diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 86b77f8c6b..f4f973d6c8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -6,6 +6,7 @@
 /types/abbrev/                                  @BendingBender
 /types/abs/                                     @AyaMorisawa
 /types/absolute/                                @AyaMorisawa
+/types/abstract-leveldown/                      @MeirionHughes @danwbyrne
 /types/acc-wizard/                              @cyrilschumacher
 /types/accept-language-parser/                  @kampfgnom
 /types/accepts/                                 @bomret @brikou
@@ -16,6 +17,7 @@
 /types/acorn/                                   @RReverser @e-cloud
 /types/actioncable/                             @zhu1230
 /types/actions-on-google/                       @joelhegg
+/types/activedirectory2/                        @pasthelod
 /types/activex-access/                          @zspitz
 /types/activex-adodb/                           @zspitz
 /types/activex-adox/                            @zspitz
@@ -46,13 +48,17 @@
 /types/adone/                                   @s0m3on3 @maxveres
 /types/aframe/                                  @devpaul @bertoritger @twastvedt
 /types/agenda/                                  @meirgottlieb @princjef
+/types/agent-base/                              @Shinigami92
 /types/aggregate-error/                         @BendingBender
+/types/agora-rtc-sdk/                           @menthays
+/types/ajv-errors/                              @afshawnlotfi
 /types/alertify/                                @jjeffery
 /types/alexa-sdk/                               @petebeegle @hoo29 @pascalwhoop @blforce @rk-7 @alexmalcoci
 /types/alexa-voice-service/                     @dolanmiu
 /types/algebra.js/                              @CaselIT
 /types/algoliasearch/                           @cbaptiste @haroenv @aherve @samouss
 /types/allure-js-commons/                       @zaqqaz
+/types/almost-equal/                            @cmaddalozzo
 /types/alt/                                     @Shearerbeard
 /types/amazon-cognito-auth-js/                  @scottescue
 /types/amazon-product-api/                      @MattiLehtinen @alien35
@@ -64,14 +70,15 @@
 /types/amplify-deferred/                        @joeriks @laurentiustamate94
 /types/amplitude-js/                            @Asido
 /types/amqp/                                    @seikho @jonnysparkplugs
+/types/amqp-connection-manager/                 @rogierschouten
 /types/amqp-rpc/                                @wokim
 /types/amqplib/                                 @mnahkies @abreits @nfantone @zelein
 /types/analytics-node/                          @fongandrew @thomasthiebaud
 /types/anchor-js/                               @xt0rted
-/types/angular/                                 @diegovilar @thorn0 @calebstdenis @leonard-thieu
+/types/angular/                                 @diegovilar @thorn0 @calebstdenis @leonard-thieu @scipper
 /types/angular-agility/                         @rolandzwaga
 /types/angular-animate/                         @michelsalib @adidahiya @rasch @codyschaaf
-/types/angular-block-ui/                        @lassebn @sclassen
+/types/angular-block-ui/                        @lassebn @sclassen @renjfk
 /types/angular-bootstrap-calendar/              @Odrin
 /types/angular-bootstrap-lightbox/              @rolandzwaga
 /types/angular-breadcrumb/                      @marctalary
@@ -106,15 +113,16 @@
 /types/angular-material/                        @blbigelow @PeterHajdu @Dona278 @geertjansen @eknowles
 /types/angular-media-queries/                   @jpmnteiro
 /types/angular-meteor/                          @pgrm
-/types/angular-mocks/                           @diegovilar @daltin
+/types/angular-mocks/                           @diegovilar @daltin @thorn0
 /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-extras/                        @mistic100
 /types/angular-q-spread/                        @rafw87
 /types/angular-resource/                        @diegovilar @miffels
-/types/angular-route/                           @park9140
+/types/angular-route/                           @park9140 @gkalpak
 /types/angular-sanitize/                        @diegovilar
 /types/angular-scenario/                        @RomanoLindano
 /types/angular-scroll/                          @samherrmann
@@ -126,7 +134,7 @@
 /types/angular-toasty/                          @muenchdo
 /types/angular-tooltips/                        @leonard-thieu
 /types/angular-translate/                       @michelsalib @GabrielGil
-/types/angular-ui-bootstrap/                    @xt0rted @ry8806
+/types/angular-ui-bootstrap/                    @xt0rted @ry8806 @alfiej
 /types/angular-ui-router/                       @michelsalib @matiishyn @mikehaas763
 /types/angular-ui-scroll/                       @marknadig
 /types/angular-ui-sortable/                     @thgreasi
@@ -142,10 +150,12 @@
 /types/animejs/                                 @A-Babin
 /types/annyang/                                 @hisham @theluk
 /types/ansi-colors/                             @rogierschouten
+/types/ansi-escape-sequences/                   @aomarks
 /types/ansi-escapes/                            @jacobbubu
 /types/ansi-regex/                              @mvachhar
 /types/ansi-styles/                             @brynbellomy @plylrnsdy
 /types/ansicolors/                              @rogierschouten
+/types/antlr4/                                  @mcchatman8009
 /types/any-db/                                  @rogierschouten
 /types/any-db-transaction/                      @rogierschouten
 /types/anybar/                                  @khoomeister
@@ -155,14 +165,15 @@
 /types/api-error-handler/                       @tkrotoff
 /types/apicache/                                @danielsogl
 /types/apigee-access/                           @CasperSkydt
-/types/apollo-codegen/                          @bradleyayers
+/types/apollo-codegen/                          @bradleyayers @kostspielig
+/types/apollo-upload-client/                    @Slessi
 /types/app-root-dir/                            @chenyang-biu
 /types/app-root-path/                           @shantmarouti
 /types/appdmg/                                  @unindented
 /types/appframework/                            @kyo-ago
 /types/applepayjs/                              @martincostello
 /types/appletvjs/                               @brainded
-/types/applicationinsights-js/                  @kamilszostak
+/types/applicationinsights-js/                  @kamilszostak @markwolff
 /types/aqb/                                     @Athenkosi-Mase
 /types/arangodb/                                @pluma
 /types/arbiter/                                 @arash16
@@ -174,17 +185,19 @@
 /types/archy/                                   @vvakame
 /types/are-we-there-yet/                        @brianloveswords
 /types/argon2-browser/                          @ivangabriele
-/types/argparse/                                @arcticwaters @tlaziuk
+/types/argparse/                                @arcticwaters @tlaziuk @eps1lon
 /types/args/                                    @Slessi
 /types/argv/                                    @hookclaw
 /types/arr-union/                               @mrmlnc
 /types/array-find-index/                        @samverschueren
 /types/array-foreach/                           @skysteve
+/types/array-sort/                              @DanielMSchmidt
 /types/array-uniq/                              @DanielRosenwasser
 /types/array-unique/                            @CSLTech
 /types/arrify/                                  @wanganjun
 /types/artillery/                               @kmccoan-allocadia
 /types/asana/                                   @tkqubo
+/types/asap/                                    @fpascutti
 /types/ascii2mathml/                            @RagibHasin
 /types/asenv/                                   @remisery
 /types/asn1js/                                  @microshine
@@ -205,6 +218,7 @@
 /types/atlaskit__inline-edit/                   @lstanden
 /types/atlaskit__layer/                         @lstanden
 /types/atlaskit__single-select/                 @lstanden
+/types/atlassian-crowd-client/                  @mtgto
 /types/atmosphere.js/                           @toedter @Mory1879 @Scipion
 /types/atob/                                    @johngeorgewright
 /types/atom/                                    @GlenCFL @smhxx @lierdakil
@@ -216,8 +230,9 @@
 /types/auth0-angular/                           @homesar
 /types/auth0-js/v7/                             @advancedrei
 /types/auth0-js/                                @adrianchia @mdurrant @peterblazejewicz
-/types/auth0-lock/                              @carusology @goldcaddy77 @lfaudreejr
+/types/auth0-lock/                              @carusology @goldcaddy77 @lfaudreejr @willcaul
 /types/auth0.widget/                            @advancedrei
+/types/auto-bind/                               @sseppola
 /types/auto-launch/                             @rhysd @unindented
 /types/auto-sni/                                @janwo
 /types/autobahn/                                @darkl @valepu
@@ -227,10 +242,12 @@
 /types/autosuggest-highlight/                   @senukartur
 /types/awesomplete/                             @webbiesdk @bmdixon @tbekolay @chrislopresto
 /types/aws-iot-device-sdk/                      @niik @mlamp
-/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo
+/types/aws-lambda/                              @skarum @tobyhede @buggy @y13i @wwwy3y3 @OrthoDex @MichaelMarner @daniel-cottone @kostya-misura @coderbyheart @palmithor @daniloraisi @simonbuchan @Haydabase @repl-chris @aneilbaboo @jeznag @louislarry @dpapukchiev
 /types/aws-serverless-express/                  @threesquared @jcaffey @mattmeye @albertovasquez
 /types/aws4/                                    @ajcrites
+/types/axe-webdriverjs/                         @JoshuaKGoldberg
 /types/axel/                                    @ruslan-molodyko
+/types/axios-token-interceptor/                 @innovation-team
 /types/axon/                                    @jewbre
 /types/azure/                                   @AndrewGaspar @antiveeranna @SomaticIT
 /types/azure-mobile-services-client/            @dmorosinotto
@@ -242,28 +259,35 @@
 /types/babel-plugin-react-pug/                  @jpap
 /types/babel-plugin-syntax-jsx/                 @marvinhagemeister
 /types/babel-template/                          @yortus @marvinhagemeister
-/types/babel-traverse/                          @yortus @marvinhagemeister
+/types/babel-traverse/                          @yortus @marvinhagemeister @rpetrich
 /types/babel-types/                             @yortus @baxtersa @marvinhagemeister @bcherny
 /types/babel-webpack-plugin/                    @j-f1
 /types/babel__code-frame/                       @mohsen1 @ForbesLindesay
+/types/babel__core/                             @yortus @marvinhagemeister @mgroenhoff
+/types/babel__generator/                        @yortus @johnnyestilles @mgroenhoff
+/types/babel__parser/                           @yortus @marvinhagemeister @mgroenhoff
+/types/babel__template/                         @yortus @marvinhagemeister @mgroenhoff
+/types/babel__traverse/                         @yortus @marvinhagemeister @rpetrich @mgroenhoff
 /types/babelify/                                @TeamworkGuy2 @marvinhagemeister
 /types/babylon/                                 @yortus @marvinhagemeister
 /types/babylon-walk/                            @czbuchi
 /types/babyparse/                               @cdiddy77
-/types/backbone/                                @borisyankov @nvivo
+/types/backbone/                                @borisyankov @nvivo @kenjiru
 /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 @razorness
+/types/backbone.marionette/                     @zhamid @nvivo @sventschui @razorness @confususs
 /types/backbone.paginator/                      @Nyamazing
 /types/backbone.radio/                          @alphaleonis
 /types/backgrid/                                @jlujan
 /types/backlog-js/                              @vvatanabe
+/types/backo2/                                  @Retsam
 /types/backoff/                                 @BendingBender
 /types/baconjs/                                 @alexander-matsievsky @gekkio
 /types/bagpipes/                                @micmro
+/types/barbellweights/                          @evelijn
 /types/barcode/                                 @pvomhoff
 /types/bardjs/                                  @TepigMC
 /types/base-64/                                 @dolanmiu
@@ -280,12 +304,16 @@
 /types/bazinga-translator/                      @alexndlm
 /types/bcrypt/                                  @codeanimal @IOAyman @dstapleton92
 /types/bcryptjs/                                @RafaelKr
+/types/bdfjs/                                   @jeremejevs
 /types/beats/                                   @urish
 /types/bech32/                                  @micksatana
 /types/behavior3/                               @carrrywu
 /types/bell/                                    @SimonSchick
 /types/bem-cn/                                  @selkinvitaly
+/types/bencode/                                 @tobenna
 /types/better-curry/                            @pocesar
+/types/better-queue/                            @maozedong
+/types/better-scroll/                           @stoneChen
 /types/better-sqlite3/                          @Morfent @matrumz
 /types/bezier-easing/                           @ptlis
 /types/bezier-js/                               @danmarshall
@@ -296,6 +324,7 @@
 /types/bigint/                                  @Evgenus
 /types/bignum/                                  @Patman64
 /types/bigscreen/                               @dduugg
+/types/bin-pack/                                @orentrutner
 /types/binary-parser/                           @riggs @dolanmiu
 /types/bind-ponyfill/                           @skysteve
 /types/bindings/                                @unindented
@@ -319,6 +348,7 @@
 /types/blocked/                                 @l-jonas
 /types/blockies/                                @LogvinovLeon
 /types/blocks/                                  @ksmigiel
+/types/bloem/                                   @danwbyrne
 /types/bloomfilter/                             @slawiko
 /types/blue-tape/                               @sodatea
 /types/bluebird/v1/                             @Bartvds
@@ -327,7 +357,7 @@
 /types/bluebird-global/                         @d-ph
 /types/bluebird-retry/                          @pvomhoff
 /types/blueimp-md5/                             @rmartone @mkohlmyr
-/types/bn.js/                                   @LogvinovLeon
+/types/bn.js/                                   @LogvinovLeon @HenryNguyen5
 /types/body-parser/                             @santialbo @vilic @dreampulse @blendsdk @tlaziuk @jwalton
 /types/body-parser-xml/                         @tbounsiar
 /types/bonjour/                                 @quentin-ol @octo-sniffle
@@ -359,12 +389,14 @@
 /types/bootstrap3-dialog/                       @nakupanda @cnboland
 /types/bounce.js/                               @cherrry
 /types/box2d/                                   @jbaldwin
+/types/bpmn-moddle/                             @haydos89
 /types/brace-expansion/                         @BendingBender
 /types/braces/                                  @vemoo
 /types/braft-editor/                            @me
 /types/braintree-web/                           @chlela
 /types/breeze/                                  @borisyankov
 /types/bricks.js/                               @kondi
+/types/bro-fs/                                  @ffflorian
 /types/brorand/                                 @chrootsu
 /types/browser-bunyan/                          @PaulLockwood @kryops
 /types/browser-fingerprint/                     @LKay
@@ -380,11 +412,13 @@
 /types/bucks/                                   @zaneli
 /types/buffer-compare/                          @chrootsu
 /types/buffer-equal/                            @Bartvds
+/types/buffer-from/                             @burnnat
+/types/buffer-reader/                           @nrlquaker
 /types/buffers/                                 @rhencke
 /types/bufferstream/                            @Bartvds
 /types/builtin-modules/                         @ajafff
 /types/bull/v2/                                 @bgrieder @JProgrammer
-/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga
+/types/bull/                                    @bgrieder @JProgrammer @marshall007 @weeco @blaugold @iamolegga @koblas @bondz @wuha-team @aleccool213
 /types/bump-regex/                              @silkentrance
 /types/bunnymq/                                 @cyrilschumacher
 /types/bunyan/                                  @amikhalev
@@ -416,6 +450,7 @@
 /types/canvas-gauges/                           @Mikhus
 /types/canvasjs/                                @brutalimp
 /types/capitalize/                              @frederickfogerty
+/types/capture-console/                         @AustonZ
 /types/card-validator/                          @ChanceM
 /types/case-sensitive-paths-webpack-plugin/     @r3nya
 /types/caseless/                                @downace @mastermatt
@@ -424,13 +459,15 @@
 /types/cassandra-driver/                        @Svjard @pc-jedi
 /types/catbox/v7/                               @jasonswearingen @AJamesPhillips
 /types/catbox/                                  @jasonswearingen @AJamesPhillips @saboya
+/types/catbox-redis/                            @SimonSchick
 /types/cbor/                                    @pushplay
 /types/ccap/                                    @taoqf
+/types/cesium/                                  @Zuzon @hnipps @szechyjs @golyalpha
 /types/chai/v2/                                 @Bartvds @AGBrown
 /types/chai/                                    @jedmao @Bartvds @AGBrown @olivr70 @mwistrand @joshuakgoldberg @shaunluttin @Naktibalda @micksatana @ErikSchierboom
 /types/chai-arrays/                             @clementprevot
 /types/chai-as-promised/                        @jt000 @Kuniwak @leonard-thieu @lazerwalker @mattbishop
-/types/chai-datetime/                           @cliffburger
+/types/chai-datetime/                           @cliffburger @mattbishop
 /types/chai-dom/                                @mattlewis92
 /types/chai-enzyme/                             @asvetliakov
 /types/chai-fuzzy/                              @Bartvds
@@ -439,7 +476,8 @@
 /types/chai-jquery/                             @kazimanzurrashid
 /types/chai-json-schema/                        @ulrichheiniger
 /types/chai-oequal/                             @mizunashi-mana
-/types/chai-spies/                              @kuzn-ilya
+/types/chai-roughly/                            @swist
+/types/chai-spies/                              @kuzn-ilya @harm-less @jounisuo
 /types/chai-string/                             @nmalaguti
 /types/chai-subset/                             @delta62 @AGBrown
 /types/chai-uuid/                               @harm-less
@@ -450,14 +488,15 @@
 /types/chardet/                                 @Gebatzens
 /types/charm/                                   @Xananax
 /types/charset/                                 @cspotcode
-/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana @guillaume-ro-fr @chicoxyzzy @archy-bold @braincore
-/types/chartist/                                @mtgibbs @psimonski @clottman @affilnost
+/types/chart.js/                                @anuti @FabienLavocat @KentarouTakeda @larrybahr @mernen @josefpaij @danmana @guillaume-ro-fr @chicoxyzzy @archy-bold @braincore @gebeto @frabnt @alexdor @mahnuh
+/types/chartist/                                @mtgibbs @psimonski @clottman @affilnost @sunnyrjuneja
+/types/chartmogul-node/                         @chartmogul
 /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/cheerio/                                 @blittle @wmaurer @umarniz @LiJinyao @chennakrishna8
 /types/chessboardjs/                            @sliverb @davidmpaz
 /types/chmodr/                                  @BendingBender
 /types/chokidar/                                @reppners @felixfbecker @bayssmekanique
@@ -466,6 +505,9 @@
 /types/chroma-js/v0/                            @invliD
 /types/chroma-js/                               @invliD @mpacholec
 /types/chrome/                                  @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
+/types/chrome-apps/                             @niikoo @AdamLay @pine613 @mzsm @RReverser @pyle @matthewkimber @otiai10 @couven92 @rreverser @sreimer15
+/types/chromecast-caf-receiver/                 @craigrbruce
+/types/chromecast-caf-sender/                   @samuelmaddock
 /types/chromedriver/                            @pe8ter
 /types/circuit-breaker-js/                      @DeTeam
 /types/circular-json/                           @jpevarnek
@@ -489,6 +531,7 @@
 /types/cli-spinner/                             @janslow
 /types/cli-table/                               @arylo
 /types/cli-table2/                              @mgroenhoff
+/types/cli-truncate/                            @danwbyrne
 /types/client-sessions/                         @netroy
 /types/clientjs/                                @icopp
 /types/cliff/                                   @brynbellomy
@@ -509,7 +552,7 @@
 /types/co-body/                                 @geoffreak
 /types/co-views/                                @devlee @geoffreak
 /types/code/                                    @prashaantt
-/types/codemirror/                              @mihailik @nrbernard @Pr1st0n
+/types/codemirror/                              @mihailik @nrbernard @Pr1st0n @rileymiller
 /types/codependency/                            @morphatic
 /types/coffeeify/                               @tkQubo
 /types/coinbase/                                @rogierschouten
@@ -525,6 +568,7 @@
 /types/color-string/                            @BendingBender @danmarshall
 /types/colorbrewer/                             @mtraynham
 /types/com.darktalker.cordova.screenshot/       @akarienta
+/types/com.wikitude.phonegap.wikitudeplugin/    @zbarbuto
 /types/combine-source-map/                      @TeamworkGuy2
 /types/combined-stream/                         @felixge @tlaziuk
 /types/combokeys/                               @iclanton
@@ -536,7 +580,9 @@
 /types/commangular/                             @hiraash
 /types/comment-json/                            @Jason3S
 /types/common-errors/                           @icopp
+/types/common-prefix/                           @seangenabe
 /types/common-tags/                             @zuzusik @tzupengwang
+/types/commondir/                               @leonard-thieu
 /types/commonmark/                              @nicojs @leonard-thieu
 /types/compare-version/                         @jpevarnek
 /types/compare-versions/                        @LogvinovLeon
@@ -553,6 +599,7 @@
 /types/conf/                                    @SamVerschueren @BendingBender
 /types/confidence/                              @jppellerin
 /types/config/                                  @RWander @forrestbice @jndonald3 @albertovasquez
+/types/config-yaml/                             @me
 /types/configstore/                             @ArcticLight
 /types/configurable/                            @jewbre
 /types/confit/                                  @ethanresnick
@@ -564,11 +611,13 @@
 /types/connect-livereload/                      @SomaticIT
 /types/connect-modrewrite/                      @tinganho
 /types/connect-mongo/                           @Syati
+/types/connect-mongodb-session/                 @NattapongSiri
 /types/connect-pg-simple/                       @pasieronen
 /types/connect-redis/                           @xstoudi @morcerf
 /types/connect-slashes/                         @samherrmann
 /types/connect-timeout/                         @cyrilschumacher
-/types/console-stamp/                           @ericbyers
+/types/console-log-level/                       @ofrobots
+/types/console-stamp/                           @ericbyers @guusdegraeve
 /types/consolidate/                             @soywiz @theosherry @nicolashenry
 /types/consul/                                  @chrootsu
 /types/content-disposition/                     @bomret
@@ -585,6 +634,7 @@
 /types/cookie-session/                          @borislavjivkov
 /types/cookie-signature/                        @lith-light-g
 /types/cookie_js/                               @slawiko
+/types/cookiejar/                               @paroxp
 /types/cookies/                                 @WangZishi @jkeylu @BendingBender
 /types/copy-paste/                              @SrTobi
 /types/copy-text-to-clipboard/                  @BendingBender
@@ -615,9 +665,9 @@
 /types/correlation-id/                          @natemara
 /types/cors/                                    @pluma
 /types/cosmiconfig/v4/                          @ozum
-/types/cosmiconfig/                             @ozum @szeck87 @saadq
+/types/cosmiconfig/                             @ozum @szeck87 @saadq @jinwoo
 /types/cote/                                    @makepost
-/types/couchbase/                               @maouida
+/types/couchbase/                               @maouida @fluggo
 /types/countdown/                               @gjuchault
 /types/counterpart/                             @santiagodoldan
 /types/countries-and-timezones/                 @zero51
@@ -645,6 +695,7 @@
 /types/crossroads/                              @diullei
 /types/cryptiles/                               @awendland
 /types/crypto-js/                               @misak113
+/types/crypto-random-string/                    @MrManny
 /types/cryptojs/                                @giabao
 /types/cson/                                    @stpettersens
 /types/csprng/                                  @winksaville
@@ -652,7 +703,10 @@
 /types/css/                                     @ilich
 /types/css-font-loading-module/                 @slikts
 /types/css-modules/                             @NeekSandhu
+/types/css-to-style/                            @bengry
 /types/cssbeautify/                             @rictic
+/types/cssnano/                                 @odnamrataizem
+/types/csso/                                    @screendriver
 /types/csurf/                                   @horiuchi
 /types/csv-parse/                               @davidm77 @obi-jan-kenobi
 /types/csv-stringify/                           @rogierschouten @arjenvanderende
@@ -689,12 +743,12 @@
 /types/d3-format/                               @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-geo/                                  @ledragon @tomwanzek @gustavderdrache @borisyankov
 /types/d3-hexbin/                               @uncovertruth @tomwanzek
-/types/d3-hierarchy/                            @tomwanzek @gustavderdrache @borisyankov
+/types/d3-hierarchy/                            @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-hsv/                                  @arrayjam @denisname
 /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-quadtree/                             @tomwanzek @gustavderdrache @borisyankov @denisname
 /types/d3-queue/                                @tomwanzek @gustavderdrache @borisyankov
 /types/d3-random/                               @tomwanzek @gustavderdrache @borisyankov
 /types/d3-request/                              @Ledragon @gustavderdrache @borisyankov @tomwanzek
@@ -732,24 +786,26 @@
 /types/datatables.net-fixedheader/              @szechyjs @Silver-Connection
 /types/datatables.net-rowgroup/                 @maixiu
 /types/datatables.net-rowreorder/               @baywet
+/types/datatables.net-scroller/                 @RohdeK
 /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/dav/                                     @ToastHawaii
 /types/db-migrate-base/                         @nickiannone
 /types/db-migrate-pg/                           @nickiannone
 /types/db.js/                                   @cgwrench
 /types/dc/                                      @hansrwindhoff @mtraynham @MatthiasJobst
-/types/dd-trace/                                @ColinBradley
+/types/dd-trace/                                @ColinBradley @alloy
 /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/decompress/                              @plantain-00 @jbethke
 /types/decompress-response/                     @DanielRosenwasser
 /types/decorum/                                 @dflor003
 /types/dedent/                                  @douglasduteil
@@ -772,6 +828,7 @@
 /types/delaunator/                              @DenisCarriere
 /types/delay/                                   @BendingBender
 /types/deline/                                  @iarroyo5
+/types/deluge/                                  @Diasiare
 /types/denodeify/                               @joaomoreno
 /types/deoxxa-content-type/                     @pine613
 /types/depcheck/                                @ark120202
@@ -787,16 +844,20 @@
 /types/detect-indent/                           @Bartvds @BendingBender
 /types/detect-it/                               @thomastilkema
 /types/detect-newline/                          @BendingBender
+/types/detect-node/                             @LogvinovLeon
 /types/detect-passive-events/                   @thomastilkema
 /types/detect-pointer/                          @thomastilkema
 /types/detect-port/                             @lith-light-g
 /types/detect-touch-events/                     @thomastilkema
 /types/detox/                                   @TareqElMasri
+/types/devexpress-aspnetcore-bootstrap/         @devexpress @skubarenko
 /types/df-visible/                              @Litee
 /types/dhtmlxgantt/                             @mkozhukh @chriscamicas
 /types/dhtmlxscheduler/                         @mkozhukh
+/types/di/                                      @johnjbarton
 /types/di-lite/                                 @dcrusader
 /types/diacritics/                              @otociulis
+/types/dialogflow/                              @dyladan
 /types/diff/                                    @vvakame @szdc
 /types/diff2html/                               @rtfpessoa
 /types/dir-resolve/                             @andy-ms
@@ -804,16 +865,18 @@
 /types/discourse-sso/                           @championswimmer
 /types/dispatchr/                               @Ragg-
 /types/disposable-email-domains/                @geoffreak
-/types/dnssd/                                   @angelmerino
+/types/dnssd/                                   @angelmerino @Maxr1998
 /types/doccookies/                              @jonegerton
 /types/dockerode/                               @seikho @nlaplante @isac322 @lazarusx @meisenzahl @thegecko
 /types/docopt/                                  @giggio
 /types/doctrine/                                @rictic
 /types/document-promises/                       @NotWoods
+/types/document-ready/                          @Jack-Works
 /types/documentdb/                              @NoelAbrahams @brettferdosi @ctstone @yifanwu
 /types/documentdb-server/                       @lith-light-g
 /types/documentdb-session/                      @DanielRosenwasser
 /types/dojo/                                    @vansimke
+/types/dom-clipboard-api/                       @43081j
 /types/dom-inputevent/                          @diagramatics
 /types/dom-to-image/                            @JipSterk
 /types/dom4/                                    @adidahiya @giladgray
@@ -847,7 +910,7 @@
 /types/dropboxjs/                               @Steve-Fenton @xperiments
 /types/dropkickjs/                              @VorobeY1326
 /types/dropzone/v4/                             @nvivo @outring @renuo @Hikariii
-/types/dropzone/                                @nvivo @outring @renuo @Hikariii @tedbcsgpro
+/types/dropzone/                                @nvivo @outring @renuo @Hikariii @tedbcsgpro @dwaxweiler
 /types/dts-generator/                           @mtraynham
 /types/duplexer2/                               @Goldsmith42
 /types/duplexer3/                               @BendingBender
@@ -866,6 +929,7 @@
 /types/each/                                    @misak113
 /types/earcut/                                  @NaridaL
 /types/easeljs/                                 @evilangelist
+/types/eases/                                   @MathiasPaumgarten
 /types/easy-api-request/                        @DeadAlready
 /types/easy-jsend/                              @DeadAlready
 /types/easy-session/                            @DeadAlready
@@ -873,7 +937,8 @@
 /types/easy-xapi/                               @DeadAlready
 /types/easy-xapi-utils/                         @DeadAlready
 /types/ebongarde-root/                          @Ebongarde
-/types/echarts/                                 @xieisabug @AntiMoron @liveangela
+/types/echarts/                                 @xieisabug @AntiMoron @liveangela @Ovilia
+/types/ecma-proposal-math-extensions/           @ksm2
 /types/ecurve/                                  @mhegazy
 /types/ed25519/                                 @erikma
 /types/ed2curve/                                @ffflorian
@@ -893,45 +958,52 @@
 /types/electron-json-storage/                   @stpettersens @nrlquaker @jbw91
 /types/electron-notifications/                  @djpereira
 /types/electron-notify/                         @djpereira
-/types/electron-packager/                       @SomaticIT @cortopy @jkleinsc
+/types/electron-packager/                       @SomaticIT @cortopy @jkleinsc @shiftkey
 /types/electron-settings/v2/                    @leonard-thieu
 /types/electron-settings/                       @icopp @nrlquaker
 /types/electron-spellchecker/                   @unindented
 /types/electron-store/                          @unindented @jsynowiec
+/types/electron-unhandled/                      @jeremejevs
 /types/electron-util/                           @kputh
 /types/electron-window-state/                   @rhysd
 /types/electron-winstaller/                     @shiftkey @unindented
+/types/elegant-spinner/                         @danwbyrne
 /types/element-ready/                           @BendingBender
 /types/element-resize-detector/                 @saranshkataria
 /types/element-resize-event/                    @rogierschouten @plgregoire
+/types/elementtree/                             @dwieeb
 /types/elm/                                     @thSoft
 /types/email-templates/                         @cyrilschumacher @gurisko @blankstar85
 /types/ember/v1/                                @jedmao
-/types/ember/                                   @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie @alexlafroscia
+/types/ember/                                   @jedmao @bttf @dwickern @chriskrycho @theroncross @mfeckie @alexlafroscia @mike-north
 /types/ember-data/                              @dwickern @mike-north @chriskrycho
 /types/ember-feature-flags/                     @tansongyang
-/types/ember-mocha/                             @dwickern
+/types/ember-mocha/                             @dwickern @simonihmig
 /types/ember-modal-dialog/                      @tansongyang
 /types/ember-qunit/v2/                          @dwickern
 /types/ember-qunit/                             @dwickern
+/types/ember-resolver/                          @dfreeman
 /types/ember-test-helpers/                      @dwickern
 /types/ember-testing-helpers/                   @chriskrycho
+/types/ember__test-helpers/                     @dfreeman @jamescdavis
 /types/emissary/                                @vvakame
-/types/emoji-mart/                              @Kovensky
+/types/emoji-mart/                              @Kovensky @Nicell
+/types/emoji-regex/                             @iKBAHT
 /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/enhanced-resolve/                        @e-cloud @onigoetz @johnnyreilly
 /types/enigma.js/                               @konne
 /types/enquire.js/                              @screendriver
 /types/ent/                                     @rogierschouten
 /types/entities/                                @aliceklipper
+/types/env-paths/                               @danwbyrne
 /types/env-to-object/                           @MugeSo
 /types/envify/                                  @tkQubo
-/types/enzyme/                                  @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden
+/types/enzyme/                                  @MarianPalkus @NoHomey @jwbay @huhuanming @MartynasZilinskas @thovden @hotell
 /types/enzyme-adapter-react-15/                 @tkrotoff
 /types/enzyme-adapter-react-15.4/               @nali
 /types/enzyme-adapter-react-16/                 @tkrotoff
@@ -942,7 +1014,9 @@
 /types/epilogue/                                @micksatana
 /types/epub/                                    @julien-c
 /types/eq.js/                                   @stephenlautier
+/types/error-subclass/                          @fitbit
 /types/errorhandler/                            @santialbo
+/types/es-feature-detection/                    @Jack-Works
 /types/es6-collections/                         @rbuckton
 /types/es6-promisify/                           @harryshipton @bschlenk
 /types/es6-shim/                                @rbuckton
@@ -959,12 +1033,14 @@
 /types/esprima/v2/                              @teppeis @RReverser
 /types/esprima/                                 @teppeis @RReverser @peter-scott
 /types/esprima-walk/                            @tswaters
-/types/espruino/                                @stasberkov
+/types/espruino/                                @stasberkov @createdbyjurand
 /types/esri-leaflet/                            @strajuser
 /types/esri-leaflet-geocoder/                   @BendingBender
 /types/estraverse/                              @sanex3339
 /types/estree/                                  @RReverser
 /types/etag/                                    @BendingBender
+/types/eth-lightwallet/                         @LogvinovLeon
+/types/ethereum-protocol/                       @LogvinovLeon
 /types/ethereumjs-abi/                          @LogvinovLeon
 /types/ethereumjs-tx/                           @LogvinovLeon
 /types/ethereumjs-util/                         @cortopy
@@ -979,8 +1055,9 @@
 /types/event-stream/                            @flcdrg
 /types/event-to-promise/                        @flying-sheep
 /types/events/                                  @yasupeke
-/types/eventsource/                             @scottleedavis
+/types/eventsource/                             @scottleedavis @afroozeh
 /types/evernote/                                @corps
+/types/ex-react-native-i18n/                    @maplerichie
 /types/excel-style-dataformatter/               @SanderDeWaal1992
 /types/exceljs/                                 @rogierschouten @alitaheri
 /types/execa/                                   @douglasduteil @BendingBender @borekb @mickdekkers
@@ -989,13 +1066,16 @@
 /types/exit-hook/                               @BendingBender
 /types/exorcist/                                @TeamworkGuy2
 /types/expect/                                  @jmreidy @merrywhether
-/types/expect-puppeteer/                        @JoshuaKGoldberg
+/types/expect-puppeteer/                        @JoshuaKGoldberg @tkrotoff
 /types/expect.js/                               @teppeis
 /types/expectations/                            @vvakame
+/types/expired-storage/                         @intolerance
 /types/expo/v23/                                @KonstantinKai
 /types/expo/v24/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger
 /types/expo/v25/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
-/types/expo/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov
+/types/expo/v26/                                @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @tinaroh
+/types/expo/                                    @KonstantinKai @martynaskadisa @janaagaard75 @ssanchezmarc @fhelwanger @umidbekkarimov @moshfeu @prokopcm @tinaroh @binki
+/types/expo__status-bar-height/                 @dawnmist
 /types/expo__vector-icons/                      @incleaf
 /types/express/                                 @borisyankov
 /types/express-brute/                           @cyrilschumacher
@@ -1010,7 +1090,7 @@
 /types/express-domain-middleware/               @hookclaw
 /types/express-ejs-layouts/                     @erikma
 /types/express-enforces-ssl/                    @kevinstubbs
-/types/express-fileupload/                      @Naktibalda
+/types/express-fileupload/                      @Naktibalda @silkimen
 /types/express-flash/                           @iMobs
 /types/express-flash-2/                         @mathsalmi
 /types/express-flash-notification/              @Mister4Eyes
@@ -1031,6 +1111,7 @@
 /types/express-partials/                        @jt000
 /types/express-promise-router/                  @wanganjun
 /types/express-rate-limit/                      @cyrilschumacher @makepost
+/types/express-redis-cache/                     @ajliv
 /types/express-route-fs/                        @kripod
 /types/express-routemap/                        @icopp
 /types/express-sanitized/                       @cjbarth
@@ -1039,21 +1120,23 @@
 /types/express-socket.io-session/               @AylaJK
 /types/express-to-koa/                          @xiaohanzhang
 /types/express-unless/                          @wokim
+/types/express-wechat-access/                   @simmons8616
 /types/express-winston/                         @bricka
 /types/express-ws/                              @ajliv
-/types/express-xml-bodyparser/                  @noticeMaker
+/types/express-xml-bodyparser/                  @noticeMaker @macedigital
 /types/extend/                                  @reppners
 /types/extjs/                                   @brian428
 /types/extract-files/                           @Slessi
 /types/extract-stack/                           @BendingBender
 /types/extract-text-webpack-plugin/             @flying-sheep @katyo
 /types/extract-zip/                             @mizunashi-mana
+/types/extsprintf/                              @AlexHankins
 /types/eyes/                                    @brynbellomy
 /types/ez-plus/                                 @AndersonFriaca
 /types/f1/                                      @neolwc
 /types/fabric/                                  @oklemencic @joewashear007 @mrand01 @NotWoods @bmartinson @RogerioTeixeira
 /types/facebook-instant-games/                  @menushka @oyvindjam
-/types/facebook-js-sdk/                         @amritk
+/types/facebook-js-sdk/                         @amritk @mahmoudzohdi
 /types/facebook-pixel/                          @noctishsu
 /types/faker/v3/                                @Kuniwak
 /types/faker/                                   @bensw @basp @Kuniwak @mattbishop
@@ -1099,11 +1182,14 @@
 /types/fetch-jsonp/                             @tkrotoff
 /types/fetch-mock/                              @asvetliakov @tamird @merrywhether @chrissinclair @matttennison @quentinbouygues
 /types/fetch.io/                                @newraina
-/types/ffi/                                     @loyd
+/types/ffi/                                     @loyd @waitingsong
+/types/ffi-napi/                                @keerthi16 @KiranNiranjan
 /types/ffmpeg-static/                           @iamstevetran
 /types/ffprobe-static/                          @iamstevetran
 /types/fhir-js-client/                          @rmchndrng
 /types/fibers/                                  @soywiz
+/types/fibjs/                                   @richardo2016
+/types/figlet/                                  @Ailrun
 /types/figures/                                 @BendingBender
 /types/file-exists/                             @BendingBender
 /types/file-saver/                              @cyrilschumacher @DaIgeb @chrismbarr
@@ -1116,6 +1202,8 @@
 /types/finalhandler/                            @chrootsu
 /types/finch/                                   @DavidSichau
 /types/find/                                    @andypyrope
+/types/find-parent-dir/                         @ikatyang
+/types/find-project-root/                       @ikatyang
 /types/find-root/                               @Alorel
 /types/find-up/                                 @BendingBender
 /types/find-versions/                           @LogvinovLeon
@@ -1141,6 +1229,7 @@
 /types/flot/                                    @burlandm @Anticom @admiralsmaster
 /types/flowjs/                                  @ryan10132
 /types/fluent-ffmpeg/                           @tcaesvk @DingWeizhe
+/types/flush-write-stream/                      @djcsdy
 /types/flux/                                    @stkb @GiedriusGrabauskas
 /types/fluxible/                                @xbim
 /types/fluxible-router/                         @xbim
@@ -1153,8 +1242,8 @@
 /types/forever-agent/                           @yavanosta
 /types/forever-monitor/                         @shuntksh @wrboyce
 /types/forge-di/                                @adamcarr
-/types/fork-ts-checker-webpack-plugin/          @JounQin
 /types/form-data/                               @soywiz @leonyu @BendingBender
+/types/form-serialize/                          @tyler-johnson
 /types/form-serializer/                         @flqw
 /types/form-urlencoded/                         @alepee
 /types/format-duration/                         @Roaders
@@ -1167,6 +1256,7 @@
 /types/foundation/                              @borisyankov
 /types/fpsmeter/                                @alampros
 /types/framebus/                                @kbukum
+/types/frctl__fractal/                          @pmccloghrylaing
 /types/freedom/                                 @jpevarnek
 /types/freeport/                                @atd-schubert
 /types/fresh/                                   @BendingBender
@@ -1190,7 +1280,7 @@
 /types/fs-promise/                              @tarruda
 /types/fs-readdir-recursive/                    @pscanf
 /types/fs-readfile-promise/                     @mtsg
-/types/fscreen/                                 @joscha
+/types/fscreen/                                 @joscha @terrymun
 /types/fsevents/                                @BendingBender
 /types/ftdomdelegate/                           @dotnetnerd
 /types/ftp/                                     @rogierschouten
@@ -1199,12 +1289,14 @@
 /types/fullpage.js/                             @jodiwarren
 /types/fusioncharts/                            @rohitkr @shivarajkv
 /types/fuzzaldrin/                              @mhegazy
-/types/fuzzaldrin-plus/                         @jeancroy @jkillian
+/types/fuzzaldrin-plus/                         @jeancroy @jkillian @reyronald
 /types/fuzzyset/                                @lgrignon @narainsagar
 /types/fuzzyset.js/                             @lgrignon @narainsagar
 /types/fxn/                                     @charrondev
 /types/gae.channel.api/                         @vvakame
+/types/gamedig/                                 @ivansieder
 /types/gamequery/                               @Laubi
+/types/ganache-core/                            @LogvinovLeon
 /types/gandi-livedns/                           @xstoudi
 /types/gapi/                                    @sgtfrankieboy
 /types/gapi.analytics/                          @gatsbimantico
@@ -1344,9 +1436,11 @@
 /types/gapi.youtube/                            @sgtfrankieboy
 /types/gapi.youtubeanalytics/                   @sgtfrankieboy
 /types/gaussian/                                @scttcper
+/types/gc-stats/                                @vfernandestoptal
 /types/geetest/                                 @plantain-00
 /types/gen-readlines/                           @CodeAnimal
 /types/generate-changelog/                      @ffflorian
+/types/generate-json-webpack-plugin/            @rynclark
 /types/generic-functions/                       @stpettersens
 /types/generic-pool/                            @jerray @wrboyce
 /types/gently/                                  @bonnici
@@ -1356,7 +1450,9 @@
 /types/geokdbush/                               @DenisCarriere
 /types/geometry-dom/                            @nakakura
 /types/geopattern/                              @Gaelan
+/types/gestalt/                                 @serranoarevalo
 /types/get-caller-file/                         @ajafff
+/types/get-folder-size/                         @mszczepanczyk
 /types/get-node-dimensions/                     @vincekovacs
 /types/get-stdin/                               @DanielRosenwasser
 /types/get-stream/                              @douglasduteil @BendingBender
@@ -1368,8 +1464,11 @@
 /types/gijgo/                                   @atatanasov
 /types/giraffe/                                 @darthapo
 /types/git/                                     @vvakame
+/types/git-branch/                              @rynclark
 /types/git-config/                              @stpettersens
 /types/git-remote-origin-url/                   @janslow
+/types/git-url-parse/                           @ajafff
+/types/github-url-to-object/                    @ajafff
 /types/github-username-regex/                   @BehindTheMath
 /types/gitlab/                                  @yanqing6628780 @Arylo
 /types/gl-matrix/                               @mattijskneppers @tatchx @nbabanov @auzmartist @surtr-isaz
@@ -1382,8 +1481,9 @@
 /types/glob-expand/                             @vvakame
 /types/glob-parent/                             @mrmlnc
 /types/glob-stream/                             @Bartvds @mrmlnc
+/types/glob-to-regexp/                          @whatasoda
 /types/global-tunnel-ng/                        @BendingBender
-/types/globalize/                               @gcastre @afromogli
+/types/globalize/                               @gcastre @afromogli @bryanforbes
 /types/globalize-compiler/                      @iclanton
 /types/globby/                                  @douglasduteil @ikatyang
 /types/globule/                                 @durad
@@ -1393,9 +1493,9 @@
 /types/google-adwords-scripts/                  @jafaircl
 /types/google-apps-script/                      @motemen @grant
 /types/google-apps-script-oauth2/               @dhayab
-/types/google-cloud__datastore/                 @beaulac
-/types/google-cloud__pubsub/                    @pheromonez
-/types/google-cloud__storage/                   @blove @nbperry
+/types/google-cloud__datastore/                 @beaulac @ogawa0071 @ThomasdenH
+/types/google-cloud__pubsub/                    @pheromonez @LunaPg @msiviero
+/types/google-cloud__storage/                   @blove @nbperry @welkie @ogawa0071
 /types/google-earth/                            @icholy
 /types/google-images/                           @dolanmiu
 /types/google-libphonenumber/                   @leonyu @winfinit
@@ -1408,15 +1508,17 @@
 /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/                              @cgwrench @nertzy @xaolas @mrmcnerd @martincostello @svenkreiss @bolatovumar @gauthierm
 /types/googlemaps.infobubble/                   @Dashue
-/types/googlepay/                               @Fluccioni
+/types/googlepay/                               @Fluccioni @Radu-Raicea
 /types/got/                                     @BendingBender @LinusU @ikokostya
 /types/graceful-fs/v2/                          @Bartvds
 /types/graceful-fs/                             @Bartvds @BendingBender
+/types/gradient-string/                         @Ailrun
 /types/graham_scan/                             @hberntsen
+/types/gramps__rest-helpers/                    @claude
 /types/graphite-udp/                            @EricByers
-/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz @bradzacher
+/types/graphql/                                 @TonyPythoneer @calebmer @intellix @firede @kepennar @freiksenet @IvanGoncharov @DxCx @rportugal @tgriesser @dyst5422 @adnsio @divyenduz @bradzacher @clayne11
 /types/graphql-date/                            @enaeseth
 /types/graphql-deduplicator/                    @lfades
 /types/graphql-depth-limit/                     @eritikass
@@ -1431,7 +1533,7 @@
 /types/gravatar-url/                            @ivangabriele
 /types/greasemonkey/                            @kotas
 /types/grecaptcha/v0/                           @brentj73
-/types/grecaptcha/                              @DethAriel
+/types/grecaptcha/                              @DethAriel @rafaeltavares
 /types/gregorian-calendar/                      @cwalv
 /types/grid-styled/                             @antonvasin @vittorio @lhache
 /types/gridfs-stream/                           @liorm
@@ -1472,6 +1574,7 @@
 /types/gulp-if/                                 @joeskeen
 /types/gulp-image/                              @Aankhen
 /types/gulp-image-resize/                       @Aankhen
+/types/gulp-imagemin/                           @romain-faust
 /types/gulp-inject/                             @k-kagurazaka
 /types/gulp-insert/                             @shantmarouti
 /types/gulp-install/                            @peterjuras
@@ -1479,6 +1582,7 @@
 /types/gulp-jasmine/                            @andypyrope
 /types/gulp-jasmine-browser/                    @tkrotoff
 /types/gulp-json-editor/                        @peterjuras
+/types/gulp-jsonmin/                            @romain-faust
 /types/gulp-jsonminify/                         @pine
 /types/gulp-jspm/                               @peterjuras
 /types/gulp-less/                               @k-kagurazaka
@@ -1492,6 +1596,7 @@
 /types/gulp-plumber/                            @joeskeen
 /types/gulp-protractor/                         @tkrotoff
 /types/gulp-pug/                                @remisery
+/types/gulp-pug-i18n/                           @romain-faust
 /types/gulp-remember/                           @tomc974
 /types/gulp-responsive-images/                  @aankhen
 /types/gulp-rev/                                @tkrotoff
@@ -1500,10 +1605,12 @@
 /types/gulp-shell/                              @tkqubo
 /types/gulp-size/                               @tkrotoff @remisery
 /types/gulp-sort/                               @joeskeen
+/types/gulp-strip-comments/                     @Aqours
 /types/gulp-strip-debug/                        @peterjuras
 /types/gulp-svg-sprite/                         @tkqubo
 /types/gulp-svgmin/                             @Aankhen
 /types/gulp-task-listing/                       @joeskeen
+/types/gulp-template/                           @pe8ter
 /types/gulp-tsd/                                @k-kagurazaka
 /types/gulp-uglify/                             @ChristopherHaws @leonard-thieu
 /types/gulp-useref/                             @tkrotoff
@@ -1522,21 +1629,24 @@
 /types/hapi/v12/                                @jasonswearingen
 /types/hapi/v15/                                @jasonswearingen
 /types/hapi/v16/                                @jasonswearingen @AJamesPhillips
-/types/hapi/                                    @BorntraegerMarc @rafaelsouzaf @jhsimms @SimonSchick
+/types/hapi/                                    @rafaelsouzaf @jhsimms @SimonSchick
 /types/hapi-auth-basic/                         @AJamesPhillips @saboya
 /types/hapi-auth-jwt2/v7/                       @warrenseymour
 /types/hapi-auth-jwt2/                          @warrenseymour @SimonSchick
 /types/hapi-decorators/                         @kenhowardpdx
 /types/har-format/                              @micmro
 /types/hard-rejection/                          @BendingBender
+/types/hard-source-webpack-plugin/              @woitechen
 /types/harmony-proxy/                           @remojansen
 /types/has-ansi/                                @BendingBender
 /types/hash-file/                               @HiromiShikata
 /types/hash-stream/                             @BendingBender
+/types/hash-sum/                                @DanielRosenwasser
 /types/hasha/                                   @BendgingBender
 /types/hasher/                                  @flyfishMT
 /types/hashids/                                 @pocesar
 /types/hashmap/                                 @outring
+/types/hat/                                     @tup1tsa
 /types/haversine/                               @screendriver
 /types/hbs/                                     @davidm77
 /types/hdkey/                                   @LogvinovLeon
@@ -1556,9 +1666,10 @@
 /types/hexo-bunyan/                             @segayuu
 /types/hexo-fs/                                 @segayuu
 /types/hexo-log/                                @segayuu
+/types/hexo-util/                               @segayuu
 /types/highcharts/                              @damianog @baltie @AlbertOzimek @hanssens
 /types/highcharts-ng/                           @scatcher
-/types/highland/                                @Bartvds @hgwood @iwllyu @alvis
+/types/highland/                                @Bartvds @hgwood @iwllyu @alvis @notbobthebuilder
 /types/highlight.js/                            @nikeee @sourrust @joshuakgoldberg
 /types/hiredis/                                 @titan
 /types/history/v2/                              @sergey-buturlakin @ngbrown
@@ -1569,6 +1680,7 @@
 /types/hjson/                                   @crunchie84
 /types/hls.js/                                  @jgainfort
 /types/hoek/                                    @prashaantt
+/types/hoist-non-react-statics/                 @JounQin
 /types/holderjs/                                @renjfk
 /types/hooker/                                  @misak113
 /types/hopscotch/                               @pimterry @Aurimas1
@@ -1592,9 +1704,12 @@
 /types/http-codes/                              @mhegazy
 /types/http-context/                            @mtraynham
 /types/http-errors/                             @tkrotoff @BendingBender
+/types/http-graceful-shutdown/                  @dlee-nvisia
+/types/http-link-header/                        @screendriver
 /types/http-proxy/                              @SomaticIT @Raigen @DanielMSchmidt
 /types/http-proxy-agent/                        @mrmlnc
 /types/http-proxy-middleware/                   @zebMcCorkle @BendingBender
+/types/http-rx/                                 @L2jLiga
 /types/http-server/                             @plantain-00
 /types/http-status/                             @misak113
 /types/http-string-parser/                      @pine613
@@ -1617,10 +1732,12 @@
 /types/i18next-browser-languagedetector/v0/     @cyrilschumacher @GiedriusGrabauskas
 /types/i18next-browser-languagedetector/        @cyrilschumacher @GiedriusGrabauskas
 /types/i18next-express-middleware/              @cyrilschumacher
+/types/i18next-ko/                              @dwaxweiler
 /types/i18next-node-fs-backend/                 @cyrilschumacher
 /types/i18next-sprintf-postprocessor/           @cyrilschumacher
 /types/i18next-xhr-backend/                     @jamuhl @GiedriusGrabauskas
 /types/i2c-bus/                                 @101100
+/types/iarna__toml/                             @ajafff
 /types/iban/                                    @cyrilschumacher
 /types/ibm-mobilefirst/                         @nacho4d
 /types/ibm_db/                                  @agov
@@ -1635,19 +1752,26 @@
 /types/iframe-resizer/                          @arminbaljic
 /types/ignite-ui/                               @IgniteUI
 /types/ignore-styles/                           @tai2
-/types/iltorb/                                  @Alorel
+/types/iltorb/                                  @Alorel @reconbot
 /types/image-size/                              @elisee
 /types/imagemagick/                             @soywiz
 /types/imagemagick-native/                      @horiuchi
 /types/imagemapster/                            @delphinus35
+/types/imagemin/                                @romain-faust
+/types/imagemin-gifsicle/                       @romain-faust
+/types/imagemin-jpegtran/                       @romain-faust
+/types/imagemin-optipng/                        @romain-faust
+/types/imagemin-svgo/                           @romain-faust
 /types/images/                                  @DingWeizhe
 /types/imagesloaded/                            @coldacid @apexskier
 /types/imap/                                    @psnider
 /types/imap-simple/                             @pushplay
 /types/imgur-rest-api/                          @lukewestby
+/types/imperium/                                @gaetansenn
 /types/impress/                                 @borisyankov
 /types/in-app-purchase/                         @l-jonas
 /types/in-range/                                @DanielRosenwasser
+/types/inboxsdk/                                @rdoursenaud @amiram
 /types/incremental-dom/                         @basarat @lanthaler @vvakame
 /types/indent-string/                           @mhegazy
 /types/inert/v4/                                @nycdotnet @AJamesPhillips
@@ -1659,27 +1783,31 @@
 /types/iniparser/                               @chrootsu
 /types/inline-css/                              @philipisapain
 /types/inline-style-prefixer/                   @ahz @dpetrezselyova
-/types/inquirer/                                @tkQubo @ppathan @jouderianjr @bang88 @bitjson @synarque @jrockwood
+/types/inquirer/                                @tkQubo @ppathan @jouderianjr @bang88 @bitjson @synarque @jrockwood @kwkelly @Ailrun
 /types/insert-module-globals/                   @leonard-thieu
 /types/insight/                                 @vvakame
 /types/integer/                                 @Morfent
-/types/interact.js/                             @dduugg @adidahiya @thasner
-/types/intercom-client/                         @jineshshah36
+/types/intercom-client/                         @jineshshah36 @peping
 /types/intercom-web/                            @fongandrew @salbahra @onatm
 /types/intercomjs/                              @spencerwi
 /types/internal-ip/                             @BendingBender
 /types/intl/                                    @RagibHasin
+/types/intl-locales-supported/                  @Slessi
 /types/intl-messageformat/                      @mhegazy
+/types/intl-relativeformat/                     @mohsen1
 /types/intl-tel-input/                          @fdnhkj @leonard-thieu
 /types/into-stream/                             @BendingBender
+/types/intrinsic-scale/                         @shalomdotnet
 /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/ion-rangeslider/v1/                      @dduugg @Karel-van-de-Plassche
+/types/ion-rangeslider/                         @Karel-van-de-Plassche
+/types/ioredis/v3/                              @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot
+/types/ioredis/                                 @plantain-00 @chrisleck @aliarham11 @br8h @shaharmor @palindrom615 @reconbot
 /types/iota.lib.js/                             @fogsh
 /types/ip/                                      @codeanimal
+/types/ip-address/                              @danwbyrne
 /types/ip-regex/                                @unindented
 /types/ipcheck/                                 @bengry
 /types/irc/                                     @phillips1012
@@ -1690,6 +1818,7 @@
 /types/is-archive/                              @mhegazy
 /types/is-array/                                @pine
 /types/is-binary-path/                          @DanielRosenwasser
+/types/is-callable/                             @nieltg
 /types/is-ci/                                   @atd-schubert
 /types/is-color/                                @VitorLuizC
 /types/is-compressed/                           @mhegazy
@@ -1709,12 +1838,15 @@
 /types/is-relative-url/                         @mhegazy
 /types/is-root/                                 @mhegazy
 /types/is-root-path/                            @mhegazy
+/types/is-running/                              @danwbyrne
 /types/is-scoped/                               @postcrafter
 /types/is-stream/                               @me
 /types/is-svg/                                  @BendingBender
 /types/is-text-path/                            @mhegazy
+/types/is-touch-device/                         @screendriver
 /types/is-url/                                  @RyotaMurohoshi
 /types/is-url-superb/                           @kryops
+/types/is-uuid/                                 @tedre191
 /types/is-windows/                              @mizunashi-mana
 /types/isbn-utils/                              @elhaard
 /types/iscroll/                                 @csrakowski @devlato
@@ -1750,7 +1882,7 @@
 /types/jasmine-promise-matchers/                @matthewjh
 /types/jasmine_dom_matchers/                    @devoto13
 /types/jasminewd2/                              @sjelin
-/types/java/                                    @jimlloyd @hrl7
+/types/java/                                    @jimlloyd @hrl7 @darti
 /types/java-applet/                             @cyrilschumacher
 /types/javascript-astar/                        @ptlis
 /types/javascript-bignum/                       @sandersn
@@ -1761,11 +1893,11 @@
 /types/jdataview/                               @RReverser
 /types/jdenticon/                               @mtr
 /types/jest/v16/                                @NoHomey @jwbay
-/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @AhnpGit @joshuakgoldberg @bradleyayers
+/types/jest/                                    @NoHomey @jwbay @asvetliakov @alexjoverm @epicallan @ikatyang @wsmd @JamieMason @douglasduteil @ahnpnl @joshuakgoldberg @UselessPickles @r3nya @hotell @sebald
 /types/jest-axe/                                @JoshuaKGoldberg
 /types/jest-diff/                               @myabc
 /types/jest-docblock/                           @ikatyang
-/types/jest-each/                               @theutz
+/types/jest-each/                               @theutz @nickmccurdy
 /types/jest-environment-puppeteer/              @joshuakgoldberg
 /types/jest-get-type/                           @myabc
 /types/jest-image-snapshot/                     @dawnmist
@@ -1775,16 +1907,19 @@
 /types/jest-matchers/                           @joscha
 /types/jest-specific-snapshot/                  @dawnmist
 /types/jest-validate/                           @ikatyang
+/types/jexl/                                    @m-tomczyk
 /types/jfs/                                     @tlaziuk
+/types/jira-client/                             @KOPTE3 @orta
 /types/jjv/                                     @Nemo157
 /types/jjve/                                    @Nemo157
 /types/jmespath/                                @pushplay
 /types/johnny-five/                             @nakakura @ujvzolee @workshop2
 /types/joi/v6/                                  @Bartvds @laurence-myers @cglantschnig @DavidBR-SW
 /types/joi/v10/                                 @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @aconanlai
-/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai
+/types/joi/                                     @Bartvds @laurence-myers @cglantschnig @DavidBR-SW @GaelMagnan @ralekna @schfkt @rokoroku @dankraus @wanganjun @rafaelkallis @aconanlai @zaphoyd
 /types/joigoose/                                @boothwhack
 /types/josa/                                    @vichyssoise
+/types/jotform-css.js/                          @pandawood
 /types/jpeg-js/                                 @DanielRosenwasser
 /types/jpegtran-bin/                            @hikoma
 /types/jpm/                                     @github-account-because-they-want-it
@@ -1795,6 +1930,7 @@
 /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-animate-scroll/                   @AndersonFriaca
 /types/jquery-awesome-cursor/                   @zskovacs
 /types/jquery-backstretch/                      @dkulyk
 /types/jquery-countdown/                        @AndersonFriaca
@@ -1808,6 +1944,7 @@
 /types/jquery-focusable/                        @AndersonFriaca
 /types/jquery-fullscreen/                       @bgrieder
 /types/jquery-galleria/                         @rimig
+/types/jquery-gray/                             @AndersonFriaca
 /types/jquery-handsontable/                     @intelorca
 /types/jquery-jcrop/                            @joeskeen
 /types/jquery-jsonrpcclient/                    @Ty3uK
@@ -1817,7 +1954,8 @@
 /types/jquery-mask-plugin/                      @avidenic @AndersonFriaca
 /types/jquery-maskmoney/                        @AndersonFriaca
 /types/jquery-match-height/                     @kbytesys
-/types/jquery-mockjax/                          @laszlojakab @vladeck
+/types/jquery-mockjax/                          @laszlojakab @vladeck @hasaki
+/types/jquery-mouse-exit/                       @AndersonFriaca
 /types/jquery-mousewheel/                       @xt0rted
 /types/jquery-next-id/                          @AndersonFriaca
 /types/jquery-notifier/                         @allipierre
@@ -1828,6 +1966,7 @@
 /types/jquery-sticky/                           @maixiu
 /types/jquery-tags-input/                       @AndersonFriaca
 /types/jquery-timeentry/                        @marknadig
+/types/jquery-toast-plugin/                     @viqashussain @astegmaier
 /types/jquery-toastmessage-plugin/              @joeskeen
 /types/jquery-truncate-html/                    @abraaoalves
 /types/jquery-urlparam/                         @stpettersens
@@ -1851,7 +1990,7 @@
 /types/jquery.dropotron/                        @cyrilschumacher
 /types/jquery.dynatree/                         @fdecampredon
 /types/jquery.elang/                            @sumegizoltan
-/types/jquery.fancytree/                        @alphaleonis @abedi-ir @Nitecube
+/types/jquery.fancytree/                        @alphaleonis @abedi-ir @niikoo @Nitecube
 /types/jquery.filtertable/                      @totpero
 /types/jquery.finger/                           @maxackley
 /types/jquery.flagstrap/                        @felipedgarcia
@@ -1864,6 +2003,7 @@
 /types/jquery.jsignature/                       @pjmagee
 /types/jquery.leanmodal/                        @FinelySliced
 /types/jquery.livestampjs/                      @vbortone
+/types/jquery.nicescroll/                       @Wkalmar
 /types/jquery.notify/                           @evil-shrike
 /types/jquery.notifybar/                        @zaneli
 /types/jquery.noty/                             @kingdango @thelfensdrfer
@@ -1932,7 +2072,8 @@
 /types/jsend/                                   @CaselIT
 /types/jsesc/                                   @Bartvds
 /types/jsfl/                                    @soywiz
-/types/jsforce/                                 @dolanmiu @netes @amphro @tnoonan-salesforce
+/types/jsforce/                                 @dolanmiu @netes @amphro @tnoonan-salesforce @whiteabelincoln
+/types/jsgraph/                                 @rosinbum
 /types/jshamcrest/                              @dharkness
 /types/jsmockito/                               @shiver-me-timbers
 /types/jsnox/                                   @stkb @DovydasNavickas
@@ -1940,18 +2081,20 @@
 /types/json-merge-patch/                        @senyaarseniy
 /types/json-parse-better-errors/                @DanielRosenwasser
 /types/json-patch/                              @vvakame
+/types/json-patch-gen/                          @RohdeK
 /types/json-pointer/                            @Bartvds
 /types/json-query/                              @mtraynham
 /types/json-rpc-ws/                             @npenin @mlamp
-/types/json-schema/                             @bcherny @cyrilletuzi @lucianbuzzo
+/types/json-schema/                             @bcherny @cyrilletuzi @lucianbuzzo @rolandjitsu
 /types/json-socket/                             @svi3c
 /types/json-stable-stringify/                   @mhfrantz
 /types/json-stringify-safe/                     @BendingBender
 /types/json2csv/                                @juanjoDiaz
 /types/json2md/                                 @MartynasZilinskas
 /types/json3/                                   @NN---
+/types/json5/                                   @Esemesek
 /types/jsonata/                                 @nick121212
-/types/jsoneditor/                              @alejo90
+/types/jsoneditor/                              @alejo90 @errietta
 /types/jsoneditor-for-react/                    @joshuakgoldberg
 /types/jsoneditoronline/                        @vbortone
 /types/jsonfile/                                @dbowring
@@ -1969,12 +2112,13 @@
 /types/jsqrcode/                                @lordazzi
 /types/jsrender/                                @zakki
 /types/jsreport-core/                           @taoqf
+/types/jsreport-html-to-xlsx/v1/                @me
 /types/jsreport-html-to-xlsx/                   @me
 /types/jsreport-jsrender/                       @taoqf
 /types/jsreport-phantom-pdf/                    @taoqf
 /types/jsreport-xlsx/                           @taoqf
 /types/jsrp/                                    @harryshipton
-/types/jss/                                     @appsforartists @kof @pelotom
+/types/jss/                                     @appsforartists @kof @pelotom @eps1lon
 /types/jssha/                                   @randombk @SrTobi
 /types/jstimezonedetect/                        @olamothe
 /types/jstorage/                                @dflor003
@@ -2003,13 +2147,14 @@
 /types/karma-chai/                              @JayAndCatchFire
 /types/karma-chai-sinon/                        @vasek17
 /types/karma-coverage/                          @tkrotoff
-/types/karma-fixture/                           @evictor
+/types/karma-fixture/                           @evictor @afshawnlotfi
 /types/karma-jasmine/                           @michelsalib
 /types/karma-viewport/                          @karak
 /types/karma-webpack/                           @mtraynham
 /types/katex/                                   @mrand01
 /types/kcors/                                   @Xstoudi @izayoiko
 /types/kdbush/                                  @DenisCarriere
+/types/keen-tracking/                           @rui-ferreira
 /types/kefir/                                   @AyaMorisawa @HitoriSensei
 /types/kendo-ui/                                @telerik
 /types/keyboardjs/                              @vbortone @piranha771
@@ -2025,7 +2170,7 @@
 /types/klaw/                                    @mceachen
 /types/klaw-sync/                               @shiftkey
 /types/kms-json/                                @sunnyone
-/types/knex/                                    @tkQubo @baronfel @MeLlamoPablo @mastermatt @micksatana @shreyjain1994
+/types/knex/                                    @tkQubo @MeLlamoPablo @mastermatt @micksatana @shreyjain1994
 /types/knex-postgis/                            @vesse
 /types/knockback/                               @borisyankov
 /types/knockout/                                @borisyankov @Igorbek @moonpyk @EnableSoftware @BenjaminEckardt @ffMathy
@@ -2048,18 +2193,22 @@
 /types/ko.plus/                                 @conficient
 /types/koa/                                     @DavidCai1993 @jkeylu @brikou
 /types/koa-basic-auth/                          @Tobias4872
-/types/koa-bodyparser/                          @hellopao
+/types/koa-better-body/                         @danwbyrne
+/types/koa-bodyparser/                          @hellopao @anup-2s
 /types/koa-cache-control/                       @pe8ter
 /types/koa-compose/                             @jkeylu
 /types/koa-compress/                            @hellopao
 /types/koa-conditional-get/                     @wingsbob
+/types/koa-convert/                             @danwbyrne
+/types/koa-cors/                                @romain-faust
 /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-html-minifier/                       @romain-faust
+/types/koa-joi-router/                          @wingsbob @move-zig
 /types/koa-json/                                @brooklyndev
 /types/koa-json-error/                          @mudkipme
 /types/koa-logger/                              @geoffreak @tlaziuk
@@ -2072,23 +2221,26 @@
 /types/koa-pug/                                 @Xstoudi
 /types/koa-range/                               @strax
 /types/koa-redis/                               @nsimmons
-/types/koa-response-time/                       @thorsedeke
-/types/koa-route/                               @migstopheles
-/types/koa-router/                              @hellopao @schfkt
+/types/koa-redis-cache/                         @dimamukhin
+/types/koa-response-time/                       @thorsedeke @sjmcdowall
+/types/koa-route/                               @migstopheles @jacogr
+/types/koa-router/                              @hellopao @schfkt @JounQin @romain-faust
 /types/koa-send/                                @pe8ter @tlaziuk
 /types/koa-session/                             @kerol2r20 @tlaziuk
 /types/koa-session-minimal/                     @longztian
 /types/koa-sslify/                              @wingsbob
 /types/koa-static/                              @hellopao @tlaziuk
+/types/koa-static-cache/                        @JounQin
 /types/koa-views/                               @brooklyndev
-/types/koa-webpack/                             @malj
-/types/koa-websocket/                           @me
+/types/koa-webpack/                             @malj @leebenson @miZyind @tlaziuk
+/types/koa-websocket/                           @moimael @jacogr @zdila
 /types/koa-xml-body/                            @uwinkelvos
 /types/koa2-cors/                               @xialeistudio
-/types/koa__cors/                               @Xstoudi @izayoiko @stevehipwell
+/types/koa2-session-redis/                      @DimaMukhin
+/types/koa__cors/                               @Xstoudi @izayoiko @stevehipwell @sjmcdowall
 /types/kolite/                                  @borisyankov
 /types/konami.js/                               @mareek
-/types/kraken-js/                               @darkwebdev
+/types/kraken-js/                               @darkwebdev @micksatana
 /types/kramed/                                  @tonicblue
 /types/kss/                                     @giladgray
 /types/kue/                                     @drudge @amiram @pc-jedi @deerawan
@@ -2136,23 +2288,27 @@
 /types/leapmotionts/                            @logotype
 /types/legal-eagle/                             @j-f1
 /types/lerna-get-packages/                      @LogvinovLeon
-/types/less/                                    @thasner @pranaygp
+/types/less/                                    @thasner @pranaygp @dwaxweiler
 /types/less-middleware/                         @federicobond
 /types/less2sass/                               @gatimus
 /types/lestate/                                 @thelambdaparty
 /types/level-sublevel/                          @basp
-/types/leveldown/                               @tarruda
+/types/leveldown/                               @tarruda @LinusU
 /types/levelup/                                 @blittle @tarruda
 /types/leven/                                   @jmalonzo
 /types/levenshtein/                             @geoffreak
 /types/libpq/                                   @Lodin
-/types/libxmljs/                                @fdecampredon
+/types/libsodium-wrappers/                      @ffflorian
+/types/libxmljs/                                @fdecampredon @ComFreek
 /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/linear-gradient/                         @Jack-Works
+/types/lingui__core/                            @huan086
+/types/lingui__react/                           @huan086
 /types/linkify-it/                              @praxxis
 /types/listr/                                   @durad
 /types/lls/                                     @borislavjivkov
@@ -2163,6 +2319,7 @@
 /types/loadware/                                @ALyman
 /types/lobibox/                                 @itboy87
 /types/local-dynamo/                            @Sicilica
+/types/local-storage/                           @tup1tsa
 /types/localized-countries/                     @coderslagoon
 /types/localizejs-library/                      @salbahra
 /types/locate-path/                             @me
@@ -2499,12 +2656,15 @@
 /types/main-bower-files/                        @k-kagurazaka
 /types/make-dir/                                @ikatyang @BendingBender
 /types/maker.js/                                @danmarshall
+/types/mali/                                    @danwbyrne
 /types/mandrill-api/                            @pocesar
 /types/map-obj/                                 @BendingBender
 /types/mapbox/                                  @anahkiasen
 /types/mapbox-gl/                               @dobrud @patrickr
 /types/mapbox-gl-leaflet/                       @agorshkov23
+/types/mapbox__geo-viewport/                    @fnberta
 /types/mapbox__geojson-area/                    @n0nick
+/types/mapbox__polyline/                        @Kern0 @mklopets
 /types/mapbox__shelf-pack/                      @Perlmint
 /types/mapnik/                                  @ipv4sec
 /types/mapsjs/                                  @davismj
@@ -2513,19 +2673,22 @@
 /types/markdown-it/                             @rapropos
 /types/markdown-it-anchor/                      @seryl
 /types/markdown-it-container/                   @hronex
+/types/markdown-pdf/                            @MonsieurMan
 /types/markdownlint/                            @ark120202
-/types/marked/                                  @worr @BendingBender
+/types/marked/                                  @worr @BendingBender @CrossR
 /types/marker-animate-unobtrusive/              @viskin
 /types/markerclustererplus/                     @enanox @mxl
 /types/markitup/                                @drillbits
+/types/marko/                                   @darkwebdev
 /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/match-sorter/                            @claasahl
 /types/material-components-web/                 @BrentDouglas @ckosti
 /types/material-design-lite/                    @bradzacher
-/types/material-ui/                             @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk @samwalshnz
+/types/material-ui/                             @ngbrown @theigor @alitaheri @herrmanno @DaIgeb @allienna @schlesingermatthias @InsidersByte @artyomsv @dan-j @minodisk @samwalshnz @reggino
 /types/material-ui-datatables/                  @coding2012
 /types/material__animation/                     @BrentDouglas @ckosti
 /types/material__auto-init/                     @BrentDouglas @ckosti
@@ -2557,7 +2720,7 @@
 /types/materialize-css/                         @huww98 @MaximBalaganskiy @MonizDave @broccoliarchy
 /types/math3d/                                  @laszlojakab @jimsmart
 /types/mathjax/                                 @rolandzwaga
-/types/mathjs/                                  @siavol @andnp
+/types/mathjs/                                  @siavol @andnp @bradbesserman
 /types/matter-js/                               @piranha771 @hasparus
 /types/maxmind/                                 @geoffreak
 /types/mcustomscrollbar/                        @flurg
@@ -2570,16 +2733,18 @@
 /types/mem-fs/                                  @MyFoodBag
 /types/mem-fs-editor/                           @MyFoodBag
 /types/memcached/                               @KentarouTakeda
-/types/memoize-one/                             @karol-majewski
+/types/memjs/                                   @leizongmin
+/types/memoize-one/                             @karol-majewski @franklixuefei
 /types/memoizee/                                @juanpicado
 /types/memory-cache/                            @jedigo @thieman
 /types/memory-fs/                               @e-cloud
 /types/memwatch-next/                           @cyrilschumacher
 /types/meow/                                    @KnisterPeter @praxxis @bitjson
 /types/merge-descriptors/                       @danny8002
-/types/merge-stream/                            @k-kagurazaka @daniel-zazula
+/types/merge-stream/                            @k-kagurazaka @tomxtobin @daniel-zazula @djcsdy
 /types/merge2/                                  @tkrotoff @smac89
 /types/merkle/                                  @kerol2r20
+/types/mermaid/                                 @ggilmore
 /types/mersenne-twister/                        @KentarouTakeda
 /types/meshblu/                                 @fnipo
 /types/mess/                                    @Nemo157
@@ -2592,12 +2757,13 @@
 /types/meteor-prime8consulting-oauth2/          @vangorra
 /types/meteor-publish-composite/                @vangorra
 /types/meteor-roles/                            @vangorra @mattmm3d
-/types/meteor-univserse-i18n/                   @mathewmeconry
+/types/meteor-universe-i18n/                    @mathewmeconry
 /types/method-override/                         @santialbo
 /types/methods/                                 @cprecioso
 /types/metric-suffix/                           @davidm77
 /types/mfiles/                                  @avonwyss
 /types/micro/                                   @kaoDev
+/types/micro-cors/                              @CallumDenby
 /types/micromatch/v2/                           @glen-84
 /types/micromatch/                              @glen-84 @vemoo
 /types/microrouter/                             @mathieudutour
@@ -2607,16 +2773,18 @@
 /types/microsoftteams/                          @WrathOfZombies @jayongg @ydogandjiev
 /types/microtime/                               @vincekovacs
 /types/milkcocoa/                               @odangosan
+/types/millisecond/                             @xeoneux
 /types/mime/                                    @jedigo @dhritzkiv
 /types/mime-db/                                 @AJamesPhillips
 /types/mime-types/                              @Perlmint
 /types/mimos/                                   @AJamesPhillips
 /types/mina/                                    @lhk @mattanja @kant2002
 /types/mini-css-extract-plugin/                 @JounQin
+/types/minimal-bit-array/                       @jeremejevs
 /types/minimatch/                               @vvakame @shantmarouti
 /types/minimist/                                @Bartvds @Necroskillz @kamranayub
 /types/minimist-options/                        @ikatyang
-/types/minio/                                   @barinbritva @castorw
+/types/minio/                                   @barinbritva @castorw @loremaps
 /types/minipass/                                @BendingBender
 /types/mirrorx/                                 @aaronphy
 /types/mithril/                                 @spacejack @andraaspar @isiahmeadows
@@ -2630,7 +2798,7 @@
 /types/mkpath/                                  @optical
 /types/mobx-apollo/                             @pselden
 /types/mobx-devtools-mst/                       @pluma
-/types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight @cspotcode
+/types/mocha/                                   @kazimanzurrashid @otiai10 @jt000 @enlight @cspotcode @1999
 /types/mocha-each/                              @magnostherobot
 /types/mocha-phantomjs/                         @ErikSchierboom
 /types/mocha-steps/                             @Arylo
@@ -2653,13 +2821,17 @@
 /types/moment-jalaali/                          @alitaheri
 /types/moment-range/                            @Burgov @wilgert @franjuan @MartynasZilinskas
 /types/moment-round/                            @jacobbaskin
+/types/moment-shortformat/                      @whatasoda
 /types/moment-strftime2/                        @dex4er
 /types/moment-timezone/                         @michelsalib @alanblins
+/types/money-math/                              @taoqf
 /types/mongo-sanitize/                          @CedricCazin
-/types/mongodb/v2/                              @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi
-/types/mongodb/                                 @CaselIT @alanmarcell @kikar @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian
+/types/mongodb/v2/                              @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi
+/types/mongodb/                                 @CaselIT @alanmarcell @bitjson @dante-101 @mcortesi @EnricoPicci @AJCStriker @julien-c @daprahamian @denys-bushulyak @BastienAr @sindbach @geraldinelemeur @jishi
+/types/mongodb-memory-server/                   @dmitryrogozhny
+/types/mongodb-uri/                             @mernxl
 /types/mongoose/v4/                             @simonxca @horiuchi @sindrenm @lukasz-zak
-/types/mongoose/                                @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab
+/types/mongoose/                                @horiuchi @sindrenm @lukasz-zak @Alorel @jendrikw @ethanresnick @vologab @jussikinnula @ondratra @alfirin @idandrd
 /types/mongoose-auto-increment/                 @AyaMorisawa
 /types/mongoose-deep-populate/                  @AyaMorisawa
 /types/mongoose-geojson-schema/                 @bondz
@@ -2676,6 +2848,8 @@
 /types/morgan/                                  @staticfunction @pscanf
 /types/morphdom/                                @arvitaly
 /types/morris.js/                               @mareek @sindilevich
+/types/mosca/                                   @GabrielGouv @jerray
+/types/motor-hat/                               @muntyan
 /types/mousetrap/                               @qcz
 /types/move-concurrently/                       @mgroenhoff
 /types/moviedb/                                 @basarat @0x6368656174
@@ -2689,7 +2863,7 @@
 /types/msgpack5/                                @wokim @heycalmdown
 /types/msnodesql/                               @borisyankov @SomaticIT
 /types/msportalfx-test/                         @julioct
-/types/mssql/                                   @jaminfarr @buzinas @mrrichar @elhaard @pkeuter
+/types/mssql/                                   @jaminfarr @buzinas @mrrichar @elhaard @pkeuter @mcdado
 /types/mu2/                                     @jedigo
 /types/muicss/                                  @samuelneff
 /types/multer/                                  @jt000 @DavidBR-SW @mxl @hyunseob
@@ -2707,15 +2881,18 @@
 /types/murmurhash-js/                           @cvle
 /types/murmurhash3js/                           @dlee-nvisia
 /types/musicmetadata/                           @Xstoudi
-/types/mustache/                                @markashleybell
+/types/mustache/                                @markashleybell @manuth
 /types/mv/                                      @nenadalm
 /types/mysql/                                   @wjohnsto @kacepe @kpping @jdmunro
 /types/mz/                                      @ThomasHickman
-/types/n3/                                      @phreed
+/types/n3/                                      @phreed @rubensworks
 /types/named-regexp-groups/                     @jewbre
+/types/named-routes/                            @qqilihq
 /types/nano/                                    @timjacobi @vincekovacs
 /types/nanoajax/                                @nathancahill
-/types/nanoid/                                  @bash
+/types/nanoevents/                              @nju33
+/types/nanographql/                             @cdaringe
+/types/nanoid/                                  @bash @fadezhanger
 /types/nanomsg/                                 @titan
 /types/nanoscroller/                            @zihark17
 /types/nanp/                                    @karn
@@ -2740,15 +2917,17 @@
 /types/negotiator/                              @BendingBender
 /types/neo4j/                                   @cyrilschumacher
 /types/nes/                                     @NoHomey @saboya
+/types/nested-error-stacks/                     @woutervh-
 /types/net-keepalive/                           @hertzg
 /types/netmask/                                 @mhfrantz
 /types/network-interfaces/                      @anderswestberg
 /types/new-relic-browser/                       @renehamburger @piotrkubisa
 /types/newline-remove/                          @OpenByteDev
+/types/newman/                                  @LogvinovLeon
 /types/newrelic/                                @mastermatt
 /types/nexpect/                                 @vvakame
-/types/next/                                    @dru89 @brikou
-/types/next-redux-wrapper/                      @stevegeek
+/types/next/                                    @dru89 @brikou @jthegedus @resir014 @scottdj92 @joaovieira
+/types/next-redux-wrapper/                      @stevegeek @Jungwoo-An
 /types/ng-command/                              @stephenlautier
 /types/ng-cordova/                              @ksachdeva
 /types/ng-dialog/                               @stephenlautier
@@ -2775,26 +2954,27 @@
 /types/nightwatch/                              @rkavalap @schlesiger
 /types/nivo-slider/                             @AndersonFriaca
 /types/noble/                                   @swook @shantanubhadoria @lukel99 @bioball @keton @thegecko
-/types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour
+/types/nock/                                    @bonnici @horiuchi @afharo @mastermatt @damour @paambaati
 /types/nodal/                                   @charrondev
-/types/node/v4/                                 @eps1lon
-/types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub
-/types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub
-/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude
-/types/node/v9/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude
-/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude
+/types/node/v4/                                 @eps1lon @Archcry
+/types/node/v6/                                 @WilcoBakker @inlined @eps1lon @Alorel @KSXGitHub @Archcry
+/types/node/v7/                                 @parambirs @tellnes @WilcoBakker @eps1lon @KSXGitHub @Archcry
+/types/node/v8/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @hoo29 @n-e @brunoscheufler @KSXGitHub @islishude @r3nya
+/types/node/v9/                                 @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude @r3nya @eyqs
+/types/node/                                    @parambirs @tellnes @WilcoBakker @octo-sniffle @smac89 @Flarna @mwiktorczyk @wwwy3y3 @DeividasBakanas @kjin @alvis @eps1lon @Hannes-Magnusson-CK @jkomyno @ajafff @hoo29 @n-e @brunoscheufler @mohsen1 @KSXGitHub @a-tarasyuk @islishude @r3nya @ZaneHannanAU @ThomasdenH @eyqs @matthieusieben
 /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-cron/                               @maximelkin
+/types/node-dijkstra/                           @nokutu
 /types/node-dir/                                @panuhorsmalahti
 /types/node-dogstatsd/                          @chrisbobo
 /types/node-emoji/                              @jonestristand @styu
 /types/node-fetch/                              @torstenwerner @nikcorg
 /types/node-fibers/                             @caryhaynie
-/types/node-forge/                              @westy92 @flynetworks @a-k-g @rafal2228
+/types/node-forge/                              @westy92 @flynetworks @a-k-g @rafal2228 @beenotung
 /types/node-gcm/                                @horiuchi
 /types/node-geocoder/                           @rosek86
 /types/node-getopt/                             @kcauchy
@@ -2802,9 +2982,10 @@
 /types/node-horseman/                           @apratheek
 /types/node-hue-api/                            @fjmorel
 /types/node-int64/                              @x3cion @kevin-greene-ck
-/types/node-ipc/                                @arvitaly
+/types/node-ipc/                                @arvitaly @gjurgens
 /types/node-jsfl-runner/                        @mrand01
 /types/node-json-db/                            @kuzn-ilya
+/types/node-memwatch/                           @Kroisse
 /types/node-mysql-wrapper/                      @kataras
 /types/node-notifier/                           @tkQubo
 /types/node-polyglot/                           @timjk
@@ -2817,9 +2998,10 @@
 /types/node-slack/                              @tkQubo
 /types/node-snap7/                              @heilingbrunner
 /types/node-sprite-generator/                   @Perlmint
+/types/node-ssdp/                               @OrionNebula
 /types/node-static/                             @Morfent
 /types/node-statsd/                             @alexturek @convoyinc
-/types/node-telegram-bot-api/                   @ammuench @agadar @Dabolus @Kallu609
+/types/node-telegram-bot-api/                   @ammuench @agadar @Dabolus @Kallu609 @XC-Zhang
 /types/node-uuid/                               @jeffmay
 /types/node-validator/                          @kengorab
 /types/node-vault/                              @YuJianrong
@@ -2827,11 +3009,13 @@
 /types/node-xmpp-client/                        @PJakcson
 /types/node-xmpp-core/                          @PJakcson
 /types/node-zookeeper-client/                   @plantain-00 @jessezhang91
+/types/node-zopfli/                             @Alorel
+/types/node-zopfli-es/                          @Alorel
 /types/node_redis/                              @borisyankov
 /types/nodecredstash/                           @migstopheles
-/types/nodegit/                                 @dolanmiu
+/types/nodegit/                                 @dolanmiu @tniessen
 /types/nodemailer/v3/                           @rogierschouten
-/types/nodemailer/                              @rogierschouten @dex4er
+/types/nodemailer/                              @rogierschouten @dex4er @bioball
 /types/nodemailer-direct-transport/             @rogierschouten
 /types/nodemailer-mailgun-transport/            @otociulis
 /types/nodemailer-pickup-transport/             @psnider
@@ -2857,14 +3041,15 @@
 /types/npm/                                     @SomaticIT
 /types/npm-package-arg/                         @mgroenhoff
 /types/npm-packlist/                            @ajafff
-/types/npmlog/                                  @DanielMSchmidt
+/types/npmlog/                                  @DanielMSchmidt @littlepiggy03
 /types/ns-api/                                  @Archcry
 /types/nslog/                                   @unindented
 /types/nsqjs/                                   @cezaryrk
+/types/nuka-carousel/                           @Romic
 /types/number-is-nan/                           @mhegazy
 /types/number-to-words/                         @frederickfogerty
-/types/numeral/                                 @vbortone
-/types/numjs/                                   @taoqf
+/types/numeral/                                 @vbortone @BehindTheMath @klujanrosas
+/types/numjs/                                   @taoqf @mattmm3d
 /types/nunjucks/                                @RubenSlabbert
 /types/nunjucks-date/                           @kruncher
 /types/nvd3/                                    @PjMitchell
@@ -2873,29 +3058,34 @@
 /types/o.js/                                    @IceOnFire @bradzacher @janhommes @jcchalte
 /types/oauth/                                   @nonAlgebraic
 /types/oauth.js/                                @nobuoka
-/types/oauth2-server/                           @vangorra @cirick
+/types/oauth2-server/                           @vangorra @cirick @d-fischer
 /types/oauth2orize/                             @wokim @heycalmdown @stevehipwell
 /types/obelisk.js/                              @bdrupieski
+/types/obj-file-parser/                         @benc-uk
 /types/object-assign/                           @chbrown
 /types/object-diff/                             @rogierschouten
 /types/object-hash/                             @misak113
 /types/object-inspect/                          @demurgos
+/types/object-keys/                             @VitorLuizC
 /types/object-map/                              @wolfgang42
 /types/object-merge/                            @OpenByteDev
 /types/object-path/                             @pocesar
 /types/object-refs/                             @3fd
+/types/object.getownpropertydescriptors/        @VitorLuizC
 /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 @Zlatkovsky @kbrandl @Rick-Kirkham
+/types/office-js/                               @OfficeDev @LanceEA @Zlatkovsky @kbrandl @Rick-Kirkham @AlexJerabek @ElizabethSamuel-MSFT
 /types/offline-js/                              @cgwrench
 /types/oibackoff/                               @geoffreak
 /types/oidc-token-manager/                      @rosieks
+/types/oja/                                     @buffcode
 /types/okta__okta-vue/                          @innovation-team
 /types/ol/                                      @yairtawil
+/types/omggif/                                  @ffflorian
 /types/on-finished/                             @czechboy0 @BendingBender
 /types/on-headers/                              @jjeffery @BendingBender
 /types/once/                                    @denis-sokolov @BendingBender
@@ -2910,7 +3100,8 @@
 /types/openjscad/                               @danmarshall
 /types/openlayers/v2/                           @bolhovsky
 /types/openlayers/v3/                           @osechet @matthiasdailey-ccri
-/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc @hauke96
+/types/openlayers/                              @osechet @wb14123 @ailrun @mylen @iamthechad @danmana @yairtawil @pierremarc @hauke96 @gberaudo
+/types/openpgp/                                 @errietta
 /types/openstack-wrapper/                       @sanjaymadane
 /types/opentok/                                 @westy92 @CatGuardian
 /types/opentype.js/                             @danmarshall @edzis
@@ -2918,7 +3109,7 @@
 /types/optics-agent/                            @crevil
 /types/optimist/                                @soywiz @chbrown
 /types/optimize-css-assets-webpack-plugin/      @odnamrataizem
-/types/ora/v0/                                  @screendriver
+/types/ora/v0/                                  @basarat @screendriver
 /types/ora/                                     @basarat @screendriver @BendingBender @azasypkin
 /types/oracledb/                                @Bigous
 /types/orchestrator/                            @tkQubo @TeamworkGuy2
@@ -2933,12 +3124,14 @@
 /types/osmtogeojson/                            @tkqubo
 /types/osrm/                                    @DenisCarriere
 /types/otplib/                                  @renjfk
+/types/overwatch-api/                           @JoshuaHall
 /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-catch-if/                              @LinusU
 /types/p-debounce/                              @BendingBender
 /types/p-defer/                                 @SamVerschueren
 /types/p-do-whilst/                             @BendingBender
@@ -2946,7 +3139,7 @@
 /types/p-event/                                 @BendingBender
 /types/p-every/                                 @BendingBender
 /types/p-lazy/                                  @BendingBender
-/types/p-limit/                                 @BendingBender
+/types/p-limit/                                 @BendingBender @LinusU
 /types/p-loading/                               @renjfk
 /types/p-locate/                                @BendingBender
 /types/p-log/                                   @BendingBender
@@ -2965,18 +3158,20 @@
 /types/p-tap/                                   @BendingBender
 /types/p-throttle/                              @BendingBender
 /types/p-timeout/                               @BendingBender
-/types/p-try/                                   @BendingBender
+/types/p-try/                                   @BendingBender @LinusU
 /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/page/                                    @43081j
 /types/paho-mqtt/                               @amikhalev
 /types/pako/                                    @cappellin @calebegg
 /types/pangu/                                   @plantain-00
-/types/papaparse/                               @torpedro @rainshen49 @jfloff @johnnyreilly
-/types/paper/                                   @clark-stevenson @Xakaloz
+/types/papaparse/                               @torpedro @rainshen49 @jfloff @johnnyreilly @albertorestifo @BehindTheMath @3af
+/types/paper/                                   @clark-stevenson @Xakaloz @sebaswebdev @rfried
+/types/parallel-transform/                      @djcsdy
 /types/paralleljs/                              @jbaldwin
 /types/parcel-env/                              @fathyb
 /types/parent-package-json/                     @sgmccli
@@ -2985,6 +3180,7 @@
 /types/parity-poe/                              @leovujanic
 /types/parse/                                   @dpoetzsch @jaeggerr @flavionegrao @wesleygrimes @owsas
 /types/parse-git-config/                        @leonard-thieu @deltaidea
+/types/parse-github-url/                        @ajafff
 /types/parse-glob/                              @glen-84
 /types/parse-json/                              @mrmlnc
 /types/parse-link-header/                       @zelein
@@ -2993,16 +3189,25 @@
 /types/parse-torrent/                           @niieani @tlaziuk
 /types/parse-torrent-file/                      @tlaziuk
 /types/parse-unit/                              @Jack-Works
+/types/parse5/v4/                               @inikulin @andnp
+/types/parse5/                                  @inikulin
+/types/parse5-htmlparser2-tree-adapter/         @inikulin
+/types/parse5-parser-stream/                    @inikulin
+/types/parse5-plain-text-conversion-stream/     @inikulin
+/types/parse5-sax-parser/                       @inikulin
+/types/parse5-serializer-stream/                @inikulin
+/types/parsecurrency/                           @cristianrgreco
 /types/parseurl/                                @bomret
-/types/parsimmon/                               @Bartvds @mizunashi-mana @bcherny @bvanreeven @leonard-thieu
+/types/parsimmon/                               @Bartvds @mizunashi-mana @bcherny @bvanreeven @leonard-thieu @MrJohz
 /types/passport/                                @horiuchi @enaeseth @theigor @tlaziuk @danielpa9708
 /types/passport-anonymous/                      @0x6368656174
 /types/passport-beam/                           @AtlasDev
+/types/passport-cognito/                        @mbutsykin
 /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-github2/                        @yasupeke @mthmulders @codepunkt
 /types/passport-google-oauth/                   @staticfunction
 /types/passport-google-oauth2/                  @bluehatbrit
 /types/passport-http/                           @krizalys @tlaziuk @cjbarth
@@ -3015,7 +3220,7 @@
 /types/passport-oauth2/                         @pasieronen @WangZishi
 /types/passport-oauth2-client-password/         @akaNightmare
 /types/passport-remember-me-extended/           @AylaJK
-/types/passport-saml/                           @cjbarth
+/types/passport-saml/                           @cjbarth @dassennato
 /types/passport-steam/                          @kzay
 /types/passport-strategy/                       @liorm
 /types/passport-twitter/                        @staticfunction
@@ -3034,6 +3239,7 @@
 /types/paypal-cordova-plugin/                   @Justin-Credible
 /types/paypal-rest-sdk/                         @trainerbill
 /types/pbf/                                     @cschwarz
+/types/pbkdf2/                                  @timonegk
 /types/pdfjs-dist/                              @jbaldwin
 /types/pdfkit/                                  @erichillah
 /types/pdfmake/                                 @m1llen1um @radziksh
@@ -3043,6 +3249,7 @@
 /types/peerjs/                                  @nakakura
 /types/pegjs/                                   @vvakame @SrTobi @siegebell
 /types/pem/                                     @tony19 @DethAriel
+/types/pem-jwk/                                 @alessiopcc
 /types/persona/                                 @Nycto
 /types/pet-finder-api/                          @me
 /types/pg/v6/                                   @pspeter3
@@ -3050,6 +3257,7 @@
 /types/pg-ears/                                 @bradleyayers
 /types/pg-escape/                               @khell
 /types/pg-format/                               @zopf
+/types/pg-large-object/                         @mateuszkrupa
 /types/pg-pool/                                 @aleung
 /types/pg-query-stream/                         @asmarques
 /types/pg-types/                                @waratuman
@@ -3071,19 +3279,21 @@
 /types/pick-weight/                             @rsxdalv
 /types/pickadate/                               @theodorejb @leonard-thieu
 /types/picturefill/                             @alaz
-/types/pidusage/                                @cyrilschumacher
+/types/pidusage/                                @cyrilschumacher @mx601595686
 /types/pify/                                    @samverschueren @mad-mike @c7hm4r
 /types/pigpio/                                  @manerfan
 /types/pikaday/                                 @MidnightDesign @wake42
 /types/pikaday-time/                            @Sayan751
 /types/pinkyswear/                              @chances
 /types/pino/v3/                                 @psnider
-/types/pino/                                    @psnider @BendingBender @screendriver
+/types/pino/                                    @psnider @BendingBender @screendriver @paambaati
 /types/pino-multi-stream/                       @JakeGinnivan
 /types/pinterest-sdk/                           @adamburmister
 /types/pinyin/                                  @wanganjun
 /types/piwik-tracker/                           @lbguilherme
 /types/pixelmatch/                              @iamolegga
+/types/pixi.js/                                 @clark-stevenson
+/types/pkg-conf/                                @jorgegonzalez
 /types/pkg-dir/                                 @NK-WEB-Git
 /types/pkijs/                                   @microshine
 /types/platform/                                @JakeH
@@ -3091,17 +3301,19 @@
 /types/playerframework/                         @ricardosabino
 /types/playmusic/                               @nickp10
 /types/pleasejs/                                @nakakura
-/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs @MercifulCode @soorajpudiyadath
+/types/plotly.js/                               @chrisgervang @martinduparc @frederikaalund @taoqf @Dadstart @szechyjs @MercifulCode @soorajpudiyadath @jonfreedman @meganrm
 /types/plugapi/                                 @BNedry
 /types/plugin-error/                            @rogierschouten
 /types/plupload/                                @patrickbussmann
-/types/pluralize/                               @ukyo
+/types/pluralize/                               @ukyo @karol-majewski
 /types/png-async/                               @kanreisa
+/types/png.js/                                  @ffflorian
 /types/pngjs/                                   @jason0x43
 /types/pngquant-bin/                            @hikoma
 /types/podcast/                                 @nikeee
 /types/podium/                                  @AJamesPhillips
 /types/point-in-polygon/                        @dyst5422 @kogai
+/types/polyfill-service/                        @Alorel
 /types/polylabel/                               @DenisCarriere
 /types/polyline/                                @Kern0
 /types/polymer/                                 @lgrignon @laco0416
@@ -3123,12 +3335,12 @@
 /types/pouchdb-adapter-websql/                  @spaulg @geppy @fredgalvao
 /types/pouchdb-browser/                         @spaulg @geppy @fredgalvao
 /types/pouchdb-core/                            @spaulg @trubit @geppy @fredgalvao @TobiasBales @tiangolo
-/types/pouchdb-find/                            @trubit
+/types/pouchdb-find/                            @trubit @tiangolo
 /types/pouchdb-http/                            @spaulg @geppy @fredgalvao
 /types/pouchdb-mapreduce/                       @spaulg @geppy @fredgalvao
 /types/pouchdb-node/                            @spaulg @geppy @fredgalvao
 /types/pouchdb-replication/                     @trubit @tiangolo
-/types/pouchdb-upsert/                          @keithdmoore @hotforfeature @apolkingg8
+/types/pouchdb-upsert/                          @keithdmoore @hotforfeature @apolkingg8 @zamb3zi
 /types/power-assert/                            @vvakame
 /types/power-assert-formatter/                  @vvakame
 /types/powerbi-visuals-tools/                   @zBritva @Microsoft
@@ -3137,12 +3349,13 @@
 /types/preloadjs/                               @endel
 /types/prelude-ls/                              @AyaMorisawa
 /types/prettier/                                @ikatyang
-/types/pretty-bytes/                            @plantain-00
+/types/pretty-bytes/v4/                         @plantain-00
+/types/pretty-bytes/                            @plantain-00 @danielasy
 /types/pretty-format/                           @ikatyang
-/types/pretty-ms/                               @BendingBender
+/types/pretty-ms/                               @BendingBender @ocboogie
 /types/printf/                                  @AluisioASG
 /types/priorityqueuejs/                         @geoffreak
-/types/prismic-dom/                             @nickw444
+/types/prismic-dom/                             @nickw444 @sbilstein
 /types/prismjs/                                 @eriklieben @andrewiggins @mmiszy
 /types/private-ip/                              @coderslagoon
 /types/procfs-stats/                            @cyrilschumacher
@@ -3153,12 +3366,15 @@
 /types/proj4leaflet/                            @BendingBender
 /types/project-oxford/                          @scsouthw
 /types/promise-dag/                             @OSjoerdWie
+/types/promise-ftp/                             @coolreader18
+/types/promise-ftp-common/                      @coolreader18
 /types/promise-map-limit/                       @kohlmannj
 /types/promise-pg/                              @coldacid
 /types/promise-polyfill/                        @skysteve
 /types/promise-pool/                            @vilic
 /types/promise-queue/                           @LachlanStuart
 /types/promise-retry/                           @shirakaba
+/types/promise-sftp/                            @coolreader18
 /types/promise-timeout/                         @Aankhen
 /types/promise.prototype.finally/               @slavik57 @BendingBender
 /types/promised-temp/                           @rokadias
@@ -3167,7 +3383,7 @@
 /types/prompt-sync/                             @MugeSo
 /types/prompt-sync-history/                     @MugeSo
 /types/promptly/                                @danrspencer
-/types/prop-types/                              @DovydasNavickas
+/types/prop-types/                              @DovydasNavickas @ferdaber
 /types/proper-lockfile/                         @qlonik
 /types/properties-reader/                       @Goldsmith42
 /types/prosemirror-collab/                      @bradleyayers @davidka @timjb @patsimm
@@ -3206,7 +3422,7 @@
 /types/pumpify/                                 @JustinBeckwith @aoberoi
 /types/pupa/                                    @nju33
 /types/puppeteer/v0/                            @marvinhagemeister @cdeutsch
-/types/puppeteer/                               @marvinhagemeister @cdeutsch @jwbay
+/types/puppeteer/                               @marvinhagemeister @cdeutsch @ksm2
 /types/pure-render-decorator/                   @seansfkelley
 /types/purl/                                    @danfma
 /types/pusher-js/                               @tkqubo @cainlevy
@@ -3217,27 +3433,30 @@
 /types/q-io/                                    @Bartvds
 /types/q-retry/                                 @vilic
 /types/qhistory/                                @Kovensky
+/types/qiniu-js/                                @taoqf
 /types/qlik/                                    @RubenSlabbert @AginicX
 /types/qlik-engineapi/                          @konne
 /types/qlik-visualizationextensions/            @konne
 /types/qr-image/                                @taoqf
+/types/qrcode/                                  @plantain-00
 /types/qrcode.react/                            @mleko
 /types/qs/                                      @RWander @leonyu @tehbelinda @zyml @artursvonda @CarlosBonetti
 /types/qtip2/                                   @Seltzer @leonard-thieu
-/types/query-string/                            @SamVerschueren @tkrotoff @huhuanming @MadaraUchiha
+/types/query-string/                            @SamVerschueren @tkrotoff @huhuanming @MadaraUchiha @shssoichiro
+/types/querystringify/                          @ilich
 /types/quick-lru/                               @BendingBender
-/types/quill/                                   @sumitkm @guillaume-ro-fr @43081j
+/types/quill/                                   @sumitkm @guillaume-ro-fr @43081j @AnielloFalcone @mhamri
 /types/quixote/                                 @greybax
 /types/qunit/v1/                                @diullei
-/types/qunit/                                   @waratuman
+/types/qunit/                                   @waratuman @mike-north
 /types/qunit-dom/                               @happycollision
 /types/quoted-printable/                        @pushplay
 /types/qwest/                                   @lindsayevans
 /types/r-script/                                @NaridaL
 /types/rabbit.js/                               @wokim
-/types/radium/                                  @alexgorbatchev @nupplaphil @asvetliakov @mihe
+/types/radium/                                  @alexgorbatchev @nupplaphil @asvetliakov
 /types/radius/                                  @codeanimal
-/types/ramda/                                   @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @charlespwd @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern
+/types/ramda/                                   @donnut @tycho01 @mdekrey @mrdziuban @sbking @afharo @teves-castro @1M0reBug @hojberg @samsonkeung @angeloocana @raynerd @googol @moshensky @ethanresnick @leighman @CaptJakk @deftomat @deptno @blimusiek @biern @rayhaneh @rgm
 /types/random-js/                               @pistacchio
 /types/random-number/                           @OpenByteDev
 /types/random-seed/                             @endel
@@ -3265,47 +3484,56 @@
 /types/rbac-a/                                  @tlaziuk
 /types/rc/                                      @DanielRosenwasser
 /types/rc-select/                               @DenisTirilis
-/types/rc-slider/                               @mantasmarcinkus @mattoni @paustint @j-fro
+/types/rc-slider/                               @mantasmarcinkus @mattoni @paustint @j-fro @Deanna2
 /types/rc-tree/                                 @johnnyreilly @Methuselah96
 /types/rcloader/                                @panuhorsmalahti
 /types/rdf-data-model/                          @rubensworks
 /types/rdf-js/                                  @rubensworks
+/types/rdflib/                                  @cenotelie
+/types/re-base/                                 @jordandrako
+/types/reach__router/                           @kingdaro
 /types/react/v15/                               @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz
-/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa
+/types/react/                                   @johnnyreilly @bbenezech @pzavolinsky @digiguru @ericanderson @morcerf @tkrotoff @DovydasNavickas @onigoetz @theruther4d @guilhermehubner @ferdaber @jrakotoharisoa @pascaloliv @hotell @franklixuefei
+/types/react-adal/                              @dkorolev1
+/types/react-albus/                             @sseppola
 /types/react-alert/                             @ssyrell
 /types/react-alice-carousel/                    @endigo
+/types/react-amplitude/                         @rayzor65
 /types/react-animate-on-scroll/                 @ralbuque
 /types/react-app/                               @prakarshpandey
 /types/react-aria-menubutton/                   @forabi @crohlfs
+/types/react-aria-modal/                        @forabi
 /types/react-autocomplete/                      @lstanden
 /types/react-autosuggest/                       @nicolas-schmitt @pjo256 @robessog @tbayne @cdeutsch @rosskevin
 /types/react-avatar-editor/                     @diogocorrea @gabsprates
-/types/react-beautiful-dnd/                     @varHarrie @bradleyayers @paustint
-/types/react-big-calendar/                      @piotrwitek @paustint @pikpok
+/types/react-beautiful-dnd/                     @varHarrie @bradleyayers @paustint @marknelissen
+/types/react-big-calendar/                      @piotrwitek @paustint @pikpok @eps1lon
 /types/react-body-classname/                    @mhegazy
-/types/react-bootstrap/                         @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa
+/types/react-bootstrap/                         @walkerburgin @vsiao @danilojrr @Batbold-Gansukh @octatone @chengsieuly @mretolaza @katbusch @vitosamson @LKay @aaronbeall @jrakotoharisoa @r3nya @t49tran
 /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 @radziksh
+/types/react-bootstrap-typeahead/               @Guymestef @radziksh @PaitoAnderson
 /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-calendar-timeline/                 @radziksh @acemac
 /types/react-cartographer/                      @trevonmckay
 /types/react-circular-progressbar/              @lstanden
 /types/react-click-outside/                     @screendriver
 /types/react-codemirror/                        @velveret @rudi-c
+/types/react-coinhive/                          @sktbcbbs
 /types/react-collapse/                          @Kimahriman
 /types/react-collapsible/                       @knegusen
 /types/react-color/                             @LKay @markspolakovs @mntdn
 /types/react-confirm/                           @santiagodoldan
 /types/react-content-loader/                    @alaatm @samwalshnz
 /types/react-copy-to-clipboard/                 @mabels @BernabeFelix
-/types/react-credit-cards/                      @vstrimaitis
+/types/react-copy-write/                        @samhh @davej
+/types/react-credit-cards/                      @vstrimaitis @olefrank
 /types/react-cropper/                           @stepancar
 /types/react-css-modules/                       @KostyaEsmukov @skirsdeda
 /types/react-css-transition-replace/            @LKay
@@ -3315,21 +3543,20 @@
 /types/react-data-grid/                         @SupernaviX @KieranPeat @martinnov92
 /types/react-datagrid/                          @stephenjelfs
 /types/react-date-range/                        @Junbong
-/types/react-datepicker/                        @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman
+/types/react-datepicker/                        @radziksh @andrewBalekha @smrq @Rogach @royxue @KoalaHuman @seansfkelley
 /types/react-daterange-picker/                  @uncovertruth @MartynasZilinskas
-/types/react-dates/                             @Artur-A
+/types/react-dates/                             @ArturAmpilogov @NathanNZ
 /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-dnd-multi-backend/                 @dawnmist @beeequeue
+/types/react-dnd-touch-backend/                 @mleko @dawnmist @beeequeue
 /types/react-document-title/                    @cleverguy25
 /types/react-dom/v15/                           @MartynasZilinskas
 /types/react-dom/                               @MartynasZilinskas @theruther4d
 /types/react-dom-factories/                     @jgoz
+/types/react-dragtastic/                        @nscarcella
 /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-dropzone/                          @matdube @LynxEyes @goblindegook @benbayard @LKay @codeaid @jurosh @ekilah
 /types/react-dynamic-number/                    @eugrdn
 /types/react-easy-chart/                        @danzel
 /types/react-event-listener/                    @asvetliakov
@@ -3338,6 +3565,7 @@
 /types/react-faux-dom/                          @alitaheri @cleverguy25 @deviousm @hanai
 /types/react-file-input/                        @dmitryrogozhny
 /types/react-file-reader-input/                 @dmitryrogozhny @alitaheri
+/types/react-flag-icon-css/                     @jonfreedman
 /types/react-flags-select/                      @senukartur
 /types/react-flatpickr/                         @begincalendar
 /types/react-flex/                              @pushplay
@@ -3346,6 +3574,7 @@
 /types/react-form/v1/                           @cameron-mcateer
 /types/react-form/                              @cameron-mcateer @TiuSh
 /types/react-foundation/                        @danielearwicker
+/types/react-gateway/                           @jsonunger
 /types/react-geosuggest/                        @brmenchl
 /types/react-google-maps-loader/                @vasilysn
 /types/react-google-places-suggest/             @vasilysn
@@ -3353,17 +3582,19 @@
 /types/react-gravatar/                          @invliD
 /types/react-grid-layout/                       @abirkholz @alitaheri @ZheyangSong @andrewhathaway
 /types/react-hamburger-menu/                    @grzesie2k
+/types/react-hammerjs/                          @jsonunger
 /types/react-helmet/v4/                         @evanbb @isman-usoh
 /types/react-helmet/                            @evanbb @isman-usoh @lith-light-g @sammkj @yuit
 /types/react-helmet-async/                      @forabi
-/types/react-highlight-words/                   @mhegazy
+/types/react-highlight/                         @joshuakgoldberg
+/types/react-highlight-words/                   @mhegazy @diogodca
 /types/react-highlighter/                       @oizie
 /types/react-holder/                            @isman-usoh
 /types/react-hot-loader/                        @jacekjagiello @MartynasZilinskas @DovydasNavickas
 /types/react-hyperscript/                       @tock203
 /types/react-i18next/v1/                        @KostyaEsmukov
-/types/react-i18next/v4/                        @GiedriusGrabauskas
-/types/react-i18next/                           @GiedriusGrabauskas @chnoch
+/types/react-i18next/v4/                        @GiedriusGrabauskas @netanelgilad
+/types/react-i18next/                           @GiedriusGrabauskas @chnoch @beheh @whtsky
 /types/react-icon-base/                         @apare @LKay
 /types/react-icons/                             @apare @johnnyreilly @LKay
 /types/react-image-crop/                        @danielasy
@@ -3371,26 +3602,31 @@
 /types/react-imageloader/                       @stephenjelfs
 /types/react-infinite/                          @rhysd
 /types/react-infinite-calendar/                 @christianchown
+/types/react-infinite-scroll-component/         @sroy3 @burtek @davidkevork
 /types/react-infinite-scroller/                 @Lapanti @psrebniak
+/types/react-input-autosize/                    @jsonunger @franklixuefei
 /types/react-input-calendar/                    @stepancar
-/types/react-input-mask/                        @apare
+/types/react-input-mask/v1/                     @apare
+/types/react-input-mask/                        @apare @dima7a14
 /types/react-intl/v1/                           @bgrieder
 /types/react-intl/                              @bgrieder @cdroulers @gyzerok @tillwolff @LKay @bhouser @kristerkari @formatlos
 /types/react-intl-redux/                        @LKay
 /types/react-is/                                @AviVahl
 /types/react-is-deprecated/                     @seansfkelley
 /types/react-joyride/                           @DanielRosenwasser @bendxn
+/types/react-js-pagination/                     @netoisc
 /types/react-json/                              @spielc
 /types/react-json-pretty/                       @LKay
 /types/react-json-tree/                         @gnestor
-/types/react-jsonschema-form/                   @iamdanfox @sirreal @iplus26 @KurtPreston
+/types/react-jsonschema-form/                   @iamdanfox @sirreal @iplus26 @KurtPreston @phbou72 @LucianBuzzo
 /types/react-lazyload/                          @m0a
+/types/react-lazylog/                           @benjaminRomano
 /types/react-leaflet/                           @danzel @davschne @yuit
 /types/react-list/                              @buptyyf @tomshen
 /types/react-loadable/                          @Kovensky @odensc @ianks @tlaziuk @iMobs
 /types/react-loader/                            @artfuldev
 /types/react-mailchimp-subscribe/               @osdiab
-/types/react-map-gl/                            @rimig
+/types/react-map-gl/                            @rimig @fnberta
 /types/react-maskedinput/                       @LKay @lavoaster @CarlosBonetti
 /types/react-mce/                               @morphologue
 /types/react-mdl/                               @bradzacher
@@ -3399,13 +3635,19 @@
 /types/react-modal/                             @radziksh @drewnoakes @homburg @ttamminen @hallowatcher @peterblazejewicz
 /types/react-motion/                            @stepancar @asvetliakov @dimitarnestorov
 /types/react-motion-slider/                     @asvetliakov
-/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff
+/types/react-motion-ui-pack/                    @jsonunger
+/types/react-native/                            @alloy @huhuanming @iRoachie @timwangdev @kamal @nelyousfi @alexdunne @swissmanu @bm-software @tkrotoff @a-tarasyuk @mvdam
 /types/react-native-android-taskdescription/    @christianchown
 /types/react-native-auth0/                      @ascariandrea
 /types/react-native-autocomplete-input/         @ifiokjr
+/types/react-native-background-timer/           @chillkroeteTTS
 /types/react-native-bluetooth-serial/           @RodrigoAWeber
+/types/react-native-calendars/                  @Tyler-Zhang @DavidNorena
 /types/react-native-communications/             @huhuanming @PaitoAnderson
+/types/react-native-custom-tabs/                @philnova
 /types/react-native-datepicker/                 @jacobbaskin
+/types/react-native-dialog/                     @MrLuje
+/types/react-native-dialogflow/                 @jasonmerino
 /types/react-native-doc-viewer/                 @iRoachie
 /types/react-native-document-picker/            @plantain-00
 /types/react-native-drawer/                     @jnbt @suniahk
@@ -3425,51 +3667,63 @@
 /types/react-native-loading-spinner-overlay/    @fhelwanger
 /types/react-native-material-design-searchbar/  @iRoachie
 /types/react-native-material-kit/               @iRoachie @timwangdev
-/types/react-native-material-textfield/         @mindhivefi
+/types/react-native-material-textfield/         @mindhivefi @iRoachie
 /types/react-native-material-ui/                @iRoachie
 /types/react-native-mixpanel/                   @r3nya
 /types/react-native-modalbox/                   @iRoachie
 /types/react-native-multi-slider/               @Slessi
-/types/react-native-navigation/                 @egorshulga
+/types/react-native-navbar/                     @ryokik
 /types/react-native-orientation/                @MoLow
 /types/react-native-permissions/                @vincentlanglet
 /types/react-native-photo-view/                 @christianchown
-/types/react-native-popup-dialog/               @PaitoAnderson @connectdotz
+/types/react-native-popup-dialog/               @PaitoAnderson @connectdotz @bm-software
 /types/react-native-push-notification/          @PaitoAnderson @tomSawkins
 /types/react-native-qrcode/                     @plantain-00
 /types/react-native-safari-view/                @mrand01
 /types/react-native-scrollable-tab-view/        @CaiHuan @egorshulga
 /types/react-native-sensor-manager/             @SahinVardar
-/types/react-native-snap-carousel/              @jnbt @j-fro @gazaret
+/types/react-native-settings-list/              @MrLuje
+/types/react-native-share/                      @marknelissen
+/types/react-native-snap-carousel/              @jnbt @j-fro @gazaret @VitorLuizC
 /types/react-native-sortable-grid/              @j-fro
 /types/react-native-sortable-list/              @sivolobov @RookY2K
-/types/react-native-sqlite-storage/             @dryganets
+/types/react-native-sqlite-storage/             @dryganets @cavarzan
 /types/react-native-star-rating/                @iRoachie
+/types/react-native-svg-charts/                 @krzysztof-miemiec
 /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-tab-view/                   @kaoDev @iRoachie @timwangdev
 /types/react-native-text-input-mask/            @RodrigoAWeber
-/types/react-native-touch-id/                   @huhuanming @gazaret
+/types/react-native-toast-native/               @bm-software
+/types/react-native-touch-id/                   @huhuanming @gazaret @jinshin1013
 /types/react-native-vector-icons/               @iRoachie @timwangdev
 /types/react-native-version-number/             @VincentLanglet
 /types/react-native-video/                      @huhuanming
-/types/react-navigation/v1/                     @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
-/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @robertohuertasm @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi @magrinj
+/types/react-navigation/v1/                     @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi
+/types/react-navigation/                        @huhuanming @mhcgrq @fangpenlin @petejkim @iRoachie @phanalpha @charlesfamu @timwangdev @bang88 @svbutko @levito @YourGamesBeOver @ArmandoAssuncao @cliedeman @Slessi @magrinj @TizioFittizio @stigi @LinusU @jshosomichi @jakebooyah @brunoro @DenisFrezzato
+/types/react-navigation-material-bottom-tabs/   @iRoachie
+/types/react-no-ssr/                            @rafalfilipek
 /types/react-notification-system/               @GiedriusGrabauskas @DeividasBakanas @LKay @sztobar
 /types/react-notification-system-redux/         @LKay
-/types/react-numeric-input/                     @heatherbooker
+/types/react-notify-toast/                      @klaascuvelier
+/types/react-numeric-input/                     @heatherbooker @akx
 /types/react-onclickoutside/v5/                 @LKay
 /types/react-onclickoutside/                    @LKay
 /types/react-onsenui/                           @salim7 @jemmyw
 /types/react-overlays/                          @aaronbeall @vitosamson
 /types/react-owl-carousel/                      @tbounsiar @igorissen @KennethanCeyer
-/types/react-paginate/                          @deevus @wouterhardeman @pegel03 @archy-bold
-/types/react-places-autocomplete/               @guilhermehubner
+/types/react-paginate/v4/                       @deevus @wouterhardeman @pegel03 @archy-bold
+/types/react-paginate/                          @deevus @wouterhardeman @pegel03 @archy-bold @yasupeke
+/types/react-places-autocomplete/               @guilhermehubner @r3nya
+/types/react-plotly.js/                         @jonfreedman
 /types/react-pointable/                         @istefo @mdibyo
 /types/react-popover/                           @jacoporicare
-/types/react-portal/                            @shuntksh
+/types/react-portal/v3/                         @shuntksh
+/types/react-portal/                            @shuntksh @HorusGoul
+/types/react-primitives/                        @aghoneim92
 /types/react-props-decorators/                  @tkqubo
+/types/react-qr-reader/                         @davidkevork
 /types/react-radio-group/                       @jsonunger
 /types/react-recaptcha/                         @mhegazy @zzanol
 /types/react-redux/v5/                          @tkqubo @thasner @kenzierocks @clayne11 @tansongyang @nicholasboll @mdibyo @pdeva
@@ -3477,18 +3731,20 @@
 /types/react-redux-epic/                        @forabi
 /types/react-redux-i18n/                        @clementdevos
 /types/react-redux-toastr/                      @Smiche @artyomsv @kulmajaba
-/types/react-relay/                             @graphcool @voxmatt @alloy @npirotte @ckknight
-/types/react-resize-detector/                   @matthew-matvei @aMoniker
+/types/react-relay/                             @graphcool @voxmatt @alloy @npirotte @ckknight @kastermester
+/types/react-request/                           @dannycochran
+/types/react-resize-detector/                   @matthew-matvei @aMoniker @rdrgn
 /types/react-resolver/                          @forabi
 /types/react-responsive/v1/                     @asvetliakov
 /types/react-responsive/                        @asvetliakov @alechill @xaviergonz
-/types/react-rnd/                               @Ragg-
+/types/react-rnd/                               @Ragg- @fsubal
 /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 @neuoy @rraina @pret-a-porter
+/types/react-router/                            @sergey-buturlakin @mrk21 @vasek17 @ngbrown @awendland @KostyaEsmukov @johnnyreilly @LKay @DovydasNavickas @tkrotoff @huy-nguyen @grmiade @DaIgeb @egorshulga @neuoy @rraina @pret-a-porter @t49tran
 /types/react-router-bootstrap/                  @vlesierse @LKay @olmobrutall
 /types/react-router-config/                     @lith-light-g
 /types/react-router-dom/                        @tkrotoff @huy-nguyen @p-jackson
+/types/react-router-hash-link/                  @zoompie
 /types/react-router-native/                     @ezintz @fhelwanger
 /types/react-router-navigation/                 @kaoDev
 /types/react-router-navigation-core/            @kaoDev
@@ -3499,22 +3755,27 @@
 /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 @misantronic @darkartur
+/types/react-select/v1/                         @Hesquibet @giladgray @iebaker @skirsdeda @vujevits @devrelm @MartynasZilinskas @onatm @ninjaferret @tehbi4 @misantronic @darkartur @eps1lon @endurance @RCGuillaume
+/types/react-select/                            @claasahl @jonfreedman
 /types/react-share/                             @icopp
-/types/react-side-effect/                       @remojansen
+/types/react-show-more/                         @naortor
+/types/react-side-effect/                       @remojansen @0xcaff
 /types/react-sidebar/                           @jeroenvervaeke
 /types/react-sketchapp/                         @ricokahler @DomiR
 /types/react-slick/                             @andrewBalekha @GiedriusGrabauskas @r3nya
+/types/react-slider/                            @jsonunger
 /types/react-smooth-scrollbar/                  @asvetliakov
 /types/react-sortable-hoc/                      @NoHomey @charlesrey
 /types/react-sortable-pane/                     @rhysd
-/types/react-sortable-tree/                     @wouterhardeman @jzoric @kevinsperrine
+/types/react-sortable-tree/                     @wouterhardeman @jzoric @kevinsperrine @acemac
+/types/react-sound/                             @koss-lebedev
 /types/react-spinkit/v1/                        @tkqubo @mleko @pelotom
 /types/react-spinkit/                           @tkqubo @mleko @pelotom @zzanol
-/types/react-sticky/                            @curtisw0
+/types/react-sticky/                            @curtisw0 @ajhyndman
+/types/react-sticky-el/                         @jbraithwaite
 /types/react-stickynode/                        @tstirrat
 /types/react-stripe-elements/                   @dan-j @santiagodoldan @sonnysangha @9y5 @thchia
-/types/react-svg/                               @viccrubs @chrisgarber
+/types/react-svg-inline/                        @kiyopikko
 /types/react-svg-pan-zoom/                      @huy-nguyen
 /types/react-swf/                               @stepancar
 /types/react-swipe/                             @DeividasBakanas
@@ -3523,35 +3784,36 @@
 /types/react-syntax-highlighter/                @NoHomey
 /types/react-table/                             @royxue @psakalo @Havret
 /types/react-tabs/                              @danez
-/types/react-tag-input/                         @Ogglas @jankarres
+/types/react-tag-input/                         @Ogglas @jankarres @matthewberryman
 /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-text-mask/                         @guilhermehubner @cavarzan
+/types/react-text-mask/                         @guilhermehubner @cavarzan @needpower
 /types/react-textarea-autosize/                 @asvetliakov @zry656565
 /types/react-timeout/                           @kerwynrg
 /types/react-toastify/                          @icopp
 /types/react-toastr/                            @shssoichiro @DanRegazzi
-/types/react-toggle/v2/                         @LKay
+/types/react-toggle/v2/                         @LKay @jsonunger
 /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-transition-group/                  @LKay @Epskampie @ybiquitous
 /types/react-treeview/                          @janslow
 /types/react-truncate/                          @mattvperry
-/types/react-twitter-auth/                      @paulfasola
+/types/react-twitter-auth/                      @paulfasola @loginwashere
 /types/react-user-tour/                         @ccancellieri
+/types/react-vertical-timeline-component/       @stephane-monnot
 /types/react-virtual-keyboard/                  @bsurai
-/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh @mgoszcz2
+/types/react-virtualized/                       @kaoDev @guntherjh @wasd171 @szabolcsx @kraenhansen @Stevearzh @mgoszcz2 @brandonhall
 /types/react-virtualized-select/                @seansfkelley
 /types/react-webcam/                            @squat
 /types/react-weui/                              @tairan
-/types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2 @r3nya
+/types/react-widgets/                           @rogierschouten @sanyatuning @frodehansen2 @r3nya @MBillemaz
 /types/react-widgets-moment/                    @dawnmist
 /types/react-youtube/                           @kgtkr
 /types/react-youtube-embed/                     @charles-salmon
@@ -3571,9 +3833,10 @@
 /types/reapop/                                  @Barrokgl
 /types/recaptcha2/                              @l-jonas
 /types/recase/                                  @18steps
-/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan
+/types/recharts/                                @mthmulders @rapmue @royxue @ZheyangSong @richbai90 @caspeco-dan @pkeuter @jrsaunde @paulmelnikow @crusectrl @apalugniok
 /types/recluster/                               @dex4er
 /types/recompose/                               @iskandersierra @mrapogee @clayne11 @Pajn @lucasterra
+/types/reconnect-core/                          @thw0rted
 /types/reconnectingwebsocket/                   @nguarracino
 /types/recursive-readdir/v1/                    @elisee
 /types/recursive-readdir/                       @elisee @MicahZoltu
@@ -3584,11 +3847,12 @@
 /types/redis-scripto/                           @westy92
 /types/redlock/v2/                              @chrootsu
 /types/redlock/                                 @chrootsu @BendingBender
-/types/redom/                                   @RauliL
+/types/redom/                                   @RauliL @nemoinho
 /types/reduce-reducers/                         @huy-nguyen
 /types/redux-action/                            @newraina
 /types/redux-action-utils/                      @tkqubo
 /types/redux-actions/                           @jaysoo @alexgorbatchev @alechill @alexey-pelykh
+/types/redux-async-queue/                       @andreiho
 /types/redux-auth-wrapper/v1/                   @LKay
 /types/redux-auth-wrapper/                      @LKay
 /types/redux-batched-subscribe/                 @mDibyo
@@ -3597,12 +3861,13 @@
 /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/                      @Valbrand @viggyfresh @janb87 @corydeppen @jscinoz
 /types/redux-first-router-link/                 @janb87
 /types/redux-first-router-restore-scroll/       @icopp
+/types/redux-first-routing/                     @tlaziuk
 /types/redux-form/v4/                           @aikoven
 /types/redux-form/v6/                           @carsonf @aikoven @LKay @bancek
-/types/redux-form/                              @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin
+/types/redux-form/                              @carsonf @aikoven @LKay @bancek @alsiola @tehbi4 @huwmartin @ethanresnick @reggino @maddijoyce
 /types/redux-immutable/                         @oizie @sebald @gavingregory
 /types/redux-immutable-state-invariant/         @remojansen @highflying
 /types/redux-infinite-scroll/                   @silkyfray
@@ -3612,8 +3877,10 @@
 /types/redux-localstorage-debounce/             @LKay
 /types/redux-localstorage-filter/               @LKay
 /types/redux-logger/                            @arusakov @kgroat
+/types/redux-mock-store/v0/                     @MarianPalkus
 /types/redux-mock-store/                        @MarianPalkus
 /types/redux-optimistic-ui/                     @asvetliakov
+/types/redux-orm/                               @keenondrums
 /types/redux-pack/                              @tansongyang @quicksnap @no-stack-dub-sack
 /types/redux-persist-transform-encrypt/         @LKay @dante-101
 /types/redux-persist-transform-filter/          @LKay
@@ -3621,31 +3888,41 @@
 /types/redux-promise-middleware/                @ianks
 /types/redux-recycle/                           @LKay
 /types/redux-router/                            @stepancar
+/types/redux-saga-tester/                       @BenLorantfy
 /types/redux-shortcuts/                         @tstirrat
 /types/redux-socket.io/                         @snakeego
 /types/redux-storage/                           @asvetliakov
 /types/redux-storage-engine-jsurl/              @screendriver
 /types/redux-storage-engine-localstorage/       @screendriver
 /types/redux-test-utils/                        @huwmartin
+/types/redux-testkit/                           @Bookler96
 /types/redux-ui/                                @andyshuxin
 /types/ref/                                     @loyd
 /types/ref-array/                               @loyd
+/types/ref-array-di/                            @keerthi16 @KiranNiranjan
+/types/ref-napi/                                @keerthi16 @KiranNiranjan
 /types/ref-struct/                              @loyd
+/types/ref-struct-di/                           @keerthi16 @KiranNiranjan
 /types/ref-union/                               @loyd
-/types/reflux/                                  @mauricedb
+/types/ref-union-di/                            @keerthi16 @KiranNiranjan
+/types/reflux/v0/                               @mauricedb
+/types/reflux/                                  @mauricedb @LiangZugeng
+/types/registry-auth-token/                     @mauricedb @LiangZugeng
 /types/relateurl/                               @tkrotoff
 /types/relaxed-json/                            @18steps
 /types/relay-runtime/                           @voxmatt @alloy
 /types/remarkable/                              @makepost
-/types/remote-redux-devtools/                   @ColinEberhardt @unindented
+/types/remote-redux-devtools/                   @ColinEberhardt @unindented @mamodom @colindekker
 /types/remove-markdown/                         @RagibHasin
 /types/rename/                                  @Aankhen
 /types/replace-ext/                             @DeividasBakanas
-/types/request/                                 @soywiz @bonnici @Bartvds @joeskeen @ccurrens @lookfirst @mastermatt
+/types/req-cwd/                                 @Alorel
+/types/request/                                 @soywiz @bonnici @Bartvds @joeskeen @ccurrens @lookfirst @mastermatt @josecolella
 /types/request-as-curl/                         @atd-schubert
 /types/request-ip/                              @mrhen
 /types/request-promise/                         @cglantschnig @joeskeen @AyaMorisawa @mastermatt
 /types/request-promise-native/                  @gustavohenke @mastermatt
+/types/requestidlecallback/                     @hax
 /types/requestretry/                            @EricByers @trainerbill
 /types/require-dir/                             @weekens
 /types/require-directory/                       @Igmat
@@ -3663,7 +3940,8 @@
 /types/restangular/                             @borisyankov
 /types/restful.js/                              @tkqubo
 /types/restify/v4/                              @blittle @stevehipwell
-/types/restify/                                 @blittle @stevehipwell @leanazulyoro
+/types/restify/v5/                              @blittle @stevehipwell @leanazulyoro
+/types/restify/                                 @blittle @stevehipwell @leanazulyoro @mgebundy
 /types/restify-cookies/                         @weekens
 /types/restify-cors-middleware/                 @dthunell
 /types/restify-errors/                          @stevehipwell
@@ -3696,11 +3974,13 @@
 /types/roads/                                   @dancespiele
 /types/roads-server/                            @dancespiele
 /types/roll/                                    @icopp
-/types/rollup-plugin-json/                      @asmockler
+/types/rolling-rate-limiter/                    @l-jonas
+/types/rollup-plugin-json/                      @asmockler @hotell
 /types/ronomon__crypto-async/                   @BendingBender
 /types/rosie/                                   @abner @subvertallchris @abukurov
 /types/roslib/                                  @Pro @skycoop @dgorobopec
 /types/rot-js/                                  @atiaxi
+/types/round-to/                                @seangenabe
 /types/route-parser/                            @ianks @bobbuehler
 /types/routie/                                  @Adilson
 /types/royalslider/                             @csrakowski
@@ -3713,7 +3993,9 @@
 /types/rsync/                                   @philippstucki
 /types/rtree/                                   @oefirouz
 /types/run-parallel/                            @mrmlnc
+/types/run-parallel-limit/                      @mrmlnc
 /types/run-sequence/                            @k-kagurazaka
+/types/runes/                                   @viralpickaxe
 /types/rword/                                   @icopp
 /types/rx/                                      @Igorbek
 /types/rx-angular/                              @mickdelaney
@@ -3747,8 +4029,9 @@
 /types/sanctuary/                               @davidchambers @cortopy @piq9117
 /types/sandboxed-module/                        @svi3c
 /types/sane/                                    @BendingBender
+/types/sane-email-validation/                   @ForbesLindesay
 /types/sanitize-filename/                       @Nemo157
-/types/sanitize-html/                           @rogierschouten @afshin @BehindTheMath
+/types/sanitize-html/                           @rogierschouten @afshin @BehindTheMath @biermeester
 /types/sap__xsenv/                              @mad-mike
 /types/sass-graph/                              @marvinhagemeister
 /types/sass-webpack-plugin/                     @AepKill
@@ -3758,6 +4041,7 @@
 /types/scalike/                                 @ryoppy
 /types/schema-registry/                         @bonzzy
 /types/schwifty/                                @ozum
+/types/scoped-http-client/                      @mattvperry @rianadon
 /types/screenfull/                              @icholy @lionelb @joelshepherd
 /types/screeps/                                 @MarkoSulamagi @NhanHo @bryanbecker @resir014 @Arcath @apemanzilla
 /types/screeps-profiler/                        @ramblurr
@@ -3766,8 +4050,10 @@
 /types/scroller/                                @haskellcamargo
 /types/scrollreveal/                            @Davidblkx
 /types/scrolltofixed/                           @bmdixon
+/types/scrypt/                                  @WhiteAbeLincoln
 /types/scrypt-async/                            @xStrom @stesix
 /types/scryptsy/                                @micksatana
+/types/sdp-transform/                           @loc
 /types/seamless/                                @danmana
 /types/seamless-immutable/                      @alex3165 @xsburg @geirsagberg
 /types/secp256k1/                               @anler
@@ -3779,6 +4065,7 @@
 /types/select2/                                 @borisyankov @denisname
 /types/selectables/                             @renjfk
 /types/selectize/                               @adidahiya @naBausch
+/types/selenium-standalone/                     @SanderDeWaal1992
 /types/selenium-webdriver/v2/                   @BillArmstrong @Kuniwak @cnishina
 /types/selenium-webdriver/                      @BillArmstrong @Kuniwak @cnishina @SupernaviX @bendxn
 /types/semantic-ui/                             @leonard-thieu
@@ -3811,24 +4098,30 @@
 /types/send/                                    @MikeJerred
 /types/seneca/                                  @psnider @kevynb
 /types/sequelize/v3/                            @samuelneff @codeanimal @drinchev @morpheusxaut @torhal
-/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01 @nidzov @Raigen @todd @nrschultz
+/types/sequelize/                               @samuelneff @codeanimal @drinchev @babolivier @kukoo1 @oktapodia @morpheusxaut @TitaneBoy @zjy01 @nidzov @Raigen @todd @nrschultz @thomas-b
+/types/sequelize-cursor-pagination/             @pilagod
 /types/sequelize-fixtures/                      @cschwarz
 /types/sequencify/                              @npenin
 /types/sequester/                               @Strate
+/types/serialize-error/                         @thomasthiebaud
 /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/                                  @sant123 @iddan
 /types/server-destroy/                          @gyszalai
+/types/servicenow/                              @bryceg
 /types/session-file-store/                      @blendsdk @rokt33r
 /types/set-cookie-parser/                       @nickp10
 /types/set-value/                               @DanielRosenwasser
 /types/settings/                                @shreyjain1994
 /types/sha1/                                    @arcdev1
+/types/shallow-equals/                          @rsolomon
 /types/shallowequal/                            @seansfkelley
-/types/shapefile/                               @DenisCarriere
+/types/shapefile/                               @DenisCarriere @Thw0rted
+/types/sharedb/                                 @soney
 /types/sharedworker/                            @nakakura
 /types/sharepoint/                              @gandjustas @andrei-markeev @baywet @teroarvola @dennispg
 /types/sharp/                                   @lith-light-g @wooseopkim
@@ -3840,7 +4133,7 @@
 /types/shimmer/                                 @kjin
 /types/shipit/                                  @cyrilschumacher
 /types/shipit-utils/                            @cyrilschumacher
-/types/shopify-buy/                             @openminder
+/types/shopify-buy/                             @openminder @straiforos @totemika
 /types/shortid/                                 @stpettersens @despairblue
 /types/shot/                                    @AJamesPhillips
 /types/should-sinon/                            @Arylo
@@ -3850,15 +4143,17 @@
 /types/siesta/                                  @bquarmby
 /types/sigmajs/                                 @qinfchen
 /types/sigmund/                                 @BendingBender
+/types/signale/                                 @resir014 @kingdaro @rjoydip
 /types/signalr/                                 @borisyankov @keesey @GiedriusGrabauskas
 /types/signalr-no-jquery/                       @gjoshevski
 /types/signals/                                 @diullei
-/types/signature_pad/                           @AbubakerB @jrmihalick
+/types/signature_pad/                           @AbubakerB @jrmihalick @leejaedus
 /types/simple-assign/                           @NoHomey
 /types/simple-cw-node/                          @vvakame
 /types/simple-lru/                              @NN---
 /types/simple-mock/                             @leonyu
-/types/simple-oauth2/                           @mad-mike @troy-lamerton
+/types/simple-oauth2/v1/                        @mad-mike @troy-lamerton @netux
+/types/simple-oauth2/                           @mad-mike @troy-lamerton @netux
 /types/simple-peer/                             @tlaziuk
 /types/simple-url-cache/                        @a-lucas
 /types/simple-websocket/                        @dex4er
@@ -3869,9 +4164,11 @@
 /types/simplesmtp/                              @rogierschouten
 /types/simplestorage.js/                        @axelcostaspena @mxl
 /types/single-line-log/                         @ffflorian
+/types/single-spa-react/                        @Garrett-Smith-iq
 /types/sinon/                                   @mrbigdog2u @rationull @lumaxis @nicojs @43081j @joshuakgoldberg
 /types/sinon-as-promised/                       @igrayson
-/types/sinon-chai/                              @kazimanzurrashid @jedmao
+/types/sinon-chai/v2/                           @kazimanzurrashid @jedmao
+/types/sinon-chai/                              @kazimanzurrashid @jedmao @elpdpt
 /types/sinon-chrome/                            @pimterry @crimx @kobanyan
 /types/sinon-express-mock/                      @jpchip @tlaziuk
 /types/sinon-mongoose/                          @stevehipwell
@@ -3880,16 +4177,23 @@
 /types/sip.js/                                  @decyrus
 /types/sipml/                                   @chookies
 /types/sitemap2/                                @shundy
+/types/six-runtime/                             @493636333
 /types/sizzle/                                  @leonard-thieu
 /types/sjcl/                                    @Evgenus
 /types/skatejs/                                 @Hotell
 /types/ski/                                     @AyaMorisawa
 /types/skyway/                                  @nakakura
+/types/slack-mock/                              @kkalavantavanich
 /types/slack-node/                              @geoffreak
 /types/slack-winston/                           @BlueHatbRit
 /types/slackdown/                               @nju33
 /types/slackify-html/                           @hypexr
+/types/slate/                                   @andykent @majelbstoat @JanLoebel @YangusKhan @kalley @Kornil
+/types/slate-base64-serializer/                 @YangusKhan
+/types/slate-html-serializer/                   @YangusKhan
 /types/slate-irc/                               @elisee
+/types/slate-plain-serializer/                  @YangusKhan
+/types/slate-react/                             @andykent @majelbstoat @JanLoebel @PatrickSachs @YangusKhan
 /types/sleep/                                   @rajarz
 /types/slickgrid/                               @jbaldwin
 /types/slideout/                                @ToastHawaii
@@ -3901,22 +4205,24 @@
 /types/smtp-server/v1/                          @markisme @Taisiias
 /types/smtp-server/                             @markisme @Taisiias @dex4er
 /types/smtpapi/                                 @a-morales
+/types/snappy/                                  @reconbot
 /types/snapsvg/                                 @lhk @mattanja @kant2002
 /types/snazzy-info-window/                      @milosd92
-/types/snekfetch/                               @DarkerTV @ShayBox @Dev-Yukine
+/types/snekfetch/                               @ANekoIsFineToo @ShayBox @Dev-Yukine
 /types/snoowrap/                                @vitosamson @TheAppleFreak
 /types/snowboy/                                 @dolanmiu
-/types/socket.io/                               @progre @divillysausages @florentpoujol @KentarouTakeda @gigi
+/types/socket.io/                               @progre @divillysausages @florentpoujol @KentarouTakeda @gigi @BrainMaestro
 /types/socket.io-client/                        @progre @divillysausages @florentpoujol
 /types/socket.io-parser/                        @plantain-00
 /types/socket.io-redis/                         @nupplaphil @seeLuck
 /types/socket.io.users/                         @kataras
+/types/socketio-jwt/                            @ehallander9591
 /types/socketio-jwt-auth/                       @codeanimal
 /types/socketio-wildcard/                       @BendingBender
 /types/socketty/                                @Nax
 /types/sockjs/                                  @pmccloghrylaing
 /types/sockjs-client/                           @vladev @arusakov @BendingBender @renjfk
-/types/solidity-parser-antlr/                   @LogvinovLeon
+/types/solidity-parser-antlr/                   @LogvinovLeon @albrow
 /types/solr-client/                             @liul85
 /types/solution-center-communicator/            @dami-gg
 /types/sort-array/                              @mrmlnc
@@ -3938,23 +4244,26 @@
 /types/speakeasy/                               @legendecas @mrOlorin @xeoneux
 /types/speakingurl/                             @Goldsmith42
 /types/spectacle/                               @zmaybury
-/types/spectrum/                                @M-Zuber
+/types/spectrum/                                @M-Zuber @Ailrun
 /types/split/                                   @marcinporebski
 /types/split.js/                                @icholy
 /types/split2/                                  @mugeso
+/types/splunk-bunyan-logger/                    @bricka
+/types/splunk-logging/                          @bricka
 /types/spotify-api/                             @skovmand
 /types/spotify-web-playback-sdk/                @Festify @mraerino @NeoLegends
 /types/sprintf/                                 @soywiz @BendingBender
 /types/sprintf-js/                              @jasonswearingen @BendingBender
 /types/sql-bricks/                              @adn05 @paleo
 /types/sql.js/                                  @Hozuki
+/types/sqlanywhere/                             @pkeuter
 /types/sqlite3/                                 @nmalaguti @dpyro @BehindTheMath
 /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-sftp-client/                        @igrayson @ascariandrea @kartik2406
 /types/ssh2-streams/                            @rbuckton
 /types/sshpk/                                   @mabels
 /types/stack-mapper/                            @rogierschouten
@@ -3963,8 +4272,9 @@
 /types/stacktrace-js/                           @exceptionless @pilagod
 /types/stale-lru-cache/                         @cxcorp
 /types/stampit/v2/                              @koresar
-/types/stampit/                                 @koresar
+/types/stampit/                                 @koresar @lummish
 /types/stamplay-js-sdk/                         @ridermansb
+/types/starwars-names/                          @claasahl
 /types/stat-mode/                               @BendingBender
 /types/stats.js/                                @gregolai @hberntsen @danvk
 /types/statsd-client/                           @peterkooijmans @chrisleck
@@ -3972,46 +4282,59 @@
 /types/std-mocks/                               @jdxcode
 /types/steam/                                   @kant2002
 /types/steam-client/                            @Slessi
+/types/steam-login/                             @Nicell
 /types/steam-totp/                              @phenomax
 /types/steamid/                                 @Slessi
 /types/steed/                                   @Paul-Isache
-/types/stellar-sdk/                             @carl-foster @tristonj
+/types/stellar-sdk/                             @carl-foster @tristonj @pselden @maxbause
 /types/stemmer/                                 @will-ockmore
 /types/sticky-cluster/                          @paustint
 /types/stompjs/                                 @jimic @Dr4k4n
 /types/stoppable/                               @EricByers
-/types/storejs/                                 @vbortone @harry0000
+/types/store/                                   @vbortone @harry0000 @Ky6uk
+/types/storybook-addon-jsx/                     @jameslnewell
 /types/storybook__addon-a11y/                   @hyunseob
-/types/storybook__addon-actions/                @joscha
+/types/storybook__addon-actions/                @joscha @jicjjang
 /types/storybook__addon-backgrounds/            @hyunseob
+/types/storybook__addon-centered/               @kiyopikko
 /types/storybook__addon-info/                   @mkornblum @fyrkant
-/types/storybook__addon-knobs/                  @joscha @martynaskadisa
+/types/storybook__addon-jest/                   @halfmatthalfcat
+/types/storybook__addon-knobs/                  @joscha @martynaskadisa @amacleay
 /types/storybook__addon-links/                  @joscha @jessepinho
-/types/storybook__addon-notes/                  @joscha
-/types/storybook__addon-options/                @joscha @simonhn
+/types/storybook__addon-notes/                  @joscha @amacleay
+/types/storybook__addon-options/                @joscha @simonhn @amacleay
 /types/storybook__addon-storyshots/             @bradleyayers
 /types/storybook__react/                        @joscha @wapgear
+/types/storybook__react-native/                 @joscha @wapgear @alechill @iRoachie
 /types/storybook__vue/                          @pntgupta
 /types/stream-buffers/                          @Jason3S
+/types/stream-chain/                            @uhop
+/types/stream-csv-as-json/                      @uhop
+/types/stream-each/                             @djcsdy
+/types/stream-json/                             @uhop
 /types/stream-meter/                            @mugeso
 /types/stream-series/                           @k-kagurazaka
+/types/stream-shift/                            @djcsdy
 /types/stream-to-array/v0/                      @Bartvds
 /types/stream-to-array/                         @Bartvds @BendingBender
 /types/stream-to-promise/                       @Alorel
 /types/streaming-json-stringify/                @BendingBender
 /types/streamjs/                                @erosb
+/types/streamtest/                              @lummish
 /types/strftime/                                @cyrilschumacher
 /types/strict-uri-encode/                       @hoishin
 /types/string/                                  @basp
+/types/string-format/                           @lal12
 /types/string-hash/                             @ethanrubio
 /types/string-similarity/                       @ragtime
 /types/string-template/                         @TonyPythoneer
+/types/string-width/                            @jacobbubu
 /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 @bruun
+/types/stripe/                                  @wjohnsto @codeanimal @sampsonjoliver @LinusU @brannon @kkamperschroer @starhoshi @bruun @galtalmor @htunnicliff @squirly @tzarger
 /types/stripe-checkout/                         @cgwrench
 /types/stripe-v2/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
 /types/stripe-v3/                               @ejsmith @amritk @adamcmiel @jleider @galuszkak
@@ -4020,7 +4343,10 @@
 /types/strong-log-transformer/                  @azasypkin
 /types/strophe/                                 @DavidKDeutsch
 /types/structured-source/                       @azu
+/types/styled-components/                       @Igorbek
 /types/styled-jsx/                              @R1ZZU
+/types/styled-system/                           @maxdeviant @phobon @zephraph @damassi @alloy @maoueh @lavoaster
+/types/stylelint/v7/                            @alan-agius4
 /types/stylelint/                               @alan-agius4
 /types/stylelint-webpack-plugin/                @bahlo
 /types/stylus/                                  @SomaticIT
@@ -4029,12 +4355,16 @@
 /types/succinct/                                @EnableSoftware
 /types/sudo-block/                              @BendingBender
 /types/suitescript/                             @darrenhillconsulting
+/types/summernote/                              @wstaelens @nusantara-cloud
 /types/sumo-logger/                             @forabi @clementallen
+/types/suncalc/                                 @horiuchi
 /types/superagent/v2/                           @varju @NicoZelaya @mxl
-/types/superagent/                              @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf
+/types/superagent/                              @NicoZelaya @mxl @paplorinc @shreyjain1994 @zopf @beeequeue
+/types/superagent-bunyan/                       @bricka
 /types/superagent-no-cache/                     @mxl
 /types/superagent-prefix/                       @mxl
 /types/supercluster/                            @DenisCarriere
+/types/superstruct/                             @edwardsnare
 /types/supertest/                               @varju
 /types/supertest-as-promised/                   @tkrotoff
 /types/supports-color/v3/                       @mgroenhoff
@@ -4042,7 +4372,9 @@
 /types/svg-injector/                            @poke
 /types/svg-parser/                              @mrmlnc
 /types/svg-path-bounding-box/                   @NotWoods
+/types/svg-path-parser/                         @tyru
 /types/svg-sprite/                              @tkqubo
+/types/svg-sprite-loader/                       @rynclark
 /types/svg2png/                                 @hansrwindhoff @sccgithub
 /types/svg4everybody/                           @BendingBender
 /types/svgjs.draggable/                         @LiFeleSs
@@ -4062,6 +4394,8 @@
 /types/swagger-sails-hook/                      @micmro
 /types/swagger-schema-official/                 @mohsen1 @bsouthga @nimerritt
 /types/swagger-tools/                           @bricka
+/types/swagger-ui-dist/                         @haowen737
+/types/swagger-ui-express/                      @dmitryrogozhny
 /types/swaggerize-express/                      @mugeso @nickmorton
 /types/swe-validation/                          @hjalmers
 /types/swfobject/                               @rou
@@ -4085,13 +4419,15 @@
 /types/tabulator/                               @euginio
 /types/tail/                                    @spacejack
 /types/tapable/v0/                              @e-cloud
-/types/tapable/                                 @e-cloud
+/types/tapable/                                 @e-cloud @johnnyreilly
 /types/tape/                                    @Bartvds @sodatea @DennisSchwartz @mikehenrty
 /types/tar/                                     @SomaticIT @connor4312
 /types/tar-fs/                                  @Umoxfo
 /types/tar-stream/                              @glicht
+/types/task-graph-runner/                       @mgroenhoff
 /types/tcp-ping/                                @stegano
-/types/tedious/                                 @rogierschouten @cjthompson
+/types/teddy/                                   @lannonbr
+/types/tedious/                                 @rogierschouten @cjthompson @v-suhame
 /types/tedious-connection-pool/                 @sandorfr
 /types/telebot/                                 @mariotsi
 /types/temp/                                    @DanielRosenwasser
@@ -4099,20 +4435,26 @@
 /types/tempfile/                                @SamVerschueren @BendingBender
 /types/tempy/                                   @douglasduteil
 /types/terminal-menu/                           @aravindarun
+/types/test-listen/                             @stephenmathieson
 /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/                           @pine613 @mohsen1
 /types/text-encoding-utf-8/                     @trxcllnt
 /types/text-table/                              @saadq
 /types/textarea-caret/                          @shiftkey
-/types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas @NotWoods @sethk
+/types/textract/                                @lal12
+/types/textversionjs/                           @aaronosher
+/types/tgfancy/                                 @Dabolus
+/types/theming/                                 @eps1lon
+/types/thepiratebay/                            @jsorrell
+/types/three/                                   @gyohk @florentpoujol @SereznoKot @omni360 @ivoisbelongtous @piranha771 @qszhusightp @nakakura @s093294 @Pro @efokschaner @PsychoSTS @dhritzkiv @apurvaojas @NotWoods @sethk @elk941 @Methuselah96
 /types/thrift/                                  @kamek-pf @kevin-greene-ck @jessezhang91
 /types/throng/                                  @cyrilschumacher @tatethurston
 /types/throttle/                                @BendingBender
-/types/throttle-debounce/                       @czbuchi
+/types/throttle-debounce/                       @czbuchi @franklixuefei
 /types/through/                                 @AndrewGaspar
 /types/through2/v0/                             @Bartvds @jedmao
 /types/through2/                                @Bartvds @jedmao @valotas @TeamworkGuy2
@@ -4124,18 +4466,24 @@
 /types/timelinejs3/                             @MikeMatusz
 /types/timer-machine/                           @dolanmiu
 /types/timezone-js/                             @bonnici
+/types/tinajs__tina/                            @Jimexist
+/types/tinajs__tina-redux/                      @Jimexist
 /types/tinder/                                  @pingec
+/types/tingle.js/                               @ajafff
 /types/tiny-slider-react/                       @screendriver
-/types/tinycolor2/                              @M-Zuber @geertjansen @nvh
+/types/tinycolor2/                              @M-Zuber @geertjansen @nvh @Ailrun
+/types/tinycon/                                 @dwaxweiler
 /types/tinycopy/                                @vvatanabe
 /types/tinymce/                                 @martinduparc @ipoul @nicohartto
 /types/titanium/                                @appcelerator @janvennemann
 /types/title/                                   @fa7ad
 /types/tldjs/                                   @geoffreak
+/types/tlds/                                    @ajshres
 /types/tmp/                                     @optical @Perlmint
 /types/to-absolute-glob/                        @ajafff
 /types/to-camel-case/                           @j-f1
 /types/to-markdown/                             @SuperPaintman
+/types/to-snake-case/                           @LogvinovLeon
 /types/to-title-case-gouch/                     @stpettersens
 /types/toastr/                                  @borisyankov
 /types/tocktimer/                               @evanshortiss
@@ -4146,6 +4494,7 @@
 /types/topojson-client/                         @denisname @ricardo-mello
 /types/topojson-simplify/                       @denisname @ricardo-mello
 /types/topojson-specification/                  @denisname
+/types/toposort/                                @danwbyrne
 /types/torrent-stream/                          @xstoudi
 /types/touch/                                   @mizunashi-mana @BendingBender
 /types/touch-events/                            @kevinb7
@@ -4162,9 +4511,12 @@
 /types/trayballoon/                             @korve
 /types/tress/                                   @sindilevich
 /types/trim/                                    @skysteve
+/types/triple-beam/                             @danwbyrne
+/types/triplesec/                               @threesquared
 /types/trunk8/                                  @niemyjski
 /types/tryer/                                   @bengry
 /types/tspromise/                               @soywiz
+/types/ttf2woff2/                               @ThomasdenH
 /types/tunnel/                                  @BendingBender
 /types/tus-js-client/                           @kevhiggins
 /types/tv4/                                     @Bartvds @psnider
@@ -4173,7 +4525,8 @@
 /types/tweezer.js/                              @praxxis
 /types/twig/                                    @soywiz @enko
 /types/twilio/                                  @nickiannone @ashleybrener
-/types/twit/                                    @Volox @lostfictions @sapphiredev
+/types/twit/                                    @Volox @sapphiredev @abraham @siwalikm @plhery
+/types/twitch-ext/                              @beheh
 /types/twitter/                                 @chitoku-k
 /types/twitter-stream-channels/                 @adrianbardan
 /types/twitter-text/                            @rhysd
@@ -4184,14 +4537,14 @@
 /types/type-is/                                 @BendingBender
 /types/type-name/                               @armorik83
 /types/typeahead/                               @igochkov @gjunge
-/types/typed.js/                                @Dona278
 /types/typedarray-pool/                         @pawsong
 /types/typeof/                                  @OpenByteDev
 /types/typescript-deferred/                     @DirtyHairy
 /types/tz-format/                               @samverschueren
 /types/ua-parser-js/                            @superduper @legendecas @MeLlamoPablo
+/types/uglify-es/                               @alan-agius4
 /types/uglify-js/v2/                            @tkrotoff
-/types/uglify-js/                               @alan-agius4 @tkrotoff
+/types/uglify-js/                               @alan-agius4 @tkrotoff @johnnyreilly
 /types/uglifycss/                               @blendsdk
 /types/uglifyjs-webpack-plugin/                 @vajkayrene
 /types/ui-grid/                                 @btesser @joeskeen @pbojanczyk
@@ -4203,12 +4556,13 @@
 /types/ultra-strftime/                          @dex4er
 /types/umbraco/                                 @DeCareSystemsIreland
 /types/umd/                                     @TeamworkGuy2
-/types/umzug/                                   @drinchev @mlamp @trodi
-/types/underscore/                              @borisyankov @jbaldwin @ccurrens @clottman
+/types/umzug/                                   @drinchev @mlamp @trodi @emmanuelgautier
+/types/underscore/                              @borisyankov @jbaldwin @ccurrens @clottman @confususs
 /types/underscore-ko/                           @MagicMau
 /types/underscore.string/                       @rygine
 /types/undertaker/                              @tkqubo @GiedriusGrabauskas
 /types/undertaker-registry/                     @GiedriusGrabauskas
+/types/unidecode/                               @vfernandestoptal
 /types/uniq/                                    @hansrwindhoff
 /types/uniqid/                                  @idchlife
 /types/unique-hash-stream/                      @BendingBender
@@ -4216,26 +4570,27 @@
 /types/unist/                                   @bizen241
 /types/unity-webapi/                            @jmvrbanac
 /types/universal-analytics/                     @Bartvds @DarkerTV
-/types/universal-router/                        @jtmthf
+/types/universal-cookie/                        @tomi
+/types/universal-router/                        @jtmthf @tlaziuk @Lodin
 /types/unorm/                                   @chbrown
 /types/untildify/                               @BendingBender
 /types/unused-filename/                         @BendingBender
 /types/unzip/                                   @coding2012
-/types/unzipper/                                @s73obrien @natemara
+/types/unzipper/                                @s73obrien @natemara @bartje321
 /types/update-notifier/v1/                      @vvakame @nchen63
 /types/update-notifier/                         @vvakame @nchen63 @bitjson
 /types/upng-js/                                 @plantain-00
 /types/uppercamelcase/                          @plantain-00
 /types/urbanairship-cordova/                    @Justin-Credible
-/types/uri-templates/                           @Bartvds
+/types/uri-templates/                           @Bartvds @barnski
 /types/urijs/                                   @RodneyJT @xt0rted @petejohanson
 /types/uritemplate/                             @teyc @rubensworks
 /types/url-assembler/                           @wolfgang42
 /types/url-join/                                @rogierschouten @devrelm
 /types/url-metadata/                            @mrkmg
 /types/url-params/                              @danielsogl
-/types/url-parse/                               @ChernenkoPaul
-/types/url-regex/                               @unindented
+/types/url-parse/                               @ChernenkoPaul @harisiva @DimitryDushkin
+/types/url-regex/                               @unindented @sosukesuzuki
 /types/url-safe-base64/                         @johngeorgewright
 /types/url-search-params/                       @nick121212 @nrathi
 /types/url-template/                            @marcinporebski
@@ -4255,17 +4610,20 @@
 /types/uuid/                                    @iamolivinius @felipeochoa @cjbarth
 /types/uuid-1345/                               @mugeso
 /types/uuid-js/                                 @mhegazy
+/types/uuid-parse/                              @screendriver
 /types/uuid-validate/                           @HiromiShikata
 /types/uws/                                     @plantain-00 @orblazer
 /types/valdr/                                   @ilbertz
 /types/valdr-message/                           @ilbertz
 /types/valerie/                                 @conficient
 /types/vali-date/                               @SamVerschueren
+/types/valiant/                                 @whatasoda
 /types/valid-url/                               @stevehipwell
 /types/validator/                               @tgfjt @chrootsu @IOAyman @louy @kacepe @deptno @builtinnya @qqilihq
 /types/validatorjs/                             @LKay @danmana
 /types/vanilla-modal/                           @samnau
 /types/vanilla-tilt/                            @BrunnerLivio
+/types/varint/                                  @dbrockman
 /types/vary/                                    @BendingBender
 /types/vast-client/                             @jgainfort
 /types/vec3/                                    @xstoudi
@@ -4275,16 +4633,18 @@
 /types/verror/                                  @svi3c @max4t
 /types/vertx3-eventbus-client/                  @oddeirik
 /types/vex-js/                                  @gdcohan
-/types/vexflow/                                 @rquiring @sebastianhaas @bohoffi
+/types/vexdb/                                   @MayorMonty
+/types/vexflow/                                 @rquiring @sebastianhaas @bohoffi @sschmidTU
 /types/vfile/                                   @bizen241 @rokt33r
 /types/vfile-location/                          @ikatyang
-/types/victory/                                 @asvetliakov @snerks @Havret
-/types/video.js/                                @vbortone @scleriot @SWBennett06 @IgelCampus @giofreitas
+/types/victory/                                 @asvetliakov @snerks @Havret @alredyExist
+/types/video.js/                                @vbortone @scleriot @SWBennett06 @IgelCampus @giofreitas @gjanblaszczyk @sroucheray @AkxeOne
 /types/viewability-helper/                      @lironzluf
 /types/viewerjs/                                @lrh3321
+/types/viewport-mercator-project/               @fnberta
 /types/viewporter/                              @borisyankov
 /types/vimeo/                                   @DazWilkin
-/types/vimeo__player/                           @denisyilmaz @timc13
+/types/vimeo__player/                           @denisyilmaz @timc13 @terrymun
 /types/vinyl/v0/                                @jedmao
 /types/vinyl/                                   @vvakame @jedmao @thorn0
 /types/vinyl-buffer/                            @tkQubo
@@ -4292,7 +4652,7 @@
 /types/vinyl-paths/                             @tkQubo
 /types/virtual-dom/                             @chbrown
 /types/virtual-keyboard/                        @bsurai
-/types/vis/                                     @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314
+/types/vis/                                     @MichaelBitard @macleodbroad-wf @adripanico @seveves @kaktus40 @mmaitre314 @supercargo @takato1314 @alex-kachura @dcop @avrahamcool
 /types/vision/v4/                               @jasonswearingen @AJamesPhillips
 /types/vision/                                  @jasonswearingen @AJamesPhillips @lenovouser
 /types/vitalsigns/                              @cyrilschumacher
@@ -4304,10 +4664,13 @@
 /types/voronoi-diagram/                         @michaelneu
 /types/vortex-web-client/                       @Pro
 /types/voximplant-websdk/                       @aylarov
+/types/vue-color/                               @me
 /types/vue-markdown/                            @neodon
 /types/vue-resource/                            @kaorun343
 /types/vue-scrollto/                            @vincekovacs
-/types/vuex-i18n/                               @jaeggerr
+/types/vue-select/                              @silh
+/types/vue2-datepicker/                         @ChristianStornowski
+/types/vuex-i18n/                               @jaeggerr @noamkfir
 /types/w2ui/                                    @Ptival
 /types/w3c-generic-sensor/                      @kenchris
 /types/w3c-image-capture/                       @cosium
@@ -4331,8 +4694,12 @@
 /types/weapp-api/                               @vargeek
 /types/web-animations-js/                       @kritollm
 /types/web-bluetooth/                           @urish
+/types/web3/                                    @simon-jentzsch @nitzantomer @zurbo @yxliang01 @phra @naddison36 @icaroharry @linusnorton @jpeletier @anneau @matrushka @andrevmatos @levino @zlumer @archangel-irk
+/types/web3-eth-abi/                            @LogvinovLeon
+/types/web3-provider-engine/                    @LogvinovLeon
 /types/webappsec-credential-management/         @iainmcgin
 /types/webassembly-js-api/                      @periklis
+/types/webassembly-web-api/                     @jhenninger
 /types/webcl/                                   @NCARalph
 /types/webcomponents.js/                        @adidahiya
 /types/webcrypto/                               @iislucas
@@ -4342,44 +4709,59 @@
 /types/webgl2/                                  @nkemnitz @karhu
 /types/webidl2/                                 @saschanaz
 /types/webmidi/                                 @lostfictions
-/types/webpack/v3/                              @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43 @christophehurpeau
-/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @ahmed-taj @alan-agius4 @elliottsj @jason0x43 @dennispg @christophehurpeau
+/types/webpack/v3/                              @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @alan-agius4 @elliottsj @jason0x43 @christophehurpeau
+/types/webpack/                                 @tkqubo @bumbleblym @bcherny @tommytroylin @mohsen1 @jcreamer898 @alan-agius4 @elliottsj @jason0x43 @dennispg @christophehurpeau @ZSkycat @johnnyreilly
+/types/webpack-assets-manifest/                 @FranklinWhale
 /types/webpack-bundle-analyzer/                 @kryops
 /types/webpack-chain/                           @eirikurn @psachs21
 /types/webpack-chunk-hash/                      @mtraynham
 /types/webpack-cleanup-plugin/                  @malj
+/types/webpack-config-utils/                    @hotell
 /types/webpack-dev-middleware/v1/               @bumbleblym @reduckted
-/types/webpack-dev-middleware/                  @bumbleblym @reduckted
-/types/webpack-dev-server/                      @maestroh @daveparslow @ZheyangSong @alan-agius4
+/types/webpack-dev-middleware/                  @bumbleblym @reduckted @chrisabrams
+/types/webpack-dev-server/                      @maestroh @daveparslow @ZheyangSong @alan-agius4 @arturovt
 /types/webpack-dotenv-plugin/                   @kryops
 /types/webpack-env/                             @use-strict @rhonsby
 /types/webpack-fail-plugin/                     @deevus
-/types/webpack-hot-middleware/                  @bumbleblym @icylace
+/types/webpack-hot-client/                      @rynclark @ZSkycat
+/types/webpack-hot-middleware/                  @bumbleblym @icylace @chrisabrams
 /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-serve/v1/                        @rynclark @Jokcy @ZSkycat
+/types/webpack-serve/                           @rynclark @Jokcy @ZSkycat
 /types/webpack-sources/                         @e-cloud @chriseppstein
 /types/webpack-stream/                          @iclanton @bumbleblym
 /types/webpack-validator/                       @deevus
+/types/webpackbar/                              @rynclark
+/types/webpagetest/                             @ksm2
 /types/webrtc/                                  @nakakura
+/types/webscopeio__react-textarea-autocomplete/ @michauzo
+/types/websequencediagrams/                     @ffflorian
+/types/website-scraper/                         @screendriver
 /types/websocket/                               @loyd @flynetworks @zhaoleimxd @jdneo
-/types/webspeechapi/                            @saschanaz
+/types/websocket-async/                         @bigbeno37
 /types/websql/                                  @TeamworkGuy2
 /types/webtorrent/                              @niieani @tlaziuk
 /types/webvr-api/                               @efokschaner
 /types/week/                                    @sindrenm
+/types/wegame-api/                              @jcyuan
 /types/weighted/                                @ccitro
-/types/weixin-app/                              @taoqf @AlexStacker
+/types/weixin-app/                              @taoqf @AlexStacker @Jimexist
 /types/wellknown/                               @yairtawil
+/types/wepy/                                    @Jimexist
+/types/wepy-redux/                              @Jimexist
 /types/whatwg-mimetype/                         @petejohanson
-/types/whatwg-streams/                          @saschanaz @ksm2
+/types/whatwg-streams/                          @saschanaz @ksm2 @MattiasBuelens
 /types/whatwg-url/                              @aomarks
 /types/wheel/                                   @BTOdell
 /types/when/                                    @derekcicerone @Nemo157
 /types/which/                                   @vvakame @cspotcode
+/types/which-pm/                                @jorgegonzalez
 /types/wicg-mediasession/                       @jucrouzet
+/types/wif/                                     @danwbyrne
 /types/wiiu/                                    @mzsm
 /types/window-or-global/                        @vvakame
 /types/window-size/                             @pmkary
@@ -4389,17 +4771,21 @@
 /types/winjs/v1/                                @adamhewitt627 @craigktreasure @xirzec
 /types/winjs/v2/                                @adamhewitt627 @craigktreasure @xirzec
 /types/winjs/                                   @adamhewitt627 @craigktreasure @xirzec
+/types/wink-tokenizer/                          @lal12
 /types/winreg/                                  @RX14 @BobBuehler
 /types/winrt-uwp/                               @saschanaz @taylor224
-/types/winston/                                 @bonnici @codeanimal @DABH
 /types/winston-dynamodb/                        @nickiannone
-/types/winston-syslog/                          @cjbarth
+/types/winston-mail/                            @idono87
+/types/winston-syslog/v1/                       @cjbarth
+/types/winston-syslog/                          @cjbarth @felix-hoc
 /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/workbox-sw/                              @wessberg
+/types/workerpool/                              @Alorel
 /types/wpapi/                                   @guoyunhe
 /types/wrap-ansi/v2/                            @kayahr
 /types/wrap-ansi/                               @kayahr
@@ -4421,7 +4807,7 @@
 /types/xdg-basedir/                             @tlaziuk
 /types/xml/                                     @YuJianrong
 /types/xml-parser/                              @mhfrantz
-/types/xml2js/                                  @michelsalib @jasonrm @ccurrens @edwardhinkle @BehindTheMath
+/types/xml2js/                                  @michelsalib @jasonrm @ccurrens @edwardhinkle @BehindTheMath @claasahl
 /types/xml2json/                                @dolanmiu
 /types/xmlbuilder/                              @wallymathieu
 /types/xmldoc/                                  @Xstoudi @ajsheehan @notlaforge
@@ -4443,15 +4829,20 @@
 /types/yargs/v8/                                @poelstra @mizunashi-mana @pushplay @jeffkenney
 /types/yargs/v10/                               @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
 /types/yargs/                                   @poelstra @mizunashi-mana @pushplay @jeffkenney @JimiC
+/types/yargs-interactive/                       @szeck87
 /types/yauzl/                                   @ffflorian
+/types/yauzl-promise/                           @dlee-nvisia
 /types/yayson/                                  @Codesleuth
 /types/yazl/                                    @taoqf
 /types/ydn-db/                                  @yathit @gabrielmaldi
 /types/yeoman-generator/                        @armorik83 @janslow @ikatyang
 /types/yeoman-test/                             @ikatyang
+/types/yesql/                                   @Sumolari
+/types/yoctodelay/                              @seangenabe
 /types/yog-bigpipe/                             @ssddi456
 /types/yog-log/                                 @ssddi456
 /types/yog2-kernel/                             @ssddi456
+/types/yoga-layout/                             @tnobody
 /types/yosay/                                   @armorik83
 /types/youtube/                                 @DazWilkin @JoshuaKGoldberg @eliotfallon213
 /types/youtube-dl/                              @bsurai
@@ -4460,18 +4851,20 @@
 /types/z-schema/                                @pgonzal
 /types/zapier-platform-core/                    @bradleyayers
 /types/zeit__next-typescript/                   @icopp
-/types/zen-observable/                          @aicest
+/types/zen-observable/                          @aicest @JounQin @itomtom
 /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 @TitaneBoy
+/types/zip-webpack-plugin/                      @blaise-io
 /types/zip.js/                                  @lgrignon
-/types/zipcodes/                                @headdetect
+/types/zipcodes/                                @headdetect @dobesv
 /types/zipkin-context-cls/                      @plantain-00
 /types/zipkin-instrumentation-express/          @plantain-00
 /types/zipkin-instrumentation-fetch/            @plantain-00
+/types/zipkin-javascript-opentracing/           @laurentgilly
 /types/zipkin-transport-http/                   @plantain-00
 /types/zmq/                                     @davemckeown
 /types/zookeeper/                               @xialeistudio
diff --git a/README.ko.md b/README.ko.md
new file mode 100644
index 0000000000..224967a9dc
--- /dev/null
+++ b/README.ko.md
@@ -0,0 +1,338 @@
+# DefinitelyTyped [![Build Status](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped.svg?branch=master)](https://travis-ci.org/DefinitelyTyped/DefinitelyTyped)
+
+[![깃터(https://gitter.im/borisyankov/DefinitelyTyped)에서 대화에 참여해보세요](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/borisyankov/DefinitelyTyped?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
+> 이 저장소는 고품질의 타입스크립트(TypeScript) 자료형 정의(Type definition)를 위한 저장소입니다.
+
+이 문서가 가장 최신 내용을 담고있긴 하지만, [공식 사이트(definitelytyped.org)](http://definitelytyped.org)도 확인해보시면 좋습니다.
+
+## 선언 파일(Declaration file)이 뭔가요?
+
+[타입스크립트 안내서(TypeScript handbook)](http://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html)를 읽어보세요.
+
+## 선언 파일(Declaration file)을 어떻게 받을 수 있나요??
+
+### npm 사용하기
+
+아래 방법은 타입스크립트(TypeScript) 2.0+ 이상의 버전을 사용하는 사람들만 사용할 수 있는 방법이기는 합니다만, 이 방법을 사용하기를 장려합니다.
+
+```sh
+npm install --save-dev @types/node
+```
+
+`node` 를 위한 자료형(Typing)이 컴파일 과정에 자동으로 포함될 겁니다.
+더 자세한 내용은 [안내서(Handbook)](http://www.typescriptlang.org/docs/handbook/declaration-files/consumption.html)에서 확인해보실 수 있습니다.
+
+NPM 의 "foo" 패키지에 대응되는 자료형 패키지는 "@types/foo" 입니다.
+원하시는 패키지를 찾을 수 없는 경우, [타입서치(TypeSearch)](https://microsoft.github.io/TypeSearch/) 사이트에서 한 번 찾아보세요.
+
+타입서치(TypeSearch)에서도 찾을 수 없는 경우, 찾고 있는 패키지가 자료형(Typing)을
+[함께 제공](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html)하고 있지는 않은지 확인해보세요.
+패키지에 포함된 자료형(Typing)은 주로 `package.json` 파일의 `"types"` 나 `"typings"` 필드(Field)를 통해 제공되지만,
+`/// <reference path="" />` 같은 주석을 사용하여 패키지 안의 ".d.ts" 파일들을 직접 가져와야 할 수도 있습니다.
+
+
+### 그 외의 방법들
+
+타입스크립트(TypeScript) 1.0 버전에서 사용할 수 있는 방법은 다음과 같습니다.
+
+* [Typings](https://github.com/typings/typings) 을 사용하기
+* ~~[NuGet](http://nuget.org/packages?q=DefinitelyTyped) 을 사용하기~~ (다른 방법을 사용해주세요. NuGet 은 더 이상 DT 자료형(Typing)을 제공하지 않습니다.)
+* 이 저장소의 `master` 브랜치를 직접 내려받기
+
+위 방법을 사용할 경우 수동으로 [참조(Reference)](http://www.typescriptlang.org/docs/handbook/triple-slash-directives.html)를 추가해주어야 할 수 있습니다.
+
+
+## 어떻게 이곳에 기여할 수 있나요?
+
+여러분과 같은 많은 기여자들의 도움 덕분에 이 저장소가 돌아가고 있습니다. 감사합니다.
+
+### 테스트
+
+여러분이 만든 자료형 선언(Type declation)을 세상에 공유하기에 앞서, 여러분이 스스로 여러분의 자료형 선언(Type declation)을 사용하고 확인해주세요.
+
+#### 이미 존재하는 자료형 패키지를 임시로 수정하기
+
+이미 존재하는 패키지의 자료형 선언(Type declaration)에 새로운 기능을 추가하려면 [모듈 증강(module augmentation)](http://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation)를 사용할 수 있습니다.
+물론 `node_modules/@types/foo/index.d.ts` 를 직접 수정하실 수도 있으며, 이 파일을 복사한 다음 아래의 과정을 따라하실 수도 있습니다.
+
+
+#### 새 자료형 패키지를 임시로 추가하기
+
+사용하고 계신 `tsconfig.json` 에 다음 내용을 추가해주세요.
+
+```json
+"baseUrl": "types",
+"typeRoots": ["types"],
+```
+
+(`types` 대신 `src/types` 을 사용하실 수도 있습니다.)
+그리고 "foo" 모듈(Module)에 대한 선언(Declaration)을 포함하는 `types/foo/index.d.ts` 파일을 만들어주세요.
+이제 코드 안에서 여러분의 새 자료형 선언(Type declaration)을 사용하는 `"foo"` 모듈(Module)을 임포트(Import)하실 수 있을 겁니다.
+코드를 컴파일하고 실행시켜서 여러분의 자료형(Typing)이 실행 중에 실제로 벌어지는 일과 잘 맞아떨어지는지 확인해주세요.
+실제 코드를 통한 확인이 끝나면, [풀 리퀘스트(Pull request)](#풀-리퀘스트pull-request-만들기)를 만들어주세요.
+[이미 존재하는 패키지를 수정](#이미-존재하는-패키지를-수정하기)하거나 [새 패키지를 만들기](#새-패키지-만들기)위한 과정들을 따라하시면 됩니다.
+
+
+### 풀 리퀘스트(Pull request) 만들기
+
+여러분의 자료형 선언이 잘 작동하는지 확인하셨다면, DefinitelyTyped 에 공유해주세요.
+
+우선, 이 저장소를 [포크(fork)](https://guides.github.com/activities/forking/)해 주시고, [node](https://nodejs.org/) 를 설치하신 뒤, `npm install` 명령을 실행해주세요.
+
+
+#### 이미 존재하는 패키지를 수정하기
+
+* `cd types/my-package-to-edit` 명령을 실행합니다.
+* 자료형(Typing) 파일들을 수정합니다. 테스트를 추가하는 것도 잊지마세요!
+  만약 브레이킹 체인지(Breaking change)를 만드셨다면, [메이저 버전(major version)](#i-want-to-update-a-package-to-a-new-major-version)을 꼭 올려주세요.
+* 패키지 머릿주석의 "Definitions by" 부분에 여러분의 이름을 추가하실 수도 있습니다.
+  - 이름을 추가하시면 다른 사람들이 그 패키지에 대한 풀 리퀘스트(Pull request)나 이슈(Issue)를 만들 때 여러분에게 알람이 갑니다.
+  - `// Definitions by: Alice <https://github.com/alice>, Bob <https://github.com/bob>` 와 같이 여러분의 이름을 줄의 맨 마지막에 추가할 수 있습니다.
+  - 사람이 너무 많을 경우엔, 다음과 같이 여러 줄로 쓰실 수도 있습니다.
+  ```typescript
+  // Definitions by: Alice <https://github.com/alice>
+  //                 Bob <https://github.com/bob>
+  //                 Steve <https://github.com/steve>
+  //                 John <https://github.com/john>
+  ```
+* `tslint.json` 파일이 있는 경우에는, `npm run lint package-name` 명령을 실행시키고 결과를 확인해주세요. 그렇지 않은 경우에는, 해당 패키지가 있는 디렉토리 안에서 `tsc` 명령을 실행시키고 결과를 확인해주세요.
+
+이미 존재하는 패키지에 대한 풀 리퀘스트(Pull request)를 만들었을 경우에는, `dt-bot` 이 이전 저자들을 자동으로 호출하는지 확인해주세요.
+그렇지 않은 경우에는, 여러분이 직접 풀 리퀘스트(Pull request)와 관계있는 사람들을 호출할 수도 있습니다.
+
+
+#### 새 패키지를 만들기
+
+만약 라이브러리를 만드는 중이고 라이브러리가 타입스크립트(TypeScript)로 쓰여있다면, DefinitelyTyped 에 선언(Declaration)을 올리는 대신 패키지에 [자동생성된 선언(Declaration) 파일을 포함](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html)시킬 수 있습니다.
+
+NPM 패키지를 위한 자료형(Typing) 패키지를 만드시려면, 패키지의 이름과 같은 이름의 디렉토리를 만들어주세요.
+NPM 에 올라가 있지 않은 패키지를 위한 자료형(Typing) 패키지를 만드시려면, 그 패키지가 NPM 에 올라와 있는 패키지와 이름이 겹치지 않는지 확인해주세요.
+(`npm info foo` 명령어를 사용하여 `foo` 패키지가 NPM 에 있는지 확인할 수 있습니다.)
+
+새 자료형 패키지는 다음과 같은 구조로 구성되어있어야만 합니다.
+
+| 파일 이름 | 용도 |
+| --- | --- |
+| index.d.ts | 패키지를 위한 자료형(Typing)을 포함하는 파일입니다. |
+| foo-tests.ts | 자료형(Typing)의 테스트를 위한 파일입니다. 이 파일의 코드는 실행되지는 않지만, 자료형 검사(Type checking)를 통과해야 합니다. |
+| tsconfig.json | `tsc` 명령을 돌릴 수 있게 해주는 파일입니다. |
+| tslint.json | 린터(Linter)를 사용할 수 있게 해주는 파일입니다. |
+
+이 파일들은, npm ≥ 5.2.0 에서는 `npx dts-gen --dt --name my-package-name --template module` 명령으로,
+그 이하 경우에는 `npm install -g dts-gen` 와 `dts-gen --dt --name my-package-name --template module` 명령으로 만들 수 있습니다.
+`dts-gen` 의 모든 옵션(Option)을 보고싶으시면 [dts-gen](https://github.com/Microsoft/dts-gen) 저장소를 확인해주세요.
+
+자료형(Typing) 패키지에 새 파일을 추가하거나, `async` 키워드를 사용하기 위해 `"target"` 을 `"es6"` 로 설정하거나, `"lib"` 를 추가하거나, `jsx` 지원을 추가하기 위해서 `tsconfig.json` 파일을 변경해야 할 수도 있습니다.
+
+DefinitelyTyped 의 관리자들이 주기적으로 새로운 풀 리퀘스트(Pull request)들을 확인하기는 하지만,
+다른 풀 리퀘스트(Pull request)가 많을 경우 확인이 느려질 수 있다는 걸 알아주세요.
+
+[base64-js](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/base64-js) 패키지는 좋은 예시 중 하나입니다.
+
+
+#### 많이 저지르는 실수들
+
+* 우선, [안내서(Handbook)](http://www.typescriptlang.org/docs/handbook/declaration-files/do-s-and-don-ts.html)에 나와있는 내용들을 따라주세요.
+* 코드에서는 모든 곳에서 탭(Tab)을 사용하거나, 항상 4 개의 띄어쓰기를 사용해주세요.
+* `function sum(nums: number[]): number`의 경우, 만약 함수가 인자를 변경하지 않는다면 `ReadonlyArray` 를 사용해주세요.
+* `interface Foo { new(): Foo; }`의 경우,
+    이런 선언은 이 형(Type)을 가진 객체(Object)에 `new` 를 사용할 수 있도록 만듭니다. 많은 경우 여러분은 `declare class Foo { constructor(); }` 를 사용하려는 것일 겁니다.
+* `const Class: { new(): IClass; }`의 경우,
+    `new` 를 사용할 수 있는 상수를 만드는 대신, `class Class { constructor(); }` 와 같이 클래스 선언(Class declaration)을 사용하는 게 더 좋습니다.
+* `getMeAT<T>(): T`의 경우,
+    만일 자료형 매개변수(Type parameter)가 함수의 매개변수에 등장하지 않는다면, 그런 제너릭(Generic) 함수를 사용할 필요가 없습니다.
+    그 제너릭(Generic) 함수는 단순히 자료형 단언(Type assertion)을 위장시킨 것뿐입니다. 이 경우 `getMeAT() as number` 와 같이 진짜 자료형 단언(Type assertion) 을 사용하는 게 더 좋습니다.
+    다음은 괜찮은 제너릭(Generic)의 예시입니다. `function id<T>(value: T): T;`.
+    다음은 문제가 있는 제너릭(Generic)의 예시입니다. `function parseJson<T>(json: string): T;`.
+    예외적으로, `new Map<string, number>()` 와 같은 경우는 괜찮습니다.
+* `Function` 이나 `Object` 와 같은 형(Type)을 사용하는 것은 대부분의 경우 문제를 일으킵니다. 99% 의 경우 더 구체적인 형(Type)을 사용하는게 가능합니다. [함수(Function)](http://www.typescriptlang.org/docs/handbook/functions.html#function-types) 를 위해서는 `(x: number) => number` 와 같은, 객체를 위해서는 `{ x: number, y: number }` 와 같은 형(Type)들을 사용할 수 있습니다. 형(Type)에 대한 정보가 전혀 없을 경우에는, `Object` 형(Type)이 아니라 [`any`](http://www.typescriptlang.org/docs/handbook/basic-types.html#any) 형(Type)을 사용해야 합니다. 만일 어떤 형(Type)이 객체라는 사실만 알고 있는 경우, `Object` 나 `{ [key: string]: any }` 가 아니라 [`object`](https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-2.html#object-type) 를 사용해주세요.
+* `var foo: string | any`의 경우,
+    `any` 가 합 자료형(Union type)의 안에서 사용될 경우, 결과 형(Type)은 언제나 `any` 가 됩니다. 따라서 형(Type)의 `string` 부분이 유용해 보인다 하더라도, 사실은 자료형 검사(Type checking)의 측면에서 `any` 와 다른 것이 없습니다.
+    대신, `any`, `string`, 나 `string | object` 중 하나를 필요에 맞게 골라서 사용해주세요.
+
+
+#### 패키지 삭제하기
+
+패키지가 스스로의 형(Type)을 [포함](http://www.typescriptlang.org/docs/handbook/declaration-files/publishing.html)하게 되면, DefinitelyTyped 에 있는 자료형(Typing) 패키지를 삭제하는 것이 좋습니다.
+
+`npm run not-needed -- typingsPackageName asOfVersion sourceRepoURL [libraryName]` 명령어를 사용하여 자료형(Typing) 패키지를 삭제할 수 있습니다.
+- `typingsPackageName` 는 삭제할 디렉토리의 이름입니다.
+- `asOfVersion`  는 새 스텁(Stub) 용 `@types/foo` 를 퍼블리시(Publish)할 버전입니다. 이 버전은 현재 NPM 에 올라간 버전보다 더 높은 버전이어야 합니다.
+- `sourceRepoURL` 는 자료형(Typing)을 포함하게 된 저장소의 주소입니다.
+- `libraryName` 는 패키지의 이름을 읽기 쉽게 쓴 것입니다. 즉, "angular2" 대신에 "Angular 2" 와 같이 쓰는 것이 좋습니다. (생략했을 경우에는 "typingsPackageName" 와 같은 것으로 취급됩니다.)
+
+DefinitelyTyped 의 다른 패키지들이 삭제된 자료형(Typing) 패키지를 사용하고 있을 경우, 형(Type)을 포함하기 시작한 원래 패키지를 사용하도록 수정해야합니다. 삭제된 자료형(Typing) 패키지를 사용하는 각 DefinitelyTyped 패키지들의 `package.json` 파일에 `"dependencies": { "foo": "x.y.z" }` 를 추가해주시면 됩니다.
+
+DefinitelyTyped 에 한 번도 올라온 적 없는 패키지가 형(Type)을 포함하게 되었다면, `notNeededPackages.json` 파일에 추가할 필요도 없습니다.
+
+
+#### 린트(Lint)하기
+
+자료형(Typing) 패키지를 린트(Lint)하려면, 패키지 디렉토리에 `{ "extends": "dtslint/dt.json" }` 를 포함하고 있는 `tslint.json` 파일을 추가해주시면 됩니다. 모든 새 패키지는 해당 파일을 가지고 있어야 합니다.
+고쳐야 하지만 아직 고쳐지지 않은 린트(Lint) 결과가 있을 때에만 `tslint.json` 에서 린트 규칙(Lint rule)을 사용하지 않도록 설정할 수 있습니다. 예를 들어,
+
+```js
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // 이 패키지는 Function 형을 사용하고 있으며, 고치는 게 쉽지 않다.
+        "ban-types": false
+    }
+}
+```
+
+(린트 규칙(Lint rule)이 절대로 적용되서는 안되는 경우에는, `// tslint:disable rule-name` 나 `//tslint:disable-next-line rule-name` 를 사용하는 것이 좋습니다. 후자가 더 나은 방식입니다.)
+
+어떤 표현식(Expression)이 특정한 형(Type)을 가진다고 단언(Assert)하고 싶을 때에는 `$ExpectType` 를 사용하시면 됩니다. 어떤 표현식(Expression)이 컴파일에 실패해야하는 경우에는 `$ExpectError` 를 하시면 됩니다.
+
+```js
+// $ExpectType void
+f(1);
+
+// $ExpectError
+f("one");
+```
+
+[dtslint](https://github.com/Microsoft/dtslint#write-tests) 저장소의 README 파일에서 더 자세한 내용을 확인하실 수 있습니다.
+
+이런 테스트들은 `npm run lint package-name` 명령으로 실행해볼 수 있습니다. 이 때, `package-name` 은 테스트하고 싶은 패키지의 이름입니다.
+테스트 스크립트는 [dtslint](https://github.com/Microsoft/dtslint) 를 사용하고 있습니다.
+
+
+## 자주 하는 질문들
+
+#### 이 저장소와 `@types` 패키지들이 대체 무슨 관계가 있는 건가요?
+
+`master` 브랜치(Branch)의 내용들이 [types-publisher](https://github.com/Microsoft/types-publisher) 를 사용해 자동으로 `@types` 퍼블리시(Publish)됩니다.
+
+#### 풀 리퀘스트(Pull request)를 제출했습니다. 이게 합쳐질 때까지 얼마나 걸리나요?
+
+상황에 따라 다르지만, 대부분의 풀 리퀘스트(Pull request)들은 일주일 안에 합쳐집니다. 머릿주석에 있는 저자 중 한명에 의해 승인된 풀 리퀘스트(Pull request)는 보통 더 빨리 합쳐집니다. 새로운 패키지에 대한 풀 리퀘스트(Pull request)는 관리자의 세세한 코드 리뷰를 필요로 하기 때문에 더 오래 걸리는 경우가 많습니다. 각 PR 들은 합쳐지기 전에 TypeScript or DefinitelyTyped 팀 구성원의 코드 리뷰를 받아야 하며, 이는 사람이 하는 일이기 때문에 느려질 수도 있으니 양해를 바랍니다. [풀 리퀘스트 번다운 보드(PR Burndown Board)](https://github.com/DefinitelyTyped/DefinitelyTyped/projects/3?card_filter_query=is%3Aopen)에서 열린 풀 리퀘스트에 대한 관리자들의 진행도를 확인하실 수 있습니다.
+
+#### 내 풀 리퀘스트(Pull request)는 합쳐졌습니다. 언제 NPM 에 `@types` 패키지가 갱신되나요?
+
+NPM 의 패키지들은 수시간 안에 갱신될 겁니다. 만약 24 시간이 지나도 갱신되지 않으면, 문제를 파악하기 위해 @RyanCavanaugh 나 @andy-ms 를 풀 리퀘스트(Pull request)에서 호출해주세요.
+
+#### 다른 자료형 정의(Type definition)에 의존하는 자료형 정의(Type definition)을 만들고 있습니다. `<reference types="" />` 와 임포트(import) 중 무엇을 사용해야하나요?
+
+외부 모듈(`export` 를 사용하는 모듈)을 사용할 경우, 임포트(import)를 사용해주세요.
+환경과 관련된 모듈(ambient module)(`declare module` 를 쓰거나 전역 변수들을 선언한 모듈)을 사용할 경우, `<reference types="" />` 를 사용해주세요.
+
+#### `package.json` 파일이 가끔 보이던데?
+
+일반적으로는 `package.json` 파일을 사용할 필요가 없습니다. 패키지가 퍼블리시(Publish)될 때 패키지를 위한 `package.json` 파일은 자동으로 생성됩니다.
+가끔 보이는 `package.json` 파일은 의존하는 것들을 표시하기 위해 사용됩니다. [예시](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/pikaday/package.json)를 한 번 보세요.
+의존성을 제외한 다른 필드(Field)들, 그러니까 `"description"` 같은 것들은 사용해서는 안됩니다.
+옛날 `@types` 패키지를 사용하고 싶으실 경우에도 `"dependencies": { "@types/foo": "x.y.z" }` 와 같은 내용을 `package.json` 파일에 넣으셔야 합니다.
+
+#### 어떤 패키지들에 `tslint.json` 이 없거나, `tsconfig.json` 에 `"noImplicitAny": true`, `"noImplicitThis": true`, 나 `"strictNullChecks": true` 가 없어요.
+
+그럼 그 패키지들이 잘못된 겁니다. 고쳐서 풀 리퀘스트(Pull request)를 제출해주시면 고맙겠습니다.
+
+#### 자료형 정의(Type definition)을 요청할 수 있나요?
+
+이미 요청된 자료형 정의(Type definition)들을 [여기서](https://github.com/DefinitelyTyped/DefinitelyTyped/labels/Definition%3ARequest) 보실 수 있습니다.
+
+#### DOM 을 위한 자료형 정의(Type definitions)는요?
+
+웹 표준(Web standard)과 관련이 있는 자료형(Typing)들은 [TSJS-lib-generator](https://github.com/Microsoft/TSJS-lib-generator) 저장소에 기여해서 고치실 수 있습니다. 고쳐진 자료형(Typing)은 `lib.dom.d.ts` 파일에 포함될 겁니다.
+
+#### 어떤 패키지가 `export =` 를 쓰고 있는데, 저는 디폴트 임포트(Default import)가 더 좋습니다. `export =` 를 `export default` 로 바꿔도 되나요?
+
+타입스크립트(TypeScript) 2.7 이상을 사용하고 계시면 프로젝트 안에서 `--esModuleInterop` 를 사용해주세요.
+그 이하의 경우, 디폴트 임포트(Default import)가 동작하는 환경(Webpack, SystemJS, esm)에서 작업 중이시면 [`--allowSyntheticDefaultImports`](http://www.typescriptlang.org/docs/handbook/compiler-options.html) 를 사용하는 걸 고려해보세요.
+자료형 정의(Type definition)가 맞는 경우에는 자료형 정의(Type definition)을 수정하지 마세요.
+NPM 패키지의 경우, `node -p 'require("foo")'` 가 원하는 값이라면 `export =` 이 맞고, `node -p 'require("foo").default'` 이 원하는 값이라면 `export default` 이 맞습니다.
+
+#### 자료형 선언(Type declaration)에서 타입스크립트(TypeScript) 2.1 이상의 기능을 사용하고 싶습니다.
+
+정의(Definition) 머릿주석(`// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped`) 뒤에 `// TypeScript Version: 2.1` 를 추가해주시면 됩니다.
+
+#### 타입스크립트(TypeScript)에 기본으로 포함되지 않은 DOM API 를 추가하고 싶어요.
+
+[TSJS-Lib-Generator](https://github.com/Microsoft/TSJS-lib-generator#readme) 저장소가 관련되어있을 가능성이 있습니다. 해당 저장소의 안내를 따라주세요.
+해당 표준이 아직 초안인 상태라면, 이 저장소와 관련된 일입니다.
+`dom-` 으로 시작하는 패키지를 만드신 뒤, "Project" 머릿주석 부분에 해당 표준의 링크를 써 주세요.
+다만 표준이 초안을 벗어나면 DefinitelyTyped 에서 삭제되고 `@types` 패키지가 지원이 중단된(Deprecated) 것으로 표시될 수도 있습니다.
+
+#### 패키지를 새 메이저 버전(major version)에 맞게 갱신하고 싶어요.
+
+옛날 버전도 계속해서 수정할 예정이라면, 이전 버전에 해당하는 새 디렉토리(예를 들어 `2.` 버전을 위해서는 `v2`)를 만들고 현재 파일들을 그 디렉토리로 옮겨야 합니다. 새 디렉토리로 옮긴 뒤에는
+
+1. `tsconfig.json` 와 `tslint.json` 에 포함된 상대경로들을 수정해주어야 합니다.
+2. 경로 대응 규칙(Path mapping rule)을 추가하여 테스트가 올바른 버전을 검사하도록 해야합니다.
+
+예를 들어, [history 패키지의 2 버전의 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/history/v2/tsconfig.json) 파일은 다음과 같이 생겼습니다.
+
+```json
+{
+    "compilerOptions": {
+        "baseUrl": "../../",
+        "typeRoots": ["../../"],
+        "paths": {
+            "history": [ "history/v2" ]
+        },
+    },
+    "files": [
+        "index.d.ts",
+        "history-tests.ts"
+    ]
+}
+```
+
+수정 중인 패키지에 의존하는 DefinitelyTyped 의 다른 패키지들이 새 버전과 호환되지 않을 경우, 그 패키지들에도 옛날 버전으로의 경로 대응 규칙(Path mapping rule)을 추가해주어야 합니다. 수정 중인 패키지에 의존하는 패키지에 의존하는 패키지들에도 똑같은 작업을 해 주셔야 합니다.
+
+예를 들어, `react-router` 패키지는 `history@2` 패키지에 의존하고 있기 때문에, [react-router 패키지의 `tsconfig.json`](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router/tsconfig.json) 파일이 `"history": [ "history/v2" ]` 와 같은 경로 대응 규칙(Path mapping rule)을 가지고 있는 걸 볼 수 있습니다.
+이어서 (`react-router` 패키지에 의존하는 패키지인) `react-router-bootstrap` 또한 [tsconfig.json](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/react-router-bootstrap/tsconfig.json) 파일 안에 경로 대응 규칙(Path mapping rule)을 가지고 있는 것을 보실 수 있습니다.
+
+`/// <reference types=".." />` 에서는 경로 대응 규칙(Path mapping rule)이 동작하지 않기 때문에, DefinitelyTyped 패키지로에 의존할 때에는 임포트(import) 를 사용해야 합니다.
+
+#### 전역적으로도 모듈로도 사용될 수 있는 패키지의 자료형 선언(Type declaration)은 어떻게 쓰나요?
+
+타입스크립트 안내서(TypeScript Handbook)은 [선언(Declaration)을 쓰는 방법에 대한 전반적인 정보](https://www.typescriptlang.org/docs/handbook/declaration-files/introduction.html)와 [예시들](https://www.typescriptlang.org/docs/handbook/declaration-files/templates/global-modifying-module-d-ts.html)을 포함하고 있습니다. 이 내용에는 ES6 식의 모듈 문법을 사용할 수 있는 자료형 선언(Type declaration)을 만드는 방법과 객체를 전역에서 사용할 수 있도록 하는 방법이 포함되어 있습니다. [big.js 패키지의 자료형 선언(Type declaration)](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/big.js/index.d.ts)이 실례입니다. 이 패키지는 웹 페이지의 스크립트 태그를 사용해 불러올 수 있으며, 또한 ES6 식의 임포트(Import) 구문을 사용해서 불러올 수도 있습니다.
+
+여러분의 패키지가 임포트(Import) 구문을 사용했을 때와 전역적으로 불렀을 때를 테스트 해보고 싶다면, `test` 디렉토리를 추가하고 `YourLibraryName-global.test.ts` 그리고 `YourLibraryName-module.test.ts` 라는 이름으로 테스트 파일 두 개를 추가해주세요. **전역(Global)** 테스트 파일은 웹 페이지에서 전역적으로 사용될 때를 테스트하는 파일입니다. 이 파일에서는 임포트(Import) 구문을 사용하지 않아야 합니다. **모듈(Module)** 테스트 파일은 임포트(Import) 구문을 사용할 때를 테스트 하는 파일입니다. 만약 여러분의 `tsconfig.json` 파일이 `files` 필드(Field)를 가지고 있다면, 이 필드(Field)는 반드시 두 테스트 파일을 모두 포함해야 합니다. [이 방식을 사용하는 실례](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/big.js/test) 또한 big.js 패키지의 자료형 선언(Type declaration)에서 확인해보실 수 있습니다.
+
+각각의 테스트 파일에 모든 상황을 테스트할 필요는 없다는 걸 잊지마세요. 전역 테스트 파일에서는 전역적으로 사용될 때만 테스트하고, 모듈 테스트 파일에서 나머지 상황들을 모두 테스트 할 수 있으며, 그 반대의 경우도 괜찮습니다.
+
+#### 지역 패키지(Scoped package)의 경우는 어떻게 하죠?
+
+`@foo/bar` 패키지와 같은 지역 패키지(Scoped package)를 위한 자료형 패키지(Type package)는 `types/foo__bar` 디렉토리에 추가하면 됩니다. 밑줄 문자가 두 번 있는 것에 주의하세요.
+
+지역 패키지(Scoped package)를 위한 자료형 패키지(Type package)를 생성하기 위해 `dts-gen` 를 사용한 경우에는,
+다음과 같이 생성된 `tsconfig.json` 안에 지역 패키지(Scoped package)를 위한 적절한 경로 대응 규칙(Path mapping rule)을 추가해주어야 합니다.
+
+```json
+{
+    "paths":{
+      "@foo/bar": ["foo__bar"]
+    }
+}
+```
+
+
+#### 깃헙(GitHub)이 보여주는 파일 히스토리(History)가 불완전해요.
+
+깃헙은 이름이 바뀐 파일의 히스토리(History)를 [지원하지 않습니다](http://stackoverflow.com/questions/5646174/how-to-make-github-follow-directory-history-after-renames). 대신 [`git log --follow`](https://www.git-scm.com/docs/git-log) 명령을 사용하세요.
+
+#### ES6 에서 사용하는 임포트(Import)를 사용하기 위해 모듈을 익스포트(Export)하지 않는 패키지들에 빈 이름공간을 추가해야 하나요?
+
+[chai-http](https://github.com/chaijs/chai-http) 패키지와 같은 몇몇 패키지들은 함수를 익스포트(Export)합니다.
+
+이런 패키지들을 `import * as foo from "foo";` 와 같이 임포트(Import)하면 다음과 같은 오류가 발생합니다.
+
+> error TS2497: Module 'foo' resolves to a non-module entity and cannot be imported using this construct
+
+이 오류는 함수의 이름과 똑같은 빈 이름공간(Namespace)을 정의해서 없앨 수 있으나, 좋은 방법은 아닙니다.
+[스택오버플로(Stack Overflow)의 이 질문의 답변](https://stackoverflow.com/questions/39415661/what-does-resolves-to-a-non-module-entity-and-cannot-be-imported-using-this)이 이 문제와 관련되어 자주 언급됩니다.
+
+`import foo = require("foo");` 를 사용하여 모듈을 임포트(Import)하거나, 환경에서 ES6 모듈 변환(Module interop)을 지원한다면 `--allowSyntheticDefaultImports` 와 함께 `import foo from "foo";` 같은 디폴트 임포트(Default import)를 사용하는 것이 더 나은 방법입니다.
+
+## 라이센스
+
+이 프로젝트는 MIT license 가 적용되어 있습니다.
+
+각 자료형 정의(Type definition) 파일들의 저작권은 각 기여자들에게 있으며, 기여자들은 해당 자료형 정의(Type definition) 파일들의 맨 위에 나열되어 있습니다.
+
+[![Analytics](https://ga-beacon.appspot.com/UA-47495295-4/borisyankov/DefinitelyTyped)](https://github.com/igrigorik/ga-beacon)
diff --git a/README.md b/README.md
index 8e582f05b4..9a31d73da1 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,7 @@
 
 Also see the [definitelytyped.org](http://definitelytyped.org) website, although information in this README is more up-to-date.
 
-*[You can also read this README in Spanish!](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.es.md)*
+*You can also read this README in [Spanish](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.es.md) and [Korean!](https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/README.ko.md)*
 
 ## What are declaration files?
 
@@ -54,7 +54,7 @@ Before you share your improvement with the world, use it yourself.
 
 #### Test editing an existing package
 
-To add new features you can use [module augmentation](http://www.typescriptlang.org/docs/handbook/declaration-merging.html).
+To add new features you can use [module augmentation](http://www.typescriptlang.org/docs/handbook/declaration-merging.html#module-augmentation).
 You can also directly edit the types in `node_modules/@types/foo/index.d.ts`, or copy them from there and follow the steps below.
 
 
diff --git a/notNeededPackages.json b/notNeededPackages.json
index f3dc9ef37f..f3f09c0f7b 100644
--- a/notNeededPackages.json
+++ b/notNeededPackages.json
@@ -156,12 +156,6 @@
             "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",
@@ -396,6 +390,12 @@
             "sourceRepoURL": "https://github.com/MikeMcl/decimal.js",
             "asOfVersion": "7.4.0"
         },
+        {
+            "libraryName": "delay",
+            "typingsPackageName": "delay",
+            "sourceRepoURL": "https://github.com/sindresorhus/delay",
+            "asOfVersion": "3.1.0"
+        },
         {
             "libraryName": "DevExtreme",
             "typingsPackageName": "devextreme",
@@ -570,6 +570,12 @@
             "sourceRepoURL": "https://github.com/acdlite/flux-standard-action",
             "asOfVersion": "1.1.0"
         },
+        {
+            "libraryName": "fork-ts-checker-webpack-plugin",
+            "typingsPackageName": "fork-ts-checker-webpack-plugin",
+            "sourceRepoURL": "https://github.com/Realytics/fork-ts-checker-webpack-plugin",
+            "asOfVersion": "0.4.5"
+        },
         {
             "libraryName": "Foundation Sites",
             "typingsPackageName": "foundation-sites",
@@ -678,6 +684,12 @@
             "sourceRepoURL": "https://github.com/facebook/immutable-js",
             "asOfVersion": "3.8.7"
         },
+        {
+            "libraryName": "interactjs",
+            "typingsPackageName": "interact.js",
+            "sourceRepoURL": "https://github.com/taye/interact.js",
+            "asOfVersion": "1.3.0"
+        },
         {
             "libraryName": "inversify",
             "typingsPackageName": "inversify",
@@ -1140,6 +1152,24 @@
             "sourceRepoURL": "https://github.com/gpbl/react-day-picker",
             "asOfVersion": "5.3.0"
         },
+        {
+            "libraryName": "react-dnd",
+            "typingsPackageName": "react-dnd",
+            "sourceRepoURL": "https://github.com/react-dnd/react-dnd",
+            "asOfVersion": "3.0.2"
+        },
+        {
+            "libraryName": "react-dnd-html5-backend",
+            "typingsPackageName": "react-dnd-html5-backend",
+            "sourceRepoURL": "https://github.com/react-dnd/react-dnd",
+            "asOfVersion": "3.0.2"
+        },
+        {
+            "libraryName": "react-dnd-test-backend",
+            "typingsPackageName": "react-dnd-test-backend",
+            "sourceRepoURL": "https://github.com/react-dnd/react-dnd",
+            "asOfVersion": "3.0.2"
+        },
         {
             "libraryName": "react-flip-move",
             "typingsPackageName": "react-flip-move",
@@ -1194,12 +1224,24 @@
             "sourceRepoURL": "https://github.com/react-native-community/react-native-modal",
             "asOfVersion": "4.1.1"
         },
+        {
+            "libraryName": "react-native-navigation",
+            "typingsPackageName": "react-native-navigation",
+            "sourceRepoURL": "https://github.com/wix/react-native-navigation",
+            "asOfVersion": "2.0.0"
+        },
         {
             "libraryName": "react-split-pane",
             "typingsPackageName": "react-split-pane",
             "sourceRepoURL": "https://github.com/tomkp/react-split-pane",
             "asOfVersion": "0.1.67"
         },
+        {
+            "libraryName": "react-svg",
+            "typingsPackageName": "react-svg",
+            "sourceRepoURL": "https://github.com/tanem/react-svg",
+            "asOfVersion": "5.0.0"
+        },
         {
             "libraryName": "realm",
             "typingsPackageName": "realm",
@@ -1219,7 +1261,7 @@
             "asOfVersion": "0.1.5"
         },
         {
-            "libraryName": "react-bootstrap",
+            "libraryName": "redux-bootstrap",
             "typingsPackageName": "redux-bootstrap",
             "sourceRepoURL": "https://github.com/remojansen/redux-bootstrap",
             "asOfVersion": "1.1.0"
@@ -1494,6 +1536,12 @@
             "sourceRepoURL": "https://github.com/samchon/tstl",
             "asOfVersion": "1.5.7"
         },
+        {
+            "libraryName": "typed.js",
+            "typingsPackageName": "typed.js",
+            "sourceRepoURL": "https://github.com/mattboldt/typed.js",
+            "asOfVersion": "2.0.9"
+        },
         {
             "libraryName": "TypeScript",
             "typingsPackageName": "typescript",
@@ -1584,6 +1632,12 @@
             "sourceRepoURL": "http://webix.com",
             "asOfVersion": "5.1.1"
         },
+        {
+            "libraryName": "winston",
+            "typingsPackageName": "winston",
+            "sourceRepoURL": "https://github.com/winstonjs/winston.git",
+            "asOfVersion": "2.4.4"
+        },
         {
             "libraryName": "wolfy87-eventemitter",
             "typingsPackageName": "wolfy87-eventemitter",
diff --git a/package.json b/package.json
index c5b1b03057..09fe064d48 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "private": true,
     "name": "definitely-typed",
-    "version": "0.0.2",
+    "version": "0.0.3",
     "homepage": "https://github.com/DefinitelyTyped/DefinitelyTyped",
     "repository": {
         "type": "git",
diff --git a/types/abstract-leveldown/abstract-leveldown-tests.ts b/types/abstract-leveldown/abstract-leveldown-tests.ts
new file mode 100644
index 0000000000..c5edadf069
--- /dev/null
+++ b/types/abstract-leveldown/abstract-leveldown-tests.ts
@@ -0,0 +1,13 @@
+import { AbstractLevelDOWN } from 'abstract-leveldown';
+
+const test = (levelDown: AbstractLevelDOWN<any, string>) => {
+  levelDown.put("key", "value", (err?) => { });
+  levelDown.put(1, "value", { something: true }, (err?) => { });
+
+  levelDown.get("key", (err?) => { });
+  levelDown.get(1, { something: true }, (err?) => { });
+};
+// $ExpectType void
+test(new AbstractLevelDOWN('here'));
+// $ExpectType void
+test(AbstractLevelDOWN('there'));
diff --git a/types/abstract-leveldown/index.d.ts b/types/abstract-leveldown/index.d.ts
new file mode 100644
index 0000000000..2caf073432
--- /dev/null
+++ b/types/abstract-leveldown/index.d.ts
@@ -0,0 +1,103 @@
+// Type definitions for abstract-leveldown 5.0
+// Project: https://github.com/Level/abstract-leveldown
+// Definitions by: Meirion Hughes <https://github.com/MeirionHughes>
+//                 Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface AbstractOptions {
+  readonly [k: string]: any;
+}
+
+export type ErrorCallback = (err: Error | undefined) => void;
+export type ErrorValueCallback<V> = (err: Error | undefined, value: V) => void;
+export type ErrorKeyValueCallback<K, V> = (err: Error | undefined, key: K, value: V) => void;
+
+export interface AbstractOpenOptions extends AbstractOptions {
+  createIfMissing?: boolean;
+  errorIfExists?: boolean;
+}
+
+export interface AbstractGetOptions extends AbstractOptions {
+  asBuffer?: boolean;
+}
+
+export interface AbstractLevelDOWN<K, V> extends AbstractOptions {
+  open(cb: ErrorCallback): void;
+  open(options: AbstractOpenOptions, cb: ErrorCallback): void;
+
+  close(cb: ErrorCallback): void;
+
+  get(key: K, cb: ErrorValueCallback<V>): void;
+  get(key: K, options: AbstractGetOptions, cb: ErrorValueCallback<V>): void;
+
+  put(key: K, value: V, cb: ErrorCallback): void;
+  put(key: K, value: V, options: AbstractOptions, cb: ErrorCallback): void;
+
+  del(key: K, cb: ErrorCallback): void;
+  del(key: K, options: AbstractOptions, cb: ErrorCallback): void;
+
+  batch(): AbstractChainedBatch<K, V>;
+  batch(array: ReadonlyArray<AbstractBatch<K, V>>, cb: ErrorCallback): AbstractChainedBatch<K, V>;
+  batch(array: ReadonlyArray<AbstractBatch<K, V>>, options: AbstractOptions, cb: ErrorCallback): AbstractChainedBatch<K, V>;
+
+  iterator(options?: AbstractIteratorOptions<K>): AbstractIterator<K, V>;
+}
+
+export interface AbstractLevelDOWNConstructor {
+  new (location: string): AbstractLevelDOWN<any, any>;
+  (location: string): AbstractLevelDOWN<any, any>;
+}
+
+export interface AbstractIteratorOptions<K> extends AbstractOptions {
+  gt?: K;
+  gte?: K;
+  lt?: K;
+  lte?: K;
+  reverse?: boolean;
+  limit?: number;
+  keys?: boolean;
+  values?: boolean;
+  keyAsBuffer?: boolean;
+  valueAsBuffer?: boolean;
+}
+
+export type AbstractBatch<K, V> = PutBatch<K, V> | DelBatch<K, V>;
+
+export interface PutBatch<K, V> {
+  readonly type: 'put';
+  readonly key: K;
+  readonly value: V;
+}
+
+export interface DelBatch<K, V> {
+  readonly type: 'del';
+  readonly key: K;
+}
+
+export interface AbstractChainedBatch<K, V> extends AbstractChainedBatchConstructor, AbstractOptions {
+  put: (key: K, value: V) => this;
+  del: (key: K) => this;
+  clear: () => this;
+  write(cb: ErrorCallback): any;
+  write(options: any, cb: ErrorCallback): any;
+}
+
+export interface AbstractChainedBatchConstructor {
+  new(db: any): AbstractChainedBatch<any, any>;
+  (db: any): AbstractChainedBatch<any, any>;
+}
+
+export interface AbstractIterator<K, V> extends AbstractChainedBatchConstructor {
+  db: AbstractLevelDOWN<K, V>;
+  next(cb: ErrorKeyValueCallback<K, V>): this;
+  end(cb: ErrorCallback): void;
+}
+
+export interface AbstractIteratorConstructor {
+  new(db: any): AbstractIterator<any, any>;
+  (db: any): AbstractIterator<any, any>;
+}
+
+export const AbstractLevelDOWN: AbstractLevelDOWNConstructor;
+export const AbstractIterator: AbstractIteratorConstructor;
+export const AbstractChainedBatch: AbstractChainedBatchConstructor;
diff --git a/types/meteor-univserse-i18n/tsconfig.json b/types/abstract-leveldown/tsconfig.json
similarity index 91%
rename from types/meteor-univserse-i18n/tsconfig.json
rename to types/abstract-leveldown/tsconfig.json
index 7beab3bd30..286b867f00 100644
--- a/types/meteor-univserse-i18n/tsconfig.json
+++ b/types/abstract-leveldown/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "meteor-univserse-i18n-tests.ts"
+        "abstract-leveldown-tests.ts"
     ]
 }
diff --git a/types/abstract-leveldown/tslint.json b/types/abstract-leveldown/tslint.json
new file mode 100644
index 0000000000..256ee54775
--- /dev/null
+++ b/types/abstract-leveldown/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json" 
+}
diff --git a/types/ace/index.d.ts b/types/ace/index.d.ts
index 828aab87c2..7faa5da4f8 100644
--- a/types/ace/index.d.ts
+++ b/types/ace/index.d.ts
@@ -832,8 +832,9 @@ declare namespace AceAjax {
 
         /**
          * [Sets the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.setScrollLeft}
+         * @param scrollLeft The new scroll left value
         **/
-        setScrollLeft(): void;
+        setScrollLeft(scrollLeft: number): void;
 
         /**
          * [Returns the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.getScrollLeft}
diff --git a/types/ace/test/edit_session.ts b/types/ace/test/edit_session.ts
index 4713495f7a..29b3bb6bd8 100644
--- a/types/ace/test/edit_session.ts
+++ b/types/ace/test/edit_session.ts
@@ -18,6 +18,23 @@ function createFoldTestSession() {
     return session;
 }
 
+function createScrollTestRenderer(): AceAjax.VirtualRenderer | null {
+    var el = document.createElement("div");
+
+    if (!el.getBoundingClientRect) {
+        console.log("Skipping test: This test only runs in the browser");
+        return null;
+    }
+
+    el.style.left = "20px";
+    el.style.top = "30px";
+    el.style.width = "300px";
+    el.style.height = "100px";
+    document.body.appendChild(el);
+
+    return new AceAjax.VirtualRenderer(el);
+}
+
 function assertArray(a, b) {
     assert.equal(a + "", b + "");
     assert.ok(a.length == b.length);
@@ -915,5 +932,25 @@ const aceEditSessionTests = {
         session = new AceAjax.EditSession(new Array(30).join("\n"));
         session.documentToScreenPosition(2, 0);
         session.documentToScreenPosition(2, 0);
+    },
+
+    "test setScrollTop()": function() {
+        var renderer = createScrollTestRenderer();
+        var session = new AceAjax.EditSession(["1", "2", "3", "2", "3", "4"]);
+        renderer.setSession(session);
+        assert.equal(renderer.getScrollTop(), 0);
+        session.setScrollTop(40);
+        assert.equal(renderer.getScrollTop(), 40);
+        renderer.getScrollTop()
+    },
+
+    "test setScrollLeft()": function() {
+        var renderer = createScrollTestRenderer();
+        var session = new AceAjax.EditSession(["1", "2", "3", "2", "3", "4"]);
+        renderer.setSession(session);
+        assert.equal(renderer.getScrollLeft(), 0);
+        session.setScrollLeft(40);
+        assert.equal(renderer.getScrollLeft(), 40);
+        renderer.getScrollLeft()
     }
-};
\ No newline at end of file
+};
diff --git a/types/acl/index.d.ts b/types/acl/index.d.ts
index 43de3f5369..3f4df31aa2 100644
--- a/types/acl/index.d.ts
+++ b/types/acl/index.d.ts
@@ -2,9 +2,8 @@
 // Project: https://github.com/optimalbits/node_acl
 // Definitions by: Qubo <https://github.com/tkQubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
-/// <reference types="bluebird" />
 /// <reference types="node"/>
 /// <reference types="express"/>
 
diff --git a/types/activedirectory2/activedirectory2-tests.ts b/types/activedirectory2/activedirectory2-tests.ts
new file mode 100644
index 0000000000..662109e746
--- /dev/null
+++ b/types/activedirectory2/activedirectory2-tests.ts
@@ -0,0 +1,14 @@
+import ActiveDirectory = require("activedirectory2");
+
+const ad = new ActiveDirectory({
+    url: 'ldap://192.168.199.10',
+    baseDN: 'OU=MyUsers,DC=mydomain,DC=com',
+    username: 'service-user@mydomain.com',
+    password: 'xxxxx000pw'
+});
+
+ad.authenticate("test@mydomain.com", "yyyy111pw", (err, authed) => {
+    console.log("hello");
+    console.log(err);
+    console.log(authed);
+});
diff --git a/types/activedirectory2/index.d.ts b/types/activedirectory2/index.d.ts
new file mode 100644
index 0000000000..f963ae32ba
--- /dev/null
+++ b/types/activedirectory2/index.d.ts
@@ -0,0 +1,151 @@
+// Type definitions for activedirectory2 1.2
+// Project: https://github.com/jsumners/node-activedirectory#readme
+// Definitions by: pas <https://github.com/pasthelod>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+
+import { Filter } from "ldapjs";
+
+interface ADProperties {
+    url: string;
+    baseDN: string;
+    username: string;
+    password: string;
+    pageSize?: 1000;
+    entryParser?: (entry: object, raw: string, cb: (entry: object) => void) => void;
+    referrals?: {
+        enabled: false,
+        exclude: [
+            'ldaps?://ForestDnsZones\\..*/.*',
+            'ldaps?://DomainDnsZones\\..*/.*',
+            'ldaps?://.*/CN=Configuration,.*'
+        ]
+    };
+    attributes?: {
+        user: [
+            'dn', 'distinguishedName',
+            'userPrincipalName', 'sAMAccountName', 'mail',
+            'lockoutTime', 'whenCreated', 'pwdLastSet', 'userAccountControl',
+            'employeeID', 'sn', 'givenName', 'initials', 'cn', 'displayName',
+            'comment', 'description'
+        ],
+        group: [
+            'dn', 'cn', 'description', 'distinguishedName', 'objectCategory'
+        ]
+    };
+}
+
+interface LDAPjsReqProps {
+    url: string;
+    tlsOptions: {
+        host?: string;
+        key?: string;
+        cert?: string;
+        ca?: string;
+        rejectUnauthorized: boolean;
+    };
+    socketPath?: string;
+    log?: any;
+    timeout?: number;
+    idleTimeout?: number;
+    connectionTimeout?: number;
+    strictDN?: boolean;
+}
+
+type MembershipType = 'all'|'user'|'group';
+
+interface ReqProps extends LDAPjsReqProps {
+    baseDN?: string;
+    bindDN?: string;
+    bindCredentials?: string;
+    scope?: 'base' | 'one' | 'sub';
+    filter: string | Filter;
+    attributes: AttributeSpec;
+    sizeLimit: 0;
+    timeLimit: 10;
+    includeMembership: MembershipType[];
+}
+
+interface AttributeSpec {
+    user: UserAttributes[];
+    group: GroupAttributes[];
+}
+
+type GroupAttributes =
+    | 'distinguishedName'
+    | 'objectCategory'
+    | 'cn'
+    | 'description';
+
+type UserAttributes =
+    | 'distinguishedName'
+    | 'userPrincipalName'
+    | 'sAMAccountName'
+    | 'mail'
+    | 'lockoutTime'
+    | 'whenCreated'
+    | 'pwdLastSet'
+    | 'userAccountControl'
+    | 'employeeID'
+    | 'sn'
+    | 'givenName'
+    | 'initials'
+    | 'cn'
+    | 'displayName'
+    | 'comment'
+    | 'description';
+
+interface FindResult {
+    groups: object[];
+    users: object[];
+    other: object[];
+}
+
+declare class ActiveDirectory {
+    constructor(props: ADProperties);
+    authenticate(
+        username: string,
+        password: string,
+        callback: (err: string, authenticated: boolean) => void
+    ): void;
+    isUserMemberOf(
+        opts: ReqProps,
+        username: string,
+        groupName: string,
+        callback: (err: object, res: boolean) => void
+    ): void;
+    find(
+        opts: string | ReqProps,
+        callback: (err: object, results: FindResult) => void
+    ): void;
+    findDeletedObjects(
+        opts: string | ReqProps,
+        callback: (err: object, results: object[]) => void
+    ): void;
+    findUser(
+        opts: string | ReqProps,
+        username: string,
+        callback: (err: object, user: object) => void
+    ): void;
+    findUsers(
+        opts: string | ReqProps,
+        callback: (err: object, users: object[]) => void
+    ): void;
+    findGroup(
+        opts: string | ReqProps,
+        groupName: string,
+        callback: (err: object, group: object) => void
+    ): void;
+    findGroups(
+        opts: string | ReqProps,
+        groupName: string,
+        callback: (err: object, groups: object[]) => void
+    ): void;
+    getRootDSE(
+        url: string,
+        attributes: string[],
+        callback: (err: object, result: object) => void
+    ): void;
+}
+
+export = ActiveDirectory;
diff --git a/types/activedirectory2/tsconfig.json b/types/activedirectory2/tsconfig.json
new file mode 100644
index 0000000000..57a68150ac
--- /dev/null
+++ b/types/activedirectory2/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "files": [
+        "index.d.ts",
+        "activedirectory2-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "es2015.iterable"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/fork-ts-checker-webpack-plugin/tslint.json b/types/activedirectory2/tslint.json
similarity index 100%
rename from types/fork-ts-checker-webpack-plugin/tslint.json
rename to types/activedirectory2/tslint.json
diff --git a/types/activex-excel/activex-excel-tests.ts b/types/activex-excel/activex-excel-tests.ts
index 4f6fab3aa1..505fcacfef 100644
--- a/types/activex-excel/activex-excel-tests.ts
+++ b/types/activex-excel/activex-excel-tests.ts
@@ -16,6 +16,17 @@ const inCollection = <T = any>(collection: { Item(index: any): T }, index: strin
     return item;
 };
 
+{
+    let app1: Excel.Application | null = new ActiveXObject('Excel.Application');
+    app1.Visible = true;
+    const book1 = app1.Workbooks.Add();
+
+    app1.Quit();
+    app1 = null;
+
+    WScript.Quit();
+}
+
 const app = new ActiveXObject('Excel.Application');
 
 // create a workbook -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/create-a-workbook
@@ -27,7 +38,7 @@ newBook.SaveAs('allsales.xls');
 // create or replace a worksheet -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/create-or-replace-a-worksheet
 const newOrExistingWorksheet = () => {
     const mySheetName = 'Sheet4';
-    let mySheet = inCollection(newBook.Worksheets, mySheetName) as Excel.Worksheet | undefined;
+    let mySheet = inCollection<Excel.Worksheet>(newBook.Worksheets, mySheetName);
     if (!mySheet) {
         WScript.Echo(`The sheet named "${mySheetName} doesn't exist, but will be created.`);
         mySheet = app.Worksheets.Add() as Excel.Worksheet;
@@ -37,7 +48,7 @@ const newOrExistingWorksheet = () => {
 const replaceWorksheet = () => {
     const mySheetName = 'Sheet4';
     app.DisplayAlerts = false;
-    let mySheet = inCollection<Excel.Worksheet | Excel.Chart | Excel.DialogSheet>(app.Worksheets, mySheetName);
+    let mySheet = inCollection<Excel.Worksheet>(app.Worksheets, mySheetName);
     if (mySheet) { mySheet.Delete(); }
     app.DisplayAlerts = true;
     mySheet = app.Worksheets.Add() as Excel.Worksheet;
@@ -46,9 +57,7 @@ const replaceWorksheet = () => {
 };
 
 // referencing multiple sheets -- https://msdn.microsoft.com/VBA/Excel-VBA/articles/sheets-object-excel
-const moveMultipleSheets = () => {
-    app.Worksheets.Item(toSafeArray<string | number>(1, 'Sheet2')).Move(4);
-};
+const moveMultipleSheets = () => app.Worksheets(toSafeArray<string | number>(1, 'Sheet2')).Move(4);
 
 // sort worksheets alphanumerically by name -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/sort-worksheets-alphanumerically-by-name
 const sortSheetsTabName = () => {
@@ -56,9 +65,9 @@ const sortSheetsTabName = () => {
     const sheets = app.ActiveWorkbook.Sheets;
     const sheetCount = sheets.Count;
     for (let i = 0; i < sheetCount; i += 1) {
-        const sheetI = sheets.Item(i);
+        const sheetI = sheets(i);
         for (let j = i; j < sheetCount; j += 1) {
-            const sheetJ = sheets.Item(j);
+            const sheetJ = sheets(j);
             if (sheetJ.Name < sheetI.Name) { sheetJ.Move(sheetI); }
         }
     }
@@ -68,7 +77,7 @@ const sortSheetsTabName = () => {
 // fill a value down into blank cells in a column -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/fill-a-value-down-into-blank-cells-in-a-column
 const fillCellsFromAbove = () => {
     app.ScreenUpdating = false;
-    const columnA = app.Columns.Item(1);
+    const columnA = app.Columns(1);
     try {
         columnA.SpecialCells(Excel.XlCellType.xlCellTypeBlanks).Formula = '=R[-1]C';
         columnA.Value = columnA.Value;
@@ -78,7 +87,7 @@ const fillCellsFromAbove = () => {
 
 // hide and unhide columns -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/hide-and-unhide-columns
 const setColumnVisibility = (visible: boolean) => {
-    const book = app.Workbooks.Item(1);
+    const book = app.Workbooks(1);
     const sheet = inCollection<Excel.Worksheet | Excel.Chart | Excel.DialogSheet>(book.Worksheets, 'Sheet1');
     if (!sheet) { return; }
 
@@ -97,7 +106,7 @@ const setColumnVisibility = (visible: boolean) => {
 };
 
 // highlighting the active cell, row, or column -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/highlight-the-active-cell-row-or-column
-(() => {
+{
     const wks = app.ActiveSheet as Excel.Worksheet;
 
     // highlight active cell
@@ -120,10 +129,10 @@ const setColumnVisibility = (visible: boolean) => {
         prm.Target.EntireColumn.Interior.ColorIndex = 8;
         app.ScreenUpdating = true;
     });
-})();
+}
 
 // referencing cells -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/reference-cells-and-ranges
-(() => {
+{
     const wks = app.ActiveSheet as Excel.Worksheet;
 
     // all the cells on a worksheet
@@ -141,20 +150,19 @@ const setColumnVisibility = (visible: boolean) => {
     wks.Range('A:A,C:C,F:F').Font.Bold = true;
 
     // using index numbers
-    wks.Cells.Item(6, 1).Value2 = 10;
-    // Value is also a property with parameters
-    ActiveXObject.set(wks.Cells.Item(6, 1), 'Value', 10);
+    wks.Cells(6, 1).Value2 = 10;
+    wks.Cells(6, 1).Value = 10;
 
     // iterating through cells using index numbers
     for (let counter = 1; counter < 20; counter += 1) {
-        ActiveXObject.set(wks.Cells.Item(counter, 1), 'Value', 10);
+        wks.Cells(counter, 1).Value = 10;
     }
 
     // relative to other cells
-    wks.Cells.Item(1, 1).Font.Underline = Excel.XlUnderlineStyle.xlUnderlineStyleDouble;
+    wks.Cells(1, 1).Font.Underline = Excel.XlUnderlineStyle.xlUnderlineStyleDouble;
 
     // using a Range object
-    const rng = wks.Cells.Item('A1:D5');
+    const rng = wks.Cells('A1:D5');
     rng.Formula = '=RAND()';
     rng.Font.Bold = true;
 
@@ -166,23 +174,22 @@ const setColumnVisibility = (visible: boolean) => {
 
     // refer to multiple ranges using Areas
     WScript.Echo(union.Areas.Count);
-})();
+}
 
 // looping through a range of cells -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/looping-through-a-range-of-cells
-(() => {
+{
     const wks = app.ActiveSheet as Excel.Worksheet;
 
     // using for
     for (let x = 1; x < 20; x++) {
-        const currentCell = wks.Cells.Item(x, 1);
-        if (Math.abs(currentCell.Value()) < 0.01) {
-            // because Value is typed as a method on the Excel.Range class, we have to treat it as a setter with parameters
-            ActiveXObject.set(currentCell, 'Value', 0);
+        const currentCell = wks.Cells(x, 1);
+        if (Math.abs(currentCell.Value) < 0.01) {
+            currentCell.Value = 0;
         }
     }
 
     // using Enumerator
-    let enumerator = new Enumerator(wks.Cells.Item('A1:D10'));
+    let enumerator = new Enumerator(wks.Cells('A1:D10'));
     enumerator.moveFirst();
     while (!enumerator.atEnd()) {
         const currentCell = enumerator.item();
@@ -202,11 +209,11 @@ const setColumnVisibility = (visible: boolean) => {
         }
         enumerator.moveNext();
     }
-})();
+}
 
 // using selection -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/selecting-and-activating-cells
-(() => {
-    const wks = app.ActiveWorkbook.Worksheets.Item(1) as Excel.Worksheet;
+{
+    const wks = app.ActiveWorkbook.Worksheets(1);
 
     // make a worksheet the active worksheet; otherwise code which uses the selection will fail
     wks.Select();
@@ -219,24 +226,24 @@ const setColumnVisibility = (visible: boolean) => {
     wks.Range("B1").Activate();
 
     // working with 3-D ranges -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/working-with-3-d-ranges
-    app.Sheets.Item(toSafeArray("Sheet2", "Sheet3", "Sheet4")).Select();
+    app.Sheets(toSafeArray("Sheet2", "Sheet3", "Sheet4")).Select();
     app.Range("A1:H1").Select();
-    (app.Selection as Excel.Range).Borders.Item(Excel.XlBordersIndex.xlEdgeBottom).LineStyle = Excel.XlLineStyle.xlDouble;
+    (app.Selection as Excel.Range).Borders(Excel.XlBordersIndex.xlEdgeBottom).LineStyle = Excel.XlLineStyle.xlDouble;
 
     // alternatively, use FillAcrossSheets to fill formatting and data across sheets
     const book = app.ActiveWorkbook;
-    const wks2 = book.Sheets.Item("Sheet2") as Excel.Worksheet;
+    const wks2 = book.Worksheets("Sheet2");
     const rng = wks2.Range("A1:H1");
-    rng.Borders.Item(Excel.XlBordersIndex.xlEdgeBottom).LineStyle = Excel.XlLineStyle.xlDouble;
+    rng.Borders(Excel.XlBordersIndex.xlEdgeBottom).LineStyle = Excel.XlLineStyle.xlDouble;
     book.Sheets.FillAcrossSheets(rng);
-})();
+}
 
 // prevent duplicate entry -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/prevent-duplicate-entries-in-a-range
-(() => {
-    const book = app.Workbooks.Item(1);
+{
+    const book = app.Workbooks(1);
 
     ActiveXObject.on(book, 'SheetChange', ['Sh', 'Target'], function(this, prm) {
-        const EvalRange = this.ActiveSheet.Range("A1:B20");
+        const EvalRange = (this.ActiveSheet as Excel.Worksheet).Range("A1:B20");
 
         // If the cell where the value was entered is not in the defined range, if the value pasted is larger than a single cell, or if no value was entered in the cell, then exit the macro
         if (
@@ -253,10 +260,11 @@ const setColumnVisibility = (visible: boolean) => {
             return;
         }
 
+        // const enumerator = new Enumerator<Excel.Worksheet | Excel.Chart | Excel.DialogSheet>(book.Worksheets);
         const enumerator = new Enumerator(book.Worksheets);
         enumerator.moveFirst();
         while (!enumerator.atEnd()) {
-            const wks = enumerator.item() as Excel.Worksheet;
+            const wks = enumerator.item();
             if (wks.Name === prm.Target.Name) { continue; }
 
             // If the value entered already exists in the defined range on the current worksheet, undo the entry.
@@ -267,14 +275,14 @@ const setColumnVisibility = (visible: boolean) => {
             app.EnableEvents = true;
         }
     });
-})();
+}
 
 // add a unique list of values to a combobox -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/add-a-unique-list-of-values-to-a-combo-box
-(() => {
-    (() => {
+{
+    {
         // using the AdvancedFilter property
         const book = app.ThisWorkbook;
-        const sheet = book.Worksheets.Item("Sheet1") as Excel.Worksheet;
+        const sheet = book.Worksheets("Sheet1");
         const dataRange = sheet.Range('A1', sheet.Range("A100").End(Excel.XlDirection.xlUp));
         dataRange.AdvancedFilter(Excel.XlFilterAction.xlFilterCopy, undefined, sheet.Range('L1'), true);
         const data = sheet.Range("L2", sheet.Range('L100').End(Excel.XlDirection.xlUp)).Value() as SafeArray;
@@ -284,15 +292,17 @@ const setColumnVisibility = (visible: boolean) => {
         combobox.Clear();
         ActiveXObject.set(combobox, 'List', [], data);
         combobox.ListIndex = -1;
-    })();
+    }
 
-    (() => {
+    {
         // using a Dictionary
-        const sheet = app.ThisWorkbook.Sheets.Item('Sheet2') as Excel.Worksheet;
+        const sheet = app.ThisWorkbook.Sheets('Sheet2') as Excel.Worksheet;
         const data = sheet.Range('A2', sheet.Range('A100').End(Excel.XlDirection.xlUp)).Value2 as SafeArray;
         const arr = new VBArray(data).toArray();
         const dict = new ActiveXObject('Scripting.Dictionary');
-        arr.forEach(x => ActiveXObject.set(dict, 'Item', [x], true));
+        for (const x of arr) {
+            ActiveXObject.set(dict, 'Item', [x], true);
+        }
 
         const combobox = sheet.OLEObjects('ComboBox1').Object as MSForms.ComboBox;
         combobox.Clear();
@@ -307,21 +317,28 @@ const setColumnVisibility = (visible: boolean) => {
 
         // alternatively, make a JS array out of the keys, and iterate using forEach
         // new VBArray(dict.Keys()).toArray().forEach(x => combobox.AddItem(x));
-    })();
-})();
-
-// animating a sparkline -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/animate-a-sparkline
-(() => {
-    const wks = app.ActiveSheet as Excel.Worksheet;
-    const oSparkGroup = wks.Cells.SparklineGroups.Item(1);
-
-    // Set the data source to the first year of data
-    oSparkGroup.ModifySourceData('B2:M4');
-
-    // Loop through the data points for the subsequent two years
-    for (let i = 1; i <= 24; i++) {
-        // Move the reference for the sparkline group over one cell
-        oSparkGroup.ModifySourceData(wks.Range(oSparkGroup.SourceData).Offset(0, 1).Address());
-        WScript.Sleep(1000);
     }
-})();
+
+    // animating a sparkline -- https://msdn.microsoft.com/en-us/vba/excel-vba/articles/animate-a-sparkline
+    {
+        const wks = app.ActiveSheet as Excel.Worksheet;
+        const oSparkGroup = wks.Cells.SparklineGroups(1);
+
+        // Set the data source to the first year of data
+        oSparkGroup.ModifySourceData('B2:M4');
+
+        // Loop through the data points for the subsequent two years
+        for (let i = 1; i <= 24; i++) {
+            // Move the reference for the sparkline group over one cell
+            oSparkGroup.ModifySourceData(wks.Range(oSparkGroup.SourceData).Offset(0, 1).Address());
+            WScript.Sleep(1000);
+        }
+    }
+
+    {
+        const formats = new VBArray(app.ClipboardFormats).toArray();
+        for (const format of formats) {
+            WScript.Echo(format);
+        }
+    }
+}
diff --git a/types/activex-excel/index.d.ts b/types/activex-excel/index.d.ts
index c55bfe1c42..6243d25e05 100644
--- a/types/activex-excel/index.d.ts
+++ b/types/activex-excel/index.d.ts
@@ -2,14 +2,52 @@
 // Project: https://msdn.microsoft.com/en-us/library/fp179694.aspx
 // Definitions by: Zev Spitz <https://github.com/zspitz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="activex-office" />
 /// <reference types="activex-vbide" />
 /// <reference types="activex-stdole" />
+/// <reference types="activex-adodb" />
+/// <reference types="activex-dao" />
 
 declare namespace Excel {
-    // tslint:disable-next-line:no-const-enum
+    type AddSheetResult<T> =
+        T extends XlSheetType.xlDialogSheet ? DialogSheet :
+        T extends XlSheetType.xlChart ? Chart :
+        T extends XlSheetType ? Worksheet :
+        T extends undefined ? Sheet :
+        never;
+
+    type InternationalResult<T> =
+        T extends XlApplicationInternationalStrings ? string :
+        T extends XlApplicationInternationalNumbers ? number :
+        T extends XlApplicationInternationalBooleans ? boolean :
+        any;
+
+    type LineStyle = XlLineStyle | Constants.xlGray25 | Constants.xlGray50 | Constants.xlGray75 | Constants.xlAutomatic;
+
+    type HorizontalAlignments = Constants.xlCenter | Constants.xlDistributed | Constants.xlJustify | Constants.xlLeft | Constants.xlRight;
+
+    type VerticalAlignments = Constants.xlBottom | Constants.xlCenter | Constants.xlDistributed | Constants.xlJustify | Constants.xlTop;
+
+    type PivotTableWizardSourceData<TSourceType> =
+        TSourceType extends XlPivotTableSourceType.xlExternal ? SafeArray<string> :
+        TSourceType extends XlPivotTableSourceType ? Range | SafeArray<Range> | string :
+        TSourceType extends undefined ? undefined :
+        never;
+
+    type PivotTableWizardAutoPage<TSourceType> =
+        TSourceType extends XlPivotTableSourceType.xlConsolidation ? boolean :
+        undefined;
+
+    type PrintToFileName<T> =
+        T extends true ? string :
+        undefined;
+
+    type Sheet = Worksheet | Chart | DialogSheet;
+
+    type SheetView = WorksheetView | DialogSheetView;
+
     const enum Constants {
         xl3DBar = -4099,
         xl3DEffects1 = 13,
@@ -180,7 +218,48 @@ declare namespace Excel {
         xlWorksheetShort = 5,
     }
 
-    // tslint:disable-next-line:no-const-enum
+    const enum FunctionCategory {
+        Commands = 10,
+        Customizing = 11,
+        Database = 6,
+        DateAndTime = 2,
+        DDEAndExternal = 13,
+        Financial = 1,
+        Information = 9,
+        Logical = 8,
+        LookupAndReference = 5,
+        MacroControl = 12,
+        MathAndTrig = 3,
+        Statistical = 4,
+        Text = 7,
+        UserDefined = 14,
+    }
+
+    const enum InputBoxReturnType {
+        Formula = 0,
+        Number = 1,
+        String = 2,
+        Boolean = 4,
+        Range = 8,
+        ErrorValue = 16,
+        SafeArray = 64,
+    }
+
+    const enum PivotFieldSubtotal {
+        Automatic = 1,
+        Average = 4,
+        Count = 3,
+        CountNums = 8,
+        Max = 5,
+        Min = 6,
+        Product = 7,
+        StdDev = 9,
+        StdDevp = 10,
+        Sum = 2,
+        Var = 11,
+        Varp = 12
+    }
+
     const enum XlAboveBelow {
         xlAboveAverage = 0,
         xlAboveStdDev = 4,
@@ -190,7 +269,6 @@ declare namespace Excel {
         xlEqualBelowAverage = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlActionType {
         xlActionTypeDrillthrough = 256,
         xlActionTypeReport = 128,
@@ -198,80 +276,82 @@ declare namespace Excel {
         xlActionTypeUrl = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAllocation {
         xlAutomaticAllocation = 2,
         xlManualAllocation = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAllocationMethod {
         xlEqualAllocation = 1,
         xlWeightedAllocation = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAllocationValue {
         xlAllocateIncrement = 2,
         xlAllocateValue = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
-    const enum XlApplicationInternational {
-        xl24HourClock = 33,
-        xl4DigitYears = 43,
+    const enum XlApplicationInternationalStrings {
         xlAlternateArraySeparator = 16,
         xlColumnSeparator = 14,
-        xlCountryCode = 1,
-        xlCountrySetting = 2,
-        xlCurrencyBefore = 37,
         xlCurrencyCode = 25,
-        xlCurrencyDigits = 27,
-        xlCurrencyLeadingZeros = 40,
-        xlCurrencyMinusSign = 38,
-        xlCurrencyNegative = 28,
-        xlCurrencySpaceBefore = 36,
-        xlCurrencyTrailingZeros = 39,
-        xlDateOrder = 32,
-        xlDateSeparator = 17,
-        xlDayCode = 21,
-        xlDayLeadingZero = 42,
         xlDecimalSeparator = 3,
         xlGeneralFormatName = 26,
-        xlHourCode = 22,
         xlLeftBrace = 12,
         xlLeftBracket = 10,
         xlListSeparator = 5,
         xlLowerCaseColumnLetter = 9,
         xlLowerCaseRowLetter = 8,
-        xlMDY = 44,
-        xlMetric = 35,
-        xlMinuteCode = 23,
-        xlMonthCode = 20,
-        xlMonthLeadingZero = 41,
-        xlMonthNameChars = 30,
-        xlNoncurrencyDigits = 29,
-        xlNonEnglishFunctions = 34,
         xlRightBrace = 13,
         xlRightBracket = 11,
+        xlUpperCaseColumnLetter = 7,
+        xlUpperCaseRowLetter = 6,
+        xlDateSeparator = 17,
+        xlDayCode = 21,
+        xlHourCode = 22,
+        xlMinuteCode = 23,
+        xlMonthCode = 20,
         xlRowSeparator = 15,
         xlSecondCode = 24,
         xlThousandsSeparator = 4,
-        xlTimeLeadingZero = 45,
         xlTimeSeparator = 18,
-        xlUpperCaseColumnLetter = 7,
-        xlUpperCaseRowLetter = 6,
-        xlWeekdayNameChars = 31,
         xlYearCode = 19,
     }
 
-    // tslint:disable-next-line:no-const-enum
+    const enum XlApplicationInternationalNumbers {
+        xlCountryCode = 1,
+        xlCountrySetting = 2,
+        xlCurrencyDigits = 27,
+        xlCurrencyNegative = 28,
+        xlNoncurrencyDigits = 29,
+        xlDateOrder = 32,
+        xlMonthNameChars = 30,
+        xlWeekdayNameChars = 31,
+    }
+
+    const enum XlApplicationInternationalBooleans {
+        xl24HourClock = 33,
+        xl4DigitYears = 43,
+        xlCurrencyBefore = 37,
+        xlCurrencyLeadingZeros = 40,
+        xlCurrencyMinusSign = 38,
+        xlCurrencySpaceBefore = 36,
+        xlCurrencyTrailingZeros = 39,
+        xlDayLeadingZero = 42,
+        xlMDY = 44,
+        xlMetric = 35,
+        xlMonthLeadingZero = 41,
+        xlNonEnglishFunctions = 34,
+        xlTimeLeadingZero = 45,
+    }
+
+    type XlApplicationInternational = XlApplicationInternationalStrings | XlApplicationInternationalNumbers | XlApplicationInternationalBooleans;
+
     const enum XlApplyNamesOrder {
         xlColumnThenRow = 2,
         xlRowThenColumn = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlArabicModes {
         xlArabicBothStrict = 3,
         xlArabicNone = 0,
@@ -279,7 +359,6 @@ declare namespace Excel {
         xlArabicStrictFinalYaa = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlArrangeStyle {
         xlArrangeStyleCascade = 7,
         xlArrangeStyleHorizontal = -4128,
@@ -287,14 +366,12 @@ declare namespace Excel {
         xlArrangeStyleVertical = -4166,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlArrowHeadLength {
         xlArrowHeadLengthLong = 3,
         xlArrowHeadLengthMedium = -4138,
         xlArrowHeadLengthShort = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlArrowHeadStyle {
         xlArrowHeadStyleClosed = 3,
         xlArrowHeadStyleDoubleClosed = 5,
@@ -303,14 +380,12 @@ declare namespace Excel {
         xlArrowHeadStyleOpen = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlArrowHeadWidth {
         xlArrowHeadWidthMedium = -4138,
         xlArrowHeadWidthNarrow = 1,
         xlArrowHeadWidthWide = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAutoFillType {
         xlFillCopy = 1,
         xlFillDays = 5,
@@ -325,7 +400,6 @@ declare namespace Excel {
         xlLinearTrend = 9,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAutoFilterOperator {
         xlAnd = 1,
         xlBottom10Items = 4,
@@ -343,7 +417,6 @@ declare namespace Excel {
         xlTop10Percent = 5,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAxisCrosses {
         xlAxisCrossesAutomatic = -4105,
         xlAxisCrossesCustom = -4114,
@@ -351,27 +424,23 @@ declare namespace Excel {
         xlAxisCrossesMinimum = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAxisGroup {
         xlPrimary = 1,
         xlSecondary = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlAxisType {
         xlCategory = 1,
         xlSeriesAxis = 3,
         xlValue = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlBackground {
         xlBackgroundAutomatic = -4105,
         xlBackgroundOpaque = 3,
         xlBackgroundTransparent = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlBarShape {
         xlBox = 0,
         xlConeToMax = 5,
@@ -381,7 +450,6 @@ declare namespace Excel {
         xlPyramidToPoint = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlBordersIndex {
         xlDiagonalDown = 5,
         xlDiagonalUp = 6,
@@ -393,7 +461,6 @@ declare namespace Excel {
         xlInsideVertical = 11,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlBorderWeight {
         xlHairline = 1,
         xlMedium = -4138,
@@ -401,7 +468,6 @@ declare namespace Excel {
         xlThin = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlBuiltInDialog {
         _xlDialogChartSourceData = 541,
         _xlDialogPhonetic = 538,
@@ -664,62 +730,53 @@ declare namespace Excel {
         xlDialogZoom = 256,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCalcFor {
         xlAllValues = 0,
         xlColGroups = 2,
         xlRowGroups = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCalculatedMemberType {
         xlCalculatedMember = 0,
         xlCalculatedSet = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCalculation {
         xlCalculationAutomatic = -4105,
         xlCalculationManual = -4135,
         xlCalculationSemiautomatic = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCalculationInterruptKey {
         xlAnyKey = 2,
         xlEscKey = 1,
         xlNoKey = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCalculationState {
         xlCalculating = 1,
         xlDone = 0,
         xlPending = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCategoryType {
         xlAutomaticScale = -4105,
         xlCategoryScale = 2,
         xlTimeScale = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCellChangedState {
         xlCellChangeApplied = 3,
         xlCellChanged = 2,
         xlCellNotChanged = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCellInsertionMode {
         xlInsertDeleteCells = 1,
         xlInsertEntireRows = 2,
         xlOverwriteCells = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCellType {
         xlCellTypeAllFormatConditions = -4172,
         xlCellTypeAllValidation = -4174,
@@ -733,20 +790,17 @@ declare namespace Excel {
         xlCellTypeVisible = 12,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartElementPosition {
         xlChartElementPositionAutomatic = -4105,
         xlChartElementPositionCustom = -4114,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartGallery {
         xlAnyGallery = 23,
         xlBuiltIn = 21,
         xlUserDefined = 22,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartItem {
         xlAxis = 21,
         xlAxisTitle = 17,
@@ -782,14 +836,12 @@ declare namespace Excel {
         xlYErrorBars = 11,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartLocation {
         xlLocationAsNewSheet = 1,
         xlLocationAsObject = 2,
         xlLocationAutomatic = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartPicturePlacement {
         xlAllFaces = 7,
         xlEnd = 2,
@@ -800,14 +852,12 @@ declare namespace Excel {
         xlSides = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartPictureType {
         xlStack = 2,
         xlStackScale = 3,
         xlStretch = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartSplitType {
         xlSplitByCustomSplit = 4,
         xlSplitByPercentValue = 3,
@@ -815,7 +865,6 @@ declare namespace Excel {
         xlSplitByValue = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlChartType {
         xl3DArea = -4098,
         xl3DAreaStacked = 78,
@@ -892,14 +941,12 @@ declare namespace Excel {
         xlXYScatterSmoothNoMarkers = 73,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCheckInVersionType {
         xlCheckInMajorVersion = 1,
         xlCheckInMinorVersion = 0,
         xlCheckInOverwriteVersion = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlClipboardFormat {
         xlClipboardFormatBIFF = 8,
         xlClipboardFormatBIFF12 = 63,
@@ -937,7 +984,6 @@ declare namespace Excel {
         xlClipboardFormatWK1 = 10,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCmdType {
         xlCmdCube = 1,
         xlCmdDefault = 4,
@@ -946,13 +992,11 @@ declare namespace Excel {
         xlCmdTable = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlColorIndex {
         xlColorIndexAutomatic = -4105,
         xlColorIndexNone = -4142,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlColumnDataType {
         xlDMYFormat = 4,
         xlDYMFormat = 7,
@@ -966,21 +1010,18 @@ declare namespace Excel {
         xlYMDFormat = 5,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCommandUnderlines {
         xlCommandUnderlinesAutomatic = -4105,
         xlCommandUnderlinesOff = -4146,
         xlCommandUnderlinesOn = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCommentDisplayMode {
         xlCommentAndIndicator = 1,
         xlCommentIndicatorOnly = -1,
         xlNoIndicator = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlConditionValueTypes {
         xlConditionValueAutomaticMax = 7,
         xlConditionValueAutomaticMin = 6,
@@ -993,7 +1034,6 @@ declare namespace Excel {
         xlConditionValuePercentile = 5,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlConnectionType {
         xlConnectionTypeODBC = 2,
         xlConnectionTypeOLEDB = 1,
@@ -1002,7 +1042,6 @@ declare namespace Excel {
         xlConnectionTypeXMLMAP = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlConsolidationFunction {
         xlAverage = -4106,
         xlCount = -4112,
@@ -1018,7 +1057,6 @@ declare namespace Excel {
         xlVarP = -4165,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlContainsOperator {
         xlBeginsWith = 2,
         xlContains = 0,
@@ -1026,32 +1064,27 @@ declare namespace Excel {
         xlEndsWith = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCopyPictureFormat {
         xlBitmap = 2,
         xlPicture = -4147,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCorruptLoad {
         xlExtractData = 2,
         xlNormalLoad = 0,
         xlRepairFile = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCreator {
         xlCreatorCode = 1480803660,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCredentialsMethod {
         xlCredentialsMethodIntegrated = 0,
         xlCredentialsMethodNone = 1,
         xlCredentialsMethodStored = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCubeFieldSubType {
         xlCubeAttribute = 4,
         xlCubeCalculatedMeasure = 5,
@@ -1065,20 +1098,17 @@ declare namespace Excel {
         xlCubeSet = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCubeFieldType {
         xlHierarchy = 1,
         xlMeasure = 2,
         xlSet = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCutCopyMode {
         xlCopy = 1,
         xlCut = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlCVError {
         xlErrDiv0 = 2007,
         xlErrNA = 2042,
@@ -1089,32 +1119,27 @@ declare namespace Excel {
         xlErrValue = 2015,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarAxisPosition {
         xlDataBarAxisAutomatic = 0,
         xlDataBarAxisMidpoint = 1,
         xlDataBarAxisNone = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarBorderType {
         xlDataBarBorderNone = 0,
         xlDataBarBorderSolid = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarFillType {
         xlDataBarFillGradient = 1,
         xlDataBarFillSolid = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataBarNegativeColorType {
         xlDataBarColor = 0,
         xlDataBarSameAsPositive = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataLabelPosition {
         xlLabelPositionAbove = 0,
         xlLabelPositionBelow = 1,
@@ -1129,12 +1154,10 @@ declare namespace Excel {
         xlLabelPositionRight = -4152,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataLabelSeparator {
         xlDataLabelSeparatorDefault = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataLabelsType {
         xlDataLabelsShowBubbleSizes = 6,
         xlDataLabelsShowLabel = 4,
@@ -1144,7 +1167,6 @@ declare namespace Excel {
         xlDataLabelsShowValue = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataSeriesDate {
         xlDay = 1,
         xlMonth = 3,
@@ -1152,7 +1174,6 @@ declare namespace Excel {
         xlYear = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDataSeriesType {
         xlAutoFill = 4,
         xlChronological = 3,
@@ -1160,13 +1181,11 @@ declare namespace Excel {
         xlGrowth = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDeleteShiftDirection {
         xlShiftToLeft = -4159,
         xlShiftUp = -4162,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDirection {
         xlDown = -4121,
         xlToLeft = -4159,
@@ -1174,21 +1193,18 @@ declare namespace Excel {
         xlUp = -4162,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDisplayBlanksAs {
         xlInterpolated = 3,
         xlNotPlotted = 1,
         xlZero = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDisplayDrawingObjects {
         xlDisplayShapes = -4104,
         xlHide = 3,
         xlPlaceholders = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDisplayUnit {
         xlHundredMillions = -8,
         xlHundreds = -2,
@@ -1201,20 +1217,17 @@ declare namespace Excel {
         xlThousands = -3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDupeUnique {
         xlDuplicate = 1,
         xlUnique = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDVAlertStyle {
         xlValidAlertInformation = 3,
         xlValidAlertStop = 1,
         xlValidAlertWarning = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDVType {
         xlValidateCustom = 7,
         xlValidateDate = 4,
@@ -1226,7 +1239,6 @@ declare namespace Excel {
         xlValidateWholeNumber = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlDynamicFilterCriteria {
         xlFilterAboveAverage = 33,
         xlFilterAllDatesInPeriodApril = 24,
@@ -1264,7 +1276,6 @@ declare namespace Excel {
         xlFilterYesterday = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlEditionFormat {
         xlBIFF = 2,
         xlPICT = 1,
@@ -1272,7 +1283,6 @@ declare namespace Excel {
         xlVALU = 8,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlEditionOptionsOption {
         xlAutomaticUpdate = 4,
         xlCancel = 1,
@@ -1284,39 +1294,33 @@ declare namespace Excel {
         xlUpdateSubscriber = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlEditionType {
         xlPublisher = 1,
         xlSubscriber = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlEnableCancelKey {
         xlDisabled = 0,
         xlErrorHandler = 2,
         xlInterrupt = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlEnableSelection {
         xlNoRestrictions = 0,
         xlNoSelection = -4142,
         xlUnlockedCells = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlEndStyleCap {
         xlCap = 1,
         xlNoCap = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlErrorBarDirection {
         xlX = -4168,
         xlY = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlErrorBarInclude {
         xlErrorBarIncludeBoth = 1,
         xlErrorBarIncludeMinusValues = 3,
@@ -1324,7 +1328,6 @@ declare namespace Excel {
         xlErrorBarIncludePlusValues = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlErrorBarType {
         xlErrorBarTypeCustom = -4114,
         xlErrorBarTypeFixedValue = 1,
@@ -1333,7 +1336,6 @@ declare namespace Excel {
         xlErrorBarTypeStError = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlErrorChecks {
         xlEmptyCellReferences = 7,
         xlEvaluateToError = 1,
@@ -1346,13 +1348,11 @@ declare namespace Excel {
         xlUnlockedFormulaCells = 6,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFileAccess {
         xlReadOnly = 3,
         xlReadWrite = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFileFormat {
         xlAddIn = 18,
         xlAddIn8 = 18,
@@ -1410,27 +1410,23 @@ declare namespace Excel {
         xlXMLSpreadsheet = 46,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFileValidationPivotMode {
         xlFileValidationPivotDefault = 0,
         xlFileValidationPivotRun = 1,
         xlFileValidationPivotSkip = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFillWith {
         xlFillWithAll = -4104,
         xlFillWithContents = 2,
         xlFillWithFormats = -4122,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFilterAction {
         xlFilterCopy = 2,
         xlFilterInPlace = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFilterAllDatesInPeriod {
         xlFilterAllDatesInPeriodDay = 2,
         xlFilterAllDatesInPeriodHour = 3,
@@ -1440,26 +1436,22 @@ declare namespace Excel {
         xlFilterAllDatesInPeriodYear = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFindLookIn {
         xlComments = -4144,
         xlFormulas = -4123,
         xlValues = -4163,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFixedFormatQuality {
         xlQualityMinimum = 1,
         xlQualityStandard = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFixedFormatType {
         xlTypePDF = 0,
         xlTypeXPS = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFormatConditionOperator {
         xlBetween = 1,
         xlEqual = 3,
@@ -1471,7 +1463,6 @@ declare namespace Excel {
         xlNotEqual = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFormatConditionType {
         xlAboveAverageCondition = 12,
         xlBlanksCondition = 10,
@@ -1489,7 +1480,6 @@ declare namespace Excel {
         xlUniqueValues = 8,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFormatFilterTypes {
         xlFilterBottom = 0,
         xlFilterBottomPercent = 2,
@@ -1497,7 +1487,6 @@ declare namespace Excel {
         xlFilterTopPercent = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFormControl {
         xlButtonControl = 0,
         xlCheckBox = 1,
@@ -1511,7 +1500,6 @@ declare namespace Excel {
         xlSpinner = 9,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlFormulaLabel {
         xlColumnLabels = 2,
         xlMixedLabels = 3,
@@ -1519,19 +1507,16 @@ declare namespace Excel {
         xlRowLabels = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlGenerateTableRefs {
         xlGenerateTableRefA1 = 0,
         xlGenerateTableRefStruct = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlGradientFillType {
         xlGradientFillLinear = 0,
         xlGradientFillPath = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlHAlign {
         xlHAlignCenter = -4108,
         xlHAlignCenterAcrossSelection = 7,
@@ -1543,7 +1528,6 @@ declare namespace Excel {
         xlHAlignRight = -4152,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlHebrewModes {
         xlHebrewFullScript = 0,
         xlHebrewMixedAuthorizedScript = 3,
@@ -1551,14 +1535,12 @@ declare namespace Excel {
         xlHebrewPartialScript = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlHighlightChangesTime {
         xlAllChanges = 2,
         xlNotYetReviewed = 3,
         xlSinceMyLastSave = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlHtmlType {
         xlHtmlCalc = 1,
         xlHtmlChart = 3,
@@ -1566,7 +1548,6 @@ declare namespace Excel {
         xlHtmlStatic = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlIcon {
         xlIcon0Bars = 37,
         xlIcon0FilledBoxes = 52,
@@ -1623,7 +1604,6 @@ declare namespace Excel {
         xlIconYellowUpInclineArrow = 25,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlIconSet {
         xl3Arrows = 1,
         xl3ArrowsGray = 2,
@@ -1648,7 +1628,6 @@ declare namespace Excel {
         xlCustomSet = -1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlIMEMode {
         xlIMEModeAlpha = 8,
         xlIMEModeAlphaFull = 7,
@@ -1663,39 +1642,33 @@ declare namespace Excel {
         xlIMEModeOn = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlImportDataAs {
         xlPivotTableReport = 1,
         xlQueryTable = 0,
         xlTable = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlInsertFormatOrigin {
         xlFormatFromLeftOrAbove = 0,
         xlFormatFromRightOrBelow = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlInsertShiftDirection {
         xlShiftDown = -4121,
         xlShiftToRight = -4161,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLayoutFormType {
         xlOutline = 1,
         xlTabular = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLayoutRowType {
         xlCompactRow = 0,
         xlOutlineRow = 2,
         xlTabularRow = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLegendPosition {
         xlLegendPositionBottom = -4107,
         xlLegendPositionCorner = 2,
@@ -1705,7 +1678,6 @@ declare namespace Excel {
         xlLegendPositionTop = -4160,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLineStyle {
         xlContinuous = 1,
         xlDash = -4115,
@@ -1717,7 +1689,6 @@ declare namespace Excel {
         xlSlantDashDot = 13,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLink {
         xlExcelLinks = 1,
         xlOLELinks = 2,
@@ -1725,21 +1696,18 @@ declare namespace Excel {
         xlSubscribers = 6,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLinkInfo {
         xlEditionDate = 2,
         xlLinkInfoStatus = 3,
         xlUpdateState = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLinkInfoType {
         xlLinkInfoOLELinks = 2,
         xlLinkInfoPublishers = 5,
         xlLinkInfoSubscribers = 6,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLinkStatus {
         xlLinkStatusCopiedValues = 10,
         xlLinkStatusIndeterminate = 5,
@@ -1754,13 +1722,11 @@ declare namespace Excel {
         xlLinkStatusSourceOpen = 9,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLinkType {
         xlLinkTypeExcelLinks = 1,
         xlLinkTypeOLELinks = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlListConflict {
         xlListConflictDialog = 0,
         xlListConflictDiscardAllConflicts = 2,
@@ -1768,7 +1734,6 @@ declare namespace Excel {
         xlListConflictRetryAllConflicts = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlListDataType {
         xlListDataTypeCheckbox = 9,
         xlListDataTypeChoice = 6,
@@ -1785,7 +1750,6 @@ declare namespace Excel {
         xlListDataTypeText = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlListObjectSourceType {
         xlSrcExternal = 0,
         xlSrcQuery = 3,
@@ -1793,7 +1757,6 @@ declare namespace Excel {
         xlSrcXml = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLocationInTable {
         xlColumnHeader = -4110,
         xlColumnItem = 5,
@@ -1806,27 +1769,23 @@ declare namespace Excel {
         xlTableBody = 8,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLookAt {
         xlPart = 2,
         xlWhole = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlLookFor {
         xlLookForBlanks = 0,
         xlLookForErrors = 1,
         xlLookForFormulas = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlMailSystem {
         xlMAPI = 1,
         xlNoMailSystem = 0,
         xlPowerTalk = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlMarkerStyle {
         xlMarkerStyleAutomatic = -4105,
         xlMarkerStyleCircle = 8,
@@ -1842,21 +1801,18 @@ declare namespace Excel {
         xlMarkerStyleX = -4168,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlMeasurementUnits {
         xlCentimeters = 1,
         xlInches = 0,
         xlMillimeters = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlMouseButton {
         xlNoButton = 0,
         xlPrimaryButton = 1,
         xlSecondaryButton = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlMousePointer {
         xlDefault = -4143,
         xlIBeam = 3,
@@ -1864,7 +1820,6 @@ declare namespace Excel {
         xlWait = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlMSApplication {
         xlMicrosoftAccess = 4,
         xlMicrosoftFoxPro = 5,
@@ -1875,46 +1830,39 @@ declare namespace Excel {
         xlMicrosoftWord = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlOartHorizontalOverflow {
         xlOartHorizontalOverflowClip = 1,
         xlOartHorizontalOverflowOverflow = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlOartVerticalOverflow {
         xlOartVerticalOverflowClip = 1,
         xlOartVerticalOverflowEllipsis = 2,
         xlOartVerticalOverflowOverflow = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlObjectSize {
         xlFitToPage = 2,
         xlFullPage = 3,
         xlScreenSize = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlOLEType {
         xlOLEControl = 2,
         xlOLEEmbed = 1,
         xlOLELink = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlOLEVerb {
         xlVerbOpen = 2,
         xlVerbPrimary = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlOrder {
         xlDownThenOver = 1,
         xlOverThenDown = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlOrientation {
         xlDownward = -4170,
         xlHorizontal = -4128,
@@ -1922,26 +1870,22 @@ declare namespace Excel {
         xlVertical = -4166,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPageBreak {
         xlPageBreakAutomatic = -4105,
         xlPageBreakManual = -4135,
         xlPageBreakNone = -4142,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPageBreakExtent {
         xlPageBreakFull = 1,
         xlPageBreakPartial = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPageOrientation {
         xlLandscape = 2,
         xlPortrait = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPaperSize {
         xlPaper10x14 = 16,
         xlPaper11x17 = 17,
@@ -1987,7 +1931,6 @@ declare namespace Excel {
         xlPaperUser = 256,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlParameterDataType {
         xlParamTypeBigInt = -5,
         xlParamTypeBinary = -2,
@@ -2012,14 +1955,12 @@ declare namespace Excel {
         xlParamTypeWChar = -8,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlParameterType {
         xlConstant = 1,
         xlPrompt = 0,
         xlRange = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPasteSpecialOperation {
         xlPasteSpecialOperationAdd = 2,
         xlPasteSpecialOperationDivide = 5,
@@ -2028,7 +1969,6 @@ declare namespace Excel {
         xlPasteSpecialOperationSubtract = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPasteType {
         xlPasteAll = -4104,
         xlPasteAllExceptBorders = 7,
@@ -2044,7 +1984,6 @@ declare namespace Excel {
         xlPasteValuesAndNumberFormats = 12,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPattern {
         xlPatternAutomatic = -4105,
         xlPatternChecker = 9,
@@ -2070,7 +2009,6 @@ declare namespace Excel {
         xlPatternVertical = -4166,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPhoneticAlignment {
         xlPhoneticAlignCenter = 2,
         xlPhoneticAlignDistributed = 3,
@@ -2078,7 +2016,6 @@ declare namespace Excel {
         xlPhoneticAlignNoControl = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPhoneticCharacterType {
         xlHiragana = 2,
         xlKatakana = 1,
@@ -2086,13 +2023,11 @@ declare namespace Excel {
         xlNoConversion = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPictureAppearance {
         xlPrinter = 2,
         xlScreen = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPictureConvertorType {
         xlBMP = 1,
         xlCGM = 7,
@@ -2109,7 +2044,6 @@ declare namespace Excel {
         xlWPG = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPieSliceIndex {
         xlCenterPoint = 5,
         xlInnerCenterPoint = 8,
@@ -2122,13 +2056,11 @@ declare namespace Excel {
         xlOuterCounterClockwisePoint = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPieSliceLocation {
         xlHorizontalCoordinate = 1,
         xlVerticalCoordinate = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotCellType {
         xlPivotCellBlankCell = 9,
         xlPivotCellCustomSubtotal = 7,
@@ -2142,14 +2074,12 @@ declare namespace Excel {
         xlPivotCellValue = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotConditionScope {
         xlDataFieldScope = 2,
         xlFieldsScope = 1,
         xlSelectionScope = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldCalculation {
         xlDifferenceFrom = 2,
         xlIndex = 9,
@@ -2168,14 +2098,12 @@ declare namespace Excel {
         xlRunningTotal = 5,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldDataType {
         xlDate = 2,
         xlNumber = -4145,
         xlText = -4158,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldOrientation {
         xlColumnField = 2,
         xlDataField = 4,
@@ -2184,13 +2112,11 @@ declare namespace Excel {
         xlRowField = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFieldRepeatLabels {
         xlDoNotRepeatLabels = 1,
         xlRepeatLabels = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFilterType {
         xlAfter = 33,
         xlAfterOrEqualTo = 34,
@@ -2262,7 +2188,6 @@ declare namespace Excel {
         xlYearToDate = 52,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotFormatType {
         xlPTClassic = 20,
         xlPTNone = 21,
@@ -2288,7 +2213,6 @@ declare namespace Excel {
         xlTable9 = 18,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotLineType {
         xlPivotLineBlank = 3,
         xlPivotLineGrandTotal = 2,
@@ -2296,7 +2220,6 @@ declare namespace Excel {
         xlPivotLineSubtotal = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotTableMissingItems {
         xlMissingItemsDefault = -1,
         xlMissingItemsMax = 32500,
@@ -2304,7 +2227,6 @@ declare namespace Excel {
         xlMissingItemsNone = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotTableSourceType {
         xlConsolidation = 3,
         xlDatabase = 1,
@@ -2313,7 +2235,6 @@ declare namespace Excel {
         xlScenario = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPivotTableVersionList {
         xlPivotTableVersion10 = 1,
         xlPivotTableVersion11 = 2,
@@ -2323,28 +2244,24 @@ declare namespace Excel {
         xlPivotTableVersionCurrent = -1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPlacement {
         xlFreeFloating = 3,
         xlMove = 2,
         xlMoveAndSize = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPlatform {
         xlMacintosh = 1,
         xlMSDOS = 3,
         xlWindows = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPortugueseReform {
         xlPortugueseBoth = 3,
         xlPortuguesePostReform = 2,
         xlPortuguesePreReform = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPrintErrors {
         xlPrintErrorsBlank = 1,
         xlPrintErrorsDash = 2,
@@ -2352,42 +2269,36 @@ declare namespace Excel {
         xlPrintErrorsNA = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPrintLocation {
         xlPrintInPlace = 16,
         xlPrintNoComments = -4142,
         xlPrintSheetEnd = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPriority {
         xlPriorityHigh = -4127,
         xlPriorityLow = -4134,
         xlPriorityNormal = -4143,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPropertyDisplayedIn {
         xlDisplayPropertyInPivotTable = 1,
         xlDisplayPropertyInPivotTableAndTooltip = 3,
         xlDisplayPropertyInTooltip = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlProtectedViewCloseReason {
         xlProtectedViewCloseEdit = 1,
         xlProtectedViewCloseForced = 2,
         xlProtectedViewCloseNormal = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlProtectedViewWindowState {
         xlProtectedViewWindowMaximized = 2,
         xlProtectedViewWindowMinimized = 1,
         xlProtectedViewWindowNormal = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlPTSelectionMode {
         xlBlanks = 4,
         xlButton = 15,
@@ -2398,7 +2309,6 @@ declare namespace Excel {
         xlOrigin = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlQueryType {
         xlADORecordset = 7,
         xlDAORecordset = 2,
@@ -2408,7 +2318,6 @@ declare namespace Excel {
         xlWebQuery = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRangeAutoFormat {
         xlRangeAutoFormat3DEffects1 = 13,
         xlRangeAutoFormat3DEffects2 = 14,
@@ -2455,20 +2364,17 @@ declare namespace Excel {
         xlRangeAutoFormatTable9 = 40,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRangeValueDataType {
         xlRangeValueDefault = 10,
         xlRangeValueMSPersistXML = 12,
         xlRangeValueXMLSpreadsheet = 11,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlReferenceStyle {
         xlA1 = 1,
         xlR1C1 = -4150,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlReferenceType {
         xlAbsolute = 1,
         xlAbsRowRelColumn = 2,
@@ -2476,7 +2382,6 @@ declare namespace Excel {
         xlRelRowAbsColumn = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRemoveDocInfoType {
         xlRDIAll = 99,
         xlRDIComments = 1,
@@ -2497,7 +2402,6 @@ declare namespace Excel {
         xlRDISendForReview = 7,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRgbColor {
         rgbAliceBlue = 16775408,
         rgbAntiqueWhite = 14150650,
@@ -2645,33 +2549,28 @@ declare namespace Excel {
         rgbYellowGreen = 3329434,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRobustConnect {
         xlAlways = 1,
         xlAsRequired = 0,
         xlNever = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRoutingSlipDelivery {
         xlAllAtOnce = 2,
         xlOneAfterAnother = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRoutingSlipStatus {
         xlNotYetRouted = 0,
         xlRoutingComplete = 2,
         xlRoutingInProgress = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRowCol {
         xlColumns = 2,
         xlRows = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlRunAutoMacro {
         xlAutoActivate = 3,
         xlAutoClose = 2,
@@ -2679,51 +2578,43 @@ declare namespace Excel {
         xlAutoOpen = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSaveAction {
         xlDoNotSaveChanges = 2,
         xlSaveChanges = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSaveAsAccessMode {
         xlExclusive = 3,
         xlNoChange = 1,
         xlShared = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSaveConflictResolution {
         xlLocalSessionChanges = 2,
         xlOtherSessionChanges = 3,
         xlUserResolution = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlScaleType {
         xlScaleLinear = -4132,
         xlScaleLogarithmic = -4133,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSearchDirection {
         xlNext = 1,
         xlPrevious = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSearchOrder {
         xlByColumns = 2,
         xlByRows = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSearchWithin {
         xlWithinSheet = 1,
         xlWithinWorkbook = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSheetType {
         xlChart = -4109,
         xlDialogSheet = -4116,
@@ -2732,34 +2623,29 @@ declare namespace Excel {
         xlWorksheet = -4167,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSheetVisibility {
         xlSheetHidden = 0,
         xlSheetVeryHidden = 2,
         xlSheetVisible = -1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSizeRepresents {
         xlSizeIsArea = 1,
         xlSizeIsWidth = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSlicerCrossFilterType {
         xlSlicerCrossFilterShowItemsWithDataAtTop = 2,
         xlSlicerCrossFilterShowItemsWithNoData = 3,
         xlSlicerNoCrossFilter = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSlicerSort {
         xlSlicerSortAscending = 2,
         xlSlicerSortDataSourceOrder = 1,
         xlSlicerSortDescending = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSmartTagControlType {
         xlSmartTagControlActiveX = 13,
         xlSmartTagControlButton = 6,
@@ -2777,32 +2663,27 @@ declare namespace Excel {
         xlSmartTagControlTextbox = 10,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSmartTagDisplayMode {
         xlButtonOnly = 2,
         xlDisplayNone = 1,
         xlIndicatorAndButton = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortDataOption {
         xlSortNormal = 0,
         xlSortTextAsNumbers = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortMethod {
         xlPinYin = 1,
         xlStroke = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortMethodOld {
         xlCodePage = 2,
         xlSyllabary = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortOn {
         xlSortOnCellColor = 1,
         xlSortOnFontColor = 2,
@@ -2810,25 +2691,21 @@ declare namespace Excel {
         xlSortOnValues = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortOrder {
         xlAscending = 1,
         xlDescending = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortOrientation {
         xlSortColumns = 1,
         xlSortRows = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSortType {
         xlSortLabels = 2,
         xlSortValues = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSourceType {
         xlSourceAutoFilter = 3,
         xlSourceChart = 5,
@@ -2840,41 +2717,35 @@ declare namespace Excel {
         xlSourceWorkbook = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSpanishModes {
         xlSpanishTuteoAndVoseo = 1,
         xlSpanishTuteoOnly = 0,
         xlSpanishVoseoOnly = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSparklineRowCol {
         xlSparklineColumnsSquare = 2,
         xlSparklineNonSquare = 0,
         xlSparklineRowsSquare = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSparkScale {
         xlSparkScaleCustom = 3,
         xlSparkScaleGroup = 1,
         xlSparkScaleSingle = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSparkType {
         xlSparkColumn = 2,
         xlSparkColumnStacked100 = 3,
         xlSparkLine = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSpeakDirection {
         xlSpeakByColumns = 1,
         xlSpeakByRows = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSpecialCellsValue {
         xlErrors = 16,
         xlLogical = 4,
@@ -2882,7 +2753,6 @@ declare namespace Excel {
         xlTextValues = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlStdColorScale {
         xlColorScaleBlackWhite = 3,
         xlColorScaleGYR = 2,
@@ -2890,37 +2760,31 @@ declare namespace Excel {
         xlColorScaleWhiteBlack = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSubscribeToFormat {
         xlSubscribeToPicture = -4147,
         xlSubscribeToText = -4158,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSubtototalLocationType {
         xlAtBottom = 2,
         xlAtTop = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSummaryColumn {
         xlSummaryOnLeft = -4131,
         xlSummaryOnRight = -4152,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSummaryReportType {
         xlStandardSummary = 1,
         xlSummaryPivotTable = -4148,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlSummaryRow {
         xlSummaryAbove = 0,
         xlSummaryBelow = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTableStyleElementType {
         xlBlankRow = 19,
         xlColumnStripe1 = 7,
@@ -2962,32 +2826,27 @@ declare namespace Excel {
         xlWholeTable = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTabPosition {
         xlTabPositionFirst = 0,
         xlTabPositionLast = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTextParsingType {
         xlDelimited = 1,
         xlFixedWidth = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTextQualifier {
         xlTextQualifierDoubleQuote = 1,
         xlTextQualifierNone = -4142,
         xlTextQualifierSingleQuote = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTextVisualLayoutType {
         xlTextVisualLTR = 1,
         xlTextVisualRTL = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlThemeColor {
         xlThemeColorAccent1 = 5,
         xlThemeColorAccent2 = 6,
@@ -3003,20 +2862,17 @@ declare namespace Excel {
         xlThemeColorLight2 = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlThemeFont {
         xlThemeFontMajor = 1,
         xlThemeFontMinor = 2,
         xlThemeFontNone = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlThreadMode {
         xlThreadModeAutomatic = 0,
         xlThreadModeManual = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTickLabelOrientation {
         xlTickLabelOrientationAutomatic = -4105,
         xlTickLabelOrientationDownward = -4170,
@@ -3025,7 +2881,6 @@ declare namespace Excel {
         xlTickLabelOrientationVertical = -4166,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTickLabelPosition {
         xlTickLabelPositionHigh = -4127,
         xlTickLabelPositionLow = -4134,
@@ -3033,7 +2888,6 @@ declare namespace Excel {
         xlTickLabelPositionNone = -4142,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTickMark {
         xlTickMarkCross = 4,
         xlTickMarkInside = 2,
@@ -3041,7 +2895,6 @@ declare namespace Excel {
         xlTickMarkOutside = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTimePeriods {
         xlLast7Days = 2,
         xlLastMonth = 5,
@@ -3055,14 +2908,12 @@ declare namespace Excel {
         xlYesterday = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTimeUnit {
         xlDays = 0,
         xlMonths = 1,
         xlYears = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlToolbarProtection {
         xlNoButtonChanges = 1,
         xlNoChanges = 4,
@@ -3071,13 +2922,11 @@ declare namespace Excel {
         xlToolbarProtectionNone = -4143,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTopBottom {
         xlTop10Bottom = 0,
         xlTop10Top = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTotalsCalculation {
         xlTotalsCalculationAverage = 2,
         xlTotalsCalculationCount = 3,
@@ -3091,7 +2940,6 @@ declare namespace Excel {
         xlTotalsCalculationVar = 8,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlTrendlineType {
         xlExponential = 5,
         xlLinear = -4132,
@@ -3101,7 +2949,6 @@ declare namespace Excel {
         xlPower = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlUnderlineStyle {
         xlUnderlineStyleDouble = -4119,
         xlUnderlineStyleDoubleAccounting = 5,
@@ -3110,14 +2957,12 @@ declare namespace Excel {
         xlUnderlineStyleSingleAccounting = 4,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlUpdateLinks {
         xlUpdateLinksAlways = 3,
         xlUpdateLinksNever = 2,
         xlUpdateLinksUserSetting = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlVAlign {
         xlVAlignBottom = -4107,
         xlVAlignCenter = -4108,
@@ -3126,7 +2971,6 @@ declare namespace Excel {
         xlVAlignTop = -4160,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlWBATemplate {
         xlWBATChart = -4109,
         xlWBATExcel4IntlMacroSheet = 4,
@@ -3134,28 +2978,24 @@ declare namespace Excel {
         xlWBATWorksheet = -4167,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlWebFormatting {
         xlWebFormattingAll = 1,
         xlWebFormattingNone = 3,
         xlWebFormattingRTF = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlWebSelectionType {
         xlAllTables = 2,
         xlEntirePage = 1,
         xlSpecifiedTables = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlWindowState {
         xlMaximized = -4137,
         xlMinimized = -4140,
         xlNormal = -4143,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlWindowType {
         xlChartAsWindow = 5,
         xlChartInPlace = 4,
@@ -3164,34 +3004,29 @@ declare namespace Excel {
         xlWorkbook = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlWindowView {
         xlNormalView = 1,
         xlPageBreakPreview = 2,
         xlPageLayoutView = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlXLMMacroType {
         xlCommand = 2,
         xlFunction = 1,
         xlNotXLM = 3,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlXmlExportResult {
         xlXmlExportSuccess = 0,
         xlXmlExportValidationFailed = 1,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlXmlImportResult {
         xlXmlImportElementsTruncated = 1,
         xlXmlImportSuccess = 0,
         xlXmlImportValidationFailed = 2,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlXmlLoadOption {
         xlXmlLoadImportToList = 2,
         xlXmlLoadMapXml = 3,
@@ -3199,13 +3034,37 @@ declare namespace Excel {
         xlXmlLoadPromptUser = 0,
     }
 
-    // tslint:disable-next-line:no-const-enum
     const enum XlYesNoGuess {
         xlGuess = 0,
         xlNo = 2,
         xlYes = 1,
     }
 
+    class AboveAverage {
+        private 'Excel.AboveAverage_typekey': AboveAverage;
+        private constructor();
+        AboveBelow: XlAboveBelow;
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly Borders: Borders;
+        CalcFor: XlCalcFor;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        readonly Font: Font;
+        readonly Interior: Interior;
+        ModifyAppliesToRange(Range: Range): void;
+        NumberFormat: string;
+        NumStdDev: number;
+        readonly Parent: any;
+        Priority: number;
+        readonly PTCondition: boolean;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        StopIfTrue: boolean;
+        readonly Type: number;
+    }
+
     class Action {
         private 'Excel.Action_typekey': Action;
         private constructor();
@@ -3220,15 +3079,14 @@ declare namespace Excel {
         readonly Type: XlActionType;
     }
 
-    class Actions {
-        private 'Excel.Actions_typekey': Actions;
-        private constructor();
-        _Default(Index: any): Action;
+    interface Actions {
+        _Default(Index: number | string): Action;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): Action;
+        Item(Index: number | string): Action;
         readonly Parent: any;
+        (Index: number | string): Action;
     }
 
     class AddIn {
@@ -3251,38 +3109,26 @@ declare namespace Excel {
         readonly Title: string;
     }
 
-    class AddIns {
-        private 'Excel.AddIns_typekey': AddIns;
-        private constructor();
-        _Default(Index: any): AddIn;
-        Add(Filename: string, CopyFile?: any): AddIn;
+    interface AddIns {
+        _Default(Index: number | string): AddIn;
+        Add(Filename: string, CopyFile?: boolean): AddIn;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): AddIn;
+        Item(Index: number | string): AddIn;
         readonly Parent: any;
+        (Index: number | string): AddIn;
     }
 
-    class AddIns2 {
-        private 'Excel.AddIns2_typekey': AddIns2;
-        private constructor();
-        _Default(Index: any): AddIn;
-        Add(Filename: string, CopyFile?: any): AddIn;
-        readonly Application: Application;
-        readonly Count: number;
-        readonly Creator: XlCreator;
-        Item(Index: any): AddIn;
-        readonly Parent: any;
-    }
+    type AddIns2 = AddIns;
 
-    class Adjustments {
-        private 'Excel.Adjustments_typekey': Adjustments;
-        private constructor();
+    interface Adjustments {
         readonly Application: any;
         readonly Count: number;
         readonly Creator: number;
         Item(Index: number): number;
         readonly Parent: any;
+        (Index: number): number;
     }
 
     class AllowEditRange {
@@ -3292,17 +3138,16 @@ declare namespace Excel {
         Delete(): void;
         Range: Range;
         Title: string;
-        Unprotect(Password?: any): void;
+        Unprotect(Password?: string): void;
         readonly Users: UserAccessList;
     }
 
-    class AllowEditRanges {
-        private 'Excel.AllowEditRanges_typekey': AllowEditRanges;
-        private constructor();
-        _Default(Index: any): AllowEditRange;
-        Add(Title: string, Range: Range, Password?: any): AllowEditRange;
+    interface AllowEditRanges {
+        _Default(Index: number | string): AllowEditRange;
+        Add(Title: string, Range: Range, Password?: string): AllowEditRange;
         readonly Count: number;
-        Item(Index: any): AllowEditRange;
+        Item(Index: number | string): AllowEditRange;
+        (Index: number | string): AllowEditRange;
     }
 
     class Application {
@@ -3311,17 +3156,10 @@ declare namespace Excel {
         readonly _Default: string;
         _Evaluate(Name: any): any;
         _FindFile(): void;
-        _MacroOptions(
-            Macro?: any, Description?: any, HasMenu?: any, MenuText?: any, HasShortcutKey?: any, ShortcutKey?: any, Category?: any, StatusBar?: any, HelpContextID?: any, HelpFile?: any): void;
-        _Run2(
-            Macro?: any, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        _MacroOptions(Macro?: any, Description?: any, HasMenu?: any, MenuText?: any, HasShortcutKey?: any, ShortcutKey?: any, Category?: any, StatusBar?: any, HelpContextID?: any, HelpFile?: any): void;
+        _Run2(Macro?: any, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         _Wait(Time: any): void;
-        _WSFunction(
-            Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        _WSFunction(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         ActivateMicrosoftApp(Index: XlMSApplication): void;
         readonly ActiveCell: Range;
         readonly ActiveChart: Chart;
@@ -3330,11 +3168,11 @@ declare namespace Excel {
         readonly ActiveMenuBar: MenuBar;
         ActivePrinter: string;
         readonly ActiveProtectedViewWindow: ProtectedViewWindow;
-        readonly ActiveSheet: Worksheet | Chart | DialogSheet;
+        readonly ActiveSheet: Sheet;
         readonly ActiveWindow: Window;
         readonly ActiveWorkbook: Workbook;
         AddChartAutoFormat(Chart: any, Name: string, Description?: any): void;
-        AddCustomList(ListArray: any, ByRow?: any): void;
+        AddCustomList(ListArray: SafeArray<string> | Range, ByRow?: boolean): void;
         readonly AddIns: AddIns;
         readonly AddIns2: AddIns2;
         AlertBeforeOverwriting: boolean;
@@ -3361,17 +3199,17 @@ declare namespace Excel {
         CalculationInterruptKey: XlCalculationInterruptKey;
         readonly CalculationState: XlCalculationState;
         readonly CalculationVersion: number;
-        Caller(Index?: any): any;
+        Caller(Index?: number): Range | string | Error;
         readonly CanPlaySounds: boolean;
         readonly CanRecordSounds: boolean;
         Caption: string;
         CellDragAndDrop: boolean;
         readonly Cells: Range;
         CentimetersToPoints(Centimeters: number): number;
-        readonly Charts: Sheets;
-        CheckAbort(KeepAbort?: any): void;
-        CheckSpelling(Word: string, CustomDictionary?: any, IgnoreUppercase?: any): boolean;
-        ClipboardFormats(Index?: any): any;
+        readonly Charts: Sheets<Chart>;
+        CheckAbort(KeepAbort?: boolean): void;
+        CheckSpelling(Word: string, CustomDictionary?: string, IgnoreUppercase?: boolean): boolean;
+        ClipboardFormats: SafeArray<XlClipboardFormat> & ((Index: number) => XlClipboardFormat);
         ClusterConnector: string;
         ColorButtons: boolean;
         readonly Columns: Range;
@@ -3380,7 +3218,7 @@ declare namespace Excel {
         CommandUnderlines: XlCommandUnderlines;
         ConstrainNumeric: boolean;
         ControlCharacters: boolean;
-        ConvertFormula(Formula: any, FromReferenceStyle: XlReferenceStyle, ToReferenceStyle?: any, ToAbsolute?: any, RelativeTo?: any): any;
+        ConvertFormula(Formula: string, FromReferenceStyle: XlReferenceStyle, ToReferenceStyle?: XlReferenceStyle, ToAbsolute?: XlReferenceType, RelativeTo?: Range): string;
         CopyObjectsWithCells: boolean;
         readonly Creator: XlCreator;
         Cursor: XlMousePointer;
@@ -3403,7 +3241,7 @@ declare namespace Excel {
         DeleteChartAutoFormat(Name: string): void;
         DeleteCustomList(ListNum: number): void;
         readonly Dialogs: Dialogs;
-        readonly DialogSheets: Sheets;
+        readonly DialogSheets: Sheets<DialogSheet>;
         DisplayAlerts: boolean;
         DisplayClipboardWindow: boolean;
         DisplayCommentIndicator: XlCommentDisplayMode;
@@ -3421,26 +3259,21 @@ declare namespace Excel {
         DisplayRecentFiles: boolean;
         DisplayScrollBars: boolean;
         DisplayStatusBar: boolean;
-        DisplayXMLSourcePane(XmlMap?: any): void;
+        DisplayXMLSourcePane(XmlMap?: XmlMap): void;
         DoubleClick(): void;
         Dummy1(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any): any;
         Dummy10(arg?: any): boolean;
         readonly Dummy101: any;
         Dummy11(): void;
         Dummy12(p1: PivotTable, p2: PivotTable): void;
-        Dummy13(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Dummy13(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         Dummy14(): void;
         Dummy2(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any): any;
         Dummy20(grfCompareFunctions: number): any;
         Dummy22: boolean;
         Dummy23: boolean;
         Dummy3(): any;
-        Dummy4(
-            Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any): any;
+        Dummy4(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any): any;
         Dummy5(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any): any;
         Dummy6(): any;
         Dummy7(): any;
@@ -3456,13 +3289,13 @@ declare namespace Excel {
         EnableSound: boolean;
         EnableTipWizard: boolean;
         readonly ErrorCheckingOptions: ErrorCheckingOptions;
-        Evaluate(Name: any): any;
+        Evaluate(Name: string): any;
         readonly Excel4IntlMacroSheets: Sheets;
         readonly Excel4MacroSheets: Sheets;
         ExecuteExcel4Macro(String: string): any;
         ExtendList: boolean;
         FeatureInstall: Office.MsoFeatureInstall;
-        FileConverters(Index1?: any, Index2?: any): any;
+        FileConverters(Index1?: string, Index2?: string): SafeArray;
         FileDialog(fileDialogType: Office.MsoFileDialogType): Office.FileDialog;
         readonly FileExportConverters: FileExportConverters;
         readonly FileFind: Office.IFind;
@@ -3476,27 +3309,31 @@ declare namespace Excel {
         FormulaBarHeight: number;
         GenerateGetPivotData: boolean;
         GenerateTableRefs: XlGenerateTableRefs;
-        GetCustomListContents(ListNum: number): any;
-        GetCustomListNum(ListArray: any): number;
-        GetOpenFilename(FileFilter?: any, FilterIndex?: any, Title?: any, ButtonText?: any, MultiSelect?: any): any;
-        GetPhonetic(Text?: any): string;
-        GetSaveAsFilename(InitialFilename?: any, FileFilter?: any, FilterIndex?: any, Title?: any, ButtonText?: any): any;
-        Goto(Reference?: any, Scroll?: any): void;
+        GetCustomListContents(ListNum: number): SafeArray<string>;
+        GetCustomListNum(ListArray: SafeArray<string>): number;
+
+        /** @param ButtonText Macintosh only */
+        GetOpenFilename(FileFilter?: string, FilterIndex?: number, Title?: string, ButtonText?: null, MultiSelect?: false): string;
+
+        /** @param ButtonText Macintosh only */
+        GetOpenFilename(FileFilter: string | null, FilterIndex: number | null, Title: string | null, ButtonText: null, MultiSelect: true): SafeArray<string>;
+        GetPhonetic(Text?: string): string;
+
+        /** @param ButtonText Macintosh only */
+        GetSaveAsFilename(InitialFilename?: string, FileFilter?: string, FilterIndex?: number, Title?: string, ButtonText?: undefined): string;
+        Goto(Reference?: Range | string, Scroll?: boolean): void;
         Height: number;
-        Help(HelpFile?: any, HelpContextID?: any): void;
+        Help(HelpFile?: string, HelpContextID?: number): void;
         HighQualityModeForGraphics: boolean;
         readonly Hinstance: number;
-        readonly HinstancePtr: any;
+        readonly HinstancePtr: number;
         readonly Hwnd: number;
         IgnoreRemoteRequests: boolean;
         InchesToPoints(Inches: number): number;
-        InputBox(Prompt: string, Title?: any, Default?: any, Left?: any, Top?: any, HelpFile?: any, HelpContextID?: any, Type?: any): any;
+        InputBox(Prompt: string, Title?: string, Default?: string, Left?: number, Top?: number, HelpFile?: string, HelpContextID?: number, Type?: InputBoxReturnType): string | number | boolean | Range | Error | SafeArray<string> | SafeArray<number> | SafeArray<boolean>;
         Interactive: boolean;
-        International(Index?: any): any;
-        Intersect(
-            Arg1: Range, Arg2: Range, Arg3?: Range, Arg4?: Range, Arg5?: Range, Arg6?: Range, Arg7?: Range, Arg8?: Range, Arg9?: Range, Arg10?: Range, Arg11?: Range, Arg12?: Range,
-            Arg13?: Range, Arg14?: Range, Arg15?: Range, Arg16?: Range, Arg17?: Range, Arg18?: Range, Arg19?: Range, Arg20?: Range, Arg21?: Range, Arg22?: Range, Arg23?: Range, Arg24?: Range,
-            Arg25?: Range, Arg26?: Range, Arg27?: Range, Arg28?: Range, Arg29?: Range, Arg30?: Range): Range;
+        International: SafeArray & (<T>(Index: T) => InternationalResult<T>);
+        Intersect(Arg1: Range, Arg2: Range, Arg3?: Range, Arg4?: Range, Arg5?: Range, Arg6?: Range, Arg7?: Range, Arg8?: Range, Arg9?: Range, Arg10?: Range, Arg11?: Range, Arg12?: Range, Arg13?: Range, Arg14?: Range, Arg15?: Range, Arg16?: Range, Arg17?: Range, Arg18?: Range, Arg19?: Range, Arg20?: Range, Arg21?: Range, Arg22?: Range, Arg23?: Range, Arg24?: Range, Arg25?: Range, Arg26?: Range, Arg27?: Range, Arg28?: Range, Arg29?: Range, Arg30?: Range): Range;
         readonly IsSandboxed: boolean;
         Iteration: boolean;
         readonly LanguageSettings: Office.LanguageSettings;
@@ -3504,12 +3341,10 @@ declare namespace Excel {
         LargeOperationCellThousandCount: number;
         Left: number;
         readonly LibraryPath: string;
-        MacroOptions(
-            Macro?: any, Description?: any, HasMenu?: any, MenuText?: any, HasShortcutKey?: any, ShortcutKey?: any, Category?: any, StatusBar?: any, HelpContextID?: any,
-            HelpFile?: any, ArgumentDescriptions?: any): void;
+        MacroOptions(Macro?: string, Description?: string, HasMenu?: undefined, MenuText?: undefined, HasShortcutKey?: boolean, ShortcutKey?: string, Category?: FunctionCategory | string, StatusBar?: string, HelpContextID?: number, HelpFile?: string, ArgumentDescriptions?: SafeArray<string>): void;
         MailLogoff(): void;
-        MailLogon(Name?: any, Password?: any, DownloadNewMail?: any): void;
-        readonly MailSession: any;
+        MailLogon(Name?: string, Password?: string, DownloadNewMail?: boolean): void;
+        readonly MailSession: string | null;
         readonly MailSystem: XlMailSystem;
         MapPaperSize: boolean;
         readonly MathCoprocessorAvailable: boolean;
@@ -3537,11 +3372,11 @@ declare namespace Excel {
         OnData: string;
         OnDoubleClick: string;
         OnEntry: string;
-        OnKey(Key: string, Procedure?: any): void;
+        OnKey(Key: string, Procedure?: string): void;
         OnRepeat(Text: string, Procedure: string): void;
         OnSheetActivate: string;
         OnSheetDeactivate: string;
-        OnTime(EarliestTime: any, Procedure: string, LatestTime?: any, Schedule?: any): void;
+        OnTime(EarliestTime: any, Procedure: string, LatestTime?: any, Schedule?: boolean): void;
         OnUndo(Text: string, Procedure: string): void;
         OnWindow: string;
         readonly OperatingSystem: string;
@@ -3550,7 +3385,7 @@ declare namespace Excel {
         readonly Path: string;
         readonly PathSeparator: string;
         PivotTableSelection: boolean;
-        PreviousSelections(Index?: any): any;
+        PreviousSelections(Index: 1 | 2 | 3 | 4): Range | null;
         PrintCommunication: boolean;
         readonly ProductCode: string;
         PromptForSummaryInfo: boolean;
@@ -3560,10 +3395,13 @@ declare namespace Excel {
         Range(Cell1: string | Range, Cell2?: string | Range): Range;
         readonly Ready: boolean;
         readonly RecentFiles: RecentFiles;
-        RecordMacro(BasicCode?: any, XlmCode?: any): void;
+        RecordMacro(BasicCode: string): void;
+
+        /** This overload prevents recording */
+        RecordMacro(BasicCode: '', XlmCode: ''): void;
         readonly RecordRelative: boolean;
         ReferenceStyle: XlReferenceStyle;
-        RegisteredFunctions(Index1?: any, Index2?: any): any;
+        RegisteredFunctions(Index1: string | undefined, Index2?: string): SafeArray | null;
         RegisterXLL(Filename: string): boolean;
         Repeat(): void;
         ReplaceFormat: CellFormat;
@@ -3571,16 +3409,15 @@ declare namespace Excel {
         RollZoom: boolean;
         readonly Rows: Range;
         readonly RTD: RTD;
-        Run(
-            Macro?: any, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Run(Macro?: string | Range | number, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         Save(Filename?: any): void;
         SaveISO8601Dates: boolean;
+
+        /** @deprecated */
         SaveWorkspace(Filename?: any): void;
         ScreenUpdating: boolean;
         readonly Selection: any;
-        SendKeys(Keys: any, Wait?: any): void;
+        SendKeys(Keys: string, Wait?: boolean): void;
         SetDefaultChart(FormatName?: any, Gallery?: any): void;
         SharePointVersion(bstrUrl: string): number;
         readonly Sheets: Sheets;
@@ -3603,7 +3440,15 @@ declare namespace Excel {
         StandardFont: string;
         StandardFontSize: number;
         readonly StartupPath: string;
-        StatusBar: any;
+
+        /**
+         * Get or set the text of the status bar
+         *
+         * Returns `false` if Microsoft Excel has control of the status bar.
+         *
+         * To restore the default status bar text, set the property to False ; this works even if the status bar is hidden.
+         */
+        StatusBar: string | false;
         Support(Object: any, ID: number, arg?: any): any;
         readonly TemplatesPath: string;
         readonly ThisCell: Range;
@@ -3616,10 +3461,7 @@ declare namespace Excel {
         TransitionNavigKeys: boolean;
         UILanguage: number;
         Undo(): void;
-        Union(
-            Arg1: Range, Arg2: Range, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): Range;
+        Union(Arg1: Range, Arg2: Range, Arg3?: Range, Arg4?: Range, Arg5?: Range, Arg6?: Range, Arg7?: Range, Arg8?: Range, Arg9?: Range, Arg10?: Range, Arg11?: Range, Arg12?: Range, Arg13?: Range, Arg14?: Range, Arg15?: Range, Arg16?: Range, Arg17?: Range, Arg18?: Range, Arg19?: Range, Arg20?: Range, Arg21?: Range, Arg22?: Range, Arg23?: Range, Arg24?: Range, Arg25?: Range, Arg26?: Range, Arg27?: Range, Arg28?: Range, Arg29?: Range, Arg30?: Range): Range;
         readonly UsableHeight: number;
         readonly UsableWidth: number;
         UseClusterConnector: boolean;
@@ -3632,7 +3474,11 @@ declare namespace Excel {
         readonly VBE: VBIDE.VBE;
         readonly Version: string;
         Visible: boolean;
-        Volatile(Volatile?: any): void;
+
+        /**
+         * @param Volatile [Volatile=true]
+         */
+        Volatile(Volatile?: boolean): void;
         Wait(Time: any): boolean;
         WarnOnFunctionNameConflict: boolean;
         readonly Watches: Watches;
@@ -3642,24 +3488,25 @@ declare namespace Excel {
         WindowState: XlWindowState;
         readonly Workbooks: Workbooks;
         readonly WorksheetFunction: WorksheetFunction;
-        readonly Worksheets: Sheets;
+        readonly Worksheets: Sheets<Worksheet>;
     }
 
-    class Areas {
-        private 'Excel.Areas_typekey': Areas;
-        private constructor();
+    interface Areas {
         _Default(Index: number): Range;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): Range;
         readonly Parent: any;
+        (Index: number): Range;
     }
 
     class AutoCorrect {
         private 'Excel.AutoCorrect_typekey': AutoCorrect;
         private constructor();
-        AddReplacement(What: string, Replacement: string): any;
+
+        /** @returns The string to be replaced */
+        AddReplacement(What: string, Replacement: string): string;
         readonly Application: Application;
         AutoExpandListRange: boolean;
         AutoFillFormulasInLists: boolean;
@@ -3667,10 +3514,12 @@ declare namespace Excel {
         CorrectCapsLock: boolean;
         CorrectSentenceCap: boolean;
         readonly Creator: XlCreator;
-        DeleteReplacement(What: string): any;
+
+        /** @returns The string to be replaced */
+        DeleteReplacement(What: string): string;
         DisplayAutoCorrectOptions: boolean;
         readonly Parent: any;
-        ReplacementList(Index?: any): any;
+        ReplacementList(Index: number): SafeArray<string>;
         ReplaceText: boolean;
         TwoInitialCapitals: boolean;
     }
@@ -3700,62 +3549,172 @@ declare namespace Excel {
         Time: number;
     }
 
+    interface Axes {
+        /** @param AxisGroup [AxisGroup=1] */
+        _Default(Type: XlAxisType, AxisGroup?: XlAxisGroup): Axis;
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+
+        /** @param AxisGroup [AxisGroup=1] */
+        Item(Type: XlAxisType, AxisGroup?: XlAxisGroup): Axis;
+        readonly Parent: any;
+
+        /** @param AxisGroup [AxisGroup=1] */
+        (Type: XlAxisType, AxisGroup?: XlAxisGroup): Axis;
+    }
+
+    class Axis {
+        private 'Excel.Axis_typekey': Axis;
+        private constructor();
+        readonly Application: Application;
+        AxisBetweenCategories: boolean;
+        readonly AxisGroup: XlAxisGroup;
+        readonly AxisTitle: AxisTitle;
+        BaseUnit: XlTimeUnit;
+        BaseUnitIsAuto: boolean;
+        readonly Border: Border;
+        CategoryNames: SafeArray<string> | Range;
+        CategoryType: XlCategoryType;
+        readonly Creator: XlCreator;
+        Crosses: XlAxisCrosses;
+        CrossesAt: number;
+        Delete(): any;
+        DisplayUnit: XlDisplayUnit;
+        DisplayUnitCustom: number;
+        readonly DisplayUnitLabel: DisplayUnitLabel;
+        readonly Format: ChartFormat;
+        HasDisplayUnitLabel: boolean;
+        HasMajorGridlines: boolean;
+        HasMinorGridlines: boolean;
+        HasTitle: boolean;
+        readonly Height: number;
+        readonly Left: number;
+        LogBase: number;
+        readonly MajorGridlines: Gridlines;
+        MajorTickMark: XlTickMark;
+        MajorUnit: number;
+        MajorUnitIsAuto: boolean;
+        MajorUnitScale: XlTimeUnit;
+        MaximumScale: number;
+        MaximumScaleIsAuto: boolean;
+        MinimumScale: number;
+        MinimumScaleIsAuto: boolean;
+        readonly MinorGridlines: Gridlines;
+        MinorTickMark: XlTickMark;
+        MinorUnit: number;
+        MinorUnitIsAuto: boolean;
+        MinorUnitScale: XlTimeUnit;
+        readonly Parent: any;
+        ReversePlotOrder: boolean;
+        ScaleType: XlScaleType;
+        Select(): any;
+        TickLabelPosition: XlTickLabelPosition;
+        readonly TickLabels: TickLabels;
+        TickLabelSpacing: number;
+        TickLabelSpacingIsAuto: boolean;
+        TickMarkSpacing: number;
+        readonly Top: number;
+        Type: XlAxisType;
+        readonly Width: number;
+    }
+
+    class AxisTitle {
+        private 'Excel.AxisTitle_typekey': AxisTitle;
+        private constructor();
+        readonly Application: Application;
+        AutoScaleFont: any;
+        readonly Border: Border;
+        Caption: string;
+        Characters(Start?: number, Length?: number): Characters;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Fill: ChartFillFormat;
+        readonly Font: Font;
+        readonly Format: ChartFormat;
+        Formula: string;
+        FormulaLocal: string;
+        FormulaR1C1: string;
+        FormulaR1C1Local: string;
+        readonly Height: number;
+        HorizontalAlignment: HorizontalAlignments;
+        IncludeInLayout: boolean;
+        readonly Interior: Interior;
+        Left: number;
+        readonly Name: string;
+        Orientation: number | XlOrientation;
+        readonly Parent: any;
+        Position: XlChartElementPosition;
+        ReadingOrder: number;
+        Select(): any;
+        Shadow: boolean;
+        Text: string;
+        Top: number;
+        VerticalAlignment: VerticalAlignments;
+        readonly Width: number;
+    }
+
     class Border {
         private 'Excel.Border_typekey': Border;
         private constructor();
         readonly Application: Application;
-        Color: any;
-        ColorIndex: any;
+        Color: XlRgbColor | number;
+        ColorIndex: number | XlColorIndex;
         readonly Creator: XlCreator;
-        LineStyle: XlLineStyle | Constants.xlGray25 | Constants.xlGray50 | Constants.xlGray75 | Constants.xlAutomatic;
+        LineStyle: LineStyle;
         readonly Parent: any;
-        ThemeColor: any;
-        TintAndShade: any;
-        Weight: any;
+        ThemeColor: XlThemeColor;
+        TintAndShade: number;
+        Weight: XlBorderWeight;
     }
 
-    class Borders {
-        private 'Excel.Borders_typekey': Borders;
-        private constructor();
+    interface Borders {
         _Default(Index: XlBordersIndex): Border;
         readonly Application: Application;
-        Color: any;
-        ColorIndex: any;
+        Color: XlRgbColor | number;
+        ColorIndex: number | XlColorIndex | null;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: XlBordersIndex): Border;
-        LineStyle: any;
+        LineStyle: LineStyle;
         readonly Parent: any;
-        ThemeColor: any;
-        TintAndShade: any;
-        Value: any;
-        Weight: any;
+        ThemeColor: XlThemeColor;
+        TintAndShade: number;
+        Value: LineStyle;
+        Weight: XlBorderWeight;
+        (Index: XlBordersIndex): Border;
     }
 
-    class CalculatedFields {
-        private 'Excel.CalculatedFields_typekey': CalculatedFields;
-        private constructor();
+    interface CalculatedFields {
         _Add(Name: string, Formula: string): PivotField;
         _Default(Field: any): PivotField;
-        Add(Name: string, Formula: string, UseStandardFormula?: any): PivotField;
+
+        /**
+         * @param UseStandardFormula [UseStandardFormula=false]
+         */
+        Add(Name: string, Formula: string, UseStandardFormula?: boolean): PivotField;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotField;
+        Item(Index: number | string): PivotField;
         readonly Parent: any;
+        (Field: number | string): PivotField;
     }
 
-    class CalculatedItems {
-        private 'Excel.CalculatedItems_typekey': CalculatedItems;
-        private constructor();
+    interface CalculatedItems {
         _Add(Name: string, Formula: string): PivotItem;
-        _Default(Field: any): PivotItem;
-        Add(Name: string, Formula: string, UseStandardFormula?: any): PivotItem;
+        _Default(Field: number | string): PivotItem;
+
+        /**
+         * @param UseStandardFormula [UseStandardFormula=false]
+         */
+        Add(Name: string, Formula: string, UseStandardFormula?: boolean): PivotItem;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotItem;
+        Item(Index: number | string): PivotItem;
         readonly Parent: any;
+        (Field: number | string): PivotItem;
     }
 
     class CalculatedMember {
@@ -3778,17 +3737,19 @@ declare namespace Excel {
         readonly Type: XlCalculatedMemberType;
     }
 
-    class CalculatedMembers {
-        private 'Excel.CalculatedMembers_typekey': CalculatedMembers;
-        private constructor();
+    interface CalculatedMembers {
         _Add(Name: string, Formula: string, SolveOrder?: any, Type?: any): CalculatedMember;
         _Default(Index: any): CalculatedMember;
-        Add(Name: string, Formula: any, SolveOrder?: any, Type?: any, Dynamic?: any, DisplayFolder?: any, HierarchizeDistinct?: any): CalculatedMember;
+        Add(Name: string, Formula: string, SolveOrder?: number, Type?: XlCalculatedMemberType, Dynamic?: boolean, DisplayFolder?: string, HierarchizeDistinct?: boolean): CalculatedMember;
+
+        /** @version 2013 */
+        AddCalculatedMember(Name: string, Formula: string, SolveOrder?: number, Type?: XlCalculatedMemberType, DisplayFolder?: string, MeasureGroup?: any, ParentMember?: any, NumberFormat?: any): CalculatedMember;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): CalculatedMember;
+        Item(Index: number | string): CalculatedMember;
         readonly Parent: any;
+        (Index: number | string): CalculatedMember;
     }
 
     class CalloutFormat {
@@ -3816,25 +3777,25 @@ declare namespace Excel {
     class CellFormat {
         private 'Excel.CellFormat_typekey': CellFormat;
         private constructor();
-        AddIndent: any;
+        AddIndent: boolean;
         readonly Application: Application;
         Borders: Borders;
         Clear(): void;
         readonly Creator: XlCreator;
         Font: Font;
-        FormulaHidden: any;
-        HorizontalAlignment: any;
-        IndentLevel: any;
+        FormulaHidden: boolean | null;
+        HorizontalAlignment: HorizontalAlignments;
+        IndentLevel: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15;
         Interior: Interior;
-        Locked: any;
-        MergeCells: any;
-        NumberFormat: any;
-        NumberFormatLocal: any;
-        Orientation: any;
+        Locked: boolean | null;
+        MergeCells: boolean;
+        NumberFormat: string | null;
+        NumberFormatLocal: string | null;
+        Orientation: number | XlOrientation;
         readonly Parent: any;
-        ShrinkToFit: any;
-        VerticalAlignment: any;
-        WrapText: any;
+        ShrinkToFit: boolean | null;
+        VerticalAlignment: VerticalAlignments;
+        WrapText: boolean | null;
     }
 
     class Characters {
@@ -3844,9 +3805,9 @@ declare namespace Excel {
         Caption: string;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Delete(): any;
+        Delete(): null;
         readonly Font: Font;
-        Insert(String: string): any;
+        Insert(String: string | null): string;
         readonly Parent: any;
         PhoneticCharacters: string;
         Text: string;
@@ -3857,67 +3818,62 @@ declare namespace Excel {
         private constructor();
         __PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any): void;
 
-        /** @param Excel.XlDataLabelsType [Type=2] */
+        /** @param Type [Type=2] */
         _ApplyDataLabels(Type?: XlDataLabelsType, LegendKey?: any, AutoText?: any, HasLeaderLines?: any): void;
         _CodeName: string;
         _Evaluate(Name: any): any;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
         _Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any): void;
-        _SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any): void;
+        _SaveAs(Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any, TextVisualLayout?: any): void;
         Activate(): void;
         readonly Application: Application;
         ApplyChartTemplate(Filename: string): void;
         ApplyCustomType(ChartType: XlChartType, TypeName?: any): void;
 
-        /** @param Excel.XlDataLabelsType [Type=2] */
-        ApplyDataLabels(
-            Type?: XlDataLabelsType, LegendKey?: any, AutoText?: any, HasLeaderLines?: any, ShowSeriesName?: any, ShowCategoryName?: any, ShowValue?: any,
-            ShowPercentage?: any, ShowBubbleSize?: any, Separator?: any): void;
-        ApplyLayout(Layout: number, ChartType?: any): void;
+        /** @param Type [Type=2] */
+        ApplyDataLabels(Type?: XlDataLabelsType, LegendKey?: boolean, AutoText?: boolean, HasLeaderLines?: boolean, ShowSeriesName?: boolean, ShowCategoryName?: boolean, ShowValue?: boolean, ShowPercentage?: boolean, ShowBubbleSize?: boolean, Separator?: string): void;
+        ApplyLayout(Layout: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10, ChartType?: XlChartType): void;
         Arcs(Index?: any): any;
         readonly Area3DGroup: ChartGroup;
         AreaGroups(Index?: any): any;
         AutoFormat(Gallery: number, Format?: any): void;
         AutoScaling: boolean;
 
-        /** @param Excel.XlAxisGroup [AxisGroup=1] */
-        Axes(Type: any, AxisGroup?: XlAxisGroup): any;
+        /** @param AxisGroup [AxisGroup=1] */
+        Axes(Type?: XlAxisType, AxisGroup?: XlAxisGroup): Axes | Axis;
         readonly BackWall: Walls;
         readonly Bar3DGroup: ChartGroup;
         BarGroups(Index?: any): any;
         BarShape: XlBarShape;
         Buttons(Index?: any): any;
         readonly ChartArea: ChartArea;
-        ChartGroups(Index?: any): any;
-        ChartObjects(Index?: any): any;
-        ChartStyle: any;
+        ChartObjects(Index?: SafeArray<string | number>): ChartObjects;
+        ChartObjects(Index: string | number): ChartObject;
+        ChartStyle: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15 | 16 | 17 | 18 | 19 | 20 | 21 | 22 | 23 | 24 | 25 | 26 | 27 | 28 | 29 | 30 | 31 | 32 | 33 | 34 | 35 | 36 | 37 | 38 | 39 | 40 | 41 | 42 | 43 | 44 | 45 | 46 | 47 | 48;
         readonly ChartTitle: ChartTitle;
         ChartType: XlChartType;
-        ChartWizard(
-            Source?: any, Gallery?: any, Format?: any, PlotBy?: any, CategoryLabels?: any, SeriesLabels?: any, HasLegend?: any, Title?: any, CategoryTitle?: any,
-            ValueTitle?: any, ExtraTitle?: any): void;
+        ChartWizard(Source?: Range, Gallery?: XlChartType, Format?: 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10, PlotBy?: XlRowCol, CategoryLabels?: number, SeriesLabels?: number, HasLegend?: boolean, Title?: string, CategoryTitle?: string, ValueTitle?: string, ExtraTitle?: string): void;
         CheckBoxes(Index?: any): any;
-        CheckSpelling(CustomDictionary?: any, IgnoreUppercase?: any, AlwaysSuggest?: any, SpellLang?: any): void;
+        CheckSpelling(CustomDictionary?: string, IgnoreUppercase?: boolean, AlwaysSuggest?: boolean, SpellLang?: Office.MsoLanguageID): void;
         ClearToMatchStyle(): void;
         readonly CodeName: string;
         readonly Column3DGroup: ChartGroup;
         ColumnGroups(Index?: any): any;
-        Copy(Before?: any, After?: any): void;
+        Copy(Before?: Sheet): void;
+        Copy(Before: undefined, After: Sheet): void;
         CopyChartBuild(): void;
 
         /**
-         * @param Excel.XlPictureAppearance [Appearance=1]
-         * @param Excel.XlCopyPictureFormat [Format=-4147]
-         * @param Excel.XlPictureAppearance [Size=2]
+         * @param Appearance [Appearance=1]
+         * @param Format [Format=-4147]
+         * @param Size [Size=2]
          */
         CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat, Size?: XlPictureAppearance): void;
         readonly Corners: Corners;
 
         /**
-         * @param Excel.XlPictureAppearance [Appearance=1]
-         * @param Excel.XlPictureAppearance [Size=1]
+         * @param Appearance [Appearance=1]
+         * @param Size [Size=1]
          */
         CreatePublisher(Edition: any, Appearance?: XlPictureAppearance, Size?: XlPictureAppearance, ContainsPICT?: any, ContainsBIFF?: any, ContainsRTF?: any, ContainsVALU?: any): void;
         readonly Creator: XlCreator;
@@ -3933,17 +3889,15 @@ declare namespace Excel {
         Dummy24: boolean;
         Dummy25: boolean;
         Elevation: number;
-        Evaluate(Name: any): any;
-        Export(Filename: string, FilterName?: any, Interactive?: any): boolean;
-        ExportAsFixedFormat(
-            Type: XlFixedFormatType, Filename?: any, Quality?: any, IncludeDocProperties?: any, IgnorePrintAreas?: any, From?: any, To?: any, OpenAfterPublish?: any,
-            FixedFormatExtClassPtr?: any): void;
+        Evaluate(Name: string): any;
+        Export(Filename: string, FilterName?: string, Interactive?: boolean): boolean;
+        ExportAsFixedFormat(Type: XlFixedFormatType, Filename?: string, Quality?: XlFixedFormatQuality, IncludeDocProperties?: boolean, IgnorePrintAreas?: boolean, From?: number, To?: number, OpenAfterPublish?: boolean, FixedFormatExtClassPtr?: any): void;
         readonly Floor: Floor;
         GapDepth: number;
         GetChartElement(x: number, y: number, ElementID: number, Arg1: number, Arg2: number): void;
         GroupBoxes(Index?: any): any;
         GroupObjects(Index?: any): any;
-        HasAxis(Index1?: any, Index2?: any): any;
+        HasAxis(Index1?: XlAxisType, Index2?: XlAxisGroup): boolean;
         HasDataTable: boolean;
         HasLegend: boolean;
         HasPivotFields: boolean;
@@ -3957,12 +3911,14 @@ declare namespace Excel {
         LineGroups(Index?: any): any;
         Lines(Index?: any): any;
         ListBoxes(Index?: any): any;
-        Location(Where: XlChartLocation, Name?: any): Chart;
+        Location(Where: XlChartLocation.xlLocationAsObject, Name: string): Chart;
+        Location(Where: XlChartLocation, Name?: string): Chart;
         readonly MailEnvelope: Office.MsoEnvelope;
-        Move(Before?: any, After?: any): void;
+        Move(Before?: Sheet, After?: Sheet): void;
         Name: string;
-        readonly Next: any;
-        OLEObjects(Index?: any): any;
+        readonly Next: Sheet;
+        OLEObjects(Index: number | string): OLEObject;
+        OLEObjects(): OLEObjects;
         OnDoubleClick: string;
         OnSheetActivate: string;
         OnSheetDeactivate: string;
@@ -3970,7 +3926,7 @@ declare namespace Excel {
         Ovals(Index?: any): any;
         readonly PageSetup: PageSetup;
         readonly Parent: any;
-        Paste(Type?: any): void;
+        Paste(Type?: XlPasteType.xlPasteAll | XlPasteType.xlPasteFormats | XlPasteType.xlPasteFormulas): void;
         Perspective: number;
         Pictures(Index?: any): any;
         readonly Pie3DGroup: ChartGroup;
@@ -3979,11 +3935,13 @@ declare namespace Excel {
         readonly PlotArea: PlotArea;
         PlotBy: XlRowCol;
         PlotVisibleOnly: boolean;
-        readonly Previous: any;
+        readonly Previous: Sheet;
         readonly PrintedCommentPages: number;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
-        PrintPreview(EnableChanges?: any): void;
-        Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any): void;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>): any;
+        PrintPreview(EnableChanges?: boolean): void;
+
+        /** @param Scenarios Passing `true` for this argument is only valid on worksheets */
+        Protect(Password?: string, DrawingObjects?: boolean, Contents?: boolean, Scenarios?: false, UserInterfaceOnly?: boolean): void;
         readonly ProtectContents: boolean;
         ProtectData: boolean;
         readonly ProtectDrawingObjects: boolean;
@@ -3994,20 +3952,20 @@ declare namespace Excel {
         RadarGroups(Index?: any): any;
         Rectangles(Index?: any): any;
         Refresh(): void;
-        RightAngleAxes: any;
-        Rotation: any;
-        SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any, Local?: any): void;
+
+        /** `true` if the chart axes are at right angles, independent of chart rotation or elevation. Applies only to 3-D line, column, and bar charts. */
+        RightAngleAxes: boolean;
+        Rotation: number;
+        SaveAs(Filename: string, FileFormat?: XlFileFormat, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, AddToMru?: boolean, TextCodepage?: any, TextVisualLayout?: any, Local?: any): void;
         SaveChartTemplate(Filename: string): void;
         readonly Scripts: Office.Scripts;
         ScrollBars(Index?: any): any;
-        Select(Replace?: any): void;
-        SeriesCollection(Index?: any): any;
+        Select(Replace?: boolean): void;
+        SeriesCollection(Index?: number | string): SeriesCollection | Series;
         SetBackgroundPicture(Filename: string): void;
         SetDefaultChart(Name: any): void;
         SetElement(Element: Office.MsoChartElementType): void;
-        SetSourceData(Source: Range, PlotBy?: any): void;
+        SetSourceData(Source: Range, PlotBy?: XlRowCol): void;
         readonly Shapes: Shapes;
         ShowAllFieldButtons: boolean;
         ShowAxisFieldButtons: boolean;
@@ -4024,7 +3982,7 @@ declare namespace Excel {
         readonly Tab: Tab;
         TextBoxes(Index?: any): any;
         Type: number;
-        Unprotect(Password?: any): void;
+        Unprotect(Password?: string): void;
         Visible: XlSheetVisibility;
         readonly Walls: Walls;
         WallsAndGridlines2D: boolean;
@@ -4138,18 +4096,114 @@ declare namespace Excel {
         readonly Parent: any;
         readonly RadarAxisLabels: TickLabels;
         SecondPlotSize: number;
-        SeriesCollection(Index?: any): any;
+        SeriesCollection(Index?: number | string): SeriesCollection | Series;
         readonly SeriesLines: SeriesLines;
         ShowNegativeBubbles: boolean;
         SizeRepresents: XlSizeRepresents;
         SplitType: XlChartSplitType;
-        SplitValue: any;
+        SplitValue: number;
         SubType: number;
         Type: number;
         readonly UpBars: UpBars;
         VaryByCategories: boolean;
     }
 
+    interface ChartGroups {
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Item(Index: number): ChartGroup;
+        readonly Parent: any;
+        (Index: number): ChartGroup;
+    }
+
+    class ChartObject {
+        private 'Excel.ChartObject_typekey': ChartObject;
+        private constructor();
+        _Copy(): any;
+        Activate(): any;
+        readonly Application: Application;
+        readonly Border: Border;
+        readonly BottomRightCell: Range;
+        BringToFront(): any;
+        readonly Chart: Chart;
+        Copy(): any;
+
+        /**
+         * @param Appearance [Appearance=2]
+         * @param Format [Format=-4147]
+         */
+        CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
+        readonly Creator: XlCreator;
+        Cut(): any;
+        Delete(): any;
+        Duplicate(): any;
+        Enabled: boolean;
+        Height: number;
+        readonly Index: number;
+        readonly Interior: Interior;
+        Left: number;
+        Locked: boolean;
+        Name: string;
+        OnAction: string;
+        readonly Parent: any;
+        Placement: XlPlacement;
+        PrintObject: boolean;
+        ProtectChartObject: boolean;
+        RoundedCorners: boolean;
+        Select(Replace?: boolean): any;
+        SendToBack(): any;
+        Shadow: boolean;
+        readonly ShapeRange: ShapeRange;
+        Top: number;
+        readonly TopLeftCell: Range;
+        Visible: boolean;
+        Width: number;
+        readonly ZOrder: number;
+    }
+
+    interface ChartObjects {
+        _Copy(): any;
+        _Default(Index: any): any;
+        Add(Left: number, Top: number, Width: number, Height: number): ChartObject;
+        readonly Application: Application;
+        readonly Border: Border;
+        BringToFront(): any;
+        Copy(): any;
+
+        /**
+         * @param Appearance [Appearance=2]
+         * @param Format [Format=-4147]
+         */
+        CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Cut(): any;
+        Delete(): any;
+        Duplicate(): any;
+        Enabled: boolean;
+        Group(): GroupObject;
+        Height: number;
+        readonly Interior: Interior;
+        Item(Index: number | string): ChartObject;
+        Left: number;
+        Locked: boolean;
+        OnAction: string;
+        readonly Parent: any;
+        Placement: XlPlacement;
+        PrintObject: boolean;
+        ProtectChartObject: boolean;
+        RoundedCorners: boolean;
+        Select(Replace?: boolean): any;
+        SendToBack(): any;
+        Shadow: boolean;
+        readonly ShapeRange: ShapeRange;
+        Top: number;
+        Visible: boolean;
+        Width: number;
+        (Index: number | string): any;
+    }
+
     class ChartTitle {
         private 'Excel.ChartTitle_typekey': ChartTitle;
         private constructor();
@@ -4157,7 +4211,7 @@ declare namespace Excel {
         AutoScaleFont: any;
         readonly Border: Border;
         Caption: string;
-        Characters(Start?: any, Length?: any): Characters;
+        Characters(Start?: number, Length?: number): Characters;
         readonly Creator: XlCreator;
         Delete(): any;
         readonly Fill: ChartFillFormat;
@@ -4168,7 +4222,7 @@ declare namespace Excel {
         FormulaR1C1: string;
         FormulaR1C1Local: string;
         readonly Height: number;
-        HorizontalAlignment: any;
+        HorizontalAlignment: HorizontalAlignments;
         IncludeInLayout: boolean;
         readonly Interior: Interior;
         Left: number;
@@ -4181,7 +4235,7 @@ declare namespace Excel {
         Shadow: boolean;
         Text: string;
         Top: number;
-        VerticalAlignment: any;
+        VerticalAlignment: VerticalAlignments;
         readonly Width: number;
     }
 
@@ -4199,6 +4253,42 @@ declare namespace Excel {
         readonly Type: Office.MsoColorType;
     }
 
+    class ColorScale {
+        private 'Excel.ColorScale_typekey': ColorScale;
+        private constructor();
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly ColorScaleCriteria: ColorScaleCriteria;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        Formula: string;
+        ModifyAppliesToRange(Range: Range): void;
+        readonly Parent: any;
+        Priority: number;
+        readonly PTCondition: boolean;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        readonly StopIfTrue: boolean;
+        readonly Type: number;
+    }
+
+    interface ColorScaleCriteria {
+        _Default(Index: any): ColorScaleCriterion;
+        readonly Count: number;
+        Item(Index: number): ColorScaleCriterion;
+        (Index: number): ColorScaleCriterion;
+    }
+
+    class ColorScaleCriterion {
+        private 'Excel.ColorScaleCriterion_typekey': ColorScaleCriterion;
+        private constructor();
+        readonly FormatColor: FormatColor;
+        readonly Index: number;
+        Type: XlConditionValueTypes;
+        Value: any;
+    }
+
     class Comment {
         private 'Excel.Comment_typekey': Comment;
         private constructor();
@@ -4210,32 +4300,44 @@ declare namespace Excel {
         readonly Parent: any;
         Previous(): Comment;
         readonly Shape: Shape;
-        Text(Text?: any, Start?: any, Overwrite?: any): string;
+        Text(Text?: string, Start?: number, Overwrite?: boolean): string;
         Visible: boolean;
     }
 
-    class Comments {
-        private 'Excel.Comments_typekey': Comments;
-        private constructor();
+    interface Comments {
         _Default(Index: number): Comment;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): Comment;
         readonly Parent: any;
+        (Index: number): Comment;
     }
 
-    class Connections {
-        private 'Excel.Connections_typekey': Connections;
+    class ConditionValue {
+        private 'Excel.ConditionValue_typekey': ConditionValue;
         private constructor();
+        readonly Application: Application;
+        readonly Creator: XlCreator;
+        Modify(newtype: XlConditionValueTypes.xlConditionValueLowestValue | XlConditionValueTypes.xlConditionValueHighestValue): void;
+        Modify(newtype: XlConditionValueTypes.xlConditionValueNumber | XlConditionValueTypes.xlConditionValuePercent | XlConditionValueTypes.xlConditionValuePercentile, newvalue: number): void;
+        Modify(newtype: XlConditionValueTypes.xlConditionValueFormula, newvalue: string): void;
+        Modify(newtype: XlConditionValueTypes, newvalue?: any): void;
+        readonly Parent: any;
+        readonly Type: XlConditionValueTypes;
+        Value: number | string;
+    }
+
+    interface Connections {
         _Default(Index: any): WorkbookConnection;
-        Add(Name: string, Description: string, ConnectionString: any, CommandText: any, lCmdtype?: any): WorkbookConnection;
+        Add(Name: string, Description: string, ConnectionString: string, CommandText: string, lCmdtype?: any): WorkbookConnection;
         AddFromFile(Filename: string): WorkbookConnection;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): WorkbookConnection;
+        Item(Index: number): WorkbookConnection;
         readonly Parent: any;
+        (Index: number): WorkbookConnection;
     }
 
     class ConnectorFormat {
@@ -4261,14 +4363,15 @@ declare namespace Excel {
         private 'Excel.ControlFormat_typekey': ControlFormat;
         private constructor();
         _Default: number;
-        AddItem(Text: string, Index?: any): void;
+        AddItem(Text: string, Index?: number): void;
         readonly Application: Application;
         readonly Creator: XlCreator;
         DropDownLines: number;
         Enabled: boolean;
         LargeChange: number;
         LinkedCell: string;
-        List(Index?: any): any;
+        List(Index: number): string;
+        List(): SafeArray<string>;
         ListCount: number;
         ListFillRange: string;
         ListIndex: number;
@@ -4279,7 +4382,7 @@ declare namespace Excel {
         readonly Parent: any;
         PrintObject: boolean;
         RemoveAllItems(): void;
-        RemoveItem(Index: number, Count?: any): void;
+        RemoveItem(Index: number, Count?: number): void;
         SmallChange: number;
         Value: number;
     }
@@ -4299,7 +4402,7 @@ declare namespace Excel {
         private constructor();
         _AddMemberPropertyField(Property: string, PropertyOrder?: any): void;
         readonly _Caption: string;
-        AddMemberPropertyField(Property: string, PropertyOrder?: any, PropertyDisplayedIn?: any): void;
+        AddMemberPropertyField(Property: string, PropertyOrder?: number, PropertyDisplayedIn?: XlPropertyDisplayedIn): void;
         readonly AllItemsVisible: boolean;
         readonly Application: Application;
         Caption: string;
@@ -4334,28 +4437,26 @@ declare namespace Excel {
         readonly Value: string;
     }
 
-    class CubeFields {
-        private 'Excel.CubeFields_typekey': CubeFields;
-        private constructor();
+    interface CubeFields {
         _Default(Index: any): CubeField;
         AddSet(Name: string, Caption: string): CubeField;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): CubeField;
+        Item(Index: number | string): CubeField;
         readonly Parent: any;
+        (Index: number | string): CubeField;
     }
 
-    class CustomProperties {
-        private 'Excel.CustomProperties_typekey': CustomProperties;
-        private constructor();
+    interface CustomProperties {
         _Default(Index: any): CustomProperty;
         Add(Name: string, Value: any): CustomProperty;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): CustomProperty;
+        Item(Index: number | string): CustomProperty;
         readonly Parent: any;
+        (Index: number | string): CustomProperty;
     }
 
     class CustomProperty {
@@ -4383,16 +4484,139 @@ declare namespace Excel {
         Show(): void;
     }
 
-    class CustomViews {
-        private 'Excel.CustomViews_typekey': CustomViews;
-        private constructor();
+    interface CustomViews {
         _Default(ViewName: any): CustomView;
-        Add(ViewName: string, PrintSettings?: any, RowColSettings?: any): CustomView;
+        Add(ViewName: string, PrintSettings?: boolean, RowColSettings?: boolean): CustomView;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(ViewName: any): CustomView;
+        Item(ViewName: number | string): CustomView;
         readonly Parent: any;
+        (ViewName: number | string): CustomView;
+    }
+
+    class Databar {
+        private 'Excel.Databar_typekey': Databar;
+        private constructor();
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly AxisColor: FormatColor;
+        AxisPosition: XlDataBarAxisPosition;
+        readonly BarBorder: DataBarBorder;
+        readonly BarColor: FormatColor;
+        BarFillType: XlDataBarFillType;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        Direction: number;
+        Formula: string;
+        readonly MaxPoint: ConditionValue;
+        readonly MinPoint: ConditionValue;
+        ModifyAppliesToRange(Range: Range): void;
+        readonly NegativeBarFormat: NegativeBarFormat;
+        readonly Parent: any;
+        PercentMax: number;
+        PercentMin: number;
+        Priority: number;
+        readonly PTCondition: boolean;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        ShowValue: boolean;
+        readonly StopIfTrue: boolean;
+        readonly Type: number;
+    }
+
+    class DataBarBorder {
+        private 'Excel.DataBarBorder_typekey': DataBarBorder;
+        private constructor();
+        readonly Application: Application;
+        readonly Color: FormatColor;
+        readonly Creator: XlCreator;
+        readonly Parent: any;
+        Type: XlDataBarBorderType;
+    }
+
+    class DataLabel {
+        private 'Excel.DataLabel_typekey': DataLabel;
+        private constructor();
+        readonly Application: Application;
+        AutoScaleFont: any;
+        AutoText: boolean;
+        readonly Border: Border;
+        Caption: string;
+        Characters(Start?: number, Length?: number): Characters;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Fill: ChartFillFormat;
+        readonly Font: Font;
+        readonly Format: ChartFormat;
+        Formula: string;
+        FormulaLocal: string;
+        FormulaR1C1: string;
+        FormulaR1C1Local: string;
+        readonly Height: number;
+        HorizontalAlignment: HorizontalAlignments;
+        readonly Interior: Interior;
+        Left: number;
+        readonly Name: string;
+        NumberFormat: string;
+        NumberFormatLinked: boolean;
+        NumberFormatLocal: string;
+        Orientation: XlOrientation;
+        readonly Parent: any;
+        Position: XlDataLabelPosition;
+        ReadingOrder: number;
+        Select(): any;
+        Separator: string | XlDataLabelSeparator;
+        Shadow: boolean;
+        ShowBubbleSize: boolean;
+        ShowCategoryName: boolean;
+        ShowLegendKey: boolean;
+        ShowPercentage: boolean;
+        ShowSeriesName: boolean;
+        ShowValue: boolean;
+        Text: string;
+        Top: number;
+        Type: any;
+        VerticalAlignment: VerticalAlignments;
+        readonly Width: number;
+    }
+
+    interface DataLabels {
+        _Default(Index: any): DataLabel;
+        readonly Application: Application;
+        AutoScaleFont: any;
+        AutoText: boolean;
+        readonly Border: Border;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Fill: ChartFillFormat;
+        readonly Font: Font;
+        readonly Format: ChartFormat;
+        HorizontalAlignment: HorizontalAlignments;
+        readonly Interior: Interior;
+        Item(Index: number): DataLabel;
+        readonly Name: string;
+        NumberFormat: string;
+        NumberFormatLinked: boolean;
+        NumberFormatLocal: string;
+        Orientation: XlOrientation;
+        readonly Parent: any;
+        Position: XlDataLabelPosition;
+        ReadingOrder: number;
+        Select(): any;
+        Separator: string | XlDataLabelSeparator;
+        Shadow: boolean;
+        ShowBubbleSize: boolean;
+        ShowCategoryName: boolean;
+        ShowLegendKey: boolean;
+        ShowPercentage: boolean;
+        ShowSeriesName: boolean;
+        ShowValue: boolean;
+        Type: any;
+        VerticalAlignment: VerticalAlignments;
+        (Index: number): DataLabel;
     }
 
     class DataTable {
@@ -4460,14 +4684,14 @@ declare namespace Excel {
         private constructor();
 
         /**
-         * @param Office.MsoRelativeNodePosition [pos=2]
-         * @param Office.MsoDiagramNodeType [nodeType=1]
+         * @param pos [pos=2]
+         * @param nodeType [nodeType=1]
          */
         AddNode(pos?: Office.MsoRelativeNodePosition, nodeType?: Office.MsoDiagramNodeType): DiagramNode;
         readonly Application: any;
         readonly Children: DiagramNodeChildren;
 
-        /** @param Office.MsoRelativeNodePosition [pos=2] */
+        /** @param pos [pos=2] */
         CloneNode(copyChildren: boolean, pTargetNode: DiagramNode, pos?: Office.MsoRelativeNodePosition): DiagramNode;
         readonly Creator: number;
         Delete(): void;
@@ -4481,19 +4705,16 @@ declare namespace Excel {
         readonly Root: DiagramNode;
         readonly Shape: Shape;
 
-        /** @param boolean [swapChildren=true] */
+        /** @param swapChildren [swapChildren=true] */
         SwapNode(pTargetNode: DiagramNode, swapChildren?: boolean): void;
         readonly TextShape: Shape;
         TransferChildren(pReceivingNode: DiagramNode): void;
     }
 
-    class DiagramNodeChildren {
-        private 'Excel.DiagramNodeChildren_typekey': DiagramNodeChildren;
-        private constructor();
-
+    interface DiagramNodeChildren {
         /**
-         * @param any [Index=-1]
-         * @param Office.MsoDiagramNodeType [nodeType=1]
+         * @param Index [Index=-1]
+         * @param nodeType [nodeType=1]
          */
         AddNode(Index?: any, nodeType?: Office.MsoDiagramNodeType): DiagramNode;
         readonly Application: any;
@@ -4504,17 +4725,17 @@ declare namespace Excel {
         readonly LastChild: DiagramNode;
         readonly Parent: any;
         SelectAll(): void;
+        (Index: any): DiagramNode;
     }
 
-    class DiagramNodes {
-        private 'Excel.DiagramNodes_typekey': DiagramNodes;
-        private constructor();
+    interface DiagramNodes {
         readonly Application: any;
         readonly Count: number;
         readonly Creator: number;
         Item(Index: any): DiagramNode;
         readonly Parent: any;
         SelectAll(): void;
+        (Index: any): DiagramNode;
     }
 
     class Dialog {
@@ -4523,10 +4744,7 @@ declare namespace Excel {
         readonly Application: Application;
         readonly Creator: XlCreator;
         readonly Parent: any;
-        Show(
-            Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): boolean;
+        Show(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): boolean;
     }
 
     class DialogFrame {
@@ -4538,8 +4756,8 @@ declare namespace Excel {
         CheckSpelling(CustomDictionary?: any, IgnoreUppercase?: any, AlwaysSuggest?: any, SpellLang?: any): any;
 
         /**
-         * @param Excel.XlPictureAppearance [Appearance=2]
-         * @param Excel.XlCopyPictureFormat [Format=-4147]
+         * @param Appearance [Appearance=2]
+         * @param Format [Format=-4147]
          */
         CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
         readonly Creator: XlCreator;
@@ -4557,15 +4775,14 @@ declare namespace Excel {
         Width: number;
     }
 
-    class Dialogs {
-        private 'Excel.Dialogs_typekey': Dialogs;
-        private constructor();
+    interface Dialogs {
         _Default(Index: XlBuiltInDialog): Dialog;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: XlBuiltInDialog): Dialog;
         readonly Parent: any;
+        (Index: XlBuiltInDialog): Dialog;
     }
 
     class DialogSheet {
@@ -4579,9 +4796,7 @@ declare namespace Excel {
         _PasteSpecial(Format?: any, Link?: any, DisplayAsIcon?: any, IconFileName?: any, IconIndex?: any, IconLabel?: any): void;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
         _Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any): void;
-        _SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any): void;
+        _SaveAs(Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any, TextVisualLayout?: any): void;
         Activate(): void;
         readonly Application: Application;
         Arcs(Index?: any): any;
@@ -4594,7 +4809,8 @@ declare namespace Excel {
         ClearCircles(): void;
         readonly CodeName: string;
         readonly Comments: Comments;
-        Copy(Before?: any, After?: any): void;
+        Copy(Before?: Sheet): void;
+        Copy(Before: undefined, After: Sheet): void;
         readonly Creator: XlCreator;
         readonly CustomProperties: CustomProperties;
         DefaultButton: any;
@@ -4614,9 +4830,7 @@ declare namespace Excel {
         EnablePivotTable: boolean;
         EnableSelection: XlEnableSelection;
         Evaluate(Name: any): any;
-        ExportAsFixedFormat(
-            Type: XlFixedFormatType, Filename?: any, Quality?: any, IncludeDocProperties?: any, IgnorePrintAreas?: any, From?: any, To?: any, OpenAfterPublish?: any,
-            FixedFormatExtClassPtr?: any): void;
+        ExportAsFixedFormat(Type: XlFixedFormatType, Filename?: any, Quality?: any, IncludeDocProperties?: any, IgnorePrintAreas?: any, From?: any, To?: any, OpenAfterPublish?: any, FixedFormatExtClassPtr?: any): void;
         Focus: any;
         GroupBoxes(Index?: any): any;
         GroupObjects(Index?: any): any;
@@ -4628,7 +4842,7 @@ declare namespace Excel {
         Lines(Index?: any): any;
         ListBoxes(Index?: any): any;
         readonly MailEnvelope: Office.MsoEnvelope;
-        Move(Before?: any, After?: any): void;
+        Move(Before?: Sheet, After?: Sheet): void;
         Name: string;
         readonly Names: Names;
         readonly Next: any;
@@ -4645,12 +4859,9 @@ declare namespace Excel {
         Pictures(Index?: any): any;
         readonly Previous: any;
         readonly PrintedCommentPages: number;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>): any;
         PrintPreview(EnableChanges?: any): void;
-        Protect(
-            Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any, AllowFormattingCells?: any, AllowFormattingColumns?: any,
-            AllowFormattingRows?: any, AllowInsertingColumns?: any, AllowInsertingRows?: any, AllowInsertingHyperlinks?: any, AllowDeletingColumns?: any,
-            AllowDeletingRows?: any, AllowSorting?: any, AllowFiltering?: any, AllowUsingPivotTables?: any): void;
+        Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any, AllowFormattingCells?: any, AllowFormattingColumns?: any, AllowFormattingRows?: any, AllowInsertingColumns?: any, AllowInsertingRows?: any, AllowInsertingHyperlinks?: any, AllowDeletingColumns?: any, AllowDeletingRows?: any, AllowSorting?: any, AllowFiltering?: any, AllowUsingPivotTables?: any): void;
         readonly ProtectContents: boolean;
         readonly ProtectDrawingObjects: boolean;
         readonly Protection: Protection;
@@ -4659,9 +4870,7 @@ declare namespace Excel {
         readonly QueryTables: QueryTables;
         Rectangles(Index?: any): any;
         ResetAllPageBreaks(): void;
-        SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any, Local?: any): void;
+        SaveAs(Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any, TextVisualLayout?: any, Local?: any): void;
         readonly Scripts: Office.Scripts;
         ScrollArea: string;
         ScrollBars(Index?: any): any;
@@ -4678,30 +4887,73 @@ declare namespace Excel {
         readonly VPageBreaks: VPageBreaks;
     }
 
+    class DialogSheetView {
+        private 'Excel.DialogSheetView_typekey': DialogSheetView;
+        private constructor();
+        readonly Application: Application;
+        readonly Creator: XlCreator;
+        readonly Parent: any;
+        readonly Sheet: DialogSheet;
+    }
+
     class DisplayFormat {
         private 'Excel.DisplayFormat_typekey': DisplayFormat;
         private constructor();
-        readonly AddIndent: any;
+        readonly AddIndent: boolean | null;
         readonly Application: Application;
         readonly Borders: Borders;
-        Characters(Start?: any, Length?: any): Characters;
+        Characters(Start?: number, Length?: number): Characters;
         readonly Creator: XlCreator;
         readonly Font: Font;
-        readonly FormulaHidden: any;
+        readonly FormulaHidden: boolean | null;
         readonly HorizontalAlignment: any;
         readonly IndentLevel: any;
         readonly Interior: Interior;
-        readonly Locked: any;
-        readonly MergeCells: any;
-        readonly NumberFormat: any;
-        readonly NumberFormatLocal: any;
+        readonly Locked: boolean | null;
+        readonly MergeCells: boolean;
+        readonly NumberFormat: string | null;
+        readonly NumberFormatLocal: string | null;
         readonly Orientation: any;
         readonly Parent: any;
         readonly ReadingOrder: number;
-        readonly ShrinkToFit: any;
-        readonly Style: any;
+        readonly ShrinkToFit: boolean;
+        readonly Style: Style;
         readonly VerticalAlignment: any;
-        readonly WrapText: any;
+        readonly WrapText: boolean;
+    }
+
+    class DisplayUnitLabel {
+        private 'Excel.DisplayUnitLabel_typekey': DisplayUnitLabel;
+        private constructor();
+        readonly Application: Application;
+        AutoScaleFont: any;
+        readonly Border: Border;
+        Caption: string;
+        Characters(Start?: number, Length?: number): Characters;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Fill: ChartFillFormat;
+        readonly Font: Font;
+        readonly Format: ChartFormat;
+        Formula: string;
+        FormulaLocal: string;
+        FormulaR1C1: string;
+        FormulaR1C1Local: string;
+        readonly Height: number;
+        HorizontalAlignment: HorizontalAlignments;
+        readonly Interior: Interior;
+        Left: number;
+        readonly Name: string;
+        Orientation: XlOrientation;
+        readonly Parent: any;
+        Position: XlChartElementPosition;
+        ReadingOrder: number;
+        Select(): any;
+        Shadow: boolean;
+        Text: string;
+        Top: number;
+        VerticalAlignment: VerticalAlignments;
+        readonly Width: number;
     }
 
     class DownBars {
@@ -4742,6 +4994,21 @@ declare namespace Excel {
         readonly Value: boolean;
     }
 
+    class ErrorBars {
+        private 'Excel.ErrorBars_typekey': ErrorBars;
+        private constructor();
+        readonly Application: Application;
+        readonly Border: Border;
+        ClearFormats(): any;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        EndStyle: XlEndStyleCap;
+        readonly Format: ChartFormat;
+        readonly Name: string;
+        readonly Parent: any;
+        Select(): any;
+    }
+
     class ErrorCheckingOptions {
         private 'Excel.ErrorCheckingOptions_typekey': ErrorCheckingOptions;
         private constructor();
@@ -4761,14 +5028,13 @@ declare namespace Excel {
         UnlockedFormulaCells: boolean;
     }
 
-    class Errors {
-        private 'Excel.Errors_typekey': Errors;
-        private constructor();
+    interface Errors {
         _Default(Index: any): Error;
         readonly Application: Application;
         readonly Creator: XlCreator;
-        Item(Index: any): Error;
+        Item(Index: number | XlErrorChecks): Error;
         readonly Parent: any;
+        (Index: number | XlErrorChecks): Error;
     }
 
     class FileExportConverter {
@@ -4782,15 +5048,14 @@ declare namespace Excel {
         readonly Parent: any;
     }
 
-    class FileExportConverters {
-        private 'Excel.FileExportConverters_typekey': FileExportConverters;
-        private constructor();
+    interface FileExportConverters {
         _Default(Index: any): FileExportConverter;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): FileExportConverter;
+        Item(Index: number): FileExportConverter;
         readonly Parent: any;
+        (Index: number): FileExportConverter;
     }
 
     class FillFormat {
@@ -4848,15 +5113,14 @@ declare namespace Excel {
         readonly Parent: any;
     }
 
-    class Filters {
-        private 'Excel.Filters_typekey': Filters;
-        private constructor();
+    interface Filters {
         _Default(Index: number): Filter;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): Filter;
         readonly Parent: any;
+        (Index: number): Filter;
     }
 
     class Floor {
@@ -4872,7 +5136,7 @@ declare namespace Excel {
         readonly Name: string;
         readonly Parent: any;
         Paste(): void;
-        PictureType: any;
+        PictureType: XlChartPictureType;
         Select(): any;
         Thickness: number;
     }
@@ -4881,133 +5145,103 @@ declare namespace Excel {
         private 'Excel.Font_typekey': Font;
         private constructor();
         readonly Application: Application;
-        Background: any;
-        Bold: any;
-        Color: any;
-        ColorIndex: any;
+        Background: XlBackground;
+        Bold: boolean;
+        Color: XlRgbColor | number;
+        ColorIndex: number | XlColorIndex;
         readonly Creator: XlCreator;
-        FontStyle: any;
-        Italic: any;
-        Name: any;
+        FontStyle: 'Regular' | 'Italic' | 'Bold' | 'Bold Italic';
+        Italic: boolean;
+        Name: string;
         OutlineFont: any;
         readonly Parent: any;
         Shadow: any;
-        Size: any;
-        Strikethrough: any;
-        Subscript: any;
-        Superscript: any;
-        ThemeColor: any;
+        Size: number;
+        Strikethrough: boolean;
+        Subscript: boolean;
+        Superscript: boolean;
+        ThemeColor: XlThemeColor;
         ThemeFont: XlThemeFont;
-        TintAndShade: any;
-        Underline: any;
+        TintAndShade: number;
+        Underline: XlUnderlineStyle;
     }
 
     class FormatColor {
         private 'Excel.FormatColor_typekey': FormatColor;
         private constructor();
         readonly Application: Application;
-        Color: any;
+        Color: XlRgbColor | number;
         ColorIndex: XlColorIndex;
         readonly Creator: XlCreator;
         readonly Parent: any;
-        ThemeColor: any;
-        TintAndShade: any;
+        ThemeColor: XlThemeColor;
+        TintAndShade: number;
     }
 
-    class FormatConditions {
-        private 'Excel.FormatConditions_typekey': FormatConditions;
+    class FormatCondition {
+        private 'Excel.FormatCondition_typekey': FormatCondition;
         private constructor();
+        _Modify(Type: XlFormatConditionType, Operator?: any, Formula1?: any, Formula2?: any): void;
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly Borders: Borders;
+        readonly Creator: XlCreator;
+        DateOperator: XlTimePeriods;
+        Delete(): void;
+        readonly Font: Font;
+        readonly Formula1: string;
+        readonly Formula2: string;
+        readonly Interior: Interior;
+        Modify(Type: XlFormatConditionType.xlExpression, Operator: undefined, Formula1: string): void;
+        Modify(Type: XlFormatConditionType, Operator: XlFormatConditionOperator.xlBetween | XlFormatConditionOperator.xlNotBetween, Formula1: string, Formula2: string): void;
+        Modify(Type: XlFormatConditionType, Operator?: XlFormatConditionOperator, Formula1?: string, Formula2?: string, String?: any, Operator2?: any): void;
+        ModifyAppliesToRange(Range: Range): void;
+        NumberFormat: string;
+        readonly Operator: number;
+        readonly Parent: any;
+        Priority: number;
+        readonly PTCondition: boolean;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        StopIfTrue: boolean;
+        Text: string;
+        TextOperator: XlContainsOperator;
+        readonly Type: number;
+    }
+
+    interface FormatConditions {
         _Default(Index: any): any;
-        Add(Type: XlFormatConditionType, Operator?: any, Formula1?: any, Formula2?: any, String?: any, TextOperator?: any, DateOperator?: any, ScopeType?: any): any;
-        AddAboveAverage(): any;
-        AddColorScale(ColorScaleType: number): any;
-        AddDatabar(): any;
-        AddIconSetCondition(): any;
-        AddTop10(): any;
-        AddUniqueValues(): any;
+        Add(Type: XlFormatConditionType.xlExpression, Operator: undefined, Formula1: string): FormatCondition;
+        Add(Type: XlFormatConditionType, Operator: XlFormatConditionOperator.xlBetween | XlFormatConditionOperator.xlNotBetween, Formula1: string, Formula2: string): FormatCondition;
+        Add(Type: XlFormatConditionType, Operator?: XlFormatConditionOperator, Formula1?: string, Formula2?: string, String?: any, TextOperator?: any, DateOperator?: any, ScopeType?: any): FormatCondition;
+        AddAboveAverage(): AboveAverage;
+        AddColorScale(ColorScaleType: number): ColorScale;
+        AddDatabar(): Databar;
+        AddIconSetCondition(): IconSetCondition;
+        AddTop10(): Top10;
+        AddUniqueValues(): UniqueValues;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Delete(): void;
-        Item(Index: any): any;
+        Item(Index: number | string): FormatCondition;
         readonly Parent: any;
+        (Index: number | string): FormatCondition;
     }
 
     class FreeformBuilder {
         private 'Excel.FreeformBuilder_typekey': FreeformBuilder;
         private constructor();
-        AddNodes(SegmentType: Office.MsoSegmentType, EditingType: Office.MsoEditingType, X1: number, Y1: number, X2?: any, Y2?: any, X3?: any, Y3?: any): void;
+        AddNodes(SegmentType: Office.MsoSegmentType.msoSegmentCurve, EditingType: Office.MsoEditingType.msoEditingCorner, X1: number, Y1: number, X2: number, Y2: number, X3: number, Y3: number): void;
+        AddNodes(SegmentType: Office.MsoSegmentType, EditingType: Office.MsoEditingType.msoEditingAuto, X1: number, Y1: number): void;
         readonly Application: Application;
         ConvertToShape(): Shape;
         readonly Creator: XlCreator;
         readonly Parent: any;
     }
 
-    class Global {
-        private 'Excel.Global_typekey': Global;
-        private constructor();
-        _Evaluate(Name: any): any;
-        _Run2(
-            Macro?: any, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
-        readonly ActiveCell: Range;
-        readonly ActiveChart: Chart;
-        readonly ActiveDialog: DialogSheet;
-        readonly ActiveMenuBar: MenuBar;
-        ActivePrinter: string;
-        readonly ActiveSheet: any;
-        readonly ActiveWindow: Window;
-        readonly ActiveWorkbook: Workbook;
-        readonly AddIns: AddIns;
-        readonly Application: Application;
-        readonly Assistant: Office.Assistant;
-        Calculate(): void;
-        readonly Cells: Range;
-        readonly Charts: Sheets;
-        readonly Columns: Range;
-        readonly CommandBars: Office.CommandBars;
-        readonly Creator: XlCreator;
-        readonly DDEAppReturnCode: number;
-        DDEExecute(Channel: number, String: string): void;
-        DDEInitiate(App: string, Topic: string): number;
-        DDEPoke(Channel: number, Item: any, Data: any): void;
-        DDERequest(Channel: number, Item: string): any;
-        DDETerminate(Channel: number): void;
-        readonly DialogSheets: Sheets;
-        Evaluate(Name: any): any;
-        readonly Excel4IntlMacroSheets: Sheets;
-        readonly Excel4MacroSheets: Sheets;
-        ExecuteExcel4Macro(String: string): any;
-        Intersect(
-            Arg1: Range, Arg2: Range, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): Range;
-        readonly MenuBars: MenuBars;
-        readonly Modules: Modules;
-        readonly Names: Names;
-        readonly Parent: Application;
-        Range(Cell1: any, Cell2?: any): Range;
-        readonly Rows: Range;
-        Run(
-            Macro?: any, Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
-        readonly Selection: any;
-        SendKeys(Keys: any, Wait?: any): void;
-        readonly Sheets: Sheets;
-        ShortcutMenus(Index: number): Menu;
-        readonly ThisWorkbook: Workbook;
-        readonly Toolbars: Toolbars;
-        Union(
-            Arg1: Range, Arg2: Range, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): Range;
-        readonly Windows: Windows;
-        readonly Workbooks: Workbooks;
-        readonly WorksheetFunction: WorksheetFunction;
-        readonly Worksheets: Sheets;
-    }
+    // there is no way to use the Globals class from within Javascript
 
     class Graphic {
         private 'Excel.Graphic_typekey': Graphic;
@@ -5028,16 +5262,82 @@ declare namespace Excel {
         Width: number;
     }
 
-    class GroupShapes {
-        private 'Excel.GroupShapes_typekey': GroupShapes;
+    class Gridlines {
+        private 'Excel.Gridlines_typekey': Gridlines;
         private constructor();
+        readonly Application: Application;
+        readonly Border: Border;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Format: ChartFormat;
+        readonly Name: string;
+        readonly Parent: any;
+        Select(): any;
+    }
+
+    class GroupObject {
+        private 'Excel.GroupObject_typekey': GroupObject;
+        private constructor();
+        _Default: number;
+        AddIndent: boolean;
+        readonly Application: Application;
+        ArrowHeadLength: any;
+        ArrowHeadStyle: any;
+        ArrowHeadWidth: any;
+        AutoSize: boolean;
+        readonly Border: Border;
+        readonly BottomRightCell: Range;
+        BringToFront(): any;
+        CheckSpelling(CustomDictionary?: any, IgnoreUppercase?: any, AlwaysSuggest?: any, SpellLang?: any): any;
+        Copy(): any;
+
+        /**
+         * @param Appearance [Appearance=2]
+         * @param Format [Format=-4147]
+         */
+        CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
+        readonly Creator: XlCreator;
+        Cut(): any;
+        Delete(): any;
+        Duplicate(): any;
+        Enabled: boolean;
+        readonly Font: Font;
+        Height: number;
+        HorizontalAlignment: any;
+        readonly Index: number;
+        readonly Interior: Interior;
+        Left: number;
+        Locked: boolean;
+        Name: string;
+        OnAction: string;
+        Orientation: any;
+        readonly Parent: any;
+        Placement: any;
+        PrintObject: boolean;
+        ReadingOrder: number;
+        RoundedCorners: boolean;
+        Select(Replace?: any): any;
+        SendToBack(): any;
+        Shadow: boolean;
+        readonly ShapeRange: ShapeRange;
+        Top: number;
+        readonly TopLeftCell: Range;
+        Ungroup(): any;
+        VerticalAlignment: any;
+        Visible: boolean;
+        Width: number;
+        readonly ZOrder: number;
+    }
+
+    interface GroupShapes {
         _Default(Index: any): Shape;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): Shape;
+        Item(Index: number | string): Shape;
         readonly Parent: any;
-        Range(Index: any): ShapeRange;
+        Range(Index: number | string | SafeArray<number | string>): ShapeRange;
+        (Index: number | string): Shape;
     }
 
     class HeaderFooter {
@@ -5073,16 +5373,15 @@ declare namespace Excel {
         Type: XlPageBreak;
     }
 
-    class HPageBreaks {
-        private 'Excel.HPageBreaks_typekey': HPageBreaks;
-        private constructor();
+    interface HPageBreaks {
         _Default(Index: number): HPageBreak;
-        Add(Before: any): HPageBreak;
+        Add(Before: Range): HPageBreak;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): HPageBreak;
         readonly Parent: any;
+        (Index: number): HPageBreak;
     }
 
     class Hyperlink {
@@ -5095,7 +5394,7 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Delete(): void;
         EmailSubject: string;
-        Follow(NewWindow?: any, AddHistory?: any, ExtraInfo?: any, Method?: any, HeaderInfo?: any): void;
+        Follow(NewWindow?: boolean, AddHistory?: undefined, ExtraInfo?: string | Office.ByteArray, Method?: Office.MsoExtraInfoMethod, HeaderInfo?: string): void;
         readonly Name: string;
         readonly Parent: any;
         readonly Range: Range;
@@ -5106,17 +5405,16 @@ declare namespace Excel {
         readonly Type: number;
     }
 
-    class Hyperlinks {
-        private 'Excel.Hyperlinks_typekey': Hyperlinks;
-        private constructor();
+    interface Hyperlinks {
         _Default(Index: any): Hyperlink;
-        Add(Anchor: any, Address: string, SubAddress?: any, ScreenTip?: any, TextToDisplay?: any): any;
+        Add(Anchor: Range | Shape, Address: string, SubAddress?: string, ScreenTip?: string, TextToDisplay?: string): Hyperlink;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Delete(): void;
-        Item(Index: any): Hyperlink;
+        Item(Index: number | string): Hyperlink;
         readonly Parent: any;
+        (Index: number | string): Hyperlink;
     }
 
     class Icon {
@@ -5128,46 +5426,100 @@ declare namespace Excel {
         readonly Parent: IconSet;
     }
 
-    class IconSet {
-        private 'Excel.IconSet_typekey': IconSet;
-        private constructor();
+    // tslint:disable-next-line:interface-name
+    interface IconSet {
         _Default(Index: any): Icon;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         readonly ID: XlIconSet;
-        Item(Index: any): Icon;
+        Item(Index: number): Icon;
         readonly Parent: any;
+        (Index: number): Icon;
     }
 
-    class IconSets {
-        private 'Excel.IconSets_typekey': IconSets;
+    class IconSetCondition {
+        private 'Excel.IconSetCondition_typekey': IconSetCondition;
         private constructor();
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        Formula: string;
+        readonly IconCriteria: IconCriteria;
+        IconSet: IconSets;
+        ModifyAppliesToRange(Range: Range): void;
+        readonly Parent: any;
+        PercentileValues: boolean;
+        Priority: number;
+        readonly PTCondition: boolean;
+        ReverseOrder: boolean;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        ShowIconOnly: boolean;
+        readonly StopIfTrue: boolean;
+        readonly Type: number;
+    }
+
+    // tslint:disable-next-line:interface-name
+    interface IconCriteria {
+        _Default(Index: any): IconCriterion;
+        readonly Count: number;
+        Item(Index: number): IconCriterion;
+        (Index: number): IconCriterion;
+    }
+
+    class IconCriterion {
+        private 'Excel.IconCriterion_typekey': IconCriterion;
+        private constructor();
+        Icon: XlIcon;
+        readonly Index: number;
+        Operator: number;
+        Type: XlConditionValueTypes;
+        Value: number | string;
+    }
+
+    // tslint:disable-next-line:interface-name
+    interface IconSets {
         _Default(Index: any): any;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): any;
+        Item(Index: number): IconSet;
         readonly Parent: any;
+        (Index: number): IconSet;
     }
 
     class Interior {
         private 'Excel.Interior_typekey': Interior;
         private constructor();
         readonly Application: Application;
-        Color: any;
+        Color: XlRgbColor | number;
         ColorIndex: number | XlColorIndex;
         readonly Creator: XlCreator;
         readonly Gradient: any;
-        InvertIfNegative: any;
+        InvertIfNegative: boolean;
         readonly Parent: any;
-        Pattern: any;
-        PatternColor: any;
-        PatternColorIndex: any;
-        PatternThemeColor: any;
-        PatternTintAndShade: any;
-        ThemeColor: any;
-        TintAndShade: any;
+        Pattern: XlPattern;
+        PatternColor: XlRgbColor | number;
+        PatternColorIndex: number | XlColorIndex;
+        PatternThemeColor: XlThemeColor;
+        PatternTintAndShade: number;
+        ThemeColor: XlThemeColor;
+        TintAndShade: number;
+    }
+
+    class LeaderLines {
+        private 'Excel.LeaderLines_typekey': LeaderLines;
+        private constructor();
+        readonly Application: Application;
+        readonly Border: Border;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        readonly Format: ChartFormat;
+        readonly Parent: any;
+        Select(): void;
     }
 
     class Legend {
@@ -5186,7 +5538,7 @@ declare namespace Excel {
         IncludeInLayout: boolean;
         readonly Interior: Interior;
         Left: number;
-        LegendEntries(Index?: any): any;
+        LegendEntries: LegendEntries & ((Index: number) => LegendEntry);
         readonly Name: string;
         readonly Parent: any;
         Position: XlLegendPosition;
@@ -5196,6 +5548,66 @@ declare namespace Excel {
         Width: number;
     }
 
+    interface LegendEntries {
+        _Default(Index: any): LegendEntry;
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Item(Index: number): LegendEntry;
+        readonly Parent: any;
+        (Index: number): LegendEntry;
+    }
+
+    class LegendEntry {
+        private 'Excel.LegendEntry_typekey': LegendEntry;
+        private constructor();
+        readonly Application: Application;
+        AutoScaleFont: any;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Font: Font;
+        readonly Format: ChartFormat;
+        readonly Height: number;
+        readonly Index: number;
+        readonly Left: number;
+        readonly LegendKey: LegendKey;
+        readonly Parent: any;
+        Select(): any;
+        readonly Top: number;
+        readonly Width: number;
+    }
+
+    class LegendKey {
+        private 'Excel.LegendKey_typekey': LegendKey;
+        private constructor();
+        readonly Application: Application;
+        readonly Border: Border;
+        ClearFormats(): any;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        readonly Fill: ChartFillFormat;
+        readonly Format: ChartFormat;
+        readonly Height: number;
+        readonly Interior: Interior;
+        InvertIfNegative: boolean;
+        readonly Left: number;
+        MarkerBackgroundColor: number;
+        MarkerBackgroundColorIndex: XlColorIndex;
+        MarkerForegroundColor: number;
+        MarkerForegroundColorIndex: XlColorIndex;
+        MarkerSize: number;
+        MarkerStyle: XlMarkerStyle;
+        readonly Parent: any;
+        PictureType: number;
+        PictureUnit: number;
+        PictureUnit2: number;
+        Select(): any;
+        Shadow: boolean;
+        Smooth: boolean;
+        readonly Top: number;
+        readonly Width: number;
+    }
+
     class LineFormat {
         private 'Excel.LineFormat_typekey': LineFormat;
         private constructor();
@@ -5249,16 +5661,15 @@ declare namespace Excel {
         readonly XPath: XPath;
     }
 
-    class ListColumns {
-        private 'Excel.ListColumns_typekey': ListColumns;
-        private constructor();
+    interface ListColumns {
         _Default(Index: any): ListColumn;
-        Add(Position?: any): ListColumn;
+        Add(Position?: number): ListColumn;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): ListColumn;
+        Item(Index: number | string): ListColumn;
         readonly Parent: any;
+        (Index: number | string): ListColumn;
     }
 
     class ListDataFormat {
@@ -5267,15 +5678,15 @@ declare namespace Excel {
         readonly _Default: XlListDataType;
         readonly AllowFillIn: boolean;
         readonly Application: Application;
-        readonly Choices: any;
+        readonly Choices: SafeArray<string>;
         readonly Creator: XlCreator;
         readonly DecimalPlaces: number;
         readonly DefaultValue: any;
         readonly IsPercent: boolean;
         readonly lcid: number;
         readonly MaxCharacters: number;
-        readonly MaxNumber: any;
-        readonly MinNumber: any;
+        readonly MaxNumber: number | null;
+        readonly MinNumber: number | null;
         readonly Parent: any;
         readonly ReadOnly: boolean;
         readonly Required: boolean;
@@ -5303,7 +5714,7 @@ declare namespace Excel {
         readonly ListRows: ListRows;
         Name: string;
         readonly Parent: any;
-        Publish(Target: any, LinkSource: boolean): string;
+        Publish(Target: SafeArray<string>, LinkSource: boolean): string;
         readonly QueryTable: QueryTable;
         readonly Range: Range;
         Refresh(): void;
@@ -5324,32 +5735,33 @@ declare namespace Excel {
         Unlink(): void;
         Unlist(): void;
 
-        /** @param Excel.XlListConflict [iConflictType=0] */
+        /** @param iConflictType [iConflictType=0] */
         UpdateChanges(iConflictType?: XlListConflict): void;
         readonly XmlMap: XmlMap;
     }
 
-    class ListObjects {
-        private 'Excel.ListObjects_typekey': ListObjects;
-        private constructor();
-
+    interface ListObjects {
         /**
-         * @param Excel.XlListObjectSourceType [SourceType=1]
-         * @param Excel.XlYesNoGuess [XlListObjectHasHeaders=0]
+         * @param SourceType [SourceType=1]
+         * @param XlListObjectHasHeaders [XlListObjectHasHeaders=0]
          */
         _Add(SourceType?: XlListObjectSourceType, Source?: any, LinkSource?: any, XlListObjectHasHeaders?: XlYesNoGuess, Destination?: any): ListObject;
         _Default(Index: any): ListObject;
 
+        Add(SourceType: XlListObjectSourceType.xlSrcRange, Source?: Range, LinkSource?: undefined, XlListObjectHasHeaders?: XlYesNoGuess, Destination?: undefined, TableStyleName?: string): ListObject;
+        Add(SourceType: XlListObjectSourceType.xlSrcExternal, Source: SafeArray<string>, LinkSource: boolean, XlListObjectHasHeaders: XlYesNoGuess, Destination: Range, TableStyleName?: string): ListObject;
+
         /**
-         * @param Excel.XlListObjectSourceType [SourceType=1]
-         * @param Excel.XlYesNoGuess [XlListObjectHasHeaders=0]
+         * @param SourceType [SourceType=1]
+         * @param XlListObjectHasHeaders [XlListObjectHasHeaders=0]
          */
-        Add(SourceType?: XlListObjectSourceType, Source?: any, LinkSource?: any, XlListObjectHasHeaders?: XlYesNoGuess, Destination?: any, TableStyleName?: any): ListObject;
+        Add(SourceType?: XlListObjectSourceType, Source?: any, LinkSource?: boolean, XlListObjectHasHeaders?: XlYesNoGuess, Destination?: Range, TableStyleName?: string): ListObject;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): ListObject;
+        Item(Index: number | string): ListObject;
         readonly Parent: any;
+        (Index: number | string): ListObject;
     }
 
     class ListRow {
@@ -5364,19 +5776,19 @@ declare namespace Excel {
         readonly Range: Range;
     }
 
-    class ListRows {
-        private 'Excel.ListRows_typekey': ListRows;
-        private constructor();
+    interface ListRows {
         _Add(Position?: any): ListRow;
         _Default(Index: any): ListRow;
-        Add(Position?: any, AlwaysInsert?: any): ListRow;
+        Add(Position?: number, AlwaysInsert?: boolean): ListRow;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): ListRow;
+        Item(Index: number | string): ListRow;
         readonly Parent: any;
+        (Index: number | string): ListRow;
     }
 
+    /** Macintosh only */
     class Mailer {
         private 'Excel.Mailer_typekey': Mailer;
         private constructor();
@@ -5422,9 +5834,7 @@ declare namespace Excel {
         Reset(): void;
     }
 
-    class MenuBars {
-        private 'Excel.MenuBars_typekey': MenuBars;
-        private constructor();
+    interface MenuBars {
         _Default(Index: any): MenuBar;
         Add(Name?: any): MenuBar;
         readonly Application: Application;
@@ -5432,6 +5842,7 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Item(Index: any): MenuBar;
         readonly Parent: any;
+        (Index: any): MenuBar;
     }
 
     class MenuItem {
@@ -5451,9 +5862,7 @@ declare namespace Excel {
         StatusBar: string;
     }
 
-    class MenuItems {
-        private 'Excel.MenuItems_typekey': MenuItems;
-        private constructor();
+    interface MenuItems {
         _Default(Index: any): any;
         Add(Caption: string, OnAction?: any, ShortcutKey?: any, Before?: any, Restore?: any, StatusBar?: any, HelpFile?: any, HelpContextID?: any): MenuItem;
         AddMenu(Caption: string, Before?: any, Restore?: any): Menu;
@@ -5462,11 +5871,10 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Item(Index: any): any;
         readonly Parent: any;
+        (Index: any): any;
     }
 
-    class Menus {
-        private 'Excel.Menus_typekey': Menus;
-        private constructor();
+    interface Menus {
         _Default(Index: any): Menu;
         Add(Caption: string, Before?: any, Restore?: any): Menu;
         readonly Application: Application;
@@ -5474,6 +5882,7 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Item(Index: any): Menu;
         readonly Parent: any;
+        (Index: any): Menu;
     }
 
     class Module {
@@ -5483,9 +5892,7 @@ declare namespace Excel {
         _CodeName: string;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any): void;
         _Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any): void;
-        _SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any): void;
+        _SaveAs(Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any, TextVisualLayout?: any): void;
         Activate(): void;
         readonly Application: Application;
         readonly CodeName: string;
@@ -5507,18 +5914,14 @@ declare namespace Excel {
         Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any): void;
         readonly ProtectContents: boolean;
         readonly ProtectionMode: boolean;
-        SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any): void;
+        SaveAs(Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any, TextVisualLayout?: any): void;
         Select(Replace?: any): void;
         readonly Shapes: Shapes;
         Unprotect(Password?: any): void;
         Visible: XlSheetVisibility;
     }
 
-    class Modules {
-        private 'Excel.Modules_typekey': Modules;
-        private constructor();
+    interface Modules {
         __PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any): void;
         _Default(Index: any): any;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
@@ -5536,6 +5939,7 @@ declare namespace Excel {
         Select(Replace?: any): void;
         Visible: any;
         readonly VPageBreaks: VPageBreaks;
+        (Index: any): any;
     }
 
     class MultiThreadedCalculation {
@@ -5564,10 +5968,10 @@ declare namespace Excel {
         Name: string;
         NameLocal: string;
         readonly Parent: any;
-        RefersTo: any;
-        RefersToLocal: any;
-        RefersToR1C1: any;
-        RefersToR1C1Local: any;
+        RefersTo: string;
+        RefersToLocal: string;
+        RefersToR1C1: string;
+        RefersToR1C1Local: string;
         readonly RefersToRange: Range;
         ShortcutKey: string;
         readonly ValidWorkbookParameter: boolean;
@@ -5576,17 +5980,30 @@ declare namespace Excel {
         WorkbookParameter: boolean;
     }
 
-    class Names {
-        private 'Excel.Names_typekey': Names;
-        private constructor();
+    interface Names {
         _Default(Index?: any, IndexLocal?: any, RefersTo?: any): Name;
-        Add(
-            Name?: any, RefersTo?: any, Visible?: any, MacroType?: any, ShortcutKey?: any, Category?: any, NameLocal?: any, RefersToLocal?: any, CategoryLocal?: any,
-            RefersToR1C1?: any, RefersToR1C1Local?: any): Name;
+        Add(Name?: string, RefersTo?: string, Visible?: boolean, MacroType?: 1 | 2 | 3, ShortcutKey?: string, Category?: FunctionCategory | string, NameLocal?: string, RefersToLocal?: string, CategoryLocal?: string, RefersToR1C1?: string, RefersToR1C1Local?: string): Name;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index?: any, IndexLocal?: any, RefersTo?: any): Name;
+        Item(Index: number | string): Name;
+        Item(Index: undefined, IndexLocal: string): Name;
+        Item(Index: undefined, IndexLocal: undefined, RefersTo: string): Name;
+        readonly Parent: any;
+        (Index: number | string): Name;
+        (Index: undefined, IndexLocal: string): Name;
+        (Index: undefined, IndexLocal: undefined, RefersTo: string): Name;
+    }
+
+    class NegativeBarFormat {
+        private 'Excel.NegativeBarFormat_typekey': NegativeBarFormat;
+        private constructor();
+        readonly Application: Application;
+        readonly BorderColor: FormatColor;
+        BorderColorType: XlDataBarNegativeColorType;
+        readonly Color: FormatColor;
+        ColorType: XlDataBarNegativeColorType;
+        readonly Creator: XlCreator;
         readonly Parent: any;
     }
 
@@ -5597,9 +6014,9 @@ declare namespace Excel {
         readonly Application: Application;
         BackgroundQuery: boolean;
         CancelRefresh(): void;
-        CommandText: any;
+        CommandText: string;
         CommandType: XlCmdType;
-        Connection: any;
+        Connection: string;
         readonly Creator: XlCreator;
         EnableRefresh: boolean;
         readonly Parent: any;
@@ -5609,12 +6026,12 @@ declare namespace Excel {
         RefreshOnFileOpen: boolean;
         RefreshPeriod: number;
         RobustConnect: XlRobustConnect;
-        SaveAsODC(ODCFileName: string, Description?: any, Keywords?: any): void;
+        SaveAsODC(ODCFileName: string, Description?: string, Keywords?: string): void;
         SavePassword: boolean;
         ServerCredentialsMethod: XlCredentialsMethod;
         ServerSSOApplicationID: string;
         SourceConnectionFile: string;
-        SourceData: any;
+        SourceData: string | SafeArray<string> | PivotTable;
         SourceDataFile: string;
     }
 
@@ -5628,33 +6045,32 @@ declare namespace Excel {
         readonly SqlState: string;
     }
 
-    class ODBCErrors {
-        private 'Excel.ODBCErrors_typekey': ODBCErrors;
-        private constructor();
+    interface ODBCErrors {
         _Default(Index: number): ODBCError;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): ODBCError;
         readonly Parent: any;
+        (Index: number): ODBCError;
     }
 
     class OLEDBConnection {
         private 'Excel.OLEDBConnection_typekey': OLEDBConnection;
         private constructor();
-        readonly ADOConnection: any;
+        readonly ADOConnection: ADODB.Connection;
         AlwaysUseConnectionFile: boolean;
         readonly Application: Application;
         BackgroundQuery: boolean;
         readonly CalculatedMembers: CalculatedMembers;
         CancelRefresh(): void;
-        CommandText: any;
+        CommandText: string;
         CommandType: XlCmdType;
-        Connection: any;
+        Connection: string;
         readonly Creator: XlCreator;
         EnableRefresh: boolean;
         readonly IsConnected: boolean;
-        LocalConnection: any;
+        LocalConnection: string;
         LocaleID: number;
         MaintainConnection: boolean;
         MakeConnection(): void;
@@ -5669,7 +6085,7 @@ declare namespace Excel {
         RefreshPeriod: number;
         RetrieveInOfficeUILang: boolean;
         RobustConnect: XlRobustConnect;
-        SaveAsODC(ODCFileName: string, Description?: any, Keywords?: any): void;
+        SaveAsODC(ODCFileName: string, Description?: string, Keywords?: string): void;
         SavePassword: boolean;
         ServerCredentialsMethod: XlCredentialsMethod;
         ServerFillColor: boolean;
@@ -5695,15 +6111,14 @@ declare namespace Excel {
         readonly Stage: number;
     }
 
-    class OLEDBErrors {
-        private 'Excel.OLEDBErrors_typekey': OLEDBErrors;
-        private constructor();
+    interface OLEDBErrors {
         _Default(Index: number): OLEDBError;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): OLEDBError;
         readonly Parent: any;
+        (Index: number): OLEDBError;
     }
 
     class OLEFormat {
@@ -5715,7 +6130,7 @@ declare namespace Excel {
         readonly Object: any;
         readonly Parent: any;
         readonly progID: string;
-        Verb(Verb?: any): void;
+        Verb(Verb?: XlOLEVerb): void;
     }
 
     class OLEObject {
@@ -5732,8 +6147,8 @@ declare namespace Excel {
         Copy(): any;
 
         /**
-         * @param Excel.XlPictureAppearance [Appearance=2]
-         * @param Excel.XlCopyPictureFormat [Format=-4147]
+         * @param Appearance [Appearance=2]
+         * @param Format [Format=-4147]
          */
         CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
         readonly Creator: XlCreator;
@@ -5750,13 +6165,13 @@ declare namespace Excel {
         Locked: boolean;
         Name: string;
         readonly Object: any;
-        readonly OLEType: any;
+        readonly OLEType: XlOLEType.xlOLELink | XlOLEType.xlOLEEmbed;
         OnAction: string;
         readonly Parent: any;
-        Placement: any;
+        Placement: XlPlacement;
         PrintObject: boolean;
         readonly progID: string;
-        Select(Replace?: any): any;
+        Select(Replace?: boolean): any;
         SendToBack(): any;
         Shadow: boolean;
         readonly ShapeRange: ShapeRange;
@@ -5765,13 +6180,58 @@ declare namespace Excel {
         readonly TopLeftCell: Range;
         Update(): any;
 
-        /** @param Excel.XlOLEVerb [Verb=1] */
+        /** @param Verb [Verb=1] */
         Verb(Verb?: XlOLEVerb): any;
         Visible: boolean;
         Width: number;
         readonly ZOrder: number;
     }
 
+    class OLEObjects {
+        private 'Excel.OLEObjects_typekey': OLEObjects;
+        private constructor();
+        Add(ClassType: string, Filename: undefined, Link: undefined, DisplayAsIcon: true, IconFileName?: string, IconIndex?: number, IconLabel?: string, Left?: number, Top?: number, Width?: number, Height?: number): OLEObject;
+        Add(ClassType: string, Filename?: undefined, Link?: undefined, DisplayAsIcon?: false, IconFileName?: undefined, IconIndex?: undefined, IconLabel?: undefined, Left?: number, Top?: number, Width?: number, Height?: number): OLEObject;
+        Add(ClassType: undefined, Filename: string, Link: boolean, DisplayAsIcon: true, IconFileName?: string, IconIndex?: number, IconLabel?: string, Left?: number, Top?: number, Width?: number, Height?: number): OLEObject;
+        Add(ClassType: undefined, Filename: string, Link?: boolean, DisplayAsIcon?: false, IconFileName?: undefined, IconIndex?: undefined, IconLabel?: undefined, Left?: number, Top?: number, Width?: number, Height?: number): OLEObject;
+        readonly Application: Application;
+        AutoLoad: boolean;
+        readonly Border: Border;
+        BringToFront(): any;
+        Copy(): any;
+
+        /**
+         * @param Appearance [Appearance=2]
+         * @param Format [Format=-4147]
+         */
+        CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Cut(): any;
+        Delete(): any;
+        Duplicate(): any;
+        Enabled: boolean;
+        Group(): GroupObject;
+        Height: number;
+        readonly Interior: Interior;
+        Item(Index: number | string): any;
+        Left: number;
+        Locked: boolean;
+        OnAction: string;
+        readonly Parent: any;
+        Placement: any;
+        PrintObject: boolean;
+        Select(Replace?: boolean): any;
+        SendToBack(): any;
+        Shadow: boolean;
+        readonly ShapeRange: ShapeRange;
+        SourceName: string;
+        Top: number;
+        Visible: boolean;
+        Width: number;
+        readonly ZOrder: number;
+    }
+
     class Outline {
         private 'Excel.Outline_typekey': Outline;
         private constructor();
@@ -5779,7 +6239,7 @@ declare namespace Excel {
         AutomaticStyles: boolean;
         readonly Creator: XlCreator;
         readonly Parent: any;
-        ShowLevels(RowLevels?: any, ColumnLevels?: any): any;
+        ShowLevels(RowLevels?: number, ColumnLevels?: number): any;
         SummaryColumn: XlSummaryColumn;
         SummaryRow: XlSummaryRow;
     }
@@ -5795,12 +6255,11 @@ declare namespace Excel {
         readonly RightHeader: HeaderFooter;
     }
 
-    class Pages {
-        private 'Excel.Pages_typekey': Pages;
-        private constructor();
+    interface Pages {
         _Default(Index: any): Page;
         readonly Count: number;
-        Item(Index: any): Page;
+        Item(Index: number): Page;
+        (Index: number): Page;
     }
 
     class PageSetup {
@@ -5823,8 +6282,8 @@ declare namespace Excel {
         readonly EvenPage: Page;
         readonly FirstPage: Page;
         FirstPageNumber: number;
-        FitToPagesTall: any;
-        FitToPagesWide: any;
+        FitToPagesTall: number | false;
+        FitToPagesWide: number | false;
         FooterMargin: number;
         HeaderMargin: number;
         LeftFooter: string;
@@ -5844,7 +6303,7 @@ declare namespace Excel {
         PrintGridlines: boolean;
         PrintHeadings: boolean;
         PrintNotes: boolean;
-        PrintQuality(Index?: any): any;
+        PrintQuality: SafeArray<number> & ((Index: 1 | 2) => number);
         PrintTitleColumns: string;
         PrintTitleRows: string;
         RightFooter: string;
@@ -5854,7 +6313,9 @@ declare namespace Excel {
         RightMargin: number;
         ScaleWithDocHeaderFooter: boolean;
         TopMargin: number;
-        Zoom: any;
+
+        /** Represents a percentage between 10 and 400 */
+        Zoom: number;
     }
 
     class Pane {
@@ -5864,26 +6325,25 @@ declare namespace Excel {
         readonly Application: Application;
         readonly Creator: XlCreator;
         readonly Index: number;
-        LargeScroll(Down?: any, Up?: any, ToRight?: any, ToLeft?: any): any;
+        LargeScroll(Down?: number, Up?: number, ToRight?: number, ToLeft?: number): any;
         readonly Parent: any;
         PointsToScreenPixelsX(Points: number): number;
         PointsToScreenPixelsY(Points: number): number;
         ScrollColumn: number;
-        ScrollIntoView(Left: number, Top: number, Width: number, Height: number, Start?: any): void;
+        ScrollIntoView(Left: number, Top: number, Width: number, Height: number, Start?: boolean): void;
         ScrollRow: number;
-        SmallScroll(Down?: any, Up?: any, ToRight?: any, ToLeft?: any): any;
+        SmallScroll(Down?: number, Up?: number, ToRight?: number, ToLeft?: number): any;
         readonly VisibleRange: Range;
     }
 
-    class Panes {
-        private 'Excel.Panes_typekey': Panes;
-        private constructor();
+    interface Panes {
         _Default(Index: number): Pane;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): Pane;
         readonly Parent: any;
+        (Index: number): Pane;
     }
 
     class Parameter {
@@ -5902,17 +6362,16 @@ declare namespace Excel {
         readonly Value: any;
     }
 
-    class Parameters {
-        private 'Excel.Parameters_typekey': Parameters;
-        private constructor();
+    interface Parameters {
         _Default(Index: any): Parameter;
-        Add(Name: string, iDataType?: any): Parameter;
+        Add(Name: string, iDataType?: XlParameterDataType): Parameter;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Delete(): void;
-        Item(Index: any): Parameter;
+        Item(Index: number | string): Parameter;
         readonly Parent: any;
+        (Index: number | string): Parameter;
     }
 
     class Phonetic {
@@ -5928,9 +6387,7 @@ declare namespace Excel {
         Visible: boolean;
     }
 
-    class Phonetics {
-        private 'Excel.Phonetics_typekey': Phonetics;
-        private constructor();
+    interface Phonetics {
         _Default(Index: number): any;
         Add(Start: number, Length: number, Text: string): void;
         Alignment: number;
@@ -5940,12 +6397,13 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Delete(): void;
         readonly Font: Font;
-        Item(Index: number): any;
+        Item(Index: number): Phonetic;
         readonly Length: number;
         readonly Parent: any;
         readonly Start: number;
         Text: string;
         Visible: boolean;
+        (Index: number): Phonetic;
     }
 
     class PictureFormat {
@@ -5980,18 +6438,18 @@ declare namespace Excel {
     class PivotCache {
         private 'Excel.PivotCache_typekey': PivotCache;
         private constructor();
-        readonly ADOConnection: any;
+        readonly ADOConnection: ADODB.Connection;
         readonly Application: Application;
         BackgroundQuery: boolean;
-        CommandText: any;
+        CommandText: string;
         CommandType: XlCmdType;
-        Connection: any;
-        CreatePivotTable(TableDestination: any, TableName?: any, ReadData?: any, DefaultVersion?: any): PivotTable;
+        Connection: string;
+        CreatePivotTable(TableDestination: Range, TableName?: string, ReadData?: boolean, DefaultVersion?: any): PivotTable;
         readonly Creator: XlCreator;
         EnableRefresh: boolean;
         readonly Index: number;
         readonly IsConnected: boolean;
-        LocalConnection: any;
+        LocalConnection: string;
         MaintainConnection: boolean;
         MakeConnection(): void;
         readonly MemoryUsed: number;
@@ -6001,7 +6459,7 @@ declare namespace Excel {
         readonly Parent: any;
         readonly QueryType: XlQueryType;
         readonly RecordCount: number;
-        Recordset: any;
+        Recordset: ADODB.Recordset;
         Refresh(): void;
         readonly RefreshDate: VarDate;
         readonly RefreshName: string;
@@ -6009,10 +6467,10 @@ declare namespace Excel {
         RefreshPeriod: number;
         ResetTimer(): void;
         RobustConnect: XlRobustConnect;
-        SaveAsODC(ODCFileName: string, Description?: any, Keywords?: any): void;
+        SaveAsODC(ODCFileName: string, Description?: string, Keywords?: string): void;
         SavePassword: boolean;
         SourceConnectionFile: string;
-        SourceData: any;
+        SourceData: string | SafeArray<string> | PivotTable;
         readonly SourceDataFile: string;
         readonly SourceType: XlPivotTableSourceType;
         Sql: any;
@@ -6022,17 +6480,17 @@ declare namespace Excel {
         readonly WorkbookConnection: WorkbookConnection;
     }
 
-    class PivotCaches {
-        private 'Excel.PivotCaches_typekey': PivotCaches;
-        private constructor();
+    interface PivotCaches {
         _Default(Index: any): PivotCache;
         Add(SourceType: XlPivotTableSourceType, SourceData?: any): PivotCache;
         readonly Application: Application;
         readonly Count: number;
-        Create(SourceType: XlPivotTableSourceType, SourceData?: any, Version?: any): PivotCache;
+        Create(SourceType: XlPivotTableSourceType.xlDatabase | XlPivotTableSourceType.xlConsolidation, SourceData: string, Version?: XlPivotTableVersionList): PivotCache;
+        Create(SourceType: XlPivotTableSourceType.xlExternal, SourceData: WorkbookConnection, Version?: XlPivotTableVersionList): PivotCache;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotCache;
+        Item(Index: number): PivotCache;
         readonly Parent: any;
+        (Index: number): PivotCache;
     }
 
     class PivotCell {
@@ -6065,7 +6523,7 @@ declare namespace Excel {
         private constructor();
         _AutoSort(Order: number, Field: string): void;
         _Default: string;
-        AddPageItem(Item: string, ClearList?: any): void;
+        AddPageItem(Item: string, ClearList?: boolean): void;
         readonly AllItemsVisible: boolean;
         readonly Application: Application;
         AutoShow(Type: number, Range: number, Count: number, Field: string): void;
@@ -6084,15 +6542,15 @@ declare namespace Excel {
         Calculation: XlPivotFieldCalculation;
         Caption: string;
         readonly ChildField: PivotField;
-        ChildItems(Index?: any): any;
+        readonly ChildItems: PivotItemsResult;
         ClearAllFilters(): void;
         ClearLabelFilters(): void;
         ClearManualFilter(): void;
         ClearValueFilters(): void;
         readonly Creator: XlCreator;
         readonly CubeField: CubeField;
-        CurrentPage: any;
-        CurrentPageList: any;
+        CurrentPage: PivotItem;
+        CurrentPageList: SafeArray<string>;
         CurrentPageName: string;
         DatabaseSort: boolean;
         readonly DataRange: Range;
@@ -6112,10 +6570,10 @@ declare namespace Excel {
         EnableMultiplePageItems: boolean;
         Formula: string;
         Function: XlConsolidationFunction;
-        readonly GroupLevel: any;
+        readonly GroupLevel: number;
         Hidden: boolean;
-        HiddenItems(Index?: any): any;
-        HiddenItemsList: any;
+        readonly HiddenItems: PivotItemsResult;
+        HiddenItemsList: SafeArray<string>;
         IncludeNewItemsInFilter: boolean;
         readonly IsCalculated: boolean;
         readonly IsMemberProperty: boolean;
@@ -6132,9 +6590,9 @@ declare namespace Excel {
         Orientation: XlPivotFieldOrientation;
         readonly Parent: any;
         readonly ParentField: PivotField;
-        ParentItems(Index?: any): any;
+        readonly ParentItems: PivotItemsResult;
         readonly PivotFilters: PivotFilters;
-        PivotItems(Index?: any): any;
+        readonly PivotItems: PivotItemsResult;
         Position: any;
         PropertyOrder: number;
         readonly PropertyParentField: PivotField;
@@ -6147,12 +6605,12 @@ declare namespace Excel {
         readonly SourceName: string;
         StandardFormula: string;
         SubtotalName: string;
-        Subtotals(Index?: any): any;
-        readonly TotalLevels: any;
+        readonly Subtotals: SafeArray<boolean> & ((Index: PivotFieldSubtotal) => boolean);
+        readonly TotalLevels: number;
         UseMemberPropertyAsCaption: boolean;
         Value: string;
-        VisibleItems(Index?: any): any;
-        VisibleItemsList: any;
+        readonly VisibleItems: PivotItemsResult;
+        VisibleItemsList: SafeArray<string>;
     }
 
     class PivotFields {
@@ -6161,10 +6619,12 @@ declare namespace Excel {
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): any;
+        Item(Index: number | string): PivotField;
         readonly Parent: PivotTable;
     }
 
+    type PivotFieldsResult = PivotFields & ((Index: number | string) => PivotField) & ((Indexes: SafeArray<number | string>) => PivotFields);
+
     class PivotFilter {
         private 'Excel.PivotFilter_typekey': PivotFilter;
         private constructor();
@@ -6186,16 +6646,15 @@ declare namespace Excel {
         readonly Value2: any;
     }
 
-    class PivotFilters {
-        private 'Excel.PivotFilters_typekey': PivotFilters;
-        private constructor();
+    interface PivotFilters {
         _Default(Index: any): PivotFilter;
         Add(Type: XlPivotFilterType, DataField?: any, Value1?: any, Value2?: any, Order?: any, Name?: any, Description?: any, MemberPropertyField?: any): PivotFilter;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotFilter;
+        Item(Index: number): PivotFilter;
         readonly Parent: any;
+        (Index: number): PivotFilter;
     }
 
     class PivotFormula {
@@ -6212,17 +6671,16 @@ declare namespace Excel {
         Value: string;
     }
 
-    class PivotFormulas {
-        private 'Excel.PivotFormulas_typekey': PivotFormulas;
-        private constructor();
+    interface PivotFormulas {
         _Add(Formula: string): PivotFormula;
         _Default(Index: any): PivotFormula;
         Add(Formula: string, UseStandardFormula?: any): PivotFormula;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotFormula;
+        Item(Index: number | string): PivotFormula;
         readonly Parent: any;
+        (Index: number | string): PivotFormula;
     }
 
     class PivotItem {
@@ -6231,7 +6689,7 @@ declare namespace Excel {
         _Default: string;
         readonly Application: Application;
         Caption: string;
-        ChildItems(Index?: any): any;
+        ChildItems: PivotItemsResult;
         readonly Creator: XlCreator;
         readonly DataRange: Range;
         Delete(): void;
@@ -6254,17 +6712,29 @@ declare namespace Excel {
         Visible: boolean;
     }
 
-    class PivotItemList {
-        private 'Excel.PivotItemList_typekey': PivotItemList;
-        private constructor();
+    interface PivotItemList {
         _Default(Field: any): PivotItem;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotItem;
+        Item(Index: number | string): PivotItem;
         readonly Parent: any;
+        (Field: number | string): PivotItem;
     }
 
+    class PivotItems {
+        private 'Excel.PivotItems_typekey': PivotItems;
+        private constructor();
+        Add(Name: string): void;
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Item(Index: number | string): any;
+        readonly Parent: PivotField;
+    }
+
+    type PivotItemsResult = PivotItems & ((Index: number | string) => PivotItem) & ((Indexes: SafeArray<number | string>) => PivotItems);
+
     class PivotLayout {
         private 'Excel.PivotLayout_typekey': PivotLayout;
         private constructor();
@@ -6296,26 +6766,24 @@ declare namespace Excel {
         readonly Position: number;
     }
 
-    class PivotLineCells {
-        private 'Excel.PivotLineCells_typekey': PivotLineCells;
-        private constructor();
+    interface PivotLineCells {
         _Default(Index: any): PivotCell;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotCell;
+        Item(Index: number): PivotCell;
         readonly Parent: any;
+        (Index: number): PivotCell;
     }
 
-    class PivotLines {
-        private 'Excel.PivotLines_typekey': PivotLines;
-        private constructor();
+    interface PivotLines {
         _Default(Index: any): PivotLine;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotLine;
+        Item(Index: number): PivotLine;
         readonly Parent: any;
+        (Index: number): PivotLine;
     }
 
     class PivotTable {
@@ -6323,11 +6791,11 @@ declare namespace Excel {
         private constructor();
         _Default: string;
 
-        /** @param Excel.XlPTSelectionMode [Mode=0] */
+        /** @param Mode [Mode=0] */
         _PivotSelect(Name: string, Mode?: XlPTSelectionMode): void;
         readonly ActiveFilters: PivotFilters;
         AddDataField(Field: any, Caption?: any, Function?: any): PivotField;
-        AddFields(RowFields?: any, ColumnFields?: any, PageFields?: any, AddToTable?: any): any;
+        AddFields(RowFields?: string | SafeArray<string>, ColumnFields?: string | SafeArray<string>, PageFields?: string | SafeArray<string>, AddToTable?: boolean): any;
         AllocateChanges(): void;
         Allocation: XlAllocation;
         AllocationMethod: XlAllocationMethod;
@@ -6342,10 +6810,10 @@ declare namespace Excel {
         CalculatedMembersInFilters: boolean;
         ChangeConnection(conn: WorkbookConnection): void;
         readonly ChangeList: PivotTableChangeList;
-        ChangePivotCache(PivotCache: any): void;
+        ChangePivotCache(PivotCache: string): void;
         ClearAllFilters(): void;
         ClearTable(): void;
-        ColumnFields(Index?: any): any;
+        ColumnFields: PivotFieldsResult;
         ColumnGrand: boolean;
         readonly ColumnRange: Range;
         CommitChanges(): void;
@@ -6353,11 +6821,11 @@ declare namespace Excel {
         CompactLayoutRowHeader: string;
         CompactRowIndent: number;
         ConvertToFormulas(ConvertFilters: boolean): void;
-        CreateCubeFile(File: string, Measures?: any, Levels?: any, Members?: any, Properties?: any): string;
+        CreateCubeFile(File: string, Measures?: SafeArray<string>, Levels?: SafeArray<string>, Members?: SafeArray<SafeArray<string>>, Properties?: boolean): string;
         readonly Creator: XlCreator;
         readonly CubeFields: CubeFields;
         readonly DataBodyRange: Range;
-        DataFields(Index?: any): any;
+        DataFields: PivotFieldsResult;
         readonly DataLabelRange: Range;
         readonly DataPivotField: PivotField;
         DiscardChanges(): void;
@@ -6369,10 +6837,7 @@ declare namespace Excel {
         DisplayImmediateItems: boolean;
         DisplayMemberPropertyTooltips: boolean;
         DisplayNullString: boolean;
-        Dummy15(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Dummy15(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         EnableDataValueEditing: boolean;
         EnableDrilldown: boolean;
         EnableFieldDialog: boolean;
@@ -6383,13 +6848,10 @@ declare namespace Excel {
         FieldListSortAscending: boolean;
         Format(Format: XlPivotFormatType): void;
         GetData(Name: string): number;
-        GetPivotData(
-            DataField?: any, Field1?: any, Item1?: any, Field2?: any, Item2?: any, Field3?: any, Item3?: any, Field4?: any, Item4?: any, Field5?: any, Item5?: any,
-            Field6?: any, Item6?: any, Field7?: any, Item7?: any, Field8?: any, Item8?: any, Field9?: any, Item9?: any, Field10?: any, Item10?: any, Field11?: any,
-            Item11?: any, Field12?: any, Item12?: any, Field13?: any, Item13?: any, Field14?: any, Item14?: any): Range;
+        GetPivotData(DataField?: string, Field1?: string, Item1?: string, Field2?: string, Item2?: string, Field3?: string, Item3?: string, Field4?: string, Item4?: string, Field5?: string, Item5?: string, Field6?: string, Item6?: string, Field7?: string, Item7?: string, Field8?: string, Item8?: string, Field9?: string, Item9?: string, Field10?: string, Item10?: string, Field11?: string, Item11?: string, Field12?: string, Item12?: string, Field13?: string, Item13?: string, Field14?: string, Item14?: string): Range;
         GrandTotalName: string;
         HasAutoFormat: boolean;
-        HiddenFields(Index?: any): any;
+        HiddenFields: PivotFieldsResult;
         InGridDropZones: boolean;
         InnerDetail: string;
         LayoutRowDefault: XlLayoutRowType;
@@ -6401,7 +6863,7 @@ declare namespace Excel {
         Name: string;
         NullString: string;
         PageFieldOrder: number;
-        PageFields(Index?: any): any;
+        PageFields: PivotFieldsResult;
         PageFieldStyle: string;
         PageFieldWrapCount: number;
         readonly PageRange: Range;
@@ -6409,17 +6871,16 @@ declare namespace Excel {
         readonly Parent: any;
         PivotCache(): PivotCache;
         readonly PivotColumnAxis: PivotAxis;
-        PivotFields(Index?: any): any;
+        PivotFields: PivotFieldsResult;
         readonly PivotFormulas: PivotFormulas;
         readonly PivotRowAxis: PivotAxis;
 
-        /** @param Excel.XlPTSelectionMode [Mode=0] */
-        PivotSelect(Name: string, Mode?: XlPTSelectionMode, UseStandardName?: any): void;
+        /** @param Mode [Mode=0] */
+        PivotSelect(Name: string, Mode?: XlPTSelectionMode, UseStandardName?: boolean): void;
         PivotSelection: string;
         PivotSelectionStandard: string;
-        PivotTableWizard(
-            SourceType?: any, SourceData?: any, TableDestination?: any, TableName?: any, RowGrand?: any, ColumnGrand?: any, SaveData?: any, HasAutoFormat?: any,
-            AutoPage?: any, Reserved?: any, BackgroundQuery?: any, OptimizeCache?: any, PageFieldOrder?: any, PageFieldWrapCount?: any, ReadData?: any, Connection?: any): void;
+        PivotTableWizard(): void;
+        PivotTableWizard<TSourceType>(SourceType: TSourceType, SourceData: PivotTableWizardSourceData<TSourceType>, TableDestination?: Range, TableName?: string, RowGrand?: boolean, ColumnGrand?: boolean, SaveData?: boolean, HasAutoFormat?: boolean, AutoPage?: PivotTableWizardAutoPage<TSourceType>, Reserved?: undefined, BackgroundQuery?: boolean, OptimizeCache?: boolean, PageFieldOrder?: XlOrder, PageFieldWrapCount?: number, ReadData?: boolean, Connection?: string): void;
         PreserveFormatting: boolean;
         PrintDrillIndicators: boolean;
         PrintTitles: boolean;
@@ -6430,7 +6891,7 @@ declare namespace Excel {
         RepeatAllLabels(Repeat: XlPivotFieldRepeatLabels): void;
         RepeatItemsOnEachPrintedPage: boolean;
         RowAxisLayout(RowLayout: XlLayoutRowType): void;
-        RowFields(Index?: any): any;
+        RowFields: PivotFieldsResult;
         RowGrand: boolean;
         readonly RowRange: Range;
         SaveData: boolean;
@@ -6438,7 +6899,7 @@ declare namespace Excel {
         ShowCellBackgroundFromOLAP: boolean;
         ShowDrillIndicators: boolean;
         ShowPageMultipleItemLabel: boolean;
-        ShowPages(PageField?: any): any;
+        ShowPages(PageField?: string): any;
         ShowTableStyleColumnHeaders: boolean;
         ShowTableStyleColumnStripes: boolean;
         ShowTableStyleLastColumn: boolean;
@@ -6463,21 +6924,20 @@ declare namespace Excel {
         Value: string;
         readonly Version: XlPivotTableVersionList;
         ViewCalculatedMembers: boolean;
-        VisibleFields(Index?: any): any;
+        VisibleFields: PivotFieldsResult;
         VisualTotals: boolean;
         VisualTotalsForSets: boolean;
     }
 
-    class PivotTableChangeList {
-        private 'Excel.PivotTableChangeList_typekey': PivotTableChangeList;
-        private constructor();
+    interface PivotTableChangeList {
         _Default(Index: any): ValueChange;
         Add(Tuple: string, Value: number, AllocationValue?: any, AllocationMethod?: any, AllocationWeightExpression?: any): ValueChange;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): ValueChange;
+        Item(Index: number | string): ValueChange;
         readonly Parent: any;
+        (Index: number | string): ValueChange;
     }
 
     class PlotArea {
@@ -6508,6 +6968,66 @@ declare namespace Excel {
         Width: number;
     }
 
+    class Point {
+        private 'Excel.Point_typekey': Point;
+        private constructor();
+
+        /** @param Type [Type=2] */
+        _ApplyDataLabels(Type?: XlDataLabelsType, LegendKey?: any, AutoText?: any, HasLeaderLines?: any): any;
+        readonly Application: Application;
+
+        /** @param Type [Type=2] */
+        ApplyDataLabels(Type?: XlDataLabelsType, LegendKey?: boolean, AutoText?: boolean, HasLeaderLines?: boolean, ShowSeriesName?: boolean, ShowCategoryName?: boolean, ShowValue?: boolean, ShowPercentage?: boolean, ShowBubbleSize?: boolean, Separator?: string): any;
+        ApplyPictToEnd: boolean;
+        ApplyPictToFront: boolean;
+        ApplyPictToSides: boolean;
+        readonly Border: Border;
+        ClearFormats(): any;
+        Copy(): any;
+        readonly Creator: XlCreator;
+        readonly DataLabel: DataLabel;
+        Delete(): any;
+        Explosion: number;
+        readonly Fill: ChartFillFormat;
+        readonly Format: ChartFormat;
+        Has3DEffect: boolean;
+        HasDataLabel: boolean;
+        readonly Height: number;
+        readonly Interior: Interior;
+        InvertIfNegative: boolean;
+        readonly Left: number;
+        MarkerBackgroundColor: number;
+        MarkerBackgroundColorIndex: XlColorIndex;
+        MarkerForegroundColor: number;
+        MarkerForegroundColorIndex: XlColorIndex;
+        MarkerSize: number;
+        MarkerStyle: XlMarkerStyle;
+        readonly Name: string;
+        readonly Parent: any;
+        Paste(): any;
+        PictureType: XlChartPictureType;
+        PictureUnit: number;
+        PictureUnit2: number;
+
+        /** @param Index [Index=2] */
+        PieSliceLocation(loc: XlPieSliceLocation, Index?: XlPieSliceIndex): number;
+        SecondaryPlot: boolean;
+        Select(): any;
+        Shadow: boolean;
+        readonly Top: number;
+        readonly Width: number;
+    }
+
+    interface Points {
+        _Default(Index: number): Point;
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Item(Index: number): Point;
+        readonly Parent: any;
+        (Index: number): Point;
+    }
+
     class ProtectedViewWindow {
         private 'Excel.ProtectedViewWindow_typekey': ProtectedViewWindow;
         private constructor();
@@ -6515,7 +7035,7 @@ declare namespace Excel {
         Activate(): void;
         Caption: string;
         Close(): boolean;
-        Edit(WriteResPassword?: any, UpdateLinks?: any): Workbook;
+        Edit(WriteResPassword?: string, UpdateLinks?: 0 | 1): Workbook;
         EnableResize: boolean;
         Height: number;
         Left: number;
@@ -6528,16 +7048,15 @@ declare namespace Excel {
         readonly Workbook: Workbook;
     }
 
-    class ProtectedViewWindows {
-        private 'Excel.ProtectedViewWindows_typekey': ProtectedViewWindows;
-        private constructor();
+    interface ProtectedViewWindows {
         _Default(Index: any): ProtectedViewWindow;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): ProtectedViewWindow;
-        Open(Filename: string, Password?: any, AddToMru?: any, RepairMode?: any): ProtectedViewWindow;
+        Item(Index: number | string): ProtectedViewWindow;
+        Open(Filename: string, Password?: string, AddToMru?: boolean, RepairMode?: boolean): ProtectedViewWindow;
         readonly Parent: any;
+        (Index: number | string): ProtectedViewWindow;
     }
 
     class Protection {
@@ -6568,25 +7087,24 @@ declare namespace Excel {
         Filename: string;
         HtmlType: XlHtmlType;
         readonly Parent: any;
-        Publish(Create?: any): void;
+        Publish(Create?: boolean): void;
         readonly Sheet: string;
         readonly Source: string;
         readonly SourceType: XlSourceType;
         Title: string;
     }
 
-    class PublishObjects {
-        private 'Excel.PublishObjects_typekey': PublishObjects;
-        private constructor();
+    interface PublishObjects {
         _Default(Index: any): PublishObject;
-        Add(SourceType: XlSourceType, Filename: string, Sheet?: any, Source?: any, HtmlType?: any, DivID?: any, Title?: any): PublishObject;
+        Add(SourceType: XlSourceType, Filename: string, Sheet?: string, Source?: XlSourceType.xlSourceAutoFilter | XlSourceType.xlSourceChart | XlSourceType.xlSourcePivotTable | XlSourceType.xlSourcePrintArea | XlSourceType.xlSourceQuery | XlSourceType.xlSourceRange, HtmlType?: XlHtmlType, DivID?: string, Title?: string): PublishObject;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Delete(): void;
-        Item(Index: any): PublishObject;
+        Item(Index: number | string): PublishObject;
         readonly Parent: any;
         Publish(): void;
+        (Index: number | string): PublishObject;
     }
 
     class QueryTable {
@@ -6596,13 +7114,13 @@ declare namespace Excel {
         readonly Application: Application;
         BackgroundQuery: boolean;
         CancelRefresh(): void;
-        CommandText: any;
+        CommandText: string;
         CommandType: XlCmdType;
-        Connection: any;
+        Connection: string;
         readonly Creator: XlCreator;
         Delete(): void;
         readonly Destination: Range;
-        EditWebPage: any;
+        EditWebPage: string;
         EnableEditing: boolean;
         EnableRefresh: boolean;
         readonly FetchedRowOverflow: boolean;
@@ -6618,8 +7136,8 @@ declare namespace Excel {
         PreserveColumnInfo: boolean;
         PreserveFormatting: boolean;
         readonly QueryType: XlQueryType;
-        Recordset: any;
-        Refresh(BackgroundQuery?: any): boolean;
+        Recordset: DAO.Recordset | ADODB.Recordset;
+        Refresh(BackgroundQuery?: boolean): boolean;
         readonly Refreshing: boolean;
         RefreshOnFileOpen: boolean;
         RefreshPeriod: number;
@@ -6628,7 +7146,7 @@ declare namespace Excel {
         readonly ResultRange: Range;
         RobustConnect: XlRobustConnect;
         RowNumbers: boolean;
-        SaveAsODC(ODCFileName: string, Description?: any, Keywords?: any): void;
+        SaveAsODC(ODCFileName: string, Description?: string, Keywords?: string): void;
         SaveData: boolean;
         SavePassword: boolean;
         readonly Sort: Sort;
@@ -6636,11 +7154,11 @@ declare namespace Excel {
         SourceDataFile: string;
         Sql: any;
         TablesOnlyFromHTML: boolean;
-        TextFileColumnDataTypes: any;
+        TextFileColumnDataTypes: SafeArray<XlColumnDataType>;
         TextFileCommaDelimiter: boolean;
         TextFileConsecutiveDelimiter: boolean;
         TextFileDecimalSeparator: string;
-        TextFileFixedColumnWidths: any;
+        TextFileFixedColumnWidths: SafeArray<number>;
         TextFileOtherDelimiter: string;
         TextFileParseType: XlTextParsingType;
         TextFilePlatform: number;
@@ -6664,79 +7182,77 @@ declare namespace Excel {
         readonly WorkbookConnection: WorkbookConnection;
     }
 
-    class QueryTables {
-        private 'Excel.QueryTables_typekey': QueryTables;
-        private constructor();
+    interface QueryTables {
         _Default(Index: any): QueryTable;
-        Add(Connection: any, Destination: Range, Sql?: any): QueryTable;
+        Add(Connection: QueryTable | DAO.Recordset | ADODB.Recordset, Destination: Range): QueryTable;
+        Add(Connection: string, Destination: Range, Sql?: string): QueryTable;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): QueryTable;
+        Item(Index: number | string): QueryTable;
         readonly Parent: any;
+        (Index: number | string): QueryTable;
     }
 
-    class Range {
-        private 'Excel.Range_typekey': Range;
-        private constructor();
+    interface Range {
         __PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any): any;
 
         /**
-         * @param Excel.XlBorderWeight [Weight=2]
-         * @param Excel.XlColorIndex [ColorIndex=-4105]
+         * @param Weight [Weight=2]
+         * @param ColorIndex [ColorIndex=-4105]
          */
         _BorderAround(LineStyle: any, Weight?: XlBorderWeight, ColorIndex?: XlColorIndex, Color?: any): any;
         _Default(RowIndex?: any, ColumnIndex?: any): any;
 
         /**
-         * @param Excel.XlPasteType [Paste=-4104]
-         * @param Excel.XlPasteSpecialOperation [Operation=-4142]
+         * @param Paste [Paste=-4104]
+         * @param Operation [Operation=-4142]
          */
         _PasteSpecial(Paste?: XlPasteType, Operation?: XlPasteSpecialOperation, SkipBlanks?: any, Transpose?: any): any;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): any;
         Activate(): any;
-        AddComment(Text?: any): Comment;
-        AddIndent: any;
+        AddComment(Text?: string): Comment;
+        AddIndent: boolean;
 
-        /** @param Excel.XlReferenceStyle [ReferenceStyle=1] */
+        /** @param ReferenceStyle [ReferenceStyle=1] */
         Address(RowAbsolute?: boolean, ColumnAbsolute?: boolean, ReferenceStyle?: XlReferenceStyle, External?: boolean, RelativeTo?: Range): string;
 
-        /** @param Excel.XlReferenceStyle [ReferenceStyle=1] */
-        AddressLocal(RowAbsolute: any, ColumnAbsolute: any, ReferenceStyle?: XlReferenceStyle, External?: any, RelativeTo?: any): string;
+        /** @param ReferenceStyle [ReferenceStyle=1] */
+        AddressLocal(RowAbsolute?: boolean, ColumnAbsolute?: boolean, ReferenceStyle?: XlReferenceStyle, External?: boolean, RelativeTo?: Range): string;
         AdvancedFilter(Action: XlFilterAction.xlFilterCopy, CriteriaRange?: Range, CopyToRange?: Range, Unique?: boolean): any;
         AdvancedFilter(Action: XlFilterAction, CriteriaRange?: Range, CopyToRange?: undefined, Unique?: boolean): any;
         AllocateChanges(): void;
         readonly AllowEdit: boolean;
         readonly Application: Application;
 
-        /** @param Excel.XlApplyNamesOrder [Order=1] */
-        ApplyNames(Names: any, IgnoreRelativeAbsolute: any, UseRowColumnNames: any, OmitColumn: any, OmitRow: any, Order?: XlApplyNamesOrder, AppendLast?: any): any;
+        /** @param Order [Order=1] */
+        ApplyNames(Names?: SafeArray<string>, IgnoreRelativeAbsolute?: boolean, UseRowColumnNames?: boolean, OmitColumn?: boolean, OmitRow?: boolean, Order?: XlApplyNamesOrder, AppendLast?: boolean): any;
         ApplyOutlineStyles(): any;
         readonly Areas: Areas;
         AutoComplete(String: string): string;
 
-        /** @param Excel.XlAutoFillType [Type=0] */
+        /** @param Type [Type=0] */
         AutoFill(Destination: Range, Type?: XlAutoFillType): any;
 
-        /** @param Excel.XlAutoFilterOperator [Operator=1] */
-        AutoFilter(Field: any, Criteria1: any, Operator?: XlAutoFilterOperator, Criteria2?: any, VisibleDropDown?: any): any;
+        /** @param Operator [Operator=1] */
+        AutoFilter(Field: number, Criteria1: string, Operator?: XlAutoFilterOperator, Criteria2?: string, VisibleDropDown?: boolean): any;
         AutoFit(): any;
 
-        /** @param Excel.XlRangeAutoFormat [Format=1] */
+        /** @param Format [Format=1] */
         AutoFormat(Format?: XlRangeAutoFormat, Number?: any, Font?: any, Alignment?: any, Border?: any, Pattern?: any, Width?: any): any;
         AutoOutline(): any;
 
         /**
-         * @param Excel.XlBorderWeight [Weight=2]
-         * @param Excel.XlColorIndex [ColorIndex=-4105]
+         * @param Weight [Weight=2]
+         * @param ColorIndex [ColorIndex=-4105]
          */
-        BorderAround(LineStyle: any, Weight?: XlBorderWeight, ColorIndex?: XlColorIndex, Color?: any, ThemeColor?: any): any;
+        BorderAround(LineStyle?: XlLineStyle, Weight?: XlBorderWeight, ColorIndex?: XlColorIndex, Color?: number, ThemeColor?: number | XlThemeColor): any;
         readonly Borders: Borders;
         Calculate(): any;
         CalculateRowMajorOrder(): any;
         readonly Cells: Range;
-        Characters(Start?: any, Length?: any): Characters;
-        CheckSpelling(CustomDictionary?: any, IgnoreUppercase?: any, AlwaysSuggest?: any, SpellLang?: any): any;
+        Characters(Start?: number, Length?: number): Characters;
+        CheckSpelling(CustomDictionary?: string, IgnoreUppercase?: boolean, AlwaysSuggest?: boolean, SpellLang?: Office.MsoLanguageID): any;
         Clear(): any;
         ClearComments(): void;
         ClearContents(): any;
@@ -6745,38 +7261,39 @@ declare namespace Excel {
         ClearNotes(): any;
         ClearOutline(): any;
         readonly Column: number;
-        ColumnDifferences(Comparison: any): Range;
+        ColumnDifferences(Comparison: Range): Range;
         readonly Columns: Range;
-        ColumnWidth: any;
+        ColumnWidth: number | null;
         readonly Comment: Comment;
-        Consolidate(Sources?: any, Function?: any, TopRow?: any, LeftColumn?: any, CreateLinks?: any): any;
-        Copy(Destination?: any): any;
-        CopyFromRecordset(Data: any, MaxRows?: any, MaxColumns?: any): number;
+        Consolidate(Sources?: SafeArray<string>, Function?: XlConsolidationFunction, TopRow?: boolean, LeftColumn?: boolean, CreateLinks?: boolean): any;
+        Copy(Destination?: Range): any;
+        CopyFromRecordset(Data: DAO.Recordset | ADODB.Recordset, MaxRows?: number, MaxColumns?: number): number;
 
         /**
-         * @param Excel.XlPictureAppearance [Appearance=1]
-         * @param Excel.XlCopyPictureFormat [Format=-4147]
+         * @param Appearance [Appearance=1]
+         * @param Format [Format=-4147]
          */
         CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): any;
         readonly Count: number;
-        readonly CountLarge: any;
-        CreateNames(Top?: any, Left?: any, Bottom?: any, Right?: any): any;
+        readonly CountLarge: number;
+        CreateNames(Top?: boolean, Left?: boolean, Bottom?: boolean, Right?: boolean): any;
 
-        /** @param Excel.XlPictureAppearance [Appearance=1] */
+        /** @param Appearance [Appearance=1] */
         CreatePublisher(Edition: any, Appearance?: XlPictureAppearance, ContainsPICT?: any, ContainsBIFF?: any, ContainsRTF?: any, ContainsVALU?: any): any;
         readonly Creator: XlCreator;
         readonly CurrentArray: Range;
         readonly CurrentRegion: Range;
-        Cut(Destination?: any): any;
+        Cut(Destination?: Range): any;
 
         /**
-         * @param Excel.XlDataSeriesType [Type=-4132]
-         * @param Excel.XlDataSeriesDate [Date=1]
+         * @param Type [Type=-4132]
+         * @param Date [Date=1]
+         * @param Step [Step=1]
          */
-        DataSeries(Rowcol: any, Type?: XlDataSeriesType, Date?: XlDataSeriesDate, Step?: any, Stop?: any, Trend?: any): any;
-        Delete(Shift?: any): any;
+        DataSeries(Rowcol: XlRowCol, Type?: XlDataSeriesType, Date?: XlDataSeriesDate, Step?: number, Stop?: number, Trend?: boolean): any;
+        Delete(Shift?: XlDeleteShiftDirection): any;
         readonly Dependents: Range;
-        DialogBox(): any;
+        DialogBox(): number | false;
         readonly DirectDependents: Range;
         readonly DirectPrecedents: Range;
         Dirty(): void;
@@ -6784,81 +7301,78 @@ declare namespace Excel {
         readonly DisplayFormat: DisplayFormat;
 
         /**
-         * @param Excel.XlPictureAppearance [Appearance=1]
-         * @param Excel.XlPictureAppearance [ChartSize=1]
+         * @param Appearance [Appearance=1]
+         * @param ChartSize [ChartSize=1]
          */
         EditionOptions(Type: XlEditionType, Option: XlEditionOptionsOption, Name: any, Reference: any, Appearance?: XlPictureAppearance, ChartSize?: XlPictureAppearance, Format?: any): any;
         End(Direction: XlDirection): Range;
         readonly EntireColumn: Range;
         readonly EntireRow: Range;
         readonly Errors: Errors;
-        ExportAsFixedFormat(
-            Type: XlFixedFormatType, Filename?: any, Quality?: any, IncludeDocProperties?: any, IgnorePrintAreas?: any, From?: any, To?: any, OpenAfterPublish?: any,
-            FixedFormatExtClassPtr?: any): void;
+        ExportAsFixedFormat(Type: XlFixedFormatType, Filename?: string, Quality?: XlFixedFormatQuality, IncludeDocProperties?: boolean, IgnorePrintAreas?: boolean, From?: number, To?: number, OpenAfterPublish?: boolean, FixedFormatExtClassPtr?: any): void;
         FillDown(): any;
         FillLeft(): any;
         FillRight(): any;
         FillUp(): any;
 
-        /** @param Excel.XlSearchDirection [SearchDirection=1] */
-        Find(What: any, After?: any, LookIn?: XlFindLookIn, LookAt?: XlLookAt, SearchOrder?: XlSearchOrder, SearchDirection?: XlSearchDirection, MatchCase?: boolean,
-            MatchByte?: boolean, SearchFormat?: any): Range;
+        /** @param SearchDirection [SearchDirection=1] */
+        Find(What: any, After?: any, LookIn?: XlFindLookIn, LookAt?: XlLookAt, SearchOrder?: XlSearchOrder, SearchDirection?: XlSearchDirection, MatchCase?: boolean, MatchByte?: boolean, SearchFormat?: any): Range;
         FindNext(After?: any): Range;
         FindPrevious(After?: any): Range;
         readonly Font: Font;
         readonly FormatConditions: FormatConditions;
-        Formula: any;
-        FormulaArray: any;
-        FormulaHidden: any;
+        Formula: string | SafeArray<string>;
+        FormulaArray: string | SafeArray<string> | null;
+        FormulaHidden: boolean | null;
         FormulaLabel: XlFormulaLabel;
-        FormulaLocal: any;
-        FormulaR1C1: any;
-        FormulaR1C1Local: any;
+        FormulaLocal: string | SafeArray<string>;
+        FormulaR1C1: string | SafeArray<string>;
+        FormulaR1C1Local: string | SafeArray<string>;
         FunctionWizard(): any;
         GoalSeek(Goal: any, ChangingCell: Range): boolean;
-        Group(Start?: any, End?: any, By?: any, Periods?: any): any;
-        readonly HasArray: any;
-        readonly HasFormula: any;
-        readonly Height: any;
-        Hidden: any;
-        HorizontalAlignment: any;
+        Group(Start?: any, End?: any, By?: number, Periods?: SafeArray<boolean>): any;
+        readonly HasArray: boolean;
+        readonly HasFormula: boolean | null;
+        Height: number;
+        Hidden: boolean;
+        HorizontalAlignment: HorizontalAlignments;
         readonly Hyperlinks: Hyperlinks;
         ID: string;
-        IndentLevel: any;
-        Insert(Shift?: any, CopyOrigin?: any): any;
+        IndentLevel: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12 | 13 | 14 | 15;
+        Insert(Shift?: XlInsertShiftDirection, CopyOrigin?: any): any;
         InsertIndent(InsertAmount: number): void;
         readonly Interior: Interior;
         Item(RowIndex: number, ColumnIndex?: number): Range;
         Item(Address: string): Range;
         Justify(): any;
-        readonly Left: any;
+        readonly Left: number;
         readonly ListHeaderRows: number;
         ListNames(): any;
         readonly ListObject: ListObject;
         readonly LocationInTable: XlLocationInTable;
-        Locked: any;
+        Locked: boolean | null;
         readonly MDX: string;
-        Merge(Across?: any): void;
+        Merge(Across?: boolean): void;
         readonly MergeArea: Range;
-        MergeCells: any;
-        Name: any;
-        NavigateArrow(TowardPrecedent?: any, ArrowNumber?: any, LinkNumber?: any): any;
+        MergeCells: boolean;
+        Name: string | Name;
+        NavigateArrow(TowardPrecedent?: boolean, ArrowNumber?: number, LinkNumber?: number): any;
         readonly Next: Range;
-        NoteText(Text?: any, Start?: any, Length?: any): string;
-        NumberFormat: any;
-        NumberFormatLocal: any;
+        NoteText(Text?: string, Start?: number, Length?: number): string;
+        NumberFormat: string | null;
+        NumberFormatLocal: string | null;
         Offset(RowOffset?: number, ColumnOffset?: number): Range;
-        Orientation: any;
-        OutlineLevel: any;
+        Orientation: number | XlOrientation;
+        OutlineLevel: number;
         PageBreak: number;
         readonly Parent: any;
-        Parse(ParseLine?: any, Destination?: any): any;
+        Parse(ParseLine?: string, Destination?: Range): any;
 
         /**
-         * @param Excel.XlPasteType [Paste=-4104]
-         * @param Excel.XlPasteSpecialOperation [Operation=-4142]
+         * @param Paste [Paste=-4104]
+         * @param Operation [Operation=-4142]
          */
-        PasteSpecial(Paste?: XlPasteType, Operation?: XlPasteSpecialOperation, SkipBlanks?: any, Transpose?: any): any;
+        PasteSpecial(Paste?: XlPasteType, Operation?: XlPasteSpecialOperation, SkipBlanks?: boolean, Transpose?: boolean): any;
         readonly Phonetic: Phonetic;
         readonly Phonetics: Phonetics;
         readonly PivotCell: PivotCell;
@@ -6866,114 +7380,108 @@ declare namespace Excel {
         readonly PivotItem: PivotItem;
         readonly PivotTable: PivotTable;
         readonly Precedents: Range;
-        readonly PrefixCharacter: any;
+        readonly PrefixCharacter: "'" | '"' | '^' | '\\' | '';
         readonly Previous: Range;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): any;
-        PrintPreview(EnableChanges?: any): any;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>): any;
+        PrintPreview(EnableChanges?: boolean): any;
         readonly QueryTable: QueryTable;
-        Range(Cell1: any, Cell2?: any): Range;
+        Range(Cell1: string | Range, Cell2?: string | Range): Range;
         ReadingOrder: number;
 
-        /** @param Excel.XlYesNoGuess [Header=2] */
-        RemoveDuplicates(Columns: any, Header?: XlYesNoGuess): void;
+        /** @param Header [Header=2] */
+        RemoveDuplicates(Columns: SafeArray<number>, Header?: XlYesNoGuess): void;
         RemoveSubtotal(): any;
-        Replace(What: any, Replacement: any, LookAt?: any, SearchOrder?: any, MatchCase?: any, MatchByte?: any, SearchFormat?: any, ReplaceFormat?: any): boolean;
-        Resize(RowSize?: any, ColumnSize?: any): Range;
+        Replace(What: string, Replacement: string, LookAt?: XlLookAt, SearchOrder?: XlSearchOrder, MatchCase?: boolean, MatchByte?: boolean, SearchFormat?: boolean, ReplaceFormat?: boolean): boolean;
+        Resize(RowSize?: number, ColumnSize?: number): Range;
         readonly Row: number;
-        RowDifferences(Comparison: any): Range;
-        RowHeight: any;
+        RowDifferences(Comparison: Range): Range;
+        RowHeight: number | null;
         readonly Rows: Range;
-        Run(
-            Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Run(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         Select(): any;
         readonly ServerActions: Actions;
         SetPhonetic(): void;
         Show(): any;
-        ShowDependents(Remove?: any): any;
+        ShowDependents(Remove?: boolean): any;
         ShowDetail: any;
         ShowErrors(): any;
-        ShowPrecedents(Remove?: any): any;
-        ShrinkToFit: any;
+        ShowPrecedents(Remove?: boolean): any;
+        ShrinkToFit: boolean | null;
         readonly SmartTags: SmartTags;
 
         /**
-         * @param Excel.XlSortOrder [Order1=1]
-         * @param Excel.XlSortOrder [Order2=1]
-         * @param Excel.XlSortOrder [Order3=1]
-         * @param Excel.XlYesNoGuess [Header=2]
-         * @param Excel.XlSortOrientation [Orientation=2]
-         * @param Excel.XlSortMethod [SortMethod=1]
-         * @param Excel.XlSortDataOption [DataOption1=0]
-         * @param Excel.XlSortDataOption [DataOption2=0]
-         * @param Excel.XlSortDataOption [DataOption3=0]
+         * @param Order1 [Order1=1]
+         * @param Order2 [Order2=1]
+         * @param Order3 [Order3=1]
+         * @param Header [Header=2]
+         * @param Orientation [Orientation=2]
+         * @param SortMethod [SortMethod=1]
+         * @param DataOption1 [DataOption1=0]
+         * @param DataOption2 [DataOption2=0]
+         * @param DataOption3 [DataOption3=0]
          */
-        Sort(
-            Key1: any, Order1?: XlSortOrder, Key2?: any, Type?: any, Order2?: XlSortOrder, Key3?: any, Order3?: XlSortOrder, Header?: XlYesNoGuess, OrderCustom?: any,
-            MatchCase?: any, Orientation?: XlSortOrientation, SortMethod?: XlSortMethod, DataOption1?: XlSortDataOption, DataOption2?: XlSortDataOption, DataOption3?: XlSortDataOption): any;
+        Sort(Key1: string | Range, Order1?: XlSortOrder, Key2?: any, Type?: any, Order2?: XlSortOrder, Key3?: any, Order3?: XlSortOrder, Header?: XlYesNoGuess, OrderCustom?: number, MatchCase?: boolean, Orientation?: XlSortOrientation, SortMethod?: XlSortMethod, DataOption1?: XlSortDataOption, DataOption2?: XlSortDataOption, DataOption3?: XlSortDataOption): any;
 
         /**
-         * @param Excel.XlSortMethod [SortMethod=1]
-         * @param Excel.XlSortOrder [Order1=1]
-         * @param Excel.XlSortOrder [Order2=1]
-         * @param Excel.XlSortOrder [Order3=1]
-         * @param Excel.XlYesNoGuess [Header=2]
-         * @param Excel.XlSortOrientation [Orientation=2]
-         * @param Excel.XlSortDataOption [DataOption1=0]
-         * @param Excel.XlSortDataOption [DataOption2=0]
-         * @param Excel.XlSortDataOption [DataOption3=0]
+         * @param SortMethod [SortMethod=1]
+         * @param Order1 [Order1=1]
+         * @param Order2 [Order2=1]
+         * @param Order3 [Order3=1]
+         * @param Header [Header=2]
+         * @param Orientation [Orientation=2]
+         * @param DataOption1 [DataOption1=0]
+         * @param DataOption2 [DataOption2=0]
+         * @param DataOption3 [DataOption3=0]
          */
-        SortSpecial(
-            SortMethod?: XlSortMethod, Key1?: any, Order1?: XlSortOrder, Type?: any, Key2?: any, Order2?: XlSortOrder, Key3?: any, Order3?: XlSortOrder,
-            Header?: XlYesNoGuess, OrderCustom?: any, MatchCase?: any, Orientation?: XlSortOrientation, DataOption1?: XlSortDataOption, DataOption2?: XlSortDataOption,
-            DataOption3?: XlSortDataOption): any;
+        SortSpecial(SortMethod?: XlSortMethod, Key1?: string | Range, Order1?: XlSortOrder, Type?: any, Key2?: string | Range, Order2?: XlSortOrder, Key3?: string | Range, Order3?: XlSortOrder, Header?: XlYesNoGuess, OrderCustom?: number, MatchCase?: boolean, Orientation?: XlSortOrientation, DataOption1?: XlSortDataOption, DataOption2?: XlSortDataOption, DataOption3?: XlSortDataOption): any;
         readonly SoundNote: SoundNote;
         readonly SparklineGroups: SparklineGroups;
-        Speak(SpeakDirection?: any, SpeakFormulas?: any): void;
-        SpecialCells(Type: XlCellType, Value?: any): Range;
-        Style: any;
+        Speak(SpeakDirection?: XlSpeakDirection, SpeakFormulas?: boolean): void;
+        SpecialCells(Type: XlCellType.xlCellTypeConstants | XlCellType.xlCellTypeFormulas, Value?: XlSpecialCellsValue): Range;
+        SpecialCells(Type: XlCellType): Range;
+        Style: Style;
 
-        /** @param Excel.XlSubscribeToFormat [Format=-4158] */
+        /** @param Format [Format=-4158] */
         SubscribeTo(Edition: string, Format?: XlSubscribeToFormat): any;
 
-        /** @param Excel.XlSummaryRow [SummaryBelowData=1] */
-        Subtotal(GroupBy: number, Function: XlConsolidationFunction, TotalList: any, Replace: any, PageBreaks: any, SummaryBelowData?: XlSummaryRow): any;
-        readonly Summary: any;
-        Table(RowInput?: any, ColumnInput?: any): any;
-        readonly Text: any;
+        /** @param SummaryBelowData [SummaryBelowData=1] */
+        Subtotal(GroupBy: number, Function: XlConsolidationFunction, TotalList: SafeArray<number>, Replace: boolean, PageBreaks: boolean, SummaryBelowData?: XlSummaryRow): any;
+        readonly Summary: boolean;
+        Table(RowInput?: Range, ColumnInput?: Range): any;
+        readonly Text: string;
 
         /**
-         * @param Excel.XlTextParsingType [DataType=1]
-         * @param Excel.XlTextQualifier [TextQualifier=1]
+         * @param DataType [DataType=1]
+         * @param TextQualifier [TextQualifier=1]
          */
-        TextToColumns(
-            Destination: any, DataType?: XlTextParsingType, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: any, Tab?: any, Semicolon?: any, Comma?: any,
-            Space?: any, Other?: any, OtherChar?: any, FieldInfo?: any, DecimalSeparator?: any, ThousandsSeparator?: any, TrailingMinusNumbers?: any): any;
-        readonly Top: any;
+        TextToColumns(Destination: Range, DataType?: XlTextParsingType, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: boolean, Tab?: boolean, Semicolon?: boolean, Comma?: boolean, Space?: boolean, Other?: boolean, OtherChar?: string, FieldInfo?: SafeArray, DecimalSeparator?: string, ThousandsSeparator?: string, TrailingMinusNumbers?: any): any;
+        readonly Top: number;
         Ungroup(): any;
         UnMerge(): void;
-        UseStandardHeight: any;
-        UseStandardWidth: any;
+        UseStandardHeight: boolean | null;
+        UseStandardWidth: boolean | null;
         readonly Validation: Validation;
-        Value(RangeValueDataType?: XlRangeValueDataType): any;
+
+        // tslint:disable-next-line: ban-types
+        Value: Exclude<any, Function> & ((RangeValueDataType?: XlRangeValueDataType) => any);
         Value2: any;
-        VerticalAlignment: any;
-        readonly Width: any;
+        VerticalAlignment: VerticalAlignments;
+        readonly Width: number;
         readonly Worksheet: Worksheet;
-        WrapText: any;
+        WrapText: boolean | null;
         readonly XPath: XPath;
+        (RowIndex: number, ColumnIndex?: number): Range;
+        (Address: string): Range;
     }
 
-    class Ranges {
-        private 'Excel.Ranges_typekey': Ranges;
-        private constructor();
+    interface Ranges {
         _Default(Index: any): Range;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: any): Range;
         readonly Parent: any;
+        (Index: any): Range;
     }
 
     class RecentFile {
@@ -6989,9 +7497,7 @@ declare namespace Excel {
         readonly Path: string;
     }
 
-    class RecentFiles {
-        private 'Excel.RecentFiles_typekey': RecentFiles;
-        private constructor();
+    interface RecentFiles {
         _Default(Index: number): RecentFile;
         Add(Name: string): RecentFile;
         readonly Application: Application;
@@ -7000,6 +7506,7 @@ declare namespace Excel {
         Item(Index: number): RecentFile;
         Maximum: number;
         readonly Parent: any;
+        (Index: number): RecentFile;
     }
 
     class Research {
@@ -7009,7 +7516,7 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         IsResearchService(ServiceID: string): boolean;
         readonly Parent: any;
-        Query(ServiceID: string, QueryString?: any, QueryLanguage?: any, UseSelection?: any, LaunchQuery?: any): any;
+        Query(ServiceID: string, QueryString?: string, QueryLanguage?: any, UseSelection?: boolean, LaunchQuery?: boolean): any;
         SetLanguagePair(LanguageFrom: number, LanguageTo: number): any;
     }
 
@@ -7037,6 +7544,123 @@ declare namespace Excel {
         ThrottleInterval: number;
     }
 
+    class Scenario {
+        private 'Excel.Scenario_typekey': Scenario;
+        private constructor();
+        readonly Application: Application;
+        ChangeScenario(ChangingCells: Range, Values?: SafeArray): any;
+        readonly ChangingCells: Range;
+        Comment: string;
+        readonly Creator: XlCreator;
+        Delete(): any;
+        Hidden: boolean;
+        readonly Index: number;
+        Locked: boolean;
+        Name: string;
+        readonly Parent: any;
+        Show(): any;
+        Values(): SafeArray;
+        Values(Index: number): any;
+    }
+
+    interface Scenarios {
+        Add(Name: string, ChangingCells: Range, Values?: SafeArray, Comment?: string, Locked?: boolean, Hidden?: boolean): Scenario;
+        readonly Application: Application;
+        readonly Count: number;
+
+        /** @param ReportType [ReportType=1] */
+        CreateSummary(ReportType?: XlSummaryReportType, ResultCells?: Range): any;
+        readonly Creator: XlCreator;
+        Item(Index: number | string): Scenario;
+        Merge(Source: string | Worksheet): any;
+        readonly Parent: any;
+        (Index: number | string): Scenario;
+    }
+
+    class Series {
+        private 'Excel.Series_typekey': Series;
+        private constructor();
+
+        /** @param Type [Type=2] */
+        _ApplyDataLabels(Type?: XlDataLabelsType, LegendKey?: any, AutoText?: any, HasLeaderLines?: any): any;
+        readonly Application: Application;
+        ApplyCustomType(ChartType: XlChartType): void;
+
+        /** @param Type [Type=2] */
+        ApplyDataLabels(Type?: XlDataLabelsType, LegendKey?: boolean, AutoText?: boolean, HasLeaderLines?: boolean, ShowSeriesName?: boolean, ShowCategoryName?: boolean, ShowValue?: boolean, ShowPercentage?: boolean, ShowBubbleSize?: boolean, Separator?: string): any;
+        ApplyPictToEnd: boolean;
+        ApplyPictToFront: boolean;
+        ApplyPictToSides: boolean;
+        AxisGroup: XlAxisGroup;
+        BarShape: XlBarShape;
+        readonly Border: Border;
+        BubbleSizes: string;
+        ChartType: XlChartType;
+        ClearFormats(): any;
+        Copy(): any;
+        readonly Creator: XlCreator;
+        DataLabels: DataLabels & ((Index: number) => DataLabel);
+        Delete(): any;
+        ErrorBar(Direction: XlErrorBarDirection, Include: XlErrorBarInclude, Type: XlErrorBarType, Amount?: any, MinusValues?: any): any;
+        readonly ErrorBars: ErrorBars;
+        Explosion: number;
+        readonly Fill: ChartFillFormat;
+        readonly Format: ChartFormat;
+        Formula: string;
+        FormulaLocal: string;
+        FormulaR1C1: string;
+        FormulaR1C1Local: string;
+        Has3DEffect: boolean;
+        HasDataLabels: boolean;
+        HasErrorBars: boolean;
+        HasLeaderLines: boolean;
+        readonly Interior: Interior;
+        InvertColor: number;
+        InvertColorIndex: number;
+        InvertIfNegative: boolean;
+        readonly LeaderLines: LeaderLines;
+        MarkerBackgroundColor: number;
+        MarkerBackgroundColorIndex: XlColorIndex;
+        MarkerForegroundColor: number;
+        MarkerForegroundColorIndex: XlColorIndex;
+        MarkerSize: number;
+        MarkerStyle: XlMarkerStyle;
+        Name: string;
+        readonly Parent: any;
+        Paste(): any;
+        PictureType: XlChartPictureType;
+        PictureUnit: number;
+        PictureUnit2: number;
+        readonly PlotColorIndex: number;
+        PlotOrder: number;
+        Points: Points & ((Index: number) => Point);
+        Select(): any;
+        Shadow: boolean;
+        Smooth: boolean;
+        Trendlines: Trendlines & ((Index: number | string) => Trendline);
+        Type: number;
+        Values: Range | SafeArray<number>;
+        XValues: Range | SafeArray<number>;
+    }
+
+    interface SeriesCollection {
+        _Default(Index: any): Series;
+
+        /** @param Rowcol [Rowcol=-4105] */
+        Add(Source: Range, Rowcol?: XlRowCol, SeriesLabels?: boolean, CategoryLabels?: boolean, Replace?: boolean): Series;
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Extend(Source: Range, Rowcol?: XlRowCol, CategoryLabels?: boolean): any;
+        Item(Index: number | string): Series;
+        NewSeries(): Series;
+        readonly Parent: any;
+
+        /** @param Rowcol [Rowcol=-4105] */
+        Paste(Rowcol?: XlRowCol, SeriesLabels?: boolean, CategoryLabels?: boolean, Replace?: boolean, NewSeries?: boolean): any;
+        (Index: number | string): Series;
+    }
+
     class SeriesLines {
         private 'Excel.SeriesLines_typekey': SeriesLines;
         private constructor();
@@ -7050,18 +7674,17 @@ declare namespace Excel {
         Select(): any;
     }
 
-    class ServerViewableItems {
-        private 'Excel.ServerViewableItems_typekey': ServerViewableItems;
-        private constructor();
+    interface ServerViewableItems {
         _Default(Index: any): any;
         Add(Obj: any): any;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Delete(Index: any): void;
+        Delete(Index: number): void;
         DeleteAll(): void;
-        Item(Index: any): any;
+        Item(Index: number): any;
         readonly Parent: any;
+        (Index: number): any;
     }
 
     class ShadowFormat {
@@ -7109,7 +7732,7 @@ declare namespace Excel {
         readonly ConnectorFormat: ConnectorFormat;
         readonly ControlFormat: ControlFormat;
         Copy(): void;
-        CopyPicture(Appearance?: any, Format?: any): void;
+        CopyPicture(Appearance?: XlPictureAppearance, Format?: XlCopyPictureFormat): void;
         readonly Creator: XlCreator;
         Cut(): void;
         Delete(): void;
@@ -7150,10 +7773,10 @@ declare namespace Excel {
         readonly Reflection: Office.ReflectionFormat;
         RerouteConnections(): void;
         Rotation: number;
-        ScaleHeight(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: any): void;
-        ScaleWidth(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: any): void;
+        ScaleHeight(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: Office.MsoScaleFrom): void;
+        ScaleWidth(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: Office.MsoScaleFrom): void;
         readonly Script: Office.Script;
-        Select(Replace?: any): void;
+        Select(Replace?: boolean): void;
         SetShapesDefaultProperties(): void;
         readonly Shadow: ShadowFormat;
         ShapeStyle: Office.MsoShapeStyleIndex;
@@ -7169,7 +7792,7 @@ declare namespace Excel {
         readonly Type: Office.MsoShapeType;
         Ungroup(): ShapeRange;
         readonly VerticalFlip: Office.MsoTriState;
-        readonly Vertices: any;
+        readonly Vertices: SafeArray<number>;
         Visible: Office.MsoTriState;
         Width: number;
         ZOrder(ZOrderCmd: Office.MsoZOrderCmd): void;
@@ -7183,35 +7806,32 @@ declare namespace Excel {
         readonly Creator: number;
         readonly EditingType: Office.MsoEditingType;
         readonly Parent: any;
-        readonly Points: any;
+        readonly Points: SafeArray<number>;
         readonly SegmentType: Office.MsoSegmentType;
     }
 
-    class ShapeNodes {
-        private 'Excel.ShapeNodes_typekey': ShapeNodes;
-        private constructor();
+    interface ShapeNodes {
         readonly Application: any;
         readonly Count: number;
         readonly Creator: number;
         Delete(Index: number): void;
 
         /**
-         * @param number [X2=0]
-         * @param number [Y2=0]
-         * @param number [X3=0]
-         * @param number [Y3=0]
+         * @param X2 [X2=0]
+         * @param Y2 [Y2=0]
+         * @param X3 [X3=0]
+         * @param Y3 [Y3=0]
          */
         Insert(Index: number, SegmentType: Office.MsoSegmentType, EditingType: Office.MsoEditingType, X1: number, Y1: number, X2?: number, Y2?: number, X3?: number, Y3?: number): void;
-        Item(Index: any): ShapeNode;
+        Item(Index: number | string): ShapeNode;
         readonly Parent: any;
         SetEditingType(Index: number, EditingType: Office.MsoEditingType): void;
         SetPosition(Index: number, X1: number, Y1: number): void;
         SetSegmentType(Index: number, SegmentType: Office.MsoSegmentType): void;
+        (Index: number | string): ShapeNode;
     }
 
-    class ShapeRange {
-        private 'Excel.ShapeRange_typekey': ShapeRange;
-        private constructor();
+    interface ShapeRange {
         _Default(Index: any): Shape;
         readonly Adjustments: Adjustments;
         Align(AlignCmd: Office.MsoAlignCmd, RelativeTo: Office.MsoTriState): void;
@@ -7253,7 +7873,7 @@ declare namespace Excel {
         IncrementLeft(Increment: number): void;
         IncrementRotation(Increment: number): void;
         IncrementTop(Increment: number): void;
-        Item(Index: any): Shape;
+        Item(Index: number | string): Shape;
         Left: number;
         readonly Line: LineFormat;
         LockAspectRatio: Office.MsoTriState;
@@ -7267,9 +7887,9 @@ declare namespace Excel {
         Regroup(): Shape;
         RerouteConnections(): void;
         Rotation: number;
-        ScaleHeight(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: any): void;
-        ScaleWidth(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: any): void;
-        Select(Replace?: any): void;
+        ScaleHeight(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: Office.MsoScaleFrom): void;
+        ScaleWidth(Factor: number, RelativeToOriginalSize: Office.MsoTriState, Scale?: Office.MsoScaleFrom): void;
+        Select(Replace?: boolean): void;
         SetShapesDefaultProperties(): void;
         readonly Shadow: ShadowFormat;
         ShapeStyle: Office.MsoShapeStyleIndex;
@@ -7283,82 +7903,81 @@ declare namespace Excel {
         readonly Type: Office.MsoShapeType;
         Ungroup(): ShapeRange;
         readonly VerticalFlip: Office.MsoTriState;
-        readonly Vertices: any;
+        readonly Vertices: SafeArray<number>;
         Visible: Office.MsoTriState;
         Width: number;
         ZOrder(ZOrderCmd: Office.MsoZOrderCmd): void;
         readonly ZOrderPosition: number;
+        (Index: number | string): Shape;
     }
 
-    class Shapes {
-        private 'Excel.Shapes_typekey': Shapes;
-        private constructor();
+    interface Shapes {
         _Default(Index: any): Shape;
         AddCallout(Type: Office.MsoCalloutType, Left: number, Top: number, Width: number, Height: number): Shape;
         AddCanvas(Left: number, Top: number, Width: number, Height: number): Shape;
-        AddChart(XlChartType?: any, Left?: any, Top?: any, Width?: any, Height?: any): Shape;
+        AddChart(XlChartType?: XlChartType, Left?: number, Top?: number, Width?: number, Height?: number, NewLayout?: boolean): Shape;
         AddConnector(Type: Office.MsoConnectorType, BeginX: number, BeginY: number, EndX: number, EndY: number): Shape;
-        AddCurve(SafeArrayOfPoints: any): Shape;
+        AddCurve(SafeArrayOfPoints: SafeArray<number>): Shape;
         AddDiagram(Type: Office.MsoDiagramType, Left: number, Top: number, Width: number, Height: number): Shape;
         AddFormControl(Type: XlFormControl, Left: number, Top: number, Width: number, Height: number): Shape;
         AddLabel(Orientation: Office.MsoTextOrientation, Left: number, Top: number, Width: number, Height: number): Shape;
         AddLine(BeginX: number, BeginY: number, EndX: number, EndY: number): Shape;
-        AddOLEObject(ClassType?: any, Filename?: any, Link?: any, DisplayAsIcon?: any, IconFileName?: any, IconIndex?: any, IconLabel?: any, Left?: any, Top?: any, Width?: any,
-            Height?: any): Shape;
+        AddOLEObject(ClassType: string, Filename?: undefined, Link?: false, DisplayAsIcon?: boolean, IconFileName?: string, IconIndex?: number, IconLabel?: string, Left?: number, Top?: number, Width?: number, Height?: number): Shape;
+        AddOLEObject(ClassType: undefined, Filename: string, Link?: boolean, DisplayAsIcon?: boolean, IconFileName?: string, IconIndex?: number, IconLabel?: string, Left?: number, Top?: number, Width?: number, Height?: number): Shape;
         AddPicture(Filename: string, LinkToFile: Office.MsoTriState, SaveWithDocument: Office.MsoTriState, Left: number, Top: number, Width: number, Height: number): Shape;
-        AddPolyline(SafeArrayOfPoints: any): Shape;
+        AddPolyline(SafeArrayOfPoints: SafeArray<number>): Shape;
         AddShape(Type: Office.MsoAutoShapeType, Left: number, Top: number, Width: number, Height: number): Shape;
-        AddSmartArt(Layout: Office.SmartArtLayout, Left?: any, Top?: any, Width?: any, Height?: any): Shape;
+        AddSmartArt(Layout: Office.SmartArtLayout, Left?: number, Top?: number, Width?: number, Height?: number): Shape;
         AddTextbox(Orientation: Office.MsoTextOrientation, Left: number, Top: number, Width: number, Height: number): Shape;
-        AddTextEffect(
-            PresetTextEffect: Office.MsoPresetTextEffect, Text: string, FontName: string, FontSize: number, FontBold: Office.MsoTriState, FontItalic: Office.MsoTriState,
-            Left: number, Top: number): Shape;
+        AddTextEffect(PresetTextEffect: Office.MsoPresetTextEffect, Text: string, FontName: string, FontSize: number, FontBold: Office.MsoTriState, FontItalic: Office.MsoTriState, Left: number, Top: number): Shape;
         readonly Application: Application;
         BuildFreeform(EditingType: Office.MsoEditingType, X1: number, Y1: number): FreeformBuilder;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): Shape;
+        Item(Index: number | string): Shape;
         readonly Parent: any;
-        Range(Index: any): ShapeRange;
+        Range(Index: number | string | SafeArray<number | string>): ShapeRange;
         SelectAll(): void;
+        (Index: number | string): Shape;
     }
 
-    class Sheets {
-        private 'Excel.Sheets_typekey': Sheets;
-        private constructor();
+    interface Sheets<TSheet = Sheet> {
         __PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any): void;
         _Default(Index: any): any;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
-        Add(Before?: any, After?: any, Count?: any, Type?: any): any;
+        Add<T>(Before?: Sheet, After?: Sheet, Count?: number, Type?: T): AddSheetResult<T>;
         readonly Application: Application;
-        Copy(Before?: any, After?: any): void;
+        Copy(Before?: Sheet): void;
+        Copy(Before: undefined, After: Sheet): void;
         readonly Count: number;
         readonly Creator: XlCreator;
         Delete(): void;
 
-        /** @param Excel.XlFillWith [Type=-4104] */
+        /** @param Type [Type=-4104] */
         FillAcrossSheets(Range: Range, Type?: XlFillWith): void;
         readonly HPageBreaks: HPageBreaks;
-        Item(Index: string | number): Worksheet | Chart | DialogSheet;
-        Item(Indexes: SafeArray<string | number>): Sheets;
-        Move(Before?: any, After?: any): void;
+        Item(Index: string | number): TSheet;
+        Item(Indexes: SafeArray<string | number>): Sheets<TSheet>;
+        Move(Before?: Sheet | number): void;
+        Move(Before: undefined, After: Sheet | number): void;
         readonly Parent: any;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any, IgnorePrintAreas?: any): void;
-        PrintPreview(EnableChanges?: any): void;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>, IgnorePrintAreas?: boolean): void;
+        PrintPreview(EnableChanges?: boolean): void;
         Select(Replace?: boolean): void;
         Visible: any;
         readonly VPageBreaks: VPageBreaks;
+        (Index: string | number): TSheet;
+        (Indexes: SafeArray<string | number>): Sheets<TSheet>;
     }
 
-    class SheetViews {
-        private 'Excel.SheetViews_typekey': SheetViews;
-        private constructor();
+    interface SheetViews {
         _Default(Index: any): any;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): any;
+        Item(Index: any): SheetView;
         readonly Parent: any;
+        (Index: any): SheetView;
     }
 
     class Slicer {
@@ -7430,27 +8049,25 @@ declare namespace Excel {
         readonly VisibleSlicerItemsList: any;
     }
 
-    class SlicerCacheLevels {
-        private 'Excel.SlicerCacheLevels_typekey': SlicerCacheLevels;
-        private constructor();
+    interface SlicerCacheLevels {
         _Default(Level?: any): SlicerCacheLevel;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Level?: any): SlicerCacheLevel;
+        Item(Level?: number | string): SlicerCacheLevel;
         readonly Parent: any;
+        (Level?: number | string): SlicerCacheLevel;
     }
 
-    class SlicerCaches {
-        private 'Excel.SlicerCaches_typekey': SlicerCaches;
-        private constructor();
+    interface SlicerCaches {
         _Default(Index: any): SlicerCache;
-        Add(Source: any, SourceField: any, Name?: any): SlicerCache;
+        Add(Source: WorkbookConnection | PivotTable | string, SourceField: any, Name?: any): SlicerCache;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): SlicerCache;
+        Item(Index: number | string): SlicerCache;
         readonly Parent: any;
+        (Index: number | string): SlicerCache;
     }
 
     class SlicerItem {
@@ -7468,40 +8085,37 @@ declare namespace Excel {
         readonly Value: string;
     }
 
-    class SlicerItems {
-        private 'Excel.SlicerItems_typekey': SlicerItems;
-        private constructor();
+    interface SlicerItems {
         _Default(Index: any): SlicerItem;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): SlicerItem;
+        Item(Index: number | string): SlicerItem;
         readonly Parent: any;
+        (Index: number | string): SlicerItem;
     }
 
-    class SlicerPivotTables {
-        private 'Excel.SlicerPivotTables_typekey': SlicerPivotTables;
-        private constructor();
+    interface SlicerPivotTables {
         _Default(Index: any): PivotTable;
         AddPivotTable(PivotTable: PivotTable): void;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): PivotTable;
+        Item(Index: number | string): PivotTable;
         readonly Parent: any;
-        RemovePivotTable(PivotTable: any): void;
+        RemovePivotTable(PivotTable: PivotTable | number | string): void;
+        (Index: number | string): PivotTable;
     }
 
-    class Slicers {
-        private 'Excel.Slicers_typekey': Slicers;
-        private constructor();
+    interface Slicers {
         _Default(Index: any): Slicer;
-        Add(SlicerDestination: any, Level?: any, Name?: any, Caption?: any, Top?: any, Left?: any, Width?: any, Height?: any): Slicer;
+        Add(SlicerDestination: string | Worksheet, Level?: any, Name?: string, Caption?: string, Top?: number, Left?: number, Width?: number, Height?: number): Slicer;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): Slicer;
+        Item(Index: number | string): Slicer;
         readonly Parent: any;
+        (Index: number | string): Slicer;
     }
 
     class SmartTag {
@@ -7539,15 +8153,14 @@ declare namespace Excel {
         readonly Type: XlSmartTagControlType;
     }
 
-    class SmartTagActions {
-        private 'Excel.SmartTagActions_typekey': SmartTagActions;
-        private constructor();
+    interface SmartTagActions {
         _Default(Index: any): SmartTagAction;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: any): SmartTagAction;
         readonly Parent: any;
+        (Index: any): SmartTagAction;
     }
 
     class SmartTagOptions {
@@ -7572,9 +8185,7 @@ declare namespace Excel {
         readonly progID: string;
     }
 
-    class SmartTagRecognizers {
-        private 'Excel.SmartTagRecognizers_typekey': SmartTagRecognizers;
-        private constructor();
+    interface SmartTagRecognizers {
         _Default(Index: any): SmartTagRecognizer;
         readonly Application: Application;
         readonly Count: number;
@@ -7582,17 +8193,17 @@ declare namespace Excel {
         Item(Index: any): SmartTagRecognizer;
         readonly Parent: any;
         Recognize: boolean;
+        (Index: any): SmartTagRecognizer;
     }
 
-    class SmartTags {
-        private 'Excel.SmartTags_typekey': SmartTags;
-        private constructor();
+    interface SmartTags {
         _Default(Index: any): SmartTag;
         Add(SmartTagType: string): SmartTag;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         readonly Parent: any;
+        (Index: any): SmartTag;
     }
 
     class Sort {
@@ -7629,9 +8240,7 @@ declare namespace Excel {
         readonly SortOnValue: any;
     }
 
-    class SortFields {
-        private 'Excel.SortFields_typekey': SortFields;
-        private constructor();
+    interface SortFields {
         _Default(Index: any): SortField;
         Add(Key: Range, SortOn?: any, Order?: any, CustomOrder?: any, DataOption?: any): SortField;
         readonly Application: Application;
@@ -7640,6 +8249,7 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Item(Index: any): SortField;
         readonly Parent: any;
+        (Index: any): SortField;
     }
 
     class SoundNote {
@@ -7723,9 +8333,7 @@ declare namespace Excel {
         Type: XlSparkType;
     }
 
-    class SparklineGroups {
-        private 'Excel.SparklineGroups_typekey': SparklineGroups;
-        private constructor();
+    interface SparklineGroups {
         _Default(Index: any): SparklineGroup;
         Add(Type: XlSparkType, SourceData: string): SparklineGroup;
         readonly Application: Application;
@@ -7734,9 +8342,10 @@ declare namespace Excel {
         readonly Count: number;
         readonly Creator: XlCreator;
         Group(Location: Range): void;
-        Item(Index: any): SparklineGroup;
+        Item(Index: number): SparklineGroup;
         readonly Parent: any;
         Ungroup(): void;
+        (Index: number): SparklineGroup;
     }
 
     class SparkPoints {
@@ -7769,7 +8378,7 @@ declare namespace Excel {
         private 'Excel.Speech_typekey': Speech;
         private constructor();
         Direction: XlSpeakDirection;
-        Speak(Text: string, SpeakAsync?: any, SpeakXML?: any, Purge?: any): void;
+        Speak(Text: string, SpeakAsync?: boolean, SpeakXML?: boolean, Purge?: boolean): void;
         SpeakCellOnEnter: boolean;
     }
 
@@ -7819,7 +8428,7 @@ declare namespace Excel {
         IndentLevel: number;
         readonly Interior: Interior;
         Locked: boolean;
-        MergeCells: any;
+        MergeCells: boolean;
         readonly Name: string;
         readonly NameLocal: string;
         NumberFormat: string;
@@ -7833,29 +8442,28 @@ declare namespace Excel {
         WrapText: boolean;
     }
 
-    class Styles {
-        private 'Excel.Styles_typekey': Styles;
-        private constructor();
+    interface Styles {
         _Default(Index: any): Style;
         Add(Name: string, BasedOn?: any): Style;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): Style;
-        Merge(Workbook: any): any;
+        Item(Index: number | string): Style;
+        Merge(Workbook: Workbook): any;
         readonly Parent: any;
+        (Index: any): Style;
     }
 
     class Tab {
         private 'Excel.Tab_typekey': Tab;
         private constructor();
         readonly Application: Application;
-        Color: any;
+        Color: XlRgbColor | number;
         ColorIndex: XlColorIndex;
         readonly Creator: XlCreator;
         readonly Parent: any;
         ThemeColor: XlThemeColor;
-        TintAndShade: any;
+        TintAndShade: number;
     }
 
     class TableStyle {
@@ -7866,7 +8474,7 @@ declare namespace Excel {
         readonly BuiltIn: boolean;
         readonly Creator: XlCreator;
         Delete(): void;
-        Duplicate(NewTableStyleName?: any): TableStyle;
+        Duplicate(NewTableStyleName?: string): TableStyle;
         readonly Name: string;
         readonly NameLocal: string;
         readonly Parent: any;
@@ -7890,27 +8498,25 @@ declare namespace Excel {
         StripeSize: number;
     }
 
-    class TableStyleElements {
-        private 'Excel.TableStyleElements_typekey': TableStyleElements;
-        private constructor();
+    interface TableStyleElements {
         _Default(Index: XlTableStyleElementType): TableStyleElement;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: XlTableStyleElementType): TableStyleElement;
         readonly Parent: any;
+        (Index: XlTableStyleElementType): TableStyleElement;
     }
 
-    class TableStyles {
-        private 'Excel.TableStyles_typekey': TableStyles;
-        private constructor();
+    interface TableStyles {
         _Default(Index: any): TableStyle;
         Add(TableStyleName: string): TableStyle;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): TableStyle;
+        Item(Index: number | string): TableStyle;
         readonly Parent: any;
+        (Index: number | string): TableStyle;
     }
 
     class TextEffectFormat {
@@ -7940,7 +8546,7 @@ declare namespace Excel {
         readonly Application: Application;
         AutoMargins: boolean;
         AutoSize: boolean;
-        Characters(Start?: any, Length?: any): Characters;
+        Characters(Start?: number, Length?: number): Characters;
         readonly Creator: XlCreator;
         HorizontalAlignment: XlHAlign;
         HorizontalOverflow: XlOartHorizontalOverflow;
@@ -8041,7 +8647,7 @@ declare namespace Excel {
         readonly Name: string;
         NumberFormat: string;
         NumberFormatLinked: boolean;
-        NumberFormatLocal: any;
+        NumberFormatLocal: string;
         Offset: number;
         Orientation: XlTickLabelOrientation;
         readonly Parent: any;
@@ -8096,9 +8702,7 @@ declare namespace Excel {
         Width: number;
     }
 
-    class ToolbarButtons {
-        private 'Excel.ToolbarButtons_typekey': ToolbarButtons;
-        private constructor();
+    interface ToolbarButtons {
         _Default(Index: number): ToolbarButton;
         Add(Button?: any, Before?: any, OnAction?: any, Pushed?: any, Enabled?: any, StatusBar?: any, HelpFile?: any, HelpContextID?: any): ToolbarButton;
         readonly Application: Application;
@@ -8106,11 +8710,10 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Item(Index: number): ToolbarButton;
         readonly Parent: any;
+        (Index: number): ToolbarButton;
     }
 
-    class Toolbars {
-        private 'Excel.Toolbars_typekey': Toolbars;
-        private constructor();
+    interface Toolbars {
         _Default(Index: any): Toolbar;
         Add(Name?: any): Toolbar;
         readonly Application: Application;
@@ -8118,6 +8721,33 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         Item(Index: any): Toolbar;
         readonly Parent: any;
+        (Index: any): Toolbar;
+    }
+
+    class Top10 {
+        private 'Excel.Top10_typekey': Top10;
+        private constructor();
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly Borders: Borders;
+        CalcFor: XlCalcFor;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        readonly Font: Font;
+        readonly Interior: Interior;
+        ModifyAppliesToRange(Range: Range): void;
+        NumberFormat: string;
+        readonly Parent: any;
+        Percent: boolean;
+        Priority: number;
+        readonly PTCondition: boolean;
+        Rank: number;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        StopIfTrue: boolean;
+        TopBottom: XlTopBottom;
+        readonly Type: number;
     }
 
     class TreeviewControl {
@@ -8126,10 +8756,74 @@ declare namespace Excel {
         readonly Application: Application;
         readonly Creator: XlCreator;
         Drilled: any;
-        Hidden: any;
+        Hidden: SafeArray<SafeArray<string>>;
         readonly Parent: any;
     }
 
+    class Trendline {
+        private 'Excel.Trendline_typekey': Trendline;
+        private constructor();
+        readonly Application: Application;
+        Backward: number;
+        Backward2: number;
+        readonly Border: Border;
+        ClearFormats(): any;
+        readonly Creator: XlCreator;
+        readonly DataLabel: DataLabel;
+        Delete(): any;
+        DisplayEquation: boolean;
+        DisplayRSquared: boolean;
+        readonly Format: ChartFormat;
+        Forward: number;
+        Forward2: number;
+        readonly Index: number;
+        Intercept: number;
+        InterceptIsAuto: boolean;
+        Name: string;
+        NameIsAuto: boolean;
+        Order: number;
+        readonly Parent: any;
+        Period: number;
+        Select(): any;
+        Type: XlTrendlineType;
+    }
+
+    interface Trendlines {
+        _Default(Index?: any): Trendline;
+
+        /** @param Type [Type=-4132] */
+        Add(Type?: XlTrendlineType, Order?: number, Period?: number, Forward?: number, Backward?: number, Intercept?: any, DisplayEquation?: boolean, DisplayRSquared?: boolean, Name?: string): Trendline;
+        readonly Application: Application;
+        readonly Count: number;
+        readonly Creator: XlCreator;
+        Item(Index: number): Trendline;
+        readonly Parent: any;
+        (Index: number): Trendline;
+    }
+
+    class UniqueValues {
+        private 'Excel.UniqueValues_typekey': UniqueValues;
+        private constructor();
+        readonly Application: Application;
+        readonly AppliesTo: Range;
+        readonly Borders: Borders;
+        readonly Creator: XlCreator;
+        Delete(): void;
+        DupeUnique: XlDupeUnique;
+        readonly Font: Font;
+        readonly Interior: Interior;
+        ModifyAppliesToRange(Range: Range): void;
+        NumberFormat: string;
+        readonly Parent: any;
+        Priority: number;
+        readonly PTCondition: boolean;
+        ScopeType: XlPivotConditionScope;
+        SetFirstPriority(): void;
+        SetLastPriority(): void;
+        StopIfTrue: boolean;
+        readonly Type: XlFormatConditionType.xlUniqueValues;
+    }
+
     class UpBars {
         private 'Excel.UpBars_typekey': UpBars;
         private constructor();
@@ -8145,15 +8839,14 @@ declare namespace Excel {
         Select(): any;
     }
 
-    class UsedObjects {
-        private 'Excel.UsedObjects_typekey': UsedObjects;
-        private constructor();
+    interface UsedObjects {
         _Default(Index: any): any;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): any;
+        Item(Index: number | string): any;
         readonly Parent: any;
+        (Index: number | string): any;
     }
 
     class UserAccess {
@@ -8164,20 +8857,21 @@ declare namespace Excel {
         readonly Name: string;
     }
 
-    class UserAccessList {
-        private 'Excel.UserAccessList_typekey': UserAccessList;
-        private constructor();
+    interface UserAccessList {
         _Default(Index: any): UserAccess;
         Add(Name: string, AllowEdit: boolean): UserAccess;
         readonly Count: number;
         DeleteAll(): void;
-        Item(Index: any): UserAccess;
+        Item(Index: number | string): UserAccess;
+        (Index: number | string): UserAccess;
     }
 
     class Validation {
         private 'Excel.Validation_typekey': Validation;
         private constructor();
-        Add(Type: XlDVType, AlertStyle?: any, Operator?: any, Formula1?: any, Formula2?: any): void;
+        Add(Type: XlDVType.xlValidateInputOnly): void;
+        Add(Type: XlDVType.xlValidateWholeNumber | XlDVType.xlValidateDate | XlDVType.xlValidateDecimal | XlDVType.xlValidateTextLength | XlDVType.xlValidateTime, AlertStyle?: XlDVAlertStyle, Operator?: XlFormatConditionOperator.xlBetween | XlFormatConditionOperator.xlNotBetween, Formula1?: string, Formula2?: string): void;
+        Add(Type?: XlDVType, AlertStyle?: XlDVAlertStyle, Operator?: XlFormatConditionOperator, Formula1?: string): void;
         readonly AlertStyle: number;
         readonly Application: Application;
         readonly Creator: XlCreator;
@@ -8191,7 +8885,9 @@ declare namespace Excel {
         InCellDropdown: boolean;
         InputMessage: string;
         InputTitle: string;
-        Modify(Type?: any, AlertStyle?: any, Operator?: any, Formula1?: any, Formula2?: any): void;
+        Modify(Type: XlDVType.xlValidateInputOnly): void;
+        Modify(Type: XlDVType.xlValidateWholeNumber | XlDVType.xlValidateDate | XlDVType.xlValidateDecimal | XlDVType.xlValidateTextLength | XlDVType.xlValidateTime, AlertStyle?: XlDVAlertStyle, Operator?: XlFormatConditionOperator.xlBetween | XlFormatConditionOperator.xlNotBetween, Formula1?: string, Formula2?: string): void;
+        Modify(Type?: XlDVType, AlertStyle?: XlDVAlertStyle, Operator?: XlFormatConditionOperator, Formula1?: string): void;
         readonly Operator: number;
         readonly Parent: any;
         ShowError: boolean;
@@ -8230,16 +8926,15 @@ declare namespace Excel {
         Type: XlPageBreak;
     }
 
-    class VPageBreaks {
-        private 'Excel.VPageBreaks_typekey': VPageBreaks;
-        private constructor();
+    interface VPageBreaks {
         _Default(Index: number): VPageBreak;
-        Add(Before: any): VPageBreak;
+        Add(Before: Range): VPageBreak;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number): VPageBreak;
         readonly Parent: any;
+        (Index: number): VPageBreak;
     }
 
     class Walls {
@@ -8255,8 +8950,8 @@ declare namespace Excel {
         readonly Name: string;
         readonly Parent: any;
         Paste(): void;
-        PictureType: any;
-        PictureUnit: any;
+        PictureType: XlChartPictureType;
+        PictureUnit: number;
         Select(): any;
         Thickness: number;
     }
@@ -8271,17 +8966,16 @@ declare namespace Excel {
         readonly Source: any;
     }
 
-    class Watches {
-        private 'Excel.Watches_typekey': Watches;
-        private constructor();
+    interface Watches {
         _Default(Index: any): Watch;
         Add(Source: any): Watch;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
         Delete(): void;
-        Item(Index: any): Watch;
+        Item(Index: number | string): Watch;
         readonly Parent: any;
+        (Index: number | string): Watch;
     }
 
     class WebOptions {
@@ -8316,12 +9010,12 @@ declare namespace Excel {
         readonly ActiveCell: Range;
         readonly ActiveChart: Chart;
         readonly ActivePane: Pane;
-        readonly ActiveSheet: any;
-        readonly ActiveSheetView: any;
+        readonly ActiveSheet: Sheet | null;
+        readonly ActiveSheetView: SheetView | null;
         readonly Application: Application;
         AutoFilterDateGrouping: boolean;
-        Caption: any;
-        Close(SaveChanges?: any, Filename?: any, RouteWorkbook?: any): boolean;
+        Caption: string;
+        Close(SaveChanges?: boolean, Filename?: string, RouteWorkbook?: boolean): boolean;
         readonly Creator: XlCreator;
         DisplayFormulas: boolean;
         DisplayGridlines: boolean;
@@ -8340,7 +9034,7 @@ declare namespace Excel {
         GridlineColorIndex: XlColorIndex;
         Height: number;
         readonly Index: number;
-        LargeScroll(Down?: any, Up?: any, ToRight?: any, ToLeft?: any): any;
+        LargeScroll(Down?: number, Up?: number, ToRight?: number, ToLeft?: number): any;
         Left: number;
         NewWindow(): Window;
         OnWindow: string;
@@ -8348,18 +9042,19 @@ declare namespace Excel {
         readonly Parent: any;
         PointsToScreenPixelsX(Points: number): number;
         PointsToScreenPixelsY(Points: number): number;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): any;
-        PrintPreview(EnableChanges?: any): any;
-        RangeFromPoint(x: number, y: number): any;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>): any;
+        PrintPreview(EnableChanges?: boolean): any;
+        RangeFromPoint(x: number, y: number): Shape | Range | null;
         readonly RangeSelection: Range;
         ScrollColumn: number;
-        ScrollIntoView(Left: number, Top: number, Width: number, Height: number, Start?: any): void;
+        ScrollIntoView(Left: number, Top: number, Width: number, Height: number, Start?: boolean): void;
         ScrollRow: number;
-        ScrollWorkbookTabs(Sheets?: any, Position?: any): any;
+        ScrollWorkbookTabs(Sheets: 0, Position: Constants.xlFirst | Constants.xlLast): any;
+        ScrollWorkbookTabs(Sheets: number): any;
         readonly SelectedSheets: Sheets;
         readonly Selection: any;
         readonly SheetViews: SheetViews;
-        SmallScroll(Down?: any, Up?: any, ToRight?: any, ToLeft?: any): any;
+        SmallScroll(Down?: number, Up?: number, ToRight?: number, ToLeft?: number): any;
         Split: boolean;
         SplitColumn: number;
         SplitHorizontal: number;
@@ -8376,25 +9071,25 @@ declare namespace Excel {
         Width: number;
         readonly WindowNumber: number;
         WindowState: XlWindowState;
-        Zoom: any;
+        Zoom: number | true;
     }
 
-    class Windows {
-        private 'Excel.Windows_typekey': Windows;
-        private constructor();
+    interface Windows {
         _Default(Index: any): Window;
         readonly Application: Application;
+        Arrange(ArrangeStyle: XlArrangeStyle, ActiveWorkbook: true, SyncHorizontal?: boolean, SyncVertical?: boolean): any;
 
-        /** @param Excel.XlArrangeStyle [ArrangeStyle=1] */
-        Arrange(ArrangeStyle?: XlArrangeStyle, ActiveWorkbook?: any, SyncHorizontal?: any, SyncVertical?: any): any;
+        /** @param ArrangeStyle [ArrangeStyle=1] */
+        Arrange(ArrangeStyle?: XlArrangeStyle, ActiveWorkbook?: boolean, SyncHorizontal?: boolean, SyncVertical?: boolean): any;
         BreakSideBySide(): boolean;
-        CompareSideBySideWith(WindowName: any): boolean;
+        CompareSideBySideWith(WindowName: string): boolean;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): Window;
+        Item(Index: number | string): Window;
         readonly Parent: any;
         ResetPositionsSideBySide(): void;
         SyncScrollingSideBySide: boolean;
+        (Index: number | string): Window;
     }
 
     class Workbook {
@@ -8407,16 +9102,14 @@ declare namespace Excel {
         _ProtectSharing(Filename?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, SharingPassword?: any): void;
         readonly _ReadOnlyRecommended: boolean;
 
-        /** @param Excel.XlSaveAsAccessMode [AccessMode=1] */
-        _SaveAs(
-            Filename: string, FileFormat?: XlFileFormat, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, AccessMode?: XlSaveAsAccessMode,
-            ConflictResolution?: XlSaveConflictResolution, AddToMru?: boolean, TextCodepage?: any, TextVisualLayout?: any): void;
+        /** @param AccessMode [AccessMode=1] */
+        _SaveAs(Filename: string, FileFormat?: XlFileFormat, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, AccessMode?: XlSaveAsAccessMode, ConflictResolution?: XlSaveConflictResolution, AddToMru?: boolean, TextCodepage?: any, TextVisualLayout?: any): void;
         AcceptAllChanges(When?: any, Who?: any, Where?: any): void;
         AcceptLabelsInFormulas: boolean;
         AccuracyVersion: number;
         Activate(): void;
         readonly ActiveChart: Chart;
-        readonly ActiveSheet: any;
+        readonly ActiveSheet: Sheet;
         readonly ActiveSlicer: Slicer;
         AddToFavorites(): void;
         readonly Application: Application;
@@ -8428,18 +9121,21 @@ declare namespace Excel {
         readonly BuiltinDocumentProperties: Office.DocumentProperties<Application>;
         readonly CalculationVersion: number;
         CanCheckIn(): boolean;
-        ChangeFileAccess(Mode: XlFileAccess, WritePassword?: any, Notify?: any): void;
+        ChangeFileAccess(Mode: XlFileAccess.xlReadWrite, WritePassword?: string, Notify?: boolean): void;
+        ChangeFileAccess(Mode: XlFileAccess): void;
         ChangeHistoryDuration: number;
 
-        /** @param Excel.XlLinkType [Type=1] */
+        /** @param Type [Type=1] */
         ChangeLink(Name: string, NewName: string, Type?: XlLinkType): void;
-        readonly Charts: Sheets;
+        readonly Charts: Sheets<Chart>;
         CheckCompatibility: boolean;
-        CheckIn(SaveChanges?: any, Comments?: any, MakePublic?: any): void;
-        CheckInWithVersion(SaveChanges?: any, Comments?: any, MakePublic?: any, VersionType?: any): void;
-        Close(SaveChanges?: any, Filename?: any, RouteWorkbook?: any): void;
+        CheckIn(SaveChanges: true, Comments?: string, MakePublic?: boolean): void;
+        CheckIn(SaveChanges?: any): void;
+        CheckInWithVersion(SaveChanges?: boolean, Comments?: any, MakePublic?: any, VersionType?: any): void;
+        Close(SaveChanges: true, Filename?: string, RouteWorkbook?: boolean): void;
+        Close(SaveChanges?: boolean, Filename?: undefined, RouteWorkbook?: boolean): void;
         readonly CodeName: string;
-        Colors(Index?: any): any;
+        Colors: SafeArray<number> & ((Index: number) => number);
         readonly CommandBars: Office.CommandBars;
         Comments: string;
         ConflictResolution: XlSaveConflictResolution;
@@ -8457,7 +9153,7 @@ declare namespace Excel {
         DefaultSlicerStyle: any;
         DefaultTableStyle: any;
         DeleteNumberFormat(NumberFormat: string): void;
-        readonly DialogSheets: Sheets;
+        readonly DialogSheets: Sheets<DialogSheet>;
         DisplayDrawingObjects: XlDisplayDrawingObjects;
         DisplayInkComments: boolean;
         readonly DocumentInspectors: Office.DocumentInspectors;
@@ -8476,12 +9172,10 @@ declare namespace Excel {
         readonly Excel4MacroSheets: Sheets;
         readonly Excel8CompatibilityMode: boolean;
         ExclusiveAccess(): boolean;
-        ExportAsFixedFormat(
-            Type: XlFixedFormatType, Filename?: any, Quality?: any, IncludeDocProperties?: any, IgnorePrintAreas?: any, From?: any, To?: any, OpenAfterPublish?: any,
-            FixedFormatExtClassPtr?: any): void;
+        ExportAsFixedFormat(Type: XlFixedFormatType, Filename?: string, Quality?: XlFixedFormatQuality, IncludeDocProperties?: boolean, IgnorePrintAreas?: boolean, From?: number, To?: number, OpenAfterPublish?: boolean, FixedFormatExtClassPtr?: any): void;
         readonly FileFormat: XlFileFormat;
         Final: boolean;
-        FollowHyperlink(Address: string, SubAddress?: any, NewWindow?: any, AddHistory?: any, ExtraInfo?: any, Method?: any, HeaderInfo?: any): void;
+        FollowHyperlink(Address: string, SubAddress?: string, NewWindow?: boolean, AddHistory?: undefined, ExtraInfo?: string | Office.ByteArray, Method?: Office.MsoExtraInfoMethod, HeaderInfo?: string): void;
         ForceFullCalculation: boolean;
         ForwardMailer(): void;
         readonly FullName: string;
@@ -8493,7 +9187,7 @@ declare namespace Excel {
         HasRoutingSlip: boolean;
         readonly HasVBProject: boolean;
         HighlightChangesOnScreen: boolean;
-        HighlightChangesOptions(When?: any, Who?: any, Where?: any): void;
+        HighlightChangesOptions(When?: XlHighlightChangesTime, Who?: 'Everyone' | 'Everyone but me' | string, Where?: string): void;
         readonly HTMLProject: Office.HTMLProject;
         readonly IconSets: IconSets;
         InactiveListBorderVisible: boolean;
@@ -8501,12 +9195,12 @@ declare namespace Excel {
         readonly IsInplace: boolean;
         KeepChangeHistory: boolean;
         Keywords: string;
-        LinkInfo(Name: string, LinkInfo: XlLinkInfo, Type?: any, EditionRef?: any): any;
-        LinkSources(Type?: any): any;
+        LinkInfo(Name: string, LinkInfo: XlLinkInfo, Type?: XlLinkInfoType, EditionRef?: string): any;
+        LinkSources(Type?: XlLink): SafeArray<string>;
         ListChangesOnNewSheet: boolean;
         LockServerFile(): void;
         readonly Mailer: Mailer;
-        MergeWorkbook(Filename: any): void;
+        MergeWorkbook(Filename: string): void;
         readonly Modules: Sheets;
         readonly MultiUserEditing: boolean;
         readonly Name: string;
@@ -8515,7 +9209,7 @@ declare namespace Excel {
         OnSave: string;
         OnSheetActivate: string;
         OnSheetDeactivate: string;
-        OpenLinks(Name: string, ReadOnly?: any, Type?: any): void;
+        OpenLinks(Name: string, ReadOnly?: boolean, Type?: XlLink): void;
         readonly Parent: any;
         Password: string;
         readonly PasswordEncryptionAlgorithm: string;
@@ -8527,19 +9221,18 @@ declare namespace Excel {
         PersonalViewListSettings: boolean;
         PersonalViewPrintSettings: boolean;
         PivotCaches(): PivotCaches;
-        PivotTableWizard(
-            SourceType?: any, SourceData?: any, TableDestination?: any, TableName?: any, RowGrand?: any, ColumnGrand?: any, SaveData?: any, HasAutoFormat?: any,
-            AutoPage?: any, Reserved?: any, BackgroundQuery?: any, OptimizeCache?: any, PageFieldOrder?: any, PageFieldWrapCount?: any, ReadData?: any, Connection?: any): void;
-        Post(DestName?: any): void;
+        PivotTableWizard(): void;
+        PivotTableWizard<TSourceType>(SourceType: TSourceType, SourceData: PivotTableWizardSourceData<TSourceType>, TableDestination?: Range, TableName?: string, RowGrand?: boolean, ColumnGrand?: boolean, SaveData?: boolean, HasAutoFormat?: boolean, AutoPage?: PivotTableWizardAutoPage<TSourceType>, Reserved?: undefined, BackgroundQuery?: boolean, OptimizeCache?: boolean, PageFieldOrder?: XlOrder, PageFieldWrapCount?: number, ReadData?: boolean, Connection?: string): void;
+        Post(): void;
         PrecisionAsDisplayed: boolean;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any, IgnorePrintAreas?: any): void;
-        PrintPreview(EnableChanges?: any): void;
-        Protect(Password?: any, Structure?: any, Windows?: any): void;
-        ProtectSharing(Filename?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, SharingPassword?: any, FileFormat?: any): void;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>, IgnorePrintAreas?: boolean): void;
+        PrintPreview(EnableChanges?: boolean): void;
+        Protect(Password?: string, Structure?: boolean, Windows?: boolean): void;
+        ProtectSharing(Filename?: string, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, SharingPassword?: string, FileFormat?: any): void;
         readonly ProtectStructure: boolean;
         readonly ProtectWindows: boolean;
         readonly PublishObjects: PublishObjects;
-        PurgeChangeHistoryNow(Days: number, SharingPassword?: any): void;
+        PurgeChangeHistoryNow(Days: number, SharingPassword?: string): void;
         readonly ReadOnly: boolean;
         ReadOnlyRecommended: boolean;
         RecheckSmartTags(): void;
@@ -8551,7 +9244,7 @@ declare namespace Excel {
         RemoveUser(Index: number): void;
         Reply(): void;
         ReplyAll(): void;
-        ReplyWithChanges(ShowMessage?: any): void;
+        ReplyWithChanges(ShowMessage?: boolean): void;
         readonly Research: Research;
         ResetColors(): void;
         readonly RevisionNumber: number;
@@ -8561,25 +9254,27 @@ declare namespace Excel {
         RunAutoMacros(Which: XlRunAutoMacro): void;
         Save(): void;
 
-        /** @param Excel.XlSaveAsAccessMode [AccessMode=1] */
-        SaveAs(
-            Filename: string, FileFormat?: XlFileFormat, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, AccessMode?: XlSaveAsAccessMode,
-            ConflictResolution?: XlSaveConflictResolution, AddToMru?: boolean, TextCodepage?: any, TextVisualLayout?: any): void;
+        /** @param AccessMode [AccessMode=1] */
+        SaveAs(Filename: string, FileFormat?: XlFileFormat, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, AccessMode?: XlSaveAsAccessMode, ConflictResolution?: XlSaveConflictResolution, AddToMru?: boolean, TextCodepage?: any, TextVisualLayout?: any): void;
         SaveAsXMLData(Filename: string, Map: XmlMap): void;
-        SaveCopyAs(Filename?: any): void;
+        SaveCopyAs(Filename: string): void;
         Saved: boolean;
         SaveLinkValues: boolean;
         sblt(s: string): void;
-        SendFaxOverInternet(Recipients?: any, Subject?: any, ShowMessage?: any): void;
-        SendForReview(Recipients?: any, Subject?: any, ShowMessage?: any, IncludeAttachment?: any): void;
-        SendMail(Recipients: any, Subject?: any, ReturnReceipt?: any): void;
+        SendFaxOverInternet(Recipients?: string, Subject?: string, ShowMessage?: boolean): void;
+        SendForReview(Recipients?: string, Subject?: string, ShowMessage?: boolean, IncludeAttachment?: boolean): void;
+        SendMail(Recipients: string | SafeArray<string>, Subject?: string, ReturnReceipt?: boolean): void;
 
-        /** @param Excel.XlPriority [Priority=-4143] */
+        /**
+         * Macintosh only
+         *
+         * @param Priority [Priority=-4143]
+         */
         SendMailer(FileFormat: any, Priority?: XlPriority): void;
         readonly ServerPolicy: Office.ServerPolicy;
         readonly ServerViewableItems: ServerViewableItems;
-        SetLinkOnData(Name: string, Procedure?: any): void;
-        SetPasswordEncryptionOptions(PasswordEncryptionProvider?: any, PasswordEncryptionAlgorithm?: any, PasswordEncryptionKeyLength?: any, PasswordEncryptionFileProperties?: any): void;
+        SetLinkOnData(Name: string, Procedure?: string): void;
+        SetPasswordEncryptionOptions(PasswordEncryptionProvider?: string, PasswordEncryptionAlgorithm?: string, PasswordEncryptionKeyLength?: number, PasswordEncryptionFileProperties?: boolean): void;
         readonly SharedWorkspace: Office.SharedWorkspace;
         readonly Sheets: Sheets;
         ShowConflictHistory: boolean;
@@ -8597,25 +9292,25 @@ declare namespace Excel {
         readonly Theme: Office.OfficeTheme;
         Title: string;
         ToggleFormsDesign(): void;
-        Unprotect(Password?: any): void;
-        UnprotectSharing(SharingPassword?: any): void;
+        Unprotect(Password?: string): void;
+        UnprotectSharing(SharingPassword?: string): void;
         UpdateFromFile(): void;
-        UpdateLink(Name?: any, Type?: any): void;
+        UpdateLink(Name?: string, Type?: XlLinkType): void;
         UpdateLinks: XlUpdateLinks;
         UpdateRemoteReferences: boolean;
         UserControl: boolean;
-        readonly UserStatus: any;
+        readonly UserStatus: SafeArray;
         readonly VBASigned: boolean;
         readonly VBProject: VBIDE.VBProject;
         readonly WebOptions: WebOptions;
         WebPagePreview(): void;
         readonly Windows: Windows;
-        readonly Worksheets: Sheets;
+        readonly Worksheets: Sheets<Worksheet>;
         WritePassword: string;
         readonly WriteReserved: boolean;
         readonly WriteReservedBy: string;
-        XmlImport(Url: string, ImportMap: XmlMap, Overwrite?: any, Destination?: any): XlXmlImportResult;
-        XmlImportXml(Data: string, ImportMap: XmlMap, Overwrite?: any, Destination?: any): XlXmlImportResult;
+        XmlImport(Url: string, ImportMap: XmlMap, Overwrite?: boolean, Destination?: any): XlXmlImportResult;
+        XmlImportXml(Data: string, ImportMap: XmlMap, Overwrite?: boolean, Destination?: any): XlXmlImportResult;
         readonly XmlMaps: XmlMaps;
         readonly XmlNamespaces: XmlNamespaces;
     }
@@ -8637,25 +9332,16 @@ declare namespace Excel {
         readonly Type: XlConnectionType;
     }
 
-    class Workbooks {
-        private 'Excel.Workbooks_typekey': Workbooks;
-        private constructor();
-
-        /** @param Excel.XlTextQualifier [TextQualifier=1] */
-        __OpenText(
-            Filename: string, Origin: any, StartRow: any, DataType: any, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: any, Tab?: any, Semicolon?: any,
-            Comma?: any, Space?: any, Other?: any, OtherChar?: any, FieldInfo?: any, TextVisualLayout?: any): void;
+    interface Workbooks {
+        /** @param TextQualifier [TextQualifier=1] */
+        __OpenText(Filename: string, Origin: any, StartRow: any, DataType: any, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: any, Tab?: any, Semicolon?: any, Comma?: any, Space?: any, Other?: any, OtherChar?: any, FieldInfo?: any, TextVisualLayout?: any): void;
         _Default(Index: any): Workbook;
-        _Open(
-            Filename: string, UpdateLinks?: any, ReadOnly?: any, Format?: any, Password?: any, WriteResPassword?: any, IgnoreReadOnlyRecommended?: any, Origin?: any,
-            Delimiter?: any, Editable?: any, Notify?: any, Converter?: any, AddToMru?: any): Workbook;
+        _Open(Filename: string, UpdateLinks?: any, ReadOnly?: any, Format?: any, Password?: any, WriteResPassword?: any, IgnoreReadOnlyRecommended?: any, Origin?: any, Delimiter?: any, Editable?: any, Notify?: any, Converter?: any, AddToMru?: any): Workbook;
 
-        /** @param Excel.XlTextQualifier [TextQualifier=1] */
-        _OpenText(
-            Filename: string, Origin: any, StartRow: any, DataType: any, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: any, Tab?: any, Semicolon?: any,
-            Comma?: any, Space?: any, Other?: any, OtherChar?: any, FieldInfo?: any, TextVisualLayout?: any, DecimalSeparator?: any, ThousandsSeparator?: any): void;
+        /** @param TextQualifier [TextQualifier=1] */
+        _OpenText(Filename: string, Origin: any, StartRow: any, DataType: any, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: any, Tab?: any, Semicolon?: any, Comma?: any, Space?: any, Other?: any, OtherChar?: any, FieldInfo?: any, TextVisualLayout?: any, DecimalSeparator?: any, ThousandsSeparator?: any): void;
         _OpenXML(Filename: string, Stylesheets?: any): Workbook;
-        Add(Template?: any): Workbook;
+        Add(Template?: string | XlWBATemplate): Workbook;
         readonly Application: Application;
         CanCheckOut(Filename: string): boolean;
         CheckOut(Filename: string): void;
@@ -8663,18 +9349,21 @@ declare namespace Excel {
         readonly Count: number;
         readonly Creator: XlCreator;
         Item(Index: number | string): Workbook;
-        Open(
-            Filename: string, UpdateLinks?: any, ReadOnly?: any, Format?: any, Password?: any, WriteResPassword?: any, IgnoreReadOnlyRecommended?: any, Origin?: any,
-            Delimiter?: any, Editable?: any, Notify?: any, Converter?: any, AddToMru?: any, Local?: any, CorruptLoad?: any): Workbook;
-        OpenDatabase(Filename: string, CommandText?: any, CommandType?: any, BackgroundQuery?: any, ImportDataAs?: any): Workbook;
+        Open(Filename: string, UpdateLinks?: 0 | 3, ReadOnly?: boolean, Format?: 1 | 2 | 3 | 4 | 5, Password?: string, WriteResPassword?: string, IgnoreReadOnlyRecommended?: boolean, Origin?: XlPlatform, Delimiter?: undefined, Editable?: boolean, Notify?: boolean, Converter?: number, AddToMru?: boolean, Local?: boolean, CorruptLoad?: XlCorruptLoad): Workbook;
+        Open(Filename: string, UpdateLinks?: 0 | 3, ReadOnly?: boolean, Format?: 6, Password?: string, WriteResPassword?: string, IgnoreReadOnlyRecommended?: boolean, Origin?: XlPlatform, Delimiter?: string, Editable?: boolean, Notify?: boolean, Converter?: number, AddToMru?: boolean, Local?: boolean, CorruptLoad?: XlCorruptLoad): Workbook;
+        OpenDatabase(Filename: string, CommandText?: string, CommandType?: XlCmdType, BackgroundQuery?: boolean, ImportDataAs?: XlImportDataAs): Workbook;
 
-        /** @param Excel.XlTextQualifier [TextQualifier=1] */
-        OpenText(
-            Filename: string, Origin: any, StartRow: any, DataType: any, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: any, Tab?: any, Semicolon?: any,
-            Comma?: any, Space?: any, Other?: any, OtherChar?: any, FieldInfo?: any, TextVisualLayout?: any, DecimalSeparator?: any, ThousandsSeparator?: any,
-            TrailingMinusNumbers?: any, Local?: any): void;
-        OpenXML(Filename: string, Stylesheets?: any, LoadOption?: any): Workbook;
+        /** @param TextQualifier [TextQualifier=1] */
+        OpenText(Filename: string, Origin: XlPlatform, StartRow: number, DataType: XlTextParsingType.xlDelimited, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: boolean, Tab?: boolean, Semicolon?: boolean, Comma?: boolean, Space?: boolean, Other?: true, OtherChar?: string, FieldInfo?: SafeArray, TextVisualLayout?: any, DecimalSeparator?: string, ThousandsSeparator?: string, TrailingMinusNumbers?: boolean, Local?: boolean): void;
+
+        /** @param TextQualifier [TextQualifier=1] */
+        OpenText(Filename: string, Origin: XlPlatform, StartRow: number, DataType: XlTextParsingType.xlDelimited, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: boolean, Tab?: boolean, Semicolon?: boolean, Comma?: boolean, Space?: boolean, Other?: boolean, OtherChar?: undefined, FieldInfo?: SafeArray, TextVisualLayout?: any, DecimalSeparator?: string, ThousandsSeparator?: string, TrailingMinusNumbers?: boolean, Local?: boolean): void;
+
+        /** @param TextQualifier [TextQualifier=1] */
+        OpenText(Filename: string, Origin: XlPlatform, StartRow: number, DataType: XlTextParsingType, TextQualifier?: XlTextQualifier, ConsecutiveDelimiter?: undefined, Tab?: undefined, Semicolon?: undefined, Comma?: undefined, Space?: undefined, Other?: undefined, OtherChar?: undefined, FieldInfo?: SafeArray, TextVisualLayout?: any, DecimalSeparator?: string, ThousandsSeparator?: string, TrailingMinusNumbers?: boolean, Local?: boolean): void;
+        OpenXML(Filename: string, Stylesheets?: string | SafeArray<string>, LoadOption?: XlXmlLoadOption): Workbook;
         readonly Parent: any;
+        (Index: number | string): Workbook;
     }
 
     class Worksheet {
@@ -8688,9 +9377,7 @@ declare namespace Excel {
         _PasteSpecial(Format?: any, Link?: any, DisplayAsIcon?: any, IconFileName?: any, IconIndex?: any, IconLabel?: any): void;
         _PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any): void;
         _Protect(Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any): void;
-        _SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any): void;
+        _SaveAs(Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any, TextVisualLayout?: any): void;
         Activate(): void;
         readonly Application: Application;
         Arcs(Index?: any): any;
@@ -8699,9 +9386,10 @@ declare namespace Excel {
         Buttons(Index?: any): any;
         Calculate(): void;
         readonly Cells: Range;
-        ChartObjects(Index?: any): any;
+        ChartObjects(Index?: SafeArray<string | number>): ChartObjects;
+        ChartObjects(Index: string | number): ChartObject;
         CheckBoxes(Index?: any): any;
-        CheckSpelling(CustomDictionary?: any, IgnoreUppercase?: any, AlwaysSuggest?: any, SpellLang?: any): void;
+        CheckSpelling(CustomDictionary?: string, IgnoreUppercase?: boolean, AlwaysSuggest?: boolean, SpellLang?: Office.MsoLanguageID): void;
         CircleInvalid(): void;
         readonly CircularReference: Range;
         ClearArrows(): void;
@@ -8710,9 +9398,10 @@ declare namespace Excel {
         readonly Columns: Range;
         readonly Comments: Comments;
         readonly ConsolidationFunction: XlConsolidationFunction;
-        readonly ConsolidationOptions: any;
-        readonly ConsolidationSources: any;
-        Copy(Before?: any, After?: any): void;
+        readonly ConsolidationOptions: SafeArray<boolean>;
+        readonly ConsolidationSources: SafeArray<string> | undefined;
+        Copy(Before?: Sheet): void;
+        Copy(Before: undefined, After: Sheet): void;
         readonly Creator: XlCreator;
         readonly CustomProperties: CustomProperties;
         Delete(): void;
@@ -8728,10 +9417,8 @@ declare namespace Excel {
         EnableOutlining: boolean;
         EnablePivotTable: boolean;
         EnableSelection: XlEnableSelection;
-        Evaluate(Name: any): any;
-        ExportAsFixedFormat(
-            Type: XlFixedFormatType, Filename?: any, Quality?: any, IncludeDocProperties?: any, IgnorePrintAreas?: any, From?: any, To?: any, OpenAfterPublish?: any,
-            FixedFormatExtClassPtr?: any): void;
+        Evaluate(Name: string): any;
+        ExportAsFixedFormat(Type: XlFixedFormatType, Filename?: string, Quality?: XlFixedFormatQuality, IncludeDocProperties?: boolean, IgnorePrintAreas?: boolean, From?: number, To?: number, OpenAfterPublish?: boolean, FixedFormatExtClassPtr?: any): void;
         readonly FilterMode: boolean;
         GroupBoxes(Index?: any): any;
         GroupObjects(Index?: any): any;
@@ -8743,11 +9430,12 @@ declare namespace Excel {
         ListBoxes(Index?: any): any;
         readonly ListObjects: ListObjects;
         readonly MailEnvelope: Office.MsoEnvelope;
-        Move(Before?: any, After?: any): void;
+        Move(Before?: Sheet, After?: Sheet): void;
         Name: string;
         readonly Names: Names;
-        readonly Next: any;
-        OLEObjects(Index?: any): any;
+        readonly Next: Worksheet;
+        OLEObjects(Index: number | string): OLEObject;
+        OLEObjects(): OLEObjects;
         OnCalculate: string;
         OnData: string;
         OnDoubleClick: string;
@@ -8759,21 +9447,18 @@ declare namespace Excel {
         Ovals(Index?: any): any;
         readonly PageSetup: PageSetup;
         readonly Parent: any;
-        Paste(Destination?: any, Link?: any): void;
-        PasteSpecial(Format?: any, Link?: any, DisplayAsIcon?: any, IconFileName?: any, IconIndex?: any, IconLabel?: any, NoHTMLFormatting?: any): void;
+        Paste(Destination?: Range, Link?: boolean): void;
+        PasteSpecial(Format: string | undefined, Link: boolean | undefined, DisplayAsIcon: true, IconFileName?: string, IconIndex?: number, IconLabel?: string, NoHTMLFormatting?: boolean): void;
+        PasteSpecial(Format?: string, Link?: boolean, DisplayAsIcon?: boolean, IconFileName?: undefined, IconIndex?: undefined, IconLabel?: undefined, NoHTMLFormatting?: boolean): void;
         Pictures(Index?: any): any;
         PivotTables(Index?: any): any;
-        PivotTableWizard(
-            SourceType?: any, SourceData?: any, TableDestination?: any, TableName?: any, RowGrand?: any, ColumnGrand?: any, SaveData?: any, HasAutoFormat?: any,
-            AutoPage?: any, Reserved?: any, BackgroundQuery?: any, OptimizeCache?: any, PageFieldOrder?: any, PageFieldWrapCount?: any, ReadData?: any, Connection?: any): PivotTable;
-        readonly Previous: any;
+        PivotTableWizard(): void;
+        PivotTableWizard<TSourceType>(SourceType: TSourceType, SourceData: PivotTableWizardSourceData<TSourceType>, TableDestination?: Range, TableName?: string, RowGrand?: boolean, ColumnGrand?: boolean, SaveData?: boolean, HasAutoFormat?: boolean, AutoPage?: PivotTableWizardAutoPage<TSourceType>, Reserved?: undefined, BackgroundQuery?: boolean, OptimizeCache?: boolean, PageFieldOrder?: XlOrder, PageFieldWrapCount?: number, ReadData?: boolean, Connection?: string): void;
+        readonly Previous: Worksheet;
         readonly PrintedCommentPages: number;
-        PrintOut(From?: any, To?: any, Copies?: any, Preview?: any, ActivePrinter?: any, PrintToFile?: any, Collate?: any, PrToFileName?: any, IgnorePrintAreas?: any): void;
-        PrintPreview(EnableChanges?: any): void;
-        Protect(
-            Password?: any, DrawingObjects?: any, Contents?: any, Scenarios?: any, UserInterfaceOnly?: any, AllowFormattingCells?: any, AllowFormattingColumns?: any,
-            AllowFormattingRows?: any, AllowInsertingColumns?: any, AllowInsertingRows?: any, AllowInsertingHyperlinks?: any, AllowDeletingColumns?: any,
-            AllowDeletingRows?: any, AllowSorting?: any, AllowFiltering?: any, AllowUsingPivotTables?: any): void;
+        PrintOut<T extends boolean | undefined>(From?: number, To?: number, Copies?: number, Preview?: boolean, ActivePrinter?: string, PrintToFile?: T, Collate?: boolean, PrToFileName?: PrintToFileName<T>, IgnorePrintAreas?: boolean): void;
+        PrintPreview(EnableChanges?: boolean): void;
+        Protect(Password?: string, DrawingObjects?: boolean, Contents?: boolean, Scenarios?: boolean, UserInterfaceOnly?: boolean, AllowFormattingCells?: boolean, AllowFormattingColumns?: boolean, AllowFormattingRows?: boolean, AllowInsertingColumns?: boolean, AllowInsertingRows?: boolean, AllowInsertingHyperlinks?: boolean, AllowDeletingColumns?: boolean, AllowDeletingRows?: boolean, AllowSorting?: boolean, AllowFiltering?: boolean, AllowUsingPivotTables?: boolean): void;
         readonly ProtectContents: boolean;
         readonly ProtectDrawingObjects: boolean;
         readonly Protection: Protection;
@@ -8784,14 +9469,13 @@ declare namespace Excel {
         Rectangles(Index?: any): any;
         ResetAllPageBreaks(): void;
         readonly Rows: Range;
-        SaveAs(
-            Filename: string, FileFormat?: any, Password?: any, WriteResPassword?: any, ReadOnlyRecommended?: any, CreateBackup?: any, AddToMru?: any, TextCodepage?: any,
-            TextVisualLayout?: any, Local?: any): void;
-        Scenarios(Index?: any): any;
+        SaveAs(Filename: string, FileFormat?: XlFileFormat, Password?: string, WriteResPassword?: string, ReadOnlyRecommended?: boolean, CreateBackup?: boolean, AddToMru?: boolean, TextCodepage?: any, TextVisualLayout?: any, Local?: boolean): void;
+        Scenarios(Index: number | string): Scenario;
+        Scenarios(Index?: SafeArray<number | string>): Scenarios;
         readonly Scripts: Office.Scripts;
         ScrollArea: string;
         ScrollBars(Index?: any): any;
-        Select(Replace?: any): void;
+        Select(Replace?: boolean): void;
         SetBackgroundPicture(Filename: string): void;
         readonly Shapes: Shapes;
         ShowAllData(): void;
@@ -8806,54 +9490,36 @@ declare namespace Excel {
         TransitionExpEval: boolean;
         TransitionFormEntry: boolean;
         readonly Type: XlSheetType;
-        Unprotect(Password?: any): void;
+        Unprotect(Password?: string): void;
         readonly UsedRange: Range;
         Visible: XlSheetVisibility;
         readonly VPageBreaks: VPageBreaks;
-        XmlDataQuery(XPath: string, SelectionNamespaces?: any, Map?: any): Range;
-        XmlMapQuery(XPath: string, SelectionNamespaces?: any, Map?: any): Range;
+        XmlDataQuery(XPath: string, SelectionNamespaces?: string, Map?: XmlMap): Range | null;
+        XmlMapQuery(XPath: string, SelectionNamespaces?: string, Map?: XmlMap): Range;
     }
 
     class WorksheetFunction {
         private 'Excel.WorksheetFunction_typekey': WorksheetFunction;
         private constructor();
-        _WSFunction(
-            Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        _WSFunction(Arg1?: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         AccrInt(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6: any, Arg7?: any): number;
         AccrIntM(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5?: any): number;
         Acos(Arg1: number): number;
         Acosh(Arg1: number): number;
-        Aggregate(
-            Arg1: number, Arg2: number, Arg3: Range, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Aggregate(Arg1: number, Arg2: number, Arg3: Range, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         AmorDegrc(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6: any, Arg7?: any): number;
         AmorLinc(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6: any, Arg7?: any): number;
-        And(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): boolean;
+        And(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): boolean;
         readonly Application: Application;
         Asc(Arg1: string): string;
         Asin(Arg1: number): number;
         Asinh(Arg1: number): number;
         Atan2(Arg1: number, Arg2: number): number;
         Atanh(Arg1: number): number;
-        AveDev(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        Average(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        AveDev(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Average(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         AverageIf(Arg1: Range, Arg2: any, Arg3?: any): number;
-        AverageIfs(
-            Arg1: Range, Arg2: Range, Arg3: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any): number;
+        AverageIfs(Arg1: Range, Arg2: Range, Arg3: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any): number;
         BahtText(Arg1: number): string;
         BesselI(Arg1: any, Arg2: any): number;
         BesselJ(Arg1: any, Arg2: any): number;
@@ -8879,10 +9545,7 @@ declare namespace Excel {
         ChiSq_Inv_RT(Arg1: number, Arg2: number): number;
         ChiSq_Test(Arg1: any, Arg2: any): number;
         ChiTest(Arg1: any, Arg2: any): number;
-        Choose(
-            Arg1: any, Arg2: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Choose(Arg1: any, Arg2: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         Clean(Arg1: string): string;
         Combin(Arg1: number, Arg2: number): number;
         Complex(Arg1: any, Arg2: any, Arg3?: any): string;
@@ -8892,20 +9555,11 @@ declare namespace Excel {
         Convert(Arg1: any, Arg2: any, Arg3: any): number;
         Correl(Arg1: any, Arg2: any): number;
         Cosh(Arg1: number): number;
-        Count(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        CountA(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Count(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        CountA(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         CountBlank(Arg1: Range): number;
         CountIf(Arg1: Range, Arg2: string | number): number;
-        CountIfs(
-            Arg1: Range, Arg2: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        CountIfs(Arg1: Range, Arg2: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         CoupDayBs(Arg1: any, Arg2: any, Arg3: any, Arg4?: any): number;
         CoupDays(Arg1: any, Arg2: any, Arg3: any, Arg4?: any): number;
         CoupDaysNc(Arg1: any, Arg2: any, Arg3: any, Arg4?: any): number;
@@ -8931,10 +9585,7 @@ declare namespace Excel {
         Dec2Oct(Arg1: any, Arg2?: any): string;
         Degrees(Arg1: number): number;
         Delta(Arg1: any, Arg2?: any): number;
-        DevSq(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        DevSq(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         DGet(Arg1: Range, Arg2: any, Arg3: any): any;
         Disc(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5?: any): number;
         DMax(Arg1: Range, Arg2: any, Arg3: any): number;
@@ -8946,10 +9597,7 @@ declare namespace Excel {
         DStDev(Arg1: Range, Arg2: any, Arg3: any): number;
         DStDevP(Arg1: Range, Arg2: any, Arg3: any): number;
         DSum(Arg1: Range, Arg2: any, Arg3: any): number;
-        Dummy19(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Dummy19(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
         Dummy21(Arg1: number, Arg2: number): number;
         Duration(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6?: any): number;
         DVar(Arg1: Range, Arg2: any, Arg3: any): number;
@@ -8991,20 +9639,11 @@ declare namespace Excel {
         GammaInv(Arg1: number, Arg2: number, Arg3: number): number;
         GammaLn(Arg1: number): number;
         GammaLn_Precise(Arg1: number): number;
-        Gcd(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        GeoMean(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Gcd(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        GeoMean(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         GeStep(Arg1: any, Arg2?: any): number;
         Growth(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any): any;
-        HarMean(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        HarMean(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         Hex2Bin(Arg1: any, Arg2?: any): string;
         Hex2Dec(Arg1: any): string;
         Hex2Oct(Arg1: any, Arg2?: any): string;
@@ -9023,18 +9662,12 @@ declare namespace Excel {
         ImLog10(Arg1: any): string;
         ImLog2(Arg1: any): string;
         ImPower(Arg1: any, Arg2: any): string;
-        ImProduct(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): string;
+        ImProduct(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): string;
         ImReal(Arg1: any): number;
         ImSin(Arg1: any): string;
         ImSqrt(Arg1: any): string;
         ImSub(Arg1: any, Arg2: any): string;
-        ImSum(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): string;
+        ImSum(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): string;
         Index(Arg1: any, Arg2: number, Arg3?: any, Arg4?: any): any;
         Intercept(Arg1: any, Arg2: any): number;
         IntRate(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5?: any): number;
@@ -9052,15 +9685,9 @@ declare namespace Excel {
         Ispmt(Arg1: number, Arg2: number, Arg3: number, Arg4: number): number;
         IsText(Arg1: any): boolean;
         IsThaiDigit(Arg1: string): boolean;
-        Kurt(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Kurt(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         Large(Arg1: any, Arg2: number): number;
-        Lcm(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Lcm(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         LinEst(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any): any;
         Ln(Arg1: number): number;
         Log(Arg1: number, Arg2?: any): number;
@@ -9072,40 +9699,19 @@ declare namespace Excel {
         LogNormDist(Arg1: number, Arg2: number, Arg3: number): number;
         Lookup(Arg1: any, Arg2: any, Arg3?: any): any;
         Match(Arg1: any, Arg2: any, Arg3?: any): number;
-        Max(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Max(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         MDeterm(Arg1: any): number;
         MDuration(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6?: any): number;
-        Median(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        Min(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Median(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Min(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         MInverse(Arg1: any): any;
         MIrr(Arg1: any, Arg2: number, Arg3: number): number;
         MMult(Arg1: any, Arg2: any): any;
-        Mode(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        Mode_Mult(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
-        Mode_Sngl(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Mode(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Mode_Mult(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): any;
+        Mode_Sngl(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         MRound(Arg1: any, Arg2: any): number;
-        MultiNomial(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        MultiNomial(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         NegBinom_Dist(Arg1: number, Arg2: number, Arg3: number, Arg4: boolean): number;
         NegBinomDist(Arg1: number, Arg2: number, Arg3: number): number;
         NetworkDays(Arg1: any, Arg2: any, Arg3?: any): number;
@@ -9120,10 +9726,7 @@ declare namespace Excel {
         NormSDist(Arg1: number): number;
         NormSInv(Arg1: number): number;
         NPer(Arg1: number, Arg2: number, Arg3: number, Arg4?: any, Arg5?: any): number;
-        Npv(
-            Arg1: number, Arg2: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Npv(Arg1: number, Arg2: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         Oct2Bin(Arg1: any, Arg2?: any): string;
         Oct2Dec(Arg1: any): string;
         Oct2Hex(Arg1: any, Arg2?: any): string;
@@ -9132,10 +9735,7 @@ declare namespace Excel {
         OddFYield(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6: any, Arg7: any, Arg8: any, Arg9?: any): number;
         OddLPrice(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6: any, Arg7: any, Arg8?: any): number;
         OddLYield(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6: any, Arg7: any, Arg8?: any): number;
-        Or(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): boolean;
+        Or(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): boolean;
         readonly Parent: any;
         Pearson(Arg1: any, Arg2: any): number;
         Percentile(Arg1: any, Arg2: number): number;
@@ -9156,10 +9756,7 @@ declare namespace Excel {
         PriceDisc(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5?: any): number;
         PriceMat(Arg1: any, Arg2: any, Arg3: any, Arg4: any, Arg5: any, Arg6?: any): number;
         Prob(Arg1: any, Arg2: any, Arg3: number, Arg4?: any): number;
-        Product(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Product(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         Proper(Arg1: string): string;
         Pv(Arg1: number, Arg2: number, Arg3: number, Arg4?: any, Arg5?: any): number;
         Quartile(Arg1: any, Arg2: number): number;
@@ -9183,62 +9780,29 @@ declare namespace Excel {
         RoundDown(Arg1: number, Arg2: number): number;
         RoundUp(Arg1: number, Arg2: number): number;
         RSq(Arg1: any, Arg2: any): number;
-        RTD(
-            progID: any, server: any, topic1: any, topic2?: any, topic3?: any, topic4?: any, topic5?: any, topic6?: any, topic7?: any, topic8?: any, topic9?: any,
-            topic10?: any, topic11?: any, topic12?: any, topic13?: any, topic14?: any, topic15?: any, topic16?: any, topic17?: any, topic18?: any, topic19?: any,
-            topic20?: any, topic21?: any, topic22?: any, topic23?: any, topic24?: any, topic25?: any, topic26?: any, topic27?: any, topic28?: any): any;
+        RTD(progID: any, server: any, topic1: any, topic2?: any, topic3?: any, topic4?: any, topic5?: any, topic6?: any, topic7?: any, topic8?: any, topic9?: any, topic10?: any, topic11?: any, topic12?: any, topic13?: any, topic14?: any, topic15?: any, topic16?: any, topic17?: any, topic18?: any, topic19?: any, topic20?: any, topic21?: any, topic22?: any, topic23?: any, topic24?: any, topic25?: any, topic26?: any, topic27?: any, topic28?: any): any;
         Search(Arg1: string, Arg2: string, Arg3?: any): number;
         SearchB(Arg1: string, Arg2: string, Arg3?: any): number;
         SeriesSum(Arg1: any, Arg2: any, Arg3: any, Arg4: any): number;
         Sinh(Arg1: number): number;
-        Skew(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Skew(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         Sln(Arg1: number, Arg2: number, Arg3: number): number;
         Slope(Arg1: any, Arg2: any): number;
         Small(Arg1: any, Arg2: number): number;
         SqrtPi(Arg1: any): number;
         Standardize(Arg1: number, Arg2: number, Arg3: number): number;
-        StDev(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        StDev_P(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        StDev_S(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        StDevP(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        StDev(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        StDev_P(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        StDev_S(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        StDevP(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         StEyx(Arg1: any, Arg2: any): number;
         Substitute(Arg1: string, Arg2: string, Arg3: string, Arg4?: any): string;
-        Subtotal(
-            Arg1: number, Arg2: Range, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        Sum(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Subtotal(Arg1: number, Arg2: Range, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Sum(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         SumIf(Arg1: Range, Arg2: any, Arg3?: any): number;
-        SumIfs(
-            Arg1: Range, Arg2: Range, Arg3: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any,
-            Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any,
-            Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any): number;
-        SumProduct(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        SumSq(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        SumIfs(Arg1: Range, Arg2: Range, Arg3: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any): number;
+        SumProduct(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        SumSq(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         SumX2MY2(Arg1: any, Arg2: any): number;
         SumX2PY2(Arg1: any, Arg2: any): number;
         SumXMY2(Arg1: any, Arg2: any): number;
@@ -9269,22 +9833,10 @@ declare namespace Excel {
         TrimMean(Arg1: any, Arg2: number): number;
         TTest(Arg1: any, Arg2: any, Arg3: number, Arg4: number): number;
         USDollar(Arg1: number, Arg2: number): string;
-        Var(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        Var_P(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        Var_S(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
-        VarP(
-            Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any,
-            Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any,
-            Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Var(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Var_P(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        Var_S(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
+        VarP(Arg1: any, Arg2?: any, Arg3?: any, Arg4?: any, Arg5?: any, Arg6?: any, Arg7?: any, Arg8?: any, Arg9?: any, Arg10?: any, Arg11?: any, Arg12?: any, Arg13?: any, Arg14?: any, Arg15?: any, Arg16?: any, Arg17?: any, Arg18?: any, Arg19?: any, Arg20?: any, Arg21?: any, Arg22?: any, Arg23?: any, Arg24?: any, Arg25?: any, Arg26?: any, Arg27?: any, Arg28?: any, Arg29?: any, Arg30?: any): number;
         Vdb(Arg1: number, Arg2: number, Arg3: number, Arg4: number, Arg5: number, Arg6?: any, Arg7?: any): number;
         VLookup(Arg1: any, Arg2: any, Arg3: any, Arg4?: any): any;
         Weekday(Arg1: any, Arg2?: any): number;
@@ -9302,6 +9854,20 @@ declare namespace Excel {
         ZTest(Arg1: any, Arg2: number, Arg3?: any): number;
     }
 
+    class WorksheetView {
+        private 'Excel.WorksheetView_typekey': WorksheetView;
+        private constructor();
+        readonly Application: Application;
+        readonly Creator: XlCreator;
+        DisplayFormulas: boolean;
+        DisplayGridlines: boolean;
+        DisplayHeadings: boolean;
+        DisplayOutline: boolean;
+        DisplayZeros: boolean;
+        readonly Parent: any;
+        readonly Sheet: Worksheet;
+    }
+
     class XmlDataBinding {
         private 'Excel.XmlDataBinding_typekey': XmlDataBinding;
         private constructor();
@@ -9325,10 +9891,10 @@ declare namespace Excel {
         readonly Creator: XlCreator;
         readonly DataBinding: XmlDataBinding;
         Delete(): void;
-        Export(Url: string, Overwrite?: any): XlXmlExportResult;
+        Export(Url: string, Overwrite?: boolean): XlXmlExportResult;
         ExportXml(Data: string): XlXmlExportResult;
-        Import(Url: string, Overwrite?: any): XlXmlImportResult;
-        ImportXml(XmlData: string, Overwrite?: any): XlXmlImportResult;
+        Import(Url: string, Overwrite?: boolean): XlXmlImportResult;
+        ImportXml(XmlData: string, Overwrite?: boolean): XlXmlImportResult;
         readonly IsExportable: boolean;
         Name: string;
         readonly Parent: any;
@@ -9342,16 +9908,15 @@ declare namespace Excel {
         readonly WorkbookConnection: WorkbookConnection;
     }
 
-    class XmlMaps {
-        private 'Excel.XmlMaps_typekey': XmlMaps;
-        private constructor();
+    interface XmlMaps {
         _Default(Index: any): XmlMap;
-        Add(Schema: string, RootElementName?: any): XmlMap;
+        Add(Schema: string, RootElementName?: string): XmlMap;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): XmlMap;
+        Item(Index: number | string): XmlMap;
         readonly Parent: any;
+        (Index: number | string): XmlMap;
     }
 
     class XmlNamespace {
@@ -9365,17 +9930,16 @@ declare namespace Excel {
         readonly Uri: string;
     }
 
-    class XmlNamespaces {
-        private 'Excel.XmlNamespaces_typekey': XmlNamespaces;
-        private constructor();
+    interface XmlNamespaces {
         _Default(Index: any): XmlNamespace;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        InstallManifest(Path: string, InstallForAllUsers?: any): void;
-        Item(Index: any): XmlNamespace;
+        InstallManifest(Path: string, InstallForAllUsers?: boolean): void;
+        Item(Index: number | string): XmlNamespace;
         readonly Parent: any;
         readonly Value: string;
+        (Index: number | string): XmlNamespace;
     }
 
     class XmlSchema {
@@ -9389,15 +9953,14 @@ declare namespace Excel {
         readonly XML: string;
     }
 
-    class XmlSchemas {
-        private 'Excel.XmlSchemas_typekey': XmlSchemas;
-        private constructor();
+    interface XmlSchemas {
         _Default(Index: any): XmlSchema;
         readonly Application: Application;
         readonly Count: number;
         readonly Creator: XlCreator;
-        Item(Index: any): XmlSchema;
+        Item(Index: number | string): XmlSchema;
         readonly Parent: any;
+        (Index: number | string): XmlSchema;
     }
 
     class XPath {
@@ -9410,7 +9973,7 @@ declare namespace Excel {
         readonly Map: XmlMap;
         readonly Parent: any;
         readonly Repeating: boolean;
-        SetValue(Map: XmlMap, XPath: string, SelectionNamespace?: any, Repeating?: any): void;
+        SetValue(Map: XmlMap, XPath: string, SelectionNamespace?: any, Repeating?: boolean): void;
         readonly Value: string;
     }
 
@@ -9495,223 +10058,100 @@ declare namespace Excel {
     }
 }
 
+interface EnumeratorConstructor {
+    // we need this because there are two overloads for Item on the Sheets object
+    new <T>(sheets: Excel.Sheets<T>): Enumerator<T>;
+}
+
 interface ActiveXObject {
-    on(
-        obj: Excel.Application, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Application, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
-    on(
-        obj: Excel.Application, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Application, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Application, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (this: Excel.Application, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
+    on(obj: Excel.Application, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (this: Excel.Application, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
     on(obj: Excel.Application, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Application, parameter: { pctinfo: number }) => void): void;
-    on(
-        obj: Excel.Application, event: 'Invoke', argNames: Excel.EventHelperTypes.Application_Invoke_ArgNames, handler: (
-            this: Excel.Application, parameter: Excel.EventHelperTypes.Application_Invoke_Parameter) => void): void;
-    on(
-        obj: Excel.Application, event: 'NewWorkbook' | 'WorkbookActivate' | 'WorkbookAddinInstall' | 'WorkbookAddinUninstall' | 'WorkbookDeactivate' | 'WorkbookOpen',
-        argNames: ['Wb'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook }) => void): void;
-    on(
-        obj: Excel.Application, event: 'ProtectedViewWindowActivate' | 'ProtectedViewWindowDeactivate' | 'ProtectedViewWindowOpen' | 'ProtectedViewWindowResize',
-        argNames: ['Pvw'], handler: (this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow }) => void): void;
-    on(
-        obj: Excel.Application, event: 'ProtectedViewWindowBeforeClose', argNames: ['Pvw', 'Reason', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow, readonly Reason: Excel.XlProtectedViewCloseReason, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'ProtectedViewWindowBeforeEdit', argNames: ['Pvw', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'Invoke', argNames: Excel.EventHelperTypes.Application_Invoke_ArgNames, handler: (this: Excel.Application, parameter: Excel.EventHelperTypes.Application_Invoke_Parameter) => void): void;
+    on(obj: Excel.Application, event: 'NewWorkbook' | 'WorkbookActivate' | 'WorkbookAddinInstall' | 'WorkbookAddinUninstall' | 'WorkbookDeactivate' | 'WorkbookOpen', argNames: ['Wb'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook }) => void): void;
+    on(obj: Excel.Application, event: 'ProtectedViewWindowActivate' | 'ProtectedViewWindowDeactivate' | 'ProtectedViewWindowOpen' | 'ProtectedViewWindowResize', argNames: ['Pvw'], handler: (this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow }) => void): void;
+    on(obj: Excel.Application, event: 'ProtectedViewWindowBeforeClose', argNames: ['Pvw', 'Reason', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow, readonly Reason: Excel.XlProtectedViewCloseReason, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'ProtectedViewWindowBeforeEdit', argNames: ['Pvw', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Pvw: Excel.ProtectedViewWindow, Cancel: boolean }) => void): void;
     on(obj: Excel.Application, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Application, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
-    on(obj: Excel.Application, event: 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (this: Excel.Application, parameter: { readonly Sh: any }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetBeforeDoubleClick' | 'SheetBeforeRightClick', argNames: ['Sh', 'Target', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.Range, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetChange' | 'SheetSelectionChange', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.Range }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.Hyperlink }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetPivotTableAfterValueChange', argNames: ['Sh', 'TargetPivotTable', 'TargetRange'], handler: (
-            this: Excel.Application, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetPivotTableBeforeAllocateChanges' | 'SheetPivotTableBeforeCommitChanges',
-        argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (
-            this: Excel.Application,
-            parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'],
-        handler: (
-            this: Excel.Application, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
-    on(
-        obj: Excel.Application, event: 'SheetPivotTableUpdate', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Application, parameter: { readonly Sh: any, readonly Target: Excel.PivotTable }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WindowActivate' | 'WindowDeactivate' | 'WindowResize', argNames: ['Wb', 'Wn'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Wn: Excel.Window }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookAfterSave', argNames: ['Wb', 'Success'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Success: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookAfterXmlExport', argNames: ['Wb', 'Map', 'Url', 'Result'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookAfterXmlImport', argNames: ['Wb', 'Map', 'IsRefresh', 'Result'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookBeforeClose' | 'WorkbookBeforePrint', argNames: ['Wb', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookBeforeSave', argNames: ['Wb', 'SaveAsUI', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly SaveAsUI: boolean, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookBeforeXmlExport', argNames: ['Wb', 'Map', 'Url', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookBeforeXmlImport', argNames: ['Wb', 'Map', 'Url', 'IsRefresh', 'Cancel'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean }) => void): void;
-    on(obj: Excel.Application, event: 'WorkbookNewChart', argNames: ['Wb', 'Ch'], handler: (
-        this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Ch: Excel.Chart }) => void): void;
-    on(obj: Excel.Application, event: 'WorkbookNewSheet', argNames: ['Wb', 'Sh'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Sh: any }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookPivotTableCloseConnection' | 'WorkbookPivotTableOpenConnection', argNames: ['Wb', 'Target'],
-        handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Target: Excel.PivotTable }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookRowsetComplete', argNames: ['Wb', 'Description', 'Sheet', 'Success'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Description: string, readonly Sheet: string, readonly Success: boolean }) => void): void;
-    on(
-        obj: Excel.Application, event: 'WorkbookSync', argNames: ['Wb', 'SyncEventType'], handler: (
-            this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly SyncEventType: Office.MsoSyncEventType }) => void): void;
-    on(
-        obj: Excel.Chart, event: 'BeforeDoubleClick', argNames: ['ElementID', 'Arg1', 'Arg2', 'Cancel'], handler: (
-            this: Excel.Chart, parameter: { readonly ElementID: number, readonly Arg1: number, readonly Arg2: number, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Chart | Excel.Worksheet }) => void): void;
+    on(obj: Excel.Application, event: 'SheetBeforeDoubleClick' | 'SheetBeforeRightClick', argNames: ['Sh', 'Target', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.Range, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'SheetChange' | 'SheetSelectionChange', argNames: ['Sh', 'Target'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.Range }) => void): void;
+    on(obj: Excel.Application, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.Hyperlink }) => void): void;
+    on(obj: Excel.Application, event: 'SheetPivotTableAfterValueChange', argNames: ['Sh', 'TargetPivotTable', 'TargetRange'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Worksheet, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
+    on(obj: Excel.Application, event: 'SheetPivotTableBeforeAllocateChanges' | 'SheetPivotTableBeforeCommitChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Worksheet, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'], handler: (this: Excel.Application, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
+    on(obj: Excel.Application, event: 'SheetPivotTableUpdate', argNames: ['Sh', 'Target'], handler: (this: Excel.Application, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Application, event: 'WindowActivate' | 'WindowDeactivate' | 'WindowResize', argNames: ['Wb', 'Wn'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Wn: Excel.Window }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookAfterSave', argNames: ['Wb', 'Success'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Success: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookAfterXmlExport', argNames: ['Wb', 'Map', 'Url', 'Result'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookAfterXmlImport', argNames: ['Wb', 'Map', 'IsRefresh', 'Result'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookBeforeClose' | 'WorkbookBeforePrint', argNames: ['Wb', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookBeforeSave', argNames: ['Wb', 'SaveAsUI', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly SaveAsUI: boolean, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookBeforeXmlExport', argNames: ['Wb', 'Map', 'Url', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookBeforeXmlImport', argNames: ['Wb', 'Map', 'Url', 'IsRefresh', 'Cancel'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookNewChart', argNames: ['Wb', 'Ch'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Ch: Excel.Chart }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookNewSheet', argNames: ['Wb', 'Sh'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Sh: Excel.Worksheet }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookPivotTableCloseConnection' | 'WorkbookPivotTableOpenConnection', argNames: ['Wb', 'Target'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookRowsetComplete', argNames: ['Wb', 'Description', 'Sheet', 'Success'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly Description: string, readonly Sheet: string, readonly Success: boolean }) => void): void;
+    on(obj: Excel.Application, event: 'WorkbookSync', argNames: ['Wb', 'SyncEventType'], handler: (this: Excel.Application, parameter: { readonly Wb: Excel.Workbook, readonly SyncEventType: Office.MsoSyncEventType }) => void): void;
+    on(obj: Excel.Chart, event: 'BeforeDoubleClick', argNames: ['ElementID', 'Arg1', 'Arg2', 'Cancel'], handler: (this: Excel.Chart, parameter: { readonly ElementID: number, readonly Arg1: number, readonly Arg2: number, Cancel: boolean }) => void): void;
     on(obj: Excel.Chart, event: 'BeforeRightClick', argNames: ['Cancel'], handler: (this: Excel.Chart, parameter: { Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Chart, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Chart, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
-    on(
-        obj: Excel.Chart, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Chart, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Chart, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (this: Excel.Chart, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
+    on(obj: Excel.Chart, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (this: Excel.Chart, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
     on(obj: Excel.Chart, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Chart, parameter: { pctinfo: number }) => void): void;
     on(obj: Excel.Chart, event: 'Invoke', argNames: Excel.EventHelperTypes.Chart_Invoke_ArgNames, handler: (this: Excel.Chart, parameter: Excel.EventHelperTypes.Chart_Invoke_Parameter) => void): void;
-    on(
-        obj: Excel.Chart, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'x', 'y'], handler: (
-            this: Excel.Chart, parameter: { readonly Button: number, readonly Shift: number, readonly x: number, readonly y: number }) => void): void;
+    on(obj: Excel.Chart, event: 'MouseDown' | 'MouseMove' | 'MouseUp', argNames: ['Button', 'Shift', 'x', 'y'], handler: (this: Excel.Chart, parameter: { readonly Button: number, readonly Shift: number, readonly x: number, readonly y: number }) => void): void;
     on(obj: Excel.Chart, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Chart, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
-    on(
-        obj: Excel.Chart, event: 'Select', argNames: ['ElementID', 'Arg1', 'Arg2'], handler: (
-            this: Excel.Chart, parameter: { readonly ElementID: number, readonly Arg1: number, readonly Arg2: number }) => void): void;
-    on(
-        obj: Excel.Chart, event: 'SeriesChange', argNames: ['SeriesIndex', 'PointIndex'], handler: (
-            this: Excel.Chart, parameter: { readonly SeriesIndex: number, readonly PointIndex: number }) => void): void;
-    on(
-        obj: Excel.OLEObject, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.OLEObject, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
-    on(
-        obj: Excel.OLEObject, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.OLEObject, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Chart, event: 'Select', argNames: ['ElementID', 'Arg1', 'Arg2'], handler: (this: Excel.Chart, parameter: { readonly ElementID: number, readonly Arg1: number, readonly Arg2: number }) => void): void;
+    on(obj: Excel.Chart, event: 'SeriesChange', argNames: ['SeriesIndex', 'PointIndex'], handler: (this: Excel.Chart, parameter: { readonly SeriesIndex: number, readonly PointIndex: number }) => void): void;
+    on(obj: Excel.OLEObject, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (this: Excel.OLEObject, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
+    on(obj: Excel.OLEObject, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (this: Excel.OLEObject, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
     on(obj: Excel.OLEObject, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.OLEObject, parameter: { pctinfo: number }) => void): void;
-    on(
-        obj: Excel.OLEObject, event: 'Invoke', argNames: Excel.EventHelperTypes.OLEObject_Invoke_ArgNames, handler: (
-            this: Excel.OLEObject, parameter: Excel.EventHelperTypes.OLEObject_Invoke_Parameter) => void): void;
+    on(obj: Excel.OLEObject, event: 'Invoke', argNames: Excel.EventHelperTypes.OLEObject_Invoke_ArgNames, handler: (this: Excel.OLEObject, parameter: Excel.EventHelperTypes.OLEObject_Invoke_Parameter) => void): void;
     on(obj: Excel.OLEObject, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.OLEObject, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
     on(obj: Excel.QueryTable, event: 'AfterRefresh', argNames: ['Success'], handler: (this: Excel.QueryTable, parameter: { readonly Success: boolean }) => void): void;
     on(obj: Excel.QueryTable, event: 'BeforeRefresh', argNames: ['Cancel'], handler: (this: Excel.QueryTable, parameter: { Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.QueryTable, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.QueryTable, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
-    on(
-        obj: Excel.QueryTable, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.QueryTable, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.QueryTable, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (this: Excel.QueryTable, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
+    on(obj: Excel.QueryTable, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (this: Excel.QueryTable, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
     on(obj: Excel.QueryTable, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.QueryTable, parameter: { pctinfo: number }) => void): void;
-    on(
-        obj: Excel.QueryTable, event: 'Invoke', argNames: Excel.EventHelperTypes.QueryTable_Invoke_ArgNames, handler: (
-            this: Excel.QueryTable, parameter: Excel.EventHelperTypes.QueryTable_Invoke_Parameter) => void): void;
+    on(obj: Excel.QueryTable, event: 'Invoke', argNames: Excel.EventHelperTypes.QueryTable_Invoke_ArgNames, handler: (this: Excel.QueryTable, parameter: Excel.EventHelperTypes.QueryTable_Invoke_Parameter) => void): void;
     on(obj: Excel.QueryTable, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.QueryTable, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
     on(obj: Excel.Workbook, event: 'AfterSave', argNames: ['Success'], handler: (this: Excel.Workbook, parameter: { readonly Success: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'AfterXmlExport', argNames: ['Map', 'Url', 'Result'], handler: (
-            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'AfterXmlImport', argNames: ['Map', 'IsRefresh', 'Result'], handler: (
-            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult }) => void): void;
+    on(obj: Excel.Workbook, event: 'AfterXmlExport', argNames: ['Map', 'Url', 'Result'], handler: (this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, readonly Result: Excel.XlXmlExportResult }) => void): void;
+    on(obj: Excel.Workbook, event: 'AfterXmlImport', argNames: ['Map', 'IsRefresh', 'Result'], handler: (this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly IsRefresh: boolean, readonly Result: Excel.XlXmlImportResult }) => void): void;
     on(obj: Excel.Workbook, event: 'BeforeClose' | 'BeforePrint', argNames: ['Cancel'], handler: (this: Excel.Workbook, parameter: { Cancel: boolean }) => void): void;
     on(obj: Excel.Workbook, event: 'BeforeSave', argNames: ['SaveAsUI', 'Cancel'], handler: (this: Excel.Workbook, parameter: { readonly SaveAsUI: boolean, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'BeforeXmlExport', argNames: ['Map', 'Url', 'Cancel'], handler: (
-            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'BeforeXmlImport', argNames: ['Map', 'Url', 'IsRefresh', 'Cancel'], handler: (
-            this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Workbook, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Workbook, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Workbook, event: 'BeforeXmlExport', argNames: ['Map', 'Url', 'Cancel'], handler: (this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, Cancel: boolean }) => void): void;
+    on(obj: Excel.Workbook, event: 'BeforeXmlImport', argNames: ['Map', 'Url', 'IsRefresh', 'Cancel'], handler: (this: Excel.Workbook, parameter: { readonly Map: Excel.XmlMap, readonly Url: string, readonly IsRefresh: boolean, Cancel: boolean }) => void): void;
+    on(obj: Excel.Workbook, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (this: Excel.Workbook, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
+    on(obj: Excel.Workbook, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (this: Excel.Workbook, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
     on(obj: Excel.Workbook, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Workbook, parameter: { pctinfo: number }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'Invoke', argNames: Excel.EventHelperTypes.Workbook_Invoke_ArgNames, handler: (
-            this: Excel.Workbook, parameter: Excel.EventHelperTypes.Workbook_Invoke_Parameter) => void): void;
+    on(obj: Excel.Workbook, event: 'Invoke', argNames: Excel.EventHelperTypes.Workbook_Invoke_ArgNames, handler: (this: Excel.Workbook, parameter: Excel.EventHelperTypes.Workbook_Invoke_Parameter) => void): void;
     on(obj: Excel.Workbook, event: 'NewChart', argNames: ['Ch'], handler: (this: Excel.Workbook, parameter: { readonly Ch: Excel.Chart }) => void): void;
-    on(obj: Excel.Workbook, event: 'NewSheet' | 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (
-        this: Excel.Workbook, parameter: { readonly Sh: any }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'PivotTableCloseConnection' | 'PivotTableOpenConnection', argNames: ['Target'], handler: (
-            this: Excel.Workbook, parameter: { readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Workbook, event: 'NewSheet' | 'SheetActivate' | 'SheetCalculate' | 'SheetDeactivate', argNames: ['Sh'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Chart | Excel.Worksheet }) => void): void;
+    on(obj: Excel.Workbook, event: 'PivotTableCloseConnection' | 'PivotTableOpenConnection', argNames: ['Target'], handler: (this: Excel.Workbook, parameter: { readonly Target: Excel.PivotTable }) => void): void;
     on(obj: Excel.Workbook, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Workbook, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'RowsetComplete', argNames: ['Description', 'Sheet', 'Success'], handler: (
-            this: Excel.Workbook, parameter: { readonly Description: string, readonly Sheet: string, readonly Success: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'SheetBeforeDoubleClick' | 'SheetBeforeRightClick', argNames: ['Sh', 'Target', 'Cancel'], handler: (
-            this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.Range, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'SheetChange' | 'SheetSelectionChange', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.Range }) => void): void;
-    on(obj: Excel.Workbook, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (
-        this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.Hyperlink }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'SheetPivotTableAfterValueChange', argNames: ['Sh', 'TargetPivotTable', 'TargetRange'], handler: (
-            this: Excel.Workbook, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'SheetPivotTableBeforeAllocateChanges' | 'SheetPivotTableBeforeCommitChanges',
-        argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (
-            this: Excel.Workbook,
-            parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'], handler: (
-            this: Excel.Workbook, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
-    on(
-        obj: Excel.Workbook, event: 'SheetPivotTableChangeSync' | 'SheetPivotTableUpdate', argNames: ['Sh', 'Target'], handler: (
-            this: Excel.Workbook, parameter: { readonly Sh: any, readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Workbook, event: 'RowsetComplete', argNames: ['Description', 'Sheet', 'Success'], handler: (this: Excel.Workbook, parameter: { readonly Description: string, readonly Sheet: string, readonly Success: boolean }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetBeforeDoubleClick' | 'SheetBeforeRightClick', argNames: ['Sh', 'Target', 'Cancel'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.Range, Cancel: boolean }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetChange' | 'SheetSelectionChange', argNames: ['Sh', 'Target'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.Range }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetFollowHyperlink', argNames: ['Sh', 'Target'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.Hyperlink }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetPivotTableAfterValueChange', argNames: ['Sh', 'TargetPivotTable', 'TargetRange'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Worksheet, readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetPivotTableBeforeAllocateChanges' | 'SheetPivotTableBeforeCommitChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Worksheet, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetPivotTableBeforeDiscardChanges', argNames: ['Sh', 'TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'], handler: (this: Excel.Workbook, parameter: { readonly Sh: any, readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
+    on(obj: Excel.Workbook, event: 'SheetPivotTableChangeSync' | 'SheetPivotTableUpdate', argNames: ['Sh', 'Target'], handler: (this: Excel.Workbook, parameter: { readonly Sh: Excel.Worksheet, readonly Target: Excel.PivotTable }) => void): void;
     on(obj: Excel.Workbook, event: 'Sync', argNames: ['SyncEventType'], handler: (this: Excel.Workbook, parameter: { readonly SyncEventType: Office.MsoSyncEventType }) => void): void;
     on(obj: Excel.Workbook, event: 'WindowActivate' | 'WindowDeactivate' | 'WindowResize', argNames: ['Wn'], handler: (this: Excel.Workbook, parameter: { readonly Wn: Excel.Window }) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'BeforeDoubleClick' | 'BeforeRightClick', argNames: ['Target', 'Cancel'], handler: (
-            this: Excel.Worksheet, parameter: { readonly Target: Excel.Range, Cancel: boolean }) => void): void;
+    on(obj: Excel.Worksheet, event: 'BeforeDoubleClick' | 'BeforeRightClick', argNames: ['Target', 'Cancel'], handler: (this: Excel.Worksheet, parameter: { readonly Target: Excel.Range, Cancel: boolean }) => void): void;
     on(obj: Excel.Worksheet, event: 'Change' | 'SelectionChange', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: { readonly Target: Excel.Range }) => void): void;
     on(obj: Excel.Worksheet, event: 'FollowHyperlink', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: { readonly Target: Excel.Hyperlink }) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (
-            this: Excel.Worksheet, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (
-            this: Excel.Worksheet, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
+    on(obj: Excel.Worksheet, event: 'GetIDsOfNames', argNames: ['riid', 'rgszNames', 'cNames', 'lcid', 'rgdispid'], handler: (this: Excel.Worksheet, parameter: { readonly riid: stdole.GUID, readonly rgszNames: number, readonly cNames: number, readonly lcid: number, rgdispid: number }) => void): void;
+    on(obj: Excel.Worksheet, event: 'GetTypeInfo', argNames: ['itinfo', 'lcid', 'pptinfo'], handler: (this: Excel.Worksheet, parameter: { readonly itinfo: number, readonly lcid: number, pptinfo: undefined }) => void): void;
     on(obj: Excel.Worksheet, event: 'GetTypeInfoCount', argNames: ['pctinfo'], handler: (this: Excel.Worksheet, parameter: { pctinfo: number }) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'Invoke', argNames: Excel.EventHelperTypes.Worksheet_Invoke_ArgNames, handler: (
-            this: Excel.Worksheet, parameter: Excel.EventHelperTypes.Worksheet_Invoke_Parameter) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'PivotTableAfterValueChange', argNames: ['TargetPivotTable', 'TargetRange'], handler: (
-            this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'PivotTableBeforeAllocateChanges' | 'PivotTableBeforeCommitChanges',
-        argNames: ['TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (
-            this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
-    on(
-        obj: Excel.Worksheet, event: 'PivotTableBeforeDiscardChanges', argNames: ['TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'],
-        handler: (this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
-    on(obj: Excel.Worksheet, event: 'PivotTableChangeSync' | 'PivotTableUpdate', argNames: ['Target'], handler: (
-        this: Excel.Worksheet, parameter: { readonly Target: Excel.PivotTable }) => void): void;
+    on(obj: Excel.Worksheet, event: 'Invoke', argNames: Excel.EventHelperTypes.Worksheet_Invoke_ArgNames, handler: (this: Excel.Worksheet, parameter: Excel.EventHelperTypes.Worksheet_Invoke_Parameter) => void): void;
+    on(obj: Excel.Worksheet, event: 'PivotTableAfterValueChange', argNames: ['TargetPivotTable', 'TargetRange'], handler: (this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly TargetRange: Excel.Range }) => void): void;
+    on(obj: Excel.Worksheet, event: 'PivotTableBeforeAllocateChanges' | 'PivotTableBeforeCommitChanges', argNames: ['TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd', 'Cancel'], handler: (this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number, Cancel: boolean }) => void): void;
+    on(obj: Excel.Worksheet, event: 'PivotTableBeforeDiscardChanges', argNames: ['TargetPivotTable', 'ValueChangeStart', 'ValueChangeEnd'], handler: (this: Excel.Worksheet, parameter: { readonly TargetPivotTable: Excel.PivotTable, readonly ValueChangeStart: number, readonly ValueChangeEnd: number }) => void): void;
+    on(obj: Excel.Worksheet, event: 'PivotTableChangeSync' | 'PivotTableUpdate', argNames: ['Target'], handler: (this: Excel.Worksheet, parameter: { readonly Target: Excel.PivotTable }) => void): void;
     on(obj: Excel.Worksheet, event: 'QueryInterface', argNames: ['riid', 'ppvObj'], handler: (this: Excel.Worksheet, parameter: { readonly riid: stdole.GUID, ppvObj: undefined }) => void): void;
     on(obj: Excel.Application, event: 'AddRef' | 'AfterCalculate' | 'Release', handler: (this: Excel.Application, parameter: {}) => void): void;
     on(obj: Excel.Chart, event: 'Activate' | 'AddRef' | 'Calculate' | 'Deactivate' | 'DragOver' | 'DragPlot' | 'Release' | 'Resize', handler: (this: Excel.Chart, parameter: {}) => void): void;
@@ -9719,10 +10159,13 @@ interface ActiveXObject {
     on(obj: Excel.QueryTable, event: 'AddRef' | 'Release', handler: (this: Excel.QueryTable, parameter: {}) => void): void;
     on(obj: Excel.Workbook, event: 'Activate' | 'AddinInstall' | 'AddinUninstall' | 'AddRef' | 'Deactivate' | 'Open' | 'Release', handler: (this: Excel.Workbook, parameter: {}) => void): void;
     on(obj: Excel.Worksheet, event: 'Activate' | 'AddRef' | 'Calculate' | 'Deactivate' | 'Release', handler: (this: Excel.Worksheet, parameter: {}) => void): void;
-    set(obj: Excel.Chart, propertyName: 'HasAxis', parameterTypes: [any, any], newValue: any): void;
-    set(obj: Excel.Workbook, propertyName: 'Colors', parameterTypes: [any], newValue: any): void;
+    set(obj: Excel.Chart, propertyName: 'HasAxis', parameterTypes: [Excel.XlAxisType | undefined, Excel.XlAxisGroup | undefined], newValue: boolean): void;
+    set(obj: Excel.ControlFormat, propertyName: 'List', parameterTypes: [number], newValue: string): void;
+    set(obj: Excel.ControlFormat, propertyName: 'List', parameterTypes: never[], newValue: SafeArray<string>): void;
+    set(obj: Excel.PageSetup, propertyName: 'PrintQuality', parameterTypes: [number], newValue: number): void;
+    set(obj: Excel.Workbook, propertyName: 'Colors', parameterTypes: [number], newValue: number): void;
     set(obj: Excel.Range, propertyName: 'Value', parameterTypes: [Excel.XlRangeValueDataType], newValue: any): void;
-    set(obj: Excel.Range, propertyName: 'Value', newValue: any): void; // because Value is defined on the type as a method, not a property
+    set(obj: Excel.PivotField, propertyName: 'Subtotals', parameterTypes: [Excel.PivotFieldSubtotal], newValue: boolean): void;
 }
 
 interface ActiveXObjectNameMap {
@@ -9730,57 +10173,3 @@ interface ActiveXObjectNameMap {
     'Excel.Chart': Excel.Chart;
     'Excel.Sheet': Excel.Worksheet;
 }
-
-interface EnumeratorConstructor {
-    new(col: Excel.Range): Enumerator;
-
-    new(col: Excel.GroupShapes | Excel.ShapeRange | Excel.Shapes): Enumerator<Excel.Shape>;
-    new(col: Excel.HPageBreaks): Enumerator<Excel.HPageBreak>;
-    new(col: Excel.Hyperlinks): Enumerator<Excel.Hyperlink>;
-    new(col: Excel.IconSet): Enumerator<Excel.Icon>;
-    new(col: Excel.ListColumns): Enumerator<Excel.ListColumn>;
-    new(col: Excel.ListObjects): Enumerator<Excel.ListObject>;
-    new(col: Excel.ListRows): Enumerator<Excel.ListRow>;
-    new(col: Excel.MenuBars): Enumerator<Excel.MenuBar>;
-    new(col: Excel.Menus): Enumerator<Excel.Menu>;
-    new(col: Excel.Names): Enumerator<Excel.Name>;
-    new(col: Excel.ODBCErrors): Enumerator<Excel.ODBCError>;
-    new(col: Excel.OLEDBErrors): Enumerator<Excel.OLEDBError>;
-    new(col: Excel.Pages): Enumerator<Excel.Page>;
-    new(col: Excel.Parameters): Enumerator<Excel.Parameter>;
-    new(col: Excel.PivotCaches): Enumerator<Excel.PivotCache>;
-    new(col: Excel.PivotFilters): Enumerator<Excel.PivotFilter>;
-    new(col: Excel.PivotFormulas): Enumerator<Excel.PivotFormula>;
-    new(col: Excel.PivotLineCells): Enumerator<Excel.PivotCell>;
-    new(col: Excel.PivotLines): Enumerator<Excel.PivotLine>;
-    new(col: Excel.PivotTableChangeList): Enumerator<Excel.ValueChange>;
-    new(col: Excel.ProtectedViewWindows): Enumerator<Excel.ProtectedViewWindow>;
-    new(col: Excel.PublishObjects): Enumerator<Excel.PublishObject>;
-    new(col: Excel.QueryTables): Enumerator<Excel.QueryTable>;
-    new(col: Excel.RecentFiles): Enumerator<Excel.RecentFile>;
-    new(col: Excel.Sheets): Enumerator<Excel.Worksheet | Excel.Chart | Excel.DialogSheet>;
-    new(col: Excel.ShapeNodes): Enumerator<Excel.ShapeNode>;
-    new(col: Excel.SlicerCacheLevels): Enumerator<Excel.SlicerCacheLevel>;
-    new(col: Excel.SlicerCaches): Enumerator<Excel.SlicerCache>;
-    new(col: Excel.SlicerItems): Enumerator<Excel.SlicerItem>;
-    new(col: Excel.SlicerPivotTables): Enumerator<Excel.PivotTable>;
-    new(col: Excel.Slicers): Enumerator<Excel.Slicer>;
-    new(col: Excel.SmartTagActions): Enumerator<Excel.SmartTagAction>;
-    new(col: Excel.SmartTagRecognizers): Enumerator<Excel.SmartTagRecognizer>;
-    new(col: Excel.SortFields): Enumerator<Excel.SortField>;
-    new(col: Excel.SparklineGroup): Enumerator<Excel.Sparkline>;
-    new(col: Excel.SparklineGroups): Enumerator<Excel.SparklineGroup>;
-    new(col: Excel.Styles): Enumerator<Excel.Style>;
-    new(col: Excel.TableStyleElements): Enumerator<Excel.TableStyleElement>;
-    new(col: Excel.TableStyles): Enumerator<Excel.TableStyle>;
-    new(col: Excel.ToolbarButtons): Enumerator<Excel.ToolbarButton>;
-    new(col: Excel.Toolbars): Enumerator<Excel.Toolbar>;
-    new(col: Excel.UserAccessList): Enumerator<Excel.UserAccess>;
-    new(col: Excel.VPageBreaks): Enumerator<Excel.VPageBreak>;
-    new(col: Excel.Watches): Enumerator<Excel.Watch>;
-    new(col: Excel.Windows): Enumerator<Excel.Window>;
-    new(col: Excel.Workbooks): Enumerator<Excel.Workbook>;
-    new(col: Excel.XmlMaps): Enumerator<Excel.XmlMap>;
-    new(col: Excel.XmlNamespaces): Enumerator<Excel.XmlNamespace>;
-    new(col: Excel.XmlSchemas): Enumerator<Excel.XmlSchema>;
-}
diff --git a/types/activex-excel/tslint.json b/types/activex-excel/tslint.json
index f93cf8562a..7b89accc6d 100644
--- a/types/activex-excel/tslint.json
+++ b/types/activex-excel/tslint.json
@@ -1,3 +1,7 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "no-const-enum": false,
+        "max-line-length": false
+    }
 }
diff --git a/types/activex-interop/index.d.ts b/types/activex-interop/index.d.ts
index 3bb13a5351..d59b315fcb 100644
--- a/types/activex-interop/index.d.ts
+++ b/types/activex-interop/index.d.ts
@@ -51,7 +51,6 @@ interface Enumerator<T = any> {
 
 interface EnumeratorConstructor {
     new <T = any>(collection: { Item(index: any): T }): Enumerator<T>;
-    // new (collection: any): Enumerator;
 }
 
 declare var Enumerator: EnumeratorConstructor;
diff --git a/types/activex-office/index.d.ts b/types/activex-office/index.d.ts
index 18a7dd285d..6df01eb16e 100644
--- a/types/activex-office/index.d.ts
+++ b/types/activex-office/index.d.ts
@@ -10,6 +10,8 @@
 declare namespace Office {
     type MsoRGBType = number;
 
+    type ByteArray = SafeArray<number>;
+
     const enum BackstageGroupStyle {
         BackstageGroupStyleError = 2,
         BackstageGroupStyleNormal = 0,
diff --git a/types/activex-outlook/index.d.ts b/types/activex-outlook/index.d.ts
index 2b316d80bd..4789c10e19 100644
--- a/types/activex-outlook/index.d.ts
+++ b/types/activex-outlook/index.d.ts
@@ -5886,7 +5886,3 @@ interface EnumeratorConstructor {
     new(col: Outlook.Reminders): Enumerator<Outlook.Reminder>;
     new(col: Outlook.Views): Enumerator<Outlook.View>;
 }
-
-interface SafeArray<T = any> {
-    _brand: SafeArray<T>;
-}
diff --git a/types/adone/index.d.ts b/types/adone/index.d.ts
index c6add2eeea..521bdf6e03 100644
--- a/types/adone/index.d.ts
+++ b/types/adone/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ciferox/adone
 // Definitions by: am <https://github.com/s0m3on3>, Maximus <https://github.com/maxveres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.6
 
 /// <reference path="./adone.d.ts" />
 /// <reference path="./glosses/app.d.ts" />
diff --git a/types/agenda/agenda-tests.ts b/types/agenda/agenda-tests.ts
index a7031d2ef8..aef7ecd7d6 100644
--- a/types/agenda/agenda-tests.ts
+++ b/types/agenda/agenda-tests.ts
@@ -1,109 +1,110 @@
 import Agenda = require("agenda");
-import { Db, Server } from "mongodb";
+import { Db, Server, MongoClient } from "mongodb";
 
 var mongoConnectionString = "mongodb://127.0.0.1/agenda";
 
-var agenda = new Agenda({ db: { address: mongoConnectionString } });
+(async () => {
+    var agenda = new Agenda({ db: { address: mongoConnectionString } });
+    var agenda = new Agenda({
+        mongo: (await MongoClient.connect(mongoConnectionString)).db(),
+        db: { collection: 'agenda-jobs' },
+    });
 
-agenda.define<{ foo: Error }>('delete old users', (job, done) => {
-    done(job.attrs.data.foo)
+    agenda.define<{ foo: Error }>('delete old users', (job, done) => {
+        done(job.attrs.data.foo)
+    });
+
+    agenda.on('ready', () => {
+        agenda.every('3 minutes', 'delete old users');
+
+        // Alternatively, you could also do:
+        agenda.every('*/3 * * * *', 'delete old users');
+
+        agenda.start();
+    });
+
+    agenda.define('send email report', { priority: 'high', concurrency: 10 }, (job, done) => {
+    });
+
+    agenda.on('ready', () => {
+        agenda.schedule('in 20 minutes', 'send email report', { to: 'admin@example.com' });
+        agenda.start();
+    });
+
+    agenda.on('ready', () => {
+        var weeklyReport = agenda.create('send email report', { to: 'another-guy@example.com' });
+        weeklyReport.repeatEvery('1 week').save();
+        agenda.start();
+    });
+
+    var agenda = new Agenda({ processEvery: '30 seconds' });
+
+    agenda.defaultConcurrency(5);
+
+    var agenda = new Agenda({ defaultConcurrency: 5 });
+
+    agenda.lockLimit(0);
+
+    var agenda = new Agenda({ lockLimit: 0 });
+
+    agenda.defaultLockLimit(0);
+
+    var agenda = new Agenda({ defaultLockLimit: 0 });
+
+    agenda.defaultLockLifetime(10000);
+
+    var agenda = new Agenda({ defaultLockLifetime: 10000 });
+
+    agenda.define('some long running job', function (job, done) {
+        done();
+    });
+
+    agenda.every('15 minutes', ['printAnalyticsReport', 'sendNotifications', 'updateUserRecords']);
+
+    agenda.schedule('tomorrow at noon', 'printAnalyticsReport', { userCount: 100 });
+
+    agenda.schedule('tomorrow at noon', ['printAnalyticsReport', 'sendNotifications', 'updateUserRecords']);
+
+    agenda.now('do the hokey pokey');
+
+    var job = agenda.create<{ userCount: number }>('printAnalyticsReport', { userCount: 100 });
+    await job.save();
+
+    const jobs = await agenda.jobs({ name: 'printAnalyticsReport' });
+    jobs.forEach((job) => {
+        job.save();
+    });
+
+    let numRemoved = await agenda.cancel({ name: 'printAnalyticsReport' });
+
+    numRemoved = await agenda.purge();
+
+    await agenda.stop();
+
+    await job.agenda.now('do the hokey pokey');
+
+    job.repeatEvery('10 minutes');
+
+    job.repeatEvery('10 minutes', { timezone: 'America/New_York' });
+
+    job.repeatEvery('10 minutes', { skipImmediate: true });
+
+    job.repeatAt('3:30pm');
+
+    job.schedule('tomorrow at 6pm');
+
+    job.priority('low');
+    job.priority(10);
+
+    job.unique({ 'data.type': 'active', 'data.userId': '123' });
+    job.fail('insuficient disk space');
+    job.fail(new Error('insufficient disk space'));
+    const job2 = await job.run();
+    await job.remove();
 });
 
-agenda.on('ready', () => {
-    agenda.every('3 minutes', 'delete old users');
-
-    // Alternatively, you could also do:
-    agenda.every('*/3 * * * *', 'delete old users');
-
-    agenda.start();
-});
-
-agenda.define('send email report', { priority: 'high', concurrency: 10 }, (job, done) => {
-});
-
-agenda.on('ready', () => {
-    agenda.schedule('in 20 minutes', 'send email report', { to: 'admin@example.com' });
-    agenda.start();
-});
-
-agenda.on('ready', () => {
-    var weeklyReport = agenda.create('send email report', { to: 'another-guy@example.com' });
-    weeklyReport.repeatEvery('1 week').save();
-    agenda.start();
-});
-
-var agenda = new Agenda({ processEvery: '30 seconds' });
-
-agenda.defaultConcurrency(5);
-
-var agenda = new Agenda({ defaultConcurrency: 5 });
-
-agenda.lockLimit(0);
-
-var agenda = new Agenda({ lockLimit: 0 });
-
-agenda.defaultLockLimit(0);
-
-var agenda = new Agenda({ defaultLockLimit: 0 });
-
-agenda.defaultLockLifetime(10000);
-
-var agenda = new Agenda({ defaultLockLifetime: 10000 });
-
-agenda.define('some long running job', function(job, done) {
-    done();
-});
-
-agenda.every('15 minutes', ['printAnalyticsReport', 'sendNotifications', 'updateUserRecords']);
-
-agenda.schedule('tomorrow at noon', 'printAnalyticsReport', { userCount: 100 });
-
-agenda.schedule('tomorrow at noon', ['printAnalyticsReport', 'sendNotifications', 'updateUserRecords']);
-
-agenda.now('do the hokey pokey');
-
-var job = agenda.create<{ userCount: number }>('printAnalyticsReport', { userCount: 100 });
-job.save(function(err) {
-    console.log("Job successfully saved");
-});
-
-agenda.jobs({ name: 'printAnalyticsReport' }, function(err, jobs) {
-    // Work with jobs (see below)
-});
-
-agenda.cancel({ name: 'printAnalyticsReport' }, function(err, numRemoved) {
-});
-
-agenda.purge(function(err, numRemoved) {
-});
-
-agenda.stop(function() {
-    process.exit(0);
-});
-
-job.agenda.now('do the hokey pokey');
-
-job.repeatEvery('10 minutes');
-
-job.repeatAt('3:30pm');
-
-job.schedule('tomorrow at 6pm');
-
-job.priority('low');
-job.priority(10);
-
-job.unique({ 'data.type': 'active', 'data.userId': '123' });
-job.fail('insuficient disk space');
-job.fail(new Error('insufficient disk space'));
-job.run(function(err, job) {
-    console.log("I don't know why you would need to do this...");
-});
-job.remove(function(err) {
-    if (!err) console.log("Successfully removed job from collection");
-})
-
 class ExtendedAgenda extends Agenda {
-    async start() {  }
+    async start() { }
 }
 
 const extendedAgenda: ExtendedAgenda = new ExtendedAgenda()
diff --git a/types/agenda/index.d.ts b/types/agenda/index.d.ts
index b29158983d..75246ecda3 100644
--- a/types/agenda/index.d.ts
+++ b/types/agenda/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Agenda v1.0.3
+// Type definitions for Agenda v2.0.0
 // Project: https://github.com/agenda/agenda
 // Definitions by: Meir Gottlieb <https://github.com/meirgottlieb>
 //                 Jeff Principe <https://github.com/princjef>
@@ -95,16 +95,14 @@ declare class Agenda extends EventEmitter {
     /**
      * Find all Jobs matching `query` and pass same back in cb().
      * @param query
-     * @param cb
      */
-    jobs<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(query: any, cb: ResultCallback<Agenda.Job<T>[]>): void;
+    jobs<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(query: any): Promise<Agenda.Job<T>[]>;
 
     /**
      * Removes all jobs in the database without defined behaviors. Useful if you change a definition name and want
      * to remove old jobs.
-     * @param cb Called with the number of jobs removed.
      */
-    purge(cb?: ResultCallback<number>): void;
+    purge(): Promise<number>;
 
     /**
      * Defines a job with the name of jobName. When a job of job name gets run, it will be passed to fn(job, done).
@@ -123,46 +121,41 @@ declare class Agenda extends EventEmitter {
      * @param names The name or names of the job(s) to run.
      * @param data An optional argument that will be passed to the processing function under job.attrs.data.
      * @param options An optional argument that will be passed to job.repeatEvery.
-     * @param cb An optional callback function which will be called when the job has been persisted in the database.
      */
-    every<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(interval: number | string, names: string, data?: T, options?: any, cb?: ResultCallback<Agenda.Job<T>>): Agenda.Job<T>;
-    every<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(interval: number | string, names: string[], data?: T, options?: any, cb?: ResultCallback<Agenda.Job<T>[]>): Agenda.Job<T>[];
+    every<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(interval: number | string, names: string, data?: T, options?: any): Promise<Agenda.Job<T>>;
+    every<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(interval: number | string, names: string[], data?: T, options?: any): Promise<Agenda.Job<T>[]>;
 
     /**
      * Schedules a job to run name once at a given time.
      * @param when A Date or a String such as tomorrow at 5pm.
      * @param names The name or names of the job(s) to run.
      * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-     * @param cb An optional callback function which will be called when the job has been persisted in the database.
      */
-    schedule<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(when: Date | string, names: string, data?: T, cb?: ResultCallback<Agenda.Job<T>>): Agenda.Job<T>;
-    schedule<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(when: Date | string, names: string[], data?: T, cb?: ResultCallback<Agenda.Job<T>[]>): Agenda.Job<T>[];
+    schedule<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(when: Date | string, names: string, data?: T): Promise<Agenda.Job<T>>;
+    schedule<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(when: Date | string, names: string[], data?: T): Promise<Agenda.Job<T>[]>;
 
     /**
      * Schedules a job to run name once immediately.
      * @param name The name of the job to run.
      * @param data An optional argument that will be passed to the processing function under job.attrs.data.
-     * @param cb An optional callback function which will be called when the job has been persisted in the database.
      */
-    now<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(name: string, data?: T, cb?: ResultCallback<Agenda.Job<T>>): Agenda.Job<T>;
+    now<T extends Agenda.JobAttributesData = Agenda.JobAttributesData>(name: string, data?: T): Promise<Agenda.Job<T>>;
 
     /**
      * Cancels any jobs matching the passed mongodb-native query, and removes them from the database.
      * @param query Mongodb native query.
-     * @param cb Called with the number of jobs removed.
      */
-    cancel(query: any, cb?: ResultCallback<number>): void;
+    cancel(query: any): Promise<number>;
 
     /**
      * Starts the job queue processing, checking processEvery time to see if there are new jobs.
      */
-    start(): void;
+    start(): Promise<void>;
 
     /**
      * Stops the job queue processing. Unlocks currently running jobs.
-     * @param cb Called after the job processing queue shuts down and unlocks all jobs.
      */
-    stop(cb: Callback): void;
+    stop(): Promise<void>;
 }
 
 declare namespace Agenda {
@@ -210,17 +203,7 @@ declare namespace Agenda {
         /**
          * Specifies that Agenda should be initialized using and existing MongoDB connection.
          */
-        mongo?: {
-            /**
-             * The MongoDB database connection to use.
-             */
-            db: Db;
-
-            /**
-             * The name of the collection to use.
-             */
-            collection?: string;
-        }
+        mongo?: Db;
 
         /**
          * Specifies that Agenda should connect to MongoDB.
@@ -228,8 +211,10 @@ declare namespace Agenda {
         db?: {
             /**
              * The connection URL.
+             * Required when using `db` option to connect.
+             * Not required when an existing connection is passed as `mongo` property.
              */
-            address: string;
+            address?: string;
 
             /**
              * The name of the collection to use.
@@ -238,6 +223,7 @@ declare namespace Agenda {
 
             /**
              * Connection options to pass to MongoDB.
+             * Not required when an existing connection is passed as `mongo` property.
              */
             options?: any;
         }
@@ -350,57 +336,57 @@ declare namespace Agenda {
         /**
          * Specifies an interval on which the job should repeat.
          * @param interval A human-readable format String, a cron format String, or a Number.
-         * @param options An optional argument that can include a timezone field. The timezone should be a string as
-         * accepted by moment-timezone and is considered when using an interval in the cron string format.
+         * @param options An optional argument that can include a timezone field or skipImmediate field.
+         * The timezone should be a string as accepted by moment-timezone and is considered when using an interval in the cron string format.
+         * Setting skipImmediate as true will skip the immediate run. The first run will occur only in configured interval.
          */
-        repeatEvery(interval: string | number, options?: { timezone?: string }): Job<T>
+        repeatEvery(interval: string | number, options?: { timezone?: string, skipImmediate?: boolean }): this
 
         /**
          * Specifies a time when the job should repeat. [Possible values](https://github.com/matthewmueller/date#examples).
          * @param time
          */
-        repeatAt(time: string): Job<T>
+        repeatAt(time: string): this
 
         /**
          * Disables the job.
          */
-        disable(): Job<T>;
+        disable(): this;
 
         /**
          * Enables the job.
          */
-        enable(): Job<T>;
+        enable(): this;
 
         /**
          * Ensure that only one instance of this job exists with the specified properties
          * @param value The properties associated with the job that must be unqiue.
          * @param opts
          */
-        unique(value: any, opts?: { insertOnly?: boolean }): Job<T>;
+        unique(value: any, opts?: { insertOnly?: boolean }): this;
 
         /**
          * Specifies the next time at which the job should run.
          * @param time The next time at which the job should run.
          */
-        schedule(time: string | Date): Job<T>;
+        schedule(time: string | Date): this;
 
         /**
          * Specifies the priority weighting of the job.
          * @param value The priority of the job (lowest|low|normal|high|highest|number).
          */
-        priority(value: string | number): Job<T>;
+        priority(value: string | number): this;
 
         /**
          * Sets job.attrs.failedAt to now, and sets job.attrs.failReason to reason.
          * @param reason A message or Error object that indicates why the job failed.
          */
-        fail(reason: string | Error): Job<T>;
+        fail(reason: string | Error): this;
 
         /**
          * Runs the given job and calls callback(err, job) upon completion. Normally you never need to call this manually
-         * @param cb Called when the job is completed.
          */
-        run(cb?: ResultCallback<Job<T>>): Job<T>;
+        run(): Promise<this>;
 
         /**
          * Returns true if the job is running; otherwise, returns false.
@@ -409,27 +395,24 @@ declare namespace Agenda {
 
         /**
          * Saves the job into the database.
-         * @param cb  Called when the job is saved.
          */
-        save(cb?: ResultCallback<Job<T>>): Job<T>;
+        save(): Promise<this>;
 
         /**
          * Removes the job from the database and cancels the job.
-         * @param cb Called after the job has beeb removed from the database.
          */
-        remove(cb?: Callback): void;
+        remove(): Promise<void>;
 
         /**
          * Resets the lock on the job. Useful to indicate that the job hasn't timed out when you have very long running
          * jobs.
-         * @param cb Called after the job has been saved to the database.
          */
-        touch(cb?: Callback): void;
+        touch(): Promise<this>;
 
         /**
          * Calculates next time the job should run
          */
-        computeNextRunAt(): Job<T>;
+        computeNextRunAt(): this;
     }
 
     interface JobOptions {
diff --git a/types/agent-base/agent-base-tests.ts b/types/agent-base/agent-base-tests.ts
new file mode 100644
index 0000000000..116ff8af96
--- /dev/null
+++ b/types/agent-base/agent-base-tests.ts
@@ -0,0 +1,23 @@
+import agent = require('agent-base');
+
+agent(); // $ExpectType Agent
+agent({ timeout: 1000 }); // $ExpectType Agent
+
+agent((req, opts) => {}); // $ExpectType Agent
+agent((req, opts) => {}, { timeout: 1000 }); // $ExpectType Agent
+
+agent(async (req, opts) => {}); // $ExpectType Agent
+agent(async (req, opts) => {}, { timeout: 1000 }); // $ExpectType Agent
+
+agent(0); // $ExpectError
+agent(1); // $ExpectError
+agent(''); // $ExpectError
+agent(true); // $ExpectError
+agent(null); // $ExpectError
+
+agent((req, opts) => {}, 0); // $ExpectError
+agent((req, opts) => {}, 1); // $ExpectError
+agent((req, opts) => {}, ''); // $ExpectError
+agent((req, opts) => {}, true); // $ExpectError
+agent((req, opts) => {}, null); // $ExpectError
+agent((req, opts) => {}, (req, opts) => {}); // $ExpectError
diff --git a/types/agent-base/index.d.ts b/types/agent-base/index.d.ts
new file mode 100644
index 0000000000..0b1e4d3018
--- /dev/null
+++ b/types/agent-base/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for agent-base 4.2
+// Project: https://github.com/TooTallNate/node-agent-base#readme
+// Definitions by: Christopher Quadflieg <https://github.com/Shinigami92>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+import { EventEmitter } from 'events';
+
+declare namespace Agent {
+	type AgentCallback = (
+		req?: any,
+		opts?: {
+			secureEndpoint: boolean;
+		}
+	) => void;
+
+	interface AgentOptions {
+		timeout?: number;
+		host?: string;
+		port?: number;
+		[key: string]: any;
+	}
+
+	interface Agent extends EventEmitter {
+		_promisifiedCallback: boolean;
+		timeout: number | null;
+		options?: AgentOptions;
+		callback: AgentCallback;
+		addRequest: (req?: any, opts?: any) => void;
+		freeSocket: (socket: any, opts: any) => void;
+	}
+}
+
+/**
+ * Base `http.Agent` implementation.
+ * No pooling/keep-alive is implemented by default.
+ */
+declare function Agent(opts?: Agent.AgentOptions): Agent.Agent;
+declare function Agent(
+	callback: Agent.AgentCallback,
+	opts?: Agent.AgentOptions
+): Agent.Agent;
+
+export = Agent;
diff --git a/types/agent-base/tsconfig.json b/types/agent-base/tsconfig.json
new file mode 100644
index 0000000000..dc6db21f70
--- /dev/null
+++ b/types/agent-base/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",
+        "agent-base-tests.ts"
+    ]
+}
diff --git a/types/meteor-univserse-i18n/tslint.json b/types/agent-base/tslint.json
similarity index 100%
rename from types/meteor-univserse-i18n/tslint.json
rename to types/agent-base/tslint.json
diff --git a/types/agora-rtc-sdk/agora-rtc-sdk-tests.ts b/types/agora-rtc-sdk/agora-rtc-sdk-tests.ts
new file mode 100644
index 0000000000..bfa00378db
--- /dev/null
+++ b/types/agora-rtc-sdk/agora-rtc-sdk-tests.ts
@@ -0,0 +1,27 @@
+let client = AgoraRTC.createClient({
+  mode: 'live',
+  codec: 'vp8'
+});
+
+let stream = AgoraRTC.createStream({
+  video: true,
+  audio: true,
+  streamID: 21230,
+  screen: false
+});
+
+client.init('74a0b7bb5d3e47c7abca0533d17b0afa', () => {
+  client.join('74a0b7bb5d3e47c7abca0533d17b0afa', 'testyy', 21230, uid => {
+    stream.init(() => {
+      client.publish(stream, err => {
+        throw(err);
+      });
+    }, err => {
+      throw(err);
+    });
+  }, err => {
+    throw(err);
+  });
+}, err => {
+  throw(err);
+});
diff --git a/types/agora-rtc-sdk/index.d.ts b/types/agora-rtc-sdk/index.d.ts
new file mode 100644
index 0000000000..d70385d639
--- /dev/null
+++ b/types/agora-rtc-sdk/index.d.ts
@@ -0,0 +1,314 @@
+// Type definitions for agora-rtc-sdk 2.3
+// Project: https://github.com/AgoraIO/web-archive#readme
+// Definitions by: Menthays <https://github.com/menthays>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/*~ If this module is a UMD module that exposes a global variable 'myLib' when
+ *~ loaded outside a module loader environment, declare that global here.
+ *~ Otherwise, delete this declaration.
+ */
+export as namespace AgoraRTC;
+
+/*~ If this module has methods, declare them as functions like so.
+ */
+export function createClient(config: ClientConfig): Client;
+export function createStream(spec: StreamSpec): Stream;
+export function checkSystemRequirements(): boolean;
+export function getDevices(callback: (devices: any[]) => void): void;
+
+/*~ You can declare types that are available via importing the module */
+export interface ClientConfig  {
+    mode: 'live' | 'rtc';
+    codec: 'vp8' | 'h264';
+    proxyServer?: string;
+    turnServer?: {
+        turnServerURL: string;
+        username: string;
+        password: string;
+        udpport: string;
+        tcpport: string;
+        forceturn: boolean;
+    };
+}
+
+export interface StreamSpec  {
+    streamID: number;
+    audio: boolean;
+    video: boolean;
+    screen: boolean;
+    cameraId?: string;
+    microphoneId?: string;
+    mirror?: boolean;
+    extensionid?: string;
+    mediaSource?: 'screen' | 'application' | 'window';
+    audioProcessing?: {
+        AGC: boolean;
+    };
+    attributes?: {
+        resolution: string;
+        minFrameRate: number;
+        maxFrameRate: number;
+    };
+}
+
+export interface LocalStreamStats {
+    audioSendBytes: string;
+    audioSendPackets: string;
+    videoSendBytes: string;
+    videoSendPackets: string;
+    videoSendPacketsLost: string;
+    videoSendFrameRate: string;
+    videoSendBandwidth: string;
+    videoSendResolutionWidth?: string;
+    videoSendResolutionHeight?: string;
+    audioCodecName: string;
+    videoCodecName: string;
+    timestamp: string;
+    startTime: string;
+    duration: string;
+}
+
+export interface RemoteStreamStats {
+    audioReceiveBytes: string;
+    audioReceivePackets: string;
+    audioReceivePacketsLost: string;
+    videoReceiveBytes: string;
+    videoReceivePackets: string;
+    videoReceivePacketsLost: string;
+    videoReceiveFrameRate?: string;
+    videoReceiveDecodeFrameRate?: string;
+    videoReceiveBandwidth?: string;
+    videoReceivedResolutionWidth?: string;
+    videoReceivedResolutionHeight?: string;
+    timestamp: string;
+    startTime: string;
+    duration: string;
+}
+
+export type VideoProfile =
+    | '120p'
+    | '120p_1'
+    | '120p_3'
+    | '180p'
+    | '180p_1'
+    | '180p_3'
+    | '180p_4'
+    | '240p'
+    | '240p_1'
+    | '240p_3'
+    | '240p_4'
+    | '360p'
+    | '360p_1'
+    | '360p_3'
+    | '360p_4'
+    | '360p_6'
+    | '360p_7'
+    | '360p_8'
+    | '360p_9'
+    | '360p_10'
+    | '360p_11'
+    | '480p'
+    | '480p_1'
+    | '480p_2'
+    | '480p_3'
+    | '480p_4'
+    | '480p_6'
+    | '480p_8'
+    | '480p_9'
+    | '480p_10'
+    | '720p'
+    | '720p_1'
+    | '720p_2'
+    | '720p_3'
+    | '720p_5'
+    | '720p_6'
+    | '1080p'
+    | '1080p_1'
+    | '1080p_2'
+    | '1080p_3'
+    | '1080p_5'
+    | '1440p'
+    | '1440p_1'
+    | '1440p_2'
+    | '4K'
+    | '4K_1'
+    | '4K_3';
+
+export type FirefoxVideoProfile =
+    | '480p'
+    | '480p_1'
+    | '480p_2'
+    | '480p_3'
+    | '480p_4'
+    | '480p_6'
+    | '480p_8'
+    | '480p_9'
+    | '480p_10'
+    | '720p'
+    | '720p_1'
+    | '720p_2'
+    | '720p_3'
+    | '720p_5'
+    | '720p_6';
+
+export type SafariVideoProfile =
+    | '480p'
+    | '480p_1'
+    | '480p_2'
+    | '480p_3'
+    | '480p_4'
+    | '480p_6'
+    | '480p_8'
+    | '480p_9'
+    | '480p_10'
+    | '720p'
+    | '720p_1'
+    | '720p_2'
+    | '720p_3'
+    | '720p_5'
+    | '720p_6'
+    | '1080p'
+    | '1080p_1'
+    | '1080p_2'
+    | '1080p_3'
+    | '1080p_5'
+    | '1440p'
+    | '1440p_1'
+    | '1440p_2'
+    | '4K'
+    | '4K_1'
+    | '4K_3';
+
+export type ScreenSharingProfile =
+    | '480p_1'
+    | '480p_2'
+    | '720p_1'
+    | '720p_2'
+    | '1080p_1'
+    | '1080p_2';
+
+export type ClientEvent =
+    | 'stream-published'
+    | 'stream-added'
+    | 'stream-removed'
+    | 'stream-subscribed'
+    | 'peer-leave'
+    | 'mute-audio'
+    | 'unmute-audio'
+    | 'mute-video'
+    | 'unmute-video'
+    | 'client-banned'
+    | 'active-speaker'
+    | 'error';
+
+export interface Stream {
+    getStats(
+        callback: (stats: LocalStreamStats | RemoteStreamStats) => void
+    ): void;
+    init(onSuccess: () => void, onFailure: (err: any) => void): void;
+    getId(): number;
+    getAttributes(): any;
+    getAudioLevel(): number;
+    hasVideo(): boolean;
+    hasAudio(): boolean;
+    enableVideo(): void;
+    disableVideo(): void;
+    enableAudio(): void;
+    disableAudio(): void;
+    setVideoProfile(
+        profile:
+        | VideoProfile
+        | FirefoxVideoProfile
+        | SafariVideoProfile
+        | ScreenSharingProfile
+    ): void;
+    play(HTMLElementID: string): void;
+    stop(): void;
+    close(): void;
+}
+
+export interface Client {
+    on(eventName: ClientEvent, callback: (evt: any) => void): void;
+    init(
+        appId: string,
+        onSuccess: () => void,
+        onFailure: (err: any) => void
+    ): void;
+    join(
+        tokenOrKey: string,
+        channel: string,
+        uid: number,
+        onSuccess: (uid: number) => void,
+        onFailure: (err: any) => void
+    ): void;
+    renewChannelKey(
+        key: string,
+        onSuccess: () => void,
+        onFailure: (err: any) => void
+    ): void;
+    enableDualStream(
+        onSuccess: () => void,
+        onFailure: (err: any) => void
+    ): void;
+    setRemoteVideoStreamType(stream: Stream, streamType: 0 | 1): void;
+    setLowStreamParameter(param: {
+        width: number;
+        height: number;
+        framerate: number;
+        birate: number;
+    }): void;
+    disableDualStream(
+        onSuccess: () => void,
+        onFailure: (err: any) => void
+    ): void;
+    leave(onSuccess: () => void, onFailure: (err: any) => void): void;
+    publish(stream: Stream, onFailure: (err: any) => void): void;
+    unpublish(stream: Stream, onFailure: (err: any) => void): void;
+    subscribe(stream: Stream, onFailure: (err: any) => void): void;
+    unsubscribe(stream: Stream, onFailure: (err: any) => void): void;
+    setProxyServer(proxyServer: ClientConfig['proxyServer']): void;
+    setTurnServer(turnServer: ClientConfig['turnServer']): void;
+    setEncryptionSecret(password: string): void;
+    setEncryptionMode(
+        encryptionMode: 'aes-128-xts' | 'aes-256-xts' | 'aes-128-ecb'
+    ): void;
+}
+
+/*~ You can declare properties of the module using const, let, or var */
+export const VERSION: string;
+
+export const AUDIO_SAMPLE_RATE_32000: 32000;
+export const AUDIO_SAMPLE_RATE_44100: 44100;
+export const AUDIO_SAMPLE_RATE_48000: 48000;
+
+export const VIDEO_CODEC_PROFILE_BASELINE: 66;
+export const VIDEO_CODEC_PROFILE_MAIN: 77;
+export const VIDEO_CODEC_PROFILE_HIGH: 100;
+
+export const REMOTE_VIDEO_STREAM_HIGH: 0;
+export const REMOTE_VIDEO_STREAM_LOW: 1;
+export const REMOTE_VIDEO_STREAM_MEDIUM: 2;
+/*~ If there are types, properties, or methods inside dotted names
+ *~ of the module, declare them inside a 'namespace'.
+ */
+export namespace Logger {
+    /*~ For example, given this definition, someone could write:
+     *~   import { subProp } from 'yourModule';
+     *~   subProp.foo();
+     *~ or
+     *~   import * as yourMod from 'yourModule';
+     *~   yourMod.subProp.foo();
+     */
+    type DEBUG = 0;
+    type INFO = 1;
+    type WARNING = 2;
+    type ERROR = 3;
+    type NONE = 4;
+    function setLogLevel(level: DEBUG|INFO|WARNING|NONE): void;
+    function log(args: any): void;
+    function debug(args: any): void;
+    function info(args: any): void;
+    function warning(args: any): void;
+    function error(args: any): void;
+}
diff --git a/types/agora-rtc-sdk/tsconfig.json b/types/agora-rtc-sdk/tsconfig.json
new file mode 100644
index 0000000000..8d3d2c118b
--- /dev/null
+++ b/types/agora-rtc-sdk/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",
+        "agora-rtc-sdk-tests.ts"
+    ]
+}
diff --git a/types/react-svg/tslint.json b/types/agora-rtc-sdk/tslint.json
similarity index 100%
rename from types/react-svg/tslint.json
rename to types/agora-rtc-sdk/tslint.json
diff --git a/types/algoliasearch/index.d.ts b/types/algoliasearch/index.d.ts
index b2890573ce..0c2d244b05 100644
--- a/types/algoliasearch/index.d.ts
+++ b/types/algoliasearch/index.d.ts
@@ -764,6 +764,11 @@ declare namespace algoliasearch {
      * https://github.com/algolia/algoliasearch-client-js#client-options
      */
     hosts?: { read?: string[]; write?: string[] };
+    /**
+     * enable the experimental feature: caching requests instead of responses
+     * see https://github.com/algolia/algoliasearch-client-javascript/pull/694
+     */
+    _useRequestCache?: boolean
   }
   /**
    * Interface describing options available for gettings the logs
@@ -1771,6 +1776,14 @@ declare namespace algoliasearch {
     facets?: {
       [facetName: string]: { [facetValue: string]: number };
     };
+    facets_stats?: {
+      [facetName: string]: {
+        avg: number,
+        max: number,
+        min: number,
+        sum: number,
+      };
+    };
   }
 
   interface MultiResponse {
diff --git a/types/algoliasearch/lite/index.d.ts b/types/algoliasearch/lite/index.d.ts
index a567a917a8..4f068d5647 100644
--- a/types/algoliasearch/lite/index.d.ts
+++ b/types/algoliasearch/lite/index.d.ts
@@ -4,6 +4,7 @@
 //                 Haroen Viaene <https://github.com/haroenv>
 //                 Aurélien Hervé <https://github.com/aherve>
 //                 Samuel Vaillant <https://github.com/samouss>
+//                 Claas Brüggemann <https://github.com/ClaasBrueggemann>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -180,6 +181,11 @@ declare namespace algoliasearch {
      * https://github.com/algolia/algoliasearch-client-js#client-options
      */
     hosts?: { read?: string[]; write?: string[] };
+    /**
+     * enable the experimental feature: caching requests instead of responses
+     * see https://github.com/algolia/algoliasearch-client-javascript/pull/694
+     */
+    _useRequestCache?: boolean
   }
   interface BrowseResponse {
     cursor?: string;
@@ -565,6 +571,14 @@ declare namespace algoliasearch {
     facets?: {
       [facetName: string]: { [facetValue: string]: number };
     };
+    facets_stats?: {
+      [facetName: string]: {
+        avg: number,
+        max: number,
+        min: number,
+        sum: number,
+      };
+    };
   }
 
   interface MultiResponse {
diff --git a/types/almost-equal/almost-equal-tests.ts b/types/almost-equal/almost-equal-tests.ts
new file mode 100644
index 0000000000..398017e7ec
--- /dev/null
+++ b/types/almost-equal/almost-equal-tests.ts
@@ -0,0 +1,7 @@
+import * as almostEqual from 'almost-equal';
+
+const res1 = almostEqual(1.999999, 2.0);
+
+const res2 = almostEqual(1.999999, 2.0, almostEqual.DBL_EPSILON);
+
+const res3 = almostEqual(1.999999, 2.0, almostEqual.FLT_EPSILON, almostEqual.FLT_EPSILON);
diff --git a/types/almost-equal/index.d.ts b/types/almost-equal/index.d.ts
new file mode 100644
index 0000000000..cacbaa4886
--- /dev/null
+++ b/types/almost-equal/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for almost-equal 1.1
+// Project: https://github.com/mikolalysenko/almost-equal#readme
+// Definitions by: Curtis Maddalozzo <https://github.com/cmaddalozzo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function almostEqual(value: number, other: number, absoluteTolerance?: number, relativeTolerance?: number): boolean;
+declare namespace almostEqual {
+  const FLT_EPSILON: number;
+  const DBL_EPSILON: number;
+}
+export = almostEqual;
diff --git a/types/fork-ts-checker-webpack-plugin/tsconfig.json b/types/almost-equal/tsconfig.json
similarity index 90%
rename from types/fork-ts-checker-webpack-plugin/tsconfig.json
rename to types/almost-equal/tsconfig.json
index cfd6ee81db..a4a61b092b 100644
--- a/types/fork-ts-checker-webpack-plugin/tsconfig.json
+++ b/types/almost-equal/tsconfig.json
@@ -7,17 +7,17 @@
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
+        "strictFunctionTypes": true,
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "fork-ts-checker-webpack-plugin-tests.ts"
+        "almost-equal-tests.ts"
     ]
 }
diff --git a/types/almost-equal/tslint.json b/types/almost-equal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/almost-equal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/alt/index.d.ts b/types/alt/index.d.ts
index 0c69e4020a..9094642e70 100644
--- a/types/alt/index.d.ts
+++ b/types/alt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/goatslacker/alt
 // Definitions by: Michael Shearer <https://github.com/Shearerbeard>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react"/>
 
diff --git a/types/amp/amp-tests.ts b/types/amp/amp-tests.ts
index 1e17bc8507..983c1f993b 100644
--- a/types/amp/amp-tests.ts
+++ b/types/amp/amp-tests.ts
@@ -32,7 +32,7 @@ new Stream({
     highWaterMark: 1,
     decodeStrings: true,
     objectMode: true,
-    destroy: (error?: Error) => {
+    destroy: (error: Error | null) => {
         return 'handle error';
     },
     final: (callback: (error?: Error) => void) => {
diff --git a/types/amqp-connection-manager/amqp-connection-manager-tests.ts b/types/amqp-connection-manager/amqp-connection-manager-tests.ts
new file mode 100644
index 0000000000..6eae738a3c
--- /dev/null
+++ b/types/amqp-connection-manager/amqp-connection-manager-tests.ts
@@ -0,0 +1,25 @@
+import * as amqp from "amqplib";
+import * as amqpConMgr from 'amqp-connection-manager';
+
+// from README.md
+const connection = amqpConMgr.connect(['amqp://localhost']);
+const channelWrapper: amqpConMgr.ChannelWrapper = connection.createChannel({
+    json: true,
+    setup: async (channel: amqp.ConfirmChannel): Promise<void> => {
+        // `channel` here is a regular amqplib `ConfirmChannel`. Unfortunately its typings make it return a bluebird-specific promise
+		// tslint:disable-next-line:await-promise
+        await channel.assertQueue('rxQueueName', {durable: true});
+    }
+});
+
+connection.on("connect", (_arg: { connection: amqp.Connection, url: string }): void => undefined);
+connection.on("disconnect", (_arg: { err: Error }): void => undefined);
+
+channelWrapper.on("close", () => undefined);
+channelWrapper.on("connect", () => undefined);
+channelWrapper.on("error", (_error: Error) => undefined);
+
+channelWrapper.sendToQueue("foo", Buffer.from("bar"))
+    .catch((error: Error): void => {
+        // nothing
+    });
diff --git a/types/amqp-connection-manager/index.d.ts b/types/amqp-connection-manager/index.d.ts
new file mode 100644
index 0000000000..ab69aadeb1
--- /dev/null
+++ b/types/amqp-connection-manager/index.d.ts
@@ -0,0 +1,184 @@
+// Type definitions for amqp-connection-manager 2.0
+// Project: https://github.com/benbria/node-amqp-connection-manager
+// Definitions by: rogierschouten <https://github.com/rogierschouten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { ConfirmChannel, Connection, Message, Options, Replies } from "amqplib";
+import { EventEmitter } from "events";
+import { SecureContextOptions } from "tls";
+
+/**
+ * connect() options
+ */
+export interface AmqpConnectionManagerOptions {
+	/**
+	 * Interval to send heartbeats to broker. Defaults to 5 seconds.
+	 */
+	heartbeatIntervalInSeconds?: number;
+
+	/**
+	 * The time to wait before trying to reconnect. If not specified, defaults to heartbeatIntervalInSeconds
+	 */
+	reconnectTimeInSeconds?: number;
+
+	/**
+	 * is a function which returns one or more servers to connect to. This should return either a single URL or an array of URLs.
+	 * This is handy when you're using a service discovery mechanism such as Consul or etcd. Instead of taking a callback, this can also
+	 * return a Promise. Note that if this is supplied, then urls is ignored.
+	 */
+	findServers?: ((callback: (urls: string | string[]) => void) => void) | (() => Promise<string | string[]>);
+
+	/**
+	 * TLS options
+	 */
+	connectionOptions?: SecureContextOptions;
+}
+
+/**
+ * Creates a new AmqpConnectionManager, which will connect to one of the URLs provided in urls.
+ * If a broker is unreachable or dies, then AmqpConnectionManager will try the next available broker, round-robin.
+ * @param urls
+ * @param options
+ */
+export function connect(urls: string[], options?: AmqpConnectionManagerOptions): AmqpConnectionManager;
+
+export type SetupFunc = ((channel: ConfirmChannel, callback: (error?: Error) => void) => void) | ((channel: ConfirmChannel) => Promise<void>);
+
+export interface CreateChannelOpts {
+	/**
+	 * Name for this channel. Used for debugging.
+	 */
+	name?: string;
+	/**
+	 * A function to call whenever we reconnect to the broker (and therefore create a new underlying channel.)
+	 * This function should either accept a callback, or return a Promise. See addSetup below
+	 */
+	setup?: SetupFunc;
+	/**
+	 * if true, then ChannelWrapper assumes all messages passed to publish() and sendToQueue() are plain JSON objects.
+	 * These will be encoded automatically before being sent.
+	 */
+	json?: boolean;
+}
+
+export interface AmqpConnectionManager extends EventEmitter {
+	addListener(event: string, listener: (...args: any[]) => void): this;
+	addListener(event: "connect", listener: (arg: { connection: Connection, url: string }) => void): this;
+	addListener(event: "disconnect", listener: (arg: {err: Error}) => void): this;
+
+	on(event: string, listener: (...args: any[]) => void): this;
+	on(event: "connect", listener: (arg: { connection: Connection, url: string }) => void): this;
+	on(event: "disconnect", listener: (arg: {err: Error}) => void): this;
+
+	once(event: string, listener: (...args: any[]) => void): this;
+	once(event: "connect", listener: (arg: { connection: Connection, url: string }) => void): this;
+	once(event: "disconnect", listener: (arg: {err: Error}) => void): this;
+
+	prependListener(event: string, listener: (...args: any[]) => void): this;
+	prependListener(event: "connect", listener: (arg: { connection: Connection, url: string }) => void): this;
+	prependListener(event: "disconnect", listener: (arg: {err: Error}) => void): this;
+
+	prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+	prependOnceListener(event: "connect", listener: (arg: { connection: Connection, url: string }) => void): this;
+	prependOnceListener(event: "disconnect", listener: (arg: {err: Error}) => void): this;
+
+	/**
+	 * Create a new ChannelWrapper. This is a proxy for the actual channel (which may or may not exist at any moment, depending on whether or not we are currently connected.)
+	 * @param opts
+	 */
+	createChannel(opts: CreateChannelOpts): ChannelWrapper;
+
+	/**
+	 * Returns true if the AmqpConnectionManager is connected to a broker, false otherwise.
+	 */
+	isConnected(): boolean;
+
+	/**
+	 * Close this AmqpConnectionManager and free all associated resources.
+	 */
+	close(): Promise<void>;
+}
+
+export interface ChannelWrapper extends EventEmitter {
+	addListener(event: string, listener: (...args: any[]) => void): this;
+	addListener(event: "connect", listener: () => void): this;
+	addListener(event: "error", listener: (err: Error, info: { name: string }) => void): this;
+	addListener(event: "close", listener: () => void): this;
+
+	on(event: string, listener: (...args: any[]) => void): this;
+	on(event: "connect", listener: () => void): this;
+	on(event: "error", listener: (err: Error, info: { name: string }) => void): this;
+	on(event: "close", listener: () => void): this;
+
+	once(event: string, listener: (...args: any[]) => void): this;
+	once(event: "connect", listener: () => void): this;
+	once(event: "error", listener: (err: Error, info: { name: string }) => void): this;
+	once(event: "close", listener: () => void): this;
+
+	prependListener(event: string, listener: (...args: any[]) => void): this;
+	prependListener(event: "connect", listener: () => void): this;
+	prependListener(event: "error", listener: (err: Error, info: { name: string }) => void): this;
+	prependListener(event: "close", listener: () => void): this;
+
+	prependOnceListener(event: string, listener: (...args: any[]) => void): this;
+	prependOnceListener(event: "connect", listener: () => void): this;
+	prependOnceListener(event: "error", listener: (err: Error, info: { name: string }) => void): this;
+	prependOnceListener(event: "close", listener: () => void): this;
+
+	/**
+	 * Adds a new 'setup handler'. setup(channel, [cb]) is a function to call when a new underlying channel is created -
+	 * handy for asserting exchanges and queues exists, and whatnot. The channel object here is a ConfirmChannel from amqplib.
+	 * The setup function should return a Promise (or optionally take a callback) - no messages will be sent until this Promise resolves.
+	 * If there is a connection, setup() will be run immediately, and the addSetup Promise/callback won't resolve until setup is complete.
+	 * Note that in this case, if the setup throws an error, no 'error' event will be emitted, since you can just handle the error here
+	 * (although the setup will still be added for future reconnects, even if it throws an error.)
+	 * Setup functions should, ideally, not throw errors, but if they do then the ChannelWrapper will emit an 'error' event.
+	 * @param func
+	 */
+	addSetup(func: SetupFunc): Promise<void>;
+
+	/**
+	 * @see amqplib
+	 * @param exchange
+	 * @param routingKey
+	 * @param content
+	 * @param options
+	 * @param callback
+	 */
+    publish(exchange: string, routingKey: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): Promise<void>;
+
+	/**
+	 * @see amqplib
+	 * @param queue
+	 * @param content
+	 * @param options
+	 * @param callback
+	 */
+    sendToQueue(queue: string, content: Buffer, options?: Options.Publish, callback?: (err: any, ok: Replies.Empty) => void): Promise<void>;
+
+	/**
+	 * @see amqplib
+	 * @param message
+	 * @param allUpTo
+	 */
+    ack(message: Message, allUpTo?: boolean): void;
+
+	/**
+	 * @see amqplib
+	 * @param message
+	 * @param allUpTo
+	 * @param requeue
+	 */
+    nack(message: Message, allUpTo?: boolean, requeue?: boolean): void;
+
+	/**
+	 * Returns a count of messages currently waiting to be sent to the underlying channel.
+	 */
+	queueLength(): number;
+
+	/**
+	 * Close a channel, clean up resources associated with it.
+	 */
+	close(): Promise<void>;
+}
diff --git a/types/amqp-connection-manager/tsconfig.json b/types/amqp-connection-manager/tsconfig.json
new file mode 100644
index 0000000000..d707bd5a65
--- /dev/null
+++ b/types/amqp-connection-manager/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",
+        "amqp-connection-manager-tests.ts"
+    ]
+}
diff --git a/types/amqp-connection-manager/tslint.json b/types/amqp-connection-manager/tslint.json
new file mode 100644
index 0000000000..d57642e30f
--- /dev/null
+++ b/types/amqp-connection-manager/tslint.json
@@ -0,0 +1,8 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"strict-export-declare-modifiers": false,
+		"unified-signatures": false,
+		"void-return": false
+	}
+}
diff --git a/types/amqplib/index.d.ts b/types/amqplib/index.d.ts
index 269ed0112e..9ad6d9ceda 100644
--- a/types/amqplib/index.d.ts
+++ b/types/amqplib/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/squaremo/amqp.node
 // Definitions by: Michael Nahkies <https://github.com/mnahkies>, Ab Reitsma <https://github.com/abreits>, Nicolás Fantone <https://github.com/nfantone>, Nick Zelei <https://github.com/zelein>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/angular-block-ui/angular-block-ui-tests.ts b/types/angular-block-ui/angular-block-ui-tests.ts
index 58547fff4d..4446e73234 100644
--- a/types/angular-block-ui/angular-block-ui-tests.ts
+++ b/types/angular-block-ui/angular-block-ui-tests.ts
@@ -38,4 +38,9 @@ app.controller('Ctrl', ($scope: ng.IScope, blockUI: angular.blockUI.BlockUIServi
     blockUI.message("Hello Types");
     blockUI.done();
     const b: boolean = blockUI.isBlocking();
+
+    const myBlockUI = blockUI.instances.get("myBlockUI");
+    myBlockUI.start();
+    myBlockUI.reset();
+    myBlockUI.stop();
 });
diff --git a/types/angular-block-ui/index.d.ts b/types/angular-block-ui/index.d.ts
index f415d386e9..f0dcdcd076 100644
--- a/types/angular-block-ui/index.d.ts
+++ b/types/angular-block-ui/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for angular-block-ui 0.2
 // Project: https://github.com/McNull/angular-block-ui
-// Definitions by: Lasse Nørregaard <https://github.com/lassebn>, Stephan Classen <https://github.com/sclassen>
+// Definitions by: Lasse Nørregaard <https://github.com/lassebn>, Stephan Classen <https://github.com/sclassen>, Soner Köksal <https://github.com/renjfk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -164,6 +164,12 @@ declare module 'angular' {
              * Returns whether currently a block is shown for the instance or not.
              */
             isBlocking(): boolean;
+
+            instances: BlockUIInstances;
+        }
+
+        interface BlockUIInstances {
+            get(id: string): BlockUIService;
         }
     }
 }
diff --git a/types/angular-desktop-notification/index.d.ts b/types/angular-desktop-notification/index.d.ts
index 6281396b66..2e017da49b 100644
--- a/types/angular-desktop-notification/index.d.ts
+++ b/types/angular-desktop-notification/index.d.ts
@@ -22,7 +22,7 @@ declare module 'angular' {
              * This is an experimental technology
              * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/badge
              */
-            badge?: USVString;
+            badge?: string;
 
             /**
              * The data read-only property of the Notification interface returns a structured clone of the notification's data,
@@ -40,7 +40,7 @@ declare module 'angular' {
              * Note: This feature is available in Web Workers.
              * Ref: https://developer.mozilla.org/en-US/docs/Web/API/Notification/image
              */
-            image?: USVString;
+            image?: string;
 
             /**
              * The renotify read-only property of the Notification interface specifies whether the user should be notified after a
diff --git a/types/angular-gettext/angular-gettext-tests.ts b/types/angular-gettext/angular-gettext-tests.ts
index 766b16a963..1b1d5b6342 100644
--- a/types/angular-gettext/angular-gettext-tests.ts
+++ b/types/angular-gettext/angular-gettext-tests.ts
@@ -24,6 +24,8 @@ angular.module("myApp").controller("helloController", function (gettextCatalog:
 
 angular.module("myApp").controller("helloController", function (gettextCatalog: angular.gettext.gettextCatalog) {
   var myString2: string = gettextCatalog.getPlural(3, "Bird", "Birds");
+  var myStringWithScope: string = gettextCatalog.getPlural(4, "{{color}} Bird", "{{color}} Birds", {color: 'Blue'});
+  var myStringWithContext: string = gettextCatalog.getPlural(5, "pick", "picks", null, 'noun');
 });
 
 angular.module("myApp").controller("helloController", function (gettextCatalog: angular.gettext.gettextCatalog) {
diff --git a/types/angular-gettext/index.d.ts b/types/angular-gettext/index.d.ts
index 5b6eb1d90f..6b5fe29e73 100644
--- a/types/angular-gettext/index.d.ts
+++ b/types/angular-gettext/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for angular-gettext v2.1.0
+// Type definitions for angular-gettext v2.1.1
 // Project: https://angular-gettext.rocketeer.be/
 // Definitions by: Ákos Lukács <https://github.com/AkosLukacs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -66,7 +66,7 @@ declare module 'angular' {
       getString(string: string, scope?: any, context?: string): string;
 
       /** Translate a plural string with the given context. */
-      getPlural(n: number, string: string, stringPlural: string, context?: any): string;
+      getPlural(n: number, string: string, stringPlural: string, scope?: any, context?: string): string;
 
       /** Load a set of translation strings from a given URL.This should be a JSON catalog generated with grunt-angular-gettext. More details https://angular-gettext.rocketeer.be/dev-guide/lazy-loading/ */
       loadRemote(url: string): ng.IHttpPromise<any>;
diff --git a/types/angular-mocks/angular-mocks-tests.ts b/types/angular-mocks/angular-mocks-tests.ts
index f04c9a2a30..662d75c079 100644
--- a/types/angular-mocks/angular-mocks-tests.ts
+++ b/types/angular-mocks/angular-mocks-tests.ts
@@ -87,7 +87,6 @@ timeoutService.verifyNoPendingTasks();
 let intervalService: ng.IIntervalService;
 let intervalServiceTimeActuallyAdvanced: number;
 
-intervalServiceTimeActuallyAdvanced = intervalService.flush();
 intervalServiceTimeActuallyAdvanced = intervalService.flush(1234);
 
 ///////////////////////////////////////
@@ -1509,12 +1508,30 @@ requestHandler.respond(expectedData);
 requestHandler.respond({ key: 'value' });
 requestHandler.respond({ key: 'value' }, { header: 'value' });
 requestHandler.respond({ key: 'value' }, { header: 'value' }, 'responseText');
+requestHandler.respond(404);
 requestHandler.respond(404, 'data');
 requestHandler.respond(404, 'data').respond({});
 requestHandler.respond(404, { key: 'value' });
 requestHandler.respond(404, { key: 'value' }, { header: 'value' });
 requestHandler.respond(404, { key: 'value' }, { header: 'value' }, 'responseText');
 
+///////////////////////////////////////
+// IFlushPendingTasksService
+///////////////////////////////////////
+let $flushPendingTasks: ng.IFlushPendingTasksService;
+$flushPendingTasks();
+$flushPendingTasks(42);
+
+///////////////////////////////////////
+// IVerifyNoPendingTasksService
+///////////////////////////////////////
+let $verifyNoPendingTasks: ng.IVerifyNoPendingTasksService;
+$verifyNoPendingTasks();
+$verifyNoPendingTasks('task type');
+
+///////////////////////////////////////
+// browserTrigger
+///////////////////////////////////////
 browserTrigger(document.body, 'click');
 browserTrigger(angular.element(document.body), 'click');
 browserTrigger(angular.element(document.body), 'click', { which: 1, keys: ['ctrl'] });
diff --git a/types/angular-mocks/index.d.ts b/types/angular-mocks/index.d.ts
index c652443eac..a2aa4fe29e 100644
--- a/types/angular-mocks/index.d.ts
+++ b/types/angular-mocks/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for Angular JS (ngMock, ngMockE2E module) 1.6
+// Type definitions for Angular JS (ngMock, ngMockE2E module) 1.7
 // Project: http://angularjs.org
-// Definitions by: Diego Vilar <https://github.com/diegovilar>, Tony Curtis <https://github.com/daltin>
+// Definitions by: Diego Vilar <https://github.com/diegovilar>
+//                 Tony Curtis <https://github.com/daltin>
+//                 Georgii Dolzhykov <https://github.com/thorn0>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -59,7 +61,38 @@ declare module 'angular' {
   // Augments the original service
   ///////////////////////////////////////////////////////////////////////////
   interface ITimeoutService {
+    /**
+     * **Deprecated** since version 1.7.3. (Use `$flushPendingTasks` instead.)
+     *
+     * ---
+     * Flushes the queue of pending tasks.
+     *
+     * _This method is essentially an alias of `$flushPendingTasks`._
+     *
+     * > For historical reasons, this method will also flush non-`$timeout` pending tasks, such as
+     * > `$q` promises and tasks scheduled via `$applyAsync` and `$evalAsync`.
+     *
+     * @param delay - The maximum timeout amount to flush up until.
+     */
     flush(delay?: number): void;
+
+    /**
+     * **Deprecated** since version 1.7.3. (Use `$verifyNoPendingTasks` instead.)
+     *
+     * ---
+     * Verifies that there are no pending tasks that need to be flushed. It throws an error if there
+     * are still pending tasks.
+     *
+     * _This method is essentially an alias of `$verifyNoPendingTasks` (called with no arguments)._
+     *
+     * > For historical reasons, this method will also verify non-`$timeout` pending tasks, such as
+     * > pending `$http` requests, in-progress `$route` transitions, unresolved `$q` promises and
+     * > tasks scheduled via `$applyAsync` and `$evalAsync`.
+     * >
+     * > It is recommended to use `$verifyNoPendingTasks` instead, which additionally supports
+     * > verifying a specific type of tasks. For example, you can verify there are no pending
+     * > timeouts with `$verifyNoPendingTasks('$timeout')`.
+     */
     verifyNoPendingTasks(): void;
   }
 
@@ -69,7 +102,13 @@ declare module 'angular' {
   // Augments the original service
   ///////////////////////////////////////////////////////////////////////////
   interface IIntervalService {
-    flush(millis?: number): number;
+    /**
+     * Runs interval tasks scheduled to be run in the next `millis` milliseconds.
+     *
+     * @param millis - The maximum timeout amount to flush up until.
+     * @return The amount of time moved forward.
+     */
+    flush(millis: number): number;
   }
 
   ///////////////////////////////////////////////////////////////////////////
@@ -413,6 +452,65 @@ declare module 'angular' {
     whenRoute(method: string, url: string): mock.IRequestHandler;
   }
 
+  ///////////////////////////////////////////////////////////////////////////
+  // FlushPendingTasksService
+  // see https://docs.angularjs.org/api/ngMock/service/$flushPendingTasks
+  ///////////////////////////////////////////////////////////////////////////
+  interface IFlushPendingTasksService {
+    /**
+     * Flushes all currently pending tasks and executes the corresponding callbacks.
+     *
+     * Optionally, you can also pass a `delay` argument to only flush tasks that are scheduled to be
+     * executed within `delay` milliseconds. Currently, `delay` only applies to timeouts, since all
+     * other tasks have a delay of 0 (i.e. they are scheduled to be executed as soon as possible, but
+     * still asynchronously).
+     *
+     * If no delay is specified, it uses a delay such that all currently pending tasks are flushed.
+     *
+     * The types of tasks that are flushed include:
+     *
+     * - Pending timeouts (via `$timeout`).
+     * - Pending tasks scheduled via `$applyAsync`.
+     * - Pending tasks scheduled via `$evalAsync`.
+     *   These include tasks scheduled via `$evalAsync()` indirectly (such as `$q` promises).
+     *
+     * > Periodic tasks scheduled via `$interval` use a different queue and are not flushed by
+     * > `$flushPendingTasks()`. Use `$interval.flush(millis)` instead.
+     *
+     * @param millis - The number of milliseconds to flush.
+     */
+    (delay?: number): void;
+  }
+
+  ///////////////////////////////////////////////////////////////////////////
+  // VerifyNoPendingTasksService
+  // see https://docs.angularjs.org/api/ngMock/service/$verifyNoPendingTasks
+  ///////////////////////////////////////////////////////////////////////////
+  interface IVerifyNoPendingTasksService {
+    /**
+     * Verifies that there are no pending tasks that need to be flushed. It throws an error if there
+     * are still pending tasks.
+     *
+     * You can check for a specific type of tasks only, by specifying a `taskType`.
+     *
+     * Available task types:
+     *
+     * - `$timeout`: Pending timeouts (via `$timeout`).
+     * - `$http`: Pending HTTP requests (via `$http`).
+     * - `$route`: In-progress route transitions (via `$route`).
+     * - `$applyAsync`: Pending tasks scheduled via `$applyAsync`.
+     * - `$evalAsync`: Pending tasks scheduled via `$evalAsync`.
+     *   These include tasks scheduled via `$evalAsync()` indirectly (such as `$q` promises).
+     *
+     * > Periodic tasks scheduled via `$interval` use a different queue and are not taken into
+     * > account by `$verifyNoPendingTasks()`. There is currently no way to verify that there are no
+     * > pending `$interval` tasks.
+     *
+     * @param taskType - The type of tasks to check for.
+     */
+    (taskType?: string): void;
+  }
+
   ///////////////////////////////////////////////////////////////////////////
   // AnimateService
   // see https://docs.angularjs.org/api/ngMock/service/$animate
@@ -464,7 +562,7 @@ declare module 'angular' {
        */
       respond(
         status: number,
-        data: string | object,
+        data?: string | object,
         headers?: IHttpHeaders,
         responseText?: string
       ): IRequestHandler;
@@ -513,6 +611,11 @@ declare module 'angular' {
        * for keyboard events (keydown, keypress, and keyup).
        */
       charcode?: number;
+      /**
+       * [data](https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent/data) for
+       * [CompositionEvents](https://developer.mozilla.org/en-US/docs/Web/API/CompositionEvent).
+       */
+      data?: string;
       /**
        * The elapsedTime for
        * [TransitionEvent](https://developer.mozilla.org/docs/Web/API/TransitionEvent)
@@ -566,10 +669,11 @@ declare global {
    * This is a global (window) function that is only available when the `ngMock` module is included.
    * It can be used to trigger a native browser event on an element, which is useful for unit testing.
    *
-   * @param element Either a wrapped jQuery/jqLite node or a DOM element
-   * @param eventType Optional event type. If none is specified, the function tries to determine
-   * the right event type for the element, e.g. `change` for `input[text]`.
-   * @param eventData An optional object which contains additional event data used when creating the event.
+   * @param element Either a wrapped jQuery/jqLite node or a DOM element.
+   * @param eventType Optional event type. If none is specified, the function tries to determine the
+   *     right event type for the element, e.g. `change` for `input[text]`.
+   * @param eventData An optional object which contains additional event data used when creating the
+   *     event.
    */
   function browserTrigger(
     element: JQuery | Element,
diff --git a/types/angular-q-extras/angular-q-extras-tests.ts b/types/angular-q-extras/angular-q-extras-tests.ts
new file mode 100644
index 0000000000..0832b6dae0
--- /dev/null
+++ b/types/angular-q-extras/angular-q-extras-tests.ts
@@ -0,0 +1,34 @@
+interface MyService {
+    getFirstname(): ng.IPromise<string>;
+    getLastname(): ng.IPromise<string>;
+}
+
+function TestCtrl($q: ng.IQService, MyService: MyService) {
+    function arrayCallback(result: [ng.PromiseValue<string>, ng.PromiseValue<string>]) {
+        const firstnameOk: boolean = $q.isFulfilledState(result[0]);
+        const lastnameOk: boolean = $q.isFulfilledState(result[1]);
+    }
+
+    function objectCallback(result: {firstname: ng.PromiseValue<string>, lastname: ng.PromiseValue<string>}) {
+      const firstnameOk: boolean = $q.isFulfilledState(result.firstname);
+      const lastnameOk: boolean = $q.isFulfilledState(result.lastname);
+    }
+
+    $q
+        .allSettled([
+            MyService.getFirstname(),
+            MyService.getLastname()
+        ])
+        .then(arrayCallback);
+
+    $q
+        .allSettled({
+            firstname: MyService.getFirstname(),
+            lastname: MyService.getLastname()
+        })
+        .then(objectCallback);
+}
+
+TestCtrl.$inject = ['$q', 'MyService'];
+
+angular.module('test').controller('TestCtrl', TestCtrl);
diff --git a/types/angular-q-extras/index.d.ts b/types/angular-q-extras/index.d.ts
new file mode 100644
index 0000000000..f73724ab43
--- /dev/null
+++ b/types/angular-q-extras/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for angular-q-extras 1.1
+// Project: https://github.com/niqdev/angular-q-extras
+// Definitions by: Damien Sorel <https://github.com/mistic100>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare var _: string;
+export = _;
+
+import * as angular from 'angular';
+
+declare module 'angular' {
+    type PromiseState = 'fulfilled' | 'rejected';
+
+    interface PromiseValue<T> {
+        state: PromiseState;
+        value?: T;
+        reason?: any;
+    }
+
+    // tslint:disable-next-line interface-name
+    interface IQService {
+        // tslint:disable:max-line-length
+        allSettled<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>, T9 | IPromise<T9>, T10 | IPromise<T10>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>, PromiseValue<T5>, PromiseValue<T6>, PromiseValue<T7>, PromiseValue<T8>, PromiseValue<T9>, PromiseValue<T10>]>;
+        allSettled<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>, T9 | IPromise<T9>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>, PromiseValue<T5>, PromiseValue<T6>, PromiseValue<T7>, PromiseValue<T8>, PromiseValue<T9>]>;
+        allSettled<T1, T2, T3, T4, T5, T6, T7, T8>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>, T8 | IPromise<T8>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>, PromiseValue<T5>, PromiseValue<T6>, PromiseValue<T7>, PromiseValue<T8>]>;
+        allSettled<T1, T2, T3, T4, T5, T6, T7>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>, T5 | IPromise<T5>, T6 | IPromise<T6>, T7 | IPromise<T7>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>, PromiseValue<T5>, PromiseValue<T6>, PromiseValue<T7>]>;
+        allSettled<T1, T2, T3, T4, T5, T6>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>, T5 | IPromise<T5>, T6 | IPromise<T6>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>, PromiseValue<T5>, PromiseValue<T6>]>;
+        allSettled<T1, T2, T3, T4, T5>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>, T5 | IPromise<T5>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>, PromiseValue<T5>]>;
+        allSettled<T1, T2, T3, T4>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>, T4 | IPromise<T4>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>, PromiseValue<T4>]>;
+        allSettled<T1, T2, T3>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>, T3 | IPromise<T3>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>, PromiseValue<T3>]>;
+        allSettled<T1, T2>(values: [T1 | IPromise<T1>, T2 | IPromise<T2>]): IPromise<[PromiseValue<T1>, PromiseValue<T2>]>;
+        // tslint:enable:max-line-length
+
+        allSettled<TAll>(promises: Array<TAll | IPromise<TAll>>): IPromise<Array<PromiseValue<TAll>>>;
+
+        allSettled<T>(promises: { [K in keyof T]: (T[K] | IPromise<T[K]>); }): IPromise<{ [K in keyof T]: PromiseValue<T[K]>; }>;
+
+        isFulfilledState(promise: PromiseValue<any>): boolean;
+        isRejectedState(promise: PromiseValue<any>): boolean;
+    }
+}
diff --git a/types/angular-q-extras/tsconfig.json b/types/angular-q-extras/tsconfig.json
new file mode 100644
index 0000000000..3047a809eb
--- /dev/null
+++ b/types/angular-q-extras/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "files": [
+        "index.d.ts",
+        "angular-q-extras-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/angular-q-extras/tslint.json b/types/angular-q-extras/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/angular-q-extras/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/angular-route/angular-route-tests.ts b/types/angular-route/angular-route-tests.ts
index 677c1589ed..e1e7bd43fd 100644
--- a/types/angular-route/angular-route-tests.ts
+++ b/types/angular-route/angular-route-tests.ts
@@ -39,6 +39,21 @@ $routeProvider
             return "I return a string"
         }
     })
+    .when('/projects/:projectId/dashboard6', {
+        resolve: {
+            foo: () => 'foo',
+            bar: () => 'bar',
+        },
+        resolveAs: 'baz',
+        resolveRedirectTo: [
+            '$http',
+            ($http: ng.IHttpService) => $http.get('/is-admin').then(() => '/admin/lounge', () => undefined),
+        ],
+    })
+    .when('/projects/:projectId/dashboard7', {
+        reloadOnUrl: false,
+        resolveRedirectTo: () => (Math.random() < 0.5) ? '/some/route' : undefined,
+    })
     .otherwise({ redirectTo: '/' })
     .otherwise({ redirectTo: ($routeParams?: ng.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any) => "" })
     .otherwise("/");
diff --git a/types/angular-route/index.d.ts b/types/angular-route/index.d.ts
index 56bd3f2263..15529f1572 100644
--- a/types/angular-route/index.d.ts
+++ b/types/angular-route/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for Angular JS (ngRoute module) 1.3
+// Type definitions for Angular JS (ngRoute module) 1.7
 // Project: http://angularjs.org
 // Definitions by: Jonathan Park <https://github.com/park9140>
+//                 George Kalpakas <https://github.com/gkalpak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -52,7 +53,7 @@ declare module 'angular' {
          */
         interface IRoute {
             /**
-             * {(string|function()=}
+             * {(string|Function)=}
              * Controller fn that should be associated with newly created scope or the name of a registered controller if passed as a string.
              */
             controller?: string | InlineAnnotatedFunction;
@@ -61,56 +62,122 @@ declare module 'angular' {
              */
             controllerAs?: string;
             /**
-             * Undocumented?
-             */
-            name?: string;
-            /**
-             * {string=|function()=}
+             * {(string|Function)=}
              * Html template as a string or a function that returns an html template as a string which should be used by ngView or ngInclude directives. This property takes precedence over templateUrl.
              *
              * If template is a function, it will be called with the following parameters:
              *
              * {Array.<Object>} - route parameters extracted from the current $location.path() by applying the current route
              */
-            template?: string | { ($routeParams?: angular.route.IRouteParamsService): string; }
+            template?: string | { ($routeParams?: IRouteParamsService): string; }
             /**
-             * {string=|function()=}
+             * {(string|Function)=}
              * Path or function that returns a path to an html template that should be used by ngView.
              *
              * If templateUrl is a function, it will be called with the following parameters:
              *
              * {Array.<Object>} - route parameters extracted from the current $location.path() by applying the current route
              */
-            templateUrl?: string | { ($routeParams?: angular.route.IRouteParamsService): string; }
+            templateUrl?: string | { ($routeParams?: IRouteParamsService): string; }
             /**
-             * {Object.<string, function>=} - An optional map of dependencies which should be injected into the controller. If any of these dependencies are promises, the router will wait for them all to be resolved or one to be rejected before the controller is instantiated. If all the promises are resolved successfully, the values of the resolved promises are injected and $routeChangeSuccess event is fired. If any of the promises are rejected the $routeChangeError event is fired. The map object is:
+             * {Object.<string, Function>=}
+             * An optional map of dependencies which should be injected into the controller. If any of these
+             * dependencies are promises, the router will wait for them all to be resolved or one to be rejected before
+             * the controller is instantiated.
+             * If all the promises are resolved successfully, the values of the resolved promises are injected and
+             * `$routeChangeSuccess` event is fired. If any of the promises are rejected the `$routeChangeError` event
+             * is fired.
+             * For easier access to the resolved dependencies from the template, the `resolve` map will be available on
+             * the scope of the route, under `$resolve` (by default) or a custom name specified by the `resolveAs`
+             * property (see below). This can be particularly useful, when working with components as route templates.
              *
-             * - key - {string}: a name of a dependency to be injected into the controller.
-             * - factory - {string|function}: If string then it is an alias for a service. Otherwise if function, then it is injected and the return value is treated as the dependency. If the result is a promise, it is resolved before its value is injected into the controller. Be aware that ngRoute.$routeParams will still refer to the previous route within these resolve functions. Use $route.current.params to access the new route parameters, instead.
+             * > **Note:** If your scope already contains a property with this name, it will be hidden or overwritten.
+             * > Make sure, you specify an appropriate name for this property, that does not collide with other
+             * > properties on the scope.
+             *
+             * The map object is:
+             *
+             * - `key` – `{string}`: a name of a dependency to be injected into the controller.
+             * - `factory` - `{string|Function}`: If `string` then it is an alias for a service. Otherwise if function,
+             *   then it is called with `$injector#invoke()` and the return value is treated as the dependency. If the
+             *   result is a promise, it is resolved before its value is injected into the controller. Be aware that
+             *   `ngRoute.$routeParams` will still refer to the previous route within these resolve functions.  Use
+             *   `$route.current.params` to access the new route parameters, instead.
              */
             resolve?: { [key: string]: any };
             /**
-             * {(string|function())=}
-             * Value to update $location path with and trigger route redirection.
-             *
-             * If redirectTo is a function, it will be called with the following parameters:
-             *
-             * - {Object.<string>} - route parameters extracted from the current $location.path() by applying the current route templateUrl.
-             * - {string} - current $location.path()
-             * - {Object} - current $location.search()
-             * - The custom redirectTo function is expected to return a string which will be used to update $location.path() and $location.search().
+             * {string=}
+             * The name under which the `resolve` map will be available on the scope of the route. If omitted, defaults
+             * to `$resolve`.
              */
-            redirectTo?: string | { ($routeParams?: angular.route.IRouteParamsService, $locationPath?: string, $locationSearch?: any): string };
+            resolveAs?: string;
             /**
-             * Reload route when only $location.search() or $location.hash() changes.
+             * {(string|Function)=}
+             * Value to update `$location` path with and trigger route redirection.
              *
-             * This option defaults to true. If the option is set to false and url in the browser changes, then $routeUpdate event is broadcasted on the root scope.
+             * If `redirectTo` is a function, it will be called with the following parameters:
+             *
+             * - `{Object.<string>}` - route parameters extracted from the current `$location.path()` by applying the
+             *   current route templateUrl.
+             * - `{string}` - current `$location.path()`
+             * - `{Object}` - current `$location.search()`
+             *
+             * The custom `redirectTo` function is expected to return a string which will be used to update
+             * `$location.url()`. If the function throws an error, no further processing will take place and the
+             * `$routeChangeError` event will be fired.
+             *
+             * Routes that specify `redirectTo` will not have their controllers, template functions or resolves called,
+             * the `$location` will be changed to the redirect url and route processing will stop. The exception to this
+             * is if the `redirectTo` is a function that returns `undefined`. In this case the route transition occurs
+             * as though there was no redirection.
+             */
+            redirectTo?: string | { ($routeParams?: IRouteParamsService, $locationPath?: string, $locationSearch?: any): string };
+            /**
+             * {Function=}
+             * A function that will (eventually) return the value to update `$location` URL with and trigger route
+             * redirection. In contrast to `redirectTo`, dependencies can be injected into `resolveRedirectTo` and the
+             * return value can be either a string or a promise that will be resolved to a string.
+             *
+             * Similar to `redirectTo`, if the return value is `undefined` (or a promise that gets resolved to
+             * `undefined`), no redirection takes place and the route transition occurs as though there was no
+             * redirection.
+             *
+             * If the function throws an error or the returned promise gets rejected, no further processing will take
+             * place and the `$routeChangeError` event will be fired.
+             *
+             * `redirectTo` takes precedence over `resolveRedirectTo`, so specifying both on the same route definition,
+             * will cause the latter to be ignored.
+             */
+            resolveRedirectTo?: angular.Injectable<(...deps: any[]) => angular.IPromise<string | undefined> | string | undefined>;
+            /**
+             * {boolean=true}
+             * Reload route when any part of the URL changes (including the path) even if the new URL maps to the same
+             * route.
+             *
+             * If the option is set to `false` and the URL in the browser changes, but the new URL maps to the same
+             * route, then a `$routeUpdate` event is broadcasted on the root scope (without reloading the route).
+             *
+             * Defaults to `true`.
+             */
+            reloadOnUrl?: boolean;
+            /**
+             * {boolean=true}
+             * Reload route when only `$location.search()` or `$location.hash()` changes.
+             *
+             * If the option is set to `false` and the URL in the browser changes, then a `$routeUpdate` event is
+             * broadcasted on the root scope (without reloading the route).
+             *
+             * > Note: This option has no effect if `reloadOnUrl` is set to `false`.
+             *
+             * Defaults to `true`.
              */
             reloadOnSearch?: boolean;
             /**
-             * Match routes without being case sensitive
+             * {boolean=false}
+             * Match routes without being case sensitive.
+             * If the option is set to `true`, then the particular route can be matched without being case sensitive.
              *
-             * This option defaults to false. If the option is set to true, then the particular route can be matched without being case sensitive
+             * Defaults to `false`.
              */
             caseInsensitiveMatch?: boolean;
         }
diff --git a/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts b/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
index 9dbbf8e002..f21ee43ab3 100644
--- a/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
+++ b/types/angular-ui-bootstrap/angular-ui-bootstrap-tests.ts
@@ -57,6 +57,28 @@ testApp.config((
     /**
      * $datepickerPopupConfig tests
      */
+    $datepickerPopupConfig.datepickerMode = 'month';
+    $datepickerPopupConfig.formatDay = 'd';
+    $datepickerPopupConfig.formatDayHeader = 'E';
+    $datepickerPopupConfig.formatDayTitle = 'dd-MM-yyyy';
+    $datepickerPopupConfig.formatMonth = 'M';
+    $datepickerPopupConfig.formatMonthTitle = 'yy';
+    $datepickerPopupConfig.formatYear = 'y';
+    $datepickerPopupConfig.initDate = '1389586124979';
+    $datepickerPopupConfig.maxDate = '1389586124979';
+    $datepickerPopupConfig.maxMode = 'month';
+    $datepickerPopupConfig.minDate = '1389586124979';
+    $datepickerPopupConfig.minMode = 'month';
+    $datepickerPopupConfig.shortcutPropagation = true;
+    $datepickerPopupConfig.showWeeks = false;
+    $datepickerPopupConfig.startingDay = 1;
+    $datepickerPopupConfig.yearRange = 10;
+    $datepickerPopupConfig.monthColumns = 3;
+    $datepickerPopupConfig.yearColumns = 9;
+    $datepickerPopupConfig.yearRows = 6;
+    $datepickerPopupConfig.ngModelOptions.allowInvalid = false;
+    $datepickerPopupConfig.ngModelOptions.timezone = "EST";
+    $datepickerPopupConfig.ngModelOptions.updateOn = "click";
     $datepickerPopupConfig.altInputFormats = ["mm/dd/YYYY", "mm-dd-YY"];
     $datepickerPopupConfig.appendToBody = true;
     $datepickerPopupConfig.currentText = 'Select Today';
diff --git a/types/angular-ui-bootstrap/index.d.ts b/types/angular-ui-bootstrap/index.d.ts
index 0c41fcc15c..db08aae252 100644
--- a/types/angular-ui-bootstrap/index.d.ts
+++ b/types/angular-ui-bootstrap/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for Angular UI Bootstrap 0.13.3
 // Project: https://github.com/angular-ui/bootstrap
-// Definitions by: Brian Surowiec <https://github.com/xt0rted>, Ryan Southgate <https://github.com/ry8806>
+// Definitions by:  Brian Surowiec <https://github.com/xt0rted>,
+//                  Ryan Southgate <https://github.com/ry8806>
+//                  Alfie Johnson <https://github.com/alfiej>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -227,7 +229,7 @@ declare module 'angular' {
             customClass?: DatepickerCallback<string>;
         }
 
-        interface IDatepickerPopupConfig {
+        interface IDatepickerPopupConfig extends IDatepickerConfig {
 
             /**
              * A list of alternate formats acceptable for manual entry.
diff --git a/types/angular/angular-tests.ts b/types/angular/angular-tests.ts
index 1dff1a0451..44f8539af2 100644
--- a/types/angular/angular-tests.ts
+++ b/types/angular/angular-tests.ts
@@ -214,11 +214,18 @@ mod.factory({
     name1(foo: any) {},
     name2: ['foo', (foo: any) => {}]
 });
-mod.filter('name', ($scope: ng.IScope) => {});
-mod.filter('name', ['$scope', ($scope: ng.IScope) => {}]);
+mod.filter('name', ($scope: ng.IScope) => () => {});
+mod.filter('name', ['$scope', ($scope: ng.IScope) => () => {}]);
 mod.filter({
-    name1(foo: any) {},
-    name2: ['foo', (foo: any) => {}]
+    name1(foo: any) { return () => {}; },
+    name2: ['foo', (foo: any) => () => {}],
+});
+const customStatefulFilter: ng.IFilterFunction = (s) => 1;
+mod.filter('name', () => customStatefulFilter);
+mod.filter('name', ['$scope', () => customStatefulFilter]);
+mod.filter({
+    name1: () => customStatefulFilter,
+    name2: ['foo', () => customStatefulFilter],
 });
 mod.provider('name', ($scope: ng.IScope) => ({ $get: () => { } }));
 mod.provider('name', TestProvider);
@@ -304,8 +311,10 @@ namespace TestQ {
     }
     const abcObject: AbcObject = null;
     const abcObjectPromise: angular.IPromise<AbcObject> = null;
+    const abcObjectPromiseLike: PromiseLike<AbcObject> = null;
     const efObject: EfObject = null;
     const efObjectPromise: angular.IPromise<EfObject> = null;
+    const efObjectPromiseLike: PromiseLike<EfObject> = null;
     const ghObject: GhObject = null;
     const ghObjectPromise: angular.IPromise<GhObject> = null;
 
@@ -397,6 +406,7 @@ namespace TestQ {
 
         result = $q.when<AbcObject>(abcObject);
         result = $q.when<AbcObject>(abcObjectPromise);
+        result = $q.when<AbcObject>(abcObjectPromiseLike);
 
         result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObject);
         result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObject, (any) => any);
@@ -409,10 +419,21 @@ namespace TestQ {
         resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromise, (result: EfObject) => abcObject, (any) => ghObjectPromise);
         resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromise, (result: EfObject) => abcObject, (any) => ghObjectPromise, (any) => any);
 
+        result = $q.when<AbcObject, EfObject>(efObjectPromiseLike, (result: EfObject) => abcObject);
+        resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromiseLike, (result: EfObject) => abcObject, (any) => ghObject);
+        resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromiseLike, (result: EfObject) => abcObject, (any) => ghObject);
+        resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromiseLike, (result: EfObject) => abcObject, (any) => ghObject, (any) => any);
+        resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromiseLike, (result: EfObject) => abcObject, (any) => ghObjectPromise);
+        resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromiseLike, (result: EfObject) => abcObject, (any) => ghObjectPromise, (any) => any);
+
         result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObjectPromise);
         result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObjectPromise, (any) => any);
         result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObjectPromise, (any) => any, (any) => any);
 
+        result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObjectPromiseLike);
+        result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObjectPromiseLike, (any) => any);
+        result = $q.when<AbcObject, EfObject>(efObject, (result: EfObject) => abcObjectPromiseLike, (any) => any, (any) => any);
+
         result = $q.when<AbcObject, EfObject>(efObjectPromise, (result: EfObject) => abcObjectPromise);
         resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromise, (result: EfObject) => abcObjectPromise, (any) => ghObject);
         resultOther = $q.when<AbcObject, GhObject, EfObject>(efObjectPromise, (result: EfObject) => abcObjectPromise, (any) => ghObject, (any) => any);
@@ -513,6 +534,20 @@ namespace TestInjector {
         anyResult = $injector.invoke(inlineAnnotatedFunction, 'anyContext');
         anyResult = $injector.invoke(inlineAnnotatedFunction, undefined, 'anyLocals');
     }
+
+    // $injector.loadNewModules
+    {
+        const inlineAnnotatedFunction: any[] = [false, (v: boolean) => {}];
+        const modA = angular.module('$injector.moduleA', []);
+        $injector.loadNewModules([modA]);
+        $injector.loadNewModules([modA.name]);
+        $injector.loadNewModules([inlineAnnotatedFunction]);
+    }
+
+    // $injector.modules
+    {
+        const module: angular.IModule = $injector.modules['$injector.module'];
+    }
 }
 
 // Promise signature tests
@@ -710,11 +745,12 @@ function test_angular_forEach() {
         this.push(`${key}: ${value}`);
     }, log);
     // expect(log).toEqual(['name: misko', 'gender: male']);
-    // $ExpectType NodeListOf<HTMLImageElement>
-    angular.forEach(document.getElementsByTagName('img'), (value, key, obj) => {
+    // TODO: Set minimum version to ts3.1 where this is always HTMLCollectionOf
+    type Collection = NodeListOf<HTMLImageElement> | HTMLCollectionOf<HTMLImageElement>;
+    const collection: Collection = angular.forEach(document.getElementsByTagName('img'), (value, key, obj) => {
         value; // $ExpectType HTMLImageElement
         key; // $ExpectType number
-        obj; // $ExpectType NodeListOf<HTMLImageElement>
+        const collection: Collection = obj;
     });
     // $ExpectType number[]
     angular.forEach([1, 2, 3], (value, key, obj) => {
diff --git a/types/angular/index.d.ts b/types/angular/index.d.ts
index 6b82a2bcb4..99977b57b5 100644
--- a/types/angular/index.d.ts
+++ b/types/angular/index.d.ts
@@ -250,8 +250,8 @@ declare namespace angular {
          */
         factory(name: string, $getFn: Injectable<Function>): IModule;
         factory(object: {[name: string]: Injectable<Function>}): IModule;
-        filter(name: string, filterFactoryFunction: Injectable<Function>): IModule;
-        filter(object: {[name: string]: Injectable<Function>}): IModule;
+        filter(name: string, filterFactoryFunction: Injectable<FilterFactory>): IModule;
+        filter(object: {[name: string]: Injectable<FilterFactory>}): IModule;
         provider(name: string, serviceProviderFactory: IServiceProviderFactory): IModule;
         provider(name: string, serviceProviderConstructor: IServiceProviderClass): IModule;
         provider(name: string, inlineAnnotatedConstructor: any[]): IModule;
@@ -1137,12 +1137,12 @@ declare namespace angular {
          *
          * @param value Value or a promise
          */
-        resolve<T>(value: IPromise<T>|T): IPromise<T>;
+        resolve<T>(value: PromiseLike<T>|T): IPromise<T>;
         /**
          * @deprecated Since TS 2.4, inference is stricter and no longer produces the desired type when T1 !== T2.
          * To use resolve with two different types, pass a union type to the single-type-argument overload.
          */
-        resolve<T1, T2>(value: IPromise<T1>|T2): IPromise<T1|T2>;
+        resolve<T1, T2>(value: PromiseLike<T1>|T2): IPromise<T1|T2>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
          */
@@ -1152,11 +1152,11 @@ declare namespace angular {
          *
          * @param value Value or a promise
          */
-        when<T>(value: IPromise<T>|T): IPromise<T>;
-        when<T1, T2>(value: IPromise<T1>|T2): IPromise<T1|T2>;
-        when<TResult, T>(value: IPromise<T>|T, successCallback: (promiseValue: T) => IPromise<TResult>|TResult): IPromise<TResult>;
-        when<TResult, T>(value: T, successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback: null | undefined | ((reason: any) => any), notifyCallback?: (state: any) => any): IPromise<TResult>;
-        when<TResult, TResult2, T>(value: IPromise<T>, successCallback: (promiseValue: T) => IPromise<TResult>|TResult, errorCallback: (reason: any) => TResult2 | IPromise<TResult2>, notifyCallback?: (state: any) => any): IPromise<TResult | TResult2>;
+        when<T>(value: PromiseLike<T>|T): IPromise<T>;
+        when<T1, T2>(value: PromiseLike<T1>|T2): IPromise<T1|T2>;
+        when<TResult, T>(value: PromiseLike<T>|T, successCallback: (promiseValue: T) => PromiseLike<TResult>|TResult): IPromise<TResult>;
+        when<TResult, T>(value: T, successCallback: (promiseValue: T) => PromiseLike<TResult>|TResult, errorCallback: null | undefined | ((reason: any) => any), notifyCallback?: (state: any) => any): IPromise<TResult>;
+        when<TResult, TResult2, T>(value: PromiseLike<T>, successCallback: (promiseValue: T) => PromiseLike<TResult>|TResult, errorCallback: (reason: any) => TResult2 | PromiseLike<TResult2>, notifyCallback?: (state: any) => any): IPromise<TResult | TResult2>;
         /**
          * Wraps an object that might be a value or a (3rd party) then-able promise into a $q promise. This is useful when you are dealing with an object that might or might not be a promise, or if the promise comes from a source that can't be trusted.
          */
@@ -2183,6 +2183,14 @@ declare namespace angular {
             has(name: string): boolean;
             instantiate<T>(typeConstructor: {new(...args: any[]): T}, locals?: any): T;
             invoke<T = any>(func: Injectable<Function | ((...args: any[]) => T)>, context?: any, locals?: any): T;
+            /**
+             * Add the specified modules to the current injector.
+             * This method will add each of the injectables to the injector and execute all of the config and run blocks for each module passed to the method.
+             * @param modules A module, module name or annotated injection function.
+             */
+            loadNewModules(modules: Array<IModule|string|Injectable<(...args: any[]) => void>>): void;
+            /** An object map of all the modules that have been loaded into the injector. */
+            modules: {[moduleName: string]: IModule};
             strictDi: boolean;
         }
 
@@ -2237,4 +2245,13 @@ declare namespace angular {
     interface IHttpParamSerializer {
         (obj: Object): string;
     }
+
+    interface IFilterFunction extends Function {
+        /**
+         * By default, filters are only run once the input value changes. By marking the filter as `$stateful`, the filter will be run on every `$digest` to update the output. **This is strongly discouraged.**
+         * See https://docs.angularjs.org/guide/filter#stateful-filters
+         */
+        $stateful?: boolean;
+    }
+    type FilterFactory = (...I: any[]) => IFilterFunction;
 }
diff --git a/types/ansi-escape-sequences/ansi-escape-sequences-tests.ts b/types/ansi-escape-sequences/ansi-escape-sequences-tests.ts
new file mode 100644
index 0000000000..ae27a57146
--- /dev/null
+++ b/types/ansi-escape-sequences/ansi-escape-sequences-tests.ts
@@ -0,0 +1,50 @@
+import * as ansi from 'ansi-escape-sequences';
+
+// $ExpectType string
+ansi.style.red;
+// $ExpectError
+ansi.style.invalidStyle;
+
+// $ExpectType string
+ansi.styles('green');
+// $ExpectType string
+ansi.styles(['green', 'underline']);
+// $ExpectError
+ansi.styles('invalidStyle');
+// $ExpectError
+ansi.styles(['invalidStyle']);
+
+// $ExpectType string
+ansi.format('what?', 'green');
+// $ExpectType string
+ansi.format('what?', ['green', 'bold']);
+// $ExpectType string
+ansi.format('[green bold]{what?}');
+// $ExpectError
+ansi.styles('what?', 'invalidStyle');
+// $ExpectError
+ansi.styles('what?', ['invalidStyle']);
+
+// $ExpectType string
+ansi.cursor.up();
+// $ExpectType string
+ansi.cursor.up(1);
+
+// $ExpectType string
+ansi.cursor.hide;
+// $ExpectType string
+ansi.cursor.show;
+
+// $ExpectType string
+ansi.erase.display();
+// $ExpectType string
+ansi.erase.display(3);
+// $ExpectError
+ansi.erase.display(4);
+
+// $ExpectType string
+ansi.erase.inLine();
+// $ExpectType string
+ansi.erase.inLine(2);
+// $ExpectError
+ansi.erase.inLine(3);
diff --git a/types/ansi-escape-sequences/index.d.ts b/types/ansi-escape-sequences/index.d.ts
new file mode 100644
index 0000000000..437841aefa
--- /dev/null
+++ b/types/ansi-escape-sequences/index.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for ansi-escape-sequences 4.0
+// Project: https://github.com/75lb/ansi-escape-sequences#readme
+// Definitions by: Alexander Marks <https://github.com/aomarks>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export type Style = 'reset'|'bold'|'italic'|'underline'|'fontDefault'|'font2'|
+    'font3'|'font4'|'font5'|'font6'|'imageNegative'|'imagePositive'|'black'|
+    'red'|'green'|'yellow'|'blue'|'magenta'|'cyan'|'white'|'grey'|'gray'|
+    'bg-black'|'bg-red'|'bg-green'|'bg-yellow'|'bg-blue'|'bg-magenta'|'bg-cyan'|
+    'bg-white'|'bg-grey'|'bg-gray';
+
+/**
+ * Various formatting styles (aka Select Graphic Rendition codes).
+ *
+ * @example
+ * console.log(ansi.style.red + 'this is red' + ansi.style.reset)
+ */
+export const style: {[K in Style]: string};
+
+/**
+ * Returns an ansi sequence setting one or more effects.
+ *
+ * @param styles a style, or list or styles
+ *
+ * @example
+ * > ansi.styles('green')
+ * '\u001b[32m'
+ *
+ * > ansi.styles([ 'green', 'underline' ])
+ * '\u001b[32;4m'
+ */
+export function styles(styles: Style|ReadonlyArray<Style>): string;
+
+/**
+ * A convenience function, applying the provided styles to the input string and
+ * then resetting.
+ *
+ * Inline styling can be applied using the syntax `[style-list]{text to
+ * format}`, where `style-list` is a space-separated list of styles from {@link
+ * module:ansi-escape-sequences.style ansi.style}. For example `[bold white
+ * bg-red]{bold white text on a red background}`.
+ *
+ * @param str the string to format
+ * @param styles a style or list of styles to add to the input string
+ *
+ * @example
+ * > ansi.format('what?', 'green')
+ * '\u001b[32mwhat?\u001b[0m'
+ *
+ * > ansi.format('what?', ['green', 'bold'])
+ * '\u001b[32;1mwhat?\u001b[0m'
+ *
+ * > ansi.format('[green bold]{what?}')
+ * '\u001b[32;1mwhat?\u001b[0m'
+ */
+export function format(
+    str: string, styles?: Style|ReadonlyArray<Style>): string;
+
+/**
+ * cursor-related sequences
+ */
+export namespace cursor {
+    /**
+     * Moves the cursor `lines` cells up. If the cursor is already at the edge
+     * of the screen, this has no effect.
+     * @param lines default=1
+     */
+    function up(lines?: number): string;
+
+    /**
+     * Moves the cursor `lines` cells down. If the cursor is already at the edge
+     * of the screen, this has no effect.
+     * @param lines default=1
+     */
+    function down(lines?: number): string;
+
+    /**
+     * Moves the cursor `lines` cells forward. If the cursor is already at the
+     * edge of the screen, this has no effect.
+     * @param lines default=1
+     */
+    function forward(lines?: number): string;
+
+    /**
+     * Moves the cursor `lines` cells back. If the cursor is already at the edge
+     * of the screen, this has no effect.
+     * @param lines default=1
+     */
+    function back(lines?: number): string;
+
+    /**
+     * Moves cursor to beginning of the line n lines down.
+     * @param lines default=1
+     */
+    function nextLine(lines?: number): string;
+
+    /**
+     * Moves cursor to beginning of the line n lines up.
+     * @param lines default=1
+     */
+    function previousLine(lines?: number): string;
+
+    /**
+     * Moves the cursor to column n.
+     * @param n column number
+     */
+    function horizontalAbsolute(n: number): string;
+
+    /**
+     * Moves the cursor to row n, column m. The values are 1-based, and default
+     * to 1 (top left corner) if omitted.
+     *
+     * @param n row number, default=1
+     * @param m column number, default=1
+     */
+    function position(n?: number, m?: number): string;
+
+    /**
+     * Hides the cursor
+     */
+    const hide: string;
+
+    /**
+     * Shows the cursor
+     */
+    const show: string;
+}
+
+/**
+ * erase sequences
+ */
+export namespace erase {
+    /**
+     * Clears part of the screen. If n is 0 (or missing), clear from cursor to
+     * end of screen. If n is 1, clear from cursor to beginning of the screen.
+     * If n is 2, clear entire screen. If n is 3, clear entire screen and delete
+     * all lines saved in the scrollback buffer (some terminals only).
+     */
+    function display(n?: 0|1|2|3): string;
+
+    /**
+     * Erases part of the line. If n is zero (or missing), clear from cursor to
+     * the end of the line. If n is one, clear from cursor to beginning of the
+     * line. If n is two, clear entire line. Cursor position does not change.
+     */
+    function inLine(n?: 0|1|2): string;
+}
diff --git a/types/ansi-escape-sequences/tsconfig.json b/types/ansi-escape-sequences/tsconfig.json
new file mode 100644
index 0000000000..30d441bd70
--- /dev/null
+++ b/types/ansi-escape-sequences/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-escape-sequences-tests.ts"
+    ]
+}
diff --git a/types/ansi-escape-sequences/tslint.json b/types/ansi-escape-sequences/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ansi-escape-sequences/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/antlr4/BufferedTokenStream.d.ts b/types/antlr4/BufferedTokenStream.d.ts
new file mode 100644
index 0000000000..0efc73da2f
--- /dev/null
+++ b/types/antlr4/BufferedTokenStream.d.ts
@@ -0,0 +1,53 @@
+import { Token } from './Token';
+import { Interval } from './IntervalSet';
+
+export class BufferedTokenStream {
+    tokenSource: any;
+    tokens: Token[];
+    index: number;
+    fetchEOF: boolean;
+
+    mark(): number;
+
+    release(marker: number): number;
+
+    reset(): void;
+
+    seek(index: number): void;
+
+    get(index: number): Token;
+
+    consume(): void;
+
+    sync(i: number): boolean;
+
+    fetch(n: number): number;
+
+    getTokens(start: number, stop: number, types: any): Token[];
+
+    LA(i: number): any;
+
+    LB(k: number): Token;
+
+    LT(k: number): Token;
+
+    adjustSeekIndex(i: number): number;
+
+    lazyInit(): void;
+
+    setup(): void;
+
+    setTokenSource(tokenSource: any): void;
+
+    nextTokenOnChannel(i: number, channel: any): number;
+
+    previousTokenOnChannel(i: number, channel: any): number;
+
+    getHiddenTokensToRight(tokenIndex: number, channel: any): Token[];
+
+    getSourceName(): any;
+
+    getText(interval: Interval): any;
+
+    fill(): void;
+}
diff --git a/types/antlr4/CommonTokenStream.d.ts b/types/antlr4/CommonTokenStream.d.ts
new file mode 100644
index 0000000000..bc15162518
--- /dev/null
+++ b/types/antlr4/CommonTokenStream.d.ts
@@ -0,0 +1,15 @@
+import { BufferedTokenStream } from './BufferedTokenStream';
+import { Token } from './Token';
+import { Lexer } from './Lexer';
+
+export class CommonTokenStream extends BufferedTokenStream {
+    constructor(lexer: Lexer, channel?: any);
+
+    adjustSeekIndex(i: number): any;
+
+    LB(k: number): Token;
+
+    LT(k: number): Token;
+
+    getNumberOfOnChannelTokens(): number;
+}
diff --git a/types/antlr4/InputStream.d.ts b/types/antlr4/InputStream.d.ts
new file mode 100644
index 0000000000..79a05490a0
--- /dev/null
+++ b/types/antlr4/InputStream.d.ts
@@ -0,0 +1,24 @@
+export class InputStream {
+    readonly index: number;
+    readonly size: number;
+
+    constructor(data: string, decodeToUnicodeCodePoints?: boolean);
+
+    reset(): void;
+
+    consume(): void;
+
+    LA(offset: number): string;
+
+    LT(offset: number): string;
+
+    mark(): number;
+
+    release(marker: any): number;
+
+    seek(index: number): void;
+
+    getText(start: number, stop: number): string;
+
+    toString(): string;
+}
diff --git a/types/antlr4/IntervalSet.d.ts b/types/antlr4/IntervalSet.d.ts
new file mode 100644
index 0000000000..cd477700f1
--- /dev/null
+++ b/types/antlr4/IntervalSet.d.ts
@@ -0,0 +1,49 @@
+import { Token } from './Token';
+
+export class Interval {
+    readonly length: number;
+    readonly start: number;
+    readonly stop: number;
+
+    constructor(start: number, stop: number);
+
+    contains(item: number): boolean;
+
+    toString(): string;
+}
+
+export class IntervalSet {
+    readonly readOnly: boolean;
+    readonly intervals: Interval[];
+    readonly length: boolean;
+
+    first(): number;
+
+    addOne(v: number): void;
+
+    addRange(l: number, h: number): void;
+
+    addInterval(interval: Interval): void;
+
+    addSet(other: IntervalSet): void;
+
+    reduce(k: number): void;
+
+    complement(start: number, stop: number): IntervalSet;
+
+    contains(item: number): boolean;
+
+    removeRange(interval: Interval): boolean;
+
+    removeOne(v: number): boolean;
+
+    toString(literalNames?: string[], symbolicNames?: string[], elemsAreChar?: boolean): string;
+
+    toCharString(): string;
+
+    toIndexString(): string;
+
+    toTokenString(literalNames: string[], symbolicNames: string[]): string;
+
+    elementName(literalNames: string[], symbolicNames: string[], token: Token): string;
+}
diff --git a/types/antlr4/Lexer.d.ts b/types/antlr4/Lexer.d.ts
new file mode 100644
index 0000000000..bb66859402
--- /dev/null
+++ b/types/antlr4/Lexer.d.ts
@@ -0,0 +1,52 @@
+import { Recognizer } from './Recognizer';
+import { Token } from './Token';
+import { RecognitionException } from './error/Errors';
+
+export class Lexer extends Recognizer {
+    inputStream: any;
+    sourceName: any;
+    type: any;
+    line: any;
+    column: any;
+    text: string;
+
+    reset(): void;
+
+    nextToken(): Token;
+
+    skip(): void;
+
+    more(): void;
+
+    pushMode(mode: any): void;
+
+    popMode(): any;
+
+    emitToken(): void;
+
+    emit(): Token;
+
+    emitEOF(): Token;
+
+    charIndex(): number;
+
+    getAllTokens(): Token[];
+
+    notifyListeners(e: RecognitionException): void;
+
+    getErrorDisplay(s: string): string;
+
+    getErrorDisplayForChar(c: string): string;
+
+    getCharErrorDisplay(c: string): string;
+
+    recover(re: RecognitionException): void;
+
+    static readonly DEFAULT_MODE: number;
+    static readonly MORE: number;
+    static readonly SKIP: number;
+    static readonly DEFAULT_TOKEN_CHANNEL: any;
+    static readonly HIDDEN: any;
+    static readonly MIN_CHAR_VALUE: number;
+    static readonly MAX_CHAR_VALUE: number;
+}
diff --git a/types/antlr4/Parser.d.ts b/types/antlr4/Parser.d.ts
new file mode 100644
index 0000000000..b43e50bc50
--- /dev/null
+++ b/types/antlr4/Parser.d.ts
@@ -0,0 +1,90 @@
+import { CommonTokenStream } from './CommonTokenStream';
+import { Recognizer } from './Recognizer';
+import { Token } from './Token';
+import { ParseTreeListener } from './tree/Tree';
+import { Lexer } from './Lexer';
+import { InputStream } from './InputStream';
+import { ParserRuleContext } from './ParserRuleContext';
+import { ErrorStrategy } from './error/ErrorStrategy';
+
+export class Parser extends Recognizer {
+    constructor(input: CommonTokenStream);
+
+    buildParseTrees: boolean;
+
+    _errHandler: ErrorStrategy;
+
+    reset(): void;
+
+    match(): Token;
+
+    matchWildcard(): Token;
+
+    getParseListeners(): ParseTreeListener[];
+
+    addParseListener(lister: ParseTreeListener): void;
+
+    removeParseListener(lister: ParseTreeListener): void;
+
+    removeParseListeners(): void;
+
+    triggerEnterRuleEvent(): void;
+
+    triggerExitRuleEvent(): void;
+
+    getTokenFactory(): any;
+
+    setTokenFactory(factory: any): void;
+
+    getATNWithBypassAlts(): any;
+
+    compileParseTreePattern(pattern: any, patternRuleIndex: any, lexer: Lexer): any;
+
+    getInputStream(): InputStream;
+
+    getTokenStream(): any;
+
+    setTokenStream(stream: any): any;
+
+    getCurrentToken(): Token;
+
+    notifyErrorListeners(msg: string, offendingToken: Token, err: any): void;
+
+    consume(): any;
+
+    addContextToParseTree(): any;
+
+    enterRule(localCtx: ParserRuleContext, state: any, ruleIndex: number): void;
+
+    exitRule(): void;
+
+    enterOuterAlt(): void;
+
+    getPrecedence(): any;
+
+    enterRecursionRule(localCtx: ParserRuleContext, state: any, ruleIndex: any, precedence: any): void;
+
+    pushNewRecursionContext(localCtx: ParserRuleContext, state: any, ruleIndex: any, precedence: any): void;
+
+    unrollRecursionContexts(parentCtx: ParserRuleContext): void;
+
+    getInvokingContext(ruleIndex: number): any;
+
+    isExpectedToken(symbol: Token): boolean;
+
+    getExpectedTokens(): Token[];
+
+    getExpectedTokensWithinCurrentRule(): Token[];
+
+    getRuleIndex(ruleName: string): number;
+
+    getRuleInvocationStack(p: any): any;
+
+    getDFAStrings(): any;
+
+    dumpDFA(): void;
+
+    getSourceName(): any;
+
+    setTrace(trace: boolean): void;
+}
diff --git a/types/antlr4/ParserRuleContext.d.ts b/types/antlr4/ParserRuleContext.d.ts
new file mode 100644
index 0000000000..c9bb873dcb
--- /dev/null
+++ b/types/antlr4/ParserRuleContext.d.ts
@@ -0,0 +1,44 @@
+import { RuleContext } from './RuleContext';
+import { Token } from './Token';
+import { ErrorNode, ParseTreeListener } from './tree/Tree';
+import { Interval } from './IntervalSet';
+import { RecognitionException } from './error/Errors';
+
+export class ParserRuleContext extends RuleContext {
+    readonly start: Token;
+    readonly stop: Token;
+    readonly ruleIndex: number;
+    readonly exception: RecognitionException;
+
+    constructor(parent: any, invokingState: number);
+
+    copyFrom(ctx: any): void;
+
+    enterRule(listener: ParseTreeListener): void;
+
+    exitRule(listener: ParseTreeListener): void;
+
+    addChild(child: any): any;
+
+    removeLastChild(): void;
+
+    addTokenNode(token: Token): Token;
+
+    addErrorNode(badToken: Token): ErrorNode;
+
+    getChild(i: number, type?: any): any;
+
+    getToken(ttype: number, i: number): Token;
+
+    getTokens(ttype: number): Token[];
+
+    getTypedRuleContext(cxtType: any, i: number): any;
+
+    getTypedRuleContexts(cxtType: any): any[];
+
+    getChildCount(): number;
+
+    getSourceInterval(): Interval;
+
+    static readonly EMPTY: ParserRuleContext;
+}
diff --git a/types/antlr4/Recognizer.d.ts b/types/antlr4/Recognizer.d.ts
new file mode 100644
index 0000000000..bbe1752cba
--- /dev/null
+++ b/types/antlr4/Recognizer.d.ts
@@ -0,0 +1,29 @@
+import { ErrorListener, ProxyErrorListener } from './error/ErrorListener';
+import { Token } from './Token';
+import { ParserRuleContext } from './ParserRuleContext';
+
+export class Recognizer {
+    state: number;
+
+    checkVersion(toolVersion: number): void;
+
+    addErrorListener(listener: ErrorListener): void;
+
+    removeErrorListeners(): void;
+
+    getTokenTypeMap(): any;
+
+    getRuleIndexMap(): any;
+
+    getTokenType(tokenName: string): any;
+
+    getErrorHeader(e: any): string;
+
+    getTokenErrorDisplay(t: Token): string;
+
+    getErrorListenerDispatch(): ProxyErrorListener;
+
+    sempred(localCtx: ParserRuleContext, ruleIndex: number, actionIndex: number): boolean;
+
+    precpred(localCtx: ParserRuleContext, precedence: any): boolean;
+}
diff --git a/types/antlr4/RuleContext.d.ts b/types/antlr4/RuleContext.d.ts
new file mode 100644
index 0000000000..992b8c4c25
--- /dev/null
+++ b/types/antlr4/RuleContext.d.ts
@@ -0,0 +1,34 @@
+import { ParseTreeVisitor, RuleNode } from './tree/Tree';
+import { Interval } from './IntervalSet';
+import { ParserRuleContext } from './ParserRuleContext';
+
+export class RuleContext extends RuleNode {
+    readonly invokingState: number;
+    readonly parentCtx: ParserRuleContext;
+
+    constructor(parent: any, invokingState: number);
+
+    depth(): number;
+
+    isEmpty(): boolean;
+
+    getSourceInterval(): Interval;
+
+    getRuleContext(): RuleContext;
+
+    getPayload(): RuleContext;
+
+    getText(): string;
+
+    getAltNumber(): number;
+
+    setAltNumber(altNumber: number): void;
+
+    getChild(i: number): any;
+
+    getChildCount(): number;
+
+    accept(visitor: ParseTreeVisitor): void;
+
+    toStringTree(ruleNames: string[], recog: any): string;
+}
diff --git a/types/antlr4/Token.d.ts b/types/antlr4/Token.d.ts
new file mode 100644
index 0000000000..fecf9f7d5c
--- /dev/null
+++ b/types/antlr4/Token.d.ts
@@ -0,0 +1,31 @@
+export class Token {
+    readonly text: string;
+    source: any;
+    type: any;
+    channel: any;
+    start: number;
+    stop: number;
+    tokenIndex: number;
+    line: number;
+    column: number;
+
+    getTokenSource(): any;
+
+    getInputStream(): any;
+
+    static readonly INVALID_TYPE: number;
+    static readonly EPSILON: number;
+    static readonly MIN_USER_TOKEN_TYPE: number;
+    static readonly EOF: number;
+    static readonly HIDDEN_CHANNEL: number;
+}
+
+export class CommonToken extends Token {
+    constructor(source: any, type: any, channel: any, start: number, stop: number);
+
+    clone(): Token;
+
+    toString(): string;
+
+    static readonly EMPTY_SOURCE: any;
+}
diff --git a/types/antlr4/antlr4-tests.ts b/types/antlr4/antlr4-tests.ts
new file mode 100644
index 0000000000..f7d75865df
--- /dev/null
+++ b/types/antlr4/antlr4-tests.ts
@@ -0,0 +1,2158 @@
+import { InputStream, CommonTokenStream, Lexer, Parser, ParserRuleContext } from 'antlr4';
+import { TerminalNode } from 'antlr4/tree/Tree';
+
+export declare class CLexer extends Lexer {
+    readonly channelNames: string[];
+    readonly modeNames: string[];
+    readonly symbolicNames: string[];
+    readonly grammarFileName: string;
+
+    constructor(input: InputStream);
+}
+
+export interface PrimaryExpressionContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    Constant(): TerminalNode;
+
+    expression(): ExpressionContext;
+
+    genericSelection(): GenericSelectionContext;
+
+    compoundStatement(): CompoundStatementContext;
+
+    unaryExpression(): UnaryExpressionContext;
+
+    typeName(): TypeNameContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+interface GenericSelectionContext extends ParserRuleContext {
+    assignmentExpression(): AssignmentExpressionContext;
+
+    genericAssocList(): GenericAssocListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface GenericAssocListContext extends ParserRuleContext {
+    genericAssociation(): GenericAssociationContext;
+
+    genericAssocList(): GenericAssocListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface GenericAssociationContext extends ParserRuleContext {
+    typeName(): TypeNameContext;
+
+    assignmentExpression(): AssignmentExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface PostfixExpressionContext extends ParserRuleContext {
+    primaryExpression(): PrimaryExpressionContext;
+
+    typeName(): TypeNameContext;
+
+    initializerList(): InitializerListContext;
+
+    postfixExpression(): PostfixExpressionContext;
+
+    expression(): ExpressionContext;
+
+    argumentExpressionList(): ArgumentExpressionListContext;
+
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ArgumentExpressionListContext extends ParserRuleContext {
+    assignmentExpression(): AssignmentExpressionContext;
+
+    argumentExpressionList(): ArgumentExpressionListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface UnaryExpressionContext extends ParserRuleContext {
+    postfixExpression(): PostfixExpressionContext;
+
+    unaryExpression(): UnaryExpressionContext;
+
+    unaryOperator(): UnaryOperatorContext;
+
+    castExpression(): CastExpressionContext;
+
+    typeName(): TypeNameContext;
+
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface UnaryOperatorContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface CastExpressionContext extends ParserRuleContext {
+    typeName(): TypeNameContext;
+
+    castExpression(): CastExpressionContext;
+
+    unaryExpression(): UnaryExpressionContext;
+
+    DigitSequence(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface MultiplicativeExpressionContext extends ParserRuleContext {
+    castExpression(): CastExpressionContext;
+
+    multiplicativeExpression(): MultiplicativeExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AdditiveExpressionContext extends ParserRuleContext {
+    multiplicativeExpression(): MultiplicativeExpressionContext;
+
+    additiveExpression(): AdditiveExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ShiftExpressionContext extends ParserRuleContext {
+    additiveExpression(): AdditiveExpressionContext;
+
+    shiftExpression(): ShiftExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface RelationalExpressionContext extends ParserRuleContext {
+    shiftExpression(): ShiftExpressionContext;
+
+    relationalExpression(): RelationalExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface EqualityExpressionContext extends ParserRuleContext {
+    relationalExpression(): RelationalExpressionContext;
+
+    equalityExpression(): EqualityExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AndExpressionContext extends ParserRuleContext {
+    equalityExpression(): EqualityExpressionContext;
+
+    andExpression(): AndExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ExclusiveOrExpressionContext extends ParserRuleContext {
+    andExpression(): AndExpressionContext;
+
+    exclusiveOrExpression(): ExclusiveOrExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface InclusiveOrExpressionContext extends ParserRuleContext {
+    exclusiveOrExpression(): ExclusiveOrExpressionContext;
+
+    inclusiveOrExpression(): InclusiveOrExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface LogicalAndExpressionContext extends ParserRuleContext {
+    inclusiveOrExpression(): InclusiveOrExpressionContext;
+
+    logicalAndExpression(): LogicalAndExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface LogicalOrExpressionContext extends ParserRuleContext {
+    logicalAndExpression(): LogicalAndExpressionContext;
+
+    logicalOrExpression(): LogicalOrExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ConditionalExpressionContext extends ParserRuleContext {
+    logicalOrExpression(): LogicalOrExpressionContext;
+
+    expression(): ExpressionContext;
+
+    conditionalExpression(): ConditionalExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AssignmentExpressionContext extends ParserRuleContext {
+    conditionalExpression(): ConditionalExpressionContext;
+
+    unaryExpression(): UnaryExpressionContext;
+
+    assignmentOperator(): AssignmentOperatorContext;
+
+    assignmentExpression(): AssignmentExpressionContext;
+
+    DigitSequence(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AssignmentOperatorContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ExpressionContext extends ParserRuleContext {
+    assignmentExpression(): AssignmentExpressionContext;
+
+    expression(): ExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ConstantExpressionContext extends ParserRuleContext {
+    conditionalExpression(): ConditionalExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DeclarationContext extends ParserRuleContext {
+    declarationSpecifiers(): DeclarationSpecifiersContext;
+
+    initDeclaratorList(): InitDeclaratorListContext;
+
+    staticAssertDeclaration(): StaticAssertDeclarationContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DeclarationSpecifiersContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DeclarationSpecifiers2Context extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DeclarationSpecifierContext extends ParserRuleContext {
+    storageClassSpecifier(): StorageClassSpecifierContext;
+
+    typeSpecifier(): TypeSpecifierContext;
+
+    typeQualifier(): TypeQualifierContext;
+
+    functionSpecifier(): FunctionSpecifierContext;
+
+    alignmentSpecifier(): AlignmentSpecifierContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface InitDeclaratorListContext extends ParserRuleContext {
+    initDeclarator(): InitDeclaratorContext;
+
+    initDeclaratorList(): InitDeclaratorListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface InitDeclaratorContext extends ParserRuleContext {
+    declarator(): DeclaratorContext;
+
+    initializer(): InitializerContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StorageClassSpecifierContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface TypeSpecifierContext extends ParserRuleContext {
+    atomicTypeSpecifier(): AtomicTypeSpecifierContext;
+
+    structOrUnionSpecifier(): StructOrUnionSpecifierContext;
+
+    enumSpecifier(): EnumSpecifierContext;
+
+    typedefName(): TypedefNameContext;
+
+    constantExpression(): ConstantExpressionContext;
+
+    typeSpecifier(): TypeSpecifierContext;
+
+    pointer(): PointerContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StructOrUnionSpecifierContext extends ParserRuleContext {
+    structOrUnion(): StructOrUnionContext;
+
+    structDeclarationList(): StructDeclarationListContext;
+
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StructOrUnionContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StructDeclarationListContext extends ParserRuleContext {
+    structDeclaration(): StructDeclarationContext;
+
+    structDeclarationList(): StructDeclarationListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StructDeclarationContext extends ParserRuleContext {
+    specifierQualifierList(): SpecifierQualifierListContext;
+
+    structDeclaratorList(): StructDeclaratorListContext;
+
+    staticAssertDeclaration(): StaticAssertDeclarationContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface SpecifierQualifierListContext extends ParserRuleContext {
+    typeSpecifier(): TypeSpecifierContext;
+
+    specifierQualifierList(): SpecifierQualifierListContext;
+
+    typeQualifier(): TypeQualifierContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StructDeclaratorListContext extends ParserRuleContext {
+    structDeclarator(): StructDeclaratorContext;
+
+    structDeclaratorList(): StructDeclaratorListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StructDeclaratorContext extends ParserRuleContext {
+    declarator(): DeclaratorContext;
+
+    constantExpression(): ConstantExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface EnumSpecifierContext extends ParserRuleContext {
+    enumeratorList(): EnumeratorListContext;
+
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface EnumeratorListContext extends ParserRuleContext {
+    enumerator(): EnumeratorContext;
+
+    enumeratorList(): EnumeratorListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface EnumeratorContext extends ParserRuleContext {
+    enumerationConstant(): EnumerationConstantContext;
+
+    constantExpression(): ConstantExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface EnumerationConstantContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AtomicTypeSpecifierContext extends ParserRuleContext {
+    typeName(): TypeNameContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface TypeQualifierContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface FunctionSpecifierContext extends ParserRuleContext {
+    gccAttributeSpecifier(): GccAttributeSpecifierContext;
+
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AlignmentSpecifierContext extends ParserRuleContext {
+    typeName(): TypeNameContext;
+
+    constantExpression(): ConstantExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DeclaratorContext extends ParserRuleContext {
+    directDeclarator(): DirectDeclaratorContext;
+
+    pointer(): PointerContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DirectDeclaratorContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    declarator(): DeclaratorContext;
+
+    DigitSequence(): TerminalNode;
+
+    pointer(): PointerContext;
+
+    directDeclarator(): DirectDeclaratorContext;
+
+    typeSpecifier(): TypeSpecifierContext;
+
+    typeQualifierList(): TypeQualifierListContext;
+
+    assignmentExpression(): AssignmentExpressionContext;
+
+    parameterTypeList(): ParameterTypeListContext;
+
+    identifierList(): IdentifierListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface GccDeclaratorExtensionContext extends ParserRuleContext {
+    gccAttributeSpecifier(): GccAttributeSpecifierContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface GccAttributeSpecifierContext extends ParserRuleContext {
+    gccAttributeList(): GccAttributeListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface GccAttributeListContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface GccAttributeContext extends ParserRuleContext {
+    argumentExpressionList(): ArgumentExpressionListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface NestedParenthesesBlockContext extends ParserRuleContext {
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface PointerContext extends ParserRuleContext {
+    typeQualifierList(): TypeQualifierListContext;
+
+    pointer(): PointerContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface TypeQualifierListContext extends ParserRuleContext {
+    typeQualifier(): TypeQualifierContext;
+
+    typeQualifierList(): TypeQualifierListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ParameterTypeListContext extends ParserRuleContext {
+    parameterList(): ParameterListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ParameterListContext extends ParserRuleContext {
+    parameterDeclaration(): ParameterDeclarationContext;
+
+    parameterList(): ParameterListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ParameterDeclarationContext extends ParserRuleContext {
+    declarationSpecifiers(): DeclarationSpecifiersContext;
+
+    declarator(): DeclaratorContext;
+
+    declarationSpecifiers2(): DeclarationSpecifiers2Context;
+
+    abstractDeclarator(): AbstractDeclaratorContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface IdentifierListContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    identifierList(): IdentifierListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface TypeNameContext extends ParserRuleContext {
+    specifierQualifierList(): SpecifierQualifierListContext;
+
+    abstractDeclarator(): AbstractDeclaratorContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface AbstractDeclaratorContext extends ParserRuleContext {
+    pointer(): PointerContext;
+
+    directAbstractDeclarator(): DirectAbstractDeclaratorContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DirectAbstractDeclaratorContext extends ParserRuleContext {
+    abstractDeclarator(): AbstractDeclaratorContext;
+
+    typeQualifierList(): TypeQualifierListContext;
+
+    assignmentExpression(): AssignmentExpressionContext;
+
+    parameterTypeList(): ParameterTypeListContext;
+
+    directAbstractDeclarator(): DirectAbstractDeclaratorContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface TypedefNameContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface InitializerContext extends ParserRuleContext {
+    assignmentExpression(): AssignmentExpressionContext;
+
+    initializerList(): InitializerListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface InitializerListContext extends ParserRuleContext {
+    initializer(): InitializerContext;
+
+    designation(): DesignationContext;
+
+    initializerList(): InitializerListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DesignationContext extends ParserRuleContext {
+    designatorList(): DesignatorListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DesignatorListContext extends ParserRuleContext {
+    designator(): DesignatorContext;
+
+    designatorList(): DesignatorListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DesignatorContext extends ParserRuleContext {
+    constantExpression(): ConstantExpressionContext;
+
+    Identifier(): TerminalNode;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StaticAssertDeclarationContext extends ParserRuleContext {
+    constantExpression(): ConstantExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface StatementContext extends ParserRuleContext {
+    labeledStatement(): LabeledStatementContext;
+
+    compoundStatement(): CompoundStatementContext;
+
+    expressionStatement(): ExpressionStatementContext;
+
+    selectionStatement(): SelectionStatementContext;
+
+    iterationStatement(): IterationStatementContext;
+
+    jumpStatement(): JumpStatementContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface LabeledStatementContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    statement(): StatementContext;
+
+    constantExpression(): ConstantExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface CompoundStatementContext extends ParserRuleContext {
+    blockItemList(): BlockItemListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface BlockItemListContext extends ParserRuleContext {
+    blockItem(): BlockItemContext;
+
+    blockItemList(): BlockItemListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface BlockItemContext extends ParserRuleContext {
+    statement(): StatementContext;
+
+    declaration(): DeclarationContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ExpressionStatementContext extends ParserRuleContext {
+    expression(): ExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface SelectionStatementContext extends ParserRuleContext {
+    expression(): ExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface IterationStatementContext extends ParserRuleContext {
+    While(): TerminalNode;
+
+    expression(): ExpressionContext;
+
+    statement(): StatementContext;
+
+    Do(): TerminalNode;
+
+    For(): TerminalNode;
+
+    forCondition(): ForConditionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ForConditionContext extends ParserRuleContext {
+    forDeclaration(): ForDeclarationContext;
+
+    expression(): ExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ForDeclarationContext extends ParserRuleContext {
+    declarationSpecifiers(): DeclarationSpecifiersContext;
+
+    initDeclaratorList(): InitDeclaratorListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ForExpressionContext extends ParserRuleContext {
+    assignmentExpression(): AssignmentExpressionContext;
+
+    forExpression(): ForExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface JumpStatementContext extends ParserRuleContext {
+    Identifier(): TerminalNode;
+
+    expression(): ExpressionContext;
+
+    unaryExpression(): UnaryExpressionContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface CompilationUnitContext extends ParserRuleContext {
+    EOF(): any;
+
+    translationUnit(): TranslationUnitContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface TranslationUnitContext extends ParserRuleContext {
+    externalDeclaration(): ExternalDeclarationContext;
+
+    translationUnit(): TranslationUnitContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface ExternalDeclarationContext extends ParserRuleContext {
+    functionDefinition(): FunctionDefinitionContext;
+
+    declaration(): DeclarationContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface FunctionDefinitionContext extends ParserRuleContext {
+    declarator(): DeclaratorContext;
+
+    compoundStatement(): CompoundStatementContext;
+
+    declarationSpecifiers(): DeclarationSpecifiersContext;
+
+    declarationList(): DeclarationListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export interface DeclarationListContext extends ParserRuleContext {
+    declaration(): DeclarationContext;
+
+    declarationList(): DeclarationListContext;
+
+    removeLastChild(): any;
+
+    getChildCount(): any;
+
+    getSourceInterval(): any;
+
+    isEmpty(): any;
+
+    getRuleContext(): any;
+
+    getPayload(): any;
+
+    getText(): any;
+
+    getAltNumber(): any;
+}
+
+export declare class CParser extends Parser {
+    readonly ruleNames: string[];
+    readonly literalNames: string[];
+    readonly symbolicNames: string[];
+
+    constructor(input: CommonTokenStream);
+
+    primaryExpression(): PrimaryExpressionContext;
+
+    genericSelection(): GenericSelectionContext;
+
+    genericAssociation(): GenericAssociationContext;
+
+    unaryExpression(): UnaryExpressionContext;
+
+    unaryOperator(): UnaryOperatorContext;
+
+    castExpression(): CastExpressionContext;
+
+    conditionalExpression(): ConditionalExpressionContext;
+
+    assignmentExpression(): AssignmentExpressionContext;
+
+    assignmentOperator(): AssignmentOperatorContext;
+
+    constantExpression(): ConstantExpressionContext;
+
+    declaration(): DeclarationContext;
+
+    declarationSpecifiers(): DeclarationSpecifiersContext;
+
+    declarationSpecifiers2(): DeclarationSpecifiers2Context;
+
+    declarationSpecifier(): DeclarationSpecifierContext;
+
+    initDeclarator(): InitDeclaratorContext;
+
+    storageClassSpecifier(): StorageClassSpecifierContext;
+
+    structOrUnionSpecifier(): StructOrUnionSpecifierContext;
+
+    structOrUnion(): StructOrUnionContext;
+
+    structDeclaration(): StructDeclarationContext;
+
+    specifierQualifierList(): SpecifierQualifierListContext;
+
+    structDeclarator(): StructDeclaratorContext;
+
+    enumSpecifier(): EnumSpecifierContext;
+
+    enumerator(): EnumeratorContext;
+
+    enumerationConstant(): EnumerationConstantContext;
+
+    atomicTypeSpecifier(): AtomicTypeSpecifierContext;
+
+    typeQualifier(): TypeQualifierContext;
+
+    functionSpecifier(): FunctionSpecifierContext;
+
+    alignmentSpecifier(): AlignmentSpecifierContext;
+
+    declarator(): DeclaratorContext;
+
+    gccDeclaratorExtension(): GccDeclaratorExtensionContext;
+
+    gccAttributeSpecifier(): GccAttributeSpecifierContext;
+
+    gccAttributeList(): GccAttributeListContext;
+
+    gccAttribute(): GccAttributeContext;
+
+    nestedParenthesesBlock(): NestedParenthesesBlockContext;
+
+    pointer(): PointerContext;
+
+    parameterTypeList(): ParameterTypeListContext;
+
+    parameterDeclaration(): ParameterDeclarationContext;
+
+    typeName(): TypeNameContext;
+
+    abstractDeclarator(): AbstractDeclaratorContext;
+
+    typedefName(): TypedefNameContext;
+
+    initializer(): InitializerContext;
+
+    designation(): DesignationContext;
+
+    designator(): DesignatorContext;
+
+    staticAssertDeclaration(): StaticAssertDeclarationContext;
+
+    statement(): StatementContext;
+
+    labeledStatement(): LabeledStatementContext;
+
+    compoundStatement(): CompoundStatementContext;
+
+    blockItem(): BlockItemContext;
+
+    expressionStatement(): ExpressionStatementContext;
+
+    selectionStatement(): SelectionStatementContext;
+
+    iterationStatement(): IterationStatementContext;
+
+    forCondition(): ForConditionContext;
+
+    forDeclaration(): ForDeclarationContext;
+
+    jumpStatement(): JumpStatementContext;
+
+    compilationUnit(): CompilationUnitContext;
+
+    externalDeclaration(): ExternalDeclarationContext;
+
+    functionDefinition(): FunctionDefinitionContext;
+
+    reset(): any;
+
+    matchWildcard(): any;
+
+    getParseListeners(): any;
+
+    removeParseListeners(): any;
+
+    triggerEnterRuleEvent(): any;
+
+    triggerExitRuleEvent(): any;
+
+    getTokenFactory(): any;
+
+    getATNWithBypassAlts(): any;
+
+    getInputStream(): any;
+
+    getTokenStream(): any;
+
+    getCurrentToken(): any;
+
+    consume(): any;
+
+    addContextToParseTree(): any;
+
+    exitRule(): any;
+
+    getPrecedence(): any;
+
+    getExpectedTokens(): any;
+
+    getExpectedTokensWithinCurrentRule(): any;
+
+    getDFAStrings(): any;
+
+    dumpDFA(): any;
+
+    getSourceName(): any;
+
+    removeErrorListeners(): any;
+
+    getTokenTypeMap(): any;
+
+    getRuleIndexMap(): any;
+
+    getErrorListenerDispatch(): any;
+}
+
+const inputStream = new InputStream('int x = 10;');
+const lexer = new CLexer(inputStream);
+const tokenStream = new CommonTokenStream(lexer);
+const parser = new CParser(tokenStream);
+
+// execute the parse, and generate the parse tree
+const tree = parser.compilationUnit();
+console.log(tree);
diff --git a/types/antlr4/error/ErrorListener.d.ts b/types/antlr4/error/ErrorListener.d.ts
new file mode 100644
index 0000000000..be03bef912
--- /dev/null
+++ b/types/antlr4/error/ErrorListener.d.ts
@@ -0,0 +1,15 @@
+import { Recognizer } from '../Recognizer';
+import { Token } from '../Token';
+
+export class ErrorListener {
+    syntaxError(recognizer: Recognizer, offendingSymbol: Token, line: number, column: number, msg: string, e: any): void;
+    reportAmbiguity(recognizer: Recognizer, dfa: any, startIndex: number, stopIndex: number, exact: any, ambigAlts: any, configs: any): void;
+    reportAttemptingFullContext(recognizer: Recognizer, dfa: any, startIndex: number, stopIndex: number, conflictingAlts: any, configs: any): void;
+    reportContextSensitivity(recognizer: Recognizer, dfa: any, startIndex: number, stopIndex: number, conflictingAlts: any, configs: any): void;
+}
+
+export class ConsoleErrorListener extends ErrorListener {
+}
+
+export class ProxyErrorListener extends ErrorListener {
+}
diff --git a/types/antlr4/error/ErrorStrategy.d.ts b/types/antlr4/error/ErrorStrategy.d.ts
new file mode 100644
index 0000000000..5b11bcbe6a
--- /dev/null
+++ b/types/antlr4/error/ErrorStrategy.d.ts
@@ -0,0 +1,21 @@
+import { Recognizer } from '../Recognizer';
+
+export class ErrorStrategy {
+    reset(recognizer: Recognizer): void;
+
+    recoverInline(recognizer: Recognizer): void;
+
+    recover(recognizer: Recognizer, e: Error): void;
+
+    sync(recognizer: Recognizer): void;
+
+    inErrorRecoveryMode(recognizer: Recognizer): void;
+
+    reportError(recognizer: Recognizer): void;
+}
+
+export class DefaultErrorStrategy extends ErrorStrategy {
+}
+
+export class BailErrorStrategy extends ErrorStrategy {
+}
diff --git a/types/antlr4/error/Errors.d.ts b/types/antlr4/error/Errors.d.ts
new file mode 100644
index 0000000000..11e348dace
--- /dev/null
+++ b/types/antlr4/error/Errors.d.ts
@@ -0,0 +1,30 @@
+import { ParserRuleContext } from '../ParserRuleContext';
+import { Recognizer } from '../Recognizer';
+import { InputStream } from '../InputStream';
+import { Token } from '../Token';
+
+export class RecognitionException extends Error {
+    message: string;
+    ctx: ParserRuleContext;
+    recognizer: Recognizer;
+    input: InputStream;
+    offendingToken: Token;
+    offendingState: -1;
+    getExpectedTokens(): Token[];
+    toString(): string;
+}
+
+export class LexerNoViableAltException extends RecognitionException {
+}
+
+export  class NoViableAltException extends RecognitionException {
+}
+
+export class InputMismatchException extends RecognitionException {
+}
+
+export class FailedPredicateException extends RecognitionException {
+}
+
+export class ParseCancellationException extends RecognitionException {
+}
diff --git a/types/antlr4/error/index.d.ts b/types/antlr4/error/index.d.ts
new file mode 100644
index 0000000000..3ef46979d3
--- /dev/null
+++ b/types/antlr4/error/index.d.ts
@@ -0,0 +1,3 @@
+export * from './ErrorListener';
+export * from './ErrorStrategy';
+export * from './Errors';
diff --git a/types/antlr4/index.d.ts b/types/antlr4/index.d.ts
new file mode 100644
index 0000000000..1d6fc4c003
--- /dev/null
+++ b/types/antlr4/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for antlr4 4.7
+// Project: https://github.com/antlr/antlr4
+// Definitions by: Marlon Chatman <https://github.com/mcchatman8009>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+export * from './Lexer';
+export * from './Parser';
+export * from './Recognizer';
+export * from './ParserRuleContext';
+export * from './IntervalSet';
+export * from './CommonTokenStream';
+export * from './InputStream';
+export * from './Token';
+import { ParserRuleContext } from './ParserRuleContext';
+
+export type AntlrRule = ParserRuleContext;
diff --git a/types/antlr4/tree/Tree.d.ts b/types/antlr4/tree/Tree.d.ts
new file mode 100644
index 0000000000..45a91a3bfa
--- /dev/null
+++ b/types/antlr4/tree/Tree.d.ts
@@ -0,0 +1,80 @@
+import { Interval } from '../IntervalSet';
+import { Token } from '../Token';
+import { ParserRuleContext } from '../ParserRuleContext';
+
+export const INVALID_INTERVAL: Interval;
+
+export class ParseTree {
+}
+
+export class RuleNode extends ParseTree {
+}
+
+export class TerminalNode implements ParseTree {
+    constructor(symbol: Token);
+
+    getChild(i: number): any;
+
+    getSymbol(): Token;
+
+    getParent(): any;
+
+    getPayload(): Token;
+
+    getSourceInterval(): Interval;
+
+    getChildCount(): number;
+
+    accept(visitor: ParseTreeVisitor): any;
+
+    getText(): string;
+
+    toString(): string;
+
+    readonly parentCtx: any;
+    readonly symbol: Token;
+}
+
+export class ErrorNode extends TerminalNode {
+}
+
+export class ParseTreeVisitor {
+    visit(ctx: ParserRuleContext): any;
+
+    visitChildren(ctx: ParserRuleContext): any;
+
+    visitTerminal(node: TerminalNode): any;
+
+    visitErrorNode(node: ErrorNode): any;
+}
+
+export interface ParseTreeListener {
+    visitTerminal(node: TerminalNode): void;
+
+    visitErrorNode(node: ErrorNode): void;
+
+    enterEveryRule(node: ParserRuleContext): void;
+
+    exitEveryRule(node: ParserRuleContext): void;
+}
+
+export class TerminalNodeImpl extends TerminalNode {
+}
+
+export class ErrorNodeImpl extends TerminalNode {
+    constructor(token: Token);
+
+    isErrorNode(): boolean;
+
+    accept(visitor: ParseTreeVisitor): any;
+}
+
+export class ParseTreeWalker {
+    static readonly DEFAULT: ParseTreeWalker;
+
+    walk(listener: ParseTreeListener, rule: any): void;
+
+    enterRule(listener: ParseTreeListener, rule: any): void;
+
+    exitRule(listener: ParseTreeListener, rule: any): void;
+}
diff --git a/types/antlr4/tsconfig.json b/types/antlr4/tsconfig.json
new file mode 100644
index 0000000000..32f7586a75
--- /dev/null
+++ b/types/antlr4/tsconfig.json
@@ -0,0 +1,39 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "error/ErrorListener.d.ts",
+        "error/Errors.d.ts",
+        "error/ErrorStrategy.d.ts",
+        "error/index.d.ts",
+        "tree/Tree.d.ts",
+        "antlr4-tests.ts",
+        "BufferedTokenStream.d.ts",
+        "CommonTokenStream.d.ts",
+        "index.d.ts",
+        "InputStream.d.ts",
+        "IntervalSet.d.ts",
+        "Lexer.d.ts",
+        "Parser.d.ts",
+        "ParserRuleContext.d.ts",
+        "Recognizer.d.ts",
+        "RuleContext.d.ts",
+        "Token.d.ts"
+    ]
+}
diff --git a/types/react-dnd-test-backend/tslint.json b/types/antlr4/tslint.json
similarity index 100%
rename from types/react-dnd-test-backend/tslint.json
rename to types/antlr4/tslint.json
diff --git a/types/aphrodite/index.d.ts b/types/aphrodite/index.d.ts
index a82ec2f36b..3e7807b6b6 100644
--- a/types/aphrodite/index.d.ts
+++ b/types/aphrodite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Khan/aphrodite
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as CSS from "csstype";
 
@@ -14,12 +14,13 @@ type FontFamily =
 
 type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
 
-type CSSProperties = Omit<BaseCSSProperties, 'fontFamily'> & {
+type CSSProperties = Omit<BaseCSSProperties, 'fontFamily' | 'transition' | 'animationName' > & {
     fontFamily?: FontFamily | FontFamily[];
+    animationName?: string | OpenCSSProperties | OpenCSSProperties[];
 };
 
 // For pseudo selectors and media queries
-interface OpenCSSProperties  extends CSSProperties {
+interface OpenCSSProperties extends CSSProperties {
     [k: string]: CSSProperties[keyof CSSProperties] | CSSProperties;
 }
 
diff --git a/types/apollo-codegen/apollo-codegen-tests.ts b/types/apollo-codegen/apollo-codegen-tests.ts
index 38d9733faf..2c78f26fa9 100644
--- a/types/apollo-codegen/apollo-codegen-tests.ts
+++ b/types/apollo-codegen/apollo-codegen-tests.ts
@@ -14,7 +14,7 @@ async function main() {
         "POST"
     );
 
-    generate(["input.ts"], "schema.json", "types.ts", "typescript", "gql", {
+    generate(["input.ts"], "schema.json", "types.ts", "", "typescript", "gql", "", {
         passthroughCustomScalars: false,
         customScalarsPrefix: "S",
         addTypename: false,
diff --git a/types/apollo-codegen/index.d.ts b/types/apollo-codegen/index.d.ts
index a506f7475e..ea5d415418 100644
--- a/types/apollo-codegen/index.d.ts
+++ b/types/apollo-codegen/index.d.ts
@@ -1,13 +1,15 @@
-// Type definitions for apollo-codegen 0.16
+// Type definitions for apollo-codegen 0.20
 // Project: https://github.com/apollographql/apollo-codegen
-// Definitions by: Bradley Ayers <https://github.com/bradleyayers>
+// Definitions by: Bradley Ayers <https://github.com/bradleyayers>, Maria Carrasco <https://github.com/kostspielig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+import { Options } from 'graphql/utilities/schemaPrinter';
+
 export function downloadSchema(
     url: string,
     outputPath: string,
-    additionalHeaders: { [name: string]: string },
+    additionalHeaders: { [name: string]: string; },
     insecure: boolean,
     method: string
 ): Promise<void>;
@@ -19,22 +21,29 @@ export function introspectSchema(
 
 export function printSchema(
     schemaPath: string,
-    outputPath: string
+    outputPath: string,
+    options?: Options
 ): Promise<void>;
 
+export type TargetType = 'json' | 'swift' | 'ts-legacy' | 'typescript-legacy' | 'flow-legacy' | 'scala' | 'flow' | 'typescript' | 'ts';
+
 export function generate(
     inputPaths: string[],
     schemaPath: string,
     outputPath: string,
-    target: "json" | "swift" | "ts" | "typescript" | "flow" | "scala",
+    only: string,
+    target: TargetType,
     tagName: string,
+    projectName: string,
     options: {
-        passthroughCustomScalars: boolean;
-        customScalarsPrefix: string;
-        addTypename: boolean;
-        namespace: string;
-        operationIdsPath: string | null;
-        generateOperationIds: boolean;
-        mergeInFieldsFromFragmentSpreads: boolean;
+        passthroughCustomScalars?: boolean;
+        customScalarsPrefix?: string;
+        addTypename?: boolean;
+        namespace?: string;
+        operationIdsPath?: string | null;
+        generateOperationIds?: boolean;
+        mergeInFieldsFromFragmentSpreads?: boolean;
+        useFlowExactObjects?: boolean;
+        useFlowReadOnlyTypes?: boolean;
     }
 ): void;
diff --git a/types/apollo-upload-client/apollo-upload-client-tests.ts b/types/apollo-upload-client/apollo-upload-client-tests.ts
new file mode 100644
index 0000000000..4db60bfaf3
--- /dev/null
+++ b/types/apollo-upload-client/apollo-upload-client-tests.ts
@@ -0,0 +1,16 @@
+import { createUploadLink, ReactNativeFile } from "apollo-upload-client";
+
+new ReactNativeFile({
+    name: "its coming home",
+    type: "its coming",
+    uri: "football's coming home",
+});
+
+createUploadLink({
+    fetch: (uri, options) => fetch(`http://localhost/${uri}`, options),
+    fetchOptions: { method: "GET" },
+    headers: { special: "Special header value" },
+    includeExtensions: true,
+    uri: "http://localhost",
+    credentials: "beepboop",
+});
diff --git a/types/apollo-upload-client/index.d.ts b/types/apollo-upload-client/index.d.ts
new file mode 100644
index 0000000000..7c1e3cb7b6
--- /dev/null
+++ b/types/apollo-upload-client/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for apollo-upload-client 8.1
+// Project: https://github.com/jaydenseric/apollo-upload-client#readme
+// Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { ApolloLink } from "apollo-link";
+import { HttpOptions } from "apollo-link-http-common";
+
+export { ReactNativeFile } from "extract-files";
+
+/**
+ * `createUploadLink` options match `createHttpLink` options
+ * @param linkOptions `HttpOptions`
+ */
+export function createUploadLink(linkOptions?: HttpOptions): ApolloLink;
diff --git a/types/apollo-upload-client/package.json b/types/apollo-upload-client/package.json
new file mode 100644
index 0000000000..580aaf19c4
--- /dev/null
+++ b/types/apollo-upload-client/package.json
@@ -0,0 +1,7 @@
+{
+    "private": true,
+    "dependencies": {
+        "apollo-link": "^1.0.0",
+        "apollo-link-http-common": "^0.2.4"
+    }
+}
diff --git a/types/apollo-upload-client/tsconfig.json b/types/apollo-upload-client/tsconfig.json
new file mode 100644
index 0000000000..2a023ff111
--- /dev/null
+++ b/types/apollo-upload-client/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "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",
+        "apollo-upload-client-tests.ts"
+    ]
+}
diff --git a/types/apollo-upload-client/tslint.json b/types/apollo-upload-client/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/apollo-upload-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/applicationinsights-js/applicationinsights-js-tests.ts b/types/applicationinsights-js/applicationinsights-js-tests.ts
index 49c68181f8..6588c3fcd3 100644
--- a/types/applicationinsights-js/applicationinsights-js-tests.ts
+++ b/types/applicationinsights-js/applicationinsights-js-tests.ts
@@ -17,17 +17,24 @@ const config: Microsoft.ApplicationInsights.IConfig = {
     autoTrackPageVisitTime: true,
     disableExceptionTracking: false,
     disableAjaxTracking: false,
+    disableFetchTracking: true,
     overridePageViewDuration: false,
     maxAjaxCallsPerView: -1,
     disableDataLossAnalysis: true,
     disableCorrelationHeaders: true,
+    correlationHeaderExcludedDomains: [],
     disableFlushOnBeforeUnload: false,
     enableSessionStorageBuffer: false,
     cookieDomain: "",
     isCookieUseDisabled: true,
     isRetryDisabled: true,
-    isPerfAnalyzerEnabled: true,
-    isStorageUseDisabled: true
+    url: "url",
+    isStorageUseDisabled: true,
+    isBeaconApiDisabled: false,
+    sdkExtension: "sdkExtension",
+    isBrowserLinkTrackingEnabled: false,
+    appId: "appId",
+    enableCorsCorrelation: false
 };
 
 appInsights = {
@@ -175,3 +182,8 @@ const traceObj = new Microsoft.ApplicationInsights.Telemetry.Trace("message", nu
 const traceData = new Microsoft.ApplicationInsights.Telemetry.Common.Data<Microsoft.ApplicationInsights.Telemetry.Trace>(Microsoft.ApplicationInsights.Telemetry.Trace.dataType, traceObj);
 const traceEnvelope = new Microsoft.ApplicationInsights.Telemetry.Common.Envelope(traceData, Microsoft.ApplicationInsights.Telemetry.Trace.envelopeType);
 context.track(traceEnvelope);
+
+// UtilHelpers
+let Util: typeof Microsoft.ApplicationInsights.UtilHelpers;
+
+Util.newId();
diff --git a/types/applicationinsights-js/index.d.ts b/types/applicationinsights-js/index.d.ts
index 4214837ddf..517324cde4 100644
--- a/types/applicationinsights-js/index.d.ts
+++ b/types/applicationinsights-js/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for ApplicationInsights-JS 1.0
 // Project: https://github.com/Microsoft/ApplicationInsights-JS
 // Definitions by: Kamil Szostak <https://github.com/kamilszostak>
+//                 Mark Wolff <https://github.com/markwolff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module AI {
@@ -560,19 +561,24 @@ declare module Microsoft.ApplicationInsights {
         samplingPercentage?: number;
         autoTrackPageVisitTime?: boolean;
         disableAjaxTracking?: boolean;
+        disableFetchTracking?: boolean;
         overridePageViewDuration?: boolean;
         maxAjaxCallsPerView?: number;
         disableDataLossAnalysis?: boolean;
         disableCorrelationHeaders?: boolean;
+        correlationHeaderExcludedDomains?: string[];
         disableFlushOnBeforeUnload?: boolean;
         enableSessionStorageBuffer?: boolean;
         isCookieUseDisabled?: boolean;
         cookieDomain?: string;
         isRetryDisabled?: boolean;
-        isPerfAnalyzerEnabled?: boolean;
         url?: string;
         isStorageUseDisabled?: boolean;
         isBeaconApiDisabled?: boolean;
+        sdkExtension?: string;
+        isBrowserLinkTrackingEnabled?: boolean;
+        appId?: string;
+        enableCorsCorrelation?: boolean;
     }
 
     /**
@@ -793,10 +799,18 @@ declare module Microsoft.ApplicationInsights {
          */
         _onerror(message: string, url: string, lineNumber: number, columnNumber: number, error: Error): any;
     }
+
+    class UtilHelpers {
+        /**
+         * Generate a random ID string
+         */
+        static newId(): string;
+    }
 }
 
 declare module 'applicationinsights-js' {
     const AppInsights: Microsoft.ApplicationInsights.IAppInsights;
+    const Util: typeof Microsoft.ApplicationInsights.UtilHelpers;
 }
 
 declare var appInsights: Microsoft.ApplicationInsights.IAppInsights;
diff --git a/types/arangodb/arangodb-tests.ts b/types/arangodb/arangodb-tests.ts
index 7e0fd6383e..e049a2374d 100644
--- a/types/arangodb/arangodb-tests.ts
+++ b/types/arangodb/arangodb-tests.ts
@@ -96,3 +96,12 @@ console.log(
         RETURN u
     `.toArray()
 );
+
+const view = db._view("yolo")!;
+view.properties({
+    consolidationIntervalMsec: 123,
+    consolidationPolicy: {
+        type: "bytes",
+        segmentThreshold: 234
+    }
+});
diff --git a/types/arangodb/index.d.ts b/types/arangodb/index.d.ts
index 5c3f56020f..32ad04210b 100644
--- a/types/arangodb/index.d.ts
+++ b/types/arangodb/index.d.ts
@@ -837,11 +837,60 @@ declare namespace ArangoDB {
 
     // Views
 
-    interface View {
-        // TODO
-        [key: string]: any;
+    interface ArangoSearchView {
+        _dbName: string;
+        _id: string;
+        name(): string;
+        type(): ViewType;
+        rename(newName: string): void;
+        properties(
+            newProperties?: ArangoSearchViewPropertiesOptions
+        ): ArangoSearchViewProperties;
+    }
+
+    type ArangoSearchViewConsolidationType =
+        | "bytes"
+        | "bytes_accum"
+        | "count"
+        | "fill";
+
+    interface ArangoSearchViewCollectionLink {
+        analyzers?: string[];
+        fields?: { [key: string]: ArangoSearchViewCollectionLink | undefined };
+        includeAllFields?: boolean;
+        trackListPositions?: boolean;
+        storeValues?: "none" | "id";
+    }
+
+    interface ArangoSearchViewProperties {
+        id: string;
+        name: string;
+        type: "arangosearch";
+
+        cleanupIntervalStep: number;
+        consolidationIntervalMsec: number;
+        consolidationPolicy: {
+            type: ArangoSearchViewConsolidationType;
+            segmentThreshold: number;
+            threshold: number;
+        };
+        links: {
+            [key: string]: ArangoSearchViewCollectionLink | undefined;
+        };
+    }
+
+    interface ArangoSearchViewPropertiesOptions {
+        cleanupIntervalStep?: number;
+        consolidationIntervalMsec?: number;
+        consolidationPolicy?: {
+            type?: ArangoSearchViewConsolidationType;
+            segmentThreshold?: number;
+            threshold?: number;
+        };
+        links?: {
+            [key: string]: ArangoSearchViewCollectionLink | undefined;
+        };
     }
-    type ViewProperties = object; // TODO
 
     // Global
 
@@ -923,13 +972,13 @@ declare namespace ArangoDB {
         ): DocumentMetadata;
 
         // Views
-        _view(name: string): View | null;
-        _views(): View[];
+        _view(name: string): ArangoSearchView | null;
+        _views(): ArangoSearchView[];
         _createView(
             name: string,
             type: ViewType,
-            properties: ViewProperties
-        ): View;
+            properties: ArangoSearchViewPropertiesOptions
+        ): ArangoSearchView;
         _dropView(name: string): void;
 
         // Global
@@ -1392,7 +1441,7 @@ declare module "@arangodb/foxx/router" {
 }
 
 declare module "@arangodb/foxx/graphql" {
-    import { GraphQLSchema, formatError } from "graphql";
+    import { formatError, GraphQLSchema } from "graphql";
     type GraphQLModule = object;
     type GraphQLFormatErrorFunction = typeof formatError;
     interface GraphQLOptions {
diff --git a/types/arcgis-js-api/index.d.ts b/types/arcgis-js-api/index.d.ts
index 4944b00bf2..97eb679110 100644
--- a/types/arcgis-js-api/index.d.ts
+++ b/types/arcgis-js-api/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ArcGIS API for JavaScript 4.7
+// Type definitions for ArcGIS API for JavaScript 4.8
 // Project: http://js.arcgis.com
 // Definitions by: Esri <https://github.com/Esri>
 //                 Bjorn Svensson <https://github.com/bsvensson>
@@ -156,6 +156,10 @@ declare namespace __esri {
 
   export type BaseTileLayerLayerviewDestroyEventHandler = (event: BaseTileLayerLayerviewDestroyEvent) => void;
 
+  export type BingMapsLayerLayerviewCreateEventHandler = (event: BingMapsLayerLayerviewCreateEvent) => void;
+
+  export type BingMapsLayerLayerviewDestroyEventHandler = (event: BingMapsLayerLayerviewDestroyEvent) => void;
+
   export type CSVLayerLayerviewCreateEventHandler = (event: CSVLayerLayerviewCreateEvent) => void;
 
   export type CSVLayerLayerviewDestroyEventHandler = (event: CSVLayerLayerviewDestroyEvent) => void;
@@ -620,6 +624,14 @@ declare namespace __esri {
    * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html)
    */
   interface config {
+    /**
+     * The URL for font resources used by the [Font](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#family) class with 2D WebGL enabled [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html). To use your own hosted fonts, make sure to follow our naming conventions (e.g. "arial-unicode-ms-bold").
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#fontsUrl)
+     * 
+     * @default "https://static.arcgis.com/fonts"
+     */
+    fontsUrl: string;
     /**
      * 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.
      * 
@@ -668,6 +680,10 @@ declare namespace __esri {
 
   export const config: config;
 
+  export type AfterInterceptorCallback = (response: RequestResponse) => void;
+
+  export type BeforeInterceptorCallback = (params: any) => any;
+
 
   export interface configRequest extends Object {
     /**
@@ -685,42 +701,7 @@ declare namespace __esri {
      */
     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:
+     * A list of servers known to support CORS specification.  By default, this list includes many Esri hosted servers that are known to support CORS and is updated at every release as the list grows. The API is capable of automatically detecting CORS support for servers used in an application (see `corsDetection`). If you are aware that a server supports CORS, add it to this list. Since the API includes some servers by default it's important to add items onto this array rather than overwriting it.  Example:
      * ```js
      * // Add a known server to the list.
      * require(["esri/config"], function(esriConfig) {
@@ -749,6 +730,37 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
      */
     httpsDomains?: string[];
+    /**
+     * Allows developers to modify requests before or after they are sent. The first interceptor that matches the request URL will be used.  Example:
+     * ```js
+     * const featureLayerUrl = "http://sampleserver6.arcgisonline.com/arcgis/rest/services/USA/MapServer/0";
+     * 
+     * esriConfig.request.interceptors.push({
+     *   // set the `urls` property to the URL of the FeatureLayer so that this
+     *   // interceptor only applies to requests made to the FeatureLayer URL
+     *   urls: featureLayerUrl,
+     *   // use the BeforeInterceptorCallback to check if the query of the
+     *   // FeatureLayer has a maxAllowableOffset property set.
+     *   // if so, then set the maxAllowableOffset to 0
+     *   before: function(params) {
+     *     if (params.requestOptions.query.maxAllowableOffset) {
+     *       params.requestOptions.query.maxAllowableOffset = 0;
+     *     }
+     *   },
+     *   // use the AfterInterceptorCallback to check if `ssl` is set to 'true'
+     *   // on the response to the request, if it's set to 'false', change
+     *   // the value to 'true' before returning the response
+     *   after: function(response) {
+     *     if (!response.ssl) {
+     *       response.ssl = true;
+     *     }
+     *   }
+     * });
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
+     */
+    interceptors?: RequestInterceptor[];
     /**
      * 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.
      * 
@@ -807,7 +819,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#request)
      */
-    host?: string;
+    host?: string | RegExp;
     /**
      * Indicates whether requests made to the associated server should include credentials such as cookies and authorization headers.
      * 
@@ -884,6 +896,50 @@ declare namespace __esri {
     packages?: any[];
   }
 
+  /**
+   * Specifies the object used for intercepting and modifying requests made via [esriRequest](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html).
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+   */
+  export interface RequestInterceptor extends Object {
+    /**
+     * Makes changes to the response after the request is sent, but before it's returned to the caller.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+     */
+    after?: AfterInterceptorCallback;
+    /**
+     * Callback function that can make changes to the URL or options before the request is sent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+     */
+    before?: BeforeInterceptorCallback;
+    /**
+     * Sets or adds headers into `requestOptions.headers`. See also: [requestOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+     */
+    headers?: any;
+    /**
+     * Sets or adds a query parameter into `requestOptions.query`. See also: [requestOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+     */
+    query?: any;
+    /**
+     * Hardcodes the response. The request will not be sent. This is resolved as the response `data`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+     */
+    responseData?: any;
+    /**
+     * Specifies the URL(s) to apply to the interceptors. If the value is type `String`, then it matches if the request URL starts with that string. If null or undefined, the interceptor will apply to all relevant requests.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-config.html#RequestInterceptor)
+     */
+    urls?: string | RegExp | (string | RegExp)[];
+  }
+
 
 
   export type WatchCallback = (newValue: any, oldValue: any, propertyName: string, target: Accessor) => void;
@@ -1179,7 +1235,7 @@ declare namespace __esri {
 
   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.
+     * Converts an instance of  [this class]() to its [ArcGIS portal JSON](https://developers.arcgis.com/documentation/common-data-types/geometry-objects.htm) 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)
      * 
@@ -1254,15 +1310,6 @@ declare namespace __esri {
      */
     readonly loadWarnings: any[];
 
-    /**
-     * **Deprecated at 4.7.** `always()` may be used to execute a function if creating an instance of the class is rejected or resolved. The input function will always execute no matter the response.
-     * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#always)
-     * 
-     * @param callbackOrErrback The function to execute when creating an instance of the class 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.
      * 
@@ -1303,15 +1350,6 @@ declare namespace __esri {
      * 
      */
     load(): IPromise<any>;
-    /**
-     * **Deprecated at 4.7.** Use `otherwise()` to call a function once creating an instance of the class is rejected.
-     * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Loadable.html#otherwise)
-     * 
-     * @param errback The function to execute when creating an instance of the class fails.
-     * 
-     */
-    otherwise(errback?: Function): IPromise<any>;
     /**
      * `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 instance of the class loads. The `errback` executes if the instance of the class fails to load.
      * 
@@ -1337,15 +1375,6 @@ declare namespace __esri {
   }
 
   interface corePromise {
-    /**
-     * **Deprecated at 4.7.** `always()` may be used to execute a function if creating an instance of the class is rejected or resolved. The input function will always execute no matter the response.
-     * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#always)
-     * 
-     * @param callbackOrErrback The function to execute when creating an instance of the class is rejected or resolved.
-     * 
-     */
-    always(callbackOrErrback?: Function): IPromise<any>;
     /**
      * `isFulfilled()` may be used to verify if creating an instance of the class is fulfilled (either resolved or rejected). If it is fulfilled, `true` will be returned.
      * 
@@ -1370,15 +1399,6 @@ declare namespace __esri {
      * 
      */
     isResolved(): boolean;
-    /**
-     * **Deprecated at 4.7.** Use `otherwise()` to call a function once creating an instance of the class is rejected.
-     * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Promise.html#otherwise)
-     * 
-     * @param errback The function to execute when creating an instance of the class fails.
-     * 
-     */
-    otherwise(errback?: Function): IPromise<any>;
     /**
      * `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 instance of the class loads. The `errback` executes if the instance of the class fails to load.
      * 
@@ -2136,7 +2156,7 @@ declare namespace __esri {
      * 
      * @param coordinates The MGRS notation string for the coordinates.
      * @param spatialReference A spatial reference object representing a [geographic coordinate system](https://developers.arcgis.com/rest/services-reference/geographic-coordinate-systems.htm) referenced by the MGRS coordinates. If `null`, WGS84 will be used.
-     * @param conversionMode The mode used by the given MGRS coordinates.  **Known values**: automatic | new-180-in-zone-01 | new-180-in-zone-60 | old-180-in-zone-01 | old-180-in-zone-60
+     * @param conversionMode The mode used by the given MGRS coordinates.  **Possible Values**: automatic | new-180-in-zone-01 | new-180-in-zone-60 | old-180-in-zone-01 | old-180-in-zone-60
      * 
      */
     fromMgrs(coordinates: string, spatialReference: SpatialReference, conversionMode: string): Point;
@@ -2162,7 +2182,7 @@ declare namespace __esri {
      * 
      * @param coordinates The UTM notation string for the coordinates.
      * @param spatialReference A spatial reference object representing a [geographic coordinate system](https://developers.arcgis.com/rest/services-reference/geographic-coordinate-systems.htm) that the UTM coordinates are in. If `null`, WGS84 will be used.
-     * @param conversionMode The latitude notation scheme used by the given UTM coordinates, either a latitudinal band, or a hemisphere designator.  **Known values**: latitude-band-indicators | north-south-indicators
+     * @param conversionMode The latitude notation scheme used by the given UTM coordinates, either a latitudinal band, or a hemisphere designator.  **Possible Values**: latitude-band-indicators | north-south-indicators
      * 
      */
     fromUtm(coordinates: string, spatialReference: SpatialReference, conversionMode: string): Point;
@@ -2212,7 +2232,7 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-coordinateFormatter.html#toLatitudeLongitude)
      * 
      * @param point The location to be represented as a formatted latitude/longitude string. The point's [spatial reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#spatialReference) should either be WGS84 or another [geographic coordinate system](https://developers.arcgis.com/rest/services-reference/geographic-coordinate-systems.htm).
-     * @param format The mode to use when formatting the latitude/longitude string.  **Known values**: dd | ddm | dms
+     * @param format The mode to use when formatting the latitude/longitude string.  **Possible Values**: dd | ddm | dms
      * @param decimalPlaces The number of decimal places to use, it should be an integer from 0 to 16.
      * 
      */
@@ -2239,7 +2259,7 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-coordinateFormatter.html#toMgrs)
      * 
      * @param point The location to be represented in MGRS notation. The point's [spatial reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#spatialReference) should either be WGS84 or another [geographic coordinate system](https://developers.arcgis.com/rest/services-reference/geographic-coordinate-systems.htm)
-     * @param conversionMode The mode to use for the returned MGRS notation string.  **Known values**: automatic | new-180-in-zone-01 | new-180-in-zone-60 | old-180-in-zone-01 | old-180-in-zone-60
+     * @param conversionMode The mode to use for the returned MGRS notation string.  **Possible Values**: automatic | new-180-in-zone-01 | new-180-in-zone-60 | old-180-in-zone-01 | old-180-in-zone-60
      * @param precision The precision with which to represent the coordinates, it should be an integer from 0 to 8.
      * @param addSpaces If `false`, the generated string will contain no spaces. If `true`, a space separates the grid zone designator, the 100km square identifier, and the numerical easting and northing values.
      * 
@@ -2289,7 +2309,7 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-coordinateFormatter.html#toUtm)
      * 
      * @param point The location to be represented in UTM notation. The point's [spatial reference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html#spatialReference) should either be WGS84 or another [geographic coordinate system](https://developers.arcgis.com/rest/services-reference/geographic-coordinate-systems.htm)
-     * @param conversionMode The latitude notation scheme to use in the returned UTM notation string, either a latitudinal band, or a hemisphere designator.  **Known values**: latitude-band-indicators | north-south-indicators
+     * @param conversionMode The latitude notation scheme to use in the returned UTM notation string, either a latitudinal band, or a hemisphere designator.  **Possible Values**: latitude-band-indicators | north-south-indicators
      * @param addSpaces If `false`, the generated string will contain no spaces. If `true`, a space separates the UTM zone and latitude designator and each numerical easting and northing value.
      * 
      */
@@ -2569,7 +2589,7 @@ declare namespace __esri {
      */
     readonly cache: any;
     /**
-     * The extent of the geometry. For points, the extent is null.
+     * The extent of the geometry. For a point, the extent is null.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Geometry.html#extent)
      */
@@ -4602,7 +4622,7 @@ declare namespace __esri {
      * @param extent An extent used to determine the suitability of the returned transformation. The extent will be re-projected to the `inSpatialReference` if it has a different spatial reference.
      * 
      */
-    getTransformation(inSpatialReference: SpatialReference | SpatialReferenceProperties, outSpatialReference: SpatialReference, extent?: Extent): GeographicTransformation;
+    getTransformation(inSpatialReference: SpatialReference | SpatialReferenceProperties, outSpatialReference: SpatialReference | SpatialReferenceProperties, extent?: Extent): GeographicTransformation;
     /**
      * Returns a list of all geographic transformations suitable to convert geometries from the input spatial reference to the specified output spatial reference. The list is ordered in descending order by suitability, with the most suitable being first in the list. 
      * > **Known Limitations** 
@@ -4616,7 +4636,7 @@ declare namespace __esri {
      * @param extent An extent used to determine the suitability of the returned transformations. The extent will be re-projected to the input spatial reference if necessary.
      * 
      */
-    getTransformations(inSpatialReference: SpatialReference | SpatialReferenceProperties, outSpatialReference: SpatialReference, extent?: Extent): GeographicTransformation[];
+    getTransformations(inSpatialReference: SpatialReference | SpatialReferenceProperties, outSpatialReference: SpatialReference | SpatialReferenceProperties, extent?: Extent): GeographicTransformation[];
     /**
      * Indicates if all dependencies of this module have been loaded.
      * 
@@ -5289,7 +5309,7 @@ declare namespace __esri {
      */
     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.
+     * 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 4.8 to get the actual `popupTemplate` of the graphic, see the [getEffectivePopupTemplate()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#getEffectivePopupTemplate) method that either returns this value or the `popupTemplate` of the graphic's layer.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#popupTemplate)
      */
@@ -5326,6 +5346,14 @@ declare namespace __esri {
      * 
      */
     getAttribute(name: string): any;
+    /**
+     * Returns the popup template applicable for the graphic. It's either the value of [popupTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#popupTemplate) or the `popupTemplate` from the graphic's layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#getEffectivePopupTemplate)
+     * 
+     * 
+     */
+    getEffectivePopupTemplate(): PopupTemplate;
     /**
      * Sets a new value to the specified attribute.
      * 
@@ -5373,7 +5401,7 @@ declare namespace __esri {
      */
     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.
+     * 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 4.8 to get the actual `popupTemplate` of the graphic, see the [getEffectivePopupTemplate()](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#getEffectivePopupTemplate) method that either returns this value or the `popupTemplate` of the graphic's layer.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html#popupTemplate)
      */
@@ -5409,6 +5437,28 @@ declare namespace __esri {
      * @default false
      */
     readonly loaded: boolean;
+    /**
+     * Specifies the user navigation constraints relative to the ground surface.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#navigationConstraint)
+     */
+    navigationConstraint: GroundNavigationConstraint;
+    /**
+     * Opacity of the ground, including surface default color and the basemap (without reference layers). This property can be used for a see-through ground effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#opacity)
+     * 
+     * @default 1
+     */
+    opacity: number;
+    /**
+     * The color of the ground surface, displayed underneath the basemap. If this is null, a grid is displayed instead. The alpha value in the color is ignored. Use the [opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#opacity) property to control the opacity of the ground.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#surfaceColor)
+     * 
+     * @default null
+     */
+    surfaceColor: Color;
 
     /**
      * Creates a deep clone of this object.
@@ -5464,6 +5514,28 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#layers)
      */
     layers?: CollectionProperties<ElevationLayerProperties>;
+    /**
+     * Specifies the user navigation constraints relative to the ground surface.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#navigationConstraint)
+     */
+    navigationConstraint?: GroundNavigationConstraintProperties;
+    /**
+     * Opacity of the ground, including surface default color and the basemap (without reference layers). This property can be used for a see-through ground effect.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#opacity)
+     * 
+     * @default 1
+     */
+    opacity?: number;
+    /**
+     * The color of the ground surface, displayed underneath the basemap. If this is null, a grid is displayed instead. The alpha value in the color is ignored. Use the [opacity](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#opacity) property to control the opacity of the ground.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#surfaceColor)
+     * 
+     * @default null
+     */
+    surfaceColor?: Color | number[] | string;
   }
 
   /**
@@ -5505,6 +5577,39 @@ declare namespace __esri {
   }
 
 
+  export interface GroundNavigationConstraintProperties extends Object {
+    /**
+     * The type of the constraint. It can be one of the following: 
+     * 
+     * Value      | Description
+     * -----------|--------------------
+     * stay-above | User can only navigate above ground surface
+     * none       | User can navigate above and below the ground surface
+     * 
+     * Default value: stay-above
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#navigationConstraint)
+     */
+    type?: string;
+  }
+
+  export interface GroundNavigationConstraint extends AnonymousAccessor {
+    /**
+     * The type of the constraint. It can be one of the following: 
+     * 
+     * Value      | Description
+     * -----------|--------------------
+     * stay-above | User can only navigate above ground surface
+     * none       | User can navigate above and below the ground surface
+     * 
+     * Default value: stay-above
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#navigationConstraint)
+     */
+    type: string;
+  }
+
+
   export interface GroundQueryElevationOptions extends Object {
     /**
      * Indicates whether to return additional sample information for each sampled coordinate.
@@ -6614,12 +6719,12 @@ declare namespace __esri {
      * 
      * @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 col 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>;
+    fetchTile(level: number, row: number, col: 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: 
      * 
@@ -6647,10 +6752,10 @@ declare namespace __esri {
      * 
      * @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).
+     * @param col 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>;
+    getTileUrl(level: number, row: number, col: number): string | IPromise<any>;
 
 
     on(name: "layerview-create", eventHandler: BaseTileLayerLayerviewCreateEventHandler): IHandle;
@@ -6711,6 +6816,119 @@ declare namespace __esri {
     view: View;
   }
 
+  interface BingMapsLayer extends BaseTileLayer {
+    /**
+     * Expose Bing logo url.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#bingLogo)
+     */
+    readonly bingLogo: string;
+    /**
+     * Copyright information.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#copyright)
+     */
+    readonly copyright: string;
+    /**
+     * Provides culture specific map labels. For more information visit: https://msdn.microsoft.com/en-us/library/ff701709.aspx  For a list of supported culture codes please visit: https://msdn.microsoft.com/en-us/library/hh441729.aspx
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#culture)
+     * 
+     * @default "en-US"
+     */
+    culture: string;
+    /**
+     * Bing Maps Key.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#key)
+     * 
+     * @default null
+     */
+    key: string;
+    /**
+     * This will alter Geopolitical disputed borders and labels to align with the specified user region.  For more information on Bing's region setting please visit: https://msdn.microsoft.com/en-us/library/ff701704.aspx  For a list of supported country codes please visit: see https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#region)
+     * 
+     * @default null
+     */
+    region: string;
+    /**
+     * The three supported maps are: `road` | `aerial` | `hybrid`  For more information on Bing map styles please visit: https://msdn.microsoft.com/en-us/library/ff701716.aspx
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#style)
+     * 
+     * @default "road"
+     */
+    style: string;
+
+
+    on(name: "layerview-create", eventHandler: BingMapsLayerLayerviewCreateEventHandler): IHandle;
+
+    on(name: "layerview-destroy", eventHandler: BingMapsLayerLayerviewDestroyEventHandler): IHandle;
+  }
+
+  interface BingMapsLayerConstructor {
+    /**
+     * This layer supports Microsoft's Bing tiled map content. Three map styles are supported - `road`, `aerial` and `hybrid`. Please note that a valid [Bing Maps key](https://msdn.microsoft.com/en-us/library/ff428642.aspx) is required to use this layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html)
+     */
+
+    new(properties?: BingMapsLayerProperties): BingMapsLayer;
+  }
+
+  export const BingMapsLayer: BingMapsLayerConstructor;
+
+  interface BingMapsLayerProperties extends BaseTileLayerProperties {
+    /**
+     * Provides culture specific map labels. For more information visit: https://msdn.microsoft.com/en-us/library/ff701709.aspx  For a list of supported culture codes please visit: https://msdn.microsoft.com/en-us/library/hh441729.aspx
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#culture)
+     * 
+     * @default "en-US"
+     */
+    culture?: string;
+    /**
+     * Bing Maps Key.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#key)
+     * 
+     * @default null
+     */
+    key?: string;
+    /**
+     * This will alter Geopolitical disputed borders and labels to align with the specified user region.  For more information on Bing's region setting please visit: https://msdn.microsoft.com/en-us/library/ff701704.aspx  For a list of supported country codes please visit: see https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#region)
+     * 
+     * @default null
+     */
+    region?: string;
+    /**
+     * The three supported maps are: `road` | `aerial` | `hybrid`  For more information on Bing map styles please visit: https://msdn.microsoft.com/en-us/library/ff701716.aspx
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-BingMapsLayer.html#style)
+     * 
+     * @default "road"
+     */
+    style?: string;
+  }
+
+  export interface BingMapsLayerLayerviewCreateEvent {
+
+    layerView: LayerView;
+
+    view: View;
+  }
+
+  export interface BingMapsLayerLayerviewDestroyEvent {
+
+    layerView: LayerView;
+
+    view: View;
+  }
+
   interface CSVLayer extends Layer {
     /**
      * Copyright information for the layer.
@@ -6758,19 +6976,24 @@ declare namespace __esri {
      */
     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).
+     * 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`.  Multiple Label classes with different `where` clauses can be used to define several labels with varying styles on the same feature. Likewise, multiple label classes may be used to label different types of features (for example blue labels for lakes and green labels for parks). 
+     * > **Known Limitations** 
+     *   * WebGL must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is 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#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).
+     * > **Known Limitations** 
+     *   * WebGL must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * Currently the `labelsVisible` property must be explicitly set to `true` for labels to be printed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible: boolean;
     /**
@@ -6860,17 +7083,23 @@ declare namespace __esri {
      */
     url: string;
 
+    /**
+     * 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-CSVLayer.html#createQuery)
+     * 
+     * 
+     */
+    createQuery(): Query;
     /**
      * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the CSV data 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. 
-     * > **Capabilities and Limitations**  The following lists capabilities with some limitations when executing a query: 
-     *   * Use [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where) to query based on a SQL where clause.
-     *   * You can perform spatial queries using the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) parameters with the following limitations:
-     *   * The `geometry` parameter only supports [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) and [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries.
-     *   * The only supported `spatialRelationship` is `intersects`.
-     *   * The `distance` and `units` parameters are not supported.
-     *   * You can query fields for statistics using onStatisticField. However,
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The `orderByField` param is not supported.
+     * > **Known Limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are currently not supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#queryExtent)
      * 
@@ -6880,15 +7109,13 @@ declare namespace __esri {
     queryExtent(params?: Query | QueryProperties): IPromise<any>;
     /**
      * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the CSV data 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. 
-     * > **Capabilities and Limitations**  The following lists capabilities with some limitations when executing a query: 
-     *   * Use [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where) to query based on a SQL where clause.
-     *   * You can perform spatial queries using the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) parameters with the following limitations:
-     *   * The `geometry` parameter only supports [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) and [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries.
-     *   * The only supported `spatialRelationship` is `intersects`.
-     *   * The `distance` and `units` parameters are not supported.
-     *   * You can query fields for statistics using onStatisticField. However,
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The `orderByField` param is not supported.
+     * > **Known Limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are currently not supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#queryFeatureCount)
      * 
@@ -6898,15 +7125,13 @@ declare namespace __esri {
     queryFeatureCount(params?: Query | QueryProperties): IPromise<number>;
     /**
      * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the CSV data 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. 
-     * > **Capabilities and Limitations**  The following lists capabilities with some limitations when executing a query: 
-     *   * Use [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where) to query based on a SQL where clause.
-     *   * You can perform spatial queries using the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) parameters with the following limitations:
-     *   * The `geometry` parameter only supports [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) and [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries.
-     *   * The only supported `spatialRelationship` is `intersects`.
-     *   * The `distance` and `units` parameters are not supported.
-     *   * You can query fields for statistics using onStatisticField. However,
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The `orderByField` param is not supported.
+     * > **Known Limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#queryFeatures)
      * 
@@ -6916,15 +7141,13 @@ declare namespace __esri {
     queryFeatures(params?: Query | QueryProperties): IPromise<FeatureSet>;
     /**
      * Executes a [Query](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html) against the CSV data 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. 
-     * > **Capabilities and Limitations**  The following lists capabilities with some limitations when executing a query: 
-     *   * Use [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where) to query based on a SQL where clause.
-     *   * You can perform spatial queries using the [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) and [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) parameters with the following limitations:
-     *   * The `geometry` parameter only supports [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) and [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries.
-     *   * The only supported `spatialRelationship` is `intersects`.
-     *   * The `distance` and `units` parameters are not supported.
-     *   * You can query fields for statistics using onStatisticField. However,
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The `orderByField` param is not supported.
+     * > **Known Limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are currently not supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#queryObjectIds)
      * 
@@ -6998,19 +7221,24 @@ declare namespace __esri {
      */
     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).
+     * 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`.  Multiple Label classes with different `where` clauses can be used to define several labels with varying styles on the same feature. Likewise, multiple label classes may be used to label different types of features (for example blue labels for lakes and green labels for parks). 
+     * > **Known Limitations** 
+     *   * WebGL must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is 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#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).
+     * > **Known Limitations** 
+     *   * WebGL must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * Currently the `labelsVisible` property must be explicitly set to `true` for labels to be printed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible?: boolean;
     /**
@@ -7277,7 +7505,7 @@ declare namespace __esri {
     rotation?: number;
   }
 
-  interface ElevationLayer extends Layer, ArcGISMapService, ArcGISCachedService, PortalLayer, TiledLayer {
+  interface ElevationLayer extends Layer, ArcGISCachedService, PortalLayer {
     /**
      * URL pointing to the Elevation layer resource on an ArcGIS Image Server.
      * 
@@ -7317,6 +7545,17 @@ declare namespace __esri {
      * 
      */
     fetchTile(level: number, row: number, column: number, noDataValue?: number): IPromise<ElevationTileData>;
+    /**
+     * 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-ElevationLayer.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;
     /**
      * 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.
      * 
@@ -7358,7 +7597,7 @@ declare namespace __esri {
 
   export const ElevationLayer: ElevationLayerConstructor;
 
-  interface ElevationLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISCachedServiceProperties, PortalLayerProperties, TiledLayerProperties {
+  interface ElevationLayerProperties extends LayerProperties, ArcGISCachedServiceProperties, PortalLayerProperties {
     /**
      * URL pointing to the Elevation layer resource on an ArcGIS Image Server.
      * 
@@ -7517,7 +7756,7 @@ declare namespace __esri {
      */
     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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields)
      */
@@ -7529,7 +7768,7 @@ declare namespace __esri {
      */
     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 | mesh
+     * 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), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties.  **Possible Values:** point | mulitpoint | polyline | polygon | extent | mesh
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType)
      */
@@ -7565,19 +7804,26 @@ declare namespace __esri {
      */
     historicMoment: Date;
     /**
-     * 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).
+     * 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.  The [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible) property of this layer must be set to `true` for labels to display in the view.  Multiple Label classes with different `where` clauses can be used to define several labels with varying styles on the same feature. Likewise, multiple label classes may be used to label different types of features (for example blue labels for lakes and green labels for parks). 
+     * > **Known Limitations** 
+     *   * [WebGL](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-rendering) must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display. Be sure to review the [WebGL limitations](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-limitations).
+     *   * Currently only FeatureLayers with point and polygon geometries are supported.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is 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#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).
+     * > **Known Limitations** 
+     *   * [WebGL](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-rendering) must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display. Be sure to review the [WebGL limitations](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-limitations).
+     *   * Currently only FeatureLayers with point and polygon geometries are supported.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * Currently the `labelsVisible` property must be explicitly set to `true` for labels to be printed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible: boolean;
     /**
@@ -7600,7 +7846,7 @@ declare namespace __esri {
      */
     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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties must also be set.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField)
      */
@@ -7626,25 +7872,25 @@ declare namespace __esri {
      */
     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.
+     * 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.  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), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), 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#renderer)
      */
     renderer: Renderer;
     /**
-     * When `true`, indicates that M values will be returned.
+     * When `true`, indicates that M values will be returned. When `false`, indicates that M values will never be returned. The layer view determines whether to include M values in feature queries when the property value is `undefined`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnM)
      * 
-     * @default false
+     * @default undefined
      */
     returnM: boolean;
     /**
-     * When `true`, indicates that Z values will be returned.
+     * When `true`, indicates that Z values will always be returned. When `false`, indicates that Z values will never be returned. The layer view determines whether to include Z values in feature queries when the property value is `undefined`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnZ)
      * 
-     * @default false
+     * @default undefined
      */
     returnZ: boolean;
     /**
@@ -7657,13 +7903,13 @@ declare namespace __esri {
      */
     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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) 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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties must also be set.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference)
      */
@@ -7854,13 +8100,13 @@ declare namespace __esri {
      */
     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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#fields)
      */
     fields?: FieldProperties[];
     /**
-     * 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 | mesh
+     * 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), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties.  **Possible Values:** point | mulitpoint | polyline | polygon | extent | mesh
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType)
      */
@@ -7872,19 +8118,26 @@ declare namespace __esri {
      */
     historicMoment?: DateProperties;
     /**
-     * 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).
+     * 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.  The [labelsVisible](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible) property of this layer must be set to `true` for labels to display in the view.  Multiple Label classes with different `where` clauses can be used to define several labels with varying styles on the same feature. Likewise, multiple label classes may be used to label different types of features (for example blue labels for lakes and green labels for parks). 
+     * > **Known Limitations** 
+     *   * [WebGL](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-rendering) must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display. Be sure to review the [WebGL limitations](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-limitations).
+     *   * Currently only FeatureLayers with point and polygon geometries are supported.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is 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#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).
+     * > **Known Limitations** 
+     *   * [WebGL](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-rendering) must be enabled in 2D [MapViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) for labels to display. Be sure to review the [WebGL limitations](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#webgl-limitations).
+     *   * Currently only FeatureLayers with point and polygon geometries are supported.
+     *   * Currently only one [LabelClass](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html) is supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * Currently the `labelsVisible` property must be explicitly set to `true` for labels to be printed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible?: boolean;
     /**
@@ -7907,7 +8160,7 @@ declare namespace __esri {
      */
     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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties must also be set.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField)
      */
@@ -7933,25 +8186,25 @@ declare namespace __esri {
      */
     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.
+     * 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.  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), [objectIdField](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#objectIdField), 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#renderer)
      */
     renderer?: RendererProperties;
     /**
-     * When `true`, indicates that M values will be returned.
+     * When `true`, indicates that M values will be returned. When `false`, indicates that M values will never be returned. The layer view determines whether to include M values in feature queries when the property value is `undefined`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnM)
      * 
-     * @default false
+     * @default undefined
      */
     returnM?: boolean;
     /**
-     * When `true`, indicates that Z values will be returned.
+     * When `true`, indicates that Z values will always be returned. When `false`, indicates that Z values will never be returned. The layer view determines whether to include Z values in feature queries when the property value is `undefined`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#returnZ)
      * 
-     * @default false
+     * @default undefined
      */
     returnZ?: boolean;
     /**
@@ -7964,13 +8217,13 @@ declare namespace __esri {
      */
     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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) 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.
+     * 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), [geometryType](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#geometryType), and [renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#renderer) properties must also be set.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#spatialReference)
      */
@@ -8356,7 +8609,7 @@ declare namespace __esri {
 
   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. 
+     * 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
      * ------|------------
@@ -8556,6 +8809,12 @@ declare namespace __esri {
      * @default true
      */
     screenSizePerspectiveEnabled: boolean;
+    /**
+     * For [GraphicsLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html) the type is `graphics`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-GraphicsLayer.html#type)
+     */
+    readonly type: "graphics";
 
     /**
      * Adds a graphic to the layer.
@@ -9021,7 +9280,7 @@ declare namespace __esri {
      */
     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. 
+     * Indicates how the layer should display in the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) widget. The possible values are listed below. 
      * 
      * Value | Description
      * ------|------------
@@ -9131,7 +9390,7 @@ declare namespace __esri {
      */
     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. 
+     * Indicates how the layer should display in the [LayerList](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html) widget. The possible values are listed below. 
      * 
      * Value | Description
      * ------|------------
@@ -9274,30 +9533,24 @@ declare namespace __esri {
   }
 
   interface ArcGISCachedService {
+    /**
+     * The copyright text as defined by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#copyright)
+     */
+    copyright: string;
+    /**
+     * The spatial reference of the layer as defined by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#spatialReference)
+     */
+    readonly spatialReference: SpatialReference;
     /**
      * 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](https://developers.arcgis.com/documentation/common-data-types/overview-of-common-data-types.htm) 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 {
@@ -9311,6 +9564,12 @@ declare namespace __esri {
   export const ArcGISCachedService: ArcGISCachedServiceConstructor;
 
   interface ArcGISCachedServiceProperties {
+    /**
+     * The copyright text as defined by the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISCachedService.html#copyright)
+     */
+    copyright?: string;
     /**
      * Contains information about the tiling scheme for the layer.
      * 
@@ -9341,7 +9600,7 @@ declare namespace __esri {
      */
     gdbVersion: string;
     /**
-     * The output image type.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg | pngjpg
+     * The output image type.  **Possible 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)
      * 
@@ -9379,6 +9638,19 @@ declare namespace __esri {
      */
     sublayers: Collection<Sublayer>;
 
+    /**
+     * Gets the parameters of the exported image to use when calling the [export REST operation](https://developers.arcgis.com/rest/services-reference/export-map.htm).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#createExportImageParameters)
+     * 
+     * @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 Server 10.3.
+     * 
+     */
+    createExportImageParameters(extent: Extent, width: number, height: number, options?: ArcGISDynamicMapServiceCreateExportImageParametersOptions): any;
     /**
      * 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.
      * 
@@ -9396,19 +9668,6 @@ declare namespace __esri {
      * 
      */
     findSublayerById(id: number): Sublayer;
-    /**
-     * Gets the parameters of the exported image to use when calling the [export REST operation](https://developers.arcgis.com/rest/services-reference/export-map.htm).
-     * 
-     * [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 Server 10.3.
-     * 
-     */
-    getExportImageParameters(extent: Extent, width: number, height: number, options?: ArcGISDynamicMapServiceGetExportImageParametersOptions): any;
   }
 
   interface ArcGISDynamicMapServiceConstructor {
@@ -9435,7 +9694,7 @@ declare namespace __esri {
      */
     gdbVersion?: string;
     /**
-     * The output image type.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg | pngjpg
+     * The output image type.  **Possible 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)
      * 
@@ -9475,11 +9734,11 @@ declare namespace __esri {
   }
 
 
-  export interface ArcGISDynamicMapServiceGetExportImageParametersOptions extends Object {
+  export interface ArcGISDynamicMapServiceCreateExportImageParametersOptions extends Object {
     /**
      * The rotation in degrees of the exported image. Available since ArcGIS Server 10.3.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#getExportImageParameters)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISDynamicMapService.html#createExportImageParameters)
      */
     rotation?: number;
   }
@@ -9524,7 +9783,7 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible 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)
      * 
@@ -9578,7 +9837,7 @@ declare namespace __esri {
      */
     multidimensionalInfo: any;
     /**
-     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * The pixel type.  **Possible 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)
      */
@@ -9697,7 +9956,7 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible 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)
      * 
@@ -9751,7 +10010,7 @@ declare namespace __esri {
      */
     multidimensionalInfo?: any;
     /**
-     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * The pixel type.  **Possible 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)
      */
@@ -9798,7 +10057,13 @@ declare namespace __esri {
 
   interface ArcGISMapService {
     /**
-     * The copyright text as defined by the map service.
+     * Indicates the layer's supported capabilities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    readonly capabilities: ArcGISMapServiceCapabilities;
+    /**
+     * The copyright text as defined by the service.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#copyright)
      */
@@ -9810,7 +10075,15 @@ declare namespace __esri {
      */
     fullExtent: Extent;
     /**
-     * The spatial reference of the layer as defined by the map service.
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#legendEnabled)
+     * 
+     * @default true
+     */
+    legendEnabled: boolean;
+    /**
+     * The spatial reference of the layer as defined by the service.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#spatialReference)
      */
@@ -9821,6 +10094,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#token)
      */
     readonly token: string;
+    /**
+     * The version of ArcGIS Server in which the map service is published.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#version)
+     */
+    readonly version: number;
   }
 
   interface ArcGISMapServiceConstructor {
@@ -9835,7 +10114,7 @@ declare namespace __esri {
 
   interface ArcGISMapServiceProperties {
     /**
-     * The copyright text as defined by the map service.
+     * The copyright text as defined by the service.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#copyright)
      */
@@ -9846,6 +10125,96 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#fullExtent)
      */
     fullExtent?: ExtentProperties;
+    /**
+     * Indicates whether the layer will be included in the legend.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#legendEnabled)
+     * 
+     * @default true
+     */
+    legendEnabled?: boolean;
+  }
+
+
+  export interface ArcGISMapServiceCapabilities extends Object {
+    /**
+     * Indicates options supported by the exportMap operation. Will be `null` if the `supportsExportMap` is `false`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    exportMap: ArcGISMapServiceCapabilitiesExportMap;
+    /**
+     * Indicates options supported by the exportTiles operation. Will be `null` if the `supportsExportTiles` is `false`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    exportTiles: ArcGISMapServiceCapabilitiesExportTiles;
+    /**
+     * Indicates operations that can be performed on the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    operations: ArcGISMapServiceCapabilitiesOperations;
+  }
+
+
+  export interface ArcGISMapServiceCapabilitiesExportMap extends Object {
+    /**
+     * Indicates if sublayers rendering can be modifyied or added using dynamic layers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsDynamicLayers: boolean;
+    /**
+     * Indicates if sublayers [visibility](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#visible) can be changed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsSublayerVisibility: boolean;
+    /**
+     * Indicates if sublayers [definition expression](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#definitionExpression) can be set.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsSublayerDefinitionExpression: boolean;
+  }
+
+
+  export interface ArcGISMapServiceCapabilitiesExportTiles extends Object {
+    /**
+     * Specifies the maximum number of tiles that can be exported to a cache dataset or a tile package.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    maxExportTilesCount: number;
+  }
+
+
+  export interface ArcGISMapServiceCapabilitiesOperations extends Object {
+    /**
+     * Indicates if features in the sublayers can be [queried](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#queryFeatures).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsQuery: boolean;
+    /**
+     * Indicates if the service can generate images.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsExportMap: boolean;
+    /**
+     * Indicates if the tiles from the service can be exported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsExportTiles: boolean;
+    /**
+     * Indicates if the service exposes a tile map that describes the presence of tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-mixins-ArcGISMapService.html#capabilities)
+     */
+    supportsTileMap: boolean;
   }
 
   interface PortalLayer {
@@ -10080,8 +10449,6 @@ declare namespace __esri {
 
 
     new(properties?: OpenStreetMapLayerProperties): OpenStreetMapLayer;
-
-    fromJSON(json: any): OpenStreetMapLayer;
   }
 
   export const OpenStreetMapLayer: OpenStreetMapLayerConstructor;
@@ -10240,7 +10607,8 @@ declare namespace __esri {
      */
     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)
+     * 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) 
+     * > **Known Limitation**  When applying featureReduction on a point SceneLayer layer updates are slow. This will be addressed in upcoming releases.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#featureReduction)
      */
@@ -10269,7 +10637,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible: boolean;
     /**
@@ -10412,7 +10780,8 @@ declare namespace __esri {
      */
     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)
+     * 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) 
+     * > **Known Limitation**  When applying featureReduction on a point SceneLayer layer updates are slow. This will be addressed in upcoming releases.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#featureReduction)
      */
@@ -10441,7 +10810,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-SceneLayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible?: boolean;
     /**
@@ -10887,7 +11256,7 @@ declare namespace __esri {
      */
     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
+     * Name of the default drawing tool defined for the template to create a feature.  **Possible 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)
      */
@@ -10930,7 +11299,7 @@ declare namespace __esri {
      */
     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
+     * Name of the default drawing tool defined for the template to create a feature.  **Possible 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)
      */
@@ -10958,7 +11327,7 @@ declare namespace __esri {
 
   export interface FeatureTemplateThumbnail extends Object {
     /**
-     * The MIME type of the image.  **Known Values:** image | png | jpg | jpeg
+     * The MIME type of the image.  **Possible Values:** image | png | jpg | jpeg
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-FeatureTemplate.html#thumbnail)
      */
@@ -11163,7 +11532,7 @@ declare namespace __esri {
      */
     extent: Extent;
     /**
-     * Map image format.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg
+     * Map image format.  **Possible 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)
      * 
@@ -11195,7 +11564,7 @@ declare namespace __esri {
      */
     layerIds: number[];
     /**
-     * The option for displaying or hiding the layer.  **Known Values:** show | hide | include | exclude
+     * The option for displaying or hiding the layer.  **Possible Values:** show | hide | include | exclude
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerOption)
      */
@@ -11249,7 +11618,7 @@ declare namespace __esri {
      */
     extent?: ExtentProperties;
     /**
-     * Map image format.  **Known Values:** png | png8 | png24 | png32 | jpg | pdf | bmp | gif | svg
+     * Map image format.  **Possible 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)
      * 
@@ -11281,7 +11650,7 @@ declare namespace __esri {
      */
     layerIds?: number[];
     /**
-     * The option for displaying or hiding the layer.  **Known Values:** show | hide | include | exclude
+     * The option for displaying or hiding the layer.  **Possible Values:** show | hide | include | exclude
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-ImageParameters.html#layerOption)
      */
@@ -11427,20 +11796,21 @@ declare namespace __esri {
      */
     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.
+     * 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.
      * 
      * [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 
+     * The position of the label. Possible values are based on the feature type. This property requires a value.  **Possible Values (Points):** above-center | above-left | above-right | below-center | below-left | below-right | center-center | center-left | center-right  **Possible 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  **Possible 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.
-     *   * 3D layers only support label placement for [Points](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
-     *   
-     *   
+     *   * Currently, if the label has a [line callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html) in a 3D SceneView, then only `above-center` is supported.
+     *   * Label placement only applies to [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) layers in 3D SceneViews.
+     *   * FeatureLayers only support labeling for [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) and [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries rendered with WebGL.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelPlacement)
+     * 
+     * @default null
      */
     labelPlacement: string;
     /**
@@ -11472,7 +11842,8 @@ declare namespace __esri {
      */
     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.
+     * 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. 
+     * > **Known Limitations**  Only very basic SQL is currently supported. 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where)
      */
@@ -11490,7 +11861,7 @@ declare namespace __esri {
 
   interface LabelClassConstructor {
     /**
-     * Defines label expressions, symbols, scale ranges, label priorities, and sets of label placement options for different groups of labels on a layer.
+     * Defines label expressions, symbols, scale ranges, label priorities, and label placement options for labels on a layer.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html)
      */
@@ -11510,20 +11881,21 @@ declare namespace __esri {
      */
     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.
+     * 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.
      * 
      * [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 
+     * The position of the label. Possible values are based on the feature type. This property requires a value.  **Possible Values (Points):** above-center | above-left | above-right | below-center | below-left | below-right | center-center | center-left | center-right  **Possible 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  **Possible 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.
-     *   * 3D layers only support label placement for [Points](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html).
-     *   
-     *   
+     *   * Currently, if the label has a [line callout](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-callouts-LineCallout3D.html) in a 3D SceneView, then only `above-center` is supported.
+     *   * Label placement only applies to [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) layers in 3D SceneViews.
+     *   * FeatureLayers only support labeling for [Point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) and [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries rendered with WebGL.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#labelPlacement)
+     * 
+     * @default null
      */
     labelPlacement?: string;
     /**
@@ -11555,7 +11927,8 @@ declare namespace __esri {
      */
     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.
+     * 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. 
+     * > **Known Limitations**  Only very basic SQL is currently supported. 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LabelClass.html#where)
      */
@@ -11565,13 +11938,13 @@ declare namespace __esri {
 
   export interface LabelClassLabelExpressionInfo extends Object {
     /**
-     * The expression defining the content of the label text.  **Deprecated as of v4.5. Use `expression` instead.**
+     * The SQL 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')`
+     * 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. Additionally, you can use `TextFormatting.NewLine` to add a new line to 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)
      */
@@ -11656,7 +12029,7 @@ declare namespace __esri {
      */
     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
+     * URL to the returned image. The image format must be of a type supported by the HTML `<img>` tag.  **Possible Values:** gif | jpg | png | bmp
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#href)
      */
@@ -11715,7 +12088,7 @@ declare namespace __esri {
      */
     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
+     * URL to the returned image. The image format must be of a type supported by the HTML `<img>` tag.  **Possible Values:** gif | jpg | png | bmp
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MapImage.html#href)
      */
@@ -11766,7 +12139,7 @@ declare namespace __esri {
      */
     lockRasterIds: number[];
     /**
-     * The mosaic method determines how the selected rasters are ordered.  **Known Values:** none | center | nadir | viewpoint | attribute | lock-raster | northwest | seamline
+     * The mosaic method determines how the selected rasters are ordered.  **Possible 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)
      */
@@ -11784,7 +12157,7 @@ declare namespace __esri {
      */
     objectIds: number[];
     /**
-     * Defines the mosaic operation used to resolve overlapping pixels.  **Known Values:** first | last | min | max | mean | blend
+     * Defines the mosaic operation used to resolve overlapping pixels.  **Possible Values:** first | last | min | max | mean | blend
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#operation)
      */
@@ -11845,7 +12218,7 @@ declare namespace __esri {
      */
     lockRasterIds?: number[];
     /**
-     * The mosaic method determines how the selected rasters are ordered.  **Known Values:** none | center | nadir | viewpoint | attribute | lock-raster | northwest | seamline
+     * The mosaic method determines how the selected rasters are ordered.  **Possible 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)
      */
@@ -11863,7 +12236,7 @@ declare namespace __esri {
      */
     objectIds?: number[];
     /**
-     * Defines the mosaic operation used to resolve overlapping pixels.  **Known Values:** first | last | min | max | mean | blend
+     * Defines the mosaic operation used to resolve overlapping pixels.  **Possible Values:** first | last | min | max | mean | blend
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-MosaicRule.html#operation)
      */
@@ -11914,7 +12287,7 @@ declare namespace __esri {
      */
     pixels: number[][];
     /**
-     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * The pixel type.  **Possible 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)
      */
@@ -11931,42 +12304,6 @@ declare namespace __esri {
      * [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 {
@@ -11997,7 +12334,7 @@ declare namespace __esri {
      */
     pixels?: number[][];
     /**
-     * The pixel type.  **Known Values:** s8 | s16 | s32 | u8 | u16 | u32 | f32 | f64
+     * The pixel type.  **Possible 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)
      */
@@ -12017,22 +12354,6 @@ declare namespace __esri {
   }
 
 
-  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 extends Object {
     /**
      * The maximum pixel value in the [pixels](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-PixelBlock.html#pixels) array.
@@ -12108,7 +12429,7 @@ declare namespace __esri {
      */
     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
+     * Defines the pixel type of the output image.  **Possible 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)
      * 
@@ -12151,7 +12472,7 @@ declare namespace __esri {
      */
     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
+     * Defines the pixel type of the output image.  **Possible 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)
      * 
@@ -12296,7 +12617,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible: boolean;
     /**
@@ -12366,7 +12687,7 @@ declare namespace __esri {
     /**
      * 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). 
      * > **Known Limitations** 
-     *   * [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in PopupTemplates set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6.1 map services (or later) created from ArcGIS Pro.
+     *   * [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in PopupTemplates set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6 map services (or later) created from ArcGIS Pro.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#popupTemplate)
      */
@@ -12374,8 +12695,8 @@ declare namespace __esri {
     /**
      * 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) and [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in renderers set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6.1 map services (or later) created from ArcGIS Pro.
+     *   * [3D symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html) are not currently supported in renderers set on MapImageLayer sublayers.
+     *   * [Visual variables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) and [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in renderers set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6 map services (or later) created from ArcGIS Pro.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#renderer)
      */
@@ -12482,7 +12803,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#labelsVisible)
      * 
-     * @default false
+     * @default true
      */
     labelsVisible?: boolean;
     /**
@@ -12552,7 +12873,7 @@ declare namespace __esri {
     /**
      * 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). 
      * > **Known Limitations** 
-     *   * [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in PopupTemplates set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6.1 map services (or later) created from ArcGIS Pro.
+     *   * [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in PopupTemplates set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6 map services (or later) created from ArcGIS Pro.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#popupTemplate)
      */
@@ -12560,8 +12881,8 @@ declare namespace __esri {
     /**
      * 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) and [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in renderers set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6.1 map services (or later) created from ArcGIS Pro.
+     *   * [3D symbols](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol3D.html) are not currently supported in renderers set on MapImageLayer sublayers.
+     *   * [Visual variables](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-SimpleRenderer.html#visualVariables) and [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expressions are not supported in renderers set on MapImageLayer sublayers unless they reference ArcGIS Enterprise 10.6 map services (or later) created from ArcGIS Pro.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html#renderer)
      */
@@ -13481,61 +13802,25 @@ declare namespace __esri {
     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;
-  }
-
-  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, RefreshableLayer, ScaleRangeLayer, PortalLayer, TiledLayer {
+  interface TileLayer extends Layer, ArcGISMapService, ArcGISCachedService, RefreshableLayer, ScaleRangeLayer, PortalLayer {
     /**
      * 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[];
+    /**
+     * For [TileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html) the type is `tile`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#type)
+     */
+    readonly type: "tile";
     /**
      * The URL of the REST endpoint of the layer. The URL may either point to a resource on ArcGIS Enterprise or ArcGIS Online.
      * 
@@ -13550,12 +13835,13 @@ declare namespace __esri {
      * 
      * @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 col 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.
+     * @param options.timestamp Number to append to the tile request to prevent fetching the tile from the browser cache.
      * 
      */
-    fetchTile(level: number, row: number, column: number, options?: TileLayerFetchTileOptions): IPromise<HTMLImageElement | HTMLCanvasElement>;
+    fetchTile(level: number, row: number, col: number, options?: TileLayerFetchTileOptions): IPromise<HTMLImageElement>;
     /**
      * This method returns a URL to a tile for a given level, row and column.
      * 
@@ -13588,15 +13874,7 @@ declare namespace __esri {
 
   export const TileLayer: TileLayerConstructor;
 
-  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;
+  interface TileLayerProperties extends LayerProperties, ArcGISMapServiceProperties, ArcGISCachedServiceProperties, RefreshableLayerProperties, ScaleRangeLayerProperties, PortalLayerProperties {
     /**
      * An array of tile servers used for changing map tiles.
      * 
@@ -13633,6 +13911,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#fetchTile)
      */
     allowImageDataAccess?: boolean;
+    /**
+     * Number to append to the tile request to prevent fetching the tile from the browser cache.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-TileLayer.html#fetchTile)
+     */
+    timestamp?: boolean;
   }
 
   interface UnknownLayer extends Layer {
@@ -13705,19 +13989,31 @@ declare namespace __esri {
     view: View;
   }
 
-  interface VectorTileLayer extends Layer, PortalLayer, ScaleRangeLayer, TiledLayer {
+  interface VectorTileLayer extends Layer, ScaleRangeLayer {
     /**
      * 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;
+    /**
+     * Indicates the layer's supported capabilities.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#capabilities)
+     */
+    readonly capabilities: VectorTileLayerCapabilities;
     /**
      * 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 portal item from which the layer is loaded. This will load the layer from the portal item, not the vector tile service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#portalItem)
+     */
+    portalItem: PortalItem;
     /**
      * The spatial reference of the layer.
      * 
@@ -13730,6 +14026,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#style)
      */
     style: any;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#tileInfo)
+     */
+    tileInfo: TileInfo;
     /**
      * 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).
      * 
@@ -13744,7 +14046,7 @@ declare namespace __esri {
     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.
+     * 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. When loading a style, it is the developer's responsibility to make sure that any relative urls in the style resolve correctly.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#loadStyle)
      * 
@@ -13773,7 +14075,13 @@ declare namespace __esri {
 
   export const VectorTileLayer: VectorTileLayerConstructor;
 
-  interface VectorTileLayerProperties extends LayerProperties, PortalLayerProperties, ScaleRangeLayerProperties, TiledLayerProperties {
+  interface VectorTileLayerProperties extends LayerProperties, ScaleRangeLayerProperties {
+    /**
+     * The portal item from which the layer is loaded. This will load the layer from the portal item, not the vector tile service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#portalItem)
+     */
+    portalItem?: PortalItemProperties;
     /**
      * The spatial reference of the layer.
      * 
@@ -13786,6 +14094,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#style)
      */
     style?: any;
+    /**
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#tileInfo)
+     */
+    tileInfo?: TileInfoProperties;
     /**
      * 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.
      * 
@@ -13809,27 +14123,71 @@ declare namespace __esri {
   }
 
 
+  export interface VectorTileLayerCapabilities extends Object {
+    /**
+     * Indicates options supported by the exportTiles operation. Will be `null` if the `supportsExportTiles` is `false`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#capabilities)
+     */
+    exportTiles: any;
+
+    exportMap: VectorTileLayerCapabilitiesExportMap;
+    /**
+     * Indicates operations that can be performed on the service.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#capabilities)
+     */
+    operations: VectorTileLayerCapabilitiesOperations;
+  }
+
+
+  export interface VectorTileLayerCapabilitiesExportMap extends Object {
+    /**
+     * Specifies the maximum number of tiles that can be exported to a cache dataset or a tile package.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#capabilities)
+     */
+    maxExportTilesCount: number;
+  }
+
+
+  export interface VectorTileLayerCapabilitiesOperations extends Object {
+    /**
+     * Indicates if the tiles from the service can be exported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#capabilities)
+     */
+    supportsExportTiles: boolean;
+    /**
+     * Indicates if the service exposes a tile map that describes the presence of tiles.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#capabilities)
+     */
+    supportsTileMap: boolean;
+  }
+
+
   export interface VectorTileLayerCurrentStyleInfo extends Object {
     /**
-     * The URL of a vector tile service.
+     * Absolute URL for 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.
+     * Absolute URL for vector tile service style.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
      */
     styleUrl: string;
     /**
-     * The sprite URL included in a style.
+     * Asbolute URL for sprites 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.
+     * Absolute template URL for font sets included in a style. The URL includes `{fontstack}` and `{range}` tokens.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-VectorTileLayer.html#currentStyleInfo)
      */
@@ -13848,7 +14206,7 @@ declare namespace __esri {
     layerDefinition: any;
   }
 
-  interface WebTileLayer extends Layer, TiledLayer, ScaleRangeLayer, RefreshableLayer {
+  interface WebTileLayer extends Layer, ScaleRangeLayer, RefreshableLayer {
     /**
      * The attribution information for the layer.
      * 
@@ -13870,11 +14228,23 @@ declare namespace __esri {
      */
     subDomains: string[];
     /**
-     * The tile server names for the layer.
+     * The tiling scheme information for the layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#tileInfo)
+     */
+    tileInfo: TileInfo;
+    /**
+     * The list of tile server urls for the layer. It's computed from the [urlTemplate](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#urlTemplate) and the list of [subDomains](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#subDomains)
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#tileServers)
      */
-    tileServers: string[];
+    readonly tileServers: string[];
+    /**
+     * For [WebTileLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html) the type is `web-tile`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#type)
+     */
+    readonly type: "web-tile";
     /**
      * 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.
      * 
@@ -13882,6 +14252,32 @@ declare namespace __esri {
      */
     urlTemplate: 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-WebTileLayer.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.
+     * @param options.timestamp A timestamp to append to the tile url to avoid loading a cached version of the tile.
+     * 
+     */
+    fetchTile(level: number, row: number, column: number, options?: WebTileLayerFetchTileOptions): IPromise<HTMLImageElement>;
+    /**
+     * 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-WebTileLayer.html#getTileUrl)
+     * 
+     * @param level The requested tile's level.
+     * @param row The requested tile's row.
+     * @param column The requested tile's column.
+     * 
+     */
+    getTileUrl(level: number, row: number, column: number): string;
+
 
     on(name: "layerview-create", eventHandler: WebTileLayerLayerviewCreateEventHandler): IHandle;
 
@@ -13896,13 +14292,11 @@ declare namespace __esri {
      */
 
     new(properties?: WebTileLayerProperties): WebTileLayer;
-
-    fromJSON(json: any): WebTileLayer;
   }
 
   export const WebTileLayer: WebTileLayerConstructor;
 
-  interface WebTileLayerProperties extends LayerProperties, TiledLayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
+  interface WebTileLayerProperties extends LayerProperties, ScaleRangeLayerProperties, RefreshableLayerProperties {
     /**
      * The attribution information for the layer.
      * 
@@ -13916,11 +14310,11 @@ declare namespace __esri {
      */
     subDomains?: string[];
     /**
-     * The tile server names for the layer.
+     * The tiling scheme information for the layer.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#tileServers)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#tileInfo)
      */
-    tileServers?: string[];
+    tileInfo?: TileInfoProperties;
     /**
      * 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.
      * 
@@ -13943,6 +14337,22 @@ declare namespace __esri {
     view: View;
   }
 
+
+  export interface WebTileLayerFetchTileOptions 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-WebTileLayer.html#fetchTile)
+     */
+    allowImageDataAccess?: boolean;
+    /**
+     * A timestamp to append to the tile url to avoid loading a cached version of the tile.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-WebTileLayer.html#fetchTile)
+     */
+    timestamp?: boolean;
+  }
+
   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.
@@ -14480,13 +14890,23 @@ declare namespace __esri {
     ground?: GroundProperties | string;
   }
 
+  /**
+   * A convenience module for importing [PointCloudRenderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html) classes when developing with [TypeScript](https://developers.arcgis.com/javascript/latest/guide/typescript-setup/index.html). For example, rather than importing renderers one at a time like this:
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-pointCloudRenderers.html)
+   */
+  interface pointCloudRenderers {
+  }
+
+  export const pointCloudRenderers: pointCloudRenderers;
+
   interface PopupTemplate extends Accessor, JSONSupport {
     /**
-     * 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.
+     * 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-actions-ActionButton.html) or [action toggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.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 [ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [ActionToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#actions)
      */
-    actions: Collection<Action>;
+    actions: Collection<ActionButton | ActionToggle>;
     /**
      * 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.
@@ -14565,11 +14985,11 @@ declare namespace __esri {
 
   interface PopupTemplateProperties {
     /**
-     * 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.
+     * 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-actions-ActionButton.html) or [action toggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.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 [ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [ActionToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#actions)
      */
-    actions?: CollectionProperties<ActionProperties>;
+    actions?: CollectionProperties<ActionButton | ActionToggle>;
     /**
      * 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.
@@ -14707,7 +15127,7 @@ declare namespace __esri {
      */
     expression: string;
     /**
-     * Indicates the return type of the Arcade expression. This is an optional property.  **Known Values:** string | number
+     * Indicates the return type of the Arcade expression. This is an optional property.  **Possible Values:** string | number
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#expressionInfos)
      */
@@ -14735,7 +15155,7 @@ declare namespace __esri {
      */
     label?: string;
     /**
-     * For editable popups, defines the text box format.      **Known Values:** rich-text | text-area | text-box
+     * For editable popups, defines the text box format.      **Possible Values:** rich-text | text-area | text-box
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-PopupTemplate.html#fieldInfos)
      */
@@ -14757,7 +15177,7 @@ declare namespace __esri {
 
   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
+     * Used only with Date fields. Specifies how the date should appear in a popup. **Possible 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)
      */
@@ -14876,7 +15296,7 @@ declare namespace __esri {
 
   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
+     * 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.  **Possible Values:** public | private
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#access)
      */
@@ -15064,6 +15484,14 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#galleryTemplatesGroupQuery)
      */
     galleryTemplatesGroupQuery: string;
+    /**
+     * Indicates whether the organization has content categories.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#hasCategorySchema)
+     * 
+     * @default false
+     */
+    hasCategorySchema: boolean;
     /**
      * 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.
      * 
@@ -15157,7 +15585,7 @@ declare namespace __esri {
      */
     portalHostname: string;
     /**
-     * The portal mode.  **Known Values:** multitenant | singletenant
+     * The portal mode.  **Possible Values:** multitenant | singletenant
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalMode)
      */
@@ -15219,7 +15647,7 @@ declare namespace __esri {
      */
     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
+     * 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).  **Possible Values:** english | metric
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#units)
      */
@@ -15272,6 +15700,14 @@ declare namespace __esri {
      * 
      */
     fetchBasemaps(basemapGalleryGroupQuery?: string): IPromise<Basemap[]>;
+    /**
+     * If present, fetches the organization's category schema.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchCategorySchema)
+     * 
+     * 
+     */
+    fetchCategorySchema(): IPromise<any[]>;
     /**
      * Fetches the featured groups in the Portal.
      * 
@@ -15280,6 +15716,14 @@ declare namespace __esri {
      * 
      */
     fetchFeaturedGroups(): IPromise<PortalGroup[]>;
+    /**
+     * Fetches and returns the associated regions with the portal instance.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#fetchRegions)
+     * 
+     * 
+     */
+    fetchRegions(): IPromise<any[]>;
     /**
      * 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.
      * 
@@ -15333,7 +15777,7 @@ declare namespace __esri {
 
   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
+     * 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.  **Possible Values:** public | private
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#access)
      */
@@ -15521,6 +15965,14 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#galleryTemplatesGroupQuery)
      */
     galleryTemplatesGroupQuery?: string;
+    /**
+     * Indicates whether the organization has content categories.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#hasCategorySchema)
+     * 
+     * @default false
+     */
+    hasCategorySchema?: boolean;
     /**
      * 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.
      * 
@@ -15600,7 +16052,7 @@ declare namespace __esri {
      */
     portalHostname?: string;
     /**
-     * The portal mode.  **Known Values:** multitenant | singletenant
+     * The portal mode.  **Possible Values:** multitenant | singletenant
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#portalMode)
      */
@@ -15650,7 +16102,7 @@ declare namespace __esri {
      */
     templatesGroupQuery?: 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
+     * 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).  **Possible Values:** english | metric
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#units)
      */
@@ -15781,7 +16233,7 @@ declare namespace __esri {
 
   interface PortalGroup extends Accessor {
     /**
-     * The access privileges on the group which determines who can see and access the group.  **Known Values:** private | org | public
+     * The access privileges on the group which determines who can see and access the group.  **Possible Values:** private | org | public
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#access)
      */
@@ -15861,6 +16313,14 @@ declare namespace __esri {
      */
     readonly url: string;
 
+    /**
+     * If present, fetches the group's category schema.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#fetchCategorySchema)
+     * 
+     * 
+     */
+    fetchCategorySchema(): IPromise<any[]>;
     /**
      * Fetches the current members of the group. This method is only available to members or administrators of the group. View the ArcGIS REST API documentation for the [Group Users](https://developers.arcgis.com/rest/users-groups-and-items/group-users.htm) for more details.
      * 
@@ -15899,7 +16359,7 @@ declare namespace __esri {
 
   interface PortalGroupProperties {
     /**
-     * The access privileges on the group which determines who can see and access the group.  **Known Values:** private | org | public
+     * The access privileges on the group which determines who can see and access the group.  **Possible Values:** private | org | public
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#access)
      */
@@ -15981,12 +16441,24 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#accessInformation)
      */
     accessInformation: string;
+    /**
+     * Contains an array of objects containing proxy information for premium platform services. This is most widely seen in registered applications that work with premium and subscriber services, e.g. routing and analysis services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#applicationProxies)
+     */
+    readonly applicationProxies: PortalItemApplicationProxies[];
     /**
      * 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;
+    /**
+     * An array of organization categories that are set on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#categories)
+     */
+    categories: string[];
     /**
      * The date the item was created.
      * 
@@ -16011,6 +16483,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#extent)
      */
     extent: Extent;
+    /**
+     * An array of group categories set on the item. This varies slightly from `categories` as it only returns categories in the group content returned from [PortalGroup.queryItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#queryItems).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#groupCategories)
+     */
+    groupCategories: string[];
     /**
      * The unique id for the item.
      * 
@@ -16098,6 +16576,14 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#portal)
      */
     portal: Portal;
+    /**
+     * An array of string URLs. These URLs should point to screenshots (i.e. screen captures) associated with an application.  An example value could be something similar to `"screenshots/Basic.png"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#screenshots)
+     * 
+     * @default null
+     */
+    screenshots: string[];
     /**
      * The size of the item (in bytes).
      * 
@@ -16169,7 +16655,7 @@ declare namespace __esri {
      * 
      * [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
+     * @param responseType The format of the response.  **Possible Values:** json | xml | text | blob | array-buffer | document
      * 
      */
     fetchData(responseType?: string): IPromise<any>;
@@ -16252,6 +16738,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#avgRating)
      */
     avgRating?: number;
+    /**
+     * An array of organization categories that are set on the item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#categories)
+     */
+    categories?: string[];
     /**
      * The date the item was created.
      * 
@@ -16276,6 +16768,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#extent)
      */
     extent?: ExtentProperties;
+    /**
+     * An array of group categories set on the item. This varies slightly from `categories` as it only returns categories in the group content returned from [PortalGroup.queryItems](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#queryItems).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#groupCategories)
+     */
+    groupCategories?: string[];
     /**
      * The unique id for the item.
      * 
@@ -16330,6 +16828,14 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#portal)
      */
     portal?: PortalProperties;
+    /**
+     * An array of string URLs. These URLs should point to screenshots (i.e. screen captures) associated with an application.  An example value could be something similar to `"screenshots/Basic.png"`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#screenshots)
+     * 
+     * @default null
+     */
+    screenshots?: string[];
     /**
      * The size of the item (in bytes).
      * 
@@ -16375,6 +16881,28 @@ declare namespace __esri {
   }
 
 
+  export interface PortalItemApplicationProxies extends Object {
+    /**
+     * The URL of the premium map service layer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#applicationProxies)
+     */
+    sourceUrl: string;
+    /**
+     * The proxy URL for the source URL.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#applicationProxies)
+     */
+    proxyUrl: string;
+    /**
+     * The proxy ID registered in ArcGIS Online or ArcGIS Enterprise Portal.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalItem.html#applicationProxies)
+     */
+    proxyId: string;
+  }
+
+
   export interface PortalItemFetchRelatedItemsParams extends Object {
     /**
      * The type of relationship between the two items. See [Relationship types](https://developers.arcgis.com/rest/users-groups-and-items/relationship-types.htm) for a complete listing of types.
@@ -16411,6 +16939,18 @@ declare namespace __esri {
   }
 
   interface PortalQueryParams extends Accessor {
+    /**
+     * An array of categories stored within the item. Use this property to filter the results from [Portal.queryItems()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#queryItems) and [PortalGroup.queryItems()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#queryItems). It accepts an array of:
+     *   * individual string elements or
+     *   * an array of strings.
+     *   
+     *   
+     * The query looks at each element within the array and performs a SQL `AND` operation on them. If the element is an array instead of a single string element, the elements within this array are read as `OR`. See the snippet below: 
+     * > Note: String[] elements are only supported by [ArcGIS Online](http://doc.arcgis.com/en/arcgis-online/reference/what-is-agol.htm) and version 10.6.1 of [Portal for ArcGIS Enterprise](https://enterprise.arcgis.com/en/portal/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#categories)
+     */
+    categories: (string | string[])[];
     /**
      * 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).
      * 
@@ -16494,6 +17034,18 @@ declare namespace __esri {
   export const PortalQueryParams: PortalQueryParamsConstructor;
 
   interface PortalQueryParamsProperties {
+    /**
+     * An array of categories stored within the item. Use this property to filter the results from [Portal.queryItems()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-Portal.html#queryItems) and [PortalGroup.queryItems()](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalGroup.html#queryItems). It accepts an array of:
+     *   * individual string elements or
+     *   * an array of strings.
+     *   
+     *   
+     * The query looks at each element within the array and performs a SQL `AND` operation on them. If the element is an array instead of a single string element, the elements within this array are read as `OR`. See the snippet below: 
+     * > Note: String[] elements are only supported by [ArcGIS Online](http://doc.arcgis.com/en/arcgis-online/reference/what-is-agol.htm) and version 10.6.1 of [Portal for ArcGIS Enterprise](https://enterprise.arcgis.com/en/portal/).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalQueryParams.html#categories)
+     */
+    categories?: (string | string[])[];
     /**
      * 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).
      * 
@@ -16661,7 +17213,7 @@ declare namespace __esri {
 
   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
+     * 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.  **Possible Values:** private | org | public
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#access)
      */
@@ -16727,7 +17279,7 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible Values:** org_admin | org_publisher | org_user
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role)
      */
@@ -16745,7 +17297,7 @@ declare namespace __esri {
      */
     readonly thumbnailUrl: string;
     /**
-     * The user's personal units of measure setting.  **Known Values:** english | metric
+     * The user's personal units of measure setting.  **Possible Values:** english | metric
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#units)
      */
@@ -16784,6 +17336,15 @@ declare namespace __esri {
      * 
      */
     deleteItem(item: PortalItem): IPromise<any>;
+    /**
+     * Deletes items from the user's portal content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#deleteItems)
+     * 
+     * @param items The portal items to remove.
+     * 
+     */
+    deleteItems(items: PortalItem[]): IPromise<any>;
     /**
      * Fetches all of the user's folders used to organize portal content.
      * 
@@ -16842,7 +17403,7 @@ declare namespace __esri {
 
   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
+     * 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.  **Possible Values:** private | org | public
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#access)
      */
@@ -16908,7 +17469,7 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible Values:** org_admin | org_publisher | org_user
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#role)
      */
@@ -16920,7 +17481,7 @@ declare namespace __esri {
      */
     roleId?: string;
     /**
-     * The user's personal units of measure setting.  **Known Values:** english | metric
+     * The user's personal units of measure setting.  **Possible Values:** english | metric
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-portal-PortalUser.html#units)
      */
@@ -16981,6 +17542,16 @@ declare namespace __esri {
     start?: number;
   }
 
+  /**
+   * A convenience module for importing [Renderer](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html) classes when developing with [TypeScript](https://developers.arcgis.com/javascript/latest/guide/typescript-setup/index.html). For example, rather than importing renderers one at a time like this:
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers.html)
+   */
+  interface renderers {
+  }
+
+  export const renderers: renderers;
+
   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.
@@ -17238,6 +17809,127 @@ declare namespace __esri {
     title: string;
   }
 
+  interface HeatmapRenderer extends Renderer {
+    /**
+     * The area of influence for each point in the layer. This is defined as a radius in pixels. The default is `10`, which means the pixels within a 10-pixel radius of the point's location are assigned an intensity value corresponding to their distance from the nearby point. Increasing this value creates a larger heatmap with more hotspots. Decreasing it makes a smaller heatmap with fewer hotspots.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#blurRadius)
+     * 
+     * @default 10
+     */
+    blurRadius: number;
+    /**
+     * An array of objects describing the renderer's color ramp. The ratio of a pixel's intensity value to the [maxPixelIntensity](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#maxPixelIntensity) of the renderer is mapped to a corresponding [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#color) along a continuous ramp. The color of the first stop (i.e. the stop with the lowest `ratio` value) must have an alpha value of `0` for the underlying basemap to be visible in the app.  The default value is the following: 
+     * ```js
+     * [
+     *   { ratio: 0, color: "rgba(255, 140, 0, 0)" },
+     *   { ratio: 0.75, color: "rgba(255, 140, 0, 1)" },
+     *   { ratio: 0.9, color: "rgba(255, 0,   0, 1)" }
+     * ]
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#colorStops)
+     */
+    colorStops: HeatmapColorStop[];
+    /**
+     * The name of the attribute field used to weight the intensity of each heatmap point.  For example, suppose you have a layer of points representing buildings containing a field `num_units` for the number of units in the building (if it's an apartment complex). You could weight the heatmap renderer based on the `num_units` field to create a heatmap representing the density of housing units in a city.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#field)
+     */
+    field: string;
+    /**
+     * The pixel intensity value that determines which pixels are assigned the final color in the [colorStops](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#colorStops). Pixelx with intensity values above this number will be assigned the final (or hottest) color in the color ramp.  Typically, `minPixelIntensity` will be zero and `maxPixelIntensity` will be set to a high value appropriate for the dataset. The default may not be ideal for your dataset, so this value will likely need to change.  Determining the best values for `minPixelIntensity` and `maxPixelIntensity` is an exercise left up to the developer since different types, scales, densities, and distributions of data will require different values for these properties to create a visually pleasing separation of high and low intensity areas appropriate for the data and the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#maxPixelIntensity)
+     * 
+     * @default 100
+     */
+    maxPixelIntensity: number;
+    /**
+     * The pixel intensity value used to determine which pixels will be assigned the initial color in the [colorStops](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#colorStops). Pixels with intensity values below this number will be excluded from the visualization.  When using a [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#field) to weight the points, setting `minPixelIntensity` above zero might help to visually deemphasize frequently occurring but low value point clusters. This property does not actually filter the data or modify the calculated intensity value. Rather, it scales the color ramp such that a higher intensity value is required for a pixel to get a noticeable color.  Determining the best values for `minPixelIntensity` and  `maxPixelIntensity` is an exercise left up to the developer since different types, scales, densities, and distributions of data will require different values for these properties to create a visually pleasing separation of high and low intensity areas appropriate for the data and the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#minPixelIntensity)
+     * 
+     * @default 0
+     */
+    minPixelIntensity: number;
+    /**
+     * The type of renderer. For HeatmapRenderer this value is always `heatmap`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#type)
+     */
+    readonly type: "heatmap";
+
+    /**
+     * Creates a deep clone of the renderer.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#clone)
+     * 
+     * 
+     */
+    clone(): HeatmapRenderer;
+  }
+
+  interface HeatmapRendererConstructor {
+    /**
+     * The HeatmapRenderer renders point [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and [CSVLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) as a raster surface, emphasizing areas with a high density of points. This renderer uses a [Gaussian Blur](https://en.wikipedia.org/wiki/Gaussian_blur) to determine the strength of the influence of each point over an area determined by the [blurRadius](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#blurRadius). A Gaussian, or normal, distribution is used to spread the color of the point so it appears to be a fuzzy circle.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html)
+     */
+
+    new(properties?: HeatmapRendererProperties): HeatmapRenderer;
+
+    fromJSON(json: any): HeatmapRenderer;
+  }
+
+  export const HeatmapRenderer: HeatmapRendererConstructor;
+
+  interface HeatmapRendererProperties extends RendererProperties {
+    /**
+     * The area of influence for each point in the layer. This is defined as a radius in pixels. The default is `10`, which means the pixels within a 10-pixel radius of the point's location are assigned an intensity value corresponding to their distance from the nearby point. Increasing this value creates a larger heatmap with more hotspots. Decreasing it makes a smaller heatmap with fewer hotspots.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#blurRadius)
+     * 
+     * @default 10
+     */
+    blurRadius?: number;
+    /**
+     * An array of objects describing the renderer's color ramp. The ratio of a pixel's intensity value to the [maxPixelIntensity](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#maxPixelIntensity) of the renderer is mapped to a corresponding [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#color) along a continuous ramp. The color of the first stop (i.e. the stop with the lowest `ratio` value) must have an alpha value of `0` for the underlying basemap to be visible in the app.  The default value is the following: 
+     * ```js
+     * [
+     *   { ratio: 0, color: "rgba(255, 140, 0, 0)" },
+     *   { ratio: 0.75, color: "rgba(255, 140, 0, 1)" },
+     *   { ratio: 0.9, color: "rgba(255, 0,   0, 1)" }
+     * ]
+     * ```
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#colorStops)
+     */
+    colorStops?: HeatmapColorStopProperties[];
+    /**
+     * The name of the attribute field used to weight the intensity of each heatmap point.  For example, suppose you have a layer of points representing buildings containing a field `num_units` for the number of units in the building (if it's an apartment complex). You could weight the heatmap renderer based on the `num_units` field to create a heatmap representing the density of housing units in a city.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#field)
+     */
+    field?: string;
+    /**
+     * The pixel intensity value that determines which pixels are assigned the final color in the [colorStops](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#colorStops). Pixelx with intensity values above this number will be assigned the final (or hottest) color in the color ramp.  Typically, `minPixelIntensity` will be zero and `maxPixelIntensity` will be set to a high value appropriate for the dataset. The default may not be ideal for your dataset, so this value will likely need to change.  Determining the best values for `minPixelIntensity` and `maxPixelIntensity` is an exercise left up to the developer since different types, scales, densities, and distributions of data will require different values for these properties to create a visually pleasing separation of high and low intensity areas appropriate for the data and the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#maxPixelIntensity)
+     * 
+     * @default 100
+     */
+    maxPixelIntensity?: number;
+    /**
+     * The pixel intensity value used to determine which pixels will be assigned the initial color in the [colorStops](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#colorStops). Pixels with intensity values below this number will be excluded from the visualization.  When using a [field](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#field) to weight the points, setting `minPixelIntensity` above zero might help to visually deemphasize frequently occurring but low value point clusters. This property does not actually filter the data or modify the calculated intensity value. Rather, it scales the color ramp such that a higher intensity value is required for a pixel to get a noticeable color.  Determining the best values for `minPixelIntensity` and  `maxPixelIntensity` is an exercise left up to the developer since different types, scales, densities, and distributions of data will require different values for these properties to create a visually pleasing separation of high and low intensity areas appropriate for the data and the application.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#minPixelIntensity)
+     * 
+     * @default 0
+     */
+    minPixelIntensity?: number;
+  }
+
   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:
@@ -17384,6 +18076,12 @@ declare namespace __esri {
      * @default 10
      */
     pointsPerInch: number;
+    /**
+     * The point cloud renderer type.  **Possible values:** point-cloud-class-breaks | point-cloud-rgb | point-cloud-stretch | point-cloud-unique-value
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-PointCloudRenderer.html#type)
+     */
+    readonly type: string;
 
     /**
      * Creates a deep clone of the renderer.
@@ -17482,12 +18180,6 @@ declare namespace __esri {
      * @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 {
@@ -17782,6 +18474,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#authoringInfo)
      */
     authoringInfo: AuthoringInfo;
+    /**
+     * The renderer type.  **Possible values:** class-breaks | heatmap | simple | unique-value
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-Renderer.html#type)
+     */
+    readonly type: string;
   }
 
   interface RendererConstructor {
@@ -18106,7 +18804,7 @@ declare namespace __esri {
 
   /**
    * 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).
+   * > **Known Limitations**  In a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) rotation visual variables are not currently 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)
    */
@@ -18658,7 +19356,7 @@ declare namespace __esri {
      * @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 view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * @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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -18687,7 +19385,7 @@ declare namespace __esri {
      * @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) or basemap object of the Esri basemap 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.
+     * Determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -18707,7 +19405,7 @@ declare namespace __esri {
      * @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 view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * @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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -18764,7 +19462,7 @@ declare namespace __esri {
      * @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) or basemap object of the Esri basemap 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.
+     * Determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -18967,11 +19665,11 @@ declare namespace __esri {
     /**
      * The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createClassBreaksRenderer)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
-     * 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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -19041,7 +19739,7 @@ declare namespace __esri {
      */
     basemap?: string | Basemap;
     /**
-     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * Determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -19119,11 +19817,11 @@ declare namespace __esri {
     /**
      * The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createContinuousRenderer)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
-     * 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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -19277,7 +19975,7 @@ declare namespace __esri {
      */
     basemap?: string | Basemap;
     /**
-     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * Determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -19347,7 +20045,7 @@ declare namespace __esri {
     /**
      * When generating 3D symbols (except for layers with a `mesh` geometry type), a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) instance is required. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-color.html#createVisualVariable)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -19531,7 +20229,7 @@ declare namespace __esri {
      * @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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -19578,11 +20276,11 @@ declare namespace __esri {
     /**
      * 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)
+     * [Read more...](global.html)
      */
     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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -19741,7 +20439,7 @@ declare namespace __esri {
     /**
      * A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) instance is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-opacity.html#createVisualVariable)
+     * [Read more...](global.html)
      */
     view?: View;
   }
@@ -19836,7 +20534,7 @@ declare namespace __esri {
      * @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 view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * @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. 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -19869,7 +20567,7 @@ declare namespace __esri {
      * @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 view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * @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. 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -20130,11 +20828,11 @@ declare namespace __esri {
     /**
      * The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createClassBreaksRenderer)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
-     * 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. 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -20254,11 +20952,11 @@ declare namespace __esri {
     /**
      * The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createContinuousRenderer)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
-     * 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. 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -20376,7 +21074,7 @@ declare namespace __esri {
     /**
      * When generating 3D symbols, a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) instance is required. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-size.html#createVisualVariables)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -20494,7 +21192,7 @@ declare namespace __esri {
      * 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
+     * **Possible 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.valueExpression An [Arcade](https://developers.arcgis.com/javascript/latest/guide/arcade/index.html) expression that returns a number or a string. This expression can reference field values using the `$feature` global variable. This property overrides the `field` property and therefore is used instead of an input `field` value.
      * @param params.valueExpressionTitle Text describing the value returned from the `valueExpression`. This is used by the [Legend](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html) widget.
@@ -20502,7 +21200,7 @@ declare namespace __esri {
      * @param params.defaultSymbolEnabled Enables the `defaultSymbol` on the renderer and assigns it to features with no value.
      * @param params.view The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * @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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -20660,7 +21358,7 @@ declare namespace __esri {
      * 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
+     * **Possible Values:** count | value
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
@@ -20701,11 +21399,11 @@ declare namespace __esri {
     /**
      * The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-type.html#createRenderer)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
-     * 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. 
+     * 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. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -20809,7 +21507,7 @@ declare namespace __esri {
      * @param params.sizeOptions Options for configuring the size portion of the visualization.
      * @param params.view The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * @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. 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -20983,11 +21681,11 @@ declare namespace __esri {
     /**
      * The view instance in which the visualization will be rendered. A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) is required if `symbolType = "3d-volumetric"` or `3d-volumetric-uniform`. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createContinuousRenderer)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
-     * 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. 
+     * The type of symbol to generate. This depends on the view in which you are working and the desired visualization. Possible values are described below. 
      * 
      * | Value | Description |
      * | ----- | ----------- |
@@ -21007,7 +21705,7 @@ declare namespace __esri {
 
   export interface univariateColorSizeCreateContinuousRendererParamsColorOptions extends Object {
     /**
-     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * Determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -21155,7 +21853,7 @@ declare namespace __esri {
     /**
      * When generating 3D symbols, a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) instance is required. The relevant SceneView or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-creators-univariateColorSize.html#createVisualVariables)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -21169,7 +21867,7 @@ declare namespace __esri {
 
   export interface univariateColorSizeCreateVisualVariablesParamsColorOptions extends Object {
     /**
-     * Determines which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * Determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -21469,7 +22167,7 @@ declare namespace __esri {
     /**
      * A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) instance is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-classBreaks.html#classBreaks)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -21657,7 +22355,7 @@ declare namespace __esri {
     /**
      * A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) instance is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-histogram.html#histogram)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -21850,7 +22548,7 @@ declare namespace __esri {
     /**
      * A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) instance is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-summaryStatistics.html#summaryStatistics)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -21945,7 +22643,7 @@ declare namespace __esri {
     /**
      * A [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) or [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) instance is required when a `valueExpression` is specified.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-statistics-uniqueValues.html#uniqueValues)
+     * [Read more...](global.html)
      */
     view?: View;
     /**
@@ -21999,9 +22697,9 @@ declare namespace __esri {
      * 
      * @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.geometryType The geometry type of the features to visualize. **Possible 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.
+     * The theme determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -22036,13 +22734,13 @@ declare namespace __esri {
      */
     basemap: string | Basemap;
     /**
-     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * The geometry type of the features to visualize. **Possible 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.
+     * The theme determines which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -22058,7 +22756,7 @@ declare namespace __esri {
     /**
      * 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)
+     * [Read more...](global.html)
      */
     view?: SceneView;
     /**
@@ -22082,7 +22780,7 @@ declare namespace __esri {
      */
     id: string;
     /**
-     * Indicates which values will be emphasized in the continuous ramp and the map. Valid values are listed below.
+     * Indicates which values will be emphasized in the continuous ramp and the map. Possible values are listed below.
      * 
      * | Value | Description | Example |
      * | ----- | ----------- | ------- |
@@ -22189,7 +22887,7 @@ declare namespace __esri {
      * 
      * @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.geometryType The geometry type of the features to visualize. **Possible 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`.
      * 
@@ -22208,7 +22906,7 @@ declare namespace __esri {
      */
     basemap: string | Basemap;
     /**
-     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * The geometry type of the features to visualize. **Possible Values:** point | multipoint | polyline | polygon | mesh
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-location.html#getSchemes)
      */
@@ -22216,7 +22914,7 @@ declare namespace __esri {
     /**
      * 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)
+     * [Read more...](global.html)
      */
     view?: SceneView;
     /**
@@ -22361,7 +23059,7 @@ declare namespace __esri {
      * 
      * @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.geometryType The geometry type of the features to visualize. **Possible 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`.
      * 
@@ -22512,7 +23210,7 @@ declare namespace __esri {
      */
     basemap: string | Basemap;
     /**
-     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon
+     * The geometry type of the features to visualize. **Possible Values:** point | multipoint | polyline | polygon
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-size.html#getSchemes)
      */
@@ -22520,7 +23218,7 @@ declare namespace __esri {
     /**
      * 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)
+     * [Read more...](global.html)
      */
     view?: SceneView;
     /**
@@ -22597,8 +23295,8 @@ declare namespace __esri {
      * 
      * @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.geometryType The geometry type of the features to visualize. **Possible 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.  **Possible 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.
      * 
@@ -22745,13 +23443,13 @@ declare namespace __esri {
      */
     basemap: string | Basemap;
     /**
-     * The geometry type of the features to visualize. **Known Values:** point | multipoint | polyline | polygon | mesh
+     * The geometry type of the features to visualize. **Possible 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
+     * 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.  **Possible Values:** point-cloud-class | default
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-smartMapping-symbology-type.html#getSchemes)
      * 
@@ -22767,7 +23465,7 @@ declare namespace __esri {
     /**
      * 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)
+     * [Read more...](global.html)
      */
     view?: SceneView;
   }
@@ -22806,11 +23504,23 @@ declare namespace __esri {
 
   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
+     * Indicates which classification method was used if a classed color or classed size renderer was generated using one of the Smart Mapping functions.  **Possible 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;
+    /**
+     * field for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#field1)
+     */
+    field1: any;
+    /**
+     * field for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#field2)
+     */
+    field2: any;
     /**
      * An array of string values representing field names used for creating predominance renderers.
      * 
@@ -22818,19 +23528,31 @@ declare namespace __esri {
      */
     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
+     * focus for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#focus)
+     */
+    focus: string;
+    /**
+     * **Only applicable to renderer used in web scenes.** Indicates the unit used in real-world sizes.  **Possible 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
+     * numClasses for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#numClasses)
+     */
+    numClasses: number;
+    /**
+     * 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.  **Possible 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
+     * Indicates the renderer type generated from one of the Smart Mapping functions.  **Possible 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)
      */
@@ -22864,11 +23586,23 @@ declare namespace __esri {
 
   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
+     * Indicates which classification method was used if a classed color or classed size renderer was generated using one of the Smart Mapping functions.  **Possible 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;
+    /**
+     * field for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#field1)
+     */
+    field1?: any;
+    /**
+     * field for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#field2)
+     */
+    field2?: any;
     /**
      * An array of string values representing field names used for creating predominance renderers.
      * 
@@ -22876,19 +23610,31 @@ declare namespace __esri {
      */
     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
+     * focus for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#focus)
+     */
+    focus?: string;
+    /**
+     * **Only applicable to renderer used in web scenes.** Indicates the unit used in real-world sizes.  **Possible 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
+     * numClasses for relationship.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfo.html#numClasses)
+     */
+    numClasses?: number;
+    /**
+     * 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.  **Possible 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
+     * Indicates the renderer type generated from one of the Smart Mapping functions.  **Possible 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)
      */
@@ -22933,25 +23679,25 @@ declare namespace __esri {
      */
     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
+     * If the UI offers the option to display values based on a ratio or percentage, this indicates which selection was made.  **Possible 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
+     * Indicates the theme selected by the user when generating a renderer or visual variable with one of the Smart Mapping functions.  **Possible 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
+     * The type of visual variable generated.  **Possible 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
+     * If an age or timeline renderer was generated, indicates the time units used.  **Possible Values:** seconds | minutes | hours | days | months | years
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-AuthoringInfoVisualVariable.html#units)
      */
@@ -23009,31 +23755,78 @@ declare namespace __esri {
      */
     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
+     * If the UI offers the option to display values based on a ratio or percentage, this indicates which selection was made.  **Possible 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
+     * Indicates the theme selected by the user when generating a renderer or visual variable with one of the Smart Mapping functions.  **Possible 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
+     * The type of visual variable generated.  **Possible 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
+     * If an age or timeline renderer was generated, indicates the time units used.  **Possible 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 HeatmapColorStop extends Accessor {
+    /**
+     * The color to shade a given pixel based on its calculated pixel intensity [ratio](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#ratio).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#color)
+     */
+    color: Color;
+    /**
+     * The ratio of a pixel's intensity value to the [minPixelIntensity](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#minPixelIntensity) of the renderer. The ratio of each pixel is matched to the corresponding [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#color).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#ratio)
+     */
+    ratio: number;
+
+    /**
+     * Creates a deep clone of the color stop.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#clone)
+     * 
+     * 
+     */
+    clone(): HeatmapColorStop;
+  }
+
+  interface HeatmapColorStopConstructor {
+
+
+    new(properties?: HeatmapColorStopProperties): HeatmapColorStop;
+  }
+
+  export const HeatmapColorStop: HeatmapColorStopConstructor;
+
+  interface HeatmapColorStopProperties {
+    /**
+     * The color to shade a given pixel based on its calculated pixel intensity [ratio](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#ratio).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#color)
+     */
+    color?: Color | number[] | string;
+    /**
+     * The ratio of a pixel's intensity value to the [minPixelIntensity](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-HeatmapRenderer.html#minPixelIntensity) of the renderer. The ratio of each pixel is matched to the corresponding [color](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#color).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-renderers-support-HeatmapColorStop.html#ratio)
+     */
+    ratio?: number;
+  }
+
 
   interface supportJsonUtils {
     /**
@@ -23417,28 +24210,9 @@ declare namespace __esri {
      * 
      * @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>;
+    esriRequest(url: string, options?: RequestOptions): IPromise<RequestResponse>;
   }
 
   const __requestMapped: request;
@@ -23503,78 +24277,70 @@ declare namespace __esri {
 
   export type GetHeader = (headerName: string) => string;
 
-
-  export interface requestEsriRequestOptions extends Object {
+  /**
+   * An object with the following properties that describe the request.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
+   */
+  export interface RequestOptions extends Object {
+    /**
+     * 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"`.  **Possible Values:** auto | post
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
+     */
+    method?: string;
     /**
      * 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)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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
+     * 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)
-     * 
-     * @default auto
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
-    method?: string;
+    query?: any;
     /**
      * 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)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     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
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     allowImageDataAccess?: boolean;
     /**
@@ -23588,100 +24354,157 @@ declare namespace __esri {
      * | 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
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions)
      */
     authMode?: string;
   }
 
-  interface Action extends Accessor {
+  /**
+   * Returns a promise that resolves to an object with the following specification. 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#RequestResponse)
+   */
+  export interface RequestResponse extends Object {
+    /**
+     * The requested data. Should match the `responseType` with the data return type. Possible types are: [json](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object), [xml](https://developer.mozilla.org/en-US/docs/Web/API/XMLDocument), [text](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String), [blob](https://developer.mozilla.org/en-US/docs/Web/API/Blob), [array-buffer](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer), [document](https://developer.mozilla.org/en-US/docs/Web/API/HTMLDocument), and [image](https://developer.mozilla.org/en-US/docs/Web/API/HTMLImageElement).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestResponse)
+     */
+    data?: any;
+    /**
+     * The options specified by the user in the data request. See [RequestOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestOptions) for available properties.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestResponse)
+     */
+    requestOptions?: RequestOptions;
+    /**
+     * If ssl is enabled or not.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestResponse)
+     */
+    ssl?: boolean;
+    /**
+     * The URL used to request the data.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestResponse)
+     */
+    url?: string;
+    /**
+     * Method for getting a header sent from the server.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-request.html#RequestResponse)
+     */
+    getHeader?: GetHeader;
+  }
+
+  interface ActionBase {
+    /**
+     * Indicates whether the action is currently active.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html#active)
+     * 
+     * @default false
+     */
+    active: boolean;
     /**
      * 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)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.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.
+     * Indicates whether this action is disabled.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#id)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html#disabled)
+     * 
+     * @default false
+     */
+    disabled: boolean;
+    /**
+     * 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-actions-ActionBase.html#event:trigger-action) event.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.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)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html#title)
      */
     title: string;
+    /**
+     * Specifies the type of action. Choose between ["button"](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or ["toggle"](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html). Currently, these two are the only supported types. A "slider" type will follow-up in a future release.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html#type)
+     * 
+     * @default null
+     */
+    type: string;
     /**
      * Indicates if the action is visible.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#visible)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionBase.html#visible)
      * 
      * @default true
      */
     visible: boolean;
+  }
+
+  interface ActionBaseConstructor {
+
+
+    new(): ActionBase;
+  }
+
+  export const ActionBase: ActionBaseConstructor;
+
+  interface ActionButton extends ActionBase {
+    /**
+     * 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-actions-ActionButton.html#image)
+     */
+    image: string;
 
     /**
      * Creates a deep clone of this object.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-Action.html#clone)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html#clone)
      * 
      * 
      */
-    clone(): Action;
+    clone(): ActionButton;
   }
 
-  interface ActionConstructor {
+  interface ActionButtonConstructor {
 
 
-    new(properties?: ActionProperties): Action;
+
+    new(properties?: any): ActionButton;
   }
 
-  export const Action: ActionConstructor;
+  export const ActionButton: ActionButtonConstructor;
 
-  interface ActionProperties {
+  interface ActionToggle extends ActionBase {
     /**
-     * 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`.
+     * Creates a deep clone of this object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html#clone)
+     * 
      * 
-     * [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;
+    clone(): ActionToggle;
   }
 
+  interface ActionToggleConstructor {
+
+
+
+    new(properties?: any): ActionToggle;
+  }
+
+  export const ActionToggle: ActionToggleConstructor;
+
   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). 
@@ -23704,11 +24527,11 @@ declare namespace __esri {
      * 
      * [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 layer Layer or a Promise&lt;Layer&gt; 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;
+    add(layer: Layer | IPromise<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).
      * 
@@ -23792,6 +24615,16 @@ declare namespace __esri {
     layers?: CollectionProperties<LayerProperties> | LayerProperties[];
   }
 
+  /**
+   * A convenience module for importing [Symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html) classes when developing with [TypeScript](https://developers.arcgis.com/javascript/latest/guide/typescript-setup/index.html). For example, rather than importing symbols one at a time like this:
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols.html)
+   */
+  interface symbols {
+  }
+
+  export const symbols: symbols;
+
   interface Callout3D extends Accessor, JSONSupport {
     /**
      * Creates a deep clone of the callout.
@@ -24274,6 +25107,50 @@ declare namespace __esri {
   }
 
   interface Font extends Accessor, JSONSupport {
+    /**
+     * The text decoration.  **Possible Values:** underline | line-through | none 
+     * > **Known Limitations**  This property is currently 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-Font.html#decoration)
+     * 
+     * @default none
+     */
+    decoration: "underline" | "line-through" | "none";
+    /**
+     * The font family of the text. The possible values are dependent upon the: layer type, rendering mechanism, and if you working with 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). See the [Labeling guide page](https://developers.arcgis.com/javascript/latest/guide/labeling/index.html) for detailed explanation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#family)
+     * 
+     * @default sans-serif
+     */
+    family: string;
+    /**
+     * The font size 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-Font.html#size)
+     * 
+     * @default 9
+     */
+    size: number;
+    /**
+     * The text style. Specifies whether a font should be styled: normal, italic, or oblique.  **Possible Values:** normal | italic | oblique 
+     * > **Known Limitations**  `oblique` is not supported in 2D WebGL enabled [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and [CSVLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#style)
+     * 
+     * @default normal
+     */
+    style: "normal" | "italic" | "oblique";
+    /**
+     * The text weight. Specifies the level of boldness.  **Possible Values:** normal | bold | bolder | lighter 
+     * > **Known Limitations**  `bolder` and `lighter` are not supported in 2D WebGL enabled [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and [CSVLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#weight)
+     * 
+     * @default normal
+     */
+    weight: "normal" | "bold" | "bolder" | "lighter";
+
     /**
      * Creates a deep clone of the font object.
      * 
@@ -24285,11 +25162,7 @@ declare namespace __esri {
   }
 
   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;
 
@@ -24299,7 +25172,49 @@ declare namespace __esri {
   export const Font: FontConstructor;
 
   interface FontProperties {
-
+    /**
+     * The text decoration.  **Possible Values:** underline | line-through | none 
+     * > **Known Limitations**  This property is currently 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-Font.html#decoration)
+     * 
+     * @default none
+     */
+    decoration?: "underline" | "line-through" | "none";
+    /**
+     * The font family of the text. The possible values are dependent upon the: layer type, rendering mechanism, and if you working with 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). See the [Labeling guide page](https://developers.arcgis.com/javascript/latest/guide/labeling/index.html) for detailed explanation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#family)
+     * 
+     * @default sans-serif
+     */
+    family?: string;
+    /**
+     * The font size 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-Font.html#size)
+     * 
+     * @default 9
+     */
+    size?: number | string;
+    /**
+     * The text style. Specifies whether a font should be styled: normal, italic, or oblique.  **Possible Values:** normal | italic | oblique 
+     * > **Known Limitations**  `oblique` is not supported in 2D WebGL enabled [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and [CSVLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#style)
+     * 
+     * @default normal
+     */
+    style?: "normal" | "italic" | "oblique";
+    /**
+     * The text weight. Specifies the level of boldness.  **Possible Values:** normal | bold | bolder | lighter 
+     * > **Known Limitations**  `bolder` and `lighter` are not supported in 2D WebGL enabled [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) and [CSVLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#weight)
+     * 
+     * @default normal
+     */
+    weight?: "normal" | "bold" | "bolder" | "lighter";
   }
 
   interface IconSymbol3DLayer extends Symbol3DLayer {
@@ -24705,7 +25620,7 @@ declare namespace __esri {
   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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -24714,7 +25629,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -24723,7 +25638,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -24749,7 +25664,7 @@ declare namespace __esri {
   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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -24758,7 +25673,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -24767,7 +25682,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -24814,11 +25729,17 @@ 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
+     * The positioning of the object relative to the geometry. The default behavior (`origin`) depends on the resource:
+     *   * For `sphere`, `cube` and `diamond` primitives, the origin is at the center.
+     *   * For `cylinder`, `cone`, `inverted-cone` and `tetrahedron` primitives, the origin is at the bottom.
+     *   * For `href` resources, the origin coincides with the origin of 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
+     * @default origin
      */
     anchor: string;
     /**
@@ -24904,11 +25825,17 @@ declare namespace __esri {
 
   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
+     * The positioning of the object relative to the geometry. The default behavior (`origin`) depends on the resource:
+     *   * For `sphere`, `cube` and `diamond` primitives, the origin is at the center.
+     *   * For `cylinder`, `cone`, `inverted-cone` and `tetrahedron` primitives, the origin is at the bottom.
+     *   * For `href` resources, the origin coincides with the origin of 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
+     * @default origin
      */
     anchor?: string;
     /**
@@ -25417,7 +26344,7 @@ declare namespace __esri {
      */
     color: Color;
     /**
-     * The fill style. Valid values are listed in the table below: 
+     * The fill style. Possible values are listed in the table below: 
      * 
      * Value | Description
      * ------|-------------
@@ -25430,7 +26357,7 @@ declare namespace __esri {
      * 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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -25478,7 +26405,7 @@ declare namespace __esri {
      */
     color?: Color | number[] | string;
     /**
-     * The fill style. Valid values are listed in the table below: 
+     * The fill style. Possible values are listed in the table below: 
      * 
      * Value | Description
      * ------|-------------
@@ -25491,7 +26418,7 @@ declare namespace __esri {
      * 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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -25502,28 +26429,42 @@ declare namespace __esri {
 
   interface SimpleLineSymbol extends LineSymbol {
     /**
-     * Specifies the cap style. The cap is the end of a line segment.  **Known Values:** butt | round | square 
+     * Specifies the cap style. The cap is the end node of a polyline, or the end of a line segment that does not connect with another segment of the same polyline.  See the table below for possible values. 
+     * 
+     * Possible Value | Example
+     * ---------------|---------
+     * butt | ![sls-cap-butt](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-cap-butt.png)
+     * round | ![sls-cap-round](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-cap-round.png)
+     * square | ![sls-cap-square](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-cap-square.png)
+     * 
      * > **Known Limitations** 
-     *   * This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * This property is currently 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
+     * @default round
      */
-    cap: string;
+    cap: "butt" | "round" | "square";
     /**
-     * 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).
+     * Specifies the join style. A `join` refers to the joint of a polyline, or the end of a line segment that connects to another segment of the same polyline. See the table below for possible values. 
+     * 
+     * Possible Value | Example
+     * ---------------|---------
+     * bevel | ![sls-join-bevel](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-join-bevel.png)
+     * miter | ![sls-join-miter](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-join-miter.png)
+     * round | ![sls-join-round](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-join-round.png)
+     * 
+     * > **Known Limitations**  This property is currently 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
+     * @default round
      */
-    join: string;
+    join: "miter" | "round" | "bevel";
     /**
      * 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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -25531,7 +26472,7 @@ declare namespace __esri {
      */
     miterLimit: number;
     /**
-     * Specifies the line style. Valid values are listed in the table below: 
+     * Specifies the line style. Possible values are listed in the table below: 
      * 
      * Value | Description
      * ------|-------------
@@ -25548,7 +26489,7 @@ declare namespace __esri {
      * 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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -25588,28 +26529,42 @@ declare namespace __esri {
 
   interface SimpleLineSymbolProperties extends LineSymbolProperties {
     /**
-     * Specifies the cap style. The cap is the end of a line segment.  **Known Values:** butt | round | square 
+     * Specifies the cap style. The cap is the end node of a polyline, or the end of a line segment that does not connect with another segment of the same polyline.  See the table below for possible values. 
+     * 
+     * Possible Value | Example
+     * ---------------|---------
+     * butt | ![sls-cap-butt](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-cap-butt.png)
+     * round | ![sls-cap-round](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-cap-round.png)
+     * square | ![sls-cap-square](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-cap-square.png)
+     * 
      * > **Known Limitations** 
-     *   * This property is not supported in 3D [SceneViews](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html).
+     *   * This property is currently 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
+     * @default round
      */
-    cap?: string;
+    cap?: "butt" | "round" | "square";
     /**
-     * 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).
+     * Specifies the join style. A `join` refers to the joint of a polyline, or the end of a line segment that connects to another segment of the same polyline. See the table below for possible values. 
+     * 
+     * Possible Value | Example
+     * ---------------|---------
+     * bevel | ![sls-join-bevel](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-join-bevel.png)
+     * miter | ![sls-join-miter](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-join-miter.png)
+     * round | ![sls-join-round](https://developers.arcgis.com/javascript/latest/assets/img/apiref/symbols/sls-join-round.png)
+     * 
+     * > **Known Limitations**  This property is currently 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
+     * @default round
      */
-    join?: string;
+    join?: "miter" | "round" | "bevel";
     /**
      * 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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -25617,7 +26572,7 @@ declare namespace __esri {
      */
     miterLimit?: number | string;
     /**
-     * Specifies the line style. Valid values are listed in the table below: 
+     * Specifies the line style. Possible values are listed in the table below: 
      * 
      * Value | Description
      * ------|-------------
@@ -25634,7 +26589,7 @@ declare namespace __esri {
      * 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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -25661,7 +26616,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      */
@@ -25740,7 +26695,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      */
@@ -26001,7 +26956,7 @@ declare namespace __esri {
   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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26042,9 +26997,7 @@ declare namespace __esri {
     /**
      * 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)
      */
@@ -26052,16 +27005,14 @@ declare namespace __esri {
     /**
      * 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).
+     * Adjusts the horizontal alignment of the text in multi-line labels.  **Possible Values:** left | right | center | justify 
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26078,7 +27029,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26098,8 +27049,8 @@ declare namespace __esri {
      */
     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).
+     * Adjusts the vertical alignment of the text.  **Possible Values:** baseline | top | middle | bottom 
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26108,7 +27059,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26117,7 +27068,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26137,7 +27088,7 @@ declare namespace __esri {
 
   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.
+     * 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), [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html), and [Sublayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-Sublayer.html), in a 2D [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). Text symbols can also be used to define the symbol property of [Graphic](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.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)
      */
@@ -26152,7 +27103,7 @@ declare namespace __esri {
   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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26193,26 +27144,22 @@ declare namespace __esri {
     /**
      * 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;
+    haloColor?: Color | number[] | string;
     /**
      * 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).
+     * Adjusts the horizontal alignment of the text in multi-line labels.  **Possible Values:** left | right | center | justify 
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26229,7 +27176,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26243,8 +27190,8 @@ declare namespace __esri {
      */
     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).
+     * Adjusts the vertical alignment of the text.  **Possible Values:** baseline | top | middle | bottom 
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26253,7 +27200,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26262,7 +27209,7 @@ declare namespace __esri {
     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).
+     * > **Known Limitations**  This property is currently 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)
      * 
@@ -26277,7 +27224,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
      */
-    font: TextSymbol3DLayerFont;
+    font: Font;
     /**
      * The halo surrounding the text.
      * 
@@ -26285,7 +27232,7 @@ declare namespace __esri {
      */
     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`).
+     * Size of the text label in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). When set, this property overrides the [font.size](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#size) property.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#size)
      * 
@@ -26335,7 +27282,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#font)
      */
-    font?: TextSymbol3DLayerFont;
+    font?: FontProperties;
     /**
      * The halo surrounding the text.
      * 
@@ -26343,7 +27290,7 @@ declare namespace __esri {
      */
     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`).
+     * Size of the text label in points. This value may be autocast with a string expressing size in points or pixels (e.g. `12px`). When set, this property overrides the [font.size](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Font.html#size) property.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-TextSymbol3DLayer.html#size)
      * 
@@ -26359,34 +27306,6 @@ declare namespace __esri {
   }
 
 
-  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 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.
@@ -26679,7 +27598,7 @@ declare namespace __esri {
      * @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 conversion 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](https://developers.arcgis.com/rest/services-reference/from-geocoordinatestring.htm) for valid values and their descriptions.
+     * @param params.conversionMode Conversion options for mrgs, utm and gars conversion types. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/from-geocoordinatestring.htm) for possible 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).
      * 
      */
@@ -26844,7 +27763,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
      */
-    sr: SpatialReference | string;
+    sr: SpatialReference | string | number;
     /**
      * The conversion type of the input strings.  **Possible Values:** mrgs | usng | utm | geo-ref | gars | dms | ddm | dd
      * 
@@ -26854,7 +27773,7 @@ declare namespace __esri {
      */
     conversionType?: string;
     /**
-     * Conversion options for mrgs, utm and gars conversion types. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/from-geocoordinatestring.htm) for valid values and their descriptions.
+     * Conversion options for mrgs, utm and gars conversion types. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/from-geocoordinatestring.htm) for possible values and their descriptions.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#fromGeoCoordinateString)
      */
@@ -26868,7 +27787,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-GeometryService.html#toGeoCoordinateString)
      */
-    sr: SpatialReference | string;
+    sr: SpatialReference | string | number;
     /**
      * An array of XY-coordinates (in JSON format) to be converted.
      * 
@@ -27444,7 +28363,7 @@ declare namespace __esri {
 
   interface PrintTask extends Task {
     /**
-     * The mode for the print task execution.  **Known Values:** async | sync
+     * The mode for the print task execution.  **Possible Values:** async | sync
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-PrintTask.html#mode)
      * 
@@ -27934,13 +28853,13 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible 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
+     * Defines the amount of direction information returned. The default value is standard.  **Possible 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)
      */
@@ -27972,7 +28891,7 @@ declare namespace __esri {
      */
     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.
+     * 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://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/understanding-network-attributes.htm) ArcGIS desktop help topic for more details.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#impedanceAttribute)
      */
@@ -27990,13 +28909,21 @@ declare namespace __esri {
      */
     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
+     * The units of the output geometry precision.  **Possible 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.
+     * 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. 
+     * 
+     * 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 measurements
+     * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputLines)
      */
@@ -28032,7 +28959,7 @@ declare namespace __esri {
      */
     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
+     * 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".  **Possible 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)
      */
@@ -28094,19 +29021,25 @@ declare namespace __esri {
      */
     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.*
+     * 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
+     * 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.*  **Possible 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 network layer. See NATravelDirection for a list of valid values.
+     * 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-ClosestFacilityParameters.html#travelDirection)
      */
@@ -28174,13 +29107,13 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible 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
+     * Defines the amount of direction information returned. The default value is standard.  **Possible 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)
      */
@@ -28212,7 +29145,7 @@ declare namespace __esri {
      */
     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.
+     * 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://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/understanding-network-attributes.htm) ArcGIS desktop help topic for more details.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#impedanceAttribute)
      */
@@ -28230,13 +29163,21 @@ declare namespace __esri {
      */
     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
+     * The units of the output geometry precision.  **Possible 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.
+     * 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. 
+     * 
+     * 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 measurements
+     * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ClosestFacilityParameters.html#outputLines)
      */
@@ -28272,7 +29213,7 @@ declare namespace __esri {
      */
     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
+     * 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".  **Possible 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)
      */
@@ -28334,19 +29275,25 @@ declare namespace __esri {
      */
     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.*
+     * 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
+     * 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.*  **Possible 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 network layer. See NATravelDirection for a list of valid values.
+     * 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-ClosestFacilityParameters.html#travelDirection)
      */
@@ -28427,7 +29374,7 @@ declare namespace __esri {
      */
     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.
+     * The array of routes. Route graphics are returned if `returnRoutes = true` and `outputLines` does not equal `none`. 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)
      */
@@ -28492,7 +29439,7 @@ declare namespace __esri {
      */
     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.
+     * The array of routes. Route graphics are returned if `returnRoutes = true` and `outputLines` does not equal `none`. 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)
      */
@@ -29312,7 +30259,7 @@ declare namespace __esri {
      */
     description: string;
     /**
-     * The geoprocessing message type.  **Known Values:** informative | process-definition | process-start | process-stop | warning | error | empty | abort
+     * The geoprocessing message type.  **Possible 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)
      */
@@ -29337,7 +30284,7 @@ declare namespace __esri {
      */
     description?: string;
     /**
-     * The geoprocessing message type.  **Known Values:** informative | process-definition | process-start | process-stop | warning | error | empty | abort
+     * The geoprocessing message type.  **Possible 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)
      */
@@ -29920,7 +30867,7 @@ declare namespace __esri {
      */
     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
+     * The job status.  **Possible 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)
      */
@@ -29951,7 +30898,7 @@ declare namespace __esri {
      */
     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
+     * The job status.  **Possible 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)
      */
@@ -30430,7 +31377,15 @@ declare namespace __esri {
      */
     exportOptions: PrintTemplateExportOptions;
     /**
-     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * When true, the feature's attributes are included in feature collection layers even when they are not needed for rendering. By default they are removed to reduce the request size. Only applicable to custom print services which use the feature attributes, for example to display a table of features and their attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#forceFeatureAttributes)
+     * 
+     * @default false
+     */
+    forceFeatureAttributes: boolean;
+    /**
+     * The output format for the printed map.  **Possible 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)
      * 
@@ -30514,7 +31469,15 @@ declare namespace __esri {
      */
     exportOptions?: PrintTemplateExportOptions;
     /**
-     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * When true, the feature's attributes are included in feature collection layers even when they are not needed for rendering. By default they are removed to reduce the request size. Only applicable to custom print services which use the feature attributes, for example to display a table of features and their attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#forceFeatureAttributes)
+     * 
+     * @default false
+     */
+    forceFeatureAttributes?: boolean;
+    /**
+     * The output format for the printed map.  **Possible 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)
      * 
@@ -30617,7 +31580,7 @@ declare namespace __esri {
      */
     copyrightText: string;
     /**
-     * The unit used for the scalebar.  **Known Values:** `Miles` | `Kilometers` | `Meters` | `Feet`
+     * The unit used for the scalebar.  **Possible Values:** `Miles` | `Kilometers` | `Meters` | `Feet`
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-PrintTemplate.html#layoutOptions)
      * 
@@ -30745,73 +31708,90 @@ declare namespace __esri {
      */
     datumTransformation: number;
     /**
-     * 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](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) is `true`.
+     * Specifies a search distance from a given [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) in a spatial query. The [units property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#units) indicates the unit of measurement. In essence, setting this property creates a buffer at the specified size around the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry). The query will use that buffer to return features in the layer or layer view that adhere to the to the indicated [spatial relationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship).  If querying a feature service, the [supportsQueryWithDistance](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) capability must be `true`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#distance)
      */
     distance: number;
     /**
-     * Specify the geodatabase version to display.
+     * Specifies the geodatabase version to display for feature service queries.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#gdbVersion)
      */
     gdbVersion: string;
     /**
-     * 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).
+     * 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-Query.html#spatialRelationship) will indicate how the geometry should be used to query features. 
+     * > **Known Limitations**  [Mesh](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Mesh.html) geometry types are currently not supported.
      * 
      * [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.
+     * Specifies the number of decimal places for 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.
+     * One or more field names that will be used to group the statistics. This is only valid when [outStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outStatistics) has been defined.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#groupByFieldsForStatistics)
      */
     groupByFieldsForStatistics: string[];
     /**
-     * The historic moment to query. This parameter applies only if the `supportsQueryWithHistoricMoment` property of the layers being queried is set to `true`. This setting is provided in the layer resource.
+     * The historic moment to query. This parameter applies only if the `supportsQueryWithHistoricMoment` capability of the service being queried is `true`. This setting is provided in the layer resource.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#historicMoment)
      */
     historicMoment: Date;
     /**
-     * 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.
+     * The maximum allowable offset used for generalizing geometries returned by the query operation. The offset is in the units of [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outSpatialReference). If `outSpatialReference` is not defined, the spatial reference of the view is used. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * When set, the maximum number of features returned by the query will equal the `maxRecordCount` of the service multiplied by this factor. The value of this property may not exceed `5`.  For example, if the `maxRecordCount` of your feature service is `2000`, and you set the `maxRecordCountFactor` to `5`, then the maximum number of features that could be returned by the query is `10000`. 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6 services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#maxRecordCountFactor)
+     * 
+     * @default 1
+     */
+    maxRecordCountFactor: number;
+    /**
+     * Parameter dictates how the geometry of a multipatch feature will be returned. Currently, the only supported value is `xyFootprint`. If indicated, 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, then the default value of `num` is 10. If neither `num` nor `start` properties are provided, then the default value of `num` is equal to the **Max Record Count** of the service, which can be found at the REST endpoint of the FeatureLayer.
+     * The number of features to retrieve. This option should be used in conjunction with the [start property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#start). Use this to implement paging (i.e. to retrieve "pages" of results when querying).  If not provided, but an instance of Query has a `start` property, then the default value of `num` is 10. If neither `num` nor `start` properties are provided, then the default value of `num` is equal to the `maxRecordCount` of the service, which can be found at the REST endpoint of the FeatureLayer. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * A comma delimited list of ObjectIDs for the features in the layer 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.*
+     * One or more field names 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`. 
+     * > **Known Limitations** 
+     *   * If querying a [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html), then `supportsAdvancedQueries` must be `true` on the service.
+     *   * For [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), `FeatureLayer.capabilities.queryRelated.supportsOrderBy` must be `true`.
      * 
      * [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.
+     * 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 service layer. You must list actual field names rather than field aliases. You may, however, use field aliases when you display the results of the query.  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 smaller the payload size, and therefore the faster the response of the query.  You can also specify SQL expressions as `outFields` to calculate new values server side for the query results. See the example snippets below for an example of this.  Each query must have access to the `Shape` and `ObjectId` fields for a layer. However, the list of outFields does not need to include these two fields. 
+     * > **Known Limitations** 
+     *   * If specifying outFields as expressions on a feature service-based [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), the service capabilities `advancedQueryCapabilities.supportsOutFieldSQLExpression` and `useStandardizedQueries` must both be true.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields)
      */
@@ -30823,43 +31803,47 @@ declare namespace __esri {
      */
     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.*
+     * The definitions for one or more field-based statistics to be calculated. If `outStatistics` is specified the only other query parameters that should be used are [groupByFieldsForStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#groupByFieldsForStatistics), [orderByFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#orderByFields), [text](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#text), and [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where). 
+     * > **Known Limitations**  For service-based queries, `outStatistics` is only supported on layers where `supportsStatistics = true`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outStatistics)
      */
     outStatistics: StatisticDefinition[];
     /**
-     * Filters features from the layer based on pre-authored parameterized filters. When value is not specified for any parameter in a request, the default value, that is assigned during authoring time, gets used. Requires ArcGIS Server service 10.5 or greater.
+     * Filters features from the layer based on pre-authored parameterized filters. When value is not specified for any parameter in a request, the default value, that is assigned during authoring time, gets used. Requires an ArcGIS Enterprise service 10.5 or greater.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#parameterValues)
      */
     parameterValues: QueryParameterValues[];
     /**
-     * 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.
+     * Specifies 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.*
+     * Used to project the geometry onto a virtual grid, likely representing pixels on the screen. 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6.1 services.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
      */
     quantizationParameters: QueryQuantizationParameters;
     /**
-     * Filters features from the layer that are within the specified range values. Requires ArcGIS Server service 10.5 or greater.
+     * Filters features from the layer that are within the specified range values. Requires ArcGIS Enterprise services 10.5 or greater.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#rangeValues)
      */
     rangeValues: QueryRangeValues[];
     /**
-     * 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.
+     * The Dimensionally Extended 9 Intersection Model (DE-9IM) matrix relation (encoded as a string) to query the spatial relationship of the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) to the layer's features. 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: '*').  Set this parameter when the [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) 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 on how to construct these strings. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * If `true`, each feature in the returned [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) will be returned with a centroid. This property only applies to queries against polygon [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6.1 services.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnCentroid)
      * 
@@ -30867,7 +31851,9 @@ declare namespace __esri {
      */
     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.*
+     * If `true` then the query returns distinct values based on the field(s) specified in [outFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields). 
+     * > **Known Limitations** 
+     *   * For service-based queries, this parameter applies only if the `supportsAdvancedQueries` capability of the layer is `true`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnDistinctValues)
      * 
@@ -30875,7 +31861,8 @@ declare namespace __esri {
      */
     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.**
+     * 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. 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6 services.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnExceededLimitFeatures)
      * 
@@ -30883,7 +31870,8 @@ declare namespace __esri {
      */
     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.
+     * If `true`, each feature in the returned [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) includes the geometry. 
+     * > **Known Limitations**  For [FeatureLayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html) queries, the precision of the returned geometries will only be as high as the view's scale resolution since geometries are quantized for improved performance on the view. The smaller the scale, the lower the resolution of the geometries.  This limitation does not apply to [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), and [CSVLayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html) queries.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry)
      * 
@@ -30891,35 +31879,31 @@ declare namespace __esri {
      */
     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.
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then m-values are included 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.
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then z-values are included 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: 
+     * For spatial queries, this parameter defines the spatial relationship to query features in the layer or layer view against the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry). See the [Types of spatial relationships that can be validated](https://desktop.arcgis.com/en/arcmap/latest/extensions/data-reviewer/types-of-spatial-relationships-that-can-be-validated.htm) document for more details about each spatial relationship.  The possible 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.
+     * intersects | Returns features from the layer or layer view that intersect the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * contains | Returns features from the layer or layer view that are completely contained by the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * crosses | Returns features from the layer or layer view that cross the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * envelope-intersects | Returns features from the layer or layer view that intersect the envelope (or extent) of the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
      * 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).
+     * overlaps | Returns features from the layer or layer view that overlap the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * touches | Returns features from the layer or layer view that touch the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * within | Returns features from the layer or layer view that are completely within the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * 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). If this value is specified, then the [relationParameter](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#relationParameter) must also be specified.
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship)
@@ -30928,7 +31912,8 @@ declare namespace __esri {
      */
     spatialRelationship: string;
     /**
-     * This parameter can be either standard SQL92 `standard` or it can use the native SQL of the underlying datastore `native`. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/query-feature-service-.htm) for more information.  **Known Values:** none | standard | native
+     * This parameter can be either standard SQL92 `standard` or it can use the native SQL of the underlying datastore `native`. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/query-feature-service-.htm) for more information.  **Possible Values:** none | standard | native 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#sqlFormat)
      * 
@@ -30936,13 +31921,14 @@ declare namespace __esri {
      */
     sqlFormat: 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.
+     * The zero-based index indicating where to begin retrieving features. This property hould 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. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * Shorthand for a where clause using "like". The field used is the display field defined in the services directory.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#text)
      * 
@@ -30950,7 +31936,9 @@ declare namespace __esri {
      */
     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](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) is `true`.  **Known Values:** feet | miles | nautical-miles | us-nautical-miles | meters | kilometers
+     * The unit for calculating the buffer distance when [distance](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#distance) is specified in spatial queries. if `unit` is not specified, the unit is derived from the layer or layer view's [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html). 
+     * > **Known Limitations**  For service-based queries, this parameter only applies if [supportsQueryWithDistance](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) is `true`.
+     * **Possible 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)
      */
@@ -30974,7 +31962,7 @@ declare namespace __esri {
 
   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).
+     * This class defines parameters for executing queries for features from a layer or layer view. Once a Query object's properties are defined, it can then be passed into an [executable function](?search=queryfeatures), which will return the features in 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)
      */
@@ -30994,73 +31982,90 @@ declare namespace __esri {
      */
     datumTransformation?: number;
     /**
-     * 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](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) is `true`.
+     * Specifies a search distance from a given [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) in a spatial query. The [units property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#units) indicates the unit of measurement. In essence, setting this property creates a buffer at the specified size around the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry). The query will use that buffer to return features in the layer or layer view that adhere to the to the indicated [spatial relationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship).  If querying a feature service, the [supportsQueryWithDistance](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) capability must be `true`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#distance)
      */
     distance?: number;
     /**
-     * Specify the geodatabase version to display.
+     * Specifies the geodatabase version to display for feature service queries.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#gdbVersion)
      */
     gdbVersion?: string;
     /**
-     * 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).
+     * 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-Query.html#spatialRelationship) will indicate how the geometry should be used to query features. 
+     * > **Known Limitations**  [Mesh](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Mesh.html) geometry types are currently not supported.
      * 
      * [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.
+     * Specifies the number of decimal places for 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.
+     * One or more field names that will be used to group the statistics. This is only valid when [outStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outStatistics) has been defined.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#groupByFieldsForStatistics)
      */
     groupByFieldsForStatistics?: string[];
     /**
-     * The historic moment to query. This parameter applies only if the `supportsQueryWithHistoricMoment` property of the layers being queried is set to `true`. This setting is provided in the layer resource.
+     * The historic moment to query. This parameter applies only if the `supportsQueryWithHistoricMoment` capability of the service being queried is `true`. This setting is provided in the layer resource.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#historicMoment)
      */
     historicMoment?: DateProperties;
     /**
-     * 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.
+     * The maximum allowable offset used for generalizing geometries returned by the query operation. The offset is in the units of [outSpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outSpatialReference). If `outSpatialReference` is not defined, the spatial reference of the view is used. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * When set, the maximum number of features returned by the query will equal the `maxRecordCount` of the service multiplied by this factor. The value of this property may not exceed `5`.  For example, if the `maxRecordCount` of your feature service is `2000`, and you set the `maxRecordCountFactor` to `5`, then the maximum number of features that could be returned by the query is `10000`. 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6 services.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#maxRecordCountFactor)
+     * 
+     * @default 1
+     */
+    maxRecordCountFactor?: number;
+    /**
+     * Parameter dictates how the geometry of a multipatch feature will be returned. Currently, the only supported value is `xyFootprint`. If indicated, 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, then the default value of `num` is 10. If neither `num` nor `start` properties are provided, then the default value of `num` is equal to the **Max Record Count** of the service, which can be found at the REST endpoint of the FeatureLayer.
+     * The number of features to retrieve. This option should be used in conjunction with the [start property](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#start). Use this to implement paging (i.e. to retrieve "pages" of results when querying).  If not provided, but an instance of Query has a `start` property, then the default value of `num` is 10. If neither `num` nor `start` properties are provided, then the default value of `num` is equal to the `maxRecordCount` of the service, which can be found at the REST endpoint of the FeatureLayer. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * A comma delimited list of ObjectIDs for the features in the layer 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.*
+     * One or more field names 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`. 
+     * > **Known Limitations** 
+     *   * If querying a [MapImageLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-MapImageLayer.html), then `supportsAdvancedQueries` must be `true` on the service.
+     *   * For [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), `FeatureLayer.capabilities.queryRelated.supportsOrderBy` must be `true`.
      * 
      * [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.
+     * 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 service layer. You must list actual field names rather than field aliases. You may, however, use field aliases when you display the results of the query.  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 smaller the payload size, and therefore the faster the response of the query.  You can also specify SQL expressions as `outFields` to calculate new values server side for the query results. See the example snippets below for an example of this.  Each query must have access to the `Shape` and `ObjectId` fields for a layer. However, the list of outFields does not need to include these two fields. 
+     * > **Known Limitations** 
+     *   * If specifying outFields as expressions on a feature service-based [FeatureLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html), the service capabilities `advancedQueryCapabilities.supportsOutFieldSQLExpression` and `useStandardizedQueries` must both be true.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields)
      */
@@ -31072,43 +32077,47 @@ declare namespace __esri {
      */
     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.*
+     * The definitions for one or more field-based statistics to be calculated. If `outStatistics` is specified the only other query parameters that should be used are [groupByFieldsForStatistics](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#groupByFieldsForStatistics), [orderByFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#orderByFields), [text](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#text), and [where](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#where). 
+     * > **Known Limitations**  For service-based queries, `outStatistics` is only supported on layers where `supportsStatistics = true`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outStatistics)
      */
     outStatistics?: StatisticDefinitionProperties[];
     /**
-     * Filters features from the layer based on pre-authored parameterized filters. When value is not specified for any parameter in a request, the default value, that is assigned during authoring time, gets used. Requires ArcGIS Server service 10.5 or greater.
+     * Filters features from the layer based on pre-authored parameterized filters. When value is not specified for any parameter in a request, the default value, that is assigned during authoring time, gets used. Requires an ArcGIS Enterprise service 10.5 or greater.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#parameterValues)
      */
     parameterValues?: QueryParameterValues[];
     /**
-     * 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.
+     * Specifies 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.*
+     * Used to project the geometry onto a virtual grid, likely representing pixels on the screen. 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6.1 services.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
      */
     quantizationParameters?: QueryQuantizationParameters;
     /**
-     * Filters features from the layer that are within the specified range values. Requires ArcGIS Server service 10.5 or greater.
+     * Filters features from the layer that are within the specified range values. Requires ArcGIS Enterprise services 10.5 or greater.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#rangeValues)
      */
     rangeValues?: QueryRangeValues[];
     /**
-     * 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.
+     * The Dimensionally Extended 9 Intersection Model (DE-9IM) matrix relation (encoded as a string) to query the spatial relationship of the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry) to the layer's features. 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: '*').  Set this parameter when the [spatialRelationship](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship) 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 on how to construct these strings. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * If `true`, each feature in the returned [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) will be returned with a centroid. This property only applies to queries against polygon [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html). 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6.1 services.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnCentroid)
      * 
@@ -31116,7 +32125,9 @@ declare namespace __esri {
      */
     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.*
+     * If `true` then the query returns distinct values based on the field(s) specified in [outFields](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#outFields). 
+     * > **Known Limitations** 
+     *   * For service-based queries, this parameter applies only if the `supportsAdvancedQueries` capability of the layer is `true`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnDistinctValues)
      * 
@@ -31124,7 +32135,8 @@ declare namespace __esri {
      */
     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.**
+     * 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. 
+     * > **Known Limitations**  Only supported with ArcGIS Online hosted services or ArcGIS Enterprise 10.6 services.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnExceededLimitFeatures)
      * 
@@ -31132,7 +32144,8 @@ declare namespace __esri {
      */
     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.
+     * If `true`, each feature in the returned [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html) includes the geometry. 
+     * > **Known Limitations**  For [FeatureLayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html) queries, the precision of the returned geometries will only be as high as the view's scale resolution since geometries are quantized for improved performance on the view. The smaller the scale, the lower the resolution of the geometries.  This limitation does not apply to [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), and [CSVLayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html) queries.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry)
      * 
@@ -31140,35 +32153,31 @@ declare namespace __esri {
      */
     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.
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then m-values are included 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.
+     * If `true`, and [returnGeometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#returnGeometry) is `true`, then z-values are included 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: 
+     * For spatial queries, this parameter defines the spatial relationship to query features in the layer or layer view against the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry). See the [Types of spatial relationships that can be validated](https://desktop.arcgis.com/en/arcmap/latest/extensions/data-reviewer/types-of-spatial-relationships-that-can-be-validated.htm) document for more details about each spatial relationship.  The possible 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.
+     * intersects | Returns features from the layer or layer view that intersect the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * contains | Returns features from the layer or layer view that are completely contained by the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * crosses | Returns features from the layer or layer view that cross the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * envelope-intersects | Returns features from the layer or layer view that intersect the envelope (or extent) of the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
      * 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).
+     * overlaps | Returns features from the layer or layer view that overlap the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * touches | Returns features from the layer or layer view that touch the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * within | Returns features from the layer or layer view that are completely within the input [geometry](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#geometry).
+     * 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). If this value is specified, then the [relationParameter](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#relationParameter) must also be specified.
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#spatialRelationship)
@@ -31177,7 +32186,8 @@ declare namespace __esri {
      */
     spatialRelationship?: string;
     /**
-     * This parameter can be either standard SQL92 `standard` or it can use the native SQL of the underlying datastore `native`. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/query-feature-service-.htm) for more information.  **Known Values:** none | standard | native
+     * This parameter can be either standard SQL92 `standard` or it can use the native SQL of the underlying datastore `native`. See the [ArcGIS REST API documentation](https://developers.arcgis.com/rest/services-reference/query-feature-service-.htm) for more information.  **Possible Values:** none | standard | native 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#sqlFormat)
      * 
@@ -31185,13 +32195,14 @@ declare namespace __esri {
      */
     sqlFormat?: 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.
+     * The zero-based index indicating where to begin retrieving features. This property hould 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. 
+     * > **Known Limitations**  This property does not apply to layer view or [CSVLayer](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-CSVLayer.html) queries.
      * 
      * [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.
+     * Shorthand for a where clause using "like". The field used is the display field defined in the services directory.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#text)
      * 
@@ -31199,7 +32210,9 @@ declare namespace __esri {
      */
     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](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) is `true`.  **Known Values:** feet | miles | nautical-miles | us-nautical-miles | meters | kilometers
+     * The unit for calculating the buffer distance when [distance](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#distance) is specified in spatial queries. if `unit` is not specified, the unit is derived from the layer or layer view's [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html). 
+     * > **Known Limitations**  For service-based queries, this parameter only applies if [supportsQueryWithDistance](https://developers.arcgis.com/rest/services-reference/query-feature-service-layer-.htm) is `true`.
+     * **Possible 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)
      */
@@ -31237,13 +32250,13 @@ declare namespace __esri {
      */
     extent?: Extent;
     /**
-     * Geometry coordinates are optimized for viewing and displaying of data. **Known Values:** view
+     * Geometry coordinates are optimized for viewing and displaying of data. **Possible 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
+     * The integer's coordinates will be returned relative to the origin position defined by this property value. **Possible Values:** upper-left | lower-left
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-Query.html#quantizationParameters)
      * 
@@ -31604,13 +32617,13 @@ declare namespace __esri {
      */
     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
+     * 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).  **Possible 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
+     * Defines the amount of direction information returned.  **Possible 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)
      * 
@@ -31658,7 +32671,7 @@ declare namespace __esri {
      */
     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).
+     * 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://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/understanding-network-attributes.htm).
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#impedanceAttribute)
      */
@@ -31670,13 +32683,13 @@ declare namespace __esri {
      */
     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
+     * The units of the output geometry precision.  **Possible 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
+     * 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).  **Possible 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)
      * 
@@ -31720,7 +32733,7 @@ declare namespace __esri {
      */
     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
+     * 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).  **Possible 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)
      */
@@ -31856,13 +32869,13 @@ declare namespace __esri {
      */
     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
+     * 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).  **Possible 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
+     * Defines the amount of direction information returned.  **Possible 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)
      * 
@@ -31910,7 +32923,7 @@ declare namespace __esri {
      */
     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).
+     * 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://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/understanding-network-attributes.htm).
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-RouteParameters.html#impedanceAttribute)
      */
@@ -31922,13 +32935,13 @@ declare namespace __esri {
      */
     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
+     * The units of the output geometry precision.  **Possible 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
+     * 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).  **Possible 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)
      * 
@@ -31972,7 +32985,7 @@ declare namespace __esri {
      */
     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
+     * 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).  **Possible 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)
      */
@@ -32195,7 +33208,7 @@ declare namespace __esri {
      */
     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.
+     * 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://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/understanding-network-attributes.htm) ArcGIS desktop help topic for more details.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#impedanceAttribute)
      */
@@ -32215,7 +33228,7 @@ declare namespace __esri {
      */
     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
+     * The units of the output geometry precision.  **Possible 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)
      */
@@ -32349,7 +33362,7 @@ declare namespace __esri {
      */
     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.
+     * Local date and time at the facility. If `travelDirection = "to-facility"`, the `timeOfDay` value specifies arrival time at the facility. if `travelDirection = "from-facility"`, `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)
      */
@@ -32455,7 +33468,7 @@ declare namespace __esri {
      */
     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.
+     * 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://desktop.arcgis.com/en/arcmap/latest/extensions/network-analyst/understanding-network-attributes.htm) ArcGIS desktop help topic for more details.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-ServiceAreaParameters.html#impedanceAttribute)
      */
@@ -32475,7 +33488,7 @@ declare namespace __esri {
      */
     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
+     * The units of the output geometry precision.  **Possible 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)
      */
@@ -32609,7 +33622,7 @@ declare namespace __esri {
      */
     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.
+     * Local date and time at the facility. If `travelDirection = "to-facility"`, the `timeOfDay` value specifies arrival time at the facility. if `travelDirection = "from-facility"`, `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)
      */
@@ -32760,19 +33773,19 @@ declare namespace __esri {
 
   interface StatisticDefinition extends Accessor, JSONSupport {
     /**
-     * Defines the field for which statistics will be calculated.
+     * Defines the field for which statistics will be calculated. This can be service field names or SQL expressions. See the snippets below for examples.
      * 
      * [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.
+     * Specifies the output field name for the requested statistic. Output field names can only contain alpha-numeric characters and an underscore. If no output field name is specified, the 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
+     * Defines the type of statistic.  **Possible Values:** count | sum | min | max | avg | stddev | var
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#statisticType)
      */
@@ -32791,19 +33804,19 @@ declare namespace __esri {
 
   interface StatisticDefinitionProperties {
     /**
-     * Defines the field for which statistics will be calculated.
+     * Defines the field for which statistics will be calculated. This can be service field names or SQL expressions. See the snippets below for examples.
      * 
      * [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.
+     * Specifies the output field name for the requested statistic. Output field names can only contain alpha-numeric characters and an underscore. If no output field name is specified, the 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
+     * Defines the type of statistic.  **Possible Values:** count | sum | min | max | avg | stddev | var
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-StatisticDefinition.html#statisticType)
      */
@@ -37831,7 +38844,7 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#create)
      * 
      * @param drawAction 
-     * Name of the [draw action](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-DrawAction.html) 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 | rectangle | circle | ellipse  
+     * Name of the [draw action](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-DrawAction.html) to create. See the table below for a list of possible values and type of draw action it creates.  **Possible Values:** point | multipoint | polyline | polygon | rectangle | circle | ellipse  
      * 
      * Geometry type | Draw action instance
      * ------------- | --------------------
@@ -37842,16 +38855,16 @@ declare namespace __esri {
      * rectangle, circle, ellipse | [SegmentDrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.html)
      * @param drawOptions Object of the drawing options for the geometry to be created.
      * @param drawOptions.mode 
-     * The drawing mode. The drawing mode only applies when creating `polygon` and `polyline` geometries.  **Known Values:** 
+     * The drawing mode. The drawing mode applies only when creating `polygon`, `polyline`, `segment` draw actions.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
-     * hybrid | Vertices are added while the pointer is clicked or dragged.
-     * freehand | Vertices are added while the pointer is dragged.
+     * hybrid | Vertices are added while the pointer is clicked or dragged. Applies to and is the default for `polygon` and `polyline` draw actions.
+     * freehand | Vertices are added while the pointer is dragged. Applies to `polygon`, `polyline` and `segment` draw actions. Default for `segment` draw actions.
      * click | Vertices are added when the pointer is clicked.
      * 
      */
-    create(drawAction: string, drawOptions: DrawCreateDrawOptions): DrawAction;
+    create(drawAction: string, drawOptions?: DrawCreateDrawOptions): DrawAction;
     /**
      * Resets the drawing by clearing the active action.
      * 
@@ -37864,7 +38877,7 @@ declare namespace __esri {
 
   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.
+     * The Draw class provides advanced drawing capabilities for developers who need complete control over creating temporary graphics with different geometries. For example, if you want to prevent users from drawing graphics with 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)
      */
@@ -37892,18 +38905,16 @@ declare namespace __esri {
 
   export interface DrawCreateDrawOptions extends Object {
     /**
-     * The drawing mode. The drawing mode only applies when creating `polygon` and `polyline` geometries.  **Known Values:** 
+     * The drawing mode. The drawing mode applies only when creating `polygon`, `polyline`, `segment` draw actions.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
-     * hybrid | Vertices are added while the pointer is clicked or dragged.
-     * freehand | Vertices are added while the pointer is dragged.
+     * hybrid | Vertices are added while the pointer is clicked or dragged. Applies to and is the default for `polygon` and `polyline` draw actions.
+     * freehand | Vertices are added while the pointer is dragged. Applies to `polygon`, `polyline` and `segment` draw actions. Default for `segment` draw actions.
      * click | Vertices are added when the pointer is clicked.
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-Draw.html#create)
-     * 
-     * @default hybrid
      */
     mode?: string;
   }
@@ -37987,19 +38998,6 @@ declare namespace __esri {
      * 
      */
     complete(): void;
-
-
-    on(name: "cursor-update", eventHandler: MultipointDrawActionCursorUpdateEventHandler): IHandle;
-
-    on(name: "vertex-add", eventHandler: MultipointDrawActionVertexAddEventHandler): IHandle;
-
-    on(name: "vertex-remove", eventHandler: MultipointDrawActionVertexRemoveEventHandler): IHandle;
-
-    on(name: "draw-complete", eventHandler: MultipointDrawActionDrawCompleteEventHandler): IHandle;
-
-    on(name: "undo", eventHandler: MultipointDrawActionUndoEventHandler): IHandle;
-
-    on(name: "redo", eventHandler: MultipointDrawActionRedoEventHandler): IHandle;
   }
 
   interface MultipointDrawActionConstructor {
@@ -38014,82 +39012,6 @@ declare namespace __esri {
 
   }
 
-  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 MultipointDrawActionRedoEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    vertices: number[][];
-  }
-
-  export interface MultipointDrawActionUndoEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    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 DrawAction {
     /**
      * An array of x,y coordinates for the [point](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Point.html) geometry.
@@ -38106,11 +39028,6 @@ declare namespace __esri {
      * 
      */
     complete(): void;
-
-
-    on(name: "cursor-update", eventHandler: PointDrawActionCursorUpdateEventHandler): IHandle;
-
-    on(name: "draw-complete", eventHandler: PointDrawActionDrawCompleteEventHandler): IHandle;
   }
 
   interface PointDrawActionConstructor {
@@ -38125,31 +39042,9 @@ declare namespace __esri {
 
   }
 
-  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 DrawAction {
     /**
-     * The drawing mode.  **Known Values:** 
+     * The drawing mode. It is only relevant when the action is first created. Its value cannot be changed during the action lifecycle.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
@@ -38178,19 +39073,6 @@ declare namespace __esri {
      * 
      */
     complete(): void;
-
-
-    on(name: "cursor-update", eventHandler: PolygonDrawActionCursorUpdateEventHandler): IHandle;
-
-    on(name: "vertex-add", eventHandler: PolygonDrawActionVertexAddEventHandler): IHandle;
-
-    on(name: "vertex-remove", eventHandler: PolygonDrawActionVertexRemoveEventHandler): IHandle;
-
-    on(name: "draw-complete", eventHandler: PolygonDrawActionDrawCompleteEventHandler): IHandle;
-
-    on(name: "undo", eventHandler: PolygonDrawActionUndoEventHandler): IHandle;
-
-    on(name: "redo", eventHandler: PolygonDrawActionRedoEventHandler): IHandle;
   }
 
   interface PolygonDrawActionConstructor {
@@ -38203,7 +39085,7 @@ declare namespace __esri {
 
   interface PolygonDrawActionProperties extends DrawActionProperties {
     /**
-     * The drawing mode.  **Known Values:** 
+     * The drawing mode. It is only relevant when the action is first created. Its value cannot be changed during the action lifecycle.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
@@ -38219,85 +39101,9 @@ declare namespace __esri {
     mode?: string;
   }
 
-  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 PolygonDrawActionRedoEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    vertices: number[][];
-  }
-
-  export interface PolygonDrawActionUndoEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    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 DrawAction {
     /**
-     * The drawing mode.  **Known Values:** 
+     * The drawing mode. It is only relevant when the action is first created. Its value cannot be changed during the action lifecycle.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
@@ -38326,19 +39132,6 @@ declare namespace __esri {
      * 
      */
     complete(): void;
-
-
-    on(name: "cursor-update", eventHandler: PolylineDrawActionCursorUpdateEventHandler): IHandle;
-
-    on(name: "vertex-add", eventHandler: PolylineDrawActionVertexAddEventHandler): IHandle;
-
-    on(name: "vertex-remove", eventHandler: PolylineDrawActionVertexRemoveEventHandler): IHandle;
-
-    on(name: "draw-complete", eventHandler: PolylineDrawActionDrawCompleteEventHandler): IHandle;
-
-    on(name: "undo", eventHandler: PolylineDrawActionUndoEventHandler): IHandle;
-
-    on(name: "redo", eventHandler: PolylineDrawActionRedoEventHandler): IHandle;
   }
 
   interface PolylineDrawActionConstructor {
@@ -38351,7 +39144,7 @@ declare namespace __esri {
 
   interface PolylineDrawActionProperties extends DrawActionProperties {
     /**
-     * The drawing mode.  **Known Values:** 
+     * The drawing mode. It is only relevant when the action is first created. Its value cannot be changed during the action lifecycle.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
@@ -38367,83 +39160,21 @@ declare namespace __esri {
     mode?: string;
   }
 
-  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 PolylineDrawActionRedoEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    vertices: number[][];
-  }
-
-  export interface PolylineDrawActionUndoEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    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[][];
-  }
-
   interface SegmentDrawAction extends DrawAction {
+    /**
+     * The drawing mode. It is only relevant when the action is first created. Its value cannot be changed during the action lifecycle.  **Possible Values:** 
+     * 
+     * Value | Description |
+     * ----- | ----------- |
+     * freehand | Vertices are added while the pointer is dragged.
+     * click | Vertices are added when the pointer is clicked. SegmentDrawActions are created from 2 vertices.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.html#mode)
+     * 
+     * @default freehand
+     */
+    mode: string;
     /**
      * Two-dimensional array of numbers representing the coordinates of each vertex comprising the geometry being drawn.
      * 
@@ -38452,20 +39183,13 @@ declare namespace __esri {
     readonly vertices: number[][];
 
     /**
-     * Completes drawing the polygon geometry and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.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.
+     * Completes drawing the polygon geometry and fires the [draw-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.html#event:draw-complete) event.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.html#complete)
      * 
      * 
      */
     complete(): void;
-
-
-    on(name: "cursor-update", eventHandler: SegmentDrawActionCursorUpdateEventHandler): IHandle;
-
-    on(name: "draw-complete", eventHandler: SegmentDrawActionDrawCompleteEventHandler): IHandle;
-
-    on(name: "vertex-add", eventHandler: SegmentDrawActionVertexAddEventHandler): IHandle;
   }
 
   interface SegmentDrawActionConstructor {
@@ -38477,46 +39201,273 @@ declare namespace __esri {
   export const SegmentDrawAction: SegmentDrawActionConstructor;
 
   interface SegmentDrawActionProperties extends DrawActionProperties {
-
+    /**
+     * The drawing mode. It is only relevant when the action is first created. Its value cannot be changed during the action lifecycle.  **Possible Values:** 
+     * 
+     * Value | Description |
+     * ----- | ----------- |
+     * freehand | Vertices are added while the pointer is dragged.
+     * click | Vertices are added when the pointer is clicked. SegmentDrawActions are created from 2 vertices.
+     * 
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.html#mode)
+     * 
+     * @default freehand
+     */
+    mode?: string;
   }
 
-  export interface SegmentDrawActionCursorUpdateEvent {
+  export class BaseLayerView2D {
+    /**
+     * References the layer this [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) represents.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#layer)
+     */
+    layer: Layer;
+    /**
+     * The array of [Tile](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile) objects computed to cover the MapView's visible area. This array is updated when the view is animating or the user is interacting with it. Then if tiles have been added or removed, [tilesChanged()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#tilesChanged) is called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#tiles)
+     */
+    tiles: Tile[];
+    /**
+     * References the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) this [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) belongs to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#view)
+     */
+    view: MapView;
 
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    vertices: number[][];
+    /**
+     * Method called when after the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) is created and right before it's asked to draw the layer's content. Typically this method is implemented to start watching property changes on the layer for example.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#attach)
+     * 
+     * 
+     */
+    attach(): void;
+    /**
+     * Method called after the layer is removed and the [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) is about to be removed. Typically, this method is implemented to free resources like watchers.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#detach)
+     * 
+     * 
+     */
+    detach(): void;
+    /**
+     * The method to implement that is responsible of drawing the content of the layer. This method is called every time the MapView's state changes, or if [requestRender()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#requestRender) has been called.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#render)
+     * 
+     * @param renderParameters
+     * @param renderParameters.context The [canvas 2D context](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D) in which to draw content.
+     * @param renderParameters.stationary The stationary state of the `MapView`.
+     * @param renderParameters.state The object that describes view state.
+     * 
+     */
+    render(renderParameters: BaseLayerView2DRenderRenderParameters): void;
+    /**
+     * The [LayerView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-LayerView.html) can call this method to ask the MapView to schedule a new rendering frame.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#requestRender)
+     * 
+     * 
+     */
+    protected requestRender(): void;
+    /**
+     * Method to implement, which notifies of tiles being added or removed for the current view state. This function can be implemented to start and stop fetching new data, or allocate and dispose resources.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#tilesChanged)
+     * 
+     * @param added The tile objects added for the current view viewport.
+     * @param removed The tile objects removed from the view viewport.
+     * 
+     */
+    tilesChanged(added: Tile[], removed: Tile[]): void;
   }
 
-  export interface SegmentDrawActionDrawCompleteEvent {
 
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertices: number[][];
+  export interface BaseLayerView2DRenderRenderParameters extends Object {
+    /**
+     * The [canvas 2D context](https://developer.mozilla.org/en-US/docs/Web/API/CanvasRenderingContext2D) in which to draw content.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#render)
+     */
+    context: CanvasRenderingContext2D;
+    /**
+     * The stationary state of the `MapView`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#render)
+     */
+    stationary: boolean;
+    /**
+     * The object that describes view state.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#render)
+     */
+    state: ViewState;
   }
 
-  export interface SegmentDrawActionVertexAddEvent {
-
-    defaultPrevented: boolean;
-
-    preventDefault: Function;
-
-    type: string;
-
-    vertexIndex: number;
-
-    vertices: number[][];
+  /**
+   * Represents a tile reference.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+   */
+  export interface Tile extends Object {
+    /**
+     * The tile string identifier in the format `level/row/col/world`
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    id: string;
+    /**
+     * The level identifier of the [LOD](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-support-LOD.html) to which the tile belongs
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    level: number;
+    /**
+     * The row identifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    row: number;
+    /**
+     * The column identifier.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    col: number;
+    /**
+     * When the projection allows world wrapping (e.g. Web Mercator), identifies the instance of the world this tile's `level`/`row`/`col`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    world: number;
+    /**
+     * The number of map units per pixel in the tile.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    resolution: number;
+    /**
+     * The map scale at the tile's level.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    scale: number;
+    /**
+     * The coordinates of the top-left corner of the tile as an array of two numbers. The coordinates are in un-normalized map units.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    coords: number[];
+    /**
+     * 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.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-layers-BaseLayerView2D.html#Tile)
+     */
+    bounds: number[];
   }
 
+  interface ViewState {
+    /**
+     * Represents the view's center point as an array of two numbers `[x, y]`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#center)
+     */
+    readonly center: number[];
+    /**
+     * The extent represents the visible portion of a map within the view as an instance of Extent.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#extent)
+     */
+    readonly extent: Extent;
+    /**
+     * Represents the size of one pixel in map units. The value of `resolution` is the result of the division of the [extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#extent) width by the [size](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#size).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#resolution)
+     */
+    readonly resolution: number;
+    /**
+     * The clockwise 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-views-2d-ViewState.html#rotation)
+     */
+    readonly rotation: number;
+    /**
+     * Represents the map scale at the center of the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#scale)
+     */
+    readonly scale: number;
+    /**
+     * Represents 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-2d-ViewState.html#size)
+     */
+    readonly size: number[];
+
+    /**
+     * Creates a deep clone of ViewState object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#clone)
+     * 
+     * 
+     */
+    clone(): ViewState;
+    /**
+     * Copies the properties from a given view state.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#copy)
+     * 
+     * @param state The view state to copy the properties from.
+     * 
+     */
+    copy(state: ViewState): ViewState;
+    /**
+     * Converts the x and y screen coordinates to map coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#toMap)
+     * 
+     * @param out The receiving array of the conversion.
+     * @param x The horizontal screen coordinate to convert.
+     * @param y The vertical screen coordinate to convert.
+     * 
+     */
+    toMap(out: number[], x: number, y: number): number[];
+    /**
+     * Converts the x and y map coordinates to screen coordinates.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#toScreen)
+     * 
+     * @param out The receiving array of the conversion.
+     * @param x The horizontal screen coordinate to convert.
+     * @param y The vertical screen coordinate to convert.
+     * 
+     */
+    toScreen(out: number[], x: number, y: number): number[];
+    /**
+     * Converts the x and y map coordinates to screen coordinates. This method is similar to [toScreen](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#toScreen), without applying the view state rotation.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-ViewState.html#toScreenNoRotation)
+     * 
+     * @param out The receiving array of the conversion.
+     * @param x The horizontal screen coordinate to convert.
+     * @param y The vertical screen coordinate to convert.
+     * 
+     */
+    toScreenNoRotation(out: number[], x: number, y: number): number[];
+  }
+
+  interface ViewStateConstructor {
+
+
+
+    new(properties?: any): ViewState;
+  }
+
+  export const ViewState: ViewStateConstructor;
+
   /**
    * 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.
    * 
@@ -39093,12 +40044,13 @@ declare namespace __esri {
     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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * Polyline, and Point geometries are not supported in the `geometry` query parameter.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not currently supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryExtent)
      * 
@@ -39108,12 +40060,13 @@ declare namespace __esri {
     queryExtent(params?: Query | QueryProperties): 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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * Polyline, and Point geometries are not supported in the `geometry` query parameter.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryFeatureCount)
      * 
@@ -39122,28 +40075,30 @@ declare namespace __esri {
      */
     queryFeatureCount(params?: Query | QueryProperties): 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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * Polyline, and Point geometries are not supported in the `geometry` query parameter.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * 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 a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.html). If query parameters are not provided, all features available for drawing are returned. 
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [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. When no parameters are passed to this method, all features in the client are returned. To only return features visible in the view, set the `geometry` parameter in the query object to the view's extent.
      * 
      */
-    queryFeatures(params?: Query | QueryProperties): IPromise<Graphic[]>;
+    queryFeatures(params?: Query | QueryProperties): IPromise<FeatureSet>;
     /**
      * 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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * Polyline, and Point geometries are not supported in the `geometry` query parameter.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-CSVLayerView.html#queryObjectIds)
      * 
@@ -39166,6 +40121,13 @@ declare namespace __esri {
   }
 
   interface FeatureLayerView extends LayerView {
+    /**
+     * The layer being viewed.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#layer)
+     */
+    readonly layer: FeatureLayer;
+
     /**
      * 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).
@@ -39178,15 +40140,14 @@ declare namespace __esri {
     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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * For spatial queries:
-     *   * [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'` can be used to query against layers of any geometry type.
-     *   * [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries with `spatialRelationship = 'intersects'` can only be used to query against point layers.
-     *   * Polyline, and Point geometries are not supported.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param)
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries are executed against quantized geometries in the layer view. The resolution of layer view geometries, is only as precise as the scale resolution of the view. Therefore, the results of the same query could be different when executed at different scales. This also means that geometries returned from any layer view query will likewise be at the same scale resolution of the view.
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryExtent)
      * 
@@ -39196,15 +40157,14 @@ declare namespace __esri {
     queryExtent(params?: Query | QueryProperties): 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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * For spatial queries:
-     *   * [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'` can be used to query against layers of any geometry type.
-     *   * [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries with `spatialRelationship = 'intersects'` can only be used to query against point layers.
-     *   * Polyline, and Point geometries are not supported.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param)
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries are executed against quantized geometries in the layer view. The resolution of layer view geometries, is only as precise as the scale resolution of the view. Therefore, the results of the same query could be different when executed at different scales. This also means that geometries returned from any layer view query will likewise be at the same scale resolution of the view.
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryFeatureCount)
      * 
@@ -39213,34 +40173,32 @@ declare namespace __esri {
      */
     queryFeatureCount(params?: Query | QueryProperties): 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 in the client, you must use the [FeatureLayer.queryFeatures()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatures) method. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * For spatial queries:
-     *   * [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'` can be used to query against layers of any geometry type.
-     *   * [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries with `spatialRelationship = 'intersects'` can only be used to query against point layers.
-     *   * Polyline, and Point geometries are not supported.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * 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 a [FeatureSet](https://developers.arcgis.com/javascript/latest/api-reference/esri-tasks-support-FeatureSet.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 in the client, you must use the [FeatureLayer.queryFeatures()](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html#queryFeatures) method. 
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries are executed against quantized geometries in the layer view. The resolution of layer view geometries, is only as precise as the scale resolution of the view. Therefore, the results of the same query could be different when executed at different scales. This also means that geometries returned from any layer view query will likewise be at the same scale resolution of the view.
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [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. When no parameters are passed to this method, all features in the client are returned. To only return features visible in the view, set the `geometry` parameter in the query object to the view's extent.
      * 
      */
-    queryFeatures(params?: Query | QueryProperties): IPromise<Graphic[]>;
+    queryFeatures(params?: Query | QueryProperties): IPromise<FeatureSet>;
     /**
      * 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. 
-     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
-     *   * For spatial queries:
-     *   * [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'` can be used to query against layers of any geometry type.
-     *   * [Polygon](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Polygon.html) geometries with `spatialRelationship = 'intersects'` can only be used to query against point layers.
-     *   * Polyline, and Point geometries are not supported.
-     *   * SQL expressions cannot be used in `outFields` nor `onStatisticField` (in the `outStatistics` param).
-     *   * The following Query parameters are currently not supported:
-     *   * `orderByField`
-     *   * `distance` and `units`
+     * > **Known Limitations**  **3D [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) limitations**  Queries with `outStatistics` and any other parameter involving statistics are currently not supported.  **SVG limitations (default)**  Only the `geometry` , `objectIds`, and `spatialRelationship`  properties are supported in the query object. Spatial queries only support [Extent](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-Extent.html) geometries with `spatialRelationship = 'intersects'`.  **WebGL limitations** 
+     *   * Spatial queries are executed against quantized geometries in the layer view. The resolution of layer view geometries, is only as precise as the scale resolution of the view. Therefore, the results of the same query could be different when executed at different scales. This also means that geometries returned from any layer view query will likewise be at the same scale resolution of the view.
+     *   * Spatial queries have the same limitations as those listed in the [projection engine](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-projection.html) documentation.
+     *   * Spatial queries are not currently supported if the layer view has any of the following [SpatialReferences](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html):
+     *   * GDM 2000 (4742) – Malaysia
+     *   * Gusterberg (Ferro) (8042) – Austria/Czech Republic
+     *   * ISN2016 (8086) - Iceland
+     *   * SVY21 (4757) - Singapore
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-layers-FeatureLayerView.html#queryObjectIds)
      * 
@@ -39732,7 +40690,7 @@ declare namespace __esri {
      *   * 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.
+     * 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).  If a tiled map service is used as the basemap and `snapToZoom` property is set to `true` in [constraints](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints), the `goTo` method will zoom to the level of detail (LOD) of the basemap that is nearest to the defined `target`. If `snapToZoom` property is set to `false`, the `goTo` method will zoom to the exact `target`.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo)
      * 
@@ -40518,6 +41476,14 @@ declare namespace __esri {
   }
 
   interface SceneView extends View, BreakpointsOwner {
+    /**
+     * Allows the view to be partially or fully transparent when composited with the webpage elements behind it. This property can only be set once at construction time. When alpha compositing is enabled, web scenes are less performant. It's important to set this property to `true` only when you need to apply transparency on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#alphaCompositingEnabled)
+     * 
+     * @default false
+     */
+    alphaCompositingEnabled: boolean;
     /**
      * 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.
@@ -40557,6 +41523,20 @@ declare namespace __esri {
      * 
      * // Disable automatic lighting updates by camera tracking
      * view.environment.lighting.cameraTrackingEnabled = true;
+     * 
+     * // Set a background color
+     * const view = new SceneView({
+     *   container: "view",
+     *   map: map,
+     *   environment: {
+     *     background: {
+     *       type: "color",
+     *       color: [255, 252, 244, 1]
+     *     },
+     *     starsEnabled: false,
+     *     atmosphereEnabled: false
+     *   }
+     * });
      * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
@@ -40807,6 +41787,14 @@ declare namespace __esri {
   export const SceneView: SceneViewConstructor;
 
   interface SceneViewProperties extends ViewProperties, BreakpointsOwnerProperties {
+    /**
+     * Allows the view to be partially or fully transparent when composited with the webpage elements behind it. This property can only be set once at construction time. When alpha compositing is enabled, web scenes are less performant. It's important to set this property to `true` only when you need to apply transparency on the view.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#alphaCompositingEnabled)
+     * 
+     * @default false
+     */
+    alphaCompositingEnabled?: boolean;
     /**
      * 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.
@@ -40846,6 +41834,20 @@ declare namespace __esri {
      * 
      * // Disable automatic lighting updates by camera tracking
      * view.environment.lighting.cameraTrackingEnabled = true;
+     * 
+     * // Set a background color
+     * const view = new SceneView({
+     *   container: "view",
+     *   map: map,
+     *   environment: {
+     *     background: {
+     *       type: "color",
+     *       color: [255, 252, 244, 1]
+     *     },
+     *     starsEnabled: false,
+     *     atmosphereEnabled: false
+     *   }
+     * });
      * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
@@ -41257,7 +42259,7 @@ declare namespace __esri {
      */
     clipDistance?: SceneViewConstraintsClipDistanceProperties;
     /**
-     * When enabled, prevents the user from navigating below the surface in a local SceneView.
+     * When enabled, prevents the user from navigating below the surface in a local SceneView. This property is deprecated, please use [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#navigationConstraint) instead.  **Deprecated since version 4.8**
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
      */
@@ -41284,7 +42286,7 @@ declare namespace __esri {
      */
     clipDistance?: SceneViewConstraintsClipDistance;
     /**
-     * When enabled, prevents the user from navigating below the surface in a local SceneView.
+     * When enabled, prevents the user from navigating below the surface in a local SceneView. This property is deprecated, please use [Ground](https://developers.arcgis.com/javascript/latest/api-reference/esri-Ground.html#navigationConstraint) instead.  **Deprecated since version 4.8**
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#constraints)
      */
@@ -41432,6 +42434,12 @@ declare namespace __esri {
 
 
   export interface SceneViewEnvironmentProperties extends Object {
+    /**
+     * Specifies how the background of the scene (which lies behind sky, stars and atmosphere) should be displayed. By default this is simply a single, fully opaque, black color. Currently [ColorBackground](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-ColorBackground.html) is the only type of background supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
+    background?: BackgroundProperties;
     /**
      * Lighting conditions of the scene.
      * 
@@ -41461,6 +42469,12 @@ declare namespace __esri {
   }
 
   export interface SceneViewEnvironment extends AnonymousAccessor {
+    /**
+     * Specifies how the background of the scene (which lies behind sky, stars and atmosphere) should be displayed. By default this is simply a single, fully opaque, black color. Currently [ColorBackground](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-ColorBackground.html) is the only type of background supported.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
+     */
+    background?: Background;
     /**
      * Lighting conditions of the scene.
      * 
@@ -41535,7 +42549,7 @@ declare namespace __esri {
      */
     date?: DateProperties;
     /**
-     * Indicates whether to show shadows cast by the sun
+     * Indicates whether to show shadows cast by the sun. Shadows are only displayed for real world 3D objects. Terrain doesn't cast shadows. In local scenes at small zoom levels, shadows are not displayed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
      * 
@@ -41570,7 +42584,7 @@ declare namespace __esri {
      */
     date?: Date;
     /**
-     * Indicates whether to show shadows cast by the sun
+     * Indicates whether to show shadows cast by the sun. Shadows are only displayed for real world 3D objects. Terrain doesn't cast shadows. In local scenes at small zoom levels, shadows are not displayed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment)
      * 
@@ -41648,7 +42662,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
      */
-    center?: number[];
+    center?: number[] | Point;
     /**
      * The [SceneView.scale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#scale) to go to.
      * 
@@ -41678,7 +42692,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo)
      */
-    position?: number;
+    position?: Point;
   }
 
 
@@ -41865,10 +42879,10 @@ declare namespace __esri {
      * 
      * @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.position The position in the view at which to add the component. If not specified, `manual` is used by default. **Possible 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 The position in the view at which to add the component. If not specified, `manual` is used by default. **Possible 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. **Possible 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.
      * 
      */
@@ -41878,7 +42892,7 @@ declare namespace __esri {
      * 
      * [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
+     * @param position The position from which to remove all components. If not specified, `manual` is used by default. **Possible Values:** top-left | top-right | bottom-left | bottom-right | manual
      * 
      */
     empty(position?: string): void;
@@ -41889,8 +42903,8 @@ declare namespace __esri {
      * 
      * @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
+     * @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. **Possible 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. **Possible Values:** top-left | top-right | bottom-left | bottom-right | manual
      * 
      */
     move(component: Widget | HTMLElement | string | any[] | UIMoveComponent, position?: string): void;
@@ -41949,7 +42963,7 @@ declare namespace __esri {
      */
     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
+     * The position in the view at which to add the component. If not specified, `manual` is used by default. **Possible 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)
      */
@@ -41965,7 +42979,7 @@ declare namespace __esri {
 
   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
+     * The position in the view at which to add the component(s). If not specified, `manual` is used by default. **Possible 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)
      */
@@ -41987,7 +43001,7 @@ declare namespace __esri {
      */
     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
+     * 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. **Possible 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)
      */
@@ -42210,7 +43224,7 @@ declare namespace __esri {
 
   interface ViewAnimation extends Accessor, corePromise {
     /**
-     * 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
+     * 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.  **Possible Values:** running | finished | stopped
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-ViewAnimation.html#state)
      * 
@@ -42928,13 +43942,111 @@ declare namespace __esri {
     search?: SearchProperties;
   }
 
+  interface Background extends Accessor, JSONSupport {
+    /**
+     * Creates a deep clone of the Background.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-Background.html#clone)
+     * 
+     * 
+     */
+    clone(): Background;
+  }
+
+  interface BackgroundConstructor {
+    /**
+     * The background of a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html) that lies behind the sky, atmosphere and stars.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-Background.html)
+     */
+
+    new(properties?: BackgroundProperties): Background;
+
+    fromJSON(json: any): Background;
+  }
+
+  export const Background: BackgroundConstructor;
+
+  interface BackgroundProperties {
+
+  }
+
+  interface ColorBackground extends Background, JSONSupport {
+    /**
+     * The color of the background. 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-webscene-background-ColorBackground.html#color)
+     * 
+     * @default black
+     */
+    color: Color;
+
+    /**
+     * Creates a deep clone of the object.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-ColorBackground.html#clone)
+     * 
+     * 
+     */
+    clone(): ColorBackground;
+  }
+
+  interface ColorBackgroundConstructor {
+    /**
+     * This type of [Background](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-Background.html) allows to set a [Color](https://developers.arcgis.com/javascript/latest/api-reference/esri-Color.html) as the background of a [SceneView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html). The view environment stars and atmosphere will show on top of the background when enabled. To have a clear background color only, make sure to set both the [view.environment.starsEnabled](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment) and [view.environment.atmosphereEnabled](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#environment) properties to `false`.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-background-ColorBackground.html)
+     */
+
+    new(properties?: ColorBackgroundProperties): ColorBackground;
+
+    fromJSON(json: any): ColorBackground;
+  }
+
+  export const ColorBackground: ColorBackgroundConstructor;
+
+  interface ColorBackgroundProperties extends BackgroundProperties {
+    /**
+     * The color of the background. 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-webscene-background-ColorBackground.html#color)
+     * 
+     * @default black
+     */
+    color?: Color | number[] | string;
+  }
+
   interface Environment extends Accessor {
+    /**
+     * Specifies whether the atmosphere should be displayed. Typically this consists of haze and sky.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#atmosphereEnabled)
+     * 
+     * @default true
+     */
+    atmosphereEnabled: boolean;
+    /**
+     * Specifies how the background of the scene (which lies behind sky, stars and atmosphere) should be displayed. By default this is simply a single, fully opaque, black color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#background)
+     * 
+     * @default null
+     */
+    background: Background;
     /**
      * 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;
+    /**
+     * Specifies whether stars should be displayed in the sky.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#starsEnabled)
+     * 
+     * @default true
+     */
+    starsEnabled: boolean;
 
     /**
      * Creates a deep clone of this object.
@@ -42955,12 +44067,36 @@ declare namespace __esri {
   export const Environment: EnvironmentConstructor;
 
   interface EnvironmentProperties {
+    /**
+     * Specifies whether the atmosphere should be displayed. Typically this consists of haze and sky.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#atmosphereEnabled)
+     * 
+     * @default true
+     */
+    atmosphereEnabled?: boolean;
+    /**
+     * Specifies how the background of the scene (which lies behind sky, stars and atmosphere) should be displayed. By default this is simply a single, fully opaque, black color.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#background)
+     * 
+     * @default null
+     */
+    background?: BackgroundProperties;
     /**
      * 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;
+    /**
+     * Specifies whether stars should be displayed in the sky.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Environment.html#starsEnabled)
+     * 
+     * @default true
+     */
+    starsEnabled?: boolean;
   }
 
   interface websceneInitialViewProperties extends Accessor, corePromise {
@@ -42977,7 +44113,7 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible Values:** global | local
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewingMode)
      * 
@@ -43023,7 +44159,7 @@ declare namespace __esri {
      */
     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
+     * 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.  **Possible Values:** global | local
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-InitialViewProperties.html#viewingMode)
      * 
@@ -43048,7 +44184,7 @@ declare namespace __esri {
      */
     date: Date;
     /**
-     * The type of direct shadows.
+     * Indicates whether to show shadows cast by the sun. Shadows are only displayed for real world 3D objects. Terrain doesn't cast shadows. In local scenes at small zoom levels, shadows are not displayed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#directShadowsEnabled)
      * 
@@ -43092,7 +44228,7 @@ declare namespace __esri {
      */
     date?: DateProperties;
     /**
-     * The type of direct shadows.
+     * Indicates whether to show shadows cast by the sun. Shadows are only displayed for real world 3D objects. Terrain doesn't cast shadows. In local scenes at small zoom levels, shadows are not displayed.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Lighting.html#directShadowsEnabled)
      * 
@@ -43177,6 +44313,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#environment)
      */
     environment: Environment;
+    /**
+     * Ground properties for this slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#ground)
+     */
+    ground: SlideGround;
     /**
      * 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).
      * 
@@ -43307,6 +44449,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#environment)
      */
     environment?: EnvironmentProperties;
+    /**
+     * Ground properties for this slide.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#ground)
+     */
+    ground?: SlideGroundProperties;
     /**
      * 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).
      * 
@@ -43450,6 +44598,25 @@ declare namespace __esri {
   }
 
 
+  export interface SlideGroundProperties extends Object {
+    /**
+     * Ground opacity
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#ground)
+     */
+    opacity?: number;
+  }
+
+  export interface SlideGround extends AnonymousAccessor {
+    /**
+     * Ground opacity
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-webscene-Slide.html#ground)
+     */
+    opacity?: number;
+  }
+
+
   export interface SlideThumbnailProperties extends Object {
     /**
      * The URI pointing to the thumbnail image representing the slide.
@@ -43611,6 +44778,12 @@ declare namespace __esri {
   }
 
   interface AreaMeasurement3D extends Widget {
+    /**
+     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Possible Values:** imperial | metric | square-inches | square-feet | square-yards | square-miles | square-meters | square-kilometers | square-us-feet | acres | ares | hectares
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-AreaMeasurement3D.html#unit)
+     */
+    unit: string;
     /**
      * List of unit options in the widget drop down list.
      * 
@@ -43655,6 +44828,12 @@ declare namespace __esri {
   export const AreaMeasurement3D: AreaMeasurement3DConstructor;
 
   interface AreaMeasurement3DProperties extends WidgetProperties {
+    /**
+     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Possible Values:** imperial | metric | square-inches | square-feet | square-yards | square-miles | square-meters | square-kilometers | square-us-feet | acres | ares | hectares
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-AreaMeasurement3D.html#unit)
+     */
+    unit?: string;
     /**
      * List of unit options in the widget drop down list.
      * 
@@ -43700,7 +44879,7 @@ declare namespace __esri {
      */
     readonly state: string;
     /**
-     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Known Values:** imperial | metric | square-inches | square-feet | square-yards | square-miles | square-meters | square-kilometers | square-us-feet | acres | ares | hectares
+     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Possible Values:** imperial | metric | square-inches | square-feet | square-yards | square-miles | square-meters | square-kilometers | square-us-feet | acres | ares | hectares
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-AreaMeasurement3D-AreaMeasurement3DViewModel.html#unit)
      */
@@ -43742,7 +44921,7 @@ declare namespace __esri {
 
   export interface AreaMeasurement3DViewModelMeasurement extends Object {
     /**
-     * Describes the mode in which the measurement was taken. In `euclidean` mode, the area and perimeter length are computed from a flat polygon with straight segments on the perimeter in the [ECEF](https://en.wikipedia.org/wiki/ECEF) coordinate system. In `geodesic` mode, the area and perimeter length are computed from a geodesic polygon on the WGS84 ellipsoid.  **Known Values:** euclidean | geodesic
+     * Describes the mode in which the measurement was taken. In `euclidean` mode, the area and perimeter length are computed from a flat polygon with straight segments on the perimeter in the [ECEF](https://en.wikipedia.org/wiki/ECEF) coordinate system. In `geodesic` mode, the area and perimeter length are computed from a geodesic polygon on the WGS84 ellipsoid.  **Possible Values:** euclidean | geodesic
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-AreaMeasurement3D-AreaMeasurement3DViewModel.html#measurement)
      */
@@ -43796,7 +44975,7 @@ declare namespace __esri {
      */
     readonly attributionText: string;
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution.html#iconClass)
      */
@@ -43881,7 +45060,7 @@ declare namespace __esri {
      */
     readonly items: Collection<AttributionItem>;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The view model's state.  **Possible Values:** ready | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Attribution-AttributionViewModel.html#state)
      * 
@@ -43937,7 +45116,7 @@ declare namespace __esri {
      */
     activeBasemap: Basemap;
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#iconClass)
      */
@@ -43997,7 +45176,7 @@ declare namespace __esri {
      */
     activeBasemap?: BasemapProperties;
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery.html#iconClass)
      */
@@ -44042,7 +45221,7 @@ declare namespace __esri {
      */
     source: LocalBasemapsSource | PortalBasemapsSource;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The view model's state.  **Possible Values:** ready | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-BasemapGalleryViewModel.html#state)
      * 
@@ -44117,7 +45296,7 @@ declare namespace __esri {
      */
     readonly error: Error;
     /**
-     * The item's state.  **Known Values:** loading | ready | error
+     * The item's state.  **Possible Values:** loading | ready | error
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-BasemapGalleryItem.html#state)
      * 
@@ -44215,6 +45394,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#query)
      */
     query: any | string;
+    /**
+     * Callback for updating basemaps after being fetched and filtered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#updateBasemapsCallback)
+     */
+    updateBasemapsCallback: Function;
   }
 
   interface PortalBasemapsSourceConstructor {
@@ -44244,6 +45429,12 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#query)
      */
     query?: any | string;
+    /**
+     * Callback for updating basemaps after being fetched and filtered.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapGallery-support-PortalBasemapsSource.html#updateBasemapsCallback)
+     */
+    updateBasemapsCallback?: Function;
   }
 
   interface BasemapToggle extends Widget {
@@ -44359,7 +45550,7 @@ declare namespace __esri {
      */
     nextBasemap: Basemap;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The view model's state.  **Possible Values:** ready | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-BasemapToggle-BasemapToggleViewModel.html#state)
      * 
@@ -44419,6 +45610,194 @@ declare namespace __esri {
     view?: MapViewProperties | SceneViewProperties;
   }
 
+  interface Bookmarks extends Widget, GoTo {
+    /**
+     * A collection of [Bookmark](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#bookmarks)
+     */
+    bookmarks: Collection<Bookmark>;
+    /**
+     * The widget's default CSS icon class.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#iconClass)
+     */
+    readonly iconClass: string;
+    /**
+     * The widget's default label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#label)
+     */
+    readonly label: string;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.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 [BookmarksViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#viewModel)
+     */
+    viewModel: BookmarksViewModel;
+
+    /**
+     * Zoom to a specific bookmark.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#goTo)
+     * 
+     * @param Bookmark The bookmark to zoom to.
+     * 
+     */
+    goTo(Bookmark: Bookmark): 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-Bookmarks.html#render)
+     * 
+     * 
+     */
+    render(): any;
+  }
+
+  interface BookmarksConstructor {
+    /**
+     * The Bookmarks widget allows end users to quickly navigate to a particular area of interest. It displays a list of bookmarks, which typically are defined inside the [WebMap](https://developers.arcgis.com/javascript/latest/api-reference/esri-WebMap.html#bookmarks).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html)
+     */
+
+    new(properties?: BookmarksProperties): Bookmarks;
+  }
+
+  export const Bookmarks: BookmarksConstructor;
+
+  interface BookmarksProperties extends WidgetProperties, GoToProperties {
+    /**
+     * A collection of [Bookmark](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#bookmarks)
+     */
+    bookmarks?: CollectionProperties<Bookmark>;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.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 [BookmarksViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.html) class to access all properties and methods on the widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html#viewModel)
+     */
+    viewModel?: BookmarksViewModelProperties;
+  }
+
+  interface Bookmark {
+    /**
+     * The `active` property is true while goTo() is animating.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html#active)
+     * 
+     * @default false
+     */
+    active: boolean;
+    /**
+     * The extent of the specified bookmark item.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html#extent)
+     */
+    extent: Extent;
+    /**
+     * The name of the bookmark item. Used as a label in the [Bookmarks](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks.html) widget.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html#name)
+     */
+    name: string;
+    /**
+     * The URL for a thumbnail image.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html#thumbnail)
+     */
+    thumbnail: BookmarkThumbnail;
+  }
+
+  interface BookmarkConstructor {
+
+
+
+    new(properties?: any): Bookmark;
+  }
+
+  export const Bookmark: BookmarkConstructor;
+
+
+  export interface BookmarkThumbnail extends Object {
+    /**
+     * URL to a thumbnail to display.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html#thumbnail)
+     */
+    url?: string;
+  }
+
+  interface BookmarksViewModel extends Accessor, GoTo {
+    /**
+     * A collection of [Bookmark](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.html#bookmarks)
+     */
+    bookmarks: Collection<Bookmark>;
+    /**
+     * The view model's state.  **Possible Values:** loading | disabled
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.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-Bookmarks-BookmarksViewModel.html#view)
+     */
+    view: MapView;
+
+    /**
+     * Zoom to a specific bookmark.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.html#goTo)
+     * 
+     * @param Bookmark The bookmark to zoom to.
+     * 
+     */
+    goTo(Bookmark: Bookmark): IPromise<any>;
+  }
+
+  interface BookmarksViewModelConstructor {
+
+
+    new(properties?: BookmarksViewModelProperties): BookmarksViewModel;
+  }
+
+  export const BookmarksViewModel: BookmarksViewModelConstructor;
+
+  interface BookmarksViewModelProperties extends GoToProperties {
+    /**
+     * A collection of [Bookmark](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-Bookmark.html)s.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.html#bookmarks)
+     */
+    bookmarks?: CollectionProperties<Bookmark>;
+    /**
+     * The view from which the widget will operate.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Bookmarks-BookmarksViewModel.html#view)
+     */
+    view?: MapViewProperties;
+  }
+
   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.
@@ -44681,9 +46060,9 @@ declare namespace __esri {
     label: string;
   }
 
-  interface Compass extends Widget {
+  interface Compass extends Widget, GoTo {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass.html#iconClass)
      */
@@ -44737,7 +46116,7 @@ declare namespace __esri {
 
   export const Compass: CompassConstructor;
 
-  interface CompassProperties extends WidgetProperties {
+  interface CompassProperties extends WidgetProperties, GoToProperties {
     /**
      * 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).
      * 
@@ -44752,7 +46131,7 @@ declare namespace __esri {
     viewModel?: CompassViewModelProperties;
   }
 
-  interface CompassViewModel extends Accessor {
+  interface CompassViewModel extends Accessor, GoTo {
     /**
      * The orientation axes (x, y, z).
      * 
@@ -44762,7 +46141,7 @@ declare namespace __esri {
      */
     orientation: any;
     /**
-     * The view model's state.  **Known Values:** compass | rotation | disabled
+     * The view model's state.  **Possible Values:** compass | rotation | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Compass-CompassViewModel.html#state)
      * 
@@ -44798,7 +46177,7 @@ declare namespace __esri {
 
   export const CompassViewModel: CompassViewModelConstructor;
 
-  interface CompassViewModelProperties {
+  interface CompassViewModelProperties extends GoToProperties {
     /**
      * The orientation axes (x, y, z).
      * 
@@ -44815,7 +46194,7 @@ declare namespace __esri {
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  interface CoordinateConversion extends Widget {
+  interface CoordinateConversion extends Widget, GoTo {
     /**
      * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) containing every [Conversion](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Conversion.html) that the widget is currently displaying.
      * 
@@ -44835,7 +46214,7 @@ declare namespace __esri {
      */
     formats: Collection<Format>;
     /**
-     * Describes the current mode of the widget.  **Known Values:** live | capture 
+     * Describes the current mode of the widget.  **Possible Values:** live | capture 
      *   * While in `live` mode, the widget will update as the cursor moves.
      *   * While in `capture` mode, the widget will update on mouse click and display a graphic marking the current location.
      * 
@@ -44853,7 +46232,7 @@ declare namespace __esri {
      */
     multipleConversions: boolean;
     /**
-     * Determines whether the widget should expand up or down.  If set to `auto` the widget will be oriented based on its position in the view.  **Known Values:** auto | expand-up | expand-down
+     * Determines whether the widget should expand up or down.  If set to `auto` the widget will be oriented based on its position in the view.  **Possible Values:** auto | expand-up | expand-down
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion.html#orientation)
      * 
@@ -44913,7 +46292,7 @@ declare namespace __esri {
 
   export const CoordinateConversion: CoordinateConversionConstructor;
 
-  interface CoordinateConversionProperties extends WidgetProperties {
+  interface CoordinateConversionProperties extends WidgetProperties, GoToProperties {
     /**
      * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) containing every [Conversion](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Conversion.html) that the widget is currently displaying.
      * 
@@ -44933,7 +46312,7 @@ declare namespace __esri {
      */
     formats?: CollectionProperties<Format>;
     /**
-     * Describes the current mode of the widget.  **Known Values:** live | capture 
+     * Describes the current mode of the widget.  **Possible Values:** live | capture 
      *   * While in `live` mode, the widget will update as the cursor moves.
      *   * While in `capture` mode, the widget will update on mouse click and display a graphic marking the current location.
      * 
@@ -44951,7 +46330,7 @@ declare namespace __esri {
      */
     multipleConversions?: boolean;
     /**
-     * Determines whether the widget should expand up or down.  If set to `auto` the widget will be oriented based on its position in the view.  **Known Values:** auto | expand-up | expand-down
+     * Determines whether the widget should expand up or down.  If set to `auto` the widget will be oriented based on its position in the view.  **Possible Values:** auto | expand-up | expand-down
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion.html#orientation)
      * 
@@ -44980,7 +46359,7 @@ declare namespace __esri {
     viewModel?: CoordinateConversionViewModelProperties;
   }
 
-  interface CoordinateConversionViewModel extends Accessor {
+  interface CoordinateConversionViewModel extends Accessor, GoTo {
     /**
      * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) containing every [Conversion](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Conversion.html) that the widget is currently displaying.
      * 
@@ -45006,7 +46385,7 @@ declare namespace __esri {
      */
     locationSymbol: SimpleMarkerSymbol | PictureMarkerSymbol;
     /**
-     * Describes the current mode of the widget.  **Known Values:** live | capture 
+     * Describes the current mode of the widget.  **Possible Values:** live | capture 
      *   * While in `live` mode, the widget will update as the cursor moves.
      *   * While in `capture` mode, the widget will update on mouse click and display a graphic marking the current location.
      * 
@@ -45024,7 +46403,7 @@ declare namespace __esri {
      */
     requestDelay: number;
     /**
-     * The view model's state.  **Known Values:** ready | loading | disabled
+     * The view model's state.  **Possible Values:** ready | loading | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-CoordinateConversionViewModel.html#state)
      * 
@@ -45078,7 +46457,7 @@ declare namespace __esri {
 
   export const CoordinateConversionViewModel: CoordinateConversionViewModelConstructor;
 
-  interface CoordinateConversionViewModelProperties {
+  interface CoordinateConversionViewModelProperties extends GoToProperties {
     /**
      * A [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) containing every [Conversion](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Conversion.html) that the widget is currently displaying.
      * 
@@ -45104,7 +46483,7 @@ declare namespace __esri {
      */
     locationSymbol?: SimpleMarkerSymbolProperties | PictureMarkerSymbolProperties;
     /**
-     * Describes the current mode of the widget.  **Known Values:** live | capture 
+     * Describes the current mode of the widget.  **Possible Values:** live | capture 
      *   * While in `live` mode, the widget will update as the cursor moves.
      *   * While in `capture` mode, the widget will update on mouse click and display a graphic marking the current location.
      * 
@@ -45235,23 +46614,28 @@ declare namespace __esri {
      * @default null
      */
     name: string;
+    /**
+     * The [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) for this format.  Coordinates generated for a format will be derived from points in this spatial reference.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#spatialReference)
+     */
+    spatialReference: SpatialReference;
+    /**
+     * The view model of the [CoordinateConversion](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion.html) widget that is utilizing this format.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#viewModel)
+     */
+    viewModel: CoordinateConversionViewModel;
   }
 
   export const Format: Format;
 
   /**
-   * Information describing how a Format should be projected.  Used to define custom Formats.  1. If the conversion can be performed synchronously, a convert function should be defined. 2. If the conversion cannot be performed synchronously, a convertDeferred function should be defined. 3. Alternatively, a [SpatialReference](https://developers.arcgis.com/javascript/latest/api-reference/esri-geometry-SpatialReference.html) can be provided, and the Format will project to this Spatial Reference.
+   * This object describes how a Format should be projected and formatted for display.  Used to define custom Formats that require custom conversion and/or projection logic.
    * 
    * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#ConversionInfo)
    */
   export interface ConversionInfo extends Object {
-    /**
-     * The SpatialReference to project to.
-     * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#ConversionInfo)
-     */
-    spatialReference?: SpatialReference;
-
     /**
      * A function that takes a point and returns a [position](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#Position).
      * 
@@ -45260,14 +46644,6 @@ declare namespace __esri {
      * 
      */
     convert(): void;
-    /**
-     * A function that takes a point and returns a promise that resolves into a [position](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#Position).
-     * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-CoordinateConversion-support-Format.html#ConversionInfo)
-     * 
-     * 
-     */
-    convertDeferred(): void;
     /**
      * A function that takes a string and returns a Point.
      * 
@@ -45325,9 +46701,9 @@ declare namespace __esri {
     coordinate: string;
   }
 
-  interface Directions extends Widget {
+  interface Directions extends Widget, GoTo {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#iconClass)
      */
@@ -45425,7 +46801,7 @@ declare namespace __esri {
 
   export const Directions: DirectionsConstructor;
 
-  interface DirectionsProperties extends WidgetProperties {
+  interface DirectionsProperties extends WidgetProperties, GoToProperties {
     /**
      * The maximum number of stops allowed for routing.
      * 
@@ -45476,7 +46852,7 @@ declare namespace __esri {
     viewModel?: DirectionsViewModelProperties;
   }
 
-  interface DirectionsViewModel extends Accessor {
+  interface DirectionsViewModel extends Accessor, GoTo {
     /**
      * 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).
      * 
@@ -45655,7 +47031,7 @@ declare namespace __esri {
 
   export const DirectionsViewModel: DirectionsViewModelConstructor;
 
-  interface DirectionsViewModelProperties {
+  interface DirectionsViewModelProperties extends GoToProperties {
     /**
      * 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).
      * 
@@ -45759,7 +47135,7 @@ declare namespace __esri {
      */
     description: string;
     /**
-     * Number indicating the message type returned from the service. This number correlates to one of the known values listed below.
+     * Number indicating the message type returned from the service. This number correlates to one of the possible values listed below.
      * 
      * Number | Value
      * ------|------------
@@ -46033,7 +47409,7 @@ declare namespace __esri {
     /**
      * The view of the widget.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Directions.html#SearchProperties)
+     * [Read more...](global.html)
      */
     view?: MapView | SceneView;
     /**
@@ -46045,6 +47421,12 @@ declare namespace __esri {
   }
 
   interface DirectLineMeasurement3D extends Widget {
+    /**
+     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Possible Values:** imperial | metric | inches | feet | yards | miles | nautical-miles |  meters | kilometers | us-feet
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D.html#unit)
+     */
+    unit: string;
     /**
      * List of unit options in the widget drop down list.
      * 
@@ -46089,6 +47471,12 @@ declare namespace __esri {
   export const DirectLineMeasurement3D: DirectLineMeasurement3DConstructor;
 
   interface DirectLineMeasurement3DProperties extends WidgetProperties {
+    /**
+     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Possible Values:** imperial | metric | inches | feet | yards | miles | nautical-miles |  meters | kilometers | us-feet
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D.html#unit)
+     */
+    unit?: string;
     /**
      * List of unit options in the widget drop down list.
      * 
@@ -46134,7 +47522,7 @@ declare namespace __esri {
      */
     readonly state: string;
     /**
-     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Known Values:** imperial | metric | inches | feet | yards | miles | nautical-miles |  meters | kilometers | us-feet
+     * Unit system (imperial, metric) or specific unit used for displaying the distance values.  **Possible Values:** imperial | metric | inches | feet | yards | miles | nautical-miles |  meters | kilometers | us-feet
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D-DirectLineMeasurement3DViewModel.html#unit)
      */
@@ -46176,7 +47564,7 @@ declare namespace __esri {
 
   export interface DirectLineMeasurement3DViewModelMeasurement extends Object {
     /**
-     * Describes the mode in which the measurement was taken. In `euclidean` mode, the distances are measured as straight lines in the [ECEF](https://en.wikipedia.org/wiki/ECEF) coordinate system. In `geodesic` mode, the distances are measured as geodesic lines on the WGS84 ellipsoid.  **Known Values:** euclidean | geodesic
+     * Describes the mode in which the measurement was taken. In `euclidean` mode, the distances are measured as straight lines in the [ECEF](https://en.wikipedia.org/wiki/ECEF) coordinate system. In `geodesic` mode, the distances are measured as geodesic lines on the WGS84 ellipsoid.  **Possible Values:** euclidean | geodesic
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-DirectLineMeasurement3D-DirectLineMeasurement3DViewModel.html#measurement)
      */
@@ -46265,7 +47653,7 @@ declare namespace __esri {
      */
     readonly expanded: boolean;
     /**
-     * Icon font used to style the Expand button.
+     * Icon font used to style the Expand button. Will automatically use the [content's](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#content) iconClass if it has one.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expandIconClass)
      */
@@ -46390,7 +47778,7 @@ declare namespace __esri {
      */
     content?: Node | string | WidgetProperties;
     /**
-     * Icon font used to style the Expand button.
+     * Icon font used to style the Expand button. Will automatically use the [content's](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#content) iconClass if it has one.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand.html#expandIconClass)
      */
@@ -46468,7 +47856,7 @@ declare namespace __esri {
      */
     group: string;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The view model's state.  **Possible Values:** ready | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Expand-ExpandViewModel.html#state)
      * 
@@ -46784,7 +48172,7 @@ declare namespace __esri {
      */
     element: HTMLElement;
     /**
-     * The view model's state.  **Known Values:** active | ready | feature-unsupported | disabled
+     * The view model's state.  **Possible Values:** active | ready | feature-unsupported | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Fullscreen-FullscreenViewModel.html#state)
      * 
@@ -46847,9 +48235,9 @@ declare namespace __esri {
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  interface Home extends Widget {
+  interface Home extends Widget, GoTo {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Home.html#iconClass)
      */
@@ -46912,7 +48300,7 @@ declare namespace __esri {
 
   export const Home: HomeConstructor;
 
-  interface HomeProperties extends WidgetProperties {
+  interface HomeProperties extends WidgetProperties, GoToProperties {
     /**
      * 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.
      * 
@@ -46936,7 +48324,7 @@ declare namespace __esri {
     viewpoint?: ViewpointProperties;
   }
 
-  interface HomeViewModel extends Accessor, Evented {
+  interface HomeViewModel extends Accessor, Evented, GoTo {
     /**
      * The current state of the widget.  **Possible Values:** disabled | ready | going-home
      * 
@@ -46981,7 +48369,7 @@ declare namespace __esri {
 
   export const HomeViewModel: HomeViewModelConstructor;
 
-  interface HomeViewModelProperties {
+  interface HomeViewModelProperties extends GoToProperties {
     /**
      * The view associated with the widget instance.
      * 
@@ -47003,7 +48391,7 @@ declare namespace __esri {
 
   interface LayerList extends Widget {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#iconClass)
      */
@@ -47019,7 +48407,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#listItemCreatedFunction)
      */
-    listItemCreatedFunction: Function;
+    listItemCreatedFunction: ListItemCreatedHandler;
     /**
      * A collection of [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html)s representing operational layers.
      * 
@@ -47056,7 +48444,7 @@ declare namespace __esri {
      */
     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).
+     * 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-actions-ActionButton.html) or [action toggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html).
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#triggerAction)
      * 
@@ -47064,7 +48452,7 @@ declare namespace __esri {
      * @param item An item associated with the action.
      * 
      */
-    triggerAction(action: Action, item: ListItem): void;
+    triggerAction(action: ActionButton | ActionToggle, item: ListItem): void;
   }
 
   interface LayerListConstructor {
@@ -47081,7 +48469,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList.html#listItemCreatedFunction)
      */
-    listItemCreatedFunction?: Function;
+    listItemCreatedFunction?: ListItemCreatedHandler;
     /**
      * A collection of [ListItem](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html)s representing operational layers.
      * 
@@ -47124,7 +48512,7 @@ declare namespace __esri {
      */
     readonly operationalItems: Collection<ListItem>;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The view model's state.  **Possible Values:** loading | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#state)
      * 
@@ -47139,7 +48527,7 @@ declare namespace __esri {
     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).
+     * 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-actions-ActionButton.html) or [action toggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html).
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-LayerListViewModel.html#triggerAction)
      * 
@@ -47147,7 +48535,7 @@ declare namespace __esri {
      * @param item An item associated with the action.
      * 
      */
-    triggerAction(action: Action, item: ListItem): void;
+    triggerAction(action: ActionButton | ActionToggle, item: ListItem): void;
   }
 
   interface LayerListViewModelConstructor {
@@ -47187,7 +48575,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-LayerList-ListItem.html#actionsSections)
      */
-    actionsSections: Collection<Collection<Action>>;
+    actionsSections: Collection<Collection<ActionButton | ActionToggle>>;
     /**
      * When a layer contains sublayers, this property is a Collection of ListItem objects belonging to the given layer.
      * 
@@ -47362,9 +48750,11 @@ declare namespace __esri {
 
   export const ListItemPanel: ListItemPanelConstructor;
 
+  export type ListItemCreatedHandler = (event: any) => void;
+
   interface Legend extends Widget {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Legend.html#iconClass)
      */
@@ -47469,7 +48859,7 @@ declare namespace __esri {
     layer: Layer;
   }
 
-  interface Locate extends Widget {
+  interface Locate extends Widget, GoTo {
     /**
      * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
      * 
@@ -47493,11 +48883,17 @@ declare namespace __esri {
      */
     graphic: Graphic;
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#iconClass)
      */
     iconClass: string;
+    /**
+     * The widget's default label.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#label)
+     */
+    readonly label: string;
     /**
      * Indicates the scale to set on the view when navigating to the position of the geolocated result once a location is returned from the [track](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#event:track) event. If a scale value is not explicitly set, then the view will navigate to a default scale of `2500`. For 2D views the value should be within the [effectiveMinScale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints) and [effectiveMaxScale](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#constraints).
      * 
@@ -47557,7 +48953,7 @@ declare namespace __esri {
 
   export const Locate: LocateConstructor;
 
-  interface LocateProperties extends WidgetProperties {
+  interface LocateProperties extends WidgetProperties, GoToProperties {
     /**
      * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
      * 
@@ -47581,7 +48977,7 @@ declare namespace __esri {
      */
     graphic?: GraphicProperties;
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Locate.html#iconClass)
      */
@@ -47616,7 +49012,7 @@ declare namespace __esri {
     viewModel?: LocateViewModelProperties;
   }
 
-  interface LocateViewModel extends Accessor, Evented, GeolocationPositioning {
+  interface LocateViewModel extends Accessor, Evented, GeolocationPositioning, GoTo {
     /**
      * The current state of the widget.  **Possible Values:** disabled | ready | locating
      * 
@@ -47648,13 +49044,13 @@ declare namespace __esri {
 
   export const LocateViewModel: LocateViewModelConstructor;
 
-  interface LocateViewModelProperties extends GeolocationPositioningProperties {
+  interface LocateViewModelProperties extends GeolocationPositioningProperties, GoToProperties {
 
   }
 
   interface NavigationToggle extends Widget {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-NavigationToggle.html#iconClass)
      */
@@ -47826,13 +49222,21 @@ declare namespace __esri {
     view?: SceneViewProperties;
   }
 
-  interface Popup extends Widget, Evented {
+  interface Popup extends Widget, GoTo, 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.
+     * 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 [ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [ActionToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) classes.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions)
      */
-    actions: Collection<Action>;
+    actions: Collection<ActionButton | ActionToggle>;
+    /**
+     * Position of the popup in relation to the selected feature.  **Possible Values:** auto | top-center | top-right | bottom-left | bottom-center | bottom-right | Function
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#alignment)
+     * 
+     * @default "auto"
+     */
+    alignment: string | Function;
     /**
      * 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.
      * 
@@ -47864,7 +49268,7 @@ declare namespace __esri {
      */
     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
+     * Dock position in the [View](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-View.html).  **Possible 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)
      */
@@ -47904,7 +49308,8 @@ declare namespace __esri {
      */
     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.
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions) set on the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or 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). 
+     * > **Known Limitation**  Only [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) rendered with [WebGL](esri-layers-FeatureLayer.html#webgl-rendering) support highlight.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#highlightEnabled)
      * 
@@ -48070,13 +49475,21 @@ declare namespace __esri {
 
   export const Popup: PopupConstructor;
 
-  interface PopupProperties extends WidgetProperties {
+  interface PopupProperties extends WidgetProperties, GoToProperties {
     /**
-     * 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.
+     * 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 [ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [ActionToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) classes.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#actions)
      */
-    actions?: CollectionProperties<ActionProperties>;
+    actions?: CollectionProperties<ActionButton | ActionToggle>;
+    /**
+     * Position of the popup in relation to the selected feature.  **Possible Values:** auto | top-center | top-right | bottom-left | bottom-center | bottom-right | Function
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#alignment)
+     * 
+     * @default "auto"
+     */
+    alignment?: string | Function;
     /**
      * 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.
      * 
@@ -48134,7 +49547,8 @@ declare namespace __esri {
      */
     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.
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions) set on the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or 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). 
+     * > **Known Limitation**  Only [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) rendered with [WebGL](esri-layers-FeatureLayer.html#webgl-rendering) support highlight.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#highlightEnabled)
      * 
@@ -48191,13 +49605,19 @@ declare namespace __esri {
     visible?: boolean;
   }
 
-  interface PopupViewModel extends Accessor, Evented {
+  interface PopupViewModel extends Accessor, Evented, GoTo {
     /**
-     * [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.
+     * [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-actions-ActionButton.html) or [action toggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.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 [ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [ActionToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions)
      */
-    actions: Collection<Action>;
+    actions: Collection<ActionButton | ActionToggle>;
+    /**
+     * A collection of [actions](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [action toggles](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) used within the [Popup](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#allActions)
+     */
+    readonly allActions: Collection<ActionButton | ActionToggle>;
     /**
      * 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.
      * 
@@ -48227,7 +49647,8 @@ declare namespace __esri {
      */
     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.
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions) set on the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or 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). 
+     * > **Known Limitation**  Only [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) rendered with [WebGL](esri-layers-FeatureLayer.html#webgl-rendering) support highlight.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#highlightEnabled)
      * 
@@ -48275,7 +49696,7 @@ declare namespace __esri {
      */
     selectedFeatureIndex: number;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The view model's state.  **Possible Values:** ready | disabled
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#state)
      * 
@@ -48351,13 +49772,13 @@ declare namespace __esri {
 
   export const PopupViewModel: PopupViewModelConstructor;
 
-  interface PopupViewModelProperties {
+  interface PopupViewModelProperties extends GoToProperties {
     /**
-     * [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.
+     * [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-actions-ActionButton.html) or [action toggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.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 [ActionButton](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionButton.html) or [ActionToggle](https://developers.arcgis.com/javascript/latest/api-reference/esri-support-actions-ActionToggle.html) class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#actions)
      */
-    actions?: CollectionProperties<ActionProperties>;
+    actions?: CollectionProperties<ActionButton | ActionToggle>;
     /**
      * 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.
      * 
@@ -48379,7 +49800,8 @@ declare namespace __esri {
      */
     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.
+     * Highlight the selected popup feature using the [highlightOptions](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#highlightOptions) set on the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html) or 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). 
+     * > **Known Limitation**  Only [FeatureLayers](https://developers.arcgis.com/javascript/latest/api-reference/esri-layers-FeatureLayer.html) rendered with [WebGL](esri-layers-FeatureLayer.html#webgl-rendering) support highlight.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup-PopupViewModel.html#highlightEnabled)
      * 
@@ -48426,7 +49848,7 @@ declare namespace __esri {
 
   export interface PopupViewModelTriggerActionEvent {
 
-    action: Action;
+    action: ActionButton | ActionToggle;
   }
 
 
@@ -48499,7 +49921,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Popup.html#open)
      */
-    content?: string;
+    content?: string | HTMLElement | Widget;
     /**
      * 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.
      * 
@@ -48546,7 +49968,7 @@ declare namespace __esri {
 
   interface Print extends Widget {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print.html#iconClass)
      */
@@ -48725,9 +50147,19 @@ declare namespace __esri {
      */
     dpi: string;
     /**
-     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * When true, the feature's attributes are included in feature collection layers even when they are not needed for rendering. By default they are removed to reduce the request size. Only applicable to custom print services which use the feature attributes, for example to display a table of features and their attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#forceFeatureAttributes)
+     * 
+     * @default false
+     */
+    forceFeatureAttributes: boolean;
+    /**
+     * The output format for the printed map.  **Possible 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)
+     * 
+     * @default pdf
      */
     format: string;
     /**
@@ -48753,6 +50185,8 @@ declare namespace __esri {
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout)
+     * 
+     * @default letter-ansi-a-landscape
      */
     layout: string;
     /**
@@ -48823,9 +50257,19 @@ declare namespace __esri {
      */
     dpi?: string;
     /**
-     * The output format for the printed map.  **Known Values:** pdf | png32 | png8 | jpg | gif | eps | svg | svgz
+     * When true, the feature's attributes are included in feature collection layers even when they are not needed for rendering. By default they are removed to reduce the request size. Only applicable to custom print services which use the feature attributes, for example to display a table of features and their attributes.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#forceFeatureAttributes)
+     * 
+     * @default false
+     */
+    forceFeatureAttributes?: boolean;
+    /**
+     * The output format for the printed map.  **Possible 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)
+     * 
+     * @default pdf
      */
     format?: string;
     /**
@@ -48851,6 +50295,8 @@ declare namespace __esri {
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Print-TemplateOptions.html#layout)
+     * 
+     * @default letter-ansi-a-landscape
      */
     layout?: string;
     /**
@@ -48885,13 +50331,13 @@ declare namespace __esri {
 
   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`.
+     * The style for the scale bar. When `unit` is set to `dual`, the style will always be `line`.  **Possible Values:** ruler | 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.
+     * Units to use for the scale bar. 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.  **Possible Values:** non-metric | metric | dual
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#unit)
      * 
@@ -48935,13 +50381,13 @@ declare namespace __esri {
 
   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`.
+     * The style for the scale bar. When `unit` is set to `dual`, the style will always be `line`.  **Possible Values:** ruler | 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.
+     * Units to use for the scale bar. 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.  **Possible Values:** non-metric | metric | dual
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-ScaleBar.html#unit)
      * 
@@ -48988,11 +50434,13 @@ declare namespace __esri {
     view?: MapViewProperties;
   }
 
-  interface widgetsSearch extends Widget {
+  interface widgetsSearch extends Widget, GoTo {
     /**
      * 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)
+     * 
+     * @default null
      */
     readonly activeSource: FeatureLayer | Locator;
     /**
@@ -49020,17 +50468,19 @@ declare namespace __esri {
      */
     autoSelect: boolean;
     /**
-     * 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;
-    /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#iconClass)
      */
     readonly iconClass: string;
+    /**
+     * Indicates whether or not to include [defaultSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources) in the Search UI. This can be a boolean value or a function that returns an array of Search [sources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#includeDefaultSources)
+     * 
+     * @default true
+     */
+    includeDefaultSources: boolean | Function;
     /**
      * The widget's default label.
      * 
@@ -49090,8 +50540,16 @@ declare namespace __esri {
      * 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)
+     * 
+     * @default null
      */
     popupTemplate: PopupTemplate;
+    /**
+     * It is possible to search a specified portal instance's [locator services](http://enterprise.arcgis.com/en/portal/latest/administer/windows/configure-portal-to-geocode-addresses.htm) Use this property to set this [ArcGIS Portal](https://enterprise.arcgis.com/en/portal/) instance to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#portal)
+     */
+    portal: Portal;
     /**
      * The graphic used to highlight the resulting feature or location.
      * 
@@ -49111,7 +50569,7 @@ declare namespace __esri {
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#results)
      */
-    results: any[];
+    readonly 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)
      * 
@@ -49143,14 +50601,6 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#sources)
      */
     sources: Collection<FeatureLayerSource | LocatorSource>;
-    /**
-     * 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`.
      * 
@@ -49242,7 +50692,7 @@ declare namespace __esri {
 
   export const widgetsSearch: widgetsSearchConstructor;
 
-  interface widgetsSearchProperties extends WidgetProperties {
+  interface widgetsSearchProperties extends WidgetProperties, GoToProperties {
     /**
      * The selected source's index. This value is `-1` when all sources are selected.
      * 
@@ -49267,6 +50717,14 @@ declare namespace __esri {
      * @default true
      */
     autoSelect?: boolean;
+    /**
+     * Indicates whether or not to include [defaultSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources) in the Search UI. This can be a boolean value or a function that returns an array of Search [sources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#includeDefaultSources)
+     * 
+     * @default true
+     */
+    includeDefaultSources?: boolean | Function;
     /**
      * 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).
@@ -49320,8 +50778,16 @@ declare namespace __esri {
      * 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)
+     * 
+     * @default null
      */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * It is possible to search a specified portal instance's [locator services](http://enterprise.arcgis.com/en/portal/latest/administer/windows/configure-portal-to-geocode-addresses.htm) Use this property to set this [ArcGIS Portal](https://enterprise.arcgis.com/en/portal/) instance to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#portal)
+     */
+    portal?: PortalProperties;
     /**
      * 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.
      * 
@@ -49330,12 +50796,6 @@ declare namespace __esri {
      * @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)
      * 
@@ -49383,7 +50843,7 @@ declare namespace __esri {
     viewModel?: SearchViewModelProperties;
   }
 
-  interface SearchViewModel extends Accessor, Evented {
+  interface SearchViewModel extends Accessor, Evented, GoTo {
     /**
      * 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).
      * 
@@ -49406,40 +50866,79 @@ declare namespace __esri {
      * @default "Find address or place"
      */
     allPlaceholder: string;
+    /**
+     * The combined collection of [defaultSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources) and [sources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources). The [defaultSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources) displays first in the Search UI.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#allSources)
+     */
+    readonly allSources: Collection<FeatureLayerSource | LocatorSource>;
     /**
      * 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)
+     * 
+     * @default true
      */
     autoSelect: boolean;
     /**
-     * The default source used for the Search widget.
+     * A read-only property that is a [Collection](https://developers.arcgis.com/javascript/latest/api-reference/esri-core-Collection.html) of [FeaturelayerSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#FeatureLayerSource) and/or [LocatorSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html#LocatorSource). This property may contain [ArcGIS Portal](https://enterprise.arcgis.com/en/portal/) [locators](http://enterprise.arcgis.com/en/server/latest/publish-services/windows/geocode-services.htm) and any web map or web scene [configurable search sources](http://doc.arcgis.com/en/arcgis-online/create-maps/configure-feature-search.htm).  This property is used to populate the Search UI if the [sources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources) property is not set.
      * 
-     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSource)
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources)
      */
-    readonly defaultSource: SearchViewModelFeatureLayerSource | SearchViewModelLocatorSource;
+    readonly defaultSources: Collection<FeatureLayerSource | LocatorSource>;
+    /**
+     * The default [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html) for the search result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSymbol)
+     * 
+     * @default PictureMarkerSymbol
+     */
+    defaultSymbol: Symbol;
+    /**
+     * Indicates whether or not to include [defaultSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources) in the Search UI. This can be a boolean value or a function that returns an array of Search [sources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#includeDefaultSources)
+     * 
+     * @default true
+     */
+    includeDefaultSources: boolean | Function;
+    /**
+     * Indicates whether location services are enabled 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-SearchViewModel.html#locationEnabled)
+     */
+    locationEnabled: boolean;
     /**
      * The maximum character length of the search text.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxInputLength)
+     * 
+     * @default 128
      */
     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)
+     * 
+     * @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-SearchViewModel.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-SearchViewModel.html#minSuggestCharacters)
+     * 
+     * @default 1
      */
     minSuggestCharacters: number;
     /**
@@ -49452,24 +50951,38 @@ declare namespace __esri {
      * 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)
+     * 
+     * @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-SearchViewModel.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-SearchViewModel.html#popupTemplate)
+     * 
+     * @default null
      */
     popupTemplate: PopupTemplate;
+    /**
+     * It is possible to search a specified portal instance's [locator services](http://enterprise.arcgis.com/en/portal/latest/administer/windows/configure-portal-to-geocode-addresses.htm) Use this property to set this [ArcGIS Portal](https://enterprise.arcgis.com/en/portal/) instance to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#portal)
+     */
+    portal: Portal;
     /**
      * 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)
+     * 
+     * @default null
      */
     readonly resultGraphic: Graphic;
     /**
@@ -49484,12 +50997,16 @@ declare namespace __esri {
      * An array of current results from the search.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#results)
+     * 
+     * @default null
      */
-    results: any[];
+    readonly 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)
+     * 
+     * @default true
      */
     searchAllEnabled: boolean;
     /**
@@ -49502,8 +51019,18 @@ declare namespace __esri {
      * The result selected from a search.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#selectedResult)
+     * 
+     * @default null
      */
     readonly selectedResult: any;
+    /**
+     * The selected SuggestResult.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#selectedSuggestion)
+     * 
+     * @default null
+     */
+    readonly selectedSuggestion: Geometry | SearchViewModelSuggestResult;
     /**
      * 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)
@@ -49515,28 +51042,44 @@ declare namespace __esri {
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources)
      */
     sources: Collection<FeatureLayerSource | LocatorSource>;
+    /**
+     * The current state of the widget. This property was removed from [Search](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search.html) and should now be accessed within the [SearchViewModel](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html).  **Possible Values:** ready | disabled | searching
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#state)
+     * 
+     * @default ready
+     */
+    readonly state: string;
     /**
      * 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)
+     * 
+     * @default 150
      */
     suggestionDelay: number;
     /**
      * 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)
+     * 
+     * @default null
      */
     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)
+     * 
+     * @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-SearchViewModel.html#view)
+     * 
+     * @default null
      */
     view: MapView | SceneView;
 
@@ -49557,6 +51100,14 @@ declare namespace __esri {
      * 
      */
     search(searchTerm?: string | Geometry | SearchViewModelSuggestResult | number[][]): IPromise<SearchViewModelSearchResponse>;
+    /**
+     * Returns search results near your current location. It checks whether [locationEnabled](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#locationEnabled) is `true`. If so, and your browser supports [geolocation](https://developer.mozilla.org/en-US/docs/Web/API/Geolocation/Using_geolocation), it will return search results nearby your current location.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#searchNearby)
+     * 
+     * 
+     */
+    searchNearby(): 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`.
      * 
@@ -49589,7 +51140,7 @@ declare namespace __esri {
 
   export const SearchViewModel: SearchViewModelConstructor;
 
-  interface SearchViewModelProperties {
+  interface SearchViewModelProperties extends GoToProperties {
     /**
      * The selected source's index. This value is `-1` when all sources are selected.
      * 
@@ -49610,50 +51161,95 @@ declare namespace __esri {
      * 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)
+     * 
+     * @default true
      */
     autoSelect?: boolean;
+    /**
+     * The default [symbol](https://developers.arcgis.com/javascript/latest/api-reference/esri-symbols-Symbol.html) for the search result.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSymbol)
+     * 
+     * @default PictureMarkerSymbol
+     */
+    defaultSymbol?: SymbolProperties;
+    /**
+     * Indicates whether or not to include [defaultSources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#defaultSources) in the Search UI. This can be a boolean value or a function that returns an array of Search [sources](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#sources).
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#includeDefaultSources)
+     * 
+     * @default true
+     */
+    includeDefaultSources?: boolean | Function;
+    /**
+     * Indicates whether location services are enabled 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-SearchViewModel.html#locationEnabled)
+     */
+    locationEnabled?: boolean;
     /**
      * The maximum character length of the search text.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#maxInputLength)
+     * 
+     * @default 128
      */
     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)
+     * 
+     * @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-SearchViewModel.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-SearchViewModel.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-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)
+     * 
+     * @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-SearchViewModel.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-SearchViewModel.html#popupTemplate)
+     * 
+     * @default null
      */
     popupTemplate?: PopupTemplateProperties;
+    /**
+     * It is possible to search a specified portal instance's [locator services](http://enterprise.arcgis.com/en/portal/latest/administer/windows/configure-portal-to-geocode-addresses.htm) Use this property to set this [ArcGIS Portal](https://enterprise.arcgis.com/en/portal/) instance to search.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Search-SearchViewModel.html#portal)
+     */
+    portal?: PortalProperties;
     /**
      * 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.
      * 
@@ -49662,16 +51258,12 @@ declare namespace __esri {
      * @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)
+     * 
+     * @default true
      */
     searchAllEnabled?: boolean;
     /**
@@ -49695,18 +51287,24 @@ declare namespace __esri {
      * 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)
+     * 
+     * @default 150
      */
     suggestionDelay?: number;
     /**
      * 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)
+     * 
+     * @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-SearchViewModel.html#view)
+     * 
+     * @default null
      */
     view?: MapViewProperties | SceneViewProperties;
   }
@@ -51061,7 +52659,7 @@ declare namespace __esri {
 
   interface SketchViewModel extends Accessor, Evented {
     /**
-     * Graphic representing the temporary geometry that is being drawn on the view.
+     * Graphic representing the sketch that is being drawn on the view.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#graphic)
      */
@@ -51073,29 +52671,56 @@ declare namespace __esri {
      */
     layer: GraphicsLayer;
     /**
-     * A simple marker symbol used for representing the point geometry that is being drawn.
+     * A simple marker symbol used for representing the point geometry that is being drawn.  The default value is the following:
+     * ```js
+     * {
+     *   type: "simple-marker",
+     *   style: "circle",
+     *   size: 6,
+     *   color: [255, 255, 255],
+     *   outline: {
+     *    color: [50, 50, 50],
+     *     width: 1
+     *   }
+     * }
+     * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#pointSymbol)
      */
     pointSymbol: SimpleMarkerSymbol;
     /**
-     * A simple fill symbol used for representing the polygon geometry that is being drawn.
+     * A simple fill symbol used for representing the polygon geometry that is being drawn.  The default value is the following:
+     * ```js
+     * {
+     *   type: "simple-fill",
+     *   color: [150, 150, 150, 0.2],
+     *   outline: {
+     *    color: [50, 50, 50],
+     *     width: 2
+     *   }
+     * }
+     * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polygonSymbol)
      */
     polygonSymbol: SimpleFillSymbol;
     /**
-     * A simple line symbol used for representing the polyline geometry that is being drawn.
+     * A simple line symbol used for representing the polyline geometry that is being drawn.  The default value is the following:
+     * ```js
+     * {
+     *   type: "simple-line",
+     *   color: [130, 130, 130],
+     *   width: 2
+     * }
+     * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polylineSymbol)
      */
     polylineSymbol: SimpleLineSymbol;
     /**
-     * The view model's state.  **Known Values:** ready | disabled
+     * The sketch view model's state.  **Possible Values:** ready | disabled | creating | updating
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#state)
-     * 
-     * @default disabled
      */
     readonly state: string;
     /**
@@ -51106,7 +52731,7 @@ declare namespace __esri {
     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.
+     * Completes the active drawing and fires the [create-complete](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#event:create-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)
      * 
@@ -51114,33 +52739,23 @@ declare namespace __esri {
      */
     complete(): void;
     /**
-     * Creates an instance of the requested draw action type. See the table below for a list of known values and type of draw action it creates.  **Known Values:** point | multipoint | polyline | polygon | rectangle | circle  
-     * 
-     * Geometry type | Draw action instance
-     * ------------- | --------------------
-     * point         | [PointDrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PointDrawAction.html)
-     * multipoint    | [MultipointDrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-MultipointDrawAction.html)
-     * polyline      | [PolylineDrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolylineDrawAction.html)
-     * polygon       | [PolygonDrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-PolygonDrawAction.html)
-     * rectangle/square, circle/ellipse | [SegmentDrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-SegmentDrawAction.html)
-     * 
-     * **Note:** Creating circle does not work in all spatial references.
+     * Creates the requested draw action.  **Note:** Creating a circle geometry does not work in all spatial references.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#create)
      * 
-     * @param drawAction Name of the draw action tool.
+     * @param drawAction Name of the draw action tool.  **Possible Values:** point | multipoint | polyline | polygon | rectangle | circle
      * @param drawOptions Object of the drawing options for the geometry to be created.
      * @param drawOptions.mode 
-     * The drawing mode. The drawing mode only applies when creating `polygon` and `polyline` geometries.  **Known Values:** 
+     * The drawing mode. The drawing mode applies only when creating `polygon`, `polyline`, `rectangle` and `circle` geometries.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
-     * hybrid | Vertices are added while the pointer is clicked or dragged.
-     * freehand | Vertices are added while the pointer is dragged.
+     * hybrid | Vertices are added while the pointer is clicked or dragged. Applies to and is the default for `polygon` and `polyline`.
+     * freehand | Vertices are added while the pointer is dragged. Applies to `polygon`, `polyline` `rectangle` and `circle`. Default for `rectangle` and `circle`.
      * click | Vertices are added when the pointer is clicked.
      * 
      */
-    create(drawAction: string, drawOptions: SketchViewModelCreateDrawOptions): void;
+    create(drawAction: string, drawOptions?: SketchViewModelCreateDrawOptions): void;
     /**
      * Resets SketchViewModel to prepare for another create operation. Reset discards the current drawing, if called mid drawing.
      * 
@@ -51150,19 +52765,19 @@ declare namespace __esri {
      */
     reset(): void;
     /**
-     * Starts an update operation for the selected geometry and fires [update-start](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#event:update-start) event.
+     * Initializes an update operation for the selected geometry and fires [update-init](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#event:update-init) event.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#update)
      * 
-     * @param geometry The geometry to be updated.
+     * @param graphic The graphic to be updated.
      * 
      */
-    update(geometry: Geometry): void;
+    update(graphic: Graphic): 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.
+     * SketchViewModel simplifies the process of adding and updating graphics on the [MapView](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html). SketchViewModel is intended to be used with [Graphics](https://developers.arcgis.com/javascript/latest/api-reference/esri-Graphic.html). Its [events](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#events-summary) allow control of a graphic's geometry. Use the [DrawAction](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-2d-draw-DrawAction.html) class if more fine-grained control is needed with vertices when creating graphics.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html)
      */
@@ -51180,19 +52795,48 @@ declare namespace __esri {
      */
     layer?: GraphicsLayerProperties;
     /**
-     * A simple marker symbol used for representing the point geometry that is being drawn.
+     * A simple marker symbol used for representing the point geometry that is being drawn.  The default value is the following:
+     * ```js
+     * {
+     *   type: "simple-marker",
+     *   style: "circle",
+     *   size: 6,
+     *   color: [255, 255, 255],
+     *   outline: {
+     *    color: [50, 50, 50],
+     *     width: 1
+     *   }
+     * }
+     * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#pointSymbol)
      */
     pointSymbol?: SimpleMarkerSymbolProperties;
     /**
-     * A simple fill symbol used for representing the polygon geometry that is being drawn.
+     * A simple fill symbol used for representing the polygon geometry that is being drawn.  The default value is the following:
+     * ```js
+     * {
+     *   type: "simple-fill",
+     *   color: [150, 150, 150, 0.2],
+     *   outline: {
+     *    color: [50, 50, 50],
+     *     width: 2
+     *   }
+     * }
+     * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polygonSymbol)
      */
     polygonSymbol?: SimpleFillSymbolProperties;
     /**
-     * A simple line symbol used for representing the polyline geometry that is being drawn.
+     * A simple line symbol used for representing the polyline geometry that is being drawn.  The default value is the following:
+     * ```js
+     * {
+     *   type: "simple-line",
+     *   color: [130, 130, 130],
+     *   width: 2
+     * }
+     * ```
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#polylineSymbol)
      */
@@ -51208,18 +52852,16 @@ declare namespace __esri {
 
   export interface SketchViewModelCreateDrawOptions extends Object {
     /**
-     * The drawing mode. The drawing mode only applies when creating `polygon` and `polyline` geometries.  **Known Values:** 
+     * The drawing mode. The drawing mode applies only when creating `polygon`, `polyline`, `rectangle` and `circle` geometries.  **Possible Values:** 
      * 
      * Value | Description |
      * ----- | ----------- |
-     * hybrid | Vertices are added while the pointer is clicked or dragged.
-     * freehand | Vertices are added while the pointer is dragged.
+     * hybrid | Vertices are added while the pointer is clicked or dragged. Applies to and is the default for `polygon` and `polyline`.
+     * freehand | Vertices are added while the pointer is dragged. Applies to `polygon`, `polyline` `rectangle` and `circle`. Default for `rectangle` and `circle`.
      * click | Vertices are added when the pointer is clicked.
      * 
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Sketch-SketchViewModel.html#create)
-     * 
-     * @default hybrid
      */
     mode?: string;
   }
@@ -51310,6 +52952,32 @@ declare namespace __esri {
     view?: MapViewProperties | SceneViewProperties;
   }
 
+  interface GoTo {
+    /**
+     * This function provides the ability to override either the [MapView goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo) or [SceneView goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo) methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GoTo.html#goToOverride)
+     */
+    goToOverride: GoToOverride;
+  }
+
+  interface GoToConstructor {
+
+
+    new(): GoTo;
+  }
+
+  export const GoTo: GoToConstructor;
+
+  interface GoToProperties {
+    /**
+     * This function provides the ability to override either the [MapView goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo) or [SceneView goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo) methods.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-GoTo.html#goToOverride)
+     */
+    goToOverride?: GoToOverride;
+  }
+
 
   interface widget {
     /**
@@ -51381,7 +53049,29 @@ declare namespace __esri {
 
   export const widget: widget;
 
-  interface Track extends Widget {
+  export type GoToOverride = (view: MapView | SceneView, goToParameters: GoToParameters) => void;
+
+  /**
+   * The following parameters passed to either the [MapView's goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo) or [SceneView's goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo) functions. For additional information on what can be passed to its `target` or `options`, please refer to documentation for either the [MapView's goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-MapView.html#goTo) or [SceneView's goTo()](https://developers.arcgis.com/javascript/latest/api-reference/esri-views-SceneView.html#goTo) functions.
+   * 
+   * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#GoToParameters)
+   */
+  export interface GoToParameters extends Object {
+    /**
+     * The target location/viewpoint to animate to.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#GoToParameters)
+     */
+    target: any;
+    /**
+     * Animation options.
+     * 
+     * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-support-widget.html#GoToParameters)
+     */
+    options?: any;
+  }
+
+  interface Track extends Widget, GoTo {
     /**
      * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
      * 
@@ -51405,7 +53095,7 @@ declare namespace __esri {
      */
     graphic: Graphic;
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Track.html#iconClass)
      */
@@ -51491,7 +53181,7 @@ declare namespace __esri {
 
   export const Track: TrackConstructor;
 
-  interface TrackProperties extends WidgetProperties {
+  interface TrackProperties extends WidgetProperties, GoToProperties {
     /**
      * The HTML5 Geolocation Position options for locating. Refer to [Geolocation API Specification](http://www.w3.org/TR/geolocation-API/#position-options) for details.
      * 
@@ -51544,7 +53234,7 @@ declare namespace __esri {
     viewModel?: TrackViewModelProperties;
   }
 
-  interface TrackViewModel extends Accessor, Evented, GeolocationPositioning {
+  interface TrackViewModel extends Accessor, Evented, GeolocationPositioning, GoTo {
     /**
      * The current state of the widget.  **Possible Values:** disabled | ready | tracking | waiting
      * 
@@ -51592,7 +53282,7 @@ declare namespace __esri {
 
   export const TrackViewModel: TrackViewModelConstructor;
 
-  interface TrackViewModelProperties extends GeolocationPositioningProperties {
+  interface TrackViewModelProperties extends GeolocationPositioningProperties, GoToProperties {
 
   }
 
@@ -51999,7 +53689,7 @@ declare namespace __esri {
 
   interface Zoom extends Widget {
     /**
-     * The widget's default icon font.
+     * The widget's default CSS icon class.
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#iconClass)
      */
@@ -52011,7 +53701,7 @@ declare namespace __esri {
      */
     readonly label: string;
     /**
-     * Determines the layout/orientation of the Zoom widget.  **Known Values:** vertical | horizontal
+     * Determines the layout/orientation of the Zoom widget.  **Possible Values:** vertical | horizontal
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#layout)
      * 
@@ -52071,7 +53761,7 @@ declare namespace __esri {
 
   interface ZoomProperties extends WidgetProperties {
     /**
-     * Determines the layout/orientation of the Zoom widget.  **Known Values:** vertical | horizontal
+     * Determines the layout/orientation of the Zoom widget.  **Possible Values:** vertical | horizontal
      * 
      * [Read more...](https://developers.arcgis.com/javascript/latest/api-reference/esri-widgets-Zoom.html#layout)
      * 
@@ -52167,18 +53857,6 @@ declare namespace __esri {
     view?: MapViewProperties | SceneViewProperties;
   }
 
-  export type MultipointDrawActionCursorUpdateEventHandler = (event: MultipointDrawActionCursorUpdateEvent) => void;
-
-  export type MultipointDrawActionDrawCompleteEventHandler = (event: MultipointDrawActionDrawCompleteEvent) => void;
-
-  export type MultipointDrawActionRedoEventHandler = (event: MultipointDrawActionRedoEvent) => void;
-
-  export type MultipointDrawActionUndoEventHandler = (event: MultipointDrawActionUndoEvent) => 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;
@@ -52187,34 +53865,6 @@ declare namespace __esri {
 
   export type PointCloudLayerLayerviewDestroyEventHandler = (event: PointCloudLayerLayerviewDestroyEvent) => void;
 
-  export type PointDrawActionCursorUpdateEventHandler = (event: PointDrawActionCursorUpdateEvent) => void;
-
-  export type PointDrawActionDrawCompleteEventHandler = (event: PointDrawActionDrawCompleteEvent) => void;
-
-  export type PolygonDrawActionCursorUpdateEventHandler = (event: PolygonDrawActionCursorUpdateEvent) => void;
-
-  export type PolygonDrawActionDrawCompleteEventHandler = (event: PolygonDrawActionDrawCompleteEvent) => void;
-
-  export type PolygonDrawActionRedoEventHandler = (event: PolygonDrawActionRedoEvent) => void;
-
-  export type PolygonDrawActionUndoEventHandler = (event: PolygonDrawActionUndoEvent) => void;
-
-  export type PolygonDrawActionVertexAddEventHandler = (event: PolygonDrawActionVertexAddEvent) => void;
-
-  export type PolygonDrawActionVertexRemoveEventHandler = (event: PolygonDrawActionVertexRemoveEvent) => void;
-
-  export type PolylineDrawActionCursorUpdateEventHandler = (event: PolylineDrawActionCursorUpdateEvent) => void;
-
-  export type PolylineDrawActionDrawCompleteEventHandler = (event: PolylineDrawActionDrawCompleteEvent) => void;
-
-  export type PolylineDrawActionRedoEventHandler = (event: PolylineDrawActionRedoEvent) => void;
-
-  export type PolylineDrawActionUndoEventHandler = (event: PolylineDrawActionUndoEvent) => void;
-
-  export type PolylineDrawActionVertexAddEventHandler = (event: PolylineDrawActionVertexAddEvent) => void;
-
-  export type PolylineDrawActionVertexRemoveEventHandler = (event: PolylineDrawActionVertexRemoveEvent) => void;
-
   export type PopupViewModelTriggerActionEventHandler = (event: PopupViewModelTriggerActionEvent) => void;
 
   export type SceneLayerLayerviewCreateEventHandler = (event: SceneLayerLayerviewCreateEvent) => void;
@@ -52269,12 +53919,6 @@ declare namespace __esri {
 
   export type SearchViewModelSuggestStartEventHandler = (event: SearchViewModelSuggestStartEvent) => void;
 
-  export type SegmentDrawActionCursorUpdateEventHandler = (event: SegmentDrawActionCursorUpdateEvent) => void;
-
-  export type SegmentDrawActionDrawCompleteEventHandler = (event: SegmentDrawActionDrawCompleteEvent) => void;
-
-  export type SegmentDrawActionVertexAddEventHandler = (event: SegmentDrawActionVertexAddEvent) => void;
-
   export type StreamLayerLayerviewCreateEventHandler = (event: StreamLayerLayerviewCreateEvent) => void;
 
   export type StreamLayerLayerviewDestroyEventHandler = (event: StreamLayerLayerviewDestroyEvent) => void;
@@ -52490,6 +54134,11 @@ declare module "esri/layers/BaseElevationLayer" {
   export = BaseElevationLayer;
 }
 
+declare module "esri/layers/BingMapsLayer" {
+  import BingMapsLayer = __esri.BingMapsLayer;
+  export = BingMapsLayer;
+}
+
 declare module "esri/layers/CSVLayer" {
   import CSVLayer = __esri.CSVLayer;
   export = CSVLayer;
@@ -52780,6 +54429,11 @@ declare module "esri/renderers/ClassBreaksRenderer" {
   export = ClassBreaksRenderer;
 }
 
+declare module "esri/renderers/HeatmapRenderer" {
+  import HeatmapRenderer = __esri.HeatmapRenderer;
+  export = HeatmapRenderer;
+}
+
 declare module "esri/renderers/Renderer" {
   import Renderer = __esri.Renderer;
   export = Renderer;
@@ -52830,9 +54484,19 @@ declare module "esri/renderers/support/AuthoringInfoVisualVariable" {
   export = AuthoringInfoVisualVariable;
 }
 
-declare module "esri/support/Action" {
-  import Action = __esri.Action;
-  export = Action;
+declare module "esri/renderers/support/HeatmapColorStop" {
+  import HeatmapColorStop = __esri.HeatmapColorStop;
+  export = HeatmapColorStop;
+}
+
+declare module "esri/support/actions/ActionButton" {
+  import ActionButton = __esri.ActionButton;
+  export = ActionButton;
+}
+
+declare module "esri/support/actions/ActionToggle" {
+  import ActionToggle = __esri.ActionToggle;
+  export = ActionToggle;
 }
 
 declare module "esri/symbols/ExtrudeSymbol3DLayer" {
@@ -53355,6 +55019,11 @@ declare module "esri/views/ui/DefaultUI" {
   export = DefaultUI;
 }
 
+declare module "esri/views/2d/ViewState" {
+  import ViewState = __esri.ViewState;
+  export = ViewState;
+}
+
 declare module "esri/views/2d/draw/Draw" {
   import Draw = __esri.Draw;
   export = Draw;
@@ -53390,6 +55059,11 @@ declare module "esri/views/2d/draw/SegmentDrawAction" {
   export = SegmentDrawAction;
 }
 
+declare module "esri/views/2d/layers/BaseLayerView2D" {
+  import BaseLayerView2D = __esri.BaseLayerView2D;
+  export = BaseLayerView2D;
+}
+
 declare module "esri/webmap/InitialViewProperties" {
   import InitialViewProperties = __esri.InitialViewProperties;
   export = InitialViewProperties;
@@ -53445,6 +55119,16 @@ declare module "esri/webscene/applicationProperties/Viewing" {
   export = Viewing;
 }
 
+declare module "esri/webscene/background/Background" {
+  import Background = __esri.Background;
+  export = Background;
+}
+
+declare module "esri/webscene/background/ColorBackground" {
+  import ColorBackground = __esri.ColorBackground;
+  export = ColorBackground;
+}
+
 declare module "esri/widgets/AreaMeasurement3D" {
   import AreaMeasurement3D = __esri.AreaMeasurement3D;
   export = AreaMeasurement3D;
@@ -53465,6 +55149,11 @@ declare module "esri/widgets/BasemapToggle" {
   export = BasemapToggle;
 }
 
+declare module "esri/widgets/Bookmarks" {
+  import Bookmarks = __esri.Bookmarks;
+  export = Bookmarks;
+}
+
 declare module "esri/widgets/ColorSlider" {
   import ColorSlider = __esri.ColorSlider;
   export = ColorSlider;
@@ -53610,6 +55299,16 @@ declare module "esri/widgets/BasemapToggle/BasemapToggleViewModel" {
   export = BasemapToggleViewModel;
 }
 
+declare module "esri/widgets/Bookmarks/Bookmark" {
+  import Bookmark = __esri.Bookmark;
+  export = Bookmark;
+}
+
+declare module "esri/widgets/Bookmarks/BookmarksViewModel" {
+  import BookmarksViewModel = __esri.BookmarksViewModel;
+  export = BookmarksViewModel;
+}
+
 declare module "esri/widgets/Compass/CompassViewModel" {
   import CompassViewModel = __esri.CompassViewModel;
   export = CompassViewModel;
@@ -53740,11 +55439,6 @@ declare module "esri/layers/DynamicLayer" {
   export = DynamicLayer;
 }
 
-declare module "esri/layers/TiledLayer" {
-  import TiledLayer = __esri.TiledLayer;
-  export = TiledLayer;
-}
-
 declare module "esri/layers/mixins/ArcGISCachedService" {
   import ArcGISCachedService = __esri.ArcGISCachedService;
   export = ArcGISCachedService;
@@ -53790,6 +55484,11 @@ declare module "esri/renderers/VisualVariablesMixin" {
   export = VisualVariablesMixin;
 }
 
+declare module "esri/support/actions/ActionBase" {
+  import ActionBase = __esri.ActionBase;
+  export = ActionBase;
+}
+
 declare module "esri/support/LayersMixin" {
   import LayersMixin = __esri.LayersMixin;
   export = LayersMixin;
@@ -53815,6 +55514,11 @@ declare module "esri/widgets/support/GeolocationPositioning" {
   export = GeolocationPositioning;
 }
 
+declare module "esri/widgets/support/GoTo" {
+  import GoTo = __esri.GoTo;
+  export = GoTo;
+}
+
 declare module "esri/config" {
   import config = __esri.config;
   export = config;
@@ -54038,3 +55742,84 @@ declare module "esri/geometry" {
 
   export type Geometry = Extent | Multipoint | Point | Polygon | Polyline | Mesh;
 }
+
+
+
+declare module "esri/pointCloudRenderers" {
+  export import PointCloudClassBreaksRenderer = __esri.PointCloudClassBreaksRenderer;
+  export import PointCloudRGBRenderer = __esri.PointCloudRGBRenderer;
+  export import PointCloudStretchRenderer = __esri.PointCloudStretchRenderer;
+  export import PointCloudUniqueValueRenderer = __esri.PointCloudUniqueValueRenderer;
+
+  export type PointCloudRenderer = PointCloudClassBreaksRenderer | PointCloudRGBRenderer | PointCloudStretchRenderer | PointCloudUniqueValueRenderer;
+}
+
+
+
+
+
+declare module "esri/renderers" {
+  export import ClassBreaksRenderer = __esri.ClassBreaksRenderer;
+  export import HeatmapRenderer = __esri.HeatmapRenderer;
+  export import SimpleRenderer = __esri.SimpleRenderer;
+  export import UniqueValueRenderer = __esri.UniqueValueRenderer;
+
+  export type Renderer = ClassBreaksRenderer | HeatmapRenderer | SimpleRenderer | UniqueValueRenderer;
+}
+
+
+
+declare module "esri/symbols" {
+  export import ExtrudeSymbol3DLayer = __esri.ExtrudeSymbol3DLayer;
+  export import FillSymbol3DLayer = __esri.FillSymbol3DLayer;
+  export import Font = __esri.Font;
+  export import IconSymbol3DLayer = __esri.IconSymbol3DLayer;
+  export import LabelSymbol3D = __esri.LabelSymbol3D;
+  export import LineSymbol3D = __esri.LineSymbol3D;
+  export import LineSymbol3DLayer = __esri.LineSymbol3DLayer;
+  export import MeshSymbol3D = __esri.MeshSymbol3D;
+  export import ObjectSymbol3DLayer = __esri.ObjectSymbol3DLayer;
+  export import PathSymbol3DLayer = __esri.PathSymbol3DLayer;
+  export import PictureFillSymbol = __esri.PictureFillSymbol;
+  export import PictureMarkerSymbol = __esri.PictureMarkerSymbol;
+  export import PointSymbol3D = __esri.PointSymbol3D;
+  export import PolygonSymbol3D = __esri.PolygonSymbol3D;
+  export import SimpleFillSymbol = __esri.SimpleFillSymbol;
+  export import SimpleLineSymbol = __esri.SimpleLineSymbol;
+  export import SimpleMarkerSymbol = __esri.SimpleMarkerSymbol;
+  export import TextSymbol = __esri.TextSymbol;
+  export import TextSymbol3DLayer = __esri.TextSymbol3DLayer;
+  export import WebStyleSymbol = __esri.WebStyleSymbol;
+
+  export type FillSymbol = PictureFillSymbol | SimpleFillSymbol;
+  export type MarkerSymbol = PictureMarkerSymbol | SimpleMarkerSymbol;
+
+  export type Symbol2D = (
+    PictureFillSymbol |
+    PictureMarkerSymbol |
+    SimpleFillSymbol |
+    SimpleLineSymbol |
+    SimpleMarkerSymbol |
+    TextSymbol
+  );
+
+  export type Symbol3D = (
+    LabelSymbol3D |
+    LineSymbol3D |
+    MeshSymbol3D |
+    PointSymbol3D |
+    PolygonSymbol3D
+  );
+
+  export type Symbol3DLayer = (
+    ExtrudeSymbol3DLayer |
+    FillSymbol3DLayer |
+    IconSymbol3DLayer |
+    LineSymbol3DLayer |
+    ObjectSymbol3DLayer |
+    PathSymbol3DLayer |
+    TextSymbol3DLayer
+  );
+
+  export type Symbol = Symbol2D | Symbol3D | WebStyleSymbol;
+}
diff --git a/types/arcgis-js-api/v3/index.d.ts b/types/arcgis-js-api/v3/index.d.ts
index e4161412b5..5ce4cfa06c 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.24
+// Type definitions for ArcGIS API for JavaScript 3.25
 // Project: https://developers.arcgis.com/javascript/3/
 // Definitions by: Esri <https://github.com/Esri>
 //                 Bjorn Svensson <https://github.com/bsvensson>
@@ -45,7 +45,6 @@ declare module "esri" {
   import PrintTemplate = require("esri/tasks/PrintTemplate");
   import QueryTask = require("esri/tasks/QueryTask");
   import DataProviderGE = require("esri/dijit/geoenrichment/ReportPlayer/DataProviderGE");
-  import PlayerResizeModes = require("esri/dijit/geoenrichment/ReportPlayer/PlayerResizeModes");
   import PlayerThemes = require("esri/dijit/geoenrichment/ReportPlayer/PlayerThemes");
   import TextSymbol = require("esri/symbols/TextSymbol");
   import StandardGeographyQueryTask = require("esri/tasks/geoenrichment/StandardGeographyQueryTask");
@@ -1896,14 +1895,29 @@ declare module "esri" {
     values: number[];
   }
   export interface ReportPlayerOptions {
+    /** Indicates whether left and right arrows key can be used to paginate when viewMode is set to PlayerViewModes.PANELS_IN_SLIDES. */
+    allowKeyboardNavigation?: boolean;
     /** Specifies which export options are available for the report. */
     dataProvider?: DataProviderGE;
-    /** Indicate whether to display the report in slide view or full screen, defaults to false which is full view. */
-    isSlidesView?: boolean;
+    /** Specifies how the ReportPlayer should zoom by default. */
+    defaultZoomBehavior?: string;
+    /** Indicates whether interactive experience for panels should be enabled. */
+    enableDataDrilling?: boolean;
     /** Specifies the resize mode of the ReportPlayer. */
-    resizeMode?: PlayerResizeModes;
+    resizeMode?: string;
+    /** If true, indicates that panels should scale to fit the window. */
+    scaleSlidesToFitWindow?: boolean;
+    /** Indicates whether the analysis area title will be shown in the toolbar. */
+    showAreaTitle?: boolean;
+    /** Indicates whether the toolbar will be shown in a compact popup view. */
+    showToolbarInPopup?: boolean;
     /** Specifies the theme of the ReportPlayer. */
     theme?: PlayerThemes;
+    /**
+     * Specifies the display of the report in full page view, slide view, or stacked panel view.
+     * @deprecated
+     */
+    viewMode?: string;
   }
   export interface RingBufferOptions {
     /** The radii to use to create ring buffers */
@@ -7549,22 +7563,45 @@ declare module "esri/dijit/geoenrichment/ReportPlayer/PlayerThemes" {
   export = PlayerThemes;
 }
 
+declare module "esri/dijit/geoenrichment/ReportPlayer/PlayerViewModes" {
+  /** An enumerator of available view modes displaying the Report Player. */
+  class PlayerViewModes {
+    /** Displays one full page at a time. */
+    static FULL_PAGES: any;
+    /** Panels will be shown in the slides view mode. */
+    static PANELS_IN_SLIDES: any;
+    /** Panels will be shown in a single stack. */
+    static PANELS_IN_STACK: any;
+  }
+  export = PlayerViewModes;
+}
+
 declare module "esri/dijit/geoenrichment/ReportPlayer/ReportPlayer" {
   import esri = require("esri");
   import DataProviderGE = require("esri/dijit/geoenrichment/ReportPlayer/DataProviderGE");
-  import PlayerResizeModes = require("esri/dijit/geoenrichment/ReportPlayer/PlayerResizeModes");
-  import PlayerThemes = require("esri/dijit/geoenrichment/ReportPlayer/PlayerThemes");
 
   /** The ReportPlayer widget runs infographic report templates for a provided analysis area. */
   class ReportPlayer {
+    /** Indicates whether left and right arrows key can be used to paginate when viewMode is set to PlayerViewModes.PANELS_IN_SLIDES. */
+    allowKeyboardNavigation: boolean;
     /** Data Provider for the ReportPlayer which allows you to specify which export options are available when running the report. */
     dataProvider: DataProviderGE;
-    /** Indicate whether to display the report in slide view or full screen, defaults to false which is full view. */
-    isSlidesView: boolean;
+    /** Specifies how the ReportPlayer should zoom by default. */
+    defaultZoomBehavior: string;
+    /** Indicates whether interactive experience for panels should be enabled. */
+    enableDataDrilling: boolean;
     /** Specifies the resize mode of the ReportPlayer. */
-    resizeModes: PlayerResizeModes;
+    resizeMode: string;
+    /** If true, indicates that panels should scale to fit the window. */
+    scaleSlidesToFitWindow: boolean;
+    /** Indicates whether the analysis area title will be shown in the toolbar. */
+    showAreaTitle: boolean;
+    /** Indicates whether the toolbar will be shown in a compact popup view. */
+    showToolbarInPopup: boolean;
     /** Specifies the theme of the ReportPlayer. */
-    theme: PlayerThemes;
+    theme: string;
+    /** Specifies the display of the report in full page view, slide view, or stacked panel view. */
+    viewMode: string;
     /**
      * Creates a new ReportPlayer dijit using the given DOM node.
      * @param params Various parameters that can be used to configure the ReportPlayer.
@@ -7577,6 +7614,22 @@ declare module "esri/dijit/geoenrichment/ReportPlayer/ReportPlayer" {
      * @param playParams See the object specifications table below for the structure of the playParams object.
      */
     playReport(dataProviderParams: any, playParams?: any): any;
+    /**
+     * Sets the width and height of the ReportPlayer when resizeMode is set to PlayerResizeModes.MANUAL.
+     * @param width The width in pixels.
+     * @param height The height in pixels.
+     */
+    resize(width?: number, height?: number): any;
+    /**
+     * Sets the maximum height for the Report Player.
+     * @param number The height in pixels.
+     */
+    setMaxHeight(number: number): number;
+    /**
+     * Sets the maximum width for the Report Player.
+     * @param number The width in pixels.
+     */
+    setMaxWidth(number: number): number;
   }
   export = ReportPlayer;
 }
@@ -11463,6 +11516,8 @@ declare module "esri/layers/VectorTileLayer" {
 
   /** A VectorTileLayer renders cached tiles of data. */
   class VectorTileLayer extends Layer {
+    /** The current style information of the VectorTileLayer. */
+    currentStyleInfo: any;
     /** The full extent of the layer. */
     fullExtent: Extent;
     /** The initial extent of the layer. */
@@ -11608,7 +11663,7 @@ declare module "esri/layers/WCSLayer" {
   import Point = require("esri/geometry/Point");
   import Layer = require("esri/layers/layer");
 
-  /** (Currently in beta) The WCSLayer works with OGC Web Coverage Services. */
+  /** The WCSLayer works with OGC Web Coverage Services. */
   class WCSLayer {
     /** Resamples pixel by bilinear interpolation. */
     static INTERPOLATION_BILINEAR: any;
@@ -12566,7 +12621,7 @@ declare module "esri/opsdashboard/DataSourceProxy" {
   import Query = require("esri/tasks/query");
   import Graphic = require("esri/graphic");
 
-  /** DataSourceProxy is a proxy class that represents a operations dashboard data source. */
+  /** (Currently in Mature Support) DataSourceProxy is a proxy class that represents a operations dashboard data source. */
   class DataSourceProxy {
     /** Read-only: The name of the display field. */
     displayFieldName: string;
@@ -12634,7 +12689,7 @@ declare module "esri/opsdashboard/ExtensionBase" {
   import esri = require("esri");
   import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
 
-  /** ExtensionBase is a base class used by all the extension proxies. */
+  /** (Currently in Mature Support) ExtensionBase is a base class used by all the extension proxies. */
   class ExtensionBase {
     /** "circle" */
     static CIRCLE: any;
@@ -12712,7 +12767,7 @@ declare module "esri/opsdashboard/ExtensionBase" {
 declare module "esri/opsdashboard/ExtensionConfigurationBase" {
   import ExtensionBase = require("esri/opsdashboard/ExtensionBase");
 
-  /** ExtensionConfigurationBase is a base class used by all the extension configuration proxies. */
+  /** (Currently in Mature Support) ExtensionConfigurationBase is a base class used by all the extension configuration proxies. */
   class ExtensionConfigurationBase extends ExtensionBase {
     /** The object that will store the Widget/MapTool/FeatureAction configuration. */
     config: any;
@@ -12728,7 +12783,7 @@ declare module "esri/opsdashboard/ExtensionConfigurationBase" {
 declare module "esri/opsdashboard/FeatureActionConfigurationProxy" {
   import ExtensionConfigurationBase = require("esri/opsdashboard/ExtensionConfigurationBase");
 
-  /** FeatureActionConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension feature action. */
+  /** (Currently in Mature Support) FeatureActionConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension feature action. */
   class FeatureActionConfigurationProxy extends ExtensionConfigurationBase {
   }
   export = FeatureActionConfigurationProxy;
@@ -12738,7 +12793,7 @@ declare module "esri/opsdashboard/FeatureActionFeatures" {
   import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
   import Graphic = require("esri/graphic");
 
-  /** FeatureActionFeatures is a specialized collection of features used by WidgetProxy to hold the collection of features for the associated feature actions. */
+  /** (Currently in Mature Support) FeatureActionFeatures is a specialized collection of features used by WidgetProxy to hold the collection of features for the associated feature actions. */
   class FeatureActionFeatures {
     /** The DataSourceProxy from which the collection of features belongs to. */
     dataSourceProxy: DataSourceProxy;
@@ -12782,7 +12837,7 @@ declare module "esri/opsdashboard/GraphicsLayerProxy" {
   import Renderer = require("esri/renderers/Renderer");
   import Graphic = require("esri/graphic");
 
-  /** GraphicsLayerProxy is a proxy class that represents a graphics layer in a map widget in the host application. */
+  /** (Currently in Mature Support) GraphicsLayerProxy is a proxy class that represents a graphics layer in a map widget in the host application. */
   class GraphicsLayerProxy {
     /** Read-only: The current host graphics layer maximum visible scale. */
     maxScale: number;
@@ -12843,7 +12898,7 @@ declare module "esri/opsdashboard/GraphicsLayerProxy" {
 declare module "esri/opsdashboard/MapToolConfigurationProxy" {
   import ExtensionConfigurationBase = require("esri/opsdashboard/ExtensionConfigurationBase");
 
-  /** MapToolConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension map tool. */
+  /** (Currently in Mature Support) MapToolConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension map tool. */
   class MapToolConfigurationProxy extends ExtensionConfigurationBase {
   }
   export = MapToolConfigurationProxy;
@@ -12854,7 +12909,7 @@ declare module "esri/opsdashboard/MapToolProxy" {
   import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
   import Geometry = require("esri/geometry/Geometry");
 
-  /** MapToolProxy is a class used to define an operations dashboard extension map tool. */
+  /** (Currently in Mature Support) MapToolProxy is a class used to define an operations dashboard extension map tool. */
   class MapToolProxy {
     /** Read-only: The available size for the map tool user experience on the host map widget. */
     availableDisplaySize: number;
@@ -12907,7 +12962,7 @@ declare module "esri/opsdashboard/MapWidgetProxy" {
   import Point = require("esri/geometry/Point");
   import Extent = require("esri/geometry/Extent");
 
-  /** MapWidgetProxy is a proxy class that represents a operations dashboard map widget. */
+  /** (Currently in Mature Support) MapWidgetProxy is a proxy class that represents a operations dashboard map widget. */
   class MapWidgetProxy {
     /** Read-only: The map id. */
     id: string;
@@ -12954,7 +13009,7 @@ declare module "esri/opsdashboard/WidgetConfigurationProxy" {
   import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
   import MapWidgetProxy = require("esri/opsdashboard/MapWidgetProxy");
 
-  /** WidgetConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension widget. */
+  /** (Currently in Mature Support) WidgetConfigurationProxy is a class used to provide the configuration user experience for an operations dashboard extension widget. */
   class WidgetConfigurationProxy extends ExtensionConfigurationBase {
     /**
      * Called by the host application when the user has changed the selected data source in the data source selector.
@@ -12990,7 +13045,7 @@ declare module "esri/opsdashboard/WidgetProxy" {
   import Graphic = require("esri/graphic");
   import Geometry = require("esri/geometry/Geometry");
 
-  /** WidgetProxy is a class used to define an operations dashboard extension widget. */
+  /** (Currently in Mature Support) WidgetProxy is a class used to define an operations dashboard extension widget. */
   class WidgetProxy extends ExtensionBase {
     /** Read-only: If the widget was configured to consume data sources, the dataSourceConfig array will hold a collection of dataSourceConfig objects. */
     dataSourceConfigs: any[];
@@ -13051,7 +13106,7 @@ declare module "esri/opsdashboard/featureActionProxy" {
   import DataSourceProxy = require("esri/opsdashboard/DataSourceProxy");
   import FeatureSet = require("esri/tasks/FeatureSet");
 
-  /** featureActionProxy is a singleton object that allows implementing an operations dashboard Feature Action extension. */
+  /** (Currently in Mature Support) featureActionProxy is a singleton object that allows implementing an operations dashboard Feature Action extension. */
   class featureActionProxy extends ExtensionBase {
     /** Event raised when the feature action should execute for a set of features. */
     on(type: "execute", listener: (event: { config: any; dataSourceProxy: DataSourceProxy; featureSet: FeatureSet; target: featureActionProxy }) => void): esri.Handle;
@@ -13903,6 +13958,11 @@ declare module "esri/renderers/smartMapping" {
      * @param params See the Object Specifications table below for the structure of the params object.
      */
     createPredominanceRenderer(params: any): any;
+    /**
+     * Creates a renderer for exploring the relationship between two numeric attributes.
+     * @param params See the object specifications table below for the structure of the params object.
+     */
+    createRelationshipRenderer(params: any): any;
     /**
      * Defines the size of the symbol where feature size is proportional to data value.
      * @param params See the object specifications table below for the structure of the params object.
@@ -15776,6 +15836,8 @@ declare module "esri/tasks/ImageServiceIdentifyParameters" {
   class ImageServiceIdentifyParameters {
     /** Input geometry that defines the location to be identified. */
     geometry: Geometry;
+    /** If the returnCatalogItems parameter is set to true, this parameter will take effect. */
+    maxItemCount: number;
     /** Specifies the mosaic rules defining the image sorting order. */
     mosaicRule: MosaicRule;
     /** The pixel or RGB color value representing no information. */
@@ -15794,6 +15856,8 @@ declare module "esri/tasks/ImageServiceIdentifyParameters" {
     returnCatalogItems: boolean;
     /** When true, each feature in the catalog items includes the geometry. */
     returnGeometry: boolean;
+    /** If true, returns the pixel values of all mosaicked raster catalog items under the requested geometry. */
+    returnPixelValues: boolean;
     /** Specify a time extent. */
     timeExtent: TimeExtent;
     /** Creates a new ImageServiceIdentifyParameters object. */
@@ -18456,3 +18520,16 @@ declare module "esri/workers/WorkerClient" {
   export = WorkerClient;
 }
 
+declare module "sri/dijit/geoenrichment/ReportPlayer/PlayerZoomBehaviors" {
+  /** Enumerator of available zoom behavior options for the ReportPlayer. */
+  class PlayerZoomBehaviors {
+    /** The Report Player zooms in to fit a full page in the viewable area. */
+    static FIT_PAGE: any;
+    /** The Report Player zooms to fit the full page's width in the viewable area. */
+    static FIT_PAGE_WIDTH: any;
+    /** The zoom will be set to 100% (not zoomed). */
+    static RESET: any;
+  }
+  export = PlayerZoomBehaviors;
+}
+
diff --git a/types/archiver/archiver-tests.ts b/types/archiver/archiver-tests.ts
index dbb1df1de7..d61950b657 100644
--- a/types/archiver/archiver-tests.ts
+++ b/types/archiver/archiver-tests.ts
@@ -67,3 +67,15 @@ archiver.use(() => {});
 archiver.finalize();
 
 archiver.symlink('./path', './target');
+
+function fakeHandler(err: Archiver.ArchiverError) {
+    console.log(err.code);
+    console.log(err.message);
+    console.log(err.stack);
+    console.log(err.data);
+}
+
+const fakeError = new Archiver.ArchiverError('code', 'foo');
+
+archiver.on('error', fakeHandler);
+archiver.on('warning', fakeHandler);
diff --git a/types/archiver/index.d.ts b/types/archiver/index.d.ts
index d33e8ec6dd..a9cafca24b 100644
--- a/types/archiver/index.d.ts
+++ b/types/archiver/index.d.ts
@@ -24,9 +24,26 @@ declare namespace archiver {
         mode?: number;
     }
 
+    interface ProgressData {
+        entries: {
+            total: number;
+            processed: number;
+        };
+        fs: {
+            totalBytes: number;
+            processedBytes: number;
+        };
+    }
+
     /** A function that lets you either opt out of including an entry (by returning false), or modify the contents of an entry as it is added (by returning an EntryData) */
     type EntryDataFunction = (entry: EntryData) => false | EntryData;
 
+    class ArchiverError extends Error {
+        code: string;       // Since archiver format support is modular, we cannot enumerate all possible error codes, as the modules can throw arbitrary ones.
+        data: any;
+        constructor(code: string, data: any);
+    }
+
     interface Archiver extends stream.Transform {
         abort(): this;
         append(source: stream.Readable | Buffer | string, name?: EntryData): this;
@@ -44,6 +61,13 @@ declare namespace archiver {
         use(plugin: Function): this;
 
         symlink(filepath: string, target: string): this;
+
+        on(event: 'error' | 'warning', listener: (error: ArchiverError) => void): this;
+        on(event: 'data', listener: (data: EntryData) => void): this;
+        on(event: 'progress', listener: (progress: ProgressData) => void): this;
+        on(event: 'close' | 'drain' | 'finish', listener: () => void): this;
+        on(event: 'pipe' | 'unpipe', listener: (src: stream.Readable) => void): this;
+        on(event: string, listener: (...args: any[]) => void): this;
     }
 
     type ArchiverOptions = CoreOptions & TransformOptions & ZipOptions & TarOptions;
diff --git a/types/array-sort/array-sort-tests.ts b/types/array-sort/array-sort-tests.ts
new file mode 100644
index 0000000000..bfd19b1bbf
--- /dev/null
+++ b/types/array-sort/array-sort-tests.ts
@@ -0,0 +1,16 @@
+import arraySort from 'array-sort';
+
+const numberArr = [1, 2, 3];
+const objArr = [{foo: "asd"}, {foo: "fas"}];
+
+arraySort(objArr);
+arraySort(numberArr);
+
+arraySort(objArr, "foo");
+arraySort(objArr, "foo", {reverse: true});
+
+arraySort(objArr, ["foo"]);
+arraySort(objArr, ["foo"], {reverse: true});
+
+arraySort(numberArr, ["foo", (a, b) => -1]);
+arraySort(numberArr, [(a, b) => 1], {reverse: true});
diff --git a/types/array-sort/index.d.ts b/types/array-sort/index.d.ts
new file mode 100644
index 0000000000..3c886d386d
--- /dev/null
+++ b/types/array-sort/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for array-sort 1.0
+// Project: https://github.com/jonschlinkert/array-sort
+// Definitions by: Daniel Schmidt <https://github.com/DanielMSchmidt>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Comparator<T> = (a: T, b: T) => number;
+type ComparisonArg<T> = string | Comparator<T>;
+type ComparisonArgs<T> = ComparisonArg<T> | Array<ComparisonArg<T>>;
+
+interface Options {
+  readonly reverse: boolean;
+}
+
+declare function arraySort<T>(
+  arr: T[],
+  props?: ComparisonArgs<T>,
+  options?: Options
+): T[];
+
+export default arraySort;
diff --git a/types/array-sort/tsconfig.json b/types/array-sort/tsconfig.json
new file mode 100644
index 0000000000..e3ae7fe409
--- /dev/null
+++ b/types/array-sort/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",
+        "array-sort-tests.ts"
+    ]
+}
diff --git a/types/array-sort/tslint.json b/types/array-sort/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/array-sort/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/asana/index.d.ts b/types/asana/index.d.ts
index 9bbfb62508..4a0ce5a05f 100644
--- a/types/asana/index.d.ts
+++ b/types/asana/index.d.ts
@@ -2,10 +2,7 @@
 // Project: https://github.com/Asana/node-asana
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="bluebird" />
-
+// TypeScript Version: 2.8
 import * as Promise from 'bluebird';
 
 declare namespace asana {
diff --git a/types/asap/asap-tests.ts b/types/asap/asap-tests.ts
new file mode 100644
index 0000000000..3ffb3d97bb
--- /dev/null
+++ b/types/asap/asap-tests.ts
@@ -0,0 +1,36 @@
+import asap = require("asap");
+import rawAsap = require("asap/raw");
+
+class Callable {
+    call(): void {
+        "'Callable' invoked";
+    }
+}
+function f(): void {
+    "'f' invoked";
+}
+
+// $ExpectType void
+asap(f);
+
+// $ExpectType void
+asap((): void => {
+    "'arrow' invoked";
+});
+
+// $ExpectType void
+asap(new Callable());
+
+// $ExpectType void
+rawAsap(f);
+
+// $ExpectType void
+rawAsap((): void => {
+    "'arrow' invoked";
+});
+
+// $ExpectType void
+rawAsap(new Callable());
+
+// $ExpectType void
+rawAsap.requestFlush();
diff --git a/types/asap/index.d.ts b/types/asap/index.d.ts
new file mode 100644
index 0000000000..c5fc69aee3
--- /dev/null
+++ b/types/asap/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for asap 2.0
+// Project: https://github.com/kriskowal/asap
+// Definitions by: fpascutti <https://github.com/fpascutti>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Task {
+    call(...args: any[]): any;
+}
+
+/**
+ * Executes a task as soon as possible.
+ * @param task Function or any object that implements `call()`.
+ */
+declare function asap(task: Task): void;
+export = asap;
diff --git a/types/asap/raw.d.ts b/types/asap/raw.d.ts
new file mode 100644
index 0000000000..c587a9c5b2
--- /dev/null
+++ b/types/asap/raw.d.ts
@@ -0,0 +1,16 @@
+interface Task {
+    call(...args: any[]): any;
+}
+
+/**
+ * Executes a task as soon as possible.
+ * @param task Function or any object that implements `call()`.
+ */
+declare function rawAsap(task: Task): void;
+declare namespace rawAsap {
+    /**
+     * Flushes the event queue.
+     */
+    function requestFlush(): void;
+}
+export = rawAsap;
diff --git a/types/asap/tsconfig.json b/types/asap/tsconfig.json
new file mode 100644
index 0000000000..ea8a3d1091
--- /dev/null
+++ b/types/asap/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
+    },
+    "files": [
+        "asap-tests.ts",
+        "index.d.ts",
+        "raw.d.ts"
+    ]
+}
diff --git a/types/asap/tslint.json b/types/asap/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/asap/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/assert-equal-jsx/index.d.ts b/types/assert-equal-jsx/index.d.ts
index e017fcf57c..735ab5974a 100644
--- a/types/assert-equal-jsx/index.d.ts
+++ b/types/assert-equal-jsx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/thejameskyle/assert-equal-jsx
 // Definitions by: Josh Toft <https://github.com/seryl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/atlaskit__button/index.d.ts b/types/atlaskit__button/index.d.ts
index e9a613fabd..95ac1e0961 100644
--- a/types/atlaskit__button/index.d.ts
+++ b/types/atlaskit__button/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://bitbucket.org/atlassian/atlaskit-mk-2/
 // Definitions by: Jimmy Luong <https://github.com/dijimsta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import {
     Component,
diff --git a/types/atlaskit__calendar/index.d.ts b/types/atlaskit__calendar/index.d.ts
index e92776c1f3..e1c76eb397 100644
--- a/types/atlaskit__calendar/index.d.ts
+++ b/types/atlaskit__calendar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, HTMLAttributes, FocusEvent } from 'react';
 
diff --git a/types/atlaskit__inline-edit/index.d.ts b/types/atlaskit__inline-edit/index.d.ts
index 4ee82ee4c3..d2d706c5a4 100644
--- a/types/atlaskit__inline-edit/index.d.ts
+++ b/types/atlaskit__inline-edit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://bitbucket.org/atlassian/atlaskit-mk-2/
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ReactElement, Component } from 'react';
 export default class InlineEdit extends Component<StatefulProps> {}
diff --git a/types/atlaskit__layer/index.d.ts b/types/atlaskit__layer/index.d.ts
index 2f50a5abcf..03673c47a3 100644
--- a/types/atlaskit__layer/index.d.ts
+++ b/types/atlaskit__layer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactNode } from 'react';
 
diff --git a/types/atlaskit__single-select/index.d.ts b/types/atlaskit__single-select/index.d.ts
index 6536869512..4910c10a11 100644
--- a/types/atlaskit__single-select/index.d.ts
+++ b/types/atlaskit__single-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://bitbucket.org/atlassian/atlaskit-mk-2/src/master/
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactNode, SyntheticEvent } from 'react';
 
diff --git a/types/atlassian-crowd-client/api.d.ts b/types/atlassian-crowd-client/api.d.ts
new file mode 100644
index 0000000000..0064382605
--- /dev/null
+++ b/types/atlassian-crowd-client/api.d.ts
@@ -0,0 +1,10 @@
+import { Settings } from "./settings";
+
+declare class CrowdApi {
+    settings: Settings;
+    constructor(settings: Settings);
+    request(method: string, path: string, data?: any): Promise<any>;
+    log(...args: any[]): void;
+}
+
+export = CrowdApi;
diff --git a/types/atlassian-crowd-client/atlassian-crowd-client-tests.ts b/types/atlassian-crowd-client/atlassian-crowd-client-tests.ts
new file mode 100644
index 0000000000..c43c272343
--- /dev/null
+++ b/types/atlassian-crowd-client/atlassian-crowd-client-tests.ts
@@ -0,0 +1,44 @@
+import CrowdClient = require("atlassian-crowd-client");
+import Attributes = require("atlassian-crowd-client/lib/models/attributes");
+import Group = require("atlassian-crowd-client/lib/models/group");
+import Session = require("atlassian-crowd-client/lib/models/session");
+import User = require("atlassian-crowd-client/lib/models/user");
+
+// Initialize the Crowd client:
+const crowd = new CrowdClient({
+    baseUrl: "https://crowd.example.com/",
+    application: {
+        name: "demo",
+        password: "example"
+    }
+});
+
+// Create a new user:
+crowd.user.create(new User("John", "Doe", "John Doe", "johndoe@example.com", "johndoe", "secret"));
+// Remove
+crowd.user.remove("johndoe");
+
+// Authenticate to Crowd:
+crowd.session.create("someusername", "somepassword").then((session: Session) => {
+    // Fetch the user profile:
+    crowd.session.getUser(session.token).then((user: User) => {
+        console.log("Hello, " + user.displayname);
+    });
+});
+
+// Find all active groups (using Crowd Query Language):
+crowd.search.group("active=true").then((groups: string[] | Group[]) => {
+    console.log("Found groups: " + groups.length);
+});
+
+const group = new Group("testgroup1", "Test group");
+
+const attributes = new Attributes({
+    foo: "Foo",
+    bar: ["Bar", "Baz"],
+    obj: { a: "A" }
+});
+
+crowd.group.attributes.set(group.groupname, attributes).then(() => {
+    console.log("Group attribute is set.");
+});
diff --git a/types/atlassian-crowd-client/index.d.ts b/types/atlassian-crowd-client/index.d.ts
new file mode 100644
index 0000000000..a2e5d8e88f
--- /dev/null
+++ b/types/atlassian-crowd-client/index.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for atlassian-crowd-client 2.0
+// Project: https://github.com/ghengeveld/atlassian-crowd-client
+// Definitions by: mtgto <https://github.com/mtgto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import CrowdApi = require("./api");
+import { Settings } from "./settings";
+import Attributes = require("./lib/models/attributes");
+import Group = require("./lib/models/group");
+import User = require("./lib/models/user");
+import Session = require("./lib/models/session");
+import ValidationFactors = require("./lib/models/validation-factors");
+
+export = CrowdClient;
+declare class CrowdClient extends CrowdApi {
+    settings: Settings;
+
+    constructor(settings: Settings);
+
+    user: {
+        get: (username: string, withAttributes?: boolean) => Promise<User>;
+        create: (user: User) => Promise<User>;
+        update: (username: string, user: User) => Promise<User>;
+        rename: (oldname: string, newname: string) => Promise<void>;
+        remove: (username: string) => Promise<void>;
+        attributes: {
+            list: (username: string) => Promise<Attributes>;
+            set: (username: string, attributes: Attributes) => Promise<Attributes>;
+            remove: (username: string, attributename: string) => Promise<void>;
+            password: {
+                set: (username: string, password: string) => Promise<void>;
+                reset: (username: string) => Promise<void>;
+            };
+            username: {
+                request: (email: string) => Promise<void>;
+            };
+        };
+        groups: {
+            get: (username: string, groupname: string, nested?: boolean) => Promise<string>;
+            list: (username: string, nested?: boolean, startIndex?: number, maxResults?: number) => Promise<string[]>;
+            add: (username: string, groupname: string) => Promise<void>;
+            remove: (username: string, groupname: string) => Promise<void>;
+        };
+    };
+    group: {
+        get: (groupname: string, withAttributes?: boolean) => Promise<Group>;
+        create: (group: Group) => Promise<Group>;
+        update: (groupname: string, group: Group) => Promise<Group>;
+        remove: (groupname: string) => Promise<void>;
+        attributes: {
+            list: (groupname: string) => Promise<Attributes>;
+            set: (groupname: string, attributes: Attributes) => Promise<Attributes>;
+            remove: (groupname: string, attributename: string) => Promise<void>;
+        };
+        users: {
+            get: (groupname: string, username: string, nested?: boolean) => Promise<string>;
+            list: (
+                groupname: string,
+                nested?: boolean,
+                startIndex?: number,
+                maxResults?: number,
+                expand?: boolean,
+            ) => Promise<string[] | User[]>;
+            add: (groupname: string, username: string) => Promise<void>;
+            remove: (groupname: string, username: string) => Promise<void>;
+        };
+        parents: {
+            get: (groupname: string, parentname: string, nested?: boolean) => Promise<string>;
+            list: (groupname: string, nested?: boolean, startIndex?: number, maxResults?: number) => Promise<string[]>;
+            add: (groupname: string, parentname: string) => Promise<void>;
+        };
+        children: {
+            get: (groupname: string, childname: string, nested?: boolean) => Promise<string>;
+            list: (groupname: string, nested?: boolean, startIndex?: number, maxResults?: number) => Promise<string[]>;
+            add: (groupname: string, childname: string) => Promise<void>;
+            remove: (groupname: string, childname: string) => Promise<void>;
+        };
+        membership: () => Promise<string>;
+    };
+    authentication: {
+        authenticate: (username: string, password: string) => Promise<User>;
+    };
+    search: {
+        user: (
+            restriction: string,
+            expand?: boolean,
+            startIndex?: number,
+            maxResults?: number,
+        ) => Promise<string[] | User[]>;
+        group: (
+            restriction: string,
+            expand?: boolean,
+            startIndex?: number,
+            maxResults?: number,
+        ) => Promise<string[] | Group[]>;
+    };
+    session: {
+        getUser: (token: string) => Promise<User>;
+        validate: (token: string, validationFactors?: ValidationFactors) => Promise<Session>;
+        create: (
+            username: string,
+            password: string,
+            validationFactors?: ValidationFactors,
+            duration?: number,
+        ) => Promise<Session>;
+        createUnvalidated: (
+            username: string,
+            validationFactors?: ValidationFactors,
+            duration?: number,
+        ) => Promise<Session>;
+        remove: (token: string) => Promise<void>;
+        removeAll: (username: string, exclude?: string) => Promise<void>;
+    };
+    config: {
+        cookie: () => Promise<any>;
+    };
+}
diff --git a/types/atlassian-crowd-client/lib/models/attributes.d.ts b/types/atlassian-crowd-client/lib/models/attributes.d.ts
new file mode 100644
index 0000000000..3385311546
--- /dev/null
+++ b/types/atlassian-crowd-client/lib/models/attributes.d.ts
@@ -0,0 +1,8 @@
+export = Attributes;
+declare class Attributes {
+    readonly attributes: {[name: string]: any};
+
+    constructor(attributePairs: {[name: string]: any});
+    toCrowd(stringify?: (attr: any) => string): any;
+    static fromCrowd(attributesArr: ReadonlyArray<{name: string}>, parse?: (json: string) => any): Attributes;
+}
diff --git a/types/atlassian-crowd-client/lib/models/group.d.ts b/types/atlassian-crowd-client/lib/models/group.d.ts
new file mode 100644
index 0000000000..e7dc70b6df
--- /dev/null
+++ b/types/atlassian-crowd-client/lib/models/group.d.ts
@@ -0,0 +1,18 @@
+export = Group;
+declare class Group {
+    readonly groupname: string;
+    readonly description: string;
+    readonly active: boolean;
+    readonly attributes?: any;
+
+    constructor(groupname: string, description?: string, active?: boolean, attributes?: any);
+    toCrowd(): GroupObj;
+    static fromCrowd(obj: {name: string, description?: string, active?: boolean, attributes: any}): Group;
+}
+
+interface GroupObj {
+    readonly type: "GROUP";
+    readonly name: string;
+    readonly description: string;
+    readonly active: boolean;
+}
diff --git a/types/atlassian-crowd-client/lib/models/session.d.ts b/types/atlassian-crowd-client/lib/models/session.d.ts
new file mode 100644
index 0000000000..2ef16a0814
--- /dev/null
+++ b/types/atlassian-crowd-client/lib/models/session.d.ts
@@ -0,0 +1,16 @@
+export = Session;
+declare class Session {
+    readonly token: string;
+    readonly createdAt: Date;
+    readonly expiresAt: Date;
+ 
+    constructor(token: string, createdAt: Date, expiresAt: Date);
+    toCrowd(): SessionObj;
+    static fromCrowd(obj: SessionObj): Session;
+}
+
+interface SessionObj {
+    readonly token: string;
+    readonly "created-date": number;
+    readonly "expiry-date": number;
+}
diff --git a/types/atlassian-crowd-client/lib/models/user.d.ts b/types/atlassian-crowd-client/lib/models/user.d.ts
new file mode 100644
index 0000000000..cf5fdeb115
--- /dev/null
+++ b/types/atlassian-crowd-client/lib/models/user.d.ts
@@ -0,0 +1,25 @@
+export = User;
+declare class User {
+    readonly firstname: string;
+    readonly lastname: string;
+    readonly displayname: string;
+    readonly email: string;
+    readonly username: string;
+    readonly password?: string;
+    readonly active: boolean;
+    readonly attributes: {[key: string]: any};
+
+    constructor(firstname: string, lastname: string, displayname: string, email: string, username: string, password?: string, active?: boolean, attributes?: any);
+    toCrowd(): UserObj;
+    static fromCrowd(userObj: UserObj): User;
+}
+
+interface UserObj {
+    readonly "name": string;
+    readonly "first-name": string;
+    readonly "last-name": string;
+    readonly "display-name": string;
+    readonly "email": string;
+    readonly "active": boolean;
+    readonly "password"?: { value: string };
+}
diff --git a/types/atlassian-crowd-client/lib/models/validation-factors.d.ts b/types/atlassian-crowd-client/lib/models/validation-factors.d.ts
new file mode 100644
index 0000000000..60e418f80d
--- /dev/null
+++ b/types/atlassian-crowd-client/lib/models/validation-factors.d.ts
@@ -0,0 +1,12 @@
+export = ValidationFactors;
+declare class ValidationFactors {
+    readonly validationFactors: any;
+
+    constructor(validationFactorPairs: any);
+    toCrowd(): ValidationFactorsObj;
+    static fromCrowd(validationFactorsObj: ValidationFactorsObj): ValidationFactors;
+}
+
+interface ValidationFactorsObj {
+    validationFactors: any[];
+}
diff --git a/types/atlassian-crowd-client/settings.d.ts b/types/atlassian-crowd-client/settings.d.ts
new file mode 100644
index 0000000000..755c26038a
--- /dev/null
+++ b/types/atlassian-crowd-client/settings.d.ts
@@ -0,0 +1,12 @@
+export interface Settings {
+    readonly baseUrl: string;
+    readonly application: {
+        readonly name: string;
+        readonly password: string;
+    }
+    readonly nesting?: boolean;
+    readonly sessionTimeout?: number;
+    readonly debug?: boolean;
+    readonly attributesParser?: (json: string) => any;
+    readonly attributesEncoder?: (obj: any) => string;
+}
diff --git a/types/atlassian-crowd-client/tsconfig.json b/types/atlassian-crowd-client/tsconfig.json
new file mode 100644
index 0000000000..51cfc0966c
--- /dev/null
+++ b/types/atlassian-crowd-client/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",
+        "atlassian-crowd-client-tests.ts"
+    ]
+}
diff --git a/types/atlassian-crowd-client/tslint.json b/types/atlassian-crowd-client/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/atlassian-crowd-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/atob/index.d.ts b/types/atob/index.d.ts
index 632880f7a6..1feb3481e8 100644
--- a/types/atob/index.d.ts
+++ b/types/atob/index.d.ts
@@ -2,6 +2,6 @@
 // Project: https://git.coolaj86.com/coolaj86/atob.js.git
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.8
+// TypeScript Version: 2.1
 
 export default function(str: string): string;
diff --git a/types/atom/index.d.ts b/types/atom/index.d.ts
index 232c20a034..c403569ab2 100644
--- a/types/atom/index.d.ts
+++ b/types/atom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Atom 1.27
+// Type definitions for Atom 1.28
 // Project: https://github.com/atom/atom
 // Definitions by: GlenCFL <https://github.com/GlenCFL>
 //                 smhxx <https://github.com/smhxx>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.3
 
 // NOTE: only those classes exported within this file should be retain that status below.
-// https://github.com/atom/atom/blob/v1.27.0/exports/atom.js
+// https://github.com/atom/atom/blob/v1.28.0/exports/atom.js
 
 /// <reference types="node" />
 
@@ -5844,7 +5844,7 @@ export interface TextEditorObservedEvent {
 // information under certain contexts.
 
 // NOTE: the config schema with these defaults can be found here:
-//   https://github.com/atom/atom/blob/v1.27.0/src/config-schema.js
+//   https://github.com/atom/atom/blob/v1.28.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
@@ -5957,7 +5957,16 @@ export interface ConfigValues {
      *  changes will miss any events caused by applications other than Atom, but may help
      *  prevent crashes or freezes.
      */
-    "core.fileSystemWatcher": "native"|"atom";
+    "core.fileSystemWatcher": "native"|"experimental"|"poll"|"atom";
+
+    /** Experimental: Use the new Tree-sitter parsing system for supported languages. */
+    "core.useTreeSitterParsers": boolean;
+
+    /**
+     * Specify whether Atom should use the operating system's color profile (recommended)
+     * or an alternative color profile.
+     */
+    "core.colorProfile": "default"|"srgb";
 
     "editor.commentStart": string|null;
 
diff --git a/types/auth0-js/auth0-js-tests.ts b/types/auth0-js/auth0-js-tests.ts
index d05ee2251e..f13599ebae 100644
--- a/types/auth0-js/auth0-js-tests.ts
+++ b/types/auth0-js/auth0-js-tests.ts
@@ -9,7 +9,9 @@ webAuth.authorize({
     audience: 'https://mystore.com/api/v2',
     scope: 'read:order write:order',
     responseType: 'token',
-    redirectUri: 'https://example.com/auth/callback'
+    redirectUri: 'https://example.com/auth/callback',
+	language: 'en',
+	prompt: 'login',
 });
 
 webAuth.parseHash((err, authResult) => {
diff --git a/types/auth0-js/index.d.ts b/types/auth0-js/index.d.ts
index c7224599bd..033a4bcbde 100644
--- a/types/auth0-js/index.d.ts
+++ b/types/auth0-js/index.d.ts
@@ -760,6 +760,9 @@ export interface AuthorizeOptions {
     nonce?: string;
     scope?: string;
     audience?: string;
+	language?: string;
+	prompt?: string;
+    mode?: "login" | "signUp";
 }
 
 export interface CheckSessionOptions extends AuthorizeOptions {
diff --git a/types/auth0-lock/auth0-lock-tests.ts b/types/auth0-lock/auth0-lock-tests.ts
index fc070f62df..4b5c60e716 100644
--- a/types/auth0-lock/auth0-lock-tests.ts
+++ b/types/auth0-lock/auth0-lock-tests.ts
@@ -90,6 +90,7 @@ const themeOptions : Auth0LockConstructorOptions = {
         icon: 'http://baz.com/icon.png'
       }
     },
+    hideMainScreenTitle: false,
     labeledSubmitButton: false,
     logo: "https://example.com/assets/logo.png",
     primaryColor: "green"
@@ -143,7 +144,8 @@ const multiVariantOptions : Auth0LockConstructorOptions = {
     signUpTerms: "I agree to the <a href='/terms' target='_new'>terms of service</a> ...",
     title: "My Company",
   },
-  autofocus: false
+  autofocus: false,
+  allowShowPassword: true,
 };
 
 new Auth0Lock(CLIENT_ID, DOMAIN, multiVariantOptions);
diff --git a/types/auth0-lock/index.d.ts b/types/auth0-lock/index.d.ts
index 7dc20ae176..622ac3d36c 100644
--- a/types/auth0-lock/index.d.ts
+++ b/types/auth0-lock/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Brian Caruso <https://github.com/carusology>
 //                 Dan Caddigan <https://github.com/goldcaddy77>
 //                 Larry Faudree <https://github.com/lfaudreejr>
+//                 Will Caulfield <https://github.com/willcaul>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="auth0-js" />
@@ -75,6 +76,7 @@ interface Auth0LockThemeButtonOptions {
 
 interface Auth0LockThemeOptions {
     authButtons?: Auth0LockThemeButtonOptions;
+    hideMainScreenTitle?: boolean;
     labeledSubmitButton?: boolean;
     logo?: string;
     primaryColor?: string;
@@ -114,6 +116,7 @@ interface Auth0LockConstructorOptions {
     allowForgotPassword?: boolean;
     allowLogin?: boolean;
     allowSignUp?: boolean;
+    allowShowPassword?: boolean;
     assetsUrl?: string;
     auth?: Auth0LockAuthOptions;
     autoclose?: boolean;
diff --git a/types/auth0/auth0-tests.ts b/types/auth0/auth0-tests.ts
index 94e7d63cb3..f4251364d2 100644
--- a/types/auth0/auth0-tests.ts
+++ b/types/auth0/auth0-tests.ts
@@ -29,6 +29,40 @@ management
     // Handle the error.
   });
 
+// Search users without paging - callback style
+management.getUsers({search_engine: 'v3', q: 'name:"jane"', per_page: 25}, (err: Error, users: auth0.User[]) => {
+    if (err) {
+        // Handle error
+    }
+    console.log(users);
+});
+
+// Search users without paging - promise style
+management.getUsers({search_engine: 'v3', q: 'name:"jane"', per_page: 25})
+    .then((users) => {
+        console.log(users);
+    })
+    .catch((err) => {
+        // Handle the error
+    });
+
+// Search users with paging - callback style
+management.getUsers({search_engine: 'v3', q: 'name:"jane"', per_page: 25, include_totals: true}, (err: Error, userPage: auth0.UserPage) => {
+    if (err) {
+        // Handle error
+    }
+    console.log(userPage.total);
+});
+
+// Search users with paging - promise style
+management.getUsers({search_engine: 'v3', q: 'name:"jane"', per_page: 25, include_totals: true})
+    .then((users: auth0.UserPage) => {
+        console.log(users.total);
+    })
+    .catch((err) => {
+        // Handle the error
+    });
+
 // Using a callback.
 management.getUser({id: 'user_id'},(err: Error, user: auth0.User) => {
   if (err) {
diff --git a/types/auth0/index.d.ts b/types/auth0/index.d.ts
index be87ceed2c..e03ad5aa06 100644
--- a/types/auth0/index.d.ts
+++ b/types/auth0/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for auth0 2.9.1
+// Type definitions for auth0 2.9.2
 // 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
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as Promise from 'bluebird';
 
@@ -68,7 +68,6 @@ export interface UpdateUserData extends UserData {
 export interface GetUsersData {
   per_page?: number;
   page?: number;
-  include_totals?: boolean;
   sort?: string;
   connection?: string;
   fields?: string;
@@ -77,6 +76,10 @@ export interface GetUsersData {
   search_engine?: string;
 }
 
+export interface GetUsersDataPaged extends GetUsersData {
+  include_totals: boolean;
+}
+
 export interface Rule {
   /**
    * The name of the rule.
@@ -261,7 +264,7 @@ export interface CreateClientGrant {
   scope: string[];
 }
 
-export type Strategy = 
+export type Strategy =
   'ad' | 'adfs' | 'amazon' | 'dropbox' | 'bitbucket' | 'aol' | 'auth0-adldap' | 'auth0-oidc' |
   'auth0' | 'baidu' | 'bitly' | 'box' | 'custom' | 'daccount' | 'dwolla' | 'email' |
   'evernote-sandbox' | 'evernote' | 'exact' | 'facebook' | 'fitbit' | 'flickr' | 'github' |
@@ -345,6 +348,17 @@ export interface User {
   family_name?: string;
 }
 
+export interface Page {
+  start: number;
+  limit: number;
+  length: number;
+  total: number;
+}
+
+export interface UserPage extends Page {
+  users: User[];
+}
+
 export interface Identity {
   connection: string;
   user_id: string;
@@ -353,7 +367,7 @@ export interface Identity {
   access_token?: string;
   profileData?: {
     email?: string;
-    email_verified?: boolean;   
+    email_verified?: boolean;
     name?: string;
     phone_number?: string;
     phone_verified?: boolean;
@@ -662,7 +676,7 @@ export class ManagementClient {
   deleteClient(params: ClientParams): Promise<void>;
   deleteClient(params: ClientParams, cb: (err: Error) => void): void;
 
-                                              
+
   // Client Grants
   getClientGrants(): Promise<ClientGrant[]>;
   getClientGrants(cb: (err: Error, data: ClientGrant[]) => void): void;
@@ -706,6 +720,8 @@ export class ManagementClient {
 
 
   // Users
+  getUsers(params: GetUsersDataPaged): Promise<UserPage>;
+  getUsers(params: GetUsersDataPaged, cb: (err: Error, userPage: UserPage) => void): void;
   getUsers(params?: GetUsersData): Promise<User[]>;
   getUsers(cb: (err: Error, users: User[]) => void): void;
   getUsers(params?: GetUsersData, cb?: (err: Error, users: User[]) => void): void;
diff --git a/types/auto-bind/auto-bind-tests.ts b/types/auto-bind/auto-bind-tests.ts
new file mode 100644
index 0000000000..2c3754e09d
--- /dev/null
+++ b/types/auto-bind/auto-bind-tests.ts
@@ -0,0 +1,65 @@
+import autoBind = require("auto-bind");
+
+const emptyConfig: autoBind.AutoBindOptions = {};
+const onlyIncludeInConfig: autoBind.AutoBindOptions = {
+    include: []
+};
+const onlyExcludeInConfig: autoBind.AutoBindOptions = {
+    exclude: []
+};
+const emptyArraysInConfig: autoBind.AutoBindOptions = {
+    include: [],
+    exclude: []
+};
+const regexConfig: autoBind.AutoBindOptions = {
+    include: [/test[123]/],
+    exclude: [/test[123]/, /^regex[123]$/]
+};
+const stringConfig: autoBind.AutoBindOptions = {
+    include: ["test"],
+    exclude: ["123", "abc"]
+};
+const mixConfig: autoBind.AutoBindOptions = {
+    include: ["test", /test[123]/],
+    exclude: ["123", /test[123]/]
+};
+
+class TestConfigs {
+    constructor() {
+        // no config
+        autoBind(this);
+        autoBind.react(this);
+
+        // empty configs
+        autoBind(this, emptyConfig);
+        autoBind.react(this, emptyConfig);
+
+        // include only configs
+        autoBind(this, onlyIncludeInConfig);
+        autoBind.react(this, onlyIncludeInConfig);
+
+        // exclude only configs
+        autoBind(this, onlyExcludeInConfig);
+        autoBind.react(this, onlyExcludeInConfig);
+
+        // empty array configs
+        autoBind(this, emptyArraysInConfig);
+        autoBind.react(this, emptyArraysInConfig);
+
+        // regex configs
+        autoBind(this, regexConfig);
+        autoBind.react(this, regexConfig);
+
+        // string configs
+        autoBind(this, stringConfig);
+        autoBind.react(this, stringConfig);
+
+        // mix configs
+        autoBind(this, mixConfig);
+        autoBind.react(this, mixConfig);
+    }
+
+    shutUpNoUnnecessaryClass() {
+        // noop
+    }
+}
diff --git a/types/auto-bind/index.d.ts b/types/auto-bind/index.d.ts
new file mode 100644
index 0000000000..9b91fb3da6
--- /dev/null
+++ b/types/auto-bind/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for auto-bind 1.2
+// Project: https://github.com/sindresorhus/auto-bind#readme
+// Definitions by: Sindre Seppola <https://github.com/sseppola>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare namespace autoBind {
+    interface AutoBindOptions {
+        include?: Array<string | RegExp>;
+        exclude?: Array<string | RegExp>;
+    }
+
+    type AutoBindFunction<selfT = object> = (
+        self: selfT,
+        options?: AutoBindOptions
+    ) => selfT;
+}
+
+interface AutoBindModule<selfT = object>
+    extends autoBind.AutoBindFunction<selfT> {
+    react: autoBind.AutoBindFunction<selfT>;
+}
+
+declare const autoBind: AutoBindModule;
+export = autoBind;
diff --git a/types/auto-bind/tsconfig.json b/types/auto-bind/tsconfig.json
new file mode 100644
index 0000000000..d9589cadad
--- /dev/null
+++ b/types/auto-bind/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",
+        "auto-bind-tests.ts"
+    ]
+}
diff --git a/types/auto-bind/tslint.json b/types/auto-bind/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/auto-bind/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/aws-lambda/aws-lambda-tests.ts b/types/aws-lambda/aws-lambda-tests.ts
index d3e630ddf1..94575006ab 100644
--- a/types/aws-lambda/aws-lambda-tests.ts
+++ b/types/aws-lambda/aws-lambda-tests.ts
@@ -479,10 +479,11 @@ str = cloudwatchLogsDecodedData.messageType;
 str = cloudwatchLogsDecodedData.logEvents[0].id;
 num = cloudwatchLogsDecodedData.logEvents[0].timestamp;
 str = cloudwatchLogsDecodedData.logEvents[0].message;
+str = cloudwatchLogsDecodedData.logEvents[0].extractedFields!["example"];
 
 /* ClientContext */
 clientContextClient = clientCtx.client;
-anyObj = clientCtx.Custom;
+anyObj = clientCtx.custom;
 clientContextEnv = clientCtx.env;
 
 /* ClientContextEnv */
@@ -585,7 +586,9 @@ const CloudFrontRequestEvent: AWSLambda.CloudFrontRequestEvent = {
     {
       cf: {
         config: {
+          distributionDomainName: "d123.cloudfront.net",
           distributionId: "EDFDVBD6EXAMPLE",
+          eventType: "viewer-request",
           requestId: "MRVMF7KydIvxMWfJIglgwHQwZsbG2IhRJ07sn9AkKUFSHS9EXAMPLE=="
         },
         request: {
@@ -654,7 +657,9 @@ const CloudFrontResponseEvent: AWSLambda.CloudFrontResponseEvent = {
         {
             cf: {
                 config: {
+                    distributionDomainName: "d123.cloudfront.net",
                     distributionId: "EDFDVBD6EXAMPLE",
+                    eventType: "viewer-response",
                     requestId: "xGN7KWpVEmB9Dp7ctcVFQC4E-nrcOcEKS3QyAez--06dV7TEXAMPLE=="
                 },
                 request: {
@@ -737,7 +742,7 @@ context.fail(error);
 context.fail(str);
 
 /* Handler */
-let handler: AWSLambda.Handler = (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+const handler: AWSLambda.Handler = (event: any, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
 
 /* In node8.10 runtime, handlers may return a promise for the result value, so existing async
  * handlers that return Promise<void> before calling the callback will now have a `null` result.
@@ -745,7 +750,7 @@ let handler: AWSLambda.Handler = (event: any, context: AWSLambda.Context, cb: AW
  * since the upgrade effort should be pretty low in most cases, and it points them at a nicer solution.
  */
 // $ExpectError
-let legacyAsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
+const legacyAsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
     event: AWSLambda.APIGatewayProxyEvent,
     context: AWSLambda.Context,
     cb: AWSLambda.Callback<AWSLambda.APIGatewayProxyResult>,
@@ -753,7 +758,7 @@ let legacyAsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
     cb(null, { statusCode: 200, body: 'No longer valid' });
 };
 
-let node8AsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
+const node8AsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
     event: AWSLambda.APIGatewayProxyEvent,
     context: AWSLambda.Context,
     cb: AWSLambda.Callback<AWSLambda.APIGatewayProxyResult>,
@@ -761,7 +766,7 @@ let node8AsyncHandler: AWSLambda.APIGatewayProxyHandler = async (
     return { statusCode: 200, body: 'Is now valid!' };
 };
 
-let inferredHandler: AWSLambda.S3Handler = (event, context, cb) => {
+const inferredHandler: AWSLambda.S3Handler = (event, context, cb) => {
     // $ExpectType S3Event
     event;
     str = event.Records[0].eventName;
@@ -778,35 +783,35 @@ let inferredHandler: AWSLambda.S3Handler = (event, context, cb) => {
 };
 
 // Test using default Callback type still works.
-let defaultCallbackHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
+const defaultCallbackHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.Callback) => { };
 
 // Specific types
 let s3Handler: AWSLambda.S3Handler = (event: AWSLambda.S3Event, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 // Test old name
-let s3CreateHandler: AWSLambda.S3Handler = (event: AWSLambda.S3CreateEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const s3CreateHandler: AWSLambda.S3Handler = (event: AWSLambda.S3CreateEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 s3Handler = s3CreateHandler;
 
-let dynamoDBStreamHandler: AWSLambda.DynamoDBStreamHandler = (event: AWSLambda.DynamoDBStreamEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const dynamoDBStreamHandler: AWSLambda.DynamoDBStreamHandler = (event: AWSLambda.DynamoDBStreamEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
-let snsHandler: AWSLambda.SNSHandler = (event: AWSLambda.SNSEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const snsHandler: AWSLambda.SNSHandler = (event: AWSLambda.SNSEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
-let cognitoUserPoolHandler: AWSLambda.CognitoUserPoolTriggerHandler = (event: AWSLambda.CognitoUserPoolEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const cognitoUserPoolHandler: AWSLambda.CognitoUserPoolTriggerHandler = (event: AWSLambda.CognitoUserPoolEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
-let cloudFormationCustomResourceHandler: AWSLambda.CloudFormationCustomResourceHandler =
+const cloudFormationCustomResourceHandler: AWSLambda.CloudFormationCustomResourceHandler =
     (event: AWSLambda.CloudFormationCustomResourceEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
-let cloudWatchLogsHandler: AWSLambda.CloudWatchLogsHandler = (event: AWSLambda.CloudWatchLogsEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const cloudWatchLogsHandler: AWSLambda.CloudWatchLogsHandler = (event: AWSLambda.CloudWatchLogsEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
-let scheduledHandler: AWSLambda.ScheduledHandler = (event: AWSLambda.ScheduledEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const scheduledHandler: AWSLambda.ScheduledHandler = (event: AWSLambda.ScheduledEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
 let apiGtwProxyHandler: AWSLambda.APIGatewayProxyHandler = (event: AWSLambda.APIGatewayProxyEvent, context: AWSLambda.Context, cb: AWSLambda.APIGatewayProxyCallback) => { };
 // Test old names
-let proxyHandler: AWSLambda.ProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
+const proxyHandler: AWSLambda.ProxyHandler = (event: AWSLambda.APIGatewayEvent, context: AWSLambda.Context, cb: AWSLambda.ProxyCallback) => { };
 apiGtwProxyHandler = proxyHandler;
 
-let codePipelineHandler: AWSLambda.CodePipelineHandler = (event: AWSLambda.CodePipelineEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
+const codePipelineHandler: AWSLambda.CodePipelineHandler = (event: AWSLambda.CodePipelineEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => {};
 
-let cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLambda.CloudFrontRequestEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontRequestCallback) => {
+const cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLambda.CloudFrontRequestEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontRequestCallback) => {
     cb();
     cb(null);
     cb(new Error(''));
@@ -816,14 +821,14 @@ let cloudFrontRequestHandler: AWSLambda.CloudFrontRequestHandler = (event: AWSLa
     cb(null, { });
 };
 
-let cloudFrontResponseHandler: AWSLambda.CloudFrontResponseHandler = (event: AWSLambda.CloudFrontResponseEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontResponseCallback) => { };
+const cloudFrontResponseHandler: AWSLambda.CloudFrontResponseHandler = (event: AWSLambda.CloudFrontResponseEvent, context: AWSLambda.Context, cb: AWSLambda.CloudFrontResponseCallback) => { };
 
-let customAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
+const customAuthorizerHandler: AWSLambda.CustomAuthorizerHandler = (event: AWSLambda.CustomAuthorizerEvent, context: AWSLambda.Context, cb: AWSLambda.CustomAuthorizerCallback) => { };
 
 interface CustomEvent { eventString: string; eventBool: boolean; }
 interface CustomResult { resultString: string; resultBool?: boolean; }
 type CustomCallback = AWSLambda.Callback<CustomResult>;
-let customHandler: AWSLambda.Handler<CustomEvent, CustomResult> = (event, context, cb) => {
+const customHandler: AWSLambda.Handler<CustomEvent, CustomResult> = (event, context, cb) => {
     // $ExpectType CustomEvent
     event;
     str = event.eventString;
@@ -837,4 +842,84 @@ let customHandler: AWSLambda.Handler<CustomEvent, CustomResult> = (event, contex
     cb(null, { resultString: bool });
 };
 
-let kinesisStreamHandler: AWSLambda.KinesisStreamHandler = (event: AWSLambda.KinesisStreamEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => { };
+const kinesisStreamHandler: AWSLambda.KinesisStreamHandler = (event: AWSLambda.KinesisStreamEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => { };
+
+const SQSMessageHandler: AWSLambda.SQSHandler = (event: AWSLambda.SQSEvent, context: AWSLambda.Context, cb: AWSLambda.Callback<void>) => { };
+
+// See https://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-sqs
+const SQSEvent: AWSLambda.SQSEvent = {
+    Records: [
+        {
+            messageId: "c80e8021-a70a-42c7-a470-796e1186f753",
+            receiptHandle: "AQEBJQ+/u6NsnT5t8Q/VbVxgdUl4TMKZ5FqhksRdIQvLBhwNvADoBxYSOVeCBXdnS9P+",
+            body: "{\"foo\":\"bar\"}",
+            attributes: {
+                ApproximateReceiveCount: "3",
+                SentTimestamp: "1529104986221",
+                SenderId: "594035263019",
+                ApproximateFirstReceiveTimestamp: "1529104986230"
+            },
+            messageAttributes: {},
+            md5OfBody: "9bb58f26192e4ba00f01e2e7b136bbd8",
+            eventSource: "aws:sqs",
+            eventSourceARN: "arn:aws:sqs:us-west-2:594035263019:NOTFIFOQUEUE",
+            awsRegion: "us-west-2"
+        }
+    ]
+};
+
+const SQSMessageLegacyAsyncHandler: AWSLambda.SQSHandler = async (
+    event: AWSLambda.SQSEvent,
+    context: AWSLambda.Context,
+    cb: AWSLambda.Callback<void>,
+) => {
+    // $ExpectType SQSEvent
+    event;
+    str = event.Records[0].messageId;
+    anyObj = event.Records[0].body;
+    // $ExpectType Context
+    context;
+    str = context.functionName;
+    // $ExpectType Callback<void>
+    cb;
+    cb();
+    cb(null);
+    cb(new Error());
+};
+
+const SQSMessageNode8AsyncHandler: AWSLambda.SQSHandler = async (
+    event: AWSLambda.SQSEvent,
+    context: AWSLambda.Context
+) => {
+    // $ExpectType SQSEvent
+    event;
+    str = event.Records[0].messageId;
+    anyObj = event.Records[0].body;
+    // $ExpectType Context
+    context;
+    str = context.functionName;
+    return;
+};
+
+const firehoseEventHandler: AWSLambda.FirehoseTransformationHandler = (
+    event: AWSLambda.FirehoseTransformationEvent,
+    context: AWSLambda.Context,
+    callback: AWSLambda.FirehoseTransformationCallback
+) => {
+    // $ExpectType FirehoseTransformationEvent
+    event;
+    str = event.records[0].recordId;
+
+    // $ExpectType Context
+    context;
+    str = context.functionName;
+    callback(null, {
+        records: [
+            {
+                recordId: event.records[0].recordId,
+                result: 'Ok' as AWSLambda.FirehoseRecordTransformationStatus,
+                data: 'eyJmb28iOiJiYXIifQ==',
+            }
+        ]
+    });
+};
diff --git a/types/aws-lambda/index.d.ts b/types/aws-lambda/index.d.ts
index dd3fd3bd4e..35d0b1d7a6 100644
--- a/types/aws-lambda/index.d.ts
+++ b/types/aws-lambda/index.d.ts
@@ -19,6 +19,8 @@
 //                 Chris Redekop <https://github.com/repl-chris>
 //                 Aneil Mallavarapu <https://github.com/aneilbaboo>
 //                 Jeremy Nagel <https://github.com/jeznag>
+//                 Louis Larry <https://github.com/louislarry>
+//                 Daniel Papukchiev <https://github.com/dpapukchiev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -211,27 +213,27 @@ export type S3CreateEvent = S3Event; // old name
 export interface CognitoUserPoolTriggerEvent {
     version: number;
     triggerSource:
-        | "PreSignUp_SignUp"
-        | "PostConfirmation_ConfirmSignUp"
-        | "PreAuthentication_Authentication"
-        | "PostAuthentication_Authentication"
-        | "CustomMessage_SignUp"
-        | "CustomMessage_AdminCreateUser"
-        | "CustomMessage_ResendCode"
-        | "CustomMessage_ForgotPassword"
-        | "CustomMessage_UpdateUserAttribute"
-        | "CustomMessage_VerifyUserAttribute"
-        | "CustomMessage_Authentication"
-        | "DefineAuthChallenge_Authentication"
-        | "CreateAuthChallenge_Authentication"
-        | "VerifyAuthChallengeResponse_Authentication"
-        | "PreSignUp_AdminCreateUser"
-        | "PostConfirmation_ConfirmForgotPassword"
-        | "TokenGeneration_HostedAuth"
-        | "TokenGeneration_Authentication"
-        | "TokenGeneration_NewPasswordChallenge"
-        | "TokenGeneration_AuthenticateDevice"
-        | "TokenGeneration_RefreshTokens";
+    | "PreSignUp_SignUp"
+    | "PostConfirmation_ConfirmSignUp"
+    | "PreAuthentication_Authentication"
+    | "PostAuthentication_Authentication"
+    | "CustomMessage_SignUp"
+    | "CustomMessage_AdminCreateUser"
+    | "CustomMessage_ResendCode"
+    | "CustomMessage_ForgotPassword"
+    | "CustomMessage_UpdateUserAttribute"
+    | "CustomMessage_VerifyUserAttribute"
+    | "CustomMessage_Authentication"
+    | "DefineAuthChallenge_Authentication"
+    | "CreateAuthChallenge_Authentication"
+    | "VerifyAuthChallengeResponse_Authentication"
+    | "PreSignUp_AdminCreateUser"
+    | "PostConfirmation_ConfirmForgotPassword"
+    | "TokenGeneration_HostedAuth"
+    | "TokenGeneration_Authentication"
+    | "TokenGeneration_NewPasswordChallenge"
+    | "TokenGeneration_AuthenticateDevice"
+    | "TokenGeneration_RefreshTokens";
     region: string;
     userPoolId: string;
     userName?: string;
@@ -240,8 +242,8 @@ export interface CognitoUserPoolTriggerEvent {
         clientId: string;
     };
     request: {
-        userAttributes: {[key: string]: string};
-        validationData?: {[key: string]: string};
+        userAttributes: { [key: string]: string };
+        validationData?: { [key: string]: string };
         codeParameter?: string;
         usernameParameter?: string;
         newDeviceUsed?: boolean;
@@ -251,8 +253,8 @@ export interface CognitoUserPoolTriggerEvent {
             challengeMetaData?: string;
         }>;
         challengeName?: string;
-        privateChallengeParameters?: {[key: string]: string};
-        challengeAnswer?: {[key: string]: string};
+        privateChallengeParameters?: { [key: string]: string };
+        challengeAnswer?: { [key: string]: string };
     };
     response: {
         autoConfirmUser?: boolean;
@@ -262,8 +264,8 @@ export interface CognitoUserPoolTriggerEvent {
         challengeName?: string;
         issueTokens?: boolean;
         failAuthentication?: boolean;
-        publicChallengeParameters?: {[key: string]: string};
-        privateChallengeParameters?: {[key: string]: string};
+        publicChallengeParameters?: { [key: string]: string };
+        privateChallengeParameters?: { [key: string]: string };
         challengeMetaData?: string;
         answerCorrect?: boolean;
     };
@@ -369,6 +371,7 @@ export interface CloudWatchLogsLogEvent {
     id: string;
     timestamp: number;
     message: string;
+    extractedFields?: {[key: string]: string};
 }
 
 // Context
@@ -404,7 +407,7 @@ export interface CognitoIdentity {
 
 export interface ClientContext {
     client: ClientContextClient;
-    Custom?: any;
+    custom?: any;
     env: ClientContextEnv;
 }
 
@@ -549,7 +552,7 @@ export interface CodePipelineEvent {
             inputArtifacts: Artifact[];
             outputArtifacts: Artifact[];
             artifactCredentials: Credentials;
-            encryptionKey?: EncryptionKey & {type: 'KMS'};
+            encryptionKey?: EncryptionKey & { type: 'KMS' };
             continuationToken?: string;
         };
     };
@@ -582,7 +585,9 @@ export interface CloudFrontRequest {
 
 export interface CloudFrontEvent {
     config: {
+        distributionDomainName: string;
         distributionId: string;
+        eventType: 'origin-request' | 'origin-response' | 'viewer-request' | 'viewer-response';
         requestId: string;
     };
 }
@@ -642,6 +647,80 @@ export interface KinesisStreamEvent {
     Records: KinesisStreamRecord[];
 }
 
+// Kinesis Data Firehose Event
+// https://docs.aws.amazon.com/lambda/latest/dg/eventsources.html#eventsources-kinesis-firehose
+// https://docs.aws.amazon.com/firehose/latest/dev/data-transformation.html
+// https://aws.amazon.com/blogs/compute/amazon-kinesis-firehose-data-transformation-with-aws-lambda/
+// Examples in the lambda blueprints
+export interface FirehoseTransformationEvent {
+    invocationId: string;
+    deliveryStreamArn: string;
+    region: string;
+    records: FirehoseTransformationEventRecord[];
+}
+
+export interface FirehoseTransformationEventRecord {
+    recordId: string;
+    approximateArrivalTimestamp: number;
+    /** Base64 encoded */
+    data: string;
+    kinesisRecordMetadata?: FirehoseRecordMetadata;
+}
+
+export interface FirehoseRecordMetadata {
+    shardId: string;
+    partitionKey: string;
+    approximateArrivalTimestamp: string;
+    sequenceNumber: string;
+    subsequenceNumber: string;
+}
+
+export type FirehoseRecordTransformationStatus = 'Ok' | 'Dropped' | 'ProcessingFailed';
+
+export interface FirehoseTransformationResultRecord {
+    recordId: string;
+    result: FirehoseRecordTransformationStatus;
+    /** Encode in Base64 */
+    data: string;
+}
+
+export interface FirehoseTransformationResult {
+    records: FirehoseTransformationResultRecord[];
+}
+
+// SQS
+// https://docs.aws.amazon.com/lambda/latest/dg/invoking-lambda-function.html#supported-event-source-sqs
+export interface SQSRecord {
+    messageId: string;
+    receiptHandle: string;
+    body: string;
+    attributes: SQSRecordAttributes;
+    messageAttributes: SQSMessageAttributes;
+    md5OfBody: string;
+    eventSource: string;
+    eventSourceARN: string;
+    awsRegion: string;
+}
+
+export interface SQSEvent {
+    Records: SQSRecord[];
+}
+
+export interface SQSRecordAttributes {
+    ApproximateReceiveCount: string;
+    SentTimestamp: string;
+    SenderId: string;
+    ApproximateFirstReceiveTimestamp: string;
+}
+export interface SQSMessageAttribute {
+    Name: string;
+    Type: string;
+    Value: string;
+}
+export interface SQSMessageAttributes {
+    [name: string]: SQSMessageAttribute;
+}
+
 /**
  * AWS Lambda handler function.
  * http://docs.aws.amazon.com/lambda/latest/dg/nodejs-prog-model-handler.html
@@ -686,6 +765,8 @@ export type SNSHandler = Handler<SNSEvent, void>;
 export type CognitoUserPoolTriggerHandler = Handler<CognitoUserPoolTriggerEvent>;
 // TODO: Different event/handler types for each event trigger so we can type the result?
 
+export type SQSHandler = Handler<SQSEvent, void>;
+
 // TODO: CognitoSync
 
 export type CloudFormationCustomResourceHandler = Handler<CloudFormationCustomResourceEvent, void>;
@@ -719,7 +800,8 @@ export type CloudFrontResponseCallback = Callback<CloudFrontResponseResult>;
 
 export type KinesisStreamHandler = Handler<KinesisStreamEvent, void>;
 
-// TODO: Kinesis Firehose
+export type FirehoseTransformationCallback = Callback<FirehoseTransformationResult>;
+export type FirehoseTransformationHandler = Handler<FirehoseTransformationEvent, FirehoseTransformationResult>;
 
 export type CustomAuthorizerHandler = Handler<CustomAuthorizerEvent, CustomAuthorizerResult>;
 export type CustomAuthorizerCallback = Callback<CustomAuthorizerResult>;
diff --git a/types/babel-types/index.d.ts b/types/babel-types/index.d.ts
index 47068c3481..c464c4bc3f 100644
--- a/types/babel-types/index.d.ts
+++ b/types/babel-types/index.d.ts
@@ -772,7 +772,7 @@ export interface VoidTypeAnnotation extends Node {
 export interface JSXAttribute extends Node {
     type: "JSXAttribute";
     name: JSXIdentifier | JSXNamespacedName;
-    value: JSXElement | StringLiteral | JSXExpressionContainer;
+    value: JSXElement | StringLiteral | JSXExpressionContainer | null;
 }
 
 export interface JSXClosingElement extends Node {
@@ -1424,7 +1424,7 @@ export function objectTypeProperty(key?: Expression, value?: FlowTypeAnnotation)
 export function qualifiedTypeIdentifier(id?: Identifier, qualification?: Identifier | QualifiedTypeIdentifier): QualifiedTypeIdentifier;
 export function unionTypeAnnotation(types?: FlowTypeAnnotation[]): UnionTypeAnnotation;
 export function voidTypeAnnotation(): VoidTypeAnnotation;
-export function jSXAttribute(name?: JSXIdentifier | JSXNamespacedName, value?: JSXElement | StringLiteral | JSXExpressionContainer): JSXAttribute;
+export function jSXAttribute(name?: JSXIdentifier | JSXNamespacedName, value?: JSXElement | StringLiteral | JSXExpressionContainer | null): JSXAttribute;
 export function jSXClosingElement(name?: JSXIdentifier | JSXMemberExpression): JSXClosingElement;
 export function jSXElement(openingElement?: JSXOpeningElement, closingElement?: JSXClosingElement, children?: Array<JSXElement | JSXExpressionContainer | JSXText>, selfClosing?: boolean): JSXElement;
 export function jSXEmptyExpression(): JSXEmptyExpression;
diff --git a/types/babel__core/babel__core-tests.ts b/types/babel__core/babel__core-tests.ts
new file mode 100644
index 0000000000..a873c3392f
--- /dev/null
+++ b/types/babel__core/babel__core-tests.ts
@@ -0,0 +1,31 @@
+import * as babel from "@babel/core";
+
+const options: babel.TransformOptions = {
+    ast: true,
+    sourceMaps: true
+};
+
+babel.transform("code();", options, (err, result) => {
+    const { code, map, ast } = result!;
+});
+
+const transformSyncResult = babel.transformSync("code();", options);
+if (transformSyncResult) {
+    const { code, map, ast } = transformSyncResult;
+}
+
+babel.transformFile("filename.js", options, (err, result) => {
+    const { code, map, ast } = result!;
+});
+
+babel.transformFileSync("filename.js", options)!.code;
+
+const sourceCode = "if (true) return;";
+const parsedAst = babel.parse(sourceCode, options);
+
+babel.transformFromAst(parsedAst!, sourceCode, options, (err, result) => {
+    const { code, map, ast } = result!;
+});
+
+const transformFromAstSyncResult = babel.transformFromAstSync(parsedAst!, sourceCode, options);
+const { code, map, ast } = transformFromAstSyncResult!;
diff --git a/types/babel__core/index.d.ts b/types/babel__core/index.d.ts
new file mode 100644
index 0000000000..277228341b
--- /dev/null
+++ b/types/babel__core/index.d.ts
@@ -0,0 +1,531 @@
+// Type definitions for @babel/core 7.0
+// Project: https://github.com/babel/babel/tree/master/packages/babel-core
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+//                 Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { GeneratorOptions } from "@babel/generator";
+import traverse, { Visitor, NodePath } from "@babel/traverse";
+import template from "@babel/template";
+import * as t from "@babel/types";
+import { ParseOptions } from "@babel/parser";
+
+export {
+    ParseOptions,
+    GeneratorOptions,
+    t as types,
+    template,
+    traverse,
+    Visitor
+};
+
+export type Node = t.Node;
+export type ParseResult = t.File | t.Program;
+export const version: string;
+
+export interface TransformOptions {
+    /**
+     * Include the AST in the returned object
+     *
+     * Default: `false`
+     */
+    ast?: boolean | null;
+
+    /**
+     * Attach a comment after all non-user injected code
+     *
+     * Default: `null`
+     */
+    auxiliaryCommentAfter?: string | null;
+
+    /**
+     * Attach a comment before all non-user injected code
+     *
+     * Default: `null`
+     */
+    auxiliaryCommentBefore?: string | null;
+
+    /**
+     * Specify the "root" folder that defines the location to search for "babel.config.js", and the default folder to allow `.babelrc` files inside of.
+     *
+     * Default: `"."`
+     */
+    root?: string | null;
+
+    /**
+     * The config file to load Babel's config from. Defaults to searching for "babel.config.js" inside the "root" folder. `false` will disable searching for config files.
+     *
+     * Default: `undefined`
+     */
+    configFile?: string | false | null;
+
+    /**
+     * Specify whether or not to use .babelrc and
+     * .babelignore files.
+     *
+     * Default: `true`
+     */
+    babelrc?: boolean | null;
+
+    /**
+     * Specify which packages should be search for .babelrc files when they are being compiled. `true` to always search, or a path string or an array of paths to packages to search
+     * inside of. Defaults to only searching the "root" package.
+     *
+     * Default: `(root)`
+     */
+    babelrcRoots?: true | string | string[] | null;
+
+    /**
+     * Defaults to environment variable `BABEL_ENV` if set, or else `NODE_ENV` if set, or else it defaults to `"development"`
+     *
+     * Default: env vars
+     */
+    envName?: string | null;
+
+    /**
+     * Enable code generation
+     *
+     * Default: `true`
+     */
+    code?: boolean | null;
+
+    /**
+     * Output comments in generated output
+     *
+     * Default: `true`
+     */
+    comments?: boolean | null;
+
+    /**
+     * Do not include superfluous whitespace characters and line terminators. When set to `"auto"` compact is set to `true` on input sizes of >500KB
+     *
+     * Default: `"auto"`
+     */
+    compact?: boolean | "auto" | null;
+
+    /**
+     * The working directory that Babel's programmatic options are loaded relative to.
+     *
+     * Default: `"."`
+     */
+    cwd?: string | null;
+
+    /**
+     * This is an object of keys that represent different environments. For example, you may have: `{ env: { production: { \/* specific options *\/ } } }`
+     * which will use those options when the `envName` is `production`
+     *
+     * Default: `{}`
+     */
+    env?: { [index: string]: TransformOptions | null | undefined; } | null;
+
+    /**
+     * A path to a `.babelrc` file to extend
+     *
+     * Default: `null`
+     */
+    extends?: string | null;
+
+    /**
+     * Filename for use in errors etc
+     *
+     * Default: `"unknown"`
+     */
+    filename?: string | null;
+
+    /**
+     * Filename relative to `sourceRoot`
+     *
+     * Default: `(filename)`
+     */
+    filenameRelative?: string | null;
+
+    /**
+     * An object containing the options to be passed down to the babel code generator, @babel/generator
+     *
+     * Default: `{}`
+     */
+    generatorOpts?: GeneratorOptions | null;
+
+    /**
+     * Specify a custom callback to generate a module id with. Called as `getModuleId(moduleName)`. If falsy value is returned then the generated module id is used
+     *
+     * Default: `null`
+     */
+    getModuleId?: ((moduleName: string) => string | null | undefined) | null;
+
+    /**
+     * ANSI highlight syntax error code frames
+     *
+     * Default: `true`
+     */
+    highlightCode?: boolean | null;
+
+    /**
+     * Opposite to the `only` option. `ignore` is disregarded if `only` is specified
+     *
+     * Default: `null`
+     */
+    ignore?: string[] | null;
+
+    /**
+     * A source map object that the output source map will be based on
+     *
+     * Default: `null`
+     */
+    inputSourceMap?: object | null;
+
+    /**
+     * Should the output be minified (not printing last semicolons in blocks, printing literal string values instead of escaped ones, stripping `()` from `new` when safe)
+     *
+     * Default: `false`
+     */
+    minified?: boolean | null;
+
+    /**
+     * Specify a custom name for module ids
+     *
+     * Default: `null`
+     */
+    moduleId?: string | null;
+
+    /**
+     * If truthy, insert an explicit id for modules. By default, all modules are anonymous. (Not available for `common` modules)
+     *
+     * Default: `false`
+     */
+    moduleIds?: boolean | null;
+
+    /**
+     * Optional prefix for the AMD module formatter that will be prepend to the filename on module definitions
+     *
+     * Default: `(sourceRoot)`
+     */
+    moduleRoot?: string | null;
+
+    /**
+     * A glob, regex, or mixed array of both, matching paths to **only** compile. Can also be an array of arrays containing paths to explicitly match. When attempting to compile
+     * a non-matching file it's returned verbatim
+     *
+     * Default: `null`
+     */
+    only?: string | RegExp | Array<string | RegExp> | null;
+
+    /**
+     * An object containing the options to be passed down to the babel parser, @babel/parser
+     *
+     * Default: `{}`
+     */
+    parserOpts?: ParseOptions | null;
+
+    /**
+     * List of plugins to load and use
+     *
+     * Default: `[]`
+     */
+    plugins?: PluginItem[] | null;
+
+    /**
+     * List of presets (a set of plugins) to load and use
+     *
+     * Default: `[]`
+     */
+    presets?: PluginItem[] | null;
+
+    /**
+     * Retain line numbers. This will lead to wacky code but is handy for scenarios where you can't use source maps. (**NOTE**: This will not retain the columns)
+     *
+     * Default: `false`
+     */
+    retainLines?: boolean | null;
+
+    /**
+     * An optional callback that controls whether a comment should be output or not. Called as `shouldPrintComment(commentContents)`. **NOTE**: This overrides the `comment` option when used
+     *
+     * Default: `null`
+     */
+    shouldPrintComment?: ((commentContents: string) => boolean) | null;
+
+    /**
+     * Set `sources[0]` on returned source map
+     *
+     * Default: `(filenameRelative)`
+     */
+    sourceFileName?: string | null;
+
+    /**
+     * If truthy, adds a `map` property to returned output. If set to `"inline"`, a comment with a sourceMappingURL directive is added to the bottom of the returned code. If set to `"both"`
+     * then a `map` property is returned as well as a source map comment appended. **This does not emit sourcemap files by itself!**
+     *
+     * Default: `false`
+     */
+    sourceMaps?: boolean | "inline" | "both" | null;
+
+    /**
+     * The root from which all sources are relative
+     *
+     * Default: `(moduleRoot)`
+     */
+    sourceRoot?: string | null;
+
+    /**
+     * Indicate the mode the code should be parsed in. Can be one of "script", "module", or "unambiguous". `"unambiguous"` will make Babel attempt to guess, based on the presence of ES6
+     * `import` or `export` statements. Files with ES6 `import`s and `export`s are considered `"module"` and are otherwise `"script"`.
+     *
+     * Default: `("module")`
+     */
+    sourceType?: "script" | "module" | "unambiguous" | null;
+
+    /**
+     * 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. Called as
+     * `wrapPluginVisitorMethod(pluginAlias, visitorType, callback)`.
+     */
+    wrapPluginVisitorMethod?: ((pluginAlias: string, visitorType: "enter" | "exit", callback: (path: NodePath, state: any) => void) => (path: NodePath, state: any) => void) | null;
+}
+
+export type FileResultCallback = (err: Error | null, result: BabelFileResult | null) => any;
+
+/**
+ * Transforms the passed in code. Calling a callback with an object with the generated code, source map, and AST.
+ */
+export function transform(code: string, callback: FileResultCallback): void;
+
+/**
+ * Transforms the passed in code. Calling a callback with an object with the generated code, source map, and AST.
+ */
+export function transform(code: string, opts: TransformOptions | undefined, callback: FileResultCallback): void;
+
+/**
+ * Here for backward-compatibility. Ideally use `transformSync` if you want a synchronous API.
+ */
+export function transform(code: string, opts?: TransformOptions): BabelFileResult | null;
+
+/**
+ * Transforms the passed in code. Returning an object with the generated code, source map, and AST.
+ */
+export function transformSync(code: string, opts?: TransformOptions): BabelFileResult | null;
+
+/**
+ * Transforms the passed in code. Calling a callback with an object with the generated code, source map, and AST.
+ */
+export function transformAsync(code: string, opts?: TransformOptions): Promise<BabelFileResult | null>;
+
+/**
+ * Asynchronously transforms the entire contents of a file.
+ */
+export function transformFile(filename: string, callback: FileResultCallback): void;
+
+/**
+ * Asynchronously transforms the entire contents of a file.
+ */
+export function transformFile(filename: string, opts: TransformOptions | undefined, callback: FileResultCallback): void;
+
+/**
+ * Synchronous version of `babel.transformFile`. Returns the transformed contents of the `filename`.
+ */
+export function transformFileSync(filename: string, opts?: TransformOptions): BabelFileResult | null;
+
+/**
+ * Asynchronously transforms the entire contents of a file.
+ */
+export function transformFileAsync(filename: string, opts?: TransformOptions): Promise<BabelFileResult | null>;
+
+/**
+ * Given an AST, transform it.
+ */
+export function transformFromAst(ast: Node, code: string | undefined, callback: FileResultCallback): void;
+
+/**
+ * Given an AST, transform it.
+ */
+export function transformFromAst(ast: Node, code: string | undefined, opts: TransformOptions | undefined, callback: FileResultCallback): void;
+
+/**
+ * Here for backward-compatibility. Ideally use ".transformSync" if you want a synchronous API.
+ */
+export function transformFromAstSync(ast: Node, code?: string, opts?: TransformOptions): BabelFileResult | null;
+
+/**
+ * Given an AST, transform it.
+ */
+export function transformFromAstSync(ast: Node, code?: string, opts?: TransformOptions): Promise<BabelFileResult | null>;
+
+// A babel plugin is a simple function which must return an object matching
+// the following interface. Babel will throw if it finds unknown properties.
+// The list of allowed plugin keys is here:
+// https://github.com/babel/babel/blob/4e50b2d9d9c376cee7a2cbf56553fe5b982ea53c/packages/babel-core/src/config/option-manager.js#L71
+export interface PluginObj<S = {}> {
+    name?: string;
+    manipulateOptions?(opts: any, parserOpts: any): void;
+    pre?(this: S, state: any): void;
+    visitor: Visitor<S>;
+    post?(this: S, state: any): void;
+    inherits?: any;
+}
+
+export interface BabelFileResult {
+    ast?: Node | null;
+    code?: string | null;
+    ignored?: boolean;
+    map?: {
+        version: number;
+        sources: string[];
+        names: string[];
+        sourceRoot?: string;
+        sourcesContent?: string[];
+        mappings: string;
+        file: string;
+    } | null;
+    metadata?: BabelFileMetadata;
+}
+
+export interface BabelFileMetadata {
+    usedHelpers: string[];
+    marked: Array<{
+        type: string;
+        message: string;
+        loc: object;
+    }>;
+    modules: BabelFileModulesMetadata;
+}
+
+export interface BabelFileModulesMetadata {
+    imports: object[];
+    exports: {
+        exported: object[];
+        specifiers: object[];
+    };
+}
+
+export type FileParseCallback = (err: Error | null, result: ParseResult | null) => any;
+
+/**
+ * Given some code, parse it using Babel's standard behavior.
+ * Referenced presets and plugins will be loaded such that optional syntax plugins are automatically enabled.
+ */
+export function parse(code: string, callback: FileParseCallback): void;
+
+/**
+ * Given some code, parse it using Babel's standard behavior.
+ * Referenced presets and plugins will be loaded such that optional syntax plugins are automatically enabled.
+ */
+export function parse(code: string, options: TransformOptions | undefined, callback: FileParseCallback): void;
+
+/**
+ * Given some code, parse it using Babel's standard behavior.
+ * Referenced presets and plugins will be loaded such that optional syntax plugins are automatically enabled.
+ */
+export function parse(code: string, options?: TransformOptions): ParseResult | null;
+
+/**
+ * Given some code, parse it using Babel's standard behavior.
+ * Referenced presets and plugins will be loaded such that optional syntax plugins are automatically enabled.
+ */
+export function parseSync(code: string, options?: TransformOptions): ParseResult | null;
+
+/**
+ * Given some code, parse it using Babel's standard behavior.
+ * Referenced presets and plugins will be loaded such that optional syntax plugins are automatically enabled.
+ */
+export function parseAsync(code: string, options?: TransformOptions): Promise<ParseResult | null>;
+
+/**
+ * Resolve Babel's options fully, resulting in an options object where:
+ *
+ * * opts.plugins is a full list of Plugin instances.
+ * * opts.presets is empty and all presets are flattened into opts.
+ * * It can be safely passed back to Babel. Fields like babelrc have been set to false so that later calls to Babel
+ * will not make a second attempt to load config files.
+ *
+ * Plugin instances aren't meant to be manipulated directly, but often callers will serialize this opts to JSON to
+ * use it as a cache key representing the options Babel has received. Caching on this isn't 100% guaranteed to
+ * invalidate properly, but it is the best we have at the moment.
+ */
+export function loadOptions(options?: TransformOptions): object | null;
+
+/**
+ * To allow systems to easily manipulate and validate a user's config, this function resolves the plugins and
+ * presets and proceeds no further. The expectation is that callers will take the config's .options, manipulate it
+ * as then see fit and pass it back to Babel again.
+ *
+ * * `babelrc: string | void` - The path of the `.babelrc` file, if there was one.
+ * * `babelignore: string | void` - The path of the `.babelignore` file, if there was one.
+ * * `options: ValidatedOptions` - The partially resolved options, which can be manipulated and passed back
+ * to Babel again.
+ *  * `plugins: Array<ConfigItem>` - See below.
+ *  * `presets: Array<ConfigItem>` - See below.
+ *  * It can be safely passed back to Babel. Fields like `babelrc` have been set to false so that later calls to
+ * Babel will not make a second attempt to load config files.
+ *
+ * `ConfigItem` instances expose properties to introspect the values, but each item should be treated as
+ * immutable. If changes are desired, the item should be removed from the list and replaced with either a normal
+ * Babel config value, or with a replacement item created by `babel.createConfigItem`. See that function for
+ * information about `ConfigItem` fields.
+ */
+export function loadPartialConfig(options?: TransformOptions): Readonly<PartialConfig> | null;
+
+export interface PartialConfig {
+    options: TransformOptions;
+    babelrc?: string;
+    babelignore?: string;
+    config?: string;
+}
+
+export interface ConfigItem {
+    /**
+     * The name that the user gave the plugin instance, e.g. `plugins: [ ['env', {}, 'my-env'] ]`
+     */
+    name?: string;
+
+    /**
+     * The resolved value of the plugin.
+     */
+    value: object | ((...args: any[]) => any);
+
+    /**
+     * The options object passed to the plugin.
+     */
+    options?: object | false;
+
+    /**
+     * The path that the options are relative to.
+     */
+    dirname: string;
+
+    /**
+     * Information about the plugin's file, if Babel knows it.
+     *  *
+     */
+    file?: {
+        /**
+         * The file that the user requested, e.g. `"@babel/env"`
+         */
+        request: string;
+
+        /**
+         * The full path of the resolved file, e.g. `"/tmp/node_modules/@babel/preset-env/lib/index.js"`
+         */
+        resolved: string;
+    } | null;
+}
+
+export type PluginOptions = object | undefined | false;
+
+export type PluginTarget = string | object | ((...args: any[]) => any);
+
+export type PluginItem = ConfigItem | PluginObj<any> | PluginTarget | [PluginTarget, PluginOptions] | [PluginTarget, PluginOptions, string | undefined];
+
+export interface CreateConfigItemOptions {
+    dirname?: string;
+    type?: "preset" | "plugin";
+}
+
+/**
+ * Allows build tooling to create and cache config items up front. If this function is called multiple times for a
+ * given plugin, Babel will call the plugin's function itself multiple times. If you have a clear set of expected
+ * plugins and presets to inject, pre-constructing the config items would be recommended.
+ */
+export function createConfigItem(value: PluginTarget | [PluginTarget, PluginOptions] | [PluginTarget, PluginOptions, string | undefined], options?: CreateConfigItemOptions): ConfigItem;
+
+export as namespace babel;
diff --git a/types/babel__core/package.json b/types/babel__core/package.json
new file mode 100644
index 0000000000..c2ca8a8f9b
--- /dev/null
+++ b/types/babel__core/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@babel/types": "^7.0.0-beta.54"
+    }
+}
diff --git a/types/babel__core/tsconfig.json b/types/babel__core/tsconfig.json
new file mode 100644
index 0000000000..2f96e019cb
--- /dev/null
+++ b/types/babel__core/tsconfig.json
@@ -0,0 +1,40 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@babel/core": [
+                "babel__core"
+            ],
+            "@babel/generator": [
+                "babel__generator"
+            ],
+            "@babel/parser": [
+                "babel__parser"
+            ],
+            "@babel/template": [
+                "babel__template"
+            ],
+            "@babel/traverse": [
+                "babel__traverse"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "babel__core-tests.ts"
+    ]
+}
diff --git a/types/babel__core/tslint.json b/types/babel__core/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/babel__core/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/babel__generator/babel__generator-tests.ts b/types/babel__generator/babel__generator-tests.ts
new file mode 100644
index 0000000000..90a668ad55
--- /dev/null
+++ b/types/babel__generator/babel__generator-tests.ts
@@ -0,0 +1,23 @@
+// Example from https://github.com/babel/babel/tree/master/packages/babel-generator
+import generate from "@babel/generator";
+import { parse } from "@babel/parser";
+
+const code = "class Example {}";
+const ast = parse(code);
+
+ast.type;
+ast.loc!.start;
+
+const output = generate(ast, { /* options */ }, code);
+
+// Example from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babel-generator
+const result = generate(ast, {
+    retainLines: false,
+    compact: "auto",
+    concise: false,
+    quotes: "double",
+    jsonCompatibleStrings: true,
+    // ...
+}, code);
+result.code;
+result.map;
diff --git a/types/babel__generator/index.d.ts b/types/babel__generator/index.d.ts
new file mode 100644
index 0000000000..03fcf2765a
--- /dev/null
+++ b/types/babel__generator/index.d.ts
@@ -0,0 +1,117 @@
+// Type definitions for @babel/generator 7.0
+// Project: https://github.com/babel/babel/tree/master/packages/babel-generator
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+//                 Johnny Estilles <https://github.com/johnnyestilles>
+//                 Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as t from "@babel/types";
+
+export interface GeneratorOptions {
+    /**
+     * Optional string to add as a block comment at the start of the output file.
+     */
+    auxiliaryCommentBefore?: string;
+
+    /**
+     * Optional string to add as a block comment at the end of the output file.
+     */
+    auxiliaryCommentAfter?: string;
+
+    /**
+     * Function that takes a comment (as a string) and returns true if the comment should be included in the output.
+     * By default, comments are included if `opts.comments` is `true` or if `opts.minifed` is `false` and the comment
+     * contains `@preserve` or `@license`.
+     */
+    shouldPrintComment?(comment: string): boolean;
+
+    /**
+     * Attempt to use the same line numbers in the output code as in the source code (helps preserve stack traces).
+     * Defaults to `false`.
+     */
+    retainLines?: boolean;
+
+    /**
+     * Should comments be included in output? Defaults to `true`.
+     */
+    comments?: boolean;
+
+    /**
+     * Set to true to avoid adding whitespace for formatting. Defaults to the value of `opts.minified`.
+     */
+    compact?: boolean | "auto";
+
+    /**
+     * Should the output be minified. Defaults to `false`.
+     */
+    minified?: boolean;
+
+    /**
+     * Set to true to reduce whitespace (but not as much as opts.compact). Defaults to `false`.
+     */
+    concise?: boolean;
+
+    /**
+     * The type of quote to use in the output. If omitted, autodetects based on `ast.tokens`.
+     */
+    quotes?: "single" | "double";
+
+    /**
+     * Used in warning messages
+     */
+    filename?: string;
+
+    /**
+     * Enable generating source maps. Defaults to `false`.
+     */
+    sourceMaps?: boolean;
+
+    /**
+     * The filename of the generated code that the source map will be associated with.
+     */
+    sourceMapTarget?: string;
+
+    /**
+     * A root for all relative URLs in the source map.
+     */
+    sourceRoot?: string;
+
+    /**
+     * The filename for the source code (i.e. the code in the `code` argument).
+     * This will only be used if `code` is a string.
+     */
+    sourceFileName?: string;
+
+    /**
+     * Set to true to run jsesc with "json": true to print "\u00A9" vs. "©";
+     */
+    jsonCompatibleStrings?: boolean;
+}
+
+export class CodeGenerator {
+    constructor(ast: t.Node, opts?: GeneratorOptions, code?: string);
+    generate(): GeneratorResult;
+}
+
+/**
+ * Turns an AST into code, maintaining sourcemaps, user preferences, and valid output.
+ * @param ast - the abstract syntax tree from which to generate output code.
+ * @param opts - used for specifying options for code generation.
+ * @param code - the original source code, used for source maps.
+ * @returns - an object containing the output code and source map.
+ */
+export default function generate(ast: t.Node, opts?: GeneratorOptions, code?: string | { [filename: string]: string; }): GeneratorResult;
+
+export interface GeneratorResult {
+    code: string;
+    map: {
+        version: number;
+        sources: string[];
+        names: string[];
+        sourceRoot?: string;
+        sourcesContent?: string[];
+        mappings: string;
+        file: string;
+    } | null;
+}
diff --git a/types/babel__generator/package.json b/types/babel__generator/package.json
new file mode 100644
index 0000000000..c2ca8a8f9b
--- /dev/null
+++ b/types/babel__generator/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@babel/types": "^7.0.0-beta.54"
+    }
+}
diff --git a/types/babel__generator/tsconfig.json b/types/babel__generator/tsconfig.json
new file mode 100644
index 0000000000..be65e3da1f
--- /dev/null
+++ b/types/babel__generator/tsconfig.json
@@ -0,0 +1,31 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@babel/generator": [
+                "babel__generator"
+            ],
+            "@babel/parser": [
+                "babel__parser"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "babel__generator-tests.ts"
+    ]
+}
diff --git a/types/babel__generator/tslint.json b/types/babel__generator/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/babel__generator/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/babel__parser/babel__parser-tests.ts b/types/babel__parser/babel__parser-tests.ts
new file mode 100644
index 0000000000..1c9873e5e8
--- /dev/null
+++ b/types/babel__parser/babel__parser-tests.ts
@@ -0,0 +1,18 @@
+import { parse, parseExpression } from "@babel/parser";
+
+declare function assert(expr: boolean): void;
+
+const code = `function square(n) {
+  return n * n;
+}`;
+
+const node = parse(code);
+assert(node.type === "File");
+assert(node.start === 0);
+assert(node.end === 38);
+assert(!!node.loc && node.loc.start > node.loc.end);
+
+parse(code, {
+  sourceType: "module", // default: "script"
+  plugins: ["jsx"] // default: []
+});
diff --git a/types/babel__parser/index.d.ts b/types/babel__parser/index.d.ts
new file mode 100644
index 0000000000..bf383ffa0c
--- /dev/null
+++ b/types/babel__parser/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for @babel/parser 7.0
+// Project: https://github.com/babel/babel/tree/master/packages/babel-parser
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+//                 Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { File, Expression } from "@babel/types";
+
+export function parse(code: string, opts?: ParseOptions): File;
+
+export function parseExpression(input: string, options?: ParseOptions): Expression;
+
+export interface ParseOptions {
+    /**
+     * By default, import and export declarations can only appear at a program's top level.
+     * Setting this option to true allows them anywhere where a statement is allowed.
+     */
+    allowImportExportEverywhere?: boolean;
+
+    /**
+     * By default, await use is not allowed outside of an async function. Set this to true to accept such code.
+     */
+    allowAwaitOutsideFunction?: boolean;
+
+    /**
+     * By default, a return statement at the top level raises an error. Set this to true to accept such code.
+     */
+    allowReturnOutsideFunction?: boolean;
+
+    allowSuperOutsideMethod?: boolean;
+
+    /**
+     * Indicate the mode the code should be parsed in. Can be one of "script", "module", or "unambiguous".
+     * Defaults to "script". "unambiguous" will make @babel/parser attempt to guess, based on the presence of ES6 import or export
+     * statements. Files with ES6 imports and exports are considered "module" and are otherwise "script".
+     */
+    sourceType?: "script" | "module" | "unambiguous";
+
+    /**
+     * Correlate output AST nodes with their source filename. Useful when
+     * generating code and source maps from the ASTs of multiple input files.
+     */
+    sourceFilename?: string;
+
+    /**
+     * By default, the first line of code parsed is treated as line 1. You can provide a line number to alternatively start with. Useful
+     * for integration with other source tools.
+     */
+    startLine?: number;
+
+    /**
+     * Array containing the plugins that you want to enable.
+     */
+    plugins?: PluginList;
+
+    strictMode?: boolean;
+
+    /**
+     * Adds a `ranges` property to each node: `[node.start, node.end]`
+     */
+    ranges?: boolean;
+
+    /**
+     * Adds all parsed tokens to a `tokens` property on the `File` node
+     */
+    tokens?: boolean;
+}
+
+export type PluginList = Array<PluginName | [PluginName, PluginOptions]>;
+
+export type PluginName =
+    "asyncGenerators" |
+    "bigInt" |
+    "classPrivateMethods" |
+    "classPrivateProperties" |
+    "classProperties" |
+    "decorators" |
+    "doExpressions" |
+    "dynamicImport" |
+    "estree" |
+    "exportDefaultFrom" |
+    "exportNamespaceFrom" |
+    "flow" |
+    "flowComments" |
+    "functionBind" |
+    "functionSent" |
+    "importMeta" |
+    "jsx" |
+    "nullishCoalescingOperator" |
+    "numericSeparator" |
+    "objectRestSpread" |
+    "optionalCatchBinding" |
+    "optionalChaining" |
+    "pipelineOperator" |
+    "throwExpressions" |
+    "typescript";
+
+export interface PluginOptions {
+    decorators?: {
+        decoratorsBeforeExport?: boolean;
+    };
+    flow?: {
+        all?: boolean;
+    };
+}
diff --git a/types/babel__parser/package.json b/types/babel__parser/package.json
new file mode 100644
index 0000000000..c2ca8a8f9b
--- /dev/null
+++ b/types/babel__parser/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@babel/types": "^7.0.0-beta.54"
+    }
+}
diff --git a/types/babel__parser/tsconfig.json b/types/babel__parser/tsconfig.json
new file mode 100644
index 0000000000..53fd02ec18
--- /dev/null
+++ b/types/babel__parser/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,
+        "paths": {
+            "@babel/parser": [
+                "babel__parser"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "babel__parser-tests.ts"
+    ]
+}
diff --git a/types/babel__parser/tslint.json b/types/babel__parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/babel__parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/babel__template/babel__template-tests.ts b/types/babel__template/babel__template-tests.ts
new file mode 100644
index 0000000000..167cf4db2f
--- /dev/null
+++ b/types/babel__template/babel__template-tests.ts
@@ -0,0 +1,34 @@
+import template from "@babel/template";
+import generate from "@babel/generator";
+import * as t from "@babel/types";
+
+const buildRequire = template.statement(`
+  var IMPORT_NAME = require(SOURCE);
+`);
+
+const ast1 = buildRequire({
+    IMPORT_NAME: t.identifier("myModule"),
+    SOURCE: t.stringLiteral("my-module")
+});
+
+console.log(generate(ast1).code);
+
+const ast2 = template.ast(`
+  var myModule = require("my-module");
+`);
+
+const fn = template.statement`
+  var IMPORT_NAME = require('${"my-module"}');
+`;
+
+const ast3 = fn({
+    IMPORT_NAME: t.identifier("myModule")
+});
+
+console.log(generate(ast3).code);
+
+declare const mod: string;
+
+const ast4 = template.ast`
+  var ${mod} = require("${name}");
+`;
diff --git a/types/babel__template/index.d.ts b/types/babel__template/index.d.ts
new file mode 100644
index 0000000000..5f3bc18bc3
--- /dev/null
+++ b/types/babel__template/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for @babel/template 7.0
+// Project: https://github.com/babel/babel/tree/master/packages/babel-template
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+//                 Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { ParseOptions } from "@babel/parser";
+import { Expression, File, Program, Statement } from "@babel/types";
+
+export interface TemplateBuilderOptions extends ParseOptions {
+    /**
+     * A set of placeholder names to automatically accept. Items in this list do not need to match the given placeholder pattern.
+     */
+    placeholderWhitelist?: Set<string>;
+
+    /**
+     * A pattern to search for when looking for Identifier and StringLiteral nodes that should be considered placeholders. `false` will
+     * disable placeholder searching entirely, leaving only the `placeholderWhitelist` value to find placeholders.
+     */
+    placeholderPattern?: RegExp | false;
+
+    /**
+     * Set this to `true` to preserve any comments from the `code` parameter.
+     */
+    preserveComments?: boolean;
+}
+
+export interface TemplateBuilder<T> {
+    /**
+     * Build a new builder, merging the given options with the previous ones.
+     */
+    (opts: TemplateBuilderOptions): TemplateBuilder<T>;
+
+    /**
+     * Building from a string produces an AST builder function by default.
+     */
+    (code: string, opts?: TemplateBuilderOptions): (arg?: PublicReplacements) => T;
+
+    /**
+     * Building from a template literal produces an AST builder function by default.
+     */
+    (tpl: TemplateStringsArray, ...args: any[]): (arg?: PublicReplacements) => T;
+
+    // Allow users to explicitly create templates that produce ASTs, skipping the need for an intermediate function.
+    ast: {
+        (tpl: string, opts?: TemplateBuilderOptions): T;
+        (tpl: TemplateStringsArray, ...args: any[]): T;
+    };
+}
+
+export type PublicReplacements = { [index: string]: any; } | any[];
+
+export const smart: TemplateBuilder<Statement | Statement[]>;
+export const statement: TemplateBuilder<Statement>;
+export const statements: TemplateBuilder<Statement[]>;
+export const expression: TemplateBuilder<Expression>;
+export const program: TemplateBuilder<Program>;
+
+type DefaultTemplateBuilder = typeof smart & {
+    smart: typeof smart;
+    statement: typeof statement;
+    statements: typeof statements;
+    expression: typeof expression;
+    program: typeof program;
+    ast: typeof smart.ast;
+};
+
+declare const templateBuilder: DefaultTemplateBuilder;
+
+export default templateBuilder;
diff --git a/types/babel__template/package.json b/types/babel__template/package.json
new file mode 100644
index 0000000000..c2ca8a8f9b
--- /dev/null
+++ b/types/babel__template/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@babel/types": "^7.0.0-beta.54"
+    }
+}
diff --git a/types/babel__template/tsconfig.json b/types/babel__template/tsconfig.json
new file mode 100644
index 0000000000..386236c02f
--- /dev/null
+++ b/types/babel__template/tsconfig.json
@@ -0,0 +1,35 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@babel/generator": [
+                "babel__generator"
+            ],
+            "@babel/parser": [
+                "babel__parser"
+            ],
+            "@babel/template": [
+                "babel__template"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "babel__template-tests.ts"
+    ]
+}
diff --git a/types/babel__template/tslint.json b/types/babel__template/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/babel__template/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/babel__traverse/babel__traverse-tests.ts b/types/babel__traverse/babel__traverse-tests.ts
new file mode 100644
index 0000000000..2fc7b07a8a
--- /dev/null
+++ b/types/babel__traverse/babel__traverse-tests.ts
@@ -0,0 +1,115 @@
+import { parse } from "@babel/parser";
+import traverse, { Visitor } from "@babel/traverse";
+import * as t from "@babel/types";
+
+// Examples from: https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md
+const MyVisitor: Visitor = {
+    Identifier: {
+        enter() {
+            console.log("Entered!");
+        },
+        exit() {
+            console.log("Exited!");
+        }
+    }
+};
+
+const MyVisitor2: Visitor = {
+    Identifier(path) {
+        console.log("Visiting: " + path.node.name);
+    }
+};
+
+// Example from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#babel-traverse
+const code = `function square(n) {
+    return n * n;
+}`;
+
+const ast = parse(code);
+
+traverse(ast, {
+    enter(path) {
+        const node = path.node;
+        if (t.isIdentifier(node) && node.name === "n") {
+            node.name = "x";
+        }
+    }
+});
+
+// Examples from https://github.com/thejameskyle/babel-handbook/blob/master/translations/en/plugin-handbook.md#writing-your-first-babel-plugin
+
+const v1: Visitor = {
+    BinaryExpression(path) {
+        if (t.isIdentifier(path.node.left)) {
+            // ...
+        }
+        path.replaceWith(
+            t.binaryExpression("**", path.node.left, t.numericLiteral(2))
+        );
+        path.parentPath.replaceWith(
+            t.expressionStatement(t.stringLiteral("Anyway the wind blows, doesn't really matter to me, to me."))
+        );
+        path.parentPath.remove();
+    },
+
+    Identifier(path) {
+        if (path.isReferencedIdentifier()) {
+            // ...
+        }
+        if (t.isQualifiedTypeIdentifier(path.node, path.parent)) {
+            // ...
+        }
+    },
+
+    ReturnStatement(path) {
+        path.replaceWithMultiple([
+            t.expressionStatement(t.stringLiteral("Is this the real life?")),
+            t.expressionStatement(t.stringLiteral("Is this just fantasy?")),
+            t.expressionStatement(t.stringLiteral("(Enjoy singing the rest of the song in your head)")),
+        ]);
+    },
+
+    FunctionDeclaration(path, state) {
+        path.replaceWithSourceString(`function add(a, b) {
+            return a + b;
+        }`);
+
+        path.insertBefore(t.expressionStatement(t.stringLiteral("Because I'm easy come, easy go.")));
+        path.insertAfter(t.expressionStatement(t.stringLiteral("A little high, little low.")));
+        path.remove();
+
+        if (path.scope.hasBinding("n")) {
+            // ...
+        }
+        if (path.scope.hasOwnBinding("n")) {
+            // ...
+        }
+
+        const id1 = path.scope.generateUidIdentifier("uid");
+        id1.type;
+        id1.name;
+        const id2 = path.scope.generateUidIdentifier("uid");
+        id2.type;
+        id2.name;
+
+        const id = path.scope.generateUidIdentifierBasedOnNode(path.node.id!);
+        path.remove();
+        path.scope.parent.push({ id, init: path.node });
+
+        path.scope.rename("n", "x");
+        path.scope.rename("n");
+    }
+};
+
+// Binding.kind
+const BindingKindTest: Visitor = {
+    Identifier(path) {
+        const kind = path.scope.getBinding("str")!.kind;
+        kind === 'module';
+        kind === 'const';
+        kind === 'let';
+        kind === 'var';
+        // The following should fail when uncommented
+        // kind === 'anythingElse';
+    },
+};
diff --git a/types/babel__traverse/index.d.ts b/types/babel__traverse/index.d.ts
new file mode 100644
index 0000000000..475ca9fb14
--- /dev/null
+++ b/types/babel__traverse/index.d.ts
@@ -0,0 +1,810 @@
+// Type definitions for @babel/traverse 7.0
+// Project: https://github.com/babel/babel/tree/master/packages/babel-traverse
+// Definitions by: Troy Gerwien <https://github.com/yortus>
+//                 Marvin Hagemeister <https://github.com/marvinhagemeister>
+//                 Ryan Petrich <https://github.com/rpetrich>
+//                 Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as t from "@babel/types";
+
+export type Node = t.Node;
+
+export default function traverse<S>(parent: Node | Node[], opts: TraverseOptions<S>, scope: Scope, state: S, parentPath?: NodePath): void;
+export default function traverse(parent: Node | Node[], opts: TraverseOptions, scope?: Scope, state?: any, parentPath?: NodePath): void;
+
+export interface TraverseOptions<S = Node> extends Visitor<S> {
+    scope?: Scope;
+    noScope?: boolean;
+}
+
+export class Scope {
+    constructor(path: NodePath, parentScope?: Scope);
+    path: NodePath;
+    block: Node;
+    parentBlock: Node;
+    parent: Scope;
+    hub: Hub;
+    bindings: { [name: string]: Binding; };
+
+    /** Traverse node with current scope and path. */
+    traverse<S>(node: Node | Node[], opts: TraverseOptions<S>, state: S): void;
+    traverse(node: Node | Node[], opts?: TraverseOptions, state?: any): void;
+
+    /** Generate a unique identifier and add it to the current scope. */
+    generateDeclaredUidIdentifier(name?: string): t.Identifier;
+
+    /** Generate a unique identifier. */
+    generateUidIdentifier(name?: string): t.Identifier;
+
+    /** Generate a unique `_id1` binding. */
+    generateUid(name?: string): string;
+
+    /** Generate a unique identifier based on a node. */
+    generateUidIdentifierBasedOnNode(parent: Node, defaultName?: string): t.Identifier;
+
+    /**
+     * Determine whether evaluating the specific input `node` is a consequenceless reference. ie.
+     * evaluating it wont result in potentially arbitrary code from being ran. The following are
+     * whitelisted and determined not to cause side effects:
+     *
+     *  - `this` expressions
+     *  - `super` expressions
+     *  - Bound identifiers
+     */
+    isStatic(node: Node): boolean;
+
+    /** Possibly generate a memoised identifier if it is not static and has consequences. */
+    maybeGenerateMemoised(node: Node, dontPush?: boolean): t.Identifier;
+
+    checkBlockScopedCollisions(local: Node, kind: string, name: string, id: object): void;
+
+    rename(oldName: string, newName?: string, block?: Node): void;
+
+    dump(): void;
+
+    toArray(node: Node, i?: number): Node;
+
+    registerDeclaration(path: NodePath): void;
+
+    buildUndefinedNode(): Node;
+
+    registerConstantViolation(path: NodePath): void;
+
+    registerBinding(kind: string, path: NodePath, bindingPath?: NodePath): void;
+
+    addGlobal(node: Node): void;
+
+    hasUid(name: string): boolean;
+
+    hasGlobal(name: string): boolean;
+
+    hasReference(name: string): boolean;
+
+    isPure(node: Node, constantsOnly?: boolean): boolean;
+
+    setData(key: string, val: any): any;
+
+    getData(key: string): any;
+
+    removeData(key: string): void;
+
+    push(opts: any): void;
+
+    getProgramParent(): Scope;
+
+    getFunctionParent(): Scope;
+
+    getBlockParent(): Scope;
+
+    /** Walks the scope tree and gathers **all** bindings. */
+    getAllBindings(...kinds: string[]): object;
+
+    bindingIdentifierEquals(name: string, node: Node): boolean;
+
+    getBinding(name: string): Binding | undefined;
+
+    getOwnBinding(name: string): Binding | undefined;
+
+    getBindingIdentifier(name: string): t.Identifier;
+
+    getOwnBindingIdentifier(name: string): t.Identifier;
+
+    hasOwnBinding(name: string): boolean;
+
+    hasBinding(name: string, noGlobals?: boolean): boolean;
+
+    parentHasBinding(name: string, noGlobals?: boolean): boolean;
+
+    /** Move a binding of `name` to another `scope`. */
+    moveBindingTo(name: string, scope: Scope): void;
+
+    removeOwnBinding(name: string): void;
+
+    removeBinding(name: string): void;
+}
+
+export class Binding {
+    constructor(opts: { existing: Binding; identifier: t.Identifier; scope: Scope; path: NodePath; kind: "var" | "let" | "const"; });
+    identifier: t.Identifier;
+    scope: Scope;
+    path: NodePath;
+    kind: "var" | "let" | "const" | "module";
+    referenced: boolean;
+    references: number;
+    referencePaths: NodePath[];
+    constant: boolean;
+    constantViolations: NodePath[];
+}
+
+export type Visitor<S = Node> = VisitNodeObject<Node> & {
+    [P in Node["type"]]?: VisitNode<S, Extract<Node, { type: P; }>>;
+};
+
+export type VisitNode<T, P> = VisitNodeFunction<T, P> | VisitNodeObject<T>;
+
+export type VisitNodeFunction<T, P> = (this: T, path: NodePath<P>, state: any) => void;
+
+export interface VisitNodeObject<T> {
+    enter?(path: NodePath<T>, state: any): void;
+    exit?(path: NodePath<T>, state: any): void;
+}
+
+export class NodePath<T = Node> {
+    constructor(hub: Hub, parent: Node);
+    parent: Node;
+    hub: Hub;
+    contexts: TraversalContext[];
+    data: object;
+    shouldSkip: boolean;
+    shouldStop: boolean;
+    removed: boolean;
+    state: any;
+    opts: object;
+    skipKeys: object;
+    parentPath: NodePath;
+    context: TraversalContext;
+    container: object | object[];
+    listKey: string;
+    inList: boolean;
+    parentKey: string;
+    key: string | number;
+    node: T;
+    scope: Scope;
+    type: T extends undefined | null ? string | null : string;
+    typeAnnotation: object;
+
+    getScope(scope: Scope): Scope;
+
+    setData(key: string, val: any): any;
+
+    getData(key: string, def?: any): any;
+
+    buildCodeFrameError<TError extends Error>(msg: string, Error?: new (msg: string) => TError): TError;
+
+    traverse<T>(visitor: Visitor<T>, state: T): void;
+    traverse(visitor: Visitor): void;
+
+    set(key: string, node: Node): void;
+
+    getPathLocation(): string;
+
+    // Example: https://github.com/babel/babel/blob/63204ae51e020d84a5b246312f5eeb4d981ab952/packages/babel-traverse/src/path/modification.js#L83
+    debug(buildMessage: () => string): void;
+
+    // ------------------------- ancestry -------------------------
+    /**
+     * Call the provided `callback` with the `NodePath`s of all the parents.
+     * When the `callback` returns a truthy value, we return that node path.
+     */
+    findParent(callback: (path: NodePath) => boolean): NodePath;
+
+    find(callback: (path: NodePath) => boolean): NodePath;
+
+    /** Get the parent function of the current path. */
+    getFunctionParent(): NodePath<t.Function>;
+
+    /** Walk up the tree until we hit a parent node path in a list. */
+    getStatementParent(): NodePath<t.Statement>;
+
+    /**
+     * Get the deepest common ancestor and then from it, get the earliest relationship path
+     * to that ancestor.
+     *
+     * Earliest is defined as being "before" all the other nodes in terms of list container
+     * position and visiting key.
+     */
+    getEarliestCommonAncestorFrom(paths: NodePath[]): NodePath[];
+
+    /** Get the earliest path in the tree where the provided `paths` intersect. */
+    getDeepestCommonAncestorFrom(
+        paths: NodePath[],
+        filter?: (deepest: Node, i: number, ancestries: NodePath[]) => NodePath
+    ): NodePath;
+
+    /**
+     * Build an array of node paths containing the entire ancestry of the current node path.
+     *
+     * NOTE: The current node path is included in this.
+     */
+    getAncestry(): NodePath[];
+
+    inType(...candidateTypes: string[]): boolean;
+
+    // ------------------------- inference -------------------------
+    /** Infer the type of the current `NodePath`. */
+    getTypeAnnotation(): t.FlowType;
+
+    isBaseType(baseName: string, soft?: boolean): boolean;
+
+    couldBeBaseType(name: string): boolean;
+
+    baseTypeStrictlyMatches(right: NodePath): boolean;
+
+    isGenericType(genericName: string): boolean;
+
+    // ------------------------- replacement -------------------------
+    /**
+     * Replace a node with an array of multiple. This method performs the following steps:
+     *
+     *  - Inherit the comments of first provided node with that of the current node.
+     *  - Insert the provided nodes after the current node.
+     *  - Remove the current node.
+     */
+    replaceWithMultiple(nodes: Node[]): void;
+
+    /**
+     * Parse a string as an expression and replace the current node with the result.
+     *
+     * NOTE: This is typically not a good idea to use. Building source strings when
+     * transforming ASTs is an antipattern and SHOULD NOT be encouraged. Even if it's
+     * easier to use, your transforms will be extremely brittle.
+     */
+    replaceWithSourceString(replacement: any): void;
+
+    /** Replace the current node with another. */
+    replaceWith(replacement: Node | NodePath): void;
+
+    /**
+     * This method takes an array of statements nodes and then explodes it
+     * into expressions. This method retains completion records which is
+     * extremely important to retain original semantics.
+     */
+    replaceExpressionWithStatements(nodes: Node[]): Node;
+
+    replaceInline(nodes: Node | Node[]): void;
+
+    // ------------------------- evaluation -------------------------
+    /**
+     * Walk the input `node` and statically evaluate if it's truthy.
+     *
+     * Returning `true` when we're sure that the expression will evaluate to a
+     * truthy value, `false` if we're sure that it will evaluate to a falsy
+     * value and `undefined` if we aren't sure. Because of this please do not
+     * rely on coercion when using this method and check with === if it's false.
+     */
+    evaluateTruthy(): boolean;
+
+    /**
+     * Walk the input `node` and statically evaluate it.
+     *
+     * Returns an object in the form `{ confident, value }`. `confident` indicates
+     * whether or not we had to drop out of evaluating the expression because of
+     * hitting an unknown node that we couldn't confidently find the value of.
+     *
+     * Example:
+     *
+     *   t.evaluate(parse("5 + 5")) // { confident: true, value: 10 }
+     *   t.evaluate(parse("!true")) // { confident: true, value: false }
+     *   t.evaluate(parse("foo + foo")) // { confident: false, value: undefined }
+     */
+    evaluate(): { confident: boolean; value: any };
+
+    // ------------------------- introspection -------------------------
+    /**
+     * Match the current node if it matches the provided `pattern`.
+     *
+     * For example, given the match `React.createClass` it would match the
+     * parsed nodes of `React.createClass` and `React["createClass"]`.
+     */
+    matchesPattern(pattern: string, allowPartial?: boolean): boolean;
+
+    /**
+     * Check whether we have the input `key`. If the `key` references an array then we check
+     * if the array has any items, otherwise we just check if it's falsy.
+     */
+    has(key: string): boolean;
+
+    isStatic(): boolean;
+
+    /** Alias of `has`. */
+    is(key: string): boolean;
+
+    /** Opposite of `has`. */
+    isnt(key: string): boolean;
+
+    /** Check whether the path node `key` strict equals `value`. */
+    equals(key: string, value: any): boolean;
+
+    /**
+     * Check the type against our stored internal type of the node. This is handy when a node has
+     * been removed yet we still internally know the type and need it to calculate node replacement.
+     */
+    isNodeType(type: string): boolean;
+
+    /**
+     * This checks whether or not we're in one of the following positions:
+     *
+     *   for (KEY in right);
+     *   for (KEY;;);
+     *
+     * This is because these spots allow VariableDeclarations AND normal expressions so we need
+     * to tell the path replacement that it's ok to replace this with an expression.
+     */
+    canHaveVariableDeclarationOrExpression(): boolean;
+
+    /**
+     * This checks whether we are swapping an arrow function's body between an
+     * expression and a block statement (or vice versa).
+     *
+     * This is because arrow functions may implicitly return an expression, which
+     * is the same as containing a block statement.
+     */
+    canSwapBetweenExpressionAndStatement(replacement: Node): boolean;
+
+    /** Check whether the current path references a completion record */
+    isCompletionRecord(allowInsideFunction?: boolean): boolean;
+
+    /**
+     * Check whether or not the current `key` allows either a single statement or block statement
+     * so we can explode it if necessary.
+     */
+    isStatementOrBlock(): boolean;
+
+    /** Check if the currently assigned path references the `importName` of `moduleSource`. */
+    referencesImport(moduleSource: string, importName: string): boolean;
+
+    /** Get the source code associated with this node. */
+    getSource(): string;
+
+    /** Check if the current path will maybe execute before another path */
+    willIMaybeExecuteBefore(path: NodePath): boolean;
+
+    // ------------------------- context -------------------------
+    call(key: string): boolean;
+
+    isBlacklisted(): boolean;
+
+    visit(): boolean;
+
+    skip(): void;
+
+    skipKey(key: string): void;
+
+    stop(): void;
+
+    setScope(): void;
+
+    setContext(context: TraversalContext): NodePath<T>;
+
+    popContext(): void;
+
+    pushContext(context: TraversalContext): void;
+
+    // ------------------------- removal -------------------------
+    remove(): void;
+
+    // ------------------------- modification -------------------------
+    /** Insert the provided nodes before the current one. */
+    insertBefore(nodes: Node | Node[]): any;
+
+    /**
+     * Insert the provided nodes after the current one. When inserting nodes after an
+     * expression, ensure that the completion record is correct by pushing the current node.
+     */
+    insertAfter(nodes: Node | Node[]): any;
+
+    /** Update all sibling node paths after `fromIndex` by `incrementBy`. */
+    updateSiblingKeys(fromIndex: number, incrementBy: number): void;
+
+    /** Hoist the current node to the highest scope possible and return a UID referencing it. */
+    hoist(scope: Scope): void;
+
+    // ------------------------- family -------------------------
+    getOpposite(): NodePath;
+
+    getCompletionRecords(): NodePath[];
+
+    getSibling(key: string | number): NodePath;
+    getAllPrevSiblings(): NodePath[];
+    getAllNextSiblings(): NodePath[];
+
+    get<K extends keyof T>(key: K, context?: boolean | TraversalContext):
+        T[K] extends Array<Node | null | undefined> ? Array<NodePath<T[K][number]>> :
+        T[K] extends Node | null | undefined ? NodePath<T[K]> :
+        never;
+    get(key: string, context?: boolean | TraversalContext): NodePath | NodePath[];
+
+    getBindingIdentifiers(duplicates?: boolean): Node[];
+
+    getOuterBindingIdentifiers(duplicates?: boolean): Node[];
+
+    // ------------------------- comments -------------------------
+    /** Share comments amongst siblings. */
+    shareCommentsWithSiblings(): void;
+
+    addComment(type: string, content: string, line?: boolean): void;
+
+    /** Give node `comments` of the specified `type`. */
+    addComments(type: string, comments: any[]): void;
+
+    // ------------------------- isXXX -------------------------
+    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>;
+    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>;
+    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): 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;
+
+    // ------------------------- assertXXX -------------------------
+    assertArrayExpression(opts?: object): void;
+    assertAssignmentExpression(opts?: object): void;
+    assertBinaryExpression(opts?: object): void;
+    assertDirective(opts?: object): void;
+    assertDirectiveLiteral(opts?: object): void;
+    assertBlockStatement(opts?: object): void;
+    assertBreakStatement(opts?: object): void;
+    assertCallExpression(opts?: object): void;
+    assertCatchClause(opts?: object): void;
+    assertConditionalExpression(opts?: object): void;
+    assertContinueStatement(opts?: object): void;
+    assertDebuggerStatement(opts?: object): void;
+    assertDoWhileStatement(opts?: object): void;
+    assertEmptyStatement(opts?: object): void;
+    assertExpressionStatement(opts?: object): void;
+    assertFile(opts?: object): void;
+    assertForInStatement(opts?: object): void;
+    assertForStatement(opts?: object): void;
+    assertFunctionDeclaration(opts?: object): void;
+    assertFunctionExpression(opts?: object): void;
+    assertIdentifier(opts?: object): void;
+    assertIfStatement(opts?: object): void;
+    assertLabeledStatement(opts?: object): void;
+    assertStringLiteral(opts?: object): void;
+    assertNumericLiteral(opts?: object): void;
+    assertNullLiteral(opts?: object): void;
+    assertBooleanLiteral(opts?: object): void;
+    assertRegExpLiteral(opts?: object): void;
+    assertLogicalExpression(opts?: object): void;
+    assertMemberExpression(opts?: object): void;
+    assertNewExpression(opts?: object): void;
+    assertProgram(opts?: object): void;
+    assertObjectExpression(opts?: object): void;
+    assertObjectMethod(opts?: object): void;
+    assertObjectProperty(opts?: object): void;
+    assertRestElement(opts?: object): void;
+    assertReturnStatement(opts?: object): void;
+    assertSequenceExpression(opts?: object): void;
+    assertSwitchCase(opts?: object): void;
+    assertSwitchStatement(opts?: object): void;
+    assertThisExpression(opts?: object): void;
+    assertThrowStatement(opts?: object): void;
+    assertTryStatement(opts?: object): void;
+    assertUnaryExpression(opts?: object): void;
+    assertUpdateExpression(opts?: object): void;
+    assertVariableDeclaration(opts?: object): void;
+    assertVariableDeclarator(opts?: object): void;
+    assertWhileStatement(opts?: object): void;
+    assertWithStatement(opts?: object): void;
+    assertAssignmentPattern(opts?: object): void;
+    assertArrayPattern(opts?: object): void;
+    assertArrowFunctionExpression(opts?: object): void;
+    assertClassBody(opts?: object): void;
+    assertClassDeclaration(opts?: object): void;
+    assertClassExpression(opts?: object): void;
+    assertExportAllDeclaration(opts?: object): void;
+    assertExportDefaultDeclaration(opts?: object): void;
+    assertExportNamedDeclaration(opts?: object): void;
+    assertExportSpecifier(opts?: object): void;
+    assertForOfStatement(opts?: object): void;
+    assertImportDeclaration(opts?: object): void;
+    assertImportDefaultSpecifier(opts?: object): void;
+    assertImportNamespaceSpecifier(opts?: object): void;
+    assertImportSpecifier(opts?: object): void;
+    assertMetaProperty(opts?: object): void;
+    assertClassMethod(opts?: object): void;
+    assertObjectPattern(opts?: object): void;
+    assertSpreadElement(opts?: object): void;
+    assertSuper(opts?: object): void;
+    assertTaggedTemplateExpression(opts?: object): void;
+    assertTemplateElement(opts?: object): void;
+    assertTemplateLiteral(opts?: object): void;
+    assertYieldExpression(opts?: object): void;
+    assertAnyTypeAnnotation(opts?: object): void;
+    assertArrayTypeAnnotation(opts?: object): void;
+    assertBooleanTypeAnnotation(opts?: object): void;
+    assertBooleanLiteralTypeAnnotation(opts?: object): void;
+    assertNullLiteralTypeAnnotation(opts?: object): void;
+    assertClassImplements(opts?: object): void;
+    assertClassProperty(opts?: object): void;
+    assertDeclareClass(opts?: object): void;
+    assertDeclareFunction(opts?: object): void;
+    assertDeclareInterface(opts?: object): void;
+    assertDeclareModule(opts?: object): void;
+    assertDeclareTypeAlias(opts?: object): void;
+    assertDeclareVariable(opts?: object): void;
+    assertExistentialTypeParam(opts?: object): void;
+    assertFunctionTypeAnnotation(opts?: object): void;
+    assertFunctionTypeParam(opts?: object): void;
+    assertGenericTypeAnnotation(opts?: object): void;
+    assertInterfaceExtends(opts?: object): void;
+    assertInterfaceDeclaration(opts?: object): void;
+    assertIntersectionTypeAnnotation(opts?: object): void;
+    assertMixedTypeAnnotation(opts?: object): void;
+    assertNullableTypeAnnotation(opts?: object): void;
+    assertNumericLiteralTypeAnnotation(opts?: object): void;
+    assertNumberTypeAnnotation(opts?: object): void;
+    assertStringLiteralTypeAnnotation(opts?: object): void;
+    assertStringTypeAnnotation(opts?: object): void;
+    assertThisTypeAnnotation(opts?: object): void;
+    assertTupleTypeAnnotation(opts?: object): void;
+    assertTypeofTypeAnnotation(opts?: object): void;
+    assertTypeAlias(opts?: object): void;
+    assertTypeAnnotation(opts?: object): void;
+    assertTypeCastExpression(opts?: object): void;
+    assertTypeParameterDeclaration(opts?: object): void;
+    assertTypeParameterInstantiation(opts?: object): void;
+    assertObjectTypeAnnotation(opts?: object): void;
+    assertObjectTypeCallProperty(opts?: object): void;
+    assertObjectTypeIndexer(opts?: object): void;
+    assertObjectTypeProperty(opts?: object): void;
+    assertQualifiedTypeIdentifier(opts?: object): void;
+    assertUnionTypeAnnotation(opts?: object): void;
+    assertVoidTypeAnnotation(opts?: object): void;
+    assertJSXAttribute(opts?: object): void;
+    assertJSXClosingElement(opts?: object): void;
+    assertJSXElement(opts?: object): void;
+    assertJSXEmptyExpression(opts?: object): void;
+    assertJSXExpressionContainer(opts?: object): void;
+    assertJSXIdentifier(opts?: object): void;
+    assertJSXMemberExpression(opts?: object): void;
+    assertJSXNamespacedName(opts?: object): void;
+    assertJSXOpeningElement(opts?: object): void;
+    assertJSXSpreadAttribute(opts?: object): void;
+    assertJSXText(opts?: object): void;
+    assertNoop(opts?: object): void;
+    assertParenthesizedExpression(opts?: object): void;
+    assertAwaitExpression(opts?: object): void;
+    assertBindExpression(opts?: object): void;
+    assertDecorator(opts?: object): void;
+    assertDoExpression(opts?: object): void;
+    assertExportDefaultSpecifier(opts?: object): void;
+    assertExportNamespaceSpecifier(opts?: object): void;
+    assertRestProperty(opts?: object): void;
+    assertSpreadProperty(opts?: object): void;
+    assertExpression(opts?: object): void;
+    assertBinary(opts?: object): void;
+    assertScopable(opts?: object): void;
+    assertBlockParent(opts?: object): void;
+    assertBlock(opts?: object): void;
+    assertStatement(opts?: object): void;
+    assertTerminatorless(opts?: object): void;
+    assertCompletionStatement(opts?: object): void;
+    assertConditional(opts?: object): void;
+    assertLoop(opts?: object): void;
+    assertWhile(opts?: object): void;
+    assertExpressionWrapper(opts?: object): void;
+    assertFor(opts?: object): void;
+    assertForXStatement(opts?: object): void;
+    assertFunction(opts?: object): void;
+    assertFunctionParent(opts?: object): void;
+    assertPureish(opts?: object): void;
+    assertDeclaration(opts?: object): void;
+    assertLVal(opts?: object): void;
+    assertLiteral(opts?: object): void;
+    assertImmutable(opts?: object): void;
+    assertUserWhitespacable(opts?: object): void;
+    assertMethod(opts?: object): void;
+    assertObjectMember(opts?: object): void;
+    assertProperty(opts?: object): void;
+    assertUnaryLike(opts?: object): void;
+    assertPattern(opts?: object): void;
+    assertClass(opts?: object): void;
+    assertModuleDeclaration(opts?: object): void;
+    assertExportDeclaration(opts?: object): void;
+    assertModuleSpecifier(opts?: object): void;
+    assertFlow(opts?: object): void;
+    assertFlowBaseAnnotation(opts?: object): void;
+    assertFlowDeclaration(opts?: object): void;
+    assertJSX(opts?: object): void;
+    assertNumberLiteral(opts?: object): void;
+    assertRegexLiteral(opts?: object): void;
+}
+
+export class Hub {
+    constructor(file: any, options: any);
+    file: any;
+    options: any;
+}
+
+export interface TraversalContext {
+    parentPath: NodePath;
+    scope: Scope;
+    state: any;
+    opts: any;
+}
diff --git a/types/babel__traverse/package.json b/types/babel__traverse/package.json
new file mode 100644
index 0000000000..c2ca8a8f9b
--- /dev/null
+++ b/types/babel__traverse/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@babel/types": "^7.0.0-beta.54"
+    }
+}
diff --git a/types/babel__traverse/tsconfig.json b/types/babel__traverse/tsconfig.json
new file mode 100644
index 0000000000..898675d222
--- /dev/null
+++ b/types/babel__traverse/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,
+        "paths": {
+            "@babel/parser": [
+                "babel__parser"
+            ],
+            "@babel/traverse": [
+                "babel__traverse"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "babel__traverse-tests.ts"
+    ]
+}
diff --git a/types/babel__traverse/tslint.json b/types/babel__traverse/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/babel__traverse/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/backbone.marionette/backbone.marionette-tests.ts b/types/backbone.marionette/backbone.marionette-tests.ts
index c6400b2672..2b86849622 100644
--- a/types/backbone.marionette/backbone.marionette-tests.ts
+++ b/types/backbone.marionette/backbone.marionette-tests.ts
@@ -135,6 +135,15 @@ class MyView extends Marionette.View<MyModel> {
     }
 }
 
+class MyOtherView extends MyView {
+    private readonly foo: string;
+
+    constructor(model: MyModel) {
+        super(model);
+        this.foo = 'bar';
+    }
+}
+
 class MainRegion extends Marionette.Region {
     constructor() {
         super();
@@ -185,10 +194,20 @@ class MyHtmlElRegion extends Marionette.Region {
     }
 }
 
-class MyCollectionView extends Marionette.CollectionView<MyModel, MyView> {
+class MyCollectionView extends Marionette.CollectionView<MyModel, MyView | MyOtherView> {
     constructor() {
         super();
+
+        this.childView = (model: MyModel) => {
+            if (model.get('isFoo')) {
+                return MyView;
+            }
+
+            return MyOtherView;
+        };
+
         this.childView = MyView;
+
         this.childViewEvents = {
             render() {
                 console.log('a childView has been rendered');
@@ -282,7 +301,7 @@ function CollectionViewTests() {
     cv.collection.add(new MyModel());
     app.mainRegion.show(cv);
     cv.emptyView = MyView;
-    const view: Marionette.CollectionView<MyModel, MyView> = cv.destroy();
+    const view: Marionette.CollectionView<MyModel, MyView | MyOtherView> = cv.destroy();
 }
 
 class MyController {
diff --git a/types/backbone.marionette/index.d.ts b/types/backbone.marionette/index.d.ts
index 0b717c9bb1..bacd045ba1 100644
--- a/types/backbone.marionette/index.d.ts
+++ b/types/backbone.marionette/index.d.ts
@@ -3,7 +3,8 @@
 // Definitions by: Zeeshan Hamid <https://github.com/zhamid>,
 //                 Natan Vivo <https://github.com/nvivo>,
 //                 Sven Tschui <https://github.com/sventschui>,
-//                 Volker Nauruhn <https://github.com/razorness>
+//                 Volker Nauruhn <https://github.com/razorness>,
+//                 Ard Timmerman <https://github.com/confususs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -1157,7 +1158,7 @@ export interface CollectionViewOptions<
     /**
      * Specify a child view to use.
      */
-    childView?: (() => typeof Backbone.View) | typeof Backbone.View;
+    childView?: ((model: TModel) => typeof Backbone.View) | typeof Backbone.View;
 
     /**
      * Define options to pass to the childView constructor.
@@ -1219,7 +1220,7 @@ export class CollectionView<TModel extends Backbone.Model, TView extends View<TM
     /**
      * Specify a child view to use.
      */
-    childView: (() => { new(...args: any[]): TView }) | { new(...args: any[]): TView };
+    childView: ((model: TModel) => { new(...args: any[]): TView }) | { new(...args: any[]): TView };
 
     /**
      * Define options to pass to the childView constructor.
diff --git a/types/backbone/backbone-tests.ts b/types/backbone/backbone-tests.ts
index 7b6fad9b56..65a1463978 100644
--- a/types/backbone/backbone-tests.ts
+++ b/types/backbone/backbone-tests.ts
@@ -398,7 +398,10 @@ namespace v1Changes {
     namespace Collection {
         function test_fetch() {
             var collection = new EmployeeCollection;
-            collection.fetch({ reset: true });
+            collection.fetch({ 
+                reset: true,
+                remove: false
+            });
         }
 
         function test_create() {
diff --git a/types/backbone/index.d.ts b/types/backbone/index.d.ts
index 3d4c90d369..81bce43606 100644
--- a/types/backbone/index.d.ts
+++ b/types/backbone/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for Backbone 1.3.3
 // Project: http://backbonejs.org/
-// Definitions by: Boris Yankov <https://github.com/borisyankov>, Natan Vivo <https://github.com/nvivo>
+// Definitions by: Boris Yankov <https://github.com/borisyankov>
+//                 Natan Vivo <https://github.com/nvivo>
+//                 kenjiru <https://github.com/kenjiru>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -76,7 +78,7 @@ declare namespace Backbone {
     interface ModelDestroyOptions extends Waitable, PersistenceOptions {
     }
 
-    interface CollectionFetchOptions extends PersistenceOptions, Parseable {
+    interface CollectionFetchOptions extends PersistenceOptions, Parseable, CollectionSetOptions {
         reset?: boolean;
     }
 
diff --git a/types/barbellweights/barbellweights-tests.ts b/types/barbellweights/barbellweights-tests.ts
new file mode 100644
index 0000000000..7652728824
--- /dev/null
+++ b/types/barbellweights/barbellweights-tests.ts
@@ -0,0 +1,33 @@
+import { BarbellWeight } from "barbellweights";
+
+let calculator: BarbellWeight;
+let results: any;
+
+calculator = new BarbellWeight(200, "bench press");
+results = calculator.getResults();
+
+calculator = new BarbellWeight(500, "deadlift");
+results = calculator.getResults();
+
+calculator = new BarbellWeight(400, "squat");
+results = calculator.getResults();
+
+calculator = new BarbellWeight(400, "deadlift", { program: "QUARTER" });
+results = calculator.getResults();
+
+calculator = new BarbellWeight(400, "deadlift", { bar: 45 });
+results = calculator.getResults();
+
+calculator = new BarbellWeight(400, "deadlift", { plates: [45, 10, 5] });
+results = calculator.getResults();
+
+calculator = new BarbellWeight(400, "deadlift", { warmup_round_to: 5 });
+results = calculator.getResults();
+
+calculator = new BarbellWeight(300, "squat", {
+    program: "STARTING_STRENGTH",
+    bar: 45,
+    plates: [45, 25, 10, 5],
+    warmup_round_to: 5
+});
+results = calculator.getResults();
diff --git a/types/barbellweights/index.d.ts b/types/barbellweights/index.d.ts
new file mode 100644
index 0000000000..069f016f8e
--- /dev/null
+++ b/types/barbellweights/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for barbellweights 0.4
+// Project: https://github.com/toddhibbs/barbellweight#readme
+// Definitions by: evelijn <https://github.com/evelijn>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface options {
+    program?: string;
+    bar?: number;
+    plates?: number[];
+    warmup_round_to?: number;
+}
+
+export class BarbellWeight {
+    constructor(workingWeight: number, lift: string, options?: options);
+    getResults(): any;
+}
+
+export namespace BarbellWeight {
+    namespace BarbellWeight {
+        function getResults(): void;
+    }
+}
diff --git a/types/barbellweights/tsconfig.json b/types/barbellweights/tsconfig.json
new file mode 100644
index 0000000000..1acdbe017b
--- /dev/null
+++ b/types/barbellweights/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",
+        "barbellweights-tests.ts"
+    ]
+}
diff --git a/types/barbellweights/tslint.json b/types/barbellweights/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/barbellweights/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/bdfjs/bdfjs-tests.ts b/types/bdfjs/bdfjs-tests.ts
new file mode 100644
index 0000000000..1f20259018
--- /dev/null
+++ b/types/bdfjs/bdfjs-tests.ts
@@ -0,0 +1,18 @@
+import { parse, draw, trim, Font, Bitmap } from "bdfjs";
+
+parse(); // $ExpectError
+parse(123); // $ExpectError
+parse('abc'); // $ExpectType Font
+parse('abc', { allprops: true, onlymeta: true }); // $ExpectType Font
+const font: Font = parse(Buffer.from([1, 2, 3]));
+
+draw(); // $ExpectError
+draw(123); // $ExpectError
+draw(font); // $ExpectError
+draw(font, 123); // $ExpectError
+draw(font, 'abc', { kerningBias: 123 }); // $ExpectType Bitmap | undefined
+const bitmap: Bitmap = draw(font, 'abc')!;
+
+trim(); // $ExpectError
+trim(123); // $ExpectError
+trim(bitmap); // $ExpectType Bitmap
diff --git a/types/bdfjs/index.d.ts b/types/bdfjs/index.d.ts
new file mode 100644
index 0000000000..c9ac5eaedd
--- /dev/null
+++ b/types/bdfjs/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for bdfjs 0.0
+// Project: https://github.com/zswang/bdfjs
+// Definitions by: Olegs Jeremejevs <https://github.com/jeremejevs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+// https://www.x.org/docs/BDF/bdf.pdf
+// https://www.adobe.com/content/dam/acom/en/devnet/font/pdfs/5005.BDF_Spec.pdf
+
+export interface ParseOptions {
+  allprops?: boolean;
+  onlymeta?: boolean;
+}
+
+export interface BoundingBox {
+  width: number;
+  height: number;
+  x: number;
+  y: number;
+}
+
+export interface Glyph {
+  bitmap: number[][];
+  boundingBox: BoundingBox;
+  bytes: number[];
+  char: string;
+  code: number;
+  deviceWidthX: number;
+  deviceWidthY: number;
+  name: string;
+  scalableWidthX: number;
+  scalableWidthY: number;
+}
+
+export interface Properties {
+  defaultChar: number;
+  fontAscent: number;
+  fontDescent: number;
+
+  addStyleName?: string;
+  averageWidth?: number;
+  capHeight?: number;
+  charsetEncoding?: string;
+  charsetRegistry?: string;
+  copyright?: string;
+  faceName?: string;
+  familyName?: string;
+  font?: string;
+  fontnameRegistry?: string;
+  fontVersion?: string;
+  foundry?: string;
+  notice?: string;
+  pixelSize?: number;
+  pointSize?: number;
+  resolutionX?: number;
+  resolutionY?: number;
+  setwidthName?: string;
+  slant?: string;
+  spacing?: string;
+  weightName?: string;
+  xHeight?: number;
+
+  [key: string]: string | number | undefined;
+}
+
+export interface Size {
+  points: number;
+  resolutionX: number;
+  resolutionY: number;
+}
+
+export interface Meta {
+  boundingBox: BoundingBox;
+  name: string;
+  // The spec says that `properties` is optional, but then goes on to point out
+  // that without `defaultChar`, `fontAscent` and `fontDescent` it's not really
+  // a valid font, so I chose to not mark them as a maybe.
+  properties: Properties;
+  size: Size;
+  totalChars: number;
+  version: string;
+}
+
+export interface Font {
+  meta: Meta;
+  glyphs: { [key: number]: Glyph }; // This is NOT a list
+}
+
+export function parse(text: string | Buffer, options?: ParseOptions): Font;
+
+export interface DrawOptions {
+  kerningBias?: number;
+}
+
+export interface Bitmap {
+  width: number;
+  height: number;
+  [row: number]: number[]; // Yep, this how the library does it, unfortunately
+}
+
+export function draw(
+  font: Font,
+  text: string,
+  options?: DrawOptions
+): Bitmap | undefined;
+
+export function trim(bitmap: Bitmap): Bitmap;
diff --git a/types/bdfjs/tsconfig.json b/types/bdfjs/tsconfig.json
new file mode 100644
index 0000000000..f1fe551e09
--- /dev/null
+++ b/types/bdfjs/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",
+        "bdfjs-tests.ts"
+    ]
+}
diff --git a/types/bdfjs/tslint.json b/types/bdfjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bdfjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/bencode/bencode-tests.ts b/types/bencode/bencode-tests.ts
new file mode 100644
index 0000000000..f6ad3c8292
--- /dev/null
+++ b/types/bencode/bencode-tests.ts
@@ -0,0 +1,6 @@
+import * as bencode from "bencode";
+
+bencode.byteLength("abcde"); // $ExpectType number
+bencode.encodingLength("abcde"); // $ExpectType number
+bencode.encode([1, 2, 3, 4], new Buffer([]), 1); // $ExpectType Buffer
+bencode.decode(new Buffer("abcde"), 1, 3); // $ExpectType any
diff --git a/types/bencode/index.d.ts b/types/bencode/index.d.ts
new file mode 100644
index 0000000000..444513192c
--- /dev/null
+++ b/types/bencode/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for bencode 2.0
+// Project: https://github.com/themasch/node-bencode#readme
+// Definitions by: Tobenna <https://github.com/tobenna>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export function byteLength(value: any): number;
+export function encodingLength(value: any): number;
+export function encode(data: any, buffer?: Buffer, offset?: number): Buffer;
+export function decode(
+    data: Buffer,
+    start?: number,
+    end?: number,
+    encoding?: string
+): any;
diff --git a/types/bencode/tsconfig.json b/types/bencode/tsconfig.json
new file mode 100644
index 0000000000..47220efa5a
--- /dev/null
+++ b/types/bencode/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",
+        "bencode-tests.ts"
+    ]
+}
diff --git a/types/bencode/tslint.json b/types/bencode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bencode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/better-queue/better-queue-tests.ts b/types/better-queue/better-queue-tests.ts
new file mode 100644
index 0000000000..4a1aa4771e
--- /dev/null
+++ b/types/better-queue/better-queue-tests.ts
@@ -0,0 +1,131 @@
+import Queue = require('better-queue');
+
+interface TestTask {
+    taskId: string;
+    taskPayload: any;
+}
+
+interface TestResult {
+    some: string;
+}
+
+new Queue((task) => {
+    const test = task.anything;
+    console.log(task);
+});
+
+new Queue((task: TestTask[]) => {
+    const test = task[0].taskId;
+    console.log(task);
+});
+
+new Queue<TestTask>((task: TestTask, cb) => {
+    const id = task.taskId;
+    cb(null, 'result');
+    cb();
+}, {});
+
+new Queue<TestTask, TestResult>({
+    process(task: TestTask, cb) {
+        const id = task.taskId;
+        cb(null, { some: 'prop' });
+    },
+    filter(task, cb) {
+        const id = task.taskId;
+        cb(null, task);
+    },
+    merge(oldTask, newTask, cb) {
+        const oldId = oldTask.taskId;
+        const newId = newTask.taskId;
+        cb(null, newTask);
+    },
+    priority(task, cb) {
+        const id = task.taskId;
+        cb(null, 10);
+    },
+    precondition(cb) {
+        cb(null, true);
+    },
+    afterProcessDelay: 1000,
+    autoResume: true,
+    batchDelay: 123,
+    batchDelayTimeout: 123,
+    batchSize: 123,
+    cancelIfRunning: true,
+    concurrent: 123,
+    failTaskOnProcessException: true,
+    filo: true,
+    id: 'taskId',
+    maxRetries: 1,
+    maxTimeout: 1,
+    retryDelay: 1,
+    storeMaxRetries: 1,
+    storeRetryTimeout: 1,
+    preconditionRetryTimeout: 1,
+    store: 'test'
+});
+
+new Queue<TestTask, TestResult>({
+    process(task: TestTask[], cb) {
+        const firstId = task[0].taskId;
+        cb(null, { some: 'prop' });
+    }
+});
+
+new Queue<TestTask, TestResult>(() => { }, {
+    id(task, cb) {
+        const id = task.taskId;
+        cb(null, 'taskId');
+    }
+});
+
+new Queue<TestTask, TestResult>(() => { }, {
+    store: {
+        type: 'test'
+    }
+});
+
+const q = new Queue<TestTask, TestResult>(() => {});
+
+const testTask = {taskId: '', taskPayload: ''};
+
+q.push(testTask);
+q.push(testTask, (error, result) => {});
+
+q.cancel('id', () => {});
+
+class TestStore implements Queue.Store<TestTask> {
+    connect(cb: (error: any, length: number) => void) {
+        cb(null, 1);
+    }
+
+    getTask(taskId: any, cb: (error: any, task: TestTask) => void) {
+        cb(null, { taskId: '', taskPayload: '' });
+    }
+
+    deleteTask(taskId: any, cb: () => void) {
+        cb();
+    }
+
+    putTask(taskId: any, task: TestTask, priority: number, cb: (error: any) => void) {
+        cb(null);
+    }
+
+    takeFirstN(n: number, cb: (error: any, lockId: string) => void) {
+        cb(null, '');
+    }
+
+    takeLastN(n: number, cb: (error: any, lockId: string) => void) {
+        cb(null, '');
+    }
+
+    getLock(lockId: string, cb: (error: any, tasks: { [taskId: string]: TestTask }) => void) {
+        cb(null, {
+            id: { taskId: 'id', taskPayload: 'payload' }
+        });
+    }
+
+    releaseLock(lockId: string, cb: (error: any) => void) {
+        cb(null);
+    }
+}
diff --git a/types/better-queue/index.d.ts b/types/better-queue/index.d.ts
new file mode 100644
index 0000000000..69861c5132
--- /dev/null
+++ b/types/better-queue/index.d.ts
@@ -0,0 +1,136 @@
+// Type definitions for better-queue 3.8
+// Project: https://github.com/diamondio/better-queue
+// Definitions by: Ostap Nagovitsyn <https://github.com/maozedong>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/* =================== USAGE ===================
+    import * as Queue from "better-queue";
+    var queue = new Queue(...);
+ =============================================== */
+
+/// <reference types="node" />
+
+declare class BetterQueue<T = any, K = any> extends NodeJS.EventEmitter {
+  constructor(options: BetterQueue.QueueOptions<T, K>);
+  constructor(process: BetterQueue.ProcessFunction<T, K>, options?: Partial<BetterQueue.QueueOptions<T, K>>);
+
+  push(task: T, cb?: (err: any, result: K) => void): BetterQueue.Ticket;
+
+  cancel(taskId: any, cb?: () => void): void;
+
+  pause(): void;
+
+  resume(): void;
+
+  destroy(cb: () => void): void;
+
+  use(store: BetterQueue.Store<T>): void;
+
+  getStats(): BetterQueue.QueueStats;
+
+  resetStats(): void;
+
+  on(event: 'task_finish', listener: (taskId: any, result: K) => void): this;
+  on(event: 'task_failed', listener: (taskId: any, errorMessage: string) => void): this;
+  on(event: 'task_progress', listener: (taskId: any, completed: number, total: number) => void): this;
+  on(event: BetterQueue.QueueEvent, listener: (...args: any[]) => void): this;
+}
+
+declare namespace BetterQueue {
+  interface QueueOptions<T, K> {
+    process: ProcessFunction<T, K>;
+    filter?(task: T, cb: (error: any, task: T) => void): void;
+    merge?(oldTask: T, newTask: T, cb: (error: any, mergedTask: T) => void): void;
+    priority?(task: T, cb: (error: any, priority: number) => void): void;
+    precondition?(cb: (error: any, passOrFail: boolean) => void): void;
+    id?: keyof T | ((task: T, cb: (error: any, id: keyof T) => void) => void);
+    cancelIfRunning?: boolean;
+    autoResume?: boolean;
+    failTaskOnProcessException?: boolean;
+    filo?: boolean;
+    batchSize?: number;
+    batchDelay?: number;
+    batchDelayTimeout?: number;
+    concurrent?: number;
+    maxTimeout?: number;
+    afterProcessDelay?: number;
+    maxRetries?: number;
+    retryDelay?: number;
+    storeMaxRetries?: number;
+    storeRetryTimeout?: number;
+    preconditionRetryTimeout?: number;
+    store?: string | StoreOptions | Store<T>;
+  }
+
+  // TODO reflect task types somehow (task: T | T[])
+  type ProcessFunction<T, K> = (task: any, cb: ProcessFunctionCb<K>) => void;
+
+  type ProcessFunctionCb<K> = (error?: any, result?: K) => void;
+
+  type QueueEvent =
+    'task_queued'
+    | 'task_accepted'
+    | 'task_started'
+    | 'task_finish'
+    | 'task_failed'
+    | 'task_progress'
+    | 'batch_finish'
+    | 'batch_failed'
+    | 'batch_progress'
+    | 'error';
+
+  type TicketEvent =
+    'accept'
+    | 'queued'
+    | 'started'
+    | 'progress'
+    | 'finish'
+    | 'failed'
+    | 'error';
+
+  interface Store<T> {
+    connect(cb: (error: any, length: number) => void): void;
+
+    getTask(taskId: any, cb: (error: any, task: T) => void): void;
+
+    deleteTask(taskId: any, cb: () => void): void;
+
+    putTask(taskId: any, task: T, priority: number, cb: (error: any) => void): void;
+
+    takeFirstN(n: number, cb: (error: any, lockId: string) => void): void;
+
+    takeLastN(n: number, cb: (error: any, lockId: string) => void): void;
+
+    getLock(lockId: string, cb: (error: any, tasks: { [taskId: string]: T }) => void): void;
+
+    releaseLock(lockId: string, cb: (error: any) => void): void;
+  }
+
+  interface StoreOptions {
+    type: string;
+    // store-specific options
+    [key: string]: any;
+  }
+
+  class Ticket extends NodeJS.EventEmitter {
+    on(event: TicketEvent, listener: (...args: any[]) => void): this;
+  }
+
+  interface TickerProgress {
+    eta: string;
+    pct: number;
+    complete: number;
+    total: number;
+    message: string;
+  }
+
+  interface QueueStats {
+    total: number;
+    average: number;
+    successRate: number;
+    peak: number;
+  }
+}
+
+export = BetterQueue;
diff --git a/types/better-queue/tsconfig.json b/types/better-queue/tsconfig.json
new file mode 100644
index 0000000000..4677f6a711
--- /dev/null
+++ b/types/better-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",
+        "better-queue-tests.ts"
+    ]
+}
diff --git a/types/better-queue/tslint.json b/types/better-queue/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/better-queue/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/better-scroll/better-scroll-tests.ts b/types/better-scroll/better-scroll-tests.ts
new file mode 100644
index 0000000000..282e6185ab
--- /dev/null
+++ b/types/better-scroll/better-scroll-tests.ts
@@ -0,0 +1,68 @@
+import BScroll from 'better-scroll';
+
+const BScroll1 = new BScroll('#wrapper');
+const BScroll2 = new BScroll('#wrapper', { scrollX: false, scrollY: false });
+const BScroll3 = new BScroll('#wrapper', {
+    snap: true,
+    wheel: false,
+    scrollbar: false,
+    pullDownRefresh: false,
+});
+const BScroll4 = new BScroll('#wrapper', {
+    wheel: {
+        selectedIndex: 0,
+    },
+});
+const BScroll6 = new BScroll('#wrapper', {
+    snap: {
+        loop: false,
+        el: document.querySelector('div-test') as Element,
+        threshold: 0.1,
+        stepX: 100,
+        stepY: 100,
+        listenFlick: true,
+    },
+});
+const BScroll7 = new BScroll('#wrapper', {
+    scrollbar: {
+        fade: true,
+    },
+});
+
+const BScroll8 = new BScroll('#wrapper', {
+    pullDownRefresh: {
+        threshold: 50,
+        stop: 20,
+    },
+});
+
+BScroll1.refresh();
+BScroll1.scrollTo(0, 100);
+BScroll1.scrollTo(0, 100, 200);
+
+BScroll1.scrollToElement('selectedElement');
+BScroll1.scrollToElement('selectedElement', 250);
+
+BScroll1.scrollToElement(document.getElementById('selectedElement') as HTMLElement);
+BScroll1.scrollToElement(document.getElementById('selectedElement') as HTMLElement, 250);
+
+BScroll2.on('scrollStart', () => { console.log('scroll started'); });
+
+const BScroll9 = new BScroll(document.getElementById('wrapper') as HTMLElement);
+const BScroll10 = new BScroll(document.getElementById('wrapper') as HTMLElement, { freeScroll: true });
+const BScroll11 = new BScroll(document.getElementById('wrapper') as HTMLElement, {
+    preventDefaultException: {
+        tagName: /^(INPUT|TEXTAREA|BUTTON|SELECT)$/,
+    },
+});
+const BScroll12 = new BScroll(document.getElementById('wrapper') as HTMLElement, {
+    preventDefaultException: {
+        className: /(^|\s)test(\s|$)/,
+    },
+});
+
+const BScroll13 = new BScroll(document.getElementById('wrapper') as HTMLElement, {
+    swipeBounceTime: 1000,
+});
+
+const BScroll14 = new BScroll('#wrapper', { disableMouse: true, disableTouch: false });
diff --git a/types/better-scroll/index.d.ts b/types/better-scroll/index.d.ts
new file mode 100644
index 0000000000..326dd2c3a0
--- /dev/null
+++ b/types/better-scroll/index.d.ts
@@ -0,0 +1,238 @@
+// Type definitions for better-scroll 1.12
+// Project: https://github.com/ustbhuangyi/better-scroll
+// Definitions by: cloudstone <https://github.com/stoneChen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.2
+export interface WheelOption {
+    selectedIndex: number;
+    rotate: number;
+    adjustTime: number;
+    wheelWrapperClass: string;
+    wheelItemClass: string;
+}
+
+export interface PageOption {
+    x: number;
+    y: number;
+    pageX: number;
+    pageY: number;
+}
+
+export interface SlideOption {
+    loop: boolean;
+    el: Element;
+    threshold: number;
+    stepX: number;
+    stepY: number;
+    speed: number;
+    listenFlick: boolean;
+}
+
+export interface ScrollBarOption {
+    fade: boolean;
+}
+
+export interface PullDownOption {
+    threshold: number;
+    stop: number;
+}
+
+export interface PullUpOption {
+    threshold: number;
+}
+
+export interface BounceObjectOption {
+    top?: boolean;
+    bottom?: boolean;
+    left?: boolean;
+    right?: boolean;
+}
+
+export interface EaseOption {
+    swipe?: {
+        style: string;
+        fn: (t: number) => number;
+    };
+    swipeBounce?: {
+        style: string;
+        fn: (t: number) => number;
+    };
+    bounce?: {
+        style: string;
+        fn: (t: number) => number;
+    };
+}
+
+export interface BsOption {
+    startX: number;
+    startY: number;
+    scrollX: boolean;
+    scrollY: boolean;
+    freeScroll: boolean;
+    directionLockThreshold: number;
+    eventPassthrough: string | boolean;
+    click: boolean;
+    tap: boolean;
+    bounce: boolean | BounceObjectOption;
+    bounceTime: number;
+    momentum: boolean;
+    momentumLimitTime: number;
+    momentumLimitDistance: number;
+    swipeTime: number;
+    swipeBounceTime: number;
+    deceleration: number;
+    flickLimitTime: number;
+    flickLimitDistance: number;
+    resizePolling: number;
+    probeType: number;
+    preventDefault: boolean;
+    preventDefaultException: object;
+    HWCompositing: boolean;
+    useTransition: boolean;
+    useTransform: boolean;
+    bindToWrapper: boolean;
+    disableMouse: boolean;
+    disableTouch: boolean;
+    observeDOM: boolean;
+    autoBlur: boolean;
+    stopPropagation: boolean;
+    /**
+     * for picker
+     * wheel: {
+     *   selectedIndex: 0,
+     *   rotate: 25,
+     *   adjustTime: 400
+     * }
+     */
+    wheel: Partial<WheelOption> | boolean;
+    /**
+     * for slide
+     * snap: {
+     *   loop: boolean,
+     *   el: domEl,
+     *   threshold: 0.1,
+     *   stepX: 100,
+     *   stepY: 100,
+     *   listenFlick: true
+     * }
+     */
+    snap: Partial<SlideOption> | boolean;
+    /**
+     * for scrollbar
+     * scrollbar: {
+     *   fade: true
+     * }
+     */
+    scrollbar: Partial<ScrollBarOption> | boolean;
+    /**
+     * for pull down and refresh
+     * pullDownRefresh: {
+     *   threshold: 50,
+     *   stop: 20
+     * }
+     */
+    pullDownRefresh: Partial<PullDownOption> | boolean;
+    /**
+     * for pull up and load
+     * pullUpLoad: {
+     *   threshold: 50
+     * }
+     */
+    pullUpLoad: Partial<PullUpOption> | boolean;
+}
+
+export interface Position {
+    x: number;
+    y: number;
+}
+
+export default class BScroll {
+    constructor(element: Element | string, options?: Partial<BsOption>);
+
+    x: number;
+    y: number;
+    maxScrollX: number;
+    maxScrollY: number;
+    movingDirectionX: number;
+    movingDirectionY: number;
+    directionX: number;
+    directionY: number;
+    enabled: boolean;
+    isInTransition: boolean;
+    isAnimating: boolean;
+    options: BsOption;
+
+    refresh(): void;
+
+    enable(): void;
+
+    disable(): void;
+
+    scrollBy(x: number, y: number, time?: number, easing?: object): void;
+
+    scrollTo(x: number, y: number, time?: number, easing?: object): void;
+
+    scrollToElement(el: HTMLElement | string, time?: number, offsetX?: number | boolean, offsetY?: number | boolean, easing?: object): void;
+
+    stop(): void;
+
+    destroy(): void;
+
+    goToPage(x: number, y: number, time?: number, easing?: object): void;
+
+    next(time?: number, easing?: object): void;
+
+    prev(time?: number, easing?: object): void;
+
+    getCurrentPage(): PageOption;
+
+    wheelTo(index: number): void;
+
+    getSelectedIndex(): number;
+
+    finishPullDown(): void;
+
+    finishPullUp(): void;
+
+    on(
+        type:
+            'beforeScrollStart' |
+            'scrollStart' |
+            'scrollCancel' |
+            'beforeScrollStart' |
+            'flick' |
+            'refresh' |
+            'destroy' |
+            'pullingDown' |
+            'pullingUp',
+        fn: () => any
+    ): void;
+
+    on(
+        type:
+            'scroll' |
+            'scrollEnd' |
+            'touchEnd',
+        fn: (pos: Position) => any
+    ): void;
+
+    off(
+        type:
+            'beforeScrollStart' |
+            'scrollStart' |
+            'scroll' |
+            'scrollCancel' |
+            'beforeScrollStart' |
+            'scrollEnd' |
+            'touchEnd' |
+            'flick' |
+            'refresh' |
+            'destroy' |
+            'pullingDown' |
+            'pullingUp',
+        fn: (...args: any[]) => void
+    ): void;
+
+    trigger(type: string): void;
+}
diff --git a/types/better-scroll/tsconfig.json b/types/better-scroll/tsconfig.json
new file mode 100644
index 0000000000..26f43ee3bd
--- /dev/null
+++ b/types/better-scroll/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",
+        "better-scroll-tests.ts"
+    ]
+}
diff --git a/types/better-scroll/tslint.json b/types/better-scroll/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/better-scroll/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/bigi/bigi-tests.ts b/types/bigi/bigi-tests.ts
index 0e4822aeb6..23bffb0477 100644
--- a/types/bigi/bigi-tests.ts
+++ b/types/bigi/bigi-tests.ts
@@ -14,3 +14,6 @@ const b6 = b4.multiply(b5);
 
 console.log(b6);
 // => BigInteger { '0': 420, '1': 0, t: 1, s: 0 }
+
+console.log(b1.compareTo(b2));
+// => 70
diff --git a/types/bigi/index.d.ts b/types/bigi/index.d.ts
index 7b44ff75e4..de849587ac 100644
--- a/types/bigi/index.d.ts
+++ b/types/bigi/index.d.ts
@@ -23,7 +23,7 @@ declare class bigi {
     clamp(): void;
     clearBit(n: number): bigi;
     clone(): bigi;
-    compareTo(a: bigi): bigi;
+    compareTo(a: bigi): number;
     copyTo(r: any): void;
     dAddOffset(n: any, w: any): void;
     dMultiply(n: number): void;
diff --git a/types/bitcore-lib/bitcore-lib-tests.ts b/types/bitcore-lib/bitcore-lib-tests.ts
index fb39c85fc1..99b64e6b78 100644
--- a/types/bitcore-lib/bitcore-lib-tests.ts
+++ b/types/bitcore-lib/bitcore-lib-tests.ts
@@ -2,7 +2,8 @@ import * as bitcore from 'bitcore-lib';
 
 const transaction = new bitcore.Transaction({});
 
-const output: bitcore.Output = transaction.outputs[0];
+const output: bitcore.Transaction.Output = transaction.outputs[0];
+const input: bitcore.Transaction.Input = transaction.inputs[0];
 
 const privateKey: bitcore.PrivateKey = new bitcore.PrivateKey('privateKey');
 const publicKey: bitcore.PublicKey = privateKey.publicKey;
@@ -24,4 +25,11 @@ const tx = new bitcore.Transaction()
   .from(utxo)
   .change('bitcoinAddress')
   .addData(Buffer.from(''))
-  .sign('bitcoinAddressPrivateKey');
+  .sign('bitcoinAddressPrivateKey')
+  .enableRBF();
+
+tx.verify();
+
+new bitcore.Unit(2, 'BTC').toSatoshis();
+
+bitcore.Unit.fromMilis(1000).toBTC();
diff --git a/types/bitcore-lib/index.d.ts b/types/bitcore-lib/index.d.ts
index 0846b85c0d..d94beaca37 100644
--- a/types/bitcore-lib/index.d.ts
+++ b/types/bitcore-lib/index.d.ts
@@ -9,17 +9,30 @@
 
 export namespace crypto {
     class BN { }
+
     namespace ECDSA {
         function sign(message: Buffer, key: PrivateKey): Signature;
         function verify(hashbuf: Buffer, sig: Signature, pubkey: PublicKey, endian?: 'little'): boolean;
     }
+
     namespace Hash {
-        function sha256(buffer: Buffer): Uint8Array;
+        function sha1(buffer: Buffer): Buffer;
+        function sha256(buffer: Buffer): Buffer;
+        function sha256sha256(buffer: Buffer): Buffer;
+        function sha256ripemd160(buffer: Buffer): Buffer;
+        function sha512(buffer: Buffer): Buffer;
+        function ripemd160(buffer: Buffer): Buffer;
+
+        function sha256hmac(data: Buffer, key: Buffer): Buffer;
+        function sha512hmac(data: Buffer, key: Buffer): Buffer;
     }
+
     namespace Random {
        function getRandomBuffer(size: number): Buffer;
     }
+
     namespace Point {}
+
     class Signature {
         static fromDER(sig: Buffer): Signature;
         static fromString(data: string): Signature;
@@ -28,24 +41,6 @@ export namespace crypto {
     }
 }
 
-export class Transaction {
-    inputs: Input[];
-    outputs: Output[];
-    readonly id: string;
-    readonly hash: string;
-    nid: string;
-
-    constructor(serialized?: any);
-
-    from(utxos: Transaction.UnspentOutput[]): Transaction;
-    to(address: Address | string, amount: number): Transaction;
-    change(address: Address | string): Transaction;
-    sign(privateKey: PrivateKey | string): Transaction;
-    applySignature(sig: crypto.Signature): Transaction;
-    addData(data: Buffer): this;
-    serialize(): string;
-}
-
 export namespace Transaction {
     class UnspentOutput {
         static fromObject(o: object): UnspentOutput;
@@ -62,6 +57,62 @@ export namespace Transaction {
         toObject(): this;
         toString(): string;
     }
+
+    class Output {
+        readonly script: Script;
+        readonly satoshis: number;
+
+        constructor(data: object);
+
+        setScript(script: Script | string | Buffer): this;
+        inspect(): string;
+        toObject(): object;
+    }
+
+    class Input {
+        readonly prevTxId: Buffer;
+        readonly outputIndex: number;
+        readonly sequenceNumber: number;
+        readonly script: Script;
+        readonly output?: Output;
+    }
+}
+
+export class Transaction {
+    inputs: Transaction.Input[];
+    outputs: Transaction.Output[];
+    readonly id: string;
+    readonly hash: string;
+    nid: string;
+
+    constructor(serialized?: any);
+
+    from(utxos: Transaction.UnspentOutput[]): this;
+    to(address: Address[] | Address | string, amount: number): this;
+    change(address: Address | string): this;
+    fee(amount: number): this;
+    feePerKb(amount: number): this;
+    sign(privateKey: PrivateKey | string): this;
+    applySignature(sig: crypto.Signature): this;
+    addInput(input: Transaction.Input): this;
+    addOutput(output: Transaction.Output): this;
+    addData(value: Buffer): this;
+    lockUntilDate(time: Date | number): this;
+    lockUntilBlockHeight(height: number): this;
+
+    hasWitnesses(): boolean;
+    getFee(): number;
+    getChangeOutput(): Transaction.Output | null;
+    getLockTime(): Date | number;
+
+    verify(): string | boolean;
+    isCoinbase(): boolean;
+
+    enableRBF(): this;
+    isRBF(): boolean;
+
+    inspect(): string;
+    serialize(): string;
 }
 
 export class Block {
@@ -78,8 +129,16 @@ export class Block {
 
 export class PrivateKey {
     readonly publicKey: PublicKey;
+    readonly network: Networks.Network;
 
-    constructor(key: string);
+    toAddress(): Address;
+    toPublicKey(): PublicKey;
+    toString(): string;
+    toObject(): object;
+    toJSON(): object;
+    toWIF(): string;
+
+    constructor(key?: string, network?: Networks.Network);
 }
 
 export class PublicKey {
@@ -91,18 +150,107 @@ export class PublicKey {
     toDER(): Buffer;
 }
 
-export interface Output {
-    readonly script: any;
+export class HDPrivateKey {
+    readonly hdPublicKey: HDPublicKey;
+
+    constructor(data?: string | Buffer | object);
+
+    derive(arg: string | number, hardened?: boolean): HDPrivateKey;
+    deriveChild(arg: string | number, hardened?: boolean): HDPrivateKey;
+    deriveNonCompliantChild(arg: string | number, hardened?: boolean): HDPrivateKey;
+
+    toString(): string;
+    toObject(): object;
+    toJSON(): object;
+}
+
+export class HDPublicKey {
+    readonly xpubkey: Buffer;
+    readonly network: Networks.Network;
+    readonly depth: number;
+    readonly publicKey: PublicKey;
+    readonly fingerPrint: Buffer;
+
+    constructor(arg: string | Buffer | object);
+
+    derive(arg: string | number, hardened?: boolean): HDPublicKey;
+    deriveChild(arg: string | number, hardened?: boolean): HDPublicKey;
+
+    toString(): string;
 }
 
 export namespace Script {
     const types: {
         DATA_OUT: string;
     };
+    function buildMultisigOut(publicKeys: PublicKey[], threshold: number, opts: object): Script;
+    function buildWitnessMultisigOutFromScript(script: Script): Script;
+    function buildMultisigIn(pubkeys: PublicKey[], threshold: number, signatures: Buffer[], opts: object): Script;
+    function buildP2SHMultisigIn(pubkeys: PublicKey[], threshold: number, signatures: Buffer[], opts: object): Script;
     function buildPublicKeyHashOut(address: Address): Script;
+    function buildPublicKeyOut(pubkey: PublicKey): Script;
+    function buildDataOut(data: string | Buffer, encoding?: string): Script;
+    function buildScriptHashOut(script: Script): Script;
+    function buildPublicKeyIn(signature: crypto.Signature | Buffer, sigtype: number): Script;
+    function buildPublicKeyHashIn(publicKey: PublicKey, signature: crypto.Signature | Buffer, sigtype: number): Script;
+
+    function fromAddress(address: string | Address): Script;
+
+    function empty(): Script;
 }
 
-export class Script { }
+export class Script {
+    constructor(data: string | object);
+
+    set(obj: object): this;
+
+    toBuffer(): Buffer;
+    toASM(): string;
+    toString(): string;
+    toHex(): string;
+
+    isPublicKeyHashOut(): boolean;
+    isPublicKeyHashIn(): boolean;
+
+    getPublicKey(): Buffer;
+    getPublicKeyHash(): Buffer;
+
+    isPublicKeyOut(): boolean;
+    isPublicKeyIn(): boolean;
+
+    isScriptHashOut(): boolean;
+    isWitnessScriptHashOut(): boolean;
+    isWitnessPublicKeyHashOut(): boolean;
+    isWitnessProgram(): boolean;
+    isScriptHashIn(): boolean;
+    isMultisigOut(): boolean;
+    isMultisigIn(): boolean;
+    isDataOut(): boolean;
+
+    getData(): Buffer;
+    isPushOnly(): boolean;
+
+    classify(): string;
+    classifyInput(): string;
+    classifyOutput(): string;
+
+    isStandard(): boolean;
+
+    prepend(obj: any): this;
+    add(obj: any): this;
+
+    hasCodeseparators(): boolean;
+    removeCodeseparators(): this;
+
+    equals(script: Script): boolean;
+
+    getAddressInfo(): Address | boolean;
+    findAndDelete(script: Script): this;
+    checkMinimalPush(i: number): boolean;
+    getSignatureOperationsCount(accurate: boolean): number;
+
+    toAddress(): Address;
+}
 
 export interface Util {
     readonly buffer: {
@@ -125,6 +273,24 @@ export namespace Networks {
     function get(args: string | number | Network, keys: string | string[]): Network;
 }
 
-export class Address {}
+export class Address {
+    readonly hashBuffer: Buffer;
+    readonly network: Networks.Network;
+    readonly type: string;
 
-export class Input {}
+    constructor(data: Buffer | Uint8Array | string | object, network?: Networks.Network, type?: string);
+}
+
+export class Unit {
+    static fromBTC(amount: number): Unit;
+    static fromMilis(amount: number): Unit;
+    static fromBits(amount: number): Unit;
+    static fromSatoshis(amount: number): Unit;
+
+    constructor(amount: number, unitPreference: string);
+
+    toBTC(): number;
+    toMilis(): number;
+    toBits(): number;
+    toSatoshis(): number;
+}
diff --git a/types/bitwise/bits/and.d.ts b/types/bitwise/bits/and.d.ts
new file mode 100644
index 0000000000..52696eee01
--- /dev/null
+++ b/types/bitwise/bits/and.d.ts
@@ -0,0 +1,4 @@
+export default function and(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bits/index.d.ts b/types/bitwise/bits/index.d.ts
new file mode 100644
index 0000000000..8bc86d20af
--- /dev/null
+++ b/types/bitwise/bits/index.d.ts
@@ -0,0 +1,33 @@
+import bitsAnd from './and';
+import bitsNor from './nor';
+import bitsNot from './not';
+import bitsOr from './or';
+import bitsReduceAnd from './reduce-and';
+import bitsReduceNand from './reduce-nand';
+import bitsReduceNor from './reduce-nor';
+import bitsReduceOr from './reduce-or';
+import bitsReduceXnor from './reduce-xnor';
+import bitsReduceXor from './reduce-xor';
+import bitsToBoolean from './to-boolean';
+import bitsToString from './to-string';
+import bitsXnor from './xnor';
+import bitsXor from './xor';
+
+declare namespace bits {
+  const and: typeof bitsAnd;
+  const nor: typeof bitsNor;
+  const not: typeof bitsNot;
+  const or: typeof bitsOr;
+  const reduceAnd: typeof bitsReduceAnd;
+  const reduceNand: typeof bitsReduceNand;
+  const reduceNor: typeof bitsReduceNor;
+  const reduceOr: typeof bitsReduceOr;
+  const reduceXnor: typeof bitsReduceXnor;
+  const reduceXor: typeof bitsReduceXor;
+  const toBoolean: typeof bitsToBoolean;
+  const toString: typeof bitsToString;
+  const xnor: typeof bitsXnor;
+  const xor: typeof bitsXor;
+}
+
+export default bits;
diff --git a/types/bitwise/bits/nand.d.ts b/types/bitwise/bits/nand.d.ts
new file mode 100644
index 0000000000..53338816b8
--- /dev/null
+++ b/types/bitwise/bits/nand.d.ts
@@ -0,0 +1,4 @@
+export default function nand(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bits/nor.d.ts b/types/bitwise/bits/nor.d.ts
new file mode 100644
index 0000000000..cda86e1a7c
--- /dev/null
+++ b/types/bitwise/bits/nor.d.ts
@@ -0,0 +1,4 @@
+export default function nor(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bits/not.d.ts b/types/bitwise/bits/not.d.ts
new file mode 100644
index 0000000000..7be251c891
--- /dev/null
+++ b/types/bitwise/bits/not.d.ts
@@ -0,0 +1,4 @@
+export default function not(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bits/or.d.ts b/types/bitwise/bits/or.d.ts
new file mode 100644
index 0000000000..953a50d4c2
--- /dev/null
+++ b/types/bitwise/bits/or.d.ts
@@ -0,0 +1,4 @@
+export default function or(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bits/reduce-and.d.ts b/types/bitwise/bits/reduce-and.d.ts
new file mode 100644
index 0000000000..b45c023eb0
--- /dev/null
+++ b/types/bitwise/bits/reduce-and.d.ts
@@ -0,0 +1 @@
+export default function reduceAnd(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/bits/reduce-nand.d.ts b/types/bitwise/bits/reduce-nand.d.ts
new file mode 100644
index 0000000000..7fd8b8f6b4
--- /dev/null
+++ b/types/bitwise/bits/reduce-nand.d.ts
@@ -0,0 +1 @@
+export default function reduceNand(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/bits/reduce-nor.d.ts b/types/bitwise/bits/reduce-nor.d.ts
new file mode 100644
index 0000000000..9d8a64f729
--- /dev/null
+++ b/types/bitwise/bits/reduce-nor.d.ts
@@ -0,0 +1 @@
+export default function reduceNor(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/bits/reduce-or.d.ts b/types/bitwise/bits/reduce-or.d.ts
new file mode 100644
index 0000000000..676e4ff347
--- /dev/null
+++ b/types/bitwise/bits/reduce-or.d.ts
@@ -0,0 +1 @@
+export default function reduceOr(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/bits/reduce-xnor.d.ts b/types/bitwise/bits/reduce-xnor.d.ts
new file mode 100644
index 0000000000..be64ebaaa3
--- /dev/null
+++ b/types/bitwise/bits/reduce-xnor.d.ts
@@ -0,0 +1 @@
+export default function reduceXnor(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/bits/reduce-xor.d.ts b/types/bitwise/bits/reduce-xor.d.ts
new file mode 100644
index 0000000000..9a2107237a
--- /dev/null
+++ b/types/bitwise/bits/reduce-xor.d.ts
@@ -0,0 +1 @@
+export default function reduceXor(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/bits/to-boolean.d.ts b/types/bitwise/bits/to-boolean.d.ts
new file mode 100644
index 0000000000..50bd8f4bc8
--- /dev/null
+++ b/types/bitwise/bits/to-boolean.d.ts
@@ -0,0 +1,3 @@
+export default function toBoolean(
+  bits: ReadonlyArray<number>
+): ReadonlyArray<boolean>;
diff --git a/types/bitwise/bits/to-string.d.ts b/types/bitwise/bits/to-string.d.ts
new file mode 100644
index 0000000000..1fee89675d
--- /dev/null
+++ b/types/bitwise/bits/to-string.d.ts
@@ -0,0 +1,5 @@
+export default function toString(
+  bit: ReadonlyArray<number>,
+  spacing?: number,
+  spacer?: string
+): string;
diff --git a/types/bitwise/bits/xnor.d.ts b/types/bitwise/bits/xnor.d.ts
new file mode 100644
index 0000000000..b6e11fcdf1
--- /dev/null
+++ b/types/bitwise/bits/xnor.d.ts
@@ -0,0 +1,4 @@
+export default function xnor(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bits/xor.d.ts b/types/bitwise/bits/xor.d.ts
new file mode 100644
index 0000000000..a8b7816408
--- /dev/null
+++ b/types/bitwise/bits/xor.d.ts
@@ -0,0 +1,4 @@
+export default function xor(
+  bits1: ReadonlyArray<number>,
+  bits2: ReadonlyArray<number>
+): ReadonlyArray<number>;
diff --git a/types/bitwise/bitwise-tests.ts b/types/bitwise/bitwise-tests.ts
new file mode 100644
index 0000000000..6975cb3591
--- /dev/null
+++ b/types/bitwise/bitwise-tests.ts
@@ -0,0 +1,56 @@
+// Demonstrating cherry-picking
+import bitwise from 'bitwise';
+
+import bits from 'bitwise/bits';
+import toBoolean from 'bitwise/bits/to-boolean';
+
+import buffer from 'bitwise/buffer';
+import create from 'bitwise/buffer/create';
+
+import byte from 'bitwise/byte';
+import read from 'bitwise/byte/read';
+
+import integer from 'bitwise/integer';
+import setBit from 'bitwise/integer/set-bit';
+
+import nibble from 'bitwise/nibble';
+import nibbleRead from 'bitwise/nibble/read';
+
+import string from 'bitwise/string';
+import toBits from 'bitwise/string/to-bits';
+
+// Testing basic functions
+const testBits = [0, 1, 1, 0, 1];
+
+// $ExpectType string
+bitwise.bits.toString(testBits);
+
+// $ExpectType ReadonlyArray<boolean>
+bits.toBoolean(testBits);
+// $ExpectType ReadonlyArray<boolean>
+toBoolean(testBits);
+
+// $ExpectType ReadonlyArray<number>
+byte.read(12);
+// $ExpectType ReadonlyArray<number>
+read(12);
+
+// $ExpectType Buffer
+buffer.create(testBits);
+// $ExpectType Buffer
+create(testBits);
+
+// $ExpectType ReadonlyArray<number>
+integer.setBit(12, 1, 0);
+// $ExpectType ReadonlyArray<number>
+setBit(12, 1, 0);
+
+// $ExpectType ReadonlyArray<number>
+nibble.read(15);
+// $ExpectType ReadonlyArray<number>
+nibbleRead(15);
+
+// $ExpectType ReadonlyArray<number>
+string.toBits('10 10 12$%_.0');
+// $ExpectType ReadonlyArray<number>
+toBits('10 10 12$%_.0');
diff --git a/types/bitwise/buffer/and.d.ts b/types/bitwise/buffer/and.d.ts
new file mode 100644
index 0000000000..c4789600c3
--- /dev/null
+++ b/types/bitwise/buffer/and.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function and(
+  buffer1: Buffer,
+  buffer2: Buffer,
+  isLooping?: boolean
+): Buffer;
diff --git a/types/bitwise/buffer/create.d.ts b/types/bitwise/buffer/create.d.ts
new file mode 100644
index 0000000000..3c67301d97
--- /dev/null
+++ b/types/bitwise/buffer/create.d.ts
@@ -0,0 +1,3 @@
+/// <reference types= "node" />
+
+export default function create(bits: ReadonlyArray<number>): Buffer;
diff --git a/types/bitwise/buffer/index.d.ts b/types/bitwise/buffer/index.d.ts
new file mode 100644
index 0000000000..a109aecb73
--- /dev/null
+++ b/types/bitwise/buffer/index.d.ts
@@ -0,0 +1,31 @@
+import bufferAnd from './and';
+import bufferCreate from './create';
+import bufferModify from './modify';
+import bufferNand from './nand';
+import bufferNor from './nor';
+import bufferNot from './not';
+import bufferOr from './or';
+import bufferRead from './read';
+import bufferReadCInt from './read-c-int';
+import bufferReadInt from './read-int';
+import bufferReadUInt from './read-u-int';
+import bufferXnor from './xnor';
+import bufferXor from './xor';
+
+declare namespace buffer {
+  const and: typeof bufferAnd;
+  const create: typeof bufferCreate;
+  const modify: typeof bufferModify;
+  const nand: typeof bufferNand;
+  const nor: typeof bufferNor;
+  const not: typeof bufferNot;
+  const or: typeof bufferOr;
+  const read: typeof bufferRead;
+  const readCInt: typeof bufferReadCInt;
+  const readInt: typeof bufferReadInt;
+  const readUInt: typeof bufferReadUInt;
+  const xnor: typeof bufferXnor;
+  const xor: typeof bufferXor;
+}
+
+export default buffer;
diff --git a/types/bitwise/buffer/modify.d.ts b/types/bitwise/buffer/modify.d.ts
new file mode 100644
index 0000000000..1d242cfd79
--- /dev/null
+++ b/types/bitwise/buffer/modify.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function modify(
+  buffer: Buffer,
+  newBits: ReadonlyArray<number>,
+  bitOffset?: number
+): void;
diff --git a/types/bitwise/buffer/nand.d.ts b/types/bitwise/buffer/nand.d.ts
new file mode 100644
index 0000000000..f887d7f82a
--- /dev/null
+++ b/types/bitwise/buffer/nand.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function nand(
+  buffer1: Buffer,
+  buffer2: Buffer,
+  isLooping?: boolean
+): Buffer;
diff --git a/types/bitwise/buffer/nor.d.ts b/types/bitwise/buffer/nor.d.ts
new file mode 100644
index 0000000000..7d285abce0
--- /dev/null
+++ b/types/bitwise/buffer/nor.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function nor(
+  buffer1: Buffer,
+  buffer2: Buffer,
+  isLooping: boolean
+): Buffer;
diff --git a/types/bitwise/buffer/not.d.ts b/types/bitwise/buffer/not.d.ts
new file mode 100644
index 0000000000..8dd6e56434
--- /dev/null
+++ b/types/bitwise/buffer/not.d.ts
@@ -0,0 +1,3 @@
+/// <reference types= "node" />
+
+export default function not(buffer: Buffer): Buffer;
diff --git a/types/bitwise/buffer/or.d.ts b/types/bitwise/buffer/or.d.ts
new file mode 100644
index 0000000000..1f06097215
--- /dev/null
+++ b/types/bitwise/buffer/or.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function or(
+  buffer1: Buffer,
+  buffer2: Buffer,
+  isLooping?: boolean
+): Buffer;
diff --git a/types/bitwise/buffer/read-c-int.d.ts b/types/bitwise/buffer/read-c-int.d.ts
new file mode 100644
index 0000000000..d3d1caca3c
--- /dev/null
+++ b/types/bitwise/buffer/read-c-int.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function readCInt(
+  buffer: Buffer,
+  bitOffset?: number,
+  bitLength?: number
+): number;
diff --git a/types/bitwise/buffer/read-int.d.ts b/types/bitwise/buffer/read-int.d.ts
new file mode 100644
index 0000000000..3bb3f65a58
--- /dev/null
+++ b/types/bitwise/buffer/read-int.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function readInt(
+  buffer: Buffer,
+  bitOffset?: number,
+  bitLength?: number
+): number;
diff --git a/types/bitwise/buffer/read-u-int.d.ts b/types/bitwise/buffer/read-u-int.d.ts
new file mode 100644
index 0000000000..5e5eec4b07
--- /dev/null
+++ b/types/bitwise/buffer/read-u-int.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function readUInt(
+  buffer: Buffer,
+  bitOffset?: number,
+  bitLength?: number
+): number;
diff --git a/types/bitwise/buffer/read.d.ts b/types/bitwise/buffer/read.d.ts
new file mode 100644
index 0000000000..b5e5f18f58
--- /dev/null
+++ b/types/bitwise/buffer/read.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function read(
+	buffer: Buffer,
+	bitOffset?: number,
+	bitLength?: number
+): ReadonlyArray<number>;
diff --git a/types/bitwise/buffer/xnor.d.ts b/types/bitwise/buffer/xnor.d.ts
new file mode 100644
index 0000000000..4cfd64dc88
--- /dev/null
+++ b/types/bitwise/buffer/xnor.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function xnor(
+  buffer1: Buffer,
+  buffer2: Buffer,
+  isLooping?: boolean
+): Buffer;
diff --git a/types/bitwise/buffer/xor.d.ts b/types/bitwise/buffer/xor.d.ts
new file mode 100644
index 0000000000..61ce88f10a
--- /dev/null
+++ b/types/bitwise/buffer/xor.d.ts
@@ -0,0 +1,7 @@
+/// <reference types= "node" />
+
+export default function xor(
+  buffer1: Buffer,
+  buffer2: Buffer,
+  isLooping?: boolean
+): Buffer;
diff --git a/types/bitwise/byte/index.d.ts b/types/bitwise/byte/index.d.ts
new file mode 100644
index 0000000000..f2e3c21d42
--- /dev/null
+++ b/types/bitwise/byte/index.d.ts
@@ -0,0 +1,9 @@
+import byteRead from './read';
+import byteWrite from './write';
+
+declare namespace byte {
+  const read: typeof byteRead;
+  const write: typeof byteWrite;
+}
+
+export default byte;
diff --git a/types/bitwise/byte/read.d.ts b/types/bitwise/byte/read.d.ts
new file mode 100644
index 0000000000..10fc79106e
--- /dev/null
+++ b/types/bitwise/byte/read.d.ts
@@ -0,0 +1 @@
+export default function read(byte: number): ReadonlyArray<number>;
diff --git a/types/bitwise/byte/write.d.ts b/types/bitwise/byte/write.d.ts
new file mode 100644
index 0000000000..be485032da
--- /dev/null
+++ b/types/bitwise/byte/write.d.ts
@@ -0,0 +1 @@
+export default function write(bits: ReadonlyArray<number>): number;
diff --git a/types/bitwise/index.d.ts b/types/bitwise/index.d.ts
new file mode 100644
index 0000000000..4e1ae86896
--- /dev/null
+++ b/types/bitwise/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for bitwise 1.5
+// Project: https://github.com/dodekeract/bitwise
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import bitwiseBits from './bits';
+import bitwiseBuffer from './buffer';
+import bitwiseByte from './byte';
+import bitwiseInteger from './integer';
+import bitwiseNibble from './nibble';
+import bitwiseString from './string';
+
+declare namespace bitwise {
+  const bits: typeof bitwiseBits;
+  const buffer: typeof bitwiseBuffer;
+  const byte: typeof bitwiseByte;
+  const integer: typeof bitwiseInteger;
+  const nibble: typeof bitwiseNibble;
+  const string: typeof bitwiseString;
+}
+
+export default bitwise;
diff --git a/types/bitwise/integer/get-bit.d.ts b/types/bitwise/integer/get-bit.d.ts
new file mode 100644
index 0000000000..ced50ff35c
--- /dev/null
+++ b/types/bitwise/integer/get-bit.d.ts
@@ -0,0 +1 @@
+export default function getBit(number: number, position: number): number;
diff --git a/types/bitwise/integer/index.d.ts b/types/bitwise/integer/index.d.ts
new file mode 100644
index 0000000000..965726728b
--- /dev/null
+++ b/types/bitwise/integer/index.d.ts
@@ -0,0 +1,11 @@
+import integerGetBit from './get-bit';
+import integerSetBit from './set-bit';
+import integerToggleBit from './toggle-bit';
+
+declare namespace integer {
+  const getBit: typeof integerGetBit;
+  const setBit: typeof integerSetBit;
+  const toggleBit: typeof integerToggleBit;
+}
+
+export default integer;
diff --git a/types/bitwise/integer/set-bit.d.ts b/types/bitwise/integer/set-bit.d.ts
new file mode 100644
index 0000000000..a6524c4079
--- /dev/null
+++ b/types/bitwise/integer/set-bit.d.ts
@@ -0,0 +1,5 @@
+export default function setBit(
+  number: number,
+  position: number,
+  value: number
+): ReadonlyArray<number>;
diff --git a/types/bitwise/integer/toggle-bit.d.ts b/types/bitwise/integer/toggle-bit.d.ts
new file mode 100644
index 0000000000..a3ea04da80
--- /dev/null
+++ b/types/bitwise/integer/toggle-bit.d.ts
@@ -0,0 +1,4 @@
+export default function toggleBit(
+  number: number,
+  position: number
+): ReadonlyArray<number>;
diff --git a/types/bitwise/nibble/index.d.ts b/types/bitwise/nibble/index.d.ts
new file mode 100644
index 0000000000..a18ed9ef6f
--- /dev/null
+++ b/types/bitwise/nibble/index.d.ts
@@ -0,0 +1,9 @@
+import nibbleRead from './read';
+import nibbleWrite from './write';
+
+declare namespace nibble {
+  const read: typeof nibbleRead;
+  const write: typeof nibbleWrite;
+}
+
+export default nibble;
diff --git a/types/bitwise/nibble/read.d.ts b/types/bitwise/nibble/read.d.ts
new file mode 100644
index 0000000000..a1182a72dd
--- /dev/null
+++ b/types/bitwise/nibble/read.d.ts
@@ -0,0 +1 @@
+export default function read(nibble: number): ReadonlyArray<number>;
diff --git a/types/bitwise/nibble/write.d.ts b/types/bitwise/nibble/write.d.ts
new file mode 100644
index 0000000000..4e79f88571
--- /dev/null
+++ b/types/bitwise/nibble/write.d.ts
@@ -0,0 +1 @@
+export default function write(nibble: ReadonlyArray<number>): number;
diff --git a/types/bitwise/string/index.d.ts b/types/bitwise/string/index.d.ts
new file mode 100644
index 0000000000..9100d0050b
--- /dev/null
+++ b/types/bitwise/string/index.d.ts
@@ -0,0 +1,7 @@
+import stringToBits from './to-bits';
+
+declare namespace string {
+  const toBits: typeof stringToBits;
+}
+
+export default string;
diff --git a/types/bitwise/string/to-bits.d.ts b/types/bitwise/string/to-bits.d.ts
new file mode 100644
index 0000000000..4930f10f79
--- /dev/null
+++ b/types/bitwise/string/to-bits.d.ts
@@ -0,0 +1 @@
+export default function toBits(string: string): ReadonlyArray<number>;
diff --git a/types/bitwise/tsconfig.json b/types/bitwise/tsconfig.json
new file mode 100644
index 0000000000..9956f50c76
--- /dev/null
+++ b/types/bitwise/tsconfig.json
@@ -0,0 +1,60 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "bitwise-tests.ts",
+    "bits/and.d.ts",
+    "bits/index.d.ts",
+    "bits/nand.d.ts",
+    "bits/nor.d.ts",
+    "bits/not.d.ts",
+    "bits/or.d.ts",
+    "bits/reduce-and.d.ts",
+    "bits/reduce-nand.d.ts",
+    "bits/reduce-nor.d.ts",
+    "bits/reduce-or.d.ts",
+    "bits/reduce-xnor.d.ts",
+    "bits/reduce-xor.d.ts",
+    "bits/to-boolean.d.ts",
+    "bits/to-string.d.ts",
+    "bits/xnor.d.ts",
+    "bits/xor.d.ts",
+    "buffer/and.d.ts",
+    "buffer/create.d.ts",
+    "buffer/modify.d.ts",
+    "buffer/nand.d.ts",
+    "buffer/nor.d.ts",
+    "buffer/not.d.ts",
+    "buffer/or.d.ts",
+    "buffer/read-c-int.d.ts",
+    "buffer/read-int.d.ts",
+    "buffer/read-u-int.d.ts",
+    "buffer/read.d.ts",
+    "buffer/xnor.d.ts",
+    "buffer/xor.d.ts",
+    "byte/index.d.ts",
+    "byte/read.d.ts",
+    "byte/write.d.ts",
+    "integer/get-bit.d.ts",
+    "integer/index.d.ts",
+    "integer/set-bit.d.ts",
+    "integer/toggle-bit.d.ts",
+    "nibble/index.d.ts",
+    "nibble/read.d.ts",
+    "nibble/write.d.ts",
+    "string/index.d.ts",
+    "string/to-bits.d.ts"
+  ]
+}
diff --git a/types/bitwise/tslint.json b/types/bitwise/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/bitwise/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/blazy/blazy-tests.ts b/types/blazy/blazy-tests.ts
index 835b0e6472..e3aedaabd4 100644
--- a/types/blazy/blazy-tests.ts
+++ b/types/blazy/blazy-tests.ts
@@ -38,7 +38,7 @@ var tester: BlazyInstance = new Blazy({
 /* Functions tests */
 tester.revalidate();
 
-var elements = <NodeList>document.getElementsByTagName('img');
+var elements = document.getElementsByTagName('img');
 tester.load(elements, true);
 
 tester.destroy();
diff --git a/types/blazy/index.d.ts b/types/blazy/index.d.ts
index 8a7183366d..661f651c0b 100644
--- a/types/blazy/index.d.ts
+++ b/types/blazy/index.d.ts
@@ -53,7 +53,7 @@ interface BlazyInstance {
    * Forces the given element(s) to load if not collapsed. If you also want to load a collapsed/hidden elements you can add true as the second parameter.
    * You can pass a single element or a list of elements. Tested with getElementById, getElementsByClassName, querySelectorAll, querySelector and jQuery selector.
    */
-  load(elements: Element|Element[]|HTMLElement|HTMLElement[]|NodeList, force: boolean): void;
+  load(elements: Element|Element[]|HTMLElement|HTMLElement[]|HTMLCollection|NodeList, force: boolean): void;
 
   /**
    * Unbind events and resets image array.
diff --git a/types/blockies/index.d.ts b/types/blockies/index.d.ts
index f2de8b2c53..2a8cc526ad 100644
--- a/types/blockies/index.d.ts
+++ b/types/blockies/index.d.ts
@@ -3,12 +3,16 @@
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface BlockiesIcon {
-    toDataURL(): string;
-}
-interface BlockiesConfig {
-    seed: string;
-}
-declare function blockies(config: BlockiesConfig): BlockiesIcon;
-
+declare function blockies(config?: blockies.BlockiesConfig): HTMLCanvasElement;
 export = blockies;
+
+declare namespace blockies {
+    interface BlockiesConfig {
+        size?: number;
+        scale?: number;
+        seed?: string;
+        color?: string;
+        bgcolor?: string;
+        spotcolor?: string;
+    }
+}
diff --git a/types/blockies/tsconfig.json b/types/blockies/tsconfig.json
index f190f0b0c9..db5851dcbb 100644
--- a/types/blockies/tsconfig.json
+++ b/types/blockies/tsconfig.json
@@ -1,7 +1,10 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": ["es6"],
+        "lib": [
+            "es6",
+            "dom"
+        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictFunctionTypes": true,
diff --git a/types/bloem/bloem-tests.ts b/types/bloem/bloem-tests.ts
new file mode 100644
index 0000000000..bcebbecebb
--- /dev/null
+++ b/types/bloem/bloem-tests.ts
@@ -0,0 +1,15 @@
+import bloem = require('bloem');
+
+const base = new bloem.Bloem(1, 2, Buffer.from('1', 'hex'));
+const safe = new bloem.SafeBloem(1, 2, Buffer.from('2', 'hex'));
+const scaling = new bloem.ScalingBloem(1,
+  {ratio: 1, initial_capacity: 2, scaling: 3}
+);
+
+// options are optional
+const scaling2 = new bloem.ScalingBloem(1);
+
+// $ExpectType number
+bloem.calculateSize(1, 2);
+// $ExpectType number
+bloem.calculateSlices(1, 2);
diff --git a/types/bloem/index.d.ts b/types/bloem/index.d.ts
new file mode 100644
index 0000000000..bcf6b35820
--- /dev/null
+++ b/types/bloem/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for bloem 0.2
+// Project: https://github.com/wiedi/node-bloem
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types= "node" />
+
+export function calculateSize(capacity: number, error_rate: number): number;
+export function calculateSlices(size: number, capacity: number): number;
+
+export class Bloem {
+  constructor(size: number, slices: number, buffer: Buffer);
+
+  has(key: Buffer): boolean;
+  add(key: Buffer): void;
+}
+
+export class SafeBloem {
+  constructor(capacity: number, error_rate: number, buffer: Buffer);
+
+  has(key: Buffer): boolean;
+  add(key: Buffer): boolean;
+}
+
+export class ScalingBloem {
+  constructor(
+    error_rate: number,
+    options?: {
+      ratio?: number;
+      initial_capacity?: number;
+      scaling?: number;
+    }
+  );
+
+  has(key: Buffer): boolean;
+  add(key: Buffer): void;
+}
diff --git a/types/bloem/tsconfig.json b/types/bloem/tsconfig.json
new file mode 100644
index 0000000000..f5ecad97bd
--- /dev/null
+++ b/types/bloem/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",
+    "bloem-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/bloem/tslint.json b/types/bloem/tslint.json
new file mode 100644
index 0000000000..6fafe521cb
--- /dev/null
+++ b/types/bloem/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+  }
diff --git a/types/bloomfilter/bloomfilter-tests.ts b/types/bloomfilter/bloomfilter-tests.ts
index 96ee0443b6..05f6c5210a 100644
--- a/types/bloomfilter/bloomfilter-tests.ts
+++ b/types/bloomfilter/bloomfilter-tests.ts
@@ -4,8 +4,14 @@ function test_bloomfilter() {
     const k = 2;
 
     const bloomFilter = new BloomFilter(m, k);
-    const array: Int32Array[] = bloomFilter.buckets;
+    const array: Int32Array = bloomFilter.buckets;
     const length: number = bloomFilter.buckets.length;
     bloomFilter.add('someString');
     const test: boolean = bloomFilter.test('someString');
+
+    const buckets: Int32Array = bloomFilter.buckets;
+    const bloom2 = new BloomFilter(buckets, k);
+
+    const a: Int32Array = new Int32Array(16);
+    a[3];
 }
diff --git a/types/bloomfilter/index.d.ts b/types/bloomfilter/index.d.ts
index 00ed408c6d..980a96be55 100644
--- a/types/bloomfilter/index.d.ts
+++ b/types/bloomfilter/index.d.ts
@@ -1,14 +1,29 @@
-// Type definitions for BloomFilter 0.1
+// Type definitions for BloomFilter 0.0
 // Project: https://github.com/jasondavies/bloomfilter.js
 // Definitions by: slawiko <https://github.com/slawiko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export class BloomFilter {
-    buckets: Int32Array[];
+    buckets: Int32Array;
 
-    constructor(m: number, k: number);
+    /**
+     * Create a new empty bloom filter of size m with hashes k or
+     * provide buckets as a number[] or Int32Array to deserialize a bloom filter
+     * @param mOrBucketsArray number of bits (will be rounded up to nearest 32), or buckets
+     * to deserialize into a filled bloomfilter
+     * @param k number of hashes
+     */
+    constructor(m: number | number[] | Int32Array, k: number);
 
+    /**
+     * Add a value to a bloom filter
+     * @param value
+     */
     add(value: any): void;
 
+    /**
+     * Test whether a value exists in a bloom filter. (False positives are
+     * possible, false negatives are not.)
+     */
     test(value: any): boolean;
 }
diff --git a/types/blue-tape/blue-tape-tests.ts b/types/blue-tape/blue-tape-tests.ts
index c34bc6e32c..526142158b 100644
--- a/types/blue-tape/blue-tape-tests.ts
+++ b/types/blue-tape/blue-tape-tests.ts
@@ -1,5 +1,3 @@
-/// <reference types="bluebird" />
-
 import tape = require('blue-tape');
 import P = require('bluebird');
 
diff --git a/types/blue-tape/index.d.ts b/types/blue-tape/index.d.ts
index c2d2d50ab5..b086124695 100644
--- a/types/blue-tape/index.d.ts
+++ b/types/blue-tape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/spion/blue-tape
 // Definitions by: Haoqun Jiang <https://github.com/sodatea>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/bluebird-global/bluebird-global-tests.ts b/types/bluebird-global/bluebird-global-tests.ts
index 0464b188cd..3928ba46c9 100644
--- a/types/bluebird-global/bluebird-global-tests.ts
+++ b/types/bluebird-global/bluebird-global-tests.ts
@@ -40,3 +40,15 @@ function testPromiseRejection() {
             return value.toUpperCase();
         });
 }
+
+function testGithubTicket28081Regression() {
+    Promise.resolve([3]).map((n: number) => true);
+}
+
+import Bluebird = require("bluebird");
+
+function testTheWalkaroundForCastingGlobalPromiseToBluebirdPromise() {
+    const bluebirdString: Bluebird<string> = Bluebird.resolve(
+        new Promise<string>(() => 'Lorem ipsum')
+    );
+}
diff --git a/types/bluebird-global/index.d.ts b/types/bluebird-global/index.d.ts
index 6b22cb7114..c82f91fc30 100644
--- a/types/bluebird-global/index.d.ts
+++ b/types/bluebird-global/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/petkaantonov/bluebird
 // Definitions by: d-ph <https://github.com/d-ph>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /*
  * 1. Why use `bluebird-global` instead of `bluebird`?
@@ -10,6 +10,45 @@
  * If you want to leverage the fact, that bluebird polyfills the global Promise in the browser, then
  * you need to tell TypeScript about this. The following declaration file does exactly that.
  *
+ * 1.1. Why you might not want to use `bluebird-global` instead of `bluebird`.
+ *
+ * Because of how these typings tell TypeScript about bluebird's Promise methods, it is not
+ * possible to cast global Promises to Bluebird promises in your code. In other words, you won't
+ * be able to do the following (even though it's possible at the runtime):
+ *
+ *   let bluebirdPromise: Bluebird<string> = new Promise<string>(() => { return 'Lorem ipsum'; });
+ *
+ * If you need to, you can walk-around this by constructing a new Bluebird promise over an instance
+ * of the global Promise, like so:
+ *
+ *   let bluebirdPromise: Bluebird<string> = Bluebird.resolve(
+ *     new Promise<string>(() => { return 'Lorem ipsum'; })
+ *   );
+ *
+ * So the bottom line is: if you use these typings, then be mindful when you try to mix the global
+ * Promises with the Bluebird promises. You can avoid this problem by just settling on using either
+ * of them and not both of them at the same time.
+ *
+ * 1.2. Further limitations of `bluebird-global` typings: the return type of Bluebird's methods.
+ *
+ * Due to the fact of how bluebird-specific methods are exposed on the global Promise, the
+ * return type of those methods is Bluebird<T> instead of Promise<T>. This is relevant in the
+ * following case:
+ *
+ *   function createDelayedPromise(): Promise<void> {
+ *     return Promise.delay(250);
+ *   }
+ *
+ * Since Promise.delay() returns a Bluebird<void> and the function is typed to return a Promise<void>,
+ * an implicit cast is performed from Bluebird<void> to Promise<void>. And since an instance
+ * of Bluebird isn't and instance of Promise (due to how `bluebird-global` works), this implicit
+ * cast fails to compile. In order to walk-around this problem, the following explicit cast should
+ * be used:
+ *
+ *   function createDelayedPromise(): Promise<void> {
+ *     return <Promise<void>> Promise.delay(250);
+ *   }
+ *
  * 2. How to use it?
  *
  * It should just work, but there are a couple of points to be wary about:
@@ -60,6 +99,17 @@
  *   d. target es6, latest "es20xx", e.g. "es2017"
  */
 
+/*
+ * @todo When dropping TS 2.x support, uncomment the following triple-slash directives and
+ * remove the copy&paste from this file (marked with #std-lib-copy&paste-to-remove)
+ *
+ * TS 2.x support should be dropped once bluebird's typings stop compiling on 2.x (i.e.
+ * once bluebird's typings stop supporting TS 2.x)
+ */
+/* /// <reference lib="es5" /> */
+/* /// <reference lib="es2015.promise" /> */
+/* /// <reference lib="es2018.promise" /> */
+
 import Bluebird = require("bluebird");
 
 declare global {
@@ -67,67 +117,66 @@ declare global {
      * Patch all instance method
      */
     interface Promise<T> {
-        all: typeof Bluebird.prototype.all;
-        any: typeof Bluebird.prototype.any;
-        asCallback: typeof Bluebird.prototype.asCallback;
-        bind: typeof Bluebird.prototype.bind;
-        call: typeof Bluebird.prototype.call;
-        cancel: typeof Bluebird.prototype.cancel;
-        // catch: typeof Bluebird.prototype.catch;
-        caught: typeof Bluebird.prototype.caught;
-        delay: typeof Bluebird.prototype.delay;
-        disposer: typeof Bluebird.prototype.disposer;
-        done: typeof Bluebird.prototype.done;
-        each: typeof Bluebird.prototype.each;
-        error: typeof Bluebird.prototype.error;
-        filter: typeof Bluebird.prototype.filter;
-        // finally: typeof Bluebird.prototype.finally;
-        get: typeof Bluebird.prototype.get;
-        isCancelled: typeof Bluebird.prototype.isCancelled;
-        isFulfilled: typeof Bluebird.prototype.isFulfilled;
-        isPending: typeof Bluebird.prototype.isPending;
-        isRejected: typeof Bluebird.prototype.isRejected;
-        isResolved: typeof Bluebird.prototype.isResolved;
-        lastly: typeof Bluebird.prototype.lastly;
-        map: typeof Bluebird.prototype.map;
-        mapSeries: typeof Bluebird.prototype.mapSeries;
-        nodeify: typeof Bluebird.prototype.nodeify;
-        props: typeof Bluebird.prototype.props;
-        race: typeof Bluebird.prototype.race;
-        reason: typeof Bluebird.prototype.reason;
-        reduce: typeof Bluebird.prototype.reduce;
-        reflect: typeof Bluebird.prototype.reflect;
-        return: typeof Bluebird.prototype.return;
-        some: typeof Bluebird.prototype.some;
-        spread: typeof Bluebird.prototype.spread;
-        suppressUnhandledRejections: typeof Bluebird.prototype.suppressUnhandledRejections;
-        tap: typeof Bluebird.prototype.tap;
-        tapCatch: typeof Bluebird.prototype.tapCatch;
-        // then: typeof Bluebird.prototype.then;
-        thenReturn: typeof Bluebird.prototype.thenReturn;
-        thenThrow: typeof Bluebird.prototype.thenThrow;
-        catchReturn: typeof Bluebird.prototype.catchReturn;
-        catchThrow: typeof Bluebird.prototype.catchThrow;
-        throw: typeof Bluebird.prototype.throw;
-        timeout: typeof Bluebird.prototype.timeout;
-        toJSON: typeof Bluebird.prototype.toJSON;
-        toString: typeof Bluebird.prototype.toString;
-        value: typeof Bluebird.prototype.value;
+        all: Bluebird<T>["all"];
+        any: Bluebird<T>["any"];
+        asCallback: Bluebird<T>["asCallback"];
+        bind: Bluebird<T>["bind"];
+        call: Bluebird<T>["call"];
+        cancel: Bluebird<T>["cancel"];
+        // catch: Bluebird<T>["catch"]; // Provided by lib.es5.d.ts
+        caught: Bluebird<T>["caught"];
+        delay: Bluebird<T>["delay"];
+        disposer: Bluebird<T>["disposer"];
+        done: Bluebird<T>["done"];
+        each: Bluebird<T>["each"];
+        error: Bluebird<T>["error"];
+        filter: Bluebird<T>["filter"];
+        // finally: Bluebird<T>["finally"]; // Provided by lib.es2018.promise.d.ts
+        get: Bluebird<T>["get"];
+        isCancelled: Bluebird<T>["isCancelled"];
+        isFulfilled: Bluebird<T>["isFulfilled"];
+        isPending: Bluebird<T>["isPending"];
+        isRejected: Bluebird<T>["isRejected"];
+        isResolved: Bluebird<T>["isResolved"];
+        lastly: Bluebird<T>["lastly"];
+        map: Bluebird<T>["map"];
+        mapSeries: Bluebird<T>["mapSeries"];
+        nodeify: Bluebird<T>["nodeify"];
+        props: Bluebird<T>["props"];
+        race: Bluebird<T>["race"];
+        reason: Bluebird<T>["reason"];
+        reduce: Bluebird<T>["reduce"];
+        reflect: Bluebird<T>["reflect"];
+        return: Bluebird<T>["return"];
+        some: Bluebird<T>["some"];
+        spread: Bluebird<T>["spread"];
+        suppressUnhandledRejections: Bluebird<T>["suppressUnhandledRejections"];
+        tap: Bluebird<T>["tap"];
+        tapCatch: Bluebird<T>["tapCatch"];
+        // then: Bluebird<T>["then"]; // Provided by lib.es5.d.ts
+        thenReturn: Bluebird<T>["thenReturn"];
+        thenThrow: Bluebird<T>["thenThrow"];
+        catchReturn: Bluebird<T>["catchReturn"];
+        catchThrow: Bluebird<T>["catchThrow"];
+        throw: Bluebird<T>["throw"];
+        timeout: Bluebird<T>["timeout"];
+        toJSON: Bluebird<T>["toJSON"];
+        toString: Bluebird<T>["toString"];
+        value: Bluebird<T>["value"];
 
         /*
-         * Copy&paste ::then and ::catch from lib.es2015.promise.d.ts, because Bluebird's typings are not
+         * Copy&paste ::then and ::catch from lib.es5.promise.d.ts, because Bluebird's typings are not
          * in line with the standard lib.
          *
-         * This is only needed for es5 target, which doesn't include the lib.es2015.promise.d.ts typings.
+         * #std-lib-copy&paste-to-remove
          *
-         * @todo Make Bluebird's typings be in line with the standard lib.
+         * @todo See the comment near the top of the file about code marked with #std-lib-copy&paste-to-remove
          */
-        then(onfulfilled?: ((value: T) => T | PromiseLike<T>) | undefined | null, onrejected?: ((reason: any) => T | PromiseLike<T>) | undefined | null): Promise<T>;
-        then<TResult>(onfulfilled: ((value: T) => T | PromiseLike<T>) | undefined | null, onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<T | TResult>;
-        then<TResult>(onfulfilled: (value: T) => TResult | PromiseLike<TResult>, onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<TResult>;
-        then<TResult1, TResult2>(onfulfilled: (value: T) => TResult1 | PromiseLike<TResult1>, onrejected: (reason: any) => TResult2 | PromiseLike<TResult2>): Promise<TResult1 | TResult2>;
-        catch(onrejected?: ((reason: any) => T | PromiseLike<T>) | undefined | null): Promise<T>;
-        catch<TResult>(onrejected: (reason: any) => TResult | PromiseLike<TResult>): Promise<T | TResult>;
+        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>;
 
         /*
          * TypeScript disallows adding overrides via `catch: typeof Bluebird.prototype.catch`. Copy&paste them then.
@@ -142,7 +191,11 @@ declare global {
         catch<U>(predicate: Object, onReject: (error: any) => U | PromiseLike<U>): Bluebird<U | T>;
 
         /*
-         * See comments above `then` for the reason why this is needed. Taken from esnext.promise.d.ts.
+         * See comments above `then` for the reason why this is needed. Taken from es2018.promise.d.ts.
+         *
+         * #std-lib-copy&paste-to-remove
+         *
+         * @todo See the comment near the top of the file about code marked with #std-lib-copy&paste-to-remove
          */
         finally(onfinally?: (() => void) | undefined | null): Promise<T>;
     }
@@ -153,7 +206,7 @@ declare global {
     interface PromiseConstructor {
         new <T>(callback: (resolve: (thenableOrResult?: T | PromiseLike<T>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void): Promise<T>;
 
-        // all: typeof Bluebird.all;
+        // all: typeof Bluebird.all; // Provided by lib.es2015.d.ts
         any: typeof Bluebird.any;
         attempt: typeof Bluebird.attempt;
         bind: typeof Bluebird.bind;
@@ -176,10 +229,10 @@ declare global {
         promisify: typeof Bluebird.promisify;
         promisifyAll: typeof Bluebird.promisifyAll;
         props: typeof Bluebird.props;
-        // race: typeof Bluebird.race;
+        // race: typeof Bluebird.race; // Provided by lib.es2015.d.ts
         reduce: typeof Bluebird.reduce;
-        // reject: typeof Bluebird.reject;
-        // resolve: typeof Bluebird.resolve;
+        // reject: typeof Bluebird.reject; // Provided by lib.es2015.d.ts
+        // resolve: typeof Bluebird.resolve; // Provided by lib.es2015.d.ts
         some: typeof Bluebird.some;
         try: typeof Bluebird.try;
         using: typeof Bluebird.using;
@@ -187,9 +240,9 @@ declare global {
         /*
          * Copy&paste from lib.es2015.promise.d.ts, because Bluebird's typings are not in line with the standard lib.
          *
-         * This is only needed for es5 target, which doesn't include the lib.es2015.promise.d.ts typings.
+         * #std-lib-copy&paste-to-remove
          *
-         * @todo Make Bluebird's typings be in line with the standard lib.
+         * @todo See the comment near the top of the file about code marked with #std-lib-copy&paste-to-remove
          */
         all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>, T10 | PromiseLike<T10>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
         all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(values: [T1 | PromiseLike<T1>, T2 | PromiseLike<T2>, T3 | PromiseLike<T3>, T4 | PromiseLike <T4>, T5 | PromiseLike<T5>, T6 | PromiseLike<T6>, T7 | PromiseLike<T7>, T8 | PromiseLike<T8>, T9 | PromiseLike<T9>]): Promise<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
@@ -219,6 +272,10 @@ declare global {
 
     /*
      * Declare the `Promise` variable. This is needed for es5 only and is a no-op for all other targets.
+     *
+     * #std-lib-copy&paste-to-remove
+     *
+     * @todo See the comment near the top of the file about code marked with #std-lib-copy&paste-to-remove
      */
     var Promise: PromiseConstructor;
 }
diff --git a/types/bluebird-global/test/jquery-tests.ts b/types/bluebird-global/test/jquery-tests.ts
new file mode 100644
index 0000000000..c4c98fadfc
--- /dev/null
+++ b/types/bluebird-global/test/jquery-tests.ts
@@ -0,0 +1,4 @@
+/// <reference types="jquery" />
+
+// Pulls in bluebird-global to test compatibility.
+// Fixes https://github.com/DefinitelyTyped/DefinitelyTyped/issues/26328.
diff --git a/types/bluebird-global/tsconfig.json b/types/bluebird-global/tsconfig.json
index d037429e0d..aa19fd3cda 100644
--- a/types/bluebird-global/tsconfig.json
+++ b/types/bluebird-global/tsconfig.json
@@ -19,6 +19,7 @@
     },
     "files": [
         "index.d.ts",
-        "bluebird-global-tests.ts"
+        "bluebird-global-tests.ts",
+        "test/jquery-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/bluebird-retry/index.d.ts b/types/bluebird-retry/index.d.ts
index b7ba96495d..7192ff90a3 100644
--- a/types/bluebird-retry/index.d.ts
+++ b/types/bluebird-retry/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 
 import Promise = require('bluebird');
 
diff --git a/types/bluebird/bluebird-tests.ts b/types/bluebird/bluebird-tests.ts
index c9c09221e8..05ac5cc19c 100644
--- a/types/bluebird/bluebird-tests.ts
+++ b/types/bluebird/bluebird-tests.ts
@@ -7,13 +7,13 @@
 
 import Promise = require("bluebird");
 
-let obj: object;
-let bool: boolean;
-let num: number;
-let str: string;
-let err: Error;
-let x: any;
-let f: (...args: any[]) => any;
+let obj: object = {};
+let bool = false;
+let num = 0;
+let str = '';
+let err: Error = new Error();
+let x: any = 0;
+let f: (...args: any[]) => any = () => {};
 let asyncfunc: (...args: any[]) => Promise<any>;
 let arr: any[];
 let exp: RegExp;
@@ -25,7 +25,6 @@ let numArr: number[];
 
 let value: any;
 let reason: any;
-let insanity: any;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -36,7 +35,10 @@ interface Bar {
 	bar(): string;
 }
 interface Baz {
-  baz(): string;
+  	baz(): string;
+}
+interface Qux {
+	qux: string;
 }
 
 // - - - - - - - - - - - - - - - - -
@@ -61,11 +63,12 @@ interface StrBarArrMap {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-let foo: Foo;
-let bar: Bar;
-let baz: Baz;
+let foo: Foo = { foo() { return 'foo'; } };
+let bar: Bar = { bar() { return 'bar'; } };
+let baz: Baz = { baz() { return 'baz'; } };
+let qux: Qux = { qux: 'quix' };
 
-let fooArr: Foo[];
+let fooArr: Foo[] = [foo];
 let barArr: Bar[];
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -74,13 +77,14 @@ let numProm: Promise<number>;
 let strProm: Promise<string>;
 let anyProm: Promise<any>;
 let boolProm: Promise<boolean>;
-let objProm: Promise<object>;
+let objProm: Promise<object> = Promise.resolve(obj);
 let voidProm: Promise<void>;
 
-let fooProm: Promise<Foo>;
-let barProm: Promise<Bar>;
+let fooProm: Promise<Foo> = Promise.resolve(foo);
+let barProm: Promise<Bar> = Promise.resolve(bar);
 let fooOrBarProm: Promise<Foo | Bar>;
-let bazProm: Promise<Baz>;
+let bazProm: Promise<Baz> = Promise.resolve(baz);
+let quxProm: Promise<Qux> = Promise.resolve(qux);
 
 // - - - - - - - - - - - - - - - - -
 
@@ -91,8 +95,8 @@ let boolThen: PromiseLike<boolean>;
 let objThen: PromiseLike<object>;
 let voidThen: PromiseLike<void>;
 
-let fooThen: PromiseLike<Foo>;
-let barThen: PromiseLike<Bar>;
+let fooThen: PromiseLike<Foo> = fooProm;
+let barThen: PromiseLike<Bar> = barProm;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -100,7 +104,7 @@ let numArrProm: Promise<number[]>;
 let strArrProm: Promise<string[]>;
 let anyArrProm: Promise<any[]>;
 
-let fooArrProm: Promise<Foo[]>;
+let fooArrProm: Promise<Foo[]> = Promise.resolve(fooArr);
 let barArrProm: Promise<Bar[]>;
 
 // - - - - - - - - - - - - - - - - -
@@ -109,7 +113,7 @@ let numArrThen: PromiseLike<number[]>;
 let strArrThen: PromiseLike<string[]>;
 let anyArrThen: PromiseLike<any[]>;
 
-let fooArrThen: PromiseLike<Foo[]>;
+let fooArrThen: PromiseLike<Foo[]> = fooArrProm;
 let barArrThen: PromiseLike<Bar[]>;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -127,23 +131,19 @@ let numThenArr: Array<PromiseLike<number>>;
 let strThenArr: Array<PromiseLike<string>>;
 let anyThenArr: Array<PromiseLike<any>>;
 
-let fooThenArr: Array<PromiseLike<Foo>>;
+let fooThenArr: Array<PromiseLike<Foo>> = [fooThen];
 let barThenArr: Array<PromiseLike<Bar>>;
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 // booya!
-let fooThenArrThen: PromiseLike<Array<PromiseLike<Foo>>>;
-let barThenArrThen: PromiseLike<Array<PromiseLike<Bar>>>;
+let fooThenArrThen: PromiseLike<Array<PromiseLike<Foo>>> = Promise.resolve(fooThenArr);
 
 let fooResolver: Promise.Resolver<Foo>;
-let barResolver: Promise.Resolver<Bar>;
-
 let fooInspection: Promise.Inspection<Foo>;
 let fooInspectionPromise: Promise<Promise.Inspection<Foo>>;
 
 let fooInspectionArrProm: Promise<Array<Promise.Inspection<Foo>>>;
-let barInspectionArrProm: Promise<Array<Promise.Inspection<Bar>>>;
 
 let BlueBird: typeof Promise;
 
@@ -192,19 +192,16 @@ fooProm = new Promise<Foo>((resolve) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-fooResolver.resolve(foo);
+fooInspectionPromise = fooProm.reflect();
 
-fooResolver.reject(err);
-
-fooResolver.callback = (err: any, value: Foo) => {};
-
-// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
-bool = fooInspection.isFulfilled();
-bool = fooInspection.isRejected();
-bool = fooInspection.isPending();
-foo = fooInspection.value();
-x = fooInspection.reason();
+fooInspectionPromise.then(value => {
+	fooInspection = value;
+	bool = fooInspection.isFulfilled();
+	bool = fooInspection.isRejected();
+	bool = fooInspection.isPending();
+	foo = fooInspection.value();
+	x = fooInspection.reason();
+});
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -235,8 +232,7 @@ barProm = fooProm.then((value: Foo) => {
 });
 barProm = barProm.then((value: Bar) => {
 	if (value) return value;
-	let b: Bar;
-	return Promise.resolve(b);
+	return Promise.resolve(bar);
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -554,10 +550,13 @@ bool = fooProm.isResolved();
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-anyProm = fooProm.call("foo");
-anyProm = fooProm.call("foo", 1, 2, 3);
+strProm = fooProm.call("foo");
+strProm = fooProm.call("foo", 1, 2, 3);
 
-voidProm = fooProm.get("foo").then((method) => { str = method(); });
+// $ExpectType Bluebird<never>
+quxProm.call("qux");
+
+strProm = fooProm.get("foo").then(method => method());
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -590,25 +589,37 @@ obj = fooProm.toJSON();
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barProm = fooArrProm.spread<Bar>((one: Foo, two: Bar, twotwo: Foo) => {
+barProm = fooArrProm.spread((one: Foo, two: Foo, twotwo: Foo) => {
 	return bar;
 });
 
 // - - - - - - - - - - - - - - - - -
 
-barProm = fooArrProm.spread<Bar>((one: Foo, two: Bar, twotwo: Foo) => {
+barProm = fooArrProm.spread((one: Foo, two: Foo, twotwo: Foo) => {
 	return barThen;
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-// TODO fix collection inference
+fooArrProm = fooArrProm.all();
 
-barArrProm = fooProm.all<Bar>();
-fooInspectionPromise = fooProm.reflect();
-barProm = fooProm.any<Bar>();
-barArrProm = fooProm.some<Bar>(num);
-barProm = fooProm.race<Bar>();
+// $ExpectType Bluebird<never>
+fooProm.all();
+
+fooProm = fooArrProm.any();
+
+// $ExpectType Bluebird<never>
+fooProm.any();
+
+fooArrProm = fooArrProm.some(num);
+
+// $ExpectType Bluebird<never>
+fooProm.some(num);
+
+fooProm = fooArrProm.race();
+
+// $ExpectType Bluebird<never>
+fooProm.race();
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -626,44 +637,42 @@ Promise.props(new Map<number, PromiseLike<string>>()).then(val => { propsMapValu
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 Promise.all([fooProm, barProm]).then(result => {
-  result[0].foo();
-  result[1].bar();
+  	foo = result[0];
+  	bar = result[1];
 });
 
 Promise.all([fooProm, fooProm]).then(result => {
-  result[0].foo();
-  result[1].foo();
+	foo = result[0];
+	foo = result[1];
 });
 
 Promise.all([fooProm, barProm, bazProm]).then(result => {
-  result[0].foo();
-  result[1].bar();
-  result[2].baz();
+	foo = result[0];
+	bar = result[1];
+	baz = result[2];
 });
 
 Promise.all([fooProm, barProm, fooProm]).then(result => {
-  result[0].foo();
-  result[1].bar();
-  result[2].foo();
+	foo = result[0];
+	bar = result[1];
+	foo = result[2];
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-// TODO fix collection inference
-
-barArrProm = fooArrProm.map<Foo, Bar>((item: Foo, index: number, arrayLength: number) => {
+barArrProm = fooArrProm.map((item: Foo, index: number, arrayLength: number) => {
 	return bar;
 });
-barArrProm = fooArrProm.map<Foo, Bar>((item: Foo) => {
+barArrProm = fooArrProm.map((item: Foo) => {
 	return bar;
 });
 
-barArrProm = fooArrProm.map<Foo, Bar>((item: Foo, index: number, arrayLength: number) => {
+barArrProm = fooArrProm.map((item: Foo, index: number, arrayLength: number) => {
 	return bar;
 }, {
 	concurrency: 1
 });
-barArrProm = fooArrProm.map<Foo, Bar>((item: Foo) => {
+barArrProm = fooArrProm.map((item: Foo) => {
 	return bar;
 }, {
 	concurrency: 1
@@ -671,37 +680,37 @@ barArrProm = fooArrProm.map<Foo, Bar>((item: Foo) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barArrProm = fooArrProm.mapSeries<Foo, Bar>((item: Foo, index: number, arrayLength: number) => {
+barArrProm = fooArrProm.mapSeries((item: Foo, index: number, arrayLength: number) => {
 	return bar;
 });
-barArrProm = fooArrProm.mapSeries<Foo, Bar>((item: Foo) => {
+barArrProm = fooArrProm.mapSeries((item: Foo) => {
 	return bar;
 });
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-barProm = fooArrProm.reduce<Foo, Bar>((memo: Bar, item: Foo, index: number, arrayLength: number) => {
+barProm = fooArrProm.reduce((memo: Bar, item: Foo, index: number, arrayLength: number) => {
 	return memo;
 });
-barProm = fooArrProm.reduce<Foo, Bar>((memo: Bar, item: Foo) => {
+barProm = fooArrProm.reduce((memo: Bar, item: Foo) => {
 	return memo;
 }, bar);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-fooArrProm = fooArrProm.filter<Foo>((item: Foo, index: number, arrayLength: number) => {
+fooArrProm = fooArrProm.filter((item: Foo, index: number, arrayLength: number) => {
 	return bool;
 });
-fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
+fooArrProm = fooArrProm.filter((item: Foo) => {
 	return bool;
 });
 
-fooArrProm = fooArrProm.filter<Foo>((item: Foo, index: number, arrayLength: number) => {
+fooArrProm = fooArrProm.filter((item: Foo, index: number, arrayLength: number) => {
 	return bool;
 }, {
 	concurrency: 1
 });
-fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
+fooArrProm = fooArrProm.filter((item: Foo) => {
 	return bool;
 }, {
 	concurrency: 1
@@ -709,10 +718,10 @@ fooArrProm = fooArrProm.filter<Foo>((item: Foo) => {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo): Bar => bar);
-fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number): Bar => index ? bar : null);
-fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number, arrayLength: number): Bar => bar);
-fooArrProm = fooArrProm.each<Foo, Bar>((item: Foo, index: number, arrayLength: number): Promise<Bar> => barProm);
+fooArrProm = fooArrProm.each((item: Foo): Bar => bar);
+fooArrProm = fooArrProm.each((item: Foo, index: number) => index ? bar : null);
+fooArrProm = fooArrProm.each((item: Foo, index: number, arrayLength: number): Bar => bar);
+fooArrProm = fooArrProm.each((item: Foo, index: number, arrayLength: number): Promise<Bar> => barProm);
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -784,6 +793,11 @@ fooProm = Promise.attempt(() => {
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 asyncfunc = Promise.method(() => {});
+{
+	const noArg: () => Promise<void> = Promise.method(() => {});
+	const oneArg: (x1: number) => Promise<void> = Promise.method((x1: number) => {});
+	const twoArg: (x1: number, x2: string) => Promise<void> = Promise.method((x1: number, x2: string) => {});
+}
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
@@ -798,6 +812,12 @@ voidProm = Promise.reject(reason);
 
 fooResolver = Promise.defer<Foo>();
 
+fooResolver.resolve(foo);
+
+fooResolver.reject(err);
+
+fooResolver.callback = (err: any, value: Foo) => {};
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
 fooProm = Promise.cast(foo);
@@ -862,11 +882,18 @@ obj = Promise.promisifyAll(obj, {
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
-const generator = function*(a: number, b: string) { return "string"; };
-const coroutine = Promise.coroutine<string, number, string>(generator);
-coroutine(5, "foo").then((x: string) => {});
+const generator1 = function*(a: number, b: string) { return "string"; };
+const coroutine1 = Promise.coroutine<string, number, string>(generator1);
+strProm = coroutine1(5, "foo");
 
-const coroutineCustomYield = Promise.coroutine(generator, { yieldHandler: (value) => "whatever" });
+const generator2 = function*(a: number, b: string) {
+	yield foo;
+	return bar;
+};
+const coroutine2 = Promise.coroutine<Bar, number, string>(generator2);
+barProm = coroutine2(5, "foo");
+
+const coroutineCustomYield = Promise.coroutine(generator1, { yieldHandler: (value) => "whatever" });
 /*
  barProm = Promise.spawn<number>(f);
  */
diff --git a/types/bluebird/index.d.ts b/types/bluebird/index.d.ts
index 8ad57050f6..091dbe6e7a 100644
--- a/types/bluebird/index.d.ts
+++ b/types/bluebird/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/petkaantonov/bluebird
 // Definitions by: Leonard Hecker <https://github.com/lhecker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /*!
  * The code following this comment originates from:
@@ -36,13 +36,20 @@
  */
 
 type CatchFilter<E> = (new (...args: any[]) => E) | ((error: E) => boolean) | (object & E);
+type IterableItem<R> = R extends Iterable<infer U> ? U : never;
+type IterableOrNever<R> = Extract<R, Iterable<any>>;
+type Resolvable<R> = R | PromiseLike<R>;
+type IterateFunction<T, R> = (item: T, index: number, arrayLength: number) => Resolvable<R>;
 
 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.
-   * If promise cancellation is enabled, passed in function will receive one more function argument `onCancel` that allows to register an optional cancellation callback.
+   * 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.
+   *
+   * If promise cancellation is enabled, passed in function will receive
+   * one more function argument `onCancel` that allows to register an optional cancellation callback.
    */
-  constructor(callback: (resolve: (thenableOrResult?: R | PromiseLike<R>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void);
+  constructor(callback: (resolve: (thenableOrResult?: Resolvable<R>) => void, reject: (error?: any) => void, onCancel?: (callback: () => void) => void) => void);
 
   /**
    * Promises/A+ `.then()`. Returns a new promise chained from this promise.
@@ -50,10 +57,10 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * The new promise will be rejected or resolved depending 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<U>(onFulfill?: (value: R) => Resolvable<U>, onReject?: (error: any) => Resolvable<U>): Bluebird<U>; // For simpler signature help.
   then<TResult1 = R, TResult2 = never>(
-      onfulfilled?: ((value: R) => TResult1 | PromiseLike<TResult1>) | null,
-      onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null
+      onfulfilled?: ((value: R) => Resolvable<TResult1>) | null,
+      onrejected?: ((reason: any) => Resolvable<TResult2>) | null
     ): Bluebird<TResult1 | TResult2>;
 
   /**
@@ -63,8 +70,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    *
    * Alias `.caught();` for compatibility with earlier ECMAScript version.
    */
-  catch(onReject: (error: any) => R | PromiseLike<R>): Bluebird<R>;
-  catch<U>(onReject: ((error: any) => U | PromiseLike<U>) | undefined | null): Bluebird<U | R>;
+  catch<U = R>(onReject: ((error: any) => Resolvable<U>) | undefined | null): Bluebird<U | R>;
 
   /**
    * This extends `.catch` to work more like catch-clauses in languages like Java or C#.
@@ -85,7 +91,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
     filter3: CatchFilter<E3>,
     filter4: CatchFilter<E4>,
     filter5: CatchFilter<E5>,
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => R | PromiseLike<R>,
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => Resolvable<R>,
   ): Bluebird<R>;
   catch<U, E1, E2, E3, E4, E5>(
     filter1: CatchFilter<E1>,
@@ -93,7 +99,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
     filter3: CatchFilter<E3>,
     filter4: CatchFilter<E4>,
     filter5: CatchFilter<E5>,
-    onReject: (error: E1 | E2 | E3 | E4 | E5) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => Resolvable<U>,
   ): Bluebird<U | R>;
 
   catch<E1, E2, E3, E4>(
@@ -101,7 +107,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
     filter2: CatchFilter<E2>,
     filter3: CatchFilter<E3>,
     filter4: CatchFilter<E4>,
-    onReject: (error: E1 | E2 | E3 | E4) => R | PromiseLike<R>,
+    onReject: (error: E1 | E2 | E3 | E4) => Resolvable<R>,
   ): Bluebird<R>;
 
   catch<U, E1, E2, E3, E4>(
@@ -109,40 +115,40 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
     filter2: CatchFilter<E2>,
     filter3: CatchFilter<E3>,
     filter4: CatchFilter<E4>,
-    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2 | E3 | E4) => Resolvable<U>,
   ): Bluebird<U | R>;
 
   catch<E1, E2, E3>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
     filter3: CatchFilter<E3>,
-    onReject: (error: E1 | E2 | E3) => R | PromiseLike<R>,
+    onReject: (error: E1 | E2 | E3) => Resolvable<R>,
   ): Bluebird<R>;
   catch<U, E1, E2, E3>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
     filter3: CatchFilter<E3>,
-    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2 | E3) => Resolvable<U>,
   ): Bluebird<U | R>;
 
   catch<E1, E2>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
-    onReject: (error: E1 | E2) => R | PromiseLike<R>,
+    onReject: (error: E1 | E2) => Resolvable<R>,
   ): Bluebird<R>;
   catch<U, E1, E2>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
-    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2) => Resolvable<U>,
   ): Bluebird<U | R>;
 
   catch<E1>(
     filter1: CatchFilter<E1>,
-    onReject: (error: E1) => R | PromiseLike<R>,
+    onReject: (error: E1) => Resolvable<R>,
   ): Bluebird<R>;
   catch<U, E1>(
     filter1: CatchFilter<E1>,
-    onReject: (error: E1) => U | PromiseLike<U>,
+    onReject: (error: E1) => Resolvable<U>,
   ): Bluebird<U | R>;
 
   /**
@@ -155,9 +161,10 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   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.
+   * 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>;
+  error<U>(onReject: (reason: any) => Resolvable<U>): Bluebird<U>;
 
   /**
    * Pass a handler that will be called regardless of this promise's fate. Returns a new promise chained from this promise.
@@ -166,12 +173,13 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    *
    * Alias `.lastly();` for compatibility with earlier ECMAScript version.
    */
-  finally<U>(handler: () => U | PromiseLike<U>): Bluebird<R>;
+  finally(handler: () => Resolvable<any>): Bluebird<R>;
 
-  lastly<U>(handler: () => U | PromiseLike<U>): Bluebird<R>;
+  lastly: Bluebird<R>["finally"];
 
   /**
-   * 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`.
+   * 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.
    */
@@ -180,47 +188,47 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * Like `.then()`, but any unhandled rejection that ends up here will be thrown as an error.
    */
-  done<U>(onFulfilled?: (value: R) => U | PromiseLike<U>, onRejected?: (error: any) => U | PromiseLike<U>): void;
+  done<U>(onFulfilled?: (value: R) => Resolvable<U>, onRejected?: (error: any) => Resolvable<U>): void;
 
   /**
    * Like `.finally()`, but not called for rejections.
    */
-  tap<U>(onFulFill: (value: R) => PromiseLike<U> | U): Bluebird<R>;
+  tap(onFulFill: (value: R) => Resolvable<any>): Bluebird<R>;
 
   /**
    * Like `.catch()` but rethrows the error
    */
-  tapCatch<U>(onReject: (error?: any) => U | PromiseLike<U>): Bluebird<R>;
+  tapCatch(onReject: (error?: any) => Resolvable<any>): Bluebird<R>;
 
-  tapCatch<U, E1, E2, E3, E4, E5>(
+  tapCatch<E1, E2, E3, E4, E5>(
     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>,
+    onReject: (error: E1 | E2 | E3 | E4 | E5) => Resolvable<any>,
   ): Bluebird<R>;
-  tapCatch<U, E1, E2, E3, E4>(
+  tapCatch<E1, E2, E3, E4>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
     filter3: CatchFilter<E3>,
     filter4: CatchFilter<E4>,
-    onReject: (error: E1 | E2 | E3 | E4) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2 | E3 | E4) => Resolvable<any>,
   ): Bluebird<R>;
-  tapCatch<U, E1, E2, E3>(
+  tapCatch<E1, E2, E3>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
     filter3: CatchFilter<E3>,
-    onReject: (error: E1 | E2 | E3) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2 | E3) => Resolvable<any>,
   ): Bluebird<R>;
-  tapCatch<U, E1, E2>(
+  tapCatch<E1, E2>(
     filter1: CatchFilter<E1>,
     filter2: CatchFilter<E2>,
-    onReject: (error: E1 | E2) => U | PromiseLike<U>,
+    onReject: (error: E1 | E2) => Resolvable<any>,
   ): Bluebird<R>;
-  tapCatch<U, E1>(
+  tapCatch<E1>(
     filter1: CatchFilter<E1>,
-    onReject: (error: E1) => U | PromiseLike<U>,
+    onReject: (error: E1) => Resolvable<any>,
   ): Bluebird<R>;
 
   /**
@@ -241,7 +249,9 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<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 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.
    */
@@ -305,7 +315,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * });
    * </code>
    */
-  call(propertyName: keyof R, ...args: any[]): Bluebird<any>;
+  call<U extends keyof R>(propertyName: U, ...args: any[]): Bluebird<R[U] extends (...args: any[]) => any ? ReturnType<R[U]> : never>;
 
   /**
    * This is a convenience method for doing:
@@ -453,66 +463,58 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * Like calling `.then`, but the fulfillment value or rejection reason is assumed to be an array, which is flattened to the formal parameters of the handlers.
    */
-  spread<U, W>(fulfilledHandler: (...values: W[]) => U | PromiseLike<U>): Bluebird<U>;
-  spread<U>(fulfilledHandler: (...args: any[]) => U | PromiseLike<U>): Bluebird<U>;
+  spread<U>(fulfilledHandler: (...values: Array<IterableItem<R>>) => Resolvable<U>): Bluebird<U>;
 
   /**
    * Same as calling `Promise.all(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  all<U>(): Bluebird<U[]>;
+  all(): Bluebird<IterableOrNever<R>>;
 
   /**
    * Same as calling `Promise.props(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  props<K, V>(this: PromiseLike<Map<K, PromiseLike<V> | V>>): Bluebird<Map<K, V>>;
+  props<K, V>(this: PromiseLike<Map<K, Resolvable<V>>>): Bluebird<Map<K, V>>;
   props<T>(this: PromiseLike<Bluebird.ResolvableProps<T>>): Bluebird<T>;
 
   /**
    * Same as calling `Promise.any(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  any<U>(): Bluebird<U>;
+  any(): Bluebird<IterableItem<R>>;
 
   /**
    * Same as calling `Promise.some(thisPromise)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  some<U>(count: number): Bluebird<U[]>;
+  some(count: number): Bluebird<IterableOrNever<R>>;
 
   /**
    * Same as calling `Promise.race(thisPromise, count)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  race<U>(): Bluebird<U>;
+  race(): Bluebird<IterableItem<R>>;
 
   /**
    * Same as calling `Bluebird.map(thisPromise, mapper)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  map<Q, U>(mapper: (item: Q, index: number, arrayLength: number) => U | PromiseLike<U>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  map<U>(mapper: IterateFunction<IterableItem<R>, U>, options?: Bluebird.ConcurrencyOption): Bluebird<R extends Iterable<any> ? U[] : never>;
 
   /**
    * Same as calling `Promise.reduce(thisPromise, Function reducer, initialValue)`. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  reduce<Q, U>(reducer: (memo: U, item: Q, index: number, arrayLength: number) => U | PromiseLike<U>, initialValue?: U): Bluebird<U>;
+  reduce<U>(reducer: (memo: U, item: IterableItem<R>, index: number, arrayLength: number) => Resolvable<U>, initialValue?: U): Bluebird<R extends Iterable<any> ? U : never>;
 
   /**
    * Same as calling ``Promise.filter(thisPromise, filterer)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  // TODO type inference from array-resolving promise?
-  filter<U>(filterer: (item: U, index: number, arrayLength: number) => boolean | PromiseLike<boolean>, options?: Bluebird.ConcurrencyOption): Bluebird<U[]>;
+  filter(filterer: IterateFunction<IterableItem<R>, boolean>, options?: Bluebird.ConcurrencyOption): Bluebird<IterableOrNever<R>>;
 
   /**
    * Same as calling ``Bluebird.each(thisPromise, iterator)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  each<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<R[]>;
+  each(iterator: IterateFunction<IterableItem<R>, any>): Bluebird<IterableOrNever<R>>;
 
   /**
    * Same as calling ``Bluebird.mapSeries(thisPromise, iterator)``. With the exception that if this promise is bound to a value, the returned promise is bound to that value too.
    */
-  mapSeries<R, U>(iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>): Bluebird<U[]>;
+  mapSeries<U>(iterator: IterateFunction<IterableItem<R>, U>): Bluebird<R extends Iterable<any> ? U[] : never>;
 
   /**
    * Cancel this `promise`. Will not do anything if this promise is already settled or if the cancellation feature has not been enabled
@@ -534,26 +536,27 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    *
    * Alias for `attempt();` for compatibility with earlier ECMAScript version.
    */
-  static try<R>(fn: () => R | PromiseLike<R>): Bluebird<R>;
-  static attempt<R>(fn: () => R | PromiseLike<R>): Bluebird<R>;
+  static try<R>(fn: () => Resolvable<R>): Bluebird<R>;
+  static attempt<R>(fn: () => Resolvable<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.
    * 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>;
-  static method<R, A1, A2>(fn: (arg1: A1, arg2: A2) => R | PromiseLike<R>): (arg1: A1, arg2: A2) => Bluebird<R>;
-  static method<R, A1, A2, A3>(fn: (arg1: A1, arg2: A2, arg3: A3) => R | PromiseLike<R>): (arg1: A1, arg2: A2, arg3: A3) => Bluebird<R>;
-  static method<R, A1, A2, A3, A4>(fn: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => R | PromiseLike<R>): (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => Bluebird<R>;
-  static method<R, A1, A2, A3, A4, A5>(fn: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => R | PromiseLike<R>): (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Bluebird<R>;
-  static method<R>(fn: (...args: any[]) => R | PromiseLike<R>): (...args: any[]) => Bluebird<R>;
+  static method<R>(fn: () => Resolvable<R>): () => Bluebird<R>;
+  static method<R, A1>(fn: (arg1: A1) => Resolvable<R>): (arg1: A1) => Bluebird<R>;
+  static method<R, A1, A2>(fn: (arg1: A1, arg2: A2) => Resolvable<R>): (arg1: A1, arg2: A2) => Bluebird<R>;
+  static method<R, A1, A2, A3>(fn: (arg1: A1, arg2: A2, arg3: A3) => Resolvable<R>): (arg1: A1, arg2: A2, arg3: A3) => Bluebird<R>;
+  static method<R, A1, A2, A3, A4>(fn: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => Resolvable<R>): (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => Bluebird<R>;
+  static method<R, A1, A2, A3, A4, A5>(fn: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Resolvable<R>): (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Bluebird<R>;
+  static method<R>(fn: (...args: any[]) => Resolvable<R>): (...args: any[]) => Bluebird<R>;
 
   /**
    * Create a promise that is resolved with the given `value`. If `value` is a thenable or promise, the returned promise will assume its state.
    */
   static resolve(): Bluebird<void>;
-  static resolve<R>(value: R | PromiseLike<R>): Bluebird<R>;
+  static resolve<R>(value: Resolvable<R>): Bluebird<R>;
 
   /**
    * Create a promise that is rejected with the given `reason`.
@@ -561,9 +564,11 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   static reject(reason: any): Bluebird<never>;
 
   /**
+   * @deprecated
    * Create a promise with undecided fate and return a `PromiseResolver` to control it. See resolution?: Promise(#promise-resolution).
+   * @see http://bluebirdjs.com/docs/deprecated-apis.html#promise-resolution
    */
-  static defer<R>(): Bluebird.Resolver<R>;
+  static defer<R>(): Bluebird.Resolver<R>; // tslint:disable-line no-unnecessary-generics
 
   /**
    * Cast the given `value` to a trusted promise.
@@ -571,7 +576,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * 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>;
+  static cast<R>(value: Resolvable<R>): Bluebird<R>;
 
   /**
    * Sugar for `Promise.resolve(undefined).bind(thisArg);`. See `.bind()`.
@@ -596,7 +601,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * If value is a promise, the delay will start counting down when it is fulfilled and the returned
    *  promise will be fulfilled with the fulfillment value of the value promise.
    */
-  static delay<R>(ms: number, value: R | PromiseLike<R>): Bluebird<R>;
+  static delay<R>(ms: number, value: Resolvable<R>): Bluebird<R>;
   static delay(ms: number): Bluebird<void>;
 
   /**
@@ -650,9 +655,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * Returns a promise that is resolved by a node style callback function.
    */
-  static fromNode(resolver: (callback: (err: any, result?: any) => void) => void, options?: Bluebird.FromNodeOptions): Bluebird<any>;
   static fromNode<T>(resolver: (callback: (err: any, result?: T) => void) => void, options?: Bluebird.FromNodeOptions): Bluebird<T>;
-  static fromCallback(resolver: (callback: (err: any, result?: any) => void) => void, options?: Bluebird.FromNodeOptions): Bluebird<any>;
   static fromCallback<T>(resolver: (callback: (err: any, result?: T) => void) => void, options?: Bluebird.FromNodeOptions): Bluebird<T>;
 
   /**
@@ -724,13 +727,13 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    */
   // TODO enable more overloads
   // array with promises of different types
-  static all<T1, T2, T3, T4, T5>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2, PromiseLike<T3> | T3, PromiseLike<T4> | T4, PromiseLike<T5> | T5]): Bluebird<[T1, T2, T3, T4, T5]>;
-  static all<T1, T2, T3, T4>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2, PromiseLike<T3> | T3, PromiseLike<T4> | T4]): Bluebird<[T1, T2, T3, T4]>;
-  static all<T1, T2, T3>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2, PromiseLike<T3> | T3]): Bluebird<[T1, T2, T3]>;
-  static all<T1, T2>(values: [PromiseLike<T1> | T1, PromiseLike<T2> | T2]): Bluebird<[T1, T2]>;
-  static all<T1>(values: [PromiseLike<T1> | T1]): Bluebird<[T1]>;
+  static all<T1, T2, T3, T4, T5>(values: [Resolvable<T1>, Resolvable<T2>, Resolvable<T3>, Resolvable<T4>, Resolvable<T5>]): Bluebird<[T1, T2, T3, T4, T5]>;
+  static all<T1, T2, T3, T4>(values: [Resolvable<T1>, Resolvable<T2>, Resolvable<T3>, Resolvable<T4>]): Bluebird<[T1, T2, T3, T4]>;
+  static all<T1, T2, T3>(values: [Resolvable<T1>, Resolvable<T2>, Resolvable<T3>]): Bluebird<[T1, T2, T3]>;
+  static all<T1, T2>(values: [Resolvable<T1>, Resolvable<T2>]): Bluebird<[T1, T2]>;
+  static all<T1>(values: [Resolvable<T1>]): Bluebird<[T1]>;
   // array with values
-  static all<R>(values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>): Bluebird<R[]>;
+  static all<R>(values: Resolvable<Iterable<Resolvable<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.
@@ -744,7 +747,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * *The original object is not modified.*
    */
   // map
-  static props<K, V>(map: PromiseLike<Map<K, PromiseLike<V> | V>> | Map<K, PromiseLike<V> | V>): Bluebird<Map<K, V>>;
+  static props<K, V>(map: Resolvable<Map<K, Resolvable<V>>>): Bluebird<Map<K, V>>;
   // trusted promise for object
   static props<T>(object: PromiseLike<Bluebird.ResolvableProps<T>>): Bluebird<T>; // tslint:disable-line:unified-signatures
   // object
@@ -753,24 +756,27 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
   /**
    * 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<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>): Bluebird<R>;
+  static any<R>(values: Resolvable<Iterable<Resolvable<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.
+   * 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<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>): Bluebird<R>;
+  static race<R>(values: Resolvable<Iterable<Resolvable<R>>>): Bluebird<R>;
 
   /**
    * Initiate a competitive 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.
+   * 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.
+   * 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<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>, count: number): Bluebird<R[]>;
+  static some<R>(values: Resolvable<Iterable<Resolvable<R>>>, count: number): Bluebird<R[]>;
 
   /**
    * Promise.join(
@@ -783,42 +789,44 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * 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>
+      arg1: Resolvable<A1>,
+      handler: (arg1: A1) => Resolvable<R>
     ): Bluebird<R>;
   static join<R, A1, A2>(
-      arg1: A1 | PromiseLike<A1>,
-      arg2: A2 | PromiseLike<A2>,
-      handler: (arg1: A1, arg2: A2) => R | PromiseLike<R>
+      arg1: Resolvable<A1>,
+      arg2: Resolvable<A2>,
+      handler: (arg1: A1, arg2: A2) => Resolvable<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>
+      arg1: Resolvable<A1>,
+      arg2: Resolvable<A2>,
+      arg3: Resolvable<A3>,
+      handler: (arg1: A1, arg2: A2, arg3: A3) => Resolvable<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>
+      arg1: Resolvable<A1>,
+      arg2: Resolvable<A2>,
+      arg3: Resolvable<A3>,
+      arg4: Resolvable<A4>,
+      handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4) => Resolvable<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>
+      arg1: Resolvable<A1>,
+      arg2: Resolvable<A2>,
+      arg3: Resolvable<A3>,
+      arg4: Resolvable<A4>,
+      arg5: Resolvable<A5>,
+      handler: (arg1: A1, arg2: A2, arg3: A3, arg4: A4, arg5: A5) => Resolvable<R>
     ): Bluebird<R>;
 
   // variadic array
   /** @deprecated use .all instead */
-  static join<R>(...values: Array<R | PromiseLike<R>>): Bluebird<R[]>;
+  static join<R>(...values: Array<Resolvable<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.
+   * 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.
@@ -826,28 +834,34 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * *The original array is not modified.*
    */
   static map<R, U>(
-      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
-      mapper: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>,
+      values: Resolvable<Iterable<Resolvable<R>>>,
+      mapper: IterateFunction<R, 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.
+   * 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 `initialValue` is given and the array doesn't contain at least 2 items, the callback will not be called and `undefined` is returned.
+   * *The original array is not modified. If no `initialValue` 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<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
-      reducer: (total: U, current: R, index: number, arrayLength: number) => U | PromiseLike<U>,
+      values: Resolvable<Iterable<Resolvable<R>>>,
+      reducer: (total: U, current: R, index: number, arrayLength: number) => Resolvable<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.
+   * 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.
@@ -855,25 +869,28 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * *The original array is not modified.
    */
   static filter<R>(
-      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
-      filterer: (item: R, index: number, arrayLength: number) => boolean | PromiseLike<boolean>,
+      values: Resolvable<Iterable<Resolvable<R>>>,
+      filterer: IterateFunction<R, 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.
+   * 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.
    */
-  static each<R, U>(
-      values: PromiseLike<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
-      iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>
+  static each<R>(
+      values: Resolvable<Iterable<Resolvable<R>>>,
+      iterator: IterateFunction<R, any>
     ): 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.
+   * 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.
@@ -882,8 +899,8 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * 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<Iterable<PromiseLike<R> | R>> | Iterable<PromiseLike<R> | R>,
-      iterator: (item: R, index: number, arrayLength: number) => U | PromiseLike<U>
+      values: Resolvable<Iterable<Resolvable<R>>>,
+      iterator: IterateFunction<R, U>
     ): Bluebird<U[]>;
 
   /**
@@ -896,7 +913,7 @@ declare class Bluebird<R> implements PromiseLike<R>, Bluebird.Inspection<R> {
    * The second argument passed to a disposer is the result promise of the using block, which you can
    *  inspect synchronously.
    */
-  disposer(disposeFn: (arg: R, promise: Bluebird<R>) => void | PromiseLike<void>): Bluebird.Disposer<R>;
+  disposer(disposeFn: (arg: R, promise: Bluebird<R>) => Resolvable<void>): Bluebird.Disposer<R>;
 
   /**
    * In conjunction with `.disposer`, using will make sure that no matter what, the specified disposer
@@ -1032,7 +1049,7 @@ declare namespace Bluebird {
   /** @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]: Resolvable<T[K]>};
 
   interface Resolver<R> {
     /**
@@ -1107,7 +1124,8 @@ declare namespace Bluebird {
   /**
    * This is relevant to browser environments with no module loader.
    *
-   * Release control of the Promise namespace to whatever it was before this library was loaded. Returns a reference to the library namespace so you can attach it to something else.
+   * Release control of the Promise namespace to whatever it was before this library was loaded.
+   * Returns a reference to the library namespace so you can attach it to something else.
    */
   function noConflict(): typeof Bluebird;
 
diff --git a/types/bluebird/tsconfig.json b/types/bluebird/tsconfig.json
index 5ab3ff2494..4ff87506f9 100644
--- a/types/bluebird/tsconfig.json
+++ b/types/bluebird/tsconfig.json
@@ -10,7 +10,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "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 6abaaba4e3..6bdbed5083 100644
--- a/types/bluebird/tslint.json
+++ b/types/bluebird/tslint.json
@@ -1,7 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "max-line-length": [true, 280],
         "no-unnecessary-generics": false,
         "prefer-const": false
     }
diff --git a/types/bn.js/bn.js-tests.ts b/types/bn.js/bn.js-tests.ts
index 670234ecfe..c1030a2677 100644
--- a/types/bn.js/bn.js-tests.ts
+++ b/types/bn.js/bn.js-tests.ts
@@ -1,3 +1,4 @@
+// test that it works as a require
 import BN = require('bn.js');
 
 let bn = new BN(42);
diff --git a/types/bn.js/index.d.ts b/types/bn.js/index.d.ts
index 1a3d4f9b70..48f20ba429 100644
--- a/types/bn.js/index.d.ts
+++ b/types/bn.js/index.d.ts
@@ -1,59 +1,506 @@
 // Type definitions for bn.js 4.11
 // Project: https://github.com/indutny/bn.js
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+//                 Henry Nguyen <https://github.com/HenryNguyen5>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
 
 type Endianness = 'le' | 'be';
+type IPrimeName = 'k256' | 'p224' | 'p192' | 'p25519';
+
+declare class RedBN {
+    redAdd(b: RedBN): RedBN;
+    redIAdd(b: RedBN): RedBN;
+    redSub(b: RedBN): RedBN;
+    redISub(b: RedBN): RedBN;
+    redShl(num: number): RedBN;
+    redMul(b: RedBN): RedBN;
+    redIMul(b: RedBN): RedBN;
+    redSqr(): RedBN;
+    redISqr(): RedBN;
+    /**
+     * @description square root modulo reduction context's prime
+     */
+    redSqrt(): RedBN;
+    /**
+     * @description  modular inverse of the number
+     */
+    redInvm(): RedBN;
+    redNeg(): RedBN;
+    /**
+     * @description modular exponentiation
+     */
+    redPow(b: RedBN): RedBN;
+    fromRed(): BN;
+}
+
+// FIXME: not sure how to specify the reduction context here
+interface ReductionContext {
+    m: number;
+    prime: any;
+    [key: string]: any;
+}
 
 declare class BN {
-    constructor(num: number | string | number[] | Buffer, base?: number, endian?: Endianness);
-    clone(): BN;
-    toString(base?: number, length?: number): string;
-    toNumber(): number;
-    toJSON(): string;
-    toArray(endian?: Endianness, length?: number): number[];
-    toBuffer(endian?: Endianness, length?: number): Buffer;
-    bitLength(): number;
-    zeroBits(): number;
-    byteLength(): number;
-    isNeg(): boolean;
-    isEven(): boolean;
-    isOdd(): boolean;
-    isZero(): boolean;
-    cmp(b: any): number;
-    lt(b: any): boolean;
-    lte(b: any): boolean;
-    gt(b: any): boolean;
-    gte(b: any): boolean;
-    eq(b: any): boolean;
-    isBN(b: any): boolean;
+    constructor(
+        number: number | string | number[] | Buffer | BN,
+        base?: number,
+        endian?: Endianness
+    );
 
+    /**
+     * @description  create a reduction context
+     */
+    static red(reductionContext: BN | IPrimeName): ReductionContext;
+
+    /**
+     * @description  create a reduction context  with the Montgomery trick.
+     */
+    static mont(num: BN): ReductionContext;
+
+    /**
+     * @description returns true if the supplied object is a BN.js instance
+     */
+    static isBN(b: any): b is BN;
+
+    /**
+     * @description  Convert number to red
+     */
+    toRed(reductionContext: ReductionContext): RedBN;
+
+    /**
+     * @description  clone number
+     */
+    clone(): BN;
+
+    /**
+     * @description  convert to base-string and pad with zeroes
+     */
+    toString(base?: number | 'hex', length?: number): string;
+
+    /**
+     * @description convert to Javascript Number (limited to 53 bits)
+     */
+    toNumber(): number;
+
+    /**
+     * @description convert to JSON compatible hex string (alias of toString(16))
+     */
+    toJSON(): string;
+
+    /**
+     * @description  convert to byte Array, and optionally zero pad to length, throwing if already exceeding
+     */
+    toArray(endian?: Endianness, length?: number): number[];
+
+    /**
+     * @description convert to an instance of `type`, which must behave like an Array
+     */
+    toArrayLike(
+        ArrayType: Buffer | any[],
+        endian?: Endianness,
+        length?: number
+    ): Buffer | any[];
+
+    /**
+     * @description  convert to Node.js Buffer (if available). For compatibility with browserify and similar tools, use this instead: a.toArrayLike(Buffer, endian, length)
+     */
+    toBuffer(endian?: Endianness, length?: number): Buffer;
+
+    /**
+     * @description get number of bits occupied
+     */
+    bitLength(): number;
+
+    /**
+     * @description return number of less-significant consequent zero bits (example: 1010000 has 4 zero bits)
+     */
+    zeroBits(): number;
+
+    /**
+     * @description return number of bytes occupied
+     */
+    byteLength(): number;
+
+    /**
+     * @description  true if the number is negative
+     */
+    isNeg(): boolean;
+
+    /**
+     * @description  check if value is even
+     */
+    isEven(): boolean;
+
+    /**
+     * @description   check if value is odd
+     */
+    isOdd(): boolean;
+
+    /**
+     * @description  check if value is zero
+     */
+    isZero(): boolean;
+
+    /**
+     * @description compare numbers and return `-1 (a < b)`, `0 (a == b)`, or `1 (a > b)` depending on the comparison result
+     */
+    cmp(b: BN): -1 | 0 | 1;
+
+    /**
+     * @description compare numbers and return `-1 (a < b)`, `0 (a == b)`, or `1 (a > b)` depending on the comparison result
+     */
+    ucmp(b: BN): -1 | 0 | 1;
+
+    /**
+     * @description compare numbers and return `-1 (a < b)`, `0 (a == b)`, or `1 (a > b)` depending on the comparison result
+     */
+    cmpn(b: number): -1 | 0 | 1;
+
+    /**
+     * @description a less than b
+     */
+    lt(b: BN): boolean;
+
+    /**
+     * @description a less than b
+     */
+    ltn(b: number): boolean;
+
+    /**
+     * @description a less than or equals b
+     */
+    lte(b: BN): boolean;
+
+    /**
+     * @description a less than or equals b
+     */
+    lten(b: number): boolean;
+
+    /**
+     * @description a greater than b
+     */
+    gt(b: BN): boolean;
+
+    /**
+     * @description a greater than b
+     */
+    gtn(b: number): boolean;
+
+    /**
+     * @description a greater than or equals b
+     */
+    gte(b: BN): boolean;
+
+    /**
+     * @description a greater than or equals b
+     */
+    gten(b: number): boolean;
+
+    /**
+     * @description a equals b
+     */
+    eq(b: BN): boolean;
+
+    /**
+     * @description a equals b
+     */
+    eqn(b: number): boolean;
+
+    /**
+     * @description convert to two's complement representation, where width is bit width
+     */
+    toTwos(width: number): BN;
+
+    /**
+     * @description  convert from two's complement representation, where width is the bit width
+     */
+    fromTwos(width: number): BN;
+
+    /**
+     * @description negate sign
+     */
     neg(): BN;
+
+    /**
+     * @description negate sign
+     */
+    ineg(): BN;
+
+    /**
+     * @description absolute value
+     */
     abs(): BN;
+
+    /**
+     * @description absolute value
+     */
+    iabs(): BN;
+
+    /**
+     * @description addition
+     */
     add(b: BN): BN;
+
+    /**
+     * @description  addition
+     */
+    iadd(b: BN): BN;
+
+    /**
+     * @description addition
+     */
+    addn(b: number): BN;
+
+    /**
+     * @description addition
+     */
+    iaddn(b: number): BN;
+
+    /**
+     * @description subtraction
+     */
     sub(b: BN): BN;
+
+    /**
+     * @description subtraction
+     */
+    isub(b: BN): BN;
+
+    /**
+     * @description subtraction
+     */
+    subn(b: number): BN;
+
+    /**
+     * @description subtraction
+     */
+    isubn(b: number): BN;
+
+    /**
+     * @description multiply
+     */
     mul(b: BN): BN;
+
+    /**
+     * @description multiply
+     */
+    imul(b: BN): BN;
+
+    /**
+     * @description multiply
+     */
+    muln(b: number): BN;
+
+    /**
+     * @description multiply
+     */
+    imuln(b: number): BN;
+
+    /**
+     * @description square
+     */
     sqr(): BN;
+
+    /**
+     * @description square
+     */
+    isqr(): BN;
+
+    /**
+     * @description raise `a` to the power of `b`
+     */
     pow(b: BN): BN;
+
+    /**
+     * @description divide
+     */
     div(b: BN): BN;
+
+    /**
+     * @description divide
+     */
+    divn(b: number): BN;
+
+    /**
+     * @description divide
+     */
+    idivn(b: number): BN;
+
+    /**
+     * @description reduct
+     */
     mod(b: BN): BN;
+
+    /**
+     * @description reduct
+     */
+    umod(b: BN): BN;
+
+    /**
+     * @see API consistency https://github.com/indutny/bn.js/pull/130
+     * @description reduct
+     */
+    modn(b: number): number;
+
+    /**
+     * @description  rounded division
+     */
     divRound(b: BN): BN;
 
+    /**
+     * @description or
+     */
     or(b: BN): BN;
+
+    /**
+     * @description or
+     */
+    ior(b: BN): BN;
+
+    /**
+     * @description or
+     */
+    uor(b: BN): BN;
+
+    /**
+     * @description or
+     */
+    iuor(b: BN): BN;
+
+    /**
+     * @description and
+     */
     and(b: BN): BN;
+
+    /**
+     * @description and
+     */
+    iand(b: BN): BN;
+
+    /**
+     * @description and
+     */
+    uand(b: BN): BN;
+
+    /**
+     * @description and
+     */
+    iuand(b: BN): BN;
+
+    /**
+     * @description and (NOTE: `andln` is going to be replaced with `andn` in future)
+     */
+    andln(b: number): BN;
+
+    /**
+     * @description xor
+     */
     xor(b: BN): BN;
+
+    /**
+     * @description xor
+     */
+    ixor(b: BN): BN;
+
+    /**
+     * @description xor
+     */
+    uxor(b: BN): BN;
+
+    /**
+     * @description xor
+     */
+    iuxor(b: BN): BN;
+
+    /**
+     * @description set specified bit to 1
+     */
     setn(b: number): BN;
+
+    /**
+     * @description shift left
+     */
     shln(b: number): BN;
+
+    /**
+     * @description shift left
+     */
+    ishln(b: number): BN;
+
+    /**
+     * @description shift left
+     */
+    ushln(b: number): BN;
+
+    /**
+     * @description shift left
+     */
+    iushln(b: number): BN;
+
+    /**
+     * @description shift right
+     */
     shrn(b: number): BN;
+
+    /**
+     * @description shift right (unimplemented https://github.com/indutny/bn.js/blob/master/lib/bn.js#L2086)
+     */
+    ishrn(b: number): BN;
+
+    /**
+     * @description shift right
+     */
+    ushrn(b: number): BN;
+    /**
+     * @description shift right
+     */
+
+    iushrn(b: number): BN;
+    /**
+     * @description  test if specified bit is set
+     */
+
     testn(b: number): boolean;
+    /**
+     * @description clear bits with indexes higher or equal to `b`
+     */
+
     maskn(b: number): BN;
+    /**
+     * @description clear bits with indexes higher or equal to `b`
+     */
+
+    imaskn(b: number): BN;
+    /**
+     * @description add `1 << b` to the number
+     */
     bincn(b: number): BN;
+
+    /**
+     * @description not (for the width specified by `w`)
+     */
     notn(w: number): BN;
 
+    /**
+     * @description not (for the width specified by `w`)
+     */
+    inotn(w: number): BN;
+
+    /**
+     * @description GCD
+     */
     gcd(b: BN): BN;
+
+    /**
+     * @description Extended GCD results `({ a: ..., b: ..., gcd: ... })`
+     */
     egcd(b: BN): { a: BN; b: BN; gcd: BN };
+
+    /**
+     * @description inverse `a` modulo `b`
+     */
     invm(b: BN): BN;
 }
 
diff --git a/types/bookshelf/index.d.ts b/types/bookshelf/index.d.ts
index c151e81624..7467b3178f 100644
--- a/types/bookshelf/index.d.ts
+++ b/types/bookshelf/index.d.ts
@@ -2,7 +2,7 @@
 // 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
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import Knex = require('knex');
 import knex = require('knex');
diff --git a/types/bootstrap/bootstrap-tests.ts b/types/bootstrap/bootstrap-tests.ts
index f0a353889c..9a80afc654 100755
--- a/types/bootstrap/bootstrap-tests.ts
+++ b/types/bootstrap/bootstrap-tests.ts
@@ -1,3 +1,5 @@
+declare let aHtmlElement: HTMLElement;
+
 // --------------------------------------------------------------------------------------
 // Alert
 // --------------------------------------------------------------------------------------
@@ -56,6 +58,10 @@ $("#carousel").carousel({
     pause: false,
 });
 
+$("#carousel").carousel({
+    interval: false,
+});
+
 // --------------------------------------------------------------------------------------
 // Collapse
 // --------------------------------------------------------------------------------------
@@ -74,7 +80,7 @@ $("#collapse").collapse({
 });
 
 $("#collapse").collapse({
-    parent: document.body,
+    parent: aHtmlElement,
 });
 
 $("#collapse").collapse({
@@ -118,11 +124,11 @@ $("#dropdown").dropdown({
 });
 
 $("#dropdown").dropdown({
-    boundary: document.body,
+    boundary: aHtmlElement,
 });
 
 $("#dropdown").dropdown({
-    reference: document.body,
+    reference: aHtmlElement,
 });
 
 // --------------------------------------------------------------------------------------
@@ -336,5 +342,5 @@ $("#tooltip").tooltip({
 });
 
 $("#tooltip").tooltip({
-    boundary: document.body,
+    boundary: aHtmlElement,
 });
diff --git a/types/bootstrap/index.d.ts b/types/bootstrap/index.d.ts
index 2f43555a73..8a815bccd5 100755
--- a/types/bootstrap/index.d.ts
+++ b/types/bootstrap/index.d.ts
@@ -46,7 +46,7 @@ export interface CarouselOption {
      *
      * @default 5000
      */
-    interval?: number;
+    interval?: false | number;
 
     /**
      * Whether the carousel should react to keyboard events.
@@ -354,7 +354,7 @@ export type TooltipEvent = "show.bs.tooltip" | "shown.bs.tooltip" | "hide.bs.too
 // --------------------------------------------------------------------------------------
 
 declare global {
-    interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
+    interface JQuery<TElement = HTMLElement> {
         alert(action?: "close" | "dispose"): this;
 
         button(action: "toggle" | "dispose"): this;
diff --git a/types/bpmn-moddle/bpmn-moddle-tests.ts b/types/bpmn-moddle/bpmn-moddle-tests.ts
new file mode 100644
index 0000000000..00e92bddf5
--- /dev/null
+++ b/types/bpmn-moddle/bpmn-moddle-tests.ts
@@ -0,0 +1,24 @@
+import * as BPMNModdle from "bpmn-moddle";
+
+const moddle: BPMNModdle.Moddle = {} as any;
+
+const element1 = moddle.create("bpmn:UserTask"); // Expect type User Task
+element1.$type = "bpmn:UserTask"; // Expect to check against type correctly
+
+const bpmnModdle: BPMNModdle.BPMNModdle = {} as any;
+
+bpmnModdle.fromXML("", (err, definitions, parseContext) => {
+    err; // type of error
+    definitions; // type of definition
+    parseContext; // type of any
+});
+
+const definition: BPMNModdle.Definitions = {} as any;
+
+// Expect type of process or undefined
+const maybeProcess = definition.rootElements.find(
+    i => i.$type === "bpmn:Process"
+);
+
+// Expect process to have additional typings to base element1
+const process = maybeProcess as BPMNModdle.Process;
diff --git a/types/bpmn-moddle/index.d.ts b/types/bpmn-moddle/index.d.ts
new file mode 100644
index 0000000000..f4411e05fa
--- /dev/null
+++ b/types/bpmn-moddle/index.d.ts
@@ -0,0 +1,1068 @@
+// Type definitions for bpmn-moddle 5.1
+// Project: https://github.com/bpmn-io/bpmn-moddle
+// Definitions by: Hayden <https://github.com/haydos89>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare namespace BPMNModdle {
+    type AdHocOrdering = "Parallel" | "Sequential";
+    type AssociationDirection = "None" | "One" | "Both";
+    type ChoreographyLoopType =
+        | "None"
+        | "Standard"
+        | "MultiInstanceSequential"
+        | "MultiInstanceParallel";
+    type EventBasedGatewayType = "Parallel" | "Exclusive";
+    type GatewayDirection =
+        | "Unspecified"
+        | "Converging"
+        | "Diverging"
+        | "Mixed";
+    type ItemKind = "Physical" | "Information";
+    type MultiInstanceBehaviour = "None" | "One" | "All" | "Complex";
+    type ProcessType = "None" | "Public" | "Private";
+    type RelationshipDirection = "None" | "Forward" | "Backward" | "Both";
+
+    interface TypeDerived {
+        $type: ElementType;
+    }
+    interface BaseElement extends TypeDerived {
+        /**
+         * Is the primary Id of the element
+         */
+        id: string;
+
+        /**
+         * Documentation for the element
+         */
+        documentation?: Documentation[];
+
+        /**
+         * Reference to the extension definitions for this element
+         */
+        extensionDefinitions?: ExtensionDefinition[];
+
+        /**
+         * Extension Elements
+         */
+        extensionElements?: ExtensionElements;
+
+        /**
+         * Attributes that aren't defined by the BPMN Spec such
+         * as Camunda properties
+         */
+        $attrs?: {
+            [key: string]: any;
+        };
+    }
+
+    // tslint:disable-next-line:no-empty-interface
+    interface RootElement extends BaseElement {}
+    interface Interface extends RootElement {
+        name: string;
+        operations: Operation[];
+        implementationRef: string;
+    }
+
+    interface Operation extends BaseElement {
+        name: string;
+        inMessageRef: Message;
+        outMessageRef: Message;
+        errorRef: ErrorElement;
+        implementationRef: string;
+    }
+
+    // tslint:disable-next-line:no-empty-interface
+    interface EndPoint extends RootElement {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Auditing extends BaseElement {}
+    interface CallableElement extends RootElement {
+        name: string;
+        ioSpecification: InputOutputSpecification;
+        supportedInterfaceRef: Interface;
+        ioBinding: InputOutputBinding;
+    }
+    interface ResourceRole extends BaseElement {
+        name: string;
+        resourceRef: Resource;
+        ResourceParameterBindings: ResourceParameterBinding[];
+        resourceAssignmentExpression: ResourceAssignmentExpression;
+    }
+    interface GlobalTask extends CallableElement {
+        resources: ResourceRole;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Monitoring extends BaseElement {}
+
+    // tslint:disable-next-line:no-empty-interface
+   interface Performer extends ResourceRole {}
+    interface Process extends FlowElementsContainer, CallableElement {
+        processType: string;
+        isClosed: boolean;
+        auditing: Auditing;
+        monitoring: Monitoring;
+        properties: Property[];
+        laneSets: LaneSet[];
+        flowElements: FlowElement[];
+        artifacts: Artifact[];
+        resources: ResourceRole[];
+        correlationSubscriptions: CorrelationSubscription[];
+        supports: Process[];
+        definitionalCollaborationRef: Collaboration;
+        isExecutable: boolean;
+    }
+    interface LaneSet extends BaseElement {
+        lanes: Lane[];
+        name: string;
+    }
+    interface Lane extends BaseElement {
+        name: string;
+        partitionElementRef: BaseElement;
+        partitionElement: BaseElement;
+        flowNodeRef: FlowNode[];
+        childLaneSet: LaneSet;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface GlobalManualTask extends GlobalTask {}
+    // tslint:disable-next-line:no-empty-interface
+    interface ManualTask extends Task {}
+    interface UserTask extends Task {
+        renderings: Rendering[];
+        implementation: string;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Rendering extends BaseElement {}
+    // tslint:disable-next-line:no-empty-interface
+    interface HumanPerformer extends Performer {}
+    // tslint:disable-next-line:no-empty-interface
+    interface PotentialOwner extends Performer {}
+    interface GlobalUserTask extends GlobalTask {
+        implementation: string;
+        renderings: Rendering;
+    }
+    interface Gateway extends FlowNode {
+        /**
+         * @default Unspecified
+         */
+        gatewayDirection: GatewayDirection;
+    }
+    interface EventBasedGateway extends Gateway {
+        instantiate: boolean;
+        /**
+         * @default Exclusive
+         */
+        eventGatewayType: EventBasedGatewayType;
+    }
+    interface ComplexGateway extends Gateway {
+        activationCondition: Expression;
+        default: SequenceFlow;
+    }
+    interface ExclusiveGateway extends Gateway {
+        default: SequenceFlow;
+    }
+    interface InclusiveGateway extends Gateway {
+        default: SequenceFlow;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface ParallelGateway extends Gateway {}
+    interface Relationship extends BaseElement {
+        type: string;
+        direction: RelationshipDirection;
+        source: BaseElement[];
+        target: BaseElement[];
+    }
+    interface Extension extends TypeDerived {
+        /**
+         * @default false
+         */
+        mustUnderstand: boolean;
+        definition: ExtensionDefinition;
+    }
+    interface ExtensionDefinition extends TypeDerived {
+        name: string;
+        extensionAttributeDefinitions: ExtensionAttributeDefinition[];
+    }
+    interface ExtensionAttributeDefinition extends TypeDerived {
+        name: string;
+        type: string;
+        /**
+         * @default false
+         */
+        isReference: boolean;
+    }
+    interface ExtensionElements extends TypeDerived {
+        valueRef: BaseElement;
+        values: BaseElement[];
+        extensionAttributeDefinition: ExtensionAttributeDefinition;
+        [key: string]: any;
+    }
+    interface Documentation extends BaseElement {
+        text: string;
+        /**
+         * @default "text/plain"
+         */
+        textFormat: string;
+    }
+    interface Event extends FlowNode, InteractionNode {
+        properties: Property[];
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface IntermediateCatchEvent extends CatchEvent {}
+    // tslint:disable-next-line:no-empty-interface
+    interface IntermediateThrowEvent extends ThrowEvent {}
+    // tslint:disable-next-line:no-empty-interface
+    interface EndEvent extends ThrowEvent {}
+    interface StartEvent extends CatchEvent {
+        /**
+         * @default true
+         */
+        isInterrupting: boolean;
+    }
+    interface ThrowEvent extends Event {
+        dataInputs: DataInput[];
+        dataInputAssociations: DataInputAssociation[];
+        inputSet: InputSet;
+        eventDefinitions: EventDefinition[];
+        eventDefinitionRef: EventDefinition[];
+    }
+    interface CatchEvent extends Event {
+        /**
+         * @default false
+         */
+        parallelMultiple: boolean;
+        dataOutputs: DataOutput[];
+        dataOutputAssociations: DataOutputAssociation[];
+        outputSet: OutputSet;
+        eventDefinitions: EventDefinition[];
+    }
+    interface BoundaryEvent extends CatchEvent {
+        /**
+         * @default true
+         */
+        cancelActivity: boolean;
+        attachedToRef: Activity;
+    }
+
+    // tslint:disable-next-line:no-empty-interface
+    interface EventDefinition extends RootElement {}
+    // tslint:disable-next-line:no-empty-interface
+    interface CancelEventDefinition extends EventDefinition {}
+    interface ErrorEventDefinition extends EventDefinition {
+        errorRef: ErrorElement;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface TerminateEventDefinition extends EventDefinition {}
+    interface EscalationEventDefinition extends EventDefinition {
+        escalationRef: Escalation;
+    }
+    interface Escalation extends RootElement {
+        structureRef: ItemDefinition;
+        name: string;
+        escalationCode: string;
+    }
+    interface CompensateEventDefinition extends EventDefinition {
+        waitForCompletion: boolean;
+        activityRef: Activity;
+    }
+    interface TimerEventDefinition extends EventDefinition {
+        timeDate: Expression;
+        timeCycle: Expression;
+        timeDuration: Expression;
+    }
+    interface LinkEventDefinition extends EventDefinition {
+        name: string;
+        target: LinkEventDefinition;
+        source: LinkEventDefinition;
+    }
+    interface MessageEventDefinition extends EventDefinition {
+        nessageRef: Message;
+        operationRef: Operation;
+    }
+    interface ConditionalEventDefinition extends EventDefinition {
+        condition: Expression;
+    }
+    interface SignalEventDefinition extends EventDefinition {
+        singalRef: Signal;
+    }
+    interface Signal extends RootElement {
+        structureRef: ItemDefinition;
+        name: string;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface ImplicitThrowEvent extends ThrowEvent {}
+    interface DataState extends BaseElement {
+        name: string;
+    }
+    interface ItemAwareElement extends BaseElement {
+        itemSubjectRef: ItemDefinition;
+        dataState: DataState;
+    }
+    interface DataAssociation extends BaseElement {
+        assignment: Assignment;
+        sourceRef: ItemAwareElement;
+        targetRef: ItemAwareElement;
+        transformation: FormalExpression;
+    }
+    interface DataInput extends ItemAwareElement {
+        name: string;
+        /** @default false */
+        isCollection: boolean;
+        inputSetRef: InputSet;
+        inputSetWithOptional: InputSet;
+        inputSetWithWhileExecuting: InputSet;
+    }
+    interface DataOutput extends ItemAwareElement {
+        name: string;
+        /**
+         * @default false
+         */
+        isCollection: boolean;
+        outputSetRef: InputSet[];
+        outputSetWithOptional: InputSet[];
+        outputSetWithWhileExecuting: InputSet[];
+    }
+    interface InputSet extends BaseElement {
+        name: string;
+        dataInputRefs: DataInput[];
+        optionalInputRefs: DataInput[];
+        whileExecutingInputsRefs: DataInput[];
+        outputSetRefs: OutputSet[];
+    }
+    interface OutputSet extends BaseElement {
+        dataOutputRefs: DataOutput[];
+        name: string;
+        inputSetRefs: InputSet[];
+        optionalOutputRefs: DataOutput[];
+        whileExecutingOutputREfs: DataOutput[];
+    }
+    interface Property extends ItemAwareElement {
+        name: string;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface DataInputAssociation extends DataAssociation {}
+    // tslint:disable-next-line:no-empty-interface
+    interface DataOutputAssociation extends DataAssociation {}
+    interface InputOutputSpecification extends BaseElement {
+        dataInputs: DataInput[];
+        dataOutputs: DataOutput[];
+        inputSets: InputSet[];
+        outputSets: OutputSet[];
+    }
+    interface DataObject extends FlowElement, ItemAwareElement {
+        /** @default false */
+        isCollection: boolean;
+    }
+    interface InputOutputBinding extends TypeDerived {
+        inputDataRef: InputSet;
+        outputDataRef: OutputSet;
+        operationRef: Operation;
+    }
+    interface Assignment extends BaseElement {
+        from: Expression;
+        to: Expression;
+    }
+    interface DataStore extends RootElement, ItemAwareElement {
+        name: string;
+        capacity: number;
+        isUnlimited: boolean;
+    }
+    interface DataStoreReference extends FlowElement, ItemAwareElement {
+        dataStoreRef: DataStore;
+    }
+    interface DataObjectReference extends ItemAwareElement, FlowElement {
+        dataObjectRef: DataObject;
+    }
+    interface ConversationLink extends BaseElement {
+        sourceRef: InteractionNode;
+        targetRef: InteractionNode;
+        name: string;
+    }
+
+    interface ConversationAssociation extends ConversationNode {
+        innerConversationNodeRef: ConversationNode;
+        outerConversationNodeRef: ConversationNode;
+    }
+    interface CallConversation extends ConversationNode {
+        calledCollaborationRef: Collaboration;
+        participantAssociations: ParticipantAssociation[];
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Conversation extends ConversationNode {}
+    interface SubConversation extends ConversationNode {
+        conversationNodes: ConversationNode[];
+    }
+    interface ConversationNode extends InteractionNode, BaseElement {
+        name: string;
+        participantRefs: Participant[];
+        messageFlowRefs: MessageFlow[];
+        correlationKeys: CorrelationKey[];
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface GlobalConversation extends Collaboration {}
+    interface PartnerEntity extends RootElement {
+        name: string;
+        participantRef: Participant[];
+    }
+    interface PartnerRole extends RootElement {
+        name: string;
+        participantRef: Participant[];
+    }
+
+    interface CorrelationProperty extends RootElement {
+        correlationPropertyRetrievalExpression: CorrelationPropertyRetrievalExpression;
+        name: string;
+        type: ItemDefinition;
+    }
+    interface ErrorElement extends RootElement {
+        structureRef: ItemDefinition;
+        name: string;
+        errorCode: string;
+    }
+    interface CorrelationKey extends BaseElement {
+        correlationPropertyRef: CorrelationProperty;
+        name: string;
+    }
+    interface Expression extends BaseElement {
+        body: string;
+    }
+    interface FormalExpression extends Expression {
+        language: string;
+        evaluatesToTypeRef: ItemDefinition;
+    }
+    interface Message extends RootElement {
+        name: string;
+        itemRef: ItemDefinition;
+    }
+    interface ItemDefinition extends RootElement {
+        itemKind: ItemKind;
+        structureRef: string;
+        /** @default false */
+        isCollection: boolean;
+        import: Import;
+    }
+    interface FlowElement extends RootElement {
+        name?: string;
+        auditing: Auditing;
+        monitoring: Monitoring;
+        categoryValueRef: CategoryValue[];
+    }
+    interface SequenceFlow extends FlowElement {
+        isImmediate: boolean;
+        conditionExpression: Expression;
+        sourceRef: FlowNode;
+        targetRef: FlowNode;
+    }
+    interface FlowElementsContainer extends BaseElement {
+        laneSets: LaneSet[];
+        flowElements: FlowElement[];
+    }
+    interface FlowNode extends FlowElement {
+        incoming: SequenceFlow[];
+        outgoing: SequenceFlow[];
+        lanes: Lane[];
+    }
+    interface CorrelationPropertyRetrievalExpression extends BaseElement {
+        messagePath: FormalExpression;
+        messageRef: Message;
+    }
+    interface CorrelationPropertyBinding extends BaseElement {
+        dataPath: FormalExpression;
+        correlationPropertyRef: CorrelationProperty;
+    }
+    interface Resource extends RootElement {
+        name: string;
+        resourceParameters: ResourceParameter[];
+    }
+    interface ResourceParameter extends BaseElement {
+        name: string;
+        isRequired: boolean;
+        type: ItemDefinition;
+    }
+    interface CorrelationSubscription extends BaseElement {
+        correlationKeyRef: CorrelationKey;
+        correlationPropertyBinding: CorrelationKey[];
+    }
+    interface MessageFlow extends BaseElement {
+        name: string;
+        sourceRef: InteractionNode;
+        targetRef: InteractionNode;
+        messageRef: Message;
+    }
+    interface MessageFlowAssociation extends BaseElement {
+        innerMessageFlowRef: MessageFlow;
+        outerMessageFlowRef: MessageFlow;
+    }
+    interface InteractionNode extends TypeDerived {
+        incomingConversationLinks: ConversationLink[];
+        outgoingConversationLinks: ConversationLink[];
+    }
+    interface Participant extends InteractionNode, BaseElement {
+        name: string;
+        interfaceRef: Interface[];
+        participantMultiplicity: ParticipantMultiplicity;
+        endPointRefs: EndPoint[];
+        processRef: Process;
+    }
+    interface ParticipantAssociation extends BaseElement {
+        innerParticipantRef: Participant;
+        outerParticipantRef: Participant;
+    }
+    interface ParticipantMultiplicity extends BaseElement {
+        minimum: number;
+        maximum: number;
+    }
+    interface Collaboration extends RootElement {
+        name: string;
+        isClosed: boolean;
+        participants: Participant[];
+        messageFlows: MessageFlow[];
+        artifacts: Artifact[];
+        conversations: ConversationNode[];
+        conversationAssociations: ConversationAssociation[];
+        participantAssociations: ParticipantAssociation[];
+        messageFlowAssociations: MessageFlowAssociation[];
+        correlationKeys: CorrelationKey[];
+        choreographyRef: Choreography[];
+        conversationLinks: ConversationLink[];
+    }
+    interface ChoreographyActivity extends FlowNode {
+        participantRef: Participant[];
+        initiatingParticipantRef: Participant;
+        correlationKeys: CorrelationKey[];
+        loopType: ChoreographyLoopType;
+    }
+    interface CallChoreography extends ChoreographyActivity {
+        calledChoreographyRef: Choreography;
+        participantAssociations: ParticipantAssociation[];
+    }
+    interface SubChoreography
+        extends ChoreographyActivity,
+            FlowElementsContainer {
+        artifacts: Artifact[];
+    }
+    interface ChoreographyTask extends ChoreographyActivity {
+        messageFlowRef: MessageFlow[];
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Choreography extends FlowElementsContainer, Collaboration {}
+    interface GlobalChoreographyTask extends Choreography {
+        initiatingParticipantRef: Participant;
+    }
+    interface TextAnnotation extends Artifact {
+        text: string;
+        textFormat: string;
+    }
+    interface Group extends Artifact {
+        categoryValueRef: CategoryValue;
+    }
+    interface Association extends Artifact {
+        associationDirection: AssociationDirection;
+        sourceRef: BaseElement;
+        targetRef: BaseElement;
+    }
+    interface Category extends RootElement {
+        categoryValue: CategoryValue;
+        name: string;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Artifact extends BaseElement {}
+    interface CategoryValue extends BaseElement {
+        categorizedFlowElements: FlowElement[];
+        value: string;
+    }
+    interface Activity extends FlowNode {
+        isForCompensation: boolean;
+        default: SequenceFlow;
+        ioSpecification: InputOutputSpecification;
+        boundaryEventRefs: BoundaryEvent[];
+        properties: Property[];
+        dataInputAssociations: DataInputAssociation[];
+        dataOutputAssociations: DataOutputAssociation[];
+        startQuantity: number;
+        resources: ResourceRole;
+        completionQuantity: number;
+        loopCharacteristics: LoopCharacteristics;
+    }
+    interface ServiceTask extends Task {
+        implementation: string;
+        operationRef: Operation;
+    }
+    interface SubProcess
+        extends Activity,
+            FlowElementsContainer,
+            InteractionNode {
+        triggeredByEvent: boolean;
+        artifacts: Artifact[];
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface LoopCharacteristics extends BaseElement {}
+    interface MultiInstanceLoopCharacteristics extends LoopCharacteristics {
+        isSequential: boolean;
+        behavior: MultiInstanceBehaviour;
+        loopCardinality: Expression;
+        loopDataInputRef: ItemAwareElement;
+        loopDataOutputRef: ItemAwareElement;
+        inputDataItem: DataInput;
+        outputDataItem: DataOutput;
+        complexBehaviorDefinition: ComplexBehaviorDefinition;
+        completionCondition: Expression;
+        oneBehaviorEventRef: EventDefinition;
+        noneBehaviorEventRef: EventDefinition;
+    }
+    interface StandardLoopCharacteristics extends LoopCharacteristics {
+        testBefore: boolean;
+        loopCondition: Expression;
+        loopMaximum: Expression;
+    }
+    interface CallActivity extends Activity {
+        calledElement: string;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Task extends Activity, InteractionNode {}
+    interface SendTask extends Task {
+        implementation: string;
+        operationRef: Operation;
+        messageRef: Message;
+    }
+    interface ReceiveTask extends Task {
+        implementation: string;
+        instantiate: boolean;
+        operationRef: Operation;
+        messageRef: Message;
+    }
+    interface ScriptTask extends Task {
+        scriptFormat: string;
+        script: string;
+    }
+    interface BusinessRuleTask extends Task {
+        implementation: string;
+    }
+    interface AdHocSubProcess extends SubProcess {
+        completionCondition: Expression;
+        ordering: AdHocOrdering;
+        cancelRemainingInstances: boolean;
+    }
+    interface Transaction extends SubProcess {
+        protocal: string;
+        method: string;
+    }
+    interface GlobalScriptTask extends GlobalTask {
+        scriptLanguage: string;
+        script: string;
+    }
+    interface GlobalBusinessRuleTask extends GlobalTask {
+        implementation: string;
+    }
+    interface ComplexBehaviorDefinition extends BaseElement {
+        condition: FormalExpression;
+        event: ImplicitThrowEvent;
+    }
+    interface ResourceParameterBinding extends TypeDerived {
+        expression: Expression;
+        parameterRef: ResourceParameter;
+    }
+    interface ResourceAssignmentExpression extends BaseElement {
+        expression: Expression;
+    }
+    interface Import extends TypeDerived {
+        importType: string;
+        location: string;
+        namespace: string;
+    }
+    interface Definitions extends BaseElement {
+        name: string;
+        targetNamespace: string;
+        expressionLanguage: string;
+        typeLanguage: string;
+        imports: Import[];
+        extensions: Extension[];
+        rootElements: RootElement[];
+        diagrams: BPMNDiagram;
+        er: string;
+        relationship: Relationship[];
+        erVersion: string;
+    }
+    interface BPMNDiagram extends Diagram {
+        plane: BPMNPlane;
+        labelStyle: BPMNLabelStyle;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface BPMNPlane extends Plane {}
+    // tslint:disable-next-line:no-empty-interface
+    interface BPMNShape extends LabeledShape {}
+    // tslint:disable-next-line:no-empty-interface
+    interface BPMNEdge extends LabeledEdge {}
+    // tslint:disable-next-line:no-empty-interface
+    interface BPMNLabel extends Label {}
+    // tslint:disable-next-line:no-empty-interface
+    interface BPMNLabelStyle extends Style {}
+    interface Font extends TypeDerived {
+        name: string;
+        size: number;
+        isBold: boolean;
+        isItalic: boolean;
+        isUnderline: boolean;
+        isStrikeThrough: boolean;
+    }
+    interface Point extends TypeDerived {
+        x: number;
+        y: number;
+        width: number;
+        height: number;
+    }
+    // tslint:disable-next-line:no-empty-interface
+    interface Bounds extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface DiagramElement extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Node extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Edge extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Diagram extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Shape extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Plane extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface LabeledEdge extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface LabeledShape extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Label extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface Style extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface ColoredShape extends TypeDerived {}
+    // tslint:disable-next-line:no-empty-interface
+    interface ColoredEdge extends TypeDerived {}
+
+    interface ElementTypes {
+        "bpmn:Interface": Interface;
+        "bpmn:Operation": Operation;
+        "bpmn:EndPoint": EndPoint;
+        "bpmn:Auditing": Auditing;
+        "bpmn:GlobalTask": GlobalTask;
+        "bpmn:Monitoring": Monitoring;
+        "bpmn:Performer": Performer;
+        "bpmn:Process": Process;
+        "bpmn:LaneSet": LaneSet;
+        "bpmn:Lane": Lane;
+        "bpmn:GlobalManualTask": GlobalManualTask;
+        "bpmn:ManualTask": ManualTask;
+        "bpmn:UserTask": UserTask;
+        "bpmn:Rendering": Rendering;
+        "bpmn:HumanPerformer": HumanPerformer;
+        "bpmn:PotentialOwner": PotentialOwner;
+        "bpmn:GlobalUserTask": GlobalUserTask;
+        "bpmn:Gateway": Gateway;
+        "bpmn:EventBasedGateway": EventBasedGateway;
+        "bpmn:ComplexGateway": ComplexGateway;
+        "bpmn:ExclusiveGateway": ExclusiveGateway;
+        "bpmn:InclusiveGateway": InclusiveGateway;
+        "bpmn:ParallelGateway": ParallelGateway;
+        "bpmn:RootElement": RootElement;
+        "bpmn:Relationship": Relationship;
+        "bpmn:BaseElement": BaseElement;
+        "bpmn:Extension": Extension;
+        "bpmn:ExtensionDefinition": ExtensionDefinition;
+        "bpmn:ExtensionAttributeDefinition": ExtensionAttributeDefinition;
+        "bpmn:ExtensionElements": ExtensionElements;
+        "bpmn:Documentation": Documentation;
+        "bpmn:Event": Event;
+        "bpmn:IntermediateCatchEvent": IntermediateCatchEvent;
+        "bpmn:IntermediateThrowEvent": IntermediateThrowEvent;
+        "bpmn:EndEvent": EndEvent;
+        "bpmn:StartEvent": StartEvent;
+        "bpmn:ThrowEvent": ThrowEvent;
+        "bpmn:CatchEvent": CatchEvent;
+        "bpmn:BoundaryEvent": BoundaryEvent;
+        "bpmn:EventDefinition": EventDefinition;
+        "bpmn:CancelEventDefinition": CancelEventDefinition;
+        "bpmn:ErrorEventDefinition": ErrorEventDefinition;
+        "bpmn:TerminateEventDefinition": TerminateEventDefinition;
+        "bpmn:EscalationEventDefinition": EscalationEventDefinition;
+        "bpmn:Escalation": Escalation;
+        "bpmn:CompensateEventDefinition": CompensateEventDefinition;
+        "bpmn:TimerEventDefinition": TimerEventDefinition;
+        "bpmn:LinkEventDefinition": LinkEventDefinition;
+        "bpmn:MessageEventDefinition": MessageEventDefinition;
+        "bpmn:ConditionalEventDefinition": ConditionalEventDefinition;
+        "bpmn:SignalEventDefinition": SignalEventDefinition;
+        "bpmn:Signal": Signal;
+        "bpmn:ImplicitThrowEvent": ImplicitThrowEvent;
+        "bpmn:DataState": DataState;
+        "bpmn:ItemAwareElement": ItemAwareElement;
+        "bpmn:DataAssociation": DataAssociation;
+        "bpmn:DataInput": DataInput;
+        "bpmn:DataOutput": DataOutput;
+        "bpmn:InputSet": InputSet;
+        "bpmn:OutputSet": OutputSet;
+        "bpmn:Property": Property;
+        "bpmn:DataInputAssociation": DataInputAssociation;
+        "bpmn:DataOutputAssociation": DataOutputAssociation;
+        "bpmn:InputOutputSpecification": InputOutputSpecification;
+        "bpmn:DataObject": DataObject;
+        "bpmn:InputOutputBinding": InputOutputBinding;
+        "bpmn:Assignment": Assignment;
+        "bpmn:DataStore": DataStore;
+        "bpmn:DataStoreReference": DataStoreReference;
+        "bpmn:DataObjectReference": DataObjectReference;
+        "bpmn:ConversationLink": ConversationLink;
+        "bpmn:ConversationAssociation": ConversationAssociation;
+        "bpmn:CallConversation": CallConversation;
+        "bpmn:Conversation": Conversation;
+        "bpmn:SubConversation": SubConversation;
+        "bpmn:ConversationNode": ConversationNode;
+        "bpmn:GlobalConversation": GlobalConversation;
+        "bpmn:PartnerEntity": PartnerEntity;
+        "bpmn:PartnerRole": PartnerRole;
+        "bpmn:CorrelationProperty": CorrelationProperty;
+        "bpmn:Error": ErrorElement;
+        "bpmn:CorrelationKey": CorrelationKey;
+        "bpmn:Expression": Expression;
+        "bpmn:FormalExpression": FormalExpression;
+        "bpmn:Message": Message;
+        "bpmn:ItemDefinition": ItemDefinition;
+        "bpmn:FlowElement": FlowElement;
+        "bpmn:SequenceFlow": SequenceFlow;
+        "bpmn:FlowElementsContainer": FlowElementsContainer;
+        "bpmn:CallableElement": CallableElement;
+        "bpmn:FlowNode": FlowNode;
+        "bpmn:CorrelationPropertyRetrievalExpression": CorrelationPropertyRetrievalExpression;
+        "bpmn:CorrelationPropertyBinding": CorrelationPropertyBinding;
+        "bpmn:Resource": Resource;
+        "bpmn:ResourceParameter": ResourceParameter;
+        "bpmn:CorrelationSubscription": CorrelationSubscription;
+        "bpmn:MessageFlow": MessageFlow;
+        "bpmn:MessageFlowAssociation": MessageFlowAssociation;
+        "bpmn:InteractionNode": InteractionNode;
+        "bpmn:Participant": Participant;
+        "bpmn:ParticipantAssociation": ParticipantAssociation;
+        "bpmn:ParticipantMultiplicity": ParticipantMultiplicity;
+        "bpmn:Collaboration": Collaboration;
+        "bpmn:ChoreographyActivity": ChoreographyActivity;
+        "bpmn:CallChoreography": CallChoreography;
+        "bpmn:SubChoreography": SubChoreography;
+        "bpmn:ChoreographyTask": ChoreographyTask;
+        "bpmn:Choreography": Choreography;
+        "bpmn:GlobalChoreographyTask": GlobalChoreographyTask;
+        "bpmn:TextAnnotation": TextAnnotation;
+        "bpmn:Group": Group;
+        "bpmn:Association": Association;
+        "bpmn:Category": Category;
+        "bpmn:Artifact": Artifact;
+        "bpmn:CategoryValue": CategoryValue;
+        "bpmn:Activity": Activity;
+        "bpmn:ServiceTask": ServiceTask;
+        "bpmn:SubProcess": SubProcess;
+        "bpmn:LoopCharacteristics": LoopCharacteristics;
+        "bpmn:MultiInstanceLoopCharacteristics": MultiInstanceLoopCharacteristics;
+        "bpmn:StandardLoopCharacteristics": StandardLoopCharacteristics;
+        "bpmn:CallActivity": CallActivity;
+        "bpmn:Task": Task;
+        "bpmn:SendTask": SendTask;
+        "bpmn:ReceiveTask": ReceiveTask;
+        "bpmn:ScriptTask": ScriptTask;
+        "bpmn:BusinessRuleTask": BusinessRuleTask;
+        "bpmn:AdHocSubProcess": AdHocSubProcess;
+        "bpmn:Transaction": Transaction;
+        "bpmn:GlobalScriptTask": GlobalScriptTask;
+        "bpmn:GlobalBusinessRuleTask": GlobalBusinessRuleTask;
+        "bpmn:ComplexBehaviorDefinition": ComplexBehaviorDefinition;
+        "bpmn:ResourceRole": ResourceRole;
+        "bpmn:ResourceParameterBinding": ResourceParameterBinding;
+        "bpmn:ResourceAssignmentExpression": ResourceAssignmentExpression;
+        "bpmn:Import": Import;
+        "bpmn:Definitions": Definitions;
+        "bpmndi:BPMNDiagram": BPMNDiagram;
+        "bpmndi:BPMNPlane": BPMNPlane;
+        "bpmndi:BPMNShape": BPMNShape;
+        "bpmndi:BPMNEdge": BPMNEdge;
+        "bpmndi:BPMNLabel": BPMNLabel;
+        "bpmndi:BPMNLabelStyle": BPMNLabelStyle;
+        "dc:boolean": boolean;
+        "dc:number": number;
+        "dc:Real": any;
+        "dc:string": string;
+        "dc:Font": Font;
+        "dc:Point": Point;
+        "dc:Bounds": Bounds;
+        "di:DiagramElement": DiagramElement;
+        "di:Node": Node;
+        "di:Edge": Edge;
+        "di:Diagram": Diagram;
+        "di:Shape": Shape;
+        "di:Plane": Plane;
+        "di:LabeledEdge": LabeledEdge;
+        "di:LabeledShape": LabeledShape;
+        "di:Label": Label;
+        "di:Style": Style;
+        "di:Extension": Extension;
+        "bioc:ColoredShape": ColoredShape;
+        "bioc:ColoredEdge": ColoredEdge;
+    }
+
+    type ElementType = keyof ElementTypes;
+
+    interface Option {
+        [key: string]: any;
+    }
+
+    interface BPMNModdleConstructor {
+        new (packages?: any, options?: Option): BPMNModdle;
+    }
+
+    type ImportFn = (
+        err: Error,
+        definitions: Definitions,
+        parseContext: any
+    ) => void;
+
+    interface Moddle {
+        /**
+         * Create an instance of the specified type.
+         *
+         * @example
+         *
+         * var foo = moddle.create('my:Foo');
+         * var bar = moddle.create('my:Bar', { id: 'BAR_1' });
+         *
+         * @param  descriptor the type descriptor or name know to the model
+         * @param  attrs   a number of attributes to initialize the model instance with
+         * @return model instance
+         */
+        create<T = ElementTypes, K extends keyof T = keyof T>(
+            descriptor: K,
+            attrs?: any
+        ): T[K];
+        create(descriptor: any, attrs?: any): BaseElement;
+
+        /**
+         * Returns the type representing a given descriptor
+         *
+         * @example
+         *
+         * var Foo = moddle.getType('my:Foo');
+         * var foo = new Foo({ 'id' : 'FOO_1' });
+         *
+         * @param  descriptor the type descriptor or name know to the model
+         * @return the type representing the descriptor
+         */
+        getType(descriptor: any): any;
+
+        /**
+         * Creates an any-element type to be used within model instances.
+         *
+         * This can be used to create custom elements that lie outside the meta-model.
+         * The created element contains all the meta-data required to serialize it
+         * as part of meta-model elements.
+         *
+         * @example
+         *
+         * var foo = moddle.createAny('vendor:Foo', 'http://vendor', {
+         *   value: 'bar'
+         * });
+         *
+         * var container = moddle.create('my:Container', 'http://my', {
+         *   any: [ foo ]
+         * });
+         *
+         * // go ahead and serialize the stuff
+         *
+         *
+         * @param  name  the name of the element
+         * @param  nsUri the namespace uri of the element
+         * @param  [properties] a map of properties to initialize the instance with
+         * @return the any type instance
+         */
+        createAny(name: string, nsUri: string, properties: any): any;
+
+        /**
+         * Returns a registered package by uri or prefix
+         *
+         * @return the package
+         */
+        getPackage(uriOrPrefix: any): any;
+
+        /**
+         * Returns a snapshot of all known packages
+         *
+         * @return the package
+         */
+        getPackages(): any;
+        /**
+         * Returns the descriptor for an element
+         */
+        getElementDescriptor(element: any): any;
+
+        /**
+         * Returns true if the given descriptor or instance
+         * represents the given type.
+         *
+         * May be applied to this, if element is omitted.
+         */
+        hasType(element: any, type: string): any;
+
+        /**
+         * Returns the descriptor of an elements named property
+         */
+        getPropertyDescriptor(element: any, property: any): any;
+        /**
+         * Returns a mapped type's descriptor
+         */
+        getTypeDescriptor(type: string): any;
+    }
+
+    interface BPMNModdle extends Moddle {
+        /**
+         * Instantiates a BPMN model tree from a given xml string.
+         *
+         * @param xmlStr
+         * XML string
+         *
+         * @param done
+         * done callback
+         */
+        fromXML(xmlStr: string, done: ImportFn): void;
+
+        /**
+         * Instantiates a BPMN model tree from a given xml string.
+         *
+         * @param xmlStr
+         * XML string
+         *
+         * @param options
+         * Options to pass to the underlying reader
+         *
+         * @param done
+         * done callback
+         */
+        fromXML(xmlStr: string, options: Option, done: ImportFn): void;
+
+        /**
+         * Instantiates a BPMN model tree from a given xml string.
+         *
+         * @param xmlStr
+         * XML string
+         *
+         * @param typeName
+         * Name of the root element
+         *
+         * @param options
+         * Options to pass to the underlying reader
+         *
+         * @param done
+         * done callback
+         */
+        fromXML(
+            xmlStr: string,
+            typeName: string,
+            options: Option,
+            done: ImportFn
+        ): void;
+    }
+}
+
+declare const BPMNModdle: BPMNModdle.BPMNModdleConstructor;
+export = BPMNModdle;
diff --git a/types/bpmn-moddle/tsconfig.json b/types/bpmn-moddle/tsconfig.json
new file mode 100644
index 0000000000..2fbd3fe7c3
--- /dev/null
+++ b/types/bpmn-moddle/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", "bpmn-moddle-tests.ts"]
+}
diff --git a/types/bpmn-moddle/tslint.json b/types/bpmn-moddle/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bpmn-moddle/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/braft-editor/index.d.ts b/types/braft-editor/index.d.ts
index 1ad5f728ad..62f339a41b 100644
--- a/types/braft-editor/index.d.ts
+++ b/types/braft-editor/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for braft-editor 1.1
+// Type definitions for braft-editor 1.9
 // Project: https://github.com/margox/braft#readme
 // Definitions by: My Self <https://github.com/me>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { RawDraftContentState } from 'draft-js';
@@ -17,25 +17,44 @@ declare namespace BraftEditor {
 		editorState?: any;
 		contentFormat?: 'raw' | 'html';
 		initialContent?: string | null;
+		contentId?: string | number;
 		onChange?: (content: RawDraftContentState) => void;
 		onRawChange?: (content: RawDraftContentState) => void;
 		onHTMLChange?: (content: string) => void;
+		onTab?: (event: Event) => void;
+		onSave?: () => void;
+		onFocus?: () => void;
+		onBlur?: () => void;
 		controls?: string[];
+		excludeControls?: string[];
 		extendControls?: any[];
+		extendAtomics?: any[];
+		disabled?: boolean;
 		height?: number;
 		language?: string;
 		placeholder?: string;
 		viewWrapper?: string;
+		tabIndents?: number;
+		forceNewLine?: boolean;
+		textAlignOptions?: string[];
 		colors?: string[];
+		allowSetTextBackgroundColor?: boolean;
 		fontSizes?: number[];
+		lineHeights?: number[];
+		letterSpacings?: number[];
+		indents?: number[];
 		fontFamilies?: fontFamiliesRange[];
+		emojis?: string[];
+		pasteMode?: 'text' | '';
 		media?: { [key: string]: any };
+		imageControls?: 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;
+		insertMedias?: (medias: Array<{ type: string, name: string, url: string }>) => any;
+		insertText?: (text: string, replace?: boolean) => any;
+		insertHTML?: (htmlString: string) => any;
 		toggleSelectionLink?: (href: string, target: string) => void;
 		toggleSelectionAlignment?: (alignment: string) => any;
 		toggleSelectionColor?: (hexColor: string) => void;
@@ -50,10 +69,12 @@ declare namespace BraftEditor {
 		getDraftInstance?: () => any;
 		getMediaLibraryInstance?: () => any;
 		getSelectionInlineStyle?: () => any;
+		isEmpty?: () => boolean;
+		clear?: () => any;
 		undo?: () => any;
 		redo?: () => any;
-		focus?: () => void;
-		blur?: () => void;
+		focus?: () => any;
+		blur?: () => any;
 	}
 }
 declare class BraftEditor extends React.Component<BraftEditor.editorProps> { }
diff --git a/types/bro-fs/bro-fs-tests.ts b/types/bro-fs/bro-fs-tests.ts
new file mode 100644
index 0000000000..75451a303a
--- /dev/null
+++ b/types/bro-fs/bro-fs-tests.ts
@@ -0,0 +1,7 @@
+import * as fs from 'bro-fs';
+
+fs.init({type: window.TEMPORARY, bytes: 5 * 1024 * 1024})
+  .then(() => fs.mkdir('dir'))
+  .then(() => fs.writeFile('dir/file.txt', 'hello world'))
+  .then(() => fs.readFile('dir/file.txt', {type: 'Text'}))
+  .then(content => console.log(content)); // => "hello world"
diff --git a/types/bro-fs/index.d.ts b/types/bro-fs/index.d.ts
new file mode 100644
index 0000000000..e0d11cddbe
--- /dev/null
+++ b/types/bro-fs/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for bro-fs 0.4
+// Project: https://github.com/vitalets/bro-fs#readme
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="filesystem" />
+
+export type TextType = 'Text' | 'BinaryString' | 'DataURL';
+
+export interface FSOptions {
+    bytes?: number;
+    /**
+     * show request quota popup for PERSISTENT type
+     * (for Chrome extensions with `unlimitedStorage` permission it is useful to pass `options.requestQuota = false`)
+     */
+    requestQuota?: boolean;
+    /** `window.PERSISTENT` | `window.TEMPORARY` */
+    type?: number;
+}
+
+export interface StatObject {
+    fullPath: string;
+    isDirectory: boolean;
+    isFile: boolean;
+    modificationTime: Date;
+    name: string;
+    size: number;
+}
+
+export interface UsageObject {
+    grantedBytes: number;
+    usedBytes: number;
+}
+
+export function appendFile(path: string | FileEntry, data: string |  Blob | File | ArrayBuffer): Promise<FileSystem>;
+export function clear(): Promise<undefined[]>;
+export function copy(oldPath: string | FileEntry, newPath: string, options?: {create?: boolean}): Promise<FileEntry>;
+export function exists(path: string): Promise<boolean>;
+export function getEntry(path: FileEntry): Promise<FileEntry>;
+export function getRoot(): Promise<DirectoryEntry>;
+export function getUrl(path: string | FileEntry): Promise<string>;
+export function init(options?: FSOptions): Promise<FileSystem>;
+export function isSupported(): boolean;
+export function mkdir(path: string): Promise<DirectoryEntry>;
+export function readdir(path: string | DirectoryEntry, options?: {deep?: boolean}): Promise<FileEntry[]>;
+export function readFile(path: string | FileEntry, options: {type: 'ArrayBuffer'}): Promise<ArrayBuffer>;
+export function readFile(path: string | FileEntry, options?: {type?: TextType}): Promise<string>;
+export function rename(oldPath: string | FileEntry, newPath: string,  options?: {create?: boolean}): Promise<FileEntry>;
+export function rmdir(path: string | DirectoryEntry): Promise<boolean>;
+export function stat(path: string | FileEntry): Promise<StatObject>;
+export function unlink(path: string | FileEntry): Promise<boolean>;
+export function usage(): Promise<UsageObject>;
+export function writeFile(path: string, data: string | Blob | File | ArrayBuffer): Promise<FileEntry>;
diff --git a/types/storejs/tsconfig.json b/types/bro-fs/tsconfig.json
similarity index 94%
rename from types/storejs/tsconfig.json
rename to types/bro-fs/tsconfig.json
index df8e4268e3..d8a019ec81 100644
--- a/types/storejs/tsconfig.json
+++ b/types/bro-fs/tsconfig.json
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "storejs-tests.ts"
+        "bro-fs-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/bro-fs/tslint.json b/types/bro-fs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/bro-fs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/bson/bson-tests.ts b/types/bson/bson-tests.ts
index b3173053c8..f75ee94523 100644
--- a/types/bson/bson-tests.ts
+++ b/types/bson/bson-tests.ts
@@ -9,7 +9,7 @@ let Long = bson.Long;
 let doc = { long: Long.fromNumber(100) }
 
 // Serialize a document
-let data = BSON.serialize(doc, false, true, false);
+let data = BSON.serialize(doc);
 console.log("data:", data);
 
 // Deserialize the resulting Buffer
diff --git a/types/bson/index.d.ts b/types/bson/index.d.ts
index 3b0feb0113..e6afab65a5 100644
--- a/types/bson/index.d.ts
+++ b/types/bson/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for bson 1.0.4
+// Type definitions for bson 1.0.6
 // Project: https://github.com/mongodb/js-bson
 // Definitions by: Hiroki Horiuchi <https://github.com/horiuchi>
 //                 Federico Caselli <https://github.com/CaselIT>
@@ -6,34 +6,81 @@
 
 /// <reference types="node"/>
 
+interface CommonSerializeOptions {
+    /** {default:false}, the serializer will check if keys are valid. */
+    checkKeys?: boolean;
+    /** {default:false}, serialize the javascript functions. */
+    serializeFunctions?: boolean;
+    /** {default:true}, ignore undefined fields. */
+    ignoreUndefined?: boolean;
+}
+
+export interface SerializeOptions extends CommonSerializeOptions {
+    /** {default:1024*1024*17}, minimum size of the internal temporary serialization buffer. */
+    minInternalBufferSize?: number;
+}
+
+export interface SerializeWithBufferAndIndexOptions extends CommonSerializeOptions {
+    /** {default:0}, the index in the buffer where we wish to start serializing into. */
+    index?: number;
+}
+
 export interface DeserializeOptions {
-    /** {Boolean, default:false}, evaluate functions in the BSON document scoped to the object deserialized. */
+    /** {default:false}, evaluate functions in the BSON document scoped to the object deserialized. */
     evalFunctions?: boolean;
-    /** {Boolean, default:false}, cache evaluated functions for reuse. */
+    /** {default:false}, cache evaluated functions for reuse. */
     cacheFunctions?: boolean;
-    /** {Boolean, default:false}, use a crc32 code for caching, otherwise use the string of the function. */
+    /** {default:false}, use a crc32 code for caching, otherwise use the string of the function. */
     cacheFunctionsCrc32?: boolean;
-    /** {Boolean, default:false}, deserialize Binary data directly into node.js Buffer object. */
+    /** {default:true}, when deserializing a Long will fit it into a Number if it's smaller than 53 bits. */
+    promoteLongs?: boolean;
+    /** {default:false}, deserialize Binary data directly into node.js Buffer object. */
     promoteBuffers?: boolean;
+    /** {default:false}, when deserializing will promote BSON values to their Node.js closest equivalent types. */
+    promoteValues?: boolean;
+    /** {default:null}, allow to specify if there what fields we wish to return as unserialized raw buffer. */
+    fieldsAsRaw?: { readonly [fieldName: string]: boolean };
+    /** {default:false}, return BSON regular expressions as BSONRegExp instances. */
+    bsonRegExp?: boolean;
 }
 
 export interface CalculateObjectSizeOptions {
-    /** {Boolean, default:false}, serialize the javascript functions */
+    /** {default:false}, serialize the javascript functions */
     serializeFunctions?: boolean;
-    /** {Boolean, default:true}, ignore undefined fields. */
+    /** {default:true}, ignore undefined fields. */
     ignoreUndefined?: boolean;
 }
 
 export class BSON {
+
     /**
-     * @param {Object} object the Javascript object to serialize.
-     * @param {Boolean} checkKeys the serializer will check if keys are valid.
-     * @param {Boolean} asBuffer return the serialized object as a Buffer object (ignore).
-     * @param {Boolean} serializeFunctions serialize the javascript functions (default:false)
-     * @return {Buffer} returns a TypedArray or Array depending on what your browser supports
+     * Serialize a Javascript object.
+     * 
+     * @param object The Javascript object to serialize.
+     * @param options Serialize options.
+     * @return The Buffer object containing the serialized object.
      */
-    serialize(object: any, checkKeys?: boolean, asBuffer?: boolean, serializeFunctions?: boolean): Buffer;
-    deserialize(buffer: Buffer, options?: DeserializeOptions, isArray?: boolean): any;
+    serialize(object: any, options?: SerializeOptions): Buffer;
+
+    /**
+     * Serialize a Javascript object using a predefined Buffer and index into the buffer, useful when pre-allocating the space for serialization.
+     * 
+     * @param object The Javascript object to serialize.
+     * @param buffer The Buffer you pre-allocated to store the serialized BSON object.
+     * @param options Serialize options.
+     * @returns The index pointing to the last written byte in the buffer
+     */
+    serializeWithBufferAndIndex(object: any, buffer: Buffer, options?: SerializeWithBufferAndIndexOptions): number;
+
+    /**
+     * Deserialize data as BSON.
+     * 
+     * @param buffer The buffer containing the serialized set of BSON documents.
+     * @param options Deserialize options.
+     * @returns The deserialized Javascript Object.
+     */
+    deserialize(buffer: Buffer, options?: DeserializeOptions): any;
+
     /**
      * Calculate the bson size for a passed in Javascript object.
      *
@@ -42,21 +89,50 @@ export class BSON {
      * @return {Number} returns the number of bytes the BSON object will take up.
      */
     calculateObjectSize(object: any, options?: CalculateObjectSizeOptions): number;
+
+    /**
+     * Deserialize stream data as BSON documents.
+     * 
+     * @param data The buffer containing the serialized set of BSON documents.
+     * @param startIndex The start index in the data Buffer where the deserialization is to start.
+     * @param numberOfDocuments Number of documents to deserialize
+     * @param documents An array where to store the deserialized documents
+     * @param docStartIndex The index in the documents array from where to start inserting documents
+     * @param options Additional options used for the deserialization
+     * @returns The next index in the buffer after deserialization of the `numberOfDocuments`
+     */
+    deserializeStream(
+        data: Buffer,
+        startIndex: number,
+        numberOfDocuments: number,
+        documents: Array<any>,
+        docStartIndex: number,
+        options?: DeserializeOptions
+    ): number;
+
 }
 
+/** A class representation of the BSON Binary type. */
 export class Binary {
-    static SUBTYPE_DEFAULT: number;
-    static SUBTYPE_FUNCTION: number;
-    static SUBTYPE_BYTE_ARRAY: number;
-    static SUBTYPE_UUID_OLD: number;
-    static SUBTYPE_UUID: number;
-    static SUBTYPE_MD5: number;
-    static SUBTYPE_USER_DEFINED: number;
 
+    static readonly SUBTYPE_DEFAULT: number;
+    static readonly SUBTYPE_FUNCTION: number;
+    static readonly SUBTYPE_BYTE_ARRAY: number;
+    static readonly SUBTYPE_UUID_OLD: number;
+    static readonly SUBTYPE_UUID: number;
+    static readonly SUBTYPE_MD5: number;
+    static readonly SUBTYPE_USER_DEFINED: number;
+
+    /**
+     * @param buffer A buffer object containing the binary data
+     * @param subType Binary data subtype
+     */
     constructor(buffer: Buffer, subType?: number);
 
     /** The underlying Buffer which stores the binary data. */
     readonly buffer: Buffer;
+    /** Binary data subtype */
+    readonly sub_type?: number;
 
     /** The length of the binary. */
     length(): number;
@@ -69,80 +145,211 @@ export class Binary {
     /** Writes a buffer or string to the binary */
     write(buffer: Buffer | string, offset: number): void;
 }
+
+/** A class representation of the BSON Code type. */
 export class Code {
+
+    /**
+     * @param code A string or function.
+     * @param scope An optional scope for the function.
+     */
     constructor(code: string | Function, scope?: any);
+
+    readonly code: string | Function;
+    readonly scope?: any;
+
 }
+
+/**
+ * A class representation of the BSON DBRef type.
+ * @deprecated
+ */
 export class DBRef {
+    /**
+     * @param namespace The collection name.
+     * @param oid The reference ObjectID.
+     * @param db Optional db name, if omitted the reference is local to the current db
+     */
     constructor(namespace: string, oid: ObjectID, db?: string);
+
     namespace: string;
     oid: ObjectID;
     db?: string;
 }
+
+/** A class representation of the BSON Double type. */
 export class Double {
+    /**
+     * @param value The number we want to represent as a double.
+     */
     constructor(value: number);
 
     valueOf(): number;
 }
-export class Long {
-    static MAX_VALUE: Long;
-    static MIN_VALUE: Long;
-    static NEG_ONE: Long;
-    static ONE: Long;
-    static ZERO: Long;
 
-    static fromInt(i: number): Long;
-    static fromNumber(n: number): Long;
-    static fromBits(lowBits: number, highBits: number): Long;
-    static fromString(s: string, opt_radix?: number): Long;
+/** A class representation of the BSON Int32 type. */
+export class Int32 {
+    /**
+     * @param value The number we want to represent as an int32.
+     */
+    constructor(value: number);
 
+    valueOf(): number;
+}
+
+/**
+ * Base class for Long and Timestamp.
+ * In original js-node@1.0.x code 'Timestamp' is a 100% copy-paste of 'Long'
+ * with 'Long' replaced by 'Timestamp' (changed to inheritance in js-node@2.0.0)
+ */
+declare class LongLike<T> {
+
+    /**
+     * @param low The low (signed) 32 bits.
+     * @param high The high (signed) 32 bits.
+     */
     constructor(low: number, high: number);
 
-    add(other: Long): Long;
-    and(other: Long): Long;
-    compare(other: Long): number;
-    div(other: Long): Long;
-    equals(other: Long): boolean;
+    /** Returns the sum of `this` and the `other`. */
+    add(other: T): T;
+    /** Returns the bitwise-AND of `this` and the `other`. */
+    and(other: T): T;
+    /**
+     * Compares `this` with the given `other`.
+     * @returns 0 if they are the same, 1 if the this is greater, and -1 if the given one is greater.
+     */
+    compare(other: T): number;
+    /** Returns `this` divided by the given `other`. */
+    div(other: T): T;
+    /** Return whether `this` equals the `other` */
+    equals(other: T): boolean;
+    /** Return the high 32-bits value. */
     getHighBits(): number;
+    /** Return the low 32-bits value. */
     getLowBits(): number;
+    /** Return the low unsigned 32-bits value. */
     getLowBitsUnsigned(): number;
+    /** Returns the number of bits needed to represent the absolute value of `this`. */
     getNumBitsAbs(): number;
-    greaterThan(other: Long): number;
-    greaterThanOrEqual(other: Long): number;
+    /** Return whether `this` is greater than the `other`. */
+    greaterThan(other: T): boolean;
+    /** Return whether `this` is greater than or equal to the `other`. */
+    greaterThanOrEqual(other: T): boolean;
+    /** Return whether `this` value is negative. */
     isNegative(): boolean;
+    /** Return whether `this` value is odd. */
     isOdd(): boolean;
+    /** Return whether `this` value is zero. */
     isZero(): boolean;
-    lessThan(other: Long): boolean;
-    lessThanOrEqual(other: Long): boolean;
-    modulo(other: Long): Long;
-    multiply(other: Long): Long;
-    negate(): Long;
-    not(): Long;
-    notEquals(other: Long): boolean;
-    or(other: Long): Long;
-    shiftLeft(other: number): Long;
-    shiftRight(other: number): Long;
-    shiftRightUnsigned(other: number): Long;
-    subtract(other: Long): Long;
+    /** Return whether `this` is less than the `other`. */
+    lessThan(other: T): boolean;
+    /** Return whether `this` is less than or equal to the `other`. */
+    lessThanOrEqual(other: T): boolean;
+    /** Returns `this` modulo the given `other`. */
+    modulo(other: T): T;
+    /** Returns the product of `this` and the given `other`. */
+    multiply(other: T): T;
+    /** The negation of this value. */
+    negate(): T;
+    /** The bitwise-NOT of this value. */
+    not(): T;
+    /** Return whether `this` does not equal to the `other`. */
+    notEquals(other: T): boolean;
+    /** Returns the bitwise-OR of `this` and the given `other`. */
+    or(other: T): T;
+    /**
+     * Returns `this` with bits shifted to the left by the given amount.
+     * @param numBits The number of bits by which to shift.
+     */
+    shiftLeft(numBits: number): T;
+    /**
+     * Returns `this` with bits shifted to the right by the given amount.
+     * @param numBits The number of bits by which to shift.
+     */
+    shiftRight(numBits: number): T;
+    /**
+     * Returns `this` with bits shifted to the right by the given amount, with the new top bits matching the current sign bit.
+     * @param numBits The number of bits by which to shift.
+     */
+    shiftRightUnsigned(numBits: number): T;
+    /** Returns the difference of `this` and the given `other`. */
+    subtract(other: T): T;
+    /** Return the int value (low 32 bits). */
     toInt(): number;
+    /** Return the JSON value. */
     toJSON(): string;
+    /** Returns closest floating-point representation to `this` value */
     toNumber(): number;
+    /**
+     * Return as a string
+     * @param radix the radix in which the text should be written. {default:10}
+     */
     toString(radix?: number): string;
-    xor(other: Long): Long;
+    /** Returns the bitwise-XOR of `this` and the given `other`. */
+    xor(other: T): T;
+
 }
+
+/**
+ * A class representation of the BSON Long type, a 64-bit two's-complement
+ * integer value, which faithfully simulates the behavior of a Java "Long". This
+ * implementation is derived from LongLib in GWT.
+ */
+export class Long extends LongLike<Long> {
+
+    static readonly MAX_VALUE: Long;
+    static readonly MIN_VALUE: Long;
+    static readonly NEG_ONE: Long;
+    static readonly ONE: Long;
+    static readonly ZERO: Long;
+
+    /** Returns a Long representing the given (32-bit) integer value. */
+    static fromInt(i: number): Long;
+    /** Returns a Long representing the given value, provided that it is a finite number. Otherwise, zero is returned. */
+    static fromNumber(n: number): Long;
+    /**
+     * Returns a Long representing the 64-bit integer that comes by concatenating the given high and low bits. Each is assumed to use 32 bits.
+     * @param lowBits The low 32-bits.
+     * @param highBits The high 32-bits.
+     */
+    static fromBits(lowBits: number, highBits: number): Long;
+    /**
+     * Returns a Long representation of the given string
+     * @param opt_radix The radix in which the text is written. {default:10}
+     */
+    static fromString(s: string, opt_radix?: number): Long;
+
+}
+
+/** A class representation of the BSON Decimal128 type. */
 export class Decimal128 {
+
+    /** Create a Decimal128 instance from a string representation. */
     static fromString(s: string): Decimal128;
 
+    /**
+     * @param bytes A buffer containing the raw Decimal128 bytes.
+     */
     constructor(bytes: Buffer);
 
+    /** A buffer containing the raw Decimal128 bytes. */
+    readonly bytes: Buffer;
+
     toJSON(): string;
     toString(): string;
 }
+
+/** A class representation of the BSON MaxKey type. */
 export class MaxKey {
     constructor();
 }
+
+/** A class representation of the BSON MinKey type. */
 export class MinKey {
     constructor();
 }
+
+/** A class representation of the BSON ObjectID type. */
 export class ObjectID {
     /**
      * Create a new ObjectID instance
@@ -173,19 +380,19 @@ export class ObjectID {
     static isValid(id: string | number | ObjectID): boolean;
     /**
      * Compares the equality of this ObjectID with `otherID`.
-     * @param {object} otherID ObjectID instance to compare against.
+     * @param {ObjectID|string} otherID ObjectID instance to compare against.
      * @return {boolean} the result of comparing two ObjectID's
      */
-    equals(otherID: ObjectID): boolean;
+    equals(otherID: ObjectID | string): boolean;
     /**
      * Generate a 12 byte id string used in ObjectID's
      * @param {number} time optional parameter allowing to pass in a second based timestamp.
      * @return {string} return the 12 byte id binary string.
      */
-    generate(time?: number): string;
+    generate(time?: number): Buffer;
     /**
      * Returns the generation date (accurate up to the second) that this ID was generated.
-     * @return {date} the generation date
+     * @return {Date} the generation date
      */
     getTimestamp(): Date;
     /**
@@ -194,56 +401,55 @@ export class ObjectID {
      */
     toHexString(): string;
 }
+
 export { ObjectID as ObjectId };
+
+/** A class representation of the BSON RegExp type. */
 export class BSONRegExp {
+
     constructor(pattern: string, options: string);
+
+    readonly pattern: string;
+    readonly options: string;
+
 }
+
+/**
+ * A class representation of the BSON Symbol type.
+ * @deprecated
+ */
 export class Symbol {
+
     constructor(value: string);
+
+    /** Access the wrapped string value. */
+    valueOf(): string;
+
 }
-export class Timestamp {
-    constructor(low: number, high: number);
 
-    static MAX_VALUE: Timestamp;
-    static MIN_VALUE: Timestamp;
-    static NEG_ONE: Timestamp;
-    static ONE: Timestamp;
-    static ZERO: Timestamp;
+/** A class representation of the BSON Timestamp type. */
+export class Timestamp extends LongLike<Timestamp> {
 
-    static fromBits(lowBits: number, highBits: number): Timestamp;
+    static readonly MAX_VALUE: Timestamp;
+    static readonly MIN_VALUE: Timestamp;
+    static readonly NEG_ONE: Timestamp;
+    static readonly ONE: Timestamp;
+    static readonly ZERO: Timestamp;
+
+    /** Returns a Timestamp represented by the given (32-bit) integer value */
     static fromInt(value: number): Timestamp;
+    /** Returns a Timestamp representing the given number value, provided that it is a finite number. */
     static fromNumber(value: number): Timestamp;
-    static fromString(str: string, radix?: number): Timestamp;
+    /**
+     * Returns a Timestamp for the given high and low bits. Each is assumed to use 32 bits.
+     * @param lowBits The low 32-bits.
+     * @param highBits The high 32-bits.
+     */
+    static fromBits(lowBits: number, highBits: number): Timestamp;
+    /**
+     * Returns a Timestamp from the given string.
+     * @param opt_radix The radix in which the text is written. {default:10}
+     */
+    static fromString(str: string, opt_radix?: number): Timestamp;
 
-    add(other: Timestamp): Timestamp;
-    and(other: Timestamp): Timestamp;
-    compare(other: Timestamp): number;
-    div(other: Timestamp): Timestamp;
-    equals(other: Timestamp): boolean;
-    getHighBits(): number;
-    getLowBits(): number;
-    getLowBitsUnsigned(): number;
-    getNumBitsAbs(): number;
-    greaterThan(other: Timestamp): number;
-    greaterThanOrEqual(other: Timestamp): number;
-    isNegative(): boolean;
-    isOdd(): boolean;
-    isZero(): boolean;
-    lessThan(other: Timestamp): boolean;
-    lessThanOrEqual(other: Timestamp): boolean;
-    modulo(other: Timestamp): Timestamp;
-    multiply(other: Timestamp): Timestamp;
-    negate(): Timestamp;
-    not(): Timestamp;
-    notEquals(other: Timestamp): boolean;
-    or(other: Timestamp): Timestamp;
-    shiftLeft(other: number): Timestamp;
-    shiftRight(other: number): Timestamp;
-    shiftRightUnsigned(other: number): Timestamp;
-    subtract(other: Timestamp): Timestamp;
-    toInt(): number;
-    toJSON(): string;
-    toNumber(): number;
-    toString(radix?: number): string;
-    xor(other: Timestamp): Timestamp;
 }
diff --git a/types/buffer-from/buffer-from-tests.ts b/types/buffer-from/buffer-from-tests.ts
new file mode 100644
index 0000000000..8fdd4fa811
--- /dev/null
+++ b/types/buffer-from/buffer-from-tests.ts
@@ -0,0 +1,6 @@
+import bufferFrom = require('buffer-from');
+
+bufferFrom([1, 2, 3, 4]); // $ExpectType Buffer
+bufferFrom(new Uint8Array([1, 2, 3, 4]).buffer, 1, 2); // $ExpectType Buffer
+bufferFrom('test', 'utf8'); // $ExpectType Buffer
+bufferFrom(bufferFrom('test')); // $ExpectType Buffer
diff --git a/types/buffer-from/index.d.ts b/types/buffer-from/index.d.ts
new file mode 100644
index 0000000000..412056ed8a
--- /dev/null
+++ b/types/buffer-from/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for buffer-from 1.1
+// Project: https://github.com/LinusU/buffer-from#readme
+// Definitions by: Nat Burns <https://github.com/burnnat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function bufferFrom(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
+declare function bufferFrom(str: string, encoding?: string): Buffer;
+declare function bufferFrom(data: ReadonlyArray<any> | Buffer): Buffer;
+
+export = bufferFrom;
diff --git a/types/buffer-from/tsconfig.json b/types/buffer-from/tsconfig.json
new file mode 100644
index 0000000000..195d0a78b6
--- /dev/null
+++ b/types/buffer-from/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",
+        "buffer-from-tests.ts"
+    ]
+}
diff --git a/types/buffer-from/tslint.json b/types/buffer-from/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/buffer-from/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/buffer-xor/buffer-xor-tests.ts b/types/buffer-xor/buffer-xor-tests.ts
new file mode 100644
index 0000000000..7c55514eaa
--- /dev/null
+++ b/types/buffer-xor/buffer-xor-tests.ts
@@ -0,0 +1,4 @@
+import xor = require('buffer-xor');
+
+// $ExpectType Buffer
+xor(Buffer.from('a'), Buffer.from('b'));
diff --git a/types/buffer-xor/index.d.ts b/types/buffer-xor/index.d.ts
new file mode 100644
index 0000000000..5e98793266
--- /dev/null
+++ b/types/buffer-xor/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for buffer-xor 2.0
+// Project: https://github.com/crypto-browserify/buffer-xor
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types = "node" />
+
+declare function xor(a: Buffer, b: Buffer): Buffer;
+
+export = xor;
diff --git a/types/buffer-xor/tsconfig.json b/types/buffer-xor/tsconfig.json
new file mode 100644
index 0000000000..adbeaec3b7
--- /dev/null
+++ b/types/buffer-xor/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"buffer-xor-tests.ts"
+	]
+}
diff --git a/types/buffer-xor/tslint.json b/types/buffer-xor/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/buffer-xor/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/bull/bull-tests.tsx b/types/bull/bull-tests.tsx
index c2e0d3161f..a8c7f403a7 100644
--- a/types/bull/bull-tests.tsx
+++ b/types/bull/bull-tests.tsx
@@ -6,7 +6,10 @@ import Redis = require("ioredis");
 import Queue = require("bull");
 
 const videoQueue = new Queue('video transcoding', 'redis://127.0.0.1:6379');
-const audioQueue = new Queue('audio transcoding', {redis: {port: 6379, host: '127.0.0.1'}}); // Specify Redis connection using object
+const audioQueue = new Queue('audio transcoding', {
+    redis: {port: 6379, host: '127.0.0.1'}, // Specify Redis connection using object
+    settings: {},
+});
 const imageQueue: Queue.Queue<{ image: string }> = new Queue('image transcoding');
 
 videoQueue.process((job, done) => {
diff --git a/types/bull/index.d.ts b/types/bull/index.d.ts
index cdef279acb..ac820290f2 100644
--- a/types/bull/index.d.ts
+++ b/types/bull/index.d.ts
@@ -7,8 +7,11 @@
 //                 Gabriel Terwesten <https://github.com/blaugold>
 //                 Oleg Repin <https://github.com/iamolegga>
 //                 David Koblas <https://github.com/koblas>
+//                 Bond Akinmade <https://github.com/bondz>
+//                 Wuha Team <https://github.com/wuha-team>
+//                 Alec Brunelle <https://github.com/aleccool213>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as Redis from "ioredis";
 import * as Promise from "bluebird";
@@ -82,6 +85,13 @@ declare namespace Bull {
      * Delay before processing next job in case of internal error
      */
     retryProcessDelay?: number;
+
+    /**
+     * Define a custom backoff strategy
+     */
+    backoffStrategies?: {
+      [key: string]: (attemptsMade: number, err: typeof Error) => number;
+    };
   }
 
   type DoneCallback = (error?: Error | null, value?: any) => void;
@@ -142,6 +152,21 @@ declare namespace Bull {
      * Promotes a job that is currently "delayed" to the "waiting" state and executed as soon as possible.
      */
     promote(): Promise<void>;
+
+    /**
+     * The lock id of the job
+     */
+    lockKey(): string;
+
+    /**
+     * Releases the lock on the job. Only locks owned by the queue instance can be released.
+     */
+    releaseLock(): Promise<void>;
+
+    /**
+     * Takes a lock for this job so that no other queue worker can process it at the same time.
+     */
+    takeLock(): Promise<number | false>;
   }
 
   type JobStatus = 'completed' | 'waiting' | 'active' | 'delayed' | 'failed';
@@ -150,20 +175,15 @@ declare namespace Bull {
     /**
      * Backoff type, which can be either `fixed` or `exponential`
      */
-    type: 'fixed' | 'exponential';
+    type: string;
 
     /**
      * Backoff delay, in milliseconds
      */
-    delay: number;
+    delay?: number;
   }
 
   interface RepeatOptions {
-    /**
-     * Cron pattern specifying when the job should execute
-     */
-    cron: string;
-
     /**
      * Timezone
      */
@@ -180,6 +200,20 @@ declare namespace Bull {
     limit?: number;
   }
 
+  interface CronRepeatOptions extends RepeatOptions {
+    /**
+     * Cron pattern specifying when the job should execute
+     */
+    cron: string;
+  }
+
+  interface EveryRepeatOptions extends RepeatOptions {
+    /**
+     * Repeat every millis (cron setting cannot be used together with this setting.)
+     */
+    every: number;
+  }
+
   interface JobOptions {
     /**
      * Optional priority value. ranges from 1 (highest priority) to MAX_INT  (lowest priority).
@@ -201,7 +235,7 @@ declare namespace Bull {
     /**
      * Repeat job according to a cron specification
      */
-    repeat?: RepeatOptions;
+    repeat?: CronRepeatOptions | EveryRepeatOptions;
 
     /**
      * Backoff setting for automatic retries if the job fails
@@ -467,7 +501,7 @@ declare namespace Bull {
      * 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<T>>;
+    getJob(jobId: JobId): Promise<Job<T> | null>;
 
     /**
      * Returns a promise that will return an array with the waiting jobs between start and end.
@@ -509,7 +543,7 @@ declare namespace Bull {
      * 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>;
+    removeRepeatable(repeat: (CronRepeatOptions | EveryRepeatOptions) & { jobId?: JobId }): Promise<void>;
 
     /**
      * Removes a given repeatable job. The RepeatOptions and JobId needs to be the same as the ones
@@ -517,7 +551,13 @@ declare namespace Bull {
      *
      * name: The name of the to be removed job
      */
-    removeRepeatable(name: string, repeat: RepeatOptions & { jobId?: JobId }): Promise<void>;
+    removeRepeatable(name: string, repeat: (CronRepeatOptions | EveryRepeatOptions) & { jobId?: JobId }): Promise<void>;
+
+    /**
+     * Returns a promise that will return an array of job instances of the given types.
+     * Optional parameters for range and ordering are provided.
+     */
+    getJobs(types: string[], start?: number, end?: number, asc?: boolean): Promise<Job[]>;
 
     /**
      * Returns a promise that resolves with the job counts for the given queue.
diff --git a/types/bull/tsconfig.json b/types/bull/tsconfig.json
index 3ce6f08792..7dbd4e7b61 100644
--- a/types/bull/tsconfig.json
+++ b/types/bull/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/bull/v2/index.d.ts b/types/bull/v2/index.d.ts
index 3c89655101..4ea3f82df7 100644
--- a/types/bull/v2/index.d.ts
+++ b/types/bull/v2/index.d.ts
@@ -54,6 +54,24 @@ declare module "bull" {
              * since pubsub does not give any guarantees.
              */
             finished(): Promise<void>;
+
+            /**
+             * Moves a job to the `completed` queue. Pulls a job from 'waiting' to
+             * 'active' and returns a tuple containing the next jobs data and id. If no
+             * job is in the `waiting` queue, returns null.
+             * @param returnValue The jobs success message.
+             * @param ignoreLock True when wanting to ignore the redis lock on this job.
+             * @returns Contains the next jobs data and id or null if job left in 'waiting' queue.
+             */
+            moveToCompleted(returnValue: string, ignoreLock: boolean): Promise<string[] | null>;
+
+            /**
+             * Moves a job to the failed queue.
+             * @param errorInfo The jobs error message.
+             * @param ignoreLock True when wanting to ignore the redis lock on this job.
+             * @returns void
+             */
+            moveToFailed(errorInfo: ErrorMessage, ignoreLock: boolean): Promise<void>;
         }
 
         export interface Backoff {
@@ -204,7 +222,7 @@ declare module "bull" {
              * 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: string): Promise<Job>;
+            getJob(jobId: string): Promise<Job | null>;
 
             /**
              * Tells the queue remove all jobs created outside of a grace period in milliseconds.
@@ -217,6 +235,18 @@ declare module "bull" {
              * 'ready', 'error', 'activ', 'progress', 'completed', 'failed', 'paused', 'resumed', 'cleaned'
              */
             on(eventName: string, callback: EventCallback): void;
+
+            /**
+             * Moves the next job from 'waiting' to 'active'.
+             * Sets the processedOn timestamp to the current datetime.
+             * @param jobId If specified, will move a specific job from 'waiting' to 'active',
+             * @returns Returns the job moved from waiting to active queue.
+             */
+            getNextJob:(jobId?: string) => Promise<Job | null>;
+        }
+
+        interface ErrorMessage {
+            message: string;
         }
 
         interface EventCallback {
diff --git a/types/bunyan-winston-adapter/bunyan-winston-adapter-tests.ts b/types/bunyan-winston-adapter/bunyan-winston-adapter-tests.ts
index fc4518fa29..f6abd7e736 100644
--- a/types/bunyan-winston-adapter/bunyan-winston-adapter-tests.ts
+++ b/types/bunyan-winston-adapter/bunyan-winston-adapter-tests.ts
@@ -1,7 +1,7 @@
 import { createAdapter } from "bunyan-winston-adapter";
-import { Logger, LoggerInstance, transports } from "winston";
+import { createLogger } from "winston";
 
-const logger = new Logger();
+const logger = createLogger();
 const mapping = {
   trace: 'silly'
 };
diff --git a/types/bunyan-winston-adapter/index.d.ts b/types/bunyan-winston-adapter/index.d.ts
index 6798b8f1c9..718c9804e1 100644
--- a/types/bunyan-winston-adapter/index.d.ts
+++ b/types/bunyan-winston-adapter/index.d.ts
@@ -5,6 +5,6 @@
 // TypeScript Version: 2.1
 
 import * as bunyan from "bunyan";
-import { LoggerInstance } from "winston";
+import { Logger } from "winston";
 
-export function createAdapter(logger: LoggerInstance, mapping?: any): bunyan;
+export function createAdapter(logger: Logger, mapping?: any): bunyan;
diff --git a/types/bunyan-winston-adapter/package.json b/types/bunyan-winston-adapter/package.json
new file mode 100644
index 0000000000..0aa4cf368f
--- /dev/null
+++ b/types/bunyan-winston-adapter/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "winston": "^3.0.0"
+    }
+}
diff --git a/types/c3/c3-tests.ts b/types/c3/c3-tests.ts
index f2e630cd09..5c554320f9 100644
--- a/types/c3/c3-tests.ts
+++ b/types/c3/c3-tests.ts
@@ -334,6 +334,7 @@ function zoom_examples() {
         data: {},
         zoom: {
             enabled: false,
+            type: 'scroll',
             rescale: true,
             extent: [1, 100], // enable more zooming
             onzoom: (domain) => { /* code */ },
@@ -452,6 +453,7 @@ function gauge_examples() {
             max: 100,
             units: " %",
             width: 10,
+            fullCircle: true,
         }
     });
 }
diff --git a/types/c3/index.d.ts b/types/c3/index.d.ts
index 6c466458e3..e047b22c7e 100644
--- a/types/c3/index.d.ts
+++ b/types/c3/index.d.ts
@@ -276,6 +276,12 @@ export interface ChartConfiguration {
          * Set width of gauge chart.
          */
         width?: number;
+        /**
+         * Whether this should be displayed
+         * as a full circle instead of a
+         * half circle.
+         */
+        fullCircle?: boolean;
     };
 
     spline?: {
@@ -800,6 +806,10 @@ export interface ZoomOptions {
      * Enable zooming.
      */
     enabled?: boolean;
+    /**
+     * Set interaction type for zooming
+     */
+    type?: 'scroll' | 'drag';
     /**
      * Enable to rescale after zooming. If true set, y domain will be updated according to the zoomed region.
      */
diff --git a/types/canvas-gauges/index.d.ts b/types/canvas-gauges/index.d.ts
index e5b4f69047..3c3a617ed7 100644
--- a/types/canvas-gauges/index.d.ts
+++ b/types/canvas-gauges/index.d.ts
@@ -118,6 +118,8 @@ declare namespace CanvasGauges {
         barProgress?: boolean,
         barShadow?: number
     }
+        
+    export const GenericOptions: GenericOptions;
 
     export interface RadialGaugeOptions extends GenericOptions {
         ticksAngle?: number,
diff --git a/types/capture-console/capture-console-tests.ts b/types/capture-console/capture-console-tests.ts
new file mode 100644
index 0000000000..45dd3a7130
--- /dev/null
+++ b/types/capture-console/capture-console-tests.ts
@@ -0,0 +1,53 @@
+import * as captureconsole from "capture-console";
+
+captureconsole.capture(process.stdout, () => { }); // $ExpectType string[]
+captureconsole.capture(process.stdout, {}, () => { }); // $ExpectType string[]
+captureconsole.capture(process.stdout, { quiet: true }, () => { }); // $ExpectType string[]
+
+captureconsole.capture([process.stdout, process.stdin], () => { }); // $ExpectType string[]
+captureconsole.capture([process.stdout, process.stdin], {}, () => { }); // $ExpectType string[]
+captureconsole.capture([process.stdout, process.stdin], { quiet: true }, () => { }); // $ExpectType string[]
+
+captureconsole.captureStderr(() => { }); // $ExpectType string
+captureconsole.captureStderr({}, () => { }); // $ExpectType string
+captureconsole.captureStderr({ quiet: true }, () => { }); // $ExpectType string
+
+captureconsole.captureStdio(() => { }); // $ExpectType { stdout: string; stderr: string; }
+captureconsole.captureStdio({}, () => { }); // $ExpectType { stdout: string; stderr: string; }
+captureconsole.captureStdio({ quiet: true }, () => { }); // $ExpectType { stdout: string; stderr: string; }
+
+captureconsole.captureStdout(() => { }); // $ExpectType string
+captureconsole.captureStdout({}, () => { }); // $ExpectType string
+captureconsole.captureStdout({ quiet: true }, () => { }); // $ExpectType string
+
+captureconsole.hook(process.stdout, (string: string, encoding?: string, fd?: (error?: any) => void) => { }); // $ExpectType () => boolean
+captureconsole.hook(process.stdout, {}, (string: string, encoding?: string, fd?: (error?: any) => void) => { }); // $ExpectType () => boolean
+captureconsole.hook(process.stdout, { quiet: true }, (string: string, encoding?: string, fd?: (error?: any) => void) => { }); // $ExpectType () => boolean
+
+captureconsole.intercept(process.stdout, () => { }); // $ExpectType string[]
+captureconsole.intercept(process.stdout, {}, () => { }); // $ExpectType string[]
+captureconsole.intercept(process.stdout, { quiet: true }, () => { }); // $ExpectType string[]
+
+captureconsole.interceptStderr(() => { }); // $ExpectType string
+captureconsole.interceptStderr({}, () => { }); // $ExpectType string
+captureconsole.interceptStderr({ quiet: true }, () => { }); // $ExpectType string
+
+captureconsole.interceptStdio(() => { }); // $ExpectType { stdout: string; stderr: string; }
+captureconsole.interceptStdio({}, () => { }); // $ExpectType { stdout: string; stderr: string; }
+captureconsole.interceptStdio({ quiet: true }, () => { }); // $ExpectType { stdout: string; stderr: string; }
+
+captureconsole.interceptStdout(() => { }); // $ExpectType string
+captureconsole.interceptStdout({}, () => { }); // $ExpectType string
+captureconsole.interceptStdout({ quiet: true }, () => { }); // $ExpectType string
+
+captureconsole.startCapture(process.stdout, (string: string, encoding?: string, fd?: (error?: any) => void) => { }); // $ExpectType boolean
+captureconsole.startCapture(process.stdout, {}, (string: string, encoding?: string, fd?: (error?: any) => void) => { }); // $ExpectType boolean
+captureconsole.startCapture(process.stdout, { quiet: true }, (string: string, encoding?: string, fd?: (error?: any) => void) => { }); // $ExpectType boolean
+
+captureconsole.startIntercept(process.stdout, () => { }); // $ExpectType boolean
+captureconsole.startIntercept(process.stdout, {}, () => { }); // $ExpectType boolean
+captureconsole.startIntercept(process.stdout, { quiet: true }, () => { }); // $ExpectType boolean
+
+captureconsole.stopCapture(process.stdout); // $ExpectType boolean
+
+captureconsole.stopIntercept(process.stdout); // $ExpectType boolean
diff --git a/types/capture-console/index.d.ts b/types/capture-console/index.d.ts
new file mode 100644
index 0000000000..d3ebd914f9
--- /dev/null
+++ b/types/capture-console/index.d.ts
@@ -0,0 +1,190 @@
+// Type definitions for capture-console 1.0
+// Project: https://github.com/zackehh/capture-console
+// Definitions by: Auston Zahrt <https://github.com/AustonZ>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+/**
+ * Options controlling behavior when capturing
+ */
+export interface CaptureOptions {
+    /**
+     * Option to silence the output going to the console
+     */
+    quiet?: boolean;
+}
+
+/**
+ * Executes the provided function with the output
+ * on the provided streams.
+ */
+export function capture(
+    streams: ReadonlyArray<NodeJS.WritableStream> | NodeJS.WritableStream,
+    exec: () => void
+): string[];
+
+/**
+ * Executes the provided function with the output
+ * on the provided streams. Accepts options to silence
+ * the output going to the console.
+ */
+export function capture(
+    streams: ReadonlyArray<NodeJS.WritableStream> | NodeJS.WritableStream,
+    opts: CaptureOptions,
+    exec: () => void
+): string[];
+
+/**
+ * Captures stderr for the provided execution scope.
+ */
+export function captureStderr(exec: () => void): string;
+
+/**
+ * Captures stderr for the provided execution scope.
+ */
+export function captureStderr(opts: CaptureOptions, exec: () => void): string;
+
+/**
+ * Captures stdout and stderr into an object for
+ * the provided execution scope.
+ */
+export function captureStdio(exec: () => void): { stdout: string; stderr: string; };
+
+/**
+ * Captures stdout and stderr into an object for
+ * the provided execution scope.
+ */
+export function captureStdio(opts: CaptureOptions, exec: () => void): { stdout: string; stderr: string; };
+
+/**
+ * Captures stdout for the provided execution scope.
+ */
+export function captureStdout(exec: () => void): string;
+
+/**
+ * Captures stdout for the provided execution scope.
+ */
+export function captureStdout(opts: CaptureOptions, exec: () => void): string;
+
+/**
+ * Listens to a provided stream, and executes the provided
+ * function for every write call. Accepts options to silence
+ * the output going to the console.
+ *
+ * Returns a function to call when you wish to stop listening
+ * to the call.
+ */
+export function hook(
+    stream: NodeJS.WritableStream,
+    exec: (
+        string: string,
+        encoding?: string,
+        fd?: (error?: any) => void
+    ) => void
+): () => boolean;
+
+/**
+ * Listens to a provided stream, and executes the provided
+ * function for every write call. Accepts options to silence
+ * the output going to the console.
+ *
+ * Returns a function to call when you wish to stop listening
+ * to the call.
+ */
+export function hook(
+    stream: NodeJS.WritableStream,
+    opts: CaptureOptions,
+    exec: (
+        string: string,
+        encoding?: string,
+        fd?: (error?: any) => void
+    ) => void
+): () => boolean;
+
+/**
+ * Delegate to #capture with a quiet passthrough.
+ */
+export function intercept(stream: NodeJS.WritableStream, exec: () => void): string[];
+
+/**
+ * Delegate to #capture with a quiet passthrough.
+ */
+export function intercept(stream: NodeJS.WritableStream, opts: CaptureOptions, exec: () => void): string[];
+
+/**
+ * Delegate to #captureStderr with a quiet passthrough.
+ */
+export function interceptStderr(exec: () => void): string;
+
+/**
+ * Delegate to #captureStderr with a quiet passthrough.
+ */
+export function interceptStderr(opts: CaptureOptions, exec: () => void): string;
+
+/**
+ * Delegate to #captureStdio with a quiet passthrough.
+ */
+export function interceptStdio(exec: () => void): { stdout: string; stderr: string; };
+
+/**
+ * Delegate to #captureStdio with a quiet passthrough.
+ */
+export function interceptStdio(opts: CaptureOptions, exec: () => void): { stdout: string; stderr: string; };
+
+/**
+ * Delegate to #captureStdout with a quiet passthrough.
+ */
+export function interceptStdout(exec: () => void): string;
+
+/**
+ * Delegate to #captureStdout with a quiet passthrough.
+ */
+export function interceptStdout(opts: CaptureOptions, exec: () => void): string;
+
+/**
+ * Starts a capture on the provided stream using the
+ * provided options and stream execution.
+ */
+export function startCapture(
+    stream: NodeJS.WritableStream,
+    exec: (
+        string: string,
+        encoding?: string,
+        fd?: (error?: any) => void
+    ) => void
+): boolean;
+
+/**
+ * Starts a capture on the provided stream using the
+ * provided options and stream execution.
+ */
+export function startCapture(
+    stream: NodeJS.WritableStream,
+    opts: CaptureOptions,
+    exec: (
+        string: string,
+        encoding?: string,
+        fd?: (error?: any) => void
+    ) => void
+): boolean;
+
+/**
+ * Delegate to #startCapture with a quiet passthrough.
+ */
+export function startIntercept(stream: NodeJS.WritableStream, exec: () => void): boolean;
+
+/**
+ * Delegate to #startCapture with a quiet passthrough.
+ */
+export function startIntercept(stream: NodeJS.WritableStream, opts: CaptureOptions, exec: () => void): boolean;
+
+/**
+ * Stops a capture on the provided stream.
+ */
+export function stopCapture(stream: NodeJS.WritableStream): boolean;
+
+/**
+ * Delegate to #stopCapture with a quiet passthrough.
+ */
+export function stopIntercept(stream: NodeJS.WritableStream): boolean;
diff --git a/types/capture-console/tsconfig.json b/types/capture-console/tsconfig.json
new file mode 100644
index 0000000000..01807d6e22
--- /dev/null
+++ b/types/capture-console/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",
+        "capture-console-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/capture-console/tslint.json b/types/capture-console/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/capture-console/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/catbox-redis/catbox-redis-tests.ts b/types/catbox-redis/catbox-redis-tests.ts
new file mode 100644
index 0000000000..d7fb5eb701
--- /dev/null
+++ b/types/catbox-redis/catbox-redis-tests.ts
@@ -0,0 +1,12 @@
+import * as CatbotRedis from 'catbox-redis';
+
+const cache = new CatbotRedis({
+    host: 'localhost',
+    partition: 'test',
+    port: 2018,
+});
+
+cache.get({
+    segment: 'test',
+    id: 'test',
+});
diff --git a/types/catbox-redis/index.d.ts b/types/catbox-redis/index.d.ts
new file mode 100644
index 0000000000..a0d3590953
--- /dev/null
+++ b/types/catbox-redis/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for catbox-redis 4.1
+// Project: https://github.com/hapijs/catbox-redis#readme
+// Definitions by: Simon Schick <https://github.com/SimonSchick>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+// tslint:disable-next-line
+declare module 'catbox-redis' {
+    import { Redis } from 'ioredis';
+    import { EnginePrototype, ClientOptions, Client } from 'catbox';
+    namespace CatboxRedis {
+      interface CatboxRedisOptions extends ClientOptions {
+        /**
+         * Raw client.
+         */
+        client?: Redis;
+        /**
+         * the Redis server URL (if url is provided, host, port, and socket are ignored)
+         */
+        url?: string;
+        /**
+         * the Redis server hostname.
+         * Defaults to '127.0.0.1'.
+         */
+        host?: string;
+        /**
+         * the Redis server port or unix domain socket path.
+         * Defaults to 6379.
+         */
+        port?: number;
+        /**
+         * the unix socket string to connect to (if socket is provided, host and port are ignored)
+         */
+        socket?: string;
+        /**
+         * the Redis authentication password when required.
+         */
+        password?: string;
+        /**
+         * the Redis database.
+         */
+        database?: string;
+        /**
+         * an array of redis sentinel addresses to connect to.
+         */
+        sentinels?: Array<{
+          host: string;
+        }>;
+        /**
+         * the name of the sentinel master.
+         * (Only needed when sentinels is specified)
+         */
+        sentinelName?: string;
+      }
+    }
+    class CatboxRedis extends Client {
+      constructor(options: CatboxRedis.CatboxRedisOptions);
+    }
+    export = CatboxRedis;
+  }
diff --git a/types/catbox-redis/tsconfig.json b/types/catbox-redis/tsconfig.json
new file mode 100644
index 0000000000..2d31a4bc59
--- /dev/null
+++ b/types/catbox-redis/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",
+        "catbox-redis-tests.ts"
+    ]
+}
diff --git a/types/catbox-redis/tslint.json b/types/catbox-redis/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/catbox-redis/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/catbox/index.d.ts b/types/catbox/index.d.ts
index 6d51e48696..f6881b1aef 100644
--- a/types/catbox/index.d.ts
+++ b/types/catbox/index.d.ts
@@ -112,6 +112,9 @@ export interface CachedObject {
 export type CacheItem = any;
 
 export interface ClientOptions {
+    /**
+     * this will store items under keys that start with this value.
+     */
     partition: string;
 }
 
diff --git a/types/cesium/index.d.ts b/types/cesium/index.d.ts
index 21b80f7d05..3ea9745ebd 100644
--- a/types/cesium/index.d.ts
+++ b/types/cesium/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for cesium 1.44
+// Type definitions for cesium 1.47
 // Project: http://cesiumjs.org
 // Definitions by: Aigars Zeiza <https://github.com/Zuzon>
 //                 Harry Nicholls <https://github.com/hnipps>
 //                 Jared Szechy <https://github.com/szechyjs>
+//                 Radek Goláň jr. <https://github.com/golyalpha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -1437,10 +1438,10 @@ declare namespace Cesium {
     }
 
     class TerrainData {
+        credits: Credit[];
         waterMask: Uint8Array | HTMLImageElement | HTMLCanvasElement;
         interpolateHeight(rectangle: Rectangle, longitude: number, latitude: number): number;
         isChildAvailable(thisX: number, thisY: number, childX: number, childY: number): boolean;
-        createMesh(tilingScheme: TilingScheme, x: number, y: number, level: number): Promise<TerrainMesh>;
         upsample(tilingScheme: TilingScheme, thisX: number, thisY: number, thisLevel: number, descendantX: number, descendantY: number, descendantLevel: number): Promise<TerrainData>;
         wasCreatedByUpsampling(): boolean;
     }
@@ -1459,7 +1460,7 @@ declare namespace Cesium {
     }
 
     abstract class TerrainProvider {
-        availability: any; // TileAvailability
+        availability: TileAvailability;
         credit: Credit;
         errorEvent: Event;
         hasVertexNormals: boolean;
@@ -1475,6 +1476,15 @@ declare namespace Cesium {
         requestTileGeometry(x: number, y: number, level: number, throttleRequests?: boolean): Promise<TerrainData>;
     }
 
+    class TileAvailability {
+        constructor(tilingScheme: TilingScheme, maximumLevel: number);
+        addAvailableTileRange(level: number, startX: number, startY: number, endX: number, endY: number): void;
+        computeBestAvailableLevelOverRectangle(rectangle: Rectangle): number;
+        computeChildMaskForTile(level: number, x: number, y: number): number;
+        computeMaximumLevelAtPosition(position: Cartographic): number;
+        isTileAvailable(level: number, x: number, y: number): boolean;
+    }
+
     class TileProviderError {
         provider: ImageryProvider | TerrainProvider;
         message: string;
@@ -1925,15 +1935,15 @@ declare namespace Cesium {
         semiMinorAxis: Property;
         rotation: Property;
         show: Property;
-        material: MaterialProperty;
+        material: MaterialProperty | Color;
         height: Property;
         extrudedHeight: Property;
         granularity: Property;
         stRotation: Property;
-        fill: Property;
-        outline: Property;
-        outlineColor: Property;
-        outlineWidth: Property;
+        fill: boolean;
+        outline: boolean;
+        outlineColor: Color;
+        outlineWidth: number;
         numberOfVerticalLines: Property;
         constructor(options?: {
             semiMajorAxis?: number;
@@ -1941,11 +1951,11 @@ declare namespace Cesium {
             height?: Property;
             extrudedHeight?: Property;
             show?: Property;
-            fill?: Property;
-            material?: MaterialProperty;
-            outline?: Property;
-            outlineColor?: Property;
-            outlineWidth?: Property;
+            fill?: boolean;
+            material?: MaterialProperty | Color
+            outline?: boolean;
+            outlineColor?: Color;
+            outlineWidth?: number;
             numberOfVerticalLines?: Property;
             rotation?: Property;
             stRotation?: Property;
@@ -2197,11 +2207,11 @@ declare namespace Cesium {
     class LabelGraphics {
         definitionChanged: Event;
         text: Property;
-        font: Property;
+        font: string;
         style: Property;
-        fillColor: Property;
-        outlineColor: Property;
-        outlineWidth: Property;
+        fillColor: Color;
+        outlineColor: Color;
+        outlineWidth: number;
         horizontalOrigin: Property;
         verticalOrigin: Property;
         eyeOffset: Property;
@@ -2212,11 +2222,11 @@ declare namespace Cesium {
         pixelOffsetScaleByDistance: Property;
         constructor(options?: {
             text?: Property;
-            font?: Property;
+            font?: string;
             style?: Property;
-            fillColor?: Property;
-            outlineColor?: Property;
-            outlineWidth?: Property;
+            fillColor?: Color;
+            outlineColor?: Color;
+            outlineWidth?: number;
             show?: Property;
             scale?: Property;
             horizontalOrigin?: Property;
@@ -2352,16 +2362,16 @@ declare namespace Cesium {
     class PolygonGraphics {
         definitionChanged: Event;
         show: Property;
-        material: MaterialProperty;
+        material: MaterialProperty | Color;
         positions: Property;
         hierarchy: Property;
         height: Property;
         extrudedHeight: Property;
         granularity: Property;
         stRotation: Property;
-        fill: Property;
+        fill: boolean;
         outline: Property;
-        outlineColor: Property;
+        outlineColor: Color;
         outlineWidth: Property;
         perPositionHeight: Property;
         constructor(options?: {
@@ -2369,10 +2379,10 @@ declare namespace Cesium {
             height?: number;
             extrudedHeight?: Property;
             show?: Property;
-            fill?: Property;
-            material?: MaterialProperty;
+            fill?: boolean;
+            material?: MaterialProperty | Color;
             outline?: boolean;
-            outlineColor?: Property;
+            outlineColor?: Color;
             outlineWidth?: number;
             stRotation?: Property;
             granularity?: Property;
@@ -3007,23 +3017,84 @@ declare namespace Cesium {
         destroy(): void;
     }
 
+    class GoogleEarthEnterpriseMetadata {
+        imageryPresent: boolean;
+        key: ArrayBuffer;
+        negativeAltitudeExponentBias: number;
+        negativeAltitudeThreshold: number;
+        protoImagery: boolean;
+        readonly proxy: Proxy;
+        readonly readyPromise: Promise<boolean>;
+        readonly resource: Resource;
+        terrainPresent: boolean;
+        readonly url: string;
+        constructor(resourceOrUrl: Resource | string);
+        static quadKeyToTileXY(quadkey: string): {x: number, y: number, level: number};
+        static tileXYToQuadKey(x: number, y: number, level: number): string;
+    }
+
     class GoogleEarthEnterpriseImageryProvider extends ImageryProvider {
-        url: string;
-        path: string;
-        channel: number;
-        version: number;
-        requestType: string;
+        readonly url: string;
         constructor(options: {
-            url: string;
+            url: Resource | string;
+            metadata: GoogleEarthEnterpriseMetadata;
+            ellipsoid?: Ellipsoid;
+            tileDiscardPolicy?: TileDiscardPolicy;
+            credit?: Credit | string;
+        });
+    }
+
+    class GoogleEarthEnterpriseMapsProvider extends ImageryProvider {
+        readonly channel: number;
+        readonly path: string;
+        readonly requestType: string;
+        readonly url: string;
+        readonly version: number;
+        static logoUrl: string;
+        constructor(options: {
+            url: Resource | string;
             channel: number;
             path?: string;
             maximumLevel?: number;
             tileDiscardPolicy?: TileDiscardPolicy;
             ellipsoid?: Ellipsoid;
-            proxy?: Proxy
         });
     }
 
+    class GoogleEarthEnterpriseTerrainData extends TerrainData {
+        constructor(options: {
+            buffer: ArrayBuffer;
+            negativeAltitudeExponentBias: number;
+            negativeElevationThreshold: number;
+            childTileMask?: number;
+            createdByUpsampling?: boolean;
+            credits?: Credit[];
+        });
+    }
+
+    class GoogleEarthEnterpriseTerrainProvider {
+        static heightmapTerrainQuality: number;
+        availability: TileAvailability;
+        credit: Credit;
+        errorEvent: Event;
+        hasVertexNormals: boolean;
+        hasWaterMask: boolean;
+        ready: boolean;
+        readonly readyPromise: Promise<boolean>;
+        tilingScheme: TilingScheme;
+        constructor(options: {
+            url: Resource | string;
+            metadata: GoogleEarthEnterpriseMetadata;
+            ellipsoid?: Ellipsoid;
+            credit?: Credit | string;
+        })
+        static getEstimatedLevelZeroGeometricErrorForAHeightmap(ellipsoid: Ellipsoid, tileImageWidth: number, numberOfTilesAtLevelZero: number): number;
+        static getRegularGridIndices(width: number, height: number): Uint16Array;
+        getLevelMaximumGeometricError(level: number): number;
+        getTileDataAvailable(x: number, y: number, level: number): boolean;
+        requestTileGeometry(x: number, y: number, level: number, request?: Request): Promise<TerrainData>;
+    }
+
     class GridImageryProvider extends ImageryProvider {
         constructor(options?: {
             tilingScheme?: TilingScheme;
@@ -3522,7 +3593,7 @@ declare namespace Cesium {
             cull?: boolean;
             asynchronous?: boolean;
             debugShowBoundingVolume?: boolean;
-            shadows: ShadowMode
+            shadows?: ShadowMode
         });
         destroy(): void;
         getGeometryInstanceAttributes(id: any): any;
diff --git a/types/chai-datetime/chai-datetime-tests.ts b/types/chai-datetime/chai-datetime-tests.ts
index 255d816b5a..f955e78e27 100644
--- a/types/chai-datetime/chai-datetime-tests.ts
+++ b/types/chai-datetime/chai-datetime-tests.ts
@@ -3,47 +3,65 @@ import chai = require('chai');
 import chaiDateTime = require('chai-datetime');
 
 chai.use(chaiDateTime);
-var expect = chai.expect;
-var assert = chai.assert;
+const expect = chai.expect;
+const assert = chai.assert;
 
 function test_equalTime(){
-    var date: Date = new Date(2014, 1, 1);
+    const date: Date = new Date(2014, 1, 1);
     expect(date).to.equalTime(date);
     date.should.equalTime(date);
     assert.equalTime(date, date);
 }
 
 function test_beforeTime(){
-    var date: Date = new Date(2014, 1, 1);
+    const date: Date = new Date(2014, 1, 1);
     expect(date).to.be.beforeTime(date);
     date.should.be.beforeTime(date);
     assert.beforeTime(date, date);
 }
 
 function test_afterTime(){
-    var date: Date = new Date(2014, 1, 1);
+    const date: Date = new Date(2014, 1, 1);
     expect(date).to.be.afterTime(date);
     date.should.be.afterTime(date);
     assert.afterTime(date, date);
 }
 
+function test_withinTime(){
+    const date: Date = new Date(2014, 7, 1);
+    const fromDate: Date = new Date(2014, 1, 1);
+    const toDate: Date = new Date(2015, 1, 1);
+    expect(date).to.be.withinTime(fromDate, toDate);
+    date.should.be.withinTime(fromDate, toDate);
+    assert.withinTime(date, fromDate, toDate);
+}
+
 function test_equalDate(){
-    var date: Date = new Date(2014, 1, 1);
+    const date: Date = new Date(2014, 1, 1);
     expect(date).to.equalDate(date);
     date.should.equalDate(date);
     assert.equalDate(date, date);
 }
 
 function test_beforeDate(){
-    var date: Date = new Date(2014, 1, 1);
+    const date: Date = new Date(2014, 1, 1);
     expect(date).to.be.beforeDate(date);
     date.should.be.beforeDate(date);
     assert.beforeDate(date, date);
 }
 
 function test_afterDate(){
-    var date: Date = new Date(2014, 1, 1);
+    const date: Date = new Date(2014, 1, 1);
     expect(date).to.be.afterDate(date);
     date.should.be.afterDate(date);
     assert.afterDate(date, date);
 }
+
+function test_withinDate(){
+    const date: Date = new Date(2014, 7, 1);
+    const fromDate: Date = new Date(2014, 1, 1);
+    const toDate: Date = new Date(2015, 1, 1);
+    expect(date).to.be.withinDate(fromDate, toDate);
+    date.should.be.withinDate(fromDate, toDate);
+    assert.withinDate(date, fromDate, toDate);
+}
diff --git a/types/chai-datetime/index.d.ts b/types/chai-datetime/index.d.ts
index 176d112dc0..be623a05d4 100644
--- a/types/chai-datetime/index.d.ts
+++ b/types/chai-datetime/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for chai-datetime
 // Project: https://github.com/gaslight/chai-datetime.git
-// Definitions by: Cliff Burger <https://github.com/cliffburger>
+// Definitions by: Cliff Burger <https://github.com/cliffburger>,
+//                 Matt Bishop <https://github.com/mattbishop>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="chai" />
@@ -14,9 +15,11 @@ declare global {
             afterDate(date: Date): Assertion;
             beforeDate(date: Date): Assertion;
             equalDate(date: Date): Assertion;
+            withinDate(dateFrom: Date, dateTo: Date): Assertion;
             afterTime(date: Date): Assertion;
             beforeTime(date: Date): Assertion;
             equalTime(date: Date): Assertion;
+            withinTime(dateFrom: Date, dateTo: Date): Assertion;
         }
 
         interface Assert {
@@ -26,12 +29,16 @@ declare global {
             notBeforeTime(val: Date, exp: Date, msg?: string): void;
             afterTime(val: Date, exp: Date, msg?: string): void;
             notAfterTime(val: Date, exp: Date, msg?: string): void;
+            withinTime(val: Date, expFrom: Date, expTo: Date, msg?: string): void;
+            notWithinTime(val: Date, expFrom: Date, expTo: Date, msg?: string): void;
             equalDate(val: Date, exp: Date, msg?: string): void;
             notEqualDate(val: Date, exp: Date, msg?: string): void;
             beforeDate(val: Date, exp: Date, msg?: string): void;
             notBeforeDate(val: Date, exp: Date, msg?: string): void;
             afterDate(val: Date, exp: Date, msg?: string): void;
             notAfterDate(val: Date, exp: Date, msg?: string): void;
+            withinDate(val: Date, expFrom: Date, expTo: Date, msg?: string): void;
+            notWithinDate(val: Date, expFrom: Date, expTo: Date, msg?: string): void;
         }
     }
 
diff --git a/types/chai-enzyme/index.d.ts b/types/chai-enzyme/index.d.ts
index 413f5ec545..783b7fce2f 100644
--- a/types/chai-enzyme/index.d.ts
+++ b/types/chai-enzyme/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/producthunt/chai-enzyme
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 
 /// <reference types="enzyme" />
diff --git a/types/chai-http/chai-http-tests.ts b/types/chai-http/chai-http-tests.ts
index 882f089a47..37a4df794e 100644
--- a/types/chai-http/chai-http-tests.ts
+++ b/types/chai-http/chai-http-tests.ts
@@ -84,6 +84,10 @@ chai.request(app)
 	.then((res: ChaiHttp.Response) => chai.expect(res).to.have.status(200))
 	.catch((err: any) => { throw err; });
 
+chai.request(app)
+	.keepOpen()
+	.close((err: any) => { throw err; });
+
 const agent = chai.request.agent(app);
 
 agent
@@ -97,6 +101,8 @@ agent
 			.then((res: ChaiHttp.Response) => chai.expect(res).to.have.status(200));
 	});
 
+agent.close((err: any) => { throw err; });
+
 function test1() {
 	const req = chai.request(app).get('/');
 	req.then((res: ChaiHttp.Response) => {
diff --git a/types/chai-http/index.d.ts b/types/chai-http/index.d.ts
index 77c711cb7f..de3caa13e7 100644
--- a/types/chai-http/index.d.ts
+++ b/types/chai-http/index.d.ts
@@ -64,6 +64,8 @@ declare global {
 			del(url: string, callback?: (err: any, res: Response) => void): request.Request;
 			options(url: string, callback?: (err: any, res: Response) => void): request.Request;
 			patch(url: string, callback?: (err: any, res: Response) => void): request.Request;
+			keepOpen(): Agent;
+			close(callback?: (err: any) => void): Agent;
 		}
 
 		interface TypeComparison {
diff --git a/types/chai-roughly/chai-roughly-tests.ts b/types/chai-roughly/chai-roughly-tests.ts
new file mode 100644
index 0000000000..20ef05e293
--- /dev/null
+++ b/types/chai-roughly/chai-roughly-tests.ts
@@ -0,0 +1,15 @@
+import chai = require('chai');
+import chaiOequal = require('chai-roughly');
+
+chai.use(chaiOequal);
+
+import {
+    expect,
+    assert
+} from 'chai';
+
+expect(1.2).to.be.roughly().equal(1.1999999999);
+expect(1.2).to.roughly().equal(1.1999999999);
+expect(1.2).to.roughly(0.1).equal(1.1);
+expect(1.2).to.roughly(0.1).deep.equal(1.1);
+expect(1.2).to.roughly.equal(1.1999999999999999999);
diff --git a/types/chai-roughly/index.d.ts b/types/chai-roughly/index.d.ts
new file mode 100644
index 0000000000..c1f162ddb7
--- /dev/null
+++ b/types/chai-roughly/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for chai-roughly 1.0
+// Project: https://github.com/Turbo87/chai-roughly#readme
+// Definitions by: Tomasz Nguyen <https://github.com/swist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="chai" />
+
+declare global {
+    namespace Chai {
+        // For BDD APIs
+        interface Roughly extends Assertion {
+            (tolerance?: number): Assertion;
+        }
+
+        interface Assertion extends LanguageChains, NumericComparison, TypeComparison {
+            roughly: Roughly;
+        }
+
+        // For Assert APIs
+        interface Assert {
+            roughly: Roughly;
+        }
+    }
+}
+
+declare function chaiRoughly(chai: any, utils: any): void;
+declare namespace chaiRoughly { }
+export = chaiRoughly;
diff --git a/types/chai-roughly/tsconfig.json b/types/chai-roughly/tsconfig.json
new file mode 100644
index 0000000000..7cca2313fc
--- /dev/null
+++ b/types/chai-roughly/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",
+        "chai-roughly-tests.ts"
+    ]
+}
diff --git a/types/chai-roughly/tslint.json b/types/chai-roughly/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/chai-roughly/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/chai-spies/chai-spies-tests.ts b/types/chai-spies/chai-spies-tests.ts
index f5247ba13f..7bc9530164 100644
--- a/types/chai-spies/chai-spies-tests.ts
+++ b/types/chai-spies/chai-spies-tests.ts
@@ -24,7 +24,12 @@ let array = [ 1, 2, 3 ];
 chai.spy.on(array, 'push');
 
 // or you can track multiple object's methods
-chai.spy.on(array, 'push', 'pop');
+chai.spy.on(array, ['push', 'pop']);
+
+// or you can track multiple object's methods
+chai.spy.on(array, 'push', function(item) {
+    array.push(item);
+});
 
 array.push(5);
 
@@ -149,4 +154,20 @@ spy.should.not.have.been.called.above(3);
 expect(spy).to.have.been.called.below(3);
 expect(spy).to.not.have.been.called.lt(3);
 spy.should.have.been.called.lt(3);
-spy.should.not.have.been.called.below(3);
\ No newline at end of file
+spy.should.not.have.been.called.below(3);
+
+// You can also create sandbox
+let sb = chai.spy.sandbox();
+
+sb.on(array, 'pop', () => {
+    return 1;
+})
+
+let one = array.pop();
+expect(one).to.equal(1);
+
+// Can restore methods in sandbox
+sb.restore();
+array.push(2);
+let two = array.pop();
+expect(two).to.equal(2);
diff --git a/types/chai-spies/index.d.ts b/types/chai-spies/index.d.ts
index 75f702ca37..bb37fa8cd4 100644
--- a/types/chai-spies/index.d.ts
+++ b/types/chai-spies/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for chai-spies
+// Type definitions for chai-spies 1.0.0
 // Project: https://github.com/chaijs/chai-spies
 // Definitions by: Ilya Kuznetsov <https://github.com/kuzn-ilya>
+//                 Harm van der Werf <https://github.com/harm-less>
+//                 Jouni Suorsa <https://github.com/jounisuo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="chai" />
@@ -21,7 +23,7 @@ declare namespace Chai {
          * ```ts
          * expect(spy).to.be.spy;
          * spy.should.be.spy;
-         * ``` 
+         * ```
          */
         spy: Assertion;
 
@@ -32,7 +34,7 @@ declare namespace Chai {
          * expect(spy).to.have.been.called();
          * spy.should.have.been.called();
          * ```
-         * Note that ```called``` can be used as a chainable method.  
+         * Note that ```called``` can be used as a chainable method.
          */
         called: ChaiSpies.Called;
 
@@ -61,7 +63,32 @@ declare namespace Chai {
 }
 
 declare namespace ChaiSpies {
+    interface Sandbox {
+      /**
+       * #### chai.spy.on (function)
+       *
+       * Wraps an object method into spy. All calls will pass through to the original function.
+       *
+       * @param {Object} object
+       * @param {String} methodNames names to spy on
+       * @param {function} fn replacement function
+       * @returns function to actually call
+       */
+      on(object: Object, methodNames: string | string[], fn?: (parameters: any[]|any) => any): any;
 
+      /**
+       * #### chai.spy.restore (function)
+       *
+       * Restores previously wrapped object's method.
+       * Restores all spied objects of a sandbox if called without parameters.
+       *
+       * @function
+       * @param {Object} [object]
+       * @param {String|String[]} [methods] name or names
+       * @return {Sandbox} Sandbox instance
+       */
+      restore(object?: Object, methodNames?: string | string[]): void;
+    }
     interface Spy {
         /**
          * #### chai.spy (function)
@@ -72,9 +99,9 @@ declare namespace ChaiSpies {
          * var spy = chai.spy(original)
          *   , e_spy = chai.spy();
          * ```
-         * @param fn function to spy on. @default ```function () {}``` 
+         * @param fn function to spy on. @default ```function () {}```
          * @returns function to actually call
-         */ 
+         */
         (): SpyFunc0Proxy<void>;
         <R>(fn: SpyFunc0<R>): SpyFunc0Proxy<R>;
         <A1, R>(fn: SpyFunc1<A1, R>): SpyFunc1Proxy<A1, R>;
@@ -107,10 +134,11 @@ declare namespace ChaiSpies {
          * var spy = chai.spy.on(Array, 'isArray');
          * ```
          * @param {Object} object
-         * @param {String} method name to spy on
+         * @param {String} method names to spy on
+         * @param {function} fn replacement function
          * @returns function to actually call
-         */ 
-        on(object: Object, ...methodNames: string[]): any;
+         */
+        on(object: Object, methodNames: string | string[], fn?: (parameters: any[]|any) => any): any;
 
         /**
          * #### chai.spy.object (function)
@@ -123,10 +151,24 @@ declare namespace ChaiSpies {
          * @param {String[]|Object} method names or method definitions
          * @returns object with spied methods
          */
-        object(name: string, methods: string[]): any;           
-        object(methods: string[]): any;           
-        object<T>(name: string, methods: T): T;           
-        object<T>(methods: T): T;           
+        object(name: string, methods: string[]): any;
+        object(methods: string[]): any;
+        object<T>(name: string, methods: T): T;
+        object<T>(methods: T): T;
+
+      /**
+       * #### chai.spy.restore (function)
+       *
+       * Restores spy assigned to DEFAULT sandbox
+       *
+       * Restores previously wrapped object's method.
+       * Restores all spied objects of a sandbox if called without parameters.
+       *
+       * @param {Object} [object]
+       * @param {String|String[]} [methods] name or names
+       * @return {Sandbox} Sandbox instance
+       */
+        restore(object?: Object, methodNames?: string | string[]): void;
 
         /**
          * #### chai.spy.returns (function)
@@ -141,6 +183,18 @@ declare namespace ChaiSpies {
          */
 
         returns<T>(value: T): SpyFunc0Proxy<T>;
+
+        /**
+         * ### chai.spy.sandbox
+         *
+         * Creates a sandbox.
+         *
+         * Sandbox is a set of spies.
+         * Sandbox allows to track methods on objects and restore original methods with on restore call.
+         *
+         * @returns {Sandbox}
+         */
+        sandbox(): Sandbox;
     }
 
     interface Called {
@@ -158,12 +212,12 @@ declare namespace ChaiSpies {
          * spy.should.not.have.been.called.once;
          * ```
          */
-        once: Chai.Assertion; 
+        once: Chai.Assertion;
 
         /**
          * ####.twice
          * Assert that a spy has been called exactly twice.
-         * ```ts 
+         * ```ts
          * expect(spy).to.have.been.called.twice;
          * expect(spy).to.not.have.been.called.twice;
          * spy.should.have.been.called.twice;
@@ -215,7 +269,7 @@ declare namespace ChaiSpies {
          * ```ts
          * expect(spy).to.have.been.called.above(3);
          * spy.should.not.have.been.called.above(3);
-         * ``` 
+         * ```
          */
         above(n: number): Chai.Assertion;
 
@@ -225,7 +279,7 @@ declare namespace ChaiSpies {
          * ```ts
          * expect(spy).to.have.been.called.gt(3);
          * spy.should.not.have.been.called.gt(3);
-         * ``` 
+         * ```
          */
         gt(n: number): Chai.Assertion;
 
@@ -235,7 +289,7 @@ declare namespace ChaiSpies {
          * ```ts
          * expect(spy).to.have.been.called.below(3);
          * spy.should.not.have.been.called.below(3);
-         * ```   
+         * ```
          */
         below(n: number): Chai.Assertion;
 
@@ -245,7 +299,7 @@ declare namespace ChaiSpies {
          * ```ts
          * expect(spy).to.have.been.called.lt(3);
          * spy.should.not.have.been.called.lt(3);
-         * ```   
+         * ```
          */
         lt(n: number): Chai.Assertion;
     }
@@ -301,7 +355,7 @@ declare namespace ChaiSpies {
          * spy.should.have.been.called.with('foo');
          * ```
          * Will also pass for ```spy('foo', 'bar')``` and ```spy(); spy('foo')```.
-         * If used with multiple arguments, assert that a spy has been called with all the given arguments at least once.  
+         * If used with multiple arguments, assert that a spy has been called with all the given arguments at least once.
          * ```ts
          * spy('foo', 'bar', 1);
          * expect(spy).to.have.been.called.with('bar', 'foo');
@@ -389,7 +443,7 @@ declare namespace ChaiSpies {
          *
          * Resets __spy object parameters for instantiation and reuse
          * @returns proxy spy object
-         */ 
+         */
         reset(): this;
     }
 
@@ -397,77 +451,77 @@ declare namespace ChaiSpies {
         (): R;
     }
 
-    interface SpyFunc1<A1, R> { 
-        (a: A1): R; 
+    interface SpyFunc1<A1, R> {
+        (a: A1): R;
     }
 
-    interface SpyFunc2<A1, A2, R> { 
-        (a: A1, b: A2): R; 
+    interface SpyFunc2<A1, A2, R> {
+        (a: A1, b: A2): R;
     }
 
-    interface SpyFunc3<A1, A2, A3, R> { 
-        (a: A1, b: A2, c: A3): R; 
+    interface SpyFunc3<A1, A2, A3, R> {
+        (a: A1, b: A2, c: A3): R;
     }
 
-    interface SpyFunc4<A1, A2, A3, A4, R> { 
-        (a: A1, b: A2, c: A3, d: A4): R; 
+    interface SpyFunc4<A1, A2, A3, A4, R> {
+        (a: A1, b: A2, c: A3, d: A4): R;
     }
 
-    interface SpyFunc5<A1, A2, A3, A4, A5, R> { 
-        (a: A1, b: A2, c: A3, d: A4, e: A5): R; 
+    interface SpyFunc5<A1, A2, A3, A4, A5, R> {
+        (a: A1, b: A2, c: A3, d: A4, e: A5): R;
     }
 
-    interface SpyFunc6<A1, A2, A3, A4, A5, A6, R> { 
-        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6): R; 
+    interface SpyFunc6<A1, A2, A3, A4, A5, A6, R> {
+        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6): R;
     }
 
-    interface SpyFunc7<A1, A2, A3, A4, A5, A6, A7, R> { 
-        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7): R; 
+    interface SpyFunc7<A1, A2, A3, A4, A5, A6, A7, R> {
+        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7): R;
     }
 
-    interface SpyFunc8<A1, A2, A3, A4, A5, A6, A7, A8, R> { 
-        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7, h: A8): R; 
+    interface SpyFunc8<A1, A2, A3, A4, A5, A6, A7, A8, R> {
+        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7, h: A8): R;
     }
-    
-    interface SpyFunc9<A1, A2, A3, A4, A5, A6, A7, A8, A9, R> { 
-        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7, h: A8, i: A9): R; 
+
+    interface SpyFunc9<A1, A2, A3, A4, A5, A6, A7, A8, A9, R> {
+        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7, h: A8, i: A9): R;
     }
-    
-    interface SpyFunc10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R> { 
-        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7, h: A8, i: A9, j: A10): R; 
+
+    interface SpyFunc10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R> {
+        (a: A1, b: A2, c: A3, d: A4, e: A5, f: A6, g: A7, h: A8, i: A9, j: A10): R;
     }
 
     interface SpyFunc0Proxy<R> extends SpyFunc0<R>, Resetable {
     }
 
-    interface SpyFunc1Proxy<A1, R> extends SpyFunc1<A1, R>, Resetable { 
+    interface SpyFunc1Proxy<A1, R> extends SpyFunc1<A1, R>, Resetable {
     }
 
-    interface SpyFunc2Proxy<A1, A2, R> extends SpyFunc2<A1, A2, R>, Resetable { 
+    interface SpyFunc2Proxy<A1, A2, R> extends SpyFunc2<A1, A2, R>, Resetable {
     }
 
-    interface SpyFunc3Proxy<A1, A2, A3, R> extends SpyFunc3<A1, A2, A3, R>, Resetable { 
+    interface SpyFunc3Proxy<A1, A2, A3, R> extends SpyFunc3<A1, A2, A3, R>, Resetable {
     }
 
-    interface SpyFunc4Proxy<A1, A2, A3, A4, R> extends SpyFunc4<A1, A2, A3, A4, R>, Resetable { 
+    interface SpyFunc4Proxy<A1, A2, A3, A4, R> extends SpyFunc4<A1, A2, A3, A4, R>, Resetable {
     }
 
-    interface SpyFunc5Proxy<A1, A2, A3, A4, A5, R> extends SpyFunc5<A1, A2, A3, A4, A5, R>, Resetable { 
+    interface SpyFunc5Proxy<A1, A2, A3, A4, A5, R> extends SpyFunc5<A1, A2, A3, A4, A5, R>, Resetable {
     }
 
-    interface SpyFunc6Proxy<A1, A2, A3, A4, A5, A6, R> extends SpyFunc6<A1, A2, A3, A4, A5, A6, R>, Resetable { 
+    interface SpyFunc6Proxy<A1, A2, A3, A4, A5, A6, R> extends SpyFunc6<A1, A2, A3, A4, A5, A6, R>, Resetable {
     }
 
-    interface SpyFunc7Proxy<A1, A2, A3, A4, A5, A6, A7, R> extends SpyFunc7<A1, A2, A3, A4, A5, A6, A7, R>, Resetable { 
+    interface SpyFunc7Proxy<A1, A2, A3, A4, A5, A6, A7, R> extends SpyFunc7<A1, A2, A3, A4, A5, A6, A7, R>, Resetable {
     }
 
-    interface SpyFunc8Proxy<A1, A2, A3, A4, A5, A6, A7, A8, R> extends SpyFunc8<A1, A2, A3, A4, A5, A6, A7, A8, R>, Resetable { 
+    interface SpyFunc8Proxy<A1, A2, A3, A4, A5, A6, A7, A8, R> extends SpyFunc8<A1, A2, A3, A4, A5, A6, A7, A8, R>, Resetable {
     }
-    
-    interface SpyFunc9Proxy<A1, A2, A3, A4, A5, A6, A7, A8, A9, R> extends SpyFunc9<A1, A2, A3, A4, A5, A6, A7, A8, A9, R>, Resetable { 
+
+    interface SpyFunc9Proxy<A1, A2, A3, A4, A5, A6, A7, A8, A9, R> extends SpyFunc9<A1, A2, A3, A4, A5, A6, A7, A8, A9, R>, Resetable {
     }
-    
-    interface SpyFunc10Proxy<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R> extends SpyFunc10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R>, Resetable { 
+
+    interface SpyFunc10Proxy<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R> extends SpyFunc10<A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, R>, Resetable {
     }
 }
 
diff --git a/types/chai/tslint.json b/types/chai/tslint.json
index f99183c97d..e6f749320f 100644
--- a/types/chai/tslint.json
+++ b/types/chai/tslint.json
@@ -9,6 +9,7 @@
         "no-redundant-jsdoc-2": false,
         "no-single-declare-module": false,
         "no-unnecessary-generics": false,
-        "strict-export-declare-modifiers": false
+        "strict-export-declare-modifiers": false,
+        "use-default-type-parameter": false
     }
 }
diff --git a/types/chance/chance-tests.ts b/types/chance/chance-tests.ts
index 00d8752118..238fd97cf3 100644
--- a/types/chance/chance-tests.ts
+++ b/types/chance/chance-tests.ts
@@ -71,3 +71,18 @@ euro = chance.euro({opt: 'abc'});
 
 let coin = chance.coin();
 coin = chance.coin();
+
+// Make sure date works with min and max parameters
+let date: string|Date = chance.date();
+
+let min = new Date();
+let max = new Date();
+date = chance.date({min, max});
+
+min = new Date();
+min.setFullYear(new Date().getFullYear() - 15);
+max = new Date();
+max.setFullYear(new Date().getFullYear() + 15);
+date = chance.date({min, max});
+date = chance.date({min});
+date = chance.date({max});
diff --git a/types/chance/index.d.ts b/types/chance/index.d.ts
index 07418e45be..17708acc5a 100644
--- a/types/chance/index.d.ts
+++ b/types/chance/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Chance 1.0.13
+// Type definitions for Chance 1.0.16
 // Project: http://chancejs.com
 // Definitions by: Chris Bowdon <https://github.com/cbowdon>
 //                 Brice BERNARD <https://github.com/brikou>
@@ -189,6 +189,8 @@ declare namespace Chance {
         year?: number;
         month?: number;
         day?: number;
+        min?: Date;
+        max?: Date;
     }
 
     interface Month {
diff --git a/types/chart.js/chart.js-tests.ts b/types/chart.js/chart.js-tests.ts
index d0f6ebc684..36f25643d9 100644
--- a/types/chart.js/chart.js-tests.ts
+++ b/types/chart.js/chart.js-tests.ts
@@ -1,18 +1,24 @@
-import { Chart, ChartData, Point } from 'chart.js';
+import { Chart, ChartData, Point } from "chart.js";
 
 // alternative:
 // import chartjs = require('chart.js');
 // => chartjs.Chart
 
+const plugin = {
+  afterDraw: (chartInstance: Chart, easing: string, options?: any) => {
+  }
+};
+
 const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
-    type: 'bar',
+    type: "bar",
+    plugins: [plugin, plugin],
     data: {
-        labels: ['group 1'],
+        labels: ["group 1"],
         datasets: [
             {
-                backgroundColor: '#000000',
+                backgroundColor: "#000000",
                 borderWidth: 1,
-                label: 'test',
+                label: "test",
                 data: [1]
             }
         ]
@@ -22,7 +28,7 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
             intersect: true
         },
         onHover(ev: MouseEvent, points: any[]) {
-          return;
+            return;
         },
         title: {
             text: ["foo", "bar"]
@@ -35,21 +41,23 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
             caretPadding: 2,
             displayColors: true,
             borderColor: "rgba(0,0,0,0)",
-            borderWidth: 1,
+            borderWidth: 1
         },
         scales: {
-            xAxes: [{
-                ticks: {
-                    callback: Math.floor
-                },
-                gridLines: {
-                    display: false,
-                    borderDash: [5, 15],
-                    borderDashOffset: 2,
-                    zeroLineBorderDash: [5, 15],
-                    zeroLineBorderDashOffset: 2
+            xAxes: [
+                {
+                    ticks: {
+                        callback: Math.floor
+                    },
+                    gridLines: {
+                        display: false,
+                        borderDash: [5, 15],
+                        borderDashOffset: 2,
+                        zeroLineBorderDash: [5, 15],
+                        zeroLineBorderDashOffset: 2
+                    }
                 }
-            }]
+            ]
         },
         legend: {
             display: true,
@@ -58,11 +66,13 @@ const chart: Chart = new Chart(new CanvasRenderingContext2D(), {
                 padding: 40
             }
         },
-        devicePixelRatio: 2,
+        devicePixelRatio: 2
     }
 });
 chart.update();
 
+console.log(chart.getDatasetMeta(0));
+
 console.log(chart.ctx && chart.ctx.font);
 console.log(chart.canvas && chart.canvas.tagName);
 if (chart.chartArea) {
@@ -72,6 +82,54 @@ if (chart.chartArea) {
     console.log(chart.chartArea.left);
 }
 
+// Testing radial chart
+const tickOptions: Chart.LinearTickOptions = {
+    max: 100,
+    stepSize: 33,
+    display: false,
+    beginAtZero: true
+};
+const scaleOptions: Chart.RadialLinearScale = {
+    ticks: tickOptions,
+    lineArc: false,
+    display: false,
+    scaleLabel: {
+        display: false
+    },
+};
+const radarChartOptions: Chart.RadialChartOptions = {
+    legend: {display: false},
+    scale: scaleOptions,
+    responsive: true,
+};
+const chartConfig: Chart.ChartConfiguration = {
+    type: 'radar',
+    data: {
+        labels: ['#apples', '#pears', '#apricots', '#acorns', '#amigas', "#orics"],
+        datasets: [{
+			label: "test",
+			lineTension: 0.15,
+			data: [1, 1, 2, 3, 5],
+			backgroundColor: '#37738353',
+			borderColor: '#37738353',
+			borderWidth: 3,
+			fill: true
+		}]
+    },
+    options: radarChartOptions
+};
+const radialChart: Chart = new Chart(new CanvasRenderingContext2D(), chartConfig);
+radialChart.update();
+
+console.log(radialChart.ctx && radialChart.ctx.font);
+console.log(radialChart.canvas && radialChart.canvas.tagName);
+if (radialChart.chartArea) {
+    console.log(radialChart.chartArea.top);
+    console.log(radialChart.chartArea.right);
+    console.log(radialChart.chartArea.bottom);
+    console.log(radialChart.chartArea.left);
+}
+
 // http://www.chartjs.org/docs/latest/configuration/tooltip.html#position-modes
 Chart.Tooltip.positioners.custom = (elements: any[], eventPosition: Point) => {
     return {
diff --git a/types/chart.js/index.d.ts b/types/chart.js/index.d.ts
index 8063cf2629..4e82fb9ff5 100644
--- a/types/chart.js/index.d.ts
+++ b/types/chart.js/index.d.ts
@@ -12,6 +12,9 @@
 //                 Simon Archer <https://github.com/archy-bold>
 //                 Ken Elkabany <https://github.com/braincore>
 //                 Slavik Nychkalo <https://github.com/gebeto>
+//                 Francesco Benedetto <https://github.com/frabnt>
+//                 Alexandros Dorodoulis <https://github.com/alexdor>
+//                 Manuel Heidrich <https://github.com/mahnuh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -29,13 +32,14 @@ declare class Chart {
     stop: () => {};
     resize: () => {};
     clear: () => {};
-    toBase64: () => string;
+    toBase64Image: () => string;
     generateLegend: () => {};
     getElementAtEvent: (e: any) => {};
     getElementsAtEvent: (e: any) => Array<{}>;
     getDatasetAtEvent: (e: any) => Array<{}>;
-    ctx: CanvasRenderingContext2D|null;
-    canvas: HTMLCanvasElement|null;
+    getDatasetMeta: (index: number) => Meta;
+    ctx: CanvasRenderingContext2D | null;
+    canvas: HTMLCanvasElement | null;
     chartArea: Chart.ChartArea;
     static pluginService: PluginServiceStatic;
     static plugins: PluginServiceStatic;
@@ -49,37 +53,54 @@ declare class Chart {
         [key: string]: any;
     };
 
+    static helpers: {
+        [key: string]: any;
+    };
+
     // Tooltip Static Options
     static Tooltip: Chart.ChartTooltipsStaticConfiguration;
 }
 declare class PluginServiceStatic {
-    register(plugin: PluginServiceRegistrationOptions): void;
-    unregister(plugin: PluginServiceRegistrationOptions): void;
+    register(plugin: PluginServiceGlobalRegistration & PluginServiceRegistrationOptions): void;
+    unregister(plugin: PluginServiceGlobalRegistration & PluginServiceRegistrationOptions): void;
+}
+
+interface PluginServiceGlobalRegistration {
+    id?: string;
 }
 
 interface PluginServiceRegistrationOptions {
     beforeInit?(chartInstance: Chart, options?: any): void;
     afterInit?(chartInstance: Chart, options?: any): void;
 
-    resize?(chartInstance: Chart, newChartSize: Size, options?: any): void;
-
     beforeUpdate?(chartInstance: Chart, options?: any): void;
-    afterScaleUpdate?(chartInstance: Chart, options?: any): void;
+    afterUpdate?(chartInstance: Chart, options?: any): void;
+
+    beforeLayout?(chartInstance: Chart, options?: any): void;
+    afterLayout?(chartInstance: Chart, options?: any): void;
+
     beforeDatasetsUpdate?(chartInstance: Chart, options?: any): void;
     afterDatasetsUpdate?(chartInstance: Chart, options?: any): void;
-    afterUpdate?(chartInstance: Chart, options?: any): void;
+
+    beforeDatasetUpdate?(chartInstance: Chart, options?: any): void;
+    afterDatasetUpdate?(chartInstance: Chart, options?: any): void;
 
     // This is called at the start of a render. It is only called once, even if the animation will run for a number of frames. Use beforeDraw or afterDraw
     // to do something on each animation frame
     beforeRender?(chartInstance: Chart, options?: any): void;
+    afterRender?(chartInstance: Chart, options?: any): void;
 
     // Easing is for animation
     beforeDraw?(chartInstance: Chart, easing: string, options?: any): void;
     afterDraw?(chartInstance: Chart, easing: string, options?: any): void;
+
     // Before the datasets are drawn but after scales are drawn
     beforeDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
     afterDatasetsDraw?(chartInstance: Chart, easing: string, options?: any): void;
 
+    beforeDatasetDraw?(chartInstance: Chart, easing: string, options?: any): void;
+    afterDatasetDraw?(chartInstance: Chart, easing: string, options?: any): void;
+
     // Called before drawing the `tooltip`. If any plugin returns `false`,
     // the tooltip drawing is cancelled until another `render` is triggered.
     beforeTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
@@ -87,16 +108,57 @@ interface PluginServiceRegistrationOptions {
     // be called if the tooltip drawing has been previously cancelled.
     afterTooltipDraw?(chartInstance: Chart, tooltipData?: any, options?: any): void;
 
-    destroy?(chartInstance: Chart): void;
-
     // Called when an event occurs on the chart
     beforeEvent?(chartInstance: Chart, event: Event, options?: any): void;
     afterEvent?(chartInstance: Chart, event: Event, options?: any): void;
+
+    resize?(chartInstance: Chart, newChartSize: Chart.ChartSize, options?: any): void;
+    destroy?(chartInstance: Chart): void;
+
+    /** @deprecated since version 2.5.0. Use `afterLayout` instead. */
+    afterScaleUpdate?(chartInstance: Chart, options?: any): void;
 }
 
-interface Size {
-    height: number;
-    width: number;
+interface Meta {
+    type: Chart.ChartType;
+    data: MetaData[];
+    dataset?: Chart.ChartDataSets;
+    controller: { [key: string]: any; };
+    hidden?: boolean;
+    total?: string;
+    xAxisID?: string;
+    yAxisID?: string;
+    "$filler"?: { [key: string]: any; };
+}
+
+interface MetaData {
+    _chart: Chart;
+    _datasetIndex: number;
+    _index: number;
+    _model: Model;
+    _start?: any;
+    _view: Model;
+    _xScale: Chart.ChartScales;
+    _yScale: Chart.ChartScales;
+    hidden?: boolean;
+}
+
+interface Model {
+    backgroundColor: string;
+    borderColor: string;
+    borderWidth?: number;
+    controlPointNextX: number;
+    controlPointNextY: number;
+    controlPointPreviousX: number;
+    controlPointPreviousY: number;
+    hitRadius: number;
+    pointStyle: string;
+    radius: string;
+    skip?: boolean;
+    steppedLine?: undefined;
+    tension: number;
+    x: number;
+    y: number;
 }
 
 declare namespace Chart {
@@ -178,8 +240,7 @@ declare namespace Chart {
         type?: ChartType | string;
         data?: ChartData;
         options?: ChartOptions;
-        // Plugins can require any options
-        plugins?: any;
+        plugins?: PluginServiceRegistrationOptions[];
     }
 
     interface ChartData {
@@ -187,6 +248,15 @@ declare namespace Chart {
         datasets?: ChartDataSets[];
     }
 
+	interface RadialChartOptions extends ChartOptions {
+		scale?: RadialLinearScale;
+	}
+
+    interface ChartSize {
+        height: number;
+        width: number;
+    }
+
     interface ChartOptions {
         responsive?: boolean;
         responsiveAnimationDuration?: number;
@@ -195,6 +265,7 @@ declare namespace Chart {
         events?: string[];
         onHover?(this: Chart, event: MouseEvent, activeElements: Array<{}>): any;
         onClick?(event?: MouseEvent, activeElements?: Array<{}>): any;
+        onResize?(this: Chart, newSize: ChartSize): void;
         title?: ChartTitleOptions;
         legend?: ChartLegendOptions;
         tooltips?: ChartTooltipOptions;
@@ -210,7 +281,7 @@ declare namespace Chart {
         rotation?: number;
         devicePixelRatio?: number;
         // Plugins can require any options
-        plugins?: { [plugin: string]: any };
+        plugins?: { [pluginId: string]: any };
     }
 
     interface ChartFontOptions {
@@ -293,7 +364,7 @@ declare namespace Chart {
     }
 
     interface ChartTooltipsStaticConfiguration {
-        positioners: {[mode: string]: ChartTooltipPositioner};
+        positioners: { [mode: string]: ChartTooltipPositioner };
     }
 
     type ChartTooltipPositioner = (elements: any[], eventPosition: Point) => Point;
@@ -367,14 +438,14 @@ declare namespace Chart {
     }
 
     interface ChartLayoutOptions {
-      padding?: ChartLayoutPaddingObject | number;
+        padding?: ChartLayoutPaddingObject | number;
     }
 
     interface ChartLayoutPaddingObject {
-      top?: number;
-      right?: number;
-      bottom?: number;
-      left?: number;
+        top?: number;
+        right?: number;
+        bottom?: number;
+        left?: number;
     }
 
     interface GridLineOptions {
@@ -410,7 +481,7 @@ declare namespace Chart {
         backdropPaddingX?: number;
         backdropPaddingY?: number;
         beginAtZero?: boolean;
-        callback?(value: any, index: any, values: any): string|number;
+        callback?(value: any, index: any, values: any): string | number;
         display?: boolean;
         fontColor?: ChartColor;
         fontFamily?: string;
@@ -483,7 +554,7 @@ declare namespace Chart {
         pointHoverBackgroundColor?: ChartColor | ChartColor[];
         pointHoverBorderColor?: ChartColor | ChartColor[];
         pointHoverBorderWidth?: number | number[];
-        pointStyle?: PointStyle | HTMLImageElement | Array<PointStyle | HTMLImageElement>;
+        pointStyle?: PointStyle | HTMLImageElement | HTMLCanvasElement | Array<PointStyle | HTMLImageElement | HTMLCanvasElement>;
         xAxisID?: string;
         yAxisID?: string;
         type?: string;
@@ -514,9 +585,10 @@ declare namespace Chart {
         position?: string;
         ticks?: TickOptions;
         gridLines?: GridLineOptions;
-        barThickness?: number;
+        barThickness?: number | "flex";
         maxBarThickness?: number;
         scaleLabel?: ScaleTitleOptions;
+        time?: TimeScale;
         offset?: boolean;
         beforeUpdate?(scale?: any): void;
         beforeSetDimension?(scale?: any): void;
@@ -538,7 +610,6 @@ declare namespace Chart {
         categoryPercentage?: number;
         barPercentage?: number;
         distribution?: 'linear' | 'series';
-        time?: TimeScale;
     }
 
     // tslint:disable-next-line no-empty-interface
@@ -579,7 +650,7 @@ declare namespace Chart {
         minUnit?: TimeUnit;
     }
 
-    interface RadialLinearScale {
+    interface RadialLinearScale extends LinearScale {
         lineArc?: boolean;
         angleLines?: AngleLineOptions;
         pointLabels?: PointLabelOptions;
diff --git a/types/chartist/chartist-tests.ts b/types/chartist/chartist-tests.ts
index 270e6e0970..bd7006723e 100644
--- a/types/chartist/chartist-tests.ts
+++ b/types/chartist/chartist-tests.ts
@@ -343,6 +343,7 @@ chart2.on('draw', (data: any) => {
             style: 'fill-opacity: 1'
         }, 'ct-area');
 
+        triangle.attr({ style: 'fill-opacity: .5' });
         // With data.element we get the Chartist SVG wrapper and we can replace the original point drawn by Chartist with our newly created triangle
         data.element.replace(triangle);
     }
diff --git a/types/chartist/index.d.ts b/types/chartist/index.d.ts
index 80cc589ee2..3d72210c73 100644
--- a/types/chartist/index.d.ts
+++ b/types/chartist/index.d.ts
@@ -534,7 +534,7 @@ declare namespace Chartist {
         /**
          * Set attributes on the current SVG element of the wrapper you're currently working on.
          */
-        attr(attributes: Object | string, ns: string): Object | string;
+        attr(attributes: Object | string, ns?: string): Object | string;
 
         /**
          * Create a new SVG element whose wrapper object will be selected for further operations. This way you can also create nested groups easily.
diff --git a/types/chartmogul-node/chartmogul-node-tests.ts b/types/chartmogul-node/chartmogul-node-tests.ts
new file mode 100644
index 0000000000..3a09a7597c
--- /dev/null
+++ b/types/chartmogul-node/chartmogul-node-tests.ts
@@ -0,0 +1,277 @@
+import * as ChartMogul from 'chartmogul-node';
+
+const config = new ChartMogul.Config("token", "secret", "baseURL");
+config.retries = 10;
+config.getAccountToken(); // $ExpectType string
+config.getSecretKey(); // $ExpectType string
+config.VERSION; // $ExpectType string
+
+ChartMogul.Ping.ping(config); // $ExpectType Promise<string>
+
+// $ExpectType Promise<DataSource>
+ChartMogul.DataSource.create(config, {
+    name: ""
+});
+
+// $ExpectType Promise<DataSource>
+ChartMogul.DataSource.retrieve(config, "");
+
+// $ExpectType Promise<{}>
+ChartMogul.DataSource.destroy(config, "");
+
+// $ExpectType Promise<DataSources>
+ChartMogul.DataSource.all(config, {
+    name: ""
+});
+
+ChartMogul.DataSource.all(config).then(data => {
+    data.data_sources[0]; // $ExpectType DataSource
+    data.data_sources[0].name; // $ExpectType string
+});
+
+// $ExpectType Promise<Customer>
+ChartMogul.Customer.create(config, {
+    data_source_uuid: "",
+    name: "",
+    external_id: "",
+    attributes: {
+		tags: ["important", "Prio1"],
+		custom: [
+			{type: "String", key: "channel", value: "Facebook", source: "integration"},
+			{type: "Integer", key: "age", value: 18}
+		]
+	}
+});
+
+// $ExpectType Promise<Customer>
+ChartMogul.Customer.retrieve(config, "");
+
+// $ExpectType Promise<Customer>
+ChartMogul.Customer.modify(config, "", {});
+
+// $ExpectType Promise<{}>
+ChartMogul.Customer.destroy(config, "");
+
+// $ExpectType Promise<Entries<Customer>>
+ChartMogul.Customer.all(config, {
+    data_source_uuid: ""
+});
+
+ChartMogul.Customer.all(config).then(data => {
+    data.entries[0]; // $ExpectType Customer
+    data.entries[0].attributes!.stripe!['something']; // $ExpectType any
+    data.page!; // $ExpectType number
+});
+
+// $ExpectType Promise<Entries<Customer>>
+ChartMogul.Customer.search(config, {
+    email: ""
+});
+// $ExpectType Promise<{}>
+ChartMogul.Customer.merge(config, {
+    from: {customer_uuid: ""},
+    into: {customer_uuid: ""}
+});
+// $ExpectType Promise<Attributes>
+ChartMogul.Customer.attributes(config, "");
+
+// $ExpectType Promise<Plan>
+ChartMogul.Plan.create(config, {
+    data_source_uuid: "",
+    name: "",
+    interval_count: 1,
+    interval_unit: "",
+    external_id: ""
+});
+
+// $ExpectType Promise<Plan>
+ChartMogul.Plan.retrieve(config, "");
+
+// $ExpectType Promise<Plan>
+ChartMogul.Plan.modify(config, "", {
+    name: ""
+});
+
+// $ExpectType Promise<{}>
+ChartMogul.Plan.destroy(config, "");
+
+ChartMogul.Plan.all(config, {
+    page: 1
+}).then(data => {
+    data.plans[0]; // $ExpectType Plan
+    data.plans[0].name!; // $ExpectType string
+    data.page!; // $ExpectType number
+});
+
+// $ExpectType Promise<Invoice>
+ChartMogul.Invoice.retrieve(config, "");
+
+// $ExpectType Promise<Invoice>
+ChartMogul.Invoice.create(config, "", {
+    invoices: [
+        {
+            external_id: ""
+        }
+    ]
+});
+
+// $ExpectType Promise<{}>
+ChartMogul.Invoice.destroy(config, "");
+ChartMogul.Invoice.all(config, {
+    external_id: ""
+}).then(data => {
+    data.invoices[0]; // $ExpectType Invoice
+    data.invoices[0].uuid!; // $ExpectType string
+    data.page!; // $ExpectType number
+});
+
+ChartMogul.Invoice.all(config, "", {
+    page: 1
+}).then(data => {
+    data.customer_uuid!; // $ExpectType string
+    data.invoices[0]; // $ExpectType Invoice
+    data.invoices[0].uuid!; // $ExpectType string
+    data.page!; // $ExpectType number
+});
+
+// $ExpectType Promise<Transaction>
+ChartMogul.Transaction.create(config, "", {
+    type: "",
+    date: "",
+    result: ""
+});
+
+ChartMogul.Subscription.all(config, "", {
+    page: 1
+}).then(data => {
+    data.customer_uuid!; // $ExpectType string
+    data.subscriptions[0]; // $ExpectType Subscription
+    data.subscriptions[0].uuid; // $ExpectType string
+    data.current_page!; // $ExpectType number
+});
+
+ChartMogul.Subscription.cancel(config, "", {
+    cancelled_at: ""
+}).then(data => {
+    data.customer_uuid; // $ExpectType string
+});
+
+// $ExpectType Promise<Entries<Customer>>
+ChartMogul.Tag.add(config, "", {
+    email: "",
+    tags: [""]
+});
+
+// $ExpectType Promise<Tags>
+ChartMogul.Tag.add(config, "", {
+    tags: [""]
+});
+
+// $ExpectType Promise<Tags>
+ChartMogul.Tag.remove(config, "", {
+    tags: [""]
+});
+
+// $ExpectType Promise<CustomAttributes>
+ChartMogul.CustomAttribute.add(config, "", {
+    custom: [
+        {type: "", key: "", value: 0}
+    ]
+});
+// $ExpectType Promise<Entries<Customer>>
+ChartMogul.CustomAttribute.add(config, "", {
+    email: "",
+    custom: [
+        {type: "", key: "", value: 0}
+    ]
+});
+
+// $ExpectType Promise<CustomAttributes>
+ChartMogul.CustomAttribute.update(config, "", {
+    custom: {
+        pro: true,
+        channel: ""
+    }
+});
+
+ChartMogul.CustomAttribute.remove(config, "", {
+    custom: [""]
+}).then(data => {
+    data.custom["key"]; // $ExpectType any
+});
+
+// $ExpectType Promise<All>
+ChartMogul.Metrics.all(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-24',
+    interval: '',
+    geo: '',
+    plans: ''
+});
+
+// $ExpectType Promise<EntriesSummary<MRR>>
+ChartMogul.Metrics.mrr(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+});
+
+// $ExpectType Promise<EntriesSummary<ARR>>
+ChartMogul.Metrics.arr(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+});
+
+// $ExpectType Promise<EntriesSummary<ARPA>>
+ChartMogul.Metrics.arpa(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+});
+
+// $ExpectType Promise<EntriesSummary<ASP>>
+ChartMogul.Metrics.asp(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+});
+
+// $ExpectType Promise<EntriesSummary<CustomerCount>>
+ChartMogul.Metrics.customerCount(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+});
+
+// $ExpectType Promise<EntriesSummary<CustomerChurnRate>>
+ChartMogul.Metrics.customerChurnRate(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01',
+    geo: '',
+    plans: ''
+});
+
+// $ExpectType Promise<EntriesSummary<MRRChurnRate>>
+ChartMogul.Metrics.mrrChurnRate(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+});
+
+ChartMogul.Metrics.ltv(config, {
+    'start-date': '2015-01-01',
+    'end-date': '2015-11-01'
+}).then(data => {
+    data.entries[0].ltv; // $ExpectType number
+    data.summary; // $ExpectType Summary
+    data.summary.current; // $ExpectType number
+});
+
+// $ExpectType Promise<Entries<MetricsSubscription>>
+ChartMogul.Metrics.Customer.subscriptions(config, "", {
+    page: 1
+});
+
+ChartMogul.Metrics.Customer.activities(config, "", {
+    page: 1
+}).then(data => {
+    data.entries; // $ExpectType MetricsActivity[]
+    data.entries[0]; // $ExpectType MetricsActivity
+    data.entries[0]['activity-mrr']; // $ExpectType number
+    data.page!; // $ExpectType number
+});
diff --git a/types/chartmogul-node/common.d.ts b/types/chartmogul-node/common.d.ts
new file mode 100644
index 0000000000..ced10f98d7
--- /dev/null
+++ b/types/chartmogul-node/common.d.ts
@@ -0,0 +1,28 @@
+export interface Map {
+    [key: string]: any
+}
+export interface CursorParams {
+    page?: number;
+    per_page?: number;
+}
+export type Strings = string[];
+
+export interface Cursor {
+    page?: number;
+    per_page?: number;
+    has_more?: boolean;
+    current_page?: number;
+    total_pages?: number;
+}
+export interface Entries<T> extends Cursor {
+    entries: T[]
+}
+interface Summary {
+    current: number;
+    previous: number;
+    ['percentage-change']: number;
+}
+export interface EntriesSummary<T> {
+    entries: T[];
+    summary: Summary;
+}
\ No newline at end of file
diff --git a/types/chartmogul-node/index.d.ts b/types/chartmogul-node/index.d.ts
new file mode 100644
index 0000000000..c4bdce5aca
--- /dev/null
+++ b/types/chartmogul-node/index.d.ts
@@ -0,0 +1,410 @@
+// Type definitions for chartmogul-node 1.0
+// Project: https://github.com/chartmogul/chartmogul-node
+// Definitions by: ChartMogul <https://github.com/chartmogul>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Map, Cursor, CursorParams, Strings, Entries, EntriesSummary } from './common';
+
+export class Config {
+    VERSION: string;
+    API_BASE: string;
+    retries: number;
+
+    constructor(token: string, secret: string, base?: string);
+    getAccountToken(): string;
+    getSecretKey(): string;
+}
+
+export namespace Ping {
+    function ping(config: Config): Promise<string>;
+}
+
+export namespace DataSource {
+    interface DataSource {
+        uuid?: string;
+        name: string;
+        created_at?: string;
+        status?: string;
+        system?: string;
+    }
+    interface DataSources {
+        data_sources: DataSource[];
+    }
+    interface ListDataSourcesParams {
+        name?: string;
+        system?: string;
+    }
+
+    function create(config: Config, data: DataSource): Promise<DataSource>;
+    function retrieve(config: Config, uuid: string): Promise<DataSource>;
+    function destroy(config: Config, uuid: string): Promise<{}>;
+    function all(config: Config, params?: ListDataSourcesParams): Promise<DataSources>;
+}
+
+export namespace Customer {
+    interface Customer {
+        id?: number;
+        data_source_uuid?: string;
+        data_source_uuids?: Strings;
+        uuid?: string;
+        external_id?: string;
+        external_ids?: Strings;
+        name?: string;
+        email?: string;
+        status?: string;
+        ['customer-since']?: string;
+        attributes?: Attributes;
+        address?: {
+            address_zip?: string;
+            city?: string;
+            state?: string;
+            country?: string;
+        };
+        mrr?: number;
+        arr?: number;
+        ['billing-system-url']?: string;
+        ['chartmogul-url']?: string;
+        ['billing-system-type']?: string;
+        currency?: string;
+        ['currency-sign']?: string;
+        company?: string;
+        country?: string;
+        state?: string;
+        city?: string;
+        zip?: string;
+        lead_created_at?: string;
+        free_trial_started_at?: string;
+    }
+    interface NewCustomer {
+        data_source_uuid: string;
+        external_id: string;
+        name: string;
+        email?: string;
+        company?: string;
+        country?: string;
+        state?: string;
+        city?: string;
+        zip?: string;
+        lead_created_at?: string;
+        free_trial_started_at?: string;
+        attributes?: NewAttributes;
+    }
+    interface UpdateCustomer {
+        name?: string;
+        email?: string;
+        company?: string;
+        country?: string;
+        state?: string;
+        city?: string;
+        zip?: string;
+        lead_created_at?: string;
+        free_trial_started_at?: string;
+        attributes?: NewAttributes;
+    }
+    interface NewAttributes {
+        tags?: Strings;
+        custom?: NewCustomAttributes[];
+    }
+    interface NewCustomAttributes {
+        type?: string;
+        key: string;
+        value: any;
+        source?: string;
+    }
+    interface Attributes {
+        tags?: Strings;
+        stripe?: Map;
+        clearbit?: Map;
+        custom?: Map;
+    }
+    interface ListCustomersParams extends CursorParams {
+        data_source_uuid?: string;
+        status?: string;
+        system?: string;
+        external_id?: string;
+    }
+    interface SearchCustomersParams extends CursorParams {
+        email: string;
+    }
+    interface MergeID {
+        customer_uuid?: string;
+        external_id?: string;
+    }
+    interface MergeCustomersParams {
+        from: MergeID;
+        into: MergeID;
+    }
+
+    function create(config: Config, data: NewCustomer): Promise<Customer>;
+    function retrieve(config: Config, uuid: string): Promise<Customer>;
+    function modify(config: Config, uuid: string, data: UpdateCustomer): Promise<Customer>;
+    function destroy(config: Config, uuid: string): Promise<{}>;
+    function all(config: Config, params?: ListCustomersParams): Promise<Entries<Customer>>;
+    function search(config: Config, params?: SearchCustomersParams): Promise<Entries<Customer>>;
+    function merge(config: Config, params?: MergeCustomersParams): Promise<{}>;
+    function attributes(config: Config, uuid: string): Promise<Attributes>;
+}
+
+export namespace Plan {
+    interface Plan {
+        uuid?: string;
+        data_source_uuid?: string;
+        external_id?: string;
+        name?: string;
+        interval_count?: number;
+        interval_unit?: string;
+    }
+    interface ListPlansParams extends CursorParams {
+        data_source_uuid?: string;
+        system?: string;
+        external_id?: string;
+    }
+    interface Plans extends Cursor {
+        plans: Plan[];
+    }
+
+    function create(config: Config, data: Plan): Promise<Plan>;
+    function retrieve(config: Config, uuid: string): Promise<Plan>;
+    function modify(config: Config, uuid: string, data: Plan): Promise<Plan>;
+    function destroy(config: Config, uuid: string): Promise<{}>;
+    function all(config: Config, params?: ListPlansParams): Promise<Plans>;
+}
+
+export namespace Invoice {
+    interface Invoice {
+        uuid?: string;
+        customer_uuid?: string;
+        currency?: string;
+        data_source_uuid?: string;
+        date?: string;
+        due_date?: string;
+        external_id?: string;
+        line_items?: LineItem[];
+        transactions?: Transaction[];
+    }
+    interface LineItem {
+        uuid?: string;
+        account_code?: string;
+        amount_in_cents?: number;
+        cancelled_at?: string;
+        description?: string;
+        discount_amount_in_cents?: number;
+        discount_code?: string;
+        external_id?: string;
+        plan_uuid?: string;
+        prorated?: boolean;
+        quantity?: number;
+        service_period_end?: string;
+        service_period_start?: string;
+        subscription_external_id?: string;
+        subscription_uuid?: string;
+        tax_amount_in_cents?: number;
+        transaction_fees_in_cents?: number;
+        type?: string;
+    }
+    interface Transaction {
+        uuid?: string;
+        date?: string;
+        external_id?: string;
+        result?: string;
+        type?: string;
+    }
+    interface ListInvoicesParams  extends CursorParams {
+        data_source_uuid?: string;
+        customer_uuid?: string;
+        external_id?: string;
+    }
+    interface Invoices extends Cursor {
+        customer_uuid?: string;
+        invoices: Invoice[];
+    }
+
+    function create(config: Config, uuid: string, data: {
+        invoices: Invoice[]
+    }): Promise<Invoice>;
+    function retrieve(config: Config, uuid: string): Promise<Invoice>;
+    function destroy(config: Config, uuid: string): Promise<{}>;
+    function all(config: Config, uuid: string, params?: ListInvoicesParams): Promise<Invoices>;
+    function all(config: Config, params?: ListInvoicesParams): Promise<Invoices>;
+}
+
+export namespace Transaction {
+    interface Transaction {
+        uuid?: string;
+        date: string;
+        external_id?: string;
+        result: string;
+        type: string;
+    }
+
+    function create(config: Config, uuid: string, data: Transaction): Promise<Transaction>;
+}
+
+export namespace Subscription {
+    interface Subscription {
+        uuid: string;
+        external_id: string;
+        customer_uuid: string;
+        plan_uuid: string;
+        cancellation_dates: Strings;
+        data_source_uuid: string;
+    }
+    interface CancelSubscriptionParams {
+        cancelled_at?: string;
+        cancellation_dates?: Strings;
+    }
+    interface Subscriptions extends Cursor {
+        customer_uuid?: string;
+        subscriptions: Subscription[];
+    }
+
+    function all(config: Config, uuid: string, data: CursorParams): Promise<Subscriptions>;
+    function cancel(config: Config, uuid: string, data: CancelSubscriptionParams): Promise<Subscription>;
+}
+
+export namespace Tag {
+    interface Tags {
+        tags: Strings;
+    }
+    interface TagsWithEmail {
+        email: string;
+        tags: Strings;
+    }
+    function add(config: Config, uuid: string, data: TagsWithEmail): Promise<Entries<Customer.Customer>>;
+    function add(config: Config, uuid: string, data: Tags): Promise<Tags>;
+    function remove(config: Config, uuid: string, data: Tags): Promise<Tags>;
+}
+
+export namespace CustomAttribute {
+    import NewCustomAttributes = Customer.NewCustomAttributes;
+
+    interface CustomAttributes {
+        custom: Map;
+    }
+    function add(config: Config, uuid: string, data: {
+        email: string;
+        custom: NewCustomAttributes[];
+    }): Promise<Entries<Customer.Customer>>;
+    function add(config: Config, uuid: string, data: {
+        custom: NewCustomAttributes[];
+    }): Promise<CustomAttributes>;
+    function update(config: Config, uuid: string, data: CustomAttributes): Promise<CustomAttributes>;
+    function remove(config: Config, uuid: string, data: {
+        custom: Strings;
+    }): Promise<CustomAttributes>;
+}
+
+export namespace Metrics {
+    interface Params extends ParamsNoInterval {
+        interval?: string;
+    }
+    interface ParamsNoInterval {
+        ['start-date']: string;
+        ['end-date']: string;
+        geo?: string;
+        plans?: string;
+    }
+    interface All {
+        entries: {
+            date: string;
+            ['customer-churn-rate']: number;
+            ['mrr-churn-rate']: number;
+            ltv: number;
+            customers: number;
+            asp: number;
+            arpa: number;
+            arr: number;
+            mrr: number;
+        };
+    }
+
+    interface MRR {
+        date: string;
+        mrr: number;
+        ['mrr-new-business']: number;
+        ['mrr-expansion']: number;
+        ['mrr-contraction']: number;
+        ['mrr-churn']: number;
+        ['mrr-reactivation']: number;
+    }
+    interface ARR {
+        date: string;
+        arr: number;
+    }
+    interface ARPA {
+        date: string;
+        arpa: number;
+    }
+    interface ASP {
+        date: string;
+        asp: number;
+    }
+    interface CustomerCount {
+        date: string;
+        customers: number;
+    }
+    interface CustomerChurnRate {
+        date: string;
+        ['customer-churn-rate']: number;
+    }
+    interface MRRChurnRate {
+        date: string;
+        ['mrr-churn-rate']: number;
+    }
+    interface LTV {
+        date: string;
+        ltv: number;
+    }
+
+    function all(config: Config, params: Params): Promise<All>;
+    function mrr(config: Config, params: Params): Promise<EntriesSummary<MRR>>;
+    function arr(config: Config, params: Params): Promise<EntriesSummary<ARR>>;
+    function asp(config: Config, params: Params): Promise<EntriesSummary<ASP>>;
+    function arpa(config: Config, params: Params): Promise<EntriesSummary<ARPA>>;
+    function customerCount(config: Config, params: Params): Promise<EntriesSummary<CustomerCount>>;
+    function customerChurnRate(config: Config, params: ParamsNoInterval): Promise<EntriesSummary<CustomerChurnRate>>;
+    function mrrChurnRate(config: Config, params: ParamsNoInterval): Promise<EntriesSummary<MRRChurnRate>>;
+    function ltv(config: Config, params: ParamsNoInterval): Promise<EntriesSummary<LTV>>;
+
+    namespace Customer {
+        interface MetricsSubscription {
+            id: number;
+            external_id: string;
+            plan: string;
+            quantity: number;
+            mrr: number;
+            arr: number;
+            status: string;
+            ['billing-cycle']: string;
+            ['billing-cycle-count']: number;
+            ['start-date']: string;
+            ['end-date']: string;
+            currency: string;
+            ['currency-sign']: string;
+        }
+        interface MetricsActivity {
+            id: number;
+            date: string;
+            ['activity-arr']: number;
+            ['activity-mrr']: number;
+            ['activity-mrr-movement']: number;
+            currency: string;
+            ['currency-sign']: string;
+            description: string;
+            type: string;
+        }
+
+        function subscriptions(config: Config, uuid: string, params?: CursorParams): Promise<Entries<MetricsSubscription>>;
+        function activities(config: Config, uuid: string, params?: CursorParams): Promise<Entries<MetricsActivity>>;
+    }
+}
+
+export class ChartMogulError extends Error {
+    response: any;
+    httpStatus: number;
+}
+export class ConfigurationError extends ChartMogulError {}
+export class ForbiddenError extends ChartMogulError {}
+export class NotFoundError extends ChartMogulError {}
+export class ResourceInvalidError extends ChartMogulError {}
+export class SchemaInvalidError extends ChartMogulError {}
diff --git a/types/chartmogul-node/tsconfig.json b/types/chartmogul-node/tsconfig.json
new file mode 100644
index 0000000000..3b24d48da8
--- /dev/null
+++ b/types/chartmogul-node/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",
+        "chartmogul-node-tests.ts"
+    ]
+}
diff --git a/types/chartmogul-node/tslint.json b/types/chartmogul-node/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/chartmogul-node/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cheerio/cheerio-tests.ts b/types/cheerio/cheerio-tests.ts
index d686951213..719c0c70da 100644
--- a/types/cheerio/cheerio-tests.ts
+++ b/types/cheerio/cheerio-tests.ts
@@ -265,8 +265,7 @@ $el.text();
 $el.text('text');
 
 // .wrap( content )
-// See https://github.com/cheeriojs/cheerio/issues/731
-// $el.wrap($('<div class="red-fruit"></div>')).html();
+$el.wrap($('<div class="red-fruit"></div>')).html();
 
 // .css
 $el.css('width');
diff --git a/types/cheerio/index.d.ts b/types/cheerio/index.d.ts
index 42bcae6eff..cb8031705e 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>, LiJinyao <https://github.com/LiJinyao>
+// 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>, Chennakrishna <https://github.com/chennakrishna8>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Cheerio {
@@ -178,10 +178,9 @@ interface Cheerio {
     text(): string;
     text(text: string): Cheerio;
 
-    // See https://github.com/cheeriojs/cheerio/issues/731
-    /*wrap(content: string): Cheerio;
+    wrap(content: string): Cheerio;
     wrap(content: Document): Cheerio;
-    wrap(content: Cheerio): Cheerio;*/
+    wrap(content: Cheerio): Cheerio;
 
     css(propertyName: string): string;
     css(propertyNames: string[]): string[];
@@ -215,6 +214,7 @@ interface CheerioOptionsInterface {
     recognizeCDATA?: boolean;
     recognizeSelfClosing?: boolean;
     normalizeWhitespace?: boolean;
+    ignoreWhitespace?: boolean;
 }
 
 interface CheerioSelector {
diff --git a/types/chrome-apps/index.d.ts b/types/chrome-apps/index.d.ts
index 957c409a4f..33b760ce82 100644
--- a/types/chrome-apps/index.d.ts
+++ b/types/chrome-apps/index.d.ts
@@ -1,31 +1,99 @@
 // Type definitions for Chrome packaged application development
 // Project: http://developer.chrome.com/apps/
-// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, 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>
+// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingconst Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, 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.4
+// TypeScript Version: 2.8
 
-/// <reference types="filesystem"/>
+/// <reference types='filesystem'/>
 
-///////////////
-// WebView ref: https://chromium.googlesource.com/chromium/src/+/68.0.3432.1/chrome/common/extensions/api/webview_tag.json
-///////////////
+//
+// Extra sources in addition to the Chromium source code and official documentation:
+//
+// Manifest:
+// - https://github.com/jasonkarns/chrome-extension-manifest-schema/blob/master/manifest.schema.cson
+// - https://github.com/chromium/chromium/blob/master/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc#L155
+// - https://chromium.googlesource.com/chromium/src.git/+/master/extensions/common/api/_manifest_features.json
+// - https://chromium.googlesource.com/chromium/src/+/master/extensions/common/api/
+// - https://chromium.googlesource.com/chromium/src/+/master/extensions/common/manifest_constants.cc
+//
+// Permissions:
+// - https://chromium.googlesource.com/chromium/src/+/master/extensions/common/api/_permission_features.json
+//
 
-////////////////////
-// Accessibility Features
-////////////////////
-/**
- * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features. This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features. In order to get feature states the extension must request accessibilityFeatures.read permission. For modifying feature state, the extension needs accessibilityFeatures.modify permission. Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
- * @since Availability: Since Chrome 37.
- * Permissions: "accessibilityFeatures.read" (For read access); "accessibilityFeatures.modify" (For modifications; Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.)
- * Important: This API works only on Chrome OS.
- */
 declare namespace chrome {
+    // #region internal
+    //////////////
+    // INTERNAL //
+    //////////////
+
+    /** @deprecated Could be used, if e.g. deprecated recently */
+    type deprecatedButUsable = any;
+
+    /** @deprecated Should never be used, used to guide migrations. */
+    type deprecated = never;
+
+    /**
+     * Convert constant and variables that function as enums to string literals.
+     * Makes it possible to use both the enum and string.
+     * String enums are a combination of 'enum type' and string literal type.
+     */
+    type IDict<T, K, F = K extends keyof T ? T[K] : never> = F;
+    type ToStringLiteral<
+        C extends Object,
+        K = keyof C,
+        V = K extends keyof C ? Exclude<K, C[K]> : never> = IDict<C, V>;
+
+    /**
+     * Integer
+     * -
+     * Chrome uses JS number, but internally requires an integer or double.
+     * This is a helper type to prevent mixup.
+     */
+    type integer = number; // | 'integer';
+
+    ///
+    /// BigInt is supported in Chrome now, but not in the api.
+    /// TypeScript doesn't support it either, so till then, use helper types.
+    ///
+
+    /**
+     * Double
+     * -
+     * Chrome uses JS number, but internally requires an integer or double.
+     * This is a helper type to prevent mixup.
+     */
+    type double = number; // | 'double';
+
+    // #endregion internal
+
+    // #region chrome.accessibilityFeatures
+    ////////////////////////////
+    // Accessibility Features //
+    ////////////////////////////
+    /**
+     * @requires Important: This API works only on Chrome OS.
+     * @requires Permissions:
+     *      'accessibilityFeatures.read' (For read access)
+     *      'accessibilityFeatures.modify' (For modifications)
+     *      Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
+     * @since Chrome 37.
+     * @description
+     * Use the chrome.accessibilityFeatures API to manage Chrome's accessibility features.
+     * This API relies on the ChromeSetting prototype of the type API for getting and setting individual accessibility features.
+     * In order to get feature states the extension must request accessibilityFeatures.read permission.
+     * For modifying feature state, the extension needs accessibilityFeatures.modify permission.
+     * Note that accessibilityFeatures.modify does not imply accessibilityFeatures.read permission.
+     */
     namespace accessibilityFeatures {
         interface AccessibilityFeaturesGetArg {
-            /** Optional. Whether to return the value that applies to the incognito session (default false).  */
+            /** Whether to return the value that applies to the incognito session (default false).  */
             incognito?: boolean;
         }
 
+        type LevelOfControl =
+            'not_controllable' | 'controlled_by_other_extensions' |
+            'controllable_by_this_extension' | 'controlled_by_this_extension';
+
         interface AccessibilityFeaturesCallbackArg {
             /** The value of the setting. */
             value: any;
@@ -33,14 +101,16 @@ declare namespace chrome {
              * 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
+             * • controllable_by_this_extension: can be controlled by this app
+             * • controlled_by_this_extension: controlled by this app
              */
-            levelOfControl: string;
-            /** Optional. 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.  */
+            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;
         }
 
+        type Scope = 'regular' | 'regular_only' | 'incognito_persistent' | 'incognito_session_only';
+
         interface AccessibilityFeaturesSetArg {
             /**
              * The value of the setting.
@@ -48,26 +118,24 @@ declare namespace chrome {
              */
             value: any;
             /**
-             * Optional.
-              * The scope of the ChromeSetting. One of
+             * The scope of the ChromeSetting. 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).
              */
-            scope?: string;
+            scope?: Scope;
         }
 
         interface AccessibilityFeaturesClearArg {
             /**
-             * Optional.
-              * The scope of the ChromeSetting. One of
+             * The scope of the ChromeSetting. 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).
              */
-            scope?: string;
+            scope?: Scope;
         }
 
         interface AccessibilityFeaturesSetting {
@@ -96,39 +164,93 @@ declare namespace chrome {
             clear(details: AccessibilityFeaturesClearArg, callback?: () => void): void;
         }
 
-        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;
+        /**
+         * Spoken feedback (text-to-speech). The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const spokenFeedback: AccessibilityFeaturesSetting;
+        /**
+         * Enlarged cursor. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const largeCursor: AccessibilityFeaturesSetting;
+        /**
+         * Sticky modifier keys (like shift or alt). The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const stickyKeys: AccessibilityFeaturesSetting;
+        /**
+         * High contrast rendering mode. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const highContrast: AccessibilityFeaturesSetting;
+        /**
+         * Full screen magnification. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const screenMagnifier: AccessibilityFeaturesSetting;
+        /**
+         * Auto mouse click after mouse stops moving. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const autoclick: AccessibilityFeaturesSetting;
+        /**
+         * Virtual on-screen keyboard. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         */
+        const virtualKeyboard: AccessibilityFeaturesSetting;
+        /**
+         * Caret highlighting. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         * @since Chrome 51.
+         */
+        const caretHighlight: AccessibilityFeaturesSetting;
+        /**
+         * Cursor highlighting. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         * @since Chrome 51.
+         */
+        const cursorHighlight: AccessibilityFeaturesSetting;
+        /**
+         * Focus highlighting. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         * @since Chrome 51.
+         */
+        const focusHighlight: AccessibilityFeaturesSetting;
+        /**
+         * Select-to-speak. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         * @since Chrome 51.
+         */
+        const selectToSpeak: AccessibilityFeaturesSetting;
+        /**
+         * Switch access. The value indicates whether the feature is enabled or not. get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         * @since Chrome 51.
+         */
+        const switchAccess: AccessibilityFeaturesSetting;
+        /**
+         * get() requires accessibilityFeatures.read permission. set() and clear() require accessibilityFeatures.modify permission.
+         * @since Chrome 42.
+         */
+        const animationPolicy: AccessibilityFeaturesSetting;
     }
+    // #endregion
 
-    ////////////////////
-    // Alarms
-    ////////////////////
+    // #region chrome.alarms
+    ////////////
+    // Alarms //
+    ////////////
     /**
-     * Use the chrome.alarms API to schedule code to run periodically or at a specified time in the future.
-     * Availability: Since Chrome 22.
-     * Permissions:  "alarms"
+     * @requires Permissions: 'alarms'
+     * @since Chrome 22.
+     * @description
+     * Use the chrome.alarms API to schedule code to run
+     * periodically or at a specified time in the future.
      */
     namespace alarms {
         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.  */
-            periodInMinutes?: number;
-            /** Optional. Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
-            when?: number;
+            /** Length of time in minutes after which the onAlarm event should fire.  */
+            delayInMinutes?: integer;
+            /** 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.  */
+            periodInMinutes?: integer;
+            /** Time at which the alarm should fire, in milliseconds past the epoch (e.g. Date.now() + n).  */
+            when?: integer;
         }
 
         interface Alarm {
-            /** Optional. If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
-            periodInMinutes?: number;
+            /** If not null, the alarm is a repeating alarm and will fire again in periodInMinutes minutes.  */
+            periodInMinutes?: integer;
             /** 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. */
-            scheduledTime: number;
+            scheduledTime: integer;
             /** Name of this alarm. */
             name: string;
         }
@@ -137,254 +259,642 @@ declare namespace chrome {
 
         /**
          * 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.
-         * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-         * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+         * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more.
+         * That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning.
+         * `when` can be set to less than 1 minute after 'now' without warning but won't actually cause the alarm to fire for at least 1 minute.
+         * To help you debug your app, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
          * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
          */
-        export function create(alarmInfo: AlarmCreateInfo): void;
+        function create(alarmInfo: AlarmCreateInfo): 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.
-         * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more. That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning. when can be set to less than 1 minute after "now" without warning but won't actually cause the alarm to fire for at least 1 minute.
-         * To help you debug your app or extension, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
+         * 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.
+         * In order to reduce the load on the user's machine, Chrome limits alarms to at most once every 1 minute but may delay them an arbitrary amount more.
+         * That is, setting delayInMinutes or periodInMinutes to less than 1 will not be honored and will cause a warning.
+         * `when` can be set to less than 1 minute after 'now' without warning but won't actually cause the alarm to fire for at least 1 minute.
+         * To help you debug your app, when you've loaded it unpacked, there's no limit to how often the alarm can fire.
          * @param name Optional name to identify this alarm. Defaults to the empty string.
          * @param alarmInfo Describes when the alarm should fire. The initial time must be specified by either when or delayInMinutes (but not both). If periodInMinutes is set, the alarm will repeat every periodInMinutes minutes after the initial event. If neither when or delayInMinutes is set for a repeating alarm, periodInMinutes is used as the default for delayInMinutes.
          */
-        export function create(name: string, alarmInfo: AlarmCreateInfo): void;
+        function create(name: string, alarmInfo: AlarmCreateInfo): void;
         /**
          * Gets an array of all the alarms.
          * @param callback The callback parameter should be a function that looks like this:
-         * function(array of Alarm alarms) {...};
+         * @example function(array of Alarm alarms) {...};
          */
-        export function getAll(callback: (alarms: Alarm[]) => void): void;
+        function getAll(callback: (alarms: Alarm[]) => void): void;
         /**
          * Clears all alarms.
-         * @param callback If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean wasCleared) {...};
+         * @param [callback] If you specify the callback parameter, it should be a function that looks like this:
+         * @example function(boolean wasCleared) {...};
          */
-        export function clearAll(callback?: (wasCleared: boolean) => void): void;
+        function clearAll(callback?: (wasCleared: boolean) => void): void;
         /**
          * Clears the alarm with the given name.
          * @param name The name of the alarm to clear. Defaults to the empty string.
-         * @param callback If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean wasCleared) {...};
+         * @param [callback] If you specify the callback parameter, it should be a function that looks like this:
+         * @example function(boolean wasCleared) {...};
          */
-        export function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
+        function clear(name?: string, callback?: (wasCleared: boolean) => void): void;
         /**
          * Clears the alarm without a name.
-         * @param callback If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean wasCleared) {...};
+         * @param [callback] If you specify the callback parameter, it should be a function that looks like this:
+         * @example function(boolean wasCleared) {...};
          */
-        export function clear(callback: (wasCleared: boolean) => void): void;
+        function clear(callback: (wasCleared: boolean) => void): void;
         /**
          * Retrieves details about the specified alarm.
          * @param callback The callback parameter should be a function that looks like this:
-         * function( Alarm alarm) {...};
+         * @example function( Alarm alarm) {...};
          */
-        export function get(callback: (alarm: Alarm) => void): void;
+        function get(callback: (alarm: Alarm) => void): void;
         /**
          * Retrieves details about the specified alarm.
          * @param name The name of the alarm to get. Defaults to the empty string.
          * @param callback The callback parameter should be a function that looks like this:
-         * function( Alarm alarm) {...};
+         * @example function( Alarm alarm) {...};
          */
-        export function get(name: string, callback: (alarm: Alarm) => void): void;
+        function get(name: string, callback: (alarm: Alarm) => void): void;
 
         /** Fired when an alarm has elapsed. Useful for event pages. */
-        export var onAlarm: AlarmEvent;
+        const onAlarm: AlarmEvent;
     }
+    // #endregion
 
-
-    ////////////////////
-    // App
-    ////////////////////
-    namespace app {
-        interface AppDetails extends chrome.runtime.Manifest {
-            id: string;
+    // #region chrome.app.*
+    /////////////////
+    // App Runtime //
+    /////////////////
+    /**
+     * @since Chrome 24.
+     * @description
+     * Use the chrome.app.runtime API to manage the app lifecycle.
+     * The app runtime manages app installation, controls the event page,
+     * and can shut down the app at anytime.
+     */
+    namespace app.runtime {
+        /** @enum */
+        const PlayStoreStatus: {
+            ENABLED: 'enabled',
+            AVAILABLE: 'available',
+            UNKNOWN: 'unknown'
+        }
+        /** @enum */
+        const ActionType: {
+            NEW_NOTE: 'new_note'
+        }
+        /** @enum */
+        const LaunchSource: {
+            ABOUT_PAGE: 'about_page',
+            APP_LAUNCHER: 'app_launcher',
+            BACKGROUND: 'background',
+            CHROME_INTERNAL: 'chrome_internal',
+            COMMAND_LINE: 'command_line',
+            CONTEXT_MENU: 'context_menu',
+            EPHEMERAL_APP: 'ephemeral_app',
+            EXTENSIONS_PAGE: 'extensions_page',
+            FILE_HANDLER: 'file_handler',
+            INSTALLED_NOTIFICATION: 'installed_notification',
+            KEYBOARD: 'keyboard',
+            KIOSK: 'kiosk',
+            LOAD_AND_LAUNCH: 'load_and_launch',
+            MANAGEMENT_API: 'management_api',
+            NEW_TAB_PAGE: 'new_tab_page',
+            RELOAD: 'reload',
+            RESTART: 'restart',
+            SYSTEM_TRAY: 'system_tray',
+            TEST: 'test',
+            UNTRACKED: 'untracked',
+            URL_HANDLER: 'url_handler'
         }
 
-        export function getDetails(): AppDetails;
-    }
-
-    ////////////////////
-    // App Runtime
-    ////////////////////
-    namespace app.runtime {
-        type LaunchSource = 'untracked' | 'app_launcher' | 'new_tab_page' | 'reload' | 'restart' |
-            'load_and_launch' | 'command_line' | 'file_handler' | 'url_handler' | 'system_tray' |
-            'about_page' | 'keyboard' | 'extensions_page' | 'management_api' | 'ephemeral_app' |
-            'background' | 'kiosk' | 'chrome_internal' | 'test' | 'installed_notification' | 'context_menu';
-
         interface LaunchData {
+            /**
+             * The ID of the file or URL handler that the app is being invoked with.
+             * Handler IDs are the top-level keys in the file_handlers and/or url_handlers dictionaries in the manifest.
+             */
             id?: string;
+            /**
+             * The file entries for the onLaunched event triggered by a matching file handler in the file_handlers manifest key.
+             */
             items?: LaunchDataItem[];
+            /**
+             * The URL for the onLaunched event triggered by a matching URL handler in the url_handlers manifest key.
+             */
             url?: string;
+            /**
+             * The referrer URL for the onLaunched event triggered by a matching URL handler in the url_handlers manifest key.
+             */
             referrerUrl?: string;
+            /**
+             * Whether the app is being launched in a Chrome OS kiosk session.
+             */
             isKioskSession?: boolean;
+            /**
+             * Whether the app is being launched in a Chrome OS public session.
+             * @since Chrome 47.
+             */
             isPublicSession?: boolean;
-            source?: LaunchSource;
-            actionData?: {};
+            /**
+             * Where the app is launched from.
+             * @see enum LaunchSource
+             */
+            source?: ToStringLiteral<typeof LaunchSource>;
+            /**
+             * Contains data that specifies the ActionType this app was launched with. This is null if the app was not launched with a specific action intent.
+             *  ______________________________________________________________________________
+             * | type of 'new_note' | actionType | new_note                                   |
+             * |                    |            | The user wants to quickly take a new note. |
+             * |____________________|____________|____________________________________________|
+             * @since Chrome 54.
+             */
+            actionData?: ToStringLiteral<typeof ActionType>;
         }
 
         interface LaunchDataItem {
+            /**
+             * Entry for the item
+             */
             entry: FileEntry;
-            type: string;
+            /**
+             * The MIME type of the file.
+             */
+            type?: string;
         }
 
-        interface LaunchedEvent extends chrome.events.Event<(launchData: LaunchData) => void> { }
-
-        interface RestartedEvent extends chrome.events.Event<() => void> { }
-
-        export var onLaunched: LaunchedEvent;
-        export var onRestarted: RestartedEvent;
+        /**
+         * Fired when an embedding app requests to embed this app.
+         * @since Chrome 43.
+         * @see[Documentation]{@link https://developer.chrome.com/apps/tags/appview}
+         */
+        const onEmbedRequested: chrome.events.Event<(request: AppView.EmbedRequest) => void>;
+        /**
+         * Fired when an app is launched from the launcher.
+         */
+        const onLaunched: chrome.events.Event<(launchData: LaunchData) => void>;
+        /**
+         * Fired at Chrome startup to apps that were running when Chrome last shut down,
+         * or when apps have been requested to restart from their previous state for other reasons
+         * (e.g. when the user revokes access to an app's retained files the runtime will restart the app).
+         * In these situations if apps do not have an onRestarted handler they will be sent an onLaunched event instead.
+         */
+        const onRestarted: chrome.events.Event<() => void>;
     }
 
-    ////////////////////
-    // App Window
-    ////////////////////
-    namespace app.window {
+    ////////////////
+    // App Window //
+    ////////////////
+    /**
+     * @since Chrome 24.
+     * @description
+     * Use the chrome.app.window API to create windows.
+     * Windows have an optional frame with title bar and size controls.
+     * They are not associated with any Chrome browser windows.
+     * See the Window State Sample for a demonstration of these options.
+     */
+    namespace app {
         interface ContentBounds {
-            left?: number;
-            top?: number;
-            width?: number;
-            height?: number;
+            left?: integer;
+            top?: integer;
+            width?: integer;
+            height?: integer;
+        }
+
+        /**
+         * @enum
+         * @internal
+         * @private
+         */
+        const _State: {
+            NORMAL: 'normal',
+            FULLSCREEN: 'fullscreen',
+            MAXIMIZED: 'maximized',
+            MINIMIZED: 'minimized'
         }
 
         interface BoundsSpecification {
-            left?: number;
-            top?: number;
-            width?: number;
-            height?: number;
-            minWidth?: number;
-            minHeight?: number;
-            maxWidth?: number;
-            maxHeight?: number;
+            /** The X coordinate of the content or window. */
+            left?: integer;
+            /** The Y coordinate of the content or window. */
+            top?: integer;
+            /** The width of the content or window. */
+            width?: integer;
+            /** The height of the content or window. */
+            height?: integer;
+            /** The minimum width of the content or window. */
+            minWidth?: integer;
+            /** The minimum height of the content or window. */
+            minHeight?: integer;
+            /** The maximum width of the content or window. */
+            maxWidth?: integer;
+            /** The maximum height of the content or window. */
+            maxHeight?: integer;
         }
 
         interface Bounds {
-            left: number;
-            top: number;
-            width: number;
-            height: number;
-            minWidth?: number;
-            minHeight?: number;
-            maxWidth?: number;
-            maxHeight?: number;
-            setPosition(left: number, top: number): void;
-            setSize(width: number, height: number): void;
-            setMinimumSize(minWidth: number, minHeight: number): void;
-            setMaximumSize(maxWidth: number, maxHeight: number): void;
+            /** This property can be used to read or write the current X coordinate of the content or window. */
+            left: integer;
+            /** This property can be used to read or write the current Y coordinate of the content or window. */
+            top: integer;
+            /** This property can be used to read or write the current width of the content or window. */
+            width: integer;
+            /** This property can be used to read or write the current height of the content or window. */
+            height: integer;
+            /** This property can be used to read or write the current minimum width of the content or window. A value of null indicates 'unspecified'. */
+            minWidth?: integer | null;
+            /** This property can be used to read or write the current minimum height of the content or window. A value of null indicates 'unspecified'. */
+            minHeight?: integer | null;
+            /** This property can be used to read or write the current maximum width of the content or window. A value of null indicates 'unspecified'. */
+            maxWidth?: integer | null;
+            /** This property can be used to read or write the current maximum height of the content or window. A value of null indicates 'unspecified'. */
+            maxHeight?: integer | null;
+            /** Set the left and top position of the content or window. */
+            setPosition(left: integer, top: integer): void;
+            /** Set the width and height of the content or window. */
+            setSize(width: integer, height: integer): void;
+            /** Set the minimum size constraints of the content or window.
+             * The minimum width or height can be set to null to remove the constraint.
+             * A value of undefined will leave a constraint unchanged.
+             **/
+            setMinimumSize(minWidth: integer | null | undefined, minHeight: integer | null | undefined): void;
+            /**
+             * Set the maximum size constraints of the content or window.
+             * The maximum width or height can be set to null to remove the constraint.
+             * A value of undefined will leave a constraint unchanged.
+             */
+            setMaximumSize(maxWidth: integer | null | undefined, maxHeight: integer | null | undefined): void;
         }
         interface FrameOptions {
-            type?: string;
+            /**
+             * Frame type: none or chrome (defaults to chrome).
+             *
+             * For none, the -webkit-app-region CSS property can be used to apply draggability to the app's window.
+             * -webkit-app-region: drag can be used to mark regions draggable. no-drag can be used to disable this style on nested elements.
+             */
+            type: 'none';
+            /**
+             * @requires(dev) Chrome dev only
+             * @requires Permissions: 'app.window.alpha'
+             * @description
+             * Enable alpha on frame 'none'
+             */
+            alphaEnabled?: boolean;
+        }
+        interface FrameOptionsChrome {
+            /**
+             * Frame type: none or chrome (defaults to chrome).
+             *
+             * For none, the -webkit-app-region CSS property can be used to apply draggability to the app's window.
+             * -webkit-app-region: drag can be used to mark regions draggable. no-drag can be used to disable this style on nested elements.
+             */
+            type: 'chrome';
+            /**
+             * Allows the frame color to be set. Frame coloring is only available if the frame type is chrome.
+             * @since Frame coloring is new in Chrome 36.
+             */
             color?: string;
+            /**
+             * Allows the frame color of the window when active to be set. Frame coloring is only available if the frame type is chrome.
+             * Frame coloring is only available if the frame type is chrome.
+             * @since Frame coloring is new in Chrome 36.
+             */
             activeColor?: string;
+            /**
+             * Allows the frame color of the window when inactive to be set differently to the active color. Frame coloring is only available if the frame type is chrome.
+             * inactiveColor must be used in conjunction with color.
+             * @since Frame coloring is new in Chrome 36.
+             */
             inactiveColor?: string;
         }
 
-        interface CreateWindowOptions {
-            id?: string;
-            innerBounds?: BoundsSpecification;
-            outerBounds?: BoundsSpecification;
-            minWidth?: number;
-            minHeight?: number;
-            maxWidth?: number;
-            maxHeight?: number;
+        interface CreateWindowOptions extends ContentBounds {
             /**
+             * Id to identify the window.
+             *
+             * This will be used to remember the size and position of the window and restore that geometry when a window with the same id is later opened.
+             * If a window with a given id is created while another window with the same id already exists,
+             * the currently opened window will be focused instead of creating a new window.
+             */
+            id?: string;
+            /**
+             * Used to specify the initial position, initial size and constraints of the window's content (excluding window decorations).
+             * If an id is also specified and a window with a matching id has been shown before, the remembered bounds will be used instead.
+             * Note that the padding between the inner and outer bounds is determined by the OS.
+             * Therefore setting the same bounds property for both the innerBounds and outerBounds will result in an error.
+             * @since This property is new in Chrome 36.
+             */
+            innerBounds?: BoundsSpecification;
+            /**
+             * Used to specify the initial position, initial size and constraints of the window (including window decorations such as the title bar and frame).
+             * If an id is also specified and a window with a matching id has been shown before, the remembered bounds will be used instead.
+             * Note that the padding between the inner and outer bounds is determined by the OS.
+             * Therefore setting the same bounds property for both the innerBounds and outerBounds will result in an error.
+             * @since This property is new in Chrome 36.
+             */
+            outerBounds?: BoundsSpecification;
+            /**
+             * Minimum width of the window.
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+             */
+            minWidth?: integer;
+            /**
+             * Minimum height of the window.
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+             */
+            minHeight?: integer;
+            /**
+             * Maximum width of the window.
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+             */
+            maxWidth?: integer;
+            /**
+             * Maximum height of the window.
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+             */
+            maxHeight?: integer;
+            /** Type of window to create */
+            type?: 'shell';
+            /**
+             * If true, the window will have its own shelf icon.
+             * Otherwise the window will be grouped in the shelf with other windows that are associated with the app.
+             * If showInShelf is set to true you need to specify an id for the window.
+             * @default false
+             * @since Chrome 54.
+             */
+            showInShelf?: boolean;
+            /**
+             * URL of the window icon.
+             * A window can have its own icon when showInShelf is set to true.
+             * The URL should be a global or an app's local URL.
+             * @since Chrome 54.
+             */
+            icon?: string;
+            /**
+             * Frame type: none or chrome (defaults to chrome).
+             * For none, the -webkit-app-region CSS property can be used to apply draggability to the app's window.
+             * -webkit-app-region: drag can be used to mark regions draggable. no-drag can be used to disable this style on nested elements.
+             * @since Use of FrameOptions is new in M36.
+             */
+            frame?: 'none' | 'chrome' | FrameOptions | FrameOptionsChrome;
+            /**
+             * @requires(dev) Chrome dev only
+             * @requires Permissions: 'app.window.alpha'
              * @description
-             * @type {(string | FrameOptions)} string ("none", "chrome") or FrameOptions
-             * @memberof CreateWindowOptions
+             * Enable alpha on frame 'none'
              */
-            frame?: string | FrameOptions;
-            bounds?: ContentBounds;
             alphaEnabled?: boolean;
             /**
+             * @requires frame = 'none'
+             * @requires Permissions: 'app.window.ime'
              * @description
-             * @type {string} "normal", "fullscreen", "maximized", "minimized"
-             * @memberof CreateWindowOptions
+             * Windows API - ime (No fullscreen window in kiosk mode)
+             */
+            ime?: boolean;
+            /**
+             * Size and position of the content in the window (excluding the titlebar).
+             * If an id is also specified and a window with a matching id has been shown before,
+             * the remembered bounds of the window will be used instead.
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+             */
+            bounds?: ContentBounds;
+            /**
+             * The initial state of the window, allowing it to be created already fullscreen, maximized, or minimized. Defaults to 'normal'.
+             */
+            state?: ToStringLiteral<typeof _State>;
+            /**
+             * If true, the window will be created in a hidden state. Call show() on the window to show it once it has been created. Defaults to false.
              */
-            state?: string;
             hidden?: boolean;
+            /**
+             * If true, the window will be resizable by the user. Defaults to true.
+             */
             resizable?: boolean;
+            /**
+             * @deprecated Deprecated since Chrome 34. Multiple windows with the same id is no longer supported.
+             * By default if you specify an id for the window,
+             * the window will only be created if another window with the same id doesn't already exist.
+             * If a window with the same id already exists that window is activated instead.
+             * If you do want to create multiple windows with the same id, you can set this property to false.
+             */
             singleton?: boolean;
+            /**
+             * @requires Permissions: 'alwaysOnTopWindows' or 'app.window.alwaysOnTop'
+             * @description
+             * If true, the window will stay above most other windows.
+             * If there are multiple windows of this kind, the currently focused window will be in the foreground.
+             * Call setAlwaysOnTop() on the window to change this property after creation.
+             * @default false
+             */
             alwaysOnTop?: boolean;
+            /** If true, the window will be focused when created. Defaults to true. */
             focused?: boolean;
+            /**
+             * If true, and supported by the platform, the window will be visible on all workspaces.
+             * @since Chrome 39.
+             */
             visibleOnAllWorkspaces?: boolean;
         }
-
         interface AppWindow {
+            /** Focus the window. */
             focus: () => void;
+            /**
+             * Fullscreens the window.
+             * The user will be able to restore the window by pressing ESC.
+             * An application can prevent the fullscreen state to be left when ESC is pressed by requesting the
+             * app.window.fullscreen.overrideEsc permission and canceling the event by calling .preventDefault(),
+             * in the keydown and keyup handlers, like this:
+             * @example window.onkeydown = window.onkeyup = function(e) { if (e.keyCode == 27 <<--``ESC``) { e.preventDefault(); }
+             * Note window.fullscreen() will cause the entire window to become fullscreen and does not require a user gesture.
+             * The HTML5 fullscreen API can also be used to enter fullscreen mode(see Web APIs for more details).
+             **/
             fullscreen: () => void;
+            /** Is the window fullscreen? This will be true if the window has been created fullscreen or was made fullscreen via the AppWindow or HTML5 fullscreen APIs. */
             isFullscreen: () => boolean;
+            /** Minimize the window. */
             minimize: () => void;
+            /** Is the window minimized? */
             isMinimized: () => boolean;
+            /** Maximize the window. */
             maximize: () => void;
+            /** Is the window maximized? */
             isMaximized: () => boolean;
+            /** Restore the window, exiting a maximized, minimized, or fullscreen state. */
             restore: () => void;
-            moveTo: (left: number, top: number) => void;
-            resizeTo: (width: number, height: number) => void;
+            /**
+             * Move the window to the position (|left|, |top|).
+             * @deprecated Deprecated since Chrome 43. Use outerBounds.
+             */
+            moveTo: (left: integer, top: integer) => void;
+            /**
+             * Resize the window to |width|x|height| pixels in size.
+             * @deprecated Deprecated since Chrome 43. Use outerBounds.
+             */
+            resizeTo: (width: integer, height: integer) => void;
+            /** Draw attention to the window. */
             drawAttention: () => void;
+            /** Clear attention to the window. */
             clearAttention: () => void;
+            /** Close the window. */
             close: () => void;
-            show: () => void;
+            /** Show the window. Does nothing if the window is already visible. Focus the window if |focused| is set to true or omitted. */
+            show: (focused?: boolean) => void;
+            /** Hide the window. Does nothing if the window is already hidden. */
             hide: () => void;
+            /**
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+              * Get the window's inner bounds as a ContentBounds object.
+             */
             getBounds: () => ContentBounds;
+            /**
+             * Set the window's inner bounds.
+             * @deprecated Deprecated since Chrome 36. Use innerBounds or outerBounds.
+             */
             setBounds: (bounds: ContentBounds) => void;
+            /** Is the window always on top? */
             isAlwaysOnTop: () => boolean;
+            /** Set whether the window should stay above most other windows. Requires the alwaysOnTopWindows permission. */
             setAlwaysOnTop: (alwaysOnTop: boolean) => void;
+            /** Set whether the window is visible on all workspaces. (Only for platforms that support this). */
             setVisibleOnAllWorkspaces: (alwaysVisible: boolean) => void;
+            /**
+             * @requires Permission: 'app.window.shape'
+             * Set window shape
+             */
+            setShape: (rects: ContentBounds[]) => void;
+            /** The JavaScript 'window' object for the created child. */
             contentWindow: Window;
+            /** The id the window was created with. */
             id: string;
+            /**
+             * The position, size and constraints of the window's content, which does not include window decorations.
+             * @since This property is new in Chrome 36.
+             * */
             innerBounds: Bounds;
+            /**
+             * The position, size and constraints of the window, which includes window decorations, such as the title bar and frame.
+             * @since This property is new in Chrome 36.
+             */
             outerBounds: Bounds;
+
+
+            /** Fired when the window is resized. */
             onBoundsChanged: WindowEvent;
+            /**
+             * Fired when the window is closed.
+             * Note, this should be listened to from a window other than the window being closed, for example from the background page.
+             * This is because the window being closed will be in the process of being torn down when the event is fired,
+             * which means not all APIs in the window's script context will be functional.
+             */
             onClosed: WindowEvent;
+            /** Fired when the window is fullscreened (either via the AppWindow or HTML5 APIs). */
             onFullscreened: WindowEvent;
+            /** Fired when the window is maximized. */
             onMaximized: WindowEvent;
+            /** Fired when the window is minimized. */
             onMinimized: WindowEvent;
+            /** Fired when the window is restored from being minimized or maximized. */
             onRestored: WindowEvent;
         }
-
-        export function create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
-        export function current(): AppWindow;
-        export function get(id: string): AppWindow;
-        export function getAll(): AppWindow[];
-        export function canSetVisibleOnAllWorkspaces(): boolean;
-
         interface WindowEvent extends chrome.events.Event<() => void> { }
 
-        export var onBoundsChanged: WindowEvent;
-        export var onClosed: WindowEvent;
-        export var onFullscreened: WindowEvent;
-        export var onMaximized: WindowEvent;
-        export var onMinimized: WindowEvent;
-        export var onRestored: WindowEvent;
+        interface WindowParams extends AppWindow {
+            id: string;
+            frameId?: integer;
+            existingWindow?: boolean;
+            [key: string]: any;
+        }
+
+        interface ChromeAppWindow extends AppWindow {
+            /**
+             * @enum
+             * Window state enum
+             */
+            readonly State: typeof _State;
+
+            readonly WindowType: {
+                SHELL: 'shell',
+                PANEL: 'panel'
+            }
+
+            /**
+             * The size and position of a window can be specified in a number of different ways. The most simple option is not specifying anything at all, in which case a default size and platform dependent position will be used.
+             * To set the position, size and constraints of the window, use the innerBounds or outerBounds properties. Inner bounds do not include window decorations. Outer bounds include the window's title bar and frame. Note that the padding between the inner and outer bounds is determined by the OS. Therefore setting the same property for both inner and outer bounds is considered an error (for example, setting both innerBounds.left and outerBounds.left).
+             * To automatically remember the positions of windows you can give them ids. If a window has an id, This id is used to remember the size and position of the window whenever it is moved or resized. This size and position is then used instead of the specified bounds on subsequent opening of a window with the same id. If you need to open a window with an id at a location other than the remembered default, you can create it hidden, move it to the desired location, then show it.
+             *
+             * @param url
+             * @param [options]
+             * @param [callback] Called in the creating window (parent) before the load event is called in the created window (child). The parent can set fields or functions on the child usable from onload. E.g. background.js: function(createdWindow) { createdWindow.contentWindow.foo = function () { }; }; window.js: window.onload = function () { foo(); } If you specify the callback parameter, it should be a function that looks like this: function(AppWindow createdWindow) {...};
+             */
+            create(url: string, options?: CreateWindowOptions, callback?: (created_window: AppWindow) => void): void;
+            /**
+             * Returns an AppWindow object for the current script context (ie JavaScript 'window' object). This can also be called on a handle to a script context for another page, for example: otherWindow.chrome.app.window.current().
+             */
+            current(): AppWindow;
+            /**
+             * Gets an AppWindow with the given id. If no window with the given id exists null is returned. This method is new in Chrome 33.
+             */
+            get(id: string): AppWindow;
+            /**
+             * Gets an array of all currently created app windows. This method is new in Chrome 33.
+             */
+            getAll(): AppWindow[];
+            /**
+             * Whether the current platform supports windows being visible on all workspaces.
+             */
+            canSetVisibleOnAllWorkspaces(): boolean;
+        }
+        const window: ChromeAppWindow;
     }
+    // #endregion chrome.app.*
 
-
-    ////////////////////
-    // Audio
-    ////////////////////
+    // #region chrome.audio
+    ///////////
+    // Audio //
+    ///////////
     /**
-     * The chrome.audio API is provided to allow users to get information about and control the audio devices attached to the system. This API is currently only implemented for ChromeOS.
-     * @since Chrome 59
+     * @since Chrome 59.
+     * @requires Permissions: 'audio'
+     * @description
+     * The chrome.audio API is provided to allow users to get information
+     * about and control the audio devices attached to the system.
+     * This API is currently only implemented for ChromeOS.
      */
     namespace audio {
-        export type StreamType = 'INPUT' | 'OUTPUT';
+        type StreamType =
+            'INPUT' |
+            'OUTPUT';
+        type DeviceType =
+            'HEADPHONE' |
+            'MIC' |
+            'USB' |
+            'BLUETOOTH' |
+            'HDMI' |
+            'INTERNAL_SPEAKER' |
+            'INTERNAL_MIC' |
+            'FRONT_MIC' |
+            'REAR_MIC' |
+            'KEYBOARD_MIC' |
+            'HOTWORD' |
+            'LINEOUT' |
+            'POST_MIX_LOOPBACK' |
+            'POST_DSP_LOOPBACK' |
+            'OTHER';
+
         interface AudioDeviceInfo {
             /** The unique identifier of the audio device. */
             id: string;
             /** Stream type associated with this device. */
             streamType: StreamType;
             /** Type of the device. */
-            deviceType: "HEADPHONE" | "MIC" | "USB" | "BLUETOOTH" | "HDMI" | "INTERNAL_SPEAKER" | "INTERNAL_MIC" | "FRONT_MIC" | "REAR_MIC" | "KEYBOARD_MIC" | "HOTWORD" | "LINEOUT" | "POST_MIX_LOOPBACK" | "POST_DSP_LOOPBACK" | "OTHER";
-            /** The user-friendly name (e.g. "USB Microphone"). */
+            deviceType: DeviceType;
+            /** The user-friendly name (e.g. 'USB Microphone'). */
             displayName: string;
             /** Device name. */
             deviceName: string;
             /** True if this is the current active device. */
             isActive: boolean;
             /** The sound level of the device, volume for output, gain for input. */
-            level: number;
+            level: integer;
             /** The stable/persisted device id string when available. */
             stableDeviceId?: string;
         }
@@ -405,198 +915,963 @@ declare namespace chrome {
              * The audio device's desired sound level. Defaults to the device's current sound level.
              * If used with audio input device, represents audio device gain.
              * If used with audio output device, represents audio device volume.
-             *
-             * Type: integer
              */
-            level?: number;
-        }
-        interface OnLevelChangedEvent {
-            /**
-             * The callback parameter should be a function that looks like this:
-             *   function(object event) {...};
-             * @param {(event: {
-             *             deviceId: string,
-             *             level: number
-             *         }) => void} callback
-             */
-            addListener(callback: (event: {
-                deviceId: string,
-                level: number
-            }) => void): void;
-        }
-        interface OnMuteChangedEvent {
-            /**
-             * The callback parameter should be a function that looks like this:
-             * function(object event) {...};
-             */
-            addListener(callback: (event: {
-                streamType: StreamType[],
-                isMuted: boolean
-            }) => void): void;
-        }
-        interface OnDeviceListChangedEvent {
-            /**
-             * The callback parameter should be a function that looks like this:
-             *   function(array of AudioDeviceInfo devices) {...};
-             * @param {(devices: AudioDeviceInfo[]) => void} callback `devices` contains a list of all present audio devices after the change.
-             */
-            addListener(callback: (devices: AudioDeviceInfo[]) => void): void;
+            level?: integer;
         }
         /**
-         * @description Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
+         * Device properties by which to filter the list of returned audio devices. If the filter is not set or set to {}, returned device list will contain all available audio devices.
          */
         interface Filter {
             /**
-             * @description If set, only audio devices whose stream type is included in this list will satisfy the filter.
+             * If set, only audio devices whose stream type is included in this list will satisfy the filter.
              */
             streamTypes?: StreamType[];
             /**
-             * @description If set, only audio devices whose active state matches this value will satisfy the filter.
+             * If set, only audio devices whose active state matches this value will satisfy the filter.
              */
             isActive?: boolean;
         }
         /**
-         * @description Gets a list of audio devices filtered based on |filter|.
+          * Gets a list of audio devices filtered based on |filter|.
          */
-        export function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => void): void;
-        export function getDevices(callback: (devices: AudioDeviceInfo[]) => void): void;
+        function getDevices(filter: Filter, callback: (devices: AudioDeviceInfo[]) => void): void;
+        function getDevices(callback: (devices: AudioDeviceInfo[]) => void): void;
         /** Sets lists of active input and/or output devices. */
-        export function setDevices(ids: DeviceIdLists[] | string[], callback: () => void): void;
+        function setDevices(ids: DeviceIdLists[] | string[], callback: () => void): void;
         /** Sets the properties for the input or output device. */
-        export function setProperties(id: string, properties: SetDeviceProperties, callback: () => void): void;
+        function setProperties(id: string, properties: SetDeviceProperties, callback: () => void): void;
         /**
-         * @description Gets the system-wide mute state for the specified stream type.
-         * @param {StreamType} streamType Stream type for which mute state should be fetched.
-         * @param {(value: boolean) => {}} callback Callback reporting whether mute is set or not for specified stream type.
+          * Gets the system-wide mute state for the specified stream type.
+         * @param streamType Stream type for which mute state should be fetched.
+         * @param callback Callback reporting whether mute is set or not for specified stream type.
          */
-        export function getMute(streamType: StreamType, callback: (value: boolean) => void): void;
+        function getMute(streamType: StreamType, callback: (value: boolean) => void): void;
         /**
-         * @description Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
-         * @param {StreamType} streamType Stream type for which mute state should be set.
-         * @param {boolean} isMuted New mute value.
-         * @param {() => {}} [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
+          * Sets mute state for a stream type. The mute state will apply to all audio devices with the specified audio stream type.
+         * @param streamType Stream type for which mute state should be set.
+         * @param isMuted New mute value.
+         * @param [callback] If you specify the callback parameter, it should be a function that looks like this: function() {...};
          */
-        export function setMute(streamType: StreamType, isMuted: boolean, callback?: () => void): void;
-        /** Fired when sound level changes for an active audio device. */
-        export var onLevelChanged: OnLevelChangedEvent;
-        /** Fired when the mute state of the audio input or output changes. Note that mute state is system-wide and the new value applies to every audio device with specified stream type. */
-        export var onMuteChanged: OnMuteChangedEvent;
-        /** Fired when audio devices change, either new devices being added, or existing devices being removed. */
-        export var onDeviceListChanged: OnDeviceListChangedEvent;
-    }
+        function setMute(streamType: StreamType, isMuted: boolean, callback?: () => void): void;
 
-    ////////////////////
-    // Bluetooth
-    ////////////////////
+        /** Fired when sound level changes for an active audio device. */
+        const onLevelChanged: chrome.events.Event<(deviceId: string, level: integer) => void>;
+        /**
+         * Fired when the mute state of the audio input or output changes.
+         * Note that mute state is system-wide and the new value applies to
+         * every audio device with specified stream type.
+         */
+        const onMuteChanged: chrome.events.Event<(streamType: StreamType[], isMuted: boolean) => void>;
+        /**
+         * Fired when audio devices change, either new devices being added,
+         * or existing devices being removed.
+         * callback `devices` contains a list of all present audio devices after the change.
+         */
+        const onDeviceListChanged: chrome.events.Event<(devices: AudioDeviceInfo[]) => void>;
+    }
+    // #endregion
+
+    // #region chrome.bluetooth*
+    ///////////////
+    // Bluetooth //
+    ///////////////
     /**
-     * Use the chrome.bluetooth API to connect to a Bluetooth device. All functions report failures via chrome.runtime.lastError.
-     * Manifest: "bluetooth": {...}
      * @since Chrome 37
+     * @requires Manifest: 'bluetooth': {...}
+     * @description
+     * Use the chrome.bluetooth API to connect to a Bluetooth device.
+     * All functions report failures via chrome.runtime.lastError.
+     * **Important: This API works only on OS X, Windows and Chrome OS.**
      */
     namespace bluetooth {
         interface AdapterState {
+            /** The address of the adapter, in the format 'XX:XX:XX:XX:XX:XX'. */
             address: string;
+            /** The human-readable name of the adapter. */
             name: string;
+            /** Indicates whether or not the adapter has power. */
             powered: boolean;
+            /** Indicates whether or not the adapter is available (i.e. enabled). */
             available: boolean;
+            /** Indicates whether or not the adapter is currently discovering. */
             discovering: boolean;
         }
+        type DeviceType =
+            'computer' | 'phone' | 'modem' |
+            'audio' | 'carAudio' | 'video' |
+            'peripheral' | 'joystick' | 'gamepad' |
+            'keyboard' | 'mouse' | 'tablet' | 'keyboardMouseCombo';
+
+        type DeviceVendorIdSource = 'bluetooth' | 'usb';
+
         interface Device {
+            /** The address of the device, in the format 'XX:XX:XX:XX:XX:XX'. */
             address: string;
+            /** The human-readable name of the device. */
             name?: string;
-            deviceClass?: number;
-            vendorIdSource?: 'bluetooth' | 'usb';
-            vendorId?: number;
-            productId?: number;
-            deviceId?: number;
-            type?: "computer" | "phone" | "modem" | "audio" | "carAudio" | "video" | "peripheral" | "joystick" | "gamepad" | "keyboard" | "mouse" | "tablet" | "keyboardMouseCombo";
+            /** The class of the device, a bit-field defined by http://www.bluetooth.org/en-us/specification/assigned-numbers/baseband. */
+            deviceClass?: integer;
+            /** The Device ID record of the device, where available. */
+            vendorIdSource?: DeviceVendorIdSource;
+            vendorId?: integer;
+            productId?: integer;
+            deviceId?: integer;
+            /**
+             * The type of the device, if recognized by Chrome.
+             * This is obtained from the |deviceClass| field and only represents a small fraction of the possible device types.
+             * When in doubt you should use the |deviceClass| field directly.
+             */
+            type?: DeviceType;
+            /** Indicates whether or not the device is paired with the system. */
             paired?: boolean;
+            /** Indicates whether the device is currently connected to the system. */
             connected?: boolean;
             /**
+             * Indicates whether the device is currently connecting to the system.
              * @since Chrome 48
              */
             connecting?: boolean;
             /**
+             * Indicates whether the device is connectable.
              * @since Chrome 48
              */
             connectable?: boolean;
+            /**
+             * UUIDs of protocols, profiles and services advertised by the device.
+             * For classic Bluetooth devices, this list is obtained from EIR data and SDP tables.
+             * For Low Energy devices, this list is obtained from AD and GATT primary services.
+             * For dual mode devices this may be obtained from both.
+             */
             uuids?: string[];
             /**
+             * The received signal strength, in dBm. This field is avaliable and valid only during discovery. Outside of discovery it's value is not specified.
              * @since Chrome 44
              */
-            inquiryRssi: number;
+            inquiryRssi: integer;
             /**
+             * The transmitted power level. This field is avaliable only for LE devices that include this field in AD. It is avaliable and valid only during discovery.
              * @since Chrome 44
              */
-            inquiryTxPower: number;
+            inquiryTxPower: integer;
         }
 
         interface BluetoothEvent<T> {
             addListener(callback: (event: T) => void): void;
         }
 
+        type DeviceFilterType = 'all' | 'known';
+
         /**
          * Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
          */
         interface DeviceFilter {
             /** Type of filter to apply to the device list. Default is all. */
-            filterType?: 'all' | 'known';
+            filterType?: DeviceFilterType;
             /** Maximum number of bluetoth devices to return. Default is 0 (no limit) if unspecified. */
-            limit?: number;
+            limit?: integer;
         }
         /** Get information about the Bluetooth adapter. */
-        export function getAdapterState(callback: (adapterInfo: AdapterState) => void): void;
+        function getAdapterState(callback: (adapterInfo: AdapterState) => void): void;
+
         /** Get information about a Bluetooth device known to the system. */
-        export function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void): void;
+        function getDevice(deviceAddress: string, callback: (deviceInfo: Device) => void): void;
+
+        /**
+         * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
+         * @param callback Called when the search is completed.
+         */
+        function getDevices(callback: (devices: Device[]) => void): void;
+
         /**
          * Get a list of Bluetooth devices known to the system, including paired and recently discovered devices.
          * @param filter Since Chrome 67. Some criteria to filter the list of returned bluetooth devices. If the filter is not set or set to {}, returned device list will contain all bluetooth devices. Right now this is only supported in ChromeOS, for other platforms, a full list is returned.
          * @param callback Called when the search is completed.
          */
-        export function getDevices(filter: DeviceFilter, callback: (deviceInfo: Device) => void): void;
+        function getDevices(filter: DeviceFilter, callback: (devices: Device[]) => void): void;
+
         /**
          * Start discovery. Newly discovered devices will be returned via the onDeviceAdded event. Previously discovered devices already known to the adapter must be obtained using getDevices and will only be updated using the |onDeviceChanged| event if information about them changes.
          * Discovery will fail to start if this application has already called startDiscovery. Discovery can be resource intensive: stopDiscovery should be called as soon as possible.
          */
-        export function startDiscovery(callback: () => void): void;
+        function startDiscovery(callback: () => void): void;
+
         /** Stop discovery. */
-        export function stopDiscovery(callback: () => void): void;
+        function stopDiscovery(callback: () => void): void;
+
         /** Fired when the state of the Bluetooth adapter changes. */
-        export var onAdapterStateChanged: BluetoothEvent<AdapterState>;
+        const onAdapterStateChanged: BluetoothEvent<AdapterState>;
+
         /** Fired when information about a new Bluetooth device is available. */
-        export var onDeviceAdded: BluetoothEvent<Device>;
+        const onDeviceAdded: BluetoothEvent<Device>;
+
         /** Fired when information about a known Bluetooth device has changed. */
-        export var onDeviceChanged: BluetoothEvent<Device>;
+        const onDeviceChanged: BluetoothEvent<Device>;
+
         /** Fired when a Bluetooth device that was previously discovered has been out of range for long enough to be considered unavailable again, and when a paired device is removed. */
-        export var onDeviceRemoved: BluetoothEvent<Device>;
-    }
-    /**
-     * The chrome.bluetoothLowEnergy API is used to communicate with Bluetooth Smart (Low Energy) devices using the Generic Attribute Profile (GATT).
-     * Manifest: "bluetooth": {...}
-     * @since Chrome 37
-     * Important: This API works only on Chrome OS.
-     * Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
-     */
-    namespace bluetoothLowEnergy {
-        /**
-         * NOT IMPLEMENTED YET
-         * @see https://developer.chrome.com/apps/bluetoothLowEnergy
-         * */
-    }
-    /**
-     * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
-     * @since Chrome 37
-     * Manifest: "bluetooth": {...}
-     * Important: This API works only on OS X, Windows and Chrome OS.
-     */
-    namespace bluetoothSocket {
-        /** NOT IMPLEMENTED YET */
+        const onDeviceRemoved: BluetoothEvent<Device>;
     }
 
-    ////////////////////
-    // Browser
-    ////////////////////
     /**
+     * @since Chrome 37
+     * @requires Manifest: 'bluetooth': {...}
+     * @requires Important: This API works only on Chrome OS.
+     * @requires Note: With Chrome 56, users can select nearby Bluetooth Low Energy devices to provide to web sites that use the Web Bluetooth API.
+     * @description
+     * The chrome.bluetoothLowEnergy API is used to communicate
+     * with Bluetooth Smart (Low Energy) devices using the
+     * Generic Attribute Profile (GATT).
+     */
+    namespace bluetoothLowEnergy {
+        interface Service {
+            /** The UUID of the service, e.g. 0000180d-0000-1000-8000-00805f9b34fb. */
+            uuid: string;
+            /** Indicates whether the type of this service is primary or secondary. */
+            isPrimary: boolean;
+            /**
+             * Returns the identifier assigned to this service.
+             * Use the instance ID to distinguish between services from a peripheral with the same UUID and to make function calls that take in a service identifier.
+             * Present, if this instance represents a remote service.
+             **/
+            instanceId?: string;
+            /**
+             * The device address of the remote peripheral that the GATT service belongs to.
+             * Present, if this instance represents a remote service.
+             */
+            deviceAddress?: string;
+        }
+        type CharacteristicProperties =
+            'broadcast' |
+            'read' |
+            'writeWithoutResponse' |
+            'write' |
+            'notify' |
+            'indicate' |
+            'authenticatedSignedWrites' |
+            'extendedProperties' |
+            'reliableWrite' |
+            'writableAuxiliaries' |
+            'encryptRead' |
+            'encryptWrite' |
+            'encryptAuthenticatedRead' |
+            'encryptAuthenticatedWrite';
+        interface Characteristic {
+            /** The UUID of the characteristic, e.g. 00002a37-0000-1000-8000-00805f9b34fb. */
+            uuid: string;
+            /** The GATT service this characteristic belongs to. */
+            service?: Service;
+            /** The properties of this characteristic. */
+            properties: CharacteristicProperties[];
+            /** Returns the identifier assigned to this characteristic. Use the instance ID to distinguish between characteristics from a peripheral with the same UUID and to make function calls that take in a characteristic identifier. Present, if this instance represents a remote characteristic. */
+            instanceId?: string;
+            /** The currently cached characteristic value. This value gets updated when the value of the characteristic is read or updated via a notification or indication. */
+            value?: ArrayBuffer;
+        }
+        type DescriptorPermissions =
+            'read' |
+            'write' |
+            'encryptedRead' |
+            'encryptedWrite' |
+            'encryptedAuthenticatedRead' |
+            'encryptedAuthenticatedWrite';
+
+        interface Descriptor {
+            /** The UUID of the characteristic descriptor, e.g. 00002902-0000-1000-8000-00805f9b34fb. */
+            uuid: string;
+            /** The GATT characteristic this descriptor belongs to. */
+            characteristic?: Characteristic;
+            /**
+             * The permissions of this descriptor.
+             * @since Chrome 52.
+             */
+            permissions: DescriptorPermissions[];
+            /** Returns the identifier assigned to this descriptor. Use the instance ID to distinguish between descriptors from a peripheral with the same UUID and to make function calls that take in a descriptor identifier. Present, if this instance represents a remote characteristic. */
+            instanceId?: string;
+            /** The currently cached descriptor value. This value gets updated when the value of the descriptor is read. */
+            value?: ArrayBuffer;
+        }
+        interface RequestDevice {
+            /** The address of the device, in the format 'XX:XX:XX:XX:XX:XX'. */
+            address: string;
+            /** The human-readable name of the device. */
+            name?: string;
+            /** The class of the device, a bit - field defined by:
+             * @see [Specs]{@link http://www.bluetooth.org/en-us/specification/assigned-numbers/baseband}
+             **/
+            deviceClass?: integer;
+        }
+        interface Request {
+            /** Unique ID for this request. Use this ID when responding to this request. */
+            requestId: integer;
+            /** Device that send this request. */
+            device: RequestDevice;
+            /** Value to write (if this is a write request). */
+            value?: ArrayBuffer;
+        }
+        interface IProperties {
+            /**
+             * Flag indicating whether a connection to the device is left open when the event page of the application is unloaded. The default value is false.
+             * @see [HowToManageAppLifecycle]{@link https://developer.chrome.com/apps/app_lifecycle}
+             * @default false
+             */
+            persistent: boolean;
+        }
+        interface INotification {
+            /** New value of the characteristic. */
+            value: ArrayBuffer;
+            /** Optional flag for sending an indication instead of a notification. */
+            shouldIndicate: boolean;
+        }
+        type AdvertisementType = 'broadcast' | 'peripheral';
+        interface Advertisement {
+            /** Type of advertisement. */
+            type: AdvertisementType;
+            /** List of UUIDs to include in the 'Service UUIDs' field of the Advertising Data. These UUIDs can be of the 16bit, 32bit or 128 formats. */
+            serviceUuids?: string[];
+            /** List of manufacturer specific data to be included in 'Manufacturer Specific Data' fields of the advertising data. */
+            manufacturerData?: { id: integer, data: integer[] };
+            /** List of UUIDs to include in the 'Solicit UUIDs' field of the Advertising Data. These UUIDs can be of the 16bit, 32bit or 128 formats. */
+            solicitUuids?: string[];
+            /** List of service data to be included in 'Service Data' fields of the advertising data. */
+            serviceData: { uuid: string, data: integer[] };
+        }
+        interface IResponse {
+            /** Id of the request this is a response to. */
+            requestId: integer;
+            /** If this is an error response, this should be true. */
+            isError: boolean;
+            /** Response value. Write requests and error responses will ignore this parameter. */
+            value?: ArrayBuffer;
+        }
+        /**
+         * Establishes a connection between the application and the device with the given address. A device may be already connected and its GATT services available without calling connect, however, an app that wants to access GATT services of a device should call this function to make sure that a connection to the device is maintained. If the device is not connected, all GATT services of the device will be discovered after a successful call to connect.
+         * @param deviceAddress The Bluetooth address of the remote device to which a GATT connection should be opened.
+         * @param callback Called when the connect request has completed.
+         */
+        function connect(deviceAddress: string, callback: () => void): void;
+        /**
+         * Establishes a connection between the application and the device with the given address. A device may be already connected and its GATT services available without calling connect, however, an app that wants to access GATT services of a device should call this function to make sure that a connection to the device is maintained. If the device is not connected, all GATT services of the device will be discovered after a successful call to connect.
+         * @param deviceAddress The Bluetooth address of the remote device to which a GATT connection should be opened.
+         * @param properties Connection properties (optional).
+         * @param callback Called when the connect request has completed.
+         */
+        function connect(deviceAddress: string, properties: IProperties, callback: () => void): void;
+        /**
+         * Closes the app's connection to the device with the given address. Note that this will not always destroy the physical link itself, since there may be other apps with open connections.
+         * @param deviceAddress The Bluetooth address of the remote device.
+         * @param [callback] Called when the disconnect request has completed.
+         */
+        function disconnect(deviceAddress: string, callback?: () => void): void;
+        /**
+         * Get the GATT service with the given instance ID.
+         * @param serviceId The instance ID of the requested GATT service.
+         * @param callback Called with the requested Service object.
+         */
+        function getService(serviceId: string, callback: (result: Service) => void): void;
+        /**
+          * Create a locally hosted GATT service. This service can be registered to be available on a local GATT server. This function is only available if the app has both the bluetooth:low_energy and the bluetooth:peripheral permissions set to true. The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param service The service to create.
+         * @param callback Called with the created services's unique ID.
+         */
+        function createService(service: Service, callback: () => void): void;
+        /**
+         * Get all the GATT services that were discovered on the remote device with the given device address.
+         * Note: If service discovery is not yet complete on the device, this API will return a subset (possibly empty) of services. A work around is to add a time based delay and/or call repeatedly until the expected number of services is returned.
+         * @param deviceAddress The Bluetooth address of the remote device whose GATT services should be returned.
+         * @param callback Called with the list of requested Service objects.
+         */
+        function getServices(deviceAddress: string, callback: (result: Service[]) => void): void;
+        /**
+         * Get the GATT characteristic with the given instance ID that belongs to the given GATT service, if the characteristic exists.
+         * @param characteristicId The instance ID of the requested GATT characteristic.
+         * @param callback Called with the requested Characteristic object.
+         */
+        function getCharacteristic(characteristicId: string, callback: (result: Characteristic) => void): void;
+        /**
+          * Create a locally hosted GATT characteristic. This characteristic must be hosted under a valid service. If the service ID is not valid, the lastError will be set. This function is only available if the app has both the bluetooth:low_energy and the bluetooth:peripheral permissions set to true. The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param characteristic The characteristic to create.
+         * @param serviceId ID of the service to create this characteristic for.
+         * @param callback Called with the created characteristic's unique ID.
+         */
+        function createCharacteristic(characteristic: Characteristic, serviceId: string, callback: (characteristicId: string) => void): void;
+        /**
+         * Get a list of all discovered GATT characteristics that belong to the given service.
+         * @param serviceId The instance ID of the GATT service whose characteristics should be returned.
+         * @param callback Called with the list of characteristics that belong to the given service.
+         */
+        function getCharacteristics(serviceId: string, callback: (result: Characteristic[]) => void): void;
+        /**
+         * Get a list of GATT services that are included by the given service.
+         * @param serviceId The instance ID of the GATT service whose included services should be returned.
+         * @param callback Called with the list of GATT services included from the given service.
+         */
+        function getIncludedServices(serviceId: string, callback: (result: Service[]) => void): void;
+        /**
+         * Get the GATT characteristic descriptor with the given instance ID.
+         * @param descriptorId The instance ID of the requested GATT characteristic descriptor.
+         * @param callback Called with the requested Descriptor object.
+         */
+        function getDescriptor(descriptorId: string, callback: (result: Descriptor) => void): void;
+        /**
+         * Create a locally hosted GATT descriptor. This descriptor must be hosted under a valid characteristic. If the characteristic ID is not valid, the lastError will be set. This function is only available if the app has both the bluetooth:low_energy and the bluetooth:peripheral permissions set to true. The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param descriptor The descriptor to create.
+         * @param characteristicId ID of the characteristic to create this descriptor for.
+         * @param callback Called with the created desciptor's unique ID.
+         */
+        function createDescriptor(descriptor: Descriptor, characteristicId: string, callback: (descriptorId: string) => void): void;
+        /**
+         * Get a list of GATT characteristic descriptors that belong to the given characteristic.
+         * @param characteristicId The instance ID of the GATT characteristic whose descriptors should be returned.
+         * @param callback Called with the list of descriptors that belong to the given characteristic.
+         */
+        function getDescriptors(characteristicId: string, callback: (result: Descriptor[]) => void): void;
+        /**
+         * Retrieve the value of a specified characteristic from a remote peripheral.
+         * @param characteristicId The instance ID of the GATT characteristic whose value should be read from the remote device.
+         * @param callback Called with the Characteristic object whose value was requested. The value field of the returned Characteristic object contains the result of the read request.
+         */
+        function readCharacteristicValue(characteristicId: string, callback: (result: Characteristic) => void): void;
+        /**
+         * Write the value of a specified characteristic from a remote peripheral.
+         * @param characteristicId The instance ID of the GATT characteristic whose value should be written to.
+         * @param value The value that should be sent to the remote characteristic as part of the write request.
+         * @param callback Called when the write request has completed.
+         */
+        function writeCharacteristicValue(characteristicId: string, value: ArrayBuffer, callback: () => void): void;
+        /**
+         * Enable value notifications/indications from the specified characteristic. Once enabled, an application can listen to notifications using the onCharacteristicValueChanged event.
+         * @see onCharacteristicValueChanged
+         * @param characteristicId The instance ID of the GATT characteristic that notifications should be enabled on.
+         * @param callback Called when the request has completed.
+         */
+        function startCharacteristicNotifications(characteristicId: string, callback: () => void): void;
+        /**
+         * Enable value notifications/indications from the specified characteristic. Once enabled, an application can listen to notifications using the onCharacteristicValueChanged event.
+         * @see onCharacteristicValueChanged
+         * @param characteristicId The instance ID of the GATT characteristic that notifications should be enabled on.
+         * @param properties Notification session properties (optional).
+         * @param callback Called when the request has completed.
+         */
+        function startCharacteristicNotifications(characteristicId: string, properties: IProperties, callback: () => void): void;
+        /**
+         * Disable value notifications/indications from the specified characteristic. After a successful call, the application will stop receiving notifications/indications from this characteristic.
+         * @param characteristicId The instance ID of the GATT characteristic on which this app's notification session should be stopped.
+         * @param [callback] Called when the request has completed (optional).
+         */
+        function stopCharacteristicNotifications(characteristicId: string, callback?: () => void): void;
+        /**
+         * Notify a remote device of a new value for a characteristic.
+         * If the shouldIndicate flag in the notification object is true, an indication will be sent instead of a notification.
+         * Note, the characteristic needs to correctly set the 'notify' or 'indicate' property during creation for this call to succeed.
+         * This function is only available if the app has both the bluetooth:low_energy and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param characteristicId The characteristic to send the notication for.
+         * @param notification Notification object
+         * @param callback Callback called once the notification or indication has been sent successfully.
+         */
+        function notifyCharacteristicValueChanged(characteristicId: string, notification: INotification, callback: () => void): void;
+        /**
+         * Retrieve the value of a specified characteristic descriptor from a remote peripheral.
+         * @param descriptorId The instance ID of the GATT characteristic descriptor whose value should be read from the remote device.
+         * @param callback Called with the Descriptor object whose value was requested. The value field of the returned Descriptor object contains the result of the read request.
+         */
+        function readDescriptorValue(descriptorId: string, callback: (result: Descriptor) => void): void;
+        /**
+         * Write the value of a specified characteristic descriptor from a remote peripheral.
+         * @param descriptorId The instance ID of the GATT characteristic descriptor whose value should be written to.
+         * @param value The value that should be sent to the remote descriptor as part of the write request.
+         * @param callback Called when the write request has completed.
+         */
+        function writeDescriptorValue(descriptorId: string, value: ArrayBuffer, callback: () => void): void;
+        /**
+         * Register the given service with the local GATT server.
+         * If the service ID is invalid, the lastError will be set.
+         * This function is only available if the app has both
+         *   the bluetooth:low_energy and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param serviceId Unique ID of a created service.
+         * @param callback Callback with the result of the register operation.
+         */
+        function registerService(serviceId: string, callback: (result: any) => void): void;
+        /**
+         * Unregister the given service with the local GATT server.
+         * If the service ID is invalid, the lastError will be set.
+         * This function is only available if the app has both
+         *   the bluetooth:low_energy and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param serviceId Unique ID of a current registered service.
+         * @param callback Callback with the result of the register operation.
+         */
+        function unregisterService(serviceId: string, callback: (result: any) => void): void;
+        /**
+         * Remove the specified service, unregistering it if it was registered.
+         * If the service ID is invalid, the lastError will be set.
+         * This function is only available if the app has both
+         *   the bluetooth:low_energy and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param serviceId Unique ID of a current registered service.
+         * @param [callback] Callback called once the service is removed.
+         */
+        function removeService(serviceId: string, callback?: () => void): void;
+        /**
+         * Create an advertisement and register it for advertising.
+         * To call this function, the app must have
+         *  the bluetooth:low_energy and bluetooth:peripheral permissions set to true.
+         * Additionally this API is only available to auto launched apps in Kiosk Mode
+         *  of by setting the 'enable-ble-advertising-in-apps' flag.
+         *  See https://developer.chrome.com/apps/manifest/bluetooth
+         * Note: On some hardware, central and peripheral modes at the same time
+         *  is supported but on hardware that doesn't support this,
+         *  making this call will switch the device to peripheral mode.
+         * In the case of hardware which does not support both central and peripheral mode,
+         *  attempting to use the device in both modes will lead to undefined behavior
+         *  or prevent other central-role applications from behaving correctly
+         *  (including the discovery of Bluetooth Low Energy devices).
+         * @since Chrome 47.
+         * @param advertisement The advertisement to advertise.
+         * @param callback Called once the registeration is done and we've started advertising. Returns the id of the created advertisement.
+         */
+        function registerAdvertisement(advertisement: Advertisement, callback: (advertisementId: integer) => void): void;
+        /**
+         * Unregisters an advertisement and stops its advertising.
+         * If the advertisement fails to unregister the only way
+         *  to stop advertising might be to restart the device.
+         * @since Chrome 47.
+         * @param advertisementId Id of the advertisement to unregister.
+         * @param callback Called once the advertisement is unregistered and is no longer being advertised.
+         */
+        function unregisterAdvertisement(advertisementId: integer, callback: () => void): void;
+        /**
+         * Resets advertising on the current device. It will unregister and stop all existing advertisements.
+         * @since Chrome 61.
+         * @param callback Called once the advertisements are reset.
+         */
+        function resetAdvertising(callback: () => void): void;
+        /**
+         * Set's the interval betweeen two consecutive advertisements.
+         * Note: This is a best effort.
+         * The actual interval may consty non-trivially from the requested intervals.
+         * On some hardware, there is a minimum interval of 100ms.
+         * The minimum and maximum values cannot exceed the the range allowed by the Bluetooth 4.2 specification.
+         * @since Chrome 55.
+         * @param minInterval Minimum interval between advertisments (in milliseconds). This cannot be lower than 20ms (as per the spec).
+         * @param maxInterval Maximum interval between advertisments (in milliseconds). This cannot be more than 10240ms (as per the spec).
+         * @param callback Called once the interval has been set.
+         */
+        function setAdvertisingInterval(minInterval: integer, maxInterval: integer, callback: () => void): void;
+        /**
+         * Sends a response for a characteristic or descriptor read/write request. This function is only available if the app has both the bluetooth:low_energy and the bluetooth:peripheral permissions set to true. The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         * @param response The response to the request.
+         */
+        function sendRequestResponse(response: IResponse): void;
+        /** Fired whan a new GATT service has been discovered on a remote device. */
+        const onServiceAdded: chrome.events.Event<(service: Service) => void>;
+        /**
+         * Fired when the state of a remote GATT service changes.
+         * This involves any characteristics and/or descriptors
+         *   that get added or removed from the service, as well as
+         *   'ServiceChanged' notifications from the remote device.
+         */
+        const onServiceChanged: chrome.events.Event<(service: Service) => void>;
+        /** Fired when a GATT service that was previously discovered on a remote device has been removed. */
+        const onServiceRemoved: chrome.events.Event<(service: Service) => void>;
+        /**
+         * Fired when the value of a remote GATT characteristic changes,
+         *   either as a result of a read request,
+         *   or a value change notification/indication.
+         * This event will only be sent if the app has enabled notifications
+         *   by calling startCharacteristicNotifications.
+         */
+        const onCharacteristicValueChanged: chrome.events.Event<(characteristic: Characteristic) => void>;
+        /**
+         * Fired when the value of a remote GATT characteristic descriptor changes,
+         *   usually as a result of a read request.
+         * This event exists mostly for convenience and will always be sent after
+         *   a successful call to readDescriptorValue.
+         */
+        const onDescriptorValueChanged: chrome.events.Event<(descriptor: Descriptor) => void>;
+        /**
+         * Fired when a connected central device requests to read the value of
+         *   a characteristic registered on the local GATT server.
+         * Not responding to this request for a long time may lead to a disconnection.
+         * This event is only available if the app has both the bluetooth:low_energy
+         *   and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         */
+        const onCharacteristicReadRequest: chrome.events.Event<(characteristic: Characteristic) => void>;
+        /**
+         * Fired when a connected central device requests to write the value of
+         *   a characteristic registered on the local GATT server.
+         * Not responding to this request for a long time may lead to a disconnection.
+         * This event is only available if the app has both the bluetooth:low_energy
+         *   and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         */
+        const onCharacteristicWriteRequest: chrome.events.Event<(characteristic: Characteristic) => void>;
+        /**
+         * Fired when a connected central device requests to read the value of
+         *   a descriptor registered on the local GATT server.
+         * Not responding to this request for a long time may lead to a disconnection.
+         * This event is only available if the app has both the bluetooth:low_energy
+         *   and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         * @since Chrome 52.
+         */
+        const onDescriptorReadRequest: chrome.events.Event<(descriptor: Descriptor) => void>;
+        /**
+         * Fired when a connected central device requests to write the value of
+         *   a descriptor registered on the local GATT server.
+         * Not responding to this request for a long time may lead to a disconnection.
+         * This event is only available if the app has both the bluetooth:low_energy
+         *   and the bluetooth:peripheral permissions set to true.
+         * The peripheral permission may not be available to all apps.
+         */
+        const onDescriptorWriteRequest: chrome.events.Event<(descriptor: Descriptor) => void>;
+    }
+
+    /**
+     * @since Chrome 37
+     * @requires Manifest: 'bluetooth': {...}
+     * @requires Important: This API works only on OS X, Windows and Chrome OS.
+      * Use the chrome.bluetoothSocket API to send and receive data to Bluetooth devices using RFCOMM and L2CAP connections.
+     */
+    namespace bluetoothSocket {
+        interface SocketProperties {
+            /**
+             * Flag indicating whether the socket is left open when
+             * the event page of the application is unloaded
+             * (see Manage App Lifecycle). The default value is false.
+             * When the application is loaded, any sockets previously
+             * opened with persistent=true can be fetched with $ref:getSockets.
+             */
+            persistent?: boolean;
+            /** An application-defined string associated with the socket. */
+            name?: string;
+            /**
+             * @default 4096
+             * @description
+             * The size of the buffer used to receive data.
+             * */
+            bufferSize?: integer;
+        }
+        interface ListenOptions {
+            /**
+             * The RFCOMM Channel used by listenUsingRfcomm.
+             * If specified, this channel must not be previously
+             * in use or the method call will fail. When not specified,
+             * an unused channel will be automatically allocated.
+             */
+            channel?: integer;
+            /**
+             * The L2CAP PSM used by listenUsingL2cap.
+             * If specified, this PSM must not be previously
+             * in use or the method call with fail. When not specified,
+             * an unused PSM will be automatically allocated.
+             * */
+            psm?: integer;
+            /**
+             * Length of the socket's listen queue.
+             * The default value depends on the operating system's host subsystem.
+             * */
+            backlog?: integer;
+        }
+        interface SocketInfo {
+            /**
+             * The socket identifier.
+             * */
+            socketId: integer;
+            /**
+             * Flag indicating if the socket remains
+             * open when the event page of the application
+             * is unloaded (see SocketProperties.persistent).
+             * The default value is 'false'.
+             */
+            persistent: boolean;
+            /**
+             * Application-defined string associated with the socket.
+             */
+            name?: string;
+            /**
+             * The size of the buffer used to receive data.
+             * If no buffer size has been specified explictly,
+             * the value is not provided.
+             */
+            bufferSize?: integer;
+            /**
+             * Flag indicating whether a connected socket
+             * blocks its peer from sending more data, or
+             * whether connection requests on a listening
+             * socket are dispatched through the onAccept
+             * event or queued up in the listen queue backlog.
+             * See setPaused. The default value is 'false'.
+             */
+            paused: boolean;
+            /**
+             * Flag indicating whether the socket is connected to a remote peer.
+             */
+            connected: boolean;
+            /**
+             * If the underlying socket is connected,
+             * contains the Bluetooth address of the device it is connected to.
+             */
+            address?: string;
+            /**
+             * If the underlying socket is connected,
+             * contains information about the service
+             * UUID it is connected to, otherwise if
+             * the underlying socket is listening,
+             * contains information about the service
+             * UUID it is listening on.
+             */
+            uuid?: string;
+        }
+
+        interface CreateInfo {
+            /**
+             * The ID of the newly created socket.
+             * Note that socket IDs created from this
+             * API are not compatible with socket IDs
+             * created from other APIs, such as the
+             * sockets.tcp API.
+             */
+            socketId: integer;
+        }
+        interface OnAcceptInfoData {
+            /** The server socket identifier. */
+            socketId: integer;
+            /**
+             * The client socket identifier, i.e. the socket
+             * identifier of the newly established connection.
+             * This socket identifier should be used only with
+             * functions from the chrome.bluetoothSocket namespace.
+             * Note the client socket is initially paused and must
+             * be explictly un-paused by the application to start
+             * receiving data.
+             */
+            clientSocketId: integer;
+        }
+        type OnAcceptErrorCode =
+            'system_error' |
+            'not_listening';
+        interface OnAcceptErrorEventData {
+            /** The server socket identifier. */
+            socketId: integer;
+            /** The error message */
+            errorMessage: string;
+            /**
+             * An error code indicating what went wrong.
+             *
+             * system_error
+             *  > A system error occurred and the connection may be unrecoverable.
+             * not_listening
+             *  > The socket is not listening.
+             */
+            error: OnAcceptErrorCode;
+        }
+        interface OnReceiveEventData {
+            /** The socket identifier. */
+            socketId: integer;
+            /** The data received, with a maxium size of bufferSize. */
+            data: ArrayBuffer;
+        }
+        type OnReceiveErrorCode =
+            'disconnected' |
+            'system_error' |
+            'not_connected';
+        interface OnReceiveErrorEventData {
+            /** The server socket identifier. */
+            socketId: integer;
+            /** The error message */
+            errorMessage: string;
+            /**
+             * An error code indicating what went wrong.
+             *
+             * disconnected
+             *  > The connection was disconnected.
+             * system_error
+             *  > A system error occurred and the connection may be unrecoverable.
+             * not_connected
+             *  > The socket has not been connected.
+             */
+            error: OnAcceptErrorCode;
+        }
+        interface OnAcceptEvent extends chrome.events.Event<(info: OnAcceptInfoData) => void> { }
+        interface OnAcceptErrorEvent extends chrome.events.Event<(info: OnAcceptErrorEventData) => void> { }
+        interface OnReceiveEvent extends chrome.events.Event<(info: OnReceiveEventData) => void> { }
+        interface OnReceiveErrorEvent extends chrome.events.Event<(info: OnReceiveErrorEventData) => void> { }
+        /**
+         * Creates a Bluetooth socket.
+         * @param callback Called when the socket has been created
+         * */
+        function create(callback: (createInfo: CreateInfo) => void): void;
+        /**
+         * Creates a Bluetooth socket.
+         * @param properties The socket properties (optional)
+         * @param callback Called when the socket has been created
+         */
+        function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+        /**
+         * Updates the socket properties.
+         * @param socketId The socket identifier.
+         * @param properties  The properties to update.
+         * @param [callback] Called when the properties are updated.
+         */
+        function update(socketId: integer, properties: SocketProperties, callback?: () => void): void;
+        /**
+         * Enables or disables a connected socket from
+         * receiving messages from its peer, or a listening
+         * socket from accepting new connections. The default
+         * value is 'false'. Pausing a connected socket is
+         * typically used by an application to throttle data
+         * sent by its peer. When a connected socket is paused,
+         * no onReceiveevent is raised. When a socket is connected
+         * and un-paused, onReceive events are raised again when
+         * messages are received. When a listening socket is paused,
+         * new connections are accepted until its backlog is full
+         * then additional connection requests are refused.
+         * onAccept events are raised only when the socket is un-paused.
+         *
+         * @param socketId The socket identifier.
+         * @param paused Flag indicating whether a connected socket
+             * blocks its peer from sending more data, or
+             * whether connection requests on a listening
+             * socket are dispatched through the onAccept
+             * event or queued up in the listen queue backlog.
+             * See setPaused. The default value is 'false'.
+         * @param [callback] Callback from the setPaused method.
+         */
+        function setPaused(socketId: integer, paused: boolean, callback?: () => void): void;
+        /**
+         * Listen for connections using the RFCOMM protocol.
+         *
+         * @param socketId The socket identifier.
+         * @param uuid Service UUID to listen on.
+         * @param callback Called when listen operation completes.
+         */
+        function listenUsingRfcomm(socketId: integer, uuid: string, callback: () => void): void;
+        /**
+         * Listen for connections using the RFCOMM protocol.
+         *
+         * @param socketId The socket identifier.
+         * @param uuid Service UUID to listen on.
+         * @param options Optional additional options for the service.
+         * @param callback Called when listen operation completes.
+         */
+        function listenUsingRfcomm(socketId: integer, uuid: string, options: ListenOptions, callback: () => void): void;
+        /**
+         * Listen for connections using the L2CAP protocol.
+         *
+         * @param socketId The socket identifier.
+         * @param uuid Service UUID to listen on.
+         * @param callback Called when listen operation completes.
+         */
+        function listenUsingL2cap(socketId: integer, uuid: string, callback: () => void): void;
+        /**
+         * Listen for connections using the L2CAP protocol.
+         *
+         * @param socketId The socket identifier.
+         * @param uuid Service UUID to listen on.
+         * @param options Optional additional options for the service.
+         * @param callback Called when listen operation completes.
+         */
+        function listenUsingL2cap(socketId: integer, uuid: string, options: ListenOptions, callback: () => void): void;
+        /**
+         * Connects the socket to a remote Bluetooth device.
+         * When the connect operation completes successfully,
+         * onReceive events are raised when data is received
+         * from the peer. If a network error occur while the
+         * runtime is receiving packets, a onReceiveError
+         * event is raised, at which point no more onReceive
+         * event will be raised for this socket until the
+         * setPaused(false) method is called.
+         *
+         * @param socketId The socket identifier.
+         * @param address The address of the Bluetooth device.
+         * @param uuid The UUID of the service to connect to.
+         * @param callback Called when the connect attempt is complete.
+         */
+        function connect(socketId: integer, address: string, uuid: string, callback: () => void): void;
+        /**
+         * Disconnects the socket. The socket identifier remains valid.
+         * @param socketId The socket identifier.
+         * @param [callback] Called when the disconnect attempt is complete.
+         */
+        function disconnect(socketId: integer, callback?: () => void): void;
+        /**
+         * Disconnects and destroys the socket.
+         * Each socket created should be closed after use.
+         * The socket id is no longer valid as soon at the
+         * function is called. However, the socket is guaranteed
+         * to be closed only when the callback is invoked.
+         *
+         * @param socketId The socket identifier.
+         * @param callback Called when the `close` operation completes
+         */
+        function close(socketId: integer, callback: () => void): void;
+        /**
+         * Sends data on the given Bluetooth socket.
+         * @param socketId The socket identifier.
+         * @param data The data to send.
+         * @param [callback] Called with the number of bytes sent.
+         */
+        function send(socketId: integer, data: ArrayBuffer, callback?: (bytesSent: integer) => void): void;
+        /**
+         * Retrieves the state of the given socket.
+         * @param socketId The socket identifier.
+         * @param callback Called when the socket state is available.
+         *                 Callback returning object containing the socket information.
+         */
+        function getInfo(socketId: integer, callback: (socketInfo: SocketInfo) => void): void;
+        /**
+         * Retrieves the list of currently opened sockets owned by the application.
+         * @param callback Called when the list of sockets is available.
+         *                 Returns an array of socket info.
+         */
+        function getSockets(callback: (sockets: SocketInfo[]) => void): void;
+        /**
+         * Event raised when a connection has been established
+         * for a given socket.
+         */
+        const onAccept: OnAcceptEvent;
+        /**
+         * Event raised when a network error occurred while the
+         * runtime was waiting for new connections on the given
+         * socket. Once this event is raised, the socket is set
+         * to paused and no more onAccept events are raised for
+         * this socket.
+         */
+        const onAcceptError: OnAcceptErrorEvent;
+        /**
+         * Event raised when data has been received for a given socket.
+         */
+        const onReceive: OnReceiveEvent;
+        /**
+         * Event raised when a network error occured while the runtime
+         * was waiting for data on the socket. Once this event is raised,
+         * the socket is set to paused and no more onReceive events are
+         * raised for this socket.
+         */
+        const onReceiveError: OnReceiveErrorEvent;
+    }
+    // #endregion
+
+    // #region chrome.browser
+    /////////////
+    // Browser //
+    /////////////
+    /**
+     * @since Chrome 42.
+     * @requires Permissions: 'browser'
+     * @description
      * Use the chrome.browser API to interact with the Chrome browser associated with
      * the current application and Chrome profile.
      */
@@ -614,7 +1889,7 @@ declare namespace chrome {
          * @param callback Called when the tab was successfully
          * created, or failed to be created. If failed, runtime.lastError will be set.
          */
-        export function openTab(options: Options, callback: () => void): void;
+        function openTab(options: Options, callback: () => void): void;
 
         /**
         * Opens a new tab in a browser window associated with the current application
@@ -622,270 +1897,752 @@ declare namespace chrome {
         * a new one is opened prior to creating the new tab. Since Chrome 42 only.
         * @param options Configures how the tab should be opened.
         */
-        export function openTab(options: Options): void;
+        function openTab(options: Options): void;
     }
+    // #endregion
 
-    ////////////////////
-    // Commands
-    ////////////////////
+    // #region chrome.certificateProvider
+    //////////////////////////
+    // Certificate Provider //
+    //////////////////////////
     /**
-     * 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 extension.
-     * Availability: Since Chrome 25.
-     * Manifest:  "commands": {...}
+     * @requires(CrOS) Chrome OS only.
+     * @requires Permissions: 'certificateProvider'
+     * @description
+     * Use this API to expose certificates to the platform which
+     * can use these certificates for TLS authentications.
+     */
+    namespace certificateProvider {
+        /** Hash type */
+        type Hash = 'MD5_SHA1' | 'SHA1' | 'SHA256' | 'SHA384' | 'SHA512';
+
+        /**
+         * The type of code being requested by the extension with requestPin function.
+         * @enum
+         */
+        const PinRequestType: {
+            'PIN': 'PIN',
+            'PUK': 'PUK'
+        };
+        /**
+         * The types of errors that can be presented to the user through the requestPin function.
+         * @enum
+         */
+        const PinRequestErrorType: {
+            'INVALID_PIN': 'INVALID_PIN',
+            'INVALID_PUK': 'INVALID_PUK',
+            'MAX_ATTEMPTS_EXCEEDED': 'MAX_ATTEMPTS_EXCEEDED',
+            'UNKNOWN_ERROR': 'UNKNOWN_ERROR'
+        };
+        interface CertificateInfo {
+            /**
+             * Must be the DER encoding of a X.509 certificate. Currently, only
+             * certificates of RSA keys are supported.
+             */
+            certificate?: ArrayBuffer;
+            /**
+             * Must be set to all hashes supported for this certificate. This app
+             * will only be asked for signatures of digests calculated with one of these
+             * hash algorithms. This should be in order of decreasing hash preference.
+             * @see Hash
+             */
+            supportedHashes?: Hash[];
+        }
+        interface SignRequest {
+            /**
+             * The unique ID to be used by the app should it need to call a method
+             * that requires it, e.g. requestPin.
+             */
+            signRequestId: integer;
+            /** The digest that must be signed */
+            digest: ArrayBuffer;
+            /** Refers to the hash algorithm that was used to create *digest*. */
+            hash: Hash;
+            /**
+             * The DER encoding of a X.509 certificate. The app must sign
+             * *digest* using the associated private key.
+             */
+            certificate: ArrayBuffer;
+        }
+        interface RequestPinDetails {
+            /**
+             * The ID given by Chrome in SignRequest.
+             */
+            signRequestId: number;
+            /**
+             * The type of code requested. Default is PIN.
+             * @see PinRequestType
+             */
+            requestType?: ToStringLiteral<typeof PinRequestType>;
+            /**
+             * The error template displayed to the user. This should be set if the
+             * previous request failed, to notify the user of the failure reason.
+             * @see PinRequestErrorType
+             */
+            errorType?: ToStringLiteral<typeof PinRequestErrorType>;
+            /**
+             * The number of attempts left. This is provided so that any UI can present
+             * this information to the user. Chrome is not expected to enforce this,
+             * instead stopPinRequest should be called by the app with
+             * errorType = MAX_ATTEMPTS_EXCEEDED when the number of pin requests is
+             * exceeded.
+             */
+            attemptsLeft?: number;
+        }
+        interface StopRequestPinDetails {
+            /**
+             * The ID given by Chrome in SignRequest
+             */
+            signRequestId: number;
+            /**
+             * The error template. If present it is displayed to user. Intended to
+             * contain the reason for stopping the flow if it was caused by an error,
+             * e.g. MAX_ATTEMPTS_EXCEEDED.
+             * @see PinRequestErrorType
+             */
+            errorType?: ToStringLiteral<typeof PinRequestErrorType>;
+        }
+        interface PinResponseDetails {
+            userInput?: string;
+        }
+        /**
+         * Requests the PIN from the user. Only one ongoing request at a time is
+         * allowed. The requests issued while another flow is ongoing are rejected.
+         * It's the apps's responsibility to try again later if another flow is
+         * in progress.
+         * @param details Contains the details about the requested dialog.
+         * @param callback Is called when the dialog is resolved with the user input, or
+         * when the dialog request finishes unsuccessfully (e.g. the dialog was
+         * canceled by the user or was not allowed to be shown).
+         */
+        function requestPin(details: RequestPinDetails, callback: (details?: PinResponseDetails) => void): void;
+        /**
+         * @description Stops the pin request started by the *requestPin* function.
+         * @param details Contains the details about the reason for stopping the request flow.
+         * @param callback To be used by Chrome to send to the app the status from
+         * their request to close PIN dialog for user.
+         */
+        function stopPinRequest(details: StopRequestPinDetails, callback: () => void): void;
+        /**
+         * This event fires every time the browser requests the current list of
+         * certificates provided by this app. The app must call *reportCallback*
+         * exactly once with the current list of certificates.
+         */
+        const onCertificatesRequested: chrome.events.Event<(certificates: CertificateInfo[], callback: (rejectedCertificates: ArrayBuffer[]) => void) => any>;
+        /**
+         * This event fires every time the browser needs to sign
+         * a message using a certificate provided by this app
+         * in reply to an *onCertificatesRequested* event.
+         *
+         * The app must sign the data in *request* using the
+         * appropriate algorithm and private key and return it by calling
+         * *reportCallback*. *reportCallback* must be called exactly once.
+         * @param request: Contains the details about the sign request.
+         */
+        const onSignDigestRequested: chrome.events.Event<(signRequest: SignRequest, signCallback: (signature?: ArrayBuffer) => void) => any>;
+    }
+    // #endregion
+
+    // #region chrome.clipboard
+    ///////////////
+    // Clipboard //
+    ///////////////
+    /**
+     * @requires(dev) **Dev** channel only.
+     * @requires Permissions: 'clipboard'
+     * @description
+     * *This API is* **experimental**. *It is* **only** *available to Chrome users on the* **dev** *channel.*
+     * The chrome.clipboard API is provided to allow users to access data of the clipboard.
+     * This is a temporary solution for chromeos platform apps until open-web alternative is available.
+     * It will be deprecated once open-web solution is available.
+     * @see[Docs]{@link https://developer.chrome.com/apps/clipboard}
+     */
+    namespace clipboard {
+        /** Image type */
+        type ImageType = 'png' | 'jpeg';
+        /** @enum */
+        const DataItemType: {
+            TEXT_PLAIN: 'textPlain',
+            TEXT_HTML: 'textHtml'
+        }
+        interface AdditionalItems {
+            /**
+             * Type of the additional data item.
+             * @see DataItemType
+             */
+            type: ToStringLiteral<typeof DataItemType>;
+            /**
+             * Content of the additional data item.
+             * Either the plain text string if *type* is 'textPlain' or
+             * markup string if *type* is 'textHtml'.
+             * The data can not exceed 2MB.
+             */
+            data: string;
+        }
+        /**
+         * **Dev channel only.**
+         * Sets image data to clipboard
+         * @param imageData The encoded image data. *Since Chrome 70. Warning: this is the current Beta channel.*
+         * @param type The type of image being passed. *Since Chrome 70. Warning: this is the current Beta channel.*
+         * @param [additionalItems] Additional data items for describing image data.
+         *      The callback is called with chrome.runtime.lastError set to error code if there is an error.
+         *      Requires clipboard and clipboardWrite permissions.
+         *      *Since Chrome 70. Warning: this is the current Beta channel.*
+         * @param [callback]
+         */
+        function setImageData(imageData: ArrayBuffer, type: ImageType, additionalItems?: AdditionalItems, callback?: () => void): void;
+
+        /**
+         * **Dev channel only.**
+         * Fired when clipboard data changes.
+         * Requires clipboard and clipboardRead permissions for adding listener to
+         * chrome.clipboard.onClipboardDataChanged event. After this event fires, the
+         * clipboard data is available by calling document.execCommand('paste').
+         */
+        const onClipboardDataChanged: chrome.events.Event<() => void>;
+    }
+    // #endregion
+
+    // #region chrome.commands
+    //////////////
+    // Commands //
+    //////////////
+    /**
+     * @since Chrome 35.
+     * @requires Manifest:  'commands': {...}
+     * @description
+     * Use the commands API to add keyboard shortcuts that
+     * trigger actions in your app, for example, an
+     * action to open the browser action or send a command
+     * to the app.
+     * @see[Usage]{@link https://developer.chrome.com/apps/commands}
      */
     namespace commands {
         interface Command {
-            /** Optional. The name of the Extension Command  */
+            /** The name of the command  */
             name?: string;
-            /** Optional. The Extension Command description  */
+            /** The command description  */
             description?: string;
-            /** Optional. The shortcut active for this command, or blank if not active.  */
+            /** The shortcut active for this command, or blank if not active.  */
             shortcut?: string;
         }
 
         interface CommandEvent extends chrome.events.Event<(command: string) => void> { }
 
         /**
-         * Returns all the registered extension commands for this extension and their shortcut (if active).
+         * Returns all the registered commands for this app and their shortcut (if active).
          * @param callback Called to return the registered commands.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(array of Command commands) {...};
          */
-        export function getAll(callback: (commands: Command[]) => void): void;
+        function getAll(callback: (commands: Command[]) => void): void;
 
         /** Fired when a registered command is activated using a keyboard shortcut. */
-        export var onCommand: CommandEvent;
+        const onCommand: CommandEvent;
     }
+    // #endregion
 
-    ////////////////////
-    // Context Menus
-    ////////////////////
+    // #region chrome.contextMenus
+    ///////////////////
+    // Context Menus //
+    ///////////////////
     /**
-     * Use the chrome.contextMenus API to add items to Google Chrome's context menu. You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages.
-     * Availability: Since Chrome 6.
-     * Permissions:  "contextMenus"
+     * @since Chrome 24.
+     * @requires Permissions: 'contextMenus'
+     * @description
+     * Use the chrome.contextMenus API to add items to Google Chrome's context menu.
+     * You can choose what types of objects your context menu additions apply to,
+     * such as images, hyperlinks, and pages.
+     *
+     * Context menu items can appear in any document (or frame within a document),
+     * even those with file:// or chrome:// URLs. To control which documents your
+     * items can appear in, specify the documentUrlPatterns field when you call the
+     * create() or update() method.
+     *
+     * You can create as many context menu items as you need,
+     * but if more than one from your app is visible at once,
+     * Google Chrome automatically collapses them into a single parent menu.
      */
     namespace contextMenus {
         /**
-        * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'. The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc. Different platforms might put limitations on what is actually supported in a launcher context menu.
+         * @since Chrome 38.
+         * @default 6
+         * @description
+         * The maximum number of top level extension items that
+         * can be added to an app's action context menu.
+         * Any items beyond this limit will be ignored.
+         */
+        const ACTION_MENU_TOP_LEVEL_LIMIT: integer;
+        /**
+        * The different contexts a menu can appear in.
+        * Specifying 'all' is equivalent to the combination of all other contexts except for 'launcher'.
+        * The 'launcher' context is only supported by apps and is used to add menu items to the context menu that appears when clicking on the app icon in the launcher/taskbar/dock/etc.
+        * Different platforms might put limitations on what is actually supported in a launcher context menu.
         **/
-        export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio" | "launcher" | "browser_action" | "page_action";
+        const ContextType: {
+            'ALL': 'all',
+            'PAGE': 'page',
+            'FRAME': 'frame',
+            'SELECTION': 'selection',
+            'LINK': 'link',
+            'EDITABLE': 'editable',
+            'IMAGE': 'image',
+            'VIDEO': 'video',
+            'AUDIO': 'audio',
+            'LAUNCHER': 'launcher',
+            'BROWSER_ACTION': 'browser_action',
+            'PAGE_ACTION': 'page_action'
+        };
         /**
         * The type of menu item.
         **/
-        export type ItemType = "normal" | "checkbox" | "radio" | "separator";
+        const ItemType: {
+            'NORMAL': 'normal',
+            'CHECKBOX': 'checkbox',
+            'RADIO': 'radio',
+            'SEPARATOR': 'separator'
+        };
 
+        type MediaType =
+            'image' |
+            'video' |
+            'audio';
         interface OnClickData {
             /**
-             * Optional.
-             * @since Since Chrome 35.
-             * The text for the context selection, if any.
-             */
-            selectionText?: string;
-            /**
-             * Optional.
-             * @since Since Chrome 35.
-             * A flag indicating the state of a checkbox or radio item after it is clicked.
-             */
-            checked?: boolean;
-            /**
-             * @since Since Chrome 35.
              * The ID of the menu item that was clicked.
+             * @since Chrome 35.
              */
-            menuItemId: any;
+            menuItemId: integer | string;
+
             /**
-             * Optional.
-             * @since Since Chrome 35.
-             * The URL of the frame of the element where the context menu was clicked, if it was in a frame.
+             * The parent ID, if any, for the item clicked.
+             * @since Chrome 35.
              */
-            frameUrl?: string;
+            parentMenuItemId?: integer | string;
+
             /**
-             * @since Since Chrome 35.
-             * A flag indicating whether the element is editable (text input, textarea, etc.).
+             * One of 'image', 'video', or 'audio' if the context menu was
+             * activated on one of these types of elements.
+             * @since Chrome 35.
              */
-            editable: boolean;
+            mediaType?: MediaType;
+
             /**
-             * Optional.
-             * @since Since Chrome 35.
-             * One of 'image', 'video', or 'audio' if the context menu was activated on one of these types of elements.
-             */
-            mediaType?: string;
-            /**
-             * Optional.
-             * @since Since Chrome 35.
-             * A flag indicating the state of a checkbox or radio item before it was clicked.
-             */
-            wasChecked?: boolean;
-            /**
-             * @since Since Chrome 35.
-             * 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;
-            /**
-             * Optional.
-             * @since Since Chrome 35.
              * If the element is a link, the URL it points to.
+             * @since Chrome 35.
              */
             linkUrl?: string;
+
             /**
-             * Optional.
-             * @since Since Chrome 35.
-             * The parent ID, if any, for the item clicked.
-             */
-            parentMenuItemId?: any;
-            /**
-             * Optional.
-             * @since Since Chrome 35.
              * Will be present for elements with a 'src' URL.
+             * @since Chrome 35.
              */
             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.
+             * @since Chrome 35.
+             */
+            pageUrl: string;
+
+            /**
+             * The URL of the frame of the element where the context menu was clicked,
+             * if it was in a frame.
+             * @since Chrome 35.
+             */
+            frameUrl?: string;
+
+            /**
+             * The ID of the frame of the element where the context menu was clicked,
+             * if it was in a frame.
+             * @since Chrome 35.
+             */
+            frameId?: integer;
+
+            /**
+             * The text for the context selection, if any.
+             * @since Chrome 35.
+             */
+            selectionText?: string;
+
+            /**
+             * A flag indicating whether the element is editable (text input, textarea, etc.).
+             * @since Chrome 35.
+             */
+            editable: boolean;
+
+            /**
+             * A flag indicating the state of a checkbox or radio item before it was clicked.
+             * @since Chrome 35.
+             */
+            wasChecked?: boolean;
+
+            /**
+             * A flag indicating the state of a checkbox or radio item after it is clicked.
+             * @since Chrome 35.
+             */
+            checked?: boolean;
         }
 
         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.  */
-            checked?: boolean;
-            /** Optional. 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;
-            /** Optional. List of contexts this menu item will appear in. Defaults to ['page'] if not specified.  */
-            contexts?: string[];
             /**
-             * Optional.
-             * Whether this context menu item is enabled or disabled. Defaults to true.
-             * @since Since Chrome 20.
+             * The type of menu item.
+             * @default 'normal' - Defaults to 'normal' if not specified.
+             * @see ItemType
              */
-            enabled?: boolean;
-            /** Optional. 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[];
+            type?: ToStringLiteral<typeof ItemType>;
+
+            /**
+             * The unique ID to assign to this item.
+             * Mandatory for event pages.
+             * Cannot be the same as another ID for this app.
+             */
+            id?: 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.
+             * @default ['page'] - Defaults to ['page'] if not specified.
+             * @see ContextType
+             **/
+            contexts?: ToStringLiteral<typeof ContextType>[];
+
+            /**
+             * Whether the item is visible in the menu.
+             * @since Chrome 62.
+             */
+            visible?: boolean;
+
             /**
-             * Optional.
              * 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 chrome.contextMenus.onClicked.
              * @param info Information sent when a context menu item is clicked.
              */
             onclick?: (info: OnClickData) => void;
-            /** Optional. The ID of a parent menu item; this makes the item a child of a previously added item.  */
-            parentId?: any;
-            /** Optional. The type of menu item. Defaults to 'normal' if not specified.  */
-            type?: string;
+
+            /** The ID of a parent menu item; this makes the item a child of a previously added item.  */
+            parentId?: integer | string;
+
             /**
-             * Optional.
-             * @since Since Chrome 21.
-             * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-             */
-            id?: 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[];
+
             /**
-             * @description Whether the item is visible in the menu.
-             * @since Since Chrome 62
+             * 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.
+             * @default true
              */
-            visible?: boolean;
+            enabled?: boolean;
         }
 
         interface UpdateProperties {
-            documentUrlPatterns?: string[];
-            checked?: boolean;
+            /** @see ItemType */
+            type?: ToStringLiteral<typeof ItemType>;
             title?: string;
-            contexts?: string[];
+            checked?: boolean;
+            /** @see ContextType */
+            contexts?: ToStringLiteral<typeof ContextType>[];
             /**
-             * @since Chrome 20
-             **/
-            enabled?: boolean;
-            targetUrlPatterns?: string[];
-            onclick?: (info: OnClickData) => void;
-            /** Optional. Note: You cannot change an item to be a child of one of its own descendants.  */
-            parentId?: any;
-            type?: string;
-            /**
-             * @description Whether the item is visible or not.
-             * @since Since Chrome 62
+             * Whether the item is visible in the menu.
+             * @since Chrome 62.
              */
             visible?: boolean;
+            /**
+             * Information sent when a context menu item is clicked.
+             * @since Chrome 44
+             */
+            onclick?: (info: OnClickData) => void;
+            /** Note: You cannot change an item to be a child of one of its own descendants.  */
+            parentId?: integer | string;
+            documentUrlPatterns?: string[];
+            targetUrlPatterns?: string[];
+            enabled?: boolean;
         }
 
         interface MenuClickedEvent extends chrome.events.Event<(info: OnClickData) => 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.
-         */
-        export var ACTION_MENU_TOP_LEVEL_LIMIT: number;
-
-        /**
-         * Removes all context menu items added by this extension.
-         * @param callback Called when removal is complete.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        export function removeAll(callback?: () => void): void;
         /**
          * 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 chrome.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 chrome.runtime.lastError.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
          */
-        export function create(createProperties: CreateProperties, callback?: () => void): void;
+        function create(createProperties: CreateProperties, callback?: () => void): void;
+
         /**
          * 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.
          * @param callback Called when the context menu has been updated.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
          */
-        export function update(id: string, updateProperties: UpdateProperties, callback?: () => void): void;
-        /**
-         * 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.
-         * @param callback Called when the context menu has been updated.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        export function update(id: number, updateProperties: UpdateProperties, callback?: () => void): void;
+        function update(id: integer | string, updateProperties: UpdateProperties, callback?: () => void): void;
+
         /**
          * Removes a context menu item.
          * @param menuItemId The ID of the context menu item to remove.
          * @param callback Called when the context menu has been removed.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
          */
-        export function remove(menuItemId: string, callback?: () => void): void;
-        /**
-         * Removes a context menu item.
-         * @param menuItemId The ID of the context menu item to remove.
-         * @param callback Called when the context menu has been removed.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
-         */
-        export function remove(menuItemId: number, callback?: () => void): void;
+        function remove(menuItemId: integer | string, callback?: () => void): void;
 
         /**
-         * Since Chrome 21.
-         * Fired when a context menu item is clicked.
+         * Removes all context menu items added by this app.
+         * @param callback Called when removal is complete.
          */
-        export var onClicked: MenuClickedEvent;
+        function removeAll(callback?: () => void): void;
 
+        /** Fired when a context menu item is clicked. */
+        const onClicked: MenuClickedEvent;
     }
+    // #endregion
 
+    // #region chrome.desktopCapture
+    /////////////////////
+    // Desktop Capture //
+    /////////////////////
+    /**
+     * Desktop Capture API that can be used to capture content of screen or individual windows.
+     * @since Chrome 34.
+     * @requires Permissions: 'desktopCapture'
+     */
+    namespace desktopCapture {
+        const DesktopCaptureSourceType: {
+            SCREEN: 'screen',
+            WINDOW: 'window',
+            TAB: 'tab',
+            AUDIO: 'audio'
+        }
+
+        /**
+         * Shows desktop media picker UI with the specified set of sources.
+         * @param sources Set of sources that should be shown to the user.
+         * @param callback Provides an opaque string that can be passed to getUserMedia() API to generate media stream that corresponds to the source selected by the user.
+         *                 If user didn't select any source (i.e. canceled the prompt) then the callback is called with an empty streamId.
+         *                 The created streamId can be used only once and expires after a few seconds when it is not used.
+         * @return Request ID to be used by cancelChooseDesktopMedia
+         */
+        function chooseDesktopMedia(sources: ToStringLiteral<typeof DesktopCaptureSourceType>[], callback: (streamId: string) => void): integer;
+
+        /**
+         * Hides desktop media picker dialog shown by chooseDesktopMedia().
+         * @param desktopMediaRequestId Id returned by chooseDesktopMedia()
+         */
+        function cancelChooseDesktopMedia(desktopMediaRequestId: integer): void;
+    }
+    // #endregion
+
+    // #region chrome.diagnostics
+    /////////////////
+    // Diagnostics //
+    /////////////////
+    /**
+     * @requires(CrOS) Only Chrome OS. Crashes app on Windows.
+     * @requires Permissions: 'diagnostics'
+     */
+    namespace diagnostics {
+        /** @todo TODO PROPER DOCS */
+        function sendPacket(options: Object, callback: () => void): void;
+    }
+    // #endregion
+
+    // #region chrome.displaySource
     ////////////////////
-    // Document Scan
+    // Display Source //
     ////////////////////
     /**
-     * Use the chrome.documentScan API to discover and retrieve images from attached paper document scanners.
-     * Availability: Since Chrome 44.
-     * Permissions:  "documentScan"
-     * Important: This API works only on Chrome OS.
+     * @requires(dev) Development versions only
+     * @requires Permissions: 'displaySource'
+     * The *chrome.displaySource* API creates a Display session using WebMediaStreamTrack as sources.
+     * @todo TODO Finish documentation and typings
+     */
+    namespace displaySource {
+        /**
+         * @enum
+         * @description
+         * **'connection_error'**
+         * The connection with sink cannot be established or has dropped unexpectedly.
+         *
+         * **'capabilities_negotiation_error'**
+         * The capabilities of this Display Source and the connected
+         * sink do not fit (e.g. the sink cannot play the media content of
+         * the formats given by the source).
+         *
+         * **'media_pipeline_error'**
+         * There was an error in media pipeline: while encoding, packetizing or
+         * sending the media content.
+         *
+         * **'timeout_error'**
+         * The sink became unresponsive.
+         *
+         * **'unknown_error'**
+         * Unspecified error.
+         */
+        const ErrorType: {
+            CONNECTION_ERROR: 'connection_error',
+            CAPABILITIES_NEGOTIATION_ERROR: 'capabilities_negotiation_error',
+            MEDIA_PIPELINE_ERROR: 'media_pipeline_error',
+            TIMEOUT_ERROR: 'timeout_error',
+            UNKNOWN_ERROR: 'unknown_error'
+        };
+        /**
+         * @enum
+         * @description
+         * **'connected'**
+         * Connected using this Display Source (i.e., there is an active session)
+         *
+         * **'connecting'**
+         * In process of connection to this Display Source
+         *
+         * **'disconnected'**
+         * Disconnected from this Display Source
+         */
+        const SinkState: {
+            CONNECTED: 'Connected',
+            CONNECTING: 'Connecting',
+            DISCONNECTED: 'Disconnected'
+        };
+        /**
+         * @enum
+         * @description
+         *
+         * **'PBC'**
+         * Push Button Config authentication method.
+         *
+         * **'PIN'**
+         * PIN authentication method.
+         */
+        const AuthenticationMethod: {
+            PBC: 'PBC',
+            PIN: 'PIN'
+        };
+        interface ErrorInfo {
+            /** @see ErrorType */
+            type: ToStringLiteral<typeof ErrorType>;
+            description?: string;
+        }
+        interface SinkInfo {
+            /** Id of the sink. It is guaranteed to be unique during the browser session. */
+            id: integer;
+            /** Human readable name of the sink. */
+            name: string;
+            /**
+             * State of the sink.
+             * @see SinkState
+             */
+            state: ToStringLiteral<typeof SinkState>;
+        }
+        interface AuthenticationInfo {
+            /**
+             * Authentication method.
+             * @see AuthenticationMethod
+             */
+            method?: ToStringLiteral<typeof AuthenticationMethod>;
+            /**
+             * Authentication data (e.g. PIN value).
+             */
+            data?: string;
+        }
+        interface StartSessionInfo {
+            sinkId: integer;
+            authenticationInfo?: AuthenticationInfo;
+            audioTrack?: object;
+            videoTrack?: object;
+        }
+        const getAvailableSinks: Function;
+        const requestAuthentication: Function;
+        const startSession: Function;
+        const terminateSession: Function;
+        const onSinksUpdated: chrome.events.Event<any>;
+        const onSessionTerminated: chrome.events.Event<any>;
+        const onSessionErrorOccured: chrome.events.Event<any>;
+    }
+    // #endregion
+
+    // #region chrome.dns
+    /////////
+    // DNS //
+    /////////
+    /**
+     * @requires(CrOS) Only Chrome OS. Crashes app on Windows.
+     * @requires Permissions: 'diagnostics'
+     * @description
+     * Use the *chrome.dns* API for dns resolution.
+     */
+    namespace dns {
+        interface ResolveCallbackResolveInfo {
+            /** The result code. Zero indicates success. */
+            resultCode: integer;
+            /**
+             * A string representing the IP address literal.
+             * Supplied only if resultCode indicates success.
+             * Note that we presently return only IPv4 addresses.
+             */
+            address?: string;
+        }
+        /**
+         * Resolves the given hostname or IP address literal.
+         * @param hostname The hostname to resolve.
+         * @param callback Called when the resolution operation completes.
+         */
+        function resolve(hostname: string, callback: (resolveInfo: ResolveCallbackResolveInfo) => void): void;
+    }
+    // #endregion
+
+    // #region chrome.documentScan
+    ///////////////////
+    // Document Scan //
+    ///////////////////
+    /**
+     * Use the chrome.documentScan API to discover and retrieve
+     * images from attached paper document scanners.
+     *
+     * The Document Scan API is designed to allow apps to view
+     * the content of paper documents on an attached document scanner.
+     *
+     * *Note: This API depends on OS features that may not be available*
+     * *depending on the underlying operating system. As of this writing only*
+     * *Chrome OS for certain USB-attached devices is known to successfully work.*
+     *
+     * @since Chrome 44.
+     * @requires Permissions: 'documentScan'
+     * @requires Important: This API works only on Chrome OS.
      */
     namespace documentScan {
         interface DocumentScanOptions {
-            /** Optional. The MIME types that are accepted by the caller.  */
+            /** The MIME types that are accepted by the caller.  */
             mimeTypes?: string[];
-            /** Optional. The number of scanned images allowed (defaults to 1).  */
-            maxImages?: number;
+            /** The number of scanned images allowed (defaults to 1).  */
+            maxImages?: integer;
         }
 
         interface DocumentScanCallbackArg {
-            /** The data image URLs in a form that can be passed as the "src" value to an image tag. */
+            /** 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. */
             mimeType: string;
@@ -895,102 +2652,308 @@ declare namespace chrome {
          * Performs a document scan. On success, the PNG data will be sent to the callback.
          * @param options Object containing scan parameters.
          * @param callback Called with the result and data from the scan.
-         * The callback parameter should be a function that looks like this:
-         * function(object result) {...};
          */
-        export function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
+        function scan(options: DocumentScanOptions, callback: (result: DocumentScanCallbackArg) => void): void;
     }
+    // #endregion
 
-    ////////////////////
-    // Events
-    ////////////////////
+    // #region chrome.enterprise.*
+    ////////////////
+    // ENTERPRISE //
+    ////////////////
     /**
-     * The chrome.events namespace  contains common types used by APIs dispatching events to notify you when something interesting happens.
-     * Availability: Since Chrome 21.
+     * @requires Permissions: 'enterprise.deviceAttributes'
+     * @requires Note: This API is only available to apps force-installed by enterprise policy.
+     * @requires(CrOS) Only available on Chrome OS.
+     * @since Chrome 46.
+     * @description
+     * Use the chrome.enterprise.deviceAttributes API to read device attributes.
+     */
+    namespace 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.
+         * If the current user is not affiliated, returns an empty string.
+         * @param callback Called with the device identifier of the directory API when received.
+         */
+        function getDirectoryDeviceId(callback: (deviceId: string) => void): void;
+        /**
+         * @since Chrome 66.
+         * @description
+         * Fetches the device's serial number.
+         * Please note the purpose of this API is to administrate the device
+         * (e.g. generating Certificate Sign Requests for device-wide certificates).
+         * This API may not be used for tracking devices without the consent of the device's administrator.
+         * If the current user is not affiliated, returns an empty string.
+         * @param callback Called with the serial number of the device.
+         */
+        function getDeviceSerialNumber(callback: (serialNumber: string) => void): void;
+        /**
+         * @since Chrome 66.
+         * @description
+         * Fetches the administrator-annotated Asset Id.
+         * If the current user is not affiliated or no Asset Id has been set by the administrator, returns an empty string.
+         * @param callback Called with the Asset ID of the device.
+         */
+        function getDeviceAssetId(callback: (assetId: string) => void): void;
+        /**
+         * @since Chrome 66.
+         * @description
+         * Fetches the administrator-annotated Location.
+         * If the current user is not affiliated or no Annotated Location has been set by the administrator, returns an empty string.
+         * @param callback Called with the Annotated Location of the device.
+         */
+        function getDeviceAnnotatedLocation(callback: (annotatedLocation: string) => void): void;
+    }
+    /**
+     * @requires Permissions: 'enterprise.platformKeys'
+     * @requires Note: This API is only available to apps force-installed by enterprise policy.
+     * @requires(CrOS) Only available on Chrome OS.
+     * @description
+     * Use the chrome.enterprise.platformKeys API to generate hardware-backed keys and to install certificates for these keys.
+     * The certificates will be managed by the platform and can be used for TLS authentication, network access or by other extension through chrome.platformKeys.
+     * @see[Documentation]{@link https://developer.chrome.com/extensions/enterprise_platformKeys}
+     */
+    namespace enterprise.platformKeys {
+        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.
+             */
+            id: string;
+            /**
+             * Implements the WebCrypto's SubtleCrypto interface.
+             * The cryptographic operations, including key generation, are hardware-backed.
+             * Only non-extractable RSASSA-PKCS1-V1_5 keys with modulusLength up to 2048 can be generated.
+             * Each key can be used for signing data at most once.
+             * Keys generated on a specific Token cannot be used with any other Tokens,
+             * nor can they be used with window.crypto.subtle. Equally,
+             * Key objects created with window.crypto.subtle cannot be used with this interface.
+             */
+            subtleCrypto: SubtleCrypto;
+        }
+        /**
+         * Returns the available Tokens.
+         * In a regular user's session the list will always contain the user's token with id 'user'.
+         * If a system-wide TPM token is available, the returned list will also contain the system-wide token with id 'system'.
+         * The system-wide token will be the same for all sessions on this device (device in the sense of e.g. a Chromebook).
+         * @param callback Invoked by getTokens with the list of available Tokens.
+         */
+        function getTokens(callback: (tokens: Token[]) => void): void;
+        /**
+         * Returns the list of all client certificates available from the given token.
+         * Can be used to check for the existence and expiration of client certificates that are usable for a certain authentication.
+         * @param tokenId The id of a Token returned by getTokens.
+         * @param callback Called back with the list of the available certificates.
+         */
+        function getCertificates(tokenId: string, callback: (certificates: ArrayBuffer[]) => void): void;
+        /**
+         * Imports certificate to the given token if the certified key is already stored in this token.
+         * After a successful certification request, this function should be used to store the obtained
+         * certificate and to make it available to the operating system and browser for authentication.
+         * @param tokenId The id of a Token returned by getTokens.
+         * @param certificate The DER encoding of a X.509 certificate.
+         * @param [callback] Called back when this operation is finished.
+         */
+        function importCertificate(tokenId: string, certificate: ArrayBuffer, callback: () => void): void;
+        /**
+         * Removes certificate from the given token if present.
+         * Should be used to remove obsolete certificates so that they are not
+         * considered during authentication and do not clutter the certificate choice.
+         * Should be used to free storage in the certificate store.
+         * @param tokenId The id of a Token returned by getTokens.
+         * @param certificate The DER encoding of a X.509 certificate.
+         * @param [callback] Called back when this operation is finished.
+         */
+        function removeCertificate(tokenId: string, certificate: ArrayBuffer, callback: () => void): void;
+        /**
+         * @since Chrome 50.
+         * @description
+         * Challenges a hardware-backed Enterprise Machine Key and emits the response as part of a remote attestation protocol.
+         * Only useful on Chrome OS and in conjunction with the Verified Access Web API which both issues challenges and verifies responses.
+         * A successful verification by the Verified Access Web API is a strong signal of all of the following:
+         *  - The current device is a legitimate Chrome OS device.
+         *  - The current device is managed by the domain specified during verification.
+         *  - The current signed-in user is managed by the domain specified during verification.
+         *  - The current device state complies with enterprise device policy.
+         * For example, a policy may specify that the device must not be in developer mode.
+         *  - Any device identity emitted by the verification is tightly bound to the hardware of the current device.
+         *    This function is highly restricted and will fail if the current device is not managed,
+         *    the current user is not managed, or if this operation has not explicitly been enabled
+         *    for the caller by enterprise device policy. The Enterprise Machine Key does not reside
+         *    in the 'system' token and is not accessible by any other API.
+         * @param challenge A challenge as emitted by the Verified Access Web API.
+         * @param callback Called back with the challenge response.
+         */
+        function challengeMachineKey(challenge: ArrayBuffer, callback: (response: ArrayBuffer) => void): void;
+        /**
+         * @since **Since Chrome 59.** - Note: the parameter 'registerKey' requires at least Chrome 59
+         * @description
+         * Challenges a hardware-backed Enterprise Machine Key and emits the response as part of a remote attestation protocol.
+         * Only useful on Chrome OS and in conjunction with the Verified Access Web API which both issues challenges and verifies responses.
+         * A successful verification by the Verified Access Web API is a strong signal of all of the following:
+         *  - The current device is a legitimate Chrome OS device.
+         *  - The current device is managed by the domain specified during verification.
+         *  - The current signed-in user is managed by the domain specified during verification.
+         *  - The current device state complies with enterprise device policy.
+         * For example, a policy may specify that the device must not be in developer mode.
+         *  - Any device identity emitted by the verification is tightly bound to the hardware of the current device.
+         *    This function is highly restricted and will fail if the current device is not managed,
+         *    the current user is not managed, or if this operation has not explicitly been enabled
+         *    for the caller by enterprise device policy. The Enterprise Machine Key does not reside
+         *    in the 'system' token and is not accessible by any other API.
+         * @param challenge A challenge as emitted by the Verified Access Web API.
+         * @param registerKey If set, the current Enterprise Machine Key is registered with the 'system' token and relinquishes the Enterprise Machine Key role.
+         *                    The key can then be associated with a certificate and used like any other signing key. This key is 2048-bit RSA.
+         *                    Subsequent calls to this function will then generate a new Enterprise Machine Key.
+         * @param callback Called back with the challenge response.
+         */
+        function challengeMachineKey(challenge: ArrayBuffer, registerKey: boolean, callback: (response: ArrayBuffer) => void): void;
+        /**
+         * @since Chrome 50.
+         * Challenges a hardware-backed Enterprise User Key and emits the response as part of a remote attestation protocol.
+         * Only useful on Chrome OS and in conjunction with the Verified Access Web API which both issues challenges and verifies responses.
+         * A successful verification by the Verified Access Web API is a strong signal of all of the following:
+         *  - The current device is a legitimate Chrome OS device.
+         *  - The current device is managed by the domain specified during verification.
+         *  - The current signed-in user is managed by the domain specified during verification.
+         *  - The current device state complies with enterprise user policy.
+         * For example, a policy may specify that the device must not be in developer mode.
+         *  - The public key emitted by the verification is tightly bound to the hardware of the current device and to the current signed-in user.
+         * This function is highly restricted and will fail if the current device is not managed, the current user is not managed,
+         * or if this operation has not explicitly been enabled for the caller by enterprise user policy.
+         * The Enterprise User Key does not reside in the 'user' token and is not accessible by any other API.
+         * @param challenge A challenge as emitted by the Verified Access Web API.
+         * @param registerKey If set, the current Enterprise User Key is registered with the 'user' token and relinquishes the Enterprise User Key role.
+         *                    The key can then be associated with a certificate and used like any other signing key.
+         *                    This key is 2048-bit RSA. Subsequent calls to this function will then generate a new Enterprise User Key.
+         * @param callback Called back with the challenge response.
+         */
+        function challengeUserKey(challenge: ArrayBuffer, registerKey: boolean, callback: (response: ArrayBuffer) => void): void;
+    }
+    // #endregion chrome.enterprise.*
+
+    // #region chrome.events
+    ////////////
+    // Events //
+    ////////////
+    /**
+     * The chrome.events namespace contains common types used by APIs
+     * dispatching events to notify you when something interesting happens.
+     *
+     * An Event is an object that allows you to be notified when something interesting happens.
+     * Here's an example of using the chrome.alarms.onAlarm event to be notified whenever an alarm has elapsed:
+     * @example
+     * chrome.alarms.onAlarm.addListener(function(alarm) {
+     *   appendToLog('alarms.onAlarm --'
+     *               + ' name: '          + alarm.name
+     *               + ' scheduledTime: ' + alarm.scheduledTime);
+     * });
+     * @description
+     * As the example shows, you register for notification using addListener().
+     * The argument to addListener() is always a function that you define to
+     * handle the event, but the parameters to the function depend on which
+     * event you're handling. Checking the documentation for alarms.onAlarm,
+     * you can see that the function has a single parameter: an alarms.Alarm
+     * object that has details about the elapsed alarm.
+     * @since Chrome 25.
      */
     namespace events {
-        /** Filters URLs for various criteria. See event filtering. All criteria are case sensitive. */
+        /** Filters URLs for constious criteria. See event filtering. All criteria are case sensitive. */
         interface UrlFilter {
-            /** Optional. Matches if the scheme of the URL is equal to any of the schemes specified in the array.  */
-            schemes?: string[];
             /**
-             * Optional.
-              * Since Chrome 23.
-             * 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.
+             * 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 starts with a specified string.  */
+            pathEquals?: string;
+            /** Matches if the path segment of the URL ends with a specified string.  */
+            pathPrefix?: string;
+            /** Matches if the path segment of the URL is equal to 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.
+             * @see[RE2 syntax docs]{@link https://github.com/google/re2/blob/master/doc/syntax.txt}
              */
             urlMatches?: string;
-            /** Optional. Matches if the path segment of the URL contains a specified string.  */
-            pathContains?: string;
-            /** Optional. Matches if the host name of the URL ends with a specified string.  */
-            hostSuffix?: string;
-            /** Optional. Matches if the host name of the URL starts with a specified string.  */
-            hostPrefix?: string;
-            /** 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 URL (without fragment identifier) contains a specified string. Port numbers are stripped from the URL if they match the default port number.  */
-            urlContains?: string;
-            /** Optional. Matches if the query segment of the URL ends with a specified string.  */
-            querySuffix?: string;
-            /** Optional. 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;
-            /** Optional. Matches if the host name of the URL is equal to a specified string.  */
-            hostEquals?: string;
-            /** Optional. 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;
-            /** Optional. Matches if the query segment of the URL contains a specified string.  */
-            queryContains?: string;
-            /** Optional. Matches if the path segment of the URL starts with a specified string.  */
-            pathPrefix?: string;
-            /** Optional. Matches if the path segment of the URL is equal to a specified string.  */
-            pathEquals?: string;
-            /** Optional. Matches if the path segment of the URL ends with a specified string.  */
-            pathSuffix?: string;
-            /** Optional. Matches if the query segment of the URL is equal to a specified string.  */
-            queryEquals?: string;
-            /** Optional. Matches if the query segment of the URL starts with a specified string.  */
-            queryPrefix?: string;
-            /** Optional. 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;
-            /** Optional. 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?: any[];
             /**
-             * Optional.
-              * Since Chrome 28.
-             * 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.
+             * 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.
+             * @see[RE2 syntax docs]{@link https://github.com/google/re2/blob/master/doc/syntax.txt}
+             * @since Chrome 28.
              */
             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<integer | integer[]>;
         }
-
         /** An object which allows the addition and removal of listeners for a Chrome event. */
-        interface Event<T> {
+        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.
-             * The callback parameter should be a function that looks like this:
-             * function() {...};
              */
             addListener(callback: T): void;
             /**
              * Returns currently registered rules.
              * @param callback Called with registered rules.
-             * The callback parameter should be a function that looks like this:
-             * function(array of Rule rules) {...};
-             * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+             * Parameter *rules*: Rules that were registered, the optional parameters are filled with values.
              */
             getRules(callback: (rules: Rule[]) => void): void;
             /**
              * Returns currently registered rules.
              * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
              * @param callback Called with registered rules.
-             * The callback parameter should be a function that looks like this:
-             * function(array of Rule rules) {...};
-             * Parameter rules: Rules that were registered, the optional parameters are filled with values.
+             * Parameter *rules*: Rules that were registered, the optional parameters are filled with values.
              */
             getRules(ruleIdentifiers: string[], callback: (rules: Rule[]) => void): void;
             /**
-             * @param callback Listener whose registration status shall be tested.
+             * Has this event this provided listener?
+             * @param listener Listener whose registration status shall be tested.
+             * @return If it has the provided listener
              */
-            hasListener(callback: T): boolean;
+            hasListener(callback: T | Function): boolean;
             /**
              * Unregisters currently registered rules.
              * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are unregistered.
@@ -1002,269 +2965,642 @@ declare namespace chrome {
             /**
              * Unregisters currently registered rules.
              * @param callback Called when rules were unregistered.
-             * If you specify the callback parameter, it should be a function that looks like this:
-             * function() {...};
              */
             removeRules(callback?: () => void): void;
             /**
              * Registers rules to handle events.
              * @param rules Rules to be registered. These do not replace previously registered rules.
              * @param callback Called with registered rules.
-             * If you specify the callback parameter, it should be a function that looks like this:
-             * function(array of Rule rules) {...};
              * Parameter rules: Rules that were registered, the optional parameters are filled with values.
              */
             addRules(rules: Rule[], callback?: (rules: Rule[]) => void): void;
             /**
              * Deregisters an event listener callback from an event.
              * @param callback Listener that shall be unregistered.
-             * The callback parameter should be a function that looks like this:
-             * function() {...};
              */
             removeListener(callback: T): void;
+            /**
+             * Has this event listeners?
+             */
             hasListeners(): boolean;
         }
 
-        /** Description of a declarative rule for handling events. */
-        interface Rule {
-            /** Optional. 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.  */
+        interface EventFilter {
+            [key: string]: string;
+        }
+
+        /**
+         * An object which allows the addition and removal of listeners for a Chrome event.
+         * Also provides the possibility to provide a filter
+         * @template T Callback function.
+         * @template F Filter interface, leave this for default
+         */
+        interface FilteredEvent<T extends Function, F = EventFilter> extends Event<T> {
+            /**
+             * 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.
+             * @param [filter] Optional key/value dictionary you can provide to filter the events
+             */
+            addListener(callback: T, filter?: F): void;
+        }
+
+        /**
+         * Description of a declarative rule for handling events.
+         * @template T Type for conditions array, default: any.
+         * @template K Type for actions array, default: any.
+         */
+        interface Rule<T extends object = any, K extends object = any> {
+            /** Identifier that allows referencing this rule.  */
             id?: string;
-            /** List of actions that are triggered if one of the condtions is fulfilled. */
-            actions: any[];
+
             /**
-             * Optional.
-              * Since Chrome 28.
              * Tags can be used to annotate rules and perform operations on sets of rules.
+             * @since Chrome 28.
              */
             tags?: string[];
+
+            /** List of conditions that can trigger the actions. */
+            conditions: T[];
+
+            /** List of actions that are triggered if one of the condtions is fulfilled. */
+            actions: K[];
+
+            /**
+             * Optional priority of this rule.
+             * @default 100
+             */
+            priority?: integer;
         }
     }
+    // #endregion
 
-    ////////////////////
-    // Extension Types
-    ////////////////////
-
+    // #region chrome.extensionTypes
+    /////////////////////
+    // Extension Types //
+    /////////////////////
     /**
      * Primary for extensions, but also used in apps.
      * https://developer.chrome.com/extensions/extensionTypes#type-ImageDetails
+     * @since Chrome 39.
      **/
     namespace extensionTypes {
-        /**
-         * The format of an image.
-         **/
-        export type ImageFormat = 'jpeg' | 'png';
+        interface ImageDetailsPng {
+            /**
+             * The format of the resulting image.
+             * @default 'jpeg'
+             */
+            format?: 'jpeg';
+
+            /**
+             * Controls the quality of the resulting image.
+             * As quality is decreased, the resulting image
+             * will have more visual artifacts, and the number
+             * of bytes needed to store it will decrease.
+             */
+            quality?: integer;
+        }
+
+        interface ImageDetailsJpeg {
+            /**
+             * The format of the resulting image.
+             */
+            format?: 'png';
+        }
         /**
          * Details about the format and quality of an image.
          */
-        interface ImageDetails {
-            /**
-             * @description The format of the resulting image. Default is "jpeg".
-             * @type {ImageFormat}
-             * @memberof ImageDetails
-             */
-            format?: ImageFormat;
-            /**
-             * @description 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.
-             * @type {number}
-             * @memberof ImageDetails
-             */
-            quality?: number;
-        }
+        type ImageDetails = ImageDetailsJpeg | ImageDetailsPng;
         /**
          * The soonest that the JavaScript or CSS will be injected into the tab.
          **/
-        export type RunAt = 'document_start' | 'document_end' | 'document_idle';
+        type RunAt =
+            'document_start' |
+            'document_end' |
+            'document_idle';
         /**
          * The origin of injected CSS.
          **/
-        export type CSSOrigin = 'author' | 'user';
+        type CSSOrigin =
+            'author' |
+            'user';
         /**
-         * @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.
-         * @interface InjectDetails
+         * Internal interfaces, not to be used directly
+         * @private
+         * @internal
          */
-        interface InjectDetails {
+        namespace _internal_ {
+            /**
+             * Partial, use these interfaces instead:
+             * @see InjectCodeDetails
+             * @see InjectFileDetails
+             */
+            interface InjectDetailsBase {
+                /**
+                 * 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. If true and frameId is set,
+                 * then the code is inserted in the selected frame and all of its child frames.
+                 */
+                allFrames?: boolean;
+                /**
+                 * The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
+                 * @see[frame ref]{@link https://developer.chrome.com/apps/webNavigation#frame_ids}
+                 * @since Chrome 50.
+                 */
+                frameId?: integer;
+                /**
+                 * 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 soonest that the JavaScript or CSS will be injected into the tab.
+                 * @default 'document_idle'
+                 */
+                runAt: RunAt;
+                /**
+                 * The origin of the CSS to inject.
+                 * This may only be specified for CSS, not JavaScript.
+                 * @default 'author'
+                 * @since Chrome 66.
+                 */
+                cssOrigin: CSSOrigin;
+            }
+        }
+
+        interface InjectFileDetails extends _internal_.InjectDetailsBase {
+            /** JavaScript or CSS file to inject. */
+            file: string;
+        }
+
+        interface InjectCodeDetails extends _internal_.InjectDetailsBase {
             /**
              * 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 attacks.
-             * @type {string}
-             * @memberof InjectDetails
+             * **⚠ Warning**
+             * Be careful using the code parameter.
+             * Incorrect use of it may open your app
+             * to cross site scripting attacks.
+             * @see[More information]{@link https://en.wikipedia.org/wiki/Cross-site_scripting}
              */
-            code?: string;
-            /**
-             * @description JavaScript or CSS file to inject.
-             * @type {string}
-             * @memberof InjectDetails
-             */
-            file?: string;
-            /**
-             * @description 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. If true and frameId is set, then the code is inserted in the selected frame and all of its child frames.
-             * @type {boolean}
-             * @memberof InjectDetails
-             */
-            allFrames?: boolean;
-            /**
-             * @description The frame where the script or CSS should be injected. Defaults to 0 (the top-level frame).
-             * @since Since Chrome 50.
-             * @type {number}
-             * @memberof InjectDetails
-             */
-            frameId?: number;
-            /**
-             * @description 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.
-             * @type {boolean}
-             * @memberof InjectDetails
-             */
-            matchAboutBlank?: boolean;
-            /**
-             * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-             * @type {RunAt}
-             * @memberof InjectDetails
-             */
-            runAt: RunAt;
-            /**
-             * @description The origin of the CSS to inject. This may only be specified for CSS, not JavaScript. Defaults to "author".
-             * @since Since Chrome 66.
-             * @type {CSSOrigin}
-             * @memberof InjectDetails
-             */
-            cssOrigin: CSSOrigin;
+            code: string;
         }
     }
+    // #endregion
 
-    ////////////////////
-    // FileSystem
-    ////////////////////
+    // #region chrome.fileBrowserHandle
+    /////////////////////////
+    // File Browser Handle //
+    /////////////////////////
+    /**
+     * @requires(CrOS) Chrome OS Only
+     * @requires Permissions: 'fileBrowserHandler'
+     * @requires Manifest: 'file_browser_handlers'
+     * @description
+     * Use the chrome.fileBrowserHandler API to extend the Chrome OS file browser.
+     * For example, you can use this API to enable users to upload files to your website.
+     * @see[Documentation]{@link https://developer.chrome.com/extensions/fileBrowserHandler}
+     */
+    namespace fileBrowserHandler {
+        type FileBrowserHandleExecuteId =
+            'ReadOnly' |
+            'ReadWrite';
+        interface SelectFileParameters {
+            /** Suggested name for the file. */
+            suggestedName: string;
+            /**
+             * 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']
+             */
+            allowedFileExtensions?: string[];
+        }
+        interface SelectionResult {
+            /** Selected file entry. It will be null if a file hasn't been selected. */
+            entry: FileEntry | null;
+            /** Whether the file has been selected. */
+            success: boolean;
+        }
+        /**
+         * 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.
+         * @param params Parameters that will be used while selecting the file.
+         * @param callback Function called upon completion.
+         */
+        function selectFile(params: SelectFileParameters, callback: (result: SelectionResult) => void): void;
+        /**
+         * Fired when file system action is executed from ChromeOS file browser.
+         */
+        const onExecute: chrome.events.Event<(id: FileBrowserHandleExecuteId, details: { entries: FileEntry[] }) => void>;
+    }
+    // #endregion
+
+    // #region chrome.fileSystem
+    ////////////////
+    // FileSystem //
+    ////////////////
+    /**
+     * Use the chrome.fileSystem API to create, read, navigate, and write to the user's local file system.
+     * With this API, Chrome Apps can read and write to a user-selected location.
+     * For example, a text editor app can use the API to read and write local documents.
+     * All failures are notified via chrome.runtime.lastError.
+     * @since Chrome 24.
+     * @requires Permissions:
+     *   'fileSystem'
+     *   {'fileSystem': ['write']}
+     *   {'fileSystem': ['write', 'retainEntries', 'directory']}
+     */
     namespace fileSystem {
-
+        /** @enum */
+        const ChildChangeType: {
+            CREATED: 'created',
+            REMOVED: 'removed',
+            CHANGED: 'changed'
+        };
+        /**
+         * **openFile**
+         *  - Prompts the user to open an existing file and returns a FileEntry on success.
+         *    From Chrome 31 onwards, the FileEntry will be writable if the application has
+         *    the 'write' permission under 'fileSystem'; otherwise, the FileEntry will be read-only.
+         * **openWritableFile**
+         *  - Prompts the user to open an existing file and returns a writable FileEntry on success.
+         *    Calls using this type will fail with a runtime error if the application doesn't have the
+         *    'write' permission under 'fileSystem'.
+         * **saveFile**
+         *  - Prompts the user to open an existing file or a new file and returns a writable FileEntry
+         *    on success. Calls using this type will fail with a runtime error if the application doesn't
+         *    have the 'write' permission under 'fileSystem'.
+         * **openDirectory**
+         *  - Prompts the user to open a directory and returns a DirectoryEntry on success. Calls using
+         *    this type will fail with a runtime error if the application doesn't have the 'directory'
+         *    permission under 'fileSystem'. If the application has the 'write' permission under
+         *    'fileSystem', the returned DirectoryEntry will be writable; otherwise it will be read-only.
+         *    New in Chrome 31.
+         * @enum
+         */
+        const ChooseEntryType: {
+            OPEN_FILE: 'openFile',
+            OPEN_WRITABLE_FILE: 'openWritableFile',
+            SAVE_FILE: 'saveFile',
+            OPEN_DIRECTORY: 'openDirectory'
+        };
         interface AcceptOptions {
+            /**
+             * This is the optional text description for this option.
+             * If not present, a description will be automatically generated;
+             * typically containing an expanded list of valid extensions (e.g. 'text/html' may expand to '*.html, *.htm').
+             */
             description?: string;
+            /**
+             * Mime-types to accept, e.g. 'image/jpeg' or 'audio/*'. One of mimeTypess must contain at least one valid element.
+             */
             mimeTypes?: string[];
+            /**
+             * Extensions to accept, e.g. 'jpg', 'gif', 'crx'.
+             */
             extensions?: string[];
         }
 
-        interface ChooseEntryOptions {
-            type?: string;
+        interface ChooseEntryOptionsBase {
+            /**
+             * Type of the prompt to show.
+             * @default 'openFile'
+             * @see ChooseEntryType
+             */
+            // type?: ToStringLiteral<typeof ChooseEntryType>;
+
+            /**
+             * The suggested file name that will be presented to the user as the default name to read or write.
+             */
             suggestedName?: string;
+
+            /**
+             * The optional list of accept options for this file opener.
+             * Each option will be presented as a unique group to the end-user.
+             */
             accepts?: AcceptOptions[];
+
+            /**
+             * Whether to accept all file types, in addition to the options specified in the accepts argument.
+             * If the accepts field is unset or contains no valid entries, this will always be reset to true.
+             * @default true
+             */
             acceptsAllTypes?: boolean;
-            acceptsMultiple?: boolean;
+        }
+        interface ChooseSaveFileEntryOptions extends ChooseEntryOptionsBase {
+            type: 'saveFile';
+        }
+        interface ChooseFileEntryOptions extends ChooseEntryOptionsBase {
+            type: 'openFile' | 'openWritableFile';
+            /**
+             * Whether to accept multiple files. This is only supported for openFile and openWritableFile.
+             * The callback to chooseEntry will be called with a list of entries if this is set to true.
+             * Otherwise it will be called with a single Entry.
+             * @default false
+             * @since Chrome 30.
+             */
+            acceptsMultiple?: false;
+        }
+        interface ChooseMultipleFilesEntryOptions extends ChooseEntryOptionsBase {
+            type: 'openFile' | 'openWritableFile';
+
+            /**
+             * Whether to accept multiple files. This is only supported for openFile and openWritableFile.
+             * The callback to chooseEntry will be called with a list of entries if this is set to true.
+             * Otherwise it will be called with a single Entry.
+             * @default false
+             * @since Chrome 30.
+             */
+            acceptsMultiple: true;
+        }
+        interface ChooseDirectoryEntryOptions extends ChooseEntryOptionsBase {
+            type: 'openDirectory';
+        }
+        type ChooseEntryOptions = ChooseFileEntryOptions | ChooseSaveFileEntryOptions | ChooseMultipleFilesEntryOptions | ChooseDirectoryEntryOptions | ChooseEntryOptionsBase;
+
+        /**
+         * @since Chrome 44.
+         */
+        interface Volume {
+            /** The ID of the requested volume. */
+            volumeId: string;
+            /**
+             * Whether the requested file system should be writable. The default is read-only.
+             * @default false
+             **/
+            writable?: boolean;
         }
 
-        export function getDisplayPath(entry: Entry, callback: (displayPath: string) => void): void;
-        export function getWritableEntry(entry: Entry, callback: (entry: Entry) => void): void;
-        export function isWritableEntry(entry: Entry, callback: (isWritable: boolean) => void): void;
-        export function chooseEntry(callback: (entry: Entry) => void): void;
-        export function chooseEntry(callback: (fileEntries: FileEntry[]) => void): void;
-        export function chooseEntry(options: ChooseEntryOptions, callback: (entry: Entry) => void): void;
-        export function chooseEntry(options: ChooseEntryOptions, callback: (fileEntries: FileEntry[]) => void): void;
-        export function restoreEntry(id: string, callback: (entry: Entry) => void): void;
-        export function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
-        export function retainEntry(entry: Entry): string;
+        /** @private */
+        type FileEntryCallback<
+            T extends ChooseEntryOptions,
+            E = T extends ChooseFileEntryOptions ? FileEntry :
+            T extends ChooseMultipleFilesEntryOptions ? FileEntry[] :
+            T extends ChooseDirectoryEntryOptions ? DirectoryEntry :
+            FileEntry> = (selectedEntries: E) => void;
+
+        /**
+         * Get the display path of an Entry object.
+         * The display path is based on the full path of the file or directory on the local file system, but may be made more readable for display purposes.
+         */
+        function getDisplayPath(entry: FileEntry | DirectoryEntry, callback: (displayPath: string) => void): void;
+        /**
+         * Get a writable Entry from another Entry. This call will fail with a runtime error if the application does not have the 'write' permission under 'fileSystem'.
+         * If entry is a DirectoryEntry, this call will fail if the application does not have the 'directory' permission under 'fileSystem'.
+         */
+        function getWritableEntry<T extends FileEntry | DirectoryEntry>(entry: T, callback: (entry: T) => void): void;
+        /** Gets whether this Entry is writable or not. */
+        function isWritableEntry(entry: FileEntry | DirectoryEntry, callback: (isWritable: boolean) => void): void;
+        /** Ask the user to choose a file or directory. */
+        function chooseEntry(callback: FileEntryCallback<ChooseFileEntryOptions>): void;
+        /** Ask the user to choose a file or directory. */
+        function chooseEntry(options: ChooseEntryOptionsBase, callback: FileEntryCallback<ChooseEntryOptionsBase>): void;
+        function chooseEntry(options: ChooseFileEntryOptions, callback: FileEntryCallback<ChooseFileEntryOptions>): void;
+        function chooseEntry(options: ChooseSaveFileEntryOptions, callback: FileEntryCallback<ChooseSaveFileEntryOptions>): void;
+        function chooseEntry(options: ChooseMultipleFilesEntryOptions, callback: FileEntryCallback<ChooseFileEntryOptions>): void;
+        function chooseEntry(options: ChooseDirectoryEntryOptions, callback: FileEntryCallback<ChooseDirectoryEntryOptions>): void;
+        /** Returns the file entry with the given id if it can be restored. This call will fail with a runtime error otherwise. */
+        function restoreEntry(id: string, callback: (entry: FileEntry) => void): void;
+        /**
+         * Returns whether the app has permission to restore the entry with the given id.
+         * @since Chrome 29.
+         **/
+        function isRestorable(id: string, callback: (isRestorable: boolean) => void): void;
+        /**
+         * Returns an id that can be passed to restoreEntry to regain access to a given file entry.
+         * Only the 500 most recently used entries are retained, where calls to retainEntry and restoreEntry count as use.
+         * If the app has the 'retainEntries' permission under 'fileSystem', entries are retained indefinitely.
+         * Otherwise, entries are retained only while the app is running and across restarts.
+         * @since Chrome 29.
+         * */
+        function retainEntry(entry: FileEntry | DirectoryEntry): string;
+        /**
+         * @requires(Kiosk) Kiosk mode only
+         * @requires Permissions: The writable option requires the 'fileSystem': {'write'} permission in the manifest.
+         * Requests access to a file system for a volume represented by options.volumeId.
+         * If options.writable is set to true, then the file system will be writable.
+         * Otherwise, it will be read-only.
+         * For manual-launch kiosk mode, a confirmation dialog will be shown on top of the active app window.
+         * In case of an error, fileSystem will be undefined, and chrome.runtime.lastError will be set.
+         * @since Chrome 44.
+         */
+        function requestFileSystem(options: Volume, callback: (fileSystem: FileSystem) => void): void;
+        /**
+         * @requires(Kiosk) Chrome OS Kiosk mode only
+         * @requires Permissions: The 'fileSystem': {'requestFileSystem'} manifest permission is required.
+         * Returns a list of volumes available for requestFileSystem().
+         * Available to kiosk apps running in the kiosk session only.
+         * In case of an error, volumes will be undefined, and chrome.runtime.lastError will be set.
+         * @since Chrome 44.
+         */
+        function getVolumeList(callback: (volumes: Volume[]) => void): void;
+        /**
+         * Called when a list of available volumes is changed.
+         * @since Chrome 44.
+         */
+        const onVolumeListChanged: chrome.events.Event<(object: Volume[]) => void>;
     }
+    // #endregion
 
-
-    ////////////////////
-    // File System Provider
-    ////////////////////
+    // #region chrome.fileSystemProvider
+    //////////////////////////
+    // File System Provider //
+    //////////////////////////
     /**
-     * Use the chrome.fileSystemProvider API to create file systems, that can be accessible from the file manager on Chrome OS.
-     * Availability: Since Chrome 40.
-     * Permissions:  "fileSystemProvider"
-     * Important: This API works only on Chrome OS.
+     * Use the chrome.fileSystemProvider API to create file systems,
+     * that can be accessible from the file manager on Chrome OS.
+     * @since Chrome 40.
+     * @requires Permissions: 'fileSystemProvider'
+     * @requires(CrOS) This API works only on Chrome OS.
+     * @requires Manifest:
+     * Requires an section in addition to the permission.
+     * The file_system_provider section must be declared as follows:
+     * **configurable (boolean)** - optional
+     * Whether configuring via onConfigureRequested is supported. By default: false.
+     * **multiple_mounts (boolean)** - optional
+     * Whether multiple (more than one) mounted file systems are supported. By default: false.
+     * **watchable (boolean)** - optional
+     * Whether setting watchers and notifying about changes is supported. By default: false.
+     * **source (type of 'file', 'device', or 'network') - required**
+     * Source of data for mounted file systems.
+     * @description
+     * Files app uses above information in order to render related UI elements approprietly.
+     * For example, if configurable is set to true, then a menu item for configuring volumes
+     * will be rendered. Similarly, if multiple_mounts is set to true, then Files app will
+     * allow to add more than one mount points from the UI. If watchable is false, then a
+     * refresh button will be rendered. Note, that if possible you should add support for
+     * watchers, so changes on the file system can be reflected immediately and automatically.
+     * @see[More information]{@link https://developer.chrome.com/apps/fileSystemProvider}
      */
     namespace fileSystemProvider {
-        interface OpenedFileInfo {
-            /** A request ID to be be used by consecutive read/write and close requests. */
-            openRequestId: number;
-            /** The path of the opened file. */
-            filePath: string;
-            /** Whether the file was opened for reading or writing. */
-            mode: string;
-        }
-
-        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. */
-            recursive: boolean;
-            /** Optional. Tag used by the last notification for the watcher.  */
-            lastTag?: string;
-        }
+        /**
+         * Error codes used by providing extensions in response to requests
+         * as well as in case of errors when calling methods of the API.
+         * For success, 'OK' must be used.
+         * */
+        const ProviderError: {
+            'OK': 'OK',
+            'FAILED': 'FAILED',
+            'IN_USE': 'IN_USE',
+            'EXISTS': 'EXISTS',
+            'NOT_FOUND': 'NOT_FOUND',
+            'ACCESS_DENIED': 'ACCESS_DENIED',
+            'TOO_MANY_OPENED': 'TOO_MANY_OPENED',
+            'NO_MEMORY': 'NO_MEMORY',
+            'NO_SPACE': 'NO_SPACE',
+            'NOT_A_DIRECTORY': 'NOT_A_DIRECTORY',
+            'INVALID_OPERATION': 'INVALID_OPERATION',
+            'SECURITY': 'SECURITY',
+            'ABORT': 'ABORT',
+            'NOT_A_FILE': 'NOT_A_FILE',
+            'NOT_EMPTY': 'NOT_EMPTY',
+            'INVALID_URL': 'INVALID_URL',
+            'IO': 'IO'
+        };
+        /** Mode of opening a file. Used by onOpenFileRequested. */
+        const OpenFileMode: {
+            'READ': 'READ',
+            'WRITE': 'WRITE'
+        };
+        /** Type of a change detected on the observed directory. */
+        const ChangeType: {
+            'CHANGED': 'CHANGED',
+            'DELETED': 'DELETED'
+        };
+        /**
+         * List of common actions. 'SHARE' is for sharing files with others.
+         * 'SAVE_FOR_OFFLINE' for pinning (saving for offline access).
+         * 'OFFLINE_NOT_NECESSARY' for notifying that the file doesn't
+         * need to be stored for offline access anymore.
+         * Used by onGetActionsRequested and onExecuteActionRequested.
+         */
+        const CommonActionId: {
+            'SAVE_FOR_OFFLINE': 'SAVE_FOR_OFFLINE',
+            'OFFLINE_NOT_NECESSARY': 'OFFLINE_NOT_NECESSARY',
+            'SHARE': 'SHARE'
+        };
 
         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. */
-            name: string;
-            /** File size in bytes. */
-            size: number;
+            /** True if it is a directory. Must be provided if requested in options */
+            isDirectory?: boolean;
+            /**
+             * Name of this entry (not full path name).
+             * Must not contain '/'.
+             * For root it must be empty.
+             * Must be provided if requested in options.
+             **/
+            name?: string;
+            /** File size in bytes. Must be provided if requested in options. */
+            size?: double;
             /** The last modified time of this entry. */
-            modificationTime: Date;
-            /** Optional. Mime type for the entry.  */
+            modificationTime?: Date;
+            /** Mime type for the entry.  */
             mimeType?: string;
-            /** Optional. Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size. Optional, but can be provided only when explicitly requested by the onGetMetadataRequested event.  */
+            /**
+             * Thumbnail image as a data URI in either PNG, JPEG or WEBP format, at most 32 KB in size.
+             * Optional, but can be provided only when explicitly requested
+             * by the onGetMetadataRequested event.
+             */
             thumbnail?: string;
         }
 
         interface FileSystemInfo {
             /** The identifier of the file system. */
             fileSystemId: string;
+
             /** A human-readable name for the file system. */
             displayName: string;
-            /** Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files). */
+
+            /**
+             * Whether the file system supports operations which may
+             * change contents of the file system (such as creating, deleting or writing to files).
+             */
             writable: boolean;
+
             /**
              * The maximum number of files that can be opened at once. If 0, then not limited.
-             * @since Since Chrome 42.
+             * @since Chrome 42.
              */
-            openedFilesLimit: number;
+            openedFilesLimit: integer;
+
             /**
              * List of currently opened files.
-             * @since Since Chrome 42.
+             * @since Chrome 42.
              */
             openedFiles: OpenedFileInfo[];
+
             /**
-             * Optional.
-              * Whether the file system supports the tag field for observing directories.
-             * @since Since Chrome 45. Warning: this is the current Beta channel.
+             * Whether the file system supports the tag field for observing directories.
+             * @since Chrome 45.
              */
             supportsNotifyTag?: boolean;
+
             /**
              * List of watchers.
-             * @since Since Chrome 45. Warning: this is the current Beta channel.
+             * @since Chrome 45.
              */
             watchers: FileWatchersInfo[];
         }
 
-        /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+        interface OpenedFileInfo {
+            /** A request ID to be be used by consecutive read/write and close requests. */
+            openRequestId: integer;
+            /** The path of the opened file. */
+            filePath: string;
+            /**
+             * Whether the file was opened for reading or writing.
+             * @see OpenFileMode
+             */
+            mode: ToStringLiteral<typeof OpenFileMode>;
+        }
+
+        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.
+             */
+            recursive: boolean;
+
+            /** Tag used by the last notification for the watcher.  */
+            lastTag?: string;
+        }
+
+        /** @since Chrome 45. */
         interface GetActionsRequestedOptions {
             /** The identifier of the file system related to this operation. */
             fileSystemId: string;
             /** The unique identifier of this request. */
-            requestId: number;
+            requestId: integer;
             /** The path of the entry to return the list of actions for. */
             entryPath: string;
         }
 
-        /** @since Since Chrome 45. Warning: this is the current Beta channel. */
         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.  */
+            /**
+             * The identifier of the action.
+             * Any string or CommonActionId for common actions.
+             * @see CommonActionId
+             **/
+            id: ToStringLiteral<typeof CommonActionId> | string;
+            /** The title of the action. It may be ignored for common actions.  */
             title?: string;
         }
 
-        /** @since Since Chrome 45. Warning: this is the current Beta channel. */
+        /** @since Chrome 45. */
         interface ExecuteActionRequestedOptions {
             /** The identifier of the file system related to this operation. */
             fileSystemId: string;
             /** The unique identifier of this request. */
-            requestId: number;
+            requestId: integer;
             /** The path of the entry to be used for the action. */
             entryPath: string;
             /** The identifier of the action to be executed. */
@@ -1276,20 +3612,27 @@ declare namespace chrome {
             fileSystemId: string;
             /** A human-readable name for the file system. */
             displayName: string;
-            /** Optional. Whether the file system supports operations which may change contents of the file system (such as creating, deleting or writing to files).  */
+            /**
+             * Whether the file system supports operations which may change contents
+             * of the file system (such as creating, deleting or writing to files).
+             */
             writable?: boolean;
             /**
-             * Optional.
-              * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
-             * @since Since Chrome 41.
+             * The maximum number of files that can be opened at once. If not specified, or 0, then not limited.
+             * @since Chrome 41.
              */
-            openedFilesLimit?: number;
+            openedFilesLimit?: integer;
             /**
-             * Optional.
-              * Whether the file system supports the tag field for observed directories.
-             * @since Since Chrome 45. Warning: this is the current Beta channel.
+             * Whether the file system supports the tag field for observed directories.
+             * @since Chrome 45.
              */
             supportsNotifyTag?: boolean;
+            /**
+             * Whether the framework should resume the file system at the next sign-in session.
+             * @default true
+             * @since Chrome 64.
+             */
+            persistent?: boolean;
         }
 
         interface UnmountOptions {
@@ -1300,8 +3643,11 @@ declare namespace chrome {
         interface NotificationChange {
             /** The path of the changed entry. */
             entryPath: string;
-            /** The type of the change which happened to the entry. */
-            changeType: string;
+            /**
+             * The type of the change which happened to the entry.
+             * @see ChangeType
+             */
+            changeType: ToStringLiteral<typeof ChangeType>;
         }
 
         interface NotificationOptions {
@@ -1311,242 +3657,576 @@ declare namespace chrome {
             observedPath: string;
             /** Mode of the observed entry. */
             recursive: boolean;
-            /** The type of the change which happened to the observed entry. If it is DELETED, then the observed entry will be automatically removed from the list of observed entries. */
-            changeType: string;
-            /** Optional. List of changes to entries within the observed directory (including the entry itself)  */
+            /**
+             * The type of the change which happened to the observed entry.
+             * If it is DELETED, then the observed entry will be automatically
+             * removed from the list of observed entries.
+             * @see ChangeType
+             */
+            changeType: ToStringLiteral<typeof ChangeType>;
+            /** List of changes to entries within the observed directory (including the entry itself)  */
             changes?: NotificationChange[];
-            /** Optional. Tag for the notification. Required if the file system was mounted with the supportsNotifyTag option. Note, that this flag is necessary to provide notifications about changes which changed even when the system was shutdown.  */
+            /**
+             * Tag for the notification.
+             * Required if the file system was mounted with the supportsNotifyTag option.
+             * Note, that this flag is necessary to provide notifications about changes
+             * which changed even when the system was shutdown.
+             */
             tag?: string;
         }
+        /**
+         * Internal interfaces, not for use
+         * @private
+         * @internal
+         */
+        namespace _internal_ {
+            /**
+             * @private
+             * @internal
+             */
+            interface RequestedEventOptions {
+                /** The identifier of the file system related to this operation. */
+                fileSystemId: string;
+                /** The unique identifier of this request. */
+                requestId: integer;
+            }
 
-        interface RequestedEventOptions {
-            /** The identifier of the file system related to this operation. */
-            fileSystemId: string;
-            /** The unique identifier of this request. */
-            requestId: number;
+            /**
+             * @private
+             * @internal
+             */
+            interface EntryPathRequestedEventOptions extends RequestedEventOptions {
+                /** The path of the entry to which this operation is related to. */
+                entryPath: string;
+            }
+
+            /**
+             * @private
+             * @internal
+             */
+            interface FilePathRequestedEventOptions extends RequestedEventOptions {
+                /** The path of the entry for the operation */
+                filePath: string;
+            }
         }
-
-        interface EntryPathRequestedEventOptions extends RequestedEventOptions {
-            /** The path of the entry to which this operation is related to. */
-            entryPath: string;
+        interface UnmountRequestedEventOptions extends _internal_.RequestedEventOptions {
         }
-
-        interface MetadataRequestedEventOptions extends EntryPathRequestedEventOptions {
-            /** Set to true if the thumbnail is requested. */
+        interface MetadataRequestedEventOptions extends _internal_.EntryPathRequestedEventOptions {
+            /**
+             * Set to true if is_directory value is requested
+             * @since Chrome 49.
+             */
+            isDirectory: boolean;
+            /**
+             * Set to true if is_directory value is requested.
+             * @since Chrome 49.
+             */
+            name: boolean;
+            /**
+             * Set to true if size value is requested.
+             * @since Chrome 49.
+             */
+            size: boolean;
+            /**
+             * Set to true if modificationTime value is requested
+             * @since Chrome 49.
+             */
+            modificationTime: boolean;
+            /**
+             * Set to true if mimeType value is requested.
+             * @since Chrome 49.
+             */
+            mimeType: boolean;
+            /**
+             * Set to true if the thumbnail is requested.
+             */
             thumbnail: boolean;
         }
-
-        interface DirectoryPathRequestedEventOptions extends RequestedEventOptions {
+        interface GetActionsRequestedEventOptions extends _internal_.RequestedEventOptions {
+            /** The path of the entry to which this operation is related to. */
+            entryPaths: string[];
+        }
+        interface ReadDirectoryRequestedEventOptions extends _internal_.RequestedEventOptions {
             /** The path of the directory which is to be operated on. */
             directoryPath: string;
+            /**
+             * Set to true if is_directory value is requested
+             * @since Chrome 49.
+             */
+            isDirectory: boolean;
+            /**
+             * Set to true if is_directory value is requested.
+             * @since Chrome 49.
+             */
+            name: boolean;
+            /**
+             * Set to true if size value is requested.
+             * @since Chrome 49.
+             */
+            size: boolean;
+            /**
+             * Set to true if modificationTime value is requested
+             * @since Chrome 49.
+             */
+            modificationTime: boolean;
+            /**
+             * Set to true if mimeType value is requested.
+             * @since Chrome 49.
+             */
+            mimeType: boolean;
+            /**
+             * Set to true if the thumbnail is requested.
+             */
+            thumbnail: boolean;
         }
-
-        interface FilePathRequestedEventOptions extends RequestedEventOptions {
-            /** The path of the entry for the operation */
-            filePath: string;
+        interface OpenFileRequestedEventOptions extends _internal_.FilePathRequestedEventOptions {
+            /**
+             * Whether the file will be used for reading or writing.
+             * @see ChangeType
+             */
+            mode: ToStringLiteral<typeof OpenFileMode>;
         }
-
-        interface OpenFileRequestedEventOptions extends FilePathRequestedEventOptions {
-            /** Whether the file will be used for reading or writing. */
-            mode: string;
-        }
-
-        interface OpenedFileRequestedEventOptions extends RequestedEventOptions {
+        interface CloseFileRequestedEventOptions extends _internal_.RequestedEventOptions {
             /** A request ID used to open the file. */
-            openRequestId: number;
+            openRequestId: integer;
         }
-
-        interface OpenedFileOffsetRequestedEventOptions extends OpenedFileRequestedEventOptions {
+        interface ReadFileRequestedEventOptions extends _internal_.RequestedEventOptions {
+            /** A request ID used to open the file. */
+            openRequestId: integer;
             /** Position in the file (in bytes) to start reading from. */
-            offset: number;
+            offset: double;
             /** Number of bytes to be returned. */
-            length: number;
+            length: double;
         }
-
-        interface DirectoryPathRecursiveRequestedEventOptions extends DirectoryPathRequestedEventOptions {
+        interface CreateDirectoryRequestedEventOptions extends _internal_.RequestedEventOptions {
+            /** The path of the directory which is to be operated on. */
+            directoryPath: string;
             /** Whether the operation is recursive (for directories only). */
             recursive: boolean;
         }
-
-        interface EntryPathRecursiveRequestedEventOptions extends EntryPathRequestedEventOptions {
+        interface DeleteEntryRequestedEventOptions extends _internal_.EntryPathRequestedEventOptions {
             /** Whether the operation is recursive (for directories only). */
             recursive: boolean;
         }
-
-        interface SourceTargetPathRequestedEventOptions extends RequestedEventOptions {
+        interface CreateFileRequestedEventOptions extends _internal_.FilePathRequestedEventOptions {
+        }
+        interface CopyEntryRequestedEventOptions extends _internal_.RequestedEventOptions {
             /** The source path for the operation. */
             sourcePath: string;
             /** The destination path for the operation. */
             targetPath: string;
         }
-
-        interface FilePathLengthRequestedEventOptions extends FilePathRequestedEventOptions {
-            /** Number of bytes to be retained after the operation completes. */
-            length: number;
+        interface MoveEntryRequestedEventOptions extends CopyEntryRequestedEventOptions {
         }
-
-        interface OpenedFileIoRequestedEventOptions extends OpenedFileRequestedEventOptions {
+        interface TruncateRequestedEventOptions extends _internal_.FilePathRequestedEventOptions {
+            /** Number of bytes to be retained after the operation completes. */
+            length: double;
+        }
+        interface WriteFileRequestedEventOptions extends _internal_.RequestedEventOptions {
+            /** A request ID used to open the file. */
+            openRequestId: integer;
             /** Position in the file (in bytes) to start operating from. */
-            offset: number;
+            offset: integer;
             /** Buffer of bytes to be operated on the file. */
             data: ArrayBuffer;
         }
-
-        interface OperationRequestedEventOptions extends RequestedEventOptions {
+        interface AbortRequestedEventOptions extends _internal_.RequestedEventOptions {
             /** An ID of the request to which this operation is related. */
-            operationRequestId: number;
+            operationRequestId: integer;
+        }
+        interface ConfigureRequestedEventOptions extends _internal_.RequestedEventOptions {
+        }
+        interface WatcherRequestedEventOptions extends _internal_.EntryPathRequestedEventOptions {
+            /**
+             * Mode of the watcher.
+             * Whether observing should include all child entries recursively.
+             * It can be true for directories only.
+             */
+            recursive: boolean;
+        }
+        interface ExecuteActionRequestedEventOptions extends GetActionsRequestedEventOptions {
+            /** The identifier of the action to be executed. */
+            actionId: string;
         }
 
-        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> { }
-
-        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> { }
-
-        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> { }
-
-        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> { }
-
-        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> { }
-
-        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> { }
-
-        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> { }
+        ///\/\/|\/\/\\\
+        /// METHODS \\\
+        ///\/\/|\/\/\\\
 
         /**
-         * 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.
+         * Mounts a file system with the given fileSystemId and displayName.
+         * displayName will be shown in the left panel of the 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.
+         *
          * Depending on the type of the file system being mounted, the source option must be set appropriately.
+         *
          * In case of an error, runtime.lastError will be set with a corresponding error code.
+         *
          * @param callback A generic result callback to indicate success or failure.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
          */
-        export function mount(options: MountOptions, callback?: () => void): void;
+        function mount(options: MountOptions, callback?: () => void): void;
+
         /**
-         * Unmounts a file system with the given fileSystemId. It must be called after onUnmountRequested is invoked. Also, the providing extension can decide to perform unmounting if not requested (eg. in case of lost connection, or a file error).
+         * Unmounts a file system with the given fileSystemId.
+         * It must be called after onUnmountRequested is invoked.
+         * Also, the providing extension can decide to perform unmounting if not requested
+         * (eg. in case of lost connection, or a file error).
+         *
          * In case of an error, runtime.lastError will be set with a corresponding error code.
+         *
          * @param callback A generic result callback to indicate success or failure.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
          */
-        export function unmount(options: UnmountOptions, callback?: () => void): void;
+        function unmount(options: UnmountOptions, callback?: () => void): void;
+
         /**
-         * Returns all file systems mounted by the extension.
+         * Returns all file systems mounted by the app.
          * @param callback Callback to receive the result of getAll function.
-         * The callback parameter should be a function that looks like this:
-         * function(array of FileSystemInfo fileSystems) {...};
          */
-        export function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+        function getAll(callback: (fileSystems: FileSystemInfo[]) => void): void;
+
         /**
          * Returns information about a file system with the passed fileSystemId.
-         * @since Since Chrome 42.
+         * @since Chrome 42.
          * @param callback Callback to receive the result of get function.
-         * The callback parameter should be a function that looks like this:
-         * function(FileSystemInfo fileSystem) {...};
          */
-        export function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+        function get(fileSystemId: string, callback: (fileSystem: FileSystemInfo) => void): void;
+
         /**
-         * Notifies about changes in the watched directory at observedPath in recursive mode. If the file system is mounted with supportsNofityTag, then tag must be provided, and all changes since the last notification always reported, even if the system was shutdown. The last tag can be obtained with getAll.
-         * To use, the file_system_provider.notify manifest option must be set to true.
-         * Value of tag can be any string which is unique per call, so it's possible to identify the last registered notification. Eg. if the providing extension starts after a reboot, and the last registered notification's tag is equal to "123", then it should call notify for all changes which happened since the change tagged as "123". It cannot be an empty string.
-         * Not all providers are able to provide a tag, but if the file system has a changelog, then the tag can be eg. a change number, or a revision number.
-         * Note that if a parent directory is removed, then all descendant entries are also removed, and if they are watched, then the API must be notified about the fact. Also, if a directory is renamed, then all descendant entries are in fact removed, as there is no entry under their original paths anymore.
+         * @requires Manifest: 'file_system_provider.notify' = true
+         * @description
+         * Notifies about changes in the watched directory at observedPath in recursive mode.
+         * If the file system is mounted with supportsNofityTag, then tag must be provided,
+         * and all changes since the last notification always reported, even if the system was shutdown.
+         * The last tag can be obtained with getAll.
+         *
+         * Value of tag can be any string which is unique per call,
+         * so it's possible to identify the last registered notification.
+         * Eg. if the providing app starts after a reboot,
+         * and the last registered notification's tag is equal to '123',
+         * then it should call notify for all changes which happened since
+         * the change tagged as '123'. It cannot be an empty string.
+         *
+         * Not all providers are able to provide a tag, but if the file system has a changelog,
+         * then the tag can be eg. a change number, or a revision number.
+         *
+         * Note that if a parent directory is removed, then all descendant entries are also removed,
+         * and if they are watched, then the API must be notified about the fact.
+         * Also, if a directory is renamed, then all descendant entries are in fact removed,
+         * as there is no entry under their original paths anymore.
+         *
          * In case of an error, runtime.lastError will be set will a corresponding error code.
+         *
          * @param callback A generic result callback to indicate success or failure.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
+         * @since Chrome 45.
          */
-        export function notify(options: NotificationOptions, callback: () => void): void;
+        function notify(options: NotificationOptions, callback: () => void): void;
+
+        ///\/\/\/\/\\\
+        /// EVENTS \\\
+        ///\/\/\/\/\\\
 
-        /** 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.  */
-        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. */
-        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. */
-        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. */
-        export var onOpenFileRequested: OpenFileRequestedEvent;
-        /** Raised when opening a file previously opened with openRequestId is requested to be closed. */
-        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. */
-        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. */
-        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. */
-        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. */
-        export var onCreateFileRequested: FilePathRequestedEvent;
-        /** Raised when copying an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-        export var onCopyEntryRequested: SourceTargetPathRequestedEvent;
-        /** Raised when moving an entry (recursively if a directory) is requested. If an error occurs, then errorCallback must be called. */
-        export var onMoveEntryRequested: SourceTargetPathRequestedEvent;
-        /** Raised when truncating a file to a desired length is requested. If an error occurs, then errorCallback must be called. */
-        export var onTruncateRequested: FilePathLengthRequestedEvent;
-        /** Raised when writing contents to a file opened previously with openRequestId is requested. */
-        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. */
-        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.
+         * 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.
+         * @see ProviderError
          */
-        export var onConfigureRequested: RequestedEvent;
+        const onUnmountRequested: chrome.events.Event<(
+            options: UnmountRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
         /**
-         * 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.
+         * 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.
+         * @see ProviderError
          */
-        export var onMountRequested: OptionlessRequestedEvent;
+        const onGetMetadataRequested: chrome.events.Event<(
+            options: MetadataRequestedEventOptions,
+            successCallback: (metadata: EntryMetadata) => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
         /**
-         * 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.
-         */
-        export var onAddWatcherRequested: EntryPathRecursiveRequestedEvent;
+         * Raised when a list of actions for a set of files or directories at entryPaths is requested.
+         * All of the returned actions must be applicable to each entry.
+         * If there are no such actions, an empty array should be returned.
+         * The actions must be returned with the successCallback call.
+         * In case of an error, errorCallback must be called.
+         * @see ProviderError
+         * @since Chrome 48.
+         **/
+        const onGetActionsRequested: chrome.events.Event<(
+            options: GetActionsRequestedEventOptions,
+            successCallback: (actions: Action[]) => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
         /**
-         * 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.
+         * 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.
+         * @see ProviderError
          */
-        export var onRemoveWatcherRequested: EntryPathRecursiveRequestedEvent;
+        const onReadDirectoryRequested: chrome.events.Event<(
+            options: ReadDirectoryRequestedEventOptions,
+            successCallback: (entries: EntryMetadata[], hasMore: boolean) => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * 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.
+         * @see ProviderError
+         */
+        const onOpenFileRequested: chrome.events.Event<(
+            options: OpenFileRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when opening a file previously opened
+         * with openRequestId is requested to be closed.
+         * @see ProviderError
+         */
+        const onCloseFileRequested: chrome.events.Event<(
+            options: CloseFileRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>
+
+        /**
+         * 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.
+         * @see ProviderError
+         */
+        const onReadFileRequested: chrome.events.Event<(
+            options: ReadFileRequestedEventOptions,
+            successCallback: (data: ArrayBuffer, hasMore: boolean) => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * 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.
+         * @see ProviderError
+         */
+        const onCreateDirectoryRequested: chrome.events.Event<(
+            options: CreateDirectoryRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * 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.
+         * @see ProviderError
+         */
+        const onDeleteEntryRequested: chrome.events.Event<(
+            options: DeleteEntryRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when creating a file is requested.
+         * If the file already exists, then errorCallback must be called with the 'EXISTS' error code.
+         * @see ProviderError
+         */
+        const onCreateFileRequested: chrome.events.Event<(
+            options: CreateFileRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when copying an entry (recursively if a directory) is requested.
+         * If an error occurs, then errorCallback must be called.
+         * @see ProviderError
+         */
+        const onCopyEntryRequested: chrome.events.Event<(
+            options: CopyEntryRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when moving an entry (recursively if a directory) is requested.
+         * If an error occurs, then errorCallback must be called.
+         * @see ProviderError
+         */
+        const onMoveEntryRequested: chrome.events.Event<(
+            options: MoveEntryRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when truncating a file to a desired length is requested.
+         * If an error occurs, then errorCallback must be called.
+         * @see ProviderError
+         */
+        const onTruncateRequested: chrome.events.Event<(
+            options: TruncateRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when writing contents to a file opened previously with openRequestId is requested.
+         * @see ProviderError
+         */
+        const onWriteFileRequested: chrome.events.Event<(
+            options: WriteFileRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * 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.
+         * @see ProviderError
+         */
+        const onAbortRequested: chrome.events.Event<(
+            options: AbortRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * 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.
+         * @requires Manifest: 'file_system_provider.configurable' = true
+         * @see ProviderError
+         * @since Chrome 44.
+         */
+        const onConfigureRequested: chrome.events.Event<(
+            options: ConfigureRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when showing a dialog for mounting a new file system is requested.
+         * If the 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.
+         * @requires Manifest (for multiple mounts): 'file_system_provider.multiple_mounts' = true
+         * @see ProviderError
+         * @since Chrome 44.
+         */
+        const onMountRequested: chrome.events.Event<(
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when setting a new directory watcher is requested.
+         * If an error occurs, then errorCallback must be called.
+         * @see ProviderError
+         * @since Chrome 45.
+         */
+        const onAddWatcherRequested: chrome.events.Event<(
+            options: WatcherRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when the watcher should be removed.
+         * If an error occurs, then errorCallback must be called.
+         * @see ProviderError
+         * @since Chrome 45.
+         */
+        const onRemoveWatcherRequested: chrome.events.Event<(
+            options: WatcherRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
+
+        /**
+         * Raised when executing an action for a set of files or directories is requested.
+         * After the action is completed, successCallback must be called.
+         * On error, errorCallback must be called.
+         * @see ProviderError
+         * @since Chrome 48.
+         */
+        const onExecuteActionRequested: chrome.events.Event<(
+            options: ExecuteActionRequestedEventOptions,
+            successCallback: () => void,
+            errorCallback: (error: ToStringLiteral<typeof ProviderError>) => void
+        ) => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // Google Cloud Messaging
-    ////////////////////
+    // #region chrome.gcm
+    ////////////////////////////
+    // Google Cloud Messaging //
+    ////////////////////////////
     /**
-     * Use chrome.gcm to enable apps and extensions to send and receive messages through the Google Cloud Messaging Service.
-     * Availability: Since Chrome 35.
-     * Permissions:  "gcm"
+     * Use chrome.gcm to enable apps to send and receive
+     * messages through the Google Cloud Messaging Service.
+     * @deprecated
+     * As of April 10, 2018, Google has deprecated GCM.
+     * The GCM server and client APIs are deprecated and will be removed as soon as April 11, 2019.
+     * Migrate GCM apps to Firebase Cloud Messaging (FCM),
+     * which inherits the reliable and scalable GCM infrastructure,
+     * plus many new features. See the migration guide to learn more.
+     * @see[Migration guide]{@link https://developers.google.com/cloud-messaging/android/android-migrate-fcm}
+     * @see[GCM Imlementation guide]{@link https://developers.google.com/cloud-messaging/chrome/client}
+     * @since Chrome 35.
+     * @requires Permissions: 'gcm'
      */
     namespace gcm {
+        /**
+         * The maximum size (in bytes) of all key/value pairs in a message.
+         * @default 4096
+         */
+        const MAX_MESSAGE_SIZE: integer;
+
+        type DisallowedKeys = 'collapse_key' | 'goog' | 'goog.' | 'GOOG' | 'GOOG.' | 'google' | 'GOOGLE';
+        type IGCMDataSend = Record<Exclude<DisallowedKeys, string>, any>;
+        type IGCMDataReceive = Record<string, any>;
+
         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. */
             messageId: string;
-            /** Optional. Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
-            timeToLive?: number;
-            /** Message data to send to the server. Case-insensitive goog. and google, as well as case-sensitive collapse_key are disallowed as key prefixes. Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE. */
-            data: Object;
+            /** Time-to-live of the message in seconds. If it is not possible to send the message within that time, an onSendError event will be raised. A time-to-live of 0 indicates that the message should be sent immediately or fail if it's not possible. The maximum and a default value of time-to-live is 86400 seconds (1 day). */
+            timeToLive?: integer;
+            /**
+             * Message data to send to the server.
+             *
+             * Case-insensitive goog. and google,
+             * as well as case-sensitive collapse_key
+             * are disallowed as key prefixes.
+             *
+             * Sum of all key/value pairs should not exceed gcm.MAX_MESSAGE_SIZE.
+             **/
+            data: IGCMDataSend;
         }
 
         interface IncomingMessage {
             /** The message data. */
-            data: Object;
+            data: IGCMDataReceive;
             /**
              * Optional.
              * The sender who issued the message.
-             * @since Since Chrome 41.
+             * @since Chrome 41.
              */
             from?: string;
             /**
@@ -1559,21 +4239,12 @@ declare namespace chrome {
         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. */
+            /** The ID of the message with this error, if error is related to a specific message. */
             messageId?: string;
             /** Additional details related to the error, when available. */
             detail: Object;
         }
 
-        interface MessageReceptionEvent extends chrome.events.Event<(message: IncomingMessage) => void> { }
-
-        interface MessageDeletionEvent extends chrome.events.Event<() => void> { }
-
-        interface GcmErrorEvent extends chrome.events.Event<(error: GcmError) => void> { }
-
-        /** The maximum size (in bytes) of all key/value pairs in a message. */
-        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.
          * @param senderIds A list of server IDs that are allowed to send messages to the application. It should contain at least one and no more than 100 sender IDs.
@@ -1582,14 +4253,14 @@ declare namespace chrome {
          * function(string registrationId) {...};
          * Parameter registrationId: A registration ID assigned to the application by the GCM.
          */
-        export function register(senderIds: string[], callback: (registrationId: string) => void): void;
+        function register(senderIds: string[], callback: (registrationId: string) => void): void;
         /**
          * Unregisters the application from GCM.
          * @param callback A function called after the unregistration completes. Unregistration was successful if runtime.lastError is not set.
          * The callback parameter should be a function that looks like this:
          * function() {...};
          */
-        export function unregister(callback: () => void): void;
+        function unregister(callback: () => void): void;
         /**
          * Sends a message according to its contents.
          * @param message A message to send to the other party via GCM.
@@ -1598,44 +4269,442 @@ declare namespace chrome {
          * function(string messageId) {...};
          * Parameter messageId: The ID of the message that the callback was issued for.
          */
-        export function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
+        function send(message: OutgoingMessage, callback: (messageId: string) => void): void;
 
         /** Fired when a message is received through GCM. */
-        export var onMessage: MessageReceptionEvent;
+        const onMessage: chrome.events.Event<(message: IncomingMessage) => void>;
         /** 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. */
-        export var onMessagesDeleted: MessageDeletionEvent;
+        const onMessagesDeleted: chrome.events.Event<() => void>;
         /** Fired when it was not possible to send a message to the GCM server. */
-        export var onSendError: GcmErrorEvent;
+        const onSendError: chrome.events.Event<(error: GcmError) => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // HID
-    ////////////////////
+    // #region chrome.hid
+    /////////
+    // HID //
+    /////////
     /**
-     * Use the chrome.hid API to interact with connected HID devices. This API provides access to HID operations from within the context of an app. Using this API, apps can function as drivers for hardware devices. Errors generated by this API are reported by setting runtime.lastError and executing the function's regular callback. The callback's regular parameters will be undefined in this case.
-     * @since Chrome 38
+     * Use the chrome.hid API to interact with connected HID devices.
+     * This API provides access to HID operations from within the context of an app.
+     * Using this API, apps can function as drivers for hardware devices.
+     * Errors generated by this API are reported by setting runtime.lastError
+     * and executing the function's regular callback. The callback's regular
+     * parameters will be undefined in this case.
+     *
+     * @requires Permissions: 'hid'
+     * @since Chrome 38.
      */
     namespace hid {
-        /** NOT YET IMPLEMENTED */
-    }
+        interface Collection {
+            /** HID usage page identifier. */
+            usagePage: integer;
+            /** Page-defined usage identifier. */
+            usage: integer;
+            /** Report IDs which belong to the collection and to its children. */
+            reportIds: integer[];
+        }
+        interface HidDeviceInfo {
+            /** Opaque device ID. */
+            deviceId: integer;
+            /** Vendor ID. */
+            vendorId: integer;
+            /** Product ID. */
+            productId: integer;
+            /**
+             * The product name read from the device, if available.
+             * @since Chrome 46
+             * */
+            productName: string;
+            /**
+             * The serial number read from the device, if available.
+             * @since Chrome 46
+             */
+            serialNumber: string;
+            /**
+             * Top-level collections from this device's report descriptors.
+             */
+            collections: Collection[];
+            /** Top-level collection's maximum input report size. */
+            maxInputReportSize: integer;
+            /** Top-level collection's maximum output report size. */
+            maxOutputReportSize: integer;
+            /** Top-level collection's maximum feature report size. */
+            maxFeatureReportSize: integer;
+            /**
+             * Raw device report descriptor (not available on Windows).
+             * @since Chrome 42
+             * */
+            reportDescriptor: ArrayBuffer;
+        }
+        /** @since Chrome 39. */
+        interface DeviceFilter {
+            /** Device vendor ID. */
+            vendorId?: integer;
+            /** Device product ID, only checked only if the vendor ID matches. */
+            productId?: integer;
+            /** HID usage page identifier. */
+            usagePage?: integer;
+            /** HID usage identifier, checked only if the HID usage page matches. */
+            usage?: integer;
+        }
+        interface DeviceOptions {
+            /**
+             * Equivalent to setting DeviceFilter.vendorId.
+             * @deprecated Deprecated since Chrome 39
+             */
+            vendorId?: chrome.deprecated;
+            /**
+             * Equivalent to setting DeviceFilter.productId.
+             * @deprecated Deprecated since Chrome 39.
+             */
+            productId?: chrome.deprecated;
+            /**
+             * A device matching any given filter will be returned.
+             * An empty filter list will return all devices the app has permission for.
+             * @since Chrome 39
+             */
+            filters?: DeviceFilter[];
+        }
+        interface UserSelectedDevicePickerOptions {
+            /**
+             * Allow the user to select multiple devices.
+             */
+            multiple?: boolean;
+            /**
+             * Filter the list of devices presented to the user.
+             * If multiple filters are provided devices matching any filter will be displayed.
+             */
+            filters?: DeviceFilter[];
+        }
 
-    ////////////////////
-    // i18n
-    ////////////////////
+        /**
+         * Enumerate connected HID devices.
+         * @param options The properties to search for on target devices.
+         * @param callback
+         */
+        function getDevices(options: DeviceOptions, callback: (devices: HidDeviceInfo[]) => void): void;
+
+        /**
+         * @requires(dev) **Dev channel only!**
+         * @see[Learn more]{@link https://developer.chrome.com/apps/api_index#dev_apis}
+         * @description
+         * Presents a device picker to the user and returns
+         * HidDeviceInfo objects for the devices selected. If the user
+         * cancels the picker devices will be empty. A user gesture is
+         * required for the dialog to display. Without a user gesture,
+         * the callback will run as though the user cancelled. If multiple
+         * filters are provided devices matching any filter will be displayed.
+         * @param callback Invoked with a list of chosen Devices.
+         */
+        function getUserSelectedDevices(callback: (devices: HidDeviceInfo) => void): void;
+
+        /**
+         * @since Chrome 45.
+         * @requires(dev) **Dev channel only!**
+         * @see[Learn more]{@link https://developer.chrome.com/apps/api_index#dev_apis}
+         * Presents a device picker to the user and returns
+         * HidDeviceInfo objects for the devices selected. If the user
+         * cancels the picker devices will be empty. A user gesture is
+         * required for the dialog to display. Without a user gesture,
+         * the callback will run as though the user cancelled. If multiple
+         * filters are provided devices matching any filter will be displayed.
+         * @param options Configuration of the device picker dialog box.
+         * @param callback Invoked with a list of chosen Devices.
+         */
+        function getUserSelectedDevices(options: UserSelectedDevicePickerOptions, callback: (devices: HidDeviceInfo) => void): void;
+
+        /**
+         * Open a connection to an HID device for communication.
+         * @param deviceId The HidDeviceInfo.deviceId of the device to open.
+         * @param callback The callback function returns an object, containing the connectionId.
+         *                 The connectionId is the opaque ID used to identify this connection in all other functions.
+         */
+        function connect(deviceId: integer, callback: (connection: { connectionId: integer }) => void): void;
+
+        /**
+         * Disconnect from a device.
+         * Invoking operations on a device after calling this is safe but has no effect.
+         * @param connectionId The connectionId returned by connect.
+         * @param [callback]
+         */
+        function disconnect(connectionId: integer, callback?: () => void): void;
+
+        /**
+         * Receive the next input report from the device.
+         * @param connectionId The connectionId returned by connect.
+         * @param callback The callback will return these parameters:
+         *                      * reportId - The report ID or 0 if none.
+         *                      * data - The report data, the report ID prefix (if present) is removed.
+         */
+        function receive(connectionId: integer, callback: (reportId: integer, data: ArrayBuffer) => void): void;
+
+        /**
+         * Send an output report to the device.
+         * Note: Do not include a report ID prefix in data. It will be added if necessary.
+         * @param connectionId The connectionId returned by connect.
+         * @param reportId reportId - The report ID or 0 if none.
+         * @param data The report data.
+         * @param callback
+         */
+        function send(connectionId: integer, reportId: integer, data: ArrayBuffer, callback: () => void): void;
+
+        /**
+         * Request a feature report from the device.
+         * @param connectionId The connectionId returned by connect.
+         * @param reportId The report ID, or 0 if none.
+         * @param callback Will provide `data` which contain the report data, including a report ID prefix if one is sent by the device.
+         */
+        function receiveFeatureReport(connectionId: integer, reportId: integer, callback: (data: ArrayBuffer) => void): void;
+
+        /**
+         * Send a feature report to the device.
+         * Note: Do not include a report ID prefix in data. It will be added if necessary.
+         * @param connectionId The connectionId returned by connect.
+         * @param reportId The report ID to use, or 0 if none.
+         * @param data The report data.
+         * @param callback
+         */
+        function sendFeatureReport(connectionId: integer, reportId: integer, data: ArrayBuffer, callback: () => void): void;
+
+        /**
+         * Event generated when a device is added to the system.
+         * Events are only broadcast to apps that
+         * have permission to access the device. Permission may
+         * have been granted at install time or when the user
+         * accepted an optional permission.
+         * @since Chrome 41.
+         * @see[permissions.request]{@link https://developer.chrome.com/apps/permissions#method-request}
+         */
+        const onDeviceAdded: chrome.events.Event<(device: HidDeviceInfo) => void>;
+
+        /**
+         * Event generated when a device is removed from the system.
+         * The callback will contain the deviceId property of the device passed to onDeviceAdded.
+         * @since Chrome 41.
+         * @see[See onDeviceAdded for which events are delivered]{@link https://developer.chrome.com/apps/hid#event-onDeviceAdded}.
+         */
+        const onDeviceRemoved: chrome.events.Event<(deviceId: integer) => void>;
+    }
+    // #endregion
+
+    // #region chrome.i18n
+    /////////////////////////////////
+    // i18n - Internationalization //
+    /////////////////////////////////
     /**
-     * Use the chrome.i18n infrastructure to implement internationalization across your whole app or extension.
-     * @since Chrome 5.
+     * Use the chrome.i18n infrastructure to implement internationalization across your whole app.
+     * Content scripts: Fully supported.
+     * @see[Docs]{@link https://developer.chrome.com/apps/i18n}
+     * @since Chrome 25.
      */
     namespace i18n {
+        /**
+         * An ISO language code such as en or fr.
+         * For a complete list of languages supported by this method, see kLanguageInfoTable.
+         * For an unknown language, und will be returned,
+         * which means that [percentage] of the text is unknown to CLD
+         * @since Chrome 47.
+         */
+        type LanguageCode = kLanguageInfoTable | 'und';
+        /**
+         * @see[Source]{@link https://github.com/chromium/chromium/blob/master/ui/base/l10n/l10n_util.cc}
+         */
+        type kLanguageInfoTable =
+            'af' |     // Afrikaans
+            'am' |     // Amharic
+            'an' |     // Aragonese
+            'ar' |     // Arabic
+            'ast' |    // Asturian
+            'az' |     // Azerbaijani
+            'be' |     // Belarusian
+            'bg' |     // Bulgarian
+            'bh' |     // Bihari
+            'bn' |     // Bengali
+            'br' |     // Breton
+            'bs' |     // Bosnian
+            'ca' |     // Catalan
+            'ceb' |    // Cebuano
+            'ckb' |    // Kurdish (Arabci),  Sorani
+            'co' |     // Corsican
+            'cs' |     // Czech
+            'cy' |     // Welsh
+            'da' |     // Danish
+            'de' |     // German
+            'de-AT' |  // German (Austria)
+            'de-CH' |  // German (Switzerland)
+            'de-DE' |  // German (Germany)
+            'de-LI' |  // German (Liechtenstein)
+            'el' |     // Greek
+            'en' |     // English
+            'en-AU' |  // English (Australia)
+            'en-CA' |  // English (Canada)
+            'en-GB' |  // English (UK)
+            'en-IN' |  // English (India)
+            'en-NZ' |  // English (New Zealand)
+            'en-US' |  // English (US)
+            'en-ZA' |  // English (South Africa)
+            'eo' |     // Esperanto
+            'es' |      // Spanish
+            'es-419' |  // Spanish (Latin America)
+            'es-AR' |   // Spanish (Argentina)
+            'es-CL' |   // Spanish (Chile)
+            'es-CO' |   // Spanish (Colombia)
+            'es-CR' |   // Spanish (Costa Rica)
+            'es-ES' |   // Spanish (Spain)
+            'es-HN' |   // Spanish (Honduras)
+            'es-MX' |   // Spanish (Mexico)
+            'es-PE' |   // Spanish (Peru)
+            'es-US' |   // Spanish (US)
+            'es-UY' |   // Spanish (Uruguay)
+            'es-VE' |   // Spanish (Venezuela)
+            'et' |      // Estonian
+            'eu' |      // Basque
+            'fa' |      // Persian
+            'fi' |      // Finnish
+            'fil' |     // Filipino
+            'fo' |      // Faroese
+            'fr' |      // French
+            'fr-CA' |   // French (Canada)
+            'fr-CH' |   // French (Switzerland)
+            'fr-FR' |   // French (France)
+            'fy' |      // Frisian
+            'ga' |      // Irish
+            'gd' |      // Scots Gaelic
+            'gl' |      // Galician
+            'gn' |      // Guarani
+            'gu' |      // Gujarati
+            'ha' |      // Hausa
+            'haw' |     // Hawaiian
+            'he' |      // Hebrew
+            'hi' |      // Hindi
+            'hmn' |     // Hmong
+            'hr' |      // Croatian
+            'ht' |      // Haitian Creole
+            'hu' |      // Hungarian
+            'hy' |      // Armenian
+            'ia' |      // Interlingua
+            'id' |      // Indonesian
+            'ig' |      // Igbo
+            'is' |      // Icelandic
+            'it' |      // Italian
+            'it-CH' |   // Italian (Switzerland)
+            'it-IT' |   // Italian (Italy)
+            'ja' |      // Japanese
+            'jv' |      // Javanese
+            'ka' |      // Georgian
+            'kk' |      // Kazakh
+            'km' |      // Cambodian
+            'kn' |      // Kannada
+            'ko' |      // Korean
+            'ku' |      // Kurdish
+            'ky' |      // Kyrgyz
+            'la' |      // Latin
+            'lb' |      // Luxembourgish
+            'ln' |      // Lingala
+            'lo' |      // Laothian
+            'lt' |      // Lithuanian
+            'lv' |      // Latvian
+            'mg' |      // Malagasy
+            'mi' |      // Maori
+            'mk' |      // Macedonian
+            'ml' |      // Malayalam
+            'mn' |      // Mongolian
+            'mo' |      // Moldavian
+            'mr' |      // Marathi
+            'ms' |      // Malay
+            'mt' |      // Maltese
+            'my' |      // Burmese
+            'nb' |      // Norwegian (Bokmal)
+            'ne' |      // Nepali
+            'nl' |      // Dutch
+            'nn' |      // Norwegian (Nynorsk)
+            'no' |      // Norwegian
+            'ny' |      // Nyanja
+            'oc' |      // Occitan
+            'om' |      // Oromo
+            'or' |      // Oriya
+            'pa' |      // Punjabi
+            'pl' |      // Polish
+            'ps' |      // Pashto
+            'pt' |      // Portuguese (pt-BR and pt-PT are used)
+            'pt-BR' |   // Portuguese (Brazil)
+            'pt-PT' |   // Portuguese (Portugal)
+            'qu' |      // Quechua
+            'rm' |      // Romansh
+            'ro' |      // Romanian
+            'ru' |      // Russian
+            'sd' |      // Sindhi
+            'sh' |      // Serbo-Croatian
+            'si' |      // Sinhalese
+            'sk' |      // Slovak
+            'sl' |      // Slovenian
+            'sm' |      // Samoan
+            'sn' |      // Shona
+            'so' |      // Somali
+            'sq' |      // Albanian
+            'sr' |      // Serbian
+            'st' |      // Sesotho
+            'su' |      // Sundanese
+            'sv' |      // Swedish
+            'sw' |      // Swahili
+            'ta' |      // Tamil
+            'te' |      // Telugu
+            'tg' |      // Tajik
+            'th' |      // Thai
+            'ti' |      // Tigrinya
+            'tk' |      // Turkmen
+            'to' |      // Tonga
+            'tr' |      // Turkish
+            'tt' |      // Tatar
+            'tw' |      // Twi
+            'ug' |      // Uighur
+            'uk' |      // Ukrainian
+            'ur' |      // Urdu
+            'uz' |      // Uzbek
+            'vi' |      // Vietnamese
+            'wa' |      // Walloon
+            'xh' |      // Xhosa
+            'yi' |      // Yiddish
+            'yo' |      // Yoruba
+            'zh' |      // Chinese
+            'zh-CN' |   // Chinese (China)
+            'zh-HK' |   // Chinese (Hong Kong)
+            'zh-TW' |   // Chinese (Taiwan)
+            'zu' |      // Zulu
+            // Aliases:
+            'ar_001' |
+            'en_001' |
+            'en_150' |
+            'zh_hans_cn' |
+            'zh_hant_hk' |
+            'zh_hant_mo' |
+            'zh_hans_sg' |
+            'zh_hant_tw';
+
+        /** Allow array of strings with length 1 to 9 */
+        type StringSubstitutions =
+            [string] |
+            [string, string] |
+            [string, string, string] |
+            [string, string, string, string] |
+            [string, string, string, string, string] |
+            [string, string, string, string, string, string] |
+            [string, string, string, string, string, string, string] |
+            [string, string, string, string, string, string, string, string] |
+            [string, string, string, string, string, string, string, string, string];
+
         /** 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}.
-             * For an unknown language, 'und' will be returned, which means that [percentage] of the text is unknown to CLD */
-            language: string;
+            /**
+              * 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: kLanguageInfoTable;
 
             /** The percentage of the detected language */
-            percentage: number;
+            percentage: integer;
         }
 
         /** Holds detected language reliability and array of DetectedLanguage */
@@ -1643,61 +4712,78 @@ declare namespace chrome {
             /** CLD detected language reliability */
             isReliable: boolean;
 
-            /** Array of detectedLanguage */
+            /** 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:
-         * function(array of string languages) {...};
-         * Parameter languages: Array of the accept languages of the browser, such as en-US,en,zh-CN
+         * Gets the accept-languages of the browser.
+         * This is different from the locale used by the browser;
+         * to get the locale, use i18n.getUILanguage.
          */
-        export function getAcceptLanguages(callback: (languages: string[]) => void): void;
+        function getAcceptLanguages(callback: (languages: LanguageCode[]) => void): void;
         /**
-         * 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.
+         * 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 Optional. Up to 9 substitution strings, if the message requires any.
+         * @param substitutions Up to 9 substitution strings, if the message requires any.
          */
-        export function getMessage(messageName: string, substitutions?: any): string;
+        function getMessage(messageName: string, substitutions?: StringSubstitutions): string | undefined;
         /**
-         * Gets the browser UI language of the browser. This is different from i18n.getAcceptLanguages which returns the preferred user languages.
+         * Gets the browser UI language of the browser.
+         * This is different from i18n.getAcceptLanguages which returns the preferred user languages.
          * @since Chrome 35.
          */
-        export function getUILanguage(): string;
+        function getUILanguage(): string;
 
-        /** Detects the language of the provided text using CLD.
+        /**
+         * 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) {...};
+         * @param callback
+         * @since Chrome 47.
          */
-        export function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
+        function detectLanguage(text: string, callback: (result: LanguageDetectionResult) => void): void;
     }
+    // #endregion
 
-    ////////////////////
-    // Identity
-    ////////////////////
+    // #region chrome.identity
+    //////////////
+    // Identity //
+    //////////////
     /**
      * Use the chrome.identity API to get OAuth2 access tokens.
-     * Permissions:  "identity"
+     * @requires Permissions: 'identity'
+     * @see[Identity User]{@link https://developer.chrome.com/apps/app_identity}
      * @since Chrome 29.
      */
     namespace identity {
         /** @since Chrome 32. */
         interface AccountInfo {
-            /** A unique identifier for the account. This ID will not change for the lifetime of the account. */
+            /**
+             * A unique identifier for the account.
+             * This ID will not change for the lifetime of the account.
+             */
             id: string;
         }
 
         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.
+             * 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.
              */
             interactive?: boolean;
             /**
              * Optional.
-             * The account ID whose token should be returned. If not specified, the primary account for the profile will be used.
-             * account is only supported when the "enable-new-profile-management" flag is set.
+             * The account ID whose token should be returned.
+             * If not specified, the primary account for the profile will be used.
+             * account is only supported when the 'enable-new-profile-management' flag is set.
              * @since Chrome 37.
              */
             account?: AccountInfo;
@@ -1711,9 +4797,17 @@ declare namespace chrome {
         }
 
         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. */
+            /**
+             * 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. */
+            /**
+             * 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;
         }
 
@@ -1723,7 +4817,9 @@ declare namespace chrome {
         }
 
         interface WebAuthFlowOptions {
-            /** The URL that initiates the auth flow. */
+            /**
+             * The URL that initiates the auth flow.
+             */
             url: string;
             /**
              * Optional.
@@ -1734,176 +4830,557 @@ declare namespace chrome {
             interactive?: boolean;
         }
 
-        interface SignInChangeEvent extends chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void> { }
-
         /**
+         * @requires(dev) **Dev channel only.**
+         * @description
          * Retrieves a list of AccountInfo objects describing the accounts present on the profile.
          * getAccounts is only supported on dev channel.
-         * Dev channel only.
          */
-        export function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+        function getAccounts(callback: (accounts: AccountInfo[]) => void): void;
+
         /**
-         * Gets an OAuth2 access token using the client ID and scopes specified in the oauth2 section of manifest.json.
-         * The Identity API caches access tokens in memory, so it's ok to call getAuthToken non-interactively any time a token is required. The token cache automatically handles expiration.
-         * For a good user experience it is important interactive token requests are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests, or Chrome sign in screens if they are not signed in, with with no context. In particular, do not use getAuthToken interactively when your app is first launched.
+         * Gets an OAuth2 access token using the client ID and
+         * scopes specified in the oauth2 section of manifest.json.
+         *
+         * The Identity API caches access tokens in memory,
+         * so it's ok to call getAuthToken non-interactively any time a token is required.
+         * The token cache automatically handles expiration.
+         *
+         * For a good user experience it is important interactive token requests are initiated by
+         * UI in your app explaining what the authorization is for. Failing to do this will cause
+         * your users to get authorization requests, or Chrome sign in screens if they are not
+         * signed in, with with no context. In particular, do not use getAuthToken interactively
+         * when your app is first launched.
+         *
          * @param details Token options.
-         * @param callback Called with an OAuth2 access token as specified by the manifest, or undefined if there was an error.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(string token) {...};
+         * @param [callback] Called with an OAuth2 access token as specified by the manifest,
+         *                   or undefined if there was an error.
          */
-        export function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+        function getAuthToken(details: TokenDetails, callback?: (token: string) => void): void;
+
         /**
          * Retrieves email address and obfuscated gaia id of the user signed into a profile.
-         * This API is different from identity.getAccounts in two ways. The information returned is available offline, and it only applies to the primary account for the profile.
+         * This API is different from identity.getAccounts in two ways.
+         * The information returned is available offline, and it only applies to the primary account for the profile.
          * @since Chrome 37.
          */
-        export function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+        function getProfileUserInfo(callback: (userInfo: UserInfo) => void): void;
+
         /**
          * Removes an OAuth2 access token from the Identity API's token cache.
-         * If an access token is discovered to be invalid, it should be passed to removeCachedAuthToken to remove it from the cache. The app may then retrieve a fresh token with getAuthToken.
+         * If an access token is discovered to be invalid,
+         * it should be passed to removeCachedAuthToken to remove it from the cache.
+         * The app may then retrieve a fresh token with getAuthToken.
          * @param details Token information.
          * @param callback Called when the token has been removed from the cache.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function() {...};
          */
-        export function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
+        function removeCachedAuthToken(details: TokenInformation, callback?: () => void): void;
+
         /**
          * Starts an auth flow at the specified URL.
-         * This method enables auth flows with non-Google identity providers by launching a web view and navigating it to the first URL in the provider's auth flow. When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*, the window will close, and the final redirect URL will be passed to the callback function.
-         * For a good user experience it is important interactive auth flows are initiated by UI in your app explaining what the authorization is for. Failing to do this will cause your users to get authorization requests with no context. In particular, do not launch an interactive auth flow when your app is first launched.
+         * This method enables auth flows with non-Google identity providers by launching
+         * a web view and navigating it to the first URL in the provider's auth flow.
+         * When the provider redirects to a URL matching the pattern https://<app-id>.chromiumapp.org/*,
+         * the window will close, and the final redirect URL will be passed to the callback function.
+         * For a good user experience it is important interactive auth flows are initiated by UI in
+         * your app explaining what the authorization is for. Failing to do this will cause your
+         * users to get authorization requests with no context.
+         * In particular, do not launch an interactive auth flow when your app is first launched.
          * @param details WebAuth flow options.
          * @param callback Called with the URL redirected back to your application.
          * The callback parameter should be a function that looks like this:
          * function(string responseUrl) {...};
          */
-        export function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+        function launchWebAuthFlow(details: WebAuthFlowOptions, callback: (responseUrl?: string) => void): void;
+
         /**
          * Generates a redirect URL to be used in launchWebAuthFlow.
          * The generated URLs match the pattern https://<app-id>.chromiumapp.org/*.
          * @since Chrome 33.
-         * @param path Optional. The path appended to the end of the generated URL.
+         * @param path The path appended to the end of the generated URL.
          */
-        export function getRedirectURL(path?: string): string;
+        function getRedirectURL(path?: string): string;
 
         /**
          * Fired when signin state changes for an account on the user's profile.
          * @since Chrome 33.
          */
-        export var onSignInChanged: SignInChangeEvent;
+        const onSignInChanged: chrome.events.Event<(account: AccountInfo, signedIn: boolean) => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // Idle
-    ////////////////////
+    // #region chrome.idle
+    //////////
+    // Idle //
+    //////////
     /**
      * Use the chrome.idle API to detect when the machine's idle state changes.
-     * Permissions:  "idle"
-     * @since Chrome 6.
+     * @requires Permissions: 'idle'
+     * @since Chrome 25.
      */
     namespace idle {
-        interface IdleStateChangedEvent extends chrome.events.Event<(newState: string) => void> { }
-
+        type IdleState =
+            'active' |
+            'idle' |
+            'locked';
         /**
-         * 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.
+         * 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.
          * @param detectionIntervalInSeconds The system is considered idle if detectionIntervalInSeconds seconds have elapsed since the last user input detected.
          * Since Chrome 25.
          * @param callback The callback parameter should be a function that looks like this:
          * function( IdleState newState) {...};
          */
-        export function queryState(detectionIntervalInSeconds: number, callback: (newState: string) => void): void;
+        function queryState(detectionIntervalInSeconds: integer, callback: (newState: IdleState) => void): void;
         /**
-         * 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.
+         * 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.
          * @since Chrome 25.
          * @param intervalInSeconds Threshold, in seconds, used to determine when the system is in an idle state.
          */
-        export function setDetectionInterval(intervalInSeconds: number): void;
+        function setDetectionInterval(intervalInSeconds: integer): 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. */
-        export var onStateChanged: IdleStateChangedEvent;
+        /**
+         * 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.
+         */
+        const onStateChanged: chrome.events.Event<(newState: IdleState) => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // InstanceID
-    ////////////////////
+    // #region chrome.instanceID
+    ////////////////
+    // InstanceID //
+    ////////////////
     /**
      * Use chrome.instanceID to access the Instance ID service.
+     * @requires Permissions: 'gcm'
      * @since Chrome 46
      */
     namespace instanceID {
-        /** NOT YET IMPLEMENTED */
+        interface TokenParams {
+            /**
+             * Identifies the entity that is authorized to access resources associated with this Instance ID.
+             * It can be a project ID from Google developer console.
+             */
+            authorizedEntity: string;
+            /**
+             * Identifies authorized actions that the authorized entity can take.
+             * E.g. for sending GCM messages, GCM scope should be used.
+             */
+            scope: string;
+            /**
+             * Allows including a small number of string key/value pairs that will
+             * be associated with the token and may be used in processing the request.
+             */
+            options?: { [key: string]: string };
+        }
+        interface DeleteTokenParams {
+            /**
+             * The authorized entity that is used to obtain the token.
+             */
+            authorizedEntity: string;
+            /**
+             * The scope that is used to obtain the token.
+             */
+            scope: string;
+        }
+        /**
+         * Retrieves an identifier for the app instance.
+         * The instance ID will be returned by the callback.
+         * The same ID will be returned as long as the application
+         * identity has not been revoked or expired.
+         * @param callback Function called when the retrieval completes.
+         *                 It should check runtime.lastError for error when instanceID is empty.
+         *                 Will be provided with instanceID: An Instance ID assigned to the app instance.
+         */
+        function getID(callback: (instanceId: string) => void): void;
+        /**
+         * Retrieves the time when the InstanceID has been generated.
+         * The creation time will be returned by the callback.
+         * @param callback Function called when the retrieval completes.
+         *                 It should check runtime.lastError for error when creationTime is zero.
+         *                 Provides `creationTime` (double)
+         *                  > The time when the Instance ID has been generated, represented in milliseconds since the epoch.
+         */
+        function getCreationTime(callback: (creationTime: integer) => void): void;
+        /**
+         * Return a token that allows the authorized entity to access the service defined by scope.
+         * @param getTokenParams Parameters for getToken.
+         * @param callback Function called when the retrieval completes. It should check runtime.lastError for error when token is empty.
+         */
+        function getToken(getTokenParams: TokenParams, callback: (token: string) => void): void;
+        /**
+         * Revokes a granted token.
+         * @param deleteTokenParams Parameters for deleteToken.
+         * @param callback Function called when the token deletion completes.
+         *                 The token was revoked successfully if runtime.lastError is not set.
+         */
+        function deleteToken(deleteTokenParams: DeleteTokenParams, callback: () => void): void;
+        /**
+         * Fired when all the granted tokens need to be refreshed.
+         * @param callback Function called when the deletion completes.
+         *                 The instance identifier was revoked successfully if runtime.lastError is not set.
+         */
+        function deleteID(callback: () => void): void;
+        /** Fired when all the granted tokens need to be refreshed. */
+        const onTokenRefresh: chrome.events.Event<() => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // mDNS
-    ////////////////////
+    // #region chrome.management
+    ////////////////
+    // Management //
+    ////////////////
     /**
-     * 	Use the chrome.mdns API to discover services over mDNS. This comprises a subset of the features of the NSD spec: http://www.w3.org/TR/discovery-api/
+     * The chrome.management API provides ways to
+     * manage the list of apps
+     * that are installed and running.
+     */
+    namespace management {
+        const ExtensionDisabledReason: {
+            UNKNOWN: 'unknown',
+            PERMISSIONS_INCREASE: 'permissions_increase'
+        };
+        const ExtensionInstallType: {
+            ADMIN: 'admin',
+            DEVELOPMENT: 'development',
+            NORMAL: 'normal',
+            SIDELOAD: 'sideload',
+            OTHER: 'other'
+        };
+        const ExtensionType: {
+            EXTENSION: 'extension',
+            HOSTED_APP: 'hosted_app',
+            PACKAGED_APP: 'packaged_app',
+            LEGACY_PACKAGED_APP: 'legacy_packaged_app',
+            THEME: 'theme'
+        };
+        const LaunchType: {
+            OPEN_AS_REGULAR_TAB: 'OPEN_AS_REGULAR_TAB',
+            OPEN_AS_PINNED_TAB: 'OPEN_AS_PINNED_TAB',
+            OPEN_AS_WINDOW: 'OPEN_AS_WINDOW',
+            OPEN_FULL_SCREEN: 'OPEN_FULL_SCREEN'
+        };
+        /** Information about an installed extension, app, or theme. */
+        interface ExtensionInfo {
+            /**
+             * A reason the item is disabled.
+             * @since Chrome 17.
+             * @see enum ExtensionDisabledReason
+             */
+            disabledReason?: ToStringLiteral<typeof ExtensionDisabledReason>;
+            /**
+             * The launch url.
+             */
+            appLaunchUrl?: string;
+            /**
+             * The description of this app.
+             */
+            description: string;
+            /**
+             * Returns a list of API based permissions.
+             */
+            permissions: chrome.runtime.Permission[];
+            /**
+             * 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 host based permissions.
+             * Permissions regarding url access.
+             */
+            hostPermissions: string[];
+            /** Whether it is currently enabled or disabled. */
+            enabled: boolean;
+            /**
+             * The URL of the homepage of this app.
+             * @since Chrome 11.
+             */
+            homepageUrl?: string;
+            /**
+             * Whether this app can be disabled or uninstalled by the user.
+             */
+            mayDisable: boolean;
+            /**
+             * How the app was installed.
+             * @since Chrome 22.
+             */
+            installType: ToStringLiteral<typeof ExtensionInstallType>;
+
+            /** The version of this app. */
+            version: string;
+
+            /** This app's version name */
+            versionName: string;
+
+            /** The extension's unique identifier. */
+            id: string;
+
+            /**
+             * Whether the app declares that it supports offline.
+             * @since Chrome 15.
+             */
+            offlineEnabled: boolean;
+            /**
+             * The update URL of this app.
+             * @since Chrome 16.
+             */
+            updateUrl?: string;
+            /**
+             * The type of this app.
+             * @since Chrome 23.
+             */
+            type: 'packaged_app';
+            /** The name of this app. */
+            name: string;
+            /**
+             * A short version of the name of this app.
+             * @since Chrome 31.
+             */
+            shortName: string;
+            /**
+             * True if this is an app, which it will be till this is removed.
+             * @deprecated since Chrome 33. Please use management.ExtensionInfo.type.
+             */
+            isApp?: true;
+            /**
+             * The app launch type.
+             * @since Chrome 37.
+             */
+            launchType?: ToStringLiteral<typeof LaunchType>;
+            /**
+             * The currently available launch types.
+             * @since Chrome 37.
+             */
+            availableLaunchTypes?: ToStringLiteral<typeof LaunchType>[];
+        }
+
+        /** Information about an icon belonging to an extension, app, or theme. */
+        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: integer;
+        }
+
+        interface UninstallOptions {
+            /**
+             * 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.
+             */
+            showConfirmDialog?: boolean;
+        }
+
+        /**
+         * Returns a list of permission warnings for the given extension manifest string.
+         * @param manifestStr Extension manifest JSON string. See example
+         * @param [callback] Permissions warnings as string array
+         * @example
+         * chrome.management.getPermissionWarningsByManifest(JSON.stringify(chrome.runtime.getManifest()), (warnings) => { *Do something here* });
+         */
+        function getPermissionWarningsByManifest(manifestStr: string, callback?: (permissionWarnings: string[]) => void): void;
+
+        /**
+         * Returns information about the calling extension, app, or theme. Note: This function can be used without requesting the 'management' permission in the manifest.
+         * @since Chrome 39.
+         * @param [callback] If you specify the callback parameter, it should be a function that looks like this:
+         * function( ExtensionInfo result) {...};
+         */
+        function getSelf(callback?: (result: ExtensionInfo) => void): void;
+
+        /**
+         * Uninstalls the calling extension.
+         * Note: This function can be used without requesting the 'management' permission in the manifest.
+         * @since Chrome 26.
+         * @param [options] Optional unstall options
+         * @param [callback]
+         */
+        function uninstallSelf(options?: UninstallOptions, callback?: () => void): void;
+    }
+    // #endregion
+
+    // #region chrome.mdns
+    //////////
+    // mDNS //
+    //////////
+    /**
+     * Use the chrome.mdns API to discover services over mDNS.
+     * This comprises a subset of the features of the NSD spec:
+     * @see[NSD Spec]{@link http://www.w3.org/TR/discovery-api/}
+     * @requires Permissions: 'mdns'
      * @since Chrome 31
      */
     namespace mdns {
-        /** NOT YET IMPLEMENTED */
-    }
-
-    ////////////////////
-    // Media Galleries
-    ////////////////////
-    namespace mediaGalleries {
-        interface MediaFileSystemsOptions {
-            interactive?: 'no' | 'yes' | 'if_needed';
+        interface Service {
+            /** The service name of an mDNS advertised service, .. */
+            serviceName: string;
+            /** The host:port pair of an mDNS advertised service. */
+            serviceHostPort: string;
+            /** The IP address of an mDNS advertised service. */
+            ipAddress: string;
+            /** Metadata for an mDNS advertised service. */
+            serviceData: string[];
         }
 
+        /**
+         * Locked to this because it's the only one that can be used.
+         *
+         * const char kEventFilterServiceTypeKey[] = "serviceType";
+         * @see[Source: event_matcher.cc, line 19]{@link https://github.com/chromium/chromium/tree/master/extensions/common/event_matcher.cc}
+         */
+        type ValidServiceTypes = 'serviceType';
+
+        /**
+         * Dictionary
+         * [key in ValidServiceTypes]: string
+         */
+        type ServiceTypes = Record<ValidServiceTypes, string>;
+
+        /**
+         * The maximum number of service instances that will be
+         * included in onServiceList events. If more instances
+         * are available, they may be truncated from the
+         * onServiceList event.
+         * @default 2048
+         * @since Chrome 44.
+         */
+        const MAX_SERVICE_INSTANCES_PER_EVENT: integer;
+
+        /**
+         * Immediately issues a multicast DNS query for all service types.
+         * |callback| is invoked immediately.
+         * At a later time, queries will be sent,
+         * and any service events will be fired.
+         * @since Chrome 45.
+         * @param callback Callback invoked after ForceDiscovery() has started.
+         */
+        function forceDiscovery(callback: () => void): void;
+        /**
+         * Event fired to inform clients of the current complete
+         * set of known available services. Clients should only
+         * need to store the list from the most recent event.
+         * The service type that the extension is interested in
+         * discovering should be specified as the event filter
+         * with the 'serviceType' key. Not specifying an event
+         * filter will not start any discovery listeners.
+         * @example
+         * Filter example:
+         * chrome.mdns.onServiceList.addListener(() => { },
+         *  { 'serviceType': 'definitelyTyped._tcp.local' });
+         */
+        const onServiceList: chrome.events.FilteredEvent<(services: Service[]) => void, ServiceTypes>;
+
+    }
+    // #endregion
+
+    // #region chrome.mediaGalleries
+    /////////////////////
+    // Media Galleries //
+    /////////////////////
+    /**
+     * Use the chrome.mediaGalleries API to access media files (audio, images, video)
+     * from the user's local disks (with the user's consent).
+     * @since Chrome 24.
+     * @requires Permissions: {'mediaGalleries': ['accessType1' | 'accessType2', ...]}
+     *                        {'mediaGalleries': ['accessType1' | 'accessType2', ..., 'allAutoDetected']}
+     * @see[More information]{@link https://developer.chrome.com/apps/mediaGalleries}
+     */
+    namespace mediaGalleries {
+        type Interactive =
+            'no' |
+            'yes' |
+            'if_needed';
+        interface MediaFileSystemsOptions {
+            /**
+             * Whether to prompt the user for permission to additional media galleries before returning
+             * the permitted set. Default is silent. If the value 'yes' is passed, or if the application
+             * has not been granted access to any media galleries and the value 'if_needed' is passed,
+             * then the media gallery configuration dialog will be displayed.
+             *
+             * **no**
+             * Do not act interactively.
+             * **yes**
+             * Ask the user to manage permitted media galleries.
+             * **if_needed**
+             * Ask the user to manage permitted galleries only if the return set would otherwise be empty.
+             */
+            interactive?: Interactive;
+        }
         interface MediaFileSystemMetadata {
+            /** The name of the file system. */
             name: string;
+            /** A unique and persistent id for the media gallery. */
             galleryId: string;
+            /** If the media gallery is on a removable device, a unique id for the device while the device is online. */
             deviceId?: string;
+            /** True if the media gallery is on a removable device. */
             isRemovable: boolean;
+            /** True if the device the media gallery is on was detected as a media device. i.e. a PTP or MTP device, or a DCIM directory is present. */
             isMediaDevice: boolean;
+            /** True if the device is currently available. */
             isAvailable: boolean;
         }
 
+        type MetadataOptionsType =
+            'all' |
+            'mimeTypeAndTags' |
+            'mimeTypeOnly';
+
         interface MetadataOptions {
-            metadataType: 'all' | 'mimeTypeAndTags' | 'mimeTypeOnly';
+            metadataType: MetadataOptionsType;
         }
 
         interface RawTag {
+            /**
+             * Describes format of container or codec of stream, i.e. 'mp3' | 'h264'.
+             */
             type: string;
+            /**
+             * An unfiltered string->string interface of tags for the stream.
+             */
             tags: { [name: string]: string; };
         }
 
         interface Metadata {
-            // The browser sniffed mime type.
+            /** The browser sniffed mime type. */
             mimeType: string;
-            // Defined for images and video. In pixels.
-            height?: number;
-            width?: number;
-            // Defined for images only.
-            xResolution?: number;
-            yResolution?: number;
-            // Defined for audio and video. In seconds.
-            duration?: number;
-            // Defined for images and video. In degrees.
-            rotation?: number;
-            // Defined for images only.
-            cameraMake?: string;
-            cameraModel?: string;
-            exposureTimeSeconds?: number;
-            flashFired?: boolean;
-            fNumber?: number;
-            focalLengthMm?: number;
-            isoEquivalent?: number;
-            // Defined for audio and video only.
+            /** Defined for images and video. In pixels. */
+            height?: integer;
+            width?: integer;
+            /** Defined for audio and video. In seconds. */
+            duration?: integer;
+            /** Defined for images and video. In degrees. */
+            rotation?: integer;
+            /** Defined for audio and video only. */
             album?: string;
             artist?: string;
             comment?: string;
             copyright?: string;
-            disc?: number;
+            disc?: integer;
             genre?: string;
             language?: string;
             title?: string;
-            track?: number;
-            // All the metadata in the media file. For formats with multiple streams, stream order will be preserved. Container metadata is the first element.
+            track?: integer;
+            /**
+             * All the metadata in the media file.
+             * For formats with multiple streams, stream order will be preserved.
+             * Container metadata is the first element.
+             */
             rawTags: RawTag[];
-            // The images embedded in the media file's metadata. This is most often used for album art or video thumbnails.
+            /**
+             * The images embedded in the media file's metadata.
+             * This is most often used for album art or video thumbnails.
+             */
             attachedImages: Blob[];
         }
 
@@ -1912,169 +5389,917 @@ declare namespace chrome {
             success: boolean;
         }
 
+        type GalleryChangedType =
+            'contents_changed' |
+            'watch_dropped';
+
         interface GalleryChangedEventArgs {
-            type: 'contents_changed' | 'watch_dropped';
+            type: GalleryChangedType;
             galleryId: string;
         }
 
+        type ScanProgressType =
+            'start' |
+            'cancel' |
+            'finish' |
+            'error';
+
         interface ScanProgressEventArgs {
-            // The type of progress event, i.e. start, finish, etc.
-            type: 'start' | 'cancel' | 'finish' | 'error';
-            // The number of Galleries found.
-            galleryCount?: number;
-            // Appoximate number of media files found; some file types can be either audio or video and are included in both counts.
-            audioCount?: number;
-            imageCount?: number;
-            videoCount?: number;
+            /** The type of progress event, i.e. start, finish, etc. */
+            type: ScanProgressType;
+            /** The number of Galleries found. */
+            galleryCount?: integer;
+            /**
+             * Appoximate number of media files found;
+             * some file types can be either audio or video
+             * and are included in both counts.
+             */
+            audioCount?: integer;
+            imageCount?: integer;
+            videoCount?: integer;
         }
 
-        export function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
-        export function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
-        export function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
-        export function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
-        export function startMediaScan(): void;
-        export function cancelMediaScan(): void;
-        export function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
-        export function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
-        export function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
-        export function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
-        export function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
-        export function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
-        export function removeGalleryWatch(galleryId: string): void;
-        export function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
-        export function removeAllGalleryWatch(): void;
+        /**
+         * Get the media galleries configured in this user agent.
+         * If none are configured or available, the callback will receive an empty array.
+         */
+        function getMediaFileSystems(callback: (mediaFileSystems: FileSystem[]) => void): void;
+        /**
+         * Get the media galleries configured in this user agent.
+         * If none are configured or available, the callback will receive an empty array.
+         */
+        function getMediaFileSystems(options: MediaFileSystemsOptions, callback: (mediaFileSystems: FileSystem[]) => void): void;
+        /**
+         * Present a directory picker to the user and add the selected directory as a gallery.
+         * If the user cancels the picker, selectedFileSystemName will be empty.
+         * A user gesture is required for the dialog to display.
+         * Without a user gesture, the callback will run as though the user canceled.
+         * @since Chrome 34.
+         */
+        function addUserSelectedFolder(callback: (mediaFileSystems: FileSystem[], selectedFileSystemName: string) => void): void;
+        /**
+         * @deprecated Deprecated since Chrome 51. The user can manually drop access to galleries via the permissions dialog.
+         * @description Give up access to a given media gallery.
+         */
+        function dropPermissionForMediaFileSystem(galleryId: string, callback?: () => void): void;
+        /**
+         * @deprecated Deprecated since Chrome 51. The mediaGalleries API no longer supports scanning.
+         * @description
+         * Start a scan of the user's hard disks for directories containing media.
+         * The scan may take a long time so progress and completion is communicated by events.
+         * No permission is granted as a result of the scan, see addScanResults.
+         */
+        function startMediaScan(): void;
+        /**
+         * @deprecated Deprecated since Chrome 51. The mediaGalleries API no longer supports scanning.
+         * @description
+         * Cancel any pending media scan.
+         * Well behaved apps should provide a way for the user to cancel scans they start.
+         */
+        function cancelMediaScan(): void;
+        /**
+         * @deprecated Deprecated since Chrome 51. The mediaGalleries API no longer supports scanning.
+         * @description
+         * Show the user the scan results and let them add any or all of them as galleries.
+         * This should be used after the 'finish' onScanProgress() event has happened.
+         * All galleries the app has access to are returned, not just the newly added galleries.
+         */
+        function addScanResults(callback: (mediaFileSystems: FileSystem[]) => void): void;
+        /**
+         * Get metadata about a specific media file system
+         * @since Chrome 26.
+         */
+        function getMediaFileSystemMetadata(mediaFileSystem: FileSystem): MediaFileSystemMetadata;
+        /**
+         * @deprecated Deprecated since Chrome 51. Use getMediaFileSystemMetadata instead
+         * Get metadata for all available media galleries.
+         */
+        function getAllMediaFileSystemMetadata(callback: (metadatas: MediaFileSystemMetadata[]) => void): void;
+        /**
+         * Gets the media-specific metadata for a media file.
+         * This should work for files in media galleries as well as other DOM filesystems.
+         * @since Chrome 38.
+         */
+        function getMetadata(mediaFile: Blob, callback: (metadata: Metadata) => void): void;
+        /**
+         * Gets the media-specific metadata for a media file.
+         * This should work for files in media galleries as well as other DOM filesystems.
+         * @since Chrome 38.
+         */
+        function getMetadata(mediaFile: Blob, options: MetadataOptions, callback: (metadata: Metadata) => void): void;
+        /**
+         * Adds a gallery watch for the gallery with the specified gallery ID.
+         * The given callback is then fired with a success or failure result.
+         * @since Chrome 39.
+         */
+        function addGalleryWatch(galleryId: string, callback: (result: GalleryWatchResult) => void): void;
+        /**
+         * Removes a gallery watch for the gallery with the specified gallery ID.
+         * @since Chrome 39.
+         */
+        function removeGalleryWatch(galleryId: string): void;
+        /**
+         * @deprecated Deprecated since Chrome 51. Applications should store their own gallery watches as they are added.
+         * Notifies which galleries are being watched via the given callback.
+         */
+        function getAllGalleryWatch(callback: (galleryIds: string[]) => void): void;
+        /**
+         * @deprecated Deprecated since Chrome 51. Use removeGalleryWatch instead.
+         * Removes all gallery watches.
+         */
+        function removeAllGalleryWatch(): void;
+        /**
+         * Fired when a media gallery is changed or a gallery watch is dropped
+         * @since Chrome 38.
+         */
+        const onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
+        /**
+         * @deprecated Deprecated since Chrome 51. The mediaGalleries API no longer supports scanning.
+         * The pending media scan has changed state. See details for more information.
+         */
+        const onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
+    }
+    // #endregion
 
-        export var onGalleryChanged: chrome.events.Event<(args: GalleryChangedEventArgs) => void>;
-        export var onScanProgress: chrome.events.Event<(args: ScanProgressEventArgs) => void>;
+    // #region chrome.networking.*
+    ///////////////////////
+    // NETWORKING CONFIG //
+    ///////////////////////
+    /**
+     * @requires(CrOS) Chrome OS only.
+     * @requires Permissions: 'networking.config'
+     * @description
+     * Use the *networking.config* API to authenticate to captive portals.
+     */
+    namespace networking.config {
+        /** Indicator for the type of network used */
+        const NetworkType: {
+            'WI_FI': 'WiFi'
+        };
+        /**
+         * Argument to finishAuthentication indicating the result of the captive portal authentication attempt.
+         * **'unhandled':** - The extension does not handle this network or captive portal (e.g. server end-point not found or not compatible).
+         * **'succeeded':** - The extension handled this network and authenticated successfully.
+         * **'rejected':** - The extension handled this network, tried to authenticate, however was rejected by the server.
+         * **'failed':** - The extension handled this network, tried to authenticate, however failed due to an unspecified error.
+         */
+        const AuthenticationResult: {
+            UNHANDLED: 'unhandled',
+            SUCCEEDED: 'succeeded',
+            REJECTED: 'rejected',
+            FAILED: 'failed'
+        }
+        interface NetworkInfo {
+            /** Currently only WiFi supported. */
+            Type: ToStringLiteral<typeof NetworkType>;
+            /** A unique identifier of the network. */
+            GUID?: string;
+            /**
+             * A hex-encoded byte sequence.
+             */
+            HexSSID?: string;
+            /**
+             * The decoded SSID of the network (default encoding is UTF-8).
+             * To filter for non-UTF-8 SSIDs, use HexSSID instead.
+             */
+            SSID?: string;
+            /**
+             * The basic service set identification (BSSID) uniquely identifying the
+             * basic service set. *BSSID* is represented as a human readable,
+             * hex-encoded string with bytes separated by colons, e.g.
+             * 45:67:89:ab:cd:ef.
+             */
+            BSSID?: string;
+            /** Identifier indicating the security type of the network. */
+            Security?: 'None' | 'WEP-PSK' | 'WPA-PSK' | 'WPA-EAP';
+        }
+        interface NetworkInfoFilterHexSSID {
+            /**
+             * A hex-encoded byte sequence.
+             */
+            HexSSID?: string;
+        }
+        interface NetworkInfoFilterSSID {
+            /**
+             * The decoded SSID of the network (default encoding is UTF-8).
+             * To filter for non-UTF-8 SSIDs, use HexSSID instead.
+             */
+            SSID?: string;
+        }
+        /**
+         * 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.
+         * @param networks Network filters to set. Array of objects with either HexSSID or SSID set.
+         * @param callback Called back when this operation is finished.
+         */
+        function setNetworkFilter(networks: Array<NetworkInfoFilterHexSSID | NetworkInfoFilterSSID>, callback: () => void): void;
+        /**
+         * Called by the app to notify the network config API that it finished
+         * a captive portal authentication attempt and hand over the result of the attempt.
+         * This function must only be called with the GUID of the latest *onCaptivePortalDetected* event.
+         * @param GUID Unique network identifier obtained from *onCaptivePortalDetected*.
+         * @param result The result of the authentication attempt.
+         * @param [callback] Called back when this operation is finished.
+         */
+        function finishAuthentication(GUID: string, result: ToStringLiteral<typeof AuthenticationResult>, 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.
+         * @param networkInfo Information about the network on which a captive portal was detected.
+         */
+        const onCaptivePortalDetected: chrome.events.Event<(networkInfo: NetworkInfo) => void>;
     }
 
-    ////////////////////////////////////
-    // Open Network Configuration (ONC)
-    ////////////////////////////////////
+    //////////////////////////////////////
+    // Open Network Configuration (ONC) //
+    //////////////////////////////////////
     /**
-     * The chrome.networking.onc API is used for configuring network connections (Cellular, Ethernet, VPN, WiFi or WiMAX). This API is available in Chrome OS kiosk sessions.
-     * Network connection configurations are specified following Open Network Configuration (ONC) specification.
-     * NOTE: Most dictionary properties and enum values use UpperCamelCase to match the ONC specification instead of the JavaScript lowerCamelCase convention.
+     * @requires(CrOS kiosk mode) This API is available in Chrome OS kiosk sessions.
+     * @requires Permissions: 'networking.onc'
+     * @since Chrome 59
+     * @description
+     * The chrome.networking.onc API is used for configuring network connections
+     * (Cellular, Ethernet, VPN, WiFi or WiMAX).
+     * Network connection configurations are specified following
+     * @see[Open Network Configuration (ONC) specification.]{@link https://chromium.googlesource.com/chromium/src/+/master/components/onc/docs/onc_spec.md}
+     * @description
+     * **NOTE**
+     * Most interface properties and type values use UpperCamelCase to match
+     * the ONC specification instead of the JavaScript lowerCamelCase convention.
      */
     namespace 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';
-        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
+        type ActivationStateType = 'Activated' | 'Activating' | 'NotActivated' | 'PartiallyActivated';
+        type CaptivePortalStatus = 'Unknown' | 'Offline' | 'Online' | 'Portal' | 'ProxyAuthRequired';
+        type ConnectionStateType = 'Connected' | 'Connecting' | 'NotConnected'
+        type IPConfigType = 'DHCP' | 'Static'
+        type NetworkType = 'All' | 'Cellular' | 'Ethernet' | 'VPN' | 'Wireless' | 'WiFi' | 'WiMAX'
+        type ProxySettingsType = 'Direct' | 'Manual' | 'PAC' | 'WPAD';
+        /**
+         * Partial classes for internal use
+         * @internal
+         * @private
+         */
+        namespace _internal_ {
+            type ObjectFunction = 'unknown' | 'getter' | 'setter';
+            interface NetworkConfigBase<
+                M extends ManagedObject = 'unmanaged',
+                IF extends InterfaceType = 'full',
+                OF extends ObjectFunction = 'unknown'> {
+                /** For cellular networks, cellular network properties. */
+                Cellular?: IF extends 'partial' ? CellularBase : CellularProperties<M>;
+                /** For Ethernet networks, the Ethernet network properties. */
+                Ethernet?: IF extends 'partial' ? { Authentication: string; } : EthernetProperties<M>;
+                /** The network GUID. */
+                GUID?: string;
+                /** The network's IP address configuration type. */
+                IPAddressConfigType?: M extends 'managed' ? ManagedIPConfigType : IPConfigType;
+                /** A user friendly network name. */
+                Name?: M extends 'managed' ? ManagedDOMString : string;
+                /** The IP configuration type for the name servers used by the network. */
+                NameServersConfigType?: M extends 'managed' ? ManagedIPConfigType : IPConfigType;
+                /** The network priority. */
+                Priority?: M extends 'managed' ? ManagedLong : integer;
+                /** The network type. */
+                Type?: NetworkType;
+                /** For VPN networks, the network VPN properties. */
+                VPN?: IF extends 'partial' ? { Type: string; } : VPNProperties<M>;
+                /** For WiFi networks, the network WiFi properties. */
+                WiFi?: IF extends 'partial' ? WiFiPropertiesBase : WiFiProperties<M, OF>;
+                /** For WiMAX networks, the network WiMAX properties. */
+                WiMAX?: IF extends 'partial' ? { SignalStrength?: integer } : WiMAXProperties<M>;
+            }
         }
-        interface ManagedLong {
+        interface ManagedType<T> {
+            /** The active value currently used by the network configuration manager (e.g. Shill). */
+            Active?: T;
+            /** The source from which the effective property value was determined. */
+            Effective?: string;
+            /** The property value provided by the user policy. */
+            UserPolicy?: T;
+            /** The property value provided by the device policy. */
+            DevicePolicy?: T;
+            /** The property value set by the logged in user. Only provided if *UserEditable* is true. */
+            UserSetting?: T;
+            /** The value set for all users of the device. Only provided if *DeviceEditiable* is true. */
+            SharedSetting?: T;
             /**
-             * @description The active value currently used by the network configuration manager (e.g. Shill).
-             * @type {number}
-             * @memberof ManagedLong
+             * Whether a UserPolicy for the property exists and allows the property
+             * to be edited (i.e. the policy set recommended property value).
+             * @default false
              */
-            Active?: number,
+            UserEditable?: boolean;
             /**
-             * @description The source from which the effective property value was determined.
-             * @type {string}
-             * @memberof ManagedLong
+             * Whether a DevicePolicy for the property exists and allows the property
+             * to be edited (i.e. the policy set recommended property value).
+             * @default false
              */
-            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
+            DeviceEditable?: boolean;
         }
-    }
+        interface ManagedBoolean extends ManagedType<boolean> { }
+        interface ManagedLong extends ManagedType<integer> { }
+        interface ManagedDOMString extends ManagedType<string> { }
+        interface ManagedDOMStringList extends ManagedType<string[]> { }
+        interface ManagedIPConfigType extends ManagedType<IPConfigType[]> { }
 
-    ////////////////////
-    // Notifications
-    // https://developer.chrome.com/extensions/notifications
-    ////////////////////
+        interface CellularProviderProperties {
+            /** The operator name. */
+            Name: string;
+            /** Cellular network ID as a simple concatenation of the network's MCC (Mobile Country Code) and MNC (Mobile Network Code). */
+            Code: string;
+            /** The two-letter country code. */
+            Country?: string;
+        }
+        interface IssuerSubjectPattern {
+            /** If set, the value against which to match the certificate subject's common name. */
+            CommonName?: string;
+            /** If set, the value against which to match the certificate subject's common location. */
+            Locality?: string;
+            /**
+             * If set, the value against which to match the certificate subject's organizations.
+             * At least one organization should match the value.
+             */
+            Organization?: string;
+            /**
+             * If set, the value against which to match the certificate subject's organizational units.
+             * At least one organizational unit should match the value.
+             */
+            OrganizationalUnit?: string;
+        }
+        interface CertPattern {
+            /**
+             * List of URIs to which the user can be directed in case
+             * no certificates that match this pattern are found.
+             */
+            EnrollmentURI?: string[];
+            /**
+             * If set, pattern against which X.509 issuer settings should be matched.
+             */
+            Issuer?: IssuerSubjectPattern;
+            /**
+             * List of certificate issuer CA certificates.
+             * A certificate must be signed by one of them in order to match this pattern.
+             */
+            IssuerCARef?: string[];
+            /**
+             * If set, pattern against which X.509 subject settings should be matched.
+             */
+            IssuerSubjectPattern?: IssuerSubjectPattern;
+        }
+        type ClientCertType = 'Ref' | 'Pattern';
+        interface EAPProperties {
+            AnonymousIdentity?: string;
+            ClientCertPattern?: CertPattern;
+            /** @since Chrome 60. */
+            ClientCertPKCS11Id?: string;
+            ClientCertRef?: string;
+            ClientCertType?: ClientCertType;
+            Identity?: string;
+            Inner?: string;
+            /** The outer EAP type. Required by ONC, but may not be provided when translating from Shill. */
+            Outer?: string;
+            Password?: string;
+            SaveCredentials?: boolean;
+            ServerCAPEMs?: string[];
+            ServerCARefs?: string[];
+            /** @since Chrome 60. */
+            SubjectMatch?: ManagedDOMString;
+            UseProactiveKeyCaching?: boolean;
+            UseSytemCAs?: boolean;
+        }
+        interface FoundNetworkProperties {
+            /** Network availability. */
+            Status: string;
+            /** Network ID. */
+            NetworkId: string;
+            /** Access technology used by the network. */
+            Technology: string;
+            /** The network operator's short-format name. */
+            ShortName?: string;
+            /** The network operator's long-format name. */
+            LongName?: string;
+        }
+        type IPConfigurationType = 'IPv4' | 'IPv6';
+        interface IPConfigProperties<M extends ManagedObject = 'unmanaged',
+            B = M extends 'managed' ? ManagedBoolean : boolean,
+            S = M extends 'managed' ? ManagedDOMString : string,
+            SL = M extends 'managed' ? ManagedDOMStringList : string[],
+            L = M extends 'managed' ? ManagedLong : integer> {
+            /** Gateway address used for the IP configuration. */
+            Gateway?: S;
+            /** The IP address for a connection. Can be IPv4 or IPv6 address, depending on value of Type. */
+            IPAddress?: S;
+            /** Array of addresses used for name servers. */
+            NameServers?: SL;
+            /** The routing prefix. */
+            RoutingPrefix?: L;
+            /** The IP configuration type. Can be IPv4 or IPv6. */
+            Type?: M extends 'managed' ? ManagedType<IPConfigurationType> : IPConfigurationType;
+            /** The URL for WEb Proxy Auto-Discovery, as reported over DHCP. */
+            WebProxyAutoDiscoveryUrl?: S;
+        }
+        interface PaymentPortalPost {
+            /** The HTTP method to use for the payment portal. */
+            Method: 'POST';
+            /** The post data to send to the payment portal. */
+            PostData?: string;
+            /** The payment portal URL. */
+            Url?: string;
+        }
+        interface PaymentPortal {
+            /** The HTTP method to use for the payment portal. */
+            Method: string;
+            /** The payment portal URL. */
+            Url?: string;
+        }
+        interface ProxyLocation {
+            /** The proxy IP address host. */
+            Host?: string;
+            /** The port to use for the proxy */
+            Port?: integer;
+        }
+        interface ManagedProxyLocation {
+            /** The proxy IP address host. */
+            Host?: ManagedDOMString;
+            /** The port to use for the proxy */
+            Port?: ManagedLong;
+        }
+        interface ManualProxySettings<M,
+            P = M extends 'managed' ? ManagedProxyLocation : ProxyLocation> {
+            /** Settings for HTTP proxy. */
+            HTTPProxy?: P;
+            /** Settings for secure HTTP proxy. */
+            SecureHTTPProxy?: P;
+            /** Settings for FTP proxy. */
+            FTPProxy?: P;
+            /** Settings for SOCKS proxy. */
+            SOCKS?: P;
+        }
+        interface ProxySettings<M = 'unmanaged',
+            S = M extends 'managed' ? ManagedDOMString : string,
+            SL = M extends 'managed' ? ManagedDOMStringList : string[]> {
+            /** The type of proxy settings. */
+            Type: M extends 'managed' ? ManagedType<ProxySettingsType> : ProxySettingsType;
+            /** Manual proxy settings - used only for *Manual* proxy settings. */
+            Manual?: ManualProxySettings<M>;
+            /** Domains and hosts for which manual proxy settings are excluded. */
+            ExcludeDomains?: SL;
+            /** URL for proxy auto-configuration file. */
+            PAC?: S;
+        }
+        interface SIMLockStatus {
+            /** The status of SIM lock - possible values are 'sim-pin', 'sim-puk' and ''. */
+            LockType: 'sim-pin' | 'sim-puk' | '';
+            /** Whether SIM lock is enabled. */
+            LockEnabled: boolean;
+            /** Number of PIN lock tries allowed before PUK is required to unlock the SIM. */
+            RetriesLeft?: integer;
+        }
+        interface ThirdPartyVPNProperties {
+            /** ID of the third-party VPN provider extension. */
+            ExtensionID: string;
+            /** The VPN provider name. */
+            ProviderName?: string;
+        }
+        interface ManagedThirdPartyVPNProperties {
+            /** ID of the third-party VPN provider extension. */
+            ExtensionID: ManagedDOMString;
+            /** The VPN provider name. */
+            ProviderName?: string;
+        }
+        interface CellularBase {
+            /** Carrier account activation state. */
+            ActivationState?: ActivationStateType;
+            /** If the modem is registered on a network, the network technology currently in use. */
+            NetworkTechnology?: string;
+            /** The roaming state of the cellular modem on the current network. */
+            RoamingState?: string;
+            /** Whether a SIM card is present. */
+            SIMPresent?: boolean;
+            /** The current network signal strength. */
+            SignalStrength?: integer;
+        }
+        interface CellularProperties<M extends ManagedObject = 'unmanaged'> extends CellularBase {
+            /** Whether the cellular network should be connected automatically (when in range). */
+            AutoConnect?: M extends 'managed' ? ManagedBoolean : boolean;
+            /** The cellular network activation type. */
+            ActivationType?: string;
+            /** Whether roaming is allowed for the network. */
+            AllowRoaming?: boolean;
+            /** The name of the carrier for which the cellular device is configured. */
+            Carrier?: M extends 'managed' ? ManagedDOMString : string;
+            /** Cellular device technology family - CDMA or GSM. */
+            Family?: 'CDMA' | 'GSM';
+            /** The firmware revision loaded in the cellular modem. */
+            FirmwareRevision?: string;
+            /** The list of networks found during the most recent network scan. */
+            FoundNetworks?: FoundNetworkProperties[];
+            /** The cellular modem hardware revision. */
+            HardwareRevision?: string;
+            /** Information about the operator that issued the SIM card currently installed in the modem. */
+            HomeProvider?: CellularProviderProperties;
+            /** The cellular modem manufacturer. */
+            MAnufacturer?: string;
+            /** The cellular modem model ID. */
+            ModelID?: string;
+            /** Online payment portal a user can use to sign-up for or modify a mobile data plan. */
+            PaymentPortal?: PaymentPortal | PaymentPortalPost;
+            /** The revision of the Preferred Roaming List loaded in the modem. */
+            PRLVersion?: integer;
+            /**
+             * @since Chrome 63.
+             * True when a cellular network scan is in progress.
+             */
+            Scanning?: boolean;
+            /** Information about the operator on whose network the modem is currently registered. */
+            ServingOperator?: CellularProviderProperties;
+            /** The state of SIM lock for GSM family networks. */
+            SIMLockStatus?: SIMLockStatus;
+            /** Whether the cellular network supports scanning. */
+            SupportNetworkScan?: boolean;
+            /** A list of supported carriers. */
+            SupportedCarriers?: string[];
+        }
+        type EthernetAuthenticationType = 'None' | '8021X';
+        interface EthernetProperties<M extends ManagedObject = 'unmanaged'> {
+            /** Whether the Ethernet network should be connected automatically. */
+            AutoConnect?: M extends 'managed' ? ManagedBoolean : boolean;
+            /** The authentication used by the Ethernet network. Possible values are None and 8021X. */
+            Authentication?: M extends 'managed' ? ManagedType<EthernetAuthenticationType> : EthernetAuthenticationType;
+            /** Network's EAP settings. Required for 8021X authentication. */
+            EAP?: EAPProperties;
+        }
+        interface VPNProperties<M extends ManagedObject = 'unmanaged',
+            B = M extends 'managed' ? ManagedBoolean : boolean,
+            S = M extends 'managed' ? ManagedDOMString : string> {
+            /** Whether the VPN network should be connected automatically. */
+            AutoConnect?: B;
+            /** The VPN host. */
+            Host?: S;
+            /**
+             * The VPN type.
+             * This cannot be an enum because of 'L2TP-IPSec'.
+             * This is optional for NetworkConfigProperties which is passed to
+             * *setProperties* which may be used to set only specific properties.
+             */
+            Type?: S;
+        }
+        interface WiFiPropertiesBase<M extends ManagedObject = 'unmanaged',
+            S = M extends 'managed' ? ManagedDOMString : string> {
+            /** The BSSID of the associated access point.. */
+            BSSID?: string;
+            /**
+             * The WiFi service operating frequency in MHz.
+             * For connected networks, the current frequency on which the network is connected.
+             * Otherwise, the frequency of the best available BSS.
+             */
+            Frequency?: integer;
+            /** HEX-encoded copy of the network SSID. */
+            HexSSID?: S;
+            /** The network security type. */
+            Security?: S;
+            /** The network SSID. */
+            SSID?: S;
+            /** The network signal strength. */
+            SignalStrength?: integer;
+        }
+        interface WiFiProperties<M extends ManagedObject = 'unmanaged',
+            OF extends _internal_.ObjectFunction = 'getter',
+            B = M extends 'managed' ? ManagedBoolean : boolean,
+            S = M extends 'managed' ? ManagedDOMString : string,
+            L = M extends 'managed' ? ManagedLong : integer>
+            extends WiFiPropertiesBase<M> {
+            /**
+             * Whether ARP polling of default gateway is allowed.
+             * @default true
+             */
+            AllowGatewayARPPolling?: B;
+            /** Whether the WiFi network should be connected automatically when in range. */
+            AutoConnect?: B;
+            /** The network EAP properties. Required for WEP-8021X and WPA-EAP networks. */
+            EAP?: EAPProperties;
+            /** Contains all operating frequency recently seen for the WiFi network. */
+            FrequencyList?: integer[];
+            /** Whether the network SSID will be broadcast. */
+            HiddenSSID?: B;
+            /** Signal-to-noise value (in dB) below which roaming to a new network should be attempted. */
+            RoamTreshold?: L;
+            /**
+             * @since Chrome 66.
+             * The passphrase for WEP/WPA/WPA2 connections.
+             * *This property can only be set!*
+             */
+            Passphrase?: OF extends 'setter' ? string : never;
+        }
+        interface WiMAXProperties<M extends ManagedObject = 'unmanaged',
+            B = M extends 'managed' ? ManagedBoolean : boolean> {
+            /** Whether the network should be connected automatically. */
+            AutoConnect?: B;
+            /** The network EAP properties. */
+            EAP?: EAPProperties;
+            /** The network signal strength. */
+            SignalStrength?: integer;
+        }
+        type ManagedObject = 'managed' | 'unmanaged';
+        type InterfaceType = 'partial' | 'full';
+
+        interface NetworkConfigProperties<OF extends _internal_.ObjectFunction = 'unknown'>
+            extends _internal_.NetworkConfigBase<'unmanaged', 'full', OF> { }
+
+        interface NetworkProperties<
+            M extends ManagedObject = 'unmanaged',
+            IF extends InterfaceType = 'full'> extends _internal_.NetworkConfigBase<M, IF, 'getter'> {
+            /** Whether the network is connectable. */
+            Connectable?: boolean;
+            /** The network's current connection state. */
+            ConnectionState?: ConnectionStateType;
+            /** The last recorded network error state. */
+            ErrorState?: string;
+            /** The network's IP configuration. */
+            IPConfigs?: IPConfigProperties[];
+            /** The network's MAC address. */
+            MacAddress?: string;
+            /** The network's proxy settings. */
+            ProxySettings?: ProxySettings;
+            /**
+             * For a connected network, whether the network connectivity to the Internet is limited,
+             * e.g. if the network is behind a portal, or a cellular network is not activated.
+             */
+            RestrictedConnectivity?: boolean;
+            /** The network's static IP configuration. */
+            StaticIPConfig?: IPConfigProperties<M>;
+            /** IP configuration that was received from the DHCP server before applying static IP configuration. */
+            SavedIPConfig?: IPConfigProperties;
+            /**
+             * Indicates whether and how the network is configured.
+             * 'None' conflicts with extension code generation,
+             * so we must use a string for 'Source' instead of a SourceType enum.
+             */
+            Source?: 'Device' | 'DevicePolicy' | 'User' | 'UserPolicy' | 'None';
+        }
+        interface ManagedProperties extends NetworkProperties<'managed'> { }
+        interface NetworkStateProperties extends NetworkProperties<'unmanaged', 'partial'> { }
+
+        /** Describes which networks to return. */
+        interface Filter {
+            /** The type of networks to return. */
+            networkType: NetworkType;
+            /**
+             * If true, only include visible (physically connected or in-range) networks.
+             * @default false
+             */
+            visible?: boolean;
+            /**
+             * If true, only include configured (saved) networks.
+             * @default false
+             */
+            configured?: boolean;
+            /**
+             * Maximum number of networks to return.
+             * Use 0 for no limit
+             * @default 1000 if unspecified.
+             * */
+            limit?: integer;
+        }
+
+        /* The current state of the device. */
+        type DeviceState = 'Uninitialized' | 'Disabled' | 'Enabling' | 'Enabled' | 'Prohibited';
+
+        /** A list of devices and their state. */
+        interface DeviceStates {
+            /** Set if the device is enabled. True if the device is currently scanning. */
+            Scanning?: boolean;
+            /** The SIM lock status if Type = Cellular and SIMPresent = True. */
+            SIMLockStatus?: SIMLockStatus;
+            /** Set to the SIM present state if the device type is Cellular. */
+            SIMPresent?: boolean;
+            /**
+             * The current state of the device.
+             *
+             * **Uninitialized**
+             *  - Device is available but not initialized.
+             * **Disabled**
+             *  - Device is initialized but not enabled.
+             * **Enabling**
+             *  - Enabled state has been requested but has not completed.
+             * **Enabled**
+             *  - Device is enabled.
+             * **Prohibited**
+             *  - Device is prohibited.
+             */
+            State: DeviceState;
+            /** The network type associated with the device (Cellular, Ethernet, WiFi, or WiMAX). */
+            Type: NetworkType;
+        }
+
+        interface GlobalPolicy {
+            /**
+             * If true, only policy networks may auto connect.
+             * @default false
+             */
+            AllowOnlyPolicyNetworksToAutoconnect?: boolean;
+            /**
+             * If true, only policy networks may be connected to
+             * and no new networks may be added or configured.
+             * @default false
+             */
+            AllowOnlyPolicyNetworksToConnect?: boolean;
+            /**
+             * List of blacklisted networks.
+             * Connections to blacklisted networks are prohibited.
+             * Networks can be whitelisted again by specifying an explicit network configuration.
+             * @default []
+             */
+            BlacklistedHexSSIDs?: string[];
+        }
+
+        /**
+         * Gets all the properties of the network with id *networkGuid*.
+         * Includes all properties of the network (read-only and read/write values).
+         * @param networkGuid The GUID of the network to get properties for.
+         * @param callback Called with the network properties when received.
+         */
+        function getProperties(networkGuid: string, callback: (result: NetworkProperties) => void): void;
+        /**
+         * Gets the merged properties of the network with id networkGuid from the sources:
+         * User settings, shared settings, user policy, device policy and the currently active settings.
+         * @param networkGuid The GUID of the network to get properties for.
+         * @param callback Called with the managed network properties when received.
+         */
+        function getManagedProperties(networkGuid: string, callback: (result: ManagedProperties) => void): void;
+        /**
+         * Gets the cached read-only properties of the network with id *networkGuid*.
+         * This is meant to be a higher performance function than *getProperties*,
+         * which requires a round trip to query the networking subsystem.
+         * The following properties are returned for all networks:
+         * GUID, Type, Name, WiFi.Security.
+         * Additional properties are provided for visible networks:
+         * ConnectionState, ErrorState, WiFi.SignalStrength,
+         * Cellular.NetworkTechnology, Cellular.ActivationState, Cellular.RoamingState.
+         * @param networkGuid The GUID of the network to get properties for.
+         * @param callback Called immediately with the network state properties.
+         */
+        function getState(networkGuid: string, callback: (result: NetworkStateProperties) => void): void;
+        /**
+         * Sets the properties of the network with id *networkGuid*.
+         * This is only valid for configured networks (Source != None).
+         * Unconfigured visible networks should use **createNetwork** instead.
+         * **In kiosk sessions, calling this method on a shared network will fail.**
+         * @param networkGuid The GUID of the network to set properties for.
+         * @param properties The properties to set.
+         * @param [callback] Called when the operation has completed.
+         */
+        function setProperties(networkGuid: string, properties: NetworkConfigProperties<'setter'>, callback?: () => void): void;
+        /**
+         * Creates a new network configuration from properties.
+         * If a matching configured network already exists, this will fail.
+         * Otherwise returns the GUID of the new network.
+         * @param shared If true, share this network configuration with other users.
+         *               Note: This option is exposed only to Chrome's Web UI.
+         *               When called by apps, false is the only allowed value.
+         * @param properties The properties to configure the new network with.
+         * @param [callback] Called with the GUID for the new network configuration once the network has been created.
+         */
+        function createNetwork(shared: false, properties: NetworkConfigProperties<'setter'>, callback?: () => void): void;
+        /**
+         * Forgets a network configuration by clearing any configured properties for the network with GUID networkGuid.
+         * This may also include any other networks with matching identifiers (e.g. WiFi SSID and Security).
+         * If no such configuration exists, an error will be set and the operation will fail.
+         * **In kiosk sessions, this method will not be able to forget shared network configurations.**
+         * @param networkGuid The GUID of the network to forget.
+         * @param [callback] Called when the operation has completed.
+         */
+        function forgetNetwork(networkGuid: string, callback?: () => void): void;
+        /**
+         * Returns a list of network objects with the same properties provided by *getState*.
+         * A filter is provided to specify the type of networks returned and to limit the number of networks.
+         * Networks are ordered by the system based on their priority, with connected or connecting networks listed first.
+         * @param callback Called with a interface of networks and their state properties when received.
+         */
+        function getNetworks(filter: Filter, callback: (result: NetworkStateProperties[]) => void): void;
+        /**
+         * Returns states of available networking devices.
+         * @param callback Called with a list of devices and their state.
+         */
+        function getDeviceStates(callback: (result: DeviceStates[]) => void): void;
+        /**
+         * Enables any devices matching the specified network type.
+         * Note, the type might represent multiple network types (e.g. 'Wireless').
+         * @param networkType The type of network to enable.
+         */
+        function enableNetworkType(networkType: NetworkType): void;
+        /**
+         * Disables any devices matching the specified network type.
+         * Note, the type might represent multiple network types (e.g. 'Wireless').
+         * @param networkType The type of network to disable.
+         */
+        function disableNetworkType(networkType: NetworkType): void;
+        /**
+         * Requests that the networking subsystem scan for new networks and update the list returned by *getVisibleNetworks*.
+         * This is only a request: the network subsystem can choose to ignore it.
+         * If the list is updated, then the *onNetworkListChanged* event will be fired.
+         */
+        function requestNetworkScan(): void;
+        /**
+         * Requests that the networking subsystem scan for new networks and update the list returned by *getVisibleNetworks*.
+         * This is only a request: the network subsystem can choose to ignore it.
+         * If the list is updated, then the *onNetworkListChanged* event will be fired.
+         * @param networkType If provided, requests a scan specific to the type. For Cellular a mobile network scan will be requested if supported.
+         * @since Chrome 63.
+         */
+        function requestNetworkScan(networkType: NetworkType): void;
+        /**
+         * @description Starts a connection to the network with networkGuid.
+         * @param networkGuid The GUID of the network to connect to.
+         * @param [callback] Creates a new network configuration from properties.
+         *                   If a matching configured network already exists, this will fail.
+         *                   Otherwise returns the GUID of the new network.
+         */
+        function startConnect(networkGuid: string, callback?: () => void): void;
+        /**
+         * @description Starts a disconnect from the network with networkGuid.
+         * @param networkGuid The GUID of the network to connect to.
+         * @param [callback] Called when the disconnect request has been sent. See note for *startConnect*.
+         */
+        function startDisconnect(networkGuid: string, callback?: () => void): void;
+        /**
+         * Returns captive portal status for the network matching 'networkGuid'.
+         * @param networkGuid The GUID of the network to get captive portal status for.
+         * @param callback A callback function that returns the results of the query for network captive portal status.
+         */
+        function getCaptivePortalStatus(networkGuid: string, callback: (result: CaptivePortalStatus) => void): void;
+        /**
+         * Gets the global policy properties.
+         * These properties are not expected to change during a session.
+         */
+        function getGlobalPolicy(callback: (result: GlobalPolicy) => void): void;
+
+        //
+        // EVENTS
+        //
+
+        /**
+         * Fired when the properties change on any of the networks.
+         * Sends a list of GUIDs for networks whose properties have changed.
+         */
+        const onNetworksChanged: chrome.events.Event<(changes: string[]) => void>;
+        /**
+         * Fired when the list of networks has changed. Sends a complete list of GUIDs for all the current networks.
+         */
+        const onNetworkListChanged: chrome.events.Event<(changes: string[]) => void>;
+        /**
+         * Fired when the list of devices has changed or any device state properties have changed.
+         */
+        const onDeviceStateListChanged: chrome.events.Event<() => void>;
+        /**
+         * Fired when a portal detection for a network completes.
+         * Sends the GUID of the network and the corresponding captive portal status.
+         */
+        const onPortalDetectionCompleted: chrome.events.Event<(networkGuid: string, status: CaptivePortalStatus) => void>;
+    }
+    // #endregion chrome.networking.*
+
+    // #region chrome.notifications
+    ///////////////////
+    // Notifications //
+    ///////////////////
     /**
-     * Use the chrome.notifications API to create rich notifications using templates and show these notifications to users in the system tray.
-     * Permissions:  "notifications"
+     * Use the chrome.notifications API to create rich notifications using
+     * templates and show these notifications to users in the system tray.
+     * @requires Permissions: 'notifications'
      * @since Chrome 28.
+     * @see[Docs]{@link https://developer.chrome.com/extensions/notifications}
      */
     namespace notifications {
+        /**
+         * @enum
+         * @prop BASIC - icon, title, message, expandedMessage, up to two buttons.
+         * @prop IMAGE - icon, title, message, expandedMessage, image, up to two buttons.
+         * @prop LIST - icon, title, message, items, up to two buttons. Users on Mac OS X only see the first item.
+         * @prop PROGRESS - icon, title, message, progress, up to two buttons.
+         */
+        const TemplateType: {
+            BASIC: 'basic',
+            IMAGE: 'image',
+            LIST: 'list',
+            PROGRESS: 'progress'
+        }
+        /**
+         * @enum
+         * @property GRANTED - User has elected to show notifications from the app . This is the default at install time.
+         * @property DENIED - User has elected not to show notifications from the app.
+         */
+        const PermissionLevel: {
+            GRANTED: 'granted',
+            DENIED: 'denied'
+        }
+
         interface ButtonOptions {
             title: string;
             iconUrl?: string;
@@ -2088,241 +6313,433 @@ declare namespace chrome {
         }
 
         interface NotificationOptions {
-            /** Optional. Which type of notification to display. Required for notifications.create method. */
-            type?: string;
+            /**
+             * Which type of notification to display. Required for notifications.create method.
+             * @see enum TemplateType
+             */
+            type: ToStringLiteral<typeof TemplateType>;
             /**
              * Optional.
              * A URL to the sender's avatar, app icon, or a thumbnail for image notifications.
-             * URLs can be a data URL, a blob URL, or a URL relative to a resource within this extension's .crx file Required for notifications.create method.
+             * URLs can be a data URL, a blob URL, or a URL relative to a resource within this app's .crx file Required for notifications.create method.
              */
-            iconUrl?: string;
-            /** Optional. Title of the notification (e.g. sender name for email). Required for notifications.create method. */
-            title?: string;
-            /** Optional. Main notification content. Required for notifications.create method. */
-            message?: string;
+            iconUrl: string;
+
+            /**
+             * @deprecated since Chrome 59. The app icon mask is not visible for Mac OS X users.
+             * A URL to the app icon mask. URLs have the same restrictions as iconUrl.
+             * The app icon mask should be in alpha channel,
+             * as only the alpha channel of the image will be considered.
+             */
+            appIconMaskUrl?: string;
+
+            /** Title of the notification (e.g. sender name for email). Required for notifications.create method. */
+            title: string;
+
+            /** Main notification content. Required for notifications.create method. */
+            message: string;
+
             /**
-             * Optional.
              * Alternate notification content with a lower-weight font.
              * @since Chrome 31.
              */
             contextMessage?: string;
-            /** Optional. Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest. Zero is default. */
-            priority?: number;
-            /** Optional. A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
-            eventTime?: number;
-            /** Optional. Text and icons for up to two notification action buttons. */
+
+            /**
+             * Priority ranges from -2 to 2. -2 is lowest priority. 2 is highest.
+             * On platforms that don't support a notification center (Windows, Linux & Mac),
+             * -2 and -1 result in an error as notifications with those priorities will not be shown at all.
+             * @default 0
+             */
+            priority?: -2 | -1 | 0 | 1 | 2;
+
+            /** A timestamp associated with the notification, in milliseconds past the epoch (e.g. Date.now() + n). */
+            eventTime?: double;
+
+            /** Text and icons for up to two notification action buttons. */
             buttons?: ButtonOptions[];
-            /** Optional. Items for multi-item notifications. */
+
+            /**
+             * @deprecated Deprecated since Chrome 59. The image is not visible for Mac OS X users.
+             * A URL to the image thumbnail for image-type notifications.
+             * URLs have the same restrictions as iconUrl.
+             */
+            imageUrl?: string;
+
+            /**
+             * Items for multi-item notifications.
+             * Items for multi-item notifications. Users on Mac OS X only see the first item.
+             */
             items?: ItemOptions[];
+
             /**
-             * Optional.
              * Current progress ranges from 0 to 100.
              * @since Chrome 30.
              */
-            progress?: number;
+            progress?: integer;
+
             /**
-             * Optional.
              * Whether to show UI indicating that the app will visibly respond to clicks on the body of a notification.
              * @since Chrome 32.
              */
             isClickable?: boolean;
+
             /**
-             * Optional.
-             * A URL to the app icon mask. URLs have the same restrictions as iconUrl. The app icon mask should be in alpha channel, as only the alpha channel of the image will be considered.
-             * @since Chrome 38.
-             */
-            appIconMaskUrl?: string;
-            /** Optional. A URL to the image thumbnail for image-type notifications. URLs have the same restrictions as iconUrl. */
-            imageUrl?: string;
-            /**
-             * Indicates that the notification should remain visible on screen until the user activates or dismisses the notification.
+             * Indicates that the notification should remain visible
+             * on screen until the user activates or dismisses the notification.
              * This defaults to false.
              * @since Chrome 50
              */
             requireInteraction?: boolean;
         }
 
-        interface NotificationClosedEvent extends chrome.events.Event<(notificationId: string, byUser: boolean) => void> { }
-
-        interface NotificationClickedEvent extends chrome.events.Event<(notificationId: string) => void> { }
-
-        interface NotificationButtonClickedEvent extends chrome.events.Event<(notificationId: string, buttonIndex: number) => void> { }
-
-        interface NotificationPermissionLevelChangedEvent extends chrome.events.Event<(level: string) => void> { }
-
-        interface NotificationShowSettingsEvent extends chrome.events.Event<() => void> { }
-
         /** The notification closed, either by the system or by user action. */
-        export var onClosed: NotificationClosedEvent;
+        const onClosed: chrome.events.Event<(notificationId: string, byUser: boolean) => void>;
         /** The user clicked in a non-button area of the notification. */
-        export var onClicked: NotificationClickedEvent;
+        const onClicked: chrome.events.Event<(notificationId: string) => void>;
         /** The user pressed a button in the notification. */
-        export var onButtonClicked: NotificationButtonClickedEvent;
+        const onButtonClicked: chrome.events.Event<(notificationId: string, buttonIndex: integer) => void>;
         /**
          * The user changes the permission level.
          * @since Chrome 32.
          */
-        export var onPermissionLevelChanged: NotificationPermissionLevelChangedEvent;
+        const onPermissionLevelChanged: chrome.events.Event<(level: string) => void>;
         /**
          * The user clicked on a link for the app's notification settings.
          * @since Chrome 32.
          */
-        export var onShowSettings: NotificationShowSettingsEvent;
+        const onShowSettings: chrome.events.Event<() => void>;
 
         /**
          * Creates and displays a notification.
-         * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
+         * @param notificationId Identifier of the notification.
+         * If not set or empty, an ID will automatically be generated.
+         * If it matches an existing notification, this method first
+         * clears that notification before proceeding with the create operation.
          * The notificationId parameter is required before Chrome 42.
          * @param options Contents of the notification.
-         * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-         * The callback is required before Chrome 42.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(string notificationId) {...};
+         * @param [callback] Returns the notification id (either supplied or generated) that represents the created notification.
          */
-        export function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
+        function create(notificationId: string, options: NotificationOptions, callback?: (notificationId: string) => void): void;
         /**
          * Creates and displays a notification.
-         * @param notificationId Identifier of the notification. If not set or empty, an ID will automatically be generated. If it matches an existing notification, this method first clears that notification before proceeding with the create operation.
-         * The notificationId parameter is required before Chrome 42.
+         * @param notificationId Identifier of the notification.
          * @param options Contents of the notification.
-         * @param callback Returns the notification id (either supplied or generated) that represents the created notification.
-         * The callback is required before Chrome 42.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(string notificationId) {...};
+         * @param [callback] Returns the notification id (either supplied or generated) that represents the created notification.
          */
-        export function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
+        function create(options: NotificationOptions, callback?: (notificationId: string) => void): void;
         /**
          * Updates an existing notification.
          * @param notificationId The id of the notification to be updated. This is returned by notifications.create method.
          * @param options Contents of the notification to update to.
-         * @param callback Called to indicate whether a matching notification existed.
-         * The callback is required before Chrome 42.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean wasUpdated) {...};
+         * @param [callback] Called to indicate whether a matching notification existed.
          */
-        export function update(notificationId: string, options: NotificationOptions, callback?: (wasUpdated: boolean) => void): void;
+        function update(notificationId: string, options: Partial<NotificationOptions>, callback?: (wasUpdated: boolean) => void): void;
+
         /**
          * Clears the specified notification.
          * @param notificationId The id of the notification to be cleared. This is returned by notifications.create method.
          * @param callback Called to indicate whether a matching notification existed.
-         * The callback is required before Chrome 42.
-         * If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean wasCleared) {...};
          */
-        export function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+        function clear(notificationId: string, callback?: (wasCleared: boolean) => void): void;
+
         /**
-         * Retrieves all the notifications.
+         * Retrieves all the active notifications.
          * @since Chrome 29.
          * @param callback Returns the set of notification_ids currently in the system.
-         * The callback parameter should be a function that looks like this:
-         * function(object notifications) {...};
+         * Get list of notifications ids using Object.keys();
+         * @example
+         * getAll((result) => {
+         *  console.log('Active notifications:', Object.keys(result));
+         * });
          */
-        export function getAll(callback: (notifications: Object) => void): void;
+        function getAll(callback: (notifications: { [notificationId: string]: true }) => void): void;
+
         /**
-         * Retrieves whether the user has enabled notifications from this app or extension.
+         * Retrieves whether the user has enabled notifications from this app .
          * @since Chrome 32.
          * @param callback Returns the current permission level.
-         * The callback parameter should be a function that looks like this:
-         * function( PermissionLevel level) {...};
+         * @see enum PermissionLevel
          */
-        export function getPermissionLevel(callback: (level: string) => void): void;
+        function getPermissionLevel(callback: (level: ToStringLiteral<typeof PermissionLevel>) => void): void;
     }
+    // #endregion
 
-    ////////////////////
-    // Permissions
-    ////////////////////
+    // #region chrome.permissions
+    /////////////////
+    // Permissions //
+    /////////////////
     /**
-     * Use the chrome.permissions API to request declared optional permissions at run time rather than install time, so users understand why the permissions are needed and grant only those that are necessary.
+     * Use the chrome.permissions API to request declared optional permissions at run time rather than install time,
+     * so users understand why the permissions are needed and grant only those that are necessary.
      * @since Chrome 16.
      */
     namespace permissions {
         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.
+             * List of named permissions (does not include hosts or origins).
+             * Anything listed here must appear in the optional_permissions list in the manifest.
              */
-            origins?: string[];
+            permissions?: chrome.runtime.OptionalPermission[];
             /**
-             * Optional.
-             * List of origin permissions. Anything listed here must be a subset of a host that appears in the optional_permissions list in the manifest. For example, if http://*.example.com/ or http://* appears in optional_permissions, you can request an origin of http://help.example.com/. Any path is ignored.
+             * List of origin permissions.
+             * Anything listed here must be a subset of a host that appears in the
+             * optional_permissions list in the manifest. For example, if
+             * http://*.example.com/ or http://* appears in optional_permissions,
+             * you can request an origin of http://help.example.com/.
+             * Any path is ignored.
              */
-            permissions?: string[];
+            origins?: chrome.runtime.UrlMatches[] | string[];
         }
 
-        interface PermissionsRemovedEvent {
-            /**
-             * @param callback The callback parameter should be a function that looks like this:
-             * function( Permissions permissions) {...};
-             * Parameter permissions: The permissions that have been removed.
-             */
-            addListener(callback: (permissions: Permissions) => void): void;
-        }
-
-        interface PermissionsAddedEvent {
-            /**
-             * @param callback The callback parameter should be a function that looks like this:
-             * function( Permissions permissions) {...};
-             * Parameter permissions: The newly acquired permissions.
-             */
-            addListener(callback: (permissions: Permissions) => void): void;
-        }
+        interface PermissionEvent extends chrome.events.Event<(permissions: Permissions) => void> { }
 
         /**
-         * Checks if the extension has the specified permissions.
-         * @param callback The callback parameter should be a function that looks like this:
-         * function(boolean result) {...};
-         * Parameter result: True if the extension has the specified permissions.
+         * Checks if the app has the specified permissions.
+         * @param callback Parameter *result*: True if the app has the specified permissions.
          */
-        export function contains(permissions: Permissions, callback: (result: boolean) => void): void;
+        function contains(permissions: Permissions, callback: (result: boolean) => void): void;
         /**
-         * Gets the extension's current set of permissions.
-         * @param callback The callback parameter should be a function that looks like this:
-         * function( Permissions permissions) {...};
-         * Parameter permissions: The extension's active permissions.
+         * Gets the app's current set of permissions.
+         * @param callback Parameter *permissions*: The app's active permissions.
          */
-        export function getAll(callback: (permissions: Permissions) => void): void;
+        function getAll(callback: (permissions: Permissions) => void): void;
         /**
-         * Requests access to the specified permissions. These permissions must be defined in the optional_permissions field of the manifest. If there are any problems requesting the permissions, runtime.lastError will be set.
-         * @param callback If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean granted) {...};
-         * Parameter granted: True if the user granted the specified permissions.
+         * Requests access to the specified permissions.
+         * These permissions must be defined in the optional_permissions field of the manifest.
+         * If there are any problems requesting the permissions, runtime.lastError will be set.
+         * @param [callback] Parameter *granted*: True if the user granted the specified permissions.
          */
-        export function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
+        function request(permissions: Permissions, callback?: (granted: boolean) => void): void;
         /**
          * Removes access to the specified permissions. If there are any problems removing the permissions, runtime.lastError will be set.
-         * @param callback If you specify the callback parameter, it should be a function that looks like this:
-         * function(boolean removed) {...};
-         * Parameter removed: True if the permissions were removed.
+         * @param [callback] Parameter *removed*: True if the permissions were removed.
          */
-        export function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
+        function remove(permissions: Permissions, callback?: (removed: boolean) => void): void;
 
-        /** Fired when access to permissions has been removed from the extension. */
-        export var onRemoved: PermissionsRemovedEvent;
-        /** Fired when the extension acquires new permissions. */
-        export var onAdded: PermissionsAddedEvent;
+        /** Fired when access to permissions has been removed from the app. */
+        const onRemoved: PermissionEvent;
+        /** Fired when the app acquires new permissions. */
+        const onAdded: PermissionEvent;
     }
+    // #endregion
 
-    ////////////////////
-    // Power
-    ////////////////////
+    // #region chrome.platformKeys
+    ///////////////////
+    // Platform Keys //
+    ///////////////////
+    /**
+     * @requires(CrOS) Only for Chrome OS.
+     * @requires Permissions: 'platformKeys'
+     * @description
+     * Use the *chrome.platformKeys* API to access client certificates
+     * managed by the platform. If the user or policy grants the permission, an
+     * app can use such a certficate in its custom authentication protocol.
+     * E.g. this allows usage of platform managed certificates in third party VPNs
+     * @see chrome.vpnProvider
+     */
+    namespace platformKeys {
+        /**
+         * @enum
+         */
+        const ClientCertificateType: {
+            'RSA_SIGN': 'rsaSign',
+            'ECDSA_SIGN': 'ecdsaSign'
+        };
+        interface Match {
+            /** The DER encoding of a X.509 certificate. */
+            certificate: ArrayBuffer;
+
+            /**
+             * @see[KeyAlgorithm]{@link http://www.w3.org/TR/WebCryptoAPI/#key-algorithm-interface}
+             * @description
+             * 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;
+        }
+
+        /**
+         * Analogous to TLS1.1's CertificateRequest.
+         * @see{@link http://tools.ietf.org/html/rfc4346#section-7.4.4}
+         */
+        interface ClientCertificateRequest {
+            /**
+             * 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.
+             * @see ClientCertificateType
+             */
+            certificateTypes: ToStringLiteral<typeof ClientCertificateType>[];
+
+            /**
+             * List of distinguished names of certificate authorities allowed by the
+             * server. Each entry must be a DER-encoded X.509 DistinguishedName.
+             */
+            certificateAuthorities: ArrayBuffer[];
+        }
+
+        interface SelectDetails {
+            /** Only certificates that match this request will be returned. */
+            request: ClientCertificateRequest;
+
+            /**
+             * If given, the *selectClientCertificates* operates on this
+             * list. Otherwise, obtains the list of all certificates from the platform's
+             * certificate stores that are available to this extensions.
+             * Entries that the extension doesn't have permission for or which doesn't
+             * match the request, are removed.
+             */
+            clientCerts?: ArrayBuffer[];
+
+            /** If true, the filtered list is presented to the user to manually select a
+             * certificate and thereby granting the extension access to the
+             * certificate(s) and key(s).Only the selected certificate(s) will be
+             * returned. If is false, the list is reduced to all certificates that the
+             * extension has been granted access to (automatically or manually). */
+            interactive: boolean;
+        }
+
+        interface VerificationDetails {
+            // 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 VerificationResult {
+            /**
+             * 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;
+
+            /**
+             * If the trust verification failed, this array contains the errors reported
+             * by the underlying network layer. Otherwise, this array is empty.
+             * **Note:** This list is meant for debugging only and may not
+             * contain all relevant errors. The errors returned may change in future
+             * revisions of this API, and are not guaranteed to be forwards or backwards
+             * compatible.
+             */
+            debug_errors: string[];
+        }
+
+        /**
+         * This function filters from a list of client certificates the ones that
+         * are known to the platform, match *request* and for which the
+         * app has permission to access the certificate and its private key.
+         * If *interactive* is true, the user is presented a dialog where
+         * they can select from matching certificates and grant the app access
+         * to the certificate.
+         * The selected / filtered client certificates will be passed to *callback*.
+         * @param callback Will provide *matches*: The list of certificates that match the request, that the
+         *                 app has permission for and, if *interactive* is true, that were selected by the user.
+         */
+        function selectClientCertificates(
+            details: SelectDetails,
+            callback: (matches: Match[]) => void): void;
+
+        /**
+         * @description
+         * Passes the key pair of *certificate* for usage with
+         * platformKeys.subtleCrypto to *callback*.
+         *
+         * ❗ Note:
+         * Currently, this function only supports the "RSASSA-PKCS1-v1_5"
+         * algorithm with one of the hashing algorithms "none", "SHA-1", "SHA-256",
+         * "SHA-384", and "SHA-512"
+         *
+         * @param certificate The certificate of a *Match* returned by *selectClientCertificates*.
+         * @param parameters Determines signature/hash algorithm parameters additionally to the parameters fixed by the key itself.
+         *   The same parameters are accepted as by WebCrypto's importKey (see docs).
+         *   function, e.g. *RsaHashedImportParams* for a RSASSA-PKCS1-v1_5
+         *   key. For RSASSA-PKCS1-v1_5 keys, additionally the parameters *{
+         *   "hash": { "name": "none" } }* are supported. The sign function will
+         *   then apply PKCS#1 v1.5 padding and but not hash the given data.
+         * @param callback The public and private CryptoKey of a certificate which can only be used with *subleCrypto*.
+         * @param callback.privateKey Might be *null* if this app does not have access to it.
+         * @param callback.privateKey
+         * @see[WebCrypto's importKey docs]{@link http://www.w3.org/TR/WebCryptoAPI/#SubtleCrypto-method-importKey}
+         * @see[CryptoKey docs]{@link http://www.w3.org/TR/WebCryptoAPI/#dfn-CryptoKey}
+         */
+        function getKeyPair(
+            certificate: ArrayBuffer,
+            parameters: object,
+            callback: (publicKey: CryptoKey, privateKey: CryptoKey | null) => void): void;
+
+        /**
+         * An implementation of WebCrypto's SubtleCrypto
+         * that allows crypto operations on keys of client
+         * certificates that are available to this app.
+         * @see[SubtleCrypto]{@link http://www.w3.org/TR/WebCryptoAPI/#subtlecrypto-interface}
+         */
+        function subtleCrypto(): SubtleCrypto;
+
+        /**
+         * Checks whether *details.serverCertificateChain* can be trusted
+         * for *details.hostname* according to the trust settings of the
+         * platform.
+         * Note: The actual behavior of the trust verification is not fully
+         * specified and might change in the future.
+         * The API implementation verifies certificate expiration, validates the
+         * certification path and checks trust by a known CA.
+         * The implementation is supposed to respect the EKU serverAuth and to
+         * support subject alternative names.
+         */
+        function verifyTLSServerCertificate(details: VerificationDetails,
+            callback: (result: VerificationResult) => void): void;
+    }
+    // #endregion
+
+    // #region chrome.power
+    ///////////
+    // Power //
+    ///////////
     /**
      * Use the chrome.power API to override the system's power management features.
-     * Permissions:  "power"
+     * @requires Permissions: 'power'
      * @since Chrome 27.
      */
     namespace power {
-        /** Requests that power management be temporarily disabled. |level| describes the degree to which power management should be disabled. If a request previously made by the same app is still active, it will be replaced by the new request. */
-        export function requestKeepAwake(level: string): void;
+        /**
+         * @enum
+         * @property SYSTEM - Prevent the system from sleeping in response to user inactivity.
+         * @property DISPLAY - Prevent the display from being turned off or dimmed or the system from sleeping in response to user inactivity.
+        */
+        const Level: {
+            SYSTEM: 'system',
+            DISPLAY: 'display'
+        }
+        /**
+         * Requests that power management be temporarily disabled.
+         * @param level Level describes the degree to which power management should be disabled.
+         *              If a request previously made by the same app is still active, it will be replaced by the new request.
+         * @see Enum: chrome.power.Level
+         */
+        function requestKeepAwake(level: ToStringLiteral<typeof Level>): void;
         /** Releases a request previously made via requestKeepAwake(). */
-        export function releaseKeepAwake(): void;
+        function releaseKeepAwake(): void;
     }
+    // #endregion
 
-    ////////////////////
-    // Printer Provider
-    ////////////////////
+    // #region chrome.printerProvider
+    //////////////////////
+    // Printer Provider //
+    //////////////////////
     /**
-     * The chrome.printerProvider API exposes events used by print manager to query printers controlled by extensions, to query their capabilities and to submit print jobs to these printers.
-     * Permissions:  "printerProvider"
+     * The chrome.printerProvider API exposes events used by print manager
+     * to query printers controlled by extensions, to query their
+     * capabilities and to submit print jobs to these printers.
+     *
+     * @requires Permissions: 'printerProvider'
      * @since Chrome 44.
      */
     namespace printerProvider {
@@ -2331,7 +6748,7 @@ declare namespace chrome {
             id: string;
             /** Printer's human readable name. */
             name: string;
-            /** Optional. Printer's human readable description. */
+            /** Printer's human readable description. */
             description?: string;
         }
 
@@ -2347,49 +6764,77 @@ declare namespace chrome {
             title: string;
             /** Print ticket in  CJT format. */
             ticket: Object;
-            /** The document content type. Supported formats are "application/pdf" and "image/pwg-raster". */
+            /** The document content type. Supported formats are 'application/pdf' and 'image/pwg-raster'. */
             contentType: string;
             /** Blob containing the document data to print. Format must match |contentType|. */
             document: Blob;
         }
 
-        interface PrinterRequestedEvent extends chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void> { }
-
-        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> { }
-
-        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;
+        const onGetPrintersRequested: chrome.events.Event<(resultCallback: (printerInfo: PrinterInfo[]) => void) => void>;
         /**
          * Event fired when print manager requests information about a USB device that may be a printer.
          * Note: An application should not rely on this event being fired more than once per device. If a connected device is supported it should be returned in the onGetPrintersRequested event.
          * @since Chrome 45.
          */
-        export var onGetUsbPrinterInfoRequested: PrinterInfoRequestedEvent;
+        const onGetUsbPrinterInfoRequested: chrome.events.Event<(device: any, resultCallback: (printerInfo?: PrinterInfo) => void) => void>;
         /** Event fired when print manager requests printer capabilities. */
-        export var onGetCapabilityRequested: CapabilityRequestedEvent;
+        const onGetCapabilityRequested: chrome.events.Event<(printerId: string, resultCallback: (capabilities: PrinterCapabilities) => void) => void>;
         /** Event fired when print manager requests printing. */
-        export var onPrintRequested: PrintRequestedEvent;
+        const onPrintRequested: chrome.events.Event<(printJob: PrintJob, resultCallback: (result: string) => void) => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // Runtime
-    ////////////////////
+    // #region chrome.runtime
+    /////////////
+    // Runtime //
+    /////////////
     /**
-     * Use the chrome.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.
+     * Use the chrome.runtime API to retrieve the background page, return details about the manifest, and listen for and respond to events in the app lifecycle. You can also use this API to convert the relative path of URLs to fully-qualified URLs.
      * @since Chrome 22
      */
     namespace runtime {
+        const OnInstalledReason: {
+            INSTALL: 'install',
+            UPDATE: 'update',
+            CHROME_UPDATE: 'chrome_update',
+            SHARED_MODULE_UPDATE: 'shared_module_update'
+        };
+        const OnRestartRequiredReason: {
+            APP_UPDATE: 'app_update',
+            OS_UPDATE: 'os_update',
+            PERIODIC: 'periodic'
+        };
+        const PlatformArch: {
+            ARM: 'arm',
+            X86_32: 'x86-32',
+            X86_64: 'x86-64',
+            MIPS: 'mips',
+            MIPS64: 'mips64'
+        };
+        const PlatformNaclArch: typeof PlatformArch;
+        const PlatformOs: {
+            ANDROID: 'android',
+            CROS: 'cros',
+            LINUX: 'linux',
+            MAC: 'mac',
+            OPENBSD: 'openbsd',
+            WIN: 'win'
+        };
+        const RequestUpdateCheckStatus: {
+            THROTTLED: 'throttled',
+            NO_UPDATE: 'no_update',
+            UPDATE_AVAILABLE: 'update_available'
+        };
+
         /** This will be defined during an API method callback if there was an error */
-        export var lastError: LastError | undefined;
-        /** The ID of the extension/app. */
-        export var id: string;
+        const lastError: LastError | undefined;
+
+        /** The ID of the app. */
+        const id: string;
 
         interface LastError {
-            /** Optional. Details about the error which occurred.  */
+            /** Details about the error which occurred.  */
             message?: string;
         }
 
@@ -2400,9 +6845,9 @@ declare namespace chrome {
         interface InstalledDetails {
             /**
              * The reason that this event is being dispatched.
-             * One of: "install", "update", "chrome_update", or "shared_module_update"
+             * @see enum OnInstalledReason
              */
-            reason: string;
+            reason: ToStringLiteral<typeof OnInstalledReason>;
             /**
              * Optional.
              * Indicates the previous version of the extension, which has just been updated. This is present only if 'reason' is 'update'.
@@ -2426,20 +6871,20 @@ declare namespace chrome {
          * @since Chrome 26.
          */
         interface MessageSender {
-            /** The ID of the extension or app that opened the connection, if any. */
+            /** The ID of the app that opened the connection, if any. */
             id?: string;
             /**
              * The frame that opened the connection. 0 for top-level frames, positive for child frames. This will only be set when tab is set.
              * @since Chrome 41.
              */
-            frameId?: number;
+            frameId?: integer;
             /**
              * 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.
              * @since Chrome 28.
              */
             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.
+             * The TLS channel ID of the page or frame that opened the connection, if requested by the app, and if available.
              * @since Chrome 32.
              */
             tlsChannelId?: string;
@@ -2452,19 +6897,19 @@ declare namespace chrome {
         interface PlatformInfo {
             /**
              * The operating system chrome is running on.
-             * One of: "mac", "win", "android", "cros", "linux", or "openbsd"
+             * @see enum PlatformOs
              */
-            os: string;
+            os: ToStringLiteral<typeof PlatformOs>;
             /**
              * The machine's processor architecture.
-             * One of: "arm", "x86-32", or "x86-64"
+             * @see enum PlatformArch
              */
-            arch: string;
+            arch: ToStringLiteral<typeof PlatformArch>;
             /**
              * The native client architecture. This may be different from arch on some platforms.
-             * One of: "arm", "x86-32", or "x86-64"
+             * @see enum PlatformNaclArch
              */
-            nacl_arch: string;
+            nacl_arch: ToStringLiteral<typeof PlatformNaclArch>;
         }
 
         /**
@@ -2480,9 +6925,9 @@ declare namespace chrome {
              */
             sender?: MessageSender;
             /** An object which allows the addition and removal of listeners for a Chrome event. */
-            onDisconnect: PortDisconnectEvent;
+            onDisconnect: chrome.events.Event<(port: Port) => void>;
             /** An object which allows the addition and removal of listeners for a Chrome event. */
-            onMessage: PortMessageEvent;
+            onMessage: chrome.events.Event<(message: any, port: Port) => void>;
             name: string;
         }
 
@@ -2496,23 +6941,15 @@ declare namespace chrome {
             version: string;
         }
 
-        interface PortDisconnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-        interface PortMessageEvent extends chrome.events.Event<(message: any, port: Port) => void> { }
-
-        interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
-
-        interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
-
-        interface RuntimeInstalledEvent extends chrome.events.Event<(details: InstalledDetails) => void> { }
-
-        interface RuntimeEvent extends chrome.events.Event<() => void> { }
-
-        interface RuntimeRestartRequiredEvent extends chrome.events.Event<(reason: string) => void> { }
-
-        interface RuntimeUpdateAvailableEvent extends chrome.events.Event<(details: UpdateAvailableDetails) => void> { }
-
         interface ManifestIcons {
+            /**
+             * @example
+             * {
+             *   '16': 'icon16.png',
+             *   '48': 'icon48.png',
+             *   '128': 'icon128.png'
+             * }
+             */
             [size: number]: string;
         }
 
@@ -2536,38 +6973,553 @@ declare namespace chrome {
             instant_url_post_params?: string;
             image_url_post_params?: string;
             alternate_urls?: string[];
-            prepopulated_id?: number;
+            prepopulated_id?: integer;
             is_default?: boolean;
         }
 
-        interface Manifest {
-            /** Required */
+        type UrlMatches =
+            'https://www.google-analytics.com/*'
+            | 'https://www.googleapis.com/*'
+            | '<all_urls>'
+            | 'http://*/*'
+            | 'https://*/*'
+            | 'file:///*/*'
+            /**
+             * Required if the extension uses the 'chrome://favicon/**url**' mechanism to display the favicon of a page.
+             * For example, to display the favicon of http://www.google.com/, you declare the 'chrome://favicon/'
+             * permission and use HTML code like this:
+             * @example
+             * <pre>
+             * <img src='chrome://favicon/http://www.google.com/'>
+             * </pre>
+             */
+            | 'chrome://favicon/'
+        // | 'chrome://extension-icon/'; // Doesn't need permission yet?
+
+        type ChromeOSOnlyPermissions =
+            /**
+             * Gives your app access to the chrome.certificateProvider API.
+             */
+            'certificateProvider' |
+            /** Gives your app access to the chrome.clipboard API. */
+            'clipboard' |
+            /** Gives your app access to the chrome.dns API. */
+            'dns' |
+            /** Gives your app access to the chrome.documentScan API. */
+            'documentScan' |
+            /**
+             * Gives your app access to the chrome.enterprise.platformKeys API.
+             */
+            'enterprise.platformKeys' |
+            /**
+             * Gives your app access to the chrome.enterprise.deviceAttributes API.
+             */
+            'enterprise.deviceAttributes' |
+            /**
+             * Gives your app access to the chrome.fileBrowserHandler API.
+             */
+            'fileBrowserHandler' |
+            /**
+             * Gives your app access to the chrome.fileSystemProvider API.
+             * Use the chrome.fileSystemProvider API to create file systems,
+             * that can be accessible from the file manager on Chrome OS.
+             */
+            'fileSystemProvider' |
+            /**
+             * Gives your app access to the chrome.networking.config API.
+             */
+            'networking.config' |
+            /**
+             * Gives your app access to the chrome.platformKeys API.
+             */
+            'platformKeys' |
+            /** Gives your app access to the chrome.vpnProvider API. */
+            'vpnProvider' |
+            /** Gives your app access to the chrome.wallpaper API. */
+            'wallpaper' |
+            FileSystemPermission;
+
+        type DevOnly =
+            /**
+             * App window enable alpha on chrome.app.window
+             */
+            'app.window.alpha' |
+            /**
+             * Gives your app access to the chrome.diagnostics API.
+             */
+            'diagnostics' |
+            /**
+             * Gives your app access to the chrome.displaySource API.
+             */
+            'displaySource' |
+            /**
+             * Gives your app access to the chrome.signedInDevices API.
+             */
+            'signedInDevices';
+
+        type KioskOnlyPermissions =
+            'audio' |
+            'networking.onc' |
+            'system.powerSource' |
+            'virtualKeyboard';
+
+        /** Undocumented but used permissions */
+        type UndocumentedPermissions =
+            'app.window.ime' |
+            /**
+             * @deprecated
+             * @see Permission: 'app.window.fullscreen'
+             */
+            'fullscreen' |
+            /**
+             * @deprecated
+             * @see Permission: 'app.window.fullscreen.overrideEsc'
+             */
+            'overrideEscFullscreen';
+
+        type NotAllowedAsOptionalPermissions =
+            'debugger' |
+            'experimental' |
+            'geolocation' |
+            'mdns' |
+            'proxy' |
+            'tts' |
+            'wallpaper';
+
+        /**
+         * Optional permissions
+         * @see NotAllowedAsOptionalPermissions for permissions that you're not allowed to set on demand.
+         */
+        type OptionalPermission = Exclude<Permission, NotAllowedAsOptionalPermissions>;
+
+        type Permission =
+            /** Gives your app access to the chrome.alarms API. */
+            'alarms' |
+            /** Enables the <appview> tag. */
+            'appview' |
+            /** Gives your app access to the chrome.audio API. */
+            'audio' |
+            /** Enables the method *setAlwaysOnTop()* on chrome.app.window */
+            'alwaysOnTopWindows' |
+            /** Enables the method *setAlwaysOnTop()* on chrome.app.window */
+            'app.window.alwaysOnTop' |
+            /**
+             * In Chrome Apps, fullscreen is entered without prompting the user or providing exit instructions.
+             * HTML5 fullscreen requires the app.window.fullscreen permission in the manifest.
+             * In normal webpages, the browser intercepts the ESC key to exit pointer lock ensuring a consistent escape method for users.
+             * To block this, set the 'app.window.fullscreen.overrideEsc permission
+             */
+            'app.window.fullscreen' |
+            /** That is also the behavior in Chrome Apps unless the app.window.fullscreen.overrideEsc
+             * permission is used to enable the app to call preventDefault on keydown and keyup events. */
+            'app.window.fullscreen.overrideEsc' |
+            /** Enables setShape() on chrome.app.window. Customize window shape. */
+            'app.window.shape' |
+            /**
+             * Requests that the app be granted permissions to capture audio
+             * directly from the user's Microphone via the getUserMedia API.
+             */
+            'audioCapture' |
+            /**
+             * Makes Chrome start up early and and shut down late, so that apps can have a longer life.
+             * When any installed app has 'background' permission, Chrome runs (invisibly) as soon as the user logs
+             * into their computer—before the user launches Chrome. The 'background' permission also makes Chrome
+             * continue running (even after its last window is closed) until the user explicitly quits Chrome.
+             * Note: Disabled apps are treated as if they aren't installed.
+             */
+            'background' |
+            /** Gives your app access to the chrome.browser API. */
+            'browser' |
+            /** Required if the app uses document.execCommand('paste'). */
+            'clipboardRead' |
+            /**
+             * Indicates the app uses document.execCommand('copy') or document.execCommand('cut').
+             * This permission is recommended for packaged apps.
+             */
+            'clipboardWrite' |
+            /** Gives your app access to the chrome.contextMenus API. */
+            'contextMenus' |
+            /** Gives your app access to the chrome.desktopCapture API. */
+            'desktopCapture' |
+            /** Required if the app uses any chrome.experimental.* APIs. */
+            'experimental' |
+            /** Gives your app access to the chrome.fileSystem API. */
+            'fileSystem' |
+            /**
+             * @deprecated
+             * Gives your app access to the chrome.gcm API.
+             */
+            'gcm' |
+            /** Allows the app to use the proposed HTML5 geolocation API without prompting the user for permission. */
+            'geolocation' |
+            /** Gives your app access to the chrome.hid API. */
+            'hid' |
+            /** Gives your app access to the chrome.identity API. */
+            'identity' |
+            /** Gives your app access to the chrome.idle API. */
+            'idle' |
+            /** Gives your app access to the chrome.mdns API. */
+            'mdns' |
+            /** Gives your app access to the chrome.mediaGalleries API. */
+            'mediaGalleries' |
+            /** Gives your app access to the native messaging API. */
+            'nativeMessaging' |
+            /**
+             * Required if the app uses the chrome.notifications API.
+             *
+             * Also allows the app to use the proposed HTML5 notification API
+             * without calling permission methods (such as checkPermission()).
+             */
+            'notifications' |
+            /**
+             * Required to use Pointer Lock via calls to **requestPointerLock** or Pepper's Mouse Lock API.
+             * In Chrome Apps, pointer lock is entered without requiring a user gesture, prompting the user,
+             * or providing exit instructions. Pointer lock requires the pointerlock permission in the manifest.
+             * Also, there is no default exit behavior.
+             * In normal webpages, the browser intercepts the ESC key to exit pointer lock.
+             * This behavior is not present in Chrome Apps.
+             * @see[Pointer Lock Docs]{@link http://www.w3.org/TR/pointerlock/}
+             * @see[Pepper's Mouse Lock API]{@link https://developers.google.com/native-client/peppercpp/classpp_1_1_mouse_lock}
+             */
+            'pointerLock' |
+            /** Gives your app access to the chrome.power API. */
+            'power' |
+            /** Gibes your app access to the chrome.printerProvider API. */
+            'printerProvider' |
+            /** Runtime is not actually a permisison, but some sysems check these values to verify restrictions. */
+            'runtime' |
+            /** @deprecated Serial is deprecated */
+            'serial' |
+            /** Gives your app access to the chrome.storage API. */
+            'storage' |
+            /** Required if the app uses the chrome.syncFileSystem API to save and synchronize data on Google Drive. */
+            'syncFileSystem' |
+            /** Gives your app access to the chrome.system.cpu API. */
+            'system.cpu' |
+            /** Gives your app access to the chrome.system.display API. */
+            'system.display' |
+            /** Gives your app access to the chrome.system.memory API. */
+            'system.memory' |
+            /** Gives your app access to the chrome.system.network API. */
+            'system.network' |
+            /** Gives your app access to the chrome.system.storage API. */
+            'system.storage' |
+            /** Gives your app access to the chrome.tts API. */
+            'tts' |
+            /**
+             * Provides an unlimited quota for storing HTML5 client-side data, such as databases and local storage files.
+             * Without this permission, the app is limited to 5 MB of local storage.
+             *
+             * *Note*
+             * *This permission applies only to Web SQL Database and application cache*
+             * *Also, it doesn't currently work with wildcard subdomains such as*
+             * @example
+             * http://*.example.com
+             */
+            'unlimitedStorage' |
+            'usb' |
+            'usbDevices' |
+            /** Requests that the app be granted permissions to capture video directly from the user's Web Cam via the getUserMedia API. */
+            'videoCapture' |
+            /** Required if the app uses the Webview Tag to embed live content from the web in the packaged app. */
+            'webview' |
+            ChromeOSOnlyPermissions |
+            KioskOnlyPermissions |
+            MediaGalleriesPermission |
+            SocketPermission |
+            /**
+             * Specifies a **host permission**.
+             * Required if the app wants to interact with the code running on pages.
+             * Many capabilities, such as cross-origin XMLHttpRequests,
+             * programmatically injected content scripts require host permissions.
+             * For details on the syntax:
+             * @see[Match Patterns]{@link https://developer.chrome.com/apps/match_patterns}
+             * A path is allowed but treated as /*
+             */
+            UrlMatches |
+            USBDevicesPermission;
+
+        interface MediaGalleriesPermission {
+            mediaGalleries: Array<'read' | 'allAutoDetected'>;
+        }
+        interface USBDevicesPermission {
+            usbDevices: { vendorId: integer, productId: integer }[]
+        }
+        interface FileSystemPermission {
+            /**
+             * @enum {string}
+             * @requires(CrOS) 'requestFileSystem' is only for ChromeOS
+             */
+            fileSystem: Array<'write' | 'retainEntries' | 'directory' | 'requestFileSystem'>;
+        }
+        interface SocketPermission {
+            /**
+             * **Possible values includes:**
+             * 'tcp-connect',
+             * 'udp-send-to',
+             * 'udp-send-to::*'
+             * 'udp-bind',
+             * 'udp-multicast-membership',
+             * 'resolve-host',
+             * 'network-state'
+             */
+            socket: string[];
+        }
+
+        /// For chrome managed storage
+
+        type JSONBasicTypes = 'integer' | 'string' | 'number';
+
+        interface JSONSchemaBasicType {
+            type: JSONBasicTypes;
+        }
+        interface JSONSchemaRefType {
+            '$ref': string;
+        }
+        interface JSONSchemaObjectType {
+            /**
+             * An 'object' can have known properties listed as 'properties', and can
+             * optionally have 'additionalProperties' indicating a schema to apply to
+             * keys that aren't found in 'properties'.
+             */
+            type: 'object';
+            properties?: {
+                [key: string]: JSONSchemaBasicType | JSONSchemaRefType;
+            }
+            additionalProperties?: JSONSchemaObjectType;
+        }
+        interface JSONSchemaArrayType {
+            type: 'array',
+            id?: string;
+            items: JSONSchemaBasicType | JSONSchemaObjectType | JSONSchemaRefType;
+        }
+
+
+        /// For chrome.sockets ///
+
+        interface SocketTcpPermission {
+            /**
+             * The host:port pattern for connect operations.
+             * *:* are allowed
+             */
+            connect?: string | string[];
+        }
+        interface SocketTcpServerPermission {
+            /**
+             * The host:port pattern for listen operations.
+             * *:* are allowed
+             */
+            listen?: string | string[];
+        }
+        interface SocketUdpPermission {
+            /**
+             * The host:port pattern for bind operations.
+             * *:* are allowed
+             */
+            bind?: string | string[];
+            /**
+             * The host:port pattern for joinGroup operations.
+             * *:* are allowed
+             */
+            multicastMembership?: string | string[];
+            /**
+             * The host:port pattern for send operations.
+             * *:* are allowed
+             */
+            send?: string | string[];
+        }
+
+        interface WebViewPartition {
+            name: string;
+            /**
+             * Path to files, relative, absolute or pattern
+             * @example
+             * ['local_*.html', '*.png', '*.js']
+             * ['img/epic.html']
+             *
+            */
+            accessible_resources: string[];
+        }
+
+
+        /**
+         * The top-level object can't have additionalProperties.
+         * The properties declared are the policies for this app.
+         */
+        interface ManagedSchema {
+            /** Each schema must have either a $ref value or exactly one type. */
+            '$ref'?: string;
+            /** The top-level schema must have type object. */
+            type: 'object';
+            /**
+             * 'properties' maps an optional key of this object to its schema. At the
+             * top-level object, these keys are the policy names supported.
+             */
+            properties?: {
+                [key: string]: JSONSchemaBasicType | JSONSchemaArrayType | JSONSchemaObjectType | JSONSchemaRefType;
+            };
+        }
+
+        interface AutomationDesktop {
+            desktop: true;
+            interact?: true;
+        }
+        interface AutomationNonInteractive {
+            interact: false;
+            desktop?: false;
+            /** Patterns for matching, use chrome url pattern */
+            matches?: UrlMatches[] | string[];
+        }
+        type AutomationOptions = boolean | AutomationDesktop | AutomationNonInteractive;
+
+        interface PartialManifest {
+            //////////////
+            // REQUIRED //
+            //////////////
+
+            /**
+             * Used by packaged apps to specify the app's background scripts.
+             * Also used by hosted apps to specify the URLs that the app uses.
+             * @required
+             */
             app: {
                 background: {
                     scripts?: string[];
                 }
-            }
-            /** Should be set to 2 */
-            manifest_version: number;
+            };
+            /**
+             * One integer specifying the version of the manifest file format your package requires.
+             * As of Chrome 18, developers should specify 2 (without quotes).
+             * @see[Manifest Version Info]{@link https://developer.chrome.com/apps/manifest/manifest_version}
+             * @required
+             */
+            manifest_version: 2;
+            /**
+             * The *name* (maximum of 45 characters) is the primary identifier
+             * of the app and is a required field.
+             * It is displayed in the following locations:
+             *  - Install dialog
+             *  - Extension management UI
+             *  - Chrome Web Store
+             *
+             * You can specify locale-specific strings, see Internationalization docs:
+             * @see[Internationalization]{@see https://developer.chrome.com/extensions/i18n}
+             * @required
+             * @requires string - Maximum 45 characters!
+             */
             name: string;
+            /**
+             * One to four dot-separated integers identifying the version of this app.
+             * A couple of rules apply to the integers: they must be between 0 and 65535, inclusive,
+             * and non-zero integers can't start with 0. For example, 99999 and 032 are both invalid.
+             * A missing integer is equal to zero. For example, 1.1.9.9999 is newer than 1.1.
+             * @see[Manifest- Version Docs]{@link https://developer.chrome.com/apps/manifest/version}
+             * @required
+             */
             version: string;
 
-            // Recommended
+            /////////////////
+            // RECOMMENDED //
+            /////////////////
+
+            /**
+             * Specifies the subdirectory of _locales that contains the default strings for this app.
+             * This field is required in apps that have a _locales directory; it must be absent in
+             * apps that have no _locales directory. For details, see Internationalization:
+             * @see[Internationalization]{@see https://developer.chrome.com/extensions/i18n}
+             */
             default_locale?: string;
+
+            /**
+             * A plain text string (no HTML or other formatting; no more than 132 characters)
+             * that describes the extension. The description should be suitable for both the
+             * browser's extension management UI and the Chrome Web Store. You can specify
+             * locale-specific strings for this field; see Internationalization for details.
+             * @see[Internationalization]{@see https://developer.chrome.com/extensions/i18n}
+             */
             description?: string;
+
+            /**
+             * One or more icons that represent the extension, app, or theme.
+             * You should always provide a 128x128 icon; it's used during
+             * installation and by the Chrome Web Store. Extensions should
+             * also provide a 48x48 icon, which is used in the extensions
+             * management page (chrome://extensions). You can also specify
+             * a 16x16 icon to be used as the favicon for an extension's pages.
+             *
+             * Icons should generally be in PNG format, because PNG has the best support for transparency.
+             * They can, however, be in any format supported by WebKit, including BMP, GIF, ICO, and JPEG.
+             *
+             * You may provide icons of any other size you wish, and Chrome will attempt to use the best size
+             * where appropriate. For example, Windows often requires 32-pixel icons, and if the app includes
+             * a 32-pixel icon, Chrome will choose that instead of shrinking a 48-pixel icon down. However,
+             * you should ensure that all of your icons are square, or unexpected behavior may result.
+             *
+             * @example
+             * 'icons': { '16': 'icon16.png',
+             *            '48': 'icon48.png',
+             *            '128': 'icon128.png' },
+             */
             icons?: ManifestIcons;
-            // Optional
-            action_handlers?: string[];
-            author?: any;
-            automation?: any;
+
+            //////////////
+            // OPTIONAL //
+            //////////////
+
+            /**
+             * @requires(CrOS) **Will only work on Chrome OS.**
+             * @description
+             * The action_handlers manifest property declares which user actions or intents the
+             * application supports; these can serve as alternate launch points for your application.
+             * This list contains one or more of the ActionType values specified
+             * in the ActionType entry of app.runtime.onLaunched.
+             * @example
+             * 'action_handlers': ['new_note']
+             */
+            action_handlers?: ToStringLiteral<typeof app.runtime.ActionType>[];
+
+            /**
+             * App author information
+             * @see[Not implemented anywhere in code]{@link https://github.com/chromium/chromium/blob/master/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc#L46}
+             */
+            author?: {
+                name: string,
+                email: string,
+            } | any;
+
+            /**
+             * Allows inspection of page contents, not enabled on stable anyways except for whitelist.
+             * @see[Docs]{@link https://github.com/chromium/chromium/blob/master/extensions/common/manifest_handlers/automation.cc}
+             */
+            automation?: AutomationOptions | boolean;
+
+            /**
+             * Note: The 'bluetooth' manifest permission is used by the
+             * chrome.bluetooth, chrome.bluetoothSocket and
+             * chrome.bluetoothLowEnergy APIs.
+             * @requires Platforms: Chrome OS, Windows and Mac
+             */
             bluetooth?: {
-                uuids?: string[];
-                socket?: boolean;
-                low_energy?: boolean;
-                peripheral?: boolean;
+                uuids?: string[],
+                socket?: boolean,
+                low_energy?: boolean,
+                peripheral?: boolean,
             };
+            /**
+             * Use the commands API to add keyboard shortcuts that trigger actions in your app.
+             * E.g. an action to open the browser action or send a command to the app.
+             */
             commands?: {
                 [name: string]: {
+                    /**
+                     * Keys can be provided matching this pattern:
+                     * ^(Ctrl|Command|MacCtrl|Alt|Option)\\+(Shift\\+)?[A-Z]
+                     * @example
+                     * 'suggested_key': {
+                     *     'default': 'Ctrl+Shift+Y',
+                     *     'mac': 'Command+Shift+Y'
+                     * },
+                     */
                     suggested_key?: {
                         default?: string;
                         windows?: string;
@@ -2575,224 +7527,554 @@ declare namespace chrome {
                         chromeos?: string;
                         linux?: string;
                     };
+                    /** Command description */
                     description?: string;
+                    /** Global scope? */
                     global?: boolean
                 }
             };
-            current_locale?: string;
+            /**
+             * An implementation detail (actually written by Chrome, not the app author).
+             */
+            readonly current_locale?: string;
+
+            /** Restricted to whitelist */
+            display_in_launcher?: boolean;
+
+            /** Restricted to whitelist */
+            display_in_new_tab_page?: boolean;
+
+            /**
+             * The *event_rules* manifest property provides a mechanism to add rules that
+             * intercept, block, or modify web requests in-flight using **declarativeWebRequest**
+             * or take actions depending on the content of a page, without requiring permission
+             * to read the page's content using **declarativeContent**.
+             * @see[event_rules docs]{@link https://developer.chrome.com/extensions/manifest/event_rules}
+             */
             event_rules?: {
-                event?: string;
+                /** Event name */
+                event?: chrome.webViewRequest.DeclarativeWebRequestEventList,
                 actions?: {
-                    type: string;
+                    /** Action type */
+                    type: chrome.webViewRequest.DeclarativeWebRequestActionsList,
                 }[];
                 conditions?: {
-                    type: string,
-                    css?: string[]
-                }[];
+                    /** Condition */
+                    type: chrome.webViewRequest.DeclarativeWebRequestConditionsList,
+                    /** Arguments, see original condition docs in chrome.webViewRequest */
+                    [key: string]: any | any[],
+                }[],
             }[];
+
+            /**
+             * Declares which extensions, apps, and web pages can connect
+             * to your extension via runtime.connect and runtime.sendMessage.
+             */
+            externally_connectable: {
+                /**
+                 * The IDs of extensions or apps that are allowed to connect.
+                 * If left empty or unspecified, no extensions or apps can connect.
+                 * The wildcard '*' will allow all extensions and apps to connect.
+                 */
+                id: string[],
+                /**
+                 * The URL patterns for web pages that are allowed to connect.
+                 * This does not affect content scripts.
+                 * If left empty or unspecified, no web pages can connect.
+                 */
+                matches: string[],
+                /**
+                 * Determines if messages sent via `runtime.connect` or `runtime.sendMessage`
+                 * are allowed to set `runtime.MessageSender.tlsChannelId`.
+                 */
+                accept_tls_channel_id?: boolean,
+            }
+
+            /**
+             * @requires Permissions: 'fileBrowserHandle'
+             * @requires Location': 'component'
+             * You can specify locale-specific strings for the value of 'default_title'
+             */
+            file_browser_handlers?: {
+                /** Handler id */
+                id: string,
+                /** What the button will display */
+                default_title: string,
+                /** Icon */
+                default_icon: string,
+                /**
+                 * To match all files, use 'filesystem:*.*'
+                 */
+                file_filters: string[],
+                /** ['read'] = read only mode */
+                file_access?: ['read'] | string[]
+            }[];
+
+            /**
+             * Triggers a launch of the app when one of these files are handled.
+             */
             file_handlers?: {
                 [key: string]: {
-                    extensions?: Array<'*' | string | { include_directories: boolean }>;
-                    types?: Array<'*' | string | { include_directories: boolean }>;
-                }
-            }[];
-            file_system_provider_capabilities?: {
-                configurable?: boolean;
-                multiple_mounts?: boolean;
-                source?: string;
+                    extensions?: Array<'*' | string | { include_directories: boolean }>,
+                    /** File types to handle */
+                    types?: Array<'*' | string | { include_directories: boolean }>,
+                },
             };
+
+            /**
+             * Files app uses above information in order to render related UI elements approprietly.
+             */
+            file_system_provider_capabilities?: {
+                /**
+                 * For example, if *configurable* is set to **true**,
+                 * then a menu item for configuring volumes will be rendered.
+                 */
+                configurable?: boolean,
+                /**
+                 * If *multiple_mounts* is set to **true**, then *Files app*
+                 * will allow to add more than one mount points from the UI.
+                 */
+                multiple_mounts?: boolean,
+                /**
+                 * If *watchable* is **false**, then a refresh button will be rendered.
+                 * Note, that if possible you should add support for watchers, so changes
+                 * on the file system can be reflected immediately and automatically.
+                 */
+                watchable?: boolean,
+                source?: 'network',
+            };
+
+            /**
+             * Import resources from another extension / app.
+             * @see[Shared modules]{@link https://developer.chrome.com/apps/shared_modules}
+             */
             import?: {
                 id: string;
             }[];
+
+            /** This value can be used to control the unique ID of an app when it is loaded during development. */
             key?: string;
-            kiosk?: {
-                always_update: any;
-                required_platform_version: any;
-            };
-            kiosk_enabled?: boolean,
-            kiosk_only?: boolean,
-            kiosk_secondary_apps: any;
+
+            /**
+             * The minimum version of Chrome that your app, if any.
+             * @example
+             * 'minimum_chrome_version': '33.0.1715.0'
+             */
             minimum_chrome_version?: string;
+
+            /** One or more mappings from MIME types to the Native Client module that handles each type. */
             nacl_modules?: {
+                /** The location of a Native Client manifest (a .nmf file) within the app's directory. */
                 path: string;
+                /** The MIME type for which the Native Client module will be registered as content handler. */
                 mime_type: string;
             }[];
+
+            /**
+             * Use the Chrome Identity API to authenticate users:
+             * the getAuthToken for users logged into their Google Account
+             * and the launchWebAuthFlow for users logged into a non-Google account.
+             */
             oauth2?: {
+                /** You need to register your app in the Google APIs Console to get the client ID. */
                 client_id: string;
-                scopes?: string[];
+                /** Applies to these scopes */
+                scopes: string[];
             };
+
+            /**
+             * Whether the app is expected to work offline.
+             * When Chrome detects that it is offline, apps with this field set to true will be highlighted on the New Tab page.
+             */
             offline_enabled?: boolean;
-            optional_permissions?: string[];
-            permissions?: string[];
+
+            /**
+             * Use the chrome.permissions API to request declared optional permissions
+             * at run time rather than install time, so users understand why the
+             * permissions are needed and grant only those that are necessary.
+             */
+            optional_permissions?: OptionalPermission[] | Array<OptionalPermission | chrome.runtime.UrlMatches[]> | Array<OptionalPermission | chrome.runtime.UrlMatches[] | string>;
+
+            /**
+             * Permissions help to limit damage if your app is compromised by malware.
+             * Some permissions are also displayed to users before installation,
+             * as detailed in Permission Warnings.
+             */
+            permissions?: Permission[] | Array<Permission | string>;
+
+            /**
+             * Native Client
+             * @see[NDK Docs]{@link https://github.com/crosswalk-project/chromium-crosswalk/blob/af36cc3ce3f5fcb8033f16236725718f8012abfe/native_client_sdk/src/doc/devguide/distributing.rst}
+             * @see[Chromium Source]{@link https://github.com/crosswalk-project/chromium-crosswalk/blob/af36cc3ce3f5fcb8033f16236725718f8012abfe/native_client_sdk/src/tools/fix_manifest.py}
+             */
             platforms?: {
-                nacl_arch?: string;
+                nacl_arch: ToStringLiteral<typeof chrome.runtime.PlatformNaclArch>;
                 sub_package_path: string;
             }[];
+
             /**
-             * Technologies required by the app or extension. Hosting sites such as the Chrome Web Store may use this list to dissuade users from installing apps or extensions that will not work on their computer. Supported requirements currently include "3D" and "plugins"; additional requirements checks may be added in the future.
+             * Technologies required by the app. Hosting sites such
+             * as the Chrome Web Store may use this list to dissuade
+             * users from installing appss that will not
+             * work on their computer. Supported requirements currently
+             * include '3D' and 'plugins'; additional requirements checks
+             * may be added in the future.
              */
             requirements?: {
                 /**
-                 * The "3D" requirement denotes GPU hardware acceleration. The "webgl" requirement refers to the WebGL API. For more information on Chrome 3D graphics support, see the help article on WebGL and 3D graphics. You can list the 3D-related features your app requires, as demonstrated in the following example:
-                 * "requirements": {
-                 *   "3D": {
-                 *     "features": ["webgl"]
+                 * The '3D' requirement denotes GPU hardware acceleration.
+                 *
+                 * The 'webgl' requirement refers to the WebGL API.
+                 * For more information on Chrome 3D graphics support,
+                 * see the help article on WebGL and 3D graphics.
+                 * You can list the 3D-related features your app requires,
+                 * as demonstrated in the following example:
+                 * @example
+                 * 'requirements': {
+                 *   '3D': {
+                 *     'features': ['webgl']
                  *   }
                  * }
                  */
                 '3D'?: {
-                    features?: Array<string | 'webgl'>;
+                    /** List of the 3D-related features your app requires. */
+                    features: ['webgl'];
                 };
+
                 /**
-                 * The "plugins" requirement indicates if an app or extension requires NPAPI to run. This requirement is enabled by default when the manifest includes the "plugins" field. For apps and extensions that still work when plugins aren't available, you can disable this requirement by setting NPAPI to false. You can also enable this requirement manually, by setting NPAPI to true, as shown in this example:
-                 * "requirements": {
-                 *   "plugins": {
-                 *     "npapi": true
+                 * The 'plugins' requirement indicates if an app requires NPAPI to run.
+                 *
+                 * This requirement is enabled by default when the manifest includes the 'plugins' field.
+                 * For apps that still work when plugins aren't available,
+                 * you can disable this requirement by setting NPAPI to false.
+                 * You can also enable this requirement manually,
+                 * by setting NPAPI to true as shown in this example:
+                 * @example
+                 * 'requirements': {
+                 *   'plugins': {
+                 *     'npapi': true
                  *   }
                  * }
                  */
                 plugins?: {
-                    npapi?: boolean;
+                    /** @default true */
+                    npapi: boolean;
                 }
-
-                [key: string]: any;
             };
+
             /**
-             * @deprecated Warning: Starting in version 57, Chrome will no longer allow external web content (including embedded frames and scripts) inside sandboxed pages. Please use a webview instead.
+             * @deprecated
+             * Warning: Starting in version 57, Chrome will no longer allow external web content
+             * (including embedded frames and scripts) inside sandboxed pages.
+             * Please use a webview instead.
              */
             sandbox?: {
                 pages: string[];
+                /**
+                 * @default 'sandbox allow-scripts allow-forms'
+                 */
                 content_security_policy?: string;
             };
+
+            /**
+             * The short_name (maximum of 12 characters recommended) is
+             * a short version of the app's name. It is an optional field
+             * and if not specified, the name will be used, though it will
+             * likely be truncated. The short name is typically used where
+             * there is insufficient space to display the full name, such as:
+             * - App launcher
+             * - New Tab page
+             *
+             * You can specify locale-specific strings, see Internationalization docs:
+             * @see[Internationalization]{@see https://developer.chrome.com/extensions/i18n}
+             */
             short_name?: string;
+
+            /** Doc missing. Declared as a feature, but unused. */
             signature?: any;
+
+            /**
+             * The sockets manifest property declares which permissions are available
+             * for the sockets.udp, sockets.tcp and sockets.tcpServer APIs.
+             */
             sockets?: {
-                tcp?: {
-                    connect: string | '*';
-                };
-                udp?: {
-                    send: string | '*';
-                }
+                /** The tcp manifest property declares which sockets.tcp operations an app can issue. */
+                tcp?: SocketTcpPermission;
+                /** The tcpServer manifest property declares which sockets.tcpServer operations an app can issue. */
+                tcpServer?: SocketTcpServerPermission;
+                /** The udp manifest property declares which sockets.udp operations an app can issue. */
+                udp?: SocketUdpPermission;
             };
+
+            /**
+             * Unlike the local and sync storage areas,
+             * the managed storage area requires its structure
+             * to be declared as JSON Schema and is strictly validated by Chrome.
+             * This schema must be stored in a file indicated by the 'managed_schema'
+             * property of the 'storage' manifest key and declares the enterprise
+             * policies supported by the app. Policies are analogous to options
+             * but are configured by a system administrator instead of the user,
+             * allowing the app to be preconfigured for all users of an organization.
+             *
+             * After declaring the policies they can be read from the storage.managed API.
+             * It's up to the app to enforce the policies configured by the administrator.
+             */
             storage?: {
-                managed_schema: string
+                /**
+                 * The storage.managed_schema property indicates a file within the app that contains the policy schema.
+                 * @see ManagedSchema for schema content typings
+                 * @see[Docs and Schema Format]{@link https://developer.chrome.com/apps/manifest/storage}
+                 */
+                managed_schema: string;
             };
-            system_indicator?: any;
+
+            // system_indicator?: any; // Deprecated / removed: https://bugs.chromium.org/p/chromium/issues/detail?id=142450
+            /**
+             * If you publish using the Chrome Developer Dashboard, ignore this field.
+             * If you host your own app: URL to an update manifest XML file.
+             * **⚠ Warning**
+             * As of M33, Windows stable / beta channel users can only
+             * download apps hosted in the Chrome Web Store
+             * @requires(not Windows)
+             * (@see[Protecting Windows users from malicious extensions]{@link http://blog.chromium.org/2013/11/protecting-windows-users-from-malicious.html}).
+             * @see[Documentation]{@link https://developer.chrome.com/apps/autoupdate}
+             */
             update_url?: string;
+
+            /**
+             * Used by packaged apps to specify URL patterns the app wants to intercept and handle.
+             * An app can define multiple URL handlers under this manifest entry,
+             * each having an identifier, a URL pattern, and a title.
+             * Here's an example of how to specify url_handlers:
+             * @example
+             * 'view_foobar_presentation': {
+             *   'matches': [
+             *     'https://www.foobar.com/presentation/view/*'
+             *   ],
+             *   'title': 'View FooBar presentation'
+             * }
+             * @see[Documentation]{@link https://developer.chrome.com/apps/manifest/url_handlers}
+             *
+             */
             url_handlers?: {
                 [name: string]: {
+                    /** URLs to match and handle */
                     matches: string[];
+                    /**
+                     * The title field is reserved for future use in all relevant UI elements.
+                     * It should describe the action that the app performs when launched with this type of URL handler.
+                     */
                     title?: string;
                 }
             };
+
+            /** The usbPrinters manifest property declares which USB printers are supported by an app using the printerProvider API. */
             usb_printers?: {
-                filters: {
-                    vendorId?: number;
-                    productId?: number;
-                    interfaceClass?: number;
-                    interfaceSubclass?: number;
-                    interfaceProtocol?: number;
-                }[]
+                /**
+                 * A list of USB device filters matching supported devices.
+                 * A device only needs to match one of the provided filters.
+                 * A vendorId is required and only one of productId or interfaceClass may be provided.
+                 */
+                filters: chrome.usb.DeviceFilterStrict[];
             };
+
+            /**
+             * version_name can be set to a descriptive version string and will be used for display purposes if present.
+             * If no version_name is present, the version field will be used for display purposes as well.
+             * @example
+             * 'version_name': '0.8 beta'
+             * 'version_name': 'build rc3'
+             * 'version_name': 'Gold Edition'
+             */
             version_name?: string;
+
+            /**
+             * By default, webviews are prevented from loading any resources packaged with the app.
+             * However, webview partitions may be granted access to these resources via a webview.partitions
+             * section in the app manifest. Partitions may be granted access to a set of files by
+             * matching partition name patterns with file name patterns. Both sorts of patterns may
+             * contain the * wildcard.
+             * @see[Accessing packaged resources]{@link https://developer.chrome.com/apps/tags/webview#local_resources}
+             */
             webview?: {
-                partitions?: {
-                    name: string;
-                    accessible_resources: string[];
-                }[]
+                /** Webview partition list */
+                partitions: WebViewPartition[]
             }
-            [key: string]: any;
         }
 
         /**
-         * 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.
-         * @since Chrome 26.
+         * Manifest for Chrome OS Kiosk apps
+         * @requires(CrOS Kiosk App) **Only for Chrome OS Kiosk Apps.**
          */
-        export function connect(connectInfo?: ConnectInfo): Port;
+        interface ValidKioskManifest extends PartialManifest {
+            /**
+             * Enable this app to be used as a kiosk app.
+             */
+            kiosk_enabled: true;
+
+            /** Kiosk settings */
+            kiosk?: {
+                /**
+                 * If the key is specified and its value is true, it allows the app to
+                 * be always updated regardless of whether the underlying platform is
+                 * compliant or not. If the value is false or the key is not specified,
+                 * the required platform version is respected and the app update is
+                 * deferred until the underlying platform becomes compliant.
+                 */
+                always_update?: boolean;
+                required_platform_version?: string;
+            };
+
+            /**
+             * This app can only be used as a kiosk app on Chrome OS
+             */
+            kiosk_only?: boolean;
+
+            /**
+             * Not useful since it will prevent app from running.
+             * @see[Source]{@link https://github.com/chromium/chromium/blob/master/chrome/browser/chromeos/extensions/device_local_account_management_policy_provider.cc#L155}
+             */
+            kiosk_secondary_apps?: any;
+        }
+        interface ValidNonKioskManifest extends PartialManifest {
+            kiosk_enabled?: false;
+        }
+
+        interface InvalidManifest extends PartialManifest {
+            //
+            // Never types - should never exist
+            // Are declared to prevent use since many
+            // legacy app are using them. Will result
+            // in errors. Many examples and code bases
+            // have these included.
+            //
+
+            /** Not for packaged apps */
+            options_ui?: never;
+            /** Not for packaged apps */
+            options_page?: never;
+            /** Not for packaged apps */
+            browser_action?: never;
+            /**
+             * Not for packaged apps
+             * Only for extensions and legacy packaged apps
+             */
+            content_security_policy?: never;
+            /**
+             * Not for packaged apps
+             * Only for extensions and legacy packaged apps
+             */
+            chrome_url_overrides?: never;
+        }
+
+        type Manifest = ValidKioskManifest | ValidNonKioskManifest | InvalidManifest;
+
         /**
-         * 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.
+         * Attempts to connect to connect listeners within an app (such as the background page), or other apps.
+         * This is useful for content scripts connecting to their extension processes, inter-app communication, and web messaging.
+         * Note that this does not connect to any listeners in a content script.
          * @since Chrome 26.
-         * @param extensionId Optional.
-         * 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.
          */
-        export function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
+        function connect(connectInfo?: ConnectInfo): Port;
+        /**
+         * Attempts to connect to connect listeners within an app (such as the background page), or other apps.
+         * This is useful for content scripts connecting to their extension processes, inter-app communication, and web messaging.
+         * Note that this does not connect to any listeners in a content script.
+         * @since Chrome 26.
+         * @param extensionId Optional; ID of the extension.
+         * The ID of the extension or app to connect to.
+         * If omitted, a connection will be attempted with your own app.
+         * Required if sending messages from a web page for web messaging.
+         */
+        function connect(extensionId: string, connectInfo?: ConnectInfo): Port;
         /**
          * Connects to a native application in the host machine.
          * @since Chrome 28.
          * @param application The name of the registered application to connect to.
          */
-        export function connectNative(application: string): Port;
-        /** 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. */
-        export function getBackgroundPage(callback: (backgroundPage?: Window) => void): void;
+        function connectNative(application: string): Port;
+
         /**
-         * Returns details about the app or extension from the manifest. The object returned is a serialization of the full manifest file.
+         * Retrieves the JavaScript 'window' object for the background page running inside the current 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(callback: (backgroundPage?: Window) => void): void;
+
+        /**
+         * Returns details about the app from the manifest.
+         * The object returned is a serialization of the full manifest file.
          * @returns The manifest details.
          */
-        export function getManifest(): Manifest;
+        function getManifest(): Manifest;
+
         /**
          * Returns a DirectoryEntry for the package directory.
          * @since Chrome 29.
          */
-        export function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+        function getPackageDirectoryEntry(callback: (directoryEntry: DirectoryEntry) => void): void;
+
         /**
          * Returns information about the current platform.
          * @since Chrome 29.
          * @param callback Called with results
          */
-        export function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+        function getPlatformInfo(callback: (platformInfo: PlatformInfo) => void): void;
+
         /**
-         * 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.
+         * Converts a relative path within an app install directory to a fully-qualified URL.
+         * @param path A path to a resource within an app expressed relative to its install directory.
          */
-        export function getURL(path: string): string;
+        function getURL(path: string): string;
+
         /**
-         * Reloads the app or extension.
+         * Reloads the app .
          * @since Chrome 25.
          */
-        export function reload(): void;
+        function reload(): void;
+
         /**
-         * Requests an update check for this app/extension.
+         * Requests an update check for this app.
          * @since Chrome 25.
          * @param callback
-         * Parameter status: Result of the update check. One of: "throttled", "no_update", or "update_available"
+         * Parameter status: Result of the update check. See enum RequestUpdateCheckStatus.
          * Optional parameter details: If an update is available, this contains more information about the available update.
          */
-        export function requestUpdateCheck(callback: (status: string, details?: UpdateCheckDetails) => void): void;
+        function requestUpdateCheck(callback: (status: ToStringLiteral<typeof RequestUpdateCheckStatus>, details?: UpdateCheckDetails) => void): void;
+
         /**
          * Restart the ChromeOS device when the app runs in kiosk mode. Otherwise, it's no-op.
          * @since Chrome 32.
          */
-        export function restart(): void;
+        function restart(): void;
+
         /**
-         * 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.
+         * Sends a single message to event listeners within your app or a different 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.
          * @since Chrome 26.
-         * @param responseCallback Optional
+         * @param [responseCallback]
          * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
          */
-        export function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+        function sendMessage(message: any, responseCallback?: (response: any) => void): void;
+
         /**
-         * 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.
+         * Sends a single message to event listeners within your app or a different 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.
          * @since Chrome 32.
-         * @param responseCallback Optional
+         * @param [responseCallback]
          * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
          */
-        export function sendMessage(message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+        function sendMessage(message: any, options?: MessageOptions | null, responseCallback?: (response: any) => void): void;
+
         /**
-         * 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.
-         * @since Chrome 26.
-         * @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.
-         * @param responseCallback Optional
-         * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
-         */
-        export function sendMessage(extensionId: string, message: any, responseCallback?: (response: any) => void): void;
-        /**
-         * 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.
+         * Sends a single message to event listeners within your app or a different 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.
          * @since Chrome 32.
-         * @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.
-         * @param responseCallback Optional
+         * @param extensionId The ID of the app to send the message to. If omitted, the message will be sent to your own app. Required if sending messages from a web page for web messaging.
+         * @param [responseCallback]
          * Parameter response: The JSON response object sent by the handler of the message. If an error occurs while connecting to the extension, the callback will be called with no arguments and runtime.lastError will be set to the error message.
          */
-        export function sendMessage(extensionId: string, message: any, options: MessageOptions, responseCallback?: (response: any) => void): void;
+        function sendMessage(extensionId: string, message: any, options?: MessageOptions | null, responseCallback?: (response: any) => void): void;
+
         /**
          * Send a single message to a native application.
          * @since Chrome 28.
@@ -2801,7 +8083,8 @@ declare namespace chrome {
          * @param responseCallback Optional.
          * Parameter response: The response message sent by the native messaging host. If an error occurs while connecting to the native messaging host, the callback will be called with no arguments and runtime.lastError will be set to the error message.
          */
-        export function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
+        function sendNativeMessage(application: string, message: Object, responseCallback?: (response: any) => void): void;
+
         /**
          * 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.
          * @since Chrome 41.
@@ -2809,195 +8092,388 @@ declare namespace chrome {
          * URL to be opened after the extension is uninstalled. This URL must have an http: or https: scheme. Set an empty string to not open a new tab upon uninstallation.
          * @param callback Called when the uninstall URL is set. If the given URL is invalid, runtime.lastError will be set.
          */
-        export function setUninstallURL(url: string, callback?: () => void): void;
-        /**
-         * Open your Extension's options page, if possible.
-         * The precise behavior may depend on your manifest's options_ui or options_page key, or what Chrome happens to support at the time. For example, the page may be opened in a new tab, within chrome://extensions, within an App, or it may just focus an open options page. It will never cause the caller page to reload.
-         * If your Extension does not declare an options page, or Chrome failed to create one for some other reason, the callback will set lastError.
-         * @since Chrome 42.
-         */
-        export function openOptionsPage(callback?: () => void): void;
+        function setUninstallURL(url: string, callback?: () => void): void;
+
+
+        interface ExtensionMessageEvent extends chrome.events.Event<(message: any, sender: MessageSender, sendResponse: (response: any) => void) => void> { }
+
+        interface ExtensionConnectEvent extends chrome.events.Event<(port: Port) => void> { }
+
+        interface RuntimeEvent extends chrome.events.Event<() => void> { }
 
         /**
          * Fired when a connection is made from either an extension process or a content script.
          * @since Chrome 26.
          */
-        export var onConnect: ExtensionConnectEvent;
+        const onConnect: ExtensionConnectEvent;
         /**
          * Fired when a connection is made from another extension.
          * @since Chrome 26.
          */
-        export var onConnectExternal: ExtensionConnectEvent;
+        const 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. */
-        export var onSuspend: RuntimeEvent;
+        const 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.
+         * Fired when a profile that has this app installed first starts up. This event is not fired when an incognito profile is started, even if this app is operating in 'split' incognito mode.
          * @since Chrome 23.
          */
-        export var onStartup: RuntimeEvent;
+        const 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. */
-        export var onInstalled: RuntimeInstalledEvent;
+        const onInstalled: chrome.events.Event<(details: InstalledDetails) => void>;
         /** Sent after onSuspend to indicate that the app won't be unloaded after all. */
-        export var onSuspendCanceled: RuntimeEvent;
+        const onSuspendCanceled: RuntimeEvent;
         /**
          * Fired when a message is sent from either an extension process or a content script.
          * @since Chrome 26.
          */
-        export var onMessage: ExtensionMessageEvent;
+        const onMessage: ExtensionMessageEvent;
         /**
-         * Fired when a message is sent from another extension/app. Cannot be used in a content script.
+         * Fired when a message is sent from another app. Cannot be used in a content script.
          * @since Chrome 26.
          */
-        export var onMessageExternal: ExtensionMessageEvent;
+        const 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.
+         * @required(Chrome OS Kiosk app) Currently, this event is only fired for Chrome OS kiosk apps.
+         * 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.
          * @since Chrome 29.
          */
-        export var onRestartRequired: RuntimeRestartRequiredEvent;
+        const onRestartRequired: chrome.events.Event<(reason: ToStringLiteral<typeof OnRestartRequiredReason>) => void>;
         /**
-         * 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.
+         * 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.
          */
-        export var onUpdateAvailable: RuntimeUpdateAvailableEvent;
+        const onUpdateAvailable: chrome.events.Event<(details: UpdateAvailableDetails) => void>;
         /**
-         * @deprecated since Chrome 33. Please use chrome.runtime.onRestartRequired.
+         * @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.
          */
-        export var onBrowserUpdateAvailable: RuntimeEvent;
+        const onBrowserUpdateAvailable: RuntimeEvent;
     }
+    // #endregion
 
-    ////////////////////
-    // Serial
-    ////////////////////
+    // #region chrome.serial
+    ////////////
+    // Serial //
+    ////////////
     /**
-     * Use the chrome.serial API to read from and write to a device connected to a serial port.
+     * Use the chrome.socket API to send and receive data over the network using TCP and UDP connections.
+     * @deprecated Note: Starting with Chrome 33,
+     *  this API is deprecated in favor of the
+     *  sockets.udp, sockets.tcp and sockets.tcpServer APIs.
      * @since Chrome 23
      */
-    namespace serial {
-        /** NOT YET IMPLEMENTED */
-    }
+    const serial: chrome.deprecated;
+    // #endregion
 
-    ////////////////////
-    // Socket
-    ////////////////////
-    namespace socket {
-        interface CreateInfo {
-            socketId: number;
-        }
-
-        interface AcceptInfo {
-            resultCode: number;
-            socketId?: number;
-        }
-
-        interface ReadInfo {
-            resultCode: number;
-            data: ArrayBuffer;
-        }
-
-        interface WriteInfo {
-            bytesWritten: number;
-        }
-
-        interface RecvFromInfo {
-            resultCode: number;
-            data: ArrayBuffer;
-            port: number;
-            address: string;
-        }
-
-        interface SocketInfo {
-            socketType: string;
-            localPort?: number;
-            peerAddress?: string;
-            peerPort?: number;
-            localAddress?: string;
-            connected: boolean;
-        }
-
-        interface NetworkInterface {
+    // #region chrome.signedInDevices
+    //////////////////////
+    // SignedIn Devices //
+    //////////////////////
+    /**
+     * @requires(dev) Requires Chrome *dev*
+     * Use the *chrome.signedInDevices* API to get a list of devices
+     * signed into chrome with the same account as the current profile.
+     */
+    namespace signedInDevices {
+        type OS = 'win' | 'mac' | 'linux' | 'chrome_os' | 'android' | 'ios' | 'unknown';
+        type DeviceType = 'desktop_or_laptop' | 'phone' | 'tablet' | 'unknown';
+        interface DeviceInfo {
+            /**
+             * Name of the device.
+             * This name is usually set by the user when setting up a device.
+             */
             name: string;
-            address: string;
+            /**
+             * Unique Id for this device.
+             * Note: The id is meaningful only in the current device.
+             * This id cannot be used to refer to the same device from
+             * another device or extension.
+             */
+            id: string;
+            /** The OS of the device. */
+            os: OS;
+            /** Device type */
+            type: DeviceType;
+            /** Version of chrome running in this device. */
+            chromeVersion: string;
         }
-
-        export function create(type: string, options?: Object, callback?: (createInfo: CreateInfo) => void): void;
-        export function destroy(socketId: number): void;
-        export function connect(socketId: number, hostname: string, port: number, callback: (result: number) => void): void;
-        export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
-        export function disconnect(socketId: number): void;
-        export function read(socketId: number, bufferSize?: number, callback?: (readInfo: ReadInfo) => void): void;
-        export function write(socketId: number, data: ArrayBuffer, callback?: (writeInfo: WriteInfo) => void): void;
-        export function recvFrom(socketId: number, bufferSize?: number, callback?: (recvFromInfo: RecvFromInfo) => void): void;
-        export function sendTo(socketId: number, data: ArrayBuffer, address: string, port: number, callback?: (writeInfo: WriteInfo) => void): void;
-        export function listen(socketId: number, address: string, port: number, backlog?: number, callback?: (result: number) => void): void;
-        export function accept(socketId: number, callback?: (acceptInfo: AcceptInfo) => void): void;
-        export function setKeepAlive(socketId: number, enable: boolean, delay?: number, callback?: (result: boolean) => void): void;
-        export function setNoDelay(socketId: number, noDelay: boolean, callback?: (result: boolean) => void): void;
-        export function getInfo(socketId: number, callback: (result: SocketInfo) => void): void;
-        export function getNetworkList(callback: (result: NetworkInterface[]) => void): void;
+        /**
+         * Gets the array of signed in devices, signed into the same account as the current profile.
+         * @param isLocal If true only return the information for the local device.
+         * If false or omitted return the list of all devices including the local device.
+         * @param callback The callback to be invoked with the array of DeviceInfo objects.
+         */
+        function get(isLocal: boolean, callback: (devices: DeviceInfo[]) => void): void;
+        /**
+         * Gets the array of signed in devices, signed into the same account as the current profile.
+         * @param callback The callback to be invoked with the array of DeviceInfo objects.
+         */
+        function get(callback: (devices: DeviceInfo[]) => void): void;
+        /**
+         * Fired when the DeviceInfo object of any of the signed in devices
+         * changes, or when a device is added or removed.
+         * Provides *devices*:
+         * The array of all signed in devices.
+         */
+        const onDeviceInfoChange: chrome.events.Event<(devices: DeviceInfo[]) => void>;
     }
 
-    namespace sockets.tcp {
+    // #endregion
+
+    // #region chrome.socket
+    ////////////
+    // Socket //
+    ////////////
+    /*
+     * @deprecated Since Chrome 33
+     * @description
+     * Use the chrome.socket API to send and receive data over the network using TCP and UDP connections.
+     * Note: Starting with Chrome 33, this API is deprecated in favor of the sockets.udp, sockets.tcp
+     * and sockets.tcpServer APIs.
+     */
+    // const socket: chrome.deprecatedButUsable; // Removed to not be confused with chrome.sockets.*
+    // #endregion
+
+    // #region chrome.sockets.*
+    ////////////////////
+    // Chrome Sockets //
+    ////////////////////
+    /**
+     * Use the chrome.sockets.* APIs to send and receive data over the network using TCP and UDP connections.
+     * @since Chrome 33.
+     */
+    namespace sockets {
         interface CreateInfo {
-            socketId: number;
+            /**
+             * The ID of the newly created socket.
+             * Note that socket IDs created from this API are
+             * **not compatible** with socket IDs created from
+             * other APIs, such as the deprecated socket API.
+             */
+            socketId: integer;
         }
 
         interface SendInfo {
-            resultCode: number;
-            bytesSent?: number;
+            /** The result code returned from the underlying network call. A negative value indicates an error. */
+            resultCode: integer;
+            /** The number of bytes sent (if result == 0) */
+            bytesSent?: integer;
         }
 
         interface ReceiveEventArgs {
-            socketId: number;
+            /** The socket identifier. */
+            socketId: integer;
+            /** The data received, with a maxium size of *bufferSize*. */
             data: ArrayBuffer;
         }
+        interface AcceptEventArgs extends ReceiveEventArgs { }
 
         interface ReceiveErrorEventArgs {
-            socketId: number;
-            resultCode: number;
+            /** The socket identifier. */
+            socketId: integer;
+            /** The result code returned from the underlying network call. */
+            resultCode: integer;
         }
+        interface AcceptErrorEventArgs extends ReceiveErrorEventArgs { }
 
         interface SocketProperties {
+            /**
+             * Flag indicating if the socket is left open when the event page of the
+             * application is unloaded. When the application is loaded, any sockets
+             * previously opened with persistent=true can be fetched with *getSockets*.
+             * @default false
+             */
             persistent?: boolean;
+            /** An application-defined string associated with the socket. */
             name?: string;
-            bufferSize?: number;
+            /**
+             * The size of the buffer used to receive data.
+             * @default: 4096
+             */
+            bufferSize?: integer;
         }
 
         interface SocketInfo {
-            socketId: number;
+            /** The socket identifier. */
+            socketId: integer;
+            /** Flag indicating whether the socket is left open when the application is suspended (see SocketProperties.persistent). */
             persistent: boolean;
+            /** Application-defined string associated with the socket. */
             name?: string;
-            bufferSize?: number;
+            /** The size of the buffer used to receive data. If no buffer size has been specified explictly, the value is not provided. */
+            bufferSize?: integer;
+            /** Flag indicating whether a connected socket blocks its peer from sending more data (see setPaused). */
             paused: boolean;
+            /** Flag indicating whether the socket is connected to a remote peer. */
             connected: boolean;
+            /** If the underlying socket is connected, contains its local IPv4/6 address. */
             localAddress?: string;
-            localPort?: number;
+            /** If the underlying socket is connected, contains its local port. */
+            localPort?: integer;
+            /** If the underlying socket is connected, contains the peer/ IPv4/6 address. */
             peerAddress?: string;
-            peerPort?: number;
+            /** If the underlying socket is connected, contains the peer port. */
+            peerPort?: integer;
         }
+    }
 
-        export function create(callback: (createInfo: CreateInfo) => void): void;
-        export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+    /**
+     * Use the chrome.sockets.tcp API to send and receive data over the network using TCP connections.
+     * This API supersedes the TCP functionality previously found in the chrome.socket API.
+     * @since Chrome 33.
+     * @requires Manifest: 'Sockets': {...}
+     */
+    namespace sockets.tcp {
+        interface SecureOptions {
+            /**
+             * The minimum and maximum acceptable versions of TLS.
+             * These will be tls1, tls1.1, or tls1.2.
+             * *Note*
+             * tls1.3 should be supported from Chrome 67.
+             * @see[TLS Info and support table]{@link https://en.wikipedia.org/wiki/Transport_Layer_Security#TLS_1.3}
+             */
+            tlsVersion?: {
+                min?: 'tls1' | 'tls1.1' | 'tls1.2' | 'tls1.3',
+                max?: 'tls1' | 'tls1.1' | 'tls1.2' | 'tls1.3',
+            },
+        }
+        /** Creates a TCP socket. */
+        function create(callback: (createInfo: CreateInfo) => void): void;
+        /**
+         * Creates a TCP socket.
+         * @param properties The socket properties (optional).
+         */
+        function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
-        export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
-        export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+        /** Updates the socket properties. */
+        function update(socketId: integer, properties: SocketProperties, callback?: () => void): void;
 
-        export function setKeepAlive(socketId: number,
-            enable: boolean, callback: (result: number) => void): void;
-        export function setKeepAlive(socketId: number,
-            enable: boolean, delay: number, callback: (result: number) => void): void;
+        /**
+         * Enables or disables the application from receiving messages from its peer.
+         * The default value is 'false'. Pausing a socket is typically used by an
+         * application to throttle data sent by its peer. When a socket is paused,
+         * no onReceive event is raised. When a socket is connected and un-paused,
+         * onReceive events are raised again when messages are received.
+         */
+        function setPaused(socketId: integer, paused: boolean, callback?: () => void): void;
 
-        export function setNoDelay(socketId: number, noDelay: boolean, callback: (result: number) => void): void;
-        export function connect(socketId: number,
-            peerAddress: string, peerPort: number, callback: (result: number) => void): void;
-        export function disconnect(socketId: number, callback?: () => void): void;
-        export function send(socketId: number, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
-        export function close(socketId: number, callback?: () => void): void;
-        export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
-        export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+        /**
+         * @description Enables or disables the keep-alive functionality for a TCP connection.
+         * @param socketId The socket identifier.
+         * @param enable If true, enable keep-alive functionality.
+         * @param callback Provides the result code returned from the underlying network call. A negative value indicates an error.
+         */
+        function setKeepAlive(socketId: integer,
+            enable: boolean, callback: (result: integer) => void): void;
+        /**
+         * @description Enables or disables the keep-alive functionality for a TCP connection.
+         * @param socketId The socket identifier.
+         * @param enable If true, enable keep-alive functionality.
+         * @param [delay] Set the delay seconds between the last data packet received and the first keepalive probe. Default is 0.
+         * @param callback Provides the result code returned from the underlying network call. A negative value indicates an error.
+         */
+        function setKeepAlive(socketId: integer,
+            enable: boolean, delay: integer, callback: (result: integer) => void): void;
 
-        export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
-        export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+        /**
+         * Sets or clears TCP_NODELAY for a TCP connection.
+         * Nagle's algorithm will be disabled when TCP_NODELAY is set.
+         * @param socketId The socket identifier.
+         * @param noDelay If true, disables Nagle's algorithm.
+         * @param callback Called when the setNoDelay attempt is complete. Provides the result code returned
+         *                 from the underlying network call. A negative value indicates an error.
+         */
+        function setNoDelay(socketId: integer, noDelay: boolean, callback: (result: integer) => void): void;
+
+        /**
+         * Connects the socket to a remote machine.
+         * When the connect operation completes successfully,
+         * onReceive events are raised when data is received from the peer.
+         * If a network error occurs while the runtime is receiving packets,
+         * a onReceiveError event is raised, at which point no more onReceive
+         * event will be raised for this socket until the resume method is called.
+         * @param socketId The socket identifier.
+         * @param peerAddress The address of the remote machine. DNS name, IPv4 and IPv6 formats are supported.
+         * @param peerPort The port of the remote machine.
+         * @param callback Called when the connect attempt is complete.
+         *                 The result code returned from the underlying network call.
+         *                 A negative value indicates an error.
+         */
+        function connect(socketId: integer,
+            peerAddress: string, peerPort: integer, callback: (result: integer) => void): void;
+
+        /**
+         * @description Disconnects the socket.
+         * @param socketId The socket identifier.
+         * @param [callback] Called when the disconnect attempt is complete.
+         */
+        function disconnect(socketId: integer, callback?: () => void): void;
+
+        /**
+         * Start a TLS client connection over the connected TCP client socket.
+         * @since Chrome 38.
+         * @param socketId The existing, connected socket to use.
+         * @param callback Called when the connection attempt is complete.
+         */
+        function secure(socketId: integer, callback: (result: integer) => void): void;
+        /**
+         * Start a TLS client connection over the connected TCP client socket.
+         * @since Chrome 38.
+         * @param socketId The existing, connected socket to use.
+         * @param [options] Constraints and parameters for the TLS connection.
+         * @param callback Called when the connection attempt is complete.
+         */
+        function secure(socketId: integer, options: SecureOptions, callback: (result: integer) => void): void;
+
+        /**
+         * @description Sends data on the given TCP socket.
+         * @param socketId The socket identifier.
+         * @param data The data to send.
+         * @param callback Called when the send operation completes.
+         */
+        function send(socketId: integer, data: ArrayBuffer, callback: (sendInfo: SendInfo) => void): void;
+
+        /**
+         * Closes the socket and releases the address/port the socket is bound to.
+         * Each socket created should be closed after use. The socket id is no longer
+         * valid as soon at the function is called. However, the socket is guaranteed
+         * to be closed only when the callback is invoked.
+         * @param socketId The socket identifier.
+         * @param [callback] Called when the close operation completes.
+         */
+        function close(socketId: integer, callback?: () => void): void;
+
+        /**
+         * Retrieves the state of the given socket.
+         * @param socketId The socket identifier.
+         * @param callback Called when the socket state is available. Provides an object containing the socket information.
+         */
+        function getInfo(socketId: integer, callback: (socketInfo: SocketInfo) => void): void;
+
+        /**
+         * @description Retrieves the list of currently opened sockets owned by the application.
+         * @param callback Called when the list of sockets is available. Provides an array of socket info.
+         */
+        function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+
+        /** Event raised when data has been received for a given socket. */
+        const onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+        /**
+         * Event raised when a network error occured while the runtime was
+         * waiting for data on the socket address and port. Once this event
+         * is raised, the socket is set to paused and no more onReceive
+         * events are raised for this socket.
+         */
+        const onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
     }
 
     /**
@@ -3009,27 +8485,13 @@ declare namespace chrome {
      * @see https://developer.chrome.com/apps/sockets_tcpServer
      */
     namespace sockets.tcpServer {
-        interface CreateInfo {
-            socketId: number;
-        }
-
-        interface AcceptEventArgs {
-            socketId: number;
-            clientSocketId: number;
-        }
-
-        interface AcceptErrorEventArgs {
-            socketId: number;
-            resultCode: number;
-        }
-
         /**
          * @see https://developer.chrome.com/apps/sockets_tcpServer#type-SocketProperties
          */
         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
+             * application is unloaded. The default value is 'false.' When the
              * application is loaded, any sockets previously opened with
              * persistent=true can be fetched with getSockets.
              *
@@ -3046,12 +8508,12 @@ declare namespace chrome {
          */
         interface SocketInfo {
             /** The socket identifier. */
-            socketId: number;
+            socketId: integer;
 
             /**
              * Flag indicating if the socket remains open when the event page of the
              * application is unloaded (see SocketProperties.persistent). The
-             * default value is "false".
+             * default value is 'false'.
              */
             persistent: boolean;
 
@@ -3061,7 +8523,7 @@ declare namespace chrome {
             /**
              * Flag indicating whether connection requests on a listening socket are
              * dispatched through the onAccept event or queued up in the listen
-             * queue backlog. See setPaused. The default value is "false"
+             * queue backlog. See setPaused. The default value is 'false'
              */
             paused: boolean;
 
@@ -3069,7 +8531,7 @@ declare namespace chrome {
             localAddress?: string;
 
             /** If the socket is listening, contains its local port. */
-            localPort?: number;
+            localPort?: integer;
         }
 
         /**
@@ -3078,7 +8540,7 @@ declare namespace chrome {
          * @see https://developer.chrome.com/apps/sockets_tcpServer#method-create
          * @param callback Called when the socket has been created.
          */
-        export function create(callback: (createInfo: CreateInfo) => void): void;
+        function create(callback: (createInfo: CreateInfo) => void): void;
 
         /**
          * Creates a TCP server socket.
@@ -3087,7 +8549,7 @@ declare namespace chrome {
          * @param properties The socket properties.
          * @param callback   Called when the socket has been created.
          */
-        export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+        function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
         /**
          * Updates the socket properties.
@@ -3097,7 +8559,7 @@ declare namespace chrome {
          * @param properties The properties to update.
          * @param callback   Called when the properties are updated.
          */
-        export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+        function update(socketId: integer, properties: SocketProperties, callback?: () => void): void;
 
         /**
          * Enables or disables a listening socket from accepting new connections.
@@ -3108,7 +8570,7 @@ declare namespace chrome {
          * @see https://developer.chrome.com/apps/sockets_tcpServer#method-setPaused
          * @param callback Callback from the setPaused method.
          */
-        export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+        function setPaused(socketId: integer, paused: boolean, callback?: () => void): void;
 
         /**
          * Listens for connections on the specified port and address. If the
@@ -3125,7 +8587,7 @@ declare namespace chrome {
          *                 ensures a reasonable queue length for most applications.
          * @param callback Called when listen operation completes.
          */
-        export function listen(socketId: number, address: string, port: number, backlog: number, callback: (result: number) => void): void;
+        function listen(socketId: integer, address: string, port: integer, backlog: integer, callback: (result: integer) => void): void;
 
         /**
          * Listens for connections on the specified port and address. If the
@@ -3139,7 +8601,7 @@ declare namespace chrome {
          *                 be found by calling getInfo.
          * @param callback Called when listen operation completes.
          */
-        export function listen(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+        function listen(socketId: integer, address: string, port: integer, callback: (result: integer) => void): void;
 
         /**
          * Disconnects the listening socket, i.e. stops accepting new connections
@@ -3151,7 +8613,7 @@ declare namespace chrome {
          * @param socketId The socket identifier.
          * @param callback Called when the disconnect attempt is complete.
          */
-        export function disconnect(socketId: number, callback?: () => void): void;
+        function disconnect(socketId: integer, callback?: () => void): void;
 
         /**
          * Disconnects and destroys the socket. Each socket created should be closed
@@ -3163,7 +8625,7 @@ declare namespace chrome {
          * @param socketId The socket identifier.
          * @param callback Called when the close operation completes.
          */
-        export function close(socketId: number, callback?: () => void): void;
+        function close(socketId: integer, callback?: () => void): void;
 
         /**
          * Retrieves the state of the given socket.
@@ -3172,7 +8634,7 @@ declare namespace chrome {
          * @param socketId The socket identifier.
          * @param callback Called when the socket state is available.
          */
-        export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+        function getInfo(socketId: integer, callback: (socketInfo: SocketInfo) => void): void;
 
         /**
          * Retrieves the list of currently opened sockets owned by the application.
@@ -3180,14 +8642,14 @@ declare namespace chrome {
          * @see https://developer.chrome.com/apps/sockets_tcpServer#method-getSockets
          * @param callback Called when the list of sockets is available.
          */
-        export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+        function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
         /**
          * Event raised when a connection has been made to the server socket.
          *
          * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAccept
          */
-        export var onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
+        const onAccept: chrome.events.Event<(args: AcceptEventArgs) => void>;
 
         /**
          * Event raised when a network error occured while the runtime was waiting
@@ -3197,109 +8659,25 @@ declare namespace chrome {
          *
          * @see https://developer.chrome.com/apps/sockets_tcpServer#event-onAcceptError
          */
-        export var onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
+        const onAcceptError: chrome.events.Event<(args: AcceptErrorEventArgs) => void>;
     }
 
     /**
      * Use the chrome.sockets.udp API to send and receive data over the network
      * using UDP connections. This API supersedes the UDP functionality previously
-     * found in the "socket" API.
-     *
+     * found in the 'socket' API.
+     * @requires Manifest: 'sockets': {...}
      * @since Chrome 33
      * @see https://developer.chrome.com/apps/sockets_udp
      */
     namespace sockets.udp {
-        interface CreateInfo {
-            socketId: number;
-        }
-
-        interface SendInfo {
-            resultCode: number;
-            bytesSent?: number;
-        }
-
-        interface ReceiveEventArgs {
-            socketId: number;
-            data: ArrayBuffer;
-            remoteAddress: string;
-            remotePort: number;
-        }
-
-        interface ReceiveErrorEventArgs {
-            socketId: number;
-            resultCode: number;
-        }
-
-        /**
-         * @see https://developer.chrome.com/apps/sockets_udp#type-SocketProperties
-         */
-        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
-             * application is loaded, any sockets previously opened with
-             * persistent=true can be fetched with getSockets.
-             * @see http://developer.chrome.com/apps/app_lifecycle.html
-             */
-            persistent?: boolean;
-
-            /** An application-defined string associated with the socket. */
-            name?: string;
-
-            /**
-             * The size of the buffer used to receive data. If the buffer is too
-             * small to receive the UDP packet, data is lost. The default value is
-             * 4096.
-             */
-            bufferSize?: number;
-        }
-
-        /**
-         * @see https://developer.chrome.com/apps/sockets_udp#type-SocketInfo
-         */
-        interface SocketInfo {
-            /** The socket identifier. */
-            socketId: number;
-
-            /**
-             * Flag indicating whether the socket is left open when the application
-             * is suspended (see SocketProperties.persistent).
-             */
-            persistent: boolean;
-
-            /** Application-defined string associated with the socket. */
-            name?: string;
-
-            /**
-             * The size of the buffer used to receive data. If no buffer size ha
-             * been specified explictly, the value is not provided.
-             */
-            bufferSize?: number;
-
-            /**
-             * Flag indicating whether the socket is blocked from firing onReceive
-             * events.
-             */
-            paused: boolean;
-
-            /**
-             * If the underlying socket is bound, contains its local IPv4/6 address.
-             */
-            localAddress?: string;
-
-            /**
-             * If the underlying socket is bound, contains its local port.
-             */
-            localPort?: number;
-        }
-
         /**
          * Creates a UDP socket with default properties.
          *
          * @see https://developer.chrome.com/apps/sockets_udp#method-create
          * @param createInfo.socketId The ID of the newly created socket.
          */
-        export function create(callback: (createInfo: CreateInfo) => void): void;
+        function create(callback: (createInfo: CreateInfo) => void): void;
 
         /**
          * Creates a UDP socket with the given properties.
@@ -3308,7 +8686,7 @@ declare namespace chrome {
          * @param properties          The socket properties.
          * @param createInfo.socketId The ID of the newly created socket.
          */
-        export function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
+        function create(properties: SocketProperties, callback: (createInfo: CreateInfo) => void): void;
 
         /**
          * Updates the socket properties.
@@ -3318,7 +8696,7 @@ declare namespace chrome {
          * @param properties The properties to update.
          * @param callback   Called when the properties are updated.
          */
-        export function update(socketId: number, properties: SocketProperties, callback?: () => void): void;
+        function update(socketId: integer, properties: SocketProperties, callback?: () => void): void;
 
         /**
          * Pauses or unpauses a socket. A paused socket is blocked from firing
@@ -3330,7 +8708,7 @@ declare namespace chrome {
          * @param callback Called when the socket has been successfully paused or
          *                 unpaused.
          */
-        export function setPaused(socketId: number, paused: boolean, callback?: () => void): void;
+        function setPaused(socketId: integer, paused: boolean, callback?: () => void): void;
 
         /**
          * Binds the local address and port for the socket. For a client socket, it
@@ -3343,13 +8721,13 @@ declare namespace chrome {
          * @see https://developer.chrome.com/apps/sockets_udp#method-bind
          * @param socketId The socket ID.
          * @param address  The address of the local machine. DNS name, IPv4 and IPv6
-         *                 formats are supported. Use "0.0.0.0" to accept packets
+         *                 formats are supported. Use '0.0.0.0' to accept packets
          *                 from all local available network interfaces.
-         * @param port     The port of the local machine. Use "0" to bind to a free
+         * @param port     The port of the local machine. Use '0' to bind to a free
          *                 port.
          * @param callback Called when the bind operation completes.
          */
-        export function bind(socketId: number, address: string, port: number, callback: (result: number) => void): void;
+        function bind(socketId: integer, address: string, port: integer, callback: (result: integer) => void): void;
 
         /**
          * Sends data on the given socket to the given address and port. The socket
@@ -3362,7 +8740,7 @@ declare namespace chrome {
          * @param port     The port of the remote machine.
          * @param callback Called when the send operation completes.
          */
-        export function send(socketId: number, data: ArrayBuffer, address: string, port: number, callback: (sendInfo: SendInfo) => void): void;
+        function send(socketId: integer, data: ArrayBuffer, address: string, port: integer, callback: (sendInfo: SendInfo) => void): void;
 
         /**
          * Closes the socket and releases the address/port the socket is bound to.
@@ -3374,7 +8752,7 @@ declare namespace chrome {
          * @param socketId The socket ID.
          * @param callback Called when the close operation completes.
          */
-        export function close(socketId: number, callback?: () => void): void;
+        function close(socketId: integer, callback?: () => void): void;
 
         /**
          * Retrieves the state of the given socket.
@@ -3383,7 +8761,7 @@ declare namespace chrome {
          * @param socketId The socket ID.
          * @param callback Called when the socket state is available.
          */
-        export function getInfo(socketId: number, callback: (socketInfo: SocketInfo) => void): void;
+        function getInfo(socketId: integer, callback: (socketInfo: SocketInfo) => void): void;
 
         /**
          * Retrieves the list of currently opened sockets owned by the application.
@@ -3391,7 +8769,7 @@ declare namespace chrome {
          * @see https://developer.chrome.com/apps/sockets_udp#method-getSockets
          * @param callback Called when the list of sockets is available.
          */
-        export function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
+        function getSockets(callback: (socketInfos: SocketInfo[]) => void): void;
 
         /**
          * Joins the multicast group and starts to receive packets from that group.
@@ -3402,7 +8780,7 @@ declare namespace chrome {
          * @param address  The group address to join. Domain names are not supported.
          * @param callback Called when the joinGroup operation completes.
          */
-        export function joinGroup(socketId: number, address: string, callback: (result: number) => void): void;
+        function joinGroup(socketId: integer, address: string, callback: (result: integer) => void): void;
 
         /**
          * Leaves the multicast group previously joined using joinGroup. This is
@@ -3419,7 +8797,7 @@ declare namespace chrome {
          *                 supported.
          * @param callback Called when the leaveGroup operation completes.
          */
-        export function leaveGroup(socketId: number, address: string, callback: (result: number) => void): void;
+        function leaveGroup(socketId: integer, address: string, callback: (result: integer) => void): void;
 
         /**
          * Sets the time-to-live of multicast packets sent to the multicast group.
@@ -3431,7 +8809,7 @@ declare namespace chrome {
          * @param ttl      The time-to-live value.
          * @param callback Called when the configuration operation completes.
          */
-        export function setMulticastTimeToLive(socketId: number, ttl: number, callback: (result: number) => void): void;
+        function setMulticastTimeToLive(socketId: integer, ttl: integer, callback: (result: integer) => void): void;
 
         /**
          * Sets whether multicast packets sent from the host to the multicast group
@@ -3442,10 +8820,10 @@ declare namespace chrome {
          * when there is more than one application on the same host joined to the
          * same multicast group while having different settings on multicast
          * loopback mode. On Windows, the applications with loopback off will not
-         * RECEIVE the loopback packets; while on Unix-like systems, the
+         * receive the loopback packets; while on Unix-like systems, the
          * applications with loopback off will not SEND the loopback packets to
          * other applications on the same host.
-         * @see MSDN: http://goo.gl/6vqbj
+         * @see[MSDN]{@link http://goo.gl/6vqbj}
          *
          * Calling this method does not require multicast permissions.
          *
@@ -3454,7 +8832,7 @@ declare namespace chrome {
          * @param enabled  Indicate whether to enable loopback mode.
          * @param callback Called when the configuration operation completes.
          */
-        export function setMulticastLoopbackMode(socketId: number, enabled: boolean, callback: (result: number) => void): void;
+        function setMulticastLoopbackMode(socketId: integer, enabled: boolean, callback: (result: integer) => void): void;
 
         /**
          * Gets the multicast group addresses the socket is currently joined to.
@@ -3463,7 +8841,7 @@ declare namespace chrome {
          * @param socketId The socket ID.
          * @param callback Called with an array of strings of the result.
          */
-        export function getJoinedGroups(socketId: number, callback: (groups: string[]) => void): void;
+        function getJoinedGroups(socketId: integer, callback: (groups: string[]) => void): void;
 
         /**
          * Enables or disables broadcast packets on this socket.
@@ -3474,14 +8852,14 @@ declare namespace chrome {
          * @param enabled  true to enable broadcast packets, false to disable them.
          * @param callback Callback from the setBroadcast method.
          */
-        export function setBroadcast(socketId: number, enabled: boolean, callback?: (result: number) => void): void;
+        function setBroadcast(socketId: integer, enabled: boolean, callback?: (result: integer) => void): void;
 
         /**
          * Event raised when a UDP packet has been received for the given socket.
          *
          * @see https://developer.chrome.com/apps/sockets_udp#event-onReceive
          */
-        export var onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
+        const onReceive: chrome.events.Event<(args: ReceiveEventArgs) => void>;
 
         /**
          * Event raised when a network error occured while the runtime was waiting
@@ -3491,32 +8869,50 @@ declare namespace chrome {
          *
          * @see https://developer.chrome.com/apps/sockets_udp#event-onReceiveError
          */
-        export var onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
+        const onReceiveError: chrome.events.Event<(args: ReceiveErrorEventArgs) => void>;
     }
+    // #endregion chrome.sockets.*
 
-    ////////////////////
-    // Storage
-    ////////////////////
+    // #region chrome.storage
+    /////////////
+    // Storage //
+    /////////////
     /**
      * Use the chrome.storage API to store, retrieve, and track changes to user data.
-     * Permissions:  "storage"
+     * Permissions:  'storage'
      * @since Chrome 20.
      */
     namespace storage {
-        interface StorageArea {
+        interface StorageAreaRead {
+            /**
+             * Gets one or more items from storage.
+             * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+             * Parameter items: Object with items in their key-value mappings.
+             */
+            get(callback: (items: { [key: string]: any }) => void): void;
+            /**
+             * Gets one or more items from storage.
+             * @param keys A single key to get, list of keys to get, or a interface specifying default values.
+             * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
+             * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
+             * Parameter items: Object with items in their key-value mappings.
+             */
+            get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
             /**
              * 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).
              * Parameter bytesInUse: Amount of space being used in storage, in bytes.
              */
-            getBytesInUse(callback: (bytesInUse: number) => void): void;
+            getBytesInUse(callback: (bytesInUse: integer) => void): void;
             /**
              * 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.
              * @param callback Callback with the amount of space being used by storage, or on failure (in which case runtime.lastError will be set).
              * Parameter bytesInUse: Amount of space being used in storage, in bytes.
              */
-            getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: number) => void): void;
+            getBytesInUse(keys: string | string[] | null, callback: (bytesInUse: integer) => void): void;
+        }
+        interface StorageAreaWrite {
             /**
              * Removes all items from storage.
              * @param callback Optional.
@@ -3526,7 +8922,7 @@ declare namespace chrome {
             /**
              * 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).
+             * 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).
              * @param callback Optional.
              * Callback on success, or on failure (in which case runtime.lastError will be set).
              */
@@ -3538,103 +8934,279 @@ declare namespace chrome {
              * Callback on success, or on failure (in which case runtime.lastError will be set).
              */
             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).
-             * Parameter items: Object with items in their key-value mappings.
-             */
-            get(callback: (items: { [key: string]: any }) => void): void;
-            /**
-             * 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.
-             * An empty list or object will return an empty result object. Pass in null to get the entire contents of storage.
-             * @param callback Callback with storage items, or on failure (in which case runtime.lastError will be set).
-             * Parameter items: Object with items in their key-value mappings.
-             */
-            get(keys: string | string[] | Object | null, callback: (items: { [key: string]: any }) => void): void;
         }
 
+        interface StorageArea extends StorageAreaRead, StorageAreaWrite { }
+
         interface StorageChange {
-            /** Optional. The new value of the item, if there is a new value. */
+            /** 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. */
+            /** The old value of the item, if there was an old value. */
             oldValue?: any;
         }
 
         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;
+            /**
+             * 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.
+             * @see Permissions: 'unlimitedStorage'
+             * @default 5242880
+             */
+            readonly QUOTA_BYTES: 5242880;
         }
 
         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. */
-            QUOTA_BYTES: number;
-            /** The maximum size (in bytes) of each individual item in sync storage, as measured by the JSON stringification of its value plus its key length. Updates containing items larger than this limit will fail immediately and set runtime.lastError. */
-            QUOTA_BYTES_PER_ITEM: number;
-            /** The maximum number of items that can be stored in sync storage. Updates that would cause this limit to be exceeded will fail immediately and set runtime.lastError. */
-            MAX_ITEMS: 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.
+             */
+            readonly QUOTA_BYTES: 102400;
             /**
-             * The maximum number of set, remove, or clear operations that can be performed each hour. This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
+             * The maximum size (in bytes) of each individual item in sync storage,
+             * as measured by the JSON stringification of its value plus its key length.
+             * Updates containing items larger than this limit will fail immediately and
+             * set runtime.lastError.
+             */
+            readonly QUOTA_BYTES_PER_ITEM: 8192;
+            /**
+             * The maximum number of items that can be stored in sync storage.
+             * Updates that would cause this limit to be exceeded will fail immediately
+             * and set runtime.lastError.
+             */
+            readonly MAX_ITEMS: 512;
+            /**
+             * The maximum number of set, remove, or clear operations that can be performed each hour.
+             * This is 1 every 2 seconds, a lower ceiling than the short term higher writes-per-minute limit.
              * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
              */
-            MAX_WRITE_OPERATIONS_PER_HOUR: number;
+            readonly MAX_WRITE_OPERATIONS_PER_HOUR: 1800;
             /**
-             * The maximum number of set, remove, or clear operations that can be performed each minute. This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
+             * The maximum number of set, remove, or clear operations that can be performed each minute.
+             * This is 2 per second, providing higher throughput than writes-per-hour over a shorter period of time.
              * Updates that would cause this limit to be exceeded fail immediately and set runtime.lastError.
              * @since Chrome 40.
              */
-            MAX_WRITE_OPERATIONS_PER_MINUTE: number;
+            readonly MAX_WRITE_OPERATIONS_PER_MINUTE: 120;
+            /**
+             * @deprecated since Chrome 40.
+             * The storage.sync API no longer has a sustained write operation quota.
+             */
+            readonly MAX_SUSTAINED_WRITE_OPERATIONS_PER_MINUTE: chrome.deprecated;
         }
+        interface ManagedStorageArea extends StorageAreaRead { }
 
-        interface StorageChangedEvent extends chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: string) => void> { }
+        type StorageAreas = 'local' | 'sync' | 'managed';
 
         /** Items in the local storage area are local to each machine. */
-        export var local: LocalStorageArea;
+        const local: LocalStorageArea;
         /** Items in the sync storage area are synced using Chrome Sync. */
-        export var sync: SyncStorageArea;
+        const 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.
+         * 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.
          */
-        export var managed: StorageArea;
+        const managed: ManagedStorageArea;
 
         /** Fired when one or more items change. */
-        export var onChanged: StorageChangedEvent;
+        const onChanged: chrome.events.Event<(changes: { [key: string]: StorageChange }, areaName: StorageAreas) => void>;
     }
+    // #endregion
 
+    // #region chrome.syncFileSystem
     ////////////////////
-    // SyncFileSystem
+    // SyncFileSystem //
     ////////////////////
     /**
-     * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive. This API is NOT for accessing arbitrary user docs stored in Google Drive. It provides app-specific syncable storage for offline and caching usage so that the same data can be available across different clients. Read Manage Data for more on using this API.
+     * Use the chrome.syncFileSystem API to save and synchronize data on Google Drive.
+     * This API is NOT for accessing arbitrary user docs stored in Google Drive.
+     * It provides app-specific syncable storage for offline and caching usage so that
+     * the same data can be available across different clients. Read Manage Data for
+     * more on using this API.
+     *
+     * @requires[Permissions: 'syncFileSystem']
+     * @see[Learn more: Manage Data]{@link https://developer.chrome.com/apps/app_storage}
      * @since Chrome 27
      */
     namespace syncFileSystem {
-        /** NOT YET IMPLEMENTED */
+        /**
+         * @enum
+         * 'initializing'
+         *  - The sync service is being initialized (e.g. restoring data from the database, checking connectivity and authenticating to the service etc).
+         * 'running'
+         *  - The sync service is up and running.
+         * 'authentication_required'
+         *  - The sync service is not synchronizing files because the remote service needs to be authenticated by the user to proceed.
+         * 'temporary_unavailable'
+         *  - The sync service is not synchronizing files because the remote service is (temporarily) unavailable due to some recoverable errors, e.g. network is offline, the remote service is down or not reachable etc. More details should be given by |description| parameter in OnServiceInfoUpdated (which could contain service-specific details).
+         * 'disabled'
+         *  - The sync service is disabled and the content will never sync. (E.g. this could happen when the user has no account on the remote service or the sync service has had an unrecoverable error.)
+         */
+        const ServiceStatus: {
+            'INITIALIZING': 'initializing',
+            'RUNNING': 'running',
+            'AUTHENTICATION_REQUIRED': 'authentication_required',
+            'TEMPORARY_UNAVAILABLE': 'temporary_unavailable',
+            'DISABLED': 'disabled'
+        };
+
+        /**
+         * @enum
+         * 'synced'
+         *  - Not conflicting and has no pending local changes.
+         * 'pending'
+         *  - Has one or more pending local changes that haven't been synchronized.
+         * 'conflicting'
+         *  - File conflicts with remote version and must be resolved manually.
+         */
+        const FileStatus: {
+            'SYNCED': 'synced',
+            'PENDING': 'pending',
+            'CONFLICTING': 'conflicting'
+        }
+
+        const ConflictResolutionPolicy: {
+            'LAST_WRITE_WIN': 'last_write_win',
+            'MANUAL': 'manual'
+        };
+
+        const SyncAction: {
+            'ADDED': 'added',
+            'UPDATED': 'updated',
+            'DELETED': 'deleted'
+        }
+
+        const SyncDirection: {
+            'LOCAL_TO_REMOTE': 'local_to_remote',
+            'REMOTE_TO_LOCAL': 'remote_to_local'
+        };
+
+        interface FileStatusInfo {
+            /** One of the Entry's originally given to getFileStatuses. */
+            fileEntry: FileEntry;
+            /**
+             * Status value
+             * @see FileStatus
+             */
+            status: ToStringLiteral<typeof FileStatus>;
+            /** Optional error that is only returned if there was a problem retrieving the FileStatus for the given file. */
+            error?: string;
+        }
+        interface FileStatusChangedDetail {
+            /**
+             * fileEntry for the target file whose status has changed.
+             * Contains name and path information of synchronized file.
+             * On file deletion, fileEntry information will still be
+             * available but file will no longer exist.
+             */
+            fileEntry: FileEntry;
+            /**
+             * Resulting file status after onFileStatusChanged event.
+             * @see FileStatus
+             */
+            status: ToStringLiteral<typeof FileStatus>;
+            /**
+             * Sync action taken to fire onFileStatusChanged event.
+             * Only applies if status is 'synced'.
+             * @see SyncAction
+             */
+            action?: ToStringLiteral<typeof SyncAction>;
+            /**
+             * Sync direction for the onFileStatusChanged event.
+             * Only applies if status is 'synced'.
+             * @see SyncDirection
+             */
+            direction?: ToStringLiteral<typeof SyncDirection>;
+        }
+        /**
+         * Returns a syncable filesystem backed by Google Drive.
+         * The returned DOMFileSystem instance can be operated on
+         * in the same way as the Temporary and Persistant file systems
+         * @see[More information]{@link http://dev.w3.org/2009/dap/file-system/file-dir-sys.html}
+         * @description
+         * Calling this multiple times from the same app will return the same handle to the same file system.
+         * Note this call can fail.
+         * For example, if the user is not signed in to Chrome
+         * or if there is no network operation. To handle these
+         * errors it is important chrome.runtime.lastError is
+         * checked in the callback.
+         * @param callback A callback type for requestFileSystem.
+         */
+        function requestFileSystem(callback: (fileSystem: FileSystem) => void): void;
+        /**
+         * Sets the default conflict resolution policy for the 'syncable' file storage
+         * for the app. By default it is set to 'last_write_win'. When conflict resolution
+         * policy is set to 'last_write_win' conflicts for existing files are automatically
+         * resolved next time the file is updated. |callback| can be optionally given to
+         * know if the request has succeeded or not.
+         * @param policy Policy
+         * @see ConflictResolutionPolicy
+         * @param [callback] A generic result callback to indicate success or failure.
+         */
+        function setConflictResolutionPolicy(policy: ToStringLiteral<typeof ConflictResolutionPolicy>, callback?: () => void): void;
+        /**
+         * Gets the current conflict resolution policy.
+         * @see ConflictResolutionPolicy
+         */
+        function getConflictResolutionPolicy(callback: (policy: ToStringLiteral<typeof ConflictResolutionPolicy>) => void): void;
+        /**
+         * Returns the current usage and quota in bytes for the 'syncable' file storage for the app.
+         * @param fileSystem
+         * @param callback
+         */
+        function getUsageAndQuota(fileSystem: FileSystem, callback: (info: { usageBytes: integer, quotaBytes: integer }) => void): void;
+        /**
+         * Returns the FileStatus for the given fileEntry.
+         * Note that 'conflicting' state only happens when
+         * the service's conflict resolution policy is set to 'manual'.
+         * @see FileStatus
+         * */
+        function getFileStatus(fileEntry: FileEntry, callback: (status: ToStringLiteral<typeof FileStatus>) => void): void;
+        /** Returns each FileStatus for the given fileEntry array. Typically called with the result from dirReader.readEntries(). */
+        function getFileStatuses(fileEntries: FileEntry[], callback: (status: FileStatusInfo[]) => void): void;
+        /**
+         * Returns the current sync backend status.
+         * @since Chrome 31.
+         * @param callback
+         * @see ServiceStatus
+         */
+        function getServiceStatus(callback: (status: ToStringLiteral<typeof ServiceStatus>) => void): void;
+        /**
+         * Fired when an error or other status change has happened in the sync backend
+         * (for example, when the sync is temporarily disabled due to network or authentication error).
+         * @see ServiceStatus
+         */
+        const onServiceStatusChanged: chrome.events.Event<(detail: { state: ToStringLiteral<typeof ServiceStatus>, description: string }) => void>;
+        /** Fired when a file has been updated by the background sync service. */
+        const onFileStatusChanged: chrome.events.Event<(detail: FileStatusChangedDetail) => void>;
     }
+    // #endregion
 
+    // #region chrome.system.*
 
-    ////////////////////
-    // System CPU
-    ////////////////////
+    ////////////////
+    // System CPU //
+    ////////////////
     /**
      * Use the system.cpu API to query CPU metadata.
-     * Permissions: "system.cpu"
+     * Permissions: 'system.cpu'
      * @since Chrome 32.
      */
     namespace system.cpu {
         interface ProcessorUsage {
             /** The cumulative time used by userspace programs on this processor. */
-            user: number;
+            user: double;
             /** The cumulative time used by kernel programs on this processor. */
-            kernel: number;
+            kernel: double;
             /** The cumulative time spent idle by this processor. */
-            idle: number;
+            idle: double;
             /** The total cumulative time for this processor. This value is equal to user + kernel + idle. */
-            total: number;
+            total: double;
         }
 
         interface ProcessorInfo {
@@ -3644,53 +9216,71 @@ declare namespace chrome {
 
         interface CpuInfo {
             /** The number of logical processors. */
-            numOfProcessors: number;
+            numOfProcessors: integer;
             /** The architecture name of the processors. */
             archName: string;
             /** The model name of the processors. */
             modelName: string;
             /**
              * A set of feature codes indicating some of the processor's capabilities.
-             * The currently supported codes are "mmx", "sse", "sse2", "sse3", "ssse3", "sse4_1", "sse4_2", and "avx".
+             * The currently supported codes are 'mmx', 'sse', 'sse2', 'sse3', 'ssse3', 'sse4_1', 'sse4_2', and 'avx'.
              */
-            features: string[];
+            features: 'mmx' | 'sse' | 'sse2' | 'sse3' | 'ssse3' | 'sse4_1' | 'sse4_2' | 'avx';
             /** Information about each logical processor. */
             processors: ProcessorInfo[];
+            /**
+             * @requires(CrOS) Currently supported on Chrome OS only.
+             * @description
+             * List of CPU temperature readings from each thermal zone of the CPU.
+             * Temperatures are in degrees Celsius.
+             */
+            temperatures?: double[];
         }
 
         /** Queries basic CPU information of the system. */
-        export function getInfo(callback: (info: CpuInfo) => void): void;
+        function getInfo(callback: (info: CpuInfo) => void): void;
     }
 
     ////////////////////
-    // System Display
+    // System Display //
     ////////////////////
     /**
      * Use the system.display API to query display metadata.
-     * Permissions: "system.display"
+     * Permissions: 'system.display'
      * @since Chrome 30.
      */
     namespace system.display {
+        const DisplayPosition: {
+            TOP: 'top',
+            RIGHT: 'right',
+            BOTTOM: 'bottom',
+            LEFT: 'left'
+        };
+        const MirrorMode: {
+            OFF: 'off',
+            NORMAL: 'normal',
+            MIXED: 'mixed'
+        };
         interface Bounds {
             /**  The x-coordinate of the upper-left corner. */
-            left: number;
+            left: integer;
             /**  The y-coordinate of the upper-left corner. */
-            top: number;
+            top: integer;
             /** The width of the display in pixels. */
-            width: number;
+            width: integer;
             /** The height of the display in pixels. */
-            height: number;
+            height: integer;
         }
 
         interface Insets {
             /** The x-axis distance from the left bound. */
-            left: number;
+            left: integer;
             /** The y-axis distance from the top bound. */
-            top: number;
+            top: integer;
             /** The x-axis distance from the right bound. */
-            right: number;
+            right: integer;
             /** The y-axis distance from the bottom bound. */
-            bottom: number;
+            bottom: integer;
         }
 
         /**
@@ -3698,16 +9288,16 @@ declare namespace chrome {
          */
         interface Point {
             /** The x-coordinate of the point. */
-            x: number;
+            x: integer;
             /** The y-coordinate of the point. */
-            y: number;
+            y: integer;
         }
 
         /**
          * @since Chrome 57
          */
         interface TouchCalibrationPair {
-            /**	The coordinates of the display point. */
+            /** The coordinates of the display point. */
             displayPoint: Point;
             /** The coordinates of the touch point corresponding to the display point. */
             touchPoint: Point;
@@ -3718,22 +9308,28 @@ declare namespace chrome {
          */
         interface DisplayMode {
             /** The display mode width in device independent (user visible) pixels. */
-            width: number;
+            width: integer;
 
             /** The display mode height in device independent (user visible) pixels. */
-            height: number;
+            height: integer;
 
             /** The display mode width in native pixels. */
-            widthInNativePixels: number;
+            widthInNativePixels: integer;
 
             /** The display mode height in native pixels. */
-            heightInNativePixels: number;
+            heightInNativePixels: integer;
 
             /** The display mode UI scale factor. */
-            uiScale: number;
+            uiScale: integer;
 
             /** The display mode device scale factor. */
-            deviceScaleFactor: number;
+            deviceScaleFactor: integer;
+
+            /**
+             * The display mode refresh rate in hertz.
+             * @since Chrome 67
+             */
+            refreshRate: double;
 
             /** True if the mode is the display's native mode. */
             isNative: boolean;
@@ -3750,16 +9346,18 @@ declare namespace chrome {
             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 layout position of this display relative to the parent.
+             * This will be ignored for the root.
+             * @see enum DisplayPosition
+             */
+            position: ToStringLiteral<typeof DisplayPosition>;
             /** The offset of the display along the connected edge. 0 indicates that the topmost or leftmost corners are aligned. */
-            offset: number;
+            offset: integer;
         }
 
         /**
-         * @description The pairs of point used to calibrate the display.
-         * @export
-         * @interface TouchCalibrationPairs
+         * The pairs of point used to calibrate the display.
          */
         interface TouchCalibrationPairs {
             /** First pair of touch and display point required for touch calibration. */
@@ -3773,55 +9371,99 @@ declare namespace chrome {
         }
 
         /**
-         * @description Representation of info data to be used in chrome.system.display.setDisplayProperties()
-         * @export
-         * @interface DisplayPropertiesInfo
+         * Representation of info data to be used in chrome.system.display.setDisplayProperties()
          */
         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.
+             * @requires(CrOS) Chrome OS only.
+             * @description
+             * If set to true, changes the display mode to unified desktop.
+             * 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.
+             * @see(See enableUnifiedDesktop for details).
              * @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.
+             * @requires(CrOS) Chrome OS only.
+             * @deprecated Deprecated since Chrome 68. Use *setMirrorMode*
+             * @see setMirrorMode
+             * @description
+             * 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. */
+            /**
+             * 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. */
+            /**
+             * 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. */
+            /**
+             * 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;
+            /**
+             * 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?: integer;
 
             /**
+             * If set, updates the display's logical bounds origin along y-axis.
+             * @see[See documentation for boundsOriginX parameter.]
+             */
+            boundsOriginY: integer;
+
+            /**
+             * If set, updates the display mode to the mode matching this value.
              * @since Chrome 52
-             * @description If set, updates the display mode to the mode matching this value.
              */
             displayMode?: DisplayMode;
+
+            /**
+             * @since Chrome 65.
+             * @description
+             * If set, updates the zoom associated with the display.
+             * This zoom performs re-layout and repaint thus resulting
+             * in a better quality zoom than just performing
+             * a pixel by pixel stretch enlargement.
+             */
+            displayZoomFactor?: double;
         }
 
         /**
-         * @description Options affecting how the information is returned.
+         * Options affecting how the information is returned.
          * @since Chrome 59
-         * @export
-         * @interface DisplayInfoFlags
          */
         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
+             * If set to true, only a single DisplayUnitInfo will be returned by getInfo when in unified desktop mode.
+             * @see[enableUnifiedDesktop]
+             * @default false
              */
             singleUnified?: boolean;
         }
@@ -3830,10 +9472,41 @@ declare namespace chrome {
         interface DisplayInfo {
             /** The unique identifier of the display. */
             id: string;
-            /** The user-friendly name (e.g. "HP LCD monitor"). */
+            /** The user-friendly name (e.g. 'HP LCD monitor'). */
             name: string;
-            /** Identifier of the display that is being mirrored on the display unit. If mirroring is not in progress, set to an empty string. Currently exposed only on ChromeOS. Will be empty string on other platforms. */
+            /**
+             * @requires(CrOS Kiosk app) Only available in Chrome OS Kiosk apps
+             */
+            edid?: {
+                /**
+                 * 3 character manufacturer code.
+                 */
+                manufacturerId: string;
+                /**
+                 * 2 byte manufacturer-assigned code.
+                 */
+                productId: string;
+                /**
+                 * Year of manufacturer.
+                 */
+                yearOfManufacture?: string;
+            }
+            /**
+             * @requires(CrOS) Only working properly on Chrome OS.
+             * Identifier of the display that is being mirrored on the display unit.
+             * If mirroring is not in progress, set to an empty string
+             * Currently exposed only on ChromeOS.
+             * Will be empty string on other platforms.
+             */
             mirroringSourceId: string;
+            /**
+             * @requires(CrOS) Only available on Chrome OS.
+             * Identifiers of the displays to which the source display is being mirrored.
+             * Empty if no displays are being mirrored. This will be set to the same value
+             * for all displays.
+             * ❗ This must not include *mirroringSourceId*. ❗
+             */
+            mirroringDestinationIds: string[];
             /** True if this is the primary display. */
             isPrimary: boolean;
             /** True if this is an internal display. */
@@ -3841,207 +9514,323 @@ declare namespace chrome {
             /** True if this display is enabled. */
             isEnabled: boolean;
             /** The number of pixels per inch along the x-axis. */
-            dpiX: number;
+            dpiX: integer;
             /** The number of pixels per inch along the y-axis. */
-            dpiY: number;
+            dpiY: integer;
             /** The display's clockwise rotation in degrees relative to the vertical position. Currently exposed only on ChromeOS. Will be set to 0 on other platforms. */
-            rotation: number;
+            rotation: integer;
             /** The display's logical bounds. */
             bounds: Bounds;
             /** The display's insets within its screen's bounds. Currently exposed only on ChromeOS. Will be set to empty insets on other platforms. */
             overscan: Insets;
             /** The usable work area of the display within the display bounds. The work area excludes areas of the display reserved for OS, for example taskbar and launcher. */
             workArea: Bounds;
+            /**
+             * @requires(CrOS) Only available on Chrome OS.
+             * The list of available display modes.
+             * The current mode will have isSelected=true.
+             * Only available on Chrome OS.
+             * Will be set to an empty array on other platforms.
+             */
+            modes: DisplayMode[];
+            /** True if this display has a touch input device associated with it. */
+            hasTouchSupport: boolean;
+            /** A list of zoom factor values that can be set for the display. */
+            availableDisplayZoomFactors: double[];
+            /**
+             * The ratio between the display's current and default zoom.
+             * For example, value 1 is equivalent to 100% zoom, and value 1.5 is equivalent to 150% zoom.
+             * */
+            displayZoomFactor: double;
         }
 
-        /** 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 {
-            /** 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. */
+        interface MirrorModeInfo {
+            /**
+             * The mirror mode that should be set.
+             * **off**
+             * Use the default mode (extended or unified desktop).
+             * **normal**
+             * The default source display will be mirrored to all other displays.
+             * **mixed**
+             * The specified source display will be mirrored to the provided destination displays. All other connected displays will be extended.
+             */
+            mode?: 'off' | 'normal' | 'mixed';
+        }
+        interface MirrorModeInfoMixed extends MirrorModeInfo {
+            mode: 'mixed';
             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?: number;
-            /** 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;
+            /** The ids of the mirroring destination displays. */
+            mirroringDestinationIds?: string[];
         }
 
         /**
-         * @description Fired when anything changes to the display configuration.
-         * @export
-         * @interface DisplayChangedEvent
-         * @extends {chrome.events.Event<() => void>}
+         * Requests the information for all attached display devices.
+         * @param callback The callback to invoke with the results.
          */
-        interface DisplayChangedEvent extends chrome.events.Event<() => void> { }
-
+        function getInfo(callback: (info: DisplayInfo[]) => void): void;
         /**
-         * @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
+         * Requests the information for all attached display devices.
          * @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.
+         * @param flags Options affecting how the information is returned.
+         * @param callback The callback to invoke with the results.
          */
-        export function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
+        function getInfo(flags: DisplayInfoFlags, callback: (info: DisplayInfo[]) => void): void;
 
         /**
-         * @description Requests the layout info for all displays. NOTE: This is only available to Chrome OS Kiosk apps and Web UI.
+         * @requires(CrOS Kiosk apps | WebUI) This is only available to Chrome OS Kiosk apps and Web UI.
+         * @description Requests the layout info for all displays.
          * @since Chrome 53
          * @export
-         * @param {(layouts: DisplayLayout[]) => void} callback The callback to invoke with the results.
+         * @param callback The callback to invoke with the results.
          */
-        export function getDisplayLayout(callback: (layouts: DisplayLayout[]) => void): void;
+        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
+         * @requires(CrOS Kiosk apps | WebUI) This is only available to Chrome OS Kiosk apps and Web UI.
+         * @description
+         * Updates the properties for the display specified by **id**,
+         * according to the information provided in **info**.
+         * On failure, runtime.lastError will be set.
          * @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;
+        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.
+         * @requires(CrOS Kiosk apps | WebUI) This is only available to Chrome OS Kiosk apps and Web UI.
+         * @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.
          * @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.
+         * @param layouts The layout information, required for all displays except the primary display.
+         * @param 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;
+        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.
+         * @requires(CrOS Kiosk apps | WebUI) This is only available to Chrome OS Kiosk apps and Web UI.
+         * @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)
          * @since Chrome 46
-         * @export
          * @param {boolean} enabled True if unified desktop should be enabled.
          */
-        export function enableUnifiedDesktop(enabled: boolean): void;
+        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.
+         * 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.
+         * @param id The display's unique identifier.
          */
-        export function overscanCalibrationStart(id: string): void;
+        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.
+         * 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.
+         * @param id The display's unique identifier.
+         * @param delta The amount to change the overscan insets.
          */
-        export function overscanCalibrationAdjust(id: string, delta: Insets): void;
+        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).
+         * 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.
+         * @param id The display's unique identifier.
          */
-        export function overscanCalibrationReset(id: string): void;
+        function overscanCalibrationReset(id: string): void;
 
         /**
-         * @description Complete overscan adjustments for a display by saving the current values and hiding the overlay.
+         * 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.
+         * @param id The display's unique identifier.
          */
-        export function overscanCalibrationComplete(id: string): void;
+        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.
+         * 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.
+         * @param id The display's unique identifier.
+         * @param 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: boolean) => void): void;
+        function showNativeTouchCalibration(id: string, callback: (success: boolean) => 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.
+         * 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.
+         * @param id The display's unique identifier.
          */
-        export function startCustomTouchCalibration(id: string): void;
+        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.
+         * 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.
+         * @param pairs The pairs of point used to calibrate the display.
+         * @param bounds Bounds of the display when the touch calibration was performed. |bounds.left| and |bounds.top| values are ignored.
+         * @throws Error
          */
-        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;
+        function completeCustomTouchCalibration(pairs: TouchCalibrationPairs, bounds: Bounds): void;
 
         /**
-         * @description Fired when anything changes to the display configuration.
-         * @export
+         * 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
+         * @param id The display's unique identifier.
          */
-        export var onDisplayChanged: DisplayChangedEvent;
+        function clearTouchCalibration(id: string): void;
+
+        /**
+         * @requires(CrOS Kiosk app) Chrome OS Kiosk apps only
+         * @since Chrome 65.
+         * @description
+         * Sets the display mode to the specified mirror mode.
+         * Each call resets the state from previous calls.
+         * Calling setDisplayProperties() will fail for the
+         * mirroring destination displays.
+         */
+        function setMirrorMode(info: MirrorModeInfo | MirrorModeInfoMixed, callback: () => void): void;
+
+        /**
+         * Fired when anything changes to the display configuration.
+         */
+        const onDisplayChanged: chrome.events.Event<() => void>;
     }
 
-    ////////////////////
-    // System Memory
-    ////////////////////
+    ///////////////////
+    // System Memory //
+    ///////////////////
     /**
      * The chrome.system.memory API.
-     * Permissions:  "system.memory"
+     * @requires Permissions: 'system.memory'
      * @since Chrome 32.
      */
     namespace system.memory {
         interface MemoryInfo {
             /** The total amount of physical memory capacity, in bytes. */
-            capacity: number;
+            capacity: double;
             /** The amount of available capacity, in bytes. */
-            availableCapacity: number;
+            availableCapacity: double;
         }
 
         /** Get physical memory information. */
-        export function getInfo(callback: (info: MemoryInfo) => void): void;
+        function getInfo(callback: (info: MemoryInfo) => void): void;
     }
 
-    ////////////////////
-    // System - Network
-    ////////////////////
+    //////////////////////
+    // System - Network //
+    //////////////////////
+    /**
+     * The chrome.system.network API.
+     * @requires Permissions: 'system.network'
+     */
     namespace system.network {
         interface NetworkInterface {
+            /** The underlying name of the adapter. On *nix, this will typically be "eth0", "wlan0", etc. */
             name: string;
+            /** The available IPv4/6 address. */
             address: string;
-            prefixLength: number;
+            /** The prefix length */
+            prefixLength: integer;
         }
+        /** Retrieves information about local adapters on this system. */
+        function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
+    }
 
-        export function getNetworkInterfaces(callback: (networkInterfaces: NetworkInterface[]) => void): void;
+    /////////////////////////
+    // System Power Source //
+    /////////////////////////
+    /**
+     * @requires(CrOS Kiosk) Chrome OS kiosk app.
+     * @requires Permissions: 'system.powerSource'
+     * @description The chrome.system.powerSource API allows Chrome Kiosk Apps to query the state of connected power sources.
+     * @since Latest
+     */
+    namespace system.powerSource {
+        enum PowerSourceType {
+            /** Unspecified type. */
+            unknown = 'unknown',
+
+            /**
+             * Dedicated charger. Typically single-purpose and non-USB
+             * (e.g. barrel jack plugs)
+             */
+            mains = 'mains',
+
+            /**
+             * USB charger, including both low-power Type-A chargers and high-power
+             * Type-C chargers using USB Power Delivery.
+             */
+            usb = 'usb'
+        }
+        interface PowerSourceInfo {
+            /**
+             * Type of power source
+             * @see PowerSourceType
+             */
+            type: keyof typeof PowerSourceType | PowerSourceType;
+            /**
+             * Maximum power this source is capable of delivering if known.
+             * Reported in watts, rounded to two significant digits.
+             */
+            maxPower?: double;
+            /** Whether this power source is connected to the device. */
+            active: boolean;
+        }
+        /**
+         * Requests information on attached power sources.
+         * @param callback The callback to invoke with the results or undefined if the power source information is not known.
+         */
+        function getPowerSourceInfo(callback: (powerSourceInfo?: PowerSourceInfo[]) => void): void;
+        /**
+         * Requests a power source status update.
+         * Resulting power source status updates are observable using *onPowerChanged*.
+         */
+        function requestStatusUpdate(): void;
+        /**
+         * Event for changes in the set of connected power sources.
+         */
+        const onPowerChanged: chrome.events.Event<(powerSourceInfo: PowerSourceInfo[]) => void>;
     }
 
     ////////////////////
-    // System Storage
+    // System Storage //
     ////////////////////
     /**
      * Use the chrome.system.storage API to query storage device information and be notified when a removable storage device is attached and detached.
-     * Permissions:  "system.storage"
+     * @requires Permissions: 'system.storage'
      * @since Chrome 30.
      */
     namespace system.storage {
+        const StorageUnitType: {
+            FIXED: 'fixed',
+            REMOVABLE: 'removable',
+            UNKNOWN: 'unknown'
+        };
+        const EjectDeviceResultCode: {
+            SUCCESS: 'success',
+            IN_USE: 'in_use',
+            NO_SUCH_DEVICE: 'no_such_device',
+            FAILURE: 'failure'
+        };
         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. */
+            /**
+             * 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. */
             name: string;
@@ -4050,75 +9839,84 @@ declare namespace chrome {
              * fixed: The storage has fixed media, e.g. hard disk or SSD.
              * removable: The storage is removable, e.g. USB flash drive.
              * unknown: The storage type is unknown.
+             * @see enum StorageUnitType
              */
-            type: string;
+            type: ToStringLiteral<typeof StorageUnitType>;
             /** The total amount of the storage space, in bytes. */
-            capacity: number;
+            capacity: integer;
         }
 
         interface StorageCapacityInfo {
-            /** A copied |id| of getAvailableCapacity function parameter |id|. */
+            /** A copied **id** of getAvailableCapacity function parameter **id**. */
             id: string;
             /** The available capacity of the storage device, in bytes. */
-            availableCapacity: number;
+            availableCapacity: integer;
         }
 
-        interface SystemStorageAttachedEvent extends chrome.events.Event<(info: StorageUnitInfo) => void> { }
-
-        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;
+        function getInfo(callback: (info: StorageUnitInfo[]) => void): void;
         /**
          * Ejects a removable storage device.
          * @param callback
-         * Parameter result: success: The ejection command is successful -- the application can prompt the user to remove the device; in_use: The device is in use by another application. The ejection did not succeed; the user should not remove the device until the other application is done with the device; no_such_device: There is no such device known. failure: The ejection command failed.
+         * Parameter **result**:
+         *
+         * **success:** The ejection command is successful -- the application can prompt the user to remove the device;
+         *
+         * **in_use:** The device is in use by another application. The ejection did not succeed;
+         *   the user should not remove the device until the other application is done with the device;
+         *
+         * **no_such_device:** There is no such device known.
+         *
+         * **failure:** The ejection command failed.
          */
-        export function ejectDevice(id: string, callback: (result: string) => void): void;
+        function ejectDevice(id: string, callback: (result: ToStringLiteral<typeof EjectDeviceResultCode>) => void): void;
         /**
          * Get the available capacity of a specified |id| storage device. The |id| is the transient device ID from StorageUnitInfo.
          * @since Dev channel only.
          */
-        export function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
+        function getAvailableCapacity(id: string, callback: (info: StorageCapacityInfo) => void): void;
 
         /** Fired when a new removable storage is attached to the system. */
-        export var onAttached: SystemStorageAttachedEvent;
+        const onAttached: chrome.events.Event<(info: StorageUnitInfo) => void>;
         /** Fired when a removable storage is detached from the system. */
-        export var onDetached: SystemStorageDetachedEvent;
+        const onDetached: chrome.events.Event<(id: string) => void>;
     }
 
+    // #endregion chrome.system.*
+
+    // #region chrome.tts
     ////////////////////
-    // Text to Speech
+    // Text to Speech //
     ////////////////////
     /**
      * Use the chrome.tts API to play synthesized text-to-speech (TTS). See also the related ttsEngine API, which allows an extension to implement a speech engine.
-     * Permissions:  "tts"
+     * Permissions:  'tts'
      * @since Chrome 14.
      */
     namespace tts {
         /** An event from the TTS engine to communicate the status of an utterance. */
         interface TtsEvent {
-            /** Optional. The index of the current character in the utterance. */
-            charIndex?: number;
-            /** Optional. The error description, if the event type is 'error'. */
+            /** The index of the current character in the utterance. */
+            charIndex?: integer;
+            /** The error description, if the event type is 'error'. */
             errorMessage?: string;
             /**
              * The type can be 'start' as soon as speech has started, 'word' when a word boundary is reached, 'sentence' when a sentence boundary is reached, 'marker' when an SSML mark element is reached, 'end' when the end of the utterance is reached, 'interrupted' when the utterance is stopped or interrupted before reaching the end, 'cancelled' when it's removed from the queue before ever being synthesized, or 'error' when any other error occurs. When pausing speech, a 'pause' event is fired if a particular utterance is paused in the middle, and 'resume' if an utterance resumes speech. Note that pause and resume events may not fire if speech is paused in-between utterances.
-             * One of: "start", "end", "word", "sentence", "marker", "interrupted", "cancelled", "error", "pause", or "resume"
+             * One of: 'start', 'end', 'word', 'sentence', 'marker', 'interrupted', 'cancelled', 'error', 'pause', or 'resume'
              */
             type: string;
         }
 
         /** A description of a voice available for speech synthesis. */
         interface TtsVoice {
-            /** Optional. The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+            /** The language that this voice supports, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
             lang?: string;
             /**
-             * Optional. This voice's gender.
-             * One of: "male", or "female"
+             * This voice's gender.
+             * One of: 'male', or 'female'
              */
             gender?: string;
-            /** Optional. The name of the voice. */
+            /** The name of the voice. */
             voiceName?: string;
             /** The ID of the extension providing this voice. */
             extensionsId?: string;
@@ -4132,8 +9930,8 @@ declare namespace chrome {
         }
 
         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;
+            /** Speaking volume between 0 and 1 inclusive, with 0 being lowest and 1 being highest, with a default of 1.0. */
+            volume?: integer;
             /**
              * Optional.
              * If true, enqueues this utterance if TTS is already in progress. If false (the default), interrupts any current speech and flushes the speech queue before speaking this new utterance.
@@ -4143,9 +9941,9 @@ declare namespace chrome {
              * Optional.
              * Speaking rate relative to the default rate for this voice. 1.0 is the default rate, normally around 180 to 220 words per minute. 2.0 is twice as fast, and 0.5 is half as fast. Values below 0.1 or above 10.0 are strictly disallowed, but many voices will constrain the minimum and maximum rates further—for example a particular voice may not actually speak faster than 3 times normal even if you specify a value larger than 3.0.
              */
-            rate?: number;
+            rate?: integer;
             /**
-             * Optional. This function is called with events that occur in the process of speaking the utterance.
+             * This function is called with events that occur in the process of speaking the utterance.
              * @param event The update event from the text-to-speech engine indicating the status of this utterance.
              */
             onEvent?: (event: TtsEvent) => void;
@@ -4153,115 +9951,135 @@ declare namespace chrome {
              * Optional.
              * Speaking pitch between 0 and 2 inclusive, with 0 being lowest and 2 being highest. 1.0 corresponds to a voice's default pitch.
              */
-            pitch?: number;
-            /** Optional. The language to be used for synthesis, in the form language-region. Examples: 'en', 'en-US', 'en-GB', 'zh-CN'. */
+            pitch?: integer;
+            /** 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. If empty, uses any available voice. */
+            /** The name of the voice to use for synthesis. If empty, uses any available voice. */
             voiceName?: string;
-            /** Optional. The extension ID of the speech engine to use, if known. */
+            /** The extension ID of the speech engine to use, if known. */
             extensionId?: string;
             /**
-             * Optional. Gender of voice for synthesized speech.
-             * One of: "male", or "female"
+             * Gender of voice for synthesized speech.
+             * One of: 'male', or 'female'
              */
             gender?: string;
-            /** Optional. The TTS event types the voice must support. */
+            /** The TTS event types the voice must support. */
             requiredEventTypes?: string[];
-            /** Optional. The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
+            /** The TTS event types that you are interested in listening to. If missing, all event types may be sent. */
             desiredEventTypes?: string[];
         }
 
         /** Checks whether the engine is currently speaking. On Mac OS X, the result is true whenever the system speech engine is speaking, even if the speech wasn't initiated by Chrome. */
-        export function isSpeaking(callback?: (speaking: boolean) => void): void;
+        function isSpeaking(callback?: (speaking: boolean) => void): void;
         /** Stops any current speech and flushes the queue of any pending utterances. In addition, if speech was paused, it will now be un-paused for the next call to speak. */
-        export function stop(): void;
+        function stop(): void;
         /** Gets an array of all available voices. */
-        export function getVoices(callback?: (voices: TtsVoice[]) => void): void;
+        function getVoices(callback?: (voices: TtsVoice[]) => void): void;
         /**
          * Speaks text using a text-to-speech engine.
          * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-         * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+         * @param callback Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
          */
-        export function speak(utterance: string, callback?: Function): void;
+        function speak(utterance: string, callback?: Function): void;
         /**
          * Speaks text using a text-to-speech engine.
          * @param utterance The text to speak, either plain text or a complete, well-formed SSML document. Speech engines that do not support SSML will strip away the tags and speak the text. The maximum length of the text is 32,768 characters.
-         * @param options Optional. The speech options.
-         * @param callback Optional. Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
+         * @param options The speech options.
+         * @param callback Called right away, before speech finishes. Check chrome.runtime.lastError to make sure there were no errors. Use options.onEvent to get more detailed feedback.
          */
-        export function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
+        function speak(utterance: string, options: SpeakOptions, callback?: Function): void;
         /**
          * Pauses speech synthesis, potentially in the middle of an utterance. A call to resume or stop will un-pause speech.
          * @since Chrome 29.
          */
-        export function pause(): void;
+        function pause(): void;
         /**
          * If speech was paused, resumes speaking where it left off.
          * @since Chrome 29.
          */
-        export function resume(): void;
+        function resume(): void;
     }
+    // #endregion
 
-    ////////////////////
-    // Types
-    ////////////////////
+    // #region chrome.types
+    ///////////
+    // Types //
+    ///////////
     /**
      * The chrome.types API contains type declarations for Chrome.
-     * @since Chrome 13.
      */
     namespace types {
+        /**
+         * The scope of the ChromeSetting. 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).
+         */
+        type ChromeSettingScope = "regular" | "regular_only" | "incognito_persistent" | "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 app
+         * • controlled_by_this_extension: controlled by this app
+         */
+        type LevelOfControl = "not_controllable" | "controlled_by_other_extensions" | "controllable_by_this_extension" | "controlled_by_this_extension";
+
         interface ChromeSettingClearDetails {
             /**
-             * Optional.
              * The scope of the ChromeSetting. 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).
+             * • 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).
              */
-            scope?: string;
+            scope?: ChromeSettingScope;
         }
 
         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.
+             * Note that every setting has a specific value type,
+             * which is described together with the setting.
+             * An app should not set a value of a different type.
              */
             value: any;
             /**
-             * Optional.
              * The scope of the ChromeSetting. 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).
+             * • 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).
              */
-            scope?: string;
+            scope?: ChromeSettingScope;
         }
 
         interface ChromeSettingGetDetails {
-            /** Optional. Whether to return the value that applies to the incognito session (default false). */
+            /** Whether to return the value that applies to the incognito session (default false). */
             incognito?: boolean;
         }
 
         /**
          * @param details Details of the currently effective value.
          */
-        export type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
+        type DetailsCallback = (details: ChromeSettingGetResultDetails) => void;
 
         interface ChromeSettingGetResultDetails {
+            /** The value of the setting. */
+            value: any;
             /**
              * 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
+             * • controllable_by_this_extension: can be controlled by this app
+             * • controlled_by_this_extension: controlled by this app
              */
             levelOfControl: string;
-            /** The value of the setting. */
-            value: any;
             /**
-             * Optional.
              * 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.
              */
@@ -4275,9 +10093,9 @@ declare namespace chrome {
             /**
              * Sets the value of a setting.
              * @param details Which setting to change.
-             * @param callback Optional. Called at the completion of the set operation.
+             * @param callback Called at the completion of the set operation.
              */
-            set(details: ChromeSettingSetDetails, callback?: Function): void;
+            set(details: ChromeSettingSetDetails, callback?: () => void): void;
             /**
              * Gets the value of a setting.
              * @param details Which setting to consider.
@@ -4286,1496 +10104,3164 @@ declare namespace chrome {
             /**
              * Clears the setting, restoring any default value.
              * @param details Which setting to clear.
-             * @param callback Optional. Called at the completion of the clear operation.
+             * @param callback Called at the completion of the clear operation.
              */
-            clear(details: ChromeSettingClearDetails, callback?: Function): void;
+            clear(details: ChromeSettingClearDetails, callback?: () => void): void;
             /** Fired after the setting changes. */
             onChange: ChromeSettingChangedEvent;
         }
     }
+    // #endregion
 
-    ////////////////////
-    // USB
-    ////////////////////
+    // #region chrome.usb
+    /////////
+    // USB //
+    /////////
+    /**
+     * @requires Permissions: 'usb'
+     * @since Chrome 26.
+     * Use the chrome.usb API to interact with connected USB devices.
+     * This API provides access to USB operations from within the context of an app.
+     * Using this API, apps can function as drivers for hardware devices.
+     * Errors generated by this API are reported by setting runtime.lastError
+     * and executing the function's regular callback. The callback's
+     * regular parameters will be undefined in this case.
+     * @see[Accessing Hardware Devices]{@link https://developer.chrome.com/apps/app_usb}
+     */
     namespace usb {
-        type Direction = 'in' | 'out';
+        /** Direction, Recipient, RequestType, and TransferType all map to their namesakes within the USB specification. */
+        const Direction: {
+            'IN': 'in',
+            'OUT': 'out'
+        };
+        /** Direction, Recipient, RequestType, and TransferType all map to their namesakes within the USB specification. */
+        const Recipient: {
+            'DEVICE': 'device',
+            'INTERFACE': 'interface',
+            'ENDPOINT': 'endpoint',
+            'OTHER': 'other'
+        };
+        /** Direction, Recipient, RequestType, and TransferType all map to their namesakes within the USB specification. */
+        const RequestType: {
+            'STANDARD': 'standard',
+            'CLASS': 'class',
+            'VENDOR': 'vendor',
+            'RESERVED': 'reserved'
+        };
+        /** Direction, Recipient, RequestType, and TransferType all map to their namesakes within the USB specification. */
+        const TransferType: {
+            'CONTROL': 'control',
+            'INTERRUPT': 'interrupt',
+            'ISOCHRONOUS': 'isochronous',
+            'BULK': 'bulk'
+        };
+        const SynchronizationType: {
+            'ASYNCHRONOUS': 'asynchronous',
+            'ADAPTIVE': 'adaptive',
+            'SYNCHRONOUS': 'synchronous'
+        };
+        const UsageType: {
+            'DATA': 'data',
+            'FEEDBACK': 'feedback',
+            'EXPLICIT_FEEDBACK': 'explicitFeedback',
+            'PERIODIC': 'periodic',
+            'NOTIFICATION': 'notification'
+        };
 
         interface Device {
-            device: number,
-            vendorId: number,
-            productId: number,
+            /**
+             * An opaque ID for the USB device. It remains unchanged until the device is unplugged.
+             * @since Chrome 31.
+             */
+            device: integer,
+            /** The vendor ID. */
+            vendorId: integer,
+            /** The product ID. */
+            productId: integer;
+            /**
+             * The device version (bcdDevice field).
+             * @since Chrome 46.
+             */
+            version: integer;
+            /**
+             * The iProduct string read from the device, if available.
+             * @since Chrome 46.
+             */
             productName: string,
+            /**
+             * The iManufacturer string read from the device, if available.
+             * @since Chrome 46.
+             */
             manufacturerName: string,
+            /**
+             * The iSerialNumber string read from the device, if available.
+             * @since Chrome 46.
+             */
             serialNumber: string
         }
 
+        /** Since Chrome 31. */
         interface ConnectionHandle {
-            handle: number,
-            vendorId: number,
-            productId: number
+            /**
+             * An opaque handle representing this connection to the USB device
+             * and all associated claimed interfaces and pending transfers.
+             * A new handle is created each time the device is opened.
+             * The connection handle is different from Device.device.
+             */
+            handle: integer;
+            /** The device vendor ID. */
+            vendorId: integer;
+            /** The product ID. */
+            productId: integer;
         }
 
+        /** Since Chrome 29. */
         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
+            /** Transfer type. */
+            address: integer;
+            /**
+             * Transfer type.
+             * @see TransferType
+             *
+             */
+            type: ToStringLiteral<typeof TransferType>;
+            /**
+             * Transfer direction.
+             * @see Direction
+             */
+            direction: ToStringLiteral<typeof Direction>;
+            /** Maximum packet size. */
+            maximumPacketSize: integer;
+            /**
+             * Transfer synchronization mode (isochronous only).
+             * @see SynchronizationType
+             */
+            synchronization?: ToStringLiteral<typeof SynchronizationType>;
+            /**
+             * Endpoint usage hint
+             * @see UsageType
+             */
+            usage?: ToStringLiteral<typeof UsageType>;
+            /** Polling interval (interrupt and isochronous only). */
+            pollingInterval?: integer;
+            /**
+             * Extra descriptor data associated with this endpoint.
+             * @since Chrome 39.
+             */
+            extra_data: ArrayBuffer;
         }
 
+        /** @since Chrome 29. */
         interface InterfaceDescriptor {
-            interfaceNumber: number,
-            alternateSetting: number,
-            interfaceClass: number,
-            interfaceSubclass: number,
-            interfaceProtocol: number,
-            description?: string,
-            endpoints: EndpointDescriptor[],
-            extra_data: ArrayBuffer
+            /** The interface number */
+            interfaceNumber: integer;
+            /**
+             * The interface alternate setting number.
+             * @default 0
+             */
+            alternateSetting: integer;
+            /** The USB interface class. */
+            interfaceClass: integer;
+            /** The USB interface sub-class. */
+            interfaceSubclass: integer;
+            /** The USB interface protocol. */
+            interfaceProtocol: integer;
+            /** Description of the interface */
+            description?: string;
+            /** Available endpoints. */
+            endpoints: EndpointDescriptor[];
+            /**
+             * Extra descriptor data associated with this interface.
+             * @since Chrome 39.
+             */
+            extra_data: ArrayBuffer;
         }
 
+        /** @since Chrome 39. */
         interface ConfigDescriptor {
-            active: boolean,
-            configurationValue: number,
-            description?: string,
-            selfPowered: boolean,
-            remoteWakeup: boolean,
-            maxPower: number,
-            interfaces: InterfaceDescriptor[],
-            extra_data: ArrayBuffer
+            /**
+             * Is this the active configuration?
+             * @since Chrome 47.
+             */
+            active: boolean;
+            /** The configuration number. */
+            configurationValue: integer;
+            /** Description of the configuration. */
+            description?: string;
+            /** The device is self-powered. */
+            selfPowered: boolean;
+            /** The device supports remote wakeup. */
+            remoteWakeup: boolean;
+            /** The maximum power needed by this device in milliamps (mA). */
+            maxPower: integer;
+            /** Available interfaces. */
+            interfaces: InterfaceDescriptor[];
+            /** Extra descriptor data associated with this configuration. */
+            extra_data: ArrayBuffer;
         }
 
         interface GenericTransferInfo {
-            direction: Direction,
-            endpoint: number,
-            length?: number,
-            data?: ArrayBuffer,
-            timeout?: number
+            /**
+             * The transfer direction ('in' or 'out').
+             * @see Direction
+             */
+            direction: ToStringLiteral<typeof Direction>;
+            /** The target endpoint address. The interface containing this endpoint must be claimed. */
+            endpoint: integer;
+            /** The maximum number of bytes to receive (required only by input transfers). */
+            length?: integer;
+            /** The data to transmit (required only by output transfers). */
+            data?: ArrayBuffer;
+            /**
+             * Request timeout (in milliseconds).
+             * The default value 0 indicates no timeout.
+             * @default 0
+             */
+            timeout?: integer;
         }
 
         interface TransferResultInfo {
-            resultCode: number,
-            data?: ArrayBuffer
+            /** A value of 0 indicates that the transfer was a success. Other values indicate failure. */
+            resultCode?: integer;
+            /** The data returned by an input transfer. undefined for output transfers. */
+            data?: ArrayBuffer;
         }
 
-        interface DeviceFilter {
-            vendorId?: number,
-            productId?: number,
-            interfaceClass?: number,
-            interfaceSubclass?: number,
-            interfaceProtocol?: number
+        interface DeviceFilterStrict {
+            /** Device vendor ID. */
+            vendorId: integer;
+            /** Device product ID, checked only if the vendor ID matches. */
+            productId?: integer;
+            /** USB interface class, matches any interface on the device. */
+            interfaceClass?: integer;
+            /** USB interface sub-class, checked only if the interface class matches. */
+            interfaceSubclass?: integer;
+            /** USB interface protocol, checked only if the interface sub-class matches. */
+            interfaceProtocol?: integer;
         }
 
+        /** @since Chrome 39. */
+        interface DeviceFilter extends Partial<DeviceFilter> { }
+
         interface TransferInfo {
-            direction: Direction;
-            recipient: 'device' | 'interface' | 'endpoint' | 'other';
-            requestType: 'standard' | 'class' | 'vendor' | 'reserved';
-            request: number;
-            value: number;
-            index: number;
-            length?: number;
+            /**
+             * The transfer direction ('in' or 'out').
+             * @see Direction
+             */
+            direction: ToStringLiteral<typeof Direction>;
+            /**
+             * The transfer target.
+             * The target given by index must be claimed if 'interface' or 'endpoint'.
+             * @see Recipient
+             */
+            recipient: ToStringLiteral<typeof Recipient>;
+            /**
+             * The request type.
+             * @see RequestType
+             */
+            requestType: ToStringLiteral<typeof RequestType>;
+            /** The bRequest field, see *Universal Serial Bus Specification Revision 1.1 § 9.3.* */
+            request: integer;
+            /** The wValue field, see *Ibid*. */
+            value: integer;
+            /** The wIndex field, see *Ibid*. */
+            index: integer;
+            /** The maximum number of bytes to receive(required only by input transfers). */
+            length?: integer;
+            /** The data to transmit (required only by output transfers). */
             data?: ArrayBuffer;
-            timeout?: number;
+            /**
+             * @since Chrome 43.
+             * Request timeout (in milliseconds).
+             * The default value 0 indicates no timeout.
+             * @default 0
+             */
+            timeout?: integer;
         }
 
+        interface IsochronousTransferInfo {
+            /**
+             * Transfer parameters.
+             * The transfer length or data buffer specified in this parameter block is split
+             * along packetLength boundaries to form the individual packets of the transfer.
+             */
+            transferInfo: GenericTransferInfo;
+            /** The total number of packets in this transfer. */
+            packets: integer;
+            /** The length of each of the packets in this transfer. */
+            packetLength: integer;
+        }
+
+        /**
+         * @description Enumerates connected USB devices.
+         * @since Chrome 39.
+         * @param options The properties to search for on target devices.
+         * @param callback
+         */
+        function getDevices(options: { filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+
+        /**
+         * Presents a device picker to the user and returns the Devices selected.
+         * If the user cancels the picker devices will be empty.
+         * A user gesture is required for the dialog to display. Without a user gesture,
+         * the callback will run as though the user cancelled.
+         * @since Chrome 40.
+         * @param options Configuration of the device picker dialog box.
+         *               - multiple: Allow the user to select multiple devices.
+         *               - filters: Filter the list of devices presented to the user.
+         *                   If multiple filters are provided, devices matching any filter will be displayed.
+         * @param callback Invoked with a list of chosen Devices.
+         */
+        function getUserSelectedDevices(options: { multiple?: boolean, filters?: DeviceFilter[] }, callback: (devices: Device[]) => void): void;
+
+        /**
+         * Returns the full set of device configuration descriptors.
+         * @since Chrome 47.
+         * @param device The Device to fetch descriptors from.
+         * @param callback
+         */
+        function getConfigurations(device: Device, callback: (configs: ConfigDescriptor[]) => void): void;
+
+        /**
+         * @deprecated Since Chrome 40.
+         * @requires(CrOS) Chrome OS specific. This operation is now implicitly performed as a part of *openDevice*.
+         */
+        function requestAccess(device: Device, interfaceId: integer, callback: (success: boolean) => void): void;
+
+        /**
+         * Opens a USB device returned by *getDevices*
+         * @since Chrome 31.
+         * @param device The device to open.
+         * @param callback
+         */
+        function openDevice(device: Device, callback: (handle: ConnectionHandle) => void): void;
+
+        /**
+         * Finds USB devices specified by the vendor, product and (optionally) interface IDs and if permissions allow opens them for use.
+         * If the access request is rejected or the device fails to be opened a connection handle will not be created or returned.
+         * Calling this method is equivalent to calling *getDevices* followed by *openDevice* for each device.
+         * @param options The properties to search for on target devices.
+         *                  - vendorId: The device vendor ID.
+         *                  - productId: The product ID.
+         * @param callback
+         */
+        function findDevices(options: { vendorId: integer, productId: integer }, callback: (handles: ConnectionHandle[]) => void): void;
+        /**
+         * Finds USB devices specified by the vendor, product and (optionally) interface IDs and if permissions allow opens them for use.
+         * If the access request is rejected or the device fails to be opened a connection handle will not be created or returned.
+         * Calling this method is equivalent to calling *getDevices* followed by *openDevice* for each device.
+         * @param options The properties to search for on target devices.
+         *                  - vendorId: The device vendor ID.
+         *                  - productId: The product ID.
+         *                  - The interface ID to request access to. Only available on Chrome OS. It has no effect on other platforms.
+         * @requires(CrOS) Chrome OS if you specify *interfaceId*
+         * @param callback
+         */
+        function findDevices(options: { vendorId: integer, productId: integer, interfaceId?: integer }, callback: (handles: ConnectionHandle[]) => void): void;
+
+        /**
+         * Closes a connection handle.
+         * Invoking operations on a handle after it has been closed is a safe operation but causes no action to be taken.
+         * @param handle The ConnectionHandle to close.
+         * @param [callback]
+         */
+        function closeDevice(handle: ConnectionHandle, callback?: () => void): void;
+
+        /**
+         * Select a device configuration.
+         * This function effectively resets the device by selecting one of the
+         * device's available configurations. Only configuration values greater
+         * than 0 are valid however some buggy devices have a working
+         * configuration 0 and so this value is allowed.
+         * @since Chrome 42.
+         * @param handle An open connection to the device.
+         * @param configurationValue
+         * @param callback
+         */
+        function setConfiguration(handle: ConnectionHandle, configurationValue: integer, callback: () => void): void;
+
+        /**
+         * Gets the configuration descriptor for the currently selected configuration.
+         * @since Chrome 39.
+         * @param handle An open connection to the device.
+         * @param callback
+         */
+        function getConfiguration(handle: ConnectionHandle, callback: (config: ConfigDescriptor) => void): void;
+
+        /**
+         * @description Lists all interfaces on a USB device.
+         * @param handle An open connection to the device.
+         * @param callback
+         */
+        function listInterfaces(handle: ConnectionHandle, callback: (descriptors: InterfaceDescriptor[]) => void): void;
+
+        /**
+         * Claims an interface on a USB device.
+         * Before data can be transfered to an interface or associated endpoints the interface must be claimed.
+         * Only one connection handle can claim an interface at any given time.
+         * If the interface is already claimed, this call will fail.
+         *
+         * **releaseInterface** should be called when the interface is no longer needed.
+         * @param handle An open connection to the device.
+         * @param interfaceNumber The interface to be claimed.
+         * @param callback
+         */
+        function claimInterface(handle: ConnectionHandle, interfaceNumber: integer, callback: () => void): void;
+
+        /**
+         * @description Releases a claimed interface.
+         * @param handle An open connection to the device.
+         * @param interfaceNumber The interface to be released.
+         * @param callback
+         */
+        function releaseInterface(handle: ConnectionHandle, interfaceNumber: integer, callback: () => void): void;
+
+        /**
+         * @description Selects an alternate setting on a previously claimed interface.
+         * @param handle An open connection to the device where this interface has been claimed.
+         * @param interfaceNumber The interface to configure.
+         * @param alternateSetting The alternate setting to configure.
+         * @param callback
+         */
+        function setInterfaceAlternateSetting(handle: ConnectionHandle, interfaceNumber: integer, alternateSetting: integer, callback: () => void): void;
+
+        /**
+         * Performs a control transfer on the specified device.
+         * Control transfers refer to either the device, an interface or an endpoint.
+         * Transfers to an interface or endpoint require the interface to be claimed.
+         * @param handle An open connection to the device.
+         * @param transferInfo Transfer info
+         * @param callback
+         */
+        function controlTransfer(handle: ConnectionHandle, transferInfo: TransferInfo, callback: (info: TransferResultInfo) => void): void;
+
+        /**
+         * @description Performs a bulk transfer on the specified device.
+         * @param handle An open connection to the device.
+         * @param transferInfo The transfer parameters.
+         * @param callback
+         */
+        function bulkTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+
+        /**
+         * @description Performs an interrupt transfer on the specified device.
+         * @param handle An open connection to the device.
+         * @param transferInfo The transfer parameters.
+         * @param callback
+         */
+        function interruptTransfer(handle: ConnectionHandle, transferInfo: GenericTransferInfo, callback: (info: TransferResultInfo) => void): void;
+
+        /**
+         * @description Performs an isochronous transfer on the specific device.
+         * @param handle An open connection to the device.
+         * @param transferInfo
+         * @param callback
+         */
+        function isochronousTransfer(handle: ConnectionHandle, transferInfo: IsochronousTransferInfo, callback: (info: TransferResultInfo) => void): void;
+
+        /**
+         * Tries to reset the USB device. If the reset fails, the given connection handle will be closed
+         * and the USB device will appear to be disconnected then reconnected.
+         * In this case **getDevices** or **findDevices** must be called again to acquire the device.
+         * @param handle A connection handle to reset.
+         * @param callback
+         */
+        function resetDevice(handle: ConnectionHandle, callback: (success: boolean) => void): void;
+
         interface DeviceEvent extends chrome.events.Event<(device: Device) => void> { }
 
-        export var onDeviceAdded: DeviceEvent;
-        export var onDeviceRemoved: DeviceEvent;
+        /**
+         * Event generated when a device is added to the system.
+         * Events are only broadcast to apps that have permission to access the device.
+         * Permission may have been granted at install time, when the user accepted an optional permission
+         * (@see[permissions.request]{https://developer.chrome.com/apps/permissions#method-request}),
+         * or through **getUserSelectedDevices**.
+         * @since Chrome 42.
+         */
+        const onDeviceAdded: 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;
+        /**
+         * Event generated when a device is removed from the system.
+         * See **onDeviceAdded** for which events are delivered.
+         * @since Chrome 42.
+         */
+        const onDeviceRemoved: DeviceEvent;
     }
+    // #endregion
 
+    // #region chrome.virtualKeyboard
+    //////////////////////
+    // Virtual Keyboard //
+    //////////////////////
+    /**
+     * @requires(CrOS Kiosk) Important: This API works only in Chrome OS apps.
+     * @requires Permissions: 'virtualKeyboard'
+     * @since Chrome 58
+     * @description
+     * The *chrome.virtualKeybaord* API is a kiosk only API used
+     * to configure virtual keyboard layout and behavior in kiosk sessions.
+     */
+    namespace virtualKeyboard {
+        /**
+         * Determines whether advanced virtual keyboard features should be enabled or not.
+         * They are enabled by default.
+         *
+         * On **Chrome 58** all properties are expected to have the same value.
+         *
+         * From **Chrome 63** the properties can be distinct and are optional.
+         * If omitted, the current value is preserved.
+         */
+        interface FeatureRestrictions {
+            /** Whether virtual keyboards can provide auto-complete. */
+            autoCompleteEnabled?: boolean;
+            /** Whether virtual keyboards can provide auto-correct. */
+            autoCorrectEnabled?: boolean;
+            /** Whether virtual keyboards can provide input via handwriting recognition. */
+            handwritingEnabled?: boolean;
+            /** Whether virtual keyboards can provide spell-check. */
+            spellCheckEnabled?: boolean;
+            /** Whether virtual keyboards can provide voice input. */
+            voiceInputEnabled?: boolean;
+        }
 
-    ////////////////////
-    // VPN Provider
-    ////////////////////
+        /**
+         * Sets restrictions on features provided by the virtual keyboard.
+         * @param restrictions the preferences to enabled/disabled virtual keyboard features.
+         * @param [callback] Invoked with the values which were updated.
+         */
+        function restrictFeatures(restrictions: FeatureRestrictions, callback?: (update: FeatureRestrictions) => void): void;
+    }
+    // #endregion
+
+    // #region chrome.vpnProvider
+    //////////////////
+    // VPN Provider //
+    //////////////////
     /**
      * Use the chrome.vpnProvider API to implement a VPN client.
-     * Permissions:  "vpnProvider"
-     * Important: This API works only on Chrome OS.
+     * @requires(CrOS) Important: This API works only on Chrome OS.
+     * @requires Permissions: 'vpnProvider'
      * @since Chrome 43.
      */
     namespace vpnProvider {
+        /**
+         * The enum is used by the platform to notify the client of the VPN session status.
+         *
+         * **'connected'**
+         * VPN configuration connected.
+         * **'disconnected'**
+         * VPN configuration disconnected.
+         * **'error'**
+         * An error occurred in VPN connection, for example a timeout. A description
+         * of the error is given as the error argument to *onPlatformMessage*.
+         * **'linkDown'**
+         * The default physical network connection is down.
+         * **'linkUp'**
+         * The default physical network connection is back up.
+         * **'linkChanged'**
+         * The default physical network connection changed, e.g. wifi->mobile.
+         * **'suspend'**
+         * The OS is preparing to suspend, so the VPN should drop its connection.
+         * The extension is not guaranteed to receive this event prior to suspending.
+         * **'resume'**
+         * The OS has resumed and the user has logged back in, so the VPN should try to reconnect.
+         * @enum
+         */
+        const PlatformMessage: {
+            CONNECTED: 'connected',
+            DISCONNECTED: 'disconnected',
+            ERROR: 'error',
+            LINK_DOWN: 'linkDown',
+            LINK_UP: 'linkUp',
+            LINK_CHANGED: 'linkChanged',
+            SUSPEND: 'suspend',
+            RESUME: 'resume'
+        };
+        /**
+         * The enum is used by the VPN client to inform the platform of its current state.
+         * This helps provide meaningful messages to the user.
+         *
+         * **'connected'**
+         * VPN connection was successful.
+         * **'failure'**
+         * VPN connection failed.
+         * @enum
+         */
+        const VpnConnectionState: {
+            CONNECTED: 'connected',
+            FAILURE: 'failure'
+        };
+        /**
+         * The enum is used by the platform to indicate the event that triggered *onUIEvent*
+         *
+         * **'showAddDialog'**
+         * Request the VPN client to show add configuration dialog to the user.
+         * **'showConfigureDialog'**
+         * Request the VPN client to show configuration settings dialog to the user.
+         * @enum
+         */
+        const UIEvent: {
+            SHOW_ADD_DIALOG: 'showAddDialog',
+            SHOW_CONFIGURE_DIALOG: 'showConfigureDialog'
+        };
         interface VpnSessionParameters {
-            /** IP address for the VPN interface in CIDR notation. IPv4 is currently the only supported mode. */
+            /**
+             * 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) */
+            /**
+             * Broadcast address for the VPN interface.
+             * (default: deduced from IP address and mask)
+             */
             broadcastAddress?: string;
-            /** Optional. MTU setting for the VPN interface. (default: 1500 bytes) */
+            /**
+             * MTU setting for the VPN interface (default 1500 bytes).
+             * @default '1500'
+             */
             mtu?: string;
             /**
-             * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel. This can be used to bypass traffic to and from the VPN server. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+             * Exclude network traffic to the list of IP blocks in CIDR notation from the tunnel.
+             * This can be used to bypass traffic to and from the VPN server.
+             * When many rules match a destination, the rule with the longest matching prefix wins.
+             * Entries that correspond to the same CIDR block are treated as duplicates.
+             * Such duplicates in the collated (exclusionList + inclusionList) list
+             * are eliminated and the exact duplicate entry that will be eliminated is undefined.
              */
             exclusionList: string[];
             /**
-             * Include network traffic to the list of IP blocks in CIDR notation to the tunnel. This parameter can be used to set up a split tunnel. By default no traffic is directed to the tunnel. Adding the entry "0.0.0.0/0" to this list gets all the user traffic redirected to the tunnel. When many rules match a destination, the rule with the longest matching prefix wins. Entries that correspond to the same CIDR block are treated as duplicates. Such duplicates in the collated (exclusionList + inclusionList) list are eliminated and the exact duplicate entry that will be eliminated is undefined.
+             * Include network traffic to the list of IP blocks in CIDR notation to the tunnel.
+             * This parameter can be used to set up a split tunnel.
+             * By default no traffic is directed to the tunnel.
+             * Adding the entry '0.0.0.0/0' to this list gets all the user traffic redirected to the tunnel.
+             * When many rules match a destination, the rule with the longest matching prefix wins.
+             * Entries that correspond to the same CIDR block are treated as duplicates.
+             * Such duplicates in the collated (exclusionList + inclusionList) list are
+             * eliminated and the exact duplicate entry that will be eliminated is undefined.
              */
             inclusionList: string[];
-            /** Optional. A list of search domains. (default: no search domain) */
+            /** A list of search domains. (default: no search domain) */
             domainSearch?: string[];
             /** A list of IPs for the DNS servers. */
-            dnsServer: string[];
+            dnsServers: string[];
+            /**
+             * @since Chrome 51.
+             * Whether or not the VPN extension implements auto-reconnection.
+             * If true, the *linkDown*, *linkUp*, *linkChanged*, *suspend*, and *resume*
+             * platform messages will be used to signal the respective events.
+             *
+             * If false, the system will forcibly disconnect the VPN if the network
+             * topology changes, and the user will need to reconnect manually.
+             *
+             * This property is new in Chrome 51; it will generate an exception in
+             * earlier versions. try/catch can be used to conditionally enable the
+             * feature based on browser support.
+             * @default false
+             */
+            reconnect: boolean;
         }
 
-        interface VpnPlatformMessageEvent extends chrome.events.Event<(id: string, message: string, error: string) => void> { }
-
-        interface VpnPacketReceptionEvent extends chrome.events.Event<(data: ArrayBuffer) => void> { }
-
-        interface VpnConfigRemovalEvent extends chrome.events.Event<(id: string) => void> { }
-
-        interface VpnConfigCreationEvent extends chrome.events.Event<(id: string, name: string, data: Object) => void> { }
-
-        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.
          * @param name The name of the VPN configuration.
          * @param callback Called when the configuration is created or if there is an error.
          * Parameter id: A unique ID for the created configuration, empty string on failure.
          */
-        export function createConfig(name: string, callback: (id: string) => void): void;
+        function createConfig(name: string, callback: (id: string) => void): void;
         /**
          * Destroys a VPN configuration created by the extension.
          * @param id ID of the VPN configuration to destroy.
-         * @param callback Optional. Called when the configuration is destroyed or if there is an error.
+         * @param callback Called when the configuration is destroyed or if there is an error.
          */
-        export function destroyConfig(id: string, callback?: Function): void;
+        function destroyConfig(id: string, callback?: () => void): void;
         /**
-         * Sets the parameters for the VPN session. This should be called immediately after "connected" is received from the platform. This will succeed only when the VPN session is owned by the extension.
+         * Sets the parameters for the VPN session. This should be called immediately after 'connected' is received from the platform. This will succeed only when the VPN session is owned by the extension.
          * @param parameters The parameters for the VPN session.
          * @param callback Called when the parameters are set or if there is an error.
          */
-        export function setParameters(parameters: VpnSessionParameters, callback: Function): void;
+        function setParameters(parameters: VpnSessionParameters, callback: () => void): void;
         /**
          * Sends an IP packet through the tunnel created for the VPN session. This will succeed only when the VPN session is owned by the extension.
          * @param data The IP packet to be sent to the platform.
-         * @param callback Optional. Called when the packet is sent or if there is an error.
+         * @param callback Called when the packet is sent or if there is an error.
          */
-        export function sendPacket(data: ArrayBuffer, callback?: Function): void;
+        function sendPacket(data: ArrayBuffer, callback?: () => void): void;
         /**
          * Notifies the VPN session state to the platform. This will succeed only when the VPN session is owned by the extension.
          * @param state The VPN session state of the VPN client.
          * connected: VPN connection was successful.
          * failure: VPN connection failed.
-         * @param callback Optional. Called when the notification is complete or if there is an error.
+         * @see enum VpnConnectionState
+         * @param callback Called when the notification is complete or if there is an error.
          */
-        export function notifyConnectionStateChanged(state: string, callback?: Function): void;
+        function notifyConnectionStateChanged(state: ToStringLiteral<typeof VpnConnectionState>, callback?: () => void): void;
 
         /** Triggered when a message is received from the platform for a VPN configuration owned by the extension. */
-        export var onPlatformMessage: VpnPlatformMessageEvent;
+        const onPlatformMessage: chrome.events.Event<(id: string, message: ToStringLiteral<typeof PlatformMessage>, error: string) => void>;
         /** Triggered when an IP packet is received via the tunnel for the VPN session owned by the extension. */
-        export var onPacketReceived: VpnPacketReceptionEvent;
+        const onPacketReceived: chrome.events.Event<(data: ArrayBuffer) => void>;
         /** Triggered when a configuration created by the extension is removed by the platform. */
-        export var onConfigRemoved: VpnConfigRemovalEvent;
+        const onConfigRemoved: chrome.events.Event<(id: string) => void>;
         /** Triggered when a configuration is created by the platform for the extension. */
-        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. */
-        export var onUIEvent: VpnUiEvent;
+        const onConfigCreated: chrome.events.Event<(id: string, name: string, data: Object) => void>;
+        /**
+         * 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.
+         */
+        const onUIEvent: chrome.events.Event<(event: ToStringLiteral<typeof UIEvent>, id?: string) => void>;
     }
+    // #endregion
 
-    ////////////////////
-    // Wallpaper
-    ////////////////////
+    // #region chrome.wallpaper
+    ///////////////
+    // Wallpaper //
+    ///////////////
     /**
      * Use the chrome.wallpaper API to change the ChromeOS wallpaper.
-     * Permissions:  "wallpaper"
-     * Important: This API works only on Chrome OS.
+     * @requires Permissions: 'wallpaper'
+     * @requires Important: This API works only on Chrome OS.
      * @since Chrome 43.
      */
     namespace wallpaper {
+        enum WallpaperLayout {
+            STRETCH = 'STRETCH',
+            CENTER = 'CENTER',
+            CENTER_CROPPED = 'CENTER_CROPPED'
+        }
+        type WallpaperLayoutType = 'STRETCH' | 'CENTER' | 'CENTER_CROPPED';
+
         interface WallpaperDetails {
-            /** Optional. The jpeg or png encoded wallpaper image. */
-            data?: any;
-            /** Optional. The URL of the wallpaper to be set. */
+            /** The jpeg or png encoded wallpaper image. */
+            data?: ArrayBuffer;
+            /** The URL of the wallpaper to be set. */
             url?: string;
             /**
              * The supported wallpaper layouts.
-             * One of: "STRETCH", "CENTER", or "CENTER_CROPPED"
+             * @see WallpaperLayout
              */
-            layout: string;
+            layout: WallpaperLayout | WallpaperLayoutType;
             /** The file name of the saved wallpaper. */
             filename: string;
-            /** Optional. True if a 128x60 thumbnail should be generated. */
+            /** True if a 128x60 thumbnail should be generated. */
             thumbnail?: boolean;
         }
 
         /**
          * Sets wallpaper to the image at url or wallpaperData with the specified layout
-         * @param callback
-         * Optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
+         * @param callback Contains the optional parameter thumbnail: The jpeg encoded wallpaper thumbnail. It is generated by resizing the wallpaper to 128x60.
          */
-        export function setWallpaper(details: WallpaperDetails, callback: (thumbnail: any) => void): void;
+        function setWallpaper(details: WallpaperDetails, callback: (thumbnail?: string) => void): void;
     }
+    // #endregion
 
+    // #region chrome.webRequest
+    namespace webRequest {
+        type ResourceType =
+            'main_frame' | 'sub_frame' | 'stylesheet' |
+            'script' | 'image' | 'font' | 'object' |
+            'xmlhttprequest' | 'ping' | 'csp_report'
+            | 'media' | 'websocket' | 'other';
+    }
+    // #endregion
 
-    ///////////////////
-    // Webview Tag
-    ///////////////////
+    // #region chrome.webViewRequest
+    /////////////////////
+    // WebView Request //
+    /////////////////////
     /**
-     * Use the webview 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>).
+     * @requires Permissions: 'webview'
+     * @description
+     * Use the *chrome.webViewRequest* API to intercept, block, or modify requests in-flight.
      */
-    namespace webview {
-        /** Options that determine what data should be cleared by `clearData`. */
-        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;
-        }
-        interface WindowEvent extends chrome.events.Event<() => void> { }
+    namespace webViewRequest {
+        type Stage = 'onBeforeRequest' | 'onBeforeSendHeaders' | 'onHeadersReceived' | 'onAuthRequired';
+        type DeclarativeWebRequestEventList =
+            'declarativeContent.onBeforeRequest' |
+            'declarativeContent.onBeforeSendHeaders' |
+            'declarativeContent.onSendHeaders' |
+            'declarativeContent.onHeadersReceived' |
+            'declarativeContent.onAuthRequired' |
+            'declarativeContent.onResponseStarted' |
+            'declarativeContent.onBeforeRedirect' |
+            'declarativeContent.onCompleted' |
+            'declarativeContent.onErrorOccured' |
+            'declarativeContent.onRequest' |
+            'declarativeContent.onMessage';
+        type DeclarativeWebRequestConditionsList =
+            'declarativeContent.PageStateMatcher';
+        type DeclarativeWebRequestActionsList =
+            'declarativeWebRequest.AddRequestCookie' |
+            'declarativeWebRequest.AddResponseCookie' |
+            'declarativeWebRequest.AddResponseHeader' |
+            'declarativeWebRequest.CancelRequest' |
+            'declarativeWebRequest.EditRequestCookie' |
+            'declarativeWebRequest.EditResponseCookie' |
+            'declarativeWebRequest.RedirectRequest' |
+            'declarativeWebRequest.RedirectToTransparentImage' |
+            'declarativeWebRequest.RedirectToEmptyDocument' |
+            'declarativeWebRequest.RedirectByRegEx' |
+            'declarativeWebRequest.RemoveRequestCookie' |
+            'declarativeWebRequest.RemoveResponseCookie' |
+            'declarativeWebRequest.RemoveRequestHeader' |
+            'declarativeWebRequest.RemoveResponseHeader' |
+            'declarativeWebRequest.SetRequestHeader' |
+            'declarativeWebRequest.SendMessageToExtension' |
+            'declarativeWebRequest.IgnoreRules';
+        interface HeaderFilter {
+            /** Matches if the header name starts with the specified string. */
+            namePrefix?: string;
+            /** Matches if the header name ends with the specified string. */
+            nameSuffix?: string;
+            /** Matches if the header name contains all of the specified strings. */
+            nameContains?: string | string[];
+            /** Matches if the header name is equal to the specified string. */
+            nameEquals?: string;
+            /** Matches if the header value starts with the specified string. */
+            valuePrefix?: string;
+            /** Matches if the header value ends with the specified string. */
+            valueSuffix?: string;
+            /** Matches if the header value contains all of the specified strings. */
+            valueContains?: string | string[];
+            /** Matches if the header value is equal to the specified string. */
+            valueEquals?: string;
 
-        interface ConsoleEvent extends Event {
+        }
+        interface RequestMatcherFields {
+            /** Matches if the conditions of the UrlFilter are fulfilled for the URL of the request. */
+            url?: chrome.events.UrlFilter;
             /**
-             * @description The severity level of the log message. Ranges from 0 to 4.
-             * @type {number}
-             * @memberof ConsoleEvent
+             * Matches if the conditions of the UrlFilter are fulfilled for the
+             * 'first party' URL of the request. The 'first party' URL of a request,
+             * when present, can be different from the request's target URL, and
+             * describes what is considered 'first party' for the sake of third-party
+             * checks for cookies.
              */
-            level: number;
+            firstPartyForCookiesUrl?: chrome.events.UrlFilter;
             /**
-             * @description The logged message contents.
-             * @type {string}
-             * @memberof ConsoleEvent
+             * Matches if the request type of a request is contained in the list.
+             * Requests that cannot match any of the types will be filtered out. */
+            resourceType?: webRequest.ResourceType[];
+            /**
+             * Matches if the MIME media type of a response
+             * (from the HTTP Content-Type header)
+             * is contained in the list. */
+            contentType?: string[];
+            /**
+             * Matches if the MIME media type of a response
+             * (from the HTTP Content-Type header) is not contained in the list.
+             */
+            excludeContentType?: string[];
+            /**
+             * Matches if some of the request headers is matched by one of the HeaderFilters.
+             */
+            requestHeaders?: HeaderFilter[];
+            /**
+             * Matches if none of the request headers is matched by any of the HeaderFilters.
+             */
+            excludeRequestHeaders?: HeaderFilter[];
+            /**
+             * Matches if some of the response headers is matched by one of the HeaderFilters.
+             */
+            responseHeaders?: HeaderFilter[];
+            /**
+             * Matches if none of the response headers is matched by any of the HeaderFilters.
+             */
+            excludeResponseHeaders?: HeaderFilter[];
+            /**
+             * If set to true, matches requests that are subject to third-party cookie policies.
+             * If set to false, matches all other requests.
+             */
+            thirdPartyForCookies?: boolean;
+            /**
+             * Contains a list of strings describing stages.
+             * If this attribute is present, then it limits the applicable stages to those listed.
+             * Note that the whole condition is only applicable in stages compatible with all attributes. */
+            stages?: Stage[];
+        }
+        /**
+         * @description Matches network events by various criteria.
+         */
+        class RequestMatcher {
+            protected readonly typeGuard: 'RequestMatcher';
+            constructor (parameters?: RequestMatcherFields);
+            public readonly instanceType: string;
+        }
+
+        /** Declarative event action that cancels a network request. */
+        class CancelRequest {
+            protected readonly typeGuard: 'CancelRequest';
+            public readonly instanceType: string;
+        }
+
+        interface RedirectRequestParams {
+            /** Destination to where the request is redirected. */
+            redirectUrl: string;
+        }
+
+        /** Declarative event action that redirects a network request.  */
+        class RedirectRequest {
+            protected readonly typeGuard: 'RedirectRequest';
+            constructor (parameters: RedirectRequestParams);
+            public readonly instanceType: string;
+        }
+
+        /** Declarative event action that redirects a network request to a transparent image. */
+        class RedirectToTransparentImage {
+            protected readonly typeGuard: 'RedirectToTransparentImage';
+            public readonly instanceType: string;
+        }
+
+        /** Declarative event action that redirects a network request to an empty document. */
+        class RedirectToEmptyDocument {
+            protected readonly typeGuard: 'RedirectToEmptyDocument';
+            public readonly instanceType: string;
+        }
+
+        interface RedirectByRegExParams {
+            /**
+             * A match pattern that may contain capture groups.
+             * Capture groups are referenced in the Perl syntax ($1, $2, ...)
+             * instead of the RE2 syntax (\1, \2, ...) in order to be closer
+             * to JavaScript Regular Expressions.
+             */
+            from: string;
+            /** Destination pattern. @see from */
+            to: string;
+        }
+
+        /**
+         * Redirects a request by applying a regular expression on the URL.
+         * The regular expressions use the RE2 syntax.
+         * @see[RE2 syntax]{@link https://github.com/google/re2/blob/master/doc/syntax.txt}
+         */
+        class RedirectByRegEx {
+            protected readonly typeGuard: 'RedirectByRegEx';
+            constructor (parameters: RedirectByRegExParams);
+            public readonly instanceType: string;
+        }
+
+        interface SetRequestHeaderParams {
+            /** HTTP request header name */
+            name: string;
+            /** HTTP request header value */
+            value: string;
+        }
+
+        /**
+         * Sets the request header of the specified name to the specified value.
+         * If a header with the specified name did not exist before, a new one is created.
+         * Header name comparison is always case-insensitive.
+         * Each request header name occurs only once in each request.
+         */
+        class SetRequestHeader {
+            protected readonly typeGuard: 'SetRequestHeader';
+            constructor (parameters: SetRequestHeaderParams);
+            public readonly instanceType: string;
+        }
+
+        interface RemoveRequestHeaderParams {
+            /** HTTP request header name (case-insensitive) */
+            name: string;
+        }
+
+        /**
+         * Removes the request header of the specified name.
+         * Do not use SetRequestHeader and RemoveRequestHeader with
+         * the same header name on the same request.
+         * Each request header name occurs only once in each request.
+         */
+        class RemoveRequestHeader {
+            protected readonly typeGuard: 'RemoveRequestHeader';
+            constructor (parameters: RemoveRequestHeaderParams);
+            public readonly instanceType: string;
+        }
+
+        interface AddResponseHeaderParams {
+            /** HTTP response header name */
+            name: string;
+            /** HTTP response header value */
+            value: string;
+        }
+
+        /**
+         * Adds the response header to the response of this web request.
+         * As multiple response headers may share the same name,
+         * you need to first remove and then add a new
+         * response header in order to replace one.
+         */
+        class AddResponseHeader {
+            protected readonly typeGuard: 'AddResponseHeader';
+            constructor (parameters: AddResponseHeaderParams);
+            public readonly instanceType: string;
+        }
+
+        interface RemoveResponseHeaderParams {
+            /** HTTP request header name (case-insensitive). */
+            name: string;
+            /** HTTP request header value (case-insensitive). */
+            value?: string;
+        }
+
+        /**
+         * Removes all response headers of the specified names and values.
+         */
+        class RemoveResponseHeader {
+            protected readonly typeGuard: 'RemoveResponseHeader';
+            constructor (parameters: RemoveResponseHeaderParams);
+            public readonly instanceType: string;
+        }
+
+        interface IgnoreRulesParams {
+            /**
+             * If set, rules with a lower priority than the specified value are ignored.
+             * This boundary is not persisted, it affects only rules and their actions
+             * of the same network request stage.
+             */
+            lowerPriorityThan?: integer;
+            /**
+             * If set, rules with the specified tag are ignored. This ignoring is not persisted,
+             * it affects only rules and their actions of the same network request stage.
+             * Note that rules are executed in descending order of their priorities.
+             * This action affects rules of lower priority than the current rule.
+             * Rules with the same priority may or may not be ignored.
+             */
+            hasTag?: string;
+        }
+
+        /**
+         * Masks all rules that match the specified criteria.
+         */
+        class IgnoreRules {
+            protected readonly typeGuard: 'IgnoreRules';
+            constructor (parameters: IgnoreRulesParams);
+            public readonly instanceType: string;
+        }
+
+        interface SendMessageParams {
+            /**
+             * The value that will be passed in the message attribute
+             * of the interface that is passed to the event handler.
              */
             message: string;
+        }
+
+        /**
+         * Triggers the webviewWebRequest.*OnMessageEvent* event which are used in webviews.
+         */
+        class SendMessageToExtension {
+            protected readonly typeGuard: 'SendMessageToExtension';
+            constructor (parameters: SendMessageParams);
+            public readonly instanceType: string;
+        }
+
+        /**
+         * A filter or specification of a cookie in HTTP Requests.
+         */
+        interface RequestCookie {
+            /** Name of a cookie. */
+            name?: string;
+            /** Value of a AddRequestCookie, may be padded in double-quotes. */
+            value?: string;
+        }
+
+        /**
+         * A specification of a cookie in HTTP Responses.
+         */
+
+        interface ResponseCookie {
+            /** Name of a cookie. */
+            name?: string;
+            /** Value of a cookie, may be padded in double-quotes. */
+            value?: string;
+            /** Value of the Expires cookie attribute. */
+            expires?: string;
+            /** Value of the Max-Age cookie attribute */
+            maxAge?: integer;
+            /** Value of the Domain cookie attribute. */
+            domain?: string;
+            /** Value of the Path cookie attribute. */
+            path?: string;
+            /** Existence of the Secure cookie attribute. */
+            secure?: string;
+            /** Existence of the HttpOnly cookie attribute. */
+            httpOnly?: string;
+        }
+
+        /** A filter of a cookie in HTTP Responses. */
+        interface FilterResponseCookie {
+            /** Name of a cookie. */
+            name?: string;
+            /** Value of a cookie, may be padded in double-quotes. */
+            value?: string;
+            /** Value of the Expires cookie attribute. */
+            expires?: string;
+            /** Value of the Max-Age cookie attribute */
+            maxAge?: double;
+            /** Value of the Domain cookie attribute. */
+            domain?: string;
+            /** Value of the Path cookie attribute. */
+            path?: string;
+            /** Existence of the Secure cookie attribute. */
+            secure?: string;
+            /** Existence of the HttpOnly cookie attribute */
+            httpOnly?: string;
             /**
-             * @description The line number of the message source.
-             * @type {number}
-             * @memberof ConsoleEvent
+             * Inclusive upper bound on the cookie lifetime (specified in seconds after current time).
+             * Only cookies whose expiration date-time is in the interval [now, now + ageUpperBound]
+             * fulfill this criterion. Session cookies and cookies whose expiration date-time is
+             * in the past do not meet the criterion of this filter. The cookie lifetime is calculated
+             * from either 'max-age' or 'expires' cookie attributes. If both are specified, 'max-age'
+             * is used to calculate the cookie lifetime.
              */
-            line: number;
+            ageUpperBound?: integer;
             /**
-             * @description A string identifying the resource which logged the message.
-             * @type {string}
-             * @memberof ConsoleEvent
+             * Inclusive lower bound on the cookie lifetime (specified in seconds after current time).
+             * Only cookies whose expiration date-time is set to 'now + ageLowerBound' or later fulfill
+             * this criterion. Session cookies do not meet the criterion of this filter. The cookie
+             * lifetime is calculated from either 'max-age' or 'expires' cookie attributes. If both
+             * are specified, 'max-age' is used to calculate the cookie lifetime.
              */
+            ageLowerBound?: integer;
+            /**
+             * Filters session cookies.
+             * Session cookies have no lifetime specified in any of 'max-age' or 'expires' attributes.
+             */
+            sessionCookie?: boolean;
+        }
+
+        /**
+         * @private
+         * @template T Type of cookie
+         */
+        interface AddCookie<T> {
+            /**
+             * Cookie to be added to the request.
+             * No field may be undefined.
+             * The name and value need to be specified.
+             */
+            cookie: T;
+        }
+
+        /**
+         * Adds a cookie to the request or overrides a cookie, in case another cookie of the same name exists already.
+         * Note that it is preferred to use the Cookies API because this is computationally less expensive.
+         */
+        class AddRequestCookie {
+            protected readonly typeGuard: 'AddRequestCookie';
+            constructor (parameters: AddCookie<RequestCookie>);
+            public readonly instanceType: string;
+        }
+
+
+        /**
+         * Adds a cookie to the response or overrides a cookie, in case another cookie of the same name exists already.
+         * Note that it is preferred to use the Cookies API because this is computationally less expensive.
+         */
+        class AddResponseCookie {
+            protected readonly typeGuard: 'AddResponseCookie';
+            constructor (parameters: AddCookie<ResponseCookie>);
+            public readonly instanceType: string;
+        }
+
+        /**
+         * @private
+         * @template T First parameter type
+         * @template K Second parameter type
+         */
+        interface EditCookieParams<T, K> {
+            /**
+             * Filter for cookies that will be modified.
+             * All empty entries are ignored.
+             */
+            filter: T;
+            /**
+             * Attributes that shall be overridden in cookies that machted the filter
+             * Attributes that are set to an empty string are removed.
+             */
+            modification: K;
+        }
+
+        /**
+         * Edits one or more cookies of request.
+         * Note that it is preferred to use the Cookies API because this is computationally less expensive.
+         */
+        class EditRequestCookie {
+            protected readonly typeGuard: 'EditRequestCookie';
+            /**
+             * @param filter
+             * @param modification Attributes that shall be overridden in cookies that machted the filter.
+             *                     Attributes that are set to an empty string are removed.
+             */
+            constructor (parameters: EditCookieParams<RequestCookie, RequestCookie>);
+            public readonly instanceType: string;
+        }
+
+        /**
+         * Edits one or more cookies of response.
+         * Note that it is preferred to use the Cookies API because this is computationally less expensive.
+         */
+        class EditResponseCookie {
+            protected readonly typeGuard: 'EditResponseCookie';
+            /**
+             * @param filter Filter for cookies that will be modified.All empty entries are ignored.
+             * @param modification
+             */
+            constructor (parameter: EditCookieParams<FilterResponseCookie, ResponseCookie>);
+            public readonly instanceType: string;
+        }
+
+        /**
+         * Removes one or more cookies of request.
+         * Note that it is preferred to use the Cookies API because this is computationally less expensive.
+         */
+        class RemoveRequestCookie {
+            protected readonly typeGuard: 'RemoveRequestCookie';
+            constructor (parameters: RemoveCookieParams<RequestCookie>);
+            public readonly instanceType: string;
+        }
+
+
+
+        /**
+         * @private
+         * @template T Filter type
+         */
+        interface RemoveCookieParams<T> {
+            /**
+             * Filter for cookies that will be removed.
+             * All empty entries are ignored.
+             */
+            filter: T;
+        }
+
+        /**
+         * Removes one or more cookies of response.
+         * Note that it is preferred to use the Cookies API because this is computationally less expensive.
+         */
+        class RemoveResponseCookie {
+            protected readonly typeGuard: 'RemoveResponseCookie';
+            constructor (parameters: RemoveCookieParams<FilterResponseCookie>);
+            public readonly instanceType: string;
+        }
+
+        /** Supported conditions */
+        type OnRequestConditions =
+            RequestMatcher;
+
+        /** Supported actions */
+        type OnRequestActions =
+            AddRequestCookie |
+            AddResponseCookie |
+            AddResponseHeader |
+            CancelRequest |
+            EditRequestCookie |
+            EditResponseCookie |
+            RedirectRequest |
+            RedirectToTransparentImage |
+            RedirectToEmptyDocument |
+            RedirectByRegEx |
+            RemoveRequestCookie |
+            RemoveResponseCookie |
+            RemoveRequestHeader |
+            RemoveResponseHeader |
+            SetRequestHeader |
+            SendMessageToExtension |
+            IgnoreRules;
+
+        /**
+         * Description of a declarative rule for handling events.
+         * With correct types for the onRequest event.
+         */
+        interface OnRequestRule extends chrome.events.Rule<OnRequestConditions, OnRequestActions> { }
+
+        /**
+         * Provides the Declarative Event API consisting of addRules, removeRules, and getRules.
+         */
+        interface OnRequestEvent {
+            /**
+             * Registers rules to handle events.
+             * @param rules Rules to be registered. These do not replace previously registered rules.
+             * @param [callback] Called with registered rules.
+             */
+            addRules(rules: OnRequestRule[], callback?: (rules: OnRequestRule[]) => void): void;
+
+            /**
+             * Returns currentlt registered rules.
+             * @param callback Called with registered rules.
+             */
+            getRules(callback: (rules: OnRequestRule[]) => void): void;
+
+            /**
+             * Returns currentlt registered rules.
+             * @param ruleIdentifiers If an array is passed, only rules with identifiers contained in this array are returned.
+             * @param callback Called with registered rules.
+             */
+            getRules(ruleIdentifiers: string[], callback: (rules: OnRequestRule[]) => void): void;
+
+            /**
+             * Unregisters currently registered rules.
+             * @param [ruleIdentifiers] If an array is passed, only rules with identifiers contained in this array are unregistered.
+             * @param [callback] Called when rules were unregistered.
+             */
+            removeRules(ruleIdentifiers?: string[], callback?: () => void): void;
+        }
+
+        interface OnMessageEventDetails {
+            /** The message sent by the calling script. */
+            message: string;
+            /** The stage of the network request during which the event was triggered. */
+            stage: Stage;
+            /**
+             * 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 */
+            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: integer;
+            /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+            parentFrameId: integer;
+            /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+            tabId: integer;
+            /** How the requested resource will be used. */
+            type: webRequest.ResourceType;
+            /** The time when this signal is triggered, in milliseconds since the epoch. */
+            timeStamp: double;
+        }
+
+        /**
+         * Fired when a message is sent via **declarativeWebRequest.SendMessageToExtension**
+         * from an action of the declarative web request API.
+         */
+        interface OnMessageEvent extends chrome.events.Event<(details: OnMessageEventDetails) => void> { }
+    }
+    // #endregion
+
+    // #region placeholders
+    //////////////////
+    // PLACEHOLDERS //
+    //////////////////
+
+    /**
+     * Chrome experimental apis may be using this namespace.
+     * Please consult the official documentation.
+     * @see[Documentation]{@link https://developer.chrome.com/apps/experimental}
+     */
+    const experimental: any;
+    // #endregion
+
+    // #region classes
+    /////////////
+    // CLASSES //
+    /////////////
+
+    /**
+     * New Chrome Event
+     * @constructor
+     */
+    const Event: {
+        new <T extends Function>(): chrome.events.Event<T>;
+    }
+
+    // #endregion
+
+    // #region methods
+    /////////////
+    // METHODS //
+    /////////////
+
+    /**
+     * Different page speed and load metrics
+     */
+    function csi(): {
+        onloadT: integer;
+        pageT: integer;
+        startE: integer;
+        tran: integer;
+    }
+
+    /**
+     * @deprecated Deprecated in Chrome 64.
+     * chrome.loadTimes() is a non-standard API that exposes loading metrics
+     * and network information to developers in order to help them better
+     * understand their site's performance in the real world.
+     * @see[Use this instead]{@link https://www.w3.org/TR/navigation-timing-2/}
+     * @see[Deprecation article]{@link https://developers.google.com/web/updates/2017/12/chrome-loadtimes-deprecated}
+     */
+    function loadTimes(): chrome.deprecatedButUsable;
+
+    // #endregion
+}
+
+/////////////////
+// AppView Tag //
+/////////////////
+/**
+ * Use the appview tag to embed other Chrome Apps within your Chrome App.
+ * The appview runs in a separate process from your app,
+ * it doesn't inherit the same permissions and is only allowed
+ * to interact with your app through asynchronous APIs.
+ * Not all apps can be embedded; apps have to explicitly allow themselves to be embedded.
+ * @since Chrome 43.
+ * @requires Permissions: 'appview'
+ * @see[Documentation]{@link https://developer.chrome.com/apps/tags/appview}
+ */
+declare class HTMLAppViewElement extends HTMLElement {
+    /** Create a new AppView tag */
+    constructor ();
+    /**
+     * Requests another app to be embedded.
+     * @param app The extension id of the app to be embedded.
+     * @param [data] Optional developer specified data that the app to be embedded can use when making an embedding decision.
+     * @param [callback] Optional callback when the embedding request is completed. Will provide the result.
+     */
+    connect(app: string, data?: any, callback?: (success: boolean) => void): void;
+}
+declare namespace AppView {
+    interface EmbedRequest {
+        /** The ID of the app that sent the embedding request. */
+        embedderId: string;
+        /** Optional developer specified data that the app to be embedded can use when making an embedding decision. */
+        data?: any;
+        /**
+         * Allows the embedding request
+         * @param url Specifies the content to be embedded.
+         */
+        allow(url: string): void;
+        /** Prevents the embedding request */
+        deny(): void;
+    }
+}
+
+declare interface Document {
+    createElement(element: 'appview'): HTMLAppViewElement;
+}
+
+declare interface Window {
+    AppView: typeof AppView;
+}
+
+declare const AppView: typeof HTMLAppViewElement;
+
+
+declare interface HTMLElementTagNameMap {
+    'appview': HTMLAppViewElement
+}
+
+// Type definitions for Chrome packaged application development
+// Project: http://developer.chrome.com/apps/
+// Definitions by: Nikolai Ommundsen <https://github.com/niikoo>, Adam Lay <https://github.com/AdamLay>, MIZUNE Pine <https://github.com/pine613>, MIZUSHIMA Junki <https://github.com/mzsm>, Ingconst Stepanyan <https://github.com/RReverser>, Adam Pyle <https://github.com/pyle>, 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.8
+
+/////////////////
+// Webview Tag //
+/////////////////
+/**
+ * Use the webview 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 *webview* and interact with the web content, initiate navigations in
+ * an embedded web page, react to error events that happen within it.
+ */
+
+declare class HTMLWebViewElement extends HTMLElement {
+    /**
+     * If present, portions of the embedder could be visible through the webview,
+     * where the contents are transparent. Without allowtransparency enabled,
+     * no part of the embedder will be shown through the webview,
+     * even if elements exist that are specified as transparent.
+     * This does not affect transparency within the contents of the webview itself.
+     */
+    allowtransparency?: boolean;
+
+    /**
+     * If 'on', the webview container will automatically resize within the bounds specified by the attributes minwidth, minheight, maxwidth, and maxheight.
+     * These constraints do not impact the webview UNLESS autosize is enabled.
+     * When autosize is enabled, the webview container size cannot be less than the minimum values or greater than the maximum.
+     */
+    autosize?: 'on' | boolean;
+
+    /** Similar to chrome's ContextMenus API, but applies to webview instead of browser.
+         * Use the webview.contextMenus API to add items to webview's context menu.
+         * You can choose what types of objects your context menu additions apply to, such as images, hyperlinks, and pages. */
+    contextMenus: WebView.ContextMenus;
+
+    /**
+     * Object reference which can be used to post messages into the guest page.
+     */
+    contentWindow: WebView.ContentWindow;
+
+    /** This sets the guest content's window.name object.**/
+    name: string;
+
+    /**
+     * Storage partition ID used by the webview tag.
+     * If the storage partition ID starts with persist: (partition='persist:googlepluswidgets'),
+     * the webview will use a persistent storage partition available to all guests in the app with the same storage partition ID.
+     * If the ID is unset or if there is no 'persist': prefix, the webview will use an in-memory storage partition.
+     * his value can only be modified before the first navigation, since the storage partition of an active renderer process cannot change.
+     * Subsequent attempts to modify the value will fail with a DOM exception.
+     * By assigning the same partition ID, multiple webviews can share the same storage partition.
+     */
+    partition?: string;
+
+    /** Interface which provides access to webRequest events on the guest page. */
+    request: WebView.WebRequestEventInterface;
+
+    /**
+     * Returns the visible URL. Mirrors the logic in the browser's omnibox: either returning a pending new navigation if initiated by the embedder page, or the last committed navigation. Writing to this attribute initiates top-level navigation.
+     * Assigning src its own value will reload the current page.
+     * The src attribute cannot be cleared or removed once it has been set, unless the webview is removed from the DOM.
+     * The src attribute can also accept data URLs, such as 'data:text/plain,Hello, world!'.
+     */
+    src: string;
+
+    /** Create a new element */
+    constructor ();
+
+    /**
+     * Queries audio state.
+     * @since Chrome 62.
+     **/
+    getAudioState(callback: (audible: boolean) => void): void;
+
+    /**
+     * Sets audio mute state of the webview.
+     * @param mute Mute audio value
+     * @since Chrome 62.
+     */
+    setAudioMuted(mute: boolean): void;
+
+    /**
+     * Queries whether audio is muted.
+     * @since Chrome 62.
+     */
+    isAudioMuted(callback: (muted: boolean) => void): void;
+
+    /**
+     * Captures the visible region of the webview.
+     * @param callback Provides a data URL which encodes an image of the visible area of the captured webview.
+     *                 May be assigned to the 'src' property of an HTML Image element for display.
+     * @since Chrome 50.
+     */
+    captureVisibleRegion(callback: (dataUrl: string) => void): void;
+    /**
+     * Captures the visible region of the webview.
+     * @param options Extension type
+     * @param callback Provides a data URL which encodes an image of the visible area of the captured webview.
+     *                 May be assigned to the 'src' property of an HTML Image element for display.
+     * @since Chrome 50.
+     */
+    captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
+
+    /**
+    * Adds content script injection rules to the webview.
+    * When the webview navigates to a page matching one or more rules, the associated scripts will be injected.
+    * You can programmatically add rules or update existing rules.
+    * The following example adds two rules to the webview: 'myRule' and 'anotherRule'.
+    * @example
+    * webview.addContentScripts([
+    * {
+    *    name: 'myRule',
+    *    matches: ['http://www.foo.com/*'],
+    *    css: { files: ['mystyles.css'] },
+    *    js: { files: ['jquery.js', 'myscript.js'] },
+    *    run_at: 'document_start'
+    *  },
+    *  {
+    *    name: 'anotherRule',
+    *    matches: ['http://www.bar.com/*'],
+    *    js: { code: 'document.body.style.backgroundColor = 'red';' },
+    *    run_at: 'document_end'
+    *  }]);
+    * ...
+    * // Navigates webview.
+    * webview.src = 'http://www.foo.com';
+    *
+    * @description
+    * You can defer addContentScripts call until you needs to inject scripts.
+    * The following example shows how to overwrite an existing rule.
+    * @example
+    * webview.addContentScripts([{
+    *    name: 'rule',
+    *    matches: ['http://www.foo.com/*'],
+    *    js: { files: ['scriptA.js'] },
+    *    run_at: 'document_start'}]);
+    *
+    * // Do something.
+    * webview.src = 'http://www.foo.com/*';
+    * ...
+    * // Overwrite 'rule' defined before.
+    * webview.addContentScripts([{
+    *   name: 'rule',
+    *   matches: ['http://www.bar.com/*'],
+    *   js: { files: ['scriptB.js'] },
+    *   run_at: 'document_end'}]);
+    * @description
+    * If webview has been naviagted to the origin (e.g., foo.com) and
+    * calls webview.addContentScripts to add 'myRule',
+    * you need to wait for next navigation to make the scripts injected.
+    * If you want immediate injection, executeScript will do the right thing.
+    * Rules are preserved even if the guest process crashes
+    * or is killed or even if the webview is reparented.
+    * Refer to the /extensions/content_scripts documentation for more details.
+    * @param contentScriptList Details of the content scripts to add.
+    * @since Chrome 44.
+    */
+    addContentScripts(contentScriptList: WebView.ContentScriptDetails[]): void;
+
+    /**
+     * Navigates backward one history entry if possible.
+     * Equivalent to go(-1).
+     * @param [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
+     */
+    back(callback?: (success: boolean) => void): void;
+
+    /**
+     * Indicates whether or not it is possible to navigate backward through history.
+     * The state of this function is cached, and updated before each loadcommit,
+     * so the best place to call it is on loadcommit.
+     */
+    canGoBack(): void;
+
+    /**
+     * Indicates whether or not it is possible to navigate forward through history.
+     * The state of this function is cached, and updated before each loadcommit,
+     * so the best place to call it is on loadcommit.
+     */
+    canGoForward(): void;
+
+    /**
+     * Clears browsing data for the webview partition.
+     * @param options Options determining which data to clear.
+     * @param types The types of data to be cleared.
+     * @param callback Called after the data has been successfully cleared.
+     * @since Chrome 33.
+     */
+    clearData(options: WebView.ClearDataOptions, types: WebView.ClearDataTypeSet, callback?: () => void): void;
+
+    /**
+     * Injects JavaScript code into the guest page.
+     * The following sample code uses script injection
+     * to set the guest page's background color to red:
+     * @example
+     * webview.executeScript({ code: 'document.body.style.backgroundColor = 'red'' });
+     * @param details  Details of the script to run.
+     * @param [callback] Called after all the JavaScript has been executed.
+     */
+    executeScript(details: WebView.InjectDetails, callback?: (result?: any[]) => void): void;
+
+    /**
+     * Initiates a find-in-page request.
+     * @param searchText The string to find in the page.
+     * @param [options]  Options for the find request.
+     * @param [callback] Called after all find results have been returned for this find request.
+     *                 Provides optionally:
+     *                 results: Contains all of the results of the find request.
+     *                 results can be omitted if it is not utilized in the callback function body;
+     *                 e.g. if the callback is only used to discern when the find request has completed.
+     */
+    find(searchText: string, options?: WebView.FindOptions, callback?: (results?: WebView.FindCallbackResults) => void): void;
+
+    /**
+     * Navigates forward one history entry if possible. Equivalent to go(1).
+     * @param [callback] Called after the navigation has either failed or completed successfully.
+     *                   Provides *success* which indicates whether the navigation was successful.
+     */
+    forward(callback?: (success: boolean) => void): void;
+
+    /**
+     * Returns Chrome's internal process ID for the guest web page's current process,
+     * allowing embedders to know how many guests would be affected by terminating
+     * the process. Two guests will share a process only if they belong to the same
+     * app and have the same **storage partition ID**. The call is synchronous and returns
+     * the embedder's cached notion of the current process ID. The process ID isn't
+     * the same as the operating system's process ID.
+     */
+    getProcessId(): chrome.integer;
+
+    /**
+     * Returns the user agent string used by the webview for guest page requests.
+     * @since Chrome 33.
+     */
+    getUserAgent(): string;
+
+    /**
+     * Gets the current zoom factor.
+     * @param callback Called after the current zoom factor is retrieved. Provides the current zoom factor.
+     * @since Chrome 36.
+     */
+    getZoom(callback: (zoomFactor: chrome.double) => void): void;
+
+    /**
+     * Gets the current zoom mode.
+     * @param callback Called with the webview's current zoom mode.
+     * @since Chrome 43.
+     */
+    getZoomMode(callback: (ZoomMode: WebView.ZoomMode) => void): void;
+
+    /**
+     * Navigates to a history entry using a history index relative to the current navigation.
+     * If the requested navigation is impossible, this method has no effect.
+     * @param relativeIndex Relative history index to which the webview should be navigated.
+     *                      For example, a value of 2 will navigate forward 2 history entries if possible;
+     *                        a value of -3 will navigate backward 3 entries.
+     * @param [callback] Called after the navigation has either failed or completed successfully.
+     *                   Provides a boolean, *success*, which indicates whether the navigation was successful.
+     */
+    go(relativeIndex: chrome.integer, callback?: (success: boolean) => void): void;
+
+    /**
+     * Injects CSS into the guest page.
+     * @param details Details of the CSS to insert.
+     * @param callback Called after the CSS has been inserted.
+     */
+    insertCSS(details: WebView.InjectDetails, callback?: () => void): void;
+
+    /**
+     * Indicates whether or not the webview's user agent string has been overridden by *setUserAgentOverride*.
+     * @since Chrome 33.
+     */
+    isUserAgentOverridden(): void;
+
+    /**
+     * Prints the contents of the webview.
+     * This is equivalent to calling scripted print function from the webview itself.
+     * @since Chrome 38.
+     */
+    print(): void;
+
+    /** Reloads the current top-level page. */
+    reload(): void;
+
+    /**
+     * Removes content scripts from a webview.
+     * The following example removes 'myRule' which was added before.
+     * @example webview.removeContentScripts(['myRule']);
+     * @description You can remove all the rules by calling:
+     * @example webview.removeContentScripts();
+     * @param scriptNameList A list of names of content scripts that will be removed.
+     *                       If the list is empty, all the content scripts added to the webview will be removed.
+     * @since Chrome 44.
+     */
+    removeContentScripts(scriptNameList?: string[]): void;
+
+    /** Set an attribute */
+    setAttribute(attributeName: string, value: string | number | boolean): void;
+
+    /**
+     * Override the user agent string used by the webview for guest page requests.
+     * @param userAgent The user agent string to use.
+     * @since Chrome 33.
+     */
+    setUserAgentOverride(userAgent: string): void;
+
+    /**
+     * Changes the zoom factor of the page.
+     * The scope and persistence of this change
+     * are determined by the webview's current zoom mode.
+     * @param zoomFactor The new zoom factor.
+     * @param [callback] Called after the page has been zoomed.
+     * @since Chrome 36.
+     */
+    setZoom(zoomFactor: chrome.double, callback?: () => void): void;
+
+    /**
+     * Sets the zoom mode of the webview.
+     * @param ZoomMode Defines how zooming is handled in the webview.
+     * @param [callback] Called after the zoom mode has been changed.
+     * @since Chrome 43.
+     */
+    setZoomMode(ZoomMode: WebView.ZoomMode, callback?: () => void): void;
+
+    /** Stops loading the current webview navigation if in progress. */
+    stop(): void;
+
+    /**
+     * Ends the current find session (clearing all highlighting)
+     * and cancels all find requests in progress.
+     * @param action Determines what to do with the active match after the find session has ended.
+     *               *clear* will clear the highlighting over the active match;
+     *               keep will keep the active match highlighted;
+     *               activate will keep the active match highlighted and simulate a user click on that match.
+     *               The default action is keep.
+     * @since Chrome 35.
+     */
+    stopFinding(action?: 'clear' | 'keep' | 'activate'): void;
+
+    /**
+     * Loads a data URL with a specified base URL used for relative links.
+     * Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
+     * @param dataUrl The data URL to load.
+     * @param baseUrl The base URL that will be used for relative links.
+     * @param virtualUrl The URL that will be displayed to the user (in the address bar).
+     * @since Chrome 40.
+     */
+    loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
+
+    /**
+     * Forcibly kills the guest web page's renderer process.
+     * This may affect multiple webview tags in the current app if they share the same process,
+     * but it will not affect webview tags in other apps.
+     */
+    terminate(): void;
+
+
+    ///
+    /// DOM Events
+    ///
+
+    /** Fired when the guest window logs a console message. */
+    onconsolemessage: ((this: HTMLWebViewElement, ev: WebView.Events.ConsoleMessageEvent) => any) | null;
+    /**
+     * Fired when the guest window fires a load event, i.e.,
+     * when a new document is loaded. This does not include
+     * page navigation within the current document or
+     * asynchronous resource loads.
+     */
+    oncontentload: ((this: HTMLWebViewElement, ev: WebView.Events.ContentLoadEvent) => any) | null;
+    /**
+     * Fired when the guest window attempts to open a modal dialog via
+     * window.alert, window.confirm, or window.prompt.
+     * Handling this event will block the guest process until each event listener
+     * returns or the dialog object becomes unreachable
+     * (if preventDefault() was called.)
+     */
+    ondialog: ((this: HTMLWebViewElement, ev: WebView.Events.DialogEvent) => any) | null;
+    /**
+     * Fired when the process rendering the guest web content has exited.
+     */
+    onexit: ((this: HTMLWebViewElement, ev: WebView.Events.ExitEvent) => any) | null;
+    /**
+     * Fired when new find results are available for an active find request.
+     * This might happen multiple times for a single find request as matches are found.
+     */
+    onfindupdate: ((this: HTMLWebViewElement, ev: WebView.Events.FindUpdateEvent) => any) | null;
+    /**
+     * Fired when a top-level load has aborted without committing.
+     * An error message will be printed to the console unless the
+     * event is default-prevented.
+     *
+     * Note: When a resource load is aborted, a loadabort event will
+     * eventually be followed by a loadstop event, even if all
+     * committed loads since the last loadstop event (if any) were aborted.
+     *
+     * Note: When the load of either an about URL or a JavaScript URL is aborted,
+     * loadabort will be fired and then the webview will be navigated to 'about:blank'.
+     */
+    onloadabort: ((this: HTMLWebViewElement, ev: WebView.Events.LoadAbortEvent) => any) | null;
+    /**
+     * Fired when a load has committed. This includes navigation within the current document
+     * as well as subframe document-level loads, but does not include asynchronous resource loads.
+     */
+    onloadcommit: ((this: HTMLWebViewElement, ev: WebView.Events.LoadCommitEvent) => any) | null;
+    /**
+     * Fired when a top-level load request has redirected to a different URL.
+     */
+    onloadredirect: ((this: HTMLWebViewElement, ev: WebView.Events.LoadRedirectEvent) => any) | null;
+    /**
+     * Fired when all frame-level loads in a guest page (including all its subframes)
+     * have completed. This includes navigation within the current document as well
+     * as subframe document-level loads, but does not include asynchronous resource
+     * loads. This event fires every time the number of document-level loads
+     * transitions from one (or more) to zero. For example, if a page that has
+     * already finished loading (i.e., loadstop already fired once) creates a new
+     * iframe which loads a page, then a second loadstop will fire when the iframe
+     * page load completes. This pattern is commonly observed on pages that load ads.
+     *
+     * Note: When a committed load is aborted, a loadstop event will eventually
+     * follow a loadabort event, even if all committed loads since the last loadstop
+     * event (if any) were aborted.
+     */
+    onloadstop: ((this: HTMLWebViewElement, ev: WebView.Events.LoadStopEvent) => any) | null;
+    /**
+     * Fired when the guest page attempts to open a new browser window.
+     */
+    onnewwwindow: ((this: HTMLWebViewElement, ev: WebView.Events.NewWindowEvent) => any) | null;
+    /**
+     * Fired when the guest page needs to request special permission from the embedder.
+     */
+    onpermissionrequest: ((this: HTMLWebViewElement, ev: WebView.Events.PermissionRequestEvent) => any) | null;
+    /**
+     * Fired when the process rendering the guest web content has become responsive again after being unresponsive.
+     */
+    onresponsive: ((this: HTMLWebViewElement, ev: WebView.Events.ResponsiveEvent) => any) | null;
+    /**
+     * @requires autosize: enabled
+     * Fired when the embedded web content has been resized via autosize.
+     * Only fires if autosize is enabled.
+     */
+    onsizechanged: ((this: HTMLWebViewElement, ev: WebView.Events.SizeChangedEvent) => any) | null;
+    /**
+     * Fired when the process rendering the guest web content has become unresponsive.
+     * This event will be generated once with a matching responsive event if the guest
+     * begins to respond again.
+     */
+    onunresponsive: ((this: HTMLWebViewElement, ev: WebView.Events.UnresponsiveEvent) => any) | null
+    /**
+     * Fired when the page's zoom changes.
+     */
+    onzoomchange: ((this: HTMLWebViewElement, ev: WebView.Events.ZoomChangeEvent) => any) | null;
+
+
+    addEventListener<K extends keyof WebView.Events.WebViewElementEventMap>(type: K, listener: (this: HTMLElement, ev: WebView.Events.WebViewElementEventMap[K]) => any, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener<K extends keyof WebView.Events.WebViewElementEventMap>(type: K, listener: (this: HTMLElement, ev: WebView.Events.WebViewElementEventMap[K]) => any, options?: boolean | EventListenerOptions): void;
+
+    ///
+    /// STYLE
+    ///
+
+    /** Maximum height */
+    maxheight: number;
+    /** Minimum height */
+    minheight: number;
+    /** Maximum width */
+    maxwidth: number;
+    /** Minimum width */
+    minwidth: number;
+    /**
+     * Allow scaling?
+     * @default false
+     */
+    allowscaling?: boolean;
+}
+/////////////
+// WEBVIEW //
+/////////////
+/**
+ * WebView Events, Methods and interfaces.
+ */
+declare namespace WebView {
+    /**
+     * WebView Events are different from Chrome Events, they extend the normal DOM Events.
+     */
+    namespace Events {
+        interface WebViewElementEventMap extends HTMLElementEventMap {
+            'close': CloseEvent,
+            'consolemessage': ConsoleMessageEvent,
+            'contentload': ContentLoadEvent,
+            'dialog': DialogEvent,
+            'exit': ExitEvent,
+            'findupdate': FindUpdateEvent,
+            'loadabort': LoadAbortEvent,
+            'loadcommit': LoadCommitEvent,
+            'loadredirect': LoadRedirectEvent,
+            'loadstart': LoadStartEvent,
+            'loadstop': LoadStopEvent,
+            'newwindow': NewWindowEvent,
+            'permissionrequest': PermissionRequestEvent,
+            'responsive': ResponsiveEvent,
+            'sizechanged': SizeChangedEvent,
+            'unresponsive': UnresponsiveEvent,
+            'zoomchange': ZoomChangeEvent
+        }
+
+        /**
+         * Fired when the guest window attempts to close itself.
+         * The following example code navigates the webview to about:blank when the guest attempts to close itself.
+         */
+        interface CloseEvent extends Event { }
+
+        type ConsoleMessageLevel = -1 | 0 | 1 | 2;
+
+        /**
+         * Fired when the guest window logs a console message.
+         * The following example code forwards all log messages to the embedder's console without regard for log level or other properties.
+         */
+        interface ConsoleMessageEvent extends Event {
+            /**
+             * The severity level of the log message.
+             * Ranges from -1 to 2.
+             * LOG_VERBOSE (console.debug) = -1
+             * LOG_INFO (console.log, console.info) = 0
+             * LOG_WARNING (console.warn) = 1
+             * LOG_ERROR (console.error) = 2
+             */
+            level: ConsoleMessageLevel;
+            /** The logged message contents. */
+            message: string;
+            /** The line number of the message source. */
+            line: chrome.integer;
+            /** A string identifying the resource which logged the message. */
             sourceId: string;
         }
 
+        /**
+         * Fired when the guest window fires a load event, i.e., when a new document is loaded. This does not include page navigation within the current document or asynchronous resource loads.
+         * The following example code modifies the default font size of the guest's body element after the page loads:
+         * @example
+         * webview.addEventListener('contentload', function() {
+         *  webview.executeScript({ code: 'document.body.style.fontSize = '42px'' })
+         * });
+         */
+        interface ContentLoadEvent extends Event { }
+
+        /**
+         * String indicating what type of abort occurred.
+         * This string is *not* guaranteed to remain backwards compatible between releases.
+         * You must not parse and act based upon its content. It is also possible that,
+         * in some cases, an error not listed here could be reported.
+         */
+        type LoadAbortReason =
+            'ERR_ABORTED' |
+            'ERR_INVALID_URL' |
+            'ERR_DISALLOWED_URL_SCHEME' |
+            'ERR_BLOCKED_BY_CLIENT' |
+            'ERR_ADDRESS_UNREACHABLE' |
+            'ERR_EMPTY_RESPONSE' |
+            'ERR_FILE_NOT_FOUND' |
+            'ERR_UNKNOWN_URL_SCHEME';
+
+        /**
+         * The type of modal dialog requested by the guest.
+         */
+        type DialogMessageType =
+            'alert' |
+            'confirm' |
+            'prompt';
+        /**
+         * Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.
+         * Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)
+         * The default behavior is to cancel the dialog.
+         */
+        interface DialogEvent extends Event {
+            /**
+             * The type of modal dialog requested by the guest.
+             */
+            messageType: DialogMessageType;
+            /**
+             * The text the guest attempted to display in the modal dialog.
+             */
+            messageText: string;
+            /**
+             * An interface that can be used to respond to the guest's modal request.
+             */
+            dialog: DialogController;
+        }
+
+        /**
+         * String indicating the reason for the exit.
+         */
+        type ExitEventReason =
+            'normal' |
+            'abnormal' |
+            'crash' |
+            'kill';
+
+        /**
+         * Fired when the process rendering the guest web content has exited.
+         */
         interface ExitEvent extends Event {
-            /**
-             * @description Chrome's internal ID of the process that exited.
-             * @type {number}
-             * @memberof ExitEvent
-             */
-            processID: number;
-            /**
-             * @description String indicating the reason for the exit.
-             * @type {string}
-             * @memberof ExitEvent
-             */
-            reason: 'normal' | 'abnormal' | 'crash' | 'kill';
-        }
-
-        /** Description of a declarative rule for handling events. */
-        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[];
+            /** Chrome's internal ID of the process that exited. */
+            processID: chrome.integer;
+            /** String indicating the reason for the exit. */
+            reason: ExitEventReason;
         }
 
         /**
-         * @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
+         * Fired when new find results are available for an active find request.
+         * This might happen multiple times for a single find request as matches are found.
          */
-        interface InjectDetails {
+        interface FindUpdateEvent extends Event {
             /**
-             * @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
+             * The string that is being searched for in the page.
              */
-            code?: string,
+            searchText: string;
             /**
-             * @description JavaScript or CSS file to inject.
-             * @type {string}
-             * @memberof InjectDetails
+             * The number of matches found for searchText on the page so far.
              */
-            file?: string
+            numberOfMatches: chrome.integer;
+            /**
+             * The ordinal number of the current active match,
+             * if it has been found. This will be 0 until then.
+             */
+            activeMatchOrdinal: chrome.integer;
+            /**
+             * Describes a rectangle around the active match,
+             * if it has been found, in screen coordinates.
+             */
+            selectionRect: SelectionRect;
+            /**
+             * Indicates whether the find request was canceled.
+             */
+            canceled: boolean;
+            /**
+             * Indicates that all find requests have completed
+             * and that no more findupdate events will be fired
+             * until more find requests are made.
+             */
+            finalUpdate: string;
         }
 
-        interface WebViewElementEventMap {
-            'close': Event,
-            'consolemessage': IConsolemessage,
-            'contentload': Event,
-            'dialog': IDialog,
-            'exit': IExit,
-            'findupdate': IFindupdate,
-            'loadabort': ILoadabort,
-            'loadcommit': ILoadcommit,
-            'loadredirect': ILoadredirect,
-            'loadstart': ILoadstart,
-            'loadstop': Event,
-            'newwindow': INewwindow,
-            'permissionrequest': IPermissionrequest,
-            'responsive': IResponsive,
-            'sizechanged': ISizechanged,
-            'unresponsive': IUnresponsive,
-            'zoomchange': IZoomchange,
-        }
-
-
         /**
+         * Fired when a top-level load has aborted without committing.
+         * An error message will be printed to the console unless the event is default-prevented.
+         *
+         * **Note:**
+         * When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event,
+         * even if all committed loads since the last loadstop event (if any) were aborted.
+         *
+         * **Note:**
+         * When the load of either an about URL or a JavaScript URL is aborted,
+         * loadabort will be fired and then the webview will be navigated to 'about:blank'.
+         */
+        interface LoadAbortEvent extends Event {
+            /** Requested URL. */
+            url: string;
+            /** Whether the load was top-level or in a subframe. */
+            isTopLevel: boolean;
+            /**
+             * Unique chrome.integer ID for the type of abort.
+             * Note that this ID is `not` guaranteed to
+             * remain backwards compatible between releases.
+             * You must not act based upon this specific chrome.integer.
+             */
+            code: chrome.integer;
+            /**
+             * String indicating what type of abort occurred.
+             * This string is `not` guaranteed to remain
+             * backwards compatible between releases.
+             * You must not parse and act based upon its content.
+             * It is also possible that, in some cases,
+             * an error not listed here could be reported.
+             */
+            reason: LoadAbortReason;
+        }
+
+        /**
+         * Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does not include asynchronous resource loads.
+         */
+        interface LoadCommitEvent extends Event {
+            /** The URL that committed. */
+            url: string;
+            /** Whether the load is top-level or in a subframe. */
+            isTopLevel: boolean;
+        }
+
+        /**
+         * Fired when a top-level load request has redirected to a different URL.
+         */
+        interface LoadRedirectEvent {
+            /** The requested URL before the redirect. */
+            oldUrl: string;
+            /** The new URL after the redirect. */
+            newUrl: string;
+            /** Whether or not the redirect happened at top-level or in a subframe. */
+            isTopLevel: boolean;
+        }
+        /**
+         * Fired when a load has begun.
+         */
+        interface LoadStartEvent extends Event {
+            /** Requested URL. */
+            url: string;
+            /** Whether the load is top-level or in a subframe. */
+            isTopLevel: boolean;
+        }
+
+        /**
+         * Fired when all frame-level loads in a guest page (including all its subframes) have completed.
+         * This includes navigation within the current document as well as subframe document-level loads,
+         * but does not include asynchronous resource loads.
+         *
+         * This event fires every time the number of document-level loads transitions from one (or more) to zero.
+         * For example, if a page that has already finished loading (i.e., loadstop already fired once) creates
+         * a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes.
+         *
+         * This pattern is commonly observed on pages that load ads.
+         *
+         * **Note:**
+         * When a committed load is aborted, a loadstop event will eventually follow a loadabort event,
+         * even if all committed loads since the last loadstop event (if any) were aborted.
+         */
+        interface LoadStopEvent extends Event { }
+
+        /** The requested disposition of the new window. */
+        type WindowOpenDisposition =
+            'ignore' |
+            'save_to_disk' |
+            'current_tab' |
+            'new_background_tab' |
+            'new_foreground_tab' |
+            'new_window' |
+            'new_popup';
+
+        /**
+         * Fired when the guest page attempts to open a new browser window.
+         * The following example code will create and navigate a new webview in the embedder for each requested new window:
+         * @example
+         * webview.addEventListener('newwindow', function(e) {
+         *  const newWebview = document.createElement('webview');
+         *  document.body.appendChild(newWebview);
+         *  e.window.attach(newWebview);
+         * });
+         */
+        interface NewWindowEvent extends Event {
+            /**
+             * An interface that can be used to either attach the requested
+             * target page to an existing webview element or explicitly
+             * discard the request.
+             **/
+            window: NewWindow;
+
+            /** The target URL requested for the new window. */
+            targetUrl: string;
+
+            /** The initial width requested for the new window. */
+            initialWidth: chrome.integer;
+
+            /** The initial height requested for the new window. */
+            initialHeight: chrome.integer;
+
+            /** The requested name of the new window. */
+            name: string;
+
+            /** The requested disposition of the new window. */
+            windowOpenDisposition: WindowOpenDisposition;
+        }
+
+        type RequestedPermission =
+            'media' |
+            'geolocation' |
+            'pointerLock' |
+            'download' |
+            'loadplugin' |
+            'filesystem' |
+            'fullscreen';
+
+        /**
+         * @requires `Permissions:` `audioCapture` and/or `videoCapture`
          * @description
-         * @export
-         * @interface HTMLWebViewElement
-         * @extends {Element}
+         *
+         * Fired when the guest page needs to request special permission from the embedder.
+         *
+         * The following example code will grant the guest page access to the `webkitGetUserMedia` API.
+         * Note that an app using this example code must itself specify `audioCapture` and/or `videoCapture`
+         * manifest permissions:
+         *
+         * @example
+         * webview.addEventListener('permissionrequest', (e) => { if (e.permission === 'media') e.request.allow(); });
          */
-        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;
+        interface PermissionRequestEvent extends Event {
+            /** The type of permission being requested. */
+            permission: RequestedPermission;
+            /** An object which holds details of the requested permission.*/
+            request: PermissionRequestHandler;
         }
 
-        /**Options that determine what data should be cleared by clearData. */
-        interface ClearDataOptions {
-
-            /**
-            * @description Clear 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?: number;
+        /**
+         * Fired when the process rendering the guest web content has become responsive again
+         * after being unresponsive.
+         *
+         * The following example code will fade the `webview` element in or out as it becomes
+         * responsive or unresponsive:
+         *
+         * @example
+         * webview.style.webkitTransition = 'opacity 250ms';
+         * webview.addEventListener('unresponsive', () => {
+         *     webview.style.opacity = '0.5';
+         * });
+         * webview.addEventListener('responsive', () => {
+         *     webview.style.opacity = '1';
+         * });
+         */
+        interface ResponsiveEvent extends Event {
+            /** Chrome's internal ID of the process that became responsive. */
+            processID: chrome.integer;
         }
-        /**A set of data types. Missing properties are interpreted as false. */
-        interface ClearDataTypeSet {
 
-            /**
-            * @description Websites' appcaches.
-             */
-            appcache?: boolean
-
-            /**
-            * @description Since Chrome 43. The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
-             */
-            cache?: boolean
-
-            /**
-            * @description The partition's cookies.
-             */
-            cookies?: boolean
-
-            /**
-            * @description The partition's session cookies.
-             */
-            sessionCookies?: boolean
-
-            /**
-            * @description The partition's persistent cookies.
-             */
-            persistentCookies?: boolean
-
-            /**
-            * @description Websites' filesystems.
-             */
-            fileSystems?: boolean
-
-            /**
-            * @description Websites' IndexedDB data.
-             */
-            indexedDB?: boolean
-
-            /**
-            * @description Websites' local storage data.
-             */
-            localStorage?: boolean
-
-            /**
-            * @description Websites' WebSQL data.
-             */
-            webSQL?: boolean
+        /**
+         * Fired when the embedded web content has been resized via autosize.
+         * Only fires if autosize is enabled.
+         */
+        interface SizeChangedEvent extends Event {
+            /** Old width of embedded web content. */
+            oldWidth: chrome.integer;
+            /** Old height of embedded web content. */
+            oldHeight: chrome.integer;
+            /** New width of embedded web content. */
+            newWidth: chrome.integer;
+            /** New height of embedded web content. */
+            newHeight: chrome.integer;
         }
+
         /**
-        * The different contexts a menu can appear in. Specifying 'all' is equivalent to the combination of all other contexts.
-        * Enum values:
-        * "all"
-        * "page"
-        * "frame"
-        * "selection"
-        * "link"
-        * "editable"
-        * "image"
-        * "video"
-        * "audio" */
-        export type ContextType = "all" | "page" | "frame" | "selection" | "link" | "editable" | "image" | "video" | "audio";
-        /**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 {
-
-            /**
-            * @description JavaScript or CSS code to inject.   Warning:  Be careful using the 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.
-             */
-            code?: string
-
-            /**
-            * @description JavaScript or CSS file to inject.
-             */
-            file?: string
+         * Fired when the process rendering the guest web content has become unresponsive.
+         * This event will be generated once with a matching responsive event if the guest begins to respond again.
+         */
+        interface UnresponsiveEvent extends Event {
+            /** Chrome's internal ID of the process that has become unresponsive. */
+            processID: chrome.integer;
         }
-        /**The type of injection item: code or a set of files. */
-        interface InjectionItems {
 
-            /**
-            * @description JavaScript code or CSS to be injected into matching pages.
-             */
-            code?: string
-
-            /**
-            * @description The list of JavaScript or CSS files to be injected into matching pages. These are injected in the order they appear in this array.
-             */
-            files?: any[]
-        }
-        /**Details of the content script to inject. Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details. */
-        interface ContentScriptDetails {
-
-            /**
-            * @description The name of the content script to inject.
-             */
-            name: string
-
-            /**
-            * @description Specifies which pages this content script will be injected into.
-             */
-            matches: any[]
-
-            /**
-            * @description Excludes pages that this content script would otherwise be injected into.
-             */
-            exclude_matches?: any[]
-
-            /**
-            * @description Whether to insert the content script on about:blank and about:srcdoc. Content scripts will only be injected on pages when their inherit URL is matched by one of the declared patterns in the matches field. The inherit URL is the URL of the document that created the frame or window. Content scripts cannot be inserted in sandboxed frames.
-             */
-            match_about_blank?: boolean
-
-            /**
-            * @description The CSS code or a list of CSS files to be injected into matching pages. These are injected in the order they appear, before any DOM is constructed or displayed for the page.
-             */
-            css?: InjectionItems
-
-            /**
-            * @description The JavaScript code or a list of JavaScript files to be injected into matching pages. These are injected in the order they appear.
-             */
-            js?: InjectionItems
-
-            /**
-            * @description The soonest that the JavaScript or CSS will be injected into the tab. Defaults to "document_idle".
-             */
-            run_at?: chrome.extensionTypes.RunAt;
-
-            /**
-            * @description If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page. By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
-             */
-            all_frames?: boolean;
-
-            /**
-            * @description Applied after matches to include only those URLs that also match this glob. Intended to emulate the @include Greasemonkey keyword.
-             */
-            include_globs?: string[];
-
-            /**
-            * @description Applied after matches to exclude URLs that match this glob. Intended to emulate the @exclude Greasemonkey keyword.
-             */
-            exclude_globs?: string[];
-        }
-        /**@todo Add documentation */
-        interface ContextMenuCreateProperties {
-
-            /**
-            * @description The type of menu item. Defaults to 'normal' if not specified.
-             */
-            type?: chrome.contextMenus.ItemType
-
-            /**
-            * @description The unique ID to assign to this item. Mandatory for event pages. Cannot be the same as another ID for this extension.
-             */
-            id?: string
-
-            /**
-            * @description The text to be displayed in the item; this is <em>required</em> 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
-
-            /**
-            * @description 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
-
-            /**
-            * @description List of contexts this menu item will appear in. Defaults to ['page'] if not specified.
-             */
-            contexts?: any[]
-
-            /**
-            * @description A function that will be called back when the menu item is clicked.
-            * @param {any} [object Object]
-             */
-            onclick?: (info: any) => void
-
-            /**
-            * @description The ID of a parent menu item; this makes the item a child of a previously added item.
-             */
-            parentId?: number | string
-
-            /**
-            * @description 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 <a href='match_patterns'>Match Patterns</a>.
-             */
-            documentUrlPatterns?: any[]
-
-            /**
-            * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-             */
-            targetUrlPatterns?: any[]
-
-            /**
-            * @description Whether this context menu item is enabled or disabled. Defaults to true.
-             */
-            enabled?: boolean
-        }
-        /**@todo Add documentation */
-        interface ContextMenuUpdateProperties {
-
-            /**
-            * @description The type of menu item.
-             */
-            type?: chrome.webview.ContextType;
-
-            /**
-            * @description The text to be displayed in the item
-             */
-            title?: string
-
-            /**
-            * @description The 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
-
-            /**
-            * @description List of contexts this menu item will appear in.
-             */
-            contexts?: any[]
-
-            /**
-            * @description A function that will be called back when the menu item is clicked.
-            * @param {any} [object Object]
-             */
-            onclick?: (info: any) => void
-
-            /**
-            * @description The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
-             */
-            parentId?: number | string
-
-            /**
-            * @description 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 <a href='match_patterns'>Match Patterns</a>.
-             */
-            documentUrlPatterns?: any[]
-
-            /**
-            * @description Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
-             */
-            targetUrlPatterns?: any[]
-
-            /**
-            * @description Whether this context menu item is enabled or disabled.
-             */
-            enabled?: boolean
-        }
-        interface ContextMenus {
-
-            /**
-            * @description 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 chrome.runtime.lastError).
-            * @param {object} createProperties The properties used to create the item
-            * @param {any} [object Object]
-             */
-            create(createProperties: object, callback?: () => void): void;
-
-            /**
-            * @description Updates a previously created context menu item.
-            * @param {any} id The ID of the item to update.
-            * @param {object} updateProperties The properties to update. Accepts the same values as the create function.
-            * @param {any} [object Object]
-             */
-            update(id: number | string, updateProperties: object, callback?: () => void): void;
-
-            /**
-            * @description Removes a context menu item.
-            * @param {any} menuItemId The ID of the context menu item to remove.
-            * @param {any} [object Object]
-             */
-            remove(menuItemId: number | string, callback?: () => void): void;
-
-            /**
-            * @description Removes all context menu items added to this webview.
-            * @param {any} [object Object]
-             */
-            removeAll(callback?: () => void): void;
-
-
-            /**
-            * @description Fired before showing a context menu on this webview. Can be used to disable this context menu by calling event.preventDefault().
-             */
-            onShow: chrome.events.Event<chrome.webview.IOnShowEvent>;
-
-        }
-        interface IOnShowEvent {
-            /**
-             * @description Call this to prevent showing the context menu.
-             * @memberof IOnShowEvent
-             */
-            preventDefault: () => void;
-        }
-        interface ContentWindow {
-
-            /**
-            * @description <p>Posts a message to the embedded web content as long as the embedded content is displaying a page from the target origin. This method is available once the page has completed loading. Listen for the <a href="#event-contentload">contentload</a> event and then call the method.</p><p>The guest will be able to send replies to the embedder by posting message to event.source on the message event it receives.</p><p>This API is identical to the <a href="https://developer.mozilla.org/en-US/docs/DOM/window.postMessage">HTML5 postMessage API</a> for communication between web pages. The embedder may listen for replies by adding a message event listener to its own frame.</p>
-            * @param {any} message Message object to send to the guest.
-            * @param {string} targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
-             */
-            postMessage(message: any, targetOrigin: string): void;
-
-        }
-        interface DialogController {
-
-            /**
-            * @description Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
-            * @param {string} response The response string to provide to the guest when accepting a prompt dialog.
-             */
-            ok(response?: string): void;
-
-            /**
-            * @description Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog.
-             */
-            cancel(): void;
-
-        }
-        /**Contains all of the results of the find request. */
-        interface FindCallbackResults {
-
-            /**
-            * @description The number of times searchText was matched on the page.
-             */
-            numberOfMatches: number
-
-            /**
-            * @description The ordinal number of the current match.
-             */
-            activeMatchOrdinal: number
-
-            /**
-            * @description Describes a rectangle around the active match in screen coordinates.
-             */
-            selectionRect: SelectionRect
-
-            /**
-            * @description Indicates whether this find request was canceled.
-             */
-            canceled: boolean
-        }
-        /**Options for the find request. */
-        interface FindOptions {
-
-            /**
-            * @description Flag to find matches in reverse order. The default value is false.
-             */
-            backward?: boolean
-
-            /**
-            * @description Flag to match with case-sensitivity. The default value is false.
-             */
-            matchCase?: boolean
-        }
-        interface NewWindow {
-
-            /**
-            * @description Attach the requested target page to an existing webview element.
-            * @param {object} webview The webview element to which the target page should be attached.
-             */
-            attach(webview: object): void;
-
-            /**
-            * @description Cancel the new window request.
-             */
-            discard(): void;
-
-        }
-        interface MediaPermissionRequest {
-
-            /**
-            * @description Allow the permission request.
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request. This is the default behavior if allow is not called.
-             */
-            deny(): void;
-
-        }
-        interface GeolocationPermissionRequest {
-
-            /**
-            * @description Allow the permission request.
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request. This is the default behavior if allow is not called.
-             */
-            deny(): void;
-
-        }
-        interface PointerLockPermissionRequest {
-
-            /**
-            * @description Allow the permission request.
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request. This is the default behavior if allow is not called.
-             */
-            deny(): void;
-
-        }
-        interface DownloadPermissionRequest {
-
-            /**
-            * @description Allow the permission request.
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request. This is the default behavior if allow is not called.
-             */
-            deny(): void;
-
-        }
-        interface FileSystemPermissionRequest {
-
-            /**
-            * @description Allow the permission request.
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request.
-             */
-            deny(): void;
-
-        }
-        interface FullscreenPermissionRequest {
-
-            /**
-            * @description Allow the permission request.
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request.
-             */
-            deny(): void;
-
-        }
-        interface LoadPluginPermissionRequest {
-
-            /**
-            * @description Allow the permission request. This is the default behavior if deny is not called..
-             */
-            allow(): void;
-
-            /**
-            * @description Deny the permission request.
-             */
-            deny(): void;
-
-        }
-        /**<p>Describes a rectangle in screen coordinates.</p><p>The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle, but the coordinate (left + width, top) is not.</p> */
-        interface SelectionRect {
-
-            /**
-            * @description Distance from the left edge of the screen to the left edge of the rectangle.
-             */
-            left: number
-
-            /**
-            * @description Distance from the top edge of the screen to the top edge of the rectangle.
-             */
-            top: number
-
-            /**
-            * @description Width of the rectangle.
-             */
-            width: number
-
-            /**
-            * @description Height of the rectangle.
-             */
-            height: number
-        }
-        /**Interface which provides access to webRequest events on the guest page. See the <a href="http://developer.chrome.com/extensions/webRequest">chrome.webRequest</a> extensions API for details on webRequest life cycle and related concepts.<p>To illustrate how usage differs from the extensions webRequest API, consider the following example code which blocks any guest requests for URLs which match *://www.evil.com/*:</p><pre>webview.request.onBeforeRequest.addListener(
-          function(details) { return {cancel: true}; },
-          {urls: ["*://www.evil.com/*"]},
-          ["blocking"]);</pre><p>Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events. See <a href="http://developer.chrome.com/extensions/declarativeWebRequest.html">declarativeWebRequest</a> for API details.</p>Note that conditions and actions for declarative webview webRequests should be instantiated from their chrome.webViewRequest.* counterparts. The following example code declaratively blocks all requests to "example.com" on the webview myWebview:</p><pre>var rule = {
-          conditions: [
-            new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
-          ],
-          actions: [ new chrome.webViewRequest.CancelRequest() ]
-        };
-        myWebview.request.onRequest.addRules([rule]);</pre> */
-        interface WebRequestEventInterface {
-        }
-        /**
-        * Defines the how zooming is handled in the webview.
-        * Enum values:
-        * "per-origin"
-        * * Zoom changes will persist in the zoomed page's origin, i.e. all other webviews in the same partition that are 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.
-        * "per-view"
-        * * Zoom changes only take effect in this webview, and zoom changes in other webviews will not affect the zooming of this webview. Also, per-view zoom changes are reset on navigation; navigating a webview will always load pages with their per-origin zoom factors (within the scope of the partition).
-        * "disabled"
-        * * Disables all zooming in the webview. The content will revert to the default zoom level, and all attempted zoom changes will be ignored. */
-        export type ZoomMode = "per-origin" | "per-view" | "disabled";
-
-        /**
-        * @description Queries audio state.
-        * @param {any} [object Object]
-         */
-        export function getAudioState(callback: (audible: boolean) => void): void;
-
-        /**
-        * @description Sets audio mute state of the webview.
-        * @param {boolean} mute Mute audio value
-         */
-        export function setAudioMuted(mute: boolean): void;
-
-        /**
-        * @description Queries whether audio is muted.
-        * @param {any} [object Object]
-         */
-        export function isAudioMuted(callback: (muted: boolean) => void): void;
-
-        /**
-         * @description Captures the visible region of the webview.
-         * @param {(dataUrl: string) => void} callback A data URL which encodes an image of the visible area of the captured tab. May be assigned to the 'src' property of an HTML Image element for display.
-         */
-        export function captureVisibleRegion(callback: (dataUrl: string) => void): void;
-        /**
-         * @description Captures the visible region of the webview.
-         * @param {*} options
-         * @param {(dataUrl: string) => void} callback
-         */
-        export function captureVisibleRegion(options: chrome.extensionTypes.ImageDetails, callback: (dataUrl: string) => void): void;
-
-        /**
-        * @description <p>Adds content script injection rules to the webview. When the webview navigates to a page matching one or more rules, the associated scripts will be injected. You can programmatically add rules or update existing rules.</p><p>The following example adds two rules to the webview: 'myRule' and 'anotherRule'.</p><pre>webview.addContentScripts([
-          {
-            name: 'myRule',
-            matches: ['http://www.foo.com/*'],
-            css: { files: ['mystyles.css'] },
-            js: { files: ['jquery.js', 'myscript.js'] },
-            run_at: 'document_start'
-          },
-          {
-            name: 'anotherRule',
-            matches: ['http://www.bar.com/*'],
-            js: { code: "document.body.style.backgroundColor = 'red';" },
-            run_at: 'document_end'
-          }]);
-         ...
-
-        // Navigates webview.
-        webview.src = 'http://www.foo.com';</pre><p>You can defer addContentScripts call until you needs to inject scripts.</p><p>The following example shows how to overwrite an existing rule.</p><pre>webview.addContentScripts([{
-            name: 'rule',
-            matches: ['http://www.foo.com/*'],
-            js: { files: ['scriptA.js'] },
-            run_at: 'document_start'}]);
-
-        // Do something.
-        webview.src = 'http://www.foo.com/*';
-         ...
-        // Overwrite 'rule' defined before.
-        webview.addContentScripts([{
-            name: 'rule',
-            matches: ['http://www.bar.com/*'],
-            js: { files: ['scriptB.js'] },
-            run_at: 'document_end'}]);</pre><p>If webview has been naviagted to the origin (e.g., foo.com) and calls webview.addContentScripts to add 'myRule', you need to wait for next navigation to make the scripts injected. If you want immediate injection, executeScript will do the right thing.</p><p>Rules are preserved even if the guest process crashes or is killed or even if the webview is reparented.</p><p>Refer to the <a href='/extensions/content_scripts'>content scripts</a> documentation for more details.</p>
-        * @param {ContentScriptDetails[]} contentScriptList Details of the content scripts to add.
-         */
-        export function addContentScripts(contentScriptList: ContentScriptDetails[]): void;
-
-        /**
-        * @description Navigates backward one history entry if possible. Equivalent to go(-1).
-        * @param {(success: boolean) => void} [callback] Called after the navigation has either failed or completed successfully. Success parameter indicates whether the navigation was successful.
-         */
-        export function back(callback?: (success: boolean) => void): void;
-
-        /**
-        * @description Indicates whether or not it is possible to navigate backward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-         */
-        export function canGoBack(): void;
-
-        /**
-        * @description Indicates whether or not it is possible to navigate forward through history. The state of this function is cached, and updated before each loadcommit, so the best place to call it is on loadcommit.
-         */
-        export function canGoForward(): void;
-
-        /**
-        * @description <p>Clears browsing data for the webview partition.</p>
-        * @param {any} options Options determining which data to clear.
-        * @param {any} types The types of data to be cleared.
-        * @param {any} [object Object]
-         */
-        export function clearData(options: ClearDataOptions, types: ClearDataTypeSet, callback?: () => void): void;
-
-        /**
-        * @description <p>Injects JavaScript code into the guest page.</p><p>The following sample code uses script injection to set the guest page's background color to red:</p><pre>webview.executeScript({ code: "document.body.style.backgroundColor = 'red'" });</pre>
-        * @param {any} details Details of the script to run.
-        * @param {any} [object Object]
-         */
-        export function executeScript(details: InjectDetails, callback?: (result?: any[]) => void): void;
-
-        /**
-        * @description Initiates a find-in-page request.
-        * @param {string} searchText The string to find in the page.
-        * @param {any} options Options for the find request.
-        * @param {any} [object Object]
-         */
-        export function find(searchText: string, options?: FindOptions, callback?: (results?: any) => void): void;
-
-        /**
-        * @description Navigates forward one history entry if possible. Equivalent to go(1).
-        * @param {any} [object Object]
-         */
-        export function forward(callback?: (success: boolean) => void): void;
-
-        /**
-        * @description Returns Chrome's internal process ID for the guest web page's current process, allowing embedders to know how many guests would be affected by terminating the process. Two guests will share a process only if they belong to the same app and have the same <a href="#partition">storage partition ID</a>. The call is synchronous and returns the embedder's cached notion of the current process ID. The process ID isn't the same as the operating system's process ID.
-         */
-        export function getProcessId(): void;
-
-        /**
-        * @description Returns the user agent string used by the webview for guest page requests.
-         */
-        export function getUserAgent(): void;
-
-        /**
-        * @description Gets the current zoom factor.
-        * @param {any} [object Object]
-         */
-        export function getZoom(callback: (zoomFactor: number) => void): void;
-
-        /**
-        * @description Gets the current zoom mode.
-        * @param {any} [object Object]
-         */
-        export function getZoomMode(callback: (ZoomMode: any) => void): void;
-
-        /**
-        * @description Navigates to a history entry using a history index relative to the current navigation. If the requested navigation is impossible, this method has no effect.
-        * @param {number} relativeIndex Relative history index to which the webview should be navigated. For example, a value of 2 will navigate forward 2 history entries if possible; a value of -3 will navigate backward 3 entries.
-        * @param {any} [object Object]
-         */
-        export function go(relativeIndex: number, callback?: (success: boolean) => void): void;
-
-        /**
-        * @description Injects CSS into the guest page.
-        * @param {any} details Details of the CSS to insert.
-        * @param {any} [object Object]
-         */
-        export function insertCSS(details: InjectDetails, callback?: () => void): void;
-
-        /**
-        * @description Indicates whether or not the webview's user agent string has been overridden by $(ref:webviewTag.setUserAgentOverride).
-         */
-        export function isUserAgentOverridden(): void;
-
-        /**
-        * @description Prints the contents of the webview. This is equivalent to calling scripted print function from the webview itself.
-         */
-        export function print(): void;
-
-        /**
-        * @description Reloads the current top-level page.
-         */
-        export function reload(): void;
-
-        /**
-        * @description <p>Removes content scripts from a webview.</p><p>The following example removes "myRule" which was added before.</p><pre>webview.removeContentScripts(['myRule']);</pre><p>You can remove all the rules by calling:</p><pre>webview.removeContentScripts();</pre>
-        * @param {any[]} scriptNameList A list of names of content scripts that will be removed. If the list is empty, all the content scripts added to the webview will be removed.
-         */
-        export function removeContentScripts(scriptNameList?: any[]): void;
-
-        /**
-        * @description Override the user agent string used by the webview for guest page requests.
-        * @param {string} userAgent The user agent string to use.
-         */
-        export function setUserAgentOverride(userAgent: string): void;
-
-        /**
-        * @description Changes the zoom factor of the page. The scope and persistence of this change are determined by the webview's current zoom mode (see $(ref:webviewTag.ZoomMode)).
-        * @param {number} zoomFactor The new zoom factor.
-        * @param {any} [object Object]
-         */
-        export function setZoom(zoomFactor: number, callback?: () => void): void;
-
-        /**
-        * @description Sets the zoom mode of the webview.
-        * @param {any} ZoomMode Defines how zooming is handled in the webview.
-        * @param {any} [object Object]
-         */
-        export function setZoomMode(ZoomMode: ZoomMode, callback?: () => void): void;
-
-        /**
-        * @description Stops loading the current webview navigation if in progress.
-         */
-        export function stop(): void;
-
-        /**
-        * @description Ends the current find session (clearing all highlighting) and cancels all find requests in progress.
-        * @param {string} action Determines what to do with the active match after the find session has ended. clear will clear the highlighting over the active match; keep will keep the active match highlighted; activate will keep the active match highlighted and simulate a user click on that match. The default action is keep.
-         */
-        export function stopFinding(action?: string): void;
-
-        /**
-        * @description Loads a data URL with a specified base URL used for relative links. Optionally, a virtual URL can be provided to be shown to the user instead of the data URL.
-        * @param {string} dataUrl The data URL to load.
-        * @param {string} baseUrl The base URL that will be used for relative links.
-        * @param {string} virtualUrl The URL that will be displayed to the user (in the address bar).
-         */
-        export function loadDataWithBaseUrl(dataUrl: string, baseUrl: string, virtualUrl?: string): void;
-
-        /**
-        * @description Forcibly kills the guest web page's renderer process. This may affect multiple webview tags in the current app if they share the same process, but it will not affect webview tags in other apps.
-         */
-        export function terminate(): void;
-
-        /**
-        * @description Fired when the guest window attempts to close itself.<p>The following example code navigates the webview to about:blank when the guest attempts to close itself.</p><pre>webview.addEventListener('close', function() {
-          webview.src = 'about:blank';
-        });</pre>
-         */
-
-        export function close(event: chrome.events.Event<Event>): void;
-
-        /**
-        * @description Fired when the guest window logs a console message.<p>The following example code forwards all log messages to the embedder's console without regard for log level or other properties.</p><pre>webview.addEventListener('consolemessage', function(e) {
-          console.log('Guest page logged a message: ', e.message);
-        });</pre>
-        * @param {any} [object Object]
-         */
-
-        export var consolemessage: chrome.events.Event<IConsolemessage>;
-
-        /**
-        * @description Fired when the guest window fires a load event, i.e., when a new document is loaded. This does <em>not</em> include page navigation within the current document or asynchronous resource loads. <p>The following example code modifies the default font size of the guest's body element after the page loads:</p><pre>webview.addEventListener('contentload', function() {
-          webview.executeScript({ code: 'document.body.style.fontSize = "42px"' });
-        });</pre>
-         */
-
-        export var contentload: (event: chrome.events.Event<Event>) => void;
-
-        /**
-        * @description Fired when the guest window attempts to open a modal dialog via window.alert, window.confirm, or window.prompt.<p>Handling this event will block the guest process until each event listener returns or the dialog object becomes unreachable (if preventDefault() was called.)</p><p>The default behavior is to cancel the dialog.</p>
-        * @param {any} [object Object]
-         */
-
-        export var dialog: chrome.events.Event<IDialog>;
-
-        /**
-        * @description Fired when the process rendering the guest web content has exited.<p>The following example code will show a farewell message whenever the guest page crashes:</p><pre>webview.addEventListener('exit', function(e) {
-          if (e.reason === 'crash') {
-            webview.src = 'data:text/plain,Goodbye, world!';
-          }
-        });</pre>
-        * @param {any} [object Object]
-         */
-
-        export var exit: chrome.events.Event<IExit>;
-
-        /**
-        * @description Fired when new find results are available for an active find request. This might happen multiple times for a single find request as matches are found.
-        * @param {any} [object Object]
-         */
-
-        export var findupdate: chrome.events.Event<IFindupdate>;
-
-        /**
-        * @description Fired when a top-level load has aborted without committing. An error message will be printed to the console unless the event is default-prevented. <p class="note"><strong>Note:</strong> When a resource load is aborted, a loadabort event will eventually be followed by a loadstop event, even if all committed loads since the last loadstop event (if any) were aborted.</p><p class="note"><strong>Note:</strong> When the load of either an about URL or a JavaScript URL is aborted, loadabort will be fired and then the webview will be navigated to 'about:blank'.</p>
-        * @param {any} [object Object]
-         */
-
-        export var loadabort: chrome.events.Event<ILoadabort>;
-
-        /**
-        * @description Fired when a load has committed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads.
-        * @param {any} [object Object]
-         */
-
-        export var loadcommit: chrome.events.Event<chrome.webview.ILoadcommit>;
-
-        /**
-        * @description Fired when a top-level load request has redirected to a different URL.
-        * @param {any} [object Object]
-         */
-
-        export var loadredirect: chrome.events.Event<chrome.webview.ILoadredirect>;
-
-        /**
-        * @description Fired when a load has begun.
-        * @param {any} [object Object]
-         */
-
-        export var loadstart: chrome.events.Event<chrome.webview.ILoadstart>;
-
-        /**
-        * @description Fired when all frame-level loads in a guest page (including all its subframes) have completed. This includes navigation within the current document as well as subframe document-level loads, but does <em>not</em> include asynchronous resource loads. This event fires every time the number of document-level loads transitions from one (or more) to zero. For example, if a page that has already finished loading (i.e., loadstop already fired once) creates a new iframe which loads a page, then a second loadstop will fire when the iframe page load completes. This pattern is commonly observed on pages that load ads. <p class="note"><strong>Note:</strong> When a committed load is aborted, a loadstop event will eventually follow a loadabort event, even if all committed loads since the last loadstop event (if any) were aborted.</p>
-         */
-
-        export function loadstop(event: chrome.events.Event<Event>): void;
-
-        /**
-        * @description Fired when the guest page attempts to open a new browser window.<p>The following example code will create and navigate a new webview in the embedder for each requested new window:</p><pre>webview.addEventListener('newwindow', function(e) {
-          var newWebview = document.createElement('webview');
-          document.body.appendChild(newWebview);
-          e.window.attach(newWebview);
-        });</pre>
-        * @param {any} [object Object]
-         */
-
-        export var newwindow: chrome.events.Event<INewwindow>;
-
-        /**
-        * @description Fired when the guest page needs to request special permission from the embedder.<p>The following example code will grant the guest page access to the webkitGetUserMedia API. Note that an app using this example code must itself specify audioCapture and/or videoCapture manifest permissions:</p><pre>webview.addEventListener('permissionrequest', function(e) {
-          if (e.permission === 'media') {
-            e.request.allow();
-          }
-        });</pre>
-        * @param {any} [object Object]
-         */
-
-        export var permissionrequest: chrome.events.Event<IPermissionrequest>;
-
-        /**
-        * @description Fired when the process rendering the guest web content has become responsive again after being unresponsive.<p>The following example code will fade the webview element in or out as it becomes responsive or unresponsive:</p><pre>webview.style.webkitTransition = 'opacity 250ms';
-        webview.addEventListener('unresponsive', function() {
-          webview.style.opacity = '0.5';
-        });
-        webview.addEventListener('responsive', function() {
-          webview.style.opacity = '1';
-        });</pre>
-        * @param {any} [object Object]
-         */
-
-        export var responsive: chrome.events.Event<chrome.webview.IResponsive>;
-
-        /**
-        * @description Fired when the embedded web content has been resized via autosize. Only fires if autosize is enabled.
-        * @param {any} [object Object]
-         */
-
-        export var sizechanged: chrome.events.Event<chrome.webview.ISizechanged>;
-
-        /**
-        * @description Fired when the process rendering the guest web content has become unresponsive. This event will be generated once with a matching responsive event if the guest begins to respond again.
-        * @param {any} [object Object]
-         */
-
-        export var unresponsive: chrome.events.Event<chrome.webview.IUnresponsive>;
-
-        /**
-        * @description Fired when the page's zoom changes.
-        * @param {any} [object Object]
-         */
-
-        export var zoomchange: chrome.events.Event<chrome.webview.IZoomchange>;
-        /**IConsolemessage (Auto generated interface) */
-        interface IConsolemessage {
-
-            /**
-            * @description The severity level of the log message. Ranges from -1 to 2. LOG_VERBOSE (console.debug) = -1, LOG_INFO (console.log, console.info) = 0, LOG_WARNING (console.warn) = 1, LOG_ERROR (console.error) = 2.
-             */
-            level: number
-
-            /**
-            * @description The logged message contents.
-             */
-            message: string
-
-            /**
-            * @description The line number of the message source.
-             */
-            line: number
-
-            /**
-            * @description A string identifying the resource which logged the message.
-             */
-            sourceId: string
-        }
-        /**IDialog (Auto generated interface) */
-        interface IDialog {
-
-            /**
-            * @description The type of modal dialog requested by the guest.
-             */
-            messageType: 'alert' | 'confirm' | 'prompt'
-
-            /**
-            * @description The text the guest attempted to display in the modal dialog.
-             */
-            messageText: string
-
-            /**
-            * @description An interface that can be used to respond to the guest's modal request.
-             */
-            dialog: DialogController
-        }
-        /**IExit (Auto generated interface) */
-        interface IExit {
-
-            /**
-            * @description Chrome's internal ID of the process that exited.
-             */
-            processID: number
-
-            /**
-            * @description String indicating the reason for the exit.
-             */
-            reason: 'normal' | 'abnormal' | 'crash' | 'kill'
-        }
-        /**IFindupdate (Auto generated interface) */
-        interface IFindupdate {
-
-            /**
-            * @description The string that is being searched for in the page.
-             */
-            searchText: string
-
-            /**
-            * @description The number of matches found for searchText on the page so far.
-             */
-            numberOfMatches: number
-
-            /**
-            * @description The ordinal number of the current active match, if it has been found. This will be 0 until then.
-             */
-            activeMatchOrdinal: number
-
-            /**
-            * @description Describes a rectangle around the active match, if it has been found, in screen coordinates.
-             */
-            selectionRect: SelectionRect
-
-            /**
-            * @description Indicates whether the find request was canceled.
-             */
-            canceled: boolean
-
-            /**
-            * @description Indicates that all find requests have completed and that no more findupdate events will be fired until more find requests are made.
-             */
-            finalUpdate: string
-        }
-        /**ILoadabort (Auto generated interface) */
-        interface ILoadabort {
-
-            /**
-            * @description Requested URL.
-             */
-            url: string
-
-            /**
-            * @description Whether the load was top-level or in a subframe.
-             */
-            isTopLevel: boolean
-
-            /**
-            * @description Unique integer ID for the type of abort. Note that this ID is <em>not</em> guaranteed to remain backwards compatible between releases. You must not act based upon this specific integer.
-             */
-            code: number
-
-            /**
-            * @description String indicating what type of abort occurred. This string is <em>not</em> guaranteed to remain backwards compatible between releases. You must not parse and act based upon its content. It is also possible that, in some cases, an error not listed here could be reported.
-             */
-            reason: 'ERR_ABORTED' | 'ERR_INVALID_URL' | 'ERR_DISALLOWED_URL_SCHEME' | 'ERR_BLOCKED_BY_CLIENT' | 'ERR_ADDRESS_UNREACHABLE' | 'ERR_EMPTY_RESPONSE' | 'ERR_FILE_NOT_FOUND' | 'ERR_UNKNOWN_URL_SCHEME'
-        }
-        /**ILoadcommit (Auto generated interface) */
-        interface ILoadcommit {
-
-            /**
-            * @description The URL that committed.
-             */
-            url: string
-
-            /**
-            * @description Whether the load is top-level or in a subframe.
-             */
-            isTopLevel: boolean
-        }
-        /**ILoadredirect (Auto generated interface) */
-        interface ILoadredirect {
-
-            /**
-            * @description The requested URL before the redirect.
-             */
-            oldUrl: string
-
-            /**
-            * @description The new URL after the redirect.
-             */
-            newUrl: string
-
-            /**
-            * @description Whether or not the redirect happened at top-level or in a subframe.
-             */
-            isTopLevel: boolean
-        }
-        /**ILoadstart (Auto generated interface) */
-        interface ILoadstart {
-
-            /**
-            * @description Requested URL.
-             */
-            url: string
-
-            /**
-            * @description Whether the load is top-level or in a subframe.
-             */
-            isTopLevel: boolean
-        }
-        /**INewwindow (Auto generated interface) */
-        interface INewwindow {
-
-            /**
-            * @description An interface that can be used to either attach the requested target page to an existing webview element or explicitly discard the request.
-             */
-            window: NewWindow
-
-            /**
-            * @description The target URL requested for the new window.
-             */
-            targetUrl: string
-
-            /**
-            * @description The initial width requested for the new window.
-             */
-            initialWidth: number
-
-            /**
-            * @description The initial height requested for the new window.
-             */
-            initialHeight: number
-
-            /**
-            * @description The requested name of the new window.
-             */
-            name: string
-
-            /**
-            * @description The requested disposition of the new window.
-             */
-            windowOpenDisposition: 'ignore' | 'save_to_disk' | 'current_tab' | 'new_background_tab' | 'new_foreground_tab' | 'new_window' | 'new_popup'
-        }
-        /**IPermissionrequest (Auto generated interface) */
-        interface IPermissionrequest {
-
-            /**
-            * @description The type of permission being requested.
-             */
-            permission: 'media' | 'geolocation' | 'pointerLock' | 'download' | 'loadplugin' | 'filesystem' | 'fullscreen'
-
-            /**
-            * @description An object which holds details of the requested permission. Depending on the type of permission requested, this may be a $(ref:webviewTag.MediaPermissionRequest), $(ref:webviewTag.GeolocationPermissionRequest), $(ref:webviewTag.PointerLockPermissionRequest), $(ref:webviewTag.DownloadPermissionRequest), $(ref:webviewTag.LoadPluginPermissionRequest), or $(ref:webviewTag.FullscreenPermissionRequest).
-             */
-            request: object
-        }
-        /**IResponsive (Auto generated interface) */
-        interface IResponsive {
-
-            /**
-            * @description Chrome's internal ID of the process that became responsive.
-             */
-            processID: number
-        }
-        /**ISizechanged (Auto generated interface) */
-        interface ISizechanged {
-
-            /**
-            * @description Old width of embedded web content.
-             */
-            oldWidth: number
-
-            /**
-            * @description Old height of embedded web content.
-             */
-            oldHeight: number
-
-            /**
-            * @description New width of embedded web content.
-             */
-            newWidth: number
-
-            /**
-            * @description New height of embedded web content.
-             */
-            newHeight: number
-        }
-        /**IUnresponsive (Auto generated interface) */
-        interface IUnresponsive {
-
-            /**
-            * @description Chrome's internal ID of the process that has become unresponsive.
-             */
-            processID: number
-        }
-        /**IZoomchange (Auto generated interface) */
-        interface IZoomchange {
-
-            /**
-            * @description The page's previous zoom factor.
-             */
-            oldZoomFactor: number
-
-            /**
-            * @description The new zoom factor that the page was zoomed to.
-             */
-            newZoomFactor: number
+        /** Fired when the page's zoom changes. */
+        interface ZoomChangeEvent extends Event {
+            /** The page's previous zoom factor. */
+            oldzoomFactor: chrome.double;
+            /** The new zoom factor that the page was zoomed to. */
+            newzoomFactor: chrome.double;
         }
 
     }
 
+    /** Options that determine what data should be cleared by *clearData* */
+    interface ClearDataOptions {
+        /**
+         * Clear 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).
+         * @default 0
+         */
+        since?: chrome.integer;
+    }
+
+
+    /**
+     * 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 app to
+         * cross site scripting attacks.
+         * @see[More information]{@link https://en.wikipedia.org/wiki/Cross-site_scripting}
+         */
+        code?: string,
+        /**
+         * JavaScript or CSS file to inject.
+         */
+        file?: string
+    }
+
+    /**
+      * WebView element from html
+     */
+
+
+    /** A set of data types. Missing properties are interpreted as false. */
+    interface ClearDataTypeSet {
+        /** Websites' appcaches. */
+        appcache?: boolean;
+        /**
+         * The browser's cache. Note: when removing data, this clears the entire cache; it is not limited to the range you specify.
+         * @since Chrome 43.
+         */
+        cache?: boolean;
+        /** The partition's cookies. */
+        cookies?: boolean;
+        /** The partition's session cookies. */
+        sessionCookies?: boolean;
+        /** The partition's persistent cookies. */
+        persistentCookies?: boolean;
+        /** Websites' filesystems. */
+        fileSystems?: boolean;
+        /** Websites' IndexedDB data. */
+        indexedDB?: boolean;
+        /** Websites' local storage data. */
+        localStorage?: boolean;
+        /** Websites' WebSQL data. */
+        webSQL?: boolean;
+    }
+    /**
+    * The different contexts a menu can appear in.
+    * Specifying 'all' is equivalent to the combination of all other contexts.
+    **/
+    type ContextType =
+        'all' |
+        'page' |
+        'frame' |
+        'selection' |
+        'link' |
+        'editable' |
+        'image' |
+        'video' |
+        'audio';
+    /**
+     * 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 app to xss attacks.
+         */
+        code?: string;
+
+        /** JavaScript or CSS file to inject. */
+        file?: string;
+    }
+    /** The type of injection item: code or a set of files. */
+    interface InjectionItems {
+        /** JavaScript code or CSS to be injected into matching pages. */
+        code?: string;
+        /**
+         * The list of JavaScript or CSS files to be injected into matching pages.
+         * These are injected in the order they appear in this array.
+         */
+        files?: any[];
+    }
+    /** Details of the content script to inject. **/
+    interface ContentScriptDetails {
+        /** The name of the content script to inject. */
+        name: string;
+
+        /** Specifies which pages this content script will be injected into. */
+        matches: string[];
+
+        /** Excludes pages that this content script would otherwise be injected into. */
+        exclude_matches?: string[];
+
+        /** JavaScript code or CSS to be injected into matching pages. */
+        code?: string;
+
+        /**
+         * Whether to insert the content script on about:blank and about:srcdoc.
+         * Content scripts will only be injected on pages when their inherit URL
+         * is matched by one of the declared patterns in the matches field.
+         * The inherit URL is the URL of the document that created the frame or window.
+         * Content scripts cannot be inserted in sandboxed frames.
+         */
+        match_about_blank?: boolean;
+
+        /**
+         * The CSS code or a list of CSS files to be injected into matching pages.
+         * These are injected in the order they appear,
+         * before any DOM is constructed or displayed for the page.
+         */
+        css?: InjectionItems;
+
+        /**
+         * The JavaScript code or a list of JavaScript files to be injected into matching pages.
+         * These are injected in the order they appear.
+         */
+        js?: InjectionItems;
+
+        /**
+         * The soonest that the JavaScript or CSS will be injected into the tab.
+         * Defaults to 'document_idle'.
+         */
+        run_at?: chrome.extensionTypes.RunAt;
+
+        /**
+         * If all_frames is true, this implies that the JavaScript or CSS should be injected into all frames of current page.
+         * By default, all_frames is false and the JavaScript or CSS is only injected into the top frame.
+         * @default false
+         */
+        all_frames?: boolean;
+
+        /**
+         * Applied after matches to include only those URLs that also match this glob.
+         * Intended to emulate the @include Greasemonkey keyword.
+         */
+        include_globs?: string[];
+
+        /**
+         * Applied after matches to exclude URLs that match this glob.
+         * Intended to emulate the @exclude Greasemonkey keyword.
+         */
+        exclude_globs?: string[];
+    }
+    interface ContextMenuCreateProperties {
+
+        /**
+         * The type of menu item. Defaults to 'normal' if not specified.
+         */
+        type?: chrome.ToStringLiteral<typeof chrome.contextMenus.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;
+
+        /**
+         * 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?: any[];
+
+        /**
+         * A function that will be called back when the menu item is clicked.
+         */
+        onclick?: (info: any) => void
+
+        /**
+         * The ID of a parent menu item; this makes the item a child of a previously added item.
+         */
+        parentId?: chrome.integer | 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 <a href='match_patterns'>Match Patterns</a>.
+         */
+        documentUrlPatterns?: any[];
+
+        /**
+         * Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+         */
+        targetUrlPatterns?: any[];
+
+        /**
+         * Whether this context menu item is enabled or disabled. Defaults to true.
+         */
+        enabled?: boolean;
+    }
+    interface ContextMenuUpdateProperties {
+        /** The type of menu item. */
+        type?: WebView.ContextType;
+
+        /** The text to be displayed in the item */
+        title?: string;
+
+        /**
+         * The 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.
+         */
+        contexts?: any[];
+
+        /**
+         * A function that will be called back when the menu item is clicked.
+        * @param callback
+         */
+        onclick?: (info: any) => void;
+
+        /**
+         * The ID of a parent menu item; this makes the item a child of a previously added item. <em>Note:</em> You cannot change an item to be a child of one of its own descendants.
+         */
+        parentId?: chrome.integer | 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.)
+         */
+        documentUrlPatterns?: any[];
+
+        /**
+         * Similar to documentUrlPatterns, but lets you filter based on the src attribute of img/audio/video tags and the href of anchor tags.
+         */
+        targetUrlPatterns?: any[];
+
+        /**
+         * Whether this context menu item is enabled or disabled.
+         */
+        enabled?: boolean;
+    }
+    interface OnShowEvent {
+        /** Call this to prevent showing the context menu. */
+        preventDefault: () => void;
+    }
+    interface ContextMenus {
+        /**
+         * 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 chrome.runtime.lastError).
+         * @param createProperties The properties used to create the item
+         * @param [callback]
+         */
+        create(createProperties: object, callback?: () => void): void;
+
+        /**
+         * 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.
+         * @param [callback]
+         */
+        update(id: chrome.integer | string, updateProperties: object, callback?: () => void): void;
+
+        /**
+         * Removes a context menu item.
+         * @param menuItemId The ID of the context menu item to remove.
+         * @param [callback]
+         */
+        remove(menuItemId: chrome.integer | string, callback?: () => void): void;
+
+        /**
+         * Removes all context menu items added to this webview.
+         * @param [callback]
+         */
+        removeAll(callback?: () => void): void;
+
+        /**
+         * Fired before showing a context menu on this webview.
+         * Can be used to disable this context menu by calling event.preventDefault().
+         */
+        onShow: chrome.events.Event<(event: OnShowEvent) => void>;
+    }
+    /** Messaging handle to a guest window. */
+    interface ContentWindow {
+        /**
+         * Posts a message to the embedded web content as long as the embedded
+         * content is displaying a page from the target origin. This method is
+         * available once the page has completed loading. Listen for the
+         * contentload event and then call the method.
+         *
+         * The guest will be able to send replies to the embedder by posting message
+         * to event.source on the message event it receives.
+         *
+         * This API is identical to the HTML5 postMessage API for communication
+         * between web pages. The embedder may listen for replies by adding
+         * a message event listener to its own frame.
+         *
+         * @param message Message object to send to the guest.
+         * @param targetOrigin Specifies what the origin of the guest window must be for the event to be dispatched.
+         */
+        postMessage(message: any, targetOrigin: string): void;
+    }
+    /** Interface attached to dialog DOM events. */
+    interface DialogController {
+        /**
+         * Accept the dialog. Equivalent to clicking OK in an alert, confirm, or prompt dialog.
+         * @param response The response string to provide to the guest when accepting a prompt dialog.
+         */
+        ok(response?: string): void;
+        /** Reject the dialog. Equivalent to clicking Cancel in a confirm or prompt dialog. */
+        cancel(): void;
+    }
+    /** Contains all of the results of the find request. */
+    interface FindCallbackResults {
+        /** The number of times searchText was matched on the page. */
+        numberOfMatches: chrome.integer;
+        /** The ordinal number of the current match. */
+        activeMatchOrdinal: chrome.integer;
+        /** Describes a rectangle around the active match in screen coordinates. */
+        selectionRect: SelectionRect;
+        /** Indicates whether this find request was canceled. */
+        canceled: boolean;
+    }
+    interface FindOptions {
+        /**
+         * Flag to find matches in reverse order.
+         * @default false
+         */
+        backward?: boolean;
+        /**
+         * Flag to match with case-sensitivity.
+         * @default false
+         */
+        matchCase?: boolean;
+    }
+    interface NewWindow {
+        /**
+         * Attach the requested target page to an existing webview element.
+        * @param webview The webview element to which the target page should be attached.
+         */
+        attach(webview: HTMLWebViewElement): void;
+        /**
+         * Cancel the new window request.
+         */
+        discard(): void;
+    }
+    interface PermissionRequestHandler {
+        /** Allow the permission request. */
+        allow(): void;
+        /** Deny the permission request. This is the default behavior if allow is not called. */
+        deny(): void;
+    }
+    /**
+     * Describes a rectangle in screen coordinates.
+     * The containment semantics are array-like; that is, the coordinate (left, top) is considered to be contained by the rectangle,
+     * but the coordinate (left + width, top) is not.
+     **/
+    interface SelectionRect {
+        /** Distance from the left edge of the screen to the left edge of the rectangle. */
+        left: chrome.integer;
+        /** Distance from the top edge of the screen to the top edge of the rectangle. */
+        top: chrome.integer;
+        /** Width of the rectangle. */
+        width: chrome.integer;
+        /** Height of the rectangle. */
+        height: chrome.integer;
+    }
+
+    /** An HTTP Header, represented as an object containing a key and either a value or a binaryValue. */
+    interface HttpHeader {
+        name: string;
+        value?: string;
+        binaryValue?: ArrayBuffer;
+    }
+
+    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;
+        /** 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: chrome.integer;
+        /** ID of frame that wraps the frame which sent the request. Set to -1 if no parent frame exists. */
+        parentFrameId: chrome.integer;
+        /** The ID of the tab in which the request takes place. Set to -1 if the request isn't related to a tab. */
+        tabId: chrome.integer;
+        /**
+         * How the requested resource will be used.
+         */
+        type: chrome.webRequest.ResourceType;
+        /** The time when this signal is triggered, in milliseconds since the epoch. */
+        timeStamp: chrome.double;
+        /** The origin where the request was initiated. This does not change through redirects. If this is an opaque origin, the string 'null' will be used.
+         * @since Chrome 63.
+        */
+        initiator?: string;
+    }
+
+    interface WebRequestDetails extends ResourceRequest {
+        /** Standard HTTP method. */
+        method: string;
+    }
+
+    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 {
+        /**
+         * Contains the HTTP request body data. Only provided if extraInfoSpec contains 'requestBody'.
+         * @since Chrome 23.
+         */
+        requestBody: WebRequestBody;
+    }
+
+    /**
+     * Contains data uploaded in a URL request.
+     * @since Chrome 23.
+     */
+    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 {
+        /** Optional. Errors when obtaining request body data. */
+        error?: string;
+        /**
+         * Optional.
+         * 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?: { [key: string]: string[] };
+        /**
+         * Optional.
+         * 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[];
+    }
+
+    interface WebRequestFullDetails extends WebRequestHeadersDetails, WebRequestBodyDetails {
+    }
+
+    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;
+        /**
+         * Standard HTTP status code returned by the server.
+         * @since Chrome 43.
+         */
+        statusCode: chrome.integer;
+    }
+
+    interface WebResponseHeadersDetails extends WebResponseDetails {
+        /** Optional. The HTTP response headers that have been received with this response. */
+        responseHeaders?: HttpHeader[];
+        /** standard HTTP method i.e. GET, POST, PUT, etc. */
+        method: string;
+    }
+
+    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.
+         */
+        ip?: string;
+        /** Indicates if this response was fetched from disk cache. */
+        fromCache: boolean;
+    }
+
+    interface WebRedirectionResponseDetails extends WebResponseCacheDetails {
+        /** The new URL. */
+        redirectUrl: string;
+    }
+
+    /** An object describing filters to apply to webRequest events. */
+    interface RequestFilter {
+        /** Optional. */
+        tabId?: chrome.integer;
+        /**
+         * A list of request types. Requests that cannot match any of the types will be filtered out.
+         */
+        types?: chrome.webRequest.ResourceType[];
+        /** A list of URLs or URL patterns. Requests that cannot match any of the URLs will be filtered out. */
+        urls: string[];
+
+        /** Optional. */
+        windowId?: chrome.integer;
+    }
+
+    interface AuthCredentials {
+        username: string;
+        password: string;
+    }
+
+    /** 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 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?: HttpHeader[];
+        /**
+         * Only used as a response to the onAuthRequired event.
+         * If set, the request is made using the supplied credentials.
+         */
+        authCredentials?: AuthCredentials;
+        /**
+         * Only used as a response to the onBeforeSendHeaders event.
+         * If set, the request is made with these request headers instead.
+         */
+        requestHeaders?: HttpHeader[];
+    }
+
+    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. */
+        realm?: string;
+        /** The server requesting authentication. */
+        challenger: WebAuthChallenger;
+        /** True for Proxy-Authenticate, false for WWW-Authenticate. */
+        isProxy: boolean;
+    }
+
+    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> {
+        addListener(callback: (details: WebRequestHeadersDetails) => void, filter?: RequestFilter, opt_extraInfoSpec?: string[]): void;
+    }
+
+    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> { }
+
+    interface WebResponseCacheEvent extends _WebResponseHeadersEvent<WebResponseCacheDetails> { }
+
+    interface WebRedirectionResponseEvent extends _WebResponseHeadersEvent<WebRedirectionResponseDetails> { }
+
+    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> { }
+
+    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 WebAuthChallenger {
+        host: string;
+        port: chrome.integer;
+    }
+
+    /**
+     * Interface which provides access to webRequest events on the guest page.
+     * @see[chrome.webRequest]{@link http://developer.chrome.com/extensions/webRequest}
+     * extensions API for details on webRequest life cycle and related concepts.
+     *
+     * To illustrate how usage differs from the extensions webRequest API,
+     * consider the following example code which blocks any guest requests
+     * for URLs which match *://www.evil.com/*:
+     * @example
+     * webview.request.onBeforeRequest.addListener(
+     *   function(details) { return {cancel: true}; }, {urls: ['*://www.evil.com/*']}, ['blocking']);
+     * @description
+     * Additionally, this interface supports declarative webRequest rules through onRequest and onMessage events.
+     * @see[Docs]{@link http://developer.chrome.com/extensions/declarativeWebRequest.htmldeclarativeWebRequest}
+     * @description
+     * Note that conditions and actions for declarative webview webRequests should be instantiated
+     * from their chrome.webViewRequest.* counterparts. The following example code declaratively
+     * blocks all requests to 'example.com' on the webview myWebview:
+     * @example const rule = { conditions: [ new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } }) ], actions: [ new chrome.webViewRequest.CancelRequest() ] }; myWebview.request.onRequest.addRules([rule]);
+     **/
+    interface WebRequestEventInterface {
+        /** Fired when a request is about to occur. */
+        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.
+         */
+        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).
+         */
+        onSendHeaders: WebRequestHeadersEvent;
+        /** Fired when HTTP response headers of a request have been received. */
+        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.
+         */
+        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.
+         */
+        onResponseStarted: WebResponseCacheEvent;
+        /** Fired when a server-initiated redirect is about to occur. */
+        onBeforeRedirect: WebRedirectionResponseEvent;
+        /** Fired when a request is completed. */
+        onCompleted: WebResponseCacheEvent;
+        /** Fired when an error occurs. */
+        onErrorOccured: WebResponseErrorEvent;
+        /**
+         * Provides the Declarative Event API consisting of addRules, removeRules, and getRules.
+         * This interface supports declarative webRequest rules through
+         * **onRequest** and **onMessage** events.
+         * @see[See declarativeWebRequest for API details.]{@link http://developer.chrome.com/extensions/declarativeWebRequest.html}
+         */
+        onRequest: chrome.webViewRequest.OnRequestEvent;
+        /**
+         * This interface supports declarative webRequest rules through
+         * **onRequest** and **onMessage** events.
+         * @see[See declarativeWebRequest for API details.]{@link http://developer.chrome.com/extensions/declarativeWebRequest.html}
+         */
+        onMessage: chrome.webViewRequest.OnMessageEvent;
+    }
+    /**
+     * Defines the how zooming is handled in the webview.
+     * Enum values:
+     * 'per-origin'
+     *   > Zoom changes will persist in the zoomed page's origin,
+     *     i.e. all other webviews in the same partition that are
+     *     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.
+     * 'per-view'
+     *   > Zoom changes only take effect in this webview,
+     *     and zoom changes in other webviews will not affect
+     *     the zooming of this webview. Also, per-view zoom
+     *     changes are reset on navigation; navigating a webview
+     *     will always load pages with their per-origin zoom factors
+     *     (within the scope of the partition).
+     * 'disabled'
+     *   > Disables all zooming in the webview.
+     *     The content will revert to the default zoom level,
+     *     and all attempted zoom changes will be ignored.
+     **/
+    type ZoomMode =
+        'per-origin' |
+        'per-view' |
+        'disabled';
 }
 
-/////////////////////
-// EXPORT
-/////////////////////
-interface Window {
+declare interface Document {
+    createElement(element: 'webview'): HTMLWebViewElement;
+}
+
+declare interface Window {
+    WebView: typeof WebView;
+}
+
+declare const WebView: typeof HTMLWebViewElement;
+
+
+declare interface HTMLElementTagNameMap {
+    'webview': HTMLWebViewElement
+}
+
+
+/////////////////////////
+// WEB APIs & Warnings //
+/////////////////////////
+/**
+ * Only warnings since:
+ *  1. It's not possible as of now to override or remove something from *Window* or *Document*.
+ *  2. It may also cause other unforseen consequences if it's removed (and if it was possible).
+ * @see[Disallowed]
+ */
+/**
+ * Chrome app - Web APIs
+ * @see[Docs]{@link https://developer.chrome.com/apps/api_other}
+ */
+interface ChromeWindow {
+    ///
+    /// Disabled Web Features
+    /// https://developer.chrome.com/apps/app_deprecated
+    ///
+
+    /**
+     * ❗ alert is not available in packaged apps. ❗
+     * Work-around: Use a custom lightbox / popup.
+     */
+    alert(message?: any): void;
+    /**
+     * ❗ confirm is not available in packaged apps. ❗
+     * Work-around: Use a custom lightbox / popup.
+     */
+    confirm(message?: string): boolean;
+
+
+    /**
+     * ❗ window.localStorage is not available in packaged apps. Use chrome.storage.local instead. ❗
+     */
+    // localStorage: typeof localStorage;
+
+
+    /**
+     * ❗ window.location is not available in packaged apps. ❗
+     * Links open up with the system web browser.
+     */
+    location: Location;
+    /**
+     * ❗ window.history is not available in packaged apps. ❗
+     * Links open up with the system web browser.
+     */
+    readonly history: History;
+
+    ///
+    /// Other APIs
+    ///
+    AudioContext: typeof AudioContext;
+}
+
+interface Document {
+    /**
+     * ❗ document.cookie is not available in packaged apps. ❗
+     * Packaged app pages are not rendered on the server, so there is no need to use these.
+     */
+    cookie: string;
+    /**
+     * ❗ document.close is not available in packaged apps. ❗
+     */
+    close(): void;
+    /**
+     * ❗ document.open is not available in packaged apps. ❗
+     */
+    open(url?: string, name?: string, features?: string, replace?: boolean): Document;
+    /**
+     * ❗ document.write is not available in packaged apps. ❗
+     */
+    write(...content: string[]): void;
+}
+
+/**
+ * ❗ iframes are not available in packaged apps, use webviews instead. ❗
+ */
+interface HTMLIFrameElement { }
+
+/**
+ * ❗ Modal dialogs are not available in packaged apps, use lightbox/popup instead. ❗
+ */
+interface HTMLDialogElement { }
+
+interface HTMLElement {
+    /**
+     * @requires Permissions: 'app.window.fullscreen', 'app.window.fullscreen.overrideEsc'
+     * @description
+     * In Chrome Apps, fullscreen is entered without prompting the user or providing
+     * exit instructions. HTML5 fullscreen requires the app.window.fullscreen permission
+     * in the manifest. In normal webpages, the browser intercepts the ESC key to exit
+     * pointer lock ensuring a consistent escape method for users. That is also the
+     * behavior in Chrome Apps unless the app.window.fullscreen.overrideEsc permission
+     * is used to enable the app to call preventDefault on keydown and keyup events.
+     *
+     * Then to exit fullscreen, the document exposes a method for that:
+     * @example
+     * document.webkitExitFullscreen();
+     */
+    webkitRequestFullscreen(): void;
+}
+
+interface HTMLElement {
+    /**
+     * ❗ Unprefixed version are not available as of Chrome 68, in Chrome apps ❗
+     */
+    requestFullscreen(): void;
+    /**
+     * ❗ Unprefixed version are not available as of Chrome 68, in Chrome apps ❗
+     */
+    exitrequestFullscreen(): void;
+    /**
+     * @requires Permissions: 'pointerLock'
+     */
+    requestPointerLock(): void;
+    /**
+     * @requires Permissions: 'pointerLock'
+     */
+    exitPointerLock(): void;
+}
+
+interface Navigator {
+    /**
+     * If you provide the 'geolocation' in your Chrome app it will allow the app to
+     * use the proposed HTML5 geolocation API without prompting the user for permission.
+     * @see Permissions: 'geolocation'
+     */
+    readonly geolocation: Geolocation;
+}
+
+////////////
+// GLOBAL //
+////////////
+declare interface Window extends ChromeWindow {
     chrome: typeof chrome;
 }
diff --git a/types/chrome-apps/test/index.ts b/types/chrome-apps/test/index.ts
index f976fc57b4..93864d107b 100644
--- a/types/chrome-apps/test/index.ts
+++ b/types/chrome-apps/test/index.ts
@@ -1,8 +1,444 @@
-import runtime = chrome.app.runtime;
-import cwindow = chrome.app.window;
+/**
+ * Some of the tests are based on examples found in the Chromium documentation or source.
+ * @author Nikolai Ommundsen (niikoo {@link https://github.com/niikoo})
+ * @author The Chromium Authors
+ */
 
-var createOptions: cwindow.CreateWindowOptions = {
-    id: "My Window",
+const runtime = chrome.app.runtime;
+const cwindow = chrome.app.window;
+
+// #region FORBIDDEN APIs
+// Will give warnings via IntelliSense.
+
+localStorage.getItem('hei');
+document.open();
+document.close();
+document.write();
+document.write('forbidden');
+
+// #endregion
+
+// #region Web APIs
+
+///
+/// HTML5 Audio
+///
+
+var audioCtx = new window.AudioContext(); // define audio context
+// Webkit/blink browsers need prefix, Safari won't work without window.
+
+var drawVisual; // requestAnimationFrame
+
+var analyser = audioCtx.createAnalyser();
+var distortion = audioCtx.createWaveShaper();
+var gainNode = audioCtx.createGain();
+var biquadFilter = audioCtx.createBiquadFilter();
+
+navigator.getUserMedia({
+    audio: true
+},
+    (stream) => {
+        const source = audioCtx.createMediaStreamSource(stream);
+        source.connect(analyser);
+        analyser.connect(distortion);
+        distortion.connect(biquadFilter);
+        biquadFilter.connect(gainNode);
+        gainNode.connect(audioCtx.destination); // connecting the different audio graph nodes together
+    },
+    (error) => {
+        console.error(error);
+    }
+);
+
+
+///
+/// HTML5 Canvas
+///
+
+const canvas = document.createElement('canvas');
+const ctx = canvas.getContext('2d');
+if (ctx) {
+    ctx.fillStyle = 'green';
+    ctx.fillRect(10, 10, 100, 100);
+}
+
+///
+/// Fullscreen API
+///
+
+const elem = document.createElement('video');
+if (elem.requestFullscreen) {
+    elem.requestFullscreen();
+}
+
+///
+/// Geolocation API
+///
+
+window.onload = () => {
+    navigator.geolocation.getCurrentPosition((position) => {
+        console.log('lat', position.coords.latitude, 'lon', position.coords.longitude);
+    });
+};
+
+// #endregion
+
+// #region Manifest
+
+const ManifestJSONTest1: chrome.runtime.Manifest = {
+    manifest_version: 2,
+    name: 'Sample Appview Embedded - modified for manifest test',
+    description: '__MSG_appDescription__',
+    version: '2.1',
+    minimum_chrome_version: '33.0.1715.0',
+    default_locale: 'en',
+    file_browser_handlers: [
+        {
+            id: 'ReadOnly',
+            default_title: 'Test read-only action.',
+            default_icon: 'icon.png',
+            file_filters: ['filesystem:*.xul'],
+            file_access: ['read']
+        },
+        {
+            id: 'ReadWrite',
+            default_title: 'Test read-write action',
+            default_icon: 'icon.png',
+            file_filters: ['filesystem:*.tiff']
+        }
+    ],
+    file_system_provider_capabilities: {
+        configurable: false,
+        multiple_mounts: true,
+        source: 'network'
+    },
+    platforms: [{
+        nacl_arch: 'x86-64',
+        sub_package_path: '_platform_specific/x86-64/'
+    }, {
+        nacl_arch: 'x86-32',
+        sub_package_path: '_platform_specific/x86-32/'
+    }, {
+        nacl_arch: 'arm',
+        sub_package_path: '_platform_specific/arm/'
+    }],
+    permissions: [
+        'https://www.google-analytics.com/*',
+        'http://localhost:8080/*',
+        'https://www.googleapis.com/*',
+        'identity',
+        'terminalPrivate',
+        'app.window.alpha', 'app.window.shape',
+        'experimental',
+        'webview',
+        'alarms',
+        'storage',
+        'videoCapture',
+        'browser',
+        'clipboardWrite',
+        'usb',
+        'metricsPrivate', 'networkingPrivate',
+        'bluetooth',
+        'unlimitedStorage',
+        {
+            fileSystem: ['write', 'retainEntries', 'directory']
+        },
+        'clipboardRead',
+        'desktopCapture',
+        'clipboardWrite',
+        'pointerLock',
+        '<all_urls>',
+        'mdns',
+        'gcm',
+        'power',
+        'cookies', 'tabs',
+        'http://*/*',
+        'https://*/*',
+        'file:///*/*',
+        'idle',
+        'app.window.fullscreen',
+        'app.window.fullscreen.overrideEsc',
+        'contextMenus',
+        'browser',
+        'system.cpu', 'system.memory', 'system.storage', 'system.display',
+        'notifications',
+        '*://*/*',
+        'accessibilityFeatures.read', 'accessibilityFeatures.modify',
+        'tts',
+        'fullscreen', 'alwaysOnTopWindows',
+        'geolocation',
+        'audioCapture',
+        'hid',
+        'metricsPrivate', 'nativeMessaging',
+        'management', 'developerPrivate', 'activityLogPrivate',
+        {
+            mediaGalleries: ['read', 'allAutoDetected']
+        },
+        {
+            socket: [
+                'udp-send-to::*',
+                'tcp-connect',
+                'udp-send-to',
+                'udp-bind',
+                'udp-multicast-membership',
+                'resolve-host',
+                'network-state',
+                'tcp-connect',
+                'resolve-host',
+                'network-state'
+            ]
+        },
+        'tts',
+        'syncFileSystem',
+        {
+            usbDevices: [{
+                vendorId: 10168,
+                productId: 493
+            }]
+        }
+    ],
+    storage: {
+        managed_schema: 'schema.json'
+    },
+    author: {
+        name: 'Your name here',
+        email: 'Email@yourmail.com'
+    },
+    automation: {
+        desktop: true
+    },
+    update_url: 'https://clients2.google.com/service/update2/crx',
+    version_name: '10.0.12-stable',
+    kiosk_enabled: true,
+    offline_enabled: true,
+    bluetooth: {
+        low_energy: true,
+        uuids: ['180f']
+    },
+    url_handlers: {
+        wiki_article: {
+            title: 'View Wikipedia article',
+            matches: [
+                '*://en.wikipedia.org/wiki/*'
+            ]
+        },
+        mobile_wiki_article: {
+            title: 'View Wikipedia article',
+            matches: [
+                '*://en.m.wikipedia.org/wiki/*'
+            ]
+        },
+        google_drive_open: {
+            matches: ['https://api.chromerestclient.com/GDrive.html*'],
+            title: 'Open from Google Drive'
+        }
+    },
+    sockets: {
+        tcpServer: { listen: '' },
+        tcp: { connect: ['*:5555', '*:5559'] },
+        udp: { bind: ['*:5554', '*:5556'], multicastMembership: '', send: ['*:5554', '*:5556'] }
+    },
+    optional_permissions: [
+        'debugger',
+        'htt',
+        'mdns',
+        'app.window.fullscreen',
+        'mdns',
+        'debugger'
+    ],
+    webview: {
+        partitions: [
+            {
+                'name': 'blockable',
+                'accessible_resources': ['browser.css', 'blocked.css', 'blocked.html']
+            },
+            {
+                'accessible_resources': ['player.*', 'migrate.*'],
+                'name': 'player'
+            }
+        ]
+    },
+    externally_connectable: {
+        id: ['*'],
+        matches: ['https://gauth.fusionlabs.net/*']
+    },
+    commands: {
+        cmdNew: {
+            suggested_key: {
+                default: 'Ctrl+Shift+1'
+            },
+            global: true,
+            description: 'Create new window'
+        },
+        'new-team-login': {
+            suggested_key: {
+                default: 'Ctrl+Shift+Y',
+                mac: 'Command+Shift+Y'
+            },
+            description: 'New team login'
+        },
+        reload: {
+            suggested_key: {
+                default: 'Ctrl+R'
+            },
+            description: 'Reload webview'
+        }
+    },
+    sandbox: {
+        content_security_policy: `sandbox allow-scripts allow-popups; script-src 'self' 'unsafe-inline' 'unsafe - eval' https://ssl.google-analytics.com/ga.js;`,
+        pages: ['sandbox.html']
+    },
+    file_handlers: {
+        image: {
+            types: [
+                'image/png',
+                'image/jpeg'
+            ]
+        },
+        text: {
+            types: [
+                'text/*'
+            ],
+            extensions: ['abap', 'as', 'ada', 'adb', 'ads', 'cfm', 'cfc', 'cfml', 'cs', 'css', 'dt', 'd', 'dot', 'ejs', 'erl', 'frt', 'ftl', 'html', 'erb', 'ini', 'jk', 'java', 'class', 'js', 'gs', 'javascript', 'jsoniq', 'json', 'jsp', 'jsx', 'lisp', 'ls', 'logic', 'make', 'makefile', 'mak', 'md', 'mysql', 'nix', 'm', 'php', 'inc', 'text', 'txt', 'log', 'ps1', 'rd', 'sass', 'scad', 'scala', 'scm', 'ss', 'scss', 'sh', 'sjs', 'sql', 'svg', 'tcl', 'tex', 'ts', 'vbs', 'vbe', 'vm', 'v', 'vhd', 'vhdl', 'xml', 'rss', 'atom', 'xhtml', 'yaml', 'yml', 'mcc']
+        },
+        any: {
+            extensions: [
+                'skrifa',
+                'skrup'
+            ]
+        },
+        cab: {
+            extensions: ['cab'],
+            types: ['application/x-cab']
+        },
+        cpio: {
+            extensions: ['cpio', 'cpio.gz', 'cpio.bz2', 'cpio.xz'],
+            types: ['application/x-cpio']
+        },
+        deb: {
+            extensions: ['deb'],
+            types: ['application/vnd.debian.binary-package']
+        },
+        gzip: {
+            extensions: ['gz'],
+            types: ['application/x-gzip']
+        },
+        iso: {
+            extensions: ['iso'],
+            types: ['application/x-iso9660-image']
+        },
+        lha: {
+            extensions: ['lha', 'lzh'],
+            types: ['application/x-lha', 'application/x-lzh', 'application/x-lzh-compressed']
+        },
+        lz4: {
+            extensions: ['lz4'],
+            types: ['application/x-lz4']
+        },
+        lzip: {
+            extensions: ['lzip'],
+            types: ['application/x-lzip']
+        },
+        lzop: {
+            extensions: ['lzop'],
+            types: ['application/x-lzop']
+        },
+        pax: {
+            extensions: ['pax', 'pax.gz', 'pax.bz2', 'pax.xz'],
+            types: ['application/x-pax']
+        },
+        rpm: {
+            extensions: ['rpm'],
+            types: ['application/x-rpm', 'application/x-redhat-package-manager']
+        },
+        tar: {
+            extensions: ['gtar', 'tar', 'tgz', 'tbz2', 'txz', 'tz'],
+            types: ['application/x-tar', 'application/x-gtar', 'application/x-gtar-compressed']
+        },
+        xz: {
+            extensions: ['lzma', 'xz'],
+            types: ['application/x-lzma', 'application/x-xz']
+        },
+        zip: {
+            extensions: ['apk', 'crx', 'jar'],
+            types: ['application/java-archive', 'application/x-chrome-extension']
+        }
+    },
+    requirements: {
+        '3D': {
+            features: ['webgl']
+        }
+    },
+    display_in_launcher: false,
+    display_in_new_tab_page: false,
+    key: 'FIMaMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCDJB6ZGcGxtlr/34s+TKgi84QiP7DMekqOjSUS2ubmbhchlM6CN9gYdGQ1aBI3TBXG3YaAu+XyutFA8M8NLLWc4OOGByW123aaa1DP6p67g8a+Ids/gX6cNSRnRHiDZXAd44ATxoN4OZjZJk9iQ26RIUjwX07bzntlI+frwwKCk4WQIDAQAB',
+    oauth2: {
+        // client_id below is specifc to the application key. Follow the
+        // documentation to obtain one for your app.
+        client_id: '1111111222333.apps.googleusercontent.com',
+        scopes: ['https://www.googleapis.com/auth/plus.login']
+    },
+    app: {
+        background: {
+            scripts: ['angular.js', 'lodash.js', 'background.js']
+        }
+    },
+    icons: {
+        16: 'icon16.png',
+        48: 'icon48.png',
+        64: 'assets/icon-64x64.png',
+        128: 'icon128.png'
+    },
+    action_handlers: ['new_note']
+}
+
+// #endregion
+
+// #region chrome.alarms
+
+chrome.alarms.create('name1', {
+    delayInMinutes: 10
+});
+chrome.alarms.create('name2', {
+    delayInMinutes: 10,
+    periodInMinutes: 100
+});
+chrome.alarms.onAlarm.addListener((alarm) => {
+    if (alarm.name === 'name1') {
+        chrome.alarms.get('name1', (_alarm) => {
+            if (alarm === _alarm) {
+                chrome.alarms.getAll((alarms) => {
+                    chrome.alarms.clear('name2');
+                    chrome.alarms.clearAll();
+                })
+            }
+        })
+        return alarm.scheduledTime;
+    }
+});
+
+// #endregion
+
+// #region chrome.app.*
+
+// Test enums
+cwindow.WindowType.PANEL;
+cwindow.State.FULLSCREEN;
+
+chrome.app.runtime.onLaunched.addListener(function () {
+    chrome.app.window.create('index.html', {
+        'left': 10,
+        'top': 10,
+        'width': 400,
+        'height': 500,
+        'frame': 'none'
+    }, (win) => {
+        win.onClosed.addListener(() => { });
+    });
+});
+
+const createOptions: chrome.app.CreateWindowOptions = {
+    id: 'My Window',
     bounds: {
         left: 0,
         top: 0,
@@ -13,45 +449,443 @@ var createOptions: cwindow.CreateWindowOptions = {
 };
 
 //Create new window on app launch
-chrome.app.runtime.onLaunched.addListener(function (launchData: runtime.LaunchData) {
-    chrome.app.window.create('app/url', createOptions, function (created_window: cwindow.AppWindow) {
+chrome.app.runtime.onLaunched.addListener((launchData: chrome.app.runtime.LaunchData) => {
+    chrome.app.window.create('app/url', createOptions, (created_window: chrome.app.AppWindow) => {
         return;
     });
 });
 
-chrome.app.runtime.onRestarted.addListener(function () { return; });
+chrome.app.runtime.onRestarted.addListener(() => { return; });
 
 // retrieving windows
-var currentWindow: cwindow.AppWindow = chrome.app.window.current();
-var otherWindow: cwindow.AppWindow = chrome.app.window.get('some-string');
-var allWindows: cwindow.AppWindow[] = chrome.app.window.getAll();
+var currentWindow: chrome.app.AppWindow = chrome.app.window.current();
+var otherWindow: chrome.app.AppWindow = chrome.app.window.get('some-string');
+var allWindows: chrome.app.AppWindow[] = chrome.app.window.getAll();
 
 // listening to window events
-currentWindow.onBoundsChanged.addListener(function () { return; });
-currentWindow.onClosed.addListener(function () { return; });
-currentWindow.onFullscreened.addListener(function () { return; });
-currentWindow.onMaximized.addListener(function () { return; });
-currentWindow.onMinimized.addListener(function () { return; });
-currentWindow.onRestored.addListener(function () { return; });
+currentWindow.onBoundsChanged.addListener(() => { return; });
+currentWindow.onClosed.addListener(() => { return; });
+currentWindow.onFullscreened.addListener(() => { return; });
+currentWindow.onMaximized.addListener(() => { return; });
+currentWindow.onMinimized.addListener(() => { return; });
+currentWindow.onRestored.addListener(() => { return; });
 
 // check platform capabilities
 var visibleEverywhere: boolean = chrome.app.window.canSetVisibleOnAllWorkspaces();
 
-// FileSystem
+let serviceId: any = null;
+
+const runApp = () => {
+    var options: chrome.app.CreateWindowOptions = {
+        id: 'Bluetooth Sample App',
+        frame: 'none',
+        alphaEnabled: true, // Permission: 'app.window.alpha'
+        bounds: {
+            'width': 1024,
+            'height': 768
+        }
+    };
+
+    chrome.runtime.onMessage.addListener((request, sender, sendResponse) => {
+        if (request.serviceId) {
+            serviceId = request.serviceId;
+            console.log('Received registered service Id: ' + serviceId);
+        }
+    });
+
+    chrome.app.window.create('test.html', options, (theWindow) => {
+        // Test setShape as provided by the permission 'app.window.shape'
+        theWindow.setShape([{ left: 100, top: 50, width: 50, height: 100 }]);
+        theWindow.setShape([{ left: 100, top: 50, width: 50, height: 100 },
+        { left: 200, top: 100, width: 50, height: 50 }]);
+        theWindow.onClosed.addListener(() => {
+            if (serviceId) {
+                console.log('Unregistering service: ' + serviceId);
+                chrome.bluetoothLowEnergy.unregisterService(serviceId, (status) => {
+                    console.log('Unregister service status = ' + status);
+                });
+            }
+        });
+    });
+}
+
+chrome.app.runtime.onLaunched.addListener(runApp);
+chrome.app.runtime.onRestarted.addListener(runApp);
+
+// #endregion
+
+// #region chrome.audio
+
+chrome.audio.getDevices({}, (audioDeviceInfoList) => {
+    for (let audioObj of audioDeviceInfoList) {
+        console.log('ID: ' + audioObj.id);
+        console.log('Audio Stream Type: ' + audioObj.streamType);
+        console.log('Audio Device Name: ' + audioObj.deviceName);
+    }
+});
+
+chrome.app.runtime.onEmbedRequested.addListener((request) => {
+    if (request === undefined || request.data === undefined) {
+        return false;
+    }
+    if (typeof request.data === 'object') {
+        request.deny();
+    }
+});
+
+chrome.app.runtime.onLaunched.addListener(() => {
+    chrome.app.window.create('index.html', {
+        id: 'test',
+        innerBounds: {
+            width: 900,
+            height: 1280,
+        },
+    });
+});
+// #endregion
+
+// #region chrome.bluetooth*
+
+// BLUETOOTH
+// BLUETOOTH SOCKET
+// BLUETOOTH LE
+// Based on https://github.com/GoogleChrome/chrome-app-samples/blob/master/samples/ioio/main.js
+
+var kUUID = '00001101-0000-1000-8000-00805f9b34fb';
+var level = 1;
+var pin = 0;
+var buffer = new ArrayBuffer(4);
+var view = new Uint8Array(buffer);
+
+// Set the level of pin0 to level
+// constants taken from here:
+// https://github.com/ytai/ioio/wiki/
+view[2] = 4;
+view[3] = pin << 2 | level;
+level = (level == 0) ? 1 : 0;
+
+var connectToDevice = (result: chrome.bluetooth.Device[]) => {
+    if (chrome.runtime.lastError) {
+        console.log('Error searching for a device to connect to.');
+        return;
+    }
+    if (result.length == 0) {
+        console.log('No devices found to connect to.');
+        return;
+    }
+    for (const device of result) {
+        console.log('Connecting to device: ' + device.name + ' @ ' + device.address);
+        chrome.bluetoothSocket.create((socket) => {
+            chrome.bluetoothSocket.connect(
+                socket.socketId,
+                device.address, kUUID,
+                () => connectCallback(socket))
+        });
+    }
+};
+
+var connectCallback = (socket: chrome.sockets.CreateInfo) => {
+    if (socket) {
+        console.log('Connected!  Socket ID is: ' + socket.socketId + ' on service ');
+        // Set pin0 as output.
+        var buffer = new ArrayBuffer(2);
+        var view = new Uint8Array(buffer);
+        // constants taken from here:
+        // https://github.com/ytai/ioio/wiki/
+        view[0] = 3;
+        view[1] = pin << 2 | 2;
+        chrome.bluetoothSocket.send(socket.socketId, buffer,
+            (bytes) => {
+                if (chrome.runtime.lastError) {
+                    console.log('Write error: ' + chrome.runtime.lastError.message);
+                } else {
+                    console.log('wrote ' + bytes + ' bytes');
+                }
+            });
+    } else {
+        console.log('Failed to connect.');
+    }
+};
+
+
+chrome.bluetooth.getAdapterState((adapter) => {
+    console.log('Adapter ' + adapter.address + ': ' + adapter.name);
+});
+
+chrome.bluetooth.getDevices((devices) => {
+    for (const device of devices) {
+        console.log(device.address);
+    }
+});
+
+chrome.bluetooth.onDeviceAdded.addListener((device) => {
+    let uuid = '0000180d-0000-1000-8000-00805f9b34fb';
+    if (!device.uuids || device.uuids.indexOf(uuid) < 0)
+        return;
+
+    // The device has a service with the desired UUID.
+    chrome.bluetoothLowEnergy.connect(device.address, () => {
+        if (chrome.runtime.lastError) {
+            console.log('Failed to connect: ' + chrome.runtime.lastError.message);
+            return;
+        }
+        // Connected! Do stuff...
+    });
+});
+
+const uuid = '1105';
+
+chrome.bluetooth.getDevices((devices) => {
+    chrome.bluetoothSocket.create((createInfo) => {
+        chrome.bluetoothSocket.connect(createInfo.socketId,
+            devices[0].address, uuid, () => {
+                if (chrome.runtime.lastError) {
+                    console.log('Connection failed: ' + chrome.runtime.lastError.message);
+                } else {
+                    chrome.bluetoothSocket.send(createInfo.socketId, new ArrayBuffer(4096), (bytes_sent) => {
+                        if (chrome.runtime.lastError) {
+                            console.log('Send failed: ' + chrome.runtime.lastError.message);
+                        } else {
+                            console.log('Sent ' + bytes_sent + ' bytes')
+                        }
+                    });
+                }
+            });
+        chrome.bluetoothSocket.onReceive.addListener((receiveInfo) => {
+            if (receiveInfo.socketId != createInfo.socketId)
+                return;
+            // receiveInfo.data is an ArrayBuffer.
+        });
+    });
+});
+
+// #endregion
+
+// #region chrome.browser
+
+chrome.browser.openTab({ url: 'https://github.com' });
+chrome.browser.openTab({ url: 'https://github.com' }, () => { });
+
+// #endregion
+
+// #region chrome.certificateProvider
+
+const requestId = 555;
+chrome.certificateProvider.requestPin({ signRequestId: requestId }, (codeVal) => {
+    if (codeVal) {
+        return codeVal.userInput;
+    }
+});
+
+chrome.certificateProvider.stopPinRequest({ signRequestId: requestId }, () => {
+    if (chrome.runtime.lastError) {
+        console.error('Error:', chrome.runtime.lastError);
+    }
+});
+
+chrome.certificateProvider.onCertificatesRequested.addListener((certifictes, callback) => {
+    for (const cert of certifictes) {
+        if (cert.supportedHashes !== undefined && cert.certificate !== undefined) {
+            cert.supportedHashes.map(hash => {
+                return [hash, cert.certificate];
+            });
+        }
+    }
+});
+
+chrome.certificateProvider.onSignDigestRequested.addListener((signRequest, signCallback) => {
+    if (signRequest.hash == 'SHA1') {
+        signCallback(signRequest.certificate);
+    }
+});
+
+// #endregion
+
+// #region chrome.clipboard
+
+const copyTextData = (text: string) => {
+    var input = document.getElementById('copy_text') as HTMLInputElement || new HTMLInputElement();
+    input.value = text;
+    input.focus();
+    input.select();
+    if (document.execCommand('Copy'))
+        return true;
+}
+copyTextData('FooBar');
+copyTextData('GitHub');
+
+function setImageDataClipboard(
+    imageUrl: string,
+    imageType: chrome.clipboard.ImageType,
+    additionalItems?: chrome.clipboard.AdditionalItems) {
+    var oReq = new XMLHttpRequest();
+    oReq.open('GET', imageUrl, true);
+    oReq.responseType = 'arraybuffer';
+    oReq.onload = (oEvent) => {
+        var arrayBuffer = oReq.response;
+        if (arrayBuffer) {
+            if (additionalItems) {
+                chrome.clipboard.setImageData(arrayBuffer, imageType, additionalItems,
+                    () => {
+                        return;
+                    });
+            } else {
+                chrome.clipboard.setImageData(arrayBuffer, imageType);
+            }
+        } else {
+            console.error('Failed to load the image file');
+        }
+    };
+    oReq.send(undefined);
+}
+
+setImageDataClipboard('/icon1.png', 'png');
+setImageDataClipboard('/test.jpg', 'jpeg');
+setImageDataClipboard('/redirect_target.gif', 'jpeg');
+setImageDataClipboard('/redirect_target.jpg', 'jpeg', {
+    data: '<p>Lorem Ipsum...</p>',
+    type: 'textHtml'
+});
+
+// #endregion
+
+// #region chrome.contextMenus
+
+chrome.contextMenus.ACTION_MENU_TOP_LEVEL_LIMIT;
+
+chrome.contextMenus.onClicked.addListener((info) => {
+    const isChecked = info.checked;
+    if (!document.hasFocus() && isChecked) {
+        return;
+    }
+});
+
+// #endregion
+
+// #region chrome.desktopCapture
+
+chrome.desktopCapture.chooseDesktopMedia(['screen', 'window', 'tab'], () => { });
+chrome.desktopCapture.chooseDesktopMedia([chrome.desktopCapture.DesktopCaptureSourceType.AUDIO], () => { });
+
+// #endregion
+
+// #region chrome.dns
+
+chrome.dns.resolve('github.com', (info) => {
+    console.log([info.resultCode === 0, info.address]);
+});
+
+// #endregion
+
+// #region chrome.documentScan
+
+chrome.documentScan.scan({
+    maxImages: 100,
+    mimeTypes: ['image/jpeg']
+}, (results) => {
+    results.dataUrls.map(urlData => {
+        var scannedImage = document.createElement('img');
+        scannedImage.title = 'Mime type: ' + results.mimeType;
+        scannedImage.src = urlData;
+    });
+});
+
+// #endregion
+
+// #region chrome.enterprise.*
+// ENTERPRISE - DEVICE ATTRIBUTES
+
+const deviceAttr = chrome.enterprise.deviceAttributes;
+
+if (deviceAttr.getDirectoryDeviceId && deviceAttr.getDeviceAssetId) {
+    if (deviceAttr.getDeviceSerialNumber && deviceAttr.getDeviceAnnotatedLocation) {
+        console.log('API OK :)');
+    }
+}
+
+chrome.enterprise.deviceAttributes.getDirectoryDeviceId((deviceId) => {
+    return deviceId.substring(0, deviceId.length - 1);
+})
+chrome.enterprise.deviceAttributes.getDeviceSerialNumber((sn) => console.log(sn.trim()));
+chrome.enterprise.deviceAttributes.getDeviceAssetId((assetId) => console.log(assetId.toLowerCase()));
+chrome.enterprise.deviceAttributes.getDeviceAnnotatedLocation((loc) => loc.charAt(0));
+
+
+// ENTERPRISE - PLATFORM KEYS
+
+if (chrome.enterprise.platformKeys.getTokens) {
+    if (chrome.enterprise.platformKeys.importCertificate) {
+        if (chrome.enterprise.platformKeys.removeCertificate) {
+            console.log('API Present');
+        }
+    }
+}
+const tokenId = 'tokenid....';
+chrome.enterprise.platformKeys.importCertificate(tokenId, new ArrayBuffer(8), () => { });
+chrome.enterprise.platformKeys.getCertificates(tokenId, (certificates) => {
+    certificates.map((cert) => {
+        chrome.enterprise.platformKeys.removeCertificate(tokenId, cert, () => { });
+    });
+});
+chrome.enterprise.platformKeys.getTokens((tokens) => {
+    const algorithm = {
+        name: 'RSASSA-PKCS1-v1_5',
+        // RsaHashedKeyGenParams
+        modulusLength: 2048,
+        publicExponent:
+            new Uint8Array([0x01, 0x00, 0x01]),  // Equivalent to 65537
+        hash: {
+            name: 'SHA-1',
+        }
+    };
+    tokens.map(token => {
+        token.subtleCrypto.generateKey(algorithm, false, ['sign']).then((val) => {
+
+        })
+    });
+});
+
+// #endregion chrome.enterprise
+
+// #region chrome.Event
+
+const e = new chrome.Event(); // Used const instead of class to be able to return the interface
+e.addListener(() => { });
+
+// #endregion
+
+// #region chrome.fileBrowserHandler
+// File Browser Handle
+
+chrome.fileBrowserHandler.onExecute.addListener((id, details) => {
+    chrome.fileBrowserHandler.selectFile(
+        {
+            suggestedName: 'some_file_name.txt',
+            allowedFileExtensions: ['txt', 'html']
+        },
+        (result) => {
+            console.log(result.entry);
+        });
+});
+
+// #endregion
+
+// #region chrome.fileSystem
+// FILE SYSTEM
 // https://developer.chrome.com/apps/fileSystem
 
-function test_fileSystem(): void {
+((): void => {
     var accepts: chrome.fileSystem.AcceptOptions[] = [
-        { mimeTypes: ["text/*"], extensions: ['js', 'css', 'txt', 'html', 'xml', 'tsv', 'csv', 'rtf'] }
+        { mimeTypes: ['text/*'], extensions: ['js', 'css', 'txt', 'html', 'xml', 'tsv', 'csv', 'rtf'] }
     ];
     var chooseOption: chrome.fileSystem.ChooseEntryOptions = {
-        type: "openFile",
-        suggestedName: "foo.txt",
+        type: 'openFile',
+        suggestedName: 'foo.txt',
         accepts: accepts,
         acceptsAllTypes: false,
         acceptsMultiple: false
     };
-    chrome.fileSystem.chooseEntry(chooseOption, (entry: Entry) => {
+    chrome.fileSystem.chooseEntry(chooseOption, (entry) => {
         chrome.fileSystem.getDisplayPath(entry, (displayPath: string) => { });
 
         var retainedId = chrome.fileSystem.retainEntry(entry);
@@ -64,13 +898,451 @@ function test_fileSystem(): void {
         chrome.fileSystem.getWritableEntry(entry, (writableEntry: Entry) => { });
         chrome.fileSystem.isWritableEntry(entry, (isWritable: boolean) => { });
     });
+})();
+chrome.app.runtime.onLaunched.addListener(() => {
+    chrome.app.window.create('index.html', { width: 100, height: 100 },
+        win => {
+            var fs = win.contentWindow.chrome.fileSystem;
+            fs.chooseEntry({ type: 'saveFile' }, (entry) => {
+                fs.getWritableEntry(entry, (writableEntry) => {
+                    var id = fs.retainEntry(entry);
+                    chrome.storage.local.set({ id: id }, () => {
+                    });
+                });
+            });
+        });
+});
+
+// #endregion
+
+// #region chrome.gcm
+
+const gcmMessage = <chrome.gcm.OutgoingMessage>{};
+gcmMessage.data = {
+    /*goog: 'any', should not be allowed, and it is not :) */
+    test: true
+};
+const eventHandler = (message: chrome.gcm.IncomingMessage) => {
+    console.log('From: ', message.from, 'collapseKey:', message.collapseKey);
+    return message.data['google'];
+}
+chrome.gcm.onMessage.addListener(eventHandler);
+chrome.gcm.onMessage.removeListener(eventHandler);
+chrome.gcm.onMessagesDeleted.addListener(() => { });
+chrome.gcm.onSendError.addListener((error) => { console.error(error.detail, error.errorMessage, error.messageId); });
+
+// #endregion
+
+// #region chrome.hid
+
+chrome.hid.getDevices({}, () => { });
+chrome.hid.onDeviceAdded.addListener(() => { });
+chrome.hid.onDeviceRemoved.addListener(() => { });
+
+chrome.hid.getDevices({
+    filters: [
+        { vendorId: 5 }
+    ]
+}, (devices) => {
+    const productId = devices[0].productId;
+    chrome.hid.getUserSelectedDevices((selectedDevices) => {
+        const hmm = selectedDevices.productId == productId ? selectedDevices.vendorId : selectedDevices.maxFeatureReportSize;
+    });
+    chrome.hid.connect(devices[0].deviceId, (connectInfo) => {
+        if (!connectInfo) {
+            console.warn('Unable to connect to device.');
+        }
+        const connection = connectInfo.connectionId;
+    });
+    chrome.hid.getUserSelectedDevices({ 'multiple': false },
+        (devices) => {
+            if (chrome.runtime.lastError != undefined) {
+                console.warn('chrome.hid.getUserSelectedDevices error: ' +
+                    chrome.runtime.lastError.message);
+                return;
+            }
+        });
+});
+
+// #endregion
+
+// #region chrome.i18n
+
+chrome.i18n.getMessage('click_here', ['string1', 'string2']);
+
+// #endregion
+
+// #region chrome.identity
+
+chrome.identity.getAuthToken({ interactive: true }, (token) => {
+    if (chrome.runtime.lastError) {
+        return;
+    }
+    chrome.identity.removeCachedAuthToken({ token: token }, () => { });
+});
+
+// #endregion
+
+// #region chrome.idle
+
+chrome.idle.onStateChanged.addListener((newState) => {
+    if (newState === 'active') {
+        return true;
+    }
+});
+chrome.idle.queryState(60, (state) => {
+    return state === 'idle';
+});
+chrome.idle.setDetectionInterval(20);
+
+// #endregion
+
+// #region chrome.instanceID
+
+chrome.instanceID.getCreationTime((creationTime) => {
+    if (creationTime === 0) {
+        return true;
+    }
+});
+chrome.instanceID.getID((instanceId) => {
+    if (instanceId) {
+        chrome.instanceID.getCreationTime((creationTime) => {
+            if (creationTime !== 0) {
+                chrome.instanceID.getToken(
+                    { 'authorizedEntity': '1', 'scope': 'GCM', 'options': { 'foo': '1' } },
+                    (token) => {
+                        return token;
+                    });
+            }
+        })
+    }
+})
+
+// #endregion
+
+// #region chrome.management
+
+chrome.management.getSelf((result) => {
+    chrome.management.getPermissionWarningsByManifest(
+        JSON.stringify(chrome.runtime.getManifest()),
+        (warnings) => {
+            console.log(warnings.join('\r\n'));
+        });
+    if (result.isApp) {
+        return 'Of course!';
+    } else {
+        chrome.management.uninstallSelf({
+            showConfirmDialog: false
+        }, () => console.log('Goodbye'));
+    }
+});
+// #endregion
+
+// #region chrome.mdns
+chrome.mdns.onServiceList.addListener(
+    () => { },
+    { 'serviceType': 'definitelyTyped._tcp.local' });
+chrome.mdns.onServiceList.addListener(function (services) {
+    chrome.mdns.forceDiscovery(() => { return chrome.mdns.MAX_SERVICE_INSTANCES_PER_EVENT === 2048; });
+}, { 'serviceType': '_googlecast._tcp.local' });
+// #endregion
+
+// #region chrome.mediaGalleries
+
+chrome.fileSystem.getVolumeList((volumes) => {
+    chrome.fileSystem.requestFileSystem({
+        volumeId: volumes[0].volumeId
+    }, (fs) => {
+        const mData = chrome.mediaGalleries.getMediaFileSystemMetadata(fs);
+        chrome.mediaGalleries.addGalleryWatch(mData.galleryId, (result) => {
+            if (result.success) {
+                console.log('Media gallery id', result.galleryId);
+            }
+        });
+    });
+});
+
+// #endregion
+
+// #region chrome.networking.config
+
+const filter: chrome.networking.config.NetworkInfoFilterHexSSID = {
+    HexSSID: '11:11:11:11:11:00'
 }
 
-// Sockets
+chrome.networking.config.setNetworkFilter([filter], () => { });
+chrome.networking.config.finishAuthentication(filter.HexSSID || '', 'rejected');
+
+// #endregion
+
+// #region chrome.networking.onc
+
+const TLSFormatExample = {
+    NetworkConfigurations: <chrome.networking.onc.NetworkConfigProperties>
+        {
+            GUID: '{00f79111-51e0-e6e0-76b3b55450d80a1b}',
+            Name: 'MyTTLSNetwork',
+            Type: 'WiFi',
+            WiFi: {
+                AutoConnect: false,
+                EAP: {
+                    ClientCertPattern: {
+                        EnrollmentURI: [
+                            'http://fetch-my-certificate.com'
+                        ],
+                        IssuerCARef: [
+                            '{6ed8dce9-64c8-d568-d225d7e467e37828}'
+                        ]
+                    },
+                    'ClientCertType': 'Pattern',
+                    'Outer': 'EAP-TLS',
+                    'ServerCARef': '{6ed8dce9-64c8-d568-d225d7e467e37828}',
+                    'UseSystemCAs': true
+                },
+                'HiddenSSID': false,
+                'SSID': 'MyTTLSNetwork',
+                'Security': 'WPA-EAP'
+            }
+        }
+}
+
+chrome.networking.onc.getNetworks({ 'networkType': 'All' }, (networkList) => {
+    console.log('Length of Network list: ' + networkList.length);
+    for (let networkObj of networkList) {
+        console.log('GUID: ' + networkObj.GUID);
+        console.log('Connectable: ' + networkObj.Connectable);
+        if (networkObj.WiFi) {
+            // WiFi active :)
+            console.log('Wifi BSID: ' + networkObj.WiFi.BSSID);
+        }
+        chrome.networking.onc.setProperties(networkObj.GUID || '', {
+            WiFi: {
+                Passphrase: 'Can be set :) but not get?'
+            }
+        })
+        // Test that we can't get passphrase
+        chrome.networking.onc.getProperties(networkObj.GUID || '', (props) => {
+            const WiFiResult = props.WiFi;
+        });
+    }
+});
+
+// #endregion
+
+// #region chrome.notifications
+
+let nID: string;
+
+chrome.notifications.create({
+    type: 'basic',
+    iconUrl: 'stay_hydrated.png',
+    title: 'Time to Hydrate',
+    message: 'Everyday I\'m Guzzlin\'!',
+    buttons: [
+        { title: 'Keep it Flowing.' }
+    ],
+    priority: 0
+}, (notificationId) => {
+    nID = notificationId;
+    chrome.notifications.update(nID, {
+        title: 'Updated title'
+    });
+    chrome.notifications.onButtonClicked.addListener((_id, buttonIndex) => {
+        if (buttonIndex === 0) {
+            chrome.notifications.clear(nID, function () { });
+        }
+    });
+});
+
+// #endregion
+
+// #region chrome.platformKeys
+var data = {
+    trusted_l1_leaf_cert: 'l1_leaf.der',
+    trusted_l1_interm_cert: 'l1_interm.der',
+    trusted_l2_leaf_cert: 'l2_leaf.der',
+    client_1: 'client_1.der',
+    client_2: 'client_2.der',
+    client_1_spki: 'client_1_spki.der',
+    client_1_issuer_dn: {
+        buffer: new ArrayBuffer(16)
+    },
+    raw_data: 'data',
+    signature_nohash_pkcs: 'signature_nohash_pkcs',
+    signature_client1_sha1_pkcs: 'signature_client1_sha1_pkcs',
+    signature_client2_sha1_pkcs: 'signature_client2_sha1_pkcs',
+};
+function requestCA1(): chrome.platformKeys.ClientCertificateRequest {
+    return {
+        certificateTypes: [],
+        certificateAuthorities: [data.client_1_issuer_dn.buffer]
+    };
+}
+chrome.platformKeys.selectClientCertificates(
+    { interactive: false, request: requestCA1() },
+    (matches) => {
+    });
+
+const requestECDSA: chrome.platformKeys.ClientCertificateRequest = {
+    certificateTypes: ['ecdsaSign'],
+    certificateAuthorities: []
+};
+chrome.platformKeys.selectClientCertificates(
+    { interactive: false, request: requestECDSA },
+    (matches) => {
+        return matches.length;
+    });
+
+if (chrome.platformKeys.subtleCrypto &&
+    chrome.platformKeys.subtleCrypto() &&
+    chrome.platformKeys.subtleCrypto().sign &&
+    chrome.platformKeys.subtleCrypto().exportKey) {
+    console.log('Subtle crypto working (Y)')
+}
+
+var keyParams = {
+    // Algorithm names are case-insensitive.
+    name: 'RSASSA-Pkcs1-V1_5',
+    hash: { name: 'sha-1' }
+};
+chrome.platformKeys.getKeyPair(
+    data.client_1_issuer_dn.buffer, keyParams,
+    (publicKey, privateKey) => {
+        let expectedAlgorithm = {
+            modulusLength: 2048,
+            name: 'RSASSA-PKCS1-v1_5',
+            publicExponent: new Uint8Array([0x01, 0x00, 0x01]),
+            hash: { name: 'SHA-1' }
+        };
+
+        if (expectedAlgorithm === publicKey.algorithm &&
+            privateKey &&
+            expectedAlgorithm === privateKey.algorithm) {
+            if (publicKey.type === 'public' && privateKey.type === 'private') {
+                console.log('All okay!');
+            }
+        }
+        chrome.platformKeys.subtleCrypto()
+            .exportKey('spki', publicKey)
+            .then((actualPublicKeySpki) => {
+                if (new ArrayBuffer(100) === actualPublicKeySpki) {
+                    return false;
+                }
+            });
+    });
+var details = {
+    serverCertificateChain: [data.client_1_issuer_dn.buffer],
+    hostname: 'l1_leaf'
+};
+chrome.platformKeys.verifyTLSServerCertificate(
+    details, (result) => {
+        return result.trusted;
+    });
+// #endregion
+
+// #region chrome.permissions
+
+chrome.permissions.request({ permissions: ['storage'] }, (granted) => {
+    return granted && 'It was granted';
+});
+
+chrome.permissions.getAll((permissions) => {
+    if (chrome.runtime.lastError || !permissions.permissions) {
+        return;
+    }
+    for (const permission of permissions.permissions) {
+        if (permission === 'alarms') {
+            return 'I knew it!';
+        }
+        chrome.permissions.remove({ permissions: [permission] }, (removed) => {
+            return removed ? 'It was removed' : 'It was not removed';
+        });
+    }
+    chrome.permissions.contains({ origins: ['chrome://favicon/'] }, (doIHaveIt) => doIHaveIt ? 'yes' : 'neh');
+    chrome.permissions.request(
+        { permissions: ['audio'] },
+        () => { });
+});
+
+// #endregion
+
+// #region chrome.power
+
+chrome.power.requestKeepAwake(chrome.power.Level.DISPLAY);
+chrome.power.requestKeepAwake('display');
+
+// #endregion
+
+// #region chrome.runtime
+
+chrome.runtime.onMessageExternal.addListener((request, sender, sendResponse) => {
+    sendResponse({
+        'result': 'Ops, I don\'t understand this message'
+    });
+});
+chrome.runtime.sendMessage(
+    chrome.runtime.id,
+    { myCustomMessage: 'tra laa la' },
+    null,
+    (response: any) => {
+        console.log('Response: ' + JSON.stringify(response));
+    }
+);
+
+chrome.runtime.getPackageDirectoryEntry((pentry) => {
+    pentry.getFile('manifest.json', undefined, (file) => {
+        return file.name;
+    }, err => console.error(err));
+});
+
+chrome.runtime.reload();
+chrome.runtime.requestUpdateCheck((status, details) => {
+    if (status === chrome.runtime.RequestUpdateCheckStatus.THROTTLED) {
+        if (details !== undefined) {
+            console.log(details.version);
+        } else {
+            console.log('Unknown');
+        }
+    }
+});
+const os = chrome.runtime.PlatformOs.ANDROID;
+if (os === 'android') {
+    console.log('Enum ok');
+}
+const appId = chrome.runtime.id;
+
+// #endregion
+
+// #region chrome.signedInDevices
+
+const dumpDevices = (devices: chrome.signedInDevices.DeviceInfo[]) => {
+    for (const device of devices) {
+        if (device.type === 'desktop_or_laptop') {
+            console.log(device.name, device.chromeVersion);
+        }
+    }
+}
+chrome.signedInDevices.onDeviceInfoChange.addListener(dumpDevices);
+chrome.signedInDevices.get(false, dumpDevices);
+
+// #endregion
+
+// #region chrome.sockets
+// SOCKETS
 // https://developer.chrome.com/apps/sockets_tcp
+
+function testSystemNetwork() {
+    chrome.system.network.getNetworkInterfaces((networkInterfaces) => {
+        var iface: chrome.system.network.NetworkInterface;
+        for (var i in networkInterfaces) {
+            iface = networkInterfaces[i];
+        }
+    });
+}
+
 function test_socketsTcp(): void {
-    var socketId: number = 0;
-    var properties: chrome.sockets.tcp.SocketProperties = {};
+    var socketId: chrome.integer = 0;
+    var properties: chrome.sockets.SocketProperties = {};
     var buffer: ArrayBuffer = new ArrayBuffer(256);
 
     // create
@@ -91,53 +1363,53 @@ function test_socketsTcp(): void {
     chrome.sockets.tcp.setPaused(socketId, true, () => { });
 
     // setKeepAlive
-    chrome.sockets.tcp.setKeepAlive(socketId, true, (result: number) => { });
-    chrome.sockets.tcp.setKeepAlive(socketId, true, 0, (result: number) => { });
+    chrome.sockets.tcp.setKeepAlive(socketId, true, (result) => { });
+    chrome.sockets.tcp.setKeepAlive(socketId, true, 0, (result) => { });
 
     // setNoDelay
-    chrome.sockets.tcp.setNoDelay(socketId, true, (result: number) => { });
+    chrome.sockets.tcp.setNoDelay(socketId, true, (result) => { });
 
     // connect
-    chrome.sockets.tcp.connect(socketId, "192.168.0.1", 8080, (result: number) => { });
+    chrome.sockets.tcp.connect(socketId, '192.168.0.1', 8080, (result) => { });
 
     // disconnect
     chrome.sockets.tcp.disconnect(socketId);
     chrome.sockets.tcp.disconnect(socketId, () => { });
 
     // send
-    chrome.sockets.tcp.send(socketId, buffer, (info: chrome.sockets.tcp.SendInfo) => { });
+    chrome.sockets.tcp.send(socketId, buffer, (info: chrome.sockets.SendInfo) => { });
 
     // close
     chrome.sockets.tcp.close(socketId);
     chrome.sockets.tcp.close(socketId, () => { });
 
     // getInfo
-    chrome.sockets.tcp.getInfo(socketId, (info: chrome.sockets.tcp.SocketInfo) => { });
+    chrome.sockets.tcp.getInfo(socketId, (info: chrome.sockets.SocketInfo) => { });
 
     // getSockets
-    chrome.sockets.tcp.getSockets((infos: chrome.sockets.tcp.SocketInfo[]) => { });
+    chrome.sockets.tcp.getSockets((infos: chrome.sockets.SocketInfo[]) => { });
 }
 
 function test_socketsTcpEvents(): void {
-    chrome.sockets.tcp.onReceive.addListener((info: chrome.sockets.tcp.ReceiveEventArgs) => { });
-    chrome.sockets.tcp.onReceiveError.addListener((info: chrome.sockets.tcp.ReceiveErrorEventArgs) => { });
+    chrome.sockets.tcp.onReceive.addListener((info: chrome.sockets.ReceiveEventArgs) => { });
+    chrome.sockets.tcp.onReceiveError.addListener((info: chrome.sockets.ReceiveErrorEventArgs) => { });
 }
 
 function testSocketsTcpTypes(): void {
     // SocketProperties
-    var properties: chrome.sockets.tcp.SocketProperties;
+    var properties: chrome.sockets.SocketProperties;
 
     properties = {
     };
 
     properties = {
         persistent: true,
-        name: "test",
+        name: 'test',
         bufferSize: 1024
     };
 
     // SocketInfo
-    var socketInfo: chrome.sockets.tcp.SocketInfo;
+    var socketInfo: chrome.sockets.SocketInfo;
 
     socketInfo = {
         socketId: 1,
@@ -146,18 +1418,18 @@ function testSocketsTcpTypes(): void {
         connected: false
     };
 
-    socketInfo.name = "test";
+    socketInfo.name = 'test';
     socketInfo.bufferSize = 1024;
-    socketInfo.localAddress = "192.168.0.2";
+    socketInfo.localAddress = '192.168.0.2';
     socketInfo.localPort = 8000;
-    socketInfo.peerAddress = "192.168.0.3";
+    socketInfo.peerAddress = '192.168.0.3';
     socketInfo.peerPort = 1000;
 }
 
 // https://developer.chrome.com/apps/sockets_udp
 function test_socketsUdp(): void {
-    var socketId: number = 0
-    var properties: chrome.sockets.udp.SocketProperties = {};
+    var socketId: chrome.integer = 0
+    var properties: chrome.sockets.SocketProperties = {};
     var buffer: ArrayBuffer = new ArrayBuffer(256);
 
     // create
@@ -178,73 +1450,74 @@ function test_socketsUdp(): void {
     chrome.sockets.udp.setPaused(socketId, true, () => { });
 
     // bind
-    chrome.sockets.udp.bind(socketId, "0.0.0.0", 8080, (result: number) => { });
+    chrome.sockets.udp.bind(socketId, '0.0.0.0', 8080, (result) => { });
 
     // send
-    chrome.sockets.udp.send(socketId, buffer, "172.21.0.1", 10080, (info: chrome.sockets.udp.SendInfo) => { });
+    chrome.sockets.udp.send(socketId, buffer, '172.21.0.1', 10080, (info: chrome.sockets.SendInfo) => { });
 
     // close
     chrome.sockets.udp.close(socketId);
     chrome.sockets.udp.close(socketId, () => { });
 
     // getInfo
-    chrome.sockets.udp.getInfo(socketId, (info: chrome.sockets.udp.SocketInfo) => { });
+    chrome.sockets.udp.getInfo(socketId, (info: chrome.sockets.SocketInfo) => { });
 
     // getSockets
-    chrome.sockets.udp.getSockets((infos: chrome.sockets.udp.SocketInfo[]) => { });
+    chrome.sockets.udp.getSockets((infos: chrome.sockets.SocketInfo[]) => { });
 
     // joinGroup
-    chrome.sockets.udp.joinGroup(socketId, "224.0.0.1", (result: number) => { });
+    chrome.sockets.udp.joinGroup(socketId, '224.0.0.1', (result) => { });
 
     // leaveGroup
-    chrome.sockets.udp.leaveGroup(socketId, "224.0.0.1", (result: number) => { });
+    chrome.sockets.udp.leaveGroup(socketId, '224.0.0.1', (result) => { });
 
     // setMulticastTimeToLive
-    chrome.sockets.udp.setMulticastTimeToLive(socketId, 100, (result: number) => { });
+    chrome.sockets.udp.setMulticastTimeToLive(socketId, 100, (result) => { });
 
     // setMulticastLoopbackMode
-    chrome.sockets.udp.setMulticastLoopbackMode(socketId, true, (result: number) => { });
+    chrome.sockets.udp.setMulticastLoopbackMode(socketId, true, (result) => { });
 
     // getJoinedGroups
     chrome.sockets.udp.getJoinedGroups(socketId, (groups: string[]) => { });
 }
 
 function test_socketsUdpEvents(): void {
-    chrome.sockets.udp.onReceive.addListener((info: chrome.sockets.udp.ReceiveEventArgs) => { });
-    chrome.sockets.udp.onReceiveError.addListener((info: chrome.sockets.udp.ReceiveErrorEventArgs) => { });
+    chrome.sockets.udp.onReceive.addListener((info: chrome.sockets.ReceiveEventArgs) => { });
+    chrome.sockets.udp.onReceiveError.addListener((info: chrome.sockets.ReceiveErrorEventArgs) => { });
 }
 
 function testSocketsUdpTypes(): void {
     // SocketProperties
-    var properties: chrome.sockets.udp.SocketProperties;
+    var properties: chrome.sockets.SocketProperties;
 
     properties = {
     };
 
     properties = {
         persistent: true,
-        name: "test",
+        name: 'test',
         bufferSize: 1024
     };
 
     // SocketInfo
-    var socketInfo: chrome.sockets.udp.SocketInfo;
+    var socketInfo: chrome.sockets.SocketInfo;
 
     socketInfo = {
         socketId: 1,
         persistent: true,
-        paused: true
+        paused: true,
+        connected: true,
     };
 
-    socketInfo.name = "test";
+    socketInfo.name = 'test';
     socketInfo.bufferSize = 1024;
-    socketInfo.localAddress = "192.168.0.2";
+    socketInfo.localAddress = '192.168.0.2';
     socketInfo.localPort = 8000;
 }
 
 // https://developer.chrome.com/apps/sockets_tcpServer
 function test_socketsTcpServer(): void {
-    var socketId: number = 0;
+    var socketId: chrome.integer = 0;
     var properties: chrome.sockets.tcpServer.SocketProperties = {};
     var buffer: ArrayBuffer = new ArrayBuffer(256);
 
@@ -266,8 +1539,8 @@ function test_socketsTcpServer(): void {
     chrome.sockets.tcpServer.setPaused(socketId, true, () => { });
 
     // listen
-    chrome.sockets.tcpServer.listen(socketId, "0.0.0.0", 80, (result: number) => { });
-    chrome.sockets.tcpServer.listen(socketId, "0.0.0.0", 80, 128, (result: number) => { });
+    chrome.sockets.tcpServer.listen(socketId, '0.0.0.0', 80, (result) => { });
+    chrome.sockets.tcpServer.listen(socketId, '0.0.0.0', 80, 128, (result) => { });
 
     // disconnect
     chrome.sockets.tcp.disconnect(socketId);
@@ -278,15 +1551,15 @@ function test_socketsTcpServer(): void {
     chrome.sockets.udp.close(socketId, () => { });
 
     // getInfo
-    chrome.sockets.udp.getInfo(socketId, (info: chrome.sockets.udp.SocketInfo) => { });
+    chrome.sockets.udp.getInfo(socketId, (info: chrome.sockets.SocketInfo) => { });
 
     // getSockets
-    chrome.sockets.tcp.getSockets((infos: chrome.sockets.tcp.SocketInfo[]) => { });
+    chrome.sockets.tcp.getSockets((infos: chrome.sockets.SocketInfo[]) => { });
 }
 
 function test_socketsTcpServerEvents(): void {
-    chrome.sockets.tcpServer.onAccept.addListener((info: chrome.sockets.tcpServer.AcceptEventArgs) => { });
-    chrome.sockets.tcpServer.onAcceptError.addListener((info: chrome.sockets.tcpServer.AcceptErrorEventArgs) => { });
+    chrome.sockets.tcpServer.onAccept.addListener((info: chrome.sockets.AcceptEventArgs) => { });
+    chrome.sockets.tcpServer.onAcceptError.addListener((info: chrome.sockets.AcceptErrorEventArgs) => { });
 }
 
 function testSocketsTcpServerTypes(): void {
@@ -298,7 +1571,7 @@ function testSocketsTcpServerTypes(): void {
 
     properties = {
         persistent: true,
-        name: "test"
+        name: 'test'
     };
 
     // SocketInfo
@@ -310,19 +1583,420 @@ function testSocketsTcpServerTypes(): void {
         paused: true
     };
 
-    socketInfo.name = "test";
-    socketInfo.localAddress = "192.168.0.2";
+    socketInfo.name = 'test';
+    socketInfo.localAddress = '192.168.0.2';
     socketInfo.localPort = 8000;
 }
 
-function testSystemNetwork() {
-    chrome.system.network.getNetworkInterfaces((networkInterfaces) => {
-        var iface: chrome.system.network.NetworkInterface;
-        for (var i in networkInterfaces) {
-            iface = networkInterfaces[i];
+chrome.sockets.udp.create({}, (createInfo) => {
+    chrome.sockets.udp.bind(createInfo['socketId'], '192.168.1.22', 0,
+        (result) => {
+            ((result >= 0) ? createInfo['socketId'] : null);
+        });
+});
+
+// #endregion
+
+// #region chrome.storage
+
+// LOCAL
+chrome.storage.local.clear();
+chrome.storage.local.clear(() => { });
+chrome.storage.local.get('test', () => { });
+chrome.storage.local.get(() => { });
+chrome.storage.local.getBytesInUse((bytesInUse) => {
+    return (bytesInUse > 100);
+});
+chrome.storage.local.set({ data: 'example' }, () => { console.log('done'); });
+
+// SYNC
+chrome.storage.sync.clear();
+chrome.storage.sync.clear(() => { });
+chrome.storage.sync.get('test', () => { });
+chrome.storage.sync.get(() => { });
+chrome.storage.sync.getBytesInUse((bytesInUse) => {
+    return (bytesInUse > 100);
+});
+chrome.storage.sync.set({ data: 'example' }, () => { console.log('done'); });
+
+// MANAGED
+chrome.storage.managed.get('test', () => { });
+chrome.storage.managed.get(() => { });
+chrome.storage.managed.getBytesInUse((bytesInUse) => {
+    return (bytesInUse > 100);
+});
+// chrome.storage.managed.set({ data: 'example' }, () => { console.log('done'); }); // Should not be allowed
+
+// EVENT
+chrome.storage.onChanged.addListener((changes, areaName) => {
+    if (changes.length > 0) {
+        return areaName === 'managed';
+    }
+});
+
+// #endregion
+
+// #region chrome.syncFileSystem
+
+chrome.syncFileSystem.getConflictResolutionPolicy((policy) => {
+    if (policy === 'manual') {
+        chrome.syncFileSystem.requestFileSystem((fs) => {
+            if (fs.root.isFile) {
+                throw new Error('It was a file!');
+            }
+        });
+    }
+});
+// #endregion
+
+// #region chrome.system.*
+
+function getPowerSourceInfo() {
+    chrome.system.powerSource.getPowerSourceInfo(info => {
+        if (info === undefined) {
+            return true;
+        }
+        if (info.length === 1 && info[0].type !== chrome.system.powerSource.PowerSourceType.mains) {
+            return false;
         }
     });
 }
 
-import webview = chrome.webview;
-let element: webview.HTMLWebViewElement;
+function onPowerChanged() {
+    chrome.system.powerSource.onPowerChanged.addListener(info => {
+        if (info[0].active) {
+            return true;
+        }
+    });
+    chrome.system.powerSource.requestStatusUpdate();
+}
+
+// #endregion
+
+// #region chrome.tts
+
+chrome.tts.isSpeaking((isSpeaking) => {
+    if (!isSpeaking) {
+        chrome.tts.speak('This is the typings calling!',
+            {
+                volume: 10,
+            });
+    }
+});
+
+// #endregion
+
+// #region chrome.usb
+
+const devices: { [key: string]: chrome.usb.Device } = {};
+chrome.usb.onDeviceAdded.addListener((device) => {
+    devices[device.device] = device;
+});
+chrome.usb.onDeviceRemoved.addListener((device) => {
+    // tslint:disable-next-line:no-dynamic-delete
+    delete devices[device.device];
+});
+chrome.usb.getUserSelectedDevices({
+    'multiple': false
+}, (selected_devices) => {
+    if (chrome.runtime.lastError != undefined) {
+        console.warn('chrome.usb.getUserSelectedDevices error: ' + chrome.runtime.lastError.message);
+        return;
+    }
+});
+
+// #endregion
+
+// #region chrome.virtualKeyboard
+chrome.virtualKeyboard.restrictFeatures(
+    {
+        autoCompleteEnabled: false,
+        autoCorrectEnabled: false,
+        spellCheckEnabled: false,
+        voiceInputEnabled: false,
+        handwritingEnabled: false
+    },
+    (update) => {
+        if (update.autoCompleteEnabled = false) {
+            return true;
+        }
+    }
+);
+// #endregion
+
+// #region chrome.vpnProvider
+
+const vpnParams = {
+    address: '127.0.0.1/32',
+    mtu: '1500',
+    exclusionList: ['127.0.0.1/32'],
+    inclusionList: ['0.0.0.0/0'],
+    dnsServers: ['1.1.1.1', '1.0.0.1', '8.8.8.8'],
+    reconnect: true
+};
+chrome.vpnProvider.onConfigCreated.addListener((id, name, data) => {
+    console.log('Connected: ', id.toLowerCase(), name.toUpperCase(), JSON.stringify(data));
+});
+chrome.vpnProvider.createConfig('Local VPN', (id) => {
+    chrome.vpnProvider.setParameters(vpnParams, () => {
+        if (chrome.runtime.lastError) {
+            chrome.vpnProvider.notifyConnectionStateChanged('failure');
+            throw chrome.runtime.lastError;
+        }
+        chrome.vpnProvider.notifyConnectionStateChanged('connected', () => {
+            chrome.vpnProvider.onPacketReceived.addListener(data => {
+                return data.byteLength > 0 ? data : undefined;
+            });
+            chrome.vpnProvider.onConfigRemoved.addListener(id => id.toUpperCase());
+            chrome.vpnProvider.onPlatformMessage.addListener((id, message) => {
+                if (typeof id === 'string') {
+                    return message === 'connected';
+                }
+            });
+            chrome.vpnProvider.onUIEvent.addListener((event, id) => {
+                if (event === 'showAddDialog') {
+                    return id;
+                }
+            });
+        });
+    });
+});
+// #endregion
+
+// #region chrome.wallpaper
+chrome.wallpaper.setWallpaper({
+    url: 'chrome://favicon/iconurl/https://www.google.com/favicon.ico',
+    layout: 'CENTER_CROPPED',
+    filename: 'test_wallpaper'
+}, (thumbnail) => {
+    const imageUrl = thumbnail;
+});
+chrome.wallpaper.setWallpaper({
+    layout: chrome.wallpaper.WallpaperLayout.STRETCH,
+    filename: 'test_wallpaper2'
+}, () => { });
+// #endregion
+
+// #region chrome.webViewRequest & WebView
+
+let wve = document.createElement('webview');
+wve = new WebView() || new window.WebView();
+wve.name = 'test';
+wve.src = 'https://github.com/DefinitelyTyped';
+wve.allowtransparency = true;
+wve.autosize = 'on';
+wve.partition = 'persist:githubwebview';
+wve.addEventListener('close', () => {
+    return;
+});
+wve.addEventListener('consolemessage', (ev) => {
+    if (ev.level === 2) {
+        const msg = ev.message;
+    }
+});
+wve.addEventListener('dialog', (ev) => {
+    ev.dialog.ok('Hello World!');
+});
+wve.addEventListener('loadstart', (ev) => {
+    if (ev.isTopLevel) {
+        return ev.url;
+    }
+    return;
+});
+wve.addEventListener('zoomchange', (ev) => {
+    return ev.newzoomFactor || ev.oldzoomFactor;
+});
+wve.addEventListener('loadredirect', (ev) => {
+    return ev.newUrl || ev.oldUrl;
+});
+
+onload = () => {
+    const WEBVIEW_SRC = 'data:text/html,<body>One</body>';
+    var webview = document.getElementById('foo') as HTMLWebViewElement;
+    webview.style.width = '600px';
+    webview.style.height = '400px';
+    webview.src = WEBVIEW_SRC;
+    const indicator = document.createElement('span');
+    if (indicator) {
+        var loadstart = () => {
+            indicator.innerText = 'loading...';
+        }
+        var loadstop = () => {
+            indicator.innerText = '';
+        }
+        webview.addEventListener('loadstart', loadstart);
+        webview.addEventListener('loadstop', loadstop);
+    }
+    webview.addEventListener('consolemessage', (e) => {
+        console.log('g: ' + e.message);
+    });
+    webview.executeScript(
+        { code: "document.querySelector('img').src" }, (results) => {
+            if (!results || !results.length) {
+                return false;
+            }
+        });
+    webview.focus();
+    var blob = new Blob(['<html><body>Blob content</body></html>'],
+        { type: 'text/html' });
+    var blobURL = URL.createObjectURL(blob);
+    webview.src = blobURL;
+    webview.onloadstop = null;
+    const rule = {
+        conditions: [
+            new chrome.webViewRequest.RequestMatcher(
+                {
+                    url: { urlContains: 'guest' }
+                }
+            )
+        ],
+        actions: [
+            new chrome.webViewRequest.CancelRequest()
+        ]
+    };
+    webview.request.onRequest.addRules([rule]);
+    webview.addEventListener('loadabort', (e) => {
+        e.preventDefault();
+        return e.reason === 'ERR_ABORTED';
+    });
+    webview.onloadcommit = (e) => {
+        if (e.url.indexOf('html') !== -1) {
+            return true;
+        }
+    };
+    webview.getZoom((zoomFactor) => {
+        webview.setZoom(3.14 * zoomFactor, () => {
+            webview.getZoomMode((zoomMode) => {
+                if (zoomMode === 'disabled') {
+                    return true;
+                }
+            });
+        });
+    });
+    webview.insertCSS({ code: '' }, () => { });
+    webview.loadDataWithBaseUrl("data:text/html;base64,PGh0bWw+CiAgVGhpcyBpcy" +
+        "BhIHRlc3QuPGJyPgogIDxpbWcgc3JjPSJ0ZXN0LmJtcCI+PGJyPgo8L2h0bWw+Cg==",
+        'https://github.com/',
+        'chrome://favicon');
+    document.body.appendChild(webview);
+    webview.onconsolemessage = () => { };
+    webview.onloadstop = () => {
+        webview.request.onCompleted.addListener((details) => {
+            if (details.url) {
+                return true;
+            }
+        }, { urls: ['<all_urls>'] });
+    };
+    webview.setAttribute('src', WEBVIEW_SRC);
+    webview.partition = 'partitionFromManifest';
+    webview.removeAttribute('src');
+    webview.insertCSS({ code: '' }, () => {
+
+    });
+}
+
+wve.request.onBeforeRequest.addListener(
+    (details) => { return { cancel: true }; },
+    { urls: ['*://www.evil.com/*'] },
+    ['blocking']);
+
+const rule: chrome.webViewRequest.OnRequestRule = {
+    conditions: [
+        // new chrome.webViewRequest.CancelRequest(), // This is incompatible - should break it :)
+        new chrome.webViewRequest.RequestMatcher({ url: { hostSuffix: 'example.com' } })
+    ],
+    actions: [
+        new chrome.webViewRequest.CancelRequest(),
+        new chrome.webViewRequest.IgnoreRules({
+            'lowerPriorityThan': 1000
+        }),
+        new chrome.webViewRequest.SendMessageToExtension({
+            'message': JSON.stringify({
+                'type': 'error',
+                'action': 'cancelled'
+            })
+        })
+    ]
+};
+
+new chrome.webViewRequest.RequestMatcher({
+    'url': { 'urlMatches': '.*' },
+    'resourceType': [
+        'image'
+    ]
+});
+
+new chrome.webViewRequest.RedirectRequest({ redirectUrl: 'http://127.0.0.1' });
+
+new chrome.webViewRequest.RedirectByRegEx({
+    'from': '^.*:\/\/([^/]*)[^#?]*\/([^#?]*)([#?].*)?$',
+    'to': 'http://dummyimage.com/xga/000/0f0.png&text=BLOCKED:$1/.../$2'
+});
+
+new chrome.webViewRequest.RequestMatcher({
+    'url': { 'hostSuffix': 'dummyimage.com' }
+});
+
+wve.request.onRequest.addRules([rule]);
+
+function CreateWebViewAndGuest() {
+    var webview = new WebView();
+    webview.allowtransparency = true;
+    webview.allowscaling = true;
+    var onLoadStop = (e: WebView.Events.LoadStopEvent) => {
+        webview.removeEventListener('loadstop', onLoadStop);
+        webview.removeEventListener('loadabort', onLoadAbort);
+    };
+    webview.addEventListener('loadstop', onLoadStop);
+
+    const onLoadAbort = (e: WebView.Events.LoadAbortEvent) => {
+        webview.removeEventListener('loadstop', onLoadStop);
+        webview.removeEventListener('loadabort', onLoadAbort);
+    };
+
+    webview.src = 'data:text/html,<!DOCTYPE html>\n' +
+        '<style>\n' +
+        'select {\n' +
+        '  position: absolute;\n' +
+        '  top: 9px;\n' +
+        '  left: 9px;\n' +
+        '  height: 25px;\n' +
+        '  width: 80px;\n' +
+        '}\n' +
+        '</style>\n' +
+        '<html>\n' +
+        '  <body>\n' +
+        '    <select>\n' +
+        '      <option selected>Apple</option>\n' +
+        '      <option>Orange</option>\n' +
+        '      <option>Banana</option>\n' +
+        '    </select>\n' +
+        '  </body>\n' +
+        '</html>\n';
+
+    return webview;
+}
+
+onload = () => {
+    var webview = CreateWebViewAndGuest();
+    document.body.appendChild(webview);
+};
+
+// #endregion
+
+// #region Embedding & AppView
+chrome.app.runtime.onEmbedRequested.addListener((request) => {
+    request.allow('foobar.html');
+});
+// Creates an <appview> element.
+let appview = document.createElement('appview');
+appview = new AppView() || new window.AppView();
+// Appends the element to the document body.
+document.body.appendChild(appview);
+// Connects the appview to appToEmbed.
+appview.connect('id of app');
+document.appendChild(appview);
+//#endregion
+
+
+
diff --git a/types/chrome-apps/tsconfig.json b/types/chrome-apps/tsconfig.json
index 50a50c3193..6e00d1a959 100644
--- a/types/chrome-apps/tsconfig.json
+++ b/types/chrome-apps/tsconfig.json
@@ -1,10 +1,6 @@
 {
     "compilerOptions": {
         "module": "commonjs",
-        "lib": [
-            "es2017",
-            "dom"
-        ],
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
@@ -13,6 +9,10 @@
         "typeRoots": [
             "../"
         ],
+        "lib": [
+            "es2017",
+            "dom"
+        ],
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/chrome/index.d.ts b/types/chrome/index.d.ts
index 0bfec6bfd8..49f079e159 100644
--- a/types/chrome/index.d.ts
+++ b/types/chrome/index.d.ts
@@ -4959,6 +4959,7 @@ declare namespace chrome.runtime {
 
     export interface ConnectInfo {
         name?: string;
+        includeTlsChannelId?: boolean;
     }
 
     export interface InstalledDetails {
@@ -6564,7 +6565,7 @@ declare namespace chrome.tabs {
      * @param callback Optional.
      * Parameter window: Contains details about the window whose tabs were highlighted.
      */
-    export function highlight(highlightInfo: HighlightInfo, callback: (window: chrome.windows.Window) => void): void;
+    export function highlight(highlightInfo: HighlightInfo, callback?: (window: chrome.windows.Window) => void): void;
     /**
      * Gets all tabs that have the specified properties, or all tabs if no properties are specified.
      * @since Chrome 16.
@@ -7383,6 +7384,10 @@ declare namespace chrome.webRequest {
         type: ResourceType;
         /** The time when this signal is triggered, in milliseconds since the epoch. */
         timeStamp: number;
+        /** The origin where the request was initiated. This does not change through redirects. If this is an opaque origin, the string 'null' will be used.
+         * @since Since Chrome 63.
+        */
+        initiator?: string;
     }
 
     export interface WebRequestDetails extends ResourceRequest {
diff --git a/types/classnames/index.d.ts b/types/classnames/index.d.ts
index 40e3ce835c..84073ec109 100644
--- a/types/classnames/index.d.ts
+++ b/types/classnames/index.d.ts
@@ -12,7 +12,7 @@
 type ClassValue = string | number | ClassDictionary | ClassArray | undefined | null | boolean;
 
 interface ClassDictionary {
-	[id: string]: boolean | undefined | null;
+	[id: string]: any;
 }
 
 // This is the only way I found to break circular references between ClassArray and ClassValue
@@ -21,7 +21,9 @@ interface ClassArray extends Array<ClassValue> { } // tslint:disable-line no-emp
 
 type ClassNamesFn = (...classes: ClassValue[]) => string;
 
-declare const classNames: ClassNamesFn;
+type ClassNamesExport = ClassNamesFn & { default: ClassNamesFn };
+
+declare const classNames: ClassNamesExport;
 
 export = classNames;
 export as namespace classNames;
diff --git a/types/cleave.js/cleave.js-tests.tsx b/types/cleave.js/cleave.js-tests.tsx
index eb682d432b..a826d2607a 100644
--- a/types/cleave.js/cleave.js-tests.tsx
+++ b/types/cleave.js/cleave.js-tests.tsx
@@ -1,6 +1,7 @@
 import * as React from "react";
 import Cleave = require("cleave.js");
 import CleaveReact = require("cleave.js/react");
+import { Props } from "cleave.js/react/props";
 
 const ExampleSelector1 = () => {
     const cleave = new Cleave("#my-input", { phone: true });
@@ -29,3 +30,14 @@ const ExampleReact1 = (props: any) => {
         />
     );
 };
+
+const ExampleReact2 = (props: Props) => {
+    return (
+        <CleaveReact
+            value="test"
+            className="form-control"
+            options={{ phone: true }}
+            {...props}
+        />
+    );
+};
diff --git a/types/cleave.js/options/index.d.ts b/types/cleave.js/options/index.d.ts
index 60e2e99e40..b1dc95920b 100644
--- a/types/cleave.js/options/index.d.ts
+++ b/types/cleave.js/options/index.d.ts
@@ -19,6 +19,12 @@ export interface CleaveOptions {
     datePattern?: ReadonlyArray<string>;
 }
 
+// Time Options
+export interface CleaveOptions {
+    time?: boolean;
+    timePattern?: ReadonlyArray<string>;
+}
+
 // Numeral Options
 export type NumeralThousandsGroupStyleType = "lakh" | "thousand" | "wan" | "none";
 
@@ -45,4 +51,5 @@ export interface CleaveOptions {
     noImmediatePrefix?: boolean;
     rawValueTrimPrefix?: boolean;
     uppercase?: boolean;
+    onValueChanged?(event: any): void;
 }
diff --git a/types/cleave.js/react/index.d.ts b/types/cleave.js/react/index.d.ts
index 1f50cbdbf3..bf158b8f4d 100644
--- a/types/cleave.js/react/index.d.ts
+++ b/types/cleave.js/react/index.d.ts
@@ -1,13 +1,5 @@
 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;
-    htmlRef?: (i: any) => void;
-}
+import { Props } from "./props";
 
 declare var Cleave: React.ComponentClass<Props>;
 export = Cleave;
diff --git a/types/cleave.js/react/props.d.ts b/types/cleave.js/react/props.d.ts
new file mode 100644
index 0000000000..6ce47db62c
--- /dev/null
+++ b/types/cleave.js/react/props.d.ts
@@ -0,0 +1,10 @@
+import * as React from "react";
+import { CleaveOptions } from "../options";
+
+export type InitHandler = (owner: React.ReactInstance) => void;
+
+export interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
+    onInit?: InitHandler;
+    options: CleaveOptions;
+    htmlRef?: (i: any) => void;
+}
diff --git a/types/cleave.js/tsconfig.json b/types/cleave.js/tsconfig.json
index ec4da5d047..1cf200a1d2 100644
--- a/types/cleave.js/tsconfig.json
+++ b/types/cleave.js/tsconfig.json
@@ -23,6 +23,7 @@
         "index.d.ts",
         "options/creditCard.d.ts",
         "options/index.d.ts",
-        "react/index.d.ts"
+        "react/index.d.ts",
+        "react/props.d.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/cli-truncate/cli-truncate-tests.ts b/types/cli-truncate/cli-truncate-tests.ts
new file mode 100644
index 0000000000..677108e6ad
--- /dev/null
+++ b/types/cli-truncate/cli-truncate-tests.ts
@@ -0,0 +1,19 @@
+import cliTruncate = require('cli-truncate');
+
+// Truncate at different positions
+// $ExpectType string
+cliTruncate('unicorn', 4); // default position: 'end'
+
+// $ExpectType string
+cliTruncate('unicorn', 4, {position: 'start'});
+
+// $ExpectType string
+cliTruncate('unicorn', 4, {position: 'middle'});
+
+// Truncate Unicode surrogate pairs
+// $ExpectType string
+cliTruncate('uni\uD83C\uDE00corn', 5);
+
+// Truncate full-width characters
+// $ExpectType string
+cliTruncate('안녕하세요', 3);
diff --git a/types/cli-truncate/index.d.ts b/types/cli-truncate/index.d.ts
new file mode 100644
index 0000000000..f02ec427b8
--- /dev/null
+++ b/types/cli-truncate/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for cli-truncate 1.1
+// Project: https://github.com/sindresorhus/cli-truncate
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = cliTruncate;
+
+declare function cliTruncate(
+  input: string,
+  columns: number,
+  options?: {position?: 'start' | 'middle' | 'end'},
+): string;
diff --git a/types/cli-truncate/tsconfig.json b/types/cli-truncate/tsconfig.json
new file mode 100644
index 0000000000..efc2a3a1c7
--- /dev/null
+++ b/types/cli-truncate/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-truncate-tests.ts"
+  ]
+}
diff --git a/types/cli-truncate/tslint.json b/types/cli-truncate/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/cli-truncate/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/clipboard/clipboard-tests.ts b/types/clipboard/clipboard-tests.ts
index a2ae8f9354..1a9a170087 100644
--- a/types/clipboard/clipboard-tests.ts
+++ b/types/clipboard/clipboard-tests.ts
@@ -14,6 +14,12 @@ const cb5 = new ClipboardJS(".btn", {
     action: elem => "copy",
     target: elem => null
 });
+const cb6 = new ClipboardJS(".btn", {
+    action: elem => "copy",
+    text: trigger => trigger.getAttribute('aria-label'),
+    target: trigger => trigger.nextElementSibling,
+    container: document.getElementById('modal')
+});
 
 cb1.destroy();
 ClipboardJS.isSupported();
diff --git a/types/clipboard/index.d.ts b/types/clipboard/index.d.ts
index 2405c0c6f0..ceb15b885b 100644
--- a/types/clipboard/index.d.ts
+++ b/types/clipboard/index.d.ts
@@ -49,6 +49,14 @@ declare namespace ClipboardJS {
          * @returns Text to be copied.
          */
         text?(elem: Element): string;
+
+        /**
+         * For use in Bootstrap Modals or with any
+         * other library that changes the focus
+         * you'll want to set the focused element
+         * as the container value.
+         */
+        container?: Element;
     }
 
     interface Event {
diff --git a/types/cls-hooked/index.d.ts b/types/cls-hooked/index.d.ts
index 6d0a68aa6e..57e6b79c60 100644
--- a/types/cls-hooked/index.d.ts
+++ b/types/cls-hooked/index.d.ts
@@ -14,6 +14,7 @@ export interface Namespace {
     get(key: string): any;
     run(fn: (...args: any[]) => void): void;
     runAndReturn<T>(fn: (...args: any[]) => T): T;
+    runPromise<T>(fn: (...args: any[]) => Promise<T>): Promise<T>;
     bind<F extends Function>(fn: F, context?: any): F; // tslint:disable-line: ban-types
     bindEmitter(emitter: EventEmitter): void;
     createContext(): any;
diff --git a/types/codemirror/index.d.ts b/types/codemirror/index.d.ts
index e7fa7c368e..729b8a86d7 100644
--- a/types/codemirror/index.d.ts
+++ b/types/codemirror/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: mihailik <https://github.com/mihailik>
 //                 nrbernard <https://github.com/nrbernard>
 //                 Pr1st0n <https://github.com/Pr1st0n>
+//                 rileymiller <https://github.com/rileymiller>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = CodeMirror;
@@ -14,10 +15,19 @@ declare function CodeMirror(callback: (host: HTMLElement) => void , options?: Co
 declare namespace CodeMirror {
     export var Doc : CodeMirror.DocConstructor;
     export var Pos: CodeMirror.PositionConstructor;
-    export var Pass: any;
+    export var Pass: {toString(): "CodeMirror.PASS"};
 
+    /** Find the column position at a given string index using a given tabsize. */
+    function countColumn(line: string, index: number | null, tabSize: number): number;
     function fromTextArea(host: HTMLTextAreaElement, options?: EditorConfiguration): CodeMirror.EditorFromTextArea;
 
+    /** Compare two positions, return 0 if they are the same, a negative number when a is less, and a positive number otherwise. */
+    function cmpPos(a: Position, b: Position): number;
+
+    /** Utility function that computes an end position from a change (an object with from, to, and text properties, as passed to various event handlers).
+    The returned position will be the end of the changed range, after the change is applied. */
+    function changeEnd(change: EditorChange): Position;
+
     /** It contains a string that indicates the version of the library. This is a triple of integers "major.minor.patch", 
     where patch is zero for releases, and something else (usually one) for dev snapshots. */
     var version: string;
@@ -49,6 +59,14 @@ declare namespace CodeMirror {
     CodeMirror.registerHelper("hint", "foo", myFoo), the value CodeMirror.hint.foo will point to myFoo. */
     function registerHelper(namespace: string, name: string, helper: any): void;
 
+    /** Given a state object, returns a {state, mode} object with the inner mode and its state for the current position. */
+    function innerMode(mode: Mode<any>, state: any): { state: any, mode: Mode<any> };
+
+    /** Sometimes, it is useful to add or override mode object properties from external code.
+    The CodeMirror.extendMode function can be used to add properties to mode objects produced for a specific mode.
+    Its first argument is the name of the mode, its second an object that specifies the properties that should be added.
+    This is mostly useful to add utilities that can later be looked up through getMode. */
+    function extendMode(name: string, properties: Mode<any>): void;
 
     function on(element: any, eventName: string, handler: Function): void;
     function off(element: any, eventName: string, handler: Function): void;
@@ -127,6 +145,10 @@ declare namespace CodeMirror {
         state: any;
     }
 
+    interface KeyMap {
+        [keyName: string]: false | string | ((instance: Editor) => void | typeof Pass);
+    }
+
     interface Editor {
 
         /** Tells you whether the editor currently has focus. */
@@ -157,11 +179,11 @@ declare namespace CodeMirror {
         Maps added in this way have a higher precedence than the extraKeys and keyMap options, and between them,
         the maps added earlier have a lower precedence than those added later, unless the bottom argument was passed,
         in which case they end up below other keymaps added with this method. */
-        addKeyMap(map: any, bottom?: boolean): void;
+        addKeyMap(map: string | KeyMap, bottom?: boolean): void;
 
         /** Disable a keymap added with addKeyMap.Either pass in the keymap object itself , or a string,
         which will be compared against the name property of the active keymaps. */
-        removeKeyMap(map: any): void;
+        removeKeyMap(map: string | KeyMap): void;
 
         /** Enable a highlighting overlay.This is a stateless mini - mode that can be used to add extra highlighting.
         For example, the search add - on uses it to highlight the term that's currently being searched.
@@ -318,6 +340,9 @@ declare namespace CodeMirror {
         you should probably follow up by calling this method to ensure CodeMirror is still looking as intended. */
         refresh(): void;
 
+        /** Gets the inner mode at a given position. This will return the same as getMode for simple modes, but will return an inner mode for nesting modes (such as htmlmixed). */
+        getModeAt(pos: Position): any;
+
         /** Retrieves information about the token the current mode found before the given position (a {line, ch} object). */
         getTokenAt(pos: CodeMirror.Position, precise?: boolean): Token;
 
@@ -549,8 +574,10 @@ declare namespace CodeMirror {
         /** Return true if any text is selected. */
         somethingSelected(): boolean;
 
-        /** 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 cursor position. You can either pass a single {line, ch} object, or the line and the character as two separate parameters.
+        Will replace all selections with a single, empty selection at the given position.
+        The supported options are the same as for setSelection */
+        setCursor(pos: CodeMirror.Position | number, ch?: number, options?: { bias?: number, origin?: string, scroll?: boolean }): 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;
@@ -703,9 +730,9 @@ declare namespace CodeMirror {
         /** Array of strings representing the text that replaced the changed range (split by line). */
         text: string[];
         /**  Text that used to be between from and to, which is overwritten by this change. */
-        removed: string[];
+        removed?: string[];
         /**  String representing the origin of the change event and wether it can be merged with history */
-        origin: string;
+        origin?: string;
     }
 
     interface EditorChangeLinkedList extends CodeMirror.EditorChange {
@@ -714,8 +741,9 @@ 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;
+        /** 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.
+        If the change came from undo/redo, `update` is undefined and the change cannot be modified. */
+        update?(from?: CodeMirror.Position, to?: CodeMirror.Position, text?: string[]): void;
 
         cancel(): void;
     }
@@ -778,7 +806,7 @@ declare namespace CodeMirror {
         keyMap?: string;
 
         /** Can be used to specify extra keybindings for the editor, alongside the ones defined by keyMap. Should be either null, or a valid keymap value. */
-        extraKeys?: any;
+        extraKeys?: string | KeyMap;
 
         /** Whether CodeMirror should scroll or wrap for long lines. Defaults to false (scroll). */
         lineWrapping?: boolean;
@@ -1076,7 +1104,7 @@ declare namespace CodeMirror {
          * This function should read one token from the stream it is given as an argument, optionally update its state,
          * and return a style string, or null for tokens that do not have to be styled. Multiple styles can be returned, separated by spaces.
          */
-        token(stream: StringStream, state: T): string | null;
+        token?: (stream: StringStream, state: T) => string | null;
 
         /**
          * A function that produces a state object to be used at the start of a document.
diff --git a/types/codemirror/test/index.ts b/types/codemirror/test/index.ts
index 39c601f159..bd2aefac88 100644
--- a/types/codemirror/test/index.ts
+++ b/types/codemirror/test/index.ts
@@ -4,7 +4,18 @@ var myCodeMirror: CodeMirror.Editor = CodeMirror(document.body);
 
 var myCodeMirror2: CodeMirror.Editor = CodeMirror(document.body, {
     value: "function myScript(){return 100;}\n",
-    mode: "javascript"
+    mode: "javascript",
+    extraKeys: {
+        Enter: (cm) => { console.log("save"); },
+        Esc: (cm) => { return CodeMirror.Pass; }
+    }
+});
+
+// $ExpectError
+var myCodeMirror2_1: CodeMirror.Editor = CodeMirror(document.body, {
+    extraKeys: {
+        "Shift-Enter": (cm) => { return 42; }  // not a valid return value
+    }
 });
 
 var range = myCodeMirror2.findWordAt(CodeMirror.Pos(0, 2));
@@ -13,9 +24,9 @@ var head = range.head;
 var from = range.from();
 var to = range.to();
 
-var myTextArea: HTMLTextAreaElement;
+var myTextArea: HTMLTextAreaElement = undefined!;
 var myCodeMirror3: CodeMirror.Editor = CodeMirror(function (elt) {
-    myTextArea.parentNode.replaceChild(elt, myTextArea);
+    myTextArea.parentNode!.replaceChild(elt, myTextArea);
 }, { value: myTextArea.value });
 
 var myCodeMirror4: CodeMirror.Editor = CodeMirror.fromTextArea(myTextArea);
@@ -67,6 +78,15 @@ myCodeMirror.on(
   (instance: CodeMirror.Editor, line: CodeMirror.LineHandle, element: HTMLElement) => { }
 );
 
+myCodeMirror.on(
+  "beforeChange",
+  (instance: CodeMirror.Editor, change: CodeMirror.EditorChangeCancellable) => {
+    // $ExpectError
+    change.update();
+    if (change.update != null) change.update();
+  }
+);
+
 CodeMirror.registerHelper("lint", "javascript", {});
 
 myCodeMirror.isReadOnly();
diff --git a/types/codemirror/tsconfig.json b/types/codemirror/tsconfig.json
index 2ff349d98e..a2c6a52430 100644
--- a/types/codemirror/tsconfig.json
+++ b/types/codemirror/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/com.wikitude.phonegap.wikitudeplugin/com.wikitude.phonegap.wikitudeplugin-tests.ts b/types/com.wikitude.phonegap.wikitudeplugin/com.wikitude.phonegap.wikitudeplugin-tests.ts
new file mode 100644
index 0000000000..c46d48d563
--- /dev/null
+++ b/types/com.wikitude.phonegap.wikitudeplugin/com.wikitude.phonegap.wikitudeplugin-tests.ts
@@ -0,0 +1,33 @@
+const startupConfiguration: any = { camera_position: 'back' };
+
+// Some code samples from the wikitude ionic starter
+WikitudePlugin.loadARchitectWorld(
+    success => {
+        console.log('ARchitect World loaded successfully.');
+    },
+    fail => {
+        console.log('Failed to load ARchitect World!');
+    },
+    'www/assets/07_3dModels_6_3dModelAtGeoLocation/index.html',
+    ['geo'],
+    <JSON> startupConfiguration
+);
+
+WikitudePlugin.setOnUrlInvokeCallback(url => {
+    if (url.indexOf('captureScreen') > -1) {
+        WikitudePlugin.captureScreen(
+            absoluteFilePath => {
+                WikitudePlugin.callJavaScript(
+                    `World.testFunction('Screenshot saved at: ${absoluteFilePath}');`
+                );
+            },
+            errorMessage => {
+                console.log(errorMessage);
+            },
+            true,
+            null
+        );
+    } else {
+        alert(url + 'not handled');
+    }
+});
diff --git a/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts b/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts
new file mode 100644
index 0000000000..50307d57c8
--- /dev/null
+++ b/types/com.wikitude.phonegap.wikitudeplugin/index.d.ts
@@ -0,0 +1,82 @@
+// Type definitions for com.wikitude.phonegap.wikitudeplugin 7.2
+// Project: https://github.com/Wikitude/wikitude-cordova-plugin
+// Definitions by: zbarbuto <https://github.com/zbarbuto>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// The following types are taken directly (unmodified) from the wikitude-ionic-3-starter-app
+// https://github.com/pbreuss/wikitude-ionic-3-starter-app
+// Latest commit at time of writing was 647cd546f6d1805765c4cee725566e246ca6259d
+
+/**
+ * Wrapper for the Wikitude SDK Phonegap Plugin - to use with IONIC2
+ * (c) 2016 Schneeweis.Technology
+ */
+interface WikitudePlugin {
+    isDeviceSupported(
+        successCallback: (success: string) => void,
+        errorCallback: (message: string) => void,
+        requiredFeatures: [string]
+    ): void;
+
+    loadARchitectWorld(
+        successCallback: (success: string) => void,
+        errorCallback: (message: string) => void,
+        architectWorldPath: string,
+        requiredFeatures: [string],
+        startupConfiguration: JSON | object
+    ): void;
+
+    close(): void;
+
+    hide(): void;
+
+    show(): void;
+
+    // test type ok?
+    callJavaScript(js: any): void;
+
+    setOnUrlInvokeCallback(onUrlInvokeCallback: (success: string) => void): void;
+
+    setLocation(latitude: any, longitude: any, altitude: any, accuracy: any): void;
+
+    captureScreen(
+        successCallback: (success: string) => void,
+        errorCallback: (message: string) => void,
+        includeWebView: boolean,
+        imagePathInBundleOrNullForPhotoLibrary: string | null
+    ): void;
+
+    setErrorHandler(errorHandler: (message: string) => void): void;
+
+    setDeviceSensorsNeedCalibrationHandler(
+        startCalibrationHandler: (message: string) => void
+    ): void;
+
+    setDeviceSensorsFinishedCalibrationHandler(
+        finishedCalibrationHandler: (message: string) => void
+    ): void;
+
+    setBackButtonCallback(onBackButtonCallback: (message: string) => void): void;
+
+    /* Lifecycle updates */
+
+    onResume(): void;
+    onBackButton(): void;
+    onPause(): void;
+
+    onWikitudeOK(): void;
+    onWikitudeError(): void;
+
+    _sdkKey: string;
+    FeatureGeo: string;
+    Feature2DTracking: string;
+    CameraPositionUndefined: number;
+    CameraPositionFront: number;
+    CameraPositionBack: number;
+    CameraFocusRangeNone: number;
+    CameraFocusRangeNear: number;
+    CameraFocusRangeFar: number;
+}
+
+declare var WikitudePlugin: WikitudePlugin;
diff --git a/types/com.wikitude.phonegap.wikitudeplugin/tsconfig.json b/types/com.wikitude.phonegap.wikitudeplugin/tsconfig.json
new file mode 100644
index 0000000000..ed0ce7783e
--- /dev/null
+++ b/types/com.wikitude.phonegap.wikitudeplugin/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",
+        "com.wikitude.phonegap.wikitudeplugin-tests.ts"
+    ]
+}
diff --git a/types/com.wikitude.phonegap.wikitudeplugin/tslint.json b/types/com.wikitude.phonegap.wikitudeplugin/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/com.wikitude.phonegap.wikitudeplugin/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/cometd/index.d.ts b/types/cometd/index.d.ts
index 0ac377c241..cc97b304fe 100644
--- a/types/cometd/index.d.ts
+++ b/types/cometd/index.d.ts
@@ -21,12 +21,16 @@ declare namespace CometD {
 }
 
 interface CometD {
+    
+    websocketEnabled?: boolean;
 
     onListenerException: (exception: any, subscriptionHandle: any, isListener: boolean, message: string) => void;
 
     init(options: CometD.ConfigurationOptions): void;
 
     configure(config: CometD.ConfigurationOptions): void;
+    
+    subscribe(channel: string, listener: (message: any) => void): void;
 
     addListener(channel: string, listener: (message: any) => void): void;
     removeListener(listener: (message: any) => void): void;
diff --git a/types/common-prefix/common-prefix-tests.ts b/types/common-prefix/common-prefix-tests.ts
new file mode 100644
index 0000000000..5de96a5358
--- /dev/null
+++ b/types/common-prefix/common-prefix-tests.ts
@@ -0,0 +1,4 @@
+import common = require('common-prefix'); // common is(string: ReadOnlyArray<string>) => string
+
+// $ExpectType string
+common(['a']);
diff --git a/types/common-prefix/index.d.ts b/types/common-prefix/index.d.ts
new file mode 100644
index 0000000000..482e880f05
--- /dev/null
+++ b/types/common-prefix/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for common-prefix 1.1
+// Project: https://github.com/hughsk/common-prefix
+// Definitions by: Sean Marvi Oliver Genabe <https://github.com/seangenabe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function common(strings: ReadonlyArray<string>): string;
+
+export = common;
diff --git a/types/common-prefix/tsconfig.json b/types/common-prefix/tsconfig.json
new file mode 100644
index 0000000000..e7b8748dee
--- /dev/null
+++ b/types/common-prefix/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "common-prefix-tests.ts"
+    ]
+}
diff --git a/types/common-prefix/tslint.json b/types/common-prefix/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/common-prefix/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/commondir/commondir-tests.ts b/types/commondir/commondir-tests.ts
new file mode 100644
index 0000000000..33adefb491
--- /dev/null
+++ b/types/commondir/commondir-tests.ts
@@ -0,0 +1,14 @@
+import commondir = require('commondir');
+
+// $ExpectType string
+commondir('wwwroot', [
+    'static_files/png/',
+    '../gif/image.gif',
+]);
+
+// $ExpectType string
+commondir([
+    '/x/y/z',
+    '/x/y',
+    '/x/y/w/q',
+]);
diff --git a/types/commondir/index.d.ts b/types/commondir/index.d.ts
new file mode 100644
index 0000000000..ac75d00d00
--- /dev/null
+++ b/types/commondir/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for commondir 1.0
+// Project: https://github.com/substack/node-commondir
+// Definitions by: Leonard Thieu <https://github.com/leonard-thieu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = commondir;
+
+/**
+ * Compute the closest common parent directory for an array absolutePaths.
+ *
+ * @see \`{@link https://github.com/substack/node-commondir#commondirabsolutepaths }\`
+ */
+declare function commondir(basedir: string, relativePaths: string[]): string;
+/**
+ * Compute the closest common parent directory for an array relativePaths which will be resolved for each dir in
+ * relativePaths according to: path.resolve(basedir, dir).
+ *
+ * @see \`{@link https://github.com/substack/node-commondir#commondirbasedir-relativepaths }\`
+ */
+declare function commondir(absolutePaths: string[]): string;
diff --git a/types/commondir/tsconfig.json b/types/commondir/tsconfig.json
new file mode 100644
index 0000000000..e00a5278b8
--- /dev/null
+++ b/types/commondir/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",
+        "commondir-tests.ts"
+    ]
+}
diff --git a/types/commondir/tslint.json b/types/commondir/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/commondir/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/commonmark/index.d.ts b/types/commonmark/index.d.ts
index 01b9541efa..96bb2774c5 100644
--- a/types/commonmark/index.d.ts
+++ b/types/commonmark/index.d.ts
@@ -64,7 +64,7 @@ export class Node {
     /**
      * either Bullet or Ordered (or undefined).
      */
-    listType: 'Bullet' | 'Ordered';
+    listType: 'bullet' | 'ordered';
     /**
      * true if list is tight
      */
diff --git a/types/compute-quantile/compute-quantile-tests.ts b/types/compute-quantile/compute-quantile-tests.ts
new file mode 100644
index 0000000000..8a4c51ea3d
--- /dev/null
+++ b/types/compute-quantile/compute-quantile-tests.ts
@@ -0,0 +1,13 @@
+import quantile = require('compute-quantile');
+
+// $ExpectType number
+quantile([1, 2, 3], 0.5);
+
+// $ExpectType number
+quantile([1, 2, 3], 0.5, undefined);
+
+// $ExpectType number
+quantile([1, 2, 3], 0.5, {});
+
+// $ExpectType number
+quantile([1, 2, 3], 0.5, { sorted: true });
diff --git a/types/compute-quantile/index.d.ts b/types/compute-quantile/index.d.ts
new file mode 100644
index 0000000000..05d83b65f4
--- /dev/null
+++ b/types/compute-quantile/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for compute-quantile 1.0
+// Project: https://github.com/compute-io/quantile
+// Definitions by: mrmlnc <https://github.com/mrmlnc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Computes a quantile for a numeric array.
+ */
+declare function quantile(array: ArrayLike<number>, quantile: number, options?: quantile.Options): number;
+
+declare namespace quantile {
+    interface Options {
+        /**
+         * If the input `array` is already sorted in `__ascending__` order, you can set the `sorted` option to `true`.
+         *
+         * @default
+         * false
+         */
+        sorted?: boolean;
+    }
+}
+
+export = quantile;
diff --git a/types/compute-quantile/tsconfig.json b/types/compute-quantile/tsconfig.json
new file mode 100644
index 0000000000..29d10580e3
--- /dev/null
+++ b/types/compute-quantile/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-quantile-tests.ts"
+    ]
+}
diff --git a/types/compute-quantile/tslint.json b/types/compute-quantile/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/compute-quantile/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/config-yaml/config-yaml-tests.ts b/types/config-yaml/config-yaml-tests.ts
new file mode 100644
index 0000000000..4ddf61e69f
--- /dev/null
+++ b/types/config-yaml/config-yaml-tests.ts
@@ -0,0 +1,5 @@
+import yaml = require('config-yaml');
+
+yaml('./simple.yaml');
+yaml('./simple.yaml', { encoding: 'gbk' });
+yaml('./simple.yaml', { encoding: 'utf-8' });
diff --git a/types/config-yaml/index.d.ts b/types/config-yaml/index.d.ts
new file mode 100644
index 0000000000..6f2be7957b
--- /dev/null
+++ b/types/config-yaml/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for config-yaml 1.1
+// Project: https://github.com/neolao/config-yaml#readme
+// Definitions by: My Self <https://github.com/me>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+import * as fs from 'fs';
+
+export = Yaml;
+
+declare namespace Yaml {
+    interface Options {
+        encoding: string;
+    }
+}
+
+declare function Yaml(path: fs.PathLike, options?: Partial<Yaml.Options>): any;
diff --git a/types/config-yaml/tsconfig.json b/types/config-yaml/tsconfig.json
new file mode 100644
index 0000000000..fa349a2f41
--- /dev/null
+++ b/types/config-yaml/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "allowSyntheticDefaultImports": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "config-yaml-tests.ts"
+    ]
+}
diff --git a/types/config-yaml/tslint.json b/types/config-yaml/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/config-yaml/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/connect-mongo/index.d.ts b/types/connect-mongo/index.d.ts
index cf3d5ddb3e..ee110ab6b0 100644
--- a/types/connect-mongo/index.d.ts
+++ b/types/connect-mongo/index.d.ts
@@ -104,11 +104,11 @@ declare namespace connectMongo {
     }
 
     export class MongoStore extends session.Store {
-        get: (sid: string, callback: (err: any, session: Express.Session) => void) => void;
+        get: (sid: string, callback: (err: any, session: Express.Session | null) => void) => void;
         set: (sid: string, session: Express.Session, callback?: (err: any) => void) => void;
         destroy: (sid: string, callback?: (err: any) => void) => void;
         length: (callback: (err: any, length: number) => void) => void;
-        clear: (callback?: (err: any) => void) => void;
+        clear: (callback?: (err?: any) => void) => void;
         touch: (sid: string, session: Express.Session, callback?: (err: any) => void) => void;
     }
 }
diff --git a/types/connect-mongo/tsconfig.json b/types/connect-mongo/tsconfig.json
index ca12068b57..c0c9ab3043 100644
--- a/types/connect-mongo/tsconfig.json
+++ b/types/connect-mongo/tsconfig.json
@@ -7,7 +7,10 @@
         "paths": {
             "mongodb": [
                 "mongodb/v2"
-            ]
+            ],
+            "mongoose": [
+                "mongoose/v4" 
+             ]
         },
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -25,4 +28,4 @@
         "index.d.ts",
         "connect-mongo-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/connect-mongodb-session/connect-mongodb-session-tests.ts b/types/connect-mongodb-session/connect-mongodb-session-tests.ts
new file mode 100644
index 0000000000..963be905c0
--- /dev/null
+++ b/types/connect-mongodb-session/connect-mongodb-session-tests.ts
@@ -0,0 +1,39 @@
+import * as express from 'express'
+import session = require('express-session')
+import connectMongo = require('connect-mongodb-session')
+let MongoDBStore = connectMongo(session)
+
+var app = express();
+var store = new MongoDBStore({
+  uri: 'mongodb://localhost:27017/connect_mongodb_session_test',
+  collection: 'mySessions'
+}, function(error) {
+    // some connection error occur
+});
+
+store.on('connected', function() {
+  store.client; // The underlying MongoClient object from the MongoDB driver
+});
+
+// Catch errors
+store.on('error', function(error) {
+});
+
+app.use(require('express-session')({
+  secret: 'This is a secret',
+  cookie: {
+    maxAge: 1000 * 60 * 60 * 24 * 7 // 1 week
+  },
+  store: store,
+  // Boilerplate options, see:
+  // * https://www.npmjs.com/package/express-session#resave
+  // * https://www.npmjs.com/package/express-session#saveuninitialized
+  resave: true,
+  saveUninitialized: true
+}));
+
+app.get('/', function(req, res) {
+  res.send('Hello ' + JSON.stringify(req.session));
+});
+
+const server = app.listen(3000);
\ No newline at end of file
diff --git a/types/connect-mongodb-session/index.d.ts b/types/connect-mongodb-session/index.d.ts
new file mode 100644
index 0000000000..c328a211b2
--- /dev/null
+++ b/types/connect-mongodb-session/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for connect-mongodb-session
+// Project: https://github.com/kcbanner/connect-mongodb-session
+// Definitions by: Nattapong Sirilappanich <https://github.com/NattapongSiri>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="express-session" />
+
+import session = require('express-session');
+import * as express from 'express';
+import {MongoClient, MongoClientOptions} from 'mongodb'
+
+declare function connect(fn : (options?: session.SessionOptions) => express.RequestHandler) : connectMongodbSession.MongoDBStore
+
+declare namespace connectMongodbSession {
+    export interface MongoDBStore extends session.Store {
+        client : MongoClient
+        new(connection?: ConnectionInfo, callback?: (error : Error) => void) : MongoDBStore
+    }
+
+    export interface ConnectionInfo {
+        idField? : string
+        collection : string
+        connectionOptions?: MongoClientOptions
+        databaseName?: string
+        expires?: number
+        uri : string
+    }
+}
+
+export = connect
\ No newline at end of file
diff --git a/types/connect-mongodb-session/tsconfig.json b/types/connect-mongodb-session/tsconfig.json
new file mode 100644
index 0000000000..61b0db83b2
--- /dev/null
+++ b/types/connect-mongodb-session/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "baseUrl": "../",
+        "forceConsistentCasingInFileNames": true,
+        "lib": [
+            "es6"
+        ],
+        "module": "commonjs",
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [
+        ]
+    },
+    "files": [
+        "connect-mongodb-session-tests.ts",
+        "index.d.ts"
+    ],
+    "exclude": [
+        "node_modules"
+    ]
+}
\ No newline at end of file
diff --git a/types/interact.js/tslint.json b/types/connect-mongodb-session/tslint.json
similarity index 100%
rename from types/interact.js/tslint.json
rename to types/connect-mongodb-session/tslint.json
diff --git a/types/console-log-level/console-log-level-tests.ts b/types/console-log-level/console-log-level-tests.ts
new file mode 100644
index 0000000000..3df123421b
--- /dev/null
+++ b/types/console-log-level/console-log-level-tests.ts
@@ -0,0 +1,20 @@
+import consoleLogLevel = require("console-log-level");
+
+const logger1 = consoleLogLevel({
+    level: "trace",
+    stderr: undefined,
+    prefix: () => "SOME PREFIX"
+});
+
+const logger2 = consoleLogLevel({
+    level: "trace",
+    stderr: true,
+    prefix: "OTHER PREFIX"
+});
+
+logger1.trace("hello %s", "world");
+logger2.debug("hello %s", "world");
+logger2.info("hello %s", "world");
+logger2.warn("hello %s", "world");
+logger2.error("hello %s", "world");
+logger2.fatal("hello %s", "world");
diff --git a/types/console-log-level/index.d.ts b/types/console-log-level/index.d.ts
new file mode 100644
index 0000000000..3a70f850df
--- /dev/null
+++ b/types/console-log-level/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for console-log-level 1.4
+// Project: https://github.com/watson/console-log-level
+// Definitions by: Ali Ijaz Sheikh <https://github.com/ofrobots>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+type PrefixFunction = (level: string) => string;
+
+declare namespace consoleLogLevel {
+    type LogLevelNames =
+        "trace" | "debug" | "info" | "warn" | "error" | "fatal";
+    type Logger = Record<LogLevelNames, (...args: any[]) => void>;
+}
+
+interface Options {
+    level?: consoleLogLevel.LogLevelNames;
+    prefix?: string | PrefixFunction;
+    stderr?: boolean;
+}
+
+declare function consoleLogLevel(opts: Options): consoleLogLevel.Logger;
+
+export = consoleLogLevel;
diff --git a/types/console-log-level/tsconfig.json b/types/console-log-level/tsconfig.json
new file mode 100644
index 0000000000..3fcb21220b
--- /dev/null
+++ b/types/console-log-level/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",
+        "console-log-level-tests.ts"
+    ]
+}
diff --git a/types/console-log-level/tslint.json b/types/console-log-level/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/console-log-level/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/console-stamp/console-stamp-tests.ts b/types/console-stamp/console-stamp-tests.ts
index d4dad4d695..55408d318a 100644
--- a/types/console-stamp/console-stamp-tests.ts
+++ b/types/console-stamp/console-stamp-tests.ts
@@ -15,6 +15,8 @@ var options2 = {
 		label: "white",
 		metadata: "green"
 	},
-	label: true
+	label: true,
+	labelPrefix: '[',
+	labelSuffix: ']'
 };
 consoleStamp(console, options2);
diff --git a/types/console-stamp/index.d.ts b/types/console-stamp/index.d.ts
index c7b9547cc8..5912b6876e 100644
--- a/types/console-stamp/index.d.ts
+++ b/types/console-stamp/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for console-stamp 0.2.0
 // Project: https://github.com/starak/node-console-stamp
 // Definitions by: Eric Byers <https://github.com/ericbyers>
+//                 Guus De Graeve <https://github.com/guusdegraeve>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -16,6 +17,16 @@ declare function consoleStamp(console: {}, options?: {
      */
     label?: boolean;
 
+    /**
+     * A custom prefix for the label.
+     */
+    labelPrefix?: string;
+
+    /**
+     * A custom suffix for the label.
+     */
+    labelSuffix?: string;
+
     /**
      * An array containing the methods to include in the patch
      */
diff --git a/types/consolidate/index.d.ts b/types/consolidate/index.d.ts
index bfe432214f..23f431d8f8 100644
--- a/types/consolidate/index.d.ts
+++ b/types/consolidate/index.d.ts
@@ -2,13 +2,13 @@
 // Project: https://github.com/visionmedia/consolidate.js
 // Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>, Theo Sherry <https://github.com/theosherry>, Nicolas Henry <https://github.com/nicolashenry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 // Imported from: https://github.com/soywiz/typescript-node-definitions/consolidate.d.ts
 
 /// <reference types="node" />
-/// <reference types="bluebird" />
 
+import Promise = require("bluebird");
 
 declare var cons: Consolidate;
 
diff --git a/types/consolidate/tslint.json b/types/consolidate/tslint.json
index a41bf5d19a..a403f5da2b 100644
--- a/types/consolidate/tslint.json
+++ b/types/consolidate/tslint.json
@@ -4,6 +4,7 @@
         "adjacent-overload-signatures": false,
         "array-type": false,
         "arrow-return-shorthand": false,
+        "await-promise": false,
         "ban-types": false,
         "callable-types": false,
         "comment-format": false,
diff --git a/types/cookie-session/index.d.ts b/types/cookie-session/index.d.ts
index 001ba646d5..a0b7a2e6b0 100644
--- a/types/cookie-session/index.d.ts
+++ b/types/cookie-session/index.d.ts
@@ -78,17 +78,17 @@ declare namespace CookieSessionInterfaces {
         /**
          * Is true if the session has been changed during the request.
          */
-        isChanged: boolean;
+        isChanged?: boolean;
 
         /**
          * Is true if the session is new.
          */
-        isNew: boolean;
+        isNew?: boolean;
 
         /**
          * Determine if the session has been populated with data or is empty.
          */
-        isPopulated: boolean;
+        isPopulated?: boolean;
 
         [propertyName: string]: any;
     }
@@ -97,7 +97,7 @@ declare namespace CookieSessionInterfaces {
         /**
          * Represents the session for the given request.
          */
-        session: CookieSessionObject;
+        session?: CookieSessionObject;
 
         /**
          * Represents the session options for the current request. These options are a shallow clone of what was provided at middleware construction and can be altered to change cookie setting behavior on a per-request basis.
diff --git a/types/cookiejar/cookiejar-tests.ts b/types/cookiejar/cookiejar-tests.ts
new file mode 100644
index 0000000000..9cc131e433
--- /dev/null
+++ b/types/cookiejar/cookiejar-tests.ts
@@ -0,0 +1,92 @@
+import cookiejarLib = require('cookiejar');
+
+const { Cookie, CookieAccessInfo, CookieJar } = cookiejarLib;
+
+// Original test: https://github.com/bmeck/node-cookiejar/blob/master/tests/test.js
+
+let testCookie = new Cookie("a=1;domain=.test.com;path=/");
+// assert.equal(testCookie.name, "a");
+// assert.equal(testCookie.value, "1");
+// assert.equal(testCookie.domain, ".test.com");
+// assert.equal(testCookie.path, "/");
+// assert.equal(testCookie.secure, false);
+// assert.equal(testCookie.expiration_date, Infinity);
+
+// assert.deepEqual(testCookie, new Cookie("a=1;domain=.test.com;path=/"));
+// assert.ok(testCookie.collidesWith(new Cookie("a=1;domain=.test.com;path=/")));
+
+testCookie = new Cookie("a=1;path=/", ".test.com");
+// assert.equal(testCookie.domain, ".test.com");
+
+// Test CookieJar
+const testCookieJar = new CookieJar();
+testCookieJar.setCookies([
+ "a=1;domain=.test.com;path=/",
+ "b=2;domain=test.com;path=/",
+ "c=3;domain=test.com;path=/;expires=January 1, 1970"
+].join(':'));
+
+let testCookies = testCookieJar.getCookies(new CookieAccessInfo("test.com", "/"));
+// assert.equal(testCookies.length, 2, "Expires on setCookies fail\n" + testCookies.toString());
+// assert.equal(testCookies.toValueString(), 'a=1;b=2', "Cannot get value string of multiple cookies");
+
+testCookies = testCookieJar.getCookies(new CookieAccessInfo("www.test.com", "/"));
+// assert.equal(testCookies.length, 2, "Wildcard domain fail\n" + testCookies.toString());
+
+testCookieJar.setCookies("b=2;domain=test.com;path=/;expires=January 1, 1970");
+testCookies = testCookieJar.getCookies(new CookieAccessInfo("test.com", "/"));
+// assert.equal(testCookies.length, 1, "Delete cookie fail\n" + testCookies.toString());
+// assert.equal(String(testCookieJar.getCookies(new CookieAccessInfo("test.com", "/"))), "a=1; domain=.test.com; path=/");
+
+testCookie = new Cookie("a=1;domain=test.com;path=/;HttpOnly");
+// assert.ok(testCookie.noscript, "HttpOnly flag parsing failed\n" + testCookie.toString());
+
+const testCookieJar2 = new CookieJar();
+testCookieJar2.setCookies([
+    "a=1;domain=.test.com;path=/",
+    "a=1;domain=.test.com;path=/",
+    "a=2;domain=.test.com;path=/",
+    "b=3;domain=.test.com;path=/"
+]);
+testCookies = testCookieJar2.getCookies(new CookieAccessInfo("test.com", "/"));
+// assert.equal(testCookies.length, 2);
+// assert.equal(testCookies[0].value, 2);
+
+// Test pure appending
+testCookieJar2.setCookie("d=4;domain=.test.com;path=/");
+testCookies = testCookieJar2.getCookies(new CookieAccessInfo("test.com", "/"));
+// assert.equal(testCookies.length, 3);
+// assert.equal(testCookies[2].value, 4);
+
+// Test Ignore Trailing Semicolons (Github Issue #6)
+testCookie = new Cookie("a=1;domain=.test.com;path=/;;;;");
+// assert.equal(testCookie.name, "a");
+// assert.equal(testCookie.value, "1");
+// assert.equal(testCookie.domain, ".test.com");
+// assert.equal(testCookie.path, "/");
+// assert.deepEqual(testCookie, new Cookie("a=1;domain=.test.com;path=/"));
+
+// Test request_path and request_domain
+testCookieJar2.setCookie(new Cookie("sub=4;path=/", "test.com"));
+testCookie = testCookieJar2.getCookie("sub", new CookieAccessInfo("sub.test.com", "/"));
+// assert.equal(testCookie, undefined);
+
+testCookie = testCookieJar2.getCookie("sub", new CookieAccessInfo("test.com", "/"));
+// assert.equal(testCookie.name, "sub");
+// assert.equal(testCookie.domain, "test.com");
+
+testCookieJar2.setCookie(new Cookie("sub=4;path=/accounts", "test.com", "/accounts"));
+testCookie = testCookieJar2.getCookie("sub", new CookieAccessInfo("test.com", "/foo"));
+// assert.equal(testCookie, undefined);
+
+testCookie = testCookieJar2.getCookie("sub", new CookieAccessInfo("test.com", "/accounts"));
+// assert.equal(testCookie.path, "/accounts");
+
+testCookieJar2.setCookie(new Cookie("sub=5;path=/", "test.com", "/accounts"));
+testCookies = testCookieJar2.getCookies(new CookieAccessInfo("test.com"));
+// assert.equal(testCookies.length, 4);
+
+testCookieJar2.setCookie(new Cookie("sub=5;path=/", "test.com", "/accounts"));
+testCookie = testCookieJar2.getCookie('sub', CookieAccessInfo.All);
+// assert(testCookie);
+// assert.equal(testCookie.name, 'sub');
diff --git a/types/cookiejar/index.d.ts b/types/cookiejar/index.d.ts
new file mode 100644
index 0000000000..ba50b63ea2
--- /dev/null
+++ b/types/cookiejar/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for CookieJar 2.1
+// Project: https://github.com/bmeck/node-cookiejar
+// Definitions by: Rafal Proszowski <https://github.com/paroxp>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export class CookieAccessInfo {
+    /**
+     * Class to determine matching qualities of a cookie
+     * @param domain string domain to match
+     * @param path string path to match
+     * @param secure boolean access is secure (ssl generally)
+     * @param script boolean access is from a script
+     */
+    constructor(domain: string, path?: string, secure?: boolean, script?: boolean);
+
+    static All: CookieAccessInfo;
+    domain: string; // domain to match
+    path: string; // path to match
+    secure: boolean; // access is secure (ssl generally)
+    script: boolean; // access is from a script
+}
+
+export class Cookie {
+    name: string; // name of the cookie
+    value: string; // string associated with the cookie
+    domain: string; // domain to match (on a cookie a '.' at the start means a wildcard matching anything ending in the rest)
+    explicit_domain: boolean; // if the domain was explicitly set via the cookie string
+    path: string; // base path to match (matches any path starting with this '/' is root)
+    explicit_path: boolean; // if the path was explicitly set via the cookie string
+    noscript: boolean; // if it should be kept from scripts
+    secure: boolean; // should it only be transmitted over secure means
+    expiration_date: number; // number of millis since 1970 at which this should be removed
+
+    /**
+     * It turns input into a Cookie (singleton if given a Cookie), the
+     * request_domain argument is used to default the domain if it is not
+     * explicit in the cookie string, the request_path argument is used to set
+     * the path if it is not explicit in a cookie String.
+     *
+     * Explicit domains/paths will cascade, implied domains/paths must exactly
+     * match (see http://en.wikipedia.org/wiki/HTTP_cookie#Domain_and_Pat).
+     * @param cookie string or a cookie to work on
+     * @param requestDomain string argument is used to default the domain if it is not explicit in the cookie string
+     * @param requestPath string argument is used to set the path if it is not explicit in a cookie String
+     */
+    constructor(cookie: string | Cookie, requestDomain?: string, requestPath?: string);
+
+    /**
+     * the set-cookie: string for this cookie
+     */
+    toString(): string;
+
+    /**
+     * the cookie: string for this cookie
+     */
+    toValueString(): string;
+
+    /**
+     * parses the string onto this cookie or a new one if called directly
+     * @param cookie string to be parsed into a Cookie
+     * @param requestDomain string definind the requesting domain
+     * @param requestPath string defining the requesting path
+     */
+    parse(cookie: string, requestDomain?: string, requestPath?: string): Cookie;
+
+    /**
+     * returns true if the access_info allows retrieval of this cookie
+     * @param accessInfo CookieAccessInfo
+     */
+    matches(accessInfo: CookieAccessInfo): boolean;
+
+    /**
+     * returns true if the cookies cannot exist in the same space
+     * (domain and path match)
+     * @param cookie Cookie
+     */
+    collidesWith(cookie: Cookie): boolean;
+}
+
+export class CookieJar {
+    /**
+     * class to hold numerous cookies from multiple domains correctly
+     */
+    constructor();
+
+    /**
+     * modify (or add if not already-existing) a cookie to the jar
+     * @param cookie string | Cookie
+     * @param requestDomain string argument is used to default the domain if it is not explicit in the cookie string
+     * @param requestPath string argument is used to set the path if it is not explicit in a cookie String
+     */
+    setCookie(cookie: string | Cookie, requestDomain?: string, requestPath?: string): Cookie | false;
+
+    /**
+     * modify (or add if not already-existing) a large number of cookies to the
+     * jar
+     * @param cookie string or list of strings defining cookies
+     * @param requestDomain string argument is used to default the domain if it is not explicit in the cookie string
+     * @param requestPath string argument is used to set the path if it is not explicit in a cookie String
+     */
+    setCookies(cookie: string | ReadonlyArray<string>, requestDomain?: string, requestPath?: string): ReadonlyArray<Cookie> | false;
+
+    /**
+     * get a cookie with the name and access_info matching
+     * @param cookieName string to be parsed into a Cookie
+     * @param accessInfo CookieAccessInfo
+     */
+    getCookie(cookieName: string, accessInfo: CookieAccessInfo): Cookie;
+
+    /**
+     * grab all cookies matching this access_info
+     * @param accessInfo CookieAccessInfo
+     */
+    getCookies(accessInfo: CookieAccessInfo): ReadonlyArray<Cookie>;
+}
diff --git a/types/cookiejar/tsconfig.json b/types/cookiejar/tsconfig.json
new file mode 100644
index 0000000000..7fbf974ede
--- /dev/null
+++ b/types/cookiejar/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",
+        "cookiejar-tests.ts"
+    ]
+}
diff --git a/types/cookiejar/tslint.json b/types/cookiejar/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cookiejar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/copy-webpack-plugin/index.d.ts b/types/copy-webpack-plugin/index.d.ts
index eedf42f450..59c1b8d0cb 100644
--- a/types/copy-webpack-plugin/index.d.ts
+++ b/types/copy-webpack-plugin/index.d.ts
@@ -61,7 +61,7 @@ interface CopyWebpackPluginConfiguration {
 }
 
 interface CopyWebpackPlugin {
-    new (patterns?: CopyPattern[], options?: CopyWebpackPluginConfiguration): Plugin
+    new (patterns?: (string | CopyPattern)[], options?: CopyWebpackPluginConfiguration): Plugin
 }
 
 declare const copyWebpackPlugin: CopyWebpackPlugin
diff --git a/types/cosmiconfig/cosmiconfig-tests.ts b/types/cosmiconfig/cosmiconfig-tests.ts
index c477eedb3e..f25337f3d3 100644
--- a/types/cosmiconfig/cosmiconfig-tests.ts
+++ b/types/cosmiconfig/cosmiconfig-tests.ts
@@ -1,4 +1,5 @@
-import cosmiconfig, { CosmiconfigResult } from "cosmiconfig";
+import cosmiconfig = require("cosmiconfig");
+import { CosmiconfigResult } from "cosmiconfig";
 import * as path from "path";
 
 const explorer = cosmiconfig("yourModuleName", {
diff --git a/types/cosmiconfig/index.d.ts b/types/cosmiconfig/index.d.ts
index 16ba1967f3..94e28e9dab 100644
--- a/types/cosmiconfig/index.d.ts
+++ b/types/cosmiconfig/index.d.ts
@@ -3,57 +3,62 @@
 // Definitions by: ozum <https://github.com/ozum>
 //                 szeck87 <https://github.com/szeck87>
 //                 saadq <https://github.com/saadq>
+//                 jinwoo <https://github.com/jinwoo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 /// <reference types="node" />
 
-export interface Config {
-  [key: string]: any;
+declare function cosmiconfig(moduleName: string, options?: cosmiconfig.ExplorerOptions): cosmiconfig.Explorer;
+
+declare namespace cosmiconfig {
+  interface Config {
+    [key: string]: any;
+  }
+
+  type CosmiconfigResult = {
+    config: Config;
+    filepath: string;
+    isEmpty?: boolean;
+  } | null;
+
+  interface LoaderResult {
+    config: Config | null;
+    filepath: string;
+  }
+
+  type SyncLoader = (filepath: string, content: string) => Config | null;
+  type AsyncLoader = (filepath: string, content: string) => Config | null | Promise<object | null>;
+
+  interface LoaderEntry {
+    sync?: SyncLoader;
+    async?: AsyncLoader;
+  }
+
+  interface Loaders {
+    [key: string]: LoaderEntry;
+  }
+
+  interface Explorer {
+    search(searchFrom?: string): Promise<null | CosmiconfigResult>;
+    searchSync(searchFrom?: string): null | CosmiconfigResult;
+    load(loadPath: string): Promise<CosmiconfigResult>;
+    loadSync(loadPath: string): CosmiconfigResult;
+    clearLoadCache(): void;
+    clearSearchCache(): void;
+    clearCaches(): void;
+  }
+
+  // These are the user options with defaults applied.
+  interface ExplorerOptions {
+    stopDir?: string;
+    cache?: boolean;
+    transform?: (result: CosmiconfigResult) => Promise<CosmiconfigResult> | CosmiconfigResult;
+    packageProp?: string;
+    loaders?: Loaders;
+    searchPlaces?: string[];
+    ignoreEmptySearchPlaces?: boolean;
+  }
 }
 
-export type CosmiconfigResult = {
-  config: Config;
-  filepath: string;
-  isEmpty?: boolean;
-} | null;
-
-export interface LoaderResult {
-  config: Config | null;
-  filepath: string;
-}
-
-export type SyncLoader = (filepath: string, content: string) => Config | null;
-export type AsyncLoader = (filepath: string, content: string) => Config | null | Promise<object | null>;
-
-export interface LoaderEntry {
-  sync?: SyncLoader;
-  async?: AsyncLoader;
-}
-
-export interface Loaders {
-  [key: string]: LoaderEntry;
-}
-
-export interface Explorer {
-  search(searchFrom?: string): Promise<null | CosmiconfigResult>;
-  searchSync(searchFrom?: string): null | CosmiconfigResult;
-  load(loadPath: string): Promise<CosmiconfigResult>;
-  loadSync(loadPath: string): CosmiconfigResult;
-  clearLoadCache(): void;
-  clearSearchCache(): void;
-  clearCaches(): void;
-}
-
-// These are the user options with defaults applied.
-export interface ExplorerOptions {
-  stopDir?: string;
-  cache?: boolean;
-  transform?: (result: CosmiconfigResult) => Promise<CosmiconfigResult> | CosmiconfigResult;
-  packageProp?: string;
-  loaders?: Loaders;
-  searchPlaces?: string[];
-  ignoreEmptySearchPlaces?: boolean;
-}
-
-export default function cosmiconfig(moduleName: string, options?: ExplorerOptions): Explorer;
+export = cosmiconfig;
diff --git a/types/couchbase/couchbase-tests.ts b/types/couchbase/couchbase-tests.ts
index 547133754b..e6ea7c12d3 100644
--- a/types/couchbase/couchbase-tests.ts
+++ b/types/couchbase/couchbase-tests.ts
@@ -1,14 +1,167 @@
 import couchbase = require('couchbase');
 var cluster = new couchbase.Cluster('couchbase://127.0.0.1');
+
+cluster.authenticate('username', 'password');
+cluster.authenticate({username: 'username', password: 'password'});
+cluster.authenticate(new couchbase.ClassicAuthenticator({'bucket': 'password'}, 'username', 'password'));
+
 var bucket = cluster.openBucket('default');
+var N1qlQuery = couchbase.N1qlQuery;
 
-bucket.upsert('testdoc', { name: 'Frank' }, (error) => {
-    if (error) throw error;
+bucket.on('connect', () => console.error('Connected!'));
+bucket.on('error', err => console.error('Connection failed!'));
 
-    bucket.get('testdoc', (err, result) => {
-        if (err) throw err;
+bucket.once('connect', () => console.error('Connected!'));
+bucket.once('error', err => console.error('Connection failed!'));
 
-        console.log(result.value);
-        // {name: Frank} 
+bucket.manager().createPrimaryIndex(function() {
+    bucket.upsert('user:king_arthur', {
+        'email': 'kingarthur@couchbase.com', 'interests': ['Holy Grail', 'African Swallows']
+    },
+    function(err, result) {
+        bucket.get('user:king_arthur', function(err, result) {
+            console.log('Got result: %j', result.value);
+            bucket.query(
+                N1qlQuery.fromString('SELECT * FROM bucketname WHERE $1 in interests LIMIT 1'),
+                ['African Swallows'],
+                function(err, rows) {
+                    console.log("Got rows: %j", rows);
+                });
+        });
     });
-});
\ No newline at end of file
+});
+
+// Ensure bucket.upsert is composable with normal callbacks
+function composable(callback: (err?: Error) => void) {
+    bucket.upsert('key', {value: 1}, callback);
+}
+
+// From https://developer.couchbase.com/documentation/server/current/sdk/nodejs/n1ql-queries-with-sdk.html
+function n1ql_a() {
+    const n1qlquery = N1qlQuery.fromString('SELECT name, email FROM users WHERE name=$1');
+    bucket.query(n1qlquery, ['Monty Python'], function(err, rows) {
+    // ...
+    });
+}
+
+function n1ql_b() {
+    const q = N1qlQuery.fromString('SELECT * FROM `travel-sample` LIMIT 10');
+    const req = bucket.query(q);
+    req.on('row', function(row) {
+    console.log('Got a row');
+    });
+    req.on('error', function(err) {
+    console.error('Got error %j', err);
+    });
+    req.on('end', function(meta) {
+    console.log('All rows received. Metadata is %j:', meta);
+    });
+}
+
+function n1ql_c() {
+    // Insert a document with a random x value
+    bucket.upsert('test-doc', {x: Math.round(Math.random()*10000000)}, function(err, res) {
+        if (err) {
+        throw err;
+        }
+
+        var qs = 'SELECT t.*, TOSTRING(META().cas) AS `_cas` FROM `travel-sample` t WHERE META().id="test-doc"';
+        var q = couchbase.N1qlQuery.fromString(qs);
+        q.consistency(couchbase.N1qlQuery.Consistency.REQUEST_PLUS);
+        bucket.query(q, function(err, rows) {
+            if (err) {
+                throw err;
+            }
+
+            if (rows.length !== 1) {
+                throw new Error('unexpected number of rows');
+            }
+
+            console.log('Query Result:', rows[0]);
+
+            var cas = rows[0]._cas;
+            var doc = rows[0];
+            delete(doc._cas);
+            doc.y = doc.x;
+
+            bucket.replace('test-doc', doc, {cas: cas}, function(err) {
+                if (err) {
+                    throw err;
+                }
+
+                bucket.get('test-doc', function(err, res) {
+                if (err) {
+                    throw err;
+                }
+
+                console.log('Updated:', res.value);
+
+                process.exit(0);
+                });
+            });
+        });
+    });
+}
+
+// From https://developer.couchbase.com/documentation/server/current/sdk/nodejs/full-text-searching-with-sdk.html
+const SearchQuery = couchbase.SearchQuery;
+const SearchFacet = couchbase.SearchFacet;
+
+function search_a() {
+    let searchQuery = SearchQuery.new('travel-search', SearchQuery.term('office'));
+    bucket.query(searchQuery, function(err, res, meta) {
+        for (var i = 0; i < res.length; ++i) {
+            console.log('Hit:', res[i].id);
+        }
+    });
+}
+
+function search_b() {
+    const searchQuery = SearchQuery.new('travel-search', SearchQuery.term('office'));
+    searchQuery.addFacet('countries', SearchFacet.term('country', 5));
+    bucket.query(searchQuery, function(err, res, meta) {
+        console.log('Total Countries:', meta.facets['countries'].total);
+    });
+}
+
+// From https://developer.couchbase.com/documentation/server/5.1/sdk/nodejs/view-queries-with-sdk.html
+const ViewQuery = couchbase.ViewQuery;
+
+function view_a() {
+    var query = ViewQuery.from('beer', 'by_name').skip(6).limit(3);
+    bucket.query(query, function(err, results) {
+        for(let i in results)
+            console.log(results[i]);
+    });
+}
+
+function view_b() {
+    var SpatialQuery = couchbase.SpatialQuery;
+
+    var query = SpatialQuery.from('spatial', 'by_location').limit(10);
+    bucket.query(query, function(err, results) {
+        for(let i in results)
+            console.log(results[i]);
+    });
+}
+
+// From https://developer.couchbase.com/documentation/server/current/sdk/nodejs/sample-app-backend.html
+function userSearch(location: string | undefined, description: string | undefined) {
+    var qp = couchbase.SearchQuery.conjuncts(couchbase.SearchQuery.term('hotel').field('type'));
+    if (location && location !== '*') {
+        qp.and(couchbase.SearchQuery.disjuncts(
+            couchbase.SearchQuery.matchPhrase(location).field("country"),
+            couchbase.SearchQuery.matchPhrase(location).field("city"),
+            couchbase.SearchQuery.matchPhrase(location).field("state"),
+            couchbase.SearchQuery.matchPhrase(location).field("address")
+        ));
+    }
+
+    if (description && description !== '*') {
+        qp.and(
+            couchbase.SearchQuery.disjuncts(
+                couchbase.SearchQuery.matchPhrase(description).field("description"),
+                couchbase.SearchQuery.matchPhrase(description).field("name")
+            ));
+    }
+}
diff --git a/types/couchbase/index.d.ts b/types/couchbase/index.d.ts
index eb945af458..813ee8f110 100644
--- a/types/couchbase/index.d.ts
+++ b/types/couchbase/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for Couchbase Node.js SDK 2.1.2
+// Type definitions for Couchbase Node.js SDK 2.4.5
 // Project: https://github.com/couchbase/couchnode
 // Definitions by: Marwan Aouida <https://github.com/maouida>
+//      Brian Crowell <https://github.com/fluggo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
@@ -144,10 +145,75 @@ declare enum errors {
     restError
 }
 
+/**
+ * Virtual base for authenticators.
+ */
+declare interface Authenticator {
+    username: string;
+    password: string;
+}
+
+/**
+ * Authenticator for using classic authentication.
+ */
+declare class ClassicAuthenticator implements Authenticator {
+    /**
+     * Create a new instance of the ClassicAuthenticator class.
+     * @param buckets Map of bucket names to passwords.
+     * @param username Cluster administration username.
+     * @param password Cluster administration password.
+     */
+    constructor(buckets: {[key: string]: string}, username: string, password: string);
+
+    username: string;
+    password: string;
+}
+
+/**
+ * Authenticator for using role-based authentication.
+ */
+declare class PasswordAuthenticator implements Authenticator {
+    /**
+     * Create a new instance of the PasswordAuthenticator class.
+     * @param username RBAC username.
+     * @param password RBAC password.
+     */
+    constructor(username: string, password: string);
+
+    username: string;
+    password: string;
+}
+
+/**
+ * Authenticator for performing certificate-based authentication.
+ */
+declare class CertAuthenticator implements Authenticator {
+    /**
+     * Create a new instance of the CertAuthenticator class.
+     */
+    constructor();
+
+    username: string;
+    password: string;
+}
+
 /**
  * Represents a singular cluster containing your buckets.
  */
 declare class Cluster {
+    /**
+     * Authenticate to the cluster using role-based authentication.
+     * @param username RBAC username.
+     * @param password RBAC password.
+     */
+    authenticate(username: string, password: string): void;
+
+    /**
+     * Authenticate to the cluster using a specific authentication type.
+     * @param auther
+     */
+    authenticate(auther: Authenticator): void;
+
     /**
      * Create a new instance of the Cluster class.
      * @param cnstr The connection string for your cluster.
@@ -255,7 +321,17 @@ interface CouchbaseError extends Error {
     /**
      * The error code for this error.
      */
-    code: errors;
+    code?: errors;
+
+    /**
+     * Possible response body included with the error.
+     */
+    responseBody?: any;
+
+    /**
+     * Possible inner error for this error.
+     */
+    innerError?: CouchbaseError;
 }
 
 interface AppendOptions {
@@ -352,10 +428,198 @@ interface InsertOptions {
     replicate_to?: number;
 }
 
+interface CreateIndexOptions {
+    /**
+     * If a secondary index already exists, an error will be thrown unless this is set to true.
+     */
+    ignoreIfExists?: boolean;
+
+    /**
+     * True to defer building of the index until buildDeferredIndexes is called (or a direct call to the corresponding query service API).
+     */
+    deferred?: boolean;
+}
+
+interface CreatePrimaryIndexOptions {
+    /**
+     * The custom name for the primary index.
+     */
+    name?: string;
+
+    /**
+     * If a primary index already exists, an error will be thrown unless this is set to true.
+     */
+    ignoreIfExists?: boolean;
+
+    /**
+     * True to defer building of the index until buildDeferredIndexes is called (or a direct call to the corresponding query service API).
+     */
+    deferred?: boolean;
+}
+
+interface DropIndexOptions {
+    /**
+     * If true, attempting to drop on a bucket without the specified index won't cause an error to be thrown.
+     */
+    ignoreIfNotExists?: boolean;
+}
+
+interface DropPrimaryIndexOptions {
+    /**
+     * The custom name for the primary index.
+     */
+    name?: string;
+
+    /**
+     * If true, attempting to drop on a bucket without the specified index won't cause an error to be thrown.
+     */
+    ignoreIfNotExists?: boolean;
+}
+
+interface CreatePrimaryIndexOptions {
+    /**
+     * The custom name for the primary index.
+     */
+    name?: string;
+
+    /**
+     * If a primary index already exists, an error will be thrown unless this is set to true.
+     */
+    ignoreIfExists?: boolean;
+
+    /**
+     * True to defer building of the index until buildDeferredIndexes is called (or a direct call to the corresponding query service API).
+     */
+    deferred?: boolean;
+}
+
+interface IndexInfo {
+    /**
+     * ID for the index.
+     */
+    id: string;
+
+    /**
+     * Name for the index.
+     */
+    name: string;
+
+    /**
+     * List of index keys.
+     */
+    index_key: string[];
+
+    /**
+     * True if this is a primary index.
+     */
+    is_primary: boolean;
+
+    /**
+     * ID for the keyspace to which the index belongs.
+     */
+    keyspace_id: string;
+
+    /**
+     * ID for the namespace to which the index belongs.
+     */
+    namespace_id: string;
+
+    /**
+     * ID for the datastore to which the index belongs.
+     */
+    store_id: string;
+
+    /**
+     * The current state of the index.
+     *
+     * Values include `online` and `pending`.
+     */
+    state: string;
+
+    /**
+     * The type of view, which will always be `gsi`.
+     */
+    using: 'gsi';
+}
+
+interface WatchIndexesOptions {
+    /**
+     * Timeout for the operation in milliseconds.
+     */
+    timeout?: number;
+}
+
 /**
  * A class for performing management operations against a bucket. This class should not be instantiated directly, but instead through the use of the Bucket#manager method instead.
  */
 interface BucketManager {
+    /**
+     * Builds any indexes that were previously created with the deferred attribute.
+     * @param callback The callback function.
+     */
+    buildDeferredIndexes(callback: (err: CouchbaseError | null, deferredIndexes: string[]) => void): void;
+
+    /**
+     * Creates a non-primary GSI index with an optional name.
+     * @param indexName The name of the index.
+     * @param fields The JSON fields to index.
+     * @param options
+     * @param callback The callback function.
+     */
+    createIndex(indexName: string, fields: string[], callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Creates a non-primary GSI index with an optional name.
+     * @param indexName The name of the index.
+     * @param fields The JSON fields to index.
+     * @param options
+     * @param callback The callback function.
+     */
+    createIndex(indexName: string, fields: string[], options: CreateIndexOptions, callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Creates a primary GSI index with an optional name.
+     * @param options
+     * @param callback The callback function.
+     */
+    createPrimaryIndex(callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Creates a primary GSI index with an optional name.
+     * @param options
+     * @param callback The callback function.
+     */
+    createPrimaryIndex(options: CreateIndexOptions, callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Drops a specific GSI index by name.
+     * @param indexName The name of the index.
+     * @param options
+     * @param callback The callback function.
+     */
+    dropIndex(indexName: string, callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Drops a specific GSI index by name.
+     * @param indexName The name of the index.
+     * @param options
+     * @param callback The callback function.
+     */
+    dropIndex(indexName: string, options: DropIndexOptions, callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Drops a primary GSI index.
+     * @param options
+     * @param callback The callback function.
+     */
+    dropPrimaryIndex(callback: (err: CouchbaseError | null) => void): void;
+
+    /**
+     * Drops a primary GSI index.
+     * @param options
+     * @param callback The callback function.
+     */
+    dropPrimaryIndex(options: DropPrimaryIndexOptions, callback: (err: CouchbaseError | null) => void): void;
 
     /**
      * Flushes the cluster, deleting all data stored within this bucket. Note that this method requires the Flush permission to be enabled on the bucket from the management console before it will work.
@@ -376,6 +640,12 @@ interface BucketManager {
      */
     getDesignDocuments(callback: Function): void;
 
+    /**
+     * Retrieves a list of the indexes currently configured on the cluster.
+     * @param callback The callback function.
+     */
+    getIndexes(callback: (err: CouchbaseError | null, indexes: IndexInfo[] | null) => void): void;
+
     /**
      * Registers a design document to this bucket, failing if it already exists.
      * @param name
@@ -401,6 +671,21 @@ interface BucketManager {
      * @returns {}
      */
     upsertDesignDocument(name: string, data: any, callback: Function): void;
+
+    /**
+     * Watches a list of indexes, waiting for them to become available for use.
+     * @param watchList List of indexes to watch.
+     * @param callback The callback function.
+     */
+    watchIndexes(watchList: string[], callback: (err: Error | null) => void): void;
+
+    /**
+     * Watches a list of indexes, waiting for them to become available for use.
+     * @param watchList List of indexes to watch.
+     * @param options
+     * @param callback The callback function.
+     */
+    watchIndexes(watchList: string[], options: WatchIndexesOptions, callback: (err: Error | null) => void): void;
 }
 
 /**
@@ -571,6 +856,9 @@ declare namespace ViewQuery {
  * Class for dynamically construction of N1QL queries. This class should never be constructed directly, instead you should use the N1qlQuery.fromString static method to instantiate a N1qlStringQuery.
  */
 declare class N1qlQuery {
+    // Private declaration to avoid other queries being misstaken for N1qlQuery
+    private __nominal: void;
+
     /**
      * Creates a query object directly from the passed query string.
      * @param str
@@ -703,10 +991,654 @@ declare namespace SpatialQuery {
     }
 }
 
+declare abstract class SearchQuery {
+    /**
+     * Creates a new search query from an index name and search query definition.
+     * @param indexName The FTS index to search in.
+     * @param query The body of the FTS query.
+     */
+    static new(indexName: string, query: SearchQuery.Query): SearchQuery;
+
+    /**
+     * Creates a compound BooleanQuery composed of several other query objects.
+     */
+    static boolean(): SearchQuery.BooleanQuery;
+
+    /**
+     * Creates a BooleanFieldQuery for searching boolean fields in an index.
+     */
+    static booleanField(val: boolean): SearchQuery.BooleanFieldQuery;
+
+    /**
+     * Creates a query for matches all of a list of subqueries in an index.
+     */
+    static conjuncts(queries: ReadonlyArray<SearchQuery.Query>): SearchQuery.ConjunctionQuery;
+
+    /**
+     * Creates a query for matches all of a list of subqueries in an index.
+     */
+    static conjuncts(...queries: SearchQuery.Query[]): SearchQuery.ConjunctionQuery;
+
+    /**
+     * Creates a search query for matching date ranges in an index.
+     */
+    static dateRange(): SearchQuery.DateRangeQuery;
+
+    /**
+     * Creates a query for matches any of a list of subqueries in an index.
+     */
+    static disjuncts(queries: ReadonlyArray<SearchQuery.Query>): SearchQuery.DisjunctionQuery;
+
+    /**
+     * Creates a query for matches any of a list of subqueries in an index.
+     */
+    static disjuncts(...queries: SearchQuery.Query[]): SearchQuery.DisjunctionQuery;
+
+    /**
+     * Creates a query which allows you to match a list of document IDs in an index.
+     */
+    static docIds(ids: ReadonlyArray<string>): SearchQuery.DocIdQuery;
+
+    /**
+     * Creates a query which allows you to match a list of document IDs in an index.
+     */
+    static docIds(...ids: string[]): SearchQuery.DocIdQuery;
+
+    /**
+     * Creates a geographical bounding-box based query.
+     * @param tl_lat Top-left latitude.
+     * @param tl_lon Top-left longitude.
+     * @param br_lat Bottom-right latitude.
+     * @param br_lon Bottom-right longitude.
+     */
+    static geoBoundingBoxQuery(tl_lat: number, tl_lon: number, br_lat: number, br_lon: number): SearchQuery.GeoBoundingBoxQuery;
+
+    /**
+     * Creates a geographical distance based query.
+     */
+    static geoDistanceQuery(): SearchQuery.GeoDistanceQuery;
+
+    /**
+     * Creates a search query for matching text.
+     */
+    static match(match: string): SearchQuery.MatchQuery;
+
+    /**
+     * Creates a search query which matches anything.
+     */
+    static matchAll(): SearchQuery.MatchAllQuery;
+
+    /**
+     * Creates a search query which matches nothing.
+     */
+    static matchNone(): SearchQuery.MatchAllQuery;
+
+    /**
+     * Creates a search query for matching phrases in an index.
+     */
+    static matchPhrase(phrase: string): SearchQuery.MatchPhraseQuery;
+
+    /**
+     * Creates a search query for matching numeric ranges in an index.
+     */
+    static numericRange(): SearchQuery.NumericRangeQuery;
+
+    /**
+     * Creates a search query for a prefix in an index.
+     */
+    static phrase(terms: ReadonlyArray<string>): SearchQuery.PhraseQuery;
+
+    /**
+     * Creates a search query for a prefix in an index.
+     */
+    static prefix(prefix: string): SearchQuery.PrefixQuery;
+    /**
+     * Creates a query for matches any of a list of subqueries in an index.
+     */
+
+    /**
+     * Creates a search query for matching string.
+     */
+    static queryString(query: string): SearchQuery.QueryStringQuery;
+
+    /**
+     * Creates a search query for matching against a regexp query in an index.
+     */
+    static regexp(regexp: string): SearchQuery.RegexpQuery;
+
+    /**
+     * Creates a search query for searching terms in an index.
+     */
+    static term(term: string): SearchQuery.TermQuery;
+
+    /**
+     * Creates a search query for matching term ranges in the index.
+     */
+    static termRange(): SearchQuery.TermRangeQuery;
+
+    /**
+     * Creates a search query for matching a string with wildcards in an index.
+     */
+    static wildcard(wildcard: string): SearchQuery.WildcardQuery;
+
+    /**
+     * Adds a SearchFacet object to return information about as part of the execution of this query.
+     */
+    addFacet(name: string, facet: SearchFacet): this;
+
+    /**
+     * Specify the consistency level for this query.
+     */
+    consistency(val: SearchQuery.Consistency): this;
+
+    /**
+     * Includes information about the internal search semantics used to execute your query.
+     */
+    explain(explain: boolean): this;
+
+    /**
+     * Specifies the fields you wish to receive in the result set.
+     */
+    fields(fields: ReadonlyArray<string>): this;
+
+    /**
+     * Specifies the fields you wish to receive in the result set.
+     */
+    fields(...fields: string[]): this;
+
+    /**
+     * Request a particular highlight style and field list for this query.
+     */
+    highlight(style: SearchQuery.HighlightStyle, fields: ReadonlyArray<string>): this;
+
+    /**
+     * Request a particular highlight style and field list for this query.
+     */
+    highlight(style: SearchQuery.HighlightStyle, ...fields: string[]): this;
+
+    /**
+     * Specifies the maximum number of results to return.
+     * @param limit Maximum number of results to return.
+     */
+    limit(limit: number): this;
+
+    /**
+     * Specifies how many results to skip from the beginning of the result set.
+     * @param skip How many results to skip from the beginning of the result set.
+     */
+    skip(skip: number): this;
+
+    /**
+     * Specifies the fields you wish to sort by in your result set.
+     */
+    sort(fields: ReadonlyArray<string | SearchSort>): this;
+
+    /**
+     * Specifies the fields you wish to sort by in your result set.
+     */
+    sort(...fields: (string | SearchSort)[]): this;
+
+    /**
+     * Specifies the maximum time to wait for this query to complete.
+     * @param timeout Maximum time to wait (in milliseconds) for this query to complete.
+     */
+    timeout(timeout: number): this;
+}
+
+declare namespace SearchQuery {
+    abstract class Query {
+    }
+
+    abstract class BooleanQuery extends Query {
+        /**
+         * Specifies a predicate query which must match.
+         * @param query
+         */
+        must(query: Query): this;
+
+        /**
+         * Specifies a predicate query which must not match.
+         * @param query
+         */
+        mustNot(query: Query): this;
+
+        /**
+         * Specifies a predicate query which should match.
+         * @param query
+         */
+        should(query: Query): this;
+
+        /**
+         * Specifies the minimum score for should predicate matches.
+         * @param shouldMin
+         */
+        shouldMin(shouldMin: number): this;
+
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+    }
+
+    abstract class BooleanFieldQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param boost The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class ConjunctionQuery extends Query {
+        /**
+         * Specifies additional predicate queries.
+         * @param queries Additional predicate queries.
+         */
+        and(queries: ReadonlyArray<SearchQuery.Query>): this;
+
+        /**
+         * Specifies additional predicate queries.
+         * @param queries Additional predicate queries.
+         */
+        and(...queries: SearchQuery.Query[]): this;
+
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+    }
+
+    abstract class DateRangeQuery extends Query {
+        /**
+         * Defines the lower bound of the date range query.
+         * @param start The lower bound of the query.
+         * @param inclusive True to set an inclusive bound. Defaults to true.
+         */
+        start(start: Date | string, inclusive?: boolean): this;
+
+        /**
+         * Defines the upper bound of the date range query.
+         * @param end The upper bound of the query.
+         * @param inclusive True to set an inclusive bound. Defaults to false.
+         */
+        end(end: Date | string, inclusive?: boolean): this;
+
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class DisjunctionQuery extends Query {
+        /**
+         * Specifies additional predicate queries.
+         * @param queries Additional predicate queries.
+         */
+        or(queries: ReadonlyArray<SearchQuery.Query>): this;
+
+        /**
+         * Specifies additional predicate queries.
+         * @param queries Additional predicate queries.
+         */
+        or(...queries: SearchQuery.Query[]): this;
+
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+    }
+
+    abstract class DocIdQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class GeoBoundingBoxQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class GeoDistanceQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class MatchAllQuery extends Query {
+    }
+
+    abstract class MatchNoneQuery extends Query {
+    }
+
+    abstract class MatchPhraseQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+
+        /**
+         * Specifies the analyzer to use for the query.
+         * @param analyzer Analyzer to use for the query.
+         */
+        analyzer(analyzer: string): this;
+    }
+
+    abstract class MatchQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+
+        /**
+         * Defines the level of fuzziness for the query.
+         * @param fuzziness Level of fuzziness for the query.
+         */
+        fuzziness(fuzziness: number): this;
+
+        /**
+         * Specifies the prefix length to consider for the query.
+         * @param prefixLength Prefix length to consider for the query.
+         */
+        prefixLength(prefixLength: number): this;
+
+        /**
+         * Specifies the analyzer to use for the query.
+         * @param analyzer Analyzer to use for the query.
+         */
+        analyzer(analyzer: string): this;
+    }
+
+    abstract class NumericRangeQuery extends Query {
+        /**
+         * Defines the lower bound of the numeric range query.
+         * @param min The lower bound of the query.
+         * @param inclusive True to set an inclusive bound. Defaults to true.
+         */
+        min(min: number, inclusive?: boolean): this;
+
+        /**
+         * Defines the upper bound of the numeric range query.
+         * @param max The upper bound of the query.
+         * @param inclusive True to set an inclusive bound. Defaults to false.
+         */
+        max(max: number, inclusive?: boolean): this;
+
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class PhraseQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class PrefixQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class QueryStringQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+    }
+
+    abstract class RegexpQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class TermQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+
+        /**
+         * Defines the level of fuzziness for the query.
+         * @param fuzziness Level of fuzziness for the query.
+         */
+        fuzziness(fuzziness: number): this;
+
+        /**
+         * Specifies the prefix length to consider for the query.
+         * @param prefixLength Prefix length to consider for the query.
+         */
+        prefixLength(prefixLength: number): this;
+    }
+
+    abstract class TermRangeQuery extends Query {
+        /**
+         * Defines the lower bound of the term range query.
+         * @param min The lower bound of the query.
+         * @param inclusive True to set an inclusive bound. Defaults to true.
+         */
+        min(min: string, inclusive?: boolean): this;
+
+        /**
+         * Defines the upper bound of the term range query.
+         * @param max The upper bound of the query.
+         * @param inclusive True to set an inclusive bound. Defaults to false.
+         */
+        max(max: string, inclusive?: boolean): this;
+
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param field The field to query.
+         */
+        field(field: string): this;
+    }
+
+    abstract class WildcardQuery extends Query {
+        /**
+         * Defines the amount to boost the query.
+         * @param boost Amount to boost the query.
+         */
+        boost(boost: number): this;
+
+        /**
+         * Specifies the field to query.
+         * @param boost The field to query.
+         */
+        field(field: string): this;
+    }
+
+    /**
+     * Enumeration for specifying FTS consistency semantics.
+     */
+    enum Consistency {
+        /**
+         * This is the default (for single-statement requests).
+         */
+        NOT_BOUNDED,
+    }
+
+    /**
+     * Enumeration for specifying FTS highlight styling.
+     */
+    enum HighlightStyle {
+        /**
+         * This causes hits to be highlighted using the default style.
+         */
+        DEFAULT,
+
+        /**
+         * This causes hits to be highlighted using HTML tags.
+         */
+        HTML,
+
+        /**
+         * This causes hits to be highlighted with ANSI character codes.
+         */
+        ANSI,
+    }
+}
+
+declare class SearchFacet {
+}
+
+declare namespace SearchFacet {
+    class TermFacet extends SearchFacet {
+    }
+
+    function term(field: string, size: number): TermFacet;
+
+    class NumericFacet extends SearchFacet {
+        addRange(name: string, min: number, max: number): this;
+    }
+
+    function numeric(field: string, size: number): NumericFacet;
+
+    class DateFacet extends SearchFacet {
+        addRange(name: string, start: string, end: string): this;
+    }
+
+    function date(field: string, size: number): DateFacet;
+}
+
+declare class SearchSort {
+    /**
+     * Specifies whether to sort descending or not.
+     */
+    descending(descending: boolean): this;
+}
+
+declare namespace SearchSort {
+    class ScoreSort extends SearchSort {
+    }
+
+    function score(): ScoreSort;
+
+    class IdSort extends SearchSort {
+    }
+
+    function id(): IdSort;
+
+    class FieldSort extends SearchSort {
+        type(type: string): this;
+        mode(mode: string): this;
+        missing(missing: string): this;
+    }
+
+    function field(field: string): FieldSort;
+
+    class GeoDistanceSort extends SearchSort {
+        unit(unit: string): this;
+    }
+
+    function geoDistance(field: string, lat: number, lon: number): GeoDistanceSort;
+}
+
 /**
  * The Bucket class represents a connection to a Couchbase bucket. Never instantiate this class directly. Instead use the Cluster#openBucket method instead.
  */
-interface Bucket {
+interface Bucket extends events.EventEmitter {
     /**
      * Returns the version of the Node.js library as a string.
      */
@@ -763,7 +1695,7 @@ interface Bucket {
      * @param fragment The document's contents to append.
      * @param callback The callback function.
      */
-    append(key: any | Buffer, fragment: any, callback: Bucket.OpCallback): void;
+    append(key: string | Buffer, fragment: any, callback: Bucket.OpCallback): void;
 
     /**
      *
@@ -772,7 +1704,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    append(key: any | Buffer, fragment: any, options: AppendOptions, callback: Bucket.OpCallback): void;
+    append(key: string | Buffer, fragment: any, options: AppendOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Increments or decrements a key's numeric value.
@@ -781,7 +1713,7 @@ interface Bucket {
      * @param delta The amount to add or subtract from the counter value. This value may be any non-zero integer.
      * @param callback The callback function.
      */
-    counter(key: any | Buffer, delta: number, callback: Bucket.OpCallback): void;
+    counter(key: string | Buffer, delta: number, callback: Bucket.OpCallback): void;
 
     /**
      *
@@ -790,7 +1722,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    counter(key: any | Buffer, delta: number, options: CounterOptions, callback: Bucket.OpCallback): void;
+    counter(key: string | Buffer, delta: number, options: CounterOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Shuts down this connection.
@@ -808,14 +1740,14 @@ interface Bucket {
      * @param key The target document key.
      * @param callback The callback function.
      */
-    get(key: any | Buffer, callback: Bucket.OpCallback): void;
+    get(key: string | Buffer, callback: Bucket.OpCallback): void;
 
     /**
      * @param key The target document key.
      * @param options The options object.
      * @param callback The callback function.
      */
-    get(key: any | Buffer, options: any, callback: Bucket.OpCallback): void;
+    get(key: string | Buffer, options: any, callback: Bucket.OpCallback): void;
 
     /**
      * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
@@ -824,7 +1756,7 @@ interface Bucket {
      * @param key The target document key.
      * @param callback The callback function.
      */
-    getAndLock(key: any, callback: Bucket.OpCallback): void;
+    getAndLock(key: string, callback: Bucket.OpCallback): void;
 
     /**
      * Lock the document on the server and retrieve it. When an document is locked, its CAS changes and subsequent operations on the document (without providing the current CAS) will fail until the lock is no longer held.
@@ -835,7 +1767,7 @@ interface Bucket {
      * @param callback The callback function.
      * @returns {}
      */
-    getAndLock(key: any, options: GetAndLockOptions, callback: Bucket.OpCallback): void;
+    getAndLock(key: string, options: GetAndLockOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Retrieves a document and updates the expiry of the item at the same time.
@@ -844,7 +1776,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    getAndTouch(key: any | Buffer, expiry: number, options: any, callback: Bucket.OpCallback): void;
+    getAndTouch(key: string | Buffer, expiry: number, options: any, callback: Bucket.OpCallback): void;
 
     /**
      * Retrieves a document and updates the expiry of the item at the same time.
@@ -852,21 +1784,21 @@ interface Bucket {
      * @param expiry The expiration time to use. If a value of 0 is provided, then the current expiration time is cleared and the key is set to never expire. Otherwise, the key is updated to expire in the time provided (in seconds).
      * @param callback The callback function.
      */
-    getAndTouch(key: any | Buffer, expiry: number, callback: Bucket.OpCallback): void;
+    getAndTouch(key: string | Buffer, expiry: number, callback: Bucket.OpCallback): void;
 
     /**
      * Retrieves a list of keys
      * @param keys The target document keys.
      * @param callback The callback function.
      */
-    getMulti(key: any[] | Buffer[], callback: Bucket.MultiGetCallback): void;
+    getMulti(key: ReadonlyArray<string | Buffer>, callback: Bucket.MultiGetCallback): void;
 
     /**
      * Get a document from a replica server in your cluster.
      * @param key The target document key.
      * @param callback The callback function.
      */
-    getReplica(key: any | Buffer, callback: Bucket.OpCallback): void;
+    getReplica(key: string | Buffer, callback: Bucket.OpCallback): void;
 
     /**
     * Get a document from a replica server in your cluster.
@@ -874,7 +1806,7 @@ interface Bucket {
     * @param options The options object.
     * @param callback The callback function.
     */
-    getReplica(key: any | Buffer, options: GetReplicaOptions, callback: Bucket.OpCallback): void;
+    getReplica(key: string | Buffer, options: GetReplicaOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Identical to Bucket#upsert but will fail if the document already exists.
@@ -882,7 +1814,7 @@ interface Bucket {
      * @param value The document's contents.
      * @param callback The callback function.
      */
-    insert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+    insert(key: string | Buffer, value: any, callback: Bucket.OpCallback): void;
 
     /**
      * Identical to Bucket#upsert but will fail if the document already exists.
@@ -891,7 +1823,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    insert(key: any | Buffer, value: any, options: InsertOptions, callback: Bucket.OpCallback): void;
+    insert(key: string | Buffer, value: any, options: InsertOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Returns an instance of a BuckerManager for performing management operations against a bucket.
@@ -904,7 +1836,7 @@ interface Bucket {
      * @param fragment The document's contents to prepend.
      * @param callback The callback function.
      */
-    prepend(key: any, fragment: any, callback: Bucket.OpCallback): void;
+    prepend(key: string, fragment: any, callback: Bucket.OpCallback): void;
 
     /**
      * Like Bucket#append, but prepends data to the existing value.
@@ -913,31 +1845,43 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    prepend(key: any, fragment: any, options: PrependOptions, callback: Bucket.OpCallback): void;
+    prepend(key: string, fragment: any, options: PrependOptions, callback: Bucket.OpCallback): void;
 
     /**
-     * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
-     * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
+     * Executes a previously prepared query object.
      * @param query The query to execute.
      * @param callback The callback function.
      */
-    query(query: ViewQuery | N1qlQuery, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
+    query(query: ViewQuery | SpatialQuery, callback?: Bucket.QueryCallback): Bucket.ViewQueryResponse;
 
     /**
-     * Executes a previously prepared query object. This could be a ViewQuery or a N1qlQuery.
-     * Note: N1qlQuery queries are currently an uncommitted interface and may be subject to change in 2.0.0's final release.
+     * Executes a previously prepared query object.
+     * @param query The query to execute.
+     * @param callback The callback function.
+     */
+    query(query: N1qlQuery, callback?: Bucket.N1qlQueryCallback): Bucket.N1qlQueryResponse;
+
+    /**
+     * Executes a previously prepared query object.
+     * @param query The query to execute.
+     * @param callback The callback function.
+     */
+    query(query: SearchQuery, callback?: Bucket.FtsQueryCallback): Bucket.FtsQueryResponse;
+
+    /**
+     * Executes a previously prepared query object.
      * @param query The query to execute.
      * @param params A list or map to do replacements on a N1QL query.
      * @param callback The callback function.
      */
-    query(query: ViewQuery | N1qlQuery, params: Object | Array<any>, callback: Bucket.QueryCallback): Bucket.ViewQueryResponse | Bucket.N1qlQueryResponse;
+    query(query: N1qlQuery, params: {[param: string]: any} | any[], callback?: Bucket.N1qlQueryCallback): Bucket.N1qlQueryResponse;
 
     /**
      * Deletes a document on the server.
      * @param key The target document key.
      * @param callback The callback function.
      */
-    remove(key: any | Buffer, callback: Bucket.OpCallback): void;
+    remove(key: string | Buffer, callback: Bucket.OpCallback): void;
 
     /**
      * Deletes a document on the server.
@@ -945,7 +1889,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    remove(key: any | Buffer, options: RemoveOptions, callback: Bucket.OpCallback): void;
+    remove(key: string | Buffer, options: RemoveOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
@@ -953,7 +1897,7 @@ interface Bucket {
      * @param value The document's contents.
      * @param callback The callback function.
      */
-    replace(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+    replace(key: string | Buffer, value: any, callback: Bucket.OpCallback): void;
 
     /**
      * Identical to Bucket#upsert, but will only succeed if the document exists already (i.e. the inverse of Bucket#insert).
@@ -962,7 +1906,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    replace(key: any | Buffer, value: any, options: ReplaceOptions, callback: Bucket.OpCallback): void;
+    replace(key: string | Buffer, value: any, options: ReplaceOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Configures a custom set of transcoder functions for encoding and decoding values that are being stored or retreived from the server.
@@ -978,7 +1922,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    touch(key: any | Buffer, expiry: number, options: TouchOptions, callback: Bucket.OpCallback): void;
+    touch(key: string | Buffer, expiry: number, options: TouchOptions, callback: Bucket.OpCallback): void;
 
     /**
      * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
@@ -986,7 +1930,7 @@ interface Bucket {
      * @param cas The CAS value returned when the key was locked. This operation will fail if the CAS value provided does not match that which was the result of the original lock operation.
      * @param callback The callback function.
      */
-    unlock(key: any | Buffer, cas: Bucket.CAS, callback: Bucket.OpCallback): void;
+    unlock(key: string | Buffer, cas: Bucket.CAS, callback: Bucket.OpCallback): void;
 
     /**
      * Unlock a previously locked document on the server. See the Bucket#lock method for more details on locking.
@@ -995,7 +1939,7 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    unlock(key: any | Buffer, cas: Bucket.CAS, options: any, callback: Bucket.OpCallback): void;
+    unlock(key: string | Buffer, cas: Bucket.CAS, options: any, callback: Bucket.OpCallback): void;
 
     /**
      * Stores a document to the bucket.
@@ -1003,7 +1947,7 @@ interface Bucket {
      * @param value The document's contents.
      * @param callback The callback function.
      */
-    upsert(key: any | Buffer, value: any, callback: Bucket.OpCallback): void;
+    upsert(key: string | Buffer, value: any, callback: Bucket.OpCallback): void;
 
     /**
      * Stores a document to the bucket.
@@ -1012,13 +1956,28 @@ interface Bucket {
      * @param options The options object.
      * @param callback The callback function.
      */
-    upsert(key: any | Buffer, value: any, options: UpsertOptions, callback: Bucket.OpCallback): void;
+    upsert(key: string | Buffer, value: any, options: UpsertOptions, callback: Bucket.OpCallback): void;
+
+    addListener(event: 'connect', listener: () => void): this;
+    addListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+
+    on(event: 'connect', listener: () => void): this;
+    on(event: 'error', listener: (error: CouchbaseError) => void): this;
+
+    once(event: 'connect', listener: () => void): this;
+    once(event: 'error', listener: (error: CouchbaseError) => void): this;
+
+    prependListener(event: 'connect', listener: () => void): this;
+    prependListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+
+    prependOnceListener(event: 'connect', listener: () => void): this;
+    prependOnceListener(event: 'error', listener: (error: CouchbaseError) => void): this;
 }
 
 declare namespace Bucket {
 
     /**
-     * his is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
+     * This is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
      */
     interface QueryCallback {
         /**
@@ -1026,7 +1985,31 @@ declare namespace Bucket {
          * @param rows The rows returned from the query.
          * @param meta The metadata returned by the query.
          */
-        (error: CouchbaseError, rows: any[], meta: Bucket.ViewQueryResponse.Meta): void;
+        (error: CouchbaseError | null, rows: any[] | null, meta: Bucket.ViewQueryResponse.Meta): void;
+    }
+
+    /**
+     * This is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
+     */
+    interface N1qlQueryCallback {
+        /**
+         * @param error The error for the operation. This can either be an Error object or a falsy value.
+         * @param rows The rows returned from the query.
+         * @param meta The metadata returned by the query.
+         */
+        (error: CouchbaseError | null, rows: any[] | null, meta: Bucket.N1qlQueryResponse.Meta): void;
+    }
+
+    /**
+     * This is used as a callback from executed queries. It is a shortcut method that automatically subscribes to the rows and error events of the Bucket.ViewQueryResponse.
+     */
+    interface FtsQueryCallback {
+        /**
+         * @param error The error for the operation. This can either be an Error object or a falsy value.
+         * @param rows The rows returned from the query.
+         * @param meta The metadata returned by the query.
+         */
+        (error: CouchbaseError | null, rows: any[] | null, meta: Bucket.FtsQueryResponse.Meta): void;
     }
 
     /**
@@ -1036,10 +2019,10 @@ declare namespace Bucket {
      */
     interface OpCallback {
         /**
-         * @param error The error for the operation. This can either be an Error object or a value which evaluates to false (null, undefined, 0 or false).
+         * @param error The error for the operation. This can either be an Error object or a value which evaluates to false.
          * @param result The result of the operation that was executed. This usually contains at least a cas property, and on some operations will contain a value property as well.
          */
-        (error: CouchbaseError | number, result: any): void;
+        (error: CouchbaseError | null, result: any): void;
     }
 
     /**
@@ -1081,7 +2064,7 @@ declare namespace Bucket {
 
     /**
      * The CAS value is a special object that indicates the current state of the item on the server. Each time an object is mutated on the server, the value is changed. CAS objects can be used in conjunction with mutation operations to ensure that the value on the server matches the local value retrieved by the client. This is useful when doing document updates on the server as you can ensure no changes were applied by other clients while you were in the process of mutating the document locally.
-     * In the Node.js SDK, the CAS is represented as an opaque value. As such,y ou cannot generate CAS objects, but should rather use the values returned from a Bucket.OpCallback.
+     * In the Node.js SDK, the CAS is represented as an opaque value. As such, you cannot generate CAS objects, but should rather use the values returned from a Bucket.OpCallback.
      */
     interface CAS {
 
@@ -1091,7 +2074,30 @@ declare namespace Bucket {
      * An event emitter allowing you to bind to various query result set events.
      */
     interface N1qlQueryResponse extends events.EventEmitter {
+        addListener(event: 'end', listener: (meta: N1qlQueryResponse.Meta) => void): this;
+        addListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        addListener(event: 'row', listener: (row: any, meta: N1qlQueryResponse.Meta) => void): this;
+        addListener(event: 'rows', listener: (rows: any[], meta: N1qlQueryResponse.Meta) => void): this;
 
+        on(event: 'end', listener: (meta: N1qlQueryResponse.Meta) => void): this;
+        on(event: 'error', listener: (error: CouchbaseError) => void): this;
+        on(event: 'row', listener: (row: any, meta: N1qlQueryResponse.Meta) => void): this;
+        on(event: 'rows', listener: (rows: any[], meta: N1qlQueryResponse.Meta) => void): this;
+
+        once(event: 'end', listener: (meta: N1qlQueryResponse.Meta) => void): this;
+        once(event: 'error', listener: (error: CouchbaseError) => void): this;
+        once(event: 'row', listener: (row: any, meta: N1qlQueryResponse.Meta) => void): this;
+        once(event: 'rows', listener: (rows: any[], meta: N1qlQueryResponse.Meta) => void): this;
+
+        prependListener(event: 'end', listener: (meta: N1qlQueryResponse.Meta) => void): this;
+        prependListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        prependListener(event: 'row', listener: (row: any, meta: N1qlQueryResponse.Meta) => void): this;
+        prependListener(event: 'rows', listener: (rows: any[], meta: N1qlQueryResponse.Meta) => void): this;
+
+        prependOnceListener(event: 'end', listener: (meta: N1qlQueryResponse.Meta) => void): this;
+        prependOnceListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        prependOnceListener(event: 'row', listener: (row: any, meta: N1qlQueryResponse.Meta) => void): this;
+        prependOnceListener(event: 'rows', listener: (rows: any[], meta: N1qlQueryResponse.Meta) => void): this;
     }
 
     namespace N1qlQueryResponse {
@@ -1118,7 +2124,30 @@ declare namespace Bucket {
      * An event emitter allowing you to bind to various query result set events.
      */
     interface ViewQueryResponse extends events.EventEmitter {
+        addListener(event: 'end', listener: (meta: ViewQueryResponse.Meta) => void): this;
+        addListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        addListener(event: 'row', listener: (row: any, meta: ViewQueryResponse.Meta) => void): this;
+        addListener(event: 'rows', listener: (rows: any[], meta: ViewQueryResponse.Meta) => void): this;
 
+        on(event: 'end', listener: (meta: ViewQueryResponse.Meta) => void): this;
+        on(event: 'error', listener: (error: CouchbaseError) => void): this;
+        on(event: 'row', listener: (row: any, meta: ViewQueryResponse.Meta) => void): this;
+        on(event: 'rows', listener: (rows: any[], meta: ViewQueryResponse.Meta) => void): this;
+
+        once(event: 'end', listener: (meta: ViewQueryResponse.Meta) => void): this;
+        once(event: 'error', listener: (error: CouchbaseError) => void): this;
+        once(event: 'row', listener: (row: any, meta: ViewQueryResponse.Meta) => void): this;
+        once(event: 'rows', listener: (rows: any[], meta: ViewQueryResponse.Meta) => void): this;
+
+        prependListener(event: 'end', listener: (meta: ViewQueryResponse.Meta) => void): this;
+        prependListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        prependListener(event: 'row', listener: (row: any, meta: ViewQueryResponse.Meta) => void): this;
+        prependListener(event: 'rows', listener: (rows: any[], meta: ViewQueryResponse.Meta) => void): this;
+
+        prependOnceListener(event: 'end', listener: (meta: ViewQueryResponse.Meta) => void): this;
+        prependOnceListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        prependOnceListener(event: 'row', listener: (row: any, meta: ViewQueryResponse.Meta) => void): this;
+        prependOnceListener(event: 'rows', listener: (rows: any[], meta: ViewQueryResponse.Meta) => void): this;
     }
 
     namespace ViewQueryResponse {
@@ -1132,4 +2161,73 @@ declare namespace Bucket {
             total_rows: number;
         }
     }
+
+    /**
+     * An event emitter allowing you to bind to various query result set events.
+     */
+    interface FtsQueryResponse extends events.EventEmitter {
+        addListener(event: 'end', listener: (meta: FtsQueryResponse.Meta) => void): this;
+        addListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        addListener(event: 'row', listener: (row: any, meta: FtsQueryResponse.Meta) => void): this;
+        addListener(event: 'rows', listener: (rows: any[], meta: FtsQueryResponse.Meta) => void): this;
+
+        on(event: 'end', listener: (meta: FtsQueryResponse.Meta) => void): this;
+        on(event: 'error', listener: (error: CouchbaseError) => void): this;
+        on(event: 'row', listener: (row: any, meta: FtsQueryResponse.Meta) => void): this;
+        on(event: 'rows', listener: (rows: any[], meta: FtsQueryResponse.Meta) => void): this;
+
+        once(event: 'end', listener: (meta: FtsQueryResponse.Meta) => void): this;
+        once(event: 'error', listener: (error: CouchbaseError) => void): this;
+        once(event: 'row', listener: (row: any, meta: FtsQueryResponse.Meta) => void): this;
+        once(event: 'rows', listener: (rows: any[], meta: FtsQueryResponse.Meta) => void): this;
+
+        prependListener(event: 'end', listener: (meta: FtsQueryResponse.Meta) => void): this;
+        prependListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        prependListener(event: 'row', listener: (row: any, meta: FtsQueryResponse.Meta) => void): this;
+        prependListener(event: 'rows', listener: (rows: any[], meta: FtsQueryResponse.Meta) => void): this;
+
+        prependOnceListener(event: 'end', listener: (meta: FtsQueryResponse.Meta) => void): this;
+        prependOnceListener(event: 'error', listener: (error: CouchbaseError) => void): this;
+        prependOnceListener(event: 'row', listener: (row: any, meta: FtsQueryResponse.Meta) => void): this;
+        prependOnceListener(event: 'rows', listener: (rows: any[], meta: FtsQueryResponse.Meta) => void): this;
+    }
+
+    namespace FtsQueryResponse {
+        /**
+         * The meta-information available from a search query response.
+         */
+        interface Meta {
+            /**
+             * The status information for this query, includes properties
+             * such as total, failed, and successful.
+             */
+            status: any;
+
+            /**
+             * Any non-fatal errors that occurred during query processing.
+             */
+            errors: any;
+
+            /**
+             * The total number of hits that were available for this search query.
+             */
+            totalHits: number;
+
+            /**
+             * The resulting facet information for any facets that were specified
+             * in the search query.
+             */
+            facets: any;
+
+            /**
+             * The time spent processing this query.
+             */
+            took: number;
+
+            /**
+             * The maximum score out of all the results in this query.
+             */
+            maxScore: number;
+        }
+    }
 }
diff --git a/types/cqrs-domain/index.d.ts b/types/cqrs-domain/index.d.ts
index f826b45ffd..33db11b857 100644
--- a/types/cqrs-domain/index.d.ts
+++ b/types/cqrs-domain/index.d.ts
@@ -252,7 +252,7 @@ declare namespace Domain {
 
     /**
      * @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)
+     * @param 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;
 
@@ -295,7 +295,7 @@ declare namespace Domain {
     /**
      * @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)
+     * @param 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;
 
diff --git a/types/create-react-class/index.d.ts b/types/create-react-class/index.d.ts
index 9a1b0b12b5..9b9d2b2ad5 100644
--- a/types/create-react-class/index.d.ts
+++ b/types/create-react-class/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentSpec, ClassicComponentClass } from "react";
 
diff --git a/types/create-subscription/index.d.ts b/types/create-subscription/index.d.ts
index 79003980ee..8c7d8c1ced 100644
--- a/types/create-subscription/index.d.ts
+++ b/types/create-subscription/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Asana <https://github.com/Asana>
 //                 Vincent Siao <https://github.com/vsiao>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/crossfilter/crossfilter-tests.ts b/types/crossfilter/crossfilter-tests.ts
index 5d9981b6d1..e96d83a7e2 100644
--- a/types/crossfilter/crossfilter-tests.ts
+++ b/types/crossfilter/crossfilter-tests.ts
@@ -1,4 +1,4 @@
-
+import * as crossfilter from 'crossfilter';
 
 
 interface Payment {
diff --git a/types/crossfilter/index.d.ts b/types/crossfilter/index.d.ts
index a009e920dd..bae8a06565 100644
--- a/types/crossfilter/index.d.ts
+++ b/types/crossfilter/index.d.ts
@@ -110,7 +110,6 @@ declare namespace CrossFilter {
     }
 }
 
-declare var crossfilter: CrossFilter.CrossFilterStatic;
 declare module "crossfilter" {
     var crossfilter: CrossFilter.CrossFilterStatic;
     export = crossfilter;    	
diff --git a/types/crypto-js/index.d.ts b/types/crypto-js/index.d.ts
index 22e5c1253c..faeeac78e6 100644
--- a/types/crypto-js/index.d.ts
+++ b/types/crypto-js/index.d.ts
@@ -9,11 +9,15 @@ export as namespace CryptoJS;
 declare var CryptoJS: CryptoJS.Hashes;
 declare namespace CryptoJS {
 
-	interface Base {}
+	interface Base {
+		create(): any;
+	}
 
 	interface BufferedBlockAlgorithm extends Base {}
 
-	interface Hasher extends BufferedBlockAlgorithm {}
+	interface Hasher extends BufferedBlockAlgorithm {
+		update(messageUpdate: WordArray|string): Hasher;
+	}
 
 	interface Cipher extends BufferedBlockAlgorithm {
 		createEncryptor(secretPassphrase: string, option?: CipherOption): Encryptor;
@@ -25,7 +29,7 @@ declare namespace CryptoJS {
 	interface StreamCipher extends Cipher {}
 
 	interface CipherHelper {
-		encrypt(message: string, secretPassphrase: string | WordArray, option?: CipherOption): WordArray;
+		encrypt(message: string | LibWordArray, secretPassphrase: string | WordArray, option?: CipherOption): WordArray;
 		decrypt(encryptedMessage: string | WordArray, secretPassphrase: string | WordArray, option?: CipherOption): DecryptedMessage;
 	}
 	interface Encryptor {
@@ -141,6 +145,7 @@ declare namespace CryptoJS {
 		lib: {
 			WordArray: {
 				create: (v: any) => LibWordArray;
+				random: (v: number) => string;
 			};
 		};
 		mode: {
diff --git a/types/crypto-random-string/crypto-random-string-tests.ts b/types/crypto-random-string/crypto-random-string-tests.ts
new file mode 100644
index 0000000000..1a66c25981
--- /dev/null
+++ b/types/crypto-random-string/crypto-random-string-tests.ts
@@ -0,0 +1,4 @@
+import generate = require('crypto-random-string');
+
+// $ExpectType string
+generate(10);
diff --git a/types/crypto-random-string/index.d.ts b/types/crypto-random-string/index.d.ts
new file mode 100644
index 0000000000..dc41e18428
--- /dev/null
+++ b/types/crypto-random-string/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for crypto-random-string 1.0
+// Project: https://github.com/sindresorhus/crypto-random-string
+// Definitions by: Manuel Warum <https://github.com/MrManny>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Generate a hexadecimal string of the given length.
+ * @param length the length of the random string.
+ * @return a string of the specified length.
+ */
+declare function cryptoRandomString(length: number): string;
+
+export = cryptoRandomString;
diff --git a/types/crypto-random-string/tsconfig.json b/types/crypto-random-string/tsconfig.json
new file mode 100644
index 0000000000..fd68e9d080
--- /dev/null
+++ b/types/crypto-random-string/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",
+        "crypto-random-string-tests.ts"
+    ]
+}
diff --git a/types/crypto-random-string/tslint.json b/types/crypto-random-string/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/crypto-random-string/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/css-to-style/css-to-style-tests.ts b/types/css-to-style/css-to-style-tests.ts
new file mode 100644
index 0000000000..ede5ae8f06
--- /dev/null
+++ b/types/css-to-style/css-to-style-tests.ts
@@ -0,0 +1,9 @@
+import toStyle from "css-to-style";
+
+toStyle(); // $ExpectError
+
+toStyle({}); // $ExpectError
+
+toStyle(1); // $ExpectError
+
+toStyle(''); // $ExpectType CSSStyleDeclaration
diff --git a/types/css-to-style/index.d.ts b/types/css-to-style/index.d.ts
new file mode 100644
index 0000000000..eb450341f9
--- /dev/null
+++ b/types/css-to-style/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for css-to-style 1.2
+// Project: https://github.com/jacobbuck/css-to-style
+// Definitions by: Ben Grynhaus <https://github.com/bengry>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+declare function toStyle(cssText: string): CSSStyleDeclaration;
+
+export default toStyle;
diff --git a/types/css-to-style/tsconfig.json b/types/css-to-style/tsconfig.json
new file mode 100644
index 0000000000..8b3a9292b3
--- /dev/null
+++ b/types/css-to-style/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "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", "css-to-style-tests.ts"]
+}
diff --git a/types/css-to-style/tslint.json b/types/css-to-style/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/css-to-style/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cssnano/cssnano-tests.ts b/types/cssnano/cssnano-tests.ts
new file mode 100644
index 0000000000..17828e1b02
--- /dev/null
+++ b/types/cssnano/cssnano-tests.ts
@@ -0,0 +1,17 @@
+import cssnano = require('cssnano');
+import { Transformer } from 'postcss';
+
+const nano1: Transformer = cssnano();
+const nano2: Transformer = cssnano({
+    configFile: '/path/to/config',
+});
+const nano3: Transformer = cssnano({
+    preset: 'default',
+});
+const nano4: Transformer = cssnano({
+    preset: ['default', {
+        discardComments: {
+            removeAll: true,
+        },
+    }],
+});
diff --git a/types/cssnano/index.d.ts b/types/cssnano/index.d.ts
new file mode 100644
index 0000000000..bf298f1854
--- /dev/null
+++ b/types/cssnano/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for cssnano 4.0
+// Project: https://github.com/cssnano/cssnano
+// Definitions by: Armando Meziat <https://github.com/odnamrataizem>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Plugin } from 'postcss';
+
+declare namespace cssnano {
+    interface CssNanoOptions {
+        configFile?: string;
+        preset?: [string, object] | string;
+    }
+
+    type CssNano = Plugin<CssNanoOptions>;
+}
+
+declare const cssnano: cssnano.CssNano;
+export = cssnano;
diff --git a/types/cssnano/package.json b/types/cssnano/package.json
new file mode 100644
index 0000000000..3c7b1f0f76
--- /dev/null
+++ b/types/cssnano/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "postcss": "5 - 7"
+    }
+}
diff --git a/types/cssnano/tsconfig.json b/types/cssnano/tsconfig.json
new file mode 100644
index 0000000000..5667012b67
--- /dev/null
+++ b/types/cssnano/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",
+        "cssnano-tests.ts"
+    ]
+}
diff --git a/types/cssnano/tslint.json b/types/cssnano/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/cssnano/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/csso/csso-tests.ts b/types/csso/csso-tests.ts
new file mode 100644
index 0000000000..74e0b51dd9
--- /dev/null
+++ b/types/csso/csso-tests.ts
@@ -0,0 +1,40 @@
+import csso = require('csso');
+
+csso.minify('.test { color: #ff0000; }').css;
+csso.minify('.test { color: #ff0000; }').map;
+csso.minify('.test { color: #ff0000; }', {
+    sourceMap: true,
+    filename: '',
+    debug: true,
+    beforeCompress: () => {},
+    afterCompress: () => {},
+    restructure: false,
+    forceMediaMerge: true,
+    clone: false,
+    comments: '',
+    logger: () => {}
+});
+
+csso.minifyBlock('color: rgba(255, 0, 0, 1); color: #ff0000').css;
+csso.minifyBlock('color: rgba(255, 0, 0, 1); color: #ff0000').map;
+csso.minifyBlock('color: rgba(255, 0, 0, 1); color: #ff0000', {
+    sourceMap: true,
+    filename: '',
+    debug: true,
+    beforeCompress: () => {},
+    afterCompress: () => {},
+    restructure: false,
+    forceMediaMerge: true,
+    clone: false,
+    comments: '',
+    logger: () => {}
+});
+
+csso.compress({}).ast;
+csso.compress({}, {
+    restructure: false,
+    forceMediaMerge: true,
+    clone: false,
+    comments: '',
+    logger: () => {}
+}).ast;
diff --git a/types/csso/index.d.ts b/types/csso/index.d.ts
new file mode 100644
index 0000000000..f89f395129
--- /dev/null
+++ b/types/csso/index.d.ts
@@ -0,0 +1,107 @@
+// Type definitions for csso 3.5
+// Project: https://github.com/css/csso
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+declare namespace csso {
+    interface Result {
+        /**
+         * Resulting CSS.
+         */
+        css: string;
+        /**
+         * Instance of SourceMapGenerator or null.
+         */
+        map: object | null;
+    }
+
+    interface CompressOptions {
+        /**
+         * Disable or enable a structure optimisations.
+         * @default true
+         */
+        restructure?: boolean;
+        /**
+         * Enables merging of @media rules with the same media query by splitted by other rules.
+         * The optimisation is unsafe in general, but should work fine in most cases. Use it on your own risk.
+         * @default false
+         */
+        forceMediaMerge?: boolean;
+        /**
+         * Transform a copy of input AST if true. Useful in case of AST reuse.
+         * @default false
+         */
+        clone?: boolean;
+        /**
+         * Specify what comments to leave:
+         * - 'exclamation' or true – leave all exclamation comments
+         * - 'first-exclamation' – remove every comment except first one
+         * - false – remove all comments
+         * @default true
+         */
+        comments?: string | boolean;
+        /**
+         * Usage data for advanced optimisations.
+         */
+        usage?: object;
+        /**
+         * Function to track every step of transformation.
+         */
+        logger?: () => void;
+    }
+
+    interface MinifyOptions {
+        /**
+         * Generate a source map when true.
+         * @default false
+         */
+        sourceMap?: boolean;
+        /**
+         * Filename of input CSS, uses for source map generation.
+         * @default '<unknown>'
+         */
+        filename?: string;
+        /**
+         * Output debug information to stderr.
+         * @default false
+         */
+        debug?: boolean;
+        /**
+         * Called right after parse is run.
+         */
+        beforeCompress?: BeforeCompressFn | BeforeCompressFn[];
+        /**
+         * Called right after compress() is run.
+         */
+        afterCompress?: AfterCompressFn | AfterCompressFn[];
+        restructure?: boolean;
+    }
+
+    type BeforeCompressFn = (ast: object, options: CompressOptions) => void;
+    type AfterCompressFn = (compressResult: string, options: CompressOptions) => void;
+}
+
+interface Csso {
+    /**
+     * Minify source CSS passed as String
+     * @param source
+     * @param options
+     */
+    minify(source: string, options?: csso.MinifyOptions & csso.CompressOptions): csso.Result;
+
+    /**
+     * The same as minify() but for list of declarations. Usually it's a style attribute value.
+     * @param source
+     * @param options
+     */
+    minifyBlock(source: string, options?: csso.MinifyOptions & csso.CompressOptions): csso.Result;
+
+    /**
+     * Does the main task – compress an AST.
+     */
+    compress(ast: object, options?: csso.CompressOptions): { ast: object };
+}
+
+declare const csso: Csso;
+export = csso;
diff --git a/types/csso/tsconfig.json b/types/csso/tsconfig.json
new file mode 100644
index 0000000000..9ed6695bc9
--- /dev/null
+++ b/types/csso/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",
+        "csso-tests.ts"
+    ]
+}
diff --git a/types/csso/tslint.json b/types/csso/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/csso/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/cytoscape/cytoscape-tests.ts b/types/cytoscape/cytoscape-tests.ts
index 39be1cd0e7..0cffa42b31 100644
--- a/types/cytoscape/cytoscape-tests.ts
+++ b/types/cytoscape/cytoscape-tests.ts
@@ -2,14 +2,8 @@
 
 // TODO: document all aliases as aliases, not as duplicates!
 
-const assert = (tag: boolean) => { if (!tag) throw new Error(); };
-const aliases = (...obj: Array<{}>) => { if (obj.slice(1).some((alias) => alias !== obj[0])) throw new Error(); };
-const events = (obj: any) => {
-  aliases(obj.on, obj.bind, obj.listen, obj.addListener);
-  aliases(obj.promiseOn, obj.pon);
-  aliases(obj.off, obj.unbind, obj.unlisten, obj.removeListener);
-  aliases(obj.emit, obj.trigger);
-};
+const assert = (tag: boolean) => {};
+const aliases = (...obj: Array<{}>) => {};
 
 // definitions
 function oneOf<A, B, C, D, E>(a: A, b: B, c: C, d: D, e: E): A | B | C | D | E;
@@ -129,7 +123,7 @@ cy.on('zoom', (event) => {
   }
 });
 cy.off('zoom');
-events(cy);
+// events(cy); - TODO
 
 cy.add({ data: { id: 'g' }, position: {x: 200, y: 150} });
 cy.add([
@@ -347,19 +341,32 @@ const positions = oneOf({a: {x: 100, y: 100}}, (node: cytoscape.NodeCollection):
 //   layout.stop();
 // });
 
-// TODO: cy.style
+cy.style(cy.style());
+cy.style([cy.style()]);
 
+// $ExpectType string
 cy.png({
-  output: oneOf('base64uri', 'base64', 'blob', undefined),
+  output: oneOf('base64uri', 'base64', undefined),
   bg: oneOf('#ffffff', undefined),
   full: true,
   scale: 2,
   maxWidth: 100,
   maxHeight: 100
 });
+// $ExpectType Blob
+cy.png({
+  output: 'blob',
+  bg: oneOf('#ffffff', undefined),
+  full: true,
+  scale: 2,
+  maxWidth: 100,
+  maxHeight: 100
+});
+
 aliases(cy.jpg, cy.jpeg);
+// $ExpectType string
 cy.jpg({
-  output: oneOf('base64uri', 'base64', 'blob', undefined),
+  output: oneOf('base64uri', 'base64', undefined),
   bg: oneOf('#ffffff', undefined),
   full: true,
   scale: 2,
@@ -367,6 +374,17 @@ cy.jpg({
   maxHeight: 100,
   quality: 0.5
 });
+// $ExpectType Blob
+cy.jpg({
+  output: 'blob',
+  bg: oneOf('#ffffff', undefined),
+  full: true,
+  scale: 2,
+  maxWidth: 100,
+  maxHeight: 100,
+  quality: 0.5
+});
+
 cy.json(cy.json());
 
 // Types possible to call methods
@@ -383,11 +401,24 @@ assert(eles.removed());
 assert(!eles.inside());
 eles.restore();
 
-([ele, eles, node, nodes, edge, edges] as cytoscape.CollectionReturnValue[]).forEach((elem) => {
-  aliases(elem.clone, elem.copy);
-  events(elem);
-  aliases(elem.data, elem.attr);
-  aliases(elem.removeData, elem.removeAttr);
+([ele, eles, node, nodes, edge, edges] as [
+  cytoscape.SingularElementReturnValue,
+  cytoscape.CollectionReturnValue,
+  cytoscape.NodeSingular,
+  cytoscape.NodeCollection,
+  cytoscape.EdgeSingular,
+  cytoscape.EdgeCollection
+]).forEach((elemType) => {
+  aliases(elemType.clone, elemType.copy);
+  // events(elemType); - TODO
+  aliases(elemType.removeData, elemType.removeAttr);
+});
+([ele, node, edge] as [
+  cytoscape.SingularElementReturnValue,
+  cytoscape.NodeSingular,
+  cytoscape.EdgeSingular
+]).forEach((elemType) => {
+  aliases(elemType.data, elemType.attr);
 });
 // TODO: tests for data flow
 
@@ -429,6 +460,8 @@ aliases(eles.renderedBoundingBox, eles.renderedBoundingbox);
 const flags: boolean[] = [
   node.grabbed(), node.grabbable(), node.locked(), ele.active(),
 ];
+nodes.lock(); node.lock();
+nodes.unlock(); node.unlock();
 
 const edgePoints: cytoscape.Position[] = [
   ...edge.controlPoints(), ...edge.segmentPoints(), edge.sourceEndpoint(), edge.targetEndpoint(), edge.midpoint()
@@ -437,6 +470,13 @@ const edgePoints: cytoscape.Position[] = [
 aliases(eles.layout, eles.createLayout, eles.makeLayout);
 const layout = eles.layout({name: 'random'}).run();
 
+layout.on('layoutstop', () => {
+  cy.fit();
+});
+layout.on('layoutstop', {}, (obj) => {
+  console.log(obj);
+});
+
 eles.select();
 assert(ele.selected()); // as we selected all, and this too
 aliases(eles.unselect, eles.deselect);
@@ -457,6 +497,27 @@ eles.style(eles.style());
 aliases(eles.style, eles.css);
 aliases(ele.renderedCss, ele.renderedStyle);
 
+nodes.forEach((child) => {
+  child.animate({
+    position: node.position(),
+    duration: 300,
+    complete: () => {
+      console.log(child.id());
+    }
+  });
+});
+
+nodes.animate({
+  renderedPosition: node.position()
+}, {
+  style: { backgroundColor: 'red' },
+  duration: 1000,
+  queue: true,
+  complete: () => console.log('end'),
+  step: () => console.log('step'),
+  easing: 'ease-in-out-quint'
+});
+
 eles.anySame(nodes);
 aliases(eles.contains, eles.has);
 aliases(eles.allAreNeighbors, eles.allAreNeighbours);
@@ -485,11 +546,25 @@ eles.difference(collNodes).abscomp().intersection(collSel).symdiff(collNodes);
 const diff = collSel.diff(collNodes);
 cy.collection().merge(diff.left).merge(diff.right).merge(diff.both).unmerge(collSel).filter((ele, i, eles) => true);
 
-eles.sort((a, b) => 1).map((ele, i, eles) => [i, ele]);
-eles.reduce<any[]>((prev, ele, i, eles) => [...prev, [ele, i]], []).concat(['finish']);
-const min = eles.min((ele, i, eles) => ele.id.length + i); min.ele.scratch('min', min.value);
-const max = eles.max((ele, i, eles) => ele.id.length + i); max.ele.scratch('max', max.value);
+nodes.map(n => n.degree(false));
+edges.map(e => e.source());
+eles.map(e => e.id());
+eles.map(e => e.isNode() ? e.degree(false) : e.source());
+eles.map(e => e.isEdge() ? e.source() : e.degree(false));
 
-// TODO: traversing (need to actively check the nodes/edeges distinction)
+eles.sort((a, b) => a.id.length - b.id.length).map((ele, i, eles) => [i, ele]);
+eles.reduce<any[]>((prev, ele, i, eles) => [...prev, [ele, i]], []).concat(['finish']);
+
+const min = eles.min((ele, i, eles) => ele.isNode() ? ele.degree(false) : ele.source().degree(false));
+min.ele.scratch('min', min.value).scratch('min').value;
+const max = eles.max((ele, i, eles) => ele.isEdge() ? ele.source().degree(false) : ele.degree(false));
+max.ele.scratch('max', max.value);
+
+nodes.min(n => n.degree(false));
+nodes.max(n => n.degree(false));
+edges.max(n => n.source().id().length);
+edges.max(n => n.source().id().length);
+
+// TODO: traversing (need to actively check the nodes/edges distinction)
 // TODO: algorithms
 // TODO: compound nodes (there aren't any in current test case)
diff --git a/types/cytoscape/index.d.ts b/types/cytoscape/index.d.ts
index a3226defd2..59482ad507 100644
--- a/types/cytoscape/index.d.ts
+++ b/types/cytoscape/index.d.ts
@@ -482,7 +482,8 @@ declare namespace cytoscape {
          * @param namespace A namespace string.
          * @param value The value to set at the specified namespace.
          */
-        scratch(namespace?: string, value?: any): Scratchpad;
+        scratch(namespace?: string): Scratchpad;
+        scratch(namespace: string, value: any): this;
 
         /**
          * Remove scratchpad data. You should remove scratchpad data only at your own namespaces.
@@ -490,7 +491,7 @@ declare namespace cytoscape {
          *
          * @param namespace A namespace string.
          */
-        removeScratch(namespace: string): void;
+        removeScratch(namespace: string): this;
     }
 
     /**
@@ -508,25 +509,25 @@ declare namespace cytoscape {
          * @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;
+        on(events: EventNames, handler: EventHandler): this;
+        on(events: EventNames, selector: Selector, handler: EventHandler): this;
+        on(events: EventNames, selector: Selector, data: any, handler: EventHandler): this;
+        on(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): this;
 
-        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;
+        bind(events: EventNames, handler: EventHandler): this;
+        bind(events: EventNames, selector: Selector, handler: EventHandler): this;
+        bind(events: EventNames, selector: Selector, data: any, handler: EventHandler): this;
+        bind(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): this;
 
-        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;
+        listen(events: EventNames, handler: EventHandler): this;
+        listen(events: EventNames, selector: Selector, handler: EventHandler): this;
+        listen(events: EventNames, selector: Selector, data: any, handler: EventHandler): this;
+        listen(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): this;
 
-        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;
+        addListener(events: EventNames, handler: EventHandler): this;
+        addListener(events: EventNames, selector: Selector, handler: EventHandler): this;
+        addListener(events: EventNames, selector: Selector, data: any, handler: EventHandler): this;
+        addListener(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): this;
 
         /**
          * Get a promise that is resolved with the first
@@ -542,7 +543,7 @@ declare namespace cytoscape {
          * @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;
+        one(events: EventNames, handler: EventHandler): this;
         /**
          * Bind to events that occur in the graph, and trigger the handler only once.
          *
@@ -550,7 +551,7 @@ declare namespace cytoscape {
          * @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;
+        one(events: EventNames, selector: Selector, handler: EventHandler): this;
         /**
          * Bind to events that occur in the graph, and trigger the handler only once.
          *
@@ -559,7 +560,7 @@ declare namespace cytoscape {
          * @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;
+        one(events: EventNames, selector: Selector, data: any, handler: EventHandler): this;
         /**
          * Bind to events that occur in the graph, and trigger the handler only once.
          *
@@ -567,7 +568,7 @@ declare namespace cytoscape {
          * @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;
+        one(eventsMap: { [value: string]: EventHandler }, selector?: Selector, data?: any): this;
 
         /**
          * Remove event handlers.
@@ -578,17 +579,17 @@ declare namespace cytoscape {
          * @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;
+        off(events: EventNames, selector?: Selector, handler?: EventHandler): this;
+        off(eventsMap: { [value: string]: EventHandler }, selector?: Selector): this;
 
-        unbind(events: EventNames, selector?: Selector, handler?: EventHandler): void;
-        unbind(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+        unbind(events: EventNames, selector?: Selector, handler?: EventHandler): this;
+        unbind(eventsMap: { [value: string]: EventHandler }, selector?: Selector): this;
 
-        unlisten(events: EventNames, selector?: Selector, handler?: EventHandler): void;
-        unlisten(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+        unlisten(events: EventNames, selector?: Selector, handler?: EventHandler): this;
+        unlisten(eventsMap: { [value: string]: EventHandler }, selector?: Selector): this;
 
-        removeListener(events: EventNames, selector?: Selector, handler?: EventHandler): void;
-        removeListener(eventsMap: { [value: string]: EventHandler }, selector?: Selector): void;
+        removeListener(events: EventNames, selector?: Selector, handler?: EventHandler): this;
+        removeListener(eventsMap: { [value: string]: EventHandler }, selector?: Selector): this;
 
         /**
          * Trigger one or more events.
@@ -596,14 +597,14 @@ declare namespace cytoscape {
          * @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;
+        trigger(events: EventNames, extraParams?: any[]): this;
+        emit(events: EventNames, extraParams?: any[]): this;
 
         /**
          * 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;
+        ready(fn: EventHandler): this;
     }
 
     interface ZoomOptionsModel {
@@ -695,7 +696,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables panning; a falsey value disables it.
          */
-        panningEnabled(bool: boolean): void;
+        panningEnabled(bool: boolean): this;
 
         /**
          * 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.
@@ -709,7 +710,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables user panning; a falsey value disables it.
          */
-        userPanningEnabled(bool: boolean): void;
+        userPanningEnabled(bool: boolean): this;
         /**
          * Get the zoom level.
          * http://js.cytoscape.org/#cy.zoom
@@ -722,7 +723,7 @@ declare namespace cytoscape {
          * @param level The zoom level to set.
          * @param options The options for zooming.
          */
-        zoom(level?: number | ZoomOptions): void;
+        zoom(level?: number | ZoomOptions): this;
 
         /**
          * Set or get whether zooming is enabled. Get if no parameter provided.
@@ -730,7 +731,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables zooming; a falsey value disables it.
          */
-        zoomingEnabled(bool?: boolean): void;
+        zoomingEnabled(bool?: boolean): this;
 
         /**
          * Get whether zooming by user events (e.g. mouse wheel, pinch-to-zoom)
@@ -745,7 +746,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables user zooming; a falsey value disables it.
          */
-        userZoomingEnabled(bool?: boolean): void;
+        userZoomingEnabled(bool?: boolean): this;
 
         /**
          * Get the minimum zoom level.
@@ -758,7 +759,7 @@ declare namespace cytoscape {
          *
          * @param zoom The new minimum zoom level to use.
          */
-        minZoom(zoom: number): void;
+        minZoom(zoom: number): this;
 
         /**
          * Get the maximum zoom level.
@@ -771,7 +772,7 @@ declare namespace cytoscape {
          *
          * @param zoom The new maximum zoom level to use.
          */
-        maxZoom(zoom: number): void;
+        maxZoom(zoom: number): this;
 
         /**
          * Set the viewport state (pan & zoom) in one call.
@@ -780,7 +781,7 @@ declare namespace cytoscape {
          * @param zoom The zoom level to set.
          * @param pan The pan to set (a rendered position).
          */
-        viewport(zoom: number, pan: Position): void;
+        viewport(zoom: number, pan: Position): this;
 
         /**
          * Get whether box selection is enabled.
@@ -795,7 +796,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables box selection; a falsey value disables it.
          */
-        boxSelectionEnabled(bool: boolean): void;
+        boxSelectionEnabled(bool: boolean): this;
 
         /**
          * Get the on-screen width of the viewport in pixels.
@@ -832,7 +833,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables autolocking; a falsey value disables it.
          */
-        autolock(bool: boolean): void;
+        autolock(bool: boolean): this;
 
         /**
          * Get whether nodes are automatically ungrabified
@@ -847,7 +848,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables autolocking; a falsey value disables it.
          */
-        autoungrabify(bool: boolean): void;
+        autoungrabify(bool: boolean): this;
 
         /**
          * Get whether nodes are automatically unselectified
@@ -862,7 +863,7 @@ declare namespace cytoscape {
          *
          * @param bool A truthy value enables autolocking; a falsey value disables it.
          */
-        autounselectify(bool: boolean): void;
+        autounselectify(bool: boolean): this;
 
         /**
          * Force the renderer to redraw (i.e. draw a new frame).
@@ -872,7 +873,7 @@ declare namespace cytoscape {
          * but it should not be needed for most developers.
          * http://js.cytoscape.org/#cy.forceRender
          */
-        forceRender(): void;
+        forceRender(): this;
 
         /**
          * Force the renderer to recalculate the viewport bounds.
@@ -914,7 +915,7 @@ declare namespace cytoscape {
         /** An object containing centring options from which the graph will be animated. */
         center?: CenterOptions;
         /** easing - A transition-timing-function easing style string that shapes the animation progress curve. */
-        easing?: string; // TODO: explicit type
+        easing?: Css.TransitionTimingFunction;
 
         /** duration - The duration of the animation in milliseconds. */
         duration?: number;
@@ -949,7 +950,7 @@ declare namespace cytoscape {
          * Get an animation of the viewport.
          * http://js.cytoscape.org/#cy.animation
          */
-        animation(options: AnimationOptions): any;
+        animation(options: AnimationOptions): AnimationManipulation;
 
         /**
          * Add a delay between animations for the viewport.
@@ -963,7 +964,7 @@ declare namespace cytoscape {
          * Get a delay animation of the viewport.
          * http://js.cytoscape.org/#cy.delayAnimation
          */
-        delayAnimation(duration: number): void;
+        delayAnimation(duration: number): AnimationManipulation;
 
         /**
          * Stop all viewport animations that are currently running.
@@ -994,7 +995,7 @@ declare namespace cytoscape {
          * 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;
+        layout(layout: LayoutOptions): Layouts;
         /**
          * Get a new layout, which can be used to algorithmically
          * position the nodes in the graph.
@@ -1007,15 +1008,18 @@ declare namespace cytoscape {
          * 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;
-        createLayout(options: LayoutOptions): LayoutManipulation;
+        makeLayout(options: LayoutOptions): Layouts;
+        createLayout(options: LayoutOptions): Layouts;
     }
 
     /**
      * Get the entry point to modify the visual style of the graph after initialisation.
      * http://js.cytoscape.org/#core/style
      */
-    interface ElementStylesheet extends StylesheetStyle {
+    interface ElementStylesheetStyle extends StylesheetStyle {
+        json(): any;
+    }
+    interface ElementStylesheetCSS extends StylesheetCSS {
         json(): any;
     }
 
@@ -1023,11 +1027,11 @@ declare namespace cytoscape {
         /**
          * Get the current style object.
          */
-        style(): ElementStylesheet | string;
+        style(): ElementStylesheetStyle | ElementStylesheetCSS;
         /**
          * Assign a new stylesheet to replace the existing one.
          */
-        style(sheet: Stylesheet): Stylesheet;
+        style(sheet: Stylesheet | Stylesheet[] | string): Stylesheet;
     }
 
     /**
@@ -1052,10 +1056,6 @@ declare namespace cytoscape {
      * 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).
          */
@@ -1077,6 +1077,18 @@ declare namespace cytoscape {
          */
         maxHeight?: number;
     }
+    interface ExportStringOptions extends ExportOptions {
+        /**
+         * output Whether the output should be 'base64uri' (default), 'base64', or 'blob'.
+         */
+        output?: "base64uri" | "base64";
+    }
+    interface ExportBlobOptions extends ExportOptions {
+        /**
+         * output Whether the output should be 'base64uri' (default), 'base64', or 'blob'.
+         */
+        output?: "blob";
+    }
 
     interface ExportJpgOptions extends ExportOptions {
         /**
@@ -1086,22 +1098,29 @@ declare namespace cytoscape {
          */
         quality?: number;
     }
+    interface ExportJpgStringOptions extends ExportJpgOptions, ExportStringOptions {
+    }
+    interface ExportJpgBlobOptions extends ExportJpgOptions, ExportBlobOptions {
+    }
 
     interface CoreExport {
         /**
          * Export the current graph view as a PNG image in Base64 representation.
          */
-        png(options?: ExportOptions): string;
+        png(options?: ExportStringOptions): string;
+        png(options?: ExportBlobOptions): Blob;
 
         /**
          * Export the current graph view as a JPG image in Base64 representation.
          */
-        jpg(options?: ExportJpgOptions): string;
+        jpg(options?: ExportJpgStringOptions): string;
+        jpg(options?: ExportJpgBlobOptions): Blob;
 
         /**
          * Export the current graph view as a JPG image in Base64 representation.
          */
-        jpeg(options?: ExportJpgOptions): string;
+        jpeg(options?: ExportJpgStringOptions): string;
+        jpeg(options?: ExportJpgBlobOptions): Blob;
 
         /**
          * Export the graph as JSON, the same format used at initialisation.
@@ -1118,19 +1137,21 @@ declare namespace cytoscape {
      * http://js.cytoscape.org/#collection
      */
     interface Collection<TOut = SingularElementReturnValue, TIn = SingularElementArgument>
-        extends Singular,
+        extends
         CollectionGraphManipulation, CollectionEvents,
         CollectionData, CollectionPosition,
         CollectionLayout,
         CollectionSelection, CollectionStyle, CollectionAnimation,
         CollectionComparision, CollectionIteration<TIn, TOut>,
-        CollectionBuildingFiltering<TOut>, CollectionAlgorithms { }
+        CollectionBuildingFiltering<TIn, TOut>, CollectionAlgorithms { }
 
     /**
      * ele  --> Cy.Singular
      * a collection of a single element (node or edge)
+     * NB: every singular collection is a general collection too (but not vice versa)!
      */
-    interface Singular extends
+    interface Singular<TOut = SingularElementReturnValue, TIn = SingularElementArgument>
+        extends Collection<TOut, TIn>,
         SingularGraphManipulation,
         SingularData, SingularPosition,
         SingularSelection, SingularStyle, SingularAnimation { }
@@ -1145,8 +1166,8 @@ declare namespace cytoscape {
     /**
      * The output is a collection of node and edge elements OR single element.
      */
-    type CollectionArgument = EdgeCollection | NodeCollection | SingularElementArgument;
-    type CollectionReturnValue = EdgeCollection & NodeCollection & SingularElementReturnValue;
+    type CollectionArgument = Collection | EdgeCollection | NodeCollection | SingularElementArgument;
+    type CollectionReturnValue = Collection & EdgeCollection & NodeCollection & SingularElementReturnValue;
 
     /**
      * edges -> Cy.EdgeCollection
@@ -1154,7 +1175,7 @@ declare namespace cytoscape {
      *
      * The output is a collection of edge elements OR single edge.
      */
-    interface EdgeCollection extends Collection<EdgeSingular, EdgeSingular>, EdgeSingular,
+    interface EdgeCollection extends Collection<EdgeSingular, EdgeSingular>,
         EdgeCollectionTraversing { }
     /**
      *  nodes -> Cy.NodeCollection
@@ -1162,7 +1183,7 @@ declare namespace cytoscape {
      *
      * The output is a collection of node elements OR single node.
      */
-    interface NodeCollection extends Collection<NodeSingular, NodeSingular>, NodeSingular,
+    interface NodeCollection extends Collection<NodeSingular, NodeSingular>,
         NodeCollectionMetadata, NodeCollectionPosition, NodeCollectionTraversing,
         NodeCollectionCompound { }
 
@@ -1172,14 +1193,14 @@ declare namespace cytoscape {
      *  edge --> Cy.EdgeSingular
      *  a collection of a single edge
      */
-    interface EdgeSingular extends Singular,
+    interface EdgeSingular extends Singular<EdgeSingular, EdgeSingular>, EdgeCollection,
         EdgeSingularData, EdgeSingularPoints, EdgeSingularTraversing { }
 
     /**
      *  node --> Cy.NodeSingular
      *  a collection of a single node
      */
-    interface NodeSingular extends Singular,
+    interface NodeSingular extends Singular<NodeSingular, NodeSingular>, NodeCollection,
         NodeSingularMetadata, NodeSingularPosition, NodeSingularCompound { }
 
     /**
@@ -1248,9 +1269,18 @@ declare namespace cytoscape {
         /**
          * 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;
+        on(events: EventNames, selector: string, data: any, handler: EventHandler): this;
+        on(events: EventNames, selector: string, handler: EventHandler): this;
+        on(events: EventNames, handler: EventHandler): this;
+        bind(events: EventNames, selector: string, data: any, handler: EventHandler): this;
+        bind(events: EventNames, selector: string, handler: EventHandler): this;
+        bind(events: EventNames, handler: EventHandler): this;
+        listen(events: EventNames, selector: string, data: any, handler: EventHandler): this;
+        listen(events: EventNames, selector: string, handler: EventHandler): this;
+        listen(events: EventNames, handler: EventHandler): this;
+        addListener(events: EventNames, selector: string, data: any, handler: EventHandler): this;
+        addListener(events: EventNames, selector: string, handler: EventHandler): this;
+        addListener(events: EventNames, handler: EventHandler): this;
         /**
          * http://js.cytoscape.org/#eles.promiseOn
          * alias: pon
@@ -1266,25 +1296,29 @@ declare namespace cytoscape {
          * @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;
+        one(events: EventNames, selector: string, data: any, handler: EventHandler): this;
+        one(events: EventNames, selector: string, handler: EventHandler): this;
+        one(events: EventNames, handler: EventHandler): this;
         /**
          * 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;
+        once(events: EventNames, selector: string, data: any, handler: EventHandler): this;
+        once(events: EventNames, selector: string, handler: EventHandler): this;
+        once(events: EventNames, handler: EventHandler): this;
         /**
          * http://js.cytoscape.org/#eles.off
          * alias unbind, unlisten, removeListener
          */
-        off(events: EventNames, selector?: string, handler?: EventHandler): void;
+        off(events: EventNames, selector?: string, handler?: EventHandler): this;
+        unbind(events: EventNames, selector?: string, handler?: EventHandler): this;
+        unlisten(events: EventNames, selector?: string, handler?: EventHandler): this;
+        removeListener(events: EventNames, selector?: string, handler?: EventHandler): this;
         /**
          * http://js.cytoscape.org/#eles.trigger
          * alias: emit
          */
-        trigger(events: EventNames, extra?: string[]): void;
+        trigger(events: EventNames, extra?: string[]): this;
+        emit(events: EventNames, extra?: string[]): this;
     }
 
     /**
@@ -1329,12 +1363,12 @@ declare namespace cytoscape {
          * @param name The name of the field to set.
          * @param value The value to set for the field.
          */
-        data(name: string, value: any): void;
+        data(name: string, value: any): this;
         /**
          * 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;
+        data(obj: any): this;
         /**
          * Get a particular data field for the element.
          * @param name The name of the field to get.
@@ -1345,12 +1379,12 @@ declare namespace cytoscape {
          * @param name The name of the field to set.
          * @param value The value to set for the field.
          */
-        attr(name: string, value: any): void;
+        attr(name: string, value: any): this;
         /**
          * Update multiple data fields at once via an object.
          * @param obj The object containing name- value pairs to update data fields.
          */
-        attr(obj: any): void;
+        attr(obj: any): this;
 
         /**
          * Get or set the scratchpad at a particular namespace,
@@ -1362,7 +1396,8 @@ declare namespace cytoscape {
          * @param namespace A namespace string.
          * @param value The value to set at the specified namespace.
          */
-        scratch(namespace?: string, value?: any): Scratchpad;
+        scratch(namespace?: string): Scratchpad;
+        scratch(namespace: string, value: any): this;
 
         /**
          * Remove scratchpad data.
@@ -1370,7 +1405,7 @@ declare namespace cytoscape {
          * http://js.cytoscape.org/#ele.removeScratch
          * @param namespace A namespace string.
          */
-        removeScratch(namespace: string): void;
+        removeScratch(namespace: string): this;
 
         /**
          * A shortcut to get the ID of an element.
@@ -1398,13 +1433,13 @@ declare namespace cytoscape {
          * Get whether the element is a node.
          * http://js.cytoscape.org/#ele.isNode
          */
-        isNode(): boolean;
+        isNode(): this is NodeSingular;
 
         /**
          * Get whether the element is an edge.
          * http://js.cytoscape.org/#ele.isEdge
          */
-        isEdge(): boolean;
+        isEdge(): this is EdgeSingular;
     }
     /**
      * http://js.cytoscape.org/#collection/data
@@ -1559,18 +1594,6 @@ declare namespace cytoscape {
          */
         point(pos: Position): this;
 
-        /**
-         * Shift the positions of the nodes by a given model position vector.
-         * @param dimension The position dimension to shift.
-         * @param value The value to shift the dimension.
-         */
-        shift(dimension: PositionDimension, value?: number): this;
-        /**
-         * Shift the positions of the nodes by a given model position vector.
-         * @param pos An object specifying name-value pairs representing dimensions to shift.
-         */
-        shift(pos: Position): this;
-
         /**
          * Get or set the rendered (on-screen) position of a node.
          * http://js.cytoscape.org/#node.renderedPosition
@@ -1582,8 +1605,8 @@ declare namespace cytoscape {
          * @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;
+        renderedPosition(dimension: PositionDimension, value: Position): this;
+        renderedPosition(pos: { [name: string]: number }): this;
 
         /**
          * Set the value of a specified rendered position dimension.
@@ -1592,8 +1615,8 @@ declare namespace cytoscape {
          * @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;
+        renderedPoint(dimension: PositionDimension, value: Position): this;
+        renderedPoint(pos: { [name: string]: number }): this;
 
         /**
          *
@@ -1606,8 +1629,8 @@ declare namespace cytoscape {
          * @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;
+        relativePosition(dimension: PositionDimension, value: Position): this;
+        relativePosition(pos: { [name: string]: number }): this;
 
         /**
          * Get the value of a specified relative position dimension.
@@ -1616,8 +1639,8 @@ declare namespace cytoscape {
          * @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;
+        relativePoint(dimension: PositionDimension, value: Position): this;
+        relativePoint(pos: { [name: string]: number }): this;
 
         /**
          * Get whether a node is currently grabbed, meaning the user has hold of the node.
@@ -1640,43 +1663,55 @@ declare namespace cytoscape {
      * @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: NodeSingular, ix: number) => void;
-    type ElementCollectionFunction = (ele: NodeSingular, ix: number, eles: CollectionArgument) => void;
+    type ElementPositionFunction = (ele: NodeSingular, ix: number) => Position;
+    type ElementCollectionFunction = (ele: NodeSingular, ix: number, eles: CollectionArgument) => Position;
 
     /**
      * http://js.cytoscape.org/#collection/position--dimensions
      */
     interface NodeCollectionPosition {
+        /**
+         * Shift the positions of the nodes by a given model position vector.
+         * @param dimension The position dimension to shift.
+         * @param value The value to shift the dimension.
+         */
+        shift(dimension: PositionDimension, value?: number): this;
+        /**
+         * Shift the positions of the nodes by a given model position vector.
+         * @param pos An object specifying name-value pairs representing dimensions to shift.
+         */
+        shift(pos: Position): this;
+
         /**
          * 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;
+        positions(handler: ElementPositionFunction | Position): this;
+        modelPositions(handler: ElementPositionFunction | Position): this;
+        points(handler: ElementPositionFunction | Position): this;
 
         /**
          * Allow the user to grab the nodes.
          * http://js.cytoscape.org/#nodes.grabify
          */
-        grabify(): void;
+        grabify(): this;
         /**
          * Disallow the user to grab the nodes.
          * http://js.cytoscape.org/#nodes.ungrabify
          */
-        ungrabify(): void;
+        ungrabify(): this;
         /**
          * Lock the nodes such that their positions can not be changed.
          * http://js.cytoscape.org/#nodes.lock
          */
-        lock(): void;
+        lock(): this;
         /**
          * Unlock the nodes such that their positions can be changed.
          * http://js.cytoscape.org/#nodes.unlock
          */
-        unlock(): void;
+        unlock(): this;
     }
     /**
      * http://js.cytoscape.org/#collection/position--dimensions
@@ -1766,9 +1801,9 @@ declare namespace cytoscape {
          *
          * @param options The layout options.
          */
-        layout(options: LayoutOptions): LayoutManipulation;
-        makeLayout(options: LayoutOptions): LayoutManipulation;
-        createLayout(options: LayoutOptions): LayoutManipulation;
+        layout(options: LayoutOptions): Layouts;
+        makeLayout(options: LayoutOptions): Layouts;
+        createLayout(options: LayoutOptions): Layouts;
     }
 
     /**
@@ -1781,7 +1816,7 @@ declare namespace cytoscape {
         animationDuration?: number;
         // easing of animation, if enabled
         animationEasing?: number;
-        // collection of elements involved in the layout; set by cy.layout() or eles.layout()
+        // collection of elements involved in the layout; set by cy.layout() or eles.layout(s)
         eles: CollectionArgument;
         // whether to fit the viewport to the graph
         fit?: boolean;
@@ -1847,23 +1882,23 @@ declare namespace cytoscape {
          * Make the elements selected (NB other elements outside the collection are not affected).
          * http://js.cytoscape.org/#eles.select
          */
-        select(): void;
+        select(): this;
         /**
          * Make the elements not selected (NB other elements outside the collection are not affected).
          * http://js.cytoscape.org/#eles.unselect
          */
-        unselect(): void;
-        deselect(): void;
+        unselect(): this;
+        deselect(): this;
         /**
          * Make the selection states of the elements mutable.
          * http://js.cytoscape.org/#eles.selectify
          */
-        selectify(): void;
+        selectify(): this;
         /**
          * Make the selection states of the elements immutable.
          * http://js.cytoscape.org/#eles.unselectify
          */
-        unselectify(): void;
+        unselectify(): this;
     }
 
     /**
@@ -1879,34 +1914,34 @@ declare namespace cytoscape {
          * http://js.cytoscape.org/#eles.addClass
          * @param classes A space-separated list of class names to add to the elements.
          */
-        addClass(classes: ClassNames): void;
+        addClass(classes: ClassNames): this;
         /**
          * 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;
+        removeClass(classes: ClassNames): this;
         /**
          * 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;
+        toggleClass(classes: ClassNames, toggle?: boolean): this;
         /**
          * 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;
+        classes(classes?: ClassNames): this;
         /**
          * 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;
+        flashClass(classes: ClassNames, duration?: number): this;
 
         /**
          * Set a particular style property value.
@@ -2031,19 +2066,15 @@ declare namespace cytoscape {
         /** 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;
+        easing?: Css.TransitionTimingFunction;
     }
-    interface ElementAnimateOptionPos {
+    interface ElementAnimateOptionPos extends ElementAnimateOptionsBase {
         /** A position to which the elements will be animated. */
-        position?: Position;
-        /** A rendered position to which the elements will be animated. */
-        renderedPosition?: Position;
+        position: Position;
     }
-    interface ElementAnimateOptionRen {
-        /** A position to which the elements will be animated. */
-        position?: Position;
+    interface ElementAnimateOptionRen extends ElementAnimateOptionsBase {
         /** A rendered position to which the elements will be animated. */
-        renderedPosition?: Position;
+        renderedPosition: Position;
     }
     interface CollectionAnimation {
         /**
@@ -2051,28 +2082,28 @@ declare namespace cytoscape {
          * @param options An object containing the details of the animation.
          * http://js.cytoscape.org/#eles.animate
          */
-        animate(options: ElementAnimateOptionPos | ElementAnimateOptionRen): void;
+        animate(options: ElementAnimateOptionPos | ElementAnimateOptionRen, params?: ElementAnimateOptionsBase): this;
         /**
          * 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;
+        delay(duration: number, complete: () => void): this;
         /**
          * 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;
+        stop(clearQueue: boolean, jumpToEnd: boolean): this;
         /**
          * Remove all queued animations for the elements.
          * http://js.cytoscape.org/#eles.clearQueue
          */
-        clearQueue(): void;
+        clearQueue(): this;
     }
-    interface SingularAnimationOptions {
+    interface SingularAnimationOptionsBase {
         /** A position to which the elements will be animated. */
         position: Position;
         /** A rendered position to which the elements will be animated. */
@@ -2082,7 +2113,15 @@ declare namespace cytoscape {
         /** The duration of the animation in milliseconds. */
         duration: number;
         /** A transition-timing-function easing style string that shapes the animation progress curve. */
-        easing(): void;
+        easing: Css.TransitionTimingFunction;
+    }
+    interface SingularAnimationOptionsPos extends SingularAnimationOptionsBase {
+        /** A position to which the elements will be animated. */
+        position: Position;
+    }
+    interface SingularAnimationOptionsRen extends SingularAnimationOptionsBase {
+        /** A rendered position to which the elements will be animated. */
+        renderedPosition: Position;
     }
     interface SingularAnimation {
         /**
@@ -2093,14 +2132,14 @@ declare namespace cytoscape {
          *  Get an animation for the element.
          * @param options An object containing the details of the animation.
          */
-        animation(options: SingularAnimationOptions): void;
+        animation(options: SingularAnimationOptionsRen | SingularAnimationOptionsPos): AnimationManipulation;
 
         /**
          * 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;
+        delayAnimation(duration: number): AnimationManipulation;
     }
 
     /**
@@ -2216,8 +2255,8 @@ declare namespace cytoscape {
          * eles - The collection of elements being iterated.
          * @param thisArg [optional] The value for this within the iterating function.
          */
-        each(each: (ele: TIn, i: number, eles: this) => void | boolean, thisArg?: any): void;
-        forEach(each: (ele: TIn, i: number, eles: this) => void | boolean, thisArg?: any): void;
+        each(each: (ele: TIn, i: number, eles: this) => void | boolean, thisArg?: any): this;
+        forEach(each: (ele: TIn, i: number, eles: this) => void | boolean, thisArg?: any): this;
 
         /**
          * Get an element at a particular index in the collection.
@@ -2257,7 +2296,7 @@ declare namespace cytoscape {
         /**
          * Get the collection as an array, maintaining the order of the elements.
          */
-        toArray(): SingularElementReturnValue[];
+        toArray(): TOut[];
     }
 
     /**
@@ -2299,7 +2338,7 @@ declare namespace cytoscape {
     /**
      * http://js.cytoscape.org/#collection/building--filtering
      */
-    interface CollectionBuildingFiltering<TOut> {
+    interface CollectionBuildingFiltering<TIn, TOut> {
         /**
          * Get an element in the collection from its ID in a very performant way.
          * @param id The ID of the element to get.
@@ -2346,12 +2385,12 @@ declare namespace cytoscape {
          * Get the elements in both this collection and another specified collection.
          * http://js.cytoscape.org/#eles.intersection
          */
-        intersection: CollectionSymmetricDifferenceFunc;
-        intersect: CollectionSymmetricDifferenceFunc;
-        and: CollectionSymmetricDifferenceFunc;
-        n: CollectionSymmetricDifferenceFunc;
-        '&': CollectionSymmetricDifferenceFunc;
-        '.': CollectionSymmetricDifferenceFunc;
+        intersection: CollectionBuildingIntersectionFunc;
+        intersect: CollectionBuildingIntersectionFunc;
+        and: CollectionBuildingIntersectionFunc;
+        n: CollectionBuildingIntersectionFunc;
+        '&': CollectionBuildingIntersectionFunc;
+        '.': CollectionBuildingIntersectionFunc;
 
         /**
          * Get the elements that are in the calling collection
@@ -2406,7 +2445,7 @@ declare namespace cytoscape {
          * var col = cy.collection(); // new, empty collection
          * col.merge('#j').merge('#e');
          */
-        merge(eles: CollectionArgument | string): this;
+        merge(eles: CollectionArgument | Selector): this;
         /**
          * Perform an in-place operation on the calling collection to remove the given elements.
          * @param eles The elements to remove  in-place or a selector representing the elements to remove .
@@ -2431,7 +2470,7 @@ declare namespace cytoscape {
          * col.merge( cy.nodes() );
          * col.unmerge('#e');
          */
-        unmerge(eles: CollectionArgument | string): this;
+        unmerge(eles: CollectionArgument | Selector): this;
 
         /**
          * Get a new collection containing elements that are accepted by the specified filter.
@@ -2442,7 +2481,7 @@ declare namespace cytoscape {
          * ele - The element being considered.
          * http://js.cytoscape.org/#eles.filter
          */
-        filter(selector: Selector | ((ele: TOut, i: number, eles: CollectionArgument) => boolean)): CollectionReturnValue;
+        filter(selector: Selector | ((ele: TIn, i: number, eles: CollectionArgument) => boolean)): CollectionReturnValue;
         /**
          * Get the nodes that match the specified selector.
          *
@@ -2468,7 +2507,7 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.sort
          */
-        sort(sort: (ele1: CollectionArgument, ele2: CollectionArgument) => number): CollectionReturnValue;
+        sort(sort: (ele1: TIn, ele2: TIn) => number): CollectionReturnValue;
 
         /**
          * Get an array containing values mapped from the collection.
@@ -2481,7 +2520,7 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.map
          */
-        map(fn: (ele: CollectionArgument, i: number, eles: CollectionArgument) => any, thisArg?: any): any[];
+        map<T>(fn: (ele: TIn, i: number, eles: CollectionArgument) => T, thisArg?: any): T[];
 
         /**
          * Reduce a single value by applying a
@@ -2491,15 +2530,15 @@ declare namespace cytoscape {
          * 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.
+         * i The index of the current element.
          * eles The collection of elements being reduced.
          * @param initialValue The initial value for reducing
          * It is used also for type inference of output, but the type can be
          * also stated explicitly as generic
          * http://js.cytoscape.org/#eles.reduce
          */
-        reduce<T>(fn: (prevVal: T, ele: SingularElementReturnValue,
-            ix: number, eles: CollectionReturnValue) => T, initialValue: T): T;
+        reduce<T>(fn: (prevVal: T, ele: TIn,
+            i: number, eles: CollectionArgument) => T, initialValue: T): T;
 
         /**
          * Find a minimum value in a collection.
@@ -2512,15 +2551,15 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.min
          */
-        min(fn: (ele: CollectionArgument, i: number, eles: CollectionArgument) => any, thisArg?: any): {
+        min<T>(fn: (ele: TIn, i: number, eles: CollectionArgument) => T, thisArg?: any): {
             /**
              * The minimum value found.
              */
-            value: any,
+            value: T,
             /**
              * The element that corresponds to the minimum value.
              */
-            ele: CollectionArgument
+            ele: SingularElementReturnValue
         };
 
         /**
@@ -2534,15 +2573,15 @@ declare namespace cytoscape {
          *
          * http://js.cytoscape.org/#eles.max
          */
-        max(fn: (ele: CollectionArgument, i: number, eles: CollectionArgument) => any, thisArg?: any): {
+        max<T>(fn: (ele: TIn, i: number, eles: CollectionArgument) => T, thisArg?: any): {
             /**
-             * The maximum value found.
+             * The minimum value found.
              */
-            value: any,
+            value: T,
             /**
-             * The element that corresponds to the maximum value.
+             * The element that corresponds to the minimum value.
              */
-            ele: CollectionArgument
+            ele: SingularElementReturnValue
         };
     }
 
@@ -2640,14 +2679,14 @@ declare namespace cytoscape {
          * @param selector An optional selector that is used to filter the resultant collection.
          * http://js.cytoscape.org/#edge.source
          */
-        source(selector?: Selector): NodeCollection;
+        source(selector?: Selector): NodeSingular;
 
         /**
          * 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;
+        target(selector?: Selector): NodeSingular;
     }
     interface EdgeCollectionTraversing {
         // http://js.cytoscape.org/#collection/traversing
@@ -2747,28 +2786,28 @@ declare namespace cytoscape {
          *
          * @param selector [optional] An optional selector that is used to filter the resultant collection.
          */
-        outgoers(selector?: Selector): EdgeCollection;
+        outgoers(selector?: Selector): CollectionReturnValue;
 
         /**
          * 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;
+        successors(selector?: Selector): CollectionReturnValue;
 
         /**
          * 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;
+        incomers(selector?: Selector): CollectionReturnValue;
 
         /**
          * 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;
+        predecessors(selector?: Selector): CollectionReturnValue;
     }
 
     /**
@@ -2780,13 +2819,13 @@ declare namespace cytoscape {
 
     /**
      * 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.
+     * i - The index indicating this node is the ith visited node.
+     * depth - How many edge hops away this node is from the root nodes.
      */
-    type SearchVisitFunction = (i: number, depth: number, v: NodeCollection, e: EdgeCollection, u: NodeCollection) => boolean;
+    type SearchVisitFunction = (v: NodeCollection,  e: EdgeCollection, u: NodeCollection, i: number, depth: number) => boolean | void;
     interface SearchFirstOptions {
         /**
          * The root nodes (selector or collection) to start the search from.
@@ -2958,7 +2997,7 @@ declare namespace cytoscape {
      */
     interface SearchPageRankResult {
         /** function that computes the rank of a given node (either object or selector string) */
-        rank(node: NodeCollection): void;
+        rank(node: NodeCollection): number;
     }
 
     /**
@@ -3168,7 +3207,7 @@ declare namespace cytoscape {
          * returning the minimum spanning tree, assuming undirected edges.
          * http://js.cytoscape.org/#eles.kruskal
          */
-        kruskal(handler: (edge: EdgeCollection) => number): void;
+        kruskal(handler: (edge: EdgeCollection) => number): CollectionReturnValue;
         /**
          * Finds the minimum cut in a graph using the Karger-Stein algorithm.
          * The optimal result is found with a high probability, but without guarantee.
@@ -4641,10 +4680,14 @@ declare namespace cytoscape {
          * @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;
+        on(events: EventNames, handler: EventHandler): this;
+        on(events: EventNames, data: any, handler: EventHandler): this;
+        bind(events: EventNames, handler: EventHandler): this;
+        bind(events: EventNames, data: any, handler: EventHandler): this;
+        listen(events: EventNames, handler: EventHandler): this;
+        listen(events: EventNames, data: any, handler: EventHandler): this;
+        addListener(events: EventNames, handler: EventHandler): this;
+        addListener(events: EventNames, data: any, handler: EventHandler): this;
 
         /**
          * Get a promise that is resolved with the first of any of
@@ -4660,8 +4703,8 @@ declare namespace cytoscape {
          * @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;
+        one(events: EventNames, handler: EventHandler): this;
+        one(events: EventNames, data: any, handler: EventHandler): this;
 
         /**
          * Remove event handlers on the layout.
@@ -4670,10 +4713,10 @@ declare namespace cytoscape {
          * @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;
+        off(events: EventNames, handler?: EventHandler): this;
+        unbind(events: EventNames, handler?: EventHandler): this;
+        unlisten(events: EventNames, handler?: EventHandler): this;
+        removeListener(events: EventNames, handler?: EventHandler): this;
 
         /**
          * Trigger one or more events on the layout.
@@ -4681,7 +4724,7 @@ declare namespace cytoscape {
          * @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;
+        trigger(events: EventNames, extraParams?: any[]): this;
     }
 
     /**
@@ -4702,7 +4745,7 @@ declare namespace cytoscape {
          * If the animation is complete, it restarts from the beginning.
          * http://js.cytoscape.org/#ani.play
          */
-        play(): void;
+        play(): this;
         /**
          * Get whether the animation is currently playing.
          * http://js.cytoscape.org/#ani.playing
diff --git a/types/d3-hierarchy/d3-hierarchy-tests.ts b/types/d3-hierarchy/d3-hierarchy-tests.ts
index 65b1f5c392..16b372993d 100644
--- a/types/d3-hierarchy/d3-hierarchy-tests.ts
+++ b/types/d3-hierarchy/d3-hierarchy-tests.ts
@@ -13,8 +13,10 @@ import * as d3Hierarchy from 'd3-hierarchy';
 // -----------------------------------------------------------------------
 
 let num: number;
+let numOrUndefined: number | undefined;
 let size: [number, number];
-let idString: string;
+let sizeOrNull: [number, number] | null;
+let idString: string | undefined;
 
 // -----------------------------------------------------------------------
 // Hierarchy
@@ -47,16 +49,20 @@ let hierarchyRootDatum: HierarchyDatum = {
     ]
 };
 
-let hierarchyNodeArray: Array<d3Hierarchy.HierarchyNode<HierarchyDatum>>;
+let hierarchyNodeArray: Array<d3Hierarchy.HierarchyNode<HierarchyDatum>> = [];
+let hierarchyNodeArrayOrUndefined: Array<d3Hierarchy.HierarchyNode<HierarchyDatum>> | undefined;
 let hierarchyNode: d3Hierarchy.HierarchyNode<HierarchyDatum>;
 
-let hierarchyPointNodeArray: Array<d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>>;
+let hierarchyPointNodeArray: Array<d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>> = [];
+let hierarchyPointNodeArrayOrUndefined: Array<d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>> | undefined;
 let hierarchyPointNode: d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>;
 
-let hierarchyRectangularNodeArray: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>>;
+let hierarchyRectangularNodeArray: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>> = [];
+let hierarchyRectangularNodeArrayOrUndefined: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>> | undefined;
 let hierarchyRectangularNode: d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>;
 
-let hierarchyCircularNodeArray: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>>;
+let hierarchyCircularNodeArray: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>> = [];
+let hierarchyCircularNodeArrayOrUndefined: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>> | undefined;
 let hierarchyCircularNode: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>;
 
 // Create Hierarchy Layout Root Node =====================================
@@ -65,6 +71,10 @@ let hierarchyRootNode: d3Hierarchy.HierarchyNode<HierarchyDatum>;
 
 hierarchyRootNode = d3Hierarchy.hierarchy(hierarchyRootDatum);
 
+hierarchyRootNode = d3Hierarchy.hierarchy(hierarchyRootDatum, (d) => {
+    return d.children;
+});
+
 hierarchyRootNode = d3Hierarchy.hierarchy(hierarchyRootDatum, (d) => {
     return d.children || null;
 });
@@ -79,10 +89,11 @@ num = hierarchyRootNode.height;
 
 // children, parent ------------------------------------------------------
 
-hierarchyNodeArray = hierarchyRootNode.children;
+hierarchyNodeArrayOrUndefined = hierarchyRootNode.children;
 
-let parentNode: d3Hierarchy.HierarchyNode<HierarchyDatum>;
+let parentNode: d3Hierarchy.HierarchyNode<HierarchyDatum> | null;
 parentNode = hierarchyNodeArray.length ? hierarchyNodeArray[0].parent : null;
+parentNode = hierarchyNodeArray[0].parent;
 
 // id --------------------------------------------------------------------
 
@@ -93,17 +104,17 @@ idString = hierarchyRootNode.id;
 const ancestors: Array<d3Hierarchy.HierarchyNode<HierarchyDatum>> = hierarchyRootNode.ancestors();
 const descendants: Array<d3Hierarchy.HierarchyNode<HierarchyDatum>> = hierarchyRootNode.descendants();
 
-// leaves() ---------------------------------------------------------------
+// leaves() --------------------------------------------------------------
 
 hierarchyNodeArray = hierarchyRootNode.leaves();
 
-// path() -------------------------------------------------------------------
+// path() ----------------------------------------------------------------
 
 hierarchyNode = descendants[descendants.length - 1];
 
 const path: Array<d3Hierarchy.HierarchyNode<HierarchyDatum>> = hierarchyRootNode.path(hierarchyNode);
 
-// links() and HierarchyLink<...> ------------------------------------------
+// links() and HierarchyLink<...> ----------------------------------------
 
 let links: Array<d3Hierarchy.HierarchyLink<HierarchyDatum>>;
 
@@ -115,26 +126,26 @@ link = links[0];
 hierarchyNode = link.source;
 hierarchyNode = link.target;
 
-// sum() and value ----------------------------------------------------------
+// sum() and value -------------------------------------------------------
 
 hierarchyRootNode = hierarchyRootNode.sum((d) => d.val);
 
-num = hierarchyRootNode.value;
+numOrUndefined = hierarchyRootNode.value;
 
-// count() and value ----------------------------------------------------------
+// count() and value -----------------------------------------------------
 
 hierarchyRootNode = hierarchyRootNode.count();
 
-num = hierarchyRootNode.value;
+numOrUndefined = hierarchyRootNode.value;
 
-// sort ---------------------------------------------------------------------
+// sort ------------------------------------------------------------------
 
 hierarchyRootNode = hierarchyRootNode.sort((a, b) => {
     console.log('Raw values in data of a and b:', a.data.val, ' and ', b.data.val); // a and b are of type HierarchyNode<HierarchyDatum>
-    return b.height - a.height || b.value - a.value;
+    return b.height - a.height || b.value! - a.value!;
 });
 
-// each(), eachAfter(), eachBefore() ----------------------------------------
+// each(), eachAfter(), eachBefore() -------------------------------------
 
 hierarchyRootNode = hierarchyRootNode.each((node) => {
     console.log('Raw value of node:', node.data.val); // node type is HierarchyNode<HierarchyDatum>
@@ -151,7 +162,7 @@ hierarchyRootNode = hierarchyRootNode.eachBefore((node) => {
     console.log('Aggregated value of node:', node.value); // node type is HierarchyNode<HierarchyDatum>
 });
 
-// copy() --------------------------------------------------------------------
+// copy() ----------------------------------------------------------------
 
 let copiedHierarchyNode: d3Hierarchy.HierarchyNode<HierarchyDatum>;
 copiedHierarchyNode = hierarchyRootNode.copy();
@@ -161,12 +172,12 @@ copiedHierarchyNode = hierarchyRootNode.copy();
 // -----------------------------------------------------------------------
 
 interface HierarchyDatumWithParentId extends HierarchyDatum {
-    parentId: string;
+    parentId: string | null;
 }
 
 interface TabularHierarchyDatum {
     name: string;
-    parentId: string;
+    parentId: string | null;
     val: number;
 }
 
@@ -178,7 +189,7 @@ tabularData = [
     { name: 'n121', parentId: 'n12', val: 30 }
 ];
 
-let idStringAccessor: (d: TabularHierarchyDatum, i?: number, data?: TabularHierarchyDatum[]) => (string | null | '' | undefined);
+let idStringAccessor: (d: TabularHierarchyDatum, i: number, data: TabularHierarchyDatum[]) => (string | null | '' | undefined);
 
 // Create Stratify Operator  ---------------------------------------------
 
@@ -189,6 +200,10 @@ stratificatorizer = d3Hierarchy.stratify<TabularHierarchyDatum>();
 
 // id(...)
 
+stratificatorizer = stratificatorizer.id((d) => {
+    return d.name; // d is of type TabularHierarchyDatum
+});
+
 stratificatorizer = stratificatorizer.id((d, i, data) => {
     console.log('Length of tabular array: ', data.length);
     console.log('Name of first entry in tabular array: ', data[0].name); // data of type Array<TabularHierarchyDatum>
@@ -199,6 +214,10 @@ idStringAccessor = stratificatorizer.id();
 
 // parentId(...)
 
+stratificatorizer = stratificatorizer.parentId((d) => {
+    return d.parentId; // d is of type TabularHierarchyDatum
+});
+
 stratificatorizer = stratificatorizer.parentId((d, i, data) => {
     console.log('Length of tabular array: ', data.length);
     console.log('Name of first entry in tabular array: ', data[0].name); // data of type Array<TabularHierarchyDatum>
@@ -209,7 +228,8 @@ idStringAccessor = stratificatorizer.parentId();
 
 // Use Stratify Operator  ------------------------------------------------
 
-const stratifiedRootNode: d3Hierarchy.HierarchyNode<HierarchyDatumWithParentId> = stratificatorizer(tabularData);
+const stratifiedRootNode: d3Hierarchy.HierarchyNode<TabularHierarchyDatum> = stratificatorizer(tabularData);
+const pId: string | null = stratifiedRootNode.data.parentId;
 
 // -----------------------------------------------------------------------
 // Cluster
@@ -225,16 +245,14 @@ clusterLayout = d3Hierarchy.cluster<HierarchyDatumWithParentId>();
 
 // size() ----------------------------------------------------------------
 
-clusterLayout = clusterLayout.size(null);
 clusterLayout = clusterLayout.size([200, 200]);
 
-size = clusterLayout.size();
+sizeOrNull = clusterLayout.size();
 
 // nodeSize() ------------------------------------------------------------
 
-clusterLayout = clusterLayout.nodeSize(null);
 clusterLayout = clusterLayout.nodeSize([10, 10]);
-size = clusterLayout.nodeSize();
+sizeOrNull = clusterLayout.nodeSize();
 
 // separation() ----------------------------------------------------------
 
@@ -266,10 +284,11 @@ num = clusterRootNode.height;
 
 // children, parent ------------------------------------------------------
 
-hierarchyPointNodeArray = clusterRootNode.children;
+hierarchyPointNodeArrayOrUndefined = clusterRootNode.children;
 
-let parentPointNode: d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>;
+let parentPointNode: d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId> | null;
 parentPointNode = hierarchyPointNodeArray.length ? hierarchyPointNodeArray[0].parent : null;
+parentPointNode = hierarchyPointNodeArray[0].parent;
 
 // id --------------------------------------------------------------------
 
@@ -280,17 +299,17 @@ idString = clusterRootNode.id;
 const pointNodeAncestors: Array<d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>> = clusterRootNode.ancestors();
 const pointNodeDescendants: Array<d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>> = clusterRootNode.descendants();
 
-// leaves() ---------------------------------------------------------------
+// leaves() --------------------------------------------------------------
 
 hierarchyPointNodeArray = clusterRootNode.leaves();
 
-// path() -------------------------------------------------------------------
+// path() ----------------------------------------------------------------
 
 hierarchyPointNode = pointNodeDescendants[pointNodeDescendants.length - 1];
 
 const clusterPath: Array<d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>> = clusterRootNode.path(hierarchyPointNode);
 
-// links() and HierarchyPointLink<...> ------------------------------------------
+// links() and HierarchyPointLink<...> -----------------------------------
 
 let pointLinks: Array<d3Hierarchy.HierarchyPointLink<HierarchyDatumWithParentId>>;
 
@@ -302,27 +321,27 @@ pointLink = pointLinks[0];
 hierarchyPointNode = pointLink.source;
 hierarchyPointNode = pointLink.target;
 
-// sum() and value ----------------------------------------------------------
+// sum() and value -------------------------------------------------------
 
 clusterRootNode = clusterRootNode.sum((d) => d.val);
 
-num = clusterRootNode.value;
+numOrUndefined = clusterRootNode.value;
 
-// count() and value ----------------------------------------------------------
+// count() and value -----------------------------------------------------
 
 clusterRootNode = clusterRootNode.count();
 
-num = clusterRootNode.value;
+numOrUndefined = clusterRootNode.value;
 
-// sort ---------------------------------------------------------------------
+// sort ------------------------------------------------------------------
 
 clusterRootNode = clusterRootNode.sort((a, b) => {
     console.log('x-coordinates of a:', a.x, ' and b:', b.x); // a and b are of type HierarchyPointNode<HierarchyDatumWithParentId>
     console.log('Raw values in data of a and b:', a.data.val, ' and ', b.data.val); // a and b are of type HierarchyPointNode<HierarchyDatumWithParentId>
-    return b.height - a.height || b.value - a.value;
+    return b.height - a.height || b.value! - a.value!;
 });
 
-// each(), eachAfter(), eachBefore() ----------------------------------------
+// each(), eachAfter(), eachBefore() -------------------------------------
 
 clusterRootNode = clusterRootNode.each((node) => {
     console.log('ParentId:', node.data.parentId); // node type is HierarchyPointNode<HierarchyDatumWithParentId>
@@ -339,7 +358,7 @@ clusterRootNode = clusterRootNode.eachBefore((node) => {
     console.log('X-coordinate of node:', node.x); // node type is HierarchyPointNode<HierarchyDatumWithParentId>
 });
 
-// copy() --------------------------------------------------------------------
+// copy() ----------------------------------------------------------------
 
 let copiedClusterNode: d3Hierarchy.HierarchyPointNode<HierarchyDatumWithParentId>;
 copiedClusterNode = clusterRootNode.copy();
@@ -348,26 +367,24 @@ copiedClusterNode = clusterRootNode.copy();
 // Tree
 // -----------------------------------------------------------------------
 
-// Create tree layout generator =======================================
+// Create tree layout generator ==========================================
 
 let treeLayout: d3Hierarchy.TreeLayout<HierarchyDatumWithParentId>;
 
 treeLayout = d3Hierarchy.tree<HierarchyDatumWithParentId>();
 
-// Configure tree layout generator ====================================
+// Configure tree layout generator =======================================
 
 // size() ----------------------------------------------------------------
 
-treeLayout = treeLayout.size(null);
 treeLayout = treeLayout.size([200, 200]);
 
-size = treeLayout.size();
+sizeOrNull = treeLayout.size();
 
 // nodeSize() ------------------------------------------------------------
 
-treeLayout = treeLayout.nodeSize(null);
 treeLayout = treeLayout.nodeSize([10, 10]);
-size = treeLayout.nodeSize();
+sizeOrNull = treeLayout.nodeSize();
 
 // separation() ----------------------------------------------------------
 
@@ -416,18 +433,17 @@ tilingFn = treemapLayout.tile();
 
 // size() ----------------------------------------------------------------
 
-treemapLayout = treemapLayout.size(null);
 treemapLayout = treemapLayout.size([400, 200]);
 
 size = treemapLayout.size();
 
-// round() ------------------------------------------------------------
+// round() ---------------------------------------------------------------
 
 treemapLayout = treemapLayout.round(true);
 
 let roundFlag: boolean = treemapLayout.round();
 
-// padding() ----------------------------------------------------------------
+// padding() -------------------------------------------------------------
 
 treemapLayout = treemapLayout.padding(1);
 treemapLayout = treemapLayout.padding((node) => {
@@ -437,7 +453,7 @@ treemapLayout = treemapLayout.padding((node) => {
 
 numberRectangularNodeAccessor = treemapLayout.padding();
 
-// paddingInner() ----------------------------------------------------------------
+// paddingInner() --------------------------------------------------------
 
 treemapLayout = treemapLayout.paddingInner(1);
 treemapLayout = treemapLayout.paddingInner((node) => {
@@ -447,7 +463,7 @@ treemapLayout = treemapLayout.paddingInner((node) => {
 
 numberRectangularNodeAccessor = treemapLayout.paddingInner();
 
-// paddingOuter() ----------------------------------------------------------------
+// paddingOuter() --------------------------------------------------------
 
 treemapLayout = treemapLayout.paddingOuter(1);
 treemapLayout = treemapLayout.paddingOuter((node) => {
@@ -457,7 +473,7 @@ treemapLayout = treemapLayout.paddingOuter((node) => {
 
 numberRectangularNodeAccessor = treemapLayout.paddingOuter();
 
-// paddingTop() ----------------------------------------------------------------
+// paddingTop() ----------------------------------------------------------
 
 treemapLayout = treemapLayout.paddingTop(1);
 treemapLayout = treemapLayout.paddingTop((node) => {
@@ -467,7 +483,7 @@ treemapLayout = treemapLayout.paddingTop((node) => {
 
 numberRectangularNodeAccessor = treemapLayout.paddingTop();
 
-// paddingRight() ----------------------------------------------------------------
+// paddingRight() --------------------------------------------------------
 
 treemapLayout = treemapLayout.paddingRight(1);
 treemapLayout = treemapLayout.paddingRight((node) => {
@@ -477,7 +493,7 @@ treemapLayout = treemapLayout.paddingRight((node) => {
 
 numberRectangularNodeAccessor = treemapLayout.paddingRight();
 
-// paddingBottom() ----------------------------------------------------------------
+// paddingBottom() -------------------------------------------------------
 
 treemapLayout = treemapLayout.paddingBottom(1);
 treemapLayout = treemapLayout.paddingBottom((node) => {
@@ -487,7 +503,7 @@ treemapLayout = treemapLayout.paddingBottom((node) => {
 
 numberRectangularNodeAccessor = treemapLayout.paddingBottom();
 
-// paddingLeft() ----------------------------------------------------------------
+// paddingLeft() ---------------------------------------------------------
 
 treemapLayout = treemapLayout.paddingLeft(1);
 treemapLayout = treemapLayout.paddingLeft((node) => {
@@ -527,7 +543,7 @@ tilingFactoryFn = d3Hierarchy.treemapResquarify.ratio(2);
 
 treemapLayout.tile(d3Hierarchy.treemapResquarify.ratio(2));
 
-// Use HierarchyRectangularNode ================================================
+// Use HierarchyRectangularNode ==========================================
 
 // x and y coordinates ---------------------------------------------------
 
@@ -544,10 +560,11 @@ num = treemapRootNode.height;
 
 // children, parent ------------------------------------------------------
 
-hierarchyRectangularNodeArray = treemapRootNode.children;
+hierarchyRectangularNodeArrayOrUndefined = treemapRootNode.children;
 
-let parentRectangularNode: d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>;
+let parentRectangularNode: d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId> | null;
 parentRectangularNode = hierarchyRectangularNodeArray.length ? hierarchyRectangularNodeArray[0].parent : null;
+parentRectangularNode = hierarchyRectangularNodeArray[0].parent;
 
 // id --------------------------------------------------------------------
 
@@ -558,17 +575,17 @@ idString = treemapRootNode.id;
 const rectangularNodeAncestors: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>> = treemapRootNode.ancestors();
 const rectangularNodeDescendants: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>> = treemapRootNode.descendants();
 
-// leaves() ---------------------------------------------------------------
+// leaves() --------------------------------------------------------------
 
 hierarchyRectangularNodeArray = treemapRootNode.leaves();
 
-// path() -------------------------------------------------------------------
+// path() ----------------------------------------------------------------
 
 hierarchyRectangularNode = rectangularNodeDescendants[rectangularNodeDescendants.length - 1];
 
 const treemapPath: Array<d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>> = treemapRootNode.path(hierarchyRectangularNode);
 
-// links() and HierarchyRectangularLink<...> ------------------------------------------
+// links() and HierarchyRectangularLink<...> -----------------------------
 
 let rectangularLinks: Array<d3Hierarchy.HierarchyRectangularLink<HierarchyDatumWithParentId>>;
 
@@ -580,26 +597,26 @@ rectangularLink = rectangularLinks[0];
 hierarchyRectangularNode = rectangularLink.source;
 hierarchyRectangularNode = rectangularLink.target;
 
-// sum() and value ----------------------------------------------------------
+// sum() and value -------------------------------------------------------
 
 treemapRootNode = treemapRootNode.sum((d) => d.val);
 
-num = treemapRootNode.value;
+numOrUndefined = treemapRootNode.value;
 
-// count() and value ----------------------------------------------------------
+// count() and value -----------------------------------------------------
 
 treemapRootNode = treemapRootNode.count();
 
-num = treemapRootNode.value;
-// sort ---------------------------------------------------------------------
+numOrUndefined = treemapRootNode.value;
+// sort ------------------------------------------------------------------
 
 treemapRootNode = treemapRootNode.sort((a, b) => {
     console.log('x0-coordinates of a:', a.x0, ' and b:', b.x0); // a and b are of type HierarchyRectangularNode<HierarchyDatumWithParentId>
     console.log('Raw values in data of a and b:', a.data.val, ' and ', b.data.val); // a and b are of type HierarchyRectangularNode<HierarchyDatumWithParentId>
-    return b.height - a.height || b.value - a.value;
+    return b.height - a.height || b.value! - a.value!;
 });
 
-// each(), eachAfter(), eachBefore() ----------------------------------------
+// each(), eachAfter(), eachBefore() -------------------------------------
 
 treemapRootNode = treemapRootNode.each((node) => {
     console.log('ParentId:', node.data.parentId); // node type is HierarchyRectangularNode<HierarchyDatumWithParentId>
@@ -616,7 +633,7 @@ treemapRootNode = treemapRootNode.eachBefore((node) => {
     console.log('X0-coordinate of node:', node.x0); // node type is HierarchyRectangularNode<HierarchyDatumWithParentId>
 });
 
-// copy() --------------------------------------------------------------------
+// copy() ----------------------------------------------------------------
 
 let copiedTreemapNode: d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>;
 copiedTreemapNode = treemapRootNode.copy();
@@ -625,34 +642,33 @@ copiedTreemapNode = treemapRootNode.copy();
 // Partition
 // -----------------------------------------------------------------------
 
-// Create partition layout generator =======================================
+// Create partition layout generator =====================================
 
 let partitionLayout: d3Hierarchy.PartitionLayout<HierarchyDatumWithParentId>;
 
 partitionLayout = d3Hierarchy.partition<HierarchyDatumWithParentId>();
 
-// Configure partition layout generator ====================================
+// Configure partition layout generator ==================================
 
 // size() ----------------------------------------------------------------
 
-partitionLayout = partitionLayout.size(null);
 partitionLayout = partitionLayout.size([400, 200]);
 
 size = partitionLayout.size();
 
-// round() ------------------------------------------------------------
+// round() ---------------------------------------------------------------
 
 partitionLayout = partitionLayout.round(true);
 
 roundFlag = partitionLayout.round();
 
-// padding() ----------------------------------------------------------------
+// padding() -------------------------------------------------------------
 
 partitionLayout = partitionLayout.padding(1);
 
 num = partitionLayout.padding();
 
-// Use partition layout generator ==========================================
+// Use partition layout generator ========================================
 
 let partitionRootNode: d3Hierarchy.HierarchyRectangularNode<HierarchyDatumWithParentId>;
 
@@ -662,54 +678,57 @@ partitionRootNode = partitionLayout(stratifiedRootNode);
 // Pack
 // -----------------------------------------------------------------------
 
-let numberCircularNodeAccessor: (node: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>) => number;
+type CircularAccessor = (node: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>) => number;
+let numberCircularNodeAccessor: CircularAccessor;
+let numberCircularNodeAccessorOrNull: CircularAccessor | null;
 
-// Create pack layout generator =======================================
+// Create pack layout generator ==========================================
 
 let packLayout: d3Hierarchy.PackLayout<HierarchyDatumWithParentId>;
 
 packLayout = d3Hierarchy.pack<HierarchyDatumWithParentId>();
 
-// Configure pack layout generator ====================================
+// Configure pack layout generator =======================================
 
 // size() ----------------------------------------------------------------
 
-packLayout = packLayout.size(null);
 packLayout = packLayout.size([400, 400]);
 
 size = packLayout.size();
 
-// radius() ------------------------------------------------------------
+// radius() --------------------------------------------------------------
+
+packLayout = packLayout.radius(null);
 
 packLayout = packLayout.radius((node) => {
     console.log('Radius property of node before completing accessor: ', node.r); // node is of type HierarchyCircularNode<HierarchyDatumWithParentId>
     console.log('Parent id of node: ', node.data.parentId); // node is of type HierarchyCircularNode<HierarchyDatumWithParentId>
-    return node.value;
+    return node.value!;
 });
 
-numberCircularNodeAccessor = packLayout.radius();
+numberCircularNodeAccessorOrNull = packLayout.radius();
 
-// padding() ----------------------------------------------------------------
+// padding() -------------------------------------------------------------
 
 packLayout = packLayout.padding(1);
 
 packLayout = packLayout.padding((node) => {
     console.log('Radius property of node: ', node.r); // node is of type HierarchyCircularNode<HierarchyDatumWithParentId>
     console.log('Parent id of node: ', node.data.parentId); // node is of type HierarchyCircularNode<HierarchyDatumWithParentId>
-    return node.value > 10 ? 2 : 1;
+    return node.value! > 10 ? 2 : 1;
 });
 
 numberCircularNodeAccessor = packLayout.padding();
 
-// Use partition layout generator ==========================================
+// Use partition layout generator ========================================
 
 let packRootNode: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>;
 
 packRootNode = packLayout(stratifiedRootNode);
 
-// Use HierarchyCircularNode ================================================
+// Use HierarchyCircularNode =============================================
 
-// x and y coordinates and radius r ------------------------------------------
+// x and y coordinates and radius r --------------------------------------
 
 num = packRootNode.x;
 num = packRootNode.y;
@@ -723,10 +742,11 @@ num = packRootNode.height;
 
 // children, parent ------------------------------------------------------
 
-hierarchyCircularNodeArray = packRootNode.children;
+hierarchyCircularNodeArrayOrUndefined = packRootNode.children;
 
-let parentCircularNode: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>;
+let parentCircularNode: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId> | null;
 parentCircularNode = hierarchyCircularNodeArray.length ? hierarchyCircularNodeArray[0].parent : null;
+parentCircularNode = hierarchyCircularNodeArray[0].parent;
 
 // id --------------------------------------------------------------------
 
@@ -737,17 +757,17 @@ idString = packRootNode.id;
 const circularNodeAncestors: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>> = packRootNode.ancestors();
 const circularNodeDescendants: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>> = packRootNode.descendants();
 
-// leaves() ---------------------------------------------------------------
+// leaves() --------------------------------------------------------------
 
 hierarchyCircularNodeArray = packRootNode.leaves();
 
-// path() -------------------------------------------------------------------
+// path() ----------------------------------------------------------------
 
 hierarchyCircularNode = circularNodeDescendants[circularNodeDescendants.length - 1];
 
 const packPath: Array<d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>> = packRootNode.path(hierarchyCircularNode);
 
-// links() and HierarchyRectangularLink<...> ------------------------------------------
+// links() and HierarchyRectangularLink<...> -----------------------------
 
 let circularLinks: Array<d3Hierarchy.HierarchyCircularLink<HierarchyDatumWithParentId>>;
 
@@ -759,26 +779,27 @@ circularLink = circularLinks[0];
 hierarchyCircularNode = circularLink.source;
 hierarchyCircularNode = circularLink.target;
 
-// sum() and value ----------------------------------------------------------
+// sum() and value -------------------------------------------------------
 
 packRootNode = packRootNode.sum((d) => d.val);
 
-num = packRootNode.value;
+numOrUndefined = packRootNode.value;
 
-// count() and value ----------------------------------------------------------
+// count() and value -----------------------------------------------------
 
 packRootNode = packRootNode.count();
 
-num = packRootNode.value;
-// sort ---------------------------------------------------------------------
+numOrUndefined = packRootNode.value;
+
+// sort ------------------------------------------------------------------
 
 packRootNode = packRootNode.sort((a, b) => {
     console.log('radius of a:', a.r, ' and b:', b.r); // a and b are of type HierarchyCircularNode<HierarchyDatumWithParentId>
     console.log('Raw values in data of a and b:', a.data.val, ' and ', b.data.val); // a and b are of type HierarchyCircularNode<HierarchyDatumWithParentId>
-    return b.height - a.height || b.value - a.value;
+    return b.height - a.height || b.value! - a.value!;
 });
 
-// each(), eachAfter(), eachBefore() ----------------------------------------
+// each(), eachAfter(), eachBefore() -------------------------------------
 
 packRootNode = packRootNode.each((node) => {
     console.log('ParentId:', node.data.parentId); // node type is HierarchyCircularNode<HierarchyDatumWithParentId>
@@ -795,7 +816,7 @@ packRootNode = packRootNode.eachBefore((node) => {
     console.log('Radius of node:', node.r); // node type is HierarchyCircularNode<HierarchyDatumWithParentId>
 });
 
-// copy() --------------------------------------------------------------------
+// copy() ----------------------------------------------------------------
 
 let copiedPackNode: d3Hierarchy.HierarchyCircularNode<HierarchyDatumWithParentId>;
 copiedPackNode = packRootNode.copy();
diff --git a/types/d3-hierarchy/index.d.ts b/types/d3-hierarchy/index.d.ts
index 440a779217..0ec823cc78 100644
--- a/types/d3-hierarchy/index.d.ts
+++ b/types/d3-hierarchy/index.d.ts
@@ -1,65 +1,208 @@
 // Type definitions for D3JS d3-hierarchy module 1.1
 // Project: https://github.com/d3/d3-hierarchy/
-// Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Tom Wanzek <https://github.com/tomwanzek>
+//                 Alex Ford <https://github.com/gustavderdrache>
+//                 Boris Yankov <https://github.com/borisyankov>
+//                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// Last module patch version validated against: 1.1.1
+// Last module patch version validated against: 1.1.6
 
 // -----------------------------------------------------------------------
 // Hierarchy
 // -----------------------------------------------------------------------
 
 export interface HierarchyLink<Datum> {
+    /**
+     * The source of the link.
+     */
     source: HierarchyNode<Datum>;
+
+    /**
+     * The target of the link.
+     */
     target: HierarchyNode<Datum>;
 }
 
 export interface HierarchyNode<Datum> {
-    data: Datum;
-    readonly depth: number;
-    readonly height: number;
-    parent: HierarchyNode<Datum> | null;
-    children?: Array<HierarchyNode<Datum>>;
     /**
-     * Aggregated numeric value as calculated by sum(value) or count(),
-     * if previously invoked.
+     * The associated data, as specified to the constructor.
+     */
+    data: Datum;
+
+    /**
+     * Zero for the root node, and increasing by one for each descendant generation.
+     */
+    readonly depth: number;
+
+    /**
+     * Zero for leaf nodes, and the greatest distance from any descendant leaf for internal nodes.
+     */
+    readonly height: number;
+
+    /**
+     * The parent node, or null for the root node.
+     */
+    parent: this | null;
+
+    /**
+     * An array of child nodes, if any; undefined for leaf nodes.
+     */
+    children?: this[];
+
+    /**
+     * Aggregated numeric value as calculated by `sum(value)` or `count()`, if previously invoked.
      */
     readonly value?: number;
+
     /**
-     * Optional Node Id string set by StratifyOperator, if
-     * hierarchical data was created from tabular data using stratify()
+     * Optional node id string set by `StratifyOperator`, if hierarchical data was created from tabular data using stratify().
      */
     readonly id?: string;
-    ancestors(): Array<HierarchyNode<Datum>>;
-    descendants(): Array<HierarchyNode<Datum>>;
-    leaves(): Array<HierarchyNode<Datum>>;
-    path(target: HierarchyNode<Datum>): Array<HierarchyNode<Datum>>;
+
+    /**
+     * Returns the array of ancestors nodes, starting with this node, then followed by each parent up to the root.
+     */
+    ancestors(): this[];
+
+    /**
+     * Returns the array of descendant nodes, starting with this node, then followed by each child in topological order.
+     */
+    descendants(): this[];
+
+    /**
+     * Returns the array of leaf nodes in traversal order; leaves are nodes with no children.
+     */
+    leaves(): this[];
+
+    /**
+     * Returns the shortest path through the hierarchy from this node to the specified target node.
+     * The path starts at this node, ascends to the least common ancestor of this node and the target node, and then descends to the target node.
+     *
+     * @param target The target node.
+     */
+    path(target: this): this[];
+
+    /**
+     * Returns an array of links for this node, where each link is an object that defines source and target properties.
+     * The source of each link is the parent node, and the target is a child node.
+     */
     links(): Array<HierarchyLink<Datum>>;
+
+    /**
+     * Evaluates the specified value function for this node and each descendant in post-order traversal, and returns this node.
+     * The `node.value` property of each node is set to the numeric value returned by the specified function plus the combined value of all descendants.
+     *
+     * @param value The value function is passed the node’s data, and must return a non-negative number.
+     */
     sum(value: (d: Datum) => number): this;
+
+    /**
+     * Computes the number of leaves under this node and assigns it to `node.value`, and similarly for every descendant of node.
+     * If this node is a leaf, its count is one. Returns this node.
+     */
     count(): this;
-    sort(compare: (a: HierarchyNode<Datum>, b: HierarchyNode<Datum>) => number): this;
-    each(func: (node: HierarchyNode<Datum>) => void): this;
-    eachAfter(func: (node: HierarchyNode<Datum>) => void): this;
-    eachBefore(func: (node: HierarchyNode<Datum>) => void): this;
-    copy(): HierarchyNode<Datum>;
+
+    /**
+     * Sorts the children of this node, if any, and each of this node’s descendants’ children,
+     * in pre-order traversal using the specified compare function, and returns this node.
+     *
+     * @param compare The compare function is passed two nodes a and b to compare.
+     * If a should be before b, the function must return a value less than zero;
+     * if b should be before a, the function must return a value greater than zero;
+     * otherwise, the relative order of a and b are not specified. See `array.sort` for more.
+     */
+    sort(compare: (a: this, b: this) => number): this;
+
+    /**
+     * Invokes the specified function for node and each descendant in breadth-first order,
+     * such that a given node is only visited if all nodes of lesser depth have already been visited,
+     * as well as all preceding nodes of the same depth.
+     *
+     * @param func The specified function is passed the current node.
+     */
+    each(func: (node: this) => void): this;
+
+    /**
+     * Invokes the specified function for node and each descendant in post-order traversal,
+     * such that a given node is only visited after all of its descendants have already been visited.
+     *
+     * @param func The specified function is passed the current node.
+     */
+    eachAfter(func: (node: this) => void): this;
+
+    /**
+     * Invokes the specified function for node and each descendant in pre-order traversal,
+     * such that a given node is only visited after all of its ancestors have already been visited.
+     *
+     * @param func The specified function is passed the current node.
+     */
+    eachBefore(func: (node: this) => void): this;
+
+    /**
+     * Return a deep copy of the subtree starting at this node. The returned deep copy shares the same data, however.
+     * The returned node is the root of a new tree; the returned node’s parent is always null and its depth is always zero.
+     */
+    copy(): this;
 }
 
-export function hierarchy<Datum>(data: Datum, children?: (d: Datum) => (Datum[] | null)): HierarchyNode<Datum>;
+/**
+ * Constructs a root node from the specified hierarchical data.
+ *
+ * @param data The root specified data.
+ * @param children The specified children accessor function invoked for each datum, starting with the root data.
+ * Must return an array of data representing the children, and return null or undefined if the current datum has no children.
+ * If children is not specified, it defaults to: `(d) => d.children`.
+ */
+export function hierarchy<Datum>(data: Datum, children?: (d: Datum) => (Datum[] | null | undefined)): HierarchyNode<Datum>;
 
 // -----------------------------------------------------------------------
 // Stratify
 // -----------------------------------------------------------------------
 
-// TODO: Review the comment in the API documentation related to 'reserved properties': id, parentId, children. If this is referring to the element on node, it should be 'parent'?
-
 export interface StratifyOperator<Datum> {
+    /**
+     * Generates a new hierarchy from the specified tabular data. Each node in the returned object has a shallow copy of the properties
+     * from the corresponding data object, excluding the following reserved properties: id, parentId, children.
+     *
+     * @param data The root specified data.
+     * @throws Error on missing id, ambiguous id, cycle, multiple roots or no root.
+     */
     (data: Datum[]): HierarchyNode<Datum>;
+
+    /**
+     * Returns the current id accessor, which defaults to: `(d) => d.id`.
+     */
     id(): (d: Datum, i: number, data: Datum[]) => (string | null | '' | undefined);
-    id(id: (d: Datum, i?: number, data?: Datum[]) => (string | null | '' | undefined)): this;
+    /**
+     * Sets the id accessor to the given function.
+     * The id accessor is invoked for each element in the input data passed to the stratify operator.
+     * The returned string is then used to identify the node's relationships in conjunction with the parent id.
+     * For leaf nodes, the id may be undefined, null or the empty string; otherwise, the id must be unique.
+     *
+     * @param id The id accessor.
+     */
+    id(id: (d: Datum, i: number, data: Datum[]) => (string | null | '' | undefined)): this;
+
+    /**
+     * Returns the current parent id accessor, which defaults to: `(d) => d.parentId`.
+     */
     parentId(): (d: Datum, i: number, data: Datum[]) => (string | null | '' | undefined);
-    parentId(parentId: (d: Datum, i?: number, data?: Datum[]) => (string | null | '' | undefined)): this;
+    /**
+     * Sets the parent id accessor to the given function.
+     * The parent id accessor is invoked for each element in the input data passed to the stratify operator.
+     * The returned string is then used to identify the node's relationships in conjunction with the id.
+     * For the root node, the parent id should be undefined, null or the empty string.
+     * There must be exactly one root node in the input data, and no circular relationships.
+     *
+     * @param parentId The parent id accessor.
+     */
+    parentId(parentId: (d: Datum, i: number, data: Datum[]) => (string | null | '' | undefined)): this;
 }
 
+/**
+ * Constructs a new stratify operator with the default settings.
+ */
 export function stratify<Datum>(): StratifyOperator<Datum>;
 
 // -----------------------------------------------------------------------
@@ -67,52 +210,86 @@ export function stratify<Datum>(): StratifyOperator<Datum>;
 // -----------------------------------------------------------------------
 
 export interface HierarchyPointLink<Datum> {
+    /**
+     * The source of the link.
+     */
     source: HierarchyPointNode<Datum>;
+
+    /**
+     * The target of the link.
+     */
     target: HierarchyPointNode<Datum>;
 }
 
-export interface HierarchyPointNode<Datum> {
+export interface HierarchyPointNode<Datum> extends HierarchyNode<Datum> {
+    /**
+     * The x-coordinate of the node.
+     */
     x: number;
+
+    /**
+     * The y-coordinate of the node.
+     */
     y: number;
-    data: Datum;
-    readonly depth: number;
-    readonly height: number;
-    parent: HierarchyPointNode<Datum> | null;
-    children?: Array<HierarchyPointNode<Datum>>;
+
     /**
-     * Aggregated numeric value as calculated by sum(value) or count(),
-     * if previously invoked.
+     * Returns an array of links for this node, where each link is an object that defines source and target properties.
+     * The source of each link is the parent node, and the target is a child node.
      */
-    readonly value?: number;
-    /**
-     * Optional Node Id string set by StratifyOperator, if
-     * hierarchical data was created from tabular data using stratify()
-     */
-    readonly id?: string;
-    ancestors(): Array<HierarchyPointNode<Datum>>;
-    descendants(): Array<HierarchyPointNode<Datum>>;
-    leaves(): Array<HierarchyPointNode<Datum>>;
-    path(target: HierarchyPointNode<Datum>): Array<HierarchyPointNode<Datum>>;
     links(): Array<HierarchyPointLink<Datum>>;
-    sum(value: (d: Datum) => number): this;
-    count(): this;
-    sort(compare: (a: HierarchyPointNode<Datum>, b: HierarchyPointNode<Datum>) => number): this;
-    each(func: (node: HierarchyPointNode<Datum>) => void): this;
-    eachAfter(func: (node: HierarchyPointNode<Datum>) => void): this;
-    eachBefore(func: (node: HierarchyPointNode<Datum>) => void): this;
-    copy(): HierarchyPointNode<Datum>;
 }
 
 export interface ClusterLayout<Datum> {
+    /**
+     * Lays out the specified root hierarchy.
+     * You may want to call `root.sort` before passing the hierarchy to the cluster layout.
+     *
+     * @param root The specified root hierarchy.
+     */
     (root: HierarchyNode<Datum>): HierarchyPointNode<Datum>;
+
+    /**
+     * Returns the current layout size, which defaults to [1, 1]. A layout size of null indicates that a node size will be used instead.
+     */
     size(): [number, number] | null;
+    /**
+     * Sets this cluster layout’s size to the specified [width, height] array and returns the cluster layout.
+     * The size represent an arbitrary coordinate system; for example, to produce a radial layout,
+     * a size of [360, radius] corresponds to a breadth of 360° and a depth of radius.
+     *
+     * @param size The specified two-element size array.
+     */
     size(size: [number, number]): this;
+
+    /**
+     * Returns the current node size, which defaults to null. A node size of null indicates that a layout size will be used instead.
+     */
     nodeSize(): [number, number] | null;
+    /**
+     * Sets this cluster layout’s node size to the specified [width, height] array and returns this cluster layout.
+     * When a node size is specified, the root node is always positioned at <0, 0>.
+     *
+     * @param size The specified two-element size array.
+     */
     nodeSize(size: [number, number]): this;
+
+    /**
+     * Returns the current separation accessor, which defaults to: `(a, b) => a.parent == b.parent ? 1 : 2`.
+     */
     separation(): (a: HierarchyPointNode<Datum>, b: HierarchyPointNode<Datum>) => number;
+    /**
+     * Sets the separation accessor to the specified function and returns this cluster layout.
+     * The separation accessor is used to separate neighboring leaves.
+     *
+     * @param separation The separation function is passed two leaves a and b, and must return the desired separation.
+     * The nodes are typically siblings, though the nodes may be more distantly related if the layout decides to place such nodes adjacent.
+     */
     separation(separation: (a: HierarchyPointNode<Datum>, b: HierarchyPointNode<Datum>) => number): this;
 }
 
+/**
+ * Creates a new cluster layout with default settings.
+ */
 export function cluster<Datum>(): ClusterLayout<Datum>;
 
 // -----------------------------------------------------------------------
@@ -120,15 +297,56 @@ export function cluster<Datum>(): ClusterLayout<Datum>;
 // -----------------------------------------------------------------------
 
 export interface TreeLayout<Datum> {
+    /**
+     * Lays out the specified root hierarchy.
+     * You may want to call `root.sort` before passing the hierarchy to the tree layout.
+     *
+     * @param root The specified root hierarchy.
+     */
     (root: HierarchyNode<Datum>): HierarchyPointNode<Datum>;
+
+    /**
+     * Returns the current layout size, which defaults to [1, 1]. A layout size of null indicates that a node size will be used instead.
+     */
     size(): [number, number] | null;
+    /**
+     * Sets this tree layout’s size to the specified [width, height] array and returns the tree layout.
+     * The size represent an arbitrary coordinate system; for example, to produce a radial layout,
+     * a size of [360, radius] corresponds to a breadth of 360° and a depth of radius.
+     *
+     * @param size The specified two-element size array.
+     */
     size(size: [number, number]): this;
+
+    /**
+     * Returns the current node size, which defaults to null. A node size of null indicates that a layout size will be used instead.
+     */
     nodeSize(): [number, number] | null;
+    /**
+     * Sets this tree layout’s node size to the specified [width, height] array and returns this tree layout.
+     * When a node size is specified, the root node is always positioned at <0, 0>.
+     *
+     * @param size The specified two-element size array.
+     */
     nodeSize(size: [number, number]): this;
+
+    /**
+     * Returns the current separation accessor, which defaults to: `(a, b) => a.parent == b.parent ? 1 : 2`.
+     */
     separation(): (a: HierarchyPointNode<Datum>, b: HierarchyPointNode<Datum>) => number;
+    /**
+     * Sets the separation accessor to the specified function and returns this tree layout.
+     * The separation accessor is used to separate neighboring nodes.
+     *
+     * @param separation The separation function is passed two nodes a and b, and must return the desired separation.
+     * The nodes are typically siblings, though the nodes may be more distantly related if the layout decides to place such nodes adjacent.
+     */
     separation(separation: (a: HierarchyPointNode<Datum>, b: HierarchyPointNode<Datum>) => number): this;
 }
 
+/**
+ * Creates a new tree layout with default settings.
+ */
 export function tree<Datum>(): TreeLayout<Datum>;
 
 // -----------------------------------------------------------------------
@@ -136,91 +354,283 @@ export function tree<Datum>(): TreeLayout<Datum>;
 // -----------------------------------------------------------------------
 
 export interface HierarchyRectangularLink<Datum> {
+    /**
+     * The source of the link.
+     */
     source: HierarchyRectangularNode<Datum>;
+
+    /**
+     * The target of the link.
+     */
     target: HierarchyRectangularNode<Datum>;
 }
 
-export interface HierarchyRectangularNode<Datum> {
+export interface HierarchyRectangularNode<Datum> extends HierarchyNode<Datum> {
+    /**
+     * The left edge of the rectangle.
+     */
     x0: number;
+
+    /**
+     * The top edge of the rectangle
+     */
     y0: number;
+
+    /**
+     * The right edge of the rectangle.
+     */
     x1: number;
+
+    /**
+     * The bottom edge of the rectangle.
+     */
     y1: number;
-    data: Datum;
-    readonly depth: number;
-    readonly height: number;
-    parent: HierarchyRectangularNode<Datum> | null;
-    children?: Array<HierarchyRectangularNode<Datum>>;
+
     /**
-     * Aggregated numeric value as calculated by sum(value) or count(),
-     * if previously invoked.
+     * Returns an array of links for this node, where each link is an object that defines source and target properties.
+     * The source of each link is the parent node, and the target is a child node.
      */
-    readonly value?: number;
-    /**
-     * Optional Node Id string set by StratifyOperator, if
-     * hierarchical data was created from tabular data using stratify()
-     */
-    readonly id?: string;
-    ancestors(): Array<HierarchyRectangularNode<Datum>>;
-    descendants(): Array<HierarchyRectangularNode<Datum>>;
-    leaves(): Array<HierarchyRectangularNode<Datum>>;
-    path(target: HierarchyRectangularNode<Datum>): Array<HierarchyRectangularNode<Datum>>;
     links(): Array<HierarchyRectangularLink<Datum>>;
-    sum(value: (d: Datum) => number): this;
-    count(): this;
-    sort(compare: (a: HierarchyRectangularNode<Datum>, b: HierarchyRectangularNode<Datum>) => number): this;
-    each(func: (node: HierarchyRectangularNode<Datum>) => void): this;
-    eachAfter(func: (node: HierarchyRectangularNode<Datum>) => void): this;
-    eachBefore(func: (node: HierarchyRectangularNode<Datum>) => void): this;
-    copy(): HierarchyRectangularNode<Datum>;
 }
 
 export interface TreemapLayout<Datum> {
+    /**
+     * Lays out the specified root hierarchy.
+     * You must call `root.sum` before passing the hierarchy to the treemap layout.
+     * You probably also want to call `root.sort` to order the hierarchy before computing the layout.
+     *
+     * @param root The specified root hierarchy.
+     */
     (root: HierarchyNode<Datum>): HierarchyRectangularNode<Datum>;
+
+    /**
+     * Returns the current tiling method, which defaults to `d3.treemapSquarify` with the golden ratio.
+     */
     tile(): (node: HierarchyRectangularNode<Datum>, x0: number, y0: number, x1: number, y1: number) => void;
+    /**
+     * Sets the tiling method to the specified function and returns this treemap layout.
+     *
+     * @param tile The specified tiling function.
+     */
     tile(tile: (node: HierarchyRectangularNode<Datum>, x0: number, y0: number, x1: number, y1: number) => void): this;
+
+    /**
+     * Returns the current size, which defaults to [1, 1].
+     */
     size(): [number, number];
+    /**
+     * Sets this treemap layout’s size to the specified [width, height] array and returns this treemap layout.
+     *
+     * @param size The specified two-element size array.
+     */
     size(size: [number, number]): this;
+
+    /**
+     * Returns the current rounding state, which defaults to false.
+     */
     round(): boolean;
+    /**
+     * Enables or disables rounding according to the given boolean and returns this treemap layout.
+     *
+     * @param round The specified boolean flag.
+     */
     round(round: boolean): this;
+
+    /**
+     * Returns the current inner padding function.
+     */
     padding(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the inner and outer padding to the specified number and returns this treemap layout.
+     *
+     * @param padding The specified padding value.
+     */
     padding(padding: number): this;
+    /**
+     * Sets the inner and outer padding to the specified function and returns this treemap layout.
+     *
+     * @param padding The specified padding function.
+     */
     padding(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
+
+    /**
+     * Returns the current inner padding function, which defaults to the constant zero.
+     */
     paddingInner(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the inner padding to the specified number and returns this treemap layout.
+     * The inner padding is used to separate a node’s adjacent children.
+     *
+     * @param padding The specified inner padding value.
+     */
     paddingInner(padding: number): this;
+    /**
+     * Sets the inner padding to the specified function and returns this treemap layout.
+     * The function is invoked for each node with children, being passed the current node.
+     * The inner padding is used to separate a node’s adjacent children.
+     *
+     * @param padding The specified inner padding function.
+     */
     paddingInner(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
+
+    /**
+     * Returns the current top padding function.
+     */
     paddingOuter(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the top, right, bottom and left padding to the specified function and returns this treemap layout.
+     *
+     * @param padding The specified padding outer value.
+     */
     paddingOuter(padding: number): this;
+    /**
+     * Sets the top, right, bottom and left padding to the specified function and returns this treemap layout.
+     *
+     * @param padding The specified padding outer function.
+     */
     paddingOuter(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
+
+    /**
+     * Returns the current top padding function, which defaults to the constant zero.
+     */
     paddingTop(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the top padding to the specified number and returns this treemap layout.
+     * The top padding is used to separate the top edge of a node from its children.
+     *
+     * @param padding The specified top padding value.
+     */
     paddingTop(padding: number): this;
+    /**
+     * Sets the top padding to the specified function and returns this treemap layout.
+     * The function is invoked for each node with children, being passed the current node.
+     * The top padding is used to separate the top edge of a node from its children.
+     *
+     * @param padding The specified top padding function.
+     */
     paddingTop(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
+
+    /**
+     * Returns the current right padding function, which defaults to the constant zero.
+     */
     paddingRight(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the right padding to the specified number and returns this treemap layout.
+     * The right padding is used to separate the right edge of a node from its children.
+     *
+     * @param padding The specified right padding value.
+     */
     paddingRight(padding: number): this;
+    /**
+     * Sets the right padding to the specified function and returns this treemap layout.
+     * The function is invoked for each node with children, being passed the current node.
+     * The right padding is used to separate the right edge of a node from its children.
+     *
+     * @param padding The specified right padding function.
+     */
     paddingRight(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
+
+    /**
+     * Returns the current bottom padding function, which defaults to the constant zero.
+     */
     paddingBottom(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the bottom padding to the specified number and returns this treemap layout.
+     * The bottom padding is used to separate the bottom edge of a node from its children.
+     *
+     * @param padding The specified bottom padding value.
+     */
     paddingBottom(padding: number): this;
+    /**
+     * Sets the bottom padding to the specified function and returns this treemap layout.
+     * The function is invoked for each node with children, being passed the current node.
+     * The bottom padding is used to separate the bottom edge of a node from its children.
+     *
+     * @param padding The specified bottom padding function.
+     */
     paddingBottom(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
+
+    /**
+     * Returns the current left padding function, which defaults to the constant zero.
+     */
     paddingLeft(): (node: HierarchyRectangularNode<Datum>) => number;
+    /**
+     * Sets the left padding to the specified number and returns this treemap layout.
+     * The left padding is used to separate the left edge of a node from its children.
+     *
+     * @param padding The specified left padding value.
+     */
     paddingLeft(padding: number): this;
+    /**
+     * Sets the left padding to the specified function and returns this treemap layout.
+     * The function is invoked for each node with children, being passed the current node.
+     * The left padding is used to separate the left edge of a node from its children.
+     *
+     * @param padding The specified left padding function.
+     */
     paddingLeft(padding: (node: HierarchyRectangularNode<Datum>) => number): this;
 }
 
+/**
+ * Creates a new treemap layout with default settings.
+ */
 export function treemap<Datum>(): TreemapLayout<Datum>;
 
-// Tiling functions ---------------------------------------------------------------------------------
+// Tiling functions ------------------------------------------------------
 
+/**
+ * Recursively partitions the specified nodes into an approximately-balanced binary tree,
+ * choosing horizontal partitioning for wide rectangles and vertical partitioning for tall rectangles.
+ */
 export function treemapBinary(node: HierarchyRectangularNode<any>, x0: number, y0: number, x1: number, y1: number): void;
+
+/**
+ * Divides the rectangular area specified by x0, y0, x1, y1 horizontally according the value of each of the specified node’s children.
+ * The children are positioned in order, starting with the left edge (x0) of the given rectangle.
+ * If the sum of the children’s values is less than the specified node’s value (i.e., if the specified node has a non-zero internal value),
+ * the remaining empty space will be positioned on the right edge (x1) of the given rectangle.
+ */
 export function treemapDice(node: HierarchyRectangularNode<any>, x0: number, y0: number, x1: number, y1: number): void;
+
+/**
+ * Divides the rectangular area specified by x0, y0, x1, y1 vertically according the value of each of the specified node’s children.
+ * The children are positioned in order, starting with the top edge (y0) of the given rectangle.
+ * If the sum of the children’s values is less than the specified node’s value (i.e., if the specified node has a non-zero internal value),
+ * the remaining empty space will be positioned on the bottom edge (y1) of the given rectangle.
+ */
 export function treemapSlice(node: HierarchyRectangularNode<any>, x0: number, y0: number, x1: number, y1: number): void;
+
+/**
+ * If the specified node has odd depth, delegates to treemapSlice; otherwise delegates to treemapDice.
+ */
 export function treemapSliceDice(node: HierarchyRectangularNode<any>, x0: number, y0: number, x1: number, y1: number): void;
 
 // TODO: Test Factory code
 export interface RatioSquarifyTilingFactory {
     (node: HierarchyRectangularNode<any>, x0: number, y0: number, x1: number, y1: number): void;
+
+    /**
+     * Specifies the desired aspect ratio of the generated rectangles.
+     * Note that the orientation of the generated rectangles (tall or wide) is not implied by the ratio.
+     * Furthermore, the rectangles ratio are not guaranteed to have the exact specified aspect ratio.
+     * If not specified, the aspect ratio defaults to the golden ratio, φ = (1 + sqrt(5)) / 2, per Kong et al.
+     *
+     * @param ratio The specified ratio value greater than or equal to one.
+     */
     ratio(ratio: number): RatioSquarifyTilingFactory;
 }
 
+/**
+ * Implements the squarified treemap algorithm by Bruls et al., which seeks to produce rectangles of a given aspect ratio.
+ */
 export const treemapSquarify: RatioSquarifyTilingFactory;
+
+/**
+ * Like `d3.treemapSquarify`, except preserves the topology (node adjacencies) of the previous layout computed by `d3.treemapResquarify`,
+ * if there is one and it used the same target aspect ratio. This tiling method is good for animating changes to treemaps because
+ * it only changes node sizes and not their relative positions, thus avoiding distracting shuffling and occlusion.
+ * The downside of a stable update, however, is a suboptimal layout for subsequent updates: only the first layout uses the Bruls et al. squarified algorithm.
+ */
 export const treemapResquarify: RatioSquarifyTilingFactory;
 
 // -----------------------------------------------------------------------
@@ -228,15 +638,53 @@ export const treemapResquarify: RatioSquarifyTilingFactory;
 // -----------------------------------------------------------------------
 
 export interface PartitionLayout<Datum> {
+    /**
+     * Lays out the specified root hierarchy.
+     * You must call `root.sum` before passing the hierarchy to the partition layout.
+     * You probably also want to call `root.sort` to order the hierarchy before computing the layout.
+     *
+     * @param root The specified root hierarchy.
+     */
     (root: HierarchyNode<Datum>): HierarchyRectangularNode<Datum>;
+
+    /**
+     * Returns the current size, which defaults to [1, 1].
+     */
     size(): [number, number];
+    /**
+     * Sets this partition layout’s size to the specified [width, height] array and returns this partition layout.
+     *
+     * @param size The specified two-element size array.
+     */
     size(size: [number, number]): this;
+
+    /**
+     * Returns the current rounding state, which defaults to false.
+     */
     round(): boolean;
+    /**
+     * Enables or disables rounding according to the given boolean and returns this partition layout.
+     *
+     * @param round The specified boolean flag.
+     */
     round(round: boolean): this;
+
+    /**
+     * Returns the current padding, which defaults to zero.
+     */
     padding(): number;
+    /**
+     * Sets the padding to the specified number and returns this partition layout.
+     * The padding is used to separate a node’s adjacent children.
+     *
+     * @param padding The specified padding value.
+     */
     padding(padding: number): this;
 }
 
+/**
+ * Creates a new partition layout with the default settings.
+ */
 export function partition<Datum>(): PartitionLayout<Datum>;
 
 // -----------------------------------------------------------------------
@@ -244,54 +692,110 @@ export function partition<Datum>(): PartitionLayout<Datum>;
 // -----------------------------------------------------------------------
 
 export interface HierarchyCircularLink<Datum> {
+    /**
+     * The source of the link.
+     */
     source: HierarchyCircularNode<Datum>;
+
+    /**
+     * The target of the link.
+     */
     target: HierarchyCircularNode<Datum>;
 }
 
-export interface HierarchyCircularNode<Datum> {
+export interface HierarchyCircularNode<Datum> extends HierarchyNode<Datum> {
+    /**
+     * The x-coordinate of the circle’s center.
+     */
     x: number;
+
+    /**
+     * The y-coordinate of the circle’s center.
+     */
     y: number;
+
+    /**
+     * The radius of the circle.
+     */
     r: number;
-    data: Datum;
-    readonly depth: number;
-    readonly height: number;
-    parent: HierarchyCircularNode<Datum> | null;
-    children?: Array<HierarchyCircularNode<Datum>>;
+
     /**
-     * Aggregated numeric value as calculated by sum(value) or count(),
-     * if previously invoked.
+     * Returns an array of links for this node, where each link is an object that defines source and target properties.
+     * The source of each link is the parent node, and the target is a child node.
      */
-    readonly value?: number;
-    /**
-     * Optional Node Id string set by StratifyOperator, if
-     * hierarchical data was created from tabular data using stratify()
-     */
-    readonly id?: string;
-    ancestors(): Array<HierarchyCircularNode<Datum>>;
-    descendants(): Array<HierarchyCircularNode<Datum>>;
-    leaves(): Array<HierarchyCircularNode<Datum>>;
-    path(target: HierarchyCircularNode<Datum>): Array<HierarchyCircularNode<Datum>>;
     links(): Array<HierarchyCircularLink<Datum>>;
-    sum(value: (d: Datum) => number): this;
-    count(): this;
-    sort(compare: (a: HierarchyCircularNode<Datum>, b: HierarchyCircularNode<Datum>) => number): this;
-    each(func: (node: HierarchyCircularNode<Datum>) => void): this;
-    eachAfter(func: (node: HierarchyCircularNode<Datum>) => void): this;
-    eachBefore(func: (node: HierarchyCircularNode<Datum>) => void): this;
-    copy(): HierarchyCircularNode<Datum>;
 }
 
 export interface PackLayout<Datum> {
+    /**
+     * Lays out the specified root hierarchy.
+     * You must call `root.sum` before passing the hierarchy to the pack layout.
+     * You probably also want to call `root.sort` to order the hierarchy before computing the layout.
+     *
+     * @param root The specified root hierarchy.
+     */
     (root: HierarchyNode<Datum>): HierarchyCircularNode<Datum>;
+
+    /**
+     * Returns the current radius accessor, which defaults to null.
+     */
     radius(): null | ((node: HierarchyCircularNode<Datum>) => number);
-    radius(radius: (node: HierarchyCircularNode<Datum>) => number): this;
+    /**
+     * Sets the pack layout’s radius accessor to the specified function and returns this pack layout.
+     * If the radius accessor is null, the radius of each leaf circle is derived from the leaf `node.value` (computed by `node.sum`);
+     * the radii are then scaled proportionally to fit the layout size.
+     * If the radius accessor is not null, the radius of each leaf circle is specified exactly by the function.
+     *
+     * @param radius The specified radius accessor.
+     */
+    radius(radius: null | ((node: HierarchyCircularNode<Datum>) => number)): this;
+
+    /**
+     * Returns the current size, which defaults to [1, 1].
+     */
     size(): [number, number];
+    /**
+     * Sets this pack layout’s size to the specified [width, height] array and returns this pack layout.
+     *
+     * @param size The specified two-element size array.
+     */
     size(size: [number, number]): this;
+
+    /**
+     * Returns the current padding accessor, which defaults to the constant zero.
+     */
     padding(): (node: HierarchyCircularNode<Datum>) => number;
+    /**
+     * Sets this pack layout’s padding accessor to the specified number and returns this pack layout.
+     * Returns the current padding accessor, which defaults to the constant zero.
+     *
+     * When siblings are packed, tangent siblings will be separated by approximately the specified padding;
+     * the enclosing parent circle will also be separated from its children by approximately the specified padding.
+     * If an explicit radius is not specified, the padding is approximate because a two-pass algorithm
+     * is needed to fit within the layout size: the circles are first packed without padding;
+     * a scaling factor is computed and applied to the specified padding; and lastly the circles are re-packed with padding.
+     *
+     * @param padding The specified padding value.
+     */
     padding(padding: number): this;
+    /**
+     * Sets this pack layout’s padding accessor to the specified function and returns this pack layout.
+     * Returns the current padding accessor, which defaults to the constant zero.
+     *
+     * When siblings are packed, tangent siblings will be separated by approximately the specified padding;
+     * the enclosing parent circle will also be separated from its children by approximately the specified padding.
+     * If an explicit radius is not specified, the padding is approximate because a two-pass algorithm
+     * is needed to fit within the layout size: the circles are first packed without padding;
+     * a scaling factor is computed and applied to the specified padding; and lastly the circles are re-packed with padding.
+     *
+     * @param padding The specified padding function.
+     */
     padding(padding: (node: HierarchyCircularNode<Datum>) => number): this;
 }
 
+/**
+ * Creates a new pack layout with the default settings.
+ */
 export function pack<Datum>(): PackLayout<Datum>;
 
 // -----------------------------------------------------------------------
@@ -299,8 +803,19 @@ export function pack<Datum>(): PackLayout<Datum>;
 // -----------------------------------------------------------------------
 
 export interface PackCircle {
+    /**
+     * The radius of the circle.
+     */
     r: number;
+
+    /**
+     * The x-coordinate of the circle’s center.
+     */
     x?: number;
+
+    /**
+     * The y-coordinate of the circle’s center.
+     */
     y?: number;
 }
 
@@ -309,6 +824,19 @@ export interface PackCircle {
 // For invocation of packEnclose the x and y coordinates are mandatory. It seems easier to just comment
 // on the mandatory nature, then to create separate interfaces and having to deal with recasting.
 
+/**
+ * Packs the specified array of circles, each of which must have a `circle.r` property specifying the circle’s radius.
+ * The circles are positioned according to the front-chain packing algorithm by Wang et al.
+ *
+ * @param circles The specified array of circles to pack.
+ */
 export function packSiblings<Datum extends PackCircle>(circles: Datum[]): Datum[];
 
+/**
+ * Computes the smallest circle that encloses the specified array of circles, each of which must have
+ * a `circle.r` property specifying the circle’s radius, and `circle.x` and `circle.y` properties specifying the circle’s center.
+ * The enclosing circle is computed using the Matoušek-Sharir-Welzl algorithm. (See also Apollonius’ Problem.)
+ *
+ * @param circles The specified array of circles to pack.
+ */
 export function packEnclose<Datum extends PackCircle>(circles: Datum[]): { r: number, x: number, y: number };
diff --git a/types/d3-hierarchy/tsconfig.json b/types/d3-hierarchy/tsconfig.json
index 7fbc1fb5df..da64c5832c 100644
--- a/types/d3-hierarchy/tsconfig.json
+++ b/types/d3-hierarchy/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/d3-quadtree/d3-quadtree-tests.ts b/types/d3-quadtree/d3-quadtree-tests.ts
index eda00fe130..8180bc0f44 100644
--- a/types/d3-quadtree/d3-quadtree-tests.ts
+++ b/types/d3-quadtree/d3-quadtree-tests.ts
@@ -13,19 +13,21 @@ import * as d3Quadtree from 'd3-quadtree';
 // ---------------------------------------------------------------------------
 
 // custom type guard
-function isLeaf(a: any): a is d3Quadtree.QuadtreeLeaf<any> {
-    return a.data !== undefined;
+function isLeaf<T>(a: d3Quadtree.QuadtreeInternalNode<T> | d3Quadtree.QuadtreeLeaf<T>): a is d3Quadtree.QuadtreeLeaf<T> {
+    return a.length === undefined;
 }
 
 let num: number;
-let extent: [[number, number], [number, number]];
+let num4: 4;
+let undef: undefined;
+let extent: [[number, number], [number, number]] | undefined;
 
 interface TestDatum {
     x: number;
     y: number;
 }
 
-let testDatum: TestDatum;
+let testDatum: TestDatum | undefined;
 
 let testData: TestDatum[] = [
     { x: 10, y: 20 },
@@ -83,7 +85,6 @@ quadtree = d3Quadtree.quadtree<TestDatum>(testData); // explicitly typed to Test
 
 // test without data
 quadtree = d3Quadtree.quadtree<TestDatum>();
-// quadtree = d3Quadtree.quadtree(); fails, wrong underlying data type
 
 // Configure Quadtree ========================================================
 
@@ -111,12 +112,14 @@ quadtree = quadtree.cover(50, 90);
 // add(...) ------------------------------------------------------------------
 
 quadtree = quadtree.add({ x: 35, y: 35 });
-// quadtree = quadtree.add({x: 35}); // fails, incompatible data type
+// $ExpectError
+quadtree = quadtree.add({x: 35}); // fails, incompatible data type
 
 // addAll(...) ---------------------------------------------------------------
 
 quadtree = quadtree.addAll(testData);
-// quadtree = quadtree.addAll([{x: 35}, {x: 55, y: 13}]); // fails, incompatible data type
+// $ExpectError
+quadtree = quadtree.addAll([{x: 35}, {x: 55, y: 13}]); // fails, incompatible data type
 
 // remove(...) ---------------------------------------------------------------
 
@@ -191,9 +194,10 @@ quadtree = quadtree.visit((node, x0, y0, x1, y1) => {
     }
 });
 
-// quadtree = quadtree.visit(function (node, x0, y0, x1, y1) {
-//     return 10; // fails wrong return type
-// });
+// $ExpectError
+quadtree = quadtree.visit((node, x0, y0, x1, y1) => {
+    return 10; // fails wrong return type
+});
 
 // visitAfter() ---------------------------------------------------------------
 
@@ -232,3 +236,15 @@ quadNode = internalNode[0];
 quadNode = internalNode[1];
 quadNode = internalNode[2];
 quadNode = internalNode[3];
+
+num = internalNode.length;
+num4 = internalNode.length;
+
+quadtree = quadtree.visit((node, x0, y0, x1, y1) => {
+    if (isLeaf(node)) {
+        undef = node.length;
+    } else {
+        num = node.length;
+        num4 = node.length;
+    }
+});
diff --git a/types/d3-quadtree/index.d.ts b/types/d3-quadtree/index.d.ts
index 8128c9e306..8e66ba411c 100644
--- a/types/d3-quadtree/index.d.ts
+++ b/types/d3-quadtree/index.d.ts
@@ -1,17 +1,34 @@
 // Type definitions for D3JS d3-quadtree module 1.0
 // Project: https://github.com/d3/d3-quadtree/
-// Definitions by: Tom Wanzek <https://github.com/tomwanzek>, Alex Ford <https://github.com/gustavderdrache>, Boris Yankov <https://github.com/borisyankov>
+// Definitions by: Tom Wanzek <https://github.com/tomwanzek>
+//                 Alex Ford <https://github.com/gustavderdrache>
+//                 Boris Yankov <https://github.com/borisyankov>
+//                 denisname <https://github.com/denisname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-// Last module patch version validated against: 1.0.1
+// Last module patch version validated against: 1.0.3
 
 /**
  * Leaf node of the quadtree.
  */
 export interface QuadtreeLeaf<T> {
+    /**
+     * The data associated with this point, as passed to quadtree.add.
+     */
     data: T;
+
+    /**
+     * The next datum in this leaf, if any.
+     */
     next?: QuadtreeLeaf<T>;
+
+    /**
+     * The length property may be used to distinguish leaf nodes from internal nodes: it is undefined for leaf nodes, and 4 for internal nodes.
+     */
+    length?: undefined;
 }
+
 /**
  * Internal nodes of the quadtree are represented as four-element arrays in left-to-right, top-to-bottom order:
  *
@@ -22,32 +39,170 @@ export interface QuadtreeLeaf<T> {
  *
  * A child quadrant may be undefined if it is empty.
  */
-export interface QuadtreeInternalNode<T> extends Array<QuadtreeInternalNode<T> | QuadtreeLeaf<T> | undefined> { }
+export interface QuadtreeInternalNode<T> extends Array<QuadtreeInternalNode<T> | QuadtreeLeaf<T> | undefined> {
+    /**
+     * The length property may be used to distinguish leaf nodes from internal nodes: it is undefined for leaf nodes, and 4 for internal nodes.
+     */
+    length: 4;
+}
 
 export interface Quadtree<T> {
+    /**
+     * Returns the current x-accessor, which defaults to: `x(d) => d[0]`.
+     */
     x(): (d: T) => number;
+    /**
+     * Sets the current x-coordinate accessor and returns the quadtree.
+     * The x-accessors must be consistent, returning the same value given the same input.
+     *
+     * @param x The x-coordinate accessor.
+     */
     x(x: (d: T) => number): this;
+
+    /**
+     * Returns the current y-accessor, which defaults to: `y(d) => d[1]`.
+     */
     y(): (d: T) => number;
+    /**
+     * Sets the current y-coordinate accessor and returns the quadtree.
+     * The y-accessors must be consistent, returning the same value given the same input.
+     *
+     * @param y The y-coordinate accessor.
+     */
     y(y: (d: T) => number): this;
+
+    /**
+     * Returns the quadtree's current extent `[[x0, y0], [x1, y1]]`,
+     * where `x0` and `y0` are the inclusive lower bounds and `x1` and `y1` are the inclusive upper bounds,
+     * or `undefined` if the quadtree has no extent.
+     */
     extent(): [[number, number], [number, number]] | undefined;
+    /**
+     * Expands the quadtree to cover the specified points `[[x0, y0], [x1, y1]]` and returns the quadtree.
+     * The extent may also be expanded by calling `quadtree.cover` or `quadtree.add`.
+     *
+     * @param extend The specified points to cover.
+     */
     extent(extend: [[number, number], [number, number]]): this;
+
+    /**
+     * Expands the quadtree to cover the specified point ⟨x,y⟩, and returns the quadtree.
+     * * If the quadtree’s extent already covers the specified point, this method does nothing.
+     * * If the quadtree has an extent, the extent is repeatedly doubled to cover the specified point, wrapping the root node as necessary.
+     * * If the quadtree is empty, the extent is initialized to the extent `[[⌊x⌋, ⌊y⌋], [⌈x⌉, ⌈y⌉]]`.
+     * Rounding is necessary such that if the extent is later doubled, the boundaries of existing quadrants do not change due to floating point error.
+     *
+     * @param x The x-coordinate for the specified point to cover.
+     * @param y The y-coordinate for the specified point to cover.
+     */
     cover(x: number, y: number): this;
+
+    /**
+     * Adds the specified datum to the quadtree, deriving its coordinates ⟨x,y⟩ using the current x- and y-accessors, and returns the quadtree.
+     * If the new point is outside the current extent of the quadtree, the quadtree is automatically expanded to cover the new point.
+     *
+     * @param datum The specified datum to add.
+     */
     add(datum: T): this;
+
+    /**
+     * Adds the specified array of data to the quadtree, deriving each element’s coordinates ⟨x,y⟩ using the current x- and y-accessors, and return this quadtree.
+     * This is approximately equivalent to calling quadtree.add repeatedly.
+     * However, this method results in a more compact quadtree because the extent of the data is computed first before adding the data.
+     *
+     * @param data The specified array of data to add.
+     */
     addAll(data: T[]): this;
+
+    /**
+     * Removes the specified datum to the quadtree, deriving its coordinates ⟨x,y⟩ using the current x- and y-accessors, and returns the quadtree.
+     * If the specified datum does not exist in this quadtree, this method does nothing.
+     *
+     * @param datum The specified datum to remove.
+     */
     remove(datum: T): this;
+
+    /**
+     * Removes the specified data to the quadtree, deriving their coordinates ⟨x,y⟩ using the current x- and y-accessors, and returns the quadtree.
+     * If a specified datum does not exist in this quadtree, it is ignored.
+     *
+     * @param data The specified array of data to remove.
+     */
     removeAll(data: T[]): this;
+
+    /**
+     * Returns a copy of the quadtree. All nodes in the returned quadtree are identical copies of the corresponding node in the quadtree;
+     * however, any data in the quadtree is shared by reference and not copied.
+     */
     copy(): Quadtree<T>;
+
+    /**
+     * Returns the root node of the quadtree.
+     */
     root(): QuadtreeInternalNode<T> | QuadtreeLeaf<T>;
+
+    /**
+     * Returns an array of all data in the quadtree.
+     */
     data(): T[];
+
+    /**
+     * Returns the total number of data in the quadtree.
+     */
     size(): number;
+
+    /**
+     * Returns the datum closest to the position ⟨x,y⟩ with the given search radius. If radius is not specified, it defaults to infinity.
+     * If there is no datum within the search area, returns undefined.
+     *
+     * @param x The x-coordinate for the search position.
+     * @param y The y-coordinate for the search position.
+     * @param radius The optional search radius.
+     */
     find(x: number, y: number, radius?: number): T | undefined;
-    // TODO: Review below, when validating to strictNullChecks.
-    // tslint:disable-next-line:void-return
-    visit(callback: (node: QuadtreeInternalNode<T> | QuadtreeLeaf<T>, x0: number, y0: number, x1: number, y1: number) => (void | boolean)): this;
+
+    /**
+     * Visits each node in the quadtree in pre-order traversal, invoking the specified callback with arguments `node`, `x0`, `y0`, `x1`, `y1` for each node,
+     * where `node` is the node being visited, ⟨x0, y0⟩ are the lower bounds of the node, and ⟨x1, y1⟩ are the upper bounds, and returns the quadtree.
+     *
+     * If the callback returns true for a given node, then the children of that node are not visited; otherwise, all child nodes are visited.
+     * This can be used to quickly visit only parts of the tree.
+     * Note, however, that child quadrants are always visited in sibling order: top-left, top-right, bottom-left, bottom-right.
+     * In cases such as search, visiting siblings in a specific order may be faster.
+     *
+     * @param callback The callback invoked for each node.
+     */
+    visit(callback: (node: QuadtreeInternalNode<T> | QuadtreeLeaf<T>, x0: number, y0: number, x1: number, y1: number) => void | boolean): this;
+
+    /**
+     * Visits each node in the quadtree in post-order traversal, invoking the specified callback with arguments `node`, `x0`, `y0`, `x1`, `y1` for each node,
+     * where `node` is the node being visited, ⟨x0, y0⟩ are the lower bounds of the node, and ⟨x1, y1⟩ are the upper bounds, and returns the quadtree.
+     *
+     * @param callback The callback invoked for each node.
+     */
     visitAfter(callback: (node: QuadtreeInternalNode<T> | QuadtreeLeaf<T>, x0: number, y0: number, x1: number, y1: number) => void): this;
 }
 
-export function quadtree(): Quadtree<[number, number]>;
-export function quadtree(data: Array<[number, number]>): Quadtree<[number, number]>;
-export function quadtree<T>(): Quadtree<T>;
-export function quadtree<T>(data: T[], x?: (d: T) => number, y?: (d: T) => number): Quadtree<T>;
+/**
+ * Creates a new, empty quadtree with an empty extent and the default x- and y-accessors.
+ *
+ * The generic refers to the data type. If omitted, the default setting assumes that,
+ * the data used with the quadtree are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
+ * When using another type, The x- and y-accessors must be specified.
+ */
+export function quadtree<T = [number, number]>(): Quadtree<T>;
+/**
+ * Creates a new quadtree with the specified array of data.
+ * If `x` and `y` are also specified, sets the x- and y- accessors to the specified functions before adding the specified array of data to the quadtree, otherwise use the default x- and y-accessors.
+ *
+ * The generic refers to the data type. If omitted, the default setting assumes that,
+ * the data used with the quadtree are two-element arrays.
+ * The first element corresponds to the x-dimension, the second to the y-dimension.
+ * When using another type, The x- and y-accessors must be specified.
+ *
+ * @param data The specified array of data to add.
+ * @param x The x-coordinate accessor.
+ * @param y The y-coordinate accessor.
+ */
+export function quadtree<T = [number, number]>(data: T[], x?: (d: T) => number, y?: (d: T) => number): Quadtree<T>;
diff --git a/types/d3-quadtree/tsconfig.json b/types/d3-quadtree/tsconfig.json
index cbbb70a658..0f4239c3a6 100644
--- a/types/d3-quadtree/tsconfig.json
+++ b/types/d3-quadtree/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/d3-selection/d3-selection-tests.ts b/types/d3-selection/d3-selection-tests.ts
index 54ddb5ea11..b99c81e39a 100644
--- a/types/d3-selection/d3-selection-tests.ts
+++ b/types/d3-selection/d3-selection-tests.ts
@@ -796,7 +796,7 @@ newDiv2 = body.append(function(d, i, g) {
     const index: number = i;
     const group: HTMLBodyElement[] | d3Selection.ArrayLike<HTMLBodyElement> = g;
     console.log('Body element foo property: ', d.foo); // data of type BodyDatum
-    return this.ownerDocument.createElement('div'); // this-type HTMLBodyElement
+    return this.ownerDocument!.createElement('div'); // this-type HTMLBodyElement
 });
 
 // newDiv2 = body.append<HTMLDivElement>(function(d) {
@@ -828,7 +828,7 @@ const typeValueFunction = function(
   i: number,
   g: HTMLBodyElement[] | d3Selection.ArrayLike<HTMLBodyElement>
 ) {
-    return this.ownerDocument.createElement('p'); // this-type HTMLParagraphElement
+    return this.ownerDocument!.createElement('p'); // this-type HTMLParagraphElement
 };
 
 const beforeValueFunction = function(
diff --git a/types/d3-selection/index.d.ts b/types/d3-selection/index.d.ts
index d1e127dfdf..d9988636fd 100644
--- a/types/d3-selection/index.d.ts
+++ b/types/d3-selection/index.d.ts
@@ -22,7 +22,7 @@ export type BaseType = Element | EnterElement | Document | Window | null;
  */
 export interface ArrayLike<T> {
     length: number;
-    item(index: number): T;
+    item(index: number): T | null;
     [index: number]: T;
 }
 
diff --git a/types/d3-shape/d3-shape-tests.ts b/types/d3-shape/d3-shape-tests.ts
index e668d152f8..8ad3e4809a 100644
--- a/types/d3-shape/d3-shape-tests.ts
+++ b/types/d3-shape/d3-shape-tests.ts
@@ -1184,7 +1184,7 @@ interface SymbolDatum {
 let customSymbol: d3Shape.SymbolType;
 
 customSymbol = {
-    draw(context: CanvasPathMethods, size: number): void {
+    draw(context: d3Shape.CanvasPath_D3Shape, size: number): void {
         // draw custom symbol using canvas path methods
     }
 };
diff --git a/types/d3-shape/index.d.ts b/types/d3-shape/index.d.ts
index 47e5c10feb..83222d0ff0 100644
--- a/types/d3-shape/index.d.ts
+++ b/types/d3-shape/index.d.ts
@@ -7,6 +7,27 @@
 
 import { Path } from 'd3-path';
 
+// -----------------------------------------------------------------------------------
+// Shared Types and Interfaces
+// -----------------------------------------------------------------------------------
+
+/**
+ * @deprecated
+ * This interface is used to bridge the gap between two incompatible versions of TypeScript (see [#25944](https://github.com/Microsoft/TypeScript/pull/25944)).
+ * Use `CanvasPathMethods` instead with TS <= 3.0 and `CanvasPath` with TS >= 3.1.
+ */
+export interface CanvasPath_D3Shape {
+    arc(x: number, y: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): void;
+    bezierCurveTo(cp1x: number, cp1y: number, cp2x: number, cp2y: number, x: number, y: number): void;
+    closePath(): void;
+    ellipse(x: number, y: number, radiusX: number, radiusY: number, rotation: number, startAngle: number, endAngle: number, anticlockwise?: boolean): void;
+    lineTo(x: number, y: number): void;
+    moveTo(x: number, y: number): void;
+    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+    rect(x: number, y: number, w: number, h: number): void;
+}
+
 // -----------------------------------------------------------------------------------
 // Arc Generator
 // -----------------------------------------------------------------------------------
@@ -2264,13 +2285,13 @@ export function linkRadial<This, LinkDatum, NodeDatum>(): LinkRadial<This, LinkD
  */
 export interface SymbolType {
     /**
-     * Renders this symbol type to the specified context with the specified size in square pixels. The context implements the CanvasPathMethods interface.
+     * Renders this symbol type to the specified context with the specified size in square pixels. The context implements the CanvasPath interface.
      * (Note that this is a subset of the CanvasRenderingContext2D interface!)
      *
-     * @param context A rendering context implementing CanvasPathMethods.
+     * @param context A rendering context implementing CanvasPath.
      * @param size Size of the symbol to draw.
      */
-    draw(context: CanvasPathMethods, size: number): void;
+    draw(context: CanvasPath_D3Shape, size: number): void;
 }
 
 /**
diff --git a/types/d3-transition/index.d.ts b/types/d3-transition/index.d.ts
index eb60cec49f..2f935802bb 100644
--- a/types/d3-transition/index.d.ts
+++ b/types/d3-transition/index.d.ts
@@ -561,6 +561,12 @@ export interface Transition<GElement extends BaseType, Datum, PElement extends B
     ease(easingFn: (normalizedTime: number) => number): this;
 }
 
+/**
+ * Represents the union of the Selection and Transition types for any usages that operate on both.
+ * Typically used for functions which take in either a selection or transition and set or update attributes.
+ */
+export type SelectionOrTransition<GElement extends BaseType, Datum, PElement extends BaseType, PDatum> = Selection<GElement, Datum, PElement, PDatum> | Transition<GElement, Datum, PElement, PDatum>;
+
 /**
  * Returns a new transition with the specified name. If a name is not specified, null is used.
  * The new transition is only exclusive with other transitions of the same name.
diff --git a/types/d3-zoom/d3-zoom-tests.ts b/types/d3-zoom/d3-zoom-tests.ts
index 8051898b8b..819f344422 100644
--- a/types/d3-zoom/d3-zoom-tests.ts
+++ b/types/d3-zoom/d3-zoom-tests.ts
@@ -166,7 +166,7 @@ svgZoom = svgZoom.touchable(true);
 svgZoom = svgZoom.touchable(function(d, i, group) {
     const that: SVGRectElement = this;
     const datum: SVGDatum = d;
-    const g: SVGRectElement[] | NodeListOf<SVGRectElement> = group;
+    const g: SVGRectElement[] | ArrayLike<SVGRectElement> = group;
     return "ontouchstart" in this && datum.height > 0;
 });
 
diff --git a/types/dat.gui/index.d.ts b/types/dat.gui/index.d.ts
index 967b5ae13b..5c20fd51fe 100644
--- a/types/dat.gui/index.d.ts
+++ b/types/dat.gui/index.d.ts
@@ -51,8 +51,7 @@ export class GUI {
     __folders: GUI[];
     domElement: HTMLElement;
 
-    add(target: Object, propName:string): GUIController;
-    add(target: Object, propName:string, min: number, max: number): GUIController;
+    add(target: Object, propName:string, min?: number, max?: number, step?: number): GUIController;
     add(target: Object, propName:string, status: boolean): GUIController;
     add(target: Object, propName:string, items:string[]): GUIController;
     add(target: Object, propName:string, items:number[]): GUIController;
@@ -64,6 +63,7 @@ export class GUI {
     destroy(): void;
 
     addFolder(propName:string): GUI;
+    removeFolder(subFolder:GUI):void;
 
     open(): void;
     close(): void;
diff --git a/types/datatables.net-scroller/datatables.net-scroller-tests.ts b/types/datatables.net-scroller/datatables.net-scroller-tests.ts
new file mode 100644
index 0000000000..cb93306ba0
--- /dev/null
+++ b/types/datatables.net-scroller/datatables.net-scroller-tests.ts
@@ -0,0 +1,13 @@
+$(document).ready(() => {
+    const config: DataTables.Settings = {
+        // Scroller extension options
+        scroller: {
+            trace: true,
+            rowHeight: 30,
+            serverWait: 1000,
+            displayBuffer: 10,
+            boundaryScale: 0.6,
+            loadingIndicator: true
+        }
+    };
+});
diff --git a/types/datatables.net-scroller/index.d.ts b/types/datatables.net-scroller/index.d.ts
new file mode 100644
index 0000000000..fe97507712
--- /dev/null
+++ b/types/datatables.net-scroller/index.d.ts
@@ -0,0 +1,106 @@
+// Type definitions for datatables.net-scroller 1.4
+// Project: https://datatables.net
+// Definitions by: Konstantin Rohde <https://github.com/RohdeK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="jquery" />
+/// <reference types="datatables.net"/>
+
+declare namespace DataTables {
+    interface Settings {
+        /*
+         * Select extension options
+         */
+        scroller?: boolean | ScrollerSettings;
+    }
+
+    interface ScrollerSettings {
+        /*
+         * Indicate if Scroller show show trace information on the console or not.
+         */
+        trace?: boolean;
+
+        /*
+        * Scroller will attempt to automatically calculate the height of rows for it's internal
+        * calculations. However the height that is used can be overridden using this parameter.
+         */
+        rowHeight?: number | string;
+
+        /*
+        * When using server-side processing, Scroller will wait a small amount of time to allow
+        * the scrolling to finish before requesting more data from the server.
+         */
+        serverWait?: number;
+
+        /*
+        * The display buffer is what Scroller uses to calculate how many rows it should pre-fetch
+        * for scrolling.
+         */
+        displayBuffer?: number;
+
+        /*
+        * Scroller uses the boundary scaling factor to decide when to redraw the table - which it
+        * typically does before you reach the end of the currently loaded data set (in order to
+        * allow the data to look continuous to a user scrolling through the data).
+         */
+        boundaryScale?: number;
+
+        /*
+        * Show (or not) the loading element in the background of the table. Note that you should
+        * include the dataTables.scroller.css file for this to be displayed correctly.
+         */
+        loadingIndicator?: boolean;
+    }
+
+    interface Api {
+        scroller: ScrollerMethodsModel;
+    }
+
+    interface ScrollerMethodsModel {
+        /*
+        * Calculate and store information about how many rows are to be displayed
+        * in the scrolling viewport, based on current dimensions in the browser's
+        * rendering.
+        */
+        measure(redraw?: boolean): Api;
+        /*
+        * Get information about current displayed record range.
+        */
+        page(): PageInfo;
+        /*
+        * Get Scroller Api
+        */
+        scroller(): ScrollerMethods;
+    }
+
+    interface ScrollerMethods extends Api {
+        /*
+        * Calculate the pixel position from the top of the scrolling container for
+        * a given row
+        */
+        rowToPixels(rowIdx: number, intParse?: boolean, virtual?: boolean): number;
+        /*
+        * Calculate the row number that will be found at the given pixel position
+        * (y-scroll).
+        */
+        pixelsToRow(pixels: number, intParse?: boolean, virtual?: boolean): number;
+        scrollToRow(rowIdx: number, animate?: boolean): Api;
+    }
+
+    /*
+    * start: {int}, // the 0-indexed record at the top of the viewport
+    * end:   {int}, // the 0-indexed record at the bottom of the viewport
+    */
+    interface PageInfo {
+        start: number;
+        end: number;
+    }
+
+    interface RowMethods {
+        /**
+         * Scroll to a row
+         */
+        scrollTo(animate?: boolean): Api;
+    }
+}
diff --git a/types/react-dnd-html5-backend/tsconfig.json b/types/datatables.net-scroller/tsconfig.json
similarity index 84%
rename from types/react-dnd-html5-backend/tsconfig.json
rename to types/datatables.net-scroller/tsconfig.json
index dca11ac9e1..29e1854557 100644
--- a/types/react-dnd-html5-backend/tsconfig.json
+++ b/types/datatables.net-scroller/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-dnd-html5-backend-tests.ts"
+        "datatables.net-scroller-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/datatables.net-scroller/tslint.json b/types/datatables.net-scroller/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/datatables.net-scroller/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/datatables.net/datatables.net-tests.ts b/types/datatables.net/datatables.net-tests.ts
index 423dcaf4c9..de739a673a 100644
--- a/types/datatables.net/datatables.net-tests.ts
+++ b/types/datatables.net/datatables.net-tests.ts
@@ -1002,6 +1002,9 @@ 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 isDataTable_3: boolean = $.fn.dataTable.isDataTable(dt.row("selector").node());
+const isDataTable_2: boolean = $.fn.dataTable.isDataTable($("selector"));
+const isDataTable_4: boolean = $.fn.dataTable.isDataTable($("selector").dataTable().api());
 const escapeRegex: string = $.fn.dataTable.util.escapeRegex("");
 
 const throttle_1 = $.fn.dataTable.util.throttle((data) => {
@@ -1070,3 +1073,92 @@ const util_1: boolean = dt.any();
 const util_2: number = dt.count();
 
 //#endregion "Methods-Util"
+
+//#region "ExtSettings"
+
+const ext_classes_settings: DataTables.ExtClassesSettings = {
+};
+const ext_classes_settings_full: DataTables.ExtClassesSettings = {
+    sFilter: "",
+    sFilterInput: "",
+    sFooterTH: "",
+    sHeaderTH: "",
+    sInfo: "",
+    sJUIFooter: "",
+    sJUIHeader: "",
+    sLength: "",
+    sLengthSelect: "",
+    sNoFooter: "",
+    sPageButton: "",
+    sPageButtonActive: "",
+    sPageButtonDisabled: "",
+    sPaging: "",
+    sProcessing: "",
+    sRowEmpty: "",
+    sScrollBody: "",
+    sScrollFoot: "",
+    sScrollFootInner: "",
+    sScrollHead: "",
+    sScrollHeadInner: "",
+    sScrollWrapper: "",
+    sSortable: "",
+    sSortableAsc: "",
+    sSortableDesc: "",
+    sSortableNone: "",
+    sSortAsc: "",
+    sSortColumn: "",
+    sSortDesc: "",
+    sSortIcon: "",
+    sSortJUI: "",
+    sSortJUIAsc: "",
+    sSortJUIAscAllowed: "",
+    sSortJUIDesc: "",
+    sSortJUIDescAllowed: "",
+    sSortJUIWrapper: "",
+    sStripeEven: "",
+    sStripeOdd: "",
+    sTable: "",
+    sWrapper: ""
+};
+
+const ext_type_settings: DataTables.ExtTypeSettings = {
+    detect: [],
+    search: {},
+    order: {}
+};
+ext_type_settings.detect.push((d: string, s: DataTables.Settings) => {
+    return null;
+});
+ext_type_settings.detect.push((d: string, s: DataTables.Settings) => {
+    return "";
+});
+
+const ext_settings: DataTables.ExtSettings = {
+    aTypes: [],
+    afnFiltering: [],
+    afnSortData: {},
+    aoFeatures: [],
+    builder: "",
+    classes: ext_classes_settings,
+    errMode: "",
+    feature: [],
+    fnVersionCheck: (version: string) => "",
+    iApiIndex: 0,
+    internal: {},
+    legacy: {},
+    oApi: {},
+    oJUIClasses: {},
+    oPagination: {},
+    oSort: {},
+    oStdClasses: ext_classes_settings,
+    ofnSearch: {},
+    order: {},
+    pager: {},
+    renderer: {},
+    sVersion: "",
+    search: [],
+    selector: {},
+    type: ext_type_settings
+};
+
+ //#endregion "ExtSettings"
diff --git a/types/datatables.net/index.d.ts b/types/datatables.net/index.d.ts
index a8f63a999e..ed87028502 100644
--- a/types/datatables.net/index.d.ts
+++ b/types/datatables.net/index.d.ts
@@ -1094,13 +1094,13 @@ declare namespace DataTables {
         (): JQueryDataTables;
 
         /**
-         * Check is a table node is a DataTable or not
+         * Check if a table node is a DataTable already or not.
          *
          * Usage:
          * $.fn.dataTable.isDataTable("selector");
-         * @param table Selector string for table
+         * @param table The table to check.
          */
-        isDataTable(table: string): boolean;
+        isDataTable(table: string | Node | JQuery | Api): boolean;
 
         /**
          * Helpers for `columns.render`.
@@ -2026,7 +2026,10 @@ declare namespace DataTables {
         sVersion: string;
         search: any[];
         selector: object;
-        type: object;
+        /**
+         * Type based plug-ins.
+         */
+        type: ExtTypeSettings;
     }
 
     interface ExtClassesSettings {
@@ -2208,4 +2211,36 @@ declare namespace DataTables {
         sJUIFooter?: string;
     }
     //#endregion "ext internal"
+
+    interface ExtTypeSettings {
+        /**
+         * Type detection functions for plug-in development.
+         *
+         * @see https://datatables.net/manual/plug-ins/type-detection
+         */
+        detect: FunctionExtTypeSettingsDetect[];
+        /**
+         * Type based ordering functions for plug-in development.
+         *
+         * @see https://datatables.net/manual/plug-ins/sorting
+         * @default {}
+         */
+        order: object;
+        /**
+         * Type based search formatting for plug-in development.
+         *
+         * @default {}
+         * @example
+         *   $.fn.dataTable.ext.type.search['title-numeric'] = function ( d ) {
+         *     return d.replace(/\n/g," ").replace( /<.*?>/g, "" );
+         *   }
+         */
+        search: object;
+    }
+
+    /**
+     * @param data Data from the column cell to be analysed.
+     * @param DataTables settings object.
+     */
+    type FunctionExtTypeSettingsDetect = (data: any, settings: Settings) => (string | null);
 }
diff --git a/types/dav/dav-tests.ts b/types/dav/dav-tests.ts
new file mode 100644
index 0000000000..b4218494cd
--- /dev/null
+++ b/types/dav/dav-tests.ts
@@ -0,0 +1,250 @@
+import * as dav from "dav";
+
+(() => {
+    const xhr = new dav.transport.Basic(
+        new dav.Credentials({
+            username: 'xxx',
+            password: 'xxx'
+        })
+    );
+
+    dav.createAccount({ server: 'http://dav.example.com', xhr })
+        .then((account) => {
+            account.calendars.forEach(() => {
+            });
+        });
+    const client = new dav.Client(xhr);
+
+    client.createAccount({
+        server: 'http://dav.example.com',
+        accountType: 'carddav'
+    }).then((account) => {
+        account.addressBooks.forEach(() => {
+        });
+    });
+})();
+
+(() => {
+    const client = new dav.Client(
+        new dav.transport.Basic(
+            new dav.Credentials({
+                username: 'xxx',
+                password: 'xxx'
+            })
+        ),
+        {
+            baseUrl: 'https://mail.mozilla.com'
+        }
+    );
+
+    const req = dav.request.basic({
+        method: 'PUT',
+        data: 'BEGIN:VCALENDAR\nEND:VCALENDAR',
+        etag: '12345'
+    });
+
+    client.send(req, '/calendars/123.ics')
+        .then(() => { });
+})();
+
+(() => {
+    const xhr = new dav.transport.Basic(
+        new dav.Credentials({
+            username: 'xxx',
+            password: 'xxx'
+        })
+    );
+
+    const req = dav.request.basic({
+        method: 'PUT',
+        data: 'BEGIN:VCALENDAR\nEND:VCALENDAR',
+        etag: '12345'
+    });
+
+    xhr.send(req, 'https://mail.mozilla.com/calendars/123.ics')
+        .then(() => {
+        });
+})();
+
+dav.debug.enabled = true;
+
+(() => {
+    const xhr = new dav.transport.Basic(
+        new dav.Credentials({
+            username: 'Killer BOB',
+            password: 'blacklodge'
+        })
+    );
+
+    const client = new dav.Client(xhr, { baseUrl: 'https://mail.mozilla.com' });
+
+    const url = 'https://mail.mozilla.com/';
+    const req = dav.request.basic({
+        method: 'PUT',
+        data: 'BEGIN:VCALENDAR\nEND:VCALENDAR',
+        etag: 'abc123'
+    });
+
+    const sandbox = dav.createSandbox();
+    client.send(req, url, { sandbox });
+    xhr.send(req, url, { sandbox });
+
+    client.createAccount({ sandbox: {}, server: 'http://dav.example.com' });
+    dav.createAccount({
+        sandbox: {},
+        server: 'http://dav.example.com',
+        xhr
+    });
+
+    let calendar = new dav.Calendar();
+    client.createCalendarObject(calendar, {
+        data: 'BEGIN:VCALENDAR\nEND:VCALENDAR',
+        filename: 'test.ics'
+    });
+    dav.createCalendarObject(
+        calendar,
+        {
+            data: 'BEGIN:VCALENDAR\nEND:VCALENDAR',
+            filename: 'test.ics',
+            xhr
+        });
+
+    let object = new dav.CalendarObject();
+    client.updateCalendarObject(object);
+    dav.updateCalendarObject(
+        object,
+        {
+            xhr
+        }
+    );
+
+    object = new dav.CalendarObject();
+    client.deleteCalendarObject(object);
+    dav.deleteCalendarObject(
+        object,
+        {
+            xhr
+        }
+    );
+
+    calendar = new dav.Calendar();
+    client.syncCalendar(calendar, { syncMethod: 'webdav' });
+    dav.syncCalendar(
+        calendar,
+        {
+            syncMethod: 'webdav',
+            xhr
+        }
+    );
+
+    let account = new dav.Account();
+    client.syncCaldavAccount(account, { syncMethod: 'webdav' });
+    dav.syncCaldavAccount(
+        account,
+        {
+            syncMethod: 'webdav',
+            xhr
+        }
+    );
+
+    let addressBook = new dav.AddressBook();
+    client.createCard(addressBook, {
+        data: 'BEGIN:VCARD\nEND:VCARD',
+        filename: 'test.vcf'
+    });
+    dav.createCard(addressBook,
+        {
+            data: 'BEGIN:VCARD\nEND:VCARD',
+            filename: 'test.vcf',
+            xhr
+        });
+
+    let vcard = new dav.VCard();
+    client.updateCard(vcard);
+    dav.updateCard(
+        vcard,
+        {
+            xhr
+        }
+    );
+    vcard = new dav.VCard();
+    client.deleteCard(vcard);
+    dav.deleteCard(
+        vcard,
+        {
+            xhr
+        });
+
+    addressBook = new dav.AddressBook();
+    client.syncAddressBook(addressBook, {
+        syncMethod: 'basic'
+    });
+
+    dav.syncAddressBook(
+        addressBook,
+        {
+            syncMethod: 'basic',
+            xhr
+        });
+
+    account = new dav.Account();
+    client.syncCarddavAccount(account, { syncMethod: 'basic' });
+
+    dav.syncCarddavAccount(
+        account,
+        {
+            syncMethod: 'basic',
+            xhr
+        });
+})();
+
+(() => {
+    const xhr = new dav.transport.Basic(
+        new dav.Credentials({ username: 'admin', password: 'admin' })
+    );
+
+    const req: dav.Request = {
+        method: 'GET',
+        transformRequest: (xhr: any) => xhr
+    };
+
+    const sandbox = dav.createSandbox();
+    xhr.send(req, 'http://127.0.0.1:1337', { sandbox });
+    sandbox.requestList;
+
+    xhr.send(req, 'http://127.0.0.1:1337');
+})();
+
+(() => {
+    const credentials = new dav.Credentials({
+        clientId: '605300196874-1ki833poa7uqabmh3hq' +
+            '6u1onlqlsi54h.apps.googleusercontent.com',
+        clientSecret: 'jQTKlOhF-RclGaGJot3HIcVf',
+        redirectUrl: 'https://oauth.gaiamobile.org/authenticated',
+        tokenUrl: 'https://accounts.google.com/o/oauth2/token',
+        authorizationCode: 'gareth'
+    });
+
+    const xhr = new dav.transport.OAuth2(credentials);
+
+    const req = { method: 'GET' };
+
+    credentials.accessToken = 'EXPIRED';
+    credentials.refreshToken = '1/oPHTPFgECWFPrs7KgHdis24u6Xl4E4EnRrkkiwLfzdk';
+    credentials.expiration = Date.now() - 1;
+
+    xhr.send(req, 'http://127.0.0.1:1337', {
+        retry: false
+    });
+
+    credentials.accessToken = 'Little Bear';
+    credentials.refreshToken = 'spicy tamales';
+    const expiration = credentials.expiration = Date.now() + 60 * 60 * 1000;
+
+    credentials.accessToken = 'EXPIRED';
+    credentials.refreshToken = 'raspberry pie';
+    credentials.expiration = Date.now() + 60 * 60 * 1000;
+
+    credentials.accessToken = 'EXPIRED';
+    credentials.refreshToken = 'soda';
+})();
diff --git a/types/dav/index.d.ts b/types/dav/index.d.ts
new file mode 100644
index 0000000000..063cc38e60
--- /dev/null
+++ b/types/dav/index.d.ts
@@ -0,0 +1,804 @@
+// Type definitions for dav 1.7
+// Project: https://github.com/lambdabaa/dav/
+// Definitions by: ToastHawaii <https://github.com/ToastHawaii>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export let version: string;
+
+/**
+ * Perform an initial download of a caldav or carddav account's data.
+ * @param options
+ * @returns a Promise which will be fulfilled with a dav.Account object.
+ */
+export function createAccount(options: CreateAccountOptions): Promise<Account>;
+
+export interface CreateAccountOptions {
+    /**
+     * one of 'caldav' or 'carddav'. Defaults to 'caldav'.
+     */
+    accountType?: "caldav" | "carddav";
+
+    /**
+     * list of caldav filters to send with request.
+     */
+    filters?: object[];
+
+    /**
+     *  whether or not to load dav collections.
+     */
+    loadCollections?: boolean;
+
+    /**
+     * whether or not to load dav objects.
+     */
+    loadObjects?: boolean;
+
+    /**
+     * request sandox.
+     */
+    sandbox?: Sandbox | {};
+
+    /**
+     *  some url for server (needn't be base url).
+     */
+    server: string;
+
+    /**
+     * VTIMEZONE calendar object.
+     */
+    timezone?: string;
+
+    /**
+     * request sender.
+     */
+
+    xhr?: transport.Transport;
+}
+
+/**
+ * Create a calendar object on the parameter calendar.
+ * @param calendar the calendar to put the object on.
+ * @param options
+ * @returns a Promise which will be fulfilled when the calendar has been created.
+ */
+export function createCalendarObject(calendar: Calendar, options: CreateCalendarObjectOptions): Promise<CalendarObject>;
+
+export interface CreateCalendarObjectOptions {
+    /**
+     * rfc 5545 VCALENDAR object.
+     */
+    data: string;
+
+    /**
+     * name for the calendar ics file.
+     */
+    filename: string;
+
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Persist updates to the parameter calendar object to the server.
+ * @param calendarObject updated calendar object.
+ * @param options
+ * @returns a Promise which will be fulfilled when the calendar has been updated.
+ */
+export function updateCalendarObject(calendarObject: CalendarObject, options: UpdateCalendarObjectOptions): Promise<CalendarObject>;
+
+export interface UpdateCalendarObjectOptions {
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Delete the parameter calendar object on the server.
+ * @param calendarObject target calendar object.
+ * @param options
+ * @returns a Promise which will be fulfilled when the calendar has been deleted.
+ */
+export function deleteCalendarObject(calendarObject: CalendarObject, options: DeleteCalendarObjectOptions): Promise<CalendarObject>;
+
+export interface DeleteCalendarObjectOptions {
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Fetch changes from the remote server to the parameter calendar.
+ * @param calendar the calendar to fetch changes for.
+ * @param options
+ * @returns a Promise which will be fulfilled with an updated dav.Calendar object once sync is complete.
+ */
+export function syncCalendar(calendar: Calendar, options: SyncCalendarOptions): Promise<Calendar>;
+
+export interface SyncCalendarOptions {
+    /**
+     * list of caldav filters to send with request.
+     */
+    filters?: object[];
+
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+
+    /**
+     * either 'basic' or 'webdav'. If unspecified, will try to do webdav sync
+     * and failover to basic sync if rfc 6578 is not supported by the server.
+     */
+    syncMethod?: "basic" | "webdav";
+
+    /**
+     * VTIMEZONE calendar object.
+     */
+    timezone?: string;
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Fetch changes from the remote server to the account's calendars.
+ * @param account the calendar account to sync.
+ * @param options
+ * @returns a Promise which will be fulfilled with an updated dav.Account object once sync is complete.
+ */
+export function syncCaldavAccount(account: Account, options: SyncCaldavAccountOptions): Promise<Account>;
+
+export interface SyncCaldavAccountOptions {
+    /**
+     * list of caldav filters to send with request.
+     */
+    filters?: object[];
+
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+
+    /**
+     * either 'basic' or 'webdav'. If unspecified, will try to do webdav sync
+     * and failover to basic sync if rfc 6578 is not supported by the server.
+     */
+    syncMethod?: "basic" | "webdav";
+
+    /**
+     * VTIMEZONE calendar object.
+     */
+    timezone?: string;
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Create a vcard object on the parameter address book.
+ * @param addressBook the address book to put the object on.
+ * @param options
+ * @returns a Promise which will be fulfilled when the vcard has been created.
+ */
+export function createCard(addressBook: AddressBook, options: CreateCardOptions): Promise<AddressBook>;
+
+export interface CreateCardOptions {
+    /**
+     * VCARD object.
+     */
+    data: string;
+    /**
+     * name for the vcard vcf file.
+     */
+    filename: string;
+
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ *     Persist updates to the parameter vcard object to the server.
+ * @param  card updated vcard object.
+ * @param options
+ * @returns a Promise which will be fulfilled when the vcard has been updated.
+ */
+export function updateCard(card: VCard, options: UpdateCardOptions): Promise<VCard>;
+
+export interface UpdateCardOptions {
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Delete the parameter vcard object on the server.
+ * @param card target vcard object.
+ * @param options
+ * @returns a Promise which will be fulfilled when the vcard has been deleted.
+ */
+export function deleteCard(card: VCard, options: DeleteCardOptions): Promise<VCard>;
+
+export interface DeleteCardOptions {
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Fetch changes from the remote server to the parameter address books.
+ * @param addressBook the address book to fetch changes for.
+ * @param options
+ * @returns a Promise which will be fulfilled with an updated AddressBook object once sync is complete.
+ */
+export function syncAddressBook(addressBook: AddressBook, options: SyncAddressBookOptions): Promise<AddressBook>;
+
+export interface SyncAddressBookOptions {
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+    /**
+     * either 'basic' or 'webdav'.If unspecified, will try to do webdav sync
+     * and failover to basic sync if rfc 6578 is not supported by the server.
+     */
+    syncMethod?: "basic" | "webdav";
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Fetch changes from the remote server to the account's address books.
+ * @param  account the address book account to sync.
+ * @param options
+ * @returns a Promise which will be fulfilled with an updated Account object once sync is complete.
+ */
+export function syncCarddavAccount(account: Account, options: SyncCarddavAccountOptions): Promise<Account>;
+
+export interface SyncCarddavAccountOptions {
+    /**
+     * list of caldav filters to send with request.
+     */
+    filters?: object[];
+
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+
+    /**
+     * either 'basic' or 'webdav'. If unspecified, will try to do webdav sync
+     * and failover to basic sync if rfc 6578 is not supported by the server.
+     */
+    syncMethod?: "basic" | "webdav";
+
+    /**
+     * VTIMEZONE calendar object.
+     */
+    timezone?: string;
+
+    /**
+     * request sender.
+     */
+    xhr?: transport.Transport;
+}
+
+/**
+ * Create a request sandbox.
+ */
+export class Sandbox {
+    constructor();
+
+    requestList: any[];
+
+    add(request: any): void;
+
+    /**
+     * abort sandboxed requests as a group.
+     */
+    abort(): void;
+}
+
+/**
+ * @deprecated
+ */
+export function createSandbox(): Sandbox;
+
+export namespace transport {
+    class Transport {
+        /**
+         * @param credentials user authorization.
+         */
+        constructor(credentials: Credentials);
+
+        send(request: Request, url: string, options?: TransportOptions): Promise<any>;
+    }
+
+    interface TransportOptions {
+        /**
+         *  request sandbox.
+         */
+        sandbox?: Sandbox;
+
+        retry?: boolean;
+    }
+
+    class Basic extends Transport {
+        /**
+         * Create a new Basic object. This sends dav requests using http basic authentication.
+         * @param credentials user authorization.
+         */
+        constructor(credentials: Credentials);
+
+        /**
+         *
+         * @param request object with request info.
+         * @param url
+         * @param options
+         * @return a promise that will be resolved with an xhr request after
+         * its readyState is 4 or the result of applying an optional request
+         * `transformResponse` function to the xhr object after its readyState
+         * is 4.
+         */
+        send(request: Request, url: string, options?: TransportOptions): Promise<any>;
+    }
+
+    /**
+     * Create a new OAuth2 object.This sends dav requests authorized via rfc 6749 oauth2.
+     * @param credentials user authorization.
+     */
+    class OAuth2 extends Transport {
+        constructor(credentials: Credentials);
+
+        /**
+         *
+         * @param request object with request info.
+         * @param url
+         * @param options
+         * @return a promise that will be resolved with an xhr request after
+         * its readyState is 4 or the result of applying an optional request
+         * `transformResponse` function to the xhr object after its readyState
+         * is 4.
+         */
+        send(request: Request, url: string, options?: TransportOptions): Promise<any>;
+    }
+}
+
+export namespace request {
+    /**
+     *
+     * @param options
+     * @returns
+     */
+    function addressBookQuery(options: AddressBookQueryOptions): string;
+
+    interface AddressBookQueryOptions {
+        /**
+         * value for Depth header.
+         */
+        depth?: string;
+
+        /**
+         * list of props to request.
+         */
+        props: object[];
+    }
+
+    /**
+     *
+     * @param options
+     * @returns
+     */
+    function basic(options: BasicOptions): Request;
+
+    interface BasicOptions {
+        /**
+         * put request body.
+         */
+        data: string;
+
+        /**
+         * http method.
+         */
+        method: string;
+
+        /**
+         * cached calendar object etag.
+         */
+        etag: string;
+    }
+
+    /**
+     *
+     * @param options
+     * @returns
+     */
+    function calendarQuery(options: CalendarQueryOptions): string;
+
+    interface CalendarQueryOptions {
+        /**
+         * value for Depth header.
+         */
+        depth?: string;
+
+        /**
+         * list of filters to send with request.
+         */
+        filters: object[];
+
+        /**
+         * list of props to request.
+         */
+        props: object[];
+
+        /**
+         * VTIMEZONE calendar object.
+         */
+        timezone: string;
+    }
+
+    /**
+     *
+     * @param options
+     * @returns
+     */
+    function propfind(options: PropfindOptions): string;
+
+    interface PropfindOptions {
+        /**
+         *  value for Depth header.
+         */
+        depth?: string;
+
+        /**
+         * list of props to request.
+         */
+        props: object[];
+    }
+
+    /**
+     *
+     * @param options
+     * @returns
+     */
+    function syncCollection(options: SyncCollectionOptions): string;
+
+    interface SyncCollectionOptions {
+        /**
+         * option value for Depth header.
+         */
+        depth?: string;
+
+        /**
+         * list of props to request.
+         */
+        props: object[];
+
+        /**
+         * indicates scope of the sync report request.
+         */
+        syncLevel: number;
+
+        /**
+         * synchronization token provided by the server.
+         */
+        syncToken: string;
+    }
+}
+
+export class Client {
+    /**
+     * Create a new Client object. The client interface allows consumers to set
+     * their credentials and transport once and then make authorized requests
+     * without passing them to each request. Each of the other, public API
+     * methods should be available on Client objects.
+     * @param xhr request sender.
+     * @param options
+     */
+    constructor(xhr: transport.Transport, options?: ClientOptions);
+
+    /**
+     * Send a request using this client's transport (and perhaps baseUrl).
+     * @param  req dav request.
+     * @param options
+     * @return a promise that will be resolved with an xhr request after
+     * its readyState is 4 or the result of applying an optional request
+     * `transformResponse` function to the xhr object after its readyState
+     * is 4.
+     */
+    send(req: Request, uri: string, options?: ClientSendOptions): Promise<any>;
+
+    /**
+     * Perform an initial download of a caldav or carddav account's data.
+     * @param options
+     * @returns a Promise which will be fulfilled with a dav.Account object.
+     */
+    createAccount(options?: CreateAccountOptions): Promise<Account>;
+
+    /**
+     * Create a calendar object on the parameter calendar.
+     * @param calendar the calendar to put the object on.
+     * @param options
+     * @returns a Promise which will be fulfilled when the calendar has been created.
+     */
+    createCalendarObject(calendar: Calendar, options?: CreateCalendarObjectOptions): Promise<CalendarObject>;
+
+    /**
+     * Persist updates to the parameter calendar object to the server.
+     * @param calendarObject updated calendar object.
+     * @param options
+     * @returns a Promise which will be fulfilled when the calendar has been updated.
+     */
+    updateCalendarObject(calendarObject: CalendarObject, options?: UpdateCalendarObjectOptions): Promise<CalendarObject>;
+
+    /**
+     * Delete the parameter calendar object on the server.
+     * @param calendarObject target calendar object.
+     * @param options
+     * @returns a Promise which will be fulfilled when the calendar has been deleted.
+     */
+    deleteCalendarObject(calendarObject: CalendarObject, options?: DeleteCalendarObjectOptions): Promise<CalendarObject>;
+
+    /**
+     * Fetch changes from the remote server to the parameter calendar.
+     * @param calendar the calendar to fetch changes for.
+     * @param options
+     * @returns a Promise which will be fulfilled with an updated dav.Calendar object once sync is complete.
+     */
+    syncCalendar(calendar: Calendar, options?: SyncCalendarOptions): Promise<Calendar>;
+
+    /**
+     * Fetch changes from the remote server to the account's calendars.
+     * @param account the calendar account to sync.
+     * @param options
+     * @returns a Promise which will be fulfilled with an updated dav.Account object once sync is complete.
+     */
+    syncCaldavAccount(account: Account, options?: SyncCaldavAccountOptions): Promise<Account>;
+
+    /**
+     * Create a vcard object on the parameter address book.
+     * @param addressBook the address book to put the object on.
+     * @param options
+     * @returns a Promise which will be fulfilled when the vcard has been created.
+     */
+    createCard(addressBook: AddressBook, options?: CreateCardOptions): Promise<AddressBook>;
+
+    /**
+     * Persist updates to the parameter vcard object to the server.
+     * @param  card updated vcard object.
+     * @param options
+     * @returns a Promise which will be fulfilled when the vcard has been updated.
+     */
+    updateCard(card: VCard, options?: UpdateCardOptions): Promise<VCard>;
+
+    /**
+     *
+     * Delete the parameter vcard object on the server.
+     * @param card target vcard object.
+     * @param options
+     * @returns a Promise which will be fulfilled when the vcard has been deleted.
+     */
+    deleteCard(card: VCard, options?: DeleteCardOptions): Promise<VCard>;
+
+    /**
+     * Fetch changes from the remote server to the parameter address books.
+     * @param addressBook the address book to fetch changes for.
+     * @param options
+     * @returns a Promise which will be fulfilled with an updated AddressBook object once sync is complete.
+     */
+    syncAddressBook(addressBook: AddressBook, options?: SyncAddressBookOptions): Promise<AddressBook>;
+
+    /**
+     * Fetch changes from the remote server to the account's address books.
+     * @param  account the address book account to sync.
+     * @param options
+     * @returns a Promise which will be fulfilled with an updated Account object once sync is complete.
+     */
+    syncCarddavAccount(account: Account, options?: SyncCarddavAccountOptions): Promise<Account>;
+}
+
+export interface ClientOptions {
+    /**
+     * root url to resolve relative request urls with.
+     */
+    baseUrl: string;
+}
+
+export interface ClientSendOptions {
+    /**
+     * request sandbox.
+     */
+    sandbox?: Sandbox;
+    /**
+     * relative url for request.
+     */
+    url?: string;
+}
+
+export type Partial<T> = {
+    [P in keyof T]?: T[P];
+};
+
+export class Account {
+    constructor(options?: AccountOptions);
+    server: string;
+    credentials: Credentials;
+    rootUrl: string;
+    principalUrl: string;
+    homeUrl: string;
+    calendars: Calendar[];
+    addressBooks: AddressBook[];
+}
+
+export type AccountOptions = Partial<Account>;
+
+export class Credentials {
+    constructor(options?: CredentialsOptions);
+
+    /**
+     * username (perhaps email) for calendar user.
+     */
+    username: string;
+
+    /**
+     * plaintext password for calendar user.
+     */
+    password: string;
+
+    /**
+     * oauth client id.
+     */
+    clientId: string;
+
+    /**
+     * oauth client secret.
+     */
+    clientSecret: string;
+
+    /**
+     * oauth code.
+     */
+    authorizationCode: string;
+
+    /**
+     * oauth redirect url.
+     */
+    redirectUrl: string;
+
+    /**
+     * oauth token url.
+     */
+    tokenUrl: string;
+
+    /**
+     * oauth access token.
+     */
+    accessToken: string;
+
+    /**
+     * oauth refresh token.
+     */
+    refreshToken: string;
+
+    /**
+     * unix time for access token expiration.
+     */
+    expiration: number;
+}
+export type CredentialsOptions = Partial<Credentials>;
+
+export class DAVCollection<T> {
+    constructor(options: DAVCollectionOptions<T>);
+    data: string;
+    objects: T[];
+    account: Account;
+    ctag: string;
+    description: string;
+    displayName: string;
+    reports: string[];
+    resourcetype: string;
+    syncToken: string;
+    url: string;
+}
+export type DAVCollectionOptions<T> = Partial<DAVCollection<T>>;
+
+export class AddressBook extends DAVCollection<VCard> {
+    constructor(options?: AddressBookOptions);
+}
+export type AddressBookOptions = Partial<AddressBook>;
+
+export class Calendar extends DAVCollection<CalendarObject> {
+    constructor(options?: CalendarOptions);
+
+    components: string[];
+    timezone: string;
+}
+export type CalendarOptions = Partial<Calendar>;
+
+export class DAVObject {
+    constructor(options: DAVObjectOptions);
+    data: string;
+    etag: string;
+    url: string;
+}
+export type DAVObjectOptions = Partial<DAVObject>;
+
+export class CalendarObject extends DAVObject {
+    constructor(options?: CalendarObjectOptions);
+    calendar: Calendar;
+    calendarData: string;
+}
+export type CalendarObjectOptions = Partial<CalendarObject>;
+
+export class VCard extends DAVObject {
+    constructor(options?: VCardOptions);
+    addressBook: AddressBook;
+    addressData: string;
+}
+
+export type VCardOptions = Partial<VCard>;
+
+export class Request {
+    constructor(options?: RequestOptions);
+    method: string;
+    requestData?: string;
+    transformRequest?: (xhr: any) => any;
+    transformResponse?: (xhr: any) => any;
+    onerror?: (error: Error) => any;
+}
+
+export type RequestOptions = Partial<Request>;
+
+export namespace debug {
+    let enabled: boolean;
+}
+
+export namespace ns {
+    const CALENDAR_SERVER = 'http://calendarserver.org/ns/';
+    const CALDAV_APPLE = 'http://apple.com/ns/ical/';
+    const CALDAV = 'urn:ietf:params:xml:ns:caldav';
+    const CARDDAV = 'urn:ietf:params:xml:ns:carddav';
+    const DAV = 'DAV:';
+}
diff --git a/types/dav/tsconfig.json b/types/dav/tsconfig.json
new file mode 100644
index 0000000000..344edfe56a
--- /dev/null
+++ b/types/dav/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",
+    "dav-tests.ts"
+  ]
+}
\ No newline at end of file
diff --git a/types/dav/tslint.json b/types/dav/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/dav/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/db-migrate-base/index.d.ts b/types/db-migrate-base/index.d.ts
index a881fa6a06..c1c9189a50 100644
--- a/types/db-migrate-base/index.d.ts
+++ b/types/db-migrate-base/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/db-migrate/db-migrate-base
 // Definitions by: nickiannone <https://github.com/nickiannone>
 // Definitions: https://github.com/nickiannone/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node"/>
 
diff --git a/types/db-migrate-pg/index.d.ts b/types/db-migrate-pg/index.d.ts
index 09cba26317..71726463e4 100644
--- a/types/db-migrate-pg/index.d.ts
+++ b/types/db-migrate-pg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/db-migrate/pg
 // Definitions by: nickiannone <https://github.com/nickiannone>
 // Definitions: https://github.com/nickiannone/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as pg from "pg";
 import * as DbMigrateBase from "db-migrate-base";
diff --git a/types/dc/dc-tests.ts b/types/dc/dc-tests.ts
index 643594276d..c431e3c714 100644
--- a/types/dc/dc-tests.ts
+++ b/types/dc/dc-tests.ts
@@ -1,3 +1,8 @@
+import * as crossfilter from 'crossfilter';
+import * as d3 from "d3";
+import * as dc from "dc";
+
+
 interface IYelpData {
     city: string;
     review_count: number;
diff --git a/types/dc/index.d.ts b/types/dc/index.d.ts
index 4ba0e5e4ab..9100acdc26 100644
--- a/types/dc/index.d.ts
+++ b/types/dc/index.d.ts
@@ -5,10 +5,6 @@
 //                 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
-
-///<reference types="crossfilter" />
-
 import * as d3 from "d3";
 
 export = dc;
diff --git a/types/dd-trace/dd-trace-tests.ts b/types/dd-trace/dd-trace-tests.ts
index 6281802d36..007ccc30a4 100644
--- a/types/dd-trace/dd-trace-tests.ts
+++ b/types/dd-trace/dd-trace-tests.ts
@@ -1,16 +1,20 @@
-import * as ddTrace from 'dd-trace';
+import * as tracer from 'dd-trace';
 import SpanContext = require('dd-trace/src/opentracing/span_context');
 
-const tracer = ddTrace.init({
+tracer.init({
     service: 'MyLovelyService',
     hostname: 'localhost',
     port: 8126,
+    logger: {
+        debug: msg => { },
+        error: err => { }
+    }
 });
 
 tracer
     .trace('web.request', {
         service: 'my_service',
-        childOf: new SpanContext({ traceId: 1337, spanId: 42 }),
+        childOf: new SpanContext({ traceId: 1337, spanId: 42 }), // Childof must be an instance of this type. See: https://github.com/DataDog/dd-trace-js/blob/master/src/opentracing/tracer.js#L99
         tags: {
             env: 'dev'
         }
@@ -19,3 +23,13 @@ tracer
         span.setTag('my_tag', 'my_value');
         span.finish();
     });
+
+const parentScope = tracer.scopeManager().active();
+const span = tracer.startSpan('memcached', {
+    childOf: parentScope && parentScope.span(),
+    tags: {
+        'service.name': 'my-memcached',
+        'resource.name': 'get',
+        'span.type': 'memcached',
+    },
+});
diff --git a/types/dd-trace/index.d.ts b/types/dd-trace/index.d.ts
index 7ce1e89b09..a6bbe7dde9 100644
--- a/types/dd-trace/index.d.ts
+++ b/types/dd-trace/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for dd-trace-js 0.2
+// Type definitions for dd-trace-js 0.5
 // Project: https://github.com/DataDog/dd-trace-js
 // Definitions by: Colin Bradley <https://github.com/ColinBradley>
+//                 Eloy Durán <https://github.com/alloy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import Tracer = require('./src/opentracing/tracer');
-import Span = require('./src/opentracing/span');
-import SpanContext = require('./src/opentracing/span_context');
+import { Tracer, Span, SpanContext } from "opentracing";
+import DatadogSpanContext = require('./src/opentracing/span_context');
 
 declare var trace: TraceProxy;
 export = trace;
@@ -42,6 +42,11 @@ declare class TraceProxy extends Tracer {
      * @returns The current span or null if outside a trace context.
      */
     currentSpan(): Span | null;
+
+    /**
+     * Get the scope manager to manager context propagation for the tracer.
+     */
+    scopeManager(): ScopeManager;
 }
 
 interface TracerOptions {
@@ -91,6 +96,16 @@ interface TracerOptions {
      * @default true
      */
     plugins?: boolean;
+
+    /**
+     * Custom logger to be used by the tracer (if debug = true),
+     * should support debug() and error() methods
+     * see https://datadog.github.io/dd-trace-js/#custom-logging__anchor
+     */
+    logger?: {
+        debug: (message: string) => void
+        error: (err: Error) => void
+    };
 }
 
 interface ExperimentalOptions {
@@ -129,11 +144,44 @@ interface TraceOptions {
     /**
      * The parent span or span context for the new span. Generally this is not needed as it will be
      * fetched from the current context.
+     * If creating your own, this must be an instance of DatadogSpanContext from ./src/opentracing/span_context
+     * See: https://github.com/DataDog/dd-trace-js/blob/master/src/opentracing/tracer.js#L99
      */
-    childOf?: Span | SpanContext;
+    childOf?: Span | SpanContext | DatadogSpanContext;
 
     /**
      * Global tags that should be assigned to every span.
      */
-    tags?: { [key: string]: any; } | string;
+    tags?: { [key: string]: any } | string;
+}
+
+declare class ScopeManager {
+    /**
+     * Get the current active scope or null if there is none.
+     *
+     * @todo The dd-trace source returns null, but opentracing's childOf span
+     *       option is typed as taking undefined or a scope, so using undefined
+     *       here instead.
+     */
+    active(): Scope | undefined;
+
+    /**
+     * Activate a new scope wrapping the provided span.
+     *
+     * @param span The span for which to activate the new scope.
+     * @param finishSpanOnClose Whether to automatically finish the span when the scope is closed.
+     */
+    activate(span: Span, finishSpanOnClose?: boolean): Scope;
+}
+
+declare class Scope {
+    /**
+     * Get the span wrapped by this scope.
+     */
+    span(): Span;
+
+    /**
+     * Close the scope, and finish the span if the scope was created with `finishSpanOnClose` set to true.
+     */
+    close(): void;
 }
diff --git a/types/dd-trace/package.json b/types/dd-trace/package.json
new file mode 100644
index 0000000000..90deb3c97b
--- /dev/null
+++ b/types/dd-trace/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "opentracing": ">=0.14.1"
+    }
+}
diff --git a/types/dd-trace/src/opentracing/reference.d.ts b/types/dd-trace/src/opentracing/reference.d.ts
deleted file mode 100644
index 57def49166..0000000000
--- a/types/dd-trace/src/opentracing/reference.d.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import Span = require('./span');
-import SpanContext = require('./span_context');
-
-declare class Reference {
-    /**
-     * @return The Reference type (e.g., REFERENCE_CHILD_OF or
-     *         REFERENCE_FOLLOWS_FROM).
-     */
-    type(): string;
-
-    /**
-     * @return The SpanContext being referred to (e.g., the
-     *         parent in a REFERENCE_CHILD_OF Reference).
-     */
-    referencedContext(): SpanContext;
-
-    /**
-     * Initialize a new Reference instance.
-     *
-     * @param type - the Reference type constant (e.g.,
-     *        REFERENCE_CHILD_OF or REFERENCE_FOLLOWS_FROM).
-     * @param referencedContext - the SpanContext being referred
-     *        to. As a convenience, a Span instance may be passed in instead
-     *        (in which case its .context() is used here).
-     */
-    constructor(type: string, referencedContext: SpanContext | Span);
-}
-
-export = Reference;
\ No newline at end of file
diff --git a/types/dd-trace/src/opentracing/span.d.ts b/types/dd-trace/src/opentracing/span.d.ts
deleted file mode 100644
index e61a611efd..0000000000
--- a/types/dd-trace/src/opentracing/span.d.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-import Tracer = require('./tracer');
-import SpanContext = require('./span_context');
-
-declare class Span {
-    /**
-     * Returns the SpanContext object associated with this Span.
-     */
-    context(): SpanContext;
-
-    /**
-     * Returns the Tracer object used to create this Span.
-     */
-    tracer(): Tracer;
-
-    /**
-     * Sets the string name for the logical operation this span represents.
-     */
-    setOperationName(name: string): this;
-
-    /**
-     * Sets a key:value pair on this Span that also propagates to future
-     * children of the associated Span.
-     *
-     * setBaggageItem() enables powerful functionality given a full-stack
-     * opentracing integration (e.g., arbitrary application data from a web
-     * client can make it, transparently, all the way into the depths of a
-     * storage system), and with it some powerful costs: use this feature with
-     * care.
-     *
-     * IMPORTANT NOTE #1: setBaggageItem() will only propagate baggage items to
-     * *future* causal descendants of the associated Span.
-     *
-     * IMPORTANT NOTE #2: Use this thoughtfully and with care. Every key and
-     * value is copied into every local *and remote* child of the associated
-     * Span, and that can add up to a lot of network and cpu overhead.
-     */
-    setBaggageItem(key: string, value: string): this;
-
-    /**
-     * Returns the value for a baggage item given its key.
-     *
-     * @param  key
-     *         The key for the given trace attribute.
-     * @return String value for the given key, or undefined if the key does not
-     *         correspond to a set trace attribute.
-     */
-    getBaggageItem(key: string): string | undefined;
-
-    /**
-     * Adds a single tag to the span.  See `addTags()` for details.
-     */
-    setTag(key: string, value: any): this;
-
-    /**
-     * Adds the given key value pairs to the set of span tags.
-     *
-     * Multiple calls to addTags() results in the tags being the superset of
-     * all calls.
-     *
-     * The behavior of setting the same key multiple times on the same span
-     * is undefined.
-     *
-     * The supported type of the values is implementation-dependent.
-     * Implementations are expected to safely handle all types of values but
-     * may choose to ignore unrecognized / unhandle-able values (e.g. objects
-     * with cyclic references, function objects).
-     */
-    addTags(keyValueMap: {
-        [key: string]: any;
-    }): this;
-
-    /**
-     * Add a log record to this Span, optionally at a user-provided timestamp.
-     *
-     * For example:
-     *
-     *     span.log({
-     *         size: rpc.size(),  // numeric value
-     *         URI: rpc.URI(),  // string value
-     *         payload: rpc.payload(),  // Object value
-     *         "keys can be arbitrary strings": rpc.foo(),
-     *     });
-     *
-     *     span.log({
-     *         "error.description": someError.description(),
-     *     }, someError.timestampMillis());
-     *
-     * @param keyValuePairs
-     *        An object mapping string keys to arbitrary value types. All
-     *        Tracer implementations should support bool, string, and numeric
-     *        value types, and some may also support Object values.
-     * @param timestamp
-     *        An optional parameter specifying the timestamp in milliseconds
-     *        since the Unix epoch. Fractional values are allowed so that
-     *        timestamps with sub-millisecond accuracy can be represented. If
-     *        not specified, the implementation is expected to use its notion
-     *        of the current time of the call.
-     */
-
-    log(keyValuePairs: {
-        [key: string]: any;
-    }, timestamp?: number): this;
-
-    /**
-     * Sets the end timestamp and finalizes Span state.
-     *
-     * With the exception of calls to Span.context() (which are always allowed),
-     * finish() must be the last call made to any span instance, and to do
-     * otherwise leads to undefined behavior.
-     *
-     * @param  finishTime
-     *         Optional finish time in milliseconds as a Unix timestamp. Decimal
-     *         values are supported for timestamps with sub-millisecond accuracy.
-     *         If not specified, the current time (as defined by the
-     *         implementation) will be used.
-     */
-    finish(finishTime?: number): void;
-}
-
-export = Span;
diff --git a/types/dd-trace/src/opentracing/span_context.d.ts b/types/dd-trace/src/opentracing/span_context.d.ts
index 4e3b532649..d966771c2f 100644
--- a/types/dd-trace/src/opentracing/span_context.d.ts
+++ b/types/dd-trace/src/opentracing/span_context.d.ts
@@ -1,38 +1,28 @@
-/**
- * SpanContext represents Span state that must propagate to descendant Spans
- * and across process boundaries.
- *
- * SpanContext is logically divided into two pieces: the user-level "Baggage"
- * (see setBaggageItem and getBaggageItem) that propagates across Span
- * boundaries and any Tracer-implementation-specific fields that are needed to
- * identify or otherwise contextualize the associated Span instance (e.g., a
- * <trace_id, span_id, sampled> tuple).
- */
-declare class SpanContext {
+import { SpanContext } from 'opentracing';
+
+declare class DatadogSpanContext extends SpanContext {
     /**
-     * Use to create references to parent spans.
+     * Used to create references to parent spans.
+     * See: https://github.com/DataDog/dd-trace-js/blob/master/src/opentracing/tracer.js#L99
      */
     constructor(props: SpanContextLike);
+}
 
-    public traceId: number;
+interface SpanContextLike {
+    traceId: number;
 
-    public spanId: number;
+    spanId: number;
 
-    public parentId?: number | null;
+    parentId?: number | null;
 
-    public sampled?: boolean;
+    sampled?: boolean;
 
-    public baggageItems?: { [key: string]: string };
+    baggageItems?: { [key: string]: string };
 
-    public trace?: {
+    trace?: {
         started: number[],
         finished: number[]
     }
 }
 
-interface SpanContextLike {
-    traceId: number;
-    spanId: number;
-}
-
-export = SpanContext;
+export = DatadogSpanContext;
diff --git a/types/dd-trace/src/opentracing/span_options.d.ts b/types/dd-trace/src/opentracing/span_options.d.ts
deleted file mode 100644
index 054d9024d1..0000000000
--- a/types/dd-trace/src/opentracing/span_options.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import Span = require('./span');
-import Reference = require('./reference');
-import SpanContext = require('./span_context');
-
-interface SpanOptions {
-    /**
-     * a parent SpanContext (or Span, for convenience) that the newly-started
-     * span will be the child of (per REFERENCE_CHILD_OF). If specified,
-     * `references` must be unspecified.
-     */
-    childOf?: Span | SpanContext;
-
-    /**
-     * an array of Reference instances, each pointing to a causal parent
-     * SpanContext. If specified, `fields.childOf` must be unspecified.
-     */
-    references?: Reference[];
-
-    /**
-     * set of key-value pairs which will be set as tags on the newly created
-     * Span. Ownership of the object is passed to the created span for
-     * efficiency reasons (the caller should not modify this object after
-     * calling startSpan).
-     */
-    tags?: {
-        [key: string]: any;
-    };
-
-    /**
-     * a manually specified start time for the created Span object. The time
-     * should be specified in milliseconds as Unix timestamp. Decimal value are
-     * supported to represent time values with sub-millisecond accuracy.
-     */
-    startTime?: number;
-}
-
-export = SpanOptions;
diff --git a/types/dd-trace/src/opentracing/tracer.d.ts b/types/dd-trace/src/opentracing/tracer.d.ts
deleted file mode 100644
index a40559dbcd..0000000000
--- a/types/dd-trace/src/opentracing/tracer.d.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-import SpanOptions = require('./span_options');
-import Span = require('./span');
-import SpanContext = require('./span_context');
-
-/**
- * Tracer is the entry-point between the instrumentation API and the tracing
- * implementation.
- */
-declare class Tracer {
-    /**
-     * Starts and returns a new Span representing a logical unit of work.
-     *
-     * For example:
-     *
-     *     // Start a new (parentless) root Span:
-     *     var parent = Tracer.startSpan('DoWork');
-     *
-     *     // Start a new (child) Span:
-     *     var child = Tracer.startSpan('load-from-db', {
-     *         childOf: parent.context(),
-     *     });
-     *
-     *     // Start a new async (FollowsFrom) Span:
-     *     var child = Tracer.startSpan('async-cache-write', {
-     *         references: [
-     *             opentracing.followsFrom(parent.context())
-     *         ],
-     *     });
-     *
-     * @param name - the name of the operation (REQUIRED).
-     * @param options - options for the newly created span.
-     * @return A new Span object.
-     */
-    startSpan(name: string, options?: SpanOptions): Span;
-
-    /**
-     * Injects the given SpanContext instance for cross-process propagation
-     * within `carrier`. The expected type of `carrier` depends on the value of
-     * `format.
-     *
-     * OpenTracing defines a common set of `format` values (see
-     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
-     * an expected carrier type.
-     *
-     * Consider this pseudocode example:
-     *
-     *     var clientSpan = ...;
-     *     ...
-     *     // Inject clientSpan into a text carrier.
-     *     var headersCarrier = {};
-     *     Tracer.inject(clientSpan.context(), Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
-     *     // Incorporate the textCarrier into the outbound HTTP request header
-     *     // map.
-     *     Object.assign(outboundHTTPReq.headers, headersCarrier);
-     *     // ... send the httpReq
-     *
-     * @param  spanContext - the SpanContext to inject into the
-     *         carrier object. As a convenience, a Span instance may be passed
-     *         in instead (in which case its .context() is used for the
-     *         inject()).
-     * @param  format - the format of the carrier.
-     * @param  carrier - see the documentation for the chosen `format`
-     *         for a description of the carrier object.
-     */
-    inject(spanContext: SpanContext | Span, format: string, carrier: any): void;
-
-    /**
-     * Returns a SpanContext instance extracted from `carrier` in the given
-     * `format`.
-     *
-     * OpenTracing defines a common set of `format` values (see
-     * FORMAT_TEXT_MAP, FORMAT_HTTP_HEADERS, and FORMAT_BINARY), and each has
-     * an expected carrier type.
-     *
-     * Consider this pseudocode example:
-     *
-     *     // Use the inbound HTTP request's headers as a text map carrier.
-     *     var headersCarrier = inboundHTTPReq.headers;
-     *     var wireCtx = Tracer.extract(Tracer.FORMAT_HTTP_HEADERS, headersCarrier);
-     *     var serverSpan = Tracer.startSpan('...', { childOf : wireCtx });
-     *
-     * @param  format - the format of the carrier.
-     * @param  carrier - the type of the carrier object is determined by
-     *         the format.
-     * @return The extracted SpanContext, or null if no such SpanContext could
-     *         be found in `carrier`
-     */
-    extract(format: string, carrier: any): SpanContext | null;
-}
-
-export = Tracer;
diff --git a/types/delay/delay-tests.ts b/types/delay/delay-tests.ts
deleted file mode 100644
index 9714bfd86d..0000000000
--- a/types/delay/delay-tests.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-import delay = require('delay');
-
-delay(200)
-    .then(() => {
-    });
-
-let str: string;
-let num: number;
-Promise.resolve(delay(100))
-    .then(() => {
-    });
-
-Promise.resolve("foo")
-    .then(delay<string>(100))
-    .then(result => {
-        str = result;
-    });
-
-Promise.resolve('foo')
-    .then(delay(100, 10))
-    .then(result => {
-        num = result;
-    });
-
-Promise.resolve('foo')
-    .then(delay.reject(100))
-    .then(x => 10)
-    .catch(err => {
-    });
-
-Promise.resolve('foo')
-    .then(delay.reject(100, 'bar'))
-    .then(x => 10)
-    .catch(err => {
-    });
-
-(async () => {
-    const delaying = delay(1000);
-    delaying.cancel();
-    try {
-        await delaying;
-    } catch (err) {
-        // `err` is an instance of `delay.CancelError`
-    }
-})();
-
-throw new delay.CancelError('bar');
diff --git a/types/delay/index.d.ts b/types/delay/index.d.ts
deleted file mode 100644
index 0ec894f1e1..0000000000
--- a/types/delay/index.d.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-// Type definitions for delay 2.0
-// Project: https://github.com/sindresorhus/delay#readme
-// Definitions by: BendingBender <https://github.com/BendingBender>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-export = delay;
-
-declare function delay<T>(ms: number): delay.PDelayedPassThroughThunk<T>;
-declare function delay<T>(ms: number, value: T): delay.PDelayedThunk<T>;
-
-declare namespace delay {
-    function reject(ms: number, rejectionValue?: any): PDelayedThunk<never>;
-
-    class CancelError extends Error {
-        readonly name: 'CancelError';
-        constructor(message?: string);
-    }
-
-    type PDelayedThunk<T> = ((value: any) => DelayedPromiseLike<T>) & DelayedPromiseLike<T>;
-
-    type PDelayedPassThroughThunk<TValue> = ((value: TValue) => DelayedPromiseLike<TValue>) & DelayedPromiseLike<void>;
-
-    interface DelayedPromiseLike<T> {
-        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/deluge/deluge-tests.ts b/types/deluge/deluge-tests.ts
new file mode 100644
index 0000000000..2ba8088915
--- /dev/null
+++ b/types/deluge/deluge-tests.ts
@@ -0,0 +1,23 @@
+import deluge = require("deluge");
+import * as http from 'http';
+
+const delugeInstance: deluge.Deluge = deluge("deluge-webui-api-url", "password");
+
+delugeInstance.getHosts((error: string, result: deluge.Host[], response: http.ServerResponse) => {
+});
+
+delugeInstance.connect("id", (error: string, result: boolean, response: http.ServerResponse) => {
+});
+
+delugeInstance.add("magnet_link", "path", (error: string, result: boolean, response: http.ServerResponse) => {
+});
+
+delugeInstance.getTorrentRecord((error: string, result: deluge.TorrentRecord, response: http.ServerResponse) => {
+});
+
+delugeInstance.isConnected((error: string, result: boolean, response: http.ServerResponse) => {
+});
+
+delugeInstance.setCookies({ "http://www.some-private-tracker.com/": "my_cookie1=xxx;my_cookie2=yyy;" },
+    (error: string, result: boolean, response: http.ServerResponse) => {
+});
diff --git a/types/deluge/index.d.ts b/types/deluge/index.d.ts
new file mode 100644
index 0000000000..8ca69daedd
--- /dev/null
+++ b/types/deluge/index.d.ts
@@ -0,0 +1,122 @@
+// Type definitions for deluge 1.7
+// Project: https://github.com/ginman86/deluge
+// Definitions by: Felix Plymouth <https://github.com/Diasiare>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import * as http from "http";
+
+export = deluge;
+
+declare function deluge(deluge_url: string, password: string): deluge.Deluge;
+
+declare namespace deluge {
+    interface Host {
+        id: string;
+        ip: string;
+        port: number;
+        status: string;
+    }
+
+    interface DelugeStats {
+        upload_protocol_rate: number;
+        max_upload: number;
+        download_protocol_rate: number;
+        download_rate: number;
+        has_incoming_connections: boolean;
+        num_connections: number;
+        max_download: number;
+        upload_rate: number;
+        dht_nodes: number;
+        free_space: number;
+        max_num_connections: number;
+    }
+
+    interface Torrent {
+        max_download_speed: number;
+        upload_payload_rate: number;
+        download_payload_rate: number;
+        num_peers: number;
+        ratio: number;
+        total_peers: number;
+        state: string;
+        max_upload_speed: number;
+        eta: number;
+        save_path: string;
+        progress: number;
+        time_added: number;
+        tracker_host: string;
+        total_uploaded: number;
+        total_done: number;
+        total_wanted: number;
+        total_seeds: number;
+        seeds_peers_ratio: number;
+        num_seeds: number;
+        name: string;
+        is_auto_managed: boolean;
+        queue: number;
+        distributed_copies: number;
+    }
+
+    interface TorrentRecord {
+        stats: DelugeStats;
+        connected: boolean;
+        torrents: {
+            [key: string]: Torrent;
+        };
+        filters: {
+            state: Array<[string, number]>;
+            tracker_host: Array<[string, number]>;
+        };
+    }
+
+    interface DownloadOptions {
+        file_priorities: any[];
+        add_paused: boolean;
+        compact_allocation: boolean;
+        download_location: string;
+        max_connections: number;
+        max_download_speed: number;
+        max_upload_slots: number;
+        max_upload_speed: number;
+        prioritize_first_last_pieces: boolean;
+    }
+
+    interface Deluge {
+        /**
+         * Add the torrent to Deluge
+         * @param magnet
+         * @param dlPath
+         * @param callback
+         */
+        add(magnet: string, dlPath: string | DownloadOptions, callback: (error: string, result: boolean, response: http.ServerResponse) => void): void;
+        /**
+         * Connect the WebUI to the wanted daemon
+         * @param hostID
+         * @param callback
+         */
+        connect(hostID: string, callback: (error: string, result: boolean, response: http.ServerResponse) => void): void;
+        /**
+         * Get the list of all the hosts that the WebUI can connect to
+         * @param callback
+         */
+        getHosts(callback: (error: string, result: Host[], response: http.ServerResponse) => void): void;
+        /**
+         * Get the list of all torrents and changing data that represents their status in the WebUI
+         * @param callback
+         */
+        getTorrentRecord(callback: (error: string, result: TorrentRecord, response: http.ServerResponse) => void): void;
+        /**
+         * Check if the WebUI is connected to a deamon. Return true or false as result of the callback.
+         * @param callback
+         */
+        isConnected(callback: (error: string, result: boolean, response: http.ServerResponse) => void): void;
+        /**
+         * Set cookies in COOKIE_JAR, cookies is an object with urls as keys, example:
+         * {'http://example.org/': 'uid=1234;pass=xxxx;'}
+         * @object cookies
+         */
+        setCookies(cookies: { [key: string]: string }, callback: (error: string, result: boolean, response: http.ServerResponse) => void): void;
+    }
+}
diff --git a/types/deluge/tsconfig.json b/types/deluge/tsconfig.json
new file mode 100644
index 0000000000..05deb4bcb2
--- /dev/null
+++ b/types/deluge/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",
+        "deluge-tests.ts"
+    ]
+}
diff --git a/types/deluge/tslint.json b/types/deluge/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/deluge/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/detect-node/detect-node-tests.ts b/types/detect-node/detect-node-tests.ts
new file mode 100644
index 0000000000..01a81a356b
--- /dev/null
+++ b/types/detect-node/detect-node-tests.ts
@@ -0,0 +1,3 @@
+import isNode = require("detect-node");
+
+isNode;
diff --git a/types/detect-node/index.d.ts b/types/detect-node/index.d.ts
new file mode 100644
index 0000000000..38fd280f1e
--- /dev/null
+++ b/types/detect-node/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for detect-node 2.0
+// Project: https://github.com/iliakan/detect-node
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+declare const isNode: boolean;
+export = isNode;
diff --git a/types/detect-node/tsconfig.json b/types/detect-node/tsconfig.json
new file mode 100644
index 0000000000..e853bcf92c
--- /dev/null
+++ b/types/detect-node/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", "detect-node-tests.ts"]
+}
diff --git a/types/detect-node/tslint.json b/types/detect-node/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/detect-node/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/di/di-tests.ts b/types/di/di-tests.ts
new file mode 100644
index 0000000000..4cfd3de5e7
--- /dev/null
+++ b/types/di/di-tests.ts
@@ -0,0 +1,21 @@
+import * as di from "di";
+
+const emptyInjector = new di.Injector();
+const moduleSpecifications = [{}];
+const fullInjector = new di.Injector(moduleSpecifications);
+const childInjector = new di.Injector(moduleSpecifications, emptyInjector);
+
+const dep: {} = fullInjector.get('foo');
+
+const factory = (context: {}, deps: Array<{}>) => {
+	return {};
+};
+
+const invoked: {} = fullInjector.invoke(factory, {});
+
+const oldTimeyClass = {prototype: {}};
+
+const instance: {} = fullInjector.instantiate(oldTimeyClass);
+
+const anotherChildInjector: di.Injector =
+		fullInjector.createChild(moduleSpecifications);
diff --git a/types/di/index.d.ts b/types/di/index.d.ts
new file mode 100644
index 0000000000..ea1d596017
--- /dev/null
+++ b/types/di/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for di 0.0
+// Project: https://github.com/vojtajina/node-di
+// Definitions by: John J Barton <https://github.com/johnjbarton>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+export class Injector {
+    get(dep: string): {};
+    invoke(fn: (context: {}, deps: Array<{}>) => {}, context: {}): {};
+    instantiate({prototype: {}}): {};
+    createChild(modules: Array<{}>): Injector;
+    constructor(modules?: Array<{}>, parent?: Injector);
+}
diff --git a/types/di/tsconfig.json b/types/di/tsconfig.json
new file mode 100644
index 0000000000..c7e591ab5a
--- /dev/null
+++ b/types/di/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",
+        "di-tests.ts"
+    ]
+}
diff --git a/types/di/tslint.json b/types/di/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/di/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/dialogflow/dialogflow-tests.ts b/types/dialogflow/dialogflow-tests.ts
new file mode 100644
index 0000000000..42d905839e
--- /dev/null
+++ b/types/dialogflow/dialogflow-tests.ts
@@ -0,0 +1,10 @@
+import * as dialogflow from "dialogflow";
+
+const agentsClient = new dialogflow.AgentsClient();
+const contextsClient = new dialogflow.ContextsClient();
+const entityTypesClient = new dialogflow.EntityTypesClient();
+const intentsClient = new dialogflow.IntentsClient();
+const sessionEntityTypesClient = new dialogflow.SessionEntityTypesClient();
+const sessionsClient = new dialogflow.SessionsClient();
+
+// TODO: Add real significant tests
diff --git a/types/dialogflow/index.d.ts b/types/dialogflow/index.d.ts
new file mode 100644
index 0000000000..c421c47f68
--- /dev/null
+++ b/types/dialogflow/index.d.ts
@@ -0,0 +1,933 @@
+// Type definitions for dialogflow 0.6
+// Project: https://github.com/dialogflow/dialogflow-nodejs-client-v2#readme
+// Definitions by: Daniel Dyla <https://github.com/dyladan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export namespace v2 {
+    class AgentsClient {
+        constructor(options?: ClientOptions);
+
+        servicePath: string;
+        port: number;
+        scopes: string[];
+
+        getProjectId(): Promise<string>;
+        getProjectId(callback?: (error: Error, id: string) => string): void;
+
+        getAgent(
+            request: GetAgentRequest,
+            options?: gax.CallOptions,
+            cb?: (err: Error, agent: Agent) => void
+        ): Promise<[Agent]>;
+        searchAgents(
+            request: SearchAgentRequest,
+            options?: gax.CallOptions,
+            cb?: (
+                err: Error,
+                agents: Agent[],
+                arg3: any,
+                response: any
+            ) => void
+        ): Promise<Agent[]>;
+        searchAgentsStream(
+            request: SearchAgentRequest,
+            options?: gax.CallOptions
+        ): any;
+        trainAgent(
+            request: TrainAgentRequest,
+            options?: gax.CallOptions,
+            cb?: (err: Error, operation: gax.Operation) => void
+        ): Promise<[gax.Operation]>;
+        exportAgent(
+            request: ExportAgentRequest,
+            options?: gax.CallOptions,
+            cb?: (err: Error, operation: gax.Operation) => void
+        ): Promise<[gax.Operation]>;
+        importAgent(
+            request: ImportAgentRequest,
+            options?: gax.CallOptions,
+            cb?: (err: Error, operation: gax.Operation) => void
+        ): Promise<[gax.Operation]>;
+        restoreAgent(
+            request: RestoreAgentRequest,
+            options?: gax.CallOptions,
+            cb?: (err: Error, operation: gax.Operation) => void
+        ): Promise<[gax.Operation]>;
+    }
+
+    class ContextsClient {
+        constructor(options?: ClientOptions);
+
+        servicePath: string;
+        port: number;
+        scopes: string[];
+
+        getProjectId(): Promise<string>;
+        getProjectId(callback?: (error: Error, id: string) => string): void;
+
+        listContexts(
+            request: ListContextsRequest,
+            options?: gax.CallOptions
+        ): Promise<[Context[]]>;
+        listContextsStream(
+            request: ListContextsRequest,
+            options?: gax.CallOptions
+        ): any;
+        getContext(
+            request: GetContextRequest,
+            options?: gax.CallOptions
+        ): Promise<[Context]>;
+        createContext(
+            request: CreateContextReqeust,
+            options?: gax.CallOptions
+        ): Promise<[Context]>;
+        updateContext(
+            request: UpdateContextRequest,
+            options?: gax.CallOptions
+        ): Promise<[Context]>;
+        deleteContext(
+            request: DeleteContextRequest,
+            options?: gax.CallOptions
+        ): Promise<void>;
+        deleteAllContexts(
+            request: DeleteAllContextsRequest,
+            options?: gax.CallOptions
+        ): Promise<void>;
+
+        sessionPath(project: string, session: string): string;
+        contextPath(project: string, session: string, context: string): string;
+
+        matchProjectFromContextName(name: string): string;
+        matchSessionFromContextName(name: string): string;
+        matchContextFromContextName(name: string): string;
+
+        matchProjectFromSessionName(name: string): string;
+        matchSessionFromSessionName(name: string): string;
+    }
+
+    class EntityTypesClient {
+        constructor(options?: ClientOptions);
+
+        servicePath: string;
+        port: number;
+        scopes: string[];
+
+        getProjectId(): Promise<string>;
+        getProjectId(callback?: (error: Error, id: string) => string): void;
+
+        listEntityTypes(
+            request: ListEntityTypesRequest,
+            options?: gax.CallOptions
+        ): Promise<[EntityType[]]>;
+
+        listEntityTypesStream(
+            request: ListEntityTypesRequest,
+            options?: gax.CallOptions
+        ): any;
+
+        getEntityType(
+            request: GetEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<[EntityType]>;
+        createEntityType(
+            request: CreateEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<[EntityType]>;
+        updateEntityType(
+            request: UpdateEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<[EntityType]>;
+        deleteEntityType(
+            request: DeleteEntityTypeRequest,
+            options?: gax.CallOptions
+        ): Promise<void>;
+
+        // TODO: add batch style calls
+        // batchUpdateEntityTypes
+        // batchDeleteEntityTypes
+        // batchCreateEntities
+        // batchUpdateEntities
+        // batchDeleteEntities
+
+        projectAgentPath(project: string): string;
+        entityTypePath(project: string, entityType: string): string;
+        matchProjectFromProjectAgentName(entityTypeName: string): string;
+        matchProjectFromEntityTypeName(entityTypeName: string): string;
+        matchEntityTypeFromEntityTypeName(entityTypeName: string): string;
+    }
+
+    class IntentsClient {
+        constructor(options?: ClientOptions);
+
+        servicePath: string;
+        port: number;
+        scopes: string[];
+
+        getProjectId(): Promise<string>;
+        getProjectId(callback?: (error: Error, id: string) => string): void;
+
+        listIntents(
+            request: ListIntentsRequest,
+            options?: gax.CallOptions
+        ): Promise<[Intent[]]>;
+        getIntent(
+            request: GetIntentRequest,
+            options?: gax.CallOptions
+        ): Promise<[Intent]>;
+        createIntent(
+            request: CreateIntentRequest,
+            options?: gax.CallOptions
+        ): Promise<[Intent]>;
+        updateIntent(
+            request: UpdateIntentRequest,
+            options?: gax.CallOptions
+        ): Promise<[Intent]>;
+        deleteIntent(
+            request: DeleteIntentRequest,
+            options?: gax.CallOptions
+        ): Promise<void>;
+
+        // TODO: add batch style calls
+        // batchUpdateIntents(request: BatchUpdateIntentsRequest): void;
+        // batchDeleteIntents(request: BatchDeleteIntentsRequest): void;
+
+        projectAgentPath(project: string): string;
+        intentPath(project: string, intent: string): string;
+        agentPath(project: string, agent: string): string;
+
+        matchProjectFromProjectAgentName(projectAgentName: string): string;
+        matchProjectFromIntentName(intentName: string): string;
+        matchIntentFromIntentName(intentName: string): string;
+        matchProjectFromAgentName(agentName: string): string;
+        matchAgentFromAgentName(agentName: string): string;
+    }
+
+    class SessionEntityTypesClient {
+        constructor(options?: ClientOptions);
+
+        servicePath: string;
+        port: number;
+        scopes: string[];
+
+        getProjectId(): Promise<string>;
+        getProjectId(callback?: (error: Error, id: string) => string): void;
+
+        // TODO: add Session Entity Types service methods
+    }
+
+    class SessionsClient {
+        constructor(options?: ClientOptions);
+
+        servicePath: string;
+        port: number;
+        scopes: string[];
+
+        getProjectId(): Promise<string>;
+        getProjectId(callback?: (error: Error, id: string) => string): void;
+
+        detectIntent(
+            request: DetectIntentRequest,
+            options?: gax.CallOptions
+        ): Promise<DetectIntentResponse[]>;
+        streamingDetectIntent(options?: gax.CallOptions): Promise<any>;
+
+        sessionPath(projectId: string, sessionId: string): string;
+    }
+}
+
+export namespace v2beta1 {
+    class AgentsClient extends v2.AgentsClient {}
+    class ContextsClient extends v2.ContextsClient {
+        environmentSessionPath(
+            project: string,
+            environment: string,
+            user: string,
+            session: string
+        ): string;
+
+        environmentContextPath(
+            project: string,
+            environment: string,
+            user: string,
+            session: string,
+            context: string
+        ): string;
+
+        matchProjectFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+        matchEnvironmentFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+        matchUserFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+        matchSessionFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+
+        matchProjectFromEnvironmentContextName(
+            environmentContextName: string
+        ): string;
+        matchEnvironmentFromEnvironmentContextName(
+            environmentContextName: string
+        ): string;
+        matchUserFromEnvironmentContextName(
+            environmentContextName: string
+        ): string;
+        matchSessionFromEnvironmentContextName(
+            environmentContextName: string
+        ): string;
+        matchContextFromEnvironmentContextName(
+            environmentContextName: string
+        ): string;
+    }
+    class EntityTypesClient extends v2.EntityTypesClient {}
+    class IntentsClient extends v2.IntentsClient {}
+    class SessionEntityTypesClient extends v2.SessionEntityTypesClient {}
+    class SessionsClient extends v2.SessionsClient {
+        environmentSessionPath(
+            project: string,
+            environment: string,
+            user: string,
+            session: string
+        ): string;
+
+        matchProjectFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+        matchEnvironmentFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+        matchUserFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+        matchSessionFromEnvironmentSessionName(
+            environmentSessionName: string
+        ): string;
+    }
+}
+
+export class AgentsClient extends v2.AgentsClient {}
+export class ContextsClient extends v2.ContextsClient {}
+export class EntityTypesClient extends v2.EntityTypesClient {}
+export class IntentsClient extends v2.IntentsClient {}
+export class SessionEntityTypesClient extends v2.SessionEntityTypesClient {}
+export class SessionsClient extends v2.SessionsClient {}
+
+export namespace entities {
+    namespace DateTimeVariants {
+        interface DateTime {
+            date_time: string;
+        }
+
+        interface DateTimePeriod {
+            startDateTime: DateTime;
+            endDateTime: DateTime;
+        }
+
+        interface DatePeriod {
+            startDate: Date;
+            endDate: Date;
+        }
+        interface TimePeriod {
+            startTime: string;
+            endTime: string;
+        }
+    }
+
+    type DateTime =
+        | string
+        | DateTimeVariants.DatePeriod
+        | DateTimeVariants.TimePeriod
+        | DateTimeVariants.DateTime
+        | DateTimeVariants.DateTimePeriod;
+
+    interface Duration {
+        unit: string;
+        amount: number;
+    }
+
+    type Date = string;
+
+    type Time = string;
+}
+
+export namespace gax {
+    interface BackoffSettings {
+        initialRetryDelayMillis: number;
+        retryDelayMultiplier: number;
+        maxRetryDelayMillis: number;
+        initialRpcTimeoutMillis: number;
+        maxRpcTimeoutMillis: number;
+        totalTimeoutMillis: number;
+    }
+
+    interface RetryOptions {
+        retryCodes: string[];
+        backoffSettings: BackoffSettings;
+    }
+
+    interface CallOptions {
+        timeout?: number;
+        retry?: RetryOptions;
+        autoPaginate?: boolean;
+        pageToken?: any;
+        isBundling?: boolean;
+        longrunning?: BackoffSettings;
+        promise?: PromiseConstructor;
+    }
+
+    interface Operation {
+        grpcOp: longrunning.Operation;
+        longrunningDescriptor: any;
+        backoffSettings: BackoffSettings;
+        callOptions?: CallOptions;
+    }
+}
+
+export namespace longrunning {
+    type Operation =
+        | UnfinishedOperation
+        | FailedOperation
+        | SuccessfulOperation;
+
+    interface BaseOperation {
+        name: string;
+        metadata: any;
+        done: boolean;
+    }
+
+    interface UnfinishedOperation extends BaseOperation {
+        done: false;
+    }
+
+    interface FailedOperation extends BaseOperation {
+        done: true;
+        error: Status;
+    }
+
+    interface SuccessfulOperation extends BaseOperation {
+        done: true;
+        response: any;
+    }
+
+    interface Status {
+        code: number;
+        message: string;
+        details: any[];
+    }
+}
+
+export interface GetAgentRequest {
+    parent: string;
+}
+
+export interface SearchAgentRequest {
+    parent: string;
+    pageSize?: number;
+}
+
+export interface TrainAgentRequest {
+    parent: string;
+}
+
+export interface ExportAgentRequest {
+    parent: string;
+    agentUri?: string;
+}
+
+export interface ImportAgentRequest {
+    parent: string;
+    agentUri?: string;
+    agentContent?: string;
+}
+
+export interface RestoreAgentRequest {
+    parent: string;
+    agentUri?: string;
+    agentContent?: string;
+}
+
+export interface ListContextsRequest {
+    parent: string;
+    pageSize?: number;
+}
+
+export interface GetContextRequest {
+    name: string;
+}
+
+export interface CreateContextReqeust {
+    parent: string;
+    context: Context;
+}
+
+export interface UpdateContextRequest {
+    context: Context;
+    updatemask?: any;
+}
+
+export interface DeleteContextRequest {
+    name: string;
+}
+
+export interface DeleteAllContextsRequest {
+    parent: string;
+}
+
+export interface ListEntityTypesRequest {
+    parent: string;
+    languageCode?: string;
+    pageSize?: number;
+}
+
+export interface GetEntityTypeRequest {
+    name: string;
+    languageCode?: string;
+}
+
+export interface CreateEntityTypeRequest {
+    parent: string;
+    entityType: EntityType;
+}
+
+export interface UpdateEntityTypeRequest {
+    entityType: EntityType;
+    languageCode?: string;
+    /** @link https://github.com/google/protobuf/blob/master/src/google/protobuf/field_mask.proto */
+    updateMask?: any;
+}
+
+export interface DeleteEntityTypeRequest {
+    name: string;
+}
+
+export interface ListIntentsRequest {
+    parent: string;
+    languageCode?: string;
+    intentView?: IntentView;
+    pageSize?: number;
+}
+
+export interface GetIntentRequest {
+    name: string;
+    languageCode?: string;
+    intentView?: IntentView;
+}
+
+export interface CreateIntentRequest {
+    parent: string;
+    intent: Intent;
+    languageCode?: string;
+    intentView?: IntentView;
+}
+
+export interface UpdateIntentRequest {
+    intent: Intent;
+    languageCode?: string;
+    updateMask?: any;
+    intentView?: IntentView;
+}
+
+export interface DeleteIntentRequest {
+    name: string;
+}
+
+export interface DetectIntentRequest {
+    session: string;
+    queryInput: QueryInput;
+    queryParams?: QueryParams;
+    inputAudio?: any;
+}
+
+export interface DetectIntentResponse {
+    responseId: string;
+    queryResult: QueryResult;
+    webhookStatus: Status;
+}
+
+export interface QueryResult {
+    queryText: string;
+    languageCode: string;
+    speechRecognitionConfidence: number;
+    action: string;
+    parameters: any;
+    allRequiredParamsSent: boolean;
+    fulfillmentText: string;
+    fulfillmentMessages: Message[];
+    webhookSource: string;
+    webhookPayload: any;
+    outputContexts: Context[];
+    intent: Intent;
+    intentDetectionConfidence: number;
+    sentimentAnalysisResult?: {
+        queryTextSentiment: {
+            magnitude: number;
+            score: number;
+        };
+    };
+    diagnosticInfo: any;
+}
+
+export interface Status {
+    code: StatusCode;
+    message: string;
+    details: any[];
+}
+
+export enum StatusCode {
+    // Not an error; returned on success
+    //
+    // HTTP Mapping: 200 OK
+    OK = 0,
+
+    // The operation was cancelled, typically by the caller.
+    //
+    // HTTP Mapping: 499 Client Closed Request
+    CANCELLED = 1,
+
+    // Unknown error.  For example, this error may be returned when
+    // a `Status` value received from another address space belongs to
+    // an error space that is not known in this address space.  Also
+    // errors raised by APIs that do not return enough error information
+    // may be converted to this error.
+    //
+    // HTTP Mapping: 500 Internal Server Error
+    UNKNOWN = 2,
+
+    // The client specified an invalid argument.  Note that this differs
+    // from `FAILED_PRECONDITION`.  `INVALID_ARGUMENT` indicates arguments
+    // that are problematic regardless of the state of the system
+    // (e.g., a malformed file name).
+    //
+    // HTTP Mapping: 400 Bad Request
+    INVALID_ARGUMENT = 3,
+
+    // The deadline expired before the operation could complete. For operations
+    // that change the state of the system, this error may be returned
+    // even if the operation has completed successfully.  For example, a
+    // successful response from a server could have been delayed long
+    // enough for the deadline to expire.
+    //
+    // HTTP Mapping: 504 Gateway Timeout
+    DEADLINE_EXCEEDED = 4,
+
+    // Some requested entity (e.g., file or directory) was not found.
+    //
+    // Note to server developers: if a request is denied for an entire class
+    // of users, such as gradual feature rollout or undocumented whitelist,
+    // `NOT_FOUND` may be used. If a request is denied for some users within
+    // a class of users, such as user-based access control, `PERMISSION_DENIED`
+    // must be used.
+    //
+    // HTTP Mapping: 404 Not Found
+    NOT_FOUND = 5,
+
+    // The entity that a client attempted to create (e.g., file or directory)
+    // already exists.
+    //
+    // HTTP Mapping: 409 Conflict
+    ALREADY_EXISTS = 6,
+
+    // The caller does not have permission to execute the specified
+    // operation. `PERMISSION_DENIED` must not be used for rejections
+    // caused by exhausting some resource (use `RESOURCE_EXHAUSTED`
+    // instead for those errors). `PERMISSION_DENIED` must not be
+    // used if the caller can not be identified (use `UNAUTHENTICATED`
+    // instead for those errors). This error code does not imply the
+    // request is valid or the requested entity exists or satisfies
+    // other pre-conditions.
+    //
+    // HTTP Mapping: 403 Forbidden
+    PERMISSION_DENIED = 7,
+
+    // The request does not have valid authentication credentials for the
+    // operation.
+    //
+    // HTTP Mapping: 401 Unauthorized
+    UNAUTHENTICATED = 16,
+
+    // Some resource has been exhausted, perhaps a per-user quota, or
+    // perhaps the entire file system is out of space.
+    //
+    // HTTP Mapping: 429 Too Many Requests
+    RESOURCE_EXHAUSTED = 8,
+
+    // The operation was rejected because the system is not in a state
+    // required for the operation's execution.  For example, the directory
+    // to be deleted is non-empty, an rmdir operation is applied to
+    // a non-directory, etc.
+    //
+    // Service implementors can use the following guidelines to decide
+    // between `FAILED_PRECONDITION`, `ABORTED`, and `UNAVAILABLE`:
+    //  (a) Use `UNAVAILABLE` if the client can retry just the failing call.
+    //  (b) Use `ABORTED` if the client should retry at a higher level
+    //      (e.g., when a client-specified test-and-set fails, indicating the
+    //      client should restart a read-modify-write sequence).
+    //  (c) Use `FAILED_PRECONDITION` if the client should not retry until
+    //      the system state has been explicitly fixed.  E.g., if an "rmdir"
+    //      fails because the directory is non-empty, `FAILED_PRECONDITION`
+    //      should be returned since the client should not retry unless
+    //      the files are deleted from the directory.
+    //
+    // HTTP Mapping: 400 Bad Request
+    FAILED_PRECONDITION = 9,
+
+    // The operation was aborted, typically due to a concurrency issue such as
+    // a sequencer check failure or transaction abort.
+    //
+    // See the guidelines above for deciding between `FAILED_PRECONDITION`,
+    // `ABORTED`, and `UNAVAILABLE`.
+    //
+    // HTTP Mapping: 409 Conflict
+    ABORTED = 10,
+
+    // The operation was attempted past the valid range.  E.g., seeking or
+    // reading past end-of-file.
+    //
+    // Unlike `INVALID_ARGUMENT`, this error indicates a problem that may
+    // be fixed if the system state changes. For example, a 32-bit file
+    // system will generate `INVALID_ARGUMENT` if asked to read at an
+    // offset that is not in the range [0,2^32-1], but it will generate
+    // `OUT_OF_RANGE` if asked to read from an offset past the current
+    // file size.
+    //
+    // There is a fair bit of overlap between `FAILED_PRECONDITION` and
+    // `OUT_OF_RANGE`.  We recommend using `OUT_OF_RANGE` (the more specific
+    // error) when it applies so that callers who are iterating through
+    // a space can easily look for an `OUT_OF_RANGE` error to detect when
+    // they are done.
+    //
+    // HTTP Mapping: 400 Bad Request
+    OUT_OF_RANGE = 11,
+
+    // The operation is not implemented or is not supported/enabled in this
+    // service.
+    //
+    // HTTP Mapping: 501 Not Implemented
+    UNIMPLEMENTED = 12,
+
+    // Internal errors.  This means that some invariants expected by the
+    // underlying system have been broken.  This error code is reserved
+    // for serious errors.
+    //
+    // HTTP Mapping: 500 Internal Server Error
+    INTERNAL = 13,
+
+    // The service is currently unavailable.  This is most likely a
+    // transient condition, which can be corrected by retrying with
+    // a backoff.
+    //
+    // See the guidelines above for deciding between `FAILED_PRECONDITION`,
+    // `ABORTED`, and `UNAVAILABLE`.
+    //
+    // HTTP Mapping: 503 Service Unavailable
+    UNAVAILABLE = 14,
+
+    // Unrecoverable data loss or corruption.
+    //
+    // HTTP Mapping: 500 Internal Server Error
+    DATA_LOSS = 15
+}
+
+export interface Agent {
+    parent: string;
+    displayName: string;
+    defaultLanguageCode: string;
+    supportedLanguageCodes?: string[];
+    timeZone: string;
+    description?: string;
+    avatarUri?: string;
+    enableLogging?: boolean;
+    matchMode?: MatchMode;
+    classificationThreshold?: number;
+}
+
+export interface Context {
+    name: string;
+    lifespanCount?: number;
+    parameters?: any;
+}
+
+export interface EntityType {
+    name: string;
+    entities: EntitySynonyms[];
+    displayName: string;
+    kind: EntityKind;
+    autoExpansionMode: EntityAutoExpansionMode;
+}
+
+export enum MatchMode {
+    MATCH_MODE_UNSPECIFIED = "MATCH_MODE_UNSPECIFIED",
+    MATCH_MODE_HYBRID = "MATCH_MODE_HYBRID",
+    MATCH_MODE_ML_ONLY = "MATCH_MODE_ML_ONLY"
+}
+
+export interface Credentials {
+    client_email: string;
+    private_key: string;
+}
+
+export interface ClientOptions {
+    credentials?: Credentials;
+    email?: string;
+    keyFilename?: string;
+    port?: number;
+    projectId?: string;
+    promise?: PromiseConstructor;
+    servicePath?: string;
+}
+
+export interface EntitySynonyms {
+    synonyms: string[];
+    value: string;
+}
+
+export enum EntityKind {
+    KIND_MAP = "KIND_MAP",
+    KIND_LIST = "KIND_LIST"
+}
+
+export enum EntityAutoExpansionMode {
+    AUTO_EXPANSION_MODE_DEFAULT = "AUTO_EXPANSION_MODE_DEFAULT",
+    AUTO_EXPANSION_MODE_UNSPECIFIED = "AUTO_EXPANSION_MODE_UNSPECIFIED"
+}
+
+export enum IntentView {
+    INTENT_VIEW_UNSPECIFIED = "INTENT_VIEW_UNSPECIFIED",
+    INTENT_VIEW_FULL = "INTENT_VIEW_FULL"
+}
+
+export interface Intent {
+    name: string;
+    displayName: string;
+    webhookState: string;
+    priority?: number;
+    isFallback?: boolean;
+    mlEnabled?: boolean;
+    inputContextNames?: string[];
+    events?: string[];
+    trainingPhrases?: TrainingPhrase[];
+    action?: string;
+    outputContexts?: Context[];
+    resetContexts?: boolean;
+    parameters?: Parameter[];
+    messages?: Message[];
+    defaultResponsePlatforms?: string[];
+    rootFollowupIntentName: string;
+    parentFollowupIntentName: string;
+    followupIntentInfo?: FollowupIntentInfo[];
+}
+
+export interface TrainingPhrase {
+    name: string;
+    type: string;
+    parts: Part[];
+    timesAddedCount?: number;
+}
+
+export interface Part {
+    text: string;
+    entityType?: string;
+    alias?: string;
+    userDefined?: boolean;
+}
+
+export interface Parameter {
+    name: string;
+    displayName: string;
+    value?: string;
+    defaultValue?: string;
+    entityTypeDisplayName?: string;
+    mandatory?: boolean;
+    prompts?: string[];
+    isList?: boolean;
+}
+
+export interface FollowupIntentInfo {
+    followupIntentName: string;
+    parentFollowupIntentName: string;
+}
+
+export interface Message {
+    platform?: string;
+    text?: Text;
+    card?: Card;
+    payload?: any;
+}
+
+export interface Text {
+    text: string[];
+}
+
+export interface Card {
+    title?: string;
+    subtitle?: string;
+    imageUri?: string;
+    buttons?: Button[];
+}
+
+export interface Button {
+    text?: string;
+    postback?: string;
+}
+
+export interface EventInput {
+    name: string;
+    languageCode: string;
+    parameters?: any;
+}
+
+export interface TextInput {
+    text: string;
+    languageCode: string;
+}
+
+export interface QueryInput {
+    text?: TextInput;
+    event?: EventInput;
+}
+
+export interface QueryParams {
+    timeZone?: string;
+    geoLocation?: LatLong;
+    contexts?: Context[];
+    resetContexts?: boolean;
+    sessionEntityTypes?: SessionEntityType[];
+    payload?: any;
+}
+
+export interface LatLong {
+    latitude: number;
+    longitude: number;
+}
+
+export interface SessionEntityType {
+    name: string;
+    entityOverrideMode: string;
+    entities: Entity[];
+}
+
+export interface Entity {
+    value: string;
+    synonyms: string[];
+}
+
+export interface WebhookRequest {
+    session: string;
+    responseId: string;
+
+    queryResult: QueryResult;
+    originalDetectIntentRequest?: any;
+}
+
+export interface WebhookResponse {
+    fulfillmentText?: string;
+    fulfillmentMessages?: Message[];
+    source?: string;
+    payload?: any;
+    outputContexts?: Context[];
+    followupEventInput?: EventInput;
+}
diff --git a/types/dialogflow/tsconfig.json b/types/dialogflow/tsconfig.json
new file mode 100644
index 0000000000..366cf28866
--- /dev/null
+++ b/types/dialogflow/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",
+        "dialogflow-tests.ts"
+    ]
+}
diff --git a/types/dialogflow/tslint.json b/types/dialogflow/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/dialogflow/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/dnssd/dnssd-tests.ts b/types/dnssd/dnssd-tests.ts
index 14b637d384..0fa7498bb2 100644
--- a/types/dnssd/dnssd-tests.ts
+++ b/types/dnssd/dnssd-tests.ts
@@ -1,6 +1,6 @@
 import * as dnssd from 'dnssd';
 
-const serviceType = new dnssd.ServiceType(dnssd.tcp('_mqtt'), dnssd.udp('_mqtt'));
+const serviceType = dnssd.ServiceType.tcp('_mqtt', '_mqtt._udp');
 
 const advertisement = new dnssd.Advertisement(serviceType, 1883, { name: 'broker' });
 const browser: dnssd.Browser = new dnssd.Browser(serviceType);
diff --git a/types/dnssd/index.d.ts b/types/dnssd/index.d.ts
index 9c66a6d6a4..8ef8aa84fd 100644
--- a/types/dnssd/index.d.ts
+++ b/types/dnssd/index.d.ts
@@ -1,30 +1,40 @@
-// Type definitions for dnssd 0.3
+// Type definitions for dnssd 0.4
 // Project: https://github.com/DeMille/dnssd.js#readme
 // Definitions by: Angel Merino <https://github.com/angelmerino>
+//                 Max Rumpf <https://github.com/Maxr1998>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 /// <reference types="node" />
 import { EventEmitter } from 'events';
 
 /** Declaration file generated by dts-gen */
 
-export class Advertisement {
-    constructor(type: any, port: any, ...args: any[]);
+export class Advertisement extends EventEmitter {
+    constructor(type: string | string[] | ServiceType, port: number, ...args: any[]);
 
-    start(): any;
+    start(): Advertisement;
 
-    stop(forceImmediate: any, callback: any): void;
+    stop(forceImmediate?: boolean, callback?: () => any): void;
 
     updateTXT(txtObj: any): void;
 }
 
+export class Options {
+    name?: string;
+    host?: string;
+    txt?: any;
+    subtypes?: string[];
+    interface?: string;
+}
+
 /**
  * A service entry as returned by serviceUp
  */
 export class Service {
     fullname: string;         // 'InstanceName._googlecast._tcp.local.'
     name: string;             // 'InstanceName'
-    type: SType;              // { name: 'googlecast'; protocol: 'tcp' }
+    type: ServiceType;        // { name: 'googlecast'; protocol: 'tcp' }
     domain: string;           // 'local'
     host: string;             // 'Hostname.local.'
     port: number;             // 8009
@@ -33,47 +43,47 @@ export class Service {
     txtRaw: any;
 }
 
-export class SType {
+export class ServiceType {
+    constructor(...args: Array<string | string[]>)
+    constructor(args: ServiceType);
+
     name: string;
     protocol: string;
+    subtypes: string[];
+
+    toString(): string;
+
+    static all(): ServiceType;
+
+    static tcp(...args: string[]): ServiceType;
+
+    static udp(...args: string[]): ServiceType;
 }
 
 export class Browser extends EventEmitter {
-    constructor(type: any, ...args: any[]);
+    constructor(type: string | string[] | ServiceType, ...args: any[]);
 
-    list(): any;
+    start(): Browser;
 
-    start(): any;
+    stop(): void;
 
-    stop(): any;
+    list(): any[];
 }
 
-export class ServiceType {
-    constructor(...args: any[]);
+export function resolve(name: string, type: string, args: object): Promise<any>;
 
-    toString(): any;
+export function resolve4(name: string, type: string, args: object): Promise<string>;
 
-    static all(): any;
+export function resolve6(name: string, type: string, args: object): Promise<string>;
 
-    static tcp(...args: any[]): any;
+export function resolveSRV(name: string, args: object): Promise<any>;
 
-    static udp(...args: any[]): any;
-}
+export function resolveTXT(name: string, args: object): Promise<any>;
 
-export const resolveA: any;
+export function resolveService(name: string, args: object): Promise<any>;
 
-export const resolveAAAA: any;
+export function tcp(...args: string[]): ServiceType;
 
-export function all(): any;
+export function udp(...args: string[]): ServiceType;
 
-export function resolve(name: any, type: any, ...args: any[]): any;
-
-export function resolveSRV(name: any, opts: any): any;
-
-export function resolveService(name: any, ...args: any[]): any;
-
-export function resolveTXT(name: any, opts: any): any;
-
-export function tcp(...args: any[]): any;
-
-export function udp(...args: any[]): any;
+export function all(): ServiceType;
diff --git a/types/dockerode/index.d.ts b/types/dockerode/index.d.ts
index 188643dc28..5c1c1bfae6 100644
--- a/types/dockerode/index.d.ts
+++ b/types/dockerode/index.d.ts
@@ -962,11 +962,11 @@ declare class Dockerode {
   pull(repoTag: string, options: {}, callback: Callback<any>, auth?: {}): Dockerode.Image;
   pull(repoTag: string, options: {}, auth?: {}): Promise<any>;
 
-  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions: {}, startOptions: {}, callback: Callback<any>): events.EventEmitter;
-  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, startOptions: {}, callback: Callback<any>): events.EventEmitter;
-  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, callback: Callback<any>): events.EventEmitter;
-  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions: {}, callback: Callback<any>): events.EventEmitter;
-  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream, createOptions?: {}, startOptions?: {}): Promise<any>;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], createOptions: {}, startOptions: {}, callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], startOptions: {}, callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], createOptions: {}, callback: Callback<any>): events.EventEmitter;
+  run(image: string, cmd: string[], outputStream: NodeJS.WritableStream | NodeJS.WritableStream[], createOptions?: {}, startOptions?: {}): Promise<any>;
 
   swarmInit(options: {}, callback: Callback<any>): void;
   swarmInit(options: {}): Promise<any>;
diff --git a/types/document-ready/document-ready-tests.ts b/types/document-ready/document-ready-tests.ts
new file mode 100644
index 0000000000..17c522f1a3
--- /dev/null
+++ b/types/document-ready/document-ready-tests.ts
@@ -0,0 +1,4 @@
+import ready = require("document-ready");
+ready(() => {
+    // on load
+});
diff --git a/types/document-ready/index.d.ts b/types/document-ready/index.d.ts
new file mode 100644
index 0000000000..6d8c6d7499
--- /dev/null
+++ b/types/document-ready/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for document-ready 2.0
+// Project: https://github.com/bendrucker/document-ready#readme
+// Definitions by: Jack Works <https://github.com/Jack-Works>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function ready(callback: () => void): void;
+export = ready;
diff --git a/types/document-ready/tsconfig.json b/types/document-ready/tsconfig.json
new file mode 100644
index 0000000000..15ce7ad650
--- /dev/null
+++ b/types/document-ready/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",
+        "document-ready-tests.ts"
+    ]
+}
diff --git a/types/document-ready/tslint.json b/types/document-ready/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/document-ready/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/documentdb/index.d.ts b/types/documentdb/index.d.ts
index e7962ba568..118881a378 100644
--- a/types/documentdb/index.d.ts
+++ b/types/documentdb/index.d.ts
@@ -802,7 +802,7 @@ export class DocumentClient {
      * @param [options]      - Represents the feed options.
      * @returns              - An instance of queryIterator to handle reading feed.
      */
-    queryDocuments<TDocument>(collectionLink: string, query: DocumentQuery, options?: FeedOptions): QueryIterator<RetrievedDocument>;
+    queryDocuments<TDocument>(collectionLink: string, query: DocumentQuery, options?: FeedOptions): QueryIterator<RetrievedDocument & TDocument>;
 
     /**
      * Query the triggers for the collection.
diff --git a/types/dom-clipboard-api/dom-clipboard-api-tests.ts b/types/dom-clipboard-api/dom-clipboard-api-tests.ts
new file mode 100644
index 0000000000..9b0731d8f4
--- /dev/null
+++ b/types/dom-clipboard-api/dom-clipboard-api-tests.ts
@@ -0,0 +1,16 @@
+const clipboard = navigator.clipboard;
+
+let text: string;
+
+clipboard.writeText('foo');
+clipboard.readText().then((val) => {
+    text = val;
+});
+
+const transfer = new DataTransfer();
+transfer.setData('text/plain', 'foo');
+
+clipboard.write(transfer);
+clipboard.read().then((tf) => {
+    text = tf.getData('text/plain');
+});
diff --git a/types/dom-clipboard-api/index.d.ts b/types/dom-clipboard-api/index.d.ts
new file mode 100644
index 0000000000..1af5f2c60a
--- /dev/null
+++ b/types/dom-clipboard-api/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for w3c Clipboard API 1.0
+// Project: https://w3c.github.io/clipboard-apis/
+// Definitions by: James Garbutt <https://github.com/43081j>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Clipboard extends EventTarget {
+  read(): Promise<DataTransfer>;
+  readText(): Promise<string>;
+  write(data: DataTransfer): Promise<void>;
+  writeText(data: string): Promise<void>;
+}
+
+interface Navigator {
+  readonly clipboard: Clipboard;
+}
diff --git a/types/dom-clipboard-api/tsconfig.json b/types/dom-clipboard-api/tsconfig.json
new file mode 100644
index 0000000000..230c5f16f6
--- /dev/null
+++ b/types/dom-clipboard-api/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",
+        "dom-clipboard-api-tests.ts"
+    ]
+}
diff --git a/types/react-dnd-html5-backend/tslint.json b/types/dom-clipboard-api/tslint.json
similarity index 56%
rename from types/react-dnd-html5-backend/tslint.json
rename to types/dom-clipboard-api/tslint.json
index bf6102640b..495d29983d 100644
--- a/types/react-dnd-html5-backend/tslint.json
+++ b/types/dom-clipboard-api/tslint.json
@@ -1,7 +1,5 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "no-namespace": false
     }
 }
diff --git a/types/dom4/index.d.ts b/types/dom4/index.d.ts
index 90c9c29966..47a7080a0c 100644
--- a/types/dom4/index.d.ts
+++ b/types/dom4/index.d.ts
@@ -60,11 +60,11 @@ interface Element extends ParentNode {
     matches(selectors: string): boolean;
 }
 
-interface Elements extends ElementTraversal, ParentNode, Array<Element> {
+interface Elements extends ParentNode, Array<Element> {
 }
 
-interface Document extends ElementTraversal, ParentNode {
+interface Document extends ParentNode {
 }
 
-interface DocumentFragment extends ElementTraversal, ParentNode {
+interface DocumentFragment extends ParentNode {
 }
diff --git a/types/domready/domready-tests.ts b/types/domready/domready-tests.ts
index 01be4213f4..6c5e126bf3 100644
--- a/types/domready/domready-tests.ts
+++ b/types/domready/domready-tests.ts
@@ -1,5 +1,5 @@
 import domready = require("domready");
 
-domready(function () {
+domready(() => {
   // dom is loaded!
-})
\ No newline at end of file
+});
diff --git a/types/domready/index.d.ts b/types/domready/index.d.ts
index 9548757894..6f9ea3a0a7 100644
--- a/types/domready/index.d.ts
+++ b/types/domready/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for domready
+// Type definitions for domready 1.0
 // Project: https://github.com/ded/domready
 // Definitions by: Christian Holm Nielsen <https://github.com/dotnetnerd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function domready(callback: () => any) : void;
+declare function domready(callback: () => void): void;
 
 export = domready;
-export as namespace domready;
\ No newline at end of file
+export as namespace domready;
diff --git a/types/domready/tsconfig.json b/types/domready/tsconfig.json
index 1495d185a6..4b4263f4b1 100644
--- a/types/domready/tsconfig.json
+++ b/types/domready/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",
         "domready-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/domready/tslint.json b/types/domready/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/domready/tslint.json
+++ b/types/domready/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/doubleclick-gpt/doubleclick-gpt-tests.ts b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
index 941ad3c260..9218408268 100644
--- a/types/doubleclick-gpt/doubleclick-gpt-tests.ts
+++ b/types/doubleclick-gpt/doubleclick-gpt-tests.ts
@@ -69,6 +69,10 @@ googletag.pubads().definePassback("/1234567/sports", [468, 60])
         .setTagForChildDirectedTreatment(1)
         .display();
 
+googletag.pubads().definePassback('/1234567/sports', [468, 60])
+        .setTagForUnderAgeOfConsent(1)
+        .display();
+
 googletag.pubads().definePassback("/1234567/sports", [468, 60]).
         setTargeting("color", "red").
         setTargeting("sport", ["rugby", "rowing"]).
@@ -79,6 +83,13 @@ googletag.pubads().definePassback("/1234567/sports", [160, 600]).
                                                     "interests": ["sports", "music", "movies"]}).
             display();
 
+googletag.pubads().enableLazyLoad();
+googletag.pubads().enableLazyLoad({
+    fetchMarginPercent: 500,
+    renderMarginPercent: 200,
+    mobileScaling: 2.0
+});
+
 // The calls to construct an ad and display contents.
 slot1 = googletag.pubads().display("/1234567/sports", [728, 90], "div-1");
 slot2 = googletag.pubads().display("/1234567/news", [160, 600], "div-2");
@@ -107,6 +118,13 @@ googletag.pubads().setTagForChildDirectedTreatment(1);
 // Clear child-directed setting and return to initial not-set value.
 googletag.pubads().clearTagForChildDirectedTreatment();
 
+// Mark ad requests as coming from users under the age of consent.
+googletag.pubads().setTagForUnderAgeOfConsent(1);
+
+// Clear the tag value that configures whether to mark ad requests as
+// coming from users under the age of consent.
+googletag.pubads().setTagForUnderAgeOfConsent();
+
 googletag.pubads().setTargeting("interests", "sports");
 googletag.pubads().setTargeting("colors", "blue");
 googletag.pubads().setTargeting("fruits", "apple");
@@ -435,3 +453,6 @@ googletag.pubads().display("/1234567/science", [300, 250], new HTMLElement());
 // A named size can be a string or an array of strings.
 googletag.pubads().display("/1234567/science/physics", [[300, 250], "fluid"], "div-1");
 googletag.pubads().display("/1234567/science/physics", [[300, 250], ["fluid"]], "div-1");
+
+// Request non-personalized ads
+googletag.pubads().setRequestNonPersonalizedAds(1);
diff --git a/types/doubleclick-gpt/index.d.ts b/types/doubleclick-gpt/index.d.ts
index 10e20cccd1..ab71cdc99a 100644
--- a/types/doubleclick-gpt/index.d.ts
+++ b/types/doubleclick-gpt/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Publisher Tag v172
+// Type definitions for Google Publisher Tag v238
 // Project: https://developers.google.com/doubleclick-gpt/reference
 // Definitions by: John Wright <https://github.com/johngeorgewright>
 //                 Steven Joyce <https://github.com/steven-joyce>
@@ -40,6 +40,12 @@ declare namespace googletag {
         setContent(slot: Slot, content: String): void;
     }
 
+    export interface LazyLoadOptionsConfig {
+        fetchMarginPercent?: number,
+        renderMarginPercent?: number,
+        mobileScaling?: number
+    }
+
     export interface ResponseInformation {
         advertiserId: string;
         campaignId: string;
@@ -101,6 +107,7 @@ declare namespace googletag {
         setClickUrl(url: string): PassbackSlot;
         setForceSafeFrame(forceSafeFrame: boolean): PassbackSlot;
         setTagForChildDirectedTreatment(value: number): PassbackSlot;
+        setTagForUnderAgeOfConsent(value: number): PassbackSlot;
         setTargeting(key: string, value: string | string[]): PassbackSlot;
         updateTargetingFromMap(map: Object): PassbackSlot;
     }
@@ -116,6 +123,7 @@ declare namespace googletag {
         disableInitialLoad(): void;
         display(adUnitPath: string, size: GeneralSize, opt_div?: string | Element, opt_clickUrl?: string): Slot;
         enableAsyncRendering(): boolean;
+        enableLazyLoad(opt_config?: LazyLoadOptionsConfig): void;
         enableSingleRequest(): boolean;
         enableSyncRendering(): boolean;
         enableVideoAds(): void;
@@ -131,8 +139,10 @@ declare namespace googletag {
         setForceSafeFrame(forceSafeFrame: boolean): PubAdsService;
         setLocation(latitudeOrAddress: string | number, opt_longitude?: number, opt_radius?: number): PubAdsService;
         setPublisherProvidedId(ppid: string): PubAdsService;
+        setRequestNonPersonalizedAds(nonPersonalizedAds: 0 | 1): PubAdsService;
         setSafeFrameConfig(config: SafeFrameConfig): PubAdsService;
         setTagForChildDirectedTreatment(value: number): PubAdsService;
+        setTagForUnderAgeOfConsent(opt_value?: number): PubAdsService;
         setTargeting(key: string, value: string | string[]): PubAdsService;
         setVideoContent(videoContentId: string, videoCmsId: string): void;
         updateCorrelator(): PubAdsService;
diff --git a/types/downloadjs/downloadjs-tests.ts b/types/downloadjs/downloadjs-tests.ts
index 00bb5395ef..da110af46d 100644
--- a/types/downloadjs/downloadjs-tests.ts
+++ b/types/downloadjs/downloadjs-tests.ts
@@ -7,6 +7,6 @@ download(new Blob(['hello world']), 'dlTextBlob.txt', 'text/plain');
 
 download('/robots.txt');
 
-download(document.documentElement.outerHTML, 'dlHTML.html', 'text/html');
+download(document.documentElement!.outerHTML, 'dlHTML.html', 'text/html');
 download(new Blob(['hello world'.bold()]), 'dlHtmlBlob.html', 'text/html');
 download('/diff6.png');
diff --git a/types/draft-js/draft-js-tests.tsx b/types/draft-js/draft-js-tests.tsx
index 857671d13d..c0c64256fd 100644
--- a/types/draft-js/draft-js-tests.tsx
+++ b/types/draft-js/draft-js-tests.tsx
@@ -1,6 +1,5 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import { Map } from "immutable";
 
 import {
   ContentBlock,
@@ -48,154 +47,141 @@ class HandleSpan extends React.Component {
 }
 
 class RichEditorExample extends React.Component<{}, { editorState: EditorState }> {
-  constructor() {
-    super({});
+    static initState() {
+        const sampleMarkup =
+            '<b>Bold text</b>, <i>Italic text</i><br/ ><br />' +
+            '<a href="http://www.facebook.com">Example link</a><br /><br/ >' +
+            '<img src="image.png" height="112" width="200" />';
+        const blocksFromHTML = convertFromHTML(sampleMarkup);
+        const state = ContentState.createFromBlockArray(blocksFromHTML.contentBlocks, blocksFromHTML.entityMap);
+        const decorator = new CompositeDecorator([
+            {
+                strategy: (
+                    block: ContentBlock,
+                    callback: (start: number, end: number) => void,
+                    contentState: ContentState
+                ) => {
+                    const text = block.getText();
+                    let matchArr, start;
+                    while ((matchArr = HANDLE_REGEX.exec(text)) !== null) {
+                        start = matchArr.index;
+                        callback(start, start + matchArr[0].length);
+                    }
+                },
+                component: HandleSpan
+            }
+        ]);
+        return { editorState: EditorState.createWithContent(state, decorator) };
+    }
+    state = RichEditorExample.initState()
 
-    const sampleMarkup =
-      '<b>Bold text</b>, <i>Italic text</i><br/ ><br />' +
-      '<a href="http://www.facebook.com">Example link</a><br /><br/ >' +
-      '<img src="image.png" height="112" width="200" />';
-    const blocksFromHTML = convertFromHTML(sampleMarkup);
-    const state = ContentState.createFromBlockArray(
-      blocksFromHTML.contentBlocks,
-      blocksFromHTML.entityMap,
-    );
-    const decorator = new CompositeDecorator([{
-      strategy: (
-        block: ContentBlock,
-        callback: (start: number, end: number) => void,
-        contentState: ContentState
-      ) => {
-        const text = block.getText();
-        let matchArr, start;
-        while ((matchArr = HANDLE_REGEX.exec(text)) !== null) {
-          start = matchArr.index;
-          callback(start, start + matchArr[0].length);
+    onChange: (editorState: EditorState) => void = (editorState: EditorState) => this.setState({ editorState });
+
+    keyBindingFn(e: SyntheticKeyboardEvent): string {
+        if (e.keyCode === KEYCODES.ENTER) {
+            const { editorState } = this.state;
+            const contentState = editorState.getCurrentContent();
+            const selectionState = editorState.getSelection();
+
+            // only split headers into header and unstyled if we press 'Enter'
+            // at the end of a header (without text selected)
+            if (selectionState.isCollapsed()) {
+                const endKey = selectionState.getEndKey();
+                const endOffset = selectionState.getEndOffset();
+                const endBlock = contentState.getBlockForKey(endKey);
+                if (isHeaderBlock(endBlock) && endOffset === endBlock.getText().length) {
+                    return SPLIT_HEADER_BLOCK;
+                }
+            }
         }
-      },
-      component: HandleSpan,
-    }]);
-    this.state = { editorState: EditorState.createWithContent(state, decorator) };
-  }
 
-  onChange: (editorState: EditorState) => void = (editorState: EditorState) => this.setState({ editorState });
+        return getDefaultKeyBinding(e);
+    }
 
-  keyBindingFn(e: SyntheticKeyboardEvent): string {
-    if (e.keyCode === KEYCODES.ENTER) {
-      const { editorState } = this.state;
-      const contentState = editorState.getCurrentContent();
-      const selectionState = editorState.getSelection();
-
-      // only split headers into header and unstyled if we press 'Enter'
-      // at the end of a header (without text selected)
-      if (selectionState.isCollapsed()) {
-        const endKey = selectionState.getEndKey();
-        const endOffset = selectionState.getEndOffset();
-        const endBlock = contentState.getBlockForKey(endKey);
-        if (isHeaderBlock(endBlock) && endOffset === endBlock.getText().length) {
-          return SPLIT_HEADER_BLOCK;
+    handleKeyCommand = (command: string, editorState: EditorState) => {
+        if (command === SPLIT_HEADER_BLOCK) {
+            this.onChange(this.splitHeaderToNewBlock());
+            return 'handled';
         }
-      }
+
+        const newState = RichUtils.handleKeyCommand(editorState, command);
+
+        if (newState) {
+            this.onChange(newState);
+            return 'handled';
+        }
+
+        return 'not-handled';
+    };
+
+    toggleBlockType: (blockType: string) => void = (blockType: string) => {
+        this.onChange(RichUtils.toggleBlockType(this.state.editorState, blockType));
+    };
+
+    toggleInlineStyle: (inlineStyle: string) => void = (inlineStyle: string) => {
+        this.onChange(RichUtils.toggleInlineStyle(this.state.editorState, inlineStyle));
+    };
+
+    splitHeaderToNewBlock(): EditorState {
+        const { editorState } = this.state;
+        const selection = editorState.getSelection();
+
+        // Add a new block after the cursor
+        const contentWithBlock = Modifier.splitBlock(editorState.getCurrentContent(), selection);
+
+        // Change the new block type to be normal 'unstyled' text,
+        const newBlock = contentWithBlock.getBlockAfter(selection.getEndKey());
+        const contentWithUnstyledBlock = Modifier.setBlockType(
+            contentWithBlock,
+            SelectionState.createEmpty(newBlock.getKey()),
+            'unstyled'
+        );
+
+        // push the new state with 'insert-characters' to preserve the undo/redo stack
+        const stateWithNewline = EditorState.push(editorState, contentWithUnstyledBlock, 'insert-characters');
+
+        // manually move the cursor to the next line (as expected)
+        const nextState = EditorState.forceSelection(stateWithNewline, SelectionState.createEmpty(newBlock.getKey()));
+
+        return nextState;
     }
 
-    return getDefaultKeyBinding(e);
-  }
+    render(): React.ReactElement<{}> {
+        // If the user changes block type before entering any text, we can
+        // either style the placeholder or hide it. Let's just hide it now.
+        let className = 'RichEditor-editor';
+        var contentState = this.state.editorState.getCurrentContent();
+        if (!contentState.hasText()) {
+            if (
+                contentState
+                    .getBlockMap()
+                    .first()
+                    .getType() !== 'unstyled'
+            ) {
+                className += ' RichEditor-hidePlaceholder';
+            }
+        }
 
-  handleKeyCommand = (command: string, editorState: EditorState) => {
-    if (command === SPLIT_HEADER_BLOCK) {
-      this.onChange(this.splitHeaderToNewBlock());
-      return 'handled';
-    }
-
-    const newState = RichUtils.handleKeyCommand(editorState, command);
-
-    if (newState) {
-      this.onChange(newState);
-      return "handled";
-    }
-
-    return "not-handled";
-    }
-
-  toggleBlockType: (blockType: string) => void = (blockType: string) => {
-    this.onChange(RichUtils.toggleBlockType(this.state.editorState, blockType));
-    }
-
-  toggleInlineStyle: (inlineStyle: string) => void = (inlineStyle: string) => {
-    this.onChange(RichUtils.toggleInlineStyle(this.state.editorState, inlineStyle));
-  }
-
-  splitHeaderToNewBlock(): EditorState {
-      const { editorState } = this.state;
-      const selection = editorState.getSelection();
-
-      // Add a new block after the cursor
-      const contentWithBlock = Modifier.splitBlock(
-        editorState.getCurrentContent(),
-        selection,
-      );
-
-      // Change the new block type to be normal 'unstyled' text,
-      const newBlock = contentWithBlock.getBlockAfter(selection.getEndKey());
-      const contentWithUnstyledBlock = Modifier.setBlockType(
-        contentWithBlock,
-        SelectionState.createEmpty(newBlock.getKey()),
-        'unstyled',
-      );
-
-      // push the new state with 'insert-characters' to preserve the undo/redo stack
-      const stateWithNewline = EditorState.push(
-        editorState,
-        contentWithUnstyledBlock,
-        'insert-characters'
-      );
-
-      // manually move the cursor to the next line (as expected)
-      const nextState = EditorState.forceSelection(
-        stateWithNewline,
-        SelectionState.createEmpty(newBlock.getKey()),
-      );
-
-      return nextState;
-  }
-
-  render(): React.ReactElement<{}> {
-    // If the user changes block type before entering any text, we can
-    // either style the placeholder or hide it. Let's just hide it now.
-    let className = 'RichEditor-editor';
-    var contentState = this.state.editorState.getCurrentContent();
-    if (!contentState.hasText()) {
-      if (contentState.getBlockMap().first().getType() !== 'unstyled') {
-        className += ' RichEditor-hidePlaceholder';
-      }
-    }
-
-            return (
-      <div className="RichEditor-root">
-        <BlockStyleControls
-          editorState={this.state.editorState}
-          onToggle={this.toggleBlockType}
-          />
-        <InlineStyleControls
-          editorState={this.state.editorState}
-          onToggle={this.toggleInlineStyle}
-          />
-        <div className={className}>
-          <Editor
-            blockStyleFn={getBlockStyle}
-            customStyleMap={styleMap}
-            editorState={this.state.editorState}
-            keyBindingFn={this.keyBindingFn}
-            handleKeyCommand={this.handleKeyCommand}
-            onChange={this.onChange}
-            placeholder="Tell a story..."
-            ref="editor"
-            spellCheck={true}
-            />
-        </div>
+        return (
+            <div className="RichEditor-root">
+                <BlockStyleControls editorState={this.state.editorState} onToggle={this.toggleBlockType} />
+                <InlineStyleControls editorState={this.state.editorState} onToggle={this.toggleInlineStyle} />
+                <div className={className}>
+                    <Editor
+                        blockStyleFn={getBlockStyle}
+                        customStyleMap={styleMap}
+                        editorState={this.state.editorState}
+                        keyBindingFn={this.keyBindingFn}
+                        handleKeyCommand={this.handleKeyCommand}
+                        onChange={this.onChange}
+                        placeholder="Tell a story..."
+                        ref="editor"
+                        spellCheck={true}
+                    />
                 </div>
-            );
-        }
+            </div>
+        );
+    }
 }
 
 // Custom overrides for "code" style.
diff --git a/types/draft-js/index.d.ts b/types/draft-js/index.d.ts
index 4064c9b8a0..06cb8f55f2 100644
--- a/types/draft-js/index.d.ts
+++ b/types/draft-js/index.d.ts
@@ -9,7 +9,7 @@
 //                 Santiago Vilar <https://github.com/smvilar>
 //                 Ulf Schwekendiek <https://github.com/sulf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as Immutable from 'immutable';
diff --git a/types/dts-generator/index.d.ts b/types/dts-generator/index.d.ts
index 5ef99eb2b0..d4d730850c 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.3
+// TypeScript Version: 2.8
 
 import ts = require('typescript');
 import Bluebird = require('bluebird');
diff --git a/types/duplicate-package-checker-webpack-plugin/duplicate-package-checker-webpack-plugin-tests.ts b/types/duplicate-package-checker-webpack-plugin/duplicate-package-checker-webpack-plugin-tests.ts
index 0552f0e7c4..27eb651287 100644
--- a/types/duplicate-package-checker-webpack-plugin/duplicate-package-checker-webpack-plugin-tests.ts
+++ b/types/duplicate-package-checker-webpack-plugin/duplicate-package-checker-webpack-plugin-tests.ts
@@ -18,7 +18,12 @@ const c: webpack.Configuration = {
     plugins: [
         new DuplicatePackageCheckerWebpackPlugin({
             verbose: true,
-            emitError: true
+            emitError: true,
+            showHelp: false,
+            strict: false,
+            exclude(instance) {
+                return instance.name === "fbjs";
+            }
         })
     ]
 };
diff --git a/types/duplicate-package-checker-webpack-plugin/index.d.ts b/types/duplicate-package-checker-webpack-plugin/index.d.ts
index 1eff56e9d5..cadb922c1a 100644
--- a/types/duplicate-package-checker-webpack-plugin/index.d.ts
+++ b/types/duplicate-package-checker-webpack-plugin/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for duplicate-package-checker-webpack-plugin 1.2
+// Type definitions for duplicate-package-checker-webpack-plugin 2.1
 // Project: https://github.com/darrenscerri/duplicate-package-checker-webpack-plugin#readme
 // Definitions by: Matt Traynham <https://github.com/mtraynham>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -13,10 +13,36 @@ declare class DuplicatePackageCheckerWebpackPlugin extends Plugin {
 }
 
 declare namespace DuplicatePackageCheckerWebpackPlugin {
+    /** The properties of the instance of a package */
+    interface PackageInstanceProperties {
+        /** The name of the package */
+        name: string;
+        /** The version of the package */
+        version: string;
+        /** Absolute path to the package */
+        path: string;
+        /** Absolute path to the module that requested the package */
+        issuer?: string;
+    }
+
+    /** The configurable options for the plugin */
     interface Options {
-        // Also show module that is requiring each duplicate package
+        /** Also show module that is requiring each duplicate package (default: false) */
         verbose?: boolean;
-        // Emit errors instead of warnings
+        /** Emit errors instead of warnings (default: false) */
         emitError?: boolean;
+        /** Show help message if duplicate packages are found (default: true) */
+        showHelp?: boolean;
+        /** Warn also if major versions differ (default: true) */
+        strict?: boolean;
+
+        /**
+         * Exclude instances of packages from the results.
+         * If all instances of a package are excluded, or all instances except one,
+         * then the package is no longer considered duplicated and won't be emitted as a warning/error.
+         * @param instance The instance of a package being evaluated for exclusion.
+         * @returns true to exclude the instance, false otherwise
+         */
+        exclude?: (instance: PackageInstanceProperties) => boolean;
     }
 }
diff --git a/types/dygraphs/index.d.ts b/types/dygraphs/index.d.ts
index 4a4a9f0492..1e075d7ba9 100644
--- a/types/dygraphs/index.d.ts
+++ b/types/dygraphs/index.d.ts
@@ -21,6 +21,11 @@ declare namespace dygraphs {
          * A per-series color definition. Used in conjunction with, and overrides, the colors option.
          */
         color?: string;
+                
+        /**
+         * A function which plot data for this series on the chart.         
+         */
+        plotter?: any;
 
         /**
          * Draw a small dot at each point, in addition to a line going through the point. This makes
diff --git a/types/eases/backIn.d.ts b/types/eases/backIn.d.ts
new file mode 100644
index 0000000000..8681c8ae58
--- /dev/null
+++ b/types/eases/backIn.d.ts
@@ -0,0 +1,2 @@
+import { backIn } from "./index";
+export = backIn;
diff --git a/types/eases/backInOut.d.ts b/types/eases/backInOut.d.ts
new file mode 100644
index 0000000000..e6957de807
--- /dev/null
+++ b/types/eases/backInOut.d.ts
@@ -0,0 +1,2 @@
+import { backInOut } from "./index";
+export = backInOut;
diff --git a/types/eases/backOut.d.ts b/types/eases/backOut.d.ts
new file mode 100644
index 0000000000..b8b6ab6f4c
--- /dev/null
+++ b/types/eases/backOut.d.ts
@@ -0,0 +1,2 @@
+import { backOut } from "./index";
+export = backOut;
diff --git a/types/eases/bounceIn.d.ts b/types/eases/bounceIn.d.ts
new file mode 100644
index 0000000000..a1499f174a
--- /dev/null
+++ b/types/eases/bounceIn.d.ts
@@ -0,0 +1,2 @@
+import { bounceIn } from "./index";
+export = bounceIn;
diff --git a/types/eases/bounceInOut.d.ts b/types/eases/bounceInOut.d.ts
new file mode 100644
index 0000000000..0aade79df0
--- /dev/null
+++ b/types/eases/bounceInOut.d.ts
@@ -0,0 +1,2 @@
+import { bounceInOut } from "./index";
+export = bounceInOut;
diff --git a/types/eases/bounceOut.d.ts b/types/eases/bounceOut.d.ts
new file mode 100644
index 0000000000..c32227373c
--- /dev/null
+++ b/types/eases/bounceOut.d.ts
@@ -0,0 +1,2 @@
+import { bounceOut } from "./index";
+export = bounceOut;
diff --git a/types/eases/circIn.d.ts b/types/eases/circIn.d.ts
new file mode 100644
index 0000000000..6cc5fee6ed
--- /dev/null
+++ b/types/eases/circIn.d.ts
@@ -0,0 +1,2 @@
+import { circIn } from "./index";
+export = circIn;
diff --git a/types/eases/circInOut.d.ts b/types/eases/circInOut.d.ts
new file mode 100644
index 0000000000..29f480688a
--- /dev/null
+++ b/types/eases/circInOut.d.ts
@@ -0,0 +1,2 @@
+import { circInOut } from "./index";
+export = circInOut;
diff --git a/types/eases/circOut.d.ts b/types/eases/circOut.d.ts
new file mode 100644
index 0000000000..39be74ff36
--- /dev/null
+++ b/types/eases/circOut.d.ts
@@ -0,0 +1,2 @@
+import { circOut } from "./index";
+export = circOut;
diff --git a/types/eases/cubicIn.d.ts b/types/eases/cubicIn.d.ts
new file mode 100644
index 0000000000..92455161df
--- /dev/null
+++ b/types/eases/cubicIn.d.ts
@@ -0,0 +1,2 @@
+import { cubicIn } from "./index";
+export = cubicIn;
diff --git a/types/eases/cubicInOut.d.ts b/types/eases/cubicInOut.d.ts
new file mode 100644
index 0000000000..1e83ef573f
--- /dev/null
+++ b/types/eases/cubicInOut.d.ts
@@ -0,0 +1,2 @@
+import { cubicInOut } from "./index";
+export = cubicInOut;
diff --git a/types/eases/cubicOut.d.ts b/types/eases/cubicOut.d.ts
new file mode 100644
index 0000000000..aa309e22a6
--- /dev/null
+++ b/types/eases/cubicOut.d.ts
@@ -0,0 +1,2 @@
+import { cubicOut } from "./index";
+export = cubicOut;
diff --git a/types/eases/eases-tests.ts b/types/eases/eases-tests.ts
new file mode 100644
index 0000000000..7dcb0dcc98
--- /dev/null
+++ b/types/eases/eases-tests.ts
@@ -0,0 +1,100 @@
+import eases = require("eases");
+import backInOut = require("eases/backInOut");
+import backIn = require("eases/backIn");
+import backOut = require("eases/backOut");
+import bounceInOut = require("eases/bounceInOut");
+import bounceIn = require("eases/bounceIn");
+import bounceOut = require("eases/bounceOut");
+import circInOut = require("eases/circInOut");
+import circIn = require("eases/circIn");
+import circOut = require("eases/circOut");
+import cubicInOut = require("eases/cubicInOut");
+import cubicIn = require("eases/cubicIn");
+import cubicOut = require("eases/cubicOut");
+import elasticInOut = require("eases/elasticInOut");
+import elasticIn = require("eases/elasticIn");
+import elasticOut = require("eases/elasticOut");
+import expoInOut = require("eases/expoInOut");
+import expoIn = require("eases/expoIn");
+import expoOut = require("eases/expoOut");
+import linear = require("eases/linear");
+import quadInOut = require("eases/quadInOut");
+import quadIn = require("eases/quadIn");
+import quadOut = require("eases/quadOut");
+import quartInOut = require("eases/quartInOut");
+import quartIn = require("eases/quartIn");
+import quartOut = require("eases/quartOut");
+import quintInOut = require("eases/quintInOut");
+import quintIn = require("eases/quintIn");
+import quintOut = require("eases/quintOut");
+import sineInOut = require("eases/sineInOut");
+import sineIn = require("eases/sineIn");
+import sineOut = require("eases/sineOut");
+
+{
+    eases.backInOut(0.5); // $ExpectType number
+    eases.backIn(0.5); // $ExpectType number
+    eases.backOut(0.5); // $ExpectType number
+    eases.bounceInOut(0.5); // $ExpectType number
+    eases.bounceIn(0.5); // $ExpectType number
+    eases.bounceOut(0.5); // $ExpectType number
+    eases.circInOut(0.5); // $ExpectType number
+    eases.circIn(0.5); // $ExpectType number
+    eases.circOut(0.5); // $ExpectType number
+    eases.cubicInOut(0.5); // $ExpectType number
+    eases.cubicIn(0.5); // $ExpectType number
+    eases.cubicOut(0.5); // $ExpectType number
+    eases.elasticInOut(0.5); // $ExpectType number
+    eases.elasticIn(0.5); // $ExpectType number
+    eases.elasticOut(0.5); // $ExpectType number
+    eases.expoInOut(0.5); // $ExpectType number
+    eases.expoIn(0.5); // $ExpectType number
+    eases.expoOut(0.5); // $ExpectType number
+    eases.linear(0.5); // $ExpectType number
+    eases.quadInOut(0.5); // $ExpectType number
+    eases.quadIn(0.5); // $ExpectType number
+    eases.quadOut(0.5); // $ExpectType number
+    eases.quartInOut(0.5); // $ExpectType number
+    eases.quartIn(0.5); // $ExpectType number
+    eases.quartOut(0.5); // $ExpectType number
+    eases.quintInOut(0.5); // $ExpectType number
+    eases.quintIn(0.5); // $ExpectType number
+    eases.quintOut(0.5); // $ExpectType number
+    eases.sineInOut(0.5); // $ExpectType number
+    eases.sineIn(0.5); // $ExpectType number
+    eases.sineOut(0.5); // $ExpectType number
+}
+
+{
+    backInOut(0.5); // $ExpectType number
+    backIn(0.5); // $ExpectType number
+    backOut(0.5); // $ExpectType number
+    bounceInOut(0.5); // $ExpectType number
+    bounceIn(0.5); // $ExpectType number
+    bounceOut(0.5); // $ExpectType number
+    circInOut(0.5); // $ExpectType number
+    circIn(0.5); // $ExpectType number
+    circOut(0.5); // $ExpectType number
+    cubicInOut(0.5); // $ExpectType number
+    cubicIn(0.5); // $ExpectType number
+    cubicOut(0.5); // $ExpectType number
+    elasticInOut(0.5); // $ExpectType number
+    elasticIn(0.5); // $ExpectType number
+    elasticOut(0.5); // $ExpectType number
+    expoInOut(0.5); // $ExpectType number
+    expoIn(0.5); // $ExpectType number
+    expoOut(0.5); // $ExpectType number
+    linear(0.5); // $ExpectType number
+    quadInOut(0.5); // $ExpectType number
+    quadIn(0.5); // $ExpectType number
+    quadOut(0.5); // $ExpectType number
+    quartInOut(0.5); // $ExpectType number
+    quartIn(0.5); // $ExpectType number
+    quartOut(0.5); // $ExpectType number
+    quintInOut(0.5); // $ExpectType number
+    quintIn(0.5); // $ExpectType number
+    quintOut(0.5); // $ExpectType number
+    sineInOut(0.5); // $ExpectType number
+    sineIn(0.5); // $ExpectType number
+    sineOut(0.5); // $ExpectType number
+}
diff --git a/types/eases/elasticIn.d.ts b/types/eases/elasticIn.d.ts
new file mode 100644
index 0000000000..6dd90cb2da
--- /dev/null
+++ b/types/eases/elasticIn.d.ts
@@ -0,0 +1,2 @@
+import { elasticIn } from "./index";
+export = elasticIn;
diff --git a/types/eases/elasticInOut.d.ts b/types/eases/elasticInOut.d.ts
new file mode 100644
index 0000000000..ec9fa9a307
--- /dev/null
+++ b/types/eases/elasticInOut.d.ts
@@ -0,0 +1,2 @@
+import { elasticInOut } from "./index";
+export = elasticInOut;
diff --git a/types/eases/elasticOut.d.ts b/types/eases/elasticOut.d.ts
new file mode 100644
index 0000000000..de7aedafe7
--- /dev/null
+++ b/types/eases/elasticOut.d.ts
@@ -0,0 +1,2 @@
+import { elasticOut } from "./index";
+export = elasticOut;
diff --git a/types/eases/expoIn.d.ts b/types/eases/expoIn.d.ts
new file mode 100644
index 0000000000..fc88cdeda3
--- /dev/null
+++ b/types/eases/expoIn.d.ts
@@ -0,0 +1,2 @@
+import { expoIn } from "./index";
+export = expoIn;
diff --git a/types/eases/expoInOut.d.ts b/types/eases/expoInOut.d.ts
new file mode 100644
index 0000000000..06235ba84b
--- /dev/null
+++ b/types/eases/expoInOut.d.ts
@@ -0,0 +1,2 @@
+import { expoInOut } from "./index";
+export = expoInOut;
diff --git a/types/eases/expoOut.d.ts b/types/eases/expoOut.d.ts
new file mode 100644
index 0000000000..62bda4ab8e
--- /dev/null
+++ b/types/eases/expoOut.d.ts
@@ -0,0 +1,2 @@
+import { expoOut } from "./index";
+export = expoOut;
diff --git a/types/eases/index.d.ts b/types/eases/index.d.ts
new file mode 100644
index 0000000000..ac46def324
--- /dev/null
+++ b/types/eases/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for eases 1.0
+// Project: https://github.com/mattdesl/eases
+// Definitions by: Mathias Paumgarten <https://github.com/MathiasPaumgarten>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface Eases {
+    backInOut(t: number): number;
+	backIn(t: number): number;
+	backOut(t: number): number;
+	bounceInOut(t: number): number;
+	bounceIn(t: number): number;
+	bounceOut(t: number): number;
+	circInOut(t: number): number;
+	circIn(t: number): number;
+	circOut(t: number): number;
+	cubicInOut(t: number): number;
+	cubicIn(t: number): number;
+	cubicOut(t: number): number;
+	elasticInOut(t: number): number;
+	elasticIn(t: number): number;
+	elasticOut(t: number): number;
+	expoInOut(t: number): number;
+	expoIn(t: number): number;
+	expoOut(t: number): number;
+	linear(t: number): number;
+	quadInOut(t: number): number;
+	quadIn(t: number): number;
+	quadOut(t: number): number;
+	quartInOut(t: number): number;
+	quartIn(t: number): number;
+	quartOut(t: number): number;
+	quintInOut(t: number): number;
+	quintIn(t: number): number;
+	quintOut(t: number): number;
+	sineInOut(t: number): number;
+	sineIn(t: number): number;
+	sineOut(t: number): number;
+}
+
+declare const eases: Eases;
+
+export = eases;
+export as namespace eases;
diff --git a/types/eases/linear.d.ts b/types/eases/linear.d.ts
new file mode 100644
index 0000000000..a0f39246a9
--- /dev/null
+++ b/types/eases/linear.d.ts
@@ -0,0 +1,2 @@
+import { linear } from "./index";
+export = linear;
diff --git a/types/eases/quadIn.d.ts b/types/eases/quadIn.d.ts
new file mode 100644
index 0000000000..b91d594fc6
--- /dev/null
+++ b/types/eases/quadIn.d.ts
@@ -0,0 +1,2 @@
+import { quadIn } from "./index";
+export = quadIn;
diff --git a/types/eases/quadInOut.d.ts b/types/eases/quadInOut.d.ts
new file mode 100644
index 0000000000..b41eedae8e
--- /dev/null
+++ b/types/eases/quadInOut.d.ts
@@ -0,0 +1,2 @@
+import { quadInOut } from "./index";
+export = quadInOut;
diff --git a/types/eases/quadOut.d.ts b/types/eases/quadOut.d.ts
new file mode 100644
index 0000000000..2f490d1d7c
--- /dev/null
+++ b/types/eases/quadOut.d.ts
@@ -0,0 +1,2 @@
+import { quadOut } from "./index";
+export = quadOut;
diff --git a/types/eases/quartIn.d.ts b/types/eases/quartIn.d.ts
new file mode 100644
index 0000000000..ae5542ed3b
--- /dev/null
+++ b/types/eases/quartIn.d.ts
@@ -0,0 +1,2 @@
+import { quartIn } from "./index";
+export = quartIn;
diff --git a/types/eases/quartInOut.d.ts b/types/eases/quartInOut.d.ts
new file mode 100644
index 0000000000..8c9eda5461
--- /dev/null
+++ b/types/eases/quartInOut.d.ts
@@ -0,0 +1,2 @@
+import { quartInOut } from "./index";
+export = quartInOut;
diff --git a/types/eases/quartOut.d.ts b/types/eases/quartOut.d.ts
new file mode 100644
index 0000000000..5d164804c5
--- /dev/null
+++ b/types/eases/quartOut.d.ts
@@ -0,0 +1,2 @@
+import { quartOut } from "./index";
+export = quartOut;
diff --git a/types/eases/quintIn.d.ts b/types/eases/quintIn.d.ts
new file mode 100644
index 0000000000..bf2e56cb2f
--- /dev/null
+++ b/types/eases/quintIn.d.ts
@@ -0,0 +1,2 @@
+import { quintIn } from "./index";
+export = quintIn;
diff --git a/types/eases/quintInOut.d.ts b/types/eases/quintInOut.d.ts
new file mode 100644
index 0000000000..eeab23e7e7
--- /dev/null
+++ b/types/eases/quintInOut.d.ts
@@ -0,0 +1,2 @@
+import { quintInOut } from "./index";
+export = quintInOut;
diff --git a/types/eases/quintOut.d.ts b/types/eases/quintOut.d.ts
new file mode 100644
index 0000000000..1a8eed0c0c
--- /dev/null
+++ b/types/eases/quintOut.d.ts
@@ -0,0 +1,2 @@
+import { quintOut } from "./index";
+export = quintOut;
diff --git a/types/eases/sineIn.d.ts b/types/eases/sineIn.d.ts
new file mode 100644
index 0000000000..77a609b4c5
--- /dev/null
+++ b/types/eases/sineIn.d.ts
@@ -0,0 +1,2 @@
+import { sineIn } from "./index";
+export = sineIn;
diff --git a/types/eases/sineInOut.d.ts b/types/eases/sineInOut.d.ts
new file mode 100644
index 0000000000..9328e02617
--- /dev/null
+++ b/types/eases/sineInOut.d.ts
@@ -0,0 +1,2 @@
+import { sineInOut } from "./index";
+export = sineInOut;
diff --git a/types/eases/sineOut.d.ts b/types/eases/sineOut.d.ts
new file mode 100644
index 0000000000..082ef825d7
--- /dev/null
+++ b/types/eases/sineOut.d.ts
@@ -0,0 +1,2 @@
+import { sineOut } from "./index";
+export = sineOut;
diff --git a/types/eases/tsconfig.json b/types/eases/tsconfig.json
new file mode 100644
index 0000000000..1ed08e1b05
--- /dev/null
+++ b/types/eases/tsconfig.json
@@ -0,0 +1,54 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "eases-tests.ts",
+        "backInOut.d.ts",
+        "backIn.d.ts",
+        "backOut.d.ts",
+        "bounceInOut.d.ts",
+        "bounceIn.d.ts",
+        "bounceOut.d.ts",
+        "circInOut.d.ts",
+        "circIn.d.ts",
+        "circOut.d.ts",
+        "cubicInOut.d.ts",
+        "cubicIn.d.ts",
+        "cubicOut.d.ts",
+        "elasticInOut.d.ts",
+        "elasticIn.d.ts",
+        "elasticOut.d.ts",
+        "expoInOut.d.ts",
+        "expoIn.d.ts",
+        "expoOut.d.ts",
+        "linear.d.ts",
+        "quadInOut.d.ts",
+        "quadIn.d.ts",
+        "quadOut.d.ts",
+        "quartInOut.d.ts",
+        "quartIn.d.ts",
+        "quartOut.d.ts",
+        "quintInOut.d.ts",
+        "quintIn.d.ts",
+        "quintOut.d.ts",
+        "sineInOut.d.ts",
+        "sineIn.d.ts",
+        "sineOut.d.ts"
+    ]
+}
diff --git a/types/eases/tslint.json b/types/eases/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/eases/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/echarts/index.d.ts b/types/echarts/index.d.ts
index 15892864e5..dc525231e6 100644
--- a/types/echarts/index.d.ts
+++ b/types/echarts/index.d.ts
@@ -1,122 +1,414 @@
-// Type definitions for echarts
+// Type definitions for echarts 4.1.0
 // Project: http://echarts.baidu.com/
 // Definitions by: Xie Jingyang <https://github.com/xieisabug>
 //                 AntiMoron <https://github.com/AntiMoron>
 //                 Liveangela <https://github.com/liveangela>
+//                 Ovilia <https://github.com/Ovilia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 declare namespace echarts {
-    function init(dom: HTMLDivElement | HTMLCanvasElement, theme?: object | string, opts?: {
-        devicePixelRatio?: number
-        renderer?: string
-        width?: number | string
-        height?: number | string
-    }): ECharts;
+    /**
+     * Creates an ECharts instance, and returns an echartsInstance. You shall
+     *     not initialize multiple ECharts instances on a single container.
+     *
+     * @param {HTMLDivElement | HTMLCanvasElement} dom Instance container,
+     *     usually is a `div` element with height and width defined.
+     * @param {object | string} [theme] Theme to be applied.
+     *     This can be a configuring object of a theme, or a theme name
+     *     registered through [echarts.registerTheme](https://echarts.apache.org/api.html#echarts.registerTheme).
+     * @param {object} [opts] Chart configurations.
+     * @param {number} [opts.devicePixelRatio] Ratio of one physical pixel to
+     *     the size of one device independent pixels. Browser's
+     *     `window.devicePixelRatio` is used by default.
+     * @param {string} [opts.renderer] Supports `'canvas'` or `'svg'`.
+     *     See [Render by Canvas or SVG](https://echarts.apache.org/tutorial.html#Render%20by%20Canvas%20or%20SVG).
+     * @param {number} [opts.width] Specify width explicitly, in pixel.
+     *     If setting to `null`/`undefined`/`'auto'`, width of `dom`
+     *     (instance container) will be used.
+     * @param {number} [opts.height] Specify height explicitly, in pixel.
+     *     If setting to `null`/`undefined`/`'auto'`, height of `dom`
+     *     (instance container) will be used.
+     */
+    function init(
+        dom: HTMLDivElement | HTMLCanvasElement,
+        theme?: object | string,
+        opts?: {
+            devicePixelRatio?: number
+            renderer?: string
+            width?: number | string
+            height?: number | string
+        }
+    ): ECharts
 
-    const graphic: Graphic;
+    /**
+     * Connects interaction of multiple chart series. For example:
+     *
+        ```js
+        // set group id of each instance respectively.
+        chart1.group = 'group1';
+        chart2.group = 'group1';
+        echarts.connect('group1');
+        // or incoming instance array that need to be linked.
+        echarts.connect([chart1, chart2]);
+        ```
+     *
+     * @param group Group id in string, or array of chart instance.
+     */
+    function connect(group: string | ECharts[]): void
 
-    interface Graphic {
-        clipPointsByRect(points: number[][], rect: ERectangle): number[][];
-        clipRectByRect(targetRect: ERectangle, rect: ERectangle): ERectangle;
-        LinearGradient: { new(x: number, y: number, x2: number, y2: number, colorStops: object[], globalCoord?: boolean): LinearGradient }
-    }
+    /**
+     * Disconnects interaction of multiple chart series. To have one single
+     * instance to be removed, you can set `group` of chart instance to be null.
+     *
+     * @param {string} group Group id in string.
+     */
+    function disConnect(group: string): void
 
-    function connect(group: string | string[]): void;
+    /**
+     * Destroys chart instance, after which the instance cannot be used any
+     *     more.
+     *
+     * @param target Chart instance or container.
+     */
+    function dispose(target: ECharts | HTMLDivElement | HTMLCanvasElement)
+        : void
 
-    function disConnect(group: string): void;
+    /**
+     * Returns chart instance of dom container.
+     *
+     * @param target Chart container.
+     */
+    function getInstanceByDom(target: HTMLDivElement | HTMLCanvasElement)
+        : ECharts
 
-    function dispose(target: ECharts | HTMLDivElement | HTMLCanvasElement): void;
+    /**
+     * Registers available maps. This can only be used after including
+     * [geo](https://echarts.apache.org/option.html#geo)
+     * component or chart series of
+     * [map](https://echarts.apache.org/option.html#series-map).
+     *
+     * @param {string} mapName Map name, referring to `map` value set in
+     *     [geo](https://echarts.apache.org/option.html#geo)
+     *     component or
+     *     [map](https://echarts.apache.org/option.html#series-map).
+     * @param {object} geoJson Data in GeoJson format. See
+     *     [http://geojson.org/](http://geojson.org/) for more format information.
+     * @param {object} [specialAreas] Zoomed part of a specific area in the map
+     *     for better visual effect.
+     *     See [USA Population Estimates example](https://ecomfe.github.io/echarts-examples/public/editor.html?c=map-usa).
+     */
+    function registerMap(
+        mapName: string,
+        geoJson: object,
+        specialAreas?: object
+    ): void
 
-    function getInstanceByDom(target: HTMLDivElement | HTMLCanvasElement): ECharts;
-
-    function registerMap(mapName: string, geoJson: object, specialAreas?: object): void;
-
-    function registerTheme(themeName: string, theme: object): void;
+    /**
+     * Registers a theme, should be specified when
+     * [initialize the chart instance](https://echarts.apache.org/api.html#echarts.init).
+     *
+     * @param {string} themeName Theme name.
+     * @param {object} theme Theme configurations.
+     */
+    function registerTheme(themeName: string, theme: object): void
 
     interface MapObj {
-        /** geoJson data for map */
+        /**
+         * geoJson data for map
+         */
         geoJson: object,
-        /** special areas fro map */
+        /**
+         * special areas fro map
+         */
         specialAreas: object
     }
 
-    function getMap(mapName: string): MapObj;
+    /**
+     * Get a registed map.
+     *
+     * @param {string} mapName Map name.
+     * @return {MapObj} Map data.
+     */
+    function getMap(mapName: string): MapObj
 
-    interface LinearGradient {
-        colorStops: object[];
-        global: boolean;
-        type: string;
-        x: number
-        x2: number
-        y: number
-        y2: number
+    /**
+     * Util methods about graphics.
+     */
+    const graphic: Graphic;
+
+    interface Graphic {
+        /**
+         * Clip the given points by the given rectangular.
+         *
+         * @param {number[][]} points The points to be clipped,
+         *     like [[23, 44], [12, 15], ...].
+         * @param {ERectangle} rect The rectangular that is used to clip points.
+         */
+        clipPointsByRect(points: number[][], rect: ERectangle): number[][];
+
+        /**
+         * Clip the first input rectangular by the second input rectangular.
+         *
+         * @param {ERectangle} targetRect The rectangular to be clipped.
+         * @param {ERectangle} rect The rectangular that is used to clip
+         *     targetRect.
+         */
+        clipRectByRect(targetRect: ERectangle, rect: ERectangle): ERectangle;
     }
 
     interface ECharts {
+        /**
+         * Group name to be used in chart connection
+         */
         group: string
 
-        setOption(option: EChartOption, notMerge?: boolean, notRefreshImmediately?: boolean): void
+        /**
+         * Configuration item, data, universal interface, all parameters and
+         *     data can all be modified through `setOption`. ECharts will merge
+         *     new parameters and data, and then refresh chart.
+         *
+         * @param {EChartOption} option Configuration item and data. Please
+         *     refer to [configuration item manual](https://echarts.apache.org/option.html)
+         *     for more information.
+         * @param {boolean} [notMerge=false] Whether not to merge with previous
+         *     `option`
+         * @param {boolean} [lazyUpdate=false] Whether not to update chart
+         *     immediately
+         */
+        setOption(
+            option: EChartOption,
+            notMerge?: boolean,
+            lazyUpdate?: boolean
+        ) : void
 
+        /**
+         * Configuration item, data, universal interface, all parameters and
+         *     data can all be modified through `setOption`. ECharts will merge
+         *     new parameters and data, and then refresh chart.
+         *
+         * @param {EChartOption} option Configuration item and data. Please
+         *     refer to [configuration item manual](https://echarts.apache.org/option.html)
+         *     for more information.
+         * @param {EChartsOptionConfig} [opts] Options about how to setOption
+         */
+        setOption(option: EChartOption, opts?: EChartsOptionConfig): void
+
+        /**
+         * Gets width of ECharts instance container.
+         *
+         * @return {number} Width.
+         */
         getWidth(): number
 
+        /**
+         * Gets height of ECharts instance container.
+         *
+         * @return {number} Height.
+         */
         getHeight(): number
 
+        /**
+         * Gets DOM element of ECharts instance container.
+         *
+         * @return {HTMLCanvasElement|HTMLDivElement} DOM container.
+         */
         getDom(): HTMLCanvasElement | HTMLDivElement
 
-        getOption(): object
+        /**
+         * Gets `option` object maintained in current instance, which contains
+         *     configuration item and data merged from previous `setOption`
+         *     operations by users, along with user interaction states.
+         *     For example, switching of legend, zooming area of data zoom,
+         *     and so on. Therefore, a new instance that is exactly the same
+         *     can be recovered from this option.
+         */
+        getOption(): EChartOption
 
-        resize(): void
+        /**
+         * Resizes chart, which should be called manually when container size
+         *     changes. When `opts` is not provided, DOM size is used.
+         *
+         * @param {EChartsResizeOption} opts Specify parameters explicitly.
+         */
+        resize(opts?: EChartsResizeOption): void
 
+        /**
+         * Triggers chart action, like chart switch `legendToggleSelect`,
+         *     zoom data area `dataZoom`, show tooltip `showTip` and so on.
+         *     See [action](https://echarts.apache.org/api.html#action) and
+         *     [events](https://echarts.apache.org/api.html#events)
+         *     for more information.
+         *
+         * @param payload Trigger multiple actions through `batch` attribute.
+         */
         dispatchAction(payload: object): void
 
+        /**
+         * Binds event-handling function.
+         *     There are two kinds of events in ECharts, one of which is mouse
+         *     events, which will be triggered when the mouse clicks certain
+         *     element in the chart, the other kind will be triggered after
+         *     `dispatchAction` is called. Every action has a corresponding
+         *     event.
+         *     If event is triggered externally by `dispatchAction`, and there
+         *     is batch attribute in action to trigger batch action, then the
+         *     corresponding response event parameters be in batch.
+         *
+         * @param {string} eventName Event names are all in lower-cases,
+         *     for example, `'click'`, `'mousemove'`, `'legendselected'`
+         * @param {Function} handler Event-handling function, whose format
+         *     is as following:
+            ```js
+            (event: object)
+            ```
+         * @param {object} [context] context of callback function, what
+         *     `this` refers to.
+         */
         on(eventName: string, handler: Function, context?: object): void
 
+        /**
+         * Unbind event-handler function.
+         *
+         * @param {string} eventName Event names are all in lower-cases,
+         *     for example, `'click'`, `'mousemove'`, `'legendselected'`
+         * @param {Function} [handler] The function to be unbound could be
+         *     passed. Otherwise, all event functions of this type will be
+         *     unbound.
+         */
         off(eventName: string, handler?: Function): void
 
-        showLoading(type?: string, opts?: object): void
+        /**
+         * Convert a point from logical coordinate (e.g., in geo, cartesian,
+         *     graph, ...) to pixel coordinate.
+         *
+         * @param {EChartsConvertFinder} finder Indicate in which coordinate
+         *     system conversion is performed.
+         *     Generally, index or id or name can be used to specify
+         *     coordinate system.
+         * @param {string | any[]} value The value to be converted.
+         */
+        convertToPixel(finder: EChartsConvertFinder, value: string | any[])
+            : string | any[]
 
+        /**
+         * Convert a point from pixel coordinate to logical coordinate
+         *     (e.g., in geo, cartesian, graph, ...).
+         *
+         * @param {EChartsConvertFinder} finder Indicate in which coordinate
+         *     system conversion is performed.
+         *     Generally, index or id or name can be used to specify
+         *     coordinate system.
+         * @param {string | any[]} value The value to be converted.
+         */
+        convertFromPixel(finder: EChartsConvertFinder, value: any[] | string)
+            : any[] | string
+
+        /**
+         * Determine whether the given point is in the given coordinate systems or series.
+         *
+         * @param {EChartsConvertFinder} finder Indicate in which coordinate
+         *     system conversion is performed.
+         *     Generally, index or id or name can be used to specify
+         *     coordinate system.
+         * @param {string | any[]} value The value to be judged, in pixel
+         *     coordinate system.
+         */
+        containPixel(finder: EChartsConvertFinder, value: any[]): boolean
+
+        /**
+         * Shows loading animation. You can call this interface manually before
+         *     data is loaded, and call `hideLoading` to hide loading animation
+         *     after data is loaded.
+         *
+         * @param {string} [type='default']
+         * @param {EChartsLoadingOption} [opts]
+         */
+        showLoading(type?: string, opts?: EChartsLoadingOption): void
+
+        /**
+         * Hides animation loading effect.
+         */
         hideLoading(): void
 
+        /**
+         * Exports chart image; returns a base64 URL; can be set to `src` of
+         *      `Image`.
+         *
+         * @param opts Options.
+         */
         getDataURL(opts: {
-            /** 导出的格式，可选 png, jpeg */
+            // Exporting format, can be either png, or jpeg
             type?: string,
-            /** 导出的图片分辨率比例，默认为 1。*/
+            // Resolution ratio of exporting image, 1 by default.
             pixelRatio?: number,
-            /** 导出的图片背景色，默认使用 option 里的 backgroundColor */
-            backgroundColor?: string
+            // Background color of exporting image, use backgroundColor in
+            // option by default.
+            backgroundColor?: string,
+            // Excluded components list. e.g. ['toolbox']
+            excludeComponents?: string[]
         }): string
 
+        /**
+         * Exports connected chart image; returns a base64 url; can be set to
+         *     `src` of `Image`. Position of charts in exported image are
+         *     related to that of the container.
+         *
+         * @param opts Options.
+         */
         getConnectedDataURL(opts: {
-            /** 导出的格式，可选 png, jpeg */
+            // Exporting format, can be either png, or jpeg
             type: string,
-            /** 导出的图片分辨率比例，默认为 1。 */
+            // Resolution ratio of exporting image, 1 by default.
             pixelRatio: number,
-            /** 导出的图片背景色，默认使用 option 里的 backgroundColor */
-            backgroundColor: string
+            // Background color of exporting image, use backgroundColor in
+            // option by default.
+            backgroundColor: string,
+            // Excluded components list. e.g. ['toolbox']
+            excludeComponents?: string[]
         }): string
 
+        /**
+         * The method is used in rendering millions of data
+         *     (e.g. rendering geo data). In these scenario, the entire size of
+         *     data is probably up to 10 or 100 MB, even using binary format.
+         *     So chunked load data and rendering is required. When using
+         *     `appendData`, the graphic elements that have been rendered will
+         *     not be cleared, but keep rendering new graphic elements.
+         *
+         * @param opts Data options.
+         */
+        appendData(opts: {
+            // Specify which series the data will be appended to.
+            seriesIndex?: string,
+            // The data to be appended.
+            data?: any[]|TypedArray,
+        }): void
+
+        /**
+         * Clears current instance; removes all components and charts in
+         *     current instance.
+         */
         clear(): void
 
+        /**
+         * Returns whether current instance has been disposed.
+         *
+         * @return {boolean} Whether has been disposed.
+         */
         isDisposed(): boolean
 
+        /**
+         * Disposes instance. Once disposed, the instance can not be used again.
+         */
         dispose(): void
-
-        /** 转换逻辑点到像素 */
-        convertToPixel(finder: ConvertFinder | string, value: string | any[]): string | any[]
-
-        convertFromPixel(finder: ConvertFinder | string, value: any[] | string): any[] | string
-
-        containPixel(finder: ConvertFinder | string,
-            /** 要被判断的点，为像素坐标值，以 echarts 实例的 dom 节点的左上角为坐标 [0, 0] 点。*/
-            value: any[]): boolean
-
-        getModel(): {
-            getComponent(finder: string): any;
-        }
     }
 
-    interface ConvertFinder {
+    type TypedArray = Int8Array | Uint8Array | Int16Array | Uint16Array
+        | Int32Array | Uint32Array | Uint8ClampedArray | Float32Array
+        | Float64Array;
+
+    interface EChartsConvertFinder {
         seriesIndex?: number,
         seriesId?: string,
         seriesName?: string,
@@ -193,6 +485,29 @@ declare namespace echarts {
         zAxis3D?: object
     }
 
+    interface EChartsOptionConfig {
+        notMerge?: boolean,
+        lazyUpdate?: boolean,
+        silent?: boolean
+    }
+
+    interface EChartsResizeOption {
+        /**
+         * Chart width.
+         */
+        width?: number | string,
+
+        /**
+         * Chart height.
+         */
+        height?: number | string,
+
+        /**
+         * Specify whether or not to prevent triggering events.
+         */
+        silent?: boolean
+    }
+
     interface EChartTitleOption {
         show?: boolean;
         text?: string;
@@ -219,6 +534,38 @@ declare namespace echarts {
         shadowOffsetX?: number,
         shadowOffsetY?: number,
     }
+
+    interface EChartsLoadingOption {
+        /**
+         * Loading text.
+         * @default 'loading'
+         */
+        text?: string,
+
+        /**
+         * Loading circle color.
+         * @default '#c23531'
+         */
+        color?: string,
+
+        /**
+         * Loading text color.
+         * @default '#000'
+         */
+        textColor?: string,
+
+        /**
+         * Mask background color.
+         * @default 'rgba(255, 255, 255, 0.8)'
+         */
+        maskColor?: string,
+
+        /**
+         * Zlevel of loading. If not 0, it creates a new canvas for loading.
+         * @default 0
+         */
+        zlevel?: 0
+    }
 }
 
 declare module 'echarts' {
diff --git a/types/ecma-proposal-math-extensions/ecma-proposal-math-extensions-tests.ts b/types/ecma-proposal-math-extensions/ecma-proposal-math-extensions-tests.ts
new file mode 100644
index 0000000000..3dc5a9d61a
--- /dev/null
+++ b/types/ecma-proposal-math-extensions/ecma-proposal-math-extensions-tests.ts
@@ -0,0 +1,7 @@
+import "ecma-proposal-math-extensions";
+
+Math.scale(42, 21, 64, 0, 100);
+Math.fscale(0.42, 0.21, 0.64, 0.0, 1.0);
+Math.clamp(42, 0, 100);
+Math.radians(180) === 180 * Math.DEG_PER_RAD;
+Math.degrees(Math.PI) === Math.PI * Math.RAD_PER_DEG;
diff --git a/types/ecma-proposal-math-extensions/index.d.ts b/types/ecma-proposal-math-extensions/index.d.ts
new file mode 100644
index 0000000000..6412e63dd6
--- /dev/null
+++ b/types/ecma-proposal-math-extensions/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for ecma-proposal-math-extensions 0.0
+// Project: https://github.com/rwaldron/proposal-math-extensions#readme
+// Definitions by: Konstantin Simon Maria Möllers <https://github.com/ksm2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.0
+
+interface Math {
+  /** This is the number of how many degrees are one radian. */
+  readonly DEG_PER_RAD: number;
+  /** This is the number of how many radians are one degree. */
+  readonly RAD_PER_DEG: number;
+  /**
+   * Scales a value between `inLow` and `inHigh` to the range of `outLow` to `outHigh`.
+   * @param x The numeric value in the input range to scale.
+   * @param inLow The lower bound of the input range.
+   * @param inHigh The upper bound of the input range.
+   * @param outLow The lower bound of the output range.
+   * @param outHigh The upper bound of the output range.
+   * @return The input value scaled to the output range.
+   */
+  scale(x: number, inLow: number, inHigh: number, outLow: number, outHigh: number): number;
+  /**
+   * Scales a floating point value between `inLow` and `inHigh` to the range of `outLow` to `outHigh`.
+   * @param x The numeric value in the input range to scale.
+   * @param inLow The lower bound of the input range.
+   * @param inHigh The upper bound of the input range.
+   * @param outLow The lower bound of the output range.
+   * @param outHigh The upper bound of the output range.
+   * @return The input value scaled to the output range.
+   */
+  fscale(x: number, inLow: number, inHigh: number, outLow: number, outHigh: number): number;
+  /**
+   * Clamps an incoming value `x` to a range between `lower` and `upper`.
+   * @param x The value to clamp.
+   * @param lower The lower bound of the range to clamp `x` to.
+   * @param upper The upper bound of the range to clamp `x` to.
+   * @return The input value clamped to the given range.
+   */
+  clamp(x: number, lower: number, upper: number): number;
+  /**
+   * Converts an angle given in degrees to an angle given in radians.
+   * @param degrees The input angle in degrees.
+   * @return The output angle in radians.
+   */
+  radians(degrees: number): number;
+  /**
+   * Converts an angle given in radians to an angle given in degrees.
+   * @param radians The input angle in radians.
+   * @return The output angle in degrees.
+   */
+  degrees(radians: number): number;
+}
diff --git a/types/ecma-proposal-math-extensions/tsconfig.json b/types/ecma-proposal-math-extensions/tsconfig.json
new file mode 100644
index 0000000000..52115765eb
--- /dev/null
+++ b/types/ecma-proposal-math-extensions/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "target": "es2017",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ecma-proposal-math-extensions-tests.ts"
+    ]
+}
diff --git a/types/ecma-proposal-math-extensions/tslint.json b/types/ecma-proposal-math-extensions/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ecma-proposal-math-extensions/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ej.web.all/ej.web.all-tests.ts b/types/ej.web.all/ej.web.all-tests.ts
index 83ed128742..58faf8c7f4 100644
--- a/types/ej.web.all/ej.web.all-tests.ts
+++ b/types/ej.web.all/ej.web.all-tests.ts
@@ -1,3461 +1,3418 @@
-module AccordionComponent {
-    $(function () {
-        var sample = new ej.Accordion($("#basicAccordion"), {
-            width: "100%",
-            allowKeyboardNavigation: true,
-            collapseSpeed: 500,
-            collapsible: true,
-            enableAnimation: true,
-            enableMultipleOpen: true,
-            events: "click",
-            expandSpeed: 500,
-            headerSize: "40px",
-            htmlAttributes: { title: "Demo" },
-            selectedItemIndex: 1,
-            showCloseButton: true,
-            showRoundedCorner: true
-        });
-    });
-}
-
-
-
-module AutocompleteComponent {
-    var carList = [
-        "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
-        "BMW 7", "Bentley Mulsanne", "Bugatti Veyron",
-        "Chevrolet Camaro", "Cadillac",
-        "Duesenberg J", "Dodge Sprinter",
-        "Elantra", "Excavator",
-        "Ford Boss 302", "Ferrari 360", "Ford Thunderbird",
-        "GAZ Siber",
-        "Honda S2000", "Hyundai Santro",
-        "Isuzu Swift", "Infiniti Skyline",
-        "Jaguar XJS",
-        "Kia Sedona EX", "Koenigsegg Agera",
-        "Lotus Esprit", "Lamborghini Diablo",
-        "Mercedes-Benz", "Mercury Coupe", "Maruti Alto 800",
-        "Nissan Qashqai",
-        "Oldsmobile S98", "Opel Superboss",
-        "Porsche 356", "Pontiac Sunbird",
-        "Scion SRS/SC/SD", "Saab Sportcombi", "Subaru Sambar", "Suzuki Swift",
-        "Triumph Spitfire", "Toyota 2000GT",
-        "Volvo P1800", "Volkswagen Shirako"
-    ];
-    $(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"), {
-            text:"http://www.syncfusion.com"
-        });
-    });
-}
-
-
-
-
-
-module Bulletgraphcomponent {
-    $(function () {
-        var bulletsample = new ej.datavisualization.BulletGraph($("#BulletGraph"), {
-            isResponsive: true,
-            load: function () {
-                var sender = $("#BulletGraph").data("ejBulletGraph");
-                var bulletTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>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":
-                            bulletTheme = "flatdark";
-                            break;
-                        case "flatoffice-365light":
-                        case "flatmateriallight":
-                            bulletTheme = "material";
-                            break;
-                        default:
-                           bulletTheme = "flatlight";
-                            break;
-                    }
-                    sender.model.theme = bulletTheme;
-                }
-
-            },
-            tooltipSettings: { visible: true },
-            quantitativeScaleSettings: {
-                featureMeasures: [{
-                    value: 8, comparativeMeasureValue:6.7
-                }]
-            },
-            qualitativeRanges: [{
-                rangeEnd: 4.3, rangeStroke:"#ebebeb",
-            },
-                {
-                    rangeEnd: 7.3, rangeStroke:"#d8d8d8"
-                },
-                {
-                    rangeEnd: 10, rangeStroke: "#7f7f7f"
-                }
-            ],
-            captionSettings: {
-                textPosition: 'right', text: 'Revenue YTD',
-                subTitle: {
-                    text: "$ in Thousands", textPosition:"right"
-                }
-            }
-        });
-    });
-}
-
-
-
-
-
-module ButtonComponent {
-    $(function () {
-        var basicButton = new ej.Button($("#buttonnormal"), {
-            size: "large",
-            showRoundedCorner: true,
-            contentType: "textandimage",
-            prefixIcon: "e-icon e-save",
-            text: "Save"
-        });
-        var toggleButton = new ej.ToggleButton($("#TextOnly"), {
-            showRoundedCorner: true,
-            size: "large",
-            contentType: "textandimage",
-            defaultPrefixIcon: "e-icon e-save",
-            activePrefixIcon: "e-icon e-delete",
-            defaultText: "Save",
-            activeText: "Delete"
-        });
-        var splitbuttonnormal = new ej.SplitButton($("#splitbuttonnormal"), {
-            showRoundedCorner: true,
-            size: "large",
-            prefixIcon: "e-icon e-file-empty",
-            targetID: "menu1",
-            contentType: "textandimage",
-            text: "File"
-        });
-        var groupButton = new ej.GroupButton($("#groupButton"), {
-            showRoundedCorner: true,
-            size: "large"
-        });
-        var check1 = new ej.CheckBox($("#check1"), {
-            size: "medium", enableTriState: true
-        });
-        var check2 = new ej.CheckBox($("#check2"), {
-            size: "medium", enableTriState: true
-        });
-        var radio1 = new ej.RadioButton($("#radio1"), {
-            size: "medium"
-        });
-        var radio2 = new ej.RadioButton($("#radio2"), {
-            size: "medium", checked: true
-        });
-    });
-}
-
-
-
-
-module ChartComponent {
-    $(function () {
-        var chartsample = new ej.datavisualization.Chart($("#Chart"), {
-            primaryXAxis: {
-                range: { min: 2005, max: 2011, interval: 1 },
-                title: { text: "Year" },
-                valueType: "category"
-            },
-            primaryYAxis: {
-                range: { min: 25, max: 50, interval: 5 },
-                labelFormat: "{value}%",
-                title: { text: "Efficiency" },
-
-            },
-            commonSeriesOptions:
-            {
-                type: 'line', enableAnimation: true,
-                tooltip: { visible: true, template: 'Tooltip' },
-                marker:
-                {
-                    shape: 'circle',
-                    size:
-                    {
-                        height: 10, width: 10
-                    },
-                    visible: true
-                },
-                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 }],
-                    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 }],
-                    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 }],
-                    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 }],
-                    name: 'France'
-                }
-            ],
-            isResponsive: true,
-            load: function () {
-                var sender = $("#Chart").data("ejChart");
-                if (!!window.orientation && sender) {           //to modify chart properties for mobile view
-                    var model = sender.model,
-                        seriesLength = model.series.length;
-                    model.legend.visible = false;
-                    model.size.height = null;
-                    model.size.width = null;
-                    for (var i = 0; i < seriesLength; i++) {
-                        if (!model.series[i].marker)
-                            model.series[i].marker = {};
-                        if (!model.series[i].marker.size)
-                            model.series[i].marker.size = {};
-                        model.series[i].marker.size.width = 6;
-                        model.series[i].marker.size.height = 6;
-                    }
-                    model.primaryXAxis.labelIntersectAction = "rotate45";
-                    if (model.primaryXAxis.title)
-                        model.primaryXAxis.title.text = "";
-                    if (model.primaryYAxis.title)
-                        model.primaryYAxis.title.text = "";
-                    model.primaryXAxis.edgeLabelPlacement = "hide";
-                    model.primaryYAxis.labelIntersectAction = "rotate45";
-                    model.primaryYAxis.edgeLabelPlacement = "hide";
-                }
-                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
-                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" },
-            legend: { visible: true },
-        });
-        //    chartsample.model.load="loadTheme";
-    });
-}
-
-
-
-
-
-module circulargaugecomponent {
-    $(function () {
-        var circularsample = new ej.datavisualization.CircularGauge($("#CircularGauge"), {
-            enableAnimation: false,
-            isResponsive: true,
-            backgroundColor: "transparent", width: 500,
-            scales: [{
-                showRanges: true,
-                startAngle: 122, sweepAngle: 296, radius: 130, showScaleBar: true, size: 1, maximum: 120, majorIntervalValue: 20, minorIntervalValue: 10,
-                border: {
-                    width: 0.5,
-                },
-                pointers: [{
-                    value: 60,
-                    showBackNeedle: true,
-                    backNeedleLength: 20,
-                    length: 95,
-                    width: 7
-                }],
-                ticks: [{
-                    type: "major",
-                    distanceFromScale: 2,
-                    height: 16,
-                    width: 1, color: "#8c8c8c"
-                }, { type: "minor", height: 8, width: 1, distanceFromScale: 2, color: "#8c8c8c" }],
-                labels: [{
-                    color: "#8c8c8c"
-                }],
-                ranges: [{
-                    distanceFromScale: -30,
-                    startValue: 0,
-                    endValue: 70
-                }, {
-                        distanceFromScale: -30,
-                        startValue: 70,
-                        endValue: 110,
-                        backgroundColor: "#fc0606",
-                        border: { color: "#fc0606" }
-                    },
-                    {
-                        distanceFromScale: -30,
-                        startValue: 110,
-                        endValue: 120,
-                        backgroundColor: "#f5b43f",
-                        border: { color: "#f5b43f" }
-                    }]
-            }]
-        });
-    });
-}
-
-
-
-
-module ColorPickerComponent {
-    $(function () {
-        var colorSample = new ej.ColorPicker($("#colorpick"), {
-            value: "#278787"
-        });
-    });
-}
-
-
-
-
-module ComboBoxComponent {
-    var BikeList = [
-        { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
-        { empid: "bk4", text: "Discover" }, { empid: "bk5", text: "Dazzler" }, { empid: "bk6", text: "Flame" },
-        { empid: "bk7", text: "Fazzer" }, { empid: "bk8", text: "FZ-S" }, { empid: "bk9", text: "Pulsar" },
-        { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
-    ];
-    $(function () {
-        var comboboxInstance = new ej.ComboBox($("#selectCar"), {
-            width: "100%",
-            placeholder: "Select a Bike",
-            fields: { text: "text", value: "empid" },
-            dataSource: BikeList,
-            autofill: true
-        });
-    });
-}
-
-
-
-
-
-module DatePickerComponent {
-    $(function () {
-        var dateSample = new ej.DatePicker($("#datepick"), {
-            width: "100%"
-        });
-    });
-}
-
-
-
-
-module DateTimePickerComponent {
-    $(function () {
-        var datetimeSample = new ej.DateRangePicker($("#daterangepick"), {
-            width: "100%"
-        });
-    });
-}
-
-
-
-module DateTimePickerComponent {
-    $(function () {
-        var datetimeSample = new ej.DateTimePicker($("#datetimepick"), {
-            width: "100%"
-        });
-    });
-}
-
-
-
-$(function () {
-    var diagram = new ej.datavisualization.Diagram($("#diagram"), {
-        width: "1000px",
-        height: "600px",
-        pageSettings: {
-            //Sets page size
-            pageHeight: 500,
-            pageWidth: 500,
-            //Customizes the appearance of page
-            pageBorderWidth: 4,
-            pageBackgroundColor: "white",
-            pageBorderColor: "lightgray",
-            pageMargin: 25,
-            showPageBreak: true,
-            multiplePage: true,
-            pageOrientation: ej.datavisualization.Diagram.PageOrientations.Portrait
-        },
-        scrollSettings: {
-            horizontalOffset: 0,
-            verticalOffset: 0
-        },
-        snapSettings: {
-            snapConstraints: ej.datavisualization.Diagram.SnapConstraints.ShowLines
-        },
-        nodes: [
-            createNode({ name: "NewIdea", width: 150, height: 60, offsetX: 300, offsetY: 60, labels: [createLabel({ "text": "New idea identified" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Terminator }),
-            createNode({ name: "Meeting", width: 150, height: 60, offsetX: 300, offsetY: 155, labels: [createLabel({ "text": "Meeting with board" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
-            createNode({
-                name: "BoardDecision", width: 150, height: 110, offsetX: 300, offsetY: 280, labels: [createLabel({ text: "Board decides \nwhether \nto proceed", wrapText: "true", "margin": { left: 20, top: 0, right: 20, bottom: 0 } })],
-                type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision
-            }),
-            createNode({ name: "Project", width: 150, height: 100, offsetX: 300, offsetY: 430, labels: [createLabel({ "text": "Find Project \nmanager" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision }),
-            createNode({
-                name: "End", width: 150, height: 60, offsetX: 300, offsetY: 555, labels: [createLabel({ "text": "Implement and Deliver" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process
-            }),
-            createNode({ name: "Decision", width: 250, height: 60, offsetX: 550, offsetY: 60, labels: [createLabel({ "text": "Decision Process for new software ideas" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Card, fillColor: "#858585", borderColor: "#858585" }),
-            createNode({ name: "Reject", width: 150, height: 60, offsetX: 550, offsetY: 285, labels: [createLabel({ "text": "Reject and write report" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
-            createNode({ name: "Resources", width: 150, height: 60, offsetX: 550, offsetY: 430, labels: [createLabel({ "text": "Hire new resources" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process })
-        ],
-        connectors: [
-            createConnector({ name: "connector1", sourceNode: "NewIdea", targetNode: "Meeting" }),
-            createConnector({ name: "connector2", sourceNode: "Meeting", targetNode: "BoardDecision" }),
-            createConnector({ name: "connector3", sourceNode: "BoardDecision", targetNode: "Project", labels: [createLabel({ "text": "Yes" })] }),
-            createConnector({ name: "connector4", sourceNode: "Project", targetNode: "End", labels: [createLabel({ "text": "Yes" })] }),
-            createConnector({ name: "connector5", sourceNode: "BoardDecision", targetNode: "Reject", labels: [createLabel({ "text": "No" })] }),
-            createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
-        ]
-    });
-
-});
-
-function createNode(option: ej.datavisualization.Diagram.Node) {
-    if (!option.fillColor) {
-        option.borderColor = "#1BA0E2";
-        option.fillColor = "#1BA0E2";
-    }
-    option.labels[0].fontColor = "white";
-    return option;
-}
-
-function createConnector(option: ej.datavisualization.Diagram.Connector) {
-    option.targetDecorator = { shape: ej.datavisualization.Diagram.DecoratorShapes.Arrow, borderColor: "#606060", width: 10, height: 10 };
-    option.lineColor = "#606060";
-    if (option.labels && option.labels.length > 0) {
-        option.labels[0].fillColor = "white";
-    }
-    return option;
-}
-
-function createLabel(options: any) {
-    return options;
-}
-
-
-
-module DialogComponent {
-    $(function () {
-        var dialogInstance = new ej.Dialog($("#basicDialog"), {
-            width: 550,
-            minWidth: 310,
-            minHeight: 215,
-            target: ".control",
-            close: () => {
-                $("#btnOpen").show();
-            }
-        });
-        var btnInstance = new ej.Button($("#btnOpen"), {
-            size: "medium",
-            click: () => {
-                $("#btnOpen").hide();
-                $("#basicDialog").ejDialog("open");
-            },
-            type: "button",
-            height: 30,
-            width: 150
-        });
-    });
-}
-
-
-
-
-module digitalgaugecomponent {
-    $(function () {
-        var digitalgaugesample = new ej.datavisualization.DigitalGauge($("#DigitalGauge"), {
-            width: 525,
-            height: 305,
-            isResponsive: true,
-            items: [{
-                segmentSettings: {
-                    width: 1,
-                    spacing: 0,
-                    color: "#8c8c8c"
-                },
-                characterSettings: {
-                    opacity: 0.8,
-                },
-                value: "Syncfusion",
-                position: { x: 52, y: 52 }
-            }]
-        });
-    });
-}
-
-
-
-
-
-
-module DropDownListComponent {
-    var BikeList = [
-        { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
-        { empid: "bk4", text: "Discover" }, { empid: "bk5", text: "Dazzler" }, { empid: "bk6", text: "Flame" },
-        { empid: "bk7", text: "Fazzer" }, { empid: "bk8", text: "FZ-S" }, { empid: "bk9", text: "Pulsar" },
-        { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
-    ];
-    $(function () {
-        var sample = new ej.DropDownList($("#bikeList"), {
-            dataSource: BikeList,
-            width: "100%",
-            watermarkText: "Select a bike",
-            fields: { id: "empid", text: "text", value: "text" },
-            enableFilterSearch: true,
-            caseSensitiveSearch: true,
-            enableIncrementalSearch: true,
-            enablePopupResize: true,
-            delimiterChar: ";",
-            multiSelectMode: ej.MultiSelectMode.Delimiter,
-            maxPopupHeight: "300px",
-            minPopupHeight: "150px",
-            maxPopupWidth: "500px",
-            minPopupWidth: "350px",
-            showCheckbox: true,
-            showRoundedCorner: true
-        });
-    });
-
-}
-
-
-
-
-
-
-module ExplorerComponent {
-    $(function () {
-        var file = new ej.FileExplorer($("#fileExplorer"), {
-            path: (<any>window).baseurl + "Content/FileBrowser/",
-            width: "100%",
-            minWidth: "150px",
-            layout: "tile",
-            isResponsive: true,
-            ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
-        });
-    });
-}
-
-
-
-
-module GanttComponent {
-    $(function () {
-        var ganttInstance = new ej.Gantt($("#GanttContainer"), {
-            dataSource: (<any>window).projectData,
-            allowColumnResize: true,
-            allowSorting: true,
-            allowSelection: true,
-            enableContextMenu: true,
-            taskIdMapping: "taskID",
-            allowDragAndDrop: true,
-            taskNameMapping: "taskName",
-            startDateMapping: "startDate",
-            showColumnChooser: true,
-            showColumnOptions: true,
-            progressMapping: "progress",
-            durationMapping: "duration",
-            endDateMapping: "endDate",
-            childMapping: "subtasks",
-            scheduleStartDate: "02/01/2017",
-            scheduleEndDate: "04/09/2017",
-            //Resources mapping
-            resourceInfoMapping: "resourceId",
-            resourceNameMapping: "resourceName",
-            resourceIdMapping: "resourceId",
-            resources: (<any>window).projectResources,
-            predecessorMapping: "predecessor",
-            showResourceNames: true,
-            toolbarSettings: {
-                showToolbar: true,
-                toolbarItems: ["add", "edit", "delete", "update", "cancel", "indent", "outdent", "expandAll", "collapseAll", "search"]
-            },
-            editSettings: {
-                allowEditing: true,
-                allowAdding: true,
-                allowDeleting: true,
-                allowIndent: true,
-                editMode: "cellEditing"
-            },
-            sizeSettings: {
-                width: "100%",
-                height: "100%"
-            },
-            dragTooltip: { showTooltip: true },
-            showGridCellTooltip: true,
-            treeColumnIndex: 1,
-            isResponsive: true,
-        });
-    });
-}
-
-
-
-module GridComponent {
-    $(function () {
-        var gridInstance = new ej.Grid($("#Grid"), {
-            dataSource: (<any>window).gridData,
-            allowGrouping: true,
-            allowSorting: true,
-            allowMultiSorting: true,
-            enableAltRow: true,
-            allowPaging: true,
-            allowReordering: true,
-            allowResizing: true,
-            allowFiltering: true,
-            allowScrolling: true,
-            enableRowHover: true,
-            selectionType: "multiple",
-            selectionSettings: { enableToggle: true, selectionMode: ["row", "cell", "column"] },
-            allowKeyboardNavigation: true,
-            editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, allowEditOnDblClick: true, showDeleteConfirmDialog: true },
-            toolbarSettings: { showToolbar: true, toolbarItems: ["add", "edit", "delete", "update", "cancel", "search"] },
-            columns: [
-                { field: "OrderID", headerText: "Order ID", isPrimaryKey: true, width: 75, textAlign: ej.TextAlign.Right },
-                { field: "CustomerID", headerText: "Customer ID", editType: ej.Grid.EditingType.String, width: 80 },
-                { field: "EmployeeID", headerText: "Employee ID", width: 75, editType: ej.Grid.EditingType.Dropdown, textAlign: ej.TextAlign.Right, priority: 4 },
-                { field: "Freight", width: 75, format: "{0:C}", editType: ej.Grid.EditingType.Numeric, textAlign: ej.TextAlign.Right, priority: 3 },
-                { field: "OrderDate", headerText: "Order Date", width: 80, format: "{0:MM/dd/yyyy}", textAlign: ej.TextAlign.Right, priority: 2 },
-                { field: "ShipCity", headerText: "Ship City", editType: ej.Grid.EditingType.Dropdown, width: 110, priority: 2 }
-            ],
-            isResponsive: true,
-            minWidth: 700,
-            showSummary: true,
-            summaryRows: [{ title: "Sum", summaryColumns: [{ summaryType: ej.Grid.SummaryType.Sum, displayColumn: "Freight", dataMember: "Freight", format: "{0:C2}" }] }]
-        });
-    });
-}
-
-
-
-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++) {
-        var value = Math.floor((Math.random() * 100) + 1);
-        itemSource.push({ ProductName: columns[i], Year: "Y" + (2011 + j), Value: value })
-    }
-}
-
-$(function () {
-    var heatmap = new ej.datavisualization.HeatMap($("#heatmap"), {
-        colorMappingCollection: [
-            { value: 0, color: "#8ec8f8", label: { text: "0" } },
-            { value: 100, color: "#0d47a1", label: { text: "100" } }
-        ],
-        isResponsive: true,
-        itemsSource: itemSource,
-        width: "100%",
-        itemsMapping: {
-            column: { propertyName: "ProductName", displayName: "Product Name" },
-            row: { propertyName: "Year", displayName: "Year" },
-            value: { propertyName: "Value" },
-            columnMapping: [
-                { "propertyName": columns[0], "displayName": columns[0] },
-                { "propertyName": columns[1], "displayName": columns[1] },
-                { "propertyName": columns[2], "displayName": columns[2] },
-                { "propertyName": columns[3], "displayName": columns[3] },
-                { "propertyName": columns[4], "displayName": columns[4] },
-                { "propertyName": columns[5], "displayName": columns[5] }
-            ],
-            headerMapping: { propertyName: "Year", displayName: "Year", columnStyle: { width: 105, textAlign: "right" } },
-        },
-        legendCollection: ["heatmap_legend"]
-    });
-    var heatmaplegend = new ej.datavisualization.HeatMapLegend($("#heatmap_legend"), {
-        colorMappingCollection: [
-            { value: 0, color: "#8ec8f8", label: { text: "0" } },
-            { value: 100, color: "#0d47a1", label: { text: "100" } }
-        ],
-        height: "50px",
-        width: "75%",
-        isResponsive: true
-    });
-});
-
-
-
-
-module KanbanComponent {
-    $(function () {
-        var sample = new ej.Kanban($("#Kanban"), {
-            dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
-            columns: [
-                { headerText: "Backlog", key: "Open" },
-                { headerText: "In Progress", key: "InProgress" },
-                { headerText: "Testing", key: "Testing" },
-                { headerText: "Done", key: "Close" }
-            ],
-            keyField: "Status",
-            allowTitle: true,
-            fields: {
-                content: "Summary",
-                primaryKey: "Id",
-                imageUrl: "ImgUrl"
-            },
-            allowSelection: false
-        });
-    });
-}
-
-
-
-
-module lineargaugecomponent {
-    $(function () {
-        var linearsample = new ej.datavisualization.LinearGauge($("#LinearGauge"), {
-            labelColor: "#8c8c8c", width: 500,
-            isResponsive: true, enableAnimation: false,
-            scales: [{
-                width: 4, border: { color: "transparent", width: 0 }, showBarPointers: false, showRanges: true, length: 310,
-                position: { x: 52, y: 50 }, markerPointers: [{
-                    value: 50, length: 10, width: 10, backgroundColor: "#4D4D4D", border: { color: "#4D4D4D" }
-                }],
-                labels: [{ font: { size: "11px", fontFamily: "Segoe UI", fontStyle: "bold" }, distanceFromScale: { x: -13 } }],
-                ticks: [{ type: "majorinterval", width: 1, color: "#8c8c8c" }],
-                ranges: [{
-                    endValue: 60,
-                    startValue: 0,
-                    backgroundColor: "#F6B53F",
-                    border: { color: "#F6B53F" }, startWidth: 4, endWidth: 4
-                }, {
-                        endValue: 100,
-                        startValue: 60,
-                        backgroundColor: "#E94649",
-                        border: { color: "#E94649" }, startWidth: 4, endWidth: 4
-                    }]
-            }]
-        });
-    });
-}
-
-
-
-
-
-module ListBoxComponent {
-    $(function () {
-        var listboxInstance = new ej.ListBox($("#selectcar"), {
-            showCheckbox: true
-        });
-    });
-}
-
-
-
-module ListviewComponent {
-    $(function () {
-        var listviewInstance = new ej.ListView($("#defaultlistview"), {
-            enableCheckMark: true,
-            width: 400
-        });
-    });
-}
-
-
-var world_map=
-    {
-        "type": "FeatureCollection",
-        "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
-        "features": [
-            { "type": "Feature", "properties": { "admin": "Afghanistan", "name": "Afghanistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [62.230651483005879, 35.270663967422287], [62.984662306576588, 35.404040839167614], [63.193538445900337, 35.857165635718907], [63.982895949158696, 36.007957465146596], [64.546479119733888, 36.31207326918426], [64.746105177677393, 37.111817735333297], [65.588947788357828, 37.305216783185628], [65.745630731066811, 37.661164048812061], [66.217384881459324, 37.393790188133913], [66.518606805288655, 37.362784328758785], [67.075782098259609, 37.35614390720928], [67.829999627559502, 37.144994004864678], [68.135562371701369, 37.023115139304302], [68.859445835245921, 37.344335842430588], [69.196272820924364, 37.15114350030742], [69.518785434857946, 37.608996690413413], [70.116578403610319, 37.588222764632086], [70.270574171840124, 37.73516469985401], [70.376304152309274, 38.138395901027515], [70.806820509732873, 38.486281643216408], [71.348131137990251, 38.258905341132156], [71.239403924448155, 37.953265082341879], [71.541917759084768, 37.905774441065631], [71.448693475230229, 37.065644843080513], [71.84463829945058, 36.738171291646914], [72.193040805962383, 36.94828766534566], [72.636889682917271, 37.047558091778349], [73.260055779924983, 37.495256862938994], [73.948695916646486, 37.421566270490786], [74.980002475895404, 37.419990139305888], [75.158027785140902, 37.13303091078911], [74.575892775372964, 37.02084137628345], [74.067551710917812, 36.836175645488446], [72.920024855444453, 36.720007025696312], [71.846291945283909, 36.509942328429851], [71.262348260385735, 36.074387518857797], [71.498767938121077, 35.650563259415996], [71.613076206350698, 35.153203436822857], [71.115018751921625, 34.733125718722228], [71.156773309213449, 34.348911444632144], [70.881803012988385, 33.988855902638512], [69.93054324735958, 34.020120144175102], [70.323594191371583, 33.358532619758385], [69.687147251264847, 33.105498969041228], [69.262522007122541, 32.501944078088293], [69.317764113242546, 31.901412258424436], [68.926676873657655, 31.620189113892064], [68.556932000609308, 31.713310044882011], [67.792689243444769, 31.582930406209623], [67.683393589147457, 31.303154201781414], [66.938891229118454, 31.304911200479346], [66.38145755398601, 30.738899237586448], [66.346472609324408, 29.88794342703617], [65.046862013616092, 29.472180691031902], [64.350418735618504, 29.560030625928089], [64.148002150331237, 29.340819200145965], [63.550260858011164, 29.468330796826162], [62.549856805272775, 29.318572496044304], [60.874248488208778, 29.829238999952604], [61.78122155136343, 30.735850328081231], [61.699314406180811, 31.379506130492661], [60.941944614511115, 31.548074652628745], [60.863654819588952, 32.182919623334421], [60.536077915290761, 32.981268825811561], [60.963700392505991, 33.528832302376252], [60.528429803311575, 33.676446031217999], [60.80319339380744, 34.404101874319856], [61.21081709172573, 35.650072333309218]]] } },
-            { "type": "Feature", "properties": { "admin": "Angola", "name": "Angola", "continent": "Africa" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[16.326528354567042, -5.877470391466217], [16.573179965896141, -6.622644545115092], [16.860190870845226, -7.222297865429978], [17.089995965247166, -7.545688978712474], [17.472970004962288, -8.068551120641656], [18.134221632569048, -7.987677504104865], [18.464175652752683, -7.847014255406475], [19.016751743249664, -7.988245944860138], [19.166613396896079, -7.738183688999724], [19.417502475673214, -7.155428562044277], [20.037723016040214, -7.116361179231658], [20.091621534920616, -6.943090101756949], [20.60182295093832, -6.939317722199688], [20.514748162526526, -7.299605808138663], [21.728110792739752, -7.290872491081315], [21.74645592620336, -7.920084730667113], [21.949130893652033, -8.305900974158304], [21.80180138518795, -8.908706556842985], [21.875181919042397, -9.523707777548564], [22.208753289486417, -9.894796237836529], [22.155268182064326, -11.084801120653777], [22.402798292742428, -10.99307545333569], [22.837345411884762, -11.017621758674334], [23.456790805767461, -10.867863457892481], [23.912215203555743, -10.926826267137541], [24.017893507592614, -11.237298272347115], [23.904153680118235, -11.722281589406332], [24.079905226342895, -12.191296888887305], [23.930922072045373, -12.565847670138821], [24.0161365088947, -12.91104623784855], [21.933886346125941, -12.898437188369353], [21.887842644953871, -16.080310153876891], [22.562478468524283, -16.898451429921831], [23.215048455506086, -17.523116143465952], [21.377176141045592, -17.930636488519706], [18.956186964603628, -17.789094740472233], [18.263309360434217, -17.309950860262003], [14.209706658595049, -17.353100681225708], [14.058501417709035, -17.423380629142653], [13.462362094789963, -16.971211846588741], [12.814081251688405, -16.941342868724075], [12.21546146001938, -17.111668389558059], [11.734198846085146, -17.301889336824498], [11.640096062881609, -16.673142185129205], [11.778537224991563, -15.793816013250687], [12.123580763404444, -14.878316338767927], [12.175618930722264, -14.449143568583889], [12.500095249083014, -13.547699883684398], [12.738478631245439, -13.137905775609934], [13.312913852601834, -12.483630466362511], [13.633721144269824, -12.038644707897189], [13.738727654686924, -11.297863050993142], [13.686379428775293, -10.73107594161584], [13.38732791510216, -10.373578383020726], [13.120987583069873, -9.766897067914112], [12.875369500386567, -9.166933689005488], [12.929061313537797, -8.959091078327573], [13.23643273280987, -8.56262948978434], [12.933040398824314, -7.596538588087752], [12.728298374083916, -6.927122084178803], [12.227347039446441, -6.294447523629372], [12.322431674863562, -6.100092461779651], [12.735171339578695, -5.965682061388476], [13.024869419006988, -5.984388929878106], [13.375597364971892, -5.864241224799555], [16.326528354567042, -5.877470391466217]]], [[[12.436688266660919, -5.684303887559223], [12.182336866920277, -5.789930515163801], [11.914963006242115, -5.037986748884733], [12.318607618873923, -4.606230157086158], [12.620759718484548, -4.438023369976121], [12.995517205465202, -4.781103203961918], [12.631611769265842, -4.991271254092935], [12.468004184629759, -5.248361504744991], [12.436688266660919, -5.684303887559223]]]] } },
-            { "type": "Feature", "properties": { "admin": "Albania", "name": "Albania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.590247430104906, 41.855404161133592], [20.463175083099195, 41.515089016275333], [20.605181919037356, 41.086226304685219], [21.020040317476397, 40.842726955725873], [20.99998986174722, 40.580003973953964], [20.67499677906363, 40.43499990494302], [20.61500044117275, 40.110006822259365], [20.150015903410516, 39.624997666983965], [19.980000441170144, 39.694993394523401], [19.9600016618732, 39.915005805006039], [19.40608198413673, 40.250773423822459], [19.319058872157139, 40.727230129553554], [19.403549838954287, 41.409565741535445], [19.540027296637099, 41.71998607031275], [19.371768833094958, 41.87754751237064], [19.304486118250786, 42.195745144207812], [19.738051385179627, 42.688247382165564], [19.801613396898681, 42.500093492190835], [20.0707, 42.58863], [20.28375451018189, 42.320259507815074], [20.52295, 42.21787], [20.590247430104906, 41.855404161133592]]] } },
-            { "type": "Feature", "properties": { "admin": "United Arab Emirates", "name": "United Arab Emirates", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[51.579518670463258, 24.245497137951102], [51.757440626844172, 24.294072984305462], [51.794389275932865, 24.019826158132499], [52.577080519425593, 24.177439276622703], [53.404006788960139, 24.151316840099167], [54.008000929587574, 24.121757920828212], [54.693023716048614, 24.797892360935084], [55.439024692614126, 25.439145209244934], [56.070820753814544, 26.055464178973978], [56.261041701080948, 25.714606431576762], [56.396847365143991, 24.924732163995483], [55.886232537667993, 24.92083059335744], [55.804118686756212, 24.269604193615258], [55.981213820220454, 24.130542914317822], [55.528631626208231, 23.933604030853498], [55.525841098864461, 23.524869289640929], [55.234489373602869, 23.110992743415316], [55.208341098863187, 22.708329982997039], [55.006803012924898, 22.496947536707129], [52.000733270074321, 23.001154486578937], [51.617707553926969, 24.014219265228824], [51.579518670463258, 24.245497137951102]]] } },
-            { "type": "Feature", "properties": { "admin": "Argentina", "name": "Argentina", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-65.5, -55.2], [-66.45, -55.25], [-66.95992, -54.89681], [-67.56244, -54.87001], [-68.63335, -54.8695], [-68.634010227583147, -52.636370458874453], [-68.25, -53.1], [-67.75, -53.85], [-66.45, -54.45], [-65.05, -54.7], [-65.5, -55.2]]], [[[-64.964892137294569, -22.075861504812348], [-64.377021043542257, -22.79809132252354], [-63.986838141522462, -21.993644301035953], [-62.84646847192154, -22.034985446869452], [-62.685057135657885, -22.249029229422401], [-60.846564704009928, -23.880712579038299], [-60.028966030503973, -24.032796319273238], [-58.807128465394939, -24.771459242453268], [-57.777217169817952, -25.162339776309032], [-57.633660040911124, -25.603656508081666], [-58.618173590719707, -27.123718763947117], [-57.609759690976134, -27.395898532828419], [-56.486701626192989, -27.548499037386243], [-55.695845506398186, -27.387837009390815], [-54.788794928595038, -26.621785577096087], [-54.625290696823541, -25.739255466415479], [-54.130049607954412, -25.547639255477243], [-53.628348965048716, -26.12486500417743], [-53.648735317587885, -26.923472588816104], [-54.490725267135517, -27.474756768505767], [-55.162286342984586, -27.881915378533414], [-56.290899624239088, -28.852760512000849], [-57.62513342958291, -30.21629485445424], [-57.874937303281897, -31.016556084926158], [-58.14244035504074, -32.044503676076182], [-58.132647671121404, -33.040566908502008], [-58.349611172098818, -33.263188978815428], [-58.427074144104367, -33.909454441057541], [-58.495442064026541, -34.4314897600701], [-57.225829637263629, -35.288026625307886], [-57.362358771378737, -35.977390232081497], [-56.737487352105447, -36.413125909166574], [-56.788285285048339, -36.901571547189327], [-57.749156867083421, -38.183870538079901], [-59.231857062401865, -38.720220228837199], [-61.2374452378656, -38.92842457454114], [-62.335956997310134, -38.827707208004362], [-62.125763108962914, -39.424104913084868], [-62.33053097191943, -40.172586358400316], [-62.145994432205228, -40.676896661136723], [-62.74580278181697, -41.028761488612083], [-63.770494757732514, -41.166789239263657], [-64.732089809819698, -40.802677097335128], [-65.118035244391578, -41.064314874028874], [-64.97856055363583, -42.058000990569312], [-64.303407965742466, -42.359016208669495], [-63.755947842042339, -42.043686618824495], [-63.458059048095883, -42.563138116222355], [-64.378803880456289, -42.873558444999638], [-65.181803961839691, -43.495380954767782], [-65.328823411710133, -44.501366062193689], [-65.565268927661592, -45.03678557716978], [-66.509965786389344, -45.039627780945843], [-67.293793911392427, -45.551896254255183], [-67.580546434180079, -46.301772963242527], [-66.597066413017259, -47.033924655953804], [-65.641026577401433, -47.23613453551188], [-65.98508826360073, -48.133289076531128], [-67.166178961847649, -48.697337334996931], [-67.816087612566449, -49.869668877970412], [-68.728745083273154, -50.26421843851886], [-69.138539191347789, -50.732510267947788], [-68.815561489523517, -51.771104011594097], [-68.149994879820397, -52.349983406127699], [-68.571545376241332, -52.299443855346247], [-69.498362189396076, -52.142760912637236], [-71.914803839796321, -52.009022305865912], [-72.329403856074023, -51.425956312872394], [-72.309973517532342, -50.677009779666342], [-72.975746832964617, -50.741450290734299], [-73.328050910114456, -50.378785088909865], [-73.415435757120022, -49.318436374712952], [-72.648247443314929, -48.878618259476774], [-72.331160854771937, -48.244238376661819], [-72.44735531278026, -47.738532810253517], [-71.917258470330196, -46.884838148791786], [-71.552009446891233, -45.560732924177117], [-71.659315558545316, -44.973688653341434], [-71.222778896759721, -44.784242852559409], [-71.329800788036195, -44.407521661151677], [-71.793622606071935, -44.207172133156099], [-71.464056159130493, -43.787611179378324], [-71.915423956983901, -43.408564548517404], [-72.148898078078517, -42.254888197601375], [-71.746803758415453, -42.051386407235988], [-71.915734015577542, -40.832339369470716], [-71.680761277946445, -39.808164157878061], [-71.413516608349042, -38.916022230791107], [-70.814664272734703, -38.552995293940732], [-71.118625047475419, -37.576827487947192], [-71.121880662709771, -36.65812387466233], [-70.364769253201658, -36.005088799789931], [-70.388049485949082, -35.169687595359441], [-69.817309129501453, -34.193571465798279], [-69.814776984319209, -33.273886000299839], [-70.074399380153622, -33.09120981214803], [-70.535068935819439, -31.365010267870279], [-69.919008348251921, -30.336339206668306], [-70.013550381129861, -29.367922865518544], [-69.656130337183143, -28.459141127233686], [-69.001234910748266, -27.521213881136127], [-68.295541551370391, -26.899339694935787], [-68.594799770772667, -26.50690886811126], [-68.386001146097342, -26.185016371365229], [-68.417652960876111, -24.518554782816874], [-67.328442959244128, -24.025303236590908], [-66.985233934177629, -22.986348565362825], [-67.106673550063604, -22.735924574476392], [-66.273339402924833, -21.832310479420677], [-64.964892137294569, -22.075861504812348]]]] } },
-            { "type": "Feature", "properties": { "admin": "Armenia", "name": "Armenia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[43.582745802592726, 41.09214325618256], [44.972480096218071, 41.248128567055588], [45.179495883979335, 40.985353908851401], [45.560351189970433, 40.812289537105919], [45.359174839058156, 40.561503811193447], [45.891907179555076, 40.218475653639992], [45.610012241402913, 39.899993801425175], [46.034534132680662, 39.628020738273058], [46.483498976432443, 39.464154771475528], [46.505719842317966, 38.770605373686287], [46.143623081248812, 38.74120148371221], [45.735379266143006, 39.319719143219736], [45.739978468616975, 39.473999131827114], [45.298144972521456, 39.471751207022422], [45.00198733905674, 39.740003567049548], [44.793989699081934, 39.713002631177041], [44.400008579288695, 40.005000311842267], [43.656436395040934, 40.253563951166178], [43.752657911968399, 40.740200914058754], [43.582745802592726, 41.09214325618256]]] } },
-            { "type": "Feature", "properties": { "admin": "French Southern and Antarctic Lands", "name": "Fr. S. Antarctic Lands", "continent": "Seven seas (open ocean)" }, "geometry": { "type": "Polygon", "coordinates": [[[68.935, -48.625], [69.58, -48.94], [70.525, -49.065], [70.56, -49.255], [70.28, -49.71], [68.745, -49.775], [68.72, -49.2425], [68.8675, -48.83], [68.935, -48.625]]] } },
-            { "type": "Feature", "properties": { "admin": "Australia", "name": "Australia", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[145.397978143494782, -40.792548516605883], [146.364120721623692, -41.137695407883335], [146.908583612250823, -41.000546156580668], [147.689259474884125, -40.808258152022681], [148.289067824495987, -40.875437514002122], [148.359864536735785, -42.062445163746439], [148.017301467073082, -42.40702361426861], [147.914051955353784, -43.211522312188485], [147.564564243763982, -42.937688897473855], [146.87034305235494, -43.634597263362082], [146.663327264593647, -43.580853773778543], [146.048377720320389, -43.54974456153888], [145.431929559510536, -42.693776137056268], [145.295090366801674, -42.03360971452755], [144.7180713238306, -41.162551771815707], [144.743754510679622, -40.703975111657705], [145.397978143494782, -40.792548516605883]]], [[[143.561811151299935, -13.763655694232209], [143.922099237238882, -14.548310642152], [144.563713820574804, -14.171176039285879], [144.894908075133515, -14.594457696188622], [145.374723748963419, -14.984976495018284], [145.271991001567244, -15.428205254785691], [145.48525963763575, -16.285672295804769], [145.637033319276952, -16.784918308176611], [145.888904250267672, -16.906926364817647], [146.160308872664473, -17.76165455492524], [146.063673944278662, -18.280072523677315], [146.387478469019584, -18.958274021075905], [147.471081577747896, -19.480722751546676], [148.177601760042478, -19.955939222902767], [148.848413527623222, -20.391209812097252], [148.717465448195583, -20.633468926681513], [149.289420200802056, -21.260510756111096], [149.678337030230637, -22.342511895438388], [150.07738244038859, -22.122783705333315], [150.482939081015161, -22.556142266533012], [150.727265252891158, -22.402404880464655], [150.899554478152254, -23.462236830338679], [151.609175246384211, -24.076256198830755], [152.07353966695905, -24.45788665130619], [152.855197381805908, -25.267501316023008], [153.136162144176751, -26.071173191026187], [153.161948683890358, -26.641319268502439], [153.09290897034856, -27.260299574494503], [153.569469028944184, -28.110066827102099], [153.512108189100218, -28.995077406532751], [153.339095493787056, -29.458201592732443], [153.069241164358857, -30.350240166954809], [153.089601678681788, -30.923641859665445], [152.891577590139377, -31.640445651985949], [152.450002476205327, -32.550002536755237], [151.709117466436766, -33.041342054986337], [151.343971795862387, -33.816023451473846], [151.010555454715103, -34.310360202777879], [150.714139439089024, -35.173459974916803], [150.328219842733233, -35.671879164371923], [150.075212030232251, -36.420205580390508], [149.946124302367139, -37.109052422841224], [149.997283970336127, -37.425260512035123], [149.423882277625523, -37.772681166333463], [148.304622430615893, -37.809061374666875], [147.38173302631526, -38.219217217767543], [146.922122837511324, -38.606532077795116], [146.317921991154776, -39.035756524411433], [145.489652134380549, -38.593767999019043], [144.876976353128157, -38.41744801203911], [145.032212355732952, -37.896187839510972], [144.485682407814011, -38.085323581699257], [143.609973586196077, -38.809465427405321], [142.745426873952965, -38.538267510737519], [142.17832970598198, -38.380034275059835], [141.606581659104677, -38.308514092767872], [140.638578729413211, -38.019332777662541], [139.992158237874321, -37.402936293285094], [139.806588169514043, -36.643602797188272], [139.574147577065219, -36.138362318670666], [139.082808058834075, -35.732754001611774], [138.120747918856296, -35.612296237939397], [138.449461704664998, -35.127261244447887], [138.207564325106659, -34.384722588845925], [137.719170363516128, -35.07682504653102], [136.829405552314711, -35.260534763328614], [137.352371047108477, -34.707338555644093], [137.503886346588331, -34.130267836240769], [137.890116001537649, -33.640478610978327], [137.810327590079112, -32.900007012668105], [136.996837192940347, -33.752771498348629], [136.372069126531642, -34.094766127256186], [135.98904341038434, -34.89011809666048], [135.208212518454104, -34.478670342752601], [135.239218377829161, -33.947953383114971], [134.613416782774607, -33.222778008763136], [134.085903761939107, -32.848072198214759], [134.273902622617015, -32.617233575166949], [132.990776808809812, -32.011224053680188], [132.288080682504869, -31.982646986622761], [131.326330601120901, -31.495803318001041], [129.535793898639668, -31.590422865527476], [128.240937534702198, -31.948488864877849], [127.102867466338282, -32.282266941051041], [126.148713820501129, -32.2159660784206], [125.088623488465586, -32.728751316052829], [124.22164798390493, -32.959486586236061], [124.028946567888511, -33.483847344701708], [123.65966678273071, -33.890179131812722], [122.811036411633609, -33.914467054989835], [122.18306440642283, -34.003402194964217], [121.299190708502579, -33.821036065406126], [120.580268182458113, -33.930176690406618], [119.893695103028222, -33.976065362281808], [119.298899367348781, -34.50936614353396], [119.007340936357977, -34.464149265278529], [118.505717808100769, -34.746819349915093], [118.024971958489516, -35.064732761374707], [117.295507440257438, -35.025458672832862], [116.62510908413492, -35.025096937806829], [115.564346958479689, -34.386427911111547], [115.026808709779516, -34.196517022438918], [115.048616164206763, -33.623425388322026], [115.545123325667078, -33.487257989232951], [115.714673700016661, -33.259571628554944], [115.679378696761376, -32.900368747694124], [115.801645135563959, -32.205062351207026], [115.689610630355105, -31.612437025683782], [115.160909051576937, -30.601594333622455], [114.99704308477942, -30.030724786094162], [115.040037876446249, -29.461095472940794], [114.64197431850198, -28.810230808224706], [114.61649783738217, -28.516398614213042], [114.173579136208446, -28.118076674107321], [114.048883905088132, -27.33476531342712], [113.477497593236876, -26.543134047147898], [113.338953078262477, -26.116545098578477], [113.77835778204026, -26.549025160429174], [113.440962355606587, -25.621278171493152], [113.936901076311642, -25.911234633082877], [114.232852004047288, -26.298446140245868], [114.216160516417006, -25.786281019801105], [113.721255324357685, -24.998938897402123], [113.625343866024025, -24.683971042583146], [113.393523390762667, -24.384764499613262], [113.502043898575607, -23.80635019297025], [113.706992629045146, -23.56021534596406], [113.843418410295669, -23.059987481378734], [113.736551548316072, -22.475475355725372], [114.149756300921865, -21.755881036061009], [114.225307244932651, -22.51748829517863], [114.64776207891866, -21.829519952076904], [115.460167270979298, -21.495173435148541], [115.94737267462699, -21.068687839443708], [116.711615431791529, -20.701681817306817], [117.166316359527684, -20.623598728113802], [117.441545037914238, -20.746898695562162], [118.229558953932951, -20.374208265873232], [118.836085239742701, -20.263310642174822], [118.987807244951753, -20.044202569257319], [119.252493931150624, -19.952941989829835], [119.805225050944543, -19.976506442954978], [120.856220330896633, -19.683707777589188], [121.399856398607199, -19.239755547769729], [121.655137974129062, -18.70531788500713], [122.241665480641757, -18.197648614171765], [122.286623976735655, -17.798603204013911], [122.312772251475408, -17.254967136303446], [123.012574497571904, -16.405199883695854], [123.433789097183009, -17.268558037996225], [123.859344517106592, -17.069035332917249], [123.503242222183232, -16.596506036040363], [123.817073195491915, -16.11131601325199], [124.258286574399847, -16.32794361741956], [124.379726190285794, -15.567059828353973], [124.926152785340022, -15.07510019293532], [125.167275018413875, -14.680395603090004], [125.670086704613823, -14.510070082256018], [125.685796340030493, -14.230655612853834], [126.125149367376096, -14.347340996968949], [126.142822707219864, -14.095986830301211], [126.582589146023736, -13.95279143642041], [127.065867140817332, -13.817967624570922], [127.804633416861932, -14.276906019755042], [128.359689976108939, -14.869169610252253], [128.985543247595899, -14.875990899314738], [129.621473423379598, -14.969783623924553], [129.409600050982988, -14.420669854391031], [129.888640578328591, -13.618703301653481], [130.339465773642928, -13.357375583553473], [130.183506300985982, -13.107520033422301], [130.617795037966971, -12.536392103732464], [131.223494500859999, -12.183648776908113], [131.73509118054946, -12.302452894747159], [132.575298293183096, -12.114040622611013], [132.557211541881031, -11.603012383676683], [131.824698114143644, -11.273781833545097], [132.357223748911395, -11.128519382372641], [133.019560581596409, -11.376411228076844], [133.550845981989028, -11.786515394745134], [134.393068475481982, -12.042365411022173], [134.678632440327021, -11.9411829565947], [135.298491245667975, -12.248606052299051], [135.882693312727611, -11.962266940969796], [136.258380975489445, -12.049341729381606], [136.492475213771627, -11.857208754120389], [136.951620314684988, -12.351958916882735], [136.685124953355739, -12.887223402562054], [136.305406528875096, -13.291229750219895], [135.961758254134111, -13.324509372615889], [136.077616815332533, -13.72427825282578], [135.783836297753226, -14.223989353088211], [135.4286641786112, -14.715432224183896], [135.500184360903177, -14.997740573794427], [136.295174595281367, -15.550264987859121], [137.065360142159477, -15.870762220933353], [137.580470819244795, -16.215082289294084], [138.303217401278971, -16.807604261952658], [138.58516401586337, -16.806622409739173], [139.108542922115475, -17.062679131745366], [139.260574985918197, -17.371600843986183], [140.215245396078274, -17.710804945550063], [140.875463495039241, -17.36906869880394], [141.071110467696258, -16.832047214426719], [141.274095493738798, -16.388870131091604], [141.398222284103781, -15.840531508042584], [141.702183058844611, -15.044921156476928], [141.563380161708665, -14.561333103089506], [141.635520461188094, -14.270394789286284], [141.519868605718955, -13.698078301653805], [141.650920038011009, -12.944687595270562], [141.842691278246207, -12.741547539931187], [141.68699018775078, -12.407614434461134], [141.928629185147543, -11.877465915578778], [142.118488397387978, -11.328042087451619], [142.14370649634634, -11.04273650476814], [142.51526004452495, -10.668185723516642], [142.797310011974048, -11.157354831591515], [142.866763136974271, -11.784706719614929], [143.11594689348567, -11.90562957117791], [143.158631626558758, -12.325655612846187], [143.522123651299864, -12.834358412327429], [143.597157830987669, -13.400422051652594], [143.561811151299935, -13.763655694232209]]]] } },
-            { "type": "Feature", "properties": { "admin": "Austria", "name": "Austria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.979666782304033, 48.123497015976298], [16.903754103267257, 47.714865627628321], [16.340584344150411, 47.712901923201215], [16.534267612380372, 47.496170966169103], [16.202298211337361, 46.852385972676949], [16.011663852612653, 46.683610744811688], [15.137091912504982, 46.658702704447016], [14.632471551174827, 46.431817328469535], [13.806475457421524, 46.509306138691201], [12.376485223040813, 46.767559109069843], [12.153088006243051, 47.115393174826437], [11.164827915093268, 46.941579494812721], [11.048555942436533, 46.751358547546324], [10.442701450246627, 46.893546250997424], [9.932448357796657, 46.920728054382948], [9.479969516649019, 47.102809963563367], [9.632931756232974, 47.347601223329974], [9.594226108446346, 47.525058091820256], [9.896068149463188, 47.58019684507569], [10.402083774465209, 47.302487697939156], [10.544504021861625, 47.566399237653762], [11.426414015354736, 47.523766181012967], [12.141357456112784, 47.703083401065761], [12.620759718484491, 47.672387600284395], [12.932626987365945, 47.467645575543983], [13.025851271220487, 47.637583523135824], [12.884102817443901, 48.289145819687903], [13.243357374736998, 48.41611481382904], [13.595945672264433, 48.877171942737135], [14.33889773932472, 48.555305284207193], [14.901447381254055, 48.964401760445817], [15.253415561593979, 49.039074205107575], [16.029647251050218, 48.733899034207916], [16.49928266771877, 48.785808010445095], [16.960288120194573, 48.596982326850593], [16.879982944412998, 48.470013332709463], [16.979666782304033, 48.123497015976298]]] } },
-            { "type": "Feature", "properties": { "admin": "Azerbaijan", "name": "Azerbaijan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[45.001987339056789, 39.740003567049591], [45.298144972521435, 39.471751207022422], [45.739978468616997, 39.473999131827149], [45.735379266143092, 39.319719143219785], [46.143623081248812, 38.74120148371221], [45.457721795438729, 38.874139105783108], [44.952688022650264, 39.33576467544642], [44.79398969908199, 39.713002631177027], [45.001987339056789, 39.740003567049591]]], [[[47.373315464066216, 41.219732367511249], [47.81566572448471, 41.151416124021338], [47.987283156126033, 41.405819200194223], [48.584352654826283, 41.808869533854669], [49.110263706260653, 41.282286688800518], [49.618914829309588, 40.572924302729966], [50.084829542853093, 40.526157131505776], [50.392821079312704, 40.256561184239096], [49.569202101444795, 40.176100979160701], [49.395259230350419, 39.39948171646224], [49.2232283872507, 39.04921885838791], [48.856532423707584, 38.815486355131775], [48.883249139202533, 38.320245266262638], [48.634375441284831, 38.270377509100925], [48.010744256386502, 38.794014797514528], [48.355529412637928, 39.288764960276886], [48.060095249225256, 39.582235419262439], [47.685079380083117, 39.508363959301185], [46.505719842317966, 38.770605373686251], [46.483498976432443, 39.464154771475528], [46.034534132680697, 39.628020738273044], [45.610012241402913, 39.899993801425175], [45.891907179555133, 40.21847565363997], [45.359174839058156, 40.561503811193482], [45.560351189970469, 40.812289537105947], [45.179495883979392, 40.98535390885143], [44.972480096218156, 41.248128567055623], [45.217426385281634, 41.411451931314041], [45.962600538930438, 41.123872585609789], [46.501637404166978, 41.064444688474104], [46.637908156120567, 41.181672675128219], [46.145431756378983, 41.72280243587263], [46.404950799348818, 41.860675157227341], [46.686070591016652, 41.827137152669899], [47.373315464066216, 41.219732367511249]]]] } },
-            { "type": "Feature", "properties": { "admin": "Burundi", "name": "Burundi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[29.339997592900342, -4.499983412294092], [29.276383904749046, -3.293907159034063], [29.02492638521678, -2.839257907730157], [29.632176141078585, -2.917857761246096], [29.938359002407935, -2.348486830254238], [30.469696079232978, -2.413857517103458], [30.527677036264457, -2.807631931167534], [30.743012729624692, -3.034284763199686], [30.752262811004943, -3.359329522315569], [30.505559523243559, -3.568567396665364], [30.116332635221166, -4.090137627787242], [29.753512404099919, -4.45238941815328], [29.339997592900342, -4.499983412294092]]] } },
-            { "type": "Feature", "properties": { "admin": "Belgium", "name": "Belgium", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[3.314971144228536, 51.345780951536071], [4.047071160507527, 51.267258612668556], [4.973991326526913, 51.475023708698124], [5.60697594567, 51.037298488969768], [6.156658155958779, 50.803721015010574], [6.043073357781109, 50.128051662794221], [5.782417433300905, 50.090327867221205], [5.674051954784828, 49.52948354755749], [4.799221632515809, 49.985373033236371], [4.286022983425084, 49.90749664977254], [3.588184441755685, 50.378992418003563], [3.123251580425801, 50.780363267614561], [2.658422071960274, 50.796848049515731], [2.513573032246142, 51.148506171261815], [3.314971144228536, 51.345780951536071]]] } },
-            { "type": "Feature", "properties": { "admin": "Benin", "name": "Benin", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.691701694356254, 6.258817246928628], [1.865240512712318, 6.14215770102973], [1.618950636409238, 6.832038072126236], [1.664477573258381, 9.128590399609378], [1.46304284018467, 9.334624335157086], [1.425060662450136, 9.825395412632998], [1.077795037448737, 10.175606594275022], [0.772335646171484, 10.470808213742357], [0.899563022474069, 10.997339382364258], [1.243469679376488, 11.11051076908346], [1.447178175471066, 11.547719224488857], [1.93598554851988, 11.641150214072551], [2.154473504249921, 11.940150051313337], [2.49016360841793, 12.233052069543671], [2.84864301922667, 12.235635891158266], [3.611180454125558, 11.660167141155966], [3.572216424177469, 11.327939357951516], [3.797112257511713, 10.734745591673104], [3.600070021182801, 10.332186184119406], [3.705438266625918, 10.063210354040207], [3.220351596702101, 9.4441525333997], [2.912308383810255, 9.13760793704432], [2.723792758809509, 8.506845404489708], [2.74906253420022, 7.870734361192886], [2.691701694356254, 6.258817246928628]]] } },
-            { "type": "Feature", "properties": { "admin": "Burkina Faso", "name": "Burkina Faso", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.827496303712706, 9.642460842319775], [-3.511898972986272, 9.900326239456216], [-3.980449184576684, 9.862344061721698], [-4.330246954760383, 9.610834865757139], [-4.779883592131966, 9.821984768101741], [-4.954653286143098, 10.152713934769732], [-5.404341599946973, 10.370736802609144], [-5.470564947929004, 10.951269842976044], [-5.197842576508648, 11.375145778850136], [-5.220941941743119, 11.713858954307224], [-4.427166103523802, 12.542645575404292], [-4.280405035814879, 13.228443508349738], [-4.006390753587225, 13.472485459848112], [-3.52280270019986, 13.337661647998612], [-3.103706834312759, 13.54126679122859], [-2.967694464520576, 13.798150336151506], [-2.191824510090384, 14.246417548067352], [-2.001035122068771, 14.559008287000887], [-1.066363491205663, 14.973815009007764], [-0.515854458000348, 15.116157741755725], [-0.26625729003058, 14.924308986872147], [0.374892205414682, 14.928908189346128], [0.295646396495101, 14.444234930880651], [0.429927605805517, 13.988733018443922], [0.993045688490071, 13.335749620003821], [1.024103224297477, 12.851825669806573], [2.177107781593775, 12.625017808477532], [2.154473504249921, 11.940150051313337], [1.93598554851988, 11.641150214072551], [1.447178175471066, 11.547719224488857], [1.243469679376488, 11.11051076908346], [0.899563022474069, 10.997339382364258], [0.023802524423701, 11.018681748900802], [-0.438701544588582, 11.09834096927872], [-0.761575893548183, 10.936929633015053], [-1.203357713211431, 11.009819240762736], [-2.94040930827046, 10.962690334512557], [-2.963896246747111, 10.395334784380081], [-2.827496303712706, 9.642460842319775]]] } },
-            { "type": "Feature", "properties": { "admin": "Bangladesh", "name": "Bangladesh", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[92.672720981825549, 22.041238918541247], [92.652257114637976, 21.324047552978481], [92.30323449093865, 21.475485337809815], [92.368553501355606, 20.670883287025344], [92.082886183646124, 21.192195135985767], [92.025215285208361, 21.701569729086764], [91.834890985077408, 22.182935695885561], [91.417087029997646, 22.765019029221218], [90.496006300827247, 22.805016587815125], [90.586956821660948, 22.392793687422863], [90.272970819055544, 21.836367702720107], [89.847467075564268, 22.039146023033421], [89.70204959509492, 21.857115790285299], [89.41886274613546, 21.966178900637296], [89.031961297566198, 22.055708319582973], [88.876311883503064, 22.879146429937826], [88.529769728553759, 23.631141872649163], [88.699940220090895, 24.233714911388557], [88.084422235062405, 24.501657212821918], [88.30637251175601, 24.866079413344199], [88.931553989623069, 25.238692328384769], [88.209789259802477, 25.768065700782707], [88.56304935094974, 26.446525580342716], [89.355094028687276, 26.014407253518065], [89.832480910199592, 25.965082098895476], [89.920692580121838, 25.269749864192171], [90.872210727912105, 25.13260061288954], [91.799595981822065, 25.14743174895731], [92.376201613334786, 24.976692816664961], [91.915092807994398, 24.130413723237108], [91.467729933643668, 24.072639471934789], [91.158963250699713, 23.503526923104381], [91.706475050832083, 22.985263983649183], [91.869927606171302, 23.62434642180278], [92.146034783906799, 23.62749868417259], [92.672720981825549, 22.041238918541247]]] } },
-            { "type": "Feature", "properties": { "admin": "Bulgaria", "name": "Bulgaria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.657149692482985, 44.234923000661276], [22.94483239105184, 43.823785305347123], [23.332302280376322, 43.897010809904707], [24.100679152124169, 43.741051337247846], [25.569271681426923, 43.688444729174712], [26.065158725699739, 43.943493760751259], [27.242399529740904, 44.175986029632398], [27.970107049275068, 43.812468166675202], [28.55808149589199, 43.707461656258118], [28.039095086384712, 43.293171698574177], [27.673897739378042, 42.577892361006214], [27.996720411905383, 42.007358710287775], [27.135739373490473, 42.141484890301335], [26.117041863720793, 41.826904608724554], [26.106138136507205, 41.328898830727766], [25.197201368925441, 41.234485988930523], [24.492644891058031, 41.583896185872028], [23.692073601992345, 41.309080918943842], [22.952377150166445, 41.337993882811141], [22.881373732197424, 41.999297186850242], [22.380525750424585, 42.320259507815081], [22.545011834409614, 42.461362006188025], [22.436594679461273, 42.580321153323929], [22.604801466571324, 42.898518785161137], [22.986018507588479, 43.211161200526959], [22.500156691180276, 43.642814439460977], [22.410446404721593, 44.008063462899948], [22.657149692482985, 44.234923000661276]]] } },
-            { "type": "Feature", "properties": { "admin": "The Bahamas", "name": "Bahamas", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-77.53466, 23.75975], [-77.78, 23.71], [-78.03405, 24.28615], [-78.40848, 24.57564], [-78.19087, 25.2103], [-77.89, 25.17], [-77.54, 24.34], [-77.53466, 23.75975]]], [[[-77.82, 26.58], [-78.91, 26.42], [-78.98, 26.79], [-78.51, 26.87], [-77.85, 26.84], [-77.82, 26.58]]], [[[-77.0, 26.59], [-77.17255, 25.87918], [-77.35641, 26.00735], [-77.34, 26.53], [-77.78802, 26.92516], [-77.79, 27.04], [-77.0, 26.59]]]] } },
-            { "type": "Feature", "properties": { "admin": "Bosnia and Herzegovina", "name": "Bosnia and Herz.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.005486281010118, 44.860233669609144], [19.36803, 44.863], [19.11761, 44.42307], [19.59976, 44.03847], [19.454, 43.568100000000115], [19.21852, 43.52384], [19.03165, 43.43253], [18.70648, 43.20011], [18.56, 42.65], [17.674921502358981, 43.028562527023603], [17.297373488034449, 43.446340643887353], [16.916156447017325, 43.667722479825663], [16.456442905348862, 44.041239732431265], [16.239660271884528, 44.351143296885695], [15.750026075918978, 44.81871165626255], [15.959367303133373, 45.233776760430935], [16.318156772535868, 45.004126695325901], [16.534939406000202, 45.211607570977705], [17.00214603035101, 45.233776760430935], [17.861783481526398, 45.067740383477137], [18.553214145591646, 45.08158966733145], [19.005486281010118, 44.860233669609144]]] } },
-            { "type": "Feature", "properties": { "admin": "Belarus", "name": "Belarus", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[23.484127638449841, 53.912497667041123], [24.45068362803703, 53.905702216194747], [25.536353794056989, 54.282423407602515], [25.768432651479792, 54.846962592175082], [26.588279249790386, 55.167175604871659], [26.494331495883749, 55.61510691997762], [27.102459751094525, 55.783313707087672], [28.17670942557799, 56.169129950578807], [29.2295133806603, 55.918344224666356], [29.371571893030669, 55.67009064393617], [29.896294386522353, 55.789463202530406], [30.87390913262, 55.550976467503396], [30.971835971813132, 55.081547756564028], [30.75753380709871, 54.811770941784303], [31.384472283663733, 54.157056382862422], [31.791424187962232, 53.974638576872117], [31.731272820774503, 53.794029446012011], [32.405598585751157, 53.618045355842028], [32.693643019346034, 53.351420803432106], [32.304519484188226, 53.132726141972903], [31.497643670382924, 53.167426866256889], [31.30520063652801, 53.073995876673195], [31.540018344862254, 52.742052313846344], [31.78599816257158, 52.10167796488544], [30.927549269338975, 52.042353420614383], [30.619454380014837, 51.822806098022362], [30.55511722181145, 51.319503485715643], [30.157363722460889, 51.416138414101454], [29.254938185347921, 51.368234361366881], [28.992835320763522, 51.602044379271462], [28.617612745892242, 51.427713934934836], [28.241615024536564, 51.572227077839059], [27.454066196408426, 51.59230337178446], [26.337958611768549, 51.832288723347915], [25.327787713327005, 51.910656032918538], [24.553106316839511, 51.888461005249177], [24.005077752384206, 51.617443956094448], [23.52707075368437, 51.578454087930233], [23.508002150168689, 52.023646552124717], [23.19949384938618, 52.486977444053664], [23.799198846133375, 52.691099351606553], [23.804934930117774, 53.08973135030606], [23.527535841574995, 53.47012156840654], [23.484127638449841, 53.912497667041123]]] } },
-            { "type": "Feature", "properties": { "admin": "Belize", "name": "Belize", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-89.143080410503302, 17.808318996649316], [-89.150909389995519, 17.955467637600414], [-89.029857347351808, 18.001511338772485], [-88.848343878926585, 17.883198147040229], [-88.490122850279334, 18.486830552641603], [-88.300031094093669, 18.499982204659897], [-88.296336229184803, 18.353272813383263], [-88.106812913754368, 18.348673610909284], [-88.123478563168476, 18.076674709541003], [-88.285354987322776, 17.644142971258031], [-88.197866787452625, 17.489475409408453], [-88.302640753924422, 17.13169363043566], [-88.239517991879893, 17.036066392479551], [-88.355428229510551, 16.530774237529624], [-88.551824510435821, 16.265467434143144], [-88.732433641295927, 16.233634751851351], [-88.930612759135244, 15.887273464415072], [-89.229121670269265, 15.886937567605166], [-89.15080603713092, 17.015576687075832], [-89.143080410503302, 17.808318996649316]]] } },
-            { "type": "Feature", "properties": { "admin": "Bolivia", "name": "Bolivia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.84646847192154, -22.034985446869442], [-63.986838141522462, -21.993644301035946], [-64.377021043542243, -22.798091322523533], [-64.964892137294598, -22.07586150481232], [-66.273339402924833, -21.832310479420713], [-67.10667355006359, -22.735924574476414], [-67.82817989772272, -22.872918796482171], [-68.219913092711266, -21.494346612231858], [-68.757167121033731, -20.372657972904459], [-68.442225104430904, -19.405068454671426], [-68.966818406841853, -18.9816834449041], [-69.100246955019472, -18.260125420812674], [-69.590423753524036, -17.580011895419329], [-68.959635382753291, -16.500697930571267], [-69.389764166934697, -15.66012908291165], [-69.160346645774936, -15.323973890853015], [-69.339534674747, -14.953195489158828], [-68.94888668483658, -14.45363941819328], [-68.929223802349526, -13.602683607643007], [-68.880079515239956, -12.89972909917665], [-68.665079718689611, -12.561300144097171], [-69.52967810736493, -10.951734307502193], [-68.786157599549469, -11.036380303596276], [-68.27125362819325, -11.014521172736817], [-68.048192308205373, -10.712059014532484], [-67.173801235610725, -10.30681243249961], [-66.646908331962791, -9.931331475466861], [-65.33843522811641, -9.76198780684639], [-65.444837002205375, -10.51145110437543], [-65.321898769783004, -10.895872084194675], [-65.402281460213018, -11.566270440317151], [-64.31635291203159, -12.461978041232191], [-63.196498786050562, -12.627032565972433], [-62.803060268796372, -13.000653171442682], [-62.127080857986371, -13.19878061284972], [-61.713204311760769, -13.489202162330049], [-61.084121263255646, -13.479383640194595], [-60.503304002511122, -13.775954685117656], [-60.459198167550014, -14.354007256734551], [-60.264326341377355, -14.645979099183638], [-60.251148851142922, -15.077218926659318], [-60.542965664295131, -15.093910414289592], [-60.158389655179022, -16.258283786690082], [-58.241219855366673, -16.299573256091289], [-58.388058437724027, -16.877109063385273], [-58.280804002502244, -17.271710300366014], [-57.734558274960989, -17.552468357007765], [-57.498371141170971, -18.174187513911289], [-57.676008877174297, -18.961839694904025], [-57.949997321185819, -19.400004164306814], [-57.853801642474494, -19.969995212486186], [-58.166392381408038, -20.176700941653674], [-58.183471442280492, -19.868399346600359], [-59.11504248720609, -19.356906019775398], [-60.043564622626477, -19.342746677327419], [-61.786326463453761, -19.633736667562957], [-62.265961269770784, -20.513734633061272], [-62.291179368729203, -21.051634616787389], [-62.685057135657871, -22.24902922942238], [-62.84646847192154, -22.034985446869442]]] } },
-            { "type": "Feature", "properties": { "admin": "Brazil", "name": "Brazil", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.290899624239067, -28.852760512000884], [-55.162286342984558, -27.881915378533456], [-54.49072526713551, -27.474756768505785], [-53.648735317587885, -26.923472588816086], [-53.628348965048737, -26.124865004177465], [-54.130049607954376, -25.547639255477247], [-54.625290696823562, -25.739255466415507], [-54.428946092330577, -25.162184747012162], [-54.293476325077435, -24.570799655863958], [-54.292959560754511, -24.021014092710722], [-54.652834235235119, -23.839578138933955], [-55.027901780809543, -24.001273695575225], [-55.400747239795407, -23.956935316668797], [-55.517639329639621, -23.57199757252663], [-55.61068274598113, -22.655619398694839], [-55.797958136606894, -22.356929620047815], [-56.473317430229379, -22.086300144135279], [-56.881509568902885, -22.282153822521476], [-57.937155727761287, -22.090175876557169], [-57.870673997617786, -20.732687676681948], [-58.166392381408038, -20.176700941653674], [-57.853801642474494, -19.969995212486186], [-57.949997321185819, -19.400004164306814], [-57.676008877174297, -18.961839694904025], [-57.498371141170971, -18.174187513911289], [-57.734558274960989, -17.552468357007765], [-58.280804002502244, -17.271710300366014], [-58.388058437724027, -16.877109063385273], [-58.241219855366673, -16.299573256091289], [-60.158389655179022, -16.258283786690082], [-60.542965664295131, -15.093910414289592], [-60.251148851142922, -15.077218926659318], [-60.264326341377355, -14.645979099183638], [-60.459198167550014, -14.354007256734551], [-60.503304002511122, -13.775954685117656], [-61.084121263255646, -13.479383640194595], [-61.713204311760769, -13.489202162330049], [-62.127080857986371, -13.19878061284972], [-62.803060268796372, -13.000653171442682], [-63.196498786050562, -12.627032565972433], [-64.31635291203159, -12.461978041232191], [-65.402281460213018, -11.566270440317151], [-65.321898769783004, -10.895872084194675], [-65.444837002205375, -10.51145110437543], [-65.33843522811641, -9.76198780684639], [-66.646908331962791, -9.931331475466861], [-67.173801235610725, -10.30681243249961], [-68.048192308205373, -10.712059014532484], [-68.27125362819325, -11.014521172736817], [-68.786157599549469, -11.036380303596276], [-69.52967810736493, -10.951734307502193], [-70.093752204046879, -11.123971856331011], [-70.548685675728393, -11.009146823778462], [-70.481893886991159, -9.490118096558842], [-71.302412278921523, -10.079436130415372], [-72.184890713169821, -10.05359791426943], [-72.563033006465631, -9.520193780152715], [-73.226713426390148, -9.462212823121233], [-73.015382656532537, -9.03283334720806], [-73.571059332967053, -8.424446709835832], [-73.987235480429646, -7.523829847853063], [-73.723401455363486, -7.340998630404412], [-73.724486660441627, -6.918595472850638], [-73.120027431923575, -6.629930922068238], [-73.219711269814596, -6.089188734566076], [-72.964507208941185, -5.741251315944892], [-72.891927659787243, -5.274561455916979], [-71.748405727816532, -4.59398284263301], [-70.928843349883564, -4.401591485210367], [-70.79476884630229, -4.251264743673302], [-69.893635219996611, -4.298186944194326], [-69.444101935489599, -1.556287123219817], [-69.420485805932216, -1.122618503426409], [-69.577065395776586, -0.549991957200163], [-70.02065589057004, -0.185156345219539], [-70.015565761989293, 0.541414292804205], [-69.452396002872447, 0.706158758950693], [-69.252434048119042, 0.602650865070075], [-69.218637661400166, 0.985676581217433], [-69.804596727157701, 1.089081122233466], [-69.816973232691609, 1.714805202639624], [-67.868565029558823, 1.692455145673392], [-67.537810024674684, 2.037162787276329], [-67.25999752467358, 1.719998684084956], [-67.065048183852483, 1.130112209473225], [-66.876325853122566, 1.253360500489336], [-66.325765143484944, 0.724452215982012], [-65.548267381437554, 0.78925446207603], [-65.354713304288353, 1.0952822941085], [-64.611011928959854, 1.328730576987041], [-64.199305792890499, 1.49285492594602], [-64.083085496666072, 1.91636912679408], [-63.368788011311644, 2.200899562993129], [-63.422867397705105, 2.411067613124174], [-64.269999152265783, 2.497005520025566], [-64.408827887617903, 3.126786200366623], [-64.368494432214092, 3.797210394705246], [-64.816064012294007, 4.056445217297422], [-64.628659430587533, 4.14848094320925], [-63.888342861574145, 4.020530096854571], [-63.093197597899092, 3.770571193858784], [-62.804533047116692, 4.006965033377951], [-62.085429653559125, 4.162123521334308], [-60.966893276601517, 4.536467596856638], [-60.601179165271922, 4.918098049332129], [-60.733574184803707, 5.2002772078619], [-60.213683437731319, 5.2444863956876], [-59.980958624904865, 5.014061184098138], [-60.111002366767373, 4.574966538914082], [-59.767405768458701, 4.423502915866606], [-59.538039923731219, 3.958802598481937], [-59.815413174057852, 3.606498521332085], [-59.974524909084543, 2.755232652188055], [-59.718545701726732, 2.249630438644359], [-59.646043667221242, 1.786893825686789], [-59.030861579002639, 1.317697658692722], [-58.540012986878288, 1.26808828369252], [-58.429477098205957, 1.46394196207872], [-58.113449876525003, 1.507195135907025], [-57.660971035377358, 1.682584947105638], [-57.33582292339689, 1.948537705895759], [-56.782704230360814, 1.863710842288653], [-56.53938574891454, 1.89952260986692], [-55.995698004771739, 1.817667141116601], [-55.905600145070871, 2.021995754398659], [-56.073341844290283, 2.220794989425499], [-55.973322109589361, 2.510363877773016], [-55.569755011605984, 2.42150625244713], [-55.097587449755125, 2.523748073736612], [-54.524754197799709, 2.311848863123785], [-54.088062506717243, 2.105556545414629], [-53.778520677288903, 2.376702785650081], [-53.554839240113537, 2.33489655192595], [-53.4184651352953, 2.05338918701598], [-52.939657151894949, 2.124857692875636], [-52.556424730018414, 2.504705308437053], [-52.249337531123942, 3.241094468596244], [-51.657797410678882, 4.156232408053028], [-51.317146369010842, 4.203490505383953], [-51.069771287629649, 3.65039765056403], [-50.508875291533641, 1.901563828942456], [-49.974075893745045, 1.736483465986069], [-49.947100796088705, 1.046189683431223], [-50.699251268096901, 0.222984117021681], [-50.388210822132123, -0.078444512536819], [-48.620566779156313, -0.235489190271821], [-48.584496629416577, -1.237805271005001], [-47.824956427590621, -0.5816179337628], [-46.566583624851219, -0.941027520352776], [-44.9057030909904, -1.551739597178134], [-44.417619187993658, -2.137750339367975], [-44.581588507655773, -2.691308282078523], [-43.418791266440188, -2.383110039889793], [-41.47265682632824, -2.912018324397116], [-39.97866533055403, -2.87305429444904], [-38.50038347019656, -3.700652357603394], [-37.223252122535193, -4.820945733258915], [-36.45293738457638, -5.109403578312153], [-35.597795783010454, -5.149504489770648], [-35.235388963347553, -5.464937432480245], [-34.896029832486825, -6.738193047719709], [-34.729993455533027, -7.343220716992965], [-35.128212042774216, -8.996401462442284], [-35.636966518687707, -9.649281508017811], [-37.046518724096991, -11.040721123908799], [-37.683611619607355, -12.17119475672582], [-38.423876512188436, -13.038118584854285], [-38.673887091616507, -13.057652276260615], [-38.953275722802537, -13.79336964280002], [-38.882298143049645, -15.667053724838764], [-39.161092495264306, -17.208406670808468], [-39.267339240056394, -17.867746270420479], [-39.583521491034219, -18.262295830968934], [-39.76082333022763, -19.599113457927402], [-40.774740770010332, -20.90451181405242], [-40.944756232250597, -21.937316989837807], [-41.75416419123821, -22.370675551037454], [-41.988284267736546, -22.970070489190888], [-43.074703742024738, -22.967693373305462], [-44.647811855637798, -23.351959323827838], [-45.35213578955991, -23.796841729428579], [-46.472093268405523, -24.088968601174539], [-47.648972337420645, -24.885199069927715], [-48.495458136577689, -25.877024834905647], [-48.641004808127725, -26.623697605090928], [-48.474735887228647, -27.175911960561887], [-48.661520351747612, -28.186134535435713], [-48.888457404157393, -28.674115085567877], [-49.587329474472668, -29.224469089476333], [-50.696874152211478, -30.984465020472953], [-51.576226162306149, -31.777698256153204], [-52.256081305538032, -32.245369968394662], [-52.71209998229768, -33.196578057591175], [-53.373661668498229, -33.768377780900757], [-53.650543992718084, -33.202004082981823], [-53.209588995971529, -32.727666110974717], [-53.787951626182185, -32.047242526987617], [-54.572451544805105, -31.494511407193745], [-55.601510179249331, -30.853878676071385], [-55.97324459494093, -30.883075860316296], [-56.976025763564721, -30.109686374636119], [-57.625133429582945, -30.216294854454258]]] } },
-            { "type": "Feature", "properties": { "admin": "Brunei", "name": "Brunei", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[114.204016554828343, 4.525873928236805], [114.599961379048707, 4.900011298029965], [115.450710483869798, 5.447729803891532], [115.405700311343566, 4.955227565933837], [115.347460972150643, 4.316636053887009], [114.869557326315373, 4.348313706881924], [114.659595981913498, 4.007636826997753], [114.204016554828343, 4.525873928236805]]] } },
-            { "type": "Feature", "properties": { "admin": "Bhutan", "name": "Bhutan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[91.69665652869665, 27.771741848251661], [92.10371178585973, 27.4526140406332], [92.033483514375078, 26.838310451763554], [91.217512648486405, 26.808648179628019], [90.37327477413406, 26.875724188742872], [89.744527622438838, 26.71940298105995], [88.835642531289366, 27.098966376243755], [88.814248488320544, 27.299315904239361], [89.475810174521101, 28.04275889740639], [90.015828891971154, 28.296438503527209], [90.730513950567769, 28.064953925075748], [91.258853794319904, 28.040614325466287], [91.69665652869665, 27.771741848251661]]] } },
-            { "type": "Feature", "properties": { "admin": "Botswana", "name": "Botswana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[25.649163445750155, -18.536025892818987], [25.850391473094724, -18.714412937090533], [26.164790887158478, -19.293085625894935], [27.296504754350501, -20.391519870690995], [27.724747348753247, -20.499058526290387], [27.727227817503252, -20.851801853114711], [28.02137007010861, -21.485975030200578], [28.794656202924209, -21.639454034107445], [29.432188348109033, -22.091312758067584], [28.017235955525244, -22.827753594659072], [27.119409620886238, -23.574323011979772], [26.78640669119741, -24.240690606383478], [26.485753208123292, -24.616326592713097], [25.941652052522151, -24.696373386333214], [25.765848829865206, -25.174845472923671], [25.664666375437712, -25.486816094669706], [25.025170525825782, -25.719670098576891], [24.211266717228792, -25.670215752873567], [23.733569777122703, -25.39012948985161], [23.312096795350179, -25.268689873965712], [22.824271274514896, -25.500458672794768], [22.579531691180584, -25.979447523708142], [22.105968865657864, -26.28025603607913], [21.60589603036939, -26.726533705351748], [20.889609002371731, -26.828542982695907], [20.666470167735437, -26.477453301704916], [20.758609246511831, -25.868136488551446], [20.165725538827186, -24.917961928000768], [19.895767856534427, -24.767790215760588], [19.895457797940672, -21.849156996347865], [20.881134067475866, -21.814327080983144], [20.910641310314531, -18.252218926672018], [21.655040317478971, -18.219146010005222], [23.196858351339298, -17.869038181227783], [23.579005568137713, -18.281261081620055], [24.217364536239209, -17.889347019118485], [24.520705193792534, -17.887124932529932], [25.084443393664564, -17.661815687737366], [25.264225701608005, -17.736539808831413], [25.649163445750155, -18.536025892818987]]] } },
-            { "type": "Feature", "properties": { "admin": "Central African Republic", "name": "Central African Rep.", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[15.279460483469107, 7.421924546737968], [16.106231723706767, 7.497087917506504], [16.290561557691884, 7.754307359239304], [16.456184523187343, 7.734773667832966], [16.705988396886251, 7.508327541529978], [17.964929640380884, 7.890914008002865], [18.389554884523218, 8.281303615751822], [18.911021762780504, 8.630894680206351], [18.81200971850927, 8.982914536978596], [19.094008009526018, 9.074846910025837], [20.059685499764267, 9.01270600019485], [21.00086836109616, 9.475985215691507], [21.723821648859452, 10.567055568885973], [22.231129184668784, 10.971888739460507], [22.864165480244218, 11.142395127807543], [22.977543572692603, 10.714462591998538], [23.554304233502187, 10.089255275915306], [23.557249790142826, 9.681218166538683], [23.394779087017181, 9.26506785729222], [23.459012892355979, 8.954285793488891], [23.805813429466745, 8.666318874542425], [24.567369012152078, 8.229187933785466], [25.114932488716786, 7.825104071479172], [25.12413089366472, 7.500085150579436], [25.796647983511171, 6.979315904158069], [26.21341840994511, 6.546603298362071], [26.465909458123232, 5.94671743410187], [27.213409051225163, 5.550953477394557], [27.374226108517483, 5.233944403500059], [27.044065382604703, 5.127852688004835], [26.402760857862535, 5.150874538590869], [25.650455356557465, 5.256087754737123], [25.278798455514302, 5.170408229997191], [25.128833449003274, 4.927244777847789], [24.805028924262409, 4.897246608902349], [24.41053104014625, 5.108784084489129], [23.297213982850135, 4.609693101414221], [22.841479526468103, 4.710126247573483], [22.704123569436284, 4.633050848810156], [22.405123732195531, 4.02916006104732], [21.659122755630019, 4.224341945813719], [20.927591180106273, 4.322785549329736], [20.290679152108932, 4.691677761245287], [19.467783644293146, 5.031527818212779], [18.932312452884755, 4.709506130385973], [18.542982211997778, 4.201785183118317], [18.453065219809925, 3.504385891123348], [17.809900343505259, 3.560196437998569], [17.133042433346297, 3.728196519379451], [16.537058139724135, 3.198254706226278], [16.01285241055535, 2.267639675298084], [15.907380812247649, 2.557389431158612], [15.862732374747479, 3.013537298998982], [15.405395948964379, 3.335300604664339], [15.036219516671249, 3.851367295747123], [14.950953403389658, 4.21038930909492], [14.478372430080466, 4.732605495620446], [14.558935988023501, 5.03059764243153], [14.459407179429345, 5.451760565610299], [14.536560092841111, 6.22695872642069], [14.776545444404572, 6.408498033062044], [15.279460483469107, 7.421924546737968]]] } },
-            { "type": "Feature", "properties": { "admin": "Canada", "name": "Canada", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-63.6645, 46.55001], [-62.9393, 46.41587], [-62.01208, 46.44314], [-62.50391, 46.03339], [-62.87433, 45.96818], [-64.1428, 46.39265], [-64.39261, 46.72747], [-64.01486, 47.03601], [-63.6645, 46.55001]]], [[[-61.806305, 49.10506], [-62.29318, 49.08717], [-63.58926, 49.40069], [-64.51912, 49.87304], [-64.17322, 49.95718], [-62.85829, 49.70641], [-61.835585, 49.28855], [-61.806305, 49.10506]]], [[[-123.510001587551116, 48.51001089130343], [-124.012890788399474, 48.370846259141402], [-125.655012777338342, 48.825004584338494], [-125.954994466792726, 49.179995835967638], [-126.850004435871853, 49.530000311880421], [-127.029993449544392, 49.814995835970073], [-128.059336304366212, 49.994959011426594], [-128.444584107102145, 50.53913768167611], [-128.358413656255408, 50.770648098343678], [-127.308581096029883, 50.552573554071948], [-126.695000977212302, 50.40090322529538], [-125.755006673823161, 50.295018215529367], [-125.415001587558791, 49.950000515332604], [-124.920768189119315, 49.47527497008339], [-123.92250870832099, 49.062483628935794], [-123.510001587551116, 48.51001089130343]]], [[[-56.134035814017111, 50.687009792679298], [-56.795881720595261, 49.812308661490945], [-56.143105027884289, 50.15011749938283], [-55.471492275602934, 49.935815334668447], [-55.822401089080913, 49.587128607779093], [-54.93514258484565, 49.313010972686833], [-54.473775397343772, 49.556691189159167], [-53.47654944519131, 49.24913890237405], [-53.786013759971233, 48.516780503933617], [-53.086133999226249, 48.687803656603528], [-52.95864824076223, 48.157164211614472], [-52.648098720904173, 47.53554840757549], [-53.069158291218336, 46.655498765644936], [-53.521456264853029, 46.618291734394823], [-54.178935512902527, 46.807065741556997], [-53.961868659060471, 47.625207017601909], [-54.240482143762122, 47.752279364607617], [-55.400773078011483, 46.88499380145312], [-55.997480841685835, 46.919720363953289], [-55.291219041552765, 47.389562486350982], [-56.250798712780508, 47.632545070987383], [-57.325229254777085, 47.572807115257987], [-59.26601518414676, 47.603347886742498], [-59.41949418805369, 47.89945384377485], [-58.796586473207398, 48.251525376979473], [-59.23162451845652, 48.523188381537793], [-58.391804979065213, 49.125580552764163], [-57.358689744686025, 50.718274034215845], [-56.738650071831998, 51.287438259478527], [-55.87097693543528, 51.632094224649187], [-55.406974249886602, 51.588272610065722], [-55.600218268442077, 51.317074693397913], [-56.134035814017111, 50.687009792679298]]], [[[-133.180004041711669, 54.169975490935308], [-132.710007884431292, 54.040009315423518], [-131.749989584003259, 54.120004380909208], [-132.049480347350965, 52.984621487024519], [-131.179042521826574, 52.18043284769827], [-131.577829549822894, 52.182370713909236], [-132.180428426778519, 52.639707139692391], [-132.549992432313843, 53.100014960332132], [-133.054611178755493, 53.411468817755363], [-133.239664482792676, 53.851080227262386], [-133.180004041711669, 54.169975490935308]]], [[[-79.26582, 62.158675], [-79.65752, 61.63308], [-80.09956, 61.7181], [-80.36215, 62.01649], [-80.315395, 62.085565], [-79.92939, 62.3856], [-79.52002, 62.36371], [-79.26582, 62.158675]]], [[[-81.89825, 62.7108], [-83.06857, 62.15922], [-83.77462, 62.18231], [-83.99367, 62.4528], [-83.25048, 62.91409], [-81.87699, 62.90458], [-81.89825, 62.7108]]], [[[-85.161307949549851, 65.657284654392797], [-84.975763719405933, 65.217518215588981], [-84.464012010419495, 65.371772365980163], [-83.88262630891974, 65.109617824963536], [-82.78757687043877, 64.766693020274673], [-81.642013719392509, 64.455135809986942], [-81.553440314444245, 63.979609280037131], [-80.817361212878851, 64.057485663500998], [-80.103451300766594, 63.725981350348597], [-80.991019863595653, 63.41124603947496], [-82.547178107416997, 63.651722317145229], [-83.108797573565042, 64.101875718839707], [-84.100416632813847, 63.569711819098004], [-85.523404710618991, 63.052379055424076], [-85.866768764982339, 63.637252916103542], [-87.221983201836721, 63.541238104905212], [-86.352759772471259, 64.035833238370699], [-86.224886440765133, 64.822916978608262], [-85.883847825854858, 65.738778388117041], [-85.161307949549851, 65.657284654392797]]], [[[-75.86588, 67.14886], [-76.98687, 67.09873], [-77.2364, 67.58809], [-76.81166, 68.14856], [-75.89521, 68.28721], [-75.1145, 68.01036], [-75.10333, 67.58202], [-75.21597, 67.44425], [-75.86588, 67.14886]]], [[[-95.647681203800488, 69.107690358321761], [-96.269521203800579, 68.757040358321731], [-97.61740120380054, 69.060030358321782], [-98.431801203800504, 68.950700358321768], [-99.797401203800504, 69.400030358321786], [-98.917401203800523, 69.710030358321788], [-98.218261203800466, 70.143540358321744], [-97.157401203800532, 69.860030358321794], [-96.557401203800524, 69.680030358321758], [-96.257401203800498, 69.490030358321761], [-95.647681203800488, 69.107690358321761]]], [[[-90.5471, 69.49766], [-90.55151, 68.47499], [-89.21515, 69.25873], [-88.01966, 68.61508], [-88.31749, 67.87338], [-87.35017, 67.19872], [-86.30607, 67.92146], [-85.57664, 68.78456], [-85.52197, 69.88211], [-84.10081, 69.80539], [-82.62258, 69.65826], [-81.28043, 69.16202], [-81.2202, 68.66567], [-81.96436, 68.13253], [-81.25928, 67.59716], [-81.38653, 67.11078], [-83.34456, 66.41154], [-84.73542, 66.2573], [-85.76943, 66.55833], [-86.0676, 66.05625], [-87.03143, 65.21297], [-87.32324, 64.77563], [-88.48296, 64.09897], [-89.91444, 64.03273], [-90.70398, 63.61017], [-90.77004, 62.96021], [-91.93342, 62.83508], [-93.15698, 62.02469], [-94.24153, 60.89865], [-94.62931, 60.11021], [-94.6846, 58.94882], [-93.21502, 58.78212], [-92.76462, 57.84571], [-92.297029999999893, 57.08709], [-90.89769, 57.28468], [-89.03953, 56.85172], [-88.03978, 56.47162], [-87.32421, 55.99914], [-86.07121, 55.72383], [-85.01181, 55.3026], [-83.36055, 55.24489], [-82.27285, 55.14832], [-82.4362, 54.28227], [-82.12502, 53.27703], [-81.40075, 52.15788], [-79.91289, 51.20842], [-79.14301, 51.53393], [-78.60191, 52.56208], [-79.12421, 54.14145], [-79.82958, 54.66772], [-78.22874, 55.13645], [-77.0956, 55.83741], [-76.54137, 56.53423], [-76.62319, 57.20263], [-77.30226, 58.05209], [-78.51688, 58.80458], [-77.33676, 59.85261], [-77.77272, 60.75788], [-78.10687, 62.31964], [-77.41067, 62.55053], [-75.69621, 62.2784], [-74.6682, 62.18111], [-73.83988, 62.4438], [-72.90853, 62.10507], [-71.67708, 61.52535], [-71.37369, 61.13717], [-69.59042, 61.06141], [-69.62033, 60.22125], [-69.2879, 58.95736], [-68.37455, 58.80106], [-67.64976, 58.21206], [-66.20178, 58.76731], [-65.24517, 59.87071], [-64.58352, 60.33558], [-63.80475, 59.4426], [-62.50236, 58.16708], [-61.39655, 56.96745], [-61.79866, 56.33945], [-60.46853, 55.77548], [-59.56962, 55.20407], [-57.97508, 54.94549], [-57.3332, 54.6265], [-56.93689, 53.78032], [-56.15811, 53.64749], [-55.75632, 53.27036], [-55.68338, 52.14664], [-56.40916, 51.7707], [-57.12691, 51.41972], [-58.77482, 51.0643], [-60.03309, 50.24277], [-61.72366, 50.08046], [-63.86251, 50.29099], [-65.36331, 50.2982], [-66.39905, 50.22897], [-67.23631, 49.51156], [-68.51114, 49.06836], [-69.95362, 47.74488], [-71.10458, 46.82171], [-70.25522, 46.98606], [-68.65, 48.3], [-66.55243, 49.1331], [-65.05626, 49.23278], [-64.17099, 48.74248], [-65.11545, 48.07085], [-64.79854, 46.99297], [-64.47219, 46.23849], [-63.17329, 45.73902], [-61.52072, 45.88377], [-60.51815, 47.00793], [-60.4486, 46.28264], [-59.80287, 45.9204], [-61.03988, 45.26525], [-63.25471, 44.67014], [-64.24656, 44.26553], [-65.36406, 43.54523], [-66.1234, 43.61867], [-66.16173, 44.46512], [-64.42549, 45.29204], [-66.02605, 45.25931], [-67.13741, 45.13753], [-67.79134, 45.70281], [-67.79046, 47.06636], [-68.23444, 47.35486], [-68.905, 47.185], [-69.237216, 47.447781], [-69.99997, 46.69307], [-70.305, 45.915], [-70.66, 45.46], [-71.08482, 45.30524], [-71.405, 45.255], [-71.50506, 45.0082], [-73.34783, 45.00738], [-74.867, 45.00048], [-75.31821, 44.81645], [-76.375, 44.09631], [-76.5, 44.018458893758712], [-76.820034145805565, 43.628784288093748], [-77.737885097957687, 43.62905558936329], [-78.720279914042365, 43.625089423184868], [-79.171673550111862, 43.466339423184216], [-79.01, 43.27], [-78.92, 42.965], [-78.939362148743683, 42.863611355148031], [-80.247447679347928, 42.366199856122584], [-81.277746548167144, 42.209025987306845], [-82.439277716791608, 41.675105088867149], [-82.690089280920162, 41.675105088867149], [-83.029810146806909, 41.832795722005834], [-83.141999681312555, 41.975681057292825], [-83.12, 42.08], [-82.9, 42.43], [-82.43, 42.98], [-82.137642381503881, 43.571087551439909], [-82.337763125431053, 44.44], [-82.550924648758169, 45.347516587905368], [-83.592850714843067, 45.816893622412373], [-83.469550747394621, 45.994686387712584], [-83.616130947590563, 46.116926988299056], [-83.890765347005726, 46.116926988299056], [-84.091851264161463, 46.27541860613816], [-84.14211951367335, 46.512225857115723], [-84.3367, 46.40877], [-84.6049, 46.4396], [-84.543748745445853, 46.538684190449132], [-84.779238247399888, 46.637101955749038], [-84.876079881514855, 46.900083319682366], [-85.652363247403414, 47.220218817730498], [-86.461990831228249, 47.553338019392037], [-87.439792623300207, 47.94], [-88.378114183286698, 48.302917588893727], [-89.272917446636654, 48.019808254582657], [-89.6, 48.01], [-90.83, 48.27], [-91.64, 48.14], [-92.61, 48.45], [-93.63087, 48.60926], [-94.32914, 48.67074], [-94.64, 48.84], [-94.81758, 49.38905], [-95.15609, 49.38425], [-95.159069509172014, 49.0], [-97.228720000004799, 49.0007], [-100.65, 49.0], [-104.04826, 48.99986], [-107.05, 49.0], [-110.05, 49.0], [-113.0, 49.0], [-116.04818, 49.0], [-117.03121, 49.0], [-120.0, 49.0], [-122.84, 49.0], [-122.97421, 49.002537777777789], [-124.91024, 49.98456], [-125.62461, 50.41656], [-127.43561, 50.83061], [-127.99276, 51.71583], [-127.85032, 52.32961], [-129.12979, 52.75538], [-129.30523, 53.56159], [-130.51497, 54.28757], [-130.53611, 54.80278], [-129.98, 55.285], [-130.00778, 55.91583], [-131.70781, 56.55212], [-132.73042, 57.69289], [-133.35556, 58.41028], [-134.27111, 58.86111], [-134.945, 59.27056], [-135.47583, 59.78778], [-136.47972, 59.46389], [-137.4525, 58.905], [-138.34089, 59.56211], [-139.039, 60.0], [-140.013, 60.27682], [-140.99778, 60.30639], [-140.9925, 66.00003], [-140.986, 69.712], [-139.12052, 69.47102], [-137.54636, 68.99002], [-136.50358, 68.89804], [-135.62576, 69.31512], [-134.41464, 69.62743], [-132.92925, 69.50534], [-131.43136, 69.94451], [-129.79471, 70.19369], [-129.10773, 69.77927], [-128.36156, 70.01286], [-128.13817, 70.48384], [-127.44712, 70.37721], [-125.75632, 69.48058], [-124.42483, 70.1584], [-124.28968, 69.39969], [-123.06108, 69.56372], [-122.6835, 69.85553], [-121.47226, 69.79778], [-119.94288, 69.37786], [-117.60268, 69.01128], [-116.22643, 68.84151], [-115.2469, 68.90591], [-113.89794, 68.3989], [-115.30489, 67.90261], [-113.49727, 67.68815], [-110.798, 67.80612], [-109.94619, 67.98104], [-108.8802, 67.38144], [-107.79239, 67.88736], [-108.81299, 68.31164], [-108.16721, 68.65392], [-106.95, 68.7], [-106.15, 68.8], [-105.34282, 68.56122], [-104.33791, 68.018], [-103.22115, 68.09775], [-101.45433, 67.64689], [-99.90195, 67.80566], [-98.4432, 67.78165], [-98.5586, 68.40394], [-97.66948, 68.57864], [-96.11991, 68.23939], [-96.12588, 67.29338], [-95.48943, 68.0907], [-94.685, 68.06383], [-94.23282, 69.06903], [-95.30408, 69.68571], [-96.47131, 70.08976], [-96.39115, 71.19482], [-95.2088, 71.92053], [-93.88997, 71.76015], [-92.87818, 71.31869], [-91.51964, 70.19129], [-92.40692, 69.69997], [-90.5471, 69.49766]]], [[[-114.167169999999871, 73.12145], [-114.66634, 72.65277], [-112.441019999999867, 72.9554], [-111.05039, 72.4504], [-109.920349999999857, 72.96113], [-109.00654, 72.63335], [-108.188349999999886, 71.65089], [-107.68599, 72.06548], [-108.39639, 73.08953], [-107.51645, 73.23598], [-106.522589999999866, 73.07601], [-105.402459999999877, 72.67259], [-104.77484, 71.6984], [-104.464759999999814, 70.99297], [-102.78537, 70.49776], [-100.980779999999868, 70.02432], [-101.089289999999892, 69.58447000000011], [-102.731159999999875, 69.50402], [-102.09329, 69.11962], [-102.43024, 68.75282], [-104.24, 68.91], [-105.96, 69.180000000000135], [-107.12254, 69.11922], [-108.999999999999872, 68.78], [-111.534148875200117, 68.630059156817921], [-113.3132, 68.53554], [-113.854959999999807, 69.007440000000102], [-115.22, 69.28], [-116.10794, 69.16821], [-117.34, 69.960000000000107], [-116.674729999999869, 70.06655], [-115.13112, 70.2373], [-113.72141, 70.19237], [-112.4161, 70.36638], [-114.35, 70.6], [-116.48684, 70.52045], [-117.9048, 70.540560000000127], [-118.43238, 70.9092], [-116.11311, 71.30918], [-117.65568, 71.2952], [-119.40199, 71.55859], [-118.56267, 72.30785], [-117.866419999999877, 72.70594], [-115.18909, 73.314590000000109], [-114.167169999999871, 73.12145]]], [[[-104.5, 73.42], [-105.38, 72.76], [-106.94, 73.46], [-106.6, 73.6], [-105.26, 73.64], [-104.5, 73.42]]], [[[-76.34, 73.102684989953005], [-76.251403808593736, 72.826385498046861], [-77.314437866210895, 72.85554504394527], [-78.391670227050795, 72.876655578613253], [-79.486251831054645, 72.742202758789062], [-79.775833129882827, 72.80290222167973], [-80.876098632812514, 73.333183288574205], [-80.833885192871051, 73.693183898925767], [-80.353057861328111, 73.75971984863277], [-78.064437866210923, 73.651931762695327], [-76.34, 73.102684989953005]]], [[[-86.562178514334107, 73.157447007938444], [-85.774371304044521, 72.534125881633798], [-84.850112474288224, 73.34027822538711], [-82.315590176100969, 73.750950832810574], [-80.600087653307611, 72.716543687624181], [-80.748941616524391, 72.061906643350753], [-78.770638597310764, 72.352173163534147], [-77.824623989559569, 72.749616604291035], [-75.605844692675717, 72.243678493937381], [-74.228616095664975, 71.767144273557889], [-74.099140794557698, 71.330840155717638], [-72.242225714797641, 71.556924546994495], [-71.200015428335192, 70.920012518997211], [-68.78605424668487, 70.525023708774242], [-67.914970465756923, 70.121947536897594], [-66.969033372654152, 69.18608734809186], [-68.805122850200533, 68.720198472764409], [-66.449866095633851, 68.067163397892003], [-64.862314419195215, 67.847538560651614], [-63.424934454996745, 66.928473212340649], [-61.851981370680569, 66.862120673277829], [-62.163176845942296, 66.160251369889593], [-63.91844438338417, 64.998668524832837], [-65.148860236253611, 65.426032619886669], [-66.72121904159853, 66.388041083432185], [-68.015016038673949, 66.262725735124391], [-68.141287400979152, 65.689789130304362], [-67.089646165623392, 65.108455105236985], [-65.732080451099748, 64.64840566675862], [-65.320167609301265, 64.382737128346051], [-64.669406297449669, 63.392926744227474], [-65.013803880458894, 62.674185085695974], [-66.275044725190455, 62.945098781986069], [-68.783186204692711, 63.745670071051805], [-67.369680752213029, 62.883965562584869], [-66.328297288667201, 62.28007477482204], [-66.165568203380147, 61.930897121825879], [-68.877366502544632, 62.330149237712803], [-71.023437059193824, 62.910708116295829], [-72.23537858751898, 63.397836005295154], [-71.886278449171286, 63.679989325608837], [-73.37830624051837, 64.193963121183813], [-74.834418911422588, 64.679075629323776], [-74.818502570276706, 64.389093329517962], [-77.709979824520019, 64.229542344816778], [-78.55594885935416, 64.572906399180127], [-77.897281053361908, 65.309192206474776], [-76.018274298797181, 65.326968899183143], [-73.95979529488271, 65.454764716240888], [-74.293883429649625, 65.81177134872938], [-73.94491248238262, 66.310578111426722], [-72.65116716173938, 67.284575507263853], [-72.926059943316076, 67.726925767682374], [-73.311617804645721, 68.069437160912898], [-74.8433072577768, 68.554627183701271], [-76.869100918266739, 68.894735622830254], [-76.228649054657339, 69.147769273547411], [-77.28736996123709, 69.769540106883269], [-78.168633999326588, 69.826487535268896], [-78.95724219431672, 70.166880194775402], [-79.492455003563649, 69.871807766388898], [-81.305470954091732, 69.743185126414332], [-84.944706183598456, 69.966634019644388], [-87.060003424817864, 70.260001125765356], [-88.681713223001495, 70.410741278760796], [-89.513419562523012, 70.762037665480975], [-88.467721116880753, 71.218185533321318], [-89.888151211287465, 71.222552191849942], [-90.205160285181989, 72.235074367960792], [-89.43657670770493, 73.129464219852352], [-88.408241543312784, 73.537888902471209], [-85.826151089200906, 73.803815823045213], [-86.562178514334107, 73.157447007938444]]], [[[-100.35642, 73.84389], [-99.16387, 73.63339], [-97.38, 73.76], [-97.12, 73.47], [-98.05359, 72.99052], [-96.54, 72.56], [-96.72, 71.66], [-98.35966, 71.27285], [-99.32286, 71.35639], [-100.01482, 71.73827], [-102.5, 72.51], [-102.48, 72.83], [-100.43836, 72.70588], [-101.54, 73.36], [-100.35642, 73.84389]]], [[[-93.196295539100205, 72.771992499473342], [-94.26904659704725, 72.024596259235949], [-95.409855516322637, 72.061880805134578], [-96.033745083382428, 72.940276801231789], [-96.01826799191096, 73.437429918095788], [-95.495793423224001, 73.862416897264154], [-94.503657599652328, 74.134906724739196], [-92.420012173211745, 74.100025132942179], [-90.509792853542578, 73.85673248971203], [-92.003965216829869, 72.966244208458477], [-93.196295539100205, 72.771992499473342]]], [[[-120.46, 71.383601793087578], [-123.09219, 70.90164], [-123.62, 71.34], [-125.92894873747332, 71.868688463011395], [-125.499999999999872, 72.292260811795003], [-124.80729, 73.02256], [-123.94, 73.680000000000135], [-124.917749999999899, 74.292750000000112], [-121.53788, 74.44893], [-120.10978, 74.24135], [-117.55564, 74.18577], [-116.58442, 73.89607], [-115.51081, 73.47519], [-116.767939999999882, 73.22292], [-119.22, 72.52], [-120.46, 71.82], [-120.46, 71.383601793087578]]], [[[-93.612755906940464, 74.979997260224437], [-94.156908738973812, 74.59234650338685], [-95.60868058956558, 74.666863918751758], [-96.820932176484561, 74.927623196096576], [-96.288587409229791, 75.377828274223333], [-94.850819871789113, 75.647217515760886], [-93.977746548217908, 75.296489569795952], [-93.612755906940464, 74.979997260224437]]], [[[-98.5, 76.72], [-97.735585, 76.25656], [-97.704415, 75.74344], [-98.16, 75.0], [-99.80874, 74.89744], [-100.88366, 75.05736], [-100.86292, 75.64075], [-102.50209, 75.5638], [-102.56552, 76.3366], [-101.48973, 76.30537], [-99.98349, 76.64634], [-98.57699, 76.58859], [-98.5, 76.72]]], [[[-108.21141, 76.20168], [-107.81943, 75.84552], [-106.92893, 76.01282], [-105.881, 75.9694], [-105.70498, 75.47951], [-106.31347, 75.00527], [-109.7, 74.85], [-112.22307, 74.41696], [-113.74381, 74.39427], [-113.87135, 74.72029], [-111.79421, 75.1625], [-116.31221, 75.04343], [-117.7104, 75.2222], [-116.34602, 76.19903], [-115.40487, 76.47887], [-112.59056, 76.14134], [-110.81422, 75.54919], [-109.0671, 75.47321], [-110.49726, 76.42982], [-109.5811, 76.79417], [-108.54859, 76.67832], [-108.21141, 76.20168]]], [[[-94.684085862999439, 77.097878323058367], [-93.573921068073105, 76.776295884906062], [-91.605023159536586, 76.778517971494594], [-90.741845872749209, 76.449597479956807], [-90.969661424507976, 76.074013170059445], [-89.822237921899244, 75.847773749485626], [-89.187082892599776, 75.610165513807615], [-87.838276333349611, 75.566188869927217], [-86.379192267588664, 75.482421373182163], [-84.789625210290595, 75.699204006646497], [-82.753444586910049, 75.784315090631225], [-81.12853084992436, 75.713983466282016], [-80.05751095245914, 75.336848863415867], [-79.833932868148324, 74.923127346487192], [-80.457770758775823, 74.657303778777774], [-81.948842536125511, 74.442459011524321], [-83.2288936022114, 74.564027818490928], [-86.097452358733292, 74.410032050261137], [-88.150350307960196, 74.392307033984977], [-89.764722052758358, 74.515555325001117], [-92.422440965529418, 74.837757880340973], [-92.768285488642789, 75.38681997344213], [-92.889905972041717, 75.882655341282629], [-93.893824022175977, 76.319243679500516], [-95.962457445035795, 76.44138092722244], [-97.121378953829463, 76.751077785947587], [-96.745122850312342, 77.161388658345132], [-94.684085862999439, 77.097878323058367]]], [[[-116.198586595507322, 77.645286770326194], [-116.335813361458349, 76.876961575010554], [-117.106050584768766, 76.530031846819114], [-118.040412157038119, 76.481171780087081], [-119.899317586885687, 76.053213406061971], [-121.499995077126471, 75.900018622532784], [-122.85492448615895, 76.116542873835684], [-122.854925293603188, 76.116542873835684], [-121.157535360328239, 76.864507554828336], [-119.103938971821023, 77.512219957174608], [-117.570130784965954, 77.498318996888102], [-116.198586595507322, 77.645286770326194]]], [[[-93.840003017943971, 77.51999726023449], [-94.295608283245244, 77.491342678528682], [-96.169654100310055, 77.55511139597688], [-96.436304490936109, 77.83462921824362], [-94.422577277386353, 77.820004787904978], [-93.720656297565867, 77.634331366680314], [-93.840003017943971, 77.51999726023449]]], [[[-110.186938035912945, 77.697014879050286], [-112.051191169058455, 77.409228827616843], [-113.534278937619035, 77.732206529441143], [-112.724586758253835, 78.051050116681935], [-111.264443325630822, 78.152956041161545], [-109.854451870547067, 77.996324774884812], [-110.186938035912945, 77.697014879050286]]], [[[-109.663145718202557, 78.601972561345676], [-110.88131425661885, 78.406919867659994], [-112.542091437615142, 78.407901719873493], [-112.525890876091566, 78.550554511215225], [-111.500010342233367, 78.849993598130538], [-110.96366065147599, 78.804440823065207], [-109.663145718202557, 78.601972561345676]]], [[[-95.830294969449312, 78.056941229963243], [-97.309842902397975, 77.85059723582178], [-98.124289313533964, 78.082856960757567], [-98.55286780474664, 78.458105373845086], [-98.631984422585504, 78.871930243638374], [-97.337231411512604, 78.831984361476756], [-96.754398769908761, 78.765812689926989], [-95.559277920294562, 78.41831452098026], [-95.830294969449312, 78.056941229963243]]], [[[-100.060191820052111, 78.324754340315891], [-99.670939093813601, 77.907544664207393], [-101.303940192452984, 78.018984890444798], [-102.949808722733025, 78.343228664860206], [-105.176132778731514, 78.38033234324574], [-104.210429450277147, 78.677420152491777], [-105.419580451258511, 78.918335679836431], [-105.492289191493128, 79.301593939929177], [-103.529282396237917, 79.16534902619162], [-100.8251580472688, 78.80046173777869], [-100.060191820052111, 78.324754340315891]]], [[[-87.02, 79.66], [-85.81435, 79.3369], [-87.18756, 79.0393], [-89.03535, 78.28723], [-90.80436, 78.21533], [-92.87669, 78.34333], [-93.95116, 78.75099], [-93.93574, 79.11373], [-93.14524, 79.3801], [-94.974, 79.37248], [-96.07614, 79.70502], [-96.70972, 80.15777], [-96.01644, 80.60233], [-95.32345, 80.90729], [-94.29843, 80.97727], [-94.73542, 81.20646], [-92.40984, 81.25739], [-91.13289, 80.72345], [-89.45, 80.509322033898258], [-87.81, 80.32], [-87.02, 79.66]]], [[[-68.5, 83.106321516765732], [-65.82735, 83.02801], [-63.68, 82.9], [-61.85, 82.6286], [-61.89388, 82.36165], [-64.334, 81.92775], [-66.75342, 81.72527], [-67.65755, 81.50141], [-65.48031, 81.50657], [-67.84, 80.9], [-69.4697, 80.61683], [-71.18, 79.8], [-73.2428, 79.63415], [-73.88, 79.430162204802073], [-76.90773, 79.32309], [-75.52924, 79.19766], [-76.22046, 79.01907], [-75.39345, 78.52581], [-76.34354, 78.18296], [-77.88851, 77.89991], [-78.36269, 77.50859], [-79.75951, 77.20968], [-79.61965, 76.98336], [-77.91089, 77.022045], [-77.88911, 76.777955], [-80.56125, 76.17812], [-83.17439, 76.45403], [-86.11184, 76.29901], [-87.6, 76.42], [-89.49068, 76.47239], [-89.6161, 76.95213], [-87.76739, 77.17833], [-88.26, 77.9], [-87.65, 77.970222222222205], [-84.97634, 77.53873], [-86.34, 78.18], [-87.96192, 78.37181], [-87.15198, 78.75867], [-85.37868, 78.9969], [-85.09495, 79.34543], [-86.50734, 79.73624], [-86.93179, 80.25145], [-84.19844, 80.20836], [-83.408695652173819, 80.1], [-81.84823, 80.46442], [-84.1, 80.58], [-87.59895, 80.51627], [-89.36663, 80.85569], [-90.2, 81.26], [-91.36786, 81.5531], [-91.58702, 81.89429], [-90.1, 82.085], [-88.93227, 82.11751], [-86.97024, 82.27961], [-85.5, 82.652273458057024], [-84.260005, 82.6], [-83.18, 82.32], [-82.42, 82.86], [-81.1, 83.02], [-79.30664, 83.13056], [-76.25, 83.172058823529369], [-75.71878, 83.06404], [-72.83153, 83.23324], [-70.665765, 83.169780758382828], [-68.5, 83.106321516765732]]]] } },
-            { "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": "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]]] } },
-            { "type": "Feature", "properties": { "admin": "Colombia", "name": "Colombia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-75.373223232713841, -0.15203175212045], [-75.801465827116587, 0.084801337073202], [-76.292314419240938, 0.416047268064119], [-76.576379767549383, 0.256935533037435], [-77.424984300430367, 0.395686753741117], [-77.668612840470416, 0.825893052570961], [-77.855061408179509, 0.809925034992773], [-78.855258755188686, 1.380923773601822], [-78.990935228171026, 1.691369940595251], [-78.617831387023699, 1.766404120283056], [-78.662118089497838, 2.267355454920476], [-78.427610439757302, 2.629555568854215], [-77.931542527971473, 2.696605739752925], [-77.510431281224996, 3.325016994638246], [-77.127689785455246, 3.849636135265356], [-77.496271938776999, 4.087606105969427], [-77.307601284479375, 4.667984117039452], [-77.533220587865713, 5.582811997902496], [-77.318815070286718, 5.845354112161359], [-77.476660732722266, 6.691116441266301], [-77.881571417945239, 7.223771267114783], [-77.75341386586139, 7.709839789252141], [-77.431107957656977, 7.638061224798733], [-77.242566494440069, 7.935278225125442], [-77.474722866511314, 8.524286200388216], [-77.353360765273848, 8.670504665558068], [-76.836673957003541, 8.638749497914715], [-76.086383836557843, 9.336820583529486], [-75.674600185840035, 9.443248195834597], [-75.664704149056149, 9.774003200718736], [-75.480425991503338, 10.618990383339305], [-74.906895107711975, 11.08304474532032], [-74.276752692344871, 11.102035834187586], [-74.197222663047683, 11.310472723836865], [-73.414763963500278, 11.227015285685479], [-72.62783525255962, 11.731971543825519], [-72.238194953078903, 11.955549628136325], [-71.754090135368628, 12.437303168177305], [-71.399822353791691, 12.376040757695289], [-71.137461107045866, 12.112981879113503], [-71.331583624950284, 11.776284084515805], [-71.973921678338272, 11.608671576377116], [-72.227575446242923, 11.108702093953237], [-72.614657762325194, 10.821975409381777], [-72.905286017534692, 10.45034434655477], [-73.027604132769554, 9.736770331252441], [-73.304951544880026, 9.151999823437604], [-72.788729824500379, 9.085027167187331], [-72.660494757768092, 8.62528778730268], [-72.439862230097944, 8.405275376820027], [-72.360900641555958, 8.002638454617893], [-72.479678921178831, 7.632506008327352], [-72.444487270788059, 7.42378489830048], [-72.19835242378187, 7.340430813013682], [-71.960175747348629, 6.991614895043538], [-70.674233567981503, 7.087784735538717], [-70.093312954372408, 6.960376491723109], [-69.389479946557103, 6.099860541198835], [-68.985318569602327, 6.206804917826856], [-68.265052456318216, 6.153268133972473], [-67.695087246355001, 6.267318020040645], [-67.34143958196556, 6.095468044454021], [-67.521531948502741, 5.556870428891968], [-67.744696621355203, 5.221128648291667], [-67.823012254493534, 4.503937282728898], [-67.621835903581271, 3.839481716319994], [-67.33756384954367, 3.542342230641721], [-67.303173183853417, 3.31845408773718], [-67.809938117123693, 2.820655015469569], [-67.447092047786299, 2.600280869960869], [-67.181294318293041, 2.250638129074062], [-66.876325853122566, 1.253360500489336], [-67.065048183852483, 1.130112209473225], [-67.25999752467358, 1.719998684084956], [-67.537810024674684, 2.037162787276329], [-67.868565029558823, 1.692455145673392], [-69.816973232691609, 1.714805202639624], [-69.804596727157701, 1.089081122233466], [-69.218637661400166, 0.985676581217433], [-69.252434048119042, 0.602650865070075], [-69.452396002872447, 0.706158758950693], [-70.015565761989293, 0.541414292804205], [-70.02065589057004, -0.185156345219539], [-69.577065395776586, -0.549991957200163], [-69.420485805932216, -1.122618503426409], [-69.444101935489599, -1.556287123219817], [-69.893635219996611, -4.298186944194326], [-70.394043952094975, -3.766591485207825], [-70.692682054309699, -3.742872002785858], [-70.047708502874841, -2.725156345229699], [-70.813475714791949, -2.256864515800742], [-71.413645799429773, -2.342802422702128], [-71.774760708285385, -2.169789727388937], [-72.325786505813639, -2.434218031426453], [-73.070392218707212, -2.308954359550952], [-73.659503546834586, -1.260491224781134], [-74.122395189089048, -1.002832533373848], [-74.441600511355958, -0.530820000819887], [-75.106624518520064, -0.05720549886486], [-75.373223232713841, -0.15203175212045]]] } },
-            { "type": "Feature", "properties": { "admin": "Costa Rica", "name": "Costa Rica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.965783047197348, 8.225027980985983], [-83.508437262694287, 8.446926581247281], [-83.711473965169063, 8.656836249216864], [-83.596313035806631, 8.830443223501417], [-83.632641567707822, 9.051385809765319], [-83.909885626953724, 9.290802720573579], [-84.303401658856345, 9.487354030795712], [-84.64764421256865, 9.615537421095707], [-84.713350796227743, 9.908051866083849], [-84.975660366541319, 10.086723130733004], [-84.911374884770211, 9.795991522658921], [-85.110923428065291, 9.557039699741308], [-85.339488288092255, 9.834542141148658], [-85.660786505866966, 9.93334747969072], [-85.797444831062819, 10.134885565629032], [-85.791708747078417, 10.439337266476612], [-85.65931372754666, 10.754330959511718], [-85.941725430021748, 10.895278428587799], [-85.712540452807289, 11.088444932494822], [-85.561851976244171, 11.217119248901593], [-84.903003302738924, 10.952303371621895], [-84.673069017256239, 11.082657172078139], [-84.355930752281026, 10.999225572142901], [-84.190178595704822, 10.793450018756671], [-83.895054490885926, 10.726839097532444], [-83.655611741861563, 10.938764146361418], [-83.402319708982944, 10.39543813724465], [-83.015676642575158, 9.992982082555553], [-82.546196255203469, 9.566134751824674], [-82.932890998043561, 9.476812038608172], [-82.927154914059145, 9.074330145702914], [-82.719183112300513, 8.925708726431493], [-82.868657192704759, 8.807266343618521], [-82.829770677405151, 8.626295477732368], [-82.9131764391242, 8.423517157419068], [-82.965783047197348, 8.225027980985983]]] } },
-            { "type": "Feature", "properties": { "admin": "Cuba", "name": "Cuba", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.268151211257035, 23.188610744717703], [-81.404457160146819, 23.117271429938775], [-80.61876868358118, 23.105980129482994], [-79.679523688460222, 22.765303249598823], [-79.281485968732071, 22.399201565027049], [-78.347434455056472, 22.512166246017085], [-77.993295864560253, 22.277193508385928], [-77.146422492161037, 21.657851467367831], [-76.523824835908528, 21.20681956632437], [-76.194620123993175, 21.220565497314006], [-75.598222418912655, 21.01662445727413], [-75.671060350228032, 20.735091254147999], [-74.933896043584483, 20.693905137611381], [-74.178024868451246, 20.284627793859737], [-74.296648118777242, 20.050378526280678], [-74.961594611292924, 19.923435370355687], [-75.634680141894577, 19.873774318923193], [-76.323656175425981, 19.952890936762056], [-77.755480923153044, 19.855480861891873], [-77.085108405246729, 20.413353786698789], [-77.492654588516601, 20.673105373613886], [-78.137292243141573, 20.739948838783427], [-78.482826707661161, 21.028613389565848], [-78.719866502583997, 21.598113511638431], [-79.284999966127913, 21.559175319906497], [-80.217475348618635, 21.827324327069032], [-80.517534552721401, 22.037078965741756], [-81.820943366203167, 22.192056586185068], [-82.169991828118611, 22.387109279870746], [-81.79500179719264, 22.636964830001951], [-82.775897996740838, 22.688150336187057], [-83.494458787759328, 22.168517971276124], [-83.908800421875611, 22.154565334557329], [-84.052150845053248, 21.910575059491251], [-84.547030198896351, 21.801227728761639], [-84.974911058273079, 21.896028143801082], [-84.44706214062775, 22.204949856041903], [-84.23035702181177, 22.56575470630376], [-83.778239915690165, 22.78811839445569], [-83.267547573565736, 22.983041897060641], [-82.510436164057495, 23.078746649665181], [-82.268151211257035, 23.188610744717703]]] } },
-            { "type": "Feature", "properties": { "admin": "Northern Cyprus", "name": "N. Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[32.731780226377445, 35.14002594658843], [32.802473585752743, 35.145503648411363], [32.946960890440799, 35.38670339613369], [33.667227003724939, 35.373215847305509], [34.576473829900458, 35.671595567358786], [33.900804477684197, 35.245755927057608], [33.973616570783456, 35.058506374647997], [33.866439650210104, 35.093594672174177], [33.675391880027057, 35.017862860650446], [33.525685255677494, 35.038688462864066], [33.475817498515845, 35.000344550103499], [33.45592207208346, 35.101423651666401], [33.383833449036295, 35.162711900364563], [33.190977003723042, 35.173124701471373], [32.919572381326127, 35.087832749973636], [32.731780226377445, 35.14002594658843]]] } },
-            { "type": "Feature", "properties": { "admin": "Cyprus", "name": "Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[33.973616570783456, 35.058506374647997], [34.004880812320032, 34.978097846001852], [32.97982710137844, 34.571869411755436], [32.490296258277532, 34.701654771456468], [32.256667107885953, 35.103232326796622], [32.731780226377445, 35.14002594658843], [32.919572381326127, 35.087832749973636], [33.190977003723042, 35.173124701471373], [33.383833449036295, 35.162711900364563], [33.45592207208346, 35.101423651666401], [33.475817498515845, 35.000344550103499], [33.525685255677494, 35.038688462864066], [33.675391880027057, 35.017862860650446], [33.866439650210104, 35.093594672174177], [33.973616570783456, 35.058506374647997]]] } },
-            { "type": "Feature", "properties": { "admin": "Czech Republic", "name": "Czech Rep.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.960288120194573, 48.596982326850593], [16.49928266771877, 48.785808010445095], [16.029647251050218, 48.733899034207916], [15.253415561593979, 49.039074205107575], [14.901447381254055, 48.964401760445817], [14.33889773932472, 48.555305284207193], [13.595945672264433, 48.877171942737135], [13.031328973043427, 49.307068182973232], [12.52102420416119, 49.54741526956272], [12.415190870827441, 49.96912079528056], [12.240111118222556, 50.266337795607271], [12.96683678554319, 50.484076443069071], [13.338131951560282, 50.733234361364346], [14.05622765468817, 50.926917629594286], [14.307013380600633, 51.117267767941399], [14.570718214586062, 51.002339382524262], [15.016995883858666, 51.106674099321566], [15.490972120839725, 50.7847299261432], [16.238626743238566, 50.697732652379827], [16.176253289462263, 50.4226073268579], [16.719475945714429, 50.215746568393527], [16.868769158605655, 50.473973700556016], [17.554567091551117, 50.36214590107641], [17.649445021238986, 50.049038397819942], [18.392913852622168, 49.988628648470737], [18.85314415861361, 49.496229763377634], [18.554971144289478, 49.495015367218777], [18.399993523846174, 49.315000515330034], [18.170498488037961, 49.271514797556421], [18.104972771891848, 49.043983466175298], [17.913511590250462, 48.996492824899072], [17.886484816161808, 48.903475246773695], [17.545006951577101, 48.800019029325362], [17.101984897538895, 48.8169688991171], [16.960288120194573, 48.596982326850593]]] } },
-            { "type": "Feature", "properties": { "admin": "Germany", "name": "Germany", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.92190636560923, 54.983104153048025], [9.939579705452898, 54.596641954153242], [10.950112338920517, 54.363607082733147], [10.939466993868447, 54.008693345752583], [11.95625247564328, 54.196485500701144], [12.518440382546711, 54.470370591847988], [13.647467075259495, 54.075510972705885], [14.119686313542555, 53.757029120491026], [14.353315463934164, 53.248171291713092], [14.074521111719431, 52.981262518925334], [14.437599725002197, 52.62485016540829], [14.685026482815713, 52.089947414755208], [14.607098422919645, 51.745188096719964], [15.016995883858781, 51.106674099321701], [14.570718214586119, 51.002339382524369], [14.307013380600662, 51.117267767941364], [14.05622765468831, 50.92691762959435], [13.338131951560397, 50.733234361364268], [12.966836785543249, 50.484076443069164], [12.240111118222668, 50.266337795607214], [12.41519087082747, 49.969120795280602], [12.521024204161332, 49.547415269562741], [13.031328973043513, 49.307068182973232], [13.595945672264575, 48.877171942737156], [13.243357374737112, 48.416114813829026], [12.884102817443873, 48.289145819687846], [13.025851271220514, 47.637583523135945], [12.93262698736606, 47.467645575543983], [12.620759718484519, 47.672387600284409], [12.141357456112869, 47.703083401065768], [11.426414015354847, 47.523766181013045], [10.544504021861597, 47.566399237653783], [10.402083774465321, 47.302487697939164], [9.896068149463188, 47.58019684507569], [9.594226108446376, 47.525058091820185], [8.522611932009793, 47.830827541691342], [8.317301466514092, 47.613579820336263], [7.466759067422286, 47.620581976911907], [7.59367638513106, 48.333019110703724], [8.099278598674855, 49.017783515003423], [6.658229607783709, 49.201958319691627], [6.186320428094176, 49.4638028021145], [6.242751092156992, 49.90222565367872], [6.043073357781109, 50.128051662794221], [6.156658155958779, 50.803721015010574], [5.988658074577812, 51.85161570902504], [6.589396599970825, 51.85202912048338], [6.842869500362381, 52.228440253297542], [7.092053256873895, 53.14404328064488], [6.905139601274128, 53.482162177130633], [7.100424838905268, 53.693932196662658], [7.936239454793961, 53.748295803433777], [8.121706170289483, 53.527792466844275], [8.800734490604667, 54.02078563090889], [8.572117954145368, 54.395646470754045], [8.526229282270206, 54.962743638725144], [9.282048780971136, 54.830865383516297], [9.92190636560923, 54.983104153048025]]] } },
-            { "type": "Feature", "properties": { "admin": "Djibouti", "name": "Djibouti", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[43.081226027200152, 12.699638576707112], [43.317852410664663, 12.390148423711022], [43.286381463398911, 11.974928290245883], [42.715873650896519, 11.735640570518338], [43.145304803242126, 11.462039699748853], [42.776851841000948, 10.926878566934416], [42.55493000000012, 11.105110000000193], [42.314140000000116, 11.0342], [41.755570000000191, 11.05091], [41.739590000000177, 11.355110000000137], [41.661760000000122, 11.6312], [42.000000000000107, 12.100000000000133], [42.351560000000106, 12.54223000000013], [42.779642368344739, 12.455415757695672], [43.081226027200152, 12.699638576707112]]] } },
-            { "type": "Feature", "properties": { "admin": "Denmark", "name": "Denmark", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[12.690006137755629, 55.60999095318077], [12.089991082414738, 54.800014553437919], [11.043543328504226, 55.36486379660424], [10.90391360845163, 55.779954738988735], [12.370904168353288, 56.111407375708822], [12.690006137755629, 55.60999095318077]]], [[[10.912181837618359, 56.4586213242779], [10.667803989309986, 56.081383368547208], [10.369992710011983, 56.190007229224719], [9.649984978889306, 55.469999498102041], [9.921906365609173, 54.983104153048046], [9.282048780971136, 54.830865383516155], [8.526229282270235, 54.962743638724973], [8.120310906617588, 55.517722683323612], [8.089976840862247, 56.540011705137587], [8.256581658571262, 56.809969387430286], [8.543437534223385, 57.110002753316891], [9.424469028367609, 57.172066148499468], [9.775558709358561, 57.447940782289649], [10.580005730846151, 57.730016587954843], [10.54610599126269, 57.21573273378614], [10.250000034230222, 56.890016181050456], [10.369992710011983, 56.60998159446082], [10.912181837618359, 56.4586213242779]]]] } },
-            { "type": "Feature", "properties": { "admin": "Dominican Republic", "name": "Dominican Rep.", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.71236141629295, 19.714455878167353], [-71.587304450146604, 19.884910590082093], [-70.806706102161726, 19.880285549391981], [-70.214364997016119, 19.622885240146157], [-69.950815192327568, 19.647999986240002], [-69.769250047470067, 19.293267116772437], [-69.222125820579862, 19.313214219637096], [-69.254346076113819, 19.015196234609871], [-68.809411994080818, 18.979074408437846], [-68.317943284768958, 18.612197577381689], [-68.689315965434503, 18.205142320218609], [-69.164945848248905, 18.422648423735108], [-69.623987596297624, 18.380712998930246], [-69.952933926051529, 18.428306993071057], [-70.133232998317879, 18.245915025296892], [-70.517137213814195, 18.184290879788829], [-70.669298468697619, 18.42688589118303], [-70.999950120717173, 18.283328762276206], [-71.400209927033885, 17.598564357976596], [-71.657661912712001, 17.757572740138695], [-71.708304816358037, 18.044997056546091], [-71.687737596305865, 18.316660061104468], [-71.945112067335543, 18.616900132720257], [-71.701302659782485, 18.785416978424049], [-71.624873216422813, 19.169837958243303], [-71.71236141629295, 19.714455878167353]]] } },
-            { "type": "Feature", "properties": { "admin": "Algeria", "name": "Algeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.99950564947161, 23.471668402596443], [8.572893100629782, 21.565660712159136], [5.677565952180684, 19.601206976799713], [4.267419467800038, 19.155265204336995], [3.158133172222704, 19.057364203360034], [3.146661004253899, 19.693578599521441], [2.683588494486428, 19.856230170160114], [2.060990838233919, 20.142233384679482], [1.823227573259032, 20.61080943448604], [-1.550054897457613, 22.792665920497377], [-4.92333736817423, 24.974574082940993], [-8.684399786809051, 27.395744126895998], [-8.66512447756419, 27.58947907155822], [-8.665589565454805, 27.656425889592349], [-8.674116176782972, 28.841288967396572], [-7.059227667661928, 29.579228420524522], [-6.060632290053772, 29.731699734001687], [-5.242129278982786, 30.000443020135581], [-4.859646165374469, 30.501187649043839], [-3.690441046554695, 30.896951605751152], [-3.647497931320145, 31.637294012980668], [-3.068980271812647, 31.724497992473207], [-2.616604783529567, 32.094346218386143], [-1.30789913573787, 32.262888902306095], [-1.124551153966308, 32.651521511357124], [-1.388049282222567, 32.864015000941301], [-1.733454555661467, 33.91971283623198], [-1.792985805661686, 34.527918606091198], [-2.169913702798624, 35.168396307916673], [-1.208602871089056, 35.71484874118709], [-0.127454392894606, 35.888662421200799], [0.503876580415209, 36.301272894835272], [1.466918572606545, 36.605647081034398], [3.161698846050824, 36.783904934225205], [4.815758090849129, 36.865036932923452], [5.320120070017792, 36.716518866516616], [6.261819695672611, 37.110655015606731], [7.330384962603969, 37.118380642234364], [7.737078484741003, 36.885707505840209], [8.420964389691674, 36.946427313783154], [8.217824334352313, 36.433176988260271], [8.376367628623766, 35.479876003555937], [8.140981479534302, 34.655145982393783], [7.524481642292242, 34.097376410451453], [7.612641635782181, 33.344114895148955], [8.430472853233367, 32.748337307255944], [8.439102817426116, 32.506284898400814], [9.055602654668148, 32.102691962201284], [9.482139926805273, 30.307556057246181], [9.805634392952411, 29.424638373323383], [9.859997999723443, 28.959989732371007], [9.683884718472765, 28.144173895779193], [9.756128370816779, 27.688258571884141], [9.629056023811073, 27.140953477480913], [9.716285841519747, 26.512206325785691], [9.319410841518161, 26.094324856057447], [9.910692579801774, 25.365454616796733], [9.948261346077969, 24.93695364023251], [10.30384687667836, 24.37931325937091], [10.771363559622925, 24.562532050061744], [11.560669386449002, 24.097909247325511], [11.99950564947161, 23.471668402596443]]] } },
-            { "type": "Feature", "properties": { "admin": "Ecuador", "name": "Ecuador", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-80.302560594387188, -3.404856459164712], [-79.770293341780913, -2.65751189535964], [-79.986559210922394, -2.220794366061014], [-80.368783942369234, -2.685158786635788], [-80.967765469064332, -2.246942640800703], [-80.764806281238023, -1.965047702648532], [-80.933659023751702, -1.057454522306358], [-80.583370327461239, -0.906662692878683], [-80.39932471385373, -0.283703301600141], [-80.020898200180355, 0.360340074053468], [-80.090609707342097, 0.768428859862396], [-79.542762010399784, 0.982937730305963], [-78.855258755188686, 1.380923773601822], [-77.855061408179509, 0.809925034992773], [-77.668612840470416, 0.825893052570961], [-77.424984300430367, 0.395686753741117], [-76.576379767549383, 0.256935533037435], [-76.292314419240938, 0.416047268064119], [-75.801465827116587, 0.084801337073202], [-75.373223232713841, -0.15203175212045], [-75.233722703741932, -0.911416924649529], [-75.544995693652027, -1.56160979574588], [-76.635394253226707, -2.608677666843817], [-77.83790483265858, -3.003020521663103], [-78.450683966775628, -3.873096612161375], [-78.639897223612323, -4.547784112164072], [-79.205289069317715, -4.959128513207388], [-79.62497921417615, -4.454198093283494], [-80.028908047185581, -4.346090996928893], [-80.442241990872134, -4.425724379090673], [-80.46929460317692, -4.059286797708999], [-80.184014858709645, -3.821161797708043], [-80.302560594387188, -3.404856459164712]]] } },
-            { "type": "Feature", "properties": { "admin": "Egypt", "name": "Egypt", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.9226, 29.50133], [34.64174, 29.09942], [34.42655, 28.34399], [34.15451, 27.8233], [33.92136, 27.6487], [33.58811, 27.97136], [33.13676, 28.41765], [32.42323, 29.85108], [32.32046, 29.76043], [32.73482, 28.70523], [33.34876, 27.69989], [34.10455, 26.14227], [34.47387, 25.59856], [34.79507, 25.03375], [35.69241, 23.92671], [35.49372, 23.75237], [35.52598, 23.10244], [36.69069, 22.20485], [36.86623, 22.0], [32.9, 22.0], [29.02, 22.0], [25.0, 22.0], [25.0, 25.682499996360992], [25.0, 29.238654529533452], [24.70007, 30.04419], [24.95762, 30.6616], [24.80287, 31.08929], [25.16482, 31.56915], [26.49533, 31.58568], [27.45762, 31.32126], [28.45048, 31.02577], [28.91353, 30.87005], [29.68342, 31.18686], [30.09503, 31.4734], [30.97693, 31.55586], [31.68796, 31.4296], [31.96041, 30.9336], [32.19247, 31.26034], [32.99392, 31.02407], [33.7734, 30.96746], [34.26544, 31.21936], [34.9226, 29.50133]]] } },
-            { "type": "Feature", "properties": { "admin": "Eritrea", "name": "Eritrea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[42.351560000000106, 12.54223000000013], [42.00975, 12.86582], [41.59856, 13.452090000000108], [41.15519371924983, 13.773319810435224], [40.8966, 14.118640000000138], [40.026218702969167, 14.519579169162281], [39.34061, 14.53155], [39.0994, 14.74064], [38.51295, 14.50547], [37.90607, 14.959430000000165], [37.59377, 14.2131], [36.42951, 14.42211], [36.323188917798113, 14.822480577041057], [36.753860304518575, 16.291874091044289], [36.852530000000108, 16.95655], [37.16747, 17.263140000000128], [37.904000000000103, 17.42754], [38.410089959473218, 17.998307399970312], [38.990622999839999, 16.84062612555169], [39.266110060388016, 15.922723496967246], [39.814293654140208, 15.435647284400314], [41.179274936697645, 14.491079616753209], [41.734951613132345, 13.921036892141554], [42.276830682144848, 13.34399201095442], [42.589576450375255, 13.000421250861901], [43.081226027200152, 12.699638576707112], [42.779642368344739, 12.455415757695672], [42.351560000000106, 12.54223000000013]]] } },
-            { "type": "Feature", "properties": { "admin": "Spain", "name": "Spain", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.98443315269567, 42.592775173506261], [-9.392883673530644, 43.026624660812686], [-7.978189663108308, 43.748337714200979], [-6.754491746436754, 43.567909450853918], [-5.411886359061596, 43.574239813809669], [-4.347842779955783, 43.403449205085025], [-3.51753170410609, 43.455900783861296], [-1.901351284177764, 43.422802028978332], [-1.502770961910528, 43.034014390630425], [0.338046909190581, 42.579546006839543], [0.701590610363894, 42.795734361332599], [1.826793247087153, 42.343384711265678], [2.985998976258457, 42.473015041669854], [3.039484083680548, 41.892120266276891], [2.091841668312184, 41.226088568683082], [0.810524529635188, 41.014731960609332], [0.721331007499401, 40.678318386389229], [0.106691521819869, 40.123933620762003], [-0.278711310212941, 39.309978135732713], [0.111290724293838, 38.738514309233032], [-0.467123582349103, 38.292365831041138], [-0.683389451490598, 37.642353827457811], [-1.438382127274849, 37.443063666324214], [-2.146452602538119, 36.674144192037282], [-3.415780808923386, 36.658899644511173], [-4.368900926114718, 36.677839056946141], [-4.995219285492211, 36.32470815687963], [-5.377159796561457, 35.946850083961458], [-5.866432257500902, 36.02981659600605], [-6.236693894872174, 36.367677110330327], [-6.520190802425402, 36.942913316387312], [-7.45372555177809, 37.097787583966053], [-7.537105475281022, 37.428904323876232], [-7.166507941099863, 37.803894354802217], [-7.029281175148794, 38.075764065089757], [-7.374092169616317, 38.373058580064914], [-7.098036668313126, 39.03007274022378], [-7.498632371439724, 39.629571031241802], [-7.066591559263527, 39.711891587882768], [-7.026413133156593, 40.184524237624238], [-6.864019944679383, 40.330871893874821], [-6.851126674822551, 41.111082668617513], [-6.389087693700914, 41.381815497394641], [-6.668605515967655, 41.883386949219577], [-7.251308966490822, 41.91834605566504], [-7.422512986673794, 41.792074693359822], [-8.01317460776991, 41.790886135417118], [-8.26385698081779, 42.280468654950326], [-8.671945766626719, 42.134689439454952], [-9.034817674180244, 41.880570583659669]]] } },
-            { "type": "Feature", "properties": { "admin": "Estonia", "name": "Estonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[24.312862583114615, 57.793423570376966], [24.428927850042154, 58.383413397853275], [24.061198357853179, 58.257374579493394], [23.426560092876681, 58.612753404364618], [23.339795363058641, 59.187240302153363], [24.604214308376182, 59.465853786855007], [25.864189080516631, 59.611090399811324], [26.949135776484518, 59.445803331125767], [27.981114129353237, 59.47538808861286], [28.131699253051742, 59.300825100330904], [27.420166456824941, 58.724581203844224], [27.716685825315714, 57.791899115624354], [27.288184848751509, 57.474528306703817], [26.46353234223778, 57.476388658266316], [25.602809685984365, 57.847528794986559], [25.164593540149262, 57.970156968815175], [24.312862583114615, 57.793423570376966]]] } },
-            { "type": "Feature", "properties": { "admin": "Ethiopia", "name": "Ethiopia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[37.90607, 14.959430000000165], [38.51295, 14.50547], [39.0994, 14.74064], [39.34061, 14.53155], [40.026250000000111, 14.51959], [40.8966, 14.118640000000138], [41.1552, 13.77333], [41.59856, 13.452090000000108], [42.00975, 12.86582], [42.351560000000106, 12.54223000000013], [42.000000000000107, 12.100000000000133], [41.661760000000122, 11.6312], [41.739590000000177, 11.355110000000137], [41.755570000000191, 11.05091], [42.314140000000116, 11.0342], [42.55493000000012, 11.105110000000193], [42.776851841000948, 10.926878566934416], [42.55876, 10.572580000000126], [42.92812, 10.021940000000139], [43.29699, 9.540480000000169], [43.67875, 9.183580000000116], [46.94834, 7.99688], [47.78942, 8.003], [44.9636, 5.001620000000115], [43.66087, 4.95755], [42.769670000000119, 4.252590000000223], [42.12861, 4.234130000000163], [41.855083092644108, 3.918911920483764], [41.171800000000125, 3.91909], [40.768480000000118, 4.257020000000124], [39.854940000000106, 3.83879000000013], [39.559384258765917, 3.422060000000215], [38.89251, 3.50074], [38.67114, 3.61607], [38.436970000000137, 3.58851], [38.120915000000132, 3.598605], [36.85509323800823, 4.447864127672857], [36.159078632855646, 4.447864127672857], [35.817447662353622, 4.776965663462021], [35.817447662353622, 5.338232082790852], [35.298007118233095, 5.506], [34.70702, 6.59422000000012], [34.25032, 6.82607], [34.075100000000184, 7.22595], [33.56829, 7.71334], [32.954180000000228, 7.7849700000001], [33.294800000000116, 8.35458], [33.82550000000014, 8.37916], [33.97498, 8.684560000000145], [33.96162, 9.58358], [34.25745, 10.63009], [34.73115000000012, 10.910170000000106], [34.831630000000125, 11.318960000000116], [35.26049, 12.08286], [35.863630000000164, 12.57828], [36.27022, 13.563330000000118], [36.42951, 14.42211], [37.59377, 14.2131], [37.90607, 14.959430000000165]]] } },
-            { "type": "Feature", "properties": { "admin": "Finland", "name": "Finland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[28.591929559043187, 69.064776923286644], [28.445943637818651, 68.36461294216403], [29.9774263852206, 67.698297024192641], [29.054588657352319, 66.944286200621917], [30.21765, 65.80598], [29.544429559046982, 64.948671576590471], [30.444684686003704, 64.204453436939076], [30.035872430142714, 63.552813625738544], [31.516092156711117, 62.867687486412869], [31.139991082490891, 62.357692776124395], [30.211107212044443, 61.780027777749673], [28.06999759289527, 60.503516547275829], [26.25517296723697, 60.423960679762487], [24.496623976344516, 60.057316392651636], [22.869694858499454, 59.846373196036211], [22.290763787533589, 60.391921291741525], [21.322244093519313, 60.720169989659503], [21.544866163832687, 61.705329494871783], [21.059211053153682, 62.607393296958726], [21.536029493910799, 63.189735012455863], [22.442744174903986, 63.817810370531276], [24.730511508897528, 64.902343655040823], [25.398067661243939, 65.111426500093728], [25.2940430030404, 65.53434642197044], [23.903378533633795, 66.006927395279604], [23.565879754335576, 66.396050930437411], [23.539473097434435, 67.936008612735236], [21.978534783626113, 68.616845608180682], [20.645592889089521, 69.106247260200846], [21.244936150810666, 69.370443020293067], [22.356237827247405, 68.841741441514898], [23.662049594830751, 68.891247463650529], [24.735679152126721, 68.649556789821446], [25.689212680776361, 69.092113755969024], [26.179622023226241, 69.825298977326113], [27.732292107867856, 70.164193020296239], [29.015572950971968, 69.766491197377974], [28.591929559043187, 69.064776923286644]]] } },
-            { "type": "Feature", "properties": { "admin": "Fiji", "name": "Fiji", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[178.3736, -17.33992], [178.71806, -17.62846], [178.55271, -18.15059], [177.93266, -18.28799], [177.38146, -18.16432], [177.28504, -17.72465], [177.67087, -17.38114], [178.12557, -17.50481], [178.3736, -17.33992]]], [[[179.364142661964223, -16.801354076946847], [178.725059362997058, -17.012041674368017], [178.596838595117021, -16.63915], [179.096609362997128, -16.43398427754742], [179.413509362997075, -16.379054277547393], [180.000000000000114, -16.067132663642436], [180.000000000000114, -16.555216566639157], [179.364142661964223, -16.801354076946847]]], [[[-179.917369384765237, -16.501783135649358], [-180.0, -16.555216566639157], [-180.0, -16.067132663642436], [-179.793320109048551, -16.020882256741228], [-179.917369384765237, -16.501783135649358]]]] } },
-            { "type": "Feature", "properties": { "admin": "Falkland Islands", "name": "Falkland Is.", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.2, -51.85], [-60.0, -51.25], [-59.15, -51.5], [-58.55, -51.1], [-57.75, -51.55], [-58.05, -51.9], [-59.4, -52.2], [-59.85, -51.85], [-60.7, -52.3], [-61.2, -51.85]]] } },
-            { "type": "Feature", "properties": { "admin": "France", "name": "France", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-52.556424730018378, 2.504705308437053], [-52.939657151894963, 2.124857692875622], [-53.41846513529525, 2.053389187016037], [-53.554839240113481, 2.334896551925964], [-53.778520677288881, 2.376702785650053], [-54.088062506717264, 2.105556545414629], [-54.524754197799737, 2.311848863123785], [-54.271229620975781, 2.738747870286942], [-54.184284023644743, 3.194172268075234], [-54.011503872276812, 3.622569891774857], [-54.3995422023565, 4.212611395683481], [-54.478632981979203, 4.896755682795642], [-53.958044603070917, 5.756548163267808], [-53.618452928264837, 5.646529038918401], [-52.882141282754063, 5.409850979021598], [-51.823342861525916, 4.565768133966144], [-51.657797410678874, 4.156232408053028], [-52.249337531123977, 3.241094468596287], [-52.556424730018378, 2.504705308437053]]], [[[9.560016310269132, 42.152491970379558], [9.229752231491771, 41.380006822264441], [8.77572309737536, 41.583611965494427], [8.544212680707828, 42.256516628583078], [8.746009148807586, 42.628121853193946], [9.390000848028901, 43.009984849614725], [9.560016310269132, 42.152491970379558]]], [[[3.588184441755714, 50.378992418003563], [4.28602298342514, 49.90749664977254], [4.799221632515752, 49.985373033236314], [5.674051954784885, 49.529483547557433], [5.897759230176375, 49.442667141307155], [6.186320428094204, 49.463802802114444], [6.658229607783538, 49.201958319691549], [8.09927859867477, 49.017783515003366], [7.59367638513106, 48.333019110703724], [7.466759067422228, 47.620581976911851], [7.192202182655533, 47.449765529970982], [6.736571079138086, 47.541801255882874], [6.768713820023634, 47.287708238303672], [6.037388950228971, 46.725778713561894], [6.022609490593566, 46.272989813820502], [6.500099724970453, 46.429672756529428], [6.84359297041456, 45.991146552100659], [6.80235517744566, 45.708579820328673], [7.096652459347835, 45.333098863295859], [6.749955275101711, 45.028517971367584], [7.007562290076661, 44.254766750661382], [7.549596388386161, 44.127901109384808], [7.435184767291841, 43.693844916349164], [6.529245232783068, 43.12889232031835], [4.556962517931395, 43.399650987311581], [3.100410597352719, 43.075200507167118], [2.985998976258486, 42.473015041669882], [1.826793247087181, 42.343384711265649], [0.701590610363922, 42.795734361332642], [0.338046909190581, 42.57954600683955], [-1.502770961910471, 43.034014390630482], [-1.901351284177735, 43.422802028978332], [-1.384225226232956, 44.022610378590166], [-1.193797573237361, 46.014917710954862], [-2.225724249673788, 47.064362697938201], [-2.963276129559573, 47.570326646507958], [-4.491554938159481, 47.95495433205641], [-4.592349819344746, 48.68416046812694], [-3.295813971357745, 48.901692409859628], [-1.616510789384932, 48.644421291694577], [-1.933494025063254, 49.776341864615759], [-0.98946895995536, 49.347375800160869], [1.338761020522753, 50.127173163445256], [1.6390010921385, 50.9466063502975], [2.51357303224617, 51.14850617126185], [2.65842207196033, 50.796848049515646], [3.123251580425716, 50.780363267614504], [3.588184441755714, 50.378992418003563]]]] } },
-            { "type": "Feature", "properties": { "admin": "Gabon", "name": "Gabon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.093772820691923, -3.978826592630546], [10.066135288135738, -2.969482517105681], [9.405245395554969, -2.144313246269042], [8.797995639693168, -1.111301364754496], [8.830086704146423, -0.779073581550037], [9.048419630579586, -0.459351494960217], [9.291350538783687, 0.268666083167687], [9.492888624721981, 1.010119533691494], [9.83028405115564, 1.067893784993799], [11.285078973036461, 1.057661851400013], [11.276449008843711, 2.261050930180871], [11.751665480199787, 2.326757513839993], [12.359380323952218, 2.19281220133945], [12.951333855855605, 2.321615708826939], [13.07582238124675, 2.267097072759014], [13.003113641012074, 1.830896307783319], [13.282631463278816, 1.31418366129688], [14.026668735417214, 1.395677395021153], [14.276265903386953, 1.196929836426619], [13.843320753645653, 0.038757635901149], [14.316418491277741, -0.552627455247048], [14.425455763413593, -1.333406670744971], [14.299210239324564, -1.998275648612213], [13.992407260807706, -2.470804945489099], [13.109618767965626, -2.428740329603513], [12.575284458067639, -1.948511244315134], [12.495702752338159, -2.391688327650242], [11.820963575903189, -2.514161472181982], [11.478038771214299, -2.765618991714241], [11.855121697648114, -3.42687061932105], [11.093772820691923, -3.978826592630546]]] } },
-            { "type": "Feature", "properties": { "admin": "United Kingdom", "name": "United Kingdom", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-5.661948614921896, 54.554603176483838], [-6.197884894220976, 53.867565009163329], [-6.953730231137994, 54.073702297575622], [-7.572167934591078, 54.059956366585979], [-7.366030646178785, 54.595840969452688], [-7.572167934591078, 55.131622219454883], [-6.733847011736144, 55.172860012423783], [-5.661948614921896, 54.554603176483838]]], [[[-3.00500484863528, 58.635000108466322], [-4.073828497728015, 57.55302480735525], [-3.055001796877661, 57.690019029360933], [-1.959280564776918, 57.684799709699512], [-2.219988165689301, 56.870017401753515], [-3.119003058271118, 55.97379303651546], [-2.085009324543023, 55.909998480851264], [-2.005675679673856, 55.804902850350217], [-1.11499101399221, 54.624986477265388], [-0.4304849918542, 54.464376125702145], [0.184981316742039, 53.325014146531018], [0.469976840831777, 52.929999498091959], [1.681530795914739, 52.739520168663987], [1.559987827164377, 52.099998480836], [1.050561557630914, 51.806760565795678], [1.4498653499503, 51.289427802121949], [0.550333693045502, 50.765738837275862], [-0.787517462558639, 50.774988918656206], [-2.489997524414377, 50.500018622431227], [-2.956273972984035, 50.696879991247002], [-3.617448085942327, 50.228355617872708], [-4.542507900399243, 50.341837063185658], [-5.245023159191134, 49.959999904981082], [-5.776566941745299, 50.159677639356815], [-4.309989793301837, 51.210001125689146], [-3.414850633142122, 51.426008612669236], [-3.422719467108322, 51.426848167406078], [-4.984367234710873, 51.593466091510962], [-5.267295701508885, 51.991400458374571], [-4.222346564134852, 52.30135569926135], [-4.770013393564112, 52.840004991255611], [-4.579999152026914, 53.495003770555165], [-3.093830673788658, 53.404547400669671], [-3.092079637047106, 53.404440822963544], [-2.945008510744343, 53.98499970154667], [-3.614700825433033, 54.60093677329256], [-3.63000545898933, 54.615012925833], [-4.844169073903003, 54.790971177786837], [-5.082526617849224, 55.061600653699358], [-4.719112107756643, 55.508472601943467], [-5.047980922862108, 55.783985500707516], [-5.586397670911139, 55.311146145236805], [-5.64499874513018, 56.275014960344791], [-6.149980841486352, 56.785009670633528], [-5.78682471355529, 57.818848375064633], [-5.009998745127574, 58.630013332750039], [-4.211494513353555, 58.550845038479153], [-3.00500484863528, 58.635000108466322]]]] } },
-            { "type": "Feature", "properties": { "admin": "Georgia", "name": "Georgia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[41.55408410011065, 41.535656236327561], [41.703170607272703, 41.962942816732912], [41.453470086438379, 42.645123399417926], [40.875469191253785, 43.013628038091277], [40.321394484220313, 43.128633938156831], [39.955008579270917, 43.434997666999216], [40.07696495947976, 43.553104153002309], [40.922184686045618, 43.38215851498078], [42.394394565608806, 43.220307929042619], [43.756016880067378, 42.74082815202248], [43.931199985536828, 42.554973863284758], [44.537622918481979, 42.71199270280362], [45.470279168485703, 42.502780666669963], [45.776410353382758, 42.09244395605635], [46.404950799348818, 41.860675157227298], [46.145431756379004, 41.722802435872573], [46.637908156120574, 41.181672675128219], [46.501637404166921, 41.064444688474104], [45.962600538930381, 41.123872585609767], [45.217426385281577, 41.411451931314041], [44.972480096218071, 41.248128567055588], [43.582745802592726, 41.09214325618256], [42.619548781104484, 41.583172715819934], [41.55408410011065, 41.535656236327561]]] } },
-            { "type": "Feature", "properties": { "admin": "Ghana", "name": "Ghana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.060121697604927, 5.928837388528875], [-0.507637905265938, 5.343472601742675], [-1.063624640294193, 5.000547797053811], [-1.964706590167594, 4.71046214438337], [-2.856125047202397, 4.994475816259508], [-2.810701463217839, 5.389051215024109], [-3.244370083011261, 6.2504715031135], [-2.983584967450326, 7.379704901555511], [-2.56218950032624, 8.219627793811481], [-2.827496303712706, 9.642460842319775], [-2.963896246747111, 10.395334784380081], [-2.94040930827046, 10.962690334512557], [-1.203357713211431, 11.009819240762736], [-0.761575893548183, 10.936929633015053], [-0.438701544588582, 11.09834096927872], [0.023802524423701, 11.018681748900802], [-0.049784715159944, 10.706917832883928], [0.367579990245389, 10.191212876827176], [0.365900506195885, 9.46500397382948], [0.461191847342121, 8.677222601756013], [0.712029249686878, 8.312464504423827], [0.490957472342245, 7.411744289576474], [0.570384148774849, 6.914358628767188], [0.836931186536333, 6.279978745952147], [1.060121697604927, 5.928837388528875]]] } },
-            { "type": "Feature", "properties": { "admin": "Guinea", "name": "Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.439298468448696, 7.686042792181736], [-8.722123582382123, 7.711674302598509], [-8.926064622422002, 7.309037380396375], [-9.208786383490844, 7.313920803247952], [-9.403348151069748, 7.526905218938906], [-9.33727983238458, 7.928534450711351], [-9.755342169625832, 8.541055202666923], [-10.016566534861253, 8.42850393313523], [-10.230093553091276, 8.406205552601291], [-10.505477260774667, 8.348896389189603], [-10.494315151399629, 8.715540676300433], [-10.65477047366589, 8.977178452994194], [-10.622395188835037, 9.267910061068276], [-10.839151984083299, 9.688246161330367], [-11.117481248407328, 10.045872911006283], [-11.917277390988655, 10.046983954300556], [-12.150338100625003, 9.858571682164378], [-12.425928514037562, 9.835834051955953], [-12.596719122762206, 9.620188300001969], [-12.711957566773076, 9.342711696810765], [-13.246550258832512, 8.903048610871506], [-13.685153977909788, 9.494743760613458], [-14.074044969122278, 9.886166897008248], [-14.330075852912367, 10.015719712763966], [-14.579698859098254, 10.214467271358513], [-14.693231980843501, 10.65630076745404], [-14.83955379887794, 10.876571560098139], [-15.130311245168167, 11.040411688679525], [-14.685687221728896, 11.527823798056485], [-14.382191534878727, 11.509271958863691], [-14.121406419317776, 11.677117010947693], [-13.900799729863772, 11.678718980348744], [-13.743160773157411, 11.811269029177408], [-13.828271857142122, 12.142644151249041], [-13.718743658899511, 12.247185573775507], [-13.700476040084322, 12.586182969610192], [-13.217818162478235, 12.575873521367964], [-12.499050665730561, 12.332089952031053], [-12.278599005573438, 12.354440008997285], [-12.20356482588563, 12.465647691289401], [-11.658300950557928, 12.386582749882834], [-11.513942836950587, 12.442987575729415], [-11.456168585648269, 12.076834214725336], [-11.297573614944508, 12.077971096235768], [-11.036555955438256, 12.211244615116513], [-10.870829637078211, 12.177887478072106], [-10.593223842806278, 11.923975328005977], [-10.165213792348835, 11.844083563682743], [-9.890992804392011, 12.060478623904968], [-9.567911749703212, 12.194243068892472], [-9.327616339546008, 12.334286200403451], [-9.127473517279581, 12.308060411015331], [-8.905264858424529, 12.088358059126433], [-8.786099005559462, 11.812560939984705], [-8.376304897484911, 11.393645941610627], [-8.581305304386772, 11.136245632364801], [-8.620321010767126, 10.810890814655181], [-8.407310756860026, 10.90925690352276], [-8.282357143578279, 10.792597357623842], [-8.335377163109738, 10.494811916541932], [-8.029943610048617, 10.206534939001711], [-8.22933712404682, 10.129020290563897], [-8.309616461612249, 9.789531968622439], [-8.079113735374348, 9.376223863152033], [-7.832100389019186, 8.575704250518625], [-8.203498907900878, 8.455453192575446], [-8.299048631208562, 8.316443589710302], [-8.221792364932197, 8.123328762235571], [-8.280703497744936, 7.687179673692156], [-8.439298468448696, 7.686042792181736]]] } },
-            { "type": "Feature", "properties": { "admin": "Gambia", "name": "Gambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.84152462408127, 13.151393947802557], [-16.713728807023468, 13.594958604379853], [-15.624596320039936, 13.623587347869556], [-15.398770310924457, 13.860368760630916], [-15.081735398813816, 13.876491807505982], [-14.687030808968483, 13.63035696049978], [-14.376713833055785, 13.625680243377371], [-14.046992356817478, 13.794067898000446], [-13.844963344772404, 13.505041612191999], [-14.277701788784553, 13.28058502853224], [-14.712197231494626, 13.298206691943774], [-15.141163295949463, 13.509511623585235], [-15.511812506562931, 13.278569647672864], [-15.691000535534991, 13.270353094938455], [-15.931295945692208, 13.130284125211331], [-16.84152462408127, 13.151393947802557]]] } },
-            { "type": "Feature", "properties": { "admin": "Guinea Bissau", "name": "Guinea-Bissau", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-15.130311245168167, 11.040411688679525], [-15.664180467175523, 11.458474025920792], [-16.085214199273562, 11.524594021038236], [-16.314786749730199, 11.806514797406548], [-16.308947312881227, 11.958701890506116], [-16.613838263403277, 12.170911159712698], [-16.67745195155457, 12.38485158940105], [-16.147716844130581, 12.547761542201185], [-15.816574266004251, 12.515567124883345], [-15.548476935274005, 12.628170070847343], [-13.700476040084322, 12.586182969610192], [-13.718743658899511, 12.247185573775507], [-13.828271857142122, 12.142644151249041], [-13.743160773157411, 11.811269029177408], [-13.900799729863772, 11.678718980348744], [-14.121406419317776, 11.677117010947693], [-14.382191534878727, 11.509271958863691], [-14.685687221728896, 11.527823798056485], [-15.130311245168167, 11.040411688679525]]] } },
-            { "type": "Feature", "properties": { "admin": "Equatorial Guinea", "name": "Eq. Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.492888624721981, 1.010119533691494], [9.305613234096255, 1.160911363119183], [9.649158155972627, 2.283866075037735], [11.276449008843711, 2.261050930180871], [11.285078973036461, 1.057661851400013], [9.83028405115564, 1.067893784993799], [9.492888624721981, 1.010119533691494]]] } },
-            { "type": "Feature", "properties": { "admin": "Greece", "name": "Greece", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[23.699980096133, 35.705004380835526], [24.246665073348673, 35.368022365860149], [25.025015496528873, 35.424995632461979], [25.769207797964182, 35.354018052709073], [25.745023227651579, 35.179997666966209], [26.290002882601719, 35.299990342747911], [26.164997592887651, 35.004995429009789], [24.724982130642299, 34.919987697889603], [24.735007358506941, 35.084990546197581], [23.514978468528106, 35.27999156345097], [23.699980096133, 35.705004380835526]]], [[[26.604195590936282, 41.562114569661098], [26.294602085075777, 40.936261298174244], [26.056942172965499, 40.824123440100827], [25.44767703624418, 40.852545477861455], [24.925848422960932, 40.947061672523226], [23.714811232200809, 40.687129218095116], [24.407998894964063, 40.124992987624083], [23.89996788910258, 39.962005520175573], [23.342999301860797, 39.960997829745786], [22.813987664488959, 40.476005153966547], [22.626298862404777, 40.256561184239175], [22.849747755634805, 39.659310818025759], [23.350027296652595, 39.190011298167256], [22.97309939951554, 38.97090322524965], [23.53001631032495, 38.51000112563846], [24.025024855248937, 38.219992987616443], [24.040011020613601, 37.655014553369419], [23.115002882589145, 37.920011298162215], [23.409971958111065, 37.409990749657389], [22.77497195810863, 37.305010077456551], [23.154225294698612, 36.422505804992042], [22.4900281104511, 36.410000108377446], [21.670026482843692, 36.84498647719419], [21.295010613701574, 37.644989325504689], [21.120034213961329, 38.31032339126272], [20.730032179454579, 38.769985256498778], [20.217712029712853, 39.340234686839629], [20.150015903410516, 39.624997666984022], [20.615000441172779, 40.110006822259422], [20.67499677906363, 40.434999904943048], [20.999989861747274, 40.580003973953964], [21.020040317476422, 40.842726955725873], [21.674160597426969, 40.931274522457976], [22.055377638444266, 41.149865831052686], [22.597308383889008, 41.130487168943198], [22.76177, 41.3048], [22.952377150166562, 41.337993882811212], [23.692073601992455, 41.309080918943849], [24.492644891058031, 41.583896185872035], [25.19720136892553, 41.234485988930651], [26.106138136507177, 41.328898830727823], [26.11704186372091, 41.826904608724725], [26.604195590936282, 41.562114569661098]]]] } },
-            { "type": "Feature", "properties": { "admin": "Greenland", "name": "Greenland", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-46.76379, 82.62796], [-43.40644, 83.22516], [-39.89753, 83.18018], [-38.62214, 83.54905], [-35.08787, 83.64513], [-27.10046, 83.51966], [-20.84539, 82.72669], [-22.69182, 82.34165], [-26.51753, 82.29765], [-31.9, 82.2], [-31.39646, 82.02154], [-27.85666, 82.13178], [-24.84448, 81.78697], [-22.90328, 82.09317], [-22.07175, 81.73449], [-23.16961, 81.15271], [-20.62363, 81.52462], [-15.76818, 81.91245], [-12.77018, 81.71885], [-12.20855, 81.29154], [-16.28533, 80.58004], [-16.85, 80.35], [-20.04624, 80.17708], [-17.73035, 80.12912], [-18.9, 79.4], [-19.70499, 78.75128], [-19.67353, 77.63859], [-18.47285, 76.98565], [-20.03503, 76.94434], [-21.67944, 76.62795], [-19.83407, 76.09808], [-19.59896, 75.24838], [-20.66818, 75.15585], [-19.37281, 74.29561], [-21.59422, 74.22382], [-20.43454, 73.81713], [-20.76234, 73.46436], [-22.17221, 73.30955], [-23.56593, 73.30663], [-22.31311, 72.62928], [-22.29954, 72.18409], [-24.27834, 72.59788], [-24.79296, 72.3302], [-23.44296, 72.08016], [-22.13281, 71.46898], [-21.75356, 70.66369], [-23.53603, 70.471], [-24.30702, 70.85649], [-25.54341, 71.43094], [-25.20135, 70.75226], [-26.36276, 70.22646], [-23.72742, 70.18401], [-22.34902, 70.12946], [-25.02927, 69.2588], [-27.74737, 68.47046], [-30.67371, 68.12503], [-31.77665, 68.12078], [-32.81105, 67.73547], [-34.20196, 66.67974], [-36.35284, 65.9789], [-37.04378, 65.93768], [-38.37505, 65.69213], [-39.81222, 65.45848], [-40.66899, 64.83997], [-40.68281, 64.13902], [-41.1887, 63.48246], [-42.81938, 62.68233], [-42.41666, 61.90093], [-42.86619, 61.07404], [-43.3784, 60.09772], [-44.7875, 60.03676], [-46.26364, 60.85328], [-48.26294, 60.85843], [-49.23308, 61.40681], [-49.90039, 62.38336], [-51.63325, 63.62691], [-52.14014, 64.27842], [-52.27659, 65.1767], [-53.66166, 66.09957], [-53.30161, 66.8365], [-53.96911, 67.18899], [-52.9804, 68.35759], [-51.47536, 68.72958], [-51.08041, 69.14781], [-50.87122, 69.9291], [-52.013585, 69.574925], [-52.55792, 69.42616], [-53.45629, 69.283625], [-54.68336, 69.61003], [-54.75001, 70.28932], [-54.35884, 70.821315], [-53.431315, 70.835755], [-51.39014, 70.56978], [-53.10937, 71.20485], [-54.00422, 71.54719], [-55.0, 71.406536967272558], [-55.83468, 71.65444], [-54.71819, 72.58625], [-55.32634, 72.95861], [-56.12003, 73.64977], [-57.32363, 74.71026], [-58.59679, 75.09861], [-58.58516, 75.51727], [-61.26861, 76.10238], [-63.39165, 76.1752], [-66.06427, 76.13486], [-68.50438, 76.06141], [-69.66485, 76.37975], [-71.40257, 77.00857], [-68.77671, 77.32312], [-66.76397, 77.37595], [-71.04293, 77.63595], [-73.297, 78.04419], [-73.15938, 78.43271], [-69.37345, 78.91388], [-65.7107, 79.39436], [-65.3239, 79.75814], [-68.02298, 80.11721], [-67.15129, 80.51582], [-63.68925, 81.21396], [-62.23444, 81.3211], [-62.65116, 81.77042], [-60.28249, 82.03363], [-57.20744, 82.19074], [-54.13442, 82.19962], [-53.04328, 81.88833], [-50.39061, 82.43883], [-48.00386, 82.06481], [-46.59984, 81.985945], [-44.523, 81.6607], [-46.9007, 82.19979], [-46.76379, 82.62796]]] } },
-            { "type": "Feature", "properties": { "admin": "Guatemala", "name": "Guatemala", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-90.095554572290951, 13.73533763270073], [-90.608624030300817, 13.909771429901948], [-91.232410244496037, 13.927832342987953], [-91.689746670279106, 14.126218166556452], [-92.227750006869812, 14.538828640190925], [-92.203229539747298, 14.830102850804066], [-92.087215949252041, 15.064584662328436], [-92.229248623406249, 15.251446641495857], [-91.747960171255912, 16.066564846251719], [-90.464472622422647, 16.069562079324651], [-90.438866950222021, 16.410109768128091], [-90.600846727240906, 16.470777899638758], [-90.711821865587694, 16.687483018454724], [-91.081670091500641, 16.918476670799404], [-91.453921271515128, 17.252177232324168], [-91.002269253284197, 17.254657701074176], [-91.001519945015943, 17.817594916245707], [-90.067933519230948, 17.819326076727474], [-89.143080410503302, 17.808318996649316], [-89.15080603713092, 17.015576687075832], [-89.229121670269265, 15.886937567605166], [-88.930612759135244, 15.887273464415072], [-88.604586147805833, 15.706380113177358], [-88.518364020526846, 15.855389105690971], [-88.22502275262201, 15.727722479713901], [-88.680679694355618, 15.346247056535301], [-89.15481096063354, 15.066419175674806], [-89.225220099631244, 14.874286200413618], [-89.145535041037149, 14.67801911056908], [-89.353325975282772, 14.424132798719112], [-89.587342698916544, 14.362586167859485], [-89.5342193265205, 14.244815578666302], [-89.7219339668207, 14.134228013561694], [-90.064677903996568, 13.881969509328924], [-90.095554572290951, 13.73533763270073]]] } },
-            { "type": "Feature", "properties": { "admin": "Guyana", "name": "Guyana", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-59.758284878159181, 8.367034816924045], [-59.10168412945864, 7.99920197187049], [-58.482962205628041, 7.347691351750696], [-58.454876064677414, 6.832787380394463], [-58.078103196837361, 6.809093736188641], [-57.542218593970631, 6.321268215353355], [-57.147436489476874, 5.973149929219161], [-57.307245856339492, 5.073566595882225], [-57.914288906472123, 4.812626451024413], [-57.860209520078691, 4.576801052260449], [-58.044694383360664, 4.060863552258382], [-57.601568976457848, 3.334654649260684], [-57.281433478409703, 3.333491929534119], [-57.150097825739898, 2.768926906745406], [-56.53938574891454, 1.89952260986692], [-56.782704230360814, 1.863710842288653], [-57.33582292339689, 1.948537705895759], [-57.660971035377358, 1.682584947105638], [-58.113449876525003, 1.507195135907025], [-58.429477098205957, 1.46394196207872], [-58.540012986878288, 1.26808828369252], [-59.030861579002639, 1.317697658692722], [-59.646043667221242, 1.786893825686789], [-59.718545701726732, 2.249630438644359], [-59.974524909084543, 2.755232652188055], [-59.815413174057852, 3.606498521332085], [-59.538039923731219, 3.958802598481937], [-59.767405768458701, 4.423502915866606], [-60.111002366767373, 4.574966538914082], [-59.980958624904865, 5.014061184098138], [-60.213683437731319, 5.2444863956876], [-60.733574184803707, 5.2002772078619], [-61.410302903881941, 5.959068101419616], [-61.139415045807937, 6.234296779806142], [-61.159336310456467, 6.696077378766317], [-60.543999192940966, 6.856584377464881], [-60.295668097562377, 7.043911444522918], [-60.637972785063752, 7.414999904810853], [-60.550587938058186, 7.779602972846178], [-59.758284878159181, 8.367034816924045]]] } },
-            { "type": "Feature", "properties": { "admin": "Honduras", "name": "Honduras", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.316654425795463, 12.984685777229], [-87.48940873894712, 13.29753489832393], [-87.793111131526501, 13.384480495655165], [-87.723502977229288, 13.785050360565602], [-87.859515347021599, 13.893312486217097], [-88.065342576840109, 13.964625962779788], [-88.503997972349609, 13.845485948130939], [-88.541230841815931, 13.98015473068352], [-88.843072882832743, 14.140506700085208], [-89.058511929057644, 14.340029405164213], [-89.353325975282786, 14.424132798719084], [-89.145535041037164, 14.678019110569149], [-89.22522009963123, 14.874286200413675], [-89.154810960633526, 15.066419175674863], [-88.680679694355575, 15.346247056535386], [-88.225022752621925, 15.727722479714027], [-88.121153123715359, 15.688655096901355], [-87.901812506852394, 15.864458319558194], [-87.615680101252309, 15.878798529519198], [-87.522920905288444, 15.797278957578779], [-87.367762417332116, 15.846940009011286], [-86.903191291028165, 15.756712958229565], [-86.440945604177372, 15.782835394753189], [-86.119233974944322, 15.893448798073958], [-86.00195431185783, 16.005405788634388], [-85.68331743034625, 15.953651841693949], [-85.444003872402547, 15.885749009662444], [-85.182443610357183, 15.909158433490628], [-84.98372188997881, 15.995923163308698], [-84.526979743167118, 15.857223619037423], [-84.36825558138257, 15.835157782448729], [-84.063054572266807, 15.648244126849132], [-83.773976610026111, 15.42407176356687], [-83.410381232420363, 15.27090281825377], [-83.147219000974104, 14.995829169164207], [-83.489988776366005, 15.01626719813566], [-83.628584967772866, 14.880073960830368], [-83.975721401693576, 14.749435939996483], [-84.228341640952394, 14.748764146376626], [-84.449335903648588, 14.62161428472251], [-84.64958207877963, 14.666805324761865], [-84.820036790694289, 14.819586696832628], [-84.924500698572302, 14.790492865452332], [-85.052787441736868, 14.551541042534719], [-85.148750576502877, 14.560196844943615], [-85.165364549484806, 14.354369615125048], [-85.514413011400265, 14.079011745657905], [-85.698665330736944, 13.960078436737998], [-85.801294725268505, 13.8360549992376], [-86.096263800790595, 14.03818736414723], [-86.312142096689826, 13.771356106008223], [-86.520708177419891, 13.778487453664464], [-86.755086636079596, 13.754845485890936], [-86.733821784191463, 13.263092556201398], [-86.880557013684353, 13.254204209847213], [-87.005769009127434, 13.025794379117254], [-87.316654425795463, 12.984685777229]]] } },
-            { "type": "Feature", "properties": { "admin": "Croatia", "name": "Croatia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.829838087650039, 45.908877671891837], [19.072768995854172, 45.521511135432078], [19.390475701584588, 45.236515611342369], [19.005486281010118, 44.860233669609144], [18.553214145591646, 45.08158966733145], [17.861783481526398, 45.067740383477137], [17.00214603035101, 45.233776760430935], [16.534939406000202, 45.211607570977705], [16.318156772535868, 45.004126695325901], [15.959367303133373, 45.233776760430935], [15.750026075918978, 44.81871165626255], [16.239660271884528, 44.351143296885695], [16.456442905348862, 44.041239732431265], [16.916156447017325, 43.667722479825663], [17.297373488034449, 43.446340643887353], [17.674921502358981, 43.028562527023603], [18.56, 42.65], [18.450016310304814, 42.47999136002931], [17.509970330483323, 42.84999461523914], [16.930005730871638, 43.209998480800373], [16.015384555737679, 43.507215481127204], [15.174453973052094, 44.243191229827907], [15.376250441151793, 44.317915350922064], [14.920309279040504, 44.73848399512945], [14.901602410550874, 45.076060289076104], [14.258747592839992, 45.233776760430935], [13.952254672917032, 44.802123521496853], [13.65697553880119, 45.136935126315947], [13.679403110415816, 45.484149074884996], [13.715059848697248, 45.500323798192419], [14.411968214585496, 45.466165676447403], [14.595109490627916, 45.63494090431282], [14.935243767972961, 45.471695054702757], [15.327674594797424, 45.452316392593325], [15.323953891672428, 45.731782538427687], [15.671529575267638, 45.8341535507979], [15.768732944408608, 46.23810822202352], [16.564808383864939, 46.503750922219794], [16.882515089595412, 46.380631822284428], [17.630066359129554, 45.951769110694087], [18.456062452882858, 45.759481106136143], [18.829838087650039, 45.908877671891837]]] } },
-            { "type": "Feature", "properties": { "admin": "Haiti", "name": "Haiti", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-73.189790615517595, 19.915683905511909], [-72.579672817663607, 19.871500555902351], [-71.71236141629295, 19.714455878167353], [-71.624873216422813, 19.169837958243303], [-71.701302659782485, 18.785416978424049], [-71.945112067335543, 18.616900132720257], [-71.687737596305865, 18.316660061104468], [-71.708304816358037, 18.044997056546091], [-72.372476162389333, 18.214960842354053], [-72.844411180294856, 18.145611070218362], [-73.454554816365018, 18.217906398994696], [-73.922433234335642, 18.030992743395], [-74.458033616824764, 18.342549953682703], [-74.369925299767118, 18.664907538319408], [-73.449542202432696, 18.526052964751141], [-72.694937099890623, 18.445799465401858], [-72.334881557896992, 18.66842153571525], [-72.791649542924873, 19.101625067618027], [-72.784104783810264, 19.483591416903405], [-73.41502234566174, 19.639550889560276], [-73.189790615517595, 19.915683905511909]]] } },
-            { "type": "Feature", "properties": { "admin": "Hungary", "name": "Hungary", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.202298211337361, 46.852385972676949], [16.534267612380372, 47.496170966169103], [16.340584344150411, 47.712901923201215], [16.903754103267257, 47.714865627628321], [16.979666782304033, 48.123497015976298], [17.488472934649813, 47.867466132186209], [17.857132602620023, 47.758428860050365], [18.696512892336923, 47.88095368101439], [18.777024773847668, 48.081768296900627], [19.174364861739885, 48.111378892603859], [19.66136355965849, 48.266614895208647], [19.769470656013109, 48.2026911484636], [20.239054396249344, 48.327567247096916], [20.473562045989862, 48.562850043321809], [20.801293979584919, 48.62385407164237], [21.872236362401729, 48.319970811550007], [22.085608351334848, 48.422264309271782], [22.640819939878746, 48.150239569687351], [22.710531447040488, 47.882193915389394], [22.09976769378283, 47.672439276716695], [21.626514926853869, 46.994237779318148], [21.021952345471245, 46.316087958351886], [20.220192498462833, 46.127468980486547], [19.596044549241579, 46.171729844744533], [18.829838087649957, 45.908877671891915], [18.456062452882858, 45.759481106136121], [17.630066359129554, 45.95176911069418], [16.882515089595298, 46.380631822284428], [16.564808383864854, 46.503750922219822], [16.370504998447412, 46.841327216166498], [16.202298211337361, 46.852385972676949]]] } },
-            { "type": "Feature", "properties": { "admin": "Indonesia", "name": "Indonesia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[120.715608758630438, -10.239581394087862], [120.295014276206871, -10.258649997603525], [118.967808465654684, -9.55796925215803], [119.900309686361609, -9.361340427287514], [120.425755649905398, -9.665921319215796], [120.775501743656719, -9.969675388227456], [120.715608758630438, -10.239581394087862]]], [[[124.435950148619384, -10.14000090906144], [123.579981724136701, -10.359987481327961], [123.459989048354998, -10.239994805546171], [123.55000939340745, -9.900015557497978], [123.980008986508096, -9.290026950724693], [124.96868248911619, -8.892790215697046], [125.070019972840612, -9.089987481322835], [125.088520135601073, -9.393173109579321], [124.435950148619384, -10.14000090906144]]], [[[117.900018345207741, -8.095681247594923], [118.260616489740471, -8.362383314653327], [118.87845991422212, -8.280682875199828], [119.126506789223086, -8.705824883665072], [117.97040164598927, -8.906639499551257], [117.277730747549015, -9.040894870645557], [116.74014082241662, -9.032936700072637], [117.083737420725313, -8.457157891476539], [117.632024367342126, -8.44930307376819], [117.900018345207741, -8.095681247594923]]], [[[122.903537225436082, -8.094234307490735], [122.756982863456287, -8.649807631060638], [121.2544905945701, -8.933666273639941], [119.924390903809567, -8.810417982623873], [119.920928582846102, -8.44485890059107], [120.715091994307542, -8.236964613480863], [121.341668735846554, -8.53673959720602], [122.007364536630405, -8.46062021244016], [122.903537225436082, -8.094234307490735]]], [[[108.623478631628927, -6.777673841990675], [110.539227329553285, -6.877357679881682], [110.759575636845909, -6.465186455921751], [112.614811232556349, -6.946035658397589], [112.978768345188087, -7.594213148634578], [114.478935174621142, -7.776527601760277], [115.705526971501058, -8.370806573116864], [114.564511346496488, -8.75181690840483], [113.464733514460875, -8.348947442257424], [112.559672479301028, -8.376180922075163], [111.522061395312448, -8.302128594600957], [110.586149530074294, -8.122604668819021], [109.427667270955183, -7.740664157749761], [108.693655226681301, -7.641600437046219], [108.277763299596302, -7.766657403192579], [106.454102004016136, -7.354899590690947], [106.280624220812285, -6.924899997590201], [105.365486281355516, -6.851416110871169], [106.051645949327053, -5.895918877794499], [107.265008579540165, -5.954985039904058], [108.072091099074683, -6.345762220895237], [108.486846144649235, -6.421984958525768], [108.623478631628927, -6.777673841990675]]], [[[134.724624465066654, -6.214400730009286], [134.210133905168902, -6.895237725454704], [134.112775506730998, -6.142467136259014], [134.290335728085779, -5.783057549669038], [134.499625278867882, -5.445042006047898], [134.727001580952106, -5.737582289252158], [134.724624465066654, -6.214400730009286]]], [[[127.249215122588893, -3.459065036638889], [126.874922723498855, -3.790982761249579], [126.183802118027302, -3.607376397316556], [125.989033644719257, -3.177273451351325], [127.00065148326496, -3.12931772218441], [127.249215122588893, -3.459065036638889]]], [[[130.471344028851775, -3.09376433676762], [130.834836053592767, -3.858472181822761], [129.990546502808115, -3.446300957862817], [129.155248651242403, -3.362636813982248], [128.590683628453633, -3.428679294451256], [127.898891229362334, -3.393435967628192], [128.135879347852779, -2.843650404474914], [129.370997756060888, -2.802154229344551], [130.471344028851775, -3.09376433676762]]], [[[134.143367954647772, -1.151867364103594], [134.422627394753022, -2.769184665542383], [135.457602980694674, -3.367752780779113], [136.293314243718754, -2.30704233155609], [137.4407377463275, -1.703513278819372], [138.329727411044757, -1.70268645590265], [139.18492068904294, -2.051295668143637], [139.926684198160387, -2.409051608900284], [141.000210402591847, -2.600151055515624], [141.017056919519007, -5.85902190513802], [141.033851760013874, -9.117892754760417], [140.143415155192542, -8.297167657100955], [139.127766554928087, -8.096042982620942], [138.881476678624949, -8.380935153846094], [137.614473911692812, -8.41168263105976], [138.039099155835174, -7.597882175327354], [138.668621454014783, -7.320224704623072], [138.407913853102343, -6.232849216337483], [137.927839797110835, -5.393365573755998], [135.989250116113453, -4.546543877789047], [135.164597609599667, -4.462931410340771], [133.662880487197867, -3.538853448097526], [133.367704705946778, -4.024818617370314], [132.983955519747326, -4.112978610860281], [132.75694095268895, -3.746282647317129], [132.753788690319197, -3.311787204607071], [131.989804315316178, -2.820551039240455], [133.066844517143466, -2.460417982598443], [133.780030959203486, -2.479848321140209], [133.69621178602614, -2.214541517753687], [132.232373488494204, -2.212526136894325], [131.836221958544684, -1.617161960459597], [130.942839797082797, -1.432522067880796], [130.519558140180038, -0.937720228686075], [131.867537876513609, -0.695461114101818], [132.380116408416768, -0.369537855636977], [133.985548130428384, -0.780210463060442], [134.143367954647772, -1.151867364103594]]], [[[125.240500522971573, 1.419836127117605], [124.43703535369734, 0.427881171058971], [123.685504998876695, 0.235593166500877], [122.723083123872854, 0.431136786293337], [121.056724888189081, 0.381217352699451], [120.18308312386273, 0.23724681233422], [120.040869582195455, -0.519657891444851], [120.935905389490699, -1.408905938323372], [121.475820754076167, -0.955962009285116], [123.34056481332847, -0.615672702643081], [123.258399285984481, -1.076213067228337], [122.822715285331597, -0.930950616055881], [122.388529901215364, -1.516858005381124], [121.508273553555455, -1.904482924002422], [122.454572381684272, -3.186058444840881], [122.271896193532541, -3.529500013852696], [123.170962762546537, -4.683693129091707], [123.162332798353759, -5.34060393638596], [122.628515252778683, -5.634591159694494], [122.236394484548057, -5.282933037948281], [122.71956912647704, -4.46417164471579], [121.738233677254357, -4.851331475446499], [121.48946333220124, -4.574552504091215], [121.619171177253861, -4.188477878438674], [120.898181593917684, -3.602105401222828], [120.972388950688767, -2.627642917494909], [120.305452915529884, -2.931603692235725], [120.39004723519173, -4.097579034037223], [120.430716587405371, -5.528241062037778], [119.796543410319487, -5.67340016034565], [119.36690555224493, -5.379878024927804], [119.653606398600104, -4.459417412944958], [119.498835483885969, -3.49441171632651], [119.078344354326987, -3.487021986508764], [118.767768996252869, -2.801999200047688], [119.180973748858662, -2.147103773612798], [119.323393996255049, -1.35314706788047], [119.825998976725828, 0.154254462073496], [120.035701938966341, 0.566477362465804], [120.885779250167687, 1.309222723796835], [121.666816847826965, 1.013943589681076], [122.927566766451818, 0.875192368977465], [124.077522414242836, 0.917101955566139], [125.065989211121803, 1.643259182131558], [125.240500522971573, 1.419836127117605]]], [[[128.688248732620707, 1.132385972494106], [128.635952183141342, 0.258485826006179], [128.120169712436166, 0.356412665199286], [127.968034295768845, -0.252077325037533], [128.379998813999691, -0.780003757331286], [128.100015903842291, -0.899996433112974], [127.69647464407501, -0.266598402511505], [127.399490187693743, 1.011721503092573], [127.600511509309044, 1.81069082275718], [127.932377557487484, 2.174596258956555], [128.004156121940809, 1.628531398928331], [128.594559360875451, 1.540810655112864], [128.688248732620707, 1.132385972494106]]], [[[117.875627069166001, 1.827640692548911], [118.996747267738158, 0.902219143066048], [117.811858351717788, 0.784241848143722], [117.478338657706047, 0.102474676917026], [117.521643507966587, -0.803723239753211], [116.560048455879496, -1.487660821136231], [116.533796828275158, -2.483517347832901], [116.148083937648607, -4.012726332214014], [116.000857782049067, -3.657037448749008], [114.864803094544513, -4.106984144714416], [114.468651564595064, -3.49570362713382], [113.755671828264099, -3.439169610206519], [113.256994256647545, -3.118775729996854], [112.068126255340644, -3.478392022316071], [111.703290643359992, -2.994442233902631], [111.04824018762821, -3.049425957861188], [110.223846063275971, -2.934032484553483], [110.070935500124335, -1.592874037282414], [109.571947869914041, -1.314906507984489], [109.091873813922518, -0.459506524257051], [108.952657505328162, 0.415375474444346], [109.069136183714036, 1.341933905437642], [109.663260125773718, 2.006466986494984], [109.830226678508836, 1.338135687664191], [110.514060907027101, 0.773131415200993], [111.159137811326559, 0.976478176269509], [111.797548455860408, 0.904441229654651], [112.380251906383648, 1.410120957846757], [112.859809198052176, 1.497790025229946], [113.805849644019531, 1.217548732911041], [114.621355422017473, 1.430688177898886], [115.134037306785231, 2.821481838386219], [115.51907840379198, 3.169238389494395], [115.86551720587677, 4.306559149590156], [117.01521447150634, 4.306094061699468], [117.882034946770162, 4.137551377779487], [117.313232456533513, 3.234428208830578], [118.048329705885351, 2.287690131027361], [117.875627069166001, 1.827640692548911]]], [[[105.817655063909356, -5.852355645372411], [104.710384149191498, -5.873284600450644], [103.868213332130736, -5.037314955264974], [102.584260695406897, -4.220258884298203], [102.156173130300999, -3.614146009946765], [101.399113397225051, -2.799777113459171], [100.902502882900137, -2.05026213949786], [100.141980828860596, -0.650347588710957], [99.26373986206022, 0.183141587724663], [98.970011020913319, 1.042882391764536], [98.601351352943084, 1.823506577965616], [97.699597609449881, 2.453183905442116], [97.17694217324987, 3.30879059489861], [96.424016554757316, 3.86885976807791], [95.380876092513475, 4.970782172053673], [95.293026157617305, 5.479820868344816], [95.936862827541745, 5.439513251157108], [97.484882033277088, 5.24632090903401], [98.369169142655679, 4.268370266126366], [99.142558628335792, 3.590349636240915], [99.693997837322399, 3.174328518075156], [100.641433546961665, 2.099381211755798], [101.658012323007313, 2.083697414555189], [102.498271112073212, 1.398700466310217], [103.076840448013002, 0.561361395668854], [103.838396030698348, 0.104541734208666], [103.437645298274973, -0.711945896002845], [104.010788608824001, -1.059211521004229], [104.369991489684878, -1.084843031421016], [104.539490187602155, -1.782371514496716], [104.887892694113987, -2.340425306816655], [105.622111444116982, -2.42884368246807], [106.10859337771268, -3.06177662517895], [105.857445916774111, -4.305524997579723], [105.817655063909356, -5.852355645372411]]]] } },
-            { "type": "Feature", "properties": { "admin": "India", "name": "India", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[77.837450799474553, 35.494009507787759], [78.912268914713209, 34.321936346975782], [78.811086460285722, 33.506198025032404], [79.208891636068572, 32.994394639613709], [79.176128777995501, 32.483779812137705], [78.458446486325997, 32.61816437431272], [78.738894484374001, 31.515906073527056], [79.721366815107089, 30.882714748654724], [81.11125613802929, 30.183480943313398], [80.476721225917373, 29.729865220655334], [80.088424513676259, 28.794470119740136], [81.057202589851997, 28.416095282499036], [81.999987420584958, 27.925479234319987], [83.304248895199535, 27.364505723575554], [84.675017938173767, 27.234901231387528], [85.25177859898335, 26.726198431906337], [86.024392938179147, 26.630984605408567], [87.22747195836628, 26.39789805755607], [88.060237664749806, 26.414615383402484], [88.174804315140904, 26.810405178325944], [88.043132765661198, 27.445818589786818], [88.120440708369841, 27.876541652939586], [88.730325962278528, 28.086864732367509], [88.814248488320544, 27.299315904239361], [88.835642531289366, 27.098966376243755], [89.744527622438838, 26.71940298105995], [90.37327477413406, 26.875724188742872], [91.217512648486405, 26.808648179628019], [92.033483514375078, 26.838310451763554], [92.10371178585973, 27.4526140406332], [91.69665652869665, 27.771741848251661], [92.503118931043616, 27.896876329046442], [93.413347609432662, 28.640629380807219], [94.565990431702929, 29.277438055939978], [95.404802280664612, 29.031716620392125], [96.117678664131006, 29.452802028922459], [96.586590610747479, 28.830979519154337], [96.248833449287758, 28.411030992134435], [97.327113885490007, 28.261582749946331], [97.402561476636123, 27.88253611908544], [97.051988559968066, 27.699058946233144], [97.133999058015277, 27.08377350514996], [96.419365675850941, 27.264589341739221], [95.124767694074933, 26.573572089132295], [95.155153436262566, 26.001307277932078], [94.603249139385355, 25.162495428970399], [94.552657912171611, 24.675238348890328], [94.106741977925054, 23.850740871673477], [93.325187615942767, 24.078556423432197], [93.286326938859247, 23.043658352138998], [93.060294224014598, 22.703110663335565], [93.166127557348361, 22.278459580977099], [92.672720981825549, 22.041238918541247], [92.146034783906799, 23.62749868417259], [91.869927606171302, 23.62434642180278], [91.706475050832083, 22.985263983649183], [91.158963250699713, 23.503526923104381], [91.467729933643668, 24.072639471934789], [91.915092807994398, 24.130413723237108], [92.376201613334786, 24.976692816664961], [91.799595981822065, 25.14743174895731], [90.872210727912105, 25.13260061288954], [89.920692580121838, 25.269749864192171], [89.832480910199592, 25.965082098895476], [89.355094028687276, 26.014407253518065], [88.56304935094974, 26.446525580342716], [88.209789259802477, 25.768065700782707], [88.931553989623069, 25.238692328384769], [88.30637251175601, 24.866079413344199], [88.084422235062405, 24.501657212821918], [88.699940220090895, 24.233714911388557], [88.529769728553759, 23.631141872649163], [88.876311883503064, 22.879146429937826], [89.031961297566198, 22.055708319582973], [88.888765903685396, 21.690588487224741], [88.208497348995209, 21.703171698487804], [86.975704380240259, 21.495561631755201], [87.033168572948853, 20.743307806882406], [86.499351027373777, 20.151638495356604], [85.060265740909671, 19.478578802971096], [83.941005893899998, 18.302009792549722], [83.189217156917834, 17.671221421778977], [82.192792189465905, 17.016636053937813], [82.191241896497175, 16.556664130107844], [81.692719354177456, 16.3102192245079], [80.791999139330116, 15.951972357644488], [80.324895867843864, 15.899184882058346], [80.025069207686428, 15.136414903214144], [80.23327355339039, 13.835770778859978], [80.286293572921849, 13.006260687710832], [79.862546828128487, 12.056215318240886], [79.85799930208681, 10.357275091997108], [79.340511509115984, 10.308854274939618], [78.885345493489169, 9.54613597252772], [79.189719679688281, 9.216543687370146], [78.27794070833049, 8.933046779816932], [77.94116539908434, 8.25295909263974], [77.539897902337927, 7.965534776232331], [76.592978957021657, 8.899276231314188], [76.130061476551063, 10.299630031775518], [75.746467319648488, 11.308250637248303], [75.396101108709573, 11.781245022015822], [74.864815708316812, 12.741935736537895], [74.616717156883524, 13.992582912649677], [74.443859490867197, 14.617221787977693], [73.534199253233368, 15.990652167214957], [73.119909295549419, 17.928570054592495], [72.820909458308634, 19.208233547436162], [72.824475132136783, 20.41950328214153], [72.630533481745388, 21.356009426351001], [71.175273471973938, 20.757441311114228], [70.470458611945091, 20.877330634031381], [69.164130080038817, 22.089298000572697], [69.644927606082391, 22.450774644454334], [69.349596795534325, 22.843179633062686], [68.176645135373377, 23.691965033456704], [68.842599318318761, 24.359133612560932], [71.0432401874682, 24.356523952730193], [70.844699334602822, 25.215102037043511], [70.282873162725579, 25.722228705339823], [70.168926629522005, 26.491871649678835], [69.514392938113119, 26.940965684511365], [70.61649620960192, 27.989196275335861], [71.777665643200308, 27.913180243434521], [72.823751662084689, 28.961591701772047], [73.450638462217412, 29.976413479119863], [74.421380242820263, 30.97981476493117], [74.405928989564998, 31.692639471965272], [75.258641798813187, 32.271105455040491], [74.451559279278698, 32.764899603805489], [74.104293654277328, 33.441473293586846], [73.749948358051952, 34.317698879527846], [74.240202671204955, 34.748887030571247], [75.757060988268321, 34.504922593721311], [76.871721632804011, 34.653544012992732], [77.837450799474553, 35.494009507787759]]] } },
-            { "type": "Feature", "properties": { "admin": "Ireland", "name": "Ireland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-6.197884894220989, 53.86756500916335], [-6.032985398777609, 53.153164170944336], [-6.788856573910847, 52.260117906292322], [-8.561616583683557, 51.669301255899349], [-9.977085740590267, 51.820454820353071], [-9.16628251793078, 52.864628811242667], [-9.688524542672452, 53.881362616585285], [-8.327987433292007, 54.664518947968624], [-7.572167934591064, 55.131622219454854], [-7.366030646178785, 54.595840969452709], [-7.572167934591064, 54.059956366585986], [-6.953730231138065, 54.073702297575622], [-6.197884894220989, 53.86756500916335]]] } },
-            { "type": "Feature", "properties": { "admin": "Iran", "name": "Iran", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.921597934795543, 37.198918361961255], [54.800303989486558, 37.392420762678178], [55.511578403551894, 37.964117133123153], [56.180374790273319, 37.935126654607423], [56.619366082592805, 38.121394354803478], [57.330433790928964, 38.029229437810933], [58.436154412678192, 37.522309475243794], [59.234761997316795, 37.412987982730336], [60.377637973883864, 36.52738312432836], [61.123070509694131, 36.491597194966239], [61.21081709172573, 35.650072333309218], [60.80319339380744, 34.404101874319856], [60.528429803311575, 33.676446031217999], [60.963700392505991, 33.528832302376252], [60.536077915290761, 32.981268825811561], [60.863654819588952, 32.182919623334421], [60.941944614511115, 31.548074652628745], [61.699314406180811, 31.379506130492661], [61.78122155136343, 30.735850328081231], [60.874248488208778, 29.829238999952604], [61.369308709564926, 29.303276272085917], [61.771868117118615, 28.699333807890792], [62.727830438085974, 28.259644883735383], [62.755425652929851, 27.378923448184985], [63.23389773952028, 27.217047024030702], [63.316631707619578, 26.756532497661659], [61.874187453056535, 26.239974880472097], [61.497362908784183, 25.078237006118492], [59.616134067630831, 25.380156561783775], [58.525761346272297, 25.609961656185725], [57.39725141788238, 25.739902045183634], [56.97076582217754, 26.966106268821356], [56.492138706290199, 27.14330475515019], [55.723710158110059, 26.964633490501036], [54.715089552637252, 26.480657863871507], [53.493096958231334, 26.812368882753042], [52.483597853409599, 27.580849107365488], [51.520762566947404, 27.865689602158291], [50.852948032439528, 28.814520575469377], [50.115008579311571, 30.14777252859971], [49.576850213423988, 29.9857152369324], [48.941333449098536, 30.31709035900403], [48.567971225789748, 29.926778265903515], [48.014568312376085, 30.452456773392594], [48.00469811380831, 30.985137437457237], [47.685286085812258, 30.984853217079621], [47.849203729042095, 31.709175930298663], [47.334661492711895, 32.469155381799105], [46.109361606639304, 33.017287299118998], [45.416690708199035, 33.967797756479577], [45.648459507028079, 34.748137722303007], [46.15178795755093, 35.093258775364284], [46.076340366404786, 35.67738332777548], [45.420618117053202, 35.977545884742817], [44.77267, 37.17045], [44.225755649600522, 37.971584377589345], [44.421402622257538, 38.281281236314534], [44.109225294782334, 39.428136298168091], [44.793989699081934, 39.713002631177041], [44.9526880226503, 39.335764675446363], [45.457721795438765, 38.874139105783051], [46.143623081248812, 38.74120148371221], [46.505719842317966, 38.770605373686287], [47.685079380083081, 39.508363959301207], [48.060095249225235, 39.582235419262453], [48.355529412637871, 39.2887649602769], [48.010744256386474, 38.794014797514514], [48.634375441284803, 38.27037750910096], [48.883249139202483, 38.32024526626261], [49.199612257693332, 37.582874253889877], [50.147771437384606, 37.37456655532133], [50.842354363819695, 36.872814235983384], [52.26402469260141, 36.700421657857696], [53.825789829326411, 36.965030829408228], [53.921597934795543, 37.198918361961255]]] } },
-            { "type": "Feature", "properties": { "admin": "Iraq", "name": "Iraq", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[45.420618117053202, 35.977545884742817], [46.076340366404786, 35.67738332777548], [46.15178795755093, 35.093258775364284], [45.648459507028079, 34.748137722303007], [45.416690708199035, 33.967797756479577], [46.109361606639304, 33.017287299118998], [47.334661492711895, 32.469155381799105], [47.849203729042095, 31.709175930298663], [47.685286085812258, 30.984853217079621], [48.00469811380831, 30.985137437457237], [48.014568312376085, 30.452456773392594], [48.567971225789748, 29.926778265903515], [47.974519077349889, 29.975819200148493], [47.302622104690947, 30.059069932570711], [46.568713413281742, 29.099025173452283], [44.709498732284736, 29.178891099559376], [41.889980910007829, 31.190008653278362], [40.399994337736238, 31.889991766887931], [39.195468377444961, 32.16100881604266], [38.792340529136077, 33.378686428352218], [41.00615888851992, 34.419372260062111], [41.383965285005807, 35.628316555314349], [41.289707472505448, 36.358814602192261], [41.837064243340954, 36.605853786763568], [42.349591098811764, 37.22987254490409], [42.779125604021822, 37.385263576805741], [43.942258742047287, 37.256227525372942], [44.293451775902852, 37.001514390606289], [44.772699008977689, 37.170444647768427], [45.420618117053202, 35.977545884742817]]] } },
-            { "type": "Feature", "properties": { "admin": "Iceland", "name": "Iceland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-14.508695441129232, 66.455892239031414], [-14.739637417041605, 65.808748277440287], [-13.609732224979807, 65.126671047619851], [-14.9098337467949, 64.36408193628867], [-17.794438035543418, 63.67874909123384], [-18.656245896874989, 63.496382961675806], [-19.972754685942757, 63.643634955491514], [-22.762971971110154, 63.960178941495371], [-21.778484259517676, 64.402115790455497], [-23.955043911219104, 64.891129869233481], [-22.184402635170354, 65.084968166760291], [-22.227423265053329, 65.378593655042721], [-24.326184047939332, 65.611189276788451], [-23.650514695723082, 66.262519029395207], [-22.134922451250883, 66.410468655046856], [-20.576283738679543, 65.732112128351417], [-19.056841600001587, 66.276600857194751], [-17.798623826559048, 65.993853257909763], [-16.167818976292121, 66.526792304135853], [-14.508695441129232, 66.455892239031414]]] } },
-            { "type": "Feature", "properties": { "admin": "Israel", "name": "Israel", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.719918247222743, 32.709192409794859], [35.545665317534535, 32.393992011030569], [35.183930291491428, 32.532510687788935], [34.974640740709319, 31.866582343059715], [35.225891554512422, 31.754341132121759], [34.970506626125989, 31.616778469360803], [34.927408481594554, 31.35343537040141], [35.397560662586038, 31.489086005167572], [35.420918409981958, 31.100065822874349], [34.922602573391423, 29.501326198844517], [34.26543338393568, 31.219360866820146], [34.556371697738903, 31.548823960896989], [34.48810713068135, 31.605538845337314], [34.752587111151165, 32.07292633720116], [34.955417107896771, 32.827376410446369], [35.098457472480668, 33.080539252244257], [35.126052687324538, 33.090900376918775], [35.460709262846699, 33.089040025356276], [35.552796665190805, 33.264274807258012], [35.821100701650231, 33.277426459276292], [35.836396925608618, 32.868123277308506], [35.700797967274745, 32.716013698857374], [35.719918247222743, 32.709192409794859]]] } },
-            { "type": "Feature", "properties": { "admin": "Italy", "name": "Italy", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[15.52037601081383, 38.231155096991465], [15.160242954171732, 37.444045518537813], [15.309897902089002, 37.134219468731793], [15.099988234119445, 36.61998729099539], [14.335228712632013, 36.996630967754747], [13.826732618879927, 37.104531358380186], [12.431003859108809, 37.612949937483812], [12.570943637755132, 38.126381130519682], [13.741156447004581, 38.03496552179535], [14.761249220446157, 38.143873602850498], [15.52037601081383, 38.231155096991465]]], [[[9.210011834356264, 41.209991360024212], [9.809975213264973, 40.500008856766094], [9.669518670295671, 39.177376410471787], [9.214817742559486, 39.240473334300127], [8.806935662479729, 38.906617743478471], [8.428302443077113, 39.171847032216611], [8.388253208050939, 40.378310858718798], [8.159998406617659, 40.950007229163774], [8.709990675500107, 40.899984442705225], [9.210011834356264, 41.209991360024212]]], [[[12.376485223040842, 46.767559109069872], [13.806475457421552, 46.50930613869118], [13.698109978905475, 46.016778062517368], [13.937630242578335, 45.59101593686465], [13.141606479554294, 45.736691799495411], [12.328581170306304, 45.38177806251484], [12.383874952858601, 44.885374253919075], [12.261453484759157, 44.600482082694008], [12.589237094786482, 44.091365871754462], [13.526905958722491, 43.587727362637899], [14.029820997787024, 42.761007798832473], [15.142569614327952, 41.955139675456891], [15.926191033601892, 41.961315009115729], [16.169897088290409, 41.740294908203417], [15.889345737377793, 41.541082261718195], [16.785001661860573, 41.179605617836579], [17.519168735431204, 40.877143459632229], [18.376687452882575, 40.355624904942651], [18.4802470231954, 40.168866278639818], [18.293385044028096, 39.810774441073235], [17.738380161213279, 40.277671006830289], [16.869595981522334, 40.442234605463838], [16.448743116937319, 39.795400702466473], [17.171489698971495, 39.424699815420716], [17.052840610429339, 38.902871202137291], [16.635088331781841, 38.843572496082395], [16.100960727613053, 37.985898749334176], [15.684086948314498, 37.908849188787023], [15.687962680736318, 38.214592800441849], [15.891981235424705, 38.750942491199218], [16.109332309644312, 38.964547024077682], [15.718813510814638, 39.544072374014938], [15.413612501698818, 40.048356838535163], [14.998495721098234, 40.172948716790913], [14.703268263414767, 40.604550279292617], [14.06067182786526, 40.786347968095434], [13.627985060285393, 41.188287258461649], [12.888081902730418, 41.253089504555604], [12.106682570044907, 41.7045348170574], [11.191906365614184, 42.355425319989671], [10.511947869517794, 42.93146251074721], [10.200028924204046, 43.920006822274608], [9.702488234097812, 44.036278794931313], [8.888946160526869, 44.366336167979533], [8.428560825238575, 44.23122813575241], [7.8507666357832, 43.767147935555236], [7.435184767291841, 43.693844916349164], [7.549596388386161, 44.127901109384808], [7.007562290076661, 44.254766750661382], [6.749955275101711, 45.028517971367584], [7.096652459347835, 45.333098863295859], [6.80235517744566, 45.708579820328673], [6.84359297041456, 45.991146552100659], [7.273850945676683, 45.776947740250748], [7.755992058959832, 45.824490057959267], [8.316629672894377, 46.16364248309084], [8.489952426801294, 46.005150865251736], [8.966305779667833, 46.03693187111115], [9.18288170740311, 46.440214748716976], [9.92283654139035, 46.314899400409182], [10.363378126678665, 46.48357127540983], [10.4427014502466, 46.893546250997431], [11.048555942436504, 46.751358547546396], [11.164827915093325, 46.941579494812729], [12.153088006243079, 47.115393174826423], [12.376485223040842, 46.767559109069872]]]] } },
-            { "type": "Feature", "properties": { "admin": "Jamaica", "name": "Jamaica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.569600796199197, 18.490525417550483], [-76.896618618462114, 18.400866807524078], [-76.365359056285527, 18.16070058844759], [-76.19965857614163, 17.886867173732963], [-76.902561408175671, 17.868237819891743], [-77.206341315403449, 17.701116237859818], [-77.766022915340599, 17.861597398342237], [-78.337719285785596, 18.225967922432226], [-78.217726610003865, 18.454532782459193], [-77.797364671525614, 18.524218451404774], [-77.569600796199197, 18.490525417550483]]] } },
-            { "type": "Feature", "properties": { "admin": "Jordan", "name": "Jordan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.719918247222743, 32.709192409794859], [36.834062127435537, 32.312937526980768], [38.792340529136077, 33.378686428352218], [39.195468377444961, 32.16100881604266], [39.004885695152545, 32.010216986614971], [37.002165561681004, 31.508412990844736], [37.998848911294367, 30.508499864213128], [37.668119744626374, 30.338665269485894], [37.503581984209028, 30.003776150018396], [36.740527784987243, 29.865283311476183], [36.501214227043583, 29.505253607698702], [36.068940870922049, 29.19749461518445], [34.956037225084252, 29.356554673778835], [34.922602573391423, 29.501326198844517], [35.420918409981958, 31.100065822874349], [35.397560662586038, 31.489086005167572], [35.545251906076196, 31.782504787720832], [35.545665317534535, 32.393992011030569]]] } },
-            { "type": "Feature", "properties": { "admin": "Japan", "name": "Japan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[134.638428176003856, 34.149233710256418], [134.766379022358478, 33.806334743783673], [134.20341596897083, 33.201177883429622], [133.792950067276479, 33.521985175097583], [133.280268182508848, 33.289570420864941], [133.014858026257855, 32.704567369104772], [132.363114862192674, 32.989382025681373], [132.371176385630179, 33.463642483040068], [132.924372593314786, 34.060298570282036], [133.492968377822194, 33.944620876596694], [133.904106073136347, 34.364931138642611], [134.638428176003856, 34.149233710256418]]], [[[140.976387567305267, 37.142074286440156], [140.599769728762084, 36.343983466124534], [140.774074334882641, 35.842877102190229], [140.253279250245072, 35.138113918593653], [138.975527785396196, 34.667600002576101], [137.217598911691198, 34.606285915661843], [135.792983026268871, 33.46480520276662], [135.120982700745401, 33.849071153289053], [135.07943484918269, 34.596544908174813], [133.340316196831964, 34.375938218720755], [132.156770868051296, 33.904933376596503], [130.986144647343451, 33.885761420216276], [132.000036248910021, 33.149992377244608], [131.33279015515734, 31.450354519164836], [130.68631798718593, 31.029579169228235], [130.202419875204953, 31.418237616495411], [130.447676222862128, 32.319474595665717], [129.81469160371887, 32.610309556604385], [129.408463169472554, 33.296055813117583], [130.353935174684636, 33.604150702441693], [130.878450962447118, 34.232742824840031], [131.884229364143891, 34.749713853487911], [132.617672967662486, 35.433393052709413], [134.608300815977771, 35.731617743465812], [135.677537876528902, 35.527134100886819], [136.723830601142424, 37.304984239240376], [137.390611607004473, 36.827390651998819], [138.857602166906247, 37.827484646143454], [139.426404657142882, 38.215962225897634], [140.054790073812057, 39.438807481436378], [139.883379347899847, 40.563312486323682], [140.305782505453664, 41.195005194659551], [141.368973423426667, 41.378559882160282], [141.914263136970476, 39.991616115878678], [141.884600864834965, 39.18086456965149], [140.959489373945729, 38.174000962876583], [140.976387567305267, 37.142074286440156]]], [[[143.910161981379474, 44.174099839853724], [144.613426548439634, 43.960882880217511], [145.320825230083074, 44.384732977875437], [145.543137241802754, 43.262088324550596], [144.059661899999867, 42.988358262700551], [143.183849725517291, 41.995214748699183], [141.611490920172457, 42.678790595056071], [141.067286411706618, 41.58459381770799], [139.95510623592105, 41.56955597591103], [139.817543573159924, 42.563758856774392], [140.312087030193169, 43.333272610032644], [141.380548944259999, 43.388824774746489], [141.671952345953912, 44.772125352551477], [141.967644891527982, 45.551483466161343], [143.142870314709796, 44.510358384776957], [143.910161981379474, 44.174099839853724]]]] } },
-            { "type": "Feature", "properties": { "admin": "Kazakhstan", "name": "Kazakhstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.962314894499272, 42.26615428320553], [70.388964878220776, 42.081307684897517], [69.070027296835221, 41.384244289712335], [68.632482944620037, 40.668680731766855], [68.259895867795635, 40.662324530594894], [67.985855747351806, 41.135990708982199], [66.714047072216587, 41.168443508461557], [66.510648634715707, 41.987644151368549], [66.023391554635609, 41.994646307944031], [66.098012322865188, 42.997660020513074], [64.90082441595932, 43.728080552742647], [63.18578698105658, 43.650074978197999], [62.013300408786264, 43.504476630215649], [61.05831994003249, 44.405816962250576], [60.239971958258472, 44.784036770194739], [58.689989048095796, 45.500013739598721], [58.503127068928428, 45.58680430763296], [55.928917270741167, 44.995858466159163], [55.968191359283011, 41.30864166926937], [55.455251092353805, 41.259859117185826], [54.755345493392653, 42.04397146256661], [54.079417759014959, 42.324109402020831], [52.944293247291725, 42.116034247397572], [52.502459751196277, 41.783315538086462], [52.446339145727208, 42.027150783855561], [52.692112257707251, 42.443895372073364], [52.501426222550315, 42.792297878585188], [51.342427199108201, 43.132974758469338], [50.891291945200223, 44.031033637053774], [50.339129266161358, 44.284015611338468], [50.305642938036257, 44.609835516938908], [51.278503452363211, 44.514854234386448], [51.316899041556034, 45.245998236667894], [52.167389764215713, 45.408391425145098], [53.040876499245194, 45.259046535821753], [53.220865512917712, 46.23464590105992], [53.042736850807771, 46.853006089864486], [52.042022739475598, 46.804636949239232], [51.191945428274252, 47.048704738953909], [50.034083286342465, 46.608989976582208], [49.10116, 46.39933000000012], [48.593241001180495, 46.561034247415471], [48.694733514201729, 47.075628160177921], [48.057253045449258, 47.743752753279516], [47.315231154170242, 47.715847479841948], [46.466445753776256, 48.394152330104923], [47.043671502476506, 49.1520388860976], [46.751596307162728, 49.35600576435376], [47.549480421749301, 50.454698391311119], [48.577841424357523, 49.874759629915658], [48.702381626181008, 50.605128485712825], [50.766648390512145, 51.692762356159889], [52.328723585830957, 51.71865224873811], [54.53287845237621, 51.026239732459302], [55.716940545479801, 50.62171662047853], [56.777961053296551, 51.043551337277037], [58.363290643146733, 51.063653469438563], [59.642282342370599, 50.545442206415707], [59.932807244715484, 50.842194118851857], [61.337424350840919, 50.799070136104248], [61.588003371024158, 51.2726587998432], [59.967533807215531, 51.960420437215696], [60.927268507740258, 52.447548326215028], [60.739993117114572, 52.719986477257734], [61.699986199800584, 52.979996446334255], [60.978066440683151, 53.664993394579128], [61.436591424409052, 54.006264553434775], [65.178533563095911, 54.354227810272093], [65.66687584825398, 54.601266994843449], [68.169100376258811, 54.970391750704309], [69.068166945272864, 55.385250149143516], [70.865266554655122, 55.169733588270091], [71.180131056609397, 54.133285224008247], [72.224150018202167, 54.376655381886728], [73.508516066384388, 54.035616766976588], [73.425678745420427, 53.489810289109741], [74.384845005190044, 53.546861070360066], [76.891100294913414, 54.490524400441913], [76.525179477854735, 54.177003485727127], [77.800915561844221, 53.404414984747561], [80.035559523441663, 50.864750881547238], [80.568446893235475, 51.388336493528456], [81.945985548839914, 50.812195949906354], [83.383003778012366, 51.069182847693909], [83.935114780618832, 50.889245510453563], [84.416377394553052, 50.311399644565817], [85.115559523462011, 50.117302964877631], [85.541269972682457, 49.69285858824815], [86.829356723989619, 49.826674709668154], [87.359970330762664, 49.214980780629148], [86.598776483103379, 48.549181626980605], [85.768232863308285, 48.455750637396974], [85.72048383987071, 47.452969468773112], [85.164290399113355, 47.000955715516099], [83.180483839860443, 47.330031236350848], [82.458925815769106, 45.539649563166499], [81.947070753918112, 45.317027492853235], [79.966106398441397, 44.917516994804643], [80.866206496101356, 43.180362046881037], [80.180150180994289, 42.920067857426936], [80.259990268885332, 42.349999294599101], [79.643645460940135, 42.496682847659649], [79.142177361979776, 42.856092434249589], [77.658391961583206, 42.960685533208327], [76.000353631498555, 42.988022365890622], [75.636964959622091, 42.877899888676765], [74.212865838522575, 43.298339341803505], [73.645303582660901, 43.091271877609863], [73.489757521462337, 42.500894476891276], [71.844638299450637, 42.845395412765178], [71.186280552052253, 42.704292914392219], [70.962314894499272, 42.26615428320553]]] } },
-            { "type": "Feature", "properties": { "admin": "Kenya", "name": "Kenya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[40.993, -0.85829], [41.58513, -1.68325], [40.88477, -2.08255], [40.63785, -2.49979], [40.26304, -2.57309], [40.12119, -3.27768], [39.80006, -3.68116], [39.60489, -4.34653], [39.20222, -4.67677], [37.7669, -3.67712], [37.69869, -3.09699], [34.07262, -1.05982], [33.903711197104521, -0.95], [33.893568969666937, 0.109813537861896], [34.18, 0.515], [34.6721, 1.17694], [35.03599, 1.90584], [34.59607, 3.05374], [34.47913, 3.5556], [34.005, 4.249884947362047], [34.620196267853871, 4.847122742081987], [35.298007118232974, 5.506], [35.817447662353501, 5.338232082790795], [35.817447662353501, 4.776965663461889], [36.159078632855639, 4.447864127672768], [36.855093238008116, 4.447864127672768], [38.120915, 3.598605], [38.43697, 3.58851], [38.67114, 3.61607], [38.89251, 3.50074], [39.559384258765846, 3.42206], [39.85494, 3.83879], [40.76848, 4.25702], [41.1718, 3.91909], [41.855083092643966, 3.918911920483726], [40.98105, 2.78452], [40.993, -0.85829]]] } },
-            { "type": "Feature", "properties": { "admin": "Kyrgyzstan", "name": "Kyrgyzstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.96231489449913, 42.266154283205481], [71.186280552052111, 42.704292914392127], [71.84463829945058, 42.845395412765093], [73.489757521462337, 42.500894476891311], [73.645303582660901, 43.09127187760982], [74.212865838522546, 43.298339341803363], [75.636964959622006, 42.877899888676673], [76.000353631498442, 42.988022365890664], [77.658391961583206, 42.960685533208256], [79.142177361979762, 42.856092434249511], [79.643645460940107, 42.496682847659514], [80.259990268885289, 42.349999294599044], [80.119430373051358, 42.123940741538235], [78.543660923175295, 41.582242540038685], [78.187196893225959, 41.185315863604792], [76.904484490877067, 41.066485907549634], [76.526368035797432, 40.427946071935111], [75.467827996730691, 40.562072251948663], [74.776862420556043, 40.366425279291619], [73.822243686828287, 39.893973497063179], [73.960013055318413, 39.660008449861721], [73.67537926625478, 39.431236884105594], [71.784693637991992, 39.279463202464363], [70.549161818325601, 39.604197902986492], [69.464886915977516, 39.526683254548693], [69.559609816368507, 40.103211371412968], [70.648018833299957, 39.935753892571157], [71.014198032520156, 40.244365546218226], [71.774875115856545, 40.145844428053763], [73.055417108049156, 40.86603302668945], [71.870114780570447, 41.392900092121259], [71.157858514291576, 41.143587144529107], [70.420022414028196, 41.519998277343134], [71.259247674448218, 42.167710679689456], [70.96231489449913, 42.266154283205481]]] } },
-            { "type": "Feature", "properties": { "admin": "Cambodia", "name": "Cambodia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[103.497279901139677, 10.632555446815926], [103.090689731867229, 11.153660590047162], [102.58493248902667, 12.186594956913279], [102.348099399833004, 13.39424734135822], [102.988422072361601, 14.225721136934464], [104.281418084736586, 14.416743068901363], [105.218776890078871, 14.27321177821069], [106.04394616091551, 13.881091009979952], [106.496373325630856, 14.57058380783428], [107.382727492301058, 14.202440904186968], [107.614547967562402, 13.535530707244202], [107.491403029410861, 12.337205918827944], [105.810523716253101, 11.567614650921225], [106.249670037869436, 10.961811835163585], [105.199914992292321, 10.889309800658094], [104.334334751403446, 10.486543687375228], [103.497279901139677, 10.632555446815926]]] } },
-            { "type": "Feature", "properties": { "admin": "South Korea", "name": "Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[128.349716424676586, 38.612242946927843], [129.212919549680038, 37.432392483055942], [129.460449660358137, 36.784189154602821], [129.468304478066472, 35.632140611303939], [129.091376580929563, 35.08248423923142], [128.18585045787907, 34.890377102186385], [127.386519403188373, 34.475673733044111], [126.485747511908713, 34.390045884736473], [126.3739197124291, 34.934560451795939], [126.559231398627773, 35.684540513647896], [126.117397902532261, 36.725484727519252], [126.860143263863364, 36.893924058574612], [126.174758742376213, 37.749685777328033], [126.237338901881742, 37.840377916000271], [126.683719924018888, 37.804772854151174], [127.073308547067342, 38.256114813788393], [127.780035435090966, 38.304535630845884], [128.205745884311426, 38.370397243801882], [128.349716424676586, 38.612242946927843]]] } },
-            { "type": "Feature", "properties": { "admin": "Kosovo", "name": "Kosovo", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.76216, 42.05186], [20.717310000000108, 41.84711], [20.59023, 41.85541], [20.52295, 42.21787], [20.28374, 42.32025], [20.0707, 42.58863], [20.25758, 42.81275], [20.49679, 42.88469], [20.63508, 43.21671], [20.81448, 43.27205], [20.95651, 43.13094], [21.143395, 43.068685000000123], [21.27421, 42.90959], [21.43866, 42.86255], [21.63302, 42.67717], [21.77505, 42.6827], [21.66292, 42.43922], [21.54332, 42.32025], [21.576635989402117, 42.245224397061847], [21.352700000000134, 42.2068], [20.76216, 42.05186]]] } },
-            { "type": "Feature", "properties": { "admin": "Kuwait", "name": "Kuwait", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[47.974519077349889, 29.975819200148493], [48.183188510944483, 29.534476630159759], [48.09394331237641, 29.306299343374999], [48.416094191283939, 28.552004299426663], [47.708850538937376, 28.526062730416136], [47.459821811722819, 29.002519436147217], [46.568713413281742, 29.099025173452283], [47.302622104690947, 30.059069932570711], [47.974519077349889, 29.975819200148493]]] } },
-            { "type": "Feature", "properties": { "admin": "Laos", "name": "Lao PDR", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[105.218776890078871, 14.27321177821069], [105.544338413517664, 14.723933620660414], [105.589038527450128, 15.570316066952856], [104.779320509868768, 16.441864935771445], [104.716947056092465, 17.428858954330078], [103.956476678485288, 18.240954087796872], [103.200192091893726, 18.309632066312769], [102.998705682387694, 17.961694647691598], [102.413004998791592, 17.932781683824281], [102.113591750092453, 18.109101670804161], [101.059547560635139, 17.512497259994486], [101.035931431077742, 18.408928330961611], [101.282014601651667, 19.462584947176762], [100.606293573003128, 19.508344427971217], [100.548881056726856, 20.109237982661124], [100.115987583417819, 20.41784963630818], [100.329101190189519, 20.786121731036229], [101.180005324307515, 21.436572984294024], [101.270025669359939, 21.201651923095177], [101.803119744882906, 21.174366766845065], [101.652017856861491, 22.318198757409544], [102.170435825613552, 22.464753119389297], [102.754896274834636, 21.675137233969462], [103.203861118586431, 20.766562201413745], [104.435000441508024, 20.758733221921528], [104.822573683697073, 19.886641750563879], [104.183387892678908, 19.624668077060214], [103.896532017026701, 19.265180975821799], [105.094598423281496, 18.666974595611073], [105.925762160264, 17.485315456608955], [106.55600792849566, 16.604283962464802], [107.312705926545576, 15.908538316303177], [107.564525181103875, 15.202173163305554], [107.382727492301058, 14.202440904186968], [106.496373325630856, 14.57058380783428], [106.04394616091551, 13.881091009979952], [105.218776890078871, 14.27321177821069]]] } },
-            { "type": "Feature", "properties": { "admin": "Lebanon", "name": "Lebanon", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.821100701650231, 33.277426459276292], [35.552796665190805, 33.264274807258012], [35.460709262846699, 33.089040025356276], [35.126052687324538, 33.090900376918775], [35.48220665868012, 33.905450140919434], [35.979592319489392, 34.610058295219126], [35.998402540843628, 34.644914048799997], [36.448194207512095, 34.59393524834406], [36.611750115715886, 34.201788641897174], [36.066460402172048, 33.824912421192543], [35.821100701650231, 33.277426459276292]]] } },
-            { "type": "Feature", "properties": { "admin": "Liberia", "name": "Liberia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-7.712159389669749, 4.364565944837721], [-7.974107224957249, 4.355755113131961], [-9.004793667018673, 4.832418524592199], [-9.913420376006682, 5.593560695819205], [-10.765383876986643, 6.140710760925556], [-11.438779466182053, 6.785916856305746], [-11.199801805048278, 7.105845648624735], [-11.14670427086838, 7.396706447779534], [-10.695594855176477, 7.939464016141085], [-10.230093553091276, 8.406205552601291], [-10.016566534861253, 8.42850393313523], [-9.755342169625832, 8.541055202666923], [-9.33727983238458, 7.928534450711351], [-9.403348151069748, 7.526905218938906], [-9.208786383490844, 7.313920803247952], [-8.926064622422002, 7.309037380396375], [-8.722123582382123, 7.711674302598509], [-8.439298468448696, 7.686042792181736], [-8.485445522485348, 7.395207831243068], [-8.385451626000572, 6.911800645368742], [-8.602880214868618, 6.467564195171659], [-8.311347622094017, 6.193033148621081], [-7.993692592795879, 6.126189683451541], [-7.570152553731686, 5.707352199725903], [-7.53971513511176, 5.313345241716517], [-7.63536821128403, 5.188159084489455], [-7.712159389669749, 4.364565944837721]]] } },
-            { "type": "Feature", "properties": { "admin": "Libya", "name": "Libya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.8513, 22.862950000000119], [14.143870883855239, 22.491288967371126], [13.581424594790459, 23.040506089769274], [11.999505649471697, 23.471668402596432], [11.560669386449032, 24.09790924732561], [10.771363559622952, 24.562532050061741], [10.303846876678445, 24.379313259370967], [9.948261346078024, 24.936953640232613], [9.910692579801774, 25.365454616796789], [9.319410841518218, 26.094324856057476], [9.716285841519662, 26.512206325785652], [9.629056023811073, 27.140953477481041], [9.756128370816779, 27.688258571884198], [9.68388471847288, 28.144173895779311], [9.859997999723472, 28.959989732371064], [9.805634392952353, 29.424638373323369], [9.482139926805415, 30.307556057246181], [9.970017124072966, 30.539324856075375], [10.056575148161697, 30.961831366493517], [9.950225050505194, 31.376069647745275], [10.636901482799484, 31.761420803345679], [10.944789666394511, 32.081814683555358], [11.43225345220378, 32.368903103152824], [11.488787469131008, 33.136995754523234], [12.66331, 32.79278], [13.08326, 32.87882], [13.91868, 32.71196], [15.24563, 32.26508], [15.71394, 31.37626], [16.61162, 31.18218], [18.02109, 30.76357], [19.08641, 30.26639], [19.57404, 30.52582], [20.05335, 30.98576], [19.82033, 31.751790000000135], [20.13397, 32.2382], [20.85452, 32.7068], [21.54298, 32.8432], [22.89576, 32.63858], [23.2368, 32.19149], [23.6091300000001, 32.18726], [23.9275, 32.01667], [24.92114, 31.89936], [25.16482, 31.56915], [24.80287, 31.08929], [24.95762, 30.6616], [24.70007, 30.04419], [25.00000000000011, 29.238654529533552], [25.00000000000011, 25.682499996360995], [25.00000000000011, 22.0], [25.00000000000011, 20.00304], [23.850000000000129, 20.0], [23.837660000000135, 19.580470000000101], [19.84926, 21.49509], [15.86085, 23.40972], [14.8513, 22.862950000000119]]] } },
-            { "type": "Feature", "properties": { "admin": "Sri Lanka", "name": "Sri Lanka", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[81.787959018891371, 7.523055324733162], [81.637322218760573, 6.481775214051921], [81.218019647144317, 6.197141424988287], [80.348356968104397, 5.968369859232154], [79.872468703128519, 6.763463446474928], [79.6951668639351, 8.200843410673384], [80.147800734379629, 9.824077663609554], [80.838817986986541, 9.268426825391186], [81.304319289071756, 8.564206244333688], [81.787959018891371, 7.523055324733162]]] } },
-            { "type": "Feature", "properties": { "admin": "Lesotho", "name": "Lesotho", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[28.978262566857236, -28.955596612261708], [29.325166456832587, -29.257386976846245], [29.018415154748016, -29.743765557577362], [28.848399692507734, -30.070050551068245], [28.291069370239903, -30.226216729454293], [28.107204624145421, -30.545732110314944], [27.749397006956478, -30.645105889612214], [26.999261915807629, -29.875953871379977], [27.532511020627471, -29.242710870075353], [28.07433841320778, -28.851468601193581], [28.541700066855491, -28.647501722937562], [28.978262566857236, -28.955596612261708]]] } },
-            { "type": "Feature", "properties": { "admin": "Lithuania", "name": "Lithuania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.731098667092649, 54.327536932993311], [22.651051873472536, 54.582740993866729], [22.757763706155256, 54.856574408581366], [22.31572350433057, 55.01529857036585], [21.26844892750346, 55.190481675835301], [21.05580040862241, 56.031076361711051], [22.201156853939491, 56.337801825579483], [23.878263787539957, 56.273671373105259], [24.860684441840753, 56.372528388079616], [25.000934279080887, 56.164530748104831], [25.533046502390327, 56.100296942766029], [26.494331495883749, 55.61510691997762], [26.588279249790386, 55.167175604871659], [25.768432651479792, 54.846962592175082], [25.536353794056989, 54.282423407602515], [24.45068362803703, 53.905702216194747], [23.484127638449841, 53.912497667041123], [23.243987257589506, 54.220566718149129], [22.731098667092649, 54.327536932993311]]] } },
-            { "type": "Feature", "properties": { "admin": "Luxembourg", "name": "Luxembourg", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.043073357781109, 50.128051662794221], [6.242751092156992, 49.90222565367872], [6.186320428094176, 49.4638028021145], [5.897759230176403, 49.442667141307012], [5.674051954784828, 49.52948354755749], [5.782417433300905, 50.090327867221205], [6.043073357781109, 50.128051662794221]]] } },
-            { "type": "Feature", "properties": { "admin": "Latvia", "name": "Latvia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[21.05580040862241, 56.031076361711051], [21.090423618257965, 56.783872789122924], [21.581866489353668, 57.411870632549913], [22.524341261492872, 57.753374335350756], [23.31845299652209, 57.006236477274854], [24.120729607853423, 57.025692654032753], [24.312862583114615, 57.793423570376966], [25.164593540149262, 57.970156968815175], [25.602809685984365, 57.847528794986559], [26.46353234223778, 57.476388658266316], [27.288184848751509, 57.474528306703817], [27.770015903440925, 57.244258124411218], [27.855282016722519, 56.759326483784278], [28.17670942557799, 56.169129950578807], [27.102459751094525, 55.783313707087672], [26.494331495883749, 55.61510691997762], [25.533046502390327, 56.100296942766029], [25.000934279080887, 56.164530748104831], [24.860684441840753, 56.372528388079616], [23.878263787539957, 56.273671373105259], [22.201156853939491, 56.337801825579483], [21.05580040862241, 56.031076361711051]]] } },
-            { "type": "Feature", "properties": { "admin": "Morocco", "name": "Morocco", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-5.193863491222031, 35.755182196590845], [-4.591006232105143, 35.330711981745644], [-3.640056525070007, 35.39985504815197], [-2.604305792644111, 35.17909332940112], [-2.169913702798624, 35.168396307916694], [-1.792985805661658, 34.527918606091298], [-1.73345455566141, 33.919712836232115], [-1.388049282222596, 32.864015000941372], [-1.124551153966195, 32.651521511357195], [-1.30789913573787, 32.262888902306024], [-2.616604783529567, 32.094346218386157], [-3.068980271812648, 31.724497992473285], [-3.647497931320145, 31.637294012980814], [-3.690441046554666, 30.896951605751152], [-4.859646165374442, 30.501187649043874], [-5.242129278982786, 30.00044302013557], [-6.060632290053745, 29.731699734001801], [-7.059227667661899, 29.57922842052465], [-8.67411617678283, 28.841288967396643], [-8.665589565454836, 27.656425889592462], [-8.817809007940523, 27.656425889592462], [-8.817828334986642, 27.656425889592462], [-8.794883999049032, 27.120696316022553], [-9.413037482124507, 27.088476060488539], [-9.735343390328749, 26.860944729107409], [-10.189424200877452, 26.860944729107409], [-10.551262579785258, 26.990807603456879], [-11.392554897496948, 26.883423977154386], [-11.718219773800339, 26.104091701760801], [-12.030758836301654, 26.030866197203121], [-12.500962693725368, 24.770116278578136], [-13.891110398809044, 23.691009019459383], [-14.22116777185715, 22.310163072188338], [-14.630832688850942, 21.860939846274867], [-14.750954555713404, 21.500600083903802], [-17.002961798561071, 21.42073415779668], [-17.020428432675768, 21.422310288981631], [-16.973247849993182, 21.88574453377495], [-16.589136928767626, 22.158234361250091], [-16.26192175949566, 22.679339504481273], [-16.326413946995896, 23.017768459560894], [-15.982610642958059, 23.723358466074096], [-15.426003790742183, 24.359133612561035], [-15.089331834360729, 24.520260728446964], [-14.824645148161689, 25.103532619725307], [-14.800925665739666, 25.636264960222285], [-14.439939947964827, 26.254418443297645], [-13.773804897506462, 26.618892320252279], [-13.13994177901429, 27.640147813420491], [-13.121613369914709, 27.654147671719805], [-12.61883663578311, 28.038185533148656], [-11.688919236690761, 28.148643907172577], [-10.9009569971044, 28.832142238880913], [-10.39959225100864, 29.09858592377778], [-9.564811163765624, 29.933573716749855], [-9.814718390329174, 31.177735500609053], [-9.434793260119362, 32.038096421836478], [-9.300692918321827, 32.564679266890629], [-8.657476365585039, 33.24024526624239], [-7.654178432638217, 33.697064927702506], [-6.912544114601358, 34.11047638603744], [-6.24434200685141, 35.145865383437517], [-5.929994269219832, 35.759988104793983], [-5.193863491222031, 35.755182196590845]]] } },
-            { "type": "Feature", "properties": { "admin": "Moldova", "name": "Moldova", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[26.619336785597788, 48.220726223333457], [26.857823520624798, 48.368210761094488], [27.52253746919515, 48.467119452501102], [28.259546746541837, 48.155562242213406], [28.670891147585163, 48.118148505234089], [29.122698195113024, 47.849095160506458], [29.050867954227321, 47.510226955752493], [29.415135125452732, 47.346645209332571], [29.559674106573105, 46.928582872091312], [29.908851759569295, 46.67436066343145], [29.838210076626289, 46.525325832701675], [30.024658644335364, 46.423936672545032], [29.759971958136383, 46.349987697935354], [29.170653924279879, 46.379262396828693], [29.072106967899288, 46.517677720722482], [28.862972446414055, 46.437889309263824], [28.933717482221621, 46.258830471372491], [28.659987420371575, 45.939986884131628], [28.48526940279276, 45.596907050145887], [28.233553501099035, 45.488283189468369], [28.054442986775392, 45.944586086605618], [28.160017937947707, 46.371562608417207], [28.128030226359037, 46.81047638608824], [27.551166212684841, 47.405117092470817], [27.233872918412736, 47.826770941756365], [26.924176059687561, 48.123264472030982], [26.619336785597788, 48.220726223333457]]] } },
-            { "type": "Feature", "properties": { "admin": "Madagascar", "name": "Madagascar", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.543518914595737, -12.469832858940553], [49.80898074727908, -12.895284925999551], [50.05651085795715, -13.555761407121981], [50.217431268114055, -14.758788750876795], [50.476536899625515, -15.226512139550541], [50.377111443895942, -15.706069431219122], [50.200274692593169, -16.000263360256763], [49.860605503138665, -15.414252618066913], [49.672606642460849, -15.710203545802477], [49.863344354050142, -16.451036879138773], [49.774564243372694, -16.875042006093597], [49.49861209493411, -17.10603565843827], [49.435618523970298, -17.953064060134363], [49.04179243347393, -19.118781019774442], [48.548540887247995, -20.496888116134119], [47.930749139198653, -22.391501153251077], [47.547723423051295, -23.781958916928513], [47.095761346226588, -24.941629733990446], [46.282477654817079, -25.178462823184102], [45.409507684110444, -25.601434421493082], [44.833573846217547, -25.346101169538933], [44.039720493349755, -24.9883452287823], [43.763768344911156, -24.460677178649988], [43.697777540874441, -23.574116306250595], [43.345654331237611, -22.77690398528387], [43.254187046080986, -22.057413018484116], [43.433297560404633, -21.336475111580185], [43.893682895692919, -21.163307386970121], [43.89637007017209, -20.830459486578167], [44.374325392439644, -20.072366224856385], [44.464397413924374, -19.435454196859045], [44.23242190936616, -18.961994724200899], [44.042976108584149, -18.331387220943167], [43.963084344260899, -17.409944756746778], [44.312468702986273, -16.850495700754951], [44.446517368351387, -16.216219170804504], [44.944936557806521, -16.179373874580396], [45.502731967964976, -15.974373467678538], [45.872993605336255, -15.793454278224681], [46.312243279817203, -15.780018405828795], [46.882182651564271, -15.210182386946309], [47.70512983581235, -14.594302666891762], [48.005214878131241, -14.091232598530372], [47.869047479042152, -13.663868503476582], [48.29382775248137, -13.784067884987483], [48.845060255738773, -13.08917489995866], [48.863508742066976, -12.487867933810417], [49.194651320193302, -12.040556735891967], [49.543518914595737, -12.469832858940553]]] } },
-            { "type": "Feature", "properties": { "admin": "Mexico", "name": "Mexico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-97.140008307670684, 25.869997463478395], [-97.528072475966539, 24.992144069920297], [-97.702945522842214, 24.272343044526728], [-97.776041836319024, 22.932579860927653], [-97.872366706111094, 22.444211737553356], [-97.699043952204164, 21.898689480064256], [-97.388959520236739, 21.411018988525818], [-97.189333462293277, 20.635433254473124], [-96.525575527720306, 19.890930894444061], [-96.292127244841737, 19.32037140550954], [-95.90088497595994, 18.828024196848727], [-94.8390634834427, 18.562717393462204], [-94.425729539756205, 18.144370835843343], [-93.548651292682365, 18.423836981677933], [-92.786113857783477, 18.524838568592255], [-92.037348192090391, 18.704569200103432], [-91.407903408559235, 18.876083278880227], [-90.771869879910852, 19.284120388256778], [-90.533589850613026, 19.867418117751292], [-90.451475999701231, 20.707521877520428], [-90.278618333684889, 20.999855454995547], [-89.601321173851474, 21.261725775634485], [-88.543866339862845, 21.493675441976613], [-87.658416510757704, 21.458845526611977], [-87.051890224948053, 21.543543199138295], [-86.811982388032931, 21.331514797444747], [-86.845907965832595, 20.849864610268348], [-87.383291185235848, 20.255404771398727], [-87.621054450210721, 19.646553046135917], [-87.436750454441764, 19.472403469312265], [-87.586560431655911, 19.040130113190738], [-87.837191128271485, 18.259815985583426], [-88.090664028663156, 18.516647854074048], [-88.300031094093626, 18.499982204659997], [-88.490122850279278, 18.486830552641717], [-88.84834387892657, 17.883198147040329], [-89.029857347351737, 18.001511338772556], [-89.150909389995462, 17.955467637600403], [-89.143080410503316, 17.808318996649401], [-90.067933519230891, 17.819326076727517], [-91.001519945015943, 17.817594916245692], [-91.002269253284155, 17.254657701074272], [-91.453921271515114, 17.252177232324183], [-91.08167009150057, 16.918476670799517], [-90.711821865587623, 16.687483018454767], [-90.600846727240921, 16.470777899638787], [-90.438866950221993, 16.410109768128105], [-90.464472622422633, 16.069562079324722], [-91.747960171255926, 16.066564846251762], [-92.229248623406278, 15.251446641495871], [-92.087215949252013, 15.06458466232851], [-92.203229539747255, 14.830102850804108], [-92.227750006869812, 14.538828640190953], [-93.359463874061746, 15.61542959234367], [-93.875168830118511, 15.94016429286591], [-94.691656460330108, 16.20097524664288], [-95.250227016973014, 16.128318182840641], [-96.053382127653293, 15.752087917539592], [-96.557434048228274, 15.653515122942787], [-97.263592495496624, 15.917064927631312], [-98.013029954809596, 16.107311713113912], [-98.947675747456486, 16.566043402568763], [-99.697397427147024, 16.706164048728166], [-100.829498867581293, 17.171071071842047], [-101.666088629954444, 17.649026394109622], [-101.918528001700196, 17.916090196193974], [-102.478132086988907, 17.975750637275095], [-103.500989549558057, 18.292294623278845], [-103.917527432046811, 18.748571682200005], [-104.992009650475467, 19.316133938061679], [-105.493038499761411, 19.946767279535429], [-105.731396043707633, 20.434101874264108], [-105.397772996831321, 20.531718654863422], [-105.500660773524402, 20.816895046466122], [-105.27075232625792, 21.076284898355137], [-105.265817226974022, 21.422103583252348], [-105.603160976975374, 21.871145941652568], [-105.693413865973113, 22.269080308516148], [-106.028716396898943, 22.77375234627862], [-106.909980434988341, 23.767774359628895], [-107.91544877809136, 24.548915310152946], [-108.401904873470954, 25.172313951105931], [-109.260198737406625, 25.580609442644054], [-109.444089321717314, 25.824883938087673], [-109.291643846456267, 26.44293406829842], [-109.801457689231796, 26.676175645447923], [-110.391731737085692, 27.162114976504533], [-110.641018846461606, 27.859876003525521], [-111.178918830187826, 27.941240546169062], [-111.759606899851619, 28.467952582303944], [-112.228234626090369, 28.954408677683482], [-112.27182369672866, 29.266844387320074], [-112.80959448937395, 30.021113593052341], [-113.163810594518651, 30.786880804969424], [-113.148669399857141, 31.170965887978912], [-113.871881069781836, 31.56760834403519], [-114.205736660603506, 31.524045111613123], [-114.776451178835003, 31.79953217216114], [-114.936699795372121, 31.393484605427595], [-114.771231859173483, 30.91361725516526], [-114.673899298951739, 30.162681179315985], [-114.330974494262918, 29.750432440707407], [-113.588875088335413, 29.061611436473008], [-113.424053107540516, 28.826173610951223], [-113.271969367305502, 28.754782619739892], [-113.140039435664363, 28.411289374295954], [-112.962298346796473, 28.425190334582503], [-112.761587083774856, 27.78021678314752], [-112.457910529411635, 27.525813706974752], [-112.24495195193677, 27.171726792910754], [-111.616489020619184, 26.662817287700474], [-111.284674648872993, 25.732589830014426], [-110.987819383572386, 25.294606228124557], [-110.71000688357131, 24.826004340101854], [-110.655048997828871, 24.298594672131113], [-110.17285620811343, 24.265547593680417], [-109.771847093528521, 23.811182562754194], [-109.409104377055698, 23.364672349536242], [-109.433392300232896, 23.185587673428696], [-109.85421932660168, 22.818271592698061], [-110.031391974714424, 22.823077500901199], [-110.295070970483636, 23.430973212166684], [-110.949501309028022, 24.000964260345988], [-111.670568407012681, 24.484423122652508], [-112.182035895621468, 24.73841278736716], [-112.148988817170817, 25.470125230404044], [-112.300710822379671, 26.012004299416613], [-112.777296719191526, 26.321959540303162], [-113.464670783321907, 26.768185533143416], [-113.596729906043805, 26.639459540304465], [-113.848936733844241, 26.900063788352437], [-114.465746629680027, 27.142090358991361], [-115.055142178184965, 27.722726752222904], [-114.982252570437382, 27.798200181585109], [-114.570365566854917, 27.741485297144884], [-114.199328782999231, 28.115002549750553], [-114.162018398884612, 28.566111965442296], [-114.931842210736605, 29.279479275015483], [-115.518653937626965, 29.556361599235395], [-115.887365282029563, 30.180793768834171], [-116.2583503894529, 30.836464341753572], [-116.721526252084956, 31.635743720012037], [-117.127759999999839, 32.53534], [-115.99135, 32.612390000000111], [-114.72139, 32.72083], [-114.815, 32.52528], [-113.30498, 32.03914], [-111.02361, 31.33472], [-109.035, 31.341940000000129], [-108.24194, 31.34222], [-108.24, 31.754853718166366], [-106.507589999999851, 31.75452], [-106.1429, 31.39995], [-105.63159, 31.08383], [-105.03737, 30.64402], [-104.70575, 30.12173], [-104.456969999999885, 29.57196], [-103.94, 29.27], [-103.11, 28.97], [-102.48, 29.76], [-101.6624, 29.7793], [-100.9576, 29.380710000000125], [-100.45584, 28.696120000000118], [-100.11, 28.11000000000012], [-99.52, 27.54], [-99.3, 26.84], [-99.019999999999897, 26.37], [-98.24, 26.06], [-97.529999999999887, 25.84], [-97.140008307670684, 25.869997463478395]]] } },
-            { "type": "Feature", "properties": { "admin": "Macedonia", "name": "Macedonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.59023, 41.85541], [20.717310000000108, 41.84711], [20.76216, 42.05186], [21.352700000000134, 42.2068], [21.576635989402117, 42.245224397061847], [21.917080000000105, 42.30364], [22.380525750424674, 42.320259507815074], [22.881373732197339, 41.999297186850349], [22.952377150166505, 41.337993882811176], [22.76177, 41.3048], [22.597308383889008, 41.130487168943198], [22.055377638444266, 41.149865831052686], [21.674160597426969, 40.93127452245794], [21.020040317476397, 40.842726955725873], [20.60518, 41.08622], [20.46315, 41.51509], [20.59023, 41.85541]]] } },
-            { "type": "Feature", "properties": { "admin": "Mali", "name": "Mali", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-11.834207526079465, 14.799096991428936], [-11.666078253617853, 15.388208319556295], [-11.349095017939502, 15.411256008358475], [-10.650791388379414, 15.132745876521422], [-10.086846482778212, 15.330485744686269], [-9.700255092802703, 15.264107367407359], [-9.550238409859388, 15.486496893775435], [-5.537744309908446, 15.501689764869253], [-5.315277268891931, 16.201853745991837], [-5.488522508150438, 16.325102037007962], [-5.971128709324247, 20.640833441647626], [-6.453786586930334, 24.956590684503418], [-4.92333736817423, 24.974574082940993], [-1.550054897457613, 22.792665920497377], [1.823227573259032, 20.61080943448604], [2.060990838233919, 20.142233384679482], [2.683588494486428, 19.856230170160114], [3.146661004253899, 19.693578599521441], [3.158133172222704, 19.057364203360034], [4.267419467800038, 19.155265204336995], [4.270209995143801, 16.852227484601212], [3.723421665063482, 16.184283759012612], [3.638258904646476, 15.568119818580453], [2.749992709981483, 15.409524847876693], [1.385528191746857, 15.323561102759168], [1.01578331869851, 14.968182277887944], [0.374892205414682, 14.928908189346128], [-0.26625729003058, 14.924308986872147], [-0.515854458000348, 15.116157741755725], [-1.066363491205663, 14.973815009007764], [-2.001035122068771, 14.559008287000887], [-2.191824510090384, 14.246417548067352], [-2.967694464520576, 13.798150336151506], [-3.103706834312759, 13.54126679122859], [-3.52280270019986, 13.337661647998612], [-4.006390753587225, 13.472485459848112], [-4.280405035814879, 13.228443508349738], [-4.427166103523802, 12.542645575404292], [-5.220941941743119, 11.713858954307224], [-5.197842576508648, 11.375145778850136], [-5.470564947929004, 10.951269842976044], [-5.404341599946973, 10.370736802609144], [-5.816926235365286, 10.222554633012191], [-6.050452032892266, 10.096360785355442], [-6.205222947606429, 10.524060777219132], [-6.493965013037267, 10.411302801958268], [-6.666460944027547, 10.430810655148447], [-6.850506557635057, 10.138993841996237], [-7.622759161804808, 10.147236232946792], [-7.89958980959237, 10.297382106970824], [-8.029943610048617, 10.206534939001711], [-8.335377163109738, 10.494811916541932], [-8.282357143578279, 10.792597357623842], [-8.407310756860026, 10.90925690352276], [-8.620321010767126, 10.810890814655181], [-8.581305304386772, 11.136245632364801], [-8.376304897484911, 11.393645941610627], [-8.786099005559462, 11.812560939984705], [-8.905264858424529, 12.088358059126433], [-9.127473517279581, 12.308060411015331], [-9.327616339546008, 12.334286200403451], [-9.567911749703212, 12.194243068892472], [-9.890992804392011, 12.060478623904968], [-10.165213792348835, 11.844083563682743], [-10.593223842806278, 11.923975328005977], [-10.870829637078211, 12.177887478072106], [-11.036555955438256, 12.211244615116513], [-11.297573614944508, 12.077971096235768], [-11.456168585648269, 12.076834214725336], [-11.513942836950587, 12.442987575729415], [-11.467899135778522, 12.754518947800973], [-11.553397793005427, 13.141213690641063], [-11.927716030311613, 13.422075100147392], [-12.124887457721256, 13.994727484589784], [-12.170750291380299, 14.616834214735503]]] } },
-            { "type": "Feature", "properties": { "admin": "Myanmar", "name": "Myanmar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[99.543309360759281, 20.186597601802056], [98.959675734454848, 19.752980658440944], [98.253723992915582, 19.708203029860041], [97.797782830804394, 18.627080389881751], [97.375896437573516, 18.445437730375811], [97.859122755934848, 17.567946071843657], [98.493761020911322, 16.837835598207928], [98.90334842325673, 16.177824204976115], [98.537375929765687, 15.308497422746081], [98.192074009191373, 15.123702500870349], [98.430819126379859, 14.622027696180831], [99.097755161538728, 13.827502549693275], [99.212011753336071, 13.269293728076462], [99.196353794351637, 12.804748439988666], [99.587286004639694, 11.892762762901695], [99.038120558673953, 10.960545762572435], [98.553550653073017, 9.932959906448543], [98.457174106848697, 10.675266018105146], [98.764545526120756, 11.441291612183745], [98.428338657629823, 12.032986761925681], [98.509574009192661, 13.122377631070675], [98.103603957107666, 13.64045970301285], [97.777732375075161, 14.837285874892638], [97.597071567782749, 16.100567938699765], [97.164539829499773, 16.928734442609336], [96.505768670642965, 16.427240505432845], [95.369352248112378, 15.714389960182599], [94.808404575584092, 15.803454291237637], [94.188804152404515, 16.037936102762014], [94.533485955791321, 17.277240301985724], [94.324816522196741, 18.213513902249893], [93.540988397193615, 19.366492621330021], [93.663254835996199, 19.726961574781992], [93.078277622452163, 19.855144965081973], [92.368553501355606, 20.670883287025344], [92.30323449093865, 21.475485337809815], [92.652257114637976, 21.324047552978481], [92.672720981825549, 22.041238918541247], [93.166127557348361, 22.278459580977099], [93.060294224014598, 22.703110663335565], [93.286326938859247, 23.043658352138998], [93.325187615942767, 24.078556423432197], [94.106741977925054, 23.850740871673477], [94.552657912171611, 24.675238348890328], [94.603249139385355, 25.162495428970399], [95.155153436262566, 26.001307277932078], [95.124767694074933, 26.573572089132295], [96.419365675850941, 27.264589341739221], [97.133999058015277, 27.08377350514996], [97.051988559968066, 27.699058946233144], [97.402561476636123, 27.88253611908544], [97.327113885490007, 28.261582749946331], [97.91198774616943, 28.335945136014338], [98.24623091023328, 27.747221381129172], [98.682690057370451, 27.508812160750612], [98.712093947344499, 26.74353587494026], [98.671838006589127, 25.918702500913518], [97.724609002679117, 25.083637193292994], [97.604719679761956, 23.897404690033039], [98.660262485755737, 24.063286037689959], [98.898749220782747, 23.142722072842524], [99.531992222087382, 22.949038804612574], [99.240898878987224, 22.118314317304577], [99.983489211021464, 21.742936713136398], [100.416537713627349, 21.558839423096607], [101.150032993578222, 21.849984442629015], [101.180005324307515, 21.436572984294024], [100.329101190189519, 20.786121731036229], [100.115987583417819, 20.41784963630818], [99.543309360759281, 20.186597601802056]]] } },
-            { "type": "Feature", "properties": { "admin": "Montenegro", "name": "Montenegro", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.801613396898681, 42.500093492190835], [19.738051385179627, 42.688247382165564], [19.30449, 42.19574], [19.371770000000136, 41.87755], [19.16246, 41.95502], [18.88214, 42.28151], [18.45, 42.48], [18.56, 42.65], [18.70648, 43.20011], [19.03165, 43.43253], [19.21852, 43.52384], [19.48389, 43.35229], [19.63, 43.213779970270522], [19.95857, 43.10604], [20.3398, 42.89852], [20.25758, 42.81275], [20.0707, 42.58863], [19.801613396898681, 42.500093492190835]]] } },
-            { "type": "Feature", "properties": { "admin": "Mongolia", "name": "Mongolia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[87.751264276076697, 49.297197984405479], [88.805566847695488, 49.470520738312409], [90.713667433640666, 50.331811835321076], [92.234711541719662, 50.802170722041716], [93.104219191462661, 50.495290228876414], [94.147566359435615, 50.480536607457083], [94.815949334698701, 50.013433335970838], [95.814027947983973, 49.977466539095708], [97.259727817781396, 49.726060695995727], [98.231761509191543, 50.422400621128737], [97.825739780674283, 51.010995184933165], [98.861490513100307, 52.047366034546684], [99.981732212323507, 51.634006252643978], [100.889480421962588, 51.516855780638316], [102.065222609467298, 51.25992055928311], [102.255908644624299, 50.510560614618669], [103.676545444760194, 50.089966132195109], [104.621552362081687, 50.275329494826067], [105.886591424586726, 50.406019192092209], [106.888804152455336, 50.274295966180219], [107.868175897250936, 49.793705145865808], [108.475167270951275, 49.282547715850725], [109.402449171996636, 49.292960516957535], [110.662010532678764, 49.130128078805861], [111.581230910286607, 49.377968248077678], [112.897739699354361, 49.543565375356984], [114.362456496235239, 50.248302720737399], [114.962109816550154, 50.140247300815112], [115.485695428531386, 49.805177313834591], [116.678800897286152, 49.888531399121376], [116.191802199367544, 49.134598090199091], [115.485282017073018, 48.135382595403428], [115.742837355615748, 47.726544501326273], [116.308952671373206, 47.853410142602826], [117.295507440257396, 47.69770905210742], [118.064142694166691, 48.066730455103674], [118.866574334794933, 47.747060044946153], [119.772823927897477, 47.048058783550125], [119.66326989143873, 46.692679958678909], [118.874325799638711, 46.805412095723646], [117.421701287914175, 46.672732855814253], [116.717868280098841, 46.388202419615205], [115.985096470200062, 45.727235012385989], [114.46033165899604, 45.339816799493811], [113.463906691544139, 44.808893134127111], [112.436062453258785, 45.011645616224278], [111.873306105600278, 45.102079372735055], [111.348376906379428, 44.457441718110083], [111.667737257943202, 44.073175767587706], [111.829587843881342, 43.743118394539515], [111.129682244920218, 43.406834011400136], [110.412103306115256, 42.871233628911014], [109.243595819131428, 42.519446316084093], [107.744772576937933, 42.481515814781865], [106.129315627061658, 42.134327704428898], [104.964993931093446, 41.597409572916334], [104.522281935648977, 41.908346666016541], [103.312278273534787, 41.907468166667591], [101.833040399179922, 42.51487295182627], [100.845865513108237, 42.663804429691439], [99.515817498780009, 42.524691473961717], [97.451757440177985, 42.748889675460013], [96.349395786527793, 42.725635280928678], [95.762454868556674, 43.319449164394598], [95.306875441471504, 44.241330878265458], [94.688928664125299, 44.352331854828414], [93.480733677141274, 44.975472113619951], [92.133890822318193, 45.115075995456444], [90.945539585334288, 45.286073309910265], [90.585768263718265, 45.719716091487513], [90.970809360724985, 46.888146063822923], [90.280825636763893, 47.693549099307923], [88.854297723346733, 48.06908173277295], [88.013832228551721, 48.599462795600601], [87.751264276076697, 49.297197984405479]]] } },
-            { "type": "Feature", "properties": { "admin": "Mozambique", "name": "Mozambique", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [35.312397902169032, -11.439146416879145], [36.514081658684248, -11.720938002166733], [36.775150994622791, -11.594537448780804], [37.471284214026596, -11.568750909067157], [37.827644891111383, -11.268769219612834], [38.427556593587745, -11.285202325081654], [39.521029900883768, -10.896853936408224], [40.316588576017182, -10.317096042525696], [40.478387485523022, -10.765440769089992], [40.437253045418672, -11.761710707245014], [40.560811395028558, -12.639176527561023], [40.599620395679743, -14.201975192931858], [40.775475294768988, -14.691764418194239], [40.477250604012596, -15.406294447493968], [40.089263950365208, -16.100774021064456], [39.452558628097044, -16.720891208566936], [38.53835086442151, -17.101023044505954], [37.411132846838875, -17.586368096591233], [36.281279331209348, -18.659687595293445], [35.896496616364054, -18.842260430580634], [35.198399692533137, -19.552811374593887], [34.786383497870041, -19.784011732667732], [34.701892531072836, -20.497043145431007], [35.176127150215358, -21.254361260668407], [35.373427768705731, -21.840837090748874], [35.385848253705397, -22.14], [35.562545536369079, -22.09], [35.533934767404297, -23.070787855727751], [35.371774122872374, -23.535358982031692], [35.607470330555621, -23.706563002214676], [35.458745558419615, -24.122609958596545], [35.040734897610655, -24.478350518493798], [34.215824008935463, -24.816314385682652], [33.013210076639005, -25.357573337507731], [32.574632195777859, -25.727318210556088], [32.660363396950082, -26.148584486599443], [32.915955031065685, -26.215867201443459], [32.830120477028878, -26.74219166433619], [32.071665480281062, -26.733820082304902], [31.985779249811962, -26.29177988048022], [31.837777947728057, -25.843331801051342], [31.752408481581874, -25.484283949487406], [31.930588820124242, -24.369416599222532], [31.670397983534645, -23.658969008073861], [31.191409132621278, -22.251509698172395], [32.244988234188007, -21.116488539313689], [32.508693068173436, -20.395292250248303], [32.659743279762573, -20.30429005298231], [32.772707960752619, -19.715592136313294], [32.611994256324884, -19.419382826416268], [32.654885695127142, -18.672089939043492], [32.849860874164385, -17.979057305577175], [32.847638787575839, -16.713398125884613], [32.328238966610222, -16.392074069893749], [31.852040643040592, -16.319417006091374], [31.636498243951188, -16.071990248277881], [31.173063999157673, -15.860943698797868], [30.338954705534537, -15.880839125230242], [30.274255812305103, -15.507786960515208], [30.179481235481827, -14.796099134991525], [33.214024692525207, -13.97186003993615], [33.789700148256678, -14.451830743063068], [34.064825473778619, -14.359950046448118], [34.459633416488536, -14.613009535381421], [34.517666049952304, -15.013708591372609], [34.307291294092089, -15.478641452702592], [34.381291945134045, -16.183559665596039], [35.033810255683527, -16.801299737213089], [35.339062941231639, -16.107440280830108], [35.771904738108347, -15.896858819240721], [35.686845330555926, -14.611045830954328], [35.267956170398001, -13.887834161029563], [34.907151320136158, -13.565424899960565], [34.559989047999345, -13.579997653866872], [34.280006137841973, -12.280025323132504], [34.559989047999345, -11.520020033415923]]] } },
-            { "type": "Feature", "properties": { "admin": "Mauritania", "name": "Mauritania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-12.830658331747513, 15.303691514542942], [-13.43573767745306, 16.039383042866188], [-14.099521450242175, 16.304302273010489], [-14.577347581428977, 16.598263658102805], [-15.135737270558813, 16.587282416240779], [-15.623666144258689, 16.369337063049809], [-16.120690070041928, 16.45566254319338], [-16.463098110407881, 16.135036119038457], [-16.549707810929061, 16.673892116761959], [-16.270551723688353, 17.166962795474866], [-16.146347418674846, 18.108481553616652], [-16.256883307347163, 19.096715806550304], [-16.377651129613266, 19.593817246981981], [-16.277838100641514, 20.092520656814695], [-16.536323614965465, 20.567866319251486], [-17.063423224342568, 20.99975210213082], [-16.845193650773989, 21.333323472574875], [-12.929101935263528, 21.327070624267559], [-13.118754441774708, 22.771220201096249], [-12.874221564169574, 23.284832261645171], [-11.93722449385332, 23.374594224536164], [-11.969418911171159, 25.933352769468261], [-8.687293667017398, 25.881056219988899], [-8.684399786809051, 27.395744126895998], [-4.92333736817423, 24.974574082940993], [-6.453786586930334, 24.956590684503418], [-5.971128709324247, 20.640833441647626], [-5.488522508150438, 16.325102037007962], [-5.315277268891931, 16.201853745991837], [-5.537744309908446, 15.501689764869253], [-9.550238409859388, 15.486496893775435], [-9.700255092802703, 15.264107367407359], [-10.086846482778212, 15.330485744686269], [-10.650791388379414, 15.132745876521422], [-11.349095017939502, 15.411256008358475], [-11.666078253617853, 15.388208319556295], [-11.834207526079465, 14.799096991428936], [-12.170750291380299, 14.616834214735503]]] } },
-            { "type": "Feature", "properties": { "admin": "Malawi", "name": "Malawi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [34.280006137841973, -12.280025323132504], [34.559989047999345, -13.579997653866872], [34.907151320136158, -13.565424899960565], [35.267956170398001, -13.887834161029563], [35.686845330555926, -14.611045830954328], [35.771904738108347, -15.896858819240721], [35.339062941231639, -16.107440280830108], [35.033810255683527, -16.801299737213089], [34.381291945134045, -16.183559665596039], [34.307291294092089, -15.478641452702592], [34.517666049952304, -15.013708591372609], [34.459633416488536, -14.613009535381421], [34.064825473778619, -14.359950046448118], [33.789700148256678, -14.451830743063068], [33.214024692525207, -13.97186003993615], [32.688165317523122, -13.712857761289273], [32.991764357237876, -12.783870537978272], [33.306422153463068, -12.435778090060214], [33.114289178201908, -11.607198174692311], [33.315310499817279, -10.796549981329695], [33.485687697083584, -10.525558770391111], [33.231387973775291, -9.676721693564799], [32.759375441221316, -9.230599053589058], [33.739729038230443, -9.417150974162722], [33.940837724096532, -9.693673841980292], [34.280006137841973, -10.159999688358402], [34.559989047999345, -11.520020033415923]]] } },
-            { "type": "Feature", "properties": { "admin": "Malaysia", "name": "Malaysia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[101.075515578213299, 6.204867051615891], [101.154218784593809, 5.691384182147713], [101.814281854258013, 5.810808417174228], [102.141186964936423, 6.221636053894655], [102.371147088635212, 6.12820506431096], [102.961705356866673, 5.524495144061077], [103.381214634212142, 4.855001125503746], [103.438575474056165, 4.181605536308381], [103.332122023534851, 3.72669790284297], [103.42942874554052, 3.382868760589019], [103.502447544368877, 2.791018581550204], [103.854674106870334, 2.515454006353763], [104.247931756611479, 1.631141058759055], [104.228811476663523, 1.293048000489534], [103.519707472754433, 1.226333726400682], [102.573615350354771, 1.967115383304744], [101.39063846232915, 2.760813706875623], [101.273539666755838, 3.27029165284118], [100.69543541870668, 3.939139715994869], [100.557407668055092, 4.767280381688279], [100.19670617065772, 5.312492580583678], [100.306260207116509, 6.040561835143875], [100.085756870527078, 6.46448944745029], [100.259596388756918, 6.64282481528957], [101.075515578213299, 6.204867051615891]]], [[[118.618320754064825, 4.47820241944754], [117.882034946770162, 4.137551377779487], [117.01521447150634, 4.306094061699468], [115.86551720587677, 4.306559149590156], [115.51907840379198, 3.169238389494395], [115.134037306785231, 2.821481838386219], [114.621355422017473, 1.430688177898886], [113.805849644019531, 1.217548732911041], [112.859809198052176, 1.497790025229946], [112.380251906383648, 1.410120957846757], [111.797548455860408, 0.904441229654651], [111.159137811326559, 0.976478176269509], [110.514060907027101, 0.773131415200993], [109.830226678508836, 1.338135687664191], [109.663260125773718, 2.006466986494984], [110.396135288537039, 1.663774725751395], [111.168852980597478, 1.850636704918784], [111.370081007942076, 2.697303371588872], [111.796928338672842, 2.885896511238073], [112.995614862115247, 3.102394924324869], [113.712935418758718, 3.893509426281127], [114.204016554828399, 4.525873928236819], [114.659595981913526, 4.00763682699781], [114.869557326315373, 4.348313706881952], [115.347460972150671, 4.316636053887009], [115.405700311343594, 4.955227565933824], [115.450710483869798, 5.447729803891561], [116.220741001450961, 6.143191229675621], [116.725102980619752, 6.924771429873998], [117.129626092600461, 6.928052883324566], [117.643393182446303, 6.422166449403305], [117.689075148592337, 5.98749013918018], [118.347691278152197, 5.708695786965462], [119.181903924639926, 5.407835598162249], [119.110693800941718, 5.016128241389864], [118.439727004064082, 4.966518866389619], [118.618320754064825, 4.47820241944754]]]] } },
-            { "type": "Feature", "properties": { "admin": "Namibia", "name": "Namibia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[16.344976840895239, -28.576705010697697], [15.601818068105812, -27.821247247022797], [15.210472446359457, -27.09095590587404], [14.989710727608548, -26.117371921495153], [14.74321414557633, -25.392920017195376], [14.40814415859583, -23.85301401132984], [14.385716586981145, -22.656652927340687], [14.257714064194172, -22.111208184499951], [13.868642205468657, -21.699036960539974], [13.352497999737437, -20.872834161057497], [12.82684533046449, -19.673165785401661], [12.608564080463617, -19.045348809487695], [11.794918654028063, -18.069129327061912], [11.734198846085118, -17.30188933682447], [12.215461460019352, -17.11166838955808], [12.814081251688405, -16.941342868724067], [13.462362094789963, -16.971211846588769], [14.058501417709007, -17.42338062914266], [14.209706658595021, -17.353100681225715], [18.26330936043416, -17.309950860262003], [18.956186964603599, -17.789094740472255], [21.377176141045563, -17.930636488519688], [23.215048455506057, -17.52311614346598], [24.033861525170771, -17.29584319424632], [24.6823490740015, -17.35341073981947], [25.076950310982255, -17.578823337476617], [25.084443393664564, -17.661815687737366], [24.520705193792534, -17.887124932529932], [24.217364536239209, -17.889347019118485], [23.579005568137713, -18.281261081620055], [23.196858351339298, -17.869038181227783], [21.655040317478971, -18.219146010005222], [20.910641310314531, -18.252218926672018], [20.881134067475866, -21.814327080983144], [19.895457797940672, -21.849156996347865], [19.895767856534427, -24.767790215760588], [19.89473432788861, -28.461104831660769], [19.002127312911082, -28.972443129188857], [18.464899122804745, -29.045461928017271], [17.836151971109526, -28.856377862261311], [17.387497185951499, -28.783514092729774], [17.218928663815401, -28.355943291946804], [16.824017368240899, -28.082161553664466], [16.344976840895239, -28.576705010697697]]] } },
-            { "type": "Feature", "properties": { "admin": "New Caledonia", "name": "New Caledonia", "continent": "Oceania" }, "geometry": { "type": "Polygon", "coordinates": [[[165.779989862326346, -21.080004978115621], [166.599991489933814, -21.700018812753523], [167.120011428086883, -22.159990736583488], [166.74003462144475, -22.399976088146943], [166.189732293968632, -22.129708347260447], [165.474375441752159, -21.679606621998229], [164.829815301775653, -21.149819838141948], [164.16799523341362, -20.444746595951624], [164.029605747735957, -20.105645847252347], [164.459967075862664, -20.120011895429492], [165.020036249041993, -20.459991143477726], [165.460009393575064, -20.800022067958253], [165.779989862326346, -21.080004978115621]]] } },
-            { "type": "Feature", "properties": { "admin": "Niger", "name": "Niger", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.154473504249949, 11.940150051313422], [2.177107781593917, 12.625017808477534], [1.024103224297619, 12.851825669806598], [0.993045688490156, 13.335749620003865], [0.429927605805517, 13.988733018443893], [0.295646396495215, 14.444234930880663], [0.374892205414767, 14.928908189346144], [1.015783318698481, 14.968182277887989], [1.385528191746971, 15.323561102759237], [2.74999270998154, 15.409524847876751], [3.63825890464659, 15.56811981858044], [3.723421665063596, 16.184283759012654], [4.270209995143886, 16.852227484601311], [4.267419467800095, 19.155265204337123], [5.677565952180712, 19.601206976799794], [8.572893100629868, 21.565660712159225], [11.999505649471697, 23.471668402596432], [13.581424594790459, 23.040506089769274], [14.143870883855239, 22.491288967371126], [14.8513, 22.862950000000119], [15.096887648181847, 21.308518785074902], [15.471076694407314, 21.048457139565979], [15.487148064850143, 20.730414537025634], [15.90324669766431, 20.387618923417499], [15.68574059414777, 19.957180080642384], [15.300441114979716, 17.927949937405], [15.247731154041842, 16.627305813050778], [13.972201775781681, 15.684365953021139], [13.540393507550785, 14.36713369390122], [13.956698846094124, 13.996691189016925], [13.954476759505607, 13.353448798063765], [14.595781284247604, 13.330426947477859], [14.495787387762899, 12.859396267137353], [14.213530714584746, 12.80203542729333], [14.181336297266906, 12.483656927943169], [13.995352817448289, 12.4615652531383], [13.318701613018558, 13.55635630945795], [13.083987257548809, 13.596147162322492], [12.302071160540546, 13.037189032437535], [11.527803175511504, 13.328980007373556], [10.989593133191532, 13.387322699431191], [10.701031935273816, 13.246917832894038], [10.114814487354748, 13.277251898649464], [9.524928012743088, 12.85110219975456], [9.014933302454436, 12.826659247280414], [7.804671258178869, 13.343526923063731], [7.330746697630046, 13.098038031461213], [6.82044192874781, 13.115091254117598], [6.445426059605721, 13.492768459522718], [5.443058302440135, 13.865923977102225], [4.368343540066006, 13.747481594289408], [4.107945997747378, 13.531215725147941], [3.967282749048933, 12.956108710171574], [3.680633579125924, 12.552903347214167], [3.611180454125587, 11.660167141155965], [2.848643019226585, 12.235635891158207], [2.490163608418015, 12.233052069543588], [2.154473504249949, 11.940150051313422]]] } },
-            { "type": "Feature", "properties": { "admin": "Nigeria", "name": "Nigeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[8.500287713259693, 4.771982937026847], [7.462108188515939, 4.41210826254624], [7.082596469764438, 4.464689032403228], [6.698072137080598, 4.240594183769516], [5.898172641634686, 4.262453314628984], [5.362804803090881, 4.887970689305957], [5.033574252959368, 5.611802476418233], [4.325607130560683, 6.270651149923466], [3.574180128604552, 6.258300482605717], [2.691701694356254, 6.258817246928628], [2.74906253420022, 7.870734361192886], [2.723792758809509, 8.506845404489708], [2.912308383810255, 9.13760793704432], [3.220351596702101, 9.4441525333997], [3.705438266625918, 10.063210354040207], [3.600070021182801, 10.332186184119406], [3.797112257511713, 10.734745591673104], [3.572216424177469, 11.327939357951516], [3.611180454125558, 11.660167141155966], [3.68063357912581, 12.552903347214222], [3.967282749048848, 12.956108710171572], [4.107945997747321, 13.531215725147829], [4.368343540066063, 13.747481594289324], [5.443058302440163, 13.865923977102295], [6.445426059605636, 13.492768459522676], [6.820441928747753, 13.115091254117514], [7.330746697630017, 13.098038031461199], [7.804671258178784, 13.343526923063745], [9.014933302454462, 12.826659247280427], [9.524928012742945, 12.851102199754477], [10.114814487354689, 13.277251898649409], [10.701031935273702, 13.246917832894081], [10.989593133191532, 13.387322699431108], [11.527803175511393, 13.328980007373584], [12.302071160540521, 13.037189032437521], [13.083987257548866, 13.596147162322563], [13.318701613018558, 13.556356309457824], [13.995352817448346, 12.461565253138343], [14.181336297266792, 12.483656927943112], [14.57717776862253, 12.085360826053501], [14.468192172918974, 11.90475169519341], [14.415378859116682, 11.572368882692071], [13.572949659894558, 10.798565985553564], [13.308676385153914, 10.160362046748926], [13.1675997249971, 9.64062632897341], [12.955467970438971, 9.417771714714702], [12.753671502339214, 8.717762762888993], [12.218872104550597, 8.305824082874322], [12.063946160539556, 7.799808457872301], [11.839308709366801, 7.397042344589434], [11.745774366918509, 6.981382961449753], [11.058787876030349, 6.644426784690593], [10.497375115611417, 7.055357774275562], [10.118276808318255, 7.038769639509879], [9.522705926154398, 6.453482367372116], [9.233162876023043, 6.444490668153334], [8.757532993208626, 5.47966583904791], [8.500287713259693, 4.771982937026847]]] } },
-            { "type": "Feature", "properties": { "admin": "Nicaragua", "name": "Nicaragua", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-85.712540452807289, 11.088444932494822], [-86.058488328785245, 11.40343862552994], [-86.525849982432931, 11.806876532432593], [-86.7459915839963, 12.143961900272483], [-87.167516242201131, 12.458257961471656], [-87.668493415054698, 12.909909979702629], [-87.557466600275603, 13.064551703336061], [-87.392386237319201, 12.914018256069836], [-87.316654425795463, 12.984685777228972], [-87.005769009127562, 13.025794379117157], [-86.880557013684339, 13.254204209847241], [-86.733821784191576, 13.263092556201441], [-86.755086636079696, 13.754845485890909], [-86.520708177419877, 13.778487453664436], [-86.312142096689911, 13.771356106008167], [-86.096263800790581, 14.038187364147245], [-85.801294725268576, 13.836054999237586], [-85.698665330736901, 13.960078436738083], [-85.514413011400222, 14.079011745657834], [-85.165364549484792, 14.354369615125076], [-85.148750576502948, 14.560196844943615], [-85.052787441736925, 14.551541042534719], [-84.924500698572388, 14.790492865452348], [-84.820036790694346, 14.819586696832669], [-84.649582078779602, 14.66680532476175], [-84.449335903648588, 14.621614284722494], [-84.228341640952394, 14.748764146376654], [-83.975721401693576, 14.749435939996458], [-83.628584967772895, 14.880073960830298], [-83.489988776366104, 15.016267198135534], [-83.147219000974104, 14.995829169164109], [-83.233234422523907, 14.8998660343981], [-83.28416154654758, 14.676623846897197], [-83.182126430987267, 14.310703029838447], [-83.412499966144424, 13.970077826386554], [-83.519831916014667, 13.56769928634588], [-83.55220720084553, 13.127054348193084], [-83.498515387694255, 12.869292303921226], [-83.473323126951968, 12.419087225794424], [-83.626104499022887, 12.320850328007563], [-83.719613003255034, 11.893124497927724], [-83.650857510090702, 11.629032090700116], [-83.855470343750369, 11.373311265503785], [-83.808935716471538, 11.103043524617274], [-83.655611741861563, 10.938764146361418], [-83.895054490885926, 10.726839097532444], [-84.190178595704822, 10.793450018756671], [-84.355930752281026, 10.999225572142901], [-84.673069017256239, 11.082657172078139], [-84.903003302738924, 10.952303371621895], [-85.561851976244171, 11.217119248901593], [-85.712540452807289, 11.088444932494822]]] } },
-            { "type": "Feature", "properties": { "admin": "Netherlands", "name": "Netherlands", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.074182570020922, 53.51040334737813], [6.905139601274128, 53.482162177130633], [7.092053256873895, 53.14404328064488], [6.842869500362381, 52.228440253297542], [6.589396599970825, 51.85202912048338], [5.988658074577812, 51.85161570902504], [6.156658155958779, 50.803721015010574], [5.60697594567, 51.037298488969768], [4.973991326526913, 51.475023708698124], [4.047071160507527, 51.267258612668556], [3.314971144228536, 51.345755113319903], [3.830288527043137, 51.620544542031936], [4.705997348661184, 53.091798407597757], [6.074182570020922, 53.51040334737813]]] } },
-            { "type": "Feature", "properties": { "admin": "Norway", "name": "Norway", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[28.165547316202911, 71.185474351680497], [31.293418409965472, 70.453787746859902], [30.005435011522785, 70.186258856884876], [31.101078728975118, 69.558080145944857], [29.399580519332879, 69.156916002063056], [28.591929559043187, 69.064776923286686], [29.015572950971968, 69.76649119737796], [27.732292107867885, 70.164193020296281], [26.179622023226298, 69.825298977326142], [25.689212680776389, 69.092113755968995], [24.735679152126714, 68.649556789821432], [23.662049594830759, 68.891247463650515], [22.356237827247405, 68.841741441514941], [21.244936150810723, 69.370443020293109], [20.645592889089581, 69.106247260200846], [20.02526899585791, 69.065138658312705], [19.878559604581248, 68.407194322372604], [17.993868442464386, 68.567391262477329], [17.729181756265344, 68.01055186631622], [16.768878614985535, 68.013936672631374], [16.108712192456832, 67.302455552836889], [15.108411492583055, 66.193866889095418], [13.555689731509087, 64.787027696381458], [13.919905226302202, 64.445420640716108], [13.571916131248766, 64.049114081469654], [12.57993533697393, 64.066218980558332], [11.930569288794228, 63.128317572676977], [11.992064243221531, 61.800362453856557], [12.63114668137524, 61.293571682370079], [12.300365838274896, 60.117932847730046], [11.468271925511173, 59.432393296945989], [11.027368605196925, 58.856149400459394], [10.356556837616095, 59.469807033925363], [8.382000359743641, 58.313288479233265], [7.048748406613297, 58.078884182357271], [5.665835402050418, 58.588155422593658], [5.308234490590733, 59.663231919993805], [4.992078077829005, 61.97099803328426], [5.912900424837885, 62.614472968182682], [8.553411085655766, 63.454008287196459], [10.527709181366784, 64.486038316497471], [12.358346795306371, 65.879725857193151], [14.7611458675816, 67.810641587995121], [16.435927361728968, 68.563205471461671], [19.184028354578512, 69.817444159617807], [21.378416375420606, 70.255169379346043], [23.02374230316158, 70.202071845166259], [24.546543409938515, 71.030496731237221], [26.370049676221807, 70.986261705195361], [28.165547316202911, 71.185474351680497]]], [[[24.72412, 77.85385], [22.49032, 77.44493], [20.72601, 77.67704], [21.41611, 77.93504], [20.8119, 78.25463], [22.88426, 78.45494], [23.28134, 78.07954], [24.72412, 77.85385]]], [[[18.25183, 79.70175], [21.54383, 78.95611], [19.02737, 78.5626], [18.47172, 77.82669], [17.59441, 77.63796], [17.1182, 76.80941], [15.91315, 76.77045], [13.76259, 77.38035], [14.66956, 77.73565], [13.1706, 78.02493], [11.22231, 78.8693], [10.44453, 79.65239], [13.17077, 80.01046], [13.71852, 79.66039], [15.14282, 79.67431], [15.52255, 80.01608], [16.99085, 80.05086], [18.25183, 79.70175]]], [[[25.447625359811887, 80.407340399894494], [27.407505730913492, 80.056405748200447], [25.924650506298171, 79.517833970854539], [23.024465773213613, 79.40001170522909], [20.075188429451877, 79.566823228667232], [19.897266473070907, 79.842361965647498], [18.46226362475792, 79.859880276194403], [17.368015170977454, 80.318896186027004], [20.455992059010693, 80.598155626132225], [21.907944777115397, 80.357679348462071], [22.919252557067431, 80.657144273593488], [25.447625359811887, 80.407340399894494]]]] } },
-            { "type": "Feature", "properties": { "admin": "Nepal", "name": "Nepal", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[88.120440708369841, 27.876541652939586], [88.043132765661198, 27.445818589786818], [88.174804315140904, 26.810405178325944], [88.060237664749806, 26.414615383402484], [87.22747195836628, 26.39789805755607], [86.024392938179147, 26.630984605408567], [85.25177859898335, 26.726198431906337], [84.675017938173767, 27.234901231387528], [83.304248895199535, 27.364505723575554], [81.999987420584958, 27.925479234319987], [81.057202589851997, 28.416095282499036], [80.088424513676259, 28.794470119740136], [80.476721225917373, 29.729865220655334], [81.11125613802929, 30.183480943313398], [81.525804477874729, 30.422716986608627], [82.327512648450863, 30.115268052688126], [83.337115106137176, 29.463731594352193], [83.898992954446712, 29.320226141877654], [84.234579705750136, 28.839893703724691], [85.011638218123025, 28.642773952747337], [85.823319940131498, 28.203575954698699], [86.954517043000592, 27.97426178640351], [88.120440708369841, 27.876541652939586]]] } },
-            { "type": "Feature", "properties": { "admin": "New Zealand", "name": "New Zealand", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[173.020374790740703, -40.919052422856417], [173.247234328502003, -41.331998793300777], [173.958405389702875, -40.926700534835604], [174.2475867048081, -41.349155368821663], [174.248516880589449, -41.770008233406749], [173.876446568087886, -42.233184096038819], [173.222739699595621, -42.970038344088557], [172.711246372770717, -43.372287693048492], [173.080112746470206, -43.853343601253577], [172.308583612352464, -43.865694268571332], [171.452925246463622, -44.24251881284372], [171.185137974327233, -44.897104180684885], [170.616697219116588, -45.908928724959701], [169.83142215400926, -46.355774834987585], [169.332331170934253, -46.641235446967848], [168.411353794628525, -46.619944756863582], [167.763744745146823, -46.290197442409195], [166.676886021184202, -46.219917494492236], [166.509144321964669, -45.852704766626204], [167.046424188503238, -45.110941257508664], [168.303763462596862, -44.12397307716612], [168.949408807651508, -43.93581918719142], [169.667814569373149, -43.555325616226334], [170.524919875366152, -43.031688327812823], [171.125089960004004, -42.512753594737781], [171.569713983443194, -41.767424411792128], [171.948708937871885, -41.514416599291145], [172.097227004278722, -40.956104424809674], [172.798579543343948, -40.493962090823466], [173.020374790740703, -40.919052422856417]]], [[[174.612008905330526, -36.156397393540537], [175.336615838927173, -37.209097995758263], [175.3575964704375, -36.52619394302112], [175.808886753642469, -36.798942152657681], [175.958490025127475, -37.555381768546063], [176.763195428776555, -37.881253350578696], [177.438813104560495, -37.961248467766488], [178.010354445708657, -37.579824721020124], [178.517093540762801, -37.695373223624792], [178.274731073313802, -38.582812595373092], [177.970460239979332, -39.166342868812968], [177.206992629299123, -39.145775648760839], [176.939980503647007, -39.449736423501562], [177.032946405340113, -39.879942722331471], [176.8858236026052, -40.06597787858216], [176.508017206119348, -40.60480803808958], [176.012440220440283, -41.289624118821493], [175.239567499082966, -41.688307793953236], [175.067898391009408, -41.425894870775075], [174.650972935278418, -41.281820977545443], [175.227630243223615, -40.459235528323397], [174.900156691789959, -39.908933200847216], [173.824046665743992, -39.508854262043506], [173.852261997775315, -39.146602471677461], [174.57480187408035, -38.797683200842748], [174.743473749081033, -38.027807712558378], [174.69701663645057, -37.381128838857954], [174.292028436579187, -36.71109221776144], [174.319003534235549, -36.534823907213884], [173.840996535535766, -36.121980889634109], [173.05417117745958, -35.237125339500331], [172.636005487353714, -34.529106540669382], [173.007042271209457, -34.450661716450334], [173.551298456107475, -35.006183363587958], [174.329390497126241, -35.265495700828616], [174.612008905330526, -36.156397393540537]]]] } },
-            { "type": "Feature", "properties": { "admin": "Oman", "name": "Oman", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[58.861141391846573, 21.114034532144299], [58.487985874266961, 20.428985907467101], [58.03431847517659, 20.481437486243347], [57.826372511634098, 20.24300242764863], [57.66576216007094, 19.736004950433109], [57.788700392493368, 19.067570298737646], [57.694390903560667, 18.944709580963799], [57.2342639504338, 18.947991034414255], [56.609650913321971, 18.574267076079476], [56.512189162019482, 18.087113348863934], [56.283520949128011, 17.876066799383945], [55.661491733630683, 17.884128322821535], [55.269939406155189, 17.632309068263194], [55.274900343655091, 17.228354397037659], [54.791002231674113, 16.950696926333357], [54.239252964093751, 17.04498057704998], [53.57050825380459, 16.707662665264674], [53.108572625547502, 16.651051133688977], [52.782184279192066, 17.349742336491229], [52.000009800022227, 19.000003363516068], [54.999981723862405, 19.999994004796118], [55.666659376859869, 22.000001125572307], [55.208341098863187, 22.708329982997007], [55.234489373602869, 23.110992743415348], [55.52584109886449, 23.524869289640911], [55.528631626208288, 23.933604030853498], [55.981213820220503, 24.130542914317854], [55.80411868675624, 24.269604193615287], [55.88623253766805, 24.920830593357486], [56.396847365143984, 24.924732163995508], [56.845140415276049, 24.241673081961487], [57.403452589757428, 23.878594468678834], [58.136947869708322, 23.747930609628835], [58.729211460205427, 23.565667832935414], [59.180501743410346, 22.992395331305456], [59.450097690677033, 22.660270900965592], [59.80806033716285, 22.533611965418199], [59.806148309168087, 22.31052480721419], [59.442191196536399, 21.71454051359208], [59.282407667889871, 21.433885809814875], [58.861141391846573, 21.114034532144299]]], [[[56.391421339753393, 25.895990708921254], [56.261041701080913, 25.714606431576748], [56.070820753814544, 26.055464178973946], [56.362017449779344, 26.395934353128947], [56.485679152253809, 26.309117946878665], [56.391421339753393, 25.895990708921254]]]] } },
-            { "type": "Feature", "properties": { "admin": "Pakistan", "name": "Pakistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[75.158027785140902, 37.13303091078911], [75.896897414050116, 36.666806138651829], [76.192848341785677, 35.898403428687821], [77.837450799474553, 35.494009507787759], [76.871721632804011, 34.653544012992732], [75.757060988268321, 34.504922593721311], [74.240202671204955, 34.748887030571247], [73.749948358051952, 34.317698879527846], [74.104293654277328, 33.441473293586846], [74.451559279278698, 32.764899603805489], [75.258641798813187, 32.271105455040491], [74.405928989564998, 31.692639471965272], [74.421380242820263, 30.97981476493117], [73.450638462217412, 29.976413479119863], [72.823751662084689, 28.961591701772047], [71.777665643200308, 27.913180243434521], [70.61649620960192, 27.989196275335861], [69.514392938113119, 26.940965684511365], [70.168926629522005, 26.491871649678835], [70.282873162725579, 25.722228705339823], [70.844699334602822, 25.215102037043511], [71.0432401874682, 24.356523952730193], [68.842599318318761, 24.359133612560932], [68.176645135373377, 23.691965033456704], [67.443666619745457, 23.944843654876983], [67.145441928989058, 24.663611151624639], [66.37282758979326, 25.425140896093847], [64.530407749291115, 25.237038682551425], [62.905700718034595, 25.218409328710202], [61.497362908784183, 25.078237006118492], [61.874187453056535, 26.239974880472097], [63.316631707619578, 26.756532497661659], [63.23389773952028, 27.217047024030702], [62.755425652929851, 27.378923448184985], [62.727830438085974, 28.259644883735383], [61.771868117118615, 28.699333807890792], [61.369308709564926, 29.303276272085917], [60.874248488208778, 29.829238999952604], [62.549856805272775, 29.318572496044304], [63.550260858011164, 29.468330796826162], [64.148002150331237, 29.340819200145965], [64.350418735618504, 29.560030625928089], [65.046862013616092, 29.472180691031902], [66.346472609324408, 29.88794342703617], [66.38145755398601, 30.738899237586448], [66.938891229118454, 31.304911200479346], [67.683393589147457, 31.303154201781414], [67.792689243444769, 31.582930406209623], [68.556932000609308, 31.713310044882011], [68.926676873657655, 31.620189113892064], [69.317764113242546, 31.901412258424436], [69.262522007122541, 32.501944078088293], [69.687147251264847, 33.105498969041228], [70.323594191371583, 33.358532619758385], [69.93054324735958, 34.020120144175102], [70.881803012988385, 33.988855902638512], [71.156773309213449, 34.348911444632144], [71.115018751921625, 34.733125718722228], [71.613076206350698, 35.153203436822857], [71.498767938121077, 35.650563259415996], [71.262348260385735, 36.074387518857797], [71.846291945283909, 36.509942328429851], [72.920024855444453, 36.720007025696312], [74.067551710917812, 36.836175645488446], [74.575892775372964, 37.02084137628345], [75.158027785140902, 37.13303091078911]]] } },
-            { "type": "Feature", "properties": { "admin": "Panama", "name": "Panama", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.881571417945239, 7.223771267114783], [-78.214936082660103, 7.512254950384159], [-78.429160732726061, 8.052041123888925], [-78.182095709938608, 8.319182440621772], [-78.43546525746568, 8.387705389840788], [-78.622120530903928, 8.718124497915026], [-79.120307176413732, 8.996092027213022], [-79.557877366845176, 8.932374986197145], [-79.760578172510037, 8.584515082224398], [-80.164481167303322, 8.333315944853593], [-80.382659064439608, 8.29840851484043], [-80.480689256497286, 8.090307522001067], [-80.003689948227148, 7.54752411542337], [-80.276670701808982, 7.419754136581713], [-80.421158006497066, 7.271571966984763], [-80.886400926420791, 7.220541490096535], [-81.059542812814698, 7.817921047390596], [-81.189715745757937, 7.647905585150339], [-81.519514736644666, 7.706610012233908], [-81.721311204744453, 8.108962714058434], [-82.131441209628889, 8.175392767769635], [-82.390934414382542, 8.292362372262287], [-82.820081346350406, 8.290863755725821], [-82.850958014644803, 8.073822740099954], [-82.965783047197348, 8.225027980985983], [-82.9131764391242, 8.423517157419068], [-82.829770677405151, 8.626295477732368], [-82.868657192704759, 8.807266343618521], [-82.719183112300513, 8.925708726431493], [-82.927154914059145, 9.074330145702914], [-82.932890998043561, 9.476812038608172], [-82.546196255203469, 9.566134751824674], [-82.187122565423394, 9.207448635286779], [-82.207586432610952, 8.995575262890098], [-81.808566860669259, 8.95061676679617], [-81.714154018872023, 9.031955471223581], [-81.43928707551153, 8.786234035675715], [-80.947301601876745, 8.858503526235905], [-80.521901211250054, 9.11107208906243], [-79.914599778955974, 9.312765204297618], [-79.573302781884294, 9.611610012241526], [-79.021191779277913, 9.552931423374103], [-79.058450486960353, 9.454565334506523], [-78.500887620747164, 9.420458889193879], [-78.055927700497989, 9.247730414258296], [-77.729513515926399, 8.946844387238867], [-77.353360765273848, 8.670504665558068], [-77.474722866511314, 8.524286200388216], [-77.242566494440069, 7.935278225125442], [-77.431107957656977, 7.638061224798733], [-77.75341386586139, 7.709839789252141], [-77.881571417945239, 7.223771267114783]]] } },
-            { "type": "Feature", "properties": { "admin": "Peru", "name": "Peru", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-69.590423753524036, -17.580011895419329], [-69.858443569605839, -18.092693780187009], [-70.3725723944777, -18.347975355708861], [-71.375250210236914, -17.77379851651385], [-71.462040778271117, -17.363487644116379], [-73.444529588500401, -16.359362888252992], [-75.23788265654143, -15.26568287522778], [-76.009205084929931, -14.649286390850317], [-76.423469204397733, -13.823186944232431], [-76.259241502574156, -13.535039157772939], [-77.10619238962181, -12.222716159720816], [-78.092152879534623, -10.377712497604062], [-79.036953091126918, -8.38656788496589], [-79.445920376284832, -7.930833428583859], [-79.760578172510037, -7.194340915560081], [-80.537481655586049, -6.541667575713715], [-81.249996304026411, -6.136834405139182], [-80.926346808582423, -5.690556735866563], [-81.410942552399433, -4.736764825055459], [-81.099669562489353, -4.036394138203696], [-80.302560594387188, -3.404856459164712], [-80.184014858709645, -3.821161797708043], [-80.46929460317692, -4.059286797708999], [-80.442241990872134, -4.425724379090673], [-80.028908047185581, -4.346090996928893], [-79.62497921417615, -4.454198093283494], [-79.205289069317715, -4.959128513207388], [-78.639897223612323, -4.547784112164072], [-78.450683966775628, -3.873096612161375], [-77.83790483265858, -3.003020521663103], [-76.635394253226707, -2.608677666843817], [-75.544995693652027, -1.56160979574588], [-75.233722703741932, -0.911416924649529], [-75.373223232713841, -0.15203175212045], [-75.106624518520064, -0.05720549886486], [-74.441600511355958, -0.530820000819887], [-74.122395189089048, -1.002832533373848], [-73.659503546834586, -1.260491224781134], [-73.070392218707212, -2.308954359550952], [-72.325786505813639, -2.434218031426453], [-71.774760708285385, -2.169789727388937], [-71.413645799429773, -2.342802422702128], [-70.813475714791949, -2.256864515800742], [-70.047708502874841, -2.725156345229699], [-70.692682054309699, -3.742872002785858], [-70.394043952094975, -3.766591485207825], [-69.893635219996611, -4.298186944194326], [-70.79476884630229, -4.251264743673302], [-70.928843349883564, -4.401591485210367], [-71.748405727816532, -4.59398284263301], [-72.891927659787243, -5.274561455916979], [-72.964507208941185, -5.741251315944892], [-73.219711269814596, -6.089188734566076], [-73.120027431923575, -6.629930922068238], [-73.724486660441627, -6.918595472850638], [-73.723401455363486, -7.340998630404412], [-73.987235480429646, -7.523829847853063], [-73.571059332967053, -8.424446709835832], [-73.015382656532537, -9.03283334720806], [-73.226713426390148, -9.462212823121233], [-72.563033006465631, -9.520193780152715], [-72.184890713169821, -10.05359791426943], [-71.302412278921523, -10.079436130415372], [-70.481893886991159, -9.490118096558842], [-70.548685675728393, -11.009146823778462], [-70.093752204046879, -11.123971856331011], [-69.52967810736493, -10.951734307502193], [-68.665079718689611, -12.561300144097171], [-68.880079515239956, -12.89972909917665], [-68.929223802349526, -13.602683607643007], [-68.94888668483658, -14.45363941819328], [-69.339534674747, -14.953195489158828], [-69.160346645774936, -15.323973890853015], [-69.389764166934697, -15.66012908291165], [-68.959635382753291, -16.500697930571267], [-69.590423753524036, -17.580011895419329]]] } },
-            { "type": "Feature", "properties": { "admin": "Philippines", "name": "Philippines", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[126.376813592637447, 8.414706325713352], [126.478512811387873, 7.750354112168976], [126.537423944200611, 7.189380601424572], [126.19677290253253, 6.274294338400038], [125.831420526229081, 7.293715318221855], [125.363852166852283, 6.78648529706099], [125.683160841983707, 6.049656887227257], [125.396511672060626, 5.581003322772288], [124.219787632342332, 6.16135549562618], [123.938719517106918, 6.88513560630612], [124.243662144061318, 7.360610459823659], [123.610212437027542, 7.833527329942753], [123.29607140512519, 7.418875637232786], [122.825505812675388, 7.457374579290216], [122.085499302255769, 6.899424139834847], [121.919928013192603, 7.192119452336072], [122.312358840017112, 8.034962063016506], [122.94239790251963, 8.316236883981174], [123.487687616063511, 8.693009751821192], [123.841154412939815, 8.240324204944384], [124.6014697612502, 8.514157619659015], [124.764612257995623, 8.960409450715458], [125.471390822451539, 8.986996975129641], [125.412117954612754, 9.760334784377545], [126.222714471543156, 9.28607432701885], [126.306636997585073, 8.782487494334573], [126.376813592637447, 8.414706325713352]]], [[[123.982437778825798, 10.278778591345811], [123.62318322153277, 9.950090643753297], [123.309920688979332, 9.318268744336676], [122.995883009941636, 9.022188625520398], [122.380054966319463, 9.713360907424201], [122.586088901867072, 9.981044826696104], [122.837081333508706, 10.261156927934234], [122.947410516451896, 10.881868394408029], [123.498849725438447, 10.940624497923945], [123.337774285984722, 10.267383938025445], [124.077935825701218, 11.232725531453706], [123.982437778825798, 10.278778591345811]]], [[[118.504580926590336, 9.316382554558087], [117.174274530100675, 8.367499904814663], [117.664477166821371, 9.066888739452933], [118.386913690261736, 9.684499619989223], [118.98734215706105, 10.376292019080507], [119.511496209797528, 11.36966807702721], [119.689676548339889, 10.554291490109872], [119.029458449378978, 10.003653265823869], [118.504580926590336, 9.316382554558087]]], [[[121.883547804859106, 11.891755072471977], [122.483821242361458, 11.582187404827506], [123.120216506035959, 11.583660183147867], [123.100837843926442, 11.165933742716486], [122.637713657726692, 10.741308498574226], [122.002610304859559, 10.441016750526087], [121.967366978036523, 10.905691229694622], [122.038370396005519, 11.415840969280039], [121.883547804859106, 11.891755072471977]]], [[[125.502551711123488, 12.162694606978347], [125.783464797062152, 11.046121934447767], [125.01188398651226, 11.311454576050377], [125.032761265158115, 10.975816148314703], [125.277449172060244, 10.358722032101308], [124.801819289245714, 10.134678859899889], [124.760168084818474, 10.8379951033923], [124.459101190286049, 10.889929917845633], [124.302521600441722, 11.495370998577227], [124.891012811381572, 11.415582587118589], [124.877990350443952, 11.794189968304988], [124.266761509295705, 12.557760931849682], [125.22711632700782, 12.53572093347719], [125.502551711123488, 12.162694606978347]]], [[[121.527393833503481, 13.069590155484516], [121.262190382981544, 12.2055602075644], [120.833896112146533, 12.704496161342416], [120.323436313967477, 13.466413479053866], [121.18012820850214, 13.429697373910439], [121.527393833503481, 13.069590155484516]]], [[[121.321308221523566, 18.504064642811013], [121.937601353036371, 18.21855235439838], [122.246006300954264, 18.478949896717094], [122.336956821787965, 18.224882717354173], [122.174279412933174, 17.810282701076371], [122.51565392465335, 17.09350474697197], [122.252310825693883, 16.262444362854122], [121.662786086108255, 15.931017564350125], [121.505069614753367, 15.124813544164621], [121.728828566577249, 14.328376369682244], [122.258925409027313, 14.218202216035973], [122.701275669445636, 14.336541245984417], [123.950295037940236, 13.782130642141066], [123.855107049658599, 13.237771104378464], [124.181288690284873, 12.997527370653469], [124.077419061378222, 12.536676947474573], [123.298035109552245, 13.027525539598981], [122.928651971529902, 13.552919826710404], [122.671355015148663, 13.185836289925131], [122.034649692880521, 13.784481919810343], [121.126384718918587, 13.636687323455559], [120.628637323083296, 13.857655747935649], [120.679383579593832, 14.271015529838319], [120.99181928923052, 14.525392767795079], [120.693336216312687, 14.756670640517282], [120.564145135582976, 14.396279201713821], [120.070428501466367, 14.970869452367094], [119.920928582846102, 15.406346747290735], [119.883773228028247, 16.363704331929963], [120.286487664878791, 16.034628811095327], [120.39004723519173, 17.599081122299506], [120.7158671407919, 18.505227362537536], [121.321308221523566, 18.504064642811013]]]] } },
-            { "type": "Feature", "properties": { "admin": "Papua New Guinea", "name": "Papua New Guinea", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[155.880025669578401, -6.819996840037758], [155.599991082988765, -6.919990736522491], [155.166994256815087, -6.535931491729299], [154.729191522438327, -5.900828138862208], [154.514114211239644, -5.139117526880012], [154.652503696917336, -5.042430922061839], [154.759990676084357, -5.339983819198493], [155.062917922179338, -5.566791680527486], [155.547746209941693, -6.200654799019658], [156.019965448224752, -6.540013929880386], [155.880025669578401, -6.819996840037758]]], [[[151.982795851854462, -5.478063246282344], [151.459106887008659, -5.560280450058739], [151.301390415653884, -5.840728448106701], [150.754447056276661, -6.083762709175387], [150.241196730753813, -6.317753594592984], [149.709963006793316, -6.316513360218051], [148.890064732050462, -6.026040134305432], [148.318936802360696, -5.74714242922613], [148.401825799756864, -5.437755629094722], [149.298411900020824, -5.583741550319216], [149.845561965127217, -5.505503431829339], [149.996250441690279, -5.026101169457674], [150.139755894164921, -5.001348158389788], [150.236907586873485, -5.53222014732428], [150.807467075808063, -5.455842380396886], [151.089672072553981, -5.113692722192368], [151.647880894170811, -4.757073662946168], [151.537861769821518, -4.167807305521889], [152.136791620084352, -4.148790378438519], [152.338743117480988, -4.31296640382976], [152.318692661751754, -4.867661228050748], [151.982795851854462, -5.478063246282344]]], [[[147.191873814074938, -7.388024183789978], [148.084635858349372, -8.044108168167609], [148.734105259393573, -9.104663588093755], [149.306835158484432, -9.071435642130067], [149.266630894161324, -9.514406019736027], [150.038728469034311, -9.684318129111698], [149.738798456012262, -9.872937106977002], [150.801627638959133, -10.29368661869742], [150.690574985963849, -10.582712904505865], [150.028393182575826, -10.652476088099929], [149.782310012001972, -10.393267103723941], [148.923137648717216, -10.28092253992136], [147.913018426707993, -10.130440769087469], [147.135443150012236, -9.492443536012017], [146.567880894150619, -8.942554619994153], [146.048481073184917, -8.067414239131308], [144.74416792213799, -7.630128269077473], [143.897087844009661, -7.915330498896279], [143.286375767184268, -8.245491224809056], [143.413913202080664, -8.983068942910945], [142.628431431244223, -9.326820570516501], [142.068258905200196, -9.159595635620034], [141.033851760013874, -9.117892754760417], [141.017056919519007, -5.85902190513802], [141.000210402591847, -2.600151055515624], [142.735246616791443, -3.289152927263216], [144.583970982033236, -3.861417738463401], [145.27317955950997, -4.373737888205027], [145.829786411725649, -4.876497897972683], [145.981921828392956, -5.465609226100012], [147.648073358347574, -6.083659356310803], [147.891107619416175, -6.614014580922315], [146.970905389594861, -6.721656589386255], [147.191873814074938, -7.388024183789978]]], [[[153.14003787659874, -4.499983412294113], [152.827292108368255, -4.766427097190998], [152.63867313050298, -4.176127211120927], [152.406025832324929, -3.789742526874561], [151.953236932583536, -3.462062269711821], [151.384279413050024, -3.035421644710111], [150.6620495953388, -2.741486097833956], [150.939965448204532, -2.500002129734028], [151.479984165654514, -2.779985039891386], [151.820015090135087, -2.999971612157907], [152.239989455371074, -3.24000864015366], [152.640016717742526, -3.659983005389647], [153.019993524384631, -3.980015150573293], [153.14003787659874, -4.499983412294113]]]] } },
-            { "type": "Feature", "properties": { "admin": "Poland", "name": "Poland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[15.016995883858666, 51.106674099321566], [14.607098422919531, 51.745188096719964], [14.685026482815685, 52.089947414755187], [14.437599725002197, 52.624850165408382], [14.074521111719488, 52.981262518925426], [14.353315463934136, 53.248171291712957], [14.119686313542584, 53.757029120491026], [14.802900424873455, 54.050706285205735], [16.363477003655728, 54.513158677785711], [17.622831658608671, 54.851535956432897], [18.620858595461637, 54.682605699270766], [18.696254510175461, 54.438718777069276], [19.6606400896064, 54.426083889373913], [20.89224450041862, 54.312524929412518], [22.731098667092649, 54.327536932993311], [23.243987257589506, 54.220566718149129], [23.484127638449841, 53.912497667041123], [23.527535841574995, 53.47012156840654], [23.804934930117774, 53.08973135030606], [23.799198846133375, 52.691099351606553], [23.19949384938618, 52.486977444053664], [23.508002150168689, 52.023646552124717], [23.52707075368437, 51.578454087930233], [24.029985792748899, 50.705406602575174], [23.922757195743259, 50.424881089878738], [23.426508416444388, 50.308505764357449], [22.518450148211596, 49.476773586619736], [22.776418898212619, 49.027395331409608], [22.558137648211751, 49.08573802346713], [21.607808058364206, 49.470107326854077], [20.887955356538406, 49.328772284535823], [20.415839471119849, 49.431453355499755], [19.825022820726865, 49.217125352569219], [19.320712517990469, 49.571574001659179], [18.909574822676316, 49.435845852244562], [18.85314415861361, 49.496229763377634], [18.392913852622168, 49.988628648470737], [17.649445021238986, 50.049038397819942], [17.554567091551117, 50.36214590107641], [16.868769158605655, 50.473973700556016], [16.719475945714429, 50.215746568393527], [16.176253289462263, 50.4226073268579], [16.238626743238566, 50.697732652379827], [15.490972120839725, 50.7847299261432], [15.016995883858666, 51.106674099321566]]] } },
-            { "type": "Feature", "properties": { "admin": "Puerto Rico", "name": "Puerto Rico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-66.2824344550082, 18.51476166429536], [-65.771302863209286, 18.426679185453875], [-65.591003790942935, 18.228034979723912], [-65.847163865813755, 17.975905666571855], [-66.599934455009475, 17.98182261806927], [-67.184162360285256, 17.946553453030074], [-67.24242753769434, 18.374460150622934], [-67.100679083917726, 18.520601101144347], [-66.2824344550082, 18.51476166429536]]] } },
-            { "type": "Feature", "properties": { "admin": "North Korea", "name": "Dem. Rep. Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[130.640015903852401, 42.39500946712527], [130.780007358931101, 42.220007229168843], [130.400030552288996, 42.280003567059701], [129.965948521037234, 41.941367906251052], [129.667362095254788, 41.601104437825221], [129.705189243692445, 40.882827867184318], [129.188114862179958, 40.661807766271984], [129.010399611528186, 40.485436102859801], [128.633368361526692, 40.189846910150301], [127.967414178581322, 40.025412502597547], [127.533435500194145, 39.756850083976694], [127.502119582225276, 39.323930772451526], [127.385434198110261, 39.213472398427648], [127.783342726757709, 39.050898342437414], [128.349716424676586, 38.612242946927843], [128.205745884311426, 38.370397243801882], [127.780035435090966, 38.304535630845884], [127.073308547067342, 38.256114813788393], [126.683719924018888, 37.804772854151174], [126.237338901881742, 37.840377916000271], [126.174758742376213, 37.749685777328033], [125.689103631697165, 37.940010077459014], [125.568439162295675, 37.752088731429616], [125.275330438336184, 37.66907054295271], [125.24008711151312, 37.857224432927424], [124.981033156433952, 37.948820909164773], [124.712160679219352, 38.108346055649783], [124.985994093933954, 38.548474229479673], [125.221948683778677, 38.665857245430665], [125.13285851450749, 38.848559271798578], [125.386589797060566, 39.387957872061158], [125.321115757346774, 39.551384589184202], [124.737482131042384, 39.660344346671614], [124.265624627785286, 39.928493353834149], [125.079941847840615, 40.569823716792442], [126.182045119329402, 41.107336127276362], [126.86908328664984, 41.816569322266176], [127.343782993682993, 41.50315176041596], [128.208433058790632, 41.466771552082477], [128.052215203972281, 41.994284572917934], [129.59666873587949, 42.424981797854542], [129.994267205933198, 42.985386867843779], [130.640015903852401, 42.39500946712527]]] } },
-            { "type": "Feature", "properties": { "admin": "Portugal", "name": "Portugal", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.671945766626719, 42.134689439454952], [-8.26385698081779, 42.280468654950326], [-8.01317460776991, 41.790886135417118], [-7.422512986673794, 41.792074693359822], [-7.251308966490822, 41.91834605566504], [-6.668605515967655, 41.883386949219577], [-6.389087693700914, 41.381815497394641], [-6.851126674822551, 41.111082668617513], [-6.864019944679383, 40.330871893874821], [-7.026413133156593, 40.184524237624238], [-7.066591559263527, 39.711891587882768], [-7.498632371439724, 39.629571031241802], [-7.098036668313126, 39.03007274022378], [-7.374092169616317, 38.373058580064914], [-7.029281175148794, 38.075764065089757], [-7.166507941099863, 37.803894354802217], [-7.537105475281022, 37.428904323876232], [-7.45372555177809, 37.097787583966053], [-7.855613165711985, 36.838268540996253], [-8.382816127953687, 36.978880113262449], [-8.898856980820325, 36.868809312480771], [-8.746101446965552, 37.6513455266766], [-8.839997524439879, 38.266243394517609], [-9.287463751655221, 38.358485826158592], [-9.526570603869713, 38.737429104154906], [-9.44698889814023, 39.392066148428363], [-9.048305223008425, 39.755093085278766], [-8.977353481471679, 40.159306138665798], [-8.7686840478771, 40.76063894303018], [-8.790853237330309, 41.18433401139125], [-8.990789353867568, 41.543459377603625], [-9.034817674180244, 41.880570583659669]]] } },
-            { "type": "Feature", "properties": { "admin": "Paraguay", "name": "Paraguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.685057135657871, -22.24902922942238], [-62.291179368729203, -21.051634616787389], [-62.265961269770784, -20.513734633061272], [-61.786326463453761, -19.633736667562957], [-60.043564622626477, -19.342746677327419], [-59.11504248720609, -19.356906019775398], [-58.183471442280492, -19.868399346600359], [-58.166392381408038, -20.176700941653674], [-57.870673997617786, -20.732687676681948], [-57.937155727761287, -22.090175876557169], [-56.881509568902885, -22.282153822521476], [-56.473317430229379, -22.086300144135279], [-55.797958136606894, -22.356929620047815], [-55.61068274598113, -22.655619398694839], [-55.517639329639621, -23.57199757252663], [-55.400747239795407, -23.956935316668797], [-55.027901780809543, -24.001273695575225], [-54.652834235235119, -23.839578138933955], [-54.292959560754511, -24.021014092710722], [-54.293476325077435, -24.570799655863958], [-54.428946092330577, -25.162184747012162], [-54.625290696823562, -25.739255466415507], [-54.788794928595038, -26.621785577096126], [-55.695845506398143, -27.387837009390857], [-56.486701626192989, -27.548499037386286], [-57.609759690976134, -27.395898532828383], [-58.618173590719735, -27.123718763947089], [-57.633660040911117, -25.603656508081638], [-57.777217169817924, -25.162339776309032], [-58.807128465394968, -24.771459242453307], [-60.028966030504016, -24.032796319273267], [-60.846564704009907, -23.880712579038288], [-62.685057135657871, -22.24902922942238]]] } },
-            { "type": "Feature", "properties": { "admin": "Palestine", "name": "Palestine", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.545251906076196, 31.782504787720832], [35.397560662586038, 31.489086005167572], [34.927408481594554, 31.35343537040141], [34.970506626125989, 31.616778469360803], [35.225891554512422, 31.754341132121759], [34.974640740709319, 31.866582343059715], [35.183930291491428, 32.532510687788935], [35.545665317534535, 32.393992011030569]]] } },
-            { "type": "Feature", "properties": { "admin": "Qatar", "name": "Qatar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[50.810108270069563, 24.754742539971371], [50.743910760303677, 25.482424221289389], [51.01335167827348, 26.006991685484191], [51.286461622936045, 26.114582017515865], [51.589078810437243, 25.801112779233375], [51.606700473848804, 25.215670477798735], [51.389607781790623, 24.627385972588051], [51.112415398977006, 24.556330878186721], [50.810108270069563, 24.754742539971371]]] } },
-            { "type": "Feature", "properties": { "admin": "Romania", "name": "Romania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.710531447040488, 47.882193915389394], [23.142236362406798, 48.096341050806942], [23.760958286237404, 47.985598456405448], [24.402056105250374, 47.981877753280422], [24.866317172960571, 47.737525743188307], [25.207743361112986, 47.891056423527459], [25.945941196402394, 47.987148749374207], [26.197450392366925, 48.220881252630342], [26.619336785597788, 48.220726223333457], [26.924176059687561, 48.123264472030982], [27.233872918412736, 47.826770941756365], [27.551166212684841, 47.405117092470817], [28.128030226359037, 46.81047638608824], [28.160017937947707, 46.371562608417207], [28.054442986775392, 45.944586086605618], [28.233553501099035, 45.488283189468369], [28.679779493939371, 45.30403087013169], [29.149724969201646, 45.464925442072442], [29.603289015427425, 45.293308010431119], [29.62654340995876, 45.035390936862392], [29.141611769331831, 44.820210272799038], [28.837857700320196, 44.913873806328041], [28.55808149589199, 43.707461656258118], [27.970107049275068, 43.812468166675202], [27.242399529740904, 44.175986029632398], [26.065158725699739, 43.943493760751259], [25.569271681426923, 43.688444729174712], [24.100679152124169, 43.741051337247846], [23.332302280376322, 43.897010809904707], [22.94483239105184, 43.823785305347123], [22.657149692482985, 44.234923000661276], [22.474008416440594, 44.409227606781762], [22.705725538837349, 44.578002834647016], [22.459022251075933, 44.702517198254291], [22.145087924902807, 44.478422349620573], [21.562022739353605, 44.768947251965486], [21.483526238702233, 45.181170152357772], [20.874312778413351, 45.416375433934228], [20.76217492033998, 45.734573065771428], [20.220192498462833, 46.127468980486547], [21.021952345471245, 46.316087958351886], [21.626514926853869, 46.994237779318148], [22.09976769378283, 47.672439276716695], [22.710531447040488, 47.882193915389394]]] } },
-            { "type": "Feature", "properties": { "admin": "Russia", "name": "Russia", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[143.648007440362846, 50.747600409541512], [144.65414757708561, 48.976390692737581], [143.173927850517174, 49.306551418650365], [142.558668247650076, 47.861575018904908], [143.533492466404027, 46.836728013692479], [143.505277134372591, 46.137907619809475], [142.747700636973889, 46.740764878926562], [142.092030064054484, 45.966755276058777], [141.906925083585008, 46.805928860046535], [142.018442824470867, 47.780132961612921], [141.904444614835029, 48.859188544299563], [142.135800002205656, 49.615163072297449], [142.179983351815281, 50.952342434281903], [141.594075962490024, 51.935434882202529], [141.682546014573632, 53.301966457728767], [142.606934035410745, 53.762145087287891], [142.209748976815376, 54.225475979216853], [142.654786411712934, 54.365880845753864], [142.914615513276544, 53.704577541714734], [143.260847609632037, 52.740760403039033], [143.235267775647628, 51.756660264688733], [143.648007440362846, 50.747600409541512]]], [[[22.731098667092649, 54.327536932993311], [20.892244500418652, 54.312524929412568], [19.6606400896064, 54.42608388937397], [19.88848147958134, 54.866160386771483], [21.268448927503492, 55.190481675835279], [22.315723504330599, 55.015298570365886], [22.757763706155281, 54.856574408581416], [22.651051873472564, 54.582740993866693], [22.731098667092649, 54.327536932993311]]], [[[180.000000000000114, 70.832199208546669], [178.903425, 70.78114], [178.7253, 71.0988], [180.000000000000114, 71.515714336428246], [180.000000000000114, 70.832199208546669]]], [[[143.60385, 73.21244], [142.08763, 73.20544], [140.038155, 73.31692], [139.86312, 73.36983], [140.81171, 73.76506], [142.06207, 73.85758], [143.48283, 73.47525], [143.60385, 73.21244]]], [[[150.73167, 75.08406], [149.575925, 74.68892], [147.977465, 74.778355], [146.11919, 75.17298], [146.358485, 75.49682], [148.22223, 75.345845], [150.73167, 75.08406]]], [[[145.086285, 75.562625], [144.3, 74.82], [140.61381, 74.84768], [138.95544, 74.61148], [136.97439, 75.26167], [137.51176, 75.94917], [138.831075, 76.13676], [141.471615, 76.09289], [145.086285, 75.562625]]], [[[57.535692579992386, 70.720463975702145], [56.944979282463933, 70.63274323188665], [53.677375115784187, 70.762657782668455], [53.412016635965372, 71.206661688920192], [51.601894565645708, 71.474759019650477], [51.455753615124209, 72.014881089965129], [52.478275180883564, 72.229441636840946], [52.444168735570841, 72.77473135038484], [54.427613559797649, 73.627547512497571], [53.508289829325136, 73.749813951300141], [55.902458937407644, 74.627486477345329], [55.631932814359701, 75.081412258597155], [57.868643833248839, 75.609390367323186], [61.170044386647497, 76.251883450008123], [64.498368361270209, 76.439055487769267], [66.210977003855092, 76.809782213031227], [68.157059767534818, 76.939696763812904], [68.852211134725124, 76.544811306454605], [68.180572544227644, 76.233641669409096], [64.637326287703004, 75.737754625136219], [61.583507521414752, 75.260884507946784], [58.477082147053366, 74.309056301562819], [56.986785516187993, 73.333043524866227], [55.41933597191094, 72.371267605265956], [55.622837762276291, 71.540594794390316], [57.535692579992386, 70.720463975702145]]], [[[106.970130000000111, 76.97419], [107.240000000000123, 76.48], [108.1538, 76.723350000000138], [111.077260000000138, 76.71], [113.33151, 76.22224], [114.13417, 75.84764], [113.88539, 75.327790000000121], [112.77918, 75.03186], [110.151250000000175, 74.47673], [109.4, 74.18], [110.64, 74.04], [112.11919, 73.787740000000113], [113.019540000000234, 73.976930000000138], [113.529580000000294, 73.33505], [113.96881, 73.59488], [115.56782, 73.75285], [118.776330000000215, 73.58772], [119.02, 73.12], [123.20066, 72.97122], [123.257770000000178, 73.73503], [125.380000000000166, 73.56], [126.97644, 73.56549], [128.59126, 73.03871], [129.05157, 72.39872], [128.46, 71.98], [129.715990000000204, 71.19304], [131.288580000000252, 70.786990000000102], [132.253500000000145, 71.8363], [133.857660000000294, 71.386420000000143], [135.56193, 71.655250000000123], [137.49755, 71.34763], [138.234090000000123, 71.62803], [139.86983, 71.487830000000116], [139.14791, 72.4161900000001], [140.46817, 72.849410000000134], [149.5, 72.2], [150.35118000000017, 71.60643], [152.96890000000019, 70.84222], [157.00688, 71.03141], [158.99779, 70.86672], [159.830310000000225, 70.45324], [159.70866, 69.72198], [160.94053000000028, 69.43728], [162.279070000000104, 69.64204], [164.05248, 69.66823], [165.940370000000172, 69.47199], [167.83567, 69.58269], [169.57763000000017, 68.6938], [170.816880000000253, 69.01363], [170.008200000000159, 69.65276], [170.453450000000259, 70.09703], [173.643910000000204, 69.81743], [175.72403000000017, 69.877250000000217], [178.6, 69.4], [180.000000000000114, 68.963636363636553], [180.000000000000114, 64.979708702198465], [179.99281, 64.97433], [178.707200000000199, 64.53493], [177.411280000000147, 64.60821], [178.313000000000187, 64.07593], [178.90825000000018, 63.251970000000128], [179.37034, 62.98262], [179.48636, 62.56894], [179.228250000000116, 62.304100000000133], [177.3643, 62.5219], [174.569290000000194, 61.76915], [173.68013, 61.65261], [172.15, 60.95], [170.6985, 60.33618], [170.330850000000282, 59.88177], [168.90046, 60.57355], [166.294980000000265, 59.7885500000002], [165.840000000000202, 60.16], [164.87674, 59.7316], [163.539290000000108, 59.86871], [163.217110000000218, 59.21101], [162.01733, 58.24328], [162.05297, 57.83912], [163.19191, 57.61503], [163.057940000000144, 56.159240000000111], [162.129580000000203, 56.12219], [161.70146, 55.285680000000148], [162.117490000000117, 54.85514], [160.368770000000325, 54.34433], [160.021730000000218, 53.20257], [158.530940000000157, 52.958680000000236], [158.23118, 51.94269], [156.789790000000266, 51.01105], [156.42000000000013, 51.7], [155.99182, 53.15895], [155.43366, 55.381030000000109], [155.914420000000291, 56.767920000000132], [156.75815, 57.3647], [156.81035, 57.83204], [158.364330000000166, 58.05575], [160.150640000000124, 59.314770000000109], [161.87204, 60.343000000000117], [163.66969, 61.1409], [164.473550000000103, 62.55061], [163.258420000000172, 62.46627], [162.65791, 61.6425], [160.12148, 60.54423], [159.30232, 61.77396], [156.72068, 61.43442], [154.218060000000293, 59.758180000000117], [155.04375, 59.14495], [152.81185, 58.88385], [151.265730000000246, 58.78089], [151.33815, 59.50396], [149.78371, 59.655730000000126], [148.54481, 59.16448], [145.48722, 59.33637], [142.197820000000121, 59.03998], [138.958480000000293, 57.08805], [135.12619, 54.72959], [136.70171, 54.603550000000112], [137.19342, 53.97732], [138.1647, 53.755010000000247], [138.80463, 54.25455], [139.90151, 54.189680000000166], [141.34531, 53.089570000000109], [141.37923, 52.23877], [140.59742000000017, 51.23967], [140.51308, 50.045530000000113], [140.061930000000189, 48.446710000000152], [138.554720000000202, 46.99965], [138.21971, 46.30795], [136.86232, 45.143500000000174], [135.515350000000183, 43.989], [134.869390000000237, 43.39821], [133.536870000000249, 42.81147], [132.90627, 42.79849], [132.278070000000241, 43.284560000000106], [130.935870000000136, 42.55274], [130.78, 42.220000000000191], [130.640000000000157, 42.395], [130.633866408409801, 42.903014634770543], [131.144687941614961, 42.929989732426932], [131.288555129115593, 44.111519680348252], [131.025190000000237, 44.96796], [131.883454217659562, 45.321161607436508], [133.097120000000189, 45.14409], [133.769643996313164, 46.116926988299149], [134.112350000000163, 47.212480000000127], [134.50081, 47.578450000000139], [135.026311476786759, 48.478229885443902], [133.373595819228001, 48.183441677434836], [132.506690000000106, 47.78896], [130.987260000000106, 47.79013], [130.582293328982644, 48.72968740497619], [129.397817824420486, 49.4406000840156], [127.657400000000351, 49.76027], [127.287455682484904, 50.739797268265434], [126.939156528837827, 51.353894151405896], [126.564399041856959, 51.784255479532689], [125.946348911646439, 52.792798570356936], [125.068211297710434, 53.161044826868924], [123.57147, 53.4588], [122.245747918793043, 53.431725979213681], [121.003084751470354, 53.251401068731226], [120.177088657716865, 52.753886216841195], [120.725789015791975, 52.516226304730893], [120.7382, 51.96411], [120.182080000000155, 51.64355], [119.27939, 50.58292], [119.288460728025839, 50.142882798861947], [117.87924441942647, 49.510983384797036], [116.67880089728618, 49.888531399121398], [115.485695428531415, 49.805177313834733], [114.962109816550353, 50.140247300815119], [114.362456496235325, 50.24830272073747], [112.897739699354361, 49.543565375356984], [111.581230910286649, 49.377968248077671], [110.662010532678835, 49.130128078805846], [109.402449171996707, 49.292960516957685], [108.475167270951275, 49.282547715850704], [107.868175897251092, 49.793705145865871], [106.888804152455293, 50.274295966180276], [105.886591424586868, 50.40601919209216], [104.62158, 50.275320000000157], [103.676545444760336, 50.08996613219513], [102.25589, 50.510560000000105], [102.06521, 51.25991], [100.889480421962631, 51.516855780638409], [99.981732212323564, 51.63400625264395], [98.861490513100492, 52.047366034546698], [97.82573978067451, 51.010995184933236], [98.231761509191699, 50.422400621128716], [97.259760000000199, 49.72605], [95.814020000000156, 49.977460000000114], [94.815949334698757, 50.01343333597088], [94.147566359435601, 50.480536607457161], [93.10421, 50.49529], [92.234711541719676, 50.802170722041737], [90.713667433640765, 50.331811835321098], [88.805566847695573, 49.470520738312459], [87.751264276076824, 49.297197984405543], [87.359970330762692, 49.214980780629148], [86.829356723989648, 49.826674709668133], [85.541269972682485, 49.69285858824815], [85.115559523462082, 50.117302964877631], [84.416377394553038, 50.311399644565817], [83.935114780618903, 50.889245510453563], [83.383003778012451, 51.069182847693881], [81.945985548839943, 50.812195949906325], [80.568446893235446, 51.388336493528435], [80.035559523441705, 50.864750881547209], [77.80091556184432, 53.404414984747532], [76.525179477854749, 54.177003485727127], [76.891100294913443, 54.490524400441913], [74.384820000000119, 53.546850000000113], [73.425678745420512, 53.489810289109741], [73.50851606638436, 54.035616766976588], [72.224150018202195, 54.376655381886778], [71.180131056609468, 54.133285224008247], [70.86526655465515, 55.169733588270091], [69.068166945272893, 55.385250149143488], [68.169100376258896, 54.970391750704366], [65.66687, 54.601250000000149], [65.178533563095939, 54.354227810272064], [61.436600000000126, 54.00625], [60.978066440683236, 53.664993394579128], [61.69998619980062, 52.979996446334255], [60.73999311711453, 52.719986477257734], [60.927268507740237, 52.447548326214999], [59.967533807215567, 51.96042043721566], [61.588003371024136, 51.272658799843171], [61.337424350840998, 50.799070136104248], [59.932807244715555, 50.842194118851822], [59.642282342370564, 50.545442206415707], [58.363320000000122, 51.06364], [56.77798, 51.04355], [55.71694, 50.621710000000142], [54.532878452376181, 51.026239732459359], [52.328723585831042, 51.718652248738088], [50.766648390512174, 51.692762356159861], [48.702381626181044, 50.605128485712825], [48.577841424357601, 49.87475962991563], [47.549480421749379, 50.454698391311119], [46.751596307162764, 49.356005764353725], [47.043671502476585, 49.152038886097571], [46.466445753776291, 48.394152330104923], [47.315240000000152, 47.71585], [48.05725, 47.74377], [48.694733514201872, 47.075628160177885], [48.59325000000014, 46.56104], [49.101160000000121, 46.39933], [48.645410000000105, 45.80629], [47.67591, 45.641490000000111], [46.68201, 44.6092], [47.59094, 43.660160000000118], [47.49252, 42.98658], [48.58437000000017, 41.80888], [47.987283156126033, 41.405819200194387], [47.815665724484653, 41.151416124021338], [47.373315464066387, 41.219732367511135], [46.686070591016708, 41.827137152669899], [46.404950799348924, 41.860675157227426], [45.7764, 42.092440000000224], [45.470279168485909, 42.502780666670041], [44.537622918482057, 42.711992702803677], [43.93121, 42.554960000000101], [43.755990000000182, 42.74083], [42.394400000000154, 43.2203], [40.922190000000128, 43.382150000000131], [40.076964959479838, 43.553104153002486], [39.95500857927108, 43.434997666999287], [38.68, 44.28], [37.539120000000104, 44.65721], [36.675460000000122, 45.24469], [37.40317, 45.40451], [38.23295, 46.24087], [37.67372, 46.63657], [39.14767, 47.044750000000128], [39.121200000000123, 47.26336], [38.22353803889947, 47.102189846375971], [38.2551123390298, 47.546400458356956], [38.77057, 47.825620000000228], [39.738277622238982, 47.898937079452068], [39.895620000000136, 48.23241], [39.67465, 48.783820000000127], [40.080789015469477, 49.307429917999364], [40.069040000000108, 49.60105], [38.594988234213552, 49.926461900423718], [38.010631137857068, 49.915661526074715], [37.393459506995228, 50.383953355503664], [36.626167840325387, 50.225590928745127], [35.35611616388811, 50.577197374059139], [35.37791, 50.77394], [35.02218305841793, 51.207572333371495], [34.224815708154402, 51.255993150428921], [34.141978387190612, 51.56641347920619], [34.391730584457228, 51.768881740925892], [33.75269982273587, 52.335074571331646], [32.715760532367163, 52.238465481162159], [32.412058139787767, 52.288694973349763], [32.15944000000021, 52.061250000000101], [31.78597, 52.10168], [31.540018344862254, 52.742052313846429], [31.305200636527978, 53.073995876673301], [31.49764, 53.167430000000124], [32.304519484188368, 53.132726141972839], [32.693643019346119, 53.351420803432141], [32.405598585751157, 53.618045355842], [31.731272820774585, 53.794029446012011], [31.791424187962399, 53.974638576872181], [31.384472283663818, 54.157056382862365], [30.757533807098774, 54.811770941784388], [30.971835971813245, 55.08154775656412], [30.873909132620064, 55.55097646750351], [29.896294386522435, 55.789463202530484], [29.371571893030783, 55.670090643936263], [29.229513380660389, 55.918344224666399], [28.176709425577933, 56.169129950578778], [27.855282016722519, 56.759326483784363], [27.770015903440985, 57.244258124411189], [27.288184848751648, 57.474528306703903], [27.716685825315771, 57.791899115624439], [27.420150000000202, 58.724570000000128], [28.131699253051856, 59.300825100330982], [27.98112, 59.47537], [29.1177, 60.028050000000107], [28.07, 60.503520000000137], [30.211107212044645, 61.780027777749673], [31.139991082491029, 62.357692776124431], [31.516092156711263, 62.867687486412898], [30.035872430142796, 63.552813625738551], [30.444684686003736, 64.204453436939062], [29.544429559047014, 64.948671576590542], [30.21765, 65.80598], [29.054588657352376, 66.944286200622017], [29.977426385220689, 67.69829702419274], [28.445943637818765, 68.364612942163987], [28.591929559043358, 69.064776923286686], [29.39955, 69.15692000000017], [31.101080000000103, 69.55811], [32.132720000000255, 69.905950000000232], [33.77547, 69.301420000000107], [36.51396, 69.06342], [40.292340000000159, 67.9324], [41.059870000000124, 67.457130000000106], [41.125950000000174, 66.79158000000011], [40.01583, 66.266180000000119], [38.38295, 65.99953], [33.918710000000168, 66.75961], [33.18444, 66.63253], [34.81477, 65.900150000000124], [34.87857425307876, 65.436212877048192], [34.943910000000152, 64.414370000000147], [36.23129, 64.10945], [37.012730000000111, 63.84983], [37.141970000000143, 64.33471], [36.539579035089801, 64.76446], [37.176040000000135, 65.143220000000113], [39.59345, 64.520790000000162], [40.4356, 64.76446], [39.762600000000148, 65.49682], [42.09309, 66.47623], [43.01604000000011, 66.41858], [43.94975000000013, 66.06908], [44.53226, 66.756340000000122], [43.69839, 67.35245], [44.187950000000136, 67.95051], [43.45282, 68.57079], [46.250000000000135, 68.25], [46.821340000000156, 67.68997], [45.55517, 67.56652], [45.56202, 67.010050000000192], [46.349150000000137, 66.66767], [47.894160000000248, 66.884550000000146], [48.13876, 67.52238], [50.227660000000142, 67.998670000000132], [53.717430000000164, 68.85738], [54.47171, 68.80815], [53.485820000000118, 68.20131], [54.72628, 68.09702], [55.442680000000124, 68.43866], [57.317020000000149, 68.46628], [58.802000000000206, 68.88082], [59.941420000000178, 68.27844], [61.077840000000165, 68.94069], [60.03, 69.52], [60.55, 69.85], [63.504000000000147, 69.54739], [64.888115, 69.234835000000132], [68.512160000000108, 68.09233000000016], [69.18068, 68.61563000000011], [68.16444, 69.14436], [68.13522, 69.35649], [66.930080000000103, 69.454610000000102], [67.25976, 69.92873], [66.724920000000125, 70.708890000000125], [66.69466, 71.028970000000228], [68.540060000000111, 71.934500000000227], [69.19636, 72.843360000000146], [69.94, 73.04000000000012], [72.58754, 72.77629], [72.79603, 72.22006], [71.84811, 71.40898], [72.47011, 71.09019], [72.79188, 70.39114], [72.564700000000201, 69.02085], [73.66787, 68.4079], [73.2387, 67.7404], [71.280000000000101, 66.320000000000149], [72.423010000000147, 66.172670000000167], [72.82077, 66.53267], [73.920990000000131, 66.789460000000119], [74.186510000000183, 67.28429], [75.052, 67.760470000000154], [74.469260000000148, 68.32899], [74.93584, 68.98918], [73.84236, 69.07146], [73.601870000000204, 69.62763], [74.3998, 70.63175], [73.1011, 71.447170000000241], [74.890820000000204, 72.12119], [74.65926, 72.83227], [75.158010000000175, 72.854970000000108], [75.68351, 72.300560000000118], [75.288980000000109, 71.33556], [76.35911, 71.152870000000135], [75.903130000000161, 71.87401], [77.5766500000001, 72.26717], [79.652020000000107, 72.32011], [81.5, 71.75], [80.61071, 72.582850000000107], [80.51109, 73.6482], [82.25, 73.85], [84.65526, 73.805910000000154], [86.822300000000226, 73.93688], [86.00956, 74.459670000000145], [87.166820000000143, 75.11643], [88.31571, 75.14393], [90.26, 75.64], [92.90058, 75.77333], [93.234210000000132, 76.0472], [95.860000000000127, 76.14], [96.67821, 75.91548], [98.922540000000197, 76.44689], [100.759670000000199, 76.43028], [101.03532, 76.86189], [101.990840000000105, 77.287540000000192], [104.3516, 77.69792], [106.066640000000135, 77.37389], [104.705000000000211, 77.1274], [106.970130000000111, 76.97419]]], [[[105.07547, 78.30689], [99.43814, 77.921], [101.2649, 79.23399], [102.08635, 79.34641], [102.837815, 79.28129], [105.37243, 78.71334], [105.07547, 78.30689]]], [[[51.136186557831266, 80.54728017854093], [49.793684523320692, 80.415427761548202], [48.894411248577526, 80.33956675894369], [48.75493655782175, 80.175468248200829], [47.586119012244147, 80.010181179515328], [46.502825962109647, 80.247246812654339], [47.072455275262897, 80.559424140129451], [44.846958042181107, 80.589809882317169], [46.799138624871226, 80.771917629713627], [48.31847741068465, 80.784009914869927], [48.52280602396668, 80.514568996900138], [49.097189568890897, 80.753985907708412], [50.039767693894603, 80.918885403151791], [51.522932977103679, 80.699725653801906], [51.136186557831266, 80.54728017854093]]], [[[99.93976, 78.88094], [97.75794, 78.7562], [94.97259, 79.044745], [93.31288, 79.4265], [92.5454, 80.14379], [91.18107, 80.34146], [93.77766, 81.0246], [95.940895, 81.2504], [97.88385, 80.746975], [100.186655, 79.780135], [99.93976, 78.88094]]]] } },
-            { "type": "Feature", "properties": { "admin": "Rwanda", "name": "Rwanda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.419104852019235, -1.134659112150416], [30.816134881317705, -1.698914076345388], [30.758308953583104, -2.287250257988368], [30.469696079232978, -2.413857517103458], [29.938359002407935, -2.348486830254238], [29.632176141078585, -2.917857761246096], [29.02492638521678, -2.839257907730157], [29.117478875451546, -2.292211195488384], [29.254834832483336, -2.215109958508911], [29.29188683443661, -1.620055840667987], [29.579466180140876, -1.341313164885626], [29.821518588996003, -1.443322442229785], [30.419104852019235, -1.134659112150416]]] } },
-            { "type": "Feature", "properties": { "admin": "Western Sahara", "name": "W. Sahara", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.794883999049075, 27.120696316022503], [-8.81782833498667, 27.656425889592349], [-8.665589565454805, 27.656425889592349], [-8.66512447756419, 27.58947907155822], [-8.684399786809051, 27.395744126895998], [-8.687293667017398, 25.881056219988899], [-11.969418911171159, 25.933352769468261], [-11.93722449385332, 23.374594224536164], [-12.874221564169574, 23.284832261645171], [-13.118754441774708, 22.771220201096249], [-12.929101935263528, 21.327070624267559], [-16.845193650773989, 21.333323472574875], [-17.063423224342568, 20.99975210213082], [-17.020428432675736, 21.422310288981475], [-17.002961798561085, 21.420734157796574], [-14.750954555713532, 21.50060008390366], [-14.630832688851068, 21.860939846274899], [-14.221167771857251, 22.310163072188153], [-13.891110398809044, 23.691009019459297], [-12.500962693725368, 24.770116278578193], [-12.030758836301613, 26.030866197203036], [-11.718219773800353, 26.104091701760616], [-11.392554897496977, 26.883423977154358], [-10.551262579785272, 26.990807603456879], [-10.18942420087758, 26.860944729107398], [-9.735343390328877, 26.860944729107398], [-9.413037482124464, 27.088476060488514], [-8.794883999049075, 27.120696316022503]]] } },
-            { "type": "Feature", "properties": { "admin": "Saudi Arabia", "name": "Saudi Arabia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[42.779332309750963, 16.34789134364868], [42.64957278826607, 16.77463532151496], [42.347989129410706, 17.075805568911996], [42.270887892431219, 17.474721787989122], [41.754381951673949, 17.833046169500971], [41.221391229015573, 18.671599636301206], [40.939341261566533, 19.486485297111752], [40.247652215339819, 20.174634507726488], [39.801684604660934, 20.338862209550054], [39.139399448408277, 21.29190481209293], [39.023695916506782, 21.986875311770191], [39.066328973147577, 22.579655666590263], [38.492772251140075, 23.688451036060851], [38.023860304523616, 24.078685614512928], [37.483634881344379, 24.285494696545008], [37.154817742671177, 24.858482977797301], [37.209491408035994, 25.084541530858104], [36.931627231602583, 25.602959499610172], [36.639603712721218, 25.826227525327219], [36.249136590323808, 26.570135606384873], [35.640181512196385, 27.376520494083415], [35.130186801907875, 28.063351955674712], [34.632336053207972, 28.058546047471559], [34.787778761541936, 28.607427273059692], [34.832220493312938, 28.957483425404838], [34.956037225084252, 29.356554673778835], [36.068940870922049, 29.19749461518445], [36.501214227043583, 29.505253607698702], [36.740527784987243, 29.865283311476183], [37.503581984209028, 30.003776150018396], [37.668119744626374, 30.338665269485894], [37.998848911294367, 30.508499864213128], [37.002165561681004, 31.508412990844736], [39.004885695152545, 32.010216986614971], [39.195468377444961, 32.16100881604266], [40.399994337736238, 31.889991766887931], [41.889980910007829, 31.190008653278362], [44.709498732284736, 29.178891099559376], [46.568713413281742, 29.099025173452283], [47.459821811722819, 29.002519436147217], [47.708850538937376, 28.526062730416136], [48.416094191283939, 28.552004299426663], [48.807594842327163, 27.689627997339876], [49.299554477745815, 27.461218166609804], [49.470913527225647, 27.109999294538078], [50.152422316290874, 26.689663194275994], [50.212935418504671, 26.277026882425371], [50.113303257045928, 25.943972276304248], [50.23985883972874, 25.608049628190923], [50.527386509000728, 25.327808335872099], [50.660556675016885, 24.999895534764018], [50.810108270069563, 24.754742539971371], [51.112415398977006, 24.556330878186721], [51.389607781790623, 24.627385972588051], [51.579518670463258, 24.245497137951102], [51.617707553926969, 24.014219265228824], [52.000733270074321, 23.001154486578937], [55.006803012924898, 22.496947536707129], [55.208341098863187, 22.708329982997039], [55.666659376859812, 22.000001125572336], [54.999981723862355, 19.999994004796104], [52.000009800022227, 19.000003363516054], [49.116671583864857, 18.616667588774941], [48.183343540241324, 18.166669216377311], [47.466694777217626, 17.116681626854877], [47.000004917189749, 16.949999294497438], [46.749994337761642, 17.283338120996174], [46.366658563020529, 17.233315334537632], [45.399999220568752, 17.333335069238554], [45.216651238797184, 17.43332896572333], [44.062613152855072, 17.410358791569589], [43.791518589051904, 17.319976711491105], [43.380794305196098, 17.579986680567668], [43.115797560403351, 17.088440456607369], [43.218375278502734, 16.666889960186406], [42.779332309750963, 16.34789134364868]]] } },
-            { "type": "Feature", "properties": { "admin": "Sudan", "name": "Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.824963480907506, 9.48406084571536], [33.842130853028145, 9.981914637215992], [33.721959248183097, 10.325262079630191], [33.206938084561777, 10.720111638406591], [33.086766479716729, 11.441141267476493], [33.206938084561777, 12.179338268667093], [32.743419037302537, 12.24800775714999], [32.674749548819641, 12.024831919580716], [32.073891524594778, 11.973329803218517], [32.314234734284746, 11.681484477166519], [32.400071594888338, 11.080626452941486], [31.850715687025509, 10.531270545078822], [31.352861895524875, 9.810240916008693], [30.837840731903377, 9.707236683284519], [29.996639497988546, 10.290927335388684], [29.618957311332842, 10.084918869940223], [29.515953078608607, 9.793073543888053], [29.000931914987166, 9.604232450560287], [28.966597170745779, 9.398223985111654], [27.970889587744345, 9.398223985111654], [27.833550610778783, 9.604232450560287], [27.112520981708876, 9.638567194801622], [26.752006167173811, 9.466893473594492], [26.477328213242508, 9.552730334198086], [25.96230704962101, 10.136420986302422], [25.790633328413943, 10.411098940233726], [25.069603699343979, 10.27375996326799], [24.79492574541268, 9.810240916008693], [24.537415163602017, 8.917537565731719], [24.194067721187643, 8.728696472403895], [23.886979580860665, 8.619729712933063], [23.805813429466745, 8.666318874542522], [23.459012892355979, 8.954285793489019], [23.394779087017291, 9.26506785729225], [23.557249790142915, 9.681218166538766], [23.554304233502187, 10.089255275915319], [22.977543572692749, 10.714462591998538], [22.864165480244246, 11.142395127807616], [22.87622, 11.384610000000119], [22.50869, 11.67936], [22.49762, 12.26024], [22.28801, 12.64605], [21.93681, 12.588180000000133], [22.03759, 12.95546], [22.29658, 13.37232], [22.18329, 13.78648], [22.51202, 14.09318], [22.30351, 14.32682], [22.567950000000106, 14.944290000000134], [23.02459, 15.68072], [23.886890000000101, 15.61084], [23.837660000000135, 19.580470000000101], [23.850000000000129, 20.0], [25.00000000000011, 20.00304], [25.00000000000011, 22.0], [29.02, 22.0], [32.9, 22.0], [36.86623, 22.0], [37.18872, 21.01885], [36.96941, 20.837440000000125], [37.114700000000134, 19.80796], [37.48179, 18.61409], [37.86276, 18.36786], [38.410089959473218, 17.998307399970312], [37.904000000000103, 17.42754], [37.16747, 17.263140000000128], [36.852530000000108, 16.95655], [36.75389, 16.29186], [36.32322, 14.82249], [36.42951, 14.42211], [36.27022, 13.563330000000118], [35.86363, 12.57828], [35.26049, 12.08286], [34.831630000000125, 11.318960000000116], [34.73115000000012, 10.910170000000106], [34.25745, 10.63009], [33.96162, 9.58358], [33.963392794971178, 9.464285229420623]]] } },
-            { "type": "Feature", "properties": { "admin": "South Sudan", "name": "S. Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.97498, 8.68456], [33.82550000000014, 8.37916], [33.294800000000116, 8.35458], [32.95418, 7.7849700000001], [33.56829, 7.71334], [34.0751, 7.22595], [34.25032, 6.82607], [34.70702, 6.59422000000012], [35.298007118233095, 5.506], [34.620196267853935, 4.847122742082034], [34.005, 4.249884947362147], [33.39, 3.79], [32.68642, 3.79232], [31.881450000000136, 3.55827], [31.24556, 3.7819], [30.83385, 3.50917], [29.95349, 4.1737], [29.715995314256013, 4.600804755060152], [29.159078403446635, 4.389267279473244], [28.696677687298795, 4.455077215996993], [28.428993768026992, 4.287154649264607], [27.979977247842946, 4.408413397637388], [27.374226108517625, 5.233944403500173], [27.213409051225248, 5.550953477394613], [26.465909458123289, 5.946717434101855], [26.213418409945113, 6.546603298362127], [25.796647983511257, 6.979315904158169], [25.124130893664805, 7.500085150579422], [25.114932488716867, 7.825104071479244], [24.567369012152191, 8.229187933785452], [23.886979580860665, 8.619729712933063], [24.194067721187643, 8.728696472403895], [24.537415163602017, 8.917537565731719], [24.79492574541268, 9.810240916008693], [25.069603699343979, 10.27375996326799], [25.790633328413943, 10.411098940233726], [25.96230704962101, 10.136420986302422], [26.477328213242508, 9.552730334198086], [26.752006167173811, 9.466893473594492], [27.112520981708876, 9.638567194801622], [27.833550610778783, 9.604232450560287], [27.970889587744345, 9.398223985111654], [28.966597170745779, 9.398223985111654], [29.000931914987166, 9.604232450560287], [29.515953078608607, 9.793073543888053], [29.618957311332842, 10.084918869940223], [29.996639497988546, 10.290927335388684], [30.837840731903377, 9.707236683284519], [31.352861895524875, 9.810240916008693], [31.850715687025509, 10.531270545078822], [32.400071594888338, 11.080626452941486], [32.314234734284746, 11.681484477166519], [32.073891524594778, 11.973329803218517], [32.674749548819641, 12.024831919580716], [32.743419037302537, 12.24800775714999], [33.206938084561777, 12.179338268667093], [33.086766479716729, 11.441141267476493], [33.206938084561777, 10.720111638406591], [33.721959248183097, 10.325262079630191], [33.842130853028145, 9.981914637215992], [33.824963480907506, 9.48406084571536], [33.963392794971178, 9.464285229420623]]] } },
-            { "type": "Feature", "properties": { "admin": "Senegal", "name": "Senegal", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.713728807023468, 13.594958604379853], [-17.126106736712611, 14.373515733289221], [-17.625042690490655, 14.72954051356407], [-17.185172898822227, 14.91947724045286], [-16.700706346085919, 15.621527411354107], [-16.463098110407881, 16.135036119038457], [-16.120690070041928, 16.45566254319338], [-15.623666144258689, 16.369337063049809], [-15.135737270558813, 16.587282416240779], [-14.577347581428977, 16.598263658102805], [-14.099521450242175, 16.304302273010489], [-13.43573767745306, 16.039383042866188], [-12.830658331747513, 15.303691514542942], [-12.170750291380299, 14.616834214735503], [-12.124887457721256, 13.994727484589784], [-11.927716030311613, 13.422075100147392], [-11.553397793005427, 13.141213690641063], [-11.467899135778522, 12.754518947800973], [-11.513942836950587, 12.442987575729415], [-11.658300950557928, 12.386582749882834], [-12.20356482588563, 12.465647691289401], [-12.278599005573438, 12.354440008997285], [-12.499050665730561, 12.332089952031053], [-13.217818162478235, 12.575873521367964], [-13.700476040084322, 12.586182969610192], [-15.548476935274005, 12.628170070847343], [-15.816574266004251, 12.515567124883345], [-16.147716844130581, 12.547761542201185], [-16.67745195155457, 12.38485158940105], [-16.84152462408127, 13.151393947802557], [-15.931295945692208, 13.130284125211331], [-15.691000535534991, 13.270353094938455], [-15.511812506562931, 13.278569647672864], [-15.141163295949463, 13.509511623585235], [-14.712197231494626, 13.298206691943774], [-14.277701788784553, 13.28058502853224], [-13.844963344772404, 13.505041612191999], [-14.046992356817478, 13.794067898000446], [-14.376713833055785, 13.625680243377371], [-14.687030808968483, 13.63035696049978], [-15.081735398813816, 13.876491807505982], [-15.398770310924457, 13.860368760630916], [-15.624596320039936, 13.623587347869556], [-16.713728807023468, 13.594958604379853]]] } },
-            { "type": "Feature", "properties": { "admin": "Solomon Islands", "name": "Solomon Is.", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[162.119024693040842, -10.482719008021133], [162.398645868172196, -10.826367282762119], [161.700032180018354, -10.820011081590222], [161.319796991214702, -10.204751478723123], [161.917383254237933, -10.446700534713653], [162.119024693040842, -10.482719008021133]]], [[[160.852228631837903, -9.872937106977002], [160.462588332357228, -9.89520964929484], [159.849447463214176, -9.794027194867367], [159.640002883135139, -9.639979750205269], [159.70294477766663, -9.242949720906777], [160.362956170898428, -9.400304457235533], [160.688517694337179, -9.610162448772808], [160.852228631837903, -9.872937106977002]]], [[[161.679981724289121, -9.599982191611373], [161.52939660059053, -9.784312025596433], [160.788253208660507, -8.917543226764918], [160.579997186524338, -8.320008640173965], [160.92002811100491, -8.320008640173965], [161.280006138349961, -9.120011488484449], [161.679981724289121, -9.599982191611373]]], [[[159.875027297198585, -8.337320244991714], [159.917401971677975, -8.538289890174864], [159.133677199539335, -8.114181410355398], [158.586113722974687, -7.754823500197713], [158.211149530264834, -7.421872246941147], [158.359977655265425, -7.320017998893915], [158.820001255527671, -7.56000335045739], [159.640002883135139, -8.020026950719567], [159.875027297198585, -8.337320244991714]]], [[[157.53842573468927, -7.347819919466928], [157.339419793933217, -7.404767347852554], [156.902030471014768, -7.176874281445391], [156.491357863591304, -6.765943291860394], [156.542827590153934, -6.599338474151478], [157.140000441718882, -7.021638278840653], [157.53842573468927, -7.347819919466928]]]] } },
-            { "type": "Feature", "properties": { "admin": "Sierra Leone", "name": "Sierra Leone", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-11.438779466182053, 6.785916856305746], [-11.708194545935736, 6.860098374860724], [-12.428098924193815, 7.262942002792029], [-12.949049038128193, 7.798645738145736], [-13.124025437868479, 8.163946438016977], [-13.246550258832512, 8.903048610871506], [-12.711957566773076, 9.342711696810765], [-12.596719122762206, 9.620188300001969], [-12.425928514037562, 9.835834051955953], [-12.150338100625003, 9.858571682164378], [-11.917277390988655, 10.046983954300556], [-11.117481248407328, 10.045872911006283], [-10.839151984083299, 9.688246161330367], [-10.622395188835037, 9.267910061068276], [-10.65477047366589, 8.977178452994194], [-10.494315151399629, 8.715540676300433], [-10.505477260774667, 8.348896389189603], [-10.230093553091276, 8.406205552601291], [-10.695594855176477, 7.939464016141085], [-11.14670427086838, 7.396706447779534], [-11.199801805048278, 7.105845648624735], [-11.438779466182053, 6.785916856305746]]] } },
-            { "type": "Feature", "properties": { "admin": "El Salvador", "name": "El Salvador", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.793111131526558, 13.384480495655051], [-87.904112108089507, 13.149016831917134], [-88.483301561216791, 13.163951320849488], [-88.843227912129692, 13.259733588102474], [-89.256742723329282, 13.4585328231293], [-89.812393561547637, 13.520622056527994], [-90.095554572290951, 13.73533763270073], [-90.064677903996568, 13.881969509328924], [-89.7219339668207, 14.134228013561694], [-89.5342193265205, 14.244815578666302], [-89.587342698916544, 14.362586167859485], [-89.353325975282772, 14.424132798719112], [-89.058511929057644, 14.340029405164085], [-88.843072882832814, 14.140506700085169], [-88.541230841815974, 13.980154730683475], [-88.50399797234968, 13.845485948130854], [-88.065342576840123, 13.964625962779774], [-87.859515347021585, 13.893312486216979], [-87.723502977229387, 13.785050360565503], [-87.793111131526558, 13.384480495655051]]] } },
-            { "type": "Feature", "properties": { "admin": "Somaliland", "name": "Somaliland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[48.938129510296491, 9.451748968946672], [48.486735874226994, 8.837626247589979], [47.78942, 8.003], [46.948328484897942, 7.996876532417386], [43.67875, 9.183580000000116], [43.296975132018744, 9.540477403191742], [42.92812, 10.021940000000139], [42.55876, 10.572580000000126], [42.776851841000948, 10.926878566934416], [43.145304803242126, 11.462039699748853], [43.470659620951658, 11.27770986576388], [43.666668328634834, 10.864169216348158], [44.117803582542805, 10.445538438351603], [44.614259067570849, 10.442205308468941], [45.556940545439133, 10.698029486529775], [46.645401238802997, 10.816549383991171], [47.525657586462778, 11.127228094929986], [48.021596307167769, 11.193063869669741], [48.378783807169263, 11.375481675660122], [48.948206414593457, 11.410621649618516], [48.942005242718423, 11.394266058798163], [48.938491245322595, 10.982327378783451], [48.938232863161076, 9.973500067581481], [48.938129510296491, 9.451748968946672]]] } },
-            { "type": "Feature", "properties": { "admin": "Somalia", "name": "Somalia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.72862, 11.5789], [50.25878, 11.67957], [50.73202, 12.0219], [51.1112, 12.02464], [51.13387, 11.74815], [51.04153, 11.16651], [51.04531, 10.6409], [50.83418, 10.27972], [50.55239, 9.19874], [50.07092, 8.08173], [49.4527, 6.80466], [48.59455, 5.33911], [47.74079, 4.2194], [46.56476, 2.85529], [45.56399, 2.04576], [44.06815, 1.05283], [43.13597, 0.2922], [42.04157, -0.91916], [41.81095, -1.44647], [41.58513, -1.68325], [40.993, -0.85829], [40.98105, 2.78452], [41.855083092643966, 3.918911920483726], [42.12861, 4.23413], [42.76967, 4.25259], [43.66087, 4.95755], [44.9636, 5.00162], [47.78942, 8.003], [48.486735874226937, 8.837626247589993], [48.938129510296442, 9.451748968946616], [48.938232863161026, 9.973500067581508], [48.938491245322481, 10.982327378783465], [48.942005242718345, 11.394266058798136], [48.948204758509732, 11.410617281697961], [49.26776, 11.43033], [49.72862, 11.5789]]] } },
-            { "type": "Feature", "properties": { "admin": "Republic of Serbia", "name": "Serbia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.874312778413408, 45.416375433934306], [21.483526238702204, 45.181170152357865], [21.562022739353718, 44.768947251965635], [22.145087924902892, 44.478422349620573], [22.459022251075961, 44.702517198254426], [22.705725538837434, 44.578002834647002], [22.47400841644065, 44.409227606781762], [22.657149692483067, 44.234923000661347], [22.410446404721593, 44.008063462900047], [22.500156691180219, 43.642814439460999], [22.986018507588479, 43.211161200527094], [22.604801466571352, 42.898518785161109], [22.43659467946139, 42.580321153323943], [22.545011834409642, 42.461362006188025], [22.380525750424674, 42.320259507815074], [21.917080000000105, 42.30364], [21.576635989402117, 42.245224397061847], [21.54332, 42.32025], [21.66292, 42.43922], [21.77505, 42.6827], [21.63302, 42.67717], [21.43866, 42.86255], [21.27421, 42.90959], [21.143395, 43.068685000000123], [20.95651, 43.13094], [20.81448, 43.27205], [20.63508, 43.21671], [20.49679, 42.88469], [20.25758, 42.81275], [20.3398, 42.89852], [19.95857, 43.10604], [19.63, 43.213779970270522], [19.48389, 43.35229], [19.21852, 43.52384], [19.454, 43.568100000000115], [19.59976, 44.03847], [19.11761, 44.42307], [19.36803, 44.863], [19.00548, 44.86023], [19.390475701584588, 45.236515611342369], [19.072768995854172, 45.521511135432078], [18.82982, 45.90888], [19.596044549241636, 46.171729844744547], [20.22019249846289, 46.127468980486569], [20.76217492033998, 45.734573065771478], [20.874312778413408, 45.416375433934306]]] } },
-            { "type": "Feature", "properties": { "admin": "Suriname", "name": "Suriname", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.147436489476874, 5.973149929219161], [-55.949318406789786, 5.772877915872], [-55.841779751190408, 5.953125311706059], [-55.033250291551759, 6.025291449401662], [-53.958044603070888, 5.756548163267764], [-54.478632981979224, 4.896755682795585], [-54.3995422023565, 4.212611395683466], [-54.006930508018996, 3.620037746592558], [-54.181726040246261, 3.189779771330421], [-54.269705166223183, 2.732391669115046], [-54.524754197799709, 2.311848863123785], [-55.097587449755125, 2.523748073736612], [-55.569755011605984, 2.42150625244713], [-55.973322109589361, 2.510363877773016], [-56.073341844290283, 2.220794989425499], [-55.905600145070871, 2.021995754398659], [-55.995698004771739, 1.817667141116601], [-56.53938574891454, 1.89952260986692], [-57.150097825739898, 2.768926906745406], [-57.281433478409703, 3.333491929534119], [-57.601568976457848, 3.334654649260684], [-58.044694383360664, 4.060863552258382], [-57.860209520078691, 4.576801052260449], [-57.914288906472123, 4.812626451024413], [-57.307245856339492, 5.073566595882225], [-57.147436489476874, 5.973149929219161]]] } },
-            { "type": "Feature", "properties": { "admin": "Slovakia", "name": "Slovakia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.85314415861361, 49.496229763377634], [18.909574822676316, 49.435845852244562], [19.320712517990469, 49.571574001659179], [19.825022820726865, 49.217125352569219], [20.415839471119849, 49.431453355499755], [20.887955356538406, 49.328772284535823], [21.607808058364206, 49.470107326854077], [22.558137648211751, 49.08573802346713], [22.280841912533553, 48.825392157580659], [22.085608351334848, 48.422264309271782], [21.872236362401729, 48.319970811550007], [20.801293979584919, 48.62385407164237], [20.473562045989862, 48.562850043321809], [20.239054396249344, 48.327567247096916], [19.769470656013109, 48.2026911484636], [19.66136355965849, 48.266614895208647], [19.174364861739885, 48.111378892603859], [18.777024773847668, 48.081768296900627], [18.696512892336923, 47.88095368101439], [17.857132602620023, 47.758428860050365], [17.488472934649813, 47.867466132186209], [16.979666782304033, 48.123497015976298], [16.879982944412998, 48.470013332709463], [16.960288120194573, 48.596982326850593], [17.101984897538895, 48.8169688991171], [17.545006951577101, 48.800019029325362], [17.886484816161808, 48.903475246773695], [17.913511590250462, 48.996492824899072], [18.104972771891848, 49.043983466175298], [18.170498488037961, 49.271514797556421], [18.399993523846174, 49.315000515330034], [18.554971144289478, 49.495015367218777], [18.85314415861361, 49.496229763377634]]] } },
-            { "type": "Feature", "properties": { "admin": "Slovenia", "name": "Slovenia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[13.806475457421524, 46.509306138691201], [14.632471551174827, 46.431817328469535], [15.137091912504982, 46.658702704447016], [16.011663852612653, 46.683610744811688], [16.202298211337361, 46.852385972676949], [16.370504998447412, 46.841327216166498], [16.564808383864854, 46.503750922219822], [15.768732944408548, 46.238108222023442], [15.671529575267552, 45.834153550797865], [15.323953891672403, 45.731782538427673], [15.327674594797424, 45.452316392593218], [14.935243767972931, 45.471695054702671], [14.595109490627804, 45.6349409043127], [14.411968214585411, 45.466165676447446], [13.715059848697221, 45.500323798192369], [13.937630242578305, 45.591015936864608], [13.698109978905475, 46.016778062517339], [13.806475457421524, 46.509306138691201]]] } },
-            { "type": "Feature", "properties": { "admin": "Sweden", "name": "Sweden", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.183173455501922, 65.723740546320158], [21.213516879977213, 65.02600535751526], [21.369631381930954, 64.413587958424273], [19.778875766690216, 63.609554348395022], [17.847779168375208, 62.749400132896803], [17.11955488451812, 61.341165676510954], [17.831346062906388, 60.636583360427394], [18.787721795332086, 60.081914374422581], [17.869224887776337, 58.95376618105869], [16.829185011470084, 58.719826972073385], [16.44770958829147, 57.041118069071871], [15.87978559740378, 56.104301866268649], [14.666681349352071, 56.20088511822216], [14.100721062891461, 55.407781073622637], [12.942910597392054, 55.361737372450563], [12.625100538797025, 56.307080186581956], [11.787942335668671, 57.441817125063061], [11.027368605196866, 58.856149400459344], [11.468271925511145, 59.432393296946024], [12.300365838274896, 60.117932847730025], [12.631146681375181, 61.293571682370121], [11.992064243221559, 61.800362453856543], [11.930569288794228, 63.128317572676963], [12.57993533697393, 64.066218980558318], [13.571916131248711, 64.049114081469696], [13.9199052263022, 64.445420640716065], [13.555689731509087, 64.7870276963815], [15.108411492582999, 66.19386688909546], [16.108712192456775, 67.302455552836875], [16.768878614985478, 68.013936672631388], [17.729181756265344, 68.010551866316263], [17.993868442464329, 68.567391262477344], [19.878559604581248, 68.407194322372561], [20.025268995857882, 69.065138658312691], [20.645592889089521, 69.106247260200846], [21.978534783626113, 68.616845608180682], [23.539473097434435, 67.936008612735236], [23.565879754335576, 66.396050930437411], [23.903378533633795, 66.006927395279604], [22.183173455501922, 65.723740546320158]]] } },
-            { "type": "Feature", "properties": { "admin": "Swaziland", "name": "Swaziland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.071665480281062, -26.733820082304902], [31.868060337051073, -27.17792734142127], [31.282773064913325, -27.285879408478991], [30.685961948374477, -26.743845310169526], [30.676608514129633, -26.398078301704604], [30.949666782359905, -26.022649021104144], [31.044079624157146, -25.731452325139436], [31.333157586397899, -25.660190525008943], [31.837777947728057, -25.843331801051342], [31.985779249811962, -26.29177988048022], [32.071665480281062, -26.733820082304902]]] } },
-            { "type": "Feature", "properties": { "admin": "Syria", "name": "Syria", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[38.792340529136077, 33.378686428352218], [36.834062127435537, 32.312937526980768], [35.719918247222743, 32.709192409794859], [35.700797967274745, 32.716013698857374], [35.836396925608618, 32.868123277308506], [35.821100701650231, 33.277426459276292], [36.066460402172048, 33.824912421192543], [36.611750115715886, 34.201788641897174], [36.448194207512095, 34.59393524834406], [35.998402540843628, 34.644914048799997], [35.905023227692219, 35.410009467097318], [36.149762811026527, 35.821534735653664], [36.417550083163029, 36.040616970355053], [36.685389031731795, 36.259699205056457], [36.739494256341395, 36.817520453431079], [37.066761102045824, 36.623036200500614], [38.167727492024191, 36.901210435527766], [38.699891391765895, 36.712927354472335], [39.522580193852541, 36.716053778625984], [40.673259311695681, 37.091276353497285], [41.212089471203043, 37.074352321921687], [42.349591098811764, 37.22987254490409], [41.837064243340954, 36.605853786763568], [41.289707472505448, 36.358814602192261], [41.383965285005807, 35.628316555314349], [41.00615888851992, 34.419372260062111], [38.792340529136077, 33.378686428352218]]] } },
-            { "type": "Feature", "properties": { "admin": "Chad", "name": "Chad", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.495787387762899, 12.859396267137353], [14.595781284247604, 13.330426947477859], [13.954476759505607, 13.353448798063765], [13.956698846094124, 13.996691189016925], [13.540393507550785, 14.36713369390122], [13.97217, 15.68437], [15.247731154041842, 16.627305813050778], [15.300441114979716, 17.927949937405], [15.68574059414777, 19.957180080642384], [15.90324669766431, 20.387618923417499], [15.487148064850143, 20.730414537025634], [15.47106, 21.04845], [15.096887648181847, 21.308518785074902], [14.8513, 22.862950000000119], [15.86085, 23.40972], [19.84926, 21.49509], [23.837660000000135, 19.580470000000101], [23.886890000000101, 15.61084], [23.02459, 15.68072], [22.567950000000106, 14.944290000000134], [22.30351, 14.32682], [22.51202, 14.09318], [22.18329, 13.78648], [22.29658, 13.37232], [22.03759, 12.95546], [21.93681, 12.588180000000133], [22.28801, 12.64605], [22.49762, 12.26024], [22.50869, 11.67936], [22.87622, 11.384610000000119], [22.864165480244246, 11.142395127807616], [22.231129184668756, 10.971888739460608], [21.723821648859538, 10.567055568885959], [21.000868361096305, 9.475985215691479], [20.059685499764267, 9.012706000194838], [19.094008009526071, 9.074846910025768], [18.81200971850927, 8.982914536978623], [18.911021762780589, 8.630894680206435], [18.389554884523303, 8.281303615751879], [17.964929640380884, 7.890914008002992], [16.705988396886365, 7.508327541529978], [16.4561845231874, 7.734773667832938], [16.290561557691884, 7.754307359239417], [16.106231723706738, 7.497087917506461], [15.279460483469164, 7.42192454673801], [15.436091749745737, 7.692812404811887], [15.120865512765302, 8.382150173369437], [14.979995558337688, 8.796104234243442], [14.544466586981851, 8.965861314322238], [13.954218377344088, 9.549494940626685], [14.17146609869911, 10.021378282100043], [14.627200555081057, 9.920919297724591], [14.909353875394796, 9.992129421422758], [15.46787275560524, 9.982336737503543], [14.923564894275042, 10.891325181517514], [14.960151808337679, 11.555574042197234], [14.89336, 12.21905], [14.495787387762899, 12.859396267137353]]] } },
-            { "type": "Feature", "properties": { "admin": "Togo", "name": "Togo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.865240512712318, 6.14215770102973], [1.060121697604927, 5.928837388528875], [0.836931186536333, 6.279978745952147], [0.570384148774849, 6.914358628767188], [0.490957472342245, 7.411744289576474], [0.712029249686878, 8.312464504423827], [0.461191847342121, 8.677222601756013], [0.365900506195885, 9.46500397382948], [0.367579990245389, 10.191212876827176], [-0.049784715159944, 10.706917832883928], [0.023802524423701, 11.018681748900802], [0.899563022474069, 10.997339382364258], [0.772335646171484, 10.470808213742357], [1.077795037448737, 10.175606594275022], [1.425060662450136, 9.825395412632998], [1.46304284018467, 9.334624335157086], [1.664477573258381, 9.128590399609378], [1.618950636409238, 6.832038072126236], [1.865240512712318, 6.14215770102973]]] } },
-            { "type": "Feature", "properties": { "admin": "Thailand", "name": "Thailand", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[102.58493248902667, 12.186594956913279], [101.687157830819928, 12.645740057826568], [100.831809523524839, 12.627084865769204], [100.978467238369191, 13.412721665902563], [100.097797479251099, 13.406856390837429], [100.018732537844528, 12.307001044153353], [99.478920526123602, 10.846366685423545], [99.153772414143134, 9.963061428258554], [99.222398716226749, 9.239255479362425], [99.873831821698118, 9.207862046745118], [100.279646844486194, 8.29515289960605], [100.45927412313273, 7.429572658717175], [101.017327915452697, 6.856868597842476], [101.623079054778032, 6.740622463401918], [102.141186964936367, 6.221636053894626], [101.81428185425797, 5.810808417174242], [101.154218784593837, 5.691384182147713], [101.075515578213327, 6.20486705161592], [100.259596388756933, 6.642824815289542], [100.085756870527092, 6.46448944745029], [99.690690545655727, 6.848212795433595], [99.519641554769606, 7.343453884302759], [98.988252801512289, 7.907993068875325], [98.503786248775967, 8.382305202666286], [98.339661899816988, 7.794511623562384], [98.150009393305808, 8.350007432483876], [98.259150018306229, 8.973922837759799], [98.553550653073017, 9.932959906448543], [99.038120558673953, 10.960545762572435], [99.587286004639694, 11.892762762901695], [99.196353794351637, 12.804748439988666], [99.212011753336071, 13.269293728076462], [99.097755161538728, 13.827502549693275], [98.430819126379859, 14.622027696180831], [98.192074009191373, 15.123702500870349], [98.537375929765687, 15.308497422746081], [98.90334842325673, 16.177824204976115], [98.493761020911322, 16.837835598207928], [97.859122755934848, 17.567946071843657], [97.375896437573516, 18.445437730375811], [97.797782830804394, 18.627080389881751], [98.253723992915582, 19.708203029860041], [98.959675734454848, 19.752980658440944], [99.543309360759281, 20.186597601802056], [100.115987583417819, 20.41784963630818], [100.548881056726856, 20.109237982661124], [100.606293573003128, 19.508344427971217], [101.282014601651667, 19.462584947176762], [101.035931431077742, 18.408928330961611], [101.059547560635139, 17.512497259994486], [102.113591750092453, 18.109101670804161], [102.413004998791592, 17.932781683824281], [102.998705682387694, 17.961694647691598], [103.200192091893726, 18.309632066312769], [103.956476678485288, 18.240954087796872], [104.716947056092465, 17.428858954330078], [104.779320509868768, 16.441864935771445], [105.589038527450128, 15.570316066952856], [105.544338413517664, 14.723933620660414], [105.218776890078871, 14.27321177821069], [104.281418084736586, 14.416743068901363], [102.988422072361601, 14.225721136934464], [102.348099399833004, 13.39424734135822], [102.58493248902667, 12.186594956913279]]] } },
-            { "type": "Feature", "properties": { "admin": "Tajikistan", "name": "Tajikistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[71.014198032520156, 40.244365546218226], [70.648018833299957, 39.935753892571157], [69.559609816368507, 40.103211371412968], [69.464886915977516, 39.526683254548693], [70.549161818325601, 39.604197902986492], [71.784693637991992, 39.279463202464363], [73.67537926625478, 39.431236884105594], [73.928852166646408, 38.505815334622724], [74.257514276022718, 38.606506862943441], [74.864815708316812, 38.378846340481587], [74.829985792952087, 37.990007025701388], [74.980002475895404, 37.419990139305888], [73.948695916646486, 37.421566270490786], [73.260055779924983, 37.495256862938994], [72.636889682917271, 37.047558091778349], [72.193040805962383, 36.94828766534566], [71.84463829945058, 36.738171291646914], [71.448693475230229, 37.065644843080513], [71.541917759084768, 37.905774441065631], [71.239403924448155, 37.953265082341879], [71.348131137990251, 38.258905341132156], [70.806820509732873, 38.486281643216408], [70.376304152309274, 38.138395901027515], [70.270574171840124, 37.73516469985401], [70.116578403610319, 37.588222764632086], [69.518785434857946, 37.608996690413413], [69.196272820924364, 37.15114350030742], [68.859445835245921, 37.344335842430588], [68.135562371701369, 37.023115139304302], [67.829999627559502, 37.144994004864678], [68.392032505165943, 38.157025254868728], [68.176025018185911, 38.901553453113898], [67.442219679641298, 39.140143541005479], [67.701428664017342, 39.580478420564518], [68.536416456989414, 39.533452867178923], [69.011632928345477, 40.086158148756653], [69.329494663372813, 40.727824408524839], [70.666622348925031, 40.960213324541407], [70.458159621059608, 40.49649485937028], [70.601406691372674, 40.218527330072284], [71.014198032520156, 40.244365546218226]]] } },
-            { "type": "Feature", "properties": { "admin": "Turkmenistan", "name": "Turkmenistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [61.123070509694131, 36.491597194966239], [60.377637973883864, 36.52738312432836], [59.234761997316795, 37.412987982730336], [58.436154412678192, 37.522309475243794], [57.330433790928964, 38.029229437810933], [56.619366082592805, 38.121394354803478], [56.180374790273319, 37.935126654607423], [55.511578403551894, 37.964117133123153], [54.800303989486558, 37.392420762678178], [53.921597934795543, 37.198918361961255], [53.735511102112504, 37.906136176091685], [53.880928582581831, 38.952093003895349], [53.101027866432894, 39.290573635407121], [53.357808058491216, 39.975286363274442], [52.693972609269807, 40.033629055331964], [52.91525109234361, 40.87652334244472], [53.85813927594112, 40.631034450842165], [54.736845330632136, 40.951014919593455], [54.0083109881813, 41.551210842447404], [53.721713494690576, 42.123191433270016], [52.916749708880069, 41.868116563477322], [52.81468875510361, 41.135370591794704], [52.502459751196135, 41.783315538086356], [52.94429324729164, 42.116034247397586], [54.079417759014937, 42.324109402020817], [54.755345493392625, 42.04397146256656], [55.455251092353755, 41.259859117185826], [55.968191359282898, 41.308641669269356], [57.096391229079089, 41.32231008561056], [56.93221520368779, 41.82602610937559], [57.786529982337065, 42.170552883465511], [58.629010857991453, 42.751551011723045], [59.976422153569771, 42.223081976890199], [60.083340691981654, 41.425146185871391], [60.46595299667068, 41.22032664648254], [61.547178989513547, 41.2663703476546], [61.882714064384679, 41.084856879229392], [62.374260288344992, 40.053886216790382], [63.518014764261018, 39.363256537425627], [64.170223016216752, 38.892406724598231], [65.215998976507379, 38.402695013984292], [66.546150343700205, 37.974684963526855], [66.518606805288655, 37.362784328758785], [66.217384881459324, 37.393790188133913], [65.745630731066811, 37.661164048812061], [65.588947788357828, 37.305216783185628], [64.746105177677393, 37.111817735333297], [64.546479119733888, 36.31207326918426], [63.982895949158696, 36.007957465146596], [63.193538445900337, 35.857165635718907], [62.984662306576588, 35.404040839167614], [62.230651483005879, 35.270663967422287], [61.21081709172573, 35.650072333309218]]] } },
-            { "type": "Feature", "properties": { "admin": "East Timor", "name": "Timor-Leste", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[124.96868248911619, -8.892790215697081], [125.086246372580248, -8.656887302284678], [125.947072381698234, -8.432094821815033], [126.64470421763852, -8.39824675866385], [126.957243280139792, -8.273344821814396], [127.335928175974615, -8.397316582882601], [126.967991978056517, -8.668256117388891], [125.925885044458568, -9.106007175333351], [125.088520135601073, -9.393173109579292], [125.070019972840583, -9.08998748132287], [124.96868248911619, -8.892790215697081]]] } },
-            { "type": "Feature", "properties": { "admin": "Trinidad and Tobago", "name": "Trinidad and Tobago", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.68, 10.76], [-61.105, 10.89], [-60.895, 10.855], [-60.935, 10.11], [-61.77, 10.0], [-61.95, 10.09], [-61.66, 10.365], [-61.68, 10.76]]] } },
-            { "type": "Feature", "properties": { "admin": "Tunisia", "name": "Tunisia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.482139926805273, 30.307556057246181], [9.055602654668148, 32.102691962201284], [8.439102817426116, 32.506284898400814], [8.430472853233367, 32.748337307255944], [7.612641635782181, 33.344114895148955], [7.524481642292242, 34.097376410451453], [8.140981479534302, 34.655145982393783], [8.376367628623766, 35.479876003555937], [8.217824334352313, 36.433176988260271], [8.420964389691674, 36.946427313783154], [9.509993523810605, 37.349994411766531], [10.210002475636315, 37.230001735984807], [10.180650262094529, 36.724037787415071], [11.028867221733348, 37.09210317641395], [11.100025668999249, 36.899996039368908], [10.600004510143092, 36.410000108377368], [10.593286573945134, 35.947444362932806], [10.939518670300686, 35.698984076473486], [10.807847120821007, 34.833507188449182], [10.149592726287123, 34.330773016897702], [10.339658644256613, 33.785741685515312], [10.856836378633684, 33.768740139291275], [11.108500603895118, 33.293342800422188], [11.488787469131008, 33.136995754523134], [11.432253452203692, 32.368903103152867], [10.944789666394453, 32.081814683555358], [10.636901482799484, 31.761420803345747], [9.950225050505081, 31.376069647745251], [10.056575148161752, 30.961831366493595], [9.97001712407285, 30.539324856075236], [9.482139926805273, 30.307556057246181]]] } },
-            { "type": "Feature", "properties": { "admin": "Turkey", "name": "Turkey", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[36.913127068842151, 41.335358384764291], [38.347664829264502, 40.948586127275711], [39.512606642420238, 41.102762763018561], [40.373432651538245, 41.013672593747337], [41.554084100110707, 41.535656236327604], [42.619548781104548, 41.58317271581992], [43.582745802592704, 41.09214325618256], [43.752657911968491, 40.740200914058811], [43.656436395040963, 40.253563951166157], [44.400008579288759, 40.005000311842302], [44.79398969908199, 39.713002631177027], [44.109225294782355, 39.428136298168049], [44.421402622257595, 38.281281236314513], [44.225755649600522, 37.971584377589345], [44.772699008977739, 37.170444647768441], [44.293451775902852, 37.001514390606353], [43.942258742047343, 37.256227525372928], [42.77912560402185, 37.385263576805798], [42.349591098811764, 37.229872544904104], [41.212089471203015, 37.074352321921729], [40.673259311695702, 37.091276353497356], [39.522580193852512, 36.716053778626012], [38.699891391765917, 36.712927354472313], [38.167727492024156, 36.90121043552778], [37.066761102045824, 36.623036200500614], [36.739494256341366, 36.817520453431108], [36.685389031731816, 36.259699205056499], [36.417550083163086, 36.040616970355096], [36.149762811026584, 35.821534735653664], [35.782084995269848, 36.274995429014915], [36.160821567537049, 36.650605577128367], [35.550936313628334, 36.565442816711325], [34.714553256984367, 36.795532131490909], [34.026894972476455, 36.219960028623966], [32.509158156064096, 36.107563788389193], [31.69959516777956, 36.644275214172602], [30.621624790171062, 36.677864895162308], [30.391096225717114, 36.262980658506983], [29.69997562024556, 36.144357408181001], [28.732902866335387, 36.676831366516431], [27.641186557737363, 36.658822129862749], [27.048767937943289, 37.653360907536005], [26.318218214633042, 38.208133246405382], [26.804700148228726, 38.985760199533551], [26.170785353304375, 39.463612168936457], [27.280019972449388, 40.420013739578302], [28.819977654747209, 40.460011298172212], [29.240003696415574, 41.219990749672682], [31.145933872204434, 41.087621568357058], [32.347979363745786, 41.736264146484629], [33.513282911927512, 42.018960069337304], [35.167703891751863, 42.040224921225438], [36.913127068842151, 41.335358384764291]]], [[[27.192376743282406, 40.690565700842448], [26.358009067497782, 40.151993923496477], [26.043351271272535, 40.617753607743161], [26.056942172965332, 40.824123440100735], [26.294602085075692, 40.936261298174166], [26.604195590936282, 41.562114569661013], [26.117041863720825, 41.826904608724554], [27.135739373490505, 42.141484890301307], [27.996720411905407, 42.007358710287768], [28.115524529744441, 41.622886054036279], [28.988442824018779, 41.299934190428175], [28.806438429486743, 41.05496206314853], [27.619017368284112, 40.999823309893102], [27.192376743282406, 40.690565700842448]]]] } },
-            { "type": "Feature", "properties": { "admin": "Taiwan", "name": "Taiwan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[121.777817824389899, 24.394273586519393], [121.175632358892713, 22.790857245367164], [120.747079705896198, 21.970571397382106], [120.220083449383651, 22.814860948166732], [120.106188592612369, 23.556262722258229], [120.694679803552233, 24.53845083261373], [121.49504438688875, 25.295458889257379], [121.951243931161429, 24.997595933527034], [121.777817824389899, 24.394273586519393]]] } },
-            { "type": "Feature", "properties": { "admin": "United Republic of Tanzania", "name": "Tanzania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.903711197104592, -0.95], [34.07262, -1.05982], [37.69869, -3.09699], [37.7669, -3.67712], [39.20222, -4.67677], [38.74054, -5.90895], [38.79977, -6.47566], [39.44, -6.84], [39.470000000000134, -7.1], [39.19469, -7.7039], [39.25203, -8.00781], [39.18652, -8.48551], [39.53574, -9.112369999999883], [39.9496, -10.0984], [40.31659, -10.317099999999867], [39.521, -10.89688], [38.427556593587767, -11.285202325081626], [37.82764, -11.26879], [37.47129, -11.56876], [36.775150994622884, -11.59453744878078], [36.514081658684397, -11.720938002166745], [35.312397902169145, -11.439146416879165], [34.559989047999451, -11.520020033415845], [34.28, -10.16], [33.940837724096518, -9.693673841980283], [33.73972, -9.41715], [32.759375441221373, -9.230599053589001], [32.191864861791935, -8.930358981973255], [31.556348097466628, -8.762048841998647], [31.157751336950064, -8.594578747317312], [30.74, -8.34], [30.2, -7.08], [29.62, -6.52], [29.419992710088305, -5.939998874539297], [29.519986606573063, -5.419978936386257], [29.339997592900367, -4.499983412294113], [29.753512404099858, -4.452389418153301], [30.11632, -4.09012], [30.50554, -3.56858], [30.75224, -3.35931], [30.74301, -3.03431], [30.52766, -2.80762], [30.46967, -2.41383], [30.758308953583132, -2.287250257988375], [30.816134881317844, -1.698914076345374], [30.419104852019291, -1.134659112150416], [30.769860000000101, -1.01455], [31.86617, -1.02736], [33.903711197104592, -0.95]]] } },
-            { "type": "Feature", "properties": { "admin": "Uganda", "name": "Uganda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.86617, -1.02736], [30.769860000000101, -1.01455], [30.419104852019291, -1.134659112150416], [29.821518588996121, -1.443322442229771], [29.579466180141019, -1.341313164885605], [29.587837762172164, -0.587405694179381], [29.8195, -0.2053], [29.875778842902431, 0.597379868976361], [30.086153598762785, 1.062312730306416], [30.468507521290285, 1.583805446779706], [30.852670118948133, 1.849396470543752], [31.174149204235952, 2.204465236821306], [30.77332, 2.339890000000139], [30.83385, 3.50917], [31.24556, 3.7819], [31.88145, 3.55827], [32.68642, 3.79232], [33.39, 3.79], [34.005, 4.249884947362147], [34.47913, 3.5556], [34.59607, 3.053740000000118], [35.03599, 1.90584], [34.6721, 1.17694], [34.18, 0.515], [33.893568969666994, 0.109813537861839], [33.903711197104592, -0.95], [31.86617, -1.02736]]] } },
-            { "type": "Feature", "properties": { "admin": "Ukraine", "name": "Ukraine", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[31.78599816257158, 52.10167796488544], [32.159412062312661, 52.061266994833204], [32.412058139787625, 52.288694973349735], [32.715760532366964, 52.238465481162038], [33.7526998227357, 52.335074571331681], [34.391730584457001, 51.768881740925778], [34.141978387190385, 51.566413479206226], [34.22481570815426, 51.255993150428942], [35.022183058417873, 51.207572333371445], [35.377923618315116, 50.773955390010343], [35.35611616388794, 50.577197374059054], [36.62616784032533, 50.225590928745127], [37.393459506995065, 50.383953355503586], [38.01063113785689, 49.915661526074622], [38.59498823421341, 49.926461900423618], [40.069058465339097, 49.601055406281688], [40.080789015469342, 49.307429917999272], [39.674663934087526, 48.783818467801872], [39.895632358567575, 48.232405097031425], [39.738277622238819, 47.898937079451983], [38.770584751141186, 47.825608222029807], [38.255112339029743, 47.546400458356807], [38.223538038899413, 47.102189846375872], [37.42513715998998, 47.022220567404197], [36.759854770664383, 46.698700263040919], [35.823684523264816, 46.645964463887054], [34.962341749823871, 46.273196519549636], [35.020787794745978, 45.65121898048465], [35.51000857925316, 45.409993394546177], [36.529997999830151, 45.46998973243705], [36.334712762199146, 45.113215643893952], [35.239999220528112, 44.939996242851599], [33.882511020652878, 44.361478583344066], [33.326420932760037, 44.564877020844875], [33.546924269349446, 45.034770819674883], [32.454174432105496, 45.327466132176063], [32.630804477679128, 45.519185695978905], [33.588162062318382, 45.851568508480227], [33.298567335754704, 46.08059845639783], [31.744140252415171, 46.333347886737378], [31.675307244602401, 46.706245022155528], [30.748748813609094, 46.583100084003995], [30.37760867688888, 46.032410183285663], [29.603289015427425, 45.293308010431119], [29.149724969201646, 45.464925442072442], [28.679779493939371, 45.30403087013169], [28.233553501099035, 45.488283189468369], [28.48526940279276, 45.596907050145887], [28.659987420371575, 45.939986884131628], [28.933717482221621, 46.258830471372491], [28.862972446414055, 46.437889309263824], [29.072106967899288, 46.517677720722482], [29.170653924279879, 46.379262396828693], [29.759971958136383, 46.349987697935354], [30.024658644335364, 46.423936672545032], [29.838210076626289, 46.525325832701675], [29.908851759569295, 46.67436066343145], [29.559674106573105, 46.928582872091312], [29.415135125452732, 47.346645209332571], [29.050867954227321, 47.510226955752493], [29.122698195113024, 47.849095160506458], [28.670891147585163, 48.118148505234089], [28.259546746541837, 48.155562242213406], [27.52253746919515, 48.467119452501102], [26.857823520624798, 48.368210761094488], [26.619336785597788, 48.220726223333457], [26.197450392366925, 48.220881252630342], [25.945941196402394, 47.987148749374207], [25.207743361112986, 47.891056423527459], [24.866317172960571, 47.737525743188307], [24.402056105250374, 47.981877753280422], [23.760958286237404, 47.985598456405448], [23.142236362406798, 48.096341050806942], [22.710531447040488, 47.882193915389394], [22.640819939878746, 48.150239569687351], [22.085608351334848, 48.422264309271782], [22.280841912533553, 48.825392157580659], [22.558137648211751, 49.08573802346713], [22.776418898212619, 49.027395331409608], [22.518450148211596, 49.476773586619736], [23.426508416444388, 50.308505764357449], [23.922757195743259, 50.424881089878738], [24.029985792748899, 50.705406602575174], [23.52707075368437, 51.578454087930233], [24.005077752384206, 51.617443956094448], [24.553106316839511, 51.888461005249177], [25.327787713327005, 51.910656032918538], [26.337958611768549, 51.832288723347915], [27.454066196408426, 51.59230337178446], [28.241615024536564, 51.572227077839059], [28.617612745892242, 51.427713934934836], [28.992835320763522, 51.602044379271462], [29.254938185347921, 51.368234361366881], [30.157363722460889, 51.416138414101454], [30.55511722181145, 51.319503485715643], [30.619454380014837, 51.822806098022362], [30.927549269338975, 52.042353420614383], [31.78599816257158, 52.10167796488544]]] } },
-            { "type": "Feature", "properties": { "admin": "Uruguay", "name": "Uruguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.976025763564721, -30.109686374636119], [-55.97324459494093, -30.883075860316296], [-55.601510179249331, -30.853878676071385], [-54.572451544805105, -31.494511407193745], [-53.787951626182185, -32.047242526987617], [-53.209588995971529, -32.727666110974717], [-53.650543992718084, -33.202004082981823], [-53.373661668498229, -33.768377780900757], [-53.806425950726521, -34.396814874002224], [-54.935866054897716, -34.952646579733617], [-55.674089728403274, -34.752658786764066], [-56.215297003796053, -34.85983570733741], [-57.139685024633096, -34.430456231424238], [-57.817860683815489, -34.462547295877492], [-58.427074144104381, -33.909454441057569], [-58.349611172098854, -33.2631889788154], [-58.132647671121433, -33.040566908502008], [-58.142440355040748, -32.044503676076147], [-57.874937303281875, -31.016556084926201], [-57.625133429582945, -30.216294854454258]]] } },
-            { "type": "Feature", "properties": { "admin": "United States of America", "name": "United States", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-155.54211, 19.08348], [-155.68817, 18.91619], [-155.93665, 19.05939], [-155.90806, 19.33888], [-156.07347, 19.70294], [-156.02368, 19.81422], [-155.85008, 19.97729], [-155.91907, 20.17395], [-155.86108, 20.26721], [-155.78505, 20.2487], [-155.40214, 20.07975], [-155.22452, 19.99302], [-155.06226, 19.8591], [-154.80741, 19.50871], [-154.83147, 19.45328], [-155.222169999999892, 19.23972], [-155.54211, 19.08348]]], [[[-156.07926, 20.64397], [-156.41445, 20.57241], [-156.58673, 20.783], [-156.70167, 20.8643], [-156.71055, 20.92676], [-156.61258, 21.01249], [-156.25711, 20.91745], [-155.99566, 20.76404], [-156.07926, 20.64397]]], [[[-156.75824, 21.17684], [-156.78933, 21.06873], [-157.32521, 21.09777], [-157.25027, 21.21958], [-156.75824, 21.17684]]], [[[-157.65283, 21.32217], [-157.70703, 21.26442], [-157.7786, 21.27729], [-158.12667, 21.31244], [-158.2538, 21.53919], [-158.29265, 21.57912], [-158.0252, 21.71696], [-157.94161, 21.65272], [-157.65283, 21.32217]]], [[[-159.34512, 21.982], [-159.46372, 21.88299], [-159.80051, 22.06533], [-159.74877, 22.1382], [-159.5962, 22.23618], [-159.36569, 22.21494], [-159.34512, 21.982]]], [[[-94.81758, 49.38905], [-94.639999999999858, 48.840000000000103], [-94.32914, 48.67074], [-93.63087, 48.60926], [-92.61, 48.45], [-91.64, 48.14], [-90.829999999999856, 48.27], [-89.6, 48.01], [-89.272917446636654, 48.019808254582834], [-88.378114183286513, 48.302917588893806], [-87.439792623300207, 47.94], [-86.461990831228135, 47.553338019392037], [-85.652363247403215, 47.220218817730498], [-84.876079881514855, 46.900083319682366], [-84.779238247399817, 46.637101955749117], [-84.54374874544564, 46.538684190449224], [-84.6049, 46.4396], [-84.3367, 46.408770000000104], [-84.142119513673279, 46.512225857115723], [-84.091851264161463, 46.275418606138253], [-83.890765347005654, 46.116926988299149], [-83.616130947590491, 46.116926988299149], [-83.469550747394621, 45.994686387712584], [-83.592850714843067, 45.816893622412543], [-82.550924648758169, 45.347516587905446], [-82.337763125431053, 44.44], [-82.137642381503952, 43.571087551439987], [-82.43, 42.98], [-82.899999999999878, 42.430000000000135], [-83.119999999999877, 42.08], [-83.141999681312555, 41.975681057292995], [-83.029810146806909, 41.832795722005997], [-82.690089280920162, 41.675105088867319], [-82.439277716791608, 41.675105088867319], [-81.277746548167059, 42.209025987306845], [-80.247447679347843, 42.36619985612267], [-78.939362148743683, 42.863611355148116], [-78.92, 42.965], [-79.009999999999863, 43.27], [-79.171673550111862, 43.466339423184301], [-78.720279914042365, 43.625089423184953], [-77.737885097957601, 43.629055589363382], [-76.820034145805565, 43.628784288093748], [-76.5, 44.018458893758599], [-76.375, 44.09631], [-75.31821, 44.81645000000016], [-74.867, 45.00048000000011], [-73.347829999999874, 45.00738], [-71.505059999999858, 45.0082], [-71.405, 45.255000000000123], [-71.08482, 45.305240000000154], [-70.659999999999783, 45.46], [-70.305, 45.915], [-69.99997, 46.69307], [-69.237216, 47.447781], [-68.905, 47.185], [-68.23444, 47.35486], [-67.79046, 47.06636], [-67.79134, 45.702810000000134], [-67.13741, 45.13753], [-66.96466, 44.809700000000149], [-68.03252, 44.3252], [-69.059999999999874, 43.98], [-70.116169999999897, 43.684050000000141], [-70.645475633410967, 43.090238348964043], [-70.81489, 42.8653], [-70.825, 42.335], [-70.494999999999891, 41.805], [-70.08, 41.78], [-70.185, 42.145], [-69.88497, 41.922830000000111], [-69.96503, 41.637170000000161], [-70.64, 41.475], [-71.12039, 41.494450000000164], [-71.859999999999829, 41.32], [-72.295, 41.27], [-72.87643, 41.22065], [-73.71, 40.931102351654481], [-72.24126, 41.119480000000138], [-71.944999999999808, 40.93], [-73.345, 40.63], [-73.982, 40.628], [-73.952325, 40.75075], [-74.25671, 40.47351], [-73.96244, 40.42763], [-74.17838, 39.70926], [-74.90604, 38.93954], [-74.98041, 39.1964], [-75.20002, 39.24845], [-75.52805, 39.4985], [-75.32, 38.96], [-75.071834764789784, 38.782032230179276], [-75.05673, 38.404120000000106], [-75.37747, 38.01551], [-75.94023, 37.21689], [-76.03127, 37.2566], [-75.722049999999783, 37.937050000000106], [-76.23287, 38.319215], [-76.35, 39.15], [-76.542725, 38.717615], [-76.32933, 38.08326], [-76.98999793161353, 38.239991766913384], [-76.301619999999886, 37.917945], [-76.25874, 36.9664000000001], [-75.9718, 36.89726], [-75.868039999999809, 36.55125], [-75.72749, 35.550740000000125], [-76.36318, 34.808540000000129], [-77.39763499999988, 34.51201], [-78.05496, 33.92547], [-78.554349999999815, 33.861330000000116], [-79.06067, 33.49395], [-79.20357, 33.15839], [-80.301325, 32.509355], [-80.86498, 32.0333], [-81.33629, 31.44049], [-81.49042, 30.729990000000122], [-81.31371, 30.03552], [-80.98, 29.18000000000011], [-80.53558499999987, 28.47213], [-80.529999999999774, 28.04], [-80.056539284977532, 26.88000000000013], [-80.088015, 26.205765], [-80.131559999999837, 25.816775], [-80.38103, 25.20616], [-80.679999999999879, 25.08], [-81.17213, 25.201260000000126], [-81.33, 25.64], [-81.709999999999795, 25.87], [-82.239999999999895, 26.730000000000125], [-82.70515, 27.49504], [-82.85526, 27.88624], [-82.65, 28.550000000000146], [-82.929999999999865, 29.100000000000129], [-83.70959, 29.93656], [-84.1, 30.090000000000114], [-85.10882, 29.63615], [-85.28784, 29.686120000000127], [-85.7731, 30.152610000000116], [-86.399999999999878, 30.400000000000112], [-87.530359999999831, 30.27433], [-88.41782, 30.3849], [-89.180489999999836, 30.31598], [-89.593831178419748, 30.159994004836843], [-89.413735, 29.89419], [-89.43, 29.48864], [-89.21767, 29.29108], [-89.40823, 29.15961], [-89.77928, 29.307140000000135], [-90.15463, 29.11743], [-90.880224999999896, 29.148535000000116], [-91.626784999999842, 29.677000000000127], [-92.49906, 29.5523], [-93.22637, 29.78375], [-93.84842, 29.71363], [-94.69, 29.480000000000125], [-95.60026, 28.73863], [-96.59404, 28.30748], [-97.139999999999802, 27.83], [-97.37, 27.38], [-97.379999999999853, 26.69], [-97.33, 26.210000000000115], [-97.139999999999802, 25.87], [-97.529999999999859, 25.84], [-98.239999999999895, 26.060000000000109], [-99.019999999999854, 26.37], [-99.3, 26.84], [-99.52, 27.54], [-100.11, 28.11000000000012], [-100.45584, 28.696120000000118], [-100.957599999999886, 29.380710000000125], [-101.6624, 29.779300000000113], [-102.48, 29.76], [-103.11, 28.97], [-103.94, 29.27], [-104.456969999999814, 29.57196], [-104.705749999999895, 30.12173], [-105.03737, 30.64402], [-105.63159, 31.083830000000113], [-106.1429, 31.39995], [-106.507589999999794, 31.75452], [-108.24, 31.754853718166398], [-108.24194, 31.34222], [-109.035, 31.341940000000161], [-111.02361, 31.33472], [-113.30498, 32.03914], [-114.815, 32.52528], [-114.721389999999829, 32.72083], [-115.991349999999869, 32.61239000000014], [-117.127759999999753, 32.53534], [-117.295937691273863, 33.04622461520389], [-117.944, 33.621236431201389], [-118.410602275897475, 33.740909223124497], [-118.519894822799685, 34.027781577575745], [-119.081, 34.078], [-119.438840642016658, 34.348477178284291], [-120.36778, 34.44711], [-120.62286, 34.60855], [-120.74433, 35.156860000000101], [-121.714569999999853, 36.16153], [-122.54747, 37.551760000000101], [-122.51201, 37.783390000000132], [-122.95319, 38.113710000000104], [-123.7272, 38.951660000000111], [-123.865169999999878, 39.766990000000128], [-124.39807, 40.3132], [-124.17886, 41.142020000000109], [-124.2137, 41.999640000000134], [-124.532839999999894, 42.76599], [-124.14214, 43.70838], [-124.020535, 44.615895], [-123.898929999999893, 45.52341], [-124.079635, 46.86475], [-124.395669999999896, 47.72017], [-124.687210083007812, 48.184432983398537], [-124.566101074218736, 48.379714965820384], [-123.12, 48.04], [-122.587359999999876, 47.096], [-122.34, 47.36], [-122.5, 48.18], [-122.84, 49.0], [-120.0, 49.0], [-117.03121, 49.0], [-116.04818, 49.0], [-112.999999999999872, 49.0], [-110.049999999999812, 49.0], [-107.049999999999898, 49.0], [-104.04826, 48.99986], [-100.65, 49.0], [-97.228720000004699, 49.0007], [-95.159069509171943, 49.0], [-95.15609, 49.38425], [-94.81758, 49.38905]]], [[[-153.006314053336837, 57.115842190165878], [-154.0050902984581, 56.734676825581047], [-154.516402757770067, 56.992748928446687], [-154.670992804971092, 57.461195787172493], [-153.762779507441451, 57.816574612043773], [-153.228729417921073, 57.968968410872421], [-152.564790615835108, 57.901427313866961], [-152.141147223906273, 57.591058661521977], [-153.006314053336837, 57.115842190165878]]], [[[-165.579164191733554, 59.909986884187539], [-166.192770148767238, 59.754440822988961], [-166.848337368821944, 59.941406155020942], [-167.455277066090048, 60.213069159579376], [-166.467792121424566, 60.384169826897775], [-165.674429694663644, 60.293606879306232], [-165.579164191733554, 59.909986884187539]]], [[[-171.731656867539357, 63.782515367275906], [-171.114433560245175, 63.592191067144981], [-170.491112433940657, 63.694975490973505], [-169.682505459653555, 63.431115627691142], [-168.689439460300662, 63.297506212000584], [-168.77194088445458, 63.188598130945437], [-169.529439867204985, 62.976931464277882], [-170.290556200215917, 63.194437567794452], [-170.671385667990847, 63.375821845138965], [-171.553063117538642, 63.317789211675077], [-171.791110602891166, 63.40584585230048], [-171.731656867539357, 63.782515367275906]]], [[[-155.067790290324211, 71.147776394323685], [-154.344165208941206, 70.696408596470192], [-153.900006273392563, 70.889988511835682], [-152.210006069935275, 70.829992173944831], [-152.270002407826127, 70.60000621202984], [-150.739992438744508, 70.430016588005699], [-149.720003018167489, 70.530010484490433], [-147.613361579357047, 70.214034939241785], [-145.689989800225248, 70.120009670686741], [-144.920010959076393, 69.989991767040479], [-143.58944618042517, 70.152514146598307], [-142.072510348713365, 69.851938178172631], [-140.985987521560702, 69.711998399526365], [-140.985988329004869, 69.711998399526365], [-140.992498752029377, 66.000028591568665], [-140.997769748123119, 60.306396796298593], [-140.012997816153074, 60.276837877027575], [-139.03900042031583, 60.000007229240012], [-138.340889999999888, 59.562110000000146], [-137.4525, 58.905000000000101], [-136.47972, 59.46389], [-135.47583, 59.78778], [-134.945, 59.270560000000117], [-134.27111, 58.86111], [-133.355548882207188, 58.410285142645151], [-132.73042, 57.692890000000105], [-131.707809999999853, 56.55212], [-130.00778, 55.91583], [-129.979994263358265, 55.284997870497207], [-130.536110189467223, 54.802753404349389], [-131.08581823797212, 55.178906155002025], [-131.967211467142278, 55.497775580459049], [-132.250010742859445, 56.369996242897443], [-133.539181084356386, 57.178887437562125], [-134.07806292029602, 58.123067531966889], [-135.038211032279037, 58.187714748763931], [-136.628062309954629, 58.212209377670447], [-137.800006279686016, 58.499995429103777], [-139.867787041412981, 59.537761542389134], [-140.825273817133024, 59.72751740176507], [-142.574443535564427, 60.084446519604981], [-143.958880994879848, 59.99918040632339], [-145.925556816827822, 60.458609727614274], [-147.114373949146625, 60.884656073644628], [-148.224306200127643, 60.672989406977152], [-148.018065558850736, 59.978328965893631], [-148.570822516860858, 59.914172675203297], [-149.727857835875824, 59.705658270905545], [-150.608243374616421, 59.368211168039487], [-151.716392788683294, 59.155821031319974], [-151.859433153267105, 59.74498403587959], [-151.40971900124714, 60.725802720779392], [-150.346941494732505, 61.033587551509854], [-150.621110806256951, 61.284424953854447], [-151.895839199816834, 60.727197984451273], [-152.578329841095581, 60.061657212964285], [-154.019172126257558, 59.350279446034264], [-153.287511359653166, 58.864727688219787], [-154.232492438758442, 58.146373602930531], [-155.307491421510207, 57.727794501366319], [-156.308334723923082, 57.422774359763636], [-156.556097378546298, 56.979984849670636], [-158.117216559867728, 56.463608099994175], [-158.433321296197136, 55.994153550838533], [-159.603327399717415, 55.566686102920116], [-160.289719611634183, 55.643580634170561], [-161.223047655257773, 55.364734605523481], [-162.23776607974105, 55.024186916720097], [-163.069446581046378, 54.689737046927171], [-164.785569221027174, 54.40417308208216], [-164.942226325520011, 54.572224839895327], [-163.84833960676562, 55.039431464246107], [-162.870001390615897, 55.348043117893198], [-161.804174974596009, 55.894986477270429], [-160.563604702781134, 56.008054511125025], [-160.070559862284483, 56.418055324928744], [-158.684442918919416, 57.016675116597852], [-158.461097378553944, 57.216921291728866], [-157.722770352183858, 57.570000515363056], [-157.550274421193564, 58.328326321030218], [-157.041674974576949, 58.918884589261708], [-158.194731208305427, 58.615802313869828], [-158.517217984023034, 58.787781480537305], [-159.058606126928709, 58.424186102931671], [-159.711667040017318, 58.931390285876333], [-159.981288825500144, 58.572549140041623], [-160.355271165996498, 59.071123358793628], [-161.355003425115001, 58.670837714260742], [-161.968893602526293, 58.671664537177371], [-162.054986538724648, 59.266925360747436], [-161.874170702135331, 59.633621324290587], [-162.518059048492034, 59.989723619213905], [-163.818341437820123, 59.798055731843377], [-164.662217577146407, 60.267484442782639], [-165.346387702474772, 60.507495632562396], [-165.350831875651835, 61.073895168697497], [-166.121379157555907, 61.500019029376212], [-165.734451870770471, 62.074996853271792], [-164.919178636717788, 62.633076483807919], [-164.562507901039339, 63.146378485763044], [-163.753332485996964, 63.219448961023758], [-163.067224494457832, 63.05945872664801], [-162.260555386381697, 63.541935736741159], [-161.534449836248569, 63.455816962326757], [-160.772506680321101, 63.76610810002326], [-160.958335130842528, 64.222798570402759], [-161.518068407212184, 64.402787584075313], [-160.777777676414729, 64.788603827566405], [-161.391926235987597, 64.777235012462327], [-162.453050096668818, 64.559444688568206], [-162.757786017894034, 64.338605455168803], [-163.54639421288428, 64.559160468190484], [-164.960829841145141, 64.446945095468848], [-166.425288255864473, 64.686672064870706], [-166.845004238939026, 65.088895575614529], [-168.110560065767146, 65.669997056736733], [-166.70527116602193, 66.088317776139391], [-164.474709642575448, 66.576660061297488], [-163.652511766595637, 66.576660061297488], [-163.788601651036117, 66.077207343196662], [-161.677774421210131, 66.116119696712403], [-162.489714525379981, 66.735565090595102], [-163.719716966791083, 67.116394558370089], [-164.430991380856511, 67.616338202577779], [-165.390286831706703, 68.042772121850234], [-166.764440680995989, 68.35887685817967], [-166.204707404626561, 68.883030910916162], [-164.430810513343431, 68.915535386827727], [-163.168613654614489, 69.371114813912882], [-162.930566169261965, 69.858061835399255], [-161.908897264635499, 70.333329983187625], [-160.93479651593367, 70.447689927849567], [-159.039175788387126, 70.891642157668926], [-158.119722866833939, 70.824721177851032], [-156.580824551398024, 71.357763576941736], [-155.067790290324211, 71.147776394323685]]]] } },
-            { "type": "Feature", "properties": { "admin": "Uzbekistan", "name": "Uzbekistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[66.518606805288655, 37.362784328758785], [66.546150343700205, 37.974684963526855], [65.215998976507379, 38.402695013984292], [64.170223016216752, 38.892406724598231], [63.518014764261018, 39.363256537425627], [62.374260288344992, 40.053886216790382], [61.882714064384679, 41.084856879229392], [61.547178989513547, 41.2663703476546], [60.46595299667068, 41.22032664648254], [60.083340691981654, 41.425146185871391], [59.976422153569771, 42.223081976890199], [58.629010857991453, 42.751551011723045], [57.786529982337065, 42.170552883465511], [56.93221520368779, 41.82602610937559], [57.096391229079089, 41.32231008561056], [55.968191359282898, 41.308641669269356], [55.928917270741081, 44.995858466159099], [58.503127068928457, 45.586804307632818], [58.689989048095882, 45.500013739598621], [60.239971958258316, 44.784036770194717], [61.05831994003244, 44.405816962250505], [62.013300408786236, 43.504476630215642], [63.185786981056559, 43.650074978197999], [64.900824415959264, 43.728080552742576], [66.098012322865074, 42.997660020513088], [66.023391554635609, 41.994646307943974], [66.510648634715707, 41.987644151368436], [66.714047072216502, 41.168443508461493], [67.985855747351806, 41.135990708982213], [68.259895867795606, 40.662324530594894], [68.632482944620008, 40.668680731766798], [69.070027296835306, 41.384244289712363], [70.388964878220776, 42.081307684897439], [70.96231489449913, 42.266154283205481], [71.259247674448218, 42.167710679689456], [70.420022414028196, 41.519998277343134], [71.157858514291576, 41.143587144529107], [71.870114780570447, 41.392900092121259], [73.055417108049156, 40.86603302668945], [71.774875115856545, 40.145844428053763], [71.014198032520156, 40.244365546218226], [70.601406691372674, 40.218527330072284], [70.458159621059608, 40.49649485937028], [70.666622348925031, 40.960213324541407], [69.329494663372813, 40.727824408524839], [69.011632928345477, 40.086158148756653], [68.536416456989414, 39.533452867178923], [67.701428664017342, 39.580478420564518], [67.442219679641298, 39.140143541005479], [68.176025018185911, 38.901553453113898], [68.392032505165943, 38.157025254868728], [67.829999627559502, 37.144994004864678], [67.075782098259609, 37.35614390720928], [66.518606805288655, 37.362784328758785]]] } },
-            { "type": "Feature", "properties": { "admin": "Venezuela", "name": "Venezuela", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.331583624950284, 11.776284084515805], [-71.36000566271079, 11.53999359786121], [-71.947049933546495, 11.423282375530018], [-71.620868292920164, 10.969459947142791], [-71.633063930941063, 10.446494452349027], [-72.074173956984495, 9.865651353388369], [-71.695644090446521, 9.072263088411246], [-71.26455929226772, 9.137194525585981], [-71.039999355743376, 9.859992784052407], [-71.350083787710773, 10.211935126176213], [-71.400623338492224, 10.968969021036013], [-70.155298834906503, 11.375481675660039], [-70.293843349881016, 11.846822414594211], [-69.943244594996813, 12.162307033736095], [-69.584300096297454, 11.459610907431211], [-68.882999233664435, 11.44338450769156], [-68.233271450458716, 10.885744126829945], [-68.194126552997616, 10.554653225135921], [-67.296248541926317, 10.545868231646306], [-66.227864142507983, 10.648626817258684], [-65.655237596281737, 10.20079885501732], [-64.890452236578156, 10.077214667191296], [-64.329478725833724, 10.389598700395679], [-64.318006557864933, 10.641417954953978], [-63.079322475828725, 10.701724351438598], [-61.880946010980182, 10.7156253117251], [-62.730118984616396, 10.420268662960904], [-62.388511928950969, 9.948204453974636], [-61.588767462801918, 9.873066921422263], [-60.830596686431711, 9.38133982994894], [-60.671252407459718, 8.580174261911877], [-60.150095587796166, 8.602756862823425], [-59.758284878159181, 8.367034816924045], [-60.550587938058186, 7.779602972846178], [-60.637972785063752, 7.414999904810853], [-60.295668097562377, 7.043911444522918], [-60.543999192940966, 6.856584377464881], [-61.159336310456467, 6.696077378766317], [-61.139415045807937, 6.234296779806142], [-61.410302903881941, 5.959068101419616], [-60.733574184803707, 5.2002772078619], [-60.601179165271922, 4.918098049332129], [-60.966893276601517, 4.536467596856638], [-62.085429653559125, 4.162123521334308], [-62.804533047116692, 4.006965033377951], [-63.093197597899092, 3.770571193858784], [-63.888342861574145, 4.020530096854571], [-64.628659430587533, 4.14848094320925], [-64.816064012294007, 4.056445217297422], [-64.368494432214092, 3.797210394705246], [-64.408827887617903, 3.126786200366623], [-64.269999152265783, 2.497005520025566], [-63.422867397705105, 2.411067613124174], [-63.368788011311644, 2.200899562993129], [-64.083085496666072, 1.91636912679408], [-64.199305792890499, 1.49285492594602], [-64.611011928959854, 1.328730576987041], [-65.354713304288353, 1.0952822941085], [-65.548267381437554, 0.78925446207603], [-66.325765143484944, 0.724452215982012], [-66.876325853122566, 1.253360500489336], [-67.181294318293041, 2.250638129074062], [-67.447092047786299, 2.600280869960869], [-67.809938117123693, 2.820655015469569], [-67.303173183853417, 3.31845408773718], [-67.33756384954367, 3.542342230641721], [-67.621835903581271, 3.839481716319994], [-67.823012254493534, 4.503937282728898], [-67.744696621355203, 5.221128648291667], [-67.521531948502741, 5.556870428891968], [-67.34143958196556, 6.095468044454021], [-67.695087246355001, 6.267318020040645], [-68.265052456318216, 6.153268133972473], [-68.985318569602327, 6.206804917826856], [-69.389479946557103, 6.099860541198835], [-70.093312954372408, 6.960376491723109], [-70.674233567981503, 7.087784735538717], [-71.960175747348629, 6.991614895043538], [-72.19835242378187, 7.340430813013682], [-72.444487270788059, 7.42378489830048], [-72.479678921178831, 7.632506008327352], [-72.360900641555958, 8.002638454617893], [-72.439862230097944, 8.405275376820027], [-72.660494757768092, 8.62528778730268], [-72.788729824500379, 9.085027167187331], [-73.304951544880026, 9.151999823437604], [-73.027604132769554, 9.736770331252441], [-72.905286017534692, 10.45034434655477], [-72.614657762325194, 10.821975409381777], [-72.227575446242923, 11.108702093953237], [-71.973921678338272, 11.608671576377116], [-71.331583624950284, 11.776284084515805]]] } },
-            { "type": "Feature", "properties": { "admin": "Vietnam", "name": "Vietnam", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[108.050180291782908, 21.552379869060111], [106.715067987090066, 20.696850694252014], [105.881682163519002, 19.752050482659694], [105.662005649846279, 19.058165188060567], [106.426816847765991, 18.004120998603224], [107.36195356651973, 16.697456569887049], [108.269495070429599, 16.079742336486145], [108.877106561317447, 15.276690578670436], [109.335269810017209, 13.42602834721772], [109.200135939573954, 11.666859239137761], [108.366129998815424, 11.00832062422627], [107.22092858279521, 10.36448395430183], [106.4051127462034, 9.530839748569317], [105.158263787865081, 8.599759629750492], [104.795185174582372, 9.2410383162765], [105.076201613385592, 9.918490505406806], [104.334334751403446, 10.486543687375228], [105.199914992292321, 10.889309800658094], [106.249670037869436, 10.961811835163585], [105.810523716253101, 11.567614650921225], [107.491403029410861, 12.337205918827944], [107.614547967562402, 13.535530707244202], [107.382727492301058, 14.202440904186968], [107.564525181103875, 15.202173163305554], [107.312705926545576, 15.908538316303177], [106.55600792849566, 16.604283962464802], [105.925762160264, 17.485315456608955], [105.094598423281496, 18.666974595611073], [103.896532017026701, 19.265180975821799], [104.183387892678908, 19.624668077060214], [104.822573683697073, 19.886641750563879], [104.435000441508024, 20.758733221921528], [103.203861118586431, 20.766562201413745], [102.754896274834636, 21.675137233969462], [102.170435825613552, 22.464753119389297], [102.706992222100084, 22.708795070887668], [103.504514601660546, 22.703756618739202], [104.476858351664447, 22.819150092046961], [105.329209425886603, 23.352063300056908], [105.811247186305209, 22.976892401617899], [106.725403273548451, 22.794267889898414], [106.567273390735295, 22.218204860924768], [107.043420037872608, 21.811898912029907], [108.050180291782908, 21.552379869060111]]] } },
-            { "type": "Feature", "properties": { "admin": "Vanuatu", "name": "Vanuatu", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[167.844876743845077, -16.466333103097153], [167.515181105822847, -16.597849623279966], [167.180007765977791, -16.159995212470957], [167.2168013857696, -15.891846205308449], [167.844876743845077, -16.466333103097153]]], [[[167.107712437201485, -14.933920179913951], [167.2700281110302, -15.74002084723487], [167.001207310247935, -15.614602146062492], [166.79315799384085, -15.668810723536719], [166.649859247095549, -15.392703545801192], [166.629136997746429, -14.6264970842096], [167.107712437201485, -14.933920179913951]]]] } },
-            { "type": "Feature", "properties": { "admin": "Yemen", "name": "Yemen", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.108572625547502, 16.651051133688949], [52.385205926325874, 16.38241120041965], [52.191729363825075, 15.938433132384018], [52.168164910699986, 15.597420355689945], [51.172515089732471, 15.175249742081489], [49.574576450403136, 14.708766587782746], [48.679230584514151, 14.003202419485657], [48.238947381387412, 13.948089504446369], [47.938914015500771, 14.007233181204423], [47.354453566279702, 13.592219753468379], [46.71707645039173, 13.399699204965016], [45.877592807810252, 13.347764390511681], [45.625050083199874, 13.290946153206759], [45.406458774605241, 13.02690542241143], [45.144355910020849, 12.953938300015306], [44.9895333188744, 12.699586900274708], [44.494576450382844, 12.721652736863344], [44.175112745954486, 12.585950425664873], [43.48295861183712, 12.63680003504008], [43.222871128112118, 13.220950425667422], [43.251448195169516, 13.767583726450848], [43.087943963398047, 14.062630316621306], [42.892245314308717, 14.802249253798745], [42.604872674333606, 15.213335272680592], [42.805015496600042, 15.261962795467252], [42.702437778500652, 15.718885809791995], [42.823670688657408, 15.911742255105263], [42.779332309750963, 16.34789134364868], [43.218375278502734, 16.666889960186406], [43.115797560403351, 17.088440456607369], [43.380794305196098, 17.579986680567668], [43.791518589051904, 17.319976711491105], [44.062613152855072, 17.410358791569589], [45.216651238797184, 17.43332896572333], [45.399999220568752, 17.333335069238554], [46.366658563020529, 17.233315334537632], [46.749994337761642, 17.283338120996174], [47.000004917189749, 16.949999294497438], [47.466694777217626, 17.116681626854877], [48.183343540241324, 18.166669216377311], [49.116671583864857, 18.616667588774941], [52.000009800022227, 19.000003363516054], [52.782184279192037, 17.349742336491229], [53.108572625547502, 16.651051133688949]]] } },
-            { "type": "Feature", "properties": { "admin": "South Africa", "name": "South Africa", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.521001417778869, -29.257386976846245], [31.325561150850994, -29.401977634398907], [30.901762729625336, -29.909956963828034], [30.622813348113816, -30.423775730106122], [30.055716180142774, -31.140269463832951], [28.925552605919535, -32.172041110972494], [28.219755893677092, -32.771952813448848], [27.464608188595967, -33.226963799778794], [26.419452345492818, -33.614950453426175], [25.909664340933482, -33.667040297176392], [25.78062828950069, -33.944646091448334], [25.172861769315965, -33.796851495093577], [24.67785322439212, -33.987175795224537], [23.594043409934635, -33.794474379208147], [22.988188917744729, -33.916430759416976], [22.574157342222232, -33.864082533505304], [21.542799106541022, -34.258838799782922], [20.689052768646999, -34.417175388325226], [20.071261020597628, -34.795136814107984], [19.616405063564567, -34.819166355123706], [19.193278435958714, -34.462598972309777], [18.855314568769867, -34.444305515278458], [18.424643182049376, -33.997872816708963], [18.377410922934612, -34.13652068454806], [18.244499139079917, -33.867751560198023], [18.250080193767442, -33.281430759414434], [17.925190463948436, -32.61129078545342], [18.247909783611185, -32.429131361624563], [18.221761508871477, -31.661632989225662], [17.566917758868861, -30.72572112398754], [17.0644161312627, -29.878641045859158], [17.06291751472622, -29.875953871379977], [16.344976840895239, -28.576705010697697], [16.824017368240899, -28.082161553664466], [17.218928663815401, -28.355943291946804], [17.387497185951499, -28.783514092729774], [17.836151971109526, -28.856377862261311], [18.464899122804745, -29.045461928017271], [19.002127312911082, -28.972443129188857], [19.89473432788861, -28.461104831660769], [19.895767856534427, -24.767790215760588], [20.165725538827186, -24.917961928000768], [20.758609246511831, -25.868136488551446], [20.666470167735437, -26.477453301704916], [20.889609002371731, -26.828542982695907], [21.60589603036939, -26.726533705351748], [22.105968865657864, -26.28025603607913], [22.579531691180584, -25.979447523708142], [22.824271274514896, -25.500458672794768], [23.312096795350179, -25.268689873965712], [23.733569777122703, -25.39012948985161], [24.211266717228792, -25.670215752873567], [25.025170525825782, -25.719670098576891], [25.664666375437712, -25.486816094669706], [25.765848829865206, -25.174845472923671], [25.941652052522151, -24.696373386333214], [26.485753208123292, -24.616326592713097], [26.78640669119741, -24.240690606383478], [27.119409620886238, -23.574323011979772], [28.017235955525244, -22.827753594659072], [29.432188348109033, -22.091312758067584], [29.839036899542965, -22.102216485281172], [30.322883335091767, -22.271611830333931], [30.659865350067083, -22.151567478119912], [31.191409132621278, -22.251509698172395], [31.670397983534645, -23.658969008073861], [31.930588820124242, -24.369416599222532], [31.752408481581874, -25.484283949487406], [31.837777947728057, -25.843331801051342], [31.333157586397899, -25.660190525008943], [31.044079624157146, -25.731452325139436], [30.949666782359905, -26.022649021104144], [30.676608514129633, -26.398078301704604], [30.685961948374477, -26.743845310169526], [31.282773064913325, -27.285879408478991], [31.868060337051073, -27.17792734142127], [32.071665480281062, -26.733820082304902], [32.830120477028878, -26.74219166433619], [32.580264926897677, -27.470157566031808], [32.462132602678444, -28.30101124442055], [32.203388706193032, -28.752404880490065], [31.521001417778869, -29.257386976846245]], [[28.978262566857236, -28.955596612261708], [28.541700066855491, -28.647501722937562], [28.07433841320778, -28.851468601193581], [27.532511020627471, -29.242710870075353], [26.999261915807629, -29.875953871379977], [27.749397006956478, -30.645105889612214], [28.107204624145421, -30.545732110314944], [28.291069370239903, -30.226216729454293], [28.848399692507734, -30.070050551068245], [29.018415154748016, -29.743765557577362], [29.325166456832587, -29.257386976846245], [28.978262566857236, -28.955596612261708]]] } },
-            { "type": "Feature", "properties": { "admin": "Zambia", "name": "Zambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.759375441221316, -9.230599053589058], [33.231387973775291, -9.676721693564799], [33.485687697083584, -10.525558770391111], [33.315310499817279, -10.796549981329695], [33.114289178201908, -11.607198174692311], [33.306422153463068, -12.435778090060214], [32.991764357237876, -12.783870537978272], [32.688165317523122, -13.712857761289273], [33.214024692525207, -13.97186003993615], [30.179481235481827, -14.796099134991525], [30.274255812305103, -15.507786960515208], [29.51683434420314, -15.644677829656386], [28.947463413211256, -16.043051446194436], [28.825868768028492, -16.389748630440611], [28.467906121542676, -16.468400160388843], [27.598243442502753, -17.290830580314005], [27.044427117630729, -17.938026218337427], [26.706773309035633, -17.961228936436477], [26.381935255648919, -17.846042168857892], [25.264225701608005, -17.736539808831413], [25.084443393664564, -17.661815687737366], [25.076950310982255, -17.578823337476617], [24.6823490740015, -17.35341073981947], [24.033861525170771, -17.29584319424632], [23.215048455506057, -17.52311614346598], [22.562478468524255, -16.89845142992181], [21.887842644953867, -16.080310153876876], [21.933886346125913, -12.898437188369357], [24.016136508894672, -12.91104623784857], [23.930922072045373, -12.565847670138854], [24.079905226342838, -12.191296888887361], [23.904153680118181, -11.722281589406318], [24.017893507592586, -11.237298272347088], [23.912215203555714, -10.926826267137512], [24.257155389103982, -10.951992689663655], [24.314516228947948, -11.262826429899269], [24.783169793402948, -11.238693536018962], [25.418118116973197, -11.330935967659958], [25.752309604604726, -11.784965101776356], [26.55308759939961, -11.924439792532125], [27.164419793412456, -11.608748467661071], [27.38879886242378, -12.132747491100663], [28.15510867687998, -12.272480564017894], [28.52356163912102, -12.698604424696679], [28.934285922976834, -13.248958428605132], [29.699613885219485, -13.257226657771827], [29.616001417771223, -12.178894545137307], [29.341547885869087, -12.36074391037241], [28.642417433392346, -11.971568698782312], [28.372253045370421, -11.793646742401389], [28.496069777141763, -10.789883721564044], [28.673681674928922, -9.605924981324931], [28.449871046672818, -9.164918308146083], [28.734866570762495, -8.526559340044576], [29.002912225060467, -8.40703175215347], [30.34608605319081, -8.238256524288216], [30.740015496551781, -8.340007419470913], [31.157751336950042, -8.594578747317362], [31.55634809746649, -8.76204884199864], [32.191864861791963, -8.930358981973276], [32.759375441221316, -9.230599053589058]]] } },
-            { "type": "Feature", "properties": { "admin": "Zimbabwe", "name": "Zimbabwe", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.191409132621278, -22.251509698172395], [30.659865350067083, -22.151567478119912], [30.322883335091767, -22.271611830333931], [29.839036899542965, -22.102216485281172], [29.432188348109033, -22.091312758067584], [28.794656202924209, -21.639454034107445], [28.02137007010861, -21.485975030200578], [27.727227817503252, -20.851801853114711], [27.724747348753247, -20.499058526290387], [27.296504754350501, -20.391519870690995], [26.164790887158478, -19.293085625894935], [25.850391473094724, -18.714412937090533], [25.649163445750155, -18.536025892818987], [25.264225701608005, -17.736539808831413], [26.381935255648919, -17.846042168857892], [26.706773309035633, -17.961228936436477], [27.044427117630729, -17.938026218337427], [27.598243442502753, -17.290830580314005], [28.467906121542676, -16.468400160388843], [28.825868768028492, -16.389748630440611], [28.947463413211256, -16.043051446194436], [29.51683434420314, -15.644677829656386], [30.274255812305103, -15.507786960515208], [30.338954705534537, -15.880839125230242], [31.173063999157673, -15.860943698797868], [31.636498243951188, -16.071990248277881], [31.852040643040592, -16.319417006091374], [32.328238966610222, -16.392074069893749], [32.847638787575839, -16.713398125884613], [32.849860874164385, -17.979057305577175], [32.654885695127142, -18.672089939043492], [32.611994256324884, -19.419382826416268], [32.772707960752619, -19.715592136313294], [32.659743279762573, -20.30429005298231], [32.508693068173436, -20.395292250248303], [32.244988234188007, -21.116488539313689], [31.191409132621278, -22.251509698172395]]] } }
-        ]
-    };
-
-var randomcountriesData1 = [
-    { country: "Iran", "continent": "Asia", "CategoryName": "Books", "Sales": 550 },
-    { country: "Benin", "continent": "Africa", "CategoryName": "Books", "Sales": 1000 },
-    { country: "China", "continent": "Asia", "CategoryName": "Books", "Sales": 420 },
-    { country: "Chile", "continent": "South America", "CategoryName": "Books", "Sales": 1100 },
-    { country: "Cuba", "continent": "North America", "CategoryName": "Books", "Sales": 450 },
-    { country: "Spain", "continent": "Europe", "CategoryName": "Books", "Sales": 1200 },
-    { country: "Fiji", "continent": "Oceania", "CategoryName": "Books", "Sales": 618.0 },
-];
-
-module mapcomponenet {
-    $(function () {
-        var mapsample = new ej.datavisualization.Map($("#map"), {
-            enableAnimation: true,
-            navigationControl: {
-                enableNavigation: true,
-                orientation: 'vertical',
-                absolutePosition: { x: 5, y: 15 },
-                dockPosition: 'none'
-            },
-            layers: [
-                {
-                    layerType: 'geometry',
-                    enableMouseHover: false,
-                    enableSelection: false,
-                    shapeSettings: {
-                        fill: "#626171",
-                        autoFill: false,
-                        highlightStroke: "white",
-                        stroke: "white",
-                        strokeThickness: 0.5,
-                        highlightColor: "#BFBFBF"
-                    },
-                    shapeData: world_map,
-                    legendSettings: { dockOnMap: false }
-                }
-            ]
-        });
-    });
-}
-
-
-
-
-
-
-
-module MenuComponent {
-    $(function () {
-        var sample = new ej.Menu($("#syncfusionProducts"), {
-            width: "100%",
-            animationType: ej.AnimationType.Default,
-            cssClass: 'gradient-lime ',
-            enableAnimation: true,
-            enableSeparator: true,
-            height: 40,
-            htmlAttributes: { "aria-label": "menu" },
-            menuType: "normalmenu",
-            orientation: ej.Orientation.Horizontal,
-            showRootLevelArrows: true,
-            showSubLevelArrows: true,
-            subMenuDirection: ej.Direction.Right,
-            titleText: "Menu",
-
-        });
-    });
-
-}
-
-
-
-
-
-
-
-
-module NavigationDrawerComponent {
-    $(function () {
-        var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
-            targetId: "butdrawer",
-            contentId: "content_container",
-            type: "overlay",
-            direction: "left",
-            enableListView: true,
-            listViewSettings: {
-                width: 300,
-                selectedItemIndex: 0
-            },
-            position: "normal"
-        });
-        $("#navpane_listview").click(function (e: any) {
-            var text = e.target["text"] || $(e.target).closest("li.e-list").text();
-            $("#butdrawer").parent().children("h2").text(text);
-        });
-    });
-}
-
-
-
-module PDFViewerComponent {
-    $(function () {
-        var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
-            serviceUrl: (<any>window).baseurl + "api/PdfViewer",
-            isResponsive: true
-        });
-    });
-}
-
-
-
-module PivotChartOlap {
-    $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"), {
-            dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Date].[Fiscal]"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Internet Sales Amount]"
-                            }
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            },
-            isResponsive: true, zooming: { enableScrollbar: true },
-            commonSeriesOptions: {
-                type: "column"
-            },
-            size: { height: "460px", width: "100%" },
-            primaryXAxis: { title: { text: "Date - Fiscal" }, labelRotation: 0 },
-            primaryYAxis: { title: { text: "Internet Sales Amount" } },
-            legend: { visible: true, rowCount: 2 }
-            // load:"loadTheme"
-        });
-    });
-}
-
-
-
-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" },
-    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
-    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
-    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
-    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
-    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
-    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
-    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
-    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
-    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
-    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
-    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
-    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
-    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
-    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
-    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
-    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
-    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
-    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
-    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
-]
-
-module PivotChartRelational {
-
-    $(function () {
-        var sample = new ej.PivotChart($("#PivotChart"), {
-            dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                        fieldCaption: "Country"
-                    },
-                    {
-                        fieldName: "State",
-                        fieldCaption: "State"
-                    },
-                    {
-                        fieldName: "Date",
-                        fieldCaption: "Date"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "Product",
-                        fieldCaption: "Product"
-                    }
-                ],
-                values: [
-                    {
-                        fieldName: "Amount",
-                        fieldCaption: "Amount"
-                    }
-                ],
-                filters: []
-            },
-            isResponsive: true, zooming: { enableScrollbar: true },
-            commonSeriesOptions: {
-                type: "column"
-            },
-            size: { height: "460px", width: "100%" },
-            primaryYAxis: { title: { text: "Amount" } },
-            legend: { visible: true }
-            // load:"loadTheme"
-        });
-    });
-}
-
-
-
-module PivotGaugeOlap {
-
-    $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"), {
-            dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Date].[Fiscal]",
-                        filterItems: { filterType: "include", values: ["[Date].[Fiscal].[Fiscal Year].&amp;[2004]"] }
-                    },
-                ],
-                columns: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Internet Sales Amount]"
-                            },
-                            {
-                                fieldName: "[Measures].[Internet Revenue Status]"
-                            },
-                            {
-                                fieldName: "[Measures].[Internet Revenue Trend]"
-                            },
-                            {
-                                fieldName: "[Measures].[Internet Revenue Goal]"
-                            },
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            },
-            enableTooltip: true, isResponsive: true,
-            labelFormatSettings: { decimalPlaces: 2 },
-            scales: [{
-                showRanges: true,
-                radius: 150, showScaleBar: true, size: 1,
-                border: {
-                    width: 0.5
-                },
-                showIndicators: true, showLabels: true,
-                pointers: [{
-                    showBackNeedle: true,
-                    backNeedleLength: 20,
-                    length: 120,
-                    width: 7
-                },
-                    {
-                        type: "marker",
-                        markerType: "diamond",
-                        distanceFromScale: 5,
-                        placement: "center",
-                        backgroundColor: "#29A4D9",
-                        length: 25,
-                        width: 15
-                    }],
-                ticks: [{
-                    type: "major",
-                    distanceFromScale: 2,
-                    height: 16,
-                    width: 1, color: "#8c8c8c"
-                },
-                    {
-                        type: "minor",
-                        height: 6,
-                        width: 1,
-                        distanceFromScale: 2,
-                        color: "#8c8c8c"
-                    }],
-                labels: [{
-                    color: "#8c8c8c"
-                }],
-                ranges: [{
-                    distanceFromScale: -5,
-                    backgroundColor: "#fc0606",
-                    border: { color: "#fc0606" }
-                },
-                    {
-                        distanceFromScale: -5
-                    }],
-                customLabels: [{
-                    position: { x: 180, y: 290 },
-                    font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                },
-                    {
-                        position: { x: 180, y: 320 },
-                        font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    },
-                    {
-                        position: { x: 180, y: 150 },
-                        font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    }]
-            }]
-        });
-    });
-}
-
-
-
-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" },
-    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
-    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
-    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
-    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
-    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
-    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
-    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
-    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
-    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
-    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
-    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
-    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
-    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
-    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
-    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
-    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
-    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
-    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
-    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
-]
-
-module PivotGaugeRelational {
-    $(function () {
-        var sample = new ej.PivotGauge($("#PivotGauge"), {
-            dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                    },
-                    {
-                        fieldName: "State",
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "Product",
-                    }
-                ],
-                values: [
-                    {
-                        fieldName: "Amount",
-                    },
-                    {
-                        fieldName: "Quantity",
-                    }
-                ]
-            },
-            enableTooltip: true, isResponsive: true,
-            labelFormatSettings: { decimalPlaces: 2 },
-            scales: [{
-                showRanges: true,
-                radius: 150, showScaleBar: true, size: 1,
-                border: {
-                    width: 0.5
-                },
-                showIndicators: true, showLabels: true,
-                pointers: [{
-                    showBackNeedle: true,
-                    backNeedleLength: 20,
-                    length: 120,
-                    width: 7
-                },
-                    {
-                        type: "marker",
-                        markerType: "diamond",
-                        distanceFromScale: 5,
-                        placement: "center",
-                        backgroundColor: "#29A4D9",
-                        length: 25,
-                        width: 15
-                    }],
-                ticks: [{
-                    type: "major",
-                    distanceFromScale: 2,
-                    height: 16,
-                    width: 1, color: "#8c8c8c"
-                },
-                    {
-                        type: "minor",
-                        height: 6,
-                        width: 1,
-                        distanceFromScale: 2,
-                        color: "#8c8c8c"
-                    }],
-                labels: [{
-                    color: "#8c8c8c"
-                }],
-                ranges: [{
-                    distanceFromScale: -5,
-                    backgroundColor: "#fc0606",
-                    border: { color: "#fc0606" }
-                },
-                    {
-                        distanceFromScale: -5
-                    }],
-                customLabels: [{
-                    position: { x: 180, y: 290 },
-                    font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                },
-                    {
-                        position: { x: 180, y: 320 },
-                        font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    },
-                    {
-                        position: { x: 180, y: 150 },
-                        font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
-                    }]
-            }]
-        });
-    });
-}
-
-
-
-module PivotGridOlap {
-
-    $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"), {
-            dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Date].[Fiscal]"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Internet Sales Amount]",
-                            }
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            },
-            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" },
-    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
-    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
-    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
-    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
-    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
-    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
-    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
-    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
-    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
-    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
-    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
-    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
-    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
-    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
-    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
-    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
-    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
-    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
-    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
-    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
-    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
-]
-
-module PivotGridRelational {
-    $(function () {
-        var sample = new ej.PivotGrid($("#PivotGrid"), {
-            dataSource: {
-                data: pivot_dataset,
-                rows: [
-                    {
-                        fieldName: "Country",
-                        fieldCaption: "Country"
-                    },
-                    {
-                        fieldName: "State",
-                        fieldCaption: "State"
-                    }
-                ],
-                columns:
-                [{
-                    fieldName: "Product",
-                    fieldCaption: "Product"
-                }
-                ],
-                values: [
-                    {
-                        fieldName: "Amount",
-                        fieldCaption: "Amount"
-                    },
-                    {
-                        fieldName: "Quantity",
-                        fieldCaption: "Quantity"
-                    }
-                ],
-                filters: []
-            },
-            enableGroupingBar: true,
-            pivotTableFieldListID: "PivotSchemaDesigner"
-        });
-        $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
-
-    });
-}
-
-
-
-module PivotTreeMap {
-    $(function () {
-        var sample = new ej.PivotTreeMap($("#PivotTreeMap"), {
-            dataSource: {
-                data: "//bi.syncfusion.com/olap/msmdpump.dll;Locale Identifier=1033;",
-                catalog: "Adventure Works DW 2008 SE",
-                cube: "Adventure Works",
-                rows: [
-                    {
-                        fieldName: "[Customer].[Customer Geography]"
-                    }
-                ],
-                columns: [
-                    {
-                        fieldName: "[Date].[Fiscal]"
-                    }
-                ],
-                values: [
-                    {
-                        measures: [
-                            {
-                                fieldName: "[Measures].[Customer Count]",
-                            }
-                        ],
-                        axis: "columns"
-                    }
-                ],
-                filters: []
-            }
-        });
-    });
-}
-
-
-
-module ProgressBarComponent {
-    $(function () {
-        var sample = new ej.ProgressBar($("#progressBar"), {
-            width: 200,
-            value: 45,
-            height: 20,
-            enablePersistence: true,
-            maxValue: 200,
-            minValue: 0,
-            showRoundedCorner: true,
-            text: 'loading...'
-        });
-    });
-
-}
-
-
-
-
-declare var rteObj: any;
-declare var data: any;
-var radialEle = $('#defaultradialmenu'), action = 0, forRedo = 0;
-var rteEle = $("#rteSample1");
-module RadialMenuComponent {
-    $(function () {
-
-        if (!(ej.browserInfo().name == "msie" && parseInt(ej.browserInfo().version) < 9)) {
-            var radialmenuInstance = new ej.RadialMenu($("#defaultradialmenu"), {
-                imageClass: "imageclass",
-                backImageClass: "backimageclass",
-                targetElementId: "radialtarget1"
-            });
-            $("#radialtarget1").parent().css("position", "relative");
-        }
-        else {
-            $("#contentDiv").html("Radial Menu is only supported from Internet Explorer Versioned 9 and above.").css({ "font-size": "20px", "color": "red" });
-        }
-        var rteInstance = new ej.RTE($("#rteSample1"), {
-            width: "100%",
-            minWidth: "10px",
-            change: (e) => { radialEle.ejRadialMenu("enableItem", "Undo"); },
-            select: (e) => {
-                var target = $("#radialtarget1"), radialRadius = 150, radialDiameter = 2 * radialRadius,
-                    // To get Iframe positions
-                    iframeY = e.event.clientY, iframeX = e.event.clientX,
-                    // To set Radial Menu position within target
-                    x = iframeX > target.width() - radialRadius ? target.width() - radialDiameter : (iframeX > radialRadius ? iframeX - radialRadius : 0),
-                    y = iframeY > target.height() - radialRadius ? target.height() - radialDiameter : (iframeY > radialRadius ? iframeY - radialRadius : 0);
-                radialEle.ejRadialMenu("setPosition", x, y);
-                radialEle.focus();
-                $('iframe').contents().find('body').blur();
-            },
-            showToolbar: false,
-            showContextMenu: false
-        });
-        $(window).resize(function () {
-            if (ej.isMobile() && ej.isPortrait())
-                $('#defaultradialmenu').css({ "left": 25 });
-        });
-    });
-}
-
-
-function bold(e: any) {
-
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("bold");
-    data = rteObj._getSelectedHtmlString() ? true : false;
-    if (data) action += 1;
-    forRedo = action;
-    radialEle.focus();
-}
-function italic(e: any) {
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("italic");
-    data = rteObj._getSelectedHtmlString() ? true : false;
-    if (data) action += 1;
-    forRedo = action;
-    radialEle.focus();
-}
-function undo(e: any) {
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("undo");
-    action -= 1;
-    if (action == 0)
-        radialEle.ejRadialMenu("disableItem", "Undo");
-    radialEle.ejRadialMenu("enableItem", "Redo");
-    radialEle.focus();
-}
-function redo(e: any) {
-    rteObj = rteEle.data("ejRTE");
-    rteObj.executeCommand("redo");
-    action += 1;
-    if (forRedo == action) radialEle.ejRadialMenu("disableItem", "Redo");
-    radialEle.ejRadialMenu("enableItem", "Undo");
-    radialEle.focus();
-}
-
-
-
-
-module RadialSliderComponent {
-    $(function () {
-        var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
-            innerCircleImageUrl: "images/radialslider/chevron-right.png"
-        });
-    });
-}
-
-
-module rangecomponent {
-    $(function () {
-        var linearsample = new ej.datavisualization.RangeNavigator($("#RangeNavigator"), {
-            enableDeferredUpdate: true,
-            padding: "15",
-            allowSnapping: true,
-            selectedRangeSettings: {
-                start: "2010/5/1", end: "2011/10/1"
-            },
-            isResponsive: true,
-            tooltipSettings: {
-                visible: true, labelFormat: "MM/dd/yyyy", backgroundColor: "gray", tooltipDisplayMode: "ondemand"
-            },
-            load: () => {
-                var rn = $("#RangeNavigator").data("ejRangeNavigator");
-                rn.model.series = [
-                    {
-                        type: 'line',
-                        dataSource: data.Open, xName: "XValue", yName: "YValue",
-                        fill: '#69D2E7'
-                    }
-                ];
-            },
-            loaded: function () {
-                var sender = $("#RangeNavigator").data("ejRangeNavigator");
-                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>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;
-                }
-            }
-
-        });
-    });
-}
-var data;
-data = GetData();
-
-function GetData() {
-    var series1: any[] = [];
-    var series2: any[] = [];
-    var value = 100;
-    var value1 = 120;
-    for (var i = 1; i < 730; i++) {
-
-        if (Math.random() > .5) {
-            value += Math.random();
-            value1 += Math.random();
-        } else {
-            value -= Math.random();
-            value1 -= Math.random();
-        }
-        var point1 = { XValue: new Date(2010, 0, i), YValue: value };
-        var point2 = { XValue: new Date(2010, 0, i), YValue: value1 };
-        series1.push(point1);
-        series2.push(point2);
-    }
-
-    data = { Open: series1, Close: series2 };
-    return data;
-};
-
-
-
-module RatingComponent {
-    $(function () {
-
-        var sample1 = new ej.Rating($("#fullRating"), {
-            value: 4,
-            precision: ej.Rating.Precision.Full,
-            allowReset: true,
-            cssClass: "gradient-lime",
-            enabled: true,
-            enablePersistence: true,
-            incrementStep: 2,
-            maxValue: 10,
-            minValue: 0,
-            orientation: ej.Orientation.Horizontal,
-            shapeHeight: 25,
-            shapeWidth: 25,
-            showTooltip: true
-        });
-
-        var sample2 = new ej.Rating($("#halfRating"), {
-            precision: ej.Rating.Precision.Half,
-            value: 3.5,
-            allowReset: true,
-            cssClass: "gradient-lime",
-            enabled: true,
-            enablePersistence: true,
-            incrementStep: 2,
-            maxValue: 10,
-            minValue: 0,
-            orientation: "horizontal",
-            shapeHeight: 25,
-            shapeWidth: 25,
-            showTooltip: true
-        });
-
-        var sample3 = new ej.Rating($("#exactRating"), {
-            precision: ej.Rating.Precision.Exact,
-            value: 3.7,
-            allowReset: true,
-            cssClass: "gradient-lime",
-            enabled: true,
-            enablePersistence: true,
-            incrementStep: 2,
-            maxValue: 10,
-            minValue: 0,
-            orientation: "horizontal",
-            shapeHeight: 25,
-            shapeWidth: 25,
-            showTooltip: true
-        });
-    });
-
-}
-
-
-
-module ReportViewerComponent {
-    $(function () {
-        var report = new ej.ReportViewer($("#territoryReportViewer"), {
-            reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
-            reportServerUrl: 'http://104.207.134.201/reportserver',
-            processingMode: ej.ReportViewer.ProcessingMode.Remote,
-            reportPath: "/SSRSSamples2/Territory Sales new",
-            isResponsive: true
-        });
-    });
-}
-
-
-
-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 () {
-        var sample = new ej.Ribbon($("#defaultRibbon"), {
-            width: "100%",
-            expandPinSettings: {
-                toolTip: "Collapse the Ribbon"
-            },
-            collapsePinSettings: {
-                toolTip: "Pin the Ribbon"
-            },
-            applicationTab: {
-                type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
-            },
-            tabs: [{
-                id: "home", text: "HOME", groups: [{
-                    text: "New", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                        groups: [{
-                            id: "new",
-                            text: "New",
-                            toolTip: "New",
-                            buttonSettings: {
-                                contentType: ej.ContentType.ImageOnly,
-                                imagePosition: ej.ImagePosition.ImageTop,
-                                prefixIcon: "e-icon e-ribbon e-new",
-                                click: "onClick"
-                            }
-                        }
-                        ],
-                        defaults: {
-                            type: "button",
-                            width: 60,
-                            height: 70
-                        }
-                    }]
-                },
-                    {
-                        text: "Clipboard", alignType: ej.Ribbon.AlignType.Columns, content: [{
-                            groups: [{
-                                id: "paste",
-                                text: "paste",
-                                toolTip: "Paste",
-                                splitButtonSettings: {
-                                    contentType: ej.ContentType.ImageOnly,
-                                    prefixIcon: "e-icon e-ribbon e-ribbonpaste",
-                                    targetID: "pasteSplit",
-                                    buttonMode: "dropdown",
-                                    click: "onClick",
-                                    arrowPosition: ej.ArrowPosition.Bottom
-                                }
-                            }
-                            ],
-                            defaults: {
-                                type: "splitbutton",
-                                width: 50,
-                                height: 70
-                            }
-                        },
-                            {
-                                groups: [{
-                                    id: "cut",
-                                    text: "Cut",
-                                    toolTip: "Cut",
-                                    buttonSettings: {
-                                        contentType: ej.ContentType.TextAndImage,
-                                        click: "onClick",
-                                        prefixIcon: "e-icon e-ribbon e-ribboncut"
-                                    }
-                                },
-                                    {
-                                        id: "copy",
-                                        text: "Copy",
-                                        toolTip: "Copy",
-                                        buttonSettings: {
-                                            contentType: ej.ContentType.TextAndImage,
-                                            click: "onClick",
-                                            prefixIcon: "e-icon e-ribbon e-ribboncopy"
-                                        }
-                                    },
-                                    {
-                                        id: "clear",
-                                        text: "Clear",
-                                        toolTip: "Clear All",
-                                        buttonSettings: {
-                                            contentType: ej.ContentType.TextAndImage,
-                                            click: "onClick",
-                                            prefixIcon: "e-icon e-ribbon clearAll"
-                                        }
-                                    }],
-                                defaults: {
-                                    type: "button",
-                                    width: 60,
-                                    isBig: false
-                                }
-                            }]
-                    },
-                    {
-                        text: "Font", alignType: "rows", content: [{
-                            groups: [{
-                                id: "fontfamily",
-                                toolTip: "Font",
-                                dropdownSettings: {
-                                    dataSource: fontfamily,
-                                    text: "Segoe UI",
-                                    select: "onClick",
-                                    width: 150
-                                }
-                            },
-                                {
-                                    id: "fontsize",
-                                    toolTip: "FontSize",
-                                    dropdownSettings: {
-                                        dataSource: fontsize,
-                                        text: "1pt",
-                                        select: "onClick",
-                                        width: 65
-                                    }
-                                }],
-                            defaults: {
-                                type: "dropdownlist",
-                                height: 28
-                            }
-                        },
-                            {
-                                groups: [{
-                                    id: "bold",
-                                    toolTip: "Bold",
-                                    type: ej.Ribbon.Type.ToggleButton,
-                                    toggleButtonSettings: {
-                                        contentType: ej.ContentType.ImageOnly,
-                                        defaultText: "Bold",
-                                        activeText: "Bold",
-                                        click: "onClick",
-                                        defaultPrefixIcon: "e-icon e-ribbon bold",
-                                        activePrefixIcon: "e-icon e-ribbon bold"
-                                    }
-                                },
-                                    {
-                                        id: "italic",
-                                        toolTip: "Italic",
-                                        type: ej.Ribbon.Type.ToggleButton,
-                                        toggleButtonSettings: {
-                                            contentType: ej.ContentType.ImageOnly,
-                                            defaultText: "Italic",
-                                            activeText: "Italic",
-                                            click: "onClick",
-                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonitalic",
-                                            activePrefixIcon: "e-icon e-ribbon e-ribbonitalic"
-                                        }
-                                    },
-                                    {
-                                        id: "underline",
-                                        text: "Underline",
-                                        toolTip: "Underline",
-                                        type: ej.Ribbon.Type.ToggleButton,
-                                        toggleButtonSettings: {
-                                            contentType: ej.ContentType.ImageOnly,
-                                            defaultText: "Underline",
-                                            activeText: "Underline",
-                                            click: "onClick",
-                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonunderline",
-                                            activePrefixIcon: "e-icon e-ribbon e-ribbonunderline"
-                                        }
-                                    },
-                                    {
-                                        id: "strikethrough",
-                                        text: "strikethrough",
-                                        toolTip: "Strikethrough",
-                                        type: ej.Ribbon.Type.ToggleButton,
-                                        toggleButtonSettings: {
-                                            contentType: ej.ContentType.ImageOnly,
-                                            defaultText: "Strikethrough",
-                                            activeText: "Strikethrough",
-                                            click: "onClick",
-                                            defaultPrefixIcon: "e-icon e-ribbon strikethrough",
-                                            activePrefixIcon: "e-icon e-ribbon strikethrough"
-                                        }
-                                    },
-                                    {
-                                        id: "superscript",
-                                        text: "superscript",
-                                        toolTip: "Superscript",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-superscripticon"
-                                        }
-                                    },
-                                    {
-                                        id: "subscript",
-                                        text: "subscript",
-                                        toolTip: "Subscript",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-subscripticon"
-                                        }
-                                    },
-                                    {
-                                        id: "fontcolor",
-                                        text: "Font Color",
-                                        toolTip: "Font Color",
-                                        type: ej.Ribbon.Type.Custom,
-                                        contentID: "fontcolor"
-                                    },
-                                    {
-                                        id: "fillcolor",
-                                        text: "Fill Color",
-                                        toolTip: "Fill Color",
-                                        type: ej.Ribbon.Type.Custom,
-                                        contentID: "fillcolor"
-                                    }
-                                ],
-                                defaults: {
-                                    isBig: false
-                                }
-                            }]
-                    },
-                    {
-                        text: "Alignment", alignType: ej.Ribbon.AlignType.Rows, content: [
-                            {
-                                groups: [{
-                                    id: "bullet",
-                                    text: "Bullet Format",
-                                    toolTip: "Bullets",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.ImageOnly,
-                                        prefixIcon: "e-icon e-ribbon e-bullet"
-                                    }
-                                },
-                                    {
-                                        id: "number",
-                                        text: "Number Format",
-                                        toolTip: "Numbering",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-numbericon"
-                                        }
-                                    },
-                                    {
-                                        id: "textindent",
-                                        text: "Indent",
-                                        toolTip: "Text Indent",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-indent"
-                                        }
-                                    },
-                                    {
-                                        id: "textoudent",
-                                        text: "Outdent",
-                                        toolTip: "Text Outdent",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-outdent"
-                                        }
-                                    },
-                                    {
-                                        id: "sortascending",
-                                        text: "Sort",
-                                        toolTip: "Sort",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-sort"
-                                        }
-                                    },
-                                    {
-                                        id: "border",
-                                        text: "Border",
-                                        toolTip: "Border",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-border"
-                                        }
-                                    }],
-                                defaults: {
-                                    type: "button",
-                                    isBig: false
-                                }
-                            },
-                            {
-                                groups: [{
-                                    id: "alignleft",
-                                    text: "JustifyLeft",
-                                    toolTip: "Align Left",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.ImageOnly,
-                                        prefixIcon: "e-icon e-ribbon alignleft"
-                                    }
-                                },
-                                    {
-                                        id: "aligncenter",
-                                        text: "JustifyCenter",
-                                        toolTip: "Align Center",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon aligncenter"
-                                        }
-                                    },
-                                    {
-                                        id: "alignright",
-                                        text: "JustifyRight",
-                                        toolTip: "Align Right",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon alignright"
-                                        }
-                                    },
-                                    {
-                                        id: "justify",
-                                        text: "JustifyFull",
-                                        toolTip: "Justify",
-                                        enableSeparator: true,
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon justify"
-                                        }
-                                    },
-                                    {
-                                        id: "uppercase",
-                                        text: "Upper Case",
-                                        toolTip: "Upper Case",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-uppercase"
-                                        }
-                                    },
-                                    {
-                                        id: "lowercase",
-                                        text: "Lower Case",
-                                        toolTip: "Lower Case",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.ImageOnly,
-                                            prefixIcon: "e-icon e-ribbon e-lowercase"
-                                        }
-                                    }],
-                                defaults: {
-                                    type: "button",
-                                    isBig: false
-                                }
-                            }]
-                    },
-                    {
-                        text: "Actions", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                            groups: [{
-                                id: "undo",
-                                text: "Undo",
-                                toolTip: "Undo",
-                                buttonSettings: {
-                                    click: "onClick",
-                                    contentType: ej.ContentType.TextAndImage,
-                                    imagePosition: ej.ImagePosition.ImageTop,
-                                    prefixIcon: "e-icon e-ribbon e-undo"
-                                }
-                            },
-                                {
-                                    id: "redo",
-                                    text: "Redo",
-                                    toolTip: "Redo",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-redo"
-                                    }
-                                }
-                            ],
-                            defaults: {
-                                type: "button",
-                                width: 40,
-                                height: 70
-                            }
-                        }]
-                    },
-                    {
-                        text: "View", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                            groups: [{
-                                id: "zoomin",
-                                text: "Zoom In",
-                                toolTip: "Zoom In",
-                                buttonSettings: {
-                                    width: 58,
-                                    click: "onClick",
-                                    contentType: ej.ContentType.TextAndImage,
-                                    imagePosition: ej.ImagePosition.ImageTop,
-                                    prefixIcon: "e-icon e-ribbon e-zoomin"
-                                }
-                            },
-                                {
-                                    id: "zoomout",
-                                    text: "Zoom Out",
-                                    toolTip: "Zoom Out",
-                                    buttonSettings: {
-                                        width: 70,
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-zoomout"
-                                    }
-                                },
-                                {
-                                    id: "fullscreen",
-                                    text: "Full Screen",
-                                    toolTip: "Full Screen",
-                                    buttonSettings: {
-                                        width: 73,
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-fullscreen"
-                                    }
-                                }
-                            ],
-                            defaults: {
-                                type: "button",
-                                height: 70
-                            }
-                        }]
-                    }]
-            }, {
-                    id: "insert", text: "INSERT", groups: [{
-                        text: "Tables", alignType: ej.Ribbon.AlignType.Columns, content: [{
-                            groups: [{
-                                id: "tables",
-                                text: "Tables",
-                                toolTip: "Tables",
-                                buttonSettings: {
-                                    click: "onClick",
-                                    contentType: ej.ContentType.TextAndImage,
-                                    imagePosition: ej.ImagePosition.ImageTop,
-                                    prefixIcon: "e-icon e-ribbon e-table"
-                                }
-                            }
-                            ],
-                            defaults: {
-                                type: "button",
-                                width: 50,
-                                height: 70
-                            }
-                        }]
-                    },
-                        {
-                            text: "Illustrations", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "pictures",
-                                    text: "Pictures",
-                                    toolTip: "Pictures",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-picture"
-                                    }
-                                },
-                                    {
-                                        id: "videos",
-                                        text: "Videos",
-                                        toolTip: "Videos",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-video"
-                                        }
-                                    },
-                                    {
-                                        id: "shapes",
-                                        text: "Shapes",
-                                        toolTip: "Shapes",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-shape"
-                                        }
-                                    },
-                                    {
-                                        id: "charts",
-                                        text: "Charts",
-                                        toolTip: "Charts",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-chart"
-                                        }
-                                    }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 56,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Comments", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "comments",
-                                    text: "Comments",
-                                    toolTip: "Comments",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-comment"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 70,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Text", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "text",
-                                    text: "Text",
-                                    toolTip: "Text",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-text",
-                                        width: 50
-                                    }
-                                },
-                                    {
-                                        id: "datetime",
-                                        text: "Date Time",
-                                        toolTip: "DateTime",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-datetimenew"
-                                        }
-                                    }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 70,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Hyperlink", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "hyperlink",
-                                    text: "Hyperlink",
-                                    toolTip: "Hyperlink",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-hyperlink"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 70,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Equation", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "equation",
-                                    text: "Equation",
-                                    toolTip: "Equation",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-equation"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 60,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Print Layout", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "printlayout",
-                                    text: "Print Layout",
-                                    toolTip: "Print Layout",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-printlayout"
-                                    }
-                                }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 80,
-                                    height: 70
-                                }
-                            }]
-                        },
-                        {
-                            text: "Save", alignType: ej.Ribbon.AlignType.Rows, content: [{
-                                groups: [{
-                                    id: "print",
-                                    text: "Print",
-                                    toolTip: "Print",
-                                    buttonSettings: {
-                                        click: "onClick",
-                                        contentType: ej.ContentType.TextAndImage,
-                                        imagePosition: ej.ImagePosition.ImageTop,
-                                        prefixIcon: "e-icon e-ribbon e-print"
-                                    }
-                                },
-                                    {
-                                        id: "save",
-                                        text: "Save",
-                                        toolTip: "Save",
-                                        buttonSettings: {
-                                            click: "onClick",
-                                            contentType: ej.ContentType.TextAndImage,
-                                            imagePosition: ej.ImagePosition.ImageTop,
-                                            prefixIcon: "e-icon e-ribbon e-save"
-                                        }
-                                    }
-                                ],
-                                defaults: {
-                                    type: "button",
-                                    width: 50,
-                                    height: 70
-                                }
-                            }]
-                        }
-                    ]
-                }
-            ],
-            create: function createControl(args) {
-                var ribbon = $("#defaultRibbon").data("ejRibbon");
-                $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
-                $("#fillcolor").ejColorPicker({ value: "#FF0000", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fillcoloricon", select: colorHandler });
-            }
-        });
-    });
-}
-function colorHandler(args:any) {
-    (this._id.indexOf("fillcolor") != -1) ? $("#contenteditor").css('background-color', args.value) : document.execCommand('forecolor', false, args.value);
-}
-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)
-        $("#contenteditor").empty();
-    else if (action2.indexOf(val) != -1)
-        document.execCommand(val, false, null);
-    else if (fontfamily.indexOf(prop) != -1)
-        document.execCommand("FontName", false, prop);
-    else if (fontsize.indexOf(prop) != -1)
-        document.execCommand("FontSize", false, prop.replace("pt", ""));
-    else
-        $("#contenteditor").append("<p> Action: " + val + " Triggered </p>");
-}
-
-
-
-
-
-
-module RotatorComponent {
-    $(function () {
-        var rotatorInstance = new ej.Rotator($("#sliderContent"), {
-            slideWidth: "100%",
-            frameSpace: "0px",
-            slideHeight: "auto",
-            displayItemsCount: "1",
-            navigateSteps: "1",
-            pagerPosition: "outside",
-            orientation: "horizontal",
-            showPager: true,
-            enabled: true,
-            showCaption: true,
-            allowKeyboardNavigation: true,
-            showPlayButton: true,
-            isResponsive: true,
-            animationType: "slide",
-        });
-    });
-}
-
-
-
-module RTEComponent {
-    $(function () {
-        var sample = new ej.RTE($("#rteSample"), {
-            width: "100%",
-            minWidth: "150px",
-            showFooter: true,
-            showHtmlSource: true,
-            allowEditing: true,
-            allowKeyboardNavigation: true,
-            autoFocus: true,
-            autoHeight: true,
-            colorPaletteColumns: 10,
-            colorPaletteRows: 5,
-            cssClass: 'gradient-lime',
-            enableResize: true,
-            enableTabKeyNavigation: true,
-            fileBrowser: {
-                filePath: (<any>window).baseurl + "Content/FileBrowser/",
-                extensionAllow: "*.png, *.doc, *.pdf, *.txt, *.docx",
-                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
-            },
-            imageBrowser: {
-                filePath: (<any>window).baseurl + "Content/FileBrowser/",
-                extensionAllow: "*.png, *.gif, *.jpg, *.jpeg, *.docx",
-                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
-            },
-            isResponsive: true,
-            showClearAll: true,
-            showClearFormat: true,
-            showDimensions: true,
-            showCharCount: true,
-            tools: {
-                formatStyle: ["format"],
-                edit: ["findAndReplace"],
-                font: ["fontName", "fontSize", "fontColor", "backgroundColor"],
-                style: ["bold", "italic", "underline", "strikethrough"],
-                alignment: ["justifyLeft", "justifyCenter", "justifyRight", "justifyFull"],
-                lists: ["unorderedList", "orderedList"],
-                clipboard: ["cut", "copy", "paste"],
-                doAction: ["undo", "redo"],
-                indenting: ["outdent", "indent"],
-                clear: ["clearFormat", "clearAll"],
-                links: ["createLink", "removeLink"],
-                images: ["image"],
-                media: ["video"],
-                tables: ["createTable", "addRowAbove", "addRowBelow", "addColumnLeft", "addColumnRight", "deleteRow", "deleteColumn", "deleteTable"],
-                effects: ["superscript", "subscript"],
-                casing: ["upperCase", "lowerCase"],
-                view: ["fullScreen", "zoomIn", "zoomOut"],
-                print: ["print"],
-                customUnorderedList: [{
-                    name: "unOrderInsert",
-                    tooltip: "Custom UnOrderList",
-                    css: "e-rte-toolbar-icon e-rte-unlistitems customUnOrder",
-                    text: "Smiley",
-                    listImage: "url('../content/images/rte/Smiley-GIF.gif')"
-                }],
-                customOrderedList: [{
-                    name: "orderInsert",
-                    tooltip: "Custom OrderList",
-                    css: "e-rte-toolbar-icon e-rte-listitems customOrder",
-                    text: "Lower-Greek",
-                    listStyle: "lower-greek"
-                }]
-            }
-        });
-    });
-
-}
-
-
-
-module ScheduleComponent {
-    $(function () {
-        var sample = new ej.Schedule($("#Schedule1"), {
-            width: "100%",
-            height: "525px",
-            currentDate: new Date(2017, 5, 5),
-            timeScale: {
-                minorSlotCount: 4,
-                majorSlot: 60
-            },
-            contextMenuSettings: {
-                enable: true,
-                menuItems: {
-                    appointment: [
-                        { id: "open", text: "Open Appointment" },
-                        { id: "delete", text: "Delete Appointment" },
-                        { id: "customMenu3", text: "Menu Item 3" },
-                        { id: "customMenu4", text: "Menu Item 4" }
-                    ],
-                    cells: [
-                        { id: "new", text: "New Appointment" },
-                        { id: "recurrence", text: "New Recurring Appointment" },
-                        { id: "today", text: "Today" },
-                        { id: "gotodate", text: "Go to date" },
-                        { id: "settings", text: "Settings" },
-                        { id: "view", text: "View", parentId: "settings" },
-                        { id: "timemode", text: "TimeMode", parentId: "settings" },
-                        { id: "view_Day", text: "Day", parentId: "view" },
-                        { id: "view_Week", text: "Week", parentId: "view" },
-                        { id: "view_Workweek", text: "Workweek", parentId: "view" },
-                        { id: "view_Month", text: "Month", parentId: "view" },
-                        { id: "timemode_Hour12", text: "12 Hours", parentId: "timemode" },
-                        { id: "timemode_Hour24", text: "24 Hours", parentId: "timemode" },
-                        { id: "workhours", text: "Work Hours", parentId: "settings" },
-                        { id: "customMenu1", text: "Menu Item 1" },
-                        { id: "customMenu2", text: "Menu Item 2" }
-                    ]
-                }
-            },
-            resources: [{
-                field: "ownerId",
-                title: "Owner",
-                name: "Owners", allowMultiple: true,
-                resourceSettings: {
-                    dataSource: [
-                        { text: "Nancy", id: 1, groupId: 1, color: "#f8a398" },
-                        { text: "Steven", id: 3, groupId: 2, color: "#56ca85" },
-                        { text: "Michael", id: 5, groupId: 1, color: "#51a0ed" }
-                    ],
-                    text: "text", id: "id", groupId: "groupId", color: "color"
-                }
-            }],
-            appointmentSettings: {
-                dataSource: new ej.DataManager((<any>window).ResourcesData).executeLocal(new ej.Query().take(10)),
-                id: "Id",
-                subject: "Subject",
-                startTime: "StartTime",
-                endTime: "EndTime",
-                description: "Description",
-                allDay: "AllDay",
-                recurrence: "Recurrence",
-                recurrenceRule: "RecurrenceRule",
-                resourceFields: "ownerId"
-            }
-        });
-    });
-}
-
-
-
-module ScrollerComponent {
-    $(function () {
-        var scrollerSample = new ej.Scroller($("#scrollcontent"), {
-            height: "300px",
-            width: "100%"
-        });
-        $(window).bind('resize', function () {
-            scrollerSample.refresh();
-        });

-    });
-}
-
-
-
-module SignatureComponent {
-    $(function () {
-        var basicSignature = new ej.Signature($("#signature"), {
-            height: "400px",
-            isResponsive: true,
-            strokeWidth: 3
-        });
-    });
-}
-
-
-
-
-module SliderComponent {
-    $(function () {
-        var slider = new ej.Slider($("#minSlider"), {
-            sliderType: "MinRange",
-            value: 60,
-            minValue: 0,
-            maxValue: 100
-        });
-        var rangeslider = new ej.Slider($("#rangeSlider"), {
-            sliderType: "Range",
-            values: [30, 60],
-            minValue: 0
-        });
-
-    });
-}
-
-
-
-
-
-
-module linesparkline {
-    $(function () {
-
-        var sparklinesample = new ej.Sparkline($("#line"), {
-            dataSource: [12, 14, 11, 12, 11, 15, 12, 10, 11, 12, 15, 13, 12, 11, 10, 13, 15, 12, 14, 16, 14, 12, 11],
-            tooltip: {
-                visible: true,
-                font: { size: "12px" }
-            },
-            type: "line",
-            size: { height: "40", width: "170" },
-        });
-    });
-}
-
-module columnsparkline {
-    $(function () {
-        var sparkcolumnsample = new ej.Sparkline($("#column"), {
-            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10, ],
-            negativePointColor: "red",
-            highPointColor: "blue",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            type: "column",
-            size: { height: "100", width: "150" },
-        });
-    });
-}
-
-module areasparkline {
-    $(function () {
-        var sparkareasample = new ej.Sparkline($("#area"), {
-            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10, ],
-            markerSettings: { visible: true },
-            highPointColor: "blue",
-            lowPointColor: "orange",
-            type: "area",
-            opacity: 0.5,
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "100", width: "150" },
-        });
-    });
-}
-
-module windlosssparkline {
-    $(function () {
-        var sparkwinlosssample = new ej.Sparkline($("#winloss"), {
-            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10, ],
-            type: "winloss",
-            size: { height: "100", width: "150" },
-        });
-    });
-}
-
-module piesparkline1 {
-    $(function () {
-        var sparkpiesample1 = new ej.Sparkline($("#pie1"), {
-            dataSource: [4, 6, 7],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-module piesparkline2 {
-    $(function () {
-        var sparkpiesample2 = new ej.Sparkline($("#pie2"), {
-            dataSource: [8, 9, 1, ],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-module piesparkline3 {
-    $(function () {
-        var sparkpiesample3 = new ej.Sparkline($("#pie3"), {
-            dataSource: [2, 3, 5],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-module piesparkline4 {
-    $(function () {
-        var sparkpiesample4 = new ej.Sparkline($("#pie4"), {
-            dataSource: [10, 12, 11],
-            type: "pie",
-            tooltip: {
-                visible: true,
-                font: {
-                    size: "12px",
-                }
-            },
-            size: { height: "40", width: "40" },
-        });
-    });
-}
-
-
-
-
-
-
-module SplitterComponent {
-    $(function () {
-        var splitterInstance = new ej.Splitter($("#outterSpliter"), {
-            height: "250px",
-            width: "50%",
-            orientation: ej.Orientation.Vertical,
-            properties: [{}, { paneSize: 80 }],
-            isResponsive: true
-        });
-        var splitterInstance1 = new ej.Splitter($("#innerSpliter"), {
-            isResponsive: true,
-        });
-    });
-}
-
-
-
-module SpreadsheetComponent {
-    $(function () {
-        var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
-            scrollSettings: {
-                height: 550,
-            },
-            importSettings: {
-                importMapper: (<any>window).baseurl + "api/Spreadsheet/Import"
-            },
-            exportSettings: {
-                excelUrl: (<any>window).baseurl + "api/Spreadsheet/ExcelExport",
-                csvUrl: (<any>window).baseurl + "api/Spreadsheet/CsvExport",
-                pdfUrl: (<any>window).baseurl + "api/Spreadsheet/PdfExport"
-            },
-            sheets: [{ rangeSettings: [{ dataSource: (<any>window).defaultData, startCell: "A1" }] }],
-            loadComplete: () => {
-                var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
-                if (!(<any>spreadsheet).isImport) {
-                    spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
-                    xlFormat.format({ "style": { "font-weight": "bold" } }, "A1:H1");
-                    xlFormat.format({ "type": "currency" }, "E2:H11");
-                    spreadsheet.XLRibbon.updateRibbonIcons();
-                }
-            }
-        });
-    });
-}
-
-
-
-
-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 },
-    { Category: "Employees", Country: "USA", JobDescription: "Marketing", EmployeesCount: 40 },
-    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 55 },
-    { Category: "Employees", Country: "USA", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 175 },
-    { 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 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Testers", EmployeesCount: 40 },
-    { Category: "Employees", Country: "Germany", JobDescription: "Technical", JobGroup: "Developers", JobRole: "Windows", EmployeesCount: 65 },
-    { 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 },
-	{ Category: "Employees", Country: "France", JobDescription: "Marketing", EmployeesCount: 50  }
-];
-
-module sunburstcomponent {
-    $(function () {
-        var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
-            valueMemberPath: "EmployeesCount",
-            levels: [
-                { groupMemberPath: "Country" },
-                { groupMemberPath: "JobDescription" },
-                { groupMemberPath: "JobGroup" },
-                { groupMemberPath: "JobRole" }
-            ],
-            dataSource: default_data,
-            dataLabelSettings: { visible: true },
-            tooltip: { visible: false },
-            enableAnimation: false,
-            size: { height: "600" },
-            innerRadius: 0.2,
-            load: function () {
-                var sender = $("#Sunburst").data("ejSunburstChart");
-                var SunBurstTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>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' }
-            // load:"loadTheme"
-        });
-    });
-}
-
-
-
-
-module TabComponent {
-    $(function () {
-        var sample = new ej.Tab($("#defaultTab"), {
-            width: "500px",
-            collapsible: true,
-            events: "click",
-            heightAdjustMode: ej.Tab.HeightAdjustMode.Content,
-            showCloseButton: true,
-            showRoundedCorner: false
-        });
-    });
-}
-
-
-
-module TagCloudComponent {
-
-
-    var websiteCollection = [
-        { text: "Google", url: "http://www.google.com", frequency: 12 },
-        { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
-        { text: "Arts Technica", url: "http://arstechnica.com/", frequency: 8 },
-        { text: "Business Week", url: "http://www.businessweek.com/", frequency: 2 },
-        { text: "Yahoo", url: "http://in.yahoo.com/", frequency: 12 },
-        { text: "Center Networks", url: "http://www.centernetworks.com/", frequency: 5 },
-        { text: "Crave", url: "http://news.cnet.com/crave/", frequency: 8 },
-        { text: "Crunch Gear", url: "http://techcrunch.com/gadgets/", frequency: 20 },
-        { text: "Daily Tech", url: "http://www.dailytech.com/", frequency: 1 },
-        { text: "Electronista", url: "http://www.electronista.com/", frequency: 3 },
-        { text: "Engadget", url: "http://www.engadget.com/", frequency: 5 },
-        { text: "Gearlog", url: "http://www.gearlog.com/", frequency: 9 },
-        { text: "Information Week", url: "http://www.informationweek.com/", frequency: 0 },
-        { text: "PCWorld", url: "http://www.pcworld.com/", frequency: 11 },
-        { text: "Tech Republic", url: "http://techrepublic.com/", frequency: 3 },
-        { text: "Valleywag", url: "http://valleywag.gawker.com/", frequency: 6 },
-        { text: "Rediff", url: "http://in.rediff.com/", frequency: 9 },
-        { text: "WebProNews", url: "http://www.webpronews.com/", frequency: 2 }
-    ];
-
-    $(function () {
-        var sample = new ej.TagCloud($("#techWebList"), {
-            titleText: "Tech Sites",
-            dataSource: websiteCollection,
-            cssClass: "gradient-lime",
-            fields: {
-                text: "text", url: "url", frequency: "frequency"
-            }
-        });
-
-    });
-}
-
-
-
-module EditorComponent {
-    $(function () {
-        var num = new ej.NumericTextbox($("#numeric"), {
-            value: 30,
-            minValue: 1,
-            maxValue: 100,
-            name: "numeric",
-            width: "100%"
-        });
-        var per = new ej.PercentageTextbox($("#percent"), {
-            value: 60,
-            minValue: 10,
-            maxValue: 1000,
-            name: "percent",
-            width: "100%"
-        });
-        var cur = new ej.CurrencyTextbox($("#currency"), {
-            value: 100,
-            minValue: 10,
-            maxValue: 1000,
-            name: "currency",
-            width: "100%"
-        });
-        var mask = new ej.MaskEdit($("#maskedit"), {
-            name: "mask",
-            value: "4242422424",
-            maskFormat: "99 999-99999",
-            width: "100%"
-        })
-    });
-}
-
-
-
-
-
-module TileViewComponent {
-    $(function () {
-        var tile1 = new ej.Tile($("#tile1"), {
-            imagePosition: "fill",
-            caption: { text: "People" },
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/people_1.png'
-        });
-        var tile2 = new ej.Tile($("#tile2"), {
-            imagePosition: "center",
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/alerts.png',
-
-        });
-        var tile3 = new ej.Tile($("#tile3"), {
-            imagePosition: "center",
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/bing.png',
-        });
-        var tile4 = new ej.Tile($("#tile4"), {
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/camera.png',
-        });
-        var tile5 = new ej.Tile($("#tile5"), {
-            imagePosition: "center",
-            tileSize: "small",
-            imageUrl: 'content/images/tile/windows/messages.png',
-        });
-        var tile6 = new ej.Tile($("#tile6"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/games.png',
-            caption: { text: "Play" }
-        });
-        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",
-            tileSize: "wide",
-            imageUrl: 'content/images/tile/windows/sports.png',
-            caption: { text: "Sports" }
-        });
-        var tile9 = new ej.Tile($("#tile9"), {
-            imagePosition: "fill",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/people_2.png',
-            caption: { text: "People" }
-        });
-        var tile10 = new ej.Tile($("#tile10"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/pictures.png',
-            caption: { text: "Photo" }
-        });
-        var tile11 = new ej.Tile($("#tile11"), {
-            imagePosition: "center",
-            tileSize: "wide",
-            imageUrl: 'content/images/tile/windows/weather.png',
-            caption: { text: "Weather" }
-        });
-        var tile12 = new ej.Tile($("#tile12"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/music.png',
-            caption: { text: "Music" }
-        });
-        var tile13 = new ej.Tile($("#tile13"), {
-            imagePosition: "center",
-            tileSize: "medium",
-            imageUrl: 'content/images/tile/windows/favs.png',
-            caption: { text: "Favorites" }
-        });
-    });
-}
-
-
-
-module TimePickerComponent {
-    $(function () {
-        var timeSample = new ej.TimePicker($("#timepick"), {
-            width: "100%"
-        });
-    });
-}
-
-
-
-
-module ToolbarComponent {
-
-    $(function () {
-        var sample = new ej.Toolbar($("#editingToolbar"), {
-            width: "100%",
-            cssClass: "gradient-lime",
-            enableSeparator: true,
-
-            isResponsive: true,
-            orientation: ej.Orientation.Horizontal,
-            showRoundedCorner: true
-        });
-    });
-
-}
-
-
-
-
-module TooltipComponent {
-
-    $(function () {
-
-        var sample1 = new ej.Tooltip($("#link1"), {
-            content: "ECMAScript (or ES) is a trademarked scripting-language specification standardized by Ecma International in ECMA-262 and ISO/IEC 16262.",
-            associate: "mousefollow",
-            autoCloseTimeout: 5000,
-            collision: "fit",
-            containment: ".frame",
-            showRoundedCorner: true,
-            showShadow: true
-        });
-
-        var sample2 = new ej.Tooltip($("#link2"), {
-            content: "The World Wide Web (WWW) is an information space where documents and other web resources are identified by URLs, interlinked by hypertext links, and can be accessed via the Internet.",
-            position: {
-                stem: {
-                    horizontal: "right",
-                    vertical: "center"
-                },
-                target: {
-                    horizontal: "left",
-                    vertical: "center"
-                }
-            },
-            autoCloseTimeout: 5000,
-            collision: "fit",
-            containment: ".frame",
-            showRoundedCorner: true,
-            showShadow: true
-        });
-
-        var sample3 = new ej.Tooltip($("#link3"), {
-            content: 'Object-oriented programming (OOP) is a programming language model organized around objects rather than "actions" and data rather than logic.',
-            position: {
-                stem: {
-                    horizontal: "right",
-                    vertical: "center"
-                },
-                target: {
-                    horizontal: "left",
-                    vertical: "center",
-                },
-            },
-            associate: "mousefollow",
-            autoCloseTimeout: 5000,
-            collision: "fit",
-            containment: ".frame",
-            showRoundedCorner: true,
-            showShadow: true
-        });
-    });
-}
-
-
-
-module TreeGridComponent {
-    $(function () {
-        var treegridInstance = new ej.TreeGrid($("#TreeGridContainer"), {
-            dataSource: (<any>window).treeGridData,
-            childMapping: "subtasks",
-            allowSorting: true,
-            allowMultiSorting: true,
-            enableAltRow: true,
-            allowFiltering: true,
-            treeColumnIndex: 1,
-            allowKeyboardNavigation: true,
-            showColumnChooser: true,
-            showColumnOptions: true,
-            contextMenuSettings: {
-                showContextMenu: true,
-                contextMenuItems: ["add", "edit", "delete"]
-            },
-            columnDialogFields: ["field", "headerText", "editType", "width", "visible", "allowSorting", "textAlign", "headerTextAlign"],
-            editSettings: {
-                allowAdding: true,
-                allowEditing: true,
-                allowDeleting: true,
-                editMode: "cellEditing",
-                rowPosition: "belowSelectedRow"
-            },
-            toolbarSettings: {
-                showToolbar: true,
-                toolbarItems: ["add", "edit", "delete", "update", "cancel", "expandAll", "collapseAll"]
-            },
-            columns: [
-                { field: "taskID", headerText: "Task Id", allowFiltering: false, editType: "numericedit", filterEditType: "numericedit" },
-                { field: "taskName", headerText: "Task Name", editType: "stringedit", filterEditType: "stringedit" },
-                { field: "startDate", headerText: "Start Date", editType: "datepicker", filterEditType: "datepicker", format: "{0:MM/dd/yyyy}" },
-                { field: "endDate", headerText: "End Date", editType: "datepicker", filterEditType: "datepicker", format: "{0:MM/dd/yyyy}" },
-                { field: "progress", headerText: "Progress", editType: "numericedit", filterEditType: "numericedit" }
-            ],
-            isResponsive: true,
-        });
-    });
-}
-
-
-
-
-var population_data: Array<Object> = [
-    { Continent: "Asia", Country: "Indonesia", Growth: 3, Population: 237641326 },
-    { Continent: "Asia", Country: "Russia", Growth: 2, Population: 152518015 },
-    { Continent: "Asia", Country: "Malaysia", Growth: 1, Population: 29672000 },
-    { Continent: "North America", Country: "United States", Growth: 4, Population: 315645000 },
-    { Continent: "North America", Country: "Mexico", Growth: 2, Population: 112336538 },
-    { Continent: "North America", Country: "Canada", Growth: 1, Population: 39056064 },
-    { Continent: "South America", Country: "Colombia", Growth: 1, Population: 47000000 },
-    { Continent: "South America", Country: "Brazil", Growth: 3, Population: 193946886 },
-    { Continent: "Africa", Country: "Nigeria", Growth: 2, Population: 170901000 },
-    { Continent: "Africa", Country: "Egypt", Growth: 1, Population: 83661000 },
-    { Continent: "Europe", Country: "Germany", Growth: 1, Population: 81993000 },
-    { Continent: "Europe", Country: "France", Growth: 1, Population: 65605000 },
-    { Continent: "Europe", Country: "UK", Growth: 1, Population: 63181775 }
-];
-
-module treemapcomponent {
-    $(function () {
-        var treemapsample = new ej.datavisualization.TreeMap($("#treemap"), {
-            leafItemSettings: { showLabels: true, labelPath: "Country" },
-            rangeColorMapping: [
-                { color: "#77D8D8", legendLabel: "1% Growth", from: 0, to: 1 },
-                { color: "#AED960", from: 0, legendLabel: "2% Growth", to: 2 },
-                { color: "#FFAF51", from: 0, legendLabel: "3% Growth", to: 3 },
-                { color: "#F3D240", from: 0, legendLabel: "4% Growth", to: 4 }
-            ],
-            levels: [
-                { groupPath: "Continent", groupGap: 5, headerHeight: 25, showHeader: true, headerTemplate: 'headertemplate' }
-            ],
-            dataSource: population_data,
-            colorValuePath: "Growth",
-            weightValuePath: "Population",
-            borderThickness: 0,
-            showLegend: true
-        });
-    });
-}
-
-
-
-
-
-module TreeViewComponent {
-    $(function () {
-        var tree = new ej.TreeView($("#treeView"), {
-            allowEditing: true,
-            allowDragAndDrop: true,
-            allowDropChild: true,
-            allowDropSibling: true,
-        });
-    });
-}
-
-
-
-
-module UploadboxComponent {
-
-    $(function () {
-        var sample = new ej.Uploadbox($("#UploadDefault"), {
-            saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
-            removeUrl: (<any>window).baseurl + "api/uploadbox/Remove",
-            buttonText: {
-                browse: "Choose File", upload: "Upload", cancel: "Cancel"
-            },
-            cssClass: "gradient- purple",
-            dialogAction: {
-                modal: false, closeOnComplete: false, drag: true
-            },
-            extensionsAllow: ".zip",
-            multipleFilesSelection: true,
-            showFileDetails: true
-        });
-    });
-
-}
-
-
-
-
-module WaitingPopupComponent {
-    $(function () {
-        var sample = new ej.WaitingPopup($("#target"), {
-            showOnInit: true,
-            showImage: true,
-            text: 'waiting&hellip;',
-            target: "#target",
-            appendTo: "#waiting"
-        });
-    });
-
-}
+module AccordionComponent {
+    $(function () {
+        var sample = new ej.Accordion($("#basicAccordion"), {
+            width: "100%",
+            allowKeyboardNavigation: true,
+            collapseSpeed: 500,
+            collapsible: true,
+            enableAnimation: true,
+            enableMultipleOpen: true,
+            events: "click",
+            expandSpeed: 500,
+            headerSize: "40px",
+            htmlAttributes: { title: "Demo" },
+            selectedItemIndex: 1,
+            showCloseButton: true,
+            showRoundedCorner: true
+        });
+    });
+}
+
+
+
+module AutocompleteComponent{
+    var carList = [
+                "Audi S6", "Austin-Healey", "Alfa Romeo", "Aston Martin",
+                "BMW 7", "Bentley Mulsanne", "Bugatti Veyron",
+                "Chevrolet Camaro", "Cadillac",
+                "Duesenberg J", "Dodge Sprinter",
+                "Elantra", "Excavator",
+                "Ford Boss 302", "Ferrari 360", "Ford Thunderbird",
+                "GAZ Siber",
+                "Honda S2000", "Hyundai Santro",
+                "Isuzu Swift", "Infiniti Skyline",
+                "Jaguar XJS",
+                "Kia Sedona EX", "Koenigsegg Agera",
+                "Lotus Esprit", "Lamborghini Diablo",
+                "Mercedes-Benz", "Mercury Coupe", "Maruti Alto 800",
+                "Nissan Qashqai",
+                "Oldsmobile S98", "Opel Superboss",
+                "Porsche 356", "Pontiac Sunbird",
+                "Scion SRS/SC/SD", "Saab Sportcombi", "Subaru Sambar", "Suzuki Swift",
+                "Triumph Spitfire", "Toyota 2000GT",
+                "Volvo P1800", "Volkswagen Shirako"
+            ];
+    $(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"), {
+            text:"http://www.syncfusion.com"
+        });
+    });
+}
+
+
+
+
+
+module Bulletgraphcomponent {
+    $(function () {
+        var bulletsample = new ej.datavisualization.BulletGraph($("#BulletGraph"), {
+            isResponsive: true,
+            load: function () {
+                var sender = $("#BulletGraph").data("ejBulletGraph");
+                var bulletTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>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":
+                            bulletTheme = "flatdark";
+                            break;
+                        case "flatoffice-365light":
+                        case "flatmateriallight":
+                            bulletTheme = "material";
+                            break;
+                        default:
+                           bulletTheme = "flatlight";
+                            break;
+                    }
+                    sender.model.theme = bulletTheme;
+                }
+
+            },
+            tooltipSettings: { visible: true },
+            quantitativeScaleSettings: {
+                featureMeasures: [{
+                    value: 8, comparativeMeasureValue:6.7
+                }]
+            },
+            qualitativeRanges: [{
+                rangeEnd: 4.3, rangeStroke:"#ebebeb",
+            },
+                {
+                    rangeEnd: 7.3, rangeStroke:"#d8d8d8"
+                },
+                {
+                    rangeEnd: 10, rangeStroke: "#7f7f7f"
+                }
+            ],
+            captionSettings: {
+                textPosition: 'right', text: 'Revenue YTD',
+                subTitle: {
+                    text: "$ in Thousands", textPosition:"right"
+                }
+            }
+        });
+    });
+}
+
+
+
+
+
+module ButtonComponent {
+    $(function () {
+        var basicButton = new ej.Button($("#buttonnormal"), {
+            size: "large",
+            showRoundedCorner: true,
+            contentType: "textandimage",
+            prefixIcon: "e-icon e-save",
+            text: "Save"
+        });
+        var toggleButton = new ej.ToggleButton($("#TextOnly"), {
+            showRoundedCorner: true,
+            size: "large",
+            contentType: "textandimage",
+            defaultPrefixIcon: "e-icon e-save",
+            activePrefixIcon: "e-icon e-delete",
+            defaultText: "Save",
+            activeText: "Delete"
+        });
+        var splitbuttonnormal = new ej.SplitButton($("#splitbuttonnormal"), {
+            showRoundedCorner: true,
+            size: "large",
+            prefixIcon: "e-icon e-file-empty",
+            targetID: "menu1",
+            contentType: "textandimage",
+            text: "File"
+        });
+        var groupButton = new ej.GroupButton($("#groupButton"), {
+            showRoundedCorner: true,
+            size: "large"
+        });
+        var check1 = new ej.CheckBox($("#check1"), {
+            size: "medium", enableTriState: true
+        });
+        var check2 = new ej.CheckBox($("#check2"), {
+            size: "medium", enableTriState: true
+        });
+        var radio1 = new ej.RadioButton($("#radio1"), {
+            size: "medium"
+        });
+        var radio2 = new ej.RadioButton($("#radio2"), {
+            size: "medium", checked: true
+        });
+    });
+}
+
+
+
+
+module ChartComponent {
+    $(function () {
+        var chartsample = new ej.datavisualization.Chart($("#Chart"), {
+            primaryXAxis: {
+                range: { min: 2005, max: 2011, interval: 1 },
+                title: { text: "Year" },
+                valueType: "category"
+            },
+            primaryYAxis: {
+                range: { min: 25, max: 50, interval: 5 },
+                labelFormat: "{value}%",
+                title: { text: "Efficiency" },
+            },
+            commonSeriesOptions:
+			{
+                type: 'line', enableAnimation: true,
+				tooltip:{ visible :true, template:'Tooltip'},
+                marker:
+                {
+                    shape: 'circle',
+                    size:
+                    {
+                        height: 10, width: 10
+                    },
+                    visible: true
+                },
+                 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 }],
+                    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 }],
+                    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 }],
+                    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 }],
+                    name: 'France'
+                }
+            ],
+            isResponsive: true,
+            load: function () {
+                var sender = $("#Chart").data("ejChart");
+                if (!!window.orientation && sender) { //to modify chart properties for mobile view
+                    var model = sender.model,
+                        seriesLength = model.series.length;
+                    model.legend.visible = false;
+                    model.size.height = null;
+                    model.size.width = null;
+                    for (var i = 0; i < seriesLength; i++) {
+                        if (!model.series[i].marker)
+                            model.series[i].marker = {};
+                        if (!model.series[i].marker.size)
+                            model.series[i].marker.size = {};
+                        model.series[i].marker.size.width = 6;
+                        model.series[i].marker.size.height = 6;
+                    }
+                    model.primaryXAxis.labelIntersectAction = "rotate45";
+                    if (model.primaryXAxis.title)
+                        model.primaryXAxis.title.text = "";
+                    if (model.primaryYAxis.title)
+                        model.primaryYAxis.title.text = "";
+                    model.primaryXAxis.edgeLabelPlacement = "hide";
+                    model.primaryYAxis.labelIntersectAction = "rotate45";
+                    model.primaryYAxis.edgeLabelPlacement = "hide";
+                }
+                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                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" },
+            legend: { visible: true},
+        });
+    });
+}
+
+
+
+
+module circulargaugecomponent {
+    $(function () {
+        var circularsample = new ej.datavisualization.CircularGauge($("#CircularGauge"), {
+            enableAnimation: false,
+            isResponsive: true,
+            backgroundColor: "transparent", width: 500,
+            scales: [{
+                showRanges: true,
+                startAngle: 122, sweepAngle: 296, radius: 130, showScaleBar: true, size: 1, maximum: 120, majorIntervalValue: 20, minorIntervalValue: 10,
+                border: {
+                    width: 0.5,
+                },
+                pointers: [{
+                    value: 60,
+                    showBackNeedle: true,
+                    backNeedleLength: 20,
+                    length: 95,
+                    width: 7
+                }],
+                ticks: [{
+                    type: "major",
+                    distanceFromScale: 2,
+                    height: 16,
+                    width: 1, color: "#8c8c8c"
+                }, { type: "minor", height: 8, width: 1, distanceFromScale: 2, color: "#8c8c8c" }],
+                labels: [{
+                    color: "#8c8c8c"
+                }],
+                ranges: [{
+                    distanceFromScale: -30,
+                    startValue: 0,
+                    endValue: 70
+                }, {
+                        distanceFromScale: -30,
+                        startValue: 70,
+                        endValue: 110,
+                        backgroundColor: "#fc0606",
+                        border: { color: "#fc0606" }
+                    },
+                    {
+                        distanceFromScale: -30,
+                        startValue: 110,
+                        endValue: 120,
+                        backgroundColor: "#f5b43f",
+                        border: { color: "#f5b43f" }
+                    }]
+            }]
+        });
+    });
+}
+
+
+
+module ColorPickerComponent {
+    $(function () {
+        var colorSample = new ej.ColorPicker($("#colorpick"), {
+            value: "#278787"
+        });
+    });
+}
+
+
+
+
+module ComboBoxComponent{
+    var BikeList = [
+        { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
+        { empid: "bk4", text: "Discover" }, { empid: "bk5", text: "Dazzler" }, { empid: "bk6", text: "Flame" },
+        { empid: "bk7", text: "Fazzer" }, { empid: "bk8", text: "FZ-S" }, { empid: "bk9", text: "Pulsar" },
+        { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
+    ];
+    $(function () {
+        var comboboxInstance =new ej.ComboBox($("#selectCar"), {
+            width: "100%",
+            placeholder: "Select a Bike",
+			fields: { text: "text", value: "empid" },
+            dataSource: BikeList,
+            autofill: true
+        });
+    });
+}
+
+
+
+module DatePickerComponent {
+    $(function () {
+        var dateSample = new ej.DatePicker($("#datepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+
+module DateTimePickerComponent {
+    $(function () {
+        var datetimeSample = new ej.DateRangePicker($("#daterangepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+module DateTimePickerComponent {
+    $(function () {
+        var datetimeSample = new ej.DateTimePicker($("#datetimepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+$(function () {
+    var diagram = new ej.datavisualization.Diagram($("#diagram"), {
+        width: "1000px",
+        height: "600px",
+        pageSettings: {
+            //Sets page size
+            pageHeight: 500,
+            pageWidth: 500,
+            //Customizes the appearance of page
+            pageBorderWidth: 4,
+            pageBackgroundColor: "white",
+            pageBorderColor: "lightgray",
+            pageMargin: 25,
+            showPageBreak: true,
+            multiplePage: true,
+            pageOrientation: ej.datavisualization.Diagram.PageOrientations.Portrait
+        },
+        scrollSettings: {
+            horizontalOffset: 0,
+            verticalOffset: 0
+        },
+        snapSettings: {
+            snapConstraints: ej.datavisualization.Diagram.SnapConstraints.ShowLines
+        },
+        nodes: [
+            createNode({ name: "NewIdea", width: 150, height: 60, offsetX: 300, offsetY: 60, labels: [createLabel({ "text": "New idea identified" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Terminator }),
+            createNode({ name: "Meeting", width: 150, height: 60, offsetX: 300, offsetY: 155, labels: [createLabel({ "text": "Meeting with board" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
+            createNode({
+                name: "BoardDecision", width: 150, height: 110, offsetX: 300, offsetY: 280, labels: [createLabel({ text: "Board decides \nwhether \nto proceed", wrapText: "true", "margin": { left: 20, top: 0, right: 20, bottom: 0 } })],
+                type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision
+            }),
+            createNode({ name: "Project", width: 150, height: 100, offsetX: 300, offsetY: 430, labels: [createLabel({ "text": "Find Project \nmanager" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Decision }),
+            createNode({
+                name: "End", width: 150, height: 60, offsetX: 300, offsetY: 555, labels: [createLabel({ "text": "Implement and Deliver" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
+            createNode({ name: "Decision", width: 250, height: 60, offsetX: 550, offsetY: 60, labels: [createLabel({ "text": "Decision Process for new software ideas" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Card, fillColor: "#858585", borderColor: "#858585" }),
+            createNode({ name: "Reject", width: 150, height: 60, offsetX: 550, offsetY: 285, labels: [createLabel({ "text": "Reject and write report" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process }),
+            createNode({ name: "Resources", width: 150, height: 60, offsetX: 550, offsetY: 430, labels: [createLabel({ "text": "Hire new resources" })], type: "flow", shape: ej.datavisualization.Diagram.FlowShapes.Process })
+        ],
+        connectors: [
+            createConnector({ name: "connector1", sourceNode: "NewIdea", targetNode: "Meeting" }),
+            createConnector({ name: "connector2", sourceNode: "Meeting", targetNode: "BoardDecision" }),
+            createConnector({ name: "connector3", sourceNode: "BoardDecision", targetNode: "Project", labels: [createLabel({ "text": "Yes" })] }),
+            createConnector({ name: "connector4", sourceNode: "Project", targetNode: "End", labels: [createLabel({ "text": "Yes" })] }),
+            createConnector({ name: "connector5", sourceNode: "BoardDecision", targetNode: "Reject", labels: [createLabel({ "text": "No" })] }),
+            createConnector({ name: "connector6", sourceNode: "Project", targetNode: "Resources", labels: [createLabel({ "text": "No" })] })
+        ]
+    });
+});
+
+function createNode(option: ej.datavisualization.Diagram.Node) {
+    if (!option.fillColor) {
+        option.borderColor = "#1BA0E2";
+        option.fillColor = "#1BA0E2";
+    }
+    option.labels[0].fontColor = "white";
+    return option;
+}
+
+function createConnector(option: ej.datavisualization.Diagram.Connector) {
+    option.targetDecorator = { shape: ej.datavisualization.Diagram.DecoratorShapes.Arrow, borderColor: "#606060", width: 10, height: 10 };
+    option.lineColor = "#606060";
+    if (option.labels && option.labels.length > 0) {
+        option.labels[0].fillColor = "white";
+    }
+    return option;
+}
+
+function createLabel(options : any) {
+    return options;
+}
+
+
+module DialogComponent {
+    $(function () {
+        var dialogInstance = new ej.Dialog($("#basicDialog"), {
+            width: 550,
+            minWidth: 310,
+            minHeight: 215,
+			target:".control",
+            close:()=>{
+			$("#btnOpen").show();}
+        });
+        var btnInstance = new ej.Button($("#btnOpen"), {
+            size: "medium",
+            click: ()=>{
+			$("#btnOpen").hide();
+        $("#basicDialog").ejDialog("open");},
+            type: "button",
+            height: 30,
+            width: 150
+        });
+    });
+}
+
+
+
+
+module digitalgaugecomponent {
+    $(function () {
+        var digitalgaugesample = new ej.datavisualization.DigitalGauge($("#DigitalGauge"), {
+            width: 525,
+            height: 305,
+            isResponsive: true,
+            items: [{
+                segmentSettings: {
+                    width: 1,
+                    spacing: 0,
+                    color: "#8c8c8c"
+                },
+                characterSettings: {
+                    opacity: 0.8,
+                },
+                value: "Syncfusion",
+                position: { x: 52, y: 52 }
+            }]
+        });
+    });
+}
+
+
+
+
+
+module DropDownListComponent {
+    var BikeList = [
+        { empid: "bk1", text: "Apache RTR" }, { empid: "bk2", text: "CBR 150-R" }, { empid: "bk3", text: "CBZ Xtreme" },
+        { empid: "bk4", text: "Discover" }, { empid: "bk5", text: "Dazzler" }, { empid: "bk6", text: "Flame" },
+        { empid: "bk7", text: "Fazzer" }, { empid: "bk8", text: "FZ-S" }, { empid: "bk9", text: "Pulsar" },
+        { empid: "bk10", text: "Shine" }, { empid: "bk11", text: "R15" }, { empid: "bk12", text: "Unicorn" }
+    ];
+    $(function () {
+        var sample = new ej.DropDownList($("#bikeList"),{
+            dataSource: BikeList,
+            width: "100%",
+            watermarkText: "Select a bike",
+            fields: { id: "empid", text: "text", value: "text" },
+            enableFilterSearch: true,
+            caseSensitiveSearch: true,
+            enableIncrementalSearch: true,
+            enablePopupResize: true,
+            delimiterChar: ";",
+            multiSelectMode: ej.MultiSelectMode.Delimiter,
+            maxPopupHeight: "300px",
+            minPopupHeight: "150px",
+            maxPopupWidth: "500px",
+            minPopupWidth: "350px",
+            showCheckbox: true,
+            showRoundedCorner: true
+        });
+    });
+}
+
+
+
+
+
+module ExplorerComponent {
+    $(function () {
+        var file = new ej.FileExplorer($("#fileExplorer"), {
+            path: (<any>window).baseurl + "Content/FileBrowser/",
+            width: "100%",
+            minWidth: "150px",
+            layout: "tile",
+            isResponsive: true,
+            ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
+        });
+    });
+}
+
+
+
+
+module GanttComponent {
+     $(function () {
+         var ganttInstance = new ej.Gantt($("#GanttContainer"), {
+        dataSource: (<any>window).projectData,
+        allowColumnResize: true,
+        allowSorting: true,
+        allowSelection: true,
+        enableContextMenu: true,
+        taskIdMapping: "taskID",
+        allowDragAndDrop: true,
+        taskNameMapping: "taskName",
+        startDateMapping: "startDate",
+        showColumnChooser: true,
+        showColumnOptions: true,
+        progressMapping: "progress",
+        durationMapping: "duration",
+        endDateMapping: "endDate",
+        childMapping: "subtasks",
+        scheduleStartDate: "02/01/2017",
+        scheduleEndDate: "04/09/2017",
+        //Resources mapping
+        resourceInfoMapping: "resourceId",
+        resourceNameMapping: "resourceName",
+        resourceIdMapping: "resourceId",
+        resources: (<any>window).projectResources,
+        predecessorMapping: "predecessor",
+        showResourceNames: true,
+        toolbarSettings: {
+            showToolbar: true,
+            toolbarItems: ["add","edit","delete","update","cancel","indent","outdent","expandAll","collapseAll","search"]
+        },
+        editSettings: {
+            allowEditing: true,
+            allowAdding: true,
+            allowDeleting: true,
+            allowIndent: true,
+            editMode: "cellEditing"
+        },
+        sizeSettings: {
+            width: "100%",
+            height: "100%"
+        },
+        dragTooltip: { showTooltip: true },
+        showGridCellTooltip: true,
+        treeColumnIndex: 1,
+        isResponsive: true,
+    });
+});
+}
+
+
+
+module GridComponent {
+    $(function () {
+        var gridInstance = new ej.Grid($("#Grid"), {
+            dataSource: (<any>window).gridData,
+            allowGrouping: true,
+            allowSorting: true,
+            allowMultiSorting: true,
+            enableAltRow: true,
+            allowPaging: true,
+            allowReordering: true,
+            allowResizing: true,
+            allowFiltering: true,
+            allowScrolling: true,
+            enableRowHover: true,
+            selectionType: "multiple",
+            selectionSettings: { enableToggle: true, selectionMode: ["row", "cell", "column"] },
+            allowKeyboardNavigation: true,
+            editSettings: { allowEditing: true, allowAdding: true, allowDeleting: true, allowEditOnDblClick: true, showDeleteConfirmDialog: true },
+            toolbarSettings: { showToolbar: true, toolbarItems: ["add", "edit", "delete", "update", "cancel", "search"] },
+            columns: [
+                { field: "OrderID", headerText: "Order ID", isPrimaryKey: true, width: 75, textAlign: ej.TextAlign.Right },
+                { field: "CustomerID", headerText: "Customer ID", editType: ej.Grid.EditingType.String, width: 80 },
+                { field: "EmployeeID", headerText: "Employee ID", width: 75, editType: ej.Grid.EditingType.Dropdown, textAlign: ej.TextAlign.Right, priority: 4 },
+                { field: "Freight", width: 75, format: "{0:C}", editType: ej.Grid.EditingType.Numeric, textAlign: ej.TextAlign.Right, priority: 3 },
+                { field: "OrderDate", headerText: "Order Date", width: 80, format: "{0:MM/dd/yyyy}", textAlign: ej.TextAlign.Right, priority: 2 },
+                { field: "ShipCity", headerText: "Ship City", editType: ej.Grid.EditingType.Dropdown, width: 110, priority: 2 }
+            ],
+            isResponsive: true,
+            minWidth: 700,
+            showSummary: true,
+            summaryRows: [{ title: "Sum", summaryColumns: [{ summaryType: ej.Grid.SummaryType.Sum, displayColumn: "Freight", dataMember: "Freight", format: "{0:C2}" }] }]
+        });
+    });
+}
+
+
+
+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++) {
+        var value = Math.floor((Math.random() * 100) + 1);
+        itemSource.push({ ProductName: columns[i], Year: "Y" + (2011 + j), Value: value })
+    }
+}
+
+$(function () {
+    var heatmap = new ej.datavisualization.HeatMap($("#heatmap"), {
+        colorMappingCollection: [
+            { value: 0, color: "#8ec8f8", label: { text: "0" } },
+            { value: 100, color: "#0d47a1", label: { text: "100" } }
+        ],
+        isResponsive: true,
+        itemsSource: itemSource,
+        width: "100%",
+        itemsMapping: {
+            column: { propertyName: "ProductName", displayName: "Product Name" },
+            row: { propertyName: "Year", displayName: "Year" },
+            value: { propertyName: "Value" },
+            columnMapping: [
+                { "propertyName": columns[0], "displayName": columns[0] },
+                { "propertyName": columns[1], "displayName": columns[1] },
+                { "propertyName": columns[2], "displayName": columns[2] },
+                { "propertyName": columns[3], "displayName": columns[3] },
+                { "propertyName": columns[4], "displayName": columns[4] },
+                { "propertyName": columns[5], "displayName": columns[5] }
+            ],
+            headerMapping: { propertyName: "Year", displayName: "Year", columnStyle: { width: 105, textAlign: "right" } },
+        },
+        legendCollection: ["heatmap_legend"]
+    });
+    var heatmaplegend = new ej.datavisualization.HeatMapLegend($("#heatmap_legend"), {
+        colorMappingCollection: [
+            { value: 0, color: "#8ec8f8", label: { text: "0" } },
+            { value: 100, color: "#0d47a1", label: { text: "100" } }
+        ],
+        height: "50px",
+        width: "75%",
+        isResponsive: true
+    });
+});
+
+
+
+
+module KanbanComponent {
+    $(function () {
+        var sample = new ej.Kanban($("#Kanban"), {
+           dataSource: new ej.DataManager((<any>window).kanbanData).executeLocal(new ej.Query().take(20)),
+            columns: [
+                { headerText: "Backlog", key: "Open" },
+                { headerText: "In Progress", key: "InProgress" },
+                { headerText: "Testing", key: "Testing" },
+                { headerText: "Done", key: "Close" }
+            ],
+            keyField: "Status",
+            allowTitle: true,
+            fields: {
+                content: "Summary",
+                primaryKey: "Id",
+                imageUrl: "ImgUrl"
+            },
+            allowSelection: false
+        });
+    });
+}
+
+
+module lineargaugecomponent {
+    $(function () {
+        var linearsample = new ej.datavisualization.LinearGauge($("#LinearGauge"), {
+            labelColor: "#8c8c8c", width: 500,
+            isResponsive: true, enableAnimation: false,
+            scales: [{
+                width: 4, border: { color: "transparent", width: 0 }, showBarPointers: false, showRanges: true, length: 310,
+                position: { x: 52, y: 50 }, markerPointers: [{
+                    value: 50, length: 10, width: 10, backgroundColor: "#4D4D4D", border: { color: "#4D4D4D" }
+                }],
+                labels: [{ font: { size: "11px", fontFamily: "Segoe UI", fontStyle: "bold" }, distanceFromScale: { x: -13 } }],
+                ticks: [{ type: "majorinterval", width: 1, color: "#8c8c8c" }],
+                ranges: [{
+                    endValue: 60,
+                    startValue: 0,
+                    backgroundColor: "#F6B53F",
+                    border: { color: "#F6B53F" }, startWidth: 4, endWidth: 4
+                }, {
+                        endValue: 100,
+                        startValue: 60,
+                        backgroundColor: "#E94649",
+                        border: { color: "#E94649" }, startWidth: 4, endWidth: 4
+                    }]
+            }]
+        });
+    });
+}
+
+
+
+module ListBoxComponent {
+    $(function () {
+        var listboxInstance = new ej.ListBox($("#selectcar"), {
+            showCheckbox: true
+        });
+    });
+}
+
+
+
+module ListviewComponent {
+    $(function () {
+        var listviewInstance = new ej.ListView($("#defaultlistview"), {
+            enableCheckMark: true,
+		    width: 400
+        });
+    });
+}
+
+
+var world_map=
+    {
+        "type": "FeatureCollection",
+        "crs": { "type": "name", "properties": { "name": "urn:ogc:def:crs:OGC:1.3:CRS84" } },
+        "features": [
+            { "type": "Feature", "properties": { "admin": "Afghanistan", "name": "Afghanistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [62.230651483005879, 35.270663967422287], [62.984662306576588, 35.404040839167614], [63.193538445900337, 35.857165635718907], [63.982895949158696, 36.007957465146596], [64.546479119733888, 36.31207326918426], [64.746105177677393, 37.111817735333297], [65.588947788357828, 37.305216783185628], [65.745630731066811, 37.661164048812061], [66.217384881459324, 37.393790188133913], [66.518606805288655, 37.362784328758785], [67.075782098259609, 37.35614390720928], [67.829999627559502, 37.144994004864678], [68.135562371701369, 37.023115139304302], [68.859445835245921, 37.344335842430588], [69.196272820924364, 37.15114350030742], [69.518785434857946, 37.608996690413413], [70.116578403610319, 37.588222764632086], [70.270574171840124, 37.73516469985401], [70.376304152309274, 38.138395901027515], [70.806820509732873, 38.486281643216408], [71.348131137990251, 38.258905341132156], [71.239403924448155, 37.953265082341879], [71.541917759084768, 37.905774441065631], [71.448693475230229, 37.065644843080513], [71.84463829945058, 36.738171291646914], [72.193040805962383, 36.94828766534566], [72.636889682917271, 37.047558091778349], [73.260055779924983, 37.495256862938994], [73.948695916646486, 37.421566270490786], [74.980002475895404, 37.419990139305888], [75.158027785140902, 37.13303091078911], [74.575892775372964, 37.02084137628345], [74.067551710917812, 36.836175645488446], [72.920024855444453, 36.720007025696312], [71.846291945283909, 36.509942328429851], [71.262348260385735, 36.074387518857797], [71.498767938121077, 35.650563259415996], [71.613076206350698, 35.153203436822857], [71.115018751921625, 34.733125718722228], [71.156773309213449, 34.348911444632144], [70.881803012988385, 33.988855902638512], [69.93054324735958, 34.020120144175102], [70.323594191371583, 33.358532619758385], [69.687147251264847, 33.105498969041228], [69.262522007122541, 32.501944078088293], [69.317764113242546, 31.901412258424436], [68.926676873657655, 31.620189113892064], [68.556932000609308, 31.713310044882011], [67.792689243444769, 31.582930406209623], [67.683393589147457, 31.303154201781414], [66.938891229118454, 31.304911200479346], [66.38145755398601, 30.738899237586448], [66.346472609324408, 29.88794342703617], [65.046862013616092, 29.472180691031902], [64.350418735618504, 29.560030625928089], [64.148002150331237, 29.340819200145965], [63.550260858011164, 29.468330796826162], [62.549856805272775, 29.318572496044304], [60.874248488208778, 29.829238999952604], [61.78122155136343, 30.735850328081231], [61.699314406180811, 31.379506130492661], [60.941944614511115, 31.548074652628745], [60.863654819588952, 32.182919623334421], [60.536077915290761, 32.981268825811561], [60.963700392505991, 33.528832302376252], [60.528429803311575, 33.676446031217999], [60.80319339380744, 34.404101874319856], [61.21081709172573, 35.650072333309218]]] } },
+            { "type": "Feature", "properties": { "admin": "Angola", "name": "Angola", "continent": "Africa" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[16.326528354567042, -5.877470391466217], [16.573179965896141, -6.622644545115092], [16.860190870845226, -7.222297865429978], [17.089995965247166, -7.545688978712474], [17.472970004962288, -8.068551120641656], [18.134221632569048, -7.987677504104865], [18.464175652752683, -7.847014255406475], [19.016751743249664, -7.988245944860138], [19.166613396896079, -7.738183688999724], [19.417502475673214, -7.155428562044277], [20.037723016040214, -7.116361179231658], [20.091621534920616, -6.943090101756949], [20.60182295093832, -6.939317722199688], [20.514748162526526, -7.299605808138663], [21.728110792739752, -7.290872491081315], [21.74645592620336, -7.920084730667113], [21.949130893652033, -8.305900974158304], [21.80180138518795, -8.908706556842985], [21.875181919042397, -9.523707777548564], [22.208753289486417, -9.894796237836529], [22.155268182064326, -11.084801120653777], [22.402798292742428, -10.99307545333569], [22.837345411884762, -11.017621758674334], [23.456790805767461, -10.867863457892481], [23.912215203555743, -10.926826267137541], [24.017893507592614, -11.237298272347115], [23.904153680118235, -11.722281589406332], [24.079905226342895, -12.191296888887305], [23.930922072045373, -12.565847670138821], [24.0161365088947, -12.91104623784855], [21.933886346125941, -12.898437188369353], [21.887842644953871, -16.080310153876891], [22.562478468524283, -16.898451429921831], [23.215048455506086, -17.523116143465952], [21.377176141045592, -17.930636488519706], [18.956186964603628, -17.789094740472233], [18.263309360434217, -17.309950860262003], [14.209706658595049, -17.353100681225708], [14.058501417709035, -17.423380629142653], [13.462362094789963, -16.971211846588741], [12.814081251688405, -16.941342868724075], [12.21546146001938, -17.111668389558059], [11.734198846085146, -17.301889336824498], [11.640096062881609, -16.673142185129205], [11.778537224991563, -15.793816013250687], [12.123580763404444, -14.878316338767927], [12.175618930722264, -14.449143568583889], [12.500095249083014, -13.547699883684398], [12.738478631245439, -13.137905775609934], [13.312913852601834, -12.483630466362511], [13.633721144269824, -12.038644707897189], [13.738727654686924, -11.297863050993142], [13.686379428775293, -10.73107594161584], [13.38732791510216, -10.373578383020726], [13.120987583069873, -9.766897067914112], [12.875369500386567, -9.166933689005488], [12.929061313537797, -8.959091078327573], [13.23643273280987, -8.56262948978434], [12.933040398824314, -7.596538588087752], [12.728298374083916, -6.927122084178803], [12.227347039446441, -6.294447523629372], [12.322431674863562, -6.100092461779651], [12.735171339578695, -5.965682061388476], [13.024869419006988, -5.984388929878106], [13.375597364971892, -5.864241224799555], [16.326528354567042, -5.877470391466217]]], [[[12.436688266660919, -5.684303887559223], [12.182336866920277, -5.789930515163801], [11.914963006242115, -5.037986748884733], [12.318607618873923, -4.606230157086158], [12.620759718484548, -4.438023369976121], [12.995517205465202, -4.781103203961918], [12.631611769265842, -4.991271254092935], [12.468004184629759, -5.248361504744991], [12.436688266660919, -5.684303887559223]]]] } },
+            { "type": "Feature", "properties": { "admin": "Albania", "name": "Albania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.590247430104906, 41.855404161133592], [20.463175083099195, 41.515089016275333], [20.605181919037356, 41.086226304685219], [21.020040317476397, 40.842726955725873], [20.99998986174722, 40.580003973953964], [20.67499677906363, 40.43499990494302], [20.61500044117275, 40.110006822259365], [20.150015903410516, 39.624997666983965], [19.980000441170144, 39.694993394523401], [19.9600016618732, 39.915005805006039], [19.40608198413673, 40.250773423822459], [19.319058872157139, 40.727230129553554], [19.403549838954287, 41.409565741535445], [19.540027296637099, 41.71998607031275], [19.371768833094958, 41.87754751237064], [19.304486118250786, 42.195745144207812], [19.738051385179627, 42.688247382165564], [19.801613396898681, 42.500093492190835], [20.0707, 42.58863], [20.28375451018189, 42.320259507815074], [20.52295, 42.21787], [20.590247430104906, 41.855404161133592]]] } },
+            { "type": "Feature", "properties": { "admin": "United Arab Emirates", "name": "United Arab Emirates", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[51.579518670463258, 24.245497137951102], [51.757440626844172, 24.294072984305462], [51.794389275932865, 24.019826158132499], [52.577080519425593, 24.177439276622703], [53.404006788960139, 24.151316840099167], [54.008000929587574, 24.121757920828212], [54.693023716048614, 24.797892360935084], [55.439024692614126, 25.439145209244934], [56.070820753814544, 26.055464178973978], [56.261041701080948, 25.714606431576762], [56.396847365143991, 24.924732163995483], [55.886232537667993, 24.92083059335744], [55.804118686756212, 24.269604193615258], [55.981213820220454, 24.130542914317822], [55.528631626208231, 23.933604030853498], [55.525841098864461, 23.524869289640929], [55.234489373602869, 23.110992743415316], [55.208341098863187, 22.708329982997039], [55.006803012924898, 22.496947536707129], [52.000733270074321, 23.001154486578937], [51.617707553926969, 24.014219265228824], [51.579518670463258, 24.245497137951102]]] } },
+            { "type": "Feature", "properties": { "admin": "Argentina", "name": "Argentina", "continent": "South America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-65.5, -55.2], [-66.45, -55.25], [-66.95992, -54.89681], [-67.56244, -54.87001], [-68.63335, -54.8695], [-68.634010227583147, -52.636370458874453], [-68.25, -53.1], [-67.75, -53.85], [-66.45, -54.45], [-65.05, -54.7], [-65.5, -55.2]]], [[[-64.964892137294569, -22.075861504812348], [-64.377021043542257, -22.79809132252354], [-63.986838141522462, -21.993644301035953], [-62.84646847192154, -22.034985446869452], [-62.685057135657885, -22.249029229422401], [-60.846564704009928, -23.880712579038299], [-60.028966030503973, -24.032796319273238], [-58.807128465394939, -24.771459242453268], [-57.777217169817952, -25.162339776309032], [-57.633660040911124, -25.603656508081666], [-58.618173590719707, -27.123718763947117], [-57.609759690976134, -27.395898532828419], [-56.486701626192989, -27.548499037386243], [-55.695845506398186, -27.387837009390815], [-54.788794928595038, -26.621785577096087], [-54.625290696823541, -25.739255466415479], [-54.130049607954412, -25.547639255477243], [-53.628348965048716, -26.12486500417743], [-53.648735317587885, -26.923472588816104], [-54.490725267135517, -27.474756768505767], [-55.162286342984586, -27.881915378533414], [-56.290899624239088, -28.852760512000849], [-57.62513342958291, -30.21629485445424], [-57.874937303281897, -31.016556084926158], [-58.14244035504074, -32.044503676076182], [-58.132647671121404, -33.040566908502008], [-58.349611172098818, -33.263188978815428], [-58.427074144104367, -33.909454441057541], [-58.495442064026541, -34.4314897600701], [-57.225829637263629, -35.288026625307886], [-57.362358771378737, -35.977390232081497], [-56.737487352105447, -36.413125909166574], [-56.788285285048339, -36.901571547189327], [-57.749156867083421, -38.183870538079901], [-59.231857062401865, -38.720220228837199], [-61.2374452378656, -38.92842457454114], [-62.335956997310134, -38.827707208004362], [-62.125763108962914, -39.424104913084868], [-62.33053097191943, -40.172586358400316], [-62.145994432205228, -40.676896661136723], [-62.74580278181697, -41.028761488612083], [-63.770494757732514, -41.166789239263657], [-64.732089809819698, -40.802677097335128], [-65.118035244391578, -41.064314874028874], [-64.97856055363583, -42.058000990569312], [-64.303407965742466, -42.359016208669495], [-63.755947842042339, -42.043686618824495], [-63.458059048095883, -42.563138116222355], [-64.378803880456289, -42.873558444999638], [-65.181803961839691, -43.495380954767782], [-65.328823411710133, -44.501366062193689], [-65.565268927661592, -45.03678557716978], [-66.509965786389344, -45.039627780945843], [-67.293793911392427, -45.551896254255183], [-67.580546434180079, -46.301772963242527], [-66.597066413017259, -47.033924655953804], [-65.641026577401433, -47.23613453551188], [-65.98508826360073, -48.133289076531128], [-67.166178961847649, -48.697337334996931], [-67.816087612566449, -49.869668877970412], [-68.728745083273154, -50.26421843851886], [-69.138539191347789, -50.732510267947788], [-68.815561489523517, -51.771104011594097], [-68.149994879820397, -52.349983406127699], [-68.571545376241332, -52.299443855346247], [-69.498362189396076, -52.142760912637236], [-71.914803839796321, -52.009022305865912], [-72.329403856074023, -51.425956312872394], [-72.309973517532342, -50.677009779666342], [-72.975746832964617, -50.741450290734299], [-73.328050910114456, -50.378785088909865], [-73.415435757120022, -49.318436374712952], [-72.648247443314929, -48.878618259476774], [-72.331160854771937, -48.244238376661819], [-72.44735531278026, -47.738532810253517], [-71.917258470330196, -46.884838148791786], [-71.552009446891233, -45.560732924177117], [-71.659315558545316, -44.973688653341434], [-71.222778896759721, -44.784242852559409], [-71.329800788036195, -44.407521661151677], [-71.793622606071935, -44.207172133156099], [-71.464056159130493, -43.787611179378324], [-71.915423956983901, -43.408564548517404], [-72.148898078078517, -42.254888197601375], [-71.746803758415453, -42.051386407235988], [-71.915734015577542, -40.832339369470716], [-71.680761277946445, -39.808164157878061], [-71.413516608349042, -38.916022230791107], [-70.814664272734703, -38.552995293940732], [-71.118625047475419, -37.576827487947192], [-71.121880662709771, -36.65812387466233], [-70.364769253201658, -36.005088799789931], [-70.388049485949082, -35.169687595359441], [-69.817309129501453, -34.193571465798279], [-69.814776984319209, -33.273886000299839], [-70.074399380153622, -33.09120981214803], [-70.535068935819439, -31.365010267870279], [-69.919008348251921, -30.336339206668306], [-70.013550381129861, -29.367922865518544], [-69.656130337183143, -28.459141127233686], [-69.001234910748266, -27.521213881136127], [-68.295541551370391, -26.899339694935787], [-68.594799770772667, -26.50690886811126], [-68.386001146097342, -26.185016371365229], [-68.417652960876111, -24.518554782816874], [-67.328442959244128, -24.025303236590908], [-66.985233934177629, -22.986348565362825], [-67.106673550063604, -22.735924574476392], [-66.273339402924833, -21.832310479420677], [-64.964892137294569, -22.075861504812348]]]] } },
+            { "type": "Feature", "properties": { "admin": "Armenia", "name": "Armenia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[43.582745802592726, 41.09214325618256], [44.972480096218071, 41.248128567055588], [45.179495883979335, 40.985353908851401], [45.560351189970433, 40.812289537105919], [45.359174839058156, 40.561503811193447], [45.891907179555076, 40.218475653639992], [45.610012241402913, 39.899993801425175], [46.034534132680662, 39.628020738273058], [46.483498976432443, 39.464154771475528], [46.505719842317966, 38.770605373686287], [46.143623081248812, 38.74120148371221], [45.735379266143006, 39.319719143219736], [45.739978468616975, 39.473999131827114], [45.298144972521456, 39.471751207022422], [45.00198733905674, 39.740003567049548], [44.793989699081934, 39.713002631177041], [44.400008579288695, 40.005000311842267], [43.656436395040934, 40.253563951166178], [43.752657911968399, 40.740200914058754], [43.582745802592726, 41.09214325618256]]] } },
+            { "type": "Feature", "properties": { "admin": "French Southern and Antarctic Lands", "name": "Fr. S. Antarctic Lands", "continent": "Seven seas (open ocean)" }, "geometry": { "type": "Polygon", "coordinates": [[[68.935, -48.625], [69.58, -48.94], [70.525, -49.065], [70.56, -49.255], [70.28, -49.71], [68.745, -49.775], [68.72, -49.2425], [68.8675, -48.83], [68.935, -48.625]]] } },
+            { "type": "Feature", "properties": { "admin": "Australia", "name": "Australia", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[145.397978143494782, -40.792548516605883], [146.364120721623692, -41.137695407883335], [146.908583612250823, -41.000546156580668], [147.689259474884125, -40.808258152022681], [148.289067824495987, -40.875437514002122], [148.359864536735785, -42.062445163746439], [148.017301467073082, -42.40702361426861], [147.914051955353784, -43.211522312188485], [147.564564243763982, -42.937688897473855], [146.87034305235494, -43.634597263362082], [146.663327264593647, -43.580853773778543], [146.048377720320389, -43.54974456153888], [145.431929559510536, -42.693776137056268], [145.295090366801674, -42.03360971452755], [144.7180713238306, -41.162551771815707], [144.743754510679622, -40.703975111657705], [145.397978143494782, -40.792548516605883]]], [[[143.561811151299935, -13.763655694232209], [143.922099237238882, -14.548310642152], [144.563713820574804, -14.171176039285879], [144.894908075133515, -14.594457696188622], [145.374723748963419, -14.984976495018284], [145.271991001567244, -15.428205254785691], [145.48525963763575, -16.285672295804769], [145.637033319276952, -16.784918308176611], [145.888904250267672, -16.906926364817647], [146.160308872664473, -17.76165455492524], [146.063673944278662, -18.280072523677315], [146.387478469019584, -18.958274021075905], [147.471081577747896, -19.480722751546676], [148.177601760042478, -19.955939222902767], [148.848413527623222, -20.391209812097252], [148.717465448195583, -20.633468926681513], [149.289420200802056, -21.260510756111096], [149.678337030230637, -22.342511895438388], [150.07738244038859, -22.122783705333315], [150.482939081015161, -22.556142266533012], [150.727265252891158, -22.402404880464655], [150.899554478152254, -23.462236830338679], [151.609175246384211, -24.076256198830755], [152.07353966695905, -24.45788665130619], [152.855197381805908, -25.267501316023008], [153.136162144176751, -26.071173191026187], [153.161948683890358, -26.641319268502439], [153.09290897034856, -27.260299574494503], [153.569469028944184, -28.110066827102099], [153.512108189100218, -28.995077406532751], [153.339095493787056, -29.458201592732443], [153.069241164358857, -30.350240166954809], [153.089601678681788, -30.923641859665445], [152.891577590139377, -31.640445651985949], [152.450002476205327, -32.550002536755237], [151.709117466436766, -33.041342054986337], [151.343971795862387, -33.816023451473846], [151.010555454715103, -34.310360202777879], [150.714139439089024, -35.173459974916803], [150.328219842733233, -35.671879164371923], [150.075212030232251, -36.420205580390508], [149.946124302367139, -37.109052422841224], [149.997283970336127, -37.425260512035123], [149.423882277625523, -37.772681166333463], [148.304622430615893, -37.809061374666875], [147.38173302631526, -38.219217217767543], [146.922122837511324, -38.606532077795116], [146.317921991154776, -39.035756524411433], [145.489652134380549, -38.593767999019043], [144.876976353128157, -38.41744801203911], [145.032212355732952, -37.896187839510972], [144.485682407814011, -38.085323581699257], [143.609973586196077, -38.809465427405321], [142.745426873952965, -38.538267510737519], [142.17832970598198, -38.380034275059835], [141.606581659104677, -38.308514092767872], [140.638578729413211, -38.019332777662541], [139.992158237874321, -37.402936293285094], [139.806588169514043, -36.643602797188272], [139.574147577065219, -36.138362318670666], [139.082808058834075, -35.732754001611774], [138.120747918856296, -35.612296237939397], [138.449461704664998, -35.127261244447887], [138.207564325106659, -34.384722588845925], [137.719170363516128, -35.07682504653102], [136.829405552314711, -35.260534763328614], [137.352371047108477, -34.707338555644093], [137.503886346588331, -34.130267836240769], [137.890116001537649, -33.640478610978327], [137.810327590079112, -32.900007012668105], [136.996837192940347, -33.752771498348629], [136.372069126531642, -34.094766127256186], [135.98904341038434, -34.89011809666048], [135.208212518454104, -34.478670342752601], [135.239218377829161, -33.947953383114971], [134.613416782774607, -33.222778008763136], [134.085903761939107, -32.848072198214759], [134.273902622617015, -32.617233575166949], [132.990776808809812, -32.011224053680188], [132.288080682504869, -31.982646986622761], [131.326330601120901, -31.495803318001041], [129.535793898639668, -31.590422865527476], [128.240937534702198, -31.948488864877849], [127.102867466338282, -32.282266941051041], [126.148713820501129, -32.2159660784206], [125.088623488465586, -32.728751316052829], [124.22164798390493, -32.959486586236061], [124.028946567888511, -33.483847344701708], [123.65966678273071, -33.890179131812722], [122.811036411633609, -33.914467054989835], [122.18306440642283, -34.003402194964217], [121.299190708502579, -33.821036065406126], [120.580268182458113, -33.930176690406618], [119.893695103028222, -33.976065362281808], [119.298899367348781, -34.50936614353396], [119.007340936357977, -34.464149265278529], [118.505717808100769, -34.746819349915093], [118.024971958489516, -35.064732761374707], [117.295507440257438, -35.025458672832862], [116.62510908413492, -35.025096937806829], [115.564346958479689, -34.386427911111547], [115.026808709779516, -34.196517022438918], [115.048616164206763, -33.623425388322026], [115.545123325667078, -33.487257989232951], [115.714673700016661, -33.259571628554944], [115.679378696761376, -32.900368747694124], [115.801645135563959, -32.205062351207026], [115.689610630355105, -31.612437025683782], [115.160909051576937, -30.601594333622455], [114.99704308477942, -30.030724786094162], [115.040037876446249, -29.461095472940794], [114.64197431850198, -28.810230808224706], [114.61649783738217, -28.516398614213042], [114.173579136208446, -28.118076674107321], [114.048883905088132, -27.33476531342712], [113.477497593236876, -26.543134047147898], [113.338953078262477, -26.116545098578477], [113.77835778204026, -26.549025160429174], [113.440962355606587, -25.621278171493152], [113.936901076311642, -25.911234633082877], [114.232852004047288, -26.298446140245868], [114.216160516417006, -25.786281019801105], [113.721255324357685, -24.998938897402123], [113.625343866024025, -24.683971042583146], [113.393523390762667, -24.384764499613262], [113.502043898575607, -23.80635019297025], [113.706992629045146, -23.56021534596406], [113.843418410295669, -23.059987481378734], [113.736551548316072, -22.475475355725372], [114.149756300921865, -21.755881036061009], [114.225307244932651, -22.51748829517863], [114.64776207891866, -21.829519952076904], [115.460167270979298, -21.495173435148541], [115.94737267462699, -21.068687839443708], [116.711615431791529, -20.701681817306817], [117.166316359527684, -20.623598728113802], [117.441545037914238, -20.746898695562162], [118.229558953932951, -20.374208265873232], [118.836085239742701, -20.263310642174822], [118.987807244951753, -20.044202569257319], [119.252493931150624, -19.952941989829835], [119.805225050944543, -19.976506442954978], [120.856220330896633, -19.683707777589188], [121.399856398607199, -19.239755547769729], [121.655137974129062, -18.70531788500713], [122.241665480641757, -18.197648614171765], [122.286623976735655, -17.798603204013911], [122.312772251475408, -17.254967136303446], [123.012574497571904, -16.405199883695854], [123.433789097183009, -17.268558037996225], [123.859344517106592, -17.069035332917249], [123.503242222183232, -16.596506036040363], [123.817073195491915, -16.11131601325199], [124.258286574399847, -16.32794361741956], [124.379726190285794, -15.567059828353973], [124.926152785340022, -15.07510019293532], [125.167275018413875, -14.680395603090004], [125.670086704613823, -14.510070082256018], [125.685796340030493, -14.230655612853834], [126.125149367376096, -14.347340996968949], [126.142822707219864, -14.095986830301211], [126.582589146023736, -13.95279143642041], [127.065867140817332, -13.817967624570922], [127.804633416861932, -14.276906019755042], [128.359689976108939, -14.869169610252253], [128.985543247595899, -14.875990899314738], [129.621473423379598, -14.969783623924553], [129.409600050982988, -14.420669854391031], [129.888640578328591, -13.618703301653481], [130.339465773642928, -13.357375583553473], [130.183506300985982, -13.107520033422301], [130.617795037966971, -12.536392103732464], [131.223494500859999, -12.183648776908113], [131.73509118054946, -12.302452894747159], [132.575298293183096, -12.114040622611013], [132.557211541881031, -11.603012383676683], [131.824698114143644, -11.273781833545097], [132.357223748911395, -11.128519382372641], [133.019560581596409, -11.376411228076844], [133.550845981989028, -11.786515394745134], [134.393068475481982, -12.042365411022173], [134.678632440327021, -11.9411829565947], [135.298491245667975, -12.248606052299051], [135.882693312727611, -11.962266940969796], [136.258380975489445, -12.049341729381606], [136.492475213771627, -11.857208754120389], [136.951620314684988, -12.351958916882735], [136.685124953355739, -12.887223402562054], [136.305406528875096, -13.291229750219895], [135.961758254134111, -13.324509372615889], [136.077616815332533, -13.72427825282578], [135.783836297753226, -14.223989353088211], [135.4286641786112, -14.715432224183896], [135.500184360903177, -14.997740573794427], [136.295174595281367, -15.550264987859121], [137.065360142159477, -15.870762220933353], [137.580470819244795, -16.215082289294084], [138.303217401278971, -16.807604261952658], [138.58516401586337, -16.806622409739173], [139.108542922115475, -17.062679131745366], [139.260574985918197, -17.371600843986183], [140.215245396078274, -17.710804945550063], [140.875463495039241, -17.36906869880394], [141.071110467696258, -16.832047214426719], [141.274095493738798, -16.388870131091604], [141.398222284103781, -15.840531508042584], [141.702183058844611, -15.044921156476928], [141.563380161708665, -14.561333103089506], [141.635520461188094, -14.270394789286284], [141.519868605718955, -13.698078301653805], [141.650920038011009, -12.944687595270562], [141.842691278246207, -12.741547539931187], [141.68699018775078, -12.407614434461134], [141.928629185147543, -11.877465915578778], [142.118488397387978, -11.328042087451619], [142.14370649634634, -11.04273650476814], [142.51526004452495, -10.668185723516642], [142.797310011974048, -11.157354831591515], [142.866763136974271, -11.784706719614929], [143.11594689348567, -11.90562957117791], [143.158631626558758, -12.325655612846187], [143.522123651299864, -12.834358412327429], [143.597157830987669, -13.400422051652594], [143.561811151299935, -13.763655694232209]]]] } },
+            { "type": "Feature", "properties": { "admin": "Austria", "name": "Austria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.979666782304033, 48.123497015976298], [16.903754103267257, 47.714865627628321], [16.340584344150411, 47.712901923201215], [16.534267612380372, 47.496170966169103], [16.202298211337361, 46.852385972676949], [16.011663852612653, 46.683610744811688], [15.137091912504982, 46.658702704447016], [14.632471551174827, 46.431817328469535], [13.806475457421524, 46.509306138691201], [12.376485223040813, 46.767559109069843], [12.153088006243051, 47.115393174826437], [11.164827915093268, 46.941579494812721], [11.048555942436533, 46.751358547546324], [10.442701450246627, 46.893546250997424], [9.932448357796657, 46.920728054382948], [9.479969516649019, 47.102809963563367], [9.632931756232974, 47.347601223329974], [9.594226108446346, 47.525058091820256], [9.896068149463188, 47.58019684507569], [10.402083774465209, 47.302487697939156], [10.544504021861625, 47.566399237653762], [11.426414015354736, 47.523766181012967], [12.141357456112784, 47.703083401065761], [12.620759718484491, 47.672387600284395], [12.932626987365945, 47.467645575543983], [13.025851271220487, 47.637583523135824], [12.884102817443901, 48.289145819687903], [13.243357374736998, 48.41611481382904], [13.595945672264433, 48.877171942737135], [14.33889773932472, 48.555305284207193], [14.901447381254055, 48.964401760445817], [15.253415561593979, 49.039074205107575], [16.029647251050218, 48.733899034207916], [16.49928266771877, 48.785808010445095], [16.960288120194573, 48.596982326850593], [16.879982944412998, 48.470013332709463], [16.979666782304033, 48.123497015976298]]] } },
+            { "type": "Feature", "properties": { "admin": "Azerbaijan", "name": "Azerbaijan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[45.001987339056789, 39.740003567049591], [45.298144972521435, 39.471751207022422], [45.739978468616997, 39.473999131827149], [45.735379266143092, 39.319719143219785], [46.143623081248812, 38.74120148371221], [45.457721795438729, 38.874139105783108], [44.952688022650264, 39.33576467544642], [44.79398969908199, 39.713002631177027], [45.001987339056789, 39.740003567049591]]], [[[47.373315464066216, 41.219732367511249], [47.81566572448471, 41.151416124021338], [47.987283156126033, 41.405819200194223], [48.584352654826283, 41.808869533854669], [49.110263706260653, 41.282286688800518], [49.618914829309588, 40.572924302729966], [50.084829542853093, 40.526157131505776], [50.392821079312704, 40.256561184239096], [49.569202101444795, 40.176100979160701], [49.395259230350419, 39.39948171646224], [49.2232283872507, 39.04921885838791], [48.856532423707584, 38.815486355131775], [48.883249139202533, 38.320245266262638], [48.634375441284831, 38.270377509100925], [48.010744256386502, 38.794014797514528], [48.355529412637928, 39.288764960276886], [48.060095249225256, 39.582235419262439], [47.685079380083117, 39.508363959301185], [46.505719842317966, 38.770605373686251], [46.483498976432443, 39.464154771475528], [46.034534132680697, 39.628020738273044], [45.610012241402913, 39.899993801425175], [45.891907179555133, 40.21847565363997], [45.359174839058156, 40.561503811193482], [45.560351189970469, 40.812289537105947], [45.179495883979392, 40.98535390885143], [44.972480096218156, 41.248128567055623], [45.217426385281634, 41.411451931314041], [45.962600538930438, 41.123872585609789], [46.501637404166978, 41.064444688474104], [46.637908156120567, 41.181672675128219], [46.145431756378983, 41.72280243587263], [46.404950799348818, 41.860675157227341], [46.686070591016652, 41.827137152669899], [47.373315464066216, 41.219732367511249]]]] } },
+            { "type": "Feature", "properties": { "admin": "Burundi", "name": "Burundi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[29.339997592900342, -4.499983412294092], [29.276383904749046, -3.293907159034063], [29.02492638521678, -2.839257907730157], [29.632176141078585, -2.917857761246096], [29.938359002407935, -2.348486830254238], [30.469696079232978, -2.413857517103458], [30.527677036264457, -2.807631931167534], [30.743012729624692, -3.034284763199686], [30.752262811004943, -3.359329522315569], [30.505559523243559, -3.568567396665364], [30.116332635221166, -4.090137627787242], [29.753512404099919, -4.45238941815328], [29.339997592900342, -4.499983412294092]]] } },
+            { "type": "Feature", "properties": { "admin": "Belgium", "name": "Belgium", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[3.314971144228536, 51.345780951536071], [4.047071160507527, 51.267258612668556], [4.973991326526913, 51.475023708698124], [5.60697594567, 51.037298488969768], [6.156658155958779, 50.803721015010574], [6.043073357781109, 50.128051662794221], [5.782417433300905, 50.090327867221205], [5.674051954784828, 49.52948354755749], [4.799221632515809, 49.985373033236371], [4.286022983425084, 49.90749664977254], [3.588184441755685, 50.378992418003563], [3.123251580425801, 50.780363267614561], [2.658422071960274, 50.796848049515731], [2.513573032246142, 51.148506171261815], [3.314971144228536, 51.345780951536071]]] } },
+            { "type": "Feature", "properties": { "admin": "Benin", "name": "Benin", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.691701694356254, 6.258817246928628], [1.865240512712318, 6.14215770102973], [1.618950636409238, 6.832038072126236], [1.664477573258381, 9.128590399609378], [1.46304284018467, 9.334624335157086], [1.425060662450136, 9.825395412632998], [1.077795037448737, 10.175606594275022], [0.772335646171484, 10.470808213742357], [0.899563022474069, 10.997339382364258], [1.243469679376488, 11.11051076908346], [1.447178175471066, 11.547719224488857], [1.93598554851988, 11.641150214072551], [2.154473504249921, 11.940150051313337], [2.49016360841793, 12.233052069543671], [2.84864301922667, 12.235635891158266], [3.611180454125558, 11.660167141155966], [3.572216424177469, 11.327939357951516], [3.797112257511713, 10.734745591673104], [3.600070021182801, 10.332186184119406], [3.705438266625918, 10.063210354040207], [3.220351596702101, 9.4441525333997], [2.912308383810255, 9.13760793704432], [2.723792758809509, 8.506845404489708], [2.74906253420022, 7.870734361192886], [2.691701694356254, 6.258817246928628]]] } },
+            { "type": "Feature", "properties": { "admin": "Burkina Faso", "name": "Burkina Faso", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-2.827496303712706, 9.642460842319775], [-3.511898972986272, 9.900326239456216], [-3.980449184576684, 9.862344061721698], [-4.330246954760383, 9.610834865757139], [-4.779883592131966, 9.821984768101741], [-4.954653286143098, 10.152713934769732], [-5.404341599946973, 10.370736802609144], [-5.470564947929004, 10.951269842976044], [-5.197842576508648, 11.375145778850136], [-5.220941941743119, 11.713858954307224], [-4.427166103523802, 12.542645575404292], [-4.280405035814879, 13.228443508349738], [-4.006390753587225, 13.472485459848112], [-3.52280270019986, 13.337661647998612], [-3.103706834312759, 13.54126679122859], [-2.967694464520576, 13.798150336151506], [-2.191824510090384, 14.246417548067352], [-2.001035122068771, 14.559008287000887], [-1.066363491205663, 14.973815009007764], [-0.515854458000348, 15.116157741755725], [-0.26625729003058, 14.924308986872147], [0.374892205414682, 14.928908189346128], [0.295646396495101, 14.444234930880651], [0.429927605805517, 13.988733018443922], [0.993045688490071, 13.335749620003821], [1.024103224297477, 12.851825669806573], [2.177107781593775, 12.625017808477532], [2.154473504249921, 11.940150051313337], [1.93598554851988, 11.641150214072551], [1.447178175471066, 11.547719224488857], [1.243469679376488, 11.11051076908346], [0.899563022474069, 10.997339382364258], [0.023802524423701, 11.018681748900802], [-0.438701544588582, 11.09834096927872], [-0.761575893548183, 10.936929633015053], [-1.203357713211431, 11.009819240762736], [-2.94040930827046, 10.962690334512557], [-2.963896246747111, 10.395334784380081], [-2.827496303712706, 9.642460842319775]]] } },
+            { "type": "Feature", "properties": { "admin": "Bangladesh", "name": "Bangladesh", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[92.672720981825549, 22.041238918541247], [92.652257114637976, 21.324047552978481], [92.30323449093865, 21.475485337809815], [92.368553501355606, 20.670883287025344], [92.082886183646124, 21.192195135985767], [92.025215285208361, 21.701569729086764], [91.834890985077408, 22.182935695885561], [91.417087029997646, 22.765019029221218], [90.496006300827247, 22.805016587815125], [90.586956821660948, 22.392793687422863], [90.272970819055544, 21.836367702720107], [89.847467075564268, 22.039146023033421], [89.70204959509492, 21.857115790285299], [89.41886274613546, 21.966178900637296], [89.031961297566198, 22.055708319582973], [88.876311883503064, 22.879146429937826], [88.529769728553759, 23.631141872649163], [88.699940220090895, 24.233714911388557], [88.084422235062405, 24.501657212821918], [88.30637251175601, 24.866079413344199], [88.931553989623069, 25.238692328384769], [88.209789259802477, 25.768065700782707], [88.56304935094974, 26.446525580342716], [89.355094028687276, 26.014407253518065], [89.832480910199592, 25.965082098895476], [89.920692580121838, 25.269749864192171], [90.872210727912105, 25.13260061288954], [91.799595981822065, 25.14743174895731], [92.376201613334786, 24.976692816664961], [91.915092807994398, 24.130413723237108], [91.467729933643668, 24.072639471934789], [91.158963250699713, 23.503526923104381], [91.706475050832083, 22.985263983649183], [91.869927606171302, 23.62434642180278], [92.146034783906799, 23.62749868417259], [92.672720981825549, 22.041238918541247]]] } },
+            { "type": "Feature", "properties": { "admin": "Bulgaria", "name": "Bulgaria", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.657149692482985, 44.234923000661276], [22.94483239105184, 43.823785305347123], [23.332302280376322, 43.897010809904707], [24.100679152124169, 43.741051337247846], [25.569271681426923, 43.688444729174712], [26.065158725699739, 43.943493760751259], [27.242399529740904, 44.175986029632398], [27.970107049275068, 43.812468166675202], [28.55808149589199, 43.707461656258118], [28.039095086384712, 43.293171698574177], [27.673897739378042, 42.577892361006214], [27.996720411905383, 42.007358710287775], [27.135739373490473, 42.141484890301335], [26.117041863720793, 41.826904608724554], [26.106138136507205, 41.328898830727766], [25.197201368925441, 41.234485988930523], [24.492644891058031, 41.583896185872028], [23.692073601992345, 41.309080918943842], [22.952377150166445, 41.337993882811141], [22.881373732197424, 41.999297186850242], [22.380525750424585, 42.320259507815081], [22.545011834409614, 42.461362006188025], [22.436594679461273, 42.580321153323929], [22.604801466571324, 42.898518785161137], [22.986018507588479, 43.211161200526959], [22.500156691180276, 43.642814439460977], [22.410446404721593, 44.008063462899948], [22.657149692482985, 44.234923000661276]]] } },
+            { "type": "Feature", "properties": { "admin": "The Bahamas", "name": "Bahamas", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-77.53466, 23.75975], [-77.78, 23.71], [-78.03405, 24.28615], [-78.40848, 24.57564], [-78.19087, 25.2103], [-77.89, 25.17], [-77.54, 24.34], [-77.53466, 23.75975]]], [[[-77.82, 26.58], [-78.91, 26.42], [-78.98, 26.79], [-78.51, 26.87], [-77.85, 26.84], [-77.82, 26.58]]], [[[-77.0, 26.59], [-77.17255, 25.87918], [-77.35641, 26.00735], [-77.34, 26.53], [-77.78802, 26.92516], [-77.79, 27.04], [-77.0, 26.59]]]] } },
+            { "type": "Feature", "properties": { "admin": "Bosnia and Herzegovina", "name": "Bosnia and Herz.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.005486281010118, 44.860233669609144], [19.36803, 44.863], [19.11761, 44.42307], [19.59976, 44.03847], [19.454, 43.568100000000115], [19.21852, 43.52384], [19.03165, 43.43253], [18.70648, 43.20011], [18.56, 42.65], [17.674921502358981, 43.028562527023603], [17.297373488034449, 43.446340643887353], [16.916156447017325, 43.667722479825663], [16.456442905348862, 44.041239732431265], [16.239660271884528, 44.351143296885695], [15.750026075918978, 44.81871165626255], [15.959367303133373, 45.233776760430935], [16.318156772535868, 45.004126695325901], [16.534939406000202, 45.211607570977705], [17.00214603035101, 45.233776760430935], [17.861783481526398, 45.067740383477137], [18.553214145591646, 45.08158966733145], [19.005486281010118, 44.860233669609144]]] } },
+            { "type": "Feature", "properties": { "admin": "Belarus", "name": "Belarus", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[23.484127638449841, 53.912497667041123], [24.45068362803703, 53.905702216194747], [25.536353794056989, 54.282423407602515], [25.768432651479792, 54.846962592175082], [26.588279249790386, 55.167175604871659], [26.494331495883749, 55.61510691997762], [27.102459751094525, 55.783313707087672], [28.17670942557799, 56.169129950578807], [29.2295133806603, 55.918344224666356], [29.371571893030669, 55.67009064393617], [29.896294386522353, 55.789463202530406], [30.87390913262, 55.550976467503396], [30.971835971813132, 55.081547756564028], [30.75753380709871, 54.811770941784303], [31.384472283663733, 54.157056382862422], [31.791424187962232, 53.974638576872117], [31.731272820774503, 53.794029446012011], [32.405598585751157, 53.618045355842028], [32.693643019346034, 53.351420803432106], [32.304519484188226, 53.132726141972903], [31.497643670382924, 53.167426866256889], [31.30520063652801, 53.073995876673195], [31.540018344862254, 52.742052313846344], [31.78599816257158, 52.10167796488544], [30.927549269338975, 52.042353420614383], [30.619454380014837, 51.822806098022362], [30.55511722181145, 51.319503485715643], [30.157363722460889, 51.416138414101454], [29.254938185347921, 51.368234361366881], [28.992835320763522, 51.602044379271462], [28.617612745892242, 51.427713934934836], [28.241615024536564, 51.572227077839059], [27.454066196408426, 51.59230337178446], [26.337958611768549, 51.832288723347915], [25.327787713327005, 51.910656032918538], [24.553106316839511, 51.888461005249177], [24.005077752384206, 51.617443956094448], [23.52707075368437, 51.578454087930233], [23.508002150168689, 52.023646552124717], [23.19949384938618, 52.486977444053664], [23.799198846133375, 52.691099351606553], [23.804934930117774, 53.08973135030606], [23.527535841574995, 53.47012156840654], [23.484127638449841, 53.912497667041123]]] } },
+            { "type": "Feature", "properties": { "admin": "Belize", "name": "Belize", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-89.143080410503302, 17.808318996649316], [-89.150909389995519, 17.955467637600414], [-89.029857347351808, 18.001511338772485], [-88.848343878926585, 17.883198147040229], [-88.490122850279334, 18.486830552641603], [-88.300031094093669, 18.499982204659897], [-88.296336229184803, 18.353272813383263], [-88.106812913754368, 18.348673610909284], [-88.123478563168476, 18.076674709541003], [-88.285354987322776, 17.644142971258031], [-88.197866787452625, 17.489475409408453], [-88.302640753924422, 17.13169363043566], [-88.239517991879893, 17.036066392479551], [-88.355428229510551, 16.530774237529624], [-88.551824510435821, 16.265467434143144], [-88.732433641295927, 16.233634751851351], [-88.930612759135244, 15.887273464415072], [-89.229121670269265, 15.886937567605166], [-89.15080603713092, 17.015576687075832], [-89.143080410503302, 17.808318996649316]]] } },
+            { "type": "Feature", "properties": { "admin": "Bolivia", "name": "Bolivia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.84646847192154, -22.034985446869442], [-63.986838141522462, -21.993644301035946], [-64.377021043542243, -22.798091322523533], [-64.964892137294598, -22.07586150481232], [-66.273339402924833, -21.832310479420713], [-67.10667355006359, -22.735924574476414], [-67.82817989772272, -22.872918796482171], [-68.219913092711266, -21.494346612231858], [-68.757167121033731, -20.372657972904459], [-68.442225104430904, -19.405068454671426], [-68.966818406841853, -18.9816834449041], [-69.100246955019472, -18.260125420812674], [-69.590423753524036, -17.580011895419329], [-68.959635382753291, -16.500697930571267], [-69.389764166934697, -15.66012908291165], [-69.160346645774936, -15.323973890853015], [-69.339534674747, -14.953195489158828], [-68.94888668483658, -14.45363941819328], [-68.929223802349526, -13.602683607643007], [-68.880079515239956, -12.89972909917665], [-68.665079718689611, -12.561300144097171], [-69.52967810736493, -10.951734307502193], [-68.786157599549469, -11.036380303596276], [-68.27125362819325, -11.014521172736817], [-68.048192308205373, -10.712059014532484], [-67.173801235610725, -10.30681243249961], [-66.646908331962791, -9.931331475466861], [-65.33843522811641, -9.76198780684639], [-65.444837002205375, -10.51145110437543], [-65.321898769783004, -10.895872084194675], [-65.402281460213018, -11.566270440317151], [-64.31635291203159, -12.461978041232191], [-63.196498786050562, -12.627032565972433], [-62.803060268796372, -13.000653171442682], [-62.127080857986371, -13.19878061284972], [-61.713204311760769, -13.489202162330049], [-61.084121263255646, -13.479383640194595], [-60.503304002511122, -13.775954685117656], [-60.459198167550014, -14.354007256734551], [-60.264326341377355, -14.645979099183638], [-60.251148851142922, -15.077218926659318], [-60.542965664295131, -15.093910414289592], [-60.158389655179022, -16.258283786690082], [-58.241219855366673, -16.299573256091289], [-58.388058437724027, -16.877109063385273], [-58.280804002502244, -17.271710300366014], [-57.734558274960989, -17.552468357007765], [-57.498371141170971, -18.174187513911289], [-57.676008877174297, -18.961839694904025], [-57.949997321185819, -19.400004164306814], [-57.853801642474494, -19.969995212486186], [-58.166392381408038, -20.176700941653674], [-58.183471442280492, -19.868399346600359], [-59.11504248720609, -19.356906019775398], [-60.043564622626477, -19.342746677327419], [-61.786326463453761, -19.633736667562957], [-62.265961269770784, -20.513734633061272], [-62.291179368729203, -21.051634616787389], [-62.685057135657871, -22.24902922942238], [-62.84646847192154, -22.034985446869442]]] } },
+            { "type": "Feature", "properties": { "admin": "Brazil", "name": "Brazil", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.290899624239067, -28.852760512000884], [-55.162286342984558, -27.881915378533456], [-54.49072526713551, -27.474756768505785], [-53.648735317587885, -26.923472588816086], [-53.628348965048737, -26.124865004177465], [-54.130049607954376, -25.547639255477247], [-54.625290696823562, -25.739255466415507], [-54.428946092330577, -25.162184747012162], [-54.293476325077435, -24.570799655863958], [-54.292959560754511, -24.021014092710722], [-54.652834235235119, -23.839578138933955], [-55.027901780809543, -24.001273695575225], [-55.400747239795407, -23.956935316668797], [-55.517639329639621, -23.57199757252663], [-55.61068274598113, -22.655619398694839], [-55.797958136606894, -22.356929620047815], [-56.473317430229379, -22.086300144135279], [-56.881509568902885, -22.282153822521476], [-57.937155727761287, -22.090175876557169], [-57.870673997617786, -20.732687676681948], [-58.166392381408038, -20.176700941653674], [-57.853801642474494, -19.969995212486186], [-57.949997321185819, -19.400004164306814], [-57.676008877174297, -18.961839694904025], [-57.498371141170971, -18.174187513911289], [-57.734558274960989, -17.552468357007765], [-58.280804002502244, -17.271710300366014], [-58.388058437724027, -16.877109063385273], [-58.241219855366673, -16.299573256091289], [-60.158389655179022, -16.258283786690082], [-60.542965664295131, -15.093910414289592], [-60.251148851142922, -15.077218926659318], [-60.264326341377355, -14.645979099183638], [-60.459198167550014, -14.354007256734551], [-60.503304002511122, -13.775954685117656], [-61.084121263255646, -13.479383640194595], [-61.713204311760769, -13.489202162330049], [-62.127080857986371, -13.19878061284972], [-62.803060268796372, -13.000653171442682], [-63.196498786050562, -12.627032565972433], [-64.31635291203159, -12.461978041232191], [-65.402281460213018, -11.566270440317151], [-65.321898769783004, -10.895872084194675], [-65.444837002205375, -10.51145110437543], [-65.33843522811641, -9.76198780684639], [-66.646908331962791, -9.931331475466861], [-67.173801235610725, -10.30681243249961], [-68.048192308205373, -10.712059014532484], [-68.27125362819325, -11.014521172736817], [-68.786157599549469, -11.036380303596276], [-69.52967810736493, -10.951734307502193], [-70.093752204046879, -11.123971856331011], [-70.548685675728393, -11.009146823778462], [-70.481893886991159, -9.490118096558842], [-71.302412278921523, -10.079436130415372], [-72.184890713169821, -10.05359791426943], [-72.563033006465631, -9.520193780152715], [-73.226713426390148, -9.462212823121233], [-73.015382656532537, -9.03283334720806], [-73.571059332967053, -8.424446709835832], [-73.987235480429646, -7.523829847853063], [-73.723401455363486, -7.340998630404412], [-73.724486660441627, -6.918595472850638], [-73.120027431923575, -6.629930922068238], [-73.219711269814596, -6.089188734566076], [-72.964507208941185, -5.741251315944892], [-72.891927659787243, -5.274561455916979], [-71.748405727816532, -4.59398284263301], [-70.928843349883564, -4.401591485210367], [-70.79476884630229, -4.251264743673302], [-69.893635219996611, -4.298186944194326], [-69.444101935489599, -1.556287123219817], [-69.420485805932216, -1.122618503426409], [-69.577065395776586, -0.549991957200163], [-70.02065589057004, -0.185156345219539], [-70.015565761989293, 0.541414292804205], [-69.452396002872447, 0.706158758950693], [-69.252434048119042, 0.602650865070075], [-69.218637661400166, 0.985676581217433], [-69.804596727157701, 1.089081122233466], [-69.816973232691609, 1.714805202639624], [-67.868565029558823, 1.692455145673392], [-67.537810024674684, 2.037162787276329], [-67.25999752467358, 1.719998684084956], [-67.065048183852483, 1.130112209473225], [-66.876325853122566, 1.253360500489336], [-66.325765143484944, 0.724452215982012], [-65.548267381437554, 0.78925446207603], [-65.354713304288353, 1.0952822941085], [-64.611011928959854, 1.328730576987041], [-64.199305792890499, 1.49285492594602], [-64.083085496666072, 1.91636912679408], [-63.368788011311644, 2.200899562993129], [-63.422867397705105, 2.411067613124174], [-64.269999152265783, 2.497005520025566], [-64.408827887617903, 3.126786200366623], [-64.368494432214092, 3.797210394705246], [-64.816064012294007, 4.056445217297422], [-64.628659430587533, 4.14848094320925], [-63.888342861574145, 4.020530096854571], [-63.093197597899092, 3.770571193858784], [-62.804533047116692, 4.006965033377951], [-62.085429653559125, 4.162123521334308], [-60.966893276601517, 4.536467596856638], [-60.601179165271922, 4.918098049332129], [-60.733574184803707, 5.2002772078619], [-60.213683437731319, 5.2444863956876], [-59.980958624904865, 5.014061184098138], [-60.111002366767373, 4.574966538914082], [-59.767405768458701, 4.423502915866606], [-59.538039923731219, 3.958802598481937], [-59.815413174057852, 3.606498521332085], [-59.974524909084543, 2.755232652188055], [-59.718545701726732, 2.249630438644359], [-59.646043667221242, 1.786893825686789], [-59.030861579002639, 1.317697658692722], [-58.540012986878288, 1.26808828369252], [-58.429477098205957, 1.46394196207872], [-58.113449876525003, 1.507195135907025], [-57.660971035377358, 1.682584947105638], [-57.33582292339689, 1.948537705895759], [-56.782704230360814, 1.863710842288653], [-56.53938574891454, 1.89952260986692], [-55.995698004771739, 1.817667141116601], [-55.905600145070871, 2.021995754398659], [-56.073341844290283, 2.220794989425499], [-55.973322109589361, 2.510363877773016], [-55.569755011605984, 2.42150625244713], [-55.097587449755125, 2.523748073736612], [-54.524754197799709, 2.311848863123785], [-54.088062506717243, 2.105556545414629], [-53.778520677288903, 2.376702785650081], [-53.554839240113537, 2.33489655192595], [-53.4184651352953, 2.05338918701598], [-52.939657151894949, 2.124857692875636], [-52.556424730018414, 2.504705308437053], [-52.249337531123942, 3.241094468596244], [-51.657797410678882, 4.156232408053028], [-51.317146369010842, 4.203490505383953], [-51.069771287629649, 3.65039765056403], [-50.508875291533641, 1.901563828942456], [-49.974075893745045, 1.736483465986069], [-49.947100796088705, 1.046189683431223], [-50.699251268096901, 0.222984117021681], [-50.388210822132123, -0.078444512536819], [-48.620566779156313, -0.235489190271821], [-48.584496629416577, -1.237805271005001], [-47.824956427590621, -0.5816179337628], [-46.566583624851219, -0.941027520352776], [-44.9057030909904, -1.551739597178134], [-44.417619187993658, -2.137750339367975], [-44.581588507655773, -2.691308282078523], [-43.418791266440188, -2.383110039889793], [-41.47265682632824, -2.912018324397116], [-39.97866533055403, -2.87305429444904], [-38.50038347019656, -3.700652357603394], [-37.223252122535193, -4.820945733258915], [-36.45293738457638, -5.109403578312153], [-35.597795783010454, -5.149504489770648], [-35.235388963347553, -5.464937432480245], [-34.896029832486825, -6.738193047719709], [-34.729993455533027, -7.343220716992965], [-35.128212042774216, -8.996401462442284], [-35.636966518687707, -9.649281508017811], [-37.046518724096991, -11.040721123908799], [-37.683611619607355, -12.17119475672582], [-38.423876512188436, -13.038118584854285], [-38.673887091616507, -13.057652276260615], [-38.953275722802537, -13.79336964280002], [-38.882298143049645, -15.667053724838764], [-39.161092495264306, -17.208406670808468], [-39.267339240056394, -17.867746270420479], [-39.583521491034219, -18.262295830968934], [-39.76082333022763, -19.599113457927402], [-40.774740770010332, -20.90451181405242], [-40.944756232250597, -21.937316989837807], [-41.75416419123821, -22.370675551037454], [-41.988284267736546, -22.970070489190888], [-43.074703742024738, -22.967693373305462], [-44.647811855637798, -23.351959323827838], [-45.35213578955991, -23.796841729428579], [-46.472093268405523, -24.088968601174539], [-47.648972337420645, -24.885199069927715], [-48.495458136577689, -25.877024834905647], [-48.641004808127725, -26.623697605090928], [-48.474735887228647, -27.175911960561887], [-48.661520351747612, -28.186134535435713], [-48.888457404157393, -28.674115085567877], [-49.587329474472668, -29.224469089476333], [-50.696874152211478, -30.984465020472953], [-51.576226162306149, -31.777698256153204], [-52.256081305538032, -32.245369968394662], [-52.71209998229768, -33.196578057591175], [-53.373661668498229, -33.768377780900757], [-53.650543992718084, -33.202004082981823], [-53.209588995971529, -32.727666110974717], [-53.787951626182185, -32.047242526987617], [-54.572451544805105, -31.494511407193745], [-55.601510179249331, -30.853878676071385], [-55.97324459494093, -30.883075860316296], [-56.976025763564721, -30.109686374636119], [-57.625133429582945, -30.216294854454258]]] } },
+            { "type": "Feature", "properties": { "admin": "Brunei", "name": "Brunei", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[114.204016554828343, 4.525873928236805], [114.599961379048707, 4.900011298029965], [115.450710483869798, 5.447729803891532], [115.405700311343566, 4.955227565933837], [115.347460972150643, 4.316636053887009], [114.869557326315373, 4.348313706881924], [114.659595981913498, 4.007636826997753], [114.204016554828343, 4.525873928236805]]] } },
+            { "type": "Feature", "properties": { "admin": "Bhutan", "name": "Bhutan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[91.69665652869665, 27.771741848251661], [92.10371178585973, 27.4526140406332], [92.033483514375078, 26.838310451763554], [91.217512648486405, 26.808648179628019], [90.37327477413406, 26.875724188742872], [89.744527622438838, 26.71940298105995], [88.835642531289366, 27.098966376243755], [88.814248488320544, 27.299315904239361], [89.475810174521101, 28.04275889740639], [90.015828891971154, 28.296438503527209], [90.730513950567769, 28.064953925075748], [91.258853794319904, 28.040614325466287], [91.69665652869665, 27.771741848251661]]] } },
+            { "type": "Feature", "properties": { "admin": "Botswana", "name": "Botswana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[25.649163445750155, -18.536025892818987], [25.850391473094724, -18.714412937090533], [26.164790887158478, -19.293085625894935], [27.296504754350501, -20.391519870690995], [27.724747348753247, -20.499058526290387], [27.727227817503252, -20.851801853114711], [28.02137007010861, -21.485975030200578], [28.794656202924209, -21.639454034107445], [29.432188348109033, -22.091312758067584], [28.017235955525244, -22.827753594659072], [27.119409620886238, -23.574323011979772], [26.78640669119741, -24.240690606383478], [26.485753208123292, -24.616326592713097], [25.941652052522151, -24.696373386333214], [25.765848829865206, -25.174845472923671], [25.664666375437712, -25.486816094669706], [25.025170525825782, -25.719670098576891], [24.211266717228792, -25.670215752873567], [23.733569777122703, -25.39012948985161], [23.312096795350179, -25.268689873965712], [22.824271274514896, -25.500458672794768], [22.579531691180584, -25.979447523708142], [22.105968865657864, -26.28025603607913], [21.60589603036939, -26.726533705351748], [20.889609002371731, -26.828542982695907], [20.666470167735437, -26.477453301704916], [20.758609246511831, -25.868136488551446], [20.165725538827186, -24.917961928000768], [19.895767856534427, -24.767790215760588], [19.895457797940672, -21.849156996347865], [20.881134067475866, -21.814327080983144], [20.910641310314531, -18.252218926672018], [21.655040317478971, -18.219146010005222], [23.196858351339298, -17.869038181227783], [23.579005568137713, -18.281261081620055], [24.217364536239209, -17.889347019118485], [24.520705193792534, -17.887124932529932], [25.084443393664564, -17.661815687737366], [25.264225701608005, -17.736539808831413], [25.649163445750155, -18.536025892818987]]] } },
+            { "type": "Feature", "properties": { "admin": "Central African Republic", "name": "Central African Rep.", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[15.279460483469107, 7.421924546737968], [16.106231723706767, 7.497087917506504], [16.290561557691884, 7.754307359239304], [16.456184523187343, 7.734773667832966], [16.705988396886251, 7.508327541529978], [17.964929640380884, 7.890914008002865], [18.389554884523218, 8.281303615751822], [18.911021762780504, 8.630894680206351], [18.81200971850927, 8.982914536978596], [19.094008009526018, 9.074846910025837], [20.059685499764267, 9.01270600019485], [21.00086836109616, 9.475985215691507], [21.723821648859452, 10.567055568885973], [22.231129184668784, 10.971888739460507], [22.864165480244218, 11.142395127807543], [22.977543572692603, 10.714462591998538], [23.554304233502187, 10.089255275915306], [23.557249790142826, 9.681218166538683], [23.394779087017181, 9.26506785729222], [23.459012892355979, 8.954285793488891], [23.805813429466745, 8.666318874542425], [24.567369012152078, 8.229187933785466], [25.114932488716786, 7.825104071479172], [25.12413089366472, 7.500085150579436], [25.796647983511171, 6.979315904158069], [26.21341840994511, 6.546603298362071], [26.465909458123232, 5.94671743410187], [27.213409051225163, 5.550953477394557], [27.374226108517483, 5.233944403500059], [27.044065382604703, 5.127852688004835], [26.402760857862535, 5.150874538590869], [25.650455356557465, 5.256087754737123], [25.278798455514302, 5.170408229997191], [25.128833449003274, 4.927244777847789], [24.805028924262409, 4.897246608902349], [24.41053104014625, 5.108784084489129], [23.297213982850135, 4.609693101414221], [22.841479526468103, 4.710126247573483], [22.704123569436284, 4.633050848810156], [22.405123732195531, 4.02916006104732], [21.659122755630019, 4.224341945813719], [20.927591180106273, 4.322785549329736], [20.290679152108932, 4.691677761245287], [19.467783644293146, 5.031527818212779], [18.932312452884755, 4.709506130385973], [18.542982211997778, 4.201785183118317], [18.453065219809925, 3.504385891123348], [17.809900343505259, 3.560196437998569], [17.133042433346297, 3.728196519379451], [16.537058139724135, 3.198254706226278], [16.01285241055535, 2.267639675298084], [15.907380812247649, 2.557389431158612], [15.862732374747479, 3.013537298998982], [15.405395948964379, 3.335300604664339], [15.036219516671249, 3.851367295747123], [14.950953403389658, 4.21038930909492], [14.478372430080466, 4.732605495620446], [14.558935988023501, 5.03059764243153], [14.459407179429345, 5.451760565610299], [14.536560092841111, 6.22695872642069], [14.776545444404572, 6.408498033062044], [15.279460483469107, 7.421924546737968]]] } },
+            { "type": "Feature", "properties": { "admin": "Canada", "name": "Canada", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-63.6645, 46.55001], [-62.9393, 46.41587], [-62.01208, 46.44314], [-62.50391, 46.03339], [-62.87433, 45.96818], [-64.1428, 46.39265], [-64.39261, 46.72747], [-64.01486, 47.03601], [-63.6645, 46.55001]]], [[[-61.806305, 49.10506], [-62.29318, 49.08717], [-63.58926, 49.40069], [-64.51912, 49.87304], [-64.17322, 49.95718], [-62.85829, 49.70641], [-61.835585, 49.28855], [-61.806305, 49.10506]]], [[[-123.510001587551116, 48.51001089130343], [-124.012890788399474, 48.370846259141402], [-125.655012777338342, 48.825004584338494], [-125.954994466792726, 49.179995835967638], [-126.850004435871853, 49.530000311880421], [-127.029993449544392, 49.814995835970073], [-128.059336304366212, 49.994959011426594], [-128.444584107102145, 50.53913768167611], [-128.358413656255408, 50.770648098343678], [-127.308581096029883, 50.552573554071948], [-126.695000977212302, 50.40090322529538], [-125.755006673823161, 50.295018215529367], [-125.415001587558791, 49.950000515332604], [-124.920768189119315, 49.47527497008339], [-123.92250870832099, 49.062483628935794], [-123.510001587551116, 48.51001089130343]]], [[[-56.134035814017111, 50.687009792679298], [-56.795881720595261, 49.812308661490945], [-56.143105027884289, 50.15011749938283], [-55.471492275602934, 49.935815334668447], [-55.822401089080913, 49.587128607779093], [-54.93514258484565, 49.313010972686833], [-54.473775397343772, 49.556691189159167], [-53.47654944519131, 49.24913890237405], [-53.786013759971233, 48.516780503933617], [-53.086133999226249, 48.687803656603528], [-52.95864824076223, 48.157164211614472], [-52.648098720904173, 47.53554840757549], [-53.069158291218336, 46.655498765644936], [-53.521456264853029, 46.618291734394823], [-54.178935512902527, 46.807065741556997], [-53.961868659060471, 47.625207017601909], [-54.240482143762122, 47.752279364607617], [-55.400773078011483, 46.88499380145312], [-55.997480841685835, 46.919720363953289], [-55.291219041552765, 47.389562486350982], [-56.250798712780508, 47.632545070987383], [-57.325229254777085, 47.572807115257987], [-59.26601518414676, 47.603347886742498], [-59.41949418805369, 47.89945384377485], [-58.796586473207398, 48.251525376979473], [-59.23162451845652, 48.523188381537793], [-58.391804979065213, 49.125580552764163], [-57.358689744686025, 50.718274034215845], [-56.738650071831998, 51.287438259478527], [-55.87097693543528, 51.632094224649187], [-55.406974249886602, 51.588272610065722], [-55.600218268442077, 51.317074693397913], [-56.134035814017111, 50.687009792679298]]], [[[-133.180004041711669, 54.169975490935308], [-132.710007884431292, 54.040009315423518], [-131.749989584003259, 54.120004380909208], [-132.049480347350965, 52.984621487024519], [-131.179042521826574, 52.18043284769827], [-131.577829549822894, 52.182370713909236], [-132.180428426778519, 52.639707139692391], [-132.549992432313843, 53.100014960332132], [-133.054611178755493, 53.411468817755363], [-133.239664482792676, 53.851080227262386], [-133.180004041711669, 54.169975490935308]]], [[[-79.26582, 62.158675], [-79.65752, 61.63308], [-80.09956, 61.7181], [-80.36215, 62.01649], [-80.315395, 62.085565], [-79.92939, 62.3856], [-79.52002, 62.36371], [-79.26582, 62.158675]]], [[[-81.89825, 62.7108], [-83.06857, 62.15922], [-83.77462, 62.18231], [-83.99367, 62.4528], [-83.25048, 62.91409], [-81.87699, 62.90458], [-81.89825, 62.7108]]], [[[-85.161307949549851, 65.657284654392797], [-84.975763719405933, 65.217518215588981], [-84.464012010419495, 65.371772365980163], [-83.88262630891974, 65.109617824963536], [-82.78757687043877, 64.766693020274673], [-81.642013719392509, 64.455135809986942], [-81.553440314444245, 63.979609280037131], [-80.817361212878851, 64.057485663500998], [-80.103451300766594, 63.725981350348597], [-80.991019863595653, 63.41124603947496], [-82.547178107416997, 63.651722317145229], [-83.108797573565042, 64.101875718839707], [-84.100416632813847, 63.569711819098004], [-85.523404710618991, 63.052379055424076], [-85.866768764982339, 63.637252916103542], [-87.221983201836721, 63.541238104905212], [-86.352759772471259, 64.035833238370699], [-86.224886440765133, 64.822916978608262], [-85.883847825854858, 65.738778388117041], [-85.161307949549851, 65.657284654392797]]], [[[-75.86588, 67.14886], [-76.98687, 67.09873], [-77.2364, 67.58809], [-76.81166, 68.14856], [-75.89521, 68.28721], [-75.1145, 68.01036], [-75.10333, 67.58202], [-75.21597, 67.44425], [-75.86588, 67.14886]]], [[[-95.647681203800488, 69.107690358321761], [-96.269521203800579, 68.757040358321731], [-97.61740120380054, 69.060030358321782], [-98.431801203800504, 68.950700358321768], [-99.797401203800504, 69.400030358321786], [-98.917401203800523, 69.710030358321788], [-98.218261203800466, 70.143540358321744], [-97.157401203800532, 69.860030358321794], [-96.557401203800524, 69.680030358321758], [-96.257401203800498, 69.490030358321761], [-95.647681203800488, 69.107690358321761]]], [[[-90.5471, 69.49766], [-90.55151, 68.47499], [-89.21515, 69.25873], [-88.01966, 68.61508], [-88.31749, 67.87338], [-87.35017, 67.19872], [-86.30607, 67.92146], [-85.57664, 68.78456], [-85.52197, 69.88211], [-84.10081, 69.80539], [-82.62258, 69.65826], [-81.28043, 69.16202], [-81.2202, 68.66567], [-81.96436, 68.13253], [-81.25928, 67.59716], [-81.38653, 67.11078], [-83.34456, 66.41154], [-84.73542, 66.2573], [-85.76943, 66.55833], [-86.0676, 66.05625], [-87.03143, 65.21297], [-87.32324, 64.77563], [-88.48296, 64.09897], [-89.91444, 64.03273], [-90.70398, 63.61017], [-90.77004, 62.96021], [-91.93342, 62.83508], [-93.15698, 62.02469], [-94.24153, 60.89865], [-94.62931, 60.11021], [-94.6846, 58.94882], [-93.21502, 58.78212], [-92.76462, 57.84571], [-92.297029999999893, 57.08709], [-90.89769, 57.28468], [-89.03953, 56.85172], [-88.03978, 56.47162], [-87.32421, 55.99914], [-86.07121, 55.72383], [-85.01181, 55.3026], [-83.36055, 55.24489], [-82.27285, 55.14832], [-82.4362, 54.28227], [-82.12502, 53.27703], [-81.40075, 52.15788], [-79.91289, 51.20842], [-79.14301, 51.53393], [-78.60191, 52.56208], [-79.12421, 54.14145], [-79.82958, 54.66772], [-78.22874, 55.13645], [-77.0956, 55.83741], [-76.54137, 56.53423], [-76.62319, 57.20263], [-77.30226, 58.05209], [-78.51688, 58.80458], [-77.33676, 59.85261], [-77.77272, 60.75788], [-78.10687, 62.31964], [-77.41067, 62.55053], [-75.69621, 62.2784], [-74.6682, 62.18111], [-73.83988, 62.4438], [-72.90853, 62.10507], [-71.67708, 61.52535], [-71.37369, 61.13717], [-69.59042, 61.06141], [-69.62033, 60.22125], [-69.2879, 58.95736], [-68.37455, 58.80106], [-67.64976, 58.21206], [-66.20178, 58.76731], [-65.24517, 59.87071], [-64.58352, 60.33558], [-63.80475, 59.4426], [-62.50236, 58.16708], [-61.39655, 56.96745], [-61.79866, 56.33945], [-60.46853, 55.77548], [-59.56962, 55.20407], [-57.97508, 54.94549], [-57.3332, 54.6265], [-56.93689, 53.78032], [-56.15811, 53.64749], [-55.75632, 53.27036], [-55.68338, 52.14664], [-56.40916, 51.7707], [-57.12691, 51.41972], [-58.77482, 51.0643], [-60.03309, 50.24277], [-61.72366, 50.08046], [-63.86251, 50.29099], [-65.36331, 50.2982], [-66.39905, 50.22897], [-67.23631, 49.51156], [-68.51114, 49.06836], [-69.95362, 47.74488], [-71.10458, 46.82171], [-70.25522, 46.98606], [-68.65, 48.3], [-66.55243, 49.1331], [-65.05626, 49.23278], [-64.17099, 48.74248], [-65.11545, 48.07085], [-64.79854, 46.99297], [-64.47219, 46.23849], [-63.17329, 45.73902], [-61.52072, 45.88377], [-60.51815, 47.00793], [-60.4486, 46.28264], [-59.80287, 45.9204], [-61.03988, 45.26525], [-63.25471, 44.67014], [-64.24656, 44.26553], [-65.36406, 43.54523], [-66.1234, 43.61867], [-66.16173, 44.46512], [-64.42549, 45.29204], [-66.02605, 45.25931], [-67.13741, 45.13753], [-67.79134, 45.70281], [-67.79046, 47.06636], [-68.23444, 47.35486], [-68.905, 47.185], [-69.237216, 47.447781], [-69.99997, 46.69307], [-70.305, 45.915], [-70.66, 45.46], [-71.08482, 45.30524], [-71.405, 45.255], [-71.50506, 45.0082], [-73.34783, 45.00738], [-74.867, 45.00048], [-75.31821, 44.81645], [-76.375, 44.09631], [-76.5, 44.018458893758712], [-76.820034145805565, 43.628784288093748], [-77.737885097957687, 43.62905558936329], [-78.720279914042365, 43.625089423184868], [-79.171673550111862, 43.466339423184216], [-79.01, 43.27], [-78.92, 42.965], [-78.939362148743683, 42.863611355148031], [-80.247447679347928, 42.366199856122584], [-81.277746548167144, 42.209025987306845], [-82.439277716791608, 41.675105088867149], [-82.690089280920162, 41.675105088867149], [-83.029810146806909, 41.832795722005834], [-83.141999681312555, 41.975681057292825], [-83.12, 42.08], [-82.9, 42.43], [-82.43, 42.98], [-82.137642381503881, 43.571087551439909], [-82.337763125431053, 44.44], [-82.550924648758169, 45.347516587905368], [-83.592850714843067, 45.816893622412373], [-83.469550747394621, 45.994686387712584], [-83.616130947590563, 46.116926988299056], [-83.890765347005726, 46.116926988299056], [-84.091851264161463, 46.27541860613816], [-84.14211951367335, 46.512225857115723], [-84.3367, 46.40877], [-84.6049, 46.4396], [-84.543748745445853, 46.538684190449132], [-84.779238247399888, 46.637101955749038], [-84.876079881514855, 46.900083319682366], [-85.652363247403414, 47.220218817730498], [-86.461990831228249, 47.553338019392037], [-87.439792623300207, 47.94], [-88.378114183286698, 48.302917588893727], [-89.272917446636654, 48.019808254582657], [-89.6, 48.01], [-90.83, 48.27], [-91.64, 48.14], [-92.61, 48.45], [-93.63087, 48.60926], [-94.32914, 48.67074], [-94.64, 48.84], [-94.81758, 49.38905], [-95.15609, 49.38425], [-95.159069509172014, 49.0], [-97.228720000004799, 49.0007], [-100.65, 49.0], [-104.04826, 48.99986], [-107.05, 49.0], [-110.05, 49.0], [-113.0, 49.0], [-116.04818, 49.0], [-117.03121, 49.0], [-120.0, 49.0], [-122.84, 49.0], [-122.97421, 49.002537777777789], [-124.91024, 49.98456], [-125.62461, 50.41656], [-127.43561, 50.83061], [-127.99276, 51.71583], [-127.85032, 52.32961], [-129.12979, 52.75538], [-129.30523, 53.56159], [-130.51497, 54.28757], [-130.53611, 54.80278], [-129.98, 55.285], [-130.00778, 55.91583], [-131.70781, 56.55212], [-132.73042, 57.69289], [-133.35556, 58.41028], [-134.27111, 58.86111], [-134.945, 59.27056], [-135.47583, 59.78778], [-136.47972, 59.46389], [-137.4525, 58.905], [-138.34089, 59.56211], [-139.039, 60.0], [-140.013, 60.27682], [-140.99778, 60.30639], [-140.9925, 66.00003], [-140.986, 69.712], [-139.12052, 69.47102], [-137.54636, 68.99002], [-136.50358, 68.89804], [-135.62576, 69.31512], [-134.41464, 69.62743], [-132.92925, 69.50534], [-131.43136, 69.94451], [-129.79471, 70.19369], [-129.10773, 69.77927], [-128.36156, 70.01286], [-128.13817, 70.48384], [-127.44712, 70.37721], [-125.75632, 69.48058], [-124.42483, 70.1584], [-124.28968, 69.39969], [-123.06108, 69.56372], [-122.6835, 69.85553], [-121.47226, 69.79778], [-119.94288, 69.37786], [-117.60268, 69.01128], [-116.22643, 68.84151], [-115.2469, 68.90591], [-113.89794, 68.3989], [-115.30489, 67.90261], [-113.49727, 67.68815], [-110.798, 67.80612], [-109.94619, 67.98104], [-108.8802, 67.38144], [-107.79239, 67.88736], [-108.81299, 68.31164], [-108.16721, 68.65392], [-106.95, 68.7], [-106.15, 68.8], [-105.34282, 68.56122], [-104.33791, 68.018], [-103.22115, 68.09775], [-101.45433, 67.64689], [-99.90195, 67.80566], [-98.4432, 67.78165], [-98.5586, 68.40394], [-97.66948, 68.57864], [-96.11991, 68.23939], [-96.12588, 67.29338], [-95.48943, 68.0907], [-94.685, 68.06383], [-94.23282, 69.06903], [-95.30408, 69.68571], [-96.47131, 70.08976], [-96.39115, 71.19482], [-95.2088, 71.92053], [-93.88997, 71.76015], [-92.87818, 71.31869], [-91.51964, 70.19129], [-92.40692, 69.69997], [-90.5471, 69.49766]]], [[[-114.167169999999871, 73.12145], [-114.66634, 72.65277], [-112.441019999999867, 72.9554], [-111.05039, 72.4504], [-109.920349999999857, 72.96113], [-109.00654, 72.63335], [-108.188349999999886, 71.65089], [-107.68599, 72.06548], [-108.39639, 73.08953], [-107.51645, 73.23598], [-106.522589999999866, 73.07601], [-105.402459999999877, 72.67259], [-104.77484, 71.6984], [-104.464759999999814, 70.99297], [-102.78537, 70.49776], [-100.980779999999868, 70.02432], [-101.089289999999892, 69.58447000000011], [-102.731159999999875, 69.50402], [-102.09329, 69.11962], [-102.43024, 68.75282], [-104.24, 68.91], [-105.96, 69.180000000000135], [-107.12254, 69.11922], [-108.999999999999872, 68.78], [-111.534148875200117, 68.630059156817921], [-113.3132, 68.53554], [-113.854959999999807, 69.007440000000102], [-115.22, 69.28], [-116.10794, 69.16821], [-117.34, 69.960000000000107], [-116.674729999999869, 70.06655], [-115.13112, 70.2373], [-113.72141, 70.19237], [-112.4161, 70.36638], [-114.35, 70.6], [-116.48684, 70.52045], [-117.9048, 70.540560000000127], [-118.43238, 70.9092], [-116.11311, 71.30918], [-117.65568, 71.2952], [-119.40199, 71.55859], [-118.56267, 72.30785], [-117.866419999999877, 72.70594], [-115.18909, 73.314590000000109], [-114.167169999999871, 73.12145]]], [[[-104.5, 73.42], [-105.38, 72.76], [-106.94, 73.46], [-106.6, 73.6], [-105.26, 73.64], [-104.5, 73.42]]], [[[-76.34, 73.102684989953005], [-76.251403808593736, 72.826385498046861], [-77.314437866210895, 72.85554504394527], [-78.391670227050795, 72.876655578613253], [-79.486251831054645, 72.742202758789062], [-79.775833129882827, 72.80290222167973], [-80.876098632812514, 73.333183288574205], [-80.833885192871051, 73.693183898925767], [-80.353057861328111, 73.75971984863277], [-78.064437866210923, 73.651931762695327], [-76.34, 73.102684989953005]]], [[[-86.562178514334107, 73.157447007938444], [-85.774371304044521, 72.534125881633798], [-84.850112474288224, 73.34027822538711], [-82.315590176100969, 73.750950832810574], [-80.600087653307611, 72.716543687624181], [-80.748941616524391, 72.061906643350753], [-78.770638597310764, 72.352173163534147], [-77.824623989559569, 72.749616604291035], [-75.605844692675717, 72.243678493937381], [-74.228616095664975, 71.767144273557889], [-74.099140794557698, 71.330840155717638], [-72.242225714797641, 71.556924546994495], [-71.200015428335192, 70.920012518997211], [-68.78605424668487, 70.525023708774242], [-67.914970465756923, 70.121947536897594], [-66.969033372654152, 69.18608734809186], [-68.805122850200533, 68.720198472764409], [-66.449866095633851, 68.067163397892003], [-64.862314419195215, 67.847538560651614], [-63.424934454996745, 66.928473212340649], [-61.851981370680569, 66.862120673277829], [-62.163176845942296, 66.160251369889593], [-63.91844438338417, 64.998668524832837], [-65.148860236253611, 65.426032619886669], [-66.72121904159853, 66.388041083432185], [-68.015016038673949, 66.262725735124391], [-68.141287400979152, 65.689789130304362], [-67.089646165623392, 65.108455105236985], [-65.732080451099748, 64.64840566675862], [-65.320167609301265, 64.382737128346051], [-64.669406297449669, 63.392926744227474], [-65.013803880458894, 62.674185085695974], [-66.275044725190455, 62.945098781986069], [-68.783186204692711, 63.745670071051805], [-67.369680752213029, 62.883965562584869], [-66.328297288667201, 62.28007477482204], [-66.165568203380147, 61.930897121825879], [-68.877366502544632, 62.330149237712803], [-71.023437059193824, 62.910708116295829], [-72.23537858751898, 63.397836005295154], [-71.886278449171286, 63.679989325608837], [-73.37830624051837, 64.193963121183813], [-74.834418911422588, 64.679075629323776], [-74.818502570276706, 64.389093329517962], [-77.709979824520019, 64.229542344816778], [-78.55594885935416, 64.572906399180127], [-77.897281053361908, 65.309192206474776], [-76.018274298797181, 65.326968899183143], [-73.95979529488271, 65.454764716240888], [-74.293883429649625, 65.81177134872938], [-73.94491248238262, 66.310578111426722], [-72.65116716173938, 67.284575507263853], [-72.926059943316076, 67.726925767682374], [-73.311617804645721, 68.069437160912898], [-74.8433072577768, 68.554627183701271], [-76.869100918266739, 68.894735622830254], [-76.228649054657339, 69.147769273547411], [-77.28736996123709, 69.769540106883269], [-78.168633999326588, 69.826487535268896], [-78.95724219431672, 70.166880194775402], [-79.492455003563649, 69.871807766388898], [-81.305470954091732, 69.743185126414332], [-84.944706183598456, 69.966634019644388], [-87.060003424817864, 70.260001125765356], [-88.681713223001495, 70.410741278760796], [-89.513419562523012, 70.762037665480975], [-88.467721116880753, 71.218185533321318], [-89.888151211287465, 71.222552191849942], [-90.205160285181989, 72.235074367960792], [-89.43657670770493, 73.129464219852352], [-88.408241543312784, 73.537888902471209], [-85.826151089200906, 73.803815823045213], [-86.562178514334107, 73.157447007938444]]], [[[-100.35642, 73.84389], [-99.16387, 73.63339], [-97.38, 73.76], [-97.12, 73.47], [-98.05359, 72.99052], [-96.54, 72.56], [-96.72, 71.66], [-98.35966, 71.27285], [-99.32286, 71.35639], [-100.01482, 71.73827], [-102.5, 72.51], [-102.48, 72.83], [-100.43836, 72.70588], [-101.54, 73.36], [-100.35642, 73.84389]]], [[[-93.196295539100205, 72.771992499473342], [-94.26904659704725, 72.024596259235949], [-95.409855516322637, 72.061880805134578], [-96.033745083382428, 72.940276801231789], [-96.01826799191096, 73.437429918095788], [-95.495793423224001, 73.862416897264154], [-94.503657599652328, 74.134906724739196], [-92.420012173211745, 74.100025132942179], [-90.509792853542578, 73.85673248971203], [-92.003965216829869, 72.966244208458477], [-93.196295539100205, 72.771992499473342]]], [[[-120.46, 71.383601793087578], [-123.09219, 70.90164], [-123.62, 71.34], [-125.92894873747332, 71.868688463011395], [-125.499999999999872, 72.292260811795003], [-124.80729, 73.02256], [-123.94, 73.680000000000135], [-124.917749999999899, 74.292750000000112], [-121.53788, 74.44893], [-120.10978, 74.24135], [-117.55564, 74.18577], [-116.58442, 73.89607], [-115.51081, 73.47519], [-116.767939999999882, 73.22292], [-119.22, 72.52], [-120.46, 71.82], [-120.46, 71.383601793087578]]], [[[-93.612755906940464, 74.979997260224437], [-94.156908738973812, 74.59234650338685], [-95.60868058956558, 74.666863918751758], [-96.820932176484561, 74.927623196096576], [-96.288587409229791, 75.377828274223333], [-94.850819871789113, 75.647217515760886], [-93.977746548217908, 75.296489569795952], [-93.612755906940464, 74.979997260224437]]], [[[-98.5, 76.72], [-97.735585, 76.25656], [-97.704415, 75.74344], [-98.16, 75.0], [-99.80874, 74.89744], [-100.88366, 75.05736], [-100.86292, 75.64075], [-102.50209, 75.5638], [-102.56552, 76.3366], [-101.48973, 76.30537], [-99.98349, 76.64634], [-98.57699, 76.58859], [-98.5, 76.72]]], [[[-108.21141, 76.20168], [-107.81943, 75.84552], [-106.92893, 76.01282], [-105.881, 75.9694], [-105.70498, 75.47951], [-106.31347, 75.00527], [-109.7, 74.85], [-112.22307, 74.41696], [-113.74381, 74.39427], [-113.87135, 74.72029], [-111.79421, 75.1625], [-116.31221, 75.04343], [-117.7104, 75.2222], [-116.34602, 76.19903], [-115.40487, 76.47887], [-112.59056, 76.14134], [-110.81422, 75.54919], [-109.0671, 75.47321], [-110.49726, 76.42982], [-109.5811, 76.79417], [-108.54859, 76.67832], [-108.21141, 76.20168]]], [[[-94.684085862999439, 77.097878323058367], [-93.573921068073105, 76.776295884906062], [-91.605023159536586, 76.778517971494594], [-90.741845872749209, 76.449597479956807], [-90.969661424507976, 76.074013170059445], [-89.822237921899244, 75.847773749485626], [-89.187082892599776, 75.610165513807615], [-87.838276333349611, 75.566188869927217], [-86.379192267588664, 75.482421373182163], [-84.789625210290595, 75.699204006646497], [-82.753444586910049, 75.784315090631225], [-81.12853084992436, 75.713983466282016], [-80.05751095245914, 75.336848863415867], [-79.833932868148324, 74.923127346487192], [-80.457770758775823, 74.657303778777774], [-81.948842536125511, 74.442459011524321], [-83.2288936022114, 74.564027818490928], [-86.097452358733292, 74.410032050261137], [-88.150350307960196, 74.392307033984977], [-89.764722052758358, 74.515555325001117], [-92.422440965529418, 74.837757880340973], [-92.768285488642789, 75.38681997344213], [-92.889905972041717, 75.882655341282629], [-93.893824022175977, 76.319243679500516], [-95.962457445035795, 76.44138092722244], [-97.121378953829463, 76.751077785947587], [-96.745122850312342, 77.161388658345132], [-94.684085862999439, 77.097878323058367]]], [[[-116.198586595507322, 77.645286770326194], [-116.335813361458349, 76.876961575010554], [-117.106050584768766, 76.530031846819114], [-118.040412157038119, 76.481171780087081], [-119.899317586885687, 76.053213406061971], [-121.499995077126471, 75.900018622532784], [-122.85492448615895, 76.116542873835684], [-122.854925293603188, 76.116542873835684], [-121.157535360328239, 76.864507554828336], [-119.103938971821023, 77.512219957174608], [-117.570130784965954, 77.498318996888102], [-116.198586595507322, 77.645286770326194]]], [[[-93.840003017943971, 77.51999726023449], [-94.295608283245244, 77.491342678528682], [-96.169654100310055, 77.55511139597688], [-96.436304490936109, 77.83462921824362], [-94.422577277386353, 77.820004787904978], [-93.720656297565867, 77.634331366680314], [-93.840003017943971, 77.51999726023449]]], [[[-110.186938035912945, 77.697014879050286], [-112.051191169058455, 77.409228827616843], [-113.534278937619035, 77.732206529441143], [-112.724586758253835, 78.051050116681935], [-111.264443325630822, 78.152956041161545], [-109.854451870547067, 77.996324774884812], [-110.186938035912945, 77.697014879050286]]], [[[-109.663145718202557, 78.601972561345676], [-110.88131425661885, 78.406919867659994], [-112.542091437615142, 78.407901719873493], [-112.525890876091566, 78.550554511215225], [-111.500010342233367, 78.849993598130538], [-110.96366065147599, 78.804440823065207], [-109.663145718202557, 78.601972561345676]]], [[[-95.830294969449312, 78.056941229963243], [-97.309842902397975, 77.85059723582178], [-98.124289313533964, 78.082856960757567], [-98.55286780474664, 78.458105373845086], [-98.631984422585504, 78.871930243638374], [-97.337231411512604, 78.831984361476756], [-96.754398769908761, 78.765812689926989], [-95.559277920294562, 78.41831452098026], [-95.830294969449312, 78.056941229963243]]], [[[-100.060191820052111, 78.324754340315891], [-99.670939093813601, 77.907544664207393], [-101.303940192452984, 78.018984890444798], [-102.949808722733025, 78.343228664860206], [-105.176132778731514, 78.38033234324574], [-104.210429450277147, 78.677420152491777], [-105.419580451258511, 78.918335679836431], [-105.492289191493128, 79.301593939929177], [-103.529282396237917, 79.16534902619162], [-100.8251580472688, 78.80046173777869], [-100.060191820052111, 78.324754340315891]]], [[[-87.02, 79.66], [-85.81435, 79.3369], [-87.18756, 79.0393], [-89.03535, 78.28723], [-90.80436, 78.21533], [-92.87669, 78.34333], [-93.95116, 78.75099], [-93.93574, 79.11373], [-93.14524, 79.3801], [-94.974, 79.37248], [-96.07614, 79.70502], [-96.70972, 80.15777], [-96.01644, 80.60233], [-95.32345, 80.90729], [-94.29843, 80.97727], [-94.73542, 81.20646], [-92.40984, 81.25739], [-91.13289, 80.72345], [-89.45, 80.509322033898258], [-87.81, 80.32], [-87.02, 79.66]]], [[[-68.5, 83.106321516765732], [-65.82735, 83.02801], [-63.68, 82.9], [-61.85, 82.6286], [-61.89388, 82.36165], [-64.334, 81.92775], [-66.75342, 81.72527], [-67.65755, 81.50141], [-65.48031, 81.50657], [-67.84, 80.9], [-69.4697, 80.61683], [-71.18, 79.8], [-73.2428, 79.63415], [-73.88, 79.430162204802073], [-76.90773, 79.32309], [-75.52924, 79.19766], [-76.22046, 79.01907], [-75.39345, 78.52581], [-76.34354, 78.18296], [-77.88851, 77.89991], [-78.36269, 77.50859], [-79.75951, 77.20968], [-79.61965, 76.98336], [-77.91089, 77.022045], [-77.88911, 76.777955], [-80.56125, 76.17812], [-83.17439, 76.45403], [-86.11184, 76.29901], [-87.6, 76.42], [-89.49068, 76.47239], [-89.6161, 76.95213], [-87.76739, 77.17833], [-88.26, 77.9], [-87.65, 77.970222222222205], [-84.97634, 77.53873], [-86.34, 78.18], [-87.96192, 78.37181], [-87.15198, 78.75867], [-85.37868, 78.9969], [-85.09495, 79.34543], [-86.50734, 79.73624], [-86.93179, 80.25145], [-84.19844, 80.20836], [-83.408695652173819, 80.1], [-81.84823, 80.46442], [-84.1, 80.58], [-87.59895, 80.51627], [-89.36663, 80.85569], [-90.2, 81.26], [-91.36786, 81.5531], [-91.58702, 81.89429], [-90.1, 82.085], [-88.93227, 82.11751], [-86.97024, 82.27961], [-85.5, 82.652273458057024], [-84.260005, 82.6], [-83.18, 82.32], [-82.42, 82.86], [-81.1, 83.02], [-79.30664, 83.13056], [-76.25, 83.172058823529369], [-75.71878, 83.06404], [-72.83153, 83.23324], [-70.665765, 83.169780758382828], [-68.5, 83.106321516765732]]]] } },
+            { "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": "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]]] } },
+            { "type": "Feature", "properties": { "admin": "Colombia", "name": "Colombia", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-75.373223232713841, -0.15203175212045], [-75.801465827116587, 0.084801337073202], [-76.292314419240938, 0.416047268064119], [-76.576379767549383, 0.256935533037435], [-77.424984300430367, 0.395686753741117], [-77.668612840470416, 0.825893052570961], [-77.855061408179509, 0.809925034992773], [-78.855258755188686, 1.380923773601822], [-78.990935228171026, 1.691369940595251], [-78.617831387023699, 1.766404120283056], [-78.662118089497838, 2.267355454920476], [-78.427610439757302, 2.629555568854215], [-77.931542527971473, 2.696605739752925], [-77.510431281224996, 3.325016994638246], [-77.127689785455246, 3.849636135265356], [-77.496271938776999, 4.087606105969427], [-77.307601284479375, 4.667984117039452], [-77.533220587865713, 5.582811997902496], [-77.318815070286718, 5.845354112161359], [-77.476660732722266, 6.691116441266301], [-77.881571417945239, 7.223771267114783], [-77.75341386586139, 7.709839789252141], [-77.431107957656977, 7.638061224798733], [-77.242566494440069, 7.935278225125442], [-77.474722866511314, 8.524286200388216], [-77.353360765273848, 8.670504665558068], [-76.836673957003541, 8.638749497914715], [-76.086383836557843, 9.336820583529486], [-75.674600185840035, 9.443248195834597], [-75.664704149056149, 9.774003200718736], [-75.480425991503338, 10.618990383339305], [-74.906895107711975, 11.08304474532032], [-74.276752692344871, 11.102035834187586], [-74.197222663047683, 11.310472723836865], [-73.414763963500278, 11.227015285685479], [-72.62783525255962, 11.731971543825519], [-72.238194953078903, 11.955549628136325], [-71.754090135368628, 12.437303168177305], [-71.399822353791691, 12.376040757695289], [-71.137461107045866, 12.112981879113503], [-71.331583624950284, 11.776284084515805], [-71.973921678338272, 11.608671576377116], [-72.227575446242923, 11.108702093953237], [-72.614657762325194, 10.821975409381777], [-72.905286017534692, 10.45034434655477], [-73.027604132769554, 9.736770331252441], [-73.304951544880026, 9.151999823437604], [-72.788729824500379, 9.085027167187331], [-72.660494757768092, 8.62528778730268], [-72.439862230097944, 8.405275376820027], [-72.360900641555958, 8.002638454617893], [-72.479678921178831, 7.632506008327352], [-72.444487270788059, 7.42378489830048], [-72.19835242378187, 7.340430813013682], [-71.960175747348629, 6.991614895043538], [-70.674233567981503, 7.087784735538717], [-70.093312954372408, 6.960376491723109], [-69.389479946557103, 6.099860541198835], [-68.985318569602327, 6.206804917826856], [-68.265052456318216, 6.153268133972473], [-67.695087246355001, 6.267318020040645], [-67.34143958196556, 6.095468044454021], [-67.521531948502741, 5.556870428891968], [-67.744696621355203, 5.221128648291667], [-67.823012254493534, 4.503937282728898], [-67.621835903581271, 3.839481716319994], [-67.33756384954367, 3.542342230641721], [-67.303173183853417, 3.31845408773718], [-67.809938117123693, 2.820655015469569], [-67.447092047786299, 2.600280869960869], [-67.181294318293041, 2.250638129074062], [-66.876325853122566, 1.253360500489336], [-67.065048183852483, 1.130112209473225], [-67.25999752467358, 1.719998684084956], [-67.537810024674684, 2.037162787276329], [-67.868565029558823, 1.692455145673392], [-69.816973232691609, 1.714805202639624], [-69.804596727157701, 1.089081122233466], [-69.218637661400166, 0.985676581217433], [-69.252434048119042, 0.602650865070075], [-69.452396002872447, 0.706158758950693], [-70.015565761989293, 0.541414292804205], [-70.02065589057004, -0.185156345219539], [-69.577065395776586, -0.549991957200163], [-69.420485805932216, -1.122618503426409], [-69.444101935489599, -1.556287123219817], [-69.893635219996611, -4.298186944194326], [-70.394043952094975, -3.766591485207825], [-70.692682054309699, -3.742872002785858], [-70.047708502874841, -2.725156345229699], [-70.813475714791949, -2.256864515800742], [-71.413645799429773, -2.342802422702128], [-71.774760708285385, -2.169789727388937], [-72.325786505813639, -2.434218031426453], [-73.070392218707212, -2.308954359550952], [-73.659503546834586, -1.260491224781134], [-74.122395189089048, -1.002832533373848], [-74.441600511355958, -0.530820000819887], [-75.106624518520064, -0.05720549886486], [-75.373223232713841, -0.15203175212045]]] } },
+            { "type": "Feature", "properties": { "admin": "Costa Rica", "name": "Costa Rica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.965783047197348, 8.225027980985983], [-83.508437262694287, 8.446926581247281], [-83.711473965169063, 8.656836249216864], [-83.596313035806631, 8.830443223501417], [-83.632641567707822, 9.051385809765319], [-83.909885626953724, 9.290802720573579], [-84.303401658856345, 9.487354030795712], [-84.64764421256865, 9.615537421095707], [-84.713350796227743, 9.908051866083849], [-84.975660366541319, 10.086723130733004], [-84.911374884770211, 9.795991522658921], [-85.110923428065291, 9.557039699741308], [-85.339488288092255, 9.834542141148658], [-85.660786505866966, 9.93334747969072], [-85.797444831062819, 10.134885565629032], [-85.791708747078417, 10.439337266476612], [-85.65931372754666, 10.754330959511718], [-85.941725430021748, 10.895278428587799], [-85.712540452807289, 11.088444932494822], [-85.561851976244171, 11.217119248901593], [-84.903003302738924, 10.952303371621895], [-84.673069017256239, 11.082657172078139], [-84.355930752281026, 10.999225572142901], [-84.190178595704822, 10.793450018756671], [-83.895054490885926, 10.726839097532444], [-83.655611741861563, 10.938764146361418], [-83.402319708982944, 10.39543813724465], [-83.015676642575158, 9.992982082555553], [-82.546196255203469, 9.566134751824674], [-82.932890998043561, 9.476812038608172], [-82.927154914059145, 9.074330145702914], [-82.719183112300513, 8.925708726431493], [-82.868657192704759, 8.807266343618521], [-82.829770677405151, 8.626295477732368], [-82.9131764391242, 8.423517157419068], [-82.965783047197348, 8.225027980985983]]] } },
+            { "type": "Feature", "properties": { "admin": "Cuba", "name": "Cuba", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-82.268151211257035, 23.188610744717703], [-81.404457160146819, 23.117271429938775], [-80.61876868358118, 23.105980129482994], [-79.679523688460222, 22.765303249598823], [-79.281485968732071, 22.399201565027049], [-78.347434455056472, 22.512166246017085], [-77.993295864560253, 22.277193508385928], [-77.146422492161037, 21.657851467367831], [-76.523824835908528, 21.20681956632437], [-76.194620123993175, 21.220565497314006], [-75.598222418912655, 21.01662445727413], [-75.671060350228032, 20.735091254147999], [-74.933896043584483, 20.693905137611381], [-74.178024868451246, 20.284627793859737], [-74.296648118777242, 20.050378526280678], [-74.961594611292924, 19.923435370355687], [-75.634680141894577, 19.873774318923193], [-76.323656175425981, 19.952890936762056], [-77.755480923153044, 19.855480861891873], [-77.085108405246729, 20.413353786698789], [-77.492654588516601, 20.673105373613886], [-78.137292243141573, 20.739948838783427], [-78.482826707661161, 21.028613389565848], [-78.719866502583997, 21.598113511638431], [-79.284999966127913, 21.559175319906497], [-80.217475348618635, 21.827324327069032], [-80.517534552721401, 22.037078965741756], [-81.820943366203167, 22.192056586185068], [-82.169991828118611, 22.387109279870746], [-81.79500179719264, 22.636964830001951], [-82.775897996740838, 22.688150336187057], [-83.494458787759328, 22.168517971276124], [-83.908800421875611, 22.154565334557329], [-84.052150845053248, 21.910575059491251], [-84.547030198896351, 21.801227728761639], [-84.974911058273079, 21.896028143801082], [-84.44706214062775, 22.204949856041903], [-84.23035702181177, 22.56575470630376], [-83.778239915690165, 22.78811839445569], [-83.267547573565736, 22.983041897060641], [-82.510436164057495, 23.078746649665181], [-82.268151211257035, 23.188610744717703]]] } },
+            { "type": "Feature", "properties": { "admin": "Northern Cyprus", "name": "N. Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[32.731780226377445, 35.14002594658843], [32.802473585752743, 35.145503648411363], [32.946960890440799, 35.38670339613369], [33.667227003724939, 35.373215847305509], [34.576473829900458, 35.671595567358786], [33.900804477684197, 35.245755927057608], [33.973616570783456, 35.058506374647997], [33.866439650210104, 35.093594672174177], [33.675391880027057, 35.017862860650446], [33.525685255677494, 35.038688462864066], [33.475817498515845, 35.000344550103499], [33.45592207208346, 35.101423651666401], [33.383833449036295, 35.162711900364563], [33.190977003723042, 35.173124701471373], [32.919572381326127, 35.087832749973636], [32.731780226377445, 35.14002594658843]]] } },
+            { "type": "Feature", "properties": { "admin": "Cyprus", "name": "Cyprus", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[33.973616570783456, 35.058506374647997], [34.004880812320032, 34.978097846001852], [32.97982710137844, 34.571869411755436], [32.490296258277532, 34.701654771456468], [32.256667107885953, 35.103232326796622], [32.731780226377445, 35.14002594658843], [32.919572381326127, 35.087832749973636], [33.190977003723042, 35.173124701471373], [33.383833449036295, 35.162711900364563], [33.45592207208346, 35.101423651666401], [33.475817498515845, 35.000344550103499], [33.525685255677494, 35.038688462864066], [33.675391880027057, 35.017862860650446], [33.866439650210104, 35.093594672174177], [33.973616570783456, 35.058506374647997]]] } },
+            { "type": "Feature", "properties": { "admin": "Czech Republic", "name": "Czech Rep.", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.960288120194573, 48.596982326850593], [16.49928266771877, 48.785808010445095], [16.029647251050218, 48.733899034207916], [15.253415561593979, 49.039074205107575], [14.901447381254055, 48.964401760445817], [14.33889773932472, 48.555305284207193], [13.595945672264433, 48.877171942737135], [13.031328973043427, 49.307068182973232], [12.52102420416119, 49.54741526956272], [12.415190870827441, 49.96912079528056], [12.240111118222556, 50.266337795607271], [12.96683678554319, 50.484076443069071], [13.338131951560282, 50.733234361364346], [14.05622765468817, 50.926917629594286], [14.307013380600633, 51.117267767941399], [14.570718214586062, 51.002339382524262], [15.016995883858666, 51.106674099321566], [15.490972120839725, 50.7847299261432], [16.238626743238566, 50.697732652379827], [16.176253289462263, 50.4226073268579], [16.719475945714429, 50.215746568393527], [16.868769158605655, 50.473973700556016], [17.554567091551117, 50.36214590107641], [17.649445021238986, 50.049038397819942], [18.392913852622168, 49.988628648470737], [18.85314415861361, 49.496229763377634], [18.554971144289478, 49.495015367218777], [18.399993523846174, 49.315000515330034], [18.170498488037961, 49.271514797556421], [18.104972771891848, 49.043983466175298], [17.913511590250462, 48.996492824899072], [17.886484816161808, 48.903475246773695], [17.545006951577101, 48.800019029325362], [17.101984897538895, 48.8169688991171], [16.960288120194573, 48.596982326850593]]] } },
+            { "type": "Feature", "properties": { "admin": "Germany", "name": "Germany", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[9.92190636560923, 54.983104153048025], [9.939579705452898, 54.596641954153242], [10.950112338920517, 54.363607082733147], [10.939466993868447, 54.008693345752583], [11.95625247564328, 54.196485500701144], [12.518440382546711, 54.470370591847988], [13.647467075259495, 54.075510972705885], [14.119686313542555, 53.757029120491026], [14.353315463934164, 53.248171291713092], [14.074521111719431, 52.981262518925334], [14.437599725002197, 52.62485016540829], [14.685026482815713, 52.089947414755208], [14.607098422919645, 51.745188096719964], [15.016995883858781, 51.106674099321701], [14.570718214586119, 51.002339382524369], [14.307013380600662, 51.117267767941364], [14.05622765468831, 50.92691762959435], [13.338131951560397, 50.733234361364268], [12.966836785543249, 50.484076443069164], [12.240111118222668, 50.266337795607214], [12.41519087082747, 49.969120795280602], [12.521024204161332, 49.547415269562741], [13.031328973043513, 49.307068182973232], [13.595945672264575, 48.877171942737156], [13.243357374737112, 48.416114813829026], [12.884102817443873, 48.289145819687846], [13.025851271220514, 47.637583523135945], [12.93262698736606, 47.467645575543983], [12.620759718484519, 47.672387600284409], [12.141357456112869, 47.703083401065768], [11.426414015354847, 47.523766181013045], [10.544504021861597, 47.566399237653783], [10.402083774465321, 47.302487697939164], [9.896068149463188, 47.58019684507569], [9.594226108446376, 47.525058091820185], [8.522611932009793, 47.830827541691342], [8.317301466514092, 47.613579820336263], [7.466759067422286, 47.620581976911907], [7.59367638513106, 48.333019110703724], [8.099278598674855, 49.017783515003423], [6.658229607783709, 49.201958319691627], [6.186320428094176, 49.4638028021145], [6.242751092156992, 49.90222565367872], [6.043073357781109, 50.128051662794221], [6.156658155958779, 50.803721015010574], [5.988658074577812, 51.85161570902504], [6.589396599970825, 51.85202912048338], [6.842869500362381, 52.228440253297542], [7.092053256873895, 53.14404328064488], [6.905139601274128, 53.482162177130633], [7.100424838905268, 53.693932196662658], [7.936239454793961, 53.748295803433777], [8.121706170289483, 53.527792466844275], [8.800734490604667, 54.02078563090889], [8.572117954145368, 54.395646470754045], [8.526229282270206, 54.962743638725144], [9.282048780971136, 54.830865383516297], [9.92190636560923, 54.983104153048025]]] } },
+            { "type": "Feature", "properties": { "admin": "Djibouti", "name": "Djibouti", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[43.081226027200152, 12.699638576707112], [43.317852410664663, 12.390148423711022], [43.286381463398911, 11.974928290245883], [42.715873650896519, 11.735640570518338], [43.145304803242126, 11.462039699748853], [42.776851841000948, 10.926878566934416], [42.55493000000012, 11.105110000000193], [42.314140000000116, 11.0342], [41.755570000000191, 11.05091], [41.739590000000177, 11.355110000000137], [41.661760000000122, 11.6312], [42.000000000000107, 12.100000000000133], [42.351560000000106, 12.54223000000013], [42.779642368344739, 12.455415757695672], [43.081226027200152, 12.699638576707112]]] } },
+            { "type": "Feature", "properties": { "admin": "Denmark", "name": "Denmark", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[12.690006137755629, 55.60999095318077], [12.089991082414738, 54.800014553437919], [11.043543328504226, 55.36486379660424], [10.90391360845163, 55.779954738988735], [12.370904168353288, 56.111407375708822], [12.690006137755629, 55.60999095318077]]], [[[10.912181837618359, 56.4586213242779], [10.667803989309986, 56.081383368547208], [10.369992710011983, 56.190007229224719], [9.649984978889306, 55.469999498102041], [9.921906365609173, 54.983104153048046], [9.282048780971136, 54.830865383516155], [8.526229282270235, 54.962743638724973], [8.120310906617588, 55.517722683323612], [8.089976840862247, 56.540011705137587], [8.256581658571262, 56.809969387430286], [8.543437534223385, 57.110002753316891], [9.424469028367609, 57.172066148499468], [9.775558709358561, 57.447940782289649], [10.580005730846151, 57.730016587954843], [10.54610599126269, 57.21573273378614], [10.250000034230222, 56.890016181050456], [10.369992710011983, 56.60998159446082], [10.912181837618359, 56.4586213242779]]]] } },
+            { "type": "Feature", "properties": { "admin": "Dominican Republic", "name": "Dominican Rep.", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.71236141629295, 19.714455878167353], [-71.587304450146604, 19.884910590082093], [-70.806706102161726, 19.880285549391981], [-70.214364997016119, 19.622885240146157], [-69.950815192327568, 19.647999986240002], [-69.769250047470067, 19.293267116772437], [-69.222125820579862, 19.313214219637096], [-69.254346076113819, 19.015196234609871], [-68.809411994080818, 18.979074408437846], [-68.317943284768958, 18.612197577381689], [-68.689315965434503, 18.205142320218609], [-69.164945848248905, 18.422648423735108], [-69.623987596297624, 18.380712998930246], [-69.952933926051529, 18.428306993071057], [-70.133232998317879, 18.245915025296892], [-70.517137213814195, 18.184290879788829], [-70.669298468697619, 18.42688589118303], [-70.999950120717173, 18.283328762276206], [-71.400209927033885, 17.598564357976596], [-71.657661912712001, 17.757572740138695], [-71.708304816358037, 18.044997056546091], [-71.687737596305865, 18.316660061104468], [-71.945112067335543, 18.616900132720257], [-71.701302659782485, 18.785416978424049], [-71.624873216422813, 19.169837958243303], [-71.71236141629295, 19.714455878167353]]] } },
+            { "type": "Feature", "properties": { "admin": "Algeria", "name": "Algeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.99950564947161, 23.471668402596443], [8.572893100629782, 21.565660712159136], [5.677565952180684, 19.601206976799713], [4.267419467800038, 19.155265204336995], [3.158133172222704, 19.057364203360034], [3.146661004253899, 19.693578599521441], [2.683588494486428, 19.856230170160114], [2.060990838233919, 20.142233384679482], [1.823227573259032, 20.61080943448604], [-1.550054897457613, 22.792665920497377], [-4.92333736817423, 24.974574082940993], [-8.684399786809051, 27.395744126895998], [-8.66512447756419, 27.58947907155822], [-8.665589565454805, 27.656425889592349], [-8.674116176782972, 28.841288967396572], [-7.059227667661928, 29.579228420524522], [-6.060632290053772, 29.731699734001687], [-5.242129278982786, 30.000443020135581], [-4.859646165374469, 30.501187649043839], [-3.690441046554695, 30.896951605751152], [-3.647497931320145, 31.637294012980668], [-3.068980271812647, 31.724497992473207], [-2.616604783529567, 32.094346218386143], [-1.30789913573787, 32.262888902306095], [-1.124551153966308, 32.651521511357124], [-1.388049282222567, 32.864015000941301], [-1.733454555661467, 33.91971283623198], [-1.792985805661686, 34.527918606091198], [-2.169913702798624, 35.168396307916673], [-1.208602871089056, 35.71484874118709], [-0.127454392894606, 35.888662421200799], [0.503876580415209, 36.301272894835272], [1.466918572606545, 36.605647081034398], [3.161698846050824, 36.783904934225205], [4.815758090849129, 36.865036932923452], [5.320120070017792, 36.716518866516616], [6.261819695672611, 37.110655015606731], [7.330384962603969, 37.118380642234364], [7.737078484741003, 36.885707505840209], [8.420964389691674, 36.946427313783154], [8.217824334352313, 36.433176988260271], [8.376367628623766, 35.479876003555937], [8.140981479534302, 34.655145982393783], [7.524481642292242, 34.097376410451453], [7.612641635782181, 33.344114895148955], [8.430472853233367, 32.748337307255944], [8.439102817426116, 32.506284898400814], [9.055602654668148, 32.102691962201284], [9.482139926805273, 30.307556057246181], [9.805634392952411, 29.424638373323383], [9.859997999723443, 28.959989732371007], [9.683884718472765, 28.144173895779193], [9.756128370816779, 27.688258571884141], [9.629056023811073, 27.140953477480913], [9.716285841519747, 26.512206325785691], [9.319410841518161, 26.094324856057447], [9.910692579801774, 25.365454616796733], [9.948261346077969, 24.93695364023251], [10.30384687667836, 24.37931325937091], [10.771363559622925, 24.562532050061744], [11.560669386449002, 24.097909247325511], [11.99950564947161, 23.471668402596443]]] } },
+            { "type": "Feature", "properties": { "admin": "Ecuador", "name": "Ecuador", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-80.302560594387188, -3.404856459164712], [-79.770293341780913, -2.65751189535964], [-79.986559210922394, -2.220794366061014], [-80.368783942369234, -2.685158786635788], [-80.967765469064332, -2.246942640800703], [-80.764806281238023, -1.965047702648532], [-80.933659023751702, -1.057454522306358], [-80.583370327461239, -0.906662692878683], [-80.39932471385373, -0.283703301600141], [-80.020898200180355, 0.360340074053468], [-80.090609707342097, 0.768428859862396], [-79.542762010399784, 0.982937730305963], [-78.855258755188686, 1.380923773601822], [-77.855061408179509, 0.809925034992773], [-77.668612840470416, 0.825893052570961], [-77.424984300430367, 0.395686753741117], [-76.576379767549383, 0.256935533037435], [-76.292314419240938, 0.416047268064119], [-75.801465827116587, 0.084801337073202], [-75.373223232713841, -0.15203175212045], [-75.233722703741932, -0.911416924649529], [-75.544995693652027, -1.56160979574588], [-76.635394253226707, -2.608677666843817], [-77.83790483265858, -3.003020521663103], [-78.450683966775628, -3.873096612161375], [-78.639897223612323, -4.547784112164072], [-79.205289069317715, -4.959128513207388], [-79.62497921417615, -4.454198093283494], [-80.028908047185581, -4.346090996928893], [-80.442241990872134, -4.425724379090673], [-80.46929460317692, -4.059286797708999], [-80.184014858709645, -3.821161797708043], [-80.302560594387188, -3.404856459164712]]] } },
+            { "type": "Feature", "properties": { "admin": "Egypt", "name": "Egypt", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.9226, 29.50133], [34.64174, 29.09942], [34.42655, 28.34399], [34.15451, 27.8233], [33.92136, 27.6487], [33.58811, 27.97136], [33.13676, 28.41765], [32.42323, 29.85108], [32.32046, 29.76043], [32.73482, 28.70523], [33.34876, 27.69989], [34.10455, 26.14227], [34.47387, 25.59856], [34.79507, 25.03375], [35.69241, 23.92671], [35.49372, 23.75237], [35.52598, 23.10244], [36.69069, 22.20485], [36.86623, 22.0], [32.9, 22.0], [29.02, 22.0], [25.0, 22.0], [25.0, 25.682499996360992], [25.0, 29.238654529533452], [24.70007, 30.04419], [24.95762, 30.6616], [24.80287, 31.08929], [25.16482, 31.56915], [26.49533, 31.58568], [27.45762, 31.32126], [28.45048, 31.02577], [28.91353, 30.87005], [29.68342, 31.18686], [30.09503, 31.4734], [30.97693, 31.55586], [31.68796, 31.4296], [31.96041, 30.9336], [32.19247, 31.26034], [32.99392, 31.02407], [33.7734, 30.96746], [34.26544, 31.21936], [34.9226, 29.50133]]] } },
+            { "type": "Feature", "properties": { "admin": "Eritrea", "name": "Eritrea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[42.351560000000106, 12.54223000000013], [42.00975, 12.86582], [41.59856, 13.452090000000108], [41.15519371924983, 13.773319810435224], [40.8966, 14.118640000000138], [40.026218702969167, 14.519579169162281], [39.34061, 14.53155], [39.0994, 14.74064], [38.51295, 14.50547], [37.90607, 14.959430000000165], [37.59377, 14.2131], [36.42951, 14.42211], [36.323188917798113, 14.822480577041057], [36.753860304518575, 16.291874091044289], [36.852530000000108, 16.95655], [37.16747, 17.263140000000128], [37.904000000000103, 17.42754], [38.410089959473218, 17.998307399970312], [38.990622999839999, 16.84062612555169], [39.266110060388016, 15.922723496967246], [39.814293654140208, 15.435647284400314], [41.179274936697645, 14.491079616753209], [41.734951613132345, 13.921036892141554], [42.276830682144848, 13.34399201095442], [42.589576450375255, 13.000421250861901], [43.081226027200152, 12.699638576707112], [42.779642368344739, 12.455415757695672], [42.351560000000106, 12.54223000000013]]] } },
+            { "type": "Feature", "properties": { "admin": "Spain", "name": "Spain", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.98443315269567, 42.592775173506261], [-9.392883673530644, 43.026624660812686], [-7.978189663108308, 43.748337714200979], [-6.754491746436754, 43.567909450853918], [-5.411886359061596, 43.574239813809669], [-4.347842779955783, 43.403449205085025], [-3.51753170410609, 43.455900783861296], [-1.901351284177764, 43.422802028978332], [-1.502770961910528, 43.034014390630425], [0.338046909190581, 42.579546006839543], [0.701590610363894, 42.795734361332599], [1.826793247087153, 42.343384711265678], [2.985998976258457, 42.473015041669854], [3.039484083680548, 41.892120266276891], [2.091841668312184, 41.226088568683082], [0.810524529635188, 41.014731960609332], [0.721331007499401, 40.678318386389229], [0.106691521819869, 40.123933620762003], [-0.278711310212941, 39.309978135732713], [0.111290724293838, 38.738514309233032], [-0.467123582349103, 38.292365831041138], [-0.683389451490598, 37.642353827457811], [-1.438382127274849, 37.443063666324214], [-2.146452602538119, 36.674144192037282], [-3.415780808923386, 36.658899644511173], [-4.368900926114718, 36.677839056946141], [-4.995219285492211, 36.32470815687963], [-5.377159796561457, 35.946850083961458], [-5.866432257500902, 36.02981659600605], [-6.236693894872174, 36.367677110330327], [-6.520190802425402, 36.942913316387312], [-7.45372555177809, 37.097787583966053], [-7.537105475281022, 37.428904323876232], [-7.166507941099863, 37.803894354802217], [-7.029281175148794, 38.075764065089757], [-7.374092169616317, 38.373058580064914], [-7.098036668313126, 39.03007274022378], [-7.498632371439724, 39.629571031241802], [-7.066591559263527, 39.711891587882768], [-7.026413133156593, 40.184524237624238], [-6.864019944679383, 40.330871893874821], [-6.851126674822551, 41.111082668617513], [-6.389087693700914, 41.381815497394641], [-6.668605515967655, 41.883386949219577], [-7.251308966490822, 41.91834605566504], [-7.422512986673794, 41.792074693359822], [-8.01317460776991, 41.790886135417118], [-8.26385698081779, 42.280468654950326], [-8.671945766626719, 42.134689439454952], [-9.034817674180244, 41.880570583659669]]] } },
+            { "type": "Feature", "properties": { "admin": "Estonia", "name": "Estonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[24.312862583114615, 57.793423570376966], [24.428927850042154, 58.383413397853275], [24.061198357853179, 58.257374579493394], [23.426560092876681, 58.612753404364618], [23.339795363058641, 59.187240302153363], [24.604214308376182, 59.465853786855007], [25.864189080516631, 59.611090399811324], [26.949135776484518, 59.445803331125767], [27.981114129353237, 59.47538808861286], [28.131699253051742, 59.300825100330904], [27.420166456824941, 58.724581203844224], [27.716685825315714, 57.791899115624354], [27.288184848751509, 57.474528306703817], [26.46353234223778, 57.476388658266316], [25.602809685984365, 57.847528794986559], [25.164593540149262, 57.970156968815175], [24.312862583114615, 57.793423570376966]]] } },
+            { "type": "Feature", "properties": { "admin": "Ethiopia", "name": "Ethiopia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[37.90607, 14.959430000000165], [38.51295, 14.50547], [39.0994, 14.74064], [39.34061, 14.53155], [40.026250000000111, 14.51959], [40.8966, 14.118640000000138], [41.1552, 13.77333], [41.59856, 13.452090000000108], [42.00975, 12.86582], [42.351560000000106, 12.54223000000013], [42.000000000000107, 12.100000000000133], [41.661760000000122, 11.6312], [41.739590000000177, 11.355110000000137], [41.755570000000191, 11.05091], [42.314140000000116, 11.0342], [42.55493000000012, 11.105110000000193], [42.776851841000948, 10.926878566934416], [42.55876, 10.572580000000126], [42.92812, 10.021940000000139], [43.29699, 9.540480000000169], [43.67875, 9.183580000000116], [46.94834, 7.99688], [47.78942, 8.003], [44.9636, 5.001620000000115], [43.66087, 4.95755], [42.769670000000119, 4.252590000000223], [42.12861, 4.234130000000163], [41.855083092644108, 3.918911920483764], [41.171800000000125, 3.91909], [40.768480000000118, 4.257020000000124], [39.854940000000106, 3.83879000000013], [39.559384258765917, 3.422060000000215], [38.89251, 3.50074], [38.67114, 3.61607], [38.436970000000137, 3.58851], [38.120915000000132, 3.598605], [36.85509323800823, 4.447864127672857], [36.159078632855646, 4.447864127672857], [35.817447662353622, 4.776965663462021], [35.817447662353622, 5.338232082790852], [35.298007118233095, 5.506], [34.70702, 6.59422000000012], [34.25032, 6.82607], [34.075100000000184, 7.22595], [33.56829, 7.71334], [32.954180000000228, 7.7849700000001], [33.294800000000116, 8.35458], [33.82550000000014, 8.37916], [33.97498, 8.684560000000145], [33.96162, 9.58358], [34.25745, 10.63009], [34.73115000000012, 10.910170000000106], [34.831630000000125, 11.318960000000116], [35.26049, 12.08286], [35.863630000000164, 12.57828], [36.27022, 13.563330000000118], [36.42951, 14.42211], [37.59377, 14.2131], [37.90607, 14.959430000000165]]] } },
+            { "type": "Feature", "properties": { "admin": "Finland", "name": "Finland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[28.591929559043187, 69.064776923286644], [28.445943637818651, 68.36461294216403], [29.9774263852206, 67.698297024192641], [29.054588657352319, 66.944286200621917], [30.21765, 65.80598], [29.544429559046982, 64.948671576590471], [30.444684686003704, 64.204453436939076], [30.035872430142714, 63.552813625738544], [31.516092156711117, 62.867687486412869], [31.139991082490891, 62.357692776124395], [30.211107212044443, 61.780027777749673], [28.06999759289527, 60.503516547275829], [26.25517296723697, 60.423960679762487], [24.496623976344516, 60.057316392651636], [22.869694858499454, 59.846373196036211], [22.290763787533589, 60.391921291741525], [21.322244093519313, 60.720169989659503], [21.544866163832687, 61.705329494871783], [21.059211053153682, 62.607393296958726], [21.536029493910799, 63.189735012455863], [22.442744174903986, 63.817810370531276], [24.730511508897528, 64.902343655040823], [25.398067661243939, 65.111426500093728], [25.2940430030404, 65.53434642197044], [23.903378533633795, 66.006927395279604], [23.565879754335576, 66.396050930437411], [23.539473097434435, 67.936008612735236], [21.978534783626113, 68.616845608180682], [20.645592889089521, 69.106247260200846], [21.244936150810666, 69.370443020293067], [22.356237827247405, 68.841741441514898], [23.662049594830751, 68.891247463650529], [24.735679152126721, 68.649556789821446], [25.689212680776361, 69.092113755969024], [26.179622023226241, 69.825298977326113], [27.732292107867856, 70.164193020296239], [29.015572950971968, 69.766491197377974], [28.591929559043187, 69.064776923286644]]] } },
+            { "type": "Feature", "properties": { "admin": "Fiji", "name": "Fiji", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[178.3736, -17.33992], [178.71806, -17.62846], [178.55271, -18.15059], [177.93266, -18.28799], [177.38146, -18.16432], [177.28504, -17.72465], [177.67087, -17.38114], [178.12557, -17.50481], [178.3736, -17.33992]]], [[[179.364142661964223, -16.801354076946847], [178.725059362997058, -17.012041674368017], [178.596838595117021, -16.63915], [179.096609362997128, -16.43398427754742], [179.413509362997075, -16.379054277547393], [180.000000000000114, -16.067132663642436], [180.000000000000114, -16.555216566639157], [179.364142661964223, -16.801354076946847]]], [[[-179.917369384765237, -16.501783135649358], [-180.0, -16.555216566639157], [-180.0, -16.067132663642436], [-179.793320109048551, -16.020882256741228], [-179.917369384765237, -16.501783135649358]]]] } },
+            { "type": "Feature", "properties": { "admin": "Falkland Islands", "name": "Falkland Is.", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.2, -51.85], [-60.0, -51.25], [-59.15, -51.5], [-58.55, -51.1], [-57.75, -51.55], [-58.05, -51.9], [-59.4, -52.2], [-59.85, -51.85], [-60.7, -52.3], [-61.2, -51.85]]] } },
+            { "type": "Feature", "properties": { "admin": "France", "name": "France", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-52.556424730018378, 2.504705308437053], [-52.939657151894963, 2.124857692875622], [-53.41846513529525, 2.053389187016037], [-53.554839240113481, 2.334896551925964], [-53.778520677288881, 2.376702785650053], [-54.088062506717264, 2.105556545414629], [-54.524754197799737, 2.311848863123785], [-54.271229620975781, 2.738747870286942], [-54.184284023644743, 3.194172268075234], [-54.011503872276812, 3.622569891774857], [-54.3995422023565, 4.212611395683481], [-54.478632981979203, 4.896755682795642], [-53.958044603070917, 5.756548163267808], [-53.618452928264837, 5.646529038918401], [-52.882141282754063, 5.409850979021598], [-51.823342861525916, 4.565768133966144], [-51.657797410678874, 4.156232408053028], [-52.249337531123977, 3.241094468596287], [-52.556424730018378, 2.504705308437053]]], [[[9.560016310269132, 42.152491970379558], [9.229752231491771, 41.380006822264441], [8.77572309737536, 41.583611965494427], [8.544212680707828, 42.256516628583078], [8.746009148807586, 42.628121853193946], [9.390000848028901, 43.009984849614725], [9.560016310269132, 42.152491970379558]]], [[[3.588184441755714, 50.378992418003563], [4.28602298342514, 49.90749664977254], [4.799221632515752, 49.985373033236314], [5.674051954784885, 49.529483547557433], [5.897759230176375, 49.442667141307155], [6.186320428094204, 49.463802802114444], [6.658229607783538, 49.201958319691549], [8.09927859867477, 49.017783515003366], [7.59367638513106, 48.333019110703724], [7.466759067422228, 47.620581976911851], [7.192202182655533, 47.449765529970982], [6.736571079138086, 47.541801255882874], [6.768713820023634, 47.287708238303672], [6.037388950228971, 46.725778713561894], [6.022609490593566, 46.272989813820502], [6.500099724970453, 46.429672756529428], [6.84359297041456, 45.991146552100659], [6.80235517744566, 45.708579820328673], [7.096652459347835, 45.333098863295859], [6.749955275101711, 45.028517971367584], [7.007562290076661, 44.254766750661382], [7.549596388386161, 44.127901109384808], [7.435184767291841, 43.693844916349164], [6.529245232783068, 43.12889232031835], [4.556962517931395, 43.399650987311581], [3.100410597352719, 43.075200507167118], [2.985998976258486, 42.473015041669882], [1.826793247087181, 42.343384711265649], [0.701590610363922, 42.795734361332642], [0.338046909190581, 42.57954600683955], [-1.502770961910471, 43.034014390630482], [-1.901351284177735, 43.422802028978332], [-1.384225226232956, 44.022610378590166], [-1.193797573237361, 46.014917710954862], [-2.225724249673788, 47.064362697938201], [-2.963276129559573, 47.570326646507958], [-4.491554938159481, 47.95495433205641], [-4.592349819344746, 48.68416046812694], [-3.295813971357745, 48.901692409859628], [-1.616510789384932, 48.644421291694577], [-1.933494025063254, 49.776341864615759], [-0.98946895995536, 49.347375800160869], [1.338761020522753, 50.127173163445256], [1.6390010921385, 50.9466063502975], [2.51357303224617, 51.14850617126185], [2.65842207196033, 50.796848049515646], [3.123251580425716, 50.780363267614504], [3.588184441755714, 50.378992418003563]]]] } },
+            { "type": "Feature", "properties": { "admin": "Gabon", "name": "Gabon", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[11.093772820691923, -3.978826592630546], [10.066135288135738, -2.969482517105681], [9.405245395554969, -2.144313246269042], [8.797995639693168, -1.111301364754496], [8.830086704146423, -0.779073581550037], [9.048419630579586, -0.459351494960217], [9.291350538783687, 0.268666083167687], [9.492888624721981, 1.010119533691494], [9.83028405115564, 1.067893784993799], [11.285078973036461, 1.057661851400013], [11.276449008843711, 2.261050930180871], [11.751665480199787, 2.326757513839993], [12.359380323952218, 2.19281220133945], [12.951333855855605, 2.321615708826939], [13.07582238124675, 2.267097072759014], [13.003113641012074, 1.830896307783319], [13.282631463278816, 1.31418366129688], [14.026668735417214, 1.395677395021153], [14.276265903386953, 1.196929836426619], [13.843320753645653, 0.038757635901149], [14.316418491277741, -0.552627455247048], [14.425455763413593, -1.333406670744971], [14.299210239324564, -1.998275648612213], [13.992407260807706, -2.470804945489099], [13.109618767965626, -2.428740329603513], [12.575284458067639, -1.948511244315134], [12.495702752338159, -2.391688327650242], [11.820963575903189, -2.514161472181982], [11.478038771214299, -2.765618991714241], [11.855121697648114, -3.42687061932105], [11.093772820691923, -3.978826592630546]]] } },
+            { "type": "Feature", "properties": { "admin": "United Kingdom", "name": "United Kingdom", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-5.661948614921896, 54.554603176483838], [-6.197884894220976, 53.867565009163329], [-6.953730231137994, 54.073702297575622], [-7.572167934591078, 54.059956366585979], [-7.366030646178785, 54.595840969452688], [-7.572167934591078, 55.131622219454883], [-6.733847011736144, 55.172860012423783], [-5.661948614921896, 54.554603176483838]]], [[[-3.00500484863528, 58.635000108466322], [-4.073828497728015, 57.55302480735525], [-3.055001796877661, 57.690019029360933], [-1.959280564776918, 57.684799709699512], [-2.219988165689301, 56.870017401753515], [-3.119003058271118, 55.97379303651546], [-2.085009324543023, 55.909998480851264], [-2.005675679673856, 55.804902850350217], [-1.11499101399221, 54.624986477265388], [-0.4304849918542, 54.464376125702145], [0.184981316742039, 53.325014146531018], [0.469976840831777, 52.929999498091959], [1.681530795914739, 52.739520168663987], [1.559987827164377, 52.099998480836], [1.050561557630914, 51.806760565795678], [1.4498653499503, 51.289427802121949], [0.550333693045502, 50.765738837275862], [-0.787517462558639, 50.774988918656206], [-2.489997524414377, 50.500018622431227], [-2.956273972984035, 50.696879991247002], [-3.617448085942327, 50.228355617872708], [-4.542507900399243, 50.341837063185658], [-5.245023159191134, 49.959999904981082], [-5.776566941745299, 50.159677639356815], [-4.309989793301837, 51.210001125689146], [-3.414850633142122, 51.426008612669236], [-3.422719467108322, 51.426848167406078], [-4.984367234710873, 51.593466091510962], [-5.267295701508885, 51.991400458374571], [-4.222346564134852, 52.30135569926135], [-4.770013393564112, 52.840004991255611], [-4.579999152026914, 53.495003770555165], [-3.093830673788658, 53.404547400669671], [-3.092079637047106, 53.404440822963544], [-2.945008510744343, 53.98499970154667], [-3.614700825433033, 54.60093677329256], [-3.63000545898933, 54.615012925833], [-4.844169073903003, 54.790971177786837], [-5.082526617849224, 55.061600653699358], [-4.719112107756643, 55.508472601943467], [-5.047980922862108, 55.783985500707516], [-5.586397670911139, 55.311146145236805], [-5.64499874513018, 56.275014960344791], [-6.149980841486352, 56.785009670633528], [-5.78682471355529, 57.818848375064633], [-5.009998745127574, 58.630013332750039], [-4.211494513353555, 58.550845038479153], [-3.00500484863528, 58.635000108466322]]]] } },
+            { "type": "Feature", "properties": { "admin": "Georgia", "name": "Georgia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[41.55408410011065, 41.535656236327561], [41.703170607272703, 41.962942816732912], [41.453470086438379, 42.645123399417926], [40.875469191253785, 43.013628038091277], [40.321394484220313, 43.128633938156831], [39.955008579270917, 43.434997666999216], [40.07696495947976, 43.553104153002309], [40.922184686045618, 43.38215851498078], [42.394394565608806, 43.220307929042619], [43.756016880067378, 42.74082815202248], [43.931199985536828, 42.554973863284758], [44.537622918481979, 42.71199270280362], [45.470279168485703, 42.502780666669963], [45.776410353382758, 42.09244395605635], [46.404950799348818, 41.860675157227298], [46.145431756379004, 41.722802435872573], [46.637908156120574, 41.181672675128219], [46.501637404166921, 41.064444688474104], [45.962600538930381, 41.123872585609767], [45.217426385281577, 41.411451931314041], [44.972480096218071, 41.248128567055588], [43.582745802592726, 41.09214325618256], [42.619548781104484, 41.583172715819934], [41.55408410011065, 41.535656236327561]]] } },
+            { "type": "Feature", "properties": { "admin": "Ghana", "name": "Ghana", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.060121697604927, 5.928837388528875], [-0.507637905265938, 5.343472601742675], [-1.063624640294193, 5.000547797053811], [-1.964706590167594, 4.71046214438337], [-2.856125047202397, 4.994475816259508], [-2.810701463217839, 5.389051215024109], [-3.244370083011261, 6.2504715031135], [-2.983584967450326, 7.379704901555511], [-2.56218950032624, 8.219627793811481], [-2.827496303712706, 9.642460842319775], [-2.963896246747111, 10.395334784380081], [-2.94040930827046, 10.962690334512557], [-1.203357713211431, 11.009819240762736], [-0.761575893548183, 10.936929633015053], [-0.438701544588582, 11.09834096927872], [0.023802524423701, 11.018681748900802], [-0.049784715159944, 10.706917832883928], [0.367579990245389, 10.191212876827176], [0.365900506195885, 9.46500397382948], [0.461191847342121, 8.677222601756013], [0.712029249686878, 8.312464504423827], [0.490957472342245, 7.411744289576474], [0.570384148774849, 6.914358628767188], [0.836931186536333, 6.279978745952147], [1.060121697604927, 5.928837388528875]]] } },
+            { "type": "Feature", "properties": { "admin": "Guinea", "name": "Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.439298468448696, 7.686042792181736], [-8.722123582382123, 7.711674302598509], [-8.926064622422002, 7.309037380396375], [-9.208786383490844, 7.313920803247952], [-9.403348151069748, 7.526905218938906], [-9.33727983238458, 7.928534450711351], [-9.755342169625832, 8.541055202666923], [-10.016566534861253, 8.42850393313523], [-10.230093553091276, 8.406205552601291], [-10.505477260774667, 8.348896389189603], [-10.494315151399629, 8.715540676300433], [-10.65477047366589, 8.977178452994194], [-10.622395188835037, 9.267910061068276], [-10.839151984083299, 9.688246161330367], [-11.117481248407328, 10.045872911006283], [-11.917277390988655, 10.046983954300556], [-12.150338100625003, 9.858571682164378], [-12.425928514037562, 9.835834051955953], [-12.596719122762206, 9.620188300001969], [-12.711957566773076, 9.342711696810765], [-13.246550258832512, 8.903048610871506], [-13.685153977909788, 9.494743760613458], [-14.074044969122278, 9.886166897008248], [-14.330075852912367, 10.015719712763966], [-14.579698859098254, 10.214467271358513], [-14.693231980843501, 10.65630076745404], [-14.83955379887794, 10.876571560098139], [-15.130311245168167, 11.040411688679525], [-14.685687221728896, 11.527823798056485], [-14.382191534878727, 11.509271958863691], [-14.121406419317776, 11.677117010947693], [-13.900799729863772, 11.678718980348744], [-13.743160773157411, 11.811269029177408], [-13.828271857142122, 12.142644151249041], [-13.718743658899511, 12.247185573775507], [-13.700476040084322, 12.586182969610192], [-13.217818162478235, 12.575873521367964], [-12.499050665730561, 12.332089952031053], [-12.278599005573438, 12.354440008997285], [-12.20356482588563, 12.465647691289401], [-11.658300950557928, 12.386582749882834], [-11.513942836950587, 12.442987575729415], [-11.456168585648269, 12.076834214725336], [-11.297573614944508, 12.077971096235768], [-11.036555955438256, 12.211244615116513], [-10.870829637078211, 12.177887478072106], [-10.593223842806278, 11.923975328005977], [-10.165213792348835, 11.844083563682743], [-9.890992804392011, 12.060478623904968], [-9.567911749703212, 12.194243068892472], [-9.327616339546008, 12.334286200403451], [-9.127473517279581, 12.308060411015331], [-8.905264858424529, 12.088358059126433], [-8.786099005559462, 11.812560939984705], [-8.376304897484911, 11.393645941610627], [-8.581305304386772, 11.136245632364801], [-8.620321010767126, 10.810890814655181], [-8.407310756860026, 10.90925690352276], [-8.282357143578279, 10.792597357623842], [-8.335377163109738, 10.494811916541932], [-8.029943610048617, 10.206534939001711], [-8.22933712404682, 10.129020290563897], [-8.309616461612249, 9.789531968622439], [-8.079113735374348, 9.376223863152033], [-7.832100389019186, 8.575704250518625], [-8.203498907900878, 8.455453192575446], [-8.299048631208562, 8.316443589710302], [-8.221792364932197, 8.123328762235571], [-8.280703497744936, 7.687179673692156], [-8.439298468448696, 7.686042792181736]]] } },
+            { "type": "Feature", "properties": { "admin": "Gambia", "name": "Gambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.84152462408127, 13.151393947802557], [-16.713728807023468, 13.594958604379853], [-15.624596320039936, 13.623587347869556], [-15.398770310924457, 13.860368760630916], [-15.081735398813816, 13.876491807505982], [-14.687030808968483, 13.63035696049978], [-14.376713833055785, 13.625680243377371], [-14.046992356817478, 13.794067898000446], [-13.844963344772404, 13.505041612191999], [-14.277701788784553, 13.28058502853224], [-14.712197231494626, 13.298206691943774], [-15.141163295949463, 13.509511623585235], [-15.511812506562931, 13.278569647672864], [-15.691000535534991, 13.270353094938455], [-15.931295945692208, 13.130284125211331], [-16.84152462408127, 13.151393947802557]]] } },
+            { "type": "Feature", "properties": { "admin": "Guinea Bissau", "name": "Guinea-Bissau", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-15.130311245168167, 11.040411688679525], [-15.664180467175523, 11.458474025920792], [-16.085214199273562, 11.524594021038236], [-16.314786749730199, 11.806514797406548], [-16.308947312881227, 11.958701890506116], [-16.613838263403277, 12.170911159712698], [-16.67745195155457, 12.38485158940105], [-16.147716844130581, 12.547761542201185], [-15.816574266004251, 12.515567124883345], [-15.548476935274005, 12.628170070847343], [-13.700476040084322, 12.586182969610192], [-13.718743658899511, 12.247185573775507], [-13.828271857142122, 12.142644151249041], [-13.743160773157411, 11.811269029177408], [-13.900799729863772, 11.678718980348744], [-14.121406419317776, 11.677117010947693], [-14.382191534878727, 11.509271958863691], [-14.685687221728896, 11.527823798056485], [-15.130311245168167, 11.040411688679525]]] } },
+            { "type": "Feature", "properties": { "admin": "Equatorial Guinea", "name": "Eq. Guinea", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.492888624721981, 1.010119533691494], [9.305613234096255, 1.160911363119183], [9.649158155972627, 2.283866075037735], [11.276449008843711, 2.261050930180871], [11.285078973036461, 1.057661851400013], [9.83028405115564, 1.067893784993799], [9.492888624721981, 1.010119533691494]]] } },
+            { "type": "Feature", "properties": { "admin": "Greece", "name": "Greece", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[23.699980096133, 35.705004380835526], [24.246665073348673, 35.368022365860149], [25.025015496528873, 35.424995632461979], [25.769207797964182, 35.354018052709073], [25.745023227651579, 35.179997666966209], [26.290002882601719, 35.299990342747911], [26.164997592887651, 35.004995429009789], [24.724982130642299, 34.919987697889603], [24.735007358506941, 35.084990546197581], [23.514978468528106, 35.27999156345097], [23.699980096133, 35.705004380835526]]], [[[26.604195590936282, 41.562114569661098], [26.294602085075777, 40.936261298174244], [26.056942172965499, 40.824123440100827], [25.44767703624418, 40.852545477861455], [24.925848422960932, 40.947061672523226], [23.714811232200809, 40.687129218095116], [24.407998894964063, 40.124992987624083], [23.89996788910258, 39.962005520175573], [23.342999301860797, 39.960997829745786], [22.813987664488959, 40.476005153966547], [22.626298862404777, 40.256561184239175], [22.849747755634805, 39.659310818025759], [23.350027296652595, 39.190011298167256], [22.97309939951554, 38.97090322524965], [23.53001631032495, 38.51000112563846], [24.025024855248937, 38.219992987616443], [24.040011020613601, 37.655014553369419], [23.115002882589145, 37.920011298162215], [23.409971958111065, 37.409990749657389], [22.77497195810863, 37.305010077456551], [23.154225294698612, 36.422505804992042], [22.4900281104511, 36.410000108377446], [21.670026482843692, 36.84498647719419], [21.295010613701574, 37.644989325504689], [21.120034213961329, 38.31032339126272], [20.730032179454579, 38.769985256498778], [20.217712029712853, 39.340234686839629], [20.150015903410516, 39.624997666984022], [20.615000441172779, 40.110006822259422], [20.67499677906363, 40.434999904943048], [20.999989861747274, 40.580003973953964], [21.020040317476422, 40.842726955725873], [21.674160597426969, 40.931274522457976], [22.055377638444266, 41.149865831052686], [22.597308383889008, 41.130487168943198], [22.76177, 41.3048], [22.952377150166562, 41.337993882811212], [23.692073601992455, 41.309080918943849], [24.492644891058031, 41.583896185872035], [25.19720136892553, 41.234485988930651], [26.106138136507177, 41.328898830727823], [26.11704186372091, 41.826904608724725], [26.604195590936282, 41.562114569661098]]]] } },
+            { "type": "Feature", "properties": { "admin": "Greenland", "name": "Greenland", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-46.76379, 82.62796], [-43.40644, 83.22516], [-39.89753, 83.18018], [-38.62214, 83.54905], [-35.08787, 83.64513], [-27.10046, 83.51966], [-20.84539, 82.72669], [-22.69182, 82.34165], [-26.51753, 82.29765], [-31.9, 82.2], [-31.39646, 82.02154], [-27.85666, 82.13178], [-24.84448, 81.78697], [-22.90328, 82.09317], [-22.07175, 81.73449], [-23.16961, 81.15271], [-20.62363, 81.52462], [-15.76818, 81.91245], [-12.77018, 81.71885], [-12.20855, 81.29154], [-16.28533, 80.58004], [-16.85, 80.35], [-20.04624, 80.17708], [-17.73035, 80.12912], [-18.9, 79.4], [-19.70499, 78.75128], [-19.67353, 77.63859], [-18.47285, 76.98565], [-20.03503, 76.94434], [-21.67944, 76.62795], [-19.83407, 76.09808], [-19.59896, 75.24838], [-20.66818, 75.15585], [-19.37281, 74.29561], [-21.59422, 74.22382], [-20.43454, 73.81713], [-20.76234, 73.46436], [-22.17221, 73.30955], [-23.56593, 73.30663], [-22.31311, 72.62928], [-22.29954, 72.18409], [-24.27834, 72.59788], [-24.79296, 72.3302], [-23.44296, 72.08016], [-22.13281, 71.46898], [-21.75356, 70.66369], [-23.53603, 70.471], [-24.30702, 70.85649], [-25.54341, 71.43094], [-25.20135, 70.75226], [-26.36276, 70.22646], [-23.72742, 70.18401], [-22.34902, 70.12946], [-25.02927, 69.2588], [-27.74737, 68.47046], [-30.67371, 68.12503], [-31.77665, 68.12078], [-32.81105, 67.73547], [-34.20196, 66.67974], [-36.35284, 65.9789], [-37.04378, 65.93768], [-38.37505, 65.69213], [-39.81222, 65.45848], [-40.66899, 64.83997], [-40.68281, 64.13902], [-41.1887, 63.48246], [-42.81938, 62.68233], [-42.41666, 61.90093], [-42.86619, 61.07404], [-43.3784, 60.09772], [-44.7875, 60.03676], [-46.26364, 60.85328], [-48.26294, 60.85843], [-49.23308, 61.40681], [-49.90039, 62.38336], [-51.63325, 63.62691], [-52.14014, 64.27842], [-52.27659, 65.1767], [-53.66166, 66.09957], [-53.30161, 66.8365], [-53.96911, 67.18899], [-52.9804, 68.35759], [-51.47536, 68.72958], [-51.08041, 69.14781], [-50.87122, 69.9291], [-52.013585, 69.574925], [-52.55792, 69.42616], [-53.45629, 69.283625], [-54.68336, 69.61003], [-54.75001, 70.28932], [-54.35884, 70.821315], [-53.431315, 70.835755], [-51.39014, 70.56978], [-53.10937, 71.20485], [-54.00422, 71.54719], [-55.0, 71.406536967272558], [-55.83468, 71.65444], [-54.71819, 72.58625], [-55.32634, 72.95861], [-56.12003, 73.64977], [-57.32363, 74.71026], [-58.59679, 75.09861], [-58.58516, 75.51727], [-61.26861, 76.10238], [-63.39165, 76.1752], [-66.06427, 76.13486], [-68.50438, 76.06141], [-69.66485, 76.37975], [-71.40257, 77.00857], [-68.77671, 77.32312], [-66.76397, 77.37595], [-71.04293, 77.63595], [-73.297, 78.04419], [-73.15938, 78.43271], [-69.37345, 78.91388], [-65.7107, 79.39436], [-65.3239, 79.75814], [-68.02298, 80.11721], [-67.15129, 80.51582], [-63.68925, 81.21396], [-62.23444, 81.3211], [-62.65116, 81.77042], [-60.28249, 82.03363], [-57.20744, 82.19074], [-54.13442, 82.19962], [-53.04328, 81.88833], [-50.39061, 82.43883], [-48.00386, 82.06481], [-46.59984, 81.985945], [-44.523, 81.6607], [-46.9007, 82.19979], [-46.76379, 82.62796]]] } },
+            { "type": "Feature", "properties": { "admin": "Guatemala", "name": "Guatemala", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-90.095554572290951, 13.73533763270073], [-90.608624030300817, 13.909771429901948], [-91.232410244496037, 13.927832342987953], [-91.689746670279106, 14.126218166556452], [-92.227750006869812, 14.538828640190925], [-92.203229539747298, 14.830102850804066], [-92.087215949252041, 15.064584662328436], [-92.229248623406249, 15.251446641495857], [-91.747960171255912, 16.066564846251719], [-90.464472622422647, 16.069562079324651], [-90.438866950222021, 16.410109768128091], [-90.600846727240906, 16.470777899638758], [-90.711821865587694, 16.687483018454724], [-91.081670091500641, 16.918476670799404], [-91.453921271515128, 17.252177232324168], [-91.002269253284197, 17.254657701074176], [-91.001519945015943, 17.817594916245707], [-90.067933519230948, 17.819326076727474], [-89.143080410503302, 17.808318996649316], [-89.15080603713092, 17.015576687075832], [-89.229121670269265, 15.886937567605166], [-88.930612759135244, 15.887273464415072], [-88.604586147805833, 15.706380113177358], [-88.518364020526846, 15.855389105690971], [-88.22502275262201, 15.727722479713901], [-88.680679694355618, 15.346247056535301], [-89.15481096063354, 15.066419175674806], [-89.225220099631244, 14.874286200413618], [-89.145535041037149, 14.67801911056908], [-89.353325975282772, 14.424132798719112], [-89.587342698916544, 14.362586167859485], [-89.5342193265205, 14.244815578666302], [-89.7219339668207, 14.134228013561694], [-90.064677903996568, 13.881969509328924], [-90.095554572290951, 13.73533763270073]]] } },
+            { "type": "Feature", "properties": { "admin": "Guyana", "name": "Guyana", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-59.758284878159181, 8.367034816924045], [-59.10168412945864, 7.99920197187049], [-58.482962205628041, 7.347691351750696], [-58.454876064677414, 6.832787380394463], [-58.078103196837361, 6.809093736188641], [-57.542218593970631, 6.321268215353355], [-57.147436489476874, 5.973149929219161], [-57.307245856339492, 5.073566595882225], [-57.914288906472123, 4.812626451024413], [-57.860209520078691, 4.576801052260449], [-58.044694383360664, 4.060863552258382], [-57.601568976457848, 3.334654649260684], [-57.281433478409703, 3.333491929534119], [-57.150097825739898, 2.768926906745406], [-56.53938574891454, 1.89952260986692], [-56.782704230360814, 1.863710842288653], [-57.33582292339689, 1.948537705895759], [-57.660971035377358, 1.682584947105638], [-58.113449876525003, 1.507195135907025], [-58.429477098205957, 1.46394196207872], [-58.540012986878288, 1.26808828369252], [-59.030861579002639, 1.317697658692722], [-59.646043667221242, 1.786893825686789], [-59.718545701726732, 2.249630438644359], [-59.974524909084543, 2.755232652188055], [-59.815413174057852, 3.606498521332085], [-59.538039923731219, 3.958802598481937], [-59.767405768458701, 4.423502915866606], [-60.111002366767373, 4.574966538914082], [-59.980958624904865, 5.014061184098138], [-60.213683437731319, 5.2444863956876], [-60.733574184803707, 5.2002772078619], [-61.410302903881941, 5.959068101419616], [-61.139415045807937, 6.234296779806142], [-61.159336310456467, 6.696077378766317], [-60.543999192940966, 6.856584377464881], [-60.295668097562377, 7.043911444522918], [-60.637972785063752, 7.414999904810853], [-60.550587938058186, 7.779602972846178], [-59.758284878159181, 8.367034816924045]]] } },
+            { "type": "Feature", "properties": { "admin": "Honduras", "name": "Honduras", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.316654425795463, 12.984685777229], [-87.48940873894712, 13.29753489832393], [-87.793111131526501, 13.384480495655165], [-87.723502977229288, 13.785050360565602], [-87.859515347021599, 13.893312486217097], [-88.065342576840109, 13.964625962779788], [-88.503997972349609, 13.845485948130939], [-88.541230841815931, 13.98015473068352], [-88.843072882832743, 14.140506700085208], [-89.058511929057644, 14.340029405164213], [-89.353325975282786, 14.424132798719084], [-89.145535041037164, 14.678019110569149], [-89.22522009963123, 14.874286200413675], [-89.154810960633526, 15.066419175674863], [-88.680679694355575, 15.346247056535386], [-88.225022752621925, 15.727722479714027], [-88.121153123715359, 15.688655096901355], [-87.901812506852394, 15.864458319558194], [-87.615680101252309, 15.878798529519198], [-87.522920905288444, 15.797278957578779], [-87.367762417332116, 15.846940009011286], [-86.903191291028165, 15.756712958229565], [-86.440945604177372, 15.782835394753189], [-86.119233974944322, 15.893448798073958], [-86.00195431185783, 16.005405788634388], [-85.68331743034625, 15.953651841693949], [-85.444003872402547, 15.885749009662444], [-85.182443610357183, 15.909158433490628], [-84.98372188997881, 15.995923163308698], [-84.526979743167118, 15.857223619037423], [-84.36825558138257, 15.835157782448729], [-84.063054572266807, 15.648244126849132], [-83.773976610026111, 15.42407176356687], [-83.410381232420363, 15.27090281825377], [-83.147219000974104, 14.995829169164207], [-83.489988776366005, 15.01626719813566], [-83.628584967772866, 14.880073960830368], [-83.975721401693576, 14.749435939996483], [-84.228341640952394, 14.748764146376626], [-84.449335903648588, 14.62161428472251], [-84.64958207877963, 14.666805324761865], [-84.820036790694289, 14.819586696832628], [-84.924500698572302, 14.790492865452332], [-85.052787441736868, 14.551541042534719], [-85.148750576502877, 14.560196844943615], [-85.165364549484806, 14.354369615125048], [-85.514413011400265, 14.079011745657905], [-85.698665330736944, 13.960078436737998], [-85.801294725268505, 13.8360549992376], [-86.096263800790595, 14.03818736414723], [-86.312142096689826, 13.771356106008223], [-86.520708177419891, 13.778487453664464], [-86.755086636079596, 13.754845485890936], [-86.733821784191463, 13.263092556201398], [-86.880557013684353, 13.254204209847213], [-87.005769009127434, 13.025794379117254], [-87.316654425795463, 12.984685777229]]] } },
+            { "type": "Feature", "properties": { "admin": "Croatia", "name": "Croatia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.829838087650039, 45.908877671891837], [19.072768995854172, 45.521511135432078], [19.390475701584588, 45.236515611342369], [19.005486281010118, 44.860233669609144], [18.553214145591646, 45.08158966733145], [17.861783481526398, 45.067740383477137], [17.00214603035101, 45.233776760430935], [16.534939406000202, 45.211607570977705], [16.318156772535868, 45.004126695325901], [15.959367303133373, 45.233776760430935], [15.750026075918978, 44.81871165626255], [16.239660271884528, 44.351143296885695], [16.456442905348862, 44.041239732431265], [16.916156447017325, 43.667722479825663], [17.297373488034449, 43.446340643887353], [17.674921502358981, 43.028562527023603], [18.56, 42.65], [18.450016310304814, 42.47999136002931], [17.509970330483323, 42.84999461523914], [16.930005730871638, 43.209998480800373], [16.015384555737679, 43.507215481127204], [15.174453973052094, 44.243191229827907], [15.376250441151793, 44.317915350922064], [14.920309279040504, 44.73848399512945], [14.901602410550874, 45.076060289076104], [14.258747592839992, 45.233776760430935], [13.952254672917032, 44.802123521496853], [13.65697553880119, 45.136935126315947], [13.679403110415816, 45.484149074884996], [13.715059848697248, 45.500323798192419], [14.411968214585496, 45.466165676447403], [14.595109490627916, 45.63494090431282], [14.935243767972961, 45.471695054702757], [15.327674594797424, 45.452316392593325], [15.323953891672428, 45.731782538427687], [15.671529575267638, 45.8341535507979], [15.768732944408608, 46.23810822202352], [16.564808383864939, 46.503750922219794], [16.882515089595412, 46.380631822284428], [17.630066359129554, 45.951769110694087], [18.456062452882858, 45.759481106136143], [18.829838087650039, 45.908877671891837]]] } },
+            { "type": "Feature", "properties": { "admin": "Haiti", "name": "Haiti", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-73.189790615517595, 19.915683905511909], [-72.579672817663607, 19.871500555902351], [-71.71236141629295, 19.714455878167353], [-71.624873216422813, 19.169837958243303], [-71.701302659782485, 18.785416978424049], [-71.945112067335543, 18.616900132720257], [-71.687737596305865, 18.316660061104468], [-71.708304816358037, 18.044997056546091], [-72.372476162389333, 18.214960842354053], [-72.844411180294856, 18.145611070218362], [-73.454554816365018, 18.217906398994696], [-73.922433234335642, 18.030992743395], [-74.458033616824764, 18.342549953682703], [-74.369925299767118, 18.664907538319408], [-73.449542202432696, 18.526052964751141], [-72.694937099890623, 18.445799465401858], [-72.334881557896992, 18.66842153571525], [-72.791649542924873, 19.101625067618027], [-72.784104783810264, 19.483591416903405], [-73.41502234566174, 19.639550889560276], [-73.189790615517595, 19.915683905511909]]] } },
+            { "type": "Feature", "properties": { "admin": "Hungary", "name": "Hungary", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[16.202298211337361, 46.852385972676949], [16.534267612380372, 47.496170966169103], [16.340584344150411, 47.712901923201215], [16.903754103267257, 47.714865627628321], [16.979666782304033, 48.123497015976298], [17.488472934649813, 47.867466132186209], [17.857132602620023, 47.758428860050365], [18.696512892336923, 47.88095368101439], [18.777024773847668, 48.081768296900627], [19.174364861739885, 48.111378892603859], [19.66136355965849, 48.266614895208647], [19.769470656013109, 48.2026911484636], [20.239054396249344, 48.327567247096916], [20.473562045989862, 48.562850043321809], [20.801293979584919, 48.62385407164237], [21.872236362401729, 48.319970811550007], [22.085608351334848, 48.422264309271782], [22.640819939878746, 48.150239569687351], [22.710531447040488, 47.882193915389394], [22.09976769378283, 47.672439276716695], [21.626514926853869, 46.994237779318148], [21.021952345471245, 46.316087958351886], [20.220192498462833, 46.127468980486547], [19.596044549241579, 46.171729844744533], [18.829838087649957, 45.908877671891915], [18.456062452882858, 45.759481106136121], [17.630066359129554, 45.95176911069418], [16.882515089595298, 46.380631822284428], [16.564808383864854, 46.503750922219822], [16.370504998447412, 46.841327216166498], [16.202298211337361, 46.852385972676949]]] } },
+            { "type": "Feature", "properties": { "admin": "Indonesia", "name": "Indonesia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[120.715608758630438, -10.239581394087862], [120.295014276206871, -10.258649997603525], [118.967808465654684, -9.55796925215803], [119.900309686361609, -9.361340427287514], [120.425755649905398, -9.665921319215796], [120.775501743656719, -9.969675388227456], [120.715608758630438, -10.239581394087862]]], [[[124.435950148619384, -10.14000090906144], [123.579981724136701, -10.359987481327961], [123.459989048354998, -10.239994805546171], [123.55000939340745, -9.900015557497978], [123.980008986508096, -9.290026950724693], [124.96868248911619, -8.892790215697046], [125.070019972840612, -9.089987481322835], [125.088520135601073, -9.393173109579321], [124.435950148619384, -10.14000090906144]]], [[[117.900018345207741, -8.095681247594923], [118.260616489740471, -8.362383314653327], [118.87845991422212, -8.280682875199828], [119.126506789223086, -8.705824883665072], [117.97040164598927, -8.906639499551257], [117.277730747549015, -9.040894870645557], [116.74014082241662, -9.032936700072637], [117.083737420725313, -8.457157891476539], [117.632024367342126, -8.44930307376819], [117.900018345207741, -8.095681247594923]]], [[[122.903537225436082, -8.094234307490735], [122.756982863456287, -8.649807631060638], [121.2544905945701, -8.933666273639941], [119.924390903809567, -8.810417982623873], [119.920928582846102, -8.44485890059107], [120.715091994307542, -8.236964613480863], [121.341668735846554, -8.53673959720602], [122.007364536630405, -8.46062021244016], [122.903537225436082, -8.094234307490735]]], [[[108.623478631628927, -6.777673841990675], [110.539227329553285, -6.877357679881682], [110.759575636845909, -6.465186455921751], [112.614811232556349, -6.946035658397589], [112.978768345188087, -7.594213148634578], [114.478935174621142, -7.776527601760277], [115.705526971501058, -8.370806573116864], [114.564511346496488, -8.75181690840483], [113.464733514460875, -8.348947442257424], [112.559672479301028, -8.376180922075163], [111.522061395312448, -8.302128594600957], [110.586149530074294, -8.122604668819021], [109.427667270955183, -7.740664157749761], [108.693655226681301, -7.641600437046219], [108.277763299596302, -7.766657403192579], [106.454102004016136, -7.354899590690947], [106.280624220812285, -6.924899997590201], [105.365486281355516, -6.851416110871169], [106.051645949327053, -5.895918877794499], [107.265008579540165, -5.954985039904058], [108.072091099074683, -6.345762220895237], [108.486846144649235, -6.421984958525768], [108.623478631628927, -6.777673841990675]]], [[[134.724624465066654, -6.214400730009286], [134.210133905168902, -6.895237725454704], [134.112775506730998, -6.142467136259014], [134.290335728085779, -5.783057549669038], [134.499625278867882, -5.445042006047898], [134.727001580952106, -5.737582289252158], [134.724624465066654, -6.214400730009286]]], [[[127.249215122588893, -3.459065036638889], [126.874922723498855, -3.790982761249579], [126.183802118027302, -3.607376397316556], [125.989033644719257, -3.177273451351325], [127.00065148326496, -3.12931772218441], [127.249215122588893, -3.459065036638889]]], [[[130.471344028851775, -3.09376433676762], [130.834836053592767, -3.858472181822761], [129.990546502808115, -3.446300957862817], [129.155248651242403, -3.362636813982248], [128.590683628453633, -3.428679294451256], [127.898891229362334, -3.393435967628192], [128.135879347852779, -2.843650404474914], [129.370997756060888, -2.802154229344551], [130.471344028851775, -3.09376433676762]]], [[[134.143367954647772, -1.151867364103594], [134.422627394753022, -2.769184665542383], [135.457602980694674, -3.367752780779113], [136.293314243718754, -2.30704233155609], [137.4407377463275, -1.703513278819372], [138.329727411044757, -1.70268645590265], [139.18492068904294, -2.051295668143637], [139.926684198160387, -2.409051608900284], [141.000210402591847, -2.600151055515624], [141.017056919519007, -5.85902190513802], [141.033851760013874, -9.117892754760417], [140.143415155192542, -8.297167657100955], [139.127766554928087, -8.096042982620942], [138.881476678624949, -8.380935153846094], [137.614473911692812, -8.41168263105976], [138.039099155835174, -7.597882175327354], [138.668621454014783, -7.320224704623072], [138.407913853102343, -6.232849216337483], [137.927839797110835, -5.393365573755998], [135.989250116113453, -4.546543877789047], [135.164597609599667, -4.462931410340771], [133.662880487197867, -3.538853448097526], [133.367704705946778, -4.024818617370314], [132.983955519747326, -4.112978610860281], [132.75694095268895, -3.746282647317129], [132.753788690319197, -3.311787204607071], [131.989804315316178, -2.820551039240455], [133.066844517143466, -2.460417982598443], [133.780030959203486, -2.479848321140209], [133.69621178602614, -2.214541517753687], [132.232373488494204, -2.212526136894325], [131.836221958544684, -1.617161960459597], [130.942839797082797, -1.432522067880796], [130.519558140180038, -0.937720228686075], [131.867537876513609, -0.695461114101818], [132.380116408416768, -0.369537855636977], [133.985548130428384, -0.780210463060442], [134.143367954647772, -1.151867364103594]]], [[[125.240500522971573, 1.419836127117605], [124.43703535369734, 0.427881171058971], [123.685504998876695, 0.235593166500877], [122.723083123872854, 0.431136786293337], [121.056724888189081, 0.381217352699451], [120.18308312386273, 0.23724681233422], [120.040869582195455, -0.519657891444851], [120.935905389490699, -1.408905938323372], [121.475820754076167, -0.955962009285116], [123.34056481332847, -0.615672702643081], [123.258399285984481, -1.076213067228337], [122.822715285331597, -0.930950616055881], [122.388529901215364, -1.516858005381124], [121.508273553555455, -1.904482924002422], [122.454572381684272, -3.186058444840881], [122.271896193532541, -3.529500013852696], [123.170962762546537, -4.683693129091707], [123.162332798353759, -5.34060393638596], [122.628515252778683, -5.634591159694494], [122.236394484548057, -5.282933037948281], [122.71956912647704, -4.46417164471579], [121.738233677254357, -4.851331475446499], [121.48946333220124, -4.574552504091215], [121.619171177253861, -4.188477878438674], [120.898181593917684, -3.602105401222828], [120.972388950688767, -2.627642917494909], [120.305452915529884, -2.931603692235725], [120.39004723519173, -4.097579034037223], [120.430716587405371, -5.528241062037778], [119.796543410319487, -5.67340016034565], [119.36690555224493, -5.379878024927804], [119.653606398600104, -4.459417412944958], [119.498835483885969, -3.49441171632651], [119.078344354326987, -3.487021986508764], [118.767768996252869, -2.801999200047688], [119.180973748858662, -2.147103773612798], [119.323393996255049, -1.35314706788047], [119.825998976725828, 0.154254462073496], [120.035701938966341, 0.566477362465804], [120.885779250167687, 1.309222723796835], [121.666816847826965, 1.013943589681076], [122.927566766451818, 0.875192368977465], [124.077522414242836, 0.917101955566139], [125.065989211121803, 1.643259182131558], [125.240500522971573, 1.419836127117605]]], [[[128.688248732620707, 1.132385972494106], [128.635952183141342, 0.258485826006179], [128.120169712436166, 0.356412665199286], [127.968034295768845, -0.252077325037533], [128.379998813999691, -0.780003757331286], [128.100015903842291, -0.899996433112974], [127.69647464407501, -0.266598402511505], [127.399490187693743, 1.011721503092573], [127.600511509309044, 1.81069082275718], [127.932377557487484, 2.174596258956555], [128.004156121940809, 1.628531398928331], [128.594559360875451, 1.540810655112864], [128.688248732620707, 1.132385972494106]]], [[[117.875627069166001, 1.827640692548911], [118.996747267738158, 0.902219143066048], [117.811858351717788, 0.784241848143722], [117.478338657706047, 0.102474676917026], [117.521643507966587, -0.803723239753211], [116.560048455879496, -1.487660821136231], [116.533796828275158, -2.483517347832901], [116.148083937648607, -4.012726332214014], [116.000857782049067, -3.657037448749008], [114.864803094544513, -4.106984144714416], [114.468651564595064, -3.49570362713382], [113.755671828264099, -3.439169610206519], [113.256994256647545, -3.118775729996854], [112.068126255340644, -3.478392022316071], [111.703290643359992, -2.994442233902631], [111.04824018762821, -3.049425957861188], [110.223846063275971, -2.934032484553483], [110.070935500124335, -1.592874037282414], [109.571947869914041, -1.314906507984489], [109.091873813922518, -0.459506524257051], [108.952657505328162, 0.415375474444346], [109.069136183714036, 1.341933905437642], [109.663260125773718, 2.006466986494984], [109.830226678508836, 1.338135687664191], [110.514060907027101, 0.773131415200993], [111.159137811326559, 0.976478176269509], [111.797548455860408, 0.904441229654651], [112.380251906383648, 1.410120957846757], [112.859809198052176, 1.497790025229946], [113.805849644019531, 1.217548732911041], [114.621355422017473, 1.430688177898886], [115.134037306785231, 2.821481838386219], [115.51907840379198, 3.169238389494395], [115.86551720587677, 4.306559149590156], [117.01521447150634, 4.306094061699468], [117.882034946770162, 4.137551377779487], [117.313232456533513, 3.234428208830578], [118.048329705885351, 2.287690131027361], [117.875627069166001, 1.827640692548911]]], [[[105.817655063909356, -5.852355645372411], [104.710384149191498, -5.873284600450644], [103.868213332130736, -5.037314955264974], [102.584260695406897, -4.220258884298203], [102.156173130300999, -3.614146009946765], [101.399113397225051, -2.799777113459171], [100.902502882900137, -2.05026213949786], [100.141980828860596, -0.650347588710957], [99.26373986206022, 0.183141587724663], [98.970011020913319, 1.042882391764536], [98.601351352943084, 1.823506577965616], [97.699597609449881, 2.453183905442116], [97.17694217324987, 3.30879059489861], [96.424016554757316, 3.86885976807791], [95.380876092513475, 4.970782172053673], [95.293026157617305, 5.479820868344816], [95.936862827541745, 5.439513251157108], [97.484882033277088, 5.24632090903401], [98.369169142655679, 4.268370266126366], [99.142558628335792, 3.590349636240915], [99.693997837322399, 3.174328518075156], [100.641433546961665, 2.099381211755798], [101.658012323007313, 2.083697414555189], [102.498271112073212, 1.398700466310217], [103.076840448013002, 0.561361395668854], [103.838396030698348, 0.104541734208666], [103.437645298274973, -0.711945896002845], [104.010788608824001, -1.059211521004229], [104.369991489684878, -1.084843031421016], [104.539490187602155, -1.782371514496716], [104.887892694113987, -2.340425306816655], [105.622111444116982, -2.42884368246807], [106.10859337771268, -3.06177662517895], [105.857445916774111, -4.305524997579723], [105.817655063909356, -5.852355645372411]]]] } },
+            { "type": "Feature", "properties": { "admin": "India", "name": "India", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[77.837450799474553, 35.494009507787759], [78.912268914713209, 34.321936346975782], [78.811086460285722, 33.506198025032404], [79.208891636068572, 32.994394639613709], [79.176128777995501, 32.483779812137705], [78.458446486325997, 32.61816437431272], [78.738894484374001, 31.515906073527056], [79.721366815107089, 30.882714748654724], [81.11125613802929, 30.183480943313398], [80.476721225917373, 29.729865220655334], [80.088424513676259, 28.794470119740136], [81.057202589851997, 28.416095282499036], [81.999987420584958, 27.925479234319987], [83.304248895199535, 27.364505723575554], [84.675017938173767, 27.234901231387528], [85.25177859898335, 26.726198431906337], [86.024392938179147, 26.630984605408567], [87.22747195836628, 26.39789805755607], [88.060237664749806, 26.414615383402484], [88.174804315140904, 26.810405178325944], [88.043132765661198, 27.445818589786818], [88.120440708369841, 27.876541652939586], [88.730325962278528, 28.086864732367509], [88.814248488320544, 27.299315904239361], [88.835642531289366, 27.098966376243755], [89.744527622438838, 26.71940298105995], [90.37327477413406, 26.875724188742872], [91.217512648486405, 26.808648179628019], [92.033483514375078, 26.838310451763554], [92.10371178585973, 27.4526140406332], [91.69665652869665, 27.771741848251661], [92.503118931043616, 27.896876329046442], [93.413347609432662, 28.640629380807219], [94.565990431702929, 29.277438055939978], [95.404802280664612, 29.031716620392125], [96.117678664131006, 29.452802028922459], [96.586590610747479, 28.830979519154337], [96.248833449287758, 28.411030992134435], [97.327113885490007, 28.261582749946331], [97.402561476636123, 27.88253611908544], [97.051988559968066, 27.699058946233144], [97.133999058015277, 27.08377350514996], [96.419365675850941, 27.264589341739221], [95.124767694074933, 26.573572089132295], [95.155153436262566, 26.001307277932078], [94.603249139385355, 25.162495428970399], [94.552657912171611, 24.675238348890328], [94.106741977925054, 23.850740871673477], [93.325187615942767, 24.078556423432197], [93.286326938859247, 23.043658352138998], [93.060294224014598, 22.703110663335565], [93.166127557348361, 22.278459580977099], [92.672720981825549, 22.041238918541247], [92.146034783906799, 23.62749868417259], [91.869927606171302, 23.62434642180278], [91.706475050832083, 22.985263983649183], [91.158963250699713, 23.503526923104381], [91.467729933643668, 24.072639471934789], [91.915092807994398, 24.130413723237108], [92.376201613334786, 24.976692816664961], [91.799595981822065, 25.14743174895731], [90.872210727912105, 25.13260061288954], [89.920692580121838, 25.269749864192171], [89.832480910199592, 25.965082098895476], [89.355094028687276, 26.014407253518065], [88.56304935094974, 26.446525580342716], [88.209789259802477, 25.768065700782707], [88.931553989623069, 25.238692328384769], [88.30637251175601, 24.866079413344199], [88.084422235062405, 24.501657212821918], [88.699940220090895, 24.233714911388557], [88.529769728553759, 23.631141872649163], [88.876311883503064, 22.879146429937826], [89.031961297566198, 22.055708319582973], [88.888765903685396, 21.690588487224741], [88.208497348995209, 21.703171698487804], [86.975704380240259, 21.495561631755201], [87.033168572948853, 20.743307806882406], [86.499351027373777, 20.151638495356604], [85.060265740909671, 19.478578802971096], [83.941005893899998, 18.302009792549722], [83.189217156917834, 17.671221421778977], [82.192792189465905, 17.016636053937813], [82.191241896497175, 16.556664130107844], [81.692719354177456, 16.3102192245079], [80.791999139330116, 15.951972357644488], [80.324895867843864, 15.899184882058346], [80.025069207686428, 15.136414903214144], [80.23327355339039, 13.835770778859978], [80.286293572921849, 13.006260687710832], [79.862546828128487, 12.056215318240886], [79.85799930208681, 10.357275091997108], [79.340511509115984, 10.308854274939618], [78.885345493489169, 9.54613597252772], [79.189719679688281, 9.216543687370146], [78.27794070833049, 8.933046779816932], [77.94116539908434, 8.25295909263974], [77.539897902337927, 7.965534776232331], [76.592978957021657, 8.899276231314188], [76.130061476551063, 10.299630031775518], [75.746467319648488, 11.308250637248303], [75.396101108709573, 11.781245022015822], [74.864815708316812, 12.741935736537895], [74.616717156883524, 13.992582912649677], [74.443859490867197, 14.617221787977693], [73.534199253233368, 15.990652167214957], [73.119909295549419, 17.928570054592495], [72.820909458308634, 19.208233547436162], [72.824475132136783, 20.41950328214153], [72.630533481745388, 21.356009426351001], [71.175273471973938, 20.757441311114228], [70.470458611945091, 20.877330634031381], [69.164130080038817, 22.089298000572697], [69.644927606082391, 22.450774644454334], [69.349596795534325, 22.843179633062686], [68.176645135373377, 23.691965033456704], [68.842599318318761, 24.359133612560932], [71.0432401874682, 24.356523952730193], [70.844699334602822, 25.215102037043511], [70.282873162725579, 25.722228705339823], [70.168926629522005, 26.491871649678835], [69.514392938113119, 26.940965684511365], [70.61649620960192, 27.989196275335861], [71.777665643200308, 27.913180243434521], [72.823751662084689, 28.961591701772047], [73.450638462217412, 29.976413479119863], [74.421380242820263, 30.97981476493117], [74.405928989564998, 31.692639471965272], [75.258641798813187, 32.271105455040491], [74.451559279278698, 32.764899603805489], [74.104293654277328, 33.441473293586846], [73.749948358051952, 34.317698879527846], [74.240202671204955, 34.748887030571247], [75.757060988268321, 34.504922593721311], [76.871721632804011, 34.653544012992732], [77.837450799474553, 35.494009507787759]]] } },
+            { "type": "Feature", "properties": { "admin": "Ireland", "name": "Ireland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-6.197884894220989, 53.86756500916335], [-6.032985398777609, 53.153164170944336], [-6.788856573910847, 52.260117906292322], [-8.561616583683557, 51.669301255899349], [-9.977085740590267, 51.820454820353071], [-9.16628251793078, 52.864628811242667], [-9.688524542672452, 53.881362616585285], [-8.327987433292007, 54.664518947968624], [-7.572167934591064, 55.131622219454854], [-7.366030646178785, 54.595840969452709], [-7.572167934591064, 54.059956366585986], [-6.953730231138065, 54.073702297575622], [-6.197884894220989, 53.86756500916335]]] } },
+            { "type": "Feature", "properties": { "admin": "Iran", "name": "Iran", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.921597934795543, 37.198918361961255], [54.800303989486558, 37.392420762678178], [55.511578403551894, 37.964117133123153], [56.180374790273319, 37.935126654607423], [56.619366082592805, 38.121394354803478], [57.330433790928964, 38.029229437810933], [58.436154412678192, 37.522309475243794], [59.234761997316795, 37.412987982730336], [60.377637973883864, 36.52738312432836], [61.123070509694131, 36.491597194966239], [61.21081709172573, 35.650072333309218], [60.80319339380744, 34.404101874319856], [60.528429803311575, 33.676446031217999], [60.963700392505991, 33.528832302376252], [60.536077915290761, 32.981268825811561], [60.863654819588952, 32.182919623334421], [60.941944614511115, 31.548074652628745], [61.699314406180811, 31.379506130492661], [61.78122155136343, 30.735850328081231], [60.874248488208778, 29.829238999952604], [61.369308709564926, 29.303276272085917], [61.771868117118615, 28.699333807890792], [62.727830438085974, 28.259644883735383], [62.755425652929851, 27.378923448184985], [63.23389773952028, 27.217047024030702], [63.316631707619578, 26.756532497661659], [61.874187453056535, 26.239974880472097], [61.497362908784183, 25.078237006118492], [59.616134067630831, 25.380156561783775], [58.525761346272297, 25.609961656185725], [57.39725141788238, 25.739902045183634], [56.97076582217754, 26.966106268821356], [56.492138706290199, 27.14330475515019], [55.723710158110059, 26.964633490501036], [54.715089552637252, 26.480657863871507], [53.493096958231334, 26.812368882753042], [52.483597853409599, 27.580849107365488], [51.520762566947404, 27.865689602158291], [50.852948032439528, 28.814520575469377], [50.115008579311571, 30.14777252859971], [49.576850213423988, 29.9857152369324], [48.941333449098536, 30.31709035900403], [48.567971225789748, 29.926778265903515], [48.014568312376085, 30.452456773392594], [48.00469811380831, 30.985137437457237], [47.685286085812258, 30.984853217079621], [47.849203729042095, 31.709175930298663], [47.334661492711895, 32.469155381799105], [46.109361606639304, 33.017287299118998], [45.416690708199035, 33.967797756479577], [45.648459507028079, 34.748137722303007], [46.15178795755093, 35.093258775364284], [46.076340366404786, 35.67738332777548], [45.420618117053202, 35.977545884742817], [44.77267, 37.17045], [44.225755649600522, 37.971584377589345], [44.421402622257538, 38.281281236314534], [44.109225294782334, 39.428136298168091], [44.793989699081934, 39.713002631177041], [44.9526880226503, 39.335764675446363], [45.457721795438765, 38.874139105783051], [46.143623081248812, 38.74120148371221], [46.505719842317966, 38.770605373686287], [47.685079380083081, 39.508363959301207], [48.060095249225235, 39.582235419262453], [48.355529412637871, 39.2887649602769], [48.010744256386474, 38.794014797514514], [48.634375441284803, 38.27037750910096], [48.883249139202483, 38.32024526626261], [49.199612257693332, 37.582874253889877], [50.147771437384606, 37.37456655532133], [50.842354363819695, 36.872814235983384], [52.26402469260141, 36.700421657857696], [53.825789829326411, 36.965030829408228], [53.921597934795543, 37.198918361961255]]] } },
+            { "type": "Feature", "properties": { "admin": "Iraq", "name": "Iraq", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[45.420618117053202, 35.977545884742817], [46.076340366404786, 35.67738332777548], [46.15178795755093, 35.093258775364284], [45.648459507028079, 34.748137722303007], [45.416690708199035, 33.967797756479577], [46.109361606639304, 33.017287299118998], [47.334661492711895, 32.469155381799105], [47.849203729042095, 31.709175930298663], [47.685286085812258, 30.984853217079621], [48.00469811380831, 30.985137437457237], [48.014568312376085, 30.452456773392594], [48.567971225789748, 29.926778265903515], [47.974519077349889, 29.975819200148493], [47.302622104690947, 30.059069932570711], [46.568713413281742, 29.099025173452283], [44.709498732284736, 29.178891099559376], [41.889980910007829, 31.190008653278362], [40.399994337736238, 31.889991766887931], [39.195468377444961, 32.16100881604266], [38.792340529136077, 33.378686428352218], [41.00615888851992, 34.419372260062111], [41.383965285005807, 35.628316555314349], [41.289707472505448, 36.358814602192261], [41.837064243340954, 36.605853786763568], [42.349591098811764, 37.22987254490409], [42.779125604021822, 37.385263576805741], [43.942258742047287, 37.256227525372942], [44.293451775902852, 37.001514390606289], [44.772699008977689, 37.170444647768427], [45.420618117053202, 35.977545884742817]]] } },
+            { "type": "Feature", "properties": { "admin": "Iceland", "name": "Iceland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-14.508695441129232, 66.455892239031414], [-14.739637417041605, 65.808748277440287], [-13.609732224979807, 65.126671047619851], [-14.9098337467949, 64.36408193628867], [-17.794438035543418, 63.67874909123384], [-18.656245896874989, 63.496382961675806], [-19.972754685942757, 63.643634955491514], [-22.762971971110154, 63.960178941495371], [-21.778484259517676, 64.402115790455497], [-23.955043911219104, 64.891129869233481], [-22.184402635170354, 65.084968166760291], [-22.227423265053329, 65.378593655042721], [-24.326184047939332, 65.611189276788451], [-23.650514695723082, 66.262519029395207], [-22.134922451250883, 66.410468655046856], [-20.576283738679543, 65.732112128351417], [-19.056841600001587, 66.276600857194751], [-17.798623826559048, 65.993853257909763], [-16.167818976292121, 66.526792304135853], [-14.508695441129232, 66.455892239031414]]] } },
+            { "type": "Feature", "properties": { "admin": "Israel", "name": "Israel", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.719918247222743, 32.709192409794859], [35.545665317534535, 32.393992011030569], [35.183930291491428, 32.532510687788935], [34.974640740709319, 31.866582343059715], [35.225891554512422, 31.754341132121759], [34.970506626125989, 31.616778469360803], [34.927408481594554, 31.35343537040141], [35.397560662586038, 31.489086005167572], [35.420918409981958, 31.100065822874349], [34.922602573391423, 29.501326198844517], [34.26543338393568, 31.219360866820146], [34.556371697738903, 31.548823960896989], [34.48810713068135, 31.605538845337314], [34.752587111151165, 32.07292633720116], [34.955417107896771, 32.827376410446369], [35.098457472480668, 33.080539252244257], [35.126052687324538, 33.090900376918775], [35.460709262846699, 33.089040025356276], [35.552796665190805, 33.264274807258012], [35.821100701650231, 33.277426459276292], [35.836396925608618, 32.868123277308506], [35.700797967274745, 32.716013698857374], [35.719918247222743, 32.709192409794859]]] } },
+            { "type": "Feature", "properties": { "admin": "Italy", "name": "Italy", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[15.52037601081383, 38.231155096991465], [15.160242954171732, 37.444045518537813], [15.309897902089002, 37.134219468731793], [15.099988234119445, 36.61998729099539], [14.335228712632013, 36.996630967754747], [13.826732618879927, 37.104531358380186], [12.431003859108809, 37.612949937483812], [12.570943637755132, 38.126381130519682], [13.741156447004581, 38.03496552179535], [14.761249220446157, 38.143873602850498], [15.52037601081383, 38.231155096991465]]], [[[9.210011834356264, 41.209991360024212], [9.809975213264973, 40.500008856766094], [9.669518670295671, 39.177376410471787], [9.214817742559486, 39.240473334300127], [8.806935662479729, 38.906617743478471], [8.428302443077113, 39.171847032216611], [8.388253208050939, 40.378310858718798], [8.159998406617659, 40.950007229163774], [8.709990675500107, 40.899984442705225], [9.210011834356264, 41.209991360024212]]], [[[12.376485223040842, 46.767559109069872], [13.806475457421552, 46.50930613869118], [13.698109978905475, 46.016778062517368], [13.937630242578335, 45.59101593686465], [13.141606479554294, 45.736691799495411], [12.328581170306304, 45.38177806251484], [12.383874952858601, 44.885374253919075], [12.261453484759157, 44.600482082694008], [12.589237094786482, 44.091365871754462], [13.526905958722491, 43.587727362637899], [14.029820997787024, 42.761007798832473], [15.142569614327952, 41.955139675456891], [15.926191033601892, 41.961315009115729], [16.169897088290409, 41.740294908203417], [15.889345737377793, 41.541082261718195], [16.785001661860573, 41.179605617836579], [17.519168735431204, 40.877143459632229], [18.376687452882575, 40.355624904942651], [18.4802470231954, 40.168866278639818], [18.293385044028096, 39.810774441073235], [17.738380161213279, 40.277671006830289], [16.869595981522334, 40.442234605463838], [16.448743116937319, 39.795400702466473], [17.171489698971495, 39.424699815420716], [17.052840610429339, 38.902871202137291], [16.635088331781841, 38.843572496082395], [16.100960727613053, 37.985898749334176], [15.684086948314498, 37.908849188787023], [15.687962680736318, 38.214592800441849], [15.891981235424705, 38.750942491199218], [16.109332309644312, 38.964547024077682], [15.718813510814638, 39.544072374014938], [15.413612501698818, 40.048356838535163], [14.998495721098234, 40.172948716790913], [14.703268263414767, 40.604550279292617], [14.06067182786526, 40.786347968095434], [13.627985060285393, 41.188287258461649], [12.888081902730418, 41.253089504555604], [12.106682570044907, 41.7045348170574], [11.191906365614184, 42.355425319989671], [10.511947869517794, 42.93146251074721], [10.200028924204046, 43.920006822274608], [9.702488234097812, 44.036278794931313], [8.888946160526869, 44.366336167979533], [8.428560825238575, 44.23122813575241], [7.8507666357832, 43.767147935555236], [7.435184767291841, 43.693844916349164], [7.549596388386161, 44.127901109384808], [7.007562290076661, 44.254766750661382], [6.749955275101711, 45.028517971367584], [7.096652459347835, 45.333098863295859], [6.80235517744566, 45.708579820328673], [6.84359297041456, 45.991146552100659], [7.273850945676683, 45.776947740250748], [7.755992058959832, 45.824490057959267], [8.316629672894377, 46.16364248309084], [8.489952426801294, 46.005150865251736], [8.966305779667833, 46.03693187111115], [9.18288170740311, 46.440214748716976], [9.92283654139035, 46.314899400409182], [10.363378126678665, 46.48357127540983], [10.4427014502466, 46.893546250997431], [11.048555942436504, 46.751358547546396], [11.164827915093325, 46.941579494812729], [12.153088006243079, 47.115393174826423], [12.376485223040842, 46.767559109069872]]]] } },
+            { "type": "Feature", "properties": { "admin": "Jamaica", "name": "Jamaica", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.569600796199197, 18.490525417550483], [-76.896618618462114, 18.400866807524078], [-76.365359056285527, 18.16070058844759], [-76.19965857614163, 17.886867173732963], [-76.902561408175671, 17.868237819891743], [-77.206341315403449, 17.701116237859818], [-77.766022915340599, 17.861597398342237], [-78.337719285785596, 18.225967922432226], [-78.217726610003865, 18.454532782459193], [-77.797364671525614, 18.524218451404774], [-77.569600796199197, 18.490525417550483]]] } },
+            { "type": "Feature", "properties": { "admin": "Jordan", "name": "Jordan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.719918247222743, 32.709192409794859], [36.834062127435537, 32.312937526980768], [38.792340529136077, 33.378686428352218], [39.195468377444961, 32.16100881604266], [39.004885695152545, 32.010216986614971], [37.002165561681004, 31.508412990844736], [37.998848911294367, 30.508499864213128], [37.668119744626374, 30.338665269485894], [37.503581984209028, 30.003776150018396], [36.740527784987243, 29.865283311476183], [36.501214227043583, 29.505253607698702], [36.068940870922049, 29.19749461518445], [34.956037225084252, 29.356554673778835], [34.922602573391423, 29.501326198844517], [35.420918409981958, 31.100065822874349], [35.397560662586038, 31.489086005167572], [35.545251906076196, 31.782504787720832], [35.545665317534535, 32.393992011030569]]] } },
+            { "type": "Feature", "properties": { "admin": "Japan", "name": "Japan", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[134.638428176003856, 34.149233710256418], [134.766379022358478, 33.806334743783673], [134.20341596897083, 33.201177883429622], [133.792950067276479, 33.521985175097583], [133.280268182508848, 33.289570420864941], [133.014858026257855, 32.704567369104772], [132.363114862192674, 32.989382025681373], [132.371176385630179, 33.463642483040068], [132.924372593314786, 34.060298570282036], [133.492968377822194, 33.944620876596694], [133.904106073136347, 34.364931138642611], [134.638428176003856, 34.149233710256418]]], [[[140.976387567305267, 37.142074286440156], [140.599769728762084, 36.343983466124534], [140.774074334882641, 35.842877102190229], [140.253279250245072, 35.138113918593653], [138.975527785396196, 34.667600002576101], [137.217598911691198, 34.606285915661843], [135.792983026268871, 33.46480520276662], [135.120982700745401, 33.849071153289053], [135.07943484918269, 34.596544908174813], [133.340316196831964, 34.375938218720755], [132.156770868051296, 33.904933376596503], [130.986144647343451, 33.885761420216276], [132.000036248910021, 33.149992377244608], [131.33279015515734, 31.450354519164836], [130.68631798718593, 31.029579169228235], [130.202419875204953, 31.418237616495411], [130.447676222862128, 32.319474595665717], [129.81469160371887, 32.610309556604385], [129.408463169472554, 33.296055813117583], [130.353935174684636, 33.604150702441693], [130.878450962447118, 34.232742824840031], [131.884229364143891, 34.749713853487911], [132.617672967662486, 35.433393052709413], [134.608300815977771, 35.731617743465812], [135.677537876528902, 35.527134100886819], [136.723830601142424, 37.304984239240376], [137.390611607004473, 36.827390651998819], [138.857602166906247, 37.827484646143454], [139.426404657142882, 38.215962225897634], [140.054790073812057, 39.438807481436378], [139.883379347899847, 40.563312486323682], [140.305782505453664, 41.195005194659551], [141.368973423426667, 41.378559882160282], [141.914263136970476, 39.991616115878678], [141.884600864834965, 39.18086456965149], [140.959489373945729, 38.174000962876583], [140.976387567305267, 37.142074286440156]]], [[[143.910161981379474, 44.174099839853724], [144.613426548439634, 43.960882880217511], [145.320825230083074, 44.384732977875437], [145.543137241802754, 43.262088324550596], [144.059661899999867, 42.988358262700551], [143.183849725517291, 41.995214748699183], [141.611490920172457, 42.678790595056071], [141.067286411706618, 41.58459381770799], [139.95510623592105, 41.56955597591103], [139.817543573159924, 42.563758856774392], [140.312087030193169, 43.333272610032644], [141.380548944259999, 43.388824774746489], [141.671952345953912, 44.772125352551477], [141.967644891527982, 45.551483466161343], [143.142870314709796, 44.510358384776957], [143.910161981379474, 44.174099839853724]]]] } },
+            { "type": "Feature", "properties": { "admin": "Kazakhstan", "name": "Kazakhstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.962314894499272, 42.26615428320553], [70.388964878220776, 42.081307684897517], [69.070027296835221, 41.384244289712335], [68.632482944620037, 40.668680731766855], [68.259895867795635, 40.662324530594894], [67.985855747351806, 41.135990708982199], [66.714047072216587, 41.168443508461557], [66.510648634715707, 41.987644151368549], [66.023391554635609, 41.994646307944031], [66.098012322865188, 42.997660020513074], [64.90082441595932, 43.728080552742647], [63.18578698105658, 43.650074978197999], [62.013300408786264, 43.504476630215649], [61.05831994003249, 44.405816962250576], [60.239971958258472, 44.784036770194739], [58.689989048095796, 45.500013739598721], [58.503127068928428, 45.58680430763296], [55.928917270741167, 44.995858466159163], [55.968191359283011, 41.30864166926937], [55.455251092353805, 41.259859117185826], [54.755345493392653, 42.04397146256661], [54.079417759014959, 42.324109402020831], [52.944293247291725, 42.116034247397572], [52.502459751196277, 41.783315538086462], [52.446339145727208, 42.027150783855561], [52.692112257707251, 42.443895372073364], [52.501426222550315, 42.792297878585188], [51.342427199108201, 43.132974758469338], [50.891291945200223, 44.031033637053774], [50.339129266161358, 44.284015611338468], [50.305642938036257, 44.609835516938908], [51.278503452363211, 44.514854234386448], [51.316899041556034, 45.245998236667894], [52.167389764215713, 45.408391425145098], [53.040876499245194, 45.259046535821753], [53.220865512917712, 46.23464590105992], [53.042736850807771, 46.853006089864486], [52.042022739475598, 46.804636949239232], [51.191945428274252, 47.048704738953909], [50.034083286342465, 46.608989976582208], [49.10116, 46.39933000000012], [48.593241001180495, 46.561034247415471], [48.694733514201729, 47.075628160177921], [48.057253045449258, 47.743752753279516], [47.315231154170242, 47.715847479841948], [46.466445753776256, 48.394152330104923], [47.043671502476506, 49.1520388860976], [46.751596307162728, 49.35600576435376], [47.549480421749301, 50.454698391311119], [48.577841424357523, 49.874759629915658], [48.702381626181008, 50.605128485712825], [50.766648390512145, 51.692762356159889], [52.328723585830957, 51.71865224873811], [54.53287845237621, 51.026239732459302], [55.716940545479801, 50.62171662047853], [56.777961053296551, 51.043551337277037], [58.363290643146733, 51.063653469438563], [59.642282342370599, 50.545442206415707], [59.932807244715484, 50.842194118851857], [61.337424350840919, 50.799070136104248], [61.588003371024158, 51.2726587998432], [59.967533807215531, 51.960420437215696], [60.927268507740258, 52.447548326215028], [60.739993117114572, 52.719986477257734], [61.699986199800584, 52.979996446334255], [60.978066440683151, 53.664993394579128], [61.436591424409052, 54.006264553434775], [65.178533563095911, 54.354227810272093], [65.66687584825398, 54.601266994843449], [68.169100376258811, 54.970391750704309], [69.068166945272864, 55.385250149143516], [70.865266554655122, 55.169733588270091], [71.180131056609397, 54.133285224008247], [72.224150018202167, 54.376655381886728], [73.508516066384388, 54.035616766976588], [73.425678745420427, 53.489810289109741], [74.384845005190044, 53.546861070360066], [76.891100294913414, 54.490524400441913], [76.525179477854735, 54.177003485727127], [77.800915561844221, 53.404414984747561], [80.035559523441663, 50.864750881547238], [80.568446893235475, 51.388336493528456], [81.945985548839914, 50.812195949906354], [83.383003778012366, 51.069182847693909], [83.935114780618832, 50.889245510453563], [84.416377394553052, 50.311399644565817], [85.115559523462011, 50.117302964877631], [85.541269972682457, 49.69285858824815], [86.829356723989619, 49.826674709668154], [87.359970330762664, 49.214980780629148], [86.598776483103379, 48.549181626980605], [85.768232863308285, 48.455750637396974], [85.72048383987071, 47.452969468773112], [85.164290399113355, 47.000955715516099], [83.180483839860443, 47.330031236350848], [82.458925815769106, 45.539649563166499], [81.947070753918112, 45.317027492853235], [79.966106398441397, 44.917516994804643], [80.866206496101356, 43.180362046881037], [80.180150180994289, 42.920067857426936], [80.259990268885332, 42.349999294599101], [79.643645460940135, 42.496682847659649], [79.142177361979776, 42.856092434249589], [77.658391961583206, 42.960685533208327], [76.000353631498555, 42.988022365890622], [75.636964959622091, 42.877899888676765], [74.212865838522575, 43.298339341803505], [73.645303582660901, 43.091271877609863], [73.489757521462337, 42.500894476891276], [71.844638299450637, 42.845395412765178], [71.186280552052253, 42.704292914392219], [70.962314894499272, 42.26615428320553]]] } },
+            { "type": "Feature", "properties": { "admin": "Kenya", "name": "Kenya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[40.993, -0.85829], [41.58513, -1.68325], [40.88477, -2.08255], [40.63785, -2.49979], [40.26304, -2.57309], [40.12119, -3.27768], [39.80006, -3.68116], [39.60489, -4.34653], [39.20222, -4.67677], [37.7669, -3.67712], [37.69869, -3.09699], [34.07262, -1.05982], [33.903711197104521, -0.95], [33.893568969666937, 0.109813537861896], [34.18, 0.515], [34.6721, 1.17694], [35.03599, 1.90584], [34.59607, 3.05374], [34.47913, 3.5556], [34.005, 4.249884947362047], [34.620196267853871, 4.847122742081987], [35.298007118232974, 5.506], [35.817447662353501, 5.338232082790795], [35.817447662353501, 4.776965663461889], [36.159078632855639, 4.447864127672768], [36.855093238008116, 4.447864127672768], [38.120915, 3.598605], [38.43697, 3.58851], [38.67114, 3.61607], [38.89251, 3.50074], [39.559384258765846, 3.42206], [39.85494, 3.83879], [40.76848, 4.25702], [41.1718, 3.91909], [41.855083092643966, 3.918911920483726], [40.98105, 2.78452], [40.993, -0.85829]]] } },
+            { "type": "Feature", "properties": { "admin": "Kyrgyzstan", "name": "Kyrgyzstan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[70.96231489449913, 42.266154283205481], [71.186280552052111, 42.704292914392127], [71.84463829945058, 42.845395412765093], [73.489757521462337, 42.500894476891311], [73.645303582660901, 43.09127187760982], [74.212865838522546, 43.298339341803363], [75.636964959622006, 42.877899888676673], [76.000353631498442, 42.988022365890664], [77.658391961583206, 42.960685533208256], [79.142177361979762, 42.856092434249511], [79.643645460940107, 42.496682847659514], [80.259990268885289, 42.349999294599044], [80.119430373051358, 42.123940741538235], [78.543660923175295, 41.582242540038685], [78.187196893225959, 41.185315863604792], [76.904484490877067, 41.066485907549634], [76.526368035797432, 40.427946071935111], [75.467827996730691, 40.562072251948663], [74.776862420556043, 40.366425279291619], [73.822243686828287, 39.893973497063179], [73.960013055318413, 39.660008449861721], [73.67537926625478, 39.431236884105594], [71.784693637991992, 39.279463202464363], [70.549161818325601, 39.604197902986492], [69.464886915977516, 39.526683254548693], [69.559609816368507, 40.103211371412968], [70.648018833299957, 39.935753892571157], [71.014198032520156, 40.244365546218226], [71.774875115856545, 40.145844428053763], [73.055417108049156, 40.86603302668945], [71.870114780570447, 41.392900092121259], [71.157858514291576, 41.143587144529107], [70.420022414028196, 41.519998277343134], [71.259247674448218, 42.167710679689456], [70.96231489449913, 42.266154283205481]]] } },
+            { "type": "Feature", "properties": { "admin": "Cambodia", "name": "Cambodia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[103.497279901139677, 10.632555446815926], [103.090689731867229, 11.153660590047162], [102.58493248902667, 12.186594956913279], [102.348099399833004, 13.39424734135822], [102.988422072361601, 14.225721136934464], [104.281418084736586, 14.416743068901363], [105.218776890078871, 14.27321177821069], [106.04394616091551, 13.881091009979952], [106.496373325630856, 14.57058380783428], [107.382727492301058, 14.202440904186968], [107.614547967562402, 13.535530707244202], [107.491403029410861, 12.337205918827944], [105.810523716253101, 11.567614650921225], [106.249670037869436, 10.961811835163585], [105.199914992292321, 10.889309800658094], [104.334334751403446, 10.486543687375228], [103.497279901139677, 10.632555446815926]]] } },
+            { "type": "Feature", "properties": { "admin": "South Korea", "name": "Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[128.349716424676586, 38.612242946927843], [129.212919549680038, 37.432392483055942], [129.460449660358137, 36.784189154602821], [129.468304478066472, 35.632140611303939], [129.091376580929563, 35.08248423923142], [128.18585045787907, 34.890377102186385], [127.386519403188373, 34.475673733044111], [126.485747511908713, 34.390045884736473], [126.3739197124291, 34.934560451795939], [126.559231398627773, 35.684540513647896], [126.117397902532261, 36.725484727519252], [126.860143263863364, 36.893924058574612], [126.174758742376213, 37.749685777328033], [126.237338901881742, 37.840377916000271], [126.683719924018888, 37.804772854151174], [127.073308547067342, 38.256114813788393], [127.780035435090966, 38.304535630845884], [128.205745884311426, 38.370397243801882], [128.349716424676586, 38.612242946927843]]] } },
+            { "type": "Feature", "properties": { "admin": "Kosovo", "name": "Kosovo", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.76216, 42.05186], [20.717310000000108, 41.84711], [20.59023, 41.85541], [20.52295, 42.21787], [20.28374, 42.32025], [20.0707, 42.58863], [20.25758, 42.81275], [20.49679, 42.88469], [20.63508, 43.21671], [20.81448, 43.27205], [20.95651, 43.13094], [21.143395, 43.068685000000123], [21.27421, 42.90959], [21.43866, 42.86255], [21.63302, 42.67717], [21.77505, 42.6827], [21.66292, 42.43922], [21.54332, 42.32025], [21.576635989402117, 42.245224397061847], [21.352700000000134, 42.2068], [20.76216, 42.05186]]] } },
+            { "type": "Feature", "properties": { "admin": "Kuwait", "name": "Kuwait", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[47.974519077349889, 29.975819200148493], [48.183188510944483, 29.534476630159759], [48.09394331237641, 29.306299343374999], [48.416094191283939, 28.552004299426663], [47.708850538937376, 28.526062730416136], [47.459821811722819, 29.002519436147217], [46.568713413281742, 29.099025173452283], [47.302622104690947, 30.059069932570711], [47.974519077349889, 29.975819200148493]]] } },
+            { "type": "Feature", "properties": { "admin": "Laos", "name": "Lao PDR", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[105.218776890078871, 14.27321177821069], [105.544338413517664, 14.723933620660414], [105.589038527450128, 15.570316066952856], [104.779320509868768, 16.441864935771445], [104.716947056092465, 17.428858954330078], [103.956476678485288, 18.240954087796872], [103.200192091893726, 18.309632066312769], [102.998705682387694, 17.961694647691598], [102.413004998791592, 17.932781683824281], [102.113591750092453, 18.109101670804161], [101.059547560635139, 17.512497259994486], [101.035931431077742, 18.408928330961611], [101.282014601651667, 19.462584947176762], [100.606293573003128, 19.508344427971217], [100.548881056726856, 20.109237982661124], [100.115987583417819, 20.41784963630818], [100.329101190189519, 20.786121731036229], [101.180005324307515, 21.436572984294024], [101.270025669359939, 21.201651923095177], [101.803119744882906, 21.174366766845065], [101.652017856861491, 22.318198757409544], [102.170435825613552, 22.464753119389297], [102.754896274834636, 21.675137233969462], [103.203861118586431, 20.766562201413745], [104.435000441508024, 20.758733221921528], [104.822573683697073, 19.886641750563879], [104.183387892678908, 19.624668077060214], [103.896532017026701, 19.265180975821799], [105.094598423281496, 18.666974595611073], [105.925762160264, 17.485315456608955], [106.55600792849566, 16.604283962464802], [107.312705926545576, 15.908538316303177], [107.564525181103875, 15.202173163305554], [107.382727492301058, 14.202440904186968], [106.496373325630856, 14.57058380783428], [106.04394616091551, 13.881091009979952], [105.218776890078871, 14.27321177821069]]] } },
+            { "type": "Feature", "properties": { "admin": "Lebanon", "name": "Lebanon", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.821100701650231, 33.277426459276292], [35.552796665190805, 33.264274807258012], [35.460709262846699, 33.089040025356276], [35.126052687324538, 33.090900376918775], [35.48220665868012, 33.905450140919434], [35.979592319489392, 34.610058295219126], [35.998402540843628, 34.644914048799997], [36.448194207512095, 34.59393524834406], [36.611750115715886, 34.201788641897174], [36.066460402172048, 33.824912421192543], [35.821100701650231, 33.277426459276292]]] } },
+            { "type": "Feature", "properties": { "admin": "Liberia", "name": "Liberia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-7.712159389669749, 4.364565944837721], [-7.974107224957249, 4.355755113131961], [-9.004793667018673, 4.832418524592199], [-9.913420376006682, 5.593560695819205], [-10.765383876986643, 6.140710760925556], [-11.438779466182053, 6.785916856305746], [-11.199801805048278, 7.105845648624735], [-11.14670427086838, 7.396706447779534], [-10.695594855176477, 7.939464016141085], [-10.230093553091276, 8.406205552601291], [-10.016566534861253, 8.42850393313523], [-9.755342169625832, 8.541055202666923], [-9.33727983238458, 7.928534450711351], [-9.403348151069748, 7.526905218938906], [-9.208786383490844, 7.313920803247952], [-8.926064622422002, 7.309037380396375], [-8.722123582382123, 7.711674302598509], [-8.439298468448696, 7.686042792181736], [-8.485445522485348, 7.395207831243068], [-8.385451626000572, 6.911800645368742], [-8.602880214868618, 6.467564195171659], [-8.311347622094017, 6.193033148621081], [-7.993692592795879, 6.126189683451541], [-7.570152553731686, 5.707352199725903], [-7.53971513511176, 5.313345241716517], [-7.63536821128403, 5.188159084489455], [-7.712159389669749, 4.364565944837721]]] } },
+            { "type": "Feature", "properties": { "admin": "Libya", "name": "Libya", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.8513, 22.862950000000119], [14.143870883855239, 22.491288967371126], [13.581424594790459, 23.040506089769274], [11.999505649471697, 23.471668402596432], [11.560669386449032, 24.09790924732561], [10.771363559622952, 24.562532050061741], [10.303846876678445, 24.379313259370967], [9.948261346078024, 24.936953640232613], [9.910692579801774, 25.365454616796789], [9.319410841518218, 26.094324856057476], [9.716285841519662, 26.512206325785652], [9.629056023811073, 27.140953477481041], [9.756128370816779, 27.688258571884198], [9.68388471847288, 28.144173895779311], [9.859997999723472, 28.959989732371064], [9.805634392952353, 29.424638373323369], [9.482139926805415, 30.307556057246181], [9.970017124072966, 30.539324856075375], [10.056575148161697, 30.961831366493517], [9.950225050505194, 31.376069647745275], [10.636901482799484, 31.761420803345679], [10.944789666394511, 32.081814683555358], [11.43225345220378, 32.368903103152824], [11.488787469131008, 33.136995754523234], [12.66331, 32.79278], [13.08326, 32.87882], [13.91868, 32.71196], [15.24563, 32.26508], [15.71394, 31.37626], [16.61162, 31.18218], [18.02109, 30.76357], [19.08641, 30.26639], [19.57404, 30.52582], [20.05335, 30.98576], [19.82033, 31.751790000000135], [20.13397, 32.2382], [20.85452, 32.7068], [21.54298, 32.8432], [22.89576, 32.63858], [23.2368, 32.19149], [23.6091300000001, 32.18726], [23.9275, 32.01667], [24.92114, 31.89936], [25.16482, 31.56915], [24.80287, 31.08929], [24.95762, 30.6616], [24.70007, 30.04419], [25.00000000000011, 29.238654529533552], [25.00000000000011, 25.682499996360995], [25.00000000000011, 22.0], [25.00000000000011, 20.00304], [23.850000000000129, 20.0], [23.837660000000135, 19.580470000000101], [19.84926, 21.49509], [15.86085, 23.40972], [14.8513, 22.862950000000119]]] } },
+            { "type": "Feature", "properties": { "admin": "Sri Lanka", "name": "Sri Lanka", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[81.787959018891371, 7.523055324733162], [81.637322218760573, 6.481775214051921], [81.218019647144317, 6.197141424988287], [80.348356968104397, 5.968369859232154], [79.872468703128519, 6.763463446474928], [79.6951668639351, 8.200843410673384], [80.147800734379629, 9.824077663609554], [80.838817986986541, 9.268426825391186], [81.304319289071756, 8.564206244333688], [81.787959018891371, 7.523055324733162]]] } },
+            { "type": "Feature", "properties": { "admin": "Lesotho", "name": "Lesotho", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[28.978262566857236, -28.955596612261708], [29.325166456832587, -29.257386976846245], [29.018415154748016, -29.743765557577362], [28.848399692507734, -30.070050551068245], [28.291069370239903, -30.226216729454293], [28.107204624145421, -30.545732110314944], [27.749397006956478, -30.645105889612214], [26.999261915807629, -29.875953871379977], [27.532511020627471, -29.242710870075353], [28.07433841320778, -28.851468601193581], [28.541700066855491, -28.647501722937562], [28.978262566857236, -28.955596612261708]]] } },
+            { "type": "Feature", "properties": { "admin": "Lithuania", "name": "Lithuania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.731098667092649, 54.327536932993311], [22.651051873472536, 54.582740993866729], [22.757763706155256, 54.856574408581366], [22.31572350433057, 55.01529857036585], [21.26844892750346, 55.190481675835301], [21.05580040862241, 56.031076361711051], [22.201156853939491, 56.337801825579483], [23.878263787539957, 56.273671373105259], [24.860684441840753, 56.372528388079616], [25.000934279080887, 56.164530748104831], [25.533046502390327, 56.100296942766029], [26.494331495883749, 55.61510691997762], [26.588279249790386, 55.167175604871659], [25.768432651479792, 54.846962592175082], [25.536353794056989, 54.282423407602515], [24.45068362803703, 53.905702216194747], [23.484127638449841, 53.912497667041123], [23.243987257589506, 54.220566718149129], [22.731098667092649, 54.327536932993311]]] } },
+            { "type": "Feature", "properties": { "admin": "Luxembourg", "name": "Luxembourg", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.043073357781109, 50.128051662794221], [6.242751092156992, 49.90222565367872], [6.186320428094176, 49.4638028021145], [5.897759230176403, 49.442667141307012], [5.674051954784828, 49.52948354755749], [5.782417433300905, 50.090327867221205], [6.043073357781109, 50.128051662794221]]] } },
+            { "type": "Feature", "properties": { "admin": "Latvia", "name": "Latvia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[21.05580040862241, 56.031076361711051], [21.090423618257965, 56.783872789122924], [21.581866489353668, 57.411870632549913], [22.524341261492872, 57.753374335350756], [23.31845299652209, 57.006236477274854], [24.120729607853423, 57.025692654032753], [24.312862583114615, 57.793423570376966], [25.164593540149262, 57.970156968815175], [25.602809685984365, 57.847528794986559], [26.46353234223778, 57.476388658266316], [27.288184848751509, 57.474528306703817], [27.770015903440925, 57.244258124411218], [27.855282016722519, 56.759326483784278], [28.17670942557799, 56.169129950578807], [27.102459751094525, 55.783313707087672], [26.494331495883749, 55.61510691997762], [25.533046502390327, 56.100296942766029], [25.000934279080887, 56.164530748104831], [24.860684441840753, 56.372528388079616], [23.878263787539957, 56.273671373105259], [22.201156853939491, 56.337801825579483], [21.05580040862241, 56.031076361711051]]] } },
+            { "type": "Feature", "properties": { "admin": "Morocco", "name": "Morocco", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-5.193863491222031, 35.755182196590845], [-4.591006232105143, 35.330711981745644], [-3.640056525070007, 35.39985504815197], [-2.604305792644111, 35.17909332940112], [-2.169913702798624, 35.168396307916694], [-1.792985805661658, 34.527918606091298], [-1.73345455566141, 33.919712836232115], [-1.388049282222596, 32.864015000941372], [-1.124551153966195, 32.651521511357195], [-1.30789913573787, 32.262888902306024], [-2.616604783529567, 32.094346218386157], [-3.068980271812648, 31.724497992473285], [-3.647497931320145, 31.637294012980814], [-3.690441046554666, 30.896951605751152], [-4.859646165374442, 30.501187649043874], [-5.242129278982786, 30.00044302013557], [-6.060632290053745, 29.731699734001801], [-7.059227667661899, 29.57922842052465], [-8.67411617678283, 28.841288967396643], [-8.665589565454836, 27.656425889592462], [-8.817809007940523, 27.656425889592462], [-8.817828334986642, 27.656425889592462], [-8.794883999049032, 27.120696316022553], [-9.413037482124507, 27.088476060488539], [-9.735343390328749, 26.860944729107409], [-10.189424200877452, 26.860944729107409], [-10.551262579785258, 26.990807603456879], [-11.392554897496948, 26.883423977154386], [-11.718219773800339, 26.104091701760801], [-12.030758836301654, 26.030866197203121], [-12.500962693725368, 24.770116278578136], [-13.891110398809044, 23.691009019459383], [-14.22116777185715, 22.310163072188338], [-14.630832688850942, 21.860939846274867], [-14.750954555713404, 21.500600083903802], [-17.002961798561071, 21.42073415779668], [-17.020428432675768, 21.422310288981631], [-16.973247849993182, 21.88574453377495], [-16.589136928767626, 22.158234361250091], [-16.26192175949566, 22.679339504481273], [-16.326413946995896, 23.017768459560894], [-15.982610642958059, 23.723358466074096], [-15.426003790742183, 24.359133612561035], [-15.089331834360729, 24.520260728446964], [-14.824645148161689, 25.103532619725307], [-14.800925665739666, 25.636264960222285], [-14.439939947964827, 26.254418443297645], [-13.773804897506462, 26.618892320252279], [-13.13994177901429, 27.640147813420491], [-13.121613369914709, 27.654147671719805], [-12.61883663578311, 28.038185533148656], [-11.688919236690761, 28.148643907172577], [-10.9009569971044, 28.832142238880913], [-10.39959225100864, 29.09858592377778], [-9.564811163765624, 29.933573716749855], [-9.814718390329174, 31.177735500609053], [-9.434793260119362, 32.038096421836478], [-9.300692918321827, 32.564679266890629], [-8.657476365585039, 33.24024526624239], [-7.654178432638217, 33.697064927702506], [-6.912544114601358, 34.11047638603744], [-6.24434200685141, 35.145865383437517], [-5.929994269219832, 35.759988104793983], [-5.193863491222031, 35.755182196590845]]] } },
+            { "type": "Feature", "properties": { "admin": "Moldova", "name": "Moldova", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[26.619336785597788, 48.220726223333457], [26.857823520624798, 48.368210761094488], [27.52253746919515, 48.467119452501102], [28.259546746541837, 48.155562242213406], [28.670891147585163, 48.118148505234089], [29.122698195113024, 47.849095160506458], [29.050867954227321, 47.510226955752493], [29.415135125452732, 47.346645209332571], [29.559674106573105, 46.928582872091312], [29.908851759569295, 46.67436066343145], [29.838210076626289, 46.525325832701675], [30.024658644335364, 46.423936672545032], [29.759971958136383, 46.349987697935354], [29.170653924279879, 46.379262396828693], [29.072106967899288, 46.517677720722482], [28.862972446414055, 46.437889309263824], [28.933717482221621, 46.258830471372491], [28.659987420371575, 45.939986884131628], [28.48526940279276, 45.596907050145887], [28.233553501099035, 45.488283189468369], [28.054442986775392, 45.944586086605618], [28.160017937947707, 46.371562608417207], [28.128030226359037, 46.81047638608824], [27.551166212684841, 47.405117092470817], [27.233872918412736, 47.826770941756365], [26.924176059687561, 48.123264472030982], [26.619336785597788, 48.220726223333457]]] } },
+            { "type": "Feature", "properties": { "admin": "Madagascar", "name": "Madagascar", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.543518914595737, -12.469832858940553], [49.80898074727908, -12.895284925999551], [50.05651085795715, -13.555761407121981], [50.217431268114055, -14.758788750876795], [50.476536899625515, -15.226512139550541], [50.377111443895942, -15.706069431219122], [50.200274692593169, -16.000263360256763], [49.860605503138665, -15.414252618066913], [49.672606642460849, -15.710203545802477], [49.863344354050142, -16.451036879138773], [49.774564243372694, -16.875042006093597], [49.49861209493411, -17.10603565843827], [49.435618523970298, -17.953064060134363], [49.04179243347393, -19.118781019774442], [48.548540887247995, -20.496888116134119], [47.930749139198653, -22.391501153251077], [47.547723423051295, -23.781958916928513], [47.095761346226588, -24.941629733990446], [46.282477654817079, -25.178462823184102], [45.409507684110444, -25.601434421493082], [44.833573846217547, -25.346101169538933], [44.039720493349755, -24.9883452287823], [43.763768344911156, -24.460677178649988], [43.697777540874441, -23.574116306250595], [43.345654331237611, -22.77690398528387], [43.254187046080986, -22.057413018484116], [43.433297560404633, -21.336475111580185], [43.893682895692919, -21.163307386970121], [43.89637007017209, -20.830459486578167], [44.374325392439644, -20.072366224856385], [44.464397413924374, -19.435454196859045], [44.23242190936616, -18.961994724200899], [44.042976108584149, -18.331387220943167], [43.963084344260899, -17.409944756746778], [44.312468702986273, -16.850495700754951], [44.446517368351387, -16.216219170804504], [44.944936557806521, -16.179373874580396], [45.502731967964976, -15.974373467678538], [45.872993605336255, -15.793454278224681], [46.312243279817203, -15.780018405828795], [46.882182651564271, -15.210182386946309], [47.70512983581235, -14.594302666891762], [48.005214878131241, -14.091232598530372], [47.869047479042152, -13.663868503476582], [48.29382775248137, -13.784067884987483], [48.845060255738773, -13.08917489995866], [48.863508742066976, -12.487867933810417], [49.194651320193302, -12.040556735891967], [49.543518914595737, -12.469832858940553]]] } },
+            { "type": "Feature", "properties": { "admin": "Mexico", "name": "Mexico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-97.140008307670684, 25.869997463478395], [-97.528072475966539, 24.992144069920297], [-97.702945522842214, 24.272343044526728], [-97.776041836319024, 22.932579860927653], [-97.872366706111094, 22.444211737553356], [-97.699043952204164, 21.898689480064256], [-97.388959520236739, 21.411018988525818], [-97.189333462293277, 20.635433254473124], [-96.525575527720306, 19.890930894444061], [-96.292127244841737, 19.32037140550954], [-95.90088497595994, 18.828024196848727], [-94.8390634834427, 18.562717393462204], [-94.425729539756205, 18.144370835843343], [-93.548651292682365, 18.423836981677933], [-92.786113857783477, 18.524838568592255], [-92.037348192090391, 18.704569200103432], [-91.407903408559235, 18.876083278880227], [-90.771869879910852, 19.284120388256778], [-90.533589850613026, 19.867418117751292], [-90.451475999701231, 20.707521877520428], [-90.278618333684889, 20.999855454995547], [-89.601321173851474, 21.261725775634485], [-88.543866339862845, 21.493675441976613], [-87.658416510757704, 21.458845526611977], [-87.051890224948053, 21.543543199138295], [-86.811982388032931, 21.331514797444747], [-86.845907965832595, 20.849864610268348], [-87.383291185235848, 20.255404771398727], [-87.621054450210721, 19.646553046135917], [-87.436750454441764, 19.472403469312265], [-87.586560431655911, 19.040130113190738], [-87.837191128271485, 18.259815985583426], [-88.090664028663156, 18.516647854074048], [-88.300031094093626, 18.499982204659997], [-88.490122850279278, 18.486830552641717], [-88.84834387892657, 17.883198147040329], [-89.029857347351737, 18.001511338772556], [-89.150909389995462, 17.955467637600403], [-89.143080410503316, 17.808318996649401], [-90.067933519230891, 17.819326076727517], [-91.001519945015943, 17.817594916245692], [-91.002269253284155, 17.254657701074272], [-91.453921271515114, 17.252177232324183], [-91.08167009150057, 16.918476670799517], [-90.711821865587623, 16.687483018454767], [-90.600846727240921, 16.470777899638787], [-90.438866950221993, 16.410109768128105], [-90.464472622422633, 16.069562079324722], [-91.747960171255926, 16.066564846251762], [-92.229248623406278, 15.251446641495871], [-92.087215949252013, 15.06458466232851], [-92.203229539747255, 14.830102850804108], [-92.227750006869812, 14.538828640190953], [-93.359463874061746, 15.61542959234367], [-93.875168830118511, 15.94016429286591], [-94.691656460330108, 16.20097524664288], [-95.250227016973014, 16.128318182840641], [-96.053382127653293, 15.752087917539592], [-96.557434048228274, 15.653515122942787], [-97.263592495496624, 15.917064927631312], [-98.013029954809596, 16.107311713113912], [-98.947675747456486, 16.566043402568763], [-99.697397427147024, 16.706164048728166], [-100.829498867581293, 17.171071071842047], [-101.666088629954444, 17.649026394109622], [-101.918528001700196, 17.916090196193974], [-102.478132086988907, 17.975750637275095], [-103.500989549558057, 18.292294623278845], [-103.917527432046811, 18.748571682200005], [-104.992009650475467, 19.316133938061679], [-105.493038499761411, 19.946767279535429], [-105.731396043707633, 20.434101874264108], [-105.397772996831321, 20.531718654863422], [-105.500660773524402, 20.816895046466122], [-105.27075232625792, 21.076284898355137], [-105.265817226974022, 21.422103583252348], [-105.603160976975374, 21.871145941652568], [-105.693413865973113, 22.269080308516148], [-106.028716396898943, 22.77375234627862], [-106.909980434988341, 23.767774359628895], [-107.91544877809136, 24.548915310152946], [-108.401904873470954, 25.172313951105931], [-109.260198737406625, 25.580609442644054], [-109.444089321717314, 25.824883938087673], [-109.291643846456267, 26.44293406829842], [-109.801457689231796, 26.676175645447923], [-110.391731737085692, 27.162114976504533], [-110.641018846461606, 27.859876003525521], [-111.178918830187826, 27.941240546169062], [-111.759606899851619, 28.467952582303944], [-112.228234626090369, 28.954408677683482], [-112.27182369672866, 29.266844387320074], [-112.80959448937395, 30.021113593052341], [-113.163810594518651, 30.786880804969424], [-113.148669399857141, 31.170965887978912], [-113.871881069781836, 31.56760834403519], [-114.205736660603506, 31.524045111613123], [-114.776451178835003, 31.79953217216114], [-114.936699795372121, 31.393484605427595], [-114.771231859173483, 30.91361725516526], [-114.673899298951739, 30.162681179315985], [-114.330974494262918, 29.750432440707407], [-113.588875088335413, 29.061611436473008], [-113.424053107540516, 28.826173610951223], [-113.271969367305502, 28.754782619739892], [-113.140039435664363, 28.411289374295954], [-112.962298346796473, 28.425190334582503], [-112.761587083774856, 27.78021678314752], [-112.457910529411635, 27.525813706974752], [-112.24495195193677, 27.171726792910754], [-111.616489020619184, 26.662817287700474], [-111.284674648872993, 25.732589830014426], [-110.987819383572386, 25.294606228124557], [-110.71000688357131, 24.826004340101854], [-110.655048997828871, 24.298594672131113], [-110.17285620811343, 24.265547593680417], [-109.771847093528521, 23.811182562754194], [-109.409104377055698, 23.364672349536242], [-109.433392300232896, 23.185587673428696], [-109.85421932660168, 22.818271592698061], [-110.031391974714424, 22.823077500901199], [-110.295070970483636, 23.430973212166684], [-110.949501309028022, 24.000964260345988], [-111.670568407012681, 24.484423122652508], [-112.182035895621468, 24.73841278736716], [-112.148988817170817, 25.470125230404044], [-112.300710822379671, 26.012004299416613], [-112.777296719191526, 26.321959540303162], [-113.464670783321907, 26.768185533143416], [-113.596729906043805, 26.639459540304465], [-113.848936733844241, 26.900063788352437], [-114.465746629680027, 27.142090358991361], [-115.055142178184965, 27.722726752222904], [-114.982252570437382, 27.798200181585109], [-114.570365566854917, 27.741485297144884], [-114.199328782999231, 28.115002549750553], [-114.162018398884612, 28.566111965442296], [-114.931842210736605, 29.279479275015483], [-115.518653937626965, 29.556361599235395], [-115.887365282029563, 30.180793768834171], [-116.2583503894529, 30.836464341753572], [-116.721526252084956, 31.635743720012037], [-117.127759999999839, 32.53534], [-115.99135, 32.612390000000111], [-114.72139, 32.72083], [-114.815, 32.52528], [-113.30498, 32.03914], [-111.02361, 31.33472], [-109.035, 31.341940000000129], [-108.24194, 31.34222], [-108.24, 31.754853718166366], [-106.507589999999851, 31.75452], [-106.1429, 31.39995], [-105.63159, 31.08383], [-105.03737, 30.64402], [-104.70575, 30.12173], [-104.456969999999885, 29.57196], [-103.94, 29.27], [-103.11, 28.97], [-102.48, 29.76], [-101.6624, 29.7793], [-100.9576, 29.380710000000125], [-100.45584, 28.696120000000118], [-100.11, 28.11000000000012], [-99.52, 27.54], [-99.3, 26.84], [-99.019999999999897, 26.37], [-98.24, 26.06], [-97.529999999999887, 25.84], [-97.140008307670684, 25.869997463478395]]] } },
+            { "type": "Feature", "properties": { "admin": "Macedonia", "name": "Macedonia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.59023, 41.85541], [20.717310000000108, 41.84711], [20.76216, 42.05186], [21.352700000000134, 42.2068], [21.576635989402117, 42.245224397061847], [21.917080000000105, 42.30364], [22.380525750424674, 42.320259507815074], [22.881373732197339, 41.999297186850349], [22.952377150166505, 41.337993882811176], [22.76177, 41.3048], [22.597308383889008, 41.130487168943198], [22.055377638444266, 41.149865831052686], [21.674160597426969, 40.93127452245794], [21.020040317476397, 40.842726955725873], [20.60518, 41.08622], [20.46315, 41.51509], [20.59023, 41.85541]]] } },
+            { "type": "Feature", "properties": { "admin": "Mali", "name": "Mali", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-11.834207526079465, 14.799096991428936], [-11.666078253617853, 15.388208319556295], [-11.349095017939502, 15.411256008358475], [-10.650791388379414, 15.132745876521422], [-10.086846482778212, 15.330485744686269], [-9.700255092802703, 15.264107367407359], [-9.550238409859388, 15.486496893775435], [-5.537744309908446, 15.501689764869253], [-5.315277268891931, 16.201853745991837], [-5.488522508150438, 16.325102037007962], [-5.971128709324247, 20.640833441647626], [-6.453786586930334, 24.956590684503418], [-4.92333736817423, 24.974574082940993], [-1.550054897457613, 22.792665920497377], [1.823227573259032, 20.61080943448604], [2.060990838233919, 20.142233384679482], [2.683588494486428, 19.856230170160114], [3.146661004253899, 19.693578599521441], [3.158133172222704, 19.057364203360034], [4.267419467800038, 19.155265204336995], [4.270209995143801, 16.852227484601212], [3.723421665063482, 16.184283759012612], [3.638258904646476, 15.568119818580453], [2.749992709981483, 15.409524847876693], [1.385528191746857, 15.323561102759168], [1.01578331869851, 14.968182277887944], [0.374892205414682, 14.928908189346128], [-0.26625729003058, 14.924308986872147], [-0.515854458000348, 15.116157741755725], [-1.066363491205663, 14.973815009007764], [-2.001035122068771, 14.559008287000887], [-2.191824510090384, 14.246417548067352], [-2.967694464520576, 13.798150336151506], [-3.103706834312759, 13.54126679122859], [-3.52280270019986, 13.337661647998612], [-4.006390753587225, 13.472485459848112], [-4.280405035814879, 13.228443508349738], [-4.427166103523802, 12.542645575404292], [-5.220941941743119, 11.713858954307224], [-5.197842576508648, 11.375145778850136], [-5.470564947929004, 10.951269842976044], [-5.404341599946973, 10.370736802609144], [-5.816926235365286, 10.222554633012191], [-6.050452032892266, 10.096360785355442], [-6.205222947606429, 10.524060777219132], [-6.493965013037267, 10.411302801958268], [-6.666460944027547, 10.430810655148447], [-6.850506557635057, 10.138993841996237], [-7.622759161804808, 10.147236232946792], [-7.89958980959237, 10.297382106970824], [-8.029943610048617, 10.206534939001711], [-8.335377163109738, 10.494811916541932], [-8.282357143578279, 10.792597357623842], [-8.407310756860026, 10.90925690352276], [-8.620321010767126, 10.810890814655181], [-8.581305304386772, 11.136245632364801], [-8.376304897484911, 11.393645941610627], [-8.786099005559462, 11.812560939984705], [-8.905264858424529, 12.088358059126433], [-9.127473517279581, 12.308060411015331], [-9.327616339546008, 12.334286200403451], [-9.567911749703212, 12.194243068892472], [-9.890992804392011, 12.060478623904968], [-10.165213792348835, 11.844083563682743], [-10.593223842806278, 11.923975328005977], [-10.870829637078211, 12.177887478072106], [-11.036555955438256, 12.211244615116513], [-11.297573614944508, 12.077971096235768], [-11.456168585648269, 12.076834214725336], [-11.513942836950587, 12.442987575729415], [-11.467899135778522, 12.754518947800973], [-11.553397793005427, 13.141213690641063], [-11.927716030311613, 13.422075100147392], [-12.124887457721256, 13.994727484589784], [-12.170750291380299, 14.616834214735503]]] } },
+            { "type": "Feature", "properties": { "admin": "Myanmar", "name": "Myanmar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[99.543309360759281, 20.186597601802056], [98.959675734454848, 19.752980658440944], [98.253723992915582, 19.708203029860041], [97.797782830804394, 18.627080389881751], [97.375896437573516, 18.445437730375811], [97.859122755934848, 17.567946071843657], [98.493761020911322, 16.837835598207928], [98.90334842325673, 16.177824204976115], [98.537375929765687, 15.308497422746081], [98.192074009191373, 15.123702500870349], [98.430819126379859, 14.622027696180831], [99.097755161538728, 13.827502549693275], [99.212011753336071, 13.269293728076462], [99.196353794351637, 12.804748439988666], [99.587286004639694, 11.892762762901695], [99.038120558673953, 10.960545762572435], [98.553550653073017, 9.932959906448543], [98.457174106848697, 10.675266018105146], [98.764545526120756, 11.441291612183745], [98.428338657629823, 12.032986761925681], [98.509574009192661, 13.122377631070675], [98.103603957107666, 13.64045970301285], [97.777732375075161, 14.837285874892638], [97.597071567782749, 16.100567938699765], [97.164539829499773, 16.928734442609336], [96.505768670642965, 16.427240505432845], [95.369352248112378, 15.714389960182599], [94.808404575584092, 15.803454291237637], [94.188804152404515, 16.037936102762014], [94.533485955791321, 17.277240301985724], [94.324816522196741, 18.213513902249893], [93.540988397193615, 19.366492621330021], [93.663254835996199, 19.726961574781992], [93.078277622452163, 19.855144965081973], [92.368553501355606, 20.670883287025344], [92.30323449093865, 21.475485337809815], [92.652257114637976, 21.324047552978481], [92.672720981825549, 22.041238918541247], [93.166127557348361, 22.278459580977099], [93.060294224014598, 22.703110663335565], [93.286326938859247, 23.043658352138998], [93.325187615942767, 24.078556423432197], [94.106741977925054, 23.850740871673477], [94.552657912171611, 24.675238348890328], [94.603249139385355, 25.162495428970399], [95.155153436262566, 26.001307277932078], [95.124767694074933, 26.573572089132295], [96.419365675850941, 27.264589341739221], [97.133999058015277, 27.08377350514996], [97.051988559968066, 27.699058946233144], [97.402561476636123, 27.88253611908544], [97.327113885490007, 28.261582749946331], [97.91198774616943, 28.335945136014338], [98.24623091023328, 27.747221381129172], [98.682690057370451, 27.508812160750612], [98.712093947344499, 26.74353587494026], [98.671838006589127, 25.918702500913518], [97.724609002679117, 25.083637193292994], [97.604719679761956, 23.897404690033039], [98.660262485755737, 24.063286037689959], [98.898749220782747, 23.142722072842524], [99.531992222087382, 22.949038804612574], [99.240898878987224, 22.118314317304577], [99.983489211021464, 21.742936713136398], [100.416537713627349, 21.558839423096607], [101.150032993578222, 21.849984442629015], [101.180005324307515, 21.436572984294024], [100.329101190189519, 20.786121731036229], [100.115987583417819, 20.41784963630818], [99.543309360759281, 20.186597601802056]]] } },
+            { "type": "Feature", "properties": { "admin": "Montenegro", "name": "Montenegro", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[19.801613396898681, 42.500093492190835], [19.738051385179627, 42.688247382165564], [19.30449, 42.19574], [19.371770000000136, 41.87755], [19.16246, 41.95502], [18.88214, 42.28151], [18.45, 42.48], [18.56, 42.65], [18.70648, 43.20011], [19.03165, 43.43253], [19.21852, 43.52384], [19.48389, 43.35229], [19.63, 43.213779970270522], [19.95857, 43.10604], [20.3398, 42.89852], [20.25758, 42.81275], [20.0707, 42.58863], [19.801613396898681, 42.500093492190835]]] } },
+            { "type": "Feature", "properties": { "admin": "Mongolia", "name": "Mongolia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[87.751264276076697, 49.297197984405479], [88.805566847695488, 49.470520738312409], [90.713667433640666, 50.331811835321076], [92.234711541719662, 50.802170722041716], [93.104219191462661, 50.495290228876414], [94.147566359435615, 50.480536607457083], [94.815949334698701, 50.013433335970838], [95.814027947983973, 49.977466539095708], [97.259727817781396, 49.726060695995727], [98.231761509191543, 50.422400621128737], [97.825739780674283, 51.010995184933165], [98.861490513100307, 52.047366034546684], [99.981732212323507, 51.634006252643978], [100.889480421962588, 51.516855780638316], [102.065222609467298, 51.25992055928311], [102.255908644624299, 50.510560614618669], [103.676545444760194, 50.089966132195109], [104.621552362081687, 50.275329494826067], [105.886591424586726, 50.406019192092209], [106.888804152455336, 50.274295966180219], [107.868175897250936, 49.793705145865808], [108.475167270951275, 49.282547715850725], [109.402449171996636, 49.292960516957535], [110.662010532678764, 49.130128078805861], [111.581230910286607, 49.377968248077678], [112.897739699354361, 49.543565375356984], [114.362456496235239, 50.248302720737399], [114.962109816550154, 50.140247300815112], [115.485695428531386, 49.805177313834591], [116.678800897286152, 49.888531399121376], [116.191802199367544, 49.134598090199091], [115.485282017073018, 48.135382595403428], [115.742837355615748, 47.726544501326273], [116.308952671373206, 47.853410142602826], [117.295507440257396, 47.69770905210742], [118.064142694166691, 48.066730455103674], [118.866574334794933, 47.747060044946153], [119.772823927897477, 47.048058783550125], [119.66326989143873, 46.692679958678909], [118.874325799638711, 46.805412095723646], [117.421701287914175, 46.672732855814253], [116.717868280098841, 46.388202419615205], [115.985096470200062, 45.727235012385989], [114.46033165899604, 45.339816799493811], [113.463906691544139, 44.808893134127111], [112.436062453258785, 45.011645616224278], [111.873306105600278, 45.102079372735055], [111.348376906379428, 44.457441718110083], [111.667737257943202, 44.073175767587706], [111.829587843881342, 43.743118394539515], [111.129682244920218, 43.406834011400136], [110.412103306115256, 42.871233628911014], [109.243595819131428, 42.519446316084093], [107.744772576937933, 42.481515814781865], [106.129315627061658, 42.134327704428898], [104.964993931093446, 41.597409572916334], [104.522281935648977, 41.908346666016541], [103.312278273534787, 41.907468166667591], [101.833040399179922, 42.51487295182627], [100.845865513108237, 42.663804429691439], [99.515817498780009, 42.524691473961717], [97.451757440177985, 42.748889675460013], [96.349395786527793, 42.725635280928678], [95.762454868556674, 43.319449164394598], [95.306875441471504, 44.241330878265458], [94.688928664125299, 44.352331854828414], [93.480733677141274, 44.975472113619951], [92.133890822318193, 45.115075995456444], [90.945539585334288, 45.286073309910265], [90.585768263718265, 45.719716091487513], [90.970809360724985, 46.888146063822923], [90.280825636763893, 47.693549099307923], [88.854297723346733, 48.06908173277295], [88.013832228551721, 48.599462795600601], [87.751264276076697, 49.297197984405479]]] } },
+            { "type": "Feature", "properties": { "admin": "Mozambique", "name": "Mozambique", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [35.312397902169032, -11.439146416879145], [36.514081658684248, -11.720938002166733], [36.775150994622791, -11.594537448780804], [37.471284214026596, -11.568750909067157], [37.827644891111383, -11.268769219612834], [38.427556593587745, -11.285202325081654], [39.521029900883768, -10.896853936408224], [40.316588576017182, -10.317096042525696], [40.478387485523022, -10.765440769089992], [40.437253045418672, -11.761710707245014], [40.560811395028558, -12.639176527561023], [40.599620395679743, -14.201975192931858], [40.775475294768988, -14.691764418194239], [40.477250604012596, -15.406294447493968], [40.089263950365208, -16.100774021064456], [39.452558628097044, -16.720891208566936], [38.53835086442151, -17.101023044505954], [37.411132846838875, -17.586368096591233], [36.281279331209348, -18.659687595293445], [35.896496616364054, -18.842260430580634], [35.198399692533137, -19.552811374593887], [34.786383497870041, -19.784011732667732], [34.701892531072836, -20.497043145431007], [35.176127150215358, -21.254361260668407], [35.373427768705731, -21.840837090748874], [35.385848253705397, -22.14], [35.562545536369079, -22.09], [35.533934767404297, -23.070787855727751], [35.371774122872374, -23.535358982031692], [35.607470330555621, -23.706563002214676], [35.458745558419615, -24.122609958596545], [35.040734897610655, -24.478350518493798], [34.215824008935463, -24.816314385682652], [33.013210076639005, -25.357573337507731], [32.574632195777859, -25.727318210556088], [32.660363396950082, -26.148584486599443], [32.915955031065685, -26.215867201443459], [32.830120477028878, -26.74219166433619], [32.071665480281062, -26.733820082304902], [31.985779249811962, -26.29177988048022], [31.837777947728057, -25.843331801051342], [31.752408481581874, -25.484283949487406], [31.930588820124242, -24.369416599222532], [31.670397983534645, -23.658969008073861], [31.191409132621278, -22.251509698172395], [32.244988234188007, -21.116488539313689], [32.508693068173436, -20.395292250248303], [32.659743279762573, -20.30429005298231], [32.772707960752619, -19.715592136313294], [32.611994256324884, -19.419382826416268], [32.654885695127142, -18.672089939043492], [32.849860874164385, -17.979057305577175], [32.847638787575839, -16.713398125884613], [32.328238966610222, -16.392074069893749], [31.852040643040592, -16.319417006091374], [31.636498243951188, -16.071990248277881], [31.173063999157673, -15.860943698797868], [30.338954705534537, -15.880839125230242], [30.274255812305103, -15.507786960515208], [30.179481235481827, -14.796099134991525], [33.214024692525207, -13.97186003993615], [33.789700148256678, -14.451830743063068], [34.064825473778619, -14.359950046448118], [34.459633416488536, -14.613009535381421], [34.517666049952304, -15.013708591372609], [34.307291294092089, -15.478641452702592], [34.381291945134045, -16.183559665596039], [35.033810255683527, -16.801299737213089], [35.339062941231639, -16.107440280830108], [35.771904738108347, -15.896858819240721], [35.686845330555926, -14.611045830954328], [35.267956170398001, -13.887834161029563], [34.907151320136158, -13.565424899960565], [34.559989047999345, -13.579997653866872], [34.280006137841973, -12.280025323132504], [34.559989047999345, -11.520020033415923]]] } },
+            { "type": "Feature", "properties": { "admin": "Mauritania", "name": "Mauritania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-12.170750291380299, 14.616834214735503], [-12.830658331747513, 15.303691514542942], [-13.43573767745306, 16.039383042866188], [-14.099521450242175, 16.304302273010489], [-14.577347581428977, 16.598263658102805], [-15.135737270558813, 16.587282416240779], [-15.623666144258689, 16.369337063049809], [-16.120690070041928, 16.45566254319338], [-16.463098110407881, 16.135036119038457], [-16.549707810929061, 16.673892116761959], [-16.270551723688353, 17.166962795474866], [-16.146347418674846, 18.108481553616652], [-16.256883307347163, 19.096715806550304], [-16.377651129613266, 19.593817246981981], [-16.277838100641514, 20.092520656814695], [-16.536323614965465, 20.567866319251486], [-17.063423224342568, 20.99975210213082], [-16.845193650773989, 21.333323472574875], [-12.929101935263528, 21.327070624267559], [-13.118754441774708, 22.771220201096249], [-12.874221564169574, 23.284832261645171], [-11.93722449385332, 23.374594224536164], [-11.969418911171159, 25.933352769468261], [-8.687293667017398, 25.881056219988899], [-8.684399786809051, 27.395744126895998], [-4.92333736817423, 24.974574082940993], [-6.453786586930334, 24.956590684503418], [-5.971128709324247, 20.640833441647626], [-5.488522508150438, 16.325102037007962], [-5.315277268891931, 16.201853745991837], [-5.537744309908446, 15.501689764869253], [-9.550238409859388, 15.486496893775435], [-9.700255092802703, 15.264107367407359], [-10.086846482778212, 15.330485744686269], [-10.650791388379414, 15.132745876521422], [-11.349095017939502, 15.411256008358475], [-11.666078253617853, 15.388208319556295], [-11.834207526079465, 14.799096991428936], [-12.170750291380299, 14.616834214735503]]] } },
+            { "type": "Feature", "properties": { "admin": "Malawi", "name": "Malawi", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[34.559989047999345, -11.520020033415923], [34.280006137841973, -12.280025323132504], [34.559989047999345, -13.579997653866872], [34.907151320136158, -13.565424899960565], [35.267956170398001, -13.887834161029563], [35.686845330555926, -14.611045830954328], [35.771904738108347, -15.896858819240721], [35.339062941231639, -16.107440280830108], [35.033810255683527, -16.801299737213089], [34.381291945134045, -16.183559665596039], [34.307291294092089, -15.478641452702592], [34.517666049952304, -15.013708591372609], [34.459633416488536, -14.613009535381421], [34.064825473778619, -14.359950046448118], [33.789700148256678, -14.451830743063068], [33.214024692525207, -13.97186003993615], [32.688165317523122, -13.712857761289273], [32.991764357237876, -12.783870537978272], [33.306422153463068, -12.435778090060214], [33.114289178201908, -11.607198174692311], [33.315310499817279, -10.796549981329695], [33.485687697083584, -10.525558770391111], [33.231387973775291, -9.676721693564799], [32.759375441221316, -9.230599053589058], [33.739729038230443, -9.417150974162722], [33.940837724096532, -9.693673841980292], [34.280006137841973, -10.159999688358402], [34.559989047999345, -11.520020033415923]]] } },
+            { "type": "Feature", "properties": { "admin": "Malaysia", "name": "Malaysia", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[101.075515578213299, 6.204867051615891], [101.154218784593809, 5.691384182147713], [101.814281854258013, 5.810808417174228], [102.141186964936423, 6.221636053894655], [102.371147088635212, 6.12820506431096], [102.961705356866673, 5.524495144061077], [103.381214634212142, 4.855001125503746], [103.438575474056165, 4.181605536308381], [103.332122023534851, 3.72669790284297], [103.42942874554052, 3.382868760589019], [103.502447544368877, 2.791018581550204], [103.854674106870334, 2.515454006353763], [104.247931756611479, 1.631141058759055], [104.228811476663523, 1.293048000489534], [103.519707472754433, 1.226333726400682], [102.573615350354771, 1.967115383304744], [101.39063846232915, 2.760813706875623], [101.273539666755838, 3.27029165284118], [100.69543541870668, 3.939139715994869], [100.557407668055092, 4.767280381688279], [100.19670617065772, 5.312492580583678], [100.306260207116509, 6.040561835143875], [100.085756870527078, 6.46448944745029], [100.259596388756918, 6.64282481528957], [101.075515578213299, 6.204867051615891]]], [[[118.618320754064825, 4.47820241944754], [117.882034946770162, 4.137551377779487], [117.01521447150634, 4.306094061699468], [115.86551720587677, 4.306559149590156], [115.51907840379198, 3.169238389494395], [115.134037306785231, 2.821481838386219], [114.621355422017473, 1.430688177898886], [113.805849644019531, 1.217548732911041], [112.859809198052176, 1.497790025229946], [112.380251906383648, 1.410120957846757], [111.797548455860408, 0.904441229654651], [111.159137811326559, 0.976478176269509], [110.514060907027101, 0.773131415200993], [109.830226678508836, 1.338135687664191], [109.663260125773718, 2.006466986494984], [110.396135288537039, 1.663774725751395], [111.168852980597478, 1.850636704918784], [111.370081007942076, 2.697303371588872], [111.796928338672842, 2.885896511238073], [112.995614862115247, 3.102394924324869], [113.712935418758718, 3.893509426281127], [114.204016554828399, 4.525873928236819], [114.659595981913526, 4.00763682699781], [114.869557326315373, 4.348313706881952], [115.347460972150671, 4.316636053887009], [115.405700311343594, 4.955227565933824], [115.450710483869798, 5.447729803891561], [116.220741001450961, 6.143191229675621], [116.725102980619752, 6.924771429873998], [117.129626092600461, 6.928052883324566], [117.643393182446303, 6.422166449403305], [117.689075148592337, 5.98749013918018], [118.347691278152197, 5.708695786965462], [119.181903924639926, 5.407835598162249], [119.110693800941718, 5.016128241389864], [118.439727004064082, 4.966518866389619], [118.618320754064825, 4.47820241944754]]]] } },
+            { "type": "Feature", "properties": { "admin": "Namibia", "name": "Namibia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[16.344976840895239, -28.576705010697697], [15.601818068105812, -27.821247247022797], [15.210472446359457, -27.09095590587404], [14.989710727608548, -26.117371921495153], [14.74321414557633, -25.392920017195376], [14.40814415859583, -23.85301401132984], [14.385716586981145, -22.656652927340687], [14.257714064194172, -22.111208184499951], [13.868642205468657, -21.699036960539974], [13.352497999737437, -20.872834161057497], [12.82684533046449, -19.673165785401661], [12.608564080463617, -19.045348809487695], [11.794918654028063, -18.069129327061912], [11.734198846085118, -17.30188933682447], [12.215461460019352, -17.11166838955808], [12.814081251688405, -16.941342868724067], [13.462362094789963, -16.971211846588769], [14.058501417709007, -17.42338062914266], [14.209706658595021, -17.353100681225715], [18.26330936043416, -17.309950860262003], [18.956186964603599, -17.789094740472255], [21.377176141045563, -17.930636488519688], [23.215048455506057, -17.52311614346598], [24.033861525170771, -17.29584319424632], [24.6823490740015, -17.35341073981947], [25.076950310982255, -17.578823337476617], [25.084443393664564, -17.661815687737366], [24.520705193792534, -17.887124932529932], [24.217364536239209, -17.889347019118485], [23.579005568137713, -18.281261081620055], [23.196858351339298, -17.869038181227783], [21.655040317478971, -18.219146010005222], [20.910641310314531, -18.252218926672018], [20.881134067475866, -21.814327080983144], [19.895457797940672, -21.849156996347865], [19.895767856534427, -24.767790215760588], [19.89473432788861, -28.461104831660769], [19.002127312911082, -28.972443129188857], [18.464899122804745, -29.045461928017271], [17.836151971109526, -28.856377862261311], [17.387497185951499, -28.783514092729774], [17.218928663815401, -28.355943291946804], [16.824017368240899, -28.082161553664466], [16.344976840895239, -28.576705010697697]]] } },
+            { "type": "Feature", "properties": { "admin": "New Caledonia", "name": "New Caledonia", "continent": "Oceania" }, "geometry": { "type": "Polygon", "coordinates": [[[165.779989862326346, -21.080004978115621], [166.599991489933814, -21.700018812753523], [167.120011428086883, -22.159990736583488], [166.74003462144475, -22.399976088146943], [166.189732293968632, -22.129708347260447], [165.474375441752159, -21.679606621998229], [164.829815301775653, -21.149819838141948], [164.16799523341362, -20.444746595951624], [164.029605747735957, -20.105645847252347], [164.459967075862664, -20.120011895429492], [165.020036249041993, -20.459991143477726], [165.460009393575064, -20.800022067958253], [165.779989862326346, -21.080004978115621]]] } },
+            { "type": "Feature", "properties": { "admin": "Niger", "name": "Niger", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[2.154473504249949, 11.940150051313422], [2.177107781593917, 12.625017808477534], [1.024103224297619, 12.851825669806598], [0.993045688490156, 13.335749620003865], [0.429927605805517, 13.988733018443893], [0.295646396495215, 14.444234930880663], [0.374892205414767, 14.928908189346144], [1.015783318698481, 14.968182277887989], [1.385528191746971, 15.323561102759237], [2.74999270998154, 15.409524847876751], [3.63825890464659, 15.56811981858044], [3.723421665063596, 16.184283759012654], [4.270209995143886, 16.852227484601311], [4.267419467800095, 19.155265204337123], [5.677565952180712, 19.601206976799794], [8.572893100629868, 21.565660712159225], [11.999505649471697, 23.471668402596432], [13.581424594790459, 23.040506089769274], [14.143870883855239, 22.491288967371126], [14.8513, 22.862950000000119], [15.096887648181847, 21.308518785074902], [15.471076694407314, 21.048457139565979], [15.487148064850143, 20.730414537025634], [15.90324669766431, 20.387618923417499], [15.68574059414777, 19.957180080642384], [15.300441114979716, 17.927949937405], [15.247731154041842, 16.627305813050778], [13.972201775781681, 15.684365953021139], [13.540393507550785, 14.36713369390122], [13.956698846094124, 13.996691189016925], [13.954476759505607, 13.353448798063765], [14.595781284247604, 13.330426947477859], [14.495787387762899, 12.859396267137353], [14.213530714584746, 12.80203542729333], [14.181336297266906, 12.483656927943169], [13.995352817448289, 12.4615652531383], [13.318701613018558, 13.55635630945795], [13.083987257548809, 13.596147162322492], [12.302071160540546, 13.037189032437535], [11.527803175511504, 13.328980007373556], [10.989593133191532, 13.387322699431191], [10.701031935273816, 13.246917832894038], [10.114814487354748, 13.277251898649464], [9.524928012743088, 12.85110219975456], [9.014933302454436, 12.826659247280414], [7.804671258178869, 13.343526923063731], [7.330746697630046, 13.098038031461213], [6.82044192874781, 13.115091254117598], [6.445426059605721, 13.492768459522718], [5.443058302440135, 13.865923977102225], [4.368343540066006, 13.747481594289408], [4.107945997747378, 13.531215725147941], [3.967282749048933, 12.956108710171574], [3.680633579125924, 12.552903347214167], [3.611180454125587, 11.660167141155965], [2.848643019226585, 12.235635891158207], [2.490163608418015, 12.233052069543588], [2.154473504249949, 11.940150051313422]]] } },
+            { "type": "Feature", "properties": { "admin": "Nigeria", "name": "Nigeria", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[8.500287713259693, 4.771982937026847], [7.462108188515939, 4.41210826254624], [7.082596469764438, 4.464689032403228], [6.698072137080598, 4.240594183769516], [5.898172641634686, 4.262453314628984], [5.362804803090881, 4.887970689305957], [5.033574252959368, 5.611802476418233], [4.325607130560683, 6.270651149923466], [3.574180128604552, 6.258300482605717], [2.691701694356254, 6.258817246928628], [2.74906253420022, 7.870734361192886], [2.723792758809509, 8.506845404489708], [2.912308383810255, 9.13760793704432], [3.220351596702101, 9.4441525333997], [3.705438266625918, 10.063210354040207], [3.600070021182801, 10.332186184119406], [3.797112257511713, 10.734745591673104], [3.572216424177469, 11.327939357951516], [3.611180454125558, 11.660167141155966], [3.68063357912581, 12.552903347214222], [3.967282749048848, 12.956108710171572], [4.107945997747321, 13.531215725147829], [4.368343540066063, 13.747481594289324], [5.443058302440163, 13.865923977102295], [6.445426059605636, 13.492768459522676], [6.820441928747753, 13.115091254117514], [7.330746697630017, 13.098038031461199], [7.804671258178784, 13.343526923063745], [9.014933302454462, 12.826659247280427], [9.524928012742945, 12.851102199754477], [10.114814487354689, 13.277251898649409], [10.701031935273702, 13.246917832894081], [10.989593133191532, 13.387322699431108], [11.527803175511393, 13.328980007373584], [12.302071160540521, 13.037189032437521], [13.083987257548866, 13.596147162322563], [13.318701613018558, 13.556356309457824], [13.995352817448346, 12.461565253138343], [14.181336297266792, 12.483656927943112], [14.57717776862253, 12.085360826053501], [14.468192172918974, 11.90475169519341], [14.415378859116682, 11.572368882692071], [13.572949659894558, 10.798565985553564], [13.308676385153914, 10.160362046748926], [13.1675997249971, 9.64062632897341], [12.955467970438971, 9.417771714714702], [12.753671502339214, 8.717762762888993], [12.218872104550597, 8.305824082874322], [12.063946160539556, 7.799808457872301], [11.839308709366801, 7.397042344589434], [11.745774366918509, 6.981382961449753], [11.058787876030349, 6.644426784690593], [10.497375115611417, 7.055357774275562], [10.118276808318255, 7.038769639509879], [9.522705926154398, 6.453482367372116], [9.233162876023043, 6.444490668153334], [8.757532993208626, 5.47966583904791], [8.500287713259693, 4.771982937026847]]] } },
+            { "type": "Feature", "properties": { "admin": "Nicaragua", "name": "Nicaragua", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-85.712540452807289, 11.088444932494822], [-86.058488328785245, 11.40343862552994], [-86.525849982432931, 11.806876532432593], [-86.7459915839963, 12.143961900272483], [-87.167516242201131, 12.458257961471656], [-87.668493415054698, 12.909909979702629], [-87.557466600275603, 13.064551703336061], [-87.392386237319201, 12.914018256069836], [-87.316654425795463, 12.984685777228972], [-87.005769009127562, 13.025794379117157], [-86.880557013684339, 13.254204209847241], [-86.733821784191576, 13.263092556201441], [-86.755086636079696, 13.754845485890909], [-86.520708177419877, 13.778487453664436], [-86.312142096689911, 13.771356106008167], [-86.096263800790581, 14.038187364147245], [-85.801294725268576, 13.836054999237586], [-85.698665330736901, 13.960078436738083], [-85.514413011400222, 14.079011745657834], [-85.165364549484792, 14.354369615125076], [-85.148750576502948, 14.560196844943615], [-85.052787441736925, 14.551541042534719], [-84.924500698572388, 14.790492865452348], [-84.820036790694346, 14.819586696832669], [-84.649582078779602, 14.66680532476175], [-84.449335903648588, 14.621614284722494], [-84.228341640952394, 14.748764146376654], [-83.975721401693576, 14.749435939996458], [-83.628584967772895, 14.880073960830298], [-83.489988776366104, 15.016267198135534], [-83.147219000974104, 14.995829169164109], [-83.233234422523907, 14.8998660343981], [-83.28416154654758, 14.676623846897197], [-83.182126430987267, 14.310703029838447], [-83.412499966144424, 13.970077826386554], [-83.519831916014667, 13.56769928634588], [-83.55220720084553, 13.127054348193084], [-83.498515387694255, 12.869292303921226], [-83.473323126951968, 12.419087225794424], [-83.626104499022887, 12.320850328007563], [-83.719613003255034, 11.893124497927724], [-83.650857510090702, 11.629032090700116], [-83.855470343750369, 11.373311265503785], [-83.808935716471538, 11.103043524617274], [-83.655611741861563, 10.938764146361418], [-83.895054490885926, 10.726839097532444], [-84.190178595704822, 10.793450018756671], [-84.355930752281026, 10.999225572142901], [-84.673069017256239, 11.082657172078139], [-84.903003302738924, 10.952303371621895], [-85.561851976244171, 11.217119248901593], [-85.712540452807289, 11.088444932494822]]] } },
+            { "type": "Feature", "properties": { "admin": "Netherlands", "name": "Netherlands", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[6.074182570020922, 53.51040334737813], [6.905139601274128, 53.482162177130633], [7.092053256873895, 53.14404328064488], [6.842869500362381, 52.228440253297542], [6.589396599970825, 51.85202912048338], [5.988658074577812, 51.85161570902504], [6.156658155958779, 50.803721015010574], [5.60697594567, 51.037298488969768], [4.973991326526913, 51.475023708698124], [4.047071160507527, 51.267258612668556], [3.314971144228536, 51.345755113319903], [3.830288527043137, 51.620544542031936], [4.705997348661184, 53.091798407597757], [6.074182570020922, 53.51040334737813]]] } },
+            { "type": "Feature", "properties": { "admin": "Norway", "name": "Norway", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[28.165547316202911, 71.185474351680497], [31.293418409965472, 70.453787746859902], [30.005435011522785, 70.186258856884876], [31.101078728975118, 69.558080145944857], [29.399580519332879, 69.156916002063056], [28.591929559043187, 69.064776923286686], [29.015572950971968, 69.76649119737796], [27.732292107867885, 70.164193020296281], [26.179622023226298, 69.825298977326142], [25.689212680776389, 69.092113755968995], [24.735679152126714, 68.649556789821432], [23.662049594830759, 68.891247463650515], [22.356237827247405, 68.841741441514941], [21.244936150810723, 69.370443020293109], [20.645592889089581, 69.106247260200846], [20.02526899585791, 69.065138658312705], [19.878559604581248, 68.407194322372604], [17.993868442464386, 68.567391262477329], [17.729181756265344, 68.01055186631622], [16.768878614985535, 68.013936672631374], [16.108712192456832, 67.302455552836889], [15.108411492583055, 66.193866889095418], [13.555689731509087, 64.787027696381458], [13.919905226302202, 64.445420640716108], [13.571916131248766, 64.049114081469654], [12.57993533697393, 64.066218980558332], [11.930569288794228, 63.128317572676977], [11.992064243221531, 61.800362453856557], [12.63114668137524, 61.293571682370079], [12.300365838274896, 60.117932847730046], [11.468271925511173, 59.432393296945989], [11.027368605196925, 58.856149400459394], [10.356556837616095, 59.469807033925363], [8.382000359743641, 58.313288479233265], [7.048748406613297, 58.078884182357271], [5.665835402050418, 58.588155422593658], [5.308234490590733, 59.663231919993805], [4.992078077829005, 61.97099803328426], [5.912900424837885, 62.614472968182682], [8.553411085655766, 63.454008287196459], [10.527709181366784, 64.486038316497471], [12.358346795306371, 65.879725857193151], [14.7611458675816, 67.810641587995121], [16.435927361728968, 68.563205471461671], [19.184028354578512, 69.817444159617807], [21.378416375420606, 70.255169379346043], [23.02374230316158, 70.202071845166259], [24.546543409938515, 71.030496731237221], [26.370049676221807, 70.986261705195361], [28.165547316202911, 71.185474351680497]]], [[[24.72412, 77.85385], [22.49032, 77.44493], [20.72601, 77.67704], [21.41611, 77.93504], [20.8119, 78.25463], [22.88426, 78.45494], [23.28134, 78.07954], [24.72412, 77.85385]]], [[[18.25183, 79.70175], [21.54383, 78.95611], [19.02737, 78.5626], [18.47172, 77.82669], [17.59441, 77.63796], [17.1182, 76.80941], [15.91315, 76.77045], [13.76259, 77.38035], [14.66956, 77.73565], [13.1706, 78.02493], [11.22231, 78.8693], [10.44453, 79.65239], [13.17077, 80.01046], [13.71852, 79.66039], [15.14282, 79.67431], [15.52255, 80.01608], [16.99085, 80.05086], [18.25183, 79.70175]]], [[[25.447625359811887, 80.407340399894494], [27.407505730913492, 80.056405748200447], [25.924650506298171, 79.517833970854539], [23.024465773213613, 79.40001170522909], [20.075188429451877, 79.566823228667232], [19.897266473070907, 79.842361965647498], [18.46226362475792, 79.859880276194403], [17.368015170977454, 80.318896186027004], [20.455992059010693, 80.598155626132225], [21.907944777115397, 80.357679348462071], [22.919252557067431, 80.657144273593488], [25.447625359811887, 80.407340399894494]]]] } },
+            { "type": "Feature", "properties": { "admin": "Nepal", "name": "Nepal", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[88.120440708369841, 27.876541652939586], [88.043132765661198, 27.445818589786818], [88.174804315140904, 26.810405178325944], [88.060237664749806, 26.414615383402484], [87.22747195836628, 26.39789805755607], [86.024392938179147, 26.630984605408567], [85.25177859898335, 26.726198431906337], [84.675017938173767, 27.234901231387528], [83.304248895199535, 27.364505723575554], [81.999987420584958, 27.925479234319987], [81.057202589851997, 28.416095282499036], [80.088424513676259, 28.794470119740136], [80.476721225917373, 29.729865220655334], [81.11125613802929, 30.183480943313398], [81.525804477874729, 30.422716986608627], [82.327512648450863, 30.115268052688126], [83.337115106137176, 29.463731594352193], [83.898992954446712, 29.320226141877654], [84.234579705750136, 28.839893703724691], [85.011638218123025, 28.642773952747337], [85.823319940131498, 28.203575954698699], [86.954517043000592, 27.97426178640351], [88.120440708369841, 27.876541652939586]]] } },
+            { "type": "Feature", "properties": { "admin": "New Zealand", "name": "New Zealand", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[173.020374790740703, -40.919052422856417], [173.247234328502003, -41.331998793300777], [173.958405389702875, -40.926700534835604], [174.2475867048081, -41.349155368821663], [174.248516880589449, -41.770008233406749], [173.876446568087886, -42.233184096038819], [173.222739699595621, -42.970038344088557], [172.711246372770717, -43.372287693048492], [173.080112746470206, -43.853343601253577], [172.308583612352464, -43.865694268571332], [171.452925246463622, -44.24251881284372], [171.185137974327233, -44.897104180684885], [170.616697219116588, -45.908928724959701], [169.83142215400926, -46.355774834987585], [169.332331170934253, -46.641235446967848], [168.411353794628525, -46.619944756863582], [167.763744745146823, -46.290197442409195], [166.676886021184202, -46.219917494492236], [166.509144321964669, -45.852704766626204], [167.046424188503238, -45.110941257508664], [168.303763462596862, -44.12397307716612], [168.949408807651508, -43.93581918719142], [169.667814569373149, -43.555325616226334], [170.524919875366152, -43.031688327812823], [171.125089960004004, -42.512753594737781], [171.569713983443194, -41.767424411792128], [171.948708937871885, -41.514416599291145], [172.097227004278722, -40.956104424809674], [172.798579543343948, -40.493962090823466], [173.020374790740703, -40.919052422856417]]], [[[174.612008905330526, -36.156397393540537], [175.336615838927173, -37.209097995758263], [175.3575964704375, -36.52619394302112], [175.808886753642469, -36.798942152657681], [175.958490025127475, -37.555381768546063], [176.763195428776555, -37.881253350578696], [177.438813104560495, -37.961248467766488], [178.010354445708657, -37.579824721020124], [178.517093540762801, -37.695373223624792], [178.274731073313802, -38.582812595373092], [177.970460239979332, -39.166342868812968], [177.206992629299123, -39.145775648760839], [176.939980503647007, -39.449736423501562], [177.032946405340113, -39.879942722331471], [176.8858236026052, -40.06597787858216], [176.508017206119348, -40.60480803808958], [176.012440220440283, -41.289624118821493], [175.239567499082966, -41.688307793953236], [175.067898391009408, -41.425894870775075], [174.650972935278418, -41.281820977545443], [175.227630243223615, -40.459235528323397], [174.900156691789959, -39.908933200847216], [173.824046665743992, -39.508854262043506], [173.852261997775315, -39.146602471677461], [174.57480187408035, -38.797683200842748], [174.743473749081033, -38.027807712558378], [174.69701663645057, -37.381128838857954], [174.292028436579187, -36.71109221776144], [174.319003534235549, -36.534823907213884], [173.840996535535766, -36.121980889634109], [173.05417117745958, -35.237125339500331], [172.636005487353714, -34.529106540669382], [173.007042271209457, -34.450661716450334], [173.551298456107475, -35.006183363587958], [174.329390497126241, -35.265495700828616], [174.612008905330526, -36.156397393540537]]]] } },
+            { "type": "Feature", "properties": { "admin": "Oman", "name": "Oman", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[58.861141391846573, 21.114034532144299], [58.487985874266961, 20.428985907467101], [58.03431847517659, 20.481437486243347], [57.826372511634098, 20.24300242764863], [57.66576216007094, 19.736004950433109], [57.788700392493368, 19.067570298737646], [57.694390903560667, 18.944709580963799], [57.2342639504338, 18.947991034414255], [56.609650913321971, 18.574267076079476], [56.512189162019482, 18.087113348863934], [56.283520949128011, 17.876066799383945], [55.661491733630683, 17.884128322821535], [55.269939406155189, 17.632309068263194], [55.274900343655091, 17.228354397037659], [54.791002231674113, 16.950696926333357], [54.239252964093751, 17.04498057704998], [53.57050825380459, 16.707662665264674], [53.108572625547502, 16.651051133688977], [52.782184279192066, 17.349742336491229], [52.000009800022227, 19.000003363516068], [54.999981723862405, 19.999994004796118], [55.666659376859869, 22.000001125572307], [55.208341098863187, 22.708329982997007], [55.234489373602869, 23.110992743415348], [55.52584109886449, 23.524869289640911], [55.528631626208288, 23.933604030853498], [55.981213820220503, 24.130542914317854], [55.80411868675624, 24.269604193615287], [55.88623253766805, 24.920830593357486], [56.396847365143984, 24.924732163995508], [56.845140415276049, 24.241673081961487], [57.403452589757428, 23.878594468678834], [58.136947869708322, 23.747930609628835], [58.729211460205427, 23.565667832935414], [59.180501743410346, 22.992395331305456], [59.450097690677033, 22.660270900965592], [59.80806033716285, 22.533611965418199], [59.806148309168087, 22.31052480721419], [59.442191196536399, 21.71454051359208], [59.282407667889871, 21.433885809814875], [58.861141391846573, 21.114034532144299]]], [[[56.391421339753393, 25.895990708921254], [56.261041701080913, 25.714606431576748], [56.070820753814544, 26.055464178973946], [56.362017449779344, 26.395934353128947], [56.485679152253809, 26.309117946878665], [56.391421339753393, 25.895990708921254]]]] } },
+            { "type": "Feature", "properties": { "admin": "Pakistan", "name": "Pakistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[75.158027785140902, 37.13303091078911], [75.896897414050116, 36.666806138651829], [76.192848341785677, 35.898403428687821], [77.837450799474553, 35.494009507787759], [76.871721632804011, 34.653544012992732], [75.757060988268321, 34.504922593721311], [74.240202671204955, 34.748887030571247], [73.749948358051952, 34.317698879527846], [74.104293654277328, 33.441473293586846], [74.451559279278698, 32.764899603805489], [75.258641798813187, 32.271105455040491], [74.405928989564998, 31.692639471965272], [74.421380242820263, 30.97981476493117], [73.450638462217412, 29.976413479119863], [72.823751662084689, 28.961591701772047], [71.777665643200308, 27.913180243434521], [70.61649620960192, 27.989196275335861], [69.514392938113119, 26.940965684511365], [70.168926629522005, 26.491871649678835], [70.282873162725579, 25.722228705339823], [70.844699334602822, 25.215102037043511], [71.0432401874682, 24.356523952730193], [68.842599318318761, 24.359133612560932], [68.176645135373377, 23.691965033456704], [67.443666619745457, 23.944843654876983], [67.145441928989058, 24.663611151624639], [66.37282758979326, 25.425140896093847], [64.530407749291115, 25.237038682551425], [62.905700718034595, 25.218409328710202], [61.497362908784183, 25.078237006118492], [61.874187453056535, 26.239974880472097], [63.316631707619578, 26.756532497661659], [63.23389773952028, 27.217047024030702], [62.755425652929851, 27.378923448184985], [62.727830438085974, 28.259644883735383], [61.771868117118615, 28.699333807890792], [61.369308709564926, 29.303276272085917], [60.874248488208778, 29.829238999952604], [62.549856805272775, 29.318572496044304], [63.550260858011164, 29.468330796826162], [64.148002150331237, 29.340819200145965], [64.350418735618504, 29.560030625928089], [65.046862013616092, 29.472180691031902], [66.346472609324408, 29.88794342703617], [66.38145755398601, 30.738899237586448], [66.938891229118454, 31.304911200479346], [67.683393589147457, 31.303154201781414], [67.792689243444769, 31.582930406209623], [68.556932000609308, 31.713310044882011], [68.926676873657655, 31.620189113892064], [69.317764113242546, 31.901412258424436], [69.262522007122541, 32.501944078088293], [69.687147251264847, 33.105498969041228], [70.323594191371583, 33.358532619758385], [69.93054324735958, 34.020120144175102], [70.881803012988385, 33.988855902638512], [71.156773309213449, 34.348911444632144], [71.115018751921625, 34.733125718722228], [71.613076206350698, 35.153203436822857], [71.498767938121077, 35.650563259415996], [71.262348260385735, 36.074387518857797], [71.846291945283909, 36.509942328429851], [72.920024855444453, 36.720007025696312], [74.067551710917812, 36.836175645488446], [74.575892775372964, 37.02084137628345], [75.158027785140902, 37.13303091078911]]] } },
+            { "type": "Feature", "properties": { "admin": "Panama", "name": "Panama", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-77.881571417945239, 7.223771267114783], [-78.214936082660103, 7.512254950384159], [-78.429160732726061, 8.052041123888925], [-78.182095709938608, 8.319182440621772], [-78.43546525746568, 8.387705389840788], [-78.622120530903928, 8.718124497915026], [-79.120307176413732, 8.996092027213022], [-79.557877366845176, 8.932374986197145], [-79.760578172510037, 8.584515082224398], [-80.164481167303322, 8.333315944853593], [-80.382659064439608, 8.29840851484043], [-80.480689256497286, 8.090307522001067], [-80.003689948227148, 7.54752411542337], [-80.276670701808982, 7.419754136581713], [-80.421158006497066, 7.271571966984763], [-80.886400926420791, 7.220541490096535], [-81.059542812814698, 7.817921047390596], [-81.189715745757937, 7.647905585150339], [-81.519514736644666, 7.706610012233908], [-81.721311204744453, 8.108962714058434], [-82.131441209628889, 8.175392767769635], [-82.390934414382542, 8.292362372262287], [-82.820081346350406, 8.290863755725821], [-82.850958014644803, 8.073822740099954], [-82.965783047197348, 8.225027980985983], [-82.9131764391242, 8.423517157419068], [-82.829770677405151, 8.626295477732368], [-82.868657192704759, 8.807266343618521], [-82.719183112300513, 8.925708726431493], [-82.927154914059145, 9.074330145702914], [-82.932890998043561, 9.476812038608172], [-82.546196255203469, 9.566134751824674], [-82.187122565423394, 9.207448635286779], [-82.207586432610952, 8.995575262890098], [-81.808566860669259, 8.95061676679617], [-81.714154018872023, 9.031955471223581], [-81.43928707551153, 8.786234035675715], [-80.947301601876745, 8.858503526235905], [-80.521901211250054, 9.11107208906243], [-79.914599778955974, 9.312765204297618], [-79.573302781884294, 9.611610012241526], [-79.021191779277913, 9.552931423374103], [-79.058450486960353, 9.454565334506523], [-78.500887620747164, 9.420458889193879], [-78.055927700497989, 9.247730414258296], [-77.729513515926399, 8.946844387238867], [-77.353360765273848, 8.670504665558068], [-77.474722866511314, 8.524286200388216], [-77.242566494440069, 7.935278225125442], [-77.431107957656977, 7.638061224798733], [-77.75341386586139, 7.709839789252141], [-77.881571417945239, 7.223771267114783]]] } },
+            { "type": "Feature", "properties": { "admin": "Peru", "name": "Peru", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-69.590423753524036, -17.580011895419329], [-69.858443569605839, -18.092693780187009], [-70.3725723944777, -18.347975355708861], [-71.375250210236914, -17.77379851651385], [-71.462040778271117, -17.363487644116379], [-73.444529588500401, -16.359362888252992], [-75.23788265654143, -15.26568287522778], [-76.009205084929931, -14.649286390850317], [-76.423469204397733, -13.823186944232431], [-76.259241502574156, -13.535039157772939], [-77.10619238962181, -12.222716159720816], [-78.092152879534623, -10.377712497604062], [-79.036953091126918, -8.38656788496589], [-79.445920376284832, -7.930833428583859], [-79.760578172510037, -7.194340915560081], [-80.537481655586049, -6.541667575713715], [-81.249996304026411, -6.136834405139182], [-80.926346808582423, -5.690556735866563], [-81.410942552399433, -4.736764825055459], [-81.099669562489353, -4.036394138203696], [-80.302560594387188, -3.404856459164712], [-80.184014858709645, -3.821161797708043], [-80.46929460317692, -4.059286797708999], [-80.442241990872134, -4.425724379090673], [-80.028908047185581, -4.346090996928893], [-79.62497921417615, -4.454198093283494], [-79.205289069317715, -4.959128513207388], [-78.639897223612323, -4.547784112164072], [-78.450683966775628, -3.873096612161375], [-77.83790483265858, -3.003020521663103], [-76.635394253226707, -2.608677666843817], [-75.544995693652027, -1.56160979574588], [-75.233722703741932, -0.911416924649529], [-75.373223232713841, -0.15203175212045], [-75.106624518520064, -0.05720549886486], [-74.441600511355958, -0.530820000819887], [-74.122395189089048, -1.002832533373848], [-73.659503546834586, -1.260491224781134], [-73.070392218707212, -2.308954359550952], [-72.325786505813639, -2.434218031426453], [-71.774760708285385, -2.169789727388937], [-71.413645799429773, -2.342802422702128], [-70.813475714791949, -2.256864515800742], [-70.047708502874841, -2.725156345229699], [-70.692682054309699, -3.742872002785858], [-70.394043952094975, -3.766591485207825], [-69.893635219996611, -4.298186944194326], [-70.79476884630229, -4.251264743673302], [-70.928843349883564, -4.401591485210367], [-71.748405727816532, -4.59398284263301], [-72.891927659787243, -5.274561455916979], [-72.964507208941185, -5.741251315944892], [-73.219711269814596, -6.089188734566076], [-73.120027431923575, -6.629930922068238], [-73.724486660441627, -6.918595472850638], [-73.723401455363486, -7.340998630404412], [-73.987235480429646, -7.523829847853063], [-73.571059332967053, -8.424446709835832], [-73.015382656532537, -9.03283334720806], [-73.226713426390148, -9.462212823121233], [-72.563033006465631, -9.520193780152715], [-72.184890713169821, -10.05359791426943], [-71.302412278921523, -10.079436130415372], [-70.481893886991159, -9.490118096558842], [-70.548685675728393, -11.009146823778462], [-70.093752204046879, -11.123971856331011], [-69.52967810736493, -10.951734307502193], [-68.665079718689611, -12.561300144097171], [-68.880079515239956, -12.89972909917665], [-68.929223802349526, -13.602683607643007], [-68.94888668483658, -14.45363941819328], [-69.339534674747, -14.953195489158828], [-69.160346645774936, -15.323973890853015], [-69.389764166934697, -15.66012908291165], [-68.959635382753291, -16.500697930571267], [-69.590423753524036, -17.580011895419329]]] } },
+            { "type": "Feature", "properties": { "admin": "Philippines", "name": "Philippines", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[126.376813592637447, 8.414706325713352], [126.478512811387873, 7.750354112168976], [126.537423944200611, 7.189380601424572], [126.19677290253253, 6.274294338400038], [125.831420526229081, 7.293715318221855], [125.363852166852283, 6.78648529706099], [125.683160841983707, 6.049656887227257], [125.396511672060626, 5.581003322772288], [124.219787632342332, 6.16135549562618], [123.938719517106918, 6.88513560630612], [124.243662144061318, 7.360610459823659], [123.610212437027542, 7.833527329942753], [123.29607140512519, 7.418875637232786], [122.825505812675388, 7.457374579290216], [122.085499302255769, 6.899424139834847], [121.919928013192603, 7.192119452336072], [122.312358840017112, 8.034962063016506], [122.94239790251963, 8.316236883981174], [123.487687616063511, 8.693009751821192], [123.841154412939815, 8.240324204944384], [124.6014697612502, 8.514157619659015], [124.764612257995623, 8.960409450715458], [125.471390822451539, 8.986996975129641], [125.412117954612754, 9.760334784377545], [126.222714471543156, 9.28607432701885], [126.306636997585073, 8.782487494334573], [126.376813592637447, 8.414706325713352]]], [[[123.982437778825798, 10.278778591345811], [123.62318322153277, 9.950090643753297], [123.309920688979332, 9.318268744336676], [122.995883009941636, 9.022188625520398], [122.380054966319463, 9.713360907424201], [122.586088901867072, 9.981044826696104], [122.837081333508706, 10.261156927934234], [122.947410516451896, 10.881868394408029], [123.498849725438447, 10.940624497923945], [123.337774285984722, 10.267383938025445], [124.077935825701218, 11.232725531453706], [123.982437778825798, 10.278778591345811]]], [[[118.504580926590336, 9.316382554558087], [117.174274530100675, 8.367499904814663], [117.664477166821371, 9.066888739452933], [118.386913690261736, 9.684499619989223], [118.98734215706105, 10.376292019080507], [119.511496209797528, 11.36966807702721], [119.689676548339889, 10.554291490109872], [119.029458449378978, 10.003653265823869], [118.504580926590336, 9.316382554558087]]], [[[121.883547804859106, 11.891755072471977], [122.483821242361458, 11.582187404827506], [123.120216506035959, 11.583660183147867], [123.100837843926442, 11.165933742716486], [122.637713657726692, 10.741308498574226], [122.002610304859559, 10.441016750526087], [121.967366978036523, 10.905691229694622], [122.038370396005519, 11.415840969280039], [121.883547804859106, 11.891755072471977]]], [[[125.502551711123488, 12.162694606978347], [125.783464797062152, 11.046121934447767], [125.01188398651226, 11.311454576050377], [125.032761265158115, 10.975816148314703], [125.277449172060244, 10.358722032101308], [124.801819289245714, 10.134678859899889], [124.760168084818474, 10.8379951033923], [124.459101190286049, 10.889929917845633], [124.302521600441722, 11.495370998577227], [124.891012811381572, 11.415582587118589], [124.877990350443952, 11.794189968304988], [124.266761509295705, 12.557760931849682], [125.22711632700782, 12.53572093347719], [125.502551711123488, 12.162694606978347]]], [[[121.527393833503481, 13.069590155484516], [121.262190382981544, 12.2055602075644], [120.833896112146533, 12.704496161342416], [120.323436313967477, 13.466413479053866], [121.18012820850214, 13.429697373910439], [121.527393833503481, 13.069590155484516]]], [[[121.321308221523566, 18.504064642811013], [121.937601353036371, 18.21855235439838], [122.246006300954264, 18.478949896717094], [122.336956821787965, 18.224882717354173], [122.174279412933174, 17.810282701076371], [122.51565392465335, 17.09350474697197], [122.252310825693883, 16.262444362854122], [121.662786086108255, 15.931017564350125], [121.505069614753367, 15.124813544164621], [121.728828566577249, 14.328376369682244], [122.258925409027313, 14.218202216035973], [122.701275669445636, 14.336541245984417], [123.950295037940236, 13.782130642141066], [123.855107049658599, 13.237771104378464], [124.181288690284873, 12.997527370653469], [124.077419061378222, 12.536676947474573], [123.298035109552245, 13.027525539598981], [122.928651971529902, 13.552919826710404], [122.671355015148663, 13.185836289925131], [122.034649692880521, 13.784481919810343], [121.126384718918587, 13.636687323455559], [120.628637323083296, 13.857655747935649], [120.679383579593832, 14.271015529838319], [120.99181928923052, 14.525392767795079], [120.693336216312687, 14.756670640517282], [120.564145135582976, 14.396279201713821], [120.070428501466367, 14.970869452367094], [119.920928582846102, 15.406346747290735], [119.883773228028247, 16.363704331929963], [120.286487664878791, 16.034628811095327], [120.39004723519173, 17.599081122299506], [120.7158671407919, 18.505227362537536], [121.321308221523566, 18.504064642811013]]]] } },
+            { "type": "Feature", "properties": { "admin": "Papua New Guinea", "name": "Papua New Guinea", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[155.880025669578401, -6.819996840037758], [155.599991082988765, -6.919990736522491], [155.166994256815087, -6.535931491729299], [154.729191522438327, -5.900828138862208], [154.514114211239644, -5.139117526880012], [154.652503696917336, -5.042430922061839], [154.759990676084357, -5.339983819198493], [155.062917922179338, -5.566791680527486], [155.547746209941693, -6.200654799019658], [156.019965448224752, -6.540013929880386], [155.880025669578401, -6.819996840037758]]], [[[151.982795851854462, -5.478063246282344], [151.459106887008659, -5.560280450058739], [151.301390415653884, -5.840728448106701], [150.754447056276661, -6.083762709175387], [150.241196730753813, -6.317753594592984], [149.709963006793316, -6.316513360218051], [148.890064732050462, -6.026040134305432], [148.318936802360696, -5.74714242922613], [148.401825799756864, -5.437755629094722], [149.298411900020824, -5.583741550319216], [149.845561965127217, -5.505503431829339], [149.996250441690279, -5.026101169457674], [150.139755894164921, -5.001348158389788], [150.236907586873485, -5.53222014732428], [150.807467075808063, -5.455842380396886], [151.089672072553981, -5.113692722192368], [151.647880894170811, -4.757073662946168], [151.537861769821518, -4.167807305521889], [152.136791620084352, -4.148790378438519], [152.338743117480988, -4.31296640382976], [152.318692661751754, -4.867661228050748], [151.982795851854462, -5.478063246282344]]], [[[147.191873814074938, -7.388024183789978], [148.084635858349372, -8.044108168167609], [148.734105259393573, -9.104663588093755], [149.306835158484432, -9.071435642130067], [149.266630894161324, -9.514406019736027], [150.038728469034311, -9.684318129111698], [149.738798456012262, -9.872937106977002], [150.801627638959133, -10.29368661869742], [150.690574985963849, -10.582712904505865], [150.028393182575826, -10.652476088099929], [149.782310012001972, -10.393267103723941], [148.923137648717216, -10.28092253992136], [147.913018426707993, -10.130440769087469], [147.135443150012236, -9.492443536012017], [146.567880894150619, -8.942554619994153], [146.048481073184917, -8.067414239131308], [144.74416792213799, -7.630128269077473], [143.897087844009661, -7.915330498896279], [143.286375767184268, -8.245491224809056], [143.413913202080664, -8.983068942910945], [142.628431431244223, -9.326820570516501], [142.068258905200196, -9.159595635620034], [141.033851760013874, -9.117892754760417], [141.017056919519007, -5.85902190513802], [141.000210402591847, -2.600151055515624], [142.735246616791443, -3.289152927263216], [144.583970982033236, -3.861417738463401], [145.27317955950997, -4.373737888205027], [145.829786411725649, -4.876497897972683], [145.981921828392956, -5.465609226100012], [147.648073358347574, -6.083659356310803], [147.891107619416175, -6.614014580922315], [146.970905389594861, -6.721656589386255], [147.191873814074938, -7.388024183789978]]], [[[153.14003787659874, -4.499983412294113], [152.827292108368255, -4.766427097190998], [152.63867313050298, -4.176127211120927], [152.406025832324929, -3.789742526874561], [151.953236932583536, -3.462062269711821], [151.384279413050024, -3.035421644710111], [150.6620495953388, -2.741486097833956], [150.939965448204532, -2.500002129734028], [151.479984165654514, -2.779985039891386], [151.820015090135087, -2.999971612157907], [152.239989455371074, -3.24000864015366], [152.640016717742526, -3.659983005389647], [153.019993524384631, -3.980015150573293], [153.14003787659874, -4.499983412294113]]]] } },
+            { "type": "Feature", "properties": { "admin": "Poland", "name": "Poland", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[15.016995883858666, 51.106674099321566], [14.607098422919531, 51.745188096719964], [14.685026482815685, 52.089947414755187], [14.437599725002197, 52.624850165408382], [14.074521111719488, 52.981262518925426], [14.353315463934136, 53.248171291712957], [14.119686313542584, 53.757029120491026], [14.802900424873455, 54.050706285205735], [16.363477003655728, 54.513158677785711], [17.622831658608671, 54.851535956432897], [18.620858595461637, 54.682605699270766], [18.696254510175461, 54.438718777069276], [19.6606400896064, 54.426083889373913], [20.89224450041862, 54.312524929412518], [22.731098667092649, 54.327536932993311], [23.243987257589506, 54.220566718149129], [23.484127638449841, 53.912497667041123], [23.527535841574995, 53.47012156840654], [23.804934930117774, 53.08973135030606], [23.799198846133375, 52.691099351606553], [23.19949384938618, 52.486977444053664], [23.508002150168689, 52.023646552124717], [23.52707075368437, 51.578454087930233], [24.029985792748899, 50.705406602575174], [23.922757195743259, 50.424881089878738], [23.426508416444388, 50.308505764357449], [22.518450148211596, 49.476773586619736], [22.776418898212619, 49.027395331409608], [22.558137648211751, 49.08573802346713], [21.607808058364206, 49.470107326854077], [20.887955356538406, 49.328772284535823], [20.415839471119849, 49.431453355499755], [19.825022820726865, 49.217125352569219], [19.320712517990469, 49.571574001659179], [18.909574822676316, 49.435845852244562], [18.85314415861361, 49.496229763377634], [18.392913852622168, 49.988628648470737], [17.649445021238986, 50.049038397819942], [17.554567091551117, 50.36214590107641], [16.868769158605655, 50.473973700556016], [16.719475945714429, 50.215746568393527], [16.176253289462263, 50.4226073268579], [16.238626743238566, 50.697732652379827], [15.490972120839725, 50.7847299261432], [15.016995883858666, 51.106674099321566]]] } },
+            { "type": "Feature", "properties": { "admin": "Puerto Rico", "name": "Puerto Rico", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-66.2824344550082, 18.51476166429536], [-65.771302863209286, 18.426679185453875], [-65.591003790942935, 18.228034979723912], [-65.847163865813755, 17.975905666571855], [-66.599934455009475, 17.98182261806927], [-67.184162360285256, 17.946553453030074], [-67.24242753769434, 18.374460150622934], [-67.100679083917726, 18.520601101144347], [-66.2824344550082, 18.51476166429536]]] } },
+            { "type": "Feature", "properties": { "admin": "North Korea", "name": "Dem. Rep. Korea", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[130.640015903852401, 42.39500946712527], [130.780007358931101, 42.220007229168843], [130.400030552288996, 42.280003567059701], [129.965948521037234, 41.941367906251052], [129.667362095254788, 41.601104437825221], [129.705189243692445, 40.882827867184318], [129.188114862179958, 40.661807766271984], [129.010399611528186, 40.485436102859801], [128.633368361526692, 40.189846910150301], [127.967414178581322, 40.025412502597547], [127.533435500194145, 39.756850083976694], [127.502119582225276, 39.323930772451526], [127.385434198110261, 39.213472398427648], [127.783342726757709, 39.050898342437414], [128.349716424676586, 38.612242946927843], [128.205745884311426, 38.370397243801882], [127.780035435090966, 38.304535630845884], [127.073308547067342, 38.256114813788393], [126.683719924018888, 37.804772854151174], [126.237338901881742, 37.840377916000271], [126.174758742376213, 37.749685777328033], [125.689103631697165, 37.940010077459014], [125.568439162295675, 37.752088731429616], [125.275330438336184, 37.66907054295271], [125.24008711151312, 37.857224432927424], [124.981033156433952, 37.948820909164773], [124.712160679219352, 38.108346055649783], [124.985994093933954, 38.548474229479673], [125.221948683778677, 38.665857245430665], [125.13285851450749, 38.848559271798578], [125.386589797060566, 39.387957872061158], [125.321115757346774, 39.551384589184202], [124.737482131042384, 39.660344346671614], [124.265624627785286, 39.928493353834149], [125.079941847840615, 40.569823716792442], [126.182045119329402, 41.107336127276362], [126.86908328664984, 41.816569322266176], [127.343782993682993, 41.50315176041596], [128.208433058790632, 41.466771552082477], [128.052215203972281, 41.994284572917934], [129.59666873587949, 42.424981797854542], [129.994267205933198, 42.985386867843779], [130.640015903852401, 42.39500946712527]]] } },
+            { "type": "Feature", "properties": { "admin": "Portugal", "name": "Portugal", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[-9.034817674180244, 41.880570583659669], [-8.671945766626719, 42.134689439454952], [-8.26385698081779, 42.280468654950326], [-8.01317460776991, 41.790886135417118], [-7.422512986673794, 41.792074693359822], [-7.251308966490822, 41.91834605566504], [-6.668605515967655, 41.883386949219577], [-6.389087693700914, 41.381815497394641], [-6.851126674822551, 41.111082668617513], [-6.864019944679383, 40.330871893874821], [-7.026413133156593, 40.184524237624238], [-7.066591559263527, 39.711891587882768], [-7.498632371439724, 39.629571031241802], [-7.098036668313126, 39.03007274022378], [-7.374092169616317, 38.373058580064914], [-7.029281175148794, 38.075764065089757], [-7.166507941099863, 37.803894354802217], [-7.537105475281022, 37.428904323876232], [-7.45372555177809, 37.097787583966053], [-7.855613165711985, 36.838268540996253], [-8.382816127953687, 36.978880113262449], [-8.898856980820325, 36.868809312480771], [-8.746101446965552, 37.6513455266766], [-8.839997524439879, 38.266243394517609], [-9.287463751655221, 38.358485826158592], [-9.526570603869713, 38.737429104154906], [-9.44698889814023, 39.392066148428363], [-9.048305223008425, 39.755093085278766], [-8.977353481471679, 40.159306138665798], [-8.7686840478771, 40.76063894303018], [-8.790853237330309, 41.18433401139125], [-8.990789353867568, 41.543459377603625], [-9.034817674180244, 41.880570583659669]]] } },
+            { "type": "Feature", "properties": { "admin": "Paraguay", "name": "Paraguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-62.685057135657871, -22.24902922942238], [-62.291179368729203, -21.051634616787389], [-62.265961269770784, -20.513734633061272], [-61.786326463453761, -19.633736667562957], [-60.043564622626477, -19.342746677327419], [-59.11504248720609, -19.356906019775398], [-58.183471442280492, -19.868399346600359], [-58.166392381408038, -20.176700941653674], [-57.870673997617786, -20.732687676681948], [-57.937155727761287, -22.090175876557169], [-56.881509568902885, -22.282153822521476], [-56.473317430229379, -22.086300144135279], [-55.797958136606894, -22.356929620047815], [-55.61068274598113, -22.655619398694839], [-55.517639329639621, -23.57199757252663], [-55.400747239795407, -23.956935316668797], [-55.027901780809543, -24.001273695575225], [-54.652834235235119, -23.839578138933955], [-54.292959560754511, -24.021014092710722], [-54.293476325077435, -24.570799655863958], [-54.428946092330577, -25.162184747012162], [-54.625290696823562, -25.739255466415507], [-54.788794928595038, -26.621785577096126], [-55.695845506398143, -27.387837009390857], [-56.486701626192989, -27.548499037386286], [-57.609759690976134, -27.395898532828383], [-58.618173590719735, -27.123718763947089], [-57.633660040911117, -25.603656508081638], [-57.777217169817924, -25.162339776309032], [-58.807128465394968, -24.771459242453307], [-60.028966030504016, -24.032796319273267], [-60.846564704009907, -23.880712579038288], [-62.685057135657871, -22.24902922942238]]] } },
+            { "type": "Feature", "properties": { "admin": "Palestine", "name": "Palestine", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[35.545665317534535, 32.393992011030569], [35.545251906076196, 31.782504787720832], [35.397560662586038, 31.489086005167572], [34.927408481594554, 31.35343537040141], [34.970506626125989, 31.616778469360803], [35.225891554512422, 31.754341132121759], [34.974640740709319, 31.866582343059715], [35.183930291491428, 32.532510687788935], [35.545665317534535, 32.393992011030569]]] } },
+            { "type": "Feature", "properties": { "admin": "Qatar", "name": "Qatar", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[50.810108270069563, 24.754742539971371], [50.743910760303677, 25.482424221289389], [51.01335167827348, 26.006991685484191], [51.286461622936045, 26.114582017515865], [51.589078810437243, 25.801112779233375], [51.606700473848804, 25.215670477798735], [51.389607781790623, 24.627385972588051], [51.112415398977006, 24.556330878186721], [50.810108270069563, 24.754742539971371]]] } },
+            { "type": "Feature", "properties": { "admin": "Romania", "name": "Romania", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.710531447040488, 47.882193915389394], [23.142236362406798, 48.096341050806942], [23.760958286237404, 47.985598456405448], [24.402056105250374, 47.981877753280422], [24.866317172960571, 47.737525743188307], [25.207743361112986, 47.891056423527459], [25.945941196402394, 47.987148749374207], [26.197450392366925, 48.220881252630342], [26.619336785597788, 48.220726223333457], [26.924176059687561, 48.123264472030982], [27.233872918412736, 47.826770941756365], [27.551166212684841, 47.405117092470817], [28.128030226359037, 46.81047638608824], [28.160017937947707, 46.371562608417207], [28.054442986775392, 45.944586086605618], [28.233553501099035, 45.488283189468369], [28.679779493939371, 45.30403087013169], [29.149724969201646, 45.464925442072442], [29.603289015427425, 45.293308010431119], [29.62654340995876, 45.035390936862392], [29.141611769331831, 44.820210272799038], [28.837857700320196, 44.913873806328041], [28.55808149589199, 43.707461656258118], [27.970107049275068, 43.812468166675202], [27.242399529740904, 44.175986029632398], [26.065158725699739, 43.943493760751259], [25.569271681426923, 43.688444729174712], [24.100679152124169, 43.741051337247846], [23.332302280376322, 43.897010809904707], [22.94483239105184, 43.823785305347123], [22.657149692482985, 44.234923000661276], [22.474008416440594, 44.409227606781762], [22.705725538837349, 44.578002834647016], [22.459022251075933, 44.702517198254291], [22.145087924902807, 44.478422349620573], [21.562022739353605, 44.768947251965486], [21.483526238702233, 45.181170152357772], [20.874312778413351, 45.416375433934228], [20.76217492033998, 45.734573065771428], [20.220192498462833, 46.127468980486547], [21.021952345471245, 46.316087958351886], [21.626514926853869, 46.994237779318148], [22.09976769378283, 47.672439276716695], [22.710531447040488, 47.882193915389394]]] } },
+            { "type": "Feature", "properties": { "admin": "Russia", "name": "Russia", "continent": "Europe" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[143.648007440362846, 50.747600409541512], [144.65414757708561, 48.976390692737581], [143.173927850517174, 49.306551418650365], [142.558668247650076, 47.861575018904908], [143.533492466404027, 46.836728013692479], [143.505277134372591, 46.137907619809475], [142.747700636973889, 46.740764878926562], [142.092030064054484, 45.966755276058777], [141.906925083585008, 46.805928860046535], [142.018442824470867, 47.780132961612921], [141.904444614835029, 48.859188544299563], [142.135800002205656, 49.615163072297449], [142.179983351815281, 50.952342434281903], [141.594075962490024, 51.935434882202529], [141.682546014573632, 53.301966457728767], [142.606934035410745, 53.762145087287891], [142.209748976815376, 54.225475979216853], [142.654786411712934, 54.365880845753864], [142.914615513276544, 53.704577541714734], [143.260847609632037, 52.740760403039033], [143.235267775647628, 51.756660264688733], [143.648007440362846, 50.747600409541512]]], [[[22.731098667092649, 54.327536932993311], [20.892244500418652, 54.312524929412568], [19.6606400896064, 54.42608388937397], [19.88848147958134, 54.866160386771483], [21.268448927503492, 55.190481675835279], [22.315723504330599, 55.015298570365886], [22.757763706155281, 54.856574408581416], [22.651051873472564, 54.582740993866693], [22.731098667092649, 54.327536932993311]]], [[[180.000000000000114, 70.832199208546669], [178.903425, 70.78114], [178.7253, 71.0988], [180.000000000000114, 71.515714336428246], [180.000000000000114, 70.832199208546669]]], [[[143.60385, 73.21244], [142.08763, 73.20544], [140.038155, 73.31692], [139.86312, 73.36983], [140.81171, 73.76506], [142.06207, 73.85758], [143.48283, 73.47525], [143.60385, 73.21244]]], [[[150.73167, 75.08406], [149.575925, 74.68892], [147.977465, 74.778355], [146.11919, 75.17298], [146.358485, 75.49682], [148.22223, 75.345845], [150.73167, 75.08406]]], [[[145.086285, 75.562625], [144.3, 74.82], [140.61381, 74.84768], [138.95544, 74.61148], [136.97439, 75.26167], [137.51176, 75.94917], [138.831075, 76.13676], [141.471615, 76.09289], [145.086285, 75.562625]]], [[[57.535692579992386, 70.720463975702145], [56.944979282463933, 70.63274323188665], [53.677375115784187, 70.762657782668455], [53.412016635965372, 71.206661688920192], [51.601894565645708, 71.474759019650477], [51.455753615124209, 72.014881089965129], [52.478275180883564, 72.229441636840946], [52.444168735570841, 72.77473135038484], [54.427613559797649, 73.627547512497571], [53.508289829325136, 73.749813951300141], [55.902458937407644, 74.627486477345329], [55.631932814359701, 75.081412258597155], [57.868643833248839, 75.609390367323186], [61.170044386647497, 76.251883450008123], [64.498368361270209, 76.439055487769267], [66.210977003855092, 76.809782213031227], [68.157059767534818, 76.939696763812904], [68.852211134725124, 76.544811306454605], [68.180572544227644, 76.233641669409096], [64.637326287703004, 75.737754625136219], [61.583507521414752, 75.260884507946784], [58.477082147053366, 74.309056301562819], [56.986785516187993, 73.333043524866227], [55.41933597191094, 72.371267605265956], [55.622837762276291, 71.540594794390316], [57.535692579992386, 70.720463975702145]]], [[[106.970130000000111, 76.97419], [107.240000000000123, 76.48], [108.1538, 76.723350000000138], [111.077260000000138, 76.71], [113.33151, 76.22224], [114.13417, 75.84764], [113.88539, 75.327790000000121], [112.77918, 75.03186], [110.151250000000175, 74.47673], [109.4, 74.18], [110.64, 74.04], [112.11919, 73.787740000000113], [113.019540000000234, 73.976930000000138], [113.529580000000294, 73.33505], [113.96881, 73.59488], [115.56782, 73.75285], [118.776330000000215, 73.58772], [119.02, 73.12], [123.20066, 72.97122], [123.257770000000178, 73.73503], [125.380000000000166, 73.56], [126.97644, 73.56549], [128.59126, 73.03871], [129.05157, 72.39872], [128.46, 71.98], [129.715990000000204, 71.19304], [131.288580000000252, 70.786990000000102], [132.253500000000145, 71.8363], [133.857660000000294, 71.386420000000143], [135.56193, 71.655250000000123], [137.49755, 71.34763], [138.234090000000123, 71.62803], [139.86983, 71.487830000000116], [139.14791, 72.4161900000001], [140.46817, 72.849410000000134], [149.5, 72.2], [150.35118000000017, 71.60643], [152.96890000000019, 70.84222], [157.00688, 71.03141], [158.99779, 70.86672], [159.830310000000225, 70.45324], [159.70866, 69.72198], [160.94053000000028, 69.43728], [162.279070000000104, 69.64204], [164.05248, 69.66823], [165.940370000000172, 69.47199], [167.83567, 69.58269], [169.57763000000017, 68.6938], [170.816880000000253, 69.01363], [170.008200000000159, 69.65276], [170.453450000000259, 70.09703], [173.643910000000204, 69.81743], [175.72403000000017, 69.877250000000217], [178.6, 69.4], [180.000000000000114, 68.963636363636553], [180.000000000000114, 64.979708702198465], [179.99281, 64.97433], [178.707200000000199, 64.53493], [177.411280000000147, 64.60821], [178.313000000000187, 64.07593], [178.90825000000018, 63.251970000000128], [179.37034, 62.98262], [179.48636, 62.56894], [179.228250000000116, 62.304100000000133], [177.3643, 62.5219], [174.569290000000194, 61.76915], [173.68013, 61.65261], [172.15, 60.95], [170.6985, 60.33618], [170.330850000000282, 59.88177], [168.90046, 60.57355], [166.294980000000265, 59.7885500000002], [165.840000000000202, 60.16], [164.87674, 59.7316], [163.539290000000108, 59.86871], [163.217110000000218, 59.21101], [162.01733, 58.24328], [162.05297, 57.83912], [163.19191, 57.61503], [163.057940000000144, 56.159240000000111], [162.129580000000203, 56.12219], [161.70146, 55.285680000000148], [162.117490000000117, 54.85514], [160.368770000000325, 54.34433], [160.021730000000218, 53.20257], [158.530940000000157, 52.958680000000236], [158.23118, 51.94269], [156.789790000000266, 51.01105], [156.42000000000013, 51.7], [155.99182, 53.15895], [155.43366, 55.381030000000109], [155.914420000000291, 56.767920000000132], [156.75815, 57.3647], [156.81035, 57.83204], [158.364330000000166, 58.05575], [160.150640000000124, 59.314770000000109], [161.87204, 60.343000000000117], [163.66969, 61.1409], [164.473550000000103, 62.55061], [163.258420000000172, 62.46627], [162.65791, 61.6425], [160.12148, 60.54423], [159.30232, 61.77396], [156.72068, 61.43442], [154.218060000000293, 59.758180000000117], [155.04375, 59.14495], [152.81185, 58.88385], [151.265730000000246, 58.78089], [151.33815, 59.50396], [149.78371, 59.655730000000126], [148.54481, 59.16448], [145.48722, 59.33637], [142.197820000000121, 59.03998], [138.958480000000293, 57.08805], [135.12619, 54.72959], [136.70171, 54.603550000000112], [137.19342, 53.97732], [138.1647, 53.755010000000247], [138.80463, 54.25455], [139.90151, 54.189680000000166], [141.34531, 53.089570000000109], [141.37923, 52.23877], [140.59742000000017, 51.23967], [140.51308, 50.045530000000113], [140.061930000000189, 48.446710000000152], [138.554720000000202, 46.99965], [138.21971, 46.30795], [136.86232, 45.143500000000174], [135.515350000000183, 43.989], [134.869390000000237, 43.39821], [133.536870000000249, 42.81147], [132.90627, 42.79849], [132.278070000000241, 43.284560000000106], [130.935870000000136, 42.55274], [130.78, 42.220000000000191], [130.640000000000157, 42.395], [130.633866408409801, 42.903014634770543], [131.144687941614961, 42.929989732426932], [131.288555129115593, 44.111519680348252], [131.025190000000237, 44.96796], [131.883454217659562, 45.321161607436508], [133.097120000000189, 45.14409], [133.769643996313164, 46.116926988299149], [134.112350000000163, 47.212480000000127], [134.50081, 47.578450000000139], [135.026311476786759, 48.478229885443902], [133.373595819228001, 48.183441677434836], [132.506690000000106, 47.78896], [130.987260000000106, 47.79013], [130.582293328982644, 48.72968740497619], [129.397817824420486, 49.4406000840156], [127.657400000000351, 49.76027], [127.287455682484904, 50.739797268265434], [126.939156528837827, 51.353894151405896], [126.564399041856959, 51.784255479532689], [125.946348911646439, 52.792798570356936], [125.068211297710434, 53.161044826868924], [123.57147, 53.4588], [122.245747918793043, 53.431725979213681], [121.003084751470354, 53.251401068731226], [120.177088657716865, 52.753886216841195], [120.725789015791975, 52.516226304730893], [120.7382, 51.96411], [120.182080000000155, 51.64355], [119.27939, 50.58292], [119.288460728025839, 50.142882798861947], [117.87924441942647, 49.510983384797036], [116.67880089728618, 49.888531399121398], [115.485695428531415, 49.805177313834733], [114.962109816550353, 50.140247300815119], [114.362456496235325, 50.24830272073747], [112.897739699354361, 49.543565375356984], [111.581230910286649, 49.377968248077671], [110.662010532678835, 49.130128078805846], [109.402449171996707, 49.292960516957685], [108.475167270951275, 49.282547715850704], [107.868175897251092, 49.793705145865871], [106.888804152455293, 50.274295966180276], [105.886591424586868, 50.40601919209216], [104.62158, 50.275320000000157], [103.676545444760336, 50.08996613219513], [102.25589, 50.510560000000105], [102.06521, 51.25991], [100.889480421962631, 51.516855780638409], [99.981732212323564, 51.63400625264395], [98.861490513100492, 52.047366034546698], [97.82573978067451, 51.010995184933236], [98.231761509191699, 50.422400621128716], [97.259760000000199, 49.72605], [95.814020000000156, 49.977460000000114], [94.815949334698757, 50.01343333597088], [94.147566359435601, 50.480536607457161], [93.10421, 50.49529], [92.234711541719676, 50.802170722041737], [90.713667433640765, 50.331811835321098], [88.805566847695573, 49.470520738312459], [87.751264276076824, 49.297197984405543], [87.359970330762692, 49.214980780629148], [86.829356723989648, 49.826674709668133], [85.541269972682485, 49.69285858824815], [85.115559523462082, 50.117302964877631], [84.416377394553038, 50.311399644565817], [83.935114780618903, 50.889245510453563], [83.383003778012451, 51.069182847693881], [81.945985548839943, 50.812195949906325], [80.568446893235446, 51.388336493528435], [80.035559523441705, 50.864750881547209], [77.80091556184432, 53.404414984747532], [76.525179477854749, 54.177003485727127], [76.891100294913443, 54.490524400441913], [74.384820000000119, 53.546850000000113], [73.425678745420512, 53.489810289109741], [73.50851606638436, 54.035616766976588], [72.224150018202195, 54.376655381886778], [71.180131056609468, 54.133285224008247], [70.86526655465515, 55.169733588270091], [69.068166945272893, 55.385250149143488], [68.169100376258896, 54.970391750704366], [65.66687, 54.601250000000149], [65.178533563095939, 54.354227810272064], [61.436600000000126, 54.00625], [60.978066440683236, 53.664993394579128], [61.69998619980062, 52.979996446334255], [60.73999311711453, 52.719986477257734], [60.927268507740237, 52.447548326214999], [59.967533807215567, 51.96042043721566], [61.588003371024136, 51.272658799843171], [61.337424350840998, 50.799070136104248], [59.932807244715555, 50.842194118851822], [59.642282342370564, 50.545442206415707], [58.363320000000122, 51.06364], [56.77798, 51.04355], [55.71694, 50.621710000000142], [54.532878452376181, 51.026239732459359], [52.328723585831042, 51.718652248738088], [50.766648390512174, 51.692762356159861], [48.702381626181044, 50.605128485712825], [48.577841424357601, 49.87475962991563], [47.549480421749379, 50.454698391311119], [46.751596307162764, 49.356005764353725], [47.043671502476585, 49.152038886097571], [46.466445753776291, 48.394152330104923], [47.315240000000152, 47.71585], [48.05725, 47.74377], [48.694733514201872, 47.075628160177885], [48.59325000000014, 46.56104], [49.101160000000121, 46.39933], [48.645410000000105, 45.80629], [47.67591, 45.641490000000111], [46.68201, 44.6092], [47.59094, 43.660160000000118], [47.49252, 42.98658], [48.58437000000017, 41.80888], [47.987283156126033, 41.405819200194387], [47.815665724484653, 41.151416124021338], [47.373315464066387, 41.219732367511135], [46.686070591016708, 41.827137152669899], [46.404950799348924, 41.860675157227426], [45.7764, 42.092440000000224], [45.470279168485909, 42.502780666670041], [44.537622918482057, 42.711992702803677], [43.93121, 42.554960000000101], [43.755990000000182, 42.74083], [42.394400000000154, 43.2203], [40.922190000000128, 43.382150000000131], [40.076964959479838, 43.553104153002486], [39.95500857927108, 43.434997666999287], [38.68, 44.28], [37.539120000000104, 44.65721], [36.675460000000122, 45.24469], [37.40317, 45.40451], [38.23295, 46.24087], [37.67372, 46.63657], [39.14767, 47.044750000000128], [39.121200000000123, 47.26336], [38.22353803889947, 47.102189846375971], [38.2551123390298, 47.546400458356956], [38.77057, 47.825620000000228], [39.738277622238982, 47.898937079452068], [39.895620000000136, 48.23241], [39.67465, 48.783820000000127], [40.080789015469477, 49.307429917999364], [40.069040000000108, 49.60105], [38.594988234213552, 49.926461900423718], [38.010631137857068, 49.915661526074715], [37.393459506995228, 50.383953355503664], [36.626167840325387, 50.225590928745127], [35.35611616388811, 50.577197374059139], [35.37791, 50.77394], [35.02218305841793, 51.207572333371495], [34.224815708154402, 51.255993150428921], [34.141978387190612, 51.56641347920619], [34.391730584457228, 51.768881740925892], [33.75269982273587, 52.335074571331646], [32.715760532367163, 52.238465481162159], [32.412058139787767, 52.288694973349763], [32.15944000000021, 52.061250000000101], [31.78597, 52.10168], [31.540018344862254, 52.742052313846429], [31.305200636527978, 53.073995876673301], [31.49764, 53.167430000000124], [32.304519484188368, 53.132726141972839], [32.693643019346119, 53.351420803432141], [32.405598585751157, 53.618045355842], [31.731272820774585, 53.794029446012011], [31.791424187962399, 53.974638576872181], [31.384472283663818, 54.157056382862365], [30.757533807098774, 54.811770941784388], [30.971835971813245, 55.08154775656412], [30.873909132620064, 55.55097646750351], [29.896294386522435, 55.789463202530484], [29.371571893030783, 55.670090643936263], [29.229513380660389, 55.918344224666399], [28.176709425577933, 56.169129950578778], [27.855282016722519, 56.759326483784363], [27.770015903440985, 57.244258124411189], [27.288184848751648, 57.474528306703903], [27.716685825315771, 57.791899115624439], [27.420150000000202, 58.724570000000128], [28.131699253051856, 59.300825100330982], [27.98112, 59.47537], [29.1177, 60.028050000000107], [28.07, 60.503520000000137], [30.211107212044645, 61.780027777749673], [31.139991082491029, 62.357692776124431], [31.516092156711263, 62.867687486412898], [30.035872430142796, 63.552813625738551], [30.444684686003736, 64.204453436939062], [29.544429559047014, 64.948671576590542], [30.21765, 65.80598], [29.054588657352376, 66.944286200622017], [29.977426385220689, 67.69829702419274], [28.445943637818765, 68.364612942163987], [28.591929559043358, 69.064776923286686], [29.39955, 69.15692000000017], [31.101080000000103, 69.55811], [32.132720000000255, 69.905950000000232], [33.77547, 69.301420000000107], [36.51396, 69.06342], [40.292340000000159, 67.9324], [41.059870000000124, 67.457130000000106], [41.125950000000174, 66.79158000000011], [40.01583, 66.266180000000119], [38.38295, 65.99953], [33.918710000000168, 66.75961], [33.18444, 66.63253], [34.81477, 65.900150000000124], [34.87857425307876, 65.436212877048192], [34.943910000000152, 64.414370000000147], [36.23129, 64.10945], [37.012730000000111, 63.84983], [37.141970000000143, 64.33471], [36.539579035089801, 64.76446], [37.176040000000135, 65.143220000000113], [39.59345, 64.520790000000162], [40.4356, 64.76446], [39.762600000000148, 65.49682], [42.09309, 66.47623], [43.01604000000011, 66.41858], [43.94975000000013, 66.06908], [44.53226, 66.756340000000122], [43.69839, 67.35245], [44.187950000000136, 67.95051], [43.45282, 68.57079], [46.250000000000135, 68.25], [46.821340000000156, 67.68997], [45.55517, 67.56652], [45.56202, 67.010050000000192], [46.349150000000137, 66.66767], [47.894160000000248, 66.884550000000146], [48.13876, 67.52238], [50.227660000000142, 67.998670000000132], [53.717430000000164, 68.85738], [54.47171, 68.80815], [53.485820000000118, 68.20131], [54.72628, 68.09702], [55.442680000000124, 68.43866], [57.317020000000149, 68.46628], [58.802000000000206, 68.88082], [59.941420000000178, 68.27844], [61.077840000000165, 68.94069], [60.03, 69.52], [60.55, 69.85], [63.504000000000147, 69.54739], [64.888115, 69.234835000000132], [68.512160000000108, 68.09233000000016], [69.18068, 68.61563000000011], [68.16444, 69.14436], [68.13522, 69.35649], [66.930080000000103, 69.454610000000102], [67.25976, 69.92873], [66.724920000000125, 70.708890000000125], [66.69466, 71.028970000000228], [68.540060000000111, 71.934500000000227], [69.19636, 72.843360000000146], [69.94, 73.04000000000012], [72.58754, 72.77629], [72.79603, 72.22006], [71.84811, 71.40898], [72.47011, 71.09019], [72.79188, 70.39114], [72.564700000000201, 69.02085], [73.66787, 68.4079], [73.2387, 67.7404], [71.280000000000101, 66.320000000000149], [72.423010000000147, 66.172670000000167], [72.82077, 66.53267], [73.920990000000131, 66.789460000000119], [74.186510000000183, 67.28429], [75.052, 67.760470000000154], [74.469260000000148, 68.32899], [74.93584, 68.98918], [73.84236, 69.07146], [73.601870000000204, 69.62763], [74.3998, 70.63175], [73.1011, 71.447170000000241], [74.890820000000204, 72.12119], [74.65926, 72.83227], [75.158010000000175, 72.854970000000108], [75.68351, 72.300560000000118], [75.288980000000109, 71.33556], [76.35911, 71.152870000000135], [75.903130000000161, 71.87401], [77.5766500000001, 72.26717], [79.652020000000107, 72.32011], [81.5, 71.75], [80.61071, 72.582850000000107], [80.51109, 73.6482], [82.25, 73.85], [84.65526, 73.805910000000154], [86.822300000000226, 73.93688], [86.00956, 74.459670000000145], [87.166820000000143, 75.11643], [88.31571, 75.14393], [90.26, 75.64], [92.90058, 75.77333], [93.234210000000132, 76.0472], [95.860000000000127, 76.14], [96.67821, 75.91548], [98.922540000000197, 76.44689], [100.759670000000199, 76.43028], [101.03532, 76.86189], [101.990840000000105, 77.287540000000192], [104.3516, 77.69792], [106.066640000000135, 77.37389], [104.705000000000211, 77.1274], [106.970130000000111, 76.97419]]], [[[105.07547, 78.30689], [99.43814, 77.921], [101.2649, 79.23399], [102.08635, 79.34641], [102.837815, 79.28129], [105.37243, 78.71334], [105.07547, 78.30689]]], [[[51.136186557831266, 80.54728017854093], [49.793684523320692, 80.415427761548202], [48.894411248577526, 80.33956675894369], [48.75493655782175, 80.175468248200829], [47.586119012244147, 80.010181179515328], [46.502825962109647, 80.247246812654339], [47.072455275262897, 80.559424140129451], [44.846958042181107, 80.589809882317169], [46.799138624871226, 80.771917629713627], [48.31847741068465, 80.784009914869927], [48.52280602396668, 80.514568996900138], [49.097189568890897, 80.753985907708412], [50.039767693894603, 80.918885403151791], [51.522932977103679, 80.699725653801906], [51.136186557831266, 80.54728017854093]]], [[[99.93976, 78.88094], [97.75794, 78.7562], [94.97259, 79.044745], [93.31288, 79.4265], [92.5454, 80.14379], [91.18107, 80.34146], [93.77766, 81.0246], [95.940895, 81.2504], [97.88385, 80.746975], [100.186655, 79.780135], [99.93976, 78.88094]]]] } },
+            { "type": "Feature", "properties": { "admin": "Rwanda", "name": "Rwanda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[30.419104852019235, -1.134659112150416], [30.816134881317705, -1.698914076345388], [30.758308953583104, -2.287250257988368], [30.469696079232978, -2.413857517103458], [29.938359002407935, -2.348486830254238], [29.632176141078585, -2.917857761246096], [29.02492638521678, -2.839257907730157], [29.117478875451546, -2.292211195488384], [29.254834832483336, -2.215109958508911], [29.29188683443661, -1.620055840667987], [29.579466180140876, -1.341313164885626], [29.821518588996003, -1.443322442229785], [30.419104852019235, -1.134659112150416]]] } },
+            { "type": "Feature", "properties": { "admin": "Western Sahara", "name": "W. Sahara", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-8.794883999049075, 27.120696316022503], [-8.81782833498667, 27.656425889592349], [-8.665589565454805, 27.656425889592349], [-8.66512447756419, 27.58947907155822], [-8.684399786809051, 27.395744126895998], [-8.687293667017398, 25.881056219988899], [-11.969418911171159, 25.933352769468261], [-11.93722449385332, 23.374594224536164], [-12.874221564169574, 23.284832261645171], [-13.118754441774708, 22.771220201096249], [-12.929101935263528, 21.327070624267559], [-16.845193650773989, 21.333323472574875], [-17.063423224342568, 20.99975210213082], [-17.020428432675736, 21.422310288981475], [-17.002961798561085, 21.420734157796574], [-14.750954555713532, 21.50060008390366], [-14.630832688851068, 21.860939846274899], [-14.221167771857251, 22.310163072188153], [-13.891110398809044, 23.691009019459297], [-12.500962693725368, 24.770116278578193], [-12.030758836301613, 26.030866197203036], [-11.718219773800353, 26.104091701760616], [-11.392554897496977, 26.883423977154358], [-10.551262579785272, 26.990807603456879], [-10.18942420087758, 26.860944729107398], [-9.735343390328877, 26.860944729107398], [-9.413037482124464, 27.088476060488514], [-8.794883999049075, 27.120696316022503]]] } },
+            { "type": "Feature", "properties": { "admin": "Saudi Arabia", "name": "Saudi Arabia", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[42.779332309750963, 16.34789134364868], [42.64957278826607, 16.77463532151496], [42.347989129410706, 17.075805568911996], [42.270887892431219, 17.474721787989122], [41.754381951673949, 17.833046169500971], [41.221391229015573, 18.671599636301206], [40.939341261566533, 19.486485297111752], [40.247652215339819, 20.174634507726488], [39.801684604660934, 20.338862209550054], [39.139399448408277, 21.29190481209293], [39.023695916506782, 21.986875311770191], [39.066328973147577, 22.579655666590263], [38.492772251140075, 23.688451036060851], [38.023860304523616, 24.078685614512928], [37.483634881344379, 24.285494696545008], [37.154817742671177, 24.858482977797301], [37.209491408035994, 25.084541530858104], [36.931627231602583, 25.602959499610172], [36.639603712721218, 25.826227525327219], [36.249136590323808, 26.570135606384873], [35.640181512196385, 27.376520494083415], [35.130186801907875, 28.063351955674712], [34.632336053207972, 28.058546047471559], [34.787778761541936, 28.607427273059692], [34.832220493312938, 28.957483425404838], [34.956037225084252, 29.356554673778835], [36.068940870922049, 29.19749461518445], [36.501214227043583, 29.505253607698702], [36.740527784987243, 29.865283311476183], [37.503581984209028, 30.003776150018396], [37.668119744626374, 30.338665269485894], [37.998848911294367, 30.508499864213128], [37.002165561681004, 31.508412990844736], [39.004885695152545, 32.010216986614971], [39.195468377444961, 32.16100881604266], [40.399994337736238, 31.889991766887931], [41.889980910007829, 31.190008653278362], [44.709498732284736, 29.178891099559376], [46.568713413281742, 29.099025173452283], [47.459821811722819, 29.002519436147217], [47.708850538937376, 28.526062730416136], [48.416094191283939, 28.552004299426663], [48.807594842327163, 27.689627997339876], [49.299554477745815, 27.461218166609804], [49.470913527225647, 27.109999294538078], [50.152422316290874, 26.689663194275994], [50.212935418504671, 26.277026882425371], [50.113303257045928, 25.943972276304248], [50.23985883972874, 25.608049628190923], [50.527386509000728, 25.327808335872099], [50.660556675016885, 24.999895534764018], [50.810108270069563, 24.754742539971371], [51.112415398977006, 24.556330878186721], [51.389607781790623, 24.627385972588051], [51.579518670463258, 24.245497137951102], [51.617707553926969, 24.014219265228824], [52.000733270074321, 23.001154486578937], [55.006803012924898, 22.496947536707129], [55.208341098863187, 22.708329982997039], [55.666659376859812, 22.000001125572336], [54.999981723862355, 19.999994004796104], [52.000009800022227, 19.000003363516054], [49.116671583864857, 18.616667588774941], [48.183343540241324, 18.166669216377311], [47.466694777217626, 17.116681626854877], [47.000004917189749, 16.949999294497438], [46.749994337761642, 17.283338120996174], [46.366658563020529, 17.233315334537632], [45.399999220568752, 17.333335069238554], [45.216651238797184, 17.43332896572333], [44.062613152855072, 17.410358791569589], [43.791518589051904, 17.319976711491105], [43.380794305196098, 17.579986680567668], [43.115797560403351, 17.088440456607369], [43.218375278502734, 16.666889960186406], [42.779332309750963, 16.34789134364868]]] } },
+            { "type": "Feature", "properties": { "admin": "Sudan", "name": "Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.824963480907506, 9.48406084571536], [33.842130853028145, 9.981914637215992], [33.721959248183097, 10.325262079630191], [33.206938084561777, 10.720111638406591], [33.086766479716729, 11.441141267476493], [33.206938084561777, 12.179338268667093], [32.743419037302537, 12.24800775714999], [32.674749548819641, 12.024831919580716], [32.073891524594778, 11.973329803218517], [32.314234734284746, 11.681484477166519], [32.400071594888338, 11.080626452941486], [31.850715687025509, 10.531270545078822], [31.352861895524875, 9.810240916008693], [30.837840731903377, 9.707236683284519], [29.996639497988546, 10.290927335388684], [29.618957311332842, 10.084918869940223], [29.515953078608607, 9.793073543888053], [29.000931914987166, 9.604232450560287], [28.966597170745779, 9.398223985111654], [27.970889587744345, 9.398223985111654], [27.833550610778783, 9.604232450560287], [27.112520981708876, 9.638567194801622], [26.752006167173811, 9.466893473594492], [26.477328213242508, 9.552730334198086], [25.96230704962101, 10.136420986302422], [25.790633328413943, 10.411098940233726], [25.069603699343979, 10.27375996326799], [24.79492574541268, 9.810240916008693], [24.537415163602017, 8.917537565731719], [24.194067721187643, 8.728696472403895], [23.886979580860665, 8.619729712933063], [23.805813429466745, 8.666318874542522], [23.459012892355979, 8.954285793489019], [23.394779087017291, 9.26506785729225], [23.557249790142915, 9.681218166538766], [23.554304233502187, 10.089255275915319], [22.977543572692749, 10.714462591998538], [22.864165480244246, 11.142395127807616], [22.87622, 11.384610000000119], [22.50869, 11.67936], [22.49762, 12.26024], [22.28801, 12.64605], [21.93681, 12.588180000000133], [22.03759, 12.95546], [22.29658, 13.37232], [22.18329, 13.78648], [22.51202, 14.09318], [22.30351, 14.32682], [22.567950000000106, 14.944290000000134], [23.02459, 15.68072], [23.886890000000101, 15.61084], [23.837660000000135, 19.580470000000101], [23.850000000000129, 20.0], [25.00000000000011, 20.00304], [25.00000000000011, 22.0], [29.02, 22.0], [32.9, 22.0], [36.86623, 22.0], [37.18872, 21.01885], [36.96941, 20.837440000000125], [37.114700000000134, 19.80796], [37.48179, 18.61409], [37.86276, 18.36786], [38.410089959473218, 17.998307399970312], [37.904000000000103, 17.42754], [37.16747, 17.263140000000128], [36.852530000000108, 16.95655], [36.75389, 16.29186], [36.32322, 14.82249], [36.42951, 14.42211], [36.27022, 13.563330000000118], [35.86363, 12.57828], [35.26049, 12.08286], [34.831630000000125, 11.318960000000116], [34.73115000000012, 10.910170000000106], [34.25745, 10.63009], [33.96162, 9.58358], [33.963392794971178, 9.464285229420623]]] } },
+            { "type": "Feature", "properties": { "admin": "South Sudan", "name": "S. Sudan", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.963392794971178, 9.464285229420623], [33.97498, 8.68456], [33.82550000000014, 8.37916], [33.294800000000116, 8.35458], [32.95418, 7.7849700000001], [33.56829, 7.71334], [34.0751, 7.22595], [34.25032, 6.82607], [34.70702, 6.59422000000012], [35.298007118233095, 5.506], [34.620196267853935, 4.847122742082034], [34.005, 4.249884947362147], [33.39, 3.79], [32.68642, 3.79232], [31.881450000000136, 3.55827], [31.24556, 3.7819], [30.83385, 3.50917], [29.95349, 4.1737], [29.715995314256013, 4.600804755060152], [29.159078403446635, 4.389267279473244], [28.696677687298795, 4.455077215996993], [28.428993768026992, 4.287154649264607], [27.979977247842946, 4.408413397637388], [27.374226108517625, 5.233944403500173], [27.213409051225248, 5.550953477394613], [26.465909458123289, 5.946717434101855], [26.213418409945113, 6.546603298362127], [25.796647983511257, 6.979315904158169], [25.124130893664805, 7.500085150579422], [25.114932488716867, 7.825104071479244], [24.567369012152191, 8.229187933785452], [23.886979580860665, 8.619729712933063], [24.194067721187643, 8.728696472403895], [24.537415163602017, 8.917537565731719], [24.79492574541268, 9.810240916008693], [25.069603699343979, 10.27375996326799], [25.790633328413943, 10.411098940233726], [25.96230704962101, 10.136420986302422], [26.477328213242508, 9.552730334198086], [26.752006167173811, 9.466893473594492], [27.112520981708876, 9.638567194801622], [27.833550610778783, 9.604232450560287], [27.970889587744345, 9.398223985111654], [28.966597170745779, 9.398223985111654], [29.000931914987166, 9.604232450560287], [29.515953078608607, 9.793073543888053], [29.618957311332842, 10.084918869940223], [29.996639497988546, 10.290927335388684], [30.837840731903377, 9.707236683284519], [31.352861895524875, 9.810240916008693], [31.850715687025509, 10.531270545078822], [32.400071594888338, 11.080626452941486], [32.314234734284746, 11.681484477166519], [32.073891524594778, 11.973329803218517], [32.674749548819641, 12.024831919580716], [32.743419037302537, 12.24800775714999], [33.206938084561777, 12.179338268667093], [33.086766479716729, 11.441141267476493], [33.206938084561777, 10.720111638406591], [33.721959248183097, 10.325262079630191], [33.842130853028145, 9.981914637215992], [33.824963480907506, 9.48406084571536], [33.963392794971178, 9.464285229420623]]] } },
+            { "type": "Feature", "properties": { "admin": "Senegal", "name": "Senegal", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-16.713728807023468, 13.594958604379853], [-17.126106736712611, 14.373515733289221], [-17.625042690490655, 14.72954051356407], [-17.185172898822227, 14.91947724045286], [-16.700706346085919, 15.621527411354107], [-16.463098110407881, 16.135036119038457], [-16.120690070041928, 16.45566254319338], [-15.623666144258689, 16.369337063049809], [-15.135737270558813, 16.587282416240779], [-14.577347581428977, 16.598263658102805], [-14.099521450242175, 16.304302273010489], [-13.43573767745306, 16.039383042866188], [-12.830658331747513, 15.303691514542942], [-12.170750291380299, 14.616834214735503], [-12.124887457721256, 13.994727484589784], [-11.927716030311613, 13.422075100147392], [-11.553397793005427, 13.141213690641063], [-11.467899135778522, 12.754518947800973], [-11.513942836950587, 12.442987575729415], [-11.658300950557928, 12.386582749882834], [-12.20356482588563, 12.465647691289401], [-12.278599005573438, 12.354440008997285], [-12.499050665730561, 12.332089952031053], [-13.217818162478235, 12.575873521367964], [-13.700476040084322, 12.586182969610192], [-15.548476935274005, 12.628170070847343], [-15.816574266004251, 12.515567124883345], [-16.147716844130581, 12.547761542201185], [-16.67745195155457, 12.38485158940105], [-16.84152462408127, 13.151393947802557], [-15.931295945692208, 13.130284125211331], [-15.691000535534991, 13.270353094938455], [-15.511812506562931, 13.278569647672864], [-15.141163295949463, 13.509511623585235], [-14.712197231494626, 13.298206691943774], [-14.277701788784553, 13.28058502853224], [-13.844963344772404, 13.505041612191999], [-14.046992356817478, 13.794067898000446], [-14.376713833055785, 13.625680243377371], [-14.687030808968483, 13.63035696049978], [-15.081735398813816, 13.876491807505982], [-15.398770310924457, 13.860368760630916], [-15.624596320039936, 13.623587347869556], [-16.713728807023468, 13.594958604379853]]] } },
+            { "type": "Feature", "properties": { "admin": "Solomon Islands", "name": "Solomon Is.", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[162.119024693040842, -10.482719008021133], [162.398645868172196, -10.826367282762119], [161.700032180018354, -10.820011081590222], [161.319796991214702, -10.204751478723123], [161.917383254237933, -10.446700534713653], [162.119024693040842, -10.482719008021133]]], [[[160.852228631837903, -9.872937106977002], [160.462588332357228, -9.89520964929484], [159.849447463214176, -9.794027194867367], [159.640002883135139, -9.639979750205269], [159.70294477766663, -9.242949720906777], [160.362956170898428, -9.400304457235533], [160.688517694337179, -9.610162448772808], [160.852228631837903, -9.872937106977002]]], [[[161.679981724289121, -9.599982191611373], [161.52939660059053, -9.784312025596433], [160.788253208660507, -8.917543226764918], [160.579997186524338, -8.320008640173965], [160.92002811100491, -8.320008640173965], [161.280006138349961, -9.120011488484449], [161.679981724289121, -9.599982191611373]]], [[[159.875027297198585, -8.337320244991714], [159.917401971677975, -8.538289890174864], [159.133677199539335, -8.114181410355398], [158.586113722974687, -7.754823500197713], [158.211149530264834, -7.421872246941147], [158.359977655265425, -7.320017998893915], [158.820001255527671, -7.56000335045739], [159.640002883135139, -8.020026950719567], [159.875027297198585, -8.337320244991714]]], [[[157.53842573468927, -7.347819919466928], [157.339419793933217, -7.404767347852554], [156.902030471014768, -7.176874281445391], [156.491357863591304, -6.765943291860394], [156.542827590153934, -6.599338474151478], [157.140000441718882, -7.021638278840653], [157.53842573468927, -7.347819919466928]]]] } },
+            { "type": "Feature", "properties": { "admin": "Sierra Leone", "name": "Sierra Leone", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[-11.438779466182053, 6.785916856305746], [-11.708194545935736, 6.860098374860724], [-12.428098924193815, 7.262942002792029], [-12.949049038128193, 7.798645738145736], [-13.124025437868479, 8.163946438016977], [-13.246550258832512, 8.903048610871506], [-12.711957566773076, 9.342711696810765], [-12.596719122762206, 9.620188300001969], [-12.425928514037562, 9.835834051955953], [-12.150338100625003, 9.858571682164378], [-11.917277390988655, 10.046983954300556], [-11.117481248407328, 10.045872911006283], [-10.839151984083299, 9.688246161330367], [-10.622395188835037, 9.267910061068276], [-10.65477047366589, 8.977178452994194], [-10.494315151399629, 8.715540676300433], [-10.505477260774667, 8.348896389189603], [-10.230093553091276, 8.406205552601291], [-10.695594855176477, 7.939464016141085], [-11.14670427086838, 7.396706447779534], [-11.199801805048278, 7.105845648624735], [-11.438779466182053, 6.785916856305746]]] } },
+            { "type": "Feature", "properties": { "admin": "El Salvador", "name": "El Salvador", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-87.793111131526558, 13.384480495655051], [-87.904112108089507, 13.149016831917134], [-88.483301561216791, 13.163951320849488], [-88.843227912129692, 13.259733588102474], [-89.256742723329282, 13.4585328231293], [-89.812393561547637, 13.520622056527994], [-90.095554572290951, 13.73533763270073], [-90.064677903996568, 13.881969509328924], [-89.7219339668207, 14.134228013561694], [-89.5342193265205, 14.244815578666302], [-89.587342698916544, 14.362586167859485], [-89.353325975282772, 14.424132798719112], [-89.058511929057644, 14.340029405164085], [-88.843072882832814, 14.140506700085169], [-88.541230841815974, 13.980154730683475], [-88.50399797234968, 13.845485948130854], [-88.065342576840123, 13.964625962779774], [-87.859515347021585, 13.893312486216979], [-87.723502977229387, 13.785050360565503], [-87.793111131526558, 13.384480495655051]]] } },
+            { "type": "Feature", "properties": { "admin": "Somaliland", "name": "Somaliland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[48.938129510296491, 9.451748968946672], [48.486735874226994, 8.837626247589979], [47.78942, 8.003], [46.948328484897942, 7.996876532417386], [43.67875, 9.183580000000116], [43.296975132018744, 9.540477403191742], [42.92812, 10.021940000000139], [42.55876, 10.572580000000126], [42.776851841000948, 10.926878566934416], [43.145304803242126, 11.462039699748853], [43.470659620951658, 11.27770986576388], [43.666668328634834, 10.864169216348158], [44.117803582542805, 10.445538438351603], [44.614259067570849, 10.442205308468941], [45.556940545439133, 10.698029486529775], [46.645401238802997, 10.816549383991171], [47.525657586462778, 11.127228094929986], [48.021596307167769, 11.193063869669741], [48.378783807169263, 11.375481675660122], [48.948206414593457, 11.410621649618516], [48.942005242718423, 11.394266058798163], [48.938491245322595, 10.982327378783451], [48.938232863161076, 9.973500067581481], [48.938129510296491, 9.451748968946672]]] } },
+            { "type": "Feature", "properties": { "admin": "Somalia", "name": "Somalia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[49.72862, 11.5789], [50.25878, 11.67957], [50.73202, 12.0219], [51.1112, 12.02464], [51.13387, 11.74815], [51.04153, 11.16651], [51.04531, 10.6409], [50.83418, 10.27972], [50.55239, 9.19874], [50.07092, 8.08173], [49.4527, 6.80466], [48.59455, 5.33911], [47.74079, 4.2194], [46.56476, 2.85529], [45.56399, 2.04576], [44.06815, 1.05283], [43.13597, 0.2922], [42.04157, -0.91916], [41.81095, -1.44647], [41.58513, -1.68325], [40.993, -0.85829], [40.98105, 2.78452], [41.855083092643966, 3.918911920483726], [42.12861, 4.23413], [42.76967, 4.25259], [43.66087, 4.95755], [44.9636, 5.00162], [47.78942, 8.003], [48.486735874226937, 8.837626247589993], [48.938129510296442, 9.451748968946616], [48.938232863161026, 9.973500067581508], [48.938491245322481, 10.982327378783465], [48.942005242718345, 11.394266058798136], [48.948204758509732, 11.410617281697961], [49.26776, 11.43033], [49.72862, 11.5789]]] } },
+            { "type": "Feature", "properties": { "admin": "Republic of Serbia", "name": "Serbia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[20.874312778413408, 45.416375433934306], [21.483526238702204, 45.181170152357865], [21.562022739353718, 44.768947251965635], [22.145087924902892, 44.478422349620573], [22.459022251075961, 44.702517198254426], [22.705725538837434, 44.578002834647002], [22.47400841644065, 44.409227606781762], [22.657149692483067, 44.234923000661347], [22.410446404721593, 44.008063462900047], [22.500156691180219, 43.642814439460999], [22.986018507588479, 43.211161200527094], [22.604801466571352, 42.898518785161109], [22.43659467946139, 42.580321153323943], [22.545011834409642, 42.461362006188025], [22.380525750424674, 42.320259507815074], [21.917080000000105, 42.30364], [21.576635989402117, 42.245224397061847], [21.54332, 42.32025], [21.66292, 42.43922], [21.77505, 42.6827], [21.63302, 42.67717], [21.43866, 42.86255], [21.27421, 42.90959], [21.143395, 43.068685000000123], [20.95651, 43.13094], [20.81448, 43.27205], [20.63508, 43.21671], [20.49679, 42.88469], [20.25758, 42.81275], [20.3398, 42.89852], [19.95857, 43.10604], [19.63, 43.213779970270522], [19.48389, 43.35229], [19.21852, 43.52384], [19.454, 43.568100000000115], [19.59976, 44.03847], [19.11761, 44.42307], [19.36803, 44.863], [19.00548, 44.86023], [19.390475701584588, 45.236515611342369], [19.072768995854172, 45.521511135432078], [18.82982, 45.90888], [19.596044549241636, 46.171729844744547], [20.22019249846289, 46.127468980486569], [20.76217492033998, 45.734573065771478], [20.874312778413408, 45.416375433934306]]] } },
+            { "type": "Feature", "properties": { "admin": "Suriname", "name": "Suriname", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.147436489476874, 5.973149929219161], [-55.949318406789786, 5.772877915872], [-55.841779751190408, 5.953125311706059], [-55.033250291551759, 6.025291449401662], [-53.958044603070888, 5.756548163267764], [-54.478632981979224, 4.896755682795585], [-54.3995422023565, 4.212611395683466], [-54.006930508018996, 3.620037746592558], [-54.181726040246261, 3.189779771330421], [-54.269705166223183, 2.732391669115046], [-54.524754197799709, 2.311848863123785], [-55.097587449755125, 2.523748073736612], [-55.569755011605984, 2.42150625244713], [-55.973322109589361, 2.510363877773016], [-56.073341844290283, 2.220794989425499], [-55.905600145070871, 2.021995754398659], [-55.995698004771739, 1.817667141116601], [-56.53938574891454, 1.89952260986692], [-57.150097825739898, 2.768926906745406], [-57.281433478409703, 3.333491929534119], [-57.601568976457848, 3.334654649260684], [-58.044694383360664, 4.060863552258382], [-57.860209520078691, 4.576801052260449], [-57.914288906472123, 4.812626451024413], [-57.307245856339492, 5.073566595882225], [-57.147436489476874, 5.973149929219161]]] } },
+            { "type": "Feature", "properties": { "admin": "Slovakia", "name": "Slovakia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[18.85314415861361, 49.496229763377634], [18.909574822676316, 49.435845852244562], [19.320712517990469, 49.571574001659179], [19.825022820726865, 49.217125352569219], [20.415839471119849, 49.431453355499755], [20.887955356538406, 49.328772284535823], [21.607808058364206, 49.470107326854077], [22.558137648211751, 49.08573802346713], [22.280841912533553, 48.825392157580659], [22.085608351334848, 48.422264309271782], [21.872236362401729, 48.319970811550007], [20.801293979584919, 48.62385407164237], [20.473562045989862, 48.562850043321809], [20.239054396249344, 48.327567247096916], [19.769470656013109, 48.2026911484636], [19.66136355965849, 48.266614895208647], [19.174364861739885, 48.111378892603859], [18.777024773847668, 48.081768296900627], [18.696512892336923, 47.88095368101439], [17.857132602620023, 47.758428860050365], [17.488472934649813, 47.867466132186209], [16.979666782304033, 48.123497015976298], [16.879982944412998, 48.470013332709463], [16.960288120194573, 48.596982326850593], [17.101984897538895, 48.8169688991171], [17.545006951577101, 48.800019029325362], [17.886484816161808, 48.903475246773695], [17.913511590250462, 48.996492824899072], [18.104972771891848, 49.043983466175298], [18.170498488037961, 49.271514797556421], [18.399993523846174, 49.315000515330034], [18.554971144289478, 49.495015367218777], [18.85314415861361, 49.496229763377634]]] } },
+            { "type": "Feature", "properties": { "admin": "Slovenia", "name": "Slovenia", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[13.806475457421524, 46.509306138691201], [14.632471551174827, 46.431817328469535], [15.137091912504982, 46.658702704447016], [16.011663852612653, 46.683610744811688], [16.202298211337361, 46.852385972676949], [16.370504998447412, 46.841327216166498], [16.564808383864854, 46.503750922219822], [15.768732944408548, 46.238108222023442], [15.671529575267552, 45.834153550797865], [15.323953891672403, 45.731782538427673], [15.327674594797424, 45.452316392593218], [14.935243767972931, 45.471695054702671], [14.595109490627804, 45.6349409043127], [14.411968214585411, 45.466165676447446], [13.715059848697221, 45.500323798192369], [13.937630242578305, 45.591015936864608], [13.698109978905475, 46.016778062517339], [13.806475457421524, 46.509306138691201]]] } },
+            { "type": "Feature", "properties": { "admin": "Sweden", "name": "Sweden", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[22.183173455501922, 65.723740546320158], [21.213516879977213, 65.02600535751526], [21.369631381930954, 64.413587958424273], [19.778875766690216, 63.609554348395022], [17.847779168375208, 62.749400132896803], [17.11955488451812, 61.341165676510954], [17.831346062906388, 60.636583360427394], [18.787721795332086, 60.081914374422581], [17.869224887776337, 58.95376618105869], [16.829185011470084, 58.719826972073385], [16.44770958829147, 57.041118069071871], [15.87978559740378, 56.104301866268649], [14.666681349352071, 56.20088511822216], [14.100721062891461, 55.407781073622637], [12.942910597392054, 55.361737372450563], [12.625100538797025, 56.307080186581956], [11.787942335668671, 57.441817125063061], [11.027368605196866, 58.856149400459344], [11.468271925511145, 59.432393296946024], [12.300365838274896, 60.117932847730025], [12.631146681375181, 61.293571682370121], [11.992064243221559, 61.800362453856543], [11.930569288794228, 63.128317572676963], [12.57993533697393, 64.066218980558318], [13.571916131248711, 64.049114081469696], [13.9199052263022, 64.445420640716065], [13.555689731509087, 64.7870276963815], [15.108411492582999, 66.19386688909546], [16.108712192456775, 67.302455552836875], [16.768878614985478, 68.013936672631388], [17.729181756265344, 68.010551866316263], [17.993868442464329, 68.567391262477344], [19.878559604581248, 68.407194322372561], [20.025268995857882, 69.065138658312691], [20.645592889089521, 69.106247260200846], [21.978534783626113, 68.616845608180682], [23.539473097434435, 67.936008612735236], [23.565879754335576, 66.396050930437411], [23.903378533633795, 66.006927395279604], [22.183173455501922, 65.723740546320158]]] } },
+            { "type": "Feature", "properties": { "admin": "Swaziland", "name": "Swaziland", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.071665480281062, -26.733820082304902], [31.868060337051073, -27.17792734142127], [31.282773064913325, -27.285879408478991], [30.685961948374477, -26.743845310169526], [30.676608514129633, -26.398078301704604], [30.949666782359905, -26.022649021104144], [31.044079624157146, -25.731452325139436], [31.333157586397899, -25.660190525008943], [31.837777947728057, -25.843331801051342], [31.985779249811962, -26.29177988048022], [32.071665480281062, -26.733820082304902]]] } },
+            { "type": "Feature", "properties": { "admin": "Syria", "name": "Syria", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[38.792340529136077, 33.378686428352218], [36.834062127435537, 32.312937526980768], [35.719918247222743, 32.709192409794859], [35.700797967274745, 32.716013698857374], [35.836396925608618, 32.868123277308506], [35.821100701650231, 33.277426459276292], [36.066460402172048, 33.824912421192543], [36.611750115715886, 34.201788641897174], [36.448194207512095, 34.59393524834406], [35.998402540843628, 34.644914048799997], [35.905023227692219, 35.410009467097318], [36.149762811026527, 35.821534735653664], [36.417550083163029, 36.040616970355053], [36.685389031731795, 36.259699205056457], [36.739494256341395, 36.817520453431079], [37.066761102045824, 36.623036200500614], [38.167727492024191, 36.901210435527766], [38.699891391765895, 36.712927354472335], [39.522580193852541, 36.716053778625984], [40.673259311695681, 37.091276353497285], [41.212089471203043, 37.074352321921687], [42.349591098811764, 37.22987254490409], [41.837064243340954, 36.605853786763568], [41.289707472505448, 36.358814602192261], [41.383965285005807, 35.628316555314349], [41.00615888851992, 34.419372260062111], [38.792340529136077, 33.378686428352218]]] } },
+            { "type": "Feature", "properties": { "admin": "Chad", "name": "Chad", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[14.495787387762899, 12.859396267137353], [14.595781284247604, 13.330426947477859], [13.954476759505607, 13.353448798063765], [13.956698846094124, 13.996691189016925], [13.540393507550785, 14.36713369390122], [13.97217, 15.68437], [15.247731154041842, 16.627305813050778], [15.300441114979716, 17.927949937405], [15.68574059414777, 19.957180080642384], [15.90324669766431, 20.387618923417499], [15.487148064850143, 20.730414537025634], [15.47106, 21.04845], [15.096887648181847, 21.308518785074902], [14.8513, 22.862950000000119], [15.86085, 23.40972], [19.84926, 21.49509], [23.837660000000135, 19.580470000000101], [23.886890000000101, 15.61084], [23.02459, 15.68072], [22.567950000000106, 14.944290000000134], [22.30351, 14.32682], [22.51202, 14.09318], [22.18329, 13.78648], [22.29658, 13.37232], [22.03759, 12.95546], [21.93681, 12.588180000000133], [22.28801, 12.64605], [22.49762, 12.26024], [22.50869, 11.67936], [22.87622, 11.384610000000119], [22.864165480244246, 11.142395127807616], [22.231129184668756, 10.971888739460608], [21.723821648859538, 10.567055568885959], [21.000868361096305, 9.475985215691479], [20.059685499764267, 9.012706000194838], [19.094008009526071, 9.074846910025768], [18.81200971850927, 8.982914536978623], [18.911021762780589, 8.630894680206435], [18.389554884523303, 8.281303615751879], [17.964929640380884, 7.890914008002992], [16.705988396886365, 7.508327541529978], [16.4561845231874, 7.734773667832938], [16.290561557691884, 7.754307359239417], [16.106231723706738, 7.497087917506461], [15.279460483469164, 7.42192454673801], [15.436091749745737, 7.692812404811887], [15.120865512765302, 8.382150173369437], [14.979995558337688, 8.796104234243442], [14.544466586981851, 8.965861314322238], [13.954218377344088, 9.549494940626685], [14.17146609869911, 10.021378282100043], [14.627200555081057, 9.920919297724591], [14.909353875394796, 9.992129421422758], [15.46787275560524, 9.982336737503543], [14.923564894275042, 10.891325181517514], [14.960151808337679, 11.555574042197234], [14.89336, 12.21905], [14.495787387762899, 12.859396267137353]]] } },
+            { "type": "Feature", "properties": { "admin": "Togo", "name": "Togo", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[1.865240512712318, 6.14215770102973], [1.060121697604927, 5.928837388528875], [0.836931186536333, 6.279978745952147], [0.570384148774849, 6.914358628767188], [0.490957472342245, 7.411744289576474], [0.712029249686878, 8.312464504423827], [0.461191847342121, 8.677222601756013], [0.365900506195885, 9.46500397382948], [0.367579990245389, 10.191212876827176], [-0.049784715159944, 10.706917832883928], [0.023802524423701, 11.018681748900802], [0.899563022474069, 10.997339382364258], [0.772335646171484, 10.470808213742357], [1.077795037448737, 10.175606594275022], [1.425060662450136, 9.825395412632998], [1.46304284018467, 9.334624335157086], [1.664477573258381, 9.128590399609378], [1.618950636409238, 6.832038072126236], [1.865240512712318, 6.14215770102973]]] } },
+            { "type": "Feature", "properties": { "admin": "Thailand", "name": "Thailand", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[102.58493248902667, 12.186594956913279], [101.687157830819928, 12.645740057826568], [100.831809523524839, 12.627084865769204], [100.978467238369191, 13.412721665902563], [100.097797479251099, 13.406856390837429], [100.018732537844528, 12.307001044153353], [99.478920526123602, 10.846366685423545], [99.153772414143134, 9.963061428258554], [99.222398716226749, 9.239255479362425], [99.873831821698118, 9.207862046745118], [100.279646844486194, 8.29515289960605], [100.45927412313273, 7.429572658717175], [101.017327915452697, 6.856868597842476], [101.623079054778032, 6.740622463401918], [102.141186964936367, 6.221636053894626], [101.81428185425797, 5.810808417174242], [101.154218784593837, 5.691384182147713], [101.075515578213327, 6.20486705161592], [100.259596388756933, 6.642824815289542], [100.085756870527092, 6.46448944745029], [99.690690545655727, 6.848212795433595], [99.519641554769606, 7.343453884302759], [98.988252801512289, 7.907993068875325], [98.503786248775967, 8.382305202666286], [98.339661899816988, 7.794511623562384], [98.150009393305808, 8.350007432483876], [98.259150018306229, 8.973922837759799], [98.553550653073017, 9.932959906448543], [99.038120558673953, 10.960545762572435], [99.587286004639694, 11.892762762901695], [99.196353794351637, 12.804748439988666], [99.212011753336071, 13.269293728076462], [99.097755161538728, 13.827502549693275], [98.430819126379859, 14.622027696180831], [98.192074009191373, 15.123702500870349], [98.537375929765687, 15.308497422746081], [98.90334842325673, 16.177824204976115], [98.493761020911322, 16.837835598207928], [97.859122755934848, 17.567946071843657], [97.375896437573516, 18.445437730375811], [97.797782830804394, 18.627080389881751], [98.253723992915582, 19.708203029860041], [98.959675734454848, 19.752980658440944], [99.543309360759281, 20.186597601802056], [100.115987583417819, 20.41784963630818], [100.548881056726856, 20.109237982661124], [100.606293573003128, 19.508344427971217], [101.282014601651667, 19.462584947176762], [101.035931431077742, 18.408928330961611], [101.059547560635139, 17.512497259994486], [102.113591750092453, 18.109101670804161], [102.413004998791592, 17.932781683824281], [102.998705682387694, 17.961694647691598], [103.200192091893726, 18.309632066312769], [103.956476678485288, 18.240954087796872], [104.716947056092465, 17.428858954330078], [104.779320509868768, 16.441864935771445], [105.589038527450128, 15.570316066952856], [105.544338413517664, 14.723933620660414], [105.218776890078871, 14.27321177821069], [104.281418084736586, 14.416743068901363], [102.988422072361601, 14.225721136934464], [102.348099399833004, 13.39424734135822], [102.58493248902667, 12.186594956913279]]] } },
+            { "type": "Feature", "properties": { "admin": "Tajikistan", "name": "Tajikistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[71.014198032520156, 40.244365546218226], [70.648018833299957, 39.935753892571157], [69.559609816368507, 40.103211371412968], [69.464886915977516, 39.526683254548693], [70.549161818325601, 39.604197902986492], [71.784693637991992, 39.279463202464363], [73.67537926625478, 39.431236884105594], [73.928852166646408, 38.505815334622724], [74.257514276022718, 38.606506862943441], [74.864815708316812, 38.378846340481587], [74.829985792952087, 37.990007025701388], [74.980002475895404, 37.419990139305888], [73.948695916646486, 37.421566270490786], [73.260055779924983, 37.495256862938994], [72.636889682917271, 37.047558091778349], [72.193040805962383, 36.94828766534566], [71.84463829945058, 36.738171291646914], [71.448693475230229, 37.065644843080513], [71.541917759084768, 37.905774441065631], [71.239403924448155, 37.953265082341879], [71.348131137990251, 38.258905341132156], [70.806820509732873, 38.486281643216408], [70.376304152309274, 38.138395901027515], [70.270574171840124, 37.73516469985401], [70.116578403610319, 37.588222764632086], [69.518785434857946, 37.608996690413413], [69.196272820924364, 37.15114350030742], [68.859445835245921, 37.344335842430588], [68.135562371701369, 37.023115139304302], [67.829999627559502, 37.144994004864678], [68.392032505165943, 38.157025254868728], [68.176025018185911, 38.901553453113898], [67.442219679641298, 39.140143541005479], [67.701428664017342, 39.580478420564518], [68.536416456989414, 39.533452867178923], [69.011632928345477, 40.086158148756653], [69.329494663372813, 40.727824408524839], [70.666622348925031, 40.960213324541407], [70.458159621059608, 40.49649485937028], [70.601406691372674, 40.218527330072284], [71.014198032520156, 40.244365546218226]]] } },
+            { "type": "Feature", "properties": { "admin": "Turkmenistan", "name": "Turkmenistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[61.21081709172573, 35.650072333309218], [61.123070509694131, 36.491597194966239], [60.377637973883864, 36.52738312432836], [59.234761997316795, 37.412987982730336], [58.436154412678192, 37.522309475243794], [57.330433790928964, 38.029229437810933], [56.619366082592805, 38.121394354803478], [56.180374790273319, 37.935126654607423], [55.511578403551894, 37.964117133123153], [54.800303989486558, 37.392420762678178], [53.921597934795543, 37.198918361961255], [53.735511102112504, 37.906136176091685], [53.880928582581831, 38.952093003895349], [53.101027866432894, 39.290573635407121], [53.357808058491216, 39.975286363274442], [52.693972609269807, 40.033629055331964], [52.91525109234361, 40.87652334244472], [53.85813927594112, 40.631034450842165], [54.736845330632136, 40.951014919593455], [54.0083109881813, 41.551210842447404], [53.721713494690576, 42.123191433270016], [52.916749708880069, 41.868116563477322], [52.81468875510361, 41.135370591794704], [52.502459751196135, 41.783315538086356], [52.94429324729164, 42.116034247397586], [54.079417759014937, 42.324109402020817], [54.755345493392625, 42.04397146256656], [55.455251092353755, 41.259859117185826], [55.968191359282898, 41.308641669269356], [57.096391229079089, 41.32231008561056], [56.93221520368779, 41.82602610937559], [57.786529982337065, 42.170552883465511], [58.629010857991453, 42.751551011723045], [59.976422153569771, 42.223081976890199], [60.083340691981654, 41.425146185871391], [60.46595299667068, 41.22032664648254], [61.547178989513547, 41.2663703476546], [61.882714064384679, 41.084856879229392], [62.374260288344992, 40.053886216790382], [63.518014764261018, 39.363256537425627], [64.170223016216752, 38.892406724598231], [65.215998976507379, 38.402695013984292], [66.546150343700205, 37.974684963526855], [66.518606805288655, 37.362784328758785], [66.217384881459324, 37.393790188133913], [65.745630731066811, 37.661164048812061], [65.588947788357828, 37.305216783185628], [64.746105177677393, 37.111817735333297], [64.546479119733888, 36.31207326918426], [63.982895949158696, 36.007957465146596], [63.193538445900337, 35.857165635718907], [62.984662306576588, 35.404040839167614], [62.230651483005879, 35.270663967422287], [61.21081709172573, 35.650072333309218]]] } },
+            { "type": "Feature", "properties": { "admin": "East Timor", "name": "Timor-Leste", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[124.96868248911619, -8.892790215697081], [125.086246372580248, -8.656887302284678], [125.947072381698234, -8.432094821815033], [126.64470421763852, -8.39824675866385], [126.957243280139792, -8.273344821814396], [127.335928175974615, -8.397316582882601], [126.967991978056517, -8.668256117388891], [125.925885044458568, -9.106007175333351], [125.088520135601073, -9.393173109579292], [125.070019972840583, -9.08998748132287], [124.96868248911619, -8.892790215697081]]] } },
+            { "type": "Feature", "properties": { "admin": "Trinidad and Tobago", "name": "Trinidad and Tobago", "continent": "North America" }, "geometry": { "type": "Polygon", "coordinates": [[[-61.68, 10.76], [-61.105, 10.89], [-60.895, 10.855], [-60.935, 10.11], [-61.77, 10.0], [-61.95, 10.09], [-61.66, 10.365], [-61.68, 10.76]]] } },
+            { "type": "Feature", "properties": { "admin": "Tunisia", "name": "Tunisia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[9.482139926805273, 30.307556057246181], [9.055602654668148, 32.102691962201284], [8.439102817426116, 32.506284898400814], [8.430472853233367, 32.748337307255944], [7.612641635782181, 33.344114895148955], [7.524481642292242, 34.097376410451453], [8.140981479534302, 34.655145982393783], [8.376367628623766, 35.479876003555937], [8.217824334352313, 36.433176988260271], [8.420964389691674, 36.946427313783154], [9.509993523810605, 37.349994411766531], [10.210002475636315, 37.230001735984807], [10.180650262094529, 36.724037787415071], [11.028867221733348, 37.09210317641395], [11.100025668999249, 36.899996039368908], [10.600004510143092, 36.410000108377368], [10.593286573945134, 35.947444362932806], [10.939518670300686, 35.698984076473486], [10.807847120821007, 34.833507188449182], [10.149592726287123, 34.330773016897702], [10.339658644256613, 33.785741685515312], [10.856836378633684, 33.768740139291275], [11.108500603895118, 33.293342800422188], [11.488787469131008, 33.136995754523134], [11.432253452203692, 32.368903103152867], [10.944789666394453, 32.081814683555358], [10.636901482799484, 31.761420803345747], [9.950225050505081, 31.376069647745251], [10.056575148161752, 30.961831366493595], [9.97001712407285, 30.539324856075236], [9.482139926805273, 30.307556057246181]]] } },
+            { "type": "Feature", "properties": { "admin": "Turkey", "name": "Turkey", "continent": "Asia" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[36.913127068842151, 41.335358384764291], [38.347664829264502, 40.948586127275711], [39.512606642420238, 41.102762763018561], [40.373432651538245, 41.013672593747337], [41.554084100110707, 41.535656236327604], [42.619548781104548, 41.58317271581992], [43.582745802592704, 41.09214325618256], [43.752657911968491, 40.740200914058811], [43.656436395040963, 40.253563951166157], [44.400008579288759, 40.005000311842302], [44.79398969908199, 39.713002631177027], [44.109225294782355, 39.428136298168049], [44.421402622257595, 38.281281236314513], [44.225755649600522, 37.971584377589345], [44.772699008977739, 37.170444647768441], [44.293451775902852, 37.001514390606353], [43.942258742047343, 37.256227525372928], [42.77912560402185, 37.385263576805798], [42.349591098811764, 37.229872544904104], [41.212089471203015, 37.074352321921729], [40.673259311695702, 37.091276353497356], [39.522580193852512, 36.716053778626012], [38.699891391765917, 36.712927354472313], [38.167727492024156, 36.90121043552778], [37.066761102045824, 36.623036200500614], [36.739494256341366, 36.817520453431108], [36.685389031731816, 36.259699205056499], [36.417550083163086, 36.040616970355096], [36.149762811026584, 35.821534735653664], [35.782084995269848, 36.274995429014915], [36.160821567537049, 36.650605577128367], [35.550936313628334, 36.565442816711325], [34.714553256984367, 36.795532131490909], [34.026894972476455, 36.219960028623966], [32.509158156064096, 36.107563788389193], [31.69959516777956, 36.644275214172602], [30.621624790171062, 36.677864895162308], [30.391096225717114, 36.262980658506983], [29.69997562024556, 36.144357408181001], [28.732902866335387, 36.676831366516431], [27.641186557737363, 36.658822129862749], [27.048767937943289, 37.653360907536005], [26.318218214633042, 38.208133246405382], [26.804700148228726, 38.985760199533551], [26.170785353304375, 39.463612168936457], [27.280019972449388, 40.420013739578302], [28.819977654747209, 40.460011298172212], [29.240003696415574, 41.219990749672682], [31.145933872204434, 41.087621568357058], [32.347979363745786, 41.736264146484629], [33.513282911927512, 42.018960069337304], [35.167703891751863, 42.040224921225438], [36.913127068842151, 41.335358384764291]]], [[[27.192376743282406, 40.690565700842448], [26.358009067497782, 40.151993923496477], [26.043351271272535, 40.617753607743161], [26.056942172965332, 40.824123440100735], [26.294602085075692, 40.936261298174166], [26.604195590936282, 41.562114569661013], [26.117041863720825, 41.826904608724554], [27.135739373490505, 42.141484890301307], [27.996720411905407, 42.007358710287768], [28.115524529744441, 41.622886054036279], [28.988442824018779, 41.299934190428175], [28.806438429486743, 41.05496206314853], [27.619017368284112, 40.999823309893102], [27.192376743282406, 40.690565700842448]]]] } },
+            { "type": "Feature", "properties": { "admin": "Taiwan", "name": "Taiwan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[121.777817824389899, 24.394273586519393], [121.175632358892713, 22.790857245367164], [120.747079705896198, 21.970571397382106], [120.220083449383651, 22.814860948166732], [120.106188592612369, 23.556262722258229], [120.694679803552233, 24.53845083261373], [121.49504438688875, 25.295458889257379], [121.951243931161429, 24.997595933527034], [121.777817824389899, 24.394273586519393]]] } },
+            { "type": "Feature", "properties": { "admin": "United Republic of Tanzania", "name": "Tanzania", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[33.903711197104592, -0.95], [34.07262, -1.05982], [37.69869, -3.09699], [37.7669, -3.67712], [39.20222, -4.67677], [38.74054, -5.90895], [38.79977, -6.47566], [39.44, -6.84], [39.470000000000134, -7.1], [39.19469, -7.7039], [39.25203, -8.00781], [39.18652, -8.48551], [39.53574, -9.112369999999883], [39.9496, -10.0984], [40.31659, -10.317099999999867], [39.521, -10.89688], [38.427556593587767, -11.285202325081626], [37.82764, -11.26879], [37.47129, -11.56876], [36.775150994622884, -11.59453744878078], [36.514081658684397, -11.720938002166745], [35.312397902169145, -11.439146416879165], [34.559989047999451, -11.520020033415845], [34.28, -10.16], [33.940837724096518, -9.693673841980283], [33.73972, -9.41715], [32.759375441221373, -9.230599053589001], [32.191864861791935, -8.930358981973255], [31.556348097466628, -8.762048841998647], [31.157751336950064, -8.594578747317312], [30.74, -8.34], [30.2, -7.08], [29.62, -6.52], [29.419992710088305, -5.939998874539297], [29.519986606573063, -5.419978936386257], [29.339997592900367, -4.499983412294113], [29.753512404099858, -4.452389418153301], [30.11632, -4.09012], [30.50554, -3.56858], [30.75224, -3.35931], [30.74301, -3.03431], [30.52766, -2.80762], [30.46967, -2.41383], [30.758308953583132, -2.287250257988375], [30.816134881317844, -1.698914076345374], [30.419104852019291, -1.134659112150416], [30.769860000000101, -1.01455], [31.86617, -1.02736], [33.903711197104592, -0.95]]] } },
+            { "type": "Feature", "properties": { "admin": "Uganda", "name": "Uganda", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.86617, -1.02736], [30.769860000000101, -1.01455], [30.419104852019291, -1.134659112150416], [29.821518588996121, -1.443322442229771], [29.579466180141019, -1.341313164885605], [29.587837762172164, -0.587405694179381], [29.8195, -0.2053], [29.875778842902431, 0.597379868976361], [30.086153598762785, 1.062312730306416], [30.468507521290285, 1.583805446779706], [30.852670118948133, 1.849396470543752], [31.174149204235952, 2.204465236821306], [30.77332, 2.339890000000139], [30.83385, 3.50917], [31.24556, 3.7819], [31.88145, 3.55827], [32.68642, 3.79232], [33.39, 3.79], [34.005, 4.249884947362147], [34.47913, 3.5556], [34.59607, 3.053740000000118], [35.03599, 1.90584], [34.6721, 1.17694], [34.18, 0.515], [33.893568969666994, 0.109813537861839], [33.903711197104592, -0.95], [31.86617, -1.02736]]] } },
+            { "type": "Feature", "properties": { "admin": "Ukraine", "name": "Ukraine", "continent": "Europe" }, "geometry": { "type": "Polygon", "coordinates": [[[31.78599816257158, 52.10167796488544], [32.159412062312661, 52.061266994833204], [32.412058139787625, 52.288694973349735], [32.715760532366964, 52.238465481162038], [33.7526998227357, 52.335074571331681], [34.391730584457001, 51.768881740925778], [34.141978387190385, 51.566413479206226], [34.22481570815426, 51.255993150428942], [35.022183058417873, 51.207572333371445], [35.377923618315116, 50.773955390010343], [35.35611616388794, 50.577197374059054], [36.62616784032533, 50.225590928745127], [37.393459506995065, 50.383953355503586], [38.01063113785689, 49.915661526074622], [38.59498823421341, 49.926461900423618], [40.069058465339097, 49.601055406281688], [40.080789015469342, 49.307429917999272], [39.674663934087526, 48.783818467801872], [39.895632358567575, 48.232405097031425], [39.738277622238819, 47.898937079451983], [38.770584751141186, 47.825608222029807], [38.255112339029743, 47.546400458356807], [38.223538038899413, 47.102189846375872], [37.42513715998998, 47.022220567404197], [36.759854770664383, 46.698700263040919], [35.823684523264816, 46.645964463887054], [34.962341749823871, 46.273196519549636], [35.020787794745978, 45.65121898048465], [35.51000857925316, 45.409993394546177], [36.529997999830151, 45.46998973243705], [36.334712762199146, 45.113215643893952], [35.239999220528112, 44.939996242851599], [33.882511020652878, 44.361478583344066], [33.326420932760037, 44.564877020844875], [33.546924269349446, 45.034770819674883], [32.454174432105496, 45.327466132176063], [32.630804477679128, 45.519185695978905], [33.588162062318382, 45.851568508480227], [33.298567335754704, 46.08059845639783], [31.744140252415171, 46.333347886737378], [31.675307244602401, 46.706245022155528], [30.748748813609094, 46.583100084003995], [30.37760867688888, 46.032410183285663], [29.603289015427425, 45.293308010431119], [29.149724969201646, 45.464925442072442], [28.679779493939371, 45.30403087013169], [28.233553501099035, 45.488283189468369], [28.48526940279276, 45.596907050145887], [28.659987420371575, 45.939986884131628], [28.933717482221621, 46.258830471372491], [28.862972446414055, 46.437889309263824], [29.072106967899288, 46.517677720722482], [29.170653924279879, 46.379262396828693], [29.759971958136383, 46.349987697935354], [30.024658644335364, 46.423936672545032], [29.838210076626289, 46.525325832701675], [29.908851759569295, 46.67436066343145], [29.559674106573105, 46.928582872091312], [29.415135125452732, 47.346645209332571], [29.050867954227321, 47.510226955752493], [29.122698195113024, 47.849095160506458], [28.670891147585163, 48.118148505234089], [28.259546746541837, 48.155562242213406], [27.52253746919515, 48.467119452501102], [26.857823520624798, 48.368210761094488], [26.619336785597788, 48.220726223333457], [26.197450392366925, 48.220881252630342], [25.945941196402394, 47.987148749374207], [25.207743361112986, 47.891056423527459], [24.866317172960571, 47.737525743188307], [24.402056105250374, 47.981877753280422], [23.760958286237404, 47.985598456405448], [23.142236362406798, 48.096341050806942], [22.710531447040488, 47.882193915389394], [22.640819939878746, 48.150239569687351], [22.085608351334848, 48.422264309271782], [22.280841912533553, 48.825392157580659], [22.558137648211751, 49.08573802346713], [22.776418898212619, 49.027395331409608], [22.518450148211596, 49.476773586619736], [23.426508416444388, 50.308505764357449], [23.922757195743259, 50.424881089878738], [24.029985792748899, 50.705406602575174], [23.52707075368437, 51.578454087930233], [24.005077752384206, 51.617443956094448], [24.553106316839511, 51.888461005249177], [25.327787713327005, 51.910656032918538], [26.337958611768549, 51.832288723347915], [27.454066196408426, 51.59230337178446], [28.241615024536564, 51.572227077839059], [28.617612745892242, 51.427713934934836], [28.992835320763522, 51.602044379271462], [29.254938185347921, 51.368234361366881], [30.157363722460889, 51.416138414101454], [30.55511722181145, 51.319503485715643], [30.619454380014837, 51.822806098022362], [30.927549269338975, 52.042353420614383], [31.78599816257158, 52.10167796488544]]] } },
+            { "type": "Feature", "properties": { "admin": "Uruguay", "name": "Uruguay", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-57.625133429582945, -30.216294854454258], [-56.976025763564721, -30.109686374636119], [-55.97324459494093, -30.883075860316296], [-55.601510179249331, -30.853878676071385], [-54.572451544805105, -31.494511407193745], [-53.787951626182185, -32.047242526987617], [-53.209588995971529, -32.727666110974717], [-53.650543992718084, -33.202004082981823], [-53.373661668498229, -33.768377780900757], [-53.806425950726521, -34.396814874002224], [-54.935866054897716, -34.952646579733617], [-55.674089728403274, -34.752658786764066], [-56.215297003796053, -34.85983570733741], [-57.139685024633096, -34.430456231424238], [-57.817860683815489, -34.462547295877492], [-58.427074144104381, -33.909454441057569], [-58.349611172098854, -33.2631889788154], [-58.132647671121433, -33.040566908502008], [-58.142440355040748, -32.044503676076147], [-57.874937303281875, -31.016556084926201], [-57.625133429582945, -30.216294854454258]]] } },
+            { "type": "Feature", "properties": { "admin": "United States of America", "name": "United States", "continent": "North America" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[-155.54211, 19.08348], [-155.68817, 18.91619], [-155.93665, 19.05939], [-155.90806, 19.33888], [-156.07347, 19.70294], [-156.02368, 19.81422], [-155.85008, 19.97729], [-155.91907, 20.17395], [-155.86108, 20.26721], [-155.78505, 20.2487], [-155.40214, 20.07975], [-155.22452, 19.99302], [-155.06226, 19.8591], [-154.80741, 19.50871], [-154.83147, 19.45328], [-155.222169999999892, 19.23972], [-155.54211, 19.08348]]], [[[-156.07926, 20.64397], [-156.41445, 20.57241], [-156.58673, 20.783], [-156.70167, 20.8643], [-156.71055, 20.92676], [-156.61258, 21.01249], [-156.25711, 20.91745], [-155.99566, 20.76404], [-156.07926, 20.64397]]], [[[-156.75824, 21.17684], [-156.78933, 21.06873], [-157.32521, 21.09777], [-157.25027, 21.21958], [-156.75824, 21.17684]]], [[[-157.65283, 21.32217], [-157.70703, 21.26442], [-157.7786, 21.27729], [-158.12667, 21.31244], [-158.2538, 21.53919], [-158.29265, 21.57912], [-158.0252, 21.71696], [-157.94161, 21.65272], [-157.65283, 21.32217]]], [[[-159.34512, 21.982], [-159.46372, 21.88299], [-159.80051, 22.06533], [-159.74877, 22.1382], [-159.5962, 22.23618], [-159.36569, 22.21494], [-159.34512, 21.982]]], [[[-94.81758, 49.38905], [-94.639999999999858, 48.840000000000103], [-94.32914, 48.67074], [-93.63087, 48.60926], [-92.61, 48.45], [-91.64, 48.14], [-90.829999999999856, 48.27], [-89.6, 48.01], [-89.272917446636654, 48.019808254582834], [-88.378114183286513, 48.302917588893806], [-87.439792623300207, 47.94], [-86.461990831228135, 47.553338019392037], [-85.652363247403215, 47.220218817730498], [-84.876079881514855, 46.900083319682366], [-84.779238247399817, 46.637101955749117], [-84.54374874544564, 46.538684190449224], [-84.6049, 46.4396], [-84.3367, 46.408770000000104], [-84.142119513673279, 46.512225857115723], [-84.091851264161463, 46.275418606138253], [-83.890765347005654, 46.116926988299149], [-83.616130947590491, 46.116926988299149], [-83.469550747394621, 45.994686387712584], [-83.592850714843067, 45.816893622412543], [-82.550924648758169, 45.347516587905446], [-82.337763125431053, 44.44], [-82.137642381503952, 43.571087551439987], [-82.43, 42.98], [-82.899999999999878, 42.430000000000135], [-83.119999999999877, 42.08], [-83.141999681312555, 41.975681057292995], [-83.029810146806909, 41.832795722005997], [-82.690089280920162, 41.675105088867319], [-82.439277716791608, 41.675105088867319], [-81.277746548167059, 42.209025987306845], [-80.247447679347843, 42.36619985612267], [-78.939362148743683, 42.863611355148116], [-78.92, 42.965], [-79.009999999999863, 43.27], [-79.171673550111862, 43.466339423184301], [-78.720279914042365, 43.625089423184953], [-77.737885097957601, 43.629055589363382], [-76.820034145805565, 43.628784288093748], [-76.5, 44.018458893758599], [-76.375, 44.09631], [-75.31821, 44.81645000000016], [-74.867, 45.00048000000011], [-73.347829999999874, 45.00738], [-71.505059999999858, 45.0082], [-71.405, 45.255000000000123], [-71.08482, 45.305240000000154], [-70.659999999999783, 45.46], [-70.305, 45.915], [-69.99997, 46.69307], [-69.237216, 47.447781], [-68.905, 47.185], [-68.23444, 47.35486], [-67.79046, 47.06636], [-67.79134, 45.702810000000134], [-67.13741, 45.13753], [-66.96466, 44.809700000000149], [-68.03252, 44.3252], [-69.059999999999874, 43.98], [-70.116169999999897, 43.684050000000141], [-70.645475633410967, 43.090238348964043], [-70.81489, 42.8653], [-70.825, 42.335], [-70.494999999999891, 41.805], [-70.08, 41.78], [-70.185, 42.145], [-69.88497, 41.922830000000111], [-69.96503, 41.637170000000161], [-70.64, 41.475], [-71.12039, 41.494450000000164], [-71.859999999999829, 41.32], [-72.295, 41.27], [-72.87643, 41.22065], [-73.71, 40.931102351654481], [-72.24126, 41.119480000000138], [-71.944999999999808, 40.93], [-73.345, 40.63], [-73.982, 40.628], [-73.952325, 40.75075], [-74.25671, 40.47351], [-73.96244, 40.42763], [-74.17838, 39.70926], [-74.90604, 38.93954], [-74.98041, 39.1964], [-75.20002, 39.24845], [-75.52805, 39.4985], [-75.32, 38.96], [-75.071834764789784, 38.782032230179276], [-75.05673, 38.404120000000106], [-75.37747, 38.01551], [-75.94023, 37.21689], [-76.03127, 37.2566], [-75.722049999999783, 37.937050000000106], [-76.23287, 38.319215], [-76.35, 39.15], [-76.542725, 38.717615], [-76.32933, 38.08326], [-76.98999793161353, 38.239991766913384], [-76.301619999999886, 37.917945], [-76.25874, 36.9664000000001], [-75.9718, 36.89726], [-75.868039999999809, 36.55125], [-75.72749, 35.550740000000125], [-76.36318, 34.808540000000129], [-77.39763499999988, 34.51201], [-78.05496, 33.92547], [-78.554349999999815, 33.861330000000116], [-79.06067, 33.49395], [-79.20357, 33.15839], [-80.301325, 32.509355], [-80.86498, 32.0333], [-81.33629, 31.44049], [-81.49042, 30.729990000000122], [-81.31371, 30.03552], [-80.98, 29.18000000000011], [-80.53558499999987, 28.47213], [-80.529999999999774, 28.04], [-80.056539284977532, 26.88000000000013], [-80.088015, 26.205765], [-80.131559999999837, 25.816775], [-80.38103, 25.20616], [-80.679999999999879, 25.08], [-81.17213, 25.201260000000126], [-81.33, 25.64], [-81.709999999999795, 25.87], [-82.239999999999895, 26.730000000000125], [-82.70515, 27.49504], [-82.85526, 27.88624], [-82.65, 28.550000000000146], [-82.929999999999865, 29.100000000000129], [-83.70959, 29.93656], [-84.1, 30.090000000000114], [-85.10882, 29.63615], [-85.28784, 29.686120000000127], [-85.7731, 30.152610000000116], [-86.399999999999878, 30.400000000000112], [-87.530359999999831, 30.27433], [-88.41782, 30.3849], [-89.180489999999836, 30.31598], [-89.593831178419748, 30.159994004836843], [-89.413735, 29.89419], [-89.43, 29.48864], [-89.21767, 29.29108], [-89.40823, 29.15961], [-89.77928, 29.307140000000135], [-90.15463, 29.11743], [-90.880224999999896, 29.148535000000116], [-91.626784999999842, 29.677000000000127], [-92.49906, 29.5523], [-93.22637, 29.78375], [-93.84842, 29.71363], [-94.69, 29.480000000000125], [-95.60026, 28.73863], [-96.59404, 28.30748], [-97.139999999999802, 27.83], [-97.37, 27.38], [-97.379999999999853, 26.69], [-97.33, 26.210000000000115], [-97.139999999999802, 25.87], [-97.529999999999859, 25.84], [-98.239999999999895, 26.060000000000109], [-99.019999999999854, 26.37], [-99.3, 26.84], [-99.52, 27.54], [-100.11, 28.11000000000012], [-100.45584, 28.696120000000118], [-100.957599999999886, 29.380710000000125], [-101.6624, 29.779300000000113], [-102.48, 29.76], [-103.11, 28.97], [-103.94, 29.27], [-104.456969999999814, 29.57196], [-104.705749999999895, 30.12173], [-105.03737, 30.64402], [-105.63159, 31.083830000000113], [-106.1429, 31.39995], [-106.507589999999794, 31.75452], [-108.24, 31.754853718166398], [-108.24194, 31.34222], [-109.035, 31.341940000000161], [-111.02361, 31.33472], [-113.30498, 32.03914], [-114.815, 32.52528], [-114.721389999999829, 32.72083], [-115.991349999999869, 32.61239000000014], [-117.127759999999753, 32.53534], [-117.295937691273863, 33.04622461520389], [-117.944, 33.621236431201389], [-118.410602275897475, 33.740909223124497], [-118.519894822799685, 34.027781577575745], [-119.081, 34.078], [-119.438840642016658, 34.348477178284291], [-120.36778, 34.44711], [-120.62286, 34.60855], [-120.74433, 35.156860000000101], [-121.714569999999853, 36.16153], [-122.54747, 37.551760000000101], [-122.51201, 37.783390000000132], [-122.95319, 38.113710000000104], [-123.7272, 38.951660000000111], [-123.865169999999878, 39.766990000000128], [-124.39807, 40.3132], [-124.17886, 41.142020000000109], [-124.2137, 41.999640000000134], [-124.532839999999894, 42.76599], [-124.14214, 43.70838], [-124.020535, 44.615895], [-123.898929999999893, 45.52341], [-124.079635, 46.86475], [-124.395669999999896, 47.72017], [-124.687210083007812, 48.184432983398537], [-124.566101074218736, 48.379714965820384], [-123.12, 48.04], [-122.587359999999876, 47.096], [-122.34, 47.36], [-122.5, 48.18], [-122.84, 49.0], [-120.0, 49.0], [-117.03121, 49.0], [-116.04818, 49.0], [-112.999999999999872, 49.0], [-110.049999999999812, 49.0], [-107.049999999999898, 49.0], [-104.04826, 48.99986], [-100.65, 49.0], [-97.228720000004699, 49.0007], [-95.159069509171943, 49.0], [-95.15609, 49.38425], [-94.81758, 49.38905]]], [[[-153.006314053336837, 57.115842190165878], [-154.0050902984581, 56.734676825581047], [-154.516402757770067, 56.992748928446687], [-154.670992804971092, 57.461195787172493], [-153.762779507441451, 57.816574612043773], [-153.228729417921073, 57.968968410872421], [-152.564790615835108, 57.901427313866961], [-152.141147223906273, 57.591058661521977], [-153.006314053336837, 57.115842190165878]]], [[[-165.579164191733554, 59.909986884187539], [-166.192770148767238, 59.754440822988961], [-166.848337368821944, 59.941406155020942], [-167.455277066090048, 60.213069159579376], [-166.467792121424566, 60.384169826897775], [-165.674429694663644, 60.293606879306232], [-165.579164191733554, 59.909986884187539]]], [[[-171.731656867539357, 63.782515367275906], [-171.114433560245175, 63.592191067144981], [-170.491112433940657, 63.694975490973505], [-169.682505459653555, 63.431115627691142], [-168.689439460300662, 63.297506212000584], [-168.77194088445458, 63.188598130945437], [-169.529439867204985, 62.976931464277882], [-170.290556200215917, 63.194437567794452], [-170.671385667990847, 63.375821845138965], [-171.553063117538642, 63.317789211675077], [-171.791110602891166, 63.40584585230048], [-171.731656867539357, 63.782515367275906]]], [[[-155.067790290324211, 71.147776394323685], [-154.344165208941206, 70.696408596470192], [-153.900006273392563, 70.889988511835682], [-152.210006069935275, 70.829992173944831], [-152.270002407826127, 70.60000621202984], [-150.739992438744508, 70.430016588005699], [-149.720003018167489, 70.530010484490433], [-147.613361579357047, 70.214034939241785], [-145.689989800225248, 70.120009670686741], [-144.920010959076393, 69.989991767040479], [-143.58944618042517, 70.152514146598307], [-142.072510348713365, 69.851938178172631], [-140.985987521560702, 69.711998399526365], [-140.985988329004869, 69.711998399526365], [-140.992498752029377, 66.000028591568665], [-140.997769748123119, 60.306396796298593], [-140.012997816153074, 60.276837877027575], [-139.03900042031583, 60.000007229240012], [-138.340889999999888, 59.562110000000146], [-137.4525, 58.905000000000101], [-136.47972, 59.46389], [-135.47583, 59.78778], [-134.945, 59.270560000000117], [-134.27111, 58.86111], [-133.355548882207188, 58.410285142645151], [-132.73042, 57.692890000000105], [-131.707809999999853, 56.55212], [-130.00778, 55.91583], [-129.979994263358265, 55.284997870497207], [-130.536110189467223, 54.802753404349389], [-131.08581823797212, 55.178906155002025], [-131.967211467142278, 55.497775580459049], [-132.250010742859445, 56.369996242897443], [-133.539181084356386, 57.178887437562125], [-134.07806292029602, 58.123067531966889], [-135.038211032279037, 58.187714748763931], [-136.628062309954629, 58.212209377670447], [-137.800006279686016, 58.499995429103777], [-139.867787041412981, 59.537761542389134], [-140.825273817133024, 59.72751740176507], [-142.574443535564427, 60.084446519604981], [-143.958880994879848, 59.99918040632339], [-145.925556816827822, 60.458609727614274], [-147.114373949146625, 60.884656073644628], [-148.224306200127643, 60.672989406977152], [-148.018065558850736, 59.978328965893631], [-148.570822516860858, 59.914172675203297], [-149.727857835875824, 59.705658270905545], [-150.608243374616421, 59.368211168039487], [-151.716392788683294, 59.155821031319974], [-151.859433153267105, 59.74498403587959], [-151.40971900124714, 60.725802720779392], [-150.346941494732505, 61.033587551509854], [-150.621110806256951, 61.284424953854447], [-151.895839199816834, 60.727197984451273], [-152.578329841095581, 60.061657212964285], [-154.019172126257558, 59.350279446034264], [-153.287511359653166, 58.864727688219787], [-154.232492438758442, 58.146373602930531], [-155.307491421510207, 57.727794501366319], [-156.308334723923082, 57.422774359763636], [-156.556097378546298, 56.979984849670636], [-158.117216559867728, 56.463608099994175], [-158.433321296197136, 55.994153550838533], [-159.603327399717415, 55.566686102920116], [-160.289719611634183, 55.643580634170561], [-161.223047655257773, 55.364734605523481], [-162.23776607974105, 55.024186916720097], [-163.069446581046378, 54.689737046927171], [-164.785569221027174, 54.40417308208216], [-164.942226325520011, 54.572224839895327], [-163.84833960676562, 55.039431464246107], [-162.870001390615897, 55.348043117893198], [-161.804174974596009, 55.894986477270429], [-160.563604702781134, 56.008054511125025], [-160.070559862284483, 56.418055324928744], [-158.684442918919416, 57.016675116597852], [-158.461097378553944, 57.216921291728866], [-157.722770352183858, 57.570000515363056], [-157.550274421193564, 58.328326321030218], [-157.041674974576949, 58.918884589261708], [-158.194731208305427, 58.615802313869828], [-158.517217984023034, 58.787781480537305], [-159.058606126928709, 58.424186102931671], [-159.711667040017318, 58.931390285876333], [-159.981288825500144, 58.572549140041623], [-160.355271165996498, 59.071123358793628], [-161.355003425115001, 58.670837714260742], [-161.968893602526293, 58.671664537177371], [-162.054986538724648, 59.266925360747436], [-161.874170702135331, 59.633621324290587], [-162.518059048492034, 59.989723619213905], [-163.818341437820123, 59.798055731843377], [-164.662217577146407, 60.267484442782639], [-165.346387702474772, 60.507495632562396], [-165.350831875651835, 61.073895168697497], [-166.121379157555907, 61.500019029376212], [-165.734451870770471, 62.074996853271792], [-164.919178636717788, 62.633076483807919], [-164.562507901039339, 63.146378485763044], [-163.753332485996964, 63.219448961023758], [-163.067224494457832, 63.05945872664801], [-162.260555386381697, 63.541935736741159], [-161.534449836248569, 63.455816962326757], [-160.772506680321101, 63.76610810002326], [-160.958335130842528, 64.222798570402759], [-161.518068407212184, 64.402787584075313], [-160.777777676414729, 64.788603827566405], [-161.391926235987597, 64.777235012462327], [-162.453050096668818, 64.559444688568206], [-162.757786017894034, 64.338605455168803], [-163.54639421288428, 64.559160468190484], [-164.960829841145141, 64.446945095468848], [-166.425288255864473, 64.686672064870706], [-166.845004238939026, 65.088895575614529], [-168.110560065767146, 65.669997056736733], [-166.70527116602193, 66.088317776139391], [-164.474709642575448, 66.576660061297488], [-163.652511766595637, 66.576660061297488], [-163.788601651036117, 66.077207343196662], [-161.677774421210131, 66.116119696712403], [-162.489714525379981, 66.735565090595102], [-163.719716966791083, 67.116394558370089], [-164.430991380856511, 67.616338202577779], [-165.390286831706703, 68.042772121850234], [-166.764440680995989, 68.35887685817967], [-166.204707404626561, 68.883030910916162], [-164.430810513343431, 68.915535386827727], [-163.168613654614489, 69.371114813912882], [-162.930566169261965, 69.858061835399255], [-161.908897264635499, 70.333329983187625], [-160.93479651593367, 70.447689927849567], [-159.039175788387126, 70.891642157668926], [-158.119722866833939, 70.824721177851032], [-156.580824551398024, 71.357763576941736], [-155.067790290324211, 71.147776394323685]]]] } },
+            { "type": "Feature", "properties": { "admin": "Uzbekistan", "name": "Uzbekistan", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[66.518606805288655, 37.362784328758785], [66.546150343700205, 37.974684963526855], [65.215998976507379, 38.402695013984292], [64.170223016216752, 38.892406724598231], [63.518014764261018, 39.363256537425627], [62.374260288344992, 40.053886216790382], [61.882714064384679, 41.084856879229392], [61.547178989513547, 41.2663703476546], [60.46595299667068, 41.22032664648254], [60.083340691981654, 41.425146185871391], [59.976422153569771, 42.223081976890199], [58.629010857991453, 42.751551011723045], [57.786529982337065, 42.170552883465511], [56.93221520368779, 41.82602610937559], [57.096391229079089, 41.32231008561056], [55.968191359282898, 41.308641669269356], [55.928917270741081, 44.995858466159099], [58.503127068928457, 45.586804307632818], [58.689989048095882, 45.500013739598621], [60.239971958258316, 44.784036770194717], [61.05831994003244, 44.405816962250505], [62.013300408786236, 43.504476630215642], [63.185786981056559, 43.650074978197999], [64.900824415959264, 43.728080552742576], [66.098012322865074, 42.997660020513088], [66.023391554635609, 41.994646307943974], [66.510648634715707, 41.987644151368436], [66.714047072216502, 41.168443508461493], [67.985855747351806, 41.135990708982213], [68.259895867795606, 40.662324530594894], [68.632482944620008, 40.668680731766798], [69.070027296835306, 41.384244289712363], [70.388964878220776, 42.081307684897439], [70.96231489449913, 42.266154283205481], [71.259247674448218, 42.167710679689456], [70.420022414028196, 41.519998277343134], [71.157858514291576, 41.143587144529107], [71.870114780570447, 41.392900092121259], [73.055417108049156, 40.86603302668945], [71.774875115856545, 40.145844428053763], [71.014198032520156, 40.244365546218226], [70.601406691372674, 40.218527330072284], [70.458159621059608, 40.49649485937028], [70.666622348925031, 40.960213324541407], [69.329494663372813, 40.727824408524839], [69.011632928345477, 40.086158148756653], [68.536416456989414, 39.533452867178923], [67.701428664017342, 39.580478420564518], [67.442219679641298, 39.140143541005479], [68.176025018185911, 38.901553453113898], [68.392032505165943, 38.157025254868728], [67.829999627559502, 37.144994004864678], [67.075782098259609, 37.35614390720928], [66.518606805288655, 37.362784328758785]]] } },
+            { "type": "Feature", "properties": { "admin": "Venezuela", "name": "Venezuela", "continent": "South America" }, "geometry": { "type": "Polygon", "coordinates": [[[-71.331583624950284, 11.776284084515805], [-71.36000566271079, 11.53999359786121], [-71.947049933546495, 11.423282375530018], [-71.620868292920164, 10.969459947142791], [-71.633063930941063, 10.446494452349027], [-72.074173956984495, 9.865651353388369], [-71.695644090446521, 9.072263088411246], [-71.26455929226772, 9.137194525585981], [-71.039999355743376, 9.859992784052407], [-71.350083787710773, 10.211935126176213], [-71.400623338492224, 10.968969021036013], [-70.155298834906503, 11.375481675660039], [-70.293843349881016, 11.846822414594211], [-69.943244594996813, 12.162307033736095], [-69.584300096297454, 11.459610907431211], [-68.882999233664435, 11.44338450769156], [-68.233271450458716, 10.885744126829945], [-68.194126552997616, 10.554653225135921], [-67.296248541926317, 10.545868231646306], [-66.227864142507983, 10.648626817258684], [-65.655237596281737, 10.20079885501732], [-64.890452236578156, 10.077214667191296], [-64.329478725833724, 10.389598700395679], [-64.318006557864933, 10.641417954953978], [-63.079322475828725, 10.701724351438598], [-61.880946010980182, 10.7156253117251], [-62.730118984616396, 10.420268662960904], [-62.388511928950969, 9.948204453974636], [-61.588767462801918, 9.873066921422263], [-60.830596686431711, 9.38133982994894], [-60.671252407459718, 8.580174261911877], [-60.150095587796166, 8.602756862823425], [-59.758284878159181, 8.367034816924045], [-60.550587938058186, 7.779602972846178], [-60.637972785063752, 7.414999904810853], [-60.295668097562377, 7.043911444522918], [-60.543999192940966, 6.856584377464881], [-61.159336310456467, 6.696077378766317], [-61.139415045807937, 6.234296779806142], [-61.410302903881941, 5.959068101419616], [-60.733574184803707, 5.2002772078619], [-60.601179165271922, 4.918098049332129], [-60.966893276601517, 4.536467596856638], [-62.085429653559125, 4.162123521334308], [-62.804533047116692, 4.006965033377951], [-63.093197597899092, 3.770571193858784], [-63.888342861574145, 4.020530096854571], [-64.628659430587533, 4.14848094320925], [-64.816064012294007, 4.056445217297422], [-64.368494432214092, 3.797210394705246], [-64.408827887617903, 3.126786200366623], [-64.269999152265783, 2.497005520025566], [-63.422867397705105, 2.411067613124174], [-63.368788011311644, 2.200899562993129], [-64.083085496666072, 1.91636912679408], [-64.199305792890499, 1.49285492594602], [-64.611011928959854, 1.328730576987041], [-65.354713304288353, 1.0952822941085], [-65.548267381437554, 0.78925446207603], [-66.325765143484944, 0.724452215982012], [-66.876325853122566, 1.253360500489336], [-67.181294318293041, 2.250638129074062], [-67.447092047786299, 2.600280869960869], [-67.809938117123693, 2.820655015469569], [-67.303173183853417, 3.31845408773718], [-67.33756384954367, 3.542342230641721], [-67.621835903581271, 3.839481716319994], [-67.823012254493534, 4.503937282728898], [-67.744696621355203, 5.221128648291667], [-67.521531948502741, 5.556870428891968], [-67.34143958196556, 6.095468044454021], [-67.695087246355001, 6.267318020040645], [-68.265052456318216, 6.153268133972473], [-68.985318569602327, 6.206804917826856], [-69.389479946557103, 6.099860541198835], [-70.093312954372408, 6.960376491723109], [-70.674233567981503, 7.087784735538717], [-71.960175747348629, 6.991614895043538], [-72.19835242378187, 7.340430813013682], [-72.444487270788059, 7.42378489830048], [-72.479678921178831, 7.632506008327352], [-72.360900641555958, 8.002638454617893], [-72.439862230097944, 8.405275376820027], [-72.660494757768092, 8.62528778730268], [-72.788729824500379, 9.085027167187331], [-73.304951544880026, 9.151999823437604], [-73.027604132769554, 9.736770331252441], [-72.905286017534692, 10.45034434655477], [-72.614657762325194, 10.821975409381777], [-72.227575446242923, 11.108702093953237], [-71.973921678338272, 11.608671576377116], [-71.331583624950284, 11.776284084515805]]] } },
+            { "type": "Feature", "properties": { "admin": "Vietnam", "name": "Vietnam", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[108.050180291782908, 21.552379869060111], [106.715067987090066, 20.696850694252014], [105.881682163519002, 19.752050482659694], [105.662005649846279, 19.058165188060567], [106.426816847765991, 18.004120998603224], [107.36195356651973, 16.697456569887049], [108.269495070429599, 16.079742336486145], [108.877106561317447, 15.276690578670436], [109.335269810017209, 13.42602834721772], [109.200135939573954, 11.666859239137761], [108.366129998815424, 11.00832062422627], [107.22092858279521, 10.36448395430183], [106.4051127462034, 9.530839748569317], [105.158263787865081, 8.599759629750492], [104.795185174582372, 9.2410383162765], [105.076201613385592, 9.918490505406806], [104.334334751403446, 10.486543687375228], [105.199914992292321, 10.889309800658094], [106.249670037869436, 10.961811835163585], [105.810523716253101, 11.567614650921225], [107.491403029410861, 12.337205918827944], [107.614547967562402, 13.535530707244202], [107.382727492301058, 14.202440904186968], [107.564525181103875, 15.202173163305554], [107.312705926545576, 15.908538316303177], [106.55600792849566, 16.604283962464802], [105.925762160264, 17.485315456608955], [105.094598423281496, 18.666974595611073], [103.896532017026701, 19.265180975821799], [104.183387892678908, 19.624668077060214], [104.822573683697073, 19.886641750563879], [104.435000441508024, 20.758733221921528], [103.203861118586431, 20.766562201413745], [102.754896274834636, 21.675137233969462], [102.170435825613552, 22.464753119389297], [102.706992222100084, 22.708795070887668], [103.504514601660546, 22.703756618739202], [104.476858351664447, 22.819150092046961], [105.329209425886603, 23.352063300056908], [105.811247186305209, 22.976892401617899], [106.725403273548451, 22.794267889898414], [106.567273390735295, 22.218204860924768], [107.043420037872608, 21.811898912029907], [108.050180291782908, 21.552379869060111]]] } },
+            { "type": "Feature", "properties": { "admin": "Vanuatu", "name": "Vanuatu", "continent": "Oceania" }, "geometry": { "type": "MultiPolygon", "coordinates": [[[[167.844876743845077, -16.466333103097153], [167.515181105822847, -16.597849623279966], [167.180007765977791, -16.159995212470957], [167.2168013857696, -15.891846205308449], [167.844876743845077, -16.466333103097153]]], [[[167.107712437201485, -14.933920179913951], [167.2700281110302, -15.74002084723487], [167.001207310247935, -15.614602146062492], [166.79315799384085, -15.668810723536719], [166.649859247095549, -15.392703545801192], [166.629136997746429, -14.6264970842096], [167.107712437201485, -14.933920179913951]]]] } },
+            { "type": "Feature", "properties": { "admin": "Yemen", "name": "Yemen", "continent": "Asia" }, "geometry": { "type": "Polygon", "coordinates": [[[53.108572625547502, 16.651051133688949], [52.385205926325874, 16.38241120041965], [52.191729363825075, 15.938433132384018], [52.168164910699986, 15.597420355689945], [51.172515089732471, 15.175249742081489], [49.574576450403136, 14.708766587782746], [48.679230584514151, 14.003202419485657], [48.238947381387412, 13.948089504446369], [47.938914015500771, 14.007233181204423], [47.354453566279702, 13.592219753468379], [46.71707645039173, 13.399699204965016], [45.877592807810252, 13.347764390511681], [45.625050083199874, 13.290946153206759], [45.406458774605241, 13.02690542241143], [45.144355910020849, 12.953938300015306], [44.9895333188744, 12.699586900274708], [44.494576450382844, 12.721652736863344], [44.175112745954486, 12.585950425664873], [43.48295861183712, 12.63680003504008], [43.222871128112118, 13.220950425667422], [43.251448195169516, 13.767583726450848], [43.087943963398047, 14.062630316621306], [42.892245314308717, 14.802249253798745], [42.604872674333606, 15.213335272680592], [42.805015496600042, 15.261962795467252], [42.702437778500652, 15.718885809791995], [42.823670688657408, 15.911742255105263], [42.779332309750963, 16.34789134364868], [43.218375278502734, 16.666889960186406], [43.115797560403351, 17.088440456607369], [43.380794305196098, 17.579986680567668], [43.791518589051904, 17.319976711491105], [44.062613152855072, 17.410358791569589], [45.216651238797184, 17.43332896572333], [45.399999220568752, 17.333335069238554], [46.366658563020529, 17.233315334537632], [46.749994337761642, 17.283338120996174], [47.000004917189749, 16.949999294497438], [47.466694777217626, 17.116681626854877], [48.183343540241324, 18.166669216377311], [49.116671583864857, 18.616667588774941], [52.000009800022227, 19.000003363516054], [52.782184279192037, 17.349742336491229], [53.108572625547502, 16.651051133688949]]] } },
+            { "type": "Feature", "properties": { "admin": "South Africa", "name": "South Africa", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.521001417778869, -29.257386976846245], [31.325561150850994, -29.401977634398907], [30.901762729625336, -29.909956963828034], [30.622813348113816, -30.423775730106122], [30.055716180142774, -31.140269463832951], [28.925552605919535, -32.172041110972494], [28.219755893677092, -32.771952813448848], [27.464608188595967, -33.226963799778794], [26.419452345492818, -33.614950453426175], [25.909664340933482, -33.667040297176392], [25.78062828950069, -33.944646091448334], [25.172861769315965, -33.796851495093577], [24.67785322439212, -33.987175795224537], [23.594043409934635, -33.794474379208147], [22.988188917744729, -33.916430759416976], [22.574157342222232, -33.864082533505304], [21.542799106541022, -34.258838799782922], [20.689052768646999, -34.417175388325226], [20.071261020597628, -34.795136814107984], [19.616405063564567, -34.819166355123706], [19.193278435958714, -34.462598972309777], [18.855314568769867, -34.444305515278458], [18.424643182049376, -33.997872816708963], [18.377410922934612, -34.13652068454806], [18.244499139079917, -33.867751560198023], [18.250080193767442, -33.281430759414434], [17.925190463948436, -32.61129078545342], [18.247909783611185, -32.429131361624563], [18.221761508871477, -31.661632989225662], [17.566917758868861, -30.72572112398754], [17.0644161312627, -29.878641045859158], [17.06291751472622, -29.875953871379977], [16.344976840895239, -28.576705010697697], [16.824017368240899, -28.082161553664466], [17.218928663815401, -28.355943291946804], [17.387497185951499, -28.783514092729774], [17.836151971109526, -28.856377862261311], [18.464899122804745, -29.045461928017271], [19.002127312911082, -28.972443129188857], [19.89473432788861, -28.461104831660769], [19.895767856534427, -24.767790215760588], [20.165725538827186, -24.917961928000768], [20.758609246511831, -25.868136488551446], [20.666470167735437, -26.477453301704916], [20.889609002371731, -26.828542982695907], [21.60589603036939, -26.726533705351748], [22.105968865657864, -26.28025603607913], [22.579531691180584, -25.979447523708142], [22.824271274514896, -25.500458672794768], [23.312096795350179, -25.268689873965712], [23.733569777122703, -25.39012948985161], [24.211266717228792, -25.670215752873567], [25.025170525825782, -25.719670098576891], [25.664666375437712, -25.486816094669706], [25.765848829865206, -25.174845472923671], [25.941652052522151, -24.696373386333214], [26.485753208123292, -24.616326592713097], [26.78640669119741, -24.240690606383478], [27.119409620886238, -23.574323011979772], [28.017235955525244, -22.827753594659072], [29.432188348109033, -22.091312758067584], [29.839036899542965, -22.102216485281172], [30.322883335091767, -22.271611830333931], [30.659865350067083, -22.151567478119912], [31.191409132621278, -22.251509698172395], [31.670397983534645, -23.658969008073861], [31.930588820124242, -24.369416599222532], [31.752408481581874, -25.484283949487406], [31.837777947728057, -25.843331801051342], [31.333157586397899, -25.660190525008943], [31.044079624157146, -25.731452325139436], [30.949666782359905, -26.022649021104144], [30.676608514129633, -26.398078301704604], [30.685961948374477, -26.743845310169526], [31.282773064913325, -27.285879408478991], [31.868060337051073, -27.17792734142127], [32.071665480281062, -26.733820082304902], [32.830120477028878, -26.74219166433619], [32.580264926897677, -27.470157566031808], [32.462132602678444, -28.30101124442055], [32.203388706193032, -28.752404880490065], [31.521001417778869, -29.257386976846245]], [[28.978262566857236, -28.955596612261708], [28.541700066855491, -28.647501722937562], [28.07433841320778, -28.851468601193581], [27.532511020627471, -29.242710870075353], [26.999261915807629, -29.875953871379977], [27.749397006956478, -30.645105889612214], [28.107204624145421, -30.545732110314944], [28.291069370239903, -30.226216729454293], [28.848399692507734, -30.070050551068245], [29.018415154748016, -29.743765557577362], [29.325166456832587, -29.257386976846245], [28.978262566857236, -28.955596612261708]]] } },
+            { "type": "Feature", "properties": { "admin": "Zambia", "name": "Zambia", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[32.759375441221316, -9.230599053589058], [33.231387973775291, -9.676721693564799], [33.485687697083584, -10.525558770391111], [33.315310499817279, -10.796549981329695], [33.114289178201908, -11.607198174692311], [33.306422153463068, -12.435778090060214], [32.991764357237876, -12.783870537978272], [32.688165317523122, -13.712857761289273], [33.214024692525207, -13.97186003993615], [30.179481235481827, -14.796099134991525], [30.274255812305103, -15.507786960515208], [29.51683434420314, -15.644677829656386], [28.947463413211256, -16.043051446194436], [28.825868768028492, -16.389748630440611], [28.467906121542676, -16.468400160388843], [27.598243442502753, -17.290830580314005], [27.044427117630729, -17.938026218337427], [26.706773309035633, -17.961228936436477], [26.381935255648919, -17.846042168857892], [25.264225701608005, -17.736539808831413], [25.084443393664564, -17.661815687737366], [25.076950310982255, -17.578823337476617], [24.6823490740015, -17.35341073981947], [24.033861525170771, -17.29584319424632], [23.215048455506057, -17.52311614346598], [22.562478468524255, -16.89845142992181], [21.887842644953867, -16.080310153876876], [21.933886346125913, -12.898437188369357], [24.016136508894672, -12.91104623784857], [23.930922072045373, -12.565847670138854], [24.079905226342838, -12.191296888887361], [23.904153680118181, -11.722281589406318], [24.017893507592586, -11.237298272347088], [23.912215203555714, -10.926826267137512], [24.257155389103982, -10.951992689663655], [24.314516228947948, -11.262826429899269], [24.783169793402948, -11.238693536018962], [25.418118116973197, -11.330935967659958], [25.752309604604726, -11.784965101776356], [26.55308759939961, -11.924439792532125], [27.164419793412456, -11.608748467661071], [27.38879886242378, -12.132747491100663], [28.15510867687998, -12.272480564017894], [28.52356163912102, -12.698604424696679], [28.934285922976834, -13.248958428605132], [29.699613885219485, -13.257226657771827], [29.616001417771223, -12.178894545137307], [29.341547885869087, -12.36074391037241], [28.642417433392346, -11.971568698782312], [28.372253045370421, -11.793646742401389], [28.496069777141763, -10.789883721564044], [28.673681674928922, -9.605924981324931], [28.449871046672818, -9.164918308146083], [28.734866570762495, -8.526559340044576], [29.002912225060467, -8.40703175215347], [30.34608605319081, -8.238256524288216], [30.740015496551781, -8.340007419470913], [31.157751336950042, -8.594578747317362], [31.55634809746649, -8.76204884199864], [32.191864861791963, -8.930358981973276], [32.759375441221316, -9.230599053589058]]] } },
+            { "type": "Feature", "properties": { "admin": "Zimbabwe", "name": "Zimbabwe", "continent": "Africa" }, "geometry": { "type": "Polygon", "coordinates": [[[31.191409132621278, -22.251509698172395], [30.659865350067083, -22.151567478119912], [30.322883335091767, -22.271611830333931], [29.839036899542965, -22.102216485281172], [29.432188348109033, -22.091312758067584], [28.794656202924209, -21.639454034107445], [28.02137007010861, -21.485975030200578], [27.727227817503252, -20.851801853114711], [27.724747348753247, -20.499058526290387], [27.296504754350501, -20.391519870690995], [26.164790887158478, -19.293085625894935], [25.850391473094724, -18.714412937090533], [25.649163445750155, -18.536025892818987], [25.264225701608005, -17.736539808831413], [26.381935255648919, -17.846042168857892], [26.706773309035633, -17.961228936436477], [27.044427117630729, -17.938026218337427], [27.598243442502753, -17.290830580314005], [28.467906121542676, -16.468400160388843], [28.825868768028492, -16.389748630440611], [28.947463413211256, -16.043051446194436], [29.51683434420314, -15.644677829656386], [30.274255812305103, -15.507786960515208], [30.338954705534537, -15.880839125230242], [31.173063999157673, -15.860943698797868], [31.636498243951188, -16.071990248277881], [31.852040643040592, -16.319417006091374], [32.328238966610222, -16.392074069893749], [32.847638787575839, -16.713398125884613], [32.849860874164385, -17.979057305577175], [32.654885695127142, -18.672089939043492], [32.611994256324884, -19.419382826416268], [32.772707960752619, -19.715592136313294], [32.659743279762573, -20.30429005298231], [32.508693068173436, -20.395292250248303], [32.244988234188007, -21.116488539313689], [31.191409132621278, -22.251509698172395]]] } }
+        ]
+    };
+
+var randomcountriesData1 = [
+    { country: "Iran", "continent": "Asia", "CategoryName": "Books", "Sales": 550 },
+    { country: "Benin", "continent": "Africa", "CategoryName": "Books", "Sales": 1000 },
+    { country: "China", "continent": "Asia", "CategoryName": "Books", "Sales": 420 },
+    { country: "Chile", "continent": "South America", "CategoryName": "Books", "Sales": 1100 },
+    { country: "Cuba", "continent": "North America", "CategoryName": "Books", "Sales": 450 },
+    { country: "Spain", "continent": "Europe", "CategoryName": "Books", "Sales": 1200 },
+    { country: "Fiji", "continent": "Oceania", "CategoryName": "Books", "Sales": 618.0 },
+];
+
+module mapcomponenet {
+    $(function () {
+        var mapsample = new ej.datavisualization.Map($("#map"), {
+            enableAnimation: true,
+            navigationControl: {
+                enableNavigation: true,
+                orientation: 'vertical',
+                absolutePosition: { x: 5, y: 15 },
+                dockPosition: 'none'
+            },
+            layers: [
+                {
+                    layerType: 'geometry',
+                    enableMouseHover: false,
+                    enableSelection: false,
+                    shapeSettings: {
+                        fill: "#626171",
+                        autoFill: false,
+                        highlightStroke: "white",
+                        stroke: "white",
+                        strokeThickness: 0.5,
+                        highlightColor: "#BFBFBF"
+                    },
+                    shapeData: world_map,
+                    legendSettings: { dockOnMap: false }
+                }
+            ]
+        });
+    });
+}
+
+
+
+
+
+
+module MenuComponent {
+    $(function () {
+        var sample = new ej.Menu($("#syncfusionProducts"),{
+            width: "100%",
+            animationType: ej.AnimationType.Default,
+            cssClass: 'gradient-lime ',
+            enableAnimation: true,
+            enableSeparator: true,
+            height: 40,
+            htmlAttributes: { "aria-label": "menu" },
+            menuType: "normalmenu",
+            orientation: ej.Orientation.Horizontal,
+            showRootLevelArrows: true,
+            showSubLevelArrows: true,
+            subMenuDirection: ej.Direction.Right,
+            titleText: "Menu",
+        });
+    });
+}
+
+
+module NavigationDrawerComponent {
+    $(function () {
+        var navigationdrawerInstance = new ej.NavigationDrawer($("#navpane"), {
+           targetId: "butdrawer",
+            contentId: "content_container",
+            type: "overlay",
+            direction: "left",
+            enableListView: true,
+            listViewSettings: {
+                width: 300,
+                selectedItemIndex: 0
+            },
+            position: "normal"
+        });
+		$("#navpane_listview").click(function(e: any) {
+            var text=e.target["text"]||$(e.target).closest("li.e-list").text();
+            $("#butdrawer").parent().children("h2").text(text);
+        });
+    });
+}
+
+
+
+module PDFViewerComponent {
+    $(function () {
+        var pdfviewerControl = new ej.PdfViewer($("#pdfviewer"), {
+            serviceUrl:(<any>window).baseurl+ "api/PdfViewer",
+            isResponsive: true
+        });
+    });
+}
+
+
+
+module PivotChartOlap {
+    $(function () {
+        var sample = new ej.PivotChart($("#PivotChart"),{
+            dataSource: {
+			data: "//bi.syncfusion.com/olap/msmdpump.dll",
+			catalog: "Adventure Works DW 2008 SE",
+			cube: "Adventure Works",
+			rows: [
+				{
+					fieldName: "[Date].[Fiscal]"
+				}
+			],
+			columns: [
+				{
+					fieldName: "[Customer].[Customer Geography]"
+				}
+			],
+			values: [
+				{
+					measures: [
+						{
+							fieldName: "[Measures].[Internet Sales Amount]"
+						}
+                    ],
+					axis: "columns"
+				}
+            ],
+			filters:[]
+        },
+		isResponsive: true,zooming:{enableScrollbar: true},
+        commonSeriesOptions: {
+			type: "column"
+		},
+		size: { height: "460px", width: "100%" },
+		primaryXAxis: { title: { text: "Date - Fiscal" }, labelRotation: 0 },
+		primaryYAxis: { title: { text: "Internet Sales Amount" } },
+		legend: { visible: true, rowCount: 2 },
+        load: function () {
+                var PivotChart = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                PivotChart = PivotChart.toString();
+                if (PivotChart.indexOf("dark") > -1 || PivotChart.indexOf("contrast") > -1)
+                    PivotChart = "flatdark";
+                else
+                    PivotChart = "flatlight";
+                this.model.theme = PivotChart;
+            },
+        });
+    });
+}
+
+
+
+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" },
+    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
+    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
+    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
+    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
+    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
+    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
+    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
+    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
+    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
+    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
+    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
+    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
+    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
+    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
+    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
+    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
+    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
+    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
+    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
+]
+
+module PivotChartRelational {
+
+    $(function () {
+        var sample = new ej.PivotChart($("#PivotChart"),{
+            dataSource: {
+			data: pivot_dataset,
+			rows: [
+				{
+					fieldName: "Country",
+					fieldCaption: "Country"
+				},
+				{
+					fieldName: "State",
+					fieldCaption: "State"
+				},
+				{
+					fieldName: "Date",
+					fieldCaption: "Date"
+				}
+			],
+			columns: [
+				{
+					fieldName: "Product",
+					fieldCaption: "Product"
+				}
+			],
+			values: [
+				{
+					fieldName: "Amount",
+					fieldCaption: "Amount"
+				}
+			],
+			filters:[]
+		},
+		isResponsive: true,zooming:{enableScrollbar: true},
+		commonSeriesOptions: {
+			type: "column"
+		},
+		size: { height: "460px", width: "100%" },
+		primaryYAxis: { title: { text: "Amount" } },
+		legend: { visible: true },
+        load: function () {
+                var PivotChart = (<any>window).themeStyle + (<any>window).themeColor + (<any>window).themeVarient;
+                PivotChart = PivotChart.toString();
+                if (PivotChart.indexOf("dark") > -1 || PivotChart.indexOf("contrast") > -1)
+                    PivotChart = "flatdark";
+                else
+                    PivotChart = "flatlight";
+                this.model.theme = PivotChart;
+            },
+        });
+    });
+}
+
+
+
+module PivotGaugeOlap {
+
+    $(function () {
+        var sample = new ej.PivotGauge($("#PivotGauge"),{
+            dataSource: {
+				data: "//bi.syncfusion.com/olap/msmdpump.dll",
+				catalog: "Adventure Works DW 2008 SE",
+				cube: "Adventure Works",
+				rows: [
+					{
+						fieldName: "[Date].[Fiscal]",
+						filterItems: { filterType: "include", values: ["[Date].[Fiscal].[Fiscal Year].&amp;[2004]"] }
+					},
+				],
+				columns: [
+					{
+						fieldName: "[Customer].[Customer Geography]"
+					}
+				],
+				values: [
+					{
+						measures: [
+							{
+								fieldName: "[Measures].[Internet Sales Amount]"
+							},
+							{
+								fieldName: "[Measures].[Internet Revenue Status]"
+							},
+							{
+								fieldName: "[Measures].[Internet Revenue Trend]"
+							},
+							{
+								fieldName: "[Measures].[Internet Revenue Goal]"
+							},
+						],
+						axis: "columns"
+					}
+				],
+				filters:[]
+			},
+            enableTooltip: true, isResponsive: true,
+            labelFormatSettings: { decimalPlaces: 2 },
+			scales: [{
+				showRanges: true,
+				radius: 150, showScaleBar: true, size: 1,
+                border: {
+					width: 0.5
+				},
+				showIndicators: true, showLabels: true,
+                pointers: [{
+					showBackNeedle: true,
+					backNeedleLength: 20,
+					length: 120,
+					width: 7
+                },
+				{
+					type: "marker",
+					markerType: "diamond",
+					distanceFromScale: 5,
+					placement: "center",
+					backgroundColor: "#29A4D9",
+					length: 25,
+					width: 15
+				}],
+                ticks: [{
+					type: "major",
+                    distanceFromScale: 2,
+					height: 16,
+					width: 1, color: "#8c8c8c"
+				},
+                {
+					type: "minor",
+					height: 6,
+					width: 1,
+					distanceFromScale: 2,
+                    color: "#8c8c8c"
+                }],
+                labels: [{
+                    color: "#8c8c8c"
+				}],
+                ranges: [{
+					distanceFromScale: -5,
+                    backgroundColor: "#fc0606",
+					border: { color: "#fc0606" }
+                },
+				{
+					distanceFromScale: -5
+                }],
+				customLabels: [{
+					position: { x: 180, y: 290 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                },
+				{
+					position: { x: 180, y: 320 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                },
+				{
+                    position: { x: 180, y: 150 },
+                    font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                }]
+            }]
+        });
+    });
+}
+
+
+
+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" },
+    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
+    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
+    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
+    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
+    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
+    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
+    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
+    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
+    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
+    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
+    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
+    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
+    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
+    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
+    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
+    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
+    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
+    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
+    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
+]
+
+module PivotGaugeRelational {
+    $(function () {
+        var sample = new ej.PivotGauge($("#PivotGauge"),{
+            dataSource: {
+				data: pivot_dataset,
+				rows: [
+					{
+						fieldName: "Country",
+					},
+					{
+						fieldName: "State",
+					}
+				],
+				columns: [
+					{
+						fieldName: "Product",
+					}
+				],
+                values: [
+					{
+						fieldName: "Amount",
+					},
+					{
+						fieldName: "Quantity",
+					}
+				]
+			},
+            enableTooltip: true, isResponsive: true,
+            labelFormatSettings: { decimalPlaces: 2 },
+			scales: [{
+				showRanges: true,
+				radius: 150, showScaleBar: true, size: 1,
+                border: {
+					width: 0.5
+				},
+				showIndicators: true, showLabels: true,
+                pointers: [{
+					showBackNeedle: true,
+					backNeedleLength: 20,
+					length: 120,
+					width: 7
+                },
+				{
+					type: "marker",
+					markerType: "diamond",
+					distanceFromScale: 5,
+					placement: "center",
+					backgroundColor: "#29A4D9",
+					length: 25,
+					width: 15
+				}],
+                ticks: [{
+					type: "major",
+                    distanceFromScale: 2,
+					height: 16,
+					width: 1, color: "#8c8c8c"
+				},
+                {
+					type: "minor",
+					height: 6,
+					width: 1,
+					distanceFromScale: 2,
+                    color: "#8c8c8c"
+                }],
+                labels: [{
+                    color: "#8c8c8c"
+				}],
+                ranges: [{
+					distanceFromScale: -5,
+                    backgroundColor: "#fc0606",
+					border: { color: "#fc0606" }
+                },
+				{
+					distanceFromScale: -5
+                }],
+				customLabels: [{
+					position: { x: 180, y: 290 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                },
+				{
+					position: { x: 180, y: 320 },
+					font: { size: "10px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                },
+				{
+                    position: { x: 180, y: 150 },
+                    font: { size: "12px", fontFamily: "Segoe UI", fontStyle: "Normal" }, color: "#666666"
+                }]
+            }]
+        });
+    });
+}
+
+
+
+module PivotGridOlap {
+
+    $(function () {
+        var sample = new ej.PivotGrid($("#PivotGrid"),{
+            dataSource: {
+			data: "//bi.syncfusion.com/olap/msmdpump.dll",
+			catalog: "Adventure Works DW 2008 SE",
+			cube: "Adventure Works",
+			rows: [
+				{
+					fieldName: "[Date].[Fiscal]"
+				}
+			],
+			columns: [
+				{
+					fieldName: "[Customer].[Customer Geography]"
+				}
+			],
+            values: [
+				{
+					measures: [
+						{
+							fieldName: "[Measures].[Internet Sales Amount]",
+						}
+                    ],
+					axis: "columns"
+				}
+			],
+			filters:[]
+		},
+        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" },
+    { Amount: 300, Country: "Canada", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Brunswick" },
+    { Amount: 150, Country: "Canada", Date: "FY 2008", Product: "Bike", Quantity: 3, State: "Manitoba" },
+    { Amount: 200, Country: "Canada", Date: "FY 2006", Product: "Car", Quantity: 4, State: "Ontario" },
+    { Amount: 100, Country: "Canada", Date: "FY 2007", Product: "Van", Quantity: 1, State: "Quebec" },
+    { Amount: 200, Country: "France", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Charente-Maritime" },
+    { Amount: 250, Country: "France", Date: "FY 2006", Product: "Van", Quantity: 4, State: "Essonne" },
+    { Amount: 300, Country: "France", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Garonne (Haute)" },
+    { Amount: 150, Country: "France", Date: "FY 2008", Product: "Van", Quantity: 2, State: "Gers" },
+    { Amount: 200, Country: "Germany", Date: "FY 2006", Product: "Van", Quantity: 3, State: "Bayern" },
+    { Amount: 250, Country: "Germany", Date: "FY 2007", Product: "Car", Quantity: 3, State: "Brandenburg" },
+    { Amount: 150, Country: "Germany", Date: "FY 2008", Product: "Car", Quantity: 4, State: "Hamburg" },
+    { Amount: 200, Country: "Germany", Date: "FY 2008", Product: "Bike", Quantity: 4, State: "Hessen" },
+    { Amount: 150, Country: "Germany", Date: "FY 2007", Product: "Van", Quantity: 3, State: "Nordrhein-Westfalen" },
+    { Amount: 100, Country: "Germany", Date: "FY 2005", Product: "Bike", Quantity: 2, State: "Saarland" },
+    { Amount: 150, Country: "United Kingdom", Date: "FY 2008", Product: "Bike", Quantity: 5, State: "England" },
+    { Amount: 250, Country: "United States", Date: "FY 2007", Product: "Car", Quantity: 4, State: "Alabama" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Van", Quantity: 4, State: "California" },
+    { Amount: 100, Country: "United States", Date: "FY 2006", Product: "Bike", Quantity: 2, State: "Colorado" },
+    { Amount: 150, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "New Mexico" },
+    { Amount: 200, Country: "United States", Date: "FY 2005", Product: "Bike", Quantity: 4, State: "New York" },
+    { Amount: 250, Country: "United States", Date: "FY 2008", Product: "Car", Quantity: 3, State: "North Carolina" },
+    { Amount: 300, Country: "United States", Date: "FY 2007", Product: "Van", Quantity: 4, State: "South Carolina" }
+]
+
+module PivotGridRelational {
+    $(function () {
+        var sample = new ej.PivotGrid($("#PivotGrid"),{
+            dataSource: {
+			data: pivot_dataset,
+			rows: [
+				{
+					fieldName: "Country",
+					fieldCaption: "Country"
+				},
+				{
+					fieldName: "State",
+					fieldCaption: "State"
+				}
+			],
+			columns:
+				[{
+					fieldName: "Product",
+					fieldCaption: "Product"
+				}
+			],
+			values: [
+				{
+					fieldName: "Amount",
+                    fieldCaption: "Amount"
+				},
+				{
+					fieldName: "Quantity",
+					fieldCaption: "Quantity"
+				}
+            ],
+			filters:[]
+		},
+        enableGroupingBar: true,
+        pivotTableFieldListID:"PivotSchemaDesigner"
+        });
+       $("#PivotSchemaDesigner").ejPivotSchemaDesigner();
+    });
+}
+
+
+
+module PivotTreeMap {
+    $(function () {
+        var sample = new ej.PivotTreeMap($("#PivotTreeMap"),{
+            dataSource: {
+			data: "//bi.syncfusion.com/olap/msmdpump.dll;Locale Identifier=1033;",
+			catalog: "Adventure Works DW 2008 SE",
+			cube: "Adventure Works",
+			rows: [
+				{
+					fieldName: "[Customer].[Customer Geography]"
+				}
+			],
+			columns: [
+				{
+					fieldName: "[Date].[Fiscal]"
+				}
+			],
+            values: [
+				{
+					measures: [
+						{
+							fieldName: "[Measures].[Customer Count]",
+						}
+					],
+					axis: "columns"
+				}
+			],
+			filters:[]
+		}
+        });
+    });
+}
+
+
+
+module ProgressBarComponent {
+    $(function () {
+        var sample = new ej.ProgressBar($("#progressBar"),{
+            width: 200,
+            value: 45,
+            height: 20,
+            enablePersistence: true,
+            maxValue: 200,
+            minValue: 0,
+            showRoundedCorner: true,
+            text: 'loading...'
+        });
+    });
+
+}
+
+
+
+
+declare var rteObj: any;
+declare var data: any;
+var radialEle = $('#defaultradialmenu'), action = 0, forRedo = 0;
+var rteEle = $("#rteSample1");
+module RadialMenuComponent {
+    $(function () {
+
+        if (!(ej.browserInfo().name == "msie" && parseInt(ej.browserInfo().version) < 9)) {
+            var radialmenuInstance = new ej.RadialMenu($("#defaultradialmenu"), {
+                imageClass: "imageclass",
+                backImageClass: "backimageclass",
+                targetElementId: "radialtarget1"
+            });
+			$("#radialtarget1").parent().css("position", "relative");
+        }
+        else {
+            $("#contentDiv").html("Radial Menu is only supported from Internet Explorer Versioned 9 and above.").css({ "font-size": "20px", "color": "red" });
+        }
+        var rteInstance = new ej.RTE($("#rteSample1"), {
+            width: "100%",
+            minWidth: "10px",
+            change: (e) => { radialEle.ejRadialMenu("enableItem", "Undo"); },
+            select: (e) => {
+                var target = $("#radialtarget1"), radialRadius = 150, radialDiameter = 2 * radialRadius,
+                    // To get Iframe positions
+                    iframeY = e.event.clientY, iframeX = e.event.clientX,
+                    // To set Radial Menu position within target
+                    x = iframeX > target.width() - radialRadius ? target.width() - radialDiameter : (iframeX > radialRadius ? iframeX - radialRadius : 0),
+                    y = iframeY > target.height() - radialRadius ? target.height() - radialDiameter : (iframeY > radialRadius ? iframeY - radialRadius : 0);
+                radialEle.ejRadialMenu("setPosition", x, y);
+                radialEle.focus();
+                $('iframe').contents().find('body').blur();
+            },
+            showToolbar: false,
+            showContextMenu: false
+        });
+        $(window).resize(function () {
+            if (ej.isMobile() && ej.isPortrait())
+                $('#defaultradialmenu').css({ "left": 25 });
+        });
+    });
+}
+
+
+function bold(e: any) {
+
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("bold");
+    data = rteObj._getSelectedHtmlString() ? true : false;
+    if (data) action += 1;
+    forRedo = action;
+    radialEle.focus();
+}
+function italic(e: any) {
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("italic");
+    data = rteObj._getSelectedHtmlString() ? true : false;
+    if (data) action += 1;
+    forRedo = action;
+    radialEle.focus();
+}
+function undo(e: any) {
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("undo");
+    action -= 1;
+    if (action == 0)
+        radialEle.ejRadialMenu("disableItem", "Undo");
+    radialEle.ejRadialMenu("enableItem", "Redo");
+    radialEle.focus();
+}
+function redo(e: any) {
+    rteObj = rteEle.data("ejRTE");
+    rteObj.executeCommand("redo");
+    action += 1;
+    if (forRedo == action) radialEle.ejRadialMenu("disableItem", "Redo");
+    radialEle.ejRadialMenu("enableItem", "Undo");
+    radialEle.focus();
+}
+
+
+module RadialSliderComponent {
+    $(function () {
+        var radialsliderInstance = new ej.RadialSlider($("#radialSlider"), {
+           innerCircleImageUrl: "images/radialslider/chevron-right.png"
+        });
+    });
+}
+
+
+module rangecomponent {
+    $(function () {
+        var linearsample = new ej.datavisualization.RangeNavigator($("#RangeNavigator"), {
+            enableDeferredUpdate: true,
+            padding: "15",
+            allowSnapping: true,
+            selectedRangeSettings: {
+                start: "2010/5/1", end: "2011/10/1"
+            },
+            isResponsive: true,
+            tooltipSettings: {
+                visible: true, labelFormat: "MM/dd/yyyy", backgroundColor: "gray", tooltipDisplayMode: "ondemand"
+            },
+            load: () => {
+                var rn = $("#RangeNavigator").data("ejRangeNavigator");
+                rn.model.series = [
+                    {
+                        type: 'line',
+                        dataSource: data.Open, xName: "XValue", yName: "YValue",
+                        fill: '#69D2E7'
+                    }
+                ];
+            },
+            loaded: function () {
+                var sender = $("#RangeNavigator").data("ejRangeNavigator");
+                var theme = (<any>window).themeStyle + (<any>window).themeColor + (<any>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;
+                }
+            }
+
+        });
+    });
+}
+var data;
+data = GetData();
+
+function GetData() {
+    var series1:any[]=[];
+    var series2:any[]= [];
+    var value = 100;
+    var value1 = 120;
+    for (var i = 1; i < 730; i++) {
+
+        if (Math.random() > .5) {
+            value += Math.random();
+            value1 += Math.random();
+        } else {
+            value -= Math.random();
+            value1 -= Math.random();
+        }
+        var point1 = { XValue: new Date(2010, 0, i), YValue: value };
+        var point2 = { XValue: new Date(2010, 0, i), YValue: value1 };
+        series1.push(point1);
+        series2.push(point2);
+    }
+
+    data = { Open: series1, Close: series2 };
+    return data;
+};
+
+
+
+module RatingComponent {
+    $(function () {
+
+        var sample1 = new ej.Rating($("#fullRating"),{
+            value: 4,
+            precision: ej.Rating.Precision.Full,
+            allowReset: true,
+            cssClass: "gradient-lime",
+            enabled: true,
+            enablePersistence: true,
+            incrementStep: 2,
+            maxValue: 10,
+            minValue: 0,
+            orientation: ej.Orientation.Horizontal,
+            shapeHeight: 25,
+            shapeWidth: 25,
+            showTooltip: true
+        });
+
+        var sample2 = new ej.Rating($("#halfRating"),{
+            precision: ej.Rating.Precision.Half,
+            value: 3.5,
+            allowReset: true,
+            cssClass: "gradient-lime",
+            enabled: true,
+            enablePersistence: true,
+            incrementStep: 2,
+            maxValue: 10,
+            minValue: 0,
+            orientation: "horizontal",
+            shapeHeight: 25,
+            shapeWidth: 25,
+            showTooltip: true
+        });
+
+        var sample3 = new ej.Rating($("#exactRating"),{
+            precision: ej.Rating.Precision.Exact,
+            value: 3.7,
+            allowReset: true,
+            cssClass: "gradient-lime",
+            enabled: true,
+            enablePersistence: true,
+            incrementStep: 2,
+            maxValue: 10,
+            minValue: 0,
+            orientation: "horizontal",
+            shapeHeight: 25,
+            shapeWidth: 25,
+            showTooltip: true
+        });
+    });
+}
+
+
+
+module ReportViewerComponent {
+	$(function () {
+        var report = new ej.ReportViewer($("#DefaultReportViewer"), {
+			reportServiceUrl: (<any>window).baseurl + 'api/ReportViewer',
+			processingMode: ej.ReportViewer.ProcessingMode.Remote,
+            reportPath: "ConditionalFormating.rdl",
+			isResponsive: true
+		});
+	});
+}
+
+
+
+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 () {
+        var sample = new ej.Ribbon($("#defaultRibbon"), {
+            width: "100%",
+            expandPinSettings: {
+                toolTip: "Collapse the Ribbon"
+            },
+            collapsePinSettings: {
+                toolTip: "Pin the Ribbon"
+            },
+            applicationTab: {
+                 type: ej.Ribbon.ApplicationTabType.Menu, menuItemID: "ribbonmenu", menuSettings: { openOnClick: false }
+            },
+            tabs: [{
+                id: "home", text: "HOME", groups: [{
+                    text: "New", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                        groups: [{
+                            id: "new",
+                            text: "New",
+                            toolTip: "New",
+                            buttonSettings: {
+                                contentType: ej.ContentType.ImageOnly,
+                                imagePosition: ej.ImagePosition.ImageTop,
+                                prefixIcon: "e-icon e-ribbon e-new",
+                                click: "onClick"
+                            }
+                        }
+                        ],
+                        defaults: {
+                            type: "button",
+                            width: 60,
+                            height: 70
+                        }
+                    }]
+                },
+                {
+                        text: "Clipboard", alignType: ej.Ribbon.AlignType.Columns, content: [{
+                            groups: [{
+                                id: "paste",
+                                text: "paste",
+                                toolTip: "Paste",
+                                splitButtonSettings: {
+                                    contentType: ej.ContentType.ImageOnly,
+                                    prefixIcon: "e-icon e-ribbon e-ribbonpaste",
+                                    targetID: "pasteSplit",
+                                    buttonMode: "dropdown",
+                                    click: "onClick",
+                                    arrowPosition: ej.ArrowPosition.Bottom
+                                }
+                            }
+                            ],
+                            defaults: {
+                                type: "splitbutton",
+                                width: 50,
+                                height: 70
+                            }
+                        },
+                        {
+                             groups: [{
+                                    id: "cut",
+                                    text: "Cut",
+                                    toolTip: "Cut",
+                                    buttonSettings: {
+                                        contentType: ej.ContentType.TextAndImage,
+                                        click: "onClick",
+                                        prefixIcon: "e-icon e-ribbon e-ribboncut"
+                                    }
+                                },
+                                    {
+                                        id: "copy",
+                                        text: "Copy",
+                                        toolTip: "Copy",
+                                        buttonSettings: {
+                                            contentType: ej.ContentType.TextAndImage,
+                                            click: "onClick",
+                                            prefixIcon: "e-icon e-ribbon e-ribboncopy"
+                                        }
+                                    },
+                                    {
+                                        id: "clear",
+                                        text: "Clear",
+                                        toolTip: "Clear All",
+                                        buttonSettings: {
+                                            contentType: ej.ContentType.TextAndImage,
+                                            click: "onClick",
+                                            prefixIcon: "e-icon e-ribbon clearAll"
+                                        }
+                                    }],
+                                     defaults: {
+                                    type: "button",
+                                    width: 60,
+                                    isBig: false
+                                }
+                            }]
+                },
+                {
+                        text: "Font", alignType: "rows", content: [{
+                            groups: [{
+                                id: "fontfamily",
+                                toolTip: "Font",
+                                dropdownSettings: {
+                                    dataSource: fontfamily,
+                                    text: "Segoe UI",
+                                    select: "onClick",
+                                    width: 150
+                                }
+                            },
+                                {
+                                    id: "fontsize",
+                                    toolTip: "FontSize",
+                                    dropdownSettings: {
+                                        dataSource: fontsize,
+                                        text: "1pt",
+                                        select: "onClick",
+                                        width: 65
+                                    }
+                                }],
+                            defaults: {
+                                type: "dropdownlist",
+                                height: 28
+                            }
+                        },
+                            {
+                                groups: [{
+                                    id: "bold",
+                                    toolTip: "Bold",
+                                    type: ej.Ribbon.Type.ToggleButton,
+                                    toggleButtonSettings: {
+                                        contentType: ej.ContentType.ImageOnly,
+                                        defaultText: "Bold",
+                                        activeText: "Bold",
+                                        click: "onClick",
+                                        defaultPrefixIcon: "e-icon e-ribbon bold",
+                                        activePrefixIcon: "e-icon e-ribbon bold"
+                                    }
+                                },
+                                    {
+                                        id: "italic",
+                                        toolTip: "Italic",
+                                        type: ej.Ribbon.Type.ToggleButton,
+                                        toggleButtonSettings: {
+                                            contentType: ej.ContentType.ImageOnly,
+                                            defaultText: "Italic",
+                                            activeText: "Italic",
+                                            click: "onClick",
+                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonitalic",
+                                            activePrefixIcon: "e-icon e-ribbon e-ribbonitalic"
+                                        }
+                                    },
+                                    {
+                                        id: "underline",
+                                        text: "Underline",
+                                        toolTip: "Underline",
+                                        type: ej.Ribbon.Type.ToggleButton,
+                                        toggleButtonSettings: {
+                                            contentType: ej.ContentType.ImageOnly,
+                                            defaultText: "Underline",
+                                            activeText: "Underline",
+                                            click: "onClick",
+                                            defaultPrefixIcon: "e-icon e-ribbon e-ribbonunderline",
+                                            activePrefixIcon: "e-icon e-ribbon e-ribbonunderline"
+                                        }
+                                    },
+                                    {
+                                        id: "strikethrough",
+                                        text: "strikethrough",
+                                        toolTip: "Strikethrough",
+                                        type: ej.Ribbon.Type.ToggleButton,
+                                        toggleButtonSettings: {
+                                            contentType: ej.ContentType.ImageOnly,
+                                            defaultText: "Strikethrough",
+                                            activeText: "Strikethrough",
+                                            click: "onClick",
+                                            defaultPrefixIcon: "e-icon e-ribbon strikethrough",
+                                            activePrefixIcon: "e-icon e-ribbon strikethrough"
+                                        }
+                                    },
+                                    {
+                                        id: "superscript",
+                                        text: "superscript",
+                                        toolTip: "Superscript",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-superscripticon"
+                                        }
+                                    },
+                                    {
+                                        id: "subscript",
+                                        text: "subscript",
+                                        toolTip: "Subscript",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-subscripticon"
+                                        }
+                                    },
+                                    {
+                                        id: "fontcolor",
+                                        text: "Font Color",
+                                        toolTip: "Font Color",
+                                        type: ej.Ribbon.Type.Custom,
+                                        contentID: "fontcolor"
+                                    },
+                                    {
+                                        id: "fillcolor",
+                                        text: "Fill Color",
+                                        toolTip: "Fill Color",
+                                        type: ej.Ribbon.Type.Custom,
+                                        contentID: "fillcolor"
+                                    }
+                                ],
+                                defaults: {
+                                    isBig: false
+                                }
+                            }]
+                    },
+                    {
+                        text: "Alignment", alignType: ej.Ribbon.AlignType.Rows, content: [
+                            {
+                                groups: [{
+                                    id: "bullet",
+                                    text: "Bullet Format",
+                                    toolTip: "Bullets",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.ImageOnly,
+                                        prefixIcon: "e-icon e-ribbon e-bullet"
+                                    }
+                                },
+                                    {
+                                        id: "number",
+                                        text: "Number Format",
+                                        toolTip: "Numbering",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-numbericon"
+                                        }
+                                    },
+                                    {
+                                        id: "textindent",
+                                        text: "Indent",
+                                        toolTip: "Text Indent",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-indent"
+                                        }
+                                    },
+                                    {
+                                        id: "textoudent",
+                                        text: "Outdent",
+                                        toolTip: "Text Outdent",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-outdent"
+                                        }
+                                    },
+                                    {
+                                        id: "sortascending",
+                                        text: "Sort",
+                                        toolTip: "Sort",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-sort"
+                                        }
+                                    },
+                                    {
+                                        id: "border",
+                                        text: "Border",
+                                        toolTip: "Border",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-border"
+                                        }
+                                    }],
+                                defaults: {
+                                    type: "button",
+                                    isBig: false
+                                }
+                            },
+                            {
+                                groups: [{
+                                    id: "alignleft",
+                                    text: "JustifyLeft",
+                                    toolTip: "Align Left",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.ImageOnly,
+                                        prefixIcon: "e-icon e-ribbon alignleft"
+                                    }
+                                },
+                                    {
+                                        id: "aligncenter",
+                                        text: "JustifyCenter",
+                                        toolTip: "Align Center",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon aligncenter"
+                                        }
+                                    },
+                                    {
+                                        id: "alignright",
+                                        text: "JustifyRight",
+                                        toolTip: "Align Right",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon alignright"
+                                        }
+                                    },
+                                    {
+                                        id: "justify",
+                                        text: "JustifyFull",
+                                        toolTip: "Justify",
+                                        enableSeparator: true,
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon justify"
+                                        }
+                                    },
+                                    {
+                                        id: "uppercase",
+                                        text: "Upper Case",
+                                        toolTip: "Upper Case",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-uppercase"
+                                        }
+                                    },
+                                    {
+                                        id: "lowercase",
+                                        text: "Lower Case",
+                                        toolTip: "Lower Case",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.ImageOnly,
+                                            prefixIcon: "e-icon e-ribbon e-lowercase"
+                                        }
+                                    }],
+                                defaults: {
+                                    type: "button",
+                                    isBig: false
+                                }
+                            }]
+                    },
+                    {
+                        text: "Actions", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                            groups: [{
+                                id: "undo",
+                                text: "Undo",
+                                toolTip: "Undo",
+                                buttonSettings: {
+                                    click: "onClick",
+                                    contentType: ej.ContentType.TextAndImage,
+                                    imagePosition: ej.ImagePosition.ImageTop,
+                                    prefixIcon: "e-icon e-ribbon e-undo"
+                                }
+                            },
+                                {
+                                    id: "redo",
+                                    text: "Redo",
+                                    toolTip: "Redo",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-redo"
+                                    }
+                                }
+                            ],
+                            defaults: {
+                                type: "button",
+                                width: 40,
+                                height: 70
+                            }
+                        }]
+                    },
+                    {
+                        text: "View", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                            groups: [{
+                                id: "zoomin",
+                                text: "Zoom In",
+                                toolTip: "Zoom In",
+                                buttonSettings: {
+                                    width: 58,
+                                    click: "onClick",
+                                    contentType: ej.ContentType.TextAndImage,
+                                    imagePosition: ej.ImagePosition.ImageTop,
+                                    prefixIcon: "e-icon e-ribbon e-zoomin"
+                                }
+                            },
+                                {
+                                    id: "zoomout",
+                                    text: "Zoom Out",
+                                    toolTip: "Zoom Out",
+                                    buttonSettings: {
+                                        width: 70,
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-zoomout"
+                                    }
+                                },
+                                {
+                                    id: "fullscreen",
+                                    text: "Full Screen",
+                                    toolTip: "Full Screen",
+                                    buttonSettings: {
+                                        width: 73,
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-fullscreen"
+                                    }
+                                }
+                            ],
+                            defaults: {
+                                type: "button",
+                                height: 70
+                            }
+                        }]
+                    }]
+            },{
+                    id: "insert", text: "INSERT", groups: [{
+                        text: "Tables", alignType: ej.Ribbon.AlignType.Columns, content: [{
+                            groups: [{
+                                id: "tables",
+                                text: "Tables",
+                                toolTip: "Tables",
+                                buttonSettings: {
+                                    click: "onClick",
+                                    contentType: ej.ContentType.TextAndImage,
+                                    imagePosition: ej.ImagePosition.ImageTop,
+                                    prefixIcon: "e-icon e-ribbon e-table"
+                                }
+                            }
+                            ],
+                            defaults: {
+                                type: "button",
+                                width: 50,
+                                height: 70
+                            }
+                        }]
+                    },
+                        {
+                            text: "Illustrations", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "pictures",
+                                    text: "Pictures",
+                                    toolTip: "Pictures",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-picture"
+                                    }
+                                },
+                                    {
+                                        id: "videos",
+                                        text: "Videos",
+                                        toolTip: "Videos",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-video"
+                                        }
+                                    },
+                                    {
+                                        id: "shapes",
+                                        text: "Shapes",
+                                        toolTip: "Shapes",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-shape"
+                                        }
+                                    },
+                                    {
+                                        id: "charts",
+                                        text: "Charts",
+                                        toolTip: "Charts",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-chart"
+                                        }
+                                    }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 56,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Comments", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "comments",
+                                    text: "Comments",
+                                    toolTip: "Comments",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-comment"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 70,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Text", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "text",
+                                    text: "Text",
+                                    toolTip: "Text",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-text",
+                                        width: 50
+                                    }
+                                },
+                                    {
+                                        id: "datetime",
+                                        text: "Date Time",
+                                        toolTip: "DateTime",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-datetimenew"
+                                        }
+                                    }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 70,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Hyperlink", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "hyperlink",
+                                    text: "Hyperlink",
+                                    toolTip: "Hyperlink",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-hyperlink"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                   type: "button",
+                                    width: 70,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Equation", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "equation",
+                                    text: "Equation",
+                                    toolTip: "Equation",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-equation"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 60,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Print Layout", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "printlayout",
+                                    text: "Print Layout",
+                                    toolTip: "Print Layout",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-printlayout"
+                                    }
+                                }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 80,
+                                    height: 70
+                                }
+                            }]
+                        },
+                        {
+                            text: "Save", alignType: ej.Ribbon.AlignType.Rows, content: [{
+                                groups: [{
+                                    id: "print",
+                                    text: "Print",
+                                    toolTip: "Print",
+                                    buttonSettings: {
+                                        click: "onClick",
+                                        contentType: ej.ContentType.TextAndImage,
+                                        imagePosition: ej.ImagePosition.ImageTop,
+                                        prefixIcon: "e-icon e-ribbon e-print"
+                                    }
+                                },
+                                    {
+                                        id: "save",
+                                        text: "Save",
+                                        toolTip: "Save",
+                                        buttonSettings: {
+                                            click: "onClick",
+                                            contentType: ej.ContentType.TextAndImage,
+                                            imagePosition: ej.ImagePosition.ImageTop,
+                                            prefixIcon: "e-icon e-ribbon e-save"
+                                        }
+                                    }
+                                ],
+                                defaults: {
+                                    type: "button",
+                                    width: 50,
+                                    height: 70
+                                }
+                            }]
+                        }
+                    ]
+                }
+            ],
+            create: function createControl(args) {
+                var ribbon = $("#defaultRibbon").data("ejRibbon");
+                $("#fontcolor").ejColorPicker({ value: "#FFFF00", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fontcoloricon", select: colorHandler });
+                $("#fillcolor").ejColorPicker({ value: "#FF0000", modelType: "palette", cssClass: "e-ribbon", toolIcon: "e-fillcoloricon", select: colorHandler });
+            }
+        });
+    });
+}
+function colorHandler(args:any) {
+    (this._id.indexOf("fillcolor") != -1) ? $("#contenteditor").css('background-color', args.value) : document.execCommand('forecolor', false, args.value);
+}
+function onClick(args:any) {
+    let val:any, prop = args.text;
+    val = (ej.isNullOrUndefined(args.model.text)) ? args.model.activeText : args.model.text;
+    if (action1.indexOf(val) != -1)
+        $("#contenteditor").empty();
+    else if (action2.indexOf(val) != -1)
+        document.execCommand(val, false, null);
+    else if (fontfamily.indexOf(prop) != -1)
+        document.execCommand("FontName", false, prop);
+    else if (fontsize.indexOf(prop) != -1)
+        document.execCommand("FontSize", false, prop.replace("pt", ""));
+    else
+        $("#contenteditor").append("<p> Action: " + val + " Triggered </p>");
+}
+
+
+module RotatorComponent {
+    $(function () {
+        var rotatorInstance = new ej.Rotator($("#sliderContent"), {
+            slideWidth: "100%",
+            frameSpace: "0px",
+            slideHeight: "auto",
+            displayItemsCount: "1",
+            navigateSteps: "1",
+            pagerPosition:"outside",
+            orientation: "horizontal",
+            showPager: true,
+            enabled: true,
+            showCaption: true,
+            allowKeyboardNavigation: true,
+            showPlayButton: true,
+            isResponsive:true,
+            animationType: "slide",
+        });
+    });
+}
+
+
+
+module RTEComponent {
+    $(function () {
+        var sample = new ej.RTE($("#rteSample"),{
+            width: "100%",
+            minWidth: "150px",
+            showFooter: true,
+            showHtmlSource: true,
+            allowEditing: true,
+            allowKeyboardNavigation: true,
+            autoFocus: true,
+            autoHeight: true,
+            colorPaletteColumns: 10,
+            colorPaletteRows: 5,
+            cssClass: 'gradient-lime',
+            enableResize: true,
+            enableTabKeyNavigation: true,
+            fileBrowser: {
+                filePath: (<any>window).baseurl + "Content/FileBrowser/",
+                extensionAllow: "*.png, *.doc, *.pdf, *.txt, *.docx",
+                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
+            },
+            imageBrowser: {
+                filePath: (<any>window).baseurl + "Content/FileBrowser/",
+                extensionAllow: "*.png, *.gif, *.jpg, *.jpeg, *.docx",
+                ajaxAction: (<any>window).baseurl + "api/FileExplorer/FileOperations"
+            },
+            isResponsive: true,
+            showClearAll: true,
+            showClearFormat: true,
+            showDimensions: true,
+            showCharCount: true,
+            tools: {
+                formatStyle: ["format"],
+                edit: ["findAndReplace"],
+                font: ["fontName", "fontSize", "fontColor", "backgroundColor"],
+                style: ["bold", "italic", "underline", "strikethrough"],
+                alignment: ["justifyLeft", "justifyCenter", "justifyRight", "justifyFull"],
+                lists: ["unorderedList", "orderedList"],
+                clipboard: ["cut", "copy", "paste"],
+                doAction: ["undo", "redo"],
+                indenting: ["outdent", "indent"],
+                clear: ["clearFormat", "clearAll"],
+                links: ["createLink", "removeLink"],
+                images: ["image"],
+                media: ["video"],
+                tables: ["createTable", "addRowAbove", "addRowBelow", "addColumnLeft", "addColumnRight", "deleteRow", "deleteColumn", "deleteTable"],
+                effects: ["superscript", "subscript"],
+                casing: ["upperCase", "lowerCase"],
+                view: ["fullScreen", "zoomIn", "zoomOut"],
+                print: ["print"],
+                customUnorderedList: [{
+                    name: "unOrderInsert",
+                    tooltip: "Custom UnOrderList",
+                    css: "e-rte-toolbar-icon e-rte-unlistitems customUnOrder",
+                    text: "Smiley",
+                    listImage: "url('../content/images/rte/Smiley-GIF.gif')"
+                }],
+                customOrderedList: [{
+                    name: "orderInsert",
+                    tooltip: "Custom OrderList",
+                    css: "e-rte-toolbar-icon e-rte-listitems customOrder",
+                    text: "Lower-Greek",
+                    listStyle: "lower-greek"
+                }]
+            }
+        });
+    });
+
+}
+
+
+
+module ScheduleComponent {
+    $(function () {
+        var sample = new ej.Schedule($("#Schedule1"), {
+            width: "100%",
+            height: "525px",
+            currentDate: new Date(2017, 5, 5),
+            timeScale: {
+                minorSlotCount: 4,
+                majorSlot: 60
+            },
+            contextMenuSettings: {
+                enable: true,
+                menuItems: {
+                    appointment: [
+                        { id: "open", text: "Open Appointment" },
+                        { id: "delete", text: "Delete Appointment" },
+                        { id: "customMenu3", text: "Menu Item 3" },
+                        { id: "customMenu4", text: "Menu Item 4" }
+                    ],
+                    cells: [
+                        { id: "new", text: "New Appointment" },
+                        { id: "recurrence", text: "New Recurring Appointment" },
+                        { id: "today", text: "Today" },
+                        { id: "gotodate", text: "Go to date" },
+                        { id: "settings", text: "Settings" },
+                        { id: "view", text: "View", parentId: "settings" },
+                        { id: "timemode", text: "TimeMode", parentId: "settings" },
+                        { id: "view_Day", text: "Day", parentId: "view" },
+                        { id: "view_Week", text: "Week", parentId: "view" },
+                        { id: "view_Workweek", text: "Workweek", parentId: "view" },
+                        { id: "view_Month", text: "Month", parentId: "view" },
+                        { id: "timemode_Hour12", text: "12 Hours", parentId: "timemode" },
+                        { id: "timemode_Hour24", text: "24 Hours", parentId: "timemode" },
+                        { id: "workhours", text: "Work Hours", parentId: "settings" },
+                        { id: "customMenu1", text: "Menu Item 1" },
+                        { id: "customMenu2", text: "Menu Item 2" }
+                    ]
+                }
+            },
+            resources: [{
+                field: "ownerId",
+                title: "Owner",
+                name: "Owners", allowMultiple: true,
+                resourceSettings: {
+                    dataSource: [
+                        { text: "Nancy", id: 1, groupId: 1, color: "#f8a398" },
+                        { text: "Steven", id: 3, groupId: 2, color: "#56ca85" },
+                        { text: "Michael", id: 5, groupId: 1, color: "#51a0ed" }
+                    ],
+                    text: "text", id: "id", groupId: "groupId", color: "color"
+                }
+            }],
+            appointmentSettings: {
+                dataSource: new ej.DataManager((<any>window).ResourcesData).executeLocal(new ej.Query().take(10)),
+                id: "Id",
+                subject: "Subject",
+                startTime: "StartTime",
+                endTime: "EndTime",
+                description: "Description",
+                allDay: "AllDay",
+                recurrence: "Recurrence",
+                recurrenceRule: "RecurrenceRule",
+                resourceFields: "ownerId"
+            }
+        });
+    });
+}
+
+
+
+module ScrollerComponent {
+    $(function () {
+        var scrollerSample = new ej.Scroller($("#scrollcontent"), {
+            height: "300px",
+            width: "100%"
+        });
+        $(window).bind('resize', function () {
+            scrollerSample.refresh();
+        });
+
+    });
+}
+
+
+
+module SignatureComponent {
+    $(function () {
+        var basicSignature = new ej.Signature($("#signature"), {
+            height: "400px",
+            isResponsive: true,
+            strokeWidth: 3
+        });
+    });
+}
+
+
+
+
+module SliderComponent {
+    $(function () {
+        var slider = new ej.Slider($("#minSlider"), {
+            sliderType: "MinRange",
+            value: 60,
+            minValue: 0,
+            maxValue: 100
+        });
+        var rangeslider = new ej.Slider($("#rangeSlider"), {
+            sliderType: "Range",
+            values: [30, 60],
+            minValue: 0
+        });
+
+    });
+}
+
+
+
+
+
+
+module linesparkline {
+    $(function () {
+
+        var sparklinesample = new ej.Sparkline($("#line"), {
+            dataSource: [12, 14, 11, 12, 11, 15, 12, 10, 11, 12, 15, 13, 12, 11, 10, 13, 15, 12, 14, 16, 14, 12, 11],
+            tooltip: {
+                visible: true,
+                font: { size:"12px" }
+            },
+            type: "line",
+            size: { height: "40", width:"170" },
+        });
+    });
+}
+
+module columnsparkline {
+    $(function () {
+        var sparkcolumnsample = new ej.Sparkline($("#column"), {
+            dataSource: [2, 6, -1, 1, 12, 5, -2, 7, -3, 5, 8, 10,],
+            negativePointColor: "red",
+            highPointColor: "blue",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            type: "column",
+            size: { height: "100", width: "150" },
+        });
+    });
+}
+
+module areasparkline {
+    $(function () {
+        var sparkareasample = new ej.Sparkline($("#area"), {
+            dataSource: [12, -10, 11, 8, 17, 6, 2, -17, 13, -6, 8, 10,],
+            markerSettings: { visible: true },
+            highPointColor: "blue",
+            lowPointColor: "orange",
+            type: "area",
+            opacity: 0.5,
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "100", width: "150" },
+        });
+    });
+}
+
+module windlosssparkline {
+    $(function () {
+        var sparkwinlosssample = new ej.Sparkline($("#winloss"), {
+            dataSource: [12, 15, -11, 13, 17, 0, -12, 17, 13, -15, 8, 10,],
+            type: "winloss",
+            size: { height: "100", width: "150" },
+        });
+    });
+}
+
+module piesparkline1 {
+    $(function () {
+        var sparkpiesample1 = new ej.Sparkline($("#pie1"), {
+            dataSource: [4, 6, 7],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+module piesparkline2 {
+    $(function () {
+        var sparkpiesample2 = new ej.Sparkline($("#pie2"), {
+            dataSource: [8, 9, 1,],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+module piesparkline3 {
+    $(function () {
+        var sparkpiesample3 = new ej.Sparkline($("#pie3"), {
+            dataSource: [2, 3, 5],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+module piesparkline4 {
+    $(function () {
+        var sparkpiesample4 = new ej.Sparkline($("#pie4"), {
+            dataSource: [10, 12, 11],
+            type: "pie",
+            tooltip: {
+                visible: true,
+                font: {
+                    size: "12px",
+                }
+            },
+            size: { height: "40", width: "40" },
+        });
+    });
+}
+
+
+
+module SplitterComponent {
+    $(function () {
+        var splitterInstance = new ej.Splitter($("#outterSpliter"), {
+            height: "250px",
+            width: "50%",
+            orientation: ej.Orientation.Vertical,
+            properties: [{}, { paneSize: 80 }],
+            isResponsive:true
+        });
+        var splitterInstance1 = new ej.Splitter($("#innerSpliter"), {
+            isResponsive:true,
+        });
+    });
+}
+
+
+
+module SpreadsheetComponent {
+$(function () {
+        var sample = new ej.Spreadsheet($("#basicSpreadsheet"), {
+            scrollSettings: {
+                height: 550,
+            },
+            importSettings: {
+                importMapper: (<any>window).baseurl + "api/Spreadsheet/Import"
+            },
+            exportSettings: {
+                excelUrl: (<any>window).baseurl + "api/Spreadsheet/ExcelExport",
+                csvUrl: (<any>window).baseurl + "api/Spreadsheet/CsvExport",
+                pdfUrl: (<any>window).baseurl + "api/Spreadsheet/PdfExport"
+            },
+            sheets: [{ rangeSettings: [{ dataSource: (<any>window).defaultData, startCell: "A1" }] }],
+			loadComplete: () => {
+			var spreadsheet = $("#basicSpreadsheet").data("ejSpreadsheet"), xlFormat = spreadsheet.XLFormat;
+			if (!(<any>spreadsheet).isImport) {
+        spreadsheet.setWidthToColumns([140, 128, 105, 100, 100, 110, 120, 120, 100]);
+        xlFormat.format({ "style": { "font-weight": "bold" } }, "A1:H1");
+        xlFormat.format({ "type": "currency" }, "E2:H11");
+        spreadsheet.XLRibbon.updateRibbonIcons();
+    }}
+        });
+    });
+}
+
+
+
+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 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Marketing",                                                   EmployeesCount : 40 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 55 },
+	{ Category : "Employees", Country : "USA", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 175},
+	{ 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 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Testers",                         EmployeesCount : 40 },
+	{ Category : "Employees", Country : "Germany", JobDescription : "Technical",     JobGroup : "Developers", JobRole : "Windows", EmployeesCount : 65 },
+	{ 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 },
+	{ Category : "Employees", Country : "France", JobDescription: "Marketing",                                                     EmployeesCount: 50  }
+];
+
+module sunburstcomponent {
+    $(function () {
+        var sunburstsample = new ej.SunburstChart($("#Sunburst"), {
+            valueMemberPath: "EmployeesCount",
+            levels: [
+                {groupMemberPath: "Country"},
+				{groupMemberPath: "JobDescription"},
+				{groupMemberPath: "JobGroup"},
+				{groupMemberPath: "JobRole"}
+            ],
+            dataSource: default_data,
+            dataLabelSettings:{visible:true},
+			tooltip:{visible:false},
+			enableAnimation:false,
+			size:{height:"600"},
+			innerRadius:0.2,
+            load: function () {
+                var sender = $("#Sunburst").data("ejSunburstChart");
+                var SunBurstTheme = (<any>window).themeStyle + (<any>window).themeColor + (<any>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'},
+        });
+    });
+}
+
+
+
+module TabComponent {
+    $(function () {
+        var sample = new ej.Tab($("#defaultTab"),{
+            width: "500px",
+            collapsible: true,
+            events: "click",
+            heightAdjustMode: ej.Tab.HeightAdjustMode.Content,
+            showCloseButton: true,
+            showRoundedCorner: false
+        });
+    });
+}
+
+
+
+module TagCloudComponent {
+
+    var websiteCollection = [
+        { text: "Google", url: "http://www.google.com", frequency: 12 },
+        { text: "All Things Digital", url: "http://allthingsd.com/", frequency: 3 },
+        { text: "Arts Technica", url: "http://arstechnica.com/", frequency: 8 },
+        { text: "Business Week", url: "http://www.businessweek.com/", frequency: 2 },
+        { text: "Yahoo", url: "http://in.yahoo.com/", frequency: 12 },
+        { text: "Center Networks", url: "http://www.centernetworks.com/", frequency: 5 },
+        { text: "Crave", url: "http://news.cnet.com/crave/", frequency: 8 },
+        { text: "Crunch Gear", url: "http://techcrunch.com/gadgets/", frequency: 20 },
+        { text: "Daily Tech", url: "http://www.dailytech.com/", frequency: 1 },
+        { text: "Electronista", url: "http://www.electronista.com/", frequency: 3 },
+        { text: "Engadget", url: "http://www.engadget.com/", frequency: 5 },
+        { text: "Gearlog", url: "http://www.gearlog.com/", frequency: 9 },
+        { text: "Information Week", url: "http://www.informationweek.com/", frequency: 0 },
+        { text: "PCWorld", url: "http://www.pcworld.com/", frequency: 11 },
+        { text: "Tech Republic", url: "http://techrepublic.com/", frequency: 3 },
+        { text: "Valleywag", url: "http://valleywag.gawker.com/", frequency: 6 },
+        { text: "Rediff", url: "http://in.rediff.com/", frequency: 9 },
+        { text: "WebProNews", url: "http://www.webpronews.com/", frequency: 2 }
+    ];
+
+    $(function () {
+        var sample = new ej.TagCloud($("#techWebList"), {
+            titleText: "Tech Sites",
+            dataSource: websiteCollection,
+            cssClass: "gradient-lime",
+            fields: {
+                text: "text", url: "url", frequency: "frequency"
+            }
+        });
+    });
+}
+
+
+module EditorComponent {
+    $(function () {
+        var num = new ej.NumericTextbox($("#numeric"), {
+            value: 30,
+            minValue: 1,
+            maxValue: 100,
+            name: "numeric",
+            width: "100%"
+        });
+        var per = new ej.PercentageTextbox($("#percent"), {
+            value: 60,
+            minValue: 10,
+            maxValue: 1000,
+            name: "percent",
+            width: "100%"
+        });
+        var cur = new ej.CurrencyTextbox($("#currency"), {
+            value: 100,
+            minValue: 10,
+            maxValue: 1000,
+            name: "currency",
+            width: "100%"
+        });
+        var mask = new ej.MaskEdit($("#maskedit"), {
+            name: "mask",
+            value: "4242422424",
+            maskFormat: "99 999-99999",
+            width: "100%"
+        })
+    });
+}
+
+
+module TileViewComponent {
+    $(function () {
+        var tile1 = new ej.Tile($("#tile1"), {
+            imagePosition:"fill",
+			caption:{text:"People"},
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/people_1.png'
+        });
+		var tile2 = new ej.Tile($("#tile2"), {
+            imagePosition:"center",
+			tileSize:"small",
+			imageUrl:'content/images/tile/windows/alerts.png',
+        });
+		var tile3 = new ej.Tile($("#tile3"), {
+            imagePosition:"center",
+			tileSize:"small",
+			imageUrl:'content/images/tile/windows/bing.png',
+        });
+		var tile4 = new ej.Tile($("#tile4"), {
+            tileSize:"small",
+		 	imageUrl:'content/images/tile/windows/camera.png',
+        });
+		var tile5 = new ej.Tile($("#tile5"), {
+            imagePosition:"center",
+			tileSize:"small",
+			imageUrl:'content/images/tile/windows/messages.png',
+        });
+		var tile6 = new ej.Tile($("#tile6"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/games.png',
+			caption:{text:"Play"}
+        });
+		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",
+			tileSize:"wide",
+			imageUrl:'content/images/tile/windows/sports.png',
+			caption:{text:"Sports"}
+        });
+		var tile9 = new ej.Tile($("#tile9"), {
+            imagePosition:"fill",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/people_2.png',
+			caption:{text:"People"}
+        });
+		var tile10 = new ej.Tile($("#tile10"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/pictures.png',
+			caption:{text:"Photo"}
+        });
+		var tile11 = new ej.Tile($("#tile11"), {
+            imagePosition:"center",
+			tileSize:"wide",
+			imageUrl:'content/images/tile/windows/weather.png',
+			caption:{text:"Weather"}
+        });
+		var tile12 = new ej.Tile($("#tile12"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/music.png',
+			caption:{text:"Music"}
+        });
+		var tile13 = new ej.Tile($("#tile13"), {
+            imagePosition:"center",
+			tileSize:"medium",
+			imageUrl:'content/images/tile/windows/favs.png',
+			caption:{text:"Favorites"}
+        });
+    });
+}
+
+
+
+module TimePickerComponent {
+    $(function () {
+        var timeSample = new ej.TimePicker($("#timepick"), {
+            width: "100%"
+        });
+    });
+}
+
+
+
+
+module ToolbarComponent {
+    $(function () {
+        var sample = new ej.Toolbar($("#editingToolbar"),{
+            width: "100%",
+            cssClass: "gradient-lime",
+            enableSeparator: true,
+            isResponsive: true,
+            orientation: ej.Orientation.Horizontal,
+            showRoundedCorner: true
+        });
+    });
+}
+
+
+
+module TooltipComponent {
+    $(function () {
+
+        var sample1 = new ej.Tooltip($("#link1"),{
+            content: "ECMAScript (or ES) is a trademarked scripting-language specification standardized by Ecma International in ECMA-262 and ISO/IEC 16262.",
+            associate: "mousefollow",
+            autoCloseTimeout: 5000,
+            collision: "fit",
+            containment: ".frame",
+            showRoundedCorner: true,
+            showShadow: true
+        });
+
+        var sample2 = new ej.Tooltip($("#link2"),{
+            content: "The World Wide Web (WWW) is an information space where documents and other web resources are identified by URLs, interlinked by hypertext links, and can be accessed via the Internet.",
+            position: {
+                stem: {
+                    horizontal: "right",
+                    vertical: "center"
+                },
+                target: {
+                    horizontal: "left",
+                    vertical: "center"
+                }
+            },
+            autoCloseTimeout: 5000,
+            collision: "fit",
+            containment: ".frame",
+            showRoundedCorner: true,
+            showShadow: true
+        });
+
+        var sample3 = new ej.Tooltip($("#link3"),{
+            content: 'Object-oriented programming (OOP) is a programming language model organized around objects rather than "actions" and data rather than logic.',
+            position: {
+                stem: {
+                    horizontal: "right",
+                    vertical: "center"
+                },
+                target: {
+                    horizontal: "left",
+                    vertical: "center",
+                },
+            },
+            associate: "mousefollow",
+            autoCloseTimeout: 5000,
+            collision: "fit",
+            containment: ".frame",
+            showRoundedCorner: true,
+            showShadow: true
+        });
+    });
+}
+
+
+
+module TreeGridComponent {
+    $(function () {
+        var treegridInstance = new ej.TreeGrid($("#TreeGridContainer"), {
+        dataSource: (<any>window).treeGridData,
+        childMapping: "subtasks",
+        allowSorting: true,
+        allowMultiSorting: true,
+        enableAltRow: true,
+        allowFiltering: true,
+        treeColumnIndex: 1,
+        allowKeyboardNavigation: true,
+        showColumnChooser: true,
+        showColumnOptions: true,
+        contextMenuSettings: {
+            showContextMenu: true,
+            contextMenuItems: ["add", "edit", "delete"]
+        },
+        columnDialogFields: ["field", "headerText", "editType", "width", "visible", "allowSorting", "textAlign", "headerTextAlign"],
+        editSettings: {
+            allowAdding: true,
+            allowEditing: true,
+            allowDeleting: true,
+            editMode: "cellEditing",
+            rowPosition: "belowSelectedRow"
+        },
+        toolbarSettings: {
+            showToolbar: true,
+            toolbarItems: ["add","edit","delete","update","cancel","expandAll","collapseAll"]
+        },
+        columns: [
+            { field: "taskID", headerText: "Task Id", allowFiltering: false, editType: "numericedit", filterEditType: "numericedit" },
+            { field: "taskName", headerText: "Task Name", editType: "stringedit", filterEditType: "stringedit" },
+            { field: "startDate", headerText: "Start Date", editType: "datepicker", filterEditType: "datepicker", format:"{0:MM/dd/yyyy}" },
+            { field: "endDate", headerText: "End Date", editType: "datepicker", filterEditType: "datepicker", format:"{0:MM/dd/yyyy}" },
+            { field: "progress", headerText: "Progress", editType: "numericedit", filterEditType: "numericedit" }
+        ],
+        isResponsive: true,
+    });
+});
+}
+
+
+
+var population_data: Array<Object> = [
+    { Continent: "Asia", Country: "Indonesia", Growth: 3, Population: 237641326 },
+    { Continent: "Asia", Country: "Russia", Growth: 2, Population: 152518015 },
+    { Continent: "Asia", Country: "Malaysia", Growth: 1, Population: 29672000 },
+    { Continent: "North America", Country: "United States", Growth: 4, Population: 315645000 },
+    { Continent: "North America", Country: "Mexico", Growth: 2, Population: 112336538 },
+    { Continent: "North America", Country: "Canada", Growth: 1, Population: 39056064 },
+    { Continent: "South America", Country: "Colombia", Growth: 1, Population: 47000000 },
+    { Continent: "South America", Country: "Brazil", Growth: 3, Population: 193946886 },
+    { Continent: "Africa", Country: "Nigeria", Growth: 2, Population: 170901000 },
+    { Continent: "Africa", Country: "Egypt", Growth: 1, Population: 83661000 },
+    { Continent: "Europe", Country: "Germany", Growth: 1, Population: 81993000 },
+    { Continent: "Europe", Country: "France", Growth: 1, Population: 65605000 },
+    { Continent: "Europe", Country: "UK", Growth: 1, Population: 63181775 }
+];
+
+module treemapcomponent {
+    $(function () {
+        var treemapsample = new ej.datavisualization.TreeMap($("#treemap"), {
+            leafItemSettings: { showLabels: true, labelPath: "Country" },
+            rangeColorMapping: [
+                { color: "#77D8D8", legendLabel: "1% Growth", from: 0, to: 1 },
+                { color: "#AED960", from: 0, legendLabel: "2% Growth", to: 2 },
+                { color: "#FFAF51", from: 0, legendLabel: "3% Growth", to: 3 },
+                { color: "#F3D240", from: 0, legendLabel: "4% Growth", to: 4 }
+            ],
+            levels: [
+                { groupPath: "Continent", groupGap: 5, headerHeight: 25, showHeader: true, headerTemplate: 'headertemplate' }
+            ],
+            dataSource: population_data,
+            colorValuePath: "Growth",
+            weightValuePath: "Population",
+            borderThickness: 0,
+            showLegend: true
+        });
+    });
+}
+
+
+
+module TreeViewComponent {
+    $(function () {
+        var tree = new ej.TreeView($("#treeView"), {
+            allowEditing: true,
+            allowDragAndDrop: true,
+            allowDropChild: true,
+            allowDropSibling: true,
+        });
+    });
+}
+
+
+
+
+module UploadboxComponent {
+
+    $(function () {
+        var sample = new ej.Uploadbox($("#UploadDefault"),{
+            saveUrl: (<any>window).baseurl + "api/uploadbox/Save",
+            removeUrl: (<any>window).baseurl + "api/uploadbox/Remove",
+            buttonText: {
+                browse: "Choose File", upload: "Upload", cancel: "Cancel"
+            },
+            cssClass: "gradient- purple",
+            dialogAction: {
+                modal: false, closeOnComplete: false, drag: true
+            },
+            extensionsAllow: ".zip",
+            multipleFilesSelection: true,
+            showFileDetails: true
+        });
+    });
+
+}
+
+
+
+module WaitingPopupComponent {
+    $(function () {
+        var sample = new ej.WaitingPopup($("#target"),{
+            showOnInit: true,
+            showImage: true,
+            text: 'waiting&hellip;',
+			target: "#target",
+			appendTo: "#waiting"
+        });
+    });
+
+}
diff --git a/types/ej.web.all/index.d.ts b/types/ej.web.all/index.d.ts
index 77332f6a6d..7584d0ba4c 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 16.1
+// Type definitions for ej.web.all 16.2
 // Project: http://help.syncfusion.com/js/typescript
 // Definitions by: Syncfusion <https://github.com/syncfusion>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,7 +8,7 @@
 
 /*!
 *  filename: ej.web.all.d.ts
-*  version : 16.1.0.37
+*  version : 16.2.0.41
 *  Copyright Syncfusion Inc. 2001 - 2018. 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
@@ -23226,10 +23226,9 @@ declare namespace ej {
         getCurrentViewData(): any[];
 
         /** Get the data of given row index in grid.
-         * @param {number} Pass the index of the row to get the corresponding data
          * @returns {any}
          */
-        getDataByIndex(rowIndex: number): any;
+        getDataByIndex(): any;
 
         /** Get the column field name from the given header text in grid.
          * @param {string} Pass header text of the column to get its corresponding field name
@@ -24810,6 +24809,10 @@ declare namespace ej {
              */
             isShiftKeyPressed?: boolean;
 
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
             /** Returns the grid model.
              */
             model?: any;
@@ -30849,6 +30852,10 @@ declare namespace ej {
              */
             beforeServiceInvoke?(e: BeforeServiceInvokeEventArgs): void;
 
+            /** Triggers before rendering multiple series with multiple axes.
+             */
+            beforeSeriesRender?(e: BeforeSeriesRenderEventArgs): void;
+
             /** Triggers when performing drill up/down operation in the pivot chart control.
              */
             drillSuccess?(e: DrillSuccessEventArgs): void;
@@ -30915,6 +30922,13 @@ declare namespace ej {
             element?: any;
         }
 
+        export interface BeforeSeriesRenderEventArgs {
+
+            /** series - Instance of the series which is about to get rendered
+             */
+            data?: any;
+        }
+
         export interface DrillSuccessEventArgs {
 
             /** returns the current instance of PivotChart.
@@ -33114,10 +33128,6 @@ declare namespace ej {
              */
             load?(e: LoadEventArgs): void;
 
-            /** Triggers before populating the pivot engine from datasource.
-             */
-            beforePivotEnginePopulate?(e: BeforePivotEnginePopulateEventArgs): void;
-
             /** Triggers when drill up/down happens in PivotTreeMap control. And it returns the outer HTML of PivotTreeMap control.
              */
             drillSuccess?(e: DrillSuccessEventArgs): void;
@@ -33180,13 +33190,6 @@ declare namespace ej {
             element?: any;
         }
 
-        export interface BeforePivotEnginePopulateEventArgs {
-
-            /** returns the current instance of PivotTreeMap control.
-             */
-            treeMapObject?: any;
-        }
-
         export interface DrillSuccessEventArgs {
 
             /** return the HTML element of PivotTreeMap control.
@@ -35392,6 +35395,11 @@ declare namespace ej {
          */
         clearFilter(): void;
 
+        /** To clear the sorted columns in Gantt.
+         * @returns {void}
+         */
+        clearSorting(): void;
+
         /** To collapse all the parent items in Gantt
          * @returns {void}
          */
@@ -35450,6 +35458,16 @@ declare namespace ej {
          */
         filterContent(ejPredicate: Gantt.EjPredicate): void;
 
+        /** To get available column collection in Gantt.
+         * @returns {void}
+         */
+        getColumns(): void;
+
+        /** To get the column collection which are used to edit the task by using task add/edit dialog in resource view.
+         * @returns {void}
+         */
+        getResourceViewEditColumns(): void;
+
         /** To hide the column by using header text
          * @param {string} you can pass a header text of a column to hide
          * @returns {void}
@@ -35500,6 +35518,12 @@ declare namespace ej {
          */
         selectMultipleRows(rowIndexes: any[]): void;
 
+        /** Method to set scroll top value for Gantt control.
+         * @param {number} Pass a value to set top position of vertical scroll bar.
+         * @returns {void}
+         */
+        setScrollTop(Top: number): void;
+
         /** Positions the splitter by the specified column index.
          * @param {number} Set the splitter position based on column index.
          * @returns {void}
@@ -35553,6 +35577,13 @@ declare namespace ej {
          */
         updateRecordByIndex(index: number, data: any): void;
 
+        /** To update the schedule start date and schedule end date of project.
+         * @param {string} New schedule start date of project
+         * @param {string} New schedule end date of project
+         * @returns {void}
+         */
+        updateScheduleDates(startDate: string, endDate: string): void;
+
         /** To change an existing Gantt ID by new ID value dynamically
          * @param {number} you can pass an existing ID value to be change
          * @param {number} you can pass a new ID value to be change
@@ -37237,7 +37268,7 @@ declare namespace ej {
             /** Specifies the list of toolbar items to be rendered in Gantt toolbar
              * @Default {[]}
              */
-            toolbarItems?: any[];
+            toolbarItems?: Array<ej.Gantt.ToolbarItems|string>;
 
             /** Allows the user to insert custom toolbar items.
              */
@@ -37386,6 +37417,49 @@ declare namespace ej {
         }
 
 
+        enum ToolbarItems {
+
+            ///Enables the add icon in toolbar
+            Add,
+
+            ///Enables the edit icon in toolbar
+            Edit,
+
+            ///Enables the edit icon in toolbar
+            Delete,
+
+            ///Enables the update icon in toolbar
+            Update,
+
+            ///Enables the cancel icon in toolbar
+            Cancel,
+
+            ///Enables the search icon in toolbar
+            Search,
+
+            ///Enables the indent icon in toolbar
+            Indent,
+
+            ///Enables the outdent icon in toolbar
+            Outdent,
+
+            ///Enables the expand all icon in toolbar
+            ExpandAll,
+
+            ///Enables the collapse all icon in toolbar
+            CollapseAll,
+
+            ///Enables the previous time span icon in toolbar
+            PrevTimeSpan,
+
+            ///Enables the next time span icon in toolbar
+            NextTimeSpan,
+
+            ///Enables the excel export toolbar icon
+            ExcelExport
+        }
+
+
         enum ViewType {
 
             ///Displays the project in task view in Gantt.
@@ -38083,173 +38157,56 @@ declare namespace ej {
          */
         addRow(data: any, rowPosition: string): void;
 
+        /** 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;
+
         /** To clear all the selection in TreeGrid
          * @param {number} you can pass a row index to clear the row selection.
          * @returns {void}
          */
         clearSelection(index: number): void;
 
-        /** To select cell based on the cell and row index dynamically.
-         * @param {any[]} array of cell indexes to be select
-         * @param {boolean} Defines that we need to preserve the previously selected cells or not
+        /** To clear the sorting from sorted columns in TreeGrid.
          * @returns {void}
          */
-        selectCells(Indexes: any[], preservePreviousSelectedCell: boolean): void;
-
-        /** To rename a column with the specified name
-         * @param {number} Index of the column to be renamed
-         * @param {string} Header text of the column
-         * @returns {void}
-         */
-        renameColumn(columnIndex: number, name: string): void;
-
-        /** To delete the specified column
-         * @param {number} Index of the column to be deleted
-         * @returns {void}
-         */
-        deleteColumn(columnIndex: number): void;
+        clearSorting(): void;
 
         /** To collapse all the parent items in tree grid
          * @returns {void}
          */
         collapseAll(): void;
 
-        /** To hide the column by using header text
-         * @param {string} you can pass a header text of a column to hide.
-         * @returns {void}
-         */
-        hideColumn(headerText: string): void;
-
-        /** Expands the records at specific hierarchical level
-         * @param {number} you can pass the level as index number to expand
-         * @returns {void}
-         */
-        expandAtLevel(index: number): void;
-
         /** Collapses the records at specific hierarchical level
          * @param {number} you can pass the particular level as index.
          * @returns {void}
          */
         collapseAtLevel(index: number): void;
 
-        /** To refresh the changes in tree grid
-         * @param {any[]} Pass which data source you want to show in tree grid
-         * @param {any} Pass which data you want to show in tree grid
+        /** To change the index of the tree column in TreeGrid.
+         * @param {number} Pass the column index to make the column as treeColumnIndex.
          * @returns {void}
          */
-        refresh(dataSource: any[], query: any): void;
+        columnIndex(Index: number): void;
 
-        /** Freeze all the columns preceding to the column specified by the field name.
-         * @param {string} Freeze all Columns before this field column.
+        /** To delete the specified column
+         * @param {number} Index of the column to be deleted
          * @returns {void}
          */
-        freezePrecedingColumns(field: string): void;
+        deleteColumn(columnIndex: number): void;
 
-        /** Freeze/unfreeze the specified column.
-         * @param {string} Freeze/Unfreeze this field column.
-         * @param {boolean} Decides to Freeze/Unfreeze this field column.
+        /** To expand all the root level nodes in TreeGrid.
          * @returns {void}
          */
-        freezeColumn(field: string, isFrozen: boolean): void;
+        expandAll(): void;
 
-        /** To save the edited cell in TreeGrid
+        /** Expands the records at specific hierarchical level
+         * @param {number} you can pass the level as index number to expand
          * @returns {void}
          */
-        saveCell(): void;
-
-        /** To show the column by using header text
-         * @param {string} you can pass a header text of a column to show.
-         * @returns {void}
-         */
-        showColumn(headerText: string): void;
-
-        /** To sorting the data based on the particular fields
-         * @param {string} you can pass a name of column to sort.
-         * @param {string} you can pass a sort direction to sort the column.
-         * @returns {void}
-         */
-        sortColumn(fieldName: string, columnSortDirection: string): void;
-
-        /** To move the TreeGrid rows programmatically with from index ,to index and position.
-         * @param {number} you can pass drag Index of the row
-         * @param {number} you can pass target Index of the row.
-         * @param {string} you can pass the drop position as above,below,child
-         * @returns {void}
-         */
-        moveRow(fromIndex: number, toIndex: number, position: string): void;
-
-        /** To reorder the column with field name and target index values
-         * @param {string} you can pass a name of column to reorder.
-         * @param {string} you can pass a target column index to be inserted.
-         * @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;
+        expandAtLevel(index: number): void;
 
         /** To expand and collapse an item in TreeGrid using item’s index.
          * @param {number} Pass the row index of row to expand/collapse.
@@ -38257,16 +38214,11 @@ declare namespace ej {
          */
         expandCollapseRow(Index: number): void;
 
-        /** To expand all the root level nodes in TreeGrid.
+        /** To expand collapse the total summary row.
+         * @param {boolean} Decides to expand/collapse the total summary
          * @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;
+        expandCollapseTotalSummary(expanded: boolean): void;
 
         /** Sends filtering request to filter a column in TreeGrid.
          * @param {string} Pass the field name of the column.
@@ -38286,16 +38238,30 @@ declare namespace ej {
          */
         filterContent(ejPredicate: TreeGrid.EjPredicate): void;
 
-        /** To change the index of the tree column in TreeGrid.
-         * @param {number} Pass the column index to make the column as treeColumnIndex.
+        /** Freeze/unfreeze the specified column.
+         * @param {string} Freeze/Unfreeze this field column.
+         * @param {boolean} Decides to Freeze/Unfreeze this field column.
          * @returns {void}
          */
-        columnIndex(Index: number): void;
+        freezeColumn(field: string, isFrozen: boolean): void;
 
-        /** To clear the sorting from sorted columns in TreeGrid.
+        /** Freeze all the columns preceding to the column specified by the field name.
+         * @param {string} Freeze all Columns before this field column.
          * @returns {void}
          */
-        clearSorting(): void;
+        freezePrecedingColumns(field: 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;
+
+        /** 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;
 
         /** Gets the column index of specific column with data source field.
          * @param {string} Pass the column field name to get its index.
@@ -38309,23 +38275,144 @@ declare namespace ej {
          */
         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}
+        /** Gets the scroll left offset of TreeGrid.
+         * @returns {number}
          */
-        getColumnByHeaderText(headerText: string): any;
+        getScrollLeftOffset(): number;
 
-        /** Clears the filter applied to a specific column.
-         * @param {string} Pass the column field name to clear filtering done in that column.
+        /** Gets the scroll top offset of TreeGrid.
+         * @returns {number}
+         */
+        getScrollTopOffset(): number;
+
+        /** Gets the selected cell(s) element details in TreeGrid.
+         * @returns {any[]}
+         */
+        getSelectedCells(): any[];
+
+        /** 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}
          */
-        clearFilter(fieldName: string): void;
+        gotoPage(PageIndex: number): void;
 
-        /** Gets the column object of specific column.
-         * @param {string} Pass the column field name to get details of that column.
-         * @returns {any}
+        /** To hide the column by using header text
+         * @param {string} you can pass a header text of a column to hide.
+         * @returns {void}
          */
-        getColumnByField(fieldName: string): any;
+        hideColumn(headerText: string): void;
+
+        /** To move the TreeGrid rows programmatically with from index ,to index and position.
+         * @param {number} you can pass drag Index of the row
+         * @param {number} you can pass target Index of the row.
+         * @param {string} you can pass the drop position as above,below,child
+         * @returns {void}
+         */
+        moveRow(fromIndex: number, toIndex: number, position: string): void;
+
+        /** To refresh the changes in tree grid
+         * @param {any[]} Pass which data source you want to show in tree grid
+         * @param {any} Pass which data you want to show in tree grid
+         * @returns {void}
+         */
+        refresh(dataSource: any[], query: any): void;
+
+        /** To rename a column with the specified name
+         * @param {number} Index of the column to be renamed
+         * @param {string} Header text of the column
+         * @returns {void}
+         */
+        renameColumn(columnIndex: number, name: string): void;
+
+        /** To reorder the column with field name and target index values
+         * @param {string} you can pass a name of column to reorder.
+         * @param {string} you can pass a target column index to be inserted.
+         * @returns {void}
+         */
+        reorderColumn(fieldName: string, targetIndex: string): void;
+
+        /** To save the edited cell in TreeGrid
+         * @returns {void}
+         */
+        saveCell(): 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;
+
+        /** Sets the scroll top offset of TreeGrid to maximum value.
+         * @returns {void}
+         */
+        scrollToBottom(): void;
+
+        /** Sets the scroll top offset of TreeGrid to 0.
+         * @returns {void}
+         */
+        scrollToTop(): void;
+
+        /** To select cell based on the cell and row index dynamically.
+         * @param {any[]} array of cell indexes to be select
+         * @param {boolean} Defines that we need to preserve the previously selected cells or not
+         * @returns {void}
+         */
+        selectCells(Indexes: any[], preservePreviousSelectedCell: boolean): void;
+
+        /** To open the dialog to add new record/row in TreeGrid.
+         * @returns {void}
+         */
+        showAddDialog(): void;
+
+        /** To show the column by using header text
+         * @param {string} you can pass a header text of a column to show.
+         * @returns {void}
+         */
+        showColumn(headerText: string): 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;
+
+        /** 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;
+
+        /** To sorting the data based on the particular fields
+         * @param {string} you can pass a name of column to sort.
+         * @param {string} you can pass a sort direction to sort the column.
+         * @returns {void}
+         */
+        sortColumn(fieldName: string, columnSortDirection: string): 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;
+
+        /** To update the value of TreeGrid row by using row index.
+         * @param {number} index of record to be updated
+         * @param {any} object with modified field value
+         * @returns {void}
+         */
+        updateRecordByIndex(index: number, data: any): void;
+
+        /** 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;
     }
     export namespace TreeGrid {
 
@@ -38350,16 +38437,16 @@ declare namespace ej {
 
         export interface Model {
 
-            /** Enables or disables the ability to resize the column width interactively.
-             * @Default {false}
-             */
-            allowColumnResize?: boolean;
-
             /** Enables or disables the option for column reordering
              * @Default {false}
              */
             allowColumnReordering?: boolean;
 
+            /** Enables or disables the ability to resize the column width interactively.
+             * @Default {false}
+             */
+            allowColumnResize?: boolean;
+
             /** Enables or disables the ability to drag and drop the row interactively to reorder the rows.
              * @Default {false}
              */
@@ -38381,6 +38468,16 @@ declare namespace ej {
              */
             allowMultiSorting?: boolean;
 
+            /** Enables/disables pagination of rows in TreeGrid
+             * @Default {false}
+             */
+            allowPaging?: boolean;
+
+            /** Enables or disables the toolbar searching in TreeGrid.
+             * @Default {false}
+             */
+            allowSearching?: boolean;
+
             /** Enables or disables the ability to select a row interactively.
              * @Default {true}
              */
@@ -38391,16 +38488,6 @@ declare namespace ej {
              */
             allowSorting?: boolean;
 
-            /** Enables or disables the toolbar searching in TreeGrid.
-             * @Default {false}
-             */
-            allowSearching?: boolean;
-
-            /** Enables/disables pagination of rows in TreeGrid
-             * @Default {false}
-             */
-            allowPaging?: boolean;
-
             /** Gets or sets a value that indicates whether the Content will wrap to the next line if the content exceeds the boundary of the Column Cells.
              * @Default {false}
              */
@@ -38410,23 +38497,38 @@ declare namespace ej {
              */
             altRowTemplateID?: string;
 
-            /** Specifies the mapping property path for the expand status of a record in data source.
+            /** Specifies the template for cell tooltip
+             * @Default {null}
              */
-            expandStateMapping?: string;
+            cellTooltipTemplate?: string;
 
             /** Specifies the mapping property path for sub tasks in datasource
              */
             childMapping?: string;
 
-            /** Option for adding columns; each column has the option to bind to a field in the dataSource.
+            /** Enables or disables the expandable/collapsible footer summary row. By default expander icon for footer summary will be rendered in first column of first summary row.
+             * @Default {false}
              */
-            columns?: Column[];
+            collapsibleTotalSummary?: boolean;
 
             /** To Specify the column fields to be displayed in the dialog while inserting a column using column menu.
              * @Default {[]}
              */
             columnDialogFields?: any[];
 
+            /** Specifies the settings for column resize
+             */
+            columnResizeSettings?: ColumnResizeSettings;
+
+            /** Option for adding columns; each column has the option to bind to a field in the dataSource.
+             */
+            columns?: Column[];
+
+            /** Defines the common width for all the columns in TreeGrid
+             * @Default {150}
+             */
+            commonWidth?: number;
+
             /** Options for displaying and customizing context menu items.
              */
             contextMenuSettings?: ContextMenuSettings;
@@ -38440,10 +38542,14 @@ declare namespace ej {
              */
             dataSource?: any[];
 
-            /** Specifies whether to wrap the header text when it is overflown i.e., when it exceeds the header width.
-             * @Default {ej.TreeGrid.HeaderTextOverflow.None}
+            /** Specifies the template for details view
              */
-            headerTextOverflow?: ej.TreeGrid.HeaderTextOverflow|string;
+            detailsTemplate?: string;
+
+            /** Specifies the row height of the details view
+             * @Default {100}
+             */
+            detailsRowHeight?: number;
 
             /** Options for displaying and customizing the tooltip. This tooltip will show the preview of the row that is being dragged.
              */
@@ -38463,6 +38569,11 @@ declare namespace ej {
              */
             enableCollapseAll?: boolean;
 
+            /** Gets or sets a value that indicates whether to enable load on demand approach, for rendering child records and page records.
+             * @Default {false}
+             */
+            enableLoadOnDemand?: boolean;
+
             /** Specifies whether to resize TreeGrid whenever window size changes.
              * @Default {false}
              */
@@ -38473,33 +38584,18 @@ declare namespace ej {
              */
             enableVirtualization?: boolean;
 
-            /** Gets or sets a value that indicates whether to enable load on demand approach, for rendering child records and page records.
-             * @Default {false}
+            /** Specifies the mapping property path for the expand status of a record in data source.
              */
-            enableLoadOnDemand?: boolean;
-
-            /** Specifies the settings for column resize
-             */
-            columnResizeSettings?: ColumnResizeSettings;
-
-            /** Defines the common width for all the columns in TreeGrid
-             * @Default {150}
-             */
-            commonWidth?: number;
+            expandStateMapping?: string;
 
             /** Options for filtering and customizing filter actions.
              */
             filterSettings?: FilterSettings;
 
-            /** Specifies the localization information to customize the User Interface (UI) to support regional language and culture
-             * @Default {en-US}
+            /** Specifies whether to wrap the header text when it is overflown i.e., when it exceeds the header width.
+             * @Default {ej.TreeGrid.HeaderTextOverflow.None}
              */
-            locale?: string;
-
-            /** Enables or disables internal parsing of a row. When disabled this property, row will be displayed using the defined template without any internal event bindings.
-             * @Default {true}
-             */
-            parseRowTemplate?: boolean;
+            headerTextOverflow?: ej.TreeGrid.HeaderTextOverflow|string;
 
             /** Specifies the name of the field in the dataSource, which contains the id of that row.
              */
@@ -38510,19 +38606,24 @@ declare namespace ej {
              */
             isResponsive?: boolean;
 
-            /** Specifies the name of the field in the dataSource, which contains the parent's id. This is necessary to form a parent-child hierarchy, if the dataSource contains self-referential
-             * data.
+            /** Specifies the localization information to customize the User Interface (UI) to support regional language and culture
+             * @Default {en-US}
              */
-            parentIdMapping?: string;
+            locale?: string;
 
             /** Specifies the options for customizing the pager.
              */
             pageSettings?: PageSettings;
 
-            /** Specifies the template for cell tooltip
-             * @Default {null}
+            /** Specifies the name of the field in the dataSource, which contains the parent's id. This is necessary to form a parent-child hierarchy, if the dataSource contains self-referential
+             * data.
              */
-            cellTooltipTemplate?: string;
+            parentIdMapping?: string;
+
+            /** Enables or disables internal parsing of a row. When disabled this property, row will be displayed using the defined template without any internal event bindings.
+             * @Default {true}
+             */
+            parseRowTemplate?: boolean;
 
             /** Specifies ej.Query to select data from the dataSource. This property is applicable only when the dataSource is ej.DataManager.
              * @Default {null}
@@ -38538,30 +38639,34 @@ declare namespace ej {
              */
             rowTemplateID?: string;
 
-            /** Specifies the index of the selected row.
-             * @Default {-1}
+            /** Specifies the toolbar searching customizations.
              */
-            selectedRowIndex?: number;
+            searchSettings?: SearchSettings;
 
             /** Specifies the selected cell information on rendering TreeGrid.
              */
             selectedCellIndexes?: SelectedCellIndex[];
 
+            /** Specifies the index of the selected row.
+             * @Default {-1}
+             */
+            selectedRowIndex?: number;
+
             /** Specifies the settings for row and cell selection.
              */
             selectionSettings?: SelectionSettings;
 
-            /** Enables/disables the options for inserting , deleting and renaming  columns.
-             * @Default {false}
-             */
-            showColumnOptions?: boolean;
-
             /** Controls the visibility of the menu button, which is displayed on the column header. Clicking on this button will show a popup menu. When you choose Columns item from this popup,
              * a list box with column names will be shown, from which you can select/deselect a column name to control the visibility of the respective columns.
              * @Default {false}
              */
             showColumnChooser?: boolean;
 
+            /** Enables/disables the options for inserting , deleting and renaming  columns.
+             * @Default {false}
+             */
+            showColumnOptions?: boolean;
+
             /** Specifies the visibility of details view
              * @Default {false}
              */
@@ -38572,29 +38677,21 @@ declare namespace ej {
              */
             showDetailsRowInfoColumn?: boolean;
 
-            /** Specifies the template for details view
+            /** Specifies whether to show tooltip when mouse is hovered on the cell.
+             * @Default {true}
              */
-            detailsTemplate?: string;
+            showGridCellTooltip?: boolean;
 
-            /** Specifies the row height of the details view
-             * @Default {100}
+            /** Specifies whether to show tooltip for the cells, which has expander button.
+             * @Default {true}
              */
-            detailsRowHeight?: number;
+            showGridExpandCellTooltip?: boolean;
 
             /** 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 toolbar searching customizations.
-             */
-            searchSettings?: SearchSettings;
-
             /** Specifies the visibility of summary row
              * @Default {false}
              */
@@ -38605,21 +38702,6 @@ declare namespace ej {
              */
             showTotalSummary?: boolean;
 
-            /** Specifies the summary row collection object to be displayed
-             * @Default {[]}
-             */
-            summaryRows?: SummaryRow[];
-
-            /** Specifies whether to show tooltip when mouse is hovered on the cell.
-             * @Default {true}
-             */
-            showGridCellTooltip?: boolean;
-
-            /** Specifies whether to show tooltip for the cells, which has expander button.
-             * @Default {true}
-             */
-            showGridExpandCellTooltip?: boolean;
-
             /** Options for setting width and height for TreeGrid.
              */
             sizeSettings?: SizeSettings;
@@ -38628,10 +38710,25 @@ declare namespace ej {
              */
             sortSettings?: SortSettings;
 
+            /** Gets or sets an object that indicates to managing the collection of stacked header rows for the TreeGrid.
+             * @Default {[]}
+             */
+            stackedHeaderRows?: StackedHeaderRow[];
+
+            /** Specifies the summary row collection object to be displayed
+             * @Default {[]}
+             */
+            summaryRows?: SummaryRow[];
+
             /** Options for displaying and customizing the toolbar items.
              */
             toolbarSettings?: ToolbarSettings;
 
+            /** Specifies the height of footer summary container.
+             * @Default {90}
+             */
+            totalSummaryHeight?: number;
+
             /** Specifies the index of the column that needs to have the expander button. By default, cells in the first column contain the expander button.
              * @Default {0}
              */
@@ -38653,6 +38750,14 @@ declare namespace ej {
              */
             beginEdit?(e: BeginEditEventArgs): void;
 
+            /** Triggered after selected a cell
+             */
+            cellSelected?(e: CellSelectedEventArgs): void;
+
+            /** Triggered before selecting a cell
+             */
+            cellSelecting?(e: CellSelectingEventArgs): void;
+
             /** Triggered after collapsed the TreeGrid record
              */
             collapsed?(e: CollapsedEventArgs): void;
@@ -38661,29 +38766,29 @@ declare namespace ej {
              */
             collapsing?(e: CollapsingEventArgs): void;
 
-            /** Triggered  when you start to drag a column
-             */
-            columnDragStart?(e: ColumnDragStartEventArgs): void;
-
             /** Triggered while dragging a column
              */
             columnDrag?(e: ColumnDragEventArgs): void;
 
+            /** Triggered  when you start to drag a column
+             */
+            columnDragStart?(e: ColumnDragStartEventArgs): void;
+
             /** Triggered when a column is dropped
              */
             columnDrop?(e: ColumnDropEventArgs): void;
 
-            /** Triggered after a column resized
+            /** Triggered when a column has been resized
              */
-            columnResized?(e: ColumnResizedEventArgs): void;
+            columnResizeEnd?(e: ColumnResizeEndEventArgs): void;
 
             /** Triggered while start to resize a column
              */
             columnResizeStart?(e: ColumnResizeStartEventArgs): void;
 
-            /** Triggered when a column has been resized
+            /** Triggered after a column resized
              */
-            columnResizeEnd?(e: ColumnResizeEndEventArgs): void;
+            columnResized?(e: ColumnResizedEventArgs): void;
 
             /** Triggered while Context Menu is rendered in TreeGrid control
              */
@@ -38697,14 +38802,14 @@ declare namespace ej {
              */
             detailsDataBound?(e: DetailsDataBoundEventArgs): void;
 
-            /** Triggered when details template pop-up is shown.
-             */
-            detailsShown?(e: DetailsShownEventArgs): void;
-
             /** Triggered when details template pop-up is hidden.
              */
             detailsHidden?(e: DetailsHiddenEventArgs): void;
 
+            /** Triggered when details template pop-up is shown.
+             */
+            detailsShown?(e: DetailsShownEventArgs): void;
+
             /** Triggered after saved the modified cellValue in TreeGrid
              */
             endEdit?(e: EndEditEventArgs): void;
@@ -38725,6 +38830,14 @@ declare namespace ej {
              */
             queryCellInfo?(e: QueryCellInfoEventArgs): void;
 
+            /** Triggered while clicking a row, even when allowSelection property is disabled.
+             */
+            recordClick?(e: RecordClickEventArgs): void;
+
+            /** Triggered during record double click action, even when allowSelection property is disabled.
+             */
+            recordDoubleClick?(e: RecordDoubleClickEventArgs): void;
+
             /** Triggered while rendering each row
              */
             rowDataBound?(e: RowDataBoundEventArgs): void;
@@ -38745,14 +38858,6 @@ declare namespace ej {
              */
             rowDropActionBegin?(e: RowDropActionBeginEventArgs): void;
 
-            /** Triggered before selecting a cell
-             */
-            cellSelecting?(e: CellSelectingEventArgs): void;
-
-            /** Triggered after selected a cell
-             */
-            cellSelected?(e: CellSelectedEventArgs): void;
-
             /** Triggered after the row is selected.
              */
             rowSelected?(e: RowSelectedEventArgs): void;
@@ -38761,14 +38866,6 @@ declare namespace ej {
              */
             rowSelecting?(e: RowSelectingEventArgs): void;
 
-            /** Triggered while clicking a row, even when allowSelection property is disabled.
-             */
-            recordClick?(e: RecordClickEventArgs): void;
-
-            /** Triggered during record double click action, even when allowSelection property is disabled.
-             */
-            recordDoubleClick?(e: RecordDoubleClickEventArgs): void;
-
             /** Triggered when toolbar item is clicked in TreeGrid.
              */
             toolbarClick?(e: ToolbarClickEventArgs): void;
@@ -38854,7 +38951,7 @@ declare namespace ej {
              */
             cancel?: boolean;
 
-            /** Returns the treegrid element which is going to be print
+            /** Returns the TreeGrid element which is going to be print
              */
             element?: any;
 
@@ -38886,6 +38983,88 @@ declare namespace ej {
             columnIndex?: number;
         }
 
+        export interface CellSelectedEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the cell index on the selection.
+             */
+            cellIndex?: number;
+
+            /** Returns the row index on the selection
+             */
+            rowIndex?: number;
+
+            /** Returns the selecting cell element
+             */
+            targetCell?: any;
+
+            /** Returns the selecting row element
+             */
+            targetRow?: any;
+
+            /** Returns the selecting record object
+             */
+            data?: any;
+
+            /** Returns the Gantt object Model
+             */
+            model?: any;
+
+            /** Returns the previously selected row data
+             */
+            previousData?: any;
+
+            /** Returns the previously selected cell index
+             */
+            previousCellIndex?: any;
+
+            /** Returns the previously selected row index
+             */
+            previousRowIndex?: any;
+
+            /** Returns the previously selected cell element
+             */
+            previousTargetCell?: any;
+
+            /** Returns the previously selected row element
+             */
+            previousTargetRow?: any;
+        }
+
+        export interface CellSelectingEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the cell index on the selection.
+             */
+            cellIndex?: number;
+
+            /** Returns the row index on the selection
+             */
+            rowIndex?: number;
+
+            /** Returns the selecting cell element
+             */
+            targetCell?: any;
+
+            /** Returns the selecting row element
+             */
+            targetRow?: any;
+
+            /** Returns the selecting record object
+             */
+            data?: any;
+
+            /** Returns the Gantt object Model
+             */
+            model?: any;
+        }
+
         export interface CollapsedEventArgs {
 
             /** Returns the cancel option value.
@@ -38936,29 +39115,6 @@ declare namespace ej {
             expanded?: boolean;
         }
 
-        export interface ColumnDragStartEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the control model values.
-             */
-            model?: any;
-
-            /** Returns the event Type.
-             */
-            type?: string;
-
-            /** Returns the column data which is dragged
-             */
-            draggedColumn?: any;
-
-            /** Returns the index of the column being dragged
-             */
-            draggedColumnIndex?: number;
-        }
-
         export interface ColumnDragEventArgs {
 
             /** Returns the cancel option value.
@@ -38994,6 +39150,29 @@ declare namespace ej {
             canDrop?: boolean;
         }
 
+        export interface ColumnDragStartEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the control model values.
+             */
+            model?: any;
+
+            /** Returns the event Type.
+             */
+            type?: string;
+
+            /** Returns the column data which is dragged
+             */
+            draggedColumn?: any;
+
+            /** Returns the index of the column being dragged
+             */
+            draggedColumnIndex?: number;
+        }
+
         export interface ColumnDropEventArgs {
 
             /** Returns the cancel option value.
@@ -39025,68 +39204,6 @@ declare namespace ej {
             targetColumnIndex?: number;
         }
 
-        export interface ColumnResizedEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the control model values.
-             */
-            model?: any;
-
-            /** Returns the event Type.
-             */
-            type?: string;
-
-            /** Returns the column data which is resized
-             */
-            column?: any;
-
-            /** Returns the index of the column being resized.
-             */
-            columnIndex?: number;
-
-            /** Returns resized column width after resized.
-             */
-            newWidth?: number;
-
-            /** Returns resized column width before resizing
-             */
-            oldWidth?: number;
-        }
-
-        export interface ColumnResizeStartEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the control model values.
-             */
-            model?: any;
-
-            /** Returns the event Type.
-             */
-            type?: string;
-
-            /** Returns the column data in which the resizing started
-             */
-            column?: any;
-
-            /** Returns the column index in which the resizing started
-             */
-            columnIndex?: number;
-
-            /** Returns column width before dragging
-             */
-            oldWidth?: number;
-
-            /** Returns initial column element object.
-             */
-            target?: any;
-        }
-
         export interface ColumnResizeEndEventArgs {
 
             /** Returns the cancel option value.
@@ -39126,6 +39243,68 @@ declare namespace ej {
             target?: any;
         }
 
+        export interface ColumnResizeStartEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the control model values.
+             */
+            model?: any;
+
+            /** Returns the event Type.
+             */
+            type?: string;
+
+            /** Returns the column data in which the resizing started
+             */
+            column?: any;
+
+            /** Returns the column index in which the resizing started
+             */
+            columnIndex?: number;
+
+            /** Returns column width before dragging
+             */
+            oldWidth?: number;
+
+            /** Returns initial column element object.
+             */
+            target?: any;
+        }
+
+        export interface ColumnResizedEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the control model values.
+             */
+            model?: any;
+
+            /** Returns the event Type.
+             */
+            type?: string;
+
+            /** Returns the column data which is resized
+             */
+            column?: any;
+
+            /** Returns the index of the column being resized.
+             */
+            columnIndex?: number;
+
+            /** Returns resized column width after resized.
+             */
+            newWidth?: number;
+
+            /** Returns resized column width before resizing
+             */
+            oldWidth?: number;
+        }
+
         export interface ContextMenuOpenEventArgs {
 
             /** Returns the cancel option value.
@@ -39191,6 +39370,25 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface DetailsHiddenEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the TreeGrid model
+             */
+            model?: any;
+
+            /** Returns the data collection of hidden details Template
+             */
+            rowData?: any;
+
+            /** Returns the name of the event.
+             */
+            type?: string;
+        }
+
         export interface DetailsShownEventArgs {
 
             /** Returns the cancel option value.
@@ -39218,25 +39416,6 @@ declare namespace ej {
             type?: string;
         }
 
-        export interface DetailsHiddenEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the TreeGrid model
-             */
-            model?: any;
-
-            /** Returns the data collection of hidden details Template
-             */
-            rowData?: any;
-
-            /** Returns the name of the event.
-             */
-            type?: string;
-        }
-
         export interface EndEditEventArgs {
 
             /** Returns the cancel option value.
@@ -39352,6 +39531,68 @@ declare namespace ej {
             column?: any;
         }
 
+        export interface RecordClickEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the element of clicked cell.
+             */
+            cell?: any;
+
+            /** Returns the index of the clicked cell.
+             */
+            cellIndex?: number;
+
+            /** Returns the data of clicked cell.
+             */
+            cellValue?: any;
+
+            /** Returns the element of the clicked row.
+             */
+            row?: any;
+
+            /** Returns the index of the clicked row.
+             */
+            rowIndex?: number;
+
+            /** Returns the column name of the clicked cell.
+             */
+            columnName?: string;
+        }
+
+        export interface RecordDoubleClickEventArgs {
+
+            /** Returns the cancel option value.
+             */
+            cancel?: boolean;
+
+            /** Returns the element of clicked cell.
+             */
+            cell?: any;
+
+            /** Returns the index of the clicked cell.
+             */
+            cellIndex?: number;
+
+            /** Returns the data of clicked cell.
+             */
+            cellValue?: any;
+
+            /** Returns the element of the clicked row.
+             */
+            row?: any;
+
+            /** Returns the index of the clicked row.
+             */
+            rowIndex?: number;
+
+            /** Returns the column name of the clicked cell.
+             */
+            columnName?: string;
+        }
+
         export interface RowDataBoundEventArgs {
 
             /** Returns the cancel option value.
@@ -39511,88 +39752,6 @@ declare namespace ej {
             type?: string;
         }
 
-        export interface CellSelectingEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the cell index on the selection.
-             */
-            cellIndex?: number;
-
-            /** Returns the row index on the selection
-             */
-            rowIndex?: number;
-
-            /** Returns the selecting cell element
-             */
-            targetCell?: any;
-
-            /** Returns the selecting row element
-             */
-            targetRow?: any;
-
-            /** Returns the selecting record object
-             */
-            data?: any;
-
-            /** Returns the Gantt object Model
-             */
-            model?: any;
-        }
-
-        export interface CellSelectedEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the cell index on the selection.
-             */
-            cellIndex?: number;
-
-            /** Returns the row index on the selection
-             */
-            rowIndex?: number;
-
-            /** Returns the selecting cell element
-             */
-            targetCell?: any;
-
-            /** Returns the selecting row element
-             */
-            targetRow?: any;
-
-            /** Returns the selecting record object
-             */
-            data?: any;
-
-            /** Returns the Gantt object Model
-             */
-            model?: any;
-
-            /** Returns the previously selected row data
-             */
-            previousData?: any;
-
-            /** Returns the previously selected cell index
-             */
-            previousCellIndex?: any;
-
-            /** Returns the previously selected row index
-             */
-            previousRowIndex?: any;
-
-            /** Returns the previously selected cell element
-             */
-            previousTargetCell?: any;
-
-            /** Returns the previously selected row element
-             */
-            previousTargetRow?: any;
-        }
-
         export interface RowSelectedEventArgs {
 
             /** Returns the cancel option value.
@@ -39647,68 +39806,6 @@ declare namespace ej {
             previousTreeGridRow?: any;
         }
 
-        export interface RecordClickEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the element of clicked cell.
-             */
-            cell?: any;
-
-            /** Returns the index of the clicked cell.
-             */
-            cellIndex?: number;
-
-            /** Returns the data of clicked cell.
-             */
-            cellValue?: any;
-
-            /** Returns the element of the clicked row.
-             */
-            row?: any;
-
-            /** Returns the index of the clicked row.
-             */
-            rowIndex?: number;
-
-            /** Returns the column name of the clicked cell.
-             */
-            columnName?: string;
-        }
-
-        export interface RecordDoubleClickEventArgs {
-
-            /** Returns the cancel option value.
-             */
-            cancel?: boolean;
-
-            /** Returns the element of clicked cell.
-             */
-            cell?: any;
-
-            /** Returns the index of the clicked cell.
-             */
-            cellIndex?: number;
-
-            /** Returns the data of clicked cell.
-             */
-            cellValue?: any;
-
-            /** Returns the element of the clicked row.
-             */
-            row?: any;
-
-            /** Returns the index of the clicked row.
-             */
-            rowIndex?: number;
-
-            /** Returns the column name of the clicked cell.
-             */
-            columnName?: string;
-        }
-
         export interface ToolbarClickEventArgs {
 
             /** Returns the cancel option value.
@@ -39732,6 +39829,14 @@ declare namespace ej {
             type?: string;
         }
 
+        export interface ColumnResizeSettings {
+
+            /** Specifies the mode for column resizing
+             * @Default {ej.TreeGrid.ColumnResizeMode.Normal}
+             */
+            columnResizeMode?: ej.TreeGrid.ColumnResizeMode|string;
+        }
+
         export interface ColumnsCommand {
 
             /** Gets or sets an object to customize command button with available ejButton properties.
@@ -39745,6 +39850,16 @@ declare namespace ej {
 
         export interface Column {
 
+            /** Enables/disables cell selection.
+             * @Default {false}
+             */
+            allowCellSelection?: boolean;
+
+            /** Enables or disables the ability to edit a row or cell.
+             * @Default {false}
+             */
+            allowEditing?: boolean;
+
             /** Enables or disables the ability to filter the rows based on this column.
              * @Default {false}
              */
@@ -39755,15 +39870,38 @@ declare namespace ej {
              */
             allowFilteringBlankContent?: boolean;
 
+            /** Enables or disables the ability to freeze/unfreeze the columns
+             * @Default {false}
+             */
+            allowFreezing?: boolean;
+
             /** Enables or disables the ability to sort the rows based on this column/field.
              * @Default {false}
              */
             allowSorting?: boolean;
 
-            /** Enables/disables cell selection.
+            /** Specifies the template ID or the template string of the AngularJS script element to enable column template for a column.
+             */
+            angularTemplate?: string;
+
+            /** Sets the clip mode for TreeGrid cell as ellipsis or clipped content(both header and content)
+             * @Default {ej.TreeGrid.ClipMode.Clip}
+             */
+            clipMode?: ej.TreeGrid.ClipMode|string;
+
+            /** Gets or sets an object to define a command column in TreeGrid.
+             * @Default {[]}
+             */
+            commands?: ColumnsCommand[];
+
+            /** Gets or sets a value that indicates to display a column value as checkbox or string
              * @Default {false}
              */
-            allowCellSelection?: boolean;
+            displayAsCheckbox?: boolean;
+
+            /** To bind the dropdown data for TreeGrid column mapped with ejDropDownList
+             */
+            dropdownData?: string;
 
             /** To customize the ej controls defined in TreeGrid column with their native property.
              */
@@ -39779,26 +39917,10 @@ declare namespace ej {
              */
             editType?: ej.TreeGrid.EditingType|string;
 
-            /** To bind the dropdown data for TreeGrid column mapped with ejDropDownList
-             */
-            dropdownData?: string;
-
             /** Specifies the name of the field from the dataSource to bind with this column.
              */
             field?: string;
 
-            /** Specifies the template string of the script element to enable column template for a column.
-             */
-            template?: string;
-
-            /** Specifies the template ID of the script element to enable column template for a column.
-             */
-            templateID?: string;
-
-            /** Specifies the template ID or the template string of the AngularJS script element to enable column template for a column.
-             */
-            angularTemplate?: string;
-
             /** Specifies the type of the editor control to be used to filter the rows.
              * @Default {ej.TreeGrid.EditingType.String}
              */
@@ -39809,102 +39931,85 @@ declare namespace ej {
              */
             filterType?: ej.TreeGrid.FilterType|string;
 
-            /** Header text of the column.
-             * @Default {null}
-             */
-            headerText?: string;
-
-            /** Gets or sets a value that indicates to display a column value as checkbox or string
-             * @Default {false}
-             */
-            displayAsCheckbox?: boolean;
-
-            /** Enables or disables the checkbox visibility in a column for checkbox selection.
-             * @Default {false}
-             */
-            showCheckbox?: boolean;
-
-            /** Controls the visibility of the column.
-             * @Default {true}
-             */
-            visible?: boolean;
-
-            /** Gets or sets a value for treegrid column width
-             */
-            width?: number;
-
-            /** Specifies the header template value for the column header
-             */
-            headerTemplateID?: string;
-
             /** Specifies the display format of a column
              * @Default {null}
              */
             format?: any;
 
-            /** Specifies whether the column is a template column
-             * @Default {false}
+            /** Specifies the header template value for the column header
              */
-            isTemplateColumn?: boolean;
+            headerTemplateID?: string;
+
+            /** Header text of the column.
+             * @Default {null}
+             */
+            headerText?: string;
 
             /** Specifies the alignment of the column header text
              * @Default {ej.TextAlign.Left}
              */
             headerTextAlign?: ej.TextAlign|string;
 
-            /** Specifies whether the column is frozen
-             * @Default {false}
-             */
-            isFrozen?: boolean;
-
-            /** Specifies the text alignment for the column
-             * @Default {ej.TextAlign.Left}
-             */
-            textAlign?: ej.TextAlign|string;
-
-            /** Enables or disables the ability to edit a row or cell.
-             * @Default {false}
-             */
-            allowEditing?: boolean;
-
-            /** Gets or sets an object to define a command column in TreeGrid.
-             * @Default {[]}
-             */
-            commands?: ColumnsCommand[];
-
-            /** We can include or exclude particular column from column visibility list in column menu.
-             * @Default {true}
-             */
-            showInColumnChooser?: boolean;
-
-            /** Sets the clip mode for TreeGrid cell as ellipsis or clipped content(both header and content)
-             * @Default {ej.TreeGrid.ClipMode.Clip}
-             */
-            clipMode?: ej.TreeGrid.ClipMode|string;
-
-            /** Sets the tooltip template for the specific column.
-             * @Default {null}
-             */
-            tooltip?: string;
-
             /** Sets the tooltip template for the column header
              * @Default {null}
              */
             headerTooltip?: string;
 
-            /** specifies the conditions for saving data to the database while adding or editing the fields.
+            /** Specifies whether the column is frozen
+             * @Default {false}
              */
-            validationRules?: any;
+            isFrozen?: boolean;
+
+            /** Specifies whether the column is a template column
+             * @Default {false}
+             */
+            isTemplateColumn?: boolean;
 
             /** Gets or sets the priority value of the column. It is used to show/hide TreeGrid columns in responsive mode.
              * @Default {-1}
              */
             priority?: number;
 
-            /** Enables or disables the ability to freeze/unfreeze the columns
+            /** Enables or disables the checkbox visibility in a column for checkbox selection.
              * @Default {false}
              */
-            allowFreezing?: boolean;
+            showCheckbox?: boolean;
+
+            /** We can include or exclude particular column from column visibility list in column menu.
+             * @Default {true}
+             */
+            showInColumnChooser?: boolean;
+
+            /** Specifies the template string of the script element to enable column template for a column.
+             */
+            template?: string;
+
+            /** Specifies the template ID of the script element to enable column template for a column.
+             */
+            templateID?: string;
+
+            /** Specifies the text alignment for the column
+             * @Default {ej.TextAlign.Left}
+             */
+            textAlign?: ej.TextAlign|string;
+
+            /** Sets the tooltip template for the specific column.
+             * @Default {null}
+             */
+            tooltip?: string;
+
+            /** specifies the conditions for saving data to the database while adding or editing the fields.
+             */
+            validationRules?: any;
+
+            /** Controls the visibility of the column.
+             * @Default {true}
+             */
+            visible?: boolean;
+
+            /** Gets or sets a value for TreeGrid column width
+             */
+            width?: number;
         }
 
         export interface ContextMenuSettings {
@@ -39912,7 +40017,7 @@ declare namespace ej {
             /** Option for adding items to context menu.
              * @Default {[]}
              */
-            contextMenuItems?: any[];
+            contextMenuItems?: Array<ej.TreeGrid.ContextMenuItems|string>;
 
             /** Shows/hides the context menu.
              * @Default {false}
@@ -39960,6 +40065,11 @@ declare namespace ej {
              */
             beginEditAction?: ej.TreeGrid.BeginEditAction|string;
 
+            /** Specifies the template ID for the custom dialog.
+             * @Default {null}
+             */
+            dialogEditorTemplateID?: string;
+
             /** specifies the edit mode in TreeGrid , &quot;cellEditing&quot; is for cell type editing and &quot;rowEditing&quot; is for entire row.
              * @Default {ej.TreeGrid.EditMode.CellEditing}
              */
@@ -39970,51 +40080,53 @@ declare namespace ej {
              */
             rowPosition?: ej.TreeGrid.RowPosition|string;
 
-            /** Specifies the template ID for the custom dialog.
-             * @Default {null}
-             */
-            dialogEditorTemplateID?: string;
-
             /** Enable or disable the confirmation dialog while deleting the record.
              * @Default {false}
              */
             showDeleteConfirmDialog?: boolean;
         }
 
-        export interface ColumnResizeSettings {
-
-            /** Specifies the mode for column resizing
-             * @Default {ej.TreeGrid.ColumnResizeMode.Normal}
-             */
-            columnResizeMode?: ej.TreeGrid.ColumnResizeMode|string;
-        }
-
         export interface FilterSettingsFilteredColumn {
 
-            /** Specifies the value to be filtered in TreeGrid.
-             */
-            value?: string;
-
             /** Specifies the field where filtering has to be performed.
              */
             field?: string;
 
+            /** Specifies the filter condition to filtered column. See operator
+             */
+            operator?: string;
+
             /** Specifies the predicate(and/or) value to perform filtering.
              */
             predicate?: string;
 
-            /** Specifies the filter condition to filtered column. See operator
+            /** Specifies the value to be filtered in TreeGrid.
              */
-            operator?: string;
+            value?: string;
         }
 
         export interface FilterSettings {
 
+            /** Gets or sets a value that indicates to perform the filter operation with case sensitive in excel styled filter menu mode.
+             * @Default {false}
+             */
+            enableCaseSensitivity?: boolean;
+
+            /** Enables or disables the ability to filter the columns with empty, null and undefined values.
+             * @Default {true}
+             */
+            enableComplexBlankFilter?: boolean;
+
             /** Specifies the mode on which column filtering should start
              * @Default {immediate}
              */
             filterBarMode?: string;
 
+            /** Specifies the mode of filtering to filter the record with or without hierarchy.
+             * @Default {ej.TreeGrid.FilterHierarchyMode.Parent}
+             */
+            filterHierarchyMode?: ej.TreeGrid.FilterHierarchyMode|string;
+
             /** Specifies the type of column filtering.
              * @Default {ej.TreeGrid.FilterType.FilterBar}
              */
@@ -40029,25 +40141,15 @@ declare namespace ej {
              * @Default {1000}
              */
             maxFilterChoice?: number;
-
-            /** Gets or sets a value that indicates to perform the filter operation with case sensitive in excel styled filter menu mode.
-             * @Default {false}
-             */
-            enableCaseSensitivity?: boolean;
-
-            /** Enables or disables the ability to filter the columns with empty, null and undefined values.
-             * @Default {true}
-             */
-            enableComplexBlankFilter?: boolean;
-
-            /** Specifies the mode of filtering to filter the record with or without hierarchy.
-             * @Default {ej.TreeGrid.FilterHierarchyMode.Parent}
-             */
-            filterHierarchyMode?: ej.TreeGrid.FilterHierarchyMode|string;
         }
 
         export interface PageSettings {
 
+            /** Specifies the current page to display at load time.
+             * @Default {1}
+             */
+            currentPage?: number;
+
             /** Using this property we can specify the number of pages should pager contains, according to this count TreeGrid height will be updated.
              * @Default {8}
              */
@@ -40058,16 +40160,6 @@ declare namespace ej {
              */
             pageSize?: number;
 
-            /** Get the value of records which is bound to TreeGrid. The totalRecordsCount value is calculated based on the datasource bound to TreeGrid.
-             * @Default {null}
-             */
-            totalRecordsCount?: number;
-
-            /** Specifies the current page to display at load time.
-             * @Default {1}
-             */
-            currentPage?: number;
-
             /** Specifies the mode of record count in a page, whether it should count all the records or the root to count zero level parent records.
              * @Default {ej.TreeGrid.PageSizeMode.All}
              */
@@ -40082,32 +40174,48 @@ declare namespace ej {
              * @Default {null}
              */
             template?: string;
+
+            /** Get the value of records which is bound to TreeGrid. The totalRecordsCount value is calculated based on the datasource bound to TreeGrid.
+             * @Default {null}
+             */
+            totalRecordsCount?: number;
+        }
+
+        export interface SearchSettings {
+
+            /** Default Value
+             * @Default {[]}
+             */
+            fields?: any[];
+
+            /** Default Value
+             * @Default {true}
+             */
+            ignoreCase?: boolean;
+
+            /** Default Value
+             */
+            key?: string;
+
+            /** Specifies the operator for the search key words in toolbar searching.
+             * @Default {contains}
+             */
+            operator?: string;
         }
 
         export interface SelectedCellIndex {
 
+            /** Specifies the cell index to be selected in the row.
+             */
+            cellIndex?: number;
+
             /** Specifies the row index of the cell to be selected in TreeGrid control
              */
             rowIndex?: number;
-
-            /** Specifies the cell index to be selected in the row.
-             * @Default { }
-             */
-            cellIndex?: number;
         }
 
         export interface SelectionSettings {
 
-            /** Specifies the type of selection whether to select row or cell.
-             * @Default {ej.TreeGrid.SelectionMode.Row}
-             */
-            selectionMode?: ej.TreeGrid.SelectionMode|string;
-
-            /** Specifies the type of selection whether single, multiple or checkbox.
-             * @Default {ej.TreeGrid.SelectionType.Single}
-             */
-            selectionType?: ej.TreeGrid.SelectionType|string;
-
             /** Enables or disables the selection by hierarchy in check box selection
              * @Default {true}
              */
@@ -40117,6 +40225,48 @@ declare namespace ej {
              * @Default {true}
              */
             enableSelectAll?: boolean;
+
+            /** Specifies the type of selection whether to select row or cell.
+             * @Default {ej.TreeGrid.SelectionMode.Row}
+             */
+            selectionMode?: ej.TreeGrid.SelectionMode|string;
+
+            /** Specifies the type of selection whether single, multiple or checkbox.
+             * @Default {ej.TreeGrid.SelectionType.Single}
+             */
+            selectionType?: ej.TreeGrid.SelectionType|string;
+        }
+
+        export interface SizeSettings {
+
+            /** Height of the TreeGrid.
+             * @Default {450px}
+             */
+            height?: string;
+
+            /** Width of the TreeGrid.
+             * @Default {100%}
+             */
+            width?: string;
+        }
+
+        export interface SortSettingsSortedColumn {
+
+            /** Specifies the sort direction in TreeGrid
+             */
+            direction?: string;
+
+            /** Specifies the field to be sorted in TreeGrid
+             */
+            field?: string;
+        }
+
+        export interface SortSettings {
+
+            /** Option to add columns based on which the rows have to be sorted recursively.
+             * @Default {[]}
+             */
+            sortedColumns?: SortSettingsSortedColumn[];
         }
 
         export interface StackedHeaderRowsStackedHeaderColumn {
@@ -40155,34 +40305,8 @@ declare namespace ej {
             stackedHeaderColumns?: StackedHeaderRowsStackedHeaderColumn[];
         }
 
-        export interface SearchSettings {
-
-            /** Default Value
-             * @Default {[]}
-             */
-            fields?: any[];
-
-            /** Default Value
-             */
-            key?: string;
-
-            /** Specifies the operator for the search key words in toolbar searching.
-             * @Default {contains}
-             */
-            operator?: string;
-
-            /** Default Value
-             * @Default {true}
-             */
-            ignoreCase?: boolean;
-        }
-
         export interface SummaryRowsSummaryColumn {
 
-            /** Specifies the summary type to perform calculations in a corresponding summary column. See summaryType.
-             */
-            summaryType?: ej.TreeGrid.SummaryType|string;
-
             /** Specifies summary column used to perform the summary calculation.
              */
             dataMember?: string;
@@ -40191,6 +40315,10 @@ declare namespace ej {
              */
             displayColumn?: string;
 
+            /** Specifies the format to be applied on the summary column value.
+             */
+            format?: string;
+
             /** Specifies the text to be displayed before the summary column value.
              */
             prefix?: string;
@@ -40199,52 +40327,20 @@ declare namespace ej {
              */
             suffix?: string;
 
-            /** Specifies the format to be applied on the summary column value.
+            /** Specifies the summary type to perform calculations in a corresponding summary column. See summaryType.
              */
-            format?: string;
+            summaryType?: ej.TreeGrid.SummaryType|string;
         }
 
         export interface SummaryRow {
 
-            /** Specifies the title for summary row collection in TreeGrid
-             */
-            title?: string;
-
             /** Specifies the summary columns in the summary rows.
              */
             summaryColumns?: SummaryRowsSummaryColumn[];
-        }
 
-        export interface SizeSettings {
-
-            /** Height of the TreeGrid.
-             * @Default {null}
+            /** Specifies the title for summary row collection in TreeGrid
              */
-            height?: string;
-
-            /** Width of the TreeGrid.
-             * @Default {null}
-             */
-            width?: string;
-        }
-
-        export interface SortSettingsSortedColumn {
-
-            /** Specifies the field to be sorted in TreeGrid
-             */
-            field?: string;
-
-            /** Specifies the sort direction in TreeGrid
-             */
-            direction?: string;
-        }
-
-        export interface SortSettings {
-
-            /** Option to add columns based on which the rows have to be sorted recursively.
-             * @Default {[]}
-             */
-            sortedColumns?: SortSettingsSortedColumn[];
+            title?: string;
         }
 
         export interface ToolbarSettingsCustomToolbarItem {
@@ -40264,6 +40360,10 @@ declare namespace ej {
 
         export interface ToolbarSettings {
 
+            /** Allows the user to insert custom toolbar items.
+             */
+            customToolbarItems?: ToolbarSettingsCustomToolbarItem[];
+
             /** Shows/hides the toolbar.
              * @Default {false}
              */
@@ -40272,13 +40372,48 @@ declare namespace ej {
             /** Specifies the list of toolbar items to be rendered in TreeGrid toolbar
              * @Default {[]}
              */
-            toolbarItems?: any[];
-
-            /** Allows the user to insert custom toolbar items.
-             */
-            customToolbarItems?: ToolbarSettingsCustomToolbarItem[];
+            toolbarItems?: Array<ej.TreeGrid.ToolbarItems|string>;
         }
 
+        enum ColumnResizeMode {
+
+            ///At load time column are rendered with given width value, while resizing the column only current column width is changed
+            FixedColumns,
+
+            ///At load time columns are stretched with control width,while resizing the column, current column width updated based on next column
+            Normal,
+
+            ///In this mode columns are stretched with control width in load time and on resizing action.
+            NextColumn
+        }
+
+
+        enum ClipMode {
+
+            ///Shows ellipsis for the overflown cell.
+            Ellipsis,
+
+            ///Truncate the text in the cell.
+            Clip
+        }
+
+
+        enum UnboundType {
+
+            ///Unbound type to perform edit action
+            Edit,
+
+            ///Unbound type to perform save action
+            Save,
+
+            ///Unbound type to perform delete action
+            Delete,
+
+            ///Unbound type to perform cancel action
+            Cancel
+        }
+
+
         enum EditingType {
 
             ///It Specifies String edit type.
@@ -40314,39 +40449,16 @@ declare namespace ej {
         }
 
 
-        enum UnboundType {
+        enum ContextMenuItems {
 
-            ///Unbound type to perform edit action
+            ///Enables the add menu item in context menu
+            Add,
+
+            ///Enables the edit menu item in context menu
             Edit,
 
-            ///Unbound type to perform save action
-            Save,
-
-            ///Unbound type to perform delete action
-            Delete,
-
-            ///Unbound type to perform cancel action
-            Cancel
-        }
-
-
-        enum ClipMode {
-
-            ///Shows ellipsis for the overflown cell.
-            Ellipsis,
-
-            ///Truncate the text in the cell.
-            Clip
-        }
-
-
-        enum HeaderTextOverflow {
-
-            ///You can disable the word wrap
-            None,
-
-            ///You can wrap the header content
-            Wrap
+            ///Enables the edit menu item in context menu
+            Delete
         }
 
 
@@ -40392,19 +40504,6 @@ declare namespace ej {
         }
 
 
-        enum ColumnResizeMode {
-
-            ///At load time column are rendered with given width value, while resizing the column only current column width is changed
-            FixedColumns,
-
-            ///At load time columns are stretched with control width,while resizing the column, current column width updated based on next column
-            Normal,
-
-            ///In this mode columns are stretched with control width in load time and on resizing action.
-            NextColumn
-        }
-
-
         enum FilterHierarchyMode {
 
             ///Shows the filtered record with parent record
@@ -40421,6 +40520,16 @@ declare namespace ej {
         }
 
 
+        enum HeaderTextOverflow {
+
+            ///You can disable the word wrap
+            None,
+
+            ///You can wrap the header content
+            Wrap
+        }
+
+
         enum PageSizeMode {
 
             ///To count all the parent and child records.
@@ -40494,6 +40603,40 @@ declare namespace ej {
             FalseCount
         }
 
+
+        enum ToolbarItems {
+
+            ///Enables the add icon in toolbar
+            Add,
+
+            ///Enables the edit icon in toolbar
+            Edit,
+
+            ///Enables the edit icon in toolbar
+            Delete,
+
+            ///Enables the update icon in toolbar
+            Update,
+
+            ///Enables the cancel icon in toolbar
+            Cancel,
+
+            ///Enables the expand all icon in toolbar
+            ExpandAll,
+
+            ///Enables the collapse all icon in toolbar
+            CollapseAll,
+
+            ///Enables the PDF export icon in toolbar
+            PdfExport,
+
+            ///Enables the excel export icon in toolbar
+            ExcelExport,
+
+            ///Enables the printing icon in toolbar
+            Print
+        }
+
     }
 
     class GroupButton extends ej.Widget {
@@ -42652,9 +42795,10 @@ declare namespace ej {
 
         /** This method is used to set the width for the columns in the Spreadsheet.
          * @param {any[]|any} Pass the column index and width of the columns.
+         * @param {number} Optional. If sheetIdx is specified, it will set the width for columns to the specified sheet else it will use active sheet.
          * @returns {void}
          */
-        setWidthToColumns(widthColl: any[]|any): void;
+        setWidthToColumns(widthColl: any[]|any, sheetIndex?: number): void;
 
         /** This method is used to rename the active sheet.
          * @param {string} Pass the sheet name that you want to change the current active sheet name.
@@ -46184,6 +46328,33 @@ declare namespace ej {
          */
         zoomTo(zoomValue: number): void;
 
+        /** Searches the target text in the PDF document and highlights the occurrences in the pages.
+         * @param {string} The text to be searched in the pages in the PDF viewer.
+         * @returns {void}
+         */
+        searchText(targetText: string): void;
+
+        /** Searches the next occurrence of the searched text from the current occurrence in the PDF viewer control.
+         * @returns {void}
+         */
+        searchNext(): void;
+
+        /** Searches the previous occurrence of the searched text from the current occurrence in the PDF viewer control.
+         * @returns {void}
+         */
+        searchPrevious(): void;
+
+        /** Searches the target text with its casing.
+         * @param {boolean} Specifies whether the text search must be performed with match case or not.
+         * @returns {void}
+         */
+        matchCase(enableMatchCase: boolean): void;
+
+        /** Cancels the text search and removes the highlighted occurrences from the PDF viewer.
+         * @returns {void}
+         */
+        cancelSearchText(): void;
+
         /** Adds annotations to the PDF document.
          * @param {ej.PdfViewer.AnnotationType} type of the annotation to be added in the PDF document.
          * @returns {void}
@@ -48201,6 +48372,410 @@ declare namespace ej {
 
     }
 
+    class ReportDesigner extends ej.Widget {
+        static fn: ReportDesigner;
+        constructor(element: JQuery | Element, options?: ReportDesigner.Model);
+        static Locale: any;
+        model: ReportDesigner.Model;
+        defaults: ReportDesigner.Model;
+
+        /** Determines whether a copy operation is possible.
+         * @returns {boolean}
+         */
+        canCopy(): boolean;
+
+        /** Determines whether a cut operation is possible.
+         * @returns {boolean}
+         */
+        canCut(): boolean;
+
+        /** Determines whether a delete operation is possible.
+         * @returns {boolean}
+         */
+        canRemove(): boolean;
+
+        /** Determines whether a paste operation is possible.
+         * @returns {boolean}
+         */
+        canPaste(): boolean;
+
+        /** Returns the bool value indicating whether the user can redo the previous action in the report.
+         * @returns {boolean}
+         */
+        canRedo(): boolean;
+
+        /** Returns a bool value indicating whether the user can undo the previous action in the report.
+         * @returns {boolean}
+         */
+        canUndo(): boolean;
+
+        /** Copies the selected ReportItem from design panel to Report Designer internal clipboard.
+         * @returns {void}
+         */
+        copy(): void;
+
+        /** Cuts the selected ReportItem from design panel to Report Designer internal clipboard.
+         * @returns {void}
+         */
+        cut(): void;
+
+        /** Deletes the selected item from the report.
+         * @returns {void}
+         */
+        remove(): void;
+
+        /** Returns the bool value that specifies whether the report has changes or not.
+         * @returns {boolean}
+         */
+        hasReportChanges(): boolean;
+
+        /** Returns the bool value that specifies whether the currently processing report is a new report or not.
+         * @returns {boolean}
+         */
+        isNewReport(): boolean;
+
+        /** Returns the bool value that specifies whether the currently processing report is a new server report or not.
+         * @returns {boolean}
+         */
+        isNewServerReport(): boolean;
+
+        /** Returns the bool value that specifies whether the currently processing report is obtained from the server or local.
+         * @returns {boolean}
+         */
+        isServerReport(): boolean;
+
+        /** To create a new report.
+         * @returns {void}
+         */
+        newReport(): void;
+
+        /** To create a new report in the server.
+         * @returns {void}
+         */
+        newServerReport(): void;
+
+        /** This method opens the report from the ReportServer.
+         * @returns {void}
+         */
+        openReport(): void;
+
+        /** To open the report client browse dialog.
+         * @returns {void}
+         */
+        openReportFromDevice(): void;
+
+        /** To open the report open server browse dialog.
+         * @returns {void}
+         */
+        openServerReportDialog(): void;
+
+        /** Pastes the selected ReportItem from Report Designer internal clipboard to design panel.
+         * @returns {void}
+         */
+        paste(): void;
+
+        /** Reverses the action of the last Undo command.
+         * @returns {void}
+         */
+        redo(): void;
+
+        /** This method saves the report into the ReportServer.
+         * @returns {void}
+         */
+        saveReport(): void;
+
+        /** To open the report save server browse dialog.
+         * @returns {void}
+         */
+        saveServerReportDialog(): void;
+
+        /** To download the designed report.
+         * @returns {void}
+         */
+        saveToDevice(): void;
+
+        /** To show the report design.
+         * @returns {void}
+         */
+        showDesign(): void;
+
+        /** To open the new report dialog.
+         * @returns {void}
+         */
+        showNewReportDialog(): void;
+
+        /** To open the server browse dialog.
+         * @returns {void}
+         */
+        showOpenSaveReportDialog(): void;
+
+        /** To show the report preview.
+         * @returns {void}
+         */
+        showPreview(): void;
+
+        /** Reverses the last action that was performed.
+         * @returns {void}
+         */
+        undo(): void;
+    }
+    export namespace ReportDesigner {
+
+        export interface Model {
+
+            /** Specifies the locale for report designer.
+             * @Default {en-US}
+             */
+            locale?: string;
+
+            /** Gets or Sets the report path of server.
+             * @Default {null}
+             */
+            reportPath?: string;
+
+            /** Gets or Sets the reports server URL.
+             * @Default {null}
+             */
+            reportServerUrl?: string;
+
+            /** Gets or sets the serviceAuthorizationToken to access the Report Server API services.
+             * @Default {empty}
+             */
+            serviceAuthorizationToken?: string;
+
+            /** Gets or Sets the URL of the  WebAPI service; it will be used for processing the report.
+             * @Default {null}
+             */
+            serviceUrl?: string;
+
+            /** Specifies the toolbar settings.
+             */
+            toolbarSettings?: ToolbarSettings;
+
+            /** This event will be triggered before AJAX loads.
+             */
+            ajaxBeforeLoad?(e: AjaxBeforeLoadEventArgs): void;
+
+            /** This event will be triggered when AJAX result is failed.
+             */
+            ajaxError?(e: AjaxErrorEventArgs): void;
+
+            /** This event will be triggered when AJAX result is succeeded.
+             */
+            ajaxSuccess?(e: AjaxSuccessEventArgs): void;
+
+            /** This event will be triggered when the Report Designer widget is created.
+             */
+            create?(e: CreateEventArgs): void;
+
+            /** This event will be triggered when the Report Designer widget is destroyed.
+             */
+            destroy?(e: DestroyEventArgs): void;
+
+            /** This event will be triggered while clicking open menu items.
+             */
+            openReportClick?(e: OpenReportClickEventArgs): void;
+
+            /** This event will be triggered when the report is modified.
+             */
+            reportModified?(e: ReportModifiedEventArgs): void;
+
+            /** This event will be triggered when the report is opened.
+             */
+            reportOpened?(e: ReportOpenedEventArgs): void;
+
+            /** This event will be triggered when the report is saved.
+             */
+            reportSaved?(e: ReportSavedEventArgs): void;
+
+            /** This event will be triggered when the save menu items are clicked.
+             */
+            saveReportClick?(e: SaveReportClickEventArgs): void;
+
+            /** This event will be triggered while clicking the toolbar items.
+             */
+            toolbarClick?(e: ToolbarClickEventArgs): void;
+
+            /** This event will be triggered on rendering the Report Designer toolbar.
+             */
+            toolbarRendering?(e: ToolbarRenderingEventArgs): void;
+        }
+
+        export interface AjaxBeforeLoadEventArgs {
+
+            /** AJAX headers, we can pass any custom header through this property.
+             */
+            headers?: any[];
+
+            /** To pass the custom data while AJAX post back.
+             */
+            data?: any;
+
+            /** Token of report designer.
+             */
+            reportDesignerToken?: string;
+
+            /** Token of ReportingService.
+             */
+            serviceAuthorizationToken?: string;
+
+            /** Action type of AJAX call back.
+             */
+            actionType?: string;
+        }
+
+        export interface AjaxErrorEventArgs {
+        }
+
+        export interface AjaxSuccessEventArgs {
+        }
+
+        export interface CreateEventArgs {
+        }
+
+        export interface DestroyEventArgs {
+        }
+
+        export interface OpenReportClickEventArgs {
+
+            /** DOM of the clicked target.
+             */
+            target?: JQuery;
+
+            /** Name of selected item.
+             */
+            select?: string;
+        }
+
+        export interface ReportModifiedEventArgs {
+
+            /** Specifies whether the report is modified or not.
+             */
+            isModified?: boolean;
+
+            /** Name of Opened Report.
+             */
+            reportName?: string;
+        }
+
+        export interface ReportOpenedEventArgs {
+
+            /** Specifies whether report opened from device or server.
+             */
+            isServerReport?: boolean;
+
+            /** Name of Opened Report.
+             */
+            reportName?: string;
+        }
+
+        export interface ReportSavedEventArgs {
+
+            /** Specifies whether report opened from device or server.
+             */
+            isServerReport?: boolean;
+
+            /** States whether report is downloaded from ReportServer.
+             */
+            reportAction?: string;
+        }
+
+        export interface SaveReportClickEventArgs {
+
+            /** DOM of the clicked target.
+             */
+            target?: JQuery;
+
+            /** Name of selected item.
+             */
+            select?: string;
+        }
+
+        export interface ToolbarClickEventArgs {
+
+            /** DOM of the clicked target.
+             */
+            target?: JQuery;
+
+            /** Name of clicked item.
+             */
+            click?: string;
+        }
+
+        export interface ToolbarRenderingEventArgs {
+        }
+
+        export interface ToolbarSettings {
+
+            /** Shows or hides the grouped items in the toolbar with the help of enum ej.ReportDesigner.ToolbarItems.
+             * @Default {ej.ReportDesigner.ToolbarItems.All}
+             */
+            items?: ej.ReportDesigner.ToolbarItems|string;
+
+            /** Shows or hides the toolbar.
+             * @Default {true}
+             */
+            showToolbar?: boolean;
+
+            /** Specifies the toolbar template ID.
+             * @Default {empty}
+             */
+            templateId?: string;
+        }
+
+        enum ToolbarItems {
+
+            ///Creates a new, blank report.
+            New,
+
+            ///Displays the Open dialog box to retrieve an existing report.
+            Open,
+
+            ///Saves the active report to a specified location.
+            Save,
+
+            ///Removes the selected item from the active report.
+            Cut,
+
+            ///Copies selected text or object to the clipboard.
+            Copy,
+
+            ///Pastes the item that cut or copied into (the position of the insertion point) the report from the clipboard.
+            Paste,
+
+            ///Deletes the selected item or text from the report.
+            Delete,
+
+            ///Reverses the last action or deletes the last entry that is typed.
+            Undo,
+
+            ///Reverses the action of the last Undo command.
+            Redo,
+
+            ///Used to "zoom in" to get a close-up view of a report or "zoom out" to see more of the page at a reduced size.
+            Zoom,
+
+            ///Previews the active report in report viewer.
+            Preview,
+
+            ///Enables/Disables the gridline in active report.
+            GridLine,
+
+            ///Enables header area in the report.
+            Header,
+
+            ///Enables footer area in the report.
+            Footer,
+
+            ///Switches from preview to design view of the report.
+            EditDesign,
+
+            ///Shows all the toolbar items.
+            All
+        }
+
+    }
+
 }
 declare namespace ej.datavisualization {
     class SymbolPalette extends ej.Widget {
@@ -64292,6 +64867,16 @@ declare namespace ej.datavisualization {
          * @returns {void}
          */
         zoom(level: number, isAnimate: boolean): void;
+
+        /** Method to reload the shape marker with updated values.
+         * @returns {void}
+         */
+        refreshLayer(): void;
+
+        /** Add markers dynamically based on layer and sublayer index value.
+         * @returns {void}
+         */
+        addMarkers(): void;
     }
     export namespace Map {
 
@@ -64413,6 +64998,10 @@ declare namespace ej.datavisualization {
              */
             Click?(e: ClickEventArgs): void;
 
+            /** Fires on clicking the legend item.
+             */
+            legendItemClick?(e: LegendItemClickEventArgs): void;
+
             /** Fires, on double clicking the map.
              */
             doubleClick?(e: DoubleClickEventArgs): void;
@@ -64424,6 +65013,18 @@ declare namespace ej.datavisualization {
             /** Fires before loading the map.
              */
             onLoad?(e: OnLoadEventArgs): void;
+
+            /** Triggers while entering the hovered marker shape.
+             */
+            markerEnter?(e: MarkerEnterEventArgs): void;
+
+            /** Triggers while leaving the hovered marker shape.
+             */
+            markerLeave?(e: MarkerLeaveEventArgs): void;
+
+            /** Triggers after refreshing the map items.
+             */
+            refreshed?(e: RefreshedEventArgs): void;
         }
 
         export interface MarkerSelectedEventArgs {
@@ -64518,6 +65119,27 @@ declare namespace ej.datavisualization {
             originalEvent?: any;
         }
 
+        export interface LegendItemClickEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the map model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+
+            /** startX - X-coordinate of legend item in pixel        LegendItem - Instance of the legend item object that is about to be rendered    style - Options to customize the legend item
+             * styles such as border, color, size, etc…,        symbolShape - Name of the legend item shape. Use this option to customize legend item shape before rendering    map - Instance
+             * of the map object corresponding to the legend item
+             */
+            data?: any;
+        }
+
         export interface DoubleClickEventArgs {
 
             /** Returns double clicked shape object.
@@ -64547,8 +65169,50 @@ declare namespace ej.datavisualization {
             type?: string;
         }
 
+        export interface MarkerEnterEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the map model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface MarkerLeaveEventArgs {
+
+            /** Set this option to true to cancel the event
+             */
+            cancel?: boolean;
+
+            /** Instance of the map model object
+             */
+            model?: any;
+
+            /** Name of the event
+             */
+            type?: string;
+        }
+
+        export interface RefreshedEventArgs {
+
+            /** Refresh and load the map.
+             */
+            originalEvent?: any;
+        }
+
         export interface ZoomSettings {
 
+            /** Specifies animation duration for map shapes while zooming.
+             * @Default {600}
+             */
+            animationDuration?: string;
+
             /** Enables or Disables the zooming of map
              * @Default {true}
              */
@@ -64806,6 +65470,11 @@ declare namespace ej.datavisualization {
              */
             showLegend?: boolean;
 
+            /** Toggle the visibility of the legend.
+             * @Default {false}
+             */
+            toggleVisibility?: boolean;
+
             /** to get title of legend setting
              * @Default {null}
              */
@@ -65639,6 +66308,11 @@ declare namespace ej.datavisualization {
          * @returns {void}
          */
         refresh(): void;
+
+        /** Method to drilldown the treemap.
+         * @returns {void}
+         */
+        drillDown(): void;
     }
     export namespace TreeMap {
 
@@ -65711,6 +66385,16 @@ declare namespace ej.datavisualization {
              */
             enableDrillDown?: boolean;
 
+            /** Specifies to drill the particular data of the treemap.
+             * @Default {null}
+             */
+            drillDownValue?: string;
+
+            /** Specifies to render particular level of the treemap.
+             * @Default {0}
+             */
+            drillDownLevel?: number;
+
             /** Controls whether Treemap has to be responsive while resizing the window.
              * @Default {true}
              */
@@ -68109,6 +68793,11 @@ declare namespace ej.datavisualization {
              */
             margin?: ConnectorsLabelsMargin;
 
+            /** Sets the padding for connector label.
+             * @Default {ej.datavisualization.Diagram.Point(0.5, 0.5)}
+             */
+            padding?: any;
+
             /** Sets the value which is used to drag the label within certain bounds.
              * @Default {null}
              */
@@ -69323,6 +70012,11 @@ declare namespace ej.datavisualization {
              */
             overflowType?: ej.datavisualization.Diagram.OverflowType|string;
 
+            /** To set the padding of the node label
+             * @Default {ej.datavisualization.Diagram.Padding()}
+             */
+            padding?: any;
+
             /** Defines whether the label is editable or not
              * @Default {false}
              */
@@ -70713,6 +71407,10 @@ declare namespace ej.datavisualization {
             BridgeObstacle,
             //Enables connector to be selected and dragged.
             Interaction,
+            //Enables the Routing for an connector
+            Routing,
+            //Inherit the routing option defined in the diagram constraints.
+            InheritRouting,
             //Enables all constraints
             Default,
         }
@@ -70919,6 +71617,8 @@ declare namespace ej.datavisualization {
             ZoomTextEditor,
             //Enables/Disables the drag and drop of element from one diagram to the other
             FloatElements,
+            //Enables the routing for an connector in diagram
+            Routing,
             //Enables all Constraints
             Default,
         }
@@ -74355,6 +75055,9 @@ interface JQuery {
     ejRecurrenceEditor(options?: ej.RecurrenceEditor.Model): JQuery;
     ejRecurrenceEditor(memberName: any, value?: any, param?: any): any;
 
+    ejReportDesigner(options?: ej.ReportDesigner.Model): JQuery;
+    ejReportDesigner(memberName: any, value?: any, param?: any): any;
+
     ejReportViewer(options?: ej.ReportViewer.Model): JQuery;
     ejReportViewer(memberName: any, value?: any, param?: any): any;
 
@@ -74501,6 +75204,7 @@ interface JQuery {
     data(key: "ejRangeNavigator"): ej.datavisualization.RangeNavigator;
     data(key: "ejRating"): ej.Rating;
     data(key: "ejRecurrenceEditor"): ej.RecurrenceEditor;
+    data(key: "ejReportDesigner"): ej.ReportDesigner;
     data(key: "ejReportViewer"): ej.ReportViewer;
     data(key: "ejResizable"): ej.Resizable;
     data(key: "ejRibbon"): ej.Ribbon;
diff --git a/types/elasticsearch/elasticsearch-tests.ts b/types/elasticsearch/elasticsearch-tests.ts
index 35b4e39798..68625bd5bb 100644
--- a/types/elasticsearch/elasticsearch-tests.ts
+++ b/types/elasticsearch/elasticsearch-tests.ts
@@ -37,6 +37,21 @@ client.search({
 }, (error) => {
 });
 
+client.search({
+  body: {
+    query: {
+      match_all: {
+        _name: 'test'
+      }
+    }
+  }
+}
+).then((body) => {
+  const hit = body.hits.hits[0];
+  const names = hit && hit.matched_queries;
+}, (error) => {
+});
+
 client.indices.delete({
   index: 'test_index',
   ignore: [404]
@@ -44,6 +59,13 @@ client.indices.delete({
 }, (error) => {
 });
 
+client.indices.delete({
+  index: 'test_index',
+  ignoreUnavailable: true
+}).then((body) => {
+}, (error) => {
+});
+
 client.deleteByQuery({
   index: 'test_index',
   type: 'test_type',
diff --git a/types/elasticsearch/index.d.ts b/types/elasticsearch/index.d.ts
index 2cfd14f689..a9dc133545 100644
--- a/types/elasticsearch/index.d.ts
+++ b/types/elasticsearch/index.d.ts
@@ -645,6 +645,7 @@ export interface SearchResponse<T> {
             fields?: any;
             highlight?: any;
             inner_hits?: any;
+            matched_queries?: string[];
             sort?: string[];
         }>;
     };
@@ -1143,6 +1144,7 @@ export interface IndicesDeleteParams extends GenericParams {
     timeout?: TimeSpan;
     masterTimeout?: TimeSpan;
     index: NameList;
+    ignoreUnavailable?: boolean;
 }
 
 export interface IndicesDeleteAliasParams extends GenericParams {
diff --git a/types/electron-devtools-installer/electron-devtools-installer-tests.ts b/types/electron-devtools-installer/electron-devtools-installer-tests.ts
index 798e6ad223..ddc7711afe 100644
--- a/types/electron-devtools-installer/electron-devtools-installer-tests.ts
+++ b/types/electron-devtools-installer/electron-devtools-installer-tests.ts
@@ -7,7 +7,6 @@ import installExtension, {
     MOBX_DEVTOOLS
 } from 'electron-devtools-installer';
 
-
 installExtension(EMBER_INSPECTOR);
 installExtension(REACT_DEVELOPER_TOOLS);
 installExtension(BACKBONE_DEBUGGER);
@@ -19,4 +18,7 @@ installExtension(REACT_PERF);
 installExtension(CYCLEJS_DEVTOOL);
 installExtension(APOLLO_DEVELOPER_TOOLS);
 installExtension(MOBX_DEVTOOLS);
-installExtension('abcdefghijkl');
\ No newline at end of file
+installExtension('abcdefghijkl');
+installExtension([EMBER_INSPECTOR, JQUERY_DEBUGGER]);
+installExtension(['extension', 'another-extension']);
+installExtension([REACT_DEVELOPER_TOOLS, 'MOBX_DEVTOOLS']);
diff --git a/types/electron-devtools-installer/index.d.ts b/types/electron-devtools-installer/index.d.ts
index 88649cd0a8..92d94044d7 100644
--- a/types/electron-devtools-installer/index.d.ts
+++ b/types/electron-devtools-installer/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for electron-devtools-installer v2.0.1
+// Type definitions for electron-devtools-installer v2.2.4
 // Project: https://github.com/MarshallOfSound/electron-devtools-installer
 // Definitions by: Robin Van den Broeck <https://github.com/gamesmaxed>
 //                 M. Fatih Mar <https://github.com/mfatihmar>
@@ -11,7 +11,7 @@ declare module "electron-devtools-installer" {
     }
 
     // Default installation function
-    export default function (extensionReference: ExtensionReference | string, forceDownload?: boolean): Promise<string>;
+    export default function (extensionReference: ExtensionReference | string | Array<ExtensionReference | string>, forceDownload?: boolean): Promise<string>;
 
     // Devtools themself
     export const EMBER_INSPECTOR: ExtensionReference;
@@ -25,4 +25,4 @@ declare module "electron-devtools-installer" {
     export const CYCLEJS_DEVTOOL: ExtensionReference;
     export const APOLLO_DEVELOPER_TOOLS: ExtensionReference;
     export const MOBX_DEVTOOLS: ExtensionReference;
-}
\ No newline at end of file
+}
diff --git a/types/electron-packager/electron-packager-tests.ts b/types/electron-packager/electron-packager-tests.ts
index f956910b78..06cadf97f0 100644
--- a/types/electron-packager/electron-packager-tests.ts
+++ b/types/electron-packager/electron-packager-tests.ts
@@ -2,7 +2,7 @@ import packager = require("electron-packager");
 
 function callback(err: Error, appPaths: string[]) {
 	const msg = err.message;
-	const	index = appPaths.indexOf("test");
+	const index = appPaths.indexOf("test");
 }
 
 function completeFunction(buildPath: string, electronVersion: string, platform: string, arch: string, callbackFn: () => void) {
@@ -13,6 +13,8 @@ function ignoreFunction(path: string) {
 	return true;
 }
 
+// this is the obsolete API and will be removed in a future version
+
 packager({
 	dir: ".",
 	name: "myapplication",
@@ -30,6 +32,29 @@ packager({
 	}
 }, callback);
 
+function onCompleted(appPaths: string | string[]) {
+}
+
+function onError(error: Error) {
+}
+
+packager({
+	dir: ".",
+	name: "myapplication",
+	platform: "win32",
+	arch: "all",
+	electronVersion: "0.34.0",
+	win32metadata: {
+		CompanyName: "Acme CO",
+		FileDescription: "My application",
+		OriginalFilename: "myapp.exe",
+		ProductName: "Application",
+		InternalName: "roadrunner",
+		"requested-execution-level": "highestAvailable",
+		"application-manifest": "manifest.xml"
+	}
+}).then(onCompleted).catch(onError);
+
 packager({
 	dir: ".",
 	name: "myapplication",
@@ -44,7 +69,7 @@ packager({
 		"requested-execution-level": "requireAdministrator",
 		"application-manifest": "manifest.xml"
 	}
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
@@ -52,14 +77,14 @@ packager({
 	platform: "all",
 	arch: "all",
 	electronVersion: "0.34.0"
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
 	name: "myapplication",
 	electronVersion: "0.34.0",
 	all: true
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
@@ -67,7 +92,7 @@ packager({
 	electronVersion: "0.34.0",
 	arch: "arm64",
 	executableName: "myapp"
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
@@ -110,7 +135,7 @@ packager({
 		"requested-execution-level": "asInvoker",
 		"application-manifest": "manifest.xml"
 	}
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
@@ -142,7 +167,7 @@ packager({
 	extendInfo: "plist.txt",
 	helperBundleId: "23223f",
 	osxSign: true
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
@@ -161,7 +186,7 @@ packager({
 	ignore: ignoreFunction,
 	packageManager: "cnpm",
 	platform: "linux"
-}, callback);
+}).then(onCompleted).catch(onError);
 
 packager({
 	dir: ".",
@@ -192,4 +217,4 @@ packager({
 			"myapp2"
 		]
 	}]
-}, callback);
+}).then(onCompleted).catch(onError);
diff --git a/types/electron-packager/index.d.ts b/types/electron-packager/index.d.ts
index 6e430ecdb2..0e438ebc6e 100644
--- a/types/electron-packager/index.d.ts
+++ b/types/electron-packager/index.d.ts
@@ -1,14 +1,28 @@
-// Type definitions for electron-packager 10.1
+// Type definitions for electron-packager 12.0
 // Project: https://github.com/electron-userland/electron-packager
 // Definitions by: Maxime LUCE <https://github.com/SomaticIT>
 //                 Juan Jimenez-Anca <https://github.com/cortopy>
 //                 John Kleinschmidt <https://github.com/jkleinsc>
+//                 Brendan Forster <https://github.com/shiftkey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
 export = electronPackager;
 
+/**
+ * This will:
+ * - Find or download the correct release of Electron
+ * - Use that version of electron to create a app in <out>/<appname>-<platform>-<arch>
+ *
+ * You should be able to launch the app on the platform you built for. If not, check your settings and try again.
+ *
+ * @param opts - Options to configure packaging.
+ *
+ * @returns A promise containing the path(s) to the newly created application(s)
+ */
+declare function electronPackager(opts: electronPackager.Options): Promise<string|string[]>;
+
 /**
  * This will:
  * - Find or download the correct release of Electron
@@ -18,6 +32,8 @@ export = electronPackager;
  *
  * @param opts - Options to configure packaging.
  * @param callback - Callback which is called when packaging is done or an error occured.
+ *
+ * @deprecated since version 12.0
  */
 declare function electronPackager(opts: electronPackager.Options, callback: electronPackager.finalCallback): void;
 
diff --git a/types/electron-unhandled/electron-unhandled-tests.ts b/types/electron-unhandled/electron-unhandled-tests.ts
new file mode 100644
index 0000000000..42444658f8
--- /dev/null
+++ b/types/electron-unhandled/electron-unhandled-tests.ts
@@ -0,0 +1,5 @@
+import * as unhandled from "electron-unhandled";
+
+unhandled({ logger: 'foo' }); // $ExpectError
+unhandled({ showDialog: 'bar' }); // $ExpectError
+unhandled({ logger: (err: Error) => {}, showDialog: true }); // $ExpectType void
diff --git a/types/electron-unhandled/index.d.ts b/types/electron-unhandled/index.d.ts
new file mode 100644
index 0000000000..d560e05b80
--- /dev/null
+++ b/types/electron-unhandled/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for electron-unhandled 1.1
+// Project: https://github.com/sindresorhus/electron-unhandled
+// Definitions by: Olegs Jeremejevs <https://github.com/jeremejevs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace unhandled {
+  interface Options {
+    logger?: (err: Error) => void;
+    showDialog?: boolean;
+  }
+}
+
+declare function unhandled(options?: unhandled.Options): void;
+
+export = unhandled;
diff --git a/types/electron-unhandled/tsconfig.json b/types/electron-unhandled/tsconfig.json
new file mode 100644
index 0000000000..fa790385fe
--- /dev/null
+++ b/types/electron-unhandled/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",
+        "electron-unhandled-tests.ts"
+    ]
+}
diff --git a/types/electron-unhandled/tslint.json b/types/electron-unhandled/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/electron-unhandled/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/elegant-spinner/elegant-spinner-tests.ts b/types/elegant-spinner/elegant-spinner-tests.ts
new file mode 100644
index 0000000000..5d2ddb9dc7
--- /dev/null
+++ b/types/elegant-spinner/elegant-spinner-tests.ts
@@ -0,0 +1,8 @@
+import elegantSpinner = require('elegant-spinner');
+
+const frameFunction = elegantSpinner();
+
+// $ExpectType string
+frameFunction();
+
+const frames = elegantSpinner.frames;
diff --git a/types/elegant-spinner/index.d.ts b/types/elegant-spinner/index.d.ts
new file mode 100644
index 0000000000..fbb8d4710a
--- /dev/null
+++ b/types/elegant-spinner/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for elegant-spinner 1.0
+// Project: https://github.com/sindresorhus/elegant-spinner
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = elegantSpinner;
+
+declare function elegantSpinner(): () => string;
+
+declare namespace elegantSpinner {
+  const frames: ReadonlyArray<string>;
+}
diff --git a/types/elegant-spinner/tsconfig.json b/types/elegant-spinner/tsconfig.json
new file mode 100644
index 0000000000..cdd768d4c6
--- /dev/null
+++ b/types/elegant-spinner/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"elegant-spinner-tests.ts"
+	]
+}
diff --git a/types/elegant-spinner/tslint.json b/types/elegant-spinner/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/elegant-spinner/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/elementtree/elementtree-tests.ts b/types/elementtree/elementtree-tests.ts
new file mode 100644
index 0000000000..630a17f6c6
--- /dev/null
+++ b/types/elementtree/elementtree-tests.ts
@@ -0,0 +1,56 @@
+import * as et from 'elementtree';
+
+// Example 1
+// https://github.com/racker/node-elementtree#example-1--creating-an-xml-document
+
+const XML = et.XML;
+const ElementTree = et.ElementTree;
+const element = et.Element;
+const subElement = et.SubElement;
+
+const root = element('entry');
+root.set('xmlns', 'http://www.w3.org/2005/Atom');
+
+const tenantId = subElement(root, 'TenantId');
+tenantId.text = '12345';
+
+const serviceName = subElement(root, 'ServiceName');
+serviceName.text = 'MaaS';
+
+const resourceId = subElement(root, 'ResourceID');
+resourceId.text = 'enAAAA';
+
+const usageId = subElement(root, 'UsageID');
+usageId.text = '550e8400-e29b-41d4-a716-446655440000';
+
+const eventType = subElement(root, 'EventType');
+eventType.text = 'create';
+
+const category = subElement(root, 'category');
+category.set('term', 'monitoring.entity.create');
+
+const dataCenter = subElement(root, 'DataCenter');
+dataCenter.text = 'global';
+
+const region = subElement(root, 'Region');
+region.text = 'global';
+
+const startTime = subElement(root, 'StartTime');
+startTime.text = new Date();
+
+const resourceName = subElement(root, 'ResourceName');
+resourceName.text = 'entity';
+
+const etree1 = new ElementTree(root);
+const xml = etree1.write({ xml_declaration: false });
+
+// Example 2
+// https://github.com/racker/node-elementtree#example-2--parsing-an-xml-document
+
+const data = '<xml></xml>';
+const etree2 = et.parse(data);
+
+etree2.findall('./entry/TenantId').length; // 2
+etree2.findtext('./entry/ServiceName'); // MaaS
+etree2.findall('./entry/category')[0].get('term'); // monitoring.entity.create
+etree2.findall('*/category/[@term="monitoring.entity.update"]').length; // 1
diff --git a/types/elementtree/index.d.ts b/types/elementtree/index.d.ts
new file mode 100644
index 0000000000..8019797b4a
--- /dev/null
+++ b/types/elementtree/index.d.ts
@@ -0,0 +1,88 @@
+// Type definitions for elementtree 0.1
+// Project: https://github.com/racker/node-elementtree
+// Definitions by: Daniel Imhoff <https://github.com/dwieeb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface ElementTreeWriteOptions {
+    default_namespace?: string;
+    encoding?: string; // default is 'utf-8'
+    indent?: number;
+    method?: 'xml' | 'text'; // default is 'xml'
+    xml_declaration?: boolean; // on by default
+}
+
+export class ElementTree {
+    constructor(element: Element);
+
+    getroot(): Element;
+    _setroot(element: Element): void;
+
+    parse(source: string): Element;
+    find(path: string): Element | null;
+    findtext(path: string): ElementText | undefined;
+    findall(path: string): Element[];
+    write(options?: ElementTreeWriteOptions): string;
+}
+
+export interface Attributes {
+    [key: string]: string | undefined;
+}
+
+export type ElementTag = typeof Comment | typeof CData | typeof ProcessingInstruction | string;
+
+export type ElementText = { toString(): string; } | string;
+
+export interface Element {
+    tag: ElementTag;
+    attrib: Attributes;
+    text: ElementText | null;
+    tail: string | null;
+
+    toString(): string;
+    makeelement(tag: ElementTag, attrib?: Attributes): Element;
+    len(): number;
+
+    getItem(index: number): Element | undefined;
+    setItem(index: number, element: Element): void;
+    delItem(index: number): void;
+    getSlice(start: number, stop: number): Element[];
+    setSlice(start: number, stop: number, elements: ReadonlyArray<Element>): void;
+    delSlice(start: number, stop: number): void;
+
+    append(element: Element): void;
+    extend(elements: ReadonlyArray<Element>): void;
+    insert(index: number, element: Element): void;
+    remove(element: Element): void;
+    getchildren(): Element[];
+
+    find(path: string): Element | null;
+    findtext(path: string): ElementText | undefined;
+    findall(path: string): Element[];
+
+    clear(): void;
+
+    get(k: string): string | undefined;
+    set(k: string, v?: string): string;
+    keys(): string[];
+    items(): Array<[string, string]>;
+}
+
+export class QName {
+    text: string;
+
+    constructor(text_or_uri: string, tag?: string);
+    toString(): string;
+}
+
+// special tags
+export function CData(text?: ElementText): Element;
+export function Comment(text?: ElementText): Element;
+export function ProcessingInstruction(target: ElementText, text?: ElementText): Element;
+
+export function XML(data: string): Element;
+export function Element(ElementTag: string, attrib?: Attributes): Element;
+export function SubElement(parent: Element, ElementTag: string, attrib?: Attributes): Element;
+
+export function parse(source: string): ElementTree;
+export function register_namespace(prefix: string, uri: string): void;
+export function tostring(element: Element, options: ElementTreeWriteOptions): string;
diff --git a/types/elementtree/tsconfig.json b/types/elementtree/tsconfig.json
new file mode 100644
index 0000000000..9f9991fb4e
--- /dev/null
+++ b/types/elementtree/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",
+        "elementtree-tests.ts"
+    ]
+}
diff --git a/types/elementtree/tslint.json b/types/elementtree/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/elementtree/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ember-data/index.d.ts b/types/ember-data/index.d.ts
index b891bbe1d1..b071662326 100644
--- a/types/ember-data/index.d.ts
+++ b/types/ember-data/index.d.ts
@@ -526,7 +526,7 @@ declare module 'ember-data' {
              * invoking the callback with the name of each relationship and its relationship
              * descriptor.
              */
-            eachRelationship(callback: Function, binding: any): any;
+            eachRelationship(callback: (name: string, details: RelationshipMeta<this>) => void, 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.
@@ -577,7 +577,7 @@ declare module 'ember-data' {
              * invoking the callback with the name of each relationship and its relationship
              * descriptor.
              */
-            static eachRelationship(callback: Function, binding: any): any;
+            static eachRelationship<M extends Model = Model>(callback: (name: string, details: RelationshipMeta<M>) => void, 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
diff --git a/types/ember-data/test/relationships.ts b/types/ember-data/test/relationships.ts
index df43387bb4..06795c0e26 100644
--- a/types/ember-data/test/relationships.ts
+++ b/types/ember-data/test/relationships.ts
@@ -12,6 +12,20 @@ const Polymorphic = DS.Model.extend({
     paymentMethods: DS.hasMany('payment-method', { polymorphic: true })
 });
 
+Polymorphic.eachRelationship(() => '');
+Polymorphic.eachRelationship(() => '', {});
+Polymorphic.eachRelationship((n, meta) => {
+    let s: string = n;
+    let m: 'belongsTo' | 'hasMany' = meta.kind;
+});
+let p = Polymorphic.create();
+p.eachRelationship(() => '');
+p.eachRelationship(() => '', {});
+p.eachRelationship((n, meta) => {
+    let s: string = n;
+    let m: 'belongsTo' | 'hasMany' = meta.kind;
+});
+
 class Comment extends DS.Model {
     author = DS.attr('string');
 }
diff --git a/types/ember-mocha/ember-mocha-tests.ts b/types/ember-mocha/ember-mocha-tests.ts
index 75d1154a87..09662096b6 100644
--- a/types/ember-mocha/ember-mocha-tests.ts
+++ b/types/ember-mocha/ember-mocha-tests.ts
@@ -1,7 +1,8 @@
 import {
     describeComponent, describeModel, describeModule,
     setResolver, setupAcceptanceTest, setupComponentTest,
-    setupModelTest, setupTest
+    setupModelTest, setupTest, setupRenderingTest,
+    setupApplicationTest
 } from 'ember-mocha';
 import { describe, it, beforeEach, afterEach, before, after } from 'mocha';
 import chai = require('chai');
@@ -96,8 +97,6 @@ describeModule('component:x-foo', 'TestModule callbacks', function() {
 });
 
 describe('setupTest', function() {
-    setupTest();
-
     setupTest('service:ajax');
 
     setupTest('service:ajax', {
@@ -193,3 +192,62 @@ it('can calculate the result', function(assert) {
 it.skip('disabled test');
 
 it.skip('disabled test', function() { });
+
+// New testing APIs of ember-mocha 0.14
+
+describe('setupTest', function() {
+    setupTest();
+
+    setupTest({ resolver: Ember.DefaultResolver.create() });
+
+    const hooks = setupTest();
+    hooks.beforeEach(function() {
+        this.owner.lookup('service:foo');
+    });
+    hooks.afterEach(function() {
+        this.owner.factoryFor('service:foo');
+    });
+
+    setupRenderingTest();
+
+    setupRenderingTest({ resolver: Ember.DefaultResolver.create() });
+
+    const hooks2 = setupRenderingTest();
+    hooks2.beforeEach(function() {
+        this.owner.lookup('service:foo');
+    });
+
+    hooks2.afterEach(function() {
+        this.owner.factoryFor('service:foo');
+    });
+
+    setupApplicationTest();
+
+    setupApplicationTest({ resolver: Ember.DefaultResolver.create() });
+
+    const hooks3 = setupApplicationTest();
+    hooks3.beforeEach(function() {
+        this.owner.lookup('service:foo');
+    });
+
+    hooks3.afterEach(function() {
+        this.owner.factoryFor('service:foo');
+    });
+
+    it('test', function() {
+    });
+});
+
+describe('rendering test', function() {
+    setupRenderingTest();
+
+    it('renders', async function() {
+        // setup the outer context
+        this.set('value', 'cat');
+
+        // render the component
+        await this.render(hbs`{{ x-foo value=value}}`);
+
+        chai.expect(this.element.querySelector('div>.value').textContent.trim()).to.equal('cat', 'The component shows the correct value');
+    });
+});
diff --git a/types/ember-mocha/index.d.ts b/types/ember-mocha/index.d.ts
index 84510eee38..638edb8542 100644
--- a/types/ember-mocha/index.d.ts
+++ b/types/ember-mocha/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for ember-mocha 0.12
+// Type definitions for ember-mocha 0.14
 // Project: https://github.com/emberjs/ember-mocha#readme
 // Definitions by: Derek Wickern <https://github.com/dwickern>
+//                 Simon Ihmig <https://github.com/simonihmig>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -36,6 +37,17 @@ declare module 'ember-mocha' {
         (callbacks: ModuleCallbacks): void;
     }
 
+    interface TestHooks {
+        beforeEach: mochaBeforeEach;
+        afterEach: mochaAfterEach;
+    }
+
+    interface SetupOptions {
+        resolver: Ember.Resolver;
+    }
+
+    type NewSetupTest = (options?: SetupOptions) => TestHooks;
+
     /** @deprecated Use setupTest instead */
     export const describeModule: ContextDefinition;
 
@@ -45,11 +57,14 @@ declare module 'ember-mocha' {
     /** @deprecated Use setupModelTest instead */
     export const describeModel: ContextDefinition;
 
-    export const setupTest: SetupTest;
+    export const setupTest: NewSetupTest & SetupTest;
     export const setupAcceptanceTest: SetupTest;
     export const setupComponentTest: SetupTest;
     export const setupModelTest: SetupTest;
 
+    export const setupRenderingTest: NewSetupTest;
+    export const setupApplicationTest: NewSetupTest;
+
     export const it: typeof mochaIt;
 
     /**
diff --git a/types/ember-qunit/ember-qunit-tests.ts b/types/ember-qunit/ember-qunit-tests.ts
index 6ddb4e5454..acd9650f98 100644
--- a/types/ember-qunit/ember-qunit-tests.ts
+++ b/types/ember-qunit/ember-qunit-tests.ts
@@ -2,6 +2,7 @@ import Ember from 'ember';
 import hbs from 'htmlbars-inline-precompile';
 import { module } from 'qunit';
 import {
+    start,
     test,
     skip,
     moduleFor,
@@ -137,3 +138,5 @@ module('x-foo', function(hooks) {
 module('foo service', function(hooks) {
     setupTest(hooks);
 });
+
+start();
diff --git a/types/ember-qunit/index.d.ts b/types/ember-qunit/index.d.ts
index 9dc93b980b..5dbfb49401 100644
--- a/types/ember-qunit/index.d.ts
+++ b/types/ember-qunit/index.d.ts
@@ -97,6 +97,48 @@ declare module 'ember-qunit' {
     export class QUnitAdapter extends Ember.Test.Adapter { }
 
     export { module, test, skip, only, todo } from 'qunit';
+
+    interface QUnitStartOptions {
+        /**
+         * If `false` tests will not be loaded automatically.
+         */
+        loadTests?: boolean;
+
+        /**
+         * If `false` the test container will not be setup based on `devmode`,
+         * `dockcontainer`, or `nocontainer` URL params.
+         */
+        setupTestContainer?: boolean;
+
+        /**
+         * If `false` tests will not be automatically started (you must run
+         * `QUnit.start()` to kick them off).
+         */
+        startTests?: boolean;
+
+        /**
+         * If `false` the default Ember.Test adapter will not be updated.
+         */
+        setupTestAdapter?: boolean;
+
+        /**
+         * `false` opts out of the default behavior of setting `Ember.testing`
+         * to `true` before all tests and back to `false` after each test will.
+         */
+        setupEmberTesting?: boolean;
+
+        /**
+         * If `false` validation of `Ember.onerror` will be disabled.
+         */
+        setupEmberOnerrorValidation?: boolean;
+
+        /**
+         * If `false` test isolation validation will be disabled.
+         */
+        setupTestIsolationValidatoin?: boolean;
+    }
+
+    export function start(options?: QUnitStartOptions): void;
 }
 
 declare module 'qunit' {
diff --git a/types/ember/index.d.ts b/types/ember/index.d.ts
index 56a0879ae5..93babaa0a7 100755
--- a/types/ember/index.d.ts
+++ b/types/ember/index.d.ts
@@ -7,6 +7,7 @@
 //                 Theron Cross <https://github.com/theroncross>
 //                 Martin Feckie <https://github.com/mfeckie>
 //                 Alex LaFroscia <https://github.com/alexlafroscia>
+//                 Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -111,6 +112,8 @@ declare module 'ember' {
         | 'render'
         | 'afterRender'
         | 'destroy';
+    type QueryParamTypes = 'boolean' | 'number' | 'array' | 'string';
+    type QueryParamScopeTypes = 'controller' | 'model';
 
     type ObserverMethod<Target, Sender> =
         | (keyof Target)
@@ -308,6 +311,10 @@ declare module 'ember' {
              * Given a fullName return a corresponding instance.
              */
             lookup(fullName: string, options?: {}): any;
+            /**
+             * Given a fullName return a corresponding factory.
+             */
+            factoryFor(fullName: string, options?: {}): any;
         }
         const _ContainerProxyMixin: Mixin<_ContainerProxyMixin>;
 
@@ -321,11 +328,11 @@ declare module 'ember' {
              */
             resolveRegistration(fullName: string): Function;
             /**
-             * Registers a factory that can be used for dependency injection (with
+             * Registers a factory or value 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?: { singleton?: boolean, instantiate?: boolean }): any;
+            register(fullName: string, factory: any, options?: { singleton?: boolean, instantiate?: boolean }): any;
             /**
              * Unregister a factory.
              */
@@ -473,6 +480,11 @@ declare module 'ember' {
             **/
             Router: Router;
             registry: Registry;
+            /**
+             *  Initialize the application and return a promise that resolves with the `Application`
+             *  object when the boot process is complete.
+             */
+            boot(): Promise<Application>;
         }
         /**
         The `ApplicationInstance` encapsulates all of the stateful aspects of a
@@ -738,7 +750,11 @@ declare module 'ember' {
             replaceRoute(name: string, ...args: any[]): void;
             transitionToRoute(name: string, ...args: any[]): void;
             model: any;
-            queryParams: string[] | Array<{ [key: string]: { type: string } }>;
+            queryParams: string | string[] | Array<{ [key: string]: {
+                type?: QueryParamTypes,
+                scope?: QueryParamScopeTypes,
+                as?: string
+            }}>;
             target: Object;
         }
         const ControllerMixin: Ember.Mixin<ControllerMixin>;
@@ -1100,6 +1116,12 @@ declare module 'ember' {
              * Unregister a factory.
              */
             unregister(fullName: string): any;
+
+            /**
+             *  Initialize the `EngineInstance` and return a promise that resolves
+             *  with the instance itself when the boot process is complete.
+             */
+            boot(): Promise<EngineInstance>;
         }
         /**
          * This mixin defines the common interface implemented by enumerable objects
@@ -1173,7 +1195,7 @@ declare module 'ember' {
              * 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>;
+            rejectBy(key: string, value?: any): 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
@@ -1492,25 +1514,25 @@ declare module 'ember' {
             __ember_mixin__: never;
 
             static create<T, Base = Ember.Object>(
-                args?: T & ThisType<Fix<T & Base>>
+              args?: MixinOrLiteral<T, Base> & 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>>
+              arg1: MixinOrLiteral<T1, Base> & ThisType<Fix<T1 & Base>>,
+              arg2: MixinOrLiteral<T2, Base> & 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>>
+              arg1: MixinOrLiteral<T1, Base> & ThisType<Fix<T1 & Base>>,
+              arg2: MixinOrLiteral<T2, Base> & ThisType<Fix<T2 & Base>>,
+              arg3: MixinOrLiteral<T3, Base> & 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>>
+              arg1: MixinOrLiteral<T1, Base> & ThisType<Fix<T1 & Base>>,
+              arg2: MixinOrLiteral<T2, Base> & ThisType<Fix<T2 & Base>>,
+              arg3: MixinOrLiteral<T3, Base> & ThisType<Fix<T3 & Base>>,
+              arg4: MixinOrLiteral<T4, Base> & ThisType<Fix<T4 & Base>>
             ): Mixin<T1 & T2 & T3 & T4, Base>;
         }
         /**
@@ -1984,6 +2006,19 @@ declare module 'ember' {
              */
             transitionTo(name: string, ...object: any[]): Transition;
 
+            // https://emberjs.com/api/ember/3.2/classes/Route/methods/intermediateTransitionTo?anchor=intermediateTransitionTo
+            /**
+             * 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).
+             *
+             * @param name           the name of the route or a URL
+             * @param object         the model(s) or identifier(s) to be used while
+             *                       transitioning to the route.
+             * @returns              the Transition object associated with this attempted transition
+             */
+            intermediateTransitionTo(name: string, ...object: any[]): Transition;
+
             // properties
             /**
              * The controller associated with this route.
@@ -3337,7 +3372,48 @@ declare module 'ember' {
     /**
      * The Router service is the public API that provides component/view layer access to the router.
      */
-    class RouterService extends Ember.Service {
+    export class RouterService extends Ember.Service {
+        //
+        /**
+             Name of the current route.
+            This property represent the logical name of the route,
+            which is comma separated.
+            For the following router:
+            ```app/router.js
+            Router.map(function() {
+            this.route('about');
+            this.route('blog', function () {
+                this.route('post', { path: ':post_id' });
+            });
+            });
+            ```
+            It will return:
+            * `index` when you visit `/`
+            * `about` when you visit `/about`
+            * `blog.index` when you visit `/blog`
+            * `blog.post` when you visit `/blog/some-post-id`
+        */
+        readonly currentRouteName: string;
+        //
+        /**
+             Current URL for the application.
+            This property represent the URL path for this route.
+            For the following router:
+            ```app/router.js
+            Router.map(function() {
+            this.route('about');
+            this.route('blog', function () {
+                this.route('post', { path: ':post_id' });
+            });
+            });
+            ```
+            It will return:
+            * `/` when you visit `/`
+            * `/about` when you visit `/about`
+            * `/blog` when you visit `/blog`
+            * `/blog/some-post-id` when you visit `/blog/some-post-id`
+        */
+        readonly currentURL: string;
         //
         /**
          * Determines whether a route is active.
@@ -3741,6 +3817,11 @@ declare module '@ember/routing/router' {
     export default class EmberRouter extends Ember.Router { }
 }
 
+declare module '@ember/routing/router-service' {
+    import { RouterService } from 'ember';
+    export default class extends RouterService { }
+}
+
 declare module '@ember/runloop' {
     import Ember from 'ember';
     export const begin: typeof Ember.run.begin;
diff --git a/types/ember/test/application-instance.ts b/types/ember/test/application-instance.ts
index dfda446463..9ae22e5f26 100644
--- a/types/ember/test/application-instance.ts
+++ b/types/ember/test/application-instance.ts
@@ -1,4 +1,5 @@
 import ApplicationInstance from '@ember/application/instance';
+import hbs from 'htmlbars-inline-precompile';
 
 const appInstance = ApplicationInstance.create();
 appInstance.register('some:injection', class Foo {});
@@ -11,7 +12,18 @@ appInstance.register('some:injection', class Foo {}, {
   instantiate: false,
 });
 
+appInstance.register('templates:foo/bar', hbs`<h1>Hello World</h1>`);
+
 appInstance.register('some:injection', class Foo {}, {
     singleton: false,
     instantiate: true,
 });
+
+appInstance.factoryFor('router:main');
+appInstance.lookup('route:basic');
+
+appInstance.boot();
+
+(async function() {
+  await appInstance.boot();
+}());
diff --git a/types/ember/test/engine-instance.ts b/types/ember/test/engine-instance.ts
new file mode 100644
index 0000000000..c74914dea5
--- /dev/null
+++ b/types/ember/test/engine-instance.ts
@@ -0,0 +1,26 @@
+import EngineInstance from '@ember/engine/instance';
+
+const engineInstance = EngineInstance.create();
+engineInstance.register('some:injection', class Foo {});
+
+engineInstance.register('some:injection', class Foo {}, {
+  singleton: true,
+});
+
+engineInstance.register('some:injection', class Foo {}, {
+  instantiate: false,
+});
+
+engineInstance.register('some:injection', class Foo {}, {
+    singleton: false,
+    instantiate: true,
+});
+
+engineInstance.factoryFor('router:main');
+engineInstance.lookup('route:basic');
+
+engineInstance.boot();
+
+(async function() {
+  await engineInstance.boot();
+}());
diff --git a/types/ember/test/mixin.ts b/types/ember/test/mixin.ts
index 2c417c00da..a89f490a11 100755
--- a/types/ember/test/mixin.ts
+++ b/types/ember/test/mixin.ts
@@ -44,3 +44,14 @@ const obj = LiteralMixins.create();
 assertType<number>(obj.a);
 assertType<number>(obj.b);
 assertType<number>(obj.c);
+
+/* Test composition of mixins */
+const EditableAndCancelableMixin = Ember.Mixin.create(EditableMixin, {
+    cancelled: false,
+});
+
+const EditableAndCancelableComment = Ember.Route.extend(EditableAndCancelableMixin);
+
+const editableAndCancelable = EditableAndCancelableComment.create();
+assertType<boolean>(editableAndCancelable.isEditing);
+assertType<boolean>(editableAndCancelable.cancelled);
diff --git a/types/ember/test/route.ts b/types/ember/test/route.ts
index fad5bbc634..84e432dbd3 100755
--- a/types/ember/test/route.ts
+++ b/types/ember/test/route.ts
@@ -92,4 +92,13 @@ class RouteUsingClass extends Route.extend({
     beforeModel(this: RouteUsingClass) {
         return 'beforeModel can return anything, not just promises';
     }
+    intermediateTransitionWithoutModel() {
+        this.intermediateTransitionTo('some-route');
+    }
+    intermediateTransitionWithModel() {
+        this.intermediateTransitionTo('some.other.route', { });
+    }
+    intermediateTransitionWithMultiModel() {
+        this.intermediateTransitionTo('some.other.route', 1, 2, { });
+    }
 }
diff --git a/types/ember/test/router.ts b/types/ember/test/router.ts
index c663083679..760e9ed5bc 100755
--- a/types/ember/test/router.ts
+++ b/types/ember/test/router.ts
@@ -1,4 +1,5 @@
 import Ember from 'ember';
+import { assertType } from './lib/assert';
 
 const AppRouter = Ember.Router.extend({
 });
@@ -25,6 +26,12 @@ AppRouter.map(function() {
 
 const RouterServiceConsumer = Ember.Service.extend({
     router: Ember.inject.service('router'),
+    currentRouteName() {
+        const x: string = Ember.get(this, 'router').currentRouteName;
+    },
+    currentURL() {
+        const x: string = Ember.get(this, 'router').currentURL;
+    },
     transitionWithoutModel() {
         Ember.get(this, 'router')
         .transitionTo('some-route');
@@ -34,6 +41,11 @@ const RouterServiceConsumer = Ember.Service.extend({
         Ember.get(this, 'router')
         .transitionTo('some.other.route', model);
     },
+    transitionWithMultiModel() {
+        const model = Ember.Object.create();
+        Ember.get(this, 'router')
+        .transitionTo('some.other.route', model, model);
+    },
     transitionWithModelAndOptions() {
         const model = Ember.Object.create();
         Ember.get(this, 'router')
diff --git a/types/ember/tsconfig.json b/types/ember/tsconfig.json
index b4bc966044..676c107f72 100755
--- a/types/ember/tsconfig.json
+++ b/types/ember/tsconfig.json
@@ -23,6 +23,7 @@
         "test/lib/assert.ts",
         "test/application.ts",
         "test/application-instance.ts",
+        "test/engine-instance.ts",
         "test/ember-tests.ts",
         "test/error.ts",
         "test/event.ts",
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..9fe9e4c297
--- /dev/null
+++ b/types/ember__test-helpers/ember__test-helpers-tests.ts
@@ -0,0 +1,95 @@
+/// <reference types="ember-qunit" />
+
+import { test } from 'qunit';
+import Application from '@ember/application';
+import hbs from 'htmlbars-inline-precompile';
+import {
+    click,
+    doubleClick,
+    tap,
+    focus,
+    blur,
+    triggerEvent,
+    triggerKeyEvent,
+    fillIn,
+    render,
+    find,
+    findAll,
+    getRootElement,
+    pauseTest,
+    resumeTest,
+    waitFor,
+    waitUntil,
+    settled,
+    isSettled,
+    getSettledState,
+    visit,
+    currentURL,
+    currentRouteName,
+    setApplication
+} from '@ember/test-helpers';
+
+const MyApp = Application.extend({ modulePrefix: 'my-app' });
+
+setApplication(MyApp.create());
+
+test('DOM interactions', async () => {
+    await render(hbs`<div class="message">Hello, world</div>`);
+
+    await click('.message');
+    await doubleClick('.message');
+    await tap('.message');
+    await focus('.message');
+    await blur('.message');
+    await triggerEvent('.message', 'custom-event');
+    await triggerKeyEvent('.message', 'keydown', 'Enter', { ctrlKey: true });
+    await fillIn('.message', 'content');
+
+    const messageElement = find('.message')!;
+    await click(messageElement);
+    await doubleClick(messageElement);
+    await tap(messageElement);
+    await focus(messageElement);
+    await blur(messageElement);
+    await triggerEvent(messageElement, 'custom-event');
+    await triggerKeyEvent(messageElement, 'keydown', 'Enter', { ctrlKey: true });
+    await fillIn(messageElement, 'content');
+
+    const allMessages = findAll('.message');
+    for (const element of allMessages) {
+        await click(element);
+    }
+
+    const root = getRootElement();
+    await click(root);
+});
+
+test('routing helpers', async (assert) => {
+    await visit('/foo');
+
+    assert.equal(currentURL(), '/foo');
+    assert.equal(currentRouteName(), 'foo');
+});
+
+test('pause and resume', async () => {
+    await pauseTest();
+    setTimeout(resumeTest, 1000);
+});
+
+test('wait helpers', async (assert) => {
+    await render(hbs`<div class="message">Hello</div>`);
+
+    await waitFor('.message', { count: 1, timeout: 10, timeoutMessage: 'uh oh' });
+    await waitUntil(() => 'hello', { timeout: 1000, timeoutMessage: 'boom' });
+
+    await settled();
+    assert.ok(isSettled());
+
+    const {
+        hasPendingRequests,
+        hasPendingTimers,
+        hasPendingWaiters,
+        hasRunLoop,
+        pendingRequestCount
+    } = getSettledState();
+});
diff --git a/types/ember__test-helpers/index.d.ts b/types/ember__test-helpers/index.d.ts
new file mode 100644
index 0000000000..067222b425
--- /dev/null
+++ b/types/ember__test-helpers/index.d.ts
@@ -0,0 +1,220 @@
+// Type definitions for @ember/test-helpers 0.7
+// Project: https://github.com/emberjs/ember-test-helpers
+// Definitions by: Dan Freeman <https://github.com/dfreeman>
+//                 James C. Davis <https://github.com/jamescdavis>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="ember" />
+
+declare module '@ember/test-helpers' {
+    // DOM Interaction Helpers
+
+    export type Target = string | Element;
+
+    export { default as click } from '@ember/test-helpers/dom/click';
+    export { default as doubleClick } from '@ember/test-helpers/dom/double-click';
+    export { default as tap } from '@ember/test-helpers/dom/tap';
+    export { default as focus } from '@ember/test-helpers/dom/focus';
+    export { default as blur } from '@ember/test-helpers/dom/blur';
+    export { default as triggerEvent } from '@ember/test-helpers/dom/trigger-event';
+    export { default as triggerKeyEvent } from '@ember/test-helpers/dom/trigger-key-event';
+    export { default as fillIn } from '@ember/test-helpers/dom/fill-in';
+
+    // DOM Query Helpers
+
+    export { default as find } from '@ember/test-helpers/dom/find';
+    export { default as findAll } from '@ember/test-helpers/dom/find-all';
+    export { default as getRootElement } from '@ember/test-helpers/dom/get-root-element';
+
+    // Routing Helpers
+
+    export { visit, currentRouteName, currentURL } from '@ember/test-helpers/setup-application-context';
+
+    // Rendering Helpers
+
+    export { render, clearRender } from '@ember/test-helpers/setup-rendering-context';
+
+    // Wait Helpers
+
+    export { default as waitFor } from '@ember/test-helpers/dom/wait-for';
+    export { default as waitUntil } from '@ember/test-helpers/wait-until';
+    export { default as settled, isSettled, getSettledState } from '@ember/test-helpers/settled';
+
+    // Pause Helpers
+
+    export { pauseTest, resumeTest } from '@ember/test-helpers/setup-context';
+
+    // Test Framework APIs
+
+    export { setResolver, getResolver } from '@ember/test-helpers/resolver';
+    export { default as setupContext, getContext, setContext, unsetContext } from '@ember/test-helpers/setup-context';
+    export { default as teardownContext } from '@ember/test-helpers/teardown-context';
+    export { default as setupRenderingContext } from '@ember/test-helpers/setup-rendering-context';
+    export { default as teardownRenderingContext } from '@ember/test-helpers/teardown-rendering-context';
+    export { getApplication, setApplication } from '@ember/test-helpers/application';
+    export { default as setupApplicationContext } from '@ember/test-helpers/setup-application-context';
+    export { default as teardownApplicationContext } from '@ember/test-helpers/teardown-application-context';
+    export { default as validateErrorHandler } from '@ember/test-helpers/validate-error-handler';
+}
+
+declare module '@ember/test-helpers/dom/click' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/double-click' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/tap' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/focus' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/blur' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/trigger-event' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target, eventType: string, options?: object): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/trigger-key-event' {
+    import { Target } from '@ember/test-helpers';
+
+    export type KeyEvent = 'keydown' | 'keyup' | 'keypress';
+
+    export interface KeyModifiers {
+        ctrlKey?: boolean;
+        altKey?: boolean;
+        shiftKey?: boolean;
+        metaKey?: boolean;
+    }
+
+    export default function(target: Target, eventType: KeyEvent, key: number | string, modifiers?: KeyModifiers): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/fill-in' {
+    import { Target } from '@ember/test-helpers';
+
+    export default function(target: Target, text: string): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/find' {
+    export default function(selector: string): Element | null;
+}
+
+declare module '@ember/test-helpers/dom/find-all' {
+    export default function(selector: string): Element[];
+}
+
+declare module '@ember/test-helpers/dom/get-root-element' {
+    export default function(): Element;
+}
+
+declare module '@ember/test-helpers/setup-application-context' {
+    export default function<Context extends object>(context: Context): Promise<Context>;
+    export function visit(url: string): Promise<void>;
+    export function currentRouteName(): string;
+    export function currentURL(): string;
+}
+
+declare module '@ember/test-helpers/setup-rendering-context' {
+    import { TemplateFactory } from 'htmlbars-inline-precompile';
+
+    export default function<Context extends object>(context: Context): Promise<Context>;
+    export function render(template: TemplateFactory): Promise<void>;
+    export function clearRender(): Promise<void>;
+}
+
+declare module '@ember/test-helpers/dom/wait-for' {
+    export interface Options {
+        timeout?: number;
+        count?: number;
+        timeoutMessage?: string;
+    }
+
+    export default function(selector: string, options?: Options): Promise<Element | Element[]>;
+}
+
+declare module '@ember/test-helpers/wait-until' {
+    export interface Options {
+        timeout?: number;
+        timeoutMessage?: string;
+    }
+
+    export default function<T>(callback: () => T, options?: Options): Promise<T>;
+}
+
+declare module '@ember/test-helpers/settled' {
+    export interface SettledState {
+        hasRunLoop: boolean;
+        hasPendingTimers: boolean;
+        hasPendingWaiters: boolean;
+        hasPendingRequests: boolean;
+        pendingRequestCount: number;
+    }
+
+    export default function(): Promise<void>;
+    export function isSettled(): boolean;
+    export function getSettledState(): SettledState;
+}
+
+declare module '@ember/test-helpers/setup-context' {
+    import Resolver from '@ember/application/resolver';
+
+    export default function<C extends object>(context: C, options?: { resolver?: Resolver }): Promise<C>;
+    export function getContext(): object;
+    export function setContext(context: object): void;
+    export function unsetContext(): void;
+
+    export function pauseTest(): Promise<void>;
+    export function resumeTest(): void;
+}
+
+declare module '@ember/test-helpers/resolver' {
+    import Resolver from '@ember/application/resolver';
+
+    export function setResolver(resolver: Resolver): void;
+    export function getResolver(): Resolver;
+}
+
+declare module '@ember/test-helpers/teardown-context' {
+    export default function(context: object): Promise<void>;
+}
+
+declare module '@ember/test-helpers/teardown-rendering-context' {
+    export default function(context: object): Promise<void>;
+}
+
+declare module '@ember/test-helpers/teardown-application-context' {
+    export default function(context: object): Promise<void>;
+}
+
+declare module '@ember/test-helpers/validate-error-handler' {
+    import Error from '@ember/error';
+
+    export default function(callback?: (error: Error) => void): { isValid: boolean, message: string };
+}
+
+declare module '@ember/test-helpers/application' {
+    import Application from '@ember/application';
+
+    export function getApplication(): Application;
+    export function setApplication(application: Application): void;
+}
diff --git a/types/ember__test-helpers/tsconfig.json b/types/ember__test-helpers/tsconfig.json
new file mode 100644
index 0000000000..de0efdd984
--- /dev/null
+++ b/types/ember__test-helpers/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": false,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@ember/test-helpers": ["ember__test-helpers"]
+        }
+    },
+    "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..4c4fc86ace
--- /dev/null
+++ b/types/ember__test-helpers/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "strict-export-declare-modifiers": false
+    }
+}
diff --git a/types/emoji-mart/dist-es/components/category.d.ts b/types/emoji-mart/dist-es/components/category.d.ts
index 8cd4ceefbb..efa52e9988 100644
--- a/types/emoji-mart/dist-es/components/category.d.ts
+++ b/types/emoji-mart/dist-es/components/category.d.ts
@@ -1,12 +1,11 @@
 import React = require('react');
 
-import { EmojiData } from '..';
-
-import { Emoji, EmojiProps, I18n } from '.';
+import { Emoji, EmojiData, EmojiProps, I18n, CategoryName } from '..';
 
 export interface Props {
     emojis?: Array<string|EmojiData>;
     hasStickyPosition?: boolean;
+    id: CategoryName;
     name: string;
     native: boolean;
     perLine: number;
diff --git a/types/emoji-mart/dist-es/components/emoji.d.ts b/types/emoji-mart/dist-es/components/emoji.d.ts
deleted file mode 100644
index 030ff7ce12..0000000000
--- a/types/emoji-mart/dist-es/components/emoji.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-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/emoji/emoji.d.ts b/types/emoji-mart/dist-es/components/emoji/emoji.d.ts
new file mode 100644
index 0000000000..d86d2b686f
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/emoji/emoji.d.ts
@@ -0,0 +1,8 @@
+import React = require('react');
+
+import { EmojiProps } from '../..';
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare const Emoji: React.StatelessComponent<EmojiProps>;
+
+export { Emoji as default };
diff --git a/types/emoji-mart/dist-es/components/emoji/nimble-emoji.d.ts b/types/emoji-mart/dist-es/components/emoji/nimble-emoji.d.ts
new file mode 100644
index 0000000000..77888f5a94
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/emoji/nimble-emoji.d.ts
@@ -0,0 +1,12 @@
+import React = require('react');
+
+import { EmojiProps, Data } from '../..';
+
+export interface NimbleEmojiProps extends EmojiProps {
+    data: Data;
+}
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare const NimbleEmoji: React.SFC<NimbleEmojiProps>;
+
+export { NimbleEmoji as default };
diff --git a/types/emoji-mart/dist-es/components/index.d.ts b/types/emoji-mart/dist-es/components/index.d.ts
index 6fc29ecd54..3f05ca5c82 100644
--- a/types/emoji-mart/dist-es/components/index.d.ts
+++ b/types/emoji-mart/dist-es/components/index.d.ts
@@ -1,4 +1,6 @@
 // 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';
+export { default as Emoji } from './emoji/emoji';
+export { default as NimbleEmoji, NimbleEmojiProps } from './emoji/nimble-emoji';
+export { default as Picker } from './picker/picker';
+export { default as NimblePicker, NimblePickerProps } from './picker/nimble-picker';
diff --git a/types/emoji-mart/dist-es/components/picker.d.ts b/types/emoji-mart/dist-es/components/picker.d.ts
deleted file mode 100644
index 9f9132df05..0000000000
--- a/types/emoji-mart/dist-es/components/picker.d.ts
+++ /dev/null
@@ -1,54 +0,0 @@
-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/components/picker/nimble-picker.d.ts b/types/emoji-mart/dist-es/components/picker/nimble-picker.d.ts
new file mode 100644
index 0000000000..cc564b2a5e
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/picker/nimble-picker.d.ts
@@ -0,0 +1,11 @@
+import React = require('react');
+
+import { Data, PickerProps } from '../..';
+
+export interface NimblePickerProps extends PickerProps {
+    data: Data;
+}
+
+export default class NimblePicker extends React.PureComponent<NimblePickerProps> {
+    // everything inside it is supposed to be private
+}
diff --git a/types/emoji-mart/dist-es/components/picker/picker.d.ts b/types/emoji-mart/dist-es/components/picker/picker.d.ts
new file mode 100644
index 0000000000..01f8a41f8b
--- /dev/null
+++ b/types/emoji-mart/dist-es/components/picker/picker.d.ts
@@ -0,0 +1,7 @@
+import React = require('react');
+
+import { PickerProps } from '../..';
+
+export default class Picker extends React.PureComponent<PickerProps> {
+    // 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
index e49d37fcf6..bb0c79be3e 100644
--- a/types/emoji-mart/dist-es/index.d.ts
+++ b/types/emoji-mart/dist-es/index.d.ts
@@ -1,15 +1,30 @@
-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 { Data } from './utils/data';
+
+export {
+    PickerProps,
+    EmojiProps,
+    I18n,
+    PartialI18n,
+    CategoryName
+} from './utils/shared-props';
+
+export {
+    emojiIndex,
+    nimbleEmojiIndex,
+    EmojiData,
+    CustomEmoji,
+    EmojiSkin
+} from './utils/emoji-index';
 
 export {
     Picker,
-    PickerProps,
-    I18n,
-    PartialI18n,
-    CustomEmoji,
+    NimblePicker,
+    NimblePickerProps,
     Emoji,
-    EmojiProps,
+    NimbleEmoji,
+    NimbleEmojiProps,
     Category,
     CategoryProps
 } from './components';
diff --git a/types/emoji-mart/dist-es/utils/data.d.ts b/types/emoji-mart/dist-es/utils/data.d.ts
new file mode 100644
index 0000000000..ad1bc0d229
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/data.d.ts
@@ -0,0 +1,73 @@
+export interface Data {
+    compressed: boolean;
+    categories: Category[];
+    emojis: { [key: string]: Emoji };
+    aliases: { [key: string]: string };
+}
+
+export interface Category {
+    id: string;
+    name: string;
+    emojis: string[];
+}
+
+export interface Emoji {
+    name?: string;
+    a?: string;
+    unified?: string;
+    b?: string;
+    non_qualified?: string;
+    c?: string;
+    has_img_apple?: boolean;
+    d?: boolean;
+    has_img_google?: boolean;
+    e?: boolean;
+    has_img_twitter?: boolean;
+    f?: boolean;
+    has_img_emojione?: boolean;
+    g?: boolean;
+    has_img_facebook?: boolean;
+    h?: boolean;
+    has_img_messenger?: boolean;
+    i?: boolean;
+    keywords?: string[];
+    j?: string[];
+    sheet?: number[];
+    k?: number[];
+    emoticons?: string[];
+    l?: string[];
+    text?: string;
+    m?: string;
+    short_names?: string[];
+    n?: string[];
+    added_in?: number;
+    o?: number;
+    sheet_x?: number;
+    sheet_y?: number;
+    skin_variations?: { [key: string]: SkinVariation };
+    obsoleted_by?: string;
+    obsoletes?: string;
+}
+
+export interface SkinVariation {
+    unified: string;
+    non_qualified: null | string;
+    image: string;
+    sheet_x: number;
+    sheet_y: number;
+    added_in: string;
+    has_img_apple: boolean;
+    has_img_google: boolean;
+    has_img_twitter: boolean;
+    has_img_emojione: boolean;
+    has_img_facebook: boolean;
+    has_img_messenger: boolean;
+    obsoleted_by?: string;
+    obsoletes?: string;
+}
+
+export function buildSearch(emoji: Emoji): string;
+
+export function compress(emoji: Emoji): void;
+
+export function uncompress(data: Data): void;
diff --git a/types/emoji-mart/dist-es/utils/emoji-index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index.d.ts
deleted file mode 100644
index c6499e663c..0000000000
--- a/types/emoji-mart/dist-es/utils/emoji-index.d.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-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/emoji-index/emoji-index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index/emoji-index.d.ts
new file mode 100644
index 0000000000..0d1d6b8881
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/emoji-index/emoji-index.d.ts
@@ -0,0 +1,14 @@
+import { EmojiData } from './nimble-emoji-index';
+
+// 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/emoji-index/index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index/index.d.ts
new file mode 100644
index 0000000000..576a5d0cb7
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/emoji-index/index.d.ts
@@ -0,0 +1,2 @@
+export { default as emojiIndex } from './emoji-index';
+export { default as nimbleEmojiIndex, EmojiData, CustomEmoji, EmojiSkin } from './nimble-emoji-index';
diff --git a/types/emoji-mart/dist-es/utils/emoji-index/nimble-emoji-index.d.ts b/types/emoji-mart/dist-es/utils/emoji-index/nimble-emoji-index.d.ts
new file mode 100644
index 0000000000..010c313d19
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/emoji-index/nimble-emoji-index.d.ts
@@ -0,0 +1,40 @@
+import { Data } from "../data";
+
+import { CategoryName } from '../shared-props';
+
+export type EmojiSkin = 1 | 2 | 3 | 4 | 5 | 6;
+
+export interface BaseEmoji {
+    id: string;
+    name: string;
+    colons: string;
+    /** Reverse mapping to keyof emoticons */
+    emoticons: string[];
+    unified: string;
+    skin: EmojiSkin | null;
+    native: string;
+}
+
+export interface CustomEmoji {
+    // id is overridden by short_names[0]
+    id?: string;
+    // colons is overridden by :id:
+    colons?: string;
+    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 type EmojiData = BaseEmoji | CustomEmoji;
+
+export default class NimbleEmojiIndex {
+    constructor(data: Data);
+    search(query: ''): null;
+    search(query: string): EmojiData[]|null;
+    emojis: { [emoji: string]: EmojiData };
+    /** Mapping of string to keyof emojis */
+    emoticons: { [emoticon: string]: string };
+}
diff --git a/types/emoji-mart/dist-es/utils/shared-props.d.ts b/types/emoji-mart/dist-es/utils/shared-props.d.ts
new file mode 100644
index 0000000000..c091e24556
--- /dev/null
+++ b/types/emoji-mart/dist-es/utils/shared-props.d.ts
@@ -0,0 +1,83 @@
+import React = require('react');
+
+import { EmojiData, EmojiSkin, CustomEmoji } from './emoji-index/nimble-emoji-index';
+
+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 EmojiProps {
+    onOver?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    onLeave?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    onClick?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    fallback?(emoji: EmojiData, props: EmojiProps): React.Component;
+    /** 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 52 */
+    sheetColumns?: number;
+    /** defaults to 52 */
+    sheetRows?: number;
+    /** defaults to 'apple' */
+    set?: EmojiSet;
+    size: number;
+    emoji: string | EmojiData;
+    html?: boolean;
+    /** data is omitted here as it should be used for NimbleEmoji only - not emoji */
+}
+
+export type CategoryName = 'search' | 'recent' | 'people' | 'nature' | 'foods' | 'activity' | 'places' | 'objects' | 'symbols' | 'flags' | 'custom';
+
+// tslint:disable-next-line interface-name
+export interface I18n {
+    search: string;
+    categories: Record<CategoryName, string>;
+    notfound: string;
+    skintext: string;
+}
+
+export type PartialI18n = Partial<Pick<I18n, 'search' | 'notfound'> & { categories: Partial<I18n['categories']> }>;
+
+export interface CustomIcons {
+    categories: Record<CategoryName, () => React.Component>;
+}
+
+export interface PickerProps {
+    /** NOTE: default is not preventable */
+    onClick?(emoji: EmojiData, e: React.MouseEvent<HTMLElement>): void;
+    onSelect?(emoji: EmojiData): void;
+    onSkinChange?(skin: EmojiSkin): void;
+    perLine?: number;
+    emojiSize?: number;
+    i18n?: PartialI18n;
+    style?: React.CSSProperties;
+    title?: string;
+    emoji?: string;
+    color?: string;
+    set?: EmojiSet;
+    skin?: EmojiSkin;
+    defaultSkin?: EmojiSkin;
+    native?: boolean;
+    backgroundImageFn?: BackgroundImageFn;
+    sheetSize?: EmojiSheetSize;
+    emojisToShowFilter?(emoji: EmojiData): boolean;
+    showPreview?: boolean;
+    showSkinTones?: boolean;
+    emojiTooltip?: boolean;
+    include?: CategoryName[];
+    exclude?: CategoryName[];
+    recent?: string[];
+    autoFocus?: boolean;
+    /** NOTE: custom emoji are copied into a singleton object on every new mount */
+    custom: CustomEmoji[];
+    skinEmoji?: string;
+    notFound?(): React.Component;
+    notFoundEmoji?: string;
+    icons?: CustomIcons;
+}
diff --git a/types/emoji-mart/emoji-mart-tests.tsx b/types/emoji-mart/emoji-mart-tests.tsx
index 7b7b8d0471..56b05453a9 100644
--- a/types/emoji-mart/emoji-mart-tests.tsx
+++ b/types/emoji-mart/emoji-mart-tests.tsx
@@ -1,4 +1,4 @@
-// Port of https://github.com/missive/emoji-mart/blob/master/src/components/emoji.js
+// Port of https://github.com/missive/emoji-mart/blob/v2.8.0/stories/index.js
 
 import React = require('react');
 
diff --git a/types/emoji-mart/index.d.ts b/types/emoji-mart/index.d.ts
index 6a8ed65632..38acd9e021 100644
--- a/types/emoji-mart/index.d.ts
+++ b/types/emoji-mart/index.d.ts
@@ -1,9 +1,8 @@
-// Type definitions for emoji-mart 2.2
+// Type definitions for emoji-mart 2.8
 // Project: https://github.com/missive/emoji-mart
 // Definitions by: Diogo Franco <https://github.com/Kovensky>
+//                 Nick Winans <https://github.com/Nicell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-// These definitions should work with 2.3, but the tests doesn't pass on 2.3.
+// TypeScript Version: 2.8
 
 export * from './dist-es';
diff --git a/types/emoji-mart/tsconfig.json b/types/emoji-mart/tsconfig.json
index 6ecc944e77..d929a3cc01 100644
--- a/types/emoji-mart/tsconfig.json
+++ b/types/emoji-mart/tsconfig.json
@@ -20,11 +20,17 @@
     "files": [
         "index.d.ts",
         "dist-es/components/category.d.ts",
-        "dist-es/components/emoji.d.ts",
+        "dist-es/components/emoji/emoji.d.ts",
+        "dist-es/components/emoji/nimble-emoji.d.ts",
         "dist-es/components/index.d.ts",
-        "dist-es/components/picker.d.ts",
-        "dist-es/utils/emoji-index.d.ts",
+        "dist-es/components/picker/picker.d.ts",
+        "dist-es/components/picker/nimble-picker.d.ts",
+        "dist-es/utils/emoji-index/emoji-index.d.ts",
+        "dist-es/utils/emoji-index/nimble-emoji-index.d.ts",
+        "dist-es/utils/emoji-index/index.d.ts",
+        "dist-es/utils/data.d.ts",
         "dist-es/utils/frequently.d.ts",
+        "dist-es/utils/shared-props.d.ts",
         "dist-es/utils/store.d.ts",
         "dist-es/index.d.ts",
         "emoji-mart-tests.tsx"
diff --git a/types/emoji-regex/emoji-regex-tests.ts b/types/emoji-regex/emoji-regex-tests.ts
new file mode 100644
index 0000000000..6d6b0d25d9
--- /dev/null
+++ b/types/emoji-regex/emoji-regex-tests.ts
@@ -0,0 +1,3 @@
+import emojiRegex from "emoji-regex";
+
+emojiRegex(); // $ExpectType RegExp
diff --git a/types/emoji-regex/index.d.ts b/types/emoji-regex/index.d.ts
new file mode 100644
index 0000000000..edff690dc7
--- /dev/null
+++ b/types/emoji-regex/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for emoji-regex 7.0
+// Project: https://github.com/mathiasbynens/emoji-regex
+// Definitions by: iKBAHT <https://github.com/iKBAHT>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function createRegExp(): RegExp;
+export = createRegExp;
diff --git a/types/emoji-regex/tsconfig.json b/types/emoji-regex/tsconfig.json
new file mode 100644
index 0000000000..1dfdf53dac
--- /dev/null
+++ b/types/emoji-regex/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "emoji-regex-tests.ts"
+    ]
+}
diff --git a/types/emoji-regex/tslint.json b/types/emoji-regex/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/emoji-regex/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/enhanced-resolve/index.d.ts b/types/enhanced-resolve/index.d.ts
index 1cf3a3397a..0a82a4263e 100644
--- a/types/enhanced-resolve/index.d.ts
+++ b/types/enhanced-resolve/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for enhanced-resolve v3.0.0
 // Project: https://github.com/webpack/enhanced-resolve.git
-// Definitions by: e-cloud <https://github.com/e-cloud>, Onigoetz <https://github.com/onigoetz>
+// Definitions by: e-cloud <https://github.com/e-cloud>
+//                 Onigoetz <https://github.com/onigoetz>
+//                 John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/env-paths/env-paths-tests.ts b/types/env-paths/env-paths-tests.ts
new file mode 100644
index 0000000000..b143fb47b5
--- /dev/null
+++ b/types/env-paths/env-paths-tests.ts
@@ -0,0 +1,4 @@
+import envPaths = require('env-paths');
+
+// $ExpectType Paths
+envPaths('./');
diff --git a/types/env-paths/index.d.ts b/types/env-paths/index.d.ts
new file mode 100644
index 0000000000..c759f3875c
--- /dev/null
+++ b/types/env-paths/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for env-paths 1.0
+// Project: https://github.com/sindresorhus/env-paths
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = envPaths;
+
+declare function envPaths(name: string, opts?: { suffix: string; }): envPaths.Paths;
+
+declare namespace envPaths {
+  interface Paths {
+    readonly data: string;
+    readonly config: string;
+    readonly cache: string;
+    readonly log: string;
+    readonly temp: string;
+  }
+}
diff --git a/types/env-paths/tsconfig.json b/types/env-paths/tsconfig.json
new file mode 100644
index 0000000000..62dcbca022
--- /dev/null
+++ b/types/env-paths/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"env-paths-tests.ts"
+	]
+}
diff --git a/types/env-paths/tslint.json b/types/env-paths/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/env-paths/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/enzyme-adapter-react-15.4/index.d.ts b/types/enzyme-adapter-react-15.4/index.d.ts
index 570cc22e99..2496fb1719 100644
--- a/types/enzyme-adapter-react-15.4/index.d.ts
+++ b/types/enzyme-adapter-react-15.4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://airbnb.io/enzyme/
 // Definitions by: Nabeelah Ali <https://github.com/nali>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme-adapter-react-15/index.d.ts b/types/enzyme-adapter-react-15/index.d.ts
index 90149cae55..06659d75b9 100644
--- a/types/enzyme-adapter-react-15/index.d.ts
+++ b/types/enzyme-adapter-react-15/index.d.ts
@@ -2,7 +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.6
+// TypeScript Version: 2.8
 
 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 53f97ccce6..3e567d956b 100644
--- a/types/enzyme-adapter-react-16/index.d.ts
+++ b/types/enzyme-adapter-react-16/index.d.ts
@@ -2,7 +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.6
+// TypeScript Version: 2.8
 
 import { EnzymeAdapter } from 'enzyme';
 
diff --git a/types/enzyme-redux/index.d.ts b/types/enzyme-redux/index.d.ts
index ad312d6d1f..e231119b89 100644
--- a/types/enzyme-redux/index.d.ts
+++ b/types/enzyme-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Knegusen/enzyme-redux#readme
 // Definitions by: Dennis Axelsson <https://github.com/knegusen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ReactWrapper, ShallowWrapper } from 'enzyme';
 import { ReactElement } from 'react';
diff --git a/types/enzyme-to-json/index.d.ts b/types/enzyme-to-json/index.d.ts
index d2ba70fc8f..1a8cafb23a 100644
--- a/types/enzyme-to-json/index.d.ts
+++ b/types/enzyme-to-json/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adriantoine/enzyme-to-json#readme
 // Definitions by: Joscha Feth <https://github.com/joscha>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ReactWrapper, ShallowWrapper } from 'enzyme';
 
diff --git a/types/enzyme/enzyme-tests.tsx b/types/enzyme/enzyme-tests.tsx
index bbdd8f404f..e1762b843e 100644
--- a/types/enzyme/enzyme-tests.tsx
+++ b/types/enzyme/enzyme-tests.tsx
@@ -36,10 +36,18 @@ interface MyComponentState {
 }
 
 class MyComponent extends Component<MyComponentProps, MyComponentState> {
+    handleEcho(value: string) {
+        return value;
+    }
     setState(...args: any[]) {
         console.log(args);
     }
 }
+class MyComponentPropsOnly extends Component<MyComponentProps> {
+    handleEcho(value: string) {
+        return value;
+    }
+}
 
 class AnotherComponent extends Component<AnotherComponentProps> {
     setState(...args: any[]) {
@@ -78,6 +86,34 @@ function ShallowWrapperTest() {
     let anotherStatelessWrapper: ShallowWrapper<AnotherStatelessProps, never>;
     let anotherComponentWrapper: ShallowWrapper<AnotherComponentProps, any>;
 
+    // testStatePropsInstanceFn(shallow<MyComponent>(<MyComponent stringProp="value" numberProp={1}/>));
+    function testStatePropsInstance() {
+        const wrapper = shallow<MyComponent>(<MyComponent stringProp="value" numberProp={1}/>);
+
+        const {
+            numberProp, // $ExpectType number
+            stringProp // $ExpectType string
+        } = wrapper.props();
+        const {
+            stateProperty // $ExpectType string
+        } = wrapper.state();
+        const {
+            handleEcho // $ExpectType (value: string) => string
+        } = wrapper.instance();
+
+        // $ExpectError
+        wrapper.setState({stateProperty: 123});
+        // $ExpectError
+        wrapper.setState({statePropertyzasd: 'hello'});
+        wrapper.setState({stateProperty: 'hello'});
+
+        // $ExpectError
+        wrapper.setProps({numberProp: '123'});
+        // $ExpectError
+        wrapper.setProps({numberPropzasd: 'hello'});
+        wrapper.setProps({numberProp: 123});
+    }
+
     function test_props_state_inferring() {
         let wrapper: ShallowWrapper<MyComponentProps, MyComponentState>;
         wrapper = shallow(<MyComponent stringProp="value" numberProp={1} />);
@@ -340,7 +376,16 @@ function ShallowWrapperTest() {
     }
 
     function test_instance() {
-        const myComponent: MyComponent = shallowWrapper.instance();
+        const myComponent = shallowWrapper.instance() as MyComponent;
+        myComponent.handleEcho('it works');
+
+        const wrapper = shallow<MyComponent>(<MyComponent stringProp="value" numberProp={1}/>);
+        wrapper.instance().handleEcho('it works');
+
+        const wrapperPropsOnly = shallow<MyComponentProps>(<MyComponent stringProp="value" numberProp={1}/>);
+        wrapperPropsOnly.setProps({stringProp: 'new value'});
+        // $ExpectError
+        wrapperPropsOnly.instance().handleEcho;
     }
 
     function test_update() {
@@ -438,6 +483,33 @@ function ReactWrapperTest() {
     let anotherStatelessWrapper: ReactWrapper<AnotherStatelessProps, never>;
     let anotherComponentWrapper: ReactWrapper<AnotherComponentProps, any>;
 
+    function testStatePropsInstance() {
+        const wrapper = mount<MyComponent>(<MyComponent stringProp="value" numberProp={1}/>);
+
+        const {
+            numberProp, // $ExpectType number
+            stringProp // $ExpectType string
+        } = wrapper.props();
+        const {
+            stateProperty // $ExpectType string
+        } = wrapper.state();
+        const {
+            handleEcho // $ExpectType (value: string) => string
+        } = wrapper.instance();
+
+        // $ExpectError
+        wrapper.setState({stateProperty: 123});
+        // $ExpectError
+        wrapper.setState({statePropertyzasd: 'hello'});
+        wrapper.setState({stateProperty: 'hello'});
+
+        // $ExpectError
+        wrapper.setProps({numberProp: '123'});
+        // $ExpectError
+        wrapper.setProps({numberPropzasd: 'hello'});
+        wrapper.setProps({numberProp: 123});
+    }
+
     function test_prop_state_inferring() {
         let wrapper: ReactWrapper<MyComponentProps, MyComponentState>;
         wrapper = mount(<MyComponent stringProp="value" numberProp={1} />);
@@ -696,7 +768,16 @@ function ReactWrapperTest() {
     }
 
     function test_instance() {
-        const myComponent: MyComponent = reactWrapper.instance();
+        const myComponent = reactWrapper.instance() as MyComponent;
+        myComponent.handleEcho('it works');
+
+        const wrapperPropsOnly = mount<MyComponentProps>(<MyComponent stringProp="value" numberProp={1}/>);
+        wrapperPropsOnly.setProps({stringProp: 'new value'});
+        // $ExpectError
+        wrapperPropsOnly.instance().handleEcho;
+
+        const wrapper = mount<MyComponent>(<MyComponent stringProp="value" numberProp={1}/>);
+        wrapper.instance().handleEcho('it works');
     }
 
     function test_update() {
diff --git a/types/enzyme/index.d.ts b/types/enzyme/index.d.ts
index 0a741460f6..a91f60b3c6 100644
--- a/types/enzyme/index.d.ts
+++ b/types/enzyme/index.d.ts
@@ -7,8 +7,9 @@
 //                 huhuanming <https://github.com/huhuanming>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 //                 Torgeir Hovden <https://github.com/thovden>
+//                 Martin Hochel <https://github.com/hotell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="cheerio" />
 import { ReactElement, Component, AllHTMLAttributes as ReactHTMLAttributes, SVGAttributes as ReactSVGAttributes } from "react";
@@ -45,7 +46,7 @@ export type EnzymeSelector = string | StatelessComponent<any> | ComponentClass<a
 
 export type Intercepter<T> = (intercepter: T) => void;
 
-export interface CommonWrapper<P = {}, S = {}> {
+export interface CommonWrapper<P = {}, S = {}, C = Component<P, S>> {
     /**
      * Returns a new wrapper with only the nodes of the current wrapper that, when passed into the provided predicate function, return true.
      */
@@ -258,7 +259,7 @@ export interface CommonWrapper<P = {}, S = {}> {
      *
      * NOTE: can only be called on a wrapper instance that is also the root instance.
      */
-    instance(): Component<P, S>;
+    instance(): C;
 
     /**
      * Forces a re-render. Useful to run before checking the render output if something external may be updating
@@ -354,8 +355,8 @@ export interface CommonWrapper<P = {}, S = {}> {
 }
 
 // tslint:disable-next-line no-empty-interface
-export interface ShallowWrapper<P = {}, S = {}> extends CommonWrapper<P, S> { }
-export class ShallowWrapper<P = {}, S = {}> {
+export interface ShallowWrapper<P = {}, S = {}, C = Component> extends CommonWrapper<P, S, C> { }
+export class ShallowWrapper<P = {}, S = {}, C = Component> {
     constructor(nodes: JSX.Element[] | JSX.Element, root?: ShallowWrapper<any, any>, options?: ShallowRendererProps);
     shallow(options?: ShallowRendererProps): ShallowWrapper<P, S>;
     unmount(): this;
@@ -440,8 +441,8 @@ export class ShallowWrapper<P = {}, S = {}> {
 }
 
 // tslint:disable-next-line no-empty-interface
-export interface ReactWrapper<P = {}, S = {}> extends CommonWrapper<P, S> { }
-export class ReactWrapper<P = {}, S = {}> {
+export interface ReactWrapper<P = {}, S = {}, C = Component> extends CommonWrapper<P, S, C> { }
+export class ReactWrapper<P = {}, S = {}, C = Component> {
     constructor(nodes: JSX.Element | JSX.Element[], root?: ReactWrapper<any, any>, options?: MountRendererProps);
 
     unmount(): this;
@@ -588,12 +589,14 @@ 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.
  */
+export function shallow<C extends Component, P = C['props'], S = C['state']>(node: ReactElement<P>, options?: ShallowRendererProps): ShallowWrapper<P, S, C>;
 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.
  */
+export function mount<C extends Component, P = C['props'], S = C['state']>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, S, C>;
 export function mount<P>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, any>;
 export function mount<P, S>(node: ReactElement<P>, options?: MountRendererProps): ReactWrapper<P, S>;
 
diff --git a/types/epilogue/index.d.ts b/types/epilogue/index.d.ts
index 3fe56b9e9f..e54f127d9e 100644
--- a/types/epilogue/index.d.ts
+++ b/types/epilogue/index.d.ts
@@ -2,7 +2,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
+// TypeScript Version: 2.8
 
 import {
     Sequelize,
diff --git a/types/error-subclass/error-subclass-tests.ts b/types/error-subclass/error-subclass-tests.ts
new file mode 100644
index 0000000000..9944bba159
--- /dev/null
+++ b/types/error-subclass/error-subclass-tests.ts
@@ -0,0 +1,7 @@
+import ErrorSubclass from 'error-subclass';
+
+class ExampleError extends ErrorSubclass {
+    static displayName = 'ExampleError';
+}
+
+throw new ExampleError('Something went wrong!');
diff --git a/types/error-subclass/index.d.ts b/types/error-subclass/index.d.ts
new file mode 100644
index 0000000000..55add2c057
--- /dev/null
+++ b/types/error-subclass/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for error-subclass 2.2
+// Project: https://github.com/spudly/error-subclass#readme
+// Definitions by: Fitbit <https://github.com/fitbit>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default class ErrorSubclass extends Error {
+    static displayName: string;
+}
diff --git a/types/error-subclass/tsconfig.json b/types/error-subclass/tsconfig.json
new file mode 100644
index 0000000000..1574ebeea2
--- /dev/null
+++ b/types/error-subclass/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",
+        "error-subclass-tests.ts"
+    ]
+}
diff --git a/types/error-subclass/tslint.json b/types/error-subclass/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/error-subclass/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/es-feature-detection/es-feature-detection-tests.ts b/types/es-feature-detection/es-feature-detection-tests.ts
new file mode 100644
index 0000000000..13b779c1bb
--- /dev/null
+++ b/types/es-feature-detection/es-feature-detection-tests.ts
@@ -0,0 +1,14 @@
+import * as es from "es-feature-detection";
+
+const fns = es.builtins();
+if (fns["Array.prototype.includes"]) {
+    // [].includes
+}
+const syntax = es.syntax();
+if (syntax["Arrow function"]) {
+    new Function("() => {}");
+}
+
+if (fns.es2017.__all && syntax.es2017.__all) {
+    // support es2017!
+}
diff --git a/types/es-feature-detection/index.d.ts b/types/es-feature-detection/index.d.ts
new file mode 100644
index 0000000000..7c4124ce73
--- /dev/null
+++ b/types/es-feature-detection/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for es-feature-detection 2.0
+// Project: https://github.com/Tokimon/es-feature-detection#readme
+// Definitions by: Jack Works <https://github.com/Jack-Works>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+export type ES2015Builtins = "__all" | "Array.from" | "Array.of" | "Array.prototype.fill" | "Array.prototype.find" | "Array.prototype.findIndex" | "Array.prototype.entries" | "Array.prototype.keys" |
+    "Array.prototype.copyWithin" | "base64" | "Map" | "Set" | "WeakMap" | "WeakSet" | "Math.imul" | "Math.clz32" | "Math.fround" | "Math.log10" | "Math.log2" | "Math.log1p" | "Math.expm1" |
+    "Math.cosh" | "Math.sinh" | "Math.tanh" | "Math.acosh" | "Math.asinh" | "Math.hypot" | "Math.trunc" | "Math.sign" | "Math.cbrt" | "Number.isNaN" | "Number.isFinite" | "Number.isInteger" |
+    "Number.parseInt" | "Number.parseFloat" | "Number.EPSILON" | "Number.MAX_SAFE_INTEGER" | "Number.MIN_SAFE_INTEGER" | "Number.isSafeInteger" | "Object.prototype.__proto__" | "Object.is" |
+    "Object.setPrototypeOf" | "Object.assign" | "Object.getOwnPropertySymbols" | "Promise" | "Proxy" | "Reflect" | "requestAnimationFrame" | "String.fromCodePoint" | "String.prototype.codePointAt" |
+    "String.prototype.startsWith" | "String.prototype.endsWith" | "String.prototype.includes" | "String.prototype.repeat" | "String.prototype.normalize" | "String.raw" | "Symbol" | "TypedArrays" |
+    "new.target";
+export type ES2016Builtins = "__all" | "Array.prototype.includes" | "TypedArray.prototype.includes";
+export type ES2017Builtins = "__all" | "Atomics" | "Object.values" | "Object.entries" | "Object.getOwnPropertyDescriptors" |
+    "String.prototype.padEnd" | "String.prototype.padStart" | "SharedArrayBuffer";
+export type ES2015Syntax = "__all" | "for...of" | "RegExp.prototype.sticky" | "RegExp.prototype.unicode" | "const" | "let" | "Destructuring" | "Spread Array" | "Spread Function call" |
+    "Rest parameters" | "Default parameters" | "Arrow function" | "Generator function" | "Binary literals" | "Octal literals" | "Template Strings" | "Shorthand property" | "Shorthand method" |
+    "Computed property" | "Block level function declaration" | "class";
+export type ES2016Syntax = "__all" | "Exponentiation operator" | "Rest destructuring";
+export type ES2017Syntax = "__all" | "async/await" | "Trailing parameter commas";
+export function builtins(): Record<ES2015Builtins | ES2016Builtins | ES2017Builtins, boolean> & {
+    es2015: Record<ES2015Builtins, boolean>;
+    es2016: Record<ES2016Builtins, boolean>;
+    es2017: Record<ES2017Builtins, boolean>;
+};
+export function syntax(): Record<ES2015Syntax | ES2016Syntax | ES2017Syntax, boolean> & {
+    es2015: Record<ES2015Syntax, boolean>;
+    es2016: Record<ES2016Syntax, boolean>;
+    es2017: Record<ES2017Syntax, boolean>;
+};
diff --git a/types/es-feature-detection/tsconfig.json b/types/es-feature-detection/tsconfig.json
new file mode 100644
index 0000000000..1a348b7edc
--- /dev/null
+++ b/types/es-feature-detection/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",
+        "es-feature-detection-tests.ts"
+    ]
+}
diff --git a/types/es-feature-detection/tslint.json b/types/es-feature-detection/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/es-feature-detection/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/escape-string-regexp/index.d.ts b/types/escape-string-regexp/index.d.ts
index 7a52a312b1..a0b218afe9 100644
--- a/types/escape-string-regexp/index.d.ts
+++ b/types/escape-string-regexp/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for escape-string-regexp
+// Type definitions for escape-string-regexp 1.0
 // Project: https://github.com/sindresorhus/escape-string-regexp
 // Definitions by: kruncher <https://github.com/kruncher>
 //                 faergeek <https://github.com/faergeek>
diff --git a/types/eslint/eslint-tests.ts b/types/eslint/eslint-tests.ts
index 6a81d69c8a..b0c3c1966d 100644
--- a/types/eslint/eslint-tests.ts
+++ b/types/eslint/eslint-tests.ts
@@ -446,6 +446,7 @@ let cli: CLIEngine;
 
 cli = new CLIEngine({ allowInlineConfig: false });
 cli = new CLIEngine({ baseConfig: false });
+cli = new CLIEngine({ baseConfig: { extends: ['lynt'] }});
 cli = new CLIEngine({ cache: true });
 cli = new CLIEngine({ cacheFile: 'foo' });
 cli = new CLIEngine({ configFile: 'foo' });
diff --git a/types/eslint/index.d.ts b/types/eslint/index.d.ts
index 89067f97c8..031ab984f7 100644
--- a/types/eslint/index.d.ts
+++ b/types/eslint/index.d.ts
@@ -483,7 +483,7 @@ export class CLIEngine {
 export namespace CLIEngine {
     class Options {
         allowInlineConfig?: boolean;
-        baseConfig?: boolean;
+        baseConfig?: false | { [name: string]: any };
         cache?: boolean;
         cacheFile?: string;
         cacheLocation?: string;
diff --git a/types/espruino/espruino-tests.ts b/types/espruino/espruino-tests.ts
index 5e84a93e65..c1bafc9048 100644
--- a/types/espruino/espruino-tests.ts
+++ b/types/espruino/espruino-tests.ts
@@ -1,2 +1,17 @@
+import * as wifi from 'Wifi';
+
+wifi.connect('ssid', { password: 'pass', authMode: 'wpa_wpa2' }, err => {
+    if (err) throw err;
+    console.log('connected');
+});
+
+wifi.startAP('ssid', { password: 'pass', authMode: 'wpa_wpa2' }, err => {
+    if (err) throw err;
+    console.log("created");
+});
+
+digitalWrite(D2, false);
+digitalWrite(D2, true);
+
 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
index 43d1068230..cb6151e85a 100644
--- a/types/espruino/index.d.ts
+++ b/types/espruino/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for Espruino 1.94
 // Project: http://www.espruino.com/
 // Definitions by: Stanislav Berkov <https://github.com/stasberkov>
+//                 Jurand Niemczycki <https://github.com/createdbyjurand>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
 
 declare interface Object {
@@ -9,6 +10,7 @@ declare interface Object {
 
 declare module "Wifi" {
     function connect(ssid: string, options: any, callback: (err: any) => any): any;
+    function startAP(ssid: string, options: any, callback: (err: any) => any): any;
 }
 
 declare module "InfluxDB" {
@@ -391,10 +393,10 @@ declare interface Timer {
 }
 
 
-    // write(data: any[]): any;
-    // on(event: string, handler: (data: any) => any): any;
-    // setup(boudrate: number, options: any): any;
-    // read(chars?: number): string;
+// write(data: any[]): any;
+// on(event: string, handler: (data: any) => any): any;
+// setup(boudrate: number, options: any): any;
+// read(chars?: number): string;
 
 
 /**
@@ -3598,7 +3600,7 @@ declare function digitalPulse(pin: Pin, value: boolean, time: any): void;
 * @param value 
 * @url http://www.espruino.com/Reference#l__global_digitalWrite
 */
-declare function digitalWrite(pin: Pin, value: number): void;
+declare function digitalWrite(pin: Pin, value: number | boolean): void;
 
 /**
 * <p>Get the digital value of the given pin.</p>
diff --git a/types/esri-leaflet/index.d.ts b/types/esri-leaflet/index.d.ts
index 3dbd351cb5..df1a9c3752 100644
--- a/types/esri-leaflet/index.d.ts
+++ b/types/esri-leaflet/index.d.ts
@@ -44,6 +44,7 @@ declare module 'leaflet' {
             | 'GrayLabels'
             | 'DarkGrayLabels'
             | 'ImageryLabels'
+            | 'ImageryClarity'
             | 'ImageryTransportation'
             | 'ShadedReliefLabels'
             | 'TerrainLabels';
diff --git a/types/eth-lightwallet/eth-lightwallet-tests.ts b/types/eth-lightwallet/eth-lightwallet-tests.ts
new file mode 100644
index 0000000000..4907c73cbf
--- /dev/null
+++ b/types/eth-lightwallet/eth-lightwallet-tests.ts
@@ -0,0 +1,3 @@
+import * as lw from "eth-lightwallet";
+
+lw.keystore.createVault({});
diff --git a/types/eth-lightwallet/index.d.ts b/types/eth-lightwallet/index.d.ts
new file mode 100644
index 0000000000..f55e71884e
--- /dev/null
+++ b/types/eth-lightwallet/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for eth-lightwallet 3.0
+// Project: https://github.com/ConsenSys/eth-lightwallet#readme
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+/// <reference types="node" />
+
+export interface ECSignatureBuffer {
+    v: number;
+    r: Buffer;
+    s: Buffer;
+}
+export namespace signing {
+    function signTx(
+        keystore: keystore,
+        pwDerivedKey: Uint8Array,
+        rawTx: string,
+        signingAddress: string
+    ): string;
+    function signMsg(
+        keystore: keystore,
+        pwDerivedKey: Uint8Array,
+        rawMsg: string,
+        signingAddress: string
+    ): ECSignatureBuffer;
+    function signMsgHash(
+        keystore: keystore,
+        pwDerivedKey: Uint8Array,
+        msgHash: string,
+        signingAddress: string
+    ): ECSignatureBuffer;
+    function concatSig(signature: any): string;
+}
+
+export class keystore {
+    static createVault(
+        options: any,
+        callback?: (error: Error, keystore: keystore) => void
+    ): keystore;
+    static generateRandomSeed(): string;
+    static isSeedValid(seed: string): boolean;
+    static deserialize(keystore: string): keystore;
+    serialize(): string;
+    keyFromPassword(
+        password: string,
+        callback?: (error: Error, pwDerivedKey: Uint8Array) => void
+    ): Uint8Array;
+    isDerivedKeyCorrect(pwDerivedKey: Uint8Array): boolean;
+    generateNewAddress(
+        pwDerivedKey: Uint8Array,
+        numberOfAddresses: number
+    ): void;
+    getSeed(pwDerivedKey: Uint8Array): string;
+    exportPrivateKey(address: string, pwDerivedKey: Uint8Array): string;
+    getAddresses(): string[];
+}
+
+export interface VaultOptions {
+    password: string;
+    seedPhrase: string;
+    salt?: string;
+    hdPathString: string;
+}
diff --git a/types/eth-lightwallet/tsconfig.json b/types/eth-lightwallet/tsconfig.json
new file mode 100644
index 0000000000..80eab8563a
--- /dev/null
+++ b/types/eth-lightwallet/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",
+    "eth-lightwallet-tests.ts"
+  ]
+}
diff --git a/types/eth-lightwallet/tslint.json b/types/eth-lightwallet/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/eth-lightwallet/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ethereum-protocol/ethereum-protocol-tests.ts b/types/ethereum-protocol/ethereum-protocol-tests.ts
new file mode 100644
index 0000000000..a30a691e87
--- /dev/null
+++ b/types/ethereum-protocol/ethereum-protocol-tests.ts
@@ -0,0 +1,4 @@
+import { CallData, BlockParamLiteral } from 'ethereum-protocol';
+BlockParamLiteral.Earliest;
+BlockParamLiteral.Latest;
+BlockParamLiteral.Pending;
diff --git a/types/ethereum-protocol/index.d.ts b/types/ethereum-protocol/index.d.ts
new file mode 100644
index 0000000000..9b967cfc83
--- /dev/null
+++ b/types/ethereum-protocol/index.d.ts
@@ -0,0 +1,293 @@
+// Type definitions for ethereum-protocol 1.0
+// Project: https://www.npmjs.com/package/ethereum-protocol
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import BigNumber from 'bignumber.js';
+
+export type JSONRPCErrorCallback = (err: Error | null, result?: JSONRPCResponsePayload) => void;
+
+/**
+ * Do not create your own provider. Use an existing provider from a Web3 or ProviderEngine library
+ * Read more about Providers in the 0x wiki.
+ */
+export interface Provider {
+    sendAsync(payload: JSONRPCRequestPayload, callback: JSONRPCErrorCallback): void;
+}
+
+export type ContractAbi = AbiDefinition[];
+
+export type AbiDefinition = FunctionAbi | EventAbi;
+
+export type FunctionAbi = MethodAbi | ConstructorAbi | FallbackAbi;
+
+export type ConstructorStateMutability = 'nonpayable' | 'payable';
+export type StateMutability = 'pure' | 'view' | ConstructorStateMutability;
+
+export enum AbiType {
+    Function = 'function',
+    Constructor = 'constructor',
+    Event = 'event',
+    Fallback = 'fallback',
+}
+
+export interface MethodAbi {
+    type: AbiType.Function;
+    name: string;
+    inputs: DataItem[];
+    outputs: DataItem[];
+    constant: boolean;
+    stateMutability: StateMutability;
+    payable: boolean;
+}
+
+export interface ConstructorAbi {
+    type: AbiType.Constructor;
+    inputs: DataItem[];
+    payable: boolean;
+    stateMutability: ConstructorStateMutability;
+}
+
+export interface FallbackAbi {
+    type: AbiType.Fallback;
+    payable: boolean;
+}
+
+export interface EventParameter extends DataItem {
+    indexed: boolean;
+}
+
+export interface EventAbi {
+    type: AbiType.Event;
+    name: string;
+    inputs: EventParameter[];
+    anonymous: boolean;
+}
+
+export interface DataItem {
+    name: string;
+    type: string;
+    components?: DataItem[];
+}
+
+export enum OpCode {
+    DelegateCall = 'DELEGATECALL',
+    Revert = 'REVERT',
+    Create = 'CREATE',
+    Stop = 'STOP',
+    Invalid = 'INVALID',
+    CallCode = 'CALLCODE',
+    StaticCall = 'STATICCALL',
+    Return = 'RETURN',
+    Call = 'CALL',
+    SelfDestruct = 'SELFDESTRUCT',
+}
+
+export interface StructLog {
+    depth: number;
+    error: string;
+    gas: number;
+    gasCost: number;
+    memory: string[];
+    op: OpCode;
+    pc: number;
+    stack: string[];
+    storage: { [location: string]: string };
+}
+
+export interface TransactionTrace {
+    gas: number;
+    returnValue: any;
+    structLogs: StructLog[];
+}
+
+export type Unit =
+    | 'kwei'
+    | 'ada'
+    | 'mwei'
+    | 'babbage'
+    | 'gwei'
+    | 'shannon'
+    | 'szabo'
+    | 'finney'
+    | 'ether'
+    | 'kether'
+    | 'grand'
+    | 'einstein'
+    | 'mether'
+    | 'gether'
+    | 'tether';
+
+export interface JSONRPCRequestPayload {
+    params: any[];
+    method: string;
+    id: number;
+    jsonrpc: string;
+}
+
+export interface JSONRPCResponsePayload {
+    result: any;
+    id: number;
+    jsonrpc: string;
+}
+
+export interface AbstractBlock {
+    number: number | null;
+    hash: string | null;
+    parentHash: string;
+    nonce: string | null;
+    sha3Uncles: string;
+    logsBloom: string | null;
+    transactionsRoot: string;
+    stateRoot: string;
+    miner: string;
+    difficulty: BigNumber;
+    totalDifficulty: BigNumber;
+    extraData: string;
+    size: number;
+    gasLimit: number;
+    gasUsed: number;
+    timestamp: number;
+    uncles: string[];
+}
+
+export interface BlockWithoutTransactionData extends AbstractBlock {
+    transactions: string[];
+}
+
+export interface BlockWithTransactionData extends AbstractBlock {
+    transactions: Transaction[];
+}
+
+export interface Transaction {
+    hash: string;
+    nonce: number;
+    blockHash: string | null;
+    blockNumber: number | null;
+    transactionIndex: number | null;
+    from: string;
+    to: string | null;
+    value: BigNumber;
+    gasPrice: BigNumber;
+    gas: number;
+    input: string;
+}
+
+export interface CallTxDataBase {
+    to?: string;
+    value?: number | string | BigNumber;
+    gas?: number | string | BigNumber;
+    gasPrice?: number | string | BigNumber;
+    data?: string;
+    nonce?: number;
+}
+
+export interface TxData extends CallTxDataBase {
+    from: string;
+}
+
+export interface CallData extends CallTxDataBase {
+    from?: string;
+}
+
+export interface FilterObject {
+    fromBlock?: number | string;
+    toBlock?: number | string;
+    address?: string;
+    topics?: LogTopic[];
+}
+
+export type LogTopic = null | string | string[];
+
+export interface DecodedLogEntry<A> extends LogEntry {
+    event: string;
+    args: A;
+}
+
+export interface DecodedLogEntryEvent<A> extends DecodedLogEntry<A> {
+    removed: boolean;
+}
+
+export interface LogEntryEvent extends LogEntry {
+    removed: boolean;
+}
+
+export interface LogEntry {
+    logIndex: number | null;
+    transactionIndex: number | null;
+    transactionHash: string;
+    blockHash: string | null;
+    blockNumber: number | null;
+    address: string;
+    data: string;
+    topics: string[];
+}
+
+export interface TxDataPayable extends TxData {
+    value?: BigNumber;
+}
+
+export interface TransactionReceipt {
+    blockHash: string;
+    blockNumber: number;
+    transactionHash: string;
+    transactionIndex: number;
+    from: string;
+    to: string;
+    status: null | string | 0 | 1;
+    cumulativeGasUsed: number;
+    gasUsed: number;
+    contractAddress: string | null;
+    logs: LogEntry[];
+}
+
+export type ContractEventArg = string | BigNumber | number | boolean;
+
+export interface DecodedLogArgs {
+    [argName: string]: ContractEventArg;
+}
+
+export interface LogWithDecodedArgs<ArgsType extends DecodedLogArgs> extends DecodedLogEntry<ArgsType> {}
+export type RawLog = LogEntry;
+
+export enum BlockParamLiteral {
+    Earliest = 'earliest',
+    Latest = 'latest',
+    Pending = 'pending',
+}
+
+export type BlockParam = BlockParamLiteral | number;
+
+export interface RawLogEntry {
+    logIndex: string | null;
+    transactionIndex: string | null;
+    transactionHash: string;
+    blockHash: string | null;
+    blockNumber: string | null;
+    address: string;
+    data: string;
+    topics: string[];
+}
+
+export enum SolidityTypes {
+    Address = 'address',
+    Uint256 = 'uint256',
+    Uint8 = 'uint8',
+    Uint = 'uint',
+}
+
+/**
+ * Contains the logs returned by a TransactionReceipt. We attempt to decode the
+ * logs using AbiDecoder. If we have the logs corresponding ABI, we decode it,
+ * otherwise we don't.
+ */
+export interface TransactionReceiptWithDecodedLogs extends TransactionReceipt {
+    logs: Array<LogWithDecodedArgs<DecodedLogArgs> | LogEntry>;
+}
+
+export interface TraceParams {
+    disableMemory?: boolean;
+    disableStack?: boolean;
+    disableStorage?: boolean;
+}
diff --git a/types/ethereum-protocol/package.json b/types/ethereum-protocol/package.json
new file mode 100644
index 0000000000..4eeb6b18c8
--- /dev/null
+++ b/types/ethereum-protocol/package.json
@@ -0,0 +1,4 @@
+{
+    "private": true,
+    "dependencies": { "bignumber.js": "7.2.1" }
+}
diff --git a/types/ethereum-protocol/tsconfig.json b/types/ethereum-protocol/tsconfig.json
new file mode 100644
index 0000000000..5f358a8dec
--- /dev/null
+++ b/types/ethereum-protocol/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", "ethereum-protocol-tests.ts"]
+}
diff --git a/types/ethereum-protocol/tslint.json b/types/ethereum-protocol/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ethereum-protocol/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ethereumjs-abi/index.d.ts b/types/ethereumjs-abi/index.d.ts
index 4314e46cbd..9208712d59 100644
--- a/types/ethereumjs-abi/index.d.ts
+++ b/types/ethereumjs-abi/index.d.ts
@@ -8,3 +8,5 @@
 export function soliditySHA3(argTypes: string[], args: any[]): Buffer;
 export function soliditySHA256(argTypes: string[], args: any[]): Buffer;
 export function methodID(name: string, types: string[]): Buffer;
+export function simpleEncode(signature: string, ...args: any[]): Buffer;
+export function rawDecode(signature: string[], data: Buffer): any[];
diff --git a/types/evaporate/evaporate-tests.ts b/types/evaporate/evaporate-tests.ts
index 3140cd9ea9..077cc2ebfd 100644
--- a/types/evaporate/evaporate-tests.ts
+++ b/types/evaporate/evaporate-tests.ts
@@ -25,3 +25,14 @@ Evaporate.create({
                 console.log(awsS3ObjectKey + '!!!');
             });
     });
+
+Evaporate.create({
+    bucket: 'test',
+    computeContentMd5: true,
+    cryptoMd5Method(data: ArrayBuffer) {
+        return '';
+    },
+    cryptoHexEncodedHash256(data: ArrayBuffer | string | null) {
+        return '';
+    },
+});
diff --git a/types/evaporate/index.d.ts b/types/evaporate/index.d.ts
index 1c415769b8..8ae110416e 100644
--- a/types/evaporate/index.d.ts
+++ b/types/evaporate/index.d.ts
@@ -34,12 +34,12 @@ declare namespace Evaporate {
         s3Acceleration?: boolean;
         mockLocalStorage?: boolean;
         encodeFilename?: boolean;
-        computeContentMd5?: false;
+        computeContentMd5?: boolean;
         allowS3ExistenceOptimization?: boolean;
         onlyRetryForSameFileName?: boolean;
         timeUrl?: string;
         cryptoMd5Method?: null | ((data: ArrayBuffer) => string);
-        cryptoHexEncodedHash256?: null | ((data: ArrayBuffer) => string);
+        cryptoHexEncodedHash256?: null | ((data: string | ArrayBuffer | null) => string);
         aws_url?: string;
         aws_key?: string;
         awsRegion?: string;
@@ -52,7 +52,7 @@ declare namespace Evaporate {
         customAuthMethod?: null | ((
             signParams: string,
             signHeaders: string,
-            stringToSign: () => string | undefined,
+            stringToSign: string,
             signatureDateTime: string,
             canonicalRequest: string
         ) => Promise<string>);
diff --git a/types/ex-react-native-i18n/ex-react-native-i18n-tests.ts b/types/ex-react-native-i18n/ex-react-native-i18n-tests.ts
new file mode 100644
index 0000000000..c83c4b60d3
--- /dev/null
+++ b/types/ex-react-native-i18n/ex-react-native-i18n-tests.ts
@@ -0,0 +1,8 @@
+import I18n from 'ex-react-native-i18n';
+
+I18n.defaultLocale = 'en';
+I18n.fallbacks = true;
+I18n.translations = {};
+I18n.locale = 'zh';
+
+const deviceLocale: string = I18n.locale;
diff --git a/types/ex-react-native-i18n/index.d.ts b/types/ex-react-native-i18n/index.d.ts
new file mode 100644
index 0000000000..0b83b06a68
--- /dev/null
+++ b/types/ex-react-native-i18n/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for ex-react-native-i18n 0.0
+// Project: https://github.com/xcarpentier/ex-react-native-i18n/
+// Definitions by: LikKee Richie <https://github.com/maplerichie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// Actual version for ex-react-native-i18n is 0.0.4 but 'npm run lint' doesn't allow patch version to pass
+import I18n = require("i18n-js");
+// import I18n from 'ex-react-native-i18n';
+
+export default I18n;
diff --git a/types/ex-react-native-i18n/tsconfig.json b/types/ex-react-native-i18n/tsconfig.json
new file mode 100644
index 0000000000..8e6dd691bf
--- /dev/null
+++ b/types/ex-react-native-i18n/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",
+        "ex-react-native-i18n-tests.ts"
+    ]
+}
diff --git a/types/ex-react-native-i18n/tslint.json b/types/ex-react-native-i18n/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ex-react-native-i18n/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/exceljs/exceljs-tests.ts b/types/exceljs/exceljs-tests.ts
index 684fad8719..0f5504fef0 100644
--- a/types/exceljs/exceljs-tests.ts
+++ b/types/exceljs/exceljs-tests.ts
@@ -1,7 +1,6 @@
 import * as Excel from 'exceljs';
 import * as stream from 'stream';
 import * as fs from 'fs';
-import * as Bluebird from 'bluebird';
 
 // most examples taken and adapted from README.md
 
@@ -464,4 +463,4 @@ worksheet.commit();
 
 workbook.commit().then(() => null);
 
-Excel.config.setValue('promise', Bluebird);
+Excel.config.setValue('promise', Promise);
diff --git a/types/expect-puppeteer/expect-puppeteer-tests.ts b/types/expect-puppeteer/expect-puppeteer-tests.ts
index 4ad0ce1f3c..4c646da1d9 100644
--- a/types/expect-puppeteer/expect-puppeteer-tests.ts
+++ b/types/expect-puppeteer/expect-puppeteer-tests.ts
@@ -5,7 +5,8 @@ const testGlobal = async (instance: ElementHandle | Page) => {
     await expect(instance).toClick("selector", { polling: "mutation", text: "text" });
     await expect(instance).toClick("selector", { polling: "raf", timeout: 777 });
 
-    await expect(instance).toDisplayDialog(async () => {});
+    const dialog = await expect(instance).toDisplayDialog(async () => {});
+    console.log(dialog.message());
 
     await expect(instance).toFill("selector", "value");
     await expect(instance).toFill("selector", "value", { polling: 777 });
diff --git a/types/expect-puppeteer/index.d.ts b/types/expect-puppeteer/index.d.ts
index 4d599f99fe..7c216f4259 100644
--- a/types/expect-puppeteer/index.d.ts
+++ b/types/expect-puppeteer/index.d.ts
@@ -1,12 +1,13 @@
 // Type definitions for expect-puppeteer 2.2
 // Project: https://github.com/smooth-code/jest-puppeteer/tree/master/packages/expect-puppeteer
 // Definitions by: Josh Goldberg <https://github.com/JoshuaKGoldberg>
+//                 Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 /// <reference types="jest" />
 
-import { ElementHandle, Page } from "puppeteer";
+import { ElementHandle, Page, Dialog } from "puppeteer";
 
 /**
  * Interval at which pageFunctions may be executed.
@@ -39,7 +40,7 @@ interface ExpectPuppeteer {
     // These must all match the ExpectPuppeteer interface above.
     // We can't extend from it directly because some method names conflict in type-incompatible ways.
     toClick(selector: string, options?: ExpectToClickOptions): Promise<void>;
-    toDisplayDialog(block: () => Promise<void>): Promise<void>;
+    toDisplayDialog(block: () => Promise<void>): Promise<Dialog>;
     toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
     toMatch(selector: string, options?: ExpectTimingActions): Promise<void>;
     toMatchElement(selector: string, options?: ExpectToClickOptions): Promise<void>;
@@ -54,7 +55,7 @@ declare global {
             // These must all match the ExpectPuppeteer interface above.
             // We can't extend from it directly because some method names conflict in type-incompatible ways.
             toClick(selector: string, options?: ExpectToClickOptions): Promise<void>;
-            toDisplayDialog(block: () => Promise<void>): Promise<void>;
+            toDisplayDialog(block: () => Promise<void>): Promise<Dialog>;
             toFill(selector: string, value: string, options?: ExpectTimingActions): Promise<void>;
             toMatch(selector: string, options?: ExpectTimingActions): Promise<void>;
             toMatchElement(selector: string, options?: ExpectToClickOptions): Promise<void>;
diff --git a/types/expired-storage/expired-storage-tests.ts b/types/expired-storage/expired-storage-tests.ts
new file mode 100644
index 0000000000..5c1a814b23
--- /dev/null
+++ b/types/expired-storage/expired-storage-tests.ts
@@ -0,0 +1,69 @@
+import ExpiredStorage = require('expired-storage');
+
+const expiredStorage = new ExpiredStorage();
+
+const mjkModel = {
+  firstName: 'Maynard',
+  middleName: 'James',
+  familyName: 'Keenan',
+};
+
+expiredStorage.clear();
+
+expiredStorage.setItem('tool', '46&2', 10);
+
+if (expiredStorage.getItem('tool') !== '46&2') {
+  throw new Error('.setItem method is not working!');
+}
+
+expiredStorage.setJson('mjk', mjkModel, 1);
+
+const mjkTest = expiredStorage.getJson('mjk');
+
+if (typeof mjkTest === 'undefined' || mjkTest.firstName !== mjkModel.firstName || mjkTest.middleName !== mjkModel.middleName || mjkTest.familyName !== mjkModel.familyName) {
+  throw new Error('.setJson method is not working!');
+}
+
+const keyCheck = expiredStorage.keys(true);
+
+if (keyCheck && keyCheck.length === 2) {
+  throw new Error('.keys method has failed.');
+}
+
+expiredStorage.setItem('apc', 'brena', 2);
+
+const goBackToSleep = expiredStorage.peek('apc');
+
+if (!goBackToSleep.isExpired && goBackToSleep.value !== 'brena') {
+  throw new Error('.peek -- we have expired early... or our value was incorrect...');
+}
+
+do {
+  // nothing here to see
+} while (!expiredStorage.isExpired('apc'));
+
+const expiredKeys = expiredStorage.clearExpired();
+
+if (expiredKeys.indexOf('apc') !== -1) {
+  throw new Error('.clearExpired did not work..');
+}
+
+if (expiredStorage.getItem('apc') !== null) {
+  throw new Error('Expiration as a whole does not work.');
+}
+
+expiredStorage.setItem('puscifer', 'the humbling river', 10000);
+
+expiredStorage.updateExpiration('puscifer', 5000);
+
+const checkKeyTime = expiredStorage.getTimeLeft('puscifer');
+
+if (checkKeyTime && checkKeyTime >= 10000) {
+  throw new Error('.updateExpiration method is broken -- or .getTimeLeft method is broken.');
+}
+
+if (!expiredStorage.isExpired('mjk')) {
+  throw new Error('.isExpired or Expiration as a whole is not working...');
+}
+
+expiredStorage.clear();
diff --git a/types/expired-storage/index.d.ts b/types/expired-storage/index.d.ts
new file mode 100644
index 0000000000..bc7f7eb0b5
--- /dev/null
+++ b/types/expired-storage/index.d.ts
@@ -0,0 +1,105 @@
+// Type definitions for extended-storage 1.0
+// Project: https://github.com/RonenNess/ExpiredStorage/
+// Definitions by: Allen Gammel <https://github.com/intolerance>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export = ExpiredStorage;
+
+declare class ExpiredStorage {
+  constructor(localStorage?: any);
+  /**
+   * Clear the entire storage and all keys in it.
+   */
+  clear(): void;
+  /**
+   * Get a json serializable value. This basically calls JSON.parse on the returned value.
+   * @param key Item key to get (string).
+   * @return Stored value (JSON.parsed), or undefined if not set / expired.
+   */
+  getJson(key: string): any;
+  /**
+   * Get item.
+   * @param key: Item key to get (string).
+   * @return: Stored value, or undefined if not set / expired.
+   */
+  getItem(key: string): string | null;
+  /**
+   * Remove an item.
+   * @param key Item key to remove (string).
+   * @return Storage.removeItem() return code.
+   */
+  removeItem(key: string): any;
+  /**
+   * Set a json serializable value. This basically calls JSON.stringify on 'val' before setting it.
+   * @param key Item key to set (string).
+   * @param value Value to store (object, will be JSON.stringified).
+   * @param expiration Expiration time, in seconds. If not provided, will not set expiration time.
+   * @param return Storage.setItem() return code.
+   */
+  setJson(key: string, value: object, expirationTime?: number): any;
+  /**
+   * Set item.
+   * @param key Item key to set (string).
+   * @param value Value to store (string).
+   * @param expiration Expiration time, in seconds. If not provided, will not set expiration time.
+   * @return Storage.setItem() return code.
+   */
+  setItem(key: string, value: string, expiration?: number): any;
+  /**
+   * Get all keys in storage, not including internal keys used to store expiration.
+   * @param: includeExpired: if true, will also include expired keys.
+   * @return: Array with keys.
+   */
+  keys(includeExpired: boolean): string[] | null;
+  /**
+   * Get item time left to live.
+   * @param key Item key to get (string).
+   * @return Time left to expire (in seconds), or null if don't have expiration date.
+   */
+  getTimeLeft(key: string): number | null;
+  /**
+   * Clear expired keys.
+   * If you never call this function, expired keys will remain until you try to get them / reset a new value.
+   *
+   * @param return: List of removed keys due to expiration.
+   */
+  clearExpired(): string[];
+  /**
+   * Return if an item is expired (don't remove it, even if expired).
+   * @param key Item key to check (string).
+   * @return True if expired, False otherwise.
+   */
+  isExpired(key: string): boolean;
+  /**
+   * Get item + metadata such as time left and if expired.
+   * Even if item expired, will not remove it.
+   * @param key Item key to get (string).
+   * @return PeekInterface with: {value, timeLeft, isExpired}
+   */
+  peek(key: string): ExpiredStorage.PeekInterface;
+  /**
+   * Update expiration time for an item (note: doesn't validate that the item is set).
+   * @param key: Item key to update expiration for (string).
+   * @param expiration: New expiration time in seconds to set.
+   * @return: Storage.setItem() return code for setting new expiration.
+   */
+  updateExpiration(key: string, expiration: number): any;
+}
+
+declare namespace ExpiredStorage {
+  interface PeekInterface {
+    /**
+     * The value of a [key]
+     */
+    value: string | null;
+    /**
+     * Time remaining until expiration
+     */
+    timeLeft: number | null;
+    /**
+     * Has the [key] expired or not
+     */
+    isExpired: boolean;
+  }
+}
diff --git a/types/expired-storage/tsconfig.json b/types/expired-storage/tsconfig.json
new file mode 100644
index 0000000000..cd1454cca7
--- /dev/null
+++ b/types/expired-storage/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",
+        "expired-storage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/typed.js/tslint.json b/types/expired-storage/tslint.json
similarity index 100%
rename from types/typed.js/tslint.json
rename to types/expired-storage/tslint.json
diff --git a/types/expo/expo-tests.tsx b/types/expo/expo-tests.tsx
index d9b7edcb5d..0098a14489 100644
--- a/types/expo/expo-tests.tsx
+++ b/types/expo/expo-tests.tsx
@@ -25,6 +25,7 @@ import {
     ImagePicker,
     ImageManipulator,
     FaceDetector,
+    Linking,
     Svg,
     IntentLauncherAndroid,
     KeepAwake,
@@ -223,8 +224,8 @@ Audio.RECORDING_OPTIONS_PRESET_HIGH_QUALITY;
 Audio.RECORDING_OPTIONS_PRESET_LOW_QUALITY;
 async () => {
     const result = await Audio.Sound.create({uri: 'uri'}, {
-        volume: 0.5,
-        rate: 0.6
+        volume: 0.55,
+        rate: 16.5
     }, null, true);
 
     const sound = result.sound;
@@ -267,8 +268,8 @@ const barcodeReadCallback = () => {};
 );
 
 async () => {
-    await Brightness.setBrightnessAsync(.6);
-    await Brightness.setSystemBrightnessAsync(.7);
+    await Brightness.setBrightnessAsync(0.65);
+    await Brightness.setSystemBrightnessAsync(0.75);
     const br1 = await Brightness.getBrightnessAsync();
     const br2 = await Brightness.getSystemBrightnessAsync();
 };
@@ -373,10 +374,13 @@ async () => {
 };
 
 async () => {
-    const result = await ImageManipulator.manipulate('url', {
-        rotate: 90
-    }, {
-        compress: 0.5
+    const result = await ImageManipulator.manipulate('url', [
+        { rotate: 90 },
+        { resize: { width: 300 } },
+        { resize: { height: 300 } },
+        { resize: { height: 300, width: 300 } },
+    ], {
+        compress: 0.75
     });
 
     result.height;
@@ -400,6 +404,38 @@ async () => {
     result.faces[0];
 };
 
+async () => {
+    function isBoolean(x: boolean) {
+    }
+    function isString(x: string) {
+    }
+    // Two examples of members inherited from react-native Linking
+    // to prove that inheritence is working.
+    Linking.addEventListener('url', (e) => {
+        e.url === '';
+    });
+    isBoolean(await Linking.canOpenURL('expo://'));
+
+    // Extensions added by expo.
+
+    isString(Linking.makeUrl('path'));
+    isString(Linking.makeUrl('path', { q: 2, u: 'ery', }));
+
+    const {
+        path,
+        queryParams,
+    } = Linking.parse('');
+    isString(path);
+    isString(queryParams['x'] || '');
+
+    const {
+        path: path2,
+        queryParams: queryParams2,
+    } = await Linking.parseInitialURLAsync();
+    isString(path2);
+    isString(queryParams2['y'] || '');
+};
+
 () => (
     <Svg width={100} height={50}>
         <Svg.Rect
@@ -478,6 +514,7 @@ async () => {
             />
         </Svg.G>
         <Svg.Use href="#shape" x="20" y="0" />
+        <Svg.Use href="#shape" x="20" y="0" width="20" height="20"/>
         <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"/>
diff --git a/types/expo/index.d.ts b/types/expo/index.d.ts
index 952cd4a086..868afd5e56 100644
--- a/types/expo/index.d.ts
+++ b/types/expo/index.d.ts
@@ -9,8 +9,9 @@
 //                 Moshe Feuchtwanger <https://github.com/moshfeu>
 //                 Michael Prokopchuk <https://github.com/prokopcm>
 //                 Tina Roh <https://github.com/tinaroh>
+//                 Nathan Phillip Brink <https://github.com/binki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { EventSubscription } from 'fbemitter';
 import { Component, ComponentClass, Ref, ComponentType } from 'react';
@@ -18,6 +19,7 @@ import {
     ColorPropType,
     ImageRequireSource,
     ImageURISource,
+    LinkingStatic as ReactNativeLinkingStatic,
     NativeEventEmitter,
     ViewProps,
     ViewStyle,
@@ -27,7 +29,6 @@ import {
 
 export type Axis = number;
 export type BarCodeReadCallback = (params: { type: string; data: string; }) => void;
-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 Md5 = string;
 export type Orientation = 'portrait' | 'landscape';
 export type RequireSource = ImageRequireSource;
@@ -37,6 +38,7 @@ export type ResizeModeStretch = 'stretch';
 export type URISource = ImageURISource;
 
 export interface HashMap { [key: string]: any; }
+export interface StringHashMap { [key: string]: string; }
 
 /** Access the device accelerometer sensor(s) to respond to changes in acceleration in 3d space. */
 export namespace Accelerometer {
@@ -550,14 +552,16 @@ export type PlaybackStatus = {
 
 export interface PlaybackStatusToSet {
     androidImplementation?: string;
-    progressUpdateIntervalMillis?: number;
-    positionMillis?: number;
-    shouldPlay?: boolean;
-    rate?: FloatFromZeroToOne;
-    shouldCorrectPitch?: boolean;
-    volume?: FloatFromZeroToOne;
-    isMuted?: boolean;
     isLooping?: boolean;
+    isMuted?: boolean;
+    positionMillis?: number;
+    progressUpdateIntervalMillis?: number;
+    /** The desired playback rate of the media. This value must be between `0.0` and `32.0`. Only available on Android API version 23 and later and iOS. */
+    rate?: number;
+    shouldCorrectPitch?: boolean;
+    shouldPlay?: boolean;
+    /** A number between `0.0` (silence) and `1.0` (maximum volume). */
+    volume?: number;
 }
 
 export type PlaybackSource = RequireSource | { uri: string } | Asset;
@@ -670,7 +674,6 @@ export class PlaybackObject {
     setRateAsync(
         /** The desired playback rate of the media. This value must be between `0.0` and `32.0`. Only available on Android API version 23 and later and iOS. */
         rate: number,
-
         /** A boolean describing if we should correct the pitch for a changed rate. If set to `true`, the pitch of the audio will be corrected (so a rate different than `1.0` will timestretch the audio). */
         shouldCorrectPitch: boolean
     ): Promise<PlaybackStatus>;
@@ -732,13 +735,32 @@ export class BlurView extends Component<BlurViewProps> { }
 // #endregion
 
 /**
- * Brightness
+ * An API to get and set screen brightness.
  */
 export namespace Brightness {
-    function setBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
-    function getBrightnessAsync(): Promise<FloatFromZeroToOne>;
-    function getSystemBrightnessAsync(): Promise<FloatFromZeroToOne>;
-    function setSystemBrightnessAsync(brightnessValue: FloatFromZeroToOne): Promise<void>;
+    /** Sets screen brightness. */
+    function setBrightnessAsync(
+        /** A number between `0` and `1`, representing the desired screen brightness. */
+        brightnessValue: number
+    ): Promise<void>;
+
+    /**
+     * Gets screen brightness.
+     * @returns A Promise that is resolved with a number between `0` and `1`, representing the current screen brightness.
+     */
+    function getBrightnessAsync(): Promise<number>;
+
+    /**
+     * Gets global system screen brightness.
+     * @returns A Promise that is resolved with a number between `0` and `1`, representing the current system screen brightness.
+     */
+    function getSystemBrightnessAsync(): Promise<number>;
+
+    /** Sets global system screen brightness, requires `WRITE_SETTINGS` permissions on Android. */
+    function setSystemBrightnessAsync(
+        /** A number between `0` and `1`, representing the desired screen brightness. */
+        brightnessValue: number
+    ): Promise<void>;
 }
 
 // #region Camera
@@ -771,22 +793,24 @@ export class CameraObject {
 }
 
 export interface CameraProps extends ViewProps {
-    zoom?: FloatFromZeroToOne;
-    ratio?: string;
-    focusDepth?: FloatFromZeroToOne;
-    type?: string | number;
-    onCameraReady?: () => void;
-    onBarCodeRead?: BarCodeReadCallback;
+    autoFocus?: string | number | boolean;
+    barCodeTypes?: Array<string | number>;
+    faceDetectionClassifications?: number;
+    faceDetectionLandmarks?: number;
     faceDetectionMode?: number;
     flashMode?: string | number;
-    barCodeTypes?: Array<string | number>;
-    whiteBalance?: string | number;
-    faceDetectionLandmarks?: number;
-    autoFocus?: string | number | boolean;
-    faceDetectionClassifications?: number;
-    onMountError?: () => void;
+    /** Distance to plane of sharpest focus. A value between `0` and `1`. `0`: infinity focus, `1`: focus as close as possible. Default: `0`. For Android this is available only for some devices and when `useCamera2Api` is set to `true`. */
+    focusDepth?: number;
+    onBarCodeRead?: BarCodeReadCallback;
+    onCameraReady?: () => void;
     onFacesDetected?: (options: { faces: TrackedFaceFeature[] }) => void;
+    onMountError?: () => void;
+    ratio?: string;
     ref?: Ref<CameraObject>;
+    type?: string | number;
+    whiteBalance?: string | number;
+    /** A value between `0` and `1` being a percentage of device's max zoom. `0`: not zoomed, `1`: maximum zoom. Default: `0`. */
+    zoom?: number;
 }
 
 export interface CameraConstants {
@@ -1492,6 +1516,27 @@ export namespace Gyroscope {
  * ImageManipulator
  */
 export namespace ImageManipulator {
+    type Action = Resize | Rotate | Flip | Crop;
+
+    interface Resize {
+        resize: { width?: number, height?: number };
+    }
+
+    interface Rotate {
+        rotate: number;
+    }
+
+    interface Flip {
+        flip?: { vertical?: boolean; horizontal?: boolean };
+    }
+
+    interface Crop {
+        originX: number;
+        originY: number;
+        width: number;
+        height: number;
+    }
+
     interface ImageResult {
         uri: string;
         width: number;
@@ -1501,25 +1546,12 @@ export namespace ImageManipulator {
 
     interface SaveOptions {
         base64?: boolean;
-        compress?: FloatFromZeroToOne;
+        /** A value in range `0` - `1` specifying compression level of the result image. `1` means no compression and `0` the highest compression. */
+        compress?: number;
         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>;
+    function manipulate(uri: string, actions: Action[], saveOptions?: SaveOptions): Promise<ImageResult>;
 }
 
 /**
@@ -1683,6 +1715,21 @@ export interface LinearGradientProps {
 export class LinearGradient extends Component<LinearGradientProps> { }
 // #endregion
 
+/**
+ * Linking
+ */
+export interface LinkInfo {
+    path: string;
+    queryParams: Partial<StringHashMap>;
+}
+
+export interface LinkingStatic extends ReactNativeLinkingStatic {
+    makeUrl(path: string, queryParams?: HashMap): string;
+    parse(url: string): LinkInfo;
+    parseInitialURLAsync(): Promise<LinkInfo>;
+}
+export const Linking: LinkingStatic;
+
 /**
  * Location
  */
@@ -2076,6 +2123,8 @@ export interface SvgUseProps extends SvgCommonProps {
     href: string;
     x: number | string;
     y: number | string;
+    width?: number | string;
+    height?: number | string;
 }
 
 export interface SvgSymbolProps extends SvgCommonProps {
@@ -2222,6 +2271,7 @@ export interface VideoProps {
     translateY?: number;
     rotation?: number;
     ref?: Ref<PlaybackObject>;
+    style?: StyleProp<ViewStyle>;
 }
 
 export interface VideoState {
diff --git a/types/expo/v23/index.d.ts b/types/expo/v23/index.d.ts
index 4c33d8b13f..b5c327f6a1 100644
--- a/types/expo/v23/index.d.ts
+++ b/types/expo/v23/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/expo/expo-sdk
 // Definitions by: Konstantin Kai <https://github.com/KonstantinKai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { EventSubscription } from 'fbemitter';
 import { Component, Ref } from 'react';
diff --git a/types/expo/v24/index.d.ts b/types/expo/v24/index.d.ts
index 803ecccf32..35d1e9be92 100644
--- a/types/expo/v24/index.d.ts
+++ b/types/expo/v24/index.d.ts
@@ -6,7 +6,7 @@
 //                 Sergio Sánchez <https://github.com/ssanchezmarc>
 //                 Fernando Helwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { EventSubscription } from 'fbemitter';
 import { Component, ComponentClass, Ref, ComponentType } from 'react';
diff --git a/types/expo/v25/index.d.ts b/types/expo/v25/index.d.ts
index 0a7093e2b7..766c055911 100644
--- a/types/expo/v25/index.d.ts
+++ b/types/expo/v25/index.d.ts
@@ -7,7 +7,7 @@
 //                 Fernando Helwanger <https://github.com/fhelwanger>
 //                 Umidbek Karimov <https://github.com/umidbekkarimov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { EventSubscription } from 'fbemitter';
 import { Component, ComponentClass, Ref, ComponentType } from 'react';
diff --git a/types/expo/v26/index.d.ts b/types/expo/v26/index.d.ts
index f1641ea643..9804579e66 100644
--- a/types/expo/v26/index.d.ts
+++ b/types/expo/v26/index.d.ts
@@ -8,7 +8,7 @@
 //                 Umidbek Karimov <https://github.com/umidbekkarimov>
 //                 Tina Roh <https://github.com/tinaroh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { EventSubscription } from 'fbemitter';
 import { Component, ComponentClass, Ref, ComponentType } from 'react';
@@ -2202,6 +2202,7 @@ export interface VideoProps {
     translateY?: number;
     rotation?: number;
     ref?: Ref<PlaybackObject>;
+    style?: StyleProp<ViewStyle>;
 }
 
 export interface VideoState {
diff --git a/types/expo__status-bar-height/expo__status-bar-height-tests.ts b/types/expo__status-bar-height/expo__status-bar-height-tests.ts
new file mode 100644
index 0000000000..84dd284d12
--- /dev/null
+++ b/types/expo__status-bar-height/expo__status-bar-height-tests.ts
@@ -0,0 +1,11 @@
+import StatusBarHeight from '@expo/status-bar-height';
+
+const onChangeHeight = (height: number) => console.log(`New height: ${height}`);
+
+StatusBarHeight.addEventListener(onChangeHeight);
+
+StatusBarHeight.getAsync()
+  .then((height: number) => console.log(`Current height: ${height}`))
+  .catch((error: Error) => console.error('Threw an error in StatusBarHeight.getAsync():', error));
+
+StatusBarHeight.removeEventListener(onChangeHeight);
diff --git a/types/expo__status-bar-height/index.d.ts b/types/expo__status-bar-height/index.d.ts
new file mode 100644
index 0000000000..24331721da
--- /dev/null
+++ b/types/expo__status-bar-height/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for @expo/status-bar-height 0.0
+// Project: https://github.com/expo/status-bar-height
+// Definitions by: Janeene Beeforth <https://github.com/dawnmist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export type StatusBarHeightHandler = (height: number) => void;
+
+export class StatusBarHeight {
+  /**
+   * Get the current status bar height
+   */
+  getAsync(): Promise<number>;
+  /**
+   * Add 'willChange' event listener
+   */
+  addEventListener(handler: StatusBarHeightHandler): void;
+  /**
+   * Remove 'willChange' event listener
+   */
+  removeEventListener(handler: StatusBarHeightHandler): void;
+}
+
+declare const StatusBarHeightStatic: StatusBarHeight;
+export default StatusBarHeightStatic;
diff --git a/types/expo__status-bar-height/tsconfig.json b/types/expo__status-bar-height/tsconfig.json
new file mode 100644
index 0000000000..88649150a0
--- /dev/null
+++ b/types/expo__status-bar-height/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@expo/status-bar-height": [
+                "expo__status-bar-height"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "expo__status-bar-height-tests.ts"
+    ]
+}
diff --git a/types/expo__status-bar-height/tslint.json b/types/expo__status-bar-height/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/expo__status-bar-height/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/expo__vector-icons/expo__vector-icons-tests.tsx b/types/expo__vector-icons/expo__vector-icons-tests.tsx
index 14ccbc7aa4..7d918c917f 100644
--- a/types/expo__vector-icons/expo__vector-icons-tests.tsx
+++ b/types/expo__vector-icons/expo__vector-icons-tests.tsx
@@ -41,13 +41,9 @@ class Example extends React.Component {
 }
 
 class TabTest extends React.Component<{}, { selectedTab: string }> {
-  constructor() {
-    super({});
-
-    this.state = {
-      selectedTab: 'tab1'
-    };
-  }
+  state = {
+    selectedTab: 'tab1'
+  };
 
   render() {
     return (
diff --git a/types/expo__vector-icons/index.d.ts b/types/expo__vector-icons/index.d.ts
index 19aadf2a33..529142c0e9 100644
--- a/types/expo__vector-icons/index.d.ts
+++ b/types/expo__vector-icons/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/expo/vector-icons
 // Definitions by: Hyeonsu Lee <https://github.com/incleaf>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { TextProps } from 'react-native';
diff --git a/types/express-fileupload/index.d.ts b/types/express-fileupload/index.d.ts
index 89331c066a..060476b109 100644
--- a/types/express-fileupload/index.d.ts
+++ b/types/express-fileupload/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for express-fileupload 0.1
+// Type definitions for express-fileupload 0.4
 // Project: https://github.com/richardgirges/express-fileupload#readme
 // Definitions by: Gintautas Miselis <https://github.com/Naktibalda>
+//                 Sefa Ilkimen <https://github.com/silkimen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -28,13 +29,16 @@ declare namespace fileUpload {
         encoding: string;
         mimetype: string;
         data: Buffer;
+        truncated: boolean;
         mv(path: string, callback: (err: any) => void): void;
+        mv(path: string): Promise<void>;
     }
 
     interface Options {
         debug?: boolean;
         safeFileNames?: boolean;
         preserveExtension?: boolean | string | number;
+        abortOnLimit?: boolean;
         [property: string]: any;
     }
 }
diff --git a/types/express-redis-cache/express-redis-cache-tests.ts b/types/express-redis-cache/express-redis-cache-tests.ts
new file mode 100644
index 0000000000..3f8976c812
--- /dev/null
+++ b/types/express-redis-cache/express-redis-cache-tests.ts
@@ -0,0 +1,105 @@
+import express = require('express');
+import redis = require('redis');
+import expressRedisCache = require('express-redis-cache');
+
+const app = express();
+const cache = expressRedisCache();
+
+expressRedisCache({ host: 'localhsot', port: 6379, auth_pass: 'passw0rd' });
+expressRedisCache({ client: redis.createClient() });
+
+cache.on('error', (error) => {
+    throw new Error('Cache error!');
+});
+
+app.get('/',
+    cache.route(), // cache entry name is `cache.prefix + "/"`
+    (req, res, next) => { });
+
+app.get('/',
+    cache.route('home'), // cache entry name is now `cache.prefix + "home"`
+    (req, res, next) => { });
+
+app.get('/',
+    cache.route({ name: 'home' }), // cache entry name is `cache.prefix + "home"`
+    (req, res, next) => { });
+
+app.get('/user/:userid',
+    // middleware to define cache name
+    (req, res, next) => {
+        // set cache name
+        res.express_redis_cache_name = 'user-' + req.params.userid;
+        next();
+    },
+    // cache middleware
+    cache.route(),
+    // content middleware
+    (req, res) => {
+        res.render('user');
+    }
+);
+
+app.get('/user',
+    // middleware to decide if using cache
+    (req, res, next) => {
+        // Use only cache if user not signed in
+        res.use_express_redis_cache = !req.signedCookies.user;
+        next();
+    },
+    cache.route(), // this will be skipped if user is signed in
+    (req, res) => {
+        res.render('user');
+    }
+);
+
+// Prefix
+expressRedisCache({ prefix: 'test' });
+
+// Expiration
+expressRedisCache({ expire: 60 });
+
+app.get('/index.html',
+    cache.route({ expire: 5000 }), // cache entry will live 5000 seconds
+    (req, res) => { }
+);
+
+// You can also use the number sugar syntax
+cache.route(5000);
+// Or
+cache.route('index', 5000);
+
+app.get('/index.html',
+    cache.route({
+        expire: {
+            200: 5000,
+            '4xx': 10,
+            403: 5000,
+            '5xx': 10,
+            xxx: 1
+        }
+    }),
+    (req, res) => { }
+);
+
+cache.get((error, entries) => {
+    if (error) throw error;
+    entries.forEach(console.log);
+});
+
+cache.get('home', (error, entries) => {});
+
+cache.add(
+    'user:info',
+    JSON.stringify({ id: 1, email: 'john@doe.com' }),
+    { expire: 60 * 60 * 24, type: 'json' },
+    (error, added) => {}
+);
+
+cache.add(
+    'user:info',
+    JSON.stringify({ id: 1, email: 'john@doe.com' }),
+    (error, added) => {}
+);
+
+cache.del('home', (error, deleted) => {});
+cache.size((error, bytes) => {});
diff --git a/types/express-redis-cache/index.d.ts b/types/express-redis-cache/index.d.ts
new file mode 100644
index 0000000000..ffd8c844a6
--- /dev/null
+++ b/types/express-redis-cache/index.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for express-redis-cache 1.1
+// Project: https://github.com/rv-kip/express-redis-cache
+// Definitions by: AJ Livingston <https://github.com/ajliv>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import events = require('events');
+import express = require('express');
+import redis = require('redis');
+
+declare module 'express-serve-static-core' {
+    interface Response {
+        express_redis_cache_name?: string;
+        use_express_redis_cache?: boolean;
+    }
+}
+
+declare function expressRedisCache(options?: expressRedisCache.Options): expressRedisCache.ExpressRedisCache;
+declare namespace expressRedisCache {
+    class ExpressRedisCache extends events.EventEmitter {
+        constructor(options?: Options);
+        static init(options?: Options): ExpressRedisCache;
+        readonly FOREVER: number;
+        options: Options;
+        host: string;
+        port: string | number;
+        prefix: string;
+        auth_pass: string;
+        connected: boolean;
+        expire: number;
+        client: redis.RedisClient;
+        add(name: string, body: string, options: AddOptions, callback: (error: any, added: Entry) => void): void;
+        add(name: string, body: string, callback: (error: any, added: Entry) => void): void;
+        del(name: string, callback: (error: any, deleted: number) => void): void;
+        get(name: string, callback: (error: any, entries: Entry[]) => void): void;
+        get(callback: (error: any, entries: Entry[]) => void): void;
+        route(nameOrOptions: string | RouteOptions, expire?: ExpireOption): express.RequestHandler;
+        route(expire?: number): express.RequestHandler;
+        size(callback: (error: any, bytes: number) => void): void;
+    }
+
+    interface AddOptions {
+        type?: string;
+        expire?: number;
+    }
+
+    interface Entry {
+        body: string;
+        touched: number;
+        expire: number;
+        type: string;
+    }
+
+    interface ExpirationConfig {
+        [statusCode: string]: number;
+    }
+
+    type ExpireOption = number | ExpirationConfig;
+    type ExpirationPolicy = (req: express.Request, res: express.Response) => number;
+
+    interface Options {
+        auth_pass?: string;
+        client?: redis.RedisClient;
+        expire?: number;
+        host?: string;
+        port?: string | number;
+        prefix?: string;
+    }
+
+    interface RouteOptions {
+        name?: string;
+        expire?: ExpireOption | ExpirationPolicy;
+        binary?: boolean;
+    }
+}
+
+export = expressRedisCache;
diff --git a/types/express-redis-cache/tsconfig.json b/types/express-redis-cache/tsconfig.json
new file mode 100644
index 0000000000..7884be049e
--- /dev/null
+++ b/types/express-redis-cache/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",
+        "express-redis-cache-tests.ts"
+    ]
+}
diff --git a/types/express-redis-cache/tslint.json b/types/express-redis-cache/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-redis-cache/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-wechat-access/express-wechat-access-tests.ts b/types/express-wechat-access/express-wechat-access-tests.ts
new file mode 100644
index 0000000000..60cc5d9d88
--- /dev/null
+++ b/types/express-wechat-access/express-wechat-access-tests.ts
@@ -0,0 +1,18 @@
+import express = require('express');
+import * as weAccessMiddleware from 'express-wechat-access';
+
+const app: express.Application = express();
+
+const options: weAccessMiddleware.WeAccessMidOption = {
+    appId: 'xxxxx',
+    appSecret: 'xxxxx'
+};
+
+app.use(
+    weAccessMiddleware(
+        options,
+        e => {
+            console.error(e);
+        }
+    )
+);
diff --git a/types/express-wechat-access/index.d.ts b/types/express-wechat-access/index.d.ts
new file mode 100644
index 0000000000..fb0d58701d
--- /dev/null
+++ b/types/express-wechat-access/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for express-wechat-access 1.1
+// Project: https://github.com/simmons8616/express-wechat-access
+// Definitions by: Simmons Zhang <https://github.com/simmons8616>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Response, NextFunction } from 'express';
+import * as http from 'http';
+import { EventEmitter } from 'events';
+
+type WeMiddleware = (req: any, res: Response | http.ServerResponse, next: NextFunction) => any;
+
+declare function weAccessMiddleware(
+    options: {
+        accessTokenUrl?: string;
+        ticketUrl?: string;
+        appId: string;
+        appSecret: string;
+        https?: boolean;
+    },
+    errorHandler?: (e: any) => any
+): WeMiddleware;
+
+declare namespace weAccessMiddleware {
+    interface WeAccessMidOption {
+        accessTokenUrl?: string;
+        ticketUrl?: string;
+        appId: string;
+        appSecret: string;
+        https?: boolean;
+    }
+
+    interface WeAccessMiddleware extends WeMiddleware, EventEmitter, Function {}
+}
+
+export = weAccessMiddleware;
diff --git a/types/express-wechat-access/tsconfig.json b/types/express-wechat-access/tsconfig.json
new file mode 100644
index 0000000000..e24d740f2c
--- /dev/null
+++ b/types/express-wechat-access/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",
+        "express-wechat-access-tests.ts"
+    ]
+}
diff --git a/types/express-wechat-access/tslint.json b/types/express-wechat-access/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/express-wechat-access/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/express-winston/express-winston-tests.ts b/types/express-winston/express-winston-tests.ts
index 5671160de0..f370abdb5d 100644
--- a/types/express-winston/express-winston-tests.ts
+++ b/types/express-winston/express-winston-tests.ts
@@ -23,26 +23,22 @@ app.use(expressWinston.logger({
   skip: (req, res) => false,
   statusLevels: ({ error: 'error', success: 'success', warn: 'warn' }),
   transports: [
-    new winston.transports.Console({
-      json: true,
-      colorize: true
-    })
+    new winston.transports.Console({})
   ]
 }));
 
 // Logger with minimum options (transport)
 app.use(expressWinston.logger({
   transports: [
-    new winston.transports.Console({
-      json: true,
-      colorize: true
-    })
+    new winston.transports.Console({})
   ],
 }));
 
+const logger = winston.createLogger();
+
 // Logger with minimum options (winstonInstance)
 app.use(expressWinston.logger({
-  winstonInstance: winston,
+  winstonInstance: logger,
 }));
 
 // Error Logger with all options
@@ -55,26 +51,20 @@ app.use(expressWinston.errorLogger({
   requestFilter: (req, prop) => true,
   requestWhitelist: ['foo', 'bar'],
   transports: [
-    new winston.transports.Console({
-      json: true,
-      colorize: true
-    })
+    new winston.transports.Console({})
   ]
 }));
 
 // Error Logger with min options (transports)
 app.use(expressWinston.errorLogger({
   transports: [
-    new winston.transports.Console({
-      json: true,
-      colorize: true
-    })
+    new winston.transports.Console({})
   ],
 }));
 
 // Error Logger with min options (winstonInstance)
 app.use(expressWinston.errorLogger({
-  winstonInstance: winston,
+  winstonInstance: logger,
 }));
 
 expressWinston.bodyBlacklist.push('potato');
diff --git a/types/express-winston/index.d.ts b/types/express-winston/index.d.ts
index e6184f64b9..462f3df1b3 100644
--- a/types/express-winston/index.d.ts
+++ b/types/express-winston/index.d.ts
@@ -1,11 +1,12 @@
-// Type definitions for express-winston 2.4
+// Type definitions for express-winston 3.0
 // 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';
+import * as winston from 'winston';
+import * as Transport from 'winston-transport';
 
 export type DynamicMetaFunction = (req: Request, res: Response, err: Error) => object;
 export type DynamicLevelFunction = (req: Request, res: Response, err: Error) => string;
@@ -39,11 +40,11 @@ export interface BaseLoggerOptions {
 }
 
 export interface LoggerOptionsWithTransports extends BaseLoggerOptions {
-  transports: TransportInstance[];
+  transports: Transport[];
 }
 
 export interface LoggerOptionsWithWinstonInstance extends BaseLoggerOptions {
-  winstonInstance: Winston;
+  winstonInstance: winston.Logger;
 }
 
 export type LoggerOptions = LoggerOptionsWithTransports | LoggerOptionsWithWinstonInstance;
@@ -61,11 +62,11 @@ export interface BaseErrorLoggerOptions {
 }
 
 export interface ErrorLoggerOptionsWithTransports extends BaseErrorLoggerOptions {
-  transports: TransportInstance[];
+  transports: Transport[];
 }
 
 export interface ErrorLoggerOptionsWithWinstonInstance extends BaseErrorLoggerOptions {
-  winstonInstance: Winston;
+  winstonInstance: winston.Logger;
 }
 
 export type ErrorLoggerOptions = ErrorLoggerOptionsWithTransports | ErrorLoggerOptionsWithWinstonInstance;
diff --git a/types/express-winston/package.json b/types/express-winston/package.json
new file mode 100644
index 0000000000..0aa4cf368f
--- /dev/null
+++ b/types/express-winston/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "winston": "^3.0.0"
+    }
+}
diff --git a/types/extsprintf/extsprintf-tests.ts b/types/extsprintf/extsprintf-tests.ts
new file mode 100644
index 0000000000..4b45462487
--- /dev/null
+++ b/types/extsprintf/extsprintf-tests.ts
@@ -0,0 +1,8 @@
+import { sprintf, fprintf, printf } from "extsprintf";
+
+fprintf({write: (s: string) => {}}, '');
+fprintf({write: (s: string) => {}}, '', {}, [], null, 0, '');
+printf('');
+printf('', {}, [], null, 0, '');
+sprintf(''); // $ExpectType string
+sprintf('', {}, [], null, 0, ''); // $ExpectType string
diff --git a/types/extsprintf/index.d.ts b/types/extsprintf/index.d.ts
new file mode 100644
index 0000000000..29d073b4c5
--- /dev/null
+++ b/types/extsprintf/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for extsprintf 1.4
+// Project: https://github.com/joyent/node-extsprintf#readme
+// Definitions by: Alex Hankins <https://github.com/AlexHankins>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Stream {
+    write(str: string): void;
+}
+
+export function fprintf(stream: Stream, format: string, ...args: any[]): any;
+export function printf(format: string, ...args: any[]): any;
+export function sprintf(format: string, ...args: any[]): string;
diff --git a/types/extsprintf/tsconfig.json b/types/extsprintf/tsconfig.json
new file mode 100644
index 0000000000..bc9783f347
--- /dev/null
+++ b/types/extsprintf/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",
+        "extsprintf-tests.ts"
+    ]
+}
diff --git a/types/extsprintf/tslint.json b/types/extsprintf/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/extsprintf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fabric/fabric-impl.d.ts b/types/fabric/fabric-impl.d.ts
index 07c1227706..783a4f41f7 100644
--- a/types/fabric/fabric-impl.d.ts
+++ b/types/fabric/fabric-impl.d.ts
@@ -851,6 +851,12 @@ interface IStaticCanvasOptions {
 	 * Indicates whether the browser can be scrolled when using a touchscreen and dragging on the canvas
 	 */
 	allowTouchScrolling?: boolean;
+
+	/**
+	 * When true, canvas is scaled by devicePixelRatio for better rendering on retina screens
+	 */
+	enableRetinaScaling?: boolean;
+
 	/**
 	 * Indicates whether this canvas will use image smoothing, this is on by default in browsers
 	 */
@@ -1644,11 +1650,6 @@ export class Group {
 	 * @chainable
 	 */
 	destroy(): Group;
-	/**
-	 * Returns requested property
-	 * @param prop Property to get
-	 */
-	get(prop: string): any;
 	/**
 	 * Checks whether this group was moved (since `saveCoords` was called last)
 	 * @return true if an object was moved (since fabric.Group#saveCoords was called)
@@ -1867,7 +1868,7 @@ export class Image {
 	 * @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) => void, objObjects?: IObjectOptions): Image;
+	static fromURL(url: string, callback?: (image: Image) => void, imgOptions?: IImageOptions): Image;
 	/**
 	 * Creates an instance of fabric.Image from its object representation
 	 * @param object Object to create an instance from
@@ -1997,7 +1998,17 @@ interface IObjectOptions {
 	 */
 	scaleY?: number;
 
-	/**
+    /**
+     * Object skew factor (horizontal)
+     */
+    skewX?: number;
+
+    /**
+     * Object skew factor (vertical)
+     */
+    skewY?: number;
+
+    /**
 	 * When true, an object is rendered as flipped horizontally
 	 */
 	flipX?: boolean;
@@ -2307,7 +2318,13 @@ export class Object {
 	getScaleY(): number;
 	setScaleY(value: number): Object;
 
-	setShadow(options: any): Object;
+    getSkewX(): number;
+    setSkewX(value: number): Object;
+
+    getSkewY(): number;
+    setSkewY(value: number): Object;
+
+    setShadow(options: any): Object;
 	getShadow(): Object;
 
 	stateProperties: any[];
@@ -2678,9 +2695,11 @@ export class Object {
 	setCoords(): this;
 	/**
 	 * Returns coordinates of object's bounding rectangle (left, top, width, height)
+     * @param absoluteopt use coordinates without viewportTransform
+     * @param calculateopt use coordinates of current position instead of .oCoords / .aCoords
 	 * @return Object with left, top, width, height properties
 	 */
-	getBoundingRect(): { left: number; top: number; width: number; height: number };
+	getBoundingRect(absoluteopt?: boolean, calculateopt?: boolean): { left: number; top: number; width: number; height: number };
 	/**
 	 * Checks if object is fully contained within area of another object
 	 * @param other Object to test
diff --git a/types/fabric/test/index.ts b/types/fabric/test/index.ts
index 1060525a00..9a5c0b24d2 100644
--- a/types/fabric/test/index.ts
+++ b/types/fabric/test/index.ts
@@ -872,7 +872,7 @@ laboris nisi ut aliquip ex ea commodo consequat.`;
       const activeObject = <fabric.Text> canvas.getActiveObject();
       if (activeObject && activeObject.type === 'text') {
         activeObject.textDecoration = (activeObject.textDecoration === 'underline' ? '' : 'underline');
-        this.className = activeObject.textDecoration ? 'selected' : '';
+        (this as HTMLElement).className = activeObject.textDecoration ? 'selected' : '';
         canvas.renderAll();
       }
     };
@@ -885,7 +885,7 @@ laboris nisi ut aliquip ex ea commodo consequat.`;
       const activeObject = <fabric.Text> canvas.getActiveObject();
       if (activeObject && activeObject.type === 'text') {
         activeObject.textDecoration = (activeObject.textDecoration === 'line-through' ? '' : 'line-through');
-        this.className = activeObject.textDecoration ? 'selected' : '';
+        (this as HTMLElement).className = activeObject.textDecoration ? 'selected' : '';
         canvas.renderAll();
       }
     };
@@ -898,7 +898,7 @@ laboris nisi ut aliquip ex ea commodo consequat.`;
       const activeObject = <fabric.Text> canvas.getActiveObject();
       if (activeObject && activeObject.type === 'text') {
         activeObject.textDecoration = (activeObject.textDecoration === 'overline' ? '' : 'overline');
-        this.className = activeObject.textDecoration ? 'selected' : '';
+        (this as HTMLElement).className = activeObject.textDecoration ? 'selected' : '';
         canvas.renderAll();
       }
     };
@@ -911,7 +911,7 @@ laboris nisi ut aliquip ex ea commodo consequat.`;
       const activeObject = <fabric.Text> canvas.getActiveObject();
       if (activeObject && activeObject.type === 'text') {
         activeObject.fontWeight = (activeObject.fontWeight === 'bold' ? '' : 'bold');
-        this.className = activeObject.fontWeight ? 'selected' : '';
+        (this as HTMLElement).className = activeObject.fontWeight ? 'selected' : '';
         canvas.renderAll();
       }
     };
@@ -924,7 +924,7 @@ laboris nisi ut aliquip ex ea commodo consequat.`;
       const activeObject = <fabric.Text> canvas.getActiveObject();
       if (activeObject && activeObject.type === 'text') {
         activeObject.fontStyle = (activeObject.fontStyle === 'italic' ? '' : 'italic');
-        this.className = activeObject.fontStyle ? 'selected' : '';
+        (this as HTMLElement).className = activeObject.fontStyle ? 'selected' : '';
         canvas.renderAll();
       }
     };
@@ -937,7 +937,7 @@ laboris nisi ut aliquip ex ea commodo consequat.`;
       const activeObject = <fabric.Text> canvas.getActiveObject();
       if (activeObject && activeObject.type === 'text') {
         activeObject.shadow = !activeObject.shadow ? 'rgba(0,0,0,0.2) 2px 2px 10px' : '';
-        this.className = activeObject.shadow ? 'selected' : '';
+        (this as HTMLElement).className = activeObject.shadow ? 'selected' : '';
         canvas.renderAll();
       }
     };
diff --git a/types/facebook-js-sdk/facebook-js-sdk-tests.ts b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
index 9652dbb86f..6b400a10a7 100644
--- a/types/facebook-js-sdk/facebook-js-sdk-tests.ts
+++ b/types/facebook-js-sdk/facebook-js-sdk-tests.ts
@@ -8,25 +8,22 @@ FB.init({
    xfbml: true
 });
 
-FB.getLoginStatus(function(response: fb.AuthResponse) {
+FB.getLoginStatus(function(response: fb.StatusResponse) {
     console.log(response);
     console.log(response.status);
     console.log(response.authResponse.accessToken);
 });
 
-FB.getLoginStatus(function(response: fb.AuthResponse) {
+FB.getLoginStatus(function(response: fb.StatusResponse) {
     console.log(response);
     console.log(response.status);
     console.log(response.authResponse.accessToken);
 }, true);
 
-FB.getAuthResponse(function(response: fb.AuthResponse) {
-    console.log(response);
-    console.log(response.status);
-    console.log(response.authResponse.accessToken);
-});
+const authResponse: fb.AuthResponse = FB.getAuthResponse();
+console.log(authResponse.accessToken);
 
-FB.login(function(response: fb.AuthResponse) {
+FB.login(function(response: fb.StatusResponse) {
     console.log(response);
     console.log(response.status);
     console.log(response.authResponse.accessToken);
@@ -34,7 +31,7 @@ FB.login(function(response: fb.AuthResponse) {
     scope: 'public_profile'
 });
 
-FB.logout(function(response: fb.AuthResponse) {
+FB.logout(function(response: fb.StatusResponse) {
     console.log(response);
     console.log(response.status);
     console.log(response.authResponse.accessToken);
diff --git a/types/facebook-js-sdk/index.d.ts b/types/facebook-js-sdk/index.d.ts
index be9f71f6c9..8a635d8995 100644
--- a/types/facebook-js-sdk/index.d.ts
+++ b/types/facebook-js-sdk/index.d.ts
@@ -1,12 +1,14 @@
 // Type definitions for the Facebook Javascript SDK 2.8
 // Project: https://developers.facebook.com/docs/javascript
-// Definitions by: Amrit Kahlon <https://github.com/amritk>
+// Definitions by:  Amrit Kahlon    <https://github.com/amritk>
+//                  Mahmoud Zohdi   <https://github.com/mahmoudzohdi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import fb = facebook;
 declare var FB: fb.FacebookStatic;
 declare namespace facebook {
-
+    
+    
     interface FacebookStatic {
         api: any;
         AppEvents: any;
@@ -18,15 +20,17 @@ declare namespace facebook {
          * The synchronous nature of this method is what sets it apart from the other login methods.
          *
          * @param callback function to handle the response.
+         * 
+         * This method is similar in nature to FB.getLoginStatus(), but it returns just the authResponse object.
          */
-        getAuthResponse(callback: (response: AuthResponse) => void): void;
+        getAuthResponse(): AuthResponse;
         /**
          * FB.getLoginStatus() allows you to determine if a user is
          * logged in to Facebook and has authenticated your app.
          *
          * @param callback function to handle the response.
          */
-        getLoginStatus(callback: (response: AuthResponse) => void, roundtrip?: boolean ): void;
+        getLoginStatus(callback: (response: StatusResponse) => void, roundtrip?: boolean ): void;
         /**
          * The method FB.init() is used to initialize and setup the SDK.
          *
@@ -43,13 +47,13 @@ declare namespace facebook {
          * @param callback function to handle the response.
          * @param options optional ILoginOption to add params such as scope.
          */
-        login(callback: (response: AuthResponse) => void, options?: LoginOptions): void;
+        login(callback: (response: StatusResponse) => void, options?: LoginOptions): void;
         /**
          * The method FB.logout() logs the user out of your site and, in some cases, Facebook.
          *
          * @param callback function to handle the response
          */
-        logout(callback: (response: AuthResponse) => void): void;
+        logout(callback: (response: StatusResponse) => void): void;
 
         /**
          * @see https://developers.facebook.com/docs/sharing/reference/share-dialog
@@ -180,16 +184,17 @@ declare namespace facebook {
     //  RESPONSES
     //
     ////////////////////////
-
     interface AuthResponse {
+        accessToken: string;
+        expiresIn: number;
+        signedRequest: string;
+        userID: string;
+        grantedScopes?: string;
+    }
+    
+    interface StatusResponse {
         status: string;
-        authResponse: {
-            accessToken: string;
-            expiresIn: number;
-	        grantedScopes: string;
-            signedRequest: string;
-            userID: string;
-        };
+        authResponse: AuthResponse;
     }
 
     interface ShareDialogResponse {
diff --git a/types/faker/index.d.ts b/types/faker/index.d.ts
index 552e7d3eeb..248a0ba96c 100644
--- a/types/faker/index.d.ts
+++ b/types/faker/index.d.ts
@@ -11,7 +11,8 @@ declare const fakerStatic: Faker.FakerStatic;
 declare namespace Faker {
 	interface FakerStatic {
 		locale: string;
-
+		setLocale(locale: string): void;
+		
 		address: {
 			zipCode(format?: string): string;
 			city(format?: number): string;
diff --git a/types/feathersjs__authentication-client/index.d.ts b/types/feathersjs__authentication-client/index.d.ts
index 9d1972bebc..6594fb7e95 100644
--- a/types/feathersjs__authentication-client/index.d.ts
+++ b/types/feathersjs__authentication-client/index.d.ts
@@ -53,7 +53,7 @@ export interface Passport {
 
     getJWT(): Promise<any>;
 
-    verifyJWT(token: string): Promise<string>;
+    verifyJWT(token: string): Promise<any>;
 
     payloadIsValid(payload: string): boolean;
 
diff --git a/types/feathersjs__authentication-jwt/index.d.ts b/types/feathersjs__authentication-jwt/index.d.ts
index ab6a7f6dbe..7a555071d9 100644
--- a/types/feathersjs__authentication-jwt/index.d.ts
+++ b/types/feathersjs__authentication-jwt/index.d.ts
@@ -8,7 +8,7 @@ import { Application } from '@feathersjs/feathers';
 import { Request } from 'express';
 import * as self from '@feathersjs/authentication-jwt';
 
-declare const feathersAuthenticationJwt: ((options?: FeathersAuthenticationJWTOptions) => () => void) & typeof self;
+declare const feathersAuthenticationJwt: ((options?: Partial<FeathersAuthenticationJWTOptions>) => () => void) & typeof self;
 export default feathersAuthenticationJwt;
 
 export interface FeathersAuthenticationJWTOptions {
@@ -43,10 +43,10 @@ export interface FeathersAuthenticationJWTOptions {
     /**
      * A Verifier class. Defaults to the built-in one but can be a custom one. See below for details.
      */
-    Verifier: JWTVerifier;
+    Verifier: typeof Verifier;
 }
 
-export class JWTVerifier {
+export class Verifier {
     constructor(app: Application, options: any); // the class constructor
 
     verify(req: Request, payload: any, done: (error: any, user?: any, info?: any) => void): void;
diff --git a/types/feathersjs__feathers/index.d.ts b/types/feathersjs__feathers/index.d.ts
index b3a0f60667..1e448dbf4f 100644
--- a/types/feathersjs__feathers/index.d.ts
+++ b/types/feathersjs__feathers/index.d.ts
@@ -14,6 +14,7 @@ declare const feathers: (() => Application<object>) & typeof self;
 export default feathers;
 
 export const version: string;
+export const SKIP: SkipSymbol;
 
 export type Id = number | string;
 export type NullableId = Id | null;
@@ -45,7 +46,9 @@ export interface Paginated<T> {
 }
 
 // tslint:disable-next-line void-return
-export type Hook = (hook: HookContext) => (Promise<HookContext> | void);
+export type Hook = (hook: HookContext) => (Promise<HookContext | SkipSymbol | void> | HookContext | SkipSymbol | void);
+
+export type SkipSymbol = symbol | '__feathersSkipHooks';
 
 export interface HookContext<T = any> {
     app?: Application;
diff --git a/types/ffi-napi/ffi-napi-tests.ts b/types/ffi-napi/ffi-napi-tests.ts
new file mode 100644
index 0000000000..5965e23e12
--- /dev/null
+++ b/types/ffi-napi/ffi-napi-tests.ts
@@ -0,0 +1,106 @@
+import ffi = require('ffi-napi');
+import ref = require('ref-napi');
+import Struct = require('ref-struct-di');
+import Union = require('ref-union-di');
+import TArray = require('ref-array-di');
+
+{
+    const sqlite3 = ref.types.void;
+    const sqlite3Ptr = ref.refType(sqlite3);
+    const sqlite3PtrPtr = ref.refType(sqlite3Ptr);
+    const stringPtr = ref.refType(ref.types.CString);
+
+    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 ]]
+    });
+
+    const dbPtrPtr = ref.alloc(sqlite3PtrPtr);
+    libsqlite3.sqlite3_open("test.sqlite3", dbPtrPtr);
+}
+{
+    const func = ffi.ForeignFunction(new Buffer(10), 'int', [ 'int' ]);
+    func(-5);
+    func.async(-5, (err: any, res: any) => {});
+}
+{
+    const funcPtr = ffi.Callback('int', [ 'int' ], Math.abs);
+    const func    = ffi.ForeignFunction(funcPtr, 'int', [ 'int' ]);
+}
+{
+    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));
+    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));
+}
+{
+    const str = ref.readCString(new Buffer('hello\0world\0'), 0);
+    const buf = ref.alloc('int64');
+    ref.writeInt64BE(buf, 0, '9223372036854775807');
+    const val = ref.readInt64BE(buf, 0);
+}
+{
+    const voidPtrType = ref.refType(ref.types.void);
+    const buf = ref.alloc('int64');
+    ref.writeInt64LE(buf, 0, '9223372036854775807');
+}
+{
+    const S1 = Struct({ a: ref.types.int });
+    const S2 = new Struct({ a: 'int' });
+}
+{
+    const P = new Struct();
+    P.defineProperty('a', ref.types.int);
+    P.defineProperty('d', 'long');
+}
+{
+    const SimpleStruct = Struct({
+        first : ref.types.byte,
+        last  : ref.types.byte
+    });
+
+    const ss = new SimpleStruct({ first: 50, last: 100 });
+    ss.first += 200;
+}
+{
+    const ST = Struct();
+    const test: ref.Type = ST.fields['t'].type;
+}
+{
+    const CharArray = TArray('char');
+    const b = new Buffer('hello', 'ascii');
+    const a = new CharArray(b);
+}
+{
+    const Int32Array = TArray(ref.types.int32);
+    const input = [1, 4, 91, 123123, 5123512, 0, -1];
+    const a = new Int32Array(input);
+}
+{
+    const int = ref.types.int;
+    const IntArray = TArray(int);
+
+    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);
+
+    const array = IntArray.untilZeros(buf);
+}
+{
+    const refCharArr = TArray('char')([1, 3, 5], 2).ref();
+}
diff --git a/types/ffi-napi/index.d.ts b/types/ffi-napi/index.d.ts
new file mode 100644
index 0000000000..6cfd439e13
--- /dev/null
+++ b/types/ffi-napi/index.d.ts
@@ -0,0 +1,186 @@
+// Type definitions for node-ffi-napi 2.4
+// Project: https://github.com/node-ffi/node-ffi
+// Definitions by: Keerthi Niranjan <https://github.com/keerthi16>, Kiran Niranjan <https://github.com/KiranNiranjan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+
+import ref = require('ref-napi');
+import StructType = require('ref-struct-di');
+
+/** Provides a friendly API on-top of `DynamicLibrary` and `ForeignFunction`. */
+export interface Library {
+    /** The extension to use on libraries. */
+    EXT: string;
+
+    /**
+     * @param libFile name of 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;
+
+    /**
+     * @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;
+}
+export const Library: Library;
+
+/** Get value of errno. */
+export function errno(): number;
+
+export interface Function extends ref.Type {
+    /** The type of return value. */
+    retType: ref.Type;
+    /** The type of arguments. */
+    argTypes: ref.Type[];
+    /** Is set for node-ffi functions. */
+    ffi_type: Buffer;
+    abi: number;
+
+    /** Get a `Callback` pointer of this function type. */
+    toPointer(fn: (...args: any[]) => any): Buffer;
+    /** Get a `ForeignFunction` of this function type. */
+    toFunction(buf: Buffer): ForeignFunction;
+}
+
+/** Creates and returns a type for a C function pointer. */
+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 {
+    (...args: any[]): any;
+    async(...args: any[]): void;
+}
+
+/**
+ * Represents a foreign function in another library. Manages all of the aspects
+ * of function execution, including marshalling the data parameters for the
+ * function into native types and also unmarshalling the return from function
+ * execution.
+ */
+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 {
+    /**
+     * What gets returned is another function that needs to be invoked with the rest
+     * of the variadic types that are being invoked from the function.
+     */
+    (...args: any[]): ForeignFunction;
+
+    /**
+     * Return type as a property of the function generator to
+     * allow for monkey patching the return value in the very rare case where the
+     * return type is variadic as well
+     */
+    returnType: any;
+}
+
+/**
+ * For when you want to call to a C function with variable amount of arguments.
+ * i.e. `printf`.
+ *
+ * This function takes care of caching and reusing `ForeignFunction` instances that
+ * contain the same ffi_type argument signature.
+ */
+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 {
+    /** Close library, returns the result of the `dlclose` system function. */
+    close(): number;
+    /** Get a symbol from this library. */
+    get(symbol: string): Buffer;
+    /** Get the result of the `dlerror` system function. */
+    error(): string;
+}
+
+/**
+ * This class loads and fetches function pointers for dynamic libraries
+ * (.so, .dylib, etc). After the libray's function pointer is acquired, then you
+ * call `get(symbol)` to retreive a pointer to an exported symbol. You need to
+ * call `get___` on the pointer to dereference it into its actual value, or
+ * turn the pointer into a callable function with `ForeignFunction`.
+ */
+export const DynamicLibrary: {
+    FLAGS: {
+        RTLD_LAZY: number;
+        RTLD_NOW: number;
+        RTLD_LOCAL: number;
+        RTLD_GLOBAL: number;
+        RTLD_NOLOAD: number;
+        RTLD_NODELETE: number;
+        RTLD_NEXT: Buffer;
+        RTLD_DEFAUL: Buffer;
+    }
+
+    new (path?: string, mode?: number): DynamicLibrary;
+    (path?: string, mode?: number): DynamicLibrary;
+};
+
+/**
+ * Turns a JavaScript function into a C function pointer.
+ * The function pointer may be used in other C functions that
+ * accept C callback functions.
+ */
+export interface 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 const Callback: Callback;
+
+export const ffiType: {
+    /** Get a `ffi_type *` Buffer appropriate for the given type. */
+    (type: ref.Type | string): Buffer
+    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 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;
+    int8: ref.Type;                 ulong: ref.Type;                 Object: ref.Type;
+    uint8: ref.Type;                longlong: ref.Type;              CString: ref.Type;
+    int16: ref.Type;                ulonglong: ref.Type;             bool: ref.Type;
+    uint16: ref.Type;               char: ref.Type;                  byte: ref.Type;
+    int32: ref.Type;                uchar: ref.Type;                 size_t: ref.Type;
+    uint32: ref.Type;               short: ref.Type;
+};
diff --git a/types/ffi-napi/node-ffi-napi-buffer.d.ts b/types/ffi-napi/node-ffi-napi-buffer.d.ts
new file mode 100644
index 0000000000..fa817e1662
--- /dev/null
+++ b/types/ffi-napi/node-ffi-napi-buffer.d.ts
@@ -0,0 +1,50 @@
+// DefinitelyTyped: partial
+
+interface Buffer {
+	/** Shorthand for `ref.address`. */
+	address(): number;
+	/** Shorthand for `ref.deref`. */
+	deref(): any;
+	/** Shorthand for `ref.isNull`. */
+	isNull(): boolean;
+	/** Shorthand for `ref.readCString`. */
+	readCString(offset?: number): string;
+	/** Shorthand for `ref.readInt64BE`. */
+	readInt64BE(offset?: number): string;
+	/** Shorthand for `ref.readInt64LE`. */
+	readInt64LE(offset?: number): string;
+	/** Shorthand for `ref.readObject`. */
+	readObject(offset?: number): string;
+	/** Shorthand for `ref.readPointer`. */
+	readPointer(offset?: number): string;
+	/** Shorthand for `ref.readUInt64BE`. */
+	readUInt64BE(offset?: number): string;
+	/** Shorthand for `ref.readUInt64LE`. */
+	readUInt64LE(offset?: number): string;
+	/** Shorthand for `ref.ref`. */
+	ref(): Buffer;
+	/** Shorthand for `ref.reinterpret`. */
+	reinterpret(size: number, offset?: number): Buffer;
+	/** Shorthand for `ref.reinterpretUntilZeros`. */
+	reinterpretUntilZeros(size: number, offset?: number): Buffer;
+	/** Shorthand for `ref.writeCString`. */
+	writeCString(offset: number, input: string, encoding?: string): void;
+	/** Shorthand for `ref.writeInt64BE`. */
+	writeInt64BE(offset: number, input: number | string): any;
+	/** Shorthand for `ref.writeInt64LE`. */
+	writeInt64LE(offset: number, input: number | string): any;
+	/** Shorthand for `ref.writeObject`. */
+	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 | string): any;
+	/** Shorthand for `ref.writeUInt64LE`. */
+	writeUInt64LE(offset: number, input: number | string): any;
+
+	/**
+	 * Generate string for inspecting.
+	 * String includes the hex-encoded memory address of the Buffer instance.
+	 */
+	inspect(): string;
+}
diff --git a/types/ffi-napi/tsconfig.json b/types/ffi-napi/tsconfig.json
new file mode 100644
index 0000000000..c914c55679
--- /dev/null
+++ b/types/ffi-napi/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
+    },
+    "files": [
+        "index.d.ts",
+        "node-ffi-napi-buffer.d.ts",
+        "ffi-napi-tests.ts"
+    ]
+}
diff --git a/types/ffi-napi/tslint.json b/types/ffi-napi/tslint.json
new file mode 100644
index 0000000000..c5fa24ca82
--- /dev/null
+++ b/types/ffi-napi/tslint.json
@@ -0,0 +1,8 @@
+{
+  "extends": "dtslint/dt.json",
+
+  "rules": {
+    "no-consecutive-blank-lines": [true, 3],
+    "ban-types": [false] 
+  }
+}
diff --git a/types/ffi/index.d.ts b/types/ffi/index.d.ts
index 76e197e841..cf562cea06 100644
--- a/types/ffi/index.d.ts
+++ b/types/ffi/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for node-ffi 0.1
+// Type definitions for node-ffi 0.2
 // Project: https://github.com/rbranson/node-ffi
-// Definitions by: Paul Loyd <https://github.com/loyd>
+// Definitions by: Paul Loyd <https://github.com/loyd>, Waiting Song <https://github.com/waitingsong>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -135,12 +135,13 @@ export const DynamicLibrary: {
  * The function pointer may be used in other C functions that
  * accept C callback functions.
  */
-export const Callback: {
+export interface 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 const Callback: Callback;
 
 export const ffiType: {
     /** Get a `ffi_type *` Buffer appropriate for the given type. */
diff --git a/types/fibjs/UNUSED_FILES.txt b/types/fibjs/UNUSED_FILES.txt
new file mode 100644
index 0000000000..2a6c4b5a1c
--- /dev/null
+++ b/types/fibjs/UNUSED_FILES.txt
@@ -0,0 +1 @@
+declare/_test_env.d.ts
\ No newline at end of file
diff --git a/types/fibjs/declare/Buffer.d.ts b/types/fibjs/declare/Buffer.d.ts
new file mode 100644
index 0000000000..867283e703
--- /dev/null
+++ b/types/fibjs/declare/Buffer.d.ts
@@ -0,0 +1,1131 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 二进制数据缓存对象，用于 io 读写的数据处理
+	* @detail Buffer 对象为全局基础类，在任何时候都可以直接以 new Buffer(...) 创建：,```JavaScript,var buf = new Buffer();,```
+	*/
+
+declare class Class_Buffer extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取缓存对象的尺寸
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	length: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param datas 初始化数据数组
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(datas: any[]);
+
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param datas 初始化数据数组
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(datas: ArrayBuffer);
+
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param datas 初始化数据数组
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(datas: ArrayLike<any>);
+
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param datas 初始化数据数组
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(datas: ArrayBufferView);
+
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param buffer 初始化Buffer对象
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(buffer: Class_Buffer);
+
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param str 初始化字符串，字符串将以 utf-8 格式写入，缺省则创建一个空对象
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(str: string, codec?: string/** = "utf8"*/);
+
+	/**
+	 * 
+	 * @brief 缓存对象构造函数
+	 * @param size 初始化缓冲区大小
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(size?: number/** = 0*/);
+
+	/**
+	 * 
+	 * @brief 检测给定的变量是否是 Buffer 对象
+	 * @param v 给定需要检测的变量
+	 * @return 传入对象是否 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static isBuffer(v: any): boolean;
+
+	/**
+	 * 
+	 * @brief 通过其他 Buffer 创建 Buffer 对象
+	 * @param buffer 给定 Buffer 类型变量用于创建 Buffer 对象
+	 * @param byteOffset 指定数据起始位置，起始为 0
+	 * @param length 指定数据长度，起始位 -1，表示剩余所有数据
+	 * @return 返回 Buffer 实例
+	 * 
+	 * 
+	 * 
+	 */
+	static from(buffer: Class_Buffer, byteOffset?: number/** = 0*/, length?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 通过字符串创建 Buffer 对象
+	 * @param str 初始化字符串，字符串将以 utf-8 格式写入
+	 * @param byteOffset 指定数据起始位置，起始为 0
+	 * @param length 指定数据长度，起始位 -1，表示剩余所有数据
+	 * @return 返回 Buffer 实例
+	 * 
+	 * 
+	 * 
+	 */
+	static from(str: string, byteOffset?: number/** = 0*/, length?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 通过字符串创建 Buffer 对象
+	 * @param str 初始化字符串，字符串将以 utf-8 格式写入，缺省则创建一个空对象
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 返回 Buffer 实例
+	 * 
+	 * 
+	 * 
+	 */
+	static from(str: string, codec?: string/** = "utf8"*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 拼接多个缓存区中的数据
+	 * @param buflist 待拼接的Buffer数组
+	 * @param cutLength 截取多少个Buffer对象
+	 * @return 拼接后产生的新 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static concat(buflist: any[], cutLength?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 分配一个指定长度的新缓存区。如果大小为0，将创建一个零长度的缓存区。
+	 * @param size 缓冲区的所需长度
+	 * @param fill 预先填充新缓冲区的值，可使用 string/buffer/integer 值类型。 默认值：0
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 填充好的新 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static alloc(size: number, fill?: number/** = 0*/, codec?: string/** = "utf8"*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 分配一个指定长度的新缓存区。如果大小为0，将创建一个零长度的缓存区。
+	 * @param size 缓冲区的所需长度
+	 * @param fill 预先填充新缓冲区的值，可使用 string/buffer/integer 值类型。 默认值：0
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 填充好的新 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static alloc(size: number, fill?: string/** = ""*/, codec?: string/** = "utf8"*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 分配一个指定长度的新缓存区。如果大小为0，将创建一个零长度的缓存区。
+	 * @param size 缓冲区的所需长度
+	 * @param fill 预先填充新缓冲区的值，可使用 string/buffer/integer 值类型。 默认值：0
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 填充好的新 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static alloc(size: number, fill: Class_Buffer, codec?: string/** = "utf8"*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 分配一个指定长度的新缓存区。如果大小为0，将创建一个零长度的缓存区。
+	 * @param size 缓冲区的所需长度
+	 * @return 指定尺寸的新 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static allocUnsafe(size: number): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 分配一个指定长度的新缓存区。如果大小为0，将创建一个零长度的缓存区。
+	 * @param size 缓冲区的所需长度
+	 * @return 指定尺寸的新 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	static allocUnsafeSlow(size: number): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回字符串的实际字节长度
+	 * @param str 待取字节的字符串，如果str为 ArrayBuffer/TypedArray/DataView/Buffer 对象，则返回它们的实际长度
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 返回实际字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	static byteLength(str: string, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 返回字符串的实际字节长度
+	 * @param str 待取字节的字符串，如果str为 ArrayBuffer/TypedArray/DataView/Buffer 对象，则返回它们的实际长度
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 返回实际字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	static byteLength(str: ArrayBuffer, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 返回字符串的实际字节长度
+	 * @param str 待取字节的字符串，如果 str 为 ArrayBuffer/TypedArray/DataView/Buffer 对象，则返回它们的实际长度
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 返回实际字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	static byteLength(str: ArrayBufferView, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 返回字符串的实际字节长度
+	 * @param str 待取字节的字符串，如果str为 ArrayBuffer/TypedArray/DataView/Buffer 对象，则返回它们的实际长度
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 返回实际字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	static byteLength(str: Class_Buffer, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 检测编码格式是否被支持
+	 * @param codec 待检测的编码格式
+	 * @return 是否支持
+	 * 
+	 * 
+	 * 
+	 */
+	static isEncoding(codec: string): boolean;
+
+	/**
+	 * 
+	 * @brief 修改缓存对象尺寸
+	 * @param sz 指定新尺寸
+	 * 
+	 * 
+	 * 
+	 */
+	resize(sz: number): void;
+
+	/**
+	 * 
+	 * @brief 在缓存对象尾部写入一组二进制数据
+	 * @param data 初始化二进制数据
+	 * 
+	 * 
+	 * 
+	 */
+	append(data: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 在缓存对象尾部写入字符串，字符串将以 utf-8 格式写入
+	 * @param str 要写入的字符串
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * 
+	 * 
+	 * 
+	 */
+	append(str: string, codec?: string/** = "utf8"*/): void;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入指定字符串，字符串默认为utf-8，越界时只写入部分数据
+	 * @param str 待写入的字符串
+	 * @param offset 写入起始位置
+	 * @param length 写入长度（单位字节，默认值-1），未指定时为待写入字符串的长度
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 写入的数据字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	write(str: string, offset?: number/** = 0*/, length?: number/** = -1*/, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入指定字符串，字符串默认为utf-8，越界时只写入部分数据
+	 * @param str 待写入的字符串
+	 * @param offset 写入起始位置
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 写入的数据字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	write(str: string, offset?: number/** = 0*/, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入指定字符串，字符串默认为utf-8，越界时只写入部分数据
+	 * @param str 待写入的字符串
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 写入的数据字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	write(str: string, codec?: string/** = "utf8"*/): number;
+
+	/**
+	 * 
+	 * @brief 为 Buffer 对象填充指定内容数据
+	 * @param v 需要填充的数据，如果未指定 offset 和 end，将填充满整个 buffer
+	 * @param offset 填充起始位置
+	 * @param end 填充终止位置
+	 * @return 返回当前 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	fill(v: number, offset?: number/** = 0*/, end?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 为 Buffer 对象填充指定内容数据
+	 * @param v 需要填充的数据，如果未指定 offset 和 end，将填充满整个 buffer
+	 * @param offset 填充起始位置
+	 * @param end 填充终止位置
+	 * @return 返回当前 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	fill(v: Class_Buffer, offset?: number/** = 0*/, end?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 为 Buffer 对象填充指定内容数据
+	 * @param v 需要填充的数据，如果未指定 offset 和 end，将填充满整个 buffer
+	 * @param offset 填充起始位置
+	 * @param end 填充终止位置
+	 * @return 返回当前 Buffer 对象
+	 * 
+	 * 
+	 * 
+	 */
+	fill(v: string, offset?: number/** = 0*/, end?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回某个指定数据在 Buffer 中首次出现的位置
+	 * @param v 待查找数据，如果未指定 offset，默认从起始位开始
+	 * @param offset 起始查找位置
+	 * @return 返回查找到的位置，未找到返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	indexOf(v: number, offset?: number/** = 0*/): number;
+
+	/**
+	 * 
+	 * @brief 返回某个指定数据在 Buffer 中首次出现的位置
+	 * @param v 待查找数据，如果未指定 offset，默认从起始位开始
+	 * @param offset 起始查找位置
+	 * @return 返回查找到的位置，未找到返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	indexOf(v: Class_Buffer, offset?: number/** = 0*/): number;
+
+	/**
+	 * 
+	 * @brief 返回某个指定数据在 Buffer 中首次出现的位置
+	 * @param v 待查找数据，如果未指定 offset，默认从起始位开始
+	 * @param offset 起始查找位置
+	 * @return 返回查找到的位置，未找到返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	indexOf(v: string, offset?: number/** = 0*/): number;
+
+	/**
+	 * 
+	 * @brief 比较缓存区的内容
+	 * @param buf 待比较缓存对象
+	 * @return 内容比较结果
+	 * 
+	 * 
+	 * 
+	 */
+	compare(buf: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 从源缓存对象区域拷贝数据到目标缓存对象区域
+	 * @param targetBuffer 目标缓存对象
+	 * @param targetStart 目标缓存对象开始拷贝字节位置，缺省为 0
+	 * @param sourceStart 源缓存对象开始字节位置, 缺省为 0
+	 * @param sourceEnd 源缓存对象结束字节位置, 缺省为 -1,表示源数据长度
+	 * @return 拷贝的数据字节长度
+	 * 
+	 * 
+	 * 
+	 */
+	copy(targetBuffer: Class_Buffer, targetStart?: number/** = 0*/, sourceStart?: number/** = 0*/, sourceEnd?: number/** = -1*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 8 位无符号整型数值
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUInt8(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 16 位无符号整型数值，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUInt16LE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 16 位无符号整型数值，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUInt16BE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 32 位无符号整型数值，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUInt32LE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 32 位无符号整型数值，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUInt32BE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个无符号整型数值，最大支持 48 位，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUIntLE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个无符号整型数值，最大支持 48 位，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readUIntBE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 8 位整型数值
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt8(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 16 位整型数值，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt16LE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 16 位整型数值，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt16BE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 32 位整型数值，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt32LE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 32 位整型数值，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt32BE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个整型数值，最大支持 48 位，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readIntLE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个整型数值，最大支持 48 位，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readIntBE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 64 位整型数值，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt64LE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个 64 位整型数值，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的整型数值
+	 * 
+	 * 
+	 * 
+	 */
+	readInt64BE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个浮点数，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的浮点数
+	 * 
+	 * 
+	 * 
+	 */
+	readFloatLE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个浮点数，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的浮点数
+	 * 
+	 * 
+	 * 
+	 */
+	readFloatBE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个双精度浮点数，以低字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的双精度浮点数
+	 * 
+	 * 
+	 * 
+	 */
+	readDoubleLE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 从缓存对象读取一个双精度浮点数，以高字节序的存储方式
+	 * @param offset 指定读取的起始位置，缺省为 0
+	 * @param noAssert 指定读取越界时不抛出错误，缺省为 flase，抛出
+	 * @return 返回读取的双精度浮点数
+	 * 
+	 * 
+	 * 
+	 */
+	readDoubleBE(offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 8 位无符号整型数值
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUInt8(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 16 位无符号整型数值，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUInt16LE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 16 位无符号整型数值，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUInt16BE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 32 位无符号整型数值，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUInt32LE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 32 位无符号整型数值，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUInt32BE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个无符号整型数值，最大支持 48 位，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUIntLE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个无符号整型数值，最大支持 48 位，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeUIntBE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 8 位整型数值
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt8(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 16 位整型数值，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt16LE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 16 位整型数值，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt16BE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 32 位整型数值，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt32LE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 32 位整型数值，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt32BE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个整型数值，最大支持 48 位，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeIntLE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个整型数值，最大支持 48 位，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeIntBE(value: number, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 64 位整型数值，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt64LE(value: Class_Int64, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个 64 位整型数值，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeInt64BE(value: Class_Int64, offset?: number/** = 0*/, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个浮点数，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeFloatLE(value: number, offset: number, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个浮点数，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeFloatBE(value: number, offset: number, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个双精度浮点数，以低字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeDoubleLE(value: number, offset: number, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 向缓存对象写入一个双精度浮点数，以高字节序的存储方式
+	 * @param value 指定写入的数值
+	 * @param offset 指定写入的起始位置
+	 * @param noAssert 指定写入越界时不抛出错误，缺省为 flase，抛出
+	 * @return offset 加上写入的字节数
+	 * 
+	 * 
+	 * 
+	 */
+	writeDoubleBE(value: number, offset: number, noAssert?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 返回一个新缓存对象，包含指定起始到缓存结尾的数据
+	 * @param start 指定范围的起始，缺省从头开始
+	 * @return 返回新的缓存对象
+	 * 
+	 * 
+	 * 
+	 */
+	slice(start?: number/** = 0*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回一个新缓存对象，包含指定范围的数据，若范围超出缓存，则只返回有效部分数据
+	 * @param start 指定范围的起始
+	 * @param end 指定范围的结束
+	 * @return 返回新的缓存对象
+	 * 
+	 * 
+	 * 
+	 */
+	slice(start: number, end: number): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 把当前对象中的所有元素放入一个字符串
+	 * @param separator 分割字符，缺省为 ","
+	 * @return 返回生成的字符串
+	 * 
+	 * 
+	 * 
+	 */
+	join(separator?: string/** = ","*/): string;
+
+	/**
+	 * 
+	 * @brief 返回一个新缓存对象，包含当前对象数据的倒序
+	 * @return 返回新的缓存对象
+	 * 
+	 * 
+	 * 
+	 */
+	reverse(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 比较当前对象与给定的对象是否相等
+	 * @param expected 制定比较的目标对象
+	 * @return 返回对象比较的结果
+	 * 
+	 * 
+	 * 
+	 */
+	equals(expected: Class__object): boolean;
+
+	/**
+	 * 
+	 * @brief 使用 16 进制编码缓存对象内容
+	 * @return 返回编码字符串
+	 * 
+	 * 
+	 * 
+	 */
+	hex(): string;
+
+	/**
+	 * 
+	 * @brief 使用 base64 编码缓存对象内容
+	 * @return 返回编码字符串
+	 * 
+	 * 
+	 * 
+	 */
+	base64(): string;
+
+	/**
+	 * 
+	 * @brief 返回全部二进制数据的数组
+	 * @return 返回包含对象数据索引的迭代器
+	 * 
+	 * 
+	 * 
+	 */
+	keys(): Iterable<any>;
+
+	/**
+	 * 
+	 * @brief 返回全部二进制数据的数组
+	 * @return 返回包含对象数据值的迭代器
+	 * 
+	 * 
+	 * 
+	 */
+	values(): Iterable<any>;
+
+	/**
+	 * 
+	 * @brief 返回包含对象数据 [index, byte] 对的迭代器
+	 * @return [index, byte] 对的迭代器
+	 * ```JavaScript
+	 * const buf = Buffer.from('buffer');
+	 * 
+	 * // Prints:
+	 * //   [0, 98]
+	 * //   [1, 117]
+	 * //   [2, 102]
+	 * //   [3, 102]
+	 * //   [4, 101]
+	 * //   [5, 114]
+	 * for (const pair of buf.entries()) {
+	 * console.log(pair);
+	 * }
+	 * ```
+	 * 
+	 * 
+	 * 
+	 */
+	entries(): Iterable<any>;
+
+	/**
+	 * 
+	 * @brief 返回全部二进制数据的数组
+	 * @return 返回包含对象数据的数组
+	 * 
+	 * 
+	 * 
+	 */
+	toArray(): any[];
+
+	/**
+	 * 
+	 * @brief 返回二进制数据的编码字符串
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @param offset 读取起始位置
+	 * @param end 读取终止位置
+	 * @return 返回对象的字符串表示
+	 * 
+	 * 
+	 * 
+	 */
+	toString(codec: string, offset?: number/** = 0*/, end?: number): string;
+
+	/**
+	 * 
+	 * @brief 返回二进制数据的编码字符串
+	 * @param codec 指定编码格式，允许值为："hex", "base64", "utf8", 或者系统支持的字符集
+	 * @param offset 读取起始位置
+	 * @return 返回对象的字符串表示
+	 * 
+	 * 
+	 * 
+	 */
+	toString(codec: string, offset?: number/** = 0*/): string;
+
+	/**
+	 * 
+	 * @brief 返回二进制数据的 utf8 编码字符串
+	 * @return 返回对象的字符串表示
+	 * 
+	 * 
+	 * 
+	 */
+	toString(): string;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/BufferedStream.d.ts b/types/fibjs/declare/BufferedStream.d.ts
new file mode 100644
index 0000000000..fab2dac2b2
--- /dev/null
+++ b/types/fibjs/declare/BufferedStream.d.ts
@@ -0,0 +1,144 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 缓存读取对象
+	* @detail BufferedReader 对象用于对二进制流对象数据进行缓存，并提供文本读取能力，仅支持 utf-8 格式转换。创建方法：,```JavaScript,var reader = new io.BufferedStream(stream);,```
+	*/
+/// <reference path="Stream.d.ts" />
+declare class Class_BufferedStream extends Class_Stream {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询创建缓存对象时的流对象
+	 * 
+	 * @readonly
+	 * @type Stream
+	 */
+	
+	stream: Class_Stream
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前对象处理文本时的字符集，缺省为 utf-8
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	charset: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置行结尾标识，缺省时，posix:\"\\n\"；windows:\"\\r\\n\"
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	EOL: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief BufferedStream 构造函数
+	 * @param stm BufferedStream 的二进制基础流对象
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(stm: Class_Stream);
+
+	/**
+	 * 
+	 * @brief 读取指定字符的文本
+	 * @param size 指定读取的文本字符个数，以 utf8 或者指定的编码字节数为准
+	 * @return 返回读取的文本字符串，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	readText(size: number): string;
+
+	/**
+	 * 
+	 * @brief 读取一行文本，行结尾标识基于 EOL 属性的设置，缺省时，posix:\"\\n\"；windows:\"\\r\\n\"
+	 * @param maxlen 指定此次读取的最大字符串，以 utf8 编码字节数为准，缺省不限制字符数
+	 * @return 返回读取的文本字符串，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	readLine(maxlen?: number/** = -1*/): string;
+
+	/**
+	 * 
+	 * @brief 以数组方式读取一组文本行，行结尾标识基于 EOL 属性的设置，缺省时，posix:\"\\n\"；windows:\"\\r\\n\"
+	 * @param maxlines 指定此次读取的最大行数，缺省读取全部文本行
+	 * @return 返回读取的文本行数组，若无数据可读，或者连接中断，空数组
+	 * 
+	 * 
+	 * 
+	 */
+	readLines(maxlines?: number/** = -1*/): any[];
+
+	/**
+	 * 
+	 * @brief 读取一个文本字符串，以指定的字节为结尾
+	 * @param mk 指定结尾的字符串
+	 * @param maxlen 指定此次读取的最大字符串，以 utf8 编码字节数为准，缺省不限制字符数
+	 * @return 返回读取的文本字符串，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	readUntil(mk: string, maxlen?: number/** = -1*/): string;
+
+	/**
+	 * 
+	 * @brief 写入一个字符串
+	 * @param txt 指定写入的字符串
+	 * 
+	 * 
+	 * @async
+	 */
+	writeText(txt: string): void;
+
+	/**
+	 * 
+	 * @brief 写入一个字符串，并写入换行符
+	 * @param txt 指定写入的字符串
+	 * 
+	 * 
+	 * @async
+	 */
+	writeLine(txt: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Chain.d.ts b/types/fibjs/declare/Chain.d.ts
new file mode 100644
index 0000000000..4a8c89e69c
--- /dev/null
+++ b/types/fibjs/declare/Chain.d.ts
@@ -0,0 +1,63 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 消息处理器链处理对象
+	* @detail 消息处理器链处理对象用于链接一系列消息处理器，按照指定的顺序链式处理。创建方法：,```JavaScript,var chain = new mq.Chain([,  func1, func2,]);,```
+	*/
+/// <reference path="Handler.d.ts" />
+declare class Class_Chain extends Class_Handler {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 构造一个消息处理器链处理对象
+	 * @param hdlrs 处理器数组
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(hdlrs: any[]);
+
+	/**
+	 * 
+	 * @brief 添加处理器数组
+	 * @param hdlrs 处理器数组
+	 * 
+	 * 
+	 * 
+	 */
+	append(hdlrs: any[]): void;
+
+	/**
+	 * 
+	 * @brief 添加处理器
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	append(hdlr: Class_Handler): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Cipher.d.ts b/types/fibjs/declare/Cipher.d.ts
new file mode 100644
index 0000000000..122da7f036
--- /dev/null
+++ b/types/fibjs/declare/Cipher.d.ts
@@ -0,0 +1,149 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 对称加密算法对象
+	* @detail Cipher 对象属于 crypto 模块，创建：,```JavaScript,var c = new crypto.Cipher(crypto.AES, crypto.ECB, ...);,```
+	*/
+
+declare class Class_Cipher extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前算法名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前算法密码长度，以位为单位
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	keySize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前算法初始向量长度，以字节为单位
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	ivSize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前算法数据块长度，以字节为单位
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	blockSize: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief Cipher 构造函数，仅用于 ARC4 初始化
+	 * @param provider 指定加密算法
+	 * @param key 指定加密解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(provider: number, key: Class_Buffer);
+
+	/**
+	 * 
+	 * @brief Cipher 构造函数
+	 * @param provider 指定加密算法
+	 * @param mode 指定分组密码工作模式
+	 * @param key 指定加密解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(provider: number, mode: number, key: Class_Buffer);
+
+	/**
+	 * 
+	 * @brief Cipher 构造函数
+	 * @param provider 指定加密算法
+	 * @param mode 指定分组密码工作模式
+	 * @param key 指定加密解密密码
+	 * @param iv 指定初始向量
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(provider: number, mode: number, key: Class_Buffer, iv: Class_Buffer);
+
+	/**
+	 * 
+	 * @brief 使用填充模式
+	 * @param mode 指定填充模式，缺省为 PADDING_PKCS7
+	 * 
+	 * 
+	 * 
+	 */
+	paddingMode(mode: number): void;
+
+	/**
+	 * 
+	 * @brief 使用当前算法密码加密数据
+	 * @param data 指定要加密的数据
+	 * @return 返回加密后的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	encrypt(data: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 使用当前算法密码解密数据
+	 * @param data 指定要解密的数据
+	 * @return 返回解密后的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	decrypt(data: Class_Buffer): Class_Buffer;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Condition.d.ts b/types/fibjs/declare/Condition.d.ts
new file mode 100644
index 0000000000..08486086d4
--- /dev/null
+++ b/types/fibjs/declare/Condition.d.ts
@@ -0,0 +1,75 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 条件变量对象
+	* @detail 条件变量是利用纤程间共享的全局变量来进行同步的一种机制，主要包括两个动作：,1）一个线程等待某个条件成立，而将自己挂起；,2）另一个线程使条件成立，并通知等待的纤程向下执行。,,为了防止竞争，每个条件变量都需要一个Lock的配合（Lock可自行显式创建并传递进来，也可交由fibjs为您创建）,,通过使用条件变量，可以利用一个条件变量控制一批纤程的开关；,,以下是两个纤程调度的实例：,```JavaScript,var coroutine = require("coroutine");,var cond = new coroutine.Condition();,var ready = false;,var state = "ready";,,function funcwait() {,   cond.acquire();,   while (!ready),       cond.wait();,   state = "go",   cond.release();,},,coroutine.start(funcwait);,,cond.acquire();,console.log(state),ready = true;,cond.notify();,coroutine.sleep();,console.log(state);,```,will output:,```sh,ready,go,```
+	*/
+/// <reference path="Lock.d.ts" />
+declare class Class_Condition extends Class_Lock {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 条件变量构造函数（条件变量所需的锁由fibjs内部构造）
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 条件变量构造函数
+	 * @param lock 使用自行构造的锁
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(lock: Class_Lock);
+
+	/**
+	 * 
+	 * @brief 使纤程进入阻塞状态
+	 * 
+	 * 
+	 */
+	wait(): void;
+
+	/**
+	 * 
+	 * @brief 通知一个被阻塞的纤程（最后加入纤程池的）向下继续执行
+	 * 
+	 * 
+	 */
+	notify(): void;
+
+	/**
+	 * 
+	 * @brief 通知所有被阻塞的纤程向下继续执行
+	 * 
+	 * 
+	 */
+	notifyAll(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/DbConnection.d.ts b/types/fibjs/declare/DbConnection.d.ts
new file mode 100644
index 0000000000..62e940687f
--- /dev/null
+++ b/types/fibjs/declare/DbConnection.d.ts
@@ -0,0 +1,119 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 数据库连接对象，用于建立和维护一个数据库连接会话。
+	* @detail 
+	*/
+
+declare class Class_DbConnection extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前连接数据库类型
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	type: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief 关闭当前数据库连接
+	 * 
+	 * @async
+	 */
+	close(): void;
+
+	/**
+	 * 
+	 * @brief 在当前数据库连接上启动一个事务
+	 * 
+	 * @async
+	 */
+	begin(): void;
+
+	/**
+	 * 
+	 * @brief 提交当前数据库连接上的事务
+	 * 
+	 * @async
+	 */
+	commit(): void;
+
+	/**
+	 * 
+	 * @brief 回滚当前数据库连接上的事务
+	 * 
+	 * @async
+	 */
+	rollback(): void;
+
+	/**
+	 * 
+	 * @brief 进入事务执行一个函数，并根据函数执行情况提交或者回滚
+	 * func 执行有三种结果：
+	 * * 函数正常返回，包括运行结束和主动 return，此时事务将自动提交
+	 * * 函数返回 false，此时事务将回滚
+	 * * 函数运行错误，事务自动回滚
+	 * 
+	 * @param func 以事务方式执行的函数
+	 * @return 返回事务是否提交，正常 commit 时返回 true, rollback 时返回 false，如果事务出错则抛出错误
+	 * 
+	 * 
+	 * 
+	 */
+	trans(func: Function): boolean;
+
+	/**
+	 * 
+	 * @brief 执行一个 sql 命令，并返回执行结果，可根据参数格式化字符串
+	 * 
+	 * @param sql 格式化字符串，可选参数用 ? 指定。例如：'SELECT FROM TEST WHERE [id]=?'
+	 * @param args 可选参数列表
+	 * @return 返回包含结果记录的数组，如果请求是 UPDATE 或者 INSERT，返回结果还会包含 affected 和 insertId，mssql 不支持 insertId。
+	 * 
+	 * 
+	 * @async
+	 */
+	execute(sql: string, ...args: any[]): any[];
+
+	/**
+	 * 
+	 * @brief 格式化一个 sql 命令，并返回格式化结果
+	 * 
+	 * @param sql 格式化字符串，可选参数用 ? 指定。例如：'SELECT FROM TEST WHERE [id]=?'
+	 * @param args 可选参数列表
+	 * @return 返回格式化之后的 sql 命令
+	 * 
+	 * 
+	 * 
+	 */
+	format(sql: string, ...args: any[]): string;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/DgramSocket.d.ts b/types/fibjs/declare/DgramSocket.d.ts
new file mode 100644
index 0000000000..22486d5832
--- /dev/null
+++ b/types/fibjs/declare/DgramSocket.d.ts
@@ -0,0 +1,180 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief dgram.Socket 对象是一个封装了数据包函数功能的 EventEmitter。
+	* @detail DgramSocket 实例是由 dgram.createSocket() 创建的。创建 dgram.Socket 实例不需要使用 new 关键字。,,创建方法：,```JavaScript,var dgram = require('dgram');,var sock = dgram.createSocket('udp4');,```,,## 事件,DgramSocket 继承于 EventEmitter，对象的状态变化，以及数据接受，都是以事件的方式实现。,,### close 事件,** `close` 事件将在使用 `close()` 关闭一个 `socket` 之后触发。该事件一旦触发，这个 `socket` 上将不会触发新的 `message` 事件。**,,### error 事件,** 当有任何错误发生时，`error` 事件将被触发。 **,,### listening 事件,** 当一个 `socket` 开始监听数据包信息时，`listening` 事件将被触发。该事件会在创建 UDP socket 之后被立即触发。 **,,### message 事件,** 当有新的数据包被 `socket` 接收时，`message` 事件会被触发。`msg` 和 `rinfo` 会作为参数传递到该事件的处理函数中。 **,- msg: Buffer，消息,- rinfo: Object，远程地址信息,   - address: string，发送方地址,   - family: string，地址类型 ('IPv4' or 'IPv6'),   - port: number，发送者端口,   - size: number，消息大小
+	*/
+/// <reference path="EventEmitter.d.ts" />
+declare class Class_DgramSocket extends Class_EventEmitter {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 该方法会令 dgram.Socket 在指定的 `port` 和 `addr` 上监听数据包信息。绑定完成时会触发一个 `listening` 事件。
+	 * @param port 指定绑定端口，若 `port` 未指定或为 0，操作系统会尝试绑定一个随机的端口
+	 * @param addr 指定绑定地址，若 address 未指定，操作系统会尝试在所有地址上监听。
+	 * 
+	 * 
+	 * @async
+	 */
+	bind(port?: number/** = 0*/, addr?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 该方法会令 dgram.Socket 在 `opts` 指定的 `port` 和 `address` 上监听数据包信息。绑定完成时会触发一个 `listening` 事件。
+	 * @param opts 指定绑定参数
+	 * 
+	 * 
+	 * @async
+	 */
+	bind(opts: object): void;
+
+	/**
+	 * 
+	 * @brief 在 socket 上发送一个数据包
+	 * @param msg 指定发送的数据
+	 * @param port 指定发送的目的端口
+	 * @param address 指定发送的目的地址
+	 * @return 返回发送尺寸
+	 * 
+	 * 
+	 * @async
+	 */
+	send(msg: Class_Buffer, port: number, address?: string/** = ""*/): number;
+
+	/**
+	 * 
+	 * @brief 在 socket 上发送一个数据包
+	 * @param msg 指定发送的数据
+	 * @param offset 从指定偏移开始发送
+	 * @param length 之发送指定长度
+	 * @param port 指定发送的目的端口
+	 * @param address 指定发送的目的地址
+	 * @return 返回发送尺寸
+	 * 
+	 * 
+	 * @async
+	 */
+	send(msg: Class_Buffer, offset: number, length: number, port: number, address?: string/** = ""*/): number;
+
+	/**
+	 * 
+	 * @brief 返回一个包含 socket 地址信息的对象。对于 UDP socket，该对象将包含 address、family 和 port 属性。
+	 * @return 返回对象绑定地址
+	 * 
+	 * 
+	 * 
+	 */
+	address(): any;
+
+	/**
+	 * 
+	 * @brief 关闭当前 socket
+	 * 
+	 * 
+	 */
+	close(): void;
+
+	/**
+	 * 
+	 * @brief 关闭当前 socket
+	 * @param callback 关闭完成后的回调函数，它相当于为 `close` 事件添加了一个监听器
+	 * 
+	 * 
+	 * 
+	 */
+	close(callback: Function): void;
+
+	/**
+	 * 
+	 * @brief 查询 socket 接收缓冲区大小
+	 * @return 返回查询结果
+	 * 
+	 * 
+	 * 
+	 */
+	getRecvBufferSize(): number;
+
+	/**
+	 * 
+	 * @brief 查询 socket 发送缓冲区大小
+	 * @return 返回查询结果
+	 * 
+	 * 
+	 * 
+	 */
+	getSendBufferSize(): number;
+
+	/**
+	 * 
+	 * @brief 设置 socket 接收缓冲区大小
+	 * @param size 指定要设置的尺寸
+	 * 
+	 * 
+	 * 
+	 */
+	setRecvBufferSize(size: number): void;
+
+	/**
+	 * 
+	 * @brief 设置 socket 发送缓冲区大小
+	 * @param size 指定要设置的尺寸
+	 * 
+	 * 
+	 * 
+	 */
+	setSendBufferSize(size: number): void;
+
+	/**
+	 * 
+	 * @brief 设置或清除 SO_BROADCAST socket 选项
+	 * @param flag 当设置为 true, UDP包会被发送到一个本地接口的广播地址
+	 * 
+	 * 
+	 * 
+	 */
+	setBroadcast(flag: boolean): void;
+
+	/**
+	 * 
+	 * @brief 维持 fibjs 进程不退出，在对象绑定期间阻止 fibjs 进程退出
+	 * @return 返回当前对象
+	 * 
+	 * 
+	 * 
+	 */
+	ref(): Class_DgramSocket;
+
+	/**
+	 * 
+	 * @brief 允许 fibjs 进程退出，在对象绑定期间允许 fibjs 进程退出
+	 * @return 返回当前对象
+	 * 
+	 * 
+	 * 
+	 */
+	unref(): Class_DgramSocket;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Digest.d.ts b/types/fibjs/declare/Digest.d.ts
new file mode 100644
index 0000000000..71c62f0386
--- /dev/null
+++ b/types/fibjs/declare/Digest.d.ts
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 信息摘要对象
+	* @detail 
+	*/
+
+declare class Class_Digest extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前信息摘要算法的摘要字节数
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	size: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 更新二进制摘要信息
+	 * @param data 二进制数据块
+	 * @return 返回信息摘要对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	update(data: Class_Buffer): Class_Digest;
+
+	/**
+	 * 
+	 * @brief 计算并返回摘要
+	 * @param codec 指定编码格式，允许值为："buffer", "hex", "base64", "utf8", 或者系统支持的字符集
+	 * @return 返回指定编码的摘要表示
+	 * 
+	 * 
+	 * 
+	 */
+	digest(codec?: string/** = "buffer"*/): any;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Event.d.ts b/types/fibjs/declare/Event.d.ts
new file mode 100644
index 0000000000..478967032e
--- /dev/null
+++ b/types/fibjs/declare/Event.d.ts
@@ -0,0 +1,85 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 事件对象
+	* @detail 通过一个事件达到对一组纤程进行控制的目的（事件对象的状态为bool类型）
+	*/
+/// <reference path="Lock.d.ts" />
+declare class Class_Event extends Class_Lock {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 事件对象构造函数
+	 * @param value 指定是否等待，为 true 时等待，缺省为 false
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(value?: boolean/** = false*/);
+
+	/**
+	 * 
+	 * @brief 判断事件对象是否为真
+	 * @return 如果事件为真，返回 true
+	 * 
+	 * 
+	 * 
+	 */
+	isSet(): boolean;
+
+	/**
+	 * 
+	 * @brief 激活事件（将事件状态改为true），并调用pulse()
+	 * 
+	 * 
+	 */
+	set(): void;
+
+	/**
+	 * 
+	 * @brief 激活等待该事件的所有纤程
+	 * 
+	 * 
+	 */
+	pulse(): void;
+
+	/**
+	 * 
+	 * @brief 重置事件（将事件状态改为false）
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+	/**
+	 * 
+	 * @brief 等待一个事件
+	 * 
+	 * 
+	 */
+	wait(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/EventEmitter.d.ts b/types/fibjs/declare/EventEmitter.d.ts
new file mode 100644
index 0000000000..0008b2faa3
--- /dev/null
+++ b/types/fibjs/declare/EventEmitter.d.ts
@@ -0,0 +1,311 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 事件触发对象，可用于建立观察者模式，支持事件触发的对象均继承于此，同一事件的同一函数只会产生一次回调
+	* @detail Event 对象可独立创建，以用于组建自定义的事件系统：,```JavaScript,var EventEmitter = require('events');,,var e = new EventEmitter();,```
+	*/
+
+declare class Class_EventEmitter extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 默认全局最大监听器数
+	 * @static
+	 * 
+	 * @type Integer
+	 */
+	
+	defaultMaxListeners: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回成功绑定的数量，如果函数已绑定则返回 0
+	 * 
+	 * 
+	 * 
+	 */
+	on(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象
+	 * @param map 指定事件映射关系，对象属性名称将作为事件名称，属性的值将作为事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	on(map: object): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	addListener(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象
+	 * @param map 指定事件映射关系，对象属性名称将作为事件名称，属性的值将作为事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	addListener(map: object): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象起始
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回成功绑定的数量，如果函数已绑定则返回 0
+	 * 
+	 * 
+	 * 
+	 */
+	prependListener(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象起始
+	 * @param map 指定事件映射关系，对象属性名称将作为事件名称，属性的值将作为事件处理函数
+	 * @return 返回成功绑定的数量，如果函数已绑定则返回 0
+	 * 
+	 * 
+	 * 
+	 */
+	prependListener(map: object): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个一次性事件处理函数到对象，一次性处理函数只会触发一次
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	once(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个一次性事件处理函数到对象，一次性处理函数只会触发一次
+	 * @param map 指定事件映射关系，对象属性名称将作为事件名称，属性的值将作为事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	once(map: object): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象起始
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回成功绑定的数量，如果函数已绑定则返回 0
+	 * 
+	 * 
+	 * 
+	 */
+	prependOnceListener(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 绑定一个事件处理函数到对象起始
+	 * @param map 指定事件映射关系，对象属性名称将作为事件名称，属性的值将作为事件处理函数
+	 * @return 返回成功绑定的数量，如果函数已绑定则返回 0
+	 * 
+	 * 
+	 * 
+	 */
+	prependOnceListener(map: object): object;
+
+	/**
+	 * 
+	 * @brief 从对象处理队列中取消指定函数
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	off(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 取消对象处理队列中的全部函数
+	 * @param ev 指定事件的名称
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	off(ev: string): object;
+
+	/**
+	 * 
+	 * @brief 从对象处理队列中取消指定函数
+	 * @param map 指定事件映射关系，对象属性名称作为事件名称，属性的值作为事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	off(map: object): object;
+
+	/**
+	 * 
+	 * @brief 从对象处理队列中取消指定函数
+	 * @param ev 指定事件的名称
+	 * @param func 指定事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	removeListener(ev: string, func: Function): object;
+
+	/**
+	 * 
+	 * @brief 取消对象处理队列中的全部函数
+	 * @param ev 指定事件的名称
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	removeListener(ev: string): object;
+
+	/**
+	 * 
+	 * @brief 从对象处理队列中取消指定函数
+	 * @param map 指定事件映射关系，对象属性名称作为事件名称，属性的值作为事件处理函数
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	removeListener(map: object): object;
+
+	/**
+	 * 
+	 * @brief 从对象处理队列中取消所有事件的所有监听器， 如果指定事件，则移除指定事件的所有监听器。
+	 * @param evs 指定事件的名称
+	 * @return 返回事件对象本身，便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	removeAllListeners(evs?: any[]/** = v8::Array::New(isolate)*/): object;
+
+	/**
+	 * 
+	 * 监听器的默认限制的数量，仅用于兼容
+	 * @param n 指定事件的数量
+	 * 
+	 * 
+	 * 
+	 */
+	setMaxListeners(n: number): void;
+
+	/**
+	 * 
+	 * 获取监听器的默认限制的数量，仅用于兼容
+	 * @return 返回默认限制数量
+	 * 
+	 * 
+	 * 
+	 */
+	getMaxListeners(): number;
+
+	/**
+	 * 
+	 * @brief 查询对象指定事件的监听器数组
+	 * @param ev 指定事件的名称
+	 * @return 返回指定事件的监听器数组
+	 * 
+	 * 
+	 * 
+	 */
+	listeners(ev: string): any[];
+
+	/**
+	 * 
+	 * @brief 查询对象指定事件的监听器数量
+	 * @param ev 指定事件的名称
+	 * @return 返回指定事件的监听器数量
+	 * 
+	 * 
+	 * 
+	 */
+	listenerCount(ev: string): number;
+
+	/**
+	 * 
+	 * @brief 查询监听器事件名称
+	 * @return 返回事件名称数组
+	 * 
+	 * 
+	 * 
+	 */
+	eventNames(): any[];
+
+	/**
+	 * 
+	 * @brief 主动触发一个事件
+	 * @param ev 事件名称
+	 * @param args 事件参数，将会传递给事件处理函数
+	 * @return 返回事件触发状态，有响应事件返回 true，否则返回 false
+	 * 
+	 * 
+	 * 
+	 */
+	emit(ev: string, ...args: any[]): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/EventInfo.d.ts b/types/fibjs/declare/EventInfo.d.ts
new file mode 100644
index 0000000000..f60190d315
--- /dev/null
+++ b/types/fibjs/declare/EventInfo.d.ts
@@ -0,0 +1,81 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 事件信息对象，用于在事件中传递信息
+	* @detail 
+	*/
+
+declare class Class_EventInfo extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * 查询事件错误编码
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	code: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * 查询事件错误信息
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	reason: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * 查询事件类型
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	type: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * 查询触发事件的对象
+	 * 
+	 * @readonly
+	 * @type Object
+	 */
+	
+	target: object
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Fiber.d.ts b/types/fibjs/declare/Fiber.d.ts
new file mode 100644
index 0000000000..1ddf81a548
--- /dev/null
+++ b/types/fibjs/declare/Fiber.d.ts
@@ -0,0 +1,77 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 纤程操作对象，此对象不可直接创建
+	* @detail 使用 coroutine.start 创建纤程后，将返回此对象，用于纤程处理和纤程间通信。,纤程主函数可以通过 this 访问本纤程对象，也可通过 coroutine.current 获取当前纤程。,```JavaScript,function func(v1),{,  console.log(v1 + this.v);,},,var fb = coroutine.start(func,100);,,fb.v = 123;,,fb.join();,```,,纤程局部存储通过共享的 Fiber 对象完成，通过 coroutine.current 获取当前纤程，通过修改和查询其变量达到共享数据的目的。,,```JavaScript,function func(),{,  console.log(coroutine.current().v);,},,coroutine.current().v = 100;,,func();,```,,纤程在创建时，会自动复制当前纤程的局部变量到新的纤程，之后，各自的局部变量的修改不会相互影响，除非变量本身为对象引用。,,```JavaScript,function func(),{,  console.log(coroutine.current().v);,},,coroutine.current().v = 100;,,var fb = coroutine.start(func);,,coroutine.current().v = 200;,,fb.join();,```
+	*/
+
+declare class Class_Fiber extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询纤程的唯一 id
+	 * 
+	 * @readonly
+	 * @type Long
+	 */
+	
+	id: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询纤程的调用纤程
+	 * 
+	 * @readonly
+	 * @type Fiber
+	 */
+	
+	caller: Class_Fiber
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询纤程的调用堆栈
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	stack: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief 等待纤程结束
+	 * 
+	 * 
+	 */
+	join(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/File.d.ts b/types/fibjs/declare/File.d.ts
new file mode 100644
index 0000000000..11b5e7391f
--- /dev/null
+++ b/types/fibjs/declare/File.d.ts
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 文件操作对象，用于二进制文件读写
+	* @detail 文件操作对象用于对二进制文件进行操作，可使用 fs 模块打开和创建文件：,```JavaScript,var f = fs.openFile('test.txt');,```
+	*/
+/// <reference path="SeekableStream.d.ts" />
+declare class Class_File extends Class_SeekableStream {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前文件名
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前文件描述符
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	fd: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 查询当前文件的访问权限，Windows 不支持此方法
+	 * @param mode 指定设定的访问权限
+	 * 
+	 * 
+	 * @async
+	 */
+	chmod(mode: number): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Handler.d.ts b/types/fibjs/declare/Handler.d.ts
new file mode 100644
index 0000000000..df2ef6463f
--- /dev/null
+++ b/types/fibjs/declare/Handler.d.ts
@@ -0,0 +1,74 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 消息处理器接口
+	* @detail 
+	*/
+
+declare class Class_Handler extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 构造一个消息处理器链处理对象
+	 * @param hdlrs 处理器数组
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(hdlrs: any[]);
+
+	/**
+	 * 
+	 * @brief 创建一个消息处理器路由对象
+	 * @param map 初始化路由参数
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(map: object);
+
+	/**
+	 * 
+	 * @brief 创建一个 JavaSvript 消息处理器
+	 * @param hdlr JavaScript 处理器函数
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(hdlr: Function);
+
+	/**
+	 * 
+	 * @brief 处理一个消息或对象
+	 * @param v 指定处理的消息或对象
+	 * @return 返回下一步的处理器
+	 * 
+	 * 
+	 * @async
+	 */
+	invoke(v: Class__object): Class_Handler;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HandlerEx.d.ts b/types/fibjs/declare/HandlerEx.d.ts
new file mode 100644
index 0000000000..22bca1ce76
--- /dev/null
+++ b/types/fibjs/declare/HandlerEx.d.ts
@@ -0,0 +1,90 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 扩展消息处理器接口
+	* @detail 
+	*/
+/// <reference path="Handler.d.ts" />
+declare class Class_HandlerEx extends Class_Handler {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief WebSocket 协议转换处理器当前事件处理接口对象
+	 * 
+	 * 
+	 * @type Handler
+	 */
+	
+	handler: Class_Handler
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询 WebSocket 包协议转换处理器的工作状态
+	 * 
+	 * 返回的结果为一个 Stats 对象，结构如下：
+	 * ```JavaScript
+	 * {
+	 * total : 1000,    // 总计处理的请求
+	 * pendding : 100,  // 当前正在处理的请求
+	 * request : 10,    // 新建的请求
+	 * response : 10,   // 发送的响应
+	 * error : 100      // 发生的错误
+	 * }
+	 * ```
+	 * 
+	 * 
+	 * @readonly
+	 * @type Stats
+	 */
+	
+	stats: Class_Stats
+	
+	
+	
+	/**
+	 * 
+	 * @brief 设置错误处理器
+	 * 
+	 * 使用方式：
+	 * ```JavaScript
+	 * hdlr.onerror({
+	 * "404": function(v)
+	 * {
+	 * ...
+	 * },
+	 * "500": new mq.Routing(...)
+	 * })
+	 * ```
+	 * @param hdlrs 指定不同的错误的处理器，key 是错误号，value 是处理器，可以是内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	onerror(hdlrs: object): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HeapGraphEdge.d.ts b/types/fibjs/declare/HeapGraphEdge.d.ts
new file mode 100644
index 0000000000..87a144c664
--- /dev/null
+++ b/types/fibjs/declare/HeapGraphEdge.d.ts
@@ -0,0 +1,97 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief HeapGraphEdge表示两个HeapGraphNode节点间的关联，从上游节点到下游节点
+	* @detail 
+	*/
+
+declare class Class_HeapGraphEdge extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 下游节点的链接方式，可能的值：
+	 * - profiler.Edge_ContextVariable,  函数中的变量
+	 * - profiler.Edge_Element,          数组中的元素
+	 * - profiler.Edge_Property,         有名对象的属性
+	 * - profiler.Edge_Internal,         JS无法进入的链接
+	 * - profiler.Edge_Hidden,           指向需要事先计算出空间大小的节点
+	 * - profiler.Edge_Shortcut,         指向无法事先计算出空间大小的节点
+	 * - profiler.Edge_Weak,             一个弱引用（被GC忽视）
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	type: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 链接名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 链接的描述
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	description: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief 获取HeapGraphEdge的上游HeapGraphNode节点
+	 * @return 返回源HeapGraphNode节点
+	 * 
+	 * 
+	 * 
+	 */
+	getFromNode(): Class_HeapGraphNode;
+
+	/**
+	 * 
+	 * @brief 获取HeapGraphEdge的下游HeapGraphNode节点
+	 * @return 返回目的HeapGraphNode节点
+	 * 
+	 * 
+	 * 
+	 */
+	getToNode(): Class_HeapGraphNode;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HeapGraphNode.d.ts b/types/fibjs/declare/HeapGraphNode.d.ts
new file mode 100644
index 0000000000..5ff54d1fd6
--- /dev/null
+++ b/types/fibjs/declare/HeapGraphNode.d.ts
@@ -0,0 +1,120 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief HeapGraphNode表示堆视图中的一个节点
+	* @detail 
+	*/
+
+declare class Class_HeapGraphNode extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 节点类型，可能的值：
+	 * - profiler.Node_Hidden,         隐藏节点，当显示给用户时可以被过滤掉
+	 * - profiler.Node_Array,          数组
+	 * - profiler.Node_String,         字符串
+	 * - profiler.Node_Object,         JS对象（字符串和数组除外）
+	 * - profiler.Node_Code,           编译后的代码
+	 * - profiler.Node_Closure,        函数闭包
+	 * - profiler.Node_RegExp,         正则表达式
+	 * - profiler.Node_HeapNumber,     堆中排好序的数字
+	 * - profiler.Node_Native,         Native对象（非v8堆上的）
+	 * - profiler.Node_Synthetic,      Synthetic对象
+	 * - profiler.Node_ConsString,     拼接的字符串
+	 * - profiler.Node_SlicedString,   分割的字符串
+	 * - profiler.Node_Symbol,         符号（ES6）
+	 * - profiler.Node_SimdValue,      堆中排好序的SIMD值(ES7)
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	type: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 节点名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 节点的描述
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	description: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 节点ID
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	id: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 节点大小，单位为字节
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	shallowSize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 子节点列表，由HeapGraphEdge类型对象组成
+	 * 
+	 * @readonly
+	 * @type NArray
+	 */
+	
+	childs: any[]
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HeapSnapshot.d.ts b/types/fibjs/declare/HeapSnapshot.d.ts
new file mode 100644
index 0000000000..0a10a6b68f
--- /dev/null
+++ b/types/fibjs/declare/HeapSnapshot.d.ts
@@ -0,0 +1,101 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief HeapSnapshots记录JS堆在某个时刻的状态
+	* @detail 
+	*/
+
+declare class Class_HeapSnapshot extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 时间信息
+	 * 
+	 * @readonly
+	 * @type Date
+	 */
+	
+	time: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 堆视图的根节点
+	 * 
+	 * @readonly
+	 * @type HeapGraphNode
+	 */
+	
+	root: Class_HeapGraphNode
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 堆视图节点组成的列表
+	 * 
+	 * @readonly
+	 * @type NArray
+	 */
+	
+	nodes: any[]
+	
+	
+	
+	/**
+	 * 
+	 * @brief 和指定的堆快照进行比较
+	 * @param before 待比较的堆快照
+	 * @return 返回堆快照的比较结果
+	 * 
+	 * 
+	 * 
+	 */
+	diff(before: Class_HeapSnapshot): object;
+
+	/**
+	 * 
+	 * @brief 根据ID获取堆视图节点
+	 * @param id 数字类型的节点ID
+	 * @return 返回获取到的堆视图节点
+	 * 
+	 * 
+	 * 
+	 */
+	getNodeById(id: number): Class_HeapGraphNode;
+
+	/**
+	 * 
+	 * @brief 根据指定名称保存HeapSnapshot
+	 * @param fname 快照名称
+	 * 
+	 * 
+	 * @async
+	 */
+	save(fname: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpClient.d.ts b/types/fibjs/declare/HttpClient.d.ts
new file mode 100644
index 0000000000..7c9f6c073f
--- /dev/null
+++ b/types/fibjs/declare/HttpClient.d.ts
@@ -0,0 +1,282 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http客户端对象
+	* @detail http客户端对象模拟浏览器环境缓存cookie，并在访问url的时候携带对应的cookie，不同的http客户端对象是相互隔离的，提供http的request、get、post等方法。,用法如下：,,```JavaScript,var http = require('http');,var httpClient = new http.Client();,httpClient.request('GET', 'http://fibjs.org');,```
+	*/
+
+declare class Class_HttpClient extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回http客户端的 HttpCookie 对象列表
+	 * 
+	 * @readonly
+	 * @type NArray
+	 */
+	
+	cookies: any[]
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置超时时间 单位毫秒
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	timeout: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 body 最大尺寸，以 MB 为单位，缺省为 -1，不限制尺寸
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxBodySize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief cookie功能开关，默认开启
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	enableCookie: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 自动redirect功能开关，默认开启
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	autoRedirect: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 http 请求中的浏览器标识
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	userAgent: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 keep-alive 最大缓存连接数，缺省 128
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	poolSize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 keep-alive 缓存连接超时时间，缺省 10000 ms
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	poolTimeout: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief HttpClient 构造函数，创建一个新的HttpClient对象
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 发送 http 请求到指定的流对象，并返回结果
+	 * @param conn 指定处理请求的流对象
+	 * @param req 要发送的 HttpRequest 对象
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	request(conn: Class_Stream, req: Class_HttpRequest): Class_HttpResponse;
+
+	/**
+	 * 
+	 * @brief 请求指定的 url，并返回结果
+	 * opts 包含请求的附加选项，支持的内容如下：
+	 * ```JavaScript
+	 * {
+	 * "query": {},
+	 * "body": SeekedStream | Buffer | String | {},
+	 * "json": {},
+	 * "headers": {}
+	 * }
+	 * ```
+	 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+	 * @param method 指定 http 请求方法：GET, POST 等
+	 * @param url 指定 url，必须是包含主机的完整 url
+	 * @param opts 指定附加信息
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	request(method: string, url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+
+	/**
+	 * 
+	 * @brief 用 GET 方法请求指定的 url，并返回结果，等同于 request("GET", ...)
+	 * opts 包含请求的附加选项，支持的内容如下：
+	 * ```JavaScript
+	 * {
+	 * "query": {},
+	 * "body": SeekedStream | Buffer | String | {},
+	 * "json": {},
+	 * "headers": {}
+	 * }
+	 * ```
+	 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+	 * @param url 指定 url，必须是包含主机的完整 url
+	 * @param opts 指定附加信息
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	get(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+
+	/**
+	 * 
+	 * @brief 用 POST 方法请求指定的 url，并返回结果，等同于 request("POST", ...)
+	 * opts 包含请求的附加选项，支持的内容如下：
+	 * ```JavaScript
+	 * {
+	 * "query": {},
+	 * "body": SeekedStream | Buffer | String | {},
+	 * "json": {},
+	 * "headers": {}
+	 * }
+	 * ```
+	 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+	 * @param url 指定 url，必须是包含主机的完整 url
+	 * @param opts 指定附加信息
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	post(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+
+	/**
+	 * 
+	 * @brief 用 DELETE 方法请求指定的 url，并返回结果，等同于 request("DELETE", ...)
+	 * opts 包含请求的附加选项，支持的内容如下：
+	 * ```JavaScript
+	 * {
+	 * "query": {},
+	 * "body": SeekedStream | Buffer | String | {},
+	 * "json": {},
+	 * "headers": {}
+	 * }
+	 * ```
+	 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+	 * @param url 指定 url，必须是包含主机的完整 url
+	 * @param opts 指定附加信息
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	del(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+
+	/**
+	 * 
+	 * @brief 用 PUT 方法请求指定的 url，并返回结果，等同于 request("PUT", ...)
+	 * opts 包含请求的附加选项，支持的内容如下：
+	 * ```JavaScript
+	 * {
+	 * "query": {},
+	 * "body": SeekedStream | Buffer | String | {},
+	 * "json": {},
+	 * "headers": {}
+	 * }
+	 * ```
+	 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+	 * @param url 指定 url，必须是包含主机的完整 url
+	 * @param opts 指定附加信息
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	put(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+
+	/**
+	 * 
+	 * @brief 用 PATCH 方法请求指定的 url，并返回结果，等同于 request("PATCH", ...)
+	 * opts 包含请求的附加选项，支持的内容如下：
+	 * ```JavaScript
+	 * {
+	 * "query": {},
+	 * "body": SeekedStream | Buffer | String | {},
+	 * "json": {},
+	 * "headers": {}
+	 * }
+	 * ```
+	 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+	 * @param url 指定 url，必须是包含主机的完整 url
+	 * @param opts 指定附加信息
+	 * @return 返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	patch(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpCollection.d.ts b/types/fibjs/declare/HttpCollection.d.ts
new file mode 100644
index 0000000000..1936011e1d
--- /dev/null
+++ b/types/fibjs/declare/HttpCollection.d.ts
@@ -0,0 +1,126 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http 容器对象，用于 http header，cookie，query，form，等数据的存储与组织
+	* @detail 
+	*/
+
+declare class Class_HttpCollection extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 清除容器数据
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+	/**
+	 * 
+	 * @brief 检查容器内是否存在指定键值的数据
+	 * @param name 指定要检查的键值
+	 * @return 返回键值是否存在
+	 * 
+	 * 
+	 * 
+	 */
+	has(name: string): boolean;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的第一个值
+	 * @param name 指定要查询的键值
+	 * @return 返回键值所对应的值，若不存在，则返回 undefined
+	 * 
+	 * 
+	 * 
+	 */
+	first(name: string): any;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的全部值
+	 * @param name 指定要查询的键值
+	 * @return 返回键值所对应全部值的数组，若数据不存在，则返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	all(name: string): any[];
+
+	/**
+	 * 
+	 * @brief 添加一个键值数据，添加数据并不修改已存在的键值的数据
+	 * @param map 指定要添加的键值数据字典
+	 * 
+	 * 
+	 * 
+	 */
+	add(map: object): void;
+
+	/**
+	 * 
+	 * @brief 添加一个键值数据，添加数据并不修改已存在的键值的数据
+	 * @param name 指定要添加的键值
+	 * @param value 指定要添加的数据
+	 * 
+	 * 
+	 * 
+	 */
+	add(name: string, value: any): void;
+
+	/**
+	 * 
+	 * @brief 设定一个键值数据，设定数据将修改键值所对应的第一个数值，并清除相同键值的其余数据
+	 * @param map 指定要设定的键值数据字典
+	 * 
+	 * 
+	 * 
+	 */
+	set(map: object): void;
+
+	/**
+	 * 
+	 * @brief 设定一个键值数据，设定数据将修改键值所对应的第一个数值，并清除相同键值的其余数据
+	 * @param name 指定要设定的键值
+	 * @param value 指定要设定的数据
+	 * 
+	 * 
+	 * 
+	 */
+	set(name: string, value: any): void;
+
+	/**
+	 * 
+	 * @brief 删除指定键值的全部值
+	 * @param name 指定要删除的键值
+	 * 
+	 * 
+	 * 
+	 */
+	remove(name: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpCookie.d.ts b/types/fibjs/declare/HttpCookie.d.ts
new file mode 100644
index 0000000000..b7c3980150
--- /dev/null
+++ b/types/fibjs/declare/HttpCookie.d.ts
@@ -0,0 +1,160 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http Cookie 对象，用于添加和处理 cookie
+	* @detail 
+	*/
+
+declare class Class_HttpCookie extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 名称
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 的值
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	value: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 的域名范围
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	domain: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 的路径范围
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	path: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 的过期时间
+	 * 
+	 * 
+	 * @type Date
+	 */
+	
+	expires: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 是否仅允许 http 请求，缺省 false
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	httpOnly: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 cookie 是否仅通过 https 传递，缺省 false
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	secure: boolean
+	
+	
+	
+	/**
+	 * 
+	 * @brief HttpCookie 构造函数，创建一个新的 HttpCookie 对象
+	 * @param opts 指定创建的 cookie 的属性
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(opts?: object/** = v8::Object::New(isolate)*/);
+
+	/**
+	 * 
+	 * @brief HttpCookie 构造函数，创建一个新的 HttpCookie 对象
+	 * @param name 指定创建的 cookie 名称
+	 * @param value 指定创建的 cookie 值
+	 * @param opts 指定创建的 cookie 的其它属性
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(name: string, value: string, opts?: object/** = v8::Object::New(isolate)*/);
+
+	/**
+	 * 
+	 * @brief 解析给定的字符串，填充 cookie 对象
+	 * @param header 指定需要解析的 header 字符串
+	 * 
+	 * 
+	 * 
+	 */
+	parse(header: string): void;
+
+	/**
+	 * 
+	 * @brief 检测给定的 url 是否匹配当前设置
+	 * @param url 指定测试的 url
+	 * @return 匹配成功返回 true
+	 * 
+	 * 
+	 * 
+	 */
+	match(url: string): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpHandler.d.ts b/types/fibjs/declare/HttpHandler.d.ts
new file mode 100644
index 0000000000..4f412cb31f
--- /dev/null
+++ b/types/fibjs/declare/HttpHandler.d.ts
@@ -0,0 +1,101 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http 协议转换处理器
+	* @detail 用以将数据流转换为 http 协议消息，创建方式：,```JavaScript,var hdlr = new mq.HttpHandler(...);,```,或者：,```JavaScript,var hdlr = new http.Handler(...);,```
+	*/
+/// <reference path="HandlerEx.d.ts" />
+declare class Class_HttpHandler extends Class_HandlerEx {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置是否允强制使用 gzip 压缩输出，缺省为 false
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	forceGZIP: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置最大请求头个数，缺省为 128
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxHeadersCount: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 body 最大尺寸，以 MB 为单位，缺省为 64
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxBodySize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置服务器名称，缺省为：fibjs/0.x.0
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	serverName: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief 创建一个 http 协议处理器对象，将流对象的数据转变为 http 消息对象
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief 允许跨域请求
+	 * @param allowHeaders 指定接受的 http 头字段
+	 * 
+	 * 
+	 * 
+	 */
+	enableCrossOrigin(allowHeaders?: string/** = "Content-Type"*/): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpMessage.d.ts b/types/fibjs/declare/HttpMessage.d.ts
new file mode 100644
index 0000000000..1d64ba5c5f
--- /dev/null
+++ b/types/fibjs/declare/HttpMessage.d.ts
@@ -0,0 +1,202 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http 基础消息对象
+	* @detail 
+	*/
+/// <reference path="Message.d.ts" />
+declare class Class_HttpMessage extends Class_Message {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 协议版本信息，允许的格式为：HTTP/#.#
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	protocol: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 包含消息中 http 消息头的容器，只读属性
+	 * 
+	 * @readonly
+	 * @type HttpCollection
+	 */
+	
+	headers: Class_HttpCollection
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设定是否保持连接
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	keepAlive: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设定是否是升级协议
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	upgrade: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置最大请求头个数，缺省为 128
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxHeadersCount: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 body 最大尺寸，以 MB 为单位，缺省为 64
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxBodySize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前对象的来源 socket
+	 * 
+	 * @readonly
+	 * @type Stream
+	 */
+	
+	socket: Class_Stream
+	
+	
+	
+	/**
+	 * 
+	 * @brief 检查是否存在指定键值的消息头
+	 * @param name 指定要检查的键值
+	 * @return 返回键值是否存在
+	 * 
+	 * 
+	 * 
+	 */
+	hasHeader(name: string): boolean;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的第一个消息头
+	 * @param name 指定要查询的键值
+	 * @return 返回键值所对应的值，若不存在，则返回 undefined
+	 * 
+	 * 
+	 * 
+	 */
+	firstHeader(name: string): any;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的全部消息头
+	 * @param name 指定要查询的键值
+	 * @return 返回键值所对应全部值的数组，若数据不存在，则返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	allHeader(name: string): any[];
+
+	/**
+	 * 
+	 * @brief 添加一个消息头，添加数据并不修改已存在的键值的消息头
+	 * @param map 指定要添加的键值数据字典
+	 * 
+	 * 
+	 * 
+	 */
+	addHeader(map: object): void;
+
+	/**
+	 * 
+	 * @brief 添加一个消息头，添加数据并不修改已存在的键值的消息头
+	 * @param name 指定要添加的键值
+	 * @param value 指定要添加的数据
+	 * 
+	 * 
+	 * 
+	 */
+	addHeader(name: string, value: any): void;
+
+	/**
+	 * 
+	 * @brief 设定一个消息头，设定数据将修改键值所对应的第一个数值，并清除相同键值的其余消息头
+	 * @param map 指定要设定的键值数据字典
+	 * 
+	 * 
+	 * 
+	 */
+	setHeader(map: object): void;
+
+	/**
+	 * 
+	 * @brief 设定一个消息头，设定数据将修改键值所对应的第一个数值，并清除相同键值的其余消息头
+	 * @param name 指定要设定的键值
+	 * @param value 指定要设定的数据
+	 * 
+	 * 
+	 * 
+	 */
+	setHeader(name: string, value: any): void;
+
+	/**
+	 * 
+	 * @brief 删除指定键值的全部消息头
+	 * @param name 指定要删除的键值
+	 * 
+	 * 
+	 * 
+	 */
+	removeHeader(name: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpRequest.d.ts b/types/fibjs/declare/HttpRequest.d.ts
new file mode 100644
index 0000000000..b7116f8673
--- /dev/null
+++ b/types/fibjs/declare/HttpRequest.d.ts
@@ -0,0 +1,125 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http 请求消息对象
+	* @detail 
+	*/
+/// <reference path="HttpMessage.d.ts" />
+declare class Class_HttpRequest extends Class_HttpMessage {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取响应消息对象
+	 * 
+	 * @readonly
+	 * @type HttpResponse
+	 */
+	
+	response: Class_HttpResponse
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置请求方法
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	method: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置请求地址
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	address: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置请求查询字符串
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	queryString: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取包含消息 cookies 的容器
+	 * 
+	 * @readonly
+	 * @type HttpCollection
+	 */
+	
+	cookies: Class_HttpCollection
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取包含消息 form 的容器
+	 * 
+	 * @readonly
+	 * @type HttpCollection
+	 */
+	
+	form: Class_HttpCollection
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取包含消息 query 的容器
+	 * 
+	 * @readonly
+	 * @type HttpCollection
+	 */
+	
+	query: Class_HttpCollection
+	
+	
+	
+	/**
+	 * 
+	 * @brief HttpRequest 构造函数，创建一个新的 HttpRequest 对象
+	 * 
+	 * 
+	 */
+	constructor();
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpResponse.d.ts b/types/fibjs/declare/HttpResponse.d.ts
new file mode 100644
index 0000000000..7f69b8509a
--- /dev/null
+++ b/types/fibjs/declare/HttpResponse.d.ts
@@ -0,0 +1,130 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http 响应消息对象
+	* @detail 
+	*/
+/// <reference path="HttpMessage.d.ts" />
+declare class Class_HttpResponse extends Class_HttpMessage {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置响应消息的返回状态
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	statusCode: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置响应消息的返回消息
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	statusMessage: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前消息的 HttpCookie 对象列表
+	 * 
+	 * @readonly
+	 * @type NArray
+	 */
+	
+	cookies: any[]
+	
+	
+	
+	/**
+	 * 
+	 * @brief HttpResponse 构造函数，创建一个新的 HttpResponse 对象
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 设置响应消息的返回状态，返回消息，并添加响应头
+	 * @param statusCode 指定响应消息的返回状态
+	 * @param statusMessage 指定响应消息的返回消息
+	 * @param headers 指定响应消息添加的响应头
+	 * 
+	 * 
+	 * 
+	 */
+	writeHead(statusCode: number, statusMessage: string, headers?: object/** = v8::Object::New(isolate)*/): void;
+
+	/**
+	 * 
+	 * @brief 设置响应消息的返回状态，返回消息，并添加响应头
+	 * @param statusCode 指定响应消息的返回状态
+	 * @param headers 指定响应消息添加的响应头
+	 * 
+	 * 
+	 * 
+	 */
+	writeHead(statusCode: number, headers?: object/** = v8::Object::New(isolate)*/): void;
+
+	/**
+	 * 
+	 * @brief 向 cookies 添加一个 HttpCookie 对象
+	 * @param cookie 指定要添加的 HttpCookie 对象
+	 * 
+	 * 
+	 * 
+	 */
+	addCookie(cookie: Class_HttpCookie): void;
+
+	/**
+	 * 
+	 * @brief 发送重定向到客户端
+	 * @param url 重定向的地址
+	 * 
+	 * 
+	 * 
+	 */
+	redirect(url: string): void;
+
+	/**
+	 * 
+	 * @brief 仅发送格式化 http 头到给定的流对象
+	 * @param stm 指定接收格式化消息的流对象
+	 * 
+	 * 
+	 * @async
+	 */
+	sendHeader(stm: Class_Stream): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpServer.d.ts b/types/fibjs/declare/HttpServer.d.ts
new file mode 100644
index 0000000000..75ba24c290
--- /dev/null
+++ b/types/fibjs/declare/HttpServer.d.ts
@@ -0,0 +1,162 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http 服务器对象
+	* @detail http 服务器对象是将 TcpServer 和 HttpHandler 组合封装的对象，方便快速搭建服务器，逻辑上相当于：,```JavaScript,var svr = new net.TcpServer(addr, port, new http.Handler(function(req){,   ...,}));,```,,创建方法：,```JavaScript,var http = require("http");,var svr = new http.Server(80, function(req){,    ...,});,```
+	*/
+/// <reference path="TcpServer.d.ts" />
+declare class Class_HttpServer extends Class_TcpServer {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置是否允强制使用 gzip 压缩输出，缺省为 false
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	forceGZIP: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置最大请求头个数，缺省为 128
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxHeadersCount: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置 body 最大尺寸，以 MB 为单位，缺省为 64
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxBodySize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置服务器名称，缺省为：fibjs/0.x.0
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	serverName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询 http 协议转换处理器的工作状态
+	 * 
+	 * 返回的结果为一个 Stats 对象，结构如下：
+	 * ```JavaScript
+	 * {
+	 * total : 1000,    // 总计处理的请求
+	 * pendding : 100,  // 当前正在处理的请求
+	 * request : 10,    // 新建的请求
+	 * response : 10,   // 发送的响应
+	 * error : 100,     // 发生的错误（不计入 404）
+	 * error_400 : 10,  // 发生的请求错误
+	 * error_404 : 12,  // 文件未找到的数量
+	 * error_500 : 2    // 内部处理错误
+	 * }
+	 * ```
+	 * 
+	 * 
+	 * @readonly
+	 * @type Stats
+	 */
+	
+	httpStats: Class_Stats
+	
+	
+	
+	/**
+	 * 
+	 * @brief HttpServer 构造函数，在所有本机地址侦听
+	 * @param port 指定 http 服务器侦听端口
+	 * @param hdlr http 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(port: number, hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief HttpServer 构造函数
+	 * @param addr 指定 http 服务器侦听地址，为 "" 则在本机所有地址侦听
+	 * @param port 指定 http 服务器侦听端口
+	 * @param hdlr http 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(addr: string, port: number, hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief 设置错误处理器
+	 * 
+	 * 使用方式：
+	 * ```JavaScript
+	 * hdlr.onerror({
+	 * "404": function(v)
+	 * {
+	 * ...
+	 * },
+	 * "500": new mq.Routing(...)
+	 * })
+	 * ```
+	 * @param hdlrs 指定不同的错误的处理器，key 是错误号，value 是处理器，可以是内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	onerror(hdlrs: object): void;
+
+	/**
+	 * 
+	 * @brief 允许跨域请求
+	 * @param allowHeaders 指定接受的 http 头字段
+	 * 
+	 * 
+	 * 
+	 */
+	enableCrossOrigin(allowHeaders?: string/** = "Content-Type"*/): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpUploadData.d.ts b/types/fibjs/declare/HttpUploadData.d.ts
new file mode 100644
index 0000000000..9b3679c51b
--- /dev/null
+++ b/types/fibjs/declare/HttpUploadData.d.ts
@@ -0,0 +1,81 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 包含 multipart 的一个条目数据
+	* @detail 
+	*/
+
+declare class Class_HttpUploadData extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 包含本条目数据的文件名
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	fileName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 包含本条目数据的类型
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	contentType: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 包含本条目数据的传输编码类型
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	contentTransferEncoding: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 包含本条目数据部分的流对象
+	 * 
+	 * @readonly
+	 * @type SeekableStream
+	 */
+	
+	body: Class_SeekableStream
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/HttpsServer.d.ts b/types/fibjs/declare/HttpsServer.d.ts
new file mode 100644
index 0000000000..d5f391c1b6
--- /dev/null
+++ b/types/fibjs/declare/HttpsServer.d.ts
@@ -0,0 +1,137 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief https 服务器对象
+	* @detail https 服务器对象是将 SslServer 和 HttpHandler 组合封装的对象，方便快速搭建服务器，逻辑上相当于：,```JavaScript,var svr = new net.SslServer(crt, key, addr, port, new http.Handler(function(req){,   ...,}));,```,,创建方法：,```JavaScript,var http = require("http");,var svr = new http.HttpsServer(crt, key, 443, function(req){,    ...,});,```
+	*/
+/// <reference path="HttpServer.d.ts" />
+declare class Class_HttpsServer extends Class_HttpServer {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设定证书验证模式，缺省为 VERIFY_NONE
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	verification: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 客户端证书验证 ca
+	 * 
+	 * @readonly
+	 * @type X509Cert
+	 */
+	
+	ca: Class_X509Cert
+	
+	
+	
+	/**
+	 * 
+	 * @brief HttpsServer 构造函数，在所有本机地址侦听
+	 * 
+	 * certs 格式为：
+	 * ```JavaScript
+	 * [
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * },
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * }
+	 * ]
+	 * ```
+	 * @param certs 服务器证书列表
+	 * @param port 指定 http 服务器侦听端口
+	 * @param hdlr http 内置消息处理器，处理函数，链式处理数组，路由对象，详见
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(certs: any[], port: number, hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief HttpsServer 构造函数
+	 * 
+	 * certs 格式为：
+	 * ```JavaScript
+	 * [
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * },
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * }
+	 * ]
+	 * ```
+	 * @param certs 服务器证书列表
+	 * @param addr 指定 http 服务器侦听地址，为 "" 则在本机所有地址侦听
+	 * @param port 指定 http 服务器侦听端口
+	 * @param hdlr http 内置消息处理器，处理函数，链式处理数组，路由对象，详见
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(certs: any[], addr: string, port: number, hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief HttpsServer 构造函数，在所有本机地址侦听
+	 * @param crt X509Cert 证书，用于客户端验证服务器
+	 * @param key PKey 私钥，用于与客户端会话
+	 * @param port 指定 http 服务器侦听端口
+	 * @param hdlr http 内置消息处理器，处理函数，链式处理数组，路由对象，详见
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(crt: Class_X509Cert, key: Class_PKey, port: number, hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief HttpsServer 构造函数
+	 * @param crt X509Cert 证书，用于客户端验证服务器
+	 * @param key PKey 私钥，用于与客户端会话
+	 * @param addr 指定 http 服务器侦听地址，为 "" 则在本机所有地址侦听
+	 * @param port 指定 http 服务器侦听端口
+	 * @param hdlr http 内置消息处理器，处理函数，链式处理数组，路由对象，详见
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(crt: Class_X509Cert, key: Class_PKey, addr: string, port: number, hdlr: Class_Handler);
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Image.d.ts b/types/fibjs/declare/Image.d.ts
new file mode 100644
index 0000000000..272eb49505
--- /dev/null
+++ b/types/fibjs/declare/Image.d.ts
@@ -0,0 +1,856 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 图像处理对象，用以对图像进行转换，绘制，存储等操作
+	* @detail Image 对象属于 gd 模块，创建：,```JavaScript,var img = gd.create(640, 480);,var img1 = gd.load(data);,```
+	*/
+
+declare class Class_Image extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询图像宽度
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	width: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询图像高度
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	height: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询图像来源格式，结果为 gd.PNG, gd.JPEG, gd.GIF, gd.BMP, gd.WEBP
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	format: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询图像类型，结果为 gd.TRUECOLOR, gd.PALETTE
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	type: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询图像颜色表内的颜色总数
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	colorsTotal: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设定指定的颜色为透明色
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	transparent: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设定图像是否渐进式，仅支持 jpeg 格式时
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	progressive: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief查询和设定绘图时是否计算 alpha 层，缺省为 true
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	alphaBlending: boolean
+	
+	
+	
+	/**
+	 * 
+	 * @brief 按照指定的格式返回图像数据
+	 * @param format 指定返回数据的格式，允许值为 gd.PNG, gd.JPEG, gd.GIF, gd.BMP, gd.WEBP, 缺省为 gd.PNG
+	 * @param quality 当格式为 gd.JPEG 或 gd.WEBP 时用于指定压缩质量，缺省为 85，其他格式忽略此参数
+	 * @return 返回格式化的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	getData(format?: number/** = undefined*/, quality?: number/** = 85*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 按照指定的格式将图像数据存入流对象
+	 * @param stm 指定要存入的流对象
+	 * @param format 指定返回数据的格式，允许值为 gd.PNG, gd.JPEG, gd.GIF, gd.BMP, gd.WEBP, 缺省为 gd.PNG
+	 * @param quality 当格式为 gd.JPEG 或 gd.WEBP 时用于指定压缩质量，缺省为 85，其他格式忽略此参数
+	 * 
+	 * 
+	 * @async
+	 */
+	save(stm: Class_Stream, format?: number/** = undefined*/, quality?: number/** = 85*/): void;
+
+	/**
+	 * 
+	 * @brief 按照指定的格式将图像数据存入指定文件，文件将被强制覆盖
+	 * @param fname 指定文件名
+	 * @param format 指定返回数据的格式，允许值为 gd.PNG, gd.JPEG, gd.GIF, gd.BMP, gd.WEBP, 缺省为 gd.PNG
+	 * @param quality 当格式为 gd.JPEG 时用于指定压缩质量，缺省为 85，其他格式忽略此参数
+	 * 
+	 * 
+	 * @async
+	 */
+	save(fname: string, format?: number/** = undefined*/, quality?: number/** = 85*/): void;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色申请一个颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorAllocate(red: number, green: number, blue: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色申请一个颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorAllocate(color: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色及透明申请一个颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @param alpha 透明分量，范围为 0-1.0
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorAllocateAlpha(red: number, green: number, blue: number, alpha: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色及透明申请一个颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorAllocateAlpha(color: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色查找一个最接近的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorClosest(red: number, green: number, blue: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色查找一个最接近的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorClosest(color: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色查找一个最接近的颜色号，此方法使用 Hue/White/Black 计算查找最接近颜色，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorClosestHWB(red: number, green: number, blue: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色查找一个最接近的颜色号，此方法使用 Hue/White/Black 计算查找最接近颜色，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorClosestHWB(color: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色及透明查找一个最接近的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @param alpha 透明分量，范围为 0-1.0
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorClosestAlpha(red: number, green: number, blue: number, alpha: number): number;
+
+	/**
+	 * 
+	 * @brief 为指定的颜色及透明查找一个最接近的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorClosestAlpha(color: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色对应的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorExact(red: number, green: number, blue: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色对应的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorExact(color: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色及透明对应的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @param alpha 透明分量，范围为 0-1.0
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorExactAlpha(red: number, green: number, blue: number, alpha: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色及透明对应的颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorExactAlpha(color: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色对应的颜色号，如果颜色不存在，则为其申请一个新颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorResolve(red: number, green: number, blue: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色对应的颜色号，如果颜色不存在，则为其申请一个新颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgb 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorResolve(color: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色及透明对应的颜色号，如果颜色不存在，则为其申请一个新颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param red 红色分量，范围为 0-255
+	 * @param green 绿色分量，范围为 0-255
+	 * @param blue 蓝色分量，范围为 0-255
+	 * @param alpha 透明分量，范围为 0-1.0
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorResolveAlpha(red: number, green: number, blue: number, alpha: number): number;
+
+	/**
+	 * 
+	 * @brief 查找指定的颜色及透明对应的颜色号，如果颜色不存在，则为其申请一个新颜色号，对于 gd.PALETTE 图像，颜色号为调色板索引，对于 gd.TRUECOLOR 图像，颜色号为 rgba 编码数值
+	 * @param color 组合颜色值，可由 gd.color, gb.rgb, gd.rgba 等函数生成
+	 * @return 返回颜色号，不成功返回 -1
+	 * 
+	 * 
+	 * 
+	 */
+	colorResolveAlpha(color: number): number;
+
+	/**
+	 * 
+	 * @brief 释放指定的颜色号，释放的颜色号将会被再次申请后替换
+	 * @param color 指定要释放的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	colorDeallocate(color: number): void;
+
+	/**
+	 * 
+	 * @brief 设定绘图的剪切窗口，设定后，所有的绘制将被剪切在窗口内部
+	 * @param x1 剪切窗口的左上 x 坐标
+	 * @param y1 剪切窗口的左上 y 坐标
+	 * @param x2 剪切窗口的右下 x 坐标
+	 * @param y2 剪切窗口的右下 y 坐标
+	 * 
+	 * 
+	 * 
+	 */
+	clip(x1: number, y1: number, x2: number, y2: number): void;
+
+	/**
+	 * 
+	 * @brief 查询指定位置点的颜色
+	 * @param x 指定查询的 x 坐标
+	 * @param y 指定查询的 y 坐标
+	 * @return 返回指定点的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	getPixel(x: number, y: number): number;
+
+	/**
+	 * 
+	 * @brief 查询指定位置点的真彩色颜色
+	 * @param x 指定查询的 x 坐标
+	 * @param y 指定查询的 y 坐标
+	 * @return 返回指定点的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	getTrueColorPixel(x: number, y: number): number;
+
+	/**
+	 * 
+	 * @brief 在指定位置画一个点
+	 * @param x 指定画点的 x 坐标
+	 * @param y 指定画点的 y 坐标
+	 * @param color 指定画点的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	setPixel(x: number, y: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 设定画线的宽度，line, rectangle, arc 等方法画线时缺省宽度为一个像素，可使用此方法改变线的宽度
+	 * @param thickness 画线的宽度
+	 * 
+	 * 
+	 * 
+	 */
+	setThickness(thickness: number): void;
+
+	/**
+	 * 
+	 * @brief 在指定的位置画一条线
+	 * @param x1 指定画线的起始 x 坐标
+	 * @param y1 指定画线的起始 y 坐标
+	 * @param x2 指定画线的结束 x 坐标
+	 * @param y2 指定画线的结束 y 坐标
+	 * @param color 指定画线的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	line(x1: number, y1: number, x2: number, y2: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 在指定的位置画一个矩形
+	 * @param x1 指定左上角 x 坐标
+	 * @param y1 指定左上角 y 坐标
+	 * @param x2 指定右下角 x 坐标
+	 * @param y2 指定右下角 y 坐标
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	rectangle(x1: number, y1: number, x2: number, y2: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 在指定的位置画一个填充的矩形
+	 * @param x1 指定左上角 x 坐标
+	 * @param y1 指定左上角 y 坐标
+	 * @param x2 指定右下角 x 坐标
+	 * @param y2 指定右下角 y 坐标
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	filledRectangle(x1: number, y1: number, x2: number, y2: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的点绘制一个多边形
+	 * @param points 包含多边形点的数组，如 [[1, 1], [1, 10], [10, 15], [10, 20]]
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	polygon(points: any[], color: number): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的点绘制一个开放多边形
+	 * @param points 包含多边形点的数组，如 [[1, 1], [1, 10], [10, 15], [10, 20]]
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	openPolygon(points: any[], color: number): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的点绘制一个填充多边形
+	 * @param points 包含多边形点的数组，如 [[1, 1], [1, 10], [10, 15], [10, 20]]
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	filledPolygon(points: any[], color: number): void;
+
+	/**
+	 * 
+	 * @brief 画一个椭圆
+	 * @param x 椭圆中心的 x 坐标
+	 * @param y 椭圆中心的 y 坐标
+	 * @param width 椭圆的宽度
+	 * @param height 椭圆的高度
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	ellipse(x: number, y: number, width: number, height: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 画一个填充的椭圆
+	 * @param x 椭圆中心的 x 坐标
+	 * @param y 椭圆中心的 y 坐标
+	 * @param width 椭圆的宽度
+	 * @param height 椭圆的高度
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	filledEllipse(x: number, y: number, width: number, height: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 画一个扇形
+	 * @param x 扇形中心的 x 坐标
+	 * @param y 扇形中心的 y 坐标
+	 * @param width 扇形所在椭圆的宽度
+	 * @param height 扇形所在椭圆的高度
+	 * @param start 扇形开始的角度，范围为 0-360
+	 * @param end 扇形结束的角度，范围为 0-360
+	 * @param color 指定矩形的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	arc(x: number, y: number, width: number, height: number, start: number, end: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 画一个填充扇形
+	 * @param x 扇形中心的 x 坐标
+	 * @param y 扇形中心的 y 坐标
+	 * @param width 扇形所在椭圆的宽度
+	 * @param height 扇形所在椭圆的高度
+	 * @param start 扇形开始的角度，范围为 0-360
+	 * @param end 扇形结束的角度，范围为 0-360
+	 * @param color 指定矩形的颜色号
+	 * @param style 指定扇形的样式，允许的值有 gd.ARC, gd.CHORD, gd.NOFILL, gd.EDGED 及其组合
+	 * 
+	 * 
+	 * 
+	 */
+	filledArc(x: number, y: number, width: number, height: number, start: number, end: number, color: number, style?: number/** = undefined*/): void;
+
+	/**
+	 * 
+	 * @brief 从指定的点开始填充封闭区域
+	 * @param x 开始填充的 x 坐标
+	 * @param y 开始填充的 y 坐标
+	 * @param color 指定填充的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	fill(x: number, y: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 从指定的点开始在指定颜色的边框内填充封闭区域
+	 * @param x 开始填充的 x 坐标
+	 * @param y 开始填充的 y 坐标
+	 * @param borderColor 指定边框的颜色号
+	 * @param color 指定填充的颜色号
+	 * 
+	 * 
+	 * 
+	 */
+	fillToBorder(x: number, y: number, borderColor: number, color: number): void;
+
+	/**
+	 * 
+	 * @brief 替换图像中指定的颜色为新颜色
+	 * @param src 指定要替换的颜色
+	 * @param dst 指定新颜色
+	 * 
+	 * 
+	 * @async
+	 */
+	colorReplace(src: number, dst: number): void;
+
+	/**
+	 * 
+	 * @brief 复制当前图像为一个新图像
+	 * @return 返回复制的新图像对象
+	 * 
+	 * 
+	 * @async
+	 */
+	clone(): Class_Image;
+
+	/**
+	 * 
+	 * @brief 根据图像拉伸生成一个新尺寸的图像
+	 * @param width 指定拉伸的宽度
+	 * @param height 指定拉伸的高度
+	 * @return 返回新图像对象
+	 * 
+	 * 
+	 * @async
+	 */
+	resample(width: number, height: number): Class_Image;
+
+	/**
+	 * 
+	 * @brief 剪切图像的一部分为一个新的图像
+	 * @param x 剪切窗口的左上 x 坐标
+	 * @param y 剪切窗口的左上 y 坐标
+	 * @param width 剪切窗口的宽度
+	 * @param height 剪切窗口的高度
+	 * @return 返回剪切出的图像
+	 * 
+	 * 
+	 * @async
+	 */
+	crop(x: number, y: number, width: number, height: number): Class_Image;
+
+	/**
+	 * 
+	 * @brief 镜像当前图像
+	 * @param dir 镜像方向，允许值为 gd.BOTH,gd.HORIZONTAL, gd.VERTICAL, 缺省为 gd.HORIZONTAL
+	 * 
+	 * 
+	 * @async
+	 */
+	flip(dir?: number/** = undefined*/): void;
+
+	/**
+	 * 
+	 * @brief 旋转当前图像
+	 * @param dir 旋转方向，允许值为 gd.LEFT, gd.RIGHT
+	 * 
+	 * 
+	 * @async
+	 */
+	rotate(dir: number): void;
+
+	/**
+	 * 
+	 * @brief 转换当前图像类型
+	 * @param color 指定图像类型，允许值为 gd.TRUECOLOR 或 gd.PALETTE
+	 * 
+	 * 
+	 * @async
+	 */
+	convert(color?: number/** = undefined*/): void;
+
+	/**
+	 * 
+	 * @brief 从一个图像中复制一个区域到指定的位置
+	 * @param source 源图像对象
+	 * @param dstX 指定复制目标的 x 坐标
+	 * @param dstY 指定复制目标的 y 坐标
+	 * @param srcX 指定复制源左上角的 x 坐标
+	 * @param srcY 指定复制源左上角的 y 坐标
+	 * @param width 指定复制的宽度
+	 * @param height 指定复制的高度
+	 * 
+	 * 
+	 * @async
+	 */
+	copy(source: Class_Image, dstX: number, dstY: number, srcX: number, srcY: number, width: number, height: number): void;
+
+	/**
+	 * 
+	 * @brief 从一个图像中复制一个区域覆盖到指定的位置
+	 * @param source 源图像对象
+	 * @param dstX 指定复制目标的 x 坐标
+	 * @param dstY 指定复制目标的 y 坐标
+	 * @param srcX 指定复制源左上角的 x 坐标
+	 * @param srcY 指定复制源左上角的 y 坐标
+	 * @param width 指定复制的宽度
+	 * @param height 指定复制的高度
+	 * @param percent 指定覆盖的透明度
+	 * 
+	 * 
+	 * @async
+	 */
+	copyMerge(source: Class_Image, dstX: number, dstY: number, srcX: number, srcY: number, width: number, height: number, percent: number): void;
+
+	/**
+	 * 
+	 * @brief 从一个图像中复制一个区域的灰度覆盖到指定的位置
+	 * @param source 源图像对象
+	 * @param dstX 指定复制目标的 x 坐标
+	 * @param dstY 指定复制目标的 y 坐标
+	 * @param srcX 指定复制源左上角的 x 坐标
+	 * @param srcY 指定复制源左上角的 y 坐标
+	 * @param width 指定复制的宽度
+	 * @param height 指定复制的高度
+	 * @param percent 指定覆盖的透明度
+	 * 
+	 * 
+	 * @async
+	 */
+	copyMergeGray(source: Class_Image, dstX: number, dstY: number, srcX: number, srcY: number, width: number, height: number, percent: number): void;
+
+	/**
+	 * 
+	 * @brief 将一个图像中的一个区域拉伸后复制到指定的位置
+	 * @param source 源图像对象
+	 * @param dstX 指定复制目标的 x 坐标
+	 * @param dstY 指定复制目标的 y 坐标
+	 * @param srcX 指定复制源左上角的 x 坐标
+	 * @param srcY 指定复制源左上角的 y 坐标
+	 * @param dstW 指定复制的拉伸宽度
+	 * @param dstH 指定复制的拉伸高度
+	 * @param srcW 指定复制的源宽度
+	 * @param srcH 指定复制的源高度
+	 * 
+	 * 
+	 * @async
+	 */
+	copyResized(source: Class_Image, dstX: number, dstY: number, srcX: number, srcY: number, dstW: number, dstH: number, srcW: number, srcH: number): void;
+
+	/**
+	 * 
+	 * @brief 将一个图像中的一个区域拉伸后复制到指定的位置，不同与 copyResized，此方法拉伸时会对图像进行抖动
+	 * @param source 源图像对象
+	 * @param dstX 指定复制目标的 x 坐标
+	 * @param dstY 指定复制目标的 y 坐标
+	 * @param srcX 指定复制源左上角的 x 坐标
+	 * @param srcY 指定复制源左上角的 y 坐标
+	 * @param dstW 指定复制的拉伸宽度
+	 * @param dstH 指定复制的拉伸高度
+	 * @param srcW 指定复制的源宽度
+	 * @param srcH 指定复制的源高度
+	 * 
+	 * 
+	 * @async
+	 */
+	copyResampled(source: Class_Image, dstX: number, dstY: number, srcX: number, srcY: number, dstW: number, dstH: number, srcW: number, srcH: number): void;
+
+	/**
+	 * 
+	 * @brief 将一个图像中的一个区域旋转后复制到指定的位置
+	 * @param source 源图像对象
+	 * @param dstX 指定复制目标的 x 坐标
+	 * @param dstY 指定复制目标的 y 坐标
+	 * @param srcX 指定复制源左上角的 x 坐标
+	 * @param srcY 指定复制源左上角的 y 坐标
+	 * @param width 指定复制的宽度
+	 * @param height 指定复制的高度
+	 * @param angle 指定旋转的角度
+	 * 
+	 * 
+	 * @async
+	 */
+	copyRotated(source: Class_Image, dstX: number, dstY: number, srcX: number, srcY: number, width: number, height: number, angle: number): void;
+
+	/**
+	 * 
+	 * @brief 把过滤器 filterType应用到图像上，根据过滤器类型传入所需参数
+	 * 
+	 * 参数 filterType 可以为以下数值：
+	 * - MEAN_REMOVAL,    用平均移除法来达到轮廓效果
+	 * - EDGEDETECT,      用边缘检测来突出图像的边缘
+	 * - EMBOSS,          使图像浮雕化
+	 * - SELECTIVE_BLUR,  模糊图像
+	 * - GAUSSIAN_BLUR,   用高斯算法模糊图像
+	 * - NEGATE,          将图像中所有颜色反转
+	 * - GRAYSCALE,       将图像转换为灰度图
+	 * - SMOOTH,          使图像更柔滑，用arg1设定柔滑级别
+	 * - BRIGHTNESS,      改变图像的亮度，用arg1设定亮度级别，取值范围是-255~255
+	 * - CONTRAST,        改变图像的对比度，用arg1设定对比度级别，取值范围是0~100
+	 * - COLORIZE,        改变图像的色调，用arg1、arg2、arg3分别指定red、blue、green分值，每种颜色范围是0~255，arg4为透明度，取值返回是0~127
+	 * @param filterType 过滤器类型
+	 * @param arg1 过滤器所需参数: SMOOTH 的平滑级别、BRIGHTNESS 的亮度级别、CONTRAST 的对比度级别、COLORIZE 的 red 分值
+	 * @param arg2 过滤器所需参数: COLORIZE 的 green 分值
+	 * @param arg3 过滤器所需参数: COLORIZE 的 blue 分值
+	 * @param arg4 过滤器所需参数: COLORIZE 的透明度 alpha 分值
+	 * 
+	 * 
+	 * @async
+	 */
+	filter(filterType: number, arg1?: number/** = 0*/, arg2?: number/** = 0*/, arg3?: number/** = 0*/, arg4?: number/** = 0*/): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的矩阵，对当前图像进行仿射
+	 * 
+	 * 参数 affine 是一个数组：
+	 * ```JavaScript
+	 * affine = [ a0, a1, b0, b1, a2, b2 ];
+	 * x' = a0x + a1y + a2;
+	 * y' = b0x + b1y + b2;
+	 * ```
+	 * @param affine 仿射矩阵，由  6 个 double 类型的数字组成
+	 * @param x 可选剪切区域的原点 x 坐标
+	 * @param y 可选剪切区域的原点 y 坐标
+	 * @param width 可选剪切区域的的宽度
+	 * @param height 可选剪切区域的的高度
+	 * @return 返回仿射后的图像
+	 * 
+	 * 
+	 * @async
+	 */
+	affine(affine: any[], x?: number/** = -1*/, y?: number/** = -1*/, width?: number/** = -1*/, height?: number/** = -1*/): Class_Image;
+
+	/**
+	 * 
+	 * @brief 对当前图像进行高斯模糊处理
+	 * @param radius 模糊半径
+	 * 
+	 * 
+	 * @async
+	 */
+	gaussianBlur(radius: number): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Int64.d.ts b/types/fibjs/declare/Int64.d.ts
new file mode 100644
index 0000000000..898fe5c675
--- /dev/null
+++ b/types/fibjs/declare/Int64.d.ts
@@ -0,0 +1,241 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 64位整数对象
+	* @detail 创建方法：,```JavaScript,var n = new Int64(123);,```
+	*/
+
+declare class Class_Int64 extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 高 32 位数值
+	 * 
+	 * 
+	 * @type Long
+	 */
+	
+	hi: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 低 32 位数值
+	 * 
+	 * 
+	 * @type Long
+	 */
+	
+	lo: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief Int64 构造函数
+	 * @param num 初始化的值
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(num?: number/** = 0*/);
+
+	/**
+	 * 
+	 * @brief Int64 构造函数
+	 * @param hi 高32位数
+	 * @param lo 低32位数
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(hi: number, lo: number);
+
+	/**
+	 * 
+	 * @brief Int64 构造函数
+	 * @param num 初始化的值
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(num: Class_Int64);
+
+	/**
+	 * 
+	 * @brief Int64 构造函数
+	 * @param num 数字字符串
+	 * @param base 数字字符串的编码方式，可以接受 2-16, 32, 64，默认为 10，为 10 时自动识别 0x 编码
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(num: string, base?: number/** = 10*/);
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定数值比较大小
+	 * @param num 指定比较的数值
+	 * @return 返回 1 表示 Int64 内的数值比指定数值更大，0 表示相等，-1 表示更小
+	 * 
+	 * 
+	 * 
+	 */
+	compare(num: Class_Int64): number;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值左移相应的位数，此操作不影响 Int64 原有数值
+	 * @param bits 指定移动的位数
+	 * @return 返回包含移位以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	shiftLeft(bits: number): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值右移相应的位数，此操作不影响 Int64 原有数值
+	 * @param bits 指定移动的位数
+	 * @return 返回包含移位以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	shiftRight(bits: number): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行按位 and 操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	and(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行按位 or 操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	or(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行按位 xor 操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	xor(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行加操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	add(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行减操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	sub(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行乘操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	multi(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 将 Int64 内的数值与给定的数值进行除操作，此操作不影响 Int64 原有数值
+	 * @param num 指定运算的数值
+	 * @return 返回包含预算以后数值的对象
+	 * 
+	 * 
+	 * 
+	 */
+	div(num: Class_Int64): Class_Int64;
+
+	/**
+	 * 
+	 * @brief 比较当前对象与给定的对象是否相等
+	 * @param expected 制定比较的目标对象
+	 * @return 返回对象比较的结果
+	 * 
+	 * 
+	 * 
+	 */
+	equals(expected: Class__object): boolean;
+
+	/**
+	 * 
+	 * @brief 转换成数字类型
+	 * @return 返回转换后的数字
+	 * 
+	 * 
+	 * 
+	 */
+	toNumber(): number;
+
+	/**
+	 * 
+	 * @brief 转换成字符串类型
+	 * @param base 字符串进制数，可以接受 2-16, 32, 64，默认为 10
+	 * @return 返回转换后的字符串
+	 * 
+	 * 
+	 * 
+	 */
+	toString(base?: number/** = 10*/): string;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/LevelDB.d.ts b/types/fibjs/declare/LevelDB.d.ts
new file mode 100644
index 0000000000..c9721bf337
--- /dev/null
+++ b/types/fibjs/declare/LevelDB.d.ts
@@ -0,0 +1,176 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief LevelDB 数据库对象
+	* @detail 用以创建和管理字典对象，创建方法：,```JavaScript,var db = require("db");,var test = new db.openLevelDB("test.db");,```
+	*/
+
+declare class Class_LevelDB extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 检查数据库内是否存在指定键值的数据
+	 * @param key 指定要检查的键值
+	 * @return 返回键值是否存在
+	 * 
+	 * 
+	 * @async
+	 */
+	has(key: Class_Buffer): boolean;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的值
+	 * @param key 指定要查询的键值
+	 * @return 返回键值所对应的值，若不存在，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	get(key: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 查询一组指定键值的值
+	 * @param keys 指定要查询的键值数组
+	 * @return 返回包含键值得数组
+	 * 
+	 * 
+	 * 
+	 */
+	mget(keys: any[]): any[];
+
+	/**
+	 * 
+	 * @brief 设定一个键值数据，键值不存在则插入新数据
+	 * @param key 指定要设定的键值
+	 * @param value 指定要设定的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	set(key: Class_Buffer, value: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 设定一组键值数据，键值不存在则插入新数据
+	 * @param map 指定要设定的键值数据字典
+	 * 
+	 * 
+	 * 
+	 */
+	mset(map: object): void;
+
+	/**
+	 * 
+	 * @brief 删除一组指定键值的值
+	 * @param keys 指定要删除的键值数组
+	 * 
+	 * 
+	 * 
+	 */
+	mremove(keys: any[]): void;
+
+	/**
+	 * 
+	 * @brief 删除指定键值的全部值
+	 * @param key 指定要删除的键值
+	 * 
+	 * 
+	 * @async
+	 */
+	remove(key: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 枚举数据库中所有的键值对
+	 * 
+	 * 回调函数有两个参数，(value, key)
+	 * 
+	 * ```JavaScript
+	 * var db = require("db");
+	 * var test = new db.openLevelDB("test.db");
+	 * 
+	 * test.forEach(function(value, key){
+	 * ...
+	 * });
+	 * ```
+	 * @param func 枚举回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	forEach(func: Function): void;
+
+	/**
+	 * 
+	 * @brief 枚举数据库中键值在 from 和 to 之间的键值对
+	 * 
+	 * 回调函数有两个参数，(value, key)
+	 * 
+	 * ```JavaScript
+	 * var db = require("db");
+	 * var test = new db.openLevelDB("test.db");
+	 * 
+	 * test.between("aaa", "bbb", function(value, key){
+	 * ...
+	 * });
+	 * ```
+	 * @param from 枚举的最小键值，枚举时包含此键值
+	 * @param to 枚举的最大键值，枚举时不包含此键值
+	 * @param func 枚举回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	between(from: Class_Buffer, to: Class_Buffer, func: Function): void;
+
+	/**
+	 * 
+	 * @brief 在当前数据库上开启一个事务
+	 * @return 返回一个开启的事务对象
+	 * 
+	 * 
+	 */
+	begin(): Class_LevelDB;
+
+	/**
+	 * 
+	 * @brief 提交当前事务
+	 * 
+	 * 
+	 */
+	commit(): void;
+
+	/**
+	 * 
+	 * @brief 关闭当前数据库连接或事务
+	 * 
+	 * @async
+	 */
+	close(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Lock.d.ts b/types/fibjs/declare/Lock.d.ts
new file mode 100644
index 0000000000..cb8a7d38d8
--- /dev/null
+++ b/types/fibjs/declare/Lock.d.ts
@@ -0,0 +1,79 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 纤程锁对象
+	* @detail 不同于操作系统的锁，纤程锁是纯逻辑实现，加锁与解锁负荷很小,```JavaScript,var l = new coroutine.Lock();,l.acquire();,.....,l.release();,```
+	*/
+
+declare class Class_Lock extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 获取锁的拥有权
+	 * 
+	 * acquire 方法用于获取锁的拥有权，当锁处于可获取状态时，此方法立即返回 true。
+	 * 
+	 * 当锁不可获取，且 blocking 为 true，则当前纤程进入休眠，当其他纤程释放锁后，此方法返回 true。
+	 * 
+	 * 当锁不可获取，且 blocking 为 false，则方法返回 false。
+	 * @param blocking 指定是否等待，为 true 时等待，缺省为真
+	 * @return 返回是否成功获取锁，为 true 表示成功获取
+	 * 
+	 * 
+	 * 
+	 */
+	acquire(blocking?: boolean/** = true*/): boolean;
+
+	/**
+	 * 
+	 * @brief 释放锁的拥有权
+	 * 
+	 * 此方法将释放对锁的拥有权，如果当前纤程未拥有锁，此方法将抛出错误。
+	 * 
+	 * 
+	 * 
+	 */
+	release(): void;
+
+	/**
+	 * 
+	 * @brief 查询当前等待任务数
+	 * @return 返回任务数
+	 * 
+	 * 
+	 * 
+	 */
+	count(): number;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/LruCache.d.ts b/types/fibjs/declare/LruCache.d.ts
new file mode 100644
index 0000000000..f68ac413cd
--- /dev/null
+++ b/types/fibjs/declare/LruCache.d.ts
@@ -0,0 +1,163 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief LRU(least recently used) 缓存对象
+	* @detail LruCache 用以维护一个 LRU 缓存，创建方法：,```JavaScript,var util = require("util");,var c = new util.LruCache(10, 100);,```
+	*/
+/// <reference path="EventEmitter.d.ts" />
+declare class Class_LruCache extends Class_EventEmitter {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询容器内数值个数
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	size: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置容器内元素失效时间，单位是 ms，小于等于 0 不失效
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	timeout: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定数据超时事件，相当于 on("expire", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onexpire: Function
+	
+	
+	
+	/**
+	 * 
+	 * @brief LruCache 对象构造函数
+	 * @param size 缓存最大尺寸
+	 * @param timeout 元素失效时间，单位是 ms，小于等于 0 不失效，缺省为 0
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(size: number, timeout?: number/** = 0*/);
+
+	/**
+	 * 
+	 * @brief 清除容器数据
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+	/**
+	 * 
+	 * @brief 检查容器内是否存在指定键值的数据
+	 * @param name 指定要检查的键值
+	 * @return 返回键值是否存在
+	 * 
+	 * 
+	 * 
+	 */
+	has(name: string): boolean;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的值
+	 * @param name 指定要查询的键值
+	 * @return 返回键值所对应的值，若不存在，则返回 undefined
+	 * 
+	 * 
+	 * 
+	 */
+	get(name: string): any;
+
+	/**
+	 * 
+	 * @brief 查询指定键值的值，若不存在或过期，则调用回调函数更新数据
+	 * @param name 指定要查询的键值
+	 * @param updater 指定更新函数
+	 * @return 返回键值所对应的值
+	 * 
+	 * 
+	 * 
+	 */
+	get(name: string, updater: Function): any;
+
+	/**
+	 * 
+	 * @brief 设定一个键值数据，键值不存在则插入一条新数据
+	 * @param name 指定要设定的键值
+	 * @param value 指定要设定的数据
+	 * 
+	 * 
+	 * 
+	 */
+	set(name: string, value: any): void;
+
+	/**
+	 * 
+	 * @brief 设定一个键值数据，键值不存在则插入新数据
+	 * @param map 指定要设定的键值数据字典
+	 * 
+	 * 
+	 * 
+	 */
+	set(map: object): void;
+
+	/**
+	 * 
+	 * @brief 删除指定键值的全部值
+	 * @param name 指定要删除的键值
+	 * 
+	 * 
+	 * 
+	 */
+	remove(name: string): void;
+
+	/**
+	 * 
+	 * @brief 检查容器是否为空
+	 * @return 容器内无数值则返回 true
+	 * 
+	 * 
+	 * 
+	 */
+	isEmpty(): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MSSQL.d.ts b/types/fibjs/declare/MSSQL.d.ts
new file mode 100644
index 0000000000..722ebbf448
--- /dev/null
+++ b/types/fibjs/declare/MSSQL.d.ts
@@ -0,0 +1,43 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief SQL Server 数据库连接对象
+	* @detail 使用 db.open 或 db.openMySQL 创建，创建方式：,```JavaScript,var sql = db.openMSSQL("mssql://user:pass@host/db");,```
+	*/
+/// <reference path="DbConnection.d.ts" />
+declare class Class_MSSQL extends Class_DbConnection {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 选择当前数据库连接的缺省数据库
+	 * @param dbName 指定数据库名
+	 * 
+	 * 
+	 * @async
+	 */
+	use(dbName: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MemoryStream.d.ts b/types/fibjs/declare/MemoryStream.d.ts
new file mode 100644
index 0000000000..2d707f48a9
--- /dev/null
+++ b/types/fibjs/declare/MemoryStream.d.ts
@@ -0,0 +1,69 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 内存流对象
+	* @detail MemoryStream 对象创建一个基于内存的流对象，创建方法：,```JavaScript,var ms = new io.MemoryStream();,```
+	*/
+/// <reference path="SeekableStream.d.ts" />
+declare class Class_MemoryStream extends Class_SeekableStream {
+	
+	
+	
+	/**
+	 * 
+	 * @brief MemoryStream 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 强制设定内存流对象的最后更新时间
+	 * @param d 指定要设定的时间
+	 * 
+	 * 
+	 * 
+	 */
+	setTime(d: Date): void;
+
+	/**
+	 * 
+	 * @brief 创建当前内存流的一个只读副本
+	 * @return 返回只读的内存流对象
+	 * 
+	 * 
+	 * 
+	 */
+	clone(): Class_MemoryStream;
+
+	/**
+	 * 
+	 * @brief 清空内存文件数据，复位指针
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Message.d.ts b/types/fibjs/declare/Message.d.ts
new file mode 100644
index 0000000000..efefee9105
--- /dev/null
+++ b/types/fibjs/declare/Message.d.ts
@@ -0,0 +1,235 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 基础消息对象
+	* @detail Message 对象兼容于 mq 各个模块，可用于构建自定义消息处理系统，创建方法：,```JavaScript,var mq = require("mq");,var m = new mq.Message();,```
+	*/
+
+declare class Class_Message extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 消息的基本内容
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	value: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 消息的基本参数
+	 * 
+	 * @readonly
+	 * @type NArray
+	 */
+	
+	params: any[]
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 消息类型
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	type: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询消息的数据
+	 * 
+	 * @readonly
+	 * @type Value
+	 */
+	
+	data: any
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 包含消息数据部分的流对象
+	 * 
+	 * 
+	 * @type SeekableStream
+	 */
+	
+	body: Class_SeekableStream
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 消息数据部分的长度
+	 * 
+	 * @readonly
+	 * @type Long
+	 */
+	
+	length: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询消息 readFrom 时的流对象
+	 * 
+	 * @readonly
+	 * @type Stream
+	 */
+	
+	stream: Class_Stream
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置消息处理的最后错误
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	lastError: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief 消息对象构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 从流内读取指定大小的数据，此方法为 body 相应方法的别名
+	 * @param bytes 指定要读取的数据量，缺省为读取随机大小的数据块，读出的数据尺寸取决于设备
+	 * @return 返回从流内读取的数据，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	read(bytes?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 从流内读取剩余的全部数据，此方法为 body 相应方法的别名
+	 * @return 返回从流内读取的数据，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	readAll(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 写入给定的数据，此方法为 body 相应方法的别名
+	 * @param data 给定要写入的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	write(data: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 以 JSON 编码写入给定的数据
+	 * @param data 给定要写入的数据
+	 * @return 此方法不会返回数据
+	 * 
+	 * 
+	 * 
+	 */
+	json(data: any): any;
+
+	/**
+	 * 
+	 * @brief 以 JSON 编码解析消息中的数据
+	 * @return 返回解析的结果
+	 * 
+	 * 
+	 * 
+	 */
+	json(): any;
+
+	/**
+	 * 
+	 * @brief 设置当前消息处理结束，Chain 处理器不再继续后面的事务
+	 * 
+	 * 
+	 */
+	end(): void;
+
+	/**
+	 * 
+	 * @brief 查询当前消息是否结束
+	 * @return 结束则返回 true
+	 * 
+	 * 
+	 * 
+	 */
+	isEnded(): boolean;
+
+	/**
+	 * 
+	 * @brief 清除消息的内容
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+	/**
+	 * 
+	 * @brief 发送格式化消息到给定的流对象
+	 * @param stm 指定接收格式化消息的流对象
+	 * 
+	 * 
+	 * @async
+	 */
+	sendTo(stm: Class_Stream): void;
+
+	/**
+	 * 
+	 * @brief 从给定的缓存流对象中读取格式化消息，并解析填充对象
+	 * @param stm 指定读取格式化消息的流对象
+	 * 
+	 * 
+	 * @async
+	 */
+	readFrom(stm: Class_Stream): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MongoCollection.d.ts b/types/fibjs/declare/MongoCollection.d.ts
new file mode 100644
index 0000000000..e721feabcd
--- /dev/null
+++ b/types/fibjs/declare/MongoCollection.d.ts
@@ -0,0 +1,227 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief mongodb 数据库数据集对象
+	* @detail 使用 MongoDB.getCollection 创建：,```JavaScript,var col1 = mdb.getCollection('test');,var col = mdb.test;,```
+	*/
+
+declare class Class_MongoCollection extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 根据给定的查询条件和返回字段设定，建立游标对象
+	 * @param query 指定查询条件的对象
+	 * @param projection 指定返回字段的对象
+	 * @return 返回游标对象
+	 * 
+	 * 
+	 * 
+	 */
+	find(query?: object/** = v8::Object::New(isolate)*/, projection?: object/** = v8::Object::New(isolate)*/): Class_MongoCursor;
+
+	/**
+	 * 
+	 * @brief 根据给定的查询条件和返回字段设定，查询一条结果
+	 * @param query 指定查询条件的对象
+	 * @param projection 指定返回字段的对象
+	 * @return 返回第一条结果
+	 * 
+	 * 
+	 * 
+	 */
+	findOne(query?: object/** = v8::Object::New(isolate)*/, projection?: object/** = v8::Object::New(isolate)*/): object;
+
+	/**
+	 * 
+	 * @brief 查询并修改
+	 * @param query 指定查询条件，修改数据
+	 * @return 返回修改前的结果及其他信息
+	 * 
+	 * 
+	 * 
+	 */
+	findAndModify(query: object): object;
+
+	/**
+	 * 
+	 * @brief 插入一组数据
+	 * @param documents 指定要插入的数据数组
+	 * 
+	 * 
+	 * 
+	 */
+	insert(documents: any[]): void;
+
+	/**
+	 * 
+	 * @brief 插入一条数据
+	 * @param document 指定要插入的数据
+	 * 
+	 * 
+	 * 
+	 */
+	insert(document: object): void;
+
+	/**
+	 * 
+	 * @brief 保存一条数据，若数据包含 _id 字段，则为更新，否则为插入
+	 * @param document 指定要保存的数据
+	 * 
+	 * 
+	 * 
+	 */
+	save(document: object): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的查询条件更新数据
+	 * @param query 指定查询条件的对象
+	 * @param document 指定要更新的数据
+	 * @param upsert 数据不存在时，插入一条新数据，缺省为 false，不插入
+	 * @param multi 当符合条件的数据多于一条时，更新所有数据，缺省为 false，只更新第一条
+	 * 
+	 * 
+	 * 
+	 */
+	update(query: object, document: object, upsert?: boolean/** = false*/, multi?: boolean/** = false*/): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的查询条件更新数据
+	 * @param query 指定查询条件的对象
+	 * @param document 指定要更新的数据
+	 * @param options 以对象字段传递的 upsert 和 multi 选项
+	 * 
+	 * 
+	 * 
+	 */
+	update(query: object, document: object, options: object): void;
+
+	/**
+	 * 
+	 * @brief 根据给定的查询条件删除数据
+	 * @param query 指定查询条件的对象
+	 * 
+	 * 
+	 * 
+	 */
+	remove(query: object): void;
+
+	/**
+	 * 
+	 * @brief 执行数据库命令
+	 * @param cmd 给定命令对象
+	 * @return 返回命令返回结果
+	 * 
+	 * 
+	 * 
+	 */
+	runCommand(cmd: object): object;
+
+	/**
+	 * 
+	 * @brief 执行数据库命令
+	 * @param cmd 给定命令名称
+	 * @param arg 给定命令参数选项
+	 * @return 返回命令返回结果
+	 * 
+	 * 
+	 * 
+	 */
+	runCommand(cmd: string, arg?: object/** = v8::Object::New(isolate)*/): object;
+
+	/**
+	 * 
+	 * @brief 删除当前集合
+	 * 
+	 * 
+	 */
+	drop(): void;
+
+	/**
+	 * 
+	 * @brief 在当前集合上创建索引
+	 * @param keys 给定索引字段、顺序和方向
+	 * @param options 给定索引的选项，唯一索引等
+	 * 
+	 * 
+	 * 
+	 */
+	ensureIndex(keys: object, options?: object/** = v8::Object::New(isolate)*/): void;
+
+	/**
+	 * 
+	 * @brief 重建当前集合的索引
+	 * @return 返回命令执行结果
+	 * 
+	 * 
+	 * 
+	 */
+	reIndex(): object;
+
+	/**
+	 * 
+	 * @brief 删除当前集合指定名称的索引
+	 * @param name 给定要删除的索引名称
+	 * @return 返回命令执行结果
+	 * 
+	 * 
+	 * 
+	 */
+	dropIndex(name: string): object;
+
+	/**
+	 * 
+	 * @brief 删除当前集合全部索引
+	 * @return 返回命令执行结果
+	 * 
+	 * 
+	 * 
+	 */
+	dropIndexes(): object;
+
+	/**
+	 * 
+	 * @brief 查询当前集合全部索引
+	 * @return 返回包含索引的结果集
+	 * 
+	 * 
+	 * 
+	 */
+	getIndexes(): Class_MongoCursor;
+
+	/**
+	 * 
+	 * @brief 获取当前集合子命名空间的集合对象
+	 * @param name 子命名空间名称
+	 * @return 返回新集合对象
+	 * 
+	 * 
+	 * 
+	 */
+	getCollection(name: string): Class_MongoCollection;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MongoCursor.d.ts b/types/fibjs/declare/MongoCursor.d.ts
new file mode 100644
index 0000000000..2dc99b5e96
--- /dev/null
+++ b/types/fibjs/declare/MongoCursor.d.ts
@@ -0,0 +1,149 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief mongodb 数据库数据游标对象
+	* @detail 
+	*/
+
+declare class Class_MongoCursor extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 指定返回结果时跳过的记录数
+	 * @param num 记录数
+	 * @return 返回游标对象本身便于链式调用
+	 * 
+	 * 
+	 * @async
+	 */
+	skip(num: number): Class_MongoCursor;
+
+	/**
+	 * 
+	 * @brief 指定返回结果的最大记录数
+	 * @param size 记录数
+	 * @return 返回游标对象本身便于链式调用
+	 * 
+	 * 
+	 * @async
+	 */
+	limit(size: number): Class_MongoCursor;
+
+	/**
+	 * 
+	 * @brief 设定返回结果的排序
+	 * @param opts 指定排序条件
+	 * @return 返回游标对象本身便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	sort(opts: object): Class_MongoCursor;
+
+	/**
+	 * 
+	 * @brief 查询当前游标是否有下一条记录
+	 * @return 有记录则返回 true
+	 * 
+	 * 
+	 * 
+	 */
+	hasNext(): boolean;
+
+	/**
+	 * 
+	 * @brief 返回当前游标的下一条记录
+	 * @return 记录对象，无记录则返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	next(): object;
+
+	/**
+	 * 
+	 * @brief 查询游标的记录总数
+	 * @param applySkipLimit 指定是否查询 skip 和 limit 后的记录数，缺省为 false，查询全部记录数
+	 * @return 返回记录总数
+	 * 
+	 * 
+	 * 
+	 */
+	count(applySkipLimit?: boolean/** = false*/): number;
+
+	/**
+	 * 
+	 * @brief 查询游标的记录总数，相当于 count(true)
+	 * @return 返回记录总数
+	 * 
+	 * 
+	 * 
+	 */
+	size(): number;
+
+	/**
+	 * 
+	 * @brief 遍历全部记录并回调处理函数
+	 * @param func 指定处理函数
+	 * 
+	 * 
+	 * 
+	 */
+	forEach(func: Function): void;
+
+	/**
+	 * 
+	 * @brief 遍历处理全部记录，并返回处理结果
+	 * @param func 指定处理函数
+	 * @return 返回处理结果数组
+	 * 
+	 * 
+	 * 
+	 */
+	map(func: Function): any[];
+
+	/**
+	 * 
+	 * @brief 返回当前游标全部记录的数组
+	 * @return 返回包含全部数据的 Javascript 数组
+	 * 
+	 * 
+	 * 
+	 */
+	toArray(): any[];
+
+	/**
+	 * 
+	 * @brief 修改 mongodb 服务器缺省索引策略，使用指定的索引进行查询
+	 * @param opts 指定强制使用的索引
+	 * @return 返回游标对象本身便于链式调用
+	 * 
+	 * 
+	 * 
+	 */
+	hint(opts: object): Class_MongoCursor;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MongoDB.d.ts b/types/fibjs/declare/MongoDB.d.ts
new file mode 100644
index 0000000000..11bcf1456d
--- /dev/null
+++ b/types/fibjs/declare/MongoDB.d.ts
@@ -0,0 +1,86 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief mongodb 数据库连接对象
+	* @detail 使用 db.open 或 db.openMongoDB 创建，创建方式：,```JavaScript,var mdb = db.openMongoDB("mongodb://host/db");,```
+	*/
+
+declare class Class_MongoDB extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 获取指定集合访问对象
+	 * @param name 指定集合的名称
+	 * @return 返回指定的集合对象
+	 * 
+	 * 
+	 * 
+	 */
+	getCollection(name: string): Class_MongoCollection;
+
+	/**
+	 * 
+	 * @brief 指定一个 MongoDB 数据库命令
+	 * @param cmd 指定命令和参数的字典对象
+	 * @return 返回命令执行结果
+	 * 
+	 * 
+	 * 
+	 */
+	runCommand(cmd: object): object;
+
+	/**
+	 * 
+	 * @brief 指定一个简单的 MongoDB 数据库命令
+	 * @param cmd 指定命令名
+	 * @param arg 指定命令参数
+	 * @return 返回命令执行结果
+	 * 
+	 * 
+	 * 
+	 */
+	runCommand(cmd: string, arg: any): object;
+
+	/**
+	 * 
+	 * @brief 生成一个 mongodb _objectid 对象
+	 * @param hexStr 初始化 16 进制字符串，缺省生成新的 id
+	 * @return 新 _objectid 对象
+	 * 
+	 * 
+	 * 
+	 */
+	oid(hexStr?: string/** = ""*/): Class_MongoID;
+
+	/**
+	 * 
+	 * @brief 关闭当前数据库连接
+	 * 
+	 * @async
+	 */
+	close(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MongoID.d.ts b/types/fibjs/declare/MongoID.d.ts
new file mode 100644
index 0000000000..372b0fa30b
--- /dev/null
+++ b/types/fibjs/declare/MongoID.d.ts
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief mongodb 数据库数据唯一标识对象，用于存储传递 oid
+	* @detail 
+	*/
+
+declare class Class_MongoID extends Class__object {
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/MySQL.d.ts b/types/fibjs/declare/MySQL.d.ts
new file mode 100644
index 0000000000..a23f9615e4
--- /dev/null
+++ b/types/fibjs/declare/MySQL.d.ts
@@ -0,0 +1,67 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief mysql 数据库连接对象
+	* @detail 使用 db.open 或 db.openMySQL 创建，创建方式：,```JavaScript,var msql = db.openMySQL("mysql://user:pass@host/db");,```
+	*/
+/// <reference path="DbConnection.d.ts" />
+declare class Class_MySQL extends Class_DbConnection {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 数据库连接接收缓存尺寸
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	rxBufferSize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 数据库连接发送缓存尺寸
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	txBufferSize: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 选择当前数据库连接的缺省数据库
+	 * @param dbName 指定数据库名
+	 * 
+	 * 
+	 * @async
+	 */
+	use(dbName: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/PKey.d.ts b/types/fibjs/declare/PKey.d.ts
new file mode 100644
index 0000000000..297cfb2a13
--- /dev/null
+++ b/types/fibjs/declare/PKey.d.ts
@@ -0,0 +1,355 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 不对称加密算法对象
+	* @detail PKey 对象属于 crypto 模块，创建：,```JavaScript,var k = new crypto.PKey();,```
+	*/
+
+declare class Class_PKey extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前算法名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前算法密码长度，以位为单位
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	keySize: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回当前密钥的公钥
+	 * @return 当前密钥的公钥
+	 * 
+	 * 
+	 * @readonly
+	 * @type PKey
+	 */
+	
+	publicKey: Class_PKey
+	
+	
+	
+	/**
+	 * 
+	 * @brief PKey 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 通过 DER 格式的密钥构造 PKey
+	 * @param DerKey DER 格式的密钥
+	 * @param password 解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(DerKey: Class_Buffer, password?: string/** = ""*/);
+
+	/**
+	 * 
+	 * @brief 通过 PEM 格式的密钥构造 PKey
+	 * @param pemKey PEM 格式的密钥
+	 * @param password 解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(pemKey: string, password?: string/** = ""*/);
+
+	/**
+	 * 
+	 * @brief 通过 JSON 格式的密钥构造 PKey
+	 * 
+	 * jsonKey 的格式支持以下四种，RSA 私钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "RSA",
+	 * "n": "0m5lvKpWqy9JS7tV2HIPqHCYHLquSuxIC3F8strIQLJKO3rZmTT96KTnhsOfBO7Y1bI7mnT0PB3_vcHd9ekWMEoZJQw7MuB8KeM_Wn54-elJr5DNLk5bMppSGxX7ZnumiXGG51_X3Yp-_EbGtDG80GxXXix7Mucyo7K25uE0uW8=",
+	 * "e": "AQAB",
+	 * "d": "agN2O9NxMHL1MTMi75WfL9Pxvl-KWXKqZSF6mjzAsF9iKI8euyHIXYFepzU8kual1RsjDhCnzvWqFvZplW8lXqrHf_P-rS_9Y4gBUw6pjnI_DnFIRwWHRvrUHHSCfWOdTCIKdOTkgLZuGFuhEY3RMIW0WSYejjLtftwy0RVxAzk=",
+	 * "p": "6a4G1qmfwWmn1biigN7IVFlkbLf9oVe6g7rOmHxI-hn1GRxKDSVuAUrmR1IhuAnca9M0y7SD-7TUs6wjOxWxaw==",
+	 * "q": "5ofkxFKdPBD0CQHMb9q13AMHUVe0rJ-hSjqqIBrmqApUOneyAcMV76M0QyIQnI2p3POa4Qu_7XChDwRVl7LlDQ==",
+	 * "dp": "2mXGiGwCHl8j-FBWuID-1C6z-BRB3MBEVoeKPOOzxOPruatB3mWEGXsqG7A8SWgV9URxTI2K6P3J6Z7RUpBkvw==",
+	 * "dq": "oagn5vfb5NQqnOpS9xkSsD67cfIj821ZSFlNFYhnuOzNVda7z_qCtnHm4zDPH0lEFXoKYMfBhfqWJpaugttjPQ==",
+	 * "qi": "dqEQgxNmOVFrF4s776hTqeC6oEDila8EvpVb2F2ZvwAOLjCQ66OiAZK1BiYGHqUy0NeqNmtlsLSuBEZQZvqZwg=="
+	 * }
+	 * ```
+	 * RSA 公钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "RSA",
+	 * "n": "0m5lvKpWqy9JS7tV2HIPqHCYHLquSuxIC3F8strIQLJKO3rZmTT96KTnhsOfBO7Y1bI7mnT0PB3_vcHd9ekWMEoZJQw7MuB8KeM_Wn54-elJr5DNLk5bMppSGxX7ZnumiXGG51_X3Yp-_EbGtDG80GxXXix7Mucyo7K25uE0uW8=",
+	 * "e": "AQAB"
+	 * }
+	 * ```
+	 * EC 私钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "EC",
+	 * "crv": "P-521",
+	 * "x": "ATfNNFuuvlGxrTGoXgyfSAGgRNNDnO3rN3k74urKJdVS14RYhdnSwm91Bm-F1l-T1XKlAY2yRnzG9w1Ukvo8c0wL",
+	 * "y": "ASBHqrruB6kdkEUB3vlW3-UIkk4HtKdUeTwN-7m3j2rgZvYR1ffRAapDvWqKGiBjomqWafxokBkbDI0c95f6f4XU",
+	 * "d": "AfkIbUHXfW41njdpoKuqqKludcoLJS8D_oMEwkj-GVaXFNKccIoF5iKGu2c69kNDjo83R_7wyGlfRczsklkik1ST"
+	 * }
+	 * ```
+	 * EC 公钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "EC",
+	 * "crv": "P-521",
+	 * "x": "ATfNNFuuvlGxrTGoXgyfSAGgRNNDnO3rN3k74urKJdVS14RYhdnSwm91Bm-F1l-T1XKlAY2yRnzG9w1Ukvo8c0wL",
+	 * "y": "ASBHqrruB6kdkEUB3vlW3-UIkk4HtKdUeTwN-7m3j2rgZvYR1ffRAapDvWqKGiBjomqWafxokBkbDI0c95f6f4XU"
+	 * }
+	 * ```
+	 * @param jsonKey JSON 格式的密钥
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(jsonKey: object);
+
+	/**
+	 * 
+	 * @brief 生成一个 RSA 私钥
+	 * @param size 指定 RSA 密钥长度，bit 为单位
+	 * 
+	 * 
+	 * @async
+	 */
+	genRsaKey(size: number): void;
+
+	/**
+	 * 
+	 * @brief 生成一个 EC 私钥
+	 * @param curve 指定预置椭圆曲线，可选值为："secp521r1", "brainpoolP512r1", "secp384r1", "brainpoolP384r1", "secp256r1", "secp256k1", "brainpoolP256r1", "secp224r1", "secp224k1", "secp192r1", "secp192k1"
+	 * 
+	 * 
+	 * @async
+	 */
+	genEcKey(curve?: string/** = "secp521r1"*/): void;
+
+	/**
+	 * 
+	 * @brief 查询当前密钥是否为私钥
+	 * @return 为 True 表示为私钥
+	 * 
+	 * 
+	 * 
+	 */
+	isPrivate(): boolean;
+
+	/**
+	 * 
+	 * @brief 复制当前密钥
+	 * @return 当前密钥的复制对象
+	 * 
+	 * 
+	 * 
+	 */
+	clone(): Class_PKey;
+
+	/**
+	 * 
+	 * @brief 加载一个 DER 格式的密钥
+	 * @param DerKey DER 格式的密钥
+	 * @param password 解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	importKey(DerKey: Class_Buffer, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 PEM 格式的密钥
+	 * @param pemKey PEM 格式的密钥
+	 * @param password 解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	importKey(pemKey: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 JSON 格式的密钥
+	 * 
+	 * jsonKey 的格式支持以下四种，RSA 私钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "RSA",
+	 * "n": "0m5lvKpWqy9JS7tV2HIPqHCYHLquSuxIC3F8strIQLJKO3rZmTT96KTnhsOfBO7Y1bI7mnT0PB3_vcHd9ekWMEoZJQw7MuB8KeM_Wn54-elJr5DNLk5bMppSGxX7ZnumiXGG51_X3Yp-_EbGtDG80GxXXix7Mucyo7K25uE0uW8=",
+	 * "e": "AQAB",
+	 * "d": "agN2O9NxMHL1MTMi75WfL9Pxvl-KWXKqZSF6mjzAsF9iKI8euyHIXYFepzU8kual1RsjDhCnzvWqFvZplW8lXqrHf_P-rS_9Y4gBUw6pjnI_DnFIRwWHRvrUHHSCfWOdTCIKdOTkgLZuGFuhEY3RMIW0WSYejjLtftwy0RVxAzk=",
+	 * "p": "6a4G1qmfwWmn1biigN7IVFlkbLf9oVe6g7rOmHxI-hn1GRxKDSVuAUrmR1IhuAnca9M0y7SD-7TUs6wjOxWxaw==",
+	 * "q": "5ofkxFKdPBD0CQHMb9q13AMHUVe0rJ-hSjqqIBrmqApUOneyAcMV76M0QyIQnI2p3POa4Qu_7XChDwRVl7LlDQ==",
+	 * "dp": "2mXGiGwCHl8j-FBWuID-1C6z-BRB3MBEVoeKPOOzxOPruatB3mWEGXsqG7A8SWgV9URxTI2K6P3J6Z7RUpBkvw==",
+	 * "dq": "oagn5vfb5NQqnOpS9xkSsD67cfIj821ZSFlNFYhnuOzNVda7z_qCtnHm4zDPH0lEFXoKYMfBhfqWJpaugttjPQ==",
+	 * "qi": "dqEQgxNmOVFrF4s776hTqeC6oEDila8EvpVb2F2ZvwAOLjCQ66OiAZK1BiYGHqUy0NeqNmtlsLSuBEZQZvqZwg=="
+	 * }
+	 * ```
+	 * RSA 公钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "RSA",
+	 * "n": "0m5lvKpWqy9JS7tV2HIPqHCYHLquSuxIC3F8strIQLJKO3rZmTT96KTnhsOfBO7Y1bI7mnT0PB3_vcHd9ekWMEoZJQw7MuB8KeM_Wn54-elJr5DNLk5bMppSGxX7ZnumiXGG51_X3Yp-_EbGtDG80GxXXix7Mucyo7K25uE0uW8=",
+	 * "e": "AQAB"
+	 * }
+	 * ```
+	 * EC 私钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "EC",
+	 * "crv": "P-521",
+	 * "x": "ATfNNFuuvlGxrTGoXgyfSAGgRNNDnO3rN3k74urKJdVS14RYhdnSwm91Bm-F1l-T1XKlAY2yRnzG9w1Ukvo8c0wL",
+	 * "y": "ASBHqrruB6kdkEUB3vlW3-UIkk4HtKdUeTwN-7m3j2rgZvYR1ffRAapDvWqKGiBjomqWafxokBkbDI0c95f6f4XU",
+	 * "d": "AfkIbUHXfW41njdpoKuqqKludcoLJS8D_oMEwkj-GVaXFNKccIoF5iKGu2c69kNDjo83R_7wyGlfRczsklkik1ST"
+	 * }
+	 * ```
+	 * EC 公钥：
+	 * ```JavaScript
+	 * {
+	 * "kty": "EC",
+	 * "crv": "P-521",
+	 * "x": "ATfNNFuuvlGxrTGoXgyfSAGgRNNDnO3rN3k74urKJdVS14RYhdnSwm91Bm-F1l-T1XKlAY2yRnzG9w1Ukvo8c0wL",
+	 * "y": "ASBHqrruB6kdkEUB3vlW3-UIkk4HtKdUeTwN-7m3j2rgZvYR1ffRAapDvWqKGiBjomqWafxokBkbDI0c95f6f4XU"
+	 * }
+	 * ```
+	 * @param jsonKey JSON 格式的密钥
+	 * 
+	 * 
+	 * 
+	 */
+	importKey(jsonKey: object): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 PEM/DER 格式的密钥文件
+	 * @param filename 密钥文件名
+	 * @param password 解密密码
+	 * 
+	 * 
+	 * 
+	 */
+	importFile(filename: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 返回当前 key 的 PEM 格式编码
+	 * @return 当前 key 的 PEM 格式编码
+	 * 
+	 * 
+	 * 
+	 */
+	exportPem(): string;
+
+	/**
+	 * 
+	 * @brief 返回当前 key 的 DER 格式编码
+	 * @return 当前 key 的 DER 格式编码
+	 * 
+	 * 
+	 * 
+	 */
+	exportDer(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回当前 key 的 DER 格式编码
+	 * @return 当前 key 的 DER 格式编码
+	 * 
+	 * 
+	 * 
+	 */
+	exportJson(): object;
+
+	/**
+	 * 
+	 * @brief 使用当前算法密码公钥加密数据
+	 * @param data 指定要加密的数据
+	 * @return 返回加密后的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	encrypt(data: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 使用当前算法密码私钥解密数据
+	 * @param data 指定要解密的数据
+	 * @return 返回解密后的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	decrypt(data: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 使用当前算法密码私钥签名数据
+	 * @param data 指定要签名的数据
+	 * @param alg 指定要签名的算法, 默认0. 支持算法: 0=NONE,1=MD2,2=MD4,3=MD5,4=SHA1,5=SHA224,6=SHA256,7=SHA384,8=SHA512,9=RIPEMD160
+	 * @return 返回签名后的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	sign(data: Class_Buffer, alg?: number/** = 0*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 使用当前算法密码公钥验证数据
+	 * @param data 指定要验证的数据
+	 * @param sign 指定要验证的签名
+	 * @param alg 指定要签名的算法, 默认0. 支持算法: 0=NONE,1=MD2,2=MD4,3=MD5,4=SHA1,5=SHA224,6=SHA256,7=SHA384,8=SHA512,9=RIPEMD160
+	 * @return 返回验证后的结果
+	 * 
+	 * 
+	 * @async
+	 */
+	verify(data: Class_Buffer, sign: Class_Buffer, alg?: number/** = 0*/): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Redis.d.ts b/types/fibjs/declare/Redis.d.ts
new file mode 100644
index 0000000000..384e0e4d80
--- /dev/null
+++ b/types/fibjs/declare/Redis.d.ts
@@ -0,0 +1,576 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Redis 数据库客户端对象
+	* @detail 用以创建和管理 Redis 数据库，创建方法：,```JavaScript,var db = require("db");,var test = new db.openRedis("redis-server");,```
+	*/
+
+declare class Class_Redis extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置错误处理函数，当 sub 出现错误或者网络中断时回调，当回调发生后，本对象的一切 sub 都将中止
+	 * 
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onsuberror: Function
+	
+	
+	
+	/**
+	 * 
+	 * @brief redis 基础命令方法
+	 * @param cmd 指定发送的命令
+	 * @param args 指定发送的参数
+	 * @return 返回服务器返回的结果
+	 * 
+	 * 
+	 */
+	command(cmd: string, ...args: any[]): any;
+
+	/**
+	 * 
+	 * @brief 将字符串值 value 关联到 key，如果 key 已经持有其他值， SET 就覆写旧值，无视类型
+	 * @param key 指定要关联的 key
+	 * @param value 指定要关联的数据
+	 * @param ttl 以毫秒为单位为 key 设置生存时间；如果 ttl 为 0 ，那么不设置生存时间
+	 * 
+	 * 
+	 */
+	set(key: Class_Buffer, value: Class_Buffer, ttl?: number/** = 0*/): void;
+
+	/**
+	 * 
+	 * @brief 将 key 的值设为 value ，当且仅当 key 不存在。若给定的 key 已经存在，则 SETNX 不做任何动作。
+	 * @param key 指定要关联的 key
+	 * @param value 指定要关联的数据
+	 * @param ttl 以毫秒为单位为 key 设置生存时间；如果 ttl 为 0 ，那么不设置生存时间
+	 * 
+	 * 
+	 */
+	setNX(key: Class_Buffer, value: Class_Buffer, ttl?: number/** = 0*/): void;
+
+	/**
+	 * 
+	 * @brief 将 key 的值设为 value，只在键已经存在时，才对键进行设置操作。
+	 * @param key 指定要关联的 key
+	 * @param value 指定要关联的数据
+	 * @param ttl 以毫秒为单位为 key 设置生存时间；如果 ttl 为 0 ，那么不设置生存时间
+	 * 
+	 * 
+	 */
+	setXX(key: Class_Buffer, value: Class_Buffer, ttl?: number/** = 0*/): void;
+
+	/**
+	 * 
+	 * @brief 同时设置一个或多个 key-value 对。如果某个给定 key 已经存在，那么 MSET 会用新值覆盖原来的旧值
+	 * @param kvs 指定要设置的 key/value 对象
+	 * 
+	 * 
+	 */
+	mset(kvs: object): void;
+
+	/**
+	 * 
+	 * @brief 同时设置一个或多个 key-value 对。如果某个给定 key 已经存在，那么 MSET 会用新值覆盖原来的旧值
+	 * @param kvs 指定要设置的 key/value 列表
+	 * 
+	 * 
+	 */
+	mset(...kvs: any[]): void;
+
+	/**
+	 * 
+	 * @brief 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
+	 * @param kvs 指定要设置的 key/value 对象
+	 * 
+	 * 
+	 */
+	msetNX(kvs: object): void;
+
+	/**
+	 * 
+	 * @brief 同时设置一个或多个 key-value 对，当且仅当所有给定 key 都不存在
+	 * @param kvs 指定要设置的 key/value 列表
+	 * 
+	 * 
+	 */
+	msetNX(...kvs: any[]): void;
+
+	/**
+	 * 
+	 * @brief 如果 key 已经存在并且是一个字符串，append 命令将 value 追加到 key 原来的值的末尾。如果 key 不存在，append 就简单地将给定 key 设为 value
+	 * @param key 指定要追加的 key
+	 * @param value 指定要追加的数据
+	 * @return 追加 value 之后， key 中字符串的长度
+	 * 
+	 * 
+	 */
+	append(key: Class_Buffer, value: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 用 value 参数覆写给定 key 所储存的字符串值，从偏移量 offset 开始
+	 * @param key 指定要修改的 key
+	 * @param offset 指定修改的字节偏移
+	 * @param value 指定要覆盖的数据
+	 * @return 被修改之后，字符串的长度
+	 * 
+	 * 
+	 */
+	setRange(key: Class_Buffer, offset: number, value: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 返回 key 中字符串值的子字符串，字符串的截取范围由 start 和 end 两个偏移量决定(包括 start 和 end 在内)
+	 * @param key 指定要查询的 key
+	 * @param start 指定查询的起始字节偏移
+	 * @param end 指定查询的结束字节偏移
+	 * @return 截取得出的子字符串
+	 * 
+	 * 
+	 */
+	getRange(key: Class_Buffer, start: number, end: number): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回 key 所储存的字符串值的长度。当 key 储存的不是字符串值时，返回一个错误
+	 * @param key 指定要计算的 key
+	 * @return 字符串值的长度。当 key 不存在时，返回 0
+	 * 
+	 * 
+	 */
+	strlen(key: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 计算给定字符串中，被设置为 1 的比特位的数量
+	 * @param key 指定要计算的 key
+	 * @param start 指定要计算的起始字节，可以使用负数值，-1 表示最后一个字节，而 -2 表示倒数第二个字节，以此类推
+	 * @param end 指定要计算的结束字节，可以使用负数值，-1 表示最后一个字节，而 -2 表示倒数第二个字节，以此类推
+	 * @return 被设置为 1 的位的数量
+	 * 
+	 * 
+	 */
+	bitcount(key: Class_Buffer, start?: number/** = 0*/, end?: number/** = -1*/): number;
+
+	/**
+	 * 
+	 * @brief 返回 key 所关联的字符串值，如果 key 不存在那么返回特殊值 Null
+	 * @param key 指定要关联的 key
+	 * @return 当 key 不存在时，返回 Null ，否则，返回 key 的值
+	 * 
+	 * 
+	 */
+	get(key: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回所有(一个或多个)给定 key 的值。如果给定的 key 里面，有某个 key 不存在，那么这个 key 返回特殊值 nil 。
+	 * @param keys 指定要查询的 key 数组
+	 * @return 一个包含所有给定 key 的值的列表
+	 * 
+	 * 
+	 */
+	mget(keys: any[]): any[];
+
+	/**
+	 * 
+	 * @brief 返回所有(一个或多个)给定 key 的值。如果给定的 key 里面，有某个 key 不存在，那么这个 key 返回特殊值 nil 。
+	 * @param keys 指定要查询的 key 列表
+	 * @return 一个包含所有给定 key 的值的列表
+	 * 
+	 * 
+	 */
+	mget(...keys: any[]): any[];
+
+	/**
+	 * 
+	 * @brief 将给定 key 的值设为 value ，并返回 key 的旧值(old value)
+	 * @param key 指定要查询修改的 key
+	 * @param value 指定修改的数值
+	 * @return 返回给定 key 的旧值
+	 * 
+	 * 
+	 */
+	getset(key: Class_Buffer, value: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 将 key 所储存的值减去减量
+	 * @param key 指定要修改的 key
+	 * @param num 指定要减去的数值
+	 * @return 减去 num 之后，key 的值
+	 * 
+	 * 
+	 */
+	decr(key: Class_Buffer, num?: number/** = 1*/): number;
+
+	/**
+	 * 
+	 * @brief 将 key 所储存的值加上增量
+	 * @param key 指定要修改的 key
+	 * @param num 指定要加上的数值
+	 * @return 加上 num 之后，key 的值
+	 * 
+	 * 
+	 */
+	incr(key: Class_Buffer, num?: number/** = 1*/): number;
+
+	/**
+	 * 
+	 * @brief 对 key 所储存的字符串值，设置或清除指定偏移量上的位(bit)
+	 * @param key 指定要修改的 key
+	 * @param offset 指定修改的位偏移
+	 * @param value 指定设置或清除的参数，可以是 0 也可以是 1
+	 * @return 指定偏移量原来储存的位
+	 * 
+	 * 
+	 */
+	setBit(key: Class_Buffer, offset: number, value: number): number;
+
+	/**
+	 * 
+	 * @brief 对 key 所储存的字符串值，获取指定偏移量上的位(bit)
+	 * @param key 指定要查询的 key
+	 * @param offset 指定查询的位偏移
+	 * @return 字符串值指定偏移量上的位(bit)
+	 * 
+	 * 
+	 */
+	getBit(key: Class_Buffer, offset: number): number;
+
+	/**
+	 * 
+	 * @brief 检查给定 key 是否存在
+	 * @param key 指定要关联的 key
+	 * @return 若 key 存在，返回 True，否则返回 False
+	 * 
+	 * 
+	 */
+	exists(key: Class_Buffer): boolean;
+
+	/**
+	 * 
+	 * @brief 返回 key 所储存的值的类型
+	 * @param key 指定要查询的 key
+	 * @return 返回 key 所储存的值的类型，可能的值为 none(key不存在) string(字符串) list(列表) set(集合) zset(有序集) hash(哈希表)
+	 * 
+	 * 
+	 */
+	type(key: Class_Buffer): string;
+
+	/**
+	 * 
+	 * @brief 查找所有符合给定模式 pattern 的 key
+	 * @param pattern 指定查询模式
+	 * @return 符合给定模式的 key 列表
+	 * 
+	 * 
+	 */
+	keys(pattern: string): any[];
+
+	/**
+	 * 
+	 * @brief 删除给定的一个或多个 key，不存在的 key 会被忽略
+	 * @param keys 指定要删除的 key 数组
+	 * @return 被删除 key 的数量
+	 * 
+	 * 
+	 */
+	del(keys: any[]): number;
+
+	/**
+	 * 
+	 * @brief 删除给定的一个或多个 key，不存在的 key 会被忽略
+	 * @param keys 指定要删除的 key 列表
+	 * @return 被删除 key 的数量
+	 * 
+	 * 
+	 */
+	del(...keys: any[]): number;
+
+	/**
+	 * 
+	 * @brief 为给定 key 设置生存时间，当 key 过期时，它会被自动删除
+	 * @param key 指定要设定的 key
+	 * @param ttl 以毫秒为单位为 key 设置生存时间
+	 * @return 若 key 存在，返回 True，否则返回 False
+	 * 
+	 * 
+	 */
+	expire(key: Class_Buffer, ttl: number): boolean;
+
+	/**
+	 * 
+	 * @brief 返回给定 key 的剩余生存时间
+	 * @param key 指定要查询的 key
+	 * @return 以毫秒为单位，返回 key 的剩余生存时间，当 key 不存在时，返回 -2，当 key 存在但没有设置剩余生存时间时，返回 -1
+	 * 
+	 * 
+	 */
+	ttl(key: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 移除给定 key 的生存时间，将这个 key 从『易失的』(带生存时间 key )转换成『持久的』(一个不带生存时间、永不过期的 key)
+	 * @param key 指定要设定的 key
+	 * @return 若 key 存在，返回 True，否则返回 False
+	 * 
+	 * 
+	 */
+	persist(key: Class_Buffer): boolean;
+
+	/**
+	 * 
+	 * @brief 将 key 改名为 newkey，当 key 和 newkey 相同，或者 key 不存在时，返回一个错误
+	 * @param key 指定要改名的 key
+	 * @param newkey 指定要改名的目的 key
+	 * 
+	 * 
+	 */
+	rename(key: Class_Buffer, newkey: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 当且仅当 newkey 不存在时，将 key 改名为 newkey，当 key 不存在时，返回一个错误
+	 * @param key 指定要改名的 key
+	 * @param newkey 指定要改名的目的 key
+	 * @return 修改成功时，返回 True，如果 newkey 已经存在，返回 False
+	 * 
+	 * 
+	 */
+	renameNX(key: Class_Buffer, newkey: Class_Buffer): boolean;
+
+	/**
+	 * 
+	 * @brief 订阅给定的一个频道的信息，当消息发生时自动调用 func，func 包含两个参数，依次为 channel 和 message，同一频道同一函数只会回调一次
+	 * @param channel 指定订阅的频道名称
+	 * @param func 指定回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	sub(channel: Class_Buffer, func: Function): void;
+
+	/**
+	 * 
+	 * @brief 订阅给定的一组频道的信息，当消息发生时自动调用相应的回调函数，同一频道同一函数只会回调一次
+	 * @param map 指定频道映射关系，对象属性名称将作为频道名称，属性的值将作为回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	sub(map: object): void;
+
+	/**
+	 * 
+	 * @brief 退订给定的频道的全部回调
+	 * @param channel 指定退订的频道名称
+	 * 
+	 * 
+	 * 
+	 */
+	unsub(channel: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 退订给定的频道的指定回调函数
+	 * @param channel 指定退订的频道名称
+	 * @param func 指定退订的回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	unsub(channel: Class_Buffer, func: Function): void;
+
+	/**
+	 * 
+	 * @brief 退订一组给定的频道的全部回调
+	 * @param channels 指定退订的频道数组
+	 * 
+	 * 
+	 * 
+	 */
+	unsub(channels: any[]): void;
+
+	/**
+	 * 
+	 * @brief 退订给定的一组频道的指定回调函数
+	 * @param map 指定频道映射关系，对象属性名称将作为频道名称，属性的值将作为回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	unsub(map: object): void;
+
+	/**
+	 * 
+	 * @brief 按照模板订阅一组频道的信息，当消息发生时自动调用 func，func 包含三个参数，依次为 channel，message 和 pattern，同一模板同一函数只会回调一次
+	 * @param pattern 指定订阅的频道模板
+	 * @param func 指定回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	psub(pattern: string, func: Function): void;
+
+	/**
+	 * 
+	 * @brief 订阅给定的一组频道模板的信息，当消息发生时自动调用相应的 func，同一频道同一函数只会回调一次
+	 * @param map 指定频道映射关系，对象属性名称将作为频道模板，属性的值将作为回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	psub(map: object): void;
+
+	/**
+	 * 
+	 * @brief 退订给定模板的频道的全部回调
+	 * @param pattern 指定退订的频道模板
+	 * 
+	 * 
+	 * 
+	 */
+	unpsub(pattern: string): void;
+
+	/**
+	 * 
+	 * @brief 退订给定模板的频道的指定回调函数
+	 * @param pattern 指定退订的频道模板
+	 * @param func 指定退订的回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	unpsub(pattern: string, func: Function): void;
+
+	/**
+	 * 
+	 * @brief 退订一组给定模板的频道的全部回调
+	 * @param patterns 指定发布的频道模板数组
+	 * 
+	 * 
+	 * 
+	 */
+	unpsub(patterns: any[]): void;
+
+	/**
+	 * 
+	 * @brief 退订一组模板的频道的指定回调函数
+	 * @param map 指定频道映射关系，对象属性名称将作为频道模板，属性的值将作为回调函数
+	 * 
+	 * 
+	 * 
+	 */
+	unpsub(map: object): void;
+
+	/**
+	 * 
+	 * @brief 将信息 message 发送到指定的频道 channel
+	 * @param channel 指定发布的频道
+	 * @param message 指定发布的消息
+	 * @return 接收此消息的客户端数量
+	 * 
+	 * 
+	 * 
+	 */
+	pub(channel: Class_Buffer, message: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 获取指定 key 的 Hash 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	 * @param key 指定要获取的 key
+	 * @return 返回包含指定 key 的 Hash 对象
+	 * 
+	 * 
+	 */
+	getHash(key: Class_Buffer): Class_RedisHash;
+
+	/**
+	 * 
+	 * @brief 获取指定 key 的 List 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	 * @param key 指定要获取的 key
+	 * @return 返回包含指定 key 的 List 对象
+	 * 
+	 * 
+	 */
+	getList(key: Class_Buffer): Class_RedisList;
+
+	/**
+	 * 
+	 * @brief 获取指定 key 的 Set 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	 * @param key 指定要获取的 key
+	 * @return 返回包含指定 key 的 Set 对象
+	 * 
+	 * 
+	 */
+	getSet(key: Class_Buffer): Class_RedisSet;
+
+	/**
+	 * 
+	 * @brief 获取指定 key 的 SortedSet 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	 * @param key 指定要获取的 key
+	 * @return 返回包含指定 key 的 SortedSet 对象
+	 * 
+	 * 
+	 */
+	getSortedSet(key: Class_Buffer): Class_RedisSortedSet;
+
+	/**
+	 * 
+	 * @brief 序列化给定 key ，并返回被序列化的值，使用 restore 命令可以将这个值反序列化为 Redis 键
+	 * @param key 指定要序列化的 key
+	 * @return 返回序列化之后的值，如果 key 不存在，那么返回 null
+	 * 
+	 * 
+	 */
+	dump(key: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 反序列化给定的序列化值，并将它和给定的 key 关联
+	 * @param key 指定要反序列化的 key
+	 * @param data 指定要反序列化的数据
+	 * @param ttl 以毫秒为单位为 key 设置生存时间；如果 ttl 为 0 ，那么不设置生存时间
+	 * 
+	 * 
+	 */
+	restore(key: Class_Buffer, data: Class_Buffer, ttl?: number/** = 0*/): void;
+
+	/**
+	 * 
+	 * @brief 关闭当前数据库连接或事务
+	 * 
+	 * 
+	 */
+	close(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/RedisHash.d.ts b/types/fibjs/declare/RedisHash.d.ts
new file mode 100644
index 0000000000..0c16eef47d
--- /dev/null
+++ b/types/fibjs/declare/RedisHash.d.ts
@@ -0,0 +1,169 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Redis 数据库客户端 Hash 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	* @detail 用以操作 Redis 的 Hash 对象，创建方法：,```JavaScript,var db = require("db");,var rdb = new db.openRedis("redis-server");,var hash = rdb.getHash("test");,```
+	*/
+
+declare class Class_RedisHash extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 将哈希表中的域 field 的值设为 value，如果域 field 已经存在于哈希表中，旧值将被覆盖
+	 * @param field 指定要修改的 field
+	 * @param value 指定要修改的数据
+	 * 
+	 * 
+	 */
+	set(field: Class_Buffer, value: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 将哈希表中的域 field 的值设置为 value ，当且仅当域 field 不存在。若域 field 已经存在，该操作无效
+	 * @param field 指定要修改的 field
+	 * @param value 指定要修改的数据
+	 * 
+	 * 
+	 */
+	setNX(field: Class_Buffer, value: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 同时将多个 field-value (域-值)对设置到哈希表中，此命令会覆盖哈希表中已存在的域
+	 * @param kvs 指定要设置的 field/value 对象
+	 * 
+	 * 
+	 */
+	mset(kvs: object): void;
+
+	/**
+	 * 
+	 * @brief 同时将多个 field-value (域-值)对设置到哈希表中，此命令会覆盖哈希表中已存在的域
+	 * @param kvs 指定要设置的 field/value 列表
+	 * 
+	 * 
+	 */
+	mset(...kvs: any[]): void;
+
+	/**
+	 * 
+	 * @brief 返回哈希表中给定域 field 的值
+	 * @param field 指定要查询的 field
+	 * @return 给定域的值，当给定域不存在或是给定 key 不存在时，返回 null
+	 * 
+	 * 
+	 */
+	get(field: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 返回哈希表中，一个或多个给定域的值
+	 * @param fields 指定要查询的域数组
+	 * @return 一个包含所有给定域的值的列表
+	 * 
+	 * 
+	 */
+	mget(fields: any[]): any[];
+
+	/**
+	 * 
+	 * @brief 返回哈希表中，一个或多个给定域的值
+	 * @param fields 指定要查询的域列表
+	 * @return 一个包含所有给定域的值的列表
+	 * 
+	 * 
+	 */
+	mget(...fields: any[]): any[];
+
+	/**
+	 * 
+	 * @brief 将域所储存的值加上增量
+	 * @param field 指定要修改的域
+	 * @param num 指定要加上的数值
+	 * @return 加上 num 之后，域的值
+	 * 
+	 * 
+	 */
+	incr(field: Class_Buffer, num?: number/** = 1*/): number;
+
+	/**
+	 * 
+	 * @brief 返回哈希表中，所有的域和值
+	 * @return 返回一个包含哈希表中所有域的列表
+	 * 
+	 * 
+	 */
+	getAll(): any[];
+
+	/**
+	 * 
+	 * @brief 返回哈希表中的所有域
+	 * @return 返回值里，紧跟每个域名(field name)之后是域的值(value)，所以返回值的长度是哈希表大小的两倍
+	 * 
+	 * 
+	 */
+	keys(): any[];
+
+	/**
+	 * 
+	 * @brief 返回哈希表中域的数量
+	 * @return 返回哈希表中域的数量
+	 * 
+	 * 
+	 */
+	len(): number;
+
+	/**
+	 * 
+	 * @brief 查看哈希表中，给定域 field 是否存在
+	 * @param field 指定要查询的 field
+	 * @return 如果哈希表含有给定域，返回 true，如果哈希表不含有给定域，或 key 不存在，返回 false
+	 * 
+	 * 
+	 */
+	exists(field: Class_Buffer): boolean;
+
+	/**
+	 * 
+	 * @brief 删除哈希表中的一个或多个指定域，不存在的域将被忽略
+	 * @param fields 指定要删除的域数组
+	 * @return 被删除域的数量
+	 * 
+	 * 
+	 */
+	del(fields: any[]): number;
+
+	/**
+	 * 
+	 * @brief 删除哈希表中的一个或多个指定域，不存在的域将被忽略
+	 * @param fields 指定要删除的域列表
+	 * @return 被删除域的数量
+	 * 
+	 * 
+	 */
+	del(...fields: any[]): number;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/RedisList.d.ts b/types/fibjs/declare/RedisList.d.ts
new file mode 100644
index 0000000000..f752f8fd1a
--- /dev/null
+++ b/types/fibjs/declare/RedisList.d.ts
@@ -0,0 +1,174 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Redis 数据库客户端 List 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	* @detail 用以操作 Redis 的 List 对象，创建方法：,```JavaScript,var db = require("db");,var rdb = new db.openRedis("redis-server");,var list = rdb.getList("test");,```
+	*/
+
+declare class Class_RedisList extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 将一个或多个值 value 插入到列表的表头
+	 * @param values 指定要插入的数据
+	 * @return 插入后，列表的长度
+	 * 
+	 * 
+	 */
+	push(values: any[]): number;
+
+	/**
+	 * 
+	 * @brief 将一个或多个值 value 插入到列表的表头
+	 * @param values 指定要插入的数据
+	 * @return 插入后，列表的长度
+	 * 
+	 * 
+	 */
+	push(...values: any[]): number;
+
+	/**
+	 * 
+	 * @brief 移除并返回列表 key 的头元素
+	 * @return 列表的头元素，如果列表为空则返回 null
+	 * 
+	 * 
+	 */
+	pop(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 将一个或多个值 value 插入到列表的表尾(最右边)
+	 * @param values 指定要插入的数据
+	 * @return 插入后，列表的长度
+	 * 
+	 * 
+	 */
+	rpush(values: any[]): number;
+
+	/**
+	 * 
+	 * @brief 将一个或多个值 value 插入到列表的表尾(最右边)
+	 * @param values 指定要插入的数据
+	 * @return 插入后，列表的长度
+	 * 
+	 * 
+	 */
+	rpush(...values: any[]): number;
+
+	/**
+	 * 
+	 * @brief 移除并返回列表 key 的表尾(最右边)元素
+	 * @return 列表的头元素，如果列表为空则返回 null
+	 * 
+	 * 
+	 */
+	rpop(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 将列表下标为 index 的元素的值设置为 value
+	 * @param index 指定要修改的下标
+	 * @param value 指定要修改的数据
+	 * 
+	 * 
+	 */
+	set(index: number, value: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 返回列表中，下标为 index 的元素
+	 * @param index 指定要查询的下标
+	 * @return 列表中下标为 index 的元素
+	 * 
+	 * 
+	 */
+	get(index: number): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 将值 value 插入到列表当中，位于值 pivot 之前
+	 * @param pivot 指定插入时查找的数据
+	 * @param value 指定要插入的数据
+	 * @return 插入后，列表的长度
+	 * 
+	 * 
+	 */
+	insertBefore(pivot: Class_Buffer, value: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 将值 value 插入到列表当中，位于值 pivot 之后
+	 * @param pivot 指定插入时查找的数据
+	 * @param value 指定要插入的数据
+	 * @return 插入后，列表的长度
+	 * 
+	 * 
+	 */
+	insertAfter(pivot: Class_Buffer, value: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 根据参数 count 的值，移除列表中与参数 value 相等的元素
+	 * @param count 指定删除的元素数量
+	 * @param value 指定要删除的数值
+	 * @return 被移除元素的数量
+	 * 
+	 * 
+	 */
+	remove(count: number, value: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 对一个列表进行修剪(trim)，就是说，让列表只保留指定区间内的元素，不在指定区间之内的元素都将被删除
+	 * @param start 指定修剪的起始下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @param stop 指定修剪的结束下标，0 表示第一个元素，-1 表示最后一个元素
+	 * 
+	 * 
+	 */
+	trim(start: number, stop: number): void;
+
+	/**
+	 * 
+	 * @brief 返回列表的长度
+	 * @return 返回列表的长度
+	 * 
+	 * 
+	 */
+	len(): number;
+
+	/**
+	 * 
+	 * @brief 返回列表中指定区间内的元素，区间以偏移量 start 和 stop 指定，包含 start 和 stop 的元素
+	 * @param start 指定查询的起始下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @param stop 指定查询的结束下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @return 包含指定区间内的元素的数组
+	 * 
+	 * 
+	 */
+	range(start: number, stop: number): any[];
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/RedisSet.d.ts b/types/fibjs/declare/RedisSet.d.ts
new file mode 100644
index 0000000000..571869a8d5
--- /dev/null
+++ b/types/fibjs/declare/RedisSet.d.ts
@@ -0,0 +1,129 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Redis 数据库客户端 Set 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	* @detail 用以操作 Redis 的 Set 对象，创建方法：,```JavaScript,var db = require("db");,var rdb = new db.openRedis("redis-server");,var set = rdb.getSet("test");,```
+	*/
+
+declare class Class_RedisSet extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 将一个或多个 member 元素加入到集合 key 当中，已经存在于集合的 member 元素将被忽略
+	 * @param members 指定要添加的元素数组
+	 * @return 被添加到集合中的新元素的数量，不包括被忽略的元素
+	 * 
+	 * 
+	 */
+	add(members: any[]): number;
+
+	/**
+	 * 
+	 * @brief 同时将多个 field-value (域-值)对设置到哈希表中，此命令会覆盖哈希表中已存在的域
+	 * @param members 指定要添加的元素列表
+	 * @return 被添加到集合中的新元素的数量，不包括被忽略的元素
+	 * 
+	 * 
+	 */
+	add(...members: any[]): number;
+
+	/**
+	 * 
+	 * @brief 移除集合中的一个或多个 member 元素
+	 * @param members 指定要移除的元素数组
+	 * @return 被成功移除的元素的数量，不包括被忽略的元素
+	 * 
+	 * 
+	 */
+	remove(members: any[]): number;
+
+	/**
+	 * 
+	 * @brief 移除集合中的一个或多个 member 元素
+	 * @param members 指定要移除的元素列表
+	 * @return 被成功移除的元素的数量，不包括被忽略的元素
+	 * 
+	 * 
+	 */
+	remove(...members: any[]): number;
+
+	/**
+	 * 
+	 * @brief 返回集合中元素的数量
+	 * @return 返回集合的长度
+	 * 
+	 * 
+	 */
+	len(): number;
+
+	/**
+	 * 
+	 * @brief 判断 member 元素是否集合的成员
+	 * @param member 指定检查的 member
+	 * @return 如果 member 元素是集合的成员，返回 true
+	 * 
+	 * 
+	 */
+	exists(member: Class_Buffer): boolean;
+
+	/**
+	 * 
+	 * @brief 返回集合中的所有成员
+	 * @return 集合中所有成员的列表
+	 * 
+	 * 
+	 */
+	members(): any[];
+
+	/**
+	 * 
+	 * @brief 移除并返回集合中的一个随机元素
+	 * @return 被移除的随机元素。当集合是空集时，返回 null
+	 * 
+	 * 
+	 */
+	pop(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 从集合中获取随机的一个元素
+	 * @return 返回一个元素；如果集合为空，返回 null
+	 * 
+	 * 
+	 */
+	randMember(): any;
+
+	/**
+	 * 
+	 * @brief 从集合中获取随机的若干元素
+	 * @param count 指定返回的元素个数。正数，返回一个包含 count 个元素的数组；负数，返回一个数组，数组中的元素可能会重复出现多次，而数组的长度为 count 的绝对值
+	 * @return 返回一个列表；如果集合为空，返回空列表
+	 * 
+	 * 
+	 */
+	randMember(count: number): any;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/RedisSortedSet.d.ts b/types/fibjs/declare/RedisSortedSet.d.ts
new file mode 100644
index 0000000000..1769fb0a79
--- /dev/null
+++ b/types/fibjs/declare/RedisSortedSet.d.ts
@@ -0,0 +1,158 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Redis 数据库客户端 SortedSet 对象，此对象为包含指定 key 的客户端，只有调用其方法才会操作数据库
+	* @detail 用以操作 Redis 的 SortedSet 对象，创建方法：,```JavaScript,var db = require("db");,var rdb = new db.openRedis("redis-server");,var set = rdb.getSortedSet("test");,```
+	*/
+
+declare class Class_RedisSortedSet extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 将一个或多个 member 元素及其 score 值加入到有序集当中
+	 * @param sms 指定要添加的 member/score 对象
+	 * @return 被成功添加的新成员的数量，不包括那些被更新的、已经存在的成员
+	 * 
+	 * 
+	 */
+	add(sms: object): number;
+
+	/**
+	 * 
+	 * @brief 将一个或多个 member 元素及其 score 值加入到有序集当中
+	 * @param sms 指定要添加的 member/score 列表
+	 * @return 被成功添加的新成员的数量，不包括那些被更新的、已经存在的成员
+	 * 
+	 * 
+	 */
+	add(...sms: any[]): number;
+
+	/**
+	 * 
+	 * @brief 返回有序集中，成员 member 的 score 值
+	 * @param member 指定要查询的 member
+	 * @return member 成员的 score 值，以字符串形式表示
+	 * 
+	 * 
+	 */
+	score(member: Class_Buffer): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 为有序集的成员 member 的 score 值加上增量 num
+	 * @param member 指定要修改的 member
+	 * @param num 指定要加上的数值
+	 * @return member 成员的新 score 值，以字符串形式表示
+	 * 
+	 * 
+	 */
+	incr(member: Class_Buffer, num?: number/** = 1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 移除有序集中的一个或多个 member 元素
+	 * @param members 指定要移除的元素数组
+	 * @return 被成功移除的元素的数量，不包括被忽略的元素
+	 * 
+	 * 
+	 */
+	remove(members: any[]): number;
+
+	/**
+	 * 
+	 * @brief 移除有序集中的一个或多个 member 元素
+	 * @param members 指定要移除的元素列表
+	 * @return 被成功移除的元素的数量，不包括被忽略的元素
+	 * 
+	 * 
+	 */
+	remove(...members: any[]): number;
+
+	/**
+	 * 
+	 * @brief 返回有序集中元素的数量
+	 * @return 返回有序集的长度
+	 * 
+	 * 
+	 */
+	len(): number;
+
+	/**
+	 * 
+	 * @brief 返回有序集中， score 值在 min 和 max 之间(默认包括 score 值等于 min 或 max )的成员的数量
+	 * @param min 指定统计的最小 score
+	 * @param max 指定统计的最大 score
+	 * @return score 值在 min 和 max 之间的成员的数量
+	 * 
+	 * 
+	 */
+	count(min: number, max: number): number;
+
+	/**
+	 * 
+	 * @brief 返回有序集中，指定区间内的成员，成员的位置按 score 值递增(从小到大)来排序
+	 * @param start 指定查询的起始下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @param stop 指定查询的结束下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @param withScores 指定是否在结果中包含 score
+	 * @return 指定区间内，带有 score 值(可选)的有序集成员的列表
+	 * 
+	 * 
+	 */
+	range(start: number, stop: number, withScores?: boolean/** = false*/): any[];
+
+	/**
+	 * 
+	 * @brief 返回有序集中，指定区间内的成员，成员的位置按 score 值递减(从大到小)来排序
+	 * @param start 指定查询的起始下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @param stop 指定查询的结束下标，0 表示第一个元素，-1 表示最后一个元素
+	 * @param withScores 指定是否在结果中包含 score
+	 * @return 指定区间内，带有 score 值(可选)的有序集成员的列表
+	 * 
+	 * 
+	 */
+	rangeRev(start: number, stop: number, withScores?: boolean/** = false*/): any[];
+
+	/**
+	 * 
+	 * @brief 有序集中成员 member 的排名。其中有序集成员按 score 值递增(从小到大)顺序排列
+	 * @param member 指定要查询的 member
+	 * @return member 如果 member 是有序集 key 的成员，返回 member 的排名。如果 member 不是有序集 key 的成员，返回 nil
+	 * 
+	 * 
+	 */
+	rank(member: Class_Buffer): number;
+
+	/**
+	 * 
+	 * @brief 有序集中成员 member 的排名。其中有序集成员按 score 值递减(从大到小)顺序排列
+	 * @param member 指定要查询的 member
+	 * @return member 如果 member 是有序集 key 的成员，返回 member 的排名。如果 member 不是有序集 key 的成员，返回 nil
+	 * 
+	 * 
+	 */
+	rankRev(member: Class_Buffer): number;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Routing.d.ts b/types/fibjs/declare/Routing.d.ts
new file mode 100644
index 0000000000..aef820feae
--- /dev/null
+++ b/types/fibjs/declare/Routing.d.ts
@@ -0,0 +1,262 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 消息处理器路由对象
+	* @detail 路由对象是 http 消息处理的核心对象，服务器根据路由的设定，匹配 url 和 method，并将 http 消息转发到相应的处理器，以完成不同的事务。,,一个简单的路由，可以直接以 JSON 对象的形式提供，比如：,```JavaScript,var http = require('http');,,var svr = new http.Server(8080, {,    '/': r => r.response.write('home'),,    '/help': r => r.response.write('help'),});,,svr.run();,```,如果需要更复杂的路由定制，可以自行创建 Routing 对象并根据需要处理路由策略：,```JavaScript,var http = require('http');,var mq = require('mq');,,var app = new mq.Routing();,,app.get('/', r => r.response.write('home'));,app.get('/help', r => r.response.write('help'));,,app.post('/help', r => r.response.write('post a help.'));,,app.get('/home/:user', (r, user) => r.response.write('hello ' + user));,,app.get('/user/:id(\\d+)', (r, id) => r.response.write('get ' + id));,,app.get('/actions', {,    '/run': r => r.response.write('running'),,    '/sleep': r => r.response.write('sleeping'),,    '(.*)': r => r.response.write('........'),});,,var svr = new http.Server(8080, app);,svr.run();,```,路由对象根据设定的规则匹配消息，将消息传递给符合规则的第一个处理器。后加入的路由规则优先匹配。创建方法：,```JavaScript,var routing = new mq.Routing({,  "^/func1(/.*)$": func1,,  "^/func2(/.*)$": func2,});,```,正则表达式匹配的项目修改消息的 value 属性，子项目存入消息的 params 属性。例如：,```JavaScript,var routing = new mq.Routing({,  "^/func1(/([0-9]+)/([0-9]+)\.html)$": func1,,});,```,匹配消息 "/func1/123/456.html" 后，value == "/123/456.html"，params == ["123", "456"];,,如果匹配的结果没有子项，则 value 为空，params 为空。例如：,```JavaScript,var routing = new mq.Routing({,  "^/func1/[0-9]+/[0-9]+\.html$": func1,,});,```,匹配消息 "/func1/123/456.html" 后，value == ""，params == [];,,如果匹配的结果第一级有多个子项，则 value 为空，params 为第一级子项。例如：,```JavaScript,var routing = new mq.Routing({,  "^/func1/([0-9]+)/([0-9]+)\.html$": func1,,});,```,匹配消息 "/func1/123/456.html" 后，value == ""，params == ["123", "456"];,,如果匹配的结果只有一个子项，并且无下级子项，则 value 和 params 均为此子项。例如：,```JavaScript,var routing = new mq.Routing({,  "^/func1/([0-9]+)/[0-9]+\.html$": func1,,});,```,匹配消息 "/func1/123/456.html" 后，value == "123"，params == ["123"];
+	*/
+/// <reference path="Handler.d.ts" />
+declare class Class_Routing extends Class_Handler {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 创建一个消息处理器路由对象
+	 * @param map 初始化路由参数
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(map?: object/** = v8::Object::New(isolate)*/);
+
+	/**
+	 * 
+	 * @brief 创建一个消息处理器路由对象
+	 * @param method 指定 http 请求方法，"*" 接受所有方法
+	 * @param map 初始化路由参数
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(method: string, map: object);
+
+	/**
+	 * 
+	 * @brief 从已有路由对象中添加规则，添加后原路由将被清空
+	 * @param route 已经初始化的路由对象
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	append(route: Class_Routing): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	append(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	append(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条路由规则
+	 * @param method 指定 http 请求方法，"*" 接受所有方法
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	append(method: string, pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组接受所有 http 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	all(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受所有 http 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	all(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组 GET 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	get(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受 http GET 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	get(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组接受 http POST 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	post(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受 http POST 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	post(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组接受 http DELETE 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	del(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受 http DELETE 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	del(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组 PUT 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	put(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受 http PUT 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	put(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组 PATCH 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	patch(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受 http PATCH 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	patch(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一组 FIND 方法路由规则
+	 * @param map 路由参数
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	find(map: object): Class_Routing;
+
+	/**
+	 * 
+	 * @brief 添加一条接受 http FIND 方法路由规则
+	 * @param pattern 消息匹配格式
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * @return 返回路由对象本身
+	 * 
+	 * 
+	 * 
+	 */
+	find(pattern: string, hdlr: Class_Handler): Class_Routing;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SQLite.d.ts b/types/fibjs/declare/SQLite.d.ts
new file mode 100644
index 0000000000..af499cfd03
--- /dev/null
+++ b/types/fibjs/declare/SQLite.d.ts
@@ -0,0 +1,66 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief sqlite 数据库连接对象
+	* @detail 使用 db.open 或 db.openSQLite 创建，创建方式：,```JavaScript,var slite = db.openSQLite("sqlite:/path/to/db");,```
+	*/
+/// <reference path="DbConnection.d.ts" />
+declare class Class_SQLite extends Class_DbConnection {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 当前数据库文件名
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	fileName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置数据库超时时间，以毫秒为单位
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	timeout: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 备份当前数据库到新文件
+	 * @param fileName 指定备份的数据库文件名
+	 * 
+	 * @async
+	 */
+	backup(fileName: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SandBox.d.ts b/types/fibjs/declare/SandBox.d.ts
new file mode 100644
index 0000000000..fc3152b232
--- /dev/null
+++ b/types/fibjs/declare/SandBox.d.ts
@@ -0,0 +1,255 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 安全沙箱对象，用于管理一个独立的运行空间
+	* @detail  所有的代码都运行在自己的沙箱中，全局的 require 会调用当前沙箱加载模块，沙箱会通过 require 传递给加载的沙箱。下面的示例创建一个沙箱，限制只允许访问全局基础模块中的 assert 模块，并添加 a 和 b 两个定制模块：,```JavaScript,var vm = require('vm');,var sbox = new vm.SandBox({,  a: 100,,  b: 200,,  assert: require('assert'),});,,var mod_in_sbox = sbox.require('./path/to/mod');,```
+	*/
+
+declare class Class_SandBox extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询沙箱的 global 对象
+	 * 
+	 * @readonly
+	 * @type Object
+	 */
+	
+	global: object
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询沙箱中现存的所有模块的字典对象
+	 * 
+	 * 
+	 * @readonly
+	 * @type Object
+	 */
+	
+	modules: object
+	
+	
+	
+	/**
+	 * 
+	 * @brief 构造一个新的安全沙箱对象，并初始化基础模块
+	 * @param mods 指定要添加的模块对象字典
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(mods: object);
+
+	/**
+	 * 
+	 * @brief 构造一个新的安全沙箱对象，并初始化基础模块
+	 * @param mods 指定要添加的模块对象字典
+	 * @param require 自定义 require 函数，当模块不存在时，先调用自定义函数，无返回再从文件中加载
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(mods: object, require: Function);
+
+	/**
+	 * 
+	 * @brief 构造一个独立 Global 新的安全沙箱对象，并初始化基础模块
+	 * @param mods 指定要添加的模块对象字典
+	 * @param global 指定初始化的 Global 属性
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(mods: object, global: object);
+
+	/**
+	 * 
+	 * @brief 构造一个独立 Global 新的安全沙箱对象，并初始化基础模块
+	 * @param mods 指定要添加的模块对象字典
+	 * @param require 自定义 require 函数，当模块不存在时，先调用自定义函数，无返回再从文件中加载
+	 * @param global 指定初始化的 Global 属性
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(mods: object, require: Function, global: object);
+
+	/**
+	 * 
+	 * @brief 向沙箱中添加一个基础模块
+	 * @param id 指定要添加的模块名称，此路径与当前运行脚本无关，必须为绝对路径或者模块名
+	 * @param mod 指定要添加的模块对象
+	 * 
+	 * 
+	 * 
+	 */
+	add(id: string, mod: any): void;
+
+	/**
+	 * 
+	 * @brief 向沙箱中添加一组基础模块
+	 * @param mods 指定要添加的模块对象字典，添加的 javascript 模块将会生成一份复制，以避免沙箱修改对象产生互相干扰
+	 * 
+	 * 
+	 * 
+	 */
+	add(mods: object): void;
+
+	/**
+	 * 
+	 * @brief 向沙箱中添加一个脚本模块
+	 * @param srcname 指定要添加的脚本名称，srcname 必须包含扩展名，比如 json 或者 js, jsc
+	 * @param script 指定要添加的二进制代码
+	 * @return 返回加载的模块对象
+	 * 
+	 * 
+	 * 
+	 */
+	addScript(srcname: string, script: Class_Buffer): any;
+
+	/**
+	 * 
+	 * @brief 从沙箱中删除指定的基础模块
+	 * @param id 指定要删除的模块名称，此路径与当前运行脚本无关，必须为绝对路径或者模块名
+	 * 
+	 * 
+	 * 
+	 */
+	remove(id: string): void;
+
+	/**
+	 * 
+	 * @brief 从沙箱中检测基础模块是否存在
+	 * @param id 指定要检测的模块名称，此路径与当前运行脚本无关，必须为绝对路径或者模块名
+	 * @return 是否存在
+	 * 
+	 * 
+	 * 
+	 */
+	has(id: string): boolean;
+
+	/**
+	 * 
+	 * @brief 复制当前沙箱，新沙箱包含当前沙箱的模块，以及相同的名称和 require 函数
+	 * @return 复制的新沙箱
+	 * 
+	 * 
+	 * 
+	 */
+	clone(): Class_SandBox;
+
+	/**
+	 * 
+	 * @brief 冻结当前沙箱，冻结后的沙箱，对 global 所做的修改将被忽略
+	 * 
+	 * 
+	 */
+	freeze(): void;
+
+	/**
+	 * 
+	 * @brief 重新加载沙箱内的模块，此操作只会重新初始化模块，复位模块内的变量，不更新模块代码
+	 * 
+	 * 
+	 */
+	refresh(): void;
+
+	/**
+	 * 
+	 * @brief 运行一个脚本
+	 * @param fname 指定要运行的脚本路径，此路径与当前运行脚本无关，必须为绝对路径
+	 * @param argv 指定要运行的参数，此参数可在脚本内使用 argv 获取
+	 * 
+	 * 
+	 * 
+	 */
+	run(fname: string, argv?: any[]/** = v8::Array::New(isolate)*/): void;
+
+	/**
+	 * 
+	 * @brief 查询一个模块并返回模块完整文件名
+	 * @param id 指定要加载的模块名称
+	 * @param base 指定查找路径
+	 * @return 返回加载的模块完整文件名
+	 * 
+	 * 
+	 * 
+	 */
+	resolve(id: string, base: string): string;
+
+	/**
+	 * 
+	 * @brief 加载一个模块并返回模块对象
+	 * @param id 指定要加载的模块名称
+	 * @param base 指定查找路径
+	 * @return 返回加载的模块对象
+	 * 
+	 * 
+	 * 
+	 */
+	require(id: string, base: string): any;
+
+	/**
+	 * 
+	 * @brief 对指定的 extname 添加 compiler, extname 不可为系统内置扩展名 (包括 {'.js', '.json', '.jsc', '.wasm'}), compiler 需返回有效的 javascript 脚本.
+	 * 
+	 * ```JavaScript
+	 * var vm = require('vm');
+	 * var sbox = new vm.SandBox({
+	 * });
+	 * 
+	 * // 编译 typescript 脚本为 js 并加载
+	 * sbox.setModuleCompiler('.ts', tsCompiler);
+	 * var mod_ts = sbox.require('./a.ts');
+	 * 
+	 * // 编译 coffee 脚本为 js 并加载
+	 * sbox.setModuleCompiler('.coffee', cafeCompiler);
+	 * var mod_coffee = sbox.require('./a.coffee');
+	 * 
+	 * // 编译 jsx 脚本为 js 并加载
+	 * sbox.setModuleCompiler('.jsx', reactCompiler);
+	 * var mod_react = sbox.require('./a.jsx');
+	 * 
+	 * // 编译 yml 脚本为自定义的内容(如 API 集合) 并加载
+	 * sbox.setModuleCompiler('.yml', yaml2Rest)
+	 * sbox.setModuleCompiler('.yaml', yaml2Rest)
+	 * 
+	 * // 编译 markdown 为自定义的内容(如 html 字符串或 XmlDocument 对象) 并加载
+	 * sbox.setModuleCompiler('.md', mdCompiler)
+	 * sbox.setModuleCompiler('.markdown', mdCompiler)
+	 * ```
+	 * 
+	 * @param extname 指定的 extname, 必须以 '.' 开头, 且为非系统内置扩展名
+	 * @param compiler 编译回调函数, 所有带 extname 的文件仅会 require 一次. 该回调函数格式为 `compiler(buf, requireInfo)`, buf 为读取到的文件 Buffer, requireInfo 结构为 `{filename: string}`.
+	 * 
+	 * 
+	 * 
+	 */
+	setModuleCompiler(extname: string, compiler: Function): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SeekableStream.d.ts b/types/fibjs/declare/SeekableStream.d.ts
new file mode 100644
index 0000000000..06e0ae7aa2
--- /dev/null
+++ b/types/fibjs/declare/SeekableStream.d.ts
@@ -0,0 +1,112 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 可移动当前指针的流对象接口
+	* @detail 
+	*/
+/// <reference path="Stream.d.ts" />
+declare class Class_SeekableStream extends Class_Stream {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 移动文件当前操作位置
+	 * @param offset 指定新的位置
+	 * @param whence 指定位置基准，允许的值为：SEEK_SET, SEEK_CUR, SEEK_END
+	 * 
+	 * 
+	 * 
+	 */
+	seek(offset: number, whence: number): void;
+
+	/**
+	 * 
+	 * @brief 查询流当前位置
+	 * @return 返回流当前位置
+	 * 
+	 * 
+	 * 
+	 */
+	tell(): number;
+
+	/**
+	 * 
+	 * @brief 移动当前位置到流开头
+	 * 
+	 * 
+	 */
+	rewind(): void;
+
+	/**
+	 * 
+	 * @brief 查询流尺寸
+	 * @return 返回流尺寸
+	 * 
+	 * 
+	 * 
+	 */
+	size(): number;
+
+	/**
+	 * 
+	 * @brief 从流内读取剩余的全部数据
+	 * @return 返回从流内读取的数据，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	readAll(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 修改文件尺寸，如果新尺寸小于原尺寸，则文件被截断
+	 * @param bytes 新的文件尺寸
+	 * 
+	 * 
+	 * @async
+	 */
+	truncate(bytes: number): void;
+
+	/**
+	 * 
+	 * @brief 查询文件是否到结尾
+	 * @return 返回 True 表示结尾
+	 * 
+	 * 
+	 * 
+	 */
+	eof(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询当前文件的基础信息
+	 * @return 返回 Stat 对象描述文件信息
+	 * 
+	 * 
+	 * @async
+	 */
+	stat(): Class_Stat;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Semaphore.d.ts b/types/fibjs/declare/Semaphore.d.ts
new file mode 100644
index 0000000000..ac99421d88
--- /dev/null
+++ b/types/fibjs/declare/Semaphore.d.ts
@@ -0,0 +1,69 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 纤程信号量对象
+	* @detail 信号量对象管理一个内部计数器，此计数器调用 acquire 或者 wait 后减一，调用 release 或者 post 后加一。,计数器不会减至负数，因为 acquire 和 wait 在发现数值为 0 的时候，会休眠当前纤程，直至其它纤程通过 release 或 post 增加计数器的值。,,信号量常用的场合是限制资源并发使用，以及生产者/消费者模式的应用。,,以数据库请求为例，限制资源并发使用的情形：,```JavaScript,var maxconnections = 5;,var l = new coroutine.Semaphore(maxconnections);,,......,,l.acquire();,var conn = connectdb(),.....,conn.close();,l.release();,```,,生产者/消费者模式通常则将信号量与队列配合使用。生产者向队列中加入数据，并 post 一个信号，消费者则先 wait 信号，获取信号后去队查询取数据。
+	*/
+/// <reference path="Lock.d.ts" />
+declare class Class_Semaphore extends Class_Lock {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 信号量构造函数
+	 * @param value 计数器初始数值
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(value?: number/** = 1*/);
+
+	/**
+	 * 
+	 * @brief 等待一个信号量，等同于 acquire(true)
+	 * 
+	 * 
+	 */
+	wait(): void;
+
+	/**
+	 * 
+	 * @brief 释放一个信号量，等同于 release()
+	 * 
+	 * 
+	 */
+	post(): void;
+
+	/**
+	 * 
+	 * @brief 尝试获取一个信号，如不能获取，则立即返回并返回 false，等同于 acquire(false)
+	 * @return 获取成功则返回 true
+	 * 
+	 * 
+	 * 
+	 */
+	trywait(): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Service.d.ts b/types/fibjs/declare/Service.d.ts
new file mode 100644
index 0000000000..7816e2d8bc
--- /dev/null
+++ b/types/fibjs/declare/Service.d.ts
@@ -0,0 +1,176 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 系统服务管理对象
+	* @detail 
+	*/
+/// <reference path="EventEmitter.d.ts" />
+declare class Class_Service extends Class_EventEmitter {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置服务名称
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定服务停止事件，相当于 on("stop", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onstop: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定服务暂停事件，相当于 on("pause", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onpause: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定服务恢复事件，相当于 on("continue", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	oncontinue: Function
+	
+	
+	
+	/**
+	 * 
+	 * @brief 系统服务管理对象构造函数
+	 * @param name 服务名称
+	 * @param worker 服务运行函数
+	 * @param event 服务事件处理
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(name: string, worker: Function, event?: object/** = v8::Object::New(isolate)*/);
+
+	/**
+	 * 
+	 * @brief 开始运行服务实体
+	 * 
+	 * @async
+	 */
+	run(): void;
+
+	/**
+	 * 
+	 * @brief 安装服务到系统
+	 * @param name 服务名称
+	 * @param cmd 服务命令行
+	 * @param displayName 服务显示名称
+	 * @param description 服务描述信息
+	 * 
+	 * 
+	 * 
+	 */
+	static install(name: string, cmd: string, displayName?: string/** = ""*/, description?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 从系统中卸载服务
+	 * @param name 服务名称
+	 * 
+	 * 
+	 * 
+	 */
+	static remove(name: string): void;
+
+	/**
+	 * 
+	 * @brief 启动服务
+	 * @param name 服务名称
+	 * 
+	 * 
+	 * 
+	 */
+	static start(name: string): void;
+
+	/**
+	 * 
+	 * @brief 停止服务
+	 * @param name 服务名称
+	 * 
+	 * 
+	 * 
+	 */
+	static stop(name: string): void;
+
+	/**
+	 * 
+	 * @brief 重启服务
+	 * @param name 服务名称
+	 * 
+	 * 
+	 * 
+	 */
+	static restart(name: string): void;
+
+	/**
+	 * 
+	 * @brief 检测服务是否安装
+	 * @param name 服务名称
+	 * @return 服务安装返回 True
+	 * 
+	 * 
+	 * 
+	 */
+	static isInstalled(name: string): boolean;
+
+	/**
+	 * 
+	 * @brief 检测服务是否运行
+	 * @param name 服务名称
+	 * @return 服务运行返回 True
+	 * 
+	 * 
+	 * 
+	 */
+	static isRunning(name: string): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Smtp.d.ts b/types/fibjs/declare/Smtp.d.ts
new file mode 100644
index 0000000000..584513c533
--- /dev/null
+++ b/types/fibjs/declare/Smtp.d.ts
@@ -0,0 +1,146 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Smtp对象
+	* @detail 
+	*/
+
+declare class Class_Smtp extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置超时时间 单位毫秒
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	timeout: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询 Smtp 对象当前连接的 Socket
+	 * 
+	 * @readonly
+	 * @type Stream
+	 */
+	
+	socket: Class_Stream
+	
+	
+	
+	/**
+	 * 
+	 * @brief Smtp 对象构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 建立到指定的服务器
+	 * @param url 指定连接的协议，可以是：tcp://host:port 或者 ssl://host:port
+	 * 
+	 * 
+	 * @async
+	 */
+	connect(url: string): void;
+
+	/**
+	 * 
+	 * @brief 发送指定命令，并返回响应，服务器报错则抛出错误
+	 * @param cmd 命令名
+	 * @param arg 参数
+	 * @return 如果成功，返回服务器响应
+	 * 
+	 * 
+	 * @async
+	 */
+	command(cmd: string, arg: string): string;
+
+	/**
+	 * 
+	 * @brief 发送 HELO 命令，服务器报错则抛出错误
+	 * @param hostname 主机名，缺省为“localhost”
+	 * 
+	 * 
+	 * @async
+	 */
+	hello(hostname?: string/** = "localhost"*/): void;
+
+	/**
+	 * 
+	 * @brief 用指定的用户及密码登录服务器，服务器报错则抛出错误
+	 * @param username 用户名
+	 * @param password 密码
+	 * 
+	 * 
+	 * @async
+	 */
+	login(username: string, password: string): void;
+
+	/**
+	 * 
+	 * @brief 指定发件人信箱，服务器报错则抛出错误
+	 * @param address 发件人信箱
+	 * 
+	 * 
+	 * @async
+	 */
+	from(address: string): void;
+
+	/**
+	 * 
+	 * @brief 指定收件人信箱，服务器报错则抛出错误
+	 * @param address 收件人信箱
+	 * 
+	 * 
+	 * @async
+	 */
+	to(address: string): void;
+
+	/**
+	 * 
+	 * @brief 发送文本到收件人，服务器报错则抛出错误
+	 * @param txt 要发送的文本
+	 * 
+	 * 
+	 * @async
+	 */
+	data(txt: string): void;
+
+	/**
+	 * 
+	 * @brief 退出并关闭连接，服务器报错则抛出错误
+	 * 
+	 * @async
+	 */
+	quit(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Socket.d.ts b/types/fibjs/declare/Socket.d.ts
new file mode 100644
index 0000000000..0e44b2e41d
--- /dev/null
+++ b/types/fibjs/declare/Socket.d.ts
@@ -0,0 +1,232 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 网络套接口对象
+	* @detail Socket 属于 net 模块，创建方法,```JavaScript,var s = new net.Socket();,```
+	*/
+/// <reference path="Stream.d.ts" />
+declare class Class_Socket extends Class_Stream {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前 Socket 对象的地址集
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	family: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前 Socket 对象的协议族
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	type: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前连接的对方地址
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	remoteAddress: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前连接的对方端口
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	remotePort: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前连接的本地地址
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	localAddress: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前连接的本地端口
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	localPort: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置超时时间 单位毫秒
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	timeout: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief Socket 构造函数，创建一个新的 Socket 对象
+	 * @param family 指定地址集，缺省为 AF_INET，ipv4
+	 * @param type 指定协议族，缺省为 SOCK_STREAM，tcp
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(family?: number/** = undefined*/, type?: number/** = undefined*/);
+
+	/**
+	 * 
+	 * @brief 建立一个 tcp 连接
+	 * @param host 指定对方地址或主机名
+	 * @param port 指定对方端口
+	 * 
+	 * 
+	 * @async
+	 */
+	connect(host: string, port: number): void;
+
+	/**
+	 * 
+	 * @brief 将当前 Socket 绑定至本地所有地址的指定端口
+	 * @param port 指定绑定的端口
+	 * @param allowIPv4 指定是否接受 ipv4 连接，缺省为 true。本参数在 ipv6 时有效，并依赖于操作系统
+	 * 
+	 * 
+	 * 
+	 */
+	bind(port: number, allowIPv4?: boolean/** = true*/): void;
+
+	/**
+	 * 
+	 * @brief 将当前 Socket 绑定至指定地址的指定端口
+	 * @param addr 指定绑定的地址
+	 * @param port 指定绑定的端口
+	 * @param allowIPv4 指定是否接受 ipv4 连接，缺省为 true。本参数在 ipv6 时有效，并依赖于操作系统
+	 * 
+	 * 
+	 * 
+	 */
+	bind(addr: string, port: number, allowIPv4?: boolean/** = true*/): void;
+
+	/**
+	 * 
+	 * @brief 开始监听连接请求
+	 * @param backlog 指定请求队列长度，超出的请求将被拒绝，缺省为 120
+	 * 
+	 * 
+	 * 
+	 */
+	listen(backlog?: number/** = 120*/): void;
+
+	/**
+	 * 
+	 * @brief 等待并接受一个连接
+	 * @return 返回接收到得连接对象
+	 * 
+	 * 
+	 * @async
+	 */
+	accept(): Class_Socket;
+
+	/**
+	 * 
+	 * @brief 从连接读取指定大小的数据，不同于 read 方法，recv 并不保证读完要求的数据，而是在读取到数据后立即返回
+	 * @param bytes 指定要读取的数据量，缺省读取任意尺寸的数据
+	 * @return 返回从连接读取的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	recv(bytes?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 读取一个 UDP 包
+	 * recvfrom 返回结果中包含以下内容：
+	 * - data: 接收到的二进制数据块
+	 * - address: 发送方的地址
+	 * - port: 发送方的端口
+	 * @param bytes 指定要读取的数据量，缺省读取任意尺寸的数据
+	 * @return 返回从连接读取的数据包
+	 * 
+	 * 
+	 * @async
+	 */
+	recvfrom(bytes?: number/** = -1*/): any;
+
+	/**
+	 * 
+	 * @brief 将给定的数据写入连接，此方法等效于 write 方法
+	 * @param data 给定要写入的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	send(data: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 向给定 ip:port 发送一个 UDP 包
+	 * @param data 给定要写入的数据
+	 * @param host 指定目标 ip 或主机名
+	 * @param port 指定目标端口
+	 * 
+	 * 
+	 * @async
+	 */
+	sendto(data: Class_Buffer, host: string, port: number): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SslHandler.d.ts b/types/fibjs/declare/SslHandler.d.ts
new file mode 100644
index 0000000000..9b5e6364c6
--- /dev/null
+++ b/types/fibjs/declare/SslHandler.d.ts
@@ -0,0 +1,106 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief ssl 协议转换处理器
+	* @detail 用以将数据流转换为 ssl 流协议。SslHandler 是对 SslSocket 的封装，用于构建服务器，逻辑上相当于：,```JavaScript,var ss = new ssl.Socket(crt, key);,,function(s){,   var s1 = ss.accept(s);,   hdlr.invoke(s1);,   s1.close();,},```
+	*/
+/// <reference path="Handler.d.ts" />
+declare class Class_SslHandler extends Class_Handler {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设定证书验证模式，缺省为 VERIFY_NONE
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	verification: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 客户端证书验证证书链
+	 * 
+	 * @readonly
+	 * @type X509Cert
+	 */
+	
+	ca: Class_X509Cert
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief ssl 协议转换处理器当前事件处理接口对象
+	 * 
+	 * 
+	 * @type Handler
+	 */
+	
+	handler: Class_Handler
+	
+	
+	
+	/**
+	 * 
+	 * @brief SslHandler 构造函数，创建一个新的 SslHandler 对象
+	 * 
+	 * certs 格式为：
+	 * ```JavaScript
+	 * [
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * },
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * }
+	 * ]
+	 * ```
+	 * @param certs 服务器证书列表
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(certs: any[], hdlr: Class_Handler);
+
+	/**
+	 * 
+	 * @brief SslHandler 构造函数，创建一个新的 SslHandler 对象
+	 * @param crt X509Cert 证书，用于客户端验证服务器
+	 * @param key PKey 私钥，用于与客户端会话
+	 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(crt: Class_X509Cert, key: Class_PKey, hdlr: Class_Handler);
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SslServer.d.ts b/types/fibjs/declare/SslServer.d.ts
new file mode 100644
index 0000000000..79b732600b
--- /dev/null
+++ b/types/fibjs/declare/SslServer.d.ts
@@ -0,0 +1,137 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief ssl 服务器对象，可方便创建一个标准多纤程 ssl 服务器
+	* @detail SslServer 对象是将 TcpServer 和 SslHandler 组合封装的对象，方便快速搭建服务器，逻辑上相当于：,```JavaScript,var svr = new net.SslServer(addr, port, new ssl.Handler(crt, key, function(req){,   ...,}));,```,,创建方法：,```JavaScript,var ssl = require("ssl");,var svr = new http.Server(crt, key, function(req){,    ...,});,```
+	*/
+/// <reference path="TcpServer.d.ts" />
+declare class Class_SslServer extends Class_TcpServer {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设定证书验证模式，缺省为 VERIFY_NONE
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	verification: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 客户端证书验证证书链
+	 * 
+	 * @readonly
+	 * @type X509Cert
+	 */
+	
+	ca: Class_X509Cert
+	
+	
+	
+	/**
+	 * 
+	 * @brief SslServer 构造函数，在所有本机地址侦听
+	 * 
+	 * certs 格式为：
+	 * ```JavaScript
+	 * [
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * },
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * }
+	 * ]
+	 * ```
+	 * @param certs 服务器证书列表
+	 * @param port 指定 ssl 服务器侦听端口
+	 * @param listener 指定 ssl 接收到的内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(certs: any[], port: number, listener: Class_Handler);
+
+	/**
+	 * 
+	 * @brief SslServer 构造函数
+	 * 
+	 * certs 格式为：
+	 * ```JavaScript
+	 * [
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * },
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * }
+	 * ]
+	 * ```
+	 * @param certs 服务器证书列表
+	 * @param addr 指定 ssl 服务器侦听地址，为 "" 则在本机所有地址侦听
+	 * @param port 指定 ssl 服务器侦听端口
+	 * @param listener 指定 ssl 接收到的连接的内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(certs: any[], addr: string, port: number, listener: Class_Handler);
+
+	/**
+	 * 
+	 * @brief SslServer 构造函数，在所有本机地址侦听
+	 * @param crt X509Cert 证书，用于客户端验证服务器
+	 * @param key PKey 私钥，用于与客户端会话
+	 * @param port 指定 ssl 服务器侦听端口
+	 * @param listener 指定 ssl 接收到的内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(crt: Class_X509Cert, key: Class_PKey, port: number, listener: Class_Handler);
+
+	/**
+	 * 
+	 * @brief SslServer 构造函数
+	 * @param crt X509Cert 证书，用于客户端验证服务器
+	 * @param key PKey 私钥，用于与客户端会话
+	 * @param addr 指定 ssl 服务器侦听地址，为 "" 则在本机所有地址侦听
+	 * @param port 指定 ssl 服务器侦听端口
+	 * @param listener 指定 ssl 接收到的连接的内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(crt: Class_X509Cert, key: Class_PKey, addr: string, port: number, listener: Class_Handler);
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SslSocket.d.ts b/types/fibjs/declare/SslSocket.d.ts
new file mode 100644
index 0000000000..7406b0d2f3
--- /dev/null
+++ b/types/fibjs/declare/SslSocket.d.ts
@@ -0,0 +1,139 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief ssl 网络套接口对象
+	* @detail SslSocket 属于 ssl 模块，创建方法,```JavaScript,var s = new ssl.Socket();,```
+	*/
+/// <reference path="Stream.d.ts" />
+declare class Class_SslSocket extends Class_Stream {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设定证书验证模式，缺省为 VERIFY_REQUIRED
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	verification: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 证书链，客户端模式 connect 时自动引用 ssl.ca，服务器模式 accept 生成 SslSocket 自动引用当前 SslSocket 的 ca
+	 * 
+	 * @readonly
+	 * @type X509Cert
+	 */
+	
+	ca: Class_X509Cert
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 连接对方的证书
+	 * 
+	 * @readonly
+	 * @type X509Cert
+	 */
+	
+	peerCert: Class_X509Cert
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询消息 ssl 建立时的下层流对象
+	 * 
+	 * @readonly
+	 * @type Stream
+	 */
+	
+	stream: Class_Stream
+	
+	
+	
+	/**
+	 * 
+	 * @brief SslSocket 构造函数，创建一个新的 SslSocket 对象
+	 * 
+	 * certs 格式为：
+	 * ```JavaScript
+	 * [
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * },
+	 * {
+	 * crt: [X509Cert object],
+	 * key: [PKey object]
+	 * }
+	 * ]
+	 * ```
+	 * @param certs 服务器证书列表
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(certs?: any[]/** = v8::Array::New(isolate)*/);
+
+	/**
+	 * 
+	 * @brief SslSocket 构造函数，创建一个新的 SslSocket 对象
+	 * @param crt X509Cert 证书，用于客户端验证服务器
+	 * @param key PKey 私钥，用于与客户端会话
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(crt: Class_X509Cert, key: Class_PKey);
+
+	/**
+	 * 
+	 * @brief 在给定的连接上连接 ssl 连接，客户端模式
+	 * @param s 给定的底层连接
+	 * @param server_name 指定服务器名称，可缺省
+	 * @return 连接成功返回 0，证书可选验证时，验证不成功则返回非 0，详细错误见 ssl 模块
+	 * 
+	 * 
+	 * @async
+	 */
+	connect(s: Class_Stream, server_name?: string/** = ""*/): number;
+
+	/**
+	 * 
+	 * @brief 在给定的连接上接收一个 ssl 连接，并生成一个新的 SslSocket
+	 * @param s 给定的底层连接
+	 * @return 返回新建立的 SslSocket 对象
+	 * 
+	 * 
+	 * @async
+	 */
+	accept(s: Class_Stream): Class_SslSocket;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Stat.d.ts b/types/fibjs/declare/Stat.d.ts
new file mode 100644
index 0000000000..545a9c8e1d
--- /dev/null
+++ b/types/fibjs/declare/Stat.d.ts
@@ -0,0 +1,219 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 文件的基础信息对象
+	* @detail Stat 对象通过 fs.stat, File.stat, fs.readdir 查询，不可独立创建
+	*/
+
+declare class Class_Stat extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件尺寸
+	 * 
+	 * @readonly
+	 * @type Long
+	 */
+	
+	size: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件权限，Windows 不支持此属性
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	mode: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件最后修改时间
+	 * 
+	 * @readonly
+	 * @type Date
+	 */
+	
+	mtime: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件最后访问时间
+	 * 
+	 * @readonly
+	 * @type Date
+	 */
+	
+	atime: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件创建时间
+	 * 
+	 * @readonly
+	 * @type Date
+	 */
+	
+	ctime: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件拥有者的id
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	uid: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 文件所属的组id
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	gid: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 查询文件是否有写入权限
+	 * @return 为 true 则有写入权限
+	 * 
+	 * 
+	 * 
+	 */
+	isWritable(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否有读权限
+	 * @return 为 true 则有读权限
+	 * 
+	 * 
+	 * 
+	 */
+	isReadable(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否有执行权限
+	 * @return 为 true 则有执行权限
+	 * 
+	 * 
+	 * 
+	 */
+	isExecutable(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否隐藏
+	 * @return 为 true 则隐藏
+	 * 
+	 * 
+	 * 
+	 */
+	isHidden(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否是目录
+	 * @return 为 true 则是目录
+	 * 
+	 * 
+	 * 
+	 */
+	isDirectory(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否是文件
+	 * @return 为 true 则是文件
+	 * 
+	 * 
+	 * 
+	 */
+	isFile(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否是符号链接
+	 * @return 为 true 则是符号链接
+	 * 
+	 * 
+	 * 
+	 */
+	isSymbolicLink(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否是内存文件
+	 * @return 为 true 则是内存文件
+	 * 
+	 * 
+	 * 
+	 */
+	isMemory(): boolean;
+
+	/**
+	 * 
+	 * @brief 查询文件是否是 Socket
+	 * @return 为 true 则是 Socket
+	 * 
+	 * 
+	 * 
+	 */
+	isSocket(): boolean;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Stats.d.ts b/types/fibjs/declare/Stats.d.ts
new file mode 100644
index 0000000000..291795b34a
--- /dev/null
+++ b/types/fibjs/declare/Stats.d.ts
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 数据统计对象，用以构建应用运行时数据收集
+	* @detail 创建方法：,```JavaScript,var util = require("util");,var stats = new util.Stats(["begin", "end", "error"]);,```,一些内部对象会提供预先定义的的统计对象
+	*/
+
+declare class Class_Stats extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 数据统计对象构造方法
+	 * @param keys 指定计数器的名称
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(keys: any[]);
+
+	/**
+	 * 
+	 * @brief 数据统计对象构造方法
+	 * @param staticKeys 指定静态计数器的名称，静态计数器不会被 reset
+	 * @param keys 指定计数器的名称
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(staticKeys: any[], keys: any[]);
+
+	/**
+	 * 
+	 * @brief 指定的计数器增一
+	 * @param key 指定计数器名称
+	 * 
+	 * 
+	 * 
+	 */
+	inc(key: string): void;
+
+	/**
+	 * 
+	 * @brief 指定的计数器减一
+	 * @param key 指定计数器名称
+	 * 
+	 * 
+	 * 
+	 */
+	dec(key: string): void;
+
+	/**
+	 * 
+	 * @brief 指定的计数器加指定值
+	 * @param key 指定计数器名称
+	 * @param value 指定数值
+	 * 
+	 * 
+	 * 
+	 */
+	add(key: string, value: number): void;
+
+	/**
+	 * 
+	 * @brief 初始化计数器，除 staticKeys 指定的计数器全部清零
+	 * 
+	 * 
+	 */
+	reset(): void;
+
+	/**
+	 * 
+	 * @brief 查询上次 reset 到现在的运行时间
+	 * @return 返回上次 reset 到现在的运行时间
+	 * 
+	 * 
+	 * 
+	 */
+	uptime(): number;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Stream.d.ts b/types/fibjs/declare/Stream.d.ts
new file mode 100644
index 0000000000..301d422e91
--- /dev/null
+++ b/types/fibjs/declare/Stream.d.ts
@@ -0,0 +1,82 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 流操作对象，用于二进制数据流读写
+	* @detail Stream 为基础对象，用于为流处理定义标准借口，不能独立创建
+	*/
+
+declare class Class_Stream extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 从流内读取指定大小的数据
+	 * @param bytes 指定要读取的数据量，缺省为读取随机大小的数据块，读出的数据尺寸取决于设备
+	 * @return 返回从流内读取的数据，若无数据可读，或者连接中断，则返回 null
+	 * 
+	 * 
+	 * @async
+	 */
+	read(bytes?: number/** = -1*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 将给定的数据写入流
+	 * @param data 给定要写入的数据
+	 * 
+	 * 
+	 * @async
+	 */
+	write(data: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 将文件缓冲区内容写入物理设备
+	 * 
+	 * @async
+	 */
+	flush(): void;
+
+	/**
+	 * 
+	 * @brief 关闭当前流对象
+	 * 
+	 * @async
+	 */
+	close(): void;
+
+	/**
+	 * 
+	 * @brief 复制流数据到目标流中
+	 * @param stm 目标流对象
+	 * @param bytes 复制的字节数
+	 * @return 返回复制的字节数
+	 * 
+	 * 
+	 * @async
+	 */
+	copyTo(stm: Class_Stream, bytes?: number/** = -1*/): number;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/StringDecoder.d.ts b/types/fibjs/declare/StringDecoder.d.ts
new file mode 100644
index 0000000000..a03c9ccadc
--- /dev/null
+++ b/types/fibjs/declare/StringDecoder.d.ts
@@ -0,0 +1,146 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 流解码对象
+	* @detail 
+	*/
+
+declare class Class_StringDecoder extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 内部使用。
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	lastNeed: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 内部使用。
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	lastTotal: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 内部使用。
+	 * 
+	 * 
+	 * @type Buffer
+	 */
+	
+	lastChar: Class_Buffer
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 解码编码.内部使用。
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	encoding: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief 解码器构造函数
+	 * @param encoding 解码编码. 默认 'utf8'.
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(encoding?: string/** = "utf8"*/);
+
+	/**
+	 * 
+	 * @brief 将内部存留的 buffer 作为字符返回。不完整的 UTF-8 和 UTF-16 字节会尝试补全。
+	 * @return 解码后的字符串.
+	 * 
+	 * 
+	 * 
+	 */
+	end(): string;
+
+	/**
+	 * 
+	 * @brief 将内部存留的 buffer 作为字符返回。不完整的 UTF-8 和 UTF-16 字节会尝试补全。
+	 * @param buf 需要解码的 Buffer. 在执行 end 之前，会先调用 write 将 buffer 写入。
+	 * @return 解码后的字符串.
+	 * 
+	 * 
+	 * 
+	 */
+	end(buf: Class_Buffer): string;
+
+	/**
+	 * 
+	 * @brief 返回一个解码后的字符串, 确保任何非完整的末尾字符被省略此次不返回，并被存储在内部供下一次的 write 或者 end 方法使用。
+	 * @param  buf 需要解码的 Buffer。
+	 * @return 解码后的字符串.
+	 * 
+	 * 
+	 * 
+	 */
+	write(buf: Class_Buffer): string;
+
+	/**
+	 * 
+	 * @brief 内部使用。.
+	 * @param buf 需要解码的 Buffer。
+	 * @param offset 解码偏移量
+	 * @return 解码后的字符串.
+	 * 
+	 * 
+	 * 
+	 */
+	text(buf: Class_Buffer, offset: number): string;
+
+	/**
+	 * 
+	 * @brief 内部使用。.
+	 * @param buf A Buffer containing the bytes to decode.
+	 * @return 解码后的字符串.
+	 * 
+	 * 
+	 * 
+	 */
+	fillLast(buf: Class_Buffer): string;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/SubProcess.d.ts b/types/fibjs/declare/SubProcess.d.ts
new file mode 100644
index 0000000000..59fe0da0c3
--- /dev/null
+++ b/types/fibjs/declare/SubProcess.d.ts
@@ -0,0 +1,103 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 子进程对象
+	* @detail ```JavaScript,var process = require("process");,var sub = process.open("ls");,```
+	*/
+/// <reference path="BufferedStream.d.ts" />
+declare class Class_SubProcess extends Class_BufferedStream {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 读取当前对象指向的进程的 id
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	pid: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 读取当前对象指向的进程的标准输入对象
+	 * 
+	 * 
+	 * @readonly
+	 * @type BufferedStream
+	 */
+	
+	stdin: Class_BufferedStream
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 读取当前对象指向的进程的标准输出对象
+	 * 
+	 * 
+	 * @readonly
+	 * @type BufferedStream
+	 */
+	
+	stdout: Class_BufferedStream
+	
+	
+	
+	/**
+	 * 
+	 * @brief 杀掉当前对象指向的进程，并传递信号
+	 * @param signal 传递的信号
+	 * 
+	 * 
+	 * 
+	 */
+	kill(signal: number): void;
+
+	/**
+	 * 
+	 * @brief 等待当前对象指向的进程结束，并返回进程结束代码
+	 * @return 进程的结束代码
+	 * 
+	 * 
+	 * @async
+	 */
+	wait(): number;
+
+	/**
+	 * 
+	 * @brief 查询当前对象所指向的进程是否存在指定名称的窗口，仅限 windows
+	 * @param name 窗口名称
+	 * @return 窗口存在则返回窗口的 rect，否则返回 undefined
+	 * 
+	 * 
+	 * 
+	 */
+	findWindow(name: string): any;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/TcpServer.d.ts b/types/fibjs/declare/TcpServer.d.ts
new file mode 100644
index 0000000000..19d9ddcfb9
--- /dev/null
+++ b/types/fibjs/declare/TcpServer.d.ts
@@ -0,0 +1,127 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief tcp 服务器对象，可方便创建一个标准多纤程 tcp 服务器
+	* @detail 使用 TcpServer 对象可以迅速创建一个多纤程并发处理的 tcp 服务器。,```JavaScript,function func(conn),{,    var data;,,    while(data = conn.read()),        conn.write(data);,,    conn.close();,},,new net.TcpServer(8080, func).run();,```
+	*/
+
+declare class Class_TcpServer extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 服务器当前侦听的 Socket 对象
+	 * 
+	 * @readonly
+	 * @type Socket
+	 */
+	
+	socket: Class_Socket
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 服务器当前事件处理接口对象
+	 * 
+	 * 
+	 * @type Handler
+	 */
+	
+	handler: Class_Handler
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前服务器运行状态
+	 * 
+	 * 返回的结果为一个 Stats 对象，初始化计数器如下：
+	 * ```JavaScript
+	 * {
+	 * total : 1000,      // 总计处理的连接
+	 * connections : 100, // 当前正在处理的连接
+	 * accept : 10,       // 上次查询后新建的连接
+	 * close : 10         // 上次查询后关闭的连接
+	 * }
+	 * ```
+	 * 
+	 * 
+	 * @readonly
+	 * @type Stats
+	 */
+	
+	stats: Class_Stats
+	
+	
+	
+	/**
+	 * 
+	 * @brief TcpServer 构造函数，在所有本机地址侦听
+	 * @param port 指定 tcp 服务器侦听端口
+	 * @param listener 指定 tcp 接收到的内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(port: number, listener: Class_Handler);
+
+	/**
+	 * 
+	 * @brief TcpServer 构造函数
+	 * @param addr 指定 tcp 服务器侦听地址，为 "" 则在本机所有地址侦听
+	 * @param port 指定 tcp 服务器侦听端口
+	 * @param listener 指定 tcp 接收到的连接的内置消息处理器，处理函数，链式处理数组，路由对象，详见 mq.Handler
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(addr: string, port: number, listener: Class_Handler);
+
+	/**
+	 * 
+	 * @brief 运行服务器并开始接收和分发连接，此函数不会返回
+	 * 
+	 * @async
+	 */
+	run(): void;
+
+	/**
+	 * 
+	 * @brief 异步运行服务器并开始接收和分发连接，调用后立即返回，服务器在后台运行
+	 * 
+	 * 
+	 */
+	asyncRun(): void;
+
+	/**
+	 * 
+	 * @brief 关闭 socket中止正在运行的服务器
+	 * 
+	 * @async
+	 */
+	stop(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Timer.d.ts b/types/fibjs/declare/Timer.d.ts
new file mode 100644
index 0000000000..c18b313cc9
--- /dev/null
+++ b/types/fibjs/declare/Timer.d.ts
@@ -0,0 +1,73 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 定时器处理器对象
+	* @detail 
+	*/
+
+declare class Class_Timer extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前定时器是否已经终止
+	 * 
+	 * @readonly
+	 * @type Boolean
+	 */
+	
+	stopped: boolean
+	
+	
+	
+	/**
+	 * 
+	 * @brief 维持 fibjs 进程不退出，在定时器等待期间阻止 fibjs 进程退出
+	 * @return 返回定时器对象
+	 * 
+	 * 
+	 * 
+	 */
+	ref(): Class_Timer;
+
+	/**
+	 * 
+	 * @brief 允许 fibjs 进程退出，在定时器等待期间允许 fibjs 进程退出
+	 * @return 返回定时器对象
+	 * 
+	 * 
+	 * 
+	 */
+	unref(): Class_Timer;
+
+	/**
+	 * 
+	 * @brief 取消当前定时器
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/UrlObject.d.ts b/types/fibjs/declare/UrlObject.d.ts
new file mode 100644
index 0000000000..5baa5b2d7d
--- /dev/null
+++ b/types/fibjs/declare/UrlObject.d.ts
@@ -0,0 +1,279 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Url 处理对象
+	* @detail 基础模块。提供 url 的格式化，解析与拼装,```JavaScript,var url = new net.Url('http://www.xici.net/');,var url = new net.Url({protocol: 'http:', hostname:'www.xici.net', pathname:'/'});,```
+	*/
+
+declare class Class_UrlObject extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的完整 url 地址描述，此描述由其他所有属性组装而成
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	href: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的协议名称
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	protocol: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象是否包含双斜杠
+	 * 
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	slashes: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的完整验证字符串，由 username 和 password 属性组装而成
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	auth: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的验证用户
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	username: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的验证密码
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	password: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的完整主机描述，由 hastname 和 port 组装而成
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	host: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的主机名
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	hostname: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的端口号
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	port: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的请求完整路径（含请求），由 pathname 和 query 组装而成
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	path: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的路径
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	pathname: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的请求字符串（含“?”），等效于“?”+query
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	search: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的请求字符串（ 不含“?”）
+	 * 
+	 * 
+	 * 
+	 * @type Value
+	 */
+	
+	query: any
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置当前 UrlObject 对象中的请求锚点（含“\#”）
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	hash: string
+	
+	
+	
+	/**
+	 * 
+	 * @brief UrlObject 对象构造函数，使用参数构造
+	 * @param args 指定构造参数的字典对象，支持的字段有：protocol, slashes, username, password, hostname, port, pathname, query, hash
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(args: object);
+
+	/**
+	 * 
+	 * @brief UrlObject 对象构造函数，使用 url 字符串构造
+	 * @param url 指定构造 url 字符串
+	 * @param parseQueryString 指定是否解析 query
+	 * @param slashesDenoteHost  默认为false, 如果设置为true，则从字符串'//'之后到下一个'/'之前的字符串会被解析为host，例如'//foo/bar', 结果应该是{host: 'foo', pathname: '/bar'}而不是{pathname: '//foo/bar'}
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(url?: string/** = ""*/, parseQueryString?: boolean/** = false*/, slashesDenoteHost?: boolean/** = false*/);
+
+	/**
+	 * 
+	 * @brief 解析一个 url 字符串
+	 * @param url 指定需要解析的 url 字符串
+	 * @param parseQueryString 指定是否解析 query
+	 * @param slashesDenoteHost  默认为false, 如果设置为true，则从字符串'//'之后到下一个'/'之前的字符串会被解析为host，例如'//foo/bar', 结果应该是{host: 'foo', pathname: '/bar'}而不是{pathname: '//foo/bar'}
+	 * 
+	 * 
+	 * 
+	 */
+	parse(url: string, parseQueryString?: boolean/** = false*/, slashesDenoteHost?: boolean/** = false*/): void;
+
+	/**
+	 * 
+	 * @brief 使用指定的参数构造 UrlObject
+	 * @param args 指定构造参数的字典对象，支持的字段有：protocol, slashes, username, password, hostname, port, pathname, query, hash
+	 * 
+	 * 
+	 * 
+	 */
+	format(args: object): void;
+
+	/**
+	 * 
+	 * @brief 重定位 url 路径，自动识别新路径为相对路径还是绝对路径
+	 * @param url 指定新的路径
+	 * @return 返回包含重定位数据的对象
+	 * 
+	 * 
+	 * 
+	 */
+	resolve(url: string): Class_UrlObject;
+
+	/**
+	 * 
+	 * @brief 标准化路径
+	 * 
+	 * 
+	 * 
+	 */
+	normalize(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/WebSocket.d.ts b/types/fibjs/declare/WebSocket.d.ts
new file mode 100644
index 0000000000..3054397004
--- /dev/null
+++ b/types/fibjs/declare/WebSocket.d.ts
@@ -0,0 +1,192 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief WebSocket 包协议转换处理器
+	* @detail 用以将 Http 协议转换为 WebSocket 包协议消息。创建方式：,```JavaScript,var ws = require('ws');,var http = require('http');,,var serv = new http.Server(8811, ws.upgrade((conn) => {,conn.onmessage = msg => {,    conn.send(new Date());,};,}));,,serv.run(r => 0);,,var sock = new ws.Socket('ws://127.0.0.1:8811');,sock.on('open', () => {,    setInterval(() => {,        sock.send('get date');,    }, 1000);,});,,sock.onmessage = evt => {,  console.log(evt.data);,},```
+	*/
+/// <reference path="EventEmitter.d.ts" />
+declare class Class_WebSocket extends Class_EventEmitter {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前对象连接的服务器
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	url: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前对象连接时的协议
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	protocol: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前对象连接的源
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	origin: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前对象的连接状态，参见 ws
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	readyState: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定连接成功事件，相当于 on("open", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onopen: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定接受到对方消息的事件，相当于 on("message", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onmessage: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定连接关闭的事件，相当于 on("close", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onclose: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定错误发生的事件，相当于 on("error", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onerror: Function
+	
+	
+	
+	/**
+	 * 
+	 * @brief WebSocket 构造函数
+	 * @param url 指定连接的服务器
+	 * @param protocol 指定握手协议，缺省为 ""
+	 * @param origin 指定握手时模拟的源
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(url: string, protocol?: string/** = ""*/, origin?: string/** = ""*/);
+
+	/**
+	 * 
+	 * @brief 关闭当前连接，此操作会向对方发送 CLOSE 数据包，并等待对方响应
+	 * @param code 指定关闭的代码，允许值为 3000-4999 或者 1000，缺省为 1000
+	 * @param reason 指定关闭的原因，缺省为 ""
+	 * 
+	 * 
+	 * 
+	 */
+	close(code?: number/** = 1000*/, reason?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 向对方发送一段文本
+	 * @param data 指定发送的文本
+	 * 
+	 * 
+	 * 
+	 */
+	send(data: string): void;
+
+	/**
+	 * 
+	 * @brief 向对方发送一段二进制数据
+	 * @param data 指定发送的二进制数据
+	 * 
+	 * 
+	 * 
+	 */
+	send(data: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 维持 fibjs 进程不退出，在对象绑定期间阻止 fibjs 进程退出
+	 * @return 返回当前对象
+	 * 
+	 * 
+	 * 
+	 */
+	ref(): Class_WebSocket;
+
+	/**
+	 * 
+	 * @brief 允许 fibjs 进程退出，在对象绑定期间允许 fibjs 进程退出
+	 * @return 返回当前对象
+	 * 
+	 * 
+	 * 
+	 */
+	unref(): Class_WebSocket;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/WebSocketMessage.d.ts b/types/fibjs/declare/WebSocketMessage.d.ts
new file mode 100644
index 0000000000..14008263b7
--- /dev/null
+++ b/types/fibjs/declare/WebSocketMessage.d.ts
@@ -0,0 +1,84 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief websocket 消息对象
+	* @detail 创建方法：,```JavaScript,var ws = require("ws");,,var msg = new ws.Message();,```
+	*/
+/// <reference path="Message.d.ts" />
+declare class Class_WebSocketMessage extends Class_Message {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和读取 websocket 掩码标记，缺省为 true
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	masked: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和读取 websocket 压缩状态，缺省为 false
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	compress: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置最大包尺寸，以字节为单位，缺省为 67108864(64M)
+	 * 
+	 * 
+	 * @type Integer
+	 */
+	
+	maxSize: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 包处理消息对象构造函数
+	 * @param type websocket 消息类型，缺省为 websocket.BINARY
+	 * @param masked websocket 消息掩码，缺省为 true
+	 * @param compress 标记消息是否压缩，缺省为 false
+	 * @param maxSize 最大包尺寸，以 MB 为单位，缺省为 67108864(64M)
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(type?: number/** = undefined*/, masked?: boolean/** = true*/, compress?: boolean/** = false*/, maxSize?: number/** = 67108864*/);
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/WebView.d.ts b/types/fibjs/declare/WebView.d.ts
new file mode 100644
index 0000000000..a5035b662e
--- /dev/null
+++ b/types/fibjs/declare/WebView.d.ts
@@ -0,0 +1,172 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 浏览器窗口对象
+	* @detail WebView 是一个嵌入浏览器的窗口组件，目前仅支持 windows ie。,,由于 WebView 内的 JavaScript 程序与 fibjs 并不在同一个引擎内，所以如果需要与宿主程序进行通讯，需要通过消息进行。,,WebView 用于通讯的对象是 external，external 支持一个方法 postMessage 和两个事件 onmessage、onclose。,,一个简单的通讯示例代码如下：,```JavaScript,// index.js,var gui = require('gui');,var webview = gui.open('fs:index.html');,,webview.onmessage = msg => console.log(msg);,,webview.onload = evt => webview.postMessage("hello from fibjs");,,webview.wait();,```,,index.html 的内容如下：,```html,<script>,    external.onclose = function() {,    },,    external.onmessage = function(msg){,        external.postMessage("send back: " + msg);,    };,</script>,```, 在用户窗口关闭之前，会触发 external.onclose 事件，external.onclose 可以决定是否关闭。如果 external.onclose 返回 false，则此次操作取消，否则将关闭窗口。,,以下的例子，会在用户点关闭后等待 5 秒后再关闭窗口。,```html,<script lang="JavaScript">,    var bClose = false;,    external.onclose = function () {,        if (!bClose) {,            setTimeout(function () {,                bClose = true;,                window.close();,            }, 5000);,            return false;,        },    },</script>,```,上面的代码中，因为 window.close 本身也会触发 onclose 事件，所以需要增加一个开关变量，用于识别是否需要处理此次事件。
+	*/
+/// <reference path="EventEmitter.d.ts" />
+declare class Class_WebView extends Class_EventEmitter {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置窗口是否显示
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	visible: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定加载成功事件，相当于 on("load", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onload: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定窗口移动事件，相当于 on("move", func);
+	 * 
+	 * 以下示例会在窗口移动时输出窗口的左上角坐标：
+	 * ```JavaScript
+	 * var gui = require('gui');
+	 * var webview = gui.open('fs:index.html');
+	 * 
+	 * webview.onmove = evt => console.log(evt.left, evt.top);
+	 * ```
+	 * 
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onmove: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定窗口尺寸改变事件，相当于 on("size", func);
+	 * 
+	 * 以下示例会在窗口改变大小时输出窗口的尺寸：
+	 * ```JavaScript
+	 * var gui = require('gui');
+	 * var webview = gui.open('fs:index.html');
+	 * 
+	 * webview.onresize = evt => console.log(evt.width, evt.height);
+	 * ```
+	 * 
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onresize: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定窗口关闭事件，WebView 关闭后会触发此时间，相当于 on("closed", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onclosed: Function
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定接受 webview 内 postMessage 消息事件，相当于 on("message", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onmessage: Function
+	
+	
+	
+	/**
+	 * 
+	 * @brief 设置 webview 的页面 html
+	 * @param html 设置的 html
+	 * 
+	 * 
+	 * @async
+	 */
+	setHtml(html: string): void;
+
+	/**
+	 * 
+	 * @brief 打印当前窗口文档
+	 * @param mode 打印参数，0: 快速打印; 1: 标准打印; 2: 打印预览。缺省为 1
+	 * 
+	 * 
+	 * @async
+	 */
+	print(mode?: number/** = 1*/): void;
+
+	/**
+	 * 
+	 * @brief 关闭当前窗口
+	 * 
+	 * @async
+	 */
+	close(): void;
+
+	/**
+	 * 
+	 * @brief 等待当前窗口关闭
+	 * 宿主程序在创建窗口后，需要进入等待，否则随着宿主程序的退出，窗口将自动关闭。同时 wait 的调用也并不是必须的，你可以在打开窗口后处理其它业务，只需要保证程序不会自行退出即可。
+	 * 
+	 * 
+	 * @async
+	 */
+	wait(): void;
+
+	/**
+	 * 
+	 * @brief 向 webview 内发送消息
+	 * postMessage 需要在窗口加载完成后发送消息，在此之前发送的消息会丢失。因此建议在 onload 事件触发后再调用此方法。
+	 * @param msg 要发送的消息
+	 * 
+	 * 
+	 * @async
+	 */
+	postMessage(msg: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/Worker.d.ts b/types/fibjs/declare/Worker.d.ts
new file mode 100644
index 0000000000..c427f6f41c
--- /dev/null
+++ b/types/fibjs/declare/Worker.d.ts
@@ -0,0 +1,66 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 独立线程工作对象
+	* @detail 
+	*/
+/// <reference path="EventEmitter.d.ts" />
+declare class Class_Worker extends Class_EventEmitter {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和绑定接受 postMessage 消息事件，相当于 on("message", func);
+	 * 
+	 * 
+	 * @type Function
+	 */
+	
+	onmessage: Function
+	
+	
+	
+	/**
+	 * 
+	 * @brief Worker 对象构造函数
+	 * @param path 指定 Worker 入口脚本，只接受绝对路径
+	 * @param opts 构造选项，暂未支持
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(path: string, opts?: object/** = v8::Object::New(isolate)*/);
+
+	/**
+	 * 
+	 * @brief 向 Master 或 Worker 发送消息，
+	 * @param data 指定发送的消息内容
+	 * 
+	 * 
+	 * 
+	 */
+	postMessage(data: any): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/X509Cert.d.ts b/types/fibjs/declare/X509Cert.d.ts
new file mode 100644
index 0000000000..5090f422cf
--- /dev/null
+++ b/types/fibjs/declare/X509Cert.d.ts
@@ -0,0 +1,263 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief x509 证书对象
+	* @detail X509Cert 对象属于 crypto 模块，创建：,```JavaScript,var k = new crypto.X509Cert();,```
+	*/
+
+declare class Class_X509Cert extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的版本
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	version: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的序列号
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	serial: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书颁发者的可分辨名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	issuer: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的主题可分辨名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	subject: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的生效时间
+	 * 
+	 * @readonly
+	 * @type Date
+	 */
+	
+	notBefore: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的到期时间
+	 * 
+	 * @readonly
+	 * @type Date
+	 */
+	
+	notAfter: Date
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书是否是 ca 证书
+	 * 
+	 * @readonly
+	 * @type Boolean
+	 */
+	
+	ca: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的 pathlen
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	pathlen: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的使用范围
+	 * 
+	 * 结果为全部或部分以下内容：digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment, keyAgreement, keyCertSign, cRLSign
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	usage: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的 Netscape 证书类型
+	 * 
+	 * 结果为全部或部分以下内容：client, server, email, objsign, reserved, sslCA, emailCA, objCA
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	type: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的公钥
+	 * 
+	 * @readonly
+	 * @type PKey
+	 */
+	
+	publicKey: Class_PKey
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书链中得下一个证书
+	 * 
+	 * @readonly
+	 * @type X509Cert
+	 */
+	
+	next: Class_X509Cert
+	
+	
+	
+	/**
+	 * 
+	 * @brief X509Cert 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 加载一个 DER 格式的证书，可多次调用
+	 * @param derCert DER 格式的证书
+	 * 
+	 * 
+	 * 
+	 */
+	load(derCert: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 CRT/PEM/TXT 格式的证书，可多次调用
+	 * 
+	 * load 加载 mozilla 的 certdata,txt， 可于 http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt 下载使用
+	 * @param txtCert PEM 格式的证书
+	 * 
+	 * 
+	 * 
+	 */
+	load(txtCert: string): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 CRT/PEM/DER/TXT 格式的证书，可多次调用
+	 * 
+	 * loadFile 加载 mozilla 的 certdata,txt， 可于 http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt 下载使用
+	 * @param filename 证书文件名
+	 * 
+	 * 
+	 * 
+	 */
+	loadFile(filename: string): void;
+
+	/**
+	 * 
+	 * @brief 加载自带的缺省根证书
+	 * 此证书内容源自：http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+	 * 
+	 * 
+	 */
+	loadRootCerts(): void;
+
+	/**
+	 * 
+	 * @brief 使用当前证书链验证给定的证书
+	 * @param cert 给定需要验证的证书
+	 * @return 如果验证成功则返回 True
+	 * 
+	 * 
+	 * @async
+	 */
+	verify(cert: Class_X509Cert): boolean;
+
+	/**
+	 * 
+	 * @brief 导出已经加载的证书
+	 * @return 以数组方式导出证书链
+	 * 
+	 * 
+	 * 
+	 */
+	dump(): any[];
+
+	/**
+	 * 
+	 * @brief 清空已经加载的证书
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/X509Crl.d.ts b/types/fibjs/declare/X509Crl.d.ts
new file mode 100644
index 0000000000..22c0b1f99a
--- /dev/null
+++ b/types/fibjs/declare/X509Crl.d.ts
@@ -0,0 +1,90 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief x509 撤销证书对象
+	* @detail X509Crl 对象属于 crypto 模块，创建：,```JavaScript,var k = new crypto.X509Crl();,```
+	*/
+
+declare class Class_X509Crl extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief X509Crl 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief 加载一个 DER 格式的撤销证书，可多次调用
+	 * @param derCrl DER 格式的撤销证书
+	 * 
+	 * 
+	 * 
+	 */
+	load(derCrl: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 PEM 格式的撤销证书，可多次调用
+	 * @param pemCrl PEM 格式的撤销证书
+	 * 
+	 * 
+	 * 
+	 */
+	load(pemCrl: string): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 PEM/DER 格式的撤销证书，可多次调用
+	 * @param filename 撤销证书文件名
+	 * 
+	 * 
+	 * 
+	 */
+	loadFile(filename: string): void;
+
+	/**
+	 * 
+	 * @brief 导出已经加载的撤销证书
+	 * @return 以数组方式导出撤销证书链
+	 * 
+	 * 
+	 * 
+	 */
+	dump(): any[];
+
+	/**
+	 * 
+	 * @brief 清空已经加载的撤销证书
+	 * 
+	 * 
+	 * 
+	 */
+	clear(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/X509Req.d.ts b/types/fibjs/declare/X509Req.d.ts
new file mode 100644
index 0000000000..502c078402
--- /dev/null
+++ b/types/fibjs/declare/X509Req.d.ts
@@ -0,0 +1,155 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief x509 证书请求对象
+	* @detail X509Req 对象属于 crypto 模块，创建：,```JavaScript,var k = new crypto.X509Req();,```
+	*/
+
+declare class Class_X509Req extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的主题可分辨名称
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	subject: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 获取证书的公钥
+	 * 
+	 * @readonly
+	 * @type PKey
+	 */
+	
+	publicKey: Class_PKey
+	
+	
+	
+	/**
+	 * 
+	 * @brief X509Req 构造函数
+	 * 
+	 * 
+	 */
+	constructor();
+
+	/**
+	 * 
+	 * @brief X509Req 构造函数，根据给定的信息创建一个证书请求
+	 * 
+	 * @param subject 证书的主题可分辨名称
+	 * @param key 证书的公钥
+	 * @param hash 证书摘要算法，缺省为 hash.SHA1
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(subject: string, key: Class_PKey, hash?: number/** = undefined*/);
+
+	/**
+	 * 
+	 * @brief 加载一个 DER 格式的证书请求
+	 * @param derReq DER 格式的证书请求
+	 * 
+	 * 
+	 * 
+	 */
+	load(derReq: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 PEM 格式的证书请求
+	 * @param pemReq PEM 格式的证书请求
+	 * 
+	 * 
+	 * 
+	 */
+	load(pemReq: string): void;
+
+	/**
+	 * 
+	 * @brief 加载一个 PEM/DER 格式的证书请求，可多次调用
+	 * @param filename 证书请求文件名
+	 * 
+	 * 
+	 * 
+	 */
+	loadFile(filename: string): void;
+
+	/**
+	 * 
+	 * @brief 返回当前证书请求的 PEM 格式编码
+	 * @return 当前证书请求的 PEM 格式编码
+	 * 
+	 * 
+	 * 
+	 */
+	exportPem(): string;
+
+	/**
+	 * 
+	 * @brief 返回当前证书请求的 DER 格式编码
+	 * @return 当前证书请求的 DER 格式编码
+	 * 
+	 * 
+	 * 
+	 */
+	exportDer(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 签名当前证书请求为正式证书
+	 * 
+	 * opts 接收的字段如下：
+	 * ```JavaScript
+	 * {
+	 * ca: false,      // 证书为 ca，缺省为 false
+	 * pathlen: -1,    // 证书深度，缺省为 -1
+	 * notBefore: "",  // 证书生效时间，缺省为当前时间
+	 * notAfter: "",   // 证书失效时间，缺省为 notBefore 后一年
+	 * usage: "",      // 证书使用范围，接收：digitalSignature, nonRepudiation, keyEncipherment, dataEncipherment, keyAgreement, keyCertSign, cRLSign
+	 * type: ""        // 证书 Netscape 证书类型，接收：client, server, email, objsign, reserved, sslCA, emailCA, objCA
+	 * }
+	 * ```
+	 * @param issuer 签名机构的可分辨名称
+	 * @param key 签名机构的私钥
+	 * @param opts 其他可选参数
+	 * @return 返回签名后的正式证书
+	 * 
+	 * 
+	 * @async
+	 */
+	sign(issuer: string, key: Class_PKey, opts?: object/** = v8::Object::New(isolate)*/): Class_X509Cert;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlAttr.d.ts b/types/fibjs/declare/XmlAttr.d.ts
new file mode 100644
index 0000000000..82659f536a
--- /dev/null
+++ b/types/fibjs/declare/XmlAttr.d.ts
@@ -0,0 +1,124 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlAttr 对象表示 XmlElement 对象的属性
+	* @detail 
+	*/
+
+declare class Class_XmlAttr extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询元素的本地名称。如果选定的节点无命名空间，则该属性等同于 nodeName
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	localName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 属性的值
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	value: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 属性的名称
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询元素的命名空间的 URI。如果选定的节点无命名空间，则该属性返回 NULL
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	namespaceURI: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置元素的命名空间前缀。如果选定的节点无命名空间，则该属性返回 NULL
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	prefix: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 属性的名称，为兼容的目的
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	nodeName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 属性的值，为兼容的目的
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	nodeValue: string
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlCDATASection.d.ts b/types/fibjs/declare/XmlCDATASection.d.ts
new file mode 100644
index 0000000000..4640fc3758
--- /dev/null
+++ b/types/fibjs/declare/XmlCDATASection.d.ts
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlCDATASection 对象表示文档中的 CDATA 区段
+	* @detail XmlCDATASection 接口是 XmlText 接口的子接口，没有定义任何自己的属性和方法。通过从 XmlNode 接口继承 nodeValue 属性，或通过从 XmlCharacterData 接口继承 data 属性，可以访问 CDATA Section 的文本内容。,,虽然通常可以把 XmlCDATASection 节点作为 XmlText 节点处理，但要注意 XmlNode 的 normalize 方法不并入相邻的 CDATA 部分。,,使用 XmlDocument 的 createXmlCDATASection 方法来创建一个 XmlCDATASection 。,,CDATA 区段包含了不会被解析器解析的文本。CDATA 区段中的标签不会被视为标记，同时实体也不会被展开。主要的目的是为了包含诸如 XML 片段之类的材料，而无需转义所有的分隔符。,,在一个 CDATA 中唯一被识别的分隔符是 "]]>"，它可标示 CDATA 区段的结束。CDATA 区段不能进行嵌套。
+	*/
+/// <reference path="XmlText.d.ts" />
+declare class Class_XmlCDATASection extends Class_XmlText {
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlCharacterData.d.ts b/types/fibjs/declare/XmlCharacterData.d.ts
new file mode 100644
index 0000000000..e1e3b486dd
--- /dev/null
+++ b/types/fibjs/declare/XmlCharacterData.d.ts
@@ -0,0 +1,115 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlCharacterData 接口提供了 XmlText 和 XmlComment 节点的常用功能
+	* @detail XmlCharacterData 是 XmlText 和 XmlComment 节点的超接口。文档从不包含 XmlCharacterData 节点，它们只包含 XmlText 节点和 XmlComment 节点。但由于这两种节点具有相似的功能，因此此处定义了这些函数，以便 XmlText 和 XmlComment 可以继承它。
+	*/
+/// <reference path="XmlNode.d.ts" />
+declare class Class_XmlCharacterData extends Class_XmlNode {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 该节点包含的文本
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	data: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 该节点包含的字符数
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	length: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 从节点中提取子串
+	 * @param offset 要返回的第一个字符的位置
+	 * @param count 要返回的子串中的字符数
+	 * @return 返回提取的字符串
+	 * 
+	 * 
+	 * 
+	 */
+	substringData(offset: number, count: number): string;
+
+	/**
+	 * 
+	 * @brief 把字符串附加到节点上
+	 * @param arg 要附加到节点的字符串
+	 * 
+	 * 
+	 * 
+	 */
+	appendData(arg: string): void;
+
+	/**
+	 * 
+	 * @brief 把字符串插入节点
+	 * @param offset 要把字符串插入节点的字符位置
+	 * @param arg 要插入的字符串
+	 * 
+	 * 
+	 * 
+	 */
+	insertData(offset: number, arg: string): void;
+
+	/**
+	 * 
+	 * @brief 从节点删除文本
+	 * @param offset 要删除的第一个字符的位置
+	 * @param count 要删除的字符的数量
+	 * 
+	 * 
+	 * 
+	 */
+	deleteData(offset: number, count: number): void;
+
+	/**
+	 * 
+	 * @brief 用指定的字符串替换节点的字符
+	 * @param offset 节点要替换的字符位置
+	 * @param count 要替换的字符的数量
+	 * @param arg 要插入的字符串
+	 * 
+	 * 
+	 * 
+	 */
+	replaceData(offset: number, count: number, arg: string): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlComment.d.ts b/types/fibjs/declare/XmlComment.d.ts
new file mode 100644
index 0000000000..62f02a1200
--- /dev/null
+++ b/types/fibjs/declare/XmlComment.d.ts
@@ -0,0 +1,33 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlComment 对象表示文档中注释节点的内容
+	* @detail XmlComment 节点表示 XML 文档中的注释。,使用由 XmlCharacterData 接口继承的 data 属性，或使用由 XmlNode 接口继承的 nodeValue 属性，可以访问注释的内容。（即 <!-- 和 --> 之间的文本）。使用由 XmlCharacterData 接口继承的各种方法可以操作注释的内容。,,使用 XmlDocument.createComment() 来创建一个注释对象。
+	*/
+/// <reference path="XmlCharacterData.d.ts" />
+declare class Class_XmlComment extends Class_XmlCharacterData {
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlDocument.d.ts b/types/fibjs/declare/XmlDocument.d.ts
new file mode 100644
index 0000000000..a4279dd1ce
--- /dev/null
+++ b/types/fibjs/declare/XmlDocument.d.ts
@@ -0,0 +1,290 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlDocument 对象代表整个 XML 文档
+	* @detail XmlDocument 对象是一棵文档树的根，可为我们提供对文档数据的最初（或最顶层）的访问入口。,用于元素节点、文本节点、注释、处理指令等均无法存在于 XmlDocument 之外， XmlDocument 对象同样提供了创建这些对象的方法。 XmlNode 对象提供了一个 ownerDocument 属性，此属性可把它们与在其中创建它们的 XmlDocument 关联起来。
+	*/
+/// <reference path="XmlNode.d.ts" />
+declare class Class_XmlDocument extends Class_XmlNode {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回用于文档的编码（在解析时）
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	inputEncoding: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设置或返回文档是否为 standalone
+	 * 
+	 * 
+	 * 
+	 * @type Boolean
+	 */
+	
+	xmlStandalone: boolean
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设置或返回文档的 XML 版本
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	xmlVersion: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回与文档相关的文档类型声明（Document Type Declaration）
+	 * 
+	 * 对于没有 DTD 的 XML 文档，则返回 null。此属性可提供对 XmlDocumentType 对象（ XmlDocument 的一个子节点）的直接访问。
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlDocumentType
+	 */
+	
+	doctype: Class_XmlDocumentType
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回文档的根节点
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlElement
+	 */
+	
+	documentElement: Class_XmlElement
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回 HTML 文档的 head 节点，仅在 html 模式有效
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlElement
+	 */
+	
+	head: Class_XmlElement
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回 HTML 文档的 title 节点的内容，仅在 html 模式有效
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	title: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回 HTML 文档的 body 节点，仅在 html 模式有效
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlElement
+	 */
+	
+	body: Class_XmlElement
+	
+	
+	
+	/**
+	 * 
+	 * @brief 构造一个 XmlDocument 对象
+	 * @param type 指定文档对象的类型，缺省为 "text/xml"，若需要处理 html 则需要指定 "text/html"
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(type?: string/** = "text/xml"*/);
+
+	/**
+	 * 
+	 * @brief 通过解析一个 XML/HTML 字符串来组成该文档，不支持多语种
+	 * @param source 要解析的 XML/HTML 文本，取决于文档创建时的类型
+	 * 
+	 * 
+	 * 
+	 */
+	load(source: string): void;
+
+	/**
+	 * 
+	 * @brief 通过解析一个二进制 XML/HTML 字符串来组成该文档，并根据语种自动转换
+	 * @param source 要解析的 XML/HTML 文本，取决于文档创建时的类型
+	 * 
+	 * 
+	 * 
+	 */
+	load(source: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 返回带有指定名称的所有元素的一个节点列表
+	 * 
+	 * 该方法将返回一个 XmlNodeList 对象（可以作为只读数组处理），该对象存放文档中具有指定标签名的所有 XmlElement 节点，它们存放的顺序就是在源文档中出现的顺序。 XmlNodeList 对象是“活”的，即如果在文档中添加或删除了指定标签名的元素，它的内容会自动进行必要的更新。
+	 * @param tagName 需检索的标签名。值 "*" 匹配所有的标签
+	 * @return 文档树中具有指定标记的 XmlElement 节点的 XmlNodeList 集合。返回的元素节点的顺序就是它们在源文档中出现的顺序。
+	 * 
+	 * 
+	 * 
+	 */
+	getElementsByTagName(tagName: string): Class_XmlNodeList;
+
+	/**
+	 * 
+	 * @brief 返回带有指定命名空间和名称的所有元素的一个节点列表
+	 * 
+	 * 该方法与 getElementsByTagName() 方法相似，只是它根据命名空间和名称来检索元素。
+	 * @param namespaceURI 指定检索的命名空间 URI。值 "*" 可匹配所有的标签
+	 * @param localName 需检索的标签名。值 "*" 匹配所有的标签
+	 * @return 文档树中具有指定标记的 XmlElement 节点的 XmlNodeList 集合。返回的元素节点的顺序就是它们在源文档中出现的顺序。
+	 * 
+	 * 
+	 * 
+	 */
+	getElementsByTagNameNS(namespaceURI: string, localName: string): Class_XmlNodeList;
+
+	/**
+	 * 
+	 * @brief 返回拥有指定 id 属性的元素
+	 * 
+	 * 该方法将遍历文档的子孙节点，返回一个 XmlElement 节点对象，表示第一个具有指定 id 属性的文档元素。。
+	 * @param id 需检索的 id
+	 * @return 节点树中具有指定 id 属性的 XmlElement 节点
+	 * 
+	 * 
+	 * 
+	 */
+	getElementById(id: string): Class_XmlElement;
+
+	/**
+	 * 
+	 * @brief 返回带有指定 class 名称的所有元素的一个节点列表
+	 * 
+	 * 该方法将返回一个 XmlNodeList 对象（可以作为只读数组处理），该对象存放文档中具有指定 class 名的所有 XmlElement 节点，它们存放的顺序就是在源文档中出现的顺序。 XmlNodeList 对象是“活”的，即如果在文档中添加或删除了指定标签名的元素，它的内容会自动进行必要的更新。
+	 * @param className 需检索的 class 名称
+	 * @return 文档树中具有指定 class 名的 XmlElement 节点的 XmlNodeList 集合。返回的元素节点的顺序就是它们在源文档中出现的顺序。
+	 * 
+	 * 
+	 * 
+	 */
+	getElementsByClassName(className: string): Class_XmlNodeList;
+
+	/**
+	 * 
+	 * @brief 创建元素节点
+	 * @param tagName 指定元素节点规定名称
+	 * @return 返回新创建的 XmlElement 节点，具有指定的标签名
+	 * 
+	 * 
+	 * 
+	 */
+	createElement(tagName: string): Class_XmlElement;
+
+	/**
+	 * 
+	 * @brief 创建带有指定命名空间的元素节点
+	 * @param namespaceURI 指定元素节点命名空间 URI
+	 * @param qualifiedName 指定元素节点规定名称
+	 * @return 返回新创建的 XmlElement 节点，具有指定的标签名
+	 * 
+	 * 
+	 * 
+	 */
+	createElementNS(namespaceURI: string, qualifiedName: string): Class_XmlElement;
+
+	/**
+	 * 
+	 * @brief 创建文本节点
+	 * @param data 指定此节点的文本
+	 * @return 返回新创建的 XmlText 节点，表示指定的 data 字符串
+	 * 
+	 * 
+	 * 
+	 */
+	createTextNode(data: string): Class_XmlText;
+
+	/**
+	 * 
+	 * @brief 创建注释节点
+	 * @param data 指定此节点的注释文本
+	 * @return 返回新创建的 XmlComment 节点，注释文本为指定的 data
+	 * 
+	 * 
+	 * 
+	 */
+	createComment(data: string): Class_XmlComment;
+
+	/**
+	 * 
+	 * @brief 创建 XmlCDATASection 节点
+	 * @param data 指定此节点规定 CDATA 数据
+	 * @return 返回新创建的 XmlCDATASection 节点，内容为指定的 data
+	 * 
+	 * 
+	 * 
+	 */
+	createCDATASection(data: string): Class_XmlCDATASection;
+
+	/**
+	 * 
+	 * @brief 创建 XmlProcessingInstruction 节点
+	 * @param target 指定处理指令的目标
+	 * @param data 指定处理指令的内容文本
+	 * @return 新创建的 ProcessingInstruction 节点
+	 * 
+	 * 
+	 * 
+	 */
+	createProcessingInstruction(target: string, data: string): Class_XmlProcessingInstruction;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlDocumentType.d.ts b/types/fibjs/declare/XmlDocumentType.d.ts
new file mode 100644
index 0000000000..f61b5fbfed
--- /dev/null
+++ b/types/fibjs/declare/XmlDocumentType.d.ts
@@ -0,0 +1,72 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlDocumentType 对象用于访问 XML 所定义的实体
+	* @detail 
+	*/
+/// <reference path="XmlNode.d.ts" />
+declare class Class_XmlDocumentType extends Class_XmlNode {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回 DTD 的名称
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	name: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 可返回外部 DTD 的公共识别符
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	publicId: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 可返回外部 DTD 的系统识别符
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	systemId: string
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlElement.d.ts b/types/fibjs/declare/XmlElement.d.ts
new file mode 100644
index 0000000000..a879cee139
--- /dev/null
+++ b/types/fibjs/declare/XmlElement.d.ts
@@ -0,0 +1,301 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlElement 对象表示 XML 文档中的元素
+	* @detail 
+	*/
+/// <reference path="XmlNode.d.ts" />
+declare class Class_XmlElement extends Class_XmlNode {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询元素的命名空间的 URI。如果选定的节点无命名空间，则该属性返回 NULL
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	namespaceURI: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询和设置元素的命名空间前缀。如果选定的节点无命名空间，则该属性返回 NULL
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	prefix: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询元素的本地名称。如果选定的节点无命名空间，则该属性等同于 nodeName
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	localName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回元素的标签名
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	tagName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * ! 查询和设置元素的 id 属性
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	id: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * ! 查询和设置选定元素的文本。查询时，返回元素节点内所有文本节点的值；设置时，删除所有子节点，并用单个文本节点来替换它们。
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	textContent: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * ! 查询和设置选定元素的 HTML 文本，仅在 html 模式有效。查询时，返回元素节点内所有子节点的 HTML 编码；设置时，删除所有子节点，并用指定的 HTML 解码后替换它们。
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	innerHTML: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * ! 查询和设置元素的 class 属性，仅在 html 模式有效
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	className: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回包含被选节点属性的 NamedNodeMap。如果被选节点不是元素，则该属性返回 NULL。
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNamedNodeMap
+	 */
+	
+	attributes: Class_XmlNamedNodeMap
+	
+	
+	
+	/**
+	 * 
+	 * @brief 通过名称查询属性的值
+	 * @param name 指定查询的属性名
+	 * @return 返回属性的值
+	 * 
+	 * 
+	 * 
+	 */
+	getAttribute(name: string): string;
+
+	/**
+	 * 
+	 * @brief 通过命名空间 URI 和名称来获取属性值
+	 * @param namespaceURI 指定查询的命名空间 URI
+	 * @param localName 指定查询的属性名
+	 * @return 返回属性的值
+	 * 
+	 * 
+	 * 
+	 */
+	getAttributeNS(namespaceURI: string, localName: string): string;
+
+	/**
+	 * 
+	 * @brief 创建或改变某个新属性
+	 * 
+	 * 该方法把指定的属性设置为指定的值。如果不存在具有指定名称的属性，该方法将创建一个新属性
+	 * @param name 指定要设置的属性名
+	 * @param value 指定要设置的属性值
+	 * 
+	 * 
+	 * 
+	 */
+	setAttribute(name: string, value: string): void;
+
+	/**
+	 * 
+	 * @brief 创建或改变具有命名空间的属性
+	 * 
+	 * 该方法与 setAttribute 方法类似，只是要创建或设置的属性由命名空间 URI 和限定名（由名字空间前缀、冒号和名字空间中的本地名构成）共同指定。除了可以改变一个属性的值以外，使用该方法还可以改变属性的名字空间前缀
+	 * @param namespaceURI 指定要设置的命名空间 URI
+	 * @param qualifiedName 指定要设置的属性名
+	 * @param value 指定要设置的属性值
+	 * 
+	 * 
+	 * 
+	 */
+	setAttributeNS(namespaceURI: string, qualifiedName: string, value: string): void;
+
+	/**
+	 * 
+	 * @brief 通过名称删除指定的属性
+	 * @param name 指定删除的属性名
+	 * 
+	 * 
+	 * 
+	 */
+	removeAttribute(name: string): void;
+
+	/**
+	 * 
+	 * @brief 通过命名空间和名称删除指定的属性
+	 * @param namespaceURI 指定要删除的命名空间 URI
+	 * @param localName 指定删除的属性名
+	 * 
+	 * 
+	 * 
+	 */
+	removeAttributeNS(namespaceURI: string, localName: string): void;
+
+	/**
+	 * 
+	 * @brief 查询当前节点是否拥有指定名称的属性
+	 * @param name 指定查询的属性名称
+	 * @return 如果当前元素节点拥有指定属性，则返回 true，否则返回 false
+	 * 
+	 * 
+	 * 
+	 */
+	hasAttribute(name: string): boolean;
+
+	/**
+	 * 
+	 * @brief 查询当前节点是否拥有指定命名空间和名称的属性
+	 * @param namespaceURI 指定要查询的命名空间 URI
+	 * @param localName 指定查询的属性名称
+	 * @return 如果当前元素节点拥有指定属性，则返回 true，否则返回 false
+	 * 
+	 * 
+	 * 
+	 */
+	hasAttributeNS(namespaceURI: string, localName: string): boolean;
+
+	/**
+	 * 
+	 * @brief 返回拥有指定名称的所有元素的 XmlNodeList
+	 * 
+	 * 该方法将遍历指定元素的子孙节点，返回一个 XmlElement 节点的 XmlNodeList 对象，表示所有具有指定标签名的文档元素。元素在返回的数组中的顺序就是它们出现在文档源代码中的顺序。
+	 * 
+	 * XmlDocument 接口也定义了 getElementsByTagName 方法，它与该方法相似，但遍历整个文档，而不是遍历某个元素的子孙节点。
+	 * @param tagName 需检索的标签名。值 "*" 匹配所有的标签
+	 * @return 节点树中具有指定标记的 XmlElement 节点的 XmlNodeList 集合。返回的元素节点的顺序就是它们在源文档中出现的顺序。
+	 * 
+	 * 
+	 * 
+	 */
+	getElementsByTagName(tagName: string): Class_XmlNodeList;
+
+	/**
+	 * 
+	 * @brief 返回拥有指定命名空间和名称的所有元素的 XmlNodeList
+	 * 
+	 * 该方法与 getElementsByTagName 方法相似，只是想获取的元素的标记名被指定为命名空间 URI 和在命名空间中定义的本地名的组合。
+	 * @param namespaceURI 指定要查询的命名空间 URI
+	 * @param localName 需检索的标签名。值 "*" 匹配所有的标签
+	 * @return 节点树中具有指定标记的 XmlElement 节点的 XmlNodeList 集合。返回的元素节点的顺序就是它们在源文档中出现的顺序。
+	 * 
+	 * 
+	 * 
+	 */
+	getElementsByTagNameNS(namespaceURI: string, localName: string): Class_XmlNodeList;
+
+	/**
+	 * 
+	 * @brief 返回拥有指定 id 属性的元素
+	 * 
+	 * 该方法将遍历指定元素的子孙节点，返回一个 XmlElement 节点对象，表示第一个具有指定 id 属性的文档元素。。
+	 * 
+	 * XmlDocument 接口也定义了 getElementsByTagName 方法，它与该方法相似，但遍历整个文档，而不是遍历某个元素的子孙节点。
+	 * @param id 需检索的 id
+	 * @return 节点树中具有指定 id 属性的 XmlElement 节点
+	 * 
+	 * 
+	 * 
+	 */
+	getElementById(id: string): Class_XmlElement;
+
+	/**
+	 * 
+	 * @brief 返回带有指定 class 名称的所有元素的一个节点列表
+	 * 
+	 * 该方法将返回一个 XmlNodeList 对象（可以作为只读数组处理），该对象存放文档中具有指定 class 名的所有 XmlElement 节点，它们存放的顺序就是在源文档中出现的顺序。 XmlNodeList 对象是“活”的，即如果在文档中添加或删除了指定标签名的元素，它的内容会自动进行必要的更新。
+	 * @param className 需检索的 class 名称
+	 * @return 文档树中具有指定 class 名的 XmlElement 节点的 XmlNodeList 集合。返回的元素节点的顺序就是它们在源文档中出现的顺序。
+	 * 
+	 * 
+	 * 
+	 */
+	getElementsByClassName(className: string): Class_XmlNodeList;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlNamedNodeMap.d.ts b/types/fibjs/declare/XmlNamedNodeMap.d.ts
new file mode 100644
index 0000000000..52920576cf
--- /dev/null
+++ b/types/fibjs/declare/XmlNamedNodeMap.d.ts
@@ -0,0 +1,68 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlNamedNodeMap 对象表示一个无顺序的属性列表
+	* @detail 
+	*/
+
+declare class Class_XmlNamedNodeMap extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回属性列表中的属性数目
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	length: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 返回属性列表中处于指定的索引号的属性
+	 * @param index 指定要查询的索引
+	 * @return 指定索引号的属性
+	 * 
+	 * 
+	 * 
+	 */
+	item(index: number): Class_XmlAttr;
+
+	/**
+	 * 
+	 * @brief 查询指定名称的属性
+	 * @param name 指定要查询的名称
+	 * @return 返回查询出的属性
+	 * 
+	 * 
+	 * 
+	 */
+	getNamedItem(name: string): Class_XmlAttr;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlNode.d.ts b/types/fibjs/declare/XmlNode.d.ts
new file mode 100644
index 0000000000..def8e0f59c
--- /dev/null
+++ b/types/fibjs/declare/XmlNode.d.ts
@@ -0,0 +1,315 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlNode 对象是整个 DOM 的基础数据类型
+	* @detail 
+	*/
+
+declare class Class_XmlNode extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点的节点类型
+	 * 
+	 * 不同对象的 nodeType 会返回不同的值：
+	 * - XmlElement: ELEMENT_NODE(1)
+	 * - XmlAttr: ATTRIBUTE_NODE(2)
+	 * - XmlText: TEXT_NODE(3)
+	 * - XmlCDATASection: CDATA_SECTION_NODE(4)
+	 * - XmlProcessingInstruction: PROCESSING_INSTRUCTION_NODE(7)
+	 * - XmlComment: COMMENT_NODE(8)
+	 * - XmlDocument: DOCUMENT_NODE(9)
+	 * - XmlDocumentType: DOCUMENT_TYPE_NODE(10)
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	nodeType: number
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点的名称，根据其类型
+	 * 
+	 * 不同对象的 nodeName 会返回不同的值：
+	 * - XmlElement: element name
+	 * - XmlAttr: 属性名称
+	 * - XmlText: \#text
+	 * - XmlCDATASection: \#cdata-section
+	 * - XmlProcessingInstruction: 返回指定目标 target
+	 * - XmlComment: \#comment
+	 * - XmlDocument: \#document
+	 * - XmlDocumentType: doctype 名称
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	nodeName: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点的名称，根据其类型
+	 * 
+	 * 不同对象的 nodeName 会返回不同的值：
+	 * - XmlElement: null
+	 * - XmlAttr: 属性的值
+	 * - XmlText: 节点的内容
+	 * - XmlCDATASection: 节点的内容
+	 * - XmlProcessingInstruction: 返回指定内容 data
+	 * - XmlComment: 注释文本
+	 * - XmlDocument: null
+	 * - XmlDocumentType: null
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	nodeValue: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点的根元素（XmlDocument 对象）
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlDocument
+	 */
+	
+	ownerDocument: Class_XmlDocument
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 可返回某节点的父节点
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNode
+	 */
+	
+	parentNode: Class_XmlNode
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回指定节点的子节点的节点列表
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNodeList
+	 */
+	
+	childNodes: Class_XmlNodeList
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点的首个子节点
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNode
+	 */
+	
+	firstChild: Class_XmlNode
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点的最后一个子节点
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNode
+	 */
+	
+	lastChild: Class_XmlNode
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回某节点之前紧跟的节点（处于同一树层级），如果没有此节点，那么该属性返回 null
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNode
+	 */
+	
+	previousSibling: Class_XmlNode
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回某个元素之后紧跟的节点（处于同一树层级中），如果无此节点，则属性返回 null
+	 * 
+	 * 
+	 * @readonly
+	 * @type XmlNode
+	 */
+	
+	nextSibling: Class_XmlNode
+	
+	
+	
+	/**
+	 * 
+	 * @brief 查询是否存在子节点
+	 * @return 存在任何子节点时返回 true，否则返回 false
+	 * 
+	 * 
+	 * 
+	 */
+	hasChildNodes(): boolean;
+
+	/**
+	 * 
+	 * @brief 合并相邻的 Text 节点并删除空的 Text 节点
+	 * 
+	 * 这个方法将遍历当前节点的所有子孙节点，通过删除空的 Text 节点，已经合并所有相邻的 Text 节点来规范化文档。该方法在进行节点的插入或删除操作后，对于简化文档树的结构很有用。
+	 * 
+	 * 
+	 * 
+	 */
+	normalize(): void;
+
+	/**
+	 * 
+	 * @brief 创建指定的节点的精确拷贝
+	 * 
+	 * 该方法将复制并返回调用它的节点的副本。如果传递给它的参数是 true，它还将递归复制当前节点的所有子孙节点。 否则，它只复制当前节点。返回的节点不属于文档树，它的 parentNode 属性为 null。当复制的是 Element 节点时，它的所有属性都将被复制。
+	 * @param deep 是否深度拷贝，为 true 时，被克隆的节点会克隆原节点的所有子节点
+	 * @return 返回所复制的节点
+	 * 
+	 * 
+	 * 
+	 */
+	cloneNode(deep?: boolean/** = true*/): Class_XmlNode;
+
+	/**
+	 * 
+	 * @brief 返回在当前节点上匹配指定的命名空间 URI 的前缀
+	 * @param namespaceURI 指定匹配的命名空间 URI
+	 * @return 返回匹配的前缀，未匹配到返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	lookupPrefix(namespaceURI: string): string;
+
+	/**
+	 * 
+	 * @brief 返回在当前节点上匹配指定的前缀的命名空间 URI
+	 * @param prefix 指定匹配的前缀
+	 * @return 返回匹配的命名空间 URI，未匹配到返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	lookupNamespaceURI(prefix: string): string;
+
+	/**
+	 * 
+	 * @brief 在已有的子节点前插入一个新的子节点
+	 * 
+	 * 如果文档树中已经存在了 newChild，它将从文档树中删除，然后重新插入它的新位置。来自一个文档的节点（或由一个文档创建的节点）不能插入另一个文档。也就是说，newChild 的 ownerDocument 属性必须与当前节点的 ownerDocument 属性相同。
+	 * @param newChild 插入新的节点
+	 * @param refChild 在此节点前插入新节点
+	 * @return 返回新的子节点
+	 * 
+	 * 
+	 * 
+	 */
+	insertBefore(newChild: Class_XmlNode, refChild: Class_XmlNode): Class_XmlNode;
+
+	/**
+	 * 
+	 * @brief 在已有的子节点后插入一个新的子节点
+	 * 
+	 * 如果文档树中已经存在了 newChild，它将从文档树中删除，然后重新插入它的新位置。来自一个文档的节点（或由一个文档创建的节点）不能插入另一个文档。也就是说，newChild 的 ownerDocument 属性必须与当前节点的 ownerDocument 属性相同。
+	 * @param newChild 插入新的节点
+	 * @param refChild 在此节点后插入新节点
+	 * @return 返回新的子节点
+	 * 
+	 * 
+	 * 
+	 */
+	insertAfter(newChild: Class_XmlNode, refChild: Class_XmlNode): Class_XmlNode;
+
+	/**
+	 * 
+	 * @brief 向节点的子节点列表的末尾添加新的子节点
+	 * 
+	 * 如果文档树中已经存在了 newChild，它将从文档树中删除，然后重新插入它的新位置。来自一个文档的节点（或由一个文档创建的节点）不能插入另一个文档。也就是说，newChild 的 ownerDocument 属性必须与当前节点的 ownerDocument 属性相同。
+	 * @param newChild 指定添加的节点
+	 * @return 返回这个新的子节点
+	 * 
+	 * 
+	 * 
+	 */
+	appendChild(newChild: Class_XmlNode): Class_XmlNode;
+
+	/**
+	 * 
+	 * @brief 将某个子节点替换为另一个
+	 * 
+	 * 如果文档树中已经存在了 newChild，它将从文档树中删除，然后重新插入它的新位置。来自一个文档的节点（或由一个文档创建的节点）不能插入另一个文档。也就是说，newChild 的 ownerDocument 属性必须与当前节点的 ownerDocument 属性相同。
+	 * @param newChild 指定新的节点
+	 * @param oldChild 指定被替换的节点
+	 * @return 如替换成功，此方法可返回被替换的节点，如替换失败，则返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	replaceChild(newChild: Class_XmlNode, oldChild: Class_XmlNode): Class_XmlNode;
+
+	/**
+	 * 
+	 * @brief 从子节点列表中删除某个节点
+	 * @param oldChild 指定被删除的节点
+	 * @return 如删除成功，此方法可返回被删除的节点，如失败，则返回 null
+	 * 
+	 * 
+	 * 
+	 */
+	removeChild(oldChild: Class_XmlNode): Class_XmlNode;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlNodeList.d.ts b/types/fibjs/declare/XmlNodeList.d.ts
new file mode 100644
index 0000000000..40934cfdc5
--- /dev/null
+++ b/types/fibjs/declare/XmlNodeList.d.ts
@@ -0,0 +1,57 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlNodeList 对象代表一个有顺序的节点列表
+	* @detail 
+	*/
+
+declare class Class_XmlNodeList extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回节点列表中的节点数目
+	 * 
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	length: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief 返回节点列表中处于指定的索引号的节点
+	 * @param index 指定要查询的索引
+	 * @return 指定索引号的节点
+	 * 
+	 * 
+	 * 
+	 */
+	item(index: number): Class_XmlNode;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlProcessingInstruction.d.ts b/types/fibjs/declare/XmlProcessingInstruction.d.ts
new file mode 100644
index 0000000000..a00cbab76a
--- /dev/null
+++ b/types/fibjs/declare/XmlProcessingInstruction.d.ts
@@ -0,0 +1,59 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlProcessingInstruction 对象表示 xml 处理指令
+	* @detail 
+	*/
+/// <reference path="XmlNode.d.ts" />
+declare class Class_XmlProcessingInstruction extends Class_XmlNode {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 返回此处理指令的目标
+	 * 
+	 * 
+	 * @readonly
+	 * @type String
+	 */
+	
+	target: string
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 设置或返回此处理指令的内容
+	 * 
+	 * 
+	 * 
+	 * @type String
+	 */
+	
+	data: string
+	
+	
+	
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/XmlText.d.ts b/types/fibjs/declare/XmlText.d.ts
new file mode 100644
index 0000000000..4236641c07
--- /dev/null
+++ b/types/fibjs/declare/XmlText.d.ts
@@ -0,0 +1,48 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief XmlText 对象表示元素或属性的文本内容
+	* @detail XmlText 节点表示 XML 文档中的一系列纯文本。因为纯文本出现在 XML 的元素和属性中，所以 XmlText 节点通常作为 XmlElement 节点和 XmlAttr 节点的子节点出现。,,XmlText 节点继承了 XmlCharacterData 接口，通过从 XmlCharacterData 接口继承的 data 属性或从 XmlNode 接口继承的 nadevalue 属性，可以访问 XmlText 节点的文本内容。,,用从 XmlCharacterData 继承的方法或 XmlText 接口自身定义的 splitText() 方法可以操作 XmlText 节点。使用 XmlDocument 的 createTextNode 来创建一个新的 XmlText 节点。,,XmlText 节点没有子节点。,,关于从文档的子树中删除空 XmlText 节点与合并相邻的 XmlText 节点的方法，请参阅 XmlNode.normalize 方法。
+	*/
+/// <reference path="XmlCharacterData.d.ts" />
+declare class Class_XmlText extends Class_XmlCharacterData {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 按照指定的 offset 把文本节点分割为两个节点
+	 * 
+	 * 该方法将在指定的 offset 处把 XmlText 节点分割成两个节点。原始的 XmlText 节点将被修改，使它包含 offset 指定的位置之前的文本内容（但不包括文本内容）。新的 XmlText 节点将被创建，用于存放从 offset 位置（包括该位置上的字符）到原字符结尾的所有字符。新的 XmlText 节点是该方法的返回值。此外，如果原始的 XmlText 节点具有 parentNode，新的 XmlText 节点将插入这个父节点，紧邻在原始节点之后。
+	 * 
+	 * XmlCDATASection 接口继承了 XmlText 接口， XmlCDATASection 节点也可以使用该方法 ，只是新创建的节点是 XmlCDATASection 节点，而不是 XmlText 节点。
+	 * @param offset 规定在何处分割文本节点。开始值以 0 开始
+	 * @return 从当前节点分割出的 Text 节点
+	 * 
+	 * 
+	 * 
+	 */
+	splitText(offset: number): Class_XmlText;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/ZipFile.d.ts b/types/fibjs/declare/ZipFile.d.ts
new file mode 100644
index 0000000000..842d518382
--- /dev/null
+++ b/types/fibjs/declare/ZipFile.d.ts
@@ -0,0 +1,168 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief zip 文件访问对象
+	* @detail 
+	*/
+
+declare class Class_ZipFile extends Class__object {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 获取文件名列表
+	 * @return 返回包含文件名的列表对象
+	 * 
+	 * 
+	 * @async
+	 */
+	namelist(): any[];
+
+	/**
+	 * 
+	 * @brief 获取文件信息列表
+	 * 文件信息包含字段有：filename, date, compress_type, compress_size, file_size, password, data
+	 * @return 返回包含文件信息的列表对象
+	 * 
+	 * 
+	 * @async
+	 */
+	infolist(): any[];
+
+	/**
+	 * 
+	 * @brief 获取文件信息
+	 * 文件信息包含字段有：filename, date, compress_type, compress_size, file_size, password, data
+	 * @param member 指定要获取信息的文件名
+	 * @return 返回文件信息对象
+	 * 
+	 * 
+	 * @async
+	 */
+	getinfo(member: string): any;
+
+	/**
+	 * 
+	 * @brief 返回从压缩文件读取的数据
+	 * @param member 指定要读取的文件名
+	 * @param password 解压密码, 默认没有密码
+	 * @return 返回文件的所有数据
+	 * 
+	 * 
+	 * @async
+	 */
+	read(member: string, password?: string/** = ""*/): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 解压所有文件
+	 * @param password 解压密码, 默认没有密码
+	 * @return 包含所有文件数据及信息的列表
+	 * 
+	 * 
+	 * @async
+	 */
+	readAll(password?: string/** = ""*/): any[];
+
+	/**
+	 * 
+	 * @brief 解压指定文件
+	 * @param member 指定要解压的文件名
+	 * @param path 指定要解压到的路径
+	 * @param password 解压密码, 默认没有密码
+	 * 
+	 * 
+	 * @async
+	 */
+	extract(member: string, path: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 解压指定文件到流
+	 * @param member 指定要解压的文件名
+	 * @param strm 指定要解压到的流
+	 * @param password 解压密码, 默认没有密码
+	 * 
+	 * 
+	 * @async
+	 */
+	extract(member: string, strm: Class_SeekableStream, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 解压所有文件到指定路径
+	 * @param path 指定要解压到的路径
+	 * @param password 解压密码, 默认没有密码
+	 * 
+	 * 
+	 * @async
+	 */
+	extractAll(path: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 写入指定文件到压缩文件
+	 * @param filename 指定要写入的文件
+	 * @param inZipName 压缩在zip文件内的文件名
+	 * @param password 解压密码, 默认没有密码
+	 * 
+	 * 
+	 * @async
+	 */
+	write(filename: string, inZipName: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 写入指定文件到压缩文件
+	 * @param data 指定要写入的文件数据
+	 * @param inZipName 压缩在zip文件内的文件名
+	 * @param password 解压密码, 默认没有密码
+	 * 
+	 * 
+	 * @async
+	 */
+	write(data: Class_Buffer, inZipName: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 写入指定文件到压缩文件
+	 * @param strm 指定要写入文件数据流
+	 * @param inZipName 压缩在zip文件内的文件名
+	 * @param password 解压密码, 默认没有密码
+	 * 
+	 * 
+	 * @async
+	 */
+	write(strm: Class_SeekableStream, inZipName: string, password?: string/** = ""*/): void;
+
+	/**
+	 * 
+	 * @brief 关闭打开的zip文件
+	 * 
+	 * @async
+	 */
+	close(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/ZmqSocket.d.ts b/types/fibjs/declare/ZmqSocket.d.ts
new file mode 100644
index 0000000000..0d2e0707fc
--- /dev/null
+++ b/types/fibjs/declare/ZmqSocket.d.ts
@@ -0,0 +1,105 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+/// <reference path="object.d.ts" />
+
+
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief ZeroMQ 套接口对象
+	* @detail 
+	*/
+
+declare class Class_ZmqSocket extends Class__object {
+	
+	/**
+	 * class prop 
+	 *
+	 * 
+	 * @brief 查询当前 socket 类型
+	 * 
+	 * @readonly
+	 * @type Integer
+	 */
+	
+	type: number
+	
+	
+	
+	/**
+	 * 
+	 * @brief ZmqSocket 对象构造函数
+	 * @param type 指定 socket 类型，缺省为 zmq.PAIR
+	 * 
+	 * 
+	 * 
+	 */
+	constructor(type?: number/** = undefined*/);
+
+	/**
+	 * 
+	 * @brief 绑定指定地址和端口
+	 * @param addr 指定绑定的地址，如："tcp://*:3000"
+	 * 
+	 * 
+	 * 
+	 */
+	bind(addr: string): void;
+
+	/**
+	 * 
+	 * @brief 连接到指定地址的服务器
+	 * @param addr 指定连接的地址，如："tcp://*:3000"
+	 * 
+	 * 
+	 * 
+	 */
+	connect(addr: string): void;
+
+	/**
+	 * 
+	 * @brief 接收一个数据包
+	 * @return 返回接收到的数据包
+	 * 
+	 * 
+	 * @async
+	 */
+	recv(): Class_Buffer;
+
+	/**
+	 * 
+	 * @brief 发送一个数据包
+	 * @param data 指定发送的数据包
+	 * 
+	 * 
+	 * 
+	 */
+	send(data: Class_Buffer): void;
+
+	/**
+	 * 
+	 * @brief 关闭当前 socket
+	 * 
+	 * 
+	 */
+	close(): void;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/_test_env.d.ts b/types/fibjs/declare/_test_env.d.ts
new file mode 100644
index 0000000000..83ae06b28d
--- /dev/null
+++ b/types/fibjs/declare/_test_env.d.ts
@@ -0,0 +1,41 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+/// <reference path="test.d.ts" />
+import test from 'test'
+
+/// <reference path="assert.d.ts" />
+import _assert from 'assert'
+
+declare global {
+	const describe: typeof test.describe
+	const xdescribe: typeof test.xdescribe
+	const odescribe: typeof test.odescribe
+	const it: typeof test.it
+	const xit: typeof test.xit
+	const oit: typeof test.oit
+	const before: typeof test.before
+	const after: typeof test.after
+	const beforeEach: typeof test.beforeEach
+	const afterEach: typeof test.afterEach
+	const run: typeof test.run
+	const setup: typeof test.setup
+
+	const assert: typeof _assert
+}
+/** declare const describe: test.describe; */
+
+
diff --git a/types/fibjs/declare/assert.d.ts b/types/fibjs/declare/assert.d.ts
new file mode 100644
index 0000000000..2b42185436
--- /dev/null
+++ b/types/fibjs/declare/assert.d.ts
@@ -0,0 +1,794 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 断言测试模块，如果测试值为假，则报错，报错行为可设定继续运行或者错误抛出
+	* @detail 引用方法：,```JavaScript,var assert = require('assert');,```,或者通过 test 模块引用：,```JavaScript,var test = require('test');,var assert = test.assert;,```,或者通过 test.setup 配置：,```JavaScript,require("test").setup();,```
+	*/
+declare module "assert" {
+	
+
+	module assert {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 测试数值为真，为假则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function Function(actual?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为真，为假则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function ok(actual?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为假，为真则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notOk(actual?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值等于预期值，不相等则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function equal(actual?: any/** = v8::Undefined(isolate)*/, expected?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不等于预期值，相等则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notEqual(actual?: any/** = v8::Undefined(isolate)*/, expected?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值严格等于预期值，不相等则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function strictEqual(actual?: any/** = v8::Undefined(isolate)*/, expected?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不严格等于预期值，相等则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notStrictEqual(actual?: any/** = v8::Undefined(isolate)*/, expected?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值深度等于预期值，不相等则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function deepEqual(actual?: any/** = v8::Undefined(isolate)*/, expected?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不深度等于预期值，相等则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notDeepEqual(actual?: any/** = v8::Undefined(isolate)*/, expected?: any/** = v8::Undefined(isolate)*/, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值近似等于预期值，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param delta 近似的小数精度
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function closeTo(actual: any, expected: any, delta: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不近似等于预期值，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param delta 近似的小数精度
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notCloseTo(actual: any, expected: any, delta: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值小于预期值，大于或等于则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function lessThan(actual: any, expected: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不小于预期值，小于则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notLessThan(actual: any, expected: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值大于预期值，小于或等于则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function greaterThan(actual: any, expected: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不大于预期值，大于则断言失败
+		 * @param actual 要测试的数值
+		 * @param expected 预期的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notGreaterThan(actual: any, expected: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试变量存在，为假则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function exist(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试变量不存在，为真则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notExist(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为布尔值真，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isTrue(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为布尔值真，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotTrue(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为布尔值假，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isFalse(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为布尔值假，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotFalse(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为 Null，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNull(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为 Null，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotNull(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为 undefined，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isUndefined(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为 undefined，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isDefined(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为函数，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isFunction(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为函数，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotFunction(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为对象，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isObject(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为对象，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotObject(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为数组，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isArray(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为数组，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotArray(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为字符串，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isString(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为字符串，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotString(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为数字，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNumber(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为数字，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotNumber(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为布尔，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isBoolean(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为布尔，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNotBoolean(actual: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值为给定类型，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param type 指定的类型
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function typeOf(actual: any, type: string, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试数值不为给定类型，否则断言失败
+		 * @param actual 要测试的数值
+		 * @param type 指定的类型
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notTypeOf(actual: any, type: string, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试对象中包含指定属性，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function property(object: any, prop: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试对象中不包含指定属性，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notProperty(object: any, prop: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 深度测试对象中包含指定属性，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性，以“.”分割
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function deepProperty(object: any, prop: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 深度测试对象中不包含指定属性，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性，以“.”分割
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function notDeepProperty(object: any, prop: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试对象中指定属性的值为给定值，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性
+		 * @param value 给定的值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function propertyVal(object: any, prop: any, value: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试对象中指定属性的值不为给定值，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性
+		 * @param value 给定的值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function propertyNotVal(object: any, prop: any, value: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 深度测试对象中指定属性的值为给定值，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性，以“.”分割
+		 * @param value 给定的值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function deepPropertyVal(object: any, prop: any, value: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 深度测试对象中指定属性的值不为给定值，否则断言失败
+		 * @param object 要测试的对象
+		 * @param prop 要测试的属性，以“.”分割
+		 * @param value 给定的值
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function deepPropertyNotVal(object: any, prop: any, value: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试给定的代码会抛出错误，未抛出则断言失败
+		 * @param block 指定测试的代码，以函数形式给出
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function throws(block: Function, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 测试给定的代码不会抛出错误，抛出则断言失败
+		 * @param block 指定测试的代码，以函数形式给出
+		 * @param msg 断言失败时的提示信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function doesNotThrow(block: Function, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 如果参数为真，则抛出
+		 * @param object 参数
+		 * 
+		 * 
+		 * 
+		 */
+		export function ifError(object?: any/** = v8::Undefined(isolate)*/): void;
+	
+	} /** end of `module assert` */
+	export = assert
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/base32.d.ts b/types/fibjs/declare/base32.d.ts
new file mode 100644
index 0000000000..516662ba9f
--- /dev/null
+++ b/types/fibjs/declare/base32.d.ts
@@ -0,0 +1,239 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief base32 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var base32 = encoding.base32;,```,或者,```JavaScript,var base32 = require('base32');,```
+	*/
+declare module "base32" {
+	
+
+	module base32 {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 以 base32 方式编码数据
+		 * @param data 要编码的数据
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: Class_Buffer): string;
+	
+		/**
+		 * 
+		 * @brief 以 base32 方式解码字符串为二进制数据
+		 * @param data 要解码的字符串
+		 * @return 返回解码的二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(data: string): Class_Buffer;
+	
+	} /** end of `module base32` */
+	export = base32
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/base64.d.ts b/types/fibjs/declare/base64.d.ts
new file mode 100644
index 0000000000..c2316cb06d
--- /dev/null
+++ b/types/fibjs/declare/base64.d.ts
@@ -0,0 +1,240 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief base64 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var base64 = encoding.base64;,```,或者,```JavaScript,var base64 = require('base64');,```
+	*/
+declare module "base64" {
+	
+
+	module base64 {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 以 base64 方式编码数据
+		 * @param data 要编码的数据
+		 * @param url 指定是否使用 url 安全字符编码
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: Class_Buffer, url?: boolean/** = false*/): string;
+	
+		/**
+		 * 
+		 * @brief 以 base64 方式解码字符串为二进制数据
+		 * @param data 要解码的字符串
+		 * @return 返回解码的二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(data: string): Class_Buffer;
+	
+	} /** end of `module base64` */
+	export = base64
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/base64vlq.d.ts b/types/fibjs/declare/base64vlq.d.ts
new file mode 100644
index 0000000000..7deb1bf810
--- /dev/null
+++ b/types/fibjs/declare/base64vlq.d.ts
@@ -0,0 +1,250 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief base64vlq 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var base64vlq = encoding.base64vlq;,```,或者,```JavaScript,var base64vlq = require('base64vlq');,```
+	*/
+declare module "base64vlq" {
+	
+
+	module base64vlq {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 以 base64vlq 方式编码数据
+		 * @param data 要编码的数据
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: number): string;
+	
+		/**
+		 * 
+		 * @brief 以 base64vlq 方式编码数据
+		 * @param data 要编码的数据
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 以 base64vlq 方式解码字符串为二进制数据
+		 * @param data 要解码的字符串
+		 * @return 返回解码的二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(data: string): any[];
+	
+	} /** end of `module base64vlq` */
+	export = base64vlq
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/bson.d.ts b/types/fibjs/declare/bson.d.ts
new file mode 100644
index 0000000000..f9eeab19cb
--- /dev/null
+++ b/types/fibjs/declare/bson.d.ts
@@ -0,0 +1,239 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief bson 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var bson = encoding.bson;,```,或者,```JavaScript,var bson = require('bson');,```
+	*/
+declare module "bson" {
+	
+
+	module bson {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 以 bson 格式编码变量
+		 * @param data 要编码的变量
+		 * @return 返回编码的二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: object): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 以 bson 方式解码字符串为一个变量
+		 * @param data 要解码的二进制数据
+		 * @return 返回解码的变量
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(data: Class_Buffer): object;
+	
+	} /** end of `module bson` */
+	export = bson
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/console.d.ts b/types/fibjs/declare/console.d.ts
new file mode 100644
index 0000000000..43f8603c2e
--- /dev/null
+++ b/types/fibjs/declare/console.d.ts
@@ -0,0 +1,917 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 控制台访问对象
+	* @detail 全局对象。可用于提示信息，警告和错误记录。通过启动配置文件，可将日志定位到不同的设备，以便于跟踪。日志支持格式化输出，例如：,```JavaScript,console.log("%d + %d = %d", 100, 200, 100 + 200);,```,可以使用的格式化参数如下：,- %s - 字符串,- %d - 数字，包括整数和数字,- %j - 以 JSON 格式输出对象,- %% - 输出字符 '%' 本身
+	*/
+declare module "console" {
+	
+
+	module console {
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const FATAL = 0;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const ALERT = 1;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const CRIT = 2;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const ERROR = 3;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const WARN = 4;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const NOTICE = 5;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const INFO = 6;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const DEBUG = 7;
+		
+		/**
+		 * 
+		 * @brief loglevel 仅用于输出，信息输出后不换行，file 和 syslog 不保存此级别信息
+		 * 
+		 * 
+		 */
+		export const PRINT = 9;
+		
+		/**
+		 * 
+		 * @brief loglevel 级别常量
+		 * 
+		 * 
+		 */
+		export const NOTSET = 10;
+		
+		
+		/**
+		 * 
+		 * @brief 输出级别，用以过滤输出信息，缺省为 NOTSET，全部输出。信息过滤之后才会输出给 add 设定的各个设备。
+		 * 
+		 * 
+		 * 
+		 */
+		export const loglevel: number;
+		
+		/**
+		 * 
+		 * @brief 查询终端每行字符数
+		 * 
+		 * 
+		 */
+		export const width: number;
+		
+		/**
+		 * 
+		 * @brief 查询终端行数
+		 * 
+		 * 
+		 */
+		export const height: number;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 添加 console 输出系统，支持的设备为 console, syslog, event，最多可以添加 10 个输出
+		 * 
+		 * 通过配置 console，可以将程序输出和系统错误发往不同设备，用于运行环境信息收集。
+		 * 
+		 * type 为配置，为设备名称字符串：
+		 * 
+		 * ```JavaScript
+		 * console.add("console");
+		 * ```
+		 * 
+		 * syslog 仅在 posix 平台有效：
+		 * ```JavaScript
+		 * console.add("syslog");
+		 * ```
+		 * 
+		 * event 仅在 windows 平台有效：
+		 * ```JavaScript
+		 * console.add("event");
+		 * ```
+		 * 
+		 * @param type 输出设备
+		 * 
+		 * 
+		 * 
+		 */
+		export function add(type: string): void;
+	
+		/**
+		 * 
+		 * @brief 添加 console 输出系统，支持的设备为 console, syslog, event 和 file，最多可以添加 10 个输出
+		 * 
+		 * 通过配置 console，可以将程序输出和系统错误发往不同设备，用于运行环境信息收集。
+		 * 
+		 * cfg 可以为一个设备配置对象：
+		 * ```JavaScript
+		 * console.add({
+		 * type: "console",
+		 * levels: [console.INFO, console.ERROR]  // 选项，省略则输出全部级别日志
+		 * });
+		 * ```
+		 * 
+		 * syslog 仅在 posix 平台有效：
+		 * ```JavaScript
+		 * console.add({
+		 * type: "syslog",
+		 * levels: [console.INFO, console.ERROR]
+		 * });
+		 * ```
+		 * 
+		 * event 仅在 windows 平台有效：
+		 * ```JavaScript
+		 * console.add({
+		 * type: "event",
+		 * levels: [console.INFO, console.ERROR]
+		 * });
+		 * ```
+		 * 
+		 * file 日志：
+		 * ```JavaScript
+		 * console.add({
+		 * type: "file",
+		 * levels: [console.INFO, console.ERROR],
+		 * // 必选项，指定日志输出文件，可使用 s% 指定插入日期位置，不指定则添加在结尾
+		 * path: "path/to/file_%s.log",
+		 * // 选项，可选值为 "day", "hour", "minute", "###k", "###m", "###g"，缺省为 "1m"
+		 * split: "30m",
+		 * // 选项，可选范围为 2-128，缺省为 128
+		 * count: 10
+		 * });
+		 * ```
+		 * 
+		 * @param cfg 输出配置
+		 * 
+		 * 
+		 * 
+		 */
+		export function add(cfg: object): void;
+	
+		/**
+		 * 
+		 * @brief 批量添加 console 输出系统，支持的设备为 console, syslog, event 和 file，最多可以添加 10 个输出
+		 * 
+		 * 通过配置 console，可以将程序输出和系统错误发往不同设备，用于运行环境信息收集。
+		 * 
+		 * ```JavaScript
+		 * console.add(["console", {
+		 * type: "syslog",
+		 * levels: [console.INFO, console.ERROR]
+		 * }]);
+		 * ```
+		 * 
+		 * @param cfg 输出配置数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function add(cfg: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 初始化到缺省设置，只在 console 输出信息
+		 * 
+		 * 
+		 */
+		export function reset(): void;
+	
+		/**
+		 * 
+		 * @brief 记录普通日志信息，与 info 等同
+		 * 
+		 * 记录一般等级的日志信息。通常用于输出非错误性提示信息。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function log(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录普通日志信息，与 info 等同
+		 * 
+		 * 记录一般等级的日志信息。通常用于输出非错误性提示信息。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function log(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录调试日志信息
+		 * 
+		 * 记录调试日志信息。通常用于输出调试信息。不重要。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function debug(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录调试日志信息
+		 * 
+		 * 记录调试日志信息。通常用于输出调试信息。不重要。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function debug(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录普通日志信息，与 log 等同
+		 * 
+		 * 记录一般等级的日志信息。通常用于输出非错误性提示信息。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function info(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录普通日志信息，与 log 等同
+		 * 
+		 * 记录一般等级的日志信息。通常用于输出非错误性提示信息。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function info(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录警告日志信息
+		 * 
+		 * 记录警告日志信息。通常用于输出提示性调试信息。一般重要。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function notice(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录警告日志信息
+		 * 
+		 * 记录警告日志信息。通常用于输出提示性调试信息。一般重要。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function notice(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录警告日志信息
+		 * 
+		 * 记录警告日志信息。通常用于输出警告性调试信息。重要。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function warn(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录警告日志信息
+		 * 
+		 * 记录警告日志信息。通常用于输出警告性调试信息。重要。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function warn(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录错误日志信息
+		 * 
+		 * 记录用于错误日志信息。通常用于输出错误信息。非常重要。系统的出错信息也会以此等级记录。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function error(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录错误日志信息
+		 * 
+		 * 记录用于错误日志信息。通常用于输出错误信息。非常重要。系统的出错信息也会以此等级记录。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function error(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录关键错误日志信息
+		 * 
+		 * 记录用于关键错误日志信息。通常用于输出关键错误信息。非常重要。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function crit(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录关键错误日志信息
+		 * 
+		 * 记录用于关键错误日志信息。通常用于输出关键错误信息。非常重要。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function crit(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录警报错误日志信息
+		 * 
+		 * 记录用于警报错误日志信息。通常用于输出警报错误信息。非常重要。为最高级别信息。
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function alert(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 记录警报错误日志信息
+		 * 
+		 * 记录用于警报错误日志信息。通常用于输出警报错误信息。非常重要。为最高级别信息。
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function alert(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 用 JSON 格式输出对象
+		 * @param obj 给定要显示的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function dir(obj: any): void;
+	
+		/**
+		 * 
+		 * @brief 启动一个计时器
+		 * 
+		 * @param label 标题，缺省为空字符串。
+		 * 
+		 * 
+		 * 
+		 */
+		export function time(label?: string/** = "time"*/): void;
+	
+		/**
+		 * 
+		 * @brief 输出指定计时器当前计时值
+		 * 
+		 * @param label 标题，缺省为空字符串。
+		 * 
+		 * 
+		 * 
+		 */
+		export function timeElapse(label?: string/** = "time"*/): void;
+	
+		/**
+		 * 
+		 * @brief 结束指定计时器，并输出最后计时值
+		 * 
+		 * @param label 标题，缺省为空字符串。
+		 * 
+		 * 
+		 * 
+		 */
+		export function timeEnd(label?: string/** = "time"*/): void;
+	
+		/**
+		 * 
+		 * @brief 输出当前调用堆栈
+		 * 
+		 * 通过日志输出当前调用堆栈。
+		 * @param label 标题，缺省为空字符串。
+		 * 
+		 * 
+		 * 
+		 */
+		export function trace(label?: string/** = "trace"*/): void;
+	
+		/**
+		 * 
+		 * @brief 断言测试，如果测试值为假，则报错
+		 * @param value 测试的数值
+		 * @param msg 报错信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function assert(value: any, msg?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 向控制台输出格式化文本，输出内容不会记入日志系统，输出文本后不会自动换行，可连续输出
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function print(fmt: string, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 向控制台输出格式化文本，输出内容不会记入日志系统，输出文本后不会自动换行，可连续输出
+		 * @param args 可选参数列表
+		 * 
+		 * 
+		 * 
+		 */
+		export function print(...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 移动控制台光标到指定位置
+		 * @param row 指定新光标的行坐标
+		 * @param column 指定新光标的列坐标
+		 * 
+		 * 
+		 * 
+		 */
+		export function moveTo(row: number, column: number): void;
+	
+		/**
+		 * 
+		 * @brief 隐藏控制台光标
+		 * 
+		 * 
+		 */
+		export function hideCursor(): void;
+	
+		/**
+		 * 
+		 * @brief 显示控制台光标
+		 * 
+		 * 
+		 */
+		export function showCursor(): void;
+	
+		/**
+		 * 
+		 * @brief 清除控制台
+		 * 
+		 * 
+		 */
+		export function clear(): void;
+	
+		/**
+		 * 
+		 * @brief 按下一个按键
+		 * 
+		 * 参数 key 可以使用字符串传入功能键：
+		 * - 功能键：f1 - f12
+		 * - 方向键：up, down,left, right, home, end, pageup, pagedown
+		 * - 编辑键：backspace, delete, insert, enter, tab, escape, space
+		 * - 控制键：control, alt, shift, command
+		 * @param key 指定按键，单字符直接传入，功能键传入名称
+		 * @param modifier 指定控制键，可以为：control, alt, shift, command
+		 * 
+		 * 
+		 * 
+		 */
+		export function keyDown(key: string, modifier?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 按下一个按键
+		 * 
+		 * 参数 key 可以使用字符串传入功能键：
+		 * - 功能键：f1 - f12
+		 * - 方向键：up, down,left, right, home, end, pageup, pagedown
+		 * - 编辑键：backspace, delete, insert, enter, tab, escape, space
+		 * - 控制键：control, alt, shift, command
+		 * @param key 指定按键，单字符直接传入，功能键传入名称
+		 * @param modifier 指定控制键数组，可以为：control, alt, shift, command
+		 * 
+		 * 
+		 * 
+		 */
+		export function keyDown(key: string, modifier: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 松开一个按键
+		 * 
+		 * 参数 key 可以使用字符串传入功能键：
+		 * - 功能键：f1 - f12
+		 * - 方向键：up, down,left, right, home, end, pageup, pagedown
+		 * - 编辑键：backspace, delete, insert, enter, tab, escape, space
+		 * - 控制键：control, alt, shift, command
+		 * @param key 指定按键，单字符直接传入，功能键传入名称
+		 * @param modifier 指定控制键，可以为：control, alt, shift, command
+		 * 
+		 * 
+		 * 
+		 */
+		export function keyUp(key: string, modifier?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 松开一个按键
+		 * 
+		 * 参数 key 可以使用字符串传入功能键：
+		 * - 功能键：f1 - f12
+		 * - 方向键：up, down,left, right, home, end, pageup, pagedown
+		 * - 编辑键：backspace, delete, insert, enter, tab, escape, space
+		 * - 控制键：control, alt, shift, command
+		 * @param key 指定按键，单字符直接传入，功能键传入名称
+		 * @param modifier 指定控制键数组，可以为：control, alt, shift, command
+		 * 
+		 * 
+		 * 
+		 */
+		export function keyUp(key: string, modifier: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 点击并松开一个按键
+		 * 
+		 * 参数 key 可以使用字符串传入功能键：
+		 * - 功能键：f1 - f12
+		 * - 方向键：up, down,left, right, home, end, pageup, pagedown
+		 * - 编辑键：backspace, delete, insert, enter, tab, escape, space
+		 * - 控制键：control, alt, shift, command
+		 * @param key 指定按键，单字符直接传入，功能键传入名称
+		 * @param modifier 指定控制键，可以为：control, alt, shift, command
+		 * 
+		 * 
+		 * 
+		 */
+		export function keyTap(key: string, modifier?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 点击并松开一个按键
+		 * 
+		 * 参数 key 可以使用字符串传入功能键：
+		 * - 功能键：f1 - f12
+		 * - 方向键：up, down,left, right, home, end, pageup, pagedown
+		 * - 编辑键：backspace, delete, insert, enter, tab, escape, space
+		 * - 控制键：control, alt, shift, command
+		 * @param key 指定按键，单字符直接传入，功能键传入名称
+		 * @param modifier 指定控制键数组，可以为：control, alt, shift, command
+		 * 
+		 * 
+		 * 
+		 */
+		export function keyTap(key: string, modifier: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 输入一个字符串
+		 * @param text 指定输入的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function typeString(text: string): void;
+	
+		/**
+		 * 
+		 * @brief 移动鼠标到指定的位置
+		 * @param x 指定 x 坐标
+		 * @param y 指定 y 坐标
+		 * 
+		 * 
+		 * 
+		 */
+		export function moveMouse(x: number, y: number): void;
+	
+		/**
+		 * 
+		 * @brief 按下一个鼠标键
+		 * @param button 指定鼠标键名称，允许值为: left, right, moddle
+		 * 
+		 * 
+		 * 
+		 */
+		export function mouseUp(button: string): void;
+	
+		/**
+		 * 
+		 * @brief 放开一个鼠标键
+		 * @param button 指定鼠标键名称，允许值为: left, right, moddle
+		 * 
+		 * 
+		 * 
+		 */
+		export function mouseDown(button: string): void;
+	
+		/**
+		 * 
+		 * @brief 点击一个鼠标键
+		 * @param button 指定鼠标键名称，允许值为: left, right, moddle
+		 * @param dbclick 指定是否双击，缺省为 false
+		 * 
+		 * 
+		 * 
+		 */
+		export function clickMouse(button: string, dbclick?: boolean/** = false*/): void;
+	
+		/**
+		 * 
+		 * @brief 从控制台读取用户输入
+		 * @param msg 提示信息
+		 * @return 返回用户输入的信息
+		 * 
+		 * 
+		 * @async
+		 */
+		export function readLine(msg?: string/** = ""*/): string;
+	
+	} /** end of `module console` */
+	export = console
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/constants.d.ts b/types/fibjs/declare/constants.d.ts
new file mode 100644
index 0000000000..76997275c9
--- /dev/null
+++ b/types/fibjs/declare/constants.d.ts
@@ -0,0 +1,217 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 常用常量定义模块
+	* @detail 引用方法：,```JavaScript,var constants = require('constants');,```
+	*/
+declare module "constants" {
+	
+
+	module constants {
+		
+		
+		
+		
+		
+	} /** end of `module constants` */
+	export = constants
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/coroutine.d.ts b/types/fibjs/declare/coroutine.d.ts
new file mode 100644
index 0000000000..8a4c5ec049
--- /dev/null
+++ b/types/fibjs/declare/coroutine.d.ts
@@ -0,0 +1,376 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 并发控制模块
+	* @detail 引用方法：,```JavaScript,var coroutine = require('coroutine');,```
+	*/
+declare module "coroutine" {
+	
+
+	module coroutine {
+		
+		
+		/**
+		 * 
+		 * @brief 返回当前正在运行的全部 fiber 数组
+		 * 
+		 * 
+		 */
+		export const fibers: any[];
+		
+		/**
+		 * 
+		 * @brief 查询和设置空闲 Fiber 数量，服务器抖动较大时可适度增加空闲 Fiber 数量。缺省为 256
+		 * 
+		 * 
+		 */
+		export const spareFibers: number;
+		
+		/**
+		 * 
+		 * @brief 查询当前 vm 编号
+		 * 
+		 * 
+		 */
+		export const vmid: number;
+		
+		/**
+		 * 
+		 * @brief 修改和查询本 vm 的输出级别，用以过滤输出信息，缺省为 console.NOTSET，全部输出
+		 * 
+		 * 
+		 * 
+		 */
+		export const loglevel: number;
+		
+		
+		/**
+		 * 
+		 * @brief 锁对象，参见 Lock
+		 * 
+		 * 
+		 */
+		export class Lock extends Class_Lock {}
+		
+		
+		/**
+		 * 
+		 * @brief 信号量对象，参见 Semaphore
+		 * 
+		 * 
+		 */
+		export class Semaphore extends Class_Semaphore {}
+		
+		
+		/**
+		 * 
+		 * @brief 条件变量对象，参见 Condition
+		 * 
+		 * 
+		 */
+		export class Condition extends Class_Condition {}
+		
+		
+		/**
+		 * 
+		 * @brief 事件对象，参见 Event
+		 * 
+		 * 
+		 */
+		export class Event extends Class_Event {}
+		
+		
+		/**
+		 * 
+		 * @brief 独立线程工作对象，参见 Worker
+		 * 
+		 * 
+		 */
+		export class Worker extends Class_Worker {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 启动一个纤程并返回纤程对象
+		 * @param func 制定纤程执行的函数
+		 * @param args 可变参数序列，此序列会在纤程内传递给函数
+		 * @return 返回纤程对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function start(func: Function, ...args: any[]): Class_Fiber;
+	
+		/**
+		 * 
+		 * @brief 并行执行一组函数，并等待返回
+		 * @param funcs 并行执行的函数数组
+		 * @param fibers 限制并发 fiber 数量，缺省为 -1，启用与 funcs 数量相同 fiber
+		 * @return 返回函数执行结果的数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function parallel(funcs: any[], fibers?: number/** = -1*/): any[];
+	
+		/**
+		 * 
+		 * @brief 并行执行一个函数处理一组数据，并等待返回
+		 * @param datas 并行执行的数据数组
+		 * @param func 并行执行的函数
+		 * @param fibers 限制并发 fiber 数量，缺省为 -1，启用与 datas 数量相同 fiber
+		 * @return 返回函数执行结果的数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function parallel(datas: any[], func: Function, fibers?: number/** = -1*/): any[];
+	
+		/**
+		 * 
+		 * @brief 并行执行一个函数多次，并等待返回
+		 * @param func 并行执行的函数数
+		 * @param num 重复任务数量
+		 * @param fibers 限制并发 fiber 数量，缺省为 -1，启用与 funcs 数量相同 fiber
+		 * @return 返回函数执行结果的数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function parallel(func: Function, num: number, fibers?: number/** = -1*/): any[];
+	
+		/**
+		 * 
+		 * @brief 并行执行一组函数，并等待返回
+		 * @param funcs 一组并行执行的函数
+		 * @return 返回函数执行结果的数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function parallel(...funcs: any[]): any[];
+	
+		/**
+		 * 
+		 * @brief 返回当前纤程
+		 * @return 当前纤程对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function current(): Class_Fiber;
+	
+		/**
+		 * 
+		 * @brief 暂停当前纤程指定的时间
+		 * @param ms 指定要暂停的时间，以毫秒为单位，缺省为 0，即有空闲立即回恢复运行
+		 * 
+		 * 
+		 * @async
+		 */
+		export function sleep(ms?: number/** = 0*/): void;
+	
+	} /** end of `module coroutine` */
+	export = coroutine
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/crypto.d.ts b/types/fibjs/declare/crypto.d.ts
new file mode 100644
index 0000000000..9dcea20fa0
--- /dev/null
+++ b/types/fibjs/declare/crypto.d.ts
@@ -0,0 +1,606 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 加密算法模块
+	* @detail 使用方法：,```JavaScript,var crypto = require('crypto');,```
+	*/
+declare module "crypto" {
+	
+
+	module crypto {
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 AES，支持 128, 192, 256 位 key，分组密码工作模式支持 ECB, CBC, CFB128, CTR, GCM
+		 * 
+		 * 
+		 */
+		export const AES = 1;
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 CAMELLIA，支持 128, 192, 256 位 key，分组密码工作模式支持 ECB, CBC, CFB128, CTR, GCM
+		 * 
+		 * 
+		 */
+		export const CAMELLIA = 2;
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 DES，支持 64 位 key，分组密码工作模式支持 ECB, CBC
+		 * 
+		 * 
+		 */
+		export const DES = 3;
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 DES-EDE，支持 128 位 key，分组密码工作模式支持 ECB, CBC
+		 * 
+		 * 
+		 */
+		export const DES_EDE = 4;
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 DES-EDE3，支持 192 位 key，分组密码工作模式支持 ECB, CBC
+		 * 
+		 * 
+		 */
+		export const DES_EDE3 = 5;
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 BLOWFISH，支持 192 位 key，分组密码工作模式支持 ECB, CBC, CFB64, CTR
+		 * 
+		 * 
+		 */
+		export const BLOWFISH = 6;
+		
+		/**
+		 * 
+		 * @brief 指定对称加密算法 ARC4，支持 40, 56, 64, 128 位 key
+		 * 
+		 * 
+		 */
+		export const ARC4 = 7;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 ECB
+		 * 
+		 * 
+		 */
+		export const ECB = 1;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 CBC
+		 * 
+		 * 
+		 */
+		export const CBC = 2;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 CFB64
+		 * 
+		 * 
+		 */
+		export const CFB64 = 3;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 CFB128
+		 * 
+		 * 
+		 */
+		export const CFB128 = 4;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 OFB
+		 * 
+		 * 
+		 */
+		export const OFB = 5;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 CTR
+		 * 
+		 * 
+		 */
+		export const CTR = 6;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 GCM
+		 * 
+		 * 
+		 */
+		export const GCM = 7;
+		
+		/**
+		 * 
+		 * @brief 指定流密码模式
+		 * 
+		 * 
+		 */
+		export const STREAM = 8;
+		
+		/**
+		 * 
+		 * @brief 指定分组密码工作模式支持 CCM
+		 * 
+		 * 
+		 */
+		export const CCM = 9;
+		
+		/**
+		 * 
+		 * @brief 指定填充模式为 PKCS7
+		 * 
+		 * 
+		 */
+		export const PKCS7 = 0;
+		
+		/**
+		 * 
+		 * @brief 指定填充模式为 ONE_AND_ZEROS
+		 * 
+		 * 
+		 */
+		export const ONE_AND_ZEROS = 1;
+		
+		/**
+		 * 
+		 * @brief 指定填充模式为 ZEROS_AND_LEN
+		 * 
+		 * 
+		 */
+		export const ZEROS_AND_LEN = 2;
+		
+		/**
+		 * 
+		 * @brief 指定填充模式为 ZEROS
+		 * 
+		 * 
+		 */
+		export const ZEROS = 3;
+		
+		/**
+		 * 
+		 * @brief 指定填充模式为 NOPADDING
+		 * 
+		 * 
+		 */
+		export const NOPADDING = 4;
+		
+		
+		
+		/**
+		 * 
+		 * @brief Cipher 构造函数，参见 Cipher
+		 * 
+		 * 
+		 */
+		export class Cipher extends Class_Cipher {}
+		
+		
+		/**
+		 * 
+		 * @brief PKey 构造函数，参见 PKey
+		 * 
+		 * 
+		 */
+		export class PKey extends Class_PKey {}
+		
+		
+		/**
+		 * 
+		 * @brief X509Cert 构造函数，参见 X509Cert
+		 * 
+		 * 
+		 */
+		export class X509Cert extends Class_X509Cert {}
+		
+		
+		/**
+		 * 
+		 * @brief X509Crl 构造函数，参见 X509Crl
+		 * 
+		 * 
+		 */
+		export class X509Crl extends Class_X509Crl {}
+		
+		
+		/**
+		 * 
+		 * @brief X509Req 构造函数，参见 X509Req
+		 * 
+		 * 
+		 */
+		export class X509Req extends Class_X509Req {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 根据给定的算法名称创建一个信息摘要对象
+		 * @param algo 指定信息摘要对象的算法
+		 * @return 返回信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function createHash(algo: string): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 根据给定的算法名称创建一个 hmac 信息摘要对象
+		 * @param algo 指定信息摘要对象的算法
+		 * @param key 二进制签名密钥
+		 * @return 返回信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function createHmac(algo: string, key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 加载一个 PEM/DER 格式的密钥文件
+		 * @param filename 密钥文件名
+		 * @param password 解密密码
+		 * @return 返回包含密钥的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadPKey(filename: string, password?: string/** = ""*/): Class_PKey;
+	
+		/**
+		 * 
+		 * @brief 加载一个 CRT/PEM/DER/TXT 格式的证书，可多次调用
+		 * 
+		 * loadFile 加载 mozilla 的 certdata,txt， 可于 http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt 下载使用
+		 * @param filename 证书文件名
+		 * @return 返回包含证书的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadCert(filename: string): Class_X509Cert;
+	
+		/**
+		 * 
+		 * @brief 加载一个 PEM/DER 格式的撤销证书，可多次调用
+		 * @param filename 撤销证书文件名
+		 * @return 返回包含撤销证书的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadCrl(filename: string): Class_X509Crl;
+	
+		/**
+		 * 
+		 * @brief 加载一个 PEM/DER 格式的证书请求，可多次调用
+		 * @param filename 证书请求文件名
+		 * @return 返回包含请求证书的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadReq(filename: string): Class_X509Req;
+	
+		/**
+		 * 
+		 * @brief 生成指定尺寸的随机数，使用 havege 生成器
+		 * @param size 指定生成的随机数尺寸
+		 * @return 返回生成的随机数
+		 * 
+		 * 
+		 * @async
+		 */
+		export function randomBytes(size: number): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 生成指定尺寸的低强度随机数，使用快速的算法
+		 * @param size 指定生成的随机数尺寸
+		 * @return 返回生成的随机数
+		 * 
+		 * 
+		 * @async
+		 */
+		export function simpleRandomBytes(size: number): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 生成指定尺寸的伪随机数，使用 entropy 生成器
+		 * @param size 指定生成的随机数尺寸
+		 * @return 返回生成的随机数
+		 * 
+		 * 
+		 * @async
+		 */
+		export function pseudoRandomBytes(size: number): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 生成给定数据的可视化字符图像
+		 * @param data 指定要展示的数据
+		 * @param title 指定字符图像的标题，多字节字符会导致宽度错误
+		 * @param size 字符图像尺寸
+		 * @return 返回生成的可视化字符串图像
+		 * 
+		 * 
+		 * 
+		 */
+		export function randomArt(data: Class_Buffer, title: string, size?: number/** = 8*/): string;
+	
+		/**
+		 * 
+		 * @brief 依据 pbkdf1 根据明文 password 生成要求的二进制钥匙
+		 * @param password 指定使用的密码
+		 * @param salt 指定 hmac 使用的 salt
+		 * @param iterations 指定迭代次数
+		 * @param size 指定钥匙尺寸
+		 * @param algo 指定要使用的 hash 算法，详见 hash 模块
+		 * @return 返回生成的二进制钥匙
+		 * 
+		 * 
+		 * @async
+		 */
+		export function pbkdf1(password: Class_Buffer, salt: Class_Buffer, iterations: number, size: number, algo: number): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 依据 pbkdf1 根据明文 password 生成要求的二进制钥匙
+		 * @param password 指定使用的密码
+		 * @param salt 指定 hmac 使用的 salt
+		 * @param iterations 指定迭代次数
+		 * @param size 指定钥匙尺寸
+		 * @param algoName 指定要使用的 hash 算法，详见 hash 模块
+		 * @return 返回生成的二进制钥匙
+		 * 
+		 * 
+		 * @async
+		 */
+		export function pbkdf1(password: Class_Buffer, salt: Class_Buffer, iterations: number, size: number, algoName: string): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 依据 rfc2898 根据明文 password 生成要求的二进制钥匙
+		 * @param password 指定使用的密码
+		 * @param salt 指定 hmac 使用的 salt
+		 * @param iterations 指定迭代次数
+		 * @param size 指定钥匙尺寸
+		 * @param algo 指定要使用的 hash 算法，详见 hash 模块
+		 * @return 返回生成的二进制钥匙
+		 * 
+		 * 
+		 * @async
+		 */
+		export function pbkdf2(password: Class_Buffer, salt: Class_Buffer, iterations: number, size: number, algo: number): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 依据 rfc2898 根据明文 password 生成要求的二进制钥匙
+		 * @param password 指定使用的密码
+		 * @param salt 指定 hmac 使用的 salt
+		 * @param iterations 指定迭代次数
+		 * @param size 指定钥匙尺寸
+		 * @param algoName 指定要使用的 hash 算法，详见 hash 模块
+		 * @return 返回生成的二进制钥匙
+		 * 
+		 * 
+		 * @async
+		 */
+		export function pbkdf2(password: Class_Buffer, salt: Class_Buffer, iterations: number, size: number, algoName: string): Class_Buffer;
+	
+	} /** end of `module crypto` */
+	export = crypto
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/db.d.ts b/types/fibjs/declare/db.d.ts
new file mode 100644
index 0000000000..04cc2f101a
--- /dev/null
+++ b/types/fibjs/declare/db.d.ts
@@ -0,0 +1,345 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 数据库访问模块
+	* @detail 基础模块。可用于创建和操作数据库资源，引用方式：,```JavaScript,var db = require('db');,```
+	*/
+declare module "db" {
+	
+
+	module db {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 打开一个数据库，此方法为通用入口，根据提供的 connString 不同调用不同的引擎
+		 * @param connString 数据库描述，如：mysql://user:pass\@host/db
+		 * @return 返回数据库连接对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function open(connString: string): Class__object;
+	
+		/**
+		 * 
+		 * @brief 打开一个 mysql 数据库
+		 * @param connString 数据库描述，如：mysql://user:pass\@host/db
+		 * @return 返回数据库连接对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openMySQL(connString: string): Class_MySQL;
+	
+		/**
+		 * 
+		 * @brief 打开一个 mysql 数据库
+		 * @param connString 数据库描述，如：mssql://user:pass\@host/db
+		 * @return 返回数据库连接对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openMSSQL(connString: string): Class_MSSQL;
+	
+		/**
+		 * 
+		 * @brief 打开一个 sqlite 数据库
+		 * @param connString 数据库描述，如：sqlite:test.db 或者 test.db
+		 * @return 返回数据库连接对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openSQLite(connString: string): Class_SQLite;
+	
+		/**
+		 * 
+		 * @brief 打开一个 mongodb 数据库
+		 * @param connString 数据库描述
+		 * @return 返回数据库连接对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openMongoDB(connString: string): Class_MongoDB;
+	
+		/**
+		 * 
+		 * @brief 打开一个 leveldb 数据库
+		 * @param connString 数据库描述，如：level:test.db 或者 test.db
+		 * @return 返回数据库对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openLevelDB(connString: string): Class_LevelDB;
+	
+		/**
+		 * 
+		 * @brief 打开一个 Redis 数据库
+		 * @param connString 数据库描述，如：redis://server:port 或者 "server"
+		 * @return 返回数据库连接对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openRedis(connString: string): Class_Redis;
+	
+		/**
+		 * 
+		 * @brief 格式化一个 sql 命令，并返回格式化结果
+		 * 
+		 * @param sql 格式化字符串，可选参数用 ? 指定。例如：'SELECT FROM TEST WHERE [id]=?'
+		 * @param args 可选参数列表
+		 * @return 返回格式化之后的 sql 命令
+		 * 
+		 * 
+		 * 
+		 */
+		export function format(sql: string, ...args: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 格式化一个 mysql 命令，并返回格式化结果
+		 * 
+		 * @param sql 格式化字符串，可选参数用 ? 指定。例如：'SELECT FROM TEST WHERE [id]=?'
+		 * @param args 可选参数列表
+		 * @return 返回格式化之后的 sql 命令
+		 * 
+		 * 
+		 * 
+		 */
+		export function formatMySQL(sql: string, ...args: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 格式化一个 mssql 命令，并返回格式化结果
+		 * 
+		 * @param sql 格式化字符串，可选参数用 ? 指定。例如：'SELECT FROM TEST WHERE [id]=?'
+		 * @param args 可选参数列表
+		 * @return 返回格式化之后的 sql 命令
+		 * 
+		 * 
+		 * 
+		 */
+		export function formatMSSQL(sql: string, ...args: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 将字符串编码为 SQL 安全编码字符串
+		 * @param str 要编码的字符串
+		 * @param mysql 指定 mysql 编码，缺省为 false
+		 * @return 返回编码后的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function escape(str: string, mysql?: boolean/** = false*/): string;
+	
+	} /** end of `module db` */
+	export = db
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/dgram.d.ts b/types/fibjs/declare/dgram.d.ts
new file mode 100644
index 0000000000..0d3ccd20a9
--- /dev/null
+++ b/types/fibjs/declare/dgram.d.ts
@@ -0,0 +1,294 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief dgram 模块提供了 UDP 数据包 socket 的实现
+	* @detail 基础模块，引用方式：,```JavaScript,var dgram = require('dgram');,```
+	*/
+declare module "dgram" {
+	
+
+	module dgram {
+		
+		
+		
+		/**
+		 * 
+		 * @brief dgram.Socket 对象是一个封装了数据包函数功能的 EventEmitter。参见 DgramSocket
+		 * dgram.Socket 实例是由 dgram.createSocket() 创建的。创建 dgram.Socket 实例不需要使用 new 关键字。
+		 * 
+		 * 
+		 * 
+		 */
+		export class Socket extends Class_DgramSocket {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 dgram.Socket 对象
+		 * 
+		 * opts 允许的选项是:
+		 * ```JavaScript
+		 * {
+		 * "type": "udp4" | "udp6",   // 必填
+		 * "reuseAddr": true | false, //若设置为 true，socket.bind() 则会重用地址，即时另一个进程已经在其上面绑定了一个套接字。 默认是 false
+		 * "recvBufferSize": ###,     // 设置 SO_RCVBUF 套接字值
+		 * "sendBufferSize": ###      //设置 SO_RCVBUF 套接字值
+		 * }
+		 * ```
+		 * @param opts
+		 * @return 返回创建的 Socket 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function createSocket(opts: object): Class_DgramSocket;
+	
+		/**
+		 * 
+		 * @brief 创建一个 dgram.Socket 对象
+		 * 
+		 * opts 允许的选项是:
+		 * ```JavaScript
+		 * {
+		 * "type": "udp4" | "udp6",   // 必填
+		 * "reuseAddr": true | false, //若设置为 true，socket.bind() 则会重用地址，即时另一个进程已经在其上面绑定了一个套接字。 默认是 false
+		 * "recvBufferSize": ###,     // 设置 SO_RCVBUF 套接字值
+		 * "sendBufferSize": ###      //设置 SO_RCVBUF 套接字值
+		 * }
+		 * ```
+		 * @param opts
+		 * @param callback 为 'message' 事件添加一个监听器。
+		 * @return 返回创建的 Socket 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function createSocket(opts: object, callback: Function): Class_DgramSocket;
+	
+		/**
+		 * 
+		 * @brief 创建一个 dgram.Socket 对象
+		 * @param type 套接字族，'udp4' 或 'udp6'。
+		 * @return 返回创建的 Socket 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function createSocket(type: string): Class_DgramSocket;
+	
+		/**
+		 * 
+		 * @brief 创建一个 dgram.Socket 对象
+		 * @param type 套接字族，'udp4' 或 'udp6'。
+		 * @param callback 为 'message' 事件添加一个监听器。
+		 * @return 返回创建的 Socket 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function createSocket(type: string, callback: Function): Class_DgramSocket;
+	
+	} /** end of `module dgram` */
+	export = dgram
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/dns.d.ts b/types/fibjs/declare/dns.d.ts
new file mode 100644
index 0000000000..c2b802cb5d
--- /dev/null
+++ b/types/fibjs/declare/dns.d.ts
@@ -0,0 +1,239 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief dns 域名查询模块
+	* @detail 基础模块，引用方式：,```JavaScript,var dns = require('dns');,```
+	*/
+declare module "dns" {
+	
+
+	module dns {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 查询给定的主机名的地址
+		 * @param name 指定主机名
+		 * @return 返回查询的 ip 字符串数组
+		 * 
+		 * 
+		 * @async
+		 */
+		export function resolve(name: string): any[];
+	
+		/**
+		 * 
+		 * @brief 查询给定的主机名的地址
+		 * @param name 指定主机名
+		 * @return 返回查询的 ip 字符串
+		 * 
+		 * 
+		 * @async
+		 */
+		export function lookup(name: string): string;
+	
+	} /** end of `module dns` */
+	export = dns
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/encoding.d.ts b/types/fibjs/declare/encoding.d.ts
new file mode 100644
index 0000000000..86db5533ac
--- /dev/null
+++ b/types/fibjs/declare/encoding.d.ts
@@ -0,0 +1,346 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 编码与解码模块，用于处理不同的数据编码格式与二进制之间的转换
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,```
+	*/
+declare module "encoding" {
+	
+	import base32NS = require('base32')
+	import base64NS = require('base64')
+	import base64vlqNS = require('base64vlq')
+	import hexNS = require('hex')
+	import iconvNS = require('iconv')
+	import jsonNS = require('json')
+	import bsonNS = require('bson')
+
+	module encoding {
+		
+		
+		
+		/**
+		 * 
+		 * @brief base32 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const base32: typeof base32NS
+		
+		/**
+		 * 
+		 * @brief base64 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const base64: typeof base64NS
+		
+		/**
+		 * 
+		 * @brief base64vlq 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const base64vlq: typeof base64vlqNS
+		
+		/**
+		 * 
+		 * @brief hex 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const hex: typeof hexNS
+		
+		/**
+		 * 
+		 * @brief iconv 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const iconv: typeof iconvNS
+		
+		/**
+		 * 
+		 * @brief json 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const json: typeof jsonNS
+		
+		/**
+		 * 
+		 * @brief bson 编码与解码模块
+		 * 
+		 * 
+		 */
+		
+		export const bson: typeof bsonNS
+		
+		
+		
+		/**
+		 * 
+		 * @brief 将字符串编码为 javascript 转义字符串，用以在 javascript 代码中包含文本
+		 * @param str 要编码的字符串
+		 * @param json 是否生成json兼容字符串
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function jsstr(str: string, json?: boolean/** = false*/): string;
+	
+		/**
+		 * 
+		 * @brief url 字符串安全编码
+		 * @param url 要编码的 url
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encodeURI(url: string): string;
+	
+		/**
+		 * 
+		 * @brief url 部件字符串安全编码
+		 * @param url 要编码的 url
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encodeURIComponent(url: string): string;
+	
+		/**
+		 * 
+		 * @brief url 安全字符串解码
+		 * @param url 要解码的 url
+		 * @return 返回解码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function decodeURI(url: string): string;
+	
+	} /** end of `module encoding` */
+	export = encoding
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/fs.d.ts b/types/fibjs/declare/fs.d.ts
new file mode 100644
index 0000000000..b0971e3ee5
--- /dev/null
+++ b/types/fibjs/declare/fs.d.ts
@@ -0,0 +1,677 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 文件系统处理模块
+	* @detail 使用方法：,```JavaScript,var fs = require('fs');,```
+	*/
+declare module "fs" {
+	
+
+	module fs {
+		
+		/**
+		 * 
+		 * @brief seek 方式常量，移动到绝对位置
+		 * 
+		 * 
+		 */
+		export const SEEK_SET = 0;
+		
+		/**
+		 * 
+		 * @brief seek 方式常量，移动到当前位置的相对位置
+		 * 
+		 * 
+		 */
+		export const SEEK_CUR = 1;
+		
+		/**
+		 * 
+		 * @brief seek 方式常量，移动到文件结尾的相对位置
+		 * 
+		 * 
+		 */
+		export const SEEK_END = 2;
+		
+		
+		/**
+		 * 
+		 * ! fs模块的常量对象
+		 * 
+		 * 
+		 */
+		export const constants: Object;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 查询指定的文件或目录是否存在
+		 * @param path 指定要查询的路径
+		 * @return 返回 True 表示文件或目录存在
+		 * 
+		 * 
+		 * @async
+		 */
+		export function exists(path: string): boolean;
+	
+		/**
+		 * 
+		 * @brief 查询用户对指定的文件的权限
+		 * @param path 指定要查询的路径
+		 * @param mode 指定查询的权限,默认为文件是否存在
+		 * 
+		 * 
+		 * @async
+		 */
+		export function access(path: string, mode?: number/** = 0*/): void;
+	
+		/**
+		 * 
+		 * @brief 创建硬链接文件, windows 下不支持此方法
+		 * @param oldPath 源文件
+		 * @param newPath 将要被创建的文件
+		 * 
+		 * 
+		 * @async
+		 */
+		export function link(oldPath: string, newPath: string): void;
+	
+		/**
+		 * 
+		 * @brief 删除指定的文件
+		 * @param path 指定要删除的路径
+		 * 
+		 * 
+		 * @async
+		 */
+		export function unlink(path: string): void;
+	
+		/**
+		 * 
+		 * @brief 创建一个目录
+		 * @param path 指定要创建的目录名
+		 * @param mode 指定文件权限，Windows 忽略此参数
+		 * 
+		 * 
+		 * @async
+		 */
+		export function mkdir(path: string, mode?: number/** = 0777*/): void;
+	
+		/**
+		 * 
+		 * @brief 删除一个目录
+		 * @param path 指定要删除的目录名
+		 * 
+		 * 
+		 * @async
+		 */
+		export function rmdir(path: string): void;
+	
+		/**
+		 * 
+		 * @brief 重新命名一个文件
+		 * @param from 指定更名的文件
+		 * @param to 指定要修改的新文件名
+		 * 
+		 * 
+		 * @async
+		 */
+		export function rename(from: string, to: string): void;
+	
+		/**
+		 * 
+		 * @brief 复制一个文件
+		 * @param from 指定更名的文件
+		 * @param to 指定要修改的新文件名
+		 * 
+		 * 
+		 * @async
+		 */
+		export function copy(from: string, to: string): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定文件的访问权限，Windows 不支持此方法
+		 * @param path 指定操作的文件
+		 * @param mode 指定设定的访问权限
+		 * 
+		 * 
+		 * @async
+		 */
+		export function chmod(path: string, mode: number): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定文件的访问权限，若文件是软连接则不改变指向文件的权限，只在macOS、BSD 系列平台上可用
+		 * @param path 指定操作的文件
+		 * @param mode 指定设定的访问权限
+		 * 
+		 * 
+		 * @async
+		 */
+		export function lchmod(path: string, mode: number): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定文件的拥有者，Windows 不支持此方法
+		 * @param path 指定设置的文件
+		 * @param uid 文件拥有者用户id
+		 * @param gid 文件拥有者组id
+		 * 
+		 * 
+		 * @async
+		 */
+		export function chown(path: string, uid: number, gid: number): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定文件的拥有者，如果指定的文件是软连接则不会改变其指向文件的拥有者，Windows 不支持此方法
+		 * @param path 指定设置的文件
+		 * @param uid 文件拥有者用户id
+		 * @param gid 文件拥有者组id
+		 * 
+		 * 
+		 * @async
+		 */
+		export function lchown(path: string, uid: number, gid: number): void;
+	
+		/**
+		 * 
+		 * @brief 查询指定文件的基础信息
+		 * @param path 指定查询的文件
+		 * @return 返回文件的基础信息
+		 * 
+		 * 
+		 * @async
+		 */
+		export function stat(path: string): Class_Stat;
+	
+		/**
+		 * 
+		 * @brief 查询指定文件的基础信息, 和stat不同的是, 当path是一个软连接的时候，返回的将是这个软连接的信息而不是指向的文件的信息
+		 * @param path 指定查询的文件
+		 * @return 返回文件的基础信息
+		 * 
+		 * 
+		 * @async
+		 */
+		export function lstat(path: string): Class_Stat;
+	
+		/**
+		 * 
+		 * @brief 读取指定的软连接文件, windows 下不支持此方法
+		 * @param path 指定读取的软连接文件
+		 * @return 返回软连接指向的文件名
+		 * 
+		 * 
+		 * @async
+		 */
+		export function readlink(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 返回指定路径的绝对路径，如果指定路径中包含相对路径也会被展开
+		 * @param path 指定读取的路径
+		 * @return 返回处理后的绝对路径
+		 * 
+		 * 
+		 * @async
+		 */
+		export function realpath(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 创建软连接文件
+		 * @param target 目标文件，可以是文件、目录、或不存在的路径
+		 * @param linkpath 将被创建的软连接文件
+		 * @param type 创建的软连接类型, 可选类型为'file', 'dir', 'junction', 默认为'file', 该参数只在windows上有效，当为'junction'的时候将要创建的目标路径linkpath必须为绝对路径, 而target则会被自动转化为绝对路径。
+		 * 
+		 * 
+		 * @async
+		 */
+		export function symlink(target: string, linkpath: string, type?: string/** = "file"*/): void;
+	
+		/**
+		 * 
+		 * @brief 修改文件尺寸,如果指定的长度大于源文件大小则用'\0'填充，否则多于的文件内容将丢失
+		 * @param path 指定被修改文件的路径
+		 * @param len 指定修改后文件的大小
+		 * 
+		 * 
+		 * @async
+		 */
+		export function truncate(path: string, len: number): void;
+	
+		/**
+		 * 
+		 * @brief 根据文件描述符，读取文件内容
+		 * @param fd 文件描述符
+		 * @param buffer 读取结果写入的 Buffer 对象
+		 * @param offset Buffer 写入偏移量， 默认为 0
+		 * @param length 文件读取字节数，默认为 0
+		 * @param position 文件读取位置，默认为当前文件位置
+		 * @return 实际读取的字节数
+		 * 
+		 * 
+		 * @async
+		 */
+		export function read(fd: number, buffer: Class_Buffer, offset?: number/** = 0*/, length?: number/** = 0*/, position?: number/** = -1*/): number;
+	
+		/**
+		 * 
+		 * @brief 根据文件描述符，改变文件模式。只在 POSIX 系统有效。
+		 * @param fd 文件描述符
+		 * @param mode 文件的模式
+		 * 
+		 * 
+		 * @async
+		 */
+		export function fchmod(fd: number, mode: number): void;
+	
+		/**
+		 * 
+		 * @brief 根据文件描述符，改变所有者。只在 POSIX 系统有效。
+		 * @param fd 文件描述符
+		 * @param uid 用户id
+		 * @param gid 组id
+		 * 
+		 * 
+		 * @async
+		 */
+		export function fchown(fd: number, uid: number, gid: number): void;
+	
+		/**
+		 * 
+		 * @brief 根据文件描述符，同步数据到磁盘
+		 * @param fd 文件描述符
+		 * 
+		 * 
+		 * @async
+		 */
+		export function fdatasync(fd: number): void;
+	
+		/**
+		 * 
+		 * @brief 根据文件描述符，同步数据到磁盘
+		 * @param fd 文件描述符
+		 * 
+		 * 
+		 * @async
+		 */
+		export function fsync(fd: number): void;
+	
+		/**
+		 * 
+		 * @brief 读取指定目录的文件信息
+		 * @param path 指定查询的目录
+		 * @return 返回目录的文件信息数组
+		 * 
+		 * 
+		 * @async
+		 */
+		export function readdir(path: string): any[];
+	
+		/**
+		 * 
+		 * @brief 打开文件，用于读取，写入，或者同时读写
+		 * 
+		 * 参数 flags 支持的方式如下：
+		 * - 'r' 只读方式，文件不存在则抛出错误。
+		 * - 'r+' 读写方式，文件不存在则抛出错误。
+		 * - 'w' 只写方式，文件不存在则自动创建，存在则将被清空。
+		 * - 'w+' 读写方式，文件不存在则自动创建。
+		 * - 'a' 只写添加方式，文件不存在则自动创建。
+		 * - 'a+' 读写添加方式，文件不存在则自动创建。
+		 * @param fname 指定文件名
+		 * @param flags 指定文件打开方式，缺省为 "r"，只读方式
+		 * @return 返回打开的文件对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openFile(fname: string, flags?: string/** = "r"*/): Class_SeekableStream;
+	
+		/**
+		 * 
+		 * @brief 打开文件描述符
+		 * 
+		 * 参数 flags 支持的方式如下：
+		 * - 'r' 只读方式，文件不存在则抛出错误。
+		 * - 'r+' 读写方式，文件不存在则抛出错误。
+		 * - 'w' 只写方式，文件不存在则自动创建，存在则将被清空。
+		 * - 'w+' 读写方式，文件不存在则自动创建。
+		 * - 'a' 只写添加方式，文件不存在则自动创建。
+		 * - 'a+' 读写添加方式，文件不存在则自动创建。
+		 * @param fname 指定文件名
+		 * @param flags 指定文件打开方式，缺省为 "r"，只读方式
+		 * @param mode 当创建文件的时候，指定文件的模式，默认 0666
+		 * @return 返回打开的文件描述符
+		 * 
+		 * 
+		 * @async
+		 */
+		export function open(fname: string, flags?: string/** = "r"*/, mode?: number/** = 0666*/): number;
+	
+		/**
+		 * 
+		 * @brief 关闭文件描述符
+		 * @param fd 文件描述符
+		 * 
+		 * 
+		 * @async
+		 */
+		export function close(fd: number): void;
+	
+		/**
+		 * 
+		 * @brief 打开文本文件，用于读取，写入，或者同时读写
+		 * 
+		 * 参数 flags 支持的方式如下：
+		 * - 'r' 只读方式，文件不存在则抛出错误。
+		 * - 'r+' 读写方式，文件不存在则抛出错误。
+		 * - 'w' 只写方式，文件不存在则自动创建，存在则将被清空。
+		 * - 'w+' 读写方式，文件不存在则自动创建。
+		 * - 'a' 只写添加方式，文件不存在则自动创建。
+		 * - 'a+' 读写添加方式，文件不存在则自动创建。
+		 * @param fname 指定文件名
+		 * @param flags 指定文件打开方式，缺省为 "r"，只读方式
+		 * @return 返回打开的文件对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openTextStream(fname: string, flags?: string/** = "r"*/): Class_BufferedStream;
+	
+		/**
+		 * 
+		 * @brief 打开文本文件，并读取内容
+		 * @param fname 指定文件名
+		 * @return 返回文件文本内容
+		 * 
+		 * 
+		 * @async
+		 */
+		export function readTextFile(fname: string): string;
+	
+		/**
+		 * 
+		 * @brief 打开二进制文件，并读取内容
+		 * @param fname 指定文件名
+		 * @param encoding 指定解码方式，缺省不解码
+		 * @return 返回文件文本内容
+		 * 
+		 * 
+		 * @async
+		 */
+		export function readFile(fname: string, encoding?: string/** = ""*/): any;
+	
+		/**
+		 * 
+		 * @brief 打开文件，以数组方式读取一组文本行，行结尾标识基于 EOL 属性的设置，缺省时，posix:"\n"；windows:"\r\n"
+		 * @param fname 指定文件名
+		 * @param maxlines 指定此次读取的最大行数，缺省读取全部文本行
+		 * @return 返回读取的文本行数组，若无数据可读，或者连接中断，空数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function readLines(fname: string, maxlines?: number/** = -1*/): any[];
+	
+		/**
+		 * 
+		 * @brief 创建文本文件，并写入内容
+		 * @param fname 指定文件名
+		 * @param txt 指定要写入的字符串
+		 * 
+		 * 
+		 * @async
+		 */
+		export function writeTextFile(fname: string, txt: string): void;
+	
+		/**
+		 * 
+		 * @brief 创建二进制文件，并写入内容
+		 * @param fname 指定文件名
+		 * @param data 指定要写入的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function writeFile(fname: string, data: Class_Buffer): void;
+	
+		/**
+		 * 
+		 * @brief 创建二进制文件，并写入内容
+		 * @param fname 指定文件名
+		 * @param data 指定要写入的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function appendFile(fname: string, data: Class_Buffer): void;
+	
+		/**
+		 * 
+		 * @brief 设置 zip 虚拟文件映射
+		 * @param fname 指定映射路径
+		 * @param data 指定映射的 zip 文件数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function setZipFS(fname: string, data: Class_Buffer): void;
+	
+		/**
+		 * 
+		 * @brief 清除 zip 虚拟文件映射
+		 * @param fname 指定映射路径，缺省清除全部缓存
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearZipFS(fname?: string/** = ""*/): void;
+	
+	} /** end of `module fs` */
+	export = fs
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/gd.d.ts b/types/fibjs/declare/gd.d.ts
new file mode 100644
index 0000000000..843e74f1e9
--- /dev/null
+++ b/types/fibjs/declare/gd.d.ts
@@ -0,0 +1,587 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 图像文件处理模块
+	* @detail 基础模块。可用于创建和操作图像文件，引用方式：,```JavaScript,var gd = require('gd');,```
+	*/
+declare module "gd" {
+	
+
+	module gd {
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为未知
+		 * 
+		 * 
+		 */
+		export const NONE = 0;
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为 jpeg 格式数据
+		 * 
+		 * 
+		 */
+		export const JPEG = 1;
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为 gif 格式数据
+		 * 
+		 * 
+		 */
+		export const GIF = 2;
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为 png 格式数据
+		 * 
+		 * 
+		 */
+		export const PNG = 3;
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为 tiff 格式数据
+		 * 
+		 * 
+		 */
+		export const TIFF = 4;
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为 bmp 格式数据
+		 * 
+		 * 
+		 */
+		export const BMP = 5;
+		
+		/**
+		 * 
+		 * @brief 图像格式常量，标示当前图像来源为 webp 格式数据
+		 * 
+		 * 
+		 */
+		export const WEBP = 6;
+		
+		/**
+		 * 
+		 * @brief 图像类型常量，标示当前图像为真彩色图像
+		 * 
+		 * 
+		 */
+		export const TRUECOLOR = 0;
+		
+		/**
+		 * 
+		 * @brief 图像类型常量，标示当前图像为调色板图像
+		 * 
+		 * 
+		 */
+		export const PALETTE = 1;
+		
+		/**
+		 * 
+		 * @brief 扇形绘制样式，绘制一条连接开始和结束点的圆弧
+		 * 
+		 * 
+		 */
+		export const ARC = 0;
+		
+		/**
+		 * 
+		 * @brief 扇形绘制样式，绘制一条连接原点，开始和结束点的直线
+		 * 
+		 * 
+		 */
+		export const CHORD = 1;
+		
+		/**
+		 * 
+		 * @brief 扇形绘制样式，绘制不填充的扇形
+		 * 
+		 * 
+		 */
+		export const NOFILL = 2;
+		
+		/**
+		 * 
+		 * @brief 扇形绘制样式，绘制一条连接起点和终点的弧和连接原点的直线
+		 * 
+		 * 
+		 */
+		export const EDGED = 4;
+		
+		/**
+		 * 
+		 * @brief 镜像方向，横向做镜像处理
+		 * 
+		 * 
+		 */
+		export const HORIZONTAL = 1;
+		
+		/**
+		 * 
+		 * @brief 镜像方向，纵向做镜像处理
+		 * 
+		 * 
+		 */
+		export const VERTICAL = 2;
+		
+		/**
+		 * 
+		 * @brief 镜像方向，横向和纵向都做镜像处理
+		 * 
+		 * 
+		 */
+		export const BOTH = 3;
+		
+		/**
+		 * 
+		 * @brief 旋转方向，向左旋转
+		 * 
+		 * 
+		 */
+		export const LEFT = 1;
+		
+		/**
+		 * 
+		 * @brief 旋转方向，向右旋转
+		 * 
+		 * 
+		 */
+		export const RIGHT = 2;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：用平均移除法来达到轮廓效果
+		 * 
+		 * 
+		 */
+		export const MEAN_REMOVAL = 0;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：用边缘检测来突出图像的边缘
+		 * 
+		 * 
+		 */
+		export const EDGEDETECT = 1;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：使图像浮雕化
+		 * 
+		 * 
+		 */
+		export const EMBOSS = 2;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：模糊图像
+		 * 
+		 * 
+		 */
+		export const SELECTIVE_BLUR = 3;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：用高斯算法模糊图像
+		 * 
+		 * 
+		 */
+		export const GAUSSIAN_BLUR = 4;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：将图像中所有颜色反转
+		 * 
+		 * 
+		 */
+		export const NEGATE = 5;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：将图像转换为灰度图
+		 * 
+		 * 
+		 */
+		export const GRAYSCALE = 6;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：使图像更柔滑，用arg1设定柔滑级别
+		 * 
+		 * 
+		 */
+		export const SMOOTH = 7;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：改变图像的亮度，用arg1设定亮度级别，取值范围是-255~255
+		 * 
+		 * 
+		 */
+		export const BRIGHTNESS = 8;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：改变图像的对比度，用arg1设定对比度级别，取值范围是0~100
+		 * 
+		 * 
+		 */
+		export const CONTRAST = 9;
+		
+		/**
+		 * 
+		 * @brief 滤波器类型：改变图像的色调，用arg1、arg2、arg3分别指定red、blue、green，每种颜色范围是0~255，arg4为透明度，取值返回是0~127
+		 * 
+		 * 
+		 */
+		export const COLORIZE = 10;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个新图像
+		 * @param width 指定图像宽度
+		 * @param height 指定图像高度
+		 * @param color 指定图像类型，允许值为 gd.TRUECOLOR 或 gd.PALETTE
+		 * @return 返回创建成功的图像对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function create(width: number, height: number, color?: number/** = undefined*/): Class_Image;
+	
+		/**
+		 * 
+		 * @brief 从格式数据中解码图像
+		 * @param data 给定解码的图像数据
+		 * @return 返回解码成功的图像对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function load(data: Class_Buffer): Class_Image;
+	
+		/**
+		 * 
+		 * @brief 从流对象中解码图像
+		 * @param stm 给定图像数据所在的流对象
+		 * @return 返回解码成功的图像对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function load(stm: Class_SeekableStream): Class_Image;
+	
+		/**
+		 * 
+		 * @brief 从指定文件中解码图像
+		 * @param fname 指定文件名
+		 * @return 返回解码成功的图像对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function load(fname: string): Class_Image;
+	
+		/**
+		 * 
+		 * @brief 通过 rgb 颜色分量生成组合颜色
+		 * @param red 红色分量，范围为 0-255
+		 * @param green 绿色分量，范围为 0-255
+		 * @param blue 蓝色分量，范围为 0-255
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function rgb(red: number, green: number, blue: number): number;
+	
+		/**
+		 * 
+		 * @brief 通过 rgba 颜色分量生成组合颜色
+		 * @param red 红色分量，范围为 0-255
+		 * @param green 绿色分量，范围为 0-255
+		 * @param blue 蓝色分量，范围为 0-255
+		 * @param alpha 透明分量，范围为 0.0-1.0
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function rgba(red: number, green: number, blue: number, alpha: number): number;
+	
+		/**
+		 * 
+		 * @brief 通过 hsl 颜色分量生成组合颜色
+		 * @param hue 色相分量，范围为 0-360
+		 * @param saturation 饱和度分量，范围为 0.0-1.0
+		 * @param lightness 亮度分量，范围为 0.0-1.0
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function hsl(hue: number, saturation: number, lightness: number): number;
+	
+		/**
+		 * 
+		 * @brief 通过 hsla 颜色分量生成组合颜色
+		 * @param hue 色相分量，范围为 0-360
+		 * @param saturation 饱和度分量，范围为 0.0-1.0
+		 * @param lightness 亮度分量，范围为 0.0-1.0
+		 * @param alpha 透明分量，范围为 0.0-1.0
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function hsla(hue: number, saturation: number, lightness: number, alpha: number): number;
+	
+		/**
+		 * 
+		 * @brief 通过 hsb 颜色分量生成组合颜色
+		 * @param hue 色相分量，范围为 0-360
+		 * @param saturation 饱和度分量，范围为 0.0-1.0
+		 * @param brightness 明亮程度分量，范围为 0.0-1.0
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function hsb(hue: number, saturation: number, brightness: number): number;
+	
+		/**
+		 * 
+		 * @brief 通过 hsba 颜色分量生成组合颜色
+		 * @param hue 色相分量，范围为 0-360
+		 * @param saturation 饱和度分量，范围为 0.0-1.0
+		 * @param brightness 明亮程度分量，范围为 0.0-1.0
+		 * @param alpha 透明分量，范围为 0.0-1.0
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function hsba(hue: number, saturation: number, brightness: number, alpha: number): number;
+	
+		/**
+		 * 
+		 * @brief 通过字符串生成组合颜色
+		 * @param color 指定颜色的字符串，如："#ff0000", "ff0000", "#f00", "f00"
+		 * @return 返回组合颜色
+		 * 
+		 * 
+		 * 
+		 */
+		export function color(color: string): number;
+	
+	} /** end of `module gd` */
+	export = gd
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/global.d.ts b/types/fibjs/declare/global.d.ts
new file mode 100644
index 0000000000..19d539d932
--- /dev/null
+++ b/types/fibjs/declare/global.d.ts
@@ -0,0 +1,553 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 全局对象，所有脚本均可以访问的基础对象
+	* @detail 
+	*/
+declare module "global" {
+	
+	import consoleNS = require('console')
+	import processNS = require('process')
+
+	module global {
+		
+		
+		/**
+		 * 
+		 * @brief Worker 宿主对象，仅在 Worker 入口脚本有效
+		 * 
+		 * 
+		 */
+		export const Master: Class_Worker;
+		
+		/**
+		 * 
+		 * @brief 全局对象
+		 * 
+		 * 
+		 */
+		export const global: Object;
+		
+		/**
+		 * 
+		 * @brief 获取当前脚本的运行参数，启动 js 获取进程启动参数，run 执行的脚本获取传递的参数
+		 * 
+		 * 
+		 */
+		export const argv: any[];
+		
+		/**
+		 * 
+		 * @brief 当前脚本文件名
+		 * 
+		 * 
+		 */
+		export const __filename: string;
+		
+		/**
+		 * 
+		 * @brief 当前脚本所在目录
+		 * 
+		 * 
+		 */
+		export const __dirname: string;
+		
+		
+		/**
+		 * 
+		 * @brief 二进制数据缓存对象，用于 io 读写的数据处理，参见 Buffer 对象。
+		 * 
+		 * 
+		 */
+		export class Buffer extends Class_Buffer {}
+		
+		
+		/**
+		 * 
+		 * @brief 64位整数对象，参见 Int64 对象。
+		 * 
+		 * 
+		 */
+		export class Int64 extends Class_Int64 {}
+		
+		
+		/**
+		 * 
+		 * @brief 控制台访问对象
+		 * 
+		 * 
+		 */
+		
+		export const console: typeof consoleNS
+		
+		/**
+		 * 
+		 * @brief 进程对象
+		 * 
+		 * 
+		 */
+		
+		export const process: typeof processNS
+		
+		
+		
+		/**
+		 * 
+		 * @brief 运行一个脚本
+		 * @param fname 指定要运行的脚本路径
+		 * @param argv 指定要运行的参数，此参数可在脚本内使用 argv 获取
+		 * 
+		 * 
+		 * 
+		 */
+		export function run(fname: string, argv?: any[]/** = v8::Array::New(isolate)*/): void;
+	
+		/**
+		 * 
+		 * @brief 加载一个模块并返回模块对象，更多信息参阅 @ref module
+		 * 
+		 * require 可用于加载基础模块，文件模块。
+		 * 
+		 * 基础模块是沙箱创建时初始化的模块，引用时只需传递相应的 id，比如 require("net")。
+		 * 
+		 * 文件模块是用户自定义模块，引用时需传递以 ./ 或 ../ 开头的相对路径。文件模块支持 .js, .jsc 和 .json 文件。
+		 * 
+		 * 文件模块也支持 package.json 格式，当模块为目录结构时，require 会先查询 package.json 中的 main，未发现则尝试加载路径下的 index.js, index.jsc 或 index.json。
+		 * 
+		 * 若引用路径不是 ./ 或 ../ 开头，并且非基础模块，require 从当前模块所在路径下的 node_modules 查找，并上级目录递归。
+		 * 
+		 * 基础流程如下:
+		 * 
+		 * ```dot
+		 * digraph{
+		 * node [fontname = "Helvetica,sans-Serif", fontsize = 10];
+		 * edge [fontname = "Helvetica,sans-Serif", fontsize = 10];
+		 * 
+		 * start [label="起始"];
+		 * resolve [label="path.resolve" shape="rect"];
+		 * search [label="从当前路径\n向上递归查找\nnode_modules" shape="rect"];
+		 * load [label="加载" shape="rect"];
+		 * end [label="返回" shape="doublecircle"];
+		 * 
+		 * is_native [label="内置模块?" shape="diamond"];
+		 * is_mod [label="模块?" shape="diamond"];
+		 * is_abs [label="绝对路径？" shape="diamond"];
+		 * has_file [label="原名存在？" shape="diamond"];
+		 * has_ext [label="增加 .js 存在？" shape="diamond"];
+		 * has_package [label="/package.json\n存在？" shape="diamond"];
+		 * has_main [label="main 存在？" shape="diamond"];
+		 * has_index [label="index.js 存在？" shape="diamond"];
+		 * 
+		 * start -> is_native;
+		 * is_native -> end [label="是"];
+		 * is_native -> is_mod [label="否"];
+		 * is_mod -> search [label="是"];
+		 * search -> has_file;
+		 * is_mod -> is_abs [label="否"];
+		 * is_abs -> has_file [label="是"];
+		 * is_abs -> resolve [label="否"];
+		 * resolve -> has_file;
+		 * has_file -> load [label="是"];
+		 * has_file -> has_ext [label="否"];
+		 * has_ext -> load [label="是"];
+		 * has_ext -> has_package [label="否"];
+		 * has_package -> has_main [label="是"];
+		 * has_package -> has_index [label="否"];
+		 * has_main -> load [label="是"];
+		 * has_main -> has_index [label="否"];
+		 * has_index -> load [label="是"];
+		 * has_index -> end [label="否"];
+		 * load -> end;
+		 * }
+		 * ```
+		 * 
+		 * @param id 指定要加载的模块名称
+		 * @return 返回加载模块的引出对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function require(id: string): any;
+	
+		/**
+		 * 
+		 * @brief 在指定的时间后调用函数
+		 * @param callback 指定回调函数
+		 * @param timeout 指定延时的时间，以毫秒为单位。超过 2^31 的话,立即执行。
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setTimeout(callback: Function, timeout?: number/** = 1*/, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearTimeout(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 每间隔指定的时间后调用函数
+		 * @param callback 指定回调函数
+		 * @param timeout 指定间隔的时间，以毫秒为单位。超过 2^31 的话,立即执行。
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setInterval(callback: Function, timeout: number, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearInterval(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 每间隔指定的时间后调用函数，这是个高精度定时器，会主动打断正在运行的 JavaScript 脚本执行定时器
+		 * 由于 setHrInterval 的定时器会中断正在运行的代码执行回调，因此不要在回调函数内修改可能影响其它模块的数据，或者在回调中调用任何标记为 async 的 api 函数，否则将会产生不可预知的结果。例如：
+		 * ```JavaScript
+		 * var timers = require('timers');
+		 * 
+		 * var cnt = 0;
+		 * timers.setHrInterval(() => {
+		 * cnt++;
+		 * }, 100);
+		 * 
+		 * while (cnt < 10);
+		 * 
+		 * console.error("===============================> done");
+		 * ```
+		 * 这段代码中，第 8 行的循环并不会因为 cnt 的改变而结束，因为 JavaScript 在优化代码时会认定在这个循环过程中 cnt 不会被改变。
+		 * @param callback 指定回调函数
+		 * @param timeout 指定间隔的时间，以毫秒为单位。超过 2^31 的话,立即执行。
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setHrInterval(callback: Function, timeout: number, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearHrInterval(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 下一个空闲时间立即执行回调函数
+		 * @param callback 指定回调函数
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setImmediate(callback: Function, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearImmediate(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 强制要求进行垃圾回收
+		 * 
+		 * 
+		 */
+		export function GC(): void;
+	
+		/**
+		 * 
+		 * @brief 进入交互模式，可以交互执行内部命令和代码，仅在启动 js 可以引用
+		 * 
+		 * 参数 cmd 格式如下：
+		 * ```JavaScript
+		 * [
+		 * {
+		 * cmd: ".test",
+		 * help: "this is a test",
+		 * exec: function(argv) {
+		 * console.log(argv);
+		 * }
+		 * },
+		 * {
+		 * cmd: ".test1",
+		 * help: "this is an other test",
+		 * exec: function(argv) {
+		 * console.log(argv);
+		 * }
+		 * }
+		 * ]
+		 * ```
+		 * @param cmds 补充命令
+		 * 
+		 * 
+		 * 
+		 */
+		export function repl(cmds?: any[]/** = v8::Array::New(isolate)*/): void;
+	
+		/**
+		 * 
+		 * @brief 进入交互模式，可以交互执行内部命令和代码，仅在启动 js 可以引用
+		 * 
+		 * 同一时刻只允许一个 Stream repl，新建一个 Stream repl 时，前一个 repl 将被关闭。
+		 * 
+		 * 参数 cmd 格式如下：
+		 * ```JavaScript
+		 * [
+		 * {
+		 * cmd: ".test",
+		 * help: "this is a test",
+		 * exec: function(argv) {
+		 * console.log(argv);
+		 * }
+		 * },
+		 * {
+		 * cmd: ".test1",
+		 * help: "this is an other test",
+		 * exec: function(argv) {
+		 * console.log(argv);
+		 * }
+		 * }
+		 * ]
+		 * ```
+		 * @param out 输入输出流对象，通常为网络连接
+		 * @param cmds 补充命令
+		 * 
+		 * 
+		 * 
+		 */
+		export function repl(out: Class_Stream, cmds?: any[]/** = v8::Array::New(isolate)*/): void;
+	
+	} /** end of `module global` */
+	export = global
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/gui.d.ts b/types/fibjs/declare/gui.d.ts
new file mode 100644
index 0000000000..60768a9d93
--- /dev/null
+++ b/types/fibjs/declare/gui.d.ts
@@ -0,0 +1,304 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief gui 模块
+	* @detail 使用方法：,```JavaScript,var gui = require('gui');,```
+	*/
+declare module "gui" {
+	
+
+	module gui {
+		
+		/**
+		 * 
+		 * @brief WebView ie 模拟版本，指定 ie7
+		 * 
+		 * 
+		 */
+		export const IE7 = 7000;
+		
+		/**
+		 * 
+		 * @brief WebView ie 模拟版本，指定 ie8
+		 * 
+		 * 
+		 */
+		export const IE8 = 8000;
+		
+		/**
+		 * 
+		 * @brief WebView ie 模拟版本，指定 ie9
+		 * 
+		 * 
+		 */
+		export const IE9 = 9000;
+		
+		/**
+		 * 
+		 * @brief WebView ie 模拟版本，指定 ie10
+		 * 
+		 * 
+		 */
+		export const IE10 = 10000;
+		
+		/**
+		 * 
+		 * @brief WebView ie 模拟版本，指定 ie11
+		 * 
+		 * 
+		 */
+		export const IE11 = 11000;
+		
+		/**
+		 * 
+		 * @brief WebView ie 模拟版本，指定 edge
+		 * 
+		 * 
+		 */
+		export const EDGE = 11001;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * 设置 WebView 内 ie 最高模拟版本，当系统 ie 版本低于此版本时，将模拟系统安装版本
+		 * @param ver 指定 ie 模拟版本
+		 * 
+		 * 
+		 * 
+		 */
+		export function setVersion(ver: number): void;
+	
+		/**
+		 * 
+		 * @brief 打开一个窗口并访问指定网址
+		 * 
+		 * 支持以下参数:
+		 * ```JavaScript
+		 * {
+		 * "left": 100, // 窗口左上角 x，缺省系统自动设定
+		 * "right": 100, // 窗口左上角 y，缺省系统自动设定
+		 * "width": 100, // 窗口宽度，缺省系统自动设定
+		 * "height": 100, // 窗口高度，缺省系统自动设定
+		 * "border": true, // 是否有边框，缺省有边框
+		 * "caption": true, // 是否有标题栏，缺省有标题栏
+		 * "resizable": true, // 是否可改变尺寸，缺省可以改变
+		 * "maximize": false, // 是否最大化显示，缺省不最大化
+		 * "visible": true, // 是否显示，缺省显示
+		 * "debug": true // 是否输出 WebView 内的错误和 console 信息，缺省显示
+		 * }
+		 * ```
+		 * 当设定 width 和 height，而未设定 left 或 right 时，窗口将自动居中
+		 * @param url 指定的网址，，可以使用 fs:path 访问本地文件系统
+		 * @param opt 打开窗口参数
+		 * @return 返回打开的窗口对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function open(url: string, opt?: object/** = v8::Object::New(isolate)*/): Class_WebView;
+	
+	} /** end of `module gui` */
+	export = gui
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/hash.d.ts b/types/fibjs/declare/hash.d.ts
new file mode 100644
index 0000000000..a51aa76e34
--- /dev/null
+++ b/types/fibjs/declare/hash.d.ts
@@ -0,0 +1,522 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 信息摘要计算模块，可用于计算信息摘要和摘要签名
+	* @detail 
+	*/
+declare module "hash" {
+	
+
+	module hash {
+		
+		/**
+		 * 
+		 * @brief MD2 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const MD2 = 1;
+		
+		/**
+		 * 
+		 * @brief MD4 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const MD4 = 2;
+		
+		/**
+		 * 
+		 * @brief MD5 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const MD5 = 3;
+		
+		/**
+		 * 
+		 * @brief SHA1 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const SHA1 = 4;
+		
+		/**
+		 * 
+		 * @brief SHA224 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const SHA224 = 5;
+		
+		/**
+		 * 
+		 * @brief SHA256 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const SHA256 = 6;
+		
+		/**
+		 * 
+		 * @brief SHA384 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const SHA384 = 7;
+		
+		/**
+		 * 
+		 * @brief SHA512 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const SHA512 = 8;
+		
+		/**
+		 * 
+		 * @brief RIPEMD160 信息摘要算法标识常量
+		 * 
+		 * 
+		 */
+		export const RIPEMD160 = 9;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 根据指定的算法标识创建一个信息摘要运算对象
+		 * @param algo 指定摘要运算算法
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function digest(algo: number, data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 根据指定的算法标识创建一个信息摘要运算对象
+		 * @param algo 指定摘要运算算法
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function digest(algo: number): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 MD2 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function md2(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 MD4 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function md4(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 MD5 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function md5(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA1 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function sha1(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA224 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function sha224(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA256 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function sha256(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA384 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function sha384(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA512 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function sha512(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 RIPEMD160 信息摘要运算对象
+		 * @param data 创建同时更新的二进制数据
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function ripemd160(data: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 根据指定的算法标识创建一个信息摘要签名运算对象
+		 * @param algo 指定摘要运算算法
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac(algo: number, key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 MD2 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_md2(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 MD4 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_md4(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 MD5 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_md5(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA1 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_sha1(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA224 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_sha224(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA256 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_sha256(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA384 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_sha384(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 SHA512 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_sha512(key: Class_Buffer): Class_Digest;
+	
+		/**
+		 * 
+		 * @brief 创建一个 RIPEMD160 信息摘要签名运算对象
+		 * @param key 二进制签名密钥
+		 * @return 返回构造的信息摘要对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function hmac_ripemd160(key: Class_Buffer): Class_Digest;
+	
+	} /** end of `module hash` */
+	export = hash
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/hex.d.ts b/types/fibjs/declare/hex.d.ts
new file mode 100644
index 0000000000..a8254c6de6
--- /dev/null
+++ b/types/fibjs/declare/hex.d.ts
@@ -0,0 +1,239 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief hex 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var hex = encoding.hex;,```,或者,```JavaScript,var hex = require('hex');,```
+	*/
+declare module "hex" {
+	
+
+	module hex {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 以 hex 方式编码数据
+		 * @param data 要编码的数据
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: Class_Buffer): string;
+	
+		/**
+		 * 
+		 * @brief 以 hex 方式解码字符串为二进制数据
+		 * @param data 要解码的字符串
+		 * @return 返回解码的二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(data: string): Class_Buffer;
+	
+	} /** end of `module hex` */
+	export = hex
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/http.d.ts b/types/fibjs/declare/http.d.ts
new file mode 100644
index 0000000000..000f4a6b79
--- /dev/null
+++ b/types/fibjs/declare/http.d.ts
@@ -0,0 +1,513 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 超文本传输协议模块，用以支持 http 协议处理，模块别名：https
+	* @detail 
+	*/
+declare module "http" {
+	
+
+	module http {
+		
+		
+		/**
+		 * 
+		 * @brief 返回标准的 HTTP 响应状态码的集合，以及各自的简短描述。
+		 * 
+		 * 
+		 */
+		export const STATUS_CODES: any[];
+		
+		/**
+		 * 
+		 * @brief 返回http客户端的 HttpCookie 对象列表
+		 * 
+		 * 
+		 */
+		export const cookies: any[];
+		
+		/**
+		 * 
+		 * @brief 查询和设置超时时间
+		 * 
+		 * 
+		 */
+		export const timeout: number;
+		
+		/**
+		 * 
+		 * @brief cookie功能开关，默认开启
+		 * 
+		 * 
+		 */
+		export const enableCookie: boolean;
+		
+		/**
+		 * 
+		 * @brief 自动redirect功能开关，默认开启
+		 * 
+		 * 
+		 */
+		export const autoRedirect: boolean;
+		
+		/**
+		 * 
+		 * @brief 查询和设置 body 最大尺寸，以 MB 为单位，缺省为 -1，不限制尺寸
+		 * 
+		 * 
+		 */
+		export const maxBodySize: number;
+		
+		/**
+		 * 
+		 * @brief 查询和设置 http 请求中的浏览器标识
+		 * 
+		 * 
+		 */
+		export const userAgent: string;
+		
+		/**
+		 * 
+		 * @brief 查询和设置 keep-alive 最大缓存连接数，缺省 128
+		 * 
+		 * 
+		 */
+		export const poolSize: number;
+		
+		/**
+		 * 
+		 * @brief 查询和设置 keep-alive 缓存连接超时时间，缺省 10000 ms
+		 * 
+		 * 
+		 */
+		export const poolTimeout: number;
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 请求对象，参见 HttpRequest
+		 * 
+		 * 
+		 */
+		export class Request extends Class_HttpRequest {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 响应对象，参见 HttpResponse
+		 * 
+		 * 
+		 */
+		export class Response extends Class_HttpResponse {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http cookie 对象，参见 HttpCookie
+		 * 
+		 * 
+		 */
+		export class Cookie extends Class_HttpCookie {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 服务器，参见 HttpServer
+		 * 
+		 * 
+		 */
+		export class Server extends Class_HttpServer {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 客户端，参见 HttpClient
+		 * 
+		 * 
+		 */
+		export class Client extends Class_HttpClient {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 https 服务器，参见 HttpsServer
+		 * 
+		 * 
+		 */
+		export class HttpsServer extends Class_HttpsServer {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 协议处理器对象，参见 HttpHandler
+		 * 
+		 * 
+		 */
+		export class Handler extends Class_HttpHandler {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 静态文件处理器，用以用静态文件响应 http 消息
+		 * 
+		 * fileHandler 支持 gzip 预压缩，当请求接受 gzip 编码，且相同路径下 filename.ext.gz 文件存在时，将直接返回此文件，
+		 * 从而避免重复压缩带来服务器负载。
+		 * @param root 文件根路径
+		 * @param mimes 扩展 mime 设置
+		 * @param autoIndex 是否支持浏览目录文件，缺省为 false，不支持
+		 * @return 返回一个静态文件处理器用于处理 http 消息
+		 * 
+		 * 
+		 * 
+		 */
+		export function fileHandler(root: string, mimes?: object/** = v8::Object::New(isolate)*/, autoIndex?: boolean/** = false*/): Class_Handler;
+	
+		/**
+		 * 
+		 * @brief 发送 http 请求到指定的流对象，并返回结果
+		 * @param conn 指定处理请求的流对象
+		 * @param req 要发送的 HttpRequest 对象
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function request(conn: Class_Stream, req: Class_HttpRequest): Class_HttpResponse;
+	
+		/**
+		 * 
+		 * @brief 请求指定的 url，并返回结果
+		 * opts 包含请求的附加选项，支持的内容如下：
+		 * ```JavaScript
+		 * {
+		 * "query": {},
+		 * "body": SeekedStream | Buffer | String | {},
+		 * "json": {},
+		 * "headers": {}
+		 * }
+		 * ```
+		 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+		 * @param method 指定 http 请求方法：GET, POST 等
+		 * @param url 指定 url，必须是包含主机的完整 url
+		 * @param opts 指定附加信息
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function request(method: string, url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+	
+		/**
+		 * 
+		 * @brief 用 GET 方法请求指定的 url，并返回结果，等同于 request("GET", ...)
+		 * opts 包含请求的附加选项，支持的内容如下：
+		 * ```JavaScript
+		 * {
+		 * "query": {},
+		 * "body": SeekedStream | Buffer | String | {},
+		 * "json": {},
+		 * "headers": {}
+		 * }
+		 * ```
+		 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+		 * @param url 指定 url，必须是包含主机的完整 url
+		 * @param opts 指定附加信息
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function get(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+	
+		/**
+		 * 
+		 * @brief 用 POST 方法请求指定的 url，并返回结果，等同于 request("POST", ...)
+		 * opts 包含请求的附加选项，支持的内容如下：
+		 * ```JavaScript
+		 * {
+		 * "query": {},
+		 * "body": SeekedStream | Buffer | String | {},
+		 * "json": {},
+		 * "headers": {}
+		 * }
+		 * ```
+		 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+		 * @param url 指定 url，必须是包含主机的完整 url
+		 * @param opts 指定附加信息
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function post(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+	
+		/**
+		 * 
+		 * @brief 用 DELETE 方法请求指定的 url，并返回结果，等同于 request("DELETE", ...)
+		 * opts 包含请求的附加选项，支持的内容如下：
+		 * ```JavaScript
+		 * {
+		 * "query": {},
+		 * "body": SeekedStream | Buffer | String | {},
+		 * "json": {},
+		 * "headers": {}
+		 * }
+		 * ```
+		 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+		 * @param url 指定 url，必须是包含主机的完整 url
+		 * @param opts 指定附加信息
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function del(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+	
+		/**
+		 * 
+		 * @brief 用 PUT 方法请求指定的 url，并返回结果，等同于 request("PUT", ...)
+		 * opts 包含请求的附加选项，支持的内容如下：
+		 * ```JavaScript
+		 * {
+		 * "query": {},
+		 * "body": SeekedStream | Buffer | String | {},
+		 * "json": {},
+		 * "headers": {}
+		 * }
+		 * ```
+		 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+		 * @param url 指定 url，必须是包含主机的完整 url
+		 * @param opts 指定附加信息
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function put(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+	
+		/**
+		 * 
+		 * @brief 用 PATCH 方法请求指定的 url，并返回结果，等同于 request("PATCH", ...)
+		 * opts 包含请求的附加选项，支持的内容如下：
+		 * ```JavaScript
+		 * {
+		 * "query": {},
+		 * "body": SeekedStream | Buffer | String | {},
+		 * "json": {},
+		 * "headers": {}
+		 * }
+		 * ```
+		 * 其中 body，json 不得同时出现。缺省为 {}，不包含任何附加信息
+		 * @param url 指定 url，必须是包含主机的完整 url
+		 * @param opts 指定附加信息
+		 * @return 返回服务器响应
+		 * 
+		 * 
+		 * @async
+		 */
+		export function patch(url: string, opts?: object/** = v8::Object::New(isolate)*/): Class_HttpResponse;
+	
+	} /** end of `module http` */
+	export = http
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/iconv.d.ts b/types/fibjs/declare/iconv.d.ts
new file mode 100644
index 0000000000..443ae25e21
--- /dev/null
+++ b/types/fibjs/declare/iconv.d.ts
@@ -0,0 +1,252 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief iconv 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var iconv = encoding.iconv;,```,或者,```JavaScript,var iconv = require('iconv');,```
+	*/
+declare module "iconv" {
+	
+
+	module iconv {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 用 iconv 将文本转换为二进制数据
+		 * @param charset 指定字符集
+		 * @param data 要转换的文本
+		 * @return 返回解码的二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(charset: string, data: string): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 用 iconv 将 Buffer 内容转换为文本
+		 * @param charset 指定字符集
+		 * @param data 要转换的二进制数据
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(charset: string, data: Class_Buffer): string;
+	
+		/**
+		 * 
+		 * @brief 检测字符集是否被支持
+		 * @param charset 指定字符集
+		 * @return 返回是否支持该字符集
+		 * 
+		 * 
+		 * 
+		 */
+		export function isEncoding(charset: string): boolean;
+	
+	} /** end of `module iconv` */
+	export = iconv
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/index.d.ts b/types/fibjs/declare/index.d.ts
new file mode 100644
index 0000000000..df0e02e683
--- /dev/null
+++ b/types/fibjs/declare/index.d.ts
@@ -0,0 +1,101 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+/// <reference path="console.d.ts" />
+/// <reference path="coroutine.d.ts" />
+/// <reference path="global.d.ts" />
+/// <reference path="gui.d.ts" />
+/// <reference path="os.d.ts" />
+/// <reference path="process.d.ts" />
+/// <reference path="registry.d.ts" />
+/// <reference path="timers.d.ts" />
+/// <reference path="tty.d.ts" />
+/// <reference path="fs.d.ts" />
+/// <reference path="io.d.ts" />
+/// <reference path="path.d.ts" />
+/// <reference path="path_posix.d.ts" />
+/// <reference path="path_win32.d.ts" />
+/// <reference path="dgram.d.ts" />
+/// <reference path="dns.d.ts" />
+/// <reference path="http.d.ts" />
+/// <reference path="mq.d.ts" />
+/// <reference path="net.d.ts" />
+/// <reference path="punycode.d.ts" />
+/// <reference path="querystring.d.ts" />
+/// <reference path="ssl.d.ts" />
+/// <reference path="url.d.ts" />
+/// <reference path="ws.d.ts" />
+/// <reference path="zmq.d.ts" />
+/// <reference path="base32.d.ts" />
+/// <reference path="base64.d.ts" />
+/// <reference path="base64vlq.d.ts" />
+/// <reference path="bson.d.ts" />
+/// <reference path="encoding.d.ts" />
+/// <reference path="hex.d.ts" />
+/// <reference path="iconv.d.ts" />
+/// <reference path="json.d.ts" />
+/// <reference path="string_decoder.d.ts" />
+/// <reference path="crypto.d.ts" />
+/// <reference path="hash.d.ts" />
+/// <reference path="zip.d.ts" />
+/// <reference path="zlib.d.ts" />
+/// <reference path="assert.d.ts" />
+/// <reference path="profiler.d.ts" />
+/// <reference path="test.d.ts" />
+/// <reference path="db.d.ts" />
+/// <reference path="gd.d.ts" />
+/// <reference path="util.d.ts" />
+/// <reference path="uuid.d.ts" />
+/// <reference path="vm.d.ts" />
+/// <reference path="xml.d.ts" />
+/// <reference path="constants.d.ts" />
+
+import _Global from 'global';
+import _Process from 'process';
+
+type GlobalExportsType = any;
+interface ModuleType {
+	exports: GlobalExportsType;
+}
+
+declare global {
+	var exports: GlobalExportsType;
+	const module: ModuleType;
+
+	const Buffer: typeof _Global.Buffer
+	const Int64: typeof _Global.Int64
+	/** const console: console; */
+	const process: typeof _Global.process
+	const Master: typeof _Global.Master
+	const global: typeof _Global.global
+	/** const run: null; */
+	const require: typeof _Global.require
+	const argv: typeof _Global.argv
+	const __filename: typeof _Global.__filename
+	const __dirname: typeof _Global.__dirname
+	/** const setTimeout: Timer; */
+	/** const clearTimeout: null; */
+	/** const setInterval: Timer; */
+	/** const clearInterval: null; */
+	const setHrInterval: typeof _Global.setHrInterval
+	const clearHrInterval: typeof _Global.clearHrInterval
+	/** const setImmediate: Timer; */
+	/** const clearImmediate: null; */
+	const GC: typeof _Global.GC
+	const repl: typeof _Global.repl
+} /** end of `declare global` */
+
+
diff --git a/types/fibjs/declare/io.d.ts b/types/fibjs/declare/io.d.ts
new file mode 100644
index 0000000000..ff9f884f28
--- /dev/null
+++ b/types/fibjs/declare/io.d.ts
@@ -0,0 +1,259 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 输入输出处理模块
+	* @detail 使用方法：,```JavaScript,var io = require('io');,```
+	*/
+declare module "io" {
+	
+
+	module io {
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个内存流对象，参见 MemoryStream
+		 * 
+		 * 
+		 */
+		export class MemoryStream extends Class_MemoryStream {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个缓存流读取对象，参见 BufferedStream
+		 * 
+		 * 
+		 */
+		export class BufferedStream extends Class_BufferedStream {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 复制流数据到目标流中
+		 * @param from 源流对象
+		 * @param to 目标流对象
+		 * @param bytes 复制的字节数
+		 * @return 返回复制的字节数
+		 * 
+		 * 
+		 * @async
+		 */
+		export function copyStream(from: Class_Stream, to: Class_Stream, bytes?: number/** = -1*/): number;
+	
+		/**
+		 * 
+		 * @brief 双向复制流数据，直到流中无数据，或者流被关闭
+		 * @param stm1 流对象一
+		 * @param stm2 流对象二
+		 * 
+		 * 
+		 * @async
+		 */
+		export function bridge(stm1: Class_Stream, stm2: Class_Stream): void;
+	
+	} /** end of `module io` */
+	export = io
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/json.d.ts b/types/fibjs/declare/json.d.ts
new file mode 100644
index 0000000000..f90b2d9a4b
--- /dev/null
+++ b/types/fibjs/declare/json.d.ts
@@ -0,0 +1,239 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief json 编码与解码模块
+	* @detail 引用方式：,```JavaScript,var encoding = require('encoding');,var json = encoding.json;,```,或者,```JavaScript,var json = require('json');,```
+	*/
+declare module "json" {
+	
+
+	module json {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 以 json 格式编码变量
+		 * @param data 要编码的变量
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(data: any): string;
+	
+		/**
+		 * 
+		 * @brief 以 json 方式解码字符串为一个变量
+		 * @param data 要解码的字符串
+		 * @return 返回解码的变量
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(data: string): any;
+	
+	} /** end of `module json` */
+	export = json
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/mq.d.ts b/types/fibjs/declare/mq.d.ts
new file mode 100644
index 0000000000..4f2af5d198
--- /dev/null
+++ b/types/fibjs/declare/mq.d.ts
@@ -0,0 +1,307 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 消息队列模块
+	* @detail 
+	*/
+declare module "mq" {
+	
+
+	module mq {
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个消息对象，参见 Message
+		 * 
+		 * 
+		 */
+		export class Message extends Class_Message {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 http 协议处理器对象，参见 HttpHandler
+		 * 
+		 * 
+		 */
+		export class HttpHandler extends Class_HttpHandler {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个消息处理器对象，传递值内置处理器则直接返回
+		 * 
+		 * hdlr 接受内置消息处理器，处理函数，链式处理数组，路由对象：
+		 * - Function javascript 函数，将使用此函数进行处理
+		 * - Handler 内置处理器，将使用此处理器进行处理
+		 * - 链式处理数组，等同于返回 new mq.Chain(hdlr)，参见 Chain
+		 * - 路由对象，等同于返回 new mq.Routing(hdlr)，参见 Routing
+		 * 
+		 * 消息处理函数语法如下：
+		 * ```JavaScript
+		 * function func(v){
+		 * }
+		 * ```
+		 * 参数 v 为正在处理的消息，返回结果允许有四种:
+		 * - Function javascript 函数，将使用此函数进行下一阶段处理
+		 * - Handler 内置处理器，将使用此处理器进行下一阶段处理
+		 * - 链式处理数组，等同于 new mq.Chain(v)，参见 Chain
+		 * - 路由对象，等同于 new mq.Routing(v)，参见 Routing
+		 * 
+		 * 无返回或者其他的返回结果将结束消息处理。
+		 * @param hdlr 内置消息处理器，处理函数，链式处理数组，路由对象
+		 * @return 返回封装了处理函数的处理器
+		 * 
+		 * 
+		 * 
+		 */
+		export class Handler extends Class_Handler {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个消息处理器链处理对象，参见 Chain
+		 * 
+		 * 
+		 */
+		export class Chain extends Class_Chain {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个消息处理器路由对象，参见 Routing
+		 * 
+		 * 
+		 */
+		export class Routing extends Class_Routing {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个空处理器对象，次处理对象不做任何处理直接返回
+		 * @return 返回空处理函数
+		 * 
+		 * 
+		 * 
+		 */
+		export function nullHandler(): Class_Handler;
+	
+		/**
+		 * 
+		 * @brief 使用给定的处理器处理一个消息或对象
+		 * 
+		 * 不同于处理器的 invoke 方法，此方法将循环调用每个处理器的返回处理器，直到处理器返回 null 为止。
+		 * @param hdlr 指定使用的处理器
+		 * @param v 指定要处理的消息或对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function invoke(hdlr: Class_Handler, v: Class__object): void;
+	
+	} /** end of `module mq` */
+	export = mq
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/net.d.ts b/types/fibjs/declare/net.d.ts
new file mode 100644
index 0000000000..8c2bf58055
--- /dev/null
+++ b/types/fibjs/declare/net.d.ts
@@ -0,0 +1,396 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 网络访问模块
+	* @detail 基础模块。可用于创建和操作网络资源，引用方式：,```JavaScript,var net = require('net');,```
+	*/
+declare module "net" {
+	
+
+	module net {
+		
+		/**
+		 * 
+		 * @brief 地址集常量，指定 ipv4
+		 * 
+		 * 
+		 */
+		export const AF_INET = 2;
+		
+		/**
+		 * 
+		 * @brief 地址集常量，指定 ipv6
+		 * 
+		 * 
+		 */
+		export const AF_INET6 = 10;
+		
+		/**
+		 * 
+		 * @brief 协议族常量，指定 tcp
+		 * 
+		 * 
+		 */
+		export const SOCK_STREAM = 1;
+		
+		/**
+		 * 
+		 * @brief 协议族常量，指定 udp
+		 * 
+		 * 
+		 */
+		export const SOCK_DGRAM = 2;
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 Socket 对象，参见 Socket
+		 * 
+		 * 
+		 */
+		export class Socket extends Class_Socket {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 Smtp 对象，参见 Smtp
+		 * 
+		 * 
+		 */
+		export class Smtp extends Class_Smtp {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 TcpServer 对象，参见 TcpServer
+		 * 
+		 * 
+		 */
+		export class TcpServer extends Class_TcpServer {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 UrlObject 对象，参见 UrlObject
+		 * 
+		 * 
+		 */
+		export class Url extends Class_UrlObject {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 查询当前运行环境网络信息
+		 * @return 返回网卡信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function info(): object;
+	
+		/**
+		 * 
+		 * @brief 查询给定的主机名的地址
+		 * @param name 指定主机名
+		 * @param family 指定查询返回类型，缺省为 AF_INET
+		 * @return 返回查询的 ip 字符串
+		 * 
+		 * 
+		 * @async
+		 */
+		export function resolve(name: string, family?: number/** = undefined*/): string;
+	
+		/**
+		 * 
+		 * @brief 快速查询的主机地址，等效与 resolve(name)
+		 * @param name 指定主机名
+		 * @return 返回查询的 ip 字符串
+		 * 
+		 * 
+		 * @async
+		 */
+		export function ip(name: string): string;
+	
+		/**
+		 * 
+		 * @brief 快速查询的主机 ipv6 地址，等效与 resolve(name, net.AF_INET6)
+		 * @param name 指定主机名
+		 * @return 返回查询的 ipv6 字符串
+		 * 
+		 * 
+		 * @async
+		 */
+		export function ipv6(name: string): string;
+	
+		/**
+		 * 
+		 * @brief 创建一个 Socket 或 SslSocket 对象并建立连接
+		 * @param url 指定连接的协议，可以是：tcp://host:port 或者 ssl://host:port
+		 * @param timeout 指定超时时间，单位是毫秒，默认为0
+		 * @return 返回连接成功的 Socket 或者 SslSocket 对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function connect(url: string, timeout?: number/** = 0*/): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 创建一个 Smtp 对象并建立连接，参见 Smtp
+		 * @param url 指定连接的协议，可以是：tcp://host:port 或者 ssl://host:port
+		 * @param timeout 指定超时时间，单位是毫秒，默认为0
+		 * @return 返回连接成功的 Smtp 对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openSmtp(url: string, timeout?: number/** = 0*/): Class_Smtp;
+	
+		/**
+		 * 
+		 * @brief 查询当前系统异步网络引擎
+		 * @return 返回网络引擎名称
+		 * 
+		 * 
+		 * 
+		 */
+		export function backend(): string;
+	
+		/**
+		 * 
+		 * @brief 检测输入是否是 IP 地址
+		 * @param ip 指定要检测的字符串
+		 * @return 非合法的 IP 地址，返回 0, 如果是 IPv4 则返回 4，如果是 IPv6 则返回 6
+		 * 
+		 * 
+		 * 
+		 */
+		export function isIP(ip?: string/** = ""*/): number;
+	
+		/**
+		 * 
+		 * @brief 检测输入是否是 IPv4 地址
+		 * @param ip 指定要检测的字符串
+		 * @return 如果是 IPv4 则返回 true.否则返回 false
+		 * 
+		 * 
+		 * 
+		 */
+		export function isIPv4(ip?: string/** = ""*/): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测输入是否是 IPv6 地址
+		 * @param ip 指定要检测的字符串
+		 * @return 如果是 IPv6 则返回 true.否则返回 false
+		 * 
+		 * 
+		 * 
+		 */
+		export function isIPv6(ip?: string/** = ""*/): boolean;
+	
+	} /** end of `module net` */
+	export = net
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/object.d.ts b/types/fibjs/declare/object.d.ts
new file mode 100644
index 0000000000..6c1b2019e0
--- /dev/null
+++ b/types/fibjs/declare/object.d.ts
@@ -0,0 +1,54 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 基础对象，所有对象均继承于此
+	* @detail 
+	*/
+
+declare class Class__object  {
+	
+	
+	
+	/**
+	 * 
+	 * @brief 返回对象的字符串表示，一般返回 "[Native Object]"，对象可以根据自己的特性重新实现
+	 * @return 返回对象的字符串表示
+	 * 
+	 * 
+	 * 
+	 */
+	toString(): string;
+
+	/**
+	 * 
+	 * @brief 返回对象的 JSON 格式表示，一般返回对象定义的可读属性集合
+	 * @param key 未使用
+	 * @return 返回包含可 JSON 序列化的值
+	 * 
+	 * 
+	 * 
+	 */
+	toJSON(key?: string/** = ""*/): any;
+
+} /** endof class */
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/os.d.ts b/types/fibjs/declare/os.d.ts
new file mode 100644
index 0000000000..977fc4c6ce
--- /dev/null
+++ b/types/fibjs/declare/os.d.ts
@@ -0,0 +1,481 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 操作系统与文件系统处理模块
+	* @detail 使用方法：,```JavaScript,var os = require('os');,```
+	*/
+declare module "os" {
+	
+
+	module os {
+		
+		
+		/**
+		 * 
+		 * @brief 查询运行环境当前时区
+		 * 
+		 * 
+		 */
+		export const timezone: number;
+		
+		/**
+		 * 
+		 * @brief 查询当前运行环境行结尾标识，posix:\"\\n\"；windows:\"\\r\\n\"
+		 * 
+		 * 
+		 */
+		export const EOL: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前运行执行文件完整路径
+		 * 
+		 * 
+		 */
+		export const execPath: string;
+		
+		
+		/**
+		 * 
+		 * @brief Service 构造函数，参见 Service
+		 * 
+		 * 
+		 */
+		export class Service extends Class_Service {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 查询当前运行环境主机名
+		 * @return 返回主机名
+		 * 
+		 * 
+		 * 
+		 */
+		export function hostname(): string;
+	
+		/**
+		 * 
+		 * @brief 查询当前 CPU 的字节顺序
+		 * @return 返回字节顺序
+		 * 
+		 * 
+		 * 
+		 */
+		export function endianness(): string;
+	
+		/**
+		 * 
+		 * @brief 查询当前运行环境操作系统名称
+		 * @return 返回系统名称
+		 * 
+		 * 
+		 * 
+		 */
+		export function type(): string;
+	
+		/**
+		 * 
+		 * @brief 查询当前运行环境操作系统版本
+		 * @return 返回版本信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function release(): string;
+	
+		/**
+		 * 
+		 * @brief 查询当前用户目录
+		 * @return 返回目录字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function homedir(): string;
+	
+		/**
+		 * 
+		 * @brief 查询当前 cpu 环境
+		 * @return 返回 cpu 类型，可能的结果为 'amd64', 'arm', 'arm64', 'ia32'
+		 * 
+		 * 
+		 * 
+		 */
+		export function arch(): string;
+	
+		/**
+		 * 
+		 * @brief 查询运行环境运行时间，以秒为单位
+		 * @return 返回表示时间的数值
+		 * 
+		 * 
+		 * 
+		 */
+		export function uptime(): number;
+	
+		/**
+		 * 
+		 * @brief 查询运行环境 1分钟，5分钟，15分钟平均负载
+		 * @return 返回包含三个负载数据的数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadavg(): any[];
+	
+		/**
+		 * 
+		 * @brief 查询运行环境总内存，以字节为单位
+		 * @return 返回内存数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function totalmem(): number;
+	
+		/**
+		 * 
+		 * @brief 查询运行环境可用内存，以字节为单位
+		 * @return 返回内存数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function freemem(): number;
+	
+		/**
+		 * 
+		 * @brief 查询当前运行环境 cpu 个数和参数
+		 * @return 返回包含 cpu 参数的数组，每一项对应一个 cpu
+		 * 
+		 * 
+		 * 
+		 */
+		export function cpus(): any[];
+	
+		/**
+		 * 
+		 * @brief 查询当前运行环境 cpu 个数
+		 * @return 返回 cpu 个数
+		 * 
+		 * 
+		 * 
+		 */
+		export function cpuNumbers(): number;
+	
+		/**
+		 * 
+		 * @brief 查询当前运行环境临时文件目录
+		 * @return 返回临时文件目录
+		 * 
+		 * 
+		 * 
+		 */
+		export function tmpdir(): string;
+	
+		/**
+		 * 
+		 * @brief 返回当前有效执行用户信息
+		 * @param options 用于解释结果字符串的字符编码
+		 * @return 当前有效执行用户信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function userInfo(options?: object/** = v8::Object::New(isolate)*/): object;
+	
+		/**
+		 * 
+		 * @brief 查询当前运行环境网络信息
+		 * @return 返回网卡信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function networkInterfaces(): object;
+	
+		/**
+		 * 
+		 * @brief 查询当前主机的打印机信息
+		 * @return 返回打印机信息
+		 * 
+		 * 
+		 * 
+		 */
+		export function printerInfo(): any[];
+	
+		/**
+		 * 
+		 * @brief 创建一个打印机输出对象
+		 * @param name 打印机名称
+		 * @return 返回打印机输出对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function openPrinter(name: string): Class_BufferedStream;
+	
+		/**
+		 * 
+		 * @brief 查询当前平台名称
+		 * @return 返回平台名称，可能的结果为 'darwin', 'freebsd', 'linux', 或 'win32'
+		 * 
+		 * 
+		 * 
+		 */
+		export function platform(): string;
+	
+		/**
+		 * 
+		 * @brief 解析时间字符串或查询运行环境当前时间
+		 * @param tmString 时间字符串，缺省则查询当前时间
+		 * @return 返回 javascript Date 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function time(tmString?: string/** = ""*/): Date;
+	
+		/**
+		 * 
+		 * @brief 时间计算函数，根据 part 指定计算时间
+		 * @param d 指定用于计算 Date 对象
+		 * @param num 指定运算的数值
+		 * @param part 指定运算的时间部位，接收值为："year", "month", "day", "hour", "minute", "second"
+		 * @return 返回 javascript Date 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function dateAdd(d: Date, num: number, part: string): Date;
+	
+		/**
+		 * 
+		 * @brief 查询当前进程内存使用报告
+		 * 
+		 * 内存报告生成类似以下结果：
+		 * ```JavaScript
+		 * {
+		 * "rss": 8622080,
+		 * "heapTotal": 4083456,
+		 * "heapUsed": 1621800,
+		 * "nativeObjects": 122
+		 * }
+		 * ```
+		 * 其中：
+		 * - rss 返回进程当前占用物理内存大小
+		 * - heapTotal 返回 v8 引擎堆内存大小
+		 * - heapUsed 返回 v8 引擎正在使用堆内存大小
+		 * - nativeObjects 返回当前有效内置对象数
+		 * @return 返回包含内存报告
+		 * 
+		 * 
+		 * 
+		 */
+		export function memoryUsage(): object;
+	
+	} /** end of `module os` */
+	export = os
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/path.d.ts b/types/fibjs/declare/path.d.ts
new file mode 100644
index 0000000000..9b6ae9cfec
--- /dev/null
+++ b/types/fibjs/declare/path.d.ts
@@ -0,0 +1,375 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 文件路径处理模块
+	* @detail 引用方法：,```JavaScript,var path = require('path');,```
+	*/
+declare module "path" {
+	
+
+	module path {
+		
+		
+		/**
+		 * 
+		 * @brief 查询当前操作系统的路径分割字符，posix 返回 '/', windows 返回  '\\'
+		 * 
+		 * 
+		 * 
+		 */
+		export const sep: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前操作系统的多路径组合字符，posix 返回 ':', windows 返回  ';'
+		 * 
+		 * 
+		 * 
+		 */
+		export const delimiter: string;
+		
+		/**
+		 * 
+		 * @brief posix 实现，参见 path_posix
+		 * 
+		 * 
+		 * 
+		 */
+		export const posix: Object;
+		
+		/**
+		 * 
+		 * @brief windows 实现，参见 path_win32
+		 * 
+		 * 
+		 * 
+		 */
+		export const win32: Object;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 标准化路径，处理路径中父目录等信息
+		 * 
+		 * @param path 给定的未处理的路径
+		 * @return 返回经过处理的路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function normalize(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的文件名称，若指定扩展名，则自动取消匹配的扩展名
+		 * 
+		 * @param path 给定查询的路径
+		 * @param ext 指定扩展名，若文件名中有符合条件的扩展名，将自动取消
+		 * @return 返回文件名称
+		 * 
+		 * 
+		 * 
+		 */
+		export function basename(path: string, ext?: string/** = ""*/): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的文件扩展名
+		 * 
+		 * @param path 给定查询的路径
+		 * @return 返回得到的扩展名
+		 * 
+		 * 
+		 * 
+		 */
+		export function extname(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的目录路径
+		 * 
+		 * @param path 给定查询的路径
+		 * @return 返回得到的目录的路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function dirname(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换给定路径为全路径
+		 * 
+		 * @param path 给定转换的路径
+		 * @return 返回转换的全路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function fullpath(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 识别给定的路径是否是绝对路径
+		 * 
+		 * @param path 给定需要识别的路径
+		 * @return 是绝对路径则返回 true
+		 * 
+		 * 
+		 * 
+		 */
+		export function isAbsolute(path: string): boolean;
+	
+		/**
+		 * 
+		 * @brief 合并一系列路径成为一个单一路径
+		 * 
+		 * @param ps 一个或多个相关的路径
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function join(...ps: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 合并一系列路径成为一个绝对路径
+		 * 
+		 * @param ps 一个或多个相关的路径
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function resolve(...ps: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 求 _from 到 to 的相对路径
+		 * 
+		 * @param _from 源路径
+		 * @param to 目标路径
+		 * @return 返回得到的相对路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function relative(_from: string, to: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换成 namespace-prefixed 路径。只在 windows 有效，其他系统直接返回。
+		 * see: https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+		 * @param path 给定的路径。
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function toNamespacedPath(path?: any/** = v8::Undefined(isolate)*/): any;
+	
+	} /** end of `module path` */
+	export = path
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/path_posix.d.ts b/types/fibjs/declare/path_posix.d.ts
new file mode 100644
index 0000000000..bfeea21068
--- /dev/null
+++ b/types/fibjs/declare/path_posix.d.ts
@@ -0,0 +1,375 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 文件路径处理模块
+	* @detail 引用方法：,```JavaScript,var path = require('path').posix;,```
+	*/
+declare module "path_posix" {
+	
+
+	module path_posix {
+		
+		
+		/**
+		 * 
+		 * @brief 查询当前操作系统的路径分割字符，posix 返回 '/', windows 返回  '\\'
+		 * 
+		 * 
+		 * 
+		 */
+		export const sep: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前操作系统的多路径组合字符，posix 返回 ':', windows 返回  ';'
+		 * 
+		 * 
+		 * 
+		 */
+		export const delimiter: string;
+		
+		/**
+		 * 
+		 * @brief posix 实现，参见 path_posix
+		 * 
+		 * 
+		 * 
+		 */
+		export const posix: Object;
+		
+		/**
+		 * 
+		 * @brief windows 实现，参见 path_win32
+		 * 
+		 * 
+		 * 
+		 */
+		export const win32: Object;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 标准化路径，处理路径中父目录等信息
+		 * 
+		 * @param path 给定的未处理的路径
+		 * @return 返回经过处理的路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function normalize(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的文件名称，若指定扩展名，则自动取消匹配的扩展名
+		 * 
+		 * @param path 给定查询的路径
+		 * @param ext 指定扩展名，若文件名中有符合条件的扩展名，将自动取消
+		 * @return 返回文件名称
+		 * 
+		 * 
+		 * 
+		 */
+		export function basename(path: string, ext?: string/** = ""*/): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的文件扩展名
+		 * 
+		 * @param path 给定查询的路径
+		 * @return 返回得到的扩展名
+		 * 
+		 * 
+		 * 
+		 */
+		export function extname(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的目录路径
+		 * 
+		 * @param path 给定查询的路径
+		 * @return 返回得到的目录的路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function dirname(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换给定路径为全路径
+		 * 
+		 * @param path 给定转换的路径
+		 * @return 返回转换的全路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function fullpath(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 识别给定的路径是否是绝对路径
+		 * 
+		 * @param path 给定需要识别的路径
+		 * @return 是绝对路径则返回 true
+		 * 
+		 * 
+		 * 
+		 */
+		export function isAbsolute(path: string): boolean;
+	
+		/**
+		 * 
+		 * @brief 合并一系列路径成为一个单一路径
+		 * 
+		 * @param ps 一个或多个相关的路径
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function join(...ps: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 合并一系列路径成为一个绝对路径
+		 * 
+		 * @param ps 一个或多个相关的路径
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function resolve(...ps: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 求 _from 到 to 的相对路径
+		 * 
+		 * @param _from 源路径
+		 * @param to 目标路径
+		 * @return 返回得到的相对路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function relative(_from: string, to: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换成 namespace-prefixed 路径。只在 windows 有效，其他系统直接返回。
+		 * see: https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+		 * @param path 给定的路径。
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function toNamespacedPath(path?: any/** = v8::Undefined(isolate)*/): any;
+	
+	} /** end of `module path_posix` */
+	export = path_posix
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/path_win32.d.ts b/types/fibjs/declare/path_win32.d.ts
new file mode 100644
index 0000000000..25ce64db09
--- /dev/null
+++ b/types/fibjs/declare/path_win32.d.ts
@@ -0,0 +1,375 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 文件路径处理模块
+	* @detail 引用方法：,```JavaScript,var path = require('path').win32;,```
+	*/
+declare module "path_win32" {
+	
+
+	module path_win32 {
+		
+		
+		/**
+		 * 
+		 * @brief 查询当前操作系统的路径分割字符，posix 返回 '/', windows 返回  '\\'
+		 * 
+		 * 
+		 * 
+		 */
+		export const sep: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前操作系统的多路径组合字符，posix 返回 ':', windows 返回  ';'
+		 * 
+		 * 
+		 * 
+		 */
+		export const delimiter: string;
+		
+		/**
+		 * 
+		 * @brief posix 实现，参见 path_posix
+		 * 
+		 * 
+		 * 
+		 */
+		export const posix: Object;
+		
+		/**
+		 * 
+		 * @brief windows 实现，参见 path_win32
+		 * 
+		 * 
+		 * 
+		 */
+		export const win32: Object;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 标准化路径，处理路径中父目录等信息
+		 * 
+		 * @param path 给定的未处理的路径
+		 * @return 返回经过处理的路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function normalize(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的文件名称，若指定扩展名，则自动取消匹配的扩展名
+		 * 
+		 * @param path 给定查询的路径
+		 * @param ext 指定扩展名，若文件名中有符合条件的扩展名，将自动取消
+		 * @return 返回文件名称
+		 * 
+		 * 
+		 * 
+		 */
+		export function basename(path: string, ext?: string/** = ""*/): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的文件扩展名
+		 * 
+		 * @param path 给定查询的路径
+		 * @return 返回得到的扩展名
+		 * 
+		 * 
+		 * 
+		 */
+		export function extname(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 查询路径中的目录路径
+		 * 
+		 * @param path 给定查询的路径
+		 * @return 返回得到的目录的路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function dirname(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换给定路径为全路径
+		 * 
+		 * @param path 给定转换的路径
+		 * @return 返回转换的全路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function fullpath(path: string): string;
+	
+		/**
+		 * 
+		 * @brief 识别给定的路径是否是绝对路径
+		 * 
+		 * @param path 给定需要识别的路径
+		 * @return 是绝对路径则返回 true
+		 * 
+		 * 
+		 * 
+		 */
+		export function isAbsolute(path: string): boolean;
+	
+		/**
+		 * 
+		 * @brief 合并一系列路径成为一个单一路径
+		 * 
+		 * @param ps 一个或多个相关的路径
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function join(...ps: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 合并一系列路径成为一个绝对路径
+		 * 
+		 * @param ps 一个或多个相关的路径
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function resolve(...ps: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 求 _from 到 to 的相对路径
+		 * 
+		 * @param _from 源路径
+		 * @param to 目标路径
+		 * @return 返回得到的相对路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function relative(_from: string, to: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换成 namespace-prefixed 路径。只在 windows 有效，其他系统直接返回。
+		 * see: https://msdn.microsoft.com/library/windows/desktop/aa365247(v=vs.85).aspx#namespaces
+		 * @param path 给定的路径。
+		 * @return 返回得到的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function toNamespacedPath(path?: any/** = v8::Undefined(isolate)*/): any;
+	
+	} /** end of `module path_win32` */
+	export = path_win32
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/process.d.ts b/types/fibjs/declare/process.d.ts
new file mode 100644
index 0000000000..1e6e1c8739
--- /dev/null
+++ b/types/fibjs/declare/process.d.ts
@@ -0,0 +1,561 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 进程处理模块，用以管理当前进程的资源
+	* @detail 引用方法：,```JavaScript,var process = require('process');,```,,## 进程事件,process 模块对象是 EventEmitter 的实例，可以通过注册事件监听器响应进程级别的事件。,,### beforeExit 事件,**当 fibjs 的任务已经为空，并且没有额外的工作被添加进来，事件 `beforeExit` 会被触发**,```JavaScript,process.on('beforeExit', exitCode => {});,```,正常情况下，如果没有额外的工作被添加到任务队列，fibjs 进程会结束。但是如果 `beforeExit` 事件绑定的监听器的回调函数中，启动了一个新的任务，比如开启一个 fiber，那么 fibjs 进程会继续运行。,,process.exitCode 作为唯一的参数值传递给 `beforeExit` 事件监听器的回调函数。如果进程由于显式的原因而将要终止，例如直接调用 process.exit 或抛出未捕获的异常，`beforeExit`事件不会被触发。,,### exit 事件,**当 fibjs 退出时，事件 `exit` 会被触发，一旦所有与 `exit` 事件绑定的监听器执行完成，进程会终止**,```JavaScript,process.on('exit', exitCode => {});,```,`exit` 事件监听器的回调函数，只有一个入参，这个参数的值可以是 process.exitCode 的属性值，或者是调用 process.exit 方法时传入的 `exitCode` 值。,,### Signal 事件,**当 fibjs 进程接收到一个信号时，会触发信号事件，目前支持的信号有 SIGINT 和 SIGTERM。每个事件名称，以信号名称的大写表示 (比如事件'SIGINT' 对应信号 SIGINT)。**,,信号事件不同于其它进程事件，信号事件是抢占的，当信号发生时，无论当前在 io 操作，还是 JavaScript 运算，都会尽快触发相应事件。比如你可以用下面的代码，中断当前应用，并输出运行状态：,```JavaScript,var coroutine = require('coroutine');,,process.on('SIGINT', () => {,   coroutine.fibers.forEach(f => console.error("Fiber %d:\n%s", f.id, f.stack));,   process.exit();,});,```,信号名称及其意义如下：,* SIGINT：在终端运行时，可以被所有平台支持，通常可以通过 CTRL+C 触发。,* SIGTERM：当进程被 kill 时触发此信号。Windows 下不支持。
+	*/
+declare module "process" {
+	
+
+	module process {
+		
+		
+		/**
+		 * 
+		 * @brief 返回当前进程的命令行参数
+		 * 
+		 * 
+		 */
+		export const argv: any[];
+		
+		/**
+		 * 
+		 * @brief 返回当前进程的特殊命令行参数，这些参数被 fibjs 用于设置运行环境
+		 * 
+		 * 
+		 */
+		export const execArgv: any[];
+		
+		/**
+		 * 
+		 * @brief 返回 fibjs 版本字符串
+		 * 
+		 * 
+		 */
+		export const version: string;
+		
+		/**
+		 * 
+		 * @brief 返回 fibjs 及组件的版本信息
+		 * 
+		 * 
+		 */
+		export const versions: Object;
+		
+		/**
+		 * 
+		 * @brief 查询当前运行执行文件完整路径
+		 * 
+		 * 
+		 */
+		export const execPath: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前进程的环境变量
+		 * 
+		 * 
+		 */
+		export const env: Object;
+		
+		/**
+		 * 
+		 * @brief 查询当前 cpu 环境，可能的结果为 'amd64', 'arm', 'arm64', 'ia32'
+		 * 
+		 * 
+		 */
+		export const arch: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前平台名称，可能的结果为 'darwin', 'freebsd', 'linux', 或 'win32'
+		 * 
+		 * 
+		 */
+		export const platform: string;
+		
+		/**
+		 * 
+		 * @brief 查询当前进程标准输入对象
+		 * 
+		 * 
+		 */
+		export const stdin: Class_File;
+		
+		/**
+		 * 
+		 * @brief 查询当前进程标准输出对象
+		 * 
+		 * 
+		 */
+		export const stdout: Class_File;
+		
+		/**
+		 * 
+		 * @brief 查询当前进程标准错误输出对象
+		 * 
+		 * 
+		 */
+		export const stderr: Class_File;
+		
+		/**
+		 * 
+		 * @brief 查询和设置当前进程的退出码
+		 * 
+		 * 
+		 */
+		export const exitCode: number;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 改变当前的 umask，Windows 不支持此方法
+		 * @param mask 指定新的掩码
+		 * @return 返回之前的 mask
+		 * 
+		 * 
+		 * 
+		 */
+		export function umask(mask: number): number;
+	
+		/**
+		 * 
+		 * @brief 改变当前的 umask，Windows 不支持此方法
+		 * @param mask 指定新的掩码， 字符串类型八进制(e.g: "0664")
+		 * @return 返回之前的 mask
+		 * 
+		 * 
+		 * 
+		 */
+		export function umask(mask: string): number;
+	
+		/**
+		 * 
+		 * @brief 返回当前的 umask，Windows 不支持此方法
+		 * @return 返回当前的 mask 值
+		 * 
+		 * 
+		 * 
+		 */
+		export function umask(): number;
+	
+		/**
+		 * 
+		 * @brief 返回系统高精度时间，此时间与当前时间无关，仅用于高精度计时
+		 * @param diff 用于比较的初始时间
+		 * @return 返回计时时间，格式为 [seconds, nanoseconds]
+		 * 
+		 * 
+		 * 
+		 */
+		export function hrtime(diff?: any[]/** = v8::Array::New(isolate)*/): any[];
+	
+		/**
+		 * 
+		 * @brief 退出当前进程，并返回 exitCode 作为进程结果
+		 * 
+		 * 
+		 */
+		export function exit(): void;
+	
+		/**
+		 * 
+		 * @brief 退出当前进程，并返回结果
+		 * @param code 返回进程结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function exit(code: number): void;
+	
+		/**
+		 * 
+		 * @brief 返回操作系统当前工作路径
+		 * @return 返回当前系统路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function cwd(): string;
+	
+		/**
+		 * 
+		 * @brief 修改操作系统当前工作路径
+		 * @param directory 指定设定的新路径
+		 * 
+		 * 
+		 * 
+		 */
+		export function chdir(directory: string): void;
+	
+		/**
+		 * 
+		 * @brief 查询运行环境运行时间，以秒为单位
+		 * @return 返回表示时间的数值
+		 * 
+		 * 
+		 * 
+		 */
+		export function uptime(): number;
+	
+		/**
+		 * 
+		 * @brief 查询当前进程内存使用报告
+		 * 
+		 * 内存报告生成类似以下结果：
+		 * ```JavaScript
+		 * {
+		 * "rss": 8622080,
+		 * "heapTotal": 4083456,
+		 * "heapUsed": 1621800
+		 * }
+		 * ```
+		 * 其中：
+		 * - rss 返回进程当前占用物理内存大小
+		 * - heapTotal 返回 v8 引擎堆内存大小
+		 * - heapUsed 返回 v8 引擎正在使用堆内存大小
+		 * @return 返回包含内存报告
+		 * 
+		 * 
+		 * 
+		 */
+		export function memoryUsage(): object;
+	
+		/**
+		 * 
+		 * @brief 启动一个纤程
+		 * @param func 制定纤程执行的函数
+		 * @param args 可变参数序列，此序列会在纤程内传递给函数
+		 * 
+		 * 
+		 * 
+		 */
+		export function nextTick(func: Function, ...args: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 运行指定的命令行，接管进程输入输出流，并返回进程对象
+		 * 
+		 * opts 支持的选项如下：
+		 * ```JavaScript
+		 * {
+		 * "timeout": 100, // 单位为 ms
+		 * "envs": [] // 进程环境变量
+		 * }
+		 * ```
+		 * @param command 指定运行的命令行
+		 * @param args 指定运行的参数列表
+		 * @param opts 指定运行的选项
+		 * @return 返回包含运行结果的进程对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function open(command: string, args: any[], opts?: object/** = v8::Object::New(isolate)*/): Class_SubProcess;
+	
+		/**
+		 * 
+		 * @brief 运行指定的命令行，接管进程输入输出流，并返回进程对象
+		 * 
+		 * opts 支持的选项如下：
+		 * ```JavaScript
+		 * {
+		 * "timeout": 100, // 单位为 ms
+		 * "envs": [] // 进程环境变量
+		 * }
+		 * ```
+		 * @param command 指定运行的命令行
+		 * @param opts 指定运行的选项
+		 * @return 返回包含运行结果的进程对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function open(command: string, opts?: object/** = v8::Object::New(isolate)*/): Class_SubProcess;
+	
+		/**
+		 * 
+		 * @brief 运行指定的命令行，并返回进程对象
+		 * 
+		 * opts 支持的选项如下：
+		 * ```JavaScript
+		 * {
+		 * "timeout": 100, // 单位为 ms
+		 * "envs": [] // 进程环境变量
+		 * }
+		 * ```
+		 * @param command 指定运行的命令行
+		 * @param args 指定运行的参数列表
+		 * @param opts 指定运行的选项
+		 * @return 返回包含运行结果的进程对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function start(command: string, args: any[], opts?: object/** = v8::Object::New(isolate)*/): Class_SubProcess;
+	
+		/**
+		 * 
+		 * @brief 运行指定的命令行，并返回进程对象
+		 * 
+		 * opts 支持的选项如下：
+		 * ```JavaScript
+		 * {
+		 * "timeout": 100, // 单位为 ms
+		 * "envs": [] // 进程环境变量
+		 * }
+		 * ```
+		 * @param command 指定运行的命令行
+		 * @param opts 指定运行的选项
+		 * @return 返回包含运行结果的进程对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function start(command: string, opts?: object/** = v8::Object::New(isolate)*/): Class_SubProcess;
+	
+		/**
+		 * 
+		 * @brief 运行指定的命令行，并返回进程的结束代码
+		 * 
+		 * opts 支持的选项如下：
+		 * ```JavaScript
+		 * {
+		 * "timeout": 100, // 单位为 ms
+		 * "envs": [] // 进程环境变量
+		 * }
+		 * ```
+		 * @param command 指定运行的命令行
+		 * @param args 指定运行的参数列表
+		 * @param opts 指定运行的选项
+		 * @return 返回命令的运行结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function run(command: string, args: any[], opts?: object/** = v8::Object::New(isolate)*/): number;
+	
+		/**
+		 * 
+		 * @brief 运行指定的命令行，并返回进程的结束代码
+		 * 
+		 * opts 支持的选项如下：
+		 * ```JavaScript
+		 * {
+		 * "timeout": 100, // 单位为 ms
+		 * "envs": [] // 进程环境变量
+		 * }
+		 * ```
+		 * @param command 指定运行的命令行
+		 * @param opts 指定运行的选项
+		 * @return 返回命令的运行结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function run(command: string, opts?: object/** = v8::Object::New(isolate)*/): number;
+	
+	} /** end of `module process` */
+	export = process
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/profiler.d.ts b/types/fibjs/declare/profiler.d.ts
new file mode 100644
index 0000000000..5d3459ddbb
--- /dev/null
+++ b/types/fibjs/declare/profiler.d.ts
@@ -0,0 +1,440 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 内存 profiler 模块
+	* @detail 使用方法：,```JavaScript,var profiler = require('profiler');,```
+	*/
+declare module "profiler" {
+	
+
+	module profiler {
+		
+		/**
+		 * 
+		 * @brief 隐藏节点，当显示给用户时可以被过滤掉
+		 * 
+		 * 
+		 */
+		export const Node_Hidden = 0;
+		
+		/**
+		 * 
+		 * @brief 数组
+		 * 
+		 * 
+		 */
+		export const Node_Array = 1;
+		
+		/**
+		 * 
+		 * @brief 字符串
+		 * 
+		 * 
+		 */
+		export const Node_String = 2;
+		
+		/**
+		 * 
+		 * @brief JS对象（字符串和数组除外）
+		 * 
+		 * 
+		 */
+		export const Node_Object = 3;
+		
+		/**
+		 * 
+		 * @brief 编译后的代码
+		 * 
+		 * 
+		 */
+		export const Node_Code = 4;
+		
+		/**
+		 * 
+		 * @brief 函数闭包
+		 * 
+		 * 
+		 */
+		export const Node_Closure = 5;
+		
+		/**
+		 * 
+		 * @brief 正则表达式
+		 * 
+		 * 
+		 */
+		export const Node_RegExp = 6;
+		
+		/**
+		 * 
+		 * @brief 堆中排好序的数字
+		 * 
+		 * 
+		 */
+		export const Node_HeapNumber = 7;
+		
+		/**
+		 * 
+		 * @brief Native对象（非v8堆上的）
+		 * 
+		 * 
+		 */
+		export const Node_Native = 8;
+		
+		/**
+		 * 
+		 * @brief Synthetic对象
+		 * 
+		 * 
+		 */
+		export const Node_Synthetic = 9;
+		
+		/**
+		 * 
+		 * @brief 拼接的字符串
+		 * 
+		 * 
+		 */
+		export const Node_ConsString = 10;
+		
+		/**
+		 * 
+		 * @brief 分割的字符串
+		 * 
+		 * 
+		 */
+		export const Node_SlicedString = 11;
+		
+		/**
+		 * 
+		 * @brief 符号（ES6）
+		 * 
+		 * 
+		 */
+		export const Node_Symbol = 12;
+		
+		/**
+		 * 
+		 * @brief 堆中排好序的SIMD值(ES7)
+		 * 
+		 * 
+		 */
+		export const Node_SimdValue = 13;
+		
+		/**
+		 * 
+		 * @brief 函数中的变量
+		 * 
+		 * 
+		 */
+		export const Edge_ContextVariable = 0;
+		
+		/**
+		 * 
+		 * @brief 数组中的元素
+		 * 
+		 * 
+		 */
+		export const Edge_Element = 1;
+		
+		/**
+		 * 
+		 * @brief 有名对象的属性
+		 * 
+		 * 
+		 */
+		export const Edge_Property = 2;
+		
+		/**
+		 * 
+		 * @brief JS无法进入的链接
+		 * 
+		 * 
+		 */
+		export const Edge_Internal = 3;
+		
+		/**
+		 * 
+		 * @brief 指向需要事先计算出空间大小的节点
+		 * 
+		 * 
+		 */
+		export const Edge_Hidden = 4;
+		
+		/**
+		 * 
+		 * @brief 指向无法事先计算出空间大小的节点
+		 * 
+		 * 
+		 */
+		export const Edge_Shortcut = 5;
+		
+		/**
+		 * 
+		 * @brief 一个弱引用（被GC忽视）
+		 * 
+		 * 
+		 */
+		export const Edge_Weak = 6;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 根据指定名称保存一个堆快照
+		 * @param fname 堆快照名称
+		 * 
+		 * 
+		 * 
+		 */
+		export function saveSnapshot(fname: string): void;
+	
+		/**
+		 * 
+		 * @brief 根据指定名称读取一个堆快照
+		 * @param fname 堆快照名称
+		 * @return 返回读取到的堆快照
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadSnapshot(fname: string): Class_HeapSnapshot;
+	
+		/**
+		 * 
+		 * @brief 获取当前时间节点的堆快照，堆快照记录了当前时刻JS堆的状态
+		 * @return 返回获取到的堆信息快照
+		 * 
+		 * 
+		 * 
+		 */
+		export function takeSnapshot(): Class_HeapSnapshot;
+	
+		/**
+		 * 
+		 * @brief 执行给定的函数，并对比执行前后 v8 堆的变化
+		 * @param test 给定要测试的函数
+		 * @return 返回对比的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function diff(test: Function): object;
+	
+		/**
+		 * 
+		 * @brief 启动一次运行状态采样日志
+		 * @param fname 给定日志存储文件名
+		 * @param time 指定采样时间，缺省 1 分钟
+		 * @param interval 指定间隔时间，缺省 100 毫秒
+		 * @return 返回采样定时器，可以通过 clear 方法提前停止采样
+		 * 
+		 * 
+		 * 
+		 */
+		export function start(fname: string, time?: number/** = 60000*/, interval?: number/** = 100*/): Class_Timer;
+	
+	} /** end of `module profiler` */
+	export = profiler
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/punycode.d.ts b/types/fibjs/declare/punycode.d.ts
new file mode 100644
index 0000000000..2d2e423bb7
--- /dev/null
+++ b/types/fibjs/declare/punycode.d.ts
@@ -0,0 +1,261 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief punycode 国际化域名转换模块
+	* @detail Punycode 是由 RFC 3492 定义的主要用于国际化域名的字符编码方案。因为 URL 中主机名限制只能是 ASCII 字符，包括非 ASCII 字符的主机名必须使用 punycode 算法转化为ASCII。,,使用方法：,```JavaScript,var punycode = require('punycode');,```
+	*/
+declare module "punycode" {
+	
+
+	module punycode {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 将一个 Unicode 字符串转化为等价的只含有 ASCII 字符的 Punycode 字符串
+		 * @param domain 给定Unicode 字符串
+		 * @return 返回编码后的只含有 ASCII 字符的 Punycode 字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function encode(domain: string): string;
+	
+		/**
+		 * 
+		 * @brief 将一个 Punycode 字符串转化为等价的 Unicode 字符串
+		 * @param domain 给定Unicode 字符串
+		 * @return 返回解码后的 Unicode 字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function decode(domain: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换一个代表了一个域名的Unicode字符串为一个只含有 ASCII 字符的字符串。只有代表了域名的部分的非 ASCII 字符串会被转换。也就是说，如果你调用了一个已经被转换为ASCII的字符串，也是没有问题的。
+		 * @param domain 给定Unicode 字符串
+		 * @return 返回编码后的 ASCII 字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function toASCII(domain: string): string;
+	
+		/**
+		 * 
+		 * @brief 转换一个代表了一个域名的Punycode字符串为一个Unicode字符串。只有代表了域名的部分的Punycode字符串会被转换。也就是说，如果你调用了一个已经被转换为Unicode的字符串，也是没有问题的。
+		 * @param domain 给定 ASCII 字符串
+		 * @return 返回解码后的 Unicode 字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function toUnicode(domain: string): string;
+	
+	} /** end of `module punycode` */
+	export = punycode
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/querystring.d.ts b/types/fibjs/declare/querystring.d.ts
new file mode 100644
index 0000000000..bd939a0621
--- /dev/null
+++ b/types/fibjs/declare/querystring.d.ts
@@ -0,0 +1,267 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief http query 处理模块
+	* @detail 引用方法：,```JavaScript,var querystring = require('querystring');,```
+	*/
+declare module "querystring" {
+	
+
+	module querystring {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief url 部件字符串安全编码
+		 * @param str 要编码的 url
+		 * @return 返回编码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function escape(str: string): string;
+	
+		/**
+		 * 
+		 * @brief url 安全字符串解码
+		 * @param str 要解码的 url
+		 * @return 返回解码的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function unescape(str: string): string;
+	
+		/**
+		 * 
+		 * @brief 解析 query 字符串
+		 * @param str 要解析的字符串
+		 * @param sep 解析时使用的分割字符串，缺省为 &
+		 * @param eq 解析时使用的赋值字符串，缺省为 =
+		 * @param opt 解析参数，暂未支持
+		 * @return 返回解码的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function parse(str: string, sep?: string/** = "&"*/, eq?: string/** = "="*/, opt?: object/** = v8::Object::New(isolate)*/): Class_HttpCollection;
+	
+		/**
+		 * 
+		 * @brief 序列化一个对象为 query 字符串
+		 * @param obj 要序列化的对象
+		 * @param sep 序列化时使用的分割字符串，缺省为 &
+		 * @param eq 序列化时使用的赋值字符串，缺省为 =
+		 * @param opt 解析参数，暂未支持
+		 * @return 返回序列化后的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function stringify(obj: object, sep?: string/** = "&"*/, eq?: string/** = "="*/, opt?: object/** = v8::Object::New(isolate)*/): string;
+	
+	} /** end of `module querystring` */
+	export = querystring
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/registry.d.ts b/types/fibjs/declare/registry.d.ts
new file mode 100644
index 0000000000..3190eaf5d5
--- /dev/null
+++ b/types/fibjs/declare/registry.d.ts
@@ -0,0 +1,386 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief Windows 注册表访问模块
+	* @detail 引用方式：,```JavaScript,var registry = require('registry');,var value = registry.get(registry.CLASSES_ROOT, "\node1\node2\value");,```
+	*/
+declare module "registry" {
+	
+
+	module registry {
+		
+		/**
+		 * 
+		 * @brief 注册表根，存储Windows可识别的文件类型的详细列表，以及相关联的程序
+		 * 
+		 * 
+		 */
+		export const CLASSES_ROOT = 0;
+		
+		/**
+		 * 
+		 * @brief 注册表根，存储当前用户设置的信息
+		 * 
+		 * 
+		 */
+		export const CURRENT_USER = 1;
+		
+		/**
+		 * 
+		 * @brief 注册表根，包括安装在计算机上的硬件和软件的信息
+		 * 
+		 * 
+		 */
+		export const LOCAL_MACHINE = 2;
+		
+		/**
+		 * 
+		 * @brief 注册表根，包含使用计算机的用户的信息
+		 * 
+		 * 
+		 */
+		export const USERS = 3;
+		
+		/**
+		 * 
+		 * @brief 注册表根，这个分支包含计算机当前的硬件配置信息
+		 * 
+		 * 
+		 */
+		export const CURRENT_CONFIG = 5;
+		
+		/**
+		 * 
+		 * @brief 注册表数据类型，字符串
+		 * 
+		 * 
+		 */
+		export const SZ = 1;
+		
+		/**
+		 * 
+		 * @brief 注册表数据类型，扩展字符串
+		 * 
+		 * 
+		 */
+		export const EXPAND_SZ = 2;
+		
+		/**
+		 * 
+		 * @brief 注册表数据类型，32 位数值
+		 * 
+		 * 
+		 */
+		export const DWORD = 4;
+		
+		/**
+		 * 
+		 * @brief 注册表数据类型，64 位数值
+		 * 
+		 * 
+		 */
+		export const QWORD = 11;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 返回指定键值下的所有子健
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @return 返回该键值下所有子健
+		 * 
+		 * 
+		 * 
+		 */
+		export function listSubKey(root: number, key: string): any[];
+	
+		/**
+		 * 
+		 * @brief 返回指定键值下的所有数据的健
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @return 返回该键值下所有数据的健
+		 * 
+		 * 
+		 * 
+		 */
+		export function listValue(root: number, key: string): any[];
+	
+		/**
+		 * 
+		 * @brief 查询指定键值的数值
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @return 返回指定键值的数值
+		 * 
+		 * 
+		 * 
+		 */
+		export function get(root: number, key: string): any;
+	
+		/**
+		 * 
+		 * @brief 设置指定键值为数字
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @param value 指定数字
+		 * @param type 指定类型，允许的类型为 DWORD 和 QWORD，缺省为 DWORD
+		 * 
+		 * 
+		 * 
+		 */
+		export function set(root: number, key: string, value: number, type?: number/** = undefined*/): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定键值为字符串
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @param value 指定字符串
+		 * @param type 指定类型，允许的类型为 SZ 和 EXPAND_SZ，缺省为 SZ
+		 * 
+		 * 
+		 * 
+		 */
+		export function set(root: number, key: string, value: string, type?: number/** = undefined*/): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定键值为多字符串
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @param value 指定多字符串数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function set(root: number, key: string, value: any[]): void;
+	
+		/**
+		 * 
+		 * @brief 设置指定键值为二进制
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * @param value 指定二进制数据
+		 * 
+		 * 
+		 * 
+		 */
+		export function set(root: number, key: string, value: Class_Buffer): void;
+	
+		/**
+		 * 
+		 * @brief 删除指定键值的数值
+		 * @param root 指定注册表根
+		 * @param key 指定键值
+		 * 
+		 * 
+		 * 
+		 */
+		export function del(root: number, key: string): void;
+	
+	} /** end of `module registry` */
+	export = registry
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/ssl.d.ts b/types/fibjs/declare/ssl.d.ts
new file mode 100644
index 0000000000..e331eeb691
--- /dev/null
+++ b/types/fibjs/declare/ssl.d.ts
@@ -0,0 +1,408 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief ssl/tls 模块，模块别名：tls
+	* @detail 
+	*/
+declare module "ssl" {
+	
+
+	module ssl {
+		
+		/**
+		 * 
+		 * @brief 证书验证模式，不验证
+		 * 
+		 * 
+		 */
+		export const VERIFY_NONE = 0;
+		
+		/**
+		 * 
+		 * @brief 证书验证模式，可选验证，允许验证不通过
+		 * 
+		 * 
+		 */
+		export const VERIFY_OPTIONAL = 1;
+		
+		/**
+		 * 
+		 * @brief 证书验证模式，要求验证，验证不通过则中断
+		 * 
+		 * 
+		 */
+		export const VERIFY_REQUIRED = 2;
+		
+		/**
+		 * 
+		 * @brief 证书验证结果，证书超时
+		 * 
+		 * 
+		 */
+		export const BADCERT_EXPIRED = 1;
+		
+		/**
+		 * 
+		 * @brief 证书验证结果，证书被撤销
+		 * 
+		 * 
+		 */
+		export const BADCERT_REVOKED = 2;
+		
+		/**
+		 * 
+		 * @brief 证书验证结果，证书名错误
+		 * 
+		 * 
+		 */
+		export const BADCERT_CN_MISMATCH = 4;
+		
+		/**
+		 * 
+		 * @brief 证书验证结果，证书不可信
+		 * 
+		 * 
+		 */
+		export const BADCERT_NOT_TRUSTED = 8;
+		
+		/**
+		 * 
+		 * @brief ssl 协议版本 ssl 3.0
+		 * 
+		 * 
+		 */
+		export const ssl3 = 0;
+		
+		/**
+		 * 
+		 * @brief ssl 协议版本 tls 1.0
+		 * 
+		 * 
+		 */
+		export const tls1 = 1;
+		
+		/**
+		 * 
+		 * @brief ssl 协议版本 tls 1.1
+		 * 
+		 * 
+		 */
+		export const tls1_1 = 2;
+		
+		/**
+		 * 
+		 * @brief ssl 协议版本 tls 1.2
+		 * 
+		 * 
+		 */
+		export const tls1_2 = 3;
+		
+		
+		/**
+		 * 
+		 * @brief 全局证书，用于 ssl 客户端模式验证服务器证书
+		 * 
+		 * 
+		 */
+		export const ca: Class_X509Cert;
+		
+		/**
+		 * 
+		 * @brief 设定证书验证模式，缺省为 VERIFY_REQUIRED
+		 * 
+		 * 
+		 */
+		export const verification: number;
+		
+		/**
+		 * 
+		 * @brief 设定最低版本支持，缺省 ssl3
+		 * 
+		 * 
+		 */
+		export const min_version: number;
+		
+		/**
+		 * 
+		 * @brief 设定最高版本支持，缺省 tls1_1
+		 * 
+		 * 
+		 */
+		export const max_version: number;
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 SslSocket 对象，参见 SslSocket
+		 * 
+		 * 
+		 */
+		export class Socket extends Class_SslSocket {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 SslHandler 对象，参见 SslHandler
+		 * 
+		 * 
+		 */
+		export class Handler extends Class_SslHandler {}
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 SslServer 对象，参见 SslServer
+		 * 
+		 * 
+		 */
+		export class Server extends Class_SslServer {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 SslSocket 对象并建立连接
+		 * @param url 指定连接的协议，可以是：ssl://host:port
+		 * @param timeout 指定超时时间，单位是毫秒，默认为0
+		 * @return 返回连接成功的 SslSocket 对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function connect(url: string, timeout?: number/** = 0*/): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 设定缺省客户端证书
+		 * @param crt X509Cert 证书，用于客户端验证服务器
+		 * @param key PKey 私钥，用于与客户端会话
+		 * 
+		 * 
+		 * 
+		 */
+		export function setClientCert(crt: Class_X509Cert, key: Class_PKey): void;
+	
+		/**
+		 * 
+		 * @brief 从文件中加载缺省客户端证书
+		 * @param crtFile X509Cert 证书文件，用于客户端验证服务器
+		 * @param keyFile PKey 私钥文件，用于与客户端会话
+		 * @param password 解密密码
+		 * 
+		 * 
+		 * 
+		 */
+		export function loadClientCertFile(crtFile: string, keyFile: string, password?: string/** = ""*/): void;
+	
+		/**
+		 * 
+		 * @brief 加载自带的缺省根证书，等同于 ssl.ca.loadRootCerts
+		 * 此证书内容源自：http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/nss/lib/ckfw/builtins/certdata.txt
+		 * 
+		 * 
+		 */
+		export function loadRootCerts(): void;
+	
+	} /** end of `module ssl` */
+	export = ssl
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/string_decoder.d.ts b/types/fibjs/declare/string_decoder.d.ts
new file mode 100644
index 0000000000..22b4a8aed6
--- /dev/null
+++ b/types/fibjs/declare/string_decoder.d.ts
@@ -0,0 +1,226 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 解码 Buffer 到字符串
+	* @detail 使用方法：,```JavaScript, const { StringDecoder } = require('string_decoder');, const decoder = new StringDecoder('utf8');,, const cent = Buffer.from([0xC2, 0xA2]);, console.log(decoder.write(cent));,, const euro = Buffer.from([0xE2, 0x82, 0xAC]);, console.log(decoder.write(euro));,```
+	*/
+declare module "string_decoder" {
+	
+
+	module string_decoder {
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个解码对象，参见 StringDecoder
+		 * 
+		 * 
+		 */
+		export class StringDecoder extends Class_StringDecoder {}
+		
+		
+		
+		
+	} /** end of `module string_decoder` */
+	export = string_decoder
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/test.d.ts b/types/fibjs/declare/test.d.ts
new file mode 100644
index 0000000000..c3f7d36456
--- /dev/null
+++ b/types/fibjs/declare/test.d.ts
@@ -0,0 +1,366 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 测试套件模块，用以定义管理测试套件
+	* @detail 使用方法 ：,,```JavaScript,var test = require('test');,test.setup();,,describe('test', () => {,  before(() => {,      // setup before the whole test,  });,,  beforeEach(() => {,      // setup before each test,  });,,  after(() => {,      // cleanup after the whole test,  });,,  afterEach(() => {,      // cleanup after each test,  });,,  it('case', () => {,      assert.ok(true);,  });,,  // ignored test case,  xit('case', () => {,      assert.ok(true);,  });,,  // ignored test case,  it.skip('case', () => {,      assert.ok(true);,  });,,  // only test case,  oit('case', () => {,      assert.ok(true);,  });,,  // only test case,  it.only('case', () => {,      assert.ok(true);,  });,});,,// async function test,describe('test async', () => {,it('pass case', async() => {,  assert.ok(true);,});,,it('error case', async() => {,    throw new Error('some thing wrong!');,});,});,,// callback function test,// cannot use callback mode in jsc,describe('test callback', () => {,it('pass case', done => {,  setTimeout(() => {,    assert.ok(true);,    done();,  }, 0);,});,,it('error case', done => {,  setTimeout(() => {,    done(new Error('some thing wrong!'));,  }, 0);,});,});,,process.exit(-test.run(console.DEBUG));,```
+	*/
+declare module "test" {
+	
+	import consoleNS = require('console')
+	import assertNS = require('assert')
+
+	module test {
+		
+		
+		/**
+		 * 
+		 * @brief 设置和查询慢速测试警告阀值，以 ms 为单位，缺省为 75
+		 * 
+		 * 
+		 * 
+		 */
+		export const slow: number;
+		
+		
+		/**
+		 * 
+		 * @brief 断言测试模块，如果测试值为假，则报错，报错行为可设定继续运行或者错误抛出
+		 * 
+		 * 
+		 */
+		
+		export const assert: typeof assertNS
+		
+		
+		
+		/**
+		 * 
+		 * @brief 定义一个测试模块，可嵌套定义
+		 * @param name 定义模块名称
+		 * @param block 模块初始化代码
+		 * 
+		 * 
+		 * 
+		 */
+		export function describe(name: string, block: Function): void;
+	
+		/**
+		 * 
+		 * @brief 暂停测试的模块定义，test.setup 后可使用 describe.skip 调用
+		 * @param name 定义模块名称
+		 * @param block 模块初始化代码
+		 * 
+		 * 
+		 * 
+		 */
+		export function xdescribe(name: string, block: Function): void;
+	
+		/**
+		 * 
+		 * @brief 独立测试的模块定义，test.setup 后可使用 describe.only 调用
+		 * @param name 定义模块名称
+		 * @param block 模块初始化代码
+		 * 
+		 * 
+		 * 
+		 */
+		export function odescribe(name: string, block: Function): void;
+	
+		/**
+		 * 
+		 * @brief 定义一个测试项目
+		 * @param name 定义项目名称
+		 * @param block 测试内容
+		 * 
+		 * 
+		 * 
+		 */
+		export function it(name: string, block: Function): void;
+	
+		/**
+		 * 
+		 * @brief 暂停测试的项目定义，test.setup 后可使用 it.skip 调用
+		 * @param name 定义项目名称
+		 * @param block 测试内容
+		 * 
+		 * 
+		 * 
+		 */
+		export function xit(name: string, block: Function): void;
+	
+		/**
+		 * 
+		 * @brief 独立测试的项目定义，test.setup 后可使用 it.only 调用
+		 * @param name 定义项目名称
+		 * @param block 测试内容
+		 * 
+		 * 
+		 * 
+		 */
+		export function oit(name: string, block: Function): void;
+	
+		/**
+		 * 
+		 * @brief 定义当前测试模块进入事件
+		 * @param func 事件函数
+		 * 
+		 * 
+		 * 
+		 */
+		export function before(func: Function): void;
+	
+		/**
+		 * 
+		 * @brief 定义当前测试模块退出事件
+		 * @param func 事件函数
+		 * 
+		 * 
+		 * 
+		 */
+		export function after(func: Function): void;
+	
+		/**
+		 * 
+		 * @brief 定义当前测试模块测试项目进入事件
+		 * @param func 事件函数
+		 * 
+		 * 
+		 * 
+		 */
+		export function beforeEach(func: Function): void;
+	
+		/**
+		 * 
+		 * @brief 定义当前测试模块测试项目退出事件
+		 * @param func 事件函数
+		 * 
+		 * 
+		 * 
+		 */
+		export function afterEach(func: Function): void;
+	
+		/**
+		 * 
+		 * @brief 开始执行定义的测试模块
+		 * @param loglevel 指定进行测试时的日志输出级别，ERROR 时，项目报错信息集中在报告后显示，低于 ERROR 时，输出信息随时显示，高于 ERROR 时，只显示报告
+		 * @return 返回测试用例统计结果，正确则返回 0，错误则返回错误个数
+		 * 
+		 * 
+		 * 
+		 */
+		export function run(loglevel?: number/** = undefined*/): number;
+	
+		/**
+		 * 
+		 * @brief 初始化当前脚本的测试环境，将 test 模块方法复制为当前脚本全局变量
+		 * 
+		 * 
+		 */
+		export function setup(): void;
+	
+	} /** end of `module test` */
+	export = test
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/timers.d.ts b/types/fibjs/declare/timers.d.ts
new file mode 100644
index 0000000000..8de6e72812
--- /dev/null
+++ b/types/fibjs/declare/timers.d.ts
@@ -0,0 +1,335 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief timers 模块
+	* @detail 
+	*/
+declare module "timers" {
+	
+
+	module timers {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 在指定的时间后调用函数
+		 * @param callback 指定回调函数
+		 * @param timeout 指定延时的时间，以毫秒为单位。超过 2^31 的话,立即执行。
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setTimeout(callback: Function, timeout?: number/** = 1*/, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearTimeout(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 每间隔指定的时间后调用函数
+		 * @param callback 指定回调函数
+		 * @param timeout 指定间隔的时间，以毫秒为单位。超过 2^31 的话,立即执行。
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setInterval(callback: Function, timeout: number, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearInterval(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 每间隔指定的时间后调用函数，这是个高精度定时器，会主动打断正在运行的 JavaScript 脚本执行定时器
+		 * 由于 setHrInterval 的定时器会中断正在运行的代码执行回调，因此不要在回调函数内修改可能影响其它模块的数据，或者在回调中调用任何标记为 async 的 api 函数，否则将会产生不可预知的结果。例如：
+		 * ```JavaScript
+		 * var timers = require('timers');
+		 * 
+		 * var cnt = 0;
+		 * timers.setHrInterval(() => {
+		 * cnt++;
+		 * }, 100);
+		 * 
+		 * while (cnt < 10);
+		 * 
+		 * console.error("===============================> done");
+		 * ```
+		 * 这段代码中，第 8 行的循环并不会因为 cnt 的改变而结束，因为 JavaScript 在优化代码时会认定在这个循环过程中 cnt 不会被改变。
+		 * @param callback 指定回调函数
+		 * @param timeout 指定间隔的时间，以毫秒为单位。超过 2^31 的话,立即执行。
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setHrInterval(callback: Function, timeout: number, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearHrInterval(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 下一个空闲时间立即执行回调函数
+		 * @param callback 指定回调函数
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回定时器对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function setImmediate(callback: Function, ...args: any[]): Class_Timer;
+	
+		/**
+		 * 
+		 * @brief 清除指定的定时器
+		 * @param t 指定要清除的定时器
+		 * 
+		 * 
+		 * 
+		 */
+		export function clearImmediate(t: any): void;
+	
+		/**
+		 * 
+		 * @brief 调用给定的函数，并在超时时间到期时中断函数运行
+		 * @param func 指定要运行的函数
+		 * @param timeout 指定超时时间
+		 * @param args 额外的参数，传入到指定的 callback 内，可选。
+		 * @return 返回 func 的运行结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function call(func: Function, timeout: number, ...args: any[]): any;
+	
+	} /** end of `module timers` */
+	export = timers
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/tty.d.ts b/types/fibjs/declare/tty.d.ts
new file mode 100644
index 0000000000..c2a20d7d2f
--- /dev/null
+++ b/types/fibjs/declare/tty.d.ts
@@ -0,0 +1,228 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief tty 模块
+	* @detail 使用方法：,```JavaScript,const tty = require('tty');,```
+	*/
+declare module "tty" {
+	
+
+	module tty {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 查询是否是命令交互窗口
+		 * @param fd 文件描述符
+		 * @return 如果文件描述符同一个终端窗口关联则返回 true ，否则返回 false
+		 * 
+		 * 
+		 * 
+		 */
+		export function isatty(fd: number): boolean;
+	
+	} /** end of `module tty` */
+	export = tty
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/url.d.ts b/types/fibjs/declare/url.d.ts
new file mode 100644
index 0000000000..545b516cd2
--- /dev/null
+++ b/types/fibjs/declare/url.d.ts
@@ -0,0 +1,241 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief url 处理模块
+	* @detail 
+	*/
+declare module "url" {
+	
+
+	module url {
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 参数构造 UrlObject 对象
+		 * @param args 指定构造参数的字典对象，支持的字段有：protocol, slashes, username, password, hostname, port, pathname, query, hash
+		 * @return 返回构造成功的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function format(args: object): string;
+	
+		/**
+		 * 
+		 * @brief 解析一个 url 字符串
+		 * @param url 指定需要解析的 url 字符串
+		 * @param parseQueryString 指定是否解析 query
+		 * @param slashesDenoteHost  默认为false, 如果设置为true，则从字符串'//'之后到下一个'/'之前的字符串会被解析为host，例如'//foo/bar', 结果应该是{host: 'foo', pathname: '/bar'}而不是{pathname: '//foo/bar'}
+		 * @return 返回包含解析数据的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function parse(url: string, parseQueryString?: boolean/** = false*/, slashesDenoteHost?: boolean/** = false*/): Class_UrlObject;
+	
+	} /** end of `module url` */
+	export = url
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/util.d.ts b/types/fibjs/declare/util.d.ts
new file mode 100644
index 0000000000..1b38c49399
--- /dev/null
+++ b/types/fibjs/declare/util.d.ts
@@ -0,0 +1,988 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 常用工具模块
+	* @detail 
+	*/
+declare module "util" {
+	
+
+	module util {
+		
+		
+		
+		/**
+		 * 
+		 * @brief 数据统计对象，用以构建应用运行时数据收集，参见 Stats 对象。
+		 * 
+		 * 
+		 */
+		export class Stats extends Class_Stats {}
+		
+		
+		/**
+		 * 
+		 * @brief LRU(least recently used) 缓存对象，参见 LruCache 对象。
+		 * 
+		 * 
+		 */
+		export class LruCache extends Class_LruCache {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 按照指定的格式格式化变量
+		 * 
+		 * @param fmt 格式化字符串
+		 * @param args 可选参数列表
+		 * @return 返回格式化后的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function format(fmt: string, ...args: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 格式格式化变量
+		 * 
+		 * @param args 可选参数列表
+		 * @return 返回格式化后的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function format(...args: any[]): string;
+	
+		/**
+		 * 
+		 * @brief 从一个构造函数 constructor 继承原型方法到另一个。构造函数的原型将被设置为一个新的从超类（superConstructor）创建的对象。
+		 * 
+		 * @param constructor 初始的构造函数
+		 * @param superConstructor 被继承的超类
+		 * 
+		 * 
+		 * 
+		 */
+		export function inherits(constructor: any, superConstructor: any): void;
+	
+		/**
+		 * 
+		 * @brief 方法返回 obj 的字符串表示，主要用于调试。 附加的 options 可用于改变格式化字符串的某些方面。
+		 * 
+		 * @param obj 指定需要处理的对象
+		 * @param options 指定格式控制选项
+		 * @return 返回格式化后的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function inspect(obj: object, options?: object/** = v8::Object::New(isolate)*/): string;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否不包含任何值(没有可枚举的属性)
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果为空则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isEmpty(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是数组
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是数组则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isArray(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Boolean
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Boolean 则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isBoolean(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Null
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Null 则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNull(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Null 或者 Undefined
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Null 或者 Undefined 则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNullOrUndefined(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是数字
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是数字则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNumber(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是字符串
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是字符串则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isString(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Undefined
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Undefined 则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isUndefined(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是正则对象
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是正则对象则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isRegExp(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是对象
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是对象则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isObject(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是日期对象
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是日期对象则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isDate(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是错误对象
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是错误对象则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isNativeError(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是原始类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是原始类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isPrimitive(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是Symbol类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是Symbol类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isSymbol(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 DataView 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 DataView 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isDataView(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 External 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 External 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isExternal(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Map 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Map 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isMap(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 MapIterator 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 MapIterator 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isMapIterator(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Promise 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Promise 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isPromise(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 AsyncFunction 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 AsyncFunction 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isAsyncFunction(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Set 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Set 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isSet(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 SetIterator 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 SetIterator 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isSetIterator(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 TypedArray 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 TypedArray 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isTypedArray(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是 Uint8Array 类型
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是 Uint8Array 类型则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isUint8Array(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是函数对象
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是函数对象则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isFunction(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 检测给定的变量是否是函数 Buffer 对象
+		 * 
+		 * @param v 给定需要检测的变量
+		 * @return 如果是函数 Buffer 对象则返回 True
+		 * 
+		 * 
+		 * 
+		 */
+		export function isBuffer(v: any): boolean;
+	
+		/**
+		 * 
+		 * @brief 查询指定对象是否包含给定的键
+		 * 
+		 * @param v 给定需要查询的对象
+		 * @param key 指定需要查询的键
+		 * @return 返回对象的全部键数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function has(v: any, key: string): boolean;
+	
+		/**
+		 * 
+		 * @brief 查询指定对象的全部键数组
+		 * 
+		 * @param v 给定需要查询的对象
+		 * @return 返回对象的全部键数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function keys(v: any): any[];
+	
+		/**
+		 * 
+		 * @brief 查询指定对象的全部值数组
+		 * 
+		 * @param v 给定需要查询的对象
+		 * @return 返回对象的全部值数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function values(v: any): any[];
+	
+		/**
+		 * 
+		 * @brief 克隆给定变量，如果是对象或数组，则复制内容到新对象
+		 * 
+		 * @param v 给定要克隆的变量
+		 * @return 返回克隆结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function clone(v: any): any;
+	
+		/**
+		 * 
+		 * @brief 深度冻结一个对象，被冻结后的对象及其包含的对象都将不允许修改
+		 * 
+		 * @param v 指定要冻结的对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function deepFreeze(v: any): void;
+	
+		/**
+		 * 
+		 * @brief 将一个或者多个对象的键值扩展到指定对象
+		 * 
+		 * @param v 指定要扩展的对象
+		 * @param objs 指定一个或者多个用于扩展的对象
+		 * @return 返回扩展的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function extend(v: any, ...objs: any[]): any;
+	
+		/**
+		 * 
+		 * @brief 将一个或者多个对象的键值扩展到指定对象，是 extend 的别名
+		 * 
+		 * @param v 指定要扩展的对象
+		 * @param objs 指定一个或者多个用于扩展的对象
+		 * @return 返回扩展的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function _extend(v: any, ...objs: any[]): any;
+	
+		/**
+		 * 
+		 * @brief 返回一个object副本，只过滤出指定键的属性值
+		 * 
+		 * @param v 指定要过滤的对象
+		 * @param objs 指定一个或者多个用于选择的键
+		 * @return 返回过滤的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function pick(v: any, ...objs: any[]): object;
+	
+		/**
+		 * 
+		 * @brief 返回一个object副本，只过排除指定键的属性值
+		 * 
+		 * @param v 指定要过滤的对象
+		 * @param keys 指定一个或者多个用于排除的键
+		 * @return 返回排除的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function omit(v: any, ...keys: any[]): object;
+	
+		/**
+		 * 
+		 * @brief 获取数组的第一个元素
+		 * 
+		 * @param v 给定要获取的数组
+		 * @return 返回获取的元素
+		 * 
+		 * 
+		 * 
+		 */
+		export function first(v: any): any;
+	
+		/**
+		 * 
+		 * @brief 获取数组的开始多个元素
+		 * 
+		 * @param v 给定要获取的数组
+		 * @param n 指定要获取的元素个数
+		 * @return 返回获取的元素数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function first(v: any, n: number): any;
+	
+		/**
+		 * 
+		 * @brief 获取数组的第后一个元素
+		 * 
+		 * @param v 给定要获取的数组
+		 * @return 返回获取的元素
+		 * 
+		 * 
+		 * 
+		 */
+		export function last(v: any): any;
+	
+		/**
+		 * 
+		 * @brief 获取数组的结尾多个元素
+		 * 
+		 * @param v 给定要获取的数组
+		 * @param n 指定要获取的元素个数
+		 * @return 返回获取的元素数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function last(v: any, n: number): any;
+	
+		/**
+		 * 
+		 * @brief 获取数组的元素去重后的副本
+		 * 
+		 * @param v 给定要去重的数组
+		 * @param sorted 指定数组是否排序，如果指定数组排序，将使用快速算法
+		 * @return 返回去重元素后的数组
+		 * 
+		 * 
+		 * 
+		 */
+		export function unique(v: any, sorted?: boolean/** = false*/): any[];
+	
+		/**
+		 * 
+		 * @brief 将一个或者多个数组的值合并成一个值唯一的数组
+		 * 
+		 * @param arrs 指定一个或者多个用于合并的数组
+		 * @return 返回合并的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function union(...arrs: any[]): any[];
+	
+		/**
+		 * 
+		 * @brief 返回一个包含 arr 数组中排除一个或者多个数组元素的交集
+		 * 
+		 * @param arrs 指定一个或者多个用于计算交集的数组
+		 * @return 返回计算交集的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function intersection(...arrs: any[]): any[];
+	
+		/**
+		 * 
+		 * @brief 将一个嵌套多层的数组(嵌套可以是任何层数)转换为只有一层的数组。 如果你传递 shallow 参数，数组将只减少一维的嵌套。
+		 * 
+		 * @param arr 指定需要转换的数组
+		 * @param shallow 指定是否只减少一维的嵌套，缺省为 false
+		 * @return 返回转换的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function flatten(arr: any, shallow?: boolean/** = false*/): any[];
+	
+		/**
+		 * 
+		 * @brief 返回一个包含 arr 数组中排除一个或者多个元素后的数组
+		 * 
+		 * @param arr 指定需要排除的数组
+		 * @param els 指定一个或者多个用于排除的元素
+		 * @return 返回排除的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function without(arr: any, ...els: any[]): any[];
+	
+		/**
+		 * 
+		 * @brief 返回一个包含 arr 数组中排除 without 数组元素之后的数组
+		 * 
+		 * @param list 指定需要排除的数组
+		 * @param arrs 指定用于排除的一个或者多个数组
+		 * @return 返回排除的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function difference(list: any[], ...arrs: any[]): any[];
+	
+		/**
+		 * 
+		 * @brief 遍历 list 中的所有元素，按顺序用遍历输出每个元素。如果传递了 context 参数，则把 iterator 绑定到 context 对象上。每次调用 iterator 都会传递三个参数：(element, index, list)
+		 * 
+		 * @param list 指定需要遍历的列表或对象
+		 * @param iterator 指定用于遍历的回调函数
+		 * @param context 指定调用 iterator 时绑定的 context 对象
+		 * @return 返回 list 本身
+		 * 
+		 * 
+		 * 
+		 */
+		export function each(list: any, iterator: Function, context?: any/** = v8::Undefined(isolate)*/): any;
+	
+		/**
+		 * 
+		 * @brief 通过变换函数（iterator迭代器）把 list 中的每个值映射到一个新的数组中。如果传递了 context 参数，则把 iterator 绑定到 context 对象上。每次调用 iterator 都会传递三个参数：(element, index, list)
+		 * 
+		 * @param list 指定需要变换的列表或对象
+		 * @param iterator 指定用于变换的回调函数
+		 * @param context 指定调用 iterator 时绑定的 context 对象
+		 * @return 返回变换的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function map(list: any, iterator: Function, context?: any/** = v8::Undefined(isolate)*/): any[];
+	
+		/**
+		 * 
+		 * @brief 把 list中 元素归结为一个单独的数值。如果传递了 context 参数，则把 iterator 绑定到 context 对象上。每次调用 iterator 都会传递三个参数：(memo, element, index, list)
+		 * 
+		 * @param list 指定需要归结的列表或对象
+		 * @param iterator 指定用于归结的回调函数
+		 * @param memo 指定归结的初始值
+		 * @param context 指定调用 iterator 时绑定的 context 对象
+		 * @return 返回归结的结果
+		 * 
+		 * 
+		 * 
+		 */
+		export function reduce(list: any, iterator: Function, memo: any, context?: any/** = v8::Undefined(isolate)*/): any;
+	
+		/**
+		 * 
+		 * @brief 编译脚本为二进制代码
+		 * util.compile 可以将脚本编译为 v8 内部运行数据块(非机器执行代码)。编译以后的代码，保存为 *.jsc 后，可以由 run 和 require 直接加载执行。
+		 * 
+		 * 由于编译之后，目标代码将不能逆向获取源代码，依赖于 Function.toString 的程序将不能正常运行。
+		 * 
+		 * @param srcname 指定要添加的脚本名称
+		 * @param script 指定要编译的脚本代码
+		 * @param mode 编译模式，0: module, 1: script, 2: worker，缺省为 0
+		 * @return 返回编译出的二进制代码
+		 * 
+		 * 
+		 * 
+		 */
+		export function compile(srcname: string, script: string, mode?: number/** = 0*/): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 包裹 callback 或 async 方法为同步调用
+		 * 
+		 * util.sync 将 callback 方法或者 async 方法处理为 sync 方法，以方便调用。
+		 * 
+		 * callback 示例如下：
+		 * ```JavaScript
+		 * // callback
+		 * var util = require('util');
+		 * 
+		 * function cb_test(a, b, cb) {
+		 * setTimeout(() => {
+		 * cb(null, a + b);
+		 * }, 100);
+		 * }
+		 * 
+		 * var fn_sync = util.sync(cb_test);
+		 * console.log(fn_sync(100, 200));
+		 * ```
+		 * async 示例如下：
+		 * ```JavaScript
+		 * // async/await
+		 * var util = require('util');
+		 * 
+		 * async function async_test(a, b) {
+		 * return a + b;
+		 * }
+		 * 
+		 * var fn_sync = util.sync(async_test);
+		 * console.log(fn_sync(100, 200));
+		 * ```
+		 * 对于未标记为 async 的返回 promise 的函数，可以手动指定 sync 模式：
+		 * ```JavaScript
+		 * // async/await
+		 * var util = require('util');
+		 * 
+		 * function async_test(a, b) {
+		 * return new Promise(function (resolve, reject) {
+		 * resolve(a + b);
+		 * });
+		 * }
+		 * 
+		 * var fn_sync = util.sync(async_test, true);
+		 * console.log(fn_sync(100, 200));
+		 * ```
+		 * 
+		 * @param func 给定需要包裹的方法
+		 * @param async_func 指定以 async 函数方式处理 func，为 false 则自动判断
+		 * @return 返回同步运行的方法
+		 * 
+		 * 
+		 * 
+		 */
+		export function sync(func: Function, async_func?: boolean/** = false*/): Function;
+	
+		/**
+		 * 
+		 * @brief 查询当前引擎及各组件版本信息
+		 * 
+		 * ```JavaScript
+		 * {
+		 * "fibjs": "0.25.0",
+		 * "clang": "9.1",
+		 * "date": "Jun 12 2018 07:22:40",
+		 * "vender": {
+		 * "ev": "4.24",
+		 * "expat": "2.2.5",
+		 * "gd": "2.2.4",
+		 * "jpeg": "8.3",
+		 * "leveldb": "1.17",
+		 * "mongo": "0.7",
+		 * "pcre": "8.21",
+		 * "png": "1.5.4",
+		 * "mbedtls": "2.6.1",
+		 * "snappy": "1.1.2",
+		 * "sqlite": "3.23.0",
+		 * "tiff": "3.9.5",
+		 * "uuid": "1.6.2",
+		 * "v8": "6.7.288.20",
+		 * "v8-snapshot": true,
+		 * "zlib": "1.2.7",
+		 * "zmq": "3.1"
+		 * }
+		 * }
+		 * ```
+		 * @return 返回组件版本对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function buildInfo(): object;
+	
+	} /** end of `module util` */
+	export = util
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/uuid.d.ts b/types/fibjs/declare/uuid.d.ts
new file mode 100644
index 0000000000..b891509800
--- /dev/null
+++ b/types/fibjs/declare/uuid.d.ts
@@ -0,0 +1,311 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief uuid 唯一 id 模块
+	* @detail 基础模块。提供唯一 id 的创建于操作,```JavaScript,var uuid = require('uuid');,```
+	*/
+declare module "uuid" {
+	
+
+	module uuid {
+		
+		/**
+		 * 
+		 * @brief md5 与 sha1 创建 uuid 时指定 name 命名为域名
+		 * 
+		 * 
+		 */
+		export const DNS = 0;
+		
+		/**
+		 * 
+		 * @brief md5 与 sha1 创建 uuid 时指定 name 命名为 url 地址
+		 * 
+		 * 
+		 */
+		export const URL = 1;
+		
+		/**
+		 * 
+		 * @brief md5 与 sha1 创建 uuid 时指定 name 命名为 ISO OID
+		 * 
+		 * 
+		 */
+		export const OID = 2;
+		
+		/**
+		 * 
+		 * @brief md5 与 sha1 创建 uuid 时指定 name 命名为 X.500 DN
+		 * 
+		 * 
+		 */
+		export const X509 = 3;
+		
+		
+		/**
+		 * 
+		 * @brief 查询和修改 Snowflake 算法的主机 id
+		 * 
+		 * 
+		 */
+		export const hostID: number;
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 使用时间和主机名创建 uuid
+		 * @return 返回一个生成的二进制 id
+		 * 
+		 * 
+		 * 
+		 */
+		export function node(): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用特定命名的 md5 创建 uuid
+		 * @param ns 指定命名空间，可以为 uuid.DNS, uuid.URL, uuid.OID, uuid.X509
+		 * @param name 指定名称
+		 * @return 返回一个生成的二进制 id
+		 * 
+		 * 
+		 * 
+		 */
+		export function md5(ns: number, name: string): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用随机数创建 uuid
+		 * @return 返回一个生成的二进制 id
+		 * 
+		 * 
+		 * 
+		 */
+		export function random(): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用特定命名的 sha1 创建 uuid
+		 * @param ns 指定命名空间，可以为 uuid.DNS, uuid.URL, uuid.OID, uuid.X509
+		 * @param name 指定名称
+		 * @return 返回一个生成的二进制 id
+		 * 
+		 * 
+		 * 
+		 */
+		export function sha1(ns: number, name: string): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用 Snowflake 算法创建 uuid
+		 * @return 返回一个生成的二进制 id
+		 * 
+		 * 
+		 * 
+		 */
+		export function snowflake(): Class_Buffer;
+	
+	} /** end of `module uuid` */
+	export = uuid
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/vm.d.ts b/types/fibjs/declare/vm.d.ts
new file mode 100644
index 0000000000..6cb2c89ead
--- /dev/null
+++ b/types/fibjs/declare/vm.d.ts
@@ -0,0 +1,226 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief 安全沙箱模块，用于隔离不同安全等级的运行环境
+	* @detail 通过建立安全沙箱，可以限制脚本运行时可以接触的资源，隔离不同脚本执行环境，并可以为不同的环境定制基础模块，以保障整体运行环境的安全。,,下面的示例创建一个沙箱，限制只允许访问全局基础模块中的 assert 模块，并添加 a 和 b 两个定制模块：,```JavaScript,var vm = require('vm');,var sbox = new vm.SandBox({,  a: 100,,  b: 200,,  assert: require('assert'),});,,var mod_in_sbox = sbox.require('./path/to/mod');,```
+	*/
+declare module "vm" {
+	
+
+	module vm {
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 SandBox 对象，参见 SandBox
+		 * 
+		 * 
+		 */
+		export class SandBox extends Class_SandBox {}
+		
+		
+		
+		
+	} /** end of `module vm` */
+	export = vm
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/ws.d.ts b/types/fibjs/declare/ws.d.ts
new file mode 100644
index 0000000000..e31944594a
--- /dev/null
+++ b/types/fibjs/declare/ws.d.ts
@@ -0,0 +1,327 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief websocket 支持模块
+	* @detail 使用方法：,```JavaScript,var ws = require('ws');,```,创建一个服务器：,```JavaScript,var ws = require('ws');,var http = require('http');,,var svr = new http.Server(80, {,    '/ws': ws.upgrade((conn, req) => {,        conn.onmessage = e => console.log(e.data);,    }),});,svr.run();,```,使用 WebSocket 客户端：,```JavaScript,var ws = require('ws');,,var conn = new ws.Socket('ws://127.0.0.1/ws');,conn.ommessage = e => console.log(e.data);,```
+	*/
+declare module "ws" {
+	
+
+	module ws {
+		
+		/**
+		 * 
+		 * @brief 指定 websocket 消息类型 0，代表一个继续帧
+		 * 
+		 * 
+		 */
+		export const CONTINUE = 0;
+		
+		/**
+		 * 
+		 * @brief 指定 websocket 消息类型 1，代表一个文本帧
+		 * 
+		 * 
+		 */
+		export const TEXT = 1;
+		
+		/**
+		 * 
+		 * @brief 指定 websocket 消息类型 2，代表一个二进制帧
+		 * 
+		 * 
+		 */
+		export const BINARY = 2;
+		
+		/**
+		 * 
+		 * @brief 指定 websocket 消息类型 8，连接关闭
+		 * 
+		 * 
+		 */
+		export const CLOSE = 8;
+		
+		/**
+		 * 
+		 * @brief 指定 websocket 消息类型 9，代表一个 ping 帧
+		 * 
+		 * 
+		 */
+		export const PING = 9;
+		
+		/**
+		 * 
+		 * @brief 指定 websocket 消息类型 10，代表一个 pong 帧
+		 * 
+		 * 
+		 */
+		export const PONG = 10;
+		
+		/**
+		 * 
+		 * @brief 指定 WebSocket 状态，表示正在连接中
+		 * 
+		 * 
+		 */
+		export const CONNECTING = 0;
+		
+		/**
+		 * 
+		 * @brief 指定 WebSocket 状态，表示打开状态
+		 * 
+		 * 
+		 */
+		export const OPEN = 1;
+		
+		/**
+		 * 
+		 * @brief 指定 WebSocket 状态，表示已发送 CLOSE 消息，等待关闭中
+		 * 
+		 * 
+		 */
+		export const CLOSING = 2;
+		
+		/**
+		 * 
+		 * @brief 指定 WebSocket 状态，表示已经关闭
+		 * 
+		 * 
+		 */
+		export const CLOSED = 3;
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 websocket 消息对象，参见 WebSocketMessage
+		 * 
+		 * 
+		 */
+		export class Message extends Class_WebSocketMessage {}
+		
+		
+		/**
+		 * 
+		 * @brief WebSocket 对象，参见 WebSocket
+		 * 
+		 * 
+		 */
+		export class Socket extends Class_WebSocket {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 websocket 协议处理器，从 http 接收 upgrade 请求并握手，生成 WebSocket 对象
+		 * accept 函数调用时，将传递两个参数，第一个参数为接收到的 WebSocket 对象，第二个参数为握手时的 HttpRequest 对象。
+		 * @param accept 连接成功处理函数
+		 * @return 返回协议处理器，可与 HttpServer, Chain, Routing 等对接
+		 * 
+		 * 
+		 * 
+		 */
+		export function upgrade(accept: Function): Class_Handler;
+	
+	} /** end of `module ws` */
+	export = ws
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/xml.d.ts b/types/fibjs/declare/xml.d.ts
new file mode 100644
index 0000000000..454d7defe5
--- /dev/null
+++ b/types/fibjs/declare/xml.d.ts
@@ -0,0 +1,333 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief xml 处理模块
+	* @detail 
+	*/
+declare module "xml" {
+	
+
+	module xml {
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlElement 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const ELEMENT_NODE = 1;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlAttr 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const ATTRIBUTE_NODE = 2;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlText 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const TEXT_NODE = 3;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlCDATASection 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const CDATA_SECTION_NODE = 4;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlProcessingInstruction 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const PROCESSING_INSTRUCTION_NODE = 7;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlComment 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const COMMENT_NODE = 8;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlDocument 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const DOCUMENT_NODE = 9;
+		
+		/**
+		 * 
+		 * @brief XmlNode 的 nodeType 属性常量，表示节点为 XmlDocumentType 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export const DOCUMENT_TYPE_NODE = 10;
+		
+		
+		
+		/**
+		 * 
+		 * @brief xml 文档对象，参见 XmlDocument 对象
+		 * 
+		 * 
+		 */
+		export class Document extends Class_XmlDocument {}
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 解析 xml/html 文本，并创建 XmlDocument 对象，不支持多语种
+		 * @param source 指定需要解析的 xml/html 文本
+		 * @param type 指定文本类型，缺省为 text/xml，也可指定为 text/html
+		 * @return 返回创建的 XmlDocument 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function parse(source: string, type?: string/** = "text/xml"*/): Class_XmlDocument;
+	
+		/**
+		 * 
+		 * @brief 解析 xml/html，并创建 XmlDocument 对象，解析时会根据指定的语种转换
+		 * @param source 指定需要解析的 xml/html 二进制数据
+		 * @param type 指定文本类型，缺省为 text/xml，也可指定为 text/html
+		 * @return 返回创建的 XmlDocument 对象
+		 * 
+		 * 
+		 * 
+		 */
+		export function parse(source: Class_Buffer, type?: string/** = "text/xml"*/): Class_XmlDocument;
+	
+		/**
+		 * 
+		 * @brief 序列化 XmlNode 为字符串
+		 * @param node 指定需要序列化的 XmlNode
+		 * @return 返回序列化的字符串
+		 * 
+		 * 
+		 * 
+		 */
+		export function serialize(node: Class_XmlNode): string;
+	
+	} /** end of `module xml` */
+	export = xml
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/zip.d.ts b/types/fibjs/declare/zip.d.ts
new file mode 100644
index 0000000000..45c87abb46
--- /dev/null
+++ b/types/fibjs/declare/zip.d.ts
@@ -0,0 +1,283 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief zip 格式文件压缩解压模块
+	* @detail 使用方法：,```JavaScript,var zip = require('zip');,```
+	*/
+declare module "zip" {
+	
+
+	module zip {
+		
+		/**
+		 * 
+		 * @brief 压缩类型常量, 不压缩, 仅存储
+		 * 
+		 * 
+		 */
+		export const ZIP_STORED = 0;
+		
+		/**
+		 * 
+		 * @brief 压缩类型常量, 需要依赖zlib库进行压缩
+		 * 
+		 * 
+		 */
+		export const ZIP_DEFLATED = 1;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief  判断文件是否是zip格式
+		 * @param filename 文件名
+		 * @return 返回true代表文件是zip文件
+		 * 
+		 * 
+		 * @async
+		 */
+		export function isZipFile(filename: string): boolean;
+	
+		/**
+		 * 
+		 * @brief 打开一个zip文件
+		 * @param path 文件路径
+		 * @param mod 打开文件模式, "r"代表读取, "w"代表创建, "a"代表在zip文件后追加
+		 * @param compress_type 压缩类型, ZIP_STORED 代表不压缩, 仅存储。 默认使用ZIP_DEFLATED 代表使用zlib库进行压缩。
+		 * @return 返回zip文件对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function open(path: string, mod?: string/** = "r"*/, compress_type?: number/** = undefined*/): Class_ZipFile;
+	
+		/**
+		 * 
+		 * @brief 打开一个zip文件
+		 * @param data zip文件数据
+		 * @param mod 打开文件模式, "r"代表读取, "w"代表创建, "a"代表在zip文件后追加
+		 * @param compress_type 压缩类型, ZIP_STORED 代表不压缩, 仅存储。 默认使用ZIP_DEFLATED 代表使用zlib库进行压缩。
+		 * @return 返回zip文件对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function open(data: Class_Buffer, mod?: string/** = "r"*/, compress_type?: number/** = undefined*/): Class_ZipFile;
+	
+		/**
+		 * 
+		 * @brief 打开一个zip文件
+		 * @param strm zip文件流
+		 * @param mod 打开文件模式, "r"代表读取, "w"代表创建, "a"代表在zip文件后追加
+		 * @param compress_type 压缩类型, ZIP_STORED 代表不压缩, 仅存储。 默认使用ZIP_DEFLATED 代表使用zlib库进行压缩。
+		 * @return 返回zip文件对象
+		 * 
+		 * 
+		 * @async
+		 */
+		export function open(strm: Class_SeekableStream, mod?: string/** = "r"*/, compress_type?: number/** = undefined*/): Class_ZipFile;
+	
+	} /** end of `module zip` */
+	export = zip
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/zlib.d.ts b/types/fibjs/declare/zlib.d.ts
new file mode 100644
index 0000000000..693dcf81bf
--- /dev/null
+++ b/types/fibjs/declare/zlib.d.ts
@@ -0,0 +1,525 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief zlib 压缩解压模块
+	* @detail 使用方法：,```JavaScript,var zlib = require('zlib');,```
+	*/
+declare module "zlib" {
+	
+
+	module zlib {
+		
+		/**
+		 * 
+		 * @brief deflate 压缩级别，设定不压缩
+		 * 
+		 * 
+		 */
+		export const NO_COMPRESSION = 0;
+		
+		/**
+		 * 
+		 * @brief deflate 压缩级别，设定最快压缩
+		 * 
+		 * 
+		 */
+		export const BEST_SPEED = 1;
+		
+		/**
+		 * 
+		 * @brief deflate 压缩级别，设定最高压缩
+		 * 
+		 * 
+		 */
+		export const BEST_COMPRESSION = 9;
+		
+		/**
+		 * 
+		 * @brief deflate 压缩级别，设定缺省设置
+		 * 
+		 * 
+		 */
+		export const DEFAULT_COMPRESSION = -1;
+		
+		
+		
+		
+		
+		/**
+		 * 
+		 * @brief 创建一个 deflate 流对象
+		 * @param to 用于存储处理结果的流
+		 * @return 返回封装过的流对象
+		 * 
+		 * 
+		 */
+		export function createDeflate(to: Class_Stream): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 创建一个 deflateRaw 流对象
+		 * @param to 用于存储处理结果的流
+		 * @return 返回封装过的流对象
+		 * 
+		 * 
+		 */
+		export function createDeflateRaw(to: Class_Stream): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 创建一个 gunzip 流对象
+		 * @param to 用于存储处理结果的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * @return 返回封装过的流对象
+		 * 
+		 * 
+		 */
+		export function createGunzip(to: Class_Stream, maxSize?: number/** = -1*/): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 创建一个 gzip 流对象
+		 * @param to 用于存储处理结果的流
+		 * @return 返回封装过的流对象
+		 * 
+		 * 
+		 */
+		export function createGzip(to: Class_Stream): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 创建一个 inflate 流对象
+		 * @param to 用于存储处理结果的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * @return 返回封装过的流对象
+		 * 
+		 * 
+		 */
+		export function createInflate(to: Class_Stream, maxSize?: number/** = -1*/): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 创建一个 inflateRaw 流对象
+		 * @param to 用于存储处理结果的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * @return 返回封装过的流对象
+		 * 
+		 * 
+		 */
+		export function createInflateRaw(to: Class_Stream, maxSize?: number/** = -1*/): Class_Stream;
+	
+		/**
+		 * 
+		 * @brief 使用 deflate 算法压缩数据(zlib格式)
+		 * @param data 给定要压缩的数据
+		 * @param level 指定压缩级别，缺省为 DEFAULT_COMPRESSION
+		 * @return 返回压缩后的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function deflate(data: Class_Buffer, level?: number/** = undefined*/): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用 deflate 算法压缩数据到流对象中(zlib格式)
+		 * @param data 给定要压缩的数据
+		 * @param stm 指定存储压缩数据的流
+		 * @param level 指定压缩级别，缺省为 DEFAULT_COMPRESSION
+		 * 
+		 * 
+		 * @async
+		 */
+		export function deflateTo(data: Class_Buffer, stm: Class_Stream, level?: number/** = undefined*/): void;
+	
+		/**
+		 * 
+		 * @brief 使用 deflate 算法压缩源流中的数据到流对象中(zlib格式)
+		 * @param src 给定要压缩的数据所在的流
+		 * @param stm 指定存储压缩数据的流
+		 * @param level 指定压缩级别，缺省为 DEFAULT_COMPRESSION
+		 * 
+		 * 
+		 * @async
+		 */
+		export function deflateTo(src: Class_Stream, stm: Class_Stream, level?: number/** = undefined*/): void;
+	
+		/**
+		 * 
+		 * @brief 解压缩 deflate 算法压缩的数据(zlib格式)
+		 * @param data 给定压缩后的数据
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * @return 返回解压缩后的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function inflate(data: Class_Buffer, maxSize?: number/** = -1*/): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 解压缩 deflate 算法压缩的数据到流对象中(zlib格式)
+		 * @param data 给定要解压缩的数据
+		 * @param stm 指定存储解压缩数据的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * 
+		 * 
+		 * @async
+		 */
+		export function inflateTo(data: Class_Buffer, stm: Class_Stream, maxSize?: number/** = -1*/): void;
+	
+		/**
+		 * 
+		 * @brief 解压缩源流中 deflate 算法压缩的数据到流对象中(zlib格式)
+		 * @param src 给定要解压缩的数据所在的流
+		 * @param stm 指定存储解压缩数据的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * 
+		 * 
+		 * @async
+		 */
+		export function inflateTo(src: Class_Stream, stm: Class_Stream, maxSize?: number/** = -1*/): void;
+	
+		/**
+		 * 
+		 * @brief 使用 gzip 算法压缩数据
+		 * @param data 给定要压缩的数据
+		 * @return 返回压缩后的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function gzip(data: Class_Buffer): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用 gzip 算法压缩数据到流对象中
+		 * @param data 给定要压缩的数据
+		 * @param stm 指定存储压缩数据的流
+		 * 
+		 * 
+		 * @async
+		 */
+		export function gzipTo(data: Class_Buffer, stm: Class_Stream): void;
+	
+		/**
+		 * 
+		 * @brief 使用 gzip 算法压缩源流中的数据到流对象中
+		 * @param src 给定要压缩的数据所在的流
+		 * @param stm 指定存储压缩数据的流
+		 * 
+		 * 
+		 * @async
+		 */
+		export function gzipTo(src: Class_Stream, stm: Class_Stream): void;
+	
+		/**
+		 * 
+		 * @brief 解压缩 gzip 算法压缩的数据
+		 * @param data 给定压缩后的数据
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * @return 返回解压缩后的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function gunzip(data: Class_Buffer, maxSize?: number/** = -1*/): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 解压缩 gzip 算法压缩的数据到流对象中
+		 * @param data 给定要解压缩的数据
+		 * @param stm 指定存储解压缩数据的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * 
+		 * 
+		 * @async
+		 */
+		export function gunzipTo(data: Class_Buffer, stm: Class_Stream, maxSize?: number/** = -1*/): void;
+	
+		/**
+		 * 
+		 * @brief 解压缩源流中 gzip 算法压缩的数据到流对象中
+		 * @param src 给定要解压缩的数据所在的流
+		 * @param stm 指定存储解压缩数据的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * 
+		 * 
+		 * @async
+		 */
+		export function gunzipTo(src: Class_Stream, stm: Class_Stream, maxSize?: number/** = -1*/): void;
+	
+		/**
+		 * 
+		 * @brief 使用 deflate 算法压缩数据(deflateRaw)
+		 * @param data 给定要压缩的数据
+		 * @param level 指定压缩级别，缺省为 DEFAULT_COMPRESSION
+		 * @return 返回压缩后的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function deflateRaw(data: Class_Buffer, level?: number/** = undefined*/): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 使用 deflate 算法压缩数据到流对象中(deflateRaw)
+		 * @param data 给定要压缩的数据
+		 * @param stm 指定存储压缩数据的流
+		 * @param level 指定压缩级别，缺省为 DEFAULT_COMPRESSION
+		 * 
+		 * 
+		 * @async
+		 */
+		export function deflateRawTo(data: Class_Buffer, stm: Class_Stream, level?: number/** = undefined*/): void;
+	
+		/**
+		 * 
+		 * @brief 使用 deflate 算法压缩源流中的数据到流对象中(deflateRaw)
+		 * @param src 给定要压缩的数据所在的流
+		 * @param stm 指定存储压缩数据的流
+		 * @param level 指定压缩级别，缺省为 DEFAULT_COMPRESSION
+		 * 
+		 * 
+		 * @async
+		 */
+		export function deflateRawTo(src: Class_Stream, stm: Class_Stream, level?: number/** = undefined*/): void;
+	
+		/**
+		 * 
+		 * @brief 解压缩 deflate 算法压缩的数据(inflateRaw)
+		 * @param data 给定压缩后的数据
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * @return 返回解压缩后的二进制数据
+		 * 
+		 * 
+		 * @async
+		 */
+		export function inflateRaw(data: Class_Buffer, maxSize?: number/** = -1*/): Class_Buffer;
+	
+		/**
+		 * 
+		 * @brief 解压缩 deflate 算法压缩的数据到流对象中(inflateRaw)
+		 * @param data 给定要解压缩的数据
+		 * @param stm 指定存储解压缩数据的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * 
+		 * 
+		 * @async
+		 */
+		export function inflateRawTo(data: Class_Buffer, stm: Class_Stream, maxSize?: number/** = -1*/): void;
+	
+		/**
+		 * 
+		 * @brief 解压缩源流中 deflate 算法压缩的数据到流对象中(inflateRaw)
+		 * @param src 给定要解压缩的数据所在的流
+		 * @param stm 指定存储解压缩数据的流
+		 * @param maxSize 指定解压缩尺寸限制，缺省为 -1，不限制
+		 * 
+		 * 
+		 * @async
+		 */
+		export function inflateRawTo(src: Class_Stream, stm: Class_Stream, maxSize?: number/** = -1*/): void;
+	
+	} /** end of `module zlib` */
+	export = zlib
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/declare/zmq.d.ts b/types/fibjs/declare/zmq.d.ts
new file mode 100644
index 0000000000..11f119e8f7
--- /dev/null
+++ b/types/fibjs/declare/zmq.d.ts
@@ -0,0 +1,314 @@
+/***************************************************************************
+ *                                                                         *
+ *   This file was automatically generated with idlc.js                    *
+ *	 build info: 								   						   *
+ *   	- fibjs	: 0.25.0                                                   *
+ *   	- date	: Jun 12 2018 07:22:40                                     *
+ *                                                                         *
+ ***************************************************************************/
+
+/** 
+ * @author Richard <richardo2016@gmail.com>
+ *
+ */
+
+
+
+
+
+/// <reference path="Buffer.d.ts" />
+
+/// <reference path="BufferedStream.d.ts" />
+
+/// <reference path="Chain.d.ts" />
+
+/// <reference path="Cipher.d.ts" />
+
+/// <reference path="Condition.d.ts" />
+
+/// <reference path="DbConnection.d.ts" />
+
+/// <reference path="DgramSocket.d.ts" />
+
+/// <reference path="Digest.d.ts" />
+
+/// <reference path="Event.d.ts" />
+
+/// <reference path="EventEmitter.d.ts" />
+
+/// <reference path="EventInfo.d.ts" />
+
+/// <reference path="Fiber.d.ts" />
+
+/// <reference path="File.d.ts" />
+
+/// <reference path="Handler.d.ts" />
+
+/// <reference path="HandlerEx.d.ts" />
+
+/// <reference path="HeapGraphEdge.d.ts" />
+
+/// <reference path="HeapGraphNode.d.ts" />
+
+/// <reference path="HeapSnapshot.d.ts" />
+
+/// <reference path="HttpClient.d.ts" />
+
+/// <reference path="HttpCollection.d.ts" />
+
+/// <reference path="HttpCookie.d.ts" />
+
+/// <reference path="HttpHandler.d.ts" />
+
+/// <reference path="HttpMessage.d.ts" />
+
+/// <reference path="HttpRequest.d.ts" />
+
+/// <reference path="HttpResponse.d.ts" />
+
+/// <reference path="HttpServer.d.ts" />
+
+/// <reference path="HttpUploadData.d.ts" />
+
+/// <reference path="HttpsServer.d.ts" />
+
+/// <reference path="Image.d.ts" />
+
+/// <reference path="Int64.d.ts" />
+
+/// <reference path="LevelDB.d.ts" />
+
+/// <reference path="Lock.d.ts" />
+
+/// <reference path="LruCache.d.ts" />
+
+/// <reference path="MSSQL.d.ts" />
+
+/// <reference path="MemoryStream.d.ts" />
+
+/// <reference path="Message.d.ts" />
+
+/// <reference path="MongoCollection.d.ts" />
+
+/// <reference path="MongoCursor.d.ts" />
+
+/// <reference path="MongoDB.d.ts" />
+
+/// <reference path="MongoID.d.ts" />
+
+/// <reference path="MySQL.d.ts" />
+
+/// <reference path="PKey.d.ts" />
+
+/// <reference path="Redis.d.ts" />
+
+/// <reference path="RedisHash.d.ts" />
+
+/// <reference path="RedisList.d.ts" />
+
+/// <reference path="RedisSet.d.ts" />
+
+/// <reference path="RedisSortedSet.d.ts" />
+
+/// <reference path="Routing.d.ts" />
+
+/// <reference path="SQLite.d.ts" />
+
+/// <reference path="SandBox.d.ts" />
+
+/// <reference path="SeekableStream.d.ts" />
+
+/// <reference path="Semaphore.d.ts" />
+
+/// <reference path="Service.d.ts" />
+
+/// <reference path="Smtp.d.ts" />
+
+/// <reference path="Socket.d.ts" />
+
+/// <reference path="SslHandler.d.ts" />
+
+/// <reference path="SslServer.d.ts" />
+
+/// <reference path="SslSocket.d.ts" />
+
+/// <reference path="Stat.d.ts" />
+
+/// <reference path="Stats.d.ts" />
+
+/// <reference path="Stream.d.ts" />
+
+/// <reference path="StringDecoder.d.ts" />
+
+/// <reference path="SubProcess.d.ts" />
+
+/// <reference path="TcpServer.d.ts" />
+
+/// <reference path="Timer.d.ts" />
+
+/// <reference path="UrlObject.d.ts" />
+
+/// <reference path="WebSocket.d.ts" />
+
+/// <reference path="WebSocketMessage.d.ts" />
+
+/// <reference path="WebView.d.ts" />
+
+/// <reference path="Worker.d.ts" />
+
+/// <reference path="X509Cert.d.ts" />
+
+/// <reference path="X509Crl.d.ts" />
+
+/// <reference path="X509Req.d.ts" />
+
+/// <reference path="XmlAttr.d.ts" />
+
+/// <reference path="XmlCDATASection.d.ts" />
+
+/// <reference path="XmlCharacterData.d.ts" />
+
+/// <reference path="XmlComment.d.ts" />
+
+/// <reference path="XmlDocument.d.ts" />
+
+/// <reference path="XmlDocumentType.d.ts" />
+
+/// <reference path="XmlElement.d.ts" />
+
+/// <reference path="XmlNamedNodeMap.d.ts" />
+
+/// <reference path="XmlNode.d.ts" />
+
+/// <reference path="XmlNodeList.d.ts" />
+
+/// <reference path="XmlProcessingInstruction.d.ts" />
+
+/// <reference path="XmlText.d.ts" />
+
+/// <reference path="ZipFile.d.ts" />
+
+/// <reference path="ZmqSocket.d.ts" />
+
+/// <reference path="object.d.ts" />
+
+
+
+/** module Or Internal Object */
+/**
+	* @brief zeroMQ 消息队列模块
+	* @detail 基础模块。提供 zeroMQ 消息队列支撑。,```JavaScript,var zmq = require('zmq');,```
+	*/
+declare module "zmq" {
+	
+
+	module zmq {
+		
+		/**
+		 * 
+		 * 
+		 * 
+		 * 
+		 */
+		export const PAIR = 0;
+		
+		/**
+		 * 
+		 * @brief 发布类型，所发送的消息将会分发给所有订阅者。
+		 * 
+		 * 
+		 */
+		export const PUB = 1;
+		
+		/**
+		 * 
+		 * @brief 订阅类型，用于接收 PUB 分发的消息。
+		 * 
+		 * 
+		 */
+		export const SUB = 2;
+		
+		/**
+		 * 
+		 * @brief 请求类型，此类型的接口只允许交替进行 send 和 recv 消息，每一个接受的消息都是最后一次发送请求的响应。
+		 * 
+		 * 
+		 */
+		export const REQ = 3;
+		
+		/**
+		 * 
+		 * @brief 响应类型，此类型的接口只允许交替进行 recv 和 send 消息，每一个发送的消息都会作为最后一次接受的请求的回应。
+		 * 
+		 * 
+		 */
+		export const REP = 4;
+		
+		/**
+		 * 
+		 * 
+		 * 
+		 * 
+		 */
+		export const DEALER = 5;
+		
+		/**
+		 * 
+		 * 
+		 * 
+		 * 
+		 */
+		export const ROUTER = 6;
+		
+		/**
+		 * 
+		 * @brief 获取消息类型，上游推送的消息将被公平的分发到此类接口。
+		 * 
+		 * 
+		 */
+		export const PULL = 7;
+		
+		/**
+		 * 
+		 * @brief 推送类型，推送的消息将均衡发送到下游接口。
+		 * 
+		 * 
+		 */
+		export const PUSH = 8;
+		
+		/**
+		 * 
+		 * 
+		 * 
+		 * 
+		 */
+		export const XPUB = 9;
+		
+		/**
+		 * 
+		 * 
+		 * 
+		 * 
+		 */
+		export const XSUB = 10;
+		
+		
+		
+		/**
+		 * 
+		 * @brief ZmqSocket 对象，参见 ZmqSocket
+		 * 
+		 * 
+		 */
+		export class Socket extends Class_ZmqSocket {}
+		
+		
+		
+		
+	} /** end of `module zmq` */
+	export = zmq
+}
+
+/** endof `module Or Internal Object` */
+
+
diff --git a/types/fibjs/fibjs-tests.ts b/types/fibjs/fibjs-tests.ts
new file mode 100644
index 0000000000..90b5f5ff6c
--- /dev/null
+++ b/types/fibjs/fibjs-tests.ts
@@ -0,0 +1,48 @@
+import assert = require('assert');
+import base32 = require('base32');
+import base64 = require('base64');
+import base64vlq = require('base64vlq');
+import bson = require('bson');
+import console = require('console');
+import constants = require('constants');
+import coroutine = require('coroutine');
+import crypto = require('crypto');
+import db = require('db');
+import dgram = require('dgram');
+import dns = require('dns');
+// import encoding = require('encoding');
+import fs = require('fs');
+import gd = require('gd');
+// import global = require('global');
+import gui = require('gui');
+import hash = require('hash');
+import hex = require('hex');
+import http = require('http');
+import iconv = require('iconv');
+import io = require('io');
+import json = require('json');
+import mq = require('mq');
+import net = require('net');
+import os = require('os');
+import path = require('path');
+import path_posix = require('path_posix');
+import path_win32 = require('path_win32');
+import process = require('process');
+import profiler = require('profiler');
+import punycode = require('punycode');
+import querystring = require('querystring');
+import registry = require('registry');
+import ssl = require('ssl');
+import string_decoder = require('string_decoder');
+// import test = require('test');
+import timers = require('timers');
+import tty = require('tty');
+import url = require('url');
+import util = require('util');
+import uuid = require('uuid');
+import vm = require('vm');
+import ws = require('ws');
+import xml = require('xml');
+import zip = require('zip');
+import zlib = require('zlib');
+import zmq = require('zmq');
diff --git a/types/fibjs/index.d.ts b/types/fibjs/index.d.ts
new file mode 100644
index 0000000000..02201fd904
--- /dev/null
+++ b/types/fibjs/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for fibjs 0.26
+// Project: https://github.com/fibjs/fibjs
+// Definitions by: richardo2016 <https://github.com/richardo2016>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="declare/index.d.ts" />
diff --git a/types/fibjs/tsconfig.json b/types/fibjs/tsconfig.json
new file mode 100644
index 0000000000..c42204e812
--- /dev/null
+++ b/types/fibjs/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",
+        "fibjs-tests.ts"
+    ]
+}
diff --git a/types/fibjs/tslint.json b/types/fibjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/fibjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/figlet/figlet-tests.ts b/types/figlet/figlet-tests.ts
new file mode 100644
index 0000000000..676fb9003f
--- /dev/null
+++ b/types/figlet/figlet-tests.ts
@@ -0,0 +1,95 @@
+import figlet = require('figlet');
+
+figlet('abc', (err, str) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType string | undefined
+  str;
+});
+figlet('My World', '1Row', (err, str) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType string | undefined
+  str;
+});
+// $ExpectError
+figlet('fweGWEPewfe', 'What is the font? I cannot get it');
+// $ExpectError
+figlet('qweoqw');
+// $ExpectError
+figlet('qweoqw', '1Row');
+// $ExpectError
+figlet('qweoqw', '1Row', undefined as any, undefined as any);
+
+figlet.text('tokiyo tomare', (err, str) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType string | undefined
+  str;
+});
+figlet.text('Hi', 'Flower Power', (err, str) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType string | undefined
+  str;
+});
+figlet.text('Annyeong', {
+  font: 'Fun Face',
+  horizontalLayout: 'full',
+  verticalLayout: 'fitted',
+}, (err, str) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType string | undefined
+  str;
+});
+figlet.text('Oreehe', {
+  font: 'Fun Face',
+  // $ExpectError
+  value: 'abc',
+}, undefined as any);
+// $ExpectError
+figlet.text('It cannot make sense');
+
+// $ExpectType string
+figlet.textSync('test text');
+// $ExpectType string
+figlet.textSync('text desu', 'Fuzzy');
+// $ExpectType string
+figlet.textSync('oho', {
+  font: 'Invita',
+});
+// $ExpectError
+figlet.textSync();
+
+figlet.metadata('JS Block Letters', (err, fontOptions, headerComment) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType FontOptions | undefined
+  fontOptions;
+  // $ExpectType string | undefined
+  headerComment;
+});
+// $ExpectError
+figlet.metadata('This is random font name which cannot make sense', undefined as any);
+// $ExpectError
+figlet.metadata('Alligator', undefined as any, undefined as any);
+
+// $ExpectType Defaults
+figlet.defaults();
+// $ExpectType Defaults
+figlet.defaults({});
+// $ExpectType Defaults
+figlet.defaults({
+  font: 'Patorjk\'s Cheese'
+});
+
+figlet.fonts((err, fonts) => {
+  // $ExpectType Error | null
+  err;
+  // $ExpectType Fonts[] | undefined
+  fonts;
+});
+
+// $ExpectType Fonts[]
+figlet.fontsSync();
diff --git a/types/figlet/index.d.ts b/types/figlet/index.d.ts
new file mode 100644
index 0000000000..07bb706066
--- /dev/null
+++ b/types/figlet/index.d.ts
@@ -0,0 +1,406 @@
+// Type definitions for figlet 1.2
+// Project: https://github.com/patorjk/figlet.js
+// Definitions by: Junyoung Clare Jang <https://github.com/Ailrun>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.1
+
+declare namespace figlet {
+    type Fonts =
+        | '1Row'
+        | '3-D'
+        | '3D Diagonal'
+        | '3D-ASCII'
+        | '3x5'
+        | '4Max'
+        | '5 Line Oblique'
+        | 'AMC 3 Line'
+        | 'AMC 3 Liv1'
+        | 'AMC AAA01'
+        | 'AMC Neko'
+        | 'AMC Razor'
+        | 'AMC Razor2'
+        | 'AMC Slash'
+        | 'AMC Slider'
+        | 'AMC Thin'
+        | 'AMC Tubes'
+        | 'AMC Untitled'
+        | 'ANSI Shadow'
+        | 'ASCII New Roman'
+        | 'Acrobatic'
+        | 'Alligator'
+        | 'Alligator2'
+        | 'Alpha'
+        | 'Alphabet'
+        | 'Arrows'
+        | 'Avatar'
+        | 'B1FF'
+        | 'B1FF'
+        | 'Banner'
+        | 'Banner3-D'
+        | 'Banner3'
+        | 'Banner4'
+        | 'Barbwire'
+        | 'Basic'
+        | 'Bear'
+        | 'Bell'
+        | 'Benjamin'
+        | 'Big Chief'
+        | 'Big Money-ne'
+        | 'Big Money-nw'
+        | 'Big Money-se'
+        | 'Big Money-sw'
+        | 'Big'
+        | 'Bigfig'
+        | 'Binary'
+        | 'Block'
+        | 'Blocks'
+        | 'Bloody'
+        | 'Bolger'
+        | 'Braced'
+        | 'Bright'
+        | 'Broadway KB'
+        | 'Broadway'
+        | 'Bubble'
+        | 'Bulbhead'
+        | 'Caligraphy'
+        | 'Caligraphy2'
+        | 'Calvin S'
+        | 'Cards'
+        | 'Catwalk'
+        | 'Chiseled'
+        | 'Chunky'
+        | 'Coinstak'
+        | 'Cola'
+        | 'Colossal'
+        | 'Computer'
+        | 'Contessa'
+        | 'Contrast'
+        | 'Cosmike'
+        | 'Crawford'
+        | 'Crawford2'
+        | 'Crazy'
+        | 'Cricket'
+        | 'Cursive'
+        | 'Cyberlarge'
+        | 'Cybermedium'
+        | 'Cybersmall'
+        | 'Cygnet'
+        | 'DANC4'
+        | 'DOS Rebel'
+        | 'DWhistled'
+        | 'Dancing Font'
+        | 'Decimal'
+        | 'Def Leppard'
+        | 'Delta Corps Priest 1'
+        | 'Diamond'
+        | 'Diet Cola'
+        | 'Digital'
+        | 'Doh'
+        | 'Doom'
+        | 'Dot Matrix'
+        | 'Double Shorts'
+        | 'Double'
+        | 'Dr Pepper'
+        | 'Efti Chess'
+        | 'Efti Font'
+        | 'Efti Italic'
+        | 'Efti Piti'
+        | 'Efti Robot'
+        | 'Efti Wall'
+        | 'Efti Water'
+        | 'Electronic'
+        | 'Elite'
+        | 'Epic'
+        | 'Fender'
+        | 'Filter'
+        | 'Fire Font-k'
+        | 'Fire Font-s'
+        | 'Flipped'
+        | 'Flower Power'
+        | 'Four Tops'
+        | 'Fraktur'
+        | 'Fun Face'
+        | 'Fun Faces'
+        | 'Fuzzy'
+        | 'Georgi16'
+        | 'Georgia11'
+        | 'Ghost'
+        | 'Ghoulish'
+        | 'Glenyn'
+        | 'Goofy'
+        | 'Gothic'
+        | 'Graceful'
+        | 'Gradient'
+        | 'Graffiti'
+        | 'Greek'
+        | 'Heart Left'
+        | 'Heart Right'
+        | 'Henry 3D'
+        | 'Hex'
+        | 'Hieroglyphs'
+        | 'Hollywood'
+        | 'Horizontal Left'
+        | 'Horizontal Right'
+        | 'ICL-1900'
+        | 'Impossible'
+        | 'Invita'
+        | 'Isometric1'
+        | 'Isometric2'
+        | 'Isometric3'
+        | 'Isometric4'
+        | 'Italic'
+        | 'Ivrit'
+        | 'JS Block Letters'
+        | 'JS Bracket Letters'
+        | 'JS Capital Curves'
+        | 'JS Cursive'
+        | 'JS Stick Letters'
+        | 'Jacky'
+        | 'Jazmine'
+        | 'Jerusalem'
+        | 'Katakana'
+        | 'Kban'
+        | 'Keyboard'
+        | 'Knob'
+        | 'Konto Slant'
+        | 'Konto'
+        | 'LCD'
+        | 'Larry 3D 2'
+        | 'Larry 3D'
+        | 'Lean'
+        | 'Letters'
+        | 'Lil Devil'
+        | 'Line Blocks'
+        | 'Linux'
+        | 'Lockergnome'
+        | 'Madrid'
+        | 'Marquee'
+        | 'Maxfour'
+        | 'Merlin1'
+        | 'Merlin2'
+        | 'Mike'
+        | 'Mini'
+        | 'Mirror'
+        | 'Mnemonic'
+        | 'Modular'
+        | 'Morse'
+        | 'Morse2'
+        | 'Moscow'
+        | 'Mshebrew210'
+        | 'Muzzle'
+        | 'NScript'
+        | 'NT Greek'
+        | 'NV Script'
+        | 'Nancyj-Fancy'
+        | 'Nancyj-Improved'
+        | 'Nancyj-Underlined'
+        | 'Nancyj'
+        | 'Nipples'
+        | 'O8'
+        | 'OS2'
+        | 'Octal'
+        | 'Ogre'
+        | 'Old Banner'
+        | 'Patorjk\'s Cheese'
+        | 'Patorjk-HeX'
+        | 'Pawp'
+        | 'Peaks Slant'
+        | 'Peaks'
+        | 'Pebbles'
+        | 'Pepper'
+        | 'Poison'
+        | 'Puffy'
+        | 'Puzzle'
+        | 'Pyramid'
+        | 'Rammstein'
+        | 'Rectangles'
+        | 'Red Phoenix'
+        | 'Relief'
+        | 'Relief2'
+        | 'Reverse'
+        | 'Roman'
+        | 'Rot13'
+        | 'Rot13'
+        | 'Rotated'
+        | 'Rounded'
+        | 'Rowan Cap'
+        | 'Rozzo'
+        | 'Runic'
+        | 'Runyc'
+        | 'S Blood'
+        | 'SL Script'
+        | 'Santa Clara'
+        | 'Script'
+        | 'Serifcap'
+        | 'Shadow'
+        | 'Shimrod'
+        | 'Short'
+        | 'Slant Relief'
+        | 'Slant'
+        | 'Slide'
+        | 'Small Caps'
+        | 'Small Isometric1'
+        | 'Small Keyboard'
+        | 'Small Poison'
+        | 'Small Script'
+        | 'Small Shadow'
+        | 'Small Slant'
+        | 'Small Tengwar'
+        | 'Small'
+        | 'Soft'
+        | 'Speed'
+        | 'Spliff'
+        | 'Stacey'
+        | 'Stampate'
+        | 'Stampatello'
+        | 'Standard'
+        | 'Star Strips'
+        | 'Star Wars'
+        | 'Stellar'
+        | 'Stforek'
+        | 'Stick Letters'
+        | 'Stop'
+        | 'Straight'
+        | 'Stronger Than All'
+        | 'Sub-Zero'
+        | 'Swamp Land'
+        | 'Swan'
+        | 'Sweet'
+        | 'THIS'
+        | 'Tanja'
+        | 'Tengwar'
+        | 'Term'
+        | 'Test1'
+        | 'The Edge'
+        | 'Thick'
+        | 'Thin'
+        | 'Thorned'
+        | 'Three Point'
+        | 'Ticks Slant'
+        | 'Ticks'
+        | 'Tiles'
+        | 'Tinker-Toy'
+        | 'Tombstone'
+        | 'Train'
+        | 'Trek'
+        | 'Tsalagi'
+        | 'Tubular'
+        | 'Twisted'
+        | 'Two Point'
+        | 'USA Flag'
+        | 'Univers'
+        | 'Varsity'
+        | 'Wavy'
+        | 'Weird'
+        | 'Wet Letter'
+        | 'Whimsy'
+        | 'Wow'
+        ;
+
+    type KerningMethods =
+        | 'default'
+        | 'full'
+        | 'fitted'
+        | 'controlled smushing'
+        | 'universal smushing'
+        ;
+    type PrintDirection = number;
+
+    interface FittingRules {
+        vLayout: number;
+        vRule5: boolean;
+        vRule4: boolean;
+        vRule3: boolean;
+        vRule2: boolean;
+        vRule1: boolean;
+        hLayout: number;
+        hRule6: boolean;
+        hRule5: boolean;
+        hRule4: boolean;
+        hRule3: boolean;
+        hRule2: boolean;
+        hRule1: boolean;
+    }
+
+    interface Options {
+        font?: Fonts;
+        horizontalLayout?: KerningMethods;
+        verticalLayout?: KerningMethods;
+        printDirection?: PrintDirection;
+        showHardBlanks?: boolean;
+    }
+    interface FontOptions {
+        hardBlank: string;
+        height: number;
+        baseline: number;
+        maxLength: number;
+        oldLayout: number;
+        numCommentLines: number;
+        printDirection: PrintDirection;
+        fullLayout: number | null;
+        codeTagCount: number | null;
+        fittingRules: FittingRules;
+    }
+    interface Defaults {
+        font: Fonts;
+        fontPath: string;
+    }
+
+    function text(txt: string, cb: (error: Error | null, result?: string) => void): void;
+    function text(txt: string, font: Fonts, cb: (error: Error | null, result?: string) => void): void;
+    /**
+     * @desc
+     * This `unified-signatures` is disabled because `Fonts` type is too long
+     */
+    // tslint:disable-next-line: unified-signatures
+    function text(txt: string, options: Options | undefined, cb: (error: Error | null, result?: string) => void): void;
+
+    function textSync(txt: string, font?: Fonts): string;
+    /**
+     * @desc
+     * This `unified-signatures` is disabled because `Fonts` type is too long
+     */
+    // tslint:disable-next-line: unified-signatures
+    function textSync(txt: string, options: Options): string;
+
+    function metadata(font: Fonts, cb: (error: Error | null, fontOptions?: FontOptions, headerComment?: string) => void): void;
+
+    function defaults(opt?: Partial<Defaults>): Defaults;
+
+    function loadFont(font: Fonts, cb: (error: Error | null, fontOptions?: FontOptions) => void): void;
+    /**
+     * @todo
+     * Use 'node' namespace to add following methods only in node environment.
+     */
+    /**
+     * @warn
+     * This method works in node environment only.
+     * In browser environment, this method does not work.
+     */
+    function loadFontSync(font: Fonts): FontOptions;
+    /**
+     * @warn
+     * This method exists in node environment only.
+     * In browser environment, this method does not exist.
+     */
+    function fonts(cb: (error: Error | null, fontList?: Fonts[]) => void): void;
+    /**
+     * @warn
+     * This method exists in node environment only.
+     * In browser environment, this method does not exist.
+     */
+    function fontsSync(): Fonts[];
+}
+
+declare function figlet(txt: string, cb: (error: Error | null, result?: string) => void): void;
+declare function figlet(txt: string, font: figlet.Fonts, cb: (error: Error | null, result?: string) => void): void;
+/**
+ * @desc
+ * This `unified-signatures` is disabled because `Fonts` type is too long
+ */
+// tslint:disable-next-line: unified-signatures
+declare function figlet(txt: string, options: figlet.Options | undefined, cb: (error: Error | null, result?: string) => void): void;
+
+export as namespace figlet;
+export = figlet;
diff --git a/types/figlet/tsconfig.json b/types/figlet/tsconfig.json
new file mode 100644
index 0000000000..946bec6c7d
--- /dev/null
+++ b/types/figlet/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",
+        "figlet-tests.ts"
+    ]
+}
diff --git a/types/figlet/tslint.json b/types/figlet/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/figlet/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/filesystem/index.d.ts b/types/filesystem/index.d.ts
index 93dbb35d61..76ac35668c 100644
--- a/types/filesystem/index.d.ts
+++ b/types/filesystem/index.d.ts
@@ -1,21 +1,21 @@
 // Type definitions for File System API
 // Project: http://www.w3.org/TR/file-system-api/
-// Definitions by: Kon <http://phyzkit.net/> 
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped 
+// Definitions by: Kon <http://phyzkit.net/>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="filewriter" />
 
 interface LocalFileSystem {
-    
+
     /**
      * Used for storage with no guarantee of persistence.
      */
-    TEMPORARY:number;
+    TEMPORARY: number;
 
     /**
      * Used for storage that should not be removed by the user agent without application or user permission.
      */
-    PERSISTENT:number;
+    PERSISTENT: number;
 
     /**
      * Requests a filesystem in which to store application data.
@@ -24,50 +24,50 @@ interface LocalFileSystem {
      * @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:number, size:number, successCallback:FileSystemCallback, errorCallback?:ErrorCallback):void;
-    
+    requestFileSystem(type: number, size: number, successCallback: FileSystemCallback, errorCallback?: ErrorCallback): void;
+
     /**
      * Allows the user to look up the Entry for a file or directory referred to by a local URL.
      * @param url A URL referring to a local file in a filesystem accessable via this API.
      * @param successCallback A callback that is called to report the Entry to which the supplied URL refers.
      * @param errorCallback A callback that is called when errors happen, or when the request to obtain the Entry is denied.
-     */ 
-    resolveLocalFileSystemURL(url:string, successCallback:EntryCallback, errorCallback?:ErrorCallback):void;
+     */
+    resolveLocalFileSystemURL(url: string, successCallback: EntryCallback, errorCallback?: ErrorCallback): void;
 
     /**
      * see requestFileSystem.
      */
-    webkitRequestFileSystem(type:number, size:number, successCallback:FileSystemCallback, errorCallback?:ErrorCallback):void;
+    webkitRequestFileSystem(type: number, size: number, successCallback: FileSystemCallback, errorCallback?: ErrorCallback): void;
 }
 
 interface LocalFileSystemSync {
     /**
      * Used for storage with no guarantee of persistence.
      */
-    TEMPORARY:number;
+    TEMPORARY: number;
 
     /**
      * Used for storage that should not be removed by the user agent without application or user permission.
      */
-    PERSISTENT:number;
+    PERSISTENT: number;
 
     /**
      * 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.
      */
-    requestFileSystemSync(type:number, size:number):FileSystemSync;
+    requestFileSystemSync(type: number, size: number): FileSystemSync;
 
     /**
      * Allows the user to look up the Entry for a file or directory referred to by a local URL.
      * @param url A URL referring to a local file in a filesystem accessable via this API.
      */
-    resolveLocalFileSystemSyncURL(url:string):EntrySync;
+    resolveLocalFileSystemSyncURL(url: string): EntrySync;
 
     /**
      * see requestFileSystemSync
      */
-    webkitRequestFileSystemSync(type:number, size:number):FileSystemSync;
+    webkitRequestFileSystemSync(type: number, size: number): FileSystemSync;
 }
 
 interface Metadata {
@@ -75,31 +75,31 @@ interface Metadata {
      * This is the time at which the file or directory was last modified.
      * @readonly
      */
-    modificationTime:Date;
+    modificationTime: Date;
 
     /**
      * The size of the file, in bytes. This must return 0 for directories.
      * @readonly
      */
-    size:number;
+    size: number;
 }
 
 interface Flags {
     /**
      * Used to indicate that the user wants to create a file or directory if it was not previously there.
      */
-    create?:boolean;
+    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;
+    exclusive?: boolean;
 }
 
-/** 
+/**
  * This interface represents a file system.
  */
-interface FileSystem{
+interface FileSystem {
     /**
      * This is the name of the file system. The specifics of naming filesystems is unspecified, but a name must be unique across the list of exposed file systems.
      * @readonly
@@ -118,38 +118,38 @@ interface Entry {
     /**
      * Entry is a file.
      */
-    isFile:boolean;
+    isFile: boolean;
 
     /**
      * Entry is a directory.
      */
-    isDirectory:boolean;
+    isDirectory: boolean;
 
     /**
      * Look up metadata about this entry.
      * @param successCallback A callback that is called with the time of the last modification.
      * @param errorCallback ErrorCallback A callback that is called when errors happen.
      */
-    getMetadata(successCallback:MetadataCallback, errorCallback?:ErrorCallback):void;
-    
+    getMetadata(successCallback: MetadataCallback, errorCallback?: ErrorCallback): void;
+
     /**
      * The name of the entry, excluding the path leading to it.
      */
-    name:string;
+    name: string;
 
     /**
      * The full absolute path from the root to the entry.
      */
-    fullPath:string;
+    fullPath: string;
 
     /**
      * The file system on which the entry resides.
      */
-    filesystem:FileSystem;
+    filesystem: FileSystem;
 
     /**
      * Move an entry to a different location on the file system. It is an error to try to:
-     * 
+     *
      * <ui>
      * <li>move a directory inside itself or to any child at any depth;</li>
      * <li>move an entry into its parent if a name different from its current one isn't provided;</li>
@@ -161,12 +161,12 @@ interface Entry {
      * 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.
      */
-    moveTo(parent:DirectoryEntry, newName?:string, successCallback?:EntryCallback, errorCallback?:ErrorCallback):void;
-    
+    moveTo(parent: DirectoryEntry, newName?: string, successCallback?: EntryCallback, errorCallback?: ErrorCallback): void;
+
     /**
      * Copy an entry to a different location on the file system. It is an error to try to:
-     * 
-     * <ul> 
+     *
+     * <ul>
      * <li> copy a directory inside itself or to any child at any depth;</li>
      * <li> copy an entry into its parent if a name different from its current one isn't provided;</li>
      * <li> copy a file to a path occupied by a directory;</li>
@@ -178,26 +178,26 @@ interface Entry {
      *
      * Directory copies are always recursive--that is, they copy all contents of the directory.
      */
-    copyTo(parent:DirectoryEntry, newName?:string, successCallback?:EntryCallback, errorCallback?:ErrorCallback):void;
-    
+    copyTo(parent: DirectoryEntry, newName?: string, successCallback?: EntryCallback, errorCallback?: ErrorCallback): void;
+
     /**
      * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
      */
-    toURL():string;
+    toURL(): 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:VoidCallback, errorCallback?:ErrorCallback):void;
-    
+    remove(successCallback: VoidCallback, errorCallback?: ErrorCallback): 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 to return the parent Entry.
      * @param errorCallback A callback that is called when errors happen.
      */
-    getParent(successCallback:DirectoryEntryCallback, errorCallback?:ErrorCallback):void;
+    getParent(successCallback: DirectoryEntryCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -207,13 +207,13 @@ interface DirectoryEntry extends Entry {
     /**
      * Creates a new DirectoryReader to read Entries from this Directory.
      */
-    createReader():DirectoryReader;
+    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
-     *     <ul> 
+     *     <ul>
      *     <li>If create and exclusive are both true, and the path already exists, getFile must fail.</li>
      *     <li>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.</li>
      *     <li>If create is not true and the path doesn't exist, getFile must fail.</li>
@@ -223,12 +223,12 @@ interface DirectoryEntry extends Entry {
      * @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?:FileEntryCallback, errorCallback?:ErrorCallback):void;
-    
+    getFile(path: string, options?: Flags, successCallback?: FileEntryCallback, errorCallback?: ErrorCallback): 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 
+     * @param options
      *     <ul>
      *     <li>If create and exclusive are both true and the path already exists, getDirectory must fail.</li>
      *     <li>If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.</li>
@@ -238,16 +238,16 @@ interface DirectoryEntry extends Entry {
      *     </ul>
      * @param successCallback   A callback that is called to return the DirectoryEntry selected or created.
      * @param errorCallback A callback that is called when errors happen.
-     * 
+     *
      */
-    getDirectory(path:string, options?:Flags, successCallback?:DirectoryEntryCallback, errorCallback?:ErrorCallback):void;
-    
+    getDirectory(path: string, options?: Flags, successCallback?: DirectoryEntryCallback, errorCallback?: ErrorCallback): 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:VoidCallback, errorCallback?:ErrorCallback):void;
+    removeRecursively(successCallback: VoidCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -265,7 +265,7 @@ interface DirectoryReader {
      * @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:EntriesCallback, errorCallback?:ErrorCallback):void;
+    readEntries(successCallback: EntriesCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -277,14 +277,14 @@ interface FileEntry extends Entry {
      * @param successCallback A callback that is called with the new FileWriter.
      * @param errorCallback A callback that is called when errors happen.
      */
-    createWriter(successCallback:FileWriterCallback, errorCallback?:ErrorCallback):void;
+    createWriter(successCallback: FileWriterCallback, errorCallback?: ErrorCallback): 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:FileCallback, errorCallback?:ErrorCallback):void;
+    file(successCallback: FileCallback, errorCallback?: ErrorCallback): void;
 }
 
 /**
@@ -294,7 +294,7 @@ interface FileSystemCallback {
     /**
      * @param filesystem The file systems to which the app is granted access.
      */
-    (filesystem:FileSystem):void;
+    (filesystem: FileSystem): void;
 }
 
 /**
@@ -304,7 +304,7 @@ interface EntryCallback {
     /**
      * @param entry
      */
-    (entry:Entry):void;
+    (entry: Entry): void;
 }
 
 /**
@@ -314,7 +314,7 @@ interface FileEntryCallback {
     /**
      * @param entry
      */
-    (entry:FileEntry):void;
+    (entry: FileEntry): void;
 }
 
 /**
@@ -324,102 +324,102 @@ interface DirectoryEntryCallback {
     /**
      * @param entry
      */
-    (entry:DirectoryEntry):void;
+    (entry: DirectoryEntry): void;
 }
 
 /**
  * When readEntries() succeeds, the following callback is made.
  */
 interface EntriesCallback {
-    (entries:Entry[]):void;
+    (entries: Entry[]): void;
 }
 
 /**
  * This interface is the callback used to look up file and directory metadata.
  */
 interface MetadataCallback {
-    (metadata:Metadata):void;
+    (metadata: Metadata): void;
 }
 
 /**
  * This interface is the callback used to create a FileWriter.
- */ 
+ */
 interface FileWriterCallback {
-    (fileWriter:FileWriter):void;
+    (fileWriter: FileWriter): void;
 }
 
 /**
  * This interface is the callback used to obtain a File.
  */
 interface FileCallback {
-    (file:File):void;
+    (file: File): void;
 }
 
-/** 
+/**
  * This interface is the generic callback used to indicate success of an asynchronous method.
- */ 
+ */
 interface VoidCallback {
-    ():void;
+    (): void;
 }
 
 /**
  * When an error occurs, the following callback is made.
  */
 interface ErrorCallback {
-    (err:DOMError):void;
+    (err: DOMError): void;
 }
 
 
-/** 
+/**
  * This interface represents a file system.
  */
 interface FileSystemSync {
     /**
      * This is the name of the file system. The specifics of naming filesystems is unspecified, but a name must be unique across the list of exposed file systems.
      */
-    name:string;
+    name: string;
 
     /**
      * root The root directory of the file system.
      */
-    root:DirectoryEntrySync;
+    root: DirectoryEntrySync;
 }
 
 /**
  * An abstract interface representing entries in a file system, each of which may be a FileEntrySync or DirectoryEntrySync.
  */
-interface EntrySync{
+interface EntrySync {
     /**
      * EntrySync is a file.
      * @readonly
      */
-    isFile:boolean;
+    isFile: boolean;
 
     /**
      * EntrySync is a directory.
      * @readonly
      */
-    isDirectory:boolean;
+    isDirectory: boolean;
 
     /**
      * Look up metadata about this entry.
      */
-    getMetadata():Metadata;
-    
+    getMetadata(): Metadata;
+
     /**
      * The name of the entry, excluding the path leading to it.
      */
-    name:string;
+    name: string;
 
     /**
      * The full absolute path from the root to the entry.
      */
-    fullPath:string;
+    fullPath: string;
 
     /**
      * The file system on which the entry resides.
      */
-    filesystem:FileSystemSync;
+    filesystem: FileSystemSync;
 
     /**
      * Move an entry to a different location on the file system. It is an error to try to:
@@ -429,12 +429,12 @@ interface EntrySync{
      * <li> move a file to a path occupied by a directory;</li>
      * <li> move a directory to a path occupied by a file;</li>
      * <li> move any element to a path occupied by a directory which is not empty.</li>
-     * </ui> 
+     * </ui>
      * 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 EntrySync's current name if unspecified.
      */
-    moveTo(parent:DirectoryEntrySync, newName?:string):EntrySync;
+    moveTo(parent: DirectoryEntrySync, newName?: string): EntrySync;
 
     /**
      * Copy an entry to a different location on the file system. It is an error to try to:
@@ -444,27 +444,27 @@ interface EntrySync{
      * <li> copy a file to a path occupied by a directory;</li>
      * <li> copy a directory to a path occupied by a file;</li>
      * <li> copy any element to a path occupied by a directory which is not empty.</li>
-     * </ui> 
+     * </ui>
      * 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.
      */
-    copyTo(parent:DirectoryEntrySync, newName?:string):EntrySync;
+    copyTo(parent: DirectoryEntrySync, newName?: string): EntrySync;
 
     /**
      * Returns a URL that can be used to identify this entry. Unlike the URN defined in [FILE-API-ED], it has no specific expiration; as it describes a location on disk, it should be valid at least as long as that location exists.
      */
-    toURL():string;
+    toURL(): 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.
      */
-    remove ():void;
+    remove(): void;
 
     /**
      * Look up the parent DirectoryEntrySync containing this Entry. If this EntrySync is the root of its filesystem, its parent is itself.
      */
-    getParent():DirectoryEntrySync;
+    getParent(): DirectoryEntrySync;
 }
 
 /**
@@ -474,12 +474,12 @@ interface DirectoryEntrySync extends EntrySync {
     /**
      * Creates a new DirectoryReaderSync to read EntrySyncs from this DirectorySync.
      */
-    createReader():DirectoryReaderSync;
+    createReader(): DirectoryReaderSync;
 
-    /** 
+    /**
      * Creates or looks up a directory.
      * @param path Either an absolute path or a relative path from this DirectoryEntrySync 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 
+     * @param options
      *     <ul>
      *     <li> If create and exclusive are both true and the path already exists, getFile must fail.</li>
      *     <li> 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.</li>
@@ -488,12 +488,12 @@ interface DirectoryEntrySync extends EntrySync {
      *     <li> Otherwise, if no other error occurs, getFile must return a FileEntrySync corresponding to path.</li>
      *     </ul>
      */
-    getFile(path:string, options?:Flags):FileEntrySync;
+    getFile(path: string, options?: Flags): FileEntrySync;
 
-    /** 
+    /**
      * Creates or looks up a directory.
      * @param path Either an absolute path or a relative path from this DirectoryEntrySync 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 
+     * @param options
      *     <ul>
      *     <li> If create and exclusive are both true and the path already exists, getDirectory must fail.</li>
      *     <li> If create is true, the path doesn't exist, and no other error occurs, getDirectory must create and return a corresponding DirectoryEntry.</li>
@@ -502,12 +502,12 @@ interface DirectoryEntrySync extends EntrySync {
      *     <li> Otherwise, if no other error occurs, getDirectory must return a DirectoryEntrySync corresponding to path.</li>
      *     </ul>
      */
-    getDirectory(path:string, options?:Flags):DirectoryEntrySync;
+    getDirectory(path: string, options?: Flags): DirectoryEntrySync;
 
     /**
      * 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.
      */
-    removeRecursively():void;
+    removeRecursively(): void;
 }
 
 /**
@@ -523,7 +523,7 @@ interface DirectoryReaderSync {
     /**
      * Read the next block of entries from this directory.
      */
-    readEntries():EntrySync[];
+    readEntries(): EntrySync[];
 }
 
 /**
@@ -533,16 +533,16 @@ interface FileEntrySync extends EntrySync {
     /**
      * Creates a new FileWriterSync associated with the file that this FileEntrySync represents.
      */
-    createWriter():FileWriterSync;
+    createWriter(): FileWriterSync;
 
     /**
      * Returns a File that represents the current state of the file that this FileEntrySync represents.
      */
-    file():File;
+    file(): File;
 }
 
-interface Window extends LocalFileSystem, LocalFileSystemSync{
+interface Window extends LocalFileSystem, LocalFileSystemSync {
 }
 
-interface WorkerGlobalScope extends LocalFileSystem, LocalFileSystemSync{
+interface WorkerGlobalScope extends LocalFileSystem, LocalFileSystemSync {
 }
diff --git a/types/find-parent-dir/find-parent-dir-tests.ts b/types/find-parent-dir/find-parent-dir-tests.ts
new file mode 100644
index 0000000000..31b3307377
--- /dev/null
+++ b/types/find-parent-dir/find-parent-dir-tests.ts
@@ -0,0 +1,19 @@
+/// <reference types="node" />
+
+import findParentDir = require("find-parent-dir");
+
+let parentDir: string | null;
+
+findParentDir(__dirname, ".git", (err, dir) => {
+    if (err) {
+        console.error("error", err);
+    } else {
+        parentDir = dir;
+    }
+});
+
+try {
+    parentDir = findParentDir.sync(__dirname, ".git");
+} catch (err) {
+    console.error("error", err);
+}
diff --git a/types/find-parent-dir/index.d.ts b/types/find-parent-dir/index.d.ts
new file mode 100644
index 0000000000..0302255198
--- /dev/null
+++ b/types/find-parent-dir/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for find-parent-dir 0.3
+// Project: https://github.com/thlorenz/find-parent-dir
+// Definitions by: Ika <https://github.com/ikatyang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Finds the first parent directory that contains a given file or directory.
+ */
+declare function findParentDir(
+    currentFullPath: string,
+    clue: string,
+    cb: (err: any, dir: string | null) => void
+): void;
+
+declare namespace findParentDir {
+    function sync(currentFullPath: string, clue: string): string | null;
+}
+
+export = findParentDir;
diff --git a/types/find-parent-dir/tsconfig.json b/types/find-parent-dir/tsconfig.json
new file mode 100644
index 0000000000..83c817d86c
--- /dev/null
+++ b/types/find-parent-dir/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "find-parent-dir-tests.ts"]
+}
diff --git a/types/find-parent-dir/tslint.json b/types/find-parent-dir/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/find-parent-dir/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/find-project-root/find-project-root-tests.ts b/types/find-project-root/find-project-root-tests.ts
new file mode 100644
index 0000000000..b77d7846d0
--- /dev/null
+++ b/types/find-project-root/find-project-root-tests.ts
@@ -0,0 +1,7 @@
+/// <reference types="node" />
+
+import findProjectRoot = require("find-project-root");
+
+const root: string | null = findProjectRoot(process.cwd(), {
+    maxDepth: 12
+});
diff --git a/types/find-project-root/index.d.ts b/types/find-project-root/index.d.ts
new file mode 100644
index 0000000000..a541c1f982
--- /dev/null
+++ b/types/find-project-root/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for find-project-root 1.1
+// Project: https://github.com/kirstein/find-project-root
+// Definitions by: Ika <https://github.com/ikatyang>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Finds the project root by custom markers
+ */
+declare function findProjectRoot(
+    path: string,
+    options?: findProjectRoot.Options
+): null | string;
+
+declare namespace findProjectRoot {
+    interface Options {
+        /**
+         * total number of levels the algorithm can traverse
+         */
+        maxDepth?: number;
+        /**
+         * markers that it will search for
+         */
+        markers?: string[];
+    }
+}
+
+export = findProjectRoot;
diff --git a/types/find-project-root/tsconfig.json b/types/find-project-root/tsconfig.json
new file mode 100644
index 0000000000..1e727f9025
--- /dev/null
+++ b/types/find-project-root/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "find-project-root-tests.ts"]
+}
diff --git a/types/find-project-root/tslint.json b/types/find-project-root/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/find-project-root/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/find/find-tests.ts b/types/find/find-tests.ts
index c6c1cd04f5..3ca401f69a 100644
--- a/types/find/find-tests.ts
+++ b/types/find/find-tests.ts
@@ -16,9 +16,9 @@ find.file(regexPattern, rootDir, (dirs: string[]): void => { }).error(errorCb);
 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.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
@@ -27,6 +27,6 @@ find.dir(rootDir, (dirs: string[]): void => { }).error(errorCb); // $ExpectType
 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
+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
index 61166669db..1ffb2f8aee 100644
--- a/types/find/index.d.ts
+++ b/types/find/index.d.ts
@@ -45,7 +45,7 @@ export function file(pattern: string | RegExp, root: string, callback: (files: s
  * @param root The root directory
  * @param callback A callback that accepts each file separately
  */
-export function eachFile(root: string, callback: (file: string) => void): FindEachStream;
+export function eachfile(root: string, callback: (file: string) => void): FindEachStream;
 
 /**
  * Find all files that match a glob pattern in a given directory asynchronously.
@@ -53,7 +53,7 @@ export function eachFile(root: string, callback: (file: string) => void): FindEa
  * @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;
+export function eachfile(pattern: string | RegExp, root: string, callback: (file: string) => void): FindEachStream;
 
 /**
  * Find all files in a given directory synchronously.
@@ -105,7 +105,7 @@ export function dirSync(pattern: string | RegExp, root: string): string[];
  * @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;
+export function eachdir(root: string, callback: (directory: string) => void): FindEachStream;
 
 /**
  * Find all directories that match a glob pattern in a given directory asynchronously.
@@ -113,4 +113,4 @@ export function eachDir(root: string, callback: (directory: string) => void): Fi
  * @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;
+export function eachdir(pattern: string | RegExp, root: string, callback: (directory: string) => void): FindEachStream;
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
index 3b34d6a44a..754b8e86e8 100644
--- a/types/fixed-data-table-2/fixed-data-table-2-tests.tsx
+++ b/types/fixed-data-table-2/fixed-data-table-2-tests.tsx
@@ -46,19 +46,15 @@ interface MyTable3State {
 }
 
 class MyTable3 extends React.Component<{}, MyTable3State> {
-    constructor(props: {}) {
-        super(props);
-
-        this.state = {
-            myTableData: [
-                { name: "Rylan" },
-                { name: "Amelia" },
-                { name: "Estevan" },
-                { name: "Florence" },
-                { name: "Tressa" },
-            ]
-        };
-    }
+    state = {
+        myTableData: [
+            { name: "Rylan" },
+            { name: "Amelia" },
+            { name: "Estevan" },
+            { name: "Florence" },
+            { name: "Tressa" },
+        ]
+    };
 
     render() {
         return (
@@ -130,18 +126,15 @@ interface MyTable4State {
 }
 
 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" }
-            ]
-        };
-    }
+    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 (
diff --git a/types/fixed-data-table-2/index.d.ts b/types/fixed-data-table-2/index.d.ts
index 0b844ec194..16b0c0f3c5 100644
--- a/types/fixed-data-table-2/index.d.ts
+++ b/types/fixed-data-table-2/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/fixed-data-table/fixed-data-table-tests.tsx b/types/fixed-data-table/fixed-data-table-tests.tsx
index bb09fedcaf..758b33d2a2 100644
--- a/types/fixed-data-table/fixed-data-table-tests.tsx
+++ b/types/fixed-data-table/fixed-data-table-tests.tsx
@@ -41,19 +41,15 @@ interface MyTable3State {
 
 class MyTable3 extends React.Component<{}, MyTable3State> {
 
-      constructor(props: {}) {
-        super(props);
-
-        this.state = {
-            myTableData: [
-                {name: "Rylan"},
-                {name: "Amelia"},
-                {name: "Estevan"},
-                {name: "Florence"},
-                {name: "Tressa"},
-            ]
-        };
-    }
+    state = {
+        myTableData: [
+            {name: "Rylan"},
+            {name: "Amelia"},
+            {name: "Estevan"},
+            {name: "Florence"},
+            {name: "Tressa"},
+        ]
+    };
 
     render(): React.ReactElement<any> {
         return (
@@ -127,18 +123,15 @@ interface MyTable4State {
 
 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"}
-            ]
-        };
-    }
+    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(): React.ReactElement<any> {
         return (
diff --git a/types/fixed-data-table/index.d.ts b/types/fixed-data-table/index.d.ts
index c8ee33a2a1..4c0b7f176f 100644
--- a/types/fixed-data-table/index.d.ts
+++ b/types/fixed-data-table/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/fixed-data-table
 // Definitions by: Petar Paar <https://github.com/pepaar>, Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
diff --git a/types/flatbuffers/index.d.ts b/types/flatbuffers/index.d.ts
index b95741200b..bd74387bf2 100644
--- a/types/flatbuffers/index.d.ts
+++ b/types/flatbuffers/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for flatbuffers 1.6
+// Type definitions for flatbuffers 1.9
 // Project: http://google.github.io/flatbuffers/index.html
 // Definitions by: Kamil Rojewski <kamil.rojewski@gmail.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,7 +10,7 @@ declare global {
     type Offset = number;
 
     interface Table {
-      bb: ByteBuffer;
+      bb: ByteBuffer|null;
       bb_pos: number;
     }
 
@@ -241,6 +241,8 @@ declare global {
       writeFloat32(offset: number, value: number): void;
       writeFloat64(offset: number, value: number): void;
 
+      getBufferIdentifier(): string;
+
       /**
        * Look up a field in the vtable, return an offset into the object, or 0 if the
        * field is not present.
diff --git a/types/flight/flight-tests.ts b/types/flight/flight-tests.ts
index bd2f22d1c3..dd21f32f48 100644
--- a/types/flight/flight-tests.ts
+++ b/types/flight/flight-tests.ts
@@ -1,6 +1,6 @@
 
 declare var el: Element;
-declare var els: Element[];
+declare var els: HTMLElement[];
 declare var mixinFn: Function;
 
 function TestComponent() {
diff --git a/types/flush-write-stream/flush-write-stream-tests.ts b/types/flush-write-stream/flush-write-stream-tests.ts
new file mode 100644
index 0000000000..3f308d2f88
--- /dev/null
+++ b/types/flush-write-stream/flush-write-stream-tests.ts
@@ -0,0 +1,18 @@
+import writer = require("flush-write-stream");
+
+const stream = writer(write, flush);
+
+stream.on("finish", () => console.log("finished"));
+
+stream.write("hello");
+stream.write("world");
+stream.end();
+
+function write(data: any, encoding: string, callback: (error?: Error) => void): void {
+    console.log("Writing", data.toString());
+    callback();
+}
+
+function flush(callback: (error?: Error) => void): void {
+    setTimeout(callback, 1000);
+}
diff --git a/types/flush-write-stream/index.d.ts b/types/flush-write-stream/index.d.ts
new file mode 100644
index 0000000000..3faae23da2
--- /dev/null
+++ b/types/flush-write-stream/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for flush-write-stream 1.0
+// Project: https://github.com/mafintosh/flush-write-stream
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Writable, WritableOptions } from "stream";
+
+type Callback = (error?: Error) => void;
+type Write = (chunk: any, encoding: string, callback: Callback) => void;
+type Flush = (callback: Callback) => void;
+
+declare const WriteStream: {
+    (opts: WritableOptions, write: Write, flush?: Flush): Writable;
+    (write: Write, flush?: Flush): Writable;
+    new(opts: WritableOptions, write: Write, flush?: Flush): Writable;
+    new(write: Write, flush?: Flush): Writable;
+    obj(opts: WritableOptions, write: Write, flush?: Flush): Writable;
+    obj(write: Write, flush?: Flush): Writable;
+};
+
+export = WriteStream;
diff --git a/types/flush-write-stream/tsconfig.json b/types/flush-write-stream/tsconfig.json
new file mode 100644
index 0000000000..95d5eca832
--- /dev/null
+++ b/types/flush-write-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",
+        "flush-write-stream-tests.ts"
+    ]
+}
diff --git a/types/flush-write-stream/tslint.json b/types/flush-write-stream/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/flush-write-stream/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/flux/index.d.ts b/types/flux/index.d.ts
index ffc0330228..cafb6a5a0b 100644
--- a/types/flux/index.d.ts
+++ b/types/flux/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Steve Baker <https://github.com/stkb>
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import Dispatcher = require("./lib/Dispatcher");
 
diff --git a/types/fluxible-router/index.d.ts b/types/fluxible-router/index.d.ts
index 2dea024107..097c2b3c2d 100644
--- a/types/fluxible-router/index.d.ts
+++ b/types/fluxible-router/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yahoo/fluxible#readme
 // Definitions by: xbim <https://github.com/xbim>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 /// <reference types="node" />
 import * as React from 'react';
 import { FluxibleContext } from 'fluxible';
diff --git a/types/fluxxor/index.d.ts b/types/fluxxor/index.d.ts
index 3457dba949..191332fa7a 100644
--- a/types/fluxxor/index.d.ts
+++ b/types/fluxxor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/BinaryMuse/fluxxor
 // Definitions by: Yuichi Murata <https://github.com/mrk21>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as EventEmitter3 from 'eventemitter3';
 import * as React from "react";
diff --git a/types/fork-ts-checker-webpack-plugin/fork-ts-checker-webpack-plugin-tests.ts b/types/fork-ts-checker-webpack-plugin/fork-ts-checker-webpack-plugin-tests.ts
deleted file mode 100644
index 78ead793b4..0000000000
--- a/types/fork-ts-checker-webpack-plugin/fork-ts-checker-webpack-plugin-tests.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-import { Configuration } from 'webpack';
-import * as ForkTsCheckerWebpackPlugin from 'fork-ts-checker-webpack-plugin';
-
-let config: Configuration = {
-    plugins: [
-        new ForkTsCheckerWebpackPlugin()
-    ]
-};
-
-config = {
-    plugins: [
-        new ForkTsCheckerWebpackPlugin({})
-    ]
-};
-
-config = {
-    plugins: [
-        new ForkTsCheckerWebpackPlugin({
-            vue: true
-        })
-    ]
-};
-
-export default config;
diff --git a/types/fork-ts-checker-webpack-plugin/index.d.ts b/types/fork-ts-checker-webpack-plugin/index.d.ts
deleted file mode 100644
index ace3db5b24..0000000000
--- a/types/fork-ts-checker-webpack-plugin/index.d.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-// Type definitions for fork-ts-checker-webpack-plugin 0.4
-// Project: https://github.com/Realytics/fork-ts-checker-webpack-plugin#readme
-// Definitions by: JounQin <https://github.com/JounQin>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="node" />
-
-import { RuleFailure } from 'tslint';
-import { Diagnostic } from 'typescript';
-import { Plugin } from 'webpack';
-
-declare namespace ForkTsCheckerWebpackPlugin {
-    type ErrorType = 'diagnostic' | 'lint';
-    type Severity = 'error' | 'warning';
-
-    interface NormalizedMessageJson {
-        type: ErrorType;
-        code: string | number;
-        severity: Severity;
-        content: string;
-        file: string;
-        line: number;
-        character: number;
-    }
-
-    class NormalizedMessage {
-        static TYPE_DIAGNOSTIC: ErrorType;
-        static TYPE_LINT: ErrorType;
-        static SEVERITY_ERROR: Severity;
-        static SEVERITY_WARNING: Severity;
-        type: ErrorType;
-        code: string | number;
-        severity: Severity;
-        content: string;
-        file: string;
-        line: number;
-        character: number;
-        constructor(data: NormalizedMessageJson);
-        static createFromDiagnostic(diagnostic: Diagnostic): NormalizedMessage;
-        static createFromLint(lint: RuleFailure): NormalizedMessage;
-        static createFromJSON(json: NormalizedMessageJson): NormalizedMessage;
-        static compare(
-            messageA: NormalizedMessage,
-            messageB: NormalizedMessage,
-        ): number;
-        static equals(
-            messageA: NormalizedMessage,
-            messageB: NormalizedMessage,
-        ): boolean;
-        static deduplicate(messages: NormalizedMessage[]): NormalizedMessage[];
-        static compareTypes(typeA: ErrorType, typeB: ErrorType): number;
-        static compareSeverities(
-            severityA: Severity,
-            severityB: Severity,
-        ): number;
-        static compareOptionalStrings(stringA: string, stringB: string): number;
-        static compareNumbers(numberA: number, numberB: number): number;
-        toJSON(): NormalizedMessageJson;
-        getType(): ErrorType;
-        isDiagnosticType(): boolean;
-        isLintType(): boolean;
-        getCode(): string | number;
-        getFormattedCode(): string | number;
-        getSeverity(): Severity;
-        isErrorSeverity(): boolean;
-        isWarningSeverity(): boolean;
-        getContent(): string;
-        getFile(): string;
-        getLine(): number;
-        getCharacter(): number;
-    }
-
-    type Formatter = (message: NormalizedMessage, useColors: boolean) => string;
-
-    interface Options {
-        tsconfig?: string;
-        tslint?: string | true;
-        watch?: string | string[];
-        async?: boolean;
-        ignoreDiagnostics?: number[];
-        ignoreLints?: string[];
-        colors?: boolean;
-        logger?: Console;
-        formatter?: 'default' | 'codeframe' | Formatter;
-        formatterOptions?: {
-            highlightCode?: boolean
-            linesAbove?: number
-            linesBelow?: number
-            forceColor?: boolean
-        };
-        silent?: boolean;
-        checkSyntacticErrors?: boolean;
-        memoryLimit?: number;
-        workers?: number;
-        vue?: boolean;
-    }
-}
-
-declare class ForkTsCheckerWebpackPlugin extends Plugin {
-    constructor(options?: ForkTsCheckerWebpackPlugin.Options);
-}
-
-export = ForkTsCheckerWebpackPlugin;
diff --git a/types/form-serialize/form-serialize-tests.ts b/types/form-serialize/form-serialize-tests.ts
new file mode 100644
index 0000000000..42b587dd80
--- /dev/null
+++ b/types/form-serialize/form-serialize-tests.ts
@@ -0,0 +1,17 @@
+import serialize = require("form-serialize");
+
+const form = document.createElement("form");
+serialize(form, { hash: true }); // $ExpectType ResultHash
+serialize(form, true); // $ExpectType ResultHash
+serialize(form, { hash: false }); // $ExpectType string
+serialize(form, false); // $ExpectType string
+serialize(form); // $ExpectType string
+
+interface CustomResult {
+  foo: string;
+}
+
+// $ExpectType CustomResult
+serialize(form, {
+  serializer: (): CustomResult => ({ foo: "bar" })
+});
diff --git a/types/form-serialize/index.d.ts b/types/form-serialize/index.d.ts
new file mode 100644
index 0000000000..b433f6b81b
--- /dev/null
+++ b/types/form-serialize/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for form-serialize 0.7
+// Project: https://github.com/defunctzombie/form-serialize#readme
+// Definitions by: Tyler Johnson <https://github.com/tyler-johnson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+interface ResultHash {
+    [key: string]: string | string[] | ResultHash;
+}
+
+interface Options<Result> {
+    /** Configure the output type. If true, the output will be a js object. */
+    hash?: boolean;
+    /**
+     * Optional serializer function to override the default one. The function takes 3 arguments (result, key,
+     * value) and should return new result hash and url encoded str serializers are provided with this module
+     */
+    serializer?: (result: Result, key: string, value: string) => Result;
+    /** If true serialize disabled fields. */
+    disabled?: boolean;
+    /** If true serialize empty fields */
+    empty?: boolean;
+}
+
+interface OptionsHash extends Options<ResultHash> {
+    hash: true;
+}
+
+interface OptionsString extends Options<string> {
+    hash: false;
+}
+
+declare function serialize(form: HTMLFormElement, options: OptionsHash | true): ResultHash;
+declare function serialize(form: HTMLFormElement, options?: OptionsString | false): string;
+declare function serialize<Result = string>(form: HTMLFormElement, options?: Options<Result> | boolean): Result;
+
+export = serialize;
diff --git a/types/form-serialize/tsconfig.json b/types/form-serialize/tsconfig.json
new file mode 100644
index 0000000000..b37dff4ca2
--- /dev/null
+++ b/types/form-serialize/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",
+        "form-serialize-tests.ts"
+    ]
+}
diff --git a/types/form-serialize/tslint.json b/types/form-serialize/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/form-serialize/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/frctl__fractal/frctl__fractal-tests.ts b/types/frctl__fractal/frctl__fractal-tests.ts
new file mode 100644
index 0000000000..b641563a45
--- /dev/null
+++ b/types/frctl__fractal/frctl__fractal-tests.ts
@@ -0,0 +1,198 @@
+// Source: https://fractal.build/guide
+
+/* Create a new Fractal instance and export it for use elsewhere if required */
+import { create } from '@frctl/fractal';
+
+const fractal = create();
+
+/* Set the title of the project */
+fractal.set('project.title', 'FooCorp Component Library');
+fractal.set('project.version', 'v1.0');
+fractal.set('project.author', 'Mickey Mouse');
+
+/* Tell Fractal where the components will live */
+fractal.components.set('path', __dirname + '/src/components');
+
+/* Tell Fractal where the documentation pages will live */
+fractal.docs.set('path', __dirname + '/src/docs');
+
+/* Specify a directory of static assets */
+fractal.web.set('static.path', __dirname + '/public');
+
+/* Set the static HTML build destination */
+fractal.web.set('builder.dest', __dirname + '/build');
+
+// Source: https://fractal.build/guide/components/configuration
+
+fractal.components.set('default.collated', true);
+fractal.components.set('default.collator', (markup: string, item: any) => {
+    return `<!-- Start: @${item.handle} -->\n${markup}\n<!-- End: @${item.handle} -->\n`;
+});
+fractal.components.set('default.context', {
+    'site-name': 'FooCorp'
+});
+fractal.components.set('default.display', {
+    'max-width': '400px'
+});
+fractal.components.set('default.prefix', 'foobar');
+fractal.components.set('default.preview', '@my-preview-layout');
+fractal.components.set('default.status', 'wip');
+fractal.components.set('ext', '.handlebars');
+fractal.components.set('label', 'Patterns');
+fractal.components.set('path', __dirname + '/src/components');
+fractal.components.set('statuses', {
+    doing: {
+        label: "Doing",
+        description: "I'm doing it.",
+        color: '#F00'
+    },
+    done: {
+        label: "Done",
+        description: "I'm done with this.",
+        color: "green"
+    }
+});
+fractal.components.set('title', 'Patterns');
+fractal.components.set('yield', 'rendered_content');
+
+// Source: https://fractal.build/guide/docs/configuration
+
+fractal.docs.set('default.context', {
+    'site-name': 'FooCorp'
+});
+fractal.docs.set('default.prefix', 'foobar');
+fractal.docs.set('default.status', 'wip');
+fractal.docs.set('ext', '.html');
+fractal.docs.set('indexLabel', 'Listing');
+fractal.docs.set('label', 'Pages');
+fractal.docs.set('markdown', false);
+fractal.docs.set('markdown.smartypants', false);
+fractal.docs.set('path', __dirname + '/src/docs');
+fractal.docs.set('statuses', {
+    doing: {
+        label: "Doing",
+        description: "I'm doing it.",
+        color: '#F00'
+    },
+    done: {
+        label: "Done",
+        description: "I'm done with this.",
+        color: "green"
+    }
+});
+fractal.docs.set('title', 'Pages');
+
+// Source: https://fractal.build/guide/web/configuration
+
+fractal.web.set('builder.concurrency', 5);
+fractal.web.set('builder.dest', __dirname + '/export');
+fractal.web.set('builder.ext', '.php');
+fractal.web.set('builder.urls.ext', null);
+fractal.web.set('server.sync', true);
+fractal.web.set('server.syncOptions', {
+    open: true,
+    browser: ['google chrome', 'firefox'],
+    notify: true
+});
+fractal.web.set('server.port', 4444);
+fractal.web.set('server.watch', true);
+fractal.web.set('static.path', __dirname + '/public');
+fractal.web.set('static.mount', 'project-assets');
+
+// Source: https://fractal.build/guide/cli/custom-commands
+
+{
+    const config = {
+        description: 'Lists components in the project'
+    };
+
+    fractal.cli.command('list-components', function(args, done) {
+        const app = this.fractal;
+        for (const item of app.components.flatten()) {
+            this.log(`${item.handle} - ${item.status.label}`);
+        }
+        done();
+    }, config);
+}
+
+fractal.cli.exec('list-components');
+
+fractal.cli.command('foo <requiredArg> [optionalArg] [anotherOptionalArg]', (args, done) => {
+    console.log(args.requiredArg);
+    done();
+});
+
+{
+    const config = {
+        options: [
+            ['-p, --port <number>', 'The port to use.'],
+        ]
+    };
+
+    fractal.cli.command('foo', (args, done) => {
+        // do something
+        console.log(`Something was started on port ${args.options.port}`);
+        done();
+    }, config);
+}
+
+// Source: https://fractal.build/guide/integration/build-tools
+
+import * as gulp from 'gulp';
+{
+    /*
+     * Configure a Fractal instance.
+     *
+     * This configuration could also be done in a separate file, provided that this file
+     * then imported the configured fractal instance from it to work with in your Gulp tasks.
+     * i.e. const fractal = require('./my-fractal-config-file');
+     */
+
+    fractal.set('project.title', 'FooCorp Component Library'); // title for the project
+    fractal.web.set('builder.dest', 'build'); // destination for the static export
+    fractal.docs.set('path', `${__dirname}/docs`); // location of the documentation directory.
+    fractal.components.set('path', `${__dirname}/components`); // location of the component directory.
+
+    // any other configuration or customisation here
+
+    const logger = fractal.cli.console; // keep a reference to the fractal CLI console utility
+
+    /*
+     * Start the Fractal server
+     *
+     * In this example we are passing the option 'sync: true' which means that it will
+     * use BrowserSync to watch for changes to the filesystem and refresh the browser automatically.
+     * Obviously this is completely optional!
+     *
+     * This task will also log any errors to the console.
+     */
+
+    gulp.task('fractal:start', () => {
+        const server = fractal.web.server({
+            sync: true
+        });
+        server.on('error', err => logger.error(err.message));
+        return server.start().then(() => {
+            logger.success(`Fractal server is now running at ${server.url}`);
+        });
+    });
+
+    /*
+     * Run a static export of the project web UI.
+     *
+     * This task will report on progress using the 'progress' event emitted by the
+     * builder instance, and log any errors to the terminal.
+     *
+     * The build destination will be the directory specified in the 'builder.dest'
+     * configuration option set above.
+     */
+
+    gulp.task('fractal:build', () => {
+        const builder = fractal.web.builder();
+        builder.on('progress', (completed, total) => logger.update(`Exported ${completed} of ${total} items`, 'info'));
+        builder.on('error', err => logger.error(err.message));
+        return builder.build().then(() => {
+            logger.success('Fractal build completed!');
+        });
+    });
+}
diff --git a/types/frctl__fractal/index.d.ts b/types/frctl__fractal/index.d.ts
new file mode 100644
index 0000000000..8e88f82948
--- /dev/null
+++ b/types/frctl__fractal/index.d.ts
@@ -0,0 +1,700 @@
+// Type definitions for @frctl/fractal 1.x
+// Project: https://github.com/frctl/fractal
+// Definitions by: Phil McCloghry-Laing <https://github.com/pmccloghrylaing>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { EventEmitter } from 'events';
+import { Stats as FileStats } from 'fs';
+import { Server as HttpServer } from 'http';
+import { Readable as ReadableStream } from 'stream';
+import * as VinylFile from 'vinyl';
+
+export namespace fractal {
+    namespace core {
+        interface StatusInfo {
+            label: string;
+            description?: string;
+            color?: string;
+        }
+        namespace entities {
+            abstract class Entity extends mixins.Entity {
+                readonly isComponent?: true;
+                readonly isCollection?: true;
+                readonly isDoc?: true;
+                readonly isVariant?: true;
+                readonly status: StatusInfo;
+                getResolvedContext(): any;
+                hasContext(): Promise<boolean>;
+                setContext(data: any): void;
+                getContext(): any;
+                toJSON(): {};
+            }
+            interface EntitySource<T extends Entity, TConfig = any> extends mixins.Source<T, TConfig> {
+                entities(): T[];
+
+                engine<TEngine = any>(adapterFactory?: string | {
+                    register(source: EntitySource<T>, app: any): Adapter<TEngine>;
+                } | (() => ({
+                    register(source: EntitySource<T>, app: any): Adapter<TEngine>;
+                }))): Adapter<TEngine>;
+
+                getProp(key: string): string | {};
+                statusInfo(handle: string): StatusInfo | null;
+                toJSON(): {};
+            }
+            interface EntityCollection<T extends Entity> extends mixins.Entity, mixins.Collection<T> {
+                readonly entities: this;
+                toJSON(): {};
+            }
+        }
+
+        namespace mixins {
+            abstract class Configurable<T = any> {
+                config(): T;
+                config(config: T): this;
+                set<K extends keyof T>(path: K, value: T[K] | null): this;
+                get<K extends keyof T, V = T[K]>(path: K, defaultValue?: V): T[K] | V | null | undefined;
+            }
+            /**
+             * Combined EventEmitter and Configurable mixins
+             */
+            abstract class ConfigurableEmitter<T = any> extends EventEmitter { }
+            interface ConfigurableEmitter<T = any> extends Configurable<T> { }
+            interface Collection<T = any> {
+                readonly isAsset: undefined;
+                readonly isComponent: undefined;
+                readonly isCollection: true;
+                readonly isDoc: undefined;
+                readonly isFile: undefined;
+                readonly isVariant: undefined;
+                readonly size: number;
+                readonly items: T[];
+                toArray(): T[];
+                setItems(items: T[]): this;
+                pushItem(item: T): this;
+                removeItem(item: T): this;
+                toJSON(): {};
+                toStream(): ReadableStream;
+                each(fn: (item: T) => void): this;
+                forEach(fn: (item: T) => void): this;
+                map(fn: (item: T) => T): this;
+                first(): T | undefined;
+                last(): T | undefined;
+                eq(pos: number): T | undefined;
+                collections(): this;
+                orderBy(): this;
+                find(handle: string): T;
+                find<TKey extends keyof T>(name: TKey, value: T[TKey]): T;
+                findCollection(handle: string): Collection<T>;
+                findCollection<TKey extends keyof T>(name: TKey, value: T[TKey]): Collection<T>;
+                flatten(): this;
+                flattenDeep(): this;
+                squash(): this;
+                filter(handle: string): T[];
+                filter<TKey extends keyof T>(name: TKey, value: T[TKey]): T[];
+                filterItems(items: T[], handle: string): T[];
+                filterItems<TKey extends keyof T>(items: T[], name: TKey, value: T[TKey]): T[];
+                flattenItems(items: T[], deep?: boolean): T[];
+                squashItems(items: T[]): T[];
+                newSelf(items: T[]): this;
+                [Symbol.iterator](): IterableIterator<T>;
+            }
+            abstract class Entity {
+                initEntity(name: string, config: any, parent: Entity): void;
+                name: string;
+                handle: string;
+                label: string;
+                title: string;
+                order: number;
+                id: string;
+                config: any;
+                readonly alias: string | null;
+                readonly source: entities.EntitySource<entities.Entity>;
+                readonly parent: Entity;
+                readonly isHidden: boolean;
+                toJSON(): {};
+            }
+            interface Source<T = any, TConfig = any> extends ConfigurableEmitter<TConfig>, Collection<T> {
+                readonly label: string;
+                readonly title: string;
+                readonly source: this;
+                readonly isWatching: boolean;
+                readonly fullPath: string | null;
+                readonly relPath: string;
+                toStream(): ReadableStream;
+                exists(): boolean;
+                load(force?: boolean): Promise<this>;
+                refresh(): Promise<this>;
+                watch(): void;
+                unwatch(): void;
+                isConfig(file: string): boolean;
+            }
+        }
+    }
+
+    namespace api {
+        namespace assets {
+            class Asset extends core.entities.Entity {
+                readonly isAsset: true;
+                readonly isComponent: undefined;
+                readonly isCollection: undefined;
+                readonly isDoc: undefined;
+                readonly isFile: undefined;
+                readonly isVariant: undefined;
+                toVinyl(): VinylFile;
+            }
+            interface AssetCollection extends core.entities.EntityCollection<Asset> {
+                assets(): this;
+                toVinylArray(): VinylFile[];
+            }
+            interface AssetSource extends core.mixins.Source<VinylFile> {
+                assets(): VinylFile[];
+                toVinylArray(): VinylFile[];
+                toVinylStream(): ReadableStream;
+                gulpify(): ReadableStream;
+            }
+            interface AssetSourceCollection extends core.mixins.ConfigurableEmitter {
+                readonly label: string;
+                readonly title: string;
+                add(name: string, config: any): AssetSource;
+                remove(name: string): this;
+                find(name: string): AssetSource | undefined;
+                sources(): AssetSource[];
+                toArray(): AssetSource[];
+                visible(): AssetSource[];
+                watch(): this;
+                unwatch(): this;
+                load(): Promise<void>;
+                toJSON(): {};
+                [Symbol.iterator](): IterableIterator<AssetSource>;
+            }
+        }
+
+        namespace components {
+            class Component extends core.entities.Entity {
+                constructor(config: {}, files: files.FileCollection, resources: assets.AssetCollection, parent: core.entities.Entity);
+                readonly isAsset: undefined;
+                readonly isComponent: true;
+                readonly isCollection: undefined;
+                readonly isDoc: undefined;
+                readonly isFile: undefined;
+                readonly isVariant: undefined;
+                defaultName: string;
+                lang: string;
+                editorMode: string;
+                editorScope: string;
+                viewPath: string;
+                viewDir: string;
+                configData: string;
+                relViewPath: string;
+                isCollated(): boolean;
+                readonly content: string;
+                readonly references: any[];
+                readonly referencedBy: any[];
+                readonly baseHandle: string;
+                readonly notes: string;
+                render(context: any, env: any, opts: any): Promise<string>;
+                getPreviewContext(): Promise<any>;
+                getPreviewContent(): Promise<string>;
+                setVariants(variantCollection: variants.VariantCollection): void;
+                hasTag(tag: string): boolean;
+                resources(): assets.AssetCollection;
+                resourcesJSON(): {};
+                flatten(): variants.VariantCollection;
+                component(): this;
+                variants(): variants.VariantCollection;
+                static create(config: {}, files: files.FileCollection, resources: assets.AssetCollection, parent: core.entities.Entity): IterableIterator<{} | variants.VariantCollection | Component>;
+            }
+            interface ComponentCollection extends core.entities.EntityCollection<Component> {
+                components(): this;
+                variants(): this;
+            }
+            type Collator = (markup: string, item: { handle: string; }) => string;
+            interface ComponentDefaultConfig {
+                collated?: boolean;
+                collator?: Collator;
+                context?: any;
+                display?: any;
+                prefix?: string;
+                preview?: string;
+                status?: string;
+            }
+            interface ComponentConfig {
+                path?: string;
+                ext?: string;
+                default?: ComponentDefaultConfig;
+                label?: string;
+                statuses?: {
+                    [status: string]: core.StatusInfo;
+                };
+                title?: string;
+                yield?: string;
+                'default.collated'?: boolean;
+                'default.collator'?: Collator;
+                'default.context'?: any;
+                'default.display'?: any;
+                'default.prefix'?: string;
+                'default.preview'?: string;
+                'default.status'?: string;
+            }
+            interface ComponentSource extends core.entities.EntitySource<Component, ComponentConfig> {
+                resources(): files.FileCollection;
+                components(): Component[];
+                getReferencesOf(target: { id: string; handle: string; alias: string; }): any[];
+                variants(): this;
+                find(): any;
+                findFile(filePath: string): files.File | undefined;
+                resolve(context: any): any;
+                renderString(str: string, context: any, env: any): Promise<string>;
+                renderPreview(entity: string | core.entities.Entity, preview?: boolean, env?: any): Promise<string>;
+                render(entity: string | core.entities.Entity, context: any, env?: any, opts?: {}): Promise<string>;
+            }
+        }
+        namespace docs {
+            class Doc extends core.entities.Entity {
+                constructor(config: any, content: string, parent: core.entities.Entity);
+                readonly isAsset: undefined;
+                readonly isComponent: undefined;
+                readonly isCollection: undefined;
+                readonly isDoc: true;
+                readonly isFile: undefined;
+                readonly isVariant: undefined;
+                readonly isIndex: boolean;
+                getContent(): Promise<string>;
+                getContentSync(): string;
+                render(context: any, env?: any, opts?: any): Promise<string>;
+                toc(maxDepth?: number): Promise<string>;
+                static create(config: any, content: string, parent: core.entities.Entity): Doc;
+            }
+            interface DocCollection extends core.entities.EntityCollection<Doc> {
+                pages(): this;
+            }
+            interface DocDefaultConfig {
+                context?: any;
+                prefix?: string;
+                status?: string;
+            }
+            interface DocMarkdownConfig {
+                gfm?: boolean;
+                tables?: boolean;
+                breaks?: boolean;
+                pedantic?: boolean;
+                sanitize?: boolean;
+                smartLists?: boolean;
+                smartypants?: boolean;
+            }
+            interface DocConfig {
+                default?: DocDefaultConfig;
+                ext?: string;
+                indexLabel?: string;
+                label?: string;
+                markdown?: boolean | DocMarkdownConfig;
+                path?: string;
+                statuses?: {
+                    [status: string]: core.StatusInfo;
+                };
+                title?: string;
+                'default.context'?: any;
+                'default.prefix'?: string;
+                'default.status'?: string;
+                'markdown.gfm'?: boolean;
+                'markdown.tables'?: boolean;
+                'markdown.breaks'?: boolean;
+                'markdown.pedantic'?: boolean;
+                'markdown.sanitize'?: boolean;
+                'markdown.smartLists'?: boolean;
+                'markdown.smartypants'?: boolean;
+            }
+            interface DocSource extends core.entities.EntitySource<Doc, DocConfig> {
+                pages(): this;
+                docs(): this;
+                resolve(context: any): any;
+                toc(page: files.File, maxDepth?: number): Promise<string>;
+                render(page: string | files.File, context?: any, env?: any, opts?: {}): Promise<string>;
+                renderString(str: string, context: any, env?: any): Promise<string>;
+                isPage(file: string): boolean;
+                isTemplate(file: string): boolean;
+            }
+        }
+        namespace files {
+            interface FileCollection extends core.mixins.Collection<File> {
+                files(): this;
+                match(test: string | RegExp | Array<string | RegExp>): this;
+                matchItems(items: core.mixins.Collection<File>, test: string | RegExp | Array<string | RegExp>): File;
+                toVinylArray(): VinylFile[];
+                toVinylStream(): ReadableStream;
+                gulpify(): ReadableStream;
+            }
+            interface File {
+                readonly isAsset: undefined;
+                readonly isComponent: undefined;
+                readonly isCollection: undefined;
+                readonly isDoc: undefined;
+                readonly isFile: true;
+                readonly isVariant: undefined;
+                id: string;
+                path: string;
+                cwd: string;
+                relPath: string;
+                base: string;
+                dir: string;
+                handle: string;
+                name: string;
+                ext: string;
+                stat: FileStats | null;
+                lang: string;
+                editorMode: string;
+                editorScope: string;
+                githubColor: string;
+                isBinary: boolean;
+                mime: string;
+                getContext(): any;
+                readonly contents: Buffer;
+                readonly isImage: boolean;
+                getContent(): Promise<string>;
+                getContentSync(): string;
+                read(): Promise<string>;
+                readSync(): string;
+                toVinyl(): VinylFile;
+            }
+        }
+        namespace variants {
+            class Variant extends core.entities.Entity {
+                constructor(config: {}, view: any, resources: assets.AssetCollection, parent: components.Component);
+                readonly isAsset: undefined;
+                readonly isComponent: undefined;
+                readonly isCollection: undefined;
+                readonly isDoc: undefined;
+                readonly isFile: true;
+                readonly isVariant: true;
+                view: any;
+                viewPath: string;
+                viewDir: string;
+                relViewPath: string;
+                isDefault: boolean;
+                lang: string;
+                editorMode: string;
+                editorScope: string;
+                readonly notes: string;
+                readonly alias: string | null;
+                readonly siblings: VariantCollection;
+                readonly content: string;
+                readonly baseHandle: string;
+                readonly references: any[];
+                readonly referencedBy: any[];
+                render(context: any, env?: any, opts?: any): Promise<string>;
+                getPreviewContext(): Promise<any>;
+                getPreviewContent(): Promise<string>;
+                component(): components.Component;
+                variant(): this;
+                defaultVariant(): this;
+                resources(): assets.AssetCollection;
+                resourcesJSON(): {};
+                getContent(): Promise<string>;
+                getContentSync(): string;
+                static create(config: {}, view: any, resources: assets.AssetCollection, parent: components.Component): Variant;
+            }
+            interface VariantCollection extends core.entities.EntityCollection<Variant> {
+                default(): Variant;
+                getCollatedContent(): Promise<string>;
+                getCollatedContentSync(): string;
+                getCOllatedContext(): Promise<any>;
+                readonly references: any[];
+                readonly referencedBy: any[];
+            }
+        }
+    }
+
+    namespace cli {
+        class Cli {
+            console: Console;
+            notify: Notifier;
+            has(command: string): boolean;
+            get(command: string): any;
+            isInteractive(): boolean;
+            command(
+                commandString: string,
+                callback: (this: Cli & { fractal: Fractal }, args: any, done: () => void) => void, opts?: string | {
+                    description?: string;
+                    options?: string[][];
+                }): void;
+            exec(command: string): void;
+            log(message: string): void;
+            error(message: string): void;
+        }
+        class Console {
+            theme: CliTheme;
+            br(): this;
+            log(text: string): this;
+            debug(text: string, data?: any): this;
+            success(text: string): this;
+            warn(text: string): this;
+            update(text: string, type?: string): this;
+            clear(): this;
+            persist(): this;
+            error(err: Error): this;
+            error(err: string, data: Error): this;
+            dump(data: any): void;
+            box(header?: string, body?: string[], footer?: string): this;
+            write(str: string, type?: string): void;
+            columns(data: any, options?: any): this;
+            slog(): this;
+            unslog(): this;
+            isSlogging(): boolean;
+            debugMode(status: boolean): void;
+        }
+        class Notifier {
+            updateAvailable(details: {
+                current: string;
+                latest: string;
+                name: string;
+            }): void;
+            versionMismatch(details: {
+                cli: string;
+                local: string;
+            }): void;
+        }
+    }
+
+    namespace web {
+        class Builder extends EventEmitter {
+            /**
+             * @deprecated Use start() instead.
+             */
+            build(): Promise<{ errorCount: number; }>;
+            start(): Promise<{ errorCount: number; }>;
+            stop(): void;
+            use(): void;
+        }
+        class Server extends EventEmitter {
+            readonly isSynced: boolean;
+            readonly port?: number;
+            readonly ports: {
+                sync?: number;
+                server?: number;
+            };
+            readonly url?: string;
+            readonly urls: {
+                sync?: {
+                    local?: string;
+                    external?: string;
+                    ui?: string;
+                };
+                server?: string;
+            };
+            start(sync?: boolean): Promise<HttpServer>;
+            stop(): void;
+            use(mount: string, middleware: any): void;
+        }
+        interface WebServerSyncOptions {
+            open?: boolean;
+            browser?: string[];
+            notify?: boolean;
+        }
+        interface WebServerConfig {
+            sync?: boolean;
+            syncOptions?: WebServerSyncOptions;
+            port?: number;
+            watch?: boolean;
+            theme?: WebTheme | string;
+        }
+        interface WebBuilderUrls {
+            ext?: string;
+        }
+        interface WebBuilderConfig {
+            concurrency?: number;
+            dest?: string;
+            ext?: string;
+            urls?: WebBuilderUrls;
+            theme?: WebTheme | string;
+        }
+        interface WebStaticConfig {
+            path?: string;
+            mount?: string;
+        }
+        interface WebConfig {
+            builder?: WebBuilderConfig;
+            server?: WebServerConfig;
+            static?: WebStaticConfig;
+            'builder.concurrency'?: number;
+            'builder.dest'?: string;
+            'builder.ext'?: string;
+            'builder.urls'?: WebBuilderUrls;
+            'builder.urls.ext'?: string;
+            'builder.theme'?: WebTheme | string;
+            'server.sync'?: boolean;
+            'server.syncOptions'?: WebServerSyncOptions;
+            'server.syncOptions.open'?: boolean;
+            'server.syncOptions.browser'?: string[];
+            'server.syncOptions.notify'?: boolean;
+            'server.port'?: number;
+            'server.watch'?: boolean;
+            'server.theme'?: WebTheme | string;
+            'static.path'?: string;
+            'static.mount'?: string;
+        }
+        class Web extends core.mixins.ConfigurableEmitter<WebConfig> {
+            server(config?: WebServerConfig): Server;
+            builder(config?: WebBuilderConfig): Builder;
+            theme(name: string, instance?: WebTheme): this;
+            defaultTheme(): WebTheme;
+            defaultTheme(instance: WebTheme): this;
+        }
+    }
+
+    const Fractal: {
+        new: Fractal;
+    };
+}
+
+export interface FractalConfig {
+    project?: {
+        title?: string;
+        version?: string;
+        author?: string;
+    };
+    'project.title'?: string;
+    'project.version'?: string;
+    'project.author'?: string;
+}
+
+export function create(config?: FractalConfig): Fractal;
+
+export class Fractal extends fractal.core.mixins.ConfigurableEmitter<FractalConfig> {
+    constructor(config?: FractalConfig);
+    readonly components: fractal.api.components.ComponentSource;
+    readonly docs: fractal.api.docs.DocSource;
+    readonly assets: fractal.api.assets.AssetSourceCollection;
+    readonly cli: fractal.cli.Cli;
+    readonly web: fractal.web.Web;
+    readonly version: string;
+    readonly debug: boolean;
+
+    extend(plugin: string | ((this: this, core: any) => void)): this;
+
+    watch(): this;
+    unwatch(): this;
+
+    load(): Promise<void>;
+}
+
+export interface CliThemeConfig {
+    delimiter?: {
+        text?: string;
+        format?: (str: string) => string;
+    };
+    styles?: {
+        [key: string]: any;
+    };
+    'delimiter.text'?: string;
+    'delimiter.format'?: (str: string) => string;
+}
+export class CliTheme extends fractal.core.mixins.ConfigurableEmitter<CliThemeConfig> {
+    constructor(config?: CliThemeConfig);
+    setDelimiter(text: string, formatter: (str: string) => string): void;
+    delimiter(): string;
+    setStyle(name: string, opts: any): void;
+    style(name: string): any;
+    format(str: string, style?: string, strip?: boolean): string;
+}
+
+export interface WebThemeOptions {
+    skin?: string;
+    panels?: string[];
+    rtl: boolean;
+    lang?: string;
+    styles?: string[];
+    scripts?: string[];
+    format?: string;
+    static?: {
+        mount?: string;
+    };
+    version?: string;
+    favicon?: string;
+    nav?: string[];
+    'static.mount': string;
+}
+export class WebTheme extends fractal.core.mixins.ConfigurableEmitter<WebThemeOptions> {
+    constructor(viewPaths: string[], options?: WebThemeOptions);
+    options(): WebThemeOptions;
+    options(value: WebThemeOptions): this;
+    setOption<K extends keyof WebThemeOptions>(key: K, value: WebThemeOptions[K]): this;
+    getOption<K extends keyof WebThemeOptions>(key: K): WebThemeOptions[K];
+    addLoadPath(path: string): this;
+    loadPaths(): string[];
+    setErrorView(view: string): void;
+    errorView(): string;
+    setRedirectView(view: string): void;
+    redirectView(): string;
+    addStatic(path: string, mount: string): void;
+    static(): Array<{ path: string; mount: string; }>;
+    addRoute(path: string, opts: {
+        handle?: string;
+    }, resolver?: any): this;
+    addResolver(handle: string, resolvers: any): this;
+    routes(): any[];
+    resolvers(): any;
+    matchRoute(urlPath: string): {
+        route: {
+            handle: string;
+            view: string;
+        };
+        params: any;
+    } | false;
+    urlFromRoute(handle: string, params: any, noRedirect?: boolean): string | null;
+}
+
+export abstract class Adapter<TEngine> extends EventEmitter {
+    constructor(engine: TEngine, source: fractal.core.entities.EntitySource<any>);
+    protected _source: fractal.core.entities.EntitySource<any>;
+    readonly engine: TEngine;
+    readonly views: Array<{
+        handle: string;
+        path: string;
+        content: string;
+    }>;
+    setHandlePrefix(prefix: string): this;
+    load(): void;
+    getReferencesForView(handle: string): any[];
+    getView(handle: string): any;
+
+    protected _resolve<T>(value: PromiseLike<T> | T): Promise<T>;
+
+    abstract render(path: string, str: string, context: any, meta: any): Promise<string>;
+}
+
+export namespace utils {
+    function lang(filePath: string): {
+        name: string,
+        mode: string,
+        scope: string | null,
+        color: string | null,
+    };
+    function titlize(str: string): string;
+    function slugify(str: string): string;
+    function toJSON(item: any): {};
+    function escapeForRegexp(str: string): string;
+    function parseArgv(): {
+        command: string;
+        args: string[];
+        opts: any;
+    };
+    function stringify(data: any, indent?: number): string;
+    function fileExistsSync(path: string): boolean;
+    function isPromise<T>(value: T | PromiseLike<T>): value is PromiseLike<T>;
+    function isPromise(value: any): value is PromiseLike<any>;
+    function md5(str: string): string;
+    function mergeProp(prop: any, upstream: any): any;
+    function defaultsDeep<T>(...args: T[]): T;
+    function relUrlPath(toPath: string, fromPath: string, opts?: any): string;
+}
+
+export namespace core {
+    type Component = fractal.api.components.Component;
+    const Component: typeof fractal.api.components.Component;
+    type Variant = fractal.api.variants.Variant;
+    const Variant: typeof fractal.api.variants.Variant;
+    type Doc = fractal.api.docs.Doc;
+    const Doc: typeof fractal.api.docs.Doc;
+}
diff --git a/types/frctl__fractal/tsconfig.json b/types/frctl__fractal/tsconfig.json
new file mode 100644
index 0000000000..7ef7117640
--- /dev/null
+++ b/types/frctl__fractal/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@frctl/fractal": ["frctl__fractal"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "frctl__fractal-tests.ts"
+    ]
+}
diff --git a/types/frctl__fractal/tslint.json b/types/frctl__fractal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/frctl__fractal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/fs-extra-promise/index.d.ts b/types/fs-extra-promise/index.d.ts
index a7222b9d5d..c2c12f6d28 100644
--- a/types/fs-extra-promise/index.d.ts
+++ b/types/fs-extra-promise/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/overlookmotel/fs-extra-promise
 // Definitions by: midknight41 <https://github.com/midknight41>, Jason Swearingen <https://github.com/jasonswearingen>, Hiromi Shikata <https://github.com/HiromiShikata>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/fs-extra/index.d.ts b/types/fs-extra/index.d.ts
index 153b285ae1..c5eddbf416 100644
--- a/types/fs-extra/index.d.ts
+++ b/types/fs-extra/index.d.ts
@@ -207,9 +207,9 @@ 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: fs.symlink.Type | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type: FsSymlinkType | undefined, callback: (err: NodeJS.ErrnoException) => void): void;
 export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, callback: (err: NodeJS.ErrnoException) => void): void;
-export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: fs.symlink.Type): Promise<void>;
+export function symlink(srcpath: string | Buffer, dstpath: string | Buffer, type?: FsSymlinkType): 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;
@@ -261,6 +261,7 @@ export type CopyFilterSync = (src: string, dest: string) => boolean;
 export type CopyFilterAsync = (src: string, dest: string) => Promise<boolean>;
 
 export type SymlinkType = "dir" | "file";
+export type FsSymlinkType = "dir" | "file" | "junction";
 
 export interface CopyOptions {
     dereference?: boolean;
diff --git a/types/fscreen/index.d.ts b/types/fscreen/index.d.ts
index dfe2f6117f..b818f2dd2f 100644
--- a/types/fscreen/index.d.ts
+++ b/types/fscreen/index.d.ts
@@ -1,9 +1,13 @@
 // Type definitions for fscreen 1.0
 // Project: https://github.com/rafrex/fscreen#readme
 // Definitions by: Joscha Feth <https://github.com/joscha>
+//                 Terry Mun <https://github.com/terrymun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-type Handler = () => void;
+type Handler = (e?: Event) => void;
+type RequestFullScreenFunction = (element: Element) => void;
+type EventName = 'fullscreenEnabled' | 'fullscreenElement' | 'requestFullscreen' | 'exitFullscreen' | 'fullscreenchange' | 'fullscreenerror';
 
 declare class Fscreen {
     readonly fullscreenElement: Element | undefined;
@@ -12,10 +16,10 @@ declare class Fscreen {
     onfullscreenchange: Handler;
     onfullscreenerror: Handler;
 
-    addEventListener(type: string, handler: Handler, useCapture?: boolean): void;
-    removeEventListener(type: string, handler: Handler): void;
+    addEventListener(type: EventName, handler: Handler, options?: boolean | AddEventListenerOptions): void;
+    removeEventListener(type: EventName, handler: Handler, options?: boolean | AddEventListenerOptions): void;
     requestFullscreen(element: Element): void;
-    requestFullscreenFunction(element: Element): void;
+    requestFullscreenFunction(element: Element): RequestFullScreenFunction;
 }
 
 declare const fscreen: Fscreen;
diff --git a/types/fuzzaldrin-plus/fuzzaldrin-plus-tests.ts b/types/fuzzaldrin-plus/fuzzaldrin-plus-tests.ts
index 97730fe2e5..b5d83d4e9c 100644
--- a/types/fuzzaldrin-plus/fuzzaldrin-plus-tests.ts
+++ b/types/fuzzaldrin-plus/fuzzaldrin-plus-tests.ts
@@ -1,4 +1,8 @@
-import * as fz from "fuzzaldrin-plus";
+import * as fz from 'fuzzaldrin-plus'
+
+//
+// Simple use cases
+// ----------------------------------------------------------------------
 
 const candidates = [
     'Find And Replace: Select All',
@@ -7,14 +11,201 @@ const candidates = [
     'Application: Install Update',
     'Install'
 ]
-const objectCandidates = candidates.map(s => ({ foo: s }));
+const objectCandidates = candidates.map(s => ({ foo: s }))
+const options: fz.IOptions = { allowErrors: true }
+const filterOptions: fz.IFilterOptions = {
+    allowErrors: true,
+    key: 'foo'
+}
 
-fz.filter(candidates, 'install');
-fz.filter(objectCandidates, 'install', { key: 'foo' });
+fz.filter(candidates, 'install')
+fz.filter(candidates, 'install', options)
+fz.filter(candidates, 'install', filterOptions)
+fz.filter(objectCandidates, 'install', { key: 'foo' })
 
-const prepQuery = fz.prepQuery('install');
-fz.score('Application: Install Update', 'install');
-fz.score('Application: Install Update', 'install', prepQuery);
+const preparedQuery: fz.Query = fz.prepareQuery('install')
 
-fz.match('Application: Install Update', 'install');
-fz.match('Application: Install Update', 'install', prepQuery);
+fz.score('Maybe', 'me')
+fz.score('Maybe', 'me', undefined)
+fz.score('Maybe', 'me', null)
+fz.score('Maybe', 'me', {})
+fz.score('Maybe', 'me', { allowErrors: true })
+fz.score('Application: Install Update', 'install')
+fz.score('Application: Install Update', 'install', { preparedQuery })
+
+fz.match('Maybe', 'me')
+fz.match('Application: Install Update', 'install')
+fz.match('Application: Install Update', 'install', { preparedQuery })
+
+fz.wrap('Maybe', 'me')
+
+//
+// Complex filter cases, using all the options
+// ----------------------------------------------------------------------
+
+fz.filter(['Maybe', 'Me'], 'me')
+fz.filter(['Maybe', 'Me'], 'me', undefined)
+fz.filter(['Maybe', 'Me'], 'me', null)
+fz.filter(['Maybe', 'Me'], 'me', {})
+fz.filter(['Maybe', 'Me'], 'me', { allowErrors: true })
+fz.filter(['Maybe', 'Me'], 'me', { key: 'key' })
+fz.filter(['Maybe', 'Me'], 'me', {
+    preparedQuery: fz.prepareQuery('me')
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true,
+    pathSeparator: '/'
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true,
+    pathSeparator: '\\',
+    optCharRegEx: new RegExp('')
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true,
+    pathSeparator: '\\',
+    optCharRegEx: new RegExp(''),
+    wrap: {
+        tagOpen: '<span>',
+        tagClass: '',
+        tagClose: '</span>'
+    }
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true,
+    pathSeparator: '\\',
+    optCharRegEx: new RegExp(''),
+    wrap: {
+        tagOpen: '<span>',
+        tagClass: '',
+        tagClose: '</span>'
+    },
+    maxResults: 10
+})
+fz.filter(['Maybe', 'Me'], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true,
+    pathSeparator: '\\',
+    optCharRegEx: new RegExp(''),
+    wrap: {
+        tagOpen: '<span>',
+        tagClass: '',
+        tagClose: '</span>'
+    },
+    maxResults: 10,
+    maxInners: 10
+})
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    allowErrors: true,
+    usePathScoring: true,
+    useExtensionBonus: true,
+    pathSeparator: '\\',
+    optCharRegEx: new RegExp(''),
+    wrap: {
+        tagOpen: '<span>',
+        tagClass: '',
+        tagClose: '</span>'
+    },
+    maxResults: 10,
+    maxInners: 10,
+    key: 'title'
+})
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    allowErrors: true,
+    key: 'title'
+})
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    key: 'title'
+})
+
+/**
+ * ======================================================================
+ * Incorrect Usage:
+ * ======================================================================
+ */
+
+// $ExpectError
+fz.score()
+// $ExpectError
+fz.match()
+// $ExpectError
+fz.wrap()
+// $ExpectError
+fz.prepareQuery()
+// $ExpectError
+fz.score('Maybe', 'me', true)
+// $ExpectError
+fz.score('Maybe', 'me', 'string')
+// $ExpectError
+fz.score('Maybe', 'me', 1)
+
+const items = ['Maybe', 'Me']
+// $ExpectError
+fz.score(items, 'me')
+// $ExpectError
+fz.score('Maybe', 'me', { unknownProperty: true })
+// $ExpectError
+fz.match(items, 'me')
+// $ExpectError
+fz.wrap(items, 'me')
+// $ExpectError
+fz.prepareQuery()
+
+// $ExpectError
+const incorrectOptions: fz.IFilterOptions = { allowErrors: 'not a boolean' }
+
+// $ExpectError
+fz.filter(candidates, 'install', { allowErrors: 'not a boolean' })
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    // $ExpectError
+    incorrectProperty: true,
+    key: 'title'
+})
+
+// $ExpectError
+fz.score('Maybe', 'me', undefined, options)
+// $ExpectError
+fz.match('Maybe', 'me', undefined, options)
+
+// $ExpectError
+fz.filter()
+// $ExpectError
+fz.filter('not an array', 'query')
+// $ExpectError
+fz.filter(['Maybe', 'Me'], 'me', { allowErrors: 'not a boolean' })
+// $ExpectError
+fz.filter(['Maybe', 'Me'], 'me', { key: true })
+// $ExpectError
+fz.filter(['Maybe', 'Me'], 'me', { preparedQuery: {} })
+// $ExpectError
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    key: 1
+})
+// $ExpectError
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    allowErrors: 'not a boolean',
+    key: 1
+})
+// $ExpectError
+fz.filter([{ title: 'Maybe' }, { title: 'Me' }], 'me', {
+    allowErrors: 'not a boolean',
+    key: 'title'
+})
diff --git a/types/fuzzaldrin-plus/index.d.ts b/types/fuzzaldrin-plus/index.d.ts
index 34d6949ace..cd52c501d4 100644
--- a/types/fuzzaldrin-plus/index.d.ts
+++ b/types/fuzzaldrin-plus/index.d.ts
@@ -1,29 +1,39 @@
-// Type definitions for fuzzaldrin-plus
+// Type definitions for fuzzaldrin-plus 0.6.0
 // Project: https://github.com/jeancroy/fuzzaldrin-plus/
-// Definitions by: Jean Christophe Roy <https://github.com/jeancroy>, Jason Killian <https://github.com/jkillian>
+// Definitions by:  Jean Christophe Roy <https://github.com/jeancroy>,
+//                  Jason Killian <https://github.com/jkillian>
+//                  Ronald Rey <https://github.com/reyronald>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
 
-export as namespace fuzzaldrin;
+export as namespace fuzzaldrin
 
-export interface IQueryOptions {
-    pathSeparator?: string;
-    optCharRegEx?: RegExp;
+export class Query {
+    $$__internal: Symbol
 }
 
-export interface IScoringOptions extends IQueryOptions {
-    allowErrors?: boolean;
-    isPath?: boolean;
-    useExtensionBonus?: boolean;
+export interface IOptions {
+    allowErrors?: boolean
+    usePathScoring?: boolean
+    useExtensionBonus?: boolean
+    pathSeparator?: '/' | '\\' | string
+    optCharRegEx?: RegExp
+    wrap?: { tagOpen?: string; tagClass?: string; tagClose?: string }
+    preparedQuery?: Query
 }
 
-export interface IFilterOptions extends IScoringOptions {
-    key?: string;
-    maxResults?: number;
+export type IFilterOptions = IOptions & {
+    key?: string
+    maxResults?: number
+    maxInners?: number
 }
 
-export type PreparedQuery = { __internalAPIBrand: string; };
-
-export function filter<T>(data: T[], query: string, options?: IFilterOptions): T[];
-export function score(str: string, query: string, preparedQuery?: PreparedQuery, options?: IScoringOptions): number;
-export function match(str: string, query: string, preparedQuery?: PreparedQuery, options?: IScoringOptions): number[];
-export function prepQuery(query: string, options?: IQueryOptions): PreparedQuery;
+export function filter<T>(
+    data: T[],
+    query: string,
+    options?: IFilterOptions
+): T[]
+export function score(str: string, query: string, options?: IOptions): number
+export function match(str: string, query: string, options?: IOptions): number[]
+export function wrap(str: string, query: string, options?: IOptions): string
+export function prepareQuery(query: string, options?: IOptions): Query
diff --git a/types/gamedig/gamedig-tests.ts b/types/gamedig/gamedig-tests.ts
new file mode 100644
index 0000000000..3af9334b70
--- /dev/null
+++ b/types/gamedig/gamedig-tests.ts
@@ -0,0 +1,18 @@
+import Gamedig = require("gamedig");
+
+Gamedig.query({
+  type: "tf2",
+  host: "127.0.0.1"
+}, (error, state) => {
+  if (error) throw error();
+
+  const {
+    name,
+    map,
+    password,
+    maxplayers,
+    players,
+    bots,
+    notes
+  } = state;
+});
diff --git a/types/gamedig/index.d.ts b/types/gamedig/index.d.ts
new file mode 100644
index 0000000000..a2ccf75de9
--- /dev/null
+++ b/types/gamedig/index.d.ts
@@ -0,0 +1,285 @@
+// Type definitions for Gamedig 1.0
+// Project: https://github.com/sonicsnes/node-gamedig
+// Definitions by: Ivan Sieder <https://github.com/ivansieder>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export type Type =
+    "7d2d"
+    | "ageofchivalry"
+    | "aoe2"
+    | "alienarena"
+    | "alienswarm"
+    | "arkse"
+    | "avp2"
+    | "avp2010"
+    | "americasarmy"
+    | "americasarmy2"
+    | "americasarmy3"
+    | "americasarmypg"
+    | "arma"
+    | "arma2"
+    | "arma3"
+    | "armagetron"
+    | "baldursgate"
+    | "bat1944"
+    | "bf1942"
+    | "bfv"
+    | "bf2"
+    | "bf2142"
+    | "bfbc2"
+    | "bf3"
+    | "bf4"
+    | "bfh"
+    | "breach"
+    | "breed"
+    | "brink"
+    | "buildandshoot"
+    | "cod"
+    | "coduo"
+    | "cod2"
+    | "cod3"
+    | "cod4"
+    | "codwaw"
+    | "codmw2"
+    | "codmw3"
+    | "callofjuarez"
+    | "chaser"
+    | "chrome"
+    | "codenameeagle"
+    | "commandos3"
+    | "cacrenegade"
+    | "conanexiles"
+    | "contactjack"
+    | "cs16"
+    | "cscz"
+    | "css"
+    | "csgo"
+    | "crossracing"
+    | "crysis"
+    | "crysiswars"
+    | "crysis2"
+    | "daikatana"
+    | "dmomam"
+    | "darkesthour"
+    | "dayz"
+    | "dayzmod"
+    | "deadlydozenpt"
+    | "dh2005"
+    | "descent3"
+    | "deusex"
+    | "devastation"
+    | "dinodday"
+    | "dirttrackracing2"
+    | "dnl"
+    | "dod"
+    | "dods"
+    | "doi"
+    | "doom3"
+    | "dota2"
+    | "drakan"
+    | "etqw"
+    | "fear"
+    | "f12002"
+    | "f1c9902"
+    | "farcry"
+    | "farcry2"
+    | "fortressforever"
+    | "flashpoint"
+    | "ffow"
+    | "fivem"
+    | "garrysmod"
+    | "graw"
+    | "graw2"
+    | "giantscitizenkabuto"
+    | "globaloperations"
+    | "geneshift"
+    | "ges"
+    | "gore"
+    | "gunmanchronicles"
+    | "hldm"
+    | "hl2dm"
+    | "halo"
+    | "halo2"
+    | "heretic2"
+    | "hexen2"
+    | "hidden"
+    | "had2"
+    | "homefront"
+    | "homeworld2"
+    | "hurtworld"
+    | "igi2"
+    | "il2"
+    | "insurgency"
+    | "ironstorm"
+    | "jamesbondnightfire"
+    | "jc2mp"
+    | "killingfloor"
+    | "killingfloor2"
+    | "kingpin"
+    | "kisspc"
+    | "kspdmp"
+    | "kzmod"
+    | "left4dead"
+    | "left4dead2"
+    | "m2mp"
+    | "medievalengineers"
+    | "mohaa"
+    | "mohpa"
+    | "mohab"
+    | "mohsh"
+    | "mohbt"
+    | "moh2010"
+    | "mohwf"
+    | "minecraft"
+    | "minecraftpe"
+    | "minecraftping"
+    | "mnc"
+    | "mtavc"
+    | "mtasa"
+    | "mumble"
+    | "mumbleping"
+    | "mutantfactions"
+    | "nascarthunder2004"
+    | "netpanzer"
+    | "nmrih"
+    | "ns"
+    | "ns2"
+    | "nfshp2"
+    | "nab"
+    | "nwn"
+    | "nwn2"
+    | "nexuiz"
+    | "nitrofamily"
+    | "nolf"
+    | "nolf2"
+    | "nucleardawn"
+    | "openarena"
+    | "openttd"
+    | "operationflashpoint"
+    | "painkiller"
+    | "postal2"
+    | "prey"
+    | "primalcarnage"
+    | "quake1"
+    | "quake2"
+    | "quake3"
+    | "quake4"
+    | "ragdollkungfu"
+    | "r6"
+    | "r6roguespear"
+    | "r6ravenshield"
+    | "rallisportchallenge"
+    | "rallymasters"
+    | "redorchestra"
+    | "redorchestraost"
+    | "redorchestra2"
+    | "redline"
+    | "rtcw"
+    | "ricochet"
+    | "riseofnations"
+    | "rune"
+    | "rust"
+    | "samp"
+    | "spaceengineers"
+    | "ss"
+    | "ss2"
+    | "shatteredhorizon"
+    | "ship"
+    | "shogo"
+    | "shootmania"
+    | "sin"
+    | "sinep"
+    | "soldat"
+    | "sof"
+    | "sof2"
+    | "stalker"
+    | "stbc"
+    | "stvef"
+    | "stvef2"
+    | "swbf"
+    | "swbf2"
+    | "swjk"
+    | "swjk2"
+    | "swrc"
+    | "starbound"
+    | "starmade"
+    | "suicidesurvival"
+    | "swat4"
+    | "svencoop"
+    | "synergy"
+    | "tacticalops"
+    | "teamfactor"
+    | "tfc"
+    | "tf2"
+    | "teamspeak2"
+    | "teamspeak3"
+    | "terminus"
+    | "terraria"
+    | "thps3"
+    | "thps4"
+    | "thu2"
+    | "towerunite"
+    | "trackmania2"
+    | "trackmaniaforever"
+    | "tremulous"
+    | "tribes1"
+    | "tribesvengeance"
+    | "tron20"
+    | "turok2"
+    | "universalcombat"
+    | "unreal"
+    | "unturned"
+    | "ut"
+    | "ut2003"
+    | "ut2004"
+    | "ut3"
+    | "urbanterror"
+    | "v8supercar"
+    | "ventrilo"
+    | "vietcong"
+    | "vietcong2"
+    | "warsow"
+    | "wheeloftime"
+    | "wolfenstein2009"
+    | "wolfensteinet"
+    | "xpandrally"
+    | "zombiemaster"
+    | "zps";
+
+export interface Player {
+    name?: string;
+    ping?: number;
+    score?: number;
+    team?: string;
+    address?: string;
+}
+
+export interface QueryOptions {
+    type: Type;
+    host: string;
+    port?: number;
+    notes?: object;
+    maxAttempts?: number;
+    socketTimeout?: number;
+    attemptTimeout?: number;
+}
+
+export interface QueryResult {
+    name: string;
+    map: string;
+    password: boolean;
+    maxplayers: number;
+    players: Player[];
+    bots: Player[];
+    notes: object;
+    raw?: object;
+    query?: object;
+}
+
+export function query(
+    options: QueryOptions,
+    callback: (error: any, state: QueryResult) => void
+): void;
+
+export function query(options: QueryOptions): Promise<QueryResult>;
diff --git a/types/gamedig/tsconfig.json b/types/gamedig/tsconfig.json
new file mode 100644
index 0000000000..ae26ece7da
--- /dev/null
+++ b/types/gamedig/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",
+        "gamedig-tests.ts"
+    ]
+}
diff --git a/types/gamedig/tslint.json b/types/gamedig/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gamedig/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ganache-core/ganache-core-tests.ts b/types/ganache-core/ganache-core-tests.ts
new file mode 100644
index 0000000000..c0a6121c34
--- /dev/null
+++ b/types/ganache-core/ganache-core-tests.ts
@@ -0,0 +1,3 @@
+import { provider } from "ganache-core";
+
+provider({ verbose: true });
diff --git a/types/ganache-core/index.d.ts b/types/ganache-core/index.d.ts
new file mode 100644
index 0000000000..9297848806
--- /dev/null
+++ b/types/ganache-core/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for ganache-core 2.1
+// Project: https://github.com/trufflesuite/ganache-core#readme
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { Provider } from "ethereum-protocol";
+export interface GanacheOpts {
+    verbose?: boolean;
+    logger?: {
+        log(msg: string): void;
+    };
+    port?: number;
+    network_id?: number;
+    networkId?: number;
+    mnemonic?: string;
+    gasLimit?: number;
+}
+export function provider(opts: GanacheOpts): Provider;
diff --git a/types/ganache-core/tsconfig.json b/types/ganache-core/tsconfig.json
new file mode 100644
index 0000000000..ecbab1915e
--- /dev/null
+++ b/types/ganache-core/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",
+    "ganache-core-tests.ts"
+  ]
+}
diff --git a/types/ganache-core/tslint.json b/types/ganache-core/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ganache-core/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gapi/index.d.ts b/types/gapi/index.d.ts
index 38bf7f07b4..7ab0dfd1e6 100644
--- a/types/gapi/index.d.ts
+++ b/types/gapi/index.d.ts
@@ -247,11 +247,7 @@ declare namespace gapi.client {
     }
 
     interface HttpRequestRejected {
-        result: {
-            error: {
-                message: string;
-            }
-        };
+        result: any | boolean;
         body: string;
         headers?: any[];
         status?: number;
diff --git a/types/gc-stats/gc-stats-tests.ts b/types/gc-stats/gc-stats-tests.ts
new file mode 100644
index 0000000000..bf44e20175
--- /dev/null
+++ b/types/gc-stats/gc-stats-tests.ts
@@ -0,0 +1,11 @@
+import GCStats = require("gc-stats");
+import { GCStatistics } from "gc-stats";
+
+const gcStats = GCStats();
+
+gcStats.on("stats", (stats: GCStatistics) => {
+    const { gctype: gcType, startTime, endTime, before, after, diff } = stats;
+    const beforeMallocedMemory = before.mallocedMemory;
+    const afterMallocedMemory = after.mallocedMemory;
+    const diffMallocedMemory = diff.mallocedMemory;
+});
diff --git a/types/gc-stats/index.d.ts b/types/gc-stats/index.d.ts
new file mode 100644
index 0000000000..917aedf5b9
--- /dev/null
+++ b/types/gc-stats/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for gc-stats 1.2
+// Project: https://github.com/dainis/node-gcstats#readme
+// Definitions by: Vitor Fernandes <https://github.com/vfernandestoptal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from "events";
+
+declare namespace GCStats {
+    interface MemoryStatistics {
+        totalHeapSize: number;
+        totalHeapExecutableSize: number;
+        usedHeapSize: number;
+        heapSizeLimit: number;
+        totalPhysicalSize: number;
+        totalAvailableSize: number;
+        mallocedMemory: number;
+        peakMallocedMemory: number;
+    }
+
+    interface GCStatistics {
+        startTime: number;
+        endTime: number;
+        pause: number;
+        pauseMS: number;
+        gctype: 1 | 2 | 4 | 8 | 15;
+        before: MemoryStatistics;
+        after: MemoryStatistics;
+        diff: MemoryStatistics;
+    }
+}
+
+declare function GCStats(): EventEmitter;
+
+export = GCStats;
diff --git a/types/gc-stats/tsconfig.json b/types/gc-stats/tsconfig.json
new file mode 100644
index 0000000000..67fda0ff67
--- /dev/null
+++ b/types/gc-stats/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",
+        "gc-stats-tests.ts"
+    ]
+}
diff --git a/types/gc-stats/tslint.json b/types/gc-stats/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gc-stats/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/generic-pool/generic-pool-tests.ts b/types/generic-pool/generic-pool-tests.ts
index 9cc8707c86..09a1e611ea 100644
--- a/types/generic-pool/generic-pool-tests.ts
+++ b/types/generic-pool/generic-pool-tests.ts
@@ -11,8 +11,8 @@ const factory = {
             resolve(conn);
         });
     },
-    destroy: (conn: Connection): Promise<undefined> => {
-        return new Promise<undefined>(resolve => {
+    destroy: (conn: Connection): Promise<void> => {
+        return new Promise<void>(resolve => {
             conn.connected = false;
             resolve();
         });
@@ -41,6 +41,8 @@ const opts = {
 
 const pool = genericPool.createPool<Connection>(factory, opts);
 
+pool.start();
+
 pool.use((conn: Connection) => 'test')
     .then((result: string) => { });
 
@@ -53,7 +55,7 @@ pool.acquire()
         return pool.destroy(conn);
     }).then(() => {
         return pool.clear();
-    }).then((results: undefined[]) => {
+    }).then(() => {
     });
 
 pool.on('factoryCreateError', (err: Error) => {
diff --git a/types/generic-pool/index.d.ts b/types/generic-pool/index.d.ts
index bcfbb907e1..e50682ab12 100644
--- a/types/generic-pool/index.d.ts
+++ b/types/generic-pool/index.d.ts
@@ -17,17 +17,18 @@ export class Pool<T> extends EventEmitter {
     max: number;
     min: number;
 
+    start(): void;
     acquire(priority?: number): PromiseLike<T>;
     release(resource: T): void;
     destroy(resource: T): void;
-    drain(): PromiseLike<undefined>;
-    clear(): PromiseLike<undefined[]>;
+    drain(): PromiseLike<void>;
+    clear(): PromiseLike<void>;
     use<U>(cb: (resource: T) => U): PromiseLike<U>;
 }
 
 export interface Factory<T> {
     create(): PromiseLike<T>;
-    destroy(client: T): PromiseLike<undefined>;
+    destroy(client: T): PromiseLike<void>;
     validate?(client: T): PromiseLike<boolean>;
 }
 
diff --git a/types/geojson/index.d.ts b/types/geojson/index.d.ts
index ac1bf84e99..93f66d3f27 100644
--- a/types/geojson/index.d.ts
+++ b/types/geojson/index.d.ts
@@ -80,7 +80,7 @@ export interface GeometryObject extends GeoJsonObject {
  * Union of geometry objects.
  * https://tools.ietf.org/html/rfc7946#section-3
  */
-export type Geometry = Point | MultiPoint | LineString | Polygon | MultiPolygon | GeometryCollection;
+export type Geometry = Point | MultiPoint | LineString | MultiLineString | Polygon | MultiPolygon | GeometryCollection;
 
 /**
  * Point geometry object.
diff --git a/types/gestalt/gestalt-tests.tsx b/types/gestalt/gestalt-tests.tsx
new file mode 100644
index 0000000000..6445062d1a
--- /dev/null
+++ b/types/gestalt/gestalt-tests.tsx
@@ -0,0 +1,28 @@
+import * as React from "react";
+import {
+    Avatar,
+    Box,
+    Button,
+    Card,
+    Checkbox,
+    Column,
+    Container,
+    GroupAvatar,
+    Icon,
+    IconButton
+} from "gestalt";
+
+<Avatar name="Nicolas" />;
+<Box />;
+<Button text={"Click me"} />;
+<Card />;
+<Checkbox id={"1"} onChange={() => {}} />;
+<Column span={1} />;
+<Container />;
+<GroupAvatar collaborators={[{ name: "nicolas" }]} />;
+<Icon
+    accessibilityLabel={"sup"}
+    icon={"add"}
+    dangerouslySetSvgPath={{ __path: "something" }}
+/>;
+<IconButton accessibilityLabel={"something"} icon={"add-pin"} />;
diff --git a/types/gestalt/index.d.ts b/types/gestalt/index.d.ts
new file mode 100644
index 0000000000..162d61dd52
--- /dev/null
+++ b/types/gestalt/index.d.ts
@@ -0,0 +1,945 @@
+// Type definitions for gestalt 0.75
+// Project: https://github.com/pinterest/gestalt
+// Definitions by: Nicolás Serrano Arévalo <https://github.com/serranoarevalo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+/*
+Avatar Props Interface
+https://pinterest.github.io/gestalt/#/Avatar
+*/
+
+export interface AvatarProps {
+    name: string;
+    outline?: boolean;
+    size?: "sm" | "md" | "lg";
+    src?: string;
+    verified?: boolean;
+}
+
+export type UnsignedUpTo12 = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11 | 12;
+export type SignedUpTo12 = | -12 | -11 | -10 | -9 | -8 | -7 | -6 | -5 | -4 | -3 | -2 | -1 | UnsignedUpTo12;
+
+/*
+Box Props Interface
+https://pinterest.github.io/gestalt/#/Box
+*/
+
+export interface BoxProps {
+    alignContent?:
+        | "start"
+        | "end"
+        | "center"
+        | "between"
+        | "around"
+        | "stretch";
+    alignItems?: "start" | "end" | "center" | "baseline" | "stretch";
+    alignSelf?: "auto" | "start" | "end" | "center" | "baseline" | "stretch";
+    bottom?: boolean;
+    children?: React.ReactNode;
+    color?:
+        | "blue"
+        | "darkGray"
+        | "darkWash"
+        | "eggplant"
+        | "gray"
+        | "green"
+        | "lightGray"
+        | "lightWash"
+        | "maroon"
+        | "midnight"
+        | "navy"
+        | "olive"
+        | "orange"
+        | "orchid"
+        | "pine"
+        | "purple"
+        | "red"
+        | "transparent"
+        | "watermelon"
+        | "white";
+    column?: UnsignedUpTo12;
+    smColumn?: UnsignedUpTo12;
+    mdColumn?: UnsignedUpTo12;
+    lgColumn?: UnsignedUpTo12;
+    dangerouslySetInlineStyle?: {
+        __style: {
+            [key: string]: any;
+        };
+    };
+    direction?: "row" | "column";
+    smDirection?: "row" | "column";
+    mdDirection?: "row" | "column";
+    lgDirection?: "row" | "column";
+    display?: "none" | "flex" | "block" | "inlineBlock" | "visuallyHidden";
+    smDisplay?: "none" | "flex" | "block" | "inlineBlock" | "visuallyHidden";
+    mdDisplay?: "none" | "flex" | "block" | "inlineBlock" | "visuallyHidden";
+    lgDisplay?: "none" | "flex" | "block" | "inlineBlock" | "visuallyHidden";
+    fit?: boolean;
+    flex?: "grow" | "shrink" | "none";
+    height?: number | string;
+    justifyContent?: "start" | "end" | "center" | "between" | "around";
+    left?: boolean;
+    margin?: SignedUpTo12;
+    smMargin?: SignedUpTo12;
+    mdMargin?: SignedUpTo12;
+    lgMargin?: SignedUpTo12;
+    marginBottom?: SignedUpTo12;
+    smMarginBottom?: SignedUpTo12;
+    mdMarginBottom?: SignedUpTo12;
+    lgMarginBottom?: SignedUpTo12;
+    marginEnd?: SignedUpTo12;
+    smMarginEnd?: SignedUpTo12;
+    mdMarginEnd?: SignedUpTo12;
+    lgMarginEnd?: SignedUpTo12;
+    marginLeft?: SignedUpTo12;
+    smMarginLeft?: SignedUpTo12;
+    mdMarginLeft?: SignedUpTo12;
+    lgMarginLeft?: SignedUpTo12;
+    marginRight?: SignedUpTo12;
+    smMarginRight?: SignedUpTo12;
+    mdMarginRight?: SignedUpTo12;
+    lgMarginRight?: SignedUpTo12;
+    marginStart?: SignedUpTo12;
+    smMarginStart?: SignedUpTo12;
+    mdMarginStart?: SignedUpTo12;
+    lgMarginStart?: SignedUpTo12;
+    marginTop?: SignedUpTo12;
+    smMarginTop?: SignedUpTo12;
+    mdMarginTop?: SignedUpTo12;
+    lgMarginTop?: SignedUpTo12;
+    maxHeight?: number | string;
+    maxWidth?: number | string;
+    minHeight?: number | string;
+    minWidth?: number | string;
+    overflow?: "visible" | "hidden" | "scroll" | "scrollX" | "scrollY" | "auto";
+    padding?: UnsignedUpTo12;
+    smPadding?: UnsignedUpTo12;
+    mdPadding?: UnsignedUpTo12;
+    lgPadding?: UnsignedUpTo12;
+    paddingX?: UnsignedUpTo12;
+    smPaddingX?: UnsignedUpTo12;
+    mdPaddingX?: UnsignedUpTo12;
+    lgPaddingX?: UnsignedUpTo12;
+    paddingY?: UnsignedUpTo12;
+    smPaddingY?: UnsignedUpTo12;
+    mdPaddingY?: UnsignedUpTo12;
+    lgPaddingY?: UnsignedUpTo12;
+    position?: "static" | "absolute" | "relative" | "fixed";
+    right?: boolean;
+    shape?:
+        | "square"
+        | "rounded"
+        | "pill"
+        | "circle"
+        | "roundedTop"
+        | "roundedBottom"
+        | "roundedLeft"
+        | "roundedRight";
+    top?: boolean;
+    width?: number | string;
+    wrap?: boolean;
+}
+
+/*
+Button Props Interface
+https://pinterest.github.io/gestalt/#/Button
+*/
+
+export interface ButtonProps {
+    text: string;
+    accessibilityExpanded?: boolean;
+    accessibilityHaspopup?: boolean;
+    accessibilityLabel?: string;
+    color?: "blue" | "gray" | "red" | "transparent" | "white";
+    disabled?: boolean;
+    inline?: boolean;
+    name?: string;
+    onClick?: (args: { event: React.SyntheticEvent<React.MouseEvent> }) => void;
+    size?: "sm" | "md" | "lg";
+    type?: "submit" | "button";
+}
+
+/*
+Card Props Interface
+https://pinterest.github.io/gestalt/#/Card
+*/
+
+export interface CardProps {
+    active?: boolean;
+    children?: React.ReactNode;
+    image?: React.ReactNode;
+    onMouseEnter?: (
+        args: { event: React.SyntheticEvent<React.MouseEvent<HTMLDivElement>> }
+    ) => void;
+    onMouseLeave?: (
+        args: { event: React.SyntheticEvent<React.MouseEvent<HTMLDivElement>> }
+    ) => void;
+}
+
+/*
+Checkbox Props Interface
+https://pinterest.github.io/gestalt/#/Checkbox
+*/
+
+export interface CheckboxProps {
+    id: string;
+    onChange: (
+        args: {
+            event: React.SyntheticEvent<HTMLInputElement>;
+            checked: boolean;
+        }
+    ) => void;
+    checked?: boolean;
+    disabled?: boolean;
+    indeterminate?: boolean;
+    name?: string;
+    size?: "sm" | "md";
+}
+
+/*
+Column Props Interface
+https://pinterest.github.io/gestalt/#/Column
+*/
+
+export interface ColumnProps {
+    span: UnsignedUpTo12;
+    smSpan?: UnsignedUpTo12;
+    mdSpan?: UnsignedUpTo12;
+    lgSpan?: UnsignedUpTo12;
+    children?: React.ReactNode;
+}
+
+/*
+Container Props Interface
+https://pinterest.github.io/gestalt/#/Container
+*/
+
+export interface ContainerProps {
+    children?: React.ReactNode;
+}
+
+/*
+Flyout Props Interface
+https://pinterest.github.io/gestalt/#/Flyout
+*/
+
+export interface FlyoutProps {
+    anchor: React.RefObject<any>;
+    onDismiss: () => void;
+    children?: React.ReactNode;
+    color?: "blue" | "orange" | "white";
+    idealDirection?: "up" | "right" | "down" | "left";
+    positionRelativeToAnchor?: boolean;
+    size?: "xs" | "sm" | "md" | "lg" | "xl" | number;
+}
+
+/*
+GroupAvatar Props Interface
+https://pinterest.github.io/gestalt/#/GroupAvatar
+*/
+
+export interface GroupAvatarProps {
+    collaborators: ReadonlyArray<{ name: string; src?: string }>;
+    outline?: boolean;
+    size?: "sm" | "md" | "lg";
+}
+
+/*
+Heading Props Interface
+https://pinterest.github.io/gestalt/#/Heading
+*/
+
+export interface HeaderProps {
+    accessibilityLevel?: 1 | 2 | 3 | 4 | 5 | 6;
+    children?: React.ReactNode;
+    color?:
+        | "blue"
+        | "darkGray"
+        | "eggplant"
+        | "gray"
+        | "green"
+        | "lightGray"
+        | "maroon"
+        | "midnight"
+        | "navy"
+        | "olive"
+        | "orange"
+        | "orchid"
+        | "pine"
+        | "purple"
+        | "red"
+        | "watermelon"
+        | "white";
+    id?: string;
+    overflow?: "normal" | "breakWord";
+    size?: "xs" | "sm" | "md" | "lg" | "xl";
+    smSize?: "xs" | "sm" | "md" | "lg" | "xl";
+    mdSize?: "xs" | "sm" | "md" | "lg" | "xl";
+    lgSize?: "xs" | "sm" | "md" | "lg" | "xl";
+    truncate?: boolean;
+}
+
+/*
+Icon Props Interface
+https://pinterest.github.io/gestalt/#/Icon
+*/
+
+export type Icons =
+    | "add"
+    | "add-circle"
+    | "add-pin"
+    | "angled-pin"
+    | "arrow-back"
+    | "arrow-circle-down"
+    | "arrow-circle-forward"
+    | "arrow-down"
+    | "arrow-forward"
+    | "arrow-up"
+    | "arrow-up-right"
+    | "bell"
+    | "camera"
+    | "cancel"
+    | "check"
+    | "check-circle"
+    | "circle-outline"
+    | "clear"
+    | "clock"
+    | "cog"
+    | "compass"
+    | "dash"
+    | "edit"
+    | "ellipsis"
+    | "ellipsis-circle-outline"
+    | "eye"
+    | "facebook"
+    | "face-happy"
+    | "face-sad"
+    | "face-smiley"
+    | "filter"
+    | "flag"
+    | "flashlight"
+    | "gif"
+    | "globe"
+    | "globe-checked"
+    | "graph-bar"
+    | "handle"
+    | "hand-pointing"
+    | "heart"
+    | "heart-broken"
+    | "knoop"
+    | "lightbulb"
+    | "link"
+    | "location"
+    | "lock"
+    | "maximize"
+    | "menu"
+    | "minimize"
+    | "move"
+    | "mute"
+    | "pause"
+    | "people"
+    | "person"
+    | "person-add"
+    | "pin"
+    | "pin-hide"
+    | "pinterest"
+    | "play"
+    | "question-mark"
+    | "remove"
+    | "report"
+    | "search"
+    | "shopping-bag"
+    | "smiley"
+    | "smiley-outline"
+    | "send"
+    | "share"
+    | "sound"
+    | "speech"
+    | "speech-ellipsis"
+    | "tag";
+
+export interface IconProps {
+    accessibilityLabel: string;
+    icon: Icons;
+    color?:
+        | "blue"
+        | "darkGray"
+        | "eggplant"
+        | "gray"
+        | "green"
+        | "lightGray"
+        | "maroon"
+        | "midnight"
+        | "navy"
+        | "olive"
+        | "orange"
+        | "orchid"
+        | "pine"
+        | "purple"
+        | "red"
+        | "watermelon"
+        | "white";
+    dangerouslySetSvgPath?: { __path: string };
+    inline?: boolean;
+    size?: number | string;
+}
+
+/*
+IconButton Props Interface
+https://pinterest.github.io/gestalt/#/IconButton
+*/
+
+export interface IconButtonProps {
+    accessibilityLabel: string;
+    icon: Icons;
+    accessibilityExpanded?: boolean;
+    accessibilityHaspopup?: boolean;
+    bgColor?: "transparent" | "lightGray" | "white";
+    iconColor?: "blue" | "darkGray" | "gray" | "red" | "white";
+    onClick?: (args: { event: React.SyntheticEvent<React.MouseEvent> }) => void;
+    size?: "xs" | "sm" | "md" | "lg" | "xl";
+}
+
+/*
+Image Props Interface
+https://pinterest.github.io/gestalt/#/Image
+*/
+
+export interface ImageProps {
+    alt: string;
+    color: string;
+    naturalHeight: number;
+    naturalWidth: number;
+    src: string;
+    children?: React.ReactNode;
+    fit?: "cover" | "contain" | "none";
+    onError?: () => void;
+    onLoad?: () => void;
+    size?: string;
+    srcSet?: string;
+}
+
+/*
+Label Props Interface
+https://pinterest.github.io/gestalt/#/Label
+*/
+
+export interface LabelProps {
+    htmlFor: string;
+    children?: React.ReactNode;
+}
+
+/*
+Letterbox Props Interface
+https://pinterest.github.io/gestalt/#/Letterbox
+*/
+
+export interface LetterboxProps {
+    contentAspectRatio: number;
+    height: number;
+    width: number;
+    children?: React.ReactNode;
+}
+
+/*
+Link Props Interface
+https://pinterest.github.io/gestalt/#/Link
+*/
+
+export interface LinkProps {
+    children?: React.ReactNode;
+    href?: string;
+    inline?: boolean;
+    onClick?: (args: { event: React.SyntheticEvent<React.MouseEvent> }) => void;
+    target?: "null" | "self" | "blank";
+}
+
+/*
+Mask Props Interface
+https://pinterest.github.io/gestalt/#/Mask
+*/
+
+export interface MaskProps {
+    children?: React.ReactNode;
+    height?: number | string;
+    shape?: "circle" | "rounded" | "square";
+    wash?: boolean;
+    width?: number | string;
+}
+
+/*
+Masonry Props Interface
+https://pinterest.github.io/gestalt/#/Masonry
+*/
+
+export interface MasonryProps {
+    comp: React.ComponentType;
+    items: ReadonlyArray<any>;
+    columnWidth?: number;
+    flexible?: boolean;
+    gutterWidth?: number;
+    layout?: "MasonryDefaultLayout" | "MasonryUniformRowLayout";
+    loadItems?: () => void;
+    measurementStore?: any;
+    minCols?: number;
+    scrollContainer?: () => HTMLElement;
+    virtualize?: boolean;
+}
+
+/*
+Modal Props Interface
+https://pinterest.github.io/gestalt/#/Modal
+*/
+
+export interface ModalProps {
+    accessibilityCloseLabel: string;
+    accessibilityModalLabel: string;
+    heading: string;
+    onDismiss: () => void;
+    children?: React.ReactNode;
+    footer?: React.ReactNode;
+    role?: "alertdialog" | "dialog";
+    size?: "sm" | "md" | "lg";
+}
+
+/*
+Props Props Interface
+https://pinterest.github.io/gestalt/#/Pog
+*/
+
+export interface PogProps {
+    icon: Icons;
+    active?: boolean;
+    bgColor?: "transparent" | "lightGray" | "white";
+    focused?: boolean;
+    hovered?: boolean;
+    iconColor?: "blue" | "darkGray" | "gray" | "red" | "white";
+    size?: "xs" | "sm" | "md" | "lg" | "xl";
+}
+
+/*
+Pulsar Props Interface
+https://pinterest.github.io/gestalt/#/Pulsar
+*/
+
+export interface PulsarProps {
+    paused?: boolean;
+    size?: number;
+}
+
+/*
+RadioButton Props Interface
+https://pinterest.github.io/gestalt/#/RadioButton
+*/
+
+export interface RadioButtonProps {
+    id: string;
+    onChange: (
+        args: {
+            event: React.SyntheticEvent<HTMLInputElement>;
+            checked: boolean;
+        }
+    ) => void;
+    checked?: boolean;
+    disabled?: boolean;
+    name?: string;
+    size?: "sm" | "md";
+    value?: string;
+}
+
+/*
+SearchField Props Interface
+https://pinterest.github.io/gestalt/#/SearchField
+*/
+
+export interface SearchFieldProps {
+    accessibilityLabel: string;
+    id: string;
+    onChange: (
+        args: {
+            value: string;
+            syntheticEvent: React.SyntheticEvent<HTMLInputElement>;
+        }
+    ) => void;
+    onBlur?: (args: { event: React.SyntheticEvent<HTMLInputElement> }) => void;
+    onFocus?: (
+        args: {
+            value: string;
+            syntheticEvent: React.SyntheticEvent<HTMLInputElement>;
+        }
+    ) => void;
+    placeholder?: string;
+    value?: string;
+}
+
+/*
+SegmentedControl Props Interface
+https://pinterest.github.io/gestalt/#/SegmentedControl
+*/
+
+export interface SegmentedControlProps {
+    items: ReadonlyArray<React.ReactNode>;
+    onChange: (
+        args: {
+            event: React.SyntheticEvent<React.MouseEvent>;
+            activeIndex: number;
+        }
+    ) => void;
+    selectedItemIndex: number;
+    size?: "md" | "lg";
+}
+
+/*
+SelectList Props Interface
+https://pinterest.github.io/gestalt/#/SelectList
+*/
+
+export interface SelectListProps {
+    id: string;
+    onChange: (
+        args: { event: React.SyntheticEvent<HTMLInputElement>; value: string }
+    ) => void;
+    options: ReadonlyArray<{ label: string; value: string }>;
+    disabled?: boolean;
+    errorMessage?: string;
+    idealErrorDirection?: "up" | "right" | "down" | "left";
+    name?: string;
+    placeholder?: string;
+    value?: string;
+}
+
+/*
+Spinner Props Interface
+https://pinterest.github.io/gestalt/#/Spinner
+*/
+
+export interface SpinnerProps {
+    accessibilityLabel: string;
+    show: boolean;
+}
+
+/*
+Sticky Props Interface
+https://pinterest.github.io/gestalt/#/Sticky
+*/
+
+export interface StickyProps {
+    bottom?: number | string;
+    children?: React.ReactNode;
+    dangerouslySetZIndex?: { __zIndex: string };
+    left?: number | string;
+    right?: number | string;
+    top?: number | string;
+}
+
+/*
+Switch Props Interface
+https://pinterest.github.io/gestalt/#/Switch
+*/
+
+export interface SwitchProps {
+    id: string;
+    onChange: (
+        args: { event: React.SyntheticEvent<HTMLInputElement>; value: boolean }
+    ) => void;
+    disabled?: boolean;
+    name?: string;
+    switched?: boolean;
+}
+
+/*
+Tabs Props Interface
+https://pinterest.github.io/gestalt/#/Tabs
+*/
+
+export interface TabsProps {
+    activeTabIndex: number;
+    onChange: (
+        args: {
+            event: React.SyntheticEvent<React.MouseEvent>;
+            activeTabIndex: number;
+        }
+    ) => void;
+    tabs: ReadonlyArray<{ text: any; href: string }>;
+}
+
+/*
+Text Props Interface
+https://pinterest.github.io/gestalt/#/Text
+*/
+
+export interface TextProps {
+    align?: "left" | "right" | "center" | "justify";
+    bold?: boolean;
+    children?: React.ReactNode;
+    color?:
+        | "blue"
+        | "darkGray"
+        | "eggplant"
+        | "gray"
+        | "green"
+        | "lightGray"
+        | "maroon"
+        | "midnight"
+        | "navy"
+        | "olive"
+        | "orange"
+        | "orchid"
+        | "pine"
+        | "purple"
+        | "red"
+        | "watermelon"
+        | "white";
+    inline?: boolean;
+    italic?: boolean;
+    overflow?: "normal" | "breakWord";
+    size?: "xs" | "sm" | "md" | "lg" | "xl";
+    smSize?: "xs" | "sm" | "md" | "lg" | "xl";
+    mdSize?: "xs" | "sm" | "md" | "lg" | "xl";
+    lgSize?: "xs" | "sm" | "md" | "lg" | "xl";
+    truncate?: boolean;
+}
+
+/*
+TextArea Interface Props
+https://pinterest.github.io/gestalt/#/TextArea
+*/
+
+export interface TextAreaProps {
+    id: string;
+    onChange: (
+        args: { event: React.SyntheticEvent<HTMLInputElement>; value: string }
+    ) => void;
+    disabled?: boolean;
+    errorMessage?: string;
+    idealErrorDirection?: "up" | "right" | "down" | "left";
+    name?: string;
+    onBlur?: (
+        args: {
+            event: React.SyntheticEvent<React.FocusEvent>;
+            value: string;
+        }
+    ) => void;
+    onFocus?: (
+        args: {
+            event: React.SyntheticEvent<React.FocusEvent>;
+            value: string;
+        }
+    ) => void;
+    placeholder?: string;
+    rows?: number;
+    value?: string;
+}
+
+/*
+TextField Interface Props
+https://pinterest.github.io/gestalt/#/TextField
+*/
+
+export interface TextFieldProps {
+    id: string;
+    onChange: (
+        args: {
+            event: React.SyntheticEvent<HTMLInputElement>;
+            value: string;
+        }
+    ) => void;
+    autoComplete?: "current-password" | "on" | "off" | "username";
+    disabled?: boolean;
+    errorMessage?: string;
+    idealErrorDirection?: "up" | "right" | "down" | "left";
+    name?: string;
+    onBlur?: (
+        args: {
+            event: React.SyntheticEvent<React.FocusEvent>;
+            value: string;
+        }
+    ) => void;
+    onFocus?: (
+        args: {
+            event: React.SyntheticEvent<React.FocusEvent>;
+            value: string;
+        }
+    ) => void;
+    placeholder?: string;
+    type?: "date" | "email" | "number" | "password" | "text" | "url";
+    value?: string;
+}
+
+/*
+Toast Interface Props
+https://pinterest.github.io/gestalt/#/Toast
+*/
+
+export interface ToastProps {
+    color?: "darkGray" | "orange";
+    icon?: "arrow-circle-forward";
+    text?: string | ReadonlyArray<string>;
+    thumbnail?: React.ReactElement<any>;
+}
+
+/*
+Tooltip Interface Props
+https://pinterest.github.io/gestalt/#/Tooltip
+*/
+
+export interface TooltipProps {
+    anchor: any;
+    onDismiss: () => void;
+    children?: React.ReactNode;
+    idealDirection?: "up" | "right" | "down" | "left";
+    positionRelativeToAnchor?: boolean;
+    size?: "xs" | "sm" | "md" | "lg" | "xl";
+}
+
+/*
+Touchable Interface Props
+https://pinterest.github.io/gestalt/#/Touchable
+*/
+
+export interface TouchableProps {
+    onTouch: (
+        args: {
+            event:
+                | React.SyntheticEvent<React.MouseEvent<HTMLDivElement>>
+                | React.SyntheticEvent<React.KeyboardEvent<HTMLDivElement>>;
+        }
+    ) => void;
+    children?: React.ReactNode;
+    fullHeight?: boolean;
+    fullWidth?: boolean;
+    mouseCursor?:
+        | "copy"
+        | "grab"
+        | "grabbing"
+        | "move"
+        | "noDrop"
+        | "pointer"
+        | "zoomIn"
+        | "zoomOut";
+    onMouseEnter?: (
+        args: {
+            event: React.SyntheticEvent<React.MouseEvent<HTMLDivElement>>;
+        }
+    ) => void;
+    onMouseLeave?: (
+        args: {
+            event: React.SyntheticEvent<React.MouseEvent<HTMLDivElement>>;
+        }
+    ) => void;
+    shape?:
+        | "square"
+        | "rounded"
+        | "pill"
+        | "circle"
+        | "roundedTop"
+        | "roundedBottom"
+        | "roundedLeft"
+        | "roundedRight";
+}
+
+/*
+Video Props Interface
+https://pinterest.github.io/gestalt/#/Video
+*/
+
+export interface VideoProps {
+    aspectRatio: number;
+    captions: string;
+    src:
+        | string
+        | ReadonlyArray<{
+              type: "video/m3u8" | "video/mp4" | "video/ogg";
+              src: string;
+          }>;
+    accessibilityMaximizeLabel?: string;
+    accessibilityMinimizeLabel?: string;
+    accessibilityMuteLabel?: string;
+    accessibilityPauseLabel?: string;
+    accessibilityPlayLabel?: string;
+    accessibilityUnmuteLabel?: string;
+    controls?: boolean;
+    loop?: boolean;
+    onDurationChange?: (
+        args: {
+            event: React.SyntheticEvent<HTMLVideoElement>;
+            duration: number;
+        }
+    ) => void;
+    onEnded?: (args: { event: React.SyntheticEvent<HTMLVideoElement> }) => void;
+    onFullscreenChange?: (
+        args: {
+            event: React.SyntheticEvent<HTMLDivElement>;
+            fullscreen: boolean;
+        }
+    ) => void;
+    onLoadedChange?: (
+        args: {
+            event: React.SyntheticEvent<HTMLVideoElement>;
+            loaded: number;
+        }
+    ) => void;
+    onPause?: (args: { event: React.SyntheticEvent<HTMLDivElement> }) => void;
+    onPlay?: (args: { event: React.SyntheticEvent<HTMLDivElement> }) => void;
+    onReady?: (args: { event: React.SyntheticEvent<HTMLVideoElement> }) => void;
+    onSeek?: (args: { event: React.SyntheticEvent<HTMLVideoElement> }) => void;
+    onTimeChange?: (
+        args: {
+            event: React.SyntheticEvent<HTMLVideoElement>;
+            time: number;
+        }
+    ) => void;
+    onVolumeChange?: (
+        args: {
+            event: React.SyntheticEvent<HTMLDivElement>;
+            volume: number;
+        }
+    ) => void;
+    playbackRate?: number;
+    playing?: boolean;
+    playsInline?: boolean;
+    poster?: string;
+    preload?: "auto" | "metadata" | "none";
+    volume: number;
+}
+
+export class Avatar extends React.Component<AvatarProps, any> {}
+export class Box extends React.Component<BoxProps, any> {}
+export class Button extends React.Component<ButtonProps, any> {}
+export class Card extends React.Component<CardProps, any> {}
+export class Checkbox extends React.Component<CheckboxProps, any> {}
+export class Column extends React.Component<ColumnProps, any> {}
+export class Container extends React.Component<ContainerProps, any> {}
+export class Divider extends React.Component<{}, any> {}
+export class Flyout extends React.Component<FlyoutProps, any> {}
+export class GroupAvatar extends React.Component<GroupAvatarProps, any> {}
+export class Heading extends React.Component<HeaderProps, any> {}
+export class Icon extends React.Component<IconProps, any> {}
+export class IconButton extends React.Component<IconButtonProps, any> {}
+export class Image extends React.Component<ImageProps, any> {}
+export class Label extends React.Component<LabelProps, any> {}
+export class Letterbox extends React.Component<LetterboxProps, any> {}
+export class Link extends React.Component<LinkProps, any> {}
+export class Mask extends React.Component<MaskProps, any> {}
+export class Masonry extends React.Component<MasonryProps, any> {}
+export class Modal extends React.Component<ModalProps, any> {}
+export class Pog extends React.Component<PogProps, any> {}
+export class Pulsar extends React.Component<PulsarProps, any> {}
+export class RadioButton extends React.Component<RadioButtonProps, any> {}
+export class SearchField extends React.Component<SearchFieldProps, any> {}
+export class SegmentedControl extends React.Component<SearchFieldProps, any> {}
+export class SelectList extends React.Component<SelectListProps, any> {}
+export class Spinner extends React.Component<SpinnerProps, any> {}
+export class Sticky extends React.Component<StickyProps, any> {}
+export class Switch extends React.Component<SwitchProps, any> {}
+export class Tabs extends React.Component<TabsProps, any> {}
+export class Text extends React.Component<TextProps, any> {}
+export class TextArea extends React.Component<TextAreaProps, any> {}
+export class TextField extends React.Component<TextFieldProps, any> {}
+export class Toast extends React.Component<ToastProps, any> {}
+export class Tooltip extends React.Component<TooltipProps, any> {}
+export class Touchable extends React.Component<TouchableProps, any> {}
+export class Video extends React.Component<VideoProps, any> {}
diff --git a/types/gestalt/tsconfig.json b/types/gestalt/tsconfig.json
new file mode 100644
index 0000000000..021cefc41d
--- /dev/null
+++ b/types/gestalt/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "gestalt-tests.tsx"]
+}
diff --git a/types/gestalt/tslint.json b/types/gestalt/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gestalt/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/get-folder-size/get-folder-size-tests.ts b/types/get-folder-size/get-folder-size-tests.ts
new file mode 100644
index 0000000000..0165988fea
--- /dev/null
+++ b/types/get-folder-size/get-folder-size-tests.ts
@@ -0,0 +1,5 @@
+import getFolderSize = require('get-folder-size');
+
+getFolderSize('.', (err: Error | null, size: number) => {});
+
+getFolderSize('.', /types/, (err: Error | null, size: number) => {});
diff --git a/types/get-folder-size/index.d.ts b/types/get-folder-size/index.d.ts
new file mode 100644
index 0000000000..cf91fddfa4
--- /dev/null
+++ b/types/get-folder-size/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for get-folder-size 2.0
+// Project: https://github.com/alessioalex/get-folder-size
+// Definitions by: Mariusz Szczepańczyk <https://github.com/mszczepanczyk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = getFolderSize;
+
+declare function getFolderSize(folder: string, callback: (err: Error | null, size: number) => void): void;
+declare function getFolderSize(folder: string, regexIgnorePattern: RegExp, callback: (err: Error | null, size: number) => void): void;
diff --git a/types/get-folder-size/tsconfig.json b/types/get-folder-size/tsconfig.json
new file mode 100644
index 0000000000..2e5c9817ae
--- /dev/null
+++ b/types/get-folder-size/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",
+        "get-folder-size-tests.ts"
+    ]
+}
diff --git a/types/get-folder-size/tslint.json b/types/get-folder-size/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/get-folder-size/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/get-port/get-port-tests.ts b/types/get-port/get-port-tests.ts
index b6e59890d6..53a9e8e69b 100644
--- a/types/get-port/get-port-tests.ts
+++ b/types/get-port/get-port-tests.ts
@@ -7,3 +7,7 @@ getPort().then(port => {
 getPort({ port: 3000 }).then(port => {
     console.log(port);
 });
+
+getPort({ port: [3000, 3001] }).then(port => {
+    console.log(port);
+});
diff --git a/types/get-port/index.d.ts b/types/get-port/index.d.ts
index 3f62b90c86..f8adb4851e 100644
--- a/types/get-port/index.d.ts
+++ b/types/get-port/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for get-port 3.2
+// Type definitions for get-port 4.0
 // Project: https://github.com/sindresorhus/get-port
 // Definitions by: York Yao <https://github.com/plantain-00/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module "get-port" {
-    var getPort: (options?: { port?: number, host?: string }) => PromiseLike<number>
+    var getPort: (options?: { port?: number | ReadonlyArray<number>, host?: string }) => PromiseLike<number>
     export = getPort;
 }
diff --git a/types/git-url-parse/git-url-parse-tests.ts b/types/git-url-parse/git-url-parse-tests.ts
new file mode 100644
index 0000000000..41fd0bd0f0
--- /dev/null
+++ b/types/git-url-parse/git-url-parse-tests.ts
@@ -0,0 +1,8 @@
+import gitUrlParse = require('git-url-parse');
+
+gitUrlParse("git@github.com:IonicaBizau/node-git-url-parse.git"); // $ExpectType GitUrl
+gitUrlParse("git@github.com:IonicaBizau/node-git-url-parse.git").toString(); // $ExpectType string
+gitUrlParse("git@github.com:IonicaBizau/node-git-url-parse.git").toString('git+ssh'); // $ExpectType string
+
+gitUrlParse.stringify(gitUrlParse("git@github.com:IonicaBizau/node-git-url-parse.git")); // $ExpectType string
+gitUrlParse.stringify(gitUrlParse("git@github.com:IonicaBizau/node-git-url-parse.git"), 'https'); // $ExpectType string
diff --git a/types/git-url-parse/index.d.ts b/types/git-url-parse/index.d.ts
new file mode 100644
index 0000000000..5c1d14ba7a
--- /dev/null
+++ b/types/git-url-parse/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for git-url-parse 9.0
+// Project: https://github.com/IonicaBizau/git-url-parse
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace gitUrlParse {
+    interface GitUrl {
+        /** An array with the url protocols (usually it has one element). */
+        protocols: string[];
+        port: number | null;
+        /** The url domain (including subdomains). */
+        resource: string;
+        /** The authentication user (usually for ssh urls). */
+        user: string;
+        pathname: string;
+        hash: string;
+        search: string;
+        href: string;
+        protocol: string;
+        /** The oauth token (could appear in the https urls). */
+        token: string;
+        /** The Git provider (e.g. `"github.com"`). */
+        source: string;
+        /** The repository owner. */
+        owner: string;
+        /** The repository name. */
+        name: string;
+        /** The repository ref (e.g., "master" or "dev"). */
+        ref: string;
+        /** A filepath relative to the repository root. */
+        filepath: string;
+        /** The type of filepath in the url ("blob" or "tree"). */
+        filepathtype: string;
+        /** The owner and name values in the `owner/name` format. */
+        full_name: string;
+        /** The organization the owner belongs to. This is CloudForge specific. */
+        organization: string;
+        /** Whether to add the `.git` suffix or not. */
+        git_suffix?: boolean;
+        toString(type?: string): string;
+    }
+
+    function stringify(url: GitUrl, type?: string): string;
+}
+
+declare function gitUrlParse(url: string): gitUrlParse.GitUrl;
+
+export = gitUrlParse;
diff --git a/types/git-url-parse/tsconfig.json b/types/git-url-parse/tsconfig.json
new file mode 100644
index 0000000000..0261055b6f
--- /dev/null
+++ b/types/git-url-parse/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",
+        "git-url-parse-tests.ts"
+    ]
+}
diff --git a/types/git-url-parse/tslint.json b/types/git-url-parse/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/git-url-parse/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/github-url-to-object/github-url-to-object-tests.ts b/types/github-url-to-object/github-url-to-object-tests.ts
new file mode 100644
index 0000000000..a6de7f1355
--- /dev/null
+++ b/types/github-url-to-object/github-url-to-object-tests.ts
@@ -0,0 +1,5 @@
+import gh = require('github-url-to-object');
+
+gh('github:monkey/business'); // $ExpectType Result | null
+gh('https://ghe.example.com:heroku/heroku-flags.git', {enterprise: true}); // $ExpectType Result | null
+gh({url: 'git+https://github.com/monkey/business.git'}); // $ExpectType Result | null
diff --git a/types/github-url-to-object/index.d.ts b/types/github-url-to-object/index.d.ts
new file mode 100644
index 0000000000..a46ca93dd7
--- /dev/null
+++ b/types/github-url-to-object/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for github-url-to-object 4.0
+// Project: https://github.com/zeke/github-url-to-object#readme
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace gh {
+    interface Options {
+        enterprise?: boolean;
+    }
+    interface Result {
+        user: string;
+        repo: string;
+        branch: string;
+        https_url: string;
+        tarball_url: string;
+        clone_url: string;
+        travis_url: string;
+        api_url: string;
+        zip_url: string;
+    }
+}
+
+declare function gh(url: string | {url: string}, options?: gh.Options): gh.Result | null;
+
+export = gh;
diff --git a/types/github-url-to-object/tsconfig.json b/types/github-url-to-object/tsconfig.json
new file mode 100644
index 0000000000..d25b3d0527
--- /dev/null
+++ b/types/github-url-to-object/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",
+        "github-url-to-object-tests.ts"
+    ]
+}
diff --git a/types/github-url-to-object/tslint.json b/types/github-url-to-object/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/github-url-to-object/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 c929323764..cf9c4ef616 100644
--- a/types/gl-matrix/gl-matrix-tests.ts
+++ b/types/gl-matrix/gl-matrix-tests.ts
@@ -79,6 +79,7 @@ outVec2 = vec2.transformMat2d(outVec2, vec2A, mat2dA);
 outVec2 = vec2.transformMat3(outVec2, vec2A, mat3A);
 outVec2 = vec2.transformMat4(outVec2, vec2A, mat4A);
 vecArray = vec2.forEach(vecArray, 0, 0, 0, vec2.normalize);
+outVal = vec2.angle(vec2A, vec2B);
 outStr = vec2.str(vec2A);
 outBool = vec2.exactEquals(vec2A, vec2B);
 outBool = vec2.equals(vec2A, vec2B);
diff --git a/types/gl-matrix/index.d.ts b/types/gl-matrix/index.d.ts
index cad714796d..2c86b6a057 100644
--- a/types/gl-matrix/index.d.ts
+++ b/types/gl-matrix/index.d.ts
@@ -431,6 +431,14 @@ declare module 'gl-matrix' {
         public static forEach(a: Float32Array, stride: number, offset: number, count: number,
                               fn: (a: vec2 | number[], b: vec2 | number[], arg: any) => void, arg: any): Float32Array;
 
+        /**
+         * Get the angle between two 2D vectors
+         * @param a The first operand
+         * @param b The second operand
+         * @returns The angle in radians
+         */
+        public static angle(a: vec2 | number[], b: vec2 | number[]): number;
+
         /**
          * Perform some operation over an array of vec2s.
          *
diff --git a/types/gl-texture2d/index.d.ts b/types/gl-texture2d/index.d.ts
index 4d979d99f9..59f92b8555 100644
--- a/types/gl-texture2d/index.d.ts
+++ b/types/gl-texture2d/index.d.ts
@@ -6,6 +6,8 @@
 
 import ndarray = require("ndarray");
 
+type GLenum = number;
+
 type InputType = ImageData | HTMLCanvasElement | HTMLImageElement | HTMLVideoElement;
 
 interface RawObject {
diff --git a/types/globalize/dist/globalize.d.ts b/types/globalize/dist/globalize.d.ts
new file mode 100644
index 0000000000..4d04f2f7b6
--- /dev/null
+++ b/types/globalize/dist/globalize.d.ts
@@ -0,0 +1,113 @@
+import * as Cldr from "cldrjs";
+
+declare namespace Globalize {
+	interface CommonNumberFormatterOptions {
+		/**
+		 * Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+		 */
+		minimumIntegerDigits?: number;
+		/**
+		 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
+		 * Numbers will be rounded or padded with trailing zeroes if necessary.
+		 * Either one or both of these properties must be present.
+		 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 */
+		minimumFractionDigits?: number;
+		/**
+		 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
+		 * Numbers will be rounded or padded with trailing zeroes if necessary.
+		 * Either one or both of these properties must be present.
+		 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 */
+		maximumFractionDigits?: number;
+		/**
+		 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
+		 * Either none or both of these properties are present
+		 * If they are, they override minimum and maximum integer and fraction digits.
+		 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 */
+		minimumSignificantDigits?: number;
+		/**
+		 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
+		 * Either none or both of these properties are present.
+		 * If they are, they override minimum and maximum integer and fraction digits.
+		 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 */
+		maximumSignificantDigits?: number;
+		/**
+		 * String with rounding method ceil, floor, round (default), or truncate.
+		 */
+		round?: "ceil" | "floor" | "round" | "truncate";
+		/**
+		 * Boolean (default is true) value indicating whether a grouping separator should be used.
+		 */
+		useGrouping?: boolean;
+	}
+
+	interface Shared {
+		cldr: Cldr.CldrStatic;
+	}
+
+	interface Static extends Shared {
+		/**
+		 * Globalize.load( json, ... )
+		 * @param {Object} [JSON]
+		 * Load resolved or unresolved cldr data.
+		 * Somewhat equivalent to previous Globalize.addCultureInfo(...).
+		 */
+		load(json: Object): void;
+
+		/**
+		 * Globalize.locale()
+		 * Return the default Cldr instance.
+		 */
+		locale(): Cldr.CldrStatic;
+
+		/**
+		 * Globalize.locale( [locale] )
+		 * @param {string} locale
+		 * Set default Cldr instance
+		 * Return the default Cldr instance.
+		 */
+		locale(locale: string): Cldr.CldrStatic;
+		/**
+		 * Globalize.locale( cldr )
+		 * @param {Cldr} cldr [Cldr instance]
+		 * Set default Cldr instance
+		 * Return the default Cldr instance.
+		 */
+		locale(cldr: Cldr.CldrStatic): Cldr.CldrStatic;
+
+		/**
+		 * Create a Globalize instance.
+		 * @param {string} Locale string of the instance.
+		 * @returns {Globalize} A Globalize instance
+		 */
+		new (locale: string): Globalize;
+		/**
+		 * Create a Globalize instance.
+		 * @param cldr Cldr instance of the instance.
+		 * @returns {Globalize} A Globalize instance
+		 */
+		new (cldr: Cldr.CldrStatic): Globalize;
+		/**
+		 * Create a Globalize instance.
+		 * @param {string} Locale string of the instance.
+		 * @returns {Globalize} A Globalize instance
+		 */
+		(locale: string): Globalize;
+		/**
+		 * Create a Globalize instance.
+		 * @param cldr Cldr instance of the instance.
+		 * @returns {Globalize} A Globalize instance
+		 */
+		(cldr: Cldr.CldrStatic): Globalize;
+	}
+}
+
+interface Globalize extends Globalize.Shared {
+}
+
+declare const Globalize: Globalize.Static;
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/currency.d.ts b/types/globalize/dist/globalize/currency.d.ts
new file mode 100644
index 0000000000..46564648c8
--- /dev/null
+++ b/types/globalize/dist/globalize/currency.d.ts
@@ -0,0 +1,32 @@
+import * as Globalize from "../globalize";
+
+declare module "../globalize" {
+	interface CurrencyFormatterOptions extends CommonNumberFormatterOptions {
+		/**
+		* symbol (default), accounting, code or name.
+		*/
+		style?: "symbol" | "accounting" | "code" | "name";
+	}
+
+	interface Shared {
+		/**
+		 * Return a function that formats a currency according to the given options or locale's defaults.
+		 * The returned function is invoked with one argument: the Number value to be formatted.
+		 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
+		 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
+		 * @returns {Function} Return a function that formats a currency
+		 */
+		currencyFormatter(currency: string, options?: CurrencyFormatterOptions): (value: number) => string;
+
+		/**
+		 * Return a currency formatted according to the given options or locale's defaults.
+		 * @param {number} value The value to format.
+		 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
+		 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
+		 * @returns {string} Return a string formatted in the currency according to the value and the options
+		 */
+		formatCurrency(value: number, currency: string, options?: CurrencyFormatterOptions): string;
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/date.d.ts b/types/globalize/dist/globalize/date.d.ts
new file mode 100644
index 0000000000..f4465a3761
--- /dev/null
+++ b/types/globalize/dist/globalize/date.d.ts
@@ -0,0 +1,67 @@
+import * as Globalize from "./number";
+
+declare module "../globalize" {
+	interface DateFormatterOptions {
+		/**
+		 * String value indicating a skeleton (see description above), eg. { skeleton: "GyMMMd" }.
+		 * Skeleton provides a more flexible formatting mechanism than the predefined list full, long, medium, or short represented by date, time, or datetime.
+		 * Instead, they are an open-ended list of patterns containing only date field information, and in a canonical order.
+		 */
+		skeleton?: string;
+		/**
+		 * One of the following String values: full, long, medium, or short, eg. { date: "full" }.
+		 */
+		date?: "full" | "long" | "medium" | "short";
+		/**
+		 * One of the following String values: full, long, medium, or short, eg. { time: "full" }.
+		 */
+		time?: "full" | "long" | "medium" | "short";
+		/**
+		 * One of the following String values: full, long, medium, or short, eg. { datetime: "full" }
+		 */
+		datetime?: "full" | "long" | "medium" | "short";
+		/**
+		 * String value indicating a machine raw pattern (anything in the "Sym." column) eg. { raw: "dd/mm" }.
+		 * Note this is NOT recommended for i18n in general. Use skeleton instead.
+		 */
+		raw?: string;
+
+		/**
+		 * String based on the time zone names of the IANA time zone database,
+		 * such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
+		 */
+		timeZone?: string;
+	}
+	interface Static {
+		/**
+		 * Globalize.loadTimeZone ( ianaTzData, ... )
+		 * This method allows you to load IANA time zone data to enable options.timeZone feature on date formatters and parsers.
+		 * @param {Object} ianaTzData A JSON object with zdumped IANA timezone data. Get the data via https://github.com/rxaviers/iana-tz-data
+		 */
+		loadTimeZone(ianaTzData: Object): void;
+	}
+
+	interface Shared {
+		/**
+		 * .dateFormatter( options )
+		 * @param {DateFormatterOptions} options see date/expand_pattern for more info.
+		 * @returns {Function} Return a function that formats a date according to the given `options` and the default/instance locale.
+		 */
+		dateFormatter(options?: DateFormatterOptions): (value: Date) => string;
+
+		//Return a function that parses a string representing a date into a JavaScript Date object according to the given options. The default parsing assumes numeric year, month, and day (i.e., { skeleton: "yMd" }).
+		dateParser(options?: DateFormatterOptions): (value: string) => Date;
+
+		//Alias for .dateFormatter( [options] )( value ).
+		formatDate(value: Date, options?: DateFormatterOptions): string;
+		/**
+		 * Alias for .dateParser( [options] )( value ).
+		 * @param {string} value The object whose module id you wish to determine.
+		 * @param {DateFormatterOptions} options The object whose module id you wish to determine.
+		 * @returns {Date} Return the value as a Date.
+		 */
+		parseDate(value: string, options?: DateFormatterOptions): Date;
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/message.d.ts b/types/globalize/dist/globalize/message.d.ts
new file mode 100644
index 0000000000..7e9004be6f
--- /dev/null
+++ b/types/globalize/dist/globalize/message.d.ts
@@ -0,0 +1,29 @@
+import * as Globalize from "../globalize";
+
+declare module "../globalize" {
+	interface Static {
+		/**
+		 * Load messages data.
+		 * @param {Object} json JSON object of messages data. Keys can use any character, except /, { and }. Values (i.e., the message content itself) can contain any character.
+		 * @returns {void}
+		 */
+		loadMessages(json: Object): void;
+	}
+	interface Shared {
+		/**
+		 * Return a function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
+		 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
+		 * @returns {Function} Return A function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
+		 */
+		messageFormatter(path: string | string[]): (variables?: string | string[] | Object) => string;
+		/**
+		 * Formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string
+		 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
+		 * @param variables Variables can be Objects, where each property can be referenced by name inside a message; or Arrays, where each entry of the Array can be used inside a message, using numeric indices. When passing one or more arguments of other types, they're converted to an Array and used as such.
+		 * @returns {string} Return a user-readable string.
+		 */
+		formatMessage(path: string | string[], variables?: string | string[] | Object): string
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/number.d.ts b/types/globalize/dist/globalize/number.d.ts
new file mode 100644
index 0000000000..99b1659164
--- /dev/null
+++ b/types/globalize/dist/globalize/number.d.ts
@@ -0,0 +1,56 @@
+import * as Globalize from "../globalize";
+
+declare module "../globalize" {
+	interface NumberFormatterOptions extends CommonNumberFormatterOptions, NumberParserOptions { }
+	interface NumberParserOptions {
+		/**
+		 * decimal (default), or percent.
+		 */
+		style?: "decimal" | "percent";
+	}
+	interface Shared {
+		/**
+		 * Return a function that formats a number according to the given options or locale's defaults.
+		 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+		 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 * round Optional String with rounding method ceil, floor, round (default), or truncate.
+		 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
+		 * @returns {Function} Return a function that formats a number according to the given options.
+		 */
+		numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
+		/**
+		 * Return a function that parses a string representing a number according to the given options or locale's defaults.
+		 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * @returns {Function} Return a function that parses a String representing a number according to the given options. If value is invalid, NaN is returned.
+		 */
+		numberParser(options?: NumberParserOptions): (value: string) => number
+		/**
+		 * Return a number formatted according to the given options or locale's defaults.
+		 * @param {number} value The number to format
+		 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
+		 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
+		 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
+		 * round Optional String with rounding method ceil, floor, round (default), or truncate.
+		 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
+		 * @returns {string} Return the number formatted
+		 */
+		formatNumber(value: number, options?: NumberFormatterOptions): string;
+
+		/**
+		 * A function that parses a string representing a number according to the given options or locale's defaults.
+		 * @param {string} value The number as string to parse
+		 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
+		 * style Optional String decimal (default), or percent.
+		 * @returns {number} Return a number according to the given options. If value is invalid, NaN is returned.
+		 */
+		parseNumber(value: string, options?: NumberParserOptions): number;
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/plural.d.ts b/types/globalize/dist/globalize/plural.d.ts
new file mode 100644
index 0000000000..5899afbba9
--- /dev/null
+++ b/types/globalize/dist/globalize/plural.d.ts
@@ -0,0 +1,31 @@
+import * as Globalize from "../globalize";
+
+declare module "../globalize" {
+	interface PluralGeneratorOptions {
+		/**
+		 * cardinal (default), or ordinal.
+		 */
+		type?: "cardinal" | "ordinal";
+	}
+	interface Shared {
+		/**
+		 * Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 * The returned function is invoked with one argument: the Number value for which to return the plural group.
+		 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
+		 * type Optional String cardinal (default), or ordinal.
+		 * @returns {Function} Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 */
+		pluralGenerator(options?: PluralGeneratorOptions): (value: number) => string;
+
+		/**
+		 * Returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 * @param {number} value A Number for which to return the plural group.
+		 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
+		 * type Optional String cardinal (default), or ordinal.
+		 * @returns {string} Returns the value's corresponding plural group: zero, one, two, few, many, or other.
+		 */
+		plural(value: number, options?: PluralGeneratorOptions): string;
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/relative-time.d.ts b/types/globalize/dist/globalize/relative-time.d.ts
new file mode 100644
index 0000000000..759dc990d4
--- /dev/null
+++ b/types/globalize/dist/globalize/relative-time.d.ts
@@ -0,0 +1,33 @@
+import * as Globalize from "../globalize";
+import "./number";
+import "./plural";
+
+declare module "../globalize" {
+	interface RelativeTimeFormatterOptions {
+		/**
+		 * eg. "short" or "narrow". Or falsy for default long form
+		 */
+		form?: "short" | "narrow";
+	}
+	interface Shared {
+		/**
+		 * Returns a function that formats a relative time according to the given unit, options, and the default/instance locale.
+		 * The returned function is invoked with one argument: the number value to be formatted.
+		 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
+		 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
+		 * @returns {Function} Returns a function that formats a relative time according to the given unit.
+		 */
+		relativeTimeFormatter(unit: string, options?: RelativeTimeFormatterOptions): (value: number) => string;
+
+		/**
+		 * Return a relative time according to the given unit
+		 * @param {number} value The number to be formatted.
+		 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
+		 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
+		 * @returns {string} Return a relative time according to the given unit.
+		 */
+		formatRelativeTime(value: number, unit: string, options?: RelativeTimeFormatterOptions): string;
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/dist/globalize/unit.d.ts b/types/globalize/dist/globalize/unit.d.ts
new file mode 100644
index 0000000000..736f086369
--- /dev/null
+++ b/types/globalize/dist/globalize/unit.d.ts
@@ -0,0 +1,39 @@
+import * as Globalize from "../globalize";
+import "./number";
+import "./plural";
+
+declare module "../globalize" {
+	interface UnitFormatterOptions {
+		/**
+		 * form: [String] eg. "long", "short" or "narrow".
+		 */
+		form?: "long" | "short" | "narrow";
+
+		/**
+		 * numberFormatter: [Function] a number formatter function. Defaults to Globalize .numberFormatter() for the current locale using the default options.
+		 */
+		numberFormatter?: NumberFormatterOptions;
+	}
+
+	interface Shared {
+		/**
+		 * Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
+		 * The returned function is invoked with one argument: the number value to be formatted.
+		 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
+		 * @param options form: [String] eg. "long", "short" or "narrow".
+		 * @returns {Function} Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
+		 */
+		unitFormatter(unit: string, options?: UnitFormatterOptions): (value: number) => string;
+
+		/**
+		 * Alias for .unitFormatter( unit, options )( value ).
+		 * @param {number} value The number to be formatted.
+		 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
+		 * @param {UnitFormatterOptions} options form: [String] eg. "long", "short" or "narrow".
+		 * @returns {string} Returns the unit formatted.
+		 */
+		formatUnit(value: number, unit: string, options?: UnitFormatterOptions): string
+	}
+}
+
+export = Globalize;
diff --git a/types/globalize/globalize-tests.ts b/types/globalize/globalize-tests.ts
index 1c4abbec41..cb431cba9f 100644
--- a/types/globalize/globalize-tests.ts
+++ b/types/globalize/globalize-tests.ts
@@ -1,135 +1,111 @@
+let en = new Globalize("en");
+en = new Globalize(new Cldr("en"));
 
+Globalize( "de-Latn-CH" ).cldr.main( "test-bundle" )
+Globalize( new Cldr("de-Latn-CH") ).cldr.main( "test-bundle" )
 
-/*Globalize.culture("fr");
-console.log(Globalize.culture().name);
+let locale = Globalize.locale();
+locale = Globalize.locale("en");
+locale = Globalize.locale(new Cldr("en"));
 
-Globalize.culture("fr-FR");
-console.log(Globalize.culture().name);
+let strOutput: string;
 
-Globalize.culture(["es-MX", "fr-FR"]);
-console.log(Globalize.culture().name);
+let currencyFormatter = en.currencyFormatter("USD", { style: "symbol" });
+strOutput = currencyFormatter(20);
 
-Globalize.culture("fr;q=0.4, es;q=0.5, he");
+currencyFormatter = Globalize.currencyFormatter("USD");
+strOutput = currencyFormatter(20);
 
-Globalize.format(1234.567, "n");
-Globalize.format(1234.567, "n1");
-Globalize.format(1234.567, "n0");
+strOutput = en.formatCurrency(20, "USD", { style: "code" });
+strOutput = Globalize.formatCurrency(20, "USD");
 
-Globalize.format(new Date(1955, 10, 5), "yyyy/MM/dd");
-Globalize.format(new Date(1955, 10, 5), "dddd MMMM d, yyyy");
+Globalize.loadTimeZone({});
 
-Globalize.addCultureInfo("fr", { messages: { "translate": "traduire" } });
-console.log(Globalize.localize("translate", "fr"));
+let dateOutput: Date;
 
-Globalize.parseInt("1,234.56"); 
-Globalize.parseInt("1.234,56", 10);
-Globalize.parseInt("1.234,56", 10, "de");
-Globalize.parseFloat("1,234.56"); 
-Globalize.parseFloat("1.234,56", 10);
-Globalize.parseFloat("1.234,56", 10, "de");
-Globalize.parseDate("1/2/2003");
-Globalize.parseDate("15 Jun 2012", "dd MMM yyyy");
-Globalize.parseDate("15 Jun 2012", ["dd MMM yyyy"]);
-Globalize.culture("fr");
-Globalize.parseDate("1/2/2003"); 
+let dateFormatter = en.dateFormatter({
+	skeleton: "",
+	date: "full",
+	time: "full",
+	datetime: "full",
+	raw: "",
+	timeZone: ""
+});
+strOutput = dateFormatter(new Date());
 
-Globalize.addCultureInfo({ numberFormat: { billionZeroes: 12 } });
-Globalize.addCultureInfo("fr", { numberFormat: { billionZeroes: 12 } });
-Globalize.addCultureInfo("de-DE", "de", { numberFormat: { billionZeroes: 12 } });
+dateFormatter = Globalize.dateFormatter({});
+strOutput = dateFormatter(new Date());
 
-//Globalize.culture().calendar = Globalize.culture().calendars.SomeOtherCalendar;
-//Globalize.culture().calendar = Globalize.culture().calendars.standard;
+let dateParser = en.dateParser({
+	skeleton: "",
+	date: "full",
+	time: "full",
+	datetime: "full",
+	raw: "",
+	timeZone: ""
+});
+dateOutput = dateParser("");
 
-Globalize.format(123.45, "n"); 
-Globalize.format(123.45, "n0");
-Globalize.format(123.45, "n1");
+dateParser = Globalize.dateParser({});
+dateOutput = dateParser("");
 
-Globalize.format(123.45, "d");
-Globalize.format(12, "d3"); 
+strOutput = en.formatDate(new Date(), {});
+strOutput = Globalize.formatDate(new Date(), {});
+dateOutput = en.parseDate("", {});
+dateOutput = Globalize.parseDate("", {});
 
-Globalize.format(123.45, "c"); 
-Globalize.format(123.45, "c0");
-Globalize.format(123.45, "c1");
-Globalize.format(-123.45, "c");
+Globalize.loadMessages({});
 
-Globalize.format(0.12345, "p"); 
-Globalize.format(0.12345, "p0");
-Globalize.format(0.12345, "p4");
+let messageFormatter = en.messageFormatter("foo.bar");
+strOutput = messageFormatter("blah");
 
-Globalize.format(1234.56, "c");
-Globalize.culture("en-US").numberFormat.currency.symbol = '\u20ac';
+messageFormatter = Globalize.messageFormatter(["foo.bar", "baz.blah"]);
+strOutput = messageFormatter(["ham", "spam"]);
 
-var currSym;
-Globalize.culture().numberFormat.currency.symbol = currSym;
+strOutput = en.formatMessage(["foo.bar", "baz.blah"], {});
+strOutput = Globalize.formatMessage("ham.spam");
 
-Globalize.format(new Date(2012, 1, 20), 'd');
-Globalize.format(new Date(2012, 1, 20), 'D');
+let numberFormatter = en.numberFormatter();
+strOutput = numberFormatter(20);
 
+numberFormatter = Globalize.numberFormatter({ style: "decimal" });
+strOutput = numberFormatter(20.2);
 
-Globalize.load[ "default" ] = {
-    name: "English",
-    englishName: "English",
-    nativeName: "English",
-    isRTL: false,
-    language: "en",
-    numberFormat: {
-        pattern: [ "-n" ],
-        decimals: 2,
-        ",": ",",
-        ".": ".",
-        groupSizes: [ 3 ],
-        "+": "+",
-        "-": "-",
-        percent: {
-            pattern: [ "-n %", "n %" ],
-            decimals: 2,
-            groupSizes: [ 3 ],
-            ",": ",",
-            ".": ".",
-            symbol: "%"
-        },
-        currency: {
-            pattern: [ "($n)", "$n" ],
-            decimals: 2,
-            groupSizes: [ 3 ],
-            ",": ",",
-            ".": ".",
-            symbol: "$"
-        }
-    },
-    calendars: {
-        standard: {
-            name: "Gregorian_USEnglish",
-            "/": "/",
-            ":": ":",
-            firstDay: 0,
-            days: {
-                names: [ "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday" ],
-                namesAbbr: [ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" ],
-                namesShort: [ "Su", "Mo", "Tu", "We", "Th", "Fr", "Sa" ]
-            },
-            //months: [
-            //  names: [ "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December", "" ],
-            //  namesAbbr: [ "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", "" ]
-            //],
-            AM: [ "AM", "am", "AM" ],
-            PM: [ "PM", "pm", "PM" ],
-            eras: [
-                {"name":"A.D.","start":null,"offset":0}
-            ],
-            twoDigitYearMax: 2029,
-            patterns: {
-                d: "M/d/yyyy",
-                D: "dddd, MMMM dd, yyyy",
-                t: "h:mm tt",
-                T: "h:mm:ss tt",
-                f: "dddd, MMMM dd, yyyy h:mm tt",
-                F: "dddd, MMMM dd, yyyy h:mm:ss tt",
-                M: "MMMM dd",
-                Y: "yyyy MMMM",
-                S: "yyyy\u0027-\u0027MM\u0027-\u0027dd\u0027T\u0027HH\u0027:\u0027mm\u0027:\u0027ss"
-            }
-        }
-    },
-    messages: {}
-}*/
\ No newline at end of file
+let numberParser = en.numberParser();
+let numOutput = numberParser("20");
+
+numberParser = Globalize.numberParser({ style: "percent" });
+numOutput = numberParser("20.4");
+
+strOutput = en.formatNumber(20);
+strOutput = Globalize.formatNumber(20, { style: "decimal" });
+
+numOutput = en.parseNumber("20");
+numOutput = Globalize.parseNumber("20", { style: "percent" });
+
+let pluralGenerator = en.pluralGenerator();
+strOutput = pluralGenerator(20);
+
+pluralGenerator = Globalize.pluralGenerator({ type: "cardinal" });
+strOutput = pluralGenerator(20);
+
+strOutput = en.plural(20);
+strOutput = Globalize.plural(20, { type: "ordinal" });
+
+let relativeTimeFormatter = en.relativeTimeFormatter("week");
+strOutput = relativeTimeFormatter(20);
+
+relativeTimeFormatter = Globalize.relativeTimeFormatter("day", { form: "short" });
+strOutput = relativeTimeFormatter(20);
+
+strOutput = en.formatRelativeTime(20, "day");
+strOutput = Globalize.formatRelativeTime(20, "week");
+
+let unitFormatter = en.unitFormatter("day");
+strOutput = unitFormatter(10);
+
+unitFormatter = Globalize.unitFormatter("week", { form: "narrow" });
+strOutput = unitFormatter(10);
+
+strOutput = en.formatUnit(10, "day");
+strOutput = Globalize.formatUnit(10, "week", { numberFormatter: { style: "decimal" } });
diff --git a/types/globalize/index.d.ts b/types/globalize/index.d.ts
index 0e6b8537fd..8fffce11db 100644
--- a/types/globalize/index.d.ts
+++ b/types/globalize/index.d.ts
@@ -1,345 +1,20 @@
 // Type definitions for Globalize
 // Project: https://github.com/jquery/globalize
-// Definitions by: Grégoire Castre <https://github.com/gcastre>, Aram Taieb <https://github.com/afromogli>
+// Definitions by: Grégoire Castre <https://github.com/gcastre>
+//                 Aram Taieb <https://github.com/afromogli>
+//                 Bryan Forbes <https://github.com/bryanforbes>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as Cldr from "cldrjs";
+import * as Globalize from "./dist/globalize";
+
+import "./dist/globalize/message";
+import "./dist/globalize/number";
+import "./dist/globalize/plural";
+import "./dist/globalize/currency";
+import "./dist/globalize/date";
+import "./dist/globalize/relative-time";
+import "./dist/globalize/unit";
 
-declare var globalize: globalize.Static;
 export as namespace Globalize;
-export = globalize;
-
-declare namespace globalize {
-	interface DateFormatterOptions {
-		/**
-		 * String value indicating a skeleton (see description above), eg. { skeleton: "GyMMMd" }.
-		 * Skeleton provides a more flexible formatting mechanism than the predefined list full, long, medium, or short represented by date, time, or datetime.
-		 * Instead, they are an open-ended list of patterns containing only date field information, and in a canonical order.
-		 */
-		skeleton?: string;
-		/**
-		 * One of the following String values: full, long, medium, or short, eg. { date: "full" }.
-		 */
-		date?: "full" | "long" | "medium" | "short";
-		/**
-		 * One of the following String values: full, long, medium, or short, eg. { time: "full" }.
-		 */
-		time?: "full" | "long" | "medium" | "short";
-		/**
-		 * One of the following String values: full, long, medium, or short, eg. { datetime: "full" }
-		 */
-		datetime?: "full" | "long" | "medium" | "short";
-		/**
-		 * String value indicating a machine raw pattern (anything in the "Sym." column) eg. { raw: "dd/mm" }.
-		 * Note this is NOT recommended for i18n in general. Use skeleton instead.
-		 */
-		raw?: string;
-
-		/**
-		 * String based on the time zone names of the IANA time zone database,
-		 * such as "Asia/Shanghai", "Asia/Kolkata", "America/New_York".
-		 */
-		timeZone?: string;
-	}
-
-	interface CommonNumberFormatterOptions {
-		/**
-		 * Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
-		 */
-		minimumIntegerDigits?: number;
-		/**
-		 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
-		 * Numbers will be rounded or padded with trailing zeroes if necessary.
-		 * Either one or both of these properties must be present.
-		 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-		 */
-		minimumFractionDigits?: number;
-		/**
-		 * Non-negative integer Number values indicating the minimum and maximum fraction digits to be used.
-		 * Numbers will be rounded or padded with trailing zeroes if necessary.
-		 * Either one or both of these properties must be present.
-		 * If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-		 */
-		maximumFractionDigits?: number;
-		/**
-		 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
-		 * Either none or both of these properties are present
-		 * If they are, they override minimum and maximum integer and fraction digits.
-		 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-		 */
-		minimumSignificantDigits?: number;
-		/**
-		 * Positive integer Number values indicating the minimum and maximum fraction digits to be shown.
-		 * Either none or both of these properties are present.
-		 * If they are, they override minimum and maximum integer and fraction digits.
-		 * The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-		 */
-		maximumSignificantDigits?: number;
-		/**
-		 * String with rounding method ceil, floor, round (default), or truncate.
-		 */
-		round?: "ceil" | "floor" | "round" | "truncate";
-		/**
-		 * Boolean (default is true) value indicating whether a grouping separator should be used.
-		 */
-		useGrouping?: boolean;
-	}
-
-	interface NumberFormatterOptions extends CommonNumberFormatterOptions {
-		/**
-		 * decimal (default), or percent
-		 */
-		style?: "decimal" | "percent";
-	}
-
-	interface CurrencyFormatterOptions extends CommonNumberFormatterOptions {
-		/**
-		 * symbol (default), accounting, code or name.
-		 */
-		style?: "symbol" | "accounting" | "code" | "name";
-	}
-
-	interface NumberParserOptions {
-		/**
-		 * decimal (default), or percent.
-		 */
-		style?: "decimal" | "percent";
-	}
-
-	interface PluralGeneratorOptions {
-		/**
-		 * cardinal (default), or ordinal.
-		 */
-		type?: "cardinal" | "ordinal";
-	}
-
-	interface RelativeTimeFormatterOptions {
-		/**
-		 * eg. "short" or "narrow". Or falsy for default long form
-		 */
-		form?: "short" | "narrow";
-	}
-
-	interface UnitFormatterOptions {
-		/**
-		 * form: [String] eg. "long", "short" or "narrow".
-		 */
-		form?: "long" | "short" | "narrow";
-
-		/**
-		 * numberFormatter: [Function] a number formatter function. Defaults to Globalize .numberFormatter() for the current locale using the default options.
-		 */
-		numberFormatter?: NumberFormatterOptions;
-	}
-
-	interface Static {
-		cldr: Cldr.CldrStatic;
-
-		/**
-		 * Globalize.loadTimeZone ( ianaTzData, ... )
-		 * This method allows you to load IANA time zone data to enable options.timeZone feature on date formatters and parsers.
-		 * @param {Object} ianaTzData A JSON object with zdumped IANA timezone data. Get the data via https://github.com/rxaviers/iana-tz-data
-		 */
-		loadTimeZone(ianaTzData: Object): void;
-
-		/**
-		 * Globalize.load( json, ... )
-		 * @param {Object} [JSON]
-		 * Load resolved or unresolved cldr data.
-		 * Somewhat equivalent to previous Globalize.addCultureInfo(...).
-		 */
-		load(json: Object): void;
-
-		/**
-		 * Globalize.locale()
-		 * Return the default Cldr instance.
-		 */
-		locale(): Cldr.CldrStatic;
-
-		/**
-		 * Globalize.locale( [locale] )
-		 * @param {string} locale
-		 * Set default Cldr instance
-		 * Return the default Cldr instance.
-		 */
-
-		locale(locale: string): Cldr.CldrStatic;
-		/**
-		 * Globalize.locale( cldr )
-		 * @param {Cldr} cldr [Cldr instance]
-		 * Set default Cldr instance
-		 * Return the default Cldr instance.
-		 */
-		locale(cldr: Cldr.CldrStatic): Cldr.CldrStatic;
-
-		/**
-		 * .dateFormatter( options )
-		 * @param {DateFormatterOptions} options see date/expand_pattern for more info.
-		 * @returns {Function} Return a function that formats a date according to the given `options` and the default/instance locale.
-		 */
-		dateFormatter(options?: DateFormatterOptions): (value: Date) => string;
-
-		//Return a function that parses a string representing a date into a JavaScript Date object according to the given options. The default parsing assumes numeric year, month, and day (i.e., { skeleton: "yMd" }).
-		dateParser(options?: DateFormatterOptions): (value: string) => Date;
-
-		//Alias for .dateFormatter( [options] )( value ).
-		formatDate(value: Date, options?: DateFormatterOptions): string;
-		/**
-		 * Alias for .dateParser( [options] )( value ).
-		 * @param {string} value The object whose module id you wish to determine.
-		 * @param {DateFormatterOptions} options The object whose module id you wish to determine.
-		 * @returns {Date} Return the value as a Date.
-		 */
-		parseDate(value: string, options?: DateFormatterOptions): Date;
-
-		/**
-		 * Load messages data.
-		 * @param {Object} json JSON object of messages data. Keys can use any character, except /, { and }. Values (i.e., the message content itself) can contain any character.
-		 * @returns {void}
-		 */
-		loadMessages(json: Object): void;
-		/**
-		 * Return a function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
-		 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
-		 * @returns {Function} Return A function that formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string. It supports pluralization and gender inflections.
-		 */
-		messageFormatter(path: string | string[]): (variables?: string | string[] | Object) => string;
-
-		/**
-		 * Formats a message (using ICU message format pattern) given its path and a set of variables into a user-readable string
-		 * @param path String or Array containing the path of the message content, eg. "greetings/bye", or [ "greetings", "bye" ].
-		 * @param variables Variables can be Objects, where each property can be referenced by name inside a message; or Arrays, where each entry of the Array can be used inside a message, using numeric indices. When passing one or more arguments of other types, they're converted to an Array and used as such.
-		 * @returns {string} Return a user-readable string.
-		 */
-		formatMessage(path: string | string[], variables?: string | string[] | Object): string
-
-		/**
-		 * Return a function that formats a number according to the given options or locale's defaults.
-		 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
-		 * style Optional String decimal (default), or percent.
-		 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
-		 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-		 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-		 * round Optional String with rounding method ceil, floor, round (default), or truncate.
-		 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
-		 * @returns {Function} Return a function that formats a number according to the given options.
-		 */
-		numberFormatter(options?: NumberFormatterOptions): (value: number) => string;
-
-		/**
-		 * Return a function that parses a string representing a number according to the given options or locale's defaults.
-		 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
-		 * style Optional String decimal (default), or percent.
-		 * @returns {Function} Return a function that parses a String representing a number according to the given options. If value is invalid, NaN is returned.
-		 */
-		numberParser(options?: NumberParserOptions): (value: string) => number
-
-		/**
-		 * Return a number formatted according to the given options or locale's defaults.
-		 * @param {number} value The number to format
-		 * @param {NumberFormatterOptions} options A JSON object including none or any of the following options.
-		 * style Optional String decimal (default), or percent.
-		 * minimumIntegerDigits Optional Non-negative integer Number value indicating the minimum integer digits to be used. Numbers will be padded with leading zeroes if necessary.
-		 * minimumFractionDigits and maximumFractionDigits Optional Non-negative integer Number values indicating the minimum and maximum fraction digits to be used. Numbers will be rounded or padded with trailing zeroes if necessary. Either one or both of these properties must be present. If they are, they will override minimum and maximum fraction digits derived from the CLDR patterns.
-		 * minimumSignificantDigits and maximumSignificantDigits Optional Positive integer Number values indicating the minimum and maximum fraction digits to be shown. Either none or both of these properties are present. If they are, they override minimum and maximum integer and fraction digits. The formatter uses however many integer and fraction digits are required to display the specified number of significant digits.
-		 * round Optional String with rounding method ceil, floor, round (default), or truncate.
-		 * useGrouping Optional Boolean (default is true) value indicating whether a grouping separator should be used.
-		 * @returns {string} Return the number formatted
-		 */
-		formatNumber(value: number, options?: NumberFormatterOptions): string;
-
-		/**
-		 * A function that parses a string representing a number according to the given options or locale's defaults.
-		 * @param {string} value The number as string to parse
-		 * @param {NumberParserOptions} options A JSON object including none or any of the following options.
-		 * style Optional String decimal (default), or percent.
-		 * @returns {number} Return a number according to the given options. If value is invalid, NaN is returned.
-		 */
-		parseNumber(value: string, options?: NumberParserOptions): number;
-
-		/**
-		 * Return a function that formats a currency according to the given options or locale's defaults.
-		 * The returned function is invoked with one argument: the Number value to be formatted.
-		 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
-		 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
-		 * @returns {Function} Return a function that formats a currency
-		 */
-		currencyFormatter(currency: string, options?: CurrencyFormatterOptions): (value: number) => string;
-
-		/**
-		 * Return a currency formatted according to the given options or locale's defaults.
-		 * @param {number} value The value to format.
-		 * @param {string} currency 3-letter currency code as defined by ISO 4217, eg. USD.
-		 * @param {CurrencyFormatterOptions} options A JSON object including none or any of the following options.
-		 * @returns {string} Return a string formatted in the currency according to the value and the options
-		 */
-		formatCurrency(value: number, currency: string, options?: CurrencyFormatterOptions): string;
-
-		/**
-		 * Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
-		 * The returned function is invoked with one argument: the Number value for which to return the plural group.
-		 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
-		 * type Optional String cardinal (default), or ordinal.
-		 * @returns {Function} Return a function that returns the value's corresponding plural group: zero, one, two, few, many, or other.
-		 */
-		pluralGenerator(options?: PluralGeneratorOptions): (value: number) => string;
-
-		/**
-		 * Returns the value's corresponding plural group: zero, one, two, few, many, or other.
-		 * @param {number} value A Number for which to return the plural group.
-		 * @param {PluralGeneratorOptions} options A JSON object including none or any of the following options.
-		 * type Optional String cardinal (default), or ordinal.
-		 * @returns {string} Returns the value's corresponding plural group: zero, one, two, few, many, or other.
-		 */
-		plural(value: number, options?: PluralGeneratorOptions): string;
-
-		/**
-		 * Returns a function that formats a relative time according to the given unit, options, and the default/instance locale.
-		 * The returned function is invoked with one argument: the number value to be formatted.
-		 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
-		 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
-		 * @returns {Function} Returns a function that formats a relative time according to the given unit.
-		 */
-		relativeTimeFormatter(unit: string, options?: RelativeTimeFormatterOptions): (value: number) => string;
-
-		/**
-		 * Return a relative time according to the given unit
-		 * @param {number} value The number to be formatted.
-		 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc.
-		 * @param options form: [String] eg. "short" or "narrow". Or falsy for default long form.
-		 * @returns {string} Return a relative time according to the given unit.
-		 */
-		formatRelativeTime(value: number, unit: string, options?: RelativeTimeFormatterOptions): string;
-
-		/**
-		 * Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
-		 * The returned function is invoked with one argument: the number value to be formatted.
-		 * @param unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
-		 * @param options form: [String] eg. "long", "short" or "narrow".
-		 * @returns {Function} Returns a function that formats a unit according to the given unit, options, and the default/instance locale.
-		 */
-		unitFormatter(unit: string, options?: UnitFormatterOptions): (value: number) => string;
-
-		/**
-		 * Alias for .unitFormatter( unit, options )( value ).
-		 * @param {number} value The number to be formatted.
-		 * @param {string} unit String value indicating the unit to be formatted. eg. "day", "week", "month", etc. Could also be a compound unit, eg. "mile-per-hour" or "mile/hour"
-		 * @param {UnitFormatterOptions} options form: [String] eg. "long", "short" or "narrow".
-		 * @returns {string} Returns the unit formatted.
-		 */
-		formatUnit(value: number, unit: string, options?: UnitFormatterOptions): string
-
-		/**
-		 * Create a Globalize instance.
-		 * @param {string} Locale string of the instance.
-		 * @returns {Globalize} A Globalize instance
-		 */
-		new (locale: string): Static;
-		/**
-		 * Create a Globalize instance.
-		 * @param cldr Cldr instance of the instance.
-		 * @returns {Globalize} A Globalize instance
-		 */
-		new (cldr: Cldr.CldrStatic): Static;
-	}
-}
+export = Globalize;
diff --git a/types/globalize/tsconfig.json b/types/globalize/tsconfig.json
index b83bbf7b09..4ef65615a9 100644
--- a/types/globalize/tsconfig.json
+++ b/types/globalize/tsconfig.json
@@ -18,6 +18,14 @@
     },
     "files": [
         "index.d.ts",
+        "dist/globalize.d.ts",
+        "dist/globalize/currency.d.ts",
+        "dist/globalize/date.d.ts",
+        "dist/globalize/message.d.ts",
+        "dist/globalize/number.d.ts",
+        "dist/globalize/plural.d.ts",
+        "dist/globalize/relative-time.d.ts",
+        "dist/globalize/unit.d.ts",
         "globalize-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/globby/globby-tests.ts b/types/globby/globby-tests.ts
index 1c3c1842d4..e1a57adb74 100644
--- a/types/globby/globby-tests.ts
+++ b/types/globby/globby-tests.ts
@@ -1,24 +1,71 @@
 import { IOptions } from 'glob';
 
-import globby = require("globby");
+import globby = require('globby');
 
 (async () => {
     let result: string[];
+
+    /**
+     * Standard `pattern` usage
+     */
     result = await globby('*.tmp');
     result = await globby(['a.tmp', '*.tmp', '!{c,d,e}.tmp']);
 
     result = globby.sync('*.tmp');
     result = globby.sync(['a.tmp', '*.tmp', '!{c,d,e}.tmp']);
 
-    result = await globby('*.tmp', Object.freeze({ignore: Object.freeze([])}));
-    result = globby.sync('*.tmp', Object.freeze({ignore: Object.freeze([])}));
+    /**
+     * `expandDirectories` option
+     */
+    result = await globby('*.tmp', { expandDirectories: false });
+    result = globby.sync('*.tmp', { expandDirectories: false });
+    result = await globby('*.tmp', { expandDirectories: ['a*', 'b*'] });
+    result = globby.sync('*.tmp', { expandDirectories: ['a*', 'b*'] });
+    result = await globby('*.tmp', {
+        expandDirectories: {
+            files: ['a', 'b'],
+            extensions: ['tmp']
+        }
+    });
+    result = globby.sync('*.tmp', {
+        expandDirectories: {
+            files: ['a', 'b'],
+            extensions: ['tmp']
+        }
+    });
+
+    /**
+     * Options passed through from `fast-glob`
+     */
+    result = await globby('*.tmp', { ignore: ['**/b.tmp'] });
+    result = globby.sync('*.tmp', { ignore: ['**/b.tmp'] });
 })();
 
 const tasks: Array<{
-    pattern: string,
-    options: IOptions
-}> = globby.generateGlobTasks(['*.tmp', '!b.tmp'], {ignore: ['c.tmp']});
+    pattern: string;
+    options: IOptions;
+}> = globby.generateGlobTasks(['*.tmp', '!b.tmp'], { ignore: ['c.tmp'] });
 
 console.log(globby.hasMagic('**'));
 console.log(globby.hasMagic(['**', 'path1', 'path2']));
 console.log(!globby.hasMagic(['path1', 'path2']));
+
+(async () => {
+    let result: (path: string) => boolean;
+
+    /**
+     * Standard `gitignore` usage
+     */
+    result = await globby.gitignore();
+    result = globby.gitignore.sync();
+
+    /** With options */
+    result = await globby.gitignore({
+        cwd: __dirname,
+        ignore: ['**/b.tmp']
+    });
+    result = globby.gitignore.sync({
+        cwd: __dirname,
+        ignore: ['**/b.tmp']
+    });
+})();
diff --git a/types/globby/index.d.ts b/types/globby/index.d.ts
index 531888f803..af49813432 100644
--- a/types/globby/index.d.ts
+++ b/types/globby/index.d.ts
@@ -1,37 +1,99 @@
-// Type definitions for globby 6.1
+// Type definitions for globby 8.0
 // Project: https://github.com/sindresorhus/globby#readme
 // Definitions by: Douglas Duteil <https://github.com/douglasduteil>
 //                 Ika <https://github.com/ikatyang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
-import { IOptions } from 'glob';
+import { IOptions as NodeGlobOptions } from 'glob';
+import { Options as FastGlobOptions } from 'fast-glob';
+
+type ExpandDirectoriesOption = boolean | string[] | { files: string[]; extensions: string[] };
+
+interface Options extends FastGlobOptions {
+    /**
+     * If set to `true`, `globby` will automatically glob directories for you.
+     * If you define an `Array` it will only glob files that matches the patterns inside the Array.
+     * You can also define an `Object` with `files` and `extensions` like below:
+     *
+     * ```js
+     * (async () => {
+     *   const paths = await globby('images', {
+     *     expandDirectories: {
+     *       files: ['cat', 'unicorn', '*.jpg'],
+     *       extensions: ['png']
+     *     }
+     *   });
+     *   console.log(paths);
+     *   //=> ['cat.png', 'unicorn.png', 'cow.jpg', 'rainbow.jpg']
+     * })();
+     * ```
+     *
+     * Note that if you set this option to `false`, you won't get back matched directories unless
+     * you set `onlyFiles: false`.
+     */
+    expandDirectories?: ExpandDirectoriesOption;
+    /**
+     * Respect ignore patterns in `.gitignore` files that apply to the globbed files.
+     */
+    gitignore?: boolean;
+}
 
 /**
  * Returns a `Promise<Array>` of matching paths.
  */
-declare function globby(patterns: string | string[], options?: IOptions): Promise<string[]>;
+declare function globby(patterns: string | string[], options?: Options): Promise<string[]>;
 
 declare namespace globby {
     /**
      * Returns an `Array` of matching paths.
      */
-    function sync(patterns: string | string[], options?: IOptions): string[];
+    function sync(patterns: string | string[], options?: Options): string[];
     /**
      * Returns an `Array<Object>` in the format `{ pattern: string, opts: Object }`,
-     * which can be passed as arguments to [node-glob](https://github.com/isaacs/node-glob).
+     * which can be passed as arguments to [`fast-glob`](https://github.com/mrmlnc/fast-glob).
      * This is useful for other globbing-related packages.
      *
      * Note that you should avoid running the same tasks multiple times as they contain a file system cache.
      * Instead, run this method each time to ensure file system changes are taken into consideration.
      */
-    function generateGlobTasks(patterns: string | string[], options?: IOptions): Array<{pattern: string, options: IOptions}>;
+    function generateGlobTasks(patterns: string | string[], options?: Options): Array<{ pattern: string; options: Options }>;
     /**
-     * Returns a `boolean` of whether there are any special glob characters in the patterns.
+     * Returns a boolean of whether there are any special glob characters in the `patterns`.
      *
-     * Note that the options affect the results. If `noext: true` is set, then `+(a|b)` will not be considered a magic pattern.
-     * If the pattern has a brace expansion, like `a/{b/c,x/y}`, then that is considered magical, unless `nobrace: true` is set.
+     * Note that the options affect the results. If `noext: true` is set, then `+(a|b)` will not
+     * be considered a magic pattern. If the pattern has a brace expansion, like `a/{b/c,x/y}`,
+     * then that is considered magical, unless `nobrace: true` is set.
+     *
+     * This function is backed by [`node-glob`](https://github.com/isaacs/node-glob#globhasmagicpattern-options)
      */
-    function hasMagic(patterns: string | string[], options?: IOptions): boolean;
+    function hasMagic(patterns: string | string[], options?: NodeGlobOptions): boolean;
+    /**
+     * Returns a Promise<(path: string) => boolean> indicating whether a given path is ignored
+     * via a `.gitignore` file.
+     *
+     * Takes `cwd?: string` and `ignore?: string[]` as options. `.gitignore` files matched by the
+     * ignore config are not used for the resulting filter function.
+     *
+     * ```js
+     * const {gitignore} = require('globby');
+     *
+     * (async () => {
+     *   const isIgnored = await gitignore();
+     *   console.log(isIgnored('some/file'));
+     * })();
+     * ```
+     */
+    function gitignore(options?: { cwd?: string; ignore?: string[]; }): Promise<(path: string) => boolean>;
+
+    namespace gitignore {
+        /**
+         * Returns a `(path: string) => boolean` indicating whether a given path is ignored via a `.gitignore` file.
+         *
+         * Takes the same options as `globby.gitignore`.
+         */
+        function sync(options?: { cwd?: string; ignore?: string[]; }): (path: string) => boolean;
+    }
 }
 
 export = globby;
diff --git a/types/globby/package.json b/types/globby/package.json
new file mode 100644
index 0000000000..136d4694e9
--- /dev/null
+++ b/types/globby/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "fast-glob": "^2.0.2"
+    }
+}
diff --git a/types/google-apps-script/google-apps-script-tests.ts b/types/google-apps-script/google-apps-script-tests.ts
index 17de10a2fc..a6a3ac8437 100644
--- a/types/google-apps-script/google-apps-script-tests.ts
+++ b/types/google-apps-script/google-apps-script-tests.ts
@@ -1,8 +1,4 @@
-
-
-
 // from https://developers.google.com/apps-script/overview
-
 function createAndSendDocument() {
   // Create a new Google Doc named 'Hello, world!'
   var doc = DocumentApp.create('Hello, world!');
@@ -27,7 +23,16 @@ function createAndSendDocument() {
 }
 
 // Regression
-
 ScriptApp.getService().getUrl();
-
 CalendarApp.GuestStatus.NO;
+
+// test for URLFetchRequestOptions.payload
+import URLFetchRequestOptions = GoogleAppsScript.URL_Fetch.URLFetchRequestOptions;
+const postTest = (payload: Object): string => {
+  const url = 'http://httpbin.org/post';
+  const params: URLFetchRequestOptions = {
+    method: 'post',
+    payload: payload
+  };
+  return UrlFetchApp.fetch(url, params).getContentText();
+};
\ No newline at end of file
diff --git a/types/google-apps-script/google-apps-script.base.d.ts b/types/google-apps-script/google-apps-script.base.d.ts
index 82f92078dd..7558263306 100644
--- a/types/google-apps-script/google-apps-script.base.d.ts
+++ b/types/google-apps-script/google-apps-script.base.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -7,7 +7,7 @@
 
 declare namespace GoogleAppsScript {
   export module Base {
-    /**
+    /** 
      * A data interchange object for Apps Script services.
      */
     export interface Blob {
@@ -42,7 +42,7 @@ declare namespace GoogleAppsScript {
      *
      * DocumentA document, containing rich text and elements such as tables and lists.
      *
-     * EmbeddedChartRepresents a chart that has been embedded into a Spreadsheet.
+     * EmbeddedChartRepresents a chart that has been embedded into a spreadsheet.
      *
      * FileA file in Google Drive.
      *
@@ -52,15 +52,19 @@ declare namespace GoogleAppsScript {
      *
      * HtmlOutputAn HtmlOutput object that can be served from a script.
      *
+     * ImageA PageElement representing an image.
+     *
      * InlineImageAn element representing an embedded image.
      *
      * JdbcBlobA JDBC Blob.
      *
      * JdbcClobA JDBC Clob.
      *
+     * PictureFillA fill that renders an image that's stretched to the dimensions of its container.
+     *
      * PositionedImageFixed position image anchored to a Paragraph.
      *
-     * SpreadsheetThis class allows users to access and modify Google Sheets files.
+     * SpreadsheetAccess and modify Google Sheets files.
      *
      * StaticMapAllows for the creation and decoration of static map images.
      */
@@ -72,7 +76,7 @@ declare namespace GoogleAppsScript {
     /**
      * This class provides access to G Suite specific dialog boxes.
      *
-     *  The methods in this class are only available for use in the context of a Google Spreadsheet.
+     * The methods in this class are only available for use in the context of a Google Spreadsheet.
      * See also
      *
      * ButtonSet
@@ -88,41 +92,38 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enum representing predetermined, localized dialog buttons returned by an
-     *  alert or PromptResponse.getSelectedButton() to
-     *  indicate which button in a dialog the user clicked. These values cannot be set; to add buttons to
-     *  an alert or
-     *  prompt, use ButtonSet instead.
+     * An enum representing predetermined, localized dialog buttons returned by an alert or PromptResponse.getSelectedButton() to indicate
+     * which button in a dialog the user clicked. These values cannot be set; to add buttons to an
+     * alert or prompt, use ButtonSet instead.
      *
-     *      // Display a dialog box with a message and "Yes" and "No" buttons.
-     *      var ui = DocumentApp.getUi();
-     *      var response = ui.alert('Are you sure you want to continue?', ui.ButtonSet.YES_NO);
+     *     // Display a dialog box with a message and "Yes" and "No" buttons.
+     *     var ui = DocumentApp.getUi();
+     *     var response = ui.alert('Are you sure you want to continue?', ui.ButtonSet.YES_NO);
      *
-     *      // Process the user's response.
-     *      if (response == ui.Button.YES) {
-     *        Logger.log('The user clicked "Yes."');
-     *      } else {
-     *        Logger.log('The user clicked "No" or the dialog\'s close button.');
-     *      }
+     *     // Process the user's response.
+     *     if (response == ui.Button.YES) {
+     *       Logger.log('The user clicked "Yes."');
+     *     } else {
+     *       Logger.log('The user clicked "No" or the dialog\'s close button.');
+     *     }
      */
     export enum Button { CLOSE, OK, CANCEL, YES, NO }
 
     /**
      * An enum representing predetermined, localized sets of one or more dialog buttons that can be
-     *  added to an alert or a
-     *  prompt. To determine which button the user
-     *  clicked, use Button.
+     * added to an alert or a prompt. To determine which button the user clicked,
+     * use Button.
      *
-     *      // Display a dialog box with a message and "Yes" and "No" buttons.
-     *      var ui = DocumentApp.getUi();
-     *      var response = ui.alert('Are you sure you want to continue?', ui.ButtonSet.YES_NO);
+     *     // Display a dialog box with a message and "Yes" and "No" buttons.
+     *     var ui = DocumentApp.getUi();
+     *     var response = ui.alert('Are you sure you want to continue?', ui.ButtonSet.YES_NO);
      *
-     *      // Process the user's response.
-     *      if (response == ui.Button.YES) {
-     *        Logger.log('The user clicked "Yes."');
-     *      } else {
-     *        Logger.log('The user clicked "No" or the dialog\'s close button.');
-     *      }
+     *     // Process the user's response.
+     *     if (response == ui.Button.YES) {
+     *       Logger.log('The user clicked "Yes."');
+     *     } else {
+     *       Logger.log('The user clicked "No" or the dialog\'s close button.');
+     *     }
      */
     export enum ButtonSet { OK, OK_CANCEL, YES_NO, YES_NO_CANCEL }
 
@@ -138,21 +139,20 @@ declare namespace GoogleAppsScript {
 
     /**
      * A custom menu in an instance of the user interface for a Google App. A script can only interact
-     *  with the UI for the current instance of an open document or form, and only if the script is
-     *  container-bound to the document or form. For more
-     *  information, see the guide to menus.
+     * with the UI for the current instance of an open document or form, and only if the script is container-bound to the document or form. For more
+     * information, see the guide to menus.
      *
-     *      // Add a custom menu to the active spreadsheet, including a separator and a sub-menu.
-     *      function onOpen(e) {
-     *        SpreadsheetApp.getUi()
-     *            .createMenu('My Menu')
-     *            .addItem('My Menu Item', 'myFunction')
-     *            .addSeparator()
-     *            .addSubMenu(SpreadsheetApp.getUi().createMenu('My Submenu')
-     *                .addItem('One Submenu Item', 'mySecondFunction')
-     *                .addItem('Another Submenu Item', 'myThirdFunction'))
-     *            .addToUi();
-     *      }
+     *     // Add a custom menu to the active spreadsheet, including a separator and a sub-menu.
+     *     function onOpen(e) {
+     *       SpreadsheetApp.getUi()
+     *           .createMenu('My Menu')
+     *           .addItem('My Menu Item', 'myFunction')
+     *           .addSeparator()
+     *           .addSubMenu(SpreadsheetApp.getUi().createMenu('My Submenu')
+     *               .addItem('One Submenu Item', 'mySecondFunction')
+     *               .addItem('Another Submenu Item', 'myThirdFunction'))
+     *           .addToUi();
+     *     }
      */
     export interface Menu {
       addItem(caption: string, functionName: string): Menu;
@@ -163,25 +163,25 @@ declare namespace GoogleAppsScript {
 
     /**
      * An enumeration that provides access to MIME-type declarations without typing the strings
-     *  explicitly. Any method that expects a MIME type rendered as a string (for example,
-     *  'image/png') will also accept one of the values below, so long as the method
-     *  supports the underlying MIME type.
+     * explicitly. Any method that expects a MIME type rendered as a string (for example,
+     * 'image/png') will also accept one of the values below, so long as the method
+     * supports the underlying MIME type.
      *
-     *      // Use MimeType enum to log the name of every Google Doc in the user's Drive.
-     *      var docs = DriveApp.getFilesByType(MimeType.GOOGLE_DOCS);
-     *      while (docs.hasNext()) {
-     *       var doc = docs.next();
-     *       Logger.log(doc.getName())
-     *      }
+     *     // Use MimeType enum to log the name of every Google Doc in the user's Drive.
+     *     var docs = DriveApp.getFilesByType(MimeType.GOOGLE_DOCS);
+     *     while (docs.hasNext()) {
+     *      var doc = docs.next();
+     *      Logger.log(doc.getName())
+     *     }
      *
-     *      // Use plain string to log the size of every PNG in the user's Drive.
-     *      var pngs = DriveApp.getFilesByType('image/png');
-     *      while (pngs.hasNext()) {
-     *       var png = pngs.next();
-     *       Logger.log(png.getSize());
-     *      }
+     *     // Use plain string to log the size of every PNG in the user's Drive.
+     *     var pngs = DriveApp.getFilesByType('image/png');
+     *     while (pngs.hasNext()) {
+     *      var png = pngs.next();
+     *      Logger.log(png.getSize());
+     *     }
      */
-    export enum MimeType { GOOGLE_APPS_SCRIPT, GOOGLE_DRAWINGS, GOOGLE_DOCS, GOOGLE_FORMS, GOOGLE_SHEETS, GOOGLE_SLIDES, FOLDER, BMP, GIF, JPEG, PNG, SVG, PDF, CSS, CSV, HTML, JAVASCRIPT, PLAIN_TEXT, RTF, OPENDOCUMENT_GRAPHICS, OPENDOCUMENT_PRESENTATION, OPENDOCUMENT_SPREADSHEET, OPENDOCUMENT_TEXT, MICROSOFT_EXCEL, MICROSOFT_EXCEL_LEGACY, MICROSOFT_POWERPOINT, MICROSOFT_POWERPOINT_LEGACY, MICROSOFT_WORD, MICROSOFT_WORD_LEGACY, ZIP }
+    export enum MimeType { GOOGLE_APPS_SCRIPT, GOOGLE_DRAWINGS, GOOGLE_DOCS, GOOGLE_FORMS, GOOGLE_SHEETS, GOOGLE_SITES, GOOGLE_SLIDES, FOLDER, BMP, GIF, JPEG, PNG, SVG, PDF, CSS, CSV, HTML, JAVASCRIPT, PLAIN_TEXT, RTF, OPENDOCUMENT_GRAPHICS, OPENDOCUMENT_PRESENTATION, OPENDOCUMENT_SPREADSHEET, OPENDOCUMENT_TEXT, MICROSOFT_EXCEL, MICROSOFT_EXCEL_LEGACY, MICROSOFT_POWERPOINT, MICROSOFT_POWERPOINT_LEGACY, MICROSOFT_WORD, MICROSOFT_WORD_LEGACY, ZIP }
 
     /**
      * An enum representing the months of the year.
@@ -190,22 +190,22 @@ declare namespace GoogleAppsScript {
 
     /**
      * A response to a prompt dialog displayed in the
-     *  user-interface environment for a Google App. The response contains any text the user entered in
-     *  the dialog's input field and indicates which button the user clicked to dismiss the dialog.
+     * user-interface environment for a Google App. The response contains any text the user entered in
+     * the dialog's input field and indicates which button the user clicked to dismiss the dialog.
      *
-     *      // Display a dialog box with a title, message, input field, and "Yes" and "No" buttons. The
-     *      // user can also close the dialog by clicking the close button in its title bar.
-     *      var ui = DocumentApp.getUi();
-     *      var response = ui.prompt('Getting to know you', 'May I know your name?', ui.ButtonSet.YES_NO);
+     *     // Display a dialog box with a title, message, input field, and "Yes" and "No" buttons. The
+     *     // user can also close the dialog by clicking the close button in its title bar.
+     *     var ui = DocumentApp.getUi();
+     *     var response = ui.prompt('Getting to know you', 'May I know your name?', ui.ButtonSet.YES_NO);
      *
-     *      // Process the user's response.
-     *      if (response.getSelectedButton() == ui.Button.YES) {
-     *        Logger.log('The user\'s name is %s.', response.getResponseText());
-     *      } else if (response.getSelectedButton() == ui.Button.NO) {
-     *        Logger.log('The user didn\'t want to provide a name.');
-     *      } else {
-     *        Logger.log('The user clicked the close button in the dialog\'s title bar.');
-     *      }
+     *     // Process the user's response.
+     *     if (response.getSelectedButton() == ui.Button.YES) {
+     *       Logger.log('The user\'s name is %s.', response.getResponseText());
+     *     } else if (response.getSelectedButton() == ui.Button.NO) {
+     *       Logger.log('The user didn\'t want to provide a name.');
+     *     } else {
+     *       Logger.log('The user clicked the close button in the dialog\'s title bar.');
+     *     }
      */
     export interface PromptResponse {
       getResponseText(): string;
@@ -214,7 +214,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * The Session class provides access to session information, such as the user's email address (in
-     *  some circumstances) and language setting.
+     * some circumstances) and language setting.
      */
     export interface Session {
       getActiveUser(): User;
@@ -228,23 +228,22 @@ declare namespace GoogleAppsScript {
 
     /**
      * An instance of the user-interface environment for a Google App that allows the script to add
-     *  features like menus, dialogs, and sidebars. A script can only interact with the UI for the
-     *  current instance of an open editor, and only if the script is
-     *  container-bound to the editor.
+     * features like menus, dialogs, and sidebars. A script can only interact with the UI for the
+     * current instance of an open editor, and only if the script is container-bound to the editor.
      *
-     *      // Display a dialog box with a title, message, input field, and "Yes" and "No" buttons. The
-     *      // user can also close the dialog by clicking the close button in its title bar.
-     *      var ui = SpreadsheetApp.getUi();
-     *      var response = ui.prompt('Getting to know you', 'May I know your name?', ui.ButtonSet.YES_NO);
+     *     // Display a dialog box with a title, message, input field, and "Yes" and "No" buttons. The
+     *     // user can also close the dialog by clicking the close button in its title bar.
+     *     var ui = SpreadsheetApp.getUi();
+     *     var response = ui.prompt('Getting to know you', 'May I know your name?', ui.ButtonSet.YES_NO);
      *
-     *      // Process the user's response.
-     *      if (response.getSelectedButton() == ui.Button.YES) {
-     *        Logger.log('The user\'s name is %s.', response.getResponseText());
-     *      } else if (response.getSelectedButton() == ui.Button.NO) {
-     *        Logger.log('The user didn\'t want to provide a name.');
-     *      } else {
-     *        Logger.log('The user clicked the close button in the dialog\'s title bar.');
-     *      }
+     *     // Process the user's response.
+     *     if (response.getSelectedButton() == ui.Button.YES) {
+     *       Logger.log('The user\'s name is %s.', response.getResponseText());
+     *     } else if (response.getSelectedButton() == ui.Button.NO) {
+     *       Logger.log('The user didn\'t want to provide a name.');
+     *     } else {
+     *       Logger.log('The user clicked the close button in the dialog\'s title bar.');
+     *     }
      */
     export interface Ui {
       Button: typeof Button;
@@ -276,6 +275,44 @@ declare namespace GoogleAppsScript {
      */
     export enum Weekday { SUNDAY, MONDAY, TUESDAY, WEDNESDAY, THURSDAY, FRIDAY, SATURDAY }
 
+    /**
+     * This class allows the developer to write logs to the Google Cloud Platform's Stackdriver Logging service. The following
+     * shows some logging examples:
+     *
+     *     function measuringExecutionTime() {
+     *       // A simple INFO log message, using sprintf() formatting.
+     *       console.info('Timing the %s function (%d arguments)', 'myFunction', 1);
+     *
+     *       // Log a JSON object at a DEBUG level. The log is labeled
+     *       // with the message string in the log viewer, and the JSON content
+     *       // is displayed in the expanded log structure under "structPayload".
+     *       var parameters = {
+     *         isValid: true,
+     *         content: 'some string',
+     *         timestamp: new Date()
+     *       };
+     *       console.log({message: 'Function Input', initialData: parameters});
+     *
+     *       var label = 'myFunction() time';  // Labels the timing log entry.
+     *       console.time(label);              // Starts the timer.
+     *       try {
+     *         myFunction(parameters);         // Function to time.
+     *       } catch (e) {
+     *         // Logs an ERROR message.
+     *         console.error('myFunction() yielded an error: ' + e);
+     *       }
+     *       console.timeEnd(label);      // Stops the timer, logs execution duration.
+     *     }
+     */
+    export interface console {
+      error(formatOrObject: Object, ...values: Object[]): void;
+      info(formatOrObject: Object, ...values: Object[]): void;
+      log(formatOrObject: Object, ...values: Object[]): void;
+      time(label: string): void;
+      timeEnd(label: string): void;
+      warn(formatOrObject: Object, ...values: Object[]): void;
+    }
+
   }
 }
 
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 23a9b19c34..7056dc0b08 100644
--- a/types/google-apps-script/google-apps-script.cache.d.ts
+++ b/types/google-apps-script/google-apps-script.cache.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,22 +10,22 @@ declare namespace GoogleAppsScript {
     /**
      * A reference to a particular cache.
      *
-     *  This class allows you to insert, retrieve, and remove items from a cache. This can be
-     *  particularly useful when you want frequent access to an expensive or slow resource. For
-     *  example, say you have an RSS feed at example.com that takes 20 seconds to fetch, but you want
-     *  to speed up access on an average request.
+     * This class allows you to insert, retrieve, and remove items from a cache. This can be
+     * particularly useful when you want frequent access to an expensive or slow resource. For example,
+     * say you have an RSS feed at example.com that takes 20 seconds to fetch, but you want to speed up
+     * access on an average request.
      *
-     *      function getRssFeed() {
-     *        var cache = CacheService.getScriptCache();
-     *        var cached = cache.get("rss-feed-contents");
-     *        if (cached != null) {
-     *          return cached;
-     *        }
-     *        var result = UrlFetchApp.fetch("http://example.com/my-slow-rss-feed.xml"); // takes 20 seconds
-     *        var contents = result.getContentText();
-     *        cache.put("rss-feed-contents", contents, 1500); // cache for 25 minutes
-     *        return contents;
-     *      }
+     *     function getRssFeed() {
+     *       var cache = CacheService.getScriptCache();
+     *       var cached = cache.get("rss-feed-contents");
+     *       if (cached != null) {
+     *         return cached;
+     *       }
+     *       var result = UrlFetchApp.fetch("http://example.com/my-slow-rss-feed.xml"); // takes 20 seconds
+     *       var contents = result.getContentText();
+     *       cache.put("rss-feed-contents", contents, 1500); // cache for 25 minutes
+     *       return contents;
+     *     }
      */
     export interface Cache {
       get(key: string): string;
@@ -41,9 +41,9 @@ declare namespace GoogleAppsScript {
     /**
      * CacheService allows you to access a cache for short term storage of data.
      *
-     *  This class lets you get a specific cache instance. Public caches are for things that are not
-     *  dependent on which user is accessing your script. Private caches are for things which are
-     *  user-specific, like settings or recent activity.
+     * This class lets you get a specific cache instance. Public caches are for things that are not
+     * dependent on which user is accessing your script. Private caches are for things which are
+     * user-specific, like settings or recent activity.
      */
     export interface CacheService {
       getDocumentCache(): Cache;
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 21770b6efb..3665b30e9e 100644
--- a/types/google-apps-script/google-apps-script.calendar.d.ts
+++ b/types/google-apps-script/google-apps-script.calendar.d.ts
@@ -1,7 +1,6 @@
-// Type definitions for Google Apps Script 2018-05-03
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
-//                 linlex <https://github.com/linlex/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
@@ -14,6 +13,8 @@ declare namespace GoogleAppsScript {
      */
     export interface Calendar {
       createAllDayEvent(title: string, date: Date): CalendarEvent;
+      createAllDayEvent(title: string, startDate: Date, endDate: Date): CalendarEvent;
+      createAllDayEvent(title: string, startDate: Date, endDate: Date, options: Object): CalendarEvent;
       createAllDayEvent(title: string, date: Date, options: Object): CalendarEvent;
       createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence): CalendarEventSeries;
       createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence, options: Object): CalendarEventSeries;
@@ -48,9 +49,9 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Allows a script to read and update the user's Google Calendar. This class provides direct
-     *  access to the user's default calendar, as well as the ability to retrieve additional calendars
-     *  that the user owns or is subscribed to.
+     * Allows a script to read and update the user's Google Calendar. This class provides direct access
+     * to the user's default calendar, as well as the ability to retrieve additional calendars that the
+     * user owns or is subscribed to.
      */
     export interface CalendarApp {
       Color: typeof Color;
@@ -60,6 +61,8 @@ declare namespace GoogleAppsScript {
       Visibility: typeof Visibility;
       Weekday: typeof Base.Weekday;
       createAllDayEvent(title: string, date: Date): CalendarEvent;
+      createAllDayEvent(title: string, startDate: Date, endDate: Date): CalendarEvent;
+      createAllDayEvent(title: string, startDate: Date, endDate: Date, options: Object): CalendarEvent;
       createAllDayEvent(title: string, date: Date, options: Object): CalendarEvent;
       createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence): CalendarEventSeries;
       createAllDayEventSeries(title: string, startDate: Date, recurrence: EventRecurrence, options: Object): CalendarEventSeries;
@@ -77,6 +80,7 @@ declare namespace GoogleAppsScript {
       getColor(): string;
       getDefaultCalendar(): Calendar;
       getDescription(): string;
+      getEventById(iCalId: string): CalendarEvent;
       getEventSeriesById(iCalId: string): CalendarEventSeries;
       getEvents(startTime: Date, endTime: Date): CalendarEvent[];
       getEvents(startTime: Date, endTime: Date, options: Object): CalendarEvent[];
@@ -147,6 +151,7 @@ declare namespace GoogleAppsScript {
       removeGuest(email: string): CalendarEvent;
       resetRemindersToDefault(): CalendarEvent;
       setAllDayDate(date: Date): CalendarEvent;
+      setAllDayDates(startDate: Date, endDate: Date): CalendarEvent;
       setAnyoneCanAddSelf(anyoneCanAddSelf: boolean): CalendarEvent;
       setColor(color: string): CalendarEvent;
       setDescription(description: string): CalendarEvent;
@@ -259,10 +264,10 @@ declare namespace GoogleAppsScript {
     /**
      * Represents a recurrence rule for an event series.
      *
-     * Note that this class also behaves like the EventRecurrence that it belongs
-     *  to, allowing you to chain rule creation together like so:
+     * Note that this class also behaves like the EventRecurrence that it belongs to,
+     * allowing you to chain rule creation together like so:
      *
-     *      recurrence.addDailyRule().times(3).interval(2).addWeeklyExclusion().times(2);
+     *     recurrence.addDailyRule().times(3).interval(2).addWeeklyExclusion().times(2);
      *
      * times(times)
      * interval(interval)
diff --git a/types/google-apps-script/google-apps-script.card.d.ts b/types/google-apps-script/google-apps-script.card.d.ts
index d879d30091..60a8bb9d37 100644
--- a/types/google-apps-script/google-apps-script.card.d.ts
+++ b/types/google-apps-script/google-apps-script.card.d.ts
@@ -1,661 +1,660 @@
-// Type definitions for Google Apps Script 2017-10-30
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
-// Definitions by: dhayab <https://github.com/dhayab/>
+// Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
 /// <reference path="google-apps-script.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;
-            /**
-             * Sets a flag to indicate that this action changed the existing data state.
-             */
-            setStateChanged(stateChanged: boolean): 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 }
+  export module Card {
+    /**
+     * An action that enables interactivity within UI elements. The action does not happen directly on
+     * the client but rather invokes an Apps Script callback function with optional parameters.
+     *
+     *     var image = CardService.newImage()
+     *         .setOnClickAction(CardService.newAction()
+     *             .setFunctionName("handleImageClick")
+     *             .setParameters({imageSrc: 'carImage'}));
+     */
+    export interface Action {
+      setFunctionName(functionName: string): Action;
+      setLoadIndicator(loadIndicator: LoadIndicator): Action;
+      setParameters(parameters: Object): Action;
+      setMethodName(functionName: string): Action;
     }
+
+    /**
+     * The response object that may be returned from a callback function (e.g., a form response handler)
+     * to perform one or more actions on the client. Some combinations of actions are not supported.
+     *
+     *     // An action that opens a link
+     *     var actionResponse = CardService.newActionResponseBuilder()
+     *         .setOpenLink(CardService.newOpenLink()
+     *             .setUrl("https://www.google.com"))
+     *         .build();
+     *
+     *     // An action that shows a notification.
+     *     var actionResponse = CardService.newActionResponseBuilder()
+     *         .setNotification(CardService.newNotification()
+     *             .setType(CardService.Notification.INFO)
+     *             .setText("Some info to display to user"))
+     *         .build();
+     *
+     *     // An action that shows an additional card. It also sets a flag to indicate that the original
+     *     // state data has changed.
+     *
+     *     var cardBuilder = CardService.newCardBuilder();
+     *     // Build card ...
+     *     var actionResponse = CardService.newActionResponseBuilder()
+     *         .setNavigation(CardService.newNavigation()
+     *             .pushCard(cardBuilder.build()))
+     *         .setStateChanged(true)
+     *         .build();
+     */
+    export interface ActionResponse {
+      printJson(): string;
+    }
+
+    /**
+     * A builder for ActionResponse objects.
+     */
+    export interface ActionResponseBuilder {
+      build(): ActionResponse;
+      setNavigation(navigation: Navigation): ActionResponseBuilder;
+      setNotification(notification: Notification): ActionResponseBuilder;
+      setOpenLink(openLink: OpenLink): ActionResponseBuilder;
+      setStateChanged(stateChanged: boolean): ActionResponseBuilder;
+    }
+
+    /**
+     * An authorization action that will send the user to the AuthorizationUrl when clicked.
+     *
+     *     CardService.newAuthorizationAction()
+     *       .setAuthorizationUrl("http://google.com/");
+     */
+    export interface AuthorizationAction {
+      setAuthorizationUrl(authorizationUrl: string): AuthorizationAction;
+    }
+
+    /**
+     * An error that can be returned to trigger an authorization card to be shown to the user.
+     *
+     *     CardService.newAuthorizationException()
+     *       .setAuthorizationUrl("http://auth.com/")
+     *       .setResourceDisplayName("Example Resource")
+     *       .throwException();
+     */
+    export interface AuthorizationException {
+      printJson(): string;
+      setAuthorizationUrl(authUrl: string): AuthorizationException;
+      setCustomUiCallback(callback: string): AuthorizationException;
+      setResourceDisplayName(name: string): AuthorizationException;
+      throwException(): void;
+    }
+
+    /**
+     * A base class for all buttons.
+     */
+    export interface Button {
+      setAuthorizationAction(action: AuthorizationAction): Button;
+      setComposeAction(action: Action, composedEmailType: ComposedEmailType): Button;
+      setOnClickAction(action: Action): Button;
+      setOnClickOpenLinkAction(action: Action): Button;
+      setOpenLink(openLink: OpenLink): Button;
+    }
+
+    /**
+     * Holds a set of Button objects that are displayed in a row.
+     *
+     *     var textButton = CardService.newTextButton();
+     *     // Finish building the text button...
+     *
+     *     var imageButton = CardService.newImageButton();
+     *     // Finish building the image button...
+     *
+     *     var buttonSet = CardService.newButtonSet()
+     *         .addButton(textButton)
+     *         .addButton(imageButton);
+     */
+    export interface ButtonSet {
+      addButton(button: Button): ButtonSet;
+    }
+
+    /**
+     * A context card that represents a single view in the
+     * UI.
+     *
+     *     var cardSection = CardService.newCardSection();
+     *     // Finish building the card section ...
+     *
+     *     var card = CardService.newCardBuilder()
+     *         .setName("Card name")
+     *         .setHeader(CardService.newCardHeader().setTitle("Card title"))
+     *         .addSection(cardSection)
+     *         .build();
+     */
+    export interface Card {
+      printJson(): string;
+    }
+
+    /**
+     * A clickable menu item that is added to the card header menu.
+     *
+     *     var action = CardService.newAction();
+     *     // Finish building the action...
+     *
+     *     var cardAction = CardService.newCardAction()
+     *         .setText("Card action")
+     *         .setOnClickAction(action);
+     */
+    export interface CardAction {
+      setAuthorizationAction(action: AuthorizationAction): CardAction;
+      setComposeAction(action: Action, composedEmailType: ComposedEmailType): CardAction;
+      setOnClickAction(action: Action): CardAction;
+      setOnClickOpenLinkAction(action: Action): CardAction;
+      setOpenLink(openLink: OpenLink): CardAction;
+      setText(text: string): CardAction;
+    }
+
+    /**
+     * A builder for Card objects.
+     */
+    export interface CardBuilder {
+      addCardAction(cardAction: CardAction): CardBuilder;
+      addSection(section: CardSection): CardBuilder;
+      build(): Card;
+      setHeader(cardHeader: CardHeader): CardBuilder;
+      setName(name: string): CardBuilder;
+    }
+
+    /**
+     * The header of a Card.
+     *
+     *     var cardHeader = CardService.newCardHeader()
+     *         .setTitle("Card header title")
+     *         .setSubtitle("Card header subtitle")
+     *         .setImageStyle(CardService.ImageStyle.CIRCLE)
+     *         .setImageUrl("https://image.png");
+     */
+    export interface CardHeader {
+      setImageAltText(imageAltText: string): CardHeader;
+      setImageStyle(imageStyle: ImageStyle): CardHeader;
+      setImageUrl(imageUrl: string): CardHeader;
+      setSubtitle(subtitle: string): CardHeader;
+      setTitle(title: string): CardHeader;
+    }
+
+    /**
+     * A card section holds groups of widgets and provides visual separation between them.
+     *
+     *     var image = CardService.newImage();
+     *     // Build image ...
+     *     var textParagraph = CardService.newTextParagraph();
+     *     // Build text paragraph ...
+     *
+     *     var cardSection = CardService.newCardSection()
+     *         .setHeader("Section header")
+     *         .addWidget(image)
+     *         .addWidget(textParagraph);
+     */
+    export interface CardSection {
+      addWidget(widget: Widget): CardSection;
+      setCollapsible(collapsible: boolean): CardSection;
+      setHeader(header: string): CardSection;
+      setNumUncollapsibleWidgets(numUncollapsibleWidgets: Integer): CardSection;
+    }
+
+    /**
+     * CardService provides the ability to create generic cards used across different Google
+     * extensibility products, such as Gmail add-ons.
+     *
+     * Currently you can only use this service to construct Gmail add-ons.
+     *
+     *     return CardService.newCardBuilder()
+     *              .setHeader(CardService.newCardHeader().setTitle("CardTitle"))
+     *              .build();
+     *
+     * Or you can return multiple Cards like so:
+     *
+     *     return [
+     *       CardService.newCardBuilder().build(),
+     *       CardService.newCardBuilder().build(),
+     *       CardService.newCardBuilder().build()
+     *     ]
+     *
+     * The following shows how you could define a card with a header, text, an image and a menu item:
+     *
+     *     function createWidgetDemoCard() {
+     *       return CardService
+     *          .newCardBuilder()
+     *          .setHeader(
+     *              CardService.newCardHeader()
+     *                  .setTitle('Widget demonstration')
+     *                  .setSubtitle('Check out these widgets')
+     *                  .setImageStyle(CardService.ImageStyle.SQUARE)
+     *                  .setImageUrl(
+     *                      'https://www.example.com/images/headerImage.png'))
+     *          .addSection(
+     *               CardService.newCardSection()
+     *                   .setHeader('Simple widgets')  // optional
+     *                   .addWidget(CardService.newTextParagraph().setText(
+     *                       'These widgets are display-only. ' +
+     *                       'A text paragraph can have multiple lines and ' +
+     *                       'formatting.'))
+     *                   .addWidget(CardService.newImage().setImageUrl(
+     *                       'https://www.example.com/images/mapsImage.png')))
+     *          .addCardAction(CardService.newCardAction().setText('Gmail').setOpenLink(
+     *              CardService.newOpenLink().setUrl('https://mail.google.com/mail')))
+     *          .build();
+     *     }
+     */
+    export interface CardService {
+      ComposedEmailType: typeof ComposedEmailType;
+      Icon: typeof Icon;
+      ImageStyle: typeof ImageStyle;
+      LoadIndicator: typeof LoadIndicator;
+      NotificationType: typeof NotificationType;
+      OnClose: typeof OnClose;
+      OpenAs: typeof OpenAs;
+      SelectionInputType: typeof SelectionInputType;
+      newAction(): Action;
+      newActionResponseBuilder(): ActionResponseBuilder;
+      newAuthorizationAction(): AuthorizationAction;
+      newAuthorizationException(): AuthorizationException;
+      newButtonSet(): ButtonSet;
+      newCardAction(): CardAction;
+      newCardBuilder(): CardBuilder;
+      newCardHeader(): CardHeader;
+      newCardSection(): CardSection;
+      newComposeActionResponseBuilder(): ComposeActionResponseBuilder;
+      newImage(): Image;
+      newImageButton(): ImageButton;
+      newKeyValue(): KeyValue;
+      newNavigation(): Navigation;
+      newNotification(): Notification;
+      newOpenLink(): OpenLink;
+      newSelectionInput(): SelectionInput;
+      newSuggestions(): Suggestions;
+      newSuggestionsResponseBuilder(): SuggestionsResponseBuilder;
+      newSwitch(): Switch;
+      newTextButton(): TextButton;
+      newTextInput(): TextInput;
+      newTextParagraph(): TextParagraph;
+      newUniversalActionResponseBuilder(): UniversalActionResponseBuilder;
+    }
+
+    /**
+     * The response object that may be returned from a callback method for compose action in a Gmail add-on.
+     *
+     *     var composeActionResponse = CardService.newComposeActionResponseBuilder()
+     *         .setGmailDraft(GmailApp.createDraft("recipient", "subject", "body"))
+     *         .build();
+     */
+    export interface ComposeActionResponse {
+      printJson(): string;
+    }
+
+    /**
+     * A builder for ComposeActionResponse objects.
+     */
+    export interface ComposeActionResponseBuilder {
+      build(): ComposeActionResponse;
+      setGmailDraft(draft: Gmail.GmailDraft): ComposeActionResponseBuilder;
+    }
+
+    /**
+     * An enum value that specifies whether the composed email is a standalone or reply draft.
+     */
+    export enum ComposedEmailType { REPLY_AS_DRAFT, STANDALONE_DRAFT }
+
+    /**
+     * Predefined icons that can be used in various UI objects, such as ImageButton or KeyValue widgets.
+     */
+    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 }
+
+    /**
+     * A widget that shows a single image.
+     *
+     *     var image = CardService.newImage().setAltText("A nice image").setImageUrl("https://image.png");
+     */
+    export interface Image {
+      setAltText(altText: string): Image;
+      setAuthorizationAction(action: AuthorizationAction): Image;
+      setComposeAction(action: Action, composedEmailType: ComposedEmailType): Image;
+      setImageUrl(url: string): Image;
+      setOnClickAction(action: Action): Image;
+      setOnClickOpenLinkAction(action: Action): Image;
+      setOpenLink(openLink: OpenLink): Image;
+    }
+
+    /**
+     * A ImageButton with an image displayed on it.
+     *
+     *     var imageButton = CardService.newImageButton()
+     *         .setAltText("An image button with an airplane icon.")
+     *         .setIcon(CardService.Icon.AIRPLANE)
+     *         .setOpenLink(CardService.newOpenLink()
+     *             .setUrl("https://airplane.com"));
+     */
+    export interface ImageButton {
+      setAltText(altText: string): ImageButton;
+      setAuthorizationAction(action: AuthorizationAction): ImageButton;
+      setComposeAction(action: Action, composedEmailType: ComposedEmailType): ImageButton;
+      setIcon(icon: Icon): ImageButton;
+      setIconUrl(url: string): ImageButton;
+      setOnClickAction(action: Action): ImageButton;
+      setOnClickOpenLinkAction(action: Action): ImageButton;
+      setOpenLink(openLink: OpenLink): ImageButton;
+    }
+
+    /**
+     * An enum that defines an image cropping style.
+     */
+    export enum ImageStyle { SQUARE, CIRCLE }
+
+    /**
+     * A widget that displays one or more "keys" around a text "value". The possible keys include an
+     * icon, a label above and a label below. Setting the text content and one of the keys is required
+     * using setContent(text) and one of setIcon(icon), setIconUrl(url), setTopLabel(text),
+     * or setBottomLabel(text).
+     *
+     *     var imageKeyValue = CardService.newKeyValue()
+     *         .setIconUrl("https://icon.png")
+     *         .setContent("KeyValue widget with an image on the left and text on the right");
+     *
+     *     var textKeyValue = CardService.newKeyValue()
+     *         .setTopLabel("Text key")
+     *         .setContent("KeyValue widget with text key on top and cotent below");
+     *
+     *     var multilineKeyValue = CardService.newKeyValue()
+     *         .setTopLabel("Top label - single line)")
+     *         .setContent("Content can be multiple lines")
+     *     .setMultiline(true)
+     *         .setBottomLabel("Bottom label - single line");
+     */
+    export interface KeyValue {
+      setAuthorizationAction(action: AuthorizationAction): KeyValue;
+      setBottomLabel(text: string): KeyValue;
+      setButton(button: Button): KeyValue;
+      setComposeAction(action: Action, composedEmailType: ComposedEmailType): KeyValue;
+      setContent(text: string): KeyValue;
+      setIcon(icon: Icon): KeyValue;
+      setIconAltText(altText: string): KeyValue;
+      setIconUrl(url: string): KeyValue;
+      setMultiline(multiline: boolean): KeyValue;
+      setOnClickAction(action: Action): KeyValue;
+      setOnClickOpenLinkAction(action: Action): KeyValue;
+      setOpenLink(openLink: OpenLink): KeyValue;
+      setSwitch(switchToSet: Switch): KeyValue;
+      setTopLabel(text: string): KeyValue;
+    }
+
+    /**
+     * An enum type that specifies the type of loading or progress indicator to display while an Action is being processed.
+     */
+    export enum LoadIndicator { SPINNER, NONE }
+
+    /**
+     * A helper object that controls card navigation. See the card navigation guide for more details.
+     */
+    export interface Navigation {
+      popCard(): Navigation;
+      popToNamedCard(cardName: string): Navigation;
+      popToRoot(): Navigation;
+      printJson(): string;
+      pushCard(card: Card): Navigation;
+      updateCard(card: Card): Navigation;
+    }
+
+    /**
+     * A notification shown to the user as a response to interacting with a UI element.
+     *
+     *     var action = CardService.newAction().setFunctionName("notificationCallback");
+     *     CardService.newTextButton().setText('Save').setOnClickAction(action);
+     *
+     *     // ...
+     *
+     *     function notificationCallback() {
+     *       return CardService.newActionResponseBuilder()
+     *           .setNotification(CardService.newNotification()
+     *               .setType(CardService.NotificationType.WARNING)
+     *               .setText("Some info to display to user"))
+     *           .build();
+     *     }
+     */
+    export interface Notification {
+      setText(text: string): Notification;
+      setType(type: NotificationType): Notification;
+    }
+
+    /**
+     * Type of notification to show.
+     */
+    export enum NotificationType { INFO, ERROR, WARNING }
+
+    /**
+     * An enum that 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.
+     */
+    export enum OnClose { NOTHING, RELOAD_ADD_ON }
+
+    /**
+     * An enum that 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.
+     */
+    export enum OpenAs { FULL_SIZE, OVERLAY }
+
+    /**
+     * Represents an action to open a link with some options.
+     *
+     *     // A button that opens as a link in an overlay and
+     *     // requires a reload when closed.
+     *     var button = CardService.newTextButton()
+     *         .setText("This button opens a link in an overlay window")
+     *         .setOpenLink(CardService.newOpenLink()
+     *             .setUrl("https://www.google.com")
+     *             .setOpenAs(CardService.OpenAs.OVERLAY)
+     *             .setOnClose(CardService.OnClose.RELOAD_ADD_ON));
+     *
+     *     // An action response that opens a link in full screen and
+     *     // requires no action when closed.
+     *     var actionResponse = CardService.newActionResponseBuilder()
+     *         .setOpenLink(CardService.newOpenLink()
+     *             .setUrl("https://www.google.com")
+     *             .setOpenAs(CardService.OpenAs.FULL_SIZE)
+     *             .setOnClose(CardService.OnClose.NOTHING));
+     *         .build();
+     */
+    export interface OpenLink {
+      setOnClose(onClose: OnClose): OpenLink;
+      setOpenAs(openAs: OpenAs): OpenLink;
+      setUrl(url: string): OpenLink;
+    }
+
+    /**
+     * An input field that allows choosing between a set of predefined options.
+     *
+     *     var checkboxGroup = CardService.newSelectionInput()
+     *         .setType(CardService.SelectionInputType.CHECK_BOX)
+     *         .setTitle("A group of checkboxes. Multiple selections are allowed.")
+     *         .setFieldName("checkbox_field")
+     *         .addItem("checkbox one title", "checkbox_one_value", false)
+     *         .addItem("checkbox two title", "checkbox_two_value", true)
+     *         .addItem("checkbox three title", "checkbox_three_value", false)
+     *         .setOnChangeAction(CardService.newAction()
+     *             .setFunctionName("handleCheckboxChange"));
+     *
+     *     var radioGroup = CardService.newSelectionInput()
+     *         .setType(CardService.SelectionInputType.RADIO_BUTTON)
+     *         .setTitle("A group of radio buttons. Only a single selection is allowed.")
+     *         .setFieldName("checkbox_field")
+     *         .addItem("radio button one title", "radio_one_value", true)
+     *         .addItem("radio button two title", "radio_two_value", true)
+     *         .addItem("radio button three title", "radio_three_value", false);
+     */
+    export interface SelectionInput {
+      addItem(text: Object, value: Object, selected: boolean): SelectionInput;
+      setFieldName(fieldName: string): SelectionInput;
+      setOnChangeAction(action: Action): SelectionInput;
+      setTitle(title: string): SelectionInput;
+      setType(type: SelectionInputType): SelectionInput;
+    }
+
+    /**
+     * Type of selection input.
+     */
+    export enum SelectionInputType { CHECK_BOX, RADIO_BUTTON, DROPDOWN }
+
+    /**
+     * Autocomplete suggestions to supplement a TextInput widget.
+     *
+     *     var textInput = CardService.newTextInput()
+     *         .setSuggestions(CardService.newSuggestions()
+     *             .addSuggestion("First suggestion")
+     *             .addSuggestion("Second suggestion"))
+     */
+    export interface Suggestions {
+      addSuggestion(suggestion: string): Suggestions;
+      addSuggestions(suggestions: Object[]): Suggestions;
+    }
+
+    /**
+     * A response object that can be returned from a suggestions callback function. This is used with
+     * TextInput widgets that implement autocomplete.
+     *
+     *     var suggestionsResponse = CardService.newSuggestionsResponseBuilder()
+     *         .setSuggestions(CardService.newSuggestions()
+     *             .addSuggestion("First suggestion")
+     *             .addSuggestion("Second suggestion"))
+     *             .build();
+     */
+    export interface SuggestionsResponse {
+      printJson(): string;
+    }
+
+    /**
+     * A builder for SuggestionsResponse objects.
+     */
+    export interface SuggestionsResponseBuilder {
+      build(): SuggestionsResponse;
+      setSuggestions(suggestions: Suggestions): SuggestionsResponseBuilder;
+    }
+
+    /**
+     * A UI element that supports being toggled on or off. This can only be used within a KeyValue widget.
+     *
+     *     var switchKeyValue = CardService.newKeyValue()
+     *         .setTopLabel("Switch key value widget label")
+     *         .setContent("This is a key value widget with a switch on the right")
+     *         .setSwitch(CardService.newSwitch()
+     *             .setFieldName("form_input_switch_key")
+     *             .setValue("form_input_switch_value")
+     *             .setOnChangeAction(CardService.newAction()
+     *                 .setFunctionName("handleSwitchChange")));
+     */
+    export interface Switch {
+      setFieldName(fieldName: string): Switch;
+      setOnChangeAction(action: Action): Switch;
+      setSelected(selected: boolean): Switch;
+      setValue(value: string): Switch;
+    }
+
+    /**
+     * A TextButton with a text label.
+     *
+     *     var textButton = CardService.newTextButton()
+     *         .setText("Open Link")
+     *         .setOpenLink(CardService.newOpenLink()
+     *             .setUrl("https://www.google.com"));
+     */
+    export interface TextButton {
+      setAuthorizationAction(action: AuthorizationAction): TextButton;
+      setComposeAction(action: Action, composedEmailType: ComposedEmailType): TextButton;
+      setOnClickAction(action: Action): TextButton;
+      setOnClickOpenLinkAction(action: Action): TextButton;
+      setOpenLink(openLink: OpenLink): TextButton;
+      setText(text: string): TextButton;
+    }
+
+    /**
+     * A input field widget that accepts text input.
+     *
+     *     var textInput = CardService.newTextInput()
+     *         .setFieldName("text_input_form_input_key")
+     *         .setTitle("Text input title")
+     *         .setHint("Text input hint");
+     */
+    export interface TextInput {
+      setFieldName(fieldName: string): TextInput;
+      setHint(hint: string): TextInput;
+      setMultiline(multiline: boolean): TextInput;
+      setOnChangeAction(action: Action): TextInput;
+      setSuggestions(suggestions: Suggestions): TextInput;
+      setSuggestionsAction(suggestionsAction: Action): TextInput;
+      setTitle(title: string): TextInput;
+      setValue(value: string): TextInput;
+    }
+
+    /**
+     * A widget that displays text and supports basic HTML formatting.
+     *
+     *     var textParagraph = CardService.newTextParagraph()
+     *         .setText("This is a text paragraph widget. Multiple lines are allowed if needed.");
+     */
+    export interface TextParagraph {
+      setText(text: string): TextParagraph;
+    }
+
+    /**
+     * The response object that may be returned from a method that creates universal action.
+     *
+     *     // A universal action that opens a link.
+     *     var openLinkUniversalAction = CardService.newUniversalActionResponseBuilder()
+     *         .setOpenLink(CardService.newOpenLink()
+     *             .setUrl("https://www.google.com"))
+     *             .build();
+     *
+     *     var cardBuilder1 = CardService.newCardBuilder();
+     *     var cardBuilder2 = CardService.newCardBuilder();
+     *     // Finish building the cards ...
+     *
+     *     // A universal action that shows two static cards.
+     *     var cardsUniversalAction = CardService.newUniversalActionResponseBuilder()
+     *         .displayAddOnCards([
+     *             cardBuilder1.build();
+     *             cardBuilder2.build();
+     *         ]).build();
+     */
+    export interface UniversalActionResponse {
+      printJson(): string;
+    }
+
+    /**
+     * A builder for the UniversalActionResponse objects.
+     */
+    export interface UniversalActionResponseBuilder {
+      build(): UniversalActionResponse;
+      displayAddOnCards(cardObjects: Object[]): UniversalActionResponseBuilder;
+      setOpenLink(openLink: OpenLink): UniversalActionResponseBuilder;
+    }
+
+    /**
+     * Base class for all widgets that can be added to a Card.
+     */
+    export interface Widget {
+    }
+
+  }
 }
 
-/**
- * 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 5e3b51436c..50013a36d0 100644
--- a/types/google-apps-script/google-apps-script.charts.d.ts
+++ b/types/google-apps-script/google-apps-script.charts.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,43 +10,42 @@
 declare namespace GoogleAppsScript {
   export module Charts {
     /**
-     * Builder for area charts. For more details, see the
-     *  Google Charts documentation.
+     * Builder for area charts. For more details, see the Google Charts documentation.
      *
-     *  Here is an example that shows how to build an area chart.
+     * Here is an example that shows how to build an area chart.
      *
-     *      function doGet() {
-     *        // Create a data table with some sample data.
-     *        var sampleData = Charts.newDataTable()
-     *            .addColumn(Charts.ColumnType.STRING, "Month")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Dining")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Total")
-     *            .addRow(["Jan", 60, 520])
-     *            .addRow(["Feb", 50, 430])
-     *            .addRow(["Mar", 53, 440])
-     *            .addRow(["Apr", 70, 410])
-     *            .addRow(["May", 80, 390])
-     *            .addRow(["Jun", 60, 500])
-     *            .addRow(["Jul", 100, 450])
-     *            .addRow(["Aug", 140, 431])
-     *            .addRow(["Sep", 75, 488])
-     *            .addRow(["Oct", 70, 521])
-     *            .addRow(["Nov", 58, 388])
-     *            .addRow(["Dec", 63, 400])
-     *            .build();
+     *     function doGet() {
+     *       // Create a data table with some sample data.
+     *       var sampleData = Charts.newDataTable()
+     *           .addColumn(Charts.ColumnType.STRING, "Month")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Dining")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Total")
+     *           .addRow(["Jan", 60, 520])
+     *           .addRow(["Feb", 50, 430])
+     *           .addRow(["Mar", 53, 440])
+     *           .addRow(["Apr", 70, 410])
+     *           .addRow(["May", 80, 390])
+     *           .addRow(["Jun", 60, 500])
+     *           .addRow(["Jul", 100, 450])
+     *           .addRow(["Aug", 140, 431])
+     *           .addRow(["Sep", 75, 488])
+     *           .addRow(["Oct", 70, 521])
+     *           .addRow(["Nov", 58, 388])
+     *           .addRow(["Dec", 63, 400])
+     *           .build();
      *
-     *        var chart = Charts.newAreaChart()
-     *            .setTitle('Yearly Spending')
-     *            .setXAxisTitle('Month')
-     *            .setYAxisTitle('Spending (USD)')
-     *            .setDimensions(600, 500)
-     *            .setStacked()
-     *            .setColors(['red', 'green'])
-     *            .setDataTable(sampleData)
-     *            .build();
+     *       var chart = Charts.newAreaChart()
+     *           .setTitle('Yearly Spending')
+     *           .setXAxisTitle('Month')
+     *           .setYAxisTitle('Spending (USD)')
+     *           .setDimensions(600, 500)
+     *           .setStacked()
+     *           .setColors(['red', 'green'])
+     *           .setDataTable(sampleData)
+     *           .build();
      *
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface AreaChartBuilder {
       build(): Chart;
@@ -76,29 +75,27 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Builder for bar charts. For more details, see the
-     *  Google Charts documentation.
+     * Builder for bar charts. For more details, see the Google Charts documentation.
      *
-     *  Here is an example that shows how to build a bar chart. The data is
+     * Here is an example that shows how to build a bar chart. The data is imported from a
+     * Google spreadsheet.
      *
-     *  imported from a Google spreadsheet.
+     *     function doGet() {
+     *      // Get sample data from a spreadsheet.
+     *      var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=B1%3AC11' +
+     *          '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=0&headers=-1';
      *
-     *      function doGet() {
-     *       // Get sample data from a spreadsheet.
-     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=B1%3AC11' +
-     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=0&headers=-1';
+     *      var chartBuilder = Charts.newBarChart()
+     *          .setTitle('Top Grossing Films in US and Canada')
+     *          .setXAxisTitle('USD')
+     *          .setYAxisTitle('Film')
+     *          .setDimensions(600, 500)
+     *          .setLegendPosition(Charts.Position.BOTTOM)
+     *          .setDataSourceUrl(dataSourceUrl);
      *
-     *       var chartBuilder = Charts.newBarChart()
-     *           .setTitle('Top Grossing Films in US and Canada')
-     *           .setXAxisTitle('USD')
-     *           .setYAxisTitle('Film')
-     *           .setDimensions(600, 500)
-     *           .setLegendPosition(Charts.Position.BOTTOM)
-     *           .setDataSourceUrl(dataSourceUrl);
-     *
-     *       var chart = chartBuilder.build();
-     *       return UiApp.createApplication().add(chart);
-     *      }
+     *      var chart = chartBuilder.build();
+     *      return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface BarChartBuilder {
       build(): Chart;
@@ -130,59 +127,59 @@ declare namespace GoogleAppsScript {
     /**
      * A builder for category filter controls.
      *
-     *  A category filter is a picker to choose one or more between a set of defined values.
-     *  Given a column of type string, this control will filter out the rows that
-     *  don't match any of the picked values.
+     * A category filter is a picker to choose one or more between a set of defined values. Given a
+     * column of type string, this control will filter out the rows that don't match any of the picked
+     * values.
      *
-     *  Here is an example that creates a table chart a binds a category filter to it. This allows the
-     *  user to filter the data the table displays.
+     * Here is an example that creates a table chart a binds a category filter to it. This allows the
+     * user to filter the data the table displays.
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var sampleData = Charts.newDataTable()
-     *            .addColumn(Charts.ColumnType.STRING, "Month")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Dining")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Total")
-     *            .addRow(["Jan", 60, 520])
-     *            .addRow(["Feb", 50, 430])
-     *            .addRow(["Mar", 53, 440])
-     *            .addRow(["Apr", 70, 410])
-     *            .addRow(["May", 80, 390])
-     *            .addRow(["Jun", 60, 500])
-     *            .addRow(["Jul", 100, 450])
-     *            .addRow(["Aug", 140, 431])
-     *            .addRow(["Sep", 75, 488])
-     *            .addRow(["Oct", 70, 521])
-     *            .addRow(["Nov", 58, 388])
-     *            .addRow(["Dec", 63, 400])
-     *            .build();
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var sampleData = Charts.newDataTable()
+     *           .addColumn(Charts.ColumnType.STRING, "Month")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Dining")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Total")
+     *           .addRow(["Jan", 60, 520])
+     *           .addRow(["Feb", 50, 430])
+     *           .addRow(["Mar", 53, 440])
+     *           .addRow(["Apr", 70, 410])
+     *           .addRow(["May", 80, 390])
+     *           .addRow(["Jun", 60, 500])
+     *           .addRow(["Jul", 100, 450])
+     *           .addRow(["Aug", 140, 431])
+     *           .addRow(["Sep", 75, 488])
+     *           .addRow(["Oct", 70, 521])
+     *           .addRow(["Nov", 58, 388])
+     *           .addRow(["Dec", 63, 400])
+     *           .build();
      *
-     *        var chart = Charts.newTableChart()
-     *            .setDimensions(600, 500)
-     *            .build();
+     *       var chart = Charts.newTableChart()
+     *           .setDimensions(600, 500)
+     *           .build();
      *
-     *        var categoryFilter = Charts.newCategoryFilter()
-     *            .setFilterColumnLabel("Month")
-     *            .setAllowMultiple(true)
-     *            .setSortValues(true)
-     *            .setLabelStacking(Charts.Orientation.VERTICAL)
-     *            .setCaption('Choose categories...')
-     *            .build();
+     *       var categoryFilter = Charts.newCategoryFilter()
+     *           .setFilterColumnLabel("Month")
+     *           .setAllowMultiple(true)
+     *           .setSortValues(true)
+     *           .setLabelStacking(Charts.Orientation.VERTICAL)
+     *           .setCaption('Choose categories...')
+     *           .build();
      *
-     *        var panel = app.createVerticalPanel().setSpacing(10);
-     *        panel.add(categoryFilter).add(chart);
+     *       var panel = app.createVerticalPanel().setSpacing(10);
+     *       panel.add(categoryFilter).add(chart);
      *
-     *        var dashboard = Charts.newDashboardPanel()
-     *            .setDataTable(sampleData)
-     *            .bind(categoryFilter, chart)
-     *            .build();
+     *       var dashboard = Charts.newDashboardPanel()
+     *           .setDataTable(sampleData)
+     *           .bind(categoryFilter, chart)
+     *           .build();
      *
-     *        dashboard.add(panel);
-     *        app.add(dashboard);
-     *        return app;
-     *      }
+     *       dashboard.add(panel);
+     *       app.add(dashboard);
+     *       return app;
+     *     }
      *
-     *  documentation
+     * documentation
      */
     export interface CategoryFilterBuilder {
       build(): Control;
@@ -204,8 +201,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * A Chart object, which can be embedded into documents, UI elements, or used as a static image. For
-     *  charts embedded in spreadsheets, see
-     *  EmbeddedChart.
+     * charts embedded in spreadsheets, see EmbeddedChart.
      */
     export interface Chart {
       getAs(contentType: string): Base.Blob;
@@ -216,14 +212,24 @@ declare namespace GoogleAppsScript {
       setId(id: string): Chart;
     }
 
+    /**
+     * An enumeration of how hidden dimensions in a source are expressed in a chart.
+     */
+    export enum ChartHiddenDimensionStrategy { IGNORE_BOTH, IGNORE_ROWS, IGNORE_COLUMNS, SHOW_BOTH }
+
+    /**
+     * An enumeration of how multiple ranges in the source are expressed in a chart.
+     */
+    export enum ChartMergeStrategy { MERGE_COLUMNS, MERGE_ROWS }
+
     /**
      * Exposes options currently configured for a Chart, such as height, color, etc.
      *
-     *  Please see the visualization
-     *  reference documentation for information on what options are available. Specific options for
-     *  each chart can be found by clicking on the specific chart in the chart gallery.
+     * Please see the visualization
+     * reference documentation for information on what options are available. Specific options for
+     * each chart can be found by clicking on the specific chart in the chart gallery.
      *
-     *  These options are immutable.
+     * These options are immutable.
      */
     export interface ChartOptions {
       get(option: string): Object;
@@ -232,39 +238,44 @@ declare namespace GoogleAppsScript {
     /**
      * Chart types supported by the Charts service.
      */
-    export enum ChartType { AREA, BAR, COLUMN, COMBO, HISTOGRAM, LINE, PIE, SCATTER, TABLE }
+    export enum ChartType { TIMELINE, AREA, BAR, BUBBLE, CANDLESTICK, COLUMN, COMBO, GAUGE, GEO, HISTOGRAM, RADAR, LINE, ORG, PIE, SCATTER, SPARKLINE, STEPPED_AREA, TABLE, TREEMAP, WATERFALL }
 
     /**
      * Entry point for creating Charts in scripts.
      *
-     *  This example creates a basic data table, populates an area chart with the data, and adds it into
-     *  a UiApp:
+     * This example creates a basic data table, populates an area chart with the data, and adds it
+     * into a web page as an image:
      *
-     *      function doGet() {
-     *        var data = Charts.newDataTable()
-     *            .addColumn(Charts.ColumnType.STRING, "Month")
-     *            .addColumn(Charts.ColumnType.NUMBER, "In Store")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Online")
-     *            .addRow(["January", 10, 1])
-     *            .addRow(["February", 12, 1])
-     *            .addRow(["March", 20, 2])
-     *            .addRow(["April", 25, 3])
-     *            .addRow(["May", 30, 4])
-     *            .build();
+     *     function doGet() {
+     *       var data = Charts.newDataTable()
+     *           .addColumn(Charts.ColumnType.STRING, "Month")
+     *           .addColumn(Charts.ColumnType.NUMBER, "In Store")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Online")
+     *           .addRow(["January", 10, 1])
+     *           .addRow(["February", 12, 1])
+     *           .addRow(["March", 20, 2])
+     *           .addRow(["April", 25, 3])
+     *           .addRow(["May", 30, 4])
+     *           .build();
      *
-     *        var chart = Charts.newAreaChart()
-     *            .setDataTable(data)
-     *            .setStacked()
-     *            .setRange(0, 40)
-     *            .setTitle("Sales per Month")
-     *            .build();
+     *       var chart = Charts.newAreaChart()
+     *           .setDataTable(data)
+     *           .setStacked()
+     *           .setRange(0, 40)
+     *           .setTitle("Sales per Month")
+     *           .build();
      *
-     *        var uiApp = UiApp.createApplication().setTitle("My Chart");
-     *        uiApp.add(chart);
-     *        return uiApp;
-     *      }
+     *        var htmlOutput = HtmlService.createHtmlOutput().setTitle('My Chart');
+     *        var imageData = Utilities.base64Encode(chart.getAs('image/png').getBytes());
+     *        var imageUrl = "data:image/png;base64," + encodeURI(imageData);
+     *        htmlOutput.append("Render chart server side: <br/>");
+     *        htmlOutput.append("<img border=\"1\" src=\"" + imageUrl + "\">");
+     *        return htmlOutput;
+     *     }
      */
     export interface Charts {
+      ChartHiddenDimensionStrategy: typeof ChartHiddenDimensionStrategy;
+      ChartMergeStrategy: typeof ChartMergeStrategy;
       ChartType: typeof ChartType;
       ColumnType: typeof ColumnType;
       CurveStyle: typeof CurveStyle;
@@ -290,37 +301,36 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Builder for column charts. For more details, see the
-     *  Google Charts documentation.
+     * Builder for column charts. For more details, see the Google Charts documentation.
      *
-     *  This example shows how to create a column chart with data from a data table.
+     * This example shows how to create a column chart with data from a data table.
      *
-     *       function doGet() {
-     *        var sampleData = Charts.newDataTable()
-     *            .addColumn(Charts.ColumnType.STRING, "Year")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Sales")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Expenses")
-     *            .addRow(["2004", 1000, 400])
-     *            .addRow(["2005", 1170, 460])
-     *            .addRow(["2006", 660, 1120])
-     *            .addRow(["2007", 1030, 540])
-     *            .addRow(["2008", 800, 600])
-     *            .addRow(["2009", 943, 678])
-     *            .addRow(["2010", 1020, 550])
-     *            .addRow(["2011", 910, 700])
-     *            .addRow(["2012", 1230, 840])
-     *            .build();
+     *      function doGet() {
+     *       var sampleData = Charts.newDataTable()
+     *           .addColumn(Charts.ColumnType.STRING, "Year")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Sales")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Expenses")
+     *           .addRow(["2004", 1000, 400])
+     *           .addRow(["2005", 1170, 460])
+     *           .addRow(["2006", 660, 1120])
+     *           .addRow(["2007", 1030, 540])
+     *           .addRow(["2008", 800, 600])
+     *           .addRow(["2009", 943, 678])
+     *           .addRow(["2010", 1020, 550])
+     *           .addRow(["2011", 910, 700])
+     *           .addRow(["2012", 1230, 840])
+     *           .build();
      *
-     *        var chart = Charts.newColumnChart()
-     *            .setTitle('Sales vs. Expenses')
-     *            .setXAxisTitle('Year')
-     *            .setYAxisTitle('Amount (USD)')
-     *            .setDimensions(600, 500)
-     *            .setDataTable(sampleData)
-     *            .build();
+     *       var chart = Charts.newColumnChart()
+     *           .setTitle('Sales vs. Expenses')
+     *           .setXAxisTitle('Year')
+     *           .setYAxisTitle('Amount (USD)')
+     *           .setDimensions(600, 500)
+     *           .setDataTable(sampleData)
+     *           .build();
      *
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface ColumnChartBuilder {
       build(): Chart;
@@ -356,18 +366,15 @@ declare namespace GoogleAppsScript {
     /**
      * A user interface control object, that drives the data displayed by a DashboardPanel.
      *
-     *  A control can be embedded in a UI application. Controls are user interface widgets (category
-     *  pickers, range sliders, autocompleters, etc.) users interact with in order to drive the data
-     *  managed by a dashboard and the charts that are part of it.
-     *  Controls collect user input and use the information to decide which of the data the
-     *  dashboard is managing should be made available to the charts that are part of it.
-     *  Given a data table, a control will filter out the data that doesn't comply with the
-     *  conditions implied by its current state, and will expose the filtered data table as
-     *  an output.
+     * A control can be embedded in a UI application. Controls are user interface widgets (category
+     * pickers, range sliders, autocompleters, etc.) users interact with in order to drive the data
+     * managed by a dashboard and the charts that are part of it. Controls collect user input and use
+     * the information to decide which of the data the dashboard is managing should be made available to
+     * the charts that are part of it. Given a data table, a control will filter out the data that
+     * doesn't comply with the conditions implied by its current state, and will expose the filtered
+     * data table as an output.
      *
-     *  For more details, see the Gviz
-     *
-     *  documentation.
+     * For more details, see the Gviz documentation.
      */
     export interface Control {
       getId(): string;
@@ -381,69 +388,67 @@ declare namespace GoogleAppsScript {
     export enum CurveStyle { NORMAL, SMOOTH }
 
     /**
-     * A dashboard is a visual structure that enables the organization and management
-     *  of multiple charts that share the same underlying data.
+     * A dashboard is a visual structure that enables the organization and management of multiple charts
+     * that share the same underlying data.
      *
-     *  Controls are user interface widgets (category pickers, range sliders, autocompleters, etc.)
-     *  users interact with in order to drive the data managed by a dashboard and the charts that
-     *  are part of it. For example, a string filter control is a simple text input field that lets
-     *  the user filter data via string matching. Given a column and matching options, the control
-     *  will filter out the rows that don't match the term that's in the input field.
+     * Controls are user interface widgets (category pickers, range sliders, autocompleters, etc.)
+     * users interact with in order to drive the data managed by a dashboard and the charts that are
+     * part of it. For example, a string filter control is a simple text input field that lets the user
+     * filter data via string matching. Given a column and matching options, the control will filter out
+     * the rows that don't match the term that's in the input field.
      *
-     *  The Gviz API defines a dashboard as a set of charts and controls bound together. The
-     *  bindings between the different components define the data flow, the state of the
-     *  controls filters views of the data which propagate in the dashboard and are
-     *  eventually visualized with charts. For more details, see the Gviz
+     * The Gviz API defines a dashboard as a set of charts and controls bound together. The bindings
+     * between the different components define the data flow, the state of the controls filters views of
+     * the data which propagate in the dashboard and are eventually visualized with charts. For more
+     * details, see the Gviz documentation.
      *
-     *  documentation.
+     * The dashboard panel has two purposes, one is being a container for the charts and controls
+     * objects that compose the dashboard, and the other is holding the data and use as an interface for
+     * binding controls to charts.
      *
-     *  The dashboard panel has two purposes, one is being a container for the charts and
-     *  controls objects that compose the dashboard, and the other is holding the data and use
-     *  as an interface for binding controls to charts.
+     * Here's an example of creating a dashboard and showing it in a UI app:
      *
-     *  Here's an example of creating a dashboard and showing it in a UI app:
+     *     function doGet() {
+     *       // Create a data table with some sample data.
+     *       var data = Charts.newDataTable()
+     *         .addColumn(Charts.ColumnType.STRING, "Name")
+     *         .addColumn(Charts.ColumnType.NUMBER, "Age")
+     *         .addRow(["Michael", 18])
+     *         .addRow(["Elisa", 12])
+     *         .addRow(["John", 20])
+     *         .addRow(["Jessica", 25])
+     *         .addRow(["Aaron", 14])
+     *         .addRow(["Margareth", 19])
+     *         .addRow(["Miranda", 22])
+     *         .addRow(["May", 20])
+     *         .build();
      *
-     *      function doGet() {
-     *        // Create a data table with some sample data.
-     *        var data = Charts.newDataTable()
-     *          .addColumn(Charts.ColumnType.STRING, "Name")
-     *          .addColumn(Charts.ColumnType.NUMBER, "Age")
-     *          .addRow(["Michael", 18])
-     *          .addRow(["Elisa", 12])
-     *          .addRow(["John", 20])
-     *          .addRow(["Jessica", 25])
-     *          .addRow(["Aaron", 14])
-     *          .addRow(["Margareth", 19])
-     *          .addRow(["Miranda", 22])
-     *          .addRow(["May", 20])
-     *          .build();
+     *       var chart = Charts.newBarChart()
+     *         .setTitle("Ages")
+     *         .build();
      *
-     *        var chart = Charts.newBarChart()
-     *          .setTitle("Ages")
-     *          .build();
+     *       var control = Charts.newStringFilter()
+     *         .setFilterColumnLabel("Name")
+     *         .build();
      *
-     *        var control = Charts.newStringFilter()
-     *          .setFilterColumnLabel("Name")
-     *          .build();
+     *       // Bind the control to the chart in a dashboard panel.
+     *       var dashboard = Charts.newDashboardPanel()
+     *         .setDataTable(data)
+     *         .bind(control, chart)
+     *         .build();
      *
-     *        // Bind the control to the chart in a dashboard panel.
-     *        var dashboard = Charts.newDashboardPanel()
-     *          .setDataTable(data)
-     *          .bind(control, chart)
-     *          .build();
+     *       var uiApp = UiApp.createApplication().setTitle("My Dashboard");
      *
-     *        var uiApp = UiApp.createApplication().setTitle("My Dashboard");
+     *       var panel = uiApp.createHorizontalPanel()
+     *         .setVerticalAlignment(UiApp.VerticalAlignment.MIDDLE)
+     *         .setSpacing(50);
      *
-     *        var panel = uiApp.createHorizontalPanel()
-     *          .setVerticalAlignment(UiApp.VerticalAlignment.MIDDLE)
-     *          .setSpacing(50);
-     *
-     *        panel.add(control);
-     *        panel.add(chart);
-     *        dashboard.add(panel);
-     *        uiApp.add(dashboard);
-     *        return uiApp;
-     *      }
+     *       panel.add(control);
+     *       panel.add(chart);
+     *       dashboard.add(panel);
+     *       uiApp.add(dashboard);
+     *       return uiApp;
+     *     }
      */
     export interface DashboardPanel {
       getId(): string;
@@ -453,12 +458,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A builder for a dashboard panel object. For an example of how to use
-     *  DashboardPanelBuilder, refer to DashboardPanel.
+     * A builder for a dashboard panel object. For an example of how to use DashboardPanelBuilder, refer to DashboardPanel.
      *
-     *  For more details, see the Gviz
-     *
-     *  documentation.
+     * For more details, see the Gviz
+     * documentation.
      */
     export interface DashboardPanelBuilder {
       bind(control: Control, chart: Chart, controls: Control[], charts: Chart[]): DashboardPanelBuilder;
@@ -470,26 +473,26 @@ declare namespace GoogleAppsScript {
 
     /**
      * A Data Table to be used in charts. A DataTable can come from sources such as Google
-     *  Sheets or specified data-table URLs, or can be filled in by hand. This class intentionally has no
-     *  methods: a DataTable can be passed around, but not manipulated directly.
+     * Sheets or specified data-table URLs, or can be filled in by hand. This class intentionally has no
+     * methods: a DataTable can be passed around, but not manipulated directly.
      */
     export interface DataTable {
     }
 
     /**
-     * Builder of DataTable objects.  Building a data table consists of first specifying its columns,
-     *  and then adding its rows, one at a time.  Example:
+     * Builder of DataTable objects. Building a data table consists of first specifying its columns, and
+     * then adding its rows, one at a time. Example:
      *
-     *      var data = Charts.newDataTable()
-     *          .addColumn(Charts.ColumnType.STRING, "Month")
-     *          .addColumn(Charts.ColumnType.NUMBER, "In Store")
-     *          .addColumn(Charts.ColumnType.NUMBER, "Online")
-     *          .addRow(["January", 10, 1])
-     *          .addRow(["February", 12, 1])
-     *          .addRow(["March", 20, 2])
-     *          .addRow(["April", 25, 3])
-     *          .addRow(["May", 30, 4])
-     *          .build();
+     *     var data = Charts.newDataTable()
+     *         .addColumn(Charts.ColumnType.STRING, "Month")
+     *         .addColumn(Charts.ColumnType.NUMBER, "In Store")
+     *         .addColumn(Charts.ColumnType.NUMBER, "Online")
+     *         .addRow(["January", 10, 1])
+     *         .addRow(["February", 12, 1])
+     *         .addRow(["March", 20, 2])
+     *         .addRow(["April", 25, 3])
+     *         .addRow(["May", 30, 4])
+     *         .build();
      */
     export interface DataTableBuilder {
       addColumn(type: ColumnType, label: string): DataTableBuilder;
@@ -515,11 +518,11 @@ declare namespace GoogleAppsScript {
     /**
      * A data view definition for visualizing chart data.
      *
-     *  Data view definition can be set for charts to visualize a view derived from the given data table
-     *  and not the data table itself. For example if the view definition of a chart states that the view
-     *  columns are [0, 3], only the first and the third columns of the data table will be taken into
-     *  consideration when drawing the chart. See DataViewDefinitionBuilder for an example on how
-     *  to define and use a DataViewDefinition.
+     * Data view definition can be set for charts to visualize a view derived from the given data
+     * table and not the data table itself. For example if the view definition of a chart states that
+     * the view columns are [0, 3], only the first and the third columns of the data table will be taken
+     * into consideration when drawing the chart. See DataViewDefinitionBuilder for an example
+     * on how to define and use a DataViewDefinition.
      */
     export interface DataViewDefinition {
     }
@@ -527,34 +530,35 @@ declare namespace GoogleAppsScript {
     /**
      * Builder for DataViewDefinition objects.
      *
-     *  Here's an example of using the builder. The data is imported from a Google spreadsheet.
+     * Here's an example of using the builder. The data is imported
+     * from a Google spreadsheet.
      *
-     *      function doGet() {
-     *        // This example creates two table charts side by side. One uses a data view definition to
-     *        // restrict the number of displayed columns.
-     *        var app = UiApp.createApplication();
-     *        // Get sample data from a spreadsheet.
-     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
-     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *     function doGet() {
+     *       // This example creates two table charts side by side. One uses a data view definition to
+     *       // restrict the number of displayed columns.
+     *       var app = UiApp.createApplication();
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
      *
-     *        // Create a chart to display all of the data.
-     *        var originalChart = Charts.newTableChart()
-     *            .setDimensions(600, 500)
-     *            .setDataSourceUrl(dataSourceUrl)
-     *            .build();
+     *       // Create a chart to display all of the data.
+     *       var originalChart = Charts.newTableChart()
+     *           .setDimensions(600, 500)
+     *           .setDataSourceUrl(dataSourceUrl)
+     *           .build();
      *
-     *        // Create another chart to display a subset of the data (only columns 1 and 4).
-     *        var dataViewDefinition = Charts.newDataViewDefinition().setColumns([0, 3]);
-     *        var limitedChart = Charts.newTableChart()
-     *            .setDimensions(200, 500)
-     *            .setDataSourceUrl(dataSourceUrl)
-     *            .setDataViewDefinition(dataViewDefinition)
-     *            .build();
+     *       // Create another chart to display a subset of the data (only columns 1 and 4).
+     *       var dataViewDefinition = Charts.newDataViewDefinition().setColumns([0, 3]);
+     *       var limitedChart = Charts.newTableChart()
+     *           .setDimensions(200, 500)
+     *           .setDataSourceUrl(dataSourceUrl)
+     *           .setDataViewDefinition(dataViewDefinition)
+     *           .build();
      *
-     *        var panel = app.createHorizontalPanel().setSpacing(15);
-     *        panel.add(originalChart).add(limitedChart);
-     *        return app.add(panel);
-     *      }
+     *       var panel = app.createHorizontalPanel().setSpacing(15);
+     *       panel.add(originalChart).add(limitedChart);
+     *       return app.add(panel);
+     *     }
      */
     export interface DataViewDefinitionBuilder {
       build(): DataViewDefinition;
@@ -562,29 +566,27 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Builder for line charts. For more details, see the
-     *  Google Charts documentation.
+     * Builder for line charts. For more details, see the Google Charts documentation.
      *
-     *  Here is an example that shows how to build a line chart. The data is
-     *  imported from a Google spreadsheet.
+     * Here is an example that shows how to build a line chart. The data is imported from a Google spreadsheet.
      *
-     *      function doGet() {
-     *        // Get sample data from a spreadsheet.
-     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AG5' +
-     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=2&headers=-1';
+     *     function doGet() {
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AG5' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=2&headers=-1';
      *
-     *        var chartBuilder = Charts.newLineChart()
-     *            .setTitle('Yearly Rainfall')
-     *            .setXAxisTitle('Month')
-     *            .setYAxisTitle('Rainfall (in)')
-     *            .setDimensions(600, 500)
-     *            .setCurveStyle(Charts.CurveStyle.SMOOTH)
-     *            .setPointStyle(Charts.PointStyle.MEDIUM)
-     *            .setDataSourceUrl(dataSourceUrl);
+     *       var chartBuilder = Charts.newLineChart()
+     *           .setTitle('Yearly Rainfall')
+     *           .setXAxisTitle('Month')
+     *           .setYAxisTitle('Rainfall (in)')
+     *           .setDimensions(600, 500)
+     *           .setCurveStyle(Charts.CurveStyle.SMOOTH)
+     *           .setPointStyle(Charts.PointStyle.MEDIUM)
+     *           .setDataSourceUrl(dataSourceUrl);
      *
-     *        var chart = chartBuilder.build();
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       var chart = chartBuilder.build();
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface LineChartBuilder {
       build(): Chart;
@@ -614,61 +616,63 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enumeration of how a string value should be matched.
-     *  Matching a string is a boolean operation. Given a string, a match term (string), and a match
-     *  type, the operation will output true in the following cases:
+     * An enumeration of how a string value should be matched. Matching a string is a boolean operation.
+     * Given a string, a match term (string), and a match type, the operation will output true in the
+     * following cases:
      *
      * If the match type equals EXACT and the match term equals the string.
+     *
      * If the match type equals PREFIX and the match term is a prefix of the string.
+     *
      * If the match type equals ANY and the match term is a substring of the string.
      *
      * This enumeration can be used in by a string filter control to decide which rows to filter out
-     *  of the data table. Given a column to filter on, leave only the rows that match the value
-     *  entered in the filter input box, using one of the above matching types.
+     * of the data table. Given a column to filter on, leave only the rows that match the value entered
+     * in the filter input box, using one of the above matching types.
      */
     export enum MatchType { EXACT, PREFIX, ANY }
 
     /**
      * A builder for number range filter controls.
      *
-     *  A number range filter is a slider with two thumbs that lets the user select ranges of
-     *  numeric values. Given a column of type number and matching options, this control will
-     *  filter out the rows that don't match the range that was selected.
+     * A number range filter is a slider with two thumbs that lets the user select ranges of numeric
+     * values. Given a column of type number and matching options, this control will filter out the rows
+     * that don't match the range that was selected.
      *
-     *  This example creates a table chart bound to a number range filter:
+     * This example creates a table chart bound to a number range filter:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // Get sample data from a spreadsheet.
-     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
-     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
-     *        var data = SpreadsheetApp.openByUrl(dataSourceUrl).getSheetByName('US_GDP').getRange("A1:F");
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *       var data = SpreadsheetApp.openByUrl(dataSourceUrl).getSheetByName('US_GDP').getRange("A1:F");
      *
-     *        var chart = Charts.newTableChart()
-     *            .setDimensions(600, 500)
-     *            .build();
+     *       var chart = Charts.newTableChart()
+     *           .setDimensions(600, 500)
+     *           .build();
      *
-     *        var numberRangeFilter = Charts.newNumberRangeFilter()
-     *            .setFilterColumnLabel("Year")
-     *            .setShowRangeValues(true)
-     *            .setLabel("Restrict year range")
-     *            .build();
+     *       var numberRangeFilter = Charts.newNumberRangeFilter()
+     *           .setFilterColumnLabel("Year")
+     *           .setShowRangeValues(true)
+     *           .setLabel("Restrict year range")
+     *           .build();
      *
-     *        var panel = app.createVerticalPanel().setSpacing(10);
-     *        panel.add(numberRangeFilter).add(chart);
+     *       var panel = app.createVerticalPanel().setSpacing(10);
+     *       panel.add(numberRangeFilter).add(chart);
      *
-     *        // Create a new dashboard panel to bind the filter and chart together.
-     *        var dashboard = Charts.newDashboardPanel()
-     *            .setDataTable(data)
-     *            .bind(numberRangeFilter, chart)
-     *            .build();
+     *       // Create a new dashboard panel to bind the filter and chart together.
+     *       var dashboard = Charts.newDashboardPanel()
+     *           .setDataTable(data)
+     *           .bind(numberRangeFilter, chart)
+     *           .build();
      *
-     *        dashboard.add(panel);
-     *        app.add(dashboard);
-     *        return app;
-     *      }
+     *       dashboard.add(panel);
+     *       app.add(dashboard);
+     *       return app;
+     *     }
      *
-     *  documentation
+     * documentation
      */
     export interface NumberRangeFilterBuilder {
       build(): Control;
@@ -697,26 +701,24 @@ declare namespace GoogleAppsScript {
     export enum PickerValuesLayout { ASIDE, BELOW, BELOW_WRAPPING, BELOW_STACKED }
 
     /**
-     * A builder for pie charts. For more details, see the
-     *  Google Charts documentation.
+     * A builder for pie charts. For more details, see the Google Charts documentation.
      *
-     *  Here is an example that shows how to build a pie chart. The data is
-     *  imported from a Google spreadsheet.
+     * Here is an example that shows how to build a pie chart. The data is imported from a Google spreadsheet.
      *
-     *      function doGet() {
-     *        // Get sample data from a spreadsheet.
-     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AB8' +
-     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=3&headers=-1';
+     *     function doGet() {
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AB8' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=3&headers=-1';
      *
-     *        var chartBuilder = Charts.newPieChart()
-     *            .setTitle('World Population by Continent')
-     *            .setDimensions(600, 500)
-     *            .set3D()
-     *            .setDataSourceUrl(dataSourceUrl);
+     *       var chartBuilder = Charts.newPieChart()
+     *           .setTitle('World Population by Continent')
+     *           .setDimensions(600, 500)
+     *           .set3D()
+     *           .setDataSourceUrl(dataSourceUrl);
      *
-     *        var chart = chartBuilder.build();
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       var chart = chartBuilder.build();
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface PieChartBuilder {
       build(): Chart;
@@ -747,28 +749,26 @@ declare namespace GoogleAppsScript {
     export enum Position { TOP, RIGHT, BOTTOM, NONE }
 
     /**
-     * Builder for scatter charts. For more details, see the
-     *  Google Charts documentation.
+     * Builder for scatter charts. For more details, see the Google Charts documentation.
      *
-     *  Here is an example that shows how to build a scatter chart. The data is
-     *  imported from a Google spreadsheet.
+     * Here is an example that shows how to build a scatter chart. The data is imported from a Google spreadsheet.
      *
-     *      function doGet() {
-     *        // Get sample data from a spreadsheet.
-     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=C1%3AD' +
-     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *     function doGet() {
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=C1%3AD' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
      *
-     *        var chartBuilder = Charts.newScatterChart()
-     *            .setTitle('Adjusted GDP vs. U.S. Population')
-     *            .setXAxisTitle('U.S. Population (millions)')
-     *            .setYAxisTitle('Adjusted GDP ($ billions)')
-     *            .setDimensions(600, 500)
-     *            .setLegendPosition(Charts.Position.NONE)
-     *            .setDataSourceUrl(dataSourceUrl);
+     *       var chartBuilder = Charts.newScatterChart()
+     *           .setTitle('Adjusted GDP vs. U.S. Population')
+     *           .setXAxisTitle('U.S. Population (millions)')
+     *           .setYAxisTitle('Adjusted GDP ($ billions)')
+     *           .setDimensions(600, 500)
+     *           .setLegendPosition(Charts.Position.NONE)
+     *           .setDataSourceUrl(dataSourceUrl);
      *
-     *        var chart = chartBuilder.build();
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       var chart = chartBuilder.build();
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface ScatterChartBuilder {
       build(): Chart;
@@ -800,59 +800,59 @@ declare namespace GoogleAppsScript {
     /**
      * A builder for string filter controls.
      *
-     *  A string filter is a simple text input field that lets the user filter data via string matching.
-     *  Given a column of type string and matching options, this control will filter out the rows that
-     *  don't match the term that's in the input field.
+     * A string filter is a simple text input field that lets the user filter data via string
+     * matching. Given a column of type string and matching options, this control will filter out the
+     * rows that don't match the term that's in the input field.
      *
-     *  This example creates a table chart and binds it to a string filter. Using the filter, it is
-     *  possible to change the table chart to display a subset of its data.
+     * This example creates a table chart and binds it to a string filter. Using the filter, it is
+     * possible to change the table chart to display a subset of its data.
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var sampleData = Charts.newDataTable()
-     *            .addColumn(Charts.ColumnType.STRING, "Month")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Dining")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Total")
-     *            .addRow(["Jan", 60, 520])
-     *            .addRow(["Feb", 50, 430])
-     *            .addRow(["Mar", 53, 440])
-     *            .addRow(["Apr", 70, 410])
-     *            .addRow(["May", 80, 390])
-     *            .addRow(["Jun", 60, 500])
-     *            .addRow(["Jul", 100, 450])
-     *            .addRow(["Aug", 140, 431])
-     *            .addRow(["Sep", 75, 488])
-     *            .addRow(["Oct", 70, 521])
-     *            .addRow(["Nov", 58, 388])
-     *            .addRow(["Dec", 63, 400])
-     *            .build();
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var sampleData = Charts.newDataTable()
+     *           .addColumn(Charts.ColumnType.STRING, "Month")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Dining")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Total")
+     *           .addRow(["Jan", 60, 520])
+     *           .addRow(["Feb", 50, 430])
+     *           .addRow(["Mar", 53, 440])
+     *           .addRow(["Apr", 70, 410])
+     *           .addRow(["May", 80, 390])
+     *           .addRow(["Jun", 60, 500])
+     *           .addRow(["Jul", 100, 450])
+     *           .addRow(["Aug", 140, 431])
+     *           .addRow(["Sep", 75, 488])
+     *           .addRow(["Oct", 70, 521])
+     *           .addRow(["Nov", 58, 388])
+     *           .addRow(["Dec", 63, 400])
+     *           .build();
      *
-     *        var chart = Charts.newTableChart()
-     *            .setDimensions(600, 500)
-     *            .build();
+     *       var chart = Charts.newTableChart()
+     *           .setDimensions(600, 500)
+     *           .build();
      *
-     *        var stringFilter = Charts.newStringFilter()
-     *            .setFilterColumnLabel("Month")
-     *            .setRealtimeTrigger(true)
-     *            .setCaseSensitive(true)
-     *            .setLabel("Filter months shown")
-     *            .build();
+     *       var stringFilter = Charts.newStringFilter()
+     *           .setFilterColumnLabel("Month")
+     *           .setRealtimeTrigger(true)
+     *           .setCaseSensitive(true)
+     *           .setLabel("Filter months shown")
+     *           .build();
      *
-     *        var panel = app.createVerticalPanel().setSpacing(10);
-     *        panel.add(stringFilter).add(chart);
+     *       var panel = app.createVerticalPanel().setSpacing(10);
+     *       panel.add(stringFilter).add(chart);
      *
-     *        // Create a dashboard panel to bind the filter and the chart together.
-     *        var dashboard = Charts.newDashboardPanel()
-     *            .setDataTable(sampleData)
-     *            .bind(stringFilter, chart)
-     *            .build();
+     *       // Create a dashboard panel to bind the filter and the chart together.
+     *       var dashboard = Charts.newDashboardPanel()
+     *           .setDataTable(sampleData)
+     *           .bind(stringFilter, chart)
+     *           .build();
      *
-     *        dashboard.add(panel);
-     *        app.add(dashboard);
-     *        return app;
-     *      }
+     *       dashboard.add(panel);
+     *       app.add(dashboard);
+     *       return app;
+     *     }
      *
-     *  documentation
+     * documentation
      */
     export interface StringFilterBuilder {
       build(): Control;
@@ -869,25 +869,23 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A builder for table charts. For more details, see the
-     *  Google Charts documentation.
+     * A builder for table charts. For more details, see the Google Charts documentation.
      *
-     *  Here is an example that shows how to build a table chart. The data is
-     *  imported from a Google spreadsheet.
+     * Here is an example that shows how to build a table chart. The data is imported from a Google spreadsheet.
      *
-     *      function doGet() {
-     *        // Get sample data from a spreadsheet.
-     *        var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
-     *            '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
+     *     function doGet() {
+     *       // Get sample data from a spreadsheet.
+     *       var dataSourceUrl = 'https://docs.google.com/spreadsheet/tq?range=A1%3AF' +
+     *           '&key=0Aq4s9w_HxMs7dHpfX05JdmVSb1FpT21sbXd4NVE3UEE&gid=4&headers=-1';
      *
-     *        var chartBuilder = Charts.newTableChart()
-     *            .setDimensions(600, 500)
-     *            .enablePaging(20)
-     *            .setDataSourceUrl(dataSourceUrl);
+     *       var chartBuilder = Charts.newTableChart()
+     *           .setDimensions(600, 500)
+     *           .enablePaging(20)
+     *           .setDataSourceUrl(dataSourceUrl);
      *
-     *        var chart = chartBuilder.build();
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       var chart = chartBuilder.build();
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface TableChartBuilder {
       build(): Chart;
@@ -910,39 +908,39 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A text style configuration object. Used in charts options to configure text style for
-     *  elements that accepts it, such as title, horizontal axis, vertical axis, legend and tooltip.
+     * A text style configuration object. Used in charts options to configure text style for elements
+     * that accepts it, such as title, horizontal axis, vertical axis, legend and tooltip.
      *
-     *      // This example creates a chart specifying different text styles for the title and axes.
-     *      function doGet() {
-     *        var sampleData = Charts.newDataTable()
-     *            .addColumn(Charts.ColumnType.STRING, "Seasons")
-     *            .addColumn(Charts.ColumnType.NUMBER, "Rainy Days")
-     *            .addRow(["Winter", 5])
-     *            .addRow(["Spring", 12])
-     *            .addRow(["Summer", 8])
-     *            .addRow(["Fall", 8])
-     *            .build();
+     *     // This example creates a chart specifying different text styles for the title and axes.
+     *     function doGet() {
+     *       var sampleData = Charts.newDataTable()
+     *           .addColumn(Charts.ColumnType.STRING, "Seasons")
+     *           .addColumn(Charts.ColumnType.NUMBER, "Rainy Days")
+     *           .addRow(["Winter", 5])
+     *           .addRow(["Spring", 12])
+     *           .addRow(["Summer", 8])
+     *           .addRow(["Fall", 8])
+     *           .build();
      *
-     *        var titleTextStyleBuilder = Charts.newTextStyle()
-     *            .setColor('#0000FF').setFontSize(26).setFontName('Ariel');
-     *        var axisTextStyleBuilder = Charts.newTextStyle()
-     *            .setColor('#3A3A3A').setFontSize(20).setFontName('Ariel');
-     *        var titleTextStyle = titleTextStyleBuilder.build();
-     *        var axisTextStyle = axisTextStyleBuilder.build();
+     *       var titleTextStyleBuilder = Charts.newTextStyle()
+     *           .setColor('#0000FF').setFontSize(26).setFontName('Ariel');
+     *       var axisTextStyleBuilder = Charts.newTextStyle()
+     *           .setColor('#3A3A3A').setFontSize(20).setFontName('Ariel');
+     *       var titleTextStyle = titleTextStyleBuilder.build();
+     *       var axisTextStyle = axisTextStyleBuilder.build();
      *
-     *        var chart = Charts.newLineChart()
-     *            .setTitleTextStyle(titleTextStyle)
-     *            .setXAxisTitleTextStyle(axisTextStyle)
-     *            .setYAxisTitleTextStyle(axisTextStyle)
-     *            .setTitle('Rainy Days Per Season')
-     *            .setXAxisTitle('Season')
-     *            .setYAxisTitle('Number of Rainy Days')
-     *            .setDataTable(sampleData)
-     *            .build();
+     *       var chart = Charts.newLineChart()
+     *           .setTitleTextStyle(titleTextStyle)
+     *           .setXAxisTitleTextStyle(axisTextStyle)
+     *           .setYAxisTitleTextStyle(axisTextStyle)
+     *           .setTitle('Rainy Days Per Season')
+     *           .setXAxisTitle('Season')
+     *           .setYAxisTitle('Number of Rainy Days')
+     *           .setDataTable(sampleData)
+     *           .build();
      *
-     *        return UiApp.createApplication().add(chart);
-     *      }
+     *       return UiApp.createApplication().add(chart);
+     *     }
      */
     export interface TextStyle {
       getColor(): string;
@@ -952,15 +950,15 @@ declare namespace GoogleAppsScript {
 
     /**
      * A builder used to create TextStyle objects. It allows configuration of the text's
-     *  properties such as name, color, and size.
+     * properties such as name, color, and size.
      *
-     *  The following example shows how to create a text style using the builder. For a more complete
-     *  example, refer to the documentation for TextStyle.
+     * The following example shows how to create a text style using the builder. For a more complete
+     * example, refer to the documentation for TextStyle.
      *
-     *      // Creates a new text style that uses 26-point, blue, Ariel font.
-     *      var textStyleBuilder = Charts.newTextStyle()
-     *          .setColor('#0000FF').setFontName('Ariel').setFontSize(26);
-     *      var style = textStyleBuilder.build();
+     *     // Creates a new text style that uses 26-point, blue, Ariel font.
+     *     var textStyleBuilder = Charts.newTextStyle()
+     *         .setColor('#0000FF').setFontName('Ariel').setFontSize(26);
+     *     var style = textStyleBuilder.build();
      */
     export interface TextStyleBuilder {
       build(): TextStyle;
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 e0fa82d371..db794b543c 100644
--- a/types/google-apps-script/google-apps-script.contacts.d.ts
+++ b/types/google-apps-script/google-apps-script.contacts.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -133,7 +133,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * This class allows users to access their own Google Contacts and create, remove, and update
-     *  contacts listed therein.
+     * contacts listed therein.
      */
     export interface ContactsApp {
       ExtendedField: typeof ExtendedField;
@@ -199,9 +199,8 @@ declare namespace GoogleAppsScript {
      * A date field in a Contact.
      *
      * This class is only used by the Contacts service, and dates used elsewhere in App Script use
-     *  JavaScript's standard
-     *
-     *  Date object.
+     * JavaScript's standard
+     * Date object.
      */
     export interface DateField {
       deleteDateField(): void;
diff --git a/types/google-apps-script/google-apps-script.content.d.ts b/types/google-apps-script/google-apps-script.content.d.ts
index eaa3057a49..538a49aaf5 100644
--- a/types/google-apps-script/google-apps-script.content.d.ts
+++ b/types/google-apps-script/google-apps-script.content.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,11 +10,11 @@ declare namespace GoogleAppsScript {
     /**
      * Service for returning text content from a script.
      *
-     *  You can serve up text in various forms. For example, publish this script as a web app.
+     * You can serve up text in various forms. For example, publish this script as a web app.
      *
-     *      function doGet() {
-     *        return ContentService.createTextOutput("Hello World");
-     *      }
+     *     function doGet() {
+     *       return ContentService.createTextOutput("Hello World");
+     *     }
      */
     export interface ContentService {
       MimeType: typeof MimeType;
@@ -30,15 +30,15 @@ declare namespace GoogleAppsScript {
     /**
      * A TextOutput object that can be served from a script.
      *
-     *  Due to security considerations, scripts cannot directly return text content to a browser.
-     *  Instead, the browser is redirected to googleusercontent.com, which will display it without any
-     *  further sanitization or manipulation.
+     * Due to security considerations, scripts cannot directly return text content to a browser.
+     * Instead, the browser is redirected to googleusercontent.com, which will display it without any
+     * further sanitization or manipulation.
      *
-     *  You can return text content like this:
+     * You can return text content like this:
      *
-     *      function doGet() {
-     *        return ContentService.createTextOutput("hello world!");
-     *      }
+     *     function doGet() {
+     *       return ContentService.createTextOutput("hello world!");
+     *     }
      *
      * ContentService
      */
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 b0cc1c4e2a..7910710beb 100644
--- a/types/google-apps-script/google-apps-script.document.d.ts
+++ b/types/google-apps-script/google-apps-script.document.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -13,33 +13,31 @@ declare namespace GoogleAppsScript {
      *
      * Use attributes to compose custom styles. For example:
      *
-     *      // Define a style with yellow background.
-     *      var highlightStyle = {};
-     *      highlightStyle[DocumentApp.Attribute.BACKGROUND_COLOR] = '#FFFF00';
-     *      highlightStyle[DocumentApp.Attribute.BOLD] = true;
+     *     // Define a style with yellow background.
+     *     var highlightStyle = {};
+     *     highlightStyle[DocumentApp.Attribute.BACKGROUND_COLOR] = '#FFFF00';
+     *     highlightStyle[DocumentApp.Attribute.BOLD] = true;
      *
-     *      // Insert "Hello", highlighted.
-     *      DocumentApp.getActiveDocument().editAsText()
-     *        .insertText(0, 'Hello\n')
-     *        .setAttributes(0, 4, highlightStyle);
+     *     // Insert "Hello", highlighted.
+     *     DocumentApp.getActiveDocument().editAsText()
+     *       .insertText(0, 'Hello\n')
+     *       .setAttributes(0, 4, highlightStyle);
      */
     export enum Attribute { BACKGROUND_COLOR, BOLD, BORDER_COLOR, BORDER_WIDTH, CODE, FONT_FAMILY, FONT_SIZE, FOREGROUND_COLOR, HEADING, HEIGHT, HORIZONTAL_ALIGNMENT, INDENT_END, INDENT_FIRST_LINE, INDENT_START, ITALIC, GLYPH_TYPE, LEFT_TO_RIGHT, LINE_SPACING, LINK_URL, LIST_ID, MARGIN_BOTTOM, MARGIN_LEFT, MARGIN_RIGHT, MARGIN_TOP, NESTING_LEVEL, MINIMUM_HEIGHT, PADDING_BOTTOM, PADDING_LEFT, PADDING_RIGHT, PADDING_TOP, PAGE_HEIGHT, PAGE_WIDTH, SPACING_AFTER, SPACING_BEFORE, STRIKETHROUGH, UNDERLINE, VERTICAL_ALIGNMENT, WIDTH }
 
     /**
-     * An element representing a document body. The Body may contain ListItem,
-     *  Paragraph, Table, and TableOfContents elements. For more information on
-     *  document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a document body. The Body may contain ListItem, Paragraph, Table, and TableOfContents elements. For more information on document
+     * structure, see the guide to extending
+     * Google Docs.
      *
-     * The Body typically contains the full document contents except for the
-     *  HeaderSection, FooterSection, and any FootnoteSection elements.
+     * The Body typically contains the full document contents except for the HeaderSection, FooterSection, and any FootnoteSection elements.
      *
-     *      var doc = DocumentApp.getActiveDocument();
-     *      var body = doc.getBody();
+     *     var doc = DocumentApp.getActiveDocument();
+     *     var body = doc.getBody();
      *
-     *      // Append a paragraph and a page break to the document body section directly.
-     *      body.appendParagraph("A paragraph.");
-     *      body.appendPageBreak();
+     *     // Append a paragraph and a page break to the document body section directly.
+     *     body.appendParagraph("A paragraph.");
+     *     body.appendPageBreak();
      */
     export interface Body {
       appendHorizontalRule(): HorizontalRule;
@@ -115,11 +113,11 @@ declare namespace GoogleAppsScript {
     /**
      * An object representing a bookmark.
      *
-     *      // Insert a bookmark at the cursor position and log its ID.
-     *      var doc = DocumentApp.getActiveDocument();
-     *      var cursor = doc.getCursor();
-     *      var bookmark = doc.addBookmark(cursor);
-     *      Logger.log(bookmark.getId());
+     *     // Insert a bookmark at the cursor position and log its ID.
+     *     var doc = DocumentApp.getActiveDocument();
+     *     var cursor = doc.getCursor();
+     *     var bookmark = doc.addBookmark(cursor);
+     *     Logger.log(bookmark.getId());
      */
     export interface Bookmark {
       getId(): string;
@@ -129,7 +127,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * A generic element that may contain other elements. All elements that may contain child elements,
-     *  such as Paragraph, inherit from ContainerElement.
+     * such as Paragraph, inherit from ContainerElement.
      */
     export interface ContainerElement {
       asBody(): Body;
@@ -175,11 +173,11 @@ declare namespace GoogleAppsScript {
      *
      * Documents may be opened or created using DocumentApp.
      *
-     *      // Open a document by ID.
-     *      var doc = DocumentApp.openById("<my-id>");
+     *     // Open a document by ID.
+     *     var doc = DocumentApp.openById("<my-id>");
      *
-     *      // Create and open a document.
-     *      doc = DocumentApp.create("Document Title");
+     *     // Create and open a document.
+     *     doc = DocumentApp.create("Document Title");
      */
     export interface Document {
       addBookmark(position: Position): Bookmark;
@@ -225,11 +223,11 @@ declare namespace GoogleAppsScript {
     /**
      * The document service creates and opens Documents that can be edited.
      *
-     *      // Open a document by ID.
-     *      var doc = DocumentApp.openById('DOCUMENT_ID_GOES_HERE');
+     *     // Open a document by ID.
+     *     var doc = DocumentApp.openById('DOCUMENT_ID_GOES_HERE');
      *
-     *      // Create and open a document.
-     *      doc = DocumentApp.create('Document Name');
+     *     // Create and open a document.
+     *     doc = DocumentApp.create('Document Name');
      */
     export interface DocumentApp {
       Attribute: typeof Attribute;
@@ -250,9 +248,8 @@ declare namespace GoogleAppsScript {
 
     /**
      * A generic element. Document contents are
-     *  represented as elements. For example, ListItem, Paragraph, and Table
-     *  are elements and inherit all of the methods defined by Element, such as
-     *  getType().
+     * represented as elements. For example, ListItem, Paragraph, and Table are
+     * elements and inherit all of the methods defined by Element, such as getType().
      * Implementing classes
      *
      * NameBrief description
@@ -300,7 +297,7 @@ declare namespace GoogleAppsScript {
      * TextAn element representing a rich text region.
      *
      * UnsupportedElementAn element representing a region that is unknown or cannot be affected by a script, such as a
-     *  page number.
+     * page number.
      */
     export interface Element {
       asBody(): Body;
@@ -338,22 +335,20 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration of all the element types.
      *
-     * Use the ElementType enumeration to check the type of a given
-     *  element, for instance:
+     * Use the ElementType enumeration to check the type of a given element, for instance:
      *
-     *      var firstChild = DocumentApp.getActiveDocument().getBody().getChild(0);
-     *      if (firstChild.getType() == DocumentApp.ElementType.PARAGRAPH) {
-     *        // It's a paragraph, apply a paragraph heading.
-     *        firstChild.asParagraph().setHeading(DocumentApp.ParagraphHeading.HEADING1);
-     *      }
+     *     var firstChild = DocumentApp.getActiveDocument().getBody().getChild(0);
+     *     if (firstChild.getType() == DocumentApp.ElementType.PARAGRAPH) {
+     *       // It's a paragraph, apply a paragraph heading.
+     *       firstChild.asParagraph().setHeading(DocumentApp.ParagraphHeading.HEADING1);
+     *     }
      */
     export enum ElementType { BODY_SECTION, COMMENT_SECTION, DOCUMENT, EQUATION, EQUATION_FUNCTION, EQUATION_FUNCTION_ARGUMENT_SEPARATOR, EQUATION_SYMBOL, FOOTER_SECTION, FOOTNOTE, FOOTNOTE_SECTION, HEADER_SECTION, HORIZONTAL_RULE, INLINE_DRAWING, INLINE_IMAGE, LIST_ITEM, PAGE_BREAK, PARAGRAPH, TABLE, TABLE_CELL, TABLE_OF_CONTENTS, TABLE_ROW, TEXT, UNSUPPORTED }
 
     /**
-     * An element representing a mathematical expression. An Equation may contain
-     *  EquationFunction, EquationSymbol, and Text elements.  For more
-     *  information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a mathematical expression. An Equation may contain EquationFunction, EquationSymbol, and Text elements. For more information on
+     * document structure, see the guide to
+     * extending Google Docs.
      */
     export interface Equation {
       clear(): Equation;
@@ -384,11 +379,8 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a function in a mathematical Equation. An
-     *  EquationFunction may contain EquationFunction,
-     *  EquationFunctionArgumentSeparator, EquationSymbol, and Text elements. For
-     *  more information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a function in a mathematical Equation. An EquationFunction may contain EquationFunction, EquationFunctionArgumentSeparator, EquationSymbol, and Text elements. For more
+     * information on document structure, see the guide to extending Google Docs.
      */
     export interface EquationFunction {
       clear(): EquationFunction;
@@ -420,10 +412,9 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a function separator in a mathematical Equation. An
-     *  EquationFunctionArgumentSeparator cannot contain any other element. For more information
-     *  on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a function separator in a mathematical Equation. An EquationFunctionArgumentSeparator cannot contain any other element. For more information on
+     * document structure, see the guide to
+     * extending Google Docs.
      */
     export interface EquationFunctionArgumentSeparator {
       copy(): EquationFunctionArgumentSeparator;
@@ -440,8 +431,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * An element representing a symbol in a mathematical Equation. An EquationSymbol
-     *  cannot contain any other element. For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * cannot contain any other element. For more information on document structure, see the guide to extending Google Docs.
      */
     export interface EquationSymbol {
       copy(): EquationSymbol;
@@ -459,39 +449,36 @@ declare namespace GoogleAppsScript {
 
     /**
      *
-     * 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.
+     * Deprecated. The methods getFontFamily() and setFontFamily(String) now use string
+     *     names for fonts instead of this enum. Although this enum is deprecated, it will remain
+     *     available for compatibility with older scripts.
      * An enumeration of the supported fonts.
      *
-     * Use the FontFamily enumeration to set the font for a range of
-     *  text, element or document.
+     * Use the FontFamily enumeration to set the font for a range of text, element or
+     * document.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Insert a paragraph at the start of the document.
-     *      body.insertParagraph(0, "Hello, Apps Script!");
+     *     // Insert a paragraph at the start of the document.
+     *     body.insertParagraph(0, "Hello, Apps Script!");
      *
-     *      // Set the document font to Calibri.
-     *      body.editAsText().setFontFamily(DocumentApp.FontFamily.CALIBRI);
+     *     // Set the document font to Calibri.
+     *     body.editAsText().setFontFamily(DocumentApp.FontFamily.CALIBRI);
      *
-     *      // Set the first paragraph font to Arial.
-     *      body.getParagraphs()[0].setFontFamily(DocumentApp.FontFamily.ARIAL);
+     *     // Set the first paragraph font to Arial.
+     *     body.getParagraphs()[0].setFontFamily(DocumentApp.FontFamily.ARIAL);
      *
-     *      // Set "Apps Script" to Comic Sans MS.
-     *      var text = 'Apps Script';
-     *      var a = body.getText().indexOf(text);
-     *      var b = a + text.length - 1;
-     *      body.editAsText().setFontFamily(a, b, DocumentApp.FontFamily.COMIC_SANS_MS);
+     *     // Set "Apps Script" to Comic Sans MS.
+     *     var text = 'Apps Script';
+     *     var a = body.getText().indexOf(text);
+     *     var b = a + text.length - 1;
+     *     body.editAsText().setFontFamily(a, b, DocumentApp.FontFamily.COMIC_SANS_MS);
      */
     export enum FontFamily { AMARANTH, ARIAL, ARIAL_BLACK, ARIAL_NARROW, ARVO, CALIBRI, CAMBRIA, COMIC_SANS_MS, CONSOLAS, CORSIVA, COURIER_NEW, DANCING_SCRIPT, DROID_SANS, DROID_SERIF, GARAMOND, GEORGIA, GLORIA_HALLELUJAH, GREAT_VIBES, LOBSTER, MERRIWEATHER, PACIFICO, PHILOSOPHER, POIRET_ONE, QUATTROCENTO, ROBOTO, SHADOWS_INTO_LIGHT, SYNCOPATE, TAHOMA, TIMES_NEW_ROMAN, TREBUCHET_MS, UBUNTU, VERDANA }
 
     /**
-     * An element representing a footer section. A
-     *  Document typically contains at most one
-     *  FooterSection. The FooterSection may contain ListItem, Paragraph,
-     *  and Table elements. For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a footer section. A Document typically contains at most one FooterSection. The FooterSection may contain ListItem, Paragraph, and
+     * Table elements. For more information on document structure, see the guide to extending Google Docs.
      */
     export interface FooterSection {
       appendHorizontalRule(): HorizontalRule;
@@ -549,10 +536,10 @@ declare namespace GoogleAppsScript {
 
     /**
      * An element representing a footnote. Each Footnote is contained within a ListItem
-     *  or Paragraph and has a corresponding FootnoteSection element for the footnote's
-     *  contents. The Footnote itself cannot contain any other element. For more information on
-     *  document structure, see the
-     *  guide to extending Google Docs.
+     * or Paragraph and has a corresponding FootnoteSection element for the footnote's
+     * contents. The Footnote itself cannot contain any other element. For more information on
+     * document structure, see the guide to
+     * extending Google Docs.
      */
     export interface Footnote {
       copy(): Footnote;
@@ -569,9 +556,8 @@ declare namespace GoogleAppsScript {
 
     /**
      * An element representing a footnote section. A FootnoteSection contains the text that
-     *  corresponds to a Footnote. The FootnoteSection may contain ListItem or
-     *  Paragraph elements. For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * corresponds to a Footnote. The FootnoteSection may contain ListItem or
+     * Paragraph elements. For more information on document structure, see the guide to extending Google Docs.
      */
     export interface FootnoteSection {
       appendParagraph(paragraph: Paragraph): Paragraph;
@@ -611,28 +597,23 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration of the supported glyph types.
      *
-     * Use the GlyphType enumeration to set the bullet type for list
-     *  items.
+     * Use the GlyphType enumeration to set the bullet type for list items.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Insert at list item, with the default nesting level of zero.
-     *       body.appendListItem("Item 1");
+     *     // Insert at list item, with the default nesting level of zero.
+     *      body.appendListItem("Item 1");
      *
-     *       // Append a second list item, with a nesting level of one, indented one inch.
-     *       // The two items will have different bullet glyphs.
-     *       body.appendListItem("Item 2").setNestingLevel(1).setIndentStart(72)
-     *           .setGlyphType(DocumentApp.GlyphType.SQUARE_BULLET);
+     *      // Append a second list item, with a nesting level of one, indented one inch.
+     *      // The two items will have different bullet glyphs.
+     *      body.appendListItem("Item 2").setNestingLevel(1).setIndentStart(72)
+     *          .setGlyphType(DocumentApp.GlyphType.SQUARE_BULLET);
      */
     export enum GlyphType { BULLET, HOLLOW_BULLET, SQUARE_BULLET, NUMBER, LATIN_UPPER, LATIN_LOWER, ROMAN_UPPER, ROMAN_LOWER }
 
     /**
-     * An element representing a header section. A
-     *  Document typically
-     *  contains at most one HeaderSection. The HeaderSection may contain
-     *  ListItem, Paragraph, and Table elements. For more information on document
-     *  structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a header section. A Document typically contains at most one HeaderSection. The HeaderSection may contain ListItem, Paragraph, and
+     * Table elements. For more information on document structure, see the guide to extending Google Docs.
      */
     export interface HeaderSection {
       appendHorizontalRule(): HorizontalRule;
@@ -691,33 +672,31 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration of the supported horizontal alignment types.
      *
-     * Use the HorizontalAlignment enumeration to manipulate the
-     *  alignment of Paragraph contents.
+     * Use the HorizontalAlignment enumeration to manipulate the alignment of Paragraph contents.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Insert a paragraph and a table at the start of document.
-     *      var par1 = body.insertParagraph(0, "Center");
-     *      var table = body.insertTable(1, [['Left', 'Right']]);
-     *      var par2 = table.getCell(0, 0).getChild(0).asParagraph();
-     *      var par3 = table.getCell(0, 0).getChild(0).asParagraph();
+     *     // Insert a paragraph and a table at the start of document.
+     *     var par1 = body.insertParagraph(0, "Center");
+     *     var table = body.insertTable(1, [['Left', 'Right']]);
+     *     var par2 = table.getCell(0, 0).getChild(0).asParagraph();
+     *     var par3 = table.getCell(0, 0).getChild(0).asParagraph();
      *
-     *      // Center align the first paragraph.
-     *      par1.setAlignment(DocumentApp.HorizontalAlignment.CENTER);
+     *     // Center align the first paragraph.
+     *     par1.setAlignment(DocumentApp.HorizontalAlignment.CENTER);
      *
-     *      // Left align the first cell.
-     *      par2.setAlignment(DocumentApp.HorizontalAlignment.LEFT);
+     *     // Left align the first cell.
+     *     par2.setAlignment(DocumentApp.HorizontalAlignment.LEFT);
      *
-     *      // Right align the second cell.
-     *      par3.setAlignment(DocumentApp.HorizontalAlignment.RIGHT);
+     *     // Right align the second cell.
+     *     par3.setAlignment(DocumentApp.HorizontalAlignment.RIGHT);
      */
     export enum HorizontalAlignment { LEFT, CENTER, RIGHT, JUSTIFY }
 
     /**
      * An element representing an horizontal rule. A HorizontalRule can be contained within a
-     *  ListItem or Paragraph, but cannot itself contain any other element. For more
-     *  information on document structure, see the
-     *  guide to extending Google Docs.
+     * ListItem or Paragraph, but cannot itself contain any other element. For more
+     * information on document structure, see the guide to extending Google Docs.
      */
     export interface HorizontalRule {
       copy(): HorizontalRule;
@@ -733,10 +712,9 @@ declare namespace GoogleAppsScript {
 
     /**
      * An element representing an embedded drawing. An InlineDrawing can be contained within a
-     *  ListItem or Paragraph, unless the ListItem or Paragraph is within
-     *  a FootnoteSection. An InlineDrawing cannot itself contain any other element. For
-     *  more information on document structure, see the
-     *  guide to extending Google Docs.
+     * ListItem or Paragraph, unless the ListItem or Paragraph is within
+     * a FootnoteSection. An InlineDrawing cannot itself contain any other element. For
+     * more information on document structure, see the guide to extending Google Docs.
      */
     export interface InlineDrawing {
       copy(): InlineDrawing;
@@ -757,10 +735,9 @@ declare namespace GoogleAppsScript {
 
     /**
      * An element representing an embedded image. An InlineImage can be contained within a
-     *  ListItem or Paragraph, unless the ListItem or Paragraph is within
-     *  a FootnoteSection. An InlineImage cannot itself contain any other element. For
-     *  more information on document structure, see the
-     *  guide to extending Google Docs.
+     * ListItem or Paragraph, unless the ListItem or Paragraph is within
+     * a FootnoteSection. An InlineImage cannot itself contain any other element. For
+     * more information on document structure, see the guide to extending Google Docs.
      */
     export interface InlineImage {
       copy(): InlineImage;
@@ -788,37 +765,35 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a list item. A ListItem is a Paragraph that is
-     *  associated with a list ID. A ListItem may contain Equation, Footnote,
-     *  HorizontalRule, InlineDrawing, InlineImage, PageBreak, and
-     *  Text elements. For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a list item. A ListItem is a Paragraph that is associated
+     * with a list ID. A ListItem may contain Equation, Footnote, HorizontalRule, InlineDrawing, InlineImage, PageBreak, and Text
+     * elements. For more information on document structure, see the guide to extending Google Docs.
      *
      * ListItems may not contain new-line characters. New-line characters ("\n") are
-     *  converted to line-break characters ("\r").
+     * converted to line-break characters ("\r").
      *
      * ListItems with the same list ID belong to the same list and are numbered accordingly.
-     *  The ListItems for a given list are not required to be adjacent in the document or even
-     *  have the same parent element. Two items belonging to the same list may exist anywhere in the
-     *  document while maintaining consecutive numbering, as the following example illustrates:
+     * The ListItems for a given list are not required to be adjacent in the document or even
+     * have the same parent element. Two items belonging to the same list may exist anywhere in the
+     * document while maintaining consecutive numbering, as the following example illustrates:
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Append a new list item to the body.
-     *      var item1 = body.appendListItem('Item 1');
+     *     // Append a new list item to the body.
+     *     var item1 = body.appendListItem('Item 1');
      *
-     *      // Log the new list item's list ID.
-     *      Logger.log(item1.getListId());
+     *     // Log the new list item's list ID.
+     *     Logger.log(item1.getListId());
      *
-     *      // Append a table after the list item.
-     *      body.appendTable([
-     *        ['Cell 1', 'Cell 2']
-     *      ]);
+     *     // Append a table after the list item.
+     *     body.appendTable([
+     *       ['Cell 1', 'Cell 2']
+     *     ]);
      *
-     *      // Append a second list item with the same list ID. The two items are treated as the same list,
-     *      // despite not being consecutive.
-     *      var item2 = body.appendListItem('Item 2');
-     *      item2.setListId(item1);
+     *     // Append a second list item with the same list ID. The two items are treated as the same list,
+     *     // despite not being consecutive.
+     *     var item2 = body.appendListItem('Item 2');
+     *     item2.setListId(item1);
      */
     export interface ListItem {
       addPositionedImage(image: Base.BlobSource): PositionedImage;
@@ -894,21 +869,21 @@ declare namespace GoogleAppsScript {
 
     /**
      * A Range that has a name and ID to allow later retrieval. Names are not
-     *  necessarily unique; several different ranges in the same document may share the same name, much
-     *  like a class in HTML. By contrast, IDs are unique within the document, like an ID in HTML. Once a
-     *  NamedRange has been added to a document, it cannot be modified, only removed.
+     * necessarily unique; several different ranges in the same document may share the same name, much
+     * like a class in HTML. By contrast, IDs are unique within the document, like an ID in HTML. Once a
+     * NamedRange has been added to a document, it cannot be modified, only removed.
      *
      * A NamedRange can be accessed by any script that accesses the document. To avoid
-     *  unintended conflicts between scripts, consider prefixing range names with a unique string.
+     * unintended conflicts between scripts, consider prefixing range names with a unique string.
      *
-     *      // Create a named range that includes every table in the document.
-     *      var doc = DocumentApp.getActiveDocument();
-     *      var rangeBuilder = doc.newRange();
-     *      var tables = doc.getBody().getTables();
-     *      for (var i = 0; i < tables.length; i++) {
-     *        rangeBuilder.addElement(tables[i]);
-     *      }
-     *      doc.addNamedRange('myUniquePrefix-tables', rangeBuilder.build());
+     *     // Create a named range that includes every table in the document.
+     *     var doc = DocumentApp.getActiveDocument();
+     *     var rangeBuilder = doc.newRange();
+     *     var tables = doc.getBody().getTables();
+     *     for (var i = 0; i < tables.length; i++) {
+     *       rangeBuilder.addElement(tables[i]);
+     *     }
+     *     doc.addNamedRange('myUniquePrefix-tables', rangeBuilder.build());
      */
     export interface NamedRange {
       getId(): string;
@@ -918,12 +893,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a page break. A PageBreak can be contained within a
-     *  ListItem or Paragraph, unless the ListItem or Paragraph is within
-     *  a Table, HeaderSection, FooterSection, or FootnoteSection. A
-     *  PageBreak cannot itself contain any other element. For more information on document
-     *  structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a page break. A PageBreak can be contained within a ListItem or Paragraph, unless the ListItem or Paragraph is within a
+     * Table, HeaderSection, FooterSection, or FootnoteSection. A PageBreak cannot itself contain any other element. For more information on document structure,
+     * see the guide to extending Google
+     * Docs.
      */
     export interface PageBreak {
       copy(): PageBreak;
@@ -938,26 +911,24 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a paragraph. A Paragraph may contain Equation,
-     *  Footnote, HorizontalRule, InlineDrawing, InlineImage,
-     *  PageBreak, and Text elements. For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a paragraph. A Paragraph may contain Equation, Footnote, HorizontalRule, InlineDrawing, InlineImage, PageBreak,
+     * and Text elements. For more information on document structure, see the guide to extending Google Docs.
      *
      * Paragraphs may not contain new-line characters. New-line characters ("\n") are
-     *  converted to line-break characters ("\r").
+     * converted to line-break characters ("\r").
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Append a document header paragraph.
-     *      var header = body.appendParagraph("A Document");
-     *      header.setHeading(DocumentApp.ParagraphHeading.HEADING1);
+     *     // Append a document header paragraph.
+     *     var header = body.appendParagraph("A Document");
+     *     header.setHeading(DocumentApp.ParagraphHeading.HEADING1);
      *
-     *      // Append a section header paragraph.
-     *      var section = body.appendParagraph("Section 1");
-     *      section.setHeading(DocumentApp.ParagraphHeading.HEADING2);
+     *     // Append a section header paragraph.
+     *     var section = body.appendParagraph("Section 1");
+     *     section.setHeading(DocumentApp.ParagraphHeading.HEADING2);
      *
-     *      // Append a regular paragraph.
-     *      body.appendParagraph("This is a typical paragraph.");
+     *     // Append a regular paragraph.
+     *     body.appendParagraph("This is a typical paragraph.");
      */
     export interface Paragraph {
       addPositionedImage(image: Base.BlobSource): PositionedImage;
@@ -1028,45 +999,43 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration of the standard paragraph headings.
      *
-     * Use the ParagraphHeading enumeration to configure
-     *  the heading style for ParagraphElement.
+     * Use the ParagraphHeading enumeration to configure the heading style for ParagraphElement.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Append a paragraph, with heading 1.
-     *      var par1 = body.appendParagraph("Title");
-     *      par1.setHeading(DocumentApp.ParagraphHeading.HEADING1);
+     *     // Append a paragraph, with heading 1.
+     *     var par1 = body.appendParagraph("Title");
+     *     par1.setHeading(DocumentApp.ParagraphHeading.HEADING1);
      *
-     *      // Append a paragraph, with heading 2.
-     *      var par2 = body.appendParagraph("SubTitle");
-     *      par2.setHeading(DocumentApp.ParagraphHeading.HEADING2);
+     *     // Append a paragraph, with heading 2.
+     *     var par2 = body.appendParagraph("SubTitle");
+     *     par2.setHeading(DocumentApp.ParagraphHeading.HEADING2);
      *
-     *      // Append a paragraph, with normal heading.
-     *      var par3 = body.appendParagraph("Text");
-     *      par3.setHeading(DocumentApp.ParagraphHeading.NORMAL);
+     *     // Append a paragraph, with normal heading.
+     *     var par3 = body.appendParagraph("Text");
+     *     par3.setHeading(DocumentApp.ParagraphHeading.NORMAL);
      */
     export enum ParagraphHeading { NORMAL, HEADING1, HEADING2, HEADING3, HEADING4, HEADING5, HEADING6, TITLE, SUBTITLE }
 
     /**
      * A reference to a location in the document, relative to a specific element. The user's cursor is
-     *  represented as a Position, among other uses. Scripts can only access the cursor of the
-     *  user who is running the script, and only if the script is
-     *  bound to the document.
+     * represented as a Position, among other uses. Scripts can only access the cursor of the
+     * user who is running the script, and only if the script is bound to the document.
      *
-     *      // Insert some text at the cursor position and make it bold.
-     *      var cursor = DocumentApp.getActiveDocument().getCursor();
-     *      if (cursor) {
-     *        // Attempt to insert text at the cursor position. If the insertion returns null, the cursor's
-     *        // containing element doesn't allow insertions, so show the user an error message.
-     *        var element = cursor.insertText('ಠ‿ಠ');
-     *        if (element) {
-     *          element.setBold(true);
-     *        } else {
-     *          DocumentApp.getUi().alert('Cannot insert text here.');
-     *        }
-     *      } else {
-     *        DocumentApp.getUi().alert('Cannot find a cursor.');
-     *      }
+     *     // Insert some text at the cursor position and make it bold.
+     *     var cursor = DocumentApp.getActiveDocument().getCursor();
+     *     if (cursor) {
+     *       // Attempt to insert text at the cursor position. If the insertion returns null, the cursor's
+     *       // containing element doesn't allow insertions, so show the user an error message.
+     *       var element = cursor.insertText('ಠ‿ಠ');
+     *       if (element) {
+     *         element.setBold(true);
+     *       } else {
+     *         DocumentApp.getUi().alert('Cannot insert text here.');
+     *       }
+     *     } else {
+     *       DocumentApp.getUi().alert('Cannot find a cursor.');
+     *     }
      */
     export interface Position {
       getElement(): Element;
@@ -1079,29 +1048,24 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Fixed position image anchored to a Paragraph.
-     *  Unlike an InlineImage,
-     *  a PositionedImage is not an
-     *  Element.
-     *  It does not have a parent or sibling
-     *  Element.
-     *  Instead, it is anchored to a Paragraph
-     *  or ListItem,
-     *  and is placed via offsets from that anchor. A PositionedImage
-     *  has an ID that can be used to reference it.
+     * Fixed position image anchored to a Paragraph. Unlike an InlineImage, a PositionedImage is
+     * not an Element. It does not have a
+     * parent or sibling Element. Instead,
+     * it is anchored to a Paragraph or ListItem, and is placed via offsets from
+     * that anchor. A PositionedImage has an ID that can be used to reference it.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Append a new paragraph.
-     *      var paragraph = body.appendParagraph("New paragraph to anchor the image to.");
+     *     // Append a new paragraph.
+     *     var paragraph = body.appendParagraph("New paragraph to anchor the image to.");
+     *     *
+     *     // Get an image in Drive from its ID.
+     *     var image = DriveApp.getFileById('ENTER_IMAGE_FILE_ID_HERE').getBlob();
      *
-     *      // Get an image in Drive from its ID.
-     *      var image = DriveApp.getFileById('ENTER_IMAGE_FILE_ID_HERE').getBlob();
-     *
-     *      // Add the PositionedImage with offsets (in points).
-     *      var posImage = paragraph.addPositionedImage(image)
-     *          .setTopOffset(60)
-     *          .setLeftOffset(40);
+     *     // Add the PositionedImage with offsets (in points).
+     *     var posImage = paragraph.addPositionedImage(image)
+     *         .setTopOffset(60)
+     *         .setLeftOffset(40);
      */
     export interface PositionedImage {
       getAs(contentType: string): Base.Blob;
@@ -1121,37 +1085,36 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enumeration that specifies how to lay out a PositionedImage in
-     *  relation to surrounding text.
+     * An enumeration that specifies how to lay out a PositionedImage in relation to surrounding
+     * text.
      */
     export enum PositionedLayout { ABOVE_TEXT, BREAK_BOTH, BREAK_LEFT, BREAK_RIGHT, WRAP_TEXT }
 
     /**
-     * A range of elements in a document. The user's selection is represented as a
-     *  Range, among other uses. Scripts can only access the selection of the user who is running
-     *  the script, and only if the script is
-     *  bound to the document.
+     * A range of elements in a document. The user's selection is represented as a Range, among
+     * other uses. Scripts can only access the selection of the user who is running the script, and only
+     * if the script is bound to the document.
      *
-     *      // Bold all selected text.
-     *      var selection = DocumentApp.getActiveDocument().getSelection();
-     *      if (selection) {
-     *        var elements = selection.getRangeElements();
-     *        for (var i = 0; i < elements.length; i++) {
-     *          var element = elements[i];
+     *     // Bold all selected text.
+     *     var selection = DocumentApp.getActiveDocument().getSelection();
+     *     if (selection) {
+     *       var elements = selection.getRangeElements();
+     *       for (var i = 0; i < elements.length; i++) {
+     *         var element = elements[i];
      *
-     *          // Only modify elements that can be edited as text; skip images and other non-text elements.
-     *          if (element.getElement().editAsText) {
-     *            var text = element.getElement().editAsText();
+     *         // Only modify elements that can be edited as text; skip images and other non-text elements.
+     *         if (element.getElement().editAsText) {
+     *           var text = element.getElement().editAsText();
      *
-     *            // Bold the selected part of the element, or the full element if it's completely selected.
-     *            if (element.isPartial()) {
-     *              text.setBold(element.getStartOffset(), element.getEndOffsetInclusive(), true);
-     *            } else {
-     *              text.setBold(true);
-     *            }
-     *          }
-     *        }
-     *      }
+     *           // Bold the selected part of the element, or the full element if it's completely selected.
+     *           if (element.isPartial()) {
+     *             text.setBold(element.getStartOffset(), element.getEndOffsetInclusive(), true);
+     *           } else {
+     *             text.setBold(true);
+     *           }
+     *         }
+     *       }
+     *     }
      */
     export interface Range {
       getRangeElements(): RangeElement[];
@@ -1161,14 +1124,14 @@ declare namespace GoogleAppsScript {
     /**
      * A builder used to construct Range objects from document elements.
      *
-     *      // Change the user's selection to a range that includes every table in the document.
-     *      var doc = DocumentApp.getActiveDocument();
-     *      var rangeBuilder = doc.newRange();
-     *      var tables = doc.getBody().getTables();
-     *      for (var i = 0; i < tables.length; i++) {
-     *        rangeBuilder.addElement(tables[i]);
-     *      }
-     *      doc.setSelection(rangeBuilder.build());
+     *     // Change the user's selection to a range that includes every table in the document.
+     *     var doc = DocumentApp.getActiveDocument();
+     *     var rangeBuilder = doc.newRange();
+     *     var tables = doc.getBody().getTables();
+     *     for (var i = 0; i < tables.length; i++) {
+     *       rangeBuilder.addElement(tables[i]);
+     *     }
+     *     doc.setSelection(rangeBuilder.build());
      */
     export interface RangeBuilder {
       addElement(element: Element): RangeBuilder;
@@ -1183,8 +1146,8 @@ declare namespace GoogleAppsScript {
 
     /**
      * A wrapper around an Element with a possible start and end offset. These offsets allow a
-     *  range of characters within a Text
-     *  element to be represented in search results, document selections, and named ranges.
+     * range of characters within a Text
+     * element to be represented in search results, document selections, and named ranges.
      */
     export interface RangeElement {
       getElement(): Element;
@@ -1195,22 +1158,21 @@ declare namespace GoogleAppsScript {
 
     /**
      * An element representing a table. A Table may only contain TableRow elements. For
-     *  more information on document structure, see the
-     *  guide to extending Google Docs.
+     * more information on document structure, see the guide to extending Google Docs.
      *
      * When creating a Table that contains a large number of rows or cells, consider building
-     *  it from a string array, as shown in the following example.
+     * it from a string array, as shown in the following example.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Create a two-dimensional array containing the cell contents.
-     *      var cells = [
-     *        ['Row 1, Cell 1', 'Row 1, Cell 2'],
-     *        ['Row 2, Cell 1', 'Row 2, Cell 2']
-     *      ];
+     *     // Create a two-dimensional array containing the cell contents.
+     *     var cells = [
+     *       ['Row 1, Cell 1', 'Row 1, Cell 2'],
+     *       ['Row 2, Cell 1', 'Row 2, Cell 2']
+     *     ];
      *
-     *      // Build a table from the array.
-     *      body.appendTable(cells);
+     *     // Build a table from the array.
+     *     body.appendTable(cells);
      */
     export interface Table {
       appendTableRow(): TableRow;
@@ -1255,10 +1217,8 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a table cell. A TableCell is always contained within a
-     *  TableRow and may contain ListItem, Paragraph, or Table elements.
-     *  For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a table cell. A TableCell is always contained within a TableRow and may contain ListItem, Paragraph, or Table elements. For
+     * more information on document structure, see the guide to extending Google Docs.
      */
     export interface TableCell {
       appendHorizontalRule(): HorizontalRule;
@@ -1329,11 +1289,9 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element containing a table of contents. A TableOfContents may contain
-     *  ListItem, Paragraph, and Table elements, although the contents of a
-     *  TableOfContents are usually generated automatically by Google Docs. For more information
-     *  on document structure, see the
-     *  guide to extending Google Docs.
+     * An element containing a table of contents. A TableOfContents may contain ListItem, Paragraph, and Table elements, although the contents of a TableOfContents are usually generated automatically by Google Docs. For more information on
+     * document structure, see the guide to
+     * extending Google Docs.
      */
     export interface TableOfContents {
       clear(): TableOfContents;
@@ -1363,10 +1321,9 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a table row. A TableRow is always contained within a
-     *  Table and may only contain TableCell elements. For more information on document
-     *  structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a table row. A TableRow is always contained within a Table and may only contain TableCell elements. For more information on document
+     * structure, see the guide to extending
+     * Google Docs.
      */
     export interface TableRow {
       appendTableCell(): TableCell;
@@ -1410,27 +1367,25 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An element representing a rich text region. All text in a
-     *  Document is contained within Text
-     *  elements.  A Text element can be contained within an Equation,
-     *  EquationFunction, ListItem, or Paragraph, but cannot itself contain any
-     *  other element. For more information on document structure, see the
-     *  guide to extending Google Docs.
+     * An element representing a rich text region. All text in a Document is contained within Text elements.
+     * A Text element can be contained within an Equation, EquationFunction,
+     * ListItem, or Paragraph, but cannot itself contain any other element. For more
+     * information on document structure, see the guide to extending Google Docs.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Use editAsText to obtain a single text element containing
-     *      // all the characters in the document.
-     *      var text = body.editAsText();
+     *     // Use editAsText to obtain a single text element containing
+     *     // all the characters in the document.
+     *     var text = body.editAsText();
      *
-     *      // Insert text at the beginning of the document.
-     *      text.insertText(0, 'Inserted text.\n');
+     *     // Insert text at the beginning of the document.
+     *     text.insertText(0, 'Inserted text.\n');
      *
-     *      // Insert text at the end of the document.
-     *      text.appendText('\nAppended text.');
+     *     // Insert text at the end of the document.
+     *     text.appendText('\nAppended text.');
      *
-     *      // Make the first half of the document blue.
-     *      text.setForegroundColor(0, text.getText().length / 2, '#00FFFF');
+     *     // Make the first half of the document blue.
+     *     text.setForegroundColor(0, text.getText().length / 2, '#00FFFF');
      */
     export interface Text {
       appendText(text: string): Text;
@@ -1500,15 +1455,15 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration of the type of text alignments.
      *
-     *      // Make the first character in the first paragraph be superscript.
-     *      var text = DocumentApp.getActiveDocument().getBody().getParagraphs()[0].editAsText();
-     *      text.setTextAlignment(0, 0, DocumentApp.TextAlignment.SUPERSCRIPT);
+     *     // Make the first character in the first paragraph be superscript.
+     *     var text = DocumentApp.getActiveDocument().getBody().getParagraphs()[0].editAsText();
+     *     text.setTextAlignment(0, 0, DocumentApp.TextAlignment.SUPERSCRIPT);
      */
     export enum TextAlignment { NORMAL, SUPERSCRIPT, SUBSCRIPT }
 
     /**
      * An element representing a region that is unknown or cannot be affected by a script, such as a
-     *  page number.
+     * page number.
      */
     export interface UnsupportedElement {
       copy(): UnsupportedElement;
@@ -1526,22 +1481,21 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration of the supported vertical alignment types.
      *
-     * Use the VerticalAlignment enumeration to set the vertical
-     *  alignment of table cells.
+     * Use the VerticalAlignment enumeration to set the vertical alignment of table cells.
      *
-     *      var body = DocumentApp.getActiveDocument().getBody();
+     *     var body = DocumentApp.getActiveDocument().getBody();
      *
-     *      // Append table containing two cells.
-     *      var table = body.appendTable([['Top', 'Center', 'Bottom']]);
+     *     // Append table containing two cells.
+     *     var table = body.appendTable([['Top', 'Center', 'Bottom']]);
      *
-     *      // Align the first cell's contents to the top.
-     *      table.getCell(0, 0).setVerticalAlignment(DocumentApp.VerticalAlignment.TOP);
+     *     // Align the first cell's contents to the top.
+     *     table.getCell(0, 0).setVerticalAlignment(DocumentApp.VerticalAlignment.TOP);
      *
-     *      // Align the second cell's contents to the center.
-     *      table.getCell(0, 1).setVerticalAlignment(DocumentApp.VerticalAlignment.CENTER);
+     *     // Align the second cell's contents to the center.
+     *     table.getCell(0, 1).setVerticalAlignment(DocumentApp.VerticalAlignment.CENTER);
      *
-     *      // Align the third cell's contents to the bottom.
-     *      table.getCell(0, 2).setVerticalAlignment(DocumentApp.VerticalAlignment.BOTTOM);
+     *     // Align the third cell's contents to the bottom.
+     *     table.getCell(0, 2).setVerticalAlignment(DocumentApp.VerticalAlignment.BOTTOM);
      */
     export enum VerticalAlignment { BOTTOM, CENTER, TOP }
 
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 6d5e6d3da3..4bc84f1184 100644
--- a/types/google-apps-script/google-apps-script.drive.d.ts
+++ b/types/google-apps-script/google-apps-script.drive.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,37 +10,24 @@ declare namespace GoogleAppsScript {
   export module Drive {
     /**
      * An enum representing classes of users who can access a file or folder, besides any individual
-     *  users who have been explicitly given access. These properties can be accessed from
-     *  DriveApp.Access.
+     * users who have been explicitly given access. These properties can be accessed from DriveApp.Access.
      *
-     *      // Creates a folder that anyone on the Internet can read from and write to. (Domain
-     *      // administrators can prohibit this setting for users of a G Suite domain.)
-     *      var folder = DriveApp.createFolder('Shared Folder');
-     *      folder.setSharing(DriveApp.Access.ANYONE, DriveApp.Permission.EDIT);
+     *     // 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 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.
      *
-     *      // Log the name of every file in the user's Drive.
-     *      var files = DriveApp.getFiles();
-     *      while (files.hasNext()) {
-     *        var file = files.next();
-     *        Logger.log(file.getName());
-     *      }
+     *     // Log the name of every file in the user's Drive.
+     *     var files = DriveApp.getFiles();
+     *     while (files.hasNext()) {
+     *       var file = files.next();
+     *       Logger.log(file.getName());
+     *     }
      */
     export interface DriveApp {
       Access: typeof Access;
@@ -149,14 +136,14 @@ declare namespace GoogleAppsScript {
     /**
      * A file in Google Drive. Files can be accessed or created from DriveApp.
      *
-     *      // Trash every untitled spreadsheet that hasn't been updated in a week.
-     *      var files = DriveApp.getFilesByName('Untitled spreadsheet');
-     *      while (files.hasNext()) {
-     *        var file = files.next();
-     *        if (new Date() - file.getLastUpdated() > 7 * 24 * 60 * 60 * 1000) {
-     *          file.setTrashed(true);
-     *        }
-     *      }
+     *     // Trash every untitled spreadsheet that hasn't been updated in a week.
+     *     var files = DriveApp.getFilesByName('Untitled spreadsheet');
+     *     while (files.hasNext()) {
+     *       var file = files.next();
+     *       if (new Date() - file.getLastUpdated() > 7 * 24 * 60 * 60 * 1000) {
+     *         file.setTrashed(true);
+     *       }
+     *     }
      */
     export interface File {
       addCommenter(emailAddress: string): File;
@@ -216,14 +203,14 @@ declare namespace GoogleAppsScript {
 
     /**
      * An iterator that allows scripts to iterate over a potentially large collection of files. File
-     *  iterators can be acccessed from DriveApp or a Folder.
+     * iterators can be acccessed from DriveApp or a Folder.
      *
-     *      // Log the name of every file in the user's Drive.
-     *      var files = DriveApp.getFiles();
-     *      while (files.hasNext()) {
-     *        var file = files.next();
-     *        Logger.log(file.getName());
-     *      }
+     *     // Log the name of every file in the user's Drive.
+     *     var files = DriveApp.getFiles();
+     *     while (files.hasNext()) {
+     *       var file = files.next();
+     *       Logger.log(file.getName());
+     *     }
      */
     export interface FileIterator {
       /**
@@ -244,12 +231,12 @@ declare namespace GoogleAppsScript {
     /**
      * A folder in Google Drive. Folders can be accessed or created from DriveApp.
      *
-     *      // Log the name of every folder in the user's Drive.
-     *      var folders = DriveApp.getFolders();
-     *      while (folders.hasNext()) {
-     *        var folder = folders.next();
-     *        Logger.log(folder.getName());
-     *      }
+     *     // Log the name of every folder in the user's Drive.
+     *     var folders = DriveApp.getFolders();
+     *     while (folders.hasNext()) {
+     *       var folder = folders.next();
+     *       Logger.log(folder.getName());
+     *     }
      */
     export interface Folder {
       addEditor(emailAddress: string): Folder;
@@ -309,41 +296,42 @@ declare namespace GoogleAppsScript {
 
     /**
      * An object that allows scripts to iterate over a potentially large collection of folders. Folder
-     *  iterators can be acccessed from DriveApp, a File, or a Folder.
+     * iterators can be acccessed from DriveApp, a File, or a Folder.
      *
-     *      // Log the name of every folder in the user's Drive.
-     *      var folders = DriveApp.getFolders();
-     *      while (folders.hasNext()) {
-     *        var folder = folders.next();
-     *        Logger.log(folder.getName());
-     *      }
+     *     // Log the name of every folder in the user's Drive.
+     *     var folders = DriveApp.getFolders();
+     *     while (folders.hasNext()) {
+     *       var folder = folders.next();
+     *       Logger.log(folder.getName());
+     *     }
      */
     export interface FolderIterator {
-      /**
-       * 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;
     }
 
     /**
-     * A user associated with a file in Google Drive. Users can be accessed from
-     *  File.getEditors(), Folder.getViewers(), and other methods.
+     * 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.
      *
-     *      // Log the email address of all users who have edit access to a file.
-     *      var file = DriveApp.getFileById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var editors = file.getEditors();
-     *      for (var i = 0; i < editors.length; i++) {
-     *        Logger.log(editors[i].getEmail());
-     *      }
+     *     // Creates a folder that anyone on the Internet can read from and write to. (Domain
+     *     // administrators can prohibit this setting for G Suite users.)
+     *     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.
+     *
+     *     // Log the email address of all users who have edit access to a file.
+     *     var file = DriveApp.getFileById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var editors = file.getEditors();
+     *     for (var i = 0; i < editors.length; i++) {
+     *       Logger.log(editors[i].getEmail());
+     *     }
      */
     export interface User {
       /** Gets the domain name associated with the user's account. */
@@ -357,16 +345,15 @@ declare namespace GoogleAppsScript {
        */
       getEmail(): string;
       /** Gets the user's name. This method returns null if the user's name is not available. */
-      getName(): string | null;
+      getName(): string;
       /** Gets the URL for the user's photo. This method returns null if the user's photo is not available. */
-      getPhotoUrl(): string | null;
+      getPhotoUrl(): string;
       /**
        * 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 cdfbfbd1ef..df08002505 100644
--- a/types/google-apps-script/google-apps-script.forms.d.ts
+++ b/types/google-apps-script/google-apps-script.forms.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,32 +10,99 @@ declare namespace GoogleAppsScript {
   export module Forms {
     /**
      * An enum representing the supported types of image alignment. Alignment types can be accessed from
-     *  FormApp.Alignment.
+     * FormApp.Alignment.
      *
-     *      // Open a form by ID and add a new image item with alignment
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var img = UrlFetchApp.fetch('https://www.google.com/images/srpr/logo4w.png');
-     *      form.addImageItem()
-     *          .setImage(img)
-     *          .setAlignment(FormApp.Alignment.CENTER);
+     *     // Open a form by ID and add a new image item with alignment
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var img = UrlFetchApp.fetch('https://www.google.com/images/srpr/logo4w.png');
+     *     form.addImageItem()
+     *         .setImage(img)
+     *         .setAlignment(FormApp.Alignment.CENTER);
      */
     export enum Alignment { LEFT, CENTER, RIGHT }
 
     /**
-     * A question item that allows the respondent to select one or more checkboxes, as well
-     *  as an optional "other" field. Items can be accessed or created from a Form. When used in
-     *  a quiz, these items are autograded.
+     * A question item, presented as a grid of columns and rows, that allows the respondent to select
+     * multiple choices per row from a sequence of checkboxes. Items can be accessed or created from a
+     * Form.
      *
-     *      // Open a form by ID and add a new checkbox item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addCheckboxItem();
-     *      item.setTitle('What condiments would you like on your hot dog?')
-     *          .setChoices([
-     *                item.createChoice('Ketchup'),
-     *                item.createChoice('Mustard'),
-     *                item.createChoice('Relish')
-     *          ])
-     *          .showOtherOption(true);
+     *     // Open a form by ID and add a new checkgox grid item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addCheckboxGridItem();
+     *     item.setTitle('Where did you celebrate New Years?')
+     *       .setRows(['New York', 'San Francisco', 'London'])
+     *       .setColumns(['2014', '2015', '2016', '2017']);
+     */
+    export interface CheckboxGridItem {
+      clearValidation(): CheckboxGridItem;
+      createResponse(responses: string[][]): ItemResponse;
+      duplicate(): CheckboxGridItem;
+      getColumns(): string[];
+      getHelpText(): string;
+      getId(): Integer;
+      getIndex(): Integer;
+      getRows(): string[];
+      getTitle(): string;
+      getType(): ItemType;
+      isRequired(): boolean;
+      setColumns(columns: string[]): CheckboxGridItem;
+      setHelpText(text: string): CheckboxGridItem;
+      setRequired(enabled: boolean): CheckboxGridItem;
+      setRows(rows: string[]): CheckboxGridItem;
+      setTitle(title: string): CheckboxGridItem;
+      setValidation(validation: CheckboxGridValidation): CheckboxGridItem;
+    }
+
+    /**
+     * A DataValidation for a CheckboxGridItem.
+     *
+     *     // Add a checkbox grid item to a form and require one response per column.
+     *     var checkboxGridItem = form.addCheckboxGridItem();
+     *     checkboxGridItem.setTitle('Where did you celebrate New Years?')
+     *       .setRows(['New York', 'San Francisco', 'London'])
+     *       .setColumns(['2014', '2015', '2016', '2017']);
+     *     var checkboxGridValidation = FormApp.createCheckboxGridValidation()
+     *       .setHelpText(“Select one item per column.”)
+     *       .requireLimitOneResponsePerColumn()
+     *       .build();
+     *     checkboxGridItem.setValidation(checkboxGridValidation);
+     */
+    export interface CheckboxGridValidation {
+    }
+
+    /**
+     * A DataValidationBuilder for a CheckboxGridValidation.
+     *
+     *     // Add a checkbox grid item to a form and restrict it to one response per column.
+     *     var checkboxGridItem = form.addCheckboxGridItem();
+     *     checkboxGridItem.setTitle('Where did you celebrate New Years?')
+     *       .setRows(['New York', 'San Francisco', 'London'])
+     *       .setColumns(['2014', '2015', '2016', '2017']);
+     *     var checkboxGridValidation = FormApp.createcheckboxGridValidation()
+     *       .setHelpText(“Select one item per column.”)
+     *       .requireLimitOneResponsePerColumn()
+     *       .build();
+     *     checkboxGridItem.setValidation(checkboxGridValidation);
+     */
+    export interface CheckboxGridValidationBuilder {
+      requireLimitOneResponsePerColumn(): CheckboxGridValidationBuilder;
+    }
+
+    /**
+     * A question item that allows the respondent to select one or more checkboxes, as well as an
+     * optional "other" field. Items can be accessed or created from a Form. When used in a
+     * quiz, these items are autograded.
+     *
+     *     // Open a form by ID and add a new checkbox item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addCheckboxItem();
+     *     item.setTitle('What condiments would you like on your hot dog?')
+     *         .setChoices([
+     *               item.createChoice('Ketchup'),
+     *               item.createChoice('Mustard'),
+     *               item.createChoice('Relish')
+     *         ])
+     *         .showOtherOption(true);
      */
     export interface CheckboxItem {
       clearValidation(): CheckboxItem;
@@ -69,73 +136,71 @@ declare namespace GoogleAppsScript {
     /**
      * A DataValidation for a CheckboxItem.
      *
-     *      // Add a checkBox item to a form and require exactly two selections.
-     *      var checkBoxItem = form.addCheckboxItem();
-     *      checkBoxItem.setTitle('What two condiments would you like on your hot dog?');
-     *      checkBoxItem.setChoices([
-     *        checkBoxItem.createChoice('Ketchup'),
-     *        checkBoxItem.createChoice('Mustard'),
-     *        checkBoxItem.createChoice('Relish')
-     *      ]);
-     *      var checkBoxValidation = FormApp.createCheckboxValidation()
-     *        .setHelpText(“Select two condiments.”)
-     *        .requireSelectExactly(2)
-     *        .build();
-     *      checkBoxItem.setValidation(checkBoxValidation);
+     *     // Add a checkBox item to a form and require exactly two selections.
+     *     var checkBoxItem = form.addCheckboxItem();
+     *     checkBoxItem.setTitle('What two condiments would you like on your hot dog?');
+     *     checkBoxItem.setChoices([
+     *       checkBoxItem.createChoice('Ketchup'),
+     *       checkBoxItem.createChoice('Mustard'),
+     *       checkBoxItem.createChoice('Relish')
+     *     ]);
+     *     var checkBoxValidation = FormApp.createCheckboxValidation()
+     *       .setHelpText(“Select two condiments.”)
+     *       .requireSelectExactly(2)
+     *       .build();
+     *     checkBoxItem.setValidation(checkBoxValidation);
      */
     export interface CheckboxValidation {
-      getHelpText(): string;
+      requireSelectAtLeast(number: Integer): CheckboxValidation;
+      requireSelectAtMost(number: Integer): CheckboxValidation;
+      requireSelectExactly(number: Integer): CheckboxValidation;
     }
 
     /**
      * A DataValidationBuilder for a CheckboxValidation.
      *
-     *      // Add a checkBox item to a form and require exactly two selections.
-     *      var checkBoxItem = form.addCheckboxItem();
-     *      checkBoxItem.setTitle('What two condiments would you like on your hot dog?');
-     *      checkBoxItem.setChoices([
-     *        checkBoxItem.createChoice('Ketchup'),
-     *        checkBoxItem.createChoice('Mustard'),
-     *        checkBoxItem.createChoice('Relish')
-     *      ]);
-     *      var checkBoxValidation = FormApp.createCheckboxValidation()
-     *        .setHelpText(“Select two condiments.”)
-     *        .requireSelectExactly(2)
-     *        .build();
-     *      checkBoxItem.setValidation(checkBoxValidation);
+     *     // Add a checkBox item to a form and require exactly two selections.
+     *     var checkBoxItem = form.addCheckboxItem();
+     *     checkBoxItem.setTitle('What two condiments would you like on your hot dog?');
+     *     checkBoxItem.setChoices([
+     *       checkBoxItem.createChoice('Ketchup'),
+     *       checkBoxItem.createChoice('Mustard'),
+     *       checkBoxItem.createChoice('Relish')
+     *     ]);
+     *     var checkBoxValidation = FormApp.createCheckboxValidation()
+     *       .setHelpText(“Select two condiments.”)
+     *       .requireSelectExactly(2)
+     *       .build();
+     *     checkBoxItem.setValidation(checkBoxValidation);
      */
     export interface CheckboxValidationBuilder {
-      build(): CheckboxValidation;
-      copy(): CheckboxValidationBuilder;
       requireSelectAtLeast(number: Integer): CheckboxValidationBuilder;
       requireSelectAtMost(number: Integer): CheckboxValidationBuilder;
       requireSelectExactly(number: Integer): CheckboxValidationBuilder;
-      setHelpText(text: string): CheckboxValidationBuilder;
     }
 
     /**
-     * A single choice associated with a type of Item that supports choices, like
-     *  CheckboxItem, ListItem, or MultipleChoiceItem.
+     * A single choice associated with a type of Item that supports choices, like CheckboxItem, ListItem, or MultipleChoiceItem.
      *
-     *      // Create a new form and add a multiple-choice item.
-     *      var form = FormApp.create('Form Name');
-     *      var item = form.addMultipleChoiceItem();
-     *      item.setTitle('Do you prefer cats or dogs?')
-     *          .setChoices([
-     *              item.createChoice('Cats', FormApp.PageNavigationType.CONTINUE),
-     *              item.createChoice('Dogs', FormApp.PageNavigationType.RESTART)
-     *          ]);
+     *     // Create a new form and add a multiple-choice item.
+     *     var form = FormApp.create('Form Name');
+     *     var item = form.addMultipleChoiceItem();
+     *     item.setTitle('Do you prefer cats or dogs?')
+     *         .setChoices([
+     *             item.createChoice('Cats', FormApp.PageNavigationType.CONTINUE),
+     *             item.createChoice('Dogs', FormApp.PageNavigationType.RESTART)
+     *         ]);
      *
-     *      // Add another page because navigation has no effect on the last page.
-     *      form.addPageBreakItem().setTitle('You chose well!');
+     *     // Add another page because navigation has no effect on the last page.
+     *     form.addPageBreakItem().setTitle('You chose well!');
      *
-     *      // Log the navigation types that each choice results in.
-     *      var choices = item.getChoices();
-     *      for (var i = 0; i < choices.length; i++) {
-     *      Logger.log('If the respondent chooses "%s", the form will %s.',
-     *                 choices[i].getValue(),
-     *                 choices[i].getPageNavigationType());
-     *      }
+     *     // Log the navigation types that each choice results in.
+     *     var choices = item.getChoices();
+     *     for (var i = 0; i < choices.length; i++) {
+     *     Logger.log('If the respondent chooses "%s", the form will %s.',
+     *                choices[i].getValue(),
+     *                choices[i].getPageNavigationType());
+     *     }
      */
     export interface Choice {
       getGotoPage(): PageBreakItem;
@@ -145,46 +210,13 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * The base DataValidation that contains properties common to all validations, such as help text.
-     *  Validations can be added to certain Form items.
+     * A question item that allows the respondent to indicate a date. Items can be accessed or created
+     * from a Form. When used in a quiz, these items are graded.
      *
-     *      // Add a text item to a form and require it to be a number within a range.
-     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
-     *      var textValidation = FormApp.createTextValidation()
-     *        .setHelpText(“Input was not a number between 1 and 100.”)
-     *        .requireNumberBetween(1, 100);
-     *      textItem.setValidation(textValidation);
-     */
-    export interface DataValidation {
-      getHelpText(): string;
-    }
-
-    /**
-     * The base DataValidationBuilder that contains setters for properties common to all validations,
-     *  such as help text. Used to build DataValadation objects.
-     *
-     *      // Add a text item to a form and require it to be a number within a range.
-     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
-     *      var textValidation = FormApp.createTextValidation()
-     *        .setHelpText(“Input was not a number between 1 and 100.”)
-     *        .requireNumberBetween(1, 100)
-     *        .build();
-     *      textItem.setValidation(textValidation);
-     */
-    export interface DataValidationBuilder {
-      build(): DataValidation;
-      copy(): DataValidationBuilder;
-      setHelpText(text: string): DataValidationBuilder;
-    }
-
-    /**
-     * A question item that allows the respondent to indicate a date. Items can be accessed or
-     *  created from a Form. When used in a quiz, these items are graded.
-     *
-     *      // Open a form by ID and add a new date item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addDateItem();
-     *      item.setTitle('When were you born?');
+     *     // Open a form by ID and add a new date item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addDateItem();
+     *     item.setTitle('When were you born?');
      */
     export interface DateItem {
       createResponse(response: Date): ItemResponse;
@@ -207,13 +239,13 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A question item that allows the respondent to indicate a date and time. Items can be
-     *  accessed or created from a Form. When used in a quiz, these items are graded.
+     * A question item that allows the respondent to indicate a date and time. Items can be accessed or
+     * created from a Form. When used in a quiz, these items are graded.
      *
-     *      // Open a form by ID and add a new date-time item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addDateTimeItem();
-     *      item.setTitle('When do you want to meet?');
+     *     // Open a form by ID and add a new date-time item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addDateTimeItem();
+     *     item.setTitle('When do you want to meet?');
      */
     export interface DateTimeItem {
       createResponse(response: Date): ItemResponse;
@@ -237,28 +269,26 @@ declare namespace GoogleAppsScript {
 
     /**
      * An enum representing the supported types of form-response destinations. All forms, including
-     *  those that do not have a destination set explicitly,
-     *  save
-     *  a copy of responses in the form's response store. Destination types can be accessed from
-     *  FormApp.DestinationType.
+     * those that do not have a destination set explicitly, save a copy of responses in the form's
+     * response store. Destination types can be accessed from FormApp.DestinationType.
      *
-     *      // Open a form by ID and create a new spreadsheet.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var ss = SpreadsheetApp.create('Spreadsheet Name');
+     *     // Open a form by ID and create a new spreadsheet.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var ss = SpreadsheetApp.create('Spreadsheet Name');
      *
-     *      // Update the form's response destination.
-     *      form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
+     *     // Update the form's response destination.
+     *     form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
      */
     export enum DestinationType { SPREADSHEET }
 
     /**
-     * A question item that allows the respondent to indicate a length of time. Items can be
-     *  accessed or created from a Form. When used in a quiz, these items are graded.
+     * A question item that allows the respondent to indicate a length of time. Items can be accessed or
+     * created from a Form. When used in a quiz, these items are graded.
      *
-     *      // Open a form by ID and add a new duration item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addDurationItem();
-     *      item.setTitle('How long can you hold your breath?');
+     *     // Open a form by ID and add a new duration item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addDurationItem();
+     *     item.setTitle('How long can you hold your breath?');
      */
     export interface DurationItem {
       createResponse(hours: Integer, minutes: Integer, seconds: Integer): ItemResponse;
@@ -279,44 +309,43 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enum representing the supported types of feedback. Feedback types can be accessed from
-     *  FormApp.FeedbackType.
+     * An enum representing the supported types of feedback. Feedback types can be accessed from FormApp.FeedbackType.
      *
-     *      // Open a form by ID and add a new list item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addListItem();
-     *      item.setTitle('Do you prefer cats or dogs?');
-     *      // Set "Dogs" as the correct answer to this question.
-     *      item.setChoices([
-     *        item.createChoice('Dogs', true),
-     *        item.createChoice('Cats', false)]);
-     *      // Add feedback which will be shown for correct responses; ie "Dogs".
-     *      item.setFeedbackForCorrect(
-     *          FormApp.createFeedback().setDisplayText("Dogs rule, cats drool.").build());
+     *     // Open a form by ID and add a new list item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addListItem();
+     *     item.setTitle('Do you prefer cats or dogs?');
+     *     // Set "Dogs" as the correct answer to this question.
+     *     item.setChoices([
+     *       item.createChoice('Dogs', true),
+     *       item.createChoice('Cats', false)]);
+     *     // Add feedback which will be shown for correct responses; ie "Dogs".
+     *     item.setFeedbackForCorrect(
+     *         FormApp.createFeedback().setDisplayText("Dogs rule, cats drool.").build());
      */
     export enum FeedbackType { CORRECT, INCORRECT, GENERAL }
 
     /**
-     * A form that contains overall properties and items.  Properties include title, settings, and
-     *  where responses are stored.  Items include question items like checkboxes or radio items, while
-     *  layout items refer to things like page breaks. Forms can be accessed or created from
-     *  FormApp.
+     * A form that contains overall properties and items. Properties include title, settings, and where
+     * responses are stored. Items include question items like checkboxes or radio items, while layout
+     * items refer to things like page breaks. Forms can be accessed or created from FormApp.
      *
-     *      // Open a form by ID and create a new spreadsheet.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var ss = SpreadsheetApp.create('Spreadsheet Name');
+     *     // Open a form by ID and create a new spreadsheet.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var ss = SpreadsheetApp.create('Spreadsheet Name');
      *
-     *      // Update form properties via chaining.
-     *      form.setTitle('Form Name')
-     *          .setDescription('Description of form')
-     *          .setConfirmationMessage('Thanks for responding!')
-     *          .setAllowResponseEdits(true)
-     *          .setAcceptingResponses(false);
+     *     // Update form properties via chaining.
+     *     form.setTitle('Form Name')
+     *         .setDescription('Description of form')
+     *         .setConfirmationMessage('Thanks for responding!')
+     *         .setAllowResponseEdits(true)
+     *         .setAcceptingResponses(false);
      *
-     *      // Update the form's response destination.
-     *      form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
+     *     // Update the form's response destination.
+     *     form.setDestination(FormApp.DestinationType.SPREADSHEET, ss.getId());
      */
     export interface Form {
+      addCheckboxGridItem(): CheckboxGridItem;
       addCheckboxItem(): CheckboxItem;
       addDateItem(): DateItem;
       addDateTimeItem(): DateTimeItem;
@@ -341,6 +370,7 @@ declare namespace GoogleAppsScript {
       deleteAllResponses(): Form;
       deleteItem(index: Integer): void;
       deleteItem(item: Item): void;
+      deleteResponse(responseId: string): Form;
       getConfirmationMessage(): string;
       getCustomClosedFormMessage(): string;
       getDescription(): string;
@@ -393,11 +423,11 @@ declare namespace GoogleAppsScript {
     /**
      * Allows a script to open an existing Form or create a new one.
      *
-     *      // Open a form by ID.
-     *      var existingForm = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     // Open a form by ID.
+     *     var existingForm = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
      *
-     *      // Create and open a form.
-     *      var newForm = FormApp.create('Form Name');
+     *     // Create and open a form.
+     *     var newForm = FormApp.create('Form Name');
      */
     export interface FormApp {
       Alignment: typeof Alignment;
@@ -406,6 +436,7 @@ declare namespace GoogleAppsScript {
       ItemType: typeof ItemType;
       PageNavigationType: typeof PageNavigationType;
       create(title: string): Form;
+      createCheckboxGridValidation(): CheckboxGridValidationBuilder;
       createCheckboxValidation(): CheckboxValidationBuilder;
       createFeedback(): QuizFeedbackBuilder;
       createGridValidation(): GridValidationBuilder;
@@ -418,26 +449,25 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A response to the form as a whole. A FormResponse can be used in three ways: to
-     *  access the answers submitted by a respondent (see getItemResponses()), to
-     *  programmatically submit a response to the form (see withItemResponse(response) and
-     *  submit()), and to generate a URL for the form which pre-fills fields using the
-     *  provided answers. FormResponses can be created or accessed from a Form.
+     * A response to the form as a whole. A FormResponse can be used in three ways: to access
+     * the answers submitted by a respondent (see getItemResponses()), to programmatically
+     * submit a response to the form (see withItemResponse(response) and submit()), and to generate a URL for the form which pre-fills fields using the provided
+     * answers. FormResponses can be created or accessed from a Form.
      *
-     *      // Open a form by ID and log the responses to each question.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var formResponses = form.getResponses();
-     *      for (var i = 0; i < formResponses.length; i++) {
-     *        var formResponse = formResponses[i];
-     *        var itemResponses = formResponse.getItemResponses();
-     *        for (var j = 0; j < itemResponses.length; j++) {
-     *          var itemResponse = itemResponses[j];
-     *          Logger.log('Response #%s to the question "%s" was "%s"',
-     *              (i + 1).toString(),
-     *              itemResponse.getItem().getTitle(),
-     *              itemResponse.getResponse());
-     *        }
-     *      }
+     *     // Open a form by ID and log the responses to each question.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var formResponses = form.getResponses();
+     *     for (var i = 0; i < formResponses.length; i++) {
+     *       var formResponse = formResponses[i];
+     *       var itemResponses = formResponse.getItemResponses();
+     *       for (var j = 0; j < itemResponses.length; j++) {
+     *         var itemResponse = itemResponses[j];
+     *         Logger.log('Response #%s to the question "%s" was "%s"',
+     *             (i + 1).toString(),
+     *             itemResponse.getItem().getTitle(),
+     *             itemResponse.getResponse());
+     *       }
+     *     }
      */
     export interface FormResponse {
       getEditResponseUrl(): string;
@@ -456,15 +486,15 @@ declare namespace GoogleAppsScript {
 
     /**
      * A question item, presented as a grid of columns and rows, that allows the respondent to select
-     *  one choice per row from a sequence of radio buttons. Items can be accessed or created from a
-     *   Form.
+     * one choice per row from a sequence of radio buttons. Items can be accessed or created from a
+     * Form.
      *
-     *      // Open a form by ID and add a new grid item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addGridItem();
-     *      item.setTitle('Rate your interests')
-     *          .setRows(['Cars', 'Computers', 'Celebrities'])
-     *          .setColumns(['Boring', 'So-so', 'Interesting']);
+     *     // Open a form by ID and add a new grid item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addGridItem();
+     *     item.setTitle('Rate your interests')
+     *         .setRows(['Cars', 'Computers', 'Celebrities'])
+     *         .setColumns(['Boring', 'So-so', 'Interesting']);
      */
     export interface GridItem {
       clearValidation(): GridItem;
@@ -489,52 +519,48 @@ declare namespace GoogleAppsScript {
     /**
      * A DataValidation for a GridItem.
      *
-     *      // Add a grid item to a form and require one response per column.
-     *      var gridItem = form.addGridItem();
-     *      gridItem.setTitle('Rate your interests')
-     *        .setRows(['Cars', 'Computers', 'Celebrities'])
-     *        .setColumns(['Boring', 'So-so', 'Interesting']);
-     *      var gridValidation = FormApp.createGridValidation()
-     *        .setHelpText(“Select one item per column.”)
-     *        .requireLimitOneResponsePerColumn()
-     *        .build();
-     *      gridItem.setValidation(gridValidation);
+     *     // Add a grid item to a form and require one response per column.
+     *     var gridItem = form.addGridItem();
+     *     gridItem.setTitle('Rate your interests')
+     *       .setRows(['Cars', 'Computers', 'Celebrities'])
+     *       .setColumns(['Boring', 'So-so', 'Interesting']);
+     *     var gridValidation = FormApp.createGridValidation()
+     *       .setHelpText(“Select one item per column.”)
+     *       .requireLimitOneResponsePerColumn()
+     *       .build();
+     *     gridItem.setValidation(gridValidation);
      */
     export interface GridValidation {
-      getHelpText(): string;
     }
 
     /**
      * A DataValidationBuilder for a GridValidation.
      *
-     *      // Add a grid item to a form and require one response per column.
-     *      var gridItem = form.addGridItem();
-     *      gridItem.setTitle('Rate your interests')
-     *        .setRows(['Cars', 'Computers', 'Celebrities'])
-     *        .setColumns(['Boring', 'So-so', 'Interesting']);
-     *      var gridValidation = FormApp.createGridValidation()
-     *        .setHelpText(“Select one item per column.”)
-     *        .requireLimitOneResponsePerColumn()
-     *        .build();
-     *      gridItem.setValidation(gridValidation);
+     *     // Add a grid item to a form and require one response per column.
+     *     var gridItem = form.addGridItem();
+     *     gridItem.setTitle('Rate your interests')
+     *       .setRows(['Cars', 'Computers', 'Celebrities'])
+     *       .setColumns(['Boring', 'So-so', 'Interesting']);
+     *     var gridValidation = FormApp.createGridValidation()
+     *       .setHelpText(“Select one item per column.”)
+     *       .requireLimitOneResponsePerColumn()
+     *       .build();
+     *     gridItem.setValidation(gridValidation);
      */
     export interface GridValidationBuilder {
-      build(): GridValidation;
-      copy(): GridValidationBuilder;
       requireLimitOneResponsePerColumn(): GridValidationBuilder;
-      setHelpText(text: string): GridValidationBuilder;
     }
 
     /**
      * A layout item that displays an image. Items can be accessed or created from a Form.
      *
-     *      // Open a form by ID and add a new image item
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var img = UrlFetchApp.fetch('https://www.google.com/images/srpr/logo4w.png');
-     *      form.addImageItem()
-     *          .setTitle('Google')
-     *          .setHelpText('Google Logo') // The help text is the image description
-     *          .setImage(img);
+     *     // Open a form by ID and add a new image item
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var img = UrlFetchApp.fetch('https://www.google.com/images/srpr/logo4w.png');
+     *     form.addImageItem()
+     *         .setTitle('Google')
+     *         .setHelpText('Google Logo') // The help text is the image description
+     *         .setImage(img);
      */
     export interface ImageItem {
       duplicate(): ImageItem;
@@ -555,27 +581,31 @@ declare namespace GoogleAppsScript {
 
     /**
      * A generic form item that contains properties common to all items, such as title and help text.
-     *  Items can be accessed or created from a Form.
+     * Items can be accessed or created from a Form.
      *
-     *  To operate on type-specific properties, use getType() to check the item's
-     *  ItemType, then cast the item to the
-     *  appropriate class using a method like asCheckboxItem().
+     * To operate on type-specific properties, use getType() to check the item's ItemType, then cast the item to the
+     * appropriate class using a method like asCheckboxItem().
      *
-     *      // Create a new form and add a text item.
-     *      var form = FormApp.create('Form Name');
-     *      form.addTextItem();
+     *     // Create a new form and add a text item.
+     *     var form = FormApp.create('Form Name');
+     *     form.addTextItem();
      *
-     *      // Access the text item as a generic item.
-     *      var items = form.getItems();
-     *      var item = items[0];
+     *     // Access the text item as a generic item.
+     *     var items = form.getItems();
+     *     var item = items[0];
      *
-     *      // Cast the generic item to the text-item class.
-     *      if (item.getType() == 'TEXT') {
-     *        var textItem = item.asTextItem();
-     *        textItem.setRequired(false);
-     *      }
+     *     // Cast the generic item to the text-item class.
+     *     if (item.getType() == 'TEXT') {
+     *       var textItem = item.asTextItem();
+     *       textItem.setRequired(false);
+     *     }
+     *
+     * Implementing classes
+     *
+     * NameBrief description
      */
     export interface Item {
+      asCheckboxGridItem(): CheckboxGridItem;
       asCheckboxItem(): CheckboxItem;
       asDateItem(): DateItem;
       asDateTimeItem(): DateTimeItem;
@@ -602,24 +632,22 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A response to one question item within a form. Item responses can be accessed from
-     *  FormResponse and created from any Item that asks the respondent to answer a
-     *  question.
+     * A response to one question item within a form. Item responses can be accessed from FormResponse and created from any Item that asks the respondent to answer a question.
      *
-     *      // Open a form by ID and log the responses to each question.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var formResponses = form.getResponses();
-     *      for (var i = 0; i < formResponses.length; i++) {
-     *        var formResponse = formResponses[i];
-     *        var itemResponses = formResponse.getItemResponses();
-     *        for (var j = 0; j < itemResponses.length; j++) {
-     *          var itemResponse = itemResponses[j];
-     *          Logger.log('Response #%s to the question "%s" was "%s"',
-     *              (i + 1).toString(),
-     *              itemResponse.getItem().getTitle(),
-     *              itemResponse.getResponse());
-     *        }
-     *      }
+     *     // Open a form by ID and log the responses to each question.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var formResponses = form.getResponses();
+     *     for (var i = 0; i < formResponses.length; i++) {
+     *       var formResponse = formResponses[i];
+     *       var itemResponses = formResponse.getItemResponses();
+     *       for (var j = 0; j < itemResponses.length; j++) {
+     *         var itemResponse = itemResponses[j];
+     *         Logger.log('Response #%s to the question "%s" was "%s"',
+     *             (i + 1).toString(),
+     *             itemResponse.getItem().getTitle(),
+     *             itemResponse.getResponse());
+     *       }
+     *     }
      */
     export interface ItemResponse {
       getFeedback(): Object;
@@ -631,33 +659,32 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enum representing the supported types of form items. Item types can be accessed from
-     *  FormApp.ItemType.
+     * An enum representing the supported types of form items. Item types can be accessed from FormApp.ItemType.
      *
-     *      // Open a form by ID and add a new section header.
-     *      var form = FormApp.create('Form Name');
-     *      var item = form.addSectionHeaderItem();
-     *      item.setTitle('Title of new section');
+     *     // Open a form by ID and add a new section header.
+     *     var form = FormApp.create('Form Name');
+     *     var item = form.addSectionHeaderItem();
+     *     item.setTitle('Title of new section');
      *
-     *      // Check the item type.
-     *      if (item.getType() == FormApp.ItemType.SECTION_HEADER) {
-     *        item.setHelpText('Description of new section.');
-     *      }
+     *     // Check the item type.
+     *     if (item.getType() == FormApp.ItemType.SECTION_HEADER) {
+     *       item.setHelpText('Description of new section.');
+     *     }
      */
-    export enum ItemType { CHECKBOX, DATE, DATETIME, DURATION, GRID, IMAGE, LIST, MULTIPLE_CHOICE, PAGE_BREAK, PARAGRAPH_TEXT, SCALE, SECTION_HEADER, TEXT, TIME }
+    export enum ItemType { CHECKBOX, CHECKBOX_GRID, DATE, DATETIME, DURATION, GRID, IMAGE, LIST, MULTIPLE_CHOICE, PAGE_BREAK, PARAGRAPH_TEXT, SCALE, SECTION_HEADER, TEXT, TIME }
 
     /**
      * A question item that allows the respondent to select one choice from a drop-down list. Items can
-     *  be accessed or created from a Form.
+     * be accessed or created from a Form.
      *
-     *      // Open a form by ID and add a new list item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addListItem();
-     *      item.setTitle('Do you prefer cats or dogs?')
-     *          .setChoices([
-     *              item.createChoice('Cats'),
-     *              item.createChoice('Dogs')
-     *          ]);
+     *     // Open a form by ID and add a new list item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addListItem();
+     *     item.setTitle('Do you prefer cats or dogs?')
+     *         .setChoices([
+     *             item.createChoice('Cats'),
+     *             item.createChoice('Dogs')
+     *         ]);
      */
     export interface ListItem {
       createChoice(value: string): Choice;
@@ -687,19 +714,19 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A question item that allows the respondent to select one choice from a list of radio
-     *  buttons or an optional "other" field. Items can be accessed or created from a Form.
-     *  When used in a quiz, these items are autograded.
+     * A question item that allows the respondent to select one choice from a list of radio buttons or
+     * an optional "other" field. Items can be accessed or created from a Form. When used in a
+     * quiz, these items are autograded.
      *
-     *      // Open a form by ID and add a new multiple choice item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addMultipleChoiceItem();
-     *      item.setTitle('Do you prefer cats or dogs?')
-     *          .setChoices([
-     *              item.createChoice('Cats'),
-     *              item.createChoice('Dogs')
-     *           ])
-     *          .showOtherOption(true);
+     *     // Open a form by ID and add a new multiple choice item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addMultipleChoiceItem();
+     *     item.setTitle('Do you prefer cats or dogs?')
+     *         .setChoices([
+     *             item.createChoice('Cats'),
+     *             item.createChoice('Dogs')
+     *          ])
+     *         .showOtherOption(true);
      */
     export interface MultipleChoiceItem {
       createChoice(value: string): Choice;
@@ -731,17 +758,16 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A layout item that marks the start of a page. Items can be accessed or
-     *  created from a Form.
+     * A layout item that marks the start of a page. Items can be accessed or created from a Form.
      *
-     *      // Create a form and add three page-break items.
-     *      var form = FormApp.create('Form Name');
-     *      var pageTwo = form.addPageBreakItem().setTitle('Page Two');
-     *      var pageThree = form.addPageBreakItem().setTitle('Page Three');
+     *     // Create a form and add three page-break items.
+     *     var form = FormApp.create('Form Name');
+     *     var pageTwo = form.addPageBreakItem().setTitle('Page Two');
+     *     var pageThree = form.addPageBreakItem().setTitle('Page Three');
      *
-     *      // Make the first two pages navigate elsewhere upon completion.
-     *      pageTwo.setGoToPage(pageThree); // At end of page one (start of page two), jump to page three
-     *      pageThree.setGoToPage(FormApp.PageNavigationType.RESTART); // At end of page two, restart form
+     *     // Make the first two pages navigate elsewhere upon completion.
+     *     pageTwo.setGoToPage(pageThree); // At end of page one (start of page two), jump to page three
+     *     pageThree.setGoToPage(FormApp.PageNavigationType.RESTART); // At end of page two, restart form
      */
     export interface PageBreakItem {
       duplicate(): PageBreakItem;
@@ -760,40 +786,41 @@ declare namespace GoogleAppsScript {
 
     /**
      * An enum representing the supported types of page navigation. Page navigation types can be
-     *  accessed from FormApp.PageNavigationType.
+     * accessed from FormApp.PageNavigationType.
      *
      * The page navigation occurs after the respondent completes a page that contains the option, and
-     *  only if the respondent chose that option. If the respondent chose multiple options with
-     *  page-navigation instructions on the same page, only the last navigation option has any effect.
-     *  Page navigation also has no effect on the last page of a form.
+     * only if the respondent chose that option. If the respondent chose multiple options with
+     * page-navigation instructions on the same page, only the last navigation option has any effect.
+     * Page navigation also has no effect on the last page of a form.
+     *
      * Choices that use page navigation cannot be combined in the same item with choices that do not
-     *  use page navigation.
+     * use page navigation.
      *
-     *      // Create a form and add a new multiple-choice item and a page-break item.
-     *      var form = FormApp.create('Form Name');
-     *      var item = form.addMultipleChoiceItem();
-     *      var pageBreak = form.addPageBreakItem();
+     *     // Create a form and add a new multiple-choice item and a page-break item.
+     *     var form = FormApp.create('Form Name');
+     *     var item = form.addMultipleChoiceItem();
+     *     var pageBreak = form.addPageBreakItem();
      *
-     *      // Set some choices with go-to-page logic.
-     *      var rightChoice = item.createChoice('Vanilla', FormApp.PageNavigationType.SUBMIT);
-     *      var wrongChoice = item.createChoice('Chocolate', FormApp.PageNavigationType.RESTART);
+     *     // Set some choices with go-to-page logic.
+     *     var rightChoice = item.createChoice('Vanilla', FormApp.PageNavigationType.SUBMIT);
+     *     var wrongChoice = item.createChoice('Chocolate', FormApp.PageNavigationType.RESTART);
      *
-     *      // For GO_TO_PAGE, just pass in the page break item. For CONTINUE (normally the default), pass in
-     *      // CONTINUE explicitly because page navigation cannot be mixed with non-navigation choices.
-     *      var iffyChoice = item.createChoice('Peanut', pageBreak);
-     *      var otherChoice = item.createChoice('Strawberry', FormApp.PageNavigationType.CONTINUE);
-     *      item.setChoices([rightChoice, wrongChoice, iffyChoice, otherChoice]);
+     *     // For GO_TO_PAGE, just pass in the page break item. For CONTINUE (normally the default), pass in
+     *     // CONTINUE explicitly because page navigation cannot be mixed with non-navigation choices.
+     *     var iffyChoice = item.createChoice('Peanut', pageBreak);
+     *     var otherChoice = item.createChoice('Strawberry', FormApp.PageNavigationType.CONTINUE);
+     *     item.setChoices([rightChoice, wrongChoice, iffyChoice, otherChoice]);
      */
     export enum PageNavigationType { CONTINUE, GO_TO_PAGE, RESTART, SUBMIT }
 
     /**
-     * A question item that allows the respondent to enter a block of text. Items can be
-     *  accessed or created from a Form. When used in a quiz, these items are graded.
+     * A question item that allows the respondent to enter a block of text. Items can be accessed or
+     * created from a Form. When used in a quiz, these items are graded.
      *
-     *      // Open a form by ID and add a new paragraph text item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addParagraphTextItem();
-     *      item.setTitle('What is your address?');
+     *     // Open a form by ID and add a new paragraph text item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addParagraphTextItem();
+     *     item.setTitle('What is your address?');
      */
     export interface ParagraphTextItem {
       clearValidation(): ParagraphTextItem;
@@ -818,53 +845,49 @@ declare namespace GoogleAppsScript {
     /**
      * A DataValidation for a ParagraphTextItem.
      *
-     *      // Add a paragraph text item to a form and require the answer to be at least 100 characters.
-     *      var paragraphTextItem = form.addParagraphTextItem().setTitle('Describe yourself:');
-     *      var paragraphtextValidation = FormApp.createParagraphTextValidation()
-     *        .setHelpText(“Answer must be more than 100 characters.”)
-     *        .requireTextLengthGreatherThan(100);
-     *      paragraphTextItem.setValidation(paragraphtextValidation);
+     *     // Add a paragraph text item to a form and require the answer to be at least 100 characters.
+     *     var paragraphTextItem = form.addParagraphTextItem().setTitle('Describe yourself:');
+     *     var paragraphtextValidation = FormApp.createParagraphTextValidation()
+     *       .setHelpText(“Answer must be more than 100 characters.”)
+     *       .requireTextLengthGreatherThan(100);
+     *     paragraphTextItem.setValidation(paragraphtextValidation);
      */
     export interface ParagraphTextValidation {
-      getHelpText(): string;
     }
 
     /**
      * A DataValidationBuilder for a ParagraphTextValidation.
      *
-     *      // Add a paragraph text item to a form and require the answer to be at least 100 characters.
-     *      var paragraphTextItem = form.addParagraphTextItem().setTitle('Describe yourself:');
-     *      var paragraphtextValidation = FormApp.createParagraphTextValidation()
-     *        .setHelpText(“Answer must be more than 100 characters.”)
-     *        .requireTextLengthGreatherThan(100);
-     *      paragraphTextItem.setValidation(paragraphtextValidation);
+     *     // Add a paragraph text item to a form and require the answer to be at least 100 characters.
+     *     var paragraphTextItem = form.addParagraphTextItem().setTitle('Describe yourself:');
+     *     var paragraphtextValidation = FormApp.createParagraphTextValidation()
+     *       .setHelpText(“Answer must be more than 100 characters.”)
+     *       .requireTextLengthGreatherThan(100);
+     *     paragraphTextItem.setValidation(paragraphtextValidation);
      */
     export interface ParagraphTextValidationBuilder {
-      build(): ParagraphTextValidation;
-      copy(): ParagraphTextValidationBuilder;
       requireTextContainsPattern(pattern: string): ParagraphTextValidationBuilder;
       requireTextDoesNotContainPattern(pattern: string): ParagraphTextValidationBuilder;
       requireTextDoesNotMatchPattern(pattern: string): ParagraphTextValidationBuilder;
       requireTextLengthGreaterThanOrEqualTo(number: Integer): ParagraphTextValidationBuilder;
       requireTextLengthLessThanOrEqualTo(number: Integer): ParagraphTextValidationBuilder;
       requireTextMatchesPattern(pattern: string): ParagraphTextValidationBuilder;
-      setHelpText(text: string): ParagraphTextValidationBuilder;
     }
 
     /**
      * The bean implementation of a Feedback, which contains properties common to all feedback, such as
-     *  display text or links.
+     * display text or links.
      *
-     *  Feedback can be added to gradeable Form items.
+     * Feedback can be added to gradeable Form items.
      *
-     *      // Setting feedback which should be automatically shown when a user responds to a question
-     *      // incorrectly.
-     *      var textItem = form.addTextItem().setTitle('Re-hydrating dried fruit is an example of what?');
-     *      var feedback = FormApp.createFeedback()
-     *        .setDisplayText(
-     *            “Good answer, but not quite right.  Please review chapter 4 before next time.”)
-     *        .addLink("http://wikipedia.com/osmosis");
-     *      textItem.setFeedbackForIncorrect(feedback);
+     *     // Setting feedback which should be automatically shown when a user responds to a question
+     *     // incorrectly.
+     *     var textItem = form.addTextItem().setTitle('Re-hydrating dried fruit is an example of what?');
+     *     var feedback = FormApp.createFeedback()
+     *       .setDisplayText(
+     *           “Good answer, but not quite right.  Please review chapter 4 before next time.”)
+     *       .addLink("http://wikipedia.com/osmosis");
+     *     textItem.setFeedbackForIncorrect(feedback);
      */
     export interface QuizFeedback {
       getLinkUrls(): string[];
@@ -872,18 +895,18 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * The base FeedbackBuilder that contains setters for properties common to all feedback,
-     *  such as display text. Used to build Feedback objects.
+     * The base FeedbackBuilder that contains setters for properties common to all feedback, such as
+     * display text. Used to build Feedback objects.
      *
-     *      // Open a form by ID and add a new list item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addListItem();
-     *      item.setTitle('Do you prefer cats or dogs?');
-     *      item.setChoices([
-     *        item.createChoice('Dogs', true),
-     *        item.createChoice('Cats', false)]);
-     *      // Add feedback which will be shown for correct responses; ie "Dogs".
-     *      item.setFeedbackForCorrect(FormApp.createFeedback().setText("Dogs rule, cats drool.").build());
+     *     // Open a form by ID and add a new list item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addListItem();
+     *     item.setTitle('Do you prefer cats or dogs?');
+     *     item.setChoices([
+     *       item.createChoice('Dogs', true),
+     *       item.createChoice('Cats', false)]);
+     *     // Add feedback which will be shown for correct responses; ie "Dogs".
+     *     item.setFeedbackForCorrect(FormApp.createFeedback().setText("Dogs rule, cats drool.").build());
      */
     export interface QuizFeedbackBuilder {
       addLink(url: string): QuizFeedbackBuilder;
@@ -894,15 +917,15 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A question item that allows the respondent to choose one option from a numbered sequence
-     *  of radio buttons. Items can be accessed or created from a Form. When used in a quiz,
-     *  these items are graded.
+     * A question item that allows the respondent to choose one option from a numbered sequence of radio
+     * buttons. Items can be accessed or created from a Form. When used in a quiz, these items
+     * are graded.
      *
-     *      // Open a form by ID and add a new scale item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addScaleItem();
-     *      item.setTitle('Pick a number between 1 and 10')
-     *          .setBounds(1, 10);
+     *     // Open a form by ID and add a new scale item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addScaleItem();
+     *     item.setTitle('Pick a number between 1 and 10')
+     *         .setBounds(1, 10);
      */
     export interface ScaleItem {
       createResponse(response: Integer): ItemResponse;
@@ -930,12 +953,12 @@ declare namespace GoogleAppsScript {
 
     /**
      * A layout item that visually indicates the start of a section. Items can be accessed or created
-     *  from a Form.
+     * from a Form.
      *
-     *      // Open a form by ID and add a new section header.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addSectionHeaderItem();
-     *      item.setTitle('Title of new section');
+     *     // Open a form by ID and add a new section header.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addSectionHeaderItem();
+     *     item.setTitle('Title of new section');
      */
     export interface SectionHeaderItem {
       duplicate(): SectionHeaderItem;
@@ -949,13 +972,13 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A question item that allows the respondent to enter a single line of text. Items can be
-     *  accessed or created from a Form. When used in a quiz, these items are graded.
+     * A question item that allows the respondent to enter a single line of text. Items can be accessed
+     * or created from a Form. When used in a quiz, these items are graded.
      *
-     *      // Open a form by ID and add a new text item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addTextItem();
-     *      item.setTitle('What is your name?');
+     *     // Open a form by ID and add a new text item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addTextItem();
+     *     item.setTitle('What is your name?');
      */
     export interface TextItem {
       clearValidation(): TextItem;
@@ -980,31 +1003,28 @@ declare namespace GoogleAppsScript {
     /**
      * A DataValidation for a TextItem.
      *
-     *      // Add a text item to a form and require it to be a number within a range.
-     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
-     *      var textValidation = FormApp.createTextValidation()
-     *        .setHelpText(“Input was not a number between 1 and 100.”)
-     *        .requireNumberBetween(1, 100)
-     *        .build();
-     *      textItem.setValidation(textValidation);
+     *     // Add a text item to a form and require it to be a number within a range.
+     *     var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
+     *     var textValidation = FormApp.createTextValidation()
+     *       .setHelpText(“Input was not a number between 1 and 100.”)
+     *       .requireNumberBetween(1, 100)
+     *       .build();
+     *     textItem.setValidation(textValidation);
      */
     export interface TextValidation {
-      getHelpText(): string;
     }
 
     /**
      * A DataValidationBuilder for a TextValidation.
      *
-     *      // Add a text item to a form and require it to be a number within a range.
-     *      var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
-     *      var textValidation = FormApp.createTextValidation()
-     *        .setHelpText(“Input was not a number between 1 and 100.”)
-     *        .requireNumberBetween(1, 100);
-     *      textItem.setValidation(textValidation);
+     *     // Add a text item to a form and require it to be a number within a range.
+     *     var textItem = form.addTextItem().setTitle('Pick a number between 1 and 100?');
+     *     var textValidation = FormApp.createTextValidation()
+     *       .setHelpText(“Input was not a number between 1 and 100.”)
+     *       .requireNumberBetween(1, 100);
+     *     textItem.setValidation(textValidation);
      */
     export interface TextValidationBuilder {
-      build(): TextValidation;
-      copy(): TextValidationBuilder;
       requireNumber(): TextValidationBuilder;
       requireNumberBetween(start: Number, end: Number): TextValidationBuilder;
       requireNumberEqualTo(number: Number): TextValidationBuilder;
@@ -1023,17 +1043,16 @@ declare namespace GoogleAppsScript {
       requireTextLengthLessThanOrEqualTo(number: Integer): TextValidationBuilder;
       requireTextMatchesPattern(pattern: string): TextValidationBuilder;
       requireWholeNumber(): TextValidationBuilder;
-      setHelpText(text: string): TextValidationBuilder;
     }
 
     /**
-     * A question item that allows the respondent to indicate a time of day. Items can be
-     *  accessed or created from a Form. When used in a quiz, these items are graded.
+     * A question item that allows the respondent to indicate a time of day. Items can be accessed or
+     * created from a Form. When used in a quiz, these items are graded.
      *
-     *      // Open a form by ID and add a new time item.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      var item = form.addTimeItem();
-     *      item.setTitle('What time do you usually wake up in the morning?');
+     *     // Open a form by ID and add a new time item.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     var item = form.addTimeItem();
+     *     item.setTitle('What time do you usually wake up in the morning?');
      */
     export interface TimeItem {
       createResponse(hour: Integer, minute: Integer): ItemResponse;
@@ -1056,23 +1075,23 @@ declare namespace GoogleAppsScript {
     /**
      * A layout item that displays a video. Items can be accessed or created from a Form.
      *
-     *      // Open a form by ID and add three new video items, using a long URL,
-     *      // a short URL, and a video ID.
-     *      var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
-     *      form.addVideoItem()
-     *          .setTitle('Video Title')
-     *          .setHelpText('Video Caption')
-     *          .setVideoUrl('www.youtube.com/watch?v=1234abcdxyz');
+     *     // Open a form by ID and add three new video items, using a long URL,
+     *     // a short URL, and a video ID.
+     *     var form = FormApp.openById('1234567890abcdefghijklmnopqrstuvwxyz');
+     *     form.addVideoItem()
+     *         .setTitle('Video Title')
+     *         .setHelpText('Video Caption')
+     *         .setVideoUrl('www.youtube.com/watch?v=1234abcdxyz');
      *
-     *      form.addVideoItem()
-     *          .setTitle('Video Title')
-     *          .setHelpText('Video Caption')
-     *          .setVideoUrl('youtu.be/1234abcdxyz');
+     *     form.addVideoItem()
+     *         .setTitle('Video Title')
+     *         .setHelpText('Video Caption')
+     *         .setVideoUrl('youtu.be/1234abcdxyz');
      *
-     *      form.addVideoItem()
-     *          .setTitle('Video Title')
-     *          .setHelpText('Video Caption')
-     *          .setVideoUrl('1234abcdxyz');
+     *     form.addVideoItem()
+     *         .setTitle('Video Title')
+     *         .setHelpText('Video Caption')
+     *         .setVideoUrl('1234abcdxyz');
      */
     export interface VideoItem {
       duplicate(): VideoItem;
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 4967f53394..9a241db3e0 100644
--- a/types/google-apps-script/google-apps-script.gmail.d.ts
+++ b/types/google-apps-script/google-apps-script.gmail.d.ts
@@ -1,7 +1,6 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // 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" />
@@ -14,7 +13,7 @@ declare namespace GoogleAppsScript {
      */
     export interface GmailApp {
       createDraft(recipient: string, subject: string, body: string): GmailDraft;
-      createDraft(recipient: string, subject: string, body: string, options: GmailDraftOptions): GmailDraft;
+      createDraft(recipient: string, subject: string, body: string, options: Object): GmailDraft;
       createLabel(name: string): GmailLabel;
       deleteLabel(label: GmailLabel): GmailApp;
       getAliases(): string[];
@@ -81,23 +80,21 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An attachment from Gmail. This is a regular
-     *  Blob except that it has an extra
-     *  getSize() method that is faster than calling getBytes().length and does
-     *  not count against the Gmail read quota.
+     * An attachment from Gmail. This is a regular Blob except that it has an extra getSize() method that is faster than calling
+     * getBytes().length and does not count against the Gmail read quota.
      *
-     *      // Logs information about any attachments in the first 100 inbox threads.
-     *      var threads = GmailApp.getInboxThreads(0, 100);
-     *      var msgs = GmailApp.getMessagesForThreads(threads);
-     *      for (var i = 0 ; i < msgs.length; i++) {
-     *        for (var j = 0; j < msgs[i].length; j++) {
-     *          var attachments = msgs[i][j].getAttachments();
-     *          for (var k = 0; k < attachments.length; k++) {
-     *            Logger.log('Message "%s" contains the attachment "%s" (%s bytes)',
-     *                       msgs[i][j].getSubject(), attachments[k].getName(), attachments[k].getSize());
-     *          }
-     *        }
-     *      }
+     *     // Logs information about any attachments in the first 100 inbox threads.
+     *     var threads = GmailApp.getInboxThreads(0, 100);
+     *     var msgs = GmailApp.getMessagesForThreads(threads);
+     *     for (var i = 0 ; i < msgs.length; i++) {
+     *       for (var j = 0; j < msgs[i].length; j++) {
+     *         var attachments = msgs[i][j].getAttachments();
+     *         for (var k = 0; k < attachments.length; k++) {
+     *           Logger.log('Message "%s" contains the attachment "%s" (%s bytes)',
+     *                      msgs[i][j].getSubject(), attachments[k].getName(), attachments[k].getSize());
+     *         }
+     *       }
+     *     }
      */
     export interface GmailAttachment {
       copyBlob(): Base.Blob;
@@ -118,6 +115,9 @@ declare namespace GoogleAppsScript {
       getAllBlobs(): Base.Blob[];
     }
 
+    /**
+     * A user-created draft message in a user's Gmail account.
+     */
     export interface GmailDraft {
       /**
        * Deletes this draft message.
@@ -149,6 +149,9 @@ declare namespace GoogleAppsScript {
       update(recipient: string, subject: string, body: string, options: GmailDraftOptions): GmailDraft;
     }
 
+    /**
+     * Options for a Gmail draft.
+     */
     export type GmailDraftOptions = {
       /**
        * An array of files to send with the email.
@@ -208,7 +211,7 @@ declare namespace GoogleAppsScript {
       createDraftReplyAll(body: string): GmailDraft;
       createDraftReplyAll(body: string, options: GmailDraftOptions): GmailDraft;
       forward(recipient: string): GmailMessage;
-      forward(recipient: string, options: Object): GmailMessage;
+      forward(recipient: string, options: GmailDraftOptions): GmailMessage;
       getAttachments(): GmailAttachment[];
       getBcc(): string;
       getBody(): string;
@@ -225,6 +228,7 @@ declare namespace GoogleAppsScript {
       isDraft(): boolean;
       isInChats(): boolean;
       isInInbox(): boolean;
+      isInPriorityInbox(): boolean;
       isInTrash(): boolean;
       isStarred(): boolean;
       isUnread(): boolean;
@@ -233,9 +237,9 @@ declare namespace GoogleAppsScript {
       moveToTrash(): GmailMessage;
       refresh(): GmailMessage;
       reply(body: string): GmailMessage;
-      reply(body: string, options: Object): GmailMessage;
+      reply(body: string, options: GmailDraftOptions): GmailMessage;
       replyAll(body: string): GmailMessage;
-      replyAll(body: string, options: Object): GmailMessage;
+      replyAll(body: string, options: GmailDraftOptions): GmailMessage;
       star(): GmailMessage;
       unstar(): GmailMessage;
     }
@@ -260,6 +264,7 @@ declare namespace GoogleAppsScript {
       isImportant(): boolean;
       isInChats(): boolean;
       isInInbox(): boolean;
+      isInPriorityInbox(): boolean;
       isInSpam(): boolean;
       isInTrash(): boolean;
       isUnread(): boolean;
@@ -274,11 +279,10 @@ declare namespace GoogleAppsScript {
       refresh(): GmailThread;
       removeLabel(label: GmailLabel): GmailThread;
       reply(body: string): GmailThread;
-      reply(body: string, options: Object): GmailThread;
+      reply(body: string, options: GmailDraftOptions): GmailThread;
       replyAll(body: string): GmailThread;
-      replyAll(body: string, options: Object): GmailThread;
+      replyAll(body: string, options: GmailDraftOptions): GmailThread;
     }
-
   }
 }
 
diff --git a/types/google-apps-script/google-apps-script.groups.d.ts b/types/google-apps-script/google-apps-script.groups.d.ts
index e6833bb840..757029f044 100644
--- a/types/google-apps-script/google-apps-script.groups.d.ts
+++ b/types/google-apps-script/google-apps-script.groups.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,41 +9,42 @@
 declare namespace GoogleAppsScript {
   export module Groups {
     /**
-     * A group object whose members and those members' roles within the group
-     *  can be queried.
+     * A group object whose members and those members' roles within the group can be queried.
      *
-     *  Here's an example which shows the members of a group. Before running it,
-     *  replace the email address of the group with that of one on your domain.
+     * Here's an example which shows the members of a group. Before running it, replace the email
+     * address of the group with that of one on your domain.
      *
-     *        function listGroupMembers() {
-     *          var group = GroupsApp.getGroupByEmail("example@googlegroups.com");
-     *          var s = group.getEmail() + ': ';
-     *          var users = group.getUsers();
-     *          for (var i = 0; i < users.length; i++) {
-     *            var user = users[i];
-     *            s = s + user.getEmail() + ", ";
-     *          }
-     *          Logger.log(s);
-     *        }
+     *     function listGroupMembers() {
+     *       var group = GroupsApp.getGroupByEmail("example@googlegroups.com");
+     *       var s = group.getEmail() + ': ';
+     *       var users = group.getUsers();
+     *       for (var i = 0; i < users.length; i++) {
+     *         var user = users[i];
+     *         s = s + user.getEmail() + ", ";
+     *       }
+     *       Logger.log(s);
+     *     }
      */
     export interface Group {
       getEmail(): string;
+      getGroups(): Group[];
       getRole(email: string): Role;
       getRole(user: Base.User): Role;
       getUsers(): Base.User[];
+      hasGroup(group: Group): boolean;
+      hasGroup(email: string): boolean;
       hasUser(email: string): boolean;
       hasUser(user: Base.User): boolean;
     }
 
     /**
-     * This class provides access to Google Groups information. It can be used to
-     *  query information such as a group's email address, or the list of groups in
-     *  which the user is a direct member.
+     * This class provides access to Google Groups information. It can be used to query information such
+     * as a group's email address, or the list of groups in which the user is a direct member.
      *
-     *  Here's an example that shows how many groups the current user is a member of:
+     * Here's an example that shows how many groups the current user is a member of:
      *
-     *        var groups = GroupsApp.getGroups();
-     *        Logger.log('You belong to ' + groups.length + ' groups.');
+     *     var groups = GroupsApp.getGroups();
+     *     Logger.log('You belong to ' + groups.length + ' groups.');
      */
     export interface GroupsApp {
       Role: typeof Role;
@@ -52,9 +53,8 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Possible roles of a user within a group, such as owner or ordinary member.
-     *  Users subscribed to a group have exactly one role within the context of that
-     *  group.
+     * Possible roles of a user within a group, such as owner or ordinary member. Users subscribed to a
+     * group have exactly one role within the context of that group.
      * See also
      *
      * Group.getRole(email)
diff --git a/types/google-apps-script/google-apps-script.html.d.ts b/types/google-apps-script/google-apps-script.html.d.ts
index f471d23eb3..a16a491d12 100644
--- a/types/google-apps-script/google-apps-script.html.d.ts
+++ b/types/google-apps-script/google-apps-script.html.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,12 +10,12 @@ declare namespace GoogleAppsScript {
   export module HTML {
     /**
      * An HtmlOutput object that can be served from a script. Due to security considerations,
-     *  scripts cannot directly return HTML to a browser. Instead, they must sanitize it so that it
-     *  cannot perform malicious actions. You can return sanitized HTML like this:
+     * scripts cannot directly return HTML to a browser. Instead, they must sanitize it so that it
+     * cannot perform malicious actions. You can return sanitized HTML like this:
      *
-     *      function doGet() {
-     *        return HtmlService.createHtmlOutput('<b>Hello, world!</b>');
-     *      }
+     *     function doGet() {
+     *       return HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *     }
      *
      * HtmlOutput
      * Google Caja
@@ -45,14 +45,13 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An object that represents a meta tag added to the page by calling
-     *  HtmlOutput.addMetaTag(name, content).
+     * An object that represents a meta tag added to the page by calling HtmlOutput.addMetaTag(name, content).
      *
-     *      var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
-     *      output.addMetaTag('viewport', 'width=device-width, initial-scale=1');
+     *     var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *     output.addMetaTag('viewport', 'width=device-width, initial-scale=1');
      *
-     *      var tags = output.getMetaTags();
-     *      Logger.log('<meta name="%s" content="%s"/>', tags[0].getName(), tags[0].getContent());
+     *     var tags = output.getMetaTags();
+     *     Logger.log('<meta name="%s" content="%s"/>', tags[0].getName(), tags[0].getContent());
      */
     export interface HtmlOutputMetaTag {
       getContent(): string;
@@ -63,8 +62,8 @@ declare namespace GoogleAppsScript {
      * Service for returning HTML and other text content from a script.
      *
      * Due to security considerations, scripts cannot directly return content to a browser. Instead,
-     *  they must sanitize the HTML so that it cannot perform malicious actions. See the description of
-     *  HtmlOutput for what limitations this implies on what can be returned.
+     * they must sanitize the HTML so that it cannot perform malicious actions. See the description of
+     * HtmlOutput for what limitations this implies on what can be returned.
      */
     export interface HtmlService {
       SandboxMode: typeof SandboxMode;
@@ -80,8 +79,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A template object for dynamically constructing HTML. For more information, see the
-     *  guide to templates.
+     * A template object for dynamically constructing HTML. For more information, see the guide to templates.
      */
     export interface HtmlTemplate {
       evaluate(): HtmlOutput;
@@ -92,44 +90,44 @@ declare namespace GoogleAppsScript {
 
     /**
      * An enum representing the sandbox modes that can be used for client-side HtmlService
-     *  scripts. These values can be accessed from HtmlService.SandboxMode, and set by calling
-     *  HtmlOutput.setSandboxMode(mode).
+     * scripts. These values can be accessed from HtmlService.SandboxMode, and set by calling
+     * HtmlOutput.setSandboxMode(mode).
+     *
+     * The NATIVE and EMULATED modes were deprecated on October 13, 2015 and both are now sunset. Only
+     * IFRAME mode is now supported.
      *
-     * The NATIVE and EMULATED modes were
-     *  deprecated on October 13, 2015 and both are
-     *  now sunset.
-     *  Only IFRAME mode is now supported.
      * To protect users from being served malicious HTML or JavaScript, client-side code served from
-     *  HTML service executes in a security sandbox that imposes restrictions on the code. The method
-     *  HtmlOutput.setSandboxMode(mode) previously allowed script authors to choose
-     *  between different versions of the sandbox, but now has no effect. For more information, see the
-     *  guide to restrictions in HTML service.
+     * HTML service executes in a security sandbox that imposes restrictions on the code. The method
+     * HtmlOutput.setSandboxMode(mode) previously allowed script authors to choose
+     * between different versions of the sandbox, but now has no effect. For more information, see the
+     * guide to restrictions in HTML service.
+     *
      * The IFRAME mode imposes many fewer restrictions than the other sandbox modes and runs
-     *  fastest, but does not work at all in certain older browsers, including Internet Explorer 9.
+     * fastest, but does not work at all in certain older browsers, including Internet Explorer 9. The
+     * sandbox mode can also be read in a client-side script by inspecting google.script.sandbox.mode. Note that this property returns the actual mode on the client, which
+     * may differ from the mode requested on the server if the requested mode is not supported in the
+     * user's browser.
      *
-     * google.script.sandbox.mode
-     *
-     *      <!-- Read the sandbox mode (in a client-side script). -->
-     *      <script>
-     *        alert(google.script.sandbox.mode);
-     *      </script>
+     *     <!-- Read the sandbox mode (in a client-side script). -->
+     *     <script>
+     *       alert(google.script.sandbox.mode);
+     *     </script>
      */
     export enum SandboxMode { EMULATED, IFRAME, NATIVE }
 
     /**
-     * An enum representing the X-Frame-Options modes that can be used for client-side
-     *  HtmlService scripts. These values can be accessed from
-     *  HtmlService.XFrameOptionsMode, and set by calling
-     *  HtmlOutput.setXFrameOptionsMode(mode).
+     * An enum representing the X-Frame-Options modes that can be used for client-side HtmlService scripts. These values can be accessed from HtmlService.XFrameOptionsMode,
+     * and set by calling HtmlOutput.setXFrameOptionsMode(mode).
      *
      * Setting XFrameOptionsMode.ALLOWALL will let any site iframe the page, so the developer
-     *  should implement their own protection against clickjacking.
-     * If a script does not set an X-Frame-Options mode, Apps Script uses DEFAULT
-     *  mode as the default.
+     * should implement their own protection against clickjacking.
      *
-     *      // Serve HTML with no X-Frame-Options header (in Apps Script server-side code).
-     *      var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
-     *      output.setXFrameOptionsMode(HtmlService.XFrameOptionsMode.ALLOWALL);
+     * If a script does not set an X-Frame-Options mode, Apps Script uses DEFAULT
+     * mode as the default.
+     *
+     *     // Serve HTML with no X-Frame-Options header (in Apps Script server-side code).
+     *     var output = HtmlService.createHtmlOutput('<b>Hello, world!</b>');
+     *     output.setXFrameOptionsMode(HtmlService.XFrameOptionsMode.ALLOWALL);
      */
     export enum XFrameOptionsMode { ALLOWALL, DEFAULT }
 
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 96ae94abac..9f93cf3661 100644
--- a/types/google-apps-script/google-apps-script.jdbc.d.ts
+++ b/types/google-apps-script/google-apps-script.jdbc.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,8 +10,7 @@ declare namespace GoogleAppsScript {
   export module JDBC {
     /**
      * The JDBC service allows scripts to connect to Google Cloud SQL, MySQL,
-     *  Microsoft SQL Server, and Oracle databases. For more information, see the
-     *  guide to JDBC.
+     * Microsoft SQL Server, and Oracle databases. For more information, see the guide to JDBC.
      */
     export interface Jdbc {
       getCloudSqlConnection(url: string): JdbcConnection;
@@ -60,11 +59,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A JDBC CallableStatement. For documentation of this class, see
-     *  java.sql.CallableStatement.
+     * A JDBC CallableStatement. For documentation of this class, see java.sql.CallableStatement.
      * See also
      *
-     *  CallableStatement
+     *     CallableStatement
      */
     export interface JdbcCallableStatement {
       addBatch(): void;
@@ -299,8 +297,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A JDBC DatabaseMetaData. For documentation of this class, see
-     *  java.sql.DatabaseMetaData.
+     * A JDBC DatabaseMetaData. For documentation of this class, see java.sql.DatabaseMetaData.
      */
     export interface JdbcDatabaseMetaData {
       allProceduresAreCallable(): boolean;
@@ -494,8 +491,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A JDBC ParameterMetaData. For documentation of this class, see
-     *  java.sql.ParameterMetaData.
+     * A JDBC ParameterMetaData. For documentation of this class, see java.sql.ParameterMetaData.
      */
     export interface JdbcParameterMetaData {
       getParameterClassName(param: Integer): string;
@@ -510,8 +506,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A JDBC PreparedStatement. For documentation of this class, see
-     *  java.sql.PreparedStatement.
+     * A JDBC PreparedStatement. For documentation of this class, see java.sql.PreparedStatement.
      */
     export interface JdbcPreparedStatement {
       addBatch(): void;
@@ -748,8 +743,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A JDBC ResultSetMetaData. For documentation of this class, see
-     *  java.sql.ResultSetMetaData.
+     * A JDBC ResultSetMetaData. For documentation of this class, see java.sql.ResultSetMetaData.
      */
     export interface JdbcResultSetMetaData {
       getCatalogName(column: Integer): string;
diff --git a/types/google-apps-script/google-apps-script.language.d.ts b/types/google-apps-script/google-apps-script.language.d.ts
index 488568feec..5462e2dd4a 100644
--- a/types/google-apps-script/google-apps-script.language.d.ts
+++ b/types/google-apps-script/google-apps-script.language.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,9 +10,9 @@ declare namespace GoogleAppsScript {
     /**
      * The Language service provides scripts a way to compute automatic translations of text.
      *
-     *      // The code below will write "Esta es una prueba" to the log.
-     *      var spanish = LanguageApp.translate('This is a test', 'en', 'es');
-     *      Logger.log(spanish);
+     *     // The code below will write "Esta es una prueba" to the log.
+     *     var spanish = LanguageApp.translate('This is a test', 'en', 'es');
+     *     Logger.log(spanish);
      */
     export interface LanguageApp {
       translate(text: string, sourceLanguage: string, targetLanguage: string): string;
diff --git a/types/google-apps-script/google-apps-script.lock.d.ts b/types/google-apps-script/google-apps-script.lock.d.ts
index f255efbc14..5b939755e9 100644
--- a/types/google-apps-script/google-apps-script.lock.d.ts
+++ b/types/google-apps-script/google-apps-script.lock.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,29 +10,29 @@ declare namespace GoogleAppsScript {
     /**
      * A representation of a mutual-exclusion lock.
      *
-     *  This class allows scripts to make sure that only one instance of the script is executing a given
-     *  section of code at a time. This is particularly useful for callbacks and triggers, where a user
-     *  action may cause changes to a shared resource and you want to ensure that aren't collisions.
+     * This class allows scripts to make sure that only one instance of the script is executing a
+     * given section of code at a time. This is particularly useful for callbacks and triggers, where a
+     * user action may cause changes to a shared resource and you want to ensure that aren't collisions.
      *
-     *  The following examples shows how to use a lock in a form submit handler.
+     * The following examples shows how to use a lock in a form submit handler.
      *
-     *      // Generates a unique ticket number for every form submission.
-     *      function onFormSubmit(e) {
-     *        var targetCell = e.range.offset(0, e.range.getNumColumns(), 1, 1);
+     *     // Generates a unique ticket number for every form submission.
+     *     function onFormSubmit(e) {
+     *       var targetCell = e.range.offset(0, e.range.getNumColumns(), 1, 1);
      *
-     *        // Get a script lock, because we're about to modify a shared resource.
-     *        var lock = LockService.getScriptLock();
-     *        // Wait for up to 30 seconds for other processes to finish.
-     *        lock.waitLock(30000);
+     *       // Get a script lock, because we're about to modify a shared resource.
+     *       var lock = LockService.getScriptLock();
+     *       // Wait for up to 30 seconds for other processes to finish.
+     *       lock.waitLock(30000);
      *
-     *        var ticketNumber = Number(ScriptProperties.getProperty('lastTicketNumber')) + 1;
-     *        ScriptProperties.setProperty('lastTicketNumber', ticketNumber);
+     *       var ticketNumber = Number(ScriptProperties.getProperty('lastTicketNumber')) + 1;
+     *       ScriptProperties.setProperty('lastTicketNumber', ticketNumber);
      *
-     *        // Release the lock so that other processes can continue.
-     *        lock.releaseLock();
+     *       // Release the lock so that other processes can continue.
+     *       lock.releaseLock();
      *
-     *        targetCell.setValue(ticketNumber);
-     *      }
+     *       targetCell.setValue(ticketNumber);
+     *     }
      *
      * lastTicketNumber
      * ScriptProperties
@@ -46,7 +46,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * Prevents concurrent access to sections of code. This can be useful when you have multiple users
-     *  or processes modifying a shared resource and want to prevent collisions.
+     * or processes modifying a shared resource and want to prevent collisions.
      */
     export interface LockService {
       getDocumentLock(): Lock;
diff --git a/types/google-apps-script/google-apps-script.mail.d.ts b/types/google-apps-script/google-apps-script.mail.d.ts
index 2cb8b3cb5f..29c5fbf1e2 100644
--- a/types/google-apps-script/google-apps-script.mail.d.ts
+++ b/types/google-apps-script/google-apps-script.mail.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,12 +10,12 @@ declare namespace GoogleAppsScript {
     /**
      * Sends email.
      *
-     * This service allows users to send emails with complete control over the
-     *  content of the email. Unlike GmailApp, MailApp's sole purpose is sending email. MailApp cannot
-     *  access a user's Gmail inbox.
+     * This service allows users to send emails with complete control over the content of the email.
+     * Unlike GmailApp, MailApp's sole purpose is sending email. MailApp cannot access a user's Gmail
+     * inbox.
      *
      * Changes to scripts written using GmailApp are more likely to trigger a re-authorization
-     *  request from a user than MailApp scripts.
+     * request from a user than MailApp scripts.
      */
     export interface MailApp {
       getRemainingDailyQuota(): Integer;
diff --git a/types/google-apps-script/google-apps-script.maps.d.ts b/types/google-apps-script/google-apps-script.maps.d.ts
index e9620ee144..ee5f185da4 100644
--- a/types/google-apps-script/google-apps-script.maps.d.ts
+++ b/types/google-apps-script/google-apps-script.maps.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -20,51 +20,50 @@ declare namespace GoogleAppsScript {
 
     /**
      * Allows for the retrieval of directions between locations.
+     * The example below shows how you can use this class to get the directions from Times Square to
+     * Central Park, stopping first at Lincoln Center, plot the locations and path on a map, and send
+     * the map in an email.
      *
-     *  The example below shows how you can use this class to get the directions from Times Square to
-     *  Central Park, stopping first at Lincoln Center, plot the locations and path on a map,
-     *  and send the map in an email.
+     *     // Get the directions.
+     *     var directions = Maps.newDirectionFinder()
+     *         .setOrigin('Times Square, New York, NY')
+     *         .addWaypoint('Lincoln Center, New York, NY')
+     *         .setDestination('Central Park, New York, NY')
+     *         .setMode(Maps.DirectionFinder.Mode.DRIVING)
+     *         .getDirections();
+     *     var route = directions.routes[0];
      *
-     *      // Get the directions.
-     *      var directions = Maps.newDirectionFinder()
-     *          .setOrigin('Times Square, New York, NY')
-     *          .addWaypoint('Lincoln Center, New York, NY')
-     *          .setDestination('Central Park, New York, NY')
-     *          .setMode(Maps.DirectionFinder.Mode.DRIVING)
-     *          .getDirections();
-     *      var route = directions.routes[0];
+     *     // Set up marker styles.
+     *     var markerSize = Maps.StaticMap.MarkerSize.MID;
+     *     var markerColor = Maps.StaticMap.Color.GREEN
+     *     var markerLetterCode = 'A'.charCodeAt();
      *
-     *      // Set up marker styles.
-     *      var markerSize = Maps.StaticMap.MarkerSize.MID;
-     *      var markerColor = Maps.StaticMap.Color.GREEN
-     *      var markerLetterCode = 'A'.charCodeAt();
+     *     // Add markers to the map.
+     *     var map = Maps.newStaticMap();
+     *     for (var i = 0; i < route.legs.length; i++) {
+     *       var leg = route.legs[i];
+     *       if (i == 0) {
+     *         // Add a marker for the start location of the first leg only.
+     *         map.setMarkerStyle(markerSize, markerColor, String.fromCharCode(markerLetterCode));
+     *         map.addMarker(leg.start_location.lat, leg.start_location.lng);
+     *         markerLetterCode++;
+     *       }
+     *       map.setMarkerStyle(markerSize, markerColor, String.fromCharCode(markerLetterCode));
+     *       map.addMarker(leg.end_location.lat, leg.end_location.lng);
+     *       markerLetterCode++;
+     *     }
      *
-     *      // Add markers to the map.
-     *      var map = Maps.newStaticMap();
-     *      for (var i = 0; i < route.legs.length; i++) {
-     *        var leg = route.legs[i];
-     *        if (i == 0) {
-     *          // Add a marker for the start location of the first leg only.
-     *          map.setMarkerStyle(markerSize, markerColor, String.fromCharCode(markerLetterCode));
-     *          map.addMarker(leg.start_location.lat, leg.start_location.lng);
-     *          markerLetterCode++;
-     *        }
-     *        map.setMarkerStyle(markerSize, markerColor, String.fromCharCode(markerLetterCode));
-     *        map.addMarker(leg.end_location.lat, leg.end_location.lng);
-     *        markerLetterCode++;
-     *      }
+     *     // Add a path for the entire route.
+     *     map.addPath(route.overview_polyline.points);
      *
-     *      // Add a path for the entire route.
-     *      map.addPath(route.overview_polyline.points);
-     *
-     *      // Send the map in an email.
-     *      var toAddress = Session.getActiveUser().getEmail();
-     *      MailApp.sendEmail(toAddress, 'Directions', 'Please open: ' + map.getMapUrl(), {
-     *        htmlBody: 'See below.<br/><img src="cid:mapImage">',
-     *        inlineImages: {
-     *          mapImage: Utilities.newBlob(map.getMapImage(), 'image/png')
-     *        }
-     *      });
+     *     // Send the map in an email.
+     *     var toAddress = Session.getActiveUser().getEmail();
+     *     MailApp.sendEmail(toAddress, 'Directions', 'Please open: ' + map.getMapUrl(), {
+     *       htmlBody: 'See below.<br/><img src="cid:mapImage">',
+     *       inlineImages: {
+     *         mapImage: Utilities.newBlob(map.getMapImage(), 'image/png')
+     *       }
+     *     });
      *
      * See also
      *
@@ -99,41 +98,40 @@ declare namespace GoogleAppsScript {
 
     /**
      * Allows for the sampling of elevations at particular locations.
+     * The example below shows how you can use this class to determine the highest point along the route
+     * from Denver to Grand Junction in Colorado, plot it on a map, and save the map to Google Drive.
      *
-     *  The example below shows how you can use this class to determine the highest point along the route
-     *  from Denver to Grand Junction in Colorado, plot it on a map, and save the map to Google Drive.
+     *     // Get directions from Denver to Grand Junction.
+     *     var directions = Maps.newDirectionFinder()
+     *         .setOrigin('Denver, CO')
+     *         .setDestination('Grand Junction, CO')
+     *         .setMode(Maps.DirectionFinder.Mode.DRIVING)
+     *         .getDirections();
+     *     var route = directions.routes[0];
      *
-     *      // Get directions from Denver to Grand Junction.
-     *      var directions = Maps.newDirectionFinder()
-     *          .setOrigin('Denver, CO')
-     *          .setDestination('Grand Junction, CO')
-     *          .setMode(Maps.DirectionFinder.Mode.DRIVING)
-     *          .getDirections();
-     *      var route = directions.routes[0];
+     *     // Get elevation samples along the route.
+     *     var numberOfSamples = 30;
+     *     var response = Maps.newElevationSampler()
+     *         .samplePath(route.overview_polyline.points, numberOfSamples)
      *
-     *      // Get elevation samples along the route.
-     *      var numberOfSamples = 30;
-     *      var response = Maps.newElevationSampler()
-     *          .samplePath(route.overview_polyline.points, numberOfSamples)
+     *     // Determine highest point.
+     *     var maxElevation = Number.MIN_VALUE;
+     *     var highestPoint = null;
+     *     for (var i = 0; i < response.results.length; i++) {
+     *       var sample = response.results[i];
+     *       if (sample.elevation > maxElevation) {
+     *         maxElevation = sample.elevation;
+     *         highestPoint = sample.location;
+     *       }
+     *     }
      *
-     *      // Determine highest point.
-     *      var maxElevation = Number.MIN_VALUE;
-     *      var highestPoint = null;
-     *      for (var i = 0; i < response.results.length; i++) {
-     *        var sample = response.results[i];
-     *        if (sample.elevation > maxElevation) {
-     *          maxElevation = sample.elevation;
-     *          highestPoint = sample.location;
-     *        }
-     *      }
+     *     // Add the path and marker to a map.
+     *     var map = Maps.newStaticMap()
+     *         .addPath(route.overview_polyline.points)
+     *         .addMarker(highestPoint.lat, highestPoint.lng);
      *
-     *      // Add the path and marker to a map.
-     *      var map = Maps.newStaticMap()
-     *          .addPath(route.overview_polyline.points)
-     *          .addMarker(highestPoint.lat, highestPoint.lng);
-     *
-     *      // Save the map to your drive
-     *      DocsList.createFile(Utilities.newBlob(map.getMapImage(), 'image/png', 'map.png'));
+     *     // Save the map to your drive
+     *     DocsList.createFile(Utilities.newBlob(map.getMapImage(), 'image/png', 'map.png'));
      *
      * See also
      *
@@ -157,30 +155,29 @@ declare namespace GoogleAppsScript {
 
     /**
      * Allows for the conversion between an address and geographical coordinates.
+     * The example below shows how you can use this class find the top nine matches for the location
+     * "Main St" in Colorado, add them to a map, and then embed it in a new Google Doc.
      *
-     *  The example below shows how you can use this class find the top nine matches for the location
-     *  "Main St" in Colorado, add them to a map, and then embed it in a new Google Doc.
+     *     // Find the best matches for "Main St" in Colorado.
+     *     var response = Maps.newGeocoder()
+     *         // The latitudes and longitudes of southwest and northeast corners of Colorado, respectively.
+     *         .setBounds(36.998166, -109.045486, 41.001666,-102.052002)
+     *         .geocode('Main St');
      *
-     *      // Find the best matches for "Main St" in Colorado.
-     *      var response = Maps.newGeocoder()
-     *          // The latitudes and longitudes of southwest and northeast corners of Colorado, respectively.
-     *          .setBounds(36.998166, -109.045486, 41.001666,-102.052002)
-     *          .geocode('Main St');
+     *     // Create a Google Doc and map.
+     *     var doc = DocumentApp.create('My Map');
+     *     var map = Maps.newStaticMap();
      *
-     *      // Create a Google Doc and map.
-     *      var doc = DocumentApp.create('My Map');
-     *      var map = Maps.newStaticMap();
+     *     // Add each result to the map and doc.
+     *     for (var i = 0; i < response.results.length && i < 9; i++) {
+     *       var result = response.results[i];
+     *       map.setMarkerStyle(null, null, i + 1);
+     *       map.addMarker(result.geometry.location.lat, result.geometry.location.lng);
+     *       doc.appendListItem(result.formatted_address);
+     *     }
      *
-     *      // Add each result to the map and doc.
-     *      for (var i = 0; i < response.results.length && i < 9; i++) {
-     *        var result = response.results[i];
-     *        map.setMarkerStyle(null, null, i + 1);
-     *        map.addMarker(result.geometry.location.lat, result.geometry.location.lng);
-     *        doc.appendListItem(result.formatted_address);
-     *      }
-     *
-     *      // Add the finished map to the doc.
-     *      doc.appendImage(Utilities.newBlob(map.getMapImage(), 'image/png'));
+     *     // Add the finished map to the doc.
+     *     doc.appendImage(Utilities.newBlob(map.getMapImage(), 'image/png'));
      *
      * See also
      *
@@ -197,7 +194,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * Allows for direction finding, geocoding, elevation sampling and the creation of static map
-     *  images.
+     * images.
      */
     export interface Maps {
       DirectionFinder: DirectionFinderEnums;
@@ -226,39 +223,38 @@ declare namespace GoogleAppsScript {
 
     /**
      * Allows for the creation and decoration of static map images.
+     * The example below shows how you can use this class to create a map of New York City's Theatre
+     * District, including nearby train stations, and display it in a simple web app.
      *
-     *  The example below shows how you can use this class to create a map of New York City's Theatre
-     *  District, including nearby train stations, and display it in a simple web app.
+     *     function doGet(event) {
+     *       // Create a map centered on Times Square.
+     *       var map = Maps.newStaticMap()
+     *           .setSize(600, 600)
+     *           .setCenter('Times Square, New York, NY');
      *
-     *      function doGet(event) {
-     *        // Create a map centered on Times Square.
-     *        var map = Maps.newStaticMap()
-     *            .setSize(600, 600)
-     *            .setCenter('Times Square, New York, NY');
+     *       // Add markers for the nearbye train stations.
+     *       map.setMarkerStyle(Maps.StaticMap.MarkerSize.MID, Maps.StaticMap.Color.RED, 'T');
+     *       map.addMarker('Grand Central Station, New York, NY');
+     *       map.addMarker('Penn Station, New York, NY');
      *
-     *        // Add markers for the nearbye train stations.
-     *        map.setMarkerStyle(Maps.StaticMap.MarkerSize.MID, Maps.StaticMap.Color.RED, 'T');
-     *        map.addMarker('Grand Central Station, New York, NY');
-     *        map.addMarker('Penn Station, New York, NY');
+     *       // Show the boundaries of the Theatre District.
+     *       var corners = [
+     *         '8th Ave & 53rd St, New York, NY',
+     *         '6th Ave & 53rd St, New York, NY',
+     *         '6th Ave & 40th St, New York, NY',
+     *         '8th Ave & 40th St, New York, NY'
+     *       ];
+     *       map.setPathStyle(4, Maps.StaticMap.Color.BLACK, Maps.StaticMap.Color.BLUE);
+     *       map.beginPath();
+     *       for (var i = 0; i < corners.length; i++) {
+     *         map.addAddress(corners[i]);
+     *       }
      *
-     *        // Show the boundaries of the Theatre District.
-     *        var corners = [
-     *          '8th Ave & 53rd St, New York, NY',
-     *          '6th Ave & 53rd St, New York, NY',
-     *          '6th Ave & 40th St, New York, NY',
-     *          '8th Ave & 40th St, New York, NY'
-     *        ];
-     *        map.setPathStyle(4, Maps.StaticMap.Color.BLACK, Maps.StaticMap.Color.BLUE);
-     *        map.beginPath();
-     *        for (var i = 0; i < corners.length; i++) {
-     *          map.addAddress(corners[i]);
-     *        }
-     *
-     *        // Create the user interface and add the map image.
-     *        var app = UiApp.createApplication().setTitle('NYC Theatre District');
-     *        app.add(app.createImage(map.getMapUrl()));
-     *        return app;
-     *      }
+     *       // Create the user interface and add the map image.
+     *       var app = UiApp.createApplication().setTitle('NYC Theatre District');
+     *       app.add(app.createImage(map.getMapUrl()));
+     *       return app;
+     *     }
      *
      * See also
      *
diff --git a/types/google-apps-script/google-apps-script.optimization.d.ts b/types/google-apps-script/google-apps-script.optimization.d.ts
index 8ac192c1e6..92fecb8619 100644
--- a/types/google-apps-script/google-apps-script.optimization.d.ts
+++ b/types/google-apps-script/google-apps-script.optimization.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -9,22 +9,22 @@ declare namespace GoogleAppsScript {
   export module Optimization {
     /**
      * Object storing a linear constraint of the form lowerBound ≤ Sum(a(i) x(i)) ≤ upperBound
-     *  where lowerBound and upperBound are constants, a(i) are constant
-     *  coefficients and x(i) are variables (unknowns).
+     * where lowerBound and upperBound are constants, a(i) are constant
+     * coefficients and x(i) are variables (unknowns).
      *
-     *  The example below creates one variable x with values between 0 and 5 and
-     *  creates the constraint 0 ≤ 2 * x ≤ 5. This is done by first creating a constraint with
-     *  the lower bound 5 and upper bound 5. Then the coefficient for variable x
-     *  in this constraint is set to 2.
+     * The example below creates one variable x with values between 0 and 5
+     * and creates the constraint 0 ≤ 2 * x ≤ 5. This is done by first creating a constraint
+     * with the lower bound 5 and upper bound 5. Then the coefficient for variable
+     * x in this constraint is set to 2.
      *
-     *       var engine = LinearOptimizationService.createEngine();
-     *       // Create a variable so we can add it to the constraint
-     *       engine.addVariable('x', 0, 5);
-     *       // Create a linear constraint with the bounds 0 and 10
-     *       var constraint = engine.addConstraint(0, 10);
-     *       // Set the coefficient of the variable in the constraint. The constraint is now:
-     *       // 0 <= 2 * x <= 5
-     *       constraint.setCoefficient('x', 2);
+     *     var engine = LinearOptimizationService.createEngine();
+     *     // Create a variable so we can add it to the constraint
+     *     engine.addVariable('x', 0, 5);
+     *     // Create a linear constraint with the bounds 0 and 10
+     *     var constraint = engine.addConstraint(0, 10);
+     *     // Set the coefficient of the variable in the constraint. The constraint is now:
+     *     // 0 <= 2 * x <= 5
+     *     constraint.setCoefficient('x', 2);
      */
     export interface LinearOptimizationConstraint {
       setCoefficient(variableName: string, coefficient: Number): LinearOptimizationConstraint;
@@ -32,55 +32,55 @@ declare namespace GoogleAppsScript {
 
     /**
      * The engine used to model and solve a linear program. The example below solves the following
-     *  linear program:
+     * linear program:
      *
-     *  Two variables, x and y:
+     * Two variables, x and y:
      *
      * 0 ≤ x ≤ 10
      *
      * 0 ≤ y ≤ 5
      *
-     *  Constraints:
+     * Constraints:
      *
      * 0 ≤ 2 * x + 5 * y ≤ 10
      *
      * 0 ≤ 10 * x + 3 * y ≤ 20
      *
-     *  Objective:
-     *  Maximize x + y
+     * Objective:
+     * Maximize x + y
      *
-     *      var engine = LinearOptimizationService.createEngine();
+     *     var engine = LinearOptimizationService.createEngine();
      *
-     *      // Add variables, constraints and define the objective with addVariable(), addConstraint(), etc
-     *      // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
-     *      engine.addVariable('x', 0, 10);
-     *      engine.addVariable('y', 0, 5);
+     *     // Add variables, constraints and define the objective with addVariable(), addConstraint(), etc
+     *     // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
+     *     engine.addVariable('x', 0, 10);
+     *     engine.addVariable('y', 0, 5);
      *
-     *      // Create the constraint: 0 <= 2 * x + 5 * y <= 10
-     *      var constraint = engine.addConstraint(0, 10);
-     *      constraint.setCoefficient('x', 2);
-     *      constraint.setCoefficient('y', 5);
+     *     // Create the constraint: 0 <= 2 * x + 5 * y <= 10
+     *     var constraint = engine.addConstraint(0, 10);
+     *     constraint.setCoefficient('x', 2);
+     *     constraint.setCoefficient('y', 5);
      *
-     *      // Create the constraint: 0 <= 10 * x + 3 * y <= 20
-     *      var constraint = engine.addConstraint(0, 20);
-     *      constraint.setCoefficient('x', 10);
-     *      constraint.setCoefficient('y', 3);
+     *     // Create the constraint: 0 <= 10 * x + 3 * y <= 20
+     *     var constraint = engine.addConstraint(0, 20);
+     *     constraint.setCoefficient('x', 10);
+     *     constraint.setCoefficient('y', 3);
      *
-     *      // Set the objective to be x + y
-     *      engine.setObjectiveCoefficient('x', 1);
-     *      engine.setObjectiveCoefficient('y', 1);
+     *     // Set the objective to be x + y
+     *     engine.setObjectiveCoefficient('x', 1);
+     *     engine.setObjectiveCoefficient('y', 1);
      *
-     *      // Engine should maximize the objective
-     *      engine.setMaximization();
+     *     // Engine should maximize the objective
+     *     engine.setMaximization();
      *
-     *      // Solve the linear program
-     *      var solution = engine.solve();
-     *      if (!solution.isValid()) {
-     *        Logger.log('No solution ' + solution.getStatus());
-     *      } else {
-     *        Logger.log('Value of x: ' + solution.getVariableValue('x'));
-     *        Logger.log('Value of y: ' + solution.getVariableValue('y'));
-     *      }
+     *     // Solve the linear program
+     *     var solution = engine.solve();
+     *     if (!solution.isValid()) {
+     *       Logger.log('No solution ' + solution.getStatus());
+     *     } else {
+     *       Logger.log('Value of x: ' + solution.getVariableValue('x'));
+     *       Logger.log('Value of y: ' + solution.getVariableValue('y'));
+     *     }
      */
     export interface LinearOptimizationEngine {
       addConstraint(lowerBound: Number, upperBound: Number): LinearOptimizationConstraint;
@@ -96,55 +96,55 @@ declare namespace GoogleAppsScript {
 
     /**
      * The linear optimization service, used to model and solve linear and mixed-integer linear
-     *  programs. The example below solves the following linear program:
+     * programs. The example below solves the following linear program:
      *
-     *  Two variables, x and y:
+     * Two variables, x and y:
      *
      * 0 ≤ x ≤ 10
      *
      * 0 ≤ y ≤ 5
      *
-     *  Constraints:
+     * Constraints:
      *
      * 0 ≤ 2 * x + 5 * y ≤ 10
      *
      * 0 ≤ 10 * x + 3 * y ≤ 20
      *
-     *  Objective:
-     *  Maximize x + y
+     * Objective:
+     * Maximize x + y
      *
-     *      var engine = LinearOptimizationService.createEngine();
+     *     var engine = LinearOptimizationService.createEngine();
      *
-     *      // Add variables, constraints and define the objective using addVariable(), addConstraint(), etc.
-     *      // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
-     *      engine.addVariable('x', 0, 10);
-     *      engine.addVariable('y', 0, 5);
+     *     // Add variables, constraints and define the objective using addVariable(), addConstraint(), etc.
+     *     // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
+     *     engine.addVariable('x', 0, 10);
+     *     engine.addVariable('y', 0, 5);
      *
-     *      // Create the constraint: 0 <= 2 * x + 5 * y <= 10
-     *      var constraint = engine.addConstraint(0, 10);
-     *      constraint.setCoefficient('x', 2);
-     *      constraint.setCoefficient('y', 5);
+     *     // Create the constraint: 0 <= 2 * x + 5 * y <= 10
+     *     var constraint = engine.addConstraint(0, 10);
+     *     constraint.setCoefficient('x', 2);
+     *     constraint.setCoefficient('y', 5);
      *
-     *      // Create the constraint: 0 <= 10 * x + 3 * y <= 20
-     *      var constraint = engine.addConstraint(0, 20);
-     *      constraint.setCoefficient('x', 10);
-     *      constraint.setCoefficient('y', 3);
+     *     // Create the constraint: 0 <= 10 * x + 3 * y <= 20
+     *     var constraint = engine.addConstraint(0, 20);
+     *     constraint.setCoefficient('x', 10);
+     *     constraint.setCoefficient('y', 3);
      *
-     *      // Set the objective to be x + y
-     *      engine.setObjectiveCoefficient('x', 1);
-     *      engine.setObjectiveCoefficient('y', 1);
+     *     // Set the objective to be x + y
+     *     engine.setObjectiveCoefficient('x', 1);
+     *     engine.setObjectiveCoefficient('y', 1);
      *
-     *      // Engine should maximize the objective.
-     *      engine.setMaximization();
+     *     // Engine should maximize the objective.
+     *     engine.setMaximization();
      *
-     *      // Solve the linear program
-     *      var solution = engine.solve();
-     *      if (!solution.isValid()) {
-     *        Logger.log('No solution ' + solution.getStatus());
-     *      } else {
-     *        Logger.log('Value of x: ' + solution.getVariableValue('x'));
-     *        Logger.log('Value of y: ' + solution.getVariableValue('y'));
-     *      }
+     *     // Solve the linear program
+     *     var solution = engine.solve();
+     *     if (!solution.isValid()) {
+     *       Logger.log('No solution ' + solution.getStatus());
+     *     } else {
+     *       Logger.log('Value of x: ' + solution.getVariableValue('x'));
+     *       Logger.log('Value of y: ' + solution.getVariableValue('y'));
+     *     }
      */
     export interface LinearOptimizationService {
       Status: typeof Status;
@@ -155,54 +155,54 @@ declare namespace GoogleAppsScript {
     /**
      * The solution of a linear program. The example below solves the following linear program:
      *
-     *  Two variables, x and y:
+     * Two variables, x and y:
      *
      * 0 ≤ x ≤ 10
      *
      * 0 ≤ y ≤ 5
      *
-     *  Constraints:
+     * Constraints:
      *
      * 0 ≤ 2 * x + 5 * y ≤ 10
      *
      * 0 ≤ 10 * x + 3 * y ≤ 20
      *
-     *  Objective:
-     *  Maximize x + y
+     * Objective:
+     * Maximize x + y
      *
-     *      var engine = LinearOptimizationService.createEngine();
+     *     var engine = LinearOptimizationService.createEngine();
      *
-     *      // Add variables, constraints and define the objective with addVariable(), addConstraint(), etc.
-     *      // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
-     *      engine.addVariable('x', 0, 10);
-     *      engine.addVariable('y', 0, 5);
+     *     // Add variables, constraints and define the objective with addVariable(), addConstraint(), etc.
+     *     // Add two variables, 0 <= x <= 10 and 0 <= y <= 5
+     *     engine.addVariable('x', 0, 10);
+     *     engine.addVariable('y', 0, 5);
      *
-     *      // Create the constraint: 0 <= 2 * x + 5 * y <= 10
-     *      var constraint = engine.addConstraint(0, 10);
-     *      constraint.setCoefficient('x', 2);
-     *      constraint.setCoefficient('y', 5);
+     *     // Create the constraint: 0 <= 2 * x + 5 * y <= 10
+     *     var constraint = engine.addConstraint(0, 10);
+     *     constraint.setCoefficient('x', 2);
+     *     constraint.setCoefficient('y', 5);
      *
-     *      // Create the constraint: 0 <= 10 * x + 3 * y <= 20
-     *      var constraint = engine.addConstraint(0, 20);
-     *      constraint.setCoefficient('x', 10);
-     *      constraint.setCoefficient('y', 3);
+     *     // Create the constraint: 0 <= 10 * x + 3 * y <= 20
+     *     var constraint = engine.addConstraint(0, 20);
+     *     constraint.setCoefficient('x', 10);
+     *     constraint.setCoefficient('y', 3);
      *
-     *      // Set the objective to be x + y
-     *      engine.setObjectiveCoefficient('x', 1);
-     *      engine.setObjectiveCoefficient('y', 1);
+     *     // Set the objective to be x + y
+     *     engine.setObjectiveCoefficient('x', 1);
+     *     engine.setObjectiveCoefficient('y', 1);
      *
-     *      // Engine should maximize the objective
-     *      engine.setMaximization();
+     *     // Engine should maximize the objective
+     *     engine.setMaximization();
      *
-     *      // Solve the linear program
-     *      var solution = engine.solve();
-     *      if (!solution.isValid()) {
-     *        Logger.log('No solution ' + solution.getStatus());
-     *      } else {
-     *        Logger.log('Objective  value: ' + solution.getObjectiveValue());
-     *        Logger.log('Value of x: ' + solution.getVariableValue('x'));
-     *        Logger.log('Value of y: ' + solution.getVariableValue('y'));
-     *      }
+     *     // Solve the linear program
+     *     var solution = engine.solve();
+     *     if (!solution.isValid()) {
+     *       Logger.log('No solution ' + solution.getStatus());
+     *     } else {
+     *       Logger.log('Objective  value: ' + solution.getObjectiveValue());
+     *       Logger.log('Value of x: ' + solution.getVariableValue('x'));
+     *       Logger.log('Value of y: ' + solution.getVariableValue('y'));
+     *     }
      */
     export interface LinearOptimizationSolution {
       getObjectiveValue(): Number;
@@ -213,8 +213,8 @@ declare namespace GoogleAppsScript {
 
     /**
      * Status of the solution. Before solving a problem the status will be NOT_SOLVED;
-     *  afterwards it will take any of the other values depending if it successfully found a solution and
-     *  if the solution is optimal.
+     * afterwards it will take any of the other values depending if it successfully found a solution and
+     * if the solution is optimal.
      */
     export enum Status { OPTIMAL, FEASIBLE, INFEASIBLE, UNBOUNDED, ABNORMAL, MODEL_INVALID, NOT_SOLVED }
 
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 fada88d73b..184c46b28f 100644
--- a/types/google-apps-script/google-apps-script.properties.d.ts
+++ b/types/google-apps-script/google-apps-script.properties.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,21 +8,18 @@
 declare namespace GoogleAppsScript {
   export module Properties {
     /**
-     * The properties object acts as the interface to access user, document, or script properties.
-     *  The specific property type depends on which of the three methods of
-     *  PropertiesService the script called:
-     *  PropertiesService.getDocumentProperties(),
-     *  PropertiesService.getUserProperties(), or
-     *  PropertiesService.getScriptProperties(). Properties cannot be shared between scripts. For
-     *  more information about property types, see the
-     *  guide to the Properties service.
+     * The properties object acts as the interface to access user, document, or script properties. The
+     * specific property type depends on which of the three methods of PropertiesService the
+     * script called: PropertiesService.getDocumentProperties(), PropertiesService.getUserProperties(), or PropertiesService.getScriptProperties().
+     * Properties cannot be shared between scripts. For more information about property types, see the
+     * guide to the Properties service.
      */
     export interface Properties {
       deleteAllProperties(): Properties;
       deleteProperty(key: string): Properties;
       getKeys(): string[];
       getProperties(): Object;
-      getProperty(key: string): string | null;
+      getProperty(key: string): string;
       setProperties(properties: Object): Properties;
       setProperties(properties: Object, deleteAllOthers: boolean): Properties;
       setProperty(key: string, value: string): Properties;
@@ -30,18 +27,17 @@ declare namespace GoogleAppsScript {
 
     /**
      * Allows scripts to store simple data in key-value pairs scoped to one script, one user of a
-     *  script, or one document in which an add-on is used. Properties cannot be shared between scripts.
-     *  For more information about when to use each type of property, see the
-     *  guide to the Properties service.
+     * script, or one document in which an add-on is used. Properties cannot be shared between scripts.
+     * For more information about when to use each type of property, see the guide to the Properties service.
      *
-     *      // Sets three properties of different types.
-     *      var documentProperties = PropertiesService.getDocumentProperties();
-     *      var scriptProperties = PropertiesService.getScriptProperties();
-     *      var userProperties = PropertiesService.getUserProperties();
+     *     // Sets three properties of different types.
+     *     var documentProperties = PropertiesService.getDocumentProperties();
+     *     var scriptProperties = PropertiesService.getScriptProperties();
+     *     var userProperties = PropertiesService.getUserProperties();
      *
-     *      documentProperties.setProperty('DAYS_TO_FETCH', '5');
-     *      scriptProperties.setProperty('SERVER_URL', 'http://www.example.com/MyWeatherService/');
-     *      userProperties.setProperty('DISPLAY_UNITS', 'metric');
+     *     documentProperties.setProperty('DAYS_TO_FETCH', '5');
+     *     scriptProperties.setProperty('SERVER_URL', 'http://www.example.com/MyWeatherService/');
+     *     userProperties.setProperty('DISPLAY_UNITS', 'metric');
      */
     export interface PropertiesService {
       getDocumentProperties(): Properties;
@@ -53,14 +49,14 @@ declare namespace GoogleAppsScript {
      *
      * Deprecated. This class is deprecated and should not be used in new scripts.
      * Script Properties are key-value pairs stored by a script in a persistent store. Script Properties
-     *  are scoped per script, regardless of which user runs the script.
+     * are scoped per script, regardless of which user runs the script.
      */
     export interface ScriptProperties {
       deleteAllProperties(): ScriptProperties;
       deleteProperty(key: string): ScriptProperties;
       getKeys(): string[];
       getProperties(): Object;
-      getProperty(key: string): string | null;
+      getProperty(key: string): string;
       setProperties(properties: Object): ScriptProperties;
       setProperties(properties: Object, deleteAllOthers: boolean): ScriptProperties;
       setProperty(key: string, value: string): ScriptProperties;
@@ -70,14 +66,14 @@ declare namespace GoogleAppsScript {
      *
      * Deprecated. This class is deprecated and should not be used in new scripts.
      * User Properties are key-value pairs unique to a user. User Properties are scoped per user; any
-     *  script running under the identity of a user can access User Properties for that user only.
+     * script running under the identity of a user can access User Properties for that user only.
      */
     export interface UserProperties {
       deleteAllProperties(): UserProperties;
       deleteProperty(key: string): UserProperties;
       getKeys(): string[];
       getProperties(): Object;
-      getProperty(key: string): string | null;
+      getProperty(key: string): string;
       setProperties(properties: Object): UserProperties;
       setProperties(properties: Object, deleteAllOthers: boolean): UserProperties;
       setProperty(key: string, value: string): UserProperties;
diff --git a/types/google-apps-script/google-apps-script.script.d.ts b/types/google-apps-script/google-apps-script.script.d.ts
index 209feaa0a1..fbe95deb8c 100644
--- a/types/google-apps-script/google-apps-script.script.d.ts
+++ b/types/google-apps-script/google-apps-script.script.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -12,49 +12,44 @@
 declare namespace GoogleAppsScript {
   export module Script {
     /**
-     * An enumeration that identifies which categories of authorized services Apps Script
-     *  is able to execute through a triggered function. These values are exposed in
-     *  triggered functions as the authMode
-     *  property of the event parameter, e. For
-     *  more information, see the
-     *  guide to the authorization lifecycle for add-ons.
+     * An enumeration that identifies which categories of authorized services Apps Script is able to
+     * execute through a triggered function. These values are exposed in triggered functions as the authMode
+     * property of the event parameter, e. For
+     * more information, see the guide to the authorization
+     * lifecycle for add-ons.
      *
-     *      function onOpen(e) {
-     *        var menu = SpreadsheetApp.getUi().createAddonMenu();
-     *        if (e && e.authMode == ScriptApp.AuthMode.NONE) {
-     *          // Add a normal menu item (works in all authorization modes).
-     *          menu.addItem('Start workflow', 'startWorkflow');
-     *        } else {
-     *          // Add a menu item based on properties (doesn't work in AuthMode.NONE).
-     *          var properties = PropertiesService.getDocumentProperties();
-     *          var workflowStarted = properties.getProperty('workflowStarted');
-     *          if (workflowStarted) {
-     *            menu.addItem('Check workflow status', 'checkWorkflow');
-     *          } else {
-     *            menu.addItem('Start workflow', 'startWorkflow');
-     *          }
-     *          // Record analytics.
-     *          UrlFetchApp.fetch('http://www.example.com/analytics?event=open');
-     *        }
-     *        menu.addToUi();
-     *      }
+     *     function onOpen(e) {
+     *       var menu = SpreadsheetApp.getUi().createAddonMenu();
+     *       if (e && e.authMode == ScriptApp.AuthMode.NONE) {
+     *         // Add a normal menu item (works in all authorization modes).
+     *         menu.addItem('Start workflow', 'startWorkflow');
+     *       } else {
+     *         // Add a menu item based on properties (doesn't work in AuthMode.NONE).
+     *         var properties = PropertiesService.getDocumentProperties();
+     *         var workflowStarted = properties.getProperty('workflowStarted');
+     *         if (workflowStarted) {
+     *           menu.addItem('Check workflow status', 'checkWorkflow');
+     *         } else {
+     *           menu.addItem('Start workflow', 'startWorkflow');
+     *         }
+     *         // Record analytics.
+     *         UrlFetchApp.fetch('http://www.example.com/analytics?event=open');
+     *       }
+     *       menu.addToUi();
+     *     }
      */
     export enum AuthMode { NONE, CUSTOM_FUNCTION, LIMITED, FULL }
 
     /**
-     * An object used to determine whether the user needs to authorize this script to use
-     *  one or more services, and to provide the URL for an authorization dialog. If the script
-     *  is published as an add-on that uses
-     *  installable triggers, this information
-     *  can be used to control access to sections of code for which the user lacks the necessary
-     *  authorization. Alternately, the add-on can ask the user to open the URL for the
-     *  authorization dialog to resolve the problem.
+     * An object used to determine whether the user needs to authorize this script to use one or more
+     * services, and to provide the URL for an authorization dialog. If the script is published as an add-on that uses installable triggers, this information can be used
+     * to control access to sections of code for which the user lacks the necessary authorization.
+     * Alternately, the add-on can ask the user to open the URL for the authorization dialog to resolve
+     * the problem.
      *
-     * This object is returned by
-     *  ScriptApp.getAuthorizationInfo(authMode). In almost all cases,
-     *  scripts should call
-     *  ScriptApp.getAuthorizationInfo(ScriptApp.AuthMode.FULL), since no other
-     *  authorization mode requires that users grant authorization.
+     * This object is returned by ScriptApp.getAuthorizationInfo(authMode). In almost
+     * all cases, scripts should call ScriptApp.getAuthorizationInfo(ScriptApp.AuthMode.FULL),
+     * since no other authorization mode requires that users grant authorization.
      */
     export interface AuthorizationInfo {
       getAuthorizationStatus(): AuthorizationStatus;
@@ -66,6 +61,14 @@ declare namespace GoogleAppsScript {
      */
     export enum AuthorizationStatus { REQUIRED, NOT_REQUIRED }
 
+    /**
+     * Builder for calendar triggers.
+     */
+    export interface CalendarTriggerBuilder {
+      create(): Trigger;
+      onEventUpdated(): CalendarTriggerBuilder;
+    }
+
     /**
      * A builder for clock triggers.
      */
@@ -96,7 +99,7 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration denoting the type of triggered event.
      */
-    export enum EventType { CLOCK, ON_OPEN, ON_EDIT, ON_FORM_SUBMIT, ON_CHANGE }
+    export enum EventType { CLOCK, ON_OPEN, ON_EDIT, ON_FORM_SUBMIT, ON_CHANGE, ON_EVENT_UPDATED }
 
     /**
      * A builder for form triggers.
@@ -108,14 +111,14 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enumeration that indicates how the script came to be installed as an add-on for the
-     *  current user.
+     * An enumeration that indicates how the script came to be installed as an add-on for the current
+     * user.
      */
     export enum InstallationSource { APPS_MARKETPLACE_DOMAIN_ADD_ON, NONE, WEB_STORE_ADD_ON }
 
     /**
      * Access and manipulate script publishing and triggers. This class allows users to create script
-     *  triggers and control publishing the script as a service.
+     * triggers and control publishing the script as a service.
      */
     export interface ScriptApp {
       AuthMode: typeof AuthMode;
@@ -145,18 +148,9 @@ declare namespace GoogleAppsScript {
      * Access and manipulate script publishing.
      */
     export interface Service {
-      Restriction: typeof Service.Restriction;
       disable(): void;
       getUrl(): string;
       isEnabled(): boolean;
-      enable(restriction: Service.Restriction): void;
-    }
-
-    /**
-     *
-     */
-    namespace Service {
-    export enum Restriction { MYSELF, DOMAIN, ALL }
     }
 
     /**
@@ -173,19 +167,19 @@ declare namespace GoogleAppsScript {
     /**
      * Allows scripts to create state tokens that can be used in callback APIs (like OAuth flows).
      *
-     *      // Reusable function to generate a callback URL, assuming the script has been published as a
-     *      // web app (necessary to obtain the URL programmatically). If the script has not been published
-     *      // as a web app, set `var url` in the first line to the URL of your script project (which
-     *      // cannot be obtained programmatically).
-     *      function getCallbackURL(callbackFunction){
-     *        var url = ScriptApp.getService().getUrl();      // Ends in /exec (for a web app)
-     *        url = url.slice(0, -4) + 'usercallback?state='; // Change /exec to /usercallback
-     *        var stateToken = ScriptApp.newStateToken()
-     *            .withMethod(callbackFunction)
-     *            .withTimeout(120)
-     *            .createToken();
-     *        return url + stateToken;
-     *      }
+     *     // Reusable function to generate a callback URL, assuming the script has been published as a
+     *     // web app (necessary to obtain the URL programmatically). If the script has not been published
+     *     // as a web app, set `var url` in the first line to the URL of your script project (which
+     *     // cannot be obtained programmatically).
+     *     function getCallbackURL(callbackFunction){
+     *       var url = ScriptApp.getService().getUrl();      // Ends in /exec (for a web app)
+     *       url = url.slice(0, -4) + 'usercallback?state='; // Change /exec to /usercallback
+     *       var stateToken = ScriptApp.newStateToken()
+     *           .withMethod(callbackFunction)
+     *           .withTimeout(120)
+     *           .createToken();
+     *       return url + stateToken;
+     *     }
      */
     export interface StateTokenBuilder {
       createToken(): string;
@@ -215,13 +209,14 @@ declare namespace GoogleAppsScript {
       forForm(key: string): FormTriggerBuilder;
       forSpreadsheet(sheet: Spreadsheet.Spreadsheet): SpreadsheetTriggerBuilder;
       forSpreadsheet(key: string): SpreadsheetTriggerBuilder;
+      forUserCalendar(emailId: string): CalendarTriggerBuilder;
       timeBased(): ClockTriggerBuilder;
     }
 
     /**
      * An enumeration denoting the source of the event that causes the trigger to fire.
      */
-    export enum TriggerSource { SPREADSHEETS, CLOCK, FORMS, DOCUMENTS }
+    export enum TriggerSource { SPREADSHEETS, CLOCK, FORMS, DOCUMENTS, CALENDAR }
 
   }
 }
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 5bbe126750..b8e7fff5f0 100644
--- a/types/google-apps-script/google-apps-script.sites.d.ts
+++ b/types/google-apps-script/google-apps-script.sites.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,20 +11,17 @@ declare namespace GoogleAppsScript {
     /**
      * A Sites Attachment such as a file attached to a page.
      *
-     *  Note that an Attachment is a Blob and can be used anywhere Blob input is expected.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
+     * Note that an Attachment is a Blob and can be used anywhere Blob input is expected. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      *
-     *    classic Sites.
+     *     var filesPage = SitesApp.getSite('example.com', 'mysite').getChildByName("files");
+     *     var attachments = filesPage.getAttachments();
      *
-     *      var filesPage = SitesApp.getSite('example.com', 'mysite').getChildByName("files");
-     *      var attachments = filesPage.getAttachments();
-     *
-     *      // DocsList.createFile accepts a blob input. Since an Attachment is just a blob, we can
-     *      // just pass it directly to that method
-     *      var file = DocsList.createFile(attachments[0]);
+     *     // DocsList.createFile accepts a blob input. Since an Attachment is just a blob, we can
+     *     // just pass it directly to that method
+     *     var file = DocsList.createFile(attachments[0]);
      */
     export interface Attachment {
       deleteAttachment(): void;
@@ -47,24 +44,18 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A typesafe enum for sites attachment type.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * A typesafe enum for sites attachment type. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export enum AttachmentType { WEB, HOSTED }
 
     /**
-     * A Sites Column - a column from a Sites List page.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * A Sites Column - a column from a Sites List page. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export interface Column {
       deleteColumn(): void;
@@ -74,13 +65,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A Comment attached to any Sites page.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * A Comment attached to any Sites page. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export interface Comment {
       deleteComment(): void;
@@ -95,13 +83,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A Sites ListItem - a list element from a Sites List page.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * A Sites ListItem - a list element from a Sites List page. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export interface ListItem {
       deleteListItem(): void;
@@ -116,13 +101,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A Page on a Google Site.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * A Page on a Google Site. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export interface Page {
       addColumn(name: string): Column;
@@ -180,24 +162,18 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * A typesafe enum for sites page type.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * A typesafe enum for sites page type. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export enum PageType { WEB_PAGE, LIST_PAGE, ANNOUNCEMENT, ANNOUNCEMENTS_PAGE, FILE_CABINET_PAGE }
 
     /**
-     * An object representing a Google Site.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * An object representing a Google Site. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export interface Site {
       addEditor(emailAddress: string): Site;
@@ -262,13 +238,10 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Create and access Google Sites.
-     *  A
-     *  rebuilt
-     *  version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
-     *  modify Sites made with this version, but script can still access
-     *
-     *    classic Sites.
+     * Create and access Google Sites. A rebuilt
+     * version of Sites was launched on November 22, 2016. Apps Script cannot currently access or
+     * modify Sites made with this version, but script can still access
+     * classic Sites.
      */
     export interface SitesApp {
       AttachmentType: typeof AttachmentType;
diff --git a/types/google-apps-script/google-apps-script.slides.d.ts b/types/google-apps-script/google-apps-script.slides.d.ts
index 494663f002..90e034ff60 100644
--- a/types/google-apps-script/google-apps-script.slides.d.ts
+++ b/types/google-apps-script/google-apps-script.slides.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2018-02-14
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,16 +11,16 @@ declare namespace GoogleAppsScript {
   export module Slides {
     /**
      * A 3x3 matrix used to transform source coordinates (x1, y1) into destination coordinates (x2, y2)
-     *  according to matrix multiplication:
+     * according to matrix multiplication:
      *
-     *      [ x2 ]   [ scaleX shearX translateX ] [ x1 ]
-     *      [ y2 ] = [ shearY scaleY translateY ] [ y1 ]
-     *      [ 1  ]   [   0      0        1      ] [ 1  ]
+     *     [ x2 ]   [ scaleX shearX translateX ] [ x1 ]
+     *     [ y2 ] = [ shearY scaleY translateY ] [ y1 ]
+     *     [ 1  ]   [   0      0        1      ] [ 1  ]
      *
      * After transformation,
      *
-     *      x2 = scaleX * x1 + shearX * y1 + translateX
-     *      y2 = scaleY * y1 + shearY * x1 + translateY
+     *     x2 = scaleX * x1 + shearX * y1 + translateX
+     *     y2 = scaleY * y1 + shearY * x1 + translateY
      */
     export interface AffineTransform {
       getScaleX(): Number;
@@ -37,13 +37,13 @@ declare namespace GoogleAppsScript {
      *
      * Call AffineTransformBuilder#build() to get the AffineTransform object.
      *
-     *      var transform =
-     *          SlidesApp.newAffineTransformBuilder().setScaleX(2.0).setShearY(1.1).build();
+     *     var transform =
+     *         SlidesApp.newAffineTransformBuilder().setScaleX(2.0).setShearY(1.1).build();
      *
-     *      The resulting transform matrix is
-     *        [ 2.0   0.0   0.0 ]
-     *        [ 1.1   1.0   0.0 ]
-     *        [  0     0     1  ]
+     *     The resulting transform matrix is
+     *       [ 2.0   0.0   0.0 ]
+     *       [ 1.1   1.0   0.0 ]
+     *       [  0     0     1  ]
      */
     export interface AffineTransformBuilder {
       build(): AffineTransform;
@@ -64,14 +64,14 @@ declare namespace GoogleAppsScript {
      * The kinds of start and end forms with which linear geometry can be rendered.
      *
      * Some values are based on the "ST_LineEndType" simple type described in section 20.1.10.33 of
-     *  of "Office Open XML File Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
-     *  edition.
+     * of "Office Open XML File Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     * edition.
      */
     export enum ArrowStyle { UNSUPPORTED, NONE, STEALTH_ARROW, FILL_ARROW, FILL_CIRCLE, FILL_SQUARE, FILL_DIAMOND, OPEN_ARROW, OPEN_CIRCLE, OPEN_SQUARE, OPEN_DIAMOND }
 
     /**
      * An element of text that is dynamically replaced with content that can change over time, such as a
-     *  slide number.
+     * slide number.
      */
     export interface AutoText {
       getAutoTextType(): AutoTextType;
@@ -113,7 +113,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * A color scheme defines a mapping from members of ThemeColorType to the actual colors used
-     *  to render them.
+     * to render them.
      */
     export interface ColorScheme {
       getConcreteColor(theme: ThemeColorType): Color;
@@ -127,20 +127,20 @@ declare namespace GoogleAppsScript {
 
     /**
      * The content alignments for a Shape or TableCell. The supported alignments
-     *  correspond to predefined text anchoring types from the ECMA-376 standard.
+     * correspond to predefined text anchoring types from the ECMA-376 standard.
      *
      * More information on those alignments can be found in the description of
-     *  the ST_TextAnchoringType simple type in section 20.1.10.59 of "Office Open XML File
-     *  Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
-     *  edition.
+     * the ST_TextAnchoringType simple type in section 20.1.10.59 of "Office Open XML File
+     * Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     * edition.
      */
     export enum ContentAlignment { UNSUPPORTED, TOP, MIDDLE, BOTTOM }
 
     /**
      * The kinds of dashes with which linear geometry can be rendered. These values are based on the
-     *  "ST_PresetLineDashVal" simple type described in section 20.1.10.48 of "Office Open XML File
-     *  Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
-     *  edition.
+     * "ST_PresetLineDashVal" simple type described in section 20.1.10.48 of "Office Open XML File
+     * Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     * edition.
      */
     export enum DashStyle { UNSUPPORTED, SOLID, DOT, DASH, DASH_DOT, LONG_DASH, LONG_DASH_DOT }
 
@@ -209,6 +209,8 @@ declare namespace GoogleAppsScript {
     export interface Image {
       alignOnPage(alignmentPosition: AlignmentPosition): Image;
       duplicate(): PageElement;
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
       getBorder(): Border;
       getContentUrl(): string;
       getDescription(): string;
@@ -254,7 +256,7 @@ declare namespace GoogleAppsScript {
      * A layout in a presentation.
      *
      * Each layout serves as a template for slides that inherit from it, determining how content on
-     *  those slides is arranged and styled.
+     * those slides is arranged and styled.
      */
     export interface Layout {
       getBackground(): PageBackground;
@@ -366,7 +368,7 @@ declare namespace GoogleAppsScript {
      * The line category.
      *
      * The exact LineType created is determined based on the category and how it's routed to
-     *  connect to other page elements.
+     * connect to other page elements.
      */
     export enum LineCategory { STRAIGHT, BENT, CURVED }
 
@@ -395,10 +397,10 @@ declare namespace GoogleAppsScript {
      * The line types.
      *
      * Derived from a subset of the values of the "ST_ShapeType" simple type in section 20.1.10.55 of
-     *  "Office Open XML File Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
-     *  edition.
+     * "Office Open XML File Formats - Fundamentals and Markup Language Reference", part 1 of ECMA-376 4th
+     * edition.
      */
-    export enum LineType { UNSUPPORTED, STRAIGHT_CONNECTOR_1, BENT_CONNECTOR_2, BENT_CONNECTOR_3, BENT_CONNECTOR_4, BENT_CONNECTOR_5, CURVED_CONNECTOR_2, CURVED_CONNECTOR_3, CURVED_CONNECTOR_4, CURVED_CONNECTOR_5 }
+    export enum LineType { UNSUPPORTED, STRAIGHT_CONNECTOR_1, BENT_CONNECTOR_2, BENT_CONNECTOR_3, BENT_CONNECTOR_4, BENT_CONNECTOR_5, CURVED_CONNECTOR_2, CURVED_CONNECTOR_3, CURVED_CONNECTOR_4, CURVED_CONNECTOR_5, STRAIGHT_LINE }
 
     /**
      * A hypertext link.
@@ -457,14 +459,14 @@ declare namespace GoogleAppsScript {
      * DIGIT: A number, like '1', '2', or '3'.
      *
      * ZERODIGIT: A number where single digit numbers are prefixed with a zero, like '01', '02',
-     *        or '03'. Numbers with more than one digit are not prefixed a zero.
+     *       or '03'. Numbers with more than one digit are not prefixed a zero.
      *
      * ROMAN: A lowercase roman numeral, like 'i', 'ii', or 'iii'.
      *
      * UPPERROMAN: A uppercase roman numeral, like 'I', 'II', or 'III'.
      *
      * LEFTTRIANGLE: A triangle pointing left, ◄, corresponding to a Unicode U+25c4 code
-     *        point
+     *       point
      */
     export enum ListPreset { DISC_CIRCLE_SQUARE, DIAMONDX_ARROW3D_SQUARE, CHECKBOX, ARROW_DIAMOND_DISC, STAR_CIRCLE_SQUARE, ARROW3D_CIRCLE_SQUARE, LEFTTRIANGLE_DIAMOND_DISC, DIAMONDX_HOLLOWDIAMOND_SQUARE, DIAMOND_CIRCLE_SQUARE, DIGIT_ALPHA_ROMAN, DIGIT_ALPHA_ROMAN_PARENS, DIGIT_NESTED, UPPERALPHA_ALPHA_ROMAN, UPPERROMAN_UPPERALPHA_DIGIT, ZERODIGIT_ALPHA_ROMAN }
 
@@ -484,15 +486,15 @@ declare namespace GoogleAppsScript {
      * A master in a presentation.
      *
      * Masters contains all common page elements and the common properties for a set of layouts. They
-     *  serve three purposes:
+     * serve three purposes:
      *
      * Placeholder shapes on a master contain the default text styles and shape properties of all
-     *        placeholder shapes on pages that use that master.
+     *       placeholder shapes on pages that use that master.
      *
      * The properties of a master page define the common page properties inherited by its layouts.
      *
      * Any other shapes on the master slide appear on all slides using that master, regardless of
-     *        their layout.
+     *       their layout.
      */
     export interface Master {
       getBackground(): PageBackground;
@@ -547,7 +549,7 @@ declare namespace GoogleAppsScript {
      * A notes master in a presentation.
      *
      * Notes masters define the default text styles and page elements for all notes pages. Notes
-     *  masters are read-only.
+     * masters are read-only.
      */
     export interface NotesMaster {
       getGroups(): Group[];
@@ -569,8 +571,8 @@ declare namespace GoogleAppsScript {
      * A notes page in a presentation.
      *
      * These pages contain the content for presentation handouts, including a a shape that contains
-     *  the slide's speaker notes. Each slide has one corresponding notes page. Only the text in the
-     *  speaker notes shape can be modified.
+     * the slide's speaker notes. Each slide has one corresponding notes page. Only the text in the
+     * speaker notes shape can be modified.
      */
     export interface NotesPage {
       getGroups(): Group[];
@@ -754,8 +756,8 @@ declare namespace GoogleAppsScript {
      * The styles of text that apply to entire paragraphs.
      *
      * Read methods in this class return null if the corresponding TextRange spans
-     *  multiple paragraphs, and those paragraphs have different values for the read method being called.
-     *  To avoid this, query for paragraph styles using the TextRange returned by the Paragraph.getRange() method.
+     * multiple paragraphs, and those paragraphs have different values for the read method being called.
+     * To avoid this, query for paragraph styles using the TextRange returned by the Paragraph.getRange() method.
      */
     export interface ParagraphStyle {
       getIndentEnd(): Number;
@@ -782,16 +784,18 @@ declare namespace GoogleAppsScript {
      * A fill that renders an image that's stretched to the dimensions of its container.
      */
     export interface PictureFill {
+      getAs(contentType: string): Base.Blob;
+      getBlob(): Base.Blob;
       getContentUrl(): string;
       getSourceUrl(): string;
     }
 
     /**
      * The placeholder types. Many of these placeholder types correspond to placeholder IDs from the
-     *  ECMA-376 standard. More information on those shapes can be found in the description of the
-     *  "ST_PlaceholderType" type in section 19.7.10 of "Office Open XML File Formats - Fundamentals and
-     *  Markup Language Reference", part 1 of ECMA-376 5th
-     *  edition.
+     * ECMA-376 standard. More information on those shapes can be found in the description of the
+     * "ST_PlaceholderType" type in section 19.7.10 of "Office Open XML File Formats - Fundamentals and
+     * Markup Language Reference", part 1 of ECMA-376 5th
+     * edition.
      */
     export enum PlaceholderType { UNSUPPORTED, NONE, BODY, CHART, CLIP_ART, CENTERED_TITLE, DIAGRAM, DATE_AND_TIME, FOOTER, HEADER, MEDIA, OBJECT, PICTURE, SLIDE_NUMBER, SUBTITLE, TABLE, TITLE, SLIDE_IMAGE }
 
@@ -805,8 +809,8 @@ declare namespace GoogleAppsScript {
 
     /**
      * Predefined layouts. These are commonly found layouts in presentations. However, there is no
-     *  guarantee that these layouts are present in the current master as they could have been deleted or
-     *  not part of the used theme. Additionally, the placeholders on each layout may have been changed.
+     * guarantee that these layouts are present in the current master as they could have been deleted or
+     * not part of the used theme. Additionally, the placeholders on each layout may have been changed.
      */
     export enum PredefinedLayout { UNSUPPORTED, BLANK, CAPTION_ONLY, TITLE, TITLE_AND_BODY, TITLE_AND_TWO_COLUMNS, TITLE_ONLY, SECTION_HEADER, SECTION_TITLE_AND_DESCRIPTION, ONE_COLUMN_TEXT, MAIN_POINT, BIG_NUMBER }
 
@@ -816,10 +820,10 @@ declare namespace GoogleAppsScript {
     export interface Presentation {
       addEditor(emailAddress: string): Presentation;
       addEditor(user: Base.User): Presentation;
-      addEditors(emailAddresses: String[]): Presentation;
+      addEditors(emailAddresses: string[]): Presentation;
       addViewer(emailAddress: string): Presentation;
       addViewer(user: Base.User): Presentation;
-      addViewers(emailAddresses: String[]): Presentation;
+      addViewers(emailAddresses: string[]): Presentation;
       appendSlide(): Slide;
       appendSlide(layout: Layout): Slide;
       appendSlide(predefinedLayout: PredefinedLayout): Slide;
@@ -866,10 +870,10 @@ declare namespace GoogleAppsScript {
     /**
      * The user's selection in the active presentation.
      *
-     *      var selection = SlidesApp.getActivePresentation().getSelection();
-     *      var currentPage = selection.getCurrentPage();
-     *      var selectionType = selection.getSelectionType();
-     *      }
+     *     var selection = SlidesApp.getActivePresentation().getSelection();
+     *     var currentPage = selection.getCurrentPage();
+     *     var selectionType = selection.getSelectionType();
+     *     }
      */
     export interface Selection {
       getCurrentPage(): Page;
@@ -884,16 +888,16 @@ declare namespace GoogleAppsScript {
      * Type of Selection.
      *
      * The SelectionType represents the most specific type of one or more objects that are
-     *  selected. As an example if one or more TableCell instances are selected in a Table, the selection type is SelectionType.TABLE_CELL. The TableCellRange can be
-     *  retrieved by using the Selection.getTableCellRange. The Table can be retrieved by
-     *  using the Selection.getPageElementRange and the Page can be retrieved from the
-     *  Selection.getCurrentPage.
+     * selected. As an example if one or more TableCell instances are selected in a Table, the selection type is SelectionType.TABLE_CELL. The TableCellRange can be
+     * retrieved by using the Selection.getTableCellRange. The Table can be retrieved by
+     * using the Selection.getPageElementRange and the Page can be retrieved from the
+     * Selection.getCurrentPage.
      */
     export enum SelectionType { UNSUPPORTED, NONE, TEXT, TABLE_CELL, PAGE, PAGE_ELEMENT, CURRENT_PAGE }
 
     /**
      * A PageElement representing a generic shape that does not have a more specific
-     *  classification. Includes text boxes, rectangles, and other predefined shapes.
+     * classification. Includes text boxes, rectangles, and other predefined shapes.
      */
     export interface Shape {
       alignOnPage(alignmentPosition: AlignmentPosition): Shape;
@@ -949,10 +953,10 @@ declare namespace GoogleAppsScript {
 
     /**
      * The shape types. Many of these shapes correspond to predefined shapes from the ECMA-376 standard.
-     *  More information on those shapes can be found in the description of the "ST_ShapeType" simple
-     *  type in section 20.1.10.55 of "Office Open XML File Formats - Fundamentals and Markup Language
-     *  Reference", part 1 of ECMA-376 4th
-     *  edition.
+     * More information on those shapes can be found in the description of the "ST_ShapeType" simple
+     * type in section 20.1.10.55 of "Office Open XML File Formats - Fundamentals and Markup Language
+     * Reference", part 1 of ECMA-376 4th
+     * edition.
      */
     export enum ShapeType { UNSUPPORTED, TEXT_BOX, RECTANGLE, ROUND_RECTANGLE, ELLIPSE, ARC, BENT_ARROW, BENT_UP_ARROW, BEVEL, BLOCK_ARC, BRACE_PAIR, BRACKET_PAIR, CAN, CHEVRON, CHORD, CLOUD, CORNER, CUBE, CURVED_DOWN_ARROW, CURVED_LEFT_ARROW, CURVED_RIGHT_ARROW, CURVED_UP_ARROW, DECAGON, DIAGONAL_STRIPE, DIAMOND, DODECAGON, DONUT, DOUBLE_WAVE, DOWN_ARROW, DOWN_ARROW_CALLOUT, FOLDED_CORNER, FRAME, HALF_FRAME, HEART, HEPTAGON, HEXAGON, HOME_PLATE, HORIZONTAL_SCROLL, IRREGULAR_SEAL_1, IRREGULAR_SEAL_2, LEFT_ARROW, LEFT_ARROW_CALLOUT, LEFT_BRACE, LEFT_BRACKET, LEFT_RIGHT_ARROW, LEFT_RIGHT_ARROW_CALLOUT, LEFT_RIGHT_UP_ARROW, LEFT_UP_ARROW, LIGHTNING_BOLT, MATH_DIVIDE, MATH_EQUAL, MATH_MINUS, MATH_MULTIPLY, MATH_NOT_EQUAL, MATH_PLUS, MOON, NO_SMOKING, NOTCHED_RIGHT_ARROW, OCTAGON, PARALLELOGRAM, PENTAGON, PIE, PLAQUE, PLUS, QUAD_ARROW, QUAD_ARROW_CALLOUT, RIBBON, RIBBON_2, RIGHT_ARROW, RIGHT_ARROW_CALLOUT, RIGHT_BRACE, RIGHT_BRACKET, ROUND_1_RECTANGLE, ROUND_2_DIAGONAL_RECTANGLE, ROUND_2_SAME_RECTANGLE, RIGHT_TRIANGLE, SMILEY_FACE, SNIP_1_RECTANGLE, SNIP_2_DIAGONAL_RECTANGLE, SNIP_2_SAME_RECTANGLE, SNIP_ROUND_RECTANGLE, STAR_10, STAR_12, STAR_16, STAR_24, STAR_32, STAR_4, STAR_5, STAR_6, STAR_7, STAR_8, STRIPED_RIGHT_ARROW, SUN, TRAPEZOID, TRIANGLE, UP_ARROW, UP_ARROW_CALLOUT, UP_DOWN_ARROW, UTURN_ARROW, VERTICAL_SCROLL, WAVE, WEDGE_ELLIPSE_CALLOUT, WEDGE_RECTANGLE_CALLOUT, WEDGE_ROUND_RECTANGLE_CALLOUT, FLOW_CHART_ALTERNATE_PROCESS, FLOW_CHART_COLLATE, FLOW_CHART_CONNECTOR, FLOW_CHART_DECISION, FLOW_CHART_DELAY, FLOW_CHART_DISPLAY, FLOW_CHART_DOCUMENT, FLOW_CHART_EXTRACT, FLOW_CHART_INPUT_OUTPUT, FLOW_CHART_INTERNAL_STORAGE, FLOW_CHART_MAGNETIC_DISK, FLOW_CHART_MAGNETIC_DRUM, FLOW_CHART_MAGNETIC_TAPE, FLOW_CHART_MANUAL_INPUT, FLOW_CHART_MANUAL_OPERATION, FLOW_CHART_MERGE, FLOW_CHART_MULTIDOCUMENT, FLOW_CHART_OFFLINE_STORAGE, FLOW_CHART_OFFPAGE_CONNECTOR, FLOW_CHART_ONLINE_STORAGE, FLOW_CHART_OR, FLOW_CHART_PREDEFINED_PROCESS, FLOW_CHART_PREPARATION, FLOW_CHART_PROCESS, FLOW_CHART_PUNCHED_CARD, FLOW_CHART_PUNCHED_TAPE, FLOW_CHART_SORT, FLOW_CHART_SUMMING_JUNCTION, FLOW_CHART_TERMINATOR, ARROW_EAST, ARROW_NORTH_EAST, ARROW_NORTH, SPEECH, STARBURST, TEARDROP, ELLIPSE_RIBBON, ELLIPSE_RIBBON_2, CLOUD_CALLOUT, CUSTOM }
 
@@ -1010,7 +1014,7 @@ declare namespace GoogleAppsScript {
      * A slide in a presentation.
      *
      * These pages contain the content you are presenting to your audience. Most slides are based on
-     *  a master and a layout. You can specify which layout to use for each slide when it is created.
+     * a master and a layout. You can specify which layout to use for each slide when it is created.
      */
     export interface Slide {
       duplicate(): Slide;
@@ -1072,11 +1076,11 @@ declare namespace GoogleAppsScript {
     /**
      * Creates and opens Presentations that can be edited.
      *
-     *      // Open a presentation by ID.
-     *      var preso = SlidesApp.openById('PRESENTATION_ID_GOES_HERE');
+     *     // Open a presentation by ID.
+     *     var preso = SlidesApp.openById('PRESENTATION_ID_GOES_HERE');
      *
-     *      // Create and open a presentation.
-     *      preso = SlidesApp.create('Presentation Name');
+     *     // Create and open a presentation.
+     *     preso = SlidesApp.create('Presentation Name');
      */
     export interface SlidesApp {
       AlignmentPosition: typeof AlignmentPosition;
@@ -1119,7 +1123,7 @@ declare namespace GoogleAppsScript {
      * A solid color fill.
      *
      * SolidFill objects are detached and immutable, so do not reflect changes made after
-     *  they have been created.
+     * they have been created.
      */
     export interface SolidFill {
       getAlpha(): Number;
@@ -1202,7 +1206,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * A column in a table. A column consists of a list of table cells. A column is identified by the
-     *  column index.
+     * column index.
      */
     export interface TableColumn {
       getCell(cellIndex: Integer): TableCell;
@@ -1276,8 +1280,8 @@ declare namespace GoogleAppsScript {
      * The style of text.
      *
      * Read methods in this class return null if the corresponding TextRange spans
-     *  multiple text runs, and those runs have different values for the read method being called. To
-     *  avoid this, query for text styles using the TextRanges returned by the TextRange.getRuns() method.
+     * multiple text runs, and those runs have different values for the read method being called. To
+     * avoid this, query for text styles using the TextRanges returned by the TextRange.getRuns() method.
      */
     export interface TextStyle {
       getBackgroundColor(): Color;
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 dd2bc1d9f3..4ac5c84d6b 100644
--- a/types/google-apps-script/google-apps-script.spreadsheet.d.ts
+++ b/types/google-apps-script/google-apps-script.spreadsheet.d.ts
@@ -1,8 +1,6 @@
-// Type definitions for Google Apps Script 2018-05-23
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
-//                 linlex <https://github.com/linlex/>
-//                 agektmr <https://github.com/agektmr/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
@@ -11,82 +9,178 @@
 /// <reference path="google-apps-script.drive.d.ts" />
 
 declare namespace GoogleAppsScript {
-  /**
-   * This service allows scripts to create, access, and modify Google Sheets files. See also the guide to storing data in spreadsheets.
-   *
-   * https://developers.google.com/apps-script/guides/sheets
-   */
   export module Spreadsheet {
     /**
-     * Styles that can be set on a range using
-     *  Range.setBorder(top, left, bottom, right, vertical, horizontal, color, style).
+     * An enumeration of the types of series used to calculate auto-filled values. The manner in which
+     * these series affect calculated values differs depending on the type and amount of source data.
      */
-    export enum BorderStyle { DOTTED, DASHED, SOLID }
+    export enum AutoFillSeries { DEFAULT_SERIES, ALTERNATE_SERIES }
 
     /**
-     * Access boolean conditions in `ConditionalFormatRules`. Each conditional
-     * format rule may contain a single boolean condition. The boolean condition
-     * itself contains a boolean criteria (with values) and formatting settings.
-     * The criteria is evaluated against the content of a cell resulting in
-     * either a `true` or `false` value. If the criteria evaluates to `true`,
-     * the condition's formatting settings are applied to the cell.
+     * Access and modify bandings, the color patterns applied to rows or columns of a range. Each
+     * banding consists of a range and a set of colors for rows, columns, headers, and footers.
+     */
+    export interface Banding {
+      copyTo(range: Range): Banding;
+      getFirstColumnColor(): string;
+      getFirstRowColor(): string;
+      getFooterColumnColor(): string;
+      getFooterRowColor(): string;
+      getHeaderColumnColor(): string;
+      getHeaderRowColor(): string;
+      getRange(): Range;
+      getSecondColumnColor(): string;
+      getSecondRowColor(): string;
+      remove(): void;
+      setFirstColumnColor(color: string): Banding;
+      setFirstRowColor(color: string): Banding;
+      setFooterColumnColor(color: string): Banding;
+      setFooterRowColor(color: string): Banding;
+      setHeaderColumnColor(color: string): Banding;
+      setHeaderRowColor(color: string): Banding;
+      setRange(range: Range): Banding;
+      setSecondColumnColor(color: string): Banding;
+      setSecondRowColor(color: string): Banding;
+    }
+
+    /**
+     * An enumeration of banding themes. Each theme consists of several complementary colors that are
+     * applied to different cells based on the banding settings.
+     */
+    export enum BandingTheme { LIGHT_GREY, CYAN, GREEN, YELLOW, ORANGE, BLUE, TEAL, GREY, BROWN, LIGHT_GREEN, INDIGO, PINK }
+
+    /**
+     * Access boolean conditions in ConditionalFormatRules. Each
+     * conditional format rule may contain a single boolean condition. The boolean condition itself
+     * contains a boolean criteria (with values) and formatting settings. The criteria is evaluated
+     * against the content of a cell resulting in either a true or false value. If the
+     * criteria evaluates to true, the condition's formatting settings are applied to the cell.
      */
     export interface BooleanCondition {
       getBackground(): string;
       getBold(): boolean;
       getCriteriaType(): BooleanCriteria;
-      getCriteriaValue(): Object[];
-      getFontColor(): string,
+      getCriteriaValues(): Object[];
+      getFontColor(): string;
       getItalic(): boolean;
       getStrikethrough(): boolean;
       getUnderline(): boolean;
     }
 
     /**
-     * The chart's position within a sheet.  Can be updated using the EmbeddedChart.modify()
-     *  function.
+     * An enumeration representing the boolean criteria that can be used in conditional format or
+     * filter.
+     */
+    export enum BooleanCriteria { CELL_EMPTY, CELL_NOT_EMPTY, DATE_AFTER, DATE_BEFORE, DATE_EQUAL_TO, DATE_AFTER_RELATIVE, DATE_BEFORE_RELATIVE, DATE_EQUAL_TO_RELATIVE, NUMBER_BETWEEN, NUMBER_EQUAL_TO, NUMBER_GREATER_THAN, NUMBER_GREATER_THAN_OR_EQUAL_TO, NUMBER_LESS_THAN, NUMBER_LESS_THAN_OR_EQUAL_TO, NUMBER_NOT_BETWEEN, NUMBER_NOT_EQUAL_TO, TEXT_CONTAINS, TEXT_DOES_NOT_CONTAIN, TEXT_EQUAL_TO, TEXT_STARTS_WITH, TEXT_ENDS_WITH, CUSTOM_FORMULA }
+
+    /**
+     * Styles that can be set on a range using Range.setBorder(top, left, bottom, right, vertical, horizontal, color, style).
+     */
+    export enum BorderStyle { DOTTED, DASHED, SOLID, SOLID_MEDIUM, SOLID_THICK, DOUBLE }
+
+    /**
+     * Access conditional formatting rules. To create a new rule, use SpreadsheetApp.newConditionalFormatRule() and ConditionalFormatRuleBuilder.
+     * You can use Sheet.setConditionalFormatRules(rules) to set the
+     * rules for a given sheet.
+     */
+    export interface ConditionalFormatRule {
+      copy(): ConditionalFormatRuleBuilder;
+      getBooleanCondition(): BooleanCondition;
+      getGradientCondition(): GradientCondition;
+      getRanges(): Range[];
+    }
+
+    /**
+     * Builder for conditional format rules.
      *
-     *      chart = chart.modify().setPosition(5, 5, 0, 0).build();
-     *      sheet.updateChart(chart);
+     *     // Adds a conditional format rule to a sheet that causes cells in range A1:B3 to turn red if
+     *     // they contain a number between 1 and 10.
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var range = sheet.getRange("A1:B3");
+     *     var rule = SpreadsheetApp.newConditionalFormatRule()
+     *         .whenNumberBetween(1, 10)
+     *         .setBackgroundColor("#FF0000")
+     *         .setRanges([range])
+     *         .build();
+     *     var rules = sheet.getConditionalFormatRules();
+     *     rules.push(rule);
+     *     sheet.setConditionalFormatRules(rules);
+     */
+    export interface ConditionalFormatRuleBuilder {
+      build(): ConditionalFormatRule;
+      copy(): ConditionalFormatRuleBuilder;
+      getBooleanCondition(): BooleanCondition;
+      getGradientCondition(): GradientCondition;
+      getRanges(): Range[];
+      setBackground(color: string): ConditionalFormatRuleBuilder;
+      setBold(bold: boolean): ConditionalFormatRuleBuilder;
+      setFontColor(color: string): ConditionalFormatRuleBuilder;
+      setGradientMaxpoint(color: string): ConditionalFormatRuleBuilder;
+      setGradientMaxpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
+      setGradientMidpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
+      setGradientMinpoint(color: string): ConditionalFormatRuleBuilder;
+      setGradientMinpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
+      setItalic(italic: boolean): ConditionalFormatRuleBuilder;
+      setRanges(ranges: Range[]): ConditionalFormatRuleBuilder;
+      setStrikethrough(strikethrough: boolean): ConditionalFormatRuleBuilder;
+      setUnderline(underline: boolean): ConditionalFormatRuleBuilder;
+      whenCellEmpty(): ConditionalFormatRuleBuilder;
+      whenCellNotEmpty(): ConditionalFormatRuleBuilder;
+      whenDateAfter(date: Date): ConditionalFormatRuleBuilder;
+      whenDateAfter(date: RelativeDate): ConditionalFormatRuleBuilder;
+      whenDateBefore(date: Date): ConditionalFormatRuleBuilder;
+      whenDateBefore(date: RelativeDate): ConditionalFormatRuleBuilder;
+      whenDateEqualTo(date: Date): ConditionalFormatRuleBuilder;
+      whenDateEqualTo(date: RelativeDate): ConditionalFormatRuleBuilder;
+      whenFormulaSatisfied(formula: string): ConditionalFormatRuleBuilder;
+      whenNumberBetween(start: Number, end: Number): ConditionalFormatRuleBuilder;
+      whenNumberEqualTo(number: Number): ConditionalFormatRuleBuilder;
+      whenNumberGreaterThan(number: Number): ConditionalFormatRuleBuilder;
+      whenNumberGreaterThanOrEqualTo(number: Number): ConditionalFormatRuleBuilder;
+      whenNumberLessThan(number: Number): ConditionalFormatRuleBuilder;
+      whenNumberLessThanOrEqualTo(number: Number): ConditionalFormatRuleBuilder;
+      whenNumberNotBetween(start: Number, end: Number): ConditionalFormatRuleBuilder;
+      whenNumberNotEqualTo(number: Number): ConditionalFormatRuleBuilder;
+      whenTextContains(text: string): ConditionalFormatRuleBuilder;
+      whenTextDoesNotContain(text: string): ConditionalFormatRuleBuilder;
+      whenTextEndsWith(text: string): ConditionalFormatRuleBuilder;
+      whenTextEqualTo(text: string): ConditionalFormatRuleBuilder;
+      whenTextStartsWith(text: string): ConditionalFormatRuleBuilder;
+      withCriteria(criteria: BooleanCriteria, args: Object[]): ConditionalFormatRuleBuilder;
+    }
+
+    /**
+     * Access the chart's position within a sheet. Can be updated using the EmbeddedChart.modify() function.
+     *
+     *     chart = chart.modify().setPosition(5, 5, 0, 0).build();
+     *     sheet.updateChart(chart);
      */
     export interface ContainerInfo {
-      /**
-       * The chart's left side will be anchored to this column.
-       * @returns {Integer}  1-indexed column (i.e. column C will be 3)
-       */
       getAnchorColumn(): Integer;
-      /**
-       * The chart's top side will be anchored to this row.
-       * @returns {Integer}  1-indexed row (i.e. row 5 will return 5)
-       */
       getAnchorRow(): Integer;
-      /**
-       * The chart's upper left hand corner will be offset from the anchor column by this many pixels.
-       * @returns {Integer} the horizontal offset in pixels for the upper left hand corner of the chart
-       */
       getOffsetX(): Integer;
-      /**
-       * Chart's upper left hand corner will be offset from the anchor row by this many pixels.
-       * @returns {Integer} the vertical offset in pixels for the upper left hand corner of the chart
-       */
       getOffsetY(): Integer;
     }
 
     /**
-     * This class allows users to access existing data-validation rules. To create a new rule, see
-     *  SpreadsheetApp.newDataValidation(), DataValidationBuilder, and
-     *  Range.setDataValidation(rule).
+     * An enumeration of possible special paste types.
+     */
+    export enum CopyPasteType { PASTE_NORMAL, PASTE_NO_BORDERS, PASTE_FORMAT, PASTE_FORMULA, PASTE_DATA_VALIDATION, PASTE_VALUES, PASTE_CONDITIONAL_FORMATTING, PASTE_COLUMN_WIDTHS }
+
+    /**
+     * Access data validation rules. To create a new rule, use SpreadsheetApp.newDataValidation() and DataValidationBuilder. You can use
+     * Range.setDataValidation(rule) to set the validation rule for a range.
      *
-     *      // Log information about the data-validation rule for cell A1.
-     *      var cell = SpreadsheetApp.getActive().getRange('A1');
-     *      var rule = cell.getDataValidation();
-     *      if (rule != null) {
-     *        var criteria = rule.getCriteriaType();
-     *        var args = rule.getCriteriaValues();
-     *        Logger.log('The data-validation rule is %s %s', criteria, args);
-     *      } else {
-     *        Logger.log('The cell does not have a data-validation rule.')
-     *      }
+     *     // Log information about the data validation rule for cell A1.
+     *     var cell = SpreadsheetApp.getActive().getRange('A1');
+     *     var rule = cell.getDataValidation();
+     *     if (rule != null) {
+     *       var criteria = rule.getCriteriaType();
+     *       var args = rule.getCriteriaValues();
+     *       Logger.log('The data validation rule is %s %s', criteria, args);
+     *     } else {
+     *       Logger.log('The cell does not have a data validation rule.')
+     *     }
      */
     export interface DataValidation {
       copy(): DataValidationBuilder;
@@ -97,13 +191,13 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Builder for data-validation rules.
+     * Builder for data validation rules.
      *
-     *      // Set the data validation for cell A1 to require a value from B1:B10.
-     *      var cell = SpreadsheetApp.getActive().getRange('A1');
-     *      var range = SpreadsheetApp.getActive().getRange('B1:B10');
-     *      var rule = SpreadsheetApp.newDataValidation().requireValueInRange(range).build();
-     *      cell.setDataValidation(rule);
+     *     // Set the data validation for cell A1 to require a value from B1:B10.
+     *     var cell = SpreadsheetApp.getActive().getRange('A1');
+     *     var range = SpreadsheetApp.getActive().getRange('B1:B10');
+     *     var rule = SpreadsheetApp.newDataValidation().requireValueInRange(range).build();
+     *     cell.setDataValidation(rule);
      */
     export interface DataValidationBuilder {
       build(): DataValidation;
@@ -144,39 +238,50 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * An enumeration representing the data-validation criteria that can be set on a range.
+     * An enumeration representing the data validation criteria that can be set on a range.
      *
-     *      // Change existing data-validation rules that require a date in 2013 to require a date in 2014.
-     *      var oldDates = [new Date('1/1/2013'), new Date('12/31/2013')];
-     *      var newDates = [new Date('1/1/2014'), new Date('12/31/2014')];
-     *      var sheet = SpreadsheetApp.getActiveSheet();
-     *      var range = sheet.getRange(1, 1, sheet.getMaxRows(), sheet.getMaxColumns());
-     *      var rules = range.getDataValidations();
+     *     // Change existing data-validation rules that require a date in 2013 to require a date in 2014.
+     *     var oldDates = [new Date('1/1/2013'), new Date('12/31/2013')];
+     *     var newDates = [new Date('1/1/2014'), new Date('12/31/2014')];
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var range = sheet.getRange(1, 1, sheet.getMaxRows(), sheet.getMaxColumns());
+     *     var rules = range.getDataValidations();
      *
-     *      for (var i = 0; i < rules.length; i++) {
-     *        for (var j = 0; j < rules[i].length; j++) {
-     *          var rule = rules[i][j];
+     *     for (var i = 0; i < rules.length; i++) {
+     *       for (var j = 0; j < rules[i].length; j++) {
+     *         var rule = rules[i][j];
      *
-     *          if (rule != null) {
-     *            var criteria = rule.getCriteriaType();
-     *            var args = rule.getCriteriaValues();
+     *         if (rule != null) {
+     *           var criteria = rule.getCriteriaType();
+     *           var args = rule.getCriteriaValues();
      *
-     *            if (criteria == SpreadsheetApp.DataValidationCriteria.DATE_BETWEEN
-     *                && args[0].getTime() == oldDates[0].getTime()
-     *                && args[1].getTime() == oldDates[1].getTime()) {
-     *              // Create a builder from the existing rule, then change the dates.
-     *              rules[i][j] = rule.copy().withCriteria(criteria, newDates).build();
-     *            }
-     *          }
-     *        }
-     *      }
-     *      range.setDataValidations(rules);
+     *           if (criteria == SpreadsheetApp.DataValidationCriteria.DATE_BETWEEN
+     *               && args[0].getTime() == oldDates[0].getTime()
+     *               && args[1].getTime() == oldDates[1].getTime()) {
+     *             // Create a builder from the existing rule, then change the dates.
+     *             rules[i][j] = rule.copy().withCriteria(criteria, newDates).build();
+     *           }
+     *         }
+     *       }
+     *     }
+     *     range.setDataValidations(rules);
      */
-    export enum DataValidationCriteria { DATE_AFTER, DATE_BEFORE, DATE_BETWEEN, DATE_EQUAL_TO, DATE_IS_VALID_DATE, DATE_NOT_BETWEEN, DATE_ON_OR_AFTER, DATE_ON_OR_BEFORE, NUMBER_BETWEEN, NUMBER_EQUAL_TO, NUMBER_GREATER_THAN, NUMBER_GREATER_THAN_OR_EQUAL_TO, NUMBER_LESS_THAN, NUMBER_LESS_THAN_OR_EQUAL_TO, NUMBER_NOT_BETWEEN, NUMBER_NOT_EQUAL_TO, TEXT_CONTAINS, TEXT_DOES_NOT_CONTAIN, TEXT_EQUAL_TO, TEXT_IS_VALID_EMAIL, TEXT_IS_VALID_URL, VALUE_IN_LIST, VALUE_IN_RANGE, CUSTOM_FORMULA }
+    export enum DataValidationCriteria { DATE_AFTER, DATE_BEFORE, DATE_BETWEEN, DATE_EQUAL_TO, DATE_IS_VALID_DATE, DATE_NOT_BETWEEN, DATE_ON_OR_AFTER, DATE_ON_OR_BEFORE, NUMBER_BETWEEN, NUMBER_EQUAL_TO, NUMBER_GREATER_THAN, NUMBER_GREATER_THAN_OR_EQUAL_TO, NUMBER_LESS_THAN, NUMBER_LESS_THAN_OR_EQUAL_TO, NUMBER_NOT_BETWEEN, NUMBER_NOT_EQUAL_TO, TEXT_CONTAINS, TEXT_DOES_NOT_CONTAIN, TEXT_EQUAL_TO, TEXT_IS_VALID_EMAIL, TEXT_IS_VALID_URL, VALUE_IN_LIST, VALUE_IN_RANGE, CUSTOM_FORMULA, CHECKBOX }
+
+    /**
+     * An enumeration of possible directions along which data can be stored in a spreadsheet.
+     */
+    export enum Dimension { COLUMNS, ROWS }
+
+    /**
+     * An enumeration representing the possible directions that one can move within a spreadsheet using
+     * the arrow keys.
+     */
+    export enum Direction { UP, DOWN, PREVIOUS, NEXT }
 
     /**
      * Builder for area charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedAreaChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -198,8 +303,11 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedAreaChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedAreaChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedAreaChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPointStyle(style: Charts.PointStyle): EmbeddedAreaChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
@@ -207,6 +315,7 @@ declare namespace GoogleAppsScript {
       setStacked(): EmbeddedAreaChartBuilder;
       setTitle(chartTitle: string): EmbeddedAreaChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
       setXAxisTitle(title: string): EmbeddedAreaChartBuilder;
       setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedAreaChartBuilder;
@@ -218,7 +327,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * Builder for bar charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedBarChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -241,14 +350,18 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedBarChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedBarChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedBarChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setRange(start: Number, end: Number): EmbeddedBarChartBuilder;
       setStacked(): EmbeddedBarChartBuilder;
       setTitle(chartTitle: string): EmbeddedBarChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
       setXAxisTitle(title: string): EmbeddedBarChartBuilder;
       setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedBarChartBuilder;
@@ -259,58 +372,62 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Represents a chart that has been embedded into a Spreadsheet.
+     * Represents a chart that has been embedded into a spreadsheet.
      *
      * This example shows how to modify an existing chart:
      *
-     *      var sheet = SpreadsheetApp.getActiveSheet();
-     *      var range = sheet.getRange("A2:B8")
-     *      var chart = sheet.getCharts()[0];
-     *      chart = chart.modify()
-     *          .addRange(range)
-     *          .setOption('title', 'Updated!')
-     *          .setOption('animation.duration', 500)
-     *          .setPosition(2,2,0,0)
-     *          .build();
-     *      sheet.updateChart(chart);
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var range = sheet.getRange("A2:B8")
+     *     var chart = sheet.getCharts()[0];
+     *     chart = chart.modify()
+     *         .addRange(range)
+     *         .setOption('title', 'Updated!')
+     *         .setOption('animation.duration', 500)
+     *         .setPosition(2,2,0,0)
+     *         .build();
+     *     sheet.updateChart(chart);
      *
      * This example shows how to create a new chart:
      *
-     *      function newChart(range, sheet) {
-     *        var sheet = SpreadsheetApp.getActiveSheet();
-     *        var chartBuilder = sheet.newChart();
-     *        chartBuilder.addRange(range)
-     *            .setChartType(Charts.ChartType.LINE)
-     *            .setOption('title', 'My Line Chart!');
-     *        sheet.insertChart(chartBuilder.build());
-     *      }
+     *     function newChart(range, sheet) {
+     *       var sheet = SpreadsheetApp.getActiveSheet();
+     *       var chartBuilder = sheet.newChart();
+     *       chartBuilder.addRange(range)
+     *           .setChartType(Charts.ChartType.LINE)
+     *           .setOption('title', 'My Line Chart!');
+     *       sheet.insertChart(chartBuilder.build());
+     *     }
      */
     export interface EmbeddedChart {
       getAs(contentType: string): Base.Blob;
       getBlob(): Base.Blob;
       getContainerInfo(): ContainerInfo;
+      getHiddenDimensionStrategy(): Charts.ChartHiddenDimensionStrategy;
       getId(): string;
+      getMergeStrategy(): Charts.ChartMergeStrategy;
+      getNumHeaders(): Integer;
       getOptions(): Charts.ChartOptions;
       getRanges(): Range[];
+      getTransposeRowsAndColumns(): boolean;
       getType(): string;
       modify(): EmbeddedChartBuilder;
       setId(id: string): Charts.Chart;
     }
 
     /**
-     * This builder allows you to edit an EmbeddedChart. Make sure to call
-     *  sheet.updateChart(builder.build()) to save your changes.
+     * Builder used to edit an EmbeddedChart. Changes made to the chart are not saved until
+     * Sheet.updateChart(chart) is called on the rebuilt chart.
      *
-     *      var sheet = SpreadsheetApp.getActiveSheet();
-     *      var range = sheet.getRange("A1:B8");
-     *      var chart = sheet.getCharts()[0];
-     *      chart = chart.modify()
-     *          .addRange(range)
-     *          .setOption('title', 'Updated!')
-     *          .setOption('animation.duration', 500)
-     *          .setPosition(2,2,0,0)
-     *          .build();
-     *      sheet.updateChart(chart);
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var range = sheet.getRange("A1:B8");
+     *     var chart = sheet.getCharts()[0];
+     *     chart = chart.modify()
+     *         .addRange(range)
+     *         .setOption('title', 'Updated!')
+     *         .setOption('animation.duration', 500)
+     *         .setPosition(2,2,0,0)
+     *         .build();
+     *     sheet.updateChart(chart);
      */
     export interface EmbeddedChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -329,13 +446,17 @@ declare namespace GoogleAppsScript {
       getRanges(): Range[];
       removeRange(range: Range): EmbeddedChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
     }
 
     /**
      * Builder for column charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedColumnChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -357,14 +478,18 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedColumnChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedColumnChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedColumnChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setRange(start: Number, end: Number): EmbeddedColumnChartBuilder;
       setStacked(): EmbeddedColumnChartBuilder;
       setTitle(chartTitle: string): EmbeddedColumnChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
       setXAxisTitle(title: string): EmbeddedColumnChartBuilder;
       setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedColumnChartBuilder;
@@ -375,8 +500,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Builder for combo charts. For more details, see the Gviz
-     *  documentation.
+     * Builder for combo charts. For more details, see the Gviz documentation.
      */
     export interface EmbeddedComboChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -398,14 +522,18 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedComboChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedComboChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedComboChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setRange(start: Number, end: Number): EmbeddedComboChartBuilder;
       setStacked(): EmbeddedComboChartBuilder;
       setTitle(chartTitle: string): EmbeddedComboChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
       setXAxisTitle(title: string): EmbeddedComboChartBuilder;
       setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedComboChartBuilder;
@@ -417,7 +545,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * Builder for histogram charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedHistogramChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -439,14 +567,18 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedHistogramChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedHistogramChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedHistogramChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setRange(start: Number, end: Number): EmbeddedHistogramChartBuilder;
       setStacked(): EmbeddedHistogramChartBuilder;
       setTitle(chartTitle: string): EmbeddedHistogramChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
       setXAxisTitle(title: string): EmbeddedHistogramChartBuilder;
       setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedHistogramChartBuilder;
@@ -458,7 +590,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * Builder for line charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedLineChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -481,14 +613,18 @@ declare namespace GoogleAppsScript {
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedLineChartBuilder;
       setCurveStyle(style: Charts.CurveStyle): EmbeddedLineChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedLineChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPointStyle(style: Charts.PointStyle): EmbeddedLineChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setRange(start: Number, end: Number): EmbeddedLineChartBuilder;
       setTitle(chartTitle: string): EmbeddedLineChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
       setXAxisTitle(title: string): EmbeddedLineChartBuilder;
       setXAxisTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedLineChartBuilder;
@@ -500,7 +636,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * Builder for pie charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedPieChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -523,17 +659,21 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedPieChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedPieChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedPieChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedPieChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setTitle(chartTitle: string): EmbeddedPieChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedPieChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
     }
 
     /**
      * Builder for scatter charts. For more details, see the Gviz
-     *  documentation.
+     * documentation.
      */
     export interface EmbeddedScatterChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -554,13 +694,17 @@ declare namespace GoogleAppsScript {
       setBackgroundColor(cssValue: string): EmbeddedScatterChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setColors(cssValues: string[]): EmbeddedScatterChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setLegendPosition(position: Charts.Position): EmbeddedScatterChartBuilder;
       setLegendTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPointStyle(style: Charts.PointStyle): EmbeddedScatterChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
       setTitle(chartTitle: string): EmbeddedScatterChartBuilder;
       setTitleTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       setXAxisLogScale(): EmbeddedScatterChartBuilder;
       setXAxisRange(start: Number, end: Number): EmbeddedScatterChartBuilder;
       setXAxisTextStyle(textStyle: Charts.TextStyle): EmbeddedScatterChartBuilder;
@@ -574,8 +718,7 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Builder for table charts. For more details, see the Gviz
-     *  documentation.
+     * Builder for table charts. For more details, see the Gviz documentation.
      */
     export interface EmbeddedTableChartBuilder {
       addRange(range: Range): EmbeddedChartBuilder;
@@ -600,38 +743,100 @@ declare namespace GoogleAppsScript {
       removeRange(range: Range): EmbeddedChartBuilder;
       setChartType(type: Charts.ChartType): EmbeddedChartBuilder;
       setFirstRowNumber(number: Integer): EmbeddedTableChartBuilder;
+      setHiddenDimensionStrategy(strategy: Charts.ChartHiddenDimensionStrategy): EmbeddedChartBuilder;
       setInitialSortingAscending(column: Integer): EmbeddedTableChartBuilder;
       setInitialSortingDescending(column: Integer): EmbeddedTableChartBuilder;
+      setMergeStrategy(mergeStrategy: Charts.ChartMergeStrategy): EmbeddedChartBuilder;
+      setNumHeaders(headers: Integer): EmbeddedChartBuilder;
       setOption(option: string, value: Object): EmbeddedChartBuilder;
       setPosition(anchorRowPos: Integer, anchorColPos: Integer, offsetX: Integer, offsetY: Integer): EmbeddedChartBuilder;
+      setTransposeRowsAndColumns(transpose: boolean): EmbeddedChartBuilder;
       showRowNumberColumn(showRowNumber: boolean): EmbeddedTableChartBuilder;
       useAlternatingRowStyle(alternate: boolean): EmbeddedTableChartBuilder;
     }
 
     /**
-     * Access gradient (color) conditions in `ConditionalFormatRuleApis`. Each
-     * conditional format rule may contain a single gradient condition. A
-     * gradient condition is defined by three points along a number scale (min,
-     * mid, and max), each of which has a color, a value, and a
-     * `InterpolationType`. The content of a cell is compared to the values in
-     * the number scale and the color applied to the cell is interpolated based
-     * on the cell content's proximity to the gradient condition min, mid, and
-     * max points.
-     * 
-     * // Logs all the information inside gradient conditional format rules on * a sheet.
-     * var sheet = SpreadsheetApp.getActiveSheet();
-     * var rules = sheet.getConditionalFormatRules();
-     * for (int i = 0; i < rules.length; i++) {
-     *   var gradient = rules[i].getGradientCondition();
-     *   Logger.log("The conditional format gradient information for rule %d:\n
-     *     MinColor %s, MinType %s, MinValue %s, \n
-     *     MidColor %s, MidType %s, MidValue %s, \n
-     *     MaxColor %s, MaxType %s, MaxValue %s \n", i,
-     *     gradient.getMinColor(), gradient.getMinType(), gradient.getMinValue(),
-     *     gradient.getMidColor(), gradient.getMidType(), gradient.getMidValue(),
-     *     gradient.getMaxColor(), gradient.getMaxType(), gradient.getMaxValue());
-     * }
-     **/
+     * Access and modify existing filters. To create a new filter, use Range.createFilter().
+     */
+    export interface Filter {
+      getColumnFilterCriteria(columnPosition: Integer): FilterCriteria;
+      getRange(): Range;
+      remove(): void;
+      removeColumnFilterCriteria(columnPosition: Integer): Filter;
+      setColumnFilterCriteria(columnPosition: Integer, filterCriteria: FilterCriteria): Filter;
+      sort(columnPosition: Integer, ascending: boolean): Filter;
+    }
+
+    /**
+     * Access filter criteria. To create a new criteria, use SpreadsheetApp.newFilterCriteria() and FilterCriteriaBuilder.
+     */
+    export interface FilterCriteria {
+      copy(): FilterCriteriaBuilder;
+      getCriteriaType(): BooleanCriteria;
+      getCriteriaValues(): Object[];
+      getHiddenValues(): string[];
+      getVisibleValues(): string[];
+    }
+
+    /**
+     * Builder for FilterCriteria.
+     */
+    export interface FilterCriteriaBuilder {
+      build(): FilterCriteria;
+      copy(): FilterCriteriaBuilder;
+      getCriteriaType(): BooleanCriteria;
+      getCriteriaValues(): Object[];
+      getHiddenValues(): string[];
+      getVisibleValues(): string[];
+      setHiddenValues(values: string[]): FilterCriteriaBuilder;
+      setVisibleValues(values: string[]): FilterCriteriaBuilder;
+      whenCellEmpty(): FilterCriteriaBuilder;
+      whenCellNotEmpty(): FilterCriteriaBuilder;
+      whenDateAfter(date: Date): FilterCriteriaBuilder;
+      whenDateAfter(date: RelativeDate): FilterCriteriaBuilder;
+      whenDateBefore(date: Date): FilterCriteriaBuilder;
+      whenDateBefore(date: RelativeDate): FilterCriteriaBuilder;
+      whenDateEqualTo(date: Date): FilterCriteriaBuilder;
+      whenDateEqualTo(date: RelativeDate): FilterCriteriaBuilder;
+      whenFormulaSatisfied(formula: string): FilterCriteriaBuilder;
+      whenNumberBetween(start: Number, end: Number): FilterCriteriaBuilder;
+      whenNumberEqualTo(number: Number): FilterCriteriaBuilder;
+      whenNumberGreaterThan(number: Number): FilterCriteriaBuilder;
+      whenNumberGreaterThanOrEqualTo(number: Number): FilterCriteriaBuilder;
+      whenNumberLessThan(number: Number): FilterCriteriaBuilder;
+      whenNumberLessThanOrEqualTo(number: Number): FilterCriteriaBuilder;
+      whenNumberNotBetween(start: Number, end: Number): FilterCriteriaBuilder;
+      whenNumberNotEqualTo(number: Number): FilterCriteriaBuilder;
+      whenTextContains(text: string): FilterCriteriaBuilder;
+      whenTextDoesNotContain(text: string): FilterCriteriaBuilder;
+      whenTextEndsWith(text: string): FilterCriteriaBuilder;
+      whenTextEqualTo(text: string): FilterCriteriaBuilder;
+      whenTextStartsWith(text: string): FilterCriteriaBuilder;
+      withCriteria(criteria: BooleanCriteria, args: Object[]): FilterCriteriaBuilder;
+    }
+
+    /**
+     * Access gradient (color) conditions in ConditionalFormatRuleApis.
+     * Each conditional format rule may contain a single gradient condition. A gradient condition is
+     * defined by three points along a number scale (min, mid, and max), each of which has a color, a
+     * value, and a InterpolationType. The content of a cell is
+     * compared to the values in the number scale and the color applied to the cell is interpolated
+     * based on the cell content's proximity to the gradient condition min, mid, and max points.
+     *
+     *     // Logs all the information inside gradient conditional format rules on a sheet.
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var rules = sheet.getConditionalFormatRules();
+     *     for (int i = 0; i < rules.length; i++) {
+     *       var gradient = rules[i].getGradientCondition();
+     *       Logger.log("The conditional format gradient information for rule %d:\n
+     *         MinColor %s, MinType %s, MinValue %s, \n
+     *         MidColor %s, MidType %s, MidValue %s, \n
+     *         MaxColor %s, MaxType %s, MaxValue %s \n", i,
+     *         gradient.getMinColor(), gradient.getMinType(), gradient.getMinValue(),
+     *         gradient.getMidColor(), gradient.getMidType(), gradient.getMidValue(),
+     *         gradient.getMaxColor(), gradient.getMaxType(), gradient.getMaxValue());
+     *     }
+     */
     export interface GradientCondition {
       getMaxColor(): string;
       getMaxType(): InterpolationType;
@@ -645,39 +850,57 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * Create, access and modify named ranges in a spreadsheet.
-     *  Named ranges are ranges that have associated string aliases.
-     *  They can be viewed and edited via the Sheets UI under the
-     *  Data > Named ranges... menu.
+     * Access and modify spreadsheet groups. Groups are an association between an interval of contiguous
+     * rows or columns that can be expanded or collapsed as a unit to hide/show the rows or columns.
+     * Each group has a control toggle on the row or column directly before or after the group
+     * (depending on settings) that can expand or collapse the group as a whole.
+     *
+     * The depth of a group refers to the nested position of the group and how many larger
+     * groups contain the group. The collapsed state of a group refers to whether the group
+     * should remain collapsed or expanded after a parent group has been expanded. Additionally, at the
+     * time that a group is collapsed or expanded, the rows or columns within the group are hidden or
+     * set visible, though individual rows or columns can be hidden or set visible irrespective of the
+     * collapsed state.
+     */
+    export interface Group {
+      collapse(): Group;
+      expand(): Group;
+      getControlIndex(): Integer;
+      getDepth(): Integer;
+      getRange(): Range;
+      isCollapsed(): boolean;
+      remove(): void;
+    }
+
+    /**
+     * An enumeration representing the possible positions that a group control toggle can have.
+     */
+    export enum GroupControlTogglePosition { BEFORE, AFTER }
+
+    /**
+     * An enumeration representing the interpolation options for calculating a value to be used in a
+     * GradientCondition in a ConditionalFormatRule.
+     */
+    export enum InterpolationType { NUMBER, PERCENT, PERCENTILE, MIN, MAX }
+
+    /**
+     * Create, access and modify named ranges in a spreadsheet. Named ranges are ranges that have
+     * associated string aliases. They can be viewed and edited via the Sheets UI under the Data >
+     * Named ranges... menu.
      */
     export interface NamedRange {
-      /**
-       * Gets the name of this named range.
-       */
       getName(): string;
-      /**
-       * Gets teh range referenced by this named range.
-       */
       getRange(): Range;
-      /**
-       * Deletes this named range.
-       */
       remove(): void;
-      /**
-       * Sets/updates the name of this named range.
-       */
       setName(name: string): NamedRange;
-      /**
-       * Sets/updates the range for this named range.
-       */
       setRange(range: Range): NamedRange;
     }
 
     /**
-     * @deprecated
-     * For spreadsheets created in the newer version of Google Sheets, use the more powerful
-     *      Protection class instead. Although this class is deprecated, it will remain
-     *      available for compatibility with the older version of Sheets.
+     *
+     * Deprecated. For spreadsheets created in the newer version of Google Sheets, use the more powerful
+     *     Protection class instead. Although this class is deprecated, it remains available
+     *     for compatibility with the older version of Sheets.
      * Access and modify protected sheets in the older version of Google Sheets.
      */
     export interface PageProtection {
@@ -688,48 +911,130 @@ declare namespace GoogleAppsScript {
       setProtected(protection: boolean): void;
     }
 
+    /**
+     * Access and modify pivot table filters.
+     */
+    export interface PivotFilter {
+      getFilterCriteria(): FilterCriteria;
+      getPivotTable(): PivotTable;
+      getSourceDataColumn(): Integer;
+      remove(): void;
+      setFilterCriteria(filterCriteria: FilterCriteria): PivotFilter;
+    }
+
+    /**
+     * Access and modify pivot table breakout groups.
+     */
+    export interface PivotGroup {
+      addManualGroupingRule(groupName: string, groupMembers: Object[]): PivotGroup;
+      areLabelsRepeated(): boolean;
+      clearGroupingRule(): PivotGroup;
+      clearSort(): PivotGroup;
+      getDimension(): Dimension;
+      getIndex(): Integer;
+      getPivotTable(): PivotTable;
+      getSourceDataColumn(): Integer;
+      hideRepeatedLabels(): PivotGroup;
+      isSortAscending(): boolean;
+      moveToIndex(index: Integer): PivotGroup;
+      remove(): void;
+      removeManualGroupingRule(groupName: string): PivotGroup;
+      resetDisplayName(): PivotGroup;
+      setDisplayName(name: string): PivotGroup;
+      setHistogramGroupingRule(minValue: Integer, maxValue: Integer, intervalSize: Integer): PivotGroup;
+      showRepeatedLabels(): PivotGroup;
+      showTotals(showTotals: boolean): PivotGroup;
+      sortAscending(): PivotGroup;
+      sortBy(value: PivotValue, oppositeGroupValues: Object[]): PivotGroup;
+      sortDescending(): PivotGroup;
+      totalsAreShown(): boolean;
+    }
+
+    /**
+     * Access and modify pivot tables.
+     */
+    export interface PivotTable {
+      addCalculatedPivotValue(name: string, formula: string): PivotValue;
+      addColumnGroup(sourceDataColumn: Integer): PivotGroup;
+      addFilter(sourceDataColumn: Integer, filterCriteria: FilterCriteria): PivotFilter;
+      addPivotValue(sourceDataColumn: Integer, summarizeFunction: PivotTableSummarizeFunction): PivotValue;
+      addRowGroup(sourceDataColumn: Integer): PivotGroup;
+      getAnchorCell(): Range;
+      getColumnGroups(): PivotGroup[];
+      getFilters(): PivotFilter[];
+      getPivotValues(): PivotValue[];
+      getRowGroups(): PivotGroup[];
+      getValuesDisplayOrientation(): Dimension;
+      remove(): void;
+      setValuesDisplayOrientation(dimension: Dimension): PivotTable;
+    }
+
+    /**
+     * An enumeration of functions that summarize pivot table data.
+     */
+    export enum PivotTableSummarizeFunction { CUSTOM, SUM, COUNTA, COUNT, COUNTUNIQUE, AVERAGE, MAX, MIN, MEDIAN, PRODUCT, STDEV, STDEVP, VAR, VARP }
+
+    /**
+     * Access and modify value groups in pivot tables.
+     */
+    export interface PivotValue {
+      getDisplayType(): PivotValueDisplayType;
+      getFormula(): string;
+      getPivotTable(): PivotTable;
+      getSummarizedBy(): PivotTableSummarizeFunction;
+      setDisplayName(name: string): PivotValue;
+      setFormula(formula: string): PivotValue;
+      showAs(displayType: PivotValueDisplayType): PivotValue;
+      summarizeBy(summarizeFunction: PivotTableSummarizeFunction): PivotValue;
+    }
+
+    /**
+     * An enumeration of ways to display a pivot value as a function of another value.
+     */
+    export enum PivotValueDisplayType { DEFAULT, PERCENT_OF_ROW_TOTAL, PERCENT_OF_COLUMN_TOTAL, PERCENT_OF_GRAND_TOTAL }
+
     /**
      * Access and modify protected ranges and sheets. A protected range can protect either a static
-     *  range of cells or a named range. A protected sheet may include unprotected regions. For
-     *  spreadsheets created with the older version of Google Sheets, use the PageProtection
-     *  class instead.
+     * range of cells or a named range. A protected sheet may include unprotected regions. For
+     * spreadsheets created with the older version of Google Sheets, use the PageProtection
+     * class instead.
      *
-     *      // Protect range A1:B10, then remove all other users from the list of editors.
-     *      var ss = SpreadsheetApp.getActive();
-     *      var range = ss.getRange('A1:B10');
-     *      var protection = range.protect().setDescription('Sample protected range');
+     *     // Protect range A1:B10, then remove all other users from the list of editors.
+     *     var ss = SpreadsheetApp.getActive();
+     *     var range = ss.getRange('A1:B10');
+     *     var protection = range.protect().setDescription('Sample protected range');
      *
-     *      // Ensure the current user is an editor before removing others. Otherwise, if the user's edit
-     *      // permission comes from a group, the script will throw an exception upon removing the group.
-     *      var me = Session.getEffectiveUser();
-     *      protection.addEditor(me);
-     *      protection.removeEditors(protection.getEditors());
-     *      if (protection.canDomainEdit()) {
-     *        protection.setDomainEdit(false);
-     *      }
+     *     // Ensure the current user is an editor before removing others. Otherwise, if the user's edit
+     *     // permission comes from a group, the script throws an exception upon removing the group.
+     *     var me = Session.getEffectiveUser();
+     *     protection.addEditor(me);
+     *     protection.removeEditors(protection.getEditors());
+     *     if (protection.canDomainEdit()) {
+     *       protection.setDomainEdit(false);
+     *     }
      *
-     *      // Remove all range protections in the spreadsheet that the user has permission to edit.
-     *      var ss = SpreadsheetApp.getActive();
-     *      var protections = ss.getProtections(SpreadsheetApp.ProtectionType.RANGE);
-     *      for (var i = 0; i < protections.length; i++) {
-     *        var protection = protections[i];
-     *        if (protection.canEdit()) {
-     *          protection.remove();
-     *        }
-     *      }
+     *     // Remove all range protections in the spreadsheet that the user has permission to edit.
+     *     var ss = SpreadsheetApp.getActive();
+     *     var protections = ss.getProtections(SpreadsheetApp.ProtectionType.RANGE);
+     *     for (var i = 0; i < protections.length; i++) {
+     *       var protection = protections[i];
+     *       if (protection.canEdit()) {
+     *         protection.remove();
+     *       }
+     *     }
      *
-     *      // Protect the active sheet, then remove all other users from the list of editors.
-     *      var sheet = SpreadsheetApp.getActiveSheet();
-     *      var protection = sheet.protect().setDescription('Sample protected sheet');
+     *     // Protect the active sheet, then remove all other users from the list of editors.
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var protection = sheet.protect().setDescription('Sample protected sheet');
      *
-     *      // Ensure the current user is an editor before removing others. Otherwise, if the user's edit
-     *      // permission comes from a group, the script will throw an exception upon removing the group.
-     *      var me = Session.getEffectiveUser();
-     *      protection.addEditor(me);
-     *      protection.removeEditors(protection.getEditors());
-     *      if (protection.canDomainEdit()) {
-     *        protection.setDomainEdit(false);
-     *      }
+     *     // Ensure the current user is an editor before removing others. Otherwise, if the user's edit
+     *     // permission comes from a group, the script throws an exception upon removing the group.
+     *     var me = Session.getEffectiveUser();
+     *     protection.addEditor(me);
+     *     protection.removeEditors(protection.getEditors());
+     *     if (protection.canDomainEdit()) {
+     *       protection.setDomainEdit(false);
+     *     }
      */
     export interface Protection {
       addEditor(emailAddress: string): Protection;
@@ -760,33 +1065,40 @@ declare namespace GoogleAppsScript {
     /**
      * An enumeration representing the parts of a spreadsheet that can be protected from edits.
      *
-     *      // Remove all range protections in the spreadsheet that the user has permission to edit.
-     *      var ss = SpreadsheetApp.getActive();
-     *      var protections = ss.getProtections(SpreadsheetApp.ProtectionType.RANGE);
-     *      for (var i = 0; i < protections.length; i++) {
-     *        var protection = protections[i];
-     *        if (protection.canEdit()) {
-     *          protection.remove();
-     *        }
-     *      }
+     *     // Remove all range protections in the spreadsheet that the user has permission to edit.
+     *     var ss = SpreadsheetApp.getActive();
+     *     var protections = ss.getProtections(SpreadsheetApp.ProtectionType.RANGE);
+     *     for (var i = 0; i < protections.length; i++) {
+     *       var protection = protections[i];
+     *       if (protection.canEdit()) {
+     *         protection.remove();
+     *       }
+     *     }
      *
-     *      // Removes sheet protection from the active sheet, if the user has permission to edit it.
-     *      var sheet = SpreadsheetApp.getActiveSheet();
-     *      var protection = sheet.getProtections(SpreadsheetApp.ProtectionType.SHEET)[0];
-     *      if (protection && protection.canEdit()) {
-     *        protection.remove();
-     *      }
+     *     // Removes sheet protection from the active sheet, if the user has permission to edit it.
+     *     var sheet = SpreadsheetApp.getActiveSheet();
+     *     var protection = sheet.getProtections(SpreadsheetApp.ProtectionType.SHEET)[0];
+     *     if (protection && protection.canEdit()) {
+     *       protection.remove();
+     *     }
      */
     export enum ProtectionType { RANGE, SHEET }
 
     /**
-     * Access and modify spreadsheet ranges.
-     *
-     *  This class allows users to access and modify ranges in Google Sheets. A range can be
-     *  a single cell in a sheet or a range of cells in a sheet.
+     * Access and modify spreadsheet ranges. A range can be a single cell in a sheet or a group of
+     * adjacent cells in a sheet.
      */
     export interface Range {
       activate(): Range;
+      activateAsCurrentCell(): Range;
+      applyColumnBanding(): Banding;
+      applyColumnBanding(bandingTheme: BandingTheme): Banding;
+      applyColumnBanding(bandingTheme: BandingTheme, showHeader: boolean, showFooter: boolean): Banding;
+      applyRowBanding(): Banding;
+      applyRowBanding(bandingTheme: BandingTheme): Banding;
+      applyRowBanding(bandingTheme: BandingTheme, showHeader: boolean, showFooter: boolean): Banding;
+      autoFill(destination: Range, series: AutoFillSeries): void;
+      autoFillToNeighbor(series: AutoFillSeries): void;
       breakApart(): Range;
       canEdit(): boolean;
       clear(): Range;
@@ -795,18 +1107,24 @@ declare namespace GoogleAppsScript {
       clearDataValidations(): Range;
       clearFormat(): Range;
       clearNote(): Range;
+      collapseGroups(): Range;
       copyFormatToRange(gridId: Integer, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
       copyFormatToRange(sheet: Sheet, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
       copyTo(destination: Range): void;
+      copyTo(destination: Range, copyPasteType: CopyPasteType, transposed: boolean): void;
       copyTo(destination: Range, options: Object): void;
       copyValuesToRange(gridId: Integer, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
       copyValuesToRange(sheet: Sheet, column: Integer, columnEnd: Integer, row: Integer, rowEnd: Integer): void;
+      createFilter(): Filter;
+      createPivotTable(sourceData: Range): PivotTable;
+      deleteCells(shiftDimension: Dimension): void;
+      expandGroups(): Range;
       getA1Notation(): string;
       getBackground(): string;
       getBackgrounds(): string[][];
+      getBandings(): Banding[];
       getCell(row: Integer, column: Integer): Range;
       getColumn(): Integer;
-      getColumnIndex(): Integer;
       getDataSourceUrl(): string;
       getDataTable(): Charts.DataTable;
       getDataTable(firstRowIsHeader: boolean): Charts.DataTable;
@@ -814,6 +1132,7 @@ declare namespace GoogleAppsScript {
       getDataValidations(): DataValidation[][];
       getDisplayValue(): string;
       getDisplayValues(): string[][];
+      getFilter(): Filter;
       getFontColor(): string;
       getFontColors(): string[][];
       getFontFamilies(): string[][];
@@ -837,6 +1156,7 @@ declare namespace GoogleAppsScript {
       getLastColumn(): Integer;
       getLastRow(): Integer;
       getMergedRanges(): Range[];
+      getNextDataCell(direction: Direction): Range;
       getNote(): string;
       getNotes(): string[][];
       getNumColumns(): Integer;
@@ -846,13 +1166,20 @@ declare namespace GoogleAppsScript {
       getRow(): Integer;
       getRowIndex(): Integer;
       getSheet(): Sheet;
+      getTextDirection(): TextDirection;
+      getTextDirections(): TextDirection[][];
+      getTextRotation(): TextRotation;
+      getTextRotations(): TextRotation[][];
       getValue(): Object;
       getValues(): Object[][];
       getVerticalAlignment(): string;
       getVerticalAlignments(): string[][];
       getWidth(): Integer;
       getWrap(): boolean;
+      getWrapStrategies(): WrapStrategy[][];
+      getWrapStrategy(): WrapStrategy;
       getWraps(): Boolean[][];
+      insertCells(shiftDimension: Dimension): Range;
       isBlank(): boolean;
       isEndColumnBounded(): boolean;
       isEndRowBounded(): boolean;
@@ -867,6 +1194,7 @@ declare namespace GoogleAppsScript {
       offset(rowOffset: Integer, columnOffset: Integer, numRows: Integer): Range;
       offset(rowOffset: Integer, columnOffset: Integer, numRows: Integer, numColumns: Integer): Range;
       protect(): Protection;
+      randomize(): Range;
       setBackground(color: string): Range;
       setBackgroundRGB(red: Integer, green: Integer, blue: Integer): Range;
       setBackgrounds(color: string[][]): Range;
@@ -896,40 +1224,145 @@ declare namespace GoogleAppsScript {
       setNotes(notes: Object[][]): Range;
       setNumberFormat(numberFormat: string): Range;
       setNumberFormats(numberFormats: Object[][]): Range;
+      setShowHyperlink(showHyperlink: boolean): Range;
+      setTextDirection(direction: TextDirection): Range;
+      setTextDirections(directions: TextDirection[][]): Range;
+      setTextRotation(degrees: Integer): Range;
+      setTextRotation(rotation: TextRotation): Range;
+      setTextRotations(rotations: TextRotation[][]): Range;
       setValue(value: Object): Range;
       setValues(values: Object[][]): Range;
       setVerticalAlignment(alignment: string): Range;
       setVerticalAlignments(alignments: Object[][]): Range;
+      setVerticalText(isVertical: boolean): Range;
       setWrap(isWrapEnabled: boolean): Range;
+      setWrapStrategies(strategies: WrapStrategy[][]): Range;
+      setWrapStrategy(strategy: WrapStrategy): Range;
       setWraps(isWrapEnabled: Object[][]): Range;
+      shiftColumnGroupDepth(delta: Integer): Range;
+      shiftRowGroupDepth(delta: Integer): Range;
       sort(sortSpecObj: Object): Range;
+      splitTextToColumns(): void;
+      splitTextToColumns(delimiter: string): void;
+      splitTextToColumns(delimiter: TextToColumnsDelimiter): void;
     }
 
     /**
-     * Access and modify spreadsheet sheets. Common operations
-     *  are renaming a sheet and accessing range objects from the sheet.
+     * A collection of one or more Range instances in the same sheet. You can use this class
+     * to apply operations on collections of non-adjacent ranges or cells.
+     */
+    export interface RangeList {
+      activate(): RangeList;
+      breakApart(): RangeList;
+      clear(): RangeList;
+      clear(options: Object): RangeList;
+      clearContent(): RangeList;
+      clearDataValidations(): RangeList;
+      clearFormat(): RangeList;
+      clearNote(): RangeList;
+      getRanges(): Range[];
+      setBackground(color: string): RangeList;
+      setBackgroundRGB(red: Integer, green: Integer, blue: Integer): RangeList;
+      setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean): RangeList;
+      setBorder(top: boolean, left: boolean, bottom: boolean, right: boolean, vertical: boolean, horizontal: boolean, color: string, style: BorderStyle): RangeList;
+      setFontColor(color: string): RangeList;
+      setFontFamily(fontFamily: string): RangeList;
+      setFontLine(fontLine: string): RangeList;
+      setFontSize(size: Integer): RangeList;
+      setFontStyle(fontStyle: string): RangeList;
+      setFontWeight(fontWeight: string): RangeList;
+      setFormula(formula: string): RangeList;
+      setFormulaR1C1(formula: string): RangeList;
+      setHorizontalAlignment(alignment: string): RangeList;
+      setNote(note: string): RangeList;
+      setNumberFormat(numberFormat: string): RangeList;
+      setShowHyperlink(showHyperlink: boolean): RangeList;
+      setTextDirection(direction: TextDirection): RangeList;
+      setTextRotation(degrees: Integer): RangeList;
+      setValue(value: Object): RangeList;
+      setVerticalAlignment(alignment: string): RangeList;
+      setVerticalText(isVertical: boolean): RangeList;
+      setWrap(isWrapEnabled: boolean): RangeList;
+      setWrapStrategy(strategy: WrapStrategy): RangeList;
+    }
+
+    /**
+     * An enumeration representing the relative date options for calculating a value to be used in
+     * date-based BooleanCriteria.
+     */
+    export enum RelativeDate { TODAY, TOMORROW, YESTERDAY, PAST_WEEK, PAST_MONTH, PAST_YEAR }
+
+    /**
+     * Access the current active selection in the active sheet. A selection is the set of cells the user
+     * has highlighted in the sheet, which can be non-adjacent ranges. One cell in the selection is the
+     * current cell, where the user's current focus is. The current cell is highlighted with a
+     * darker border in the Google Sheets UI.
+     *
+     *     var activeSheet = SpreadsheetApp.getActiveSheet();
+     *     var rangeList = activeSheet.getRangeList(['A1:B4', 'D1:E4']);
+     *     rangeList.activate();
+     *
+     *     var selection = activeSheet.getSelection();
+     *     // Current Cell: D1
+     *     Logger.log('Current Cell: ' + selection.getCurrentCell().getA1Notation());
+     *     // Active Range: D1:E4
+     *     Logger.log('Active Range: ' + selection.getActiveRange().getA1Notation());
+     *     // Active Ranges: A1:B4, D1:E4
+     *     var ranges =  selection.getActiveRangeList().getRanges();
+     *     for (var i = 0; i < ranges.length; i++) {
+     *       Logger.log('Active Ranges: ' + ranges[i].getA1Notation());
+     *     }
+     *     Logger.log('Active Sheet: ' + selection.getActiveSheet().getName());
+     */
+    export interface Selection {
+      getActiveRange(): Range;
+      getActiveRangeList(): RangeList;
+      getActiveSheet(): Sheet;
+      getCurrentCell(): Range;
+      getNextDataRange(direction: Direction): Range;
+    }
+
+    /**
+     * Access and modify spreadsheet sheets. Common operations are renaming a sheet and accessing range
+     * objects from the sheet.
      */
     export interface Sheet {
       activate(): Sheet;
       appendRow(rowContents: Object[]): Sheet;
       autoResizeColumn(columnPosition: Integer): Sheet;
+      autoResizeColumns(startColumn: Integer, numColumns: Integer): Sheet;
+      autoResizeRows(startRow: Integer, numRows: Integer): Sheet;
       clear(): Sheet;
       clear(options: Object): Sheet;
       clearConditionalFormatRules(): void;
       clearContents(): Sheet;
       clearFormats(): Sheet;
       clearNotes(): Sheet;
+      collapseAllColumnGroups(): Sheet;
+      collapseAllRowGroups(): Sheet;
       copyTo(spreadsheet: Spreadsheet): Sheet;
       deleteColumn(columnPosition: Integer): Sheet;
       deleteColumns(columnPosition: Integer, howMany: Integer): void;
       deleteRow(rowPosition: Integer): Sheet;
       deleteRows(rowPosition: Integer, howMany: Integer): void;
+      expandAllColumnGroups(): Sheet;
+      expandAllRowGroups(): Sheet;
+      expandColumnGroupsUpToDepth(groupDepth: Integer): Sheet;
+      expandRowGroupsUpToDepth(groupDepth: Integer): Sheet;
       getActiveCell(): Range;
       getActiveRange(): Range;
+      getActiveRangeList(): RangeList;
+      getBandings(): Banding[];
       getCharts(): EmbeddedChart[];
+      getColumnGroup(columnIndex: Integer, groupDepth: Integer): Group;
+      getColumnGroupControlPosition(): GroupControlTogglePosition;
+      getColumnGroupDepth(columnIndex: Integer): Integer;
       getColumnWidth(columnPosition: Integer): Integer;
       getConditionalFormatRules(): ConditionalFormatRule[];
+      getCurrentCell(): Range;
       getDataRange(): Range;
+      getFilter(): Filter;
+      getFormUrl(): string;
       getFrozenColumns(): Integer;
       getFrozenRows(): Integer;
       getIndex(): Integer;
@@ -940,16 +1373,23 @@ declare namespace GoogleAppsScript {
       getName(): string;
       getNamedRanges(): NamedRange[];
       getParent(): Spreadsheet;
+      getPivotTables(): PivotTable[];
       getProtections(type: ProtectionType): Protection[];
       getRange(row: Integer, column: Integer): Range;
       getRange(row: Integer, column: Integer, numRows: Integer): Range;
       getRange(row: Integer, column: Integer, numRows: Integer, numColumns: Integer): Range;
       getRange(a1Notation: string): Range;
+      getRangeList(a1Notations: string[]): RangeList;
+      getRowGroup(rowIndex: Integer, groupDepth: Integer): Group;
+      getRowGroupControlPosition(): GroupControlTogglePosition;
+      getRowGroupDepth(rowIndex: Integer): Integer;
       getRowHeight(rowPosition: Integer): Integer;
+      getSelection(): Selection;
       getSheetId(): Integer;
       getSheetName(): string;
       getSheetValues(startRow: Integer, startColumn: Integer, numRows: Integer, numColumns: Integer): Object[][];
       getTabColor(): string;
+      hasHiddenGridlines(): boolean;
       hideColumn(column: Range): void;
       hideColumns(columnIndex: Integer): void;
       hideColumns(columnIndex: Integer, numColumns: Integer): void;
@@ -964,8 +1404,8 @@ declare namespace GoogleAppsScript {
       insertColumns(columnIndex: Integer, numColumns: Integer): void;
       insertColumnsAfter(afterPosition: Integer, howMany: Integer): Sheet;
       insertColumnsBefore(beforePosition: Integer, howMany: Integer): Sheet;
-      insertImage(blob: Base.Blob, column: Integer, row: Integer): void;
-      insertImage(blob: Base.Blob, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
+      insertImage(blobSource: Base.BlobSource, column: Integer, row: Integer): void;
+      insertImage(blobSource: Base.BlobSource, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
       insertImage(url: string, column: Integer, row: Integer): void;
       insertImage(url: string, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
       insertRowAfter(afterPosition: Integer): Sheet;
@@ -974,20 +1414,30 @@ declare namespace GoogleAppsScript {
       insertRows(rowIndex: Integer, numRows: Integer): void;
       insertRowsAfter(afterPosition: Integer, howMany: Integer): Sheet;
       insertRowsBefore(beforePosition: Integer, howMany: Integer): Sheet;
+      isRightToLeft(): boolean;
       isSheetHidden(): boolean;
+      moveColumns(columnSpec: Range, destinationIndex: Integer): void;
+      moveRows(rowSpec: Range, destinationIndex: Integer): void;
       newChart(): EmbeddedChartBuilder;
       protect(): Protection;
       removeChart(chart: EmbeddedChart): void;
       setActiveRange(range: Range): Range;
+      setActiveRangeList(rangeList: RangeList): RangeList;
       setActiveSelection(range: Range): Range;
       setActiveSelection(a1Notation: string): Range;
+      setColumnGroupControlPosition(position: GroupControlTogglePosition): Sheet;
       setColumnWidth(columnPosition: Integer, width: Integer): Sheet;
-      setConditionalFormatRules(rules: ReadonlyArray<ConditionalFormatRule>): void;
-      setCurrentCell(cell: Range): void;
+      setColumnWidths(startColumn: Integer, numColumns: Integer, width: Integer): Sheet;
+      setConditionalFormatRules(rules: ConditionalFormatRule[]): void;
+      setCurrentCell(cell: Range): Range;
       setFrozenColumns(columns: Integer): void;
       setFrozenRows(rows: Integer): void;
+      setHiddenGridlines(hideGridlines: boolean): Sheet;
       setName(name: string): Sheet;
+      setRightToLeft(rightToLeft: boolean): Sheet;
+      setRowGroupControlPosition(position: GroupControlTogglePosition): Sheet;
       setRowHeight(rowPosition: Integer, height: Integer): Sheet;
+      setRowHeights(startRow: Integer, numRows: Integer, height: Integer): Sheet;
       setTabColor(color: string): Sheet;
       showColumns(columnIndex: Integer): void;
       showColumns(columnIndex: Integer, numColumns: Integer): void;
@@ -1004,8 +1454,8 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * This class allows users to access and modify Google Sheets files. Common operations are adding
-     *  new sheets and adding collaborators.
+     * Access and modify Google Sheets files. Common operations are adding new sheets and adding
+     * collaborators.
      */
     export interface Spreadsheet {
       addEditor(emailAddress: string): Spreadsheet;
@@ -1027,10 +1477,13 @@ declare namespace GoogleAppsScript {
       duplicateActiveSheet(): Sheet;
       getActiveCell(): Range;
       getActiveRange(): Range;
+      getActiveRangeList(): RangeList;
       getActiveSheet(): Sheet;
       getAs(contentType: string): Base.Blob;
+      getBandings(): Banding[];
       getBlob(): Base.Blob;
       getColumnWidth(columnPosition: Integer): Integer;
+      getCurrentCell(): Range;
       getDataRange(): Range;
       getEditors(): Base.User[];
       getFormUrl(): string;
@@ -1046,7 +1499,9 @@ declare namespace GoogleAppsScript {
       getProtections(type: ProtectionType): Protection[];
       getRange(a1Notation: string): Range;
       getRangeByName(name: string): Range;
+      getRangeList(a1Notations: string[]): RangeList;
       getRowHeight(rowPosition: Integer): Integer;
+      getSelection(): Selection;
       getSheetByName(name: string): Sheet;
       getSheetId(): Integer;
       getSheetName(): string;
@@ -1062,8 +1517,8 @@ declare namespace GoogleAppsScript {
       insertColumnBefore(beforePosition: Integer): Sheet;
       insertColumnsAfter(afterPosition: Integer, howMany: Integer): Sheet;
       insertColumnsBefore(beforePosition: Integer, howMany: Integer): Sheet;
-      insertImage(blob: Base.Blob, column: Integer, row: Integer): void;
-      insertImage(blob: Base.Blob, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
+      insertImage(blobSource: Base.BlobSource, column: Integer, row: Integer): void;
+      insertImage(blobSource: Base.BlobSource, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
       insertImage(url: string, column: Integer, row: Integer): void;
       insertImage(url: string, column: Integer, row: Integer, offsetX: Integer, offsetY: Integer): void;
       insertRowAfter(afterPosition: Integer): Sheet;
@@ -1088,10 +1543,13 @@ declare namespace GoogleAppsScript {
       rename(newName: string): void;
       renameActiveSheet(newName: string): void;
       setActiveRange(range: Range): Range;
+      setActiveRangeList(rangeList: RangeList): RangeList;
       setActiveSelection(range: Range): Range;
       setActiveSelection(a1Notation: string): Range;
       setActiveSheet(sheet: Sheet): Sheet;
+      setActiveSheet(sheet: Sheet, restoreSelection: boolean): Sheet;
       setColumnWidth(columnPosition: Integer, width: Integer): Sheet;
+      setCurrentCell(cell: Range): Range;
       setFrozenColumns(columns: Integer): void;
       setFrozenRows(rows: Integer): void;
       setNamedRange(name: string, range: Range): void;
@@ -1115,478 +1573,76 @@ declare namespace GoogleAppsScript {
     }
 
     /**
-     * This class allows users to open Google Sheets files and to create new ones. This class is
-     *  the parent class for the Spreadsheet service.
+     * Access and create Google Sheets files. This class is the parent class for the Spreadsheet service.
      */
     export interface SpreadsheetApp {
-      /**
-       * An enumeration of the valid styles for setting borders on a Range.
-       */
-      BorderStyle: typeof BorderStyle;
-      /**
-       * An enumeration representing the data-validation criteria that can be set on a range.
-       */
-      DataValidationCriteria: typeof DataValidationCriteria;
-      /**
-       * An enumeration representing the interpolation options for calculating a value to be used in a GradientCondition in a ConditionalFormatRule.
-       */
-      InterpolationType: typeof InterpolationType;
-      /**
-       * An enumeration representing the boolean criteria that can be used in conditional format or filter.
-       */
+      AutoFillSeries: typeof AutoFillSeries;
+      BandingTheme: typeof BandingTheme;
       BooleanCriteria: typeof BooleanCriteria;
-      /**
-       * An enumeration representing the parts of a spreadsheet that can be protected from edits.
-       */
+      BorderStyle: typeof BorderStyle;
+      CopyPasteType: typeof CopyPasteType;
+      DataValidationCriteria: typeof DataValidationCriteria;
+      Dimension: typeof Dimension;
+      Direction: typeof Direction;
+      GroupControlTogglePosition: typeof GroupControlTogglePosition;
+      InterpolationType: typeof InterpolationType;
+      PivotTableSummarizeFunction: typeof PivotTableSummarizeFunction;
+      PivotValueDisplayType: typeof PivotValueDisplayType;
       ProtectionType: typeof ProtectionType;
-      /**
-       * Creates a new spreadsheet with the given name.
-       */
+      RelativeDate: typeof RelativeDate;
+      TextDirection: typeof TextDirection;
+      TextToColumnsDelimiter: typeof TextToColumnsDelimiter;
+      WrapStrategy: typeof WrapStrategy;
       create(name: string): Spreadsheet;
-      /**
-       * Creates a new spreadsheet with the given name and the specified number of rows and columns.
-       */
       create(name: string, rows: Integer, columns: Integer): Spreadsheet;
-      /**
-       * Applies all pending Spreadsheet changes.
-       */
       flush(): void;
-      /**
-       * Returns the currently active spreadsheet, or null if there is none.
-       */
-      getActive(): Spreadsheet | null;
-      /**
-       * Returns the range of cells that is currently considered active.
-       */
+      getActive(): Spreadsheet;
       getActiveRange(): Range;
-      /**
-       * Gets the active sheet in a spreadsheet.
-       */
+      getActiveRangeList(): RangeList;
       getActiveSheet(): Sheet;
-      /**
-       * Returns the currently active spreadsheet, or null if there is none.
-       */
-      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.
-       */
+      getActiveSpreadsheet(): Spreadsheet;
+      getCurrentCell(): Range;
+      getSelection(): Selection;
       getUi(): Base.Ui;
-      /**
-       * Creates a builder for a data-validation rule.
-       */
-      newDataValidation(): DataValidationBuilder;
-      /**
-       * Opens the spreadsheet that corresponds to the given File object.
-       */
-      open(file: Drive.File): Spreadsheet;
-      /**
-       * Opens the spreadsheet with the given ID.
-       */
-      openById(id: string): Spreadsheet;
-      /**
-       * Opens the spreadsheet with the given url.
-       */
-      openByUrl(url: string): Spreadsheet;
-      /**
-       * Sets the active range for the application.
-       */
-      setActiveRange(range: Range): Range;
-      /**
-       * Sets the active sheet in a spreadsheet.
-       */
-      setActiveSheet(sheet: Sheet): Sheet;
-      /**
-       * Sets the active spreadsheet.
-       */
-      setActiveSpreadsheet(newActiveSpreadsheet: Spreadsheet): void;
-      /**
-       * Creates a builder for a conditional formatting rule.
-       */
       newConditionalFormatRule(): ConditionalFormatRuleBuilder;
+      newDataValidation(): DataValidationBuilder;
+      newFilterCriteria(): FilterCriteriaBuilder;
+      open(file: Drive.File): Spreadsheet;
+      openById(id: string): Spreadsheet;
+      openByUrl(url: string): Spreadsheet;
+      setActiveRange(range: Range): Range;
+      setActiveRangeList(rangeList: RangeList): RangeList;
+      setActiveSheet(sheet: Sheet): Sheet;
+      setActiveSheet(sheet: Sheet, restoreSelection: boolean): Sheet;
+      setActiveSpreadsheet(newActiveSpreadsheet: Spreadsheet): void;
+      setCurrentCell(cell: Range): Range;
     }
 
     /**
-     * Access conditional formatting rules. To create a new rule, use SpreadsheetApp.newConditionalFormatRule() and
-     * ConditionalFormatRuleBuilder. You can use Sheet.setConditionalFormatRules(rules) to set the rules for a given
-     * sheet.
+     * An enumerations of text directions.
      */
-    export interface ConditionalFormatRule {
-      /**
-       * Returns a rule builder preset with this rule's settings.
-       */
-      copy(): ConditionalFormatRuleBuilder;
+    export enum TextDirection { LEFT_TO_RIGHT, RIGHT_TO_LEFT }
 
-      /**
-       * Retrieves the rule's BooleanCondition information if this rule uses boolean condition criteria.
-       */
-      getBooleanCondition(): BooleanCondition;
-
-      /**
-       * Retrieves the rule's GradientCondition information, if this rule uses gradient condition criteria.
-       */
-      getGradientCondition(): GradientCondition;
-
-      /**
-       * Retrieves the ranges to which this conditional format rule is applied.
-       */
-      getRanges(): Range[];
+    /**
+     * Access the text rotation settings for a cell.
+     */
+    export interface TextRotation {
+      getDegrees(): Integer;
+      isVertical(): boolean;
     }
 
     /**
-     * Builder for conditional format rules.
+     * An enumeration of the types of preset delimiters that can split a column of text into multiple
+     * columns.
      */
-    export interface ConditionalFormatRuleBuilder {
-
-      /**
-       * Constructs a conditional format rule from the settings applied to the builder.
-       */
-      build(): ConditionalFormatRule;
-
-      /**
-       * Returns a rule builder preset with this rule's settings.
-       */
-      copy(): ConditionalFormatRuleBuilder;
-
-      /**
-       * Retrieves the rule's BooleanCondition information if this rule uses boolean condition criteria.
-       */
-      getBooleanCondition(): BooleanCondition;
-
-      /**
-       * Retrieves the rule's GradientCondition information, if this rule uses gradient condition criteria.
-       */
-      getGradientCondition(): GradientCondition;
-
-      /**
-       * Retrieves the ranges to which this conditional format rule is applied.
-       */
-      getRanges(): Range[];
-
-      /**
-       * Sets the background color for the conditional format rule's format.
-       */
-      setBackground(color: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets text bolding for the conditional format rule's format.
-       */
-      setBold(bold: boolean): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the font color for the conditional format rule's format.
-       */
-      setFontColor(color: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Clears the conditional format rule's gradient maxpoint value, and instead uses the maximum value in the rule's ranges.
-       */
-      setGradientMaxpoint(color: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule's gradient maxpoint fields.
-       */
-      setGradientMaxpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule's gradient midpoint fields.
-       */
-      setGradientMidpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Clears the conditional format rule's gradient minpoint value, and instead uses the minimum value in the rule's ranges.
-       */
-      setGradientMinpoint(color: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule's gradient minpoint fields.
-       */
-      setGradientMinpointWithValue(color: string, type: InterpolationType, value: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets text italics for the conditional format rule's format.
-       */
-      setItalic(italic: boolean): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets one or more ranges to which this conditional format rule is applied.
-       */
-      setRanges(ranges: ReadonlyArray<Range>): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets text strikethrough for the conditional format rule's format.
-       */
-      setStrikethrough(strikethrough: boolean): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets text underlining for the conditional format rule's format.
-       */
-      setUnderline(underline: boolean): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when the cell is empty.
-       */
-      whenCellEmpty(): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when the cell is not empty.
-       */
-      whenCellNotEmpty(): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a date is after the given value.
-       */
-      whenDateAfter(date: Date): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a date is after the given relative date.
-       */
-      whenDateAfter(date: Date): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a date is before the given date.
-       */
-      whenDateBefore(date: Date): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a date is before the given relative date.
-       */
-      whenDateBefore(date: Date): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a date is equal to the given date.
-       */
-      whenDateEqualTo(date: Date): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a date is equal to the given relative date.
-       */
-      whenDateEqualTo(date: Date): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when that the given formula evaluates to true.
-       */
-      whenFormulaSatisfied(formula: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number falls between, or is either of, two specified values.
-       */
-      whenNumberBetween(start: number, end: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number is equal to the given value.
-       */
-      whenNumberEqualTo(number: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number is greater than the given value.
-       */
-      whenNumberGreaterThan(number: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number is greater than or equal to the given value.
-       */
-      whenNumberGreaterThanOrEqualTo(number: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional conditional format rule to trigger when a number less than the given value.
-       */
-      whenNumberLessThan(number: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number less than or equal to the given value.
-       */
-      whenNumberLessThanOrEqualTo(number: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number does not fall between, and is neither of, two specified values.
-       */
-      whenNumberNotBetween(start: number, end: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when a number is not equal to the given value.
-       */
-      whenNumberNotEqualTo(number: number): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when that the input contains the given value.
-       */
-      whenTextContains(text: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when that the input does not contain the given value.
-       */
-      whenTextDoesNotContain(text: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when that the input ends with the given value.
-       */
-      whenTextEndsWith(text: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when that the input is equal to the given value.
-       */
-      whenTextEqualTo(text: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to trigger when that the input starts with the given value.
-       */
-      whenTextStartsWith(text: string): ConditionalFormatRuleBuilder;
-
-      /**
-       * Sets the conditional format rule to criteria defined by BooleanCriteria values, typically taken from the criteria and arguments of an existing rule.
-       */
-      withCriteria(criteria: BooleanCriteria, args: ReadonlyArray<number|string|Date>): ConditionalFormatRuleBuilder;
-    }
+    export enum TextToColumnsDelimiter { COMMA, SEMICOLON, PERIOD, SPACE }
 
     /**
-     * An enumeration representing the boolean criteria that can be used in conditional format or filter.
+     * An enumeration of the strategies used to handle cell text wrapping.
      */
-    export enum BooleanCriteria {
-      /**
-       * The criteria is met when a cell is empty.
-       */
-      CELL_EMPTY,
+    export enum WrapStrategy { WRAP, OVERFLOW, CLIP }
 
-      /**
-       * The criteria is met when a cell is not empty.
-       */
-      CELL_NOT_EMPTY,
-
-      /**
-       * The criteria is met when a date is after the given value.
-       */
-      DATE_AFTER,
-
-      /**
-       * The criteria is met when a date is before the given value.
-       */
-      DATE_BEFORE,
-
-      /**
-       * The criteria is met when a date is equal to the given value.
-       */
-      DATE_EQUAL_TO,
-
-      /**
-       * The criteria is met when a date is after the relative date value.
-       */
-      DATE_AFTER_RELATIVE,
-
-      /**
-       * The criteria is met when a date is before the relative date value.
-       */
-      DATE_BEFORE_RELATIVE,
-
-      /**
-       * The criteria is met when a date is equal to the relative date value.
-       */
-      DATE_EQUAL_TO_RELATIVE,
-
-      /**
-       * The criteria is met when a number that is between the given values.
-       */
-      NUMBER_BETWEEN,
-
-      /**
-       * The criteria is met when a number that is equal to the given value.
-       */
-      NUMBER_EQUAL_TO,
-
-      /**
-       * The criteria is met when a number that is greater than the given value.
-       */
-      NUMBER_GREATER_THAN,
-
-      /**
-       * The criteria is met when a number that is greater than or equal to the given value.
-       */
-      NUMBER_GREATER_THAN_OR_EQUAL_TO,
-
-      /**
-       * The criteria is met when a number that is less than the given value.
-       */
-      NUMBER_LESS_THAN,
-
-      /**
-       * The criteria is met when a number that is less than or equal to the given value.
-       */
-      NUMBER_LESS_THAN_OR_EQUAL_TO,
-
-      /**
-       * The criteria is met when a number that is not between the given values.
-       */
-      NUMBER_NOT_BETWEEN,
-
-      /**
-       * The criteria is met when a number that is not equal to the given value.
-       */
-      NUMBER_NOT_EQUAL_TO,
-
-      /**
-       * The criteria is met when the input contains the given value.
-       */
-      TEXT_CONTAINS,
-
-      /**
-       * The criteria is met when the input does not contain the given value.
-       */
-      TEXT_DOES_NOT_CONTAIN,
-
-      /**
-       * The criteria is met when the input is equal to the given value.
-       */
-      TEXT_EQUAL_TO,
-
-      /**
-       * The criteria is met when the input begins with the given value.
-       */
-      TEXT_STARTS_WITH,
-
-      /**
-       * The criteria is met when the input ends with the given value.
-       */
-      TEXT_ENDS_WITH,
-
-      /**
-       * The criteria is met when the input makes the given formula evaluate to true.
-       */
-      CUSTOM_FORMULA
-    }
-
-    /**
-     * An enumeration representing the interpolation options for calculating a value to be used in a GradientCondition in a ConditionalFormatRule.
-     */
-    export enum InterpolationType {
-      /**
-       * Use the number as as specific interpolation point for a gradient condition.
-       */
-      NUMBER,
-
-      /**
-       * Use the number as a percentage interpolation point for a gradient condition.
-       */
-      PERCENT,
-
-      /**
-       * Use the number as a percentile interpolation point for a gradient condition.
-       */
-      PERCENTILE,
-
-      /**
-       * Infer the minimum number as a specific interpolation point for a gradient condition.
-       */
-      MIN,
-
-      /**
-       * Infer the maximum number as a specific interpolation point for a gradient condition.
-       */
-      MAX
-    }
   }
 }
 
-/**
- * This class allows users to open Google Sheets files and to create new ones. This class is
- *  the parent class for the Spreadsheet service.
- */
 declare var SpreadsheetApp: GoogleAppsScript.Spreadsheet.SpreadsheetApp;
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 f44218a866..b2bb57bc2e 100644
--- a/types/google-apps-script/google-apps-script.ui.d.ts
+++ b/types/google-apps-script/google-apps-script.ui.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,26 +10,23 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * An absolute panel positions all of its children absolutely, allowing them to overlap.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var button = app.createButton("a button");
-     *        var panel = app.createAbsolutePanel();
-     *        // add a widget at position (10, 20)
-     *        panel.add(button, 10, 20);
-     *        app.add(panel);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var button = app.createButton("a button");
+     *       var panel = app.createAbsolutePanel();
+     *       // add a widget at position (10, 20)
+     *       panel.add(button, 10, 20);
+     *       app.add(panel);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the AbsolutePanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the AbsolutePanel documentation here.
      */
     export interface AbsolutePanel {
       add(widget: Widget): AbsolutePanel;
@@ -61,27 +58,24 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A widget that represents a simple <a> element. That is, a hyperlink to a different page.
      *
-     *  By design, these hyperlinks always open in a new page. Links that reload the current page are
-     *  not allowed.
+     * By design, these hyperlinks always open in a new page. Links that reload the current page are
+     * not allowed.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // Creates a link to your favorite search engine.
-     *        var anchor = app.createAnchor("a link", "http://www.google.com");
-     *        app.add(anchor);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // Creates a link to your favorite search engine.
+     *       var anchor = app.createAnchor("a link", "http://www.google.com");
+     *       app.add(anchor);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Anchor documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Anchor documentation here.
      */
     export interface Anchor {
       addBlurHandler(handler: Handler): Anchor;
@@ -131,31 +125,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A standard push-button widget.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // create a button and give it a click handler
-     *        var button = app.createButton("click me!").setId("button");
-     *        button.addClickHandler(app.createServerHandler("handlerFunction"));
-     *        app.add(button);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // create a button and give it a click handler
+     *       var button = app.createButton("click me!").setId("button");
+     *       button.addClickHandler(app.createServerHandler("handlerFunction"));
+     *       app.add(button);
+     *       return app;
+     *     }
      *
-     *      function handlerFunction(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        app.getElementById("button").setText("I was clicked!");
-     *        return app;
-     *      }
+     *     function handlerFunction(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       app.getElementById("button").setText("I was clicked!");
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Button documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Button documentation here.
      */
     export interface Button {
       addBlurHandler(handler: Handler): Button;
@@ -199,31 +190,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A panel that wraps its contents in a border with a caption that appears in the upper left corner
+     * of the border. This is an implementation of the fieldset HTML element.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A panel that wraps its contents in a border with a caption that appears in the upper left
-     *  corner of the border. This is an implementation of the fieldset HTML element.
+     * Note that this panel can contain at most one direct child widget. To add more children, make
+     * the child of this panel a different panel that can contain more than one child.
      *
-     *  Note that this panel can contain at most one direct child widget. To add more children, make the
-     *  child of this panel a different panel that can contain more than one child.
+     * Note also that the placement of the caption in a caption panel will vary slightly from browser
+     * to browser, so this widget is not a good choice when precise cross-browser layout is needed.
      *
-     *  Note also that the placement of the caption in a caption panel will vary slightly from browser to
-     *  browser, so this widget is not a good choice when precise cross-browser layout is needed.
+     * Here is an example of how to use this widget:
      *
-     *  Here is an example of how to use this widget:
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var panel = app.createCaptionPanel("my caption!");
+     *       panel.add(app.createButton("a button inside..."));
+     *       app.add(panel);
+     *       return app;
+     *     }
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var panel = app.createCaptionPanel("my caption!");
-     *        panel.add(app.createButton("a button inside..."));
-     *        app.add(panel);
-     *        return app;
-     *      }
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the CaptionPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the CaptionPanel documentation here.
      */
     export interface CaptionPanel {
       add(widget: Widget): CaptionPanel;
@@ -255,30 +243,27 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A standard check box widget.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var handler = app.createServerHandler("change");
-     *        var check = app.createCheckBox("click me").addValueChangeHandler(handler);
-     *        app.add(check);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var handler = app.createServerHandler("change");
+     *       var check = app.createCheckBox("click me").addValueChangeHandler(handler);
+     *       app.add(check);
+     *       return app;
+     *     }
      *
-     *      function change() {
-     *        var app = UiApp.getActiveApplication();
-     *        app.add(app.createLabel("The value changed!"));
-     *        return app;
-     *      }
+     *     function change() {
+     *       var app = UiApp.getActiveApplication();
+     *       app.add(app.createLabel("The value changed!"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the CheckBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the CheckBox documentation here.
      */
     export interface CheckBox {
       addBlurHandler(handler: Handler): CheckBox;
@@ -327,45 +312,43 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * An event handler that runs in the user's browser without needing a call back to the server. These
+     * will, in general, run much faster than ServerHandlers but they are also more limited in
+     * what they can do.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * An event handler that runs in the user's browser without needing a call back to the server.
-     *  These will, in general, run much faster than ServerHandlers but they are also more
-     *  limited in what they can do.
+     * Any method that accepts a "Handler" parameter can accept a ClientHandler.
      *
-     *  Any method that accepts a "Handler" parameter can accept a ClientHandler.
+     * If you set validators on a ClientHandler, they will be checked before the handler performs its
+     * actions. The actions will only be performed if the validators succeed.
      *
-     *  If you set validators on a ClientHandler, they will be checked before the handler performs its
-     *  actions. The actions will only be performed if the validators succeed.
+     * If you have multiple ClientHandlers for the same event on the same widget, they will perform
+     * their actions in the order that they were added.
      *
-     *  If you have multiple ClientHandlers for the same event on the same widget, they will perform
-     *  their actions in the order that they were added.
+     * An example of using client handlers:
      *
-     *  An example of using client handlers:
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var button = app.createButton("Say Hello");
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var button = app.createButton("Say Hello");
+     *       // Create a label with the "Hello World!" text and hide it for now
+     *       var label = app.createLabel("Hello World!").setVisible(false);
      *
-     *        // Create a label with the "Hello World!" text and hide it for now
-     *        var label = app.createLabel("Hello World!").setVisible(false);
+     *       // Create a new handler that does not require the server.
+     *       // We give the handler two actions to perform on different targets.
+     *       // The first action disables the widget that invokes the handler
+     *       // and the second displays the label.
+     *       var handler = app.createClientHandler()
+     *         .forEventSource().setEnabled(false)
+     *         .forTargets(label).setVisible(true);
      *
-     *        // Create a new handler that does not require the server.
-     *        // We give the handler two actions to perform on different targets.
-     *        // The first action disables the widget that invokes the handler
-     *        // and the second displays the label.
-     *        var handler = app.createClientHandler()
-     *          .forEventSource().setEnabled(false)
-     *          .forTargets(label).setVisible(true);
+     *       // Add our new handler to be invoked when the button is clicked
+     *       button.addClickHandler(handler);
      *
-     *        // Add our new handler to be invoked when the button is clicked
-     *        button.addClickHandler(handler);
-     *
-     *        app.add(button);
-     *        app.add(label);
-     *        return app;
-     *      }
+     *       app.add(button);
+     *       app.add(label);
+     *       return app;
+     *     }
      */
     export interface ClientHandler {
       forEventSource(): ClientHandler;
@@ -407,9 +390,7 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A generic component object.
      * Implementing classes
      *
@@ -421,8 +402,8 @@ declare namespace GoogleAppsScript {
      *
      * ButtonA standard push-button widget.
      *
-     * CaptionPanelA panel that wraps its contents in a border with a caption that appears in the upper left
-     *  corner of the border.
+     * CaptionPanelA panel that wraps its contents in a border with a caption that appears in the upper left corner
+     * of the border.
      *
      * ChartA Chart object, which can be embedded into documents, UI elements, or used as a static image.
      *
@@ -432,29 +413,28 @@ declare namespace GoogleAppsScript {
      *
      * ControlA user interface control object, that drives the data displayed by a DashboardPanel.
      *
-     * DashboardPanelA dashboard is a visual structure that enables the organization and management
-     *  of multiple charts that share the same underlying data.
+     * DashboardPanelA dashboard is a visual structure that enables the organization and management of multiple charts
+     * that share the same underlying data.
      *
      * DateBoxA text box that shows a DatePicker when the user focuses on it.
      *
      * DatePickerA date picker widget.
      *
      * DecoratedStackPanelA StackPanel that wraps each item in a 2x3 grid (six box), which allows users to add
-     *  rounded corners.
+     * rounded corners.
      *
      * DecoratedTabBarA TabBar that wraps each tab in a 2x3 grid (six box), which allows users to add rounded corners.
      *
      * DecoratedTabPanelA TabPanel that uses a DecoratedTabBar with rounded corners.
      *
      * DecoratorPanelA SimplePanel that wraps its contents in stylized boxes, which can be used to add rounded
-     *  corners to a Widget.
+     * corners to a Widget.
      *
-     * DialogBoxA form of popup that has a caption area at the top and can be dragged by the
-     *  user.
+     * DialogBoxA form of popup that has a caption area at the top and can be dragged by the user.
      *
      * DocsListDialogA "file-open" dialog for Google Drive.
      *
-     * EmbeddedChartRepresents a chart that has been embedded into a Spreadsheet.
+     * EmbeddedChartRepresents a chart that has been embedded into a spreadsheet.
      *
      * FileUploadA widget that wraps the HTML <input type='file'> element.
      *
@@ -463,7 +443,7 @@ declare namespace GoogleAppsScript {
      * FlowPanelA panel that formats its child widgets using the default HTML layout behavior.
      *
      * FocusPanelA simple panel that makes its contents focusable, and adds the ability to catch mouse and
-     *  keyboard events.
+     * keyboard events.
      *
      * FormPanelA panel that wraps its contents in an HTML <FORM> element.
      *
@@ -474,7 +454,7 @@ declare namespace GoogleAppsScript {
      * HandlerBase interface for client and server handlers.
      *
      * HiddenRepresents a hidden field for storing data in the user's browser that can be passed back to a
-     *  handler as a "callback element".
+     * handler as a "callback element".
      *
      * HorizontalPanelA panel that lays all of its widgets out in a single horizontal column.
      *
@@ -484,8 +464,8 @@ declare namespace GoogleAppsScript {
      *
      * LabelA widget that contains arbitrary text, not interpreted as HTML.
      *
-     * ListBoxA widget that presents a list of choices to the user, either as a list box or
-     *  as a drop-down list.
+     * ListBoxA widget that presents a list of choices to the user, either as a list box or as a drop-down
+     * list.
      *
      * MenuBarA standard menu bar widget.
      *
@@ -502,7 +482,7 @@ declare namespace GoogleAppsScript {
      * RadioButtonA mutually-exclusive selection radio button widget.
      *
      * ResetButtonA standard push-button widget which will automatically reset its enclosing FormPanel if
-     *  any.
+     * any.
      *
      * ScrollPanelA panel that wraps its contents in a scrollable element.
      *
@@ -516,26 +496,25 @@ declare namespace GoogleAppsScript {
      *
      * SplitLayoutPanelA panel that adds user-positioned splitters between each of its child widgets.
      *
-     * StackPanelA panel that stacks its children vertically, displaying only one at a time,
-     *  with a header for each child which the user can click to display.
+     * StackPanelA panel that stacks its children vertically, displaying only one at a time, with a header for
+     * each child which the user can click to display.
      *
      * SubmitButtonA standard push-button widget which will automatically submit its enclosing FormPanel if
-     *  any.
+     * any.
      *
-     * SuggestBoxA SuggestBox is a text box or text area which displays a
-     *  pre-configured set of selections that match the user's input.
+     * SuggestBoxA SuggestBox is a text box or text area which displays a pre-configured set of selections
+     * that match the user's input.
      *
      * TabBarA horizontal bar of folder-style tabs, most commonly used as part of a TabPanel.
      *
-     * TabPanelA panel that represents a tabbed set of pages, each of which contains another
-     *  widget.
+     * TabPanelA panel that represents a tabbed set of pages, each of which contains another widget.
      *
      * TextAreaA text box that allows multiple lines of text to be entered.
      *
      * TextBoxA standard single-line text box.
      *
-     * ToggleButtonA ToggleButton is a stylish stateful button which allows the
-     *  user to toggle between up and down states.
+     * ToggleButtonA ToggleButton is a stylish stateful button which allows the user to toggle between
+     * up and down states.
      *
      * TreeA standard hierarchical tree widget.
      *
@@ -553,31 +532,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A text box that shows a DatePicker when the user focuses on it.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var handler = app.createServerHandler("change");
-     *        var dateBox = app.createDateBox().addValueChangeHandler(handler).setId("datebox");
-     *        app.add(dateBox);
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var handler = app.createServerHandler("change");
+     *       var dateBox = app.createDateBox().addValueChangeHandler(handler).setId("datebox");
+     *       app.add(dateBox);
+     *       return app;
+     *     }
+     *
+     *     function change(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       app.add(app.createLabel("The value of the date box changed to " +
+     *           eventInfo.parameter.datebox));
      *        return app;
      *      }
      *
-     *      function change(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        app.add(app.createLabel("The value of the date box changed to " +
-     *            eventInfo.parameter.datebox));
-     *         return app;
-     *       }
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DateBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DateBox documentation here.
      */
     export interface DateBox {
       addStyleDependentName(styleName: string): DateBox;
@@ -614,31 +590,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A date picker widget.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var handler = app.createServerHandler("change");
-     *        var picker = app.createDatePicker().addValueChangeHandler(handler).setId("picker");
-     *        app.add(picker);
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var handler = app.createServerHandler("change");
+     *       var picker = app.createDatePicker().addValueChangeHandler(handler).setId("picker");
+     *       app.add(picker);
+     *       return app;
+     *     }
+     *
+     *     function change(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       app.add(app.createLabel("The value of the date picker changed to " +
+     *           eventInfo.parameter.picker));
      *        return app;
      *      }
      *
-     *      function change(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        app.add(app.createLabel("The value of the date picker changed to " +
-     *            eventInfo.parameter.picker));
-     *         return app;
-     *       }
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DatePicker documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DatePicker documentation here.
      */
     export interface DatePicker {
       addStyleDependentName(styleName: string): DatePicker;
@@ -668,30 +641,24 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * Date and time format constants for widgets such as DateBox.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * Date and time format constants for widgets such as
-     *  DateBox.
-     *
-     *  These correspond to the predefined constants from the Google Web Toolkit. You can read
-     *  more about these constants
-     *  here.
+     * These correspond to the predefined constants from the Google Web Toolkit. You can read more
+     * about these constants
+     * here.
      */
     export enum DateTimeFormat { ISO_8601, RFC_2822, DATE_FULL, DATE_LONG, DATE_MEDIUM, DATE_SHORT, TIME_FULL, TIME_LONG, TIME_MEDIUM, TIME_SHORT, DATE_TIME_FULL, DATE_TIME_LONG, DATE_TIME_MEDIUM, DATE_TIME_SHORT, DAY, HOUR_MINUTE, HOUR_MINUTE_SECOND, HOUR24_MINUTE, HOUR24_MINUTE_SECOND, MINUTE_SECOND, MONTH, MONTH_ABBR, MONTH_ABBR_DAY, MONTH_DAY, MONTH_NUM_DAY, MONTH_WEEKDAY_DAY, YEAR, YEAR_MONTH, YEAR_MONTH_ABBR, YEAR_MONTH_ABBR_DAY, YEAR_MONTH_DAY, YEAR_MONTH_NUM, YEAR_MONTH_NUM_DAY, YEAR_MONTH_WEEKDAY_DAY, YEAR_QUARTER, YEAR_QUARTER_ABBR }
 
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A StackPanel that wraps each item in a 2x3 grid (six box), which allows users to add
-     *  rounded corners.
+     * rounded corners.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DecoratedStackPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DecoratedStackPanel documentation here.
      */
     export interface DecoratedStackPanel {
       add(widget: Widget): DecoratedStackPanel;
@@ -725,14 +692,11 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A TabBar that wraps each tab in a 2x3 grid (six box), which allows users to add rounded corners.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DecoratedTabBar documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DecoratedTabBar documentation here.
      */
     export interface DecoratedTabBar {
       addBeforeSelectionHandler(handler: Handler): DecoratedTabBar;
@@ -766,14 +730,11 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A TabPanel that uses a DecoratedTabBar with rounded corners.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DecoratedTabPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DecoratedTabPanel documentation here.
      */
     export interface DecoratedTabPanel {
       add(widget: Widget): DecoratedTabPanel;
@@ -807,18 +768,15 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A SimplePanel that wraps its contents in stylized boxes, which can be used to add rounded
-     *  corners to a Widget.
+     * corners to a Widget.
      *
-     *  Note that this panel can contain at most one direct child widget. To add more children, make the
-     *  child of this panel a different panel that can contain more than one child.
+     * Note that this panel can contain at most one direct child widget. To add more children, make
+     * the child of this panel a different panel that can contain more than one child.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DecoratorPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DecoratorPanel documentation here.
      */
     export interface DecoratorPanel {
       add(widget: Widget): DecoratorPanel;
@@ -847,35 +805,31 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A form of popup that has a caption area at the top and can be dragged by the user. Unlike a
+     * PopupPanel, calls to setWidth(width) and setHeight(height) will set
+     * the width and height of the dialog box itself, even if a widget has not been added as yet.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A form of popup that has a caption area at the top and can be dragged by the
-     *  user. Unlike a PopupPanel, calls to setWidth(width) and
-     *  setHeight(height) will set the width and height of the dialog box
-     *  itself, even if a widget has not been added as yet.
+     * In general it's not recommended to add this panel as a child of another widget or of the app
+     * as that will make it behave like any other inline panel and not act as a popup. Instead, create
+     * the popup and then use its show() and hide() methods to show and hide it. See
+     * the example below.
      *
-     *  In general it's not recommended to add this panel as a child of another widget or of the app
-     *  as that will make it behave like any other inline panel and not act as a popup. Instead, create
-     *  the popup and then use its show() and hide() methods to show and hide it. See
-     *  the example below.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the DialogBox documentation here.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the DialogBox documentation here.
+     * Here is an example showing how to use the dialog box widget:
      *
-     *  Here is an example showing how to use the dialog box widget:
-     *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // Create a dialog box.
-     *        var dialog = app.createDialogBox();
-     *        // Set the position and dimensions.
-     *        dialog.setPopupPosition(100, 100).setSize(500, 500);
-     *        // Show the dialog. Note that it does not have to be "added" to the UiInstance.
-     *        dialog.show();
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // Create a dialog box.
+     *       var dialog = app.createDialogBox();
+     *       // Set the position and dimensions.
+     *       dialog.setPopupPosition(100, 100).setSize(500, 500);
+     *       // Show the dialog. Note that it does not have to be "added" to the UiInstance.
+     *       dialog.show();
+     *       return app;
+     *     }
      */
     export interface DialogBox {
       add(widget: Widget): DialogBox;
@@ -918,64 +872,61 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A "file-open" dialog for Google Drive. Unlike most UiApp objects, DocsListDialog
-     *  should not be added to the UiInstance. The
-     *  example below shows how to display a DocsListDialog in the
-     *  new version of Google Sheets.
+     * should not be added to the UiInstance. The
+     * example below shows how to display a DocsListDialog in the new version of Google Sheets.
      *
      * Note that HTML service offers a similar but superior
-     *  feature, Google Picker. In almost all
-     *  cases, using Google Picker is preferable.
+     * feature, Google Picker. In almost all
+     * cases, using Google Picker is preferable.
      *
-     *      function onOpen() {
-     *        SpreadsheetApp.getUi() // Or DocumentApp or FormApp.
-     *            .createMenu('Custom Menu')
-     *            .addItem('Select file', 'showDialog')
-     *            .addToUi();
-     *      }
+     *     function onOpen() {
+     *       SpreadsheetApp.getUi() // Or DocumentApp or FormApp.
+     *           .createMenu('Custom Menu')
+     *           .addItem('Select file', 'showDialog')
+     *           .addToUi();
+     *     }
      *
-     *      function showDialog() {
-     *        // Dummy call to DriveApp to ensure the OAuth dialog requests Google Drive scope, so that the
-     *        // getOAuthToken() call below returns a token with the necessary permissions.
-     *        DriveApp.getRootFolder();
+     *     function showDialog() {
+     *       // Dummy call to DriveApp to ensure the OAuth dialog requests Google Drive scope, so that the
+     *       // getOAuthToken() call below returns a token with the necessary permissions.
+     *       DriveApp.getRootFolder();
      *
-     *        var app = UiApp.createApplication()
-     *            .setWidth(570)
-     *            .setHeight(352);
+     *       var app = UiApp.createApplication()
+     *           .setWidth(570)
+     *           .setHeight(352);
      *
-     *        var serverHandler = app.createServerHandler('pickerHandler');
+     *       var serverHandler = app.createServerHandler('pickerHandler');
      *
-     *        app.createDocsListDialog()
-     *           .addCloseHandler(serverHandler)
-     *           .addSelectionHandler(serverHandler)
-     *           .setOAuthToken(ScriptApp.getOAuthToken())
-     *           .showDocsPicker();
+     *       app.createDocsListDialog()
+     *          .addCloseHandler(serverHandler)
+     *          .addSelectionHandler(serverHandler)
+     *          .setOAuthToken(ScriptApp.getOAuthToken())
+     *          .showDocsPicker();
      *
-     *        SpreadsheetApp.getUi() // Or DocumentApp or FormApp.
-     *           .showModalDialog(app,' ');
-     *      }
+     *       SpreadsheetApp.getUi() // Or DocumentApp or FormApp.
+     *          .showModalDialog(app,' ');
+     *     }
      *
-     *      function pickerHandler(e) {
-     *        var action = e.parameter.eventType;
-     *        var app = UiApp.getActiveApplication();
+     *     function pickerHandler(e) {
+     *       var action = e.parameter.eventType;
+     *       var app = UiApp.getActiveApplication();
      *
-     *        if (action == 'selection') {
-     *          var doc = e.parameter.items[0];
-     *          var id = doc.id;
-     *          var name = doc.name;
-     *          var url = doc.url;
-     *          app.add(app.createLabel('You picked '));
-     *          app.add(app.createAnchor(name, url));
-     *          app.add(app.createLabel('(ID: ' + id + ').'));
-     *        } else if (action == 'close') {
-     *          app.add(app.createLabel('You clicked "Cancel".'));
-     *        }
+     *       if (action == 'selection') {
+     *         var doc = e.parameter.items[0];
+     *         var id = doc.id;
+     *         var name = doc.name;
+     *         var url = doc.url;
+     *         app.add(app.createLabel('You picked '));
+     *         app.add(app.createAnchor(name, url));
+     *         app.add(app.createLabel('(ID: ' + id + ').'));
+     *       } else if (action == 'close') {
+     *         app.add(app.createLabel('You clicked "Cancel".'));
+     *       }
      *
-     *        return app;
-     *      }
+     *       return app;
+     *     }
      */
     export interface DocsListDialog {
       addCloseHandler(handler: Handler): DocsListDialog;
@@ -995,47 +946,41 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * File type constants for the
-     *  DocsListDialog.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * File type constants for the DocsListDialog.
      */
     export enum FileType { ALL, ALL_DOCS, DRAWINGS, DOCUMENTS, SPREADSHEETS, FOLDERS, RECENTLY_PICKED, PRESENTATIONS, FORMS, PHOTOS, PHOTO_ALBUMS, PDFS }
 
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A widget that wraps the HTML <input type='file'> element. This widget must be used within a
+     * FormPanel.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A widget that wraps the HTML <input type='file'> element. This widget
-     *  must be used within a FormPanel.
+     * The result of a FileUpload is a "Blob" which can we used in various other functions. Below is
+     * an example of how to use FileUpload.
      *
-     *  The result of a FileUpload is a "Blob" which can we used in various other functions. Below is an
-     *  example of how to use FileUpload.
+     *     function doGet(e) {
      *
-     *      function doGet(e) {
+     *     var app = UiApp.createApplication().setTitle("Upload CSV to Sheet");
+     *       var formContent = app.createVerticalPanel();
+     *       formContent.add(app.createFileUpload().setName('thefile'));
+     *       formContent.add(app.createSubmitButton());
+     *       var form = app.createFormPanel();
+     *       form.add(formContent);
+     *       app.add(form);
+     *       return app;
+     *     }
      *
-     *      var app = UiApp.createApplication().setTitle("Upload CSV to Sheet");
-     *        var formContent = app.createVerticalPanel();
-     *        formContent.add(app.createFileUpload().setName('thefile'));
-     *        formContent.add(app.createSubmitButton());
-     *        var form = app.createFormPanel();
-     *        form.add(formContent);
-     *        app.add(form);
-     *        return app;
-     *      }
+     *     function doPost(e) {
+     *       // data returned is a blob for FileUpload widget
+     *       var fileBlob = e.parameter.thefile;
+     *       var doc = DocsList.createFile(fileBlob);
+     *     }
      *
-     *      function doPost(e) {
-     *        // data returned is a blob for FileUpload widget
-     *        var fileBlob = e.parameter.thefile;
-     *        var doc = DocsList.createFile(fileBlob);
-     *      }
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the FileUpload documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the FileUpload documentation here.
      */
     export interface FileUpload {
       addChangeHandler(handler: Handler): FileUpload;
@@ -1064,32 +1009,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A flexible table that creates cells on demand. It can be jagged (that is, each row can contain a
+     * different number of cells) and individual cells can be set to span multiple rows or columns.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A flexible table that creates cells on demand. It can be jagged (that is,
-     *  each row can contain a different number of cells) and individual cells can be
-     *  set to span multiple rows or columns.
+     * Here is an example of how to use this widget:
      *
-     *  Here is an example of how to use this widget:
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       app.add(app.createFlexTable()
+     *         .insertRow(0).insertRow(0).insertRow(0)
+     *         .insertCell(0, 0)
+     *         .insertCell(0, 1)
+     *         .insertCell(0, 2)
+     *         .insertCell(1, 0)
+     *         .insertCell(1, 1)
+     *         .insertCell(2, 0)
+     *         .setBorderWidth(5).setCellPadding(10).setCellSpacing(10));
+     *       return app;
+     *     }
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        app.add(app.createFlexTable()
-     *          .insertRow(0).insertRow(0).insertRow(0)
-     *          .insertCell(0, 0)
-     *          .insertCell(0, 1)
-     *          .insertCell(0, 2)
-     *          .insertCell(1, 0)
-     *          .insertCell(1, 1)
-     *          .insertCell(2, 0)
-     *          .setBorderWidth(5).setCellPadding(10).setCellSpacing(10));
-     *        return app;
-     *      }
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the FlexTable documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the FlexTable documentation here.
      */
     export interface FlexTable {
       addCell(row: Integer): FlexTable;
@@ -1134,25 +1075,22 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that formats its child widgets using the default HTML layout behavior.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var panel = app.createFlowPanel();
-     *        panel.add(app.createButton("button 1"));
-     *        panel.add(app.createButton("button 2"));
-     *        app.add(panel);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var panel = app.createFlowPanel();
+     *       panel.add(app.createButton("button 1"));
+     *       panel.add(app.createButton("button 2"));
+     *       app.add(panel);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the FlowPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the FlowPanel documentation here.
      */
     export interface FlowPanel {
       add(widget: Widget): FlowPanel;
@@ -1183,31 +1121,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A simple panel that makes its contents focusable, and adds the ability to catch mouse and
-     *  keyboard events.
+     * keyboard events.
      *
-     *  Note that this panel can contain at most one direct child widget. To add more children, make the
-     *  child of this panel a different panel that can contain more than one child.
+     * Note that this panel can contain at most one direct child widget. To add more children, make
+     * the child of this panel a different panel that can contain more than one child.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var focus = app.createFocusPanel();
-     *        var flow = app.createFlowPanel();
-     *        flow.add(app.createButton("button 1"));
-     *        flow.add(app.createButton("button 2"));
-     *        focus.add(flow);
-     *        app.add(focus);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var focus = app.createFocusPanel();
+     *       var flow = app.createFlowPanel();
+     *       flow.add(app.createButton("button 1"));
+     *       flow.add(app.createButton("button 2"));
+     *       focus.add(flow);
+     *       app.add(focus);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the FocusPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the FocusPanel documentation here.
      */
     export interface FocusPanel {
       add(widget: Widget): FocusPanel;
@@ -1251,45 +1186,42 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that wraps its contents in an HTML <FORM> element.
      *
-     *  This panel can be used with a SubmitButton to post form values to the server. All
-     *  children of this panel (direct, or even children of sub-panels) that have a setName function
-     *  and have been given a name will have their values sent to the server when the form is submitted.
-     *  The submit can be handled in the special "doPost" function, as shown in the example.
+     * This panel can be used with a SubmitButton to post form values to the server. All
+     * children of this panel (direct, or even children of sub-panels) that have a setName function and
+     * have been given a name will have their values sent to the server when the form is submitted. The
+     * submit can be handled in the special "doPost" function, as shown in the example.
      *
-     *  Note that this panel can contain at most one direct child widget. To add more children, make the
-     *  child of this panel a different panel that can contain more than one child.
+     * Note that this panel can contain at most one direct child widget. To add more children, make
+     * the child of this panel a different panel that can contain more than one child.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var form = app.createFormPanel();
-     *        var flow = app.createFlowPanel();
-     *        flow.add(app.createTextBox().setName("textBox"));
-     *        flow.add(app.createListBox().setName("listBox").addItem("option 1").addItem("option 2"));
-     *        flow.add(app.createSubmitButton("Submit"));
-     *        form.add(flow);
-     *        app.add(form);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var form = app.createFormPanel();
+     *       var flow = app.createFlowPanel();
+     *       flow.add(app.createTextBox().setName("textBox"));
+     *       flow.add(app.createListBox().setName("listBox").addItem("option 1").addItem("option 2"));
+     *       flow.add(app.createSubmitButton("Submit"));
+     *       form.add(flow);
+     *       app.add(form);
+     *       return app;
+     *     }
      *
-     *      function doPost(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        app.add(app.createLabel("Form submitted. The text box's value was '" +
-     *            eventInfo.parameter.textBox +
-     *            "' and the list box's value was '" +
-     *            eventInfo.parameter.listBox + "'"));
-     *        return app;
-     *      }
+     *     function doPost(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       app.add(app.createLabel("Form submitted. The text box's value was '" +
+     *           eventInfo.parameter.textBox +
+     *           "' and the list box's value was '" +
+     *           eventInfo.parameter.listBox + "'"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the FormPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the FormPanel documentation here.
      */
     export interface FormPanel {
       add(widget: Widget): FormPanel;
@@ -1323,36 +1255,33 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A rectangular grid that can contain text, html, or a child widget within its cells. It must be
-     *  resized explicitly to the desired number of rows and columns.
+     * resized explicitly to the desired number of rows and columns.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        app.add(app.createGrid(3, 3)
-     *            .setBorderWidth(1)
-     *            .setCellSpacing(10)
-     *            .setCellPadding(10)
-     *            .setText(0, 0, "X")
-     *            .setText(1, 1, "X")
-     *            .setText(2, 2, "X")
-     *            .setText(0, 1, "O")
-     *            .setText(0, 2, "O")
-     *            .setStyleAttribute(0, 0, "color", "red")
-     *            .setStyleAttribute(1, 1, "color", "red")
-     *            .setStyleAttribute(2, 2, "color", "red")
-     *            .setStyleAttribute(0, 1, "color", "blue")
-     *            .setStyleAttribute(0, 2, "color", "blue"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       app.add(app.createGrid(3, 3)
+     *           .setBorderWidth(1)
+     *           .setCellSpacing(10)
+     *           .setCellPadding(10)
+     *           .setText(0, 0, "X")
+     *           .setText(1, 1, "X")
+     *           .setText(2, 2, "X")
+     *           .setText(0, 1, "O")
+     *           .setText(0, 2, "O")
+     *           .setStyleAttribute(0, 0, "color", "red")
+     *           .setStyleAttribute(1, 1, "color", "red")
+     *           .setStyleAttribute(2, 2, "color", "red")
+     *           .setStyleAttribute(0, 1, "color", "blue")
+     *           .setStyleAttribute(0, 2, "color", "blue"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Grid documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Grid documentation here.
      */
     export interface Grid {
       addClickHandler(handler: Handler): Grid;
@@ -1392,25 +1321,22 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A widget that contains arbitrary text, which is interpreted as HTML.
      *
-     *  Only basic HTML markup such as bold, italic, etc. are allowed; in particular, scripts will be
-     *  stripped out completely.
+     * Only basic HTML markup such as bold, italic, etc. are allowed; in particular, scripts will be
+     * stripped out completely.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        app.add(app.createHTML("<b>Hello World!</b>"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       app.add(app.createHTML("<b>Hello World!</b>"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the HTML documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the HTML documentation here.
      */
     export interface HTML {
       addClickHandler(handler: Handler): HTML;
@@ -1448,9 +1374,7 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * Base interface for client and server handlers.
      * Implementing classes
      *
@@ -1489,42 +1413,39 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * Represents a hidden field for storing data in the user's browser that can be passed back to a
-     *  handler as a "callback element".
+     * handler as a "callback element".
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // Note that the name "appState" for callbacks, and the id "hidden" for
-     *        // getting a reference to the widget, are not required to be the same.
-     *        var hidden = app.createHidden("appState", "0").setId("hidden");
-     *        app.add(hidden);
-     *        var handler = app.createServerHandler("click").addCallbackElement(hidden);
-     *        app.add(app.createButton("click me!", handler));
-     *        app.add(app.createLabel("clicked 0 times").setId("label"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // Note that the name "appState" for callbacks, and the id "hidden" for
+     *       // getting a reference to the widget, are not required to be the same.
+     *       var hidden = app.createHidden("appState", "0").setId("hidden");
+     *       app.add(hidden);
+     *       var handler = app.createServerHandler("click").addCallbackElement(hidden);
+     *       app.add(app.createButton("click me!", handler));
+     *       app.add(app.createLabel("clicked 0 times").setId("label"));
+     *       return app;
+     *     }
      *
-     *      function click(eventInfo) {
-     *        var app = UiApp.createApplication();
-     *        // We have the value of the hidden field because it was a callback element.
-     *        var numClicks = Number(eventInfo.parameter.appState);
-     *        numClicks++;
-     *        // Just store the number as a string. We could actually store arbitrarily complex data
-     *        // here using JSON.stringify() to turn a JavaScript object into a string to store, and
-     *        // JSON.parse() to turn the string back into an object.
-     *        app.getElementById("hidden").setValue(String(numClicks));
-     *        app.getElementById("label").setText("clicked " + numClicks + " times");
-     *        return app;
-     *      }
+     *     function click(eventInfo) {
+     *       var app = UiApp.createApplication();
+     *       // We have the value of the hidden field because it was a callback element.
+     *       var numClicks = Number(eventInfo.parameter.appState);
+     *       numClicks++;
+     *       // Just store the number as a string. We could actually store arbitrarily complex data
+     *       // here using JSON.stringify() to turn a JavaScript object into a string to store, and
+     *       // JSON.parse() to turn the string back into an object.
+     *       app.getElementById("hidden").setValue(String(numClicks));
+     *       app.getElementById("label").setText("clicked " + numClicks + " times");
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Hidden documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Hidden documentation here.
      */
     export interface Hidden {
       addStyleDependentName(styleName: string): Hidden;
@@ -1554,9 +1475,7 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * Horizontal alignment constants to use with setHorizontalAlignment methods in UiApp.
      */
     export enum HorizontalAlignment { LEFT, RIGHT, CENTER, DEFAULT, JUSTIFY, LOCALE_START, LOCALE_END }
@@ -1564,25 +1483,22 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that lays all of its widgets out in a single horizontal column.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var panel = app.createHorizontalPanel();
-     *        panel.add(app.createButton("button 1"));
-     *        panel.add(app.createButton("button 2"));
-     *        app.add(panel);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var panel = app.createHorizontalPanel();
+     *       panel.add(app.createButton("button 1"));
+     *       panel.add(app.createButton("button 2"));
+     *       app.add(panel);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the HorizontalPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the HorizontalPanel documentation here.
      */
     export interface HorizontalPanel {
       add(widget: Widget): HorizontalPanel;
@@ -1620,38 +1536,34 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A widget that displays the image at a given URL.
      *
-     *  The image can be in 'unclipped' mode (the default) or 'clipped' mode.
-     *  In clipped mode, a viewport is overlaid on top of the image so that a subset of the image will be
-     *  displayed. In unclipped mode, there is no viewport - the entire image will be
-     *  visible. Whether an image is in clipped or unclipped mode depends on how the
-     *  image is constructed, and how it is transformed after construction. Methods
-     *  will operate differently depending on the mode that the image is in. These
-     *  differences are detailed in the documentation for each method.
+     * The image can be in 'unclipped' mode (the default) or 'clipped' mode. In clipped mode, a
+     * viewport is overlaid on top of the image so that a subset of the image will be displayed. In
+     * unclipped mode, there is no viewport - the entire image will be visible. Whether an image is in
+     * clipped or unclipped mode depends on how the image is constructed, and how it is transformed
+     * after construction. Methods will operate differently depending on the mode that the image is in.
+     * These differences are detailed in the documentation for each method.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // The very first Google Doodle!
-     *        app.add(app.createImage("http://www.google.com/logos/googleburn.jpg"));
-     *        // Just the man in the middle
-     *        app.add(app.createImage("http://www.google.com/logos/googleburn.jpg", 118, 0, 50, 106));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // The very first Google Doodle!
+     *       app.add(app.createImage("http://www.google.com/logos/googleburn.jpg"));
+     *       // Just the man in the middle
+     *       app.add(app.createImage("http://www.google.com/logos/googleburn.jpg", 118, 0, 50, 106));
+     *       return app;
+     *     }
      *
-     *  Due to browser-specific HTML constructions needed to achieve the clipping effect, certain CSS
-     *  attributes, such as padding and background, may not work as expected when an image is in clipped
-     *  mode. These limitations can usually be easily worked around by encapsulating the image in a
-     *  container widget that can itself be styled.
+     * Due to browser-specific HTML constructions needed to achieve the clipping effect, certain CSS
+     * attributes, such as padding and background, may not work as expected when an image is in clipped
+     * mode. These limitations can usually be easily worked around by encapsulating the image in a
+     * container widget that can itself be styled.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Image documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Image documentation here.
      */
     export interface Image {
       addClickHandler(handler: Handler): Image;
@@ -1690,16 +1602,13 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A widget that contains arbitrary text, not interpreted as HTML.
      *
-     *  This widget uses a <span> element, causing it to be displayed with inline layout.
+     * This widget uses a <span> element, causing it to be displayed with inline layout.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the InlineLabel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the InlineLabel documentation here.
      */
     export interface InlineLabel {
       addClickHandler(handler: Handler): InlineLabel;
@@ -1736,22 +1645,19 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A widget that contains arbitrary text, not interpreted as HTML.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        app.add(app.createLabel("Hello World!"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       app.add(app.createLabel("Hello World!"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Label documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Label documentation here.
      */
     export interface Label {
       addClickHandler(handler: Handler): Label;
@@ -1788,55 +1694,52 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A widget that presents a list of choices to the user, either as a list box or as a drop-down
+     * list.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A widget that presents a list of choices to the user, either as a list box or
-     *  as a drop-down list.
+     * Here is an example usage, which should be executed from within a spreadsheet bound script.
      *
-     *  Here is an example usage, which should be executed from within a spreadsheet bound script.
+     *     // execute this in a spreadsheet
+     *     function show() {
+     *       var doc = SpreadsheetApp.getActiveSpreadsheet();
+     *       var app = UiApp.createApplication().setTitle('My Application');
+     *       var panel = app.createVerticalPanel();
+     *       var lb = app.createListBox(true).setId('myId').setName('myLbName');
      *
-     *      // execute this in a spreadsheet
-     *      function show() {
-     *        var doc = SpreadsheetApp.getActiveSpreadsheet();
-     *        var app = UiApp.createApplication().setTitle('My Application');
-     *        var panel = app.createVerticalPanel();
-     *        var lb = app.createListBox(true).setId('myId').setName('myLbName');
+     *       // add items to ListBox
+     *       lb.setVisibleItemCount(3);
+     *       lb.addItem('first');
+     *       lb.addItem('second');
+     *       lb.addItem('third');
+     *       lb.addItem('fourth');
+     *       lb.addItem('fifth');
+     *       lb.addItem('sixth');
      *
-     *        // add items to ListBox
-     *        lb.setVisibleItemCount(3);
-     *        lb.addItem('first');
-     *        lb.addItem('second');
-     *        lb.addItem('third');
-     *        lb.addItem('fourth');
-     *        lb.addItem('fifth');
-     *        lb.addItem('sixth');
+     *       panel.add(lb);
+     *       var button = app.createButton('press me');
+     *       var handler = app.createServerClickHandler('click').addCallbackElement(panel);
+     *       button.addClickHandler(handler);
+     *       panel.add(button);
+     *       app.add(panel);
+     *       doc.show(app);
+     *     }
      *
-     *        panel.add(lb);
-     *        var button = app.createButton('press me');
-     *        var handler = app.createServerClickHandler('click').addCallbackElement(panel);
-     *        button.addClickHandler(handler);
-     *        panel.add(button);
-     *        app.add(panel);
-     *        doc.show(app);
-     *      }
+     *     function click(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       // get values of ListBox
+     *       var value = eventInfo.parameter.myLbName;
+     *       // multi select box returns a comma separated string
+     *       var n = value.split(',');
      *
-     *      function click(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        // get values of ListBox
-     *        var value = eventInfo.parameter.myLbName;
-     *        // multi select box returns a comma separated string
-     *        var n = value.split(',');
+     *       var doc = SpreadsheetApp.getActiveSpreadsheet();
+     *       doc.getRange('a1').setValue(value);
+     *       doc.getRange('b1').setValue('there are ' + n.length + ' items selected');
+     *       return app;
+     *     }
      *
-     *        var doc = SpreadsheetApp.getActiveSpreadsheet();
-     *        doc.getRange('a1').setValue(value);
-     *        doc.getRange('b1').setValue('there are ' + n.length + ' items selected');
-     *        return app;
-     *      }
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the ListBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the ListBox documentation here.
      */
     export interface ListBox {
       addBlurHandler(handler: Handler): ListBox;
@@ -1889,17 +1792,14 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A standard menu bar widget.
      *
-     *  A menu bar can contain any number of menu items,
-     *  each of which can either fire an event handler or open a cascaded menu bar.
+     * A menu bar can contain any number of menu items, each of which can either fire an event
+     * handler or open a cascaded menu bar.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the MenuBar documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the MenuBar documentation here.
      */
     export interface MenuBar {
       addCloseHandler(handler: Handler): MenuBar;
@@ -1935,16 +1835,14 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * An entry in a MenuBar.
      *
-     *  Menu items can either fire an event handler when they are clicked, or open a cascading sub-menu.
+     * Menu items can either fire an event handler when they are clicked, or open a cascading
+     * sub-menu.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the MenuItem documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the MenuItem documentation here.
      */
     export interface MenuItem {
       addStyleDependentName(styleName: string): MenuItem;
@@ -1973,14 +1871,11 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A separator that can be placed in a MenuBar.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the MenuItemSeparator documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the MenuItemSeparator documentation here.
      */
     export interface MenuItemSeparator {
       addStyleDependentName(styleName: string): MenuItemSeparator;
@@ -2005,44 +1900,41 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A text box that visually masks its input to prevent eavesdropping.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var text = app.createPasswordTextBox().setName("text");
-     *        var handler = app.createServerHandler("test").addCallbackElement(text);
-     *        app.add(text);
-     *        app.add(app.createButton("Test", handler));
-     *        app.add(app.createLabel("0 characters").setId("label"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var text = app.createPasswordTextBox().setName("text");
+     *       var handler = app.createServerHandler("test").addCallbackElement(text);
+     *       app.add(text);
+     *       app.add(app.createButton("Test", handler));
+     *       app.add(app.createLabel("0 characters").setId("label"));
+     *       return app;
+     *     }
      *
-     *      function test(eventInfo) {
-     *        var app = UiApp.createApplication();
-     *        // Because the text box was named "text" and added as a callback element to the
-     *        // button's click event, we have its value available in eventInfo.parameter.text.
-     *        var pass = eventInfo.parameter.text;
-     *        var isStrong =
-     *            pass.length >= 10 && /[A-Z]/.test(pass) && /[a-z]/.test(pass) && /[0-9]/.test(pass);
-     *        var label = app.getElementById("label");
-     *        if (isStrong) {
-     *          label.setText("Strong! Well, not really, but this is just an example.")
-     *              .setStyleAttribute("color", "green");
-     *        } else {
-     *          label.setText("Weak! Use at least 10 characters, with uppercase, lowercase, and digits")
-     *              .setStyleAttribute("color", "red");
-     *        }
-     *        return app;
-     *      }
+     *     function test(eventInfo) {
+     *       var app = UiApp.createApplication();
+     *       // Because the text box was named "text" and added as a callback element to the
+     *       // button's click event, we have its value available in eventInfo.parameter.text.
+     *       var pass = eventInfo.parameter.text;
+     *       var isStrong =
+     *           pass.length >= 10 && /[A-Z]/.test(pass) && /[a-z]/.test(pass) && /[0-9]/.test(pass);
+     *       var label = app.getElementById("label");
+     *       if (isStrong) {
+     *         label.setText("Strong! Well, not really, but this is just an example.")
+     *             .setStyleAttribute("color", "green");
+     *       } else {
+     *         label.setText("Weak! Use at least 10 characters, with uppercase, lowercase, and digits")
+     *             .setStyleAttribute("color", "red");
+     *       }
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the PasswordTextBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the PasswordTextBox documentation here.
      */
     export interface PasswordTextBox {
       addBlurHandler(handler: Handler): PasswordTextBox;
@@ -2097,40 +1989,37 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A panel that can "pop up" over other widgets. It overlays the browser's client area (and any
+     * previously-created popups).
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A panel that can "pop up" over other widgets. It overlays the browser's
-     *  client area (and any previously-created popups).
+     * In general it's not recommended to add this panel as a child of another widget or of the app
+     * as that will make it behave like any other inline panel and not act as a popup. Instead, create
+     * the popup and then use its show() and hide() methods to show and hide it. See
+     * the example below.
      *
-     *  In general it's not recommended to add this panel as a child of another widget or of the app
-     *  as that will make it behave like any other inline panel and not act as a popup. Instead, create
-     *  the popup and then use its show() and hide() methods to show and hide it. See
-     *  the example below.
+     * To make the popup stay at a fixed location rather than scrolling with the page, try setting
+     * the 'position', 'fixed' style on it with setStyleAttribute(attribute, value).
      *
-     *  To make the popup stay at a fixed location rather than scrolling with the page, try setting the
-     *  'position', 'fixed' style on it with setStyleAttribute(attribute, value).
+     * Note that this panel can contain at most one direct child widget. To add more children, make
+     * the child of this panel a different panel that can contain more than one child.
      *
-     *  Note that this panel can contain at most one direct child widget. To add more children, make the
-     *  child of this panel a different panel that can contain more than one child.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the PopupPanel documentation here.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the PopupPanel documentation here.
+     * Here is an example showing how to use the popup panel widget:
      *
-     *  Here is an example showing how to use the popup panel widget:
-     *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // Create a popup panel and set it to be modal.
-     *        var popupPanel = app.createPopupPanel(false, true);
-     *        // Add a button to the panel and set the dimensions and position.
-     *        popupPanel.add(app.createButton()).setWidth("100px").setHeight("100px")
-     *            .setPopupPosition(100, 100);
-     *        // Show the panel. Note that it does not have to be "added" to the UiInstance.
-     *        popupPanel.show();
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // Create a popup panel and set it to be modal.
+     *       var popupPanel = app.createPopupPanel(false, true);
+     *       // Add a button to the panel and set the dimensions and position.
+     *       popupPanel.add(app.createButton()).setWidth("100px").setHeight("100px")
+     *           .setPopupPosition(100, 100);
+     *       // Show the panel. Note that it does not have to be "added" to the UiInstance.
+     *       popupPanel.show();
+     *       return app;
+     *     }
      */
     export interface PopupPanel {
       add(widget: Widget): PopupPanel;
@@ -2171,31 +2060,28 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A normal push button with custom styling.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // create a button and give it a click handler
-     *        var button = app.createPushButton().setText("click me!").setId("button");
-     *        button.addClickHandler(app.createServerHandler("handlerFunction"));
-     *        app.add(button);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // create a button and give it a click handler
+     *       var button = app.createPushButton().setText("click me!").setId("button");
+     *       button.addClickHandler(app.createServerHandler("handlerFunction"));
+     *       app.add(button);
+     *       return app;
+     *     }
      *
-     *      function handlerFunction(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        app.add(app.createLabel("The button was clicked!"));
-     *        return app;
-     *      }
+     *     function handlerFunction(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       app.add(app.createLabel("The button was clicked!"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the PushButton documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the PushButton documentation here.
      */
     export interface PushButton {
       addBlurHandler(handler: Handler): PushButton;
@@ -2239,35 +2125,31 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A mutually-exclusive selection radio button widget.
      *
-     *  This widget fires
-     *  click events when the radio button is clicked, and value change events when the
-     *  button becomes checked. Note, however, that browser limitations prevent
-     *  value change events from being sent when the radio button is cleared as a side
-     *  effect of another in the group being clicked.
+     * This widget fires click events when the radio button is clicked, and value change events when
+     * the button becomes checked. Note, however, that browser limitations prevent value change events
+     * from being sent when the radio button is cleared as a side effect of another in the group being
+     * clicked.
      *
-     *  RadioButtons are grouped according to the following rules:
+     * RadioButtons are grouped according to the following rules:
      *
      * In the absence of a FormPanel, RadioButtons with the same name are part of the same
-     *  group.
+     *       group.
      *
      * Within a FormPanel, all unnamed RadioButtons are part of the same group.
      *
      * Within a FormPanel, all RadioButtons with the same name are part of the same group - but
-     *      not part of the same group as RadioButtons with the same name outside of the
-     *      FormPanel.
+     *       not part of the same group as RadioButtons with the same name outside of the
+     *       FormPanel.
      *
-     *  Note that radio button selections within a group do not propagate to server handlers created with
-     *  UiInstance#createServerHandler(). Instead, to capture values on the server, use
-     *  doPost() or separate handlers for each RadioButton.
+     * Note that radio button selections within a group do not propagate to server handlers created
+     * with UiInstance#createServerHandler(). Instead, to capture values on the server, use
+     * doPost() or separate handlers for each RadioButton.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the RadioButton documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the RadioButton documentation here.
      */
     export interface RadioButton {
       addBlurHandler(handler: Handler): RadioButton;
@@ -2316,28 +2198,25 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A standard push-button widget which will automatically reset its enclosing FormPanel if
-     *  any.
+     * any.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var panel = app.createFlowPanel();
-     *        panel.add(app.createTextBox().setText("some text"));
-     *        panel.add(app.createResetButton("reset the textbox"));
-     *        var form = app.createFormPanel();
-     *        form.add(panel);
-     *        app.add(form);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var panel = app.createFlowPanel();
+     *       panel.add(app.createTextBox().setText("some text"));
+     *       panel.add(app.createResetButton("reset the textbox"));
+     *       var form = app.createFormPanel();
+     *       form.add(panel);
+     *       app.add(form);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the ResetButton documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the ResetButton documentation here.
      */
     export interface ResetButton {
       addBlurHandler(handler: Handler): ResetButton;
@@ -2381,32 +2260,29 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that wraps its contents in a scrollable element.
      *
-     *  Note that this panel can contain at most one direct child widget. To add more children, make the
-     *  child of this panel a different panel that can contain more than one child.
+     * Note that this panel can contain at most one direct child widget. To add more children, make
+     * the child of this panel a different panel that can contain more than one child.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        // Create some long content.
-     *        var vertical = app.createVerticalPanel();
-     *        for (var i = 0; i < 100; ++i) {
-     *          vertical.add(app.createButton("button " + i));
-     *        }
-     *        var scroll = app.createScrollPanel().setPixelSize(100, 100);
-     *        scroll.add(vertical);
-     *        app.add(scroll);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       // Create some long content.
+     *       var vertical = app.createVerticalPanel();
+     *       for (var i = 0; i < 100; ++i) {
+     *         vertical.add(app.createButton("button " + i));
+     *       }
+     *       var scroll = app.createScrollPanel().setPixelSize(100, 100);
+     *       scroll.add(vertical);
+     *       app.add(scroll);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the ScrollPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the ScrollPanel documentation here.
      */
     export interface ScrollPanel {
       add(widget: Widget): ScrollPanel;
@@ -2439,29 +2315,26 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * An event handler that runs on the server. These will, in general, run much slower than ClientHandlers but they are not limited in what they can do.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * An event handler that runs on the server. These will, in general, run much slower than
-     *  ClientHandlers but they are not limited in what they can do.
+     * Any method that accepts a "Handler" parameter can accept a ServerHandler.
      *
-     *  Any method that accepts a "Handler" parameter can accept a ServerHandler.
+     * When a ServerHandler is invoked, the function it refers to is called on the Apps Script server
+     * in a "fresh" script. This means that no variable values will have survived from previous handlers
+     * or from the initial script that loaded the app. Global variables in the script will be
+     * re-evaluated, which means that it's a bad idea to do anything slow (like opening a Spreadsheet or
+     * fetching a Calendar) in a global variable.
      *
-     *  When a ServerHandler is invoked, the function it refers to is called on the Apps Script server in
-     *  a "fresh" script. This means that no variable values will have survived from previous handlers or
-     *  from the initial script that loaded the app. Global variables in the script will be re-evaluated,
-     *  which means that it's a bad idea to do anything slow (like opening a Spreadsheet or fetching a
-     *  Calendar) in a global variable.
+     * If you need to save state on the server, you can try using ScriptProperties or UserProperties.
+     * You can also add a Hidden field to your app storing the information you want to save and
+     * pass it back explicitly to handlers as a "callback element."
      *
-     *  If you need to save state on the server, you can try using ScriptProperties or UserProperties.
-     *  You can also add a Hidden field to your app storing the information you want to save
-     *  and pass it back explicitly to handlers as a "callback element."
+     * If you set validators on a ServerHandler, they will be checked before the handler calls the
+     * server. The server will only be called if the validators succeed.
      *
-     *  If you set validators on a ServerHandler, they will be checked before the handler calls the
-     *  server. The server will only be called if the validators succeed.
-     *
-     *  If you have multiple ServerHandlers for the same event on the same widget, they will be called
-     *  simultaneously.
+     * If you have multiple ServerHandlers for the same event on the same widget, they will be called
+     * simultaneously.
      */
     export interface ServerHandler {
       addCallbackElement(widget: Widget): ServerHandler;
@@ -2494,14 +2367,11 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A simple checkbox widget, with no label.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the SimpleCheckBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the SimpleCheckBox documentation here.
      */
     export interface SimpleCheckBox {
       addBlurHandler(handler: Handler): SimpleCheckBox;
@@ -2545,30 +2415,27 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that can contain only one widget.
      *
-     *  This panel is useful for adding styling effects to the child widget. To add more children, make
-     *  the child of this panel a different panel that can contain more than one child.
+     * This panel is useful for adding styling effects to the child widget. To add more children,
+     * make the child of this panel a different panel that can contain more than one child.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var simple = app.createSimplePanel();
-     *        var flow = app.createFlowPanel();
-     *        flow.add(app.createButton("button 1"));
-     *        flow.add(app.createButton("button 2"));
-     *        simple.add(flow);
-     *        app.add(simple);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var simple = app.createSimplePanel();
+     *       var flow = app.createFlowPanel();
+     *       flow.add(app.createButton("button 1"));
+     *       flow.add(app.createButton("button 2"));
+     *       simple.add(flow);
+     *       app.add(simple);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the SimplePanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the SimplePanel documentation here.
      */
     export interface SimplePanel {
       add(widget: Widget): SimplePanel;
@@ -2597,16 +2464,13 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A simple radio button widget, with no label.
      *
-     *  SimpleRadioButtons are grouped according to the same rules as RadioButtons.
+     * SimpleRadioButtons are grouped according to the same rules as RadioButtons.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the SimpleRadioButton documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the SimpleRadioButton documentation here.
      */
     export interface SimpleRadioButton {
       addBlurHandler(handler: Handler): SimpleRadioButton;
@@ -2650,17 +2514,14 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that adds user-positioned splitters between each of its child widgets.
      *
-     *  This panel is similar to a DockLayoutPanel, but each pair of child widgets has a splitter
-     *  between them that the user can drag.
+     * This panel is similar to a DockLayoutPanel, but each pair of child widgets has a
+     * splitter between them that the user can drag.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the SplitLayoutPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the SplitLayoutPanel documentation here.
      */
     export interface SplitLayoutPanel {
       add(widget: Widget): SplitLayoutPanel;
@@ -2695,15 +2556,12 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A panel that stacks its children vertically, displaying only one at a time, with a header for
+     * each child which the user can click to display.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A panel that stacks its children vertically, displaying only one at a time,
-     *  with a header for each child which the user can click to display.
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the StackPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the StackPanel documentation here.
      */
     export interface StackPanel {
       add(widget: Widget): StackPanel;
@@ -2737,35 +2595,32 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A standard push-button widget which will automatically submit its enclosing FormPanel if
-     *  any.
+     * any.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var form = app.createFormPanel();
-     *        var flow = app.createFlowPanel();
-     *        flow.add(app.createTextBox().setName("textBox"));
-     *        flow.add(app.createSubmitButton("Submit"));
-     *        form.add(flow);
-     *        app.add(form);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var form = app.createFormPanel();
+     *       var flow = app.createFlowPanel();
+     *       flow.add(app.createTextBox().setName("textBox"));
+     *       flow.add(app.createSubmitButton("Submit"));
+     *       form.add(flow);
+     *       app.add(form);
+     *       return app;
+     *     }
      *
-     *      function doPost(eventInfo) {
-     *        var app = UiApp.getActiveApplication();
-     *        app.add(app.createLabel("Form submitted. The text box's value was '" +
-     *            eventInfo.parameter.textBox + "'"));
-     *        return app;
-     *      }
+     *     function doPost(eventInfo) {
+     *       var app = UiApp.getActiveApplication();
+     *       app.add(app.createLabel("Form submitted. The text box's value was '" +
+     *           eventInfo.parameter.textBox + "'"));
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the SubmitButton documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the SubmitButton documentation here.
      */
     export interface SubmitButton {
       addBlurHandler(handler: Handler): SubmitButton;
@@ -2809,14 +2664,13 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. This class is deprecated and should not be used in new scripts.
-     * A SuggestBox is a text box or text area which displays a
-     *  pre-configured set of selections that match the user's input.
+     * A SuggestBox is a text box or text area which displays a pre-configured set of selections
+     * that match the user's input.
      *
-     *  This widget is not currently functional.
+     * This widget is not currently functional.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the SuggestBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the SuggestBox documentation here.
      */
     export interface SuggestBox {
       addKeyDownHandler(handler: Handler): SuggestBox;
@@ -2857,14 +2711,11 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A horizontal bar of folder-style tabs, most commonly used as part of a TabPanel.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the TabBar documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the TabBar documentation here.
      */
     export interface TabBar {
       addBeforeSelectionHandler(handler: Handler): TabBar;
@@ -2898,16 +2749,12 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A panel that represents a tabbed set of pages, each of which contains another widget. Its child
+     * widgets are shown as the user selects the various tabs associated with them.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A panel that represents a tabbed set of pages, each of which contains another
-     *  widget. Its child widgets are shown as the user selects the various tabs
-     *  associated with them.
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the TabPanel documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the TabPanel documentation here.
      */
     export interface TabPanel {
       add(widget: Widget): TabPanel;
@@ -2941,34 +2788,31 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A text box that allows multiple lines of text to be entered.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var text = app.createTextArea().setName("text");
-     *        var handler = app.createServerHandler("count").addCallbackElement(text);
-     *        app.add(text);
-     *        app.add(app.createButton("Count", handler));
-     *        app.add(app.createLabel("0 characters").setId("label"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var text = app.createTextArea().setName("text");
+     *       var handler = app.createServerHandler("count").addCallbackElement(text);
+     *       app.add(text);
+     *       app.add(app.createButton("Count", handler));
+     *       app.add(app.createLabel("0 characters").setId("label"));
+     *       return app;
+     *     }
      *
-     *      function count(eventInfo) {
-     *        var app = UiApp.createApplication();
-     *        // Because the text area was named "text" and added as a callback element to the
-     *        // button's click event, we have its value available in eventInfo.parameter.text.
-     *        app.getElementById("label").setText(eventInfo.parameter.text.length + " characters");
-     *        return app;
-     *      }
+     *     function count(eventInfo) {
+     *       var app = UiApp.createApplication();
+     *       // Because the text area was named "text" and added as a callback element to the
+     *       // button's click event, we have its value available in eventInfo.parameter.text.
+     *       app.getElementById("label").setText(eventInfo.parameter.text.length + " characters");
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the TextArea documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the TextArea documentation here.
      */
     export interface TextArea {
       addBlurHandler(handler: Handler): TextArea;
@@ -3023,34 +2867,31 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A standard single-line text box.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var text = app.createTextBox().setName("text");
-     *        var handler = app.createServerHandler("count").addCallbackElement(text);
-     *        app.add(text);
-     *        app.add(app.createButton("Count", handler));
-     *        app.add(app.createLabel("0 characters").setId("label"));
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var text = app.createTextBox().setName("text");
+     *       var handler = app.createServerHandler("count").addCallbackElement(text);
+     *       app.add(text);
+     *       app.add(app.createButton("Count", handler));
+     *       app.add(app.createLabel("0 characters").setId("label"));
+     *       return app;
+     *     }
      *
-     *      function count(eventInfo) {
-     *        var app = UiApp.createApplication();
-     *        // Because the text box was named "text" and added as a callback element to the
-     *        // button's click event, we have its value available in eventInfo.parameter.text.
-     *        app.getElementById("label").setText(eventInfo.parameter.text.length + " characters");
-     *        return app;
-     *      }
+     *     function count(eventInfo) {
+     *       var app = UiApp.createApplication();
+     *       // Because the text box was named "text" and added as a callback element to the
+     *       // button's click event, we have its value available in eventInfo.parameter.text.
+     *       app.getElementById("label").setText(eventInfo.parameter.text.length + " characters");
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the TextBox documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the TextBox documentation here.
      */
     export interface TextBox {
       addBlurHandler(handler: Handler): TextBox;
@@ -3105,15 +2946,12 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A ToggleButton is a stylish stateful button which allows the user to toggle between
+     * up and down states.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A ToggleButton is a stylish stateful button which allows the
-     *  user to toggle between up and down states.
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the ToggleButton documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the ToggleButton documentation here.
      */
     export interface ToggleButton {
       addBlurHandler(handler: Handler): ToggleButton;
@@ -3158,15 +2996,12 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
+     * A standard hierarchical tree widget. The tree contains a hierarchy of TreeItems that the
+     * user can open, close, and select.
      *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
-     * A standard hierarchical tree widget. The tree contains a hierarchy of
-     *  TreeItems that the user can open, close, and select.
-     *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the Tree documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the Tree documentation here.
      */
     export interface Tree {
       add(widget: Widget): Tree;
@@ -3217,14 +3052,11 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * An item that can be contained within a Tree.
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the TreeItem documentation here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the TreeItem documentation here.
      */
     export interface TreeItem {
       addItem(text: string): TreeItem;
@@ -3260,9 +3092,7 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * Create user interfaces for use inside G Suite or as standalone services.
      */
     export interface UiApp {
@@ -3278,12 +3108,10 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A representation of a user interface.
      *
-     *  You can use this to create a new user interface or manipulate an existing one.
+     * You can use this to create a new user interface or manipulate an existing one.
      */
     export interface UiInstance {
       add(child: Widget): UiInstance;
@@ -3428,9 +3256,7 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * Vertical alignment constants to use with setVerticalAlignment methods in UiApp.
      */
     export enum VerticalAlignment { TOP, MIDDLE, BOTTOM }
@@ -3438,26 +3264,22 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * A panel that lays all of its widgets out in a single vertical column.
      *
-     *  Here is an example of how to use this widget:
+     * Here is an example of how to use this widget:
      *
-     *      function doGet() {
-     *        var app = UiApp.createApplication();
-     *        var panel = app.createVerticalPanel();
-     *        panel.add(app.createButton("button 1"));
-     *        panel.add(app.createButton("button 2"));
-     *        app.add(panel);
-     *        return app;
-     *      }
+     *     function doGet() {
+     *       var app = UiApp.createApplication();
+     *       var panel = app.createVerticalPanel();
+     *       panel.add(app.createButton("button 1"));
+     *       panel.add(app.createButton("button 2"));
+     *       app.add(panel);
+     *       return app;
+     *     }
      *
-     *  Internally, UiApp widgets are built on top of the
-     *  Google Web Toolkit, and it can sometimes be helpful to look at the GWT documentation
-     *  directly. You can find the VerticalPanel documentation
-     *  here.
+     * Internally, UiApp widgets are built on top of the Google Web Toolkit, and it can sometimes be helpful
+     * to look at the GWT documentation directly. You can find the VerticalPanel documentation here.
      */
     export interface VerticalPanel {
       add(widget: Widget): VerticalPanel;
@@ -3495,9 +3317,7 @@ declare namespace GoogleAppsScript {
     /**
      *
      * Deprecated. The UI service was
-     *
-     *      deprecated on December 11, 2014. To create user interfaces, use the
-     *      HTML service instead.
+     *     deprecated on December 11, 2014. To create user interfaces, use the HTML service instead.
      * Base interface for UiApp widgets.
      * Implementing classes
      *
@@ -3509,8 +3329,8 @@ declare namespace GoogleAppsScript {
      *
      * ButtonA standard push-button widget.
      *
-     * CaptionPanelA panel that wraps its contents in a border with a caption that appears in the upper left
-     *  corner of the border.
+     * CaptionPanelA panel that wraps its contents in a border with a caption that appears in the upper left corner
+     * of the border.
      *
      * ChartA Chart object, which can be embedded into documents, UI elements, or used as a static image.
      *
@@ -3518,27 +3338,26 @@ declare namespace GoogleAppsScript {
      *
      * ControlA user interface control object, that drives the data displayed by a DashboardPanel.
      *
-     * DashboardPanelA dashboard is a visual structure that enables the organization and management
-     *  of multiple charts that share the same underlying data.
+     * DashboardPanelA dashboard is a visual structure that enables the organization and management of multiple charts
+     * that share the same underlying data.
      *
      * DateBoxA text box that shows a DatePicker when the user focuses on it.
      *
      * DatePickerA date picker widget.
      *
      * DecoratedStackPanelA StackPanel that wraps each item in a 2x3 grid (six box), which allows users to add
-     *  rounded corners.
+     * rounded corners.
      *
      * DecoratedTabBarA TabBar that wraps each tab in a 2x3 grid (six box), which allows users to add rounded corners.
      *
      * DecoratedTabPanelA TabPanel that uses a DecoratedTabBar with rounded corners.
      *
      * DecoratorPanelA SimplePanel that wraps its contents in stylized boxes, which can be used to add rounded
-     *  corners to a Widget.
+     * corners to a Widget.
      *
-     * DialogBoxA form of popup that has a caption area at the top and can be dragged by the
-     *  user.
+     * DialogBoxA form of popup that has a caption area at the top and can be dragged by the user.
      *
-     * EmbeddedChartRepresents a chart that has been embedded into a Spreadsheet.
+     * EmbeddedChartRepresents a chart that has been embedded into a spreadsheet.
      *
      * FileUploadA widget that wraps the HTML <input type='file'> element.
      *
@@ -3547,7 +3366,7 @@ declare namespace GoogleAppsScript {
      * FlowPanelA panel that formats its child widgets using the default HTML layout behavior.
      *
      * FocusPanelA simple panel that makes its contents focusable, and adds the ability to catch mouse and
-     *  keyboard events.
+     * keyboard events.
      *
      * FormPanelA panel that wraps its contents in an HTML <FORM> element.
      *
@@ -3556,7 +3375,7 @@ declare namespace GoogleAppsScript {
      * HTMLA widget that contains arbitrary text, which is interpreted as HTML.
      *
      * HiddenRepresents a hidden field for storing data in the user's browser that can be passed back to a
-     *  handler as a "callback element".
+     * handler as a "callback element".
      *
      * HorizontalPanelA panel that lays all of its widgets out in a single horizontal column.
      *
@@ -3566,8 +3385,8 @@ declare namespace GoogleAppsScript {
      *
      * LabelA widget that contains arbitrary text, not interpreted as HTML.
      *
-     * ListBoxA widget that presents a list of choices to the user, either as a list box or
-     *  as a drop-down list.
+     * ListBoxA widget that presents a list of choices to the user, either as a list box or as a drop-down
+     * list.
      *
      * MenuBarA standard menu bar widget.
      *
@@ -3580,7 +3399,7 @@ declare namespace GoogleAppsScript {
      * RadioButtonA mutually-exclusive selection radio button widget.
      *
      * ResetButtonA standard push-button widget which will automatically reset its enclosing FormPanel if
-     *  any.
+     * any.
      *
      * ScrollPanelA panel that wraps its contents in a scrollable element.
      *
@@ -3592,26 +3411,25 @@ declare namespace GoogleAppsScript {
      *
      * SplitLayoutPanelA panel that adds user-positioned splitters between each of its child widgets.
      *
-     * StackPanelA panel that stacks its children vertically, displaying only one at a time,
-     *  with a header for each child which the user can click to display.
+     * StackPanelA panel that stacks its children vertically, displaying only one at a time, with a header for
+     * each child which the user can click to display.
      *
      * SubmitButtonA standard push-button widget which will automatically submit its enclosing FormPanel if
-     *  any.
+     * any.
      *
-     * SuggestBoxA SuggestBox is a text box or text area which displays a
-     *  pre-configured set of selections that match the user's input.
+     * SuggestBoxA SuggestBox is a text box or text area which displays a pre-configured set of selections
+     * that match the user's input.
      *
      * TabBarA horizontal bar of folder-style tabs, most commonly used as part of a TabPanel.
      *
-     * TabPanelA panel that represents a tabbed set of pages, each of which contains another
-     *  widget.
+     * TabPanelA panel that represents a tabbed set of pages, each of which contains another widget.
      *
      * TextAreaA text box that allows multiple lines of text to be entered.
      *
      * TextBoxA standard single-line text box.
      *
-     * ToggleButtonA ToggleButton is a stylish stateful button which allows the
-     *  user to toggle between up and down states.
+     * ToggleButtonA ToggleButton is a stylish stateful button which allows the user to toggle between
+     * up and down states.
      *
      * TreeA standard hierarchical tree widget.
      *
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 4e8d45ec16..28cc744672 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
@@ -1,7 +1,7 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-08-08
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
-//                 ramzallan <https://github.com/ramzallan>
+//                 takoyaki9n <https://github.com/takoyaki9n>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference path="google-apps-script.types.d.ts" />
@@ -27,69 +27,80 @@ declare namespace GoogleAppsScript {
     }
 
     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;
+      /**
+       * 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;
+      /**
+       * 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 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;
+      /**
+       * 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 | object | Base.Blob;
 
-        /**
-         * Deprecated. This instructs fetch to resolve the specified URL within the intranet linked to your
-         * domain through (deprecated) SDC
-         */
-        useIntranet?: boolean;
+      /**
+       * 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 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 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 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;
+      /**
+       * 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.
      *
-     *  This service allows scripts to communicate with other applications or access other resources on
-     *  the web by fetching URLs. A script can use the URL Fetch service to issue HTTP and HTTPS requests
-     *  and receive responses. The URL Fetch service uses Google's network infrastructure for efficiency
-     *  and scaling purposes.
+     * This service allows scripts to communicate with other applications or access other resources
+     * on the web by fetching URLs. A script can use the URL Fetch service to issue HTTP and HTTPS
+     * requests and receive responses. The URL Fetch service uses Google's network infrastructure for
+     * efficiency and scaling purposes.
+     *
+     * Requests made using this service originate from a set pool of IP ranges. You can look up the full list of IP addresses
+     * if you need to whitelist or approve these requests.
+     *
+     * This service requires the https://www.googleapis.com/auth/script.external_request
+     * scope. In most cases Apps Script automatically detects and includes the scopes a script needs,
+     * but if you are setting your scopes
+     * explicitly you must manually add this scope to use UrlFetchApp.
      * See also
      *
      * HTTPResponse
+     *
+     * Setting explicit scopes
      */
     export interface UrlFetchApp {
       fetch(url: string, params?: URLFetchRequestOptions): HTTPResponse;
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 c8fde9349c..272c341b6c 100644
--- a/types/google-apps-script/google-apps-script.utilities.d.ts
+++ b/types/google-apps-script/google-apps-script.utilities.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -25,7 +25,7 @@ declare namespace GoogleAppsScript {
 
     /**
      * This service provides utilities for string encoding/decoding, date formatting, JSON manipulation,
-     *  and other miscellaneous tasks.
+     * and other miscellaneous tasks.
      */
     export interface Utilities {
       Charset: typeof Charset;
@@ -41,10 +41,13 @@ declare namespace GoogleAppsScript {
       base64EncodeWebSafe(data: Byte[]): string;
       base64EncodeWebSafe(data: string): string;
       base64EncodeWebSafe(data: string, charset: Charset): string;
+      computeDigest(algorithm: DigestAlgorithm, value: Byte[]): Byte[];
       computeDigest(algorithm: DigestAlgorithm, value: string): Byte[];
       computeDigest(algorithm: DigestAlgorithm, value: string, charset: Charset): Byte[];
+      computeHmacSha256Signature(value: Byte[], key: Byte[]): Byte[];
       computeHmacSha256Signature(value: string, key: string): Byte[];
       computeHmacSha256Signature(value: string, key: string, charset: Charset): Byte[];
+      computeHmacSignature(algorithm: MacAlgorithm, value: Byte[], key: Byte[]): Byte[];
       computeHmacSignature(algorithm: MacAlgorithm, value: string, key: string): Byte[];
       computeHmacSignature(algorithm: MacAlgorithm, value: string, key: string, charset: Charset): Byte[];
       computeRsaSha256Signature(value: string, key: string): Byte[];
@@ -52,6 +55,8 @@ declare namespace GoogleAppsScript {
       formatDate(date: Date, timeZone: string, format: string): string;
       formatString(template: string, ...args: Object[]): string;
       getUuid(): string;
+      gzip(blob: Base.BlobSource): Base.Blob;
+      gzip(blob: Base.BlobSource, name: string): Base.Blob;
       newBlob(data: Byte[]): Base.Blob;
       newBlob(data: Byte[], contentType: string): Base.Blob;
       newBlob(data: Byte[], contentType: string, name: string): Base.Blob;
@@ -61,6 +66,7 @@ declare namespace GoogleAppsScript {
       parseCsv(csv: string): string[][];
       parseCsv(csv: string, delimiter: Char): string[][];
       sleep(milliseconds: Integer): void;
+      ungzip(blob: Base.BlobSource): Base.Blob;
       unzip(blob: Base.BlobSource): Base.Blob[];
       zip(blobs: Base.BlobSource[]): Base.Blob;
       zip(blobs: Base.BlobSource[], name: string): Base.Blob;
diff --git a/types/google-apps-script/google-apps-script.xml-service.d.ts b/types/google-apps-script/google-apps-script.xml-service.d.ts
index 664fbfc2b9..ff63f961b8 100644
--- a/types/google-apps-script/google-apps-script.xml-service.d.ts
+++ b/types/google-apps-script/google-apps-script.xml-service.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Google Apps Script 2017-05-12
+// Type definitions for Google Apps Script 2018-07-11
 // Project: https://developers.google.com/apps-script/
 // Definitions by: motemen <https://github.com/motemen/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -10,21 +10,21 @@ declare namespace GoogleAppsScript {
     /**
      * A representation of an XML attribute.
      *
-     *      // Reads the first and last name of each person and adds a new attribute with the full name.
-     *      var xml = '<roster>'
-     *          + '<person first="John" last="Doe"/>'
-     *          + '<person first="Mary" last="Smith"/>'
-     *          + '</roster>';
-     *      var document = XmlService.parse(xml);
-     *      var people = document.getRootElement().getChildren('person');
-     *      for (var i = 0; i < people.length; i++) {
-     *        var person = people[i];
-     *        var firstName = person.getAttribute('first').getValue();
-     *        var lastName = person.getAttribute('last').getValue();
-     *        person.setAttribute('full', firstName + ' ' + lastName);
-     *      }
-     *      xml = XmlService.getPrettyFormat().format(document);
-     *      Logger.log(xml);
+     *     // Reads the first and last name of each person and adds a new attribute with the full name.
+     *     var xml = '<roster>'
+     *         + '<person first="John" last="Doe"/>'
+     *         + '<person first="Mary" last="Smith"/>'
+     *         + '</roster>';
+     *     var document = XmlService.parse(xml);
+     *     var people = document.getRootElement().getChildren('person');
+     *     for (var i = 0; i < people.length; i++) {
+     *       var person = people[i];
+     *       var firstName = person.getAttribute('first').getValue();
+     *       var lastName = person.getAttribute('last').getValue();
+     *       person.setAttribute('full', firstName + ' ' + lastName);
+     *     }
+     *     xml = XmlService.getPrettyFormat().format(document);
+     *     Logger.log(xml);
      */
     export interface Attribute {
       getName(): string;
@@ -38,15 +38,15 @@ declare namespace GoogleAppsScript {
     /**
      * A representation of an XML CDATASection node.
      *
-     *      // Create and log an XML document that shows how special characters like '<', '>', and '&' are
-     *      // stored in a CDATASection node as compared to in a Text node.
-     *      var illegalCharacters = '<em>The Amazing Adventures of Kavalier & Clay</em>';
-     *      var cdata = XmlService.createCdata(illegalCharacters);
-     *      var text = XmlService.createText(illegalCharacters);
-     *      var root = XmlService.createElement('root').addContent(cdata).addContent(text);
-     *      var document = XmlService.createDocument(root);
-     *      var xml = XmlService.getPrettyFormat().format(document);
-     *      Logger.log(xml);
+     *     // Create and log an XML document that shows how special characters like '<', '>', and '&' are
+     *     // stored in a CDATASection node as compared to in a Text node.
+     *     var illegalCharacters = '<em>The Amazing Adventures of Kavalier & Clay</em>';
+     *     var cdata = XmlService.createCdata(illegalCharacters);
+     *     var text = XmlService.createText(illegalCharacters);
+     *     var root = XmlService.createElement('root').addContent(cdata).addContent(text);
+     *     var document = XmlService.createDocument(root);
+     *     var xml = XmlService.getPrettyFormat().format(document);
+     *     Logger.log(xml);
      */
     export interface Cdata {
       append(text: string): Text;
@@ -149,23 +149,23 @@ declare namespace GoogleAppsScript {
     /**
      * A representation of an XML Element node.
      *
-     *      // Adds up the values listed in a sample XML document and adds a new element with the total.
-     *      var xml = '<things>'
-     *          + '<plates>12</plates>'
-     *          + '<bowls>18</bowls>'
-     *          + '<cups>25</cups>'
-     *          + '</things>';
-     *      var document = XmlService.parse(xml);
-     *      var root = document.getRootElement();
-     *      var items = root.getChildren();
-     *      var total = 0;
-     *      for (var i = 0; i < items.length; i++) {
-     *        total += Number(items[i].getText());
-     *      }
-     *      var totalElement = XmlService.createElement('total').setText(total);
-     *      root.addContent(totalElement);
-     *      xml = XmlService.getPrettyFormat().format(document);
-     *      Logger.log(xml);
+     *     // Adds up the values listed in a sample XML document and adds a new element with the total.
+     *     var xml = '<things>'
+     *         + '<plates>12</plates>'
+     *         + '<bowls>18</bowls>'
+     *         + '<cups>25</cups>'
+     *         + '</things>';
+     *     var document = XmlService.parse(xml);
+     *     var root = document.getRootElement();
+     *     var items = root.getChildren();
+     *     var total = 0;
+     *     for (var i = 0; i < items.length; i++) {
+     *       total += Number(items[i].getText());
+     *     }
+     *     var totalElement = XmlService.createElement('total').setText(total);
+     *     root.addContent(totalElement);
+     *     xml = XmlService.getPrettyFormat().format(document);
+     *     Logger.log(xml);
      */
     export interface Element {
       addContent(content: Content): Element;
@@ -227,17 +227,17 @@ declare namespace GoogleAppsScript {
 
     /**
      * A formatter for outputting an XML document, with three pre-defined formats that can be further
-     *  customized.
+     * customized.
      *
-     *      // Log an XML document with specified formatting options.
-     *      var xml = '<root><a><b>Text!</b><b>More text!</b></a></root>';
-     *      var document = XmlService.parse(xml);
-     *      var output = XmlService.getCompactFormat()
-     *          .setLineSeparator('\n')
-     *          .setEncoding('UTF-8')
-     *          .setIndent('   ')
-     *          .format(document);
-     *      Logger.log(output);
+     *     // Log an XML document with specified formatting options.
+     *     var xml = '<root><a><b>Text!</b><b>More text!</b></a></root>';
+     *     var document = XmlService.parse(xml);
+     *     var output = XmlService.getCompactFormat()
+     *         .setLineSeparator('\n')
+     *         .setEncoding('UTF-8')
+     *         .setIndent('   ')
+     *         .format(document);
+     *     Logger.log(output);
      */
     export interface Format {
       format(document: Document): string;
@@ -283,41 +283,41 @@ declare namespace GoogleAppsScript {
     /**
      * This service allows scripts to parse, navigate, and programmatically create XML documents.
      *
-     *      // Log the title and labels for the first page of blog posts on the G Suite Developer blog.
-     *      function parseXml() {
-     *        var url = 'https://gsuite-developers.googleblog.com/atom.xml';
-     *        var xml = UrlFetchApp.fetch(url).getContentText();
-     *        var document = XmlService.parse(xml);
-     *        var root = document.getRootElement();
-     *        var atom = XmlService.getNamespace('http://www.w3.org/2005/Atom');
+     *     // Log the title and labels for the first page of blog posts on the G Suite Developer blog.
+     *     function parseXml() {
+     *       var url = 'https://gsuite-developers.googleblog.com/atom.xml';
+     *       var xml = UrlFetchApp.fetch(url).getContentText();
+     *       var document = XmlService.parse(xml);
+     *       var root = document.getRootElement();
+     *       var atom = XmlService.getNamespace('http://www.w3.org/2005/Atom');
      *
-     *        var entries = document.getRootElement().getChildren('entry', atom);
-     *        for (var i = 0; i < entries.length; i++) {
-     *          var title = entries[i].getChild('title', atom).getText();
-     *          var categoryElements = entries[i].getChildren('category', atom);
-     *          var labels = [];
-     *          for (var j = 0; j < categoryElements.length; j++) {
-     *            labels.push(categoryElements[j].getAttribute('term').getValue());
-     *          }
-     *          Logger.log('%s (%s)', title, labels.join(', '));
-     *        }
-     *      }
+     *       var entries = document.getRootElement().getChildren('entry', atom);
+     *       for (var i = 0; i < entries.length; i++) {
+     *         var title = entries[i].getChild('title', atom).getText();
+     *         var categoryElements = entries[i].getChildren('category', atom);
+     *         var labels = [];
+     *         for (var j = 0; j < categoryElements.length; j++) {
+     *           labels.push(categoryElements[j].getAttribute('term').getValue());
+     *         }
+     *         Logger.log('%s (%s)', title, labels.join(', '));
+     *       }
+     *     }
      *
-     *      // Create and log an XML representation of the threads in your Gmail inbox.
-     *      function createXml() {
-     *        var root = XmlService.createElement('threads');
-     *        var threads = GmailApp.getInboxThreads();
-     *        for (var i = 0; i < threads.length; i++) {
-     *          var child = XmlService.createElement('thread')
-     *              .setAttribute('messageCount', threads[i].getMessageCount())
-     *              .setAttribute('isUnread', threads[i].isUnread())
-     *              .setText(threads[i].getFirstMessageSubject());
-     *          root.addContent(child);
-     *        }
-     *        var document = XmlService.createDocument(root);
-     *        var xml = XmlService.getPrettyFormat().format(document);
-     *        Logger.log(xml);
-     *      }
+     *     // Create and log an XML representation of the threads in your Gmail inbox.
+     *     function createXml() {
+     *       var root = XmlService.createElement('threads');
+     *       var threads = GmailApp.getInboxThreads();
+     *       for (var i = 0; i < threads.length; i++) {
+     *         var child = XmlService.createElement('thread')
+     *             .setAttribute('messageCount', threads[i].getMessageCount())
+     *             .setAttribute('isUnread', threads[i].isUnread())
+     *             .setText(threads[i].getFirstMessageSubject());
+     *         root.addContent(child);
+     *       }
+     *       var document = XmlService.createDocument(root);
+     *       var xml = XmlService.getPrettyFormat().format(document);
+     *       Logger.log(xml);
+     *     }
      */
     export interface XmlService {
       ContentTypes: typeof ContentType;
diff --git a/types/google-apps-script/index.d.ts b/types/google-apps-script/index.d.ts
index 129e11d70f..2635b9aad7 100644
--- a/types/google-apps-script/index.d.ts
+++ b/types/google-apps-script/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: motemen <https://github.com/motemen>, grant <https://github.com/grant>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 /// <reference path="google-apps-script.base.d.ts"/>
 /// <reference path="google-apps-script.cache.d.ts"/>
 /// <reference path="google-apps-script.calendar.d.ts"/>
@@ -33,4 +32,3 @@
 /// <reference path="google-apps-script.url-fetch.d.ts"/>
 /// <reference path="google-apps-script.utilities.d.ts"/>
 /// <reference path="google-apps-script.xml-service.d.ts"/>
-
diff --git a/types/google-cloud__datastore/google-cloud__datastore-tests.ts b/types/google-cloud__datastore/google-cloud__datastore-tests.ts
index cb723d0d5b..df48a70f59 100644
--- a/types/google-cloud__datastore/google-cloud__datastore-tests.ts
+++ b/types/google-cloud__datastore/google-cloud__datastore-tests.ts
@@ -72,7 +72,7 @@ const complexQuery = ds.createQuery('special_namespace', kind)
                        .offset(10);
 
 // Running queries:
-const queryCallback: QueryCallback = (err: Error, entities: TestEntity[]) => entities[0][Datastore.KEY];
+const queryCallback: QueryCallback = (err: Error, entities: TestEntity[]) => entities[0][ds.KEY];
 
 ds.runQuery(query, queryCallback);
 ds.runQuery(query, options, queryCallback);
diff --git a/types/google-cloud__datastore/index.d.ts b/types/google-cloud__datastore/index.d.ts
index f864f965c9..c6b7ed3462 100644
--- a/types/google-cloud__datastore/index.d.ts
+++ b/types/google-cloud__datastore/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for @google-cloud/datastore 1.3
 // Project: https://github.com/googleapis/nodejs-datastore
 // Definitions by: Antoine Beauvais-Lacasse <https://github.com/beaulac>
+//                 Futa Ogawa <https://github.com/ogawa0071>
+//                 Thomas den Hollander <https://github.com/ThomasdenH>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
@@ -34,7 +36,16 @@ declare module '@google-cloud/datastore' {
     import { DatastoreTransaction } from '@google-cloud/datastore/transaction';
 
     class Datastore extends DatastoreRequest_ {
-        constructor(options: InitOptions);
+        static readonly KEY: unique symbol;
+        static readonly MORE_RESULTS_AFTER_CURSOR: MoreResultsAfterCursor;
+        static readonly MORE_RESULTS_AFTER_LIMIT: MoreResultsAfterLimit;
+        static readonly NO_MORE_RESULTS: NoMoreResults;
+
+        static readonly Query: typeof DatastoreQuery;
+        static readonly DatastoreRequest: typeof DatastoreRequest_;
+        static readonly Transaction: typeof DatastoreTransaction;
+
+        constructor(options?: InitOptions);
 
         readonly KEY: typeof Datastore.KEY;
         readonly MORE_RESULTS_AFTER_CURSOR: MoreResultsAfterCursor;
@@ -79,17 +90,6 @@ declare module '@google-cloud/datastore' {
         keyFilename?: string;
         credentials?: object;
     }
-
-    namespace Datastore {
-        const KEY: unique symbol;
-        const MORE_RESULTS_AFTER_CURSOR: MoreResultsAfterCursor;
-        const MORE_RESULTS_AFTER_LIMIT: MoreResultsAfterLimit;
-        const NO_MORE_RESULTS: NoMoreResults;
-
-        const Query: typeof DatastoreQuery;
-        const DatastoreRequest: typeof DatastoreRequest_;
-        const Transaction: typeof DatastoreTransaction;
-    }
 }
 
 declare module '@google-cloud/datastore/entity' {
diff --git a/types/google-cloud__pubsub/index.d.ts b/types/google-cloud__pubsub/index.d.ts
index 130e62a5e4..9375b55860 100644
--- a/types/google-cloud__pubsub/index.d.ts
+++ b/types/google-cloud__pubsub/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for @google-cloud/pubsub 0.18
-// Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/pubsub
+// Project: https://github.com/googleapis/nodejs-pubsub
 // Definitions by: Paul Huynh <https://github.com/pheromonez>
 //                 LunaPg <https://github.com/LunaPg>
+//                 Marco Siviero <https://github.com/msiviero>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -115,11 +116,15 @@ declare namespace PubSub {
 
     interface Publisher {
         publish(data: Buffer, callback: Publisher.PublishCallback): void;
-        publish(data: Buffer, attributes: object, callback: Publisher.PublishCallback): void;
-        publish(data: Buffer, attributes?: object): Promise<string>;
+        publish(data: Buffer, attributes: Publisher.Attributes, callback: Publisher.PublishCallback): void;
+        publish(data: Buffer, attributes?: Publisher.Attributes): Promise<string>;
     }
     namespace Publisher {
         type PublishCallback = (error: Error | null, messageId: string) => void;
+
+        interface Attributes {
+            [key: string]: string | Buffer | ArrayBuffer;
+        }
     }
 
     interface Snapshot {
diff --git a/types/google-cloud__storage/google-cloud__storage-tests.ts b/types/google-cloud__storage/google-cloud__storage-tests.ts
index dec2846f26..1db3e73284 100644
--- a/types/google-cloud__storage/google-cloud__storage-tests.ts
+++ b/types/google-cloud__storage/google-cloud__storage-tests.ts
@@ -26,7 +26,7 @@ import {
     WriteStreamOptions,
     UploadOptions
 } from "@google-cloud/storage";
-import CloudStorage = require("@google-cloud/storage");
+import Storage = require("@google-cloud/storage");
 
 /**
  * Test the storage service.
@@ -38,7 +38,7 @@ export class TestStorage {
     };
 
     // import Storage class
-    static gcs = CloudStorage();
+    static gcs = new Storage();
 
     constructor() {
         // nothing to do
@@ -204,7 +204,7 @@ export class TestFile {
     }
 
     /** Get a signed URL to allow limited time access to the file */
-    getSignedUrl(config?: SignedUrlConfig): Promise<[string]> {
+    getSignedUrl(config: SignedUrlConfig): Promise<[string]> {
         return this.file.getSignedUrl(config);
     }
 
@@ -263,3 +263,330 @@ testStorage.iam.setPolicy({
 testStorage.iam.testPermissions('storage.buckets.delete');
 
 testStorage.iam.testPermissions(['storage.buckets.delete', 'storage.buckets.get']);
+
+// Example from https://cloud.google.com/storage/docs/creating-buckets#storage-create-bucket-code_samples
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+
+    // Creates a new bucket
+    storage
+    .createBucket(bucketName, {
+        location: 'ASIA',
+        storageClass: 'COLDLINE',
+    })
+    .then(() => {
+        console.log(`Bucket ${bucketName} created.`);
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/listing-buckets#storage-list-buckets-nodejs
+{
+    // Creates a client
+    const storage = new Storage();
+
+    // Lists all buckets in the current project
+    storage
+    .getBuckets()
+    .then(results => {
+        const buckets = results[0];
+
+        console.log('Buckets:');
+        buckets.forEach(bucket => {
+        console.log(bucket.name);
+        });
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/moving-buckets#storage-create-bucket-nodejs
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+
+    // Creates a new bucket
+    storage
+    .createBucket(bucketName, {
+        location: 'ASIA',
+        storageClass: 'COLDLINE',
+    })
+    .then(() => {
+        console.log(`Bucket ${bucketName} created.`);
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/deleting-buckets
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+
+    // Deletes the bucket
+    storage
+    .bucket(bucketName)
+    .delete()
+    .then(() => {
+        console.log(`Bucket ${bucketName} deleted.`);
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/uploading-objects
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+    const filename = 'Local file to upload, e.g. ./local/path/to/file.txt';
+
+    // Uploads a local file to the bucket
+    storage
+    .bucket(bucketName)
+    .upload(filename, {
+        // Support for HTTP requests made with `Accept-Encoding: gzip`
+        gzip: true,
+        metadata: {
+        // Enable long-lived HTTP caching headers
+        // Use only if the contents of the file will never change
+        // (If the contents will change, use cacheControl: 'no-cache')
+        cacheControl: 'public, max-age=31536000',
+        },
+    })
+    .then(() => {
+        console.log(`${filename} uploaded to ${bucketName}.`);
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/listing-objects
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+
+    // Lists files in the bucket
+    storage
+    .bucket(bucketName)
+    .getFiles()
+    .then(results => {
+        const files = results[0];
+
+        console.log('Files:');
+        files.forEach(file => {
+        console.log(file.name);
+        });
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/listing-objects
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+    const prefix = 'Prefix by which to filter, e.g. public/';
+    const delimiter = 'Delimiter to use, e.g. /';
+
+    /**
+     * This can be used to list all blobs in a "folder", e.g. "public/".
+     *
+     * The delimiter argument can be used to restrict the results to only the
+     * "files" in the given "folder". Without the delimiter, the entire tree under
+     * the prefix is returned. For example, given these blobs:
+     *
+     *   /a/1.txt
+     *   /a/b/2.txt
+     *
+     * If you just specify prefix = '/a', you'll get back:
+     *
+     *   /a/1.txt
+     *   /a/b/2.txt
+     *
+     * However, if you specify prefix='/a' and delimiter='/', you'll get back:
+     *
+     *   /a/1.txt
+     */
+    const options = {
+        prefix,
+        delimiter
+    };
+
+    // Lists files in the bucket, filtered by a prefix
+    storage
+        .bucket(bucketName)
+        .getFiles(options)
+        .then(results => {
+            const files = results[0];
+
+            console.log('Files:');
+            files.forEach(file => {
+            console.log(file.name);
+            });
+        })
+        .catch(err => {
+            console.error('ERROR:', err);
+        });
+}
+
+// Example from https://cloud.google.com/storage/docs/downloading-objects#storage-download-object-nodejs
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+    const srcFilename = 'Remote file to download, e.g. file.txt';
+    const destFilename = 'Local destination for file, e.g. ./local/path/to/file.txt';
+
+    const options = {
+        // The path to which the file should be downloaded, e.g. "./file.txt"
+        destination: destFilename,
+    };
+
+    // Downloads the file
+    storage
+    .bucket(bucketName)
+    .file(srcFilename)
+    .download(options)
+    .then(() => {
+        console.log(
+        `gs://${bucketName}/${srcFilename} downloaded to ${destFilename}.`
+        );
+    })
+    .catch(err => {
+        console.error('ERROR:', err);
+    });
+}
+
+// Example from https://cloud.google.com/storage/docs/renaming-copying-moving-objects
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+    const srcFilename = 'File to move, e.g. file.txt';
+    const destFilename = 'Destination for file, e.g. moved.txt';
+
+    // Moves the file within the bucket
+    storage
+        .bucket(bucketName)
+        .file(srcFilename)
+        .move(destFilename)
+        .then(() => {
+            console.log(
+            `gs://${bucketName}/${srcFilename} moved to gs://${bucketName}/${destFilename}.`
+            );
+        })
+        .catch(err => {
+            console.error('ERROR:', err);
+        });
+}
+
+// Example from https://cloud.google.com/storage/docs/renaming-copying-moving-objects
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const srcBucketName = 'Name of the source bucket, e.g. my-bucket';
+    const srcFilename = 'Name of the source file, e.g. file.txt';
+    const destBucketName = 'Name of the destination bucket, e.g. my-other-bucket';
+    const destFilename = 'Destination name of file, e.g. file.txt';
+
+    // Copies the file to the other bucket
+    storage
+        .bucket(srcBucketName)
+        .file(srcFilename)
+        .copy(storage.bucket(destBucketName).file(destFilename))
+        .then(() => {
+            console.log(
+            `gs://${srcBucketName}/${srcFilename} copied to gs://${destBucketName}/${destFilename}.`
+            );
+        })
+        .catch(err => {
+            console.error('ERROR:', err);
+        });
+}
+
+// Example from https://cloud.google.com/storage/docs/viewing-editing-metadata
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+    const filename = 'File to access, e.g. file.txt';
+
+    // Gets the metadata for the file
+    storage
+        .bucket(bucketName)
+        .file(filename)
+        .getMetadata()
+        .then(results => {
+            const metadata = results[0];
+
+            console.log(`File: ${metadata.name}`);
+            console.log(`Bucket: ${metadata.bucket}`);
+            console.log(`Storage class: ${metadata.storageClass}`);
+            console.log(`Self link: ${metadata.selfLink}`);
+            console.log(`ID: ${metadata.id}`);
+            console.log(`Size: ${metadata.size}`);
+            console.log(`Updated: ${metadata.updated}`);
+            console.log(`Generation: ${metadata.generation}`);
+            console.log(`Metageneration: ${metadata.metageneration}`);
+            console.log(`Etag: ${metadata.etag}`);
+            console.log(`Owner: ${metadata.owner}`);
+            console.log(`Component count: ${metadata.component_count}`);
+            console.log(`Crc32c: ${metadata.crc32c}`);
+            console.log(`md5Hash: ${metadata.md5Hash}`);
+            console.log(`Cache-control: ${metadata.cacheControl}`);
+            console.log(`Content-type: ${metadata.contentType}`);
+            console.log(`Content-disposition: ${metadata.contentDisposition}`);
+            console.log(`Content-encoding: ${metadata.contentEncoding}`);
+            console.log(`Content-language: ${metadata.contentLanguage}`);
+            console.log(`Metadata: ${metadata.metadata}`);
+            console.log(`Media link: ${metadata.mediaLink}`);
+        })
+        .catch(err => {
+            console.error('ERROR:', err);
+        });
+}
+
+// Example from https://cloud.google.com/storage/docs/deleting-objects
+{
+    // Creates a client
+    const storage = new Storage();
+
+    const bucketName = 'Name of a bucket, e.g. my-bucket';
+    const filename = 'File to delete, e.g. file.txt';
+
+    // Deletes the file from the bucket
+    storage
+        .bucket(bucketName)
+        .file(filename)
+        .delete()
+        .then(() => {
+            console.log(`gs://${bucketName}/${filename} deleted.`);
+        })
+        .catch(err => {
+            console.error('ERROR:', err);
+        });
+}
diff --git a/types/google-cloud__storage/index.d.ts b/types/google-cloud__storage/index.d.ts
index a614ea4982..2053abcc62 100644
--- a/types/google-cloud__storage/index.d.ts
+++ b/types/google-cloud__storage/index.d.ts
@@ -1,12 +1,16 @@
-// Type definitions for @google-cloud/storage 1.1
-// Project: https://github.com/GoogleCloudPlatform/google-cloud-node/tree/master/packages/storage
+// Type definitions for @google-cloud/storage 1.7
+// Project: https://github.com/googleapis/nodejs-storage
 // Definitions by: Brian Love <https://github.com/blove>
 //                 Nathan Brooker Perry <https://github.com/nbperry>
+//                 Matt Welke <https://github.com/welkie>
+//                 Futa Ogawa <https://github.com/ogawa0071>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 /// <reference types="node" />
 
 import { ReadStream, WriteStream } from "fs";
+import { CoreOptions } from "request";
 
 type PromiseLibrary<T> = () => PromiseLike<T>;
 
@@ -17,7 +21,7 @@ declare namespace Storage {
     class Bucket {
         constructor(storage: Storage, name: string);
         acl: Acl;
-        combine(sources: string[] | File[], destination: string[] | File[]): Promise<[File, ApiResponse]>;
+        combine(sources: string[] | File[], destination: string | File): Promise<[File, ApiResponse]>;
         create(config?: BucketConfig): Promise<[Bucket, ApiResponse]>;
         createChannel(id: string, config: ChannelConfig): Promise<[Channel, ApiResponse]>;
         delete(): Promise<[ApiResponse]>;
@@ -51,6 +55,8 @@ declare namespace Storage {
         versioning?: {
             enabled?: boolean
         };
+        // Note: This is not documented, but it is used in examples (https://cloud.google.com/nodejs/docs/reference/storage/1.7.x/Storage)
+        storageClass?: 'COLDLINE' | 'DURABLE_REDUCED_AVAILABILITY' | 'MULTI_REGIONAL' | 'NEARLINE' | 'REGIONAL';
     }
 
     /**
@@ -98,10 +104,12 @@ declare namespace Storage {
     interface BucketQuery {
         autoPaginate?: boolean;
         delimiter?: string;
+        directory?: string;
         prefix?: string;
         maxApiCalls?: number;
         maxResults?: number;
         pageToken?: string;
+        userProject?: string;
         versions?: boolean;
     }
 
@@ -129,7 +137,7 @@ declare namespace Storage {
         get(): Promise<[File, ApiResponse]>;
         getMetadata(): Promise<[FileMetadata, ApiResponse]>;
         getSignedPolicy(options?: SignedPolicyOptions): Promise<[SignedPolicy]>;
-        getSignedUrl(config?: SignedUrlConfig): Promise<[string]>;
+        getSignedUrl(config: SignedUrlConfig): Promise<[string]>;
         makePrivate(options?: FilePrivateOptions): Promise<[ApiResponse]>;
         makePublic(): Promise<[ApiResponse]>;
         move(destination: string | Bucket | File): Promise<[File, ApiResponse]>;
@@ -140,20 +148,90 @@ declare namespace Storage {
         metadata?: FileMetadata;
     }
 
+    /**
+     * Access controls on the object, containing one or more objectAccessControls Resources.
+     */
+    interface AclFileMetadata {
+        bucket?: string;
+        domain?: string;
+        email?: string;
+        entity?: string;
+        entityId?: string;
+        etag?: string;
+        generation?: number;
+        id?: string;
+        kind?: string;
+        object?: string;
+        projectTeam?: ProjectTeam;
+        role?: string;
+        selfLink?: string;
+    }
+
+    /**
+     * The project team associated with the entity, if any.
+     */
+    interface ProjectTeam {
+        projectNumber?: string;
+        team?: string;
+    }
+
+    /**
+     * Metadata of customer-supplied encryption key, if the object is encrypted by such a key.
+     */
+    interface CustomerEncryption {
+        encryptionAlgorithm?: string;
+        keySha256?: string;
+    }
+
     /**
      * User-defined metadata.
      */
     interface CustomFileMetadata {
-        [key: string]: boolean | number | string | null;
+        [key: string]: string;
+    }
+
+    /**
+     * The owner of the object. This will always be the uploader of the object.
+     */
+    interface Owner {
+        entity?: string;
+        entityId?: string;
     }
 
     /**
      * File metadata.
      */
     interface FileMetadata {
-        contentType?: string;
-        metadata?: CustomFileMetadata;
+        acl?: AclFileMetadata[];
+        bucket?: string;
         cacheControl?: string;
+        componentCount?: number;
+        // Note: this property is accessed in one of the examples
+        component_count?: number;
+        contentDisposition?: string;
+        contentEncoding?: string;
+        contentLanguage?: string;
+        contentType?: string;
+        crc32c?: string;
+        customerEncryption?: CustomerEncryption;
+        etag?: string;
+        generation?: number;
+        id?: string;
+        kind?: string;
+        kmsKeyName?: string;
+        md5Hash?: string;
+        mediaLink?: string;
+        metadata?: CustomFileMetadata;
+        metageneration?: number;
+        name?: string;
+        owner?: Owner;
+        selfLink?: string;
+        size?: null | number;
+        storageClass?: string;
+        timeCreated?: string;
+        timeDeleted?: string;
+        timeStorageClassUpdated?: string;
+        updated?: string;
     }
 
     /**
@@ -195,7 +273,7 @@ declare namespace Storage {
         cname?: string;
         contentMd5?: string;
         contentType?: string;
-        expires?: number | string;
+        expires: any;
         extensionHeaders?: { [key: string]: string };
         promptSaveAs?: string;
         responseDisposition?: string;
@@ -312,40 +390,29 @@ declare namespace Storage {
      * Options when uploading file to bucket.
      */
     interface UploadOptions extends WriteStreamOptions {
-        destination?: string;
+        destination?: string | File;
+        encryptionKey?: string;
+        kmsKeyName?: string;
+        requestOptions?: CoreOptions;
     }
 
     /**
      * Options when writing to a file stream.
      */
     interface WriteStreamOptions {
-        gzip?: boolean;
+        contentType?: string;
+        gzip?: string | boolean;
         metadata?: FileMetadata;
-        offset?: number;
+        offset?: string;
         predefinedAcl?: string;
         private?: boolean;
         public?: boolean;
         resumable?: boolean;
         uri?: string;
+        userProject?: string;
         validation?: string | boolean;
     }
 
-    /**
-     * The Storage class allows you interact with Google Cloud Storage.
-     */
-    class Storage {
-        constructor(config?: ConfigurationObject);
-        acl: Acl;
-        bucket(name: string | Bucket): Bucket;
-        channel(id: string, resourceId: string): Channel;
-        createBucket(name: string, metadata?: BucketConfig): Promise<[Bucket, ApiResponse]>;
-        getBuckets(query?: BucketQuery): Promise<[Bucket[]]>;
-        getBucketsStream(query?: BucketQuery): Promise<[ReadStream]>;
-        Channel: (storage: Storage, id: string, resourceId: string) => Channel;
-        File: (bucket: Bucket, name: string, opts: BucketFileOptions) => File;
-        Bucket: (storage: Storage, name: string) => Bucket;
-    }
-
     /**
      * This class allows you interact with Google Cloud Storage.
      */
@@ -383,6 +450,20 @@ declare namespace Storage {
     }
 }
 
-declare function Storage(config?: Storage.ConfigurationObject): Storage.Storage;
+/**
+ * The Storage class allows you interact with Google Cloud Storage.
+ */
+declare class Storage {
+    constructor(config?: Storage.ConfigurationObject);
+    acl: Storage.Acl;
+    bucket(name: string | Storage.Bucket): Storage.Bucket;
+    channel(id: string, resourceId: string): Storage.Channel;
+    createBucket(name: string, metadata?: Storage.BucketConfig): Promise<[Storage.Bucket, Storage.ApiResponse]>;
+    getBuckets(query?: Storage.BucketQuery): Promise<[Storage.Bucket[]]>;
+    getBucketsStream(query?: Storage.BucketQuery): Promise<[ReadStream]>;
+    Channel: (storage: Storage, id: string, resourceId: string) => Storage.Channel;
+    File: (bucket: Storage.Bucket, name: string, opts: Storage.BucketFileOptions) => Storage.File;
+    Bucket: (storage: Storage, name: string) => Storage.Bucket;
+}
 
 export = Storage;
diff --git a/types/google-map-react/index.d.ts b/types/google-map-react/index.d.ts
index ca5348323a..b77c481dd9 100644
--- a/types/google-map-react/index.d.ts
+++ b/types/google-map-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/istarkov/google-map-react
 // Definitions by: Honza Brecka <https://github.com/honzabrecka>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -131,6 +131,7 @@ export interface Props {
   onChildClick?(hoverKey: any, childProps: any): void;
   onChildMouseEnter?(hoverKey: any, childProps: any): void;
   onChildMouseLeave?(hoverKey: any, childProps: any): void;
+  onDrag?(args: any): void;
   onZoomAnimationStart?(args: any): void;
   onZoomAnimationEnd?(args: any): void;
   onMapTypeIdChange?(args: any): void;
diff --git a/types/google.picker/index.d.ts b/types/google.picker/index.d.ts
index b5fc91404d..9a0c95f920 100644
--- a/types/google.picker/index.d.ts
+++ b/types/google.picker/index.d.ts
@@ -83,7 +83,7 @@ declare namespace google {
          */
         export interface Picker {
             isVisible(): boolean;
-            setCallback():Picker;
+            setCallback(method:Function):Picker;
             setRelayUrl(url:string):Picker;
             setVisible(visible:boolean):Picker;
         }
diff --git a/types/google.visualization/index.d.ts b/types/google.visualization/index.d.ts
index a94ca8dc90..6f36ff881a 100644
--- a/types/google.visualization/index.d.ts
+++ b/types/google.visualization/index.d.ts
@@ -20,6 +20,7 @@ declare namespace google {
 
         export interface ChartSpecs {
             chartType: string;
+            container?: HTMLElement;
             containerId?: string;
             options?: Object;
             dataTable?: Object;
@@ -87,7 +88,7 @@ declare namespace google {
             getColumnProperties(columnIndex: number): Properties;
             getColumnProperty(columnIndex: number, name: string): any;
             getColumnRange(columnIndex: number): { min: any; max: any };
-            getColumnRole(columnIndex: string): string;
+            getColumnRole(columnIndex: number): string;
             getColumnType(columnIndex: number): string;
             getDistinctValues(columnIndex: number): any[];
             getFilteredRows(filters: DataTableCellFilter[]): number[];
diff --git a/types/googlemaps/googlemaps-tests.ts b/types/googlemaps/googlemaps-tests.ts
index 561e53f91a..e161e8068e 100644
--- a/types/googlemaps/googlemaps-tests.ts
+++ b/types/googlemaps/googlemaps-tests.ts
@@ -60,6 +60,33 @@ map.fitBounds({
     top: 50
 });
 
+/***** Pan map to bounds *****/
+map.panToBounds({
+    north: 10,
+    east: 10,
+    west: 10,
+    south: 10
+})
+
+map.panToBounds({
+    north: 10,
+    east: 10,
+    west: 10,
+    south: 10
+}, 50)
+
+map.panToBounds({
+    east: 10,
+    north: 10,
+    south: 10,
+    west: 10
+}, {
+    bottom: 100,
+    left: 150,
+    right: 150,
+    top: 50
+});
+
 
 /***** Data *****/
 
@@ -385,3 +412,29 @@ heatmap.setData([
     { weight: 1, location: new google.maps.LatLng(37.782551, -122.445368) },
     { weight: 2, location: new google.maps.LatLng(37.782745, -122.444586) }
 ]);
+
+/***** google.maps.places.PlacesService *****/
+let service = new google.maps.places.PlacesService(new HTMLDivElement());
+
+service.getDetails({
+    placeId: '-a1',
+    fields: ['name'],
+    sessionToken: new google.maps.places.AutocompleteSessionToken()
+}, (result, status) => {
+    if (status === google.maps.places.PlacesServiceStatus.NOT_FOUND) {
+        return;
+    }
+
+    result.name; // $ExpectType string
+})
+
+service.findPlaceFromQuery({
+    query: 'Big Ben London',
+    fields: ['name']
+}, (results, status) => {
+    if (status === google.maps.places.PlacesServiceStatus.ERROR) {
+        return;
+    }
+
+    results[0].name; // $ExpectType string
+});
diff --git a/types/googlemaps/index.d.ts b/types/googlemaps/index.d.ts
index 9430698fe6..dba5a5a5a1 100644
--- a/types/googlemaps/index.d.ts
+++ b/types/googlemaps/index.d.ts
@@ -1,14 +1,15 @@
 // 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>
 //                  Umar Bolatov <https://github.com/bolatovumar>
+//                  Michael Gauthier <https://github.com/gauthierm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /*
@@ -51,7 +52,7 @@ declare namespace google.maps {
         getZoom(): number;
         panBy(x: number, y: number): void;
         panTo(latLng: LatLng|LatLngLiteral): void;
-        panToBounds(latLngBounds: LatLngBounds|LatLngBoundsLiteral): void;
+        panToBounds(latLngBounds: LatLngBounds|LatLngBoundsLiteral, padding?: number|Padding): void;
         setCenter(latlng: LatLng|LatLngLiteral): void;
         setHeading(heading: number): void;
         setMapTypeId(mapTypeId: MapTypeId|string): void;
@@ -1106,6 +1107,13 @@ declare namespace google.maps {
         zIndex?: number;
     }
 
+    export interface CircleLiteral extends CircleOptions {
+        /** The center of the Circle. */
+        center?: LatLng|LatLngLiteral;
+        /** The radius in meters on the Earth's surface. */
+        radius?: number;
+    }
+
     /**
      * The possible positions of the stroke on a polygon.
      */
@@ -2535,6 +2543,10 @@ declare namespace google.maps {
             getQueryPredictions(request: QueryAutocompletionRequest, callback: (result: QueryAutocompletePrediction[], status: PlacesServiceStatus) => void): void;
         }
 
+        export class AutocompleteSessionToken {
+            constructor();
+        }
+
         export interface AutocompletionRequest {
             bounds?: LatLngBounds|LatLngBoundsLiteral;
             componentRestrictions?: ComponentRestrictions;
@@ -2542,6 +2554,7 @@ declare namespace google.maps {
             location?: LatLng;
             offset?: number;
             radius?: number;
+            sessionToken?: AutocompleteSessionToken;
             types?: string[];
         }
 
@@ -2549,6 +2562,8 @@ declare namespace google.maps {
             country: string|string[];
         }
 
+        export type LocationBias = LatLng|LatLngLiteral|LatLngBounds|LatLngBoundsLiteral|Circle|CircleLiteral|string;
+
         export interface PlaceAspectRating {
             rating: number;
             type: string;
@@ -2556,6 +2571,8 @@ declare namespace google.maps {
 
         export interface PlaceDetailsRequest  {
             placeId: string;
+            fields?: string[];
+            sessionToken?: AutocompleteSessionToken;
         }
 
         export interface PlaceGeometry {
@@ -2629,16 +2646,21 @@ declare namespace google.maps {
 
         export class PlacesService {
             constructor(attrContainer: HTMLDivElement|Map);
+            findPlaceFromPhoneNumber(request: FindPlaceFromPhoneNumberRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
+            findPlaceFromQuery(request: FindPlaceFromQueryRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
             getDetails(request: PlaceDetailsRequest, callback: (result: PlaceResult, status: PlacesServiceStatus) => void): void;
             nearbySearch(request: PlaceSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
+            /** @deprecated Radar search is deprecated as of June 30, 2018. After that time, this feature will no longer be available. */
             radarSearch(request: RadarSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus) => void): void;
             textSearch(request: TextSearchRequest, callback: (results: PlaceResult[], status: PlacesServiceStatus, pagination: PlaceSearchPagination) => void): void;
         }
 
         export enum PlacesServiceStatus {
+            ERROR,
             INVALID_REQUEST,
             OK,
             OVER_QUERY_LIMIT,
+            NOT_FOUND,
             REQUEST_DENIED,
             UNKNOWN_ERROR,
             ZERO_RESULTS
@@ -2693,6 +2715,18 @@ declare namespace google.maps {
             types?: string[]; /* Deprecated. Will be removed February 16, 2017 */
             type?: string;
         }
+
+        export interface FindPlaceFromQueryRequest {
+            fields: string[];
+            locationBias?: LocationBias;
+            query: string;
+        }
+
+        export interface FindPlaceFromPhoneNumberRequest {
+            fields: string[];
+            locationBias?: LocationBias;
+            query: string;
+        }
     }
 
     /***** Drawing Library *****/
diff --git a/types/googlepay/googlepay-tests.ts b/types/googlepay/googlepay-tests.ts
index ea97c2a586..4897dd3c80 100644
--- a/types/googlepay/googlepay-tests.ts
+++ b/types/googlepay/googlepay-tests.ts
@@ -26,10 +26,13 @@ function onGooglePayLoaded() {
 }
 
 function addGooglePayButton() {
-    const button = document.createElement('button');
-    button.className = 'google-pay';
-    button.appendChild(document.createTextNode('Google Pay'));
-    button.addEventListener('click', onGooglePaymentButtonClick);
+    const buttonOptions: google.payments.api.ButtonOptions = {
+        onClick: onGooglePaymentButtonClick,
+        buttonColor: 'black',
+        buttonType: 'short',
+    };
+    const client = getGooglePaymentsClient();
+    const button = client.createButton(buttonOptions);
     document.appendChild(document.createElement('div').appendChild(button));
 }
 
diff --git a/types/googlepay/index.d.ts b/types/googlepay/index.d.ts
index 524c277691..4e700d695d 100644
--- a/types/googlepay/index.d.ts
+++ b/types/googlepay/index.d.ts
@@ -1,12 +1,15 @@
-// Type definitions for Google Pay API 0.0
+// Type definitions for Google Pay API 0.1
 // Project: https://developers.google.com/pay/api/web/setup/
-// Definitions by: Florian Luccioni <https://github.com/Fluccioni>
+// Definitions by: Florian Luccioni <https://github.com/Fluccioni>,
+//                 Radu Raicea <https://github.com/Radu-Raicea>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace google.payments.api {
     type AddressFormat = 'FULL' | 'MIN';
     type AllowedCardNetwork = 'AMEX' | 'DISCOVER' | 'JCB' | 'MASTERCARD' | 'VISA';
     type AllowedPaymentMethod = 'CARD' | 'TOKENIZED_CARD';
+    type ButtonColor = 'default' | 'black' | 'white';
+    type ButtonType = 'long' | 'short';
     type CardClass = 'CREDIT' | 'DEBIT';
     type CardInfo = CardInfoMin | CardInfoFull;
     type CardRequirements = CardRequirementsMin | CardRequirementsFull;
@@ -19,6 +22,12 @@ declare namespace google.payments.api {
     type PaymentDataRequest = PaymentDataRequestMin | PaymentDataRequestFull;
     type PaymentData = PaymentDataMin | PaymentDataFull;
 
+    interface ButtonOptions {
+        onClick: EventListener;
+        buttonColor?: ButtonColor;
+        buttonType?: ButtonType;
+    }
+
     interface PaymentOptions {
         environment?: EnvironmentType;
     }
@@ -151,6 +160,7 @@ declare namespace google.payments.api {
 
     class PaymentsClient {
         constructor(paymentOptions: PaymentOptions);
+        createButton(request: ButtonOptions): HTMLElement;
         isReadyToPay(request: IsReadyToPayRequest): Promise<{result: boolean}>;
         loadPaymentData(request: PaymentDataRequestMin): Promise<PaymentDataMin>;
         loadPaymentData(request: PaymentDataRequestFull): Promise<PaymentDataFull>;
diff --git a/types/got/index.d.ts b/types/got/index.d.ts
index f786af118e..86a3d42131 100644
--- a/types/got/index.d.ts
+++ b/types/got/index.d.ts
@@ -100,6 +100,7 @@ declare namespace got {
     }
 
     interface GotJSONOptions extends GotOptions<string | null> {
+        // Body must be an object or array. See https://github.com/sindresorhus/got/issues/511
         body?: object;
         form?: boolean;
         json: true;
diff --git a/types/gradient-string/gradient-string-tests.ts b/types/gradient-string/gradient-string-tests.ts
new file mode 100644
index 0000000000..7216a0862f
--- /dev/null
+++ b/types/gradient-string/gradient-string-tests.ts
@@ -0,0 +1,42 @@
+import tinycolor = require('tinycolor2');
+import gradient = require('gradient-string');
+
+// $ExpectType string
+gradient('cyan', 'pink')('Hello world!');
+
+// $ExpectType Gradient
+gradient('red', 'green', 'blue');
+// $ExpectType Gradient
+gradient(['#FF0000', '#00FF00', '#0000FF']);
+
+// $ExpectType Gradient
+gradient([
+    tinycolor('#FFBB65'),       // tinycolor object
+    {r: 0, g: 255, b: 0},       // RGB object
+    {h: 240, s: 1, v: 1, a: 1}, // HSVa object
+    'rgb(120, 120, 0)',         // RGB CSS string
+    'gold'                      // named color
+]);
+
+// $ExpectType string
+gradient.rainbow('I love gradient-strings!');
+
+// $ExpectType string
+gradient('orange', 'yellow').multiline([
+    "  __",
+    "<(o )___",
+    " ( ._> /",
+    "  `---'",
+].join('\n'));
+
+// $ExpectType string
+gradient.atlas.multiline('Multi line\nstring');
+// $ExpectType string
+gradient('cyan', 'pink').multiline('Multi line\nstring', {interpolation: 'hsv'});
+
+// $ExpectType Gradient
+gradient([
+    {color: '#d8e0de', pos: 0},
+    {color: '#255B53', pos: 0.8},
+    {color: '#000000', pos: 1},
+]);
diff --git a/types/gradient-string/index.d.ts b/types/gradient-string/index.d.ts
new file mode 100644
index 0000000000..0191700b19
--- /dev/null
+++ b/types/gradient-string/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for gradient-string 1.1
+// Project: https://github.com/bokub/gradient-string
+// Definitions by: Junyoung Clare Jang <https://github.com/Ailrun>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import tinycolor = require('tinycolor2');
+
+declare namespace gradient {
+    interface PositionedColorInput {
+        color: tinycolor.ColorInput;
+        pos: number;
+    }
+
+    interface Gradient {
+        (message?: string, opt?: Options): string;
+        multiline(message?: string, opt?: Options): string;
+    }
+
+    interface Options {
+        interpolation?: string;
+        hsvSpin?: string;
+    }
+
+    const atlas: Gradient;
+	const cristal: Gradient;
+	const teen: Gradient;
+	const mind: Gradient;
+	const morning: Gradient;
+	const vice: Gradient;
+	const passion: Gradient;
+	const fruit: Gradient;
+	const instagram: Gradient;
+	const retro: Gradient;
+	const summer: Gradient;
+	const rainbow: Gradient;
+    const pastel: Gradient;
+}
+
+declare function gradient(colors: tinycolor.ColorInput[] | gradient.PositionedColorInput[]): gradient.Gradient;
+declare function gradient(...colors: tinycolor.ColorInput[]): gradient.Gradient;
+declare function gradient(...colors: gradient.PositionedColorInput[]): gradient.Gradient;
+export = gradient;
diff --git a/types/gradient-string/tsconfig.json b/types/gradient-string/tsconfig.json
new file mode 100644
index 0000000000..d0e3833686
--- /dev/null
+++ b/types/gradient-string/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",
+        "gradient-string-tests.ts"
+    ]
+}
diff --git a/types/gradient-string/tslint.json b/types/gradient-string/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/gradient-string/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/gramps__rest-helpers/gramps__rest-helpers-tests.ts b/types/gramps__rest-helpers/gramps__rest-helpers-tests.ts
new file mode 100644
index 0000000000..cbb74725ca
--- /dev/null
+++ b/types/gramps__rest-helpers/gramps__rest-helpers-tests.ts
@@ -0,0 +1,16 @@
+import { GraphQLConnector, GraphQLModel } from '@gramps/rest-helpers';
+
+const myConnector = new GraphQLConnector();
+
+myConnector.apiBaseUri = "some uri";
+myConnector.headers = {};
+myConnector.cacheExpiry = 300;
+myConnector.enableCache = true;
+myConnector.redis = false;
+
+myConnector.get("someurl");
+myConnector.post("someendpoint", {}, {}).then(() => {});
+myConnector.put("someendpoint", {}, {}).then(() => {});
+myConnector.delete("someendpoint", {}).then(() => {});
+
+const myModel = new GraphQLModel(myConnector);
diff --git a/types/gramps__rest-helpers/index.d.ts b/types/gramps__rest-helpers/index.d.ts
new file mode 100644
index 0000000000..4fb7e32a27
--- /dev/null
+++ b/types/gramps__rest-helpers/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for @gramps/rest-helpers 1.1
+// Project: https://github.com/gramps-graphql/rest-helpers
+// Definitions by: Claude Ciocan <https://github.com/claude>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export class GraphQLConnector {
+    constructor();
+
+    apiBaseUri: string;
+    headers: object;
+    request: any;
+    cacheExpiry: number;
+    enableCache: boolean;
+    redis: boolean;
+    get(endpoint: string): Promise<any>;
+    post(endpoint: string, body: object, options: object): Promise<any>;
+    put(endpoint: string, body: object, options: object): Promise<any>;
+    delete(endpoint: string, options: object): Promise<any>;
+}
+
+export class GraphQLModel {
+    connector: GraphQLConnector;
+
+    constructor({});
+}
diff --git a/types/gramps__rest-helpers/tsconfig.json b/types/gramps__rest-helpers/tsconfig.json
new file mode 100644
index 0000000000..03402cad31
--- /dev/null
+++ b/types/gramps__rest-helpers/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,
+        "paths": {
+            "@gramps/rest-helpers": [
+                "gramps__rest-helpers"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "gramps__rest-helpers-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/gramps__rest-helpers/tslint.json b/types/gramps__rest-helpers/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/gramps__rest-helpers/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
index 9043cdaf0e..51f8964423 100644
--- a/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
+++ b/types/graphql-resolve-batch/graphql-resolve-batch-tests.ts
@@ -95,13 +95,15 @@ const withSourceAndArgsAndContextTyped = createBatchResolver<
     SomeTestResult,
     SomeTestArgs,
     SomeTestContext
->(async (sources, args, context) => {
+>(async (sources, args, context, info) => {
     // $ExpectType ReadonlyArray<SomeTestSource>
     const verifySources = sources;
     // $ExpectType string
     const verifyArgs = args.someArg;
     // $ExpectType string
     const verifyContext = context.someContextProp;
+    // $ExpectType GraphQLResolveInfo
+    const verifyInfo = info;
 
     const result = await asyncBatchFunction(sources);
     return result;
diff --git a/types/graphql-resolve-batch/index.d.ts b/types/graphql-resolve-batch/index.d.ts
index ea90a83555..9908b7082a 100644
--- a/types/graphql-resolve-batch/index.d.ts
+++ b/types/graphql-resolve-batch/index.d.ts
@@ -4,6 +4,8 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+import { GraphQLResolveInfo } from 'graphql';
+
 /**
  * Creates a GraphQL.js field resolver that batches together multiple resolves
  * together that share the *exact* same GraphQL field selection.
@@ -45,5 +47,6 @@ export type ResolverFunction<TSource, TArgs, TContext, TReturn> = (
 export type BatchResolveFunction<TSource, TArgs, TContext, TReturn> = (
     sources: ReadonlyArray<TSource>,
     args: TArgs,
-    context: TContext
+    context: TContext,
+    info: GraphQLResolveInfo
 ) => TReturn[] | Promise<TReturn[]>;
diff --git a/types/graphql/execution/execute.d.ts b/types/graphql/execution/execute.d.ts
index 1b0eccbd92..fc6ad898d1 100644
--- a/types/graphql/execution/execute.d.ts
+++ b/types/graphql/execution/execute.d.ts
@@ -36,15 +36,19 @@ export interface ExecutionContext {
     errors: GraphQLError[];
 }
 
+export interface ExecutionResultDataDefault {
+    [key: string]: any
+}
+
 /**
  * The result of GraphQL execution.
  *
  *   - `errors` is included when any errors occurred as a non-empty array.
  *   - `data` is the result of a successful execution of the query.
  */
-export interface ExecutionResult {
+export interface ExecutionResult<TData = ExecutionResultDataDefault> {
     errors?: ReadonlyArray<GraphQLError>;
-    data?: { [key: string]: any };
+    data?: TData;
 }
 
 export type ExecutionArgs = {
@@ -69,8 +73,8 @@ export type ExecutionArgs = {
  *
  * Accepts either an object with named arguments, or individual arguments.
  */
-export function execute(args: ExecutionArgs): MaybePromise<ExecutionResult>;
-export function execute(
+export function execute<TData = ExecutionResultDataDefault>(args: ExecutionArgs): MaybePromise<ExecutionResult<TData>>;
+export function execute<TData = ExecutionResultDataDefault>(
     schema: GraphQLSchema,
     document: DocumentNode,
     rootValue?: any,
@@ -78,7 +82,7 @@ export function execute(
     variableValues?: Maybe<{ [key: string]: any }>,
     operationName?: Maybe<string>,
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
-): MaybePromise<ExecutionResult>;
+): MaybePromise<ExecutionResult<TData>>;
 
 /**
  * Given a ResponsePath (found in the `path` entry in the information provided
@@ -89,6 +93,7 @@ export function responsePathAsArray(path: ResponsePath): ReadonlyArray<string |
 /**
  * Given a ResponsePath and a key, return a new ResponsePath containing the
  * new key.
+
  */
 export function addPath(
     prev: ResponsePath | undefined,
diff --git a/types/graphql/graphql-tests.ts b/types/graphql/graphql-tests.ts
index 7c0210249b..e75fecb329 100644
--- a/types/graphql/graphql-tests.ts
+++ b/types/graphql/graphql-tests.ts
@@ -1,4 +1,4 @@
-import * as graphql from 'graphql';
+import { assertInputType, isInputType, isOutputType } from 'graphql';
 
 ///////////////////////////
 // graphql               //
@@ -50,7 +50,10 @@ function language_visitor_tests() {
 // graphql/type          //
 ///////////////////////////
 function type_definition_tests() {
-    // TODO
+    isInputType(null);
+    isOutputType(null);
+
+    assertInputType(null);
 }
 
 function type_directives_tests() {
diff --git a/types/graphql/graphql.d.ts b/types/graphql/graphql.d.ts
index 59dc3918f1..0b3d52b2d7 100644
--- a/types/graphql/graphql.d.ts
+++ b/types/graphql/graphql.d.ts
@@ -2,7 +2,7 @@ import Maybe from "./tsutils/Maybe";
 import { Source } from "./language/source";
 import { GraphQLFieldResolver } from "./type/definition";
 import { GraphQLSchema } from "./type/schema";
-import { ExecutionResult } from "./execution/execute";
+import { ExecutionResult, ExecutionResultDataDefault } from "./execution/execute";
 
 /**
  * This is the primary entry point function for fulfilling GraphQL operations
@@ -44,8 +44,8 @@ export interface GraphQLArgs {
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
 }
 
-export function graphql(args: GraphQLArgs): Promise<ExecutionResult>;
-export function graphql(
+export function graphql<TData = ExecutionResultDataDefault>(args: GraphQLArgs): Promise<ExecutionResult<TData>>;
+export function graphql<TData = ExecutionResultDataDefault>(
     schema: GraphQLSchema,
     source: Source | string,
     rootValue?: any,
@@ -53,7 +53,7 @@ export function graphql(
     variableValues?: Maybe<{ [key: string]: any }>,
     operationName?: Maybe<string>,
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
-): Promise<ExecutionResult>;
+): Promise<ExecutionResult<TData>>;
 
 /**
  * The graphqlSync function also fulfills GraphQL operations by parsing,
@@ -61,8 +61,8 @@ export function graphql(
  * However, it guarantees to complete synchronously (or throw an error) assuming
  * that all field resolvers are also synchronous.
  */
-export function graphqlSync(args: GraphQLArgs): ExecutionResult;
-export function graphqlSync(
+export function graphqlSync<TData = ExecutionResultDataDefault>(args: GraphQLArgs): ExecutionResult<TData>;
+export function graphqlSync<TData = ExecutionResultDataDefault>(
     schema: GraphQLSchema,
     source: Source | string,
     rootValue?: any,
@@ -70,4 +70,4 @@ export function graphqlSync(
     variableValues?: Maybe<{ [key: string]: any }>,
     operationName?: Maybe<string>,
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
-): ExecutionResult;
+): ExecutionResult<TData>;
diff --git a/types/graphql/index.d.ts b/types/graphql/index.d.ts
index c4a425a541..5a4e0d77d6 100644
--- a/types/graphql/index.d.ts
+++ b/types/graphql/index.d.ts
@@ -14,6 +14,7 @@
 //                 Alessio Dionisi <https://github.com/adnsio>
 //                 Divyendu Singh <https://github.com/divyenduz>
 //                 Brad Zacher <https://github.com/bradzacher>
+//                 Curtis Layne <https://github.com/clayne11>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/graphql/subscription/subscribe.d.ts b/types/graphql/subscription/subscribe.d.ts
index f5b29ebbb8..b58c36bd8a 100644
--- a/types/graphql/subscription/subscribe.d.ts
+++ b/types/graphql/subscription/subscribe.d.ts
@@ -2,7 +2,7 @@ import Maybe from "../tsutils/Maybe";
 import { GraphQLSchema } from "../type/schema";
 import { DocumentNode } from "../language/ast";
 import { GraphQLFieldResolver } from "../type/definition";
-import { ExecutionResult } from "../execution/execute";
+import { ExecutionResult, ExecutionResultDataDefault } from "../execution/execute";
 
 /**
  * Implements the "Subscribe" algorithm described in the GraphQL specification.
@@ -24,7 +24,7 @@ import { ExecutionResult } from "../execution/execute";
  *
  * Accepts either an object with named arguments, or individual arguments.
  */
-export function subscribe(args: {
+export function subscribe<TData = ExecutionResultDataDefault>(args: {
     schema: GraphQLSchema;
     document: DocumentNode;
     rootValue?: any;
@@ -33,9 +33,9 @@ export function subscribe(args: {
     operationName?: Maybe<string>;
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
     subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>;
-}): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
+}): Promise<AsyncIterator<ExecutionResult<TData>> | ExecutionResult<TData>>;
 
-export function subscribe(
+export function subscribe<TData = ExecutionResultDataDefault>(
     schema: GraphQLSchema,
     document: DocumentNode,
     rootValue?: any,
@@ -44,7 +44,7 @@ export function subscribe(
     operationName?: Maybe<string>,
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>,
     subscribeFieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
-): Promise<AsyncIterator<ExecutionResult> | ExecutionResult>;
+): Promise<AsyncIterator<ExecutionResult<TData>> | ExecutionResult<TData>>;
 
 /**
  * Implements the "CreateSourceEventStream" algorithm described in the
@@ -64,7 +64,7 @@ export function subscribe(
  * or otherwise separating these two steps. For more on this, see the
  * "Supporting Subscriptions at Scale" information in the GraphQL specification.
  */
-export function createSourceEventStream(
+export function createSourceEventStream<TData = ExecutionResultDataDefault>(
     schema: GraphQLSchema,
     document: DocumentNode,
     rootValue?: any,
@@ -72,4 +72,4 @@ export function createSourceEventStream(
     variableValues?: { [key: string]: any },
     operationName?: Maybe<string>,
     fieldResolver?: Maybe<GraphQLFieldResolver<any, any>>
-): Promise<AsyncIterable<any> | ExecutionResult>;
+): Promise<AsyncIterable<any> | ExecutionResult<TData>>;
diff --git a/types/graphql/type/definition.d.ts b/types/graphql/type/definition.d.ts
index afb19eb7d2..52d7e7f935 100644
--- a/types/graphql/type/definition.d.ts
+++ b/types/graphql/type/definition.d.ts
@@ -40,37 +40,37 @@ export function isType(type: any): type is GraphQLType;
 
 export function assertType(type: any): GraphQLType;
 
-export function isScalarType(type: GraphQLType): type is GraphQLScalarType;
+export function isScalarType(type: any): type is GraphQLScalarType;
 
-export function assertScalarType(type: GraphQLType): GraphQLScalarType;
+export function assertScalarType(type: any): GraphQLScalarType;
 
-export function isObjectType(type: GraphQLType): type is GraphQLObjectType;
+export function isObjectType(type: any): type is GraphQLObjectType;
 
-export function assertObjectType(type: GraphQLType): GraphQLObjectType;
+export function assertObjectType(type: any): GraphQLObjectType;
 
-export function isInterfaceType(type: GraphQLType): type is GraphQLInterfaceType;
+export function isInterfaceType(type: any): type is GraphQLInterfaceType;
 
-export function assertInterfaceType(type: GraphQLType): GraphQLInterfaceType;
+export function assertInterfaceType(type: any): GraphQLInterfaceType;
 
-export function isUnionType(type: GraphQLType): type is GraphQLUnionType;
+export function isUnionType(type: any): type is GraphQLUnionType;
 
-export function assertUnionType(type: GraphQLType): GraphQLUnionType;
+export function assertUnionType(type: any): GraphQLUnionType;
 
-export function isEnumType(type: GraphQLType): type is GraphQLEnumType;
+export function isEnumType(type: any): type is GraphQLEnumType;
 
-export function assertEnumType(type: GraphQLType): GraphQLEnumType;
+export function assertEnumType(type: any): GraphQLEnumType;
 
-export function isInputObjectType(type: GraphQLType): type is GraphQLInputObjectType;
+export function isInputObjectType(type: any): type is GraphQLInputObjectType;
 
-export function assertInputObjectType(type: GraphQLType): GraphQLInputObjectType;
+export function assertInputObjectType(type: any): GraphQLInputObjectType;
 
-export function isListType(type: GraphQLType): type is GraphQLList<any>;
+export function isListType(type: any): type is GraphQLList<any>;
 
-export function assertListType(type: GraphQLType): GraphQLList<any>;
+export function assertListType(type: any): GraphQLList<any>;
 
-export function isNonNullType(type: GraphQLType): type is GraphQLNonNull<any>;
+export function isNonNullType(type: any): type is GraphQLNonNull<any>;
 
-export function assertNonNullType(type: GraphQLType): GraphQLNonNull<any>;
+export function assertNonNullType(type: any): GraphQLNonNull<any>;
 
 /**
  * These types may be used as input types for arguments and directives.
@@ -82,9 +82,9 @@ export type GraphQLInputType =
     | GraphQLList<any>
     | GraphQLNonNull<GraphQLScalarType | GraphQLEnumType | GraphQLInputObjectType | GraphQLList<any>>;
 
-export function isInputType(type: GraphQLType): type is GraphQLInputType;
+export function isInputType(type: any): type is GraphQLInputType;
 
-export function assertInputType(type: GraphQLType): GraphQLInputType;
+export function assertInputType(type: any): GraphQLInputType;
 
 /**
  * These types may be used as output types as the result of fields.
@@ -105,36 +105,36 @@ export type GraphQLOutputType =
           | GraphQLList<any>
       >;
 
-export function isOutputType(type: GraphQLType): type is GraphQLOutputType;
+export function isOutputType(type: any): type is GraphQLOutputType;
 
-export function assertOutputType(type: GraphQLType): GraphQLOutputType;
+export function assertOutputType(type: any): GraphQLOutputType;
 
 /**
  * These types may describe types which may be leaf values.
  */
 export type GraphQLLeafType = GraphQLScalarType | GraphQLEnumType;
 
-export function isLeafType(type: GraphQLType): type is GraphQLLeafType;
+export function isLeafType(type: any): type is GraphQLLeafType;
 
-export function assertLeafType(type: GraphQLType): GraphQLLeafType;
+export function assertLeafType(type: any): GraphQLLeafType;
 
 /**
  * These types may describe the parent context of a selection set.
  */
 export type GraphQLCompositeType = GraphQLObjectType | GraphQLInterfaceType | GraphQLUnionType;
 
-export function isCompositeType(type: GraphQLType): type is GraphQLCompositeType;
+export function isCompositeType(type: any): type is GraphQLCompositeType;
 
-export function assertCompositeType(type: GraphQLType): GraphQLCompositeType;
+export function assertCompositeType(type: any): GraphQLCompositeType;
 
 /**
  * These types may describe the parent context of a selection set.
  */
 export type GraphQLAbstractType = GraphQLInterfaceType | GraphQLUnionType;
 
-export function isAbstractType(type: GraphQLType): type is GraphQLAbstractType;
+export function isAbstractType(type: any): type is GraphQLAbstractType;
 
-export function assertAbstractType(type: GraphQLType): GraphQLAbstractType;
+export function assertAbstractType(type: any): GraphQLAbstractType;
 
 /**
  * List Modifier
@@ -192,9 +192,9 @@ export class GraphQLNonNull<T extends GraphQLNullableType> {
 
 export type GraphQLWrappingType = GraphQLList<any> | GraphQLNonNull<any>;
 
-export function isWrappingType(type: GraphQLType): type is GraphQLWrappingType;
+export function isWrappingType(type: any): type is GraphQLWrappingType;
 
-export function assertWrappingType(type: GraphQLType): GraphQLWrappingType;
+export function assertWrappingType(type: any): GraphQLWrappingType;
 
 /**
  * These types can all accept null as a value.
@@ -208,9 +208,9 @@ export type GraphQLNullableType =
     | GraphQLInputObjectType
     | GraphQLList<any>;
 
-export function isNullableType(type: GraphQLType): type is GraphQLNullableType;
+export function isNullableType(type: any): type is GraphQLNullableType;
 
-export function assertNullableType(type: GraphQLType): GraphQLNullableType;
+export function assertNullableType(type: any): GraphQLNullableType;
 
 export function getNullableType(type: void): undefined;
 export function getNullableType<T extends GraphQLNullableType>(type: T): T;
@@ -227,9 +227,9 @@ export type GraphQLNamedType =
     | GraphQLEnumType
     | GraphQLInputObjectType;
 
-export function isNamedType(type: GraphQLType): type is GraphQLNamedType;
+export function isNamedType(type: any): type is GraphQLNamedType;
 
-export function assertNamedType(type: GraphQLType): GraphQLNamedType;
+export function assertNamedType(type: any): GraphQLNamedType;
 
 export function getNamedType(type: void): undefined;
 export function getNamedType(type: GraphQLType): GraphQLNamedType;
diff --git a/types/grid-styled/index.d.ts b/types/grid-styled/index.d.ts
index af969b0cec..2a245f2260 100644
--- a/types/grid-styled/index.d.ts
+++ b/types/grid-styled/index.d.ts
@@ -1,14 +1,14 @@
-// Type definitions for grid-styled 4.1
+// Type definitions for grid-styled 4.2
 // Project: https://github.com/jxnblk/grid-styled
 // Definitions by: Anton Vasin <https://github.com/antonvasin>
 //                 Victor Orlov <https://github.com/vittorio>
 //                 Louis Hache <https://github.com/lhache>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
 
-import { ComponentClass } from "react";
+import { ComponentType } from "react";
 import { StyledComponentClass } from "styled-components";
 
 export type ResponsiveProp = number | string | Array<string | number>;
@@ -39,7 +39,7 @@ export interface BoxProps
     extends Omit<React.HTMLProps<HTMLDivElement>, "width" | "wrap" | "is"> {
     flex?: ResponsiveProp;
     order?: ResponsiveProp;
-    is?: string | ComponentClass<any>;
+    is?: string | ComponentType<any>;
     alignSelf?: ResponsiveProp;
 }
 
@@ -77,4 +77,4 @@ export const theme: Theme;
 export type DivProps = Omit<React.HTMLProps<HTMLDivElement>, "ref"> & {
     innerRef?: (el: HTMLDivElement) => any;
 };
-export const div: ComponentClass<DivProps>;
+export const div: ComponentType<DivProps>;
diff --git a/types/grpc-error/grpc-error-tests.ts b/types/grpc-error/grpc-error-tests.ts
new file mode 100644
index 0000000000..f8f309cb65
--- /dev/null
+++ b/types/grpc-error/grpc-error-tests.ts
@@ -0,0 +1,7 @@
+import GRPCError = require('grpc-error');
+
+const error1 = new GRPCError('test');
+const error2 = new GRPCError({status_code: 'invalid'});
+const error3 = new GRPCError('test', 12);
+const error4 = new GRPCError('test', {status_code: 'invalid'});
+const error5 = new GRPCError('test', 12, {status_code: 'invalid'});
diff --git a/types/grpc-error/index.d.ts b/types/grpc-error/index.d.ts
new file mode 100644
index 0000000000..6f76d288db
--- /dev/null
+++ b/types/grpc-error/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for grpc-error 1.0
+// Project: https://github.com/bojand/grpc-error
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare class GRPCError extends Error {
+  constructor(value: string | object);
+  constructor(message: string, value: number | object);
+  constructor(message: string, code: number, metadata: object);
+
+  code: number;
+  metadata: object;
+}
+
+export = GRPCError;
diff --git a/types/grpc-error/tsconfig.json b/types/grpc-error/tsconfig.json
new file mode 100644
index 0000000000..51388578e0
--- /dev/null
+++ b/types/grpc-error/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"grpc-error-tests.ts"
+	]
+}
diff --git a/types/grpc-error/tslint.json b/types/grpc-error/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/grpc-error/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/gulp-imagemin/gulp-imagemin-tests.ts b/types/gulp-imagemin/gulp-imagemin-tests.ts
new file mode 100644
index 0000000000..839e126fe2
--- /dev/null
+++ b/types/gulp-imagemin/gulp-imagemin-tests.ts
@@ -0,0 +1,33 @@
+import gulp = require('gulp');
+import gulpImagemin = require('gulp-imagemin');
+
+const plugins = [
+    gulpImagemin.gifsicle({ interlaced: true }),
+    gulpImagemin.jpegtran({ progressive: true }),
+    gulpImagemin.optipng({ optimizationLevel: 5 }),
+    gulpImagemin.svgo({ floatPrecision: 2 })
+];
+
+gulp.task('build', () => {
+    return gulp.src('*.{gif,jpg,png,svg}')
+        .pipe(gulpImagemin())
+        .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build', () => {
+    return gulp.src('*.{gif,jpg,png,svg}')
+        .pipe(gulpImagemin(plugins))
+        .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build', () => {
+    return gulp.src('*.{gif,jpg,png,svg}')
+        .pipe(gulpImagemin({ verbose: true }))
+        .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build', () => {
+    return gulp.src('*.{gif,jpg,png,svg}')
+        .pipe(gulpImagemin(plugins, { verbose: true }))
+        .pipe(gulp.dest('dist'));
+});
diff --git a/types/gulp-imagemin/index.d.ts b/types/gulp-imagemin/index.d.ts
new file mode 100644
index 0000000000..ac61547a74
--- /dev/null
+++ b/types/gulp-imagemin/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for gulp-imagemin 4.1
+// Project: https://github.com/sindresorhus/gulp-imagemin#readme
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Plugin } from 'imagemin';
+import { Options as GifsicleOptions } from 'imagemin-gifsicle';
+import { Options as JpegtranOptions } from 'imagemin-jpegtran';
+import { Options as OptipngOptions } from 'imagemin-optipng';
+import { Options as SvgoOptions } from 'imagemin-svgo';
+import { Transform } from 'stream';
+
+declare function imagemin(pluginsOrOptions?: ReadonlyArray<Plugin> | imagemin.Options): Transform;
+declare function imagemin(plugins?: ReadonlyArray<Plugin>, options?: imagemin.Options): Transform;
+
+declare namespace imagemin {
+    interface Options {
+        verbose?: boolean;
+    }
+
+    type PluginFactory<T> = (options?: T) => Plugin;
+
+    const gifsicle: PluginFactory<GifsicleOptions>;
+    const jpegtran: PluginFactory<JpegtranOptions>;
+    const optipng: PluginFactory<OptipngOptions>;
+    const svgo: PluginFactory<SvgoOptions>;
+}
+
+export = imagemin;
diff --git a/types/gulp-imagemin/tsconfig.json b/types/gulp-imagemin/tsconfig.json
new file mode 100644
index 0000000000..1b35a74382
--- /dev/null
+++ b/types/gulp-imagemin/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-imagemin-tests.ts"
+    ]
+}
diff --git a/types/gulp-imagemin/tslint.json b/types/gulp-imagemin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-imagemin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-jsonmin/gulp-jsonmin-tests.ts b/types/gulp-jsonmin/gulp-jsonmin-tests.ts
new file mode 100644
index 0000000000..e13ec2c69f
--- /dev/null
+++ b/types/gulp-jsonmin/gulp-jsonmin-tests.ts
@@ -0,0 +1,14 @@
+import gulp = require('gulp');
+import gulpJsonmin = require('gulp-jsonmin');
+
+gulp.task('build', () => {
+    return gulp.src('*.json')
+        .pipe(gulpJsonmin())
+        .pipe(gulp.dest('dist'));
+});
+
+gulp.task('build', () => {
+    return gulp.src('*.json')
+        .pipe(gulpJsonmin({ verbose: true }))
+        .pipe(gulp.dest('dist'));
+});
diff --git a/types/gulp-jsonmin/index.d.ts b/types/gulp-jsonmin/index.d.ts
new file mode 100644
index 0000000000..d5faa2b969
--- /dev/null
+++ b/types/gulp-jsonmin/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for gulp-jsonmin 1.1
+// Project: https://github.com/englercj/gulp-jsonmin
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Transform } from 'stream';
+
+declare function gulpJsonmin(options?: gulpJsonmin.Options): Transform;
+
+declare namespace gulpJsonmin {
+    interface Options {
+        verbose?: boolean;
+    }
+}
+
+export = gulpJsonmin;
diff --git a/types/gulp-jsonmin/tsconfig.json b/types/gulp-jsonmin/tsconfig.json
new file mode 100644
index 0000000000..7f1244285f
--- /dev/null
+++ b/types/gulp-jsonmin/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-jsonmin-tests.ts"
+    ]
+}
diff --git a/types/gulp-jsonmin/tslint.json b/types/gulp-jsonmin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-jsonmin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-pug-i18n/gulp-pug-i18n-tests.ts b/types/gulp-pug-i18n/gulp-pug-i18n-tests.ts
new file mode 100644
index 0000000000..98e83afcff
--- /dev/null
+++ b/types/gulp-pug-i18n/gulp-pug-i18n-tests.ts
@@ -0,0 +1,10 @@
+import gulp = require('gulp');
+import gulpPugI18n = require('gulp-pug-i18n');
+
+gulp.task('build', () => {
+    return gulp.src('*.pug')
+        .pipe(gulpPugI18n({
+            i18n: { locales: 'locales/*.json' }
+        }))
+        .pipe(gulp.dest('dist'));
+});
diff --git a/types/gulp-pug-i18n/index.d.ts b/types/gulp-pug-i18n/index.d.ts
new file mode 100644
index 0000000000..7f4c50deda
--- /dev/null
+++ b/types/gulp-pug-i18n/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for gulp-pug-i18n 1.0
+// Project: https://github.com/dogancelik/gulp-pug-i18n
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Options as PugOptions } from 'pug';
+import { Transform } from 'stream';
+
+declare function gulpPugI18n(options: gulpPugI18n.Options): Transform;
+
+declare namespace gulpPugI18n {
+    interface Options extends PugOptions {
+        data?: any;
+        i18n: {
+            default?: string;
+            filename?: string;
+            locales: string | ReadonlyArray<string>;
+            namespace?: string | null;
+        };
+    }
+}
+
+export = gulpPugI18n;
diff --git a/types/gulp-pug-i18n/tsconfig.json b/types/gulp-pug-i18n/tsconfig.json
new file mode 100644
index 0000000000..afd4c6ea4c
--- /dev/null
+++ b/types/gulp-pug-i18n/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-pug-i18n-tests.ts"
+    ]
+}
diff --git a/types/gulp-pug-i18n/tslint.json b/types/gulp-pug-i18n/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-pug-i18n/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/gulp-template/gulp-template-tests.ts b/types/gulp-template/gulp-template-tests.ts
new file mode 100644
index 0000000000..9e5011074c
--- /dev/null
+++ b/types/gulp-template/gulp-template-tests.ts
@@ -0,0 +1,20 @@
+import gulp = require('gulp');
+import gulpTemplate = require('gulp-template');
+
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ a: 'A' }, { sourceURL: 'https://www.example.com' })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ b: 'B' }, { escape: /x/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ c: 'C' }, { evaluate: /y/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ d: 'D' }, { imports: /z/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ e: 'E' }, { interpolate: /w/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ f: 'F' }, { variable: 'some-var' })));
+
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate({ g: 'G' }, { badOption: 'some-var' }))); // $ExpectError
+
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ sourceURL: 'https://www.example.com' })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ escape: /x/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ evaluate: /y/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ imports: /z/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ interpolate: /w/ })));
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ variable: 'some-var' })));
+
+gulp.task('replace', () => gulp.src('files').pipe(gulpTemplate.precompile({ badOption: 'some-var' }))); // $ExpectError
diff --git a/types/gulp-template/index.d.ts b/types/gulp-template/index.d.ts
new file mode 100644
index 0000000000..a2270eb387
--- /dev/null
+++ b/types/gulp-template/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for gulp-template 5.0
+// Project: https://github.com/sindresorhus/gulp-template#readme
+// Definitions by: Peter Safranek <https://github.com/pe8ter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="node" />
+
+import * as _ from 'lodash';
+import * as stream from 'stream';
+
+declare function gulpTemplate(data: any, options: _.TemplateOptions): stream.Transform;
+
+declare namespace gulpTemplate {
+    function precompile(options: _.TemplateOptions): stream.Transform;
+}
+
+export = gulpTemplate;
diff --git a/types/gulp-template/tsconfig.json b/types/gulp-template/tsconfig.json
new file mode 100644
index 0000000000..0666e34adc
--- /dev/null
+++ b/types/gulp-template/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-template-tests.ts"
+    ]
+}
diff --git a/types/gulp-template/tslint.json b/types/gulp-template/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/gulp-template/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/halogen/index.d.ts b/types/halogen/index.d.ts
index de09f29f43..ab0d4f31f4 100644
--- a/types/halogen/index.d.ts
+++ b/types/halogen/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/yuanyan/halogen
 // Definitions by: Vincent Rouffiat <https://github.com/steller>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as react from "react";
 
diff --git a/types/handlebars/index.d.ts b/types/handlebars/index.d.ts
index 480f91f6f0..6272dde3a0 100644
--- a/types/handlebars/index.d.ts
+++ b/types/handlebars/index.d.ts
@@ -40,6 +40,7 @@ declare namespace Handlebars {
     export function unregisterHelper(name: string): void;
 
     export function registerPartial(name: string, fn: Template): void;
+    export function registerPartial(spec: { [name: string]: HandlebarsTemplateDelegate }): void;
     export function unregisterPartial(name: string): void;
 
     // TODO: replace Function with actual signature
diff --git a/types/hapi/index.d.ts b/types/hapi/index.d.ts
index d8edc40685..b152d34e5b 100644
--- a/types/hapi/index.d.ts
+++ b/types/hapi/index.d.ts
@@ -1,7 +1,6 @@
 // Type definitions for hapi 17.0
 // Project: https://github.com/hapijs/hapi
-// Definitions by: Marc Bornträger <https://github.com/BorntraegerMarc>
-//                 Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
+// Definitions by: Rafael Souza Fijalkowski <https://github.com/rafaelsouzaf>
 //                 Justin Simms <https://github.com/jhsimms>
 //                 Simon Schick <https://github.com/SimonSchick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -451,7 +450,7 @@ export interface Request extends Podium {
      * An object where each key is the name assigned by a route pre-handler methods function. The values are the raw values provided to the continuation function as argument. For the wrapped response
      * object, use responses.
      */
-    readonly pre: Util.Dictionary<object>;
+    readonly pre: Util.Dictionary<any>;
 
     /**
      * Access: read / write (see limitations below).
@@ -463,7 +462,7 @@ export interface Request extends Podium {
     /**
      * Same as pre but represented as the response object created by the pre method.
      */
-    readonly preResponses: Util.Dictionary<object>;
+    readonly preResponses: Util.Dictionary<any>;
 
     /**
      * By default the object outputted from node's URL parse() method. Might also be set indirectly via request.setUrl in which case it may be a string (if url is set to an object with the query
@@ -2905,7 +2904,7 @@ export interface ServerOptions {
      * Default value: none.
      * Used to create an HTTPS connection. The tls object is passed unchanged to the node HTTPS server as described in the node HTTPS documentation.
      */
-    tls?: true | https.RequestOptions;
+    tls?: boolean | https.ServerOptions;
 
     /**
      * Default value: constructed from runtime server information.
@@ -3200,7 +3199,7 @@ export interface ServerState {
      * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie formating (e.g. when headers are set manually).
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesformatcookies)
      */
-    format(cookies: ServerStateFormat | ServerStateFormat[]): string;
+    format(cookies: ServerStateFormat | ServerStateFormat[]): Promise<string>;
 
     /**
      * Parses an HTTP 'Cookies' header based on the server.options.state where:
@@ -3209,7 +3208,7 @@ export interface ServerState {
      * Note that this utility uses the server configuration but does not change the server state. It is provided for manual cookie parsing (e.g. when server parsing is disabled).
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-async-serverstatesparseheader)
      */
-    parse(header: string): Util.Dictionary<string>;
+    parse(header: string): Promise<Util.Dictionary<string>>;
 }
 
 /**
@@ -3790,7 +3789,7 @@ export class Server extends Podium {
      * * path - the route path.
      * [See docs](https://github.com/hapijs/hapi/blob/master/API.md#-servertablehost)
      */
-    table(host?: string): Array<{settings: ServerRoute; method: Util.HTTP_METHODS_PARTIAL_LOWERCASE, path: string}>; // TODO I am not sure if the ServerRoute is the object expected here
+    table(host?: string): RequestRoute[];
 }
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/types/hapi/test/server/server-options.ts b/types/hapi/test/server/server-options.ts
index 030c721103..f72f98a55e 100644
--- a/types/hapi/test/server/server-options.ts
+++ b/types/hapi/test/server/server-options.ts
@@ -103,7 +103,7 @@ const options: ServerOptions = {
         isSameSite: 'Strict',
         encoding: 'none'
     },
-    tls: undefined
+    tls: true
 };
 
 const server = new Server(options);
diff --git a/types/hapi/test/server/server-table.ts b/types/hapi/test/server/server-table.ts
index ab14938be4..79726118b5 100644
--- a/types/hapi/test/server/server-table.ts
+++ b/types/hapi/test/server/server-table.ts
@@ -19,4 +19,11 @@ server.route({
 server.start();
 const table = server.table();
 console.log(table);
+console.log(table[0].method);
+console.log(table[0].path);
+console.log(table[0].vhost);
+console.log(table[0].realm);
+console.log(table[0].settings);
+console.log(table[0].fingerprint);
+console.log(table[0].auth);
 console.log('Server started at: ' + server.info.uri);
diff --git a/types/hapi/v16/index.d.ts b/types/hapi/v16/index.d.ts
index ee22f1dea7..b9b5b98456 100644
--- a/types/hapi/v16/index.d.ts
+++ b/types/hapi/v16/index.d.ts
@@ -766,7 +766,7 @@ export interface ServerConnectionOptions extends ConnectionConfigurationServerDe
     /** labels - a string or string array of labels used to server.select() specific connections matching the specified labels. Defaults to an empty array [] (no labels). */
     labels?: string | string[];
     /** tls - used to create an HTTPS connection. The tls object is passed unchanged as options to the node.js HTTPS server as described in the node.js HTTPS [documentation](https://nodejs.org/api/https.html#https_https_createserver_options_requestlistener})  . Set to true when passing a listener object that has been configured to use TLS directly. */
-    tls?: true | https.RequestOptions;
+    tls?: boolean | https.RequestOptions;
 }
 
 /**
diff --git a/types/hard-source-webpack-plugin/hard-source-webpack-plugin-tests.ts b/types/hard-source-webpack-plugin/hard-source-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..a2cc9a486a
--- /dev/null
+++ b/types/hard-source-webpack-plugin/hard-source-webpack-plugin-tests.ts
@@ -0,0 +1,8 @@
+import * as HardSourceWebpackPlugin from 'hard-source-webpack-plugin';
+
+new HardSourceWebpackPlugin({
+    info: {
+        level: 'debug',
+        mode: 'test',
+    }
+});
diff --git a/types/hard-source-webpack-plugin/index.d.ts b/types/hard-source-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..3e02ee1d8a
--- /dev/null
+++ b/types/hard-source-webpack-plugin/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for hard-source-webpack-plugin 0.9
+// Project: https://github.com/mzgoddard/hard-source-webpack-plugin#readme
+// Definitions by: woitechen <https://github.com/woitechen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as webpack from 'webpack';
+
+declare class hard_source_webpack_plugin {
+    constructor(options?: Options);
+    apply(...args: any[]): void;
+}
+
+declare namespace hard_source_webpack_plugin { }
+
+interface Options {
+    cacheDirectory?: string;
+    configHash?: (webpackConfig?: webpack.Configuration) => string;
+    environmentHash?: {
+        root: string;
+        directories: string[];
+        files: string[];
+    };
+    info?: {
+        mode: 'none' | 'test';
+        level: 'debug' | 'log' | 'info' | 'warn' | 'error';
+    };
+    cachePrune?: {
+        maxAge: number;
+        sizeThreshold: number;
+    };
+}
+
+export = hard_source_webpack_plugin;
diff --git a/types/hard-source-webpack-plugin/tsconfig.json b/types/hard-source-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..94b7ae1705
--- /dev/null
+++ b/types/hard-source-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",
+        "hard-source-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/hard-source-webpack-plugin/tslint.json b/types/hard-source-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hard-source-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/hash-sum/hash-sum-tests.ts b/types/hash-sum/hash-sum-tests.ts
new file mode 100644
index 0000000000..2da5ff9566
--- /dev/null
+++ b/types/hash-sum/hash-sum-tests.ts
@@ -0,0 +1,9 @@
+import sum = require("hash-sum");
+
+sum(undefined);
+sum(null);
+sum({});
+sum({ hello: "world" });
+sum(100);
+sum("");
+sum(true);
diff --git a/types/hash-sum/index.d.ts b/types/hash-sum/index.d.ts
new file mode 100644
index 0000000000..e999437abe
--- /dev/null
+++ b/types/hash-sum/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for hash-sum 1.0
+// Project: https://github.com/bevacqua/hash-sum
+// Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = hash_sum;
+
+declare function hash_sum(value: any): string;
diff --git a/types/hash-sum/tsconfig.json b/types/hash-sum/tsconfig.json
new file mode 100644
index 0000000000..be8178d410
--- /dev/null
+++ b/types/hash-sum/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",
+        "hash-sum-tests.ts"
+    ]
+}
diff --git a/types/hash-sum/tslint.json b/types/hash-sum/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hash-sum/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/hat/hat-tests.ts b/types/hat/hat-tests.ts
new file mode 100644
index 0000000000..3156a138f0
--- /dev/null
+++ b/types/hat/hat-tests.ts
@@ -0,0 +1,10 @@
+import hat = require('hat');
+
+const randomId = hat();
+
+const rack = hat.rack();
+rack('car');
+const tractorId = rack('tractor');
+rack.get(tractorId);
+rack.set(randomId, 'bicycle');
+rack.hats;
diff --git a/types/hat/index.d.ts b/types/hat/index.d.ts
new file mode 100644
index 0000000000..58a7bdc983
--- /dev/null
+++ b/types/hat/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for hat 0.0
+// Project: https://github.com/substack/node-hat
+// Definitions by: Sasha Grin <https://github.com/tup1tsa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface HatsList {
+    [key: string]: any;
+}
+
+interface Rack {
+    bits: number;
+    base: number;
+    hats: HatsList;
+
+    (data: any): string;
+    get(id: string): any;
+    set(id: string, value: any): Rack;
+}
+
+type CreateRack = (bits?: number, base?: number, expandBy?: number) => Rack;
+
+interface Hat {
+    (bits?: number, base?: number): string;
+    rack: CreateRack;
+}
+
+declare const hat: Hat;
+export = hat;
diff --git a/types/hat/tsconfig.json b/types/hat/tsconfig.json
new file mode 100644
index 0000000000..c13e03fd48
--- /dev/null
+++ b/types/hat/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",
+        "hat-tests.ts"
+    ]
+}
diff --git a/types/hat/tslint.json b/types/hat/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hat/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 af0c021b3f..ca1d3ff604 100644
--- a/types/heatmap.js/heatmap.js-tests.ts
+++ b/types/heatmap.js/heatmap.js-tests.ts
@@ -18,10 +18,7 @@ declare const container: HTMLElement;
 
 {
     // $ExpectError
-    const config: h337.HeatmapConfiguration = {
-        container,
-        valueField: 'foo',
-    };
+    const config: h337.HeatmapConfiguration = { container, valueField: 'foo' };
 }
 
 {
diff --git a/types/hedron/hedron-tests.tsx b/types/hedron/hedron-tests.tsx
index 8b2ce82f01..3fe25ddff1 100644
--- a/types/hedron/hedron-tests.tsx
+++ b/types/hedron/hedron-tests.tsx
@@ -4,7 +4,29 @@ import * as hedron from 'hedron';
 <hedron.BreakpointProvider breakpoints={{ lg: 1, md: 2 }}>
     <hedron.Page debug fluid tagName="div" width="10px">
         <hedron.Row debug tagName="div">
-            <hedron.Column debug divisions={3} fluid lg={3} smShift={2}>test</hedron.Column>
+            <hedron.Column debug divisions={3} fluid lg={3} smShift={2}>
+                test
+            </hedron.Column>
         </hedron.Row>
     </hedron.Page>
 </hedron.BreakpointProvider>;
+
+// withBreakpoints test
+interface Props {
+    numeric: number;
+    str: string;
+}
+
+class ComponentWithBreakpoints extends React.Component<Props & hedron.BreakpointsProps> {
+    render() {
+        // `breakpoints` prop is accessible in component
+        this.props.breakpoints;
+
+        return null;
+    }
+}
+
+const WithBreakpoints = hedron.withBreakpoints(ComponentWithBreakpoints);
+
+// breakpoints props is not needed
+<WithBreakpoints numeric={42} str='str' />;
diff --git a/types/hedron/index.d.ts b/types/hedron/index.d.ts
index 6eb34e3638..8ce464c017 100644
--- a/types/hedron/index.d.ts
+++ b/types/hedron/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JSBros/hedron
 // Definitions by: Dmytro Borysov <https://github.com/dborysov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -150,8 +150,14 @@ export interface HiddenProps {
     lg?: boolean;
 }
 
-export interface BreakpointProviderProps {
-    breakpoints: { sm?: number; md?: number; lg?: number };
+export interface Breakpoints {
+    sm?: number;
+    md?: number;
+    lg?: number;
+}
+
+export interface BreakpointsProps {
+    breakpoints: Breakpoints;
 }
 
 export class Column extends React.Component<ColumnProps & React.HTMLProps<HTMLElement>> {}
@@ -159,8 +165,8 @@ export class Page extends React.Component<PageProps & React.HTMLProps<HTMLElemen
 export class Row extends React.Component<RowProps & React.HTMLProps<HTMLElement>> {}
 export class Hidden extends React.Component<HiddenProps & React.HTMLProps<HTMLElement>> {}
 export class BreakpointProvider extends React.Component<
-    BreakpointProviderProps & React.HTMLProps<HTMLElement>
+    BreakpointsProps & React.HTMLProps<HTMLElement>
 > {}
 export function withBreakpoints<T>(
-    wrappedComponent: React.ComponentClass<T>
+    wrappedComponent: React.ComponentClass<T & BreakpointsProps>
 ): React.ComponentClass<T>;
diff --git a/types/helmet/helmet-tests.ts b/types/helmet/helmet-tests.ts
index 38fa53828f..afedea6c23 100644
--- a/types/helmet/helmet-tests.ts
+++ b/types/helmet/helmet-tests.ts
@@ -58,6 +58,7 @@ function contentSecurityPolicyTest() {
         directives: {
             defaultSrc: ["'self'"]
         },
+        loose: false,
         setAllHeaders: true
     }));
 }
@@ -206,3 +207,12 @@ function xssFilterTest() {
     app.use(helmet.xssFilter({ setOnOldIE: false }));
     app.use(helmet.xssFilter({ setOnOldIE: true }));
 }
+
+/**
+ * @summary Test for {@see helmet#permittedCrossDomainPolicies} function.
+ */
+function permittedCrossDomainPoliciesTest() {
+    app.use(helmet.permittedCrossDomainPolicies());
+    app.use(helmet.permittedCrossDomainPolicies({}));
+    app.use(helmet.permittedCrossDomainPolicies({ permittedPolicies: 'none' }));
+}
diff --git a/types/helmet/index.d.ts b/types/helmet/index.d.ts
index 0162912d99..6f89728e8a 100644
--- a/types/helmet/index.d.ts
+++ b/types/helmet/index.d.ts
@@ -11,18 +11,23 @@ export = helmet;
 
 declare namespace helmet {
     export interface IHelmetConfiguration {
-        contentSecurityPolicy?: boolean | IHelmetContentSecurityPolicyConfiguration,
-        dnsPrefetchControl?: boolean | IHelmetDnsPrefetchControlConfiguration,
-        frameguard?: boolean | IHelmetFrameguardConfiguration,
-        hidePoweredBy?: boolean | IHelmetHidePoweredByConfiguration,
-        hpkp?: boolean | IHelmetHpkpConfiguration,
-        hsts?: boolean | IHelmetHstsConfiguration,
-        ieNoOpen?: boolean,
-        noCache?: boolean,
-        noSniff?: boolean,
-        referrerPolicy?: boolean | IHelmetReferrerPolicyConfiguration,
-        xssFilter?: boolean | IHelmetXssFilterConfiguration,
-        expectCt?: boolean | IHelmetExpectCtConfiguration,
+        contentSecurityPolicy?: boolean | IHelmetContentSecurityPolicyConfiguration;
+        dnsPrefetchControl?: boolean | IHelmetDnsPrefetchControlConfiguration;
+        frameguard?: boolean | IHelmetFrameguardConfiguration;
+        hidePoweredBy?: boolean | IHelmetHidePoweredByConfiguration;
+        hpkp?: boolean | IHelmetHpkpConfiguration;
+        hsts?: boolean | IHelmetHstsConfiguration;
+        ieNoOpen?: boolean;
+        noCache?: boolean;
+        noSniff?: boolean;
+        referrerPolicy?: boolean | IHelmetReferrerPolicyConfiguration;
+        xssFilter?: boolean | IHelmetXssFilterConfiguration;
+        expectCt?: boolean | IHelmetExpectCtConfiguration;
+        permittedCrossDomainPolicies?: boolean | IHelmetPermittedCrossDomainPoliciesConfiguration;
+    }
+
+    export interface IHelmetPermittedCrossDomainPoliciesConfiguration {
+        permittedPolicies?: string;
     }
 
     export interface IHelmetContentSecurityPolicyDirectiveFunction {
@@ -31,22 +36,22 @@ declare namespace helmet {
     export type HelmetCspDirectiveValue = string | IHelmetContentSecurityPolicyDirectiveFunction;
 
     export interface IHelmetContentSecurityPolicyDirectives {
-        baseUri?: HelmetCspDirectiveValue[],
-        childSrc?: HelmetCspDirectiveValue[],
-        connectSrc?: HelmetCspDirectiveValue[],
-        defaultSrc?: HelmetCspDirectiveValue[],
-        fontSrc?: HelmetCspDirectiveValue[],
-        formAction?: HelmetCspDirectiveValue[],
-        frameAncestors?: HelmetCspDirectiveValue[],
-        frameSrc?: HelmetCspDirectiveValue[],
-        imgSrc?: HelmetCspDirectiveValue[],
-        mediaSrc?: HelmetCspDirectiveValue[],
-        objectSrc?: HelmetCspDirectiveValue[],
-        pluginTypes?: HelmetCspDirectiveValue[],
-        reportUri?: string,
-        sandbox?: HelmetCspDirectiveValue[],
-        scriptSrc?: HelmetCspDirectiveValue[],
-        styleSrc?: HelmetCspDirectiveValue[]
+        baseUri?: HelmetCspDirectiveValue[];
+        childSrc?: HelmetCspDirectiveValue[];
+        connectSrc?: HelmetCspDirectiveValue[];
+        defaultSrc?: HelmetCspDirectiveValue[];
+        fontSrc?: HelmetCspDirectiveValue[];
+        formAction?: HelmetCspDirectiveValue[];
+        frameAncestors?: HelmetCspDirectiveValue[];
+        frameSrc?: HelmetCspDirectiveValue[];
+        imgSrc?: HelmetCspDirectiveValue[];
+        mediaSrc?: HelmetCspDirectiveValue[];
+        objectSrc?: HelmetCspDirectiveValue[];
+        pluginTypes?: HelmetCspDirectiveValue[];
+        reportUri?: string;
+        sandbox?: HelmetCspDirectiveValue[];
+        scriptSrc?: HelmetCspDirectiveValue[];
+        styleSrc?: HelmetCspDirectiveValue[];
     }
 
     export interface IHelmetContentSecurityPolicyConfiguration {
@@ -54,7 +59,8 @@ declare namespace helmet {
         setAllHeaders?: boolean;
         disableAndroid?: boolean;
         browserSniff?: boolean;
-        directives?: IHelmetContentSecurityPolicyDirectives
+        directives?: IHelmetContentSecurityPolicyDirectives;
+        loose?: boolean;
     }
 
     export interface IHelmetDnsPrefetchControlConfiguration {
@@ -62,12 +68,12 @@ declare namespace helmet {
     }
 
     export interface IHelmetFrameguardConfiguration {
-        action?: string,
-        domain?: string
+        action?: string;
+        domain?: string;
     }
 
     export interface IHelmetHidePoweredByConfiguration {
-        setTo?: string
+        setTo?: string;
     }
 
     export interface IHelmetSetIfFunction {
@@ -80,14 +86,14 @@ declare namespace helmet {
         includeSubdomains?: boolean;
         reportUri?: string;
         reportOnly?: boolean;
-        setIf?: IHelmetSetIfFunction
+        setIf?: IHelmetSetIfFunction;
     }
 
     export interface IHelmetHstsConfiguration {
         maxAge?: number;
         includeSubdomains?: boolean;
         preload?: boolean;
-        setIf?: IHelmetSetIfFunction,
+        setIf?: IHelmetSetIfFunction;
         force?: boolean;
     }
 
@@ -195,5 +201,12 @@ declare namespace helmet {
          * @returns {e.RequestHandler}
          */
         expectCt(options?: IHelmetExpectCtConfiguration): express.RequestHandler;
+
+        /**
+         * @summary Adds the "X-Permitted-Cross-Domain-Policies" header.
+         * @param {helmet.IHelmetPermittedCrossDomainPoliciesConfiguration} options
+         * @returns {express.RequestHandler}
+         */
+        permittedCrossDomainPolicies(options?: IHelmetPermittedCrossDomainPoliciesConfiguration): express.RequestHandler;
     }
 }
diff --git a/types/hexo-fs/hexo-fs-tests.ts b/types/hexo-fs/hexo-fs-tests.ts
index 7bd5dc13b8..d678e91f34 100644
--- a/types/hexo-fs/hexo-fs-tests.ts
+++ b/types/hexo-fs/hexo-fs-tests.ts
@@ -1,995 +1,144 @@
+import 'mocha';
 import fs = require('hexo-fs');
-import { join, dirname } from 'path';
 import chai = require('chai');
 import Promise = require('bluebird');
-
-// Stub mocha functions
-const {describe, it, before, after, beforeEach, afterEach} = null as any as {
-    [s: string]: ((s: string, cb: (done: any) => void) => void) & ((cb: (done: any) => void) => void) & {only: any, skip: any};
-};
+import { FSWatcher } from 'chokidar';
 
 const should = chai.should();
 
-function createDummyFolder(path: string) {
-    return Promise.all([
-        // Normal files in a hidden folder
-        fs.writeFile(join(path, '.hidden', 'a.txt'), 'a'),
-        fs.writeFile(join(path, '.hidden', 'b.js'), 'b'),
-        // Normal folder in a hidden folder
-        fs.writeFile(join(path, '.hidden', 'c', 'd'), 'd'),
-        // Top-class files
-        fs.writeFile(join(path, 'e.txt'), 'e'),
-        fs.writeFile(join(path, 'f.js'), 'f'),
-        // A hidden file
-        fs.writeFile(join(path, '.g'), 'g'),
-        // Files in a normal folder
-        fs.writeFile(join(path, 'folder', 'h.txt'), 'h'),
-        fs.writeFile(join(path, 'folder', 'i.js'), 'i'),
-        // A hidden files in a normal folder
-        fs.writeFile(join(path, 'folder', '.j'), 'j')
-    ]);
-}
+let string = '';
+let strings = [string];
+let bool = false;
+let boolPromise: Promise<boolean>;
+let stringPromise: Promise<string>;
+let stringsPromise: Promise<string[]>;
+let stringOrStrings: string|string[];
+let stringOrStringsPromise: Promise<string|string[]>;
+let watcherPromise: Promise<FSWatcher>;
+let writeStream: fs.WriteStream;
+let writeStreamPromise: Promise<fs.WriteStream>;
 
-const tmpDir = join(__dirname, 'fs_tmp');
+boolPromise = fs.exists(string);
 
-before(() => fs.mkdirs(tmpDir));
-
-after(done => {
-    fs.rmdir(tmpDir);
-    done();
+fs.exists(string, exist => {
+    bool = exist;
 });
 
-it('exists()', () => {
-    return fs.exists(tmpDir).then(exist => {
-        exist.should.be.true;
-    });
+// $ExpectType Bluebird<void>
+fs.mkdirs(string);
+
+fs.mkdirs(string, err => {
+    should.not.exist(err);
 });
 
-it('exists() - callback', callback => {
-    fs.exists(tmpDir, (exist) => {
-        exist.should.be.true;
-        callback();
-    });
+// $ExpectType void
+fs.mkdirsSync(string);
+
+// $ExpectType Bluebird<void>
+fs.writeFile(string, 'foo');
+
+fs.writeFile(string, 'foo', err => {
+    should.not.exist(err);
 });
 
-it('mkdirs()', () => {
-    const target = join(tmpDir, 'a', 'b', 'c');
+// $ExpectType void
+fs.writeFileSync(string, 'foo');
 
-    return fs.mkdirs(target).then(() => {
-        return fs.exists(target);
-    }).then(exist => {
-        exist.should.be.true;
-        return fs.rmdir(join(tmpDir, 'a'));
-    });
+// $ExpectType Bluebird<void>
+fs.appendFile(string, 'foo');
+
+fs.appendFile(string, 'bar', err => {
+    should.not.exist(err);
 });
 
-it('mkdirs() - callback', callback => {
-    const target = join(tmpDir, 'a', 'b', 'c');
+// $ExpectType void
+fs.appendFileSync(string, 'bar');
 
-    fs.mkdirs(target, err => {
-        should.not.exist(err);
+// $ExpectType Bluebird<void>
+fs.copyFile(string, string);
 
-        fs.exists(target, exist => {
-            exist.should.be.true;
-            fs.rmdir(join(tmpDir, 'a'), callback);
-        });
-    });
+fs.copyFile(string, string, err => {
+    should.not.exist(err);
 });
 
-it('mkdirsSync()', () => {
-    const target = join(tmpDir, 'a', 'b', 'c');
+stringsPromise = fs.copyDir(string, string);
 
-    fs.mkdirsSync(target);
-
-    return fs.exists(target).then(exist => {
-        exist.should.be.true;
-        return fs.rmdir(join(tmpDir, 'a'));
-    });
+fs.copyDir(string, string, (err, files) => {
+    should.not.exist(err);
+    strings = files!;
 });
 
-it('writeFile()', () => {
-    const target = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
+stringsPromise = fs.copyDir(string, string, { ignoreHidden: false });
+stringsPromise = fs.copyDir(string, string, { ignorePattern: /\.js/ });
 
-    return fs.writeFile(target, body).then(() => {
-        return fs.readFile(target);
-    }).then(content => {
-        content.should.eql(body);
-        return fs.rmdir(join(tmpDir, 'a'));
-    });
+stringsPromise = fs.listDir(string);
+
+fs.listDir(string, (err, files) => {
+    should.not.exist(err);
+    strings = files!;
 });
 
-it('writeFile() - callback', callback => {
-    const target = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
+stringsPromise = fs.listDir(string, { ignoreHidden: false });
+stringsPromise = fs.listDir(string, { ignorePattern: /\.js/ });
 
-    fs.writeFile(target, body, err => {
-        should.not.exist(err);
+stringOrStrings = fs.listDirSync(string);
+stringOrStrings = fs.listDirSync(string, { ignoreHidden: false });
+stringOrStrings = fs.listDirSync(string, { ignorePattern: /\.js/ });
 
-        fs.readFile(target, (_, content) => {
-            content!.should.eql(body);
-            fs.rmdir(join(tmpDir, 'a'), callback);
-        });
-    });
+stringPromise = fs.readFile(string);
+
+fs.readFile(string, (err, content) => {
+    should.not.exist(err);
+    string = content!;
 });
 
-it('writeFileSync()', () => {
-    const target = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
+string = fs.readFileSync(string);
 
-    fs.writeFileSync(target, body);
+// $ExpectType Bluebird<void>
+fs.unlink(string);
 
-    return fs.readFile(target).then(content => {
-        content.should.eql(body);
-        return fs.rmdir(join(tmpDir, 'a'));
-    });
+stringOrStringsPromise = fs.emptyDir(string);
+
+fs.emptyDir(string, (err, files) => {
+    should.not.exist(err);
+    stringOrStrings = files!;
 });
 
-it('appendFile()', () => {
-    const target = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
-    const body2 = 'bar';
+stringOrStringsPromise = fs.emptyDir(string, { ignoreHidden: false });
+stringOrStringsPromise = fs.emptyDir(string, { ignorePattern: /\.js/ });
+stringOrStringsPromise = fs.emptyDir(string, { exclude: strings });
 
-    return fs.writeFile(target, body).then(() => {
-        return fs.appendFile(target, body2);
-    }).then(() => {
-        return fs.readFile(target);
-    }).then(content => {
-        content.should.eql(body + body2);
-        return fs.rmdir(join(tmpDir, 'a'));
-    });
+stringOrStrings = fs.emptyDirSync(string);
+stringOrStrings = fs.emptyDirSync(string, { ignoreHidden: false });
+stringOrStrings = fs.emptyDirSync(string, { ignorePattern: /\.js/ });
+stringOrStrings = fs.emptyDirSync(string, { exclude: strings });
+
+// $ExpectType Bluebird<void>
+fs.rmdir(string);
+
+fs.rmdir(string, err => {
+    should.not.exist(err);
 });
 
-it('appendFile() - callback', callback => {
-    const target = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
-    const body2 = 'bar';
+// $ExpectType void
+fs.rmdirSync(string);
 
-    fs.writeFile(target, body, () => {
-        fs.appendFile(target, body2, err => {
-            should.not.exist(err);
+watcherPromise = fs.watch(string);
 
-            fs.readFile(target, (_, content) => {
-                content!.should.eql(body + body2);
-                fs.rmdir(join(tmpDir, 'a'), callback);
-            });
-        });
-    });
+stringPromise = fs.ensurePath(string);
+
+fs.ensurePath(string, (err, path) => {
+    should.not.exist(err);
+    string = path!;
 });
 
-it('appendFileSync()', () => {
-    const target = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
-    const body2 = 'bar';
+string = fs.ensurePathSync(string);
 
-    return fs.writeFile(target, body).then(() => {
-        fs.appendFileSync(target, body2);
-        return fs.readFile(target);
-    }).then(content => {
-        content.should.eql(body + body2);
-        return fs.rmdir(join(tmpDir, 'a'));
-    });
+writeStreamPromise = fs.ensureWriteStream(string);
+
+fs.ensureWriteStream(string, (err, stream) => {
+    should.not.exist(err);
+    writeStream = stream!;
 });
 
-it('copyFile()', () => {
-    const src = join(tmpDir, 'test.txt');
-    const dest = join(tmpDir, 'a', 'b', 'test.txt');
-    const body = 'foo';
-
-    return fs.writeFile(src, body).then(() => {
-        return fs.copyFile(src, dest);
-    }).then(() => {
-        return fs.readFile(dest);
-    }).then(content => {
-        content.should.eql(body);
-
-        return Promise.all([
-            fs.unlink(src),
-            fs.rmdir(join(tmpDir, 'a'))
-        ]);
-    });
-});
-
-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 => {
-        if (err) return callback(err);
-
-        fs.copyFile(src, dest, err => {
-            if (err) return callback(err);
-
-            fs.readFile(dest, (err, content) => {
-                if (err)
-                    return callback(err);
-                content!.should.eql(body);
-
-                Promise.all([
-                    fs.unlink(src),
-                    fs.rmdir(join(tmpDir, 'a'))
-                ]).asCallback(callback);
-            });
-        });
-    });
-});
-
-it('copyDir()', () => {
-    const src = join(tmpDir, 'a');
-    const dest = join(tmpDir, 'b');
-
-    return createDummyFolder(src).then(() => {
-        return fs.copyDir(src, dest);
-    }).then(files => {
-        files.should.have.members([
-            'e.txt',
-            'f.js',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js')
-        ]);
-
-        return Promise.all([
-            fs.readFile(join(dest, 'e.txt')),
-            fs.readFile(join(dest, 'f.js')),
-            fs.readFile(join(dest, 'folder', 'h.txt')),
-            fs.readFile(join(dest, 'folder', 'i.js'))
-        ]);
-    }).then(result => {
-        result.should.eql(['e', 'f', 'h', 'i']);
-    }).then(() => {
-        return Promise.all([
-            fs.rmdir(src),
-            fs.rmdir(dest)
-        ]);
-    });
-});
-
-it('copyDir() - callback', callback => {
-    const src = join(tmpDir, 'a');
-    const dest = join(tmpDir, 'b');
-
-    createDummyFolder(src).then(() => {
-        fs.copyDir(src, dest, (err, files) => {
-            should.not.exist(err);
-            files!.should.have.members([
-                'e.txt',
-                'f.js',
-                join('folder', 'h.txt'),
-                join('folder', 'i.js')
-            ]);
-
-            Promise.all([
-                fs.readFile(join(dest, 'e.txt')),
-                fs.readFile(join(dest, 'f.js')),
-                fs.readFile(join(dest, 'folder', 'h.txt')),
-                fs.readFile(join(dest, 'folder', 'i.js'))
-            ]).then(result => {
-                result.should.eql(['e', 'f', 'h', 'i']);
-            }).then(() => {
-                return Promise.all([
-                    fs.rmdir(src),
-                    fs.rmdir(dest)
-                ]);
-            }).asCallback(callback);
-        });
-    });
-});
-
-it('copyDir() - ignoreHidden off', () => {
-    const src = join(tmpDir, 'a');
-    const dest = join(tmpDir, 'b');
-
-    return createDummyFolder(src).then(() => {
-        return fs.copyDir(src, dest, { ignoreHidden: false });
-    }).then(files => {
-        files.should.have.members([
-            join('.hidden', 'a.txt'),
-            join('.hidden', 'b.js'),
-            join('.hidden', 'c', 'd'),
-            'e.txt',
-            'f.js',
-            '.g',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js'),
-            join('folder', '.j')
-        ]);
-
-        return Promise.all([
-            fs.readFile(join(dest, '.hidden', 'a.txt')),
-            fs.readFile(join(dest, '.hidden', 'b.js')),
-            fs.readFile(join(dest, '.hidden', 'c', 'd')),
-            fs.readFile(join(dest, 'e.txt')),
-            fs.readFile(join(dest, 'f.js')),
-            fs.readFile(join(dest, '.g')),
-            fs.readFile(join(dest, 'folder', 'h.txt')),
-            fs.readFile(join(dest, 'folder', 'i.js')),
-            fs.readFile(join(dest, 'folder', '.j'))
-        ]);
-    }).then(result => {
-        result.should.eql(['a', 'b', 'd', 'e', 'f', 'g', 'h', 'i', 'j']);
-    }).then(() => {
-        return Promise.all([
-            fs.rmdir(src),
-            fs.rmdir(dest)
-        ]);
-    });
-});
-
-it('copyDir() - ignorePattern', () => {
-    const src = join(tmpDir, 'a');
-    const dest = join(tmpDir, 'b');
-
-    return createDummyFolder(src).then(() => {
-        return fs.copyDir(src, dest, { ignorePattern: /\.js/ });
-    }).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 => {
-        result.should.eql(['e', 'h']);
-    }).then(() => {
-        return Promise.all([
-            fs.rmdir(src),
-            fs.rmdir(dest)
-        ]);
-    });
-});
-
-it('listDir()', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.listDir(target);
-    }).then(files => {
-        files.should.have.members([
-            'e.txt',
-            'f.js',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js')
-        ]);
-
-        return fs.rmdir(target);
-    });
-});
-
-it('listDir() - callback', callback => {
-    const target = join(tmpDir, 'test');
-
-    createDummyFolder(target).then(() => {
-        fs.listDir(target, (err, files) => {
-            if (err) return callback(err);
-
-            files!.should.have.members([
-                'e.txt',
-                'f.js',
-                join('folder', 'h.txt'),
-                join('folder', 'i.js')
-            ]);
-
-            fs.rmdir(target, callback);
-        });
-    });
-});
-
-it('listDir() - ignoreHidden off', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.listDir(target, { ignoreHidden: false });
-    }).then(files => {
-        files.should.have.members([
-            join('.hidden', 'a.txt'),
-            join('.hidden', 'b.js'),
-            join('.hidden', 'c', 'd'),
-            'e.txt',
-            'f.js',
-            '.g',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js'),
-            join('folder', '.j')
-        ]);
-
-        return fs.rmdir(target);
-    });
-});
-
-it('listDir() - ignorePattern', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.listDir(target, { ignorePattern: /\.js/ });
-    }).then(files => {
-        files.should.have.members(['e.txt', join('folder', 'h.txt')]);
-        return fs.rmdir(target);
-    });
-});
-
-it('listDirSync()', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        const files = fs.listDirSync(target);
-        files.should.have.members([
-            'e.txt',
-            'f.js',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js')
-        ]);
-
-        return fs.rmdir(target);
-    });
-});
-
-it('listDirSync() - ignoreHidden off', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        const files = fs.listDirSync(target, { ignoreHidden: false });
-        files.should.have.members([
-            join('.hidden', 'a.txt'),
-            join('.hidden', 'b.js'),
-            join('.hidden', 'c', 'd'),
-            'e.txt',
-            'f.js',
-            '.g',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js'),
-            join('folder', '.j')
-        ]);
-
-        return fs.rmdir(target);
-    });
-});
-
-it('listDirSync() - ignorePattern', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        const files = fs.listDirSync(target, { ignorePattern: /\.js/ });
-        files.should.have.members(['e.txt', join('folder', 'h.txt')]);
-        return fs.rmdir(target);
-    });
-});
-
-it('readFile()', () => {
-    const target = join(tmpDir, 'test.txt');
-    const body = 'test';
-
-    return fs.writeFile(target, body).then(() => {
-        return fs.readFile(target);
-    }).then(content => {
-        content.should.eql(body);
-        return fs.unlink(target);
-    });
-});
-
-it('readFile() - callback', callback => {
-    const target = join(tmpDir, 'test.txt');
-    const body = 'test';
-
-    fs.writeFile(target, body, err => {
-        if (err) return callback(err);
-
-        fs.readFile(target, (err, content) => {
-            if (err) return callback(err);
-
-            content!.should.eql(body);
-
-            fs.unlink(target).asCallback(callback);
-        });
-    });
-});
-
-it('readFile() - escape BOM', () => {
-    const target = join(tmpDir, 'test.txt');
-    const body = '\ufefffoo';
-
-    return fs.writeFile(target, body).then(() => {
-        return fs.readFile(target);
-    }).then(content => {
-        content.should.eql('foo');
-        return fs.unlink(target);
-    });
-});
-
-it('readFile() - escape Windows line ending', () => {
-    const target = join(tmpDir, 'test.txt');
-    const body = 'foo\r\nbar';
-
-    return fs.writeFile(target, body).then(() => {
-        return fs.readFile(target);
-    }).then(content => {
-        content.should.eql('foo\nbar');
-        return fs.unlink(target);
-    });
-});
-
-it('readFileSync()', () => {
-    const target = join(tmpDir, 'test.txt');
-    const body = 'test';
-
-    return fs.writeFile(target, body).then(() => {
-        fs.readFileSync(target).should.eql(body);
-        return fs.unlink(target);
-    });
-});
-
-it('readFileSync() - escape BOM', () => {
-    const target = join(tmpDir, 'test.txt');
-    const body = '\ufefffoo';
-
-    return fs.writeFile(target, body).then(() => {
-        fs.readFileSync(target).should.eql('foo');
-        return fs.unlink(target);
-    });
-});
-
-it('readFileSync() - escape Windows line ending', () => {
-    const target = join(tmpDir, 'test.txt');
-    const body = 'foo\r\nbar';
-
-    return fs.writeFile(target, body).then(() => {
-        fs.readFileSync(target).should.eql('foo\nbar');
-        return fs.unlink(target);
-    });
-});
-
-it('unlink()', () => {
-    const target = join(tmpDir, 'test-unlink');
-
-    return fs.writeFile(target, '').then(() => {
-        return fs.exists(target);
-    }).then(exist => {
-        exist.should.eql(true);
-        return fs.unlink(target);
-    }).then(() => {
-        return fs.exists(target);
-    }).then(exist => {
-        exist.should.eql(false);
-    });
-});
-
-it('emptyDir()', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.emptyDir(target);
-    }).then(files => {
-        files.should.have.members([
-            'e.txt',
-            'f.js',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js')
-        ]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), true],
-            [join(target, '.hidden', 'b.js'), true],
-            [join(target, '.hidden', 'c', 'd'), true],
-            [join(target, 'e.txt'), false],
-            [join(target, 'f.js'), false],
-            [join(target, '.g'), true],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), false],
-            [join(target, 'folder', '.j'), true]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDir() - callback', callback => {
-    const target = join(tmpDir, 'test');
-
-    createDummyFolder(target).then(() => {
-        fs.emptyDir(target, (err, files) => {
-            if (err) return callback(err);
-
-            files!.should.have.members([
-                'e.txt',
-                'f.js',
-                join('folder', 'h.txt'),
-                join('folder', 'i.js')
-            ]);
-
-            Promise.map([
-                [join(target, '.hidden', 'a.txt'), true],
-                [join(target, '.hidden', 'b.js'), true],
-                [join(target, '.hidden', 'c', 'd'), true],
-                [join(target, 'e.txt'), false],
-                [join(target, 'f.js'), false],
-                [join(target, '.g'), true],
-                [join(target, 'folder', 'h.txt'), false],
-                [join(target, 'folder', 'i.js'), false],
-                [join(target, 'folder', '.j'), true]
-            ], (data: any) => {
-                return fs.exists(data[0]).then(exist => {
-                    exist.should.eql(data[1]);
-                });
-            }).then(() => {
-                return fs.rmdir(target);
-            }).asCallback(callback);
-        });
-    });
-});
-
-it('emptyDir() - ignoreHidden off', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.emptyDir(target, { ignoreHidden: false });
-    }).then(files => {
-        files.should.have.members([
-            join('.hidden', 'a.txt'),
-            join('.hidden', 'b.js'),
-            join('.hidden', 'c', 'd'),
-            'e.txt',
-            'f.js',
-            '.g',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js'),
-            join('folder', '.j')
-        ]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), false],
-            [join(target, '.hidden', 'b.js'), false],
-            [join(target, '.hidden', 'c', 'd'), false],
-            [join(target, 'e.txt'), false],
-            [join(target, 'f.js'), false],
-            [join(target, '.g'), false],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), false],
-            [join(target, 'folder', '.j'), false]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDir() - ignorePattern', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.emptyDir(target, { ignorePattern: /\.js/ });
-    }).then(files => {
-        files.should.have.members(['e.txt', join('folder', 'h.txt')]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), true],
-            [join(target, '.hidden', 'b.js'), true],
-            [join(target, '.hidden', 'c', 'd'), true],
-            [join(target, 'e.txt'), false],
-            [join(target, 'f.js'), true],
-            [join(target, '.g'), true],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), true],
-            [join(target, 'folder', '.j'), true]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDir() - exclude', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.emptyDir(target, { exclude: ['e.txt', join('folder', 'i.js')] });
-    }).then(files => {
-        files.should.have.members(['f.js', join('folder', 'h.txt')]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), true],
-            [join(target, '.hidden', 'b.js'), true],
-            [join(target, '.hidden', 'c', 'd'), true],
-            [join(target, 'e.txt'), true],
-            [join(target, 'f.js'), false],
-            [join(target, '.g'), true],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), true],
-            [join(target, 'folder', '.j'), true]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDirSync()', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        const files = fs.emptyDirSync(target);
-        files.should.have.members([
-            'e.txt',
-            'f.js',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js')
-        ]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), true],
-            [join(target, '.hidden', 'b.js'), true],
-            [join(target, '.hidden', 'c', 'd'), true],
-            [join(target, 'e.txt'), false],
-            [join(target, 'f.js'), false],
-            [join(target, '.g'), true],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), false],
-            [join(target, 'folder', '.j'), true]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDirSync() - ignoreHidden off', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        const files = fs.emptyDirSync(target, { ignoreHidden: false });
-        files.should.have.members([
-            join('.hidden', 'a.txt'),
-            join('.hidden', 'b.js'),
-            join('.hidden', 'c', 'd'),
-            'e.txt',
-            'f.js',
-            '.g',
-            join('folder', 'h.txt'),
-            join('folder', 'i.js'),
-            join('folder', '.j')
-        ]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), false],
-            [join(target, '.hidden', 'b.js'), false],
-            [join(target, '.hidden', 'c', 'd'), false],
-            [join(target, 'e.txt'), false],
-            [join(target, 'f.js'), false],
-            [join(target, '.g'), false],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), false],
-            [join(target, 'folder', '.j'), false]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDirSync() - ignorePattern', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        const files = fs.emptyDirSync(target, { ignorePattern: /\.js/ });
-        files.should.have.members(['e.txt', join('folder', 'h.txt')]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), true],
-            [join(target, '.hidden', 'b.js'), true],
-            [join(target, '.hidden', 'c', 'd'), true],
-            [join(target, 'e.txt'), false],
-            [join(target, 'f.js'), true],
-            [join(target, '.g'), true],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), true],
-            [join(target, 'folder', '.j'), true]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('emptyDirSync() - exclude', () => {
-    const target = join(tmpDir, 'test');
-
-    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')]);
-
-        return [
-            [join(target, '.hidden', 'a.txt'), true],
-            [join(target, '.hidden', 'b.js'), true],
-            [join(target, '.hidden', 'c', 'd'), true],
-            [join(target, 'e.txt'), true],
-            [join(target, 'f.js'), false],
-            [join(target, '.g'), true],
-            [join(target, 'folder', 'h.txt'), false],
-            [join(target, 'folder', 'i.js'), true],
-            [join(target, 'folder', '.j'), true]
-        ];
-    }).map((data: [string, boolean]) => {
-        return fs.exists(data[0]).then(exist => {
-            exist.should.eql(data[1]);
-        });
-    }).then(() => {
-        return fs.rmdir(target);
-    });
-});
-
-it('rmdir()', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        return fs.rmdir(target);
-    }).then(() => {
-        return fs.exists(target);
-    }).then(exist => {
-        exist.should.be.false;
-    });
-});
-
-it('rmdir() - callback', callback => {
-    const target = join(tmpDir, 'test');
-
-    createDummyFolder(target).then(() => {
-        fs.rmdir(target, err => {
-            should.not.exist(err);
-
-            fs.exists(target, exist => {
-                exist.should.be.false;
-                callback();
-            });
-        });
-    });
-});
-
-it('rmdirSync()', () => {
-    const target = join(tmpDir, 'test');
-
-    return createDummyFolder(target).then(() => {
-        fs.rmdirSync(target);
-        return fs.exists(target);
-    }).then(exist => {
-        exist.should.be.false;
-    });
-});
-
-import { FSWatcher } from 'chokidar';
-
-it('watch()', () => {
-    let watcher: FSWatcher;
-
-    return fs.watch(tmpDir).then(watcher_ => {
-        watcher = watcher_;
-
-        return new Promise((resolve, reject) => {
-            const path = join(tmpDir, 'test.txt');
-
-            watcher.on('add', (path_) => {
-                path_.should.eql(path);
-                resolve();
-            });
-
-            fs.writeFile(path, 'test').catch(reject);
-        });
-    }).finally(() => {
-        if (watcher) watcher.close();
-    });
-});
-
-it('ensurePath() - file exists', () => {
-    const target = join(tmpDir, 'test');
-
-    return Promise.all([
-        fs.writeFile(join(target, 'foo.txt'), ''),
-        fs.writeFile(join(target, 'foo-1.txt'), ''),
-        fs.writeFile(join(target, 'foo-2.md'), ''),
-        fs.writeFile(join(target, 'bar.txt'), '')
-    ]).then(() => {
-        return fs.ensurePath(join(target, 'foo.txt'));
-    }).then(path => {
-        path.should.eql(join(target, 'foo-2.txt'));
-        return fs.rmdir(target);
-    });
-});
-
-it('ensurePath() - file not exist', () => {
-    const target = join(tmpDir, 'foo.txt');
-
-    return fs.ensurePath(target).then(path => {
-        path.should.eql(target);
-    });
-});
-
-it('ensurePath() - callback', callback => {
-    const target = join(tmpDir, 'test');
-
-    Promise.all([
-        fs.writeFile(join(target, 'foo.txt'), ''),
-        fs.writeFile(join(target, 'foo-1.txt'), ''),
-        fs.writeFile(join(target, 'foo-2.md'), ''),
-        fs.writeFile(join(target, 'bar.txt'), '')
-    ]).then(() => {
-        fs.ensurePath(join(target, 'foo.txt'), (err, path) => {
-            should.not.exist(err);
-            path!.should.eql(join(target, 'foo-2.txt'));
-            fs.rmdir(target, callback);
-        });
-    });
-});
-
-it('ensurePathSync() - file exists', () => {
-    const target = join(tmpDir, 'test');
-
-    return Promise.all([
-        fs.writeFile(join(target, 'foo.txt'), ''),
-        fs.writeFile(join(target, 'foo-1.txt'), ''),
-        fs.writeFile(join(target, 'foo-2.md'), ''),
-        fs.writeFile(join(target, 'bar.txt'), '')
-    ]).then(() => {
-        const path = fs.ensurePathSync(join(target, 'foo.txt'));
-        path.should.eql(join(target, 'foo-2.txt'));
-
-        return fs.rmdir(target);
-    });
-});
-
-it('ensurePathSync() - file not exist', () => {
-    const target = join(tmpDir, 'foo.txt');
-    const path = fs.ensurePathSync(target);
-
-    path.should.eql(target);
-});
-
-it('ensureWriteStream()', () => {
-    const target = join(tmpDir, 'foo', 'bar.txt');
-
-    return fs.ensureWriteStream(target).then(stream => {
-        stream.path.should.eql(target);
-        stream.on('finish', () => {
-            return fs.unlink(target);
-        });
-    });
-});
-
-it('ensureWriteStream() - callback', callback => {
-    const target = join(tmpDir, 'foo', 'bar.txt');
-
-    fs.ensureWriteStream(target, (err, stream) => {
-        should.not.exist(err);
-        stream!.path.should.eql(target);
-        callback();
-    });
-});
-
-it('ensureWriteStreamSync()', () => {
-    const target = join(tmpDir, 'foo', 'bar.txt');
-    const stream = fs.ensureWriteStreamSync(target);
-
-    stream.path.should.eql(target);
-    stream.on('finish', () => {
-        return fs.rmdir(dirname(target));
-    });
-});
+writeStream = fs.ensureWriteStreamSync(string);
diff --git a/types/hexo-fs/index.d.ts b/types/hexo-fs/index.d.ts
index 46c7b99d64..89166b230c 100644
--- a/types/hexo-fs/index.d.ts
+++ b/types/hexo-fs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://hexo.io/
 // Definitions by: segayuu <https://github.com/segayuu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import Promise = require('bluebird');
 import {
diff --git a/types/hexo-util/hexo-util-tests.ts b/types/hexo-util/hexo-util-tests.ts
new file mode 100644
index 0000000000..8d46185ccc
--- /dev/null
+++ b/types/hexo-util/hexo-util-tests.ts
@@ -0,0 +1,278 @@
+import {
+    CacheStream,
+    camelCaseKeys,
+    escapeDiacritic,
+    escapeHTML,
+    escapeRegExp,
+    hash,
+    HashStream,
+    highlight,
+    htmlTag,
+    Pattern,
+    Permalink,
+    slugize,
+    spawn,
+    truncate,
+    wordWrap
+} from 'hexo-util';
+
+import { expect } from 'chai';
+
+import { Readable } from 'stream';
+import { createHash } from 'crypto';
+import { join } from 'path';
+
+let buffer = Buffer.alloc(0);
+let directory: { [x: string]: any; } = {};
+let string = '';
+
+const cacheStream = new CacheStream();
+const hashStream = new HashStream();
+const readable = new Readable();
+
+readable.pipe(cacheStream);
+
+buffer = cacheStream.getCache();
+cacheStream.destroy();
+
+directory = camelCaseKeys({ foo_bar: 'test' });
+directory = camelCaseKeys({ foo_bar: 'test' });
+directory = camelCaseKeys({ _foo_bar: 'test', __bar_baz: 'foo' });
+directory = camelCaseKeys({ fooBar: 'test' });
+
+escapeDiacritic('Hell\u00F2 w\u00F2rld') === 'Hello world';
+escapeHTML('<p>Hello "world".</p>') === '&lt;p&gt;Hello &quot;world&quot;.&lt;&#x2F;p&gt;';
+escapeRegExp('hello*world') === 'hello\\*world';
+
+const sha1 = (content: string) => {
+    const hash = createHash('sha1');
+    hash.update(content);
+
+    return hash.digest();
+};
+
+string = '123456';
+hash(string).equals(sha1(string));
+
+sha1(string).equals(hashStream.read());
+
+const testString = JSON.stringify({
+    foo: 1,
+    bar: 2
+}, null, '  ');
+
+string = highlight(testString);
+string = highlight(testString, { gutter: false });
+string = highlight(testString, { wrap: false });
+string = highlight(testString, { firstLine: 3 });
+string = highlight(testString, { lang: 'json' });
+string = highlight(testString, { autoDetect: true });
+string = highlight('test', { lang: 'jrowiejrowi' });
+string = highlight(testString, { caption: 'hello world' });
+
+string = highlight([
+    'function fib(i){',
+    '\tif (i <= 1) return i;',
+    '\treturn fib(i - 1) + fib(i - 2);',
+    '}'
+].join('\n'), { tab: '  ', lang: 'js' });
+
+string = highlight([
+    'const string = `',
+    '  Multi',
+    '  line',
+    '  string',
+    '`'
+].join('\n'), { lang: 'js' });
+
+string = highlight([
+    'const string = `',
+    '  Multi',
+    '',
+    '  string',
+    '`'
+].join('\n'), { lang: 'js' });
+
+string = highlight([
+    '"use strict";',
+    'const string = `',
+    '  Multi',
+    '',
+    '  string',
+    '`'
+].join('\n'), { autoDetect: true });
+
+string = highlight([
+    'roses are red',
+    'violets are blue',
+    'sugar is sweet',
+    'and so are you'
+].join('\n'), { mark: [1, 3, 5] });
+
+string.includes('class="line marked">roses');
+string.includes('class="line">violets');
+string.includes('class="line marked">sugar');
+string.includes('class="line">and');
+
+const gutterStart = '<td class="gutter"><pre>';
+const codeStart = '<td class="code"><pre>';
+
+string = highlight([
+    'a => {',
+    '    if (a > 3)',
+    '        return true;',
+    '    return false;',
+    '}'
+].join('\n'), { hljs: true, lang: 'javascript' });
+
+string.includes(gutterStart);
+string.includes(codeStart);
+string.includes('code class="hljs javascript"');
+string.includes('class="hljs-function"');
+
+string = highlight([
+    'a => {',
+    '    if (a > 3)',
+    '        return true;',
+    '    return false;',
+    '}'
+].join('\n'), { hljs: true, gutter: false, lang: 'javascript' });
+
+!string.includes(gutterStart);
+!string.includes(codeStart);
+string.includes('code class="hljs javascript"');
+string.includes('class="hljs-function"');
+
+string = htmlTag('hr');
+string = htmlTag('img', { src: 'http://placekitten.com/200/300' });
+string = htmlTag('img', {
+    src: 'http://placekitten.com/200/300',
+    width: 200,
+    height: 300
+});
+string = htmlTag('a', { href: 'http://zespia.tw' }, 'My blog');
+
+{
+    const pattern = new Pattern('posts/:id');
+    const result = pattern.match('/posts/89');
+
+    result![0] === 'posts/89';
+    result![1] === '89';
+    result!.id === '89';
+}
+
+{
+    const pattern = new Pattern('posts/*path');
+    const result = pattern.match('posts/2013/hello-world');
+
+    result![0] === 'posts/2013/hello-world';
+    result![1] === '2013/hello-world';
+    result!.path === '2013/hello-world';
+}
+
+{
+    const pattern = new Pattern('posts/:id?');
+    const result = pattern.match('posts/');
+
+    result![0] === 'posts/';
+    result![1] === undefined;
+    result!.id === undefined;
+}
+
+{
+    const pattern = new Pattern('posts/:id?');
+    const result = pattern.match('posts/89');
+
+    result![0] === 'posts/89';
+    result![1] === '89';
+    result!.id === '89';
+}
+
+{
+    const pattern = new Pattern(/ab?cd/);
+
+    pattern.match('abcd')!.length !== 0;
+    pattern.match('acd')!.length !== 0;
+}
+
+{
+    const pattern = new Pattern(str => {
+        str === 'foo';
+        return {};
+    });
+
+    pattern.match('foo').should.eql({});
+}
+
+let permalink = new Permalink(':year/:month/:day/:title');
+
+permalink.rule === ':year/:month/:day/:title';
+permalink.regex === /^(.+?)\/(.+?)\/(.+?)\/(.+?)$/;
+permalink.params.should.eql(['year', 'month', 'day', 'title']);
+
+permalink = new Permalink(':year/:month/:day/:title', {
+    segments: {
+        year: /(\d{4})/,
+        month: /(\d{2})/,
+        day: /(\d{2})/
+    }
+});
+
+permalink.rule === ':year/:month/:day/:title';
+permalink.regex === /^(\d{4})\/(\d{2})\/(\d{2})\/(.+?)$/;
+permalink.params.should.eql(['year', 'month', 'day', 'title']);
+permalink.test('2014/01/31/test');
+!permalink.test('foweirojwoier');
+
+expect(permalink.parse('2014/01/31/test')).eql({
+    year: '2014',
+    month: '01',
+    day: '31',
+    title: 'test'
+});
+
+permalink.stringify({
+    year: '2014',
+    month: '01',
+    day: '31',
+    title: 'test'
+}) === '2014/01/31/test';
+
+slugize('Hello World') === 'Hello-World';
+slugize('Hell\u00F2 w\u00F2rld') === 'Hello-world';
+slugize('Hello  World') === 'Hello-World';
+slugize('~Hello World~') === 'Hello-World';
+slugize('Hello ~`!@#$%^&*()-_+=[]{}|\\;:"\'<>,.?/World') === 'Hello-World';
+slugize('Hello World', { separator: '_' }) === 'Hello_World';
+slugize('Hello World', { transform: 1 }) === 'hello-world';
+slugize('Hello World', { transform: 2 }) === 'HELLO-WORLD';
+slugize('遊戲') === '遊戲';
+
+async () => {
+    const fixturePath = join(__dirname, 'spawn_test.txt');
+
+    string = await spawn('cat', [fixturePath]);
+
+    try {
+        await spawn('cat', ['nothing']);
+    } catch (err) {
+        err.message.trim() === 'cat: nothing: No such file or directory';
+        err.code === 1;
+    }
+
+    string = await spawn('cat', [fixturePath], { encoding: 'hex' });
+    buffer = await spawn('cat', [fixturePath], { encoding: null });
+
+    await spawn('echo', ['something'], { stdio: 'inherit' });
+};
+
+string = truncate('Once upon a time in a world far far away');
+string = truncate('Once upon');
+string = truncate('Once upon a time in a world far far away', { length: 17 });
+string = truncate('Once upon a time in a world far far away', { length: 17, separator: ' ' });
+string = truncate('And they found that many people were sleeping better.', { length: 25, omission: '... (continued)' });
+
+string = wordWrap('Once upon a time');
+string = wordWrap('Once upon a time, in a kingdom called Far Far Away, a king fell ill, and finding a successor to the throne turned out to be more trouble than anyone could have imagined...');
+string = wordWrap('Once upon a time', { width: 8 });
+string = wordWrap('Once upon a time', { width: 1 });
diff --git a/types/hexo-util/index.d.ts b/types/hexo-util/index.d.ts
new file mode 100644
index 0000000000..5a6be7f5a2
--- /dev/null
+++ b/types/hexo-util/index.d.ts
@@ -0,0 +1,109 @@
+// Type definitions for hexo-util 0.6
+// Project: https://hexo.io/
+// Definitions by: sega yuu <https://github.com/segayuu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Transform } from "stream";
+import { SpawnOptions, StdioOptions } from 'child_process';
+
+export class CacheStream extends Transform {
+    destroy(): void;
+    getCache(): Buffer;
+}
+
+export function camelCaseKeys(obj: { [x: string]: any; }): { [x: string]: any; };
+
+export function escapeRegExp(str: string): string;
+
+export function escapeDiacritic(str: string): string;
+
+export function escapeHTML(str: string): string;
+
+export function hash(str: string | ArrayBufferView): Buffer;
+
+export class HashStream extends Transform {}
+
+export function highlight(str: string, options?: {
+    hljs?: boolean;
+    gutter?: boolean;
+    wrap?: boolean;
+    firstLine?: number;
+    caption?: string;
+    mark?: number[];
+    tab?: string;
+    lang?: string;
+    autoDetect?: boolean;
+}): string;
+
+export function htmlTag(tag: string, attrs?: string[] | ArrayLike<string> | { [x: string]: any }, text?: string | null): string;
+
+export interface Pattern<T> {
+    test(str: string): boolean;
+    match(str: string): T;
+}
+
+export const Pattern: {
+    new<T>(rule: Pattern<T> | ((str: string) => T)): Pattern<T>;
+    new(rule: RegExp): Pattern<RegExpMatchArray | null>;
+    new(rule: string): Pattern<{ 0: string; [index: number]: any; } & { [name: string]: any; } | undefined>;
+};
+
+export class Permalink {
+    constructor(rule: string, options?: {
+        segments?: { [name: string]: string | RegExp; };
+    });
+    rule: string;
+    regex: RegExp;
+    params: string[];
+    test(str: string): boolean;
+    parse(str: string): { [param: string]: any; } | undefined;
+    stringify(data: { [name: string]: string; }): string;
+}
+
+export function slugize(str: string, options?: {
+    separator?: string;
+    transform?: 1 | 2;
+}): string;
+
+export interface hexoSpawnOptions extends SpawnOptions {
+    verbose?: boolean;
+    encoding?: BufferEncoding;
+}
+
+export interface hexoSpawnDisableEncodingOptions extends SpawnOptions {
+    verbose?: boolean;
+    encoding: '' | false | null;
+}
+
+export interface hexoSpawnOverrideStdioOptions extends hexoSpawnOptions {
+    stdio: StdioOptions;
+}
+
+export interface hexoSpawnDisableEncodingAndOverrideStdioOptions extends hexoSpawnDisableEncodingOptions {
+    stdio: StdioOptions;
+}
+
+export function spawn(command: string, args: string[], options: hexoSpawnDisableEncodingAndOverrideStdioOptions): Promise<Buffer | undefined>;
+export function spawn(command: string, args: string[], options: hexoSpawnOverrideStdioOptions): Promise<string | undefined>;
+export function spawn(command: string, args: string[], options: hexoSpawnDisableEncodingOptions): Promise<Buffer>;
+export function spawn(command: string, args: string[], options?: hexoSpawnOptions): Promise<string>;
+
+export function spawn(command: string, options: hexoSpawnDisableEncodingAndOverrideStdioOptions): Promise<Buffer | undefined>;
+export function spawn(command: string, options: hexoSpawnOverrideStdioOptions): Promise<string | undefined>;
+export function spawn(command: string, options: hexoSpawnDisableEncodingOptions): Promise<Buffer>;
+export function spawn(command: string, options?: hexoSpawnOptions): Promise<string>;
+
+export function stripHTML(str: string): string;
+
+export function wordWrap(str: string, options?: {
+    width?: number;
+}): string;
+
+export function truncate(str: string, options?: {
+    length?: number;
+    omission?: string;
+    separator?: string;
+}): string;
diff --git a/types/hexo-util/tsconfig.json b/types/hexo-util/tsconfig.json
new file mode 100644
index 0000000000..f93eb62342
--- /dev/null
+++ b/types/hexo-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",
+        "hexo-util-tests.ts"
+    ]
+}
diff --git a/types/hexo-util/tslint.json b/types/hexo-util/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hexo-util/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/highcharts/index.d.ts b/types/highcharts/index.d.ts
index 1434999411..a71e07c925 100644
--- a/types/highcharts/index.d.ts
+++ b/types/highcharts/index.d.ts
@@ -474,6 +474,26 @@ declare namespace Highcharts {
         skipNullPoints?: boolean;
     }
 
+    interface AnimationOptions {
+        /**
+         * The animation duration in milliseconds.
+         */
+        duration: number;
+        /**
+         * The name of an easing function as defined on the Math object.
+         */
+        easing?: string;
+        /**
+         * A callback function to exectute when the animation finishes.
+         */
+        complete?: () => void;
+        /**
+         * A callback function to execute on each step of each attribute or CSS property that's being animated.
+         * The first argument contains information about the animation and progress.
+         */
+        step?: () => void;
+    }
+
     interface AxisTitle {
         /**
          * Alignment of the title relative to the axis values. Possible values are 'low', 'middle' or 'high'.
@@ -1995,7 +2015,7 @@ declare namespace Highcharts {
         fontWeight?: string;
         left?: string;
         opacity?: number;
-		overflow?: string;
+        overflow?: string;
         padding?: string | number;
         position?: string;
         top?: string;
@@ -2354,7 +2374,7 @@ declare namespace Highcharts {
          * can be customized by defining a new array of items and assigning null to unwanted positions.
          * @since 2.0
          */
-        menuItems?: MenuItem[];
+        menuItems?: string[] | MenuItem[];
         /**
          * A click handler callback to use on the button directly instead of the popup menu.
          * @since 2.0
@@ -2661,6 +2681,12 @@ declare namespace Highcharts {
          * @default ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun', 'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec']
          */
         shortMonths?: string[];
+        /**
+         * Short week days, starting Sunday. If not specified, Highcharts uses the first three letters of the lang.weekdays option.
+         * @default undefined
+         * @since 4.2.4
+         */
+        shortWeekdays?: string[];
         /**
          * The default thousands separator used in the Highcharts.numberFormat method unless otherwise specified in the
          * function arguments. Since Highcharts 4.1 it defaults to a single space character, which is compatible with ISO
@@ -3124,7 +3150,7 @@ declare namespace Highcharts {
          * chart's two series to be updated with respective options.
          * @since 5.0.0
          */
-        chartOptions?: ChartOptions;
+        chartOptions?: Options;
 
         /**
          * Under which conditions the rule applies.
@@ -5686,6 +5712,46 @@ declare namespace Highcharts {
         y?: number | null;
     }
 
+    interface TimeOptions {
+        /**
+         * A custom Date class for advanced date handling. For example, JDate can be hooked in to handle Jalali dates.
+         * @default undefined
+         * @since 4.0.4
+         */
+        Date?: Date;
+        /**
+         * A callback to return the time zone offset for a given datetime. It takes the timestamp in terms of milliseconds since
+         * January 1 1970, and returns the timezone offset in minutes. This provides a hook for drawing time based charts in
+         * specific time zones using their local DST crossover dates, with the help of external libraries.
+         * @default undefined
+         * @since 4.1.0
+         */
+        getTimezoneOffset?: (timestamp: Date) => number;
+        /**
+         * Requires moment.js. If the timezone option is specified, it creates a default getTimezoneOffset function that looks
+         * up the specified timezone in moment.js. If moment.js is not included, this throws a Highcharts error in the console,
+         * but does not crash the chart.
+         * @default undefined
+         * @since 5.0.7
+         */
+        timezone?: string;
+        /**
+         * The timezone offset in minutes. Positive values are west, negative values are east of UTC, as in the ECMAScript
+         * getTimezoneOffset method. Use this to display UTC based data in a predefined time zone.
+         * @default 0
+         * @since 3.0.8
+         */
+        timezoneOffset?: number;
+        /**
+         * Whether to use UTC time for axis scaling, tickmark placement and time display in Highcharts.dateFormat.
+         * Advantages of using UTC is that the time displays equally regardless of the user agent's time zone settings.
+         * Local time can be used when the data is loaded in real time or when correct Daylight Saving Time transitions are required.
+         * @default undefined
+         * @since 6.0.5
+         */
+        useUTC?: boolean;
+    }
+
     interface TitleOptions {
         /**
          * The horizontal alignment of the title. Can be one of 'left', 'center' and 'right'.
@@ -6112,6 +6178,10 @@ declare namespace Highcharts {
          * The chart's subtitle
          */
         subtitle?: SubtitleOptions;
+        /**
+         * The chart's time options
+         */
+        time?: TimeOptions;
         /**
          * The chart's main title.
          */
@@ -6481,9 +6551,10 @@ declare namespace Highcharts {
          * @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.
+         * @param [(boolean | AnimationOptions)] animation Whether to apply animation, and optionally animation configuration.
          * @since 5.0.0
          */
-        update(options: Options, redraw?: boolean, oneToOne?: boolean): void;
+        update(options: Options, redraw?: boolean, oneToOne?: boolean, animation?: boolean | AnimationOptions): 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
@@ -6801,6 +6872,16 @@ declare namespace Highcharts {
 
         map(array: any[], fn: Function): any[];
 
+        /**
+         * Wrap an existing behavior of a part of the chart to extend or replace it.
+         * @since 2.3.0
+         *
+         * @see {@link https://www.highcharts.com/docs/extending-highcharts/extending-highcharts}
+         *
+         * @param prototype The prototype for the part of the chart to extend.
+         * @param type The type of behavior you are extending.
+         * @param cb The function that executes when the behavior occurs.
+         */
         wrap(prototype: any, type: string, cb: (proceed: Function, ...args: any[]) => void): void;
 
         /**
@@ -6832,6 +6913,15 @@ declare namespace Highcharts {
                   type: string,
                   eventArguments?: any,
                   defaultFunction?: () => void): void;
+
+        distribute(array: any[], value: number): void;
+
+        /**
+         * Prototype used to extend tooltip behavior in a chart.
+         *
+         * @see {@link https://www.highcharts.com/docs/extending-highcharts/extending-highcharts}
+         */
+        Tooltip: TooltipPrototype;
     }
 
     /**
@@ -7073,6 +7163,19 @@ declare namespace Highcharts {
          */
         update(options: LegendOptions, redraw?: boolean): void;
     }
+
+    /**
+     * The Tooltip prototype is used to to wrap and extend tooltip behaviors.
+     *
+     * @see {@link https://www.highcharts.com/docs/extending-highcharts/extending-highcharts}
+     */
+    interface TooltipPrototype {
+        /**
+         * The behavior prototypes for the tooltips in a chart.
+         * @since 2.3.0
+         */
+        prototype: any;
+    }
 }
 
 declare global {
diff --git a/types/highcharts/modules/drilldown.d.ts b/types/highcharts/modules/drilldown.d.ts
new file mode 100644
index 0000000000..adf9bae6f8
--- /dev/null
+++ b/types/highcharts/modules/drilldown.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for Highcharts Drilldown 4.2.7
+// Project: http://www.highcharts.com/
+// Definitions by: Konstantin Rohde <https://github.com/RohdeK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Static } from "highcharts";
+
+declare function HighchartsDrilldown(H: Static): Static;
+export = HighchartsDrilldown;
+export as namespace HighchartsDrilldown;
diff --git a/types/highcharts/test/drilldown.ts b/types/highcharts/test/drilldown.ts
new file mode 100644
index 0000000000..f4aa33ca4a
--- /dev/null
+++ b/types/highcharts/test/drilldown.ts
@@ -0,0 +1 @@
+HighchartsDrilldown(Highcharts);
diff --git a/types/highcharts/test/index.ts b/types/highcharts/test/index.ts
index 310886b585..bafb4a7516 100644
--- a/types/highcharts/test/index.ts
+++ b/types/highcharts/test/index.ts
@@ -2457,6 +2457,10 @@ function test_ChartObject() {
     chart.update(<Highcharts.Options> {});
     chart.update(<Highcharts.Options> {}, true);
     chart.update(<Highcharts.Options> {}, true, true);
+    chart.update(<Highcharts.Options> {}, true, true, true);
+    chart.update(<Highcharts.Options> {}, true, true, {
+        duration: 3000,
+    });
 }
 
 function test_ElementObject() {
@@ -2591,8 +2595,10 @@ function test_ResponsiveOptions() {
     const responsiveOptions: Highcharts.ResponsiveOptions = <Highcharts.ResponsiveOptions> {
         rules: [
             <Highcharts.RulesOptions> {
-                chartOptions: <Highcharts.ChartOptions> {
-                    description: 'just a test'
+                chartOptions: <Highcharts.Options> {
+                    chart: {
+                        description: 'just a test'
+                    }
                 },
                 condition: <Highcharts.ConditionOptions> {
                     callback: () => { },
@@ -2816,3 +2822,11 @@ function test_WordCloud() {
         }
     };
 }
+
+// Test wrapping the tooltip refresh behavior.
+function test_WrapTooltipBehavior() {
+    Highcharts.wrap(Highcharts.Tooltip.prototype, 'refresh', (proceed, points) => {
+        // When refresh is called, code inside this wrap is executed.
+        // Many prototype functions use this so arrow functions should only be used to replace behaviors.
+    });
+}
diff --git a/types/highcharts/tsconfig.json b/types/highcharts/tsconfig.json
index 24b0cf2dd7..e69f0eeb57 100644
--- a/types/highcharts/tsconfig.json
+++ b/types/highcharts/tsconfig.json
@@ -21,6 +21,7 @@
         "index.d.ts",
         "modules/map/index.d.ts",
         "modules/boost.d.ts",
+        "modules/drilldown.d.ts",
         "modules/exporting.d.ts",
         "modules/no-data-to-display.d.ts",
         "modules/offline-exporting.d.ts",
@@ -28,6 +29,7 @@
         "highstock.d.ts",
         "js/highcharts/index.d.ts",
         "test/boost.ts",
+        "test/drilldown.ts",
         "test/exporting.ts",
         "test/highstock.ts",
         "test/index.ts",
diff --git a/types/highland/highland-tests.ts b/types/highland/highland-tests.ts
index a1c48c944b..fc63a23925 100644
--- a/types/highland/highland-tests.ts
+++ b/types/highland/highland-tests.ts
@@ -333,6 +333,12 @@ fooStream.toArray((arr: Foo[]) => {});
 fooStream.toCallback((err: Error, x: Foo) => {});
 fooStream.toCallback((err: Error) => {});
 
+fooStream.toNodeStream();
+fooStream.toNodeStream({objectMode: false});
+fooStream.toNodeStream({objectMode: true});
+
+fooStream.toPromise(Promise);
+
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 // UTILS
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
diff --git a/types/highland/index.d.ts b/types/highland/index.d.ts
index 473e93880a..7203e959ab 100644
--- a/types/highland/index.d.ts
+++ b/types/highland/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for Highland 2.10.5
+// Type definitions for Highland 2.12.0
 // Project: http://highlandjs.org/
 // 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>
+//                 Jack Wearden <https://github.com/notbobthebuilder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -1319,6 +1320,25 @@ declare namespace Highland {
 		 */
 		toCallback(cb: (err?: Error, x?: R) => void): void;
 
+		/**
+		 * Converts the stream to a node Readable Stream for use in methods
+		 * or pipes that depend on the native stream type.
+		 *
+		 * The options parameter can be an object passed into the [`Readable`
+		 * constructor](http://nodejs.org/api/stream.html#stream_class_stream_readable).
+		 *
+		 * @id toNodeStream
+		 * @section Consumption
+		 * @name Stream.toNodeStream(options)
+		 * @param {Object} options - (optional) [`Readable` constructor](http://nodejs.org/api/stream.html#stream_class_stream_readable) options
+		 * @api public
+		 *
+		 * _(fs.createReadStream('./abc')).toNodeStream()
+		 * _(fs.createReadStream('./abc')).toNodeStream({objectMode: false})
+		 * _([{a: 1}]).toNodeStream({objectMode: true})
+		 */
+		toNodeStream(options?: object): NodeJS.ReadableStream;
+
     /**
      * Converts the result of a stream to Promise.
      *
diff --git a/types/history/index.d.ts b/types/history/index.d.ts
index eb15aaa0fc..1c7b35b8f2 100644
--- a/types/history/index.d.ts
+++ b/types/history/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for history 4.6.2
+// Type definitions for history 4.7.2
 // Project: https://github.com/mjackson/history
 // Definitions by: Sergey Buturlakin <https://github.com/sergey-buturlakin>, Nathan Brown <https://github.com/ngbrown>, Young Rok Kim <https://github.com/rokoroku>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 export as namespace History;
 
 export type Action = 'PUSH' | 'POP' | 'REPLACE';
@@ -23,24 +24,24 @@ export interface History {
     createHref(location: LocationDescriptorObject): Href;
 }
 
-export interface Location {
+export interface Location<S = LocationState> {
     pathname: Pathname;
     search: Search;
-    state: LocationState;
+    state: S;
     hash: Hash;
     key?: LocationKey;
 }
 
-export interface LocationDescriptorObject {
+export interface LocationDescriptorObject<S = LocationState> {
     pathname?: Pathname;
     search?: Search;
-    state?: LocationState;
+    state?: S;
     hash?: Hash;
     key?: LocationKey;
 }
 
 export namespace History {
-    export type LocationDescriptor = Path | LocationDescriptorObject;
+    export type LocationDescriptor<S = LocationState> = Path | LocationDescriptorObject<S>;
     export type LocationKey = string;
     export type LocationListener = (location: Location, action: Action) => void;
     export type LocationState = any;
@@ -53,7 +54,7 @@ export namespace History {
     export type Href = string;
 }
 
-export type LocationDescriptor = History.LocationDescriptor;
+export type LocationDescriptor<S = LocationState> = History.LocationDescriptor<S>;
 export type LocationKey = History.LocationKey;
 export type LocationListener = History.LocationListener;
 export type LocationState = History.LocationState;
diff --git a/types/hls.js/hls.js-tests.ts b/types/hls.js/hls.js-tests.ts
index daab1f23f2..579c2fc18c 100644
--- a/types/hls.js/hls.js-tests.ts
+++ b/types/hls.js/hls.js-tests.ts
@@ -28,15 +28,22 @@ if (Hls.isSupported()) {
     hls.loadSource('http://www.streambox.fr/playlists/test_001/stream.m3u8');
     hls.attachMedia(video);
 
-    hls.on(Hls.Events.MANIFEST_PARSED, () => {
+    hls.once(Hls.Events.MANIFEST_PARSED, (event: "hlsManifestParsed", data: Hls.manifestParsedData) => {
         video.play();
     });
 
-    hls.on(Hls.Events.FRAG_LOAD_ERMERGENCY_ABORTED, (event: string, data: Hls.Data) => {
+    const onFragBuffered = (event: "hlsFragBuffered", data: Hls.fragBufferedData) => {
+        // DO SOMETHING
+    };
+
+    hls.on(Hls.Events.FRAG_BUFFERED, onFragBuffered);
+    hls.off(Hls.Events.FRAG_BUFFERED, onFragBuffered);
+
+    hls.on(Hls.Events.FRAG_LOAD_EMERGENCY_ABORTED, (event: "hlsFragLoadEmergencyAborted", data: Hls.fragLoadEmergencyAbortedData) => {
         console.log('frag: ', data.frag);
     });
 
-    hls.on(Hls.Events.ERROR, (event: string, data: Hls.Data) => {
+    hls.on(Hls.Events.ERROR, (event: "hlsError", data: Hls.errorData) => {
         const errorType = data.type;
         const errorDetails = data.details;
         const errorFatal = data.fatal;
diff --git a/types/hls.js/index.d.ts b/types/hls.js/index.d.ts
index ea26719b22..a376a29b2c 100644
--- a/types/hls.js/index.d.ts
+++ b/types/hls.js/index.d.ts
@@ -1,484 +1,1618 @@
-// Type definitions for hls.js 0.8
+// Type definitions for hls.js 0.10
 // Project: https://github.com/video-dev/hls.js
 // Definitions by: John G. Gainfort, Jr. <https://github.com/jgainfort>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-declare class Loader {
-  constructor(config: Hls.LoaderConfig)
-  /**
-   * Start retrieving content located at given URL (HTTP GET).
-   */
-  load(context: Hls.LoaderContext, config: Hls.LoaderConfig, callbacks: Hls.LoaderCallbacks): void;
-  /**
-   * Abort any loading in progress.
-   */
-  abort(): void;
-  /**
-   * Destroy loading context.
-   */
-  destroy(): void;
-}
+// Event Keys
+type K_MEDIA_ATTACHING = "hlsMediaAttaching";
+type K_MEDIA_ATTACHED = "hlsMediaAttached";
+type K_MEDIA_DETACHING = "hlsMediaDetaching";
+type K_MEDIA_DETACHED = "hlsMediaDetached";
+type K_BUFFER_RESET = "hlsBufferReset";
+type K_BUFFER_CODECS = "hlsBufferCodecs";
+type K_BUFFER_CREATED = "hlsBufferCreated";
+type K_BUFFER_APPENDING = "hlsBufferAppending";
+type K_BUFFER_APPENDED = "hlsBufferAppended";
+type K_BUFFER_EOS = "hlsBufferEOS";
+type K_BUFFER_FLUSHING = "hlsBufferFlushing";
+type K_BUFFER_FLUSHED = "hlsBufferFlushed";
+type K_MANIFEST_LOADING = "hlsManifestLoading";
+type K_MANIFEST_LOADED = "hlsManifestLoaded";
+type K_MANIFEST_PARSED = "hlsManifestParsed";
+type K_LEVEL_LOADING = "hlsLevelLoading";
+type K_LEVEL_LOADED = "hlsLevelLoaded";
+type K_LEVEL_UPDATED = "hlsLevelUpdated";
+type K_LEVEL_PTS_UPDATED = "hlsLevelPtsUpdated";
+type K_LEVEL_SWITCHING = "hlsLevelSwitching";
+type K_LEVEL_SWITCHED = "hlsLevelSwitched";
+type K_AUDIO_TRACKS_UPDATED = "hlsAudioTracksUpdated";
+type K_AUDIO_TRACK_SWITCH = "hlsAudioTrackSwitch";
+type K_AUDIO_TRACK_SWITCHING = "hlsAudioTrackSwitching";
+type K_AUDIO_TRACK_SWITCHED = "hlsAudioTrackSwitched";
+type K_AUDIO_TRACK_LOADING = "hlsAudioTrackLoading";
+type K_AUDIO_TRACK_LOADED = "hlsAudioTrackLoaded";
+type K_SUBTITLE_TRACKS_UPDATED = "hlsSubtitleTracksUpdated";
+type K_SUBTITLE_TRACK_SWITCH = "hlsSubtitleTrackSwitch";
+type K_SUBTITLE_TRACK_LOADING = "hlsSubtitleTrackLoading";
+type K_SUBTITLE_TRACK_LOADED = "hlsSubtitleTrackLoaded";
+type K_SUBTITLE_FRAG_PROCESSED = "hlsSubtitleFragProcessed";
+type K_KEY_LOADING = "hlsKeyLoading";
+type K_KEY_LOADED = "hlsKeyLoaded";
+type K_INIT_PTS_FOUND = "hlsInitPtsFound";
+type K_FRAG_LOADING = "hlsFragLoading";
+type K_FRAG_LOAD_PROGRESS = "hlsFragLoadProgress";
+type K_FRAG_LOAD_EMERGENCY_ABORTED = "hlsFragLoadEmergencyAborted";
+type K_FRAG_LOADED = "hlsFragLoaded";
+type K_FRAG_DECRYPTED = "hlsFragDecrypted";
+type K_FRAG_PARSING_INIT_SEGMENT = "hlsFragParsingInitSegment";
+type K_FRAG_PARSING_USERDATA = "hlsFragParsingUserData";
+type K_FRAG_PARSING_METADATA = "hlsFragParsingMetadata";
+type K_FRAG_PARSING_DATA = "hlsFragParsingData";
+type K_FRAG_PARSED = "hlsFragParsed";
+type K_FRAG_BUFFERED = "hlsFragBuffered";
+type K_FRAG_CHANGED = "hlsFragChanged";
+type K_FPS_DROP = "hlsFpsDrop";
+type K_FPS_DROP_LEVEL_CAPPING = "hlsFpsDropLevelCapping";
+type K_ERROR = "hlsError";
+type K_DESTROYING = "hlsDestroying";
+type K_STREAM_STATE_TRANSITION = "hlsStreamStateTransition";
+
+// Error Type Keys
+type K_NETWORK_ERROR = "networkError";
+type K_MEDIA_ERROR = "mediaError";
+type K_KEY_SYSTEM_ERROR = "keySystemError";
+type K_MUX_ERROR = "muxError";
+type K_OTHER_ERROR = "otherError";
+
+// Error Keys
+type K_MANIFEST_LOAD_ERROR = "manifestLoadError";
+type K_MANIFEST_LOAD_TIMEOUT = "manifestLoadTimeout";
+type K_MANIFEST_PARSING_ERROR = "manifestParsingError";
+type K_LEVEL_LOAD_ERROR = "levelLoadError";
+type K_LEVEL_LOAD_TIMEOUT = "levelLoadTimeout";
+type K_AUDIO_TRACK_LOAD_ERROR = "audioTrackLoadError";
+type K_AUDIO_TRACK_LOAD_TIMEOUT = "audioTrackLoadTimeout";
+type K_FRAG_LOAD_ERROR = "fragLoadError";
+type K_FRAG_LOAD_TIMEOUT = "fragLoadTimeout";
+type K_KEY_LOAD_ERROR = "keyLoadError";
+type K_KEY_LOAD_TIMEOUT = "keyLoadTimeout";
+// MEDIA_ERRORS //
+type K_MANIFEST_INCOMPATIBLE_CODECS_ERROR = "manifestIncompatibleCodecsError";
+type K_FRAG_LOOP_LOADING_ERROR = "fragLoopLoadingError";
+type K_FRAG_DECRYPT_ERROR = "fragDecryptError";
+type K_FRAG_PARSING_ERROR = "fragParsingError";
+type K_BUFFER_ADD_CODEC_ERROR = "bufferAddCodecError";
+type K_BUFFER_APPEND_ERROR = "bufferAppendError";
+type K_BUFFER_APPENDING_ERROR = "bufferAppendingError";
+type K_BUFFER_STALLED_ERROR = "bufferStalledError";
+type K_BUFFER_FULL_ERROR = "bufferFullError";
+type K_BUFFER_SEEK_OVER_HOLE = "bufferSeekOverHole";
+type K_BUFFER_NUDGE_ON_STALL = "bufferNudgeOnStall";
+// MUX_ERROR //
+type K_REMUX_ALLOC_ERROR = "remuxAllocError";
+// OTHER_ERROR //
+type K_LEVEL_SWITCH_ERROR = "levelSwitchError";
+type K_INTERNAL_EXCEPTION = "interalException";
 
 declare namespace Hls {
-  /**
-   * Hls events
-   */
-  namespace Events {
-    /**
-     * fired to attach Media to hls instance
-     * data: { video , mediaSource }
-     */
-    const MEDIA_ATTACHING: string;
-    /**
-     * fired when Media has been succesfully attached to hls instance
-     * data: { video , mediaSource }
-     */
-    const MEDIA_ATTACHED: string;
-    /**
-     * fired before detaching Media from hls instance
-     * data: { }
-     */
-    const MEDIA_DETACHING: string;
-    /**
-     * fired when Media has been detached from hls instance
-     * data: { }
-     */
-    const MEDIA_DETACHED: string;
-    /**
-     * fired when the buffer is going to be reset
-     * data: { }
-     */
-    const BUFFER_RESET: string;
-    /**
-     * fired when we know about the codecs that we need buffers for to push into
-     * data: { tracks : { container, codec, levelCodec, initSegment, metadata } }
-     */
-    const BUFFER_CODECS: string;
-    /**
-     * fired when sourcebuffers have been created
-     * data: { tracks: tracks }
-     */
-    const BUFFER_CREATED: string;
-    /**
-     * fired when we append a segment to the buffer
-     * data: { segment: segment object }
-     */
-    const BUFFER_APPENDING: string;
-    /**
-     * fired when we are done with appending a media segment to the buffer
-     * data: { parent : segment parent that triggered BUFFER_APPENDING, pending : nb of segments waiting for appending for this segment parent }
-     */
-    const BUFFER_APPENDED: string;
-    /**
-     * fired when the stream is finished and we want to notify the media buffer that there will be no more data
-     * data: { }
-     */
-    const BUFFER_EOS: string;
-    /**
-     * fired when the media buffer should be flushed
-     * data: { }
-     */
-    const BUFFER_FLUSHING: string;
-    /**
-     * fired when the media buffer has been flushed
-     * data: { }
-     */
-    const BUFFER_FLUSHED: string;
-    /**
-     * fired to signal that a manifest loading starts
-     * data: { url : manifestURL }
-     */
-    const MANIFEST_LOADING: string;
-    /**
-     * fired after manifest has been loaded
-     * data: { levels : [available quality levels] , audioTracks : [ available audio tracks], url : manifestURL, stats : { trequest, tfirst, tload, mtime}}
-     */
-    const MANIFEST_LOADED: string;
-    /**
-     * fired after manifest has been parsed
-     * data: { levels : [ available quality levels ], firstLevel : index of first quality level appearing in Manifest }
-     */
-    const MANIFEST_PARSED: string;
-    /**
-     * fired when a level playlist loading starts
-     * data: { url : level URL, level : id of level being loaded }
-     */
-    const LEVEL_LOADING: string;
-    /**
-     * fired when a level playlist loading finishes
-     * data: { details : levelDetails object, levelId : id of loaded level, stats : { trequest, tfirst, tload, mtime } }
-     */
-    const LEVEL_LOADED: string;
-    /**
-     * fired when a level's details have been updated based on previous details, after it has been loaded
-     * data: { details : levelDetails object, level : id of updated level }
-     */
-    const LEVEL_UPDATED: string;
-    /**
-     * fired when a level's PTS information has been updated after parsing a fragment
-     * data: { details: levelDetails object, level : id of updated level, drift: PTS drift observed when parsing last fragment }
-     */
-    const LEVEL_PTS_UPDATED: string;
-    /**
-     * fired when a level switch is requested
-     * data: { level: Level }
-     */
-    const LEVEL_SWITCHING: string;
-    /**
-     * fired when a level switch is effective
-     * data: { level: level object }
-     */
-    const LEVEL_SWITCHED: string;
-    /**
-     * fired to notify that audio track lists has been updated
-     * data: { audioTracks : audioTracks }
-     */
-    const AUDIO_TRACKS_UPDATED: string;
-    /**
-     * fired when an audio track switch occurs. deprecated in favor AUDIO_TRACK_SWITCHING
-     * data: { id : audio track id }
-     */
-    const AUDIO_TRACK_SWTICH: string;
-    /**
-     * fired when an audio track switching is requested
-     * data: { id : audio track id }
-     */
-    const AUDIO_TRACK_SWITCHING: string;
-    /**
-     * fired when an audio track switch actually occurs
-     * data: { id : audio track id }
-     */
-    const AUDIO_TRACK_SWITCHED: string;
-    /**
-     * fired when an audio track loading starts
-     * data: { url : audio track URL, id : audio track id }
-     */
-    const AUDIO_TRACK_LOADING: string;
-    /**
-     * fired when an audio track loading finishes
-     * data: { details : levelDetails object, id : audio track id, stats : { trequest, tfirst, tload, mtime } }
-     */
-    const AUDIO_TRACK_LOADED: string;
-    /**
-     * fired to notify that subtitle track lists has been updated
-     * data: { subtitleTracks : subtitleTracks }
-     */
-    const SUBTITLE_TRACKS_UPDATED: string;
-    /**
-     * fired when an subtitle track switch occurs
-     * data: { id : subtitle track id }
-     */
-    const SUBTITLE_TRACK_SWITCH: string;
-    /**
-     * fired when a subtitle track loading starts
-     * data: { url : subtitle track URL, id : subtitle track id }
-     */
-    const SUBTITLE_TRACK_LOADING: string;
-    /**
-     * fired when a subtitle track loading finishes
-     * data: { details : levelDetails object, id : subtitle track id, stats : { trequest, tfirst, tload, mtime } }
-     */
-    const SUBTITLE_TRACK_LOADED: string;
-    /**
-     * fired when a subtitle fragment has been processed
-     * data: { success : boolean, frag : the processed frag }
-     */
-    const SUBTITLE_FRAG_PROCESSED: string;
-    /**
-     * fired when a decryption key loading starts
-     * data: { frag: fragment object }
-     */
-    const KEY_LOADING: string;
-    /**
-     * fired when a decryption key loading is completed
-     * data: { frag: fragment object }
-     */
-    const KEY_LOADED: string;
-    /**
-     * fired when first timestamp has been found
-     * data: { id: demuxer id, frag: fragment object, initPTS: initPTS }
-     */
-    const INIT_PTS_FOUND: string;
-    /**
-     * fired when a fragment loading starts
-     * data: { frag : fragment object }
-     */
-    const FRAG_LOADING: string;
-    /**
-     * fired when a fragment load is in progress
-     * data: { frag : fragment object with frag.loaded=stats.loaded, stats : { trequest, tfirst, loaded, total } }
-     */
-    const FRAG_LOAD_PROGRESS: string;
-    /**
-     * identifier for fragment load aborting for emergency switch down
-     * data: { frag: fragment object }
-     */
-    const FRAG_LOAD_ERMERGENCY_ABORTED: string;
-    /**
-     * fired when a fragment loading is completed
-     * data: { frag : fragment object, payload : fragment payload, stats : { trequest, tfirst, tload, length}}
-     */
-    const FRAG_LOADED: string;
-    /**
-     * fired when a fragment decryption is completed
-     * data: { id: demuxer id, frag: fragment object, stats: { tstart, tdecrypt } }
-     */
-    const FRAG_DECRYPTED: string;
-    /**
-     * fired when Init Segment has been extracted from fragment
-     * data: { id: demuxer id, moov : moov MP4 box, codecs : codecs found while parsing fragment}
-     */
-    const FRAG_PARSING_INIT_SEGMENT: string;
-    /**
-     * fired when parsing id3 is completed
-     * data: { id: demuxer id, samples : [ id3 pes - pts and dts timestamp are relative, values are in seconds]}
-     */
-    const FRAG_PARSING_METADATA: string;
-    /**
-     * fired when moof/mdat have been extracted from fragment
-     * data: { id: demuxer id,
-     *        moof : moof MP4 box,
-     *        mdat : mdat MP4 box,
-     *        startPTS : PTS of first sample,
-     *        endPTS : PTS of last sample,
-     *        startDTS : DTS of first sample,
-     *        endDTS : DTS of last sample,
-     *        type : stream type (audio or video),
-     *        nb : number of samples}
-     */
-    const FRAG_PARSING_DATA: string;
-    /**
-     * fired when fragment parsing is completed
-     * data: { id: demuxer id}
-     */
-    const FRAG_PARSED: string;
-    /**
-     * fired when fragment remuxed MP4 boxes have all been appended into SourceBuffer
-     * data: { id: demuxer id, frag : fragment object, stats : { trequest, tfirst, tload, tparsed, tbuffered, length} }
-     */
-    const FRAG_BUFFERED: string;
-    /**
-     * fired when fragment matching with current video position is changing
-     * data: { frag : fragment object }
-     */
-    const FRAG_CHANGED: string;
-    /**
-     * triggered when FPS drop in last monitoring period is higher than given threshold
-     * data: { curentDropped : nb of dropped frames in last monitoring period,
-     *         currentDecoded : nb of decoded frames in last monitoring period,
-     *         totalDropped : total dropped frames on this video element }
-     */
-    const FPS_DROP: string;
-    /**
-     * triggered when FPS drop triggers auto level capping
-     * data: { level: suggested new auto level capping by fps controller, droppedLevel : level has to much dropped frame will be restricted }
-     */
-    const FPS_DROP_LEVEL_CAPPING: string;
-    /**
-     *  Identifier for an error event
-     * data: { type : error type, details : error details, fatal : is error fatal or not, other error specific data }
-     */
-    const ERROR: string;
-    /**
-     * fired when hls.js instance starts destroying. Different from MEDIA_DETACHED as one could want to detach and reattach a video to the instance of hls.js to handle mid-rolls for example.
-     * data: { }
-     */
-    const DESTROYING: string;
-    /**
-     * fired upon stream controller state transitions
-     * data: { previousState, nextState }
-     */
-    const STREAM_STATE_TRANSITION: string;
-  }
+    class Loader {
+        constructor(config: LoaderConfig);
+        /**
+         * Start retrieving content located at given URL (HTTP GET).
+         */
+        load(
+            context: LoaderContext,
+            config: LoaderConfig,
+            callbacks: LoaderCallbacks
+        ): void;
+        /**
+         * Abort any loading in progress.
+         */
+        abort(): void;
+        /**
+         * Destroy loading context.
+         */
+        destroy(): void;
+    }
 
-  /**
-   * Hls error details
-   */
-  namespace ErrorDetails {
-    // NETWORK_ERRORS //
     /**
-     * raised when manifest loading fails because of a network error
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.MANIFEST_LOAD_ERROR, fatal : true, url : manifest URL, response : { code: error code, text: error text }, loader : URL loader }
+     * (default: internal ABR controller)
+     * Customized Adaptive Bitrate Streaming Controller.
      */
-    const MANIFEST_LOAD_ERROR: string;
-    /**
-     * raised when manifest loading fails because of a timeout
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.MANIFEST_LOAD_TIMEOUT, fatal : true, url : manifest URL, loader : URL loader }
-     */
-    const MANIFEST_LOAD_TIMEOUT: string;
-    /**
-     * raised when manifest parsing failed to find proper content
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.MANIFEST_PARSING_ERROR, fatal : true, url : manifest URL, reason : parsing error reason }
-     */
-    const MANIFEST_PARSING_ERROR: string;
-    /**
-     * raised when level loading fails because of a network error
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.LEVEL_LOAD_ERROR, fatal : true, url : level URL, response : { code: error code, text: error text }, loader : URL loader }
-     */
-    const LEVEL_LOAD_ERROR: string;
-    /**
-     * raised when level loading fails because of a timeout
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.LEVEL_LOAD_TIMEOUT, fatal : true, url : level URL, loader : URL loader }
-     */
-    const LEVEL_LOAD_TIMEOUT: string;
-    /**
-     * raised when audio track loading fails because of a network error
-     * data: { type: NETWORK_ERROR, details: Hls.ErrorDetails.AUDIO_TRACK_LOAD_ERROR, fatal: false, url: audio URL, loader: URL loader }
-     */
-    const AUDIO_TRACK_LOAD_ERROR: string;
-    /**
-     * raised when audio track loading fails because of a timeout
-     * data: { type: NETWORK_ERROR, details: Hls.ErrorDetails.AUDIO_TRACK_LOAD_TIMEOUT, fatal: false, url: audio URL, response: { code: error code, text: error text }, loader: URL loader }
-     */
-    const AUDIO_TRACK_LOAD_TIMEOUT: string;
-    /**
-     * raised when fragment loading fails because of a network error
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_LOAD_ERROR, fatal : true or false, frag : fragment object, response : { code: error code, text: error text } }
-     */
-    const FRAG_LOAD_ERROR: string;
-    /**
-     * raised when fragment loading fails because of a timeout
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_LOAD_TIMEOUT, fatal : true or false, frag : fragment object }
-     */
-    const FRAG_LOAD_TIMEOUT: string;
-    /**
-     * raised when decrypt key loading fails because of a network error
-     * data: { type: NETWORK_ERROR, details: Hls.ErrorDetails.KEY_LOAD_ERROR, fatal: false, frag: fragment object }
-     */
-    const KEY_LOAD_ERROR: string;
-    /**
-     * raised when decrypt key loading fails because of timeout
-     * data: { type: NETWORK_EROR, details: Hls.ErrorDetails.KEY_LOAD_TIMEOUT, fatal: true, frag: fragment object }
-     */
-    const KEY_LOAD_TIMEOUT: string;
+    interface AbrController {
+        /**
+         * get: capping/max level value that could be used by ABR Controller
+         * set: capping/max level value that could be used by ABR Controller
+         */
+        autoLevelCapping: number;
+        /**
+         *  accumulated handled events
+         */
+        handledEvents: string[];
+        /**
+         * current hls instance
+         */
+        hls: Hls;
+        /**
+         * last fragments corresponding level
+         */
+        lastLoadedFragLevel: number;
+        /**
+         * get: next auto-quality levele/force next auto-quality level that should be returned
+         * set: next auto-quality levele/force next auto-quality level that should be returned
+         *  - currently used for emergency switch down
+         */
+        nextAutoLevel: number;
+        useGenericHandler: boolean;
+    }
 
-    // MEDIA_ERRORS //
     /**
-     * raised when manifest only contains quality level with codecs incompatible with MediaSource Engine.
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR, fatal : true, url : manifest URL }
+     *  Customized text track syncronization controller.
      */
-    const MANIFEST_INCOMPATIBLE_CODECS_ERROR: string;
-    /**
-     * raised upon detection of same fragment being requested in loop
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_LOOP_LOADING_ERROR, fatal : true or false, frag : fragment object }
-     */
-    const FRAG_LOOP_LOADING_ERROR: string;
-    /**
-     * raised when fragment decryption fails
-     * data: { type: MEDIA_ERROR, details: Hls.ErrorDetails.FRAG_DECRYPT_ERROR, fatal: true, reason: failure reason }
-     */
-    const FRAG_DECRYPT_ERROR: string;
-    /**
-     * raised when fragment parsing fails
-     * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_PARSING_ERROR, fatal : true or false, reason : failure reason }
-     */
-    const FRAG_PARSING_ERROR: string;
-    /**
-     *  raised when MediaSource fails to add new sourceBuffer
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_ADD_CODEC_ERROR, fatal : false, err : error raised by MediaSource, mimeType: mimeType on which the failure happened }
-     */
-    const BUFFER_ADD_CODEC_ERROR: string;
-    /**
-     * raised when exception is raised while calling buffer append
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_APPEND_ERROR, fatal : true, frag : fragment object }
-     */
-    const BUFFER_APPEND_ERROR: string;
-    /**
-     * raised when exception is raised during buffer appending
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_APPENDING_ERROR, fatal : false }
-     */
-    const BUFFER_APPENDING_ERROR: string;
-    /**
-     * raised when playback is stuck because buffer is running out of data
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_STALLED_ERROR, fatal : false }
-     */
-    const BUFFER_STALLED_ERROR: string;
-    /**
-     * raised when no data can be appended anymore in media buffer because it is full.
-     * This error is recovered automatically by performing a smooth level switching that empty buffers (without disrupting the playback) and reducing the max buffer length.
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_FULL_ERROR, fatal : false }
-     */
-    const BUFFER_FULL_ERROR: string;
-    /**
-     * raised after hls.js seeks over a buffer hole to unstuck the playback,
-     * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_SEEK_OVER_HOLE, fatal : false, hole : hole duration }
-     */
-    const BUFFER_SEEK_OVER_HOLE: string;
-    /**
-     * raised when playback is stuck although currentTime is in a buffered aread
-     * data: { type: MEDIA_ERROR, details: Hls.ErrorDetails.BUFFERED_STALLED_ERROR, fatal: true }
-     */
-    const BUFFER_NUDGE_ON_STALL: string;
+    interface TimelineController {
+        /**
+         * clean-up all used resources
+         */
+        destroy(): void;
+    }
 
-    // MUX_ERROR //
-    /**
-     * raised when memory allocation fails during remuxing
-     * data: { type: MUX_ERROR, details: Hls.ErrorDetails.REMUX_ALLOC_ERROR, fatal: false, bytes: mdat size, reason: failure reason }
-     */
-    const REMUX_ALLOC_ERROR: string;
+    interface Tracks {
+        container: any;
+        codec: string;
+        levelCodec: any;
+        initSegment: any;
+        metadata: any;
+    }
 
-    // OTHER_ERROR //
-    /**
-     * raised when level switching fails
-     * data: { type : OTHER_ERROR, details : Hls.ErrorDetails.LEVEL_SWITCH_ERROR, fatal : false, level : failed level index, reason : failure reason }
-     */
-    const LEVEL_SWITCH_ERROR: string;
-    /**
-     * raised when an exception occurs in an internal hls.js event handler
-     * data: { type: OTHER_ERROR, details: Hls.ErrorDetails.INTERNAL_EXCEPTION, fatal: true or false, event: event object or string, error: { message: error message } }
-     */
-    const INTERNAL_EXCEPTION: string;
-  }
+    interface Stats {
+        /**
+         * performance.now() just after load() has been called
+         */
+        trequest: number;
+        /**
+         * performance.now() of first received byte
+         */
+        tfirst: number;
+        /**
+         * performance.now() on load complete
+         */
+        tload: number;
+        mtime: number;
+        tbuffered?: number;
+        length?: number;
+    }
 
-  /**
-   * Hls error types
-   */
-  namespace ErrorTypes {
     /**
-     * network related errors
+     * a Level object represents a given quality level and contains quality level related info
      */
-    const NETWORK_ERROR: string;
-    /**
-     * media/video related errors
-     */
-    const MEDIA_ERROR: string;
-    /**
-     * muxing related errors
-     */
-    const MUX_ERROR: string;
-    /**
-     * all other erros
-     */
-    const OTHER_ERROR: string;
-  }
-  /**
-   * override Hls default configuration
-   * this configuration will be applied by default to all instances
-   */
-  let DefaultConfig: Config;
-  /**
-   * checks whether your browser is supporting MediaSource Extensions
-   */
-  function isSupported(): boolean;
-  /**
-   * returns hls.js dist version number
-   */
-  const version: string;
+    interface Level {
+        /**
+         * level url. might contain sever items if failover/redundant streams are found in the manifest
+         */
+        url: string[];
+        /**
+         * level bitrate
+         */
+        bitrate: number;
+        /**
+         * level name
+         */
+        name: string;
+        /**
+         * used codecs
+         */
+        codecs: string;
+        /**
+         * video width
+         */
+        width: number;
+        /**
+         * video height
+         */
+        height: number;
+        /**
+         * level details
+         */
+        details: LevelDetails;
+    }
 
-  interface Config {
     /**
-     * (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)
-     * if set to false, levels will not be limited. All available levels could be used in auto-quality mode taking only bandwidth into consideration.
+     * a LevelDetails object contains level details retrieved after level playlist parsing
      */
-    capLevelToPlayerSize: boolean;
+    interface LevelDetails {
+        /**
+         * protocol version
+         */
+        version: number;
+        /**
+         * playlist type
+         */
+        type: string;
+        /**
+         * start sequence number
+         */
+        startSN: number;
+        /**
+         * end sequence number
+         */
+        endSN: number;
+        /**
+         * level total duration
+         */
+        totalduration: number;
+        /**
+         * level fragment target duration
+         */
+        targetduration: number;
+        /**
+         * average fragment duration
+         */
+        averagetargetduration: number;
+        /**
+         * array of fragments info
+         */
+        fragments: Fragment[];
+        /**
+         * is this level a live playlist or not?
+         */
+        live: boolean;
+    }
+
     /**
-     * (default: false)
-     * setting config.debug = true; will turn on debug logs on JS console.
-     * a logger object could also be provided for custom logging: config.debug = customLogger;
+     * the Fragment object contains fragment related info
      */
-    debug: boolean;
+    interface Fragment {
+        /**
+         * fragment duration
+         */
+        duration: number;
+        /**
+         * fragment level identifier
+         */
+        level: number;
+        /**
+         * fragment sequence number
+         */
+        sn: number;
+        /**
+         * fragment start offset
+         */
+        start: number;
+        /**
+         * fragment url
+         */
+        url: string;
+        /**
+         * stream start date and time
+         */
+        programDateTime: Date;
+        /**
+         * continuity count
+         */
+        cc: number;
+        /**
+         * list of tags associated with the fragment
+         */
+        tagList: string[][];
+        /**
+         * fragment title
+         */
+        title: string;
+    }
+
+    // interface Segment {}
+
+    // interface TimeRange {}
+
+    // interface SubtitleTracks {}
+
+    interface Config {
+        /**
+         * (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)
+         * if set to false, levels will not be limited. All available levels could be used in auto-quality mode taking only bandwidth into consideration.
+         */
+        capLevelToPlayerSize: boolean;
+        /**
+         * (default: false)
+         * setting config.debug = true; will turn on debug logs on JS console.
+         * 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.
+         * If sampling rate is less or equal than 22050 Hz, then hls.js assumes it is HE-AAC, otherwise it assumes it is AAC-LC.
+         * This could result in bad guess, leading to audio decode error, ending up in media error.
+         * It is possible to hint default audiocodec to hls.js by configuring this value as below:
+         * mp4a.40.2 (AAC-LC) or
+         * mp4a.40.5 (HE-AAC) or
+         * undefined (guess based on sampling rate)
+         */
+        defaultAudioCodec: string;
+        /**
+         * (default: 1)
+         * number of segments needed to start a playback of Live stream.
+         */
+        initialLiveManifestSize: number;
+        /**
+         * (default: 30 seconds)
+         * Maximum buffer length in seconds. If buffer length is/become less than this value, a new fragment will be loaded.
+         * This is the guaranteed buffer length hls.js will try to reach, regardless of maxBufferSize.
+         */
+        maxBufferLength: number;
+        /**
+         * (default 600s)
+         * Maximum buffer length in seconds. Hls.js will never exceed this value, even if maxBufferSize is not reached yet.
+         * hls.js tries to buffer up to a maximum number of bytes (60 MB by default) rather than to buffer up to a maximum nb of seconds.
+         * This is to mimic the browser behaviour (the buffer eviction algorithm is starting after the browser detects that video buffer size reaches a limit in bytes)
+         * maxBufferLength is the minimum guaranteed buffer length that hls.js will try to achieve, even if that value exceeds the amount of bytes 60 MB of memory.
+         * maxMaxBufferLength acts as a capping value, as if bitrate is really low, you could need more than one hour of buffer to fill 60 MB.
+         */
+        maxMaxBufferLength: number;
+        /**
+         * (default: 60 MB)
+         * 'Minimum' maximum buffer size in bytes. If buffer size upfront is bigger than this value, no fragment will be loaded
+         */
+        maxBufferSize: number;
+        /**
+         * (default: 0.5 seconds)
+         * 'Maximum' inter-fragment buffer hole tolerance that hls.js can cope with when searching for the next fragment to load. When switching between quality level,
+         * fragments might not be perfectly aligned.
+         * 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)
+         *
+         * ABR algorithm will always try to choose a quality level that should avoid rebuffering. In case no quality level with this criteria can
+         * be found (lets say for example that buffer length is 1s, but fetching a fragment at lowest quality is predicted to take around 2s ...
+         * ie we can forecast around 1s of rebuffering ...) then ABR algorithm will try to find a level that should guarantee less than
+         * maxStarvationDelay of buffering.
+         */
+        maxStarvationDelay: 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: 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,
+         * hls.js will try to nudge playhead to recover playback
+         */
+        lowBufferWatchdogPeriod: number;
+        /**
+         * (default: 3s)
+         * if media element is expected to play and if currentTime has not moved for more than highBufferWatchdogPeriod and if there are more than maxBufferHole seconds buffered upfront,
+         * hls.js will try to nudge playhead to recover playback
+         */
+        highBufferWatchdogPeriod: number;
+        /**
+         * (default: 0.1s)
+         * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
+         * media.currentTime += (nb nudge retry -1)*nudgeOffset
+         */
+        nudgeOffset: number;
+        /**
+         * (default: 3s)
+         * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
+         * media.currentTime += (nb nudge retry -1)*nudgeOffset
+         */
+        nudgeMaxRetry: number;
+        /**
+         * (default 4s)
+         *
+         * max video loading delay used in automatic start level selection : in that mode ABR controller will ensure that video loading time (ie
+         * the time to fetch the first fragment at lowest quality level + the time to fetch the fragment at the appropriate quality level is less
+         * than maxLoadingDelay )
+         */
+        maxFragLookUpTolerance: number;
+        /**
+         * (default: 3)
+         * edge of live delay, expressed in multiple of EXT-X-TARGETDURATION. if set to 3, playback will start from fragment N-3, N being the last fragment of the live playlist.
+         * 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.
+         * If defined in the configuration object, liveSyncDuration will take precedence over the default liveSyncDurationCount.
+         * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
+         * A value too low (inferior to ~3 segment durations) is likely to cause playback stalls.
+         */
+        liveSyncDuration: number;
+        /**
+         * (default: undefined)
+         * Alternative parameter to liveMaxLatencyDurationCount, expressed in seconds vs number of segments.
+         * If defined in the configuration object, liveMaxLatencyDuration will take precedence over the default liveMaxLatencyDurationCount.
+         * If set, this value must be stricly superior to liveSyncDuration which must be defined as well.
+         * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
+         * 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.
+         */
+        enableWorker: boolean;
+        /**
+         * (default: true)
+         * Enable to use JavaScript version AES decryption for fallback of WebCrypto API.
+         */
+        enableSoftwareAES: boolean;
+        /**
+         * (default: undefined)
+         * When set, use this level as the default hls.startLevel. Keep in mind that the startLevel set with the API takes precedence over
+         * config.startLevel configuration parameter.
+         */
+        startLevel: number;
+        /**
+         * (default: 10000ms for level and manifest)
+         * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
+         * It is up to the application to catch this event and treat it as needed.
+         */
+        manifestLoadingTimeOut: number;
+        /**
+         * (default: 3)
+         * Max number of load retries.
+         */
+        manifestLoadingMaxRetry: number;
+        /**
+         * (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).
+         * Prefetch start fragment although media not attached.
+         */
+        manifestLoadingRetryDelay: number;
+        /**
+         * (default: 64000 ms)
+         * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
+         */
+        manifestLoadingMaxRetryTimeout: number;
+        /**
+         * (default: 60000ms for fragment)
+         * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
+         * It is up to the application to catch this event and treat it as needed.
+         */
+        levelLoadingTimeOut: number;
+        /**
+         * (default: 3)
+         * Max number of load retries.
+         */
+        levelLoadingMaxRetry: number;
+        /**
+         * (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).
+         * Prefetch start fragment although media not attached.
+         */
+        levelLoadingRetryDelay: number;
+        /**
+         * (default: 64000 ms)
+         * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
+         */
+        levelLoadingMaxRetryTimeout: number;
+        /**
+         * (default: 60000ms for fragment)
+         * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
+         * It is up to the application to catch this event and treat it as needed.
+         */
+        fragLoadingTimeOut: number;
+        /**
+         * (default: 3)
+         * Max number of load retries.
+         */
+        fragLoadingMaxRetry: number;
+        /**
+         * (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).
+         * Prefetch start fragment although media not attached.
+         */
+        fragLoadingRetryDelay: number;
+        /**
+         * (default: 64000 ms)
+         * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
+         */
+        fragLoadingMaxRetryDelay: number;
+        /**
+         * (default: false)
+         * Start prefetching start fragment although media not attached yet. Max number of append retries.
+         */
+        startFragPrefech: 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).
+         * In that case we need to wait for the browser to evict some data before being able to append buffer correctly.
+         */
+        appendErrorMaxRetry: number;
+        /**
+         * (default: standard XMLHttpRequest-based URL loader)
+         * Override standard URL loader by a custom one. Could be useful for P2P or stubbing (testing).
+         * Use this, if you want to overwrite both the fragment and the playlist loader.
+         * Note: If fLoader or pLoader are used, they overwrite loader!
+         */
+        loader: typeof Loader;
+        /**
+         * (default: undefined)
+         * This enables the manipulation of the fragment loader.
+         * Note: This will overwrite the default loader, as well as your own loader function.
+         */
+        fLoader?: typeof Loader;
+        /**
+         * (default: undefined)
+         * This enables the manipulation of the playlist loader.
+         * Note: This will overwrite the default loader, as well as your own loader function.
+         */
+        pLoader?: typeof Loader;
+        /**
+         * (default: undefined)
+         * XMLHttpRequest customization callback for default XHR based loader.
+         * Parameter should be a function with two arguments (xhr: XMLHttpRequest, url: string).
+         * If xhrSetup is specified, default loader will invoke it before calling xhr.send(). This allows user to easily modify/setup XHR.
+         */
+        xhrSetup?(xhr: XMLHttpRequest, url: string): void;
+        /**
+         * (default: undefined)
+         * Fetch customization callback for Fetch based loader.
+         * Parameter should be a function with two arguments (context and Request Init Params).
+         * If fetchSetup is specified and Fetch loader is used, fetchSetup will be triggered to instantiate Request Object. This allows user to easily tweak Fetch loader.
+         */
+        fetchSetup?(context: any, initParams: any): Request;
+        /**
+         * (default: internal ABR controller)
+         * Customized Adaptive Bitrate Streaming Controller.
+         * Parameter should be a class providing 2 getters, 2 setters and a destroy() method:
+         * get/set nextAutoLevel: return next auto-quality level/force next auto-quality level that should be returned (currently used for emergency switch down)
+         * get/set autoLevelCapping: capping/max level value that could be used by ABR Controller
+         * destroy(): should clean-up all used resources
+         */
+        abrController: AbrController;
+        /**
+         * (default: internal track timeline controller)
+         * Customized text track syncronization controller.
+         * Parameter should be a class with a destroy() method:
+         * 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
+         */
+        enableCEA708Captions: boolean;
+        /**
+         * (default: English)
+         * Label for the text track generated for CEA-708 captions track 1. This is how it will appear in the browser's native menu for subtitles and captions.
+         */
+        captionsTextTrack1Label: string;
+        /**
+         * (default: en)
+         * RFC 3066 language code for the text track generated for CEA-708 captions track 1.
+         */
+        captionsTextTrack1LanguagedCode: string;
+        /**
+         * (default: Spanish)
+         * Label for the text track generated for CEA-708 captions track 2. This is how it will appear in the browser's native menu for subtitles and captions.
+         */
+        captionsTextTrack2Label: string;
+        /**
+         * (default: es)
+         * RFC 3066 language code for the text track generated for CEA-708 captions track 2.
+         */
+        captionsTextTrack2LanguageCode: string;
+        /**
+         * (default: false)
+         * If a segment's video track is shorter than its audio track by > min(maxSeekHole, maxBufferHole), extend the final video frame's duration to match the audio track's duration.
+         * 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.
+         */
+        forceKeyFrameOnDiscontinuity: boolean;
+        /**
+         * (default: 5.0)
+         * Fast bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
+         * Half of the estimate is based on the last abrEwmaFastLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+         * parameter should be a float greater than 0
+         */
+        abrEwmaFastLive: number;
+        /**
+         * (default: 9.0)
+         * Slow bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
+         * Half of the estimate is based on the last abrEwmaSlowLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+         * parameter should be a float greater than abrEwmaFastLive
+         */
+        abrEwmaSlowLive: number;
+        /**
+         * (default: 4.0)
+         * Fast bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
+         * Half of the estimate is based on the last abrEwmaFastVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+         * parameter should be a float greater than 0
+         */
+        abrEwmaFastVod: number;
+        /**
+         * (default: 15.0)
+         * Slow bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
+         * Half of the estimate is based on the last abrEwmaSlowVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
+         * parameter should be a float greater than abrEwmaFastVoD
+         */
+        abrEwmaSlowVod: number;
+        /**
+         * (default: 500000)
+         * Default bandwidth estimate in bits/second prior to collecting fragment bandwidth samples.
+         * parameter should be a float
+         */
+        abrEwmaDefaultEstimate: number;
+        /**
+         * (default: 0.8)
+         * Scale factor to be applied against measured bandwidth average, to determine whether we can stay on current or lower quality level.
+         * If abrBandWidthFactor * bandwidth average < level.bitrate then ABR can switch to that level providing that it is equal or less than current level.
+         */
+        abrBandWidthFactor: number;
+        /**
+         * (default: 0.7)
+         * Scale factor to be applied against measured bandwidth average, to determine whether we can switch up to a higher quality level.
+         * If abrBandWidthUpFactor * bandwidth average < level.bitrate then ABR can switch up to that quality level.
+         */
+        abrBandWidthUpFactor: number;
+        /**
+         * (default: false)
+         * max bitrate used in ABR by avg measured bitrate i.e. if bitrate signaled in variant manifest for a given level is 2Mb/s but average bitrate measured on this level is 2.5Mb/s,
+         * then if config value is set to true, ABR will use 2.5 Mb/s for this quality level.
+         */
+        abrMaxWithRealBitrate: boolean;
+        /**
+         * (default: 0)
+         * Return the capping/min bandwidth value that could be used by automatic level selection algorithm.
+         * Useful when browser or tab of the browser is not in the focus and bandwidth drops
+         */
+        minAutoBitrate: number;
+    }
+
+    interface mediaAttachingData {
+        video: HTMLVideoElement;
+        mediaSource: string;
+    }
+
+    interface mediaAttachedData {
+        video: HTMLVideoElement;
+        mediaSource: string;
+    }
+
+    // interface mediaDetachingData {}
+
+    // interface mediaDetachedData {}
+
+    // interface bufferResetData {}
+
+    interface bufferCodecsData {
+        tracks: Tracks;
+    }
+
+    interface bufferCreatedData {
+        tracks: Tracks;
+    }
+
+    interface bufferAppendingData {
+        segment: {};
+    }
+
+    interface bufferAppendedData {
+        parent: {};
+        pending: number;
+        timeRanges: {
+            video: {};
+            audio: {};
+        };
+    }
+
+    // interface bufferEosData {}
+
+    interface bufferFlushingData {
+        startOffset: number;
+        endOffset: number;
+    }
+
+    interface bufferFlushedData {
+        startOffset: number;
+        endOffset: number;
+    }
+
+    interface manifestLoadingData {
+        url: string;
+    }
+
+    interface manifestLoadedData {
+        levels: number[];
+        audioTracks: number[];
+        url: string;
+        stats: Stats;
+    }
+
+    interface manifestParsedData {
+        levels: number[];
+        firstLevel: number;
+    }
+
+    interface levelLoadingData {
+        url: string;
+        level: number;
+    }
+
+    interface levelLoadedData {
+        details: LevelDetails;
+        levelId: number;
+        stats: Stats;
+    }
+
+    interface levelUpdatedData {
+        details: LevelDetails;
+        level: number;
+    }
+
+    interface levelPtsUpdatedData {
+        details: LevelDetails;
+        level: number;
+        drift: number;
+    }
+
+    interface levelSwitchingData {
+        attrs: any;
+        audioCodec: string;
+        bitrate: number;
+        fragmentError: boolean;
+        height: number;
+        level: number;
+        loadError: number;
+        name: string;
+        unknownCodecs: string[];
+        url: string[];
+        urlId: number;
+        videoCodec: string;
+        width: number;
+    }
+
+    interface levelSwitchedData {
+        level: number;
+    }
+
+    interface audioTracksUpdatedData {
+        audioTracks: AudioTrack[];
+    }
+
+    interface audioTrackSwitchingData {
+        id: string;
+    }
+
+    interface audioTrackSwitchedData {
+        id: string;
+    }
+
+    interface audioTrackLoadingData {
+        url: string;
+        id: string;
+    }
+
+    interface audioTrackLoadedData {
+        details: LevelDetails;
+        id: string;
+        stats: Stats;
+    }
+
+    interface subtitleTracksUpdatedData {
+        subtitleTracks: {};
+    }
+
+    interface subtitleTrackSwitchData {
+        id: string;
+    }
+
+    interface subtitleTrackLoadingData {
+        url: string;
+        id: string;
+    }
+
+    interface subtitleTrackLoadedData {
+        details: LevelDetails;
+        id: string;
+        stats: Stats;
+    }
+
+    interface subtitleFragProcessedData {
+        success: boolean;
+        frag: Fragment;
+    }
+
+    interface initPtsFoundData {
+        d: string;
+        initPTS: number;
+        frag: Fragment;
+    }
+
+    interface fragLoadingData {
+        frag: Fragment;
+    }
+
+    interface fragLoadProgressData {
+        frag: Fragment;
+        stats: Stats;
+    }
+
+    interface fragLoadEmergencyAbortedData {
+        frag: Fragment;
+    }
+
+    interface fragLoadedData {
+        frag: Fragment;
+        payload: any;
+    }
+
+    interface fragDecryptedData {
+        id: string;
+        frag: Fragment;
+        payload: any;
+        stats: Stats;
+    }
+
+    interface fragParsingInitSegmentData {
+        id: string;
+        frag: Fragment;
+        moov: any;
+        codecs: any;
+    }
+
+    interface fragParsingUserData {
+        id: string;
+        frag: Fragment;
+        samples: any[];
+    }
+
+    interface fragParsingMetadata {
+        id: string;
+        frag: Fragment;
+        samples: any[];
+    }
+
+    interface fragParsingData {
+        id: string;
+        frag: Fragment;
+        moof: any;
+        mdat: any;
+        startPTS: number;
+        endPTS: number;
+        startDTS: number;
+        endDTS: number;
+        type: string;
+        nb: number;
+    }
+
+    interface fragParsedData {
+        id: string;
+        frag: Fragment;
+    }
+
+    interface fragBufferedData {
+        id: string;
+        frag: Fragment;
+        stats: Stats;
+    }
+
+    interface fragChangedData {
+        id: string;
+        frag: Fragment;
+    }
+
+    interface fpsDropData {
+        currentDropped: number;
+        currentDecoded: number;
+        totalDroppedFragmes: number;
+    }
+
+    interface fpsDropLevelCappingData {
+        level: Level;
+        droppedLevel: Level;
+    }
+
+    interface errorData {
+        type: string;
+        details: string;
+        fatal: boolean;
+        frag?: Fragment;
+        networkDetails?: XMLHttpRequest;
+        response?: LoaderError;
+        context?: LoaderContext;
+        levelRetry?: boolean;
+        url?: string;
+        loader?: Loader;
+        buffer?: number;
+    }
+
+    // interface destroyingData {}
+
+    interface keyLoadingData {
+        frag: Fragment;
+    }
+
+    interface keyLoadedData {
+        frag: Fragment;
+    }
+
+    interface streamStateTransitionData {
+        previousState: any;
+        nextState: any;
+    }
+
+    interface LoaderConfig {
+        /**
+         * Max number of load retries
+         */
+        maxRetry: number;
+        /**
+         * Timeout after which `onTimeOut` callback will be triggered (if loading is still not finished after that delay)
+         */
+        timeout: number;
+        /**
+         * Delay between an I/O error and following connection retry (ms). This to avoid spamming the server
+         */
+        retryDelay: number;
+        /**
+         * max connection retry delay (ms)
+         */
+        maxRetryDelay: number;
+    }
+
+    interface LoaderResponse {
+        url: string;
+        data: string | ArrayBuffer;
+    }
+
+    interface LoaderError {
+        /**
+         * error code
+         */
+        code: number;
+        /**
+         *  error description
+         */
+        text: string;
+    }
+
+    interface LoaderContext {
+        /**
+         * target URL
+         */
+        url: string;
+        /**
+         * loader response type (arraybuffer or default response type for playlist)
+         */
+        responseType: string;
+        /**
+         * start byte range offset
+         */
+        rangeStart?: number;
+        /**
+         * end byte range offset
+         */
+        rangeEnd?: number;
+        /**
+         * true if onProgress should report partial chunk of loaded content
+         */
+        progressData?: boolean;
+        /**
+         * fragment object
+         */
+        frag: Fragment;
+        /**
+         * request type
+         * - level, manifest
+         */
+        type: string;
+        /**
+         * level id
+         */
+        level: number;
+    }
+
+    interface LoaderStats {
+        /**
+         * performance.now() just after load() has been called
+         */
+        trequest: number;
+        /**
+         * performance.now() of first received byte
+         */
+        tfirst: number;
+        /**
+         * performance.now() on load complete
+         */
+        tload: number;
+        /**
+         * number of loaded bytes
+         */
+        loaded: number;
+        /**
+         * download bandwitdh in bit/s
+         */
+        bw: number;
+        /**
+         * total nb of bytes
+         */
+        total: number;
+    }
+
+    interface LoaderCallbacks {
+        onSuccess(
+            response: LoaderResponse,
+            stats: LoaderStats,
+            context: LoaderContext
+        ): void;
+        onProgress(
+            stats: LoaderStats,
+            context: LoaderContext,
+            data: string | ArrayBuffer
+        ): void;
+        onError(error: LoaderError, context: LoaderContext): void;
+        onTimeout(stats: LoaderStats, context: LoaderContext): void;
+    }
+}
+
+declare class Hls {
+    /**
+     * override Hls default configuration
+     * this configuration will be applied by default to all instances
+     */
+    static DefaultConfig: Hls.Config;
+    /**
+     * returns hls.js dist version number
+     */
+    static version: string;
+    /**
+     * checks whether your browser is supporting MediaSource Extensions
+     */
+    static isSupported(): boolean;
+
+    /**
+     * Hls events
+     */
+    static Events: {
+        /**
+         * fired to attach Media to hls instance
+         * data: { video , mediaSource }
+         */
+        MEDIA_ATTACHING: K_MEDIA_ATTACHING;
+        /**
+         * fired when Media has been succesfully attached to hls instance
+         * data: { video , mediaSource }
+         */
+        MEDIA_ATTACHED: K_MEDIA_ATTACHED;
+        /**
+         * fired before detaching Media from hls instance
+         * data: { }
+         */
+        MEDIA_DETACHING: K_MEDIA_DETACHING;
+        /**
+         * fired when Media has been detached from hls instance
+         * data: { }
+         */
+        MEDIA_DETACHED: K_MEDIA_DETACHED;
+        /**
+         * fired when the buffer is going to be reset
+         * data: { }
+         */
+        BUFFER_RESET: K_BUFFER_RESET;
+        /**
+         * fired when we know about the codecs that we need buffers for to push into
+         * data: { tracks : { container, codec, levelCodec, initSegment, metadata } }
+         */
+        BUFFER_CODECS: K_BUFFER_CODECS;
+        /**
+         * fired when sourcebuffers have been created
+         * data: { tracks: tracks }
+         */
+        BUFFER_CREATED: K_BUFFER_CREATED;
+        /**
+         * fired when we append a segment to the buffer
+         * data: { segment: segment object }
+         */
+        BUFFER_APPENDING: K_BUFFER_APPENDING;
+        /**
+         * fired when we are done with appending a media segment to the buffer
+         * data: { parent : segment parent that triggered BUFFER_APPENDING, pending : nb of segments waiting for appending for this segment parent }
+         */
+        BUFFER_APPENDED: K_BUFFER_APPENDED;
+        /**
+         * fired when the stream is finished and we want to notify the media buffer that there will be no more data
+         * data: { }
+         */
+        BUFFER_EOS: K_BUFFER_EOS;
+        /**
+         * fired when the media buffer should be flushed
+         * data: { }
+         */
+        BUFFER_FLUSHING: K_BUFFER_FLUSHING;
+        /**
+         * fired when the media buffer has been flushed
+         * data: { }
+         */
+        BUFFER_FLUSHED: K_BUFFER_FLUSHED;
+        /**
+         * fired to signal that a manifest loading starts
+         * data: { url : manifestURL }
+         */
+        MANIFEST_LOADING: K_MANIFEST_LOADING;
+        /**
+         * fired after manifest has been loaded
+         * data: { levels : [available quality levels] , audioTracks : [ available audio tracks], url : manifestURL, stats : { trequest, tfirst, tload, mtime}}
+         */
+        MANIFEST_LOADED: K_MANIFEST_LOADED;
+        /**
+         * fired after manifest has been parsed
+         * data: { levels : [ available quality levels ], firstLevel : index of first quality level appearing in Manifest }
+         */
+        MANIFEST_PARSED: K_MANIFEST_PARSED;
+        /**
+         * fired when a level playlist loading starts
+         * data: { url : level URL, level : id of level being loaded }
+         */
+        LEVEL_LOADING: K_LEVEL_LOADING;
+        /**
+         * fired when a level playlist loading finishes
+         * data: { details : levelDetails object, levelId : id of loaded level, stats : { trequest, tfirst, tload, mtime } }
+         */
+        LEVEL_LOADED: K_LEVEL_LOADED;
+        /**
+         * fired when a level's details have been updated based on previous details, after it has been loaded
+         * data: { details : levelDetails object, level : id of updated level }
+         */
+        LEVEL_UPDATED: K_LEVEL_UPDATED;
+        /**
+         * fired when a level's PTS information has been updated after parsing a fragment
+         * data: { details: levelDetails object, level : id of updated level, drift: PTS drift observed when parsing last fragment }
+         */
+        LEVEL_PTS_UPDATED: K_LEVEL_PTS_UPDATED;
+        /**
+         * fired when a level switch is requested
+         * data: { level: Level }
+         */
+        LEVEL_SWITCHING: K_LEVEL_SWITCHING;
+        /**
+         * fired when a level switch is effective
+         * data: { level: level object }
+         */
+        LEVEL_SWITCHED: K_LEVEL_SWITCHED;
+        /**
+         * fired to notify that audio track lists has been updated
+         * data: { audioTracks : audioTracks }
+         */
+        AUDIO_TRACKS_UPDATED: K_AUDIO_TRACKS_UPDATED;
+        /**
+         * fired when an audio track switch occurs. deprecated in favor AUDIO_TRACK_SWITCHING
+         * data: { id : audio track id }
+         */
+        AUDIO_TRACK_SWITCH: K_AUDIO_TRACK_SWITCH;
+        /**
+         * fired when an audio track switching is requested
+         * data: { id : audio track id }
+         */
+        AUDIO_TRACK_SWITCHING: K_AUDIO_TRACK_SWITCHING;
+        /**
+         * fired when an audio track switch actually occurs
+         * data: { id : audio track id }
+         */
+        AUDIO_TRACK_SWITCHED: K_AUDIO_TRACK_SWITCHED;
+        /**
+         * fired when an audio track loading starts
+         * data: { url : audio track URL, id : audio track id }
+         */
+        AUDIO_TRACK_LOADING: K_AUDIO_TRACK_LOADING;
+        /**
+         * fired when an audio track loading finishes
+         * data: { details : levelDetails object, id : audio track id, stats : { trequest, tfirst, tload, mtime } }
+         */
+        AUDIO_TRACK_LOADED: K_AUDIO_TRACK_LOADED;
+        /**
+         * fired to notify that subtitle track lists has been updated
+         * data: { subtitleTracks : subtitleTracks }
+         */
+        SUBTITLE_TRACKS_UPDATED: K_SUBTITLE_TRACKS_UPDATED;
+        /**
+         * fired when an subtitle track switch occurs
+         * data: { id : subtitle track id }
+         */
+        SUBTITLE_TRACK_SWITCH: K_SUBTITLE_TRACK_SWITCH;
+        /**
+         * fired when a subtitle track loading starts
+         * data: { url : subtitle track URL, id : subtitle track id }
+         */
+        SUBTITLE_TRACK_LOADING: K_SUBTITLE_TRACK_LOADING;
+        /**
+         * fired when a subtitle track loading finishes
+         * data: { details : levelDetails object, id : subtitle track id, stats : { trequest, tfirst, tload, mtime } }
+         */
+        SUBTITLE_TRACK_LOADED: K_SUBTITLE_TRACK_LOADED;
+        /**
+         * fired when a subtitle fragment has been processed
+         * data: { success : boolean, frag : the processed frag }
+         */
+        SUBTITLE_FRAG_PROCESSED: K_SUBTITLE_FRAG_PROCESSED;
+        /**
+         * fired when a decryption key loading starts
+         * data: { frag: fragment object }
+         */
+        KEY_LOADING: K_KEY_LOADING;
+        /**
+         * fired when a decryption key loading is completed
+         * data: { frag: fragment object }
+         */
+        KEY_LOADED: K_KEY_LOADED;
+        /**
+         * fired when first timestamp has been found
+         * data: { id: demuxer id, frag: fragment object, initPTS: initPTS }
+         */
+        INIT_PTS_FOUND: K_INIT_PTS_FOUND;
+        /**
+         * fired when a fragment loading starts
+         * data: { frag : fragment object }
+         */
+        FRAG_LOADING: K_FRAG_LOADING;
+        /**
+         * fired when a fragment load is in progress
+         * data: { frag : fragment object with frag.loaded=stats.loaded, stats : { trequest, tfirst, loaded, total } }
+         */
+        FRAG_LOAD_PROGRESS: K_FRAG_LOAD_PROGRESS;
+        /**
+         * identifier for fragment load aborting for emergency switch down
+         * data: { frag: fragment object }
+         */
+        FRAG_LOAD_EMERGENCY_ABORTED: K_FRAG_LOAD_EMERGENCY_ABORTED;
+        /**
+         * fired when a fragment loading is completed
+         * data: { frag : fragment object, payload : fragment payload, stats : { trequest, tfirst, tload, length}}
+         */
+        FRAG_LOADED: K_FRAG_LOADED;
+        /**
+         * fired when a fragment decryption is completed
+         * data: { id: demuxer id, frag: fragment object, stats: { tstart, tdecrypt } }
+         */
+        FRAG_DECRYPTED: K_FRAG_DECRYPTED;
+        /**
+         * fired when Init Segment has been extracted from fragment
+         * data: { id: demuxer id, moov : moov MP4 box, codecs : codecs found while parsing fragment}
+         */
+        FRAG_PARSING_INIT_SEGMENT: K_FRAG_PARSING_INIT_SEGMENT;
+        /**
+         * fired when parsing sei text is completed
+         * data: { id : demuxer id, frag: fragment object, samples : [ sei samples pes ] }
+         */
+        FRAG_PARSING_USERDATA: K_FRAG_PARSING_USERDATA;
+        /**
+         * fired when parsing id3 is completed
+         * data: { id: demuxer id, samples : [ id3 pes - pts and dts timestamp are relative, values are in seconds]}
+         */
+        FRAG_PARSING_METADATA: K_FRAG_PARSING_METADATA;
+        /**
+         * fired when moof/mdat have been extracted from fragment
+         * data: { id: demuxer id,
+         *        moof : moof MP4 box,
+         *        mdat : mdat MP4 box,
+         *        startPTS : PTS of first sample,
+         *        endPTS : PTS of last sample,
+         *        startDTS : DTS of first sample,
+         *        endDTS : DTS of last sample,
+         *        type : stream type (audio or video),
+         *        nb : number of samples}
+         */
+        FRAG_PARSING_DATA: K_FRAG_PARSING_DATA;
+        /**
+         * fired when fragment parsing is completed
+         * data: { id: demuxer id}
+         */
+        FRAG_PARSED: K_FRAG_PARSED;
+        /**
+         * fired when fragment remuxed MP4 boxes have all been appended into SourceBuffer
+         * data: { id: demuxer id, frag : fragment object, stats : { trequest, tfirst, tload, tparsed, tbuffered, length} }
+         */
+        FRAG_BUFFERED: K_FRAG_BUFFERED;
+        /**
+         * fired when fragment matching with current video position is changing
+         * data: { frag : fragment object }
+         */
+        FRAG_CHANGED: K_FRAG_CHANGED;
+        /**
+         * triggered when FPS drop in last monitoring period is higher than given threshold
+         * data: { curentDropped : nb of dropped frames in last monitoring period,
+         *         currentDecoded : nb of decoded frames in last monitoring period,
+         *         totalDropped : total dropped frames on this video element }
+         */
+        FPS_DROP: K_FPS_DROP;
+        /**
+         * triggered when FPS drop triggers auto level capping
+         * data: { level: suggested new auto level capping by fps controller, droppedLevel : level has to much dropped frame will be restricted }
+         */
+        FPS_DROP_LEVEL_CAPPING: K_FPS_DROP_LEVEL_CAPPING;
+        /**
+         *  Identifier for an error event
+         * data: { type : error type, details : error details, fatal : is error fatal or not, other error specific data }
+         */
+        ERROR: K_ERROR;
+        /**
+         * fired when hls.js instance starts destroying. Different from MEDIA_DETACHED as one could want to detach and reattach a video to the instance of hls.js to handle mid-rolls for example.
+         * data: { }
+         */
+        DESTROYING: K_DESTROYING;
+        /**
+         * fired upon stream controller state transitions
+         * data: { previousState, nextState }
+         */
+        STREAM_STATE_TRANSITION: K_STREAM_STATE_TRANSITION;
+    };
+    /**
+     * Hls error types
+     */
+    static ErrorTypes: {
+        /**
+         * Identifier for a network error (loading error / timeout ...)
+         */
+        NETWORK_ERROR: K_NETWORK_ERROR;
+        /**
+         * Identifier for a media Error (video/parsing/mediasource error)
+         */
+        MEDIA_ERROR: K_MEDIA_ERROR;
+        /**
+         * EME (encrypted media extensions) errors
+         */
+        KEY_SYSTEM_ERROR: K_KEY_SYSTEM_ERROR;
+        /**
+         * Identifier for a mux Error (demuxing/remuxing)
+         */
+        MUX_ERROR: K_MUX_ERROR;
+        /**
+         * Identifier for all other errors
+         */
+        OTHER_ERROR: K_OTHER_ERROR;
+    };
+    /**
+     * Hls error details
+     */
+    static ErrorDetails: {
+        // NETWORK_ERRORS //
+        /**
+         * raised when manifest loading fails because of a network error
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.MANIFEST_LOAD_ERROR, fatal : true, url : manifest URL, response : { code: error code, text: error text }, loader : URL loader }
+         */
+        MANIFEST_LOAD_ERROR: K_MANIFEST_LOAD_ERROR;
+        /**
+         * raised when manifest loading fails because of a timeout
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.MANIFEST_LOAD_TIMEOUT, fatal : true, url : manifest URL, loader : URL loader }
+         */
+        MANIFEST_LOAD_TIMEOUT: K_MANIFEST_LOAD_TIMEOUT;
+        /**
+         * raised when manifest parsing failed to find proper content
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.MANIFEST_PARSING_ERROR, fatal : true, url : manifest URL, reason : parsing error reason }
+         */
+        MANIFEST_PARSING_ERROR: K_MANIFEST_PARSING_ERROR;
+        /**
+         * raised when level loading fails because of a network error
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.LEVEL_LOAD_ERROR, fatal : true, url : level URL, response : { code: error code, text: error text }, loader : URL loader }
+         */
+        LEVEL_LOAD_ERROR: K_LEVEL_LOAD_ERROR;
+        /**
+         * raised when level loading fails because of a timeout
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.LEVEL_LOAD_TIMEOUT, fatal : true, url : level URL, loader : URL loader }
+         */
+        LEVEL_LOAD_TIMEOUT: K_LEVEL_LOAD_TIMEOUT;
+        /**
+         * raised when audio track loading fails because of a network error
+         * data: { type: NETWORK_ERROR, details: Hls.ErrorDetails.AUDIO_TRACK_LOAD_ERROR, fatal: false, url: audio URL, loader: URL loader }
+         */
+        AUDIO_TRACK_LOAD_ERROR: K_AUDIO_TRACK_LOAD_ERROR;
+        /**
+         * raised when audio track loading fails because of a timeout
+         * data: { type: NETWORK_ERROR, details: Hls.ErrorDetails.AUDIO_TRACK_LOAD_TIMEOUT, fatal: false, url: audio URL, response: { code: error code, text: error text }, loader: URL loader }
+         */
+        AUDIO_TRACK_LOAD_TIMEOUT: K_AUDIO_TRACK_LOAD_TIMEOUT;
+        /**
+         * raised when fragment loading fails because of a network error
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_LOAD_ERROR, fatal : true or false, frag : fragment object, response : { code: error code, text: error text } }
+         */
+        FRAG_LOAD_ERROR: K_FRAG_LOAD_ERROR;
+        /**
+         * raised when fragment loading fails because of a timeout
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_LOAD_TIMEOUT, fatal : true or false, frag : fragment object }
+         */
+        FRAG_LOAD_TIMEOUT: K_FRAG_LOAD_TIMEOUT;
+        /**
+         * raised when decrypt key loading fails because of a network error
+         * data: { type: NETWORK_ERROR, details: Hls.ErrorDetails.KEY_LOAD_ERROR, fatal: false, frag: fragment object }
+         */
+        KEY_LOAD_ERROR: K_KEY_LOAD_ERROR;
+        /**
+         * raised when decrypt key loading fails because of timeout
+         * data: { type: NETWORK_EROR, details: Hls.ErrorDetails.KEY_LOAD_TIMEOUT, fatal: true, frag: fragment object }
+         */
+        KEY_LOAD_TIMEOUT: K_KEY_LOAD_TIMEOUT;
+
+        // MEDIA_ERRORS //
+        /**
+         * raised when manifest only contains quality level with codecs incompatible with MediaSource Engine.
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR, fatal : true, url : manifest URL }
+         */
+        MANIFEST_INCOMPATIBLE_CODECS_ERROR: K_MANIFEST_INCOMPATIBLE_CODECS_ERROR;
+        /**
+         * raised upon detection of same fragment being requested in loop
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_LOOP_LOADING_ERROR, fatal : true or false, frag : fragment object }
+         */
+        FRAG_LOOP_LOADING_ERROR: K_FRAG_LOOP_LOADING_ERROR;
+        /**
+         * raised when fragment decryption fails
+         * data: { type: MEDIA_ERROR, details: Hls.ErrorDetails.FRAG_DECRYPT_ERROR, fatal: true, reason: failure reason }
+         */
+        FRAG_DECRYPT_ERROR: K_FRAG_DECRYPT_ERROR;
+        /**
+         * raised when fragment parsing fails
+         * data: { type : NETWORK_ERROR, details : Hls.ErrorDetails.FRAG_PARSING_ERROR, fatal : true or false, reason : failure reason }
+         */
+        FRAG_PARSING_ERROR: K_FRAG_PARSING_ERROR;
+        /**
+         *  raised when MediaSource fails to add new sourceBuffer
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_ADD_CODEC_ERROR, fatal : false, err : error raised by MediaSource, mimeType: mimeType on which the failure happened }
+         */
+        BUFFER_ADD_CODEC_ERROR: K_BUFFER_ADD_CODEC_ERROR;
+        /**
+         * raised when exception is raised while calling buffer append
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_APPEND_ERROR, fatal : true, frag : fragment object }
+         */
+        BUFFER_APPEND_ERROR: K_BUFFER_APPEND_ERROR;
+        /**
+         * raised when exception is raised during buffer appending
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_APPENDING_ERROR, fatal : false }
+         */
+        BUFFER_APPENDING_ERROR: K_BUFFER_APPENDING_ERROR;
+        /**
+         * raised when playback is stuck because buffer is running out of data
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_STALLED_ERROR, fatal : false }
+         */
+        BUFFER_STALLED_ERROR: K_BUFFER_STALLED_ERROR;
+        /**
+         * raised when no data can be appended anymore in media buffer because it is full.
+         * This error is recovered automatically by performing a smooth level switching that empty buffers (without disrupting the playback) and reducing the max buffer length.
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_FULL_ERROR, fatal : false }
+         */
+        BUFFER_FULL_ERROR: K_BUFFER_FULL_ERROR;
+        /**
+         * raised after hls.js seeks over a buffer hole to unstuck the playback,
+         * data: { type : MEDIA_ERROR, details : Hls.ErrorDetails.BUFFER_SEEK_OVER_HOLE, fatal : false, hole : hole duration }
+         */
+        BUFFER_SEEK_OVER_HOLE: K_BUFFER_SEEK_OVER_HOLE;
+        /**
+         * raised when playback is stuck although currentTime is in a buffered aread
+         * data: { type: MEDIA_ERROR, details: Hls.ErrorDetails.BUFFERED_STALLED_ERROR, fatal: true }
+         */
+        BUFFER_NUDGE_ON_STALL: K_BUFFER_NUDGE_ON_STALL;
+
+        // MUX_ERROR //
+        /**
+         * raised when memory allocation fails during remuxing
+         * data: { type: MUX_ERROR, details: Hls.ErrorDetails.REMUX_ALLOC_ERROR, fatal: false, bytes: mdat size, reason: failure reason }
+         */
+        REMUX_ALLOC_ERROR: K_REMUX_ALLOC_ERROR;
+
+        // OTHER_ERROR //
+        /**
+         * raised when level switching fails
+         * data: { type : OTHER_ERROR, details : Hls.ErrorDetails.LEVEL_SWITCH_ERROR, fatal : false, level : failed level index, reason : failure reason }
+         */
+        LEVEL_SWITCH_ERROR: K_LEVEL_SWITCH_ERROR;
+        /**
+         * raised when an exception occurs in an internal hls.js event handler
+         * data: { type: OTHER_ERROR, details: Hls.ErrorDetails.INTERNAL_EXCEPTION, fatal: true or false, event: event object or string, error: { message: error message } }
+         */
+        INTERNAL_EXCEPTION: K_INTERNAL_EXCEPTION;
+    };
+    /**
+     * Constructor. Can be provided an HlsConfig object as default properties and or overrides
+     */
+    constructor(config?: Partial<Hls.Config>);
+    /**
+     * return array of available quality levels
+     */
+    levels: Hls.Level[];
+    /**
+     * get: return current playback quality level
+     * set:  trigger an immediate quality level switch to new quality level
+     * this will pause the video if it was playing, flush the whole buffer,
+     * and fetch fragment matching with current position and requested quality level
+     * then resume the video if needed once fetched fragment will have been buffered
+     *
+     * set to -1 for automatic level selection
+     */
+    currentLevel: number;
+    /**
+     * capping/max level (index of level) that could be used by ABR Controller. Defaults to -1
+     * which means no limit
+     * set: max level value that could be used by the ABR Controller
+     */
+    autoLevelCapping: number;
+    /**
+     * return start level index (level of first fragment that will be played back)
+     *      if not overrided by user: first level appearing in manifest will be used as start level
+     *      if -1: automatic start level selection, playback will start from level matching download bandwidth (determined from download of first segment)
+     *
+     *  default valus is hls.firstLevel
+     */
+    startLevel: number;
     /**
      * (default: true)
      * if set to true, start level playlist and first fragments will be loaded automatically, after triggering of Hls.Events.MANIFEST_PARSED event
@@ -486,1395 +1620,232 @@ declare namespace Hls {
      */
     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)).
+     * get: Return the bound videoElement from the hls instance
      */
-    startPosition: number;
+    media: HTMLVideoElement;
     /**
-     * (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.
-     * If sampling rate is less or equal than 22050 Hz, then hls.js assumes it is HE-AAC, otherwise it assumes it is AAC-LC.
-     * This could result in bad guess, leading to audio decode error, ending up in media error.
-     * It is possible to hint default audiocodec to hls.js by configuring this value as below:
-     * mp4a.40.2 (AAC-LC) or
-     * mp4a.40.5 (HE-AAC) or
-     * undefined (guess based on sampling rate)
+     *  hls.js config
      */
-    defaultAudioCodec: string;
+    config: Hls.Config;
     /**
-     * (default: 1)
-     * number of segments needed to start a playback of Live stream.
-     */
-    initialLiveManifestSize: number;
-    /**
-     * (default: 30 seconds)
-     * Maximum buffer length in seconds. If buffer length is/become less than this value, a new fragment will be loaded.
-     * This is the guaranteed buffer length hls.js will try to reach, regardless of maxBufferSize.
-     */
-    maxBufferLength: number;
-    /**
-     * (default 600s)
-     * Maximum buffer length in seconds. Hls.js will never exceed this value, even if maxBufferSize is not reached yet.
-     * hls.js tries to buffer up to a maximum number of bytes (60 MB by default) rather than to buffer up to a maximum nb of seconds.
-     * This is to mimic the browser behaviour (the buffer eviction algorithm is starting after the browser detects that video buffer size reaches a limit in bytes)
-     * maxBufferLength is the minimum guaranteed buffer length that hls.js will try to achieve, even if that value exceeds the amount of bytes 60 MB of memory.
-     * maxMaxBufferLength acts as a capping value, as if bitrate is really low, you could need more than one hour of buffer to fill 60 MB.
-     */
-    maxMaxBufferLength: number;
-    /**
-     * (default: 60 MB)
-     * 'Minimum' maximum buffer size in bytes. If buffer size upfront is bigger than this value, no fragment will be loaded
-     */
-    maxBufferSize: number;
-    /**
-     * (default: 0.5 seconds)
-     * 'Maximum' inter-fragment buffer hole tolerance that hls.js can cope with when searching for the next fragment to load. When switching between quality level,
-     * fragments might not be perfectly aligned.
-     * 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)
+     * get: return next playback quality level (playback quality level for next buffered fragment)
+     * return -1 if next fragment not buffered yet
+     * set: trigger a quality level switch for next fragment
+     * this could eventually flush already buffered next fragment
      *
-     * ABR algorithm will always try to choose a quality level that should avoid rebuffering. In case no quality level with this criteria can
-     * be found (lets say for example that buffer length is 1s, but fetching a fragment at lowest quality is predicted to take around 2s ...
-     * ie we can forecast around 1s of rebuffering ...) then ABR algorithm will try to find a level that should guarantee less than
-     * maxStarvationDelay of buffering.
+     * set to -1 for automatic level selection
      */
-    maxStarvationDelay: number;
+    nextLevel: 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
+     * get: return last loaded fragment quality level
+     * set: quality level for next loaded fragment
+     * set to -1 for automatic level selection
      */
-    maxLoadingDelay: number;
+    loadLevel: 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,
-     * hls.js will try to nudge playhead to recover playback
+     * get: return quality level that will be used to load next fragment
+     * set: force quality level for next loaded fragment
+     * quality level will be forced only for that fragment
+     * after a fragment at this quality level has been loaded, hls.loadLevel will prevail
      */
-    lowBufferWatchdogPeriod: number;
+    nextLoadLevel: number;
     /**
-     * (default: 3s)
-     * if media element is expected to play and if currentTime has not moved for more than highBufferWatchdogPeriod and if there are more than maxBufferHole seconds buffered upfront,
-     * hls.js will try to nudge playhead to recover playback
+     * first level index (index of first level appearing in Manifest. it is usually defined as start level hint for player)
      */
-    highBufferWatchdogPeriod: number;
+    firstLevel: number;
     /**
-     * (default: 0.1s)
-     * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
-     * media.currentTime += (nb nudge retry -1)*nudgeOffset
+     * array of audio tracks exposed in manifest
      */
-    nudgeOffset: number;
+    audioTracks: AudioTrack[];
     /**
-     * (default: 3s)
-     * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
-     * media.currentTime += (nb nudge retry -1)*nudgeOffset
+     * get: returns audio track id
+     * set: sets audio track id (returned by)
      */
-    nudgeMaxRetry: number;
+    audioTrack: number;
     /**
-     * (default 4s)
+     * position of live sync point (ie edge of live position minus safety delay defined by hls.config.liveSyncDuration)
+     */
+    liveSyncPosition: number;
+    /**
+     * get : array of subtitle tracks exposed in manifest
+     */
+    subtitleTracks: any[];
+    /**
+     * get/set : subtitle track id (returned by).
+     * Returns -1 if no track is visible.
+     * Set to -1 to hide all subtitle tracks.
+     */
+    subtitleTrack: number;
+    /**
+     * (default: false)
+     * get/set : if set to true the active subtitle track mode will be set to showing and the browser will display the active subtitles.
+     * If set to false, the mode will be set to hidden.
+     */
+    subtitleDisplay: boolean;
+    /**
+     * calling this method will:
+     *      bind videoElement and hls instances
+     *      create MediaSource and set it as video source
+     *      once MediaSource object is successfully created, MEDIA_ATTACHED event will be fired
+     */
+    attachMedia(videoElement: HTMLVideoElement): void;
+    /**
+     * calling this method will:
+     *      unbind VideoElement from hls instance
+     *      signal the end of the stream on MediaSource
+     *      reset video source ( video.src = '' )
+     */
+    detachMedia(): void;
+    /**
+     * tell whether auto level selection is enabled or not
+     */
+    autoLevelEnabled(enabled: boolean): boolean;
+    /**
+     * loads provided url as media source
+     */
+    loadSource(source: string): void;
+    /**
+     * by default, hls.js will automatically start loading quality level playlists, and fragments after Hls.Events.MANIFEST_PARSED event has been triggered (and video element has been attached)
+     * however if config.autoStartLoad is set to false, hls.startLoad() needs to be called to manually start playlist and fragments loading
      *
-     * max video loading delay used in automatic start level selection : in that mode ABR controller will ensure that video loading time (ie
-     * the time to fetch the first fragment at lowest quality level + the time to fetch the fragment at the appropriate quality level is less
-     * than maxLoadingDelay )
+     * start/restart playlist/fragment loading. this is only effective if MANIFEST_PARSED event has been triggered and video element has been attached to hls object
+     * startPosition is the initial position in the playlist
+     * ff startPosition is not set to -1, it allows to override default startPosition to the one you want
+     * (it will bypass hls.config.liveSync* config params for Live for example, so that user can start playback from whatever position)
      */
-    maxFragLookUpTolerance: number;
+    startLoad(startPosition?: number): void;
     /**
-     * (default: 3)
-     * edge of live delay, expressed in multiple of EXT-X-TARGETDURATION. if set to 3, playback will start from fragment N-3, N being the last fragment of the live playlist.
-     * Decreasing this value is likely to cause playback stalls.
+     * stop playlist/fragment loading. could be resumed later on by calling hls.startLoad()
      */
-    liveSyncDurationCount: number;
+    stopLoad(): void;
     /**
-     * (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.
+     * should be invoked to recover media error.
      */
-    liveMaxLatencyDurationCount: number;
+    recoverMediaError(): void;
     /**
-     * (default: undefined)
-     * Alternative parameter to liveSyncDurationCount, expressed in seconds vs number of segments.
-     * If defined in the configuration object, liveSyncDuration will take precedence over the default liveSyncDurationCount.
-     * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
-     * A value too low (inferior to ~3 segment durations) is likely to cause playback stalls.
+     * if media error are still raised after calling hls.recoverMediaError(), calling this method, could be useful to workaround audio codec mismatch.
+     * the workflow should be:
+     *  on First Media Error : call hls.recoverMediaError()
+     *  if another Media Error is raised 'quickly' after this first Media Error : first call hls.swapAudioCodec(), then call hls.recoverMediaError()
      */
-    liveSyncDuration: number;
+    swapAudioCodec(): void;
     /**
-     * (default: undefined)
-     * Alternative parameter to liveMaxLatencyDurationCount, expressed in seconds vs number of segments.
-     * If defined in the configuration object, liveMaxLatencyDuration will take precedence over the default liveMaxLatencyDurationCount.
-     * If set, this value must be stricly superior to liveSyncDuration which must be defined as well.
-     * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
-     * A value too close from liveSyncDuration is likely to cause playback stalls.
+     * should be called to free used resources and destroy hls context
      */
-    liveMaxLatencyDuration: number;
+    destroy(): void;
     /**
-     * (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.
+     * hls.js event listener
      */
-    liveDurationInfinity: boolean;
+    on(event: K_MEDIA_ATTACHING, callback: (event: K_MEDIA_ATTACHING, data: Hls.mediaAttachedData) => void): void;
+    on(event: K_MEDIA_ATTACHED, callback: (event: K_MEDIA_ATTACHED, data: Hls.mediaAttachedData) => void): void;
+    on(event: K_MEDIA_DETACHING, callback: (event: K_MEDIA_DETACHING, data: {}) => void): void;
+    on(event: K_MEDIA_DETACHED, callback: (event: K_MEDIA_DETACHED, data: {}) => void): void;
+    on(event: K_BUFFER_RESET, callback: (event: K_BUFFER_RESET, data: {}) => void): void;
+    on(event: K_BUFFER_CODECS, callback: (event: K_BUFFER_CODECS, data: Hls.bufferCodecsData) => void): void;
+    on(event: K_BUFFER_CREATED, callback: (event: K_BUFFER_CREATED, data: Hls.bufferCreatedData) => void): void;
+    on(event: K_BUFFER_APPENDING, callback: (event: K_BUFFER_APPENDING, data: Hls.bufferAppendingData) => void): void;
+    on(event: K_BUFFER_APPENDED, callback: (event: K_BUFFER_APPENDED, data: Hls.bufferAppendedData) => void): void;
+    on(event: K_BUFFER_EOS, callback: (event: K_BUFFER_EOS, data: {}) => void): void;
+    on(event: K_BUFFER_FLUSHING, callback: (event: K_BUFFER_FLUSHING, data: Hls.bufferFlushingData) => void): void;
+    on(event: K_BUFFER_FLUSHED, callback: (event: K_BUFFER_FLUSHED, data: Hls.bufferFlushedData) => void): void;
+    on(event: K_MANIFEST_LOADING, callback: (event: K_MANIFEST_LOADING, data: Hls.manifestLoadingData) => void): void;
+    on(event: K_MANIFEST_LOADED, callback: (event: K_MANIFEST_LOADED, data: Hls.manifestLoadedData) => void): void;
+    on(event: K_MANIFEST_PARSED, callback: (event: K_MANIFEST_PARSED, data: Hls.manifestParsedData) => void): void;
+    on(event: K_LEVEL_SWITCHING, callback: (event: K_LEVEL_SWITCHING, data: Hls.levelSwitchingData) => void): void;
+    on(event: K_LEVEL_SWITCHED, callback: (event: K_LEVEL_SWITCHED, data: Hls.levelSwitchedData) => void): void;
+    on(event: K_LEVEL_LOADING, callback: (event: K_LEVEL_LOADING, data: Hls.levelLoadingData) => void): void;
+    on(event: K_LEVEL_LOADED, callback: (event: K_LEVEL_LOADED, data: Hls.levelLoadedData) => void): void;
+    on(event: K_LEVEL_UPDATED, callback: (event: K_LEVEL_UPDATED, data: Hls.levelUpdatedData) => void): void;
+    on(event: K_LEVEL_PTS_UPDATED, callback: (event: K_LEVEL_PTS_UPDATED, data: Hls.levelPtsUpdatedData) => void): void;
+    on(event: K_AUDIO_TRACKS_UPDATED, callback: (event: K_AUDIO_TRACKS_UPDATED, data: Hls.audioTracksUpdatedData) => void): void;
+    on(event: K_AUDIO_TRACK_SWITCHING, callback: (event: K_AUDIO_TRACK_SWITCHING, data: Hls.audioTrackSwitchingData) => void): void;
+    on(event: K_AUDIO_TRACK_SWITCHED, callback: (event: K_AUDIO_TRACK_SWITCHED, data: Hls.audioTrackSwitchedData) => void): void;
+    on(event: K_AUDIO_TRACK_LOADING, callback: (event: K_AUDIO_TRACK_LOADING, data: Hls.audioTrackLoadingData) => void): void;
+    on(event: K_AUDIO_TRACK_LOADED, callback: (event: K_AUDIO_TRACK_LOADED, data: Hls.audioTrackLoadedData) => void): void;
+    on(event: K_SUBTITLE_TRACKS_UPDATED, callback: (event: K_SUBTITLE_TRACKS_UPDATED, data: Hls.subtitleTracksUpdatedData) => void): void;
+    on(event: K_SUBTITLE_TRACK_SWITCH, callback: (event: K_SUBTITLE_TRACK_SWITCH, data: Hls.subtitleTrackSwitchData) => void): void;
+    on(event: K_SUBTITLE_TRACK_LOADING, callback: (event: K_SUBTITLE_TRACK_LOADING, data: Hls.subtitleTrackLoadingData) => void): void;
+    on(event: K_SUBTITLE_TRACK_LOADED, callback: (event: K_SUBTITLE_TRACK_LOADED, data: Hls.subtitleTrackLoadedData) => void): void;
+    on(event: K_SUBTITLE_FRAG_PROCESSED, callback: (event: K_SUBTITLE_FRAG_PROCESSED, data: Hls.subtitleFragProcessedData) => void): void;
+    on(event: K_INIT_PTS_FOUND, callback: (event: K_INIT_PTS_FOUND, data: Hls.initPtsFoundData) => void): void;
+    on(event: K_FRAG_LOADING, callback: (event: K_FRAG_LOADING, data: Hls.fragLoadingData) => void): void;
+    on(event: K_FRAG_LOAD_PROGRESS, callback: (event: K_FRAG_LOAD_PROGRESS, data: Hls.fragLoadProgressData) => void): void;
+    on(event: K_FRAG_LOAD_EMERGENCY_ABORTED, callback: (event: K_FRAG_LOAD_EMERGENCY_ABORTED, data: Hls.fragLoadEmergencyAbortedData) => void): void;
+    on(event: K_FRAG_LOADED, callback: (event: K_FRAG_LOADED, data: Hls.fragLoadedData) => void): void;
+    on(event: K_FRAG_DECRYPTED, callback: (event: K_FRAG_DECRYPTED, data: Hls.fragDecryptedData) => void): void;
+    on(event: K_FRAG_PARSING_INIT_SEGMENT, callback: (event: K_FRAG_PARSING_INIT_SEGMENT, data: Hls.fragParsingInitSegmentData) => void): void;
+    on(event: K_FRAG_PARSING_USERDATA, callback: (event: K_FRAG_PARSING_USERDATA, data: Hls.fragParsingUserData) => void): void;
+    on(event: K_FRAG_PARSING_METADATA, callback: (event: K_FRAG_PARSING_METADATA, data: Hls.fragParsingMetadata) => void): void;
+    on(event: K_FRAG_PARSING_DATA, callback: (event: K_FRAG_PARSING_DATA, data: Hls.fragParsingData) => void): void;
+    on(event: K_FRAG_PARSED, callback: (event: K_FRAG_PARSED, data: Hls.fragParsedData) => void): void;
+    on(event: K_FRAG_BUFFERED, callback: (event: K_FRAG_BUFFERED, data: Hls.fragBufferedData) => void): void;
+    on(event: K_FRAG_CHANGED, callback: (event: K_FRAG_CHANGED, data: Hls.fragChangedData) => void): void;
+    on(event: K_FPS_DROP, callback: (event: K_FPS_DROP, data: Hls.fpsDropData) => void): void;
+    on(event: K_FPS_DROP_LEVEL_CAPPING, callback: (event: K_FPS_DROP_LEVEL_CAPPING, data: Hls.fpsDropLevelCappingData) => void): void;
+    on(event: K_ERROR, callback: (event: K_ERROR, data: Hls.errorData) => void): void;
+    on(event: K_DESTROYING, callback: (event: K_DESTROYING, data: {}) => void): void;
+    on(event: K_KEY_LOADING, callback: (event: K_KEY_LOADING, data: Hls.keyLoadingData) => void): void;
+    on(event: K_KEY_LOADED, callback: (event: K_KEY_LOADED, data: Hls.keyLoadedData) => void): void;
+    on(event: K_STREAM_STATE_TRANSITION, callback: (event: K_STREAM_STATE_TRANSITION, data: Hls.streamStateTransitionData) => void): void;
     /**
-     * (default: true)
-     * Enable WebWorker (if available on browser) for TS demuxing/MP4 remuxing, to improve performance and avoid lag/frame drops.
+     * hls.js single event listener
      */
-    enableWorker: boolean;
-    /**
-     * (default: true)
-     * Enable to use JavaScript version AES decryption for fallback of WebCrypto API.
-     */
-    enableSoftwareAES: boolean;
-    /**
-     * (default: undefined)
-     * When set, use this level as the default hls.startLevel. Keep in mind that the startLevel set with the API takes precedence over
-     * config.startLevel configuration parameter.
-     */
-    startLevel: number;
-    /**
-     * (default: 10000ms for level and manifest)
-     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
-     * It is up to the application to catch this event and treat it as needed.
-     */
-    manifestLoadingTimeOut: number;
-    /**
-     * (default: 3)
-     * Max number of load retries.
-     */
-    manifestLoadingMaxRetry: number;
-    /**
-     * (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).
-     * Prefetch start fragment although media not attached.
-     */
-    manifestLoadingRetryDelay: number;
-    /**
-     * (default: 64000 ms)
-     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
-     */
-    manifestLoadingMaxRetryTimeout: number;
-    /**
-     * (default: 60000ms for fragment)
-     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
-     * It is up to the application to catch this event and treat it as needed.
-     */
-    levelLoadingTimeOut: number;
-    /**
-     * (default: 3)
-     * Max number of load retries.
-     */
-    levelLoadingMaxRetry: number;
-    /**
-     * (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).
-     * Prefetch start fragment although media not attached.
-     */
-    levelLoadingRetryDelay: number;
-    /**
-     * (default: 64000 ms)
-     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
-     */
-    levelLoadingMaxRetryTimeout: number;
-    /**
-     * (default: 60000ms for fragment)
-     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
-     * It is up to the application to catch this event and treat it as needed.
-     */
-    fragLoadingTimeOut: number;
-    /**
-     * (default: 3)
-     * Max number of load retries.
-     */
-    fragLoadingMaxRetry: number;
-    /**
-     * (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).
-     * Prefetch start fragment although media not attached.
-     */
-    fragLoadingRetryDelay: number;
-    /**
-     * (default: 64000 ms)
-     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
-     */
-    fragLoadingMaxRetryDelay: number;
-    /**
-     * (default: false)
-     * Start prefetching start fragment although media not attached yet. Max number of append retries.
-     */
-    startFragPrefech: 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).
-     * In that case we need to wait for the browser to evict some data before being able to append buffer correctly.
-     */
-    appendErrorMaxRetry: number;
-    /**
-     * (default: standard XMLHttpRequest-based URL loader)
-     * Override standard URL loader by a custom one. Could be useful for P2P or stubbing (testing).
-     * Use this, if you want to overwrite both the fragment and the playlist loader.
-     * Note: If fLoader or pLoader are used, they overwrite loader!
-     */
-    loader: typeof Loader;
-    /**
-     * (default: undefined)
-     * This enables the manipulation of the fragment loader.
-     * Note: This will overwrite the default loader, as well as your own loader function.
-     */
-    fLoader?: typeof Loader;
-    /**
-     * (default: undefined)
-     * This enables the manipulation of the playlist loader.
-     * Note: This will overwrite the default loader, as well as your own loader function.
-     */
-    pLoader?: typeof Loader;
-    /**
-     * (default: undefined)
-     * XMLHttpRequest customization callback for default XHR based loader.
-     * Parameter should be a function with two arguments (xhr: XMLHttpRequest, url: string).
-     * If xhrSetup is specified, default loader will invoke it before calling xhr.send(). This allows user to easily modify/setup XHR.
-     */
-    xhrSetup?(xhr: XMLHttpRequest, url: string): void;
-    /**
-     * (default: undefined)
-     * Fetch customization callback for Fetch based loader.
-     * Parameter should be a function with two arguments (context and Request Init Params).
-     * If fetchSetup is specified and Fetch loader is used, fetchSetup will be triggered to instantiate Request Object. This allows user to easily tweak Fetch loader.
-     */
-    fetchSetup?(context: any, initParams: any): Request;
-    /**
-     * (default: internal ABR controller)
-     * Customized Adaptive Bitrate Streaming Controller.
-     * Parameter should be a class providing 2 getters, 2 setters and a destroy() method:
-     * get/set nextAutoLevel: return next auto-quality level/force next auto-quality level that should be returned (currently used for emergency switch down)
-     * get/set autoLevelCapping: capping/max level value that could be used by ABR Controller
-     * destroy(): should clean-up all used resources
-     */
-    abrController: AbrController;
-    /**
-     * (default: internal track timeline controller)
-     * Customized text track syncronization controller.
-     * Parameter should be a class with a destroy() method:
-     * 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
-     */
-    enableCEA708Captions: boolean;
-    /**
-     * (default: English)
-     * Label for the text track generated for CEA-708 captions track 1. This is how it will appear in the browser's native menu for subtitles and captions.
-     */
-    captionsTextTrack1Label: string;
-    /**
-     * (default: en)
-     * RFC 3066 language code for the text track generated for CEA-708 captions track 1.
-     */
-    captionsTextTrack1LanguagedCode: string;
-    /**
-     * (default: Spanish)
-     * Label for the text track generated for CEA-708 captions track 2. This is how it will appear in the browser's native menu for subtitles and captions.
-     */
-    captionsTextTrack2Label: string;
-    /**
-     * (default: es)
-     * RFC 3066 language code for the text track generated for CEA-708 captions track 2.
-     */
-    captionsTextTrack2LanguageCode: string;
-    /**
-     * (default: false)
-     * If a segment's video track is shorter than its audio track by > min(maxSeekHole, maxBufferHole), extend the final video frame's duration to match the audio track's duration.
-     * 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.
-     */
-    forceKeyFrameOnDiscontinuity: boolean;
-    /**
-     * (default: 5.0)
-     * Fast bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
-     * Half of the estimate is based on the last abrEwmaFastLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than 0
-     */
-    abrEwmaFastLive: number;
-    /**
-     * (default: 9.0)
-     * Slow bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
-     * Half of the estimate is based on the last abrEwmaSlowLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than abrEwmaFastLive
-     */
-    abrEwmaSlowLive: number;
-    /**
-     * (default: 4.0)
-     * Fast bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
-     * Half of the estimate is based on the last abrEwmaFastVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than 0
-     */
-    abrEwmaFastVod: number;
-    /**
-     * (default: 15.0)
-     * Slow bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
-     * Half of the estimate is based on the last abrEwmaSlowVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than abrEwmaFastVoD
-     */
-    abrEwmaSlowVod: number;
-    /**
-     * (default: 500000)
-     * Default bandwidth estimate in bits/second prior to collecting fragment bandwidth samples.
-     * parameter should be a float
-     */
-    abrEwmaDefaultEstimate: number;
-    /**
-     * (default: 0.8)
-     * Scale factor to be applied against measured bandwidth average, to determine whether we can stay on current or lower quality level.
-     * If abrBandWidthFactor * bandwidth average < level.bitrate then ABR can switch to that level providing that it is equal or less than current level.
-     */
-    abrBandWidthFactor: number;
-    /**
-     * (default: 0.7)
-     * Scale factor to be applied against measured bandwidth average, to determine whether we can switch up to a higher quality level.
-     * If abrBandWidthUpFactor * bandwidth average < level.bitrate then ABR can switch up to that quality level.
-     */
-    abrBandWidthUpFactor: number;
-    /**
-     * (default: false)
-     * max bitrate used in ABR by avg measured bitrate i.e. if bitrate signaled in variant manifest for a given level is 2Mb/s but average bitrate measured on this level is 2.5Mb/s,
-     * then if config value is set to true, ABR will use 2.5 Mb/s for this quality level.
-     */
-    abrMaxWithRealBitrate: boolean;
-    /**
-     * (default: 0)
-     * Return the capping/min bandwidth value that could be used by automatic level selection algorithm.
-     * Useful when browser or tab of the browser is not in the focus and bandwidth drops
-     */
-    minAutoBitrate: number;
-  }
+    once(event: K_MEDIA_ATTACHING, callback: (event: K_MEDIA_ATTACHING, data: Hls.mediaAttachedData) => void): void;
+    once(event: K_MEDIA_ATTACHED, callback: (event: K_MEDIA_ATTACHED, data: Hls.mediaAttachedData) => void): void;
+    once(event: K_MEDIA_DETACHING, callback: (event: K_MEDIA_DETACHING, data: {}) => void): void;
+    once(event: K_MEDIA_DETACHED, callback: (event: K_MEDIA_DETACHED, data: {}) => void): void;
+    once(event: K_BUFFER_RESET, callback: (event: K_BUFFER_RESET, data: {}) => void): void;
+    once(event: K_BUFFER_CODECS, callback: (event: K_BUFFER_CODECS, data: Hls.bufferCodecsData) => void): void;
+    once(event: K_BUFFER_CREATED, callback: (event: K_BUFFER_CREATED, data: Hls.bufferCreatedData) => void): void;
+    once(event: K_BUFFER_APPENDING, callback: (event: K_BUFFER_APPENDING, data: Hls.bufferAppendingData) => void): void;
+    once(event: K_BUFFER_APPENDED, callback: (event: K_BUFFER_APPENDED, data: Hls.bufferAppendedData) => void): void;
+    once(event: K_BUFFER_EOS, callback: (event: K_BUFFER_EOS, data: {}) => void): void;
+    once(event: K_BUFFER_FLUSHING, callback: (event: K_BUFFER_FLUSHING, data: Hls.bufferFlushingData) => void): void;
+    once(event: K_BUFFER_FLUSHED, callback: (event: K_BUFFER_FLUSHED, data: Hls.bufferFlushedData) => void): void;
+    once(event: K_MANIFEST_LOADING, callback: (event: K_MANIFEST_LOADING, data: Hls.manifestLoadingData) => void): void;
+    once(event: K_MANIFEST_LOADED, callback: (event: K_MANIFEST_LOADED, data: Hls.manifestLoadedData) => void): void;
+    once(event: K_MANIFEST_PARSED, callback: (event: K_MANIFEST_PARSED, data: Hls.manifestParsedData) => void): void;
+    once(event: K_LEVEL_SWITCHING, callback: (event: K_LEVEL_SWITCHING, data: Hls.levelSwitchingData) => void): void;
+    once(event: K_LEVEL_SWITCHED, callback: (event: K_LEVEL_SWITCHED, data: Hls.levelSwitchedData) => void): void;
+    once(event: K_LEVEL_LOADING, callback: (event: K_LEVEL_LOADING, data: Hls.levelLoadingData) => void): void;
+    once(event: K_LEVEL_LOADED, callback: (event: K_LEVEL_LOADED, data: Hls.levelLoadedData) => void): void;
+    once(event: K_LEVEL_UPDATED, callback: (event: K_LEVEL_UPDATED, data: Hls.levelUpdatedData) => void): void;
+    once(event: K_LEVEL_PTS_UPDATED, callback: (event: K_LEVEL_PTS_UPDATED, data: Hls.levelPtsUpdatedData) => void): void;
+    once(event: K_AUDIO_TRACKS_UPDATED, callback: (event: K_AUDIO_TRACKS_UPDATED, data: Hls.audioTracksUpdatedData) => void): void;
+    once(event: K_AUDIO_TRACK_SWITCHING, callback: (event: K_AUDIO_TRACK_SWITCHING, data: Hls.audioTrackSwitchingData) => void): void;
+    once(event: K_AUDIO_TRACK_SWITCHED, callback: (event: K_AUDIO_TRACK_SWITCHED, data: Hls.audioTrackSwitchedData) => void): void;
+    once(event: K_AUDIO_TRACK_LOADING, callback: (event: K_AUDIO_TRACK_LOADING, data: Hls.audioTrackLoadingData) => void): void;
+    once(event: K_AUDIO_TRACK_LOADED, callback: (event: K_AUDIO_TRACK_LOADED, data: Hls.audioTrackLoadedData) => void): void;
+    once(event: K_SUBTITLE_TRACKS_UPDATED, callback: (event: K_SUBTITLE_TRACKS_UPDATED, data: Hls.subtitleTracksUpdatedData) => void): void;
+    once(event: K_SUBTITLE_TRACK_SWITCH, callback: (event: K_SUBTITLE_TRACK_SWITCH, data: Hls.subtitleTrackSwitchData) => void): void;
+    once(event: K_SUBTITLE_TRACK_LOADING, callback: (event: K_SUBTITLE_TRACK_LOADING, data: Hls.subtitleTrackLoadingData) => void): void;
+    once(event: K_SUBTITLE_TRACK_LOADED, callback: (event: K_SUBTITLE_TRACK_LOADED, data: Hls.subtitleTrackLoadedData) => void): void;
+    once(event: K_SUBTITLE_FRAG_PROCESSED, callback: (event: K_SUBTITLE_FRAG_PROCESSED, data: Hls.subtitleFragProcessedData) => void): void;
+    once(event: K_INIT_PTS_FOUND, callback: (event: K_INIT_PTS_FOUND, data: Hls.initPtsFoundData) => void): void;
+    once(event: K_FRAG_LOADING, callback: (event: K_FRAG_LOADING, data: Hls.fragLoadingData) => void): void;
+    once(event: K_FRAG_LOAD_PROGRESS, callback: (event: K_FRAG_LOAD_PROGRESS, data: Hls.fragLoadProgressData) => void): void;
+    once(event: K_FRAG_LOAD_EMERGENCY_ABORTED, callback: (event: K_FRAG_LOAD_EMERGENCY_ABORTED, data: Hls.fragLoadEmergencyAbortedData) => void): void;
+    once(event: K_FRAG_LOADED, callback: (event: K_FRAG_LOADED, data: Hls.fragLoadedData) => void): void;
+    once(event: K_FRAG_DECRYPTED, callback: (event: K_FRAG_DECRYPTED, data: Hls.fragDecryptedData) => void): void;
+    once(event: K_FRAG_PARSING_INIT_SEGMENT, callback: (event: K_FRAG_PARSING_INIT_SEGMENT, data: Hls.fragParsingInitSegmentData) => void): void;
+    once(event: K_FRAG_PARSING_USERDATA, callback: (event: K_FRAG_PARSING_USERDATA, data: Hls.fragParsingUserData) => void): void;
+    once(event: K_FRAG_PARSING_METADATA, callback: (event: K_FRAG_PARSING_METADATA, data: Hls.fragParsingMetadata) => void): void;
+    once(event: K_FRAG_PARSING_DATA, callback: (event: K_FRAG_PARSING_DATA, data: Hls.fragParsingData) => void): void;
+    once(event: K_FRAG_PARSED, callback: (event: K_FRAG_PARSED, data: Hls.fragParsedData) => void): void;
+    once(event: K_FRAG_BUFFERED, callback: (event: K_FRAG_BUFFERED, data: Hls.fragBufferedData) => void): void;
+    once(event: K_FRAG_CHANGED, callback: (event: K_FRAG_CHANGED, data: Hls.fragChangedData) => void): void;
+    once(event: K_FPS_DROP, callback: (event: K_FPS_DROP, data: Hls.fpsDropData) => void): void;
+    once(event: K_FPS_DROP_LEVEL_CAPPING, callback: (event: K_FPS_DROP_LEVEL_CAPPING, data: Hls.fpsDropLevelCappingData) => void): void;
+    once(event: K_ERROR, callback: (event: K_ERROR, data: Hls.errorData) => void): void;
+    once(event: K_DESTROYING, callback: (event: K_DESTROYING, data: {}) => void): void;
+    once(event: K_KEY_LOADING, callback: (event: K_KEY_LOADING, data: Hls.keyLoadingData) => void): void;
+    once(event: K_KEY_LOADED, callback: (event: K_KEY_LOADED, data: Hls.keyLoadedData) => void): void;
+    once(event: K_STREAM_STATE_TRANSITION, callback: (event: K_STREAM_STATE_TRANSITION, data: Hls.streamStateTransitionData) => void): void;
 
-  interface OptionalConfig {
     /**
-     * (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)
-     * if set to false, levels will not be limited. All available levels could be used in auto-quality mode taking only bandwidth into consideration.
+     * remove hls.js event listener
      */
-    capLevelToPlayerSize?: boolean;
-    /**
-     * (default: false)
-     * setting config.debug = true; will turn on debug logs on JS console.
-     * 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.
-     * If sampling rate is less or equal than 22050 Hz, then hls.js assumes it is HE-AAC, otherwise it assumes it is AAC-LC.
-     * This could result in bad guess, leading to audio decode error, ending up in media error.
-     * It is possible to hint default audiocodec to hls.js by configuring this value as below:
-     * mp4a.40.2 (AAC-LC) or
-     * mp4a.40.5 (HE-AAC) or
-     * undefined (guess based on sampling rate)
-     */
-    defaultAudioCodec?: string;
-    /**
-     * (default: 1)
-     * number of segments needed to start a playback of Live stream.
-     */
-    initialLiveManifestSize?: number;
-    /**
-     * (default: 30 seconds)
-     * Maximum buffer length in seconds. If buffer length is/become less than this value, a new fragment will be loaded.
-     * This is the guaranteed buffer length hls.js will try to reach, regardless of maxBufferSize.
-     */
-    maxBufferLength?: number;
-    /**
-     * (default 600s)
-     * Maximum buffer length in seconds. Hls.js will never exceed this value, even if maxBufferSize is not reached yet.
-     * hls.js tries to buffer up to a maximum number of bytes (60 MB by default) rather than to buffer up to a maximum nb of seconds.
-     * This is to mimic the browser behaviour (the buffer eviction algorithm is starting after the browser detects that video buffer size reaches a limit in bytes)
-     * maxBufferLength is the minimum guaranteed buffer length that hls.js will try to achieve, even if that value exceeds the amount of bytes 60 MB of memory.
-     * maxMaxBufferLength acts as a capping value, as if bitrate is really low, you could need more than one hour of buffer to fill 60 MB.
-     */
-    maxMaxBufferLength?: number;
-    /**
-     * (default: 60 MB)
-     * 'Minimum' maximum buffer size in bytes. If buffer size upfront is bigger than this value, no fragment will be loaded
-     */
-    maxBufferSize?: number;
-    /**
-     * (default: 0.5 seconds)
-     * 'Maximum' inter-fragment buffer hole tolerance that hls.js can cope with when searching for the next fragment to load. When switching between quality level,
-     * fragments might not be perfectly aligned.
-     * 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)
-     *
-     * ABR algorithm will always try to choose a quality level that should avoid rebuffering. In case no quality level with this criteria can
-     * be found (lets say for example that buffer length is 1s, but fetching a fragment at lowest quality is predicted to take around 2s ...
-     * ie we can forecast around 1s of rebuffering ...) then ABR algorithm will try to find a level that should guarantee less than
-     * maxStarvationDelay of buffering.
-     */
-    maxStarvationDelay?: 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: 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,
-     * hls.js will try to nudge playhead to recover playback
-     */
-    lowBufferWatchdogPeriod?: number;
-    /**
-     * (default: 3s)
-     * if media element is expected to play and if currentTime has not moved for more than highBufferWatchdogPeriod and if there are more than maxBufferHole seconds buffered upfront,
-     * hls.js will try to nudge playhead to recover playback
-     */
-    highBufferWatchdogPeriod?: number;
-    /**
-     * (default: 0.1s)
-     * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
-     * media.currentTime += (nb nudge retry -1)*nudgeOffset
-     */
-    nudgeOffset?: number;
-    /**
-     * (default: 3s)
-     * In case playback continues to stall after first playhead nudging, currentTime will be nudged evenmore following nudgeOffset to try to restore playback.
-     * media.currentTime += (nb nudge retry -1)*nudgeOffset
-     */
-    nudgeMaxRetry?: number;
-    /**
-     * (default 4s)
-     *
-     * max video loading delay used in automatic start level selection : in that mode ABR controller will ensure that video loading time (ie
-     * the time to fetch the first fragment at lowest quality level + the time to fetch the fragment at the appropriate quality level is less
-     * than maxLoadingDelay )
-     */
-    maxFragLookUpTolerance?: number;
-    /**
-     * (default: 3)
-     * edge of live delay, expressed in multiple of EXT-X-TARGETDURATION. if set to 3, playback will start from fragment N-3, N being the last fragment of the live playlist.
-     * 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.
-     * If defined in the configuration object, liveSyncDuration will take precedence over the default liveSyncDurationCount.
-     * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
-     * A value too low (inferior to ~3 segment durations) is likely to cause playback stalls.
-     */
-    liveSyncDuration?: number;
-    /**
-     * (default: undefined)
-     * Alternative parameter to liveMaxLatencyDurationCount, expressed in seconds vs number of segments.
-     * If defined in the configuration object, liveMaxLatencyDuration will take precedence over the default liveMaxLatencyDurationCount.
-     * If set, this value must be stricly superior to liveSyncDuration which must be defined as well.
-     * You can't define this parameter and either liveSyncDurationCount or liveMaxLatencyDurationCount in your configuration object at the same time.
-     * 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.
-     */
-    enableWorker?: boolean;
-    /**
-     * (default: true)
-     * Enable to use JavaScript version AES decryption for fallback of WebCrypto API.
-     */
-    enableSoftwareAES?: boolean;
-    /**
-     * (default: undefined)
-     * When set, use this level as the default hls.startLevel. Keep in mind that the startLevel set with the API takes precedence over
-     * config.startLevel configuration parameter.
-     */
-    startLevel?: number;
-    /**
-     * (default: 10000ms for level and manifest)
-     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
-     * It is up to the application to catch this event and treat it as needed.
-     */
-    manifestLoadingTimeOut?: number;
-    /**
-     * (default: 3)
-     * Max number of load retries.
-     */
-    manifestLoadingMaxRetry?: number;
-    /**
-     * (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).
-     * Prefetch start fragment although media not attached.
-     */
-    manifestLoadingRetryDelay?: number;
-    /**
-     * (default: 64000 ms)
-     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
-     */
-    manifestLoadingMaxRetryTimeout?: number;
-    /**
-     * (default: 60000ms for fragment)
-     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
-     * It is up to the application to catch this event and treat it as needed.
-     */
-    levelLoadingTimeOut?: number;
-    /**
-     * (default: 3)
-     * Max number of load retries.
-     */
-    levelLoadingMaxRetry?: number;
-    /**
-     * (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).
-     * Prefetch start fragment although media not attached.
-     */
-    levelLoadingRetryDelay?: number;
-    /**
-     * (default: 64000 ms)
-     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
-     */
-    levelLoadingMaxRetryTimeout?: number;
-    /**
-     * (default: 60000ms for fragment)
-     * URL Loader timeout. A timeout callback will be triggered if loading duration exceeds this timeout. no further action will be done : the load operation will not be cancelled/aborted.
-     * It is up to the application to catch this event and treat it as needed.
-     */
-    fragLoadingTimeOut?: number;
-    /**
-     * (default: 3)
-     * Max number of load retries.
-     */
-    fragLoadingMaxRetry?: number;
-    /**
-     * (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).
-     * Prefetch start fragment although media not attached.
-     */
-    fragLoadingRetryDelay?: number;
-    /**
-     * (default: 64000 ms)
-     * Maximum frag/manifest/key retry timeout (in milliseconds) in case I/O errors are met.
-     */
-    fragLoadingMaxRetryDelay?: number;
-    /**
-     * (default: false)
-     * Start prefetching start fragment although media not attached yet. Max number of append retries.
-     */
-    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).
-     * In that case we need to wait for the browser to evict some data before being able to append buffer correctly.
-     */
-    appendErrorMaxRetry?: number;
-    /**
-     * (default: standard XMLHttpRequest-based URL loader)
-     * Override standard URL loader by a custom one. Could be useful for P2P or stubbing (testing).
-     * Use this, if you want to overwrite both the fragment and the playlist loader.
-     * Note: If fLoader or pLoader are used, they overwrite loader!
-     */
-    loader?: typeof Loader;
-    /**
-     * (default: undefined)
-     * This enables the manipulation of the fragment loader.
-     * Note: This will overwrite the default loader, as well as your own loader function.
-     */
-    fLoader?: typeof Loader;
-    /**
-     * (default: undefined)
-     * This enables the manipulation of the playlist loader.
-     * Note: This will overwrite the default loader, as well as your own loader function.
-     */
-    pLoader?: typeof Loader;
-    /**
-     * (default: undefined)
-     * XMLHttpRequest customization callback for default XHR based loader.
-     * Parameter should be a function with two arguments (xhr: XMLHttpRequest, url: string).
-     * If xhrSetup is specified, default loader will invoke it before calling xhr.send(). This allows user to easily modify/setup XHR.
-     */
-    xhrSetup?(xhr: XMLHttpRequest, url: string): void;
-    /**
-     * (default: undefined)
-     * Fetch customization callback for Fetch based loader.
-     * Parameter should be a function with two arguments (context and Request Init Params).
-     * If fetchSetup is specified and Fetch loader is used, fetchSetup will be triggered to instantiate Request Object. This allows user to easily tweak Fetch loader.
-     */
-    fetchSetup?(context: any, initParams: any): Request;
-    /**
-     * (default: internal ABR controller)
-     * Customized Adaptive Bitrate Streaming Controller.
-     * Parameter should be a class providing 2 getters, 2 setters and a destroy() method:
-     * get/set nextAutoLevel: return next auto-quality level/force next auto-quality level that should be returned (currently used for emergency switch down)
-     * get/set autoLevelCapping: capping/max level value that could be used by ABR Controller
-     * destroy(): should clean-up all used resources
-     */
-    abrController?: AbrController;
-    /**
-     * (default: internal track timeline controller)
-     * Customized text track syncronization controller.
-     * Parameter should be a class with a destroy() method:
-     * 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
-     */
-    enableCEA708Captions?: boolean;
-    /**
-     * (default: English)
-     * Label for the text track generated for CEA-708 captions track 1. This is how it will appear in the browser's native menu for subtitles and captions.
-     */
-    captionsTextTrack1Label?: string;
-    /**
-     * (default: en)
-     * RFC 3066 language code for the text track generated for CEA-708 captions track 1.
-     */
-    captionsTextTrack1LanguagedCode?: string;
-    /**
-     * (default: Spanish)
-     * Label for the text track generated for CEA-708 captions track 2. This is how it will appear in the browser's native menu for subtitles and captions.
-     */
-    captionsTextTrack2Label?: string;
-    /**
-     * (default: es)
-     * RFC 3066 language code for the text track generated for CEA-708 captions track 2.
-     */
-    captionsTextTrack2LanguageCode?: string;
-    /**
-     * (default: false)
-     * If a segment's video track is shorter than its audio track by > min(maxSeekHole, maxBufferHole), extend the final video frame's duration to match the audio track's duration.
-     * 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.
-     */
-    forceKeyFrameOnDiscontinuity?: boolean;
-    /**
-     * (default: 5.0)
-     * Fast bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
-     * Half of the estimate is based on the last abrEwmaFastLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than 0
-     */
-    abrEwmaFastLive?: number;
-    /**
-     * (default: 9.0)
-     * Slow bitrate Exponential moving average half-life, used to compute average bitrate for Live streams.
-     * Half of the estimate is based on the last abrEwmaSlowLive seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than abrEwmaFastLive
-     */
-    abrEwmaSlowLive?: number;
-    /**
-     * (default: 4.0)
-     * Fast bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
-     * Half of the estimate is based on the last abrEwmaFastVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than 0
-     */
-    abrEwmaFastVod?: number;
-    /**
-     * (default: 15.0)
-     * Slow bitrate Exponential moving average half-life, used to compute average bitrate for VoD streams.
-     * Half of the estimate is based on the last abrEwmaSlowVoD seconds of sample history. Each of the sample is weighted by the fragment loading duration.
-     * parameter should be a float greater than abrEwmaFastVoD
-     */
-    abrEwmaSlowVod?: number;
-    /**
-     * (default: 500000)
-     * Default bandwidth estimate in bits/second prior to collecting fragment bandwidth samples.
-     * parameter should be a float
-     */
-    abrEwmaDefaultEstimate?: number;
-    /**
-     * (default: 0.8)
-     * Scale factor to be applied against measured bandwidth average, to determine whether we can stay on current or lower quality level.
-     * If abrBandWidthFactor * bandwidth average < level.bitrate then ABR can switch to that level providing that it is equal or less than current level.
-     */
-    abrBandWidthFactor?: number;
-    /**
-     * (default: 0.7)
-     * Scale factor to be applied against measured bandwidth average, to determine whether we can switch up to a higher quality level.
-     * If abrBandWidthUpFactor * bandwidth average < level.bitrate then ABR can switch up to that quality level.
-     */
-    abrBandWidthUpFactor?: number;
-    /**
-     * (default: false)
-     * max bitrate used in ABR by avg measured bitrate i.e. if bitrate signaled in variant manifest for a given level is 2Mb/s but average bitrate measured on this level is 2.5Mb/s,
-     * then if config value is set to true, ABR will use 2.5 Mb/s for this quality level.
-     */
-    abrMaxWithRealBitrate?: boolean;
-    /**
-     * (default: 0)
-     * Return the capping/min bandwidth value that could be used by automatic level selection algorithm.
-     * Useful when browser or tab of the browser is not in the focus and bandwidth drops
-     */
-    minAutoBitrate?: number;
-  }
-
-  /**
-   * a Level object represents a given quality level and contains quality level related info
-   */
-  interface Level {
-    /**
-     * level url. might contain sever items if failover/redundant streams are found in the manifest
-     */
-    url: string[];
-    /**
-     * level bitrate
-     */
-    bitrate: number;
-    /**
-     * level name
-     */
-    name: string;
-    /**
-     * used codecs
-     */
-    codecs: string;
-    /**
-     * video width
-     */
-    width: number;
-    /**
-     * video height
-     */
-    height: number;
-    /**
-     * level details
-     */
-    details: LevelDetails;
-  }
-
-  /**
-   * a LevelDetails object contains level details retrieved after level playlist parsing
-   */
-  interface LevelDetails {
-    /**
-     * protocol version
-     */
-    version: number;
-    /**
-     * playlist type
-     */
-    type: string;
-    /**
-     * start sequence number
-     */
-    startSN: number;
-    /**
-     * end sequence number
-     */
-    endSN: number;
-    /**
-     * level total duration
-     */
-    totalduration: number;
-    /**
-     * level fragment target duration
-     */
-    targetduration: number;
-    /**
-     * average fragment duration
-     */
-    averagetargetduration: number;
-    /**
-     * array of fragments info
-     */
-    fragments: Fragment[];
-    /**
-     * is this level a live playlist or not?
-     */
-    live: boolean;
-  }
-
-  /**
-   * the Fragment object contains fragment related info
-   */
-  interface Fragment {
-    /**
-     * fragment duration
-     */
-    duration: number;
-    /**
-     * fragment level identifier
-     */
-    level: number;
-    /**
-     * fragment sequence number
-     */
-    sn: number;
-    /**
-     * fragment start offset
-     */
-    start: number;
-    /**
-     * fragment url
-     */
-    url: string;
-    /**
-     * stream start date and time
-     */
-    programDateTime: Date;
-    /**
-     * continuity count
-     */
-    cc: number;
-    /**
-     * list of tags associated with the fragment
-     */
-    tagList: string[][];
-    /**
-     * fragment title
-     */
-    title: string;
-  }
-
-  interface Data {
-    /**
-     * videoElement
-     */
-    video?: HTMLVideoElement;
-    /**
-     * media source
-     */
-    mediaSource?: string;
-    /**
-     * manifest url
-     */
-    url?: string;
-    /**
-     * available quality levels
-     */
-    levels?: number[];
-    /**
-     * available audio tracks
-     */
-    audioTracks?: AudioTrack[];
-    /**
-     * XMLHttp request stats
-     */
-    stats?: HlsStats;
-    /**
-     * index of first quality level appearing in Manifest
-     */
-    firstLevel?: number;
-    /**
-     * id of updated level
-     */
-    level?: number;
-    /**
-     *  id of loaded level
-     */
-    levelId?: number;
-    /**
-     * ErrorDetails type or Level Details
-     */
-    details?: string | LevelDetails;
-    /**
-     * PTS drift observed when parsing last fragment
-     */
-    drift?: number;
-    /**
-     * fragment object with frag.loaded=stats.loaded
-     */
-    frag?: Fragment;
-    /**
-     * fragment payload
-     */
-    payload?: any; // TODO: what is the payload?
-    /**
-     * id of level or demuxer
-     */
-    id?: number;
-    /**
-     * moof MP4 box
-     */
-    moof?: any; // TODO: whats is the moof?
-    /**
-     * mdat MP4 box
-     */
-    mdat?: any; // TODO: what is mdat?
-    /**
-     * PTS of first sample
-     */
-    startPTS?: number;
-    /**
-     * PTS of last sample
-     */
-    endPTS?: number;
-    /**
-     * DTS of first sample
-     */
-    startDTS?: number;
-    /**
-     * DTS of last sample
-     */
-    endDTS?: number;
-    /**
-     * stream type (audio or video)
-     */
-    type?: string;
-    /**
-     * number of samples
-     */
-    nb?: number;
-    /**
-     * number of dropped frames in last monitoring period
-     */
-    currentDropped?: number;
-    /**
-     * number of decoded frames in last monitoring period
-     */
-    currentDecode?: number;
-    /**
-     * total dropped frames on this video element
-     */
-    totalDropped?: number;
-    /**
-     * level has to much dropped frame will be restricted
-     */
-    droppedLevel?: number;
-    /**
-     * is error fatal or not.
-     * if error is not fatal, hls.js will try to recover it
-     * if error is fatal, an action is required to (try to) recover it
-     */
-    fatal?: boolean;
-  }
-
-  /**
-   * (default: internal ABR controller)
-   * Customized Adaptive Bitrate Streaming Controller.
-   */
-  interface AbrController {
-    /**
-     * get: capping/max level value that could be used by ABR Controller
-     * set: capping/max level value that could be used by ABR Controller
-     */
-    autoLevelCapping: number;
-    /**
-     *  accumulated handled events
-     */
-    handledEvents: string[];
-    /**
-     * current hls instance
-     */
-    hls: Hls;
-    /**
-     * last fragments corresponding level
-     */
-    lastLoadedFragLevel: number;
-    /**
-     * get: next auto-quality levele/force next auto-quality level that should be returned
-     * set: next auto-quality levele/force next auto-quality level that should be returned
-     *  - currently used for emergency switch down
-     */
-    nextAutoLevel: number;
-    useGenericHandler: boolean;
-  }
-
-  /**
-   *  Customized text track syncronization controller.
-   */
-  interface TimelineController {
-    /**
-     * clean-up all used resources
-     */
-    destory(): void;
-  }
-
-  interface LoaderResponse {
-    url: string;
-    data: string | ArrayBuffer;
-  }
-
-  interface LoaderStats {
-    /**
-     * performance.now() just after load() has been called
-     */
-    trequest: number;
-    /**
-     * performance.now() of first received byte
-     */
-    tfirst: number;
-    /**
-     * performance.now() on load complete
-     */
-    tload: number;
-    /**
-     * number of loaded bytes
-     */
-    loaded: number;
-    /**
-     * download bandwitdh in bit/s
-     */
-    bw: number;
-    /**
-     * total nb of bytes
-     */
-    total: number;
-  }
-
-  interface LoaderError {
-    /**
-     * error code
-     */
-    code: number;
-    /**
-     *  error description
-     */
-    text: string;
-  }
-
-  interface HlsStats {
-    /**
-     * performance.now() just after load() has been called
-     */
-    trequest: number;
-    /**
-     * performance.now() of first received byte
-     */
-    tfirst: number;
-    /**
-     * performance.now() on load complete
-     */
-    tload: number;
-    mtime: number;
-    tbuffered?: number;
-    length?: number;
-  }
-
-  interface LoaderContext {
-    /**
-     * target URL
-     */
-    url: string;
-    /**
-     * loader response type (arraybuffer or default response type for playlist)
-     */
-    responseType: string;
-    /**
-     * start byte range offset
-     */
-    rangeStart?: number;
-    /**
-     * end byte range offset
-     */
-    rangeEnd?: number;
-    /**
-     * true if onProgress should report partial chunk of loaded content
-     */
-    progressData?: boolean;
-    /**
-     * fragment object
-     */
-    frag: Fragment;
-    /**
-     * request type
-     * - level, manifest
-     */
-    type: string;
-    /**
-     * level id
-     */
-    level: number;
-  }
-
-  interface LoaderConfig {
-    /**
-     * Max number of load retries
-     */
-    maxRetry: number;
-    /**
-     * Timeout after which `onTimeOut` callback will be triggered (if loading is still not finished after that delay)
-     */
-    timeout: number;
-    /**
-     * Delay between an I/O error and following connection retry (ms). This to avoid spamming the server
-     */
-    retryDelay: number;
-    /**
-     * max connection retry delay (ms)
-     */
-    maxRetryDelay: number;
-  }
-
-  interface LoaderCallbacks {
-    onSuccess(response: LoaderResponse, stats: LoaderStats, context: LoaderContext): void;
-    onProgress(stats: LoaderStats, context: LoaderContext, data: string | ArrayBuffer): void;
-    onError(error: LoaderError, context: LoaderContext): void;
-    onTimeout(stats: LoaderStats, context: LoaderContext): void;
-  }
-}
-
-declare class Hls {
-  /**
-   * Constructor. Can be provided an HlsConfig object as default properties and or overrides
-   */
-  constructor(config?: Hls.OptionalConfig)
-  /**
-   * return array of available quality levels
-   */
-  levels: Hls.Level[];
-  /**
-   * get: return current playback quality level
-   * set:  trigger an immediate quality level switch to new quality level
-   * this will pause the video if it was playing, flush the whole buffer,
-   * and fetch fragment matching with current position and requested quality level
-   * then resume the video if needed once fetched fragment will have been buffered
-   *
-   * set to -1 for automatic level selection
-   */
-  currentLevel: number;
-  /**
-   * capping/max level (index of level) that could be used by ABR Controller. Defaults to -1
-   * which means no limit
-   * set: max level value that could be used by the ABR Controller
-   */
-  autoLevelCapping: number;
-  /**
-   * return start level index (level of first fragment that will be played back)
-   *      if not overrided by user: first level appearing in manifest will be used as start level
-   *      if -1: automatic start level selection, playback will start from level matching download bandwidth (determined from download of first segment)
-   *
-   *  default valus is hls.firstLevel
-   */
-  startLevel: number;
-  /**
-   * (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;
-  /**
-   * get: Return the bound videoElement from the hls instance
-   */
-  media: HTMLVideoElement;
-  /**
-   *  hls.js config
-   */
-  config: Hls.Config;
-  /**
-   * get: return next playback quality level (playback quality level for next buffered fragment)
-   * return -1 if next fragment not buffered yet
-   * set: trigger a quality level switch for next fragment
-   * this could eventually flush already buffered next fragment
-   *
-   * set to -1 for automatic level selection
-   */
-  nextLevel: number;
-  /**
-   * get: return last loaded fragment quality level
-   * set: quality level for next loaded fragment
-   * set to -1 for automatic level selection
-   */
-  loadLevel: number;
-  /**
-   * get: return quality level that will be used to load next fragment
-   * set: force quality level for next loaded fragment
-   * quality level will be forced only for that fragment
-   * after a fragment at this quality level has been loaded, hls.loadLevel will prevail
-   */
-  nextLoadLevel: number;
-  /**
-   * first level index (index of first level appearing in Manifest. it is usually defined as start level hint for player)
-   */
-  firstLevel: number;
-  /**
-   * array of audio tracks exposed in manifest
-   */
-  audioTracks: AudioTrack[];
-  /**
-   * get: returns audio track id
-   * set: sets audio track id (returned by)
-   */
-  audioTrack: number;
-  /**
-   * position of live sync point (ie edge of live position minus safety delay defined by hls.config.liveSyncDuration)
-   */
-  liveSyncPosition: number;
-  /**
-   * calling this method will:
-   *      bind videoElement and hls instances
-   *      create MediaSource and set it as video source
-   *      once MediaSource object is successfully created, MEDIA_ATTACHED event will be fired
-   */
-  attachMedia(videoElement: HTMLVideoElement): void;
-  /**
-   * calling this method will:
-   *      unbind VideoElement from hls instance
-   *      signal the end of the stream on MediaSource
-   *      reset video source ( video.src = '' )
-   */
-  detachMedia(): void;
-  /**
-   * tell whether auto level selection is enabled or not
-   */
-  autoLevelEnabled(enabled: boolean): boolean;
-  /**
-   * loads provided url as media source
-   */
-  loadSource(source: string): void;
-  /**
-   * by default, hls.js will automatically start loading quality level playlists, and fragments after Hls.Events.MANIFEST_PARSED event has been triggered (and video element has been attached)
-   * however if config.autoStartLoad is set to false, hls.startLoad() needs to be called to manually start playlist and fragments loading
-   *
-   * start/restart playlist/fragment loading. this is only effective if MANIFEST_PARSED event has been triggered and video element has been attached to hls object
-   * startPosition is the initial position in the playlist
-   * ff startPosition is not set to -1, it allows to override default startPosition to the one you want
-   * (it will bypass hls.config.liveSync* config params for Live for example, so that user can start playback from whatever position)
-   */
-  startLoad(startPosition?: number): void;
-  /**
-   * stop playlist/fragment loading. could be resumed later on by calling hls.startLoad()
-   */
-  stopLoad(): void;
-  /**
-   * should be invoked to recover media error.
-   */
-  recoverMediaError(): void;
-  /**
-   * if media error are still raised after calling hls.recoverMediaError(), calling this method, could be useful to workaround audio codec mismatch.
-   * the workflow should be:
-   *  on First Media Error : call hls.recoverMediaError()
-   *  if another Media Error is raised 'quickly' after this first Media Error : first call hls.swapAudioCodec(), then call hls.recoverMediaError()
-   */
-  swapAudioCodec(): void;
-  /**
-   * should be called to free used resources and destroy hls context
-   */
-  destroy(): void;
-  /**
-   * hls.js event listener
-   */
-  on(event: string, callback: (event: string, data: Hls.Data) => void): void;
-  /**
-   * remove hls.js event listener
-   */
-  off(event: string, callback: (event: string, data: Hls.Data) => void): void;
+    off(event: string, callback: (...params: any[]) => void): void;
 }
 
 export as namespace Hls;
diff --git a/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx b/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
new file mode 100644
index 0000000000..0e1beed2e9
--- /dev/null
+++ b/types/hoist-non-react-statics/hoist-non-react-statics-tests.tsx
@@ -0,0 +1,46 @@
+import * as React from 'react';
+import * as PropTypes from 'prop-types';
+
+import hoistNonReactStatics = require('hoist-non-react-statics');
+
+class A extends React.Component<{ x: number; y?: number | null }> {
+    static a = 'a';
+
+    static propTypes = {
+        x: PropTypes.number.isRequired,
+        y: PropTypes.number,
+    };
+
+    getA() {
+        return A.a;
+    }
+}
+
+class B extends React.Component {
+    static b = 'b';
+
+    static propTypes = {
+        n: PropTypes.number.isRequired,
+    };
+
+    getB() {
+        return B.b;
+    }
+}
+
+const C = hoistNonReactStatics(A, B);
+
+C.a !== C.b;
+
+C.propTypes.x;
+C.prototype.getA();
+
+C.propTypes.n; // $ExpectError
+C.prototype.getB(); // $ExpectError
+
+<C x={1} />;
+
+const D = hoistNonReactStatics(A, B, { a: true, b: true });
+
+D.a;
+D.b; // $ExpectError
diff --git a/types/hoist-non-react-statics/index.d.ts b/types/hoist-non-react-statics/index.d.ts
new file mode 100644
index 0000000000..414c4c41f0
--- /dev/null
+++ b/types/hoist-non-react-statics/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for hoist-non-react-statics 3.0
+// Project: https://github.com/mridgway/hoist-non-react-statics#readme
+// Definitions by: JounQin <https://github.com/JounQin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+interface REACT_STATICS {
+    childContextTypes: true;
+    contextTypes: true;
+    defaultProps: true;
+    displayName: true;
+    getDefaultProps: true;
+    getDerivedStateFromProps: true;
+    mixins: true;
+    propTypes: true;
+    type: true;
+}
+
+interface KNOWN_STATICS {
+    name: true;
+    length: true;
+    prototype: true;
+    caller: true;
+    callee: true;
+    arguments: true;
+    arity: true;
+}
+
+declare function hoistNonReactStatics<
+    T extends React.ComponentType<any>,
+    S extends React.ComponentType<any>,
+    C extends {
+        [key: string]: true
+    } = {}
+>(
+    TargetComponent: T,
+    SourceComponent: S,
+    customStatic?: C,
+): T &
+    {
+        [key in Exclude<
+            keyof S,
+            // only extends static properties, exclude instance properties and known react statics
+            keyof REACT_STATICS | keyof KNOWN_STATICS | keyof C
+        >]: S[key]
+    };
+
+export = hoistNonReactStatics;
diff --git a/types/hoist-non-react-statics/tsconfig.json b/types/hoist-non-react-statics/tsconfig.json
new file mode 100644
index 0000000000..e0d62444e2
--- /dev/null
+++ b/types/hoist-non-react-statics/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": "preserve"
+    },
+    "files": [
+        "index.d.ts",
+        "hoist-non-react-statics-tests.tsx"
+    ]
+}
diff --git a/types/hoist-non-react-statics/tslint.json b/types/hoist-non-react-statics/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/hoist-non-react-statics/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/html-webpack-plugin/html-webpack-plugin-tests.ts b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
index b80ea9e6b0..461e43c2af 100644
--- a/types/html-webpack-plugin/html-webpack-plugin-tests.ts
+++ b/types/html-webpack-plugin/html-webpack-plugin-tests.ts
@@ -1,4 +1,5 @@
 import HtmlWebpackPlugin = require('html-webpack-plugin');
+import { Compiler, compilation } from 'webpack';
 
 new HtmlWebpackPlugin();
 
@@ -21,7 +22,93 @@ const optionsArray: HtmlWebpackPlugin.Options[] = [
 	},
 	{
 		chunksSortMode: 'manual',
+	},
+	// All default params
+	{
+		template: 'default_index.ejs',
+		templateParameters: (compilation, assets, options) => {
+			return {
+				compilation,
+				webpack: compilation.getStats().toJson(),
+				// TODO: compilation.options not defined on @types/webpack
+				webpackConfig: {},
+				htmlWebpackPlugin: {
+					files: assets,
+					options
+				}
+			};
+		},
+		filename: 'index.html',
+		hash: false,
+		inject: true,
+		compile: true,
+		favicon: false,
+		minify: false,
+		cache: true,
+		showErrors: true,
+		chunks: 'all',
+		excludeChunks: [],
+		chunksSortMode: 'auto',
+		meta: {},
+		title: 'Webpack App',
+		xhtml: false
+	},
+	// Config from 'appcache' example
+	{
+		filename: 'index.html',
+		template: 'template.html',
+		minify: {
+		  removeComments: true,
+		  collapseWhitespace: true
+		}
+	},
+	// Config from 'custom-template' example
+	{
+		template: 'template.html'
+	},
+	// Config from 'favicon' example
+	{
+		title: 'HtmlWebpackPlugin example',
+		favicon: 'favicon.ico',
+		filename: 'favicon.html'
+	},
+	// Config from 'inline' example
+	{
+		inject: false,
+		cache: false,
+		template: 'template.jade',
+		filename: 'index.html',
+		favicon: 'favicon.ico',
+		title: 'Jade demo'
+	},
+	// Config from 'sort-manually' example
+	{
+		inject: true,
+		filename: 'first-file.html',
+		template: 'template.html',
+		chunksSortMode: 'manual',
+		chunks: ['a', 'b', 'c']
+	},
+	// Config from 'template-parameters' example
+	{
+		templateParameters: {
+		  foo: 'bar'
+		},
+		template: 'index.ejs'
 	}
 ];
 
 const plugins: HtmlWebpackPlugin[] = optionsArray.map(options => new HtmlWebpackPlugin(options));
+
+// Webpack plugin `apply` function
+function apply(compiler: Compiler) {
+	compiler.hooks.compilation.tap('SomeWebpackPlugin', (compilation: compilation.Compilation) => {
+		(<HtmlWebpackPlugin.Hooks> compilation.hooks).htmlWebpackPluginAfterHtmlProcessing.tap(
+			'MyPlugin',
+			(data) => {
+				data.html += 'The Magic Footer';
+				return data;
+			}
+		);
+	});
+}
diff --git a/types/html-webpack-plugin/index.d.ts b/types/html-webpack-plugin/index.d.ts
index c3db12f4e7..25b615a7be 100644
--- a/types/html-webpack-plugin/index.d.ts
+++ b/types/html-webpack-plugin/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for html-webpack-plugin 2.30
-// Project: https://github.com/ampedandwired/html-webpack-plugin
+// Type definitions for html-webpack-plugin 3.2
+// Project: https://github.com/jantimon/html-webpack-plugin
 // 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
 // TypeScript Version: 2.3
 
-import { Plugin } from 'webpack';
+import { Plugin, compilation } from 'webpack';
+import { AsyncSeriesWaterfallHook } from 'tapable';
 import { Options as HtmlMinifierOptions } from 'html-minifier';
 
 export = HtmlWebpackPlugin;
@@ -18,64 +19,113 @@ declare class HtmlWebpackPlugin extends Plugin {
 declare namespace HtmlWebpackPlugin {
 	type MinifyOptions = HtmlMinifierOptions;
 
-	/**
-	 * It is assumed that each [chunk] contains at least the properties "id"
-	 * (containing the chunk id) and "parents" (array containing the ids of the
-	 * parent chunks).
-	 *
-	 * @todo define in webpack
-	 */
-	interface Chunk {
-		id: string;
-		parents: string[];
-		[propName: string]: any;
+	interface TemplateParametersAssets {
+		/** The public path */
+		publicPath: string;
+		/** Will contain all js & css files by chunk */
+		chunks: {};
+		/** Will contain all js files */
+		js: string[];
+		/** Will contain all css files */
+		css: string[];
+		/** Will contain a favicon if it exists */
+		favicon?: string;
+		/** Will contain amn appcache manifest file if it exists */
+		manifest?: string;
 	}
 
-	type ChunkComparator = (a: Chunk, b: Chunk) => number;
-
 	interface Options {
-		/** `true | false` if `true` (default) try to emit the file only if it was changed. */
+		/**
+		 * Emit the file only if it was changed.
+		 * Default: `true`.
+		 */
 		cache?: boolean;
 		/**
 		 * Allows to control how chunks should be sorted before they are included to the html.
-		 * Allowed values: 'none' | 'auto' | 'dependency' |'manual' | {function} - default: 'auto'
+		 * Default: `'auto'`.
+		 */
+		chunksSortMode?:
+			'none'
+			| 'auto'
+			| 'dependency'
+			| 'manual'
+			| ((a: compilation.Chunk, b: compilation.Chunk) => number);
+		/**
+		 * Allows you to add only some chunks (e.g. only the unit-test chunk).
+		 * Default: 'all'.
+		 */
+		chunks?: 'all' | string[];
+		/**
+		 * Allows you to skip some chunks (e.g. don't add the unit-test chunk).
+		 * Default: `[]`.
 		 */
-		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) */
 		excludeChunks?: string[];
-		/** Adds the given favicon path to the output html. */
-		favicon?: string;
+		/**
+		 * Adds the given favicon path to the output html.
+		 * Default: `false`.
+		 */
+		favicon?: false | string;
 		/**
 		 * The file to write the HTML to.
-		 * Defaults to index.html. You can specify a subdirectory here too (eg: `assets/admin.html`).
+		 * You can specify a subdirectory here too (eg: `assets/admin.html`).
+		 * Default: `'index.html'`.
 		 */
 		filename?: string;
 		/**
-		 * `true | false` if `true` then append a unique webpack compilation hash to all included scripts and css files.
+		 * If true then append a unique webpack compilation hash to all included scripts and CSS files.
 		 * This is useful for cache busting.
+		 * Default: `false`.
 		 */
 		hash?: boolean;
 		/**
-		 * `true | 'head' | 'body' | false`
 		 * Inject all assets into the given template or templateContent.
 		 * When passing true or 'body' all javascript resources will be placed at the bottom of the body element.
 		 * 'head' will place the scripts in the head element.
+		 * Default: `true`.
 		 */
 		inject?: 'body' | 'head' | boolean;
 		/**
-		 * `{...} | false` Pass a html-minifier options object to minify the output.
+		 * Allows to inject meta-tags, e.g. meta: `{viewport: 'width=device-width, initial-scale=1, shrink-to-fit=no'}`.
+		 * Default: `{}`.
+		 */
+		meta?: false | { [name: string]: any };
+		/**
+		 * Pass a html-minifier options object to minify the output.
 		 * https://github.com/kangax/html-minifier#options-quick-reference
+		 * Default: `false`.
 		 */
 		minify?: false | MinifyOptions;
-		/** `true | false` if `true` (default) errors details will be written into the html page. */
+		/**
+		 * Errors details will be written into the HTML page.
+		 * Default: `true`.
+		 */
 		showErrors?: boolean;
-		/** Webpack require path to the template. Please see the docs for details. */
+		/**
+		 * The `webpack` require path to the template.
+		 * @see https://github.com/jantimon/html-webpack-plugin/blob/master/docs/template-option.md
+		 */
 		template?: string;
-		/** The title to use for the generated HTML document. */
+		/**
+		 * Allow to use a html string instead of reading from a file.
+		 * Default: `false`, meaning the `template` option should be used instead.
+		 */
+		templateContent?: false | string | Promise<string>;
+		/**
+		 * Allows to overwrite the parameters used in the template.
+		 */
+		templateParameters?:
+			false
+			| ((compilation: compilation.Compilation, assets: TemplateParametersAssets, options: Options) => any)
+			| { [key: string]: any };
+		/**
+		 * The title to use for the generated HTML document.
+		 * Default: `'Webpack App'`.
+		 */
 		title?: string;
-		/** `true | false` If `true` render the link tags as self-closing, XHTML compliant. Default is `false` */
+		/**
+		 * If true render the link tags as self-closing (XHTML compliant).
+		 * Default: `false`.
+		 */
 		xhtml?: boolean;
 		/**
 		 * In addition to the options actually used by this plugin, you can use this hash to pass arbitrary data through
@@ -84,8 +134,81 @@ declare namespace HtmlWebpackPlugin {
 		[option: string]: any;
 	}
 
+	interface Hooks extends compilation.CompilationHooks {
+		htmlWebpackPluginBeforeHtmlGeneration: AsyncSeriesWaterfallHook<{
+			assets: {
+				publicPath: string;
+				js: EntryObject[];
+				css: EntryObject[];
+			};
+			outputName: string;
+			plugin: HtmlWebpackPlugin;
+		}>;
+		htmlWebpackPluginBeforeHtmlProcessing: AsyncSeriesWaterfallHook<{
+			html: string;
+			assets: {
+				publicPath: string;
+				js: EntryObject[];
+				css: EntryObject[];
+			};
+			outputName: string;
+			plugin: HtmlWebpackPlugin;
+		}>;
+		htmlWebpackPluginAfterHtmlProcessing: AsyncSeriesWaterfallHook<{
+			html: string;
+			assets: {
+				publicPath: string;
+				js: EntryObject[];
+				css: EntryObject[];
+			};
+			outputName: string;
+			plugin: HtmlWebpackPlugin;
+		}>;
+		htmlWebpackPluginAlterAssetTags: AsyncSeriesWaterfallHook<{
+			head: HtmlTagObject[];
+			body: HtmlTagObject[];
+			outputName: string;
+			plugin: HtmlWebpackPlugin;
+		}>;
+		htmlWebpackPluginAfterEmit: AsyncSeriesWaterfallHook<{
+			html: string;
+			outputName: string;
+			plugin: HtmlWebpackPlugin;
+		}>;
+	}
+
 	/** @deprecated use MinifyOptions */
 	type MinifyConfig = MinifyOptions;
 	/** @deprecated use Options */
 	type Config = Options;
 }
+
+interface EntryObject {
+	/** Webpack entry or chunk name */
+	entryName: string;
+	/** Entry or chunk path */
+	path: string;
+}
+
+interface HtmlTagObject {
+	/**
+	 * Attributes of the html tag
+	 * E.g. `{'disabled': true, 'value': 'demo'}`
+	 */
+	attributes: {
+		[attributeName: string]: string | boolean;
+	};
+	/**
+	 * Wether this html must not contain innerHTML
+	 * @see https://www.w3.org/TR/html5/syntax.html#void-elements
+	 */
+	voidTag: boolean;
+	/**
+	 * The tag name e.g. `'div'`
+	 */
+	tagName: string;
+	/**
+	 * Inner HTML The
+	 */
+	innerHTML?: string;
+}
diff --git a/types/http-graceful-shutdown/http-graceful-shutdown-tests.ts b/types/http-graceful-shutdown/http-graceful-shutdown-tests.ts
new file mode 100644
index 0000000000..2445635c67
--- /dev/null
+++ b/types/http-graceful-shutdown/http-graceful-shutdown-tests.ts
@@ -0,0 +1,30 @@
+import GracefulShutdown = require('http-graceful-shutdown');
+import * as http from "http";
+import * as https from "https";
+
+const opts: GracefulShutdown.Options = {
+    signals: "SIGINT SIGTERM",
+    timeout: 1337,
+    development: false,
+    onShutdown: () => {
+        console.log('fake shutdown handler');
+        return Promise.resolve();
+    },
+    finally: () => {
+        console.log('fake finally handler');
+    }
+};
+
+const httpServer = http.createServer((req, res) => {
+    res.end();
+});
+
+const httpsServer = https.createServer({
+    key: new Buffer('foo'),
+    cert: new Buffer('bar')
+}, (req, res) => {
+    res.end();
+});
+
+GracefulShutdown(httpServer, opts);
+GracefulShutdown(httpsServer, opts);
diff --git a/types/http-graceful-shutdown/index.d.ts b/types/http-graceful-shutdown/index.d.ts
new file mode 100644
index 0000000000..ba34246290
--- /dev/null
+++ b/types/http-graceful-shutdown/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for http-graceful-shutdown 2.1
+// Project: https://github.com/sebhildebrandt/http-graceful-shutdown
+// Definitions by: Dave Lee <https://github.com/dlee-nvisia>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Server as HttpServer } from "http";
+import { Server as HttpsServer } from "https";
+
+declare function GracefulShutdown(server: HttpServer | HttpsServer, options?: GracefulShutdown.Options): void;
+
+declare namespace GracefulShutdown {
+    interface Options {
+        signals?: string;
+        timeout?: number;
+        development?: boolean;
+        onShutdown?: () => Promise<void>;
+        finally?: () => void;
+    }
+}
+
+export = GracefulShutdown;
diff --git a/types/http-graceful-shutdown/tsconfig.json b/types/http-graceful-shutdown/tsconfig.json
new file mode 100644
index 0000000000..a738609778
--- /dev/null
+++ b/types/http-graceful-shutdown/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-graceful-shutdown-tests.ts"
+    ]
+}
diff --git a/types/http-graceful-shutdown/tslint.json b/types/http-graceful-shutdown/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-graceful-shutdown/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/http-link-header/index.d.ts b/types/http-link-header/index.d.ts
index a8dca563d2..cbcb4cbfdb 100644
--- a/types/http-link-header/index.d.ts
+++ b/types/http-link-header/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for http-link-header 0.6
 // Project: https://github.com/jhermsmeier/node-http-link-header
-// Definitions by: Christian Rackerseder <https://www.echooff.de/>
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export interface Reference {
diff --git a/types/http-proxy-middleware/http-proxy-middleware-tests.ts b/types/http-proxy-middleware/http-proxy-middleware-tests.ts
index 3e932bb838..9f60f3704d 100644
--- a/types/http-proxy-middleware/http-proxy-middleware-tests.ts
+++ b/types/http-proxy-middleware/http-proxy-middleware-tests.ts
@@ -64,7 +64,7 @@ proxy({
 });
 proxy({
   logProvider(provider) {
-    const logger = new (Winston.Logger)();
+    const logger = Winston.createLogger();
 
     return {
       log: logger.log,
diff --git a/types/http-proxy-middleware/package.json b/types/http-proxy-middleware/package.json
new file mode 100644
index 0000000000..0aa4cf368f
--- /dev/null
+++ b/types/http-proxy-middleware/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "winston": "^3.0.0"
+    }
+}
diff --git a/types/http-rx/http-rx-tests.ts b/types/http-rx/http-rx-tests.ts
new file mode 100644
index 0000000000..082585fdf9
--- /dev/null
+++ b/types/http-rx/http-rx-tests.ts
@@ -0,0 +1,14 @@
+import { Observable } from 'rxjs';
+import httpRx = require('http-rx');
+
+const httpGet: Observable<any> = httpRx.get('');
+
+const httpHead: Observable<number> = httpRx.head('');
+
+const httpPatch: Observable<string> = httpRx.patch('');
+
+const httpPost: Observable<void> = httpRx.post('');
+
+const httpPut: Observable<{}> = httpRx.put('');
+
+const httpDelete: Observable<object> = httpRx.delete('');
diff --git a/types/http-rx/index.d.ts b/types/http-rx/index.d.ts
new file mode 100644
index 0000000000..3b0c734fb0
--- /dev/null
+++ b/types/http-rx/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for http-rx 1.1
+// Project: https://github.com/JasonRammoray/HttpRx
+// Definitions by: L2jLiga <https://github.com/L2jLiga>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Observable } from 'rxjs';
+import request = require('request');
+
+interface HttpRx {
+    get(url: string, options?: request.CoreOptions): Observable<any>;
+
+    head(url: string, options?: request.CoreOptions): Observable<any>;
+
+    patch(url: string, options?: request.CoreOptions): Observable<any>;
+
+    post(url: string, options?: request.CoreOptions): Observable<any>;
+
+    put(url: string, options?: request.CoreOptions): Observable<any>;
+
+    'delete'(url: string, options?: request.CoreOptions): Observable<any>;
+}
+
+declare const httpRx: HttpRx;
+export = httpRx;
diff --git a/types/http-rx/package.json b/types/http-rx/package.json
new file mode 100644
index 0000000000..5c3a35fe37
--- /dev/null
+++ b/types/http-rx/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "rxjs": ">=6.2.0"
+    }
+}
diff --git a/types/typed.js/tsconfig.json b/types/http-rx/tsconfig.json
similarity index 94%
rename from types/typed.js/tsconfig.json
rename to types/http-rx/tsconfig.json
index b018ca64fe..025bdc0c3e 100644
--- a/types/typed.js/tsconfig.json
+++ b/types/http-rx/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "typed.js-tests.ts"
+        "http-rx-tests.ts"
     ]
 }
diff --git a/types/http-rx/tslint.json b/types/http-rx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/http-rx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/i18n-js/index.d.ts b/types/i18n-js/index.d.ts
index 4800125087..70a197772d 100644
--- a/types/i18n-js/index.d.ts
+++ b/types/i18n-js/index.d.ts
@@ -70,6 +70,8 @@ declare namespace I18n {
     }
     function toCurrency(num: number, options?: ToCurrencyOptions): string;
 
+    function toTime(scope: Scope, value: string | number | Date): string;
+
     interface ToHumanSizeOptions extends ToNumberOptions {
         format?: string;
     }
diff --git a/types/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts b/types/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
index eadfcea369..174a871b9f 100644
--- a/types/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
+++ b/types/i18next-browser-languagedetector/i18next-browser-languagedetector-tests.ts
@@ -19,7 +19,7 @@ const options: LngDetector.DetectorOptions = {
     cookieDomain: "myDomain",
 
     // optional htmlTag with lang attribute, the default is:
-    htmlTag: document.documentElement
+    htmlTag: document.documentElement!
 };
 
 i18next.use(LngDetector).init({
diff --git a/types/i18next-ko/i18next-ko-tests.ts b/types/i18next-ko/i18next-ko-tests.ts
new file mode 100644
index 0000000000..1b8cd90904
--- /dev/null
+++ b/types/i18next-ko/i18next-ko-tests.ts
@@ -0,0 +1,24 @@
+import * as i18next from 'i18next';
+import * as i18nextko from 'i18next-ko';
+import * as ko from 'knockout';
+
+const resourceStore = {
+    en: {
+        translation: {
+            testTranslation: 'Test translation'
+        }
+    },
+
+    de: {
+        translation: {
+            testTranslation: 'Test-Übersetzung'
+        }
+    }
+};
+i18nextko.init(resourceStore, 'en', ko);
+
+i18nextko.setLanguage('de');
+
+i18nextko.i18n;
+
+i18nextko.t('testTranslation');
diff --git a/types/i18next-ko/index.d.ts b/types/i18next-ko/index.d.ts
new file mode 100644
index 0000000000..e9d3c2c639
--- /dev/null
+++ b/types/i18next-ko/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for i18next-ko 3.0
+// Project: https://github.com/leMaik/i18next-ko
+// Definitions by: Daniel Waxweiler <https://github.com/dwaxweiler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="knockout"/>
+
+import * as i18next from 'i18next';
+
+export const i18n: i18next.i18n;
+
+export function init(resourceStore: i18nextkoResourceStore, language: string, ko: KnockoutStatic): void;
+
+export function setLanguage(language: string): void;
+
+export function t(key: string): KnockoutComputed<string>;
+
+export interface i18nextkoResourceStore {
+    [language: string]: {
+        translation: {
+            [key: string]: string
+        }
+    };
+}
diff --git a/types/i18next-ko/tsconfig.json b/types/i18next-ko/tsconfig.json
new file mode 100644
index 0000000000..9509fa509e
--- /dev/null
+++ b/types/i18next-ko/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",
+        "i18next-ko-tests.ts"
+    ]
+}
diff --git a/types/i18next-ko/tslint.json b/types/i18next-ko/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/i18next-ko/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/i18next/index.d.ts b/types/i18next/index.d.ts
index 61b59b32e1..484745bcad 100644
--- a/types/i18next/index.d.ts
+++ b/types/i18next/index.d.ts
@@ -97,17 +97,29 @@ declare namespace i18next {
     interface ReactOptions {
         /**
          * set to true if you like to wait for loaded in every translated hoc
+         * @default false
          */
         wait?: boolean;
         /**
          * set it to fallback to let passed namespaces to translated hoc act as fallbacks
+         * @default 'default'
          */
-        nsMode?: string;
+        nsMode?: 'default' | 'fallback';
         /**
          * set it to the default parent element created by the Trans component.
-         * @default div
+         * @default 'div'
          */
         defaultTransParent?: string;
+        /**
+         * set which events trigger a rerender, can be set to false or string of events
+         * @default 'languageChanged loaded'
+         */
+        bindI18n?: string | false;
+        /**
+         * set which events on store trigger a rerender, can be set to false or string of events
+         * @default 'added removed'
+         */
+        bindStore?: string | false;
     }
 
     interface InitOptions {
@@ -493,7 +505,7 @@ declare namespace i18next {
         /**
          * Returns rtl or ltr depending on languages read direction.
          */
-        dir(lng?: string): void;
+        dir(lng?: string): "ltr" | "rtl";
 
         /**
          * Exposes interpolation.format function added on init.
diff --git a/types/i18next/v2/index.d.ts b/types/i18next/v2/index.d.ts
index f9bd900e77..b67a5f9423 100644
--- a/types/i18next/v2/index.d.ts
+++ b/types/i18next/v2/index.d.ts
@@ -128,7 +128,7 @@ declare namespace i18n {
 
         loadLanguages(lngs: string[], callback?: () => void): void;
 
-        dir(lng?: string): string;
+        dir(lng?: string): "ltr" | "rtl";
 
         createInstance(options?: Options, callback?: (err: any, t: TranslationFunction) => void): I18n;
 
diff --git a/types/iarna__toml/iarna__toml-tests.ts b/types/iarna__toml/iarna__toml-tests.ts
new file mode 100644
index 0000000000..65dcddbe3a
--- /dev/null
+++ b/types/iarna__toml/iarna__toml-tests.ts
@@ -0,0 +1,35 @@
+import * as TOML from '@iarna/toml';
+import { Readable } from 'stream';
+
+TOML.parse('{}'); // $ExpectType Record<string, any>
+TOML.parse.async('{}'); // $ExpectType Promise<Record<string, any>>
+TOML.parse.async('{}', {}); // $ExpectType Promise<Record<string, any>>
+TOML.parse.async('{}', {blocksize: 1}); // $ExpectType Promise<Record<string, any>>
+
+TOML.parse.stream(); // $ExpectType Transform
+TOML.parse.stream(new Readable()); // $ExpectType Promise<Record<string, any>>
+
+TOML.stringify({}); // $ExpectType string
+TOML.stringify(1); // $ExpectError
+
+TOML.stringify.value({}); // $ExpectType string
+TOML.stringify.value(1); // $ExpectType string
+
+import parse = require('@iarna/toml/parse-string');
+parse('{}'); // $ExpectType Record<string, any>
+
+import parseAsync = require('@iarna/toml/parse-async');
+parseAsync('{}'); // $ExpectType Promise<Record<string, any>>
+parseAsync('{}', {}); // $ExpectType Promise<Record<string, any>>
+parseAsync('{}', {blocksize: 1}); // $ExpectType Promise<Record<string, any>>
+
+import parseStream = require('@iarna/toml/parse-stream');
+parseStream(); // $ExpectType Transform
+parseStream(new Readable()); // $ExpectType Promise<Record<string, any>>
+
+import stringify = require('@iarna/toml/stringify');
+stringify({}); // $ExpectType string
+stringify(1); // $ExpectError
+
+stringify.value({}); // $ExpectType string
+stringify.value(1); // $ExpectType string
diff --git a/types/iarna__toml/index.d.ts b/types/iarna__toml/index.d.ts
new file mode 100644
index 0000000000..1d7f8b1239
--- /dev/null
+++ b/types/iarna__toml/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for @iarna/toml 2.0
+// Project: https://github.com/iarna/iarna-toml#readme
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import parseAsync = require('./parse-async');
+import parseStream = require('./parse-stream');
+
+export import stringify = require('./stringify');
+
+/** Synchronously parse a TOML string and return an object. */
+export function parse(str: string): Record<string, any>;
+export namespace parse {
+    export {
+        parseAsync as async,
+        parseStream as stream,
+    };
+}
diff --git a/types/iarna__toml/parse-async.d.ts b/types/iarna__toml/parse-async.d.ts
new file mode 100644
index 0000000000..40ba9b64ba
--- /dev/null
+++ b/types/iarna__toml/parse-async.d.ts
@@ -0,0 +1,10 @@
+/** Asynchronously parse a TOML string and return a promise of the resulting object. */
+declare function parseAsync(str: string, opts?: parseAsync.Options): Promise<Record<string, any>>;
+
+declare namespace parseAsync {
+    interface Options {
+        /** The amount text to parser per pass through the event loop. Defaults to 40kb. */
+        blocksize?: number;
+    }
+}
+export = parseAsync;
diff --git a/types/iarna__toml/parse-stream.d.ts b/types/iarna__toml/parse-stream.d.ts
new file mode 100644
index 0000000000..f844be1f07
--- /dev/null
+++ b/types/iarna__toml/parse-stream.d.ts
@@ -0,0 +1,9 @@
+/// <reference types="node" />
+
+import { Readable, Transform } from "stream";
+
+/** Given a readable stream, parse it as it feeds us data. Return a promise of the resulting object. */
+declare function parseStream(readable: Readable): Promise<Record<string, any>>;
+/** Returns a transform stream in object mode. When it completes, emit the resulting object. Only one object will ever be emitted. */
+declare function parseStream(): Transform;
+export = parseStream;
diff --git a/types/iarna__toml/parse-string.d.ts b/types/iarna__toml/parse-string.d.ts
new file mode 100644
index 0000000000..0ef7630951
--- /dev/null
+++ b/types/iarna__toml/parse-string.d.ts
@@ -0,0 +1,3 @@
+/** Synchronously parse a TOML string and return an object. */
+declare function parseString(str: string): Record<string, any>;
+export = parseString;
diff --git a/types/iarna__toml/stringify.d.ts b/types/iarna__toml/stringify.d.ts
new file mode 100644
index 0000000000..6596d587f3
--- /dev/null
+++ b/types/iarna__toml/stringify.d.ts
@@ -0,0 +1,15 @@
+/**
+ * Serialize an object as TOML.
+ *
+ * If an object `TOML.stringify` is serializing has a toJSON method then it will call it to transform the object before serializing it.
+ * This matches the behavior of JSON.stringify.
+ * The one exception to this is that toJSON is not called for Date objects because JSON represents dates as strings and TOML can represent them natively.
+ */
+declare function stringify(obj: Record<string, any>): string;
+
+declare namespace stringify {
+    /** Serialize a value as TOML would. This is a fragment and not a complete valid TOML document. */
+    function value(v: any): string;
+}
+
+export = stringify;
diff --git a/types/iarna__toml/tsconfig.json b/types/iarna__toml/tsconfig.json
new file mode 100644
index 0000000000..fe5c1cbf66
--- /dev/null
+++ b/types/iarna__toml/tsconfig.json
@@ -0,0 +1,35 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true,
+        "paths": {
+            "@iarna/toml": [
+                "iarna__toml"
+            ],
+            "@iarna/toml/*": [
+                "iarna__toml/*"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "parse-async.d.ts",
+        "parse-stream.d.ts",
+        "parse-string.d.ts",
+        "stringify.d.ts",
+        "iarna__toml-tests.ts"
+    ]
+}
diff --git a/types/iarna__toml/tslint.json b/types/iarna__toml/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/iarna__toml/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/icepick/index.d.ts b/types/icepick/index.d.ts
index bffe424d1b..fe7a3d0b36 100644
--- a/types/icepick/index.d.ts
+++ b/types/icepick/index.d.ts
@@ -8,13 +8,15 @@ export declare function freeze<T>(collection: T): T;
 export declare function thaw<T>(collection: T): T;
 export declare function assoc<T, V>(collection: T, key: number | string, value: V): T;
 export declare function dissoc<T>(collection: T, key: number | string): T;
+export declare function dissocIn<T>(collection: T, path: Array<number | string>): T;
 export declare function assocIn<T, V>(collection: T, path: Array<number | string>, value: V): T;
 export declare function getIn<T>(collection: T, path: Array<number | string>): any;
 export declare function updateIn<T, V>(collection: T, path: Array<number | string>, callback: (value: V) => V): T;
 
 export {assoc as set};
-export {dissoc as unset};
 export {assocIn as setIn};
+export {dissoc as unset};
+export {dissocIn as unsetIn};
 
 export declare function assign<T>(target: T): T;
 export declare function assign<T, S1>(target: T, source1: S1): (T & S1);
@@ -52,6 +54,9 @@ interface IcepickWrapper<T> {
 
     assocIn<V>(path: Array<number | string>, value: V): IcepickWrapper<T>;
     setIn<V>(path: Array<number | string>, value: V): IcepickWrapper<T>;
+    
+    dissocIn<V>(path: Array<number | string>): IcepickWrapper<T>;
+    unsetIn<V>(path: Array<number | string>): IcepickWrapper<T>;
 
     getIn(path: Array<number | string>): IcepickWrapper<any>;
     updateIn<V>(path: Array<number | string>, callback: (value: V) => V): IcepickWrapper<T>;
diff --git a/types/ignite-ui/index.d.ts b/types/ignite-ui/index.d.ts
index 1fa6cf1168..29d809964a 100644
--- a/types/ignite-ui/index.d.ts
+++ b/types/ignite-ui/index.d.ts
@@ -1044,6 +1044,7 @@ class TypeParser {
 	 * @param obj
 	 */
 	toDate(obj: Object): void;
+	toTime(obj: Object): void;
 	toNumber(obj: Object): void;
 	toBool(obj: Object): void;
 	isNullOrUndefined(obj: Object): void;
@@ -1063,8 +1064,12 @@ interface DataSchemaSchemaFields {
 	 * number
 	 * bool
 	 * date
+	 * time
 	 * object
 	 *
+	 *
+	 * Valid values:
+	 * "time"
 	 */
 	type?: string|number|boolean|Date|Object;
 
@@ -10903,6 +10908,13 @@ interface IgCategoryChart {
 	 */
 	tooltipTemplates?: any;
 
+	/**
+	 * Gets or sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	pixelScalingRatio?: number;
+
 	/**
 	 * Gets or sets the left margin of chart title
 	 */
@@ -11139,6 +11151,11 @@ interface IgCategoryChart {
 	 */
 	markerMaxCount?: number;
 
+	/**
+	 * Gets or sets whether the series animations should be allowed when a range change has been detected on an axis.
+	 */
+	animateSeriesWhenAxisRangeChanges?: boolean;
+
 	/**
 	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart.
 	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
@@ -11728,11 +11745,6 @@ interface IgCategoryChart {
 	 */
 	negativeOutlines?: any;
 
-	/**
-	 * Gets or sets whether the series animations should be allowed when a range change has been detected on an axis.
-	 */
-	animateSeriesWhenAxisRangeChanges?: boolean;
-
 	/**
 	 * Gets or sets whether the large numbers on the Y-axis labels are abbreviated.
 	 */
@@ -12020,6 +12032,22 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
 
+	/**
+	 * Gets  the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "pixelScalingRatio"): number;
+
+	/**
+	 * Sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
+
 	/**
 	 * Gets  the left margin of chart title
 	 */
@@ -12546,6 +12574,18 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "markerMaxCount", optionValue: number): void;
 
+	/**
+	 * Gets  whether the series animations should be allowed when a range change has been detected on an axis.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges"): boolean;
+
+	/**
+	 * Sets whether the series animations should be allowed when a range change has been detected on an axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igCategoryChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges", optionValue: boolean): void;
+
 	/**
 	 * Gets  the palette of brushes to used for coloring trend lines in this chart.
 	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
@@ -13706,18 +13746,6 @@ interface JQuery {
 	 */
 	igCategoryChart(optionLiteral: 'option', optionName: "negativeOutlines", optionValue: any): void;
 
-	/**
-	 * Gets  whether the series animations should be allowed when a range change has been detected on an axis.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges"): boolean;
-
-	/**
-	 * Sets whether the series animations should be allowed when a range change has been detected on an axis.
-	 *
-	 * @optionValue New value to be set.
-	 */
-	igCategoryChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges", optionValue: boolean): void;
-
 	/**
 	 * Gets  whether the large numbers on the Y-axis labels are abbreviated.
 	 */
@@ -39305,6 +39333,13 @@ interface IgFinancialChart {
 	 */
 	tooltipTemplates?: any;
 
+	/**
+	 * Gets or sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	pixelScalingRatio?: number;
+
 	/**
 	 * Gets or sets the left margin of chart title
 	 */
@@ -39541,6 +39576,11 @@ interface IgFinancialChart {
 	 */
 	markerMaxCount?: number;
 
+	/**
+	 * Gets or sets whether the series animations should be allowed when a range change has been detected on an axis.
+	 */
+	animateSeriesWhenAxisRangeChanges?: boolean;
+
 	/**
 	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart.
 	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
@@ -40093,6 +40133,7 @@ interface IgFinancialChart {
 	 *
 	 * Valid values:
 	 * "none" Do not display the zoom slider pane.
+	 * "auto"
 	 * "bar" Display financial bar series in the zoom slider pane.
 	 * "candle" Display candle series in the zoom slider pane.
 	 * "column" Display column series in the zoom slider pane.
@@ -40215,6 +40256,8 @@ interface IgFinancialChart {
 	 * When CustomIndicatorNames is set, the ApplyCustomIndicators event will be raised for each custom indicator name.
 	 */
 	customIndicatorNames?: any;
+	zoomSliderXAxisMajorStroke?: any;
+	zoomSliderXAxisMajorStrokeThickness?: number;
 
 	/**
 	 * The width of the chart.
@@ -40504,6 +40547,22 @@ interface JQuery {
 	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
 
+	/**
+	 * Gets  the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "pixelScalingRatio"): number;
+
+	/**
+	 * Sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
+
 	/**
 	 * Gets  the left margin of chart title
 	 */
@@ -41030,6 +41089,18 @@ interface JQuery {
 	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "markerMaxCount", optionValue: number): void;
 
+	/**
+	 * Gets  whether the series animations should be allowed when a range change has been detected on an axis.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges"): boolean;
+
+	/**
+	 * Sets whether the series animations should be allowed when a range change has been detected on an axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igFinancialChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges", optionValue: boolean): void;
+
 	/**
 	 * Gets  the palette of brushes to used for coloring trend lines in this chart.
 	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
@@ -42431,6 +42502,10 @@ interface JQuery {
 	 * @optionValue New value to be set.
 	 */
 	igFinancialChart(optionLiteral: 'option', optionName: "customIndicatorNames", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStroke"): any;
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStroke", optionValue: any): void;
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStrokeThickness"): number;
+	igFinancialChart(optionLiteral: 'option', optionName: "zoomSliderXAxisMajorStrokeThickness", optionValue: number): void;
 
 	/**
 	 * The width of the chart.
@@ -44382,6 +44457,22 @@ interface IgGridCellMerging {
 	 */
 	mergeStrategy?: string|Function;
 
+	/**
+	 * 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.
+	 */
+	rowMergeStrategy?: string|Function;
+
+	/**
+	 * Defines the whether the rows will be merged or not.
+	 *
+	 */
+	mergeRows?: any;
+
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
@@ -44452,6 +44543,8 @@ interface IgGridCellMergingMethods {
 	 * @param column The column index or column key to get the state for.
 	 */
 	isMerged(column: Object): boolean;
+	mergeRow(id: Object, fireEvents: Object): void;
+	unmergeRow(id: Object, index: Object): void;
 
 	/**
 	 * Changes the all locales contained into a specified container to the language specified in [options.language](ui.igwidget#options:language)
@@ -44472,6 +44565,8 @@ interface JQuery {
 	igGridCellMerging(methodName: "mergeColumn", column: Object, raiseEvents: boolean): string;
 	igGridCellMerging(methodName: "unmergeColumn", column: Object): string;
 	igGridCellMerging(methodName: "isMerged", column: Object): boolean;
+	igGridCellMerging(methodName: "mergeRow", id: Object, fireEvents: Object): void;
+	igGridCellMerging(methodName: "unmergeRow", id: Object, index: Object): void;
 	igGridCellMerging(methodName: "changeLocale", $container: Object): void;
 
 	/**
@@ -44522,6 +44617,36 @@ interface JQuery {
 
 	igGridCellMerging(optionLiteral: 'option', optionName: "mergeStrategy", optionValue: string|Function): void;
 
+	/**
+	 * Defines the rules merging is based on.
+	 *
+	 */
+
+	igGridCellMerging(optionLiteral: 'option', optionName: "rowMergeStrategy"): string|Function;
+
+	/**
+	 * Defines the rules merging is based on.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+
+	igGridCellMerging(optionLiteral: 'option', optionName: "rowMergeStrategy", optionValue: string|Function): void;
+
+	/**
+	 * Defines the whether the rows will be merged or not.
+	 *
+	 */
+	igGridCellMerging(optionLiteral: 'option', optionName: "mergeRows"): any;
+
+	/**
+	 * Defines the whether the rows will be merged or not.
+	 *
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igGridCellMerging(optionLiteral: 'option', optionName: "mergeRows", optionValue: any): void;
+
 	/**
 	 * A list of column settings that specifies hiding options on a per column basis.
 	 *
@@ -65610,6 +65735,11 @@ interface EditRowStartingEvent {
 }
 
 interface EditRowStartingEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65626,6 +65756,11 @@ interface EditRowStartedEvent {
 }
 
 interface EditRowStartedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65642,6 +65777,11 @@ interface EditRowEndingEvent {
 }
 
 interface EditRowEndingEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Check if any of the values is changed which will cause update in the data source. Can be manually set to false to prevent this update.
 	 */
@@ -65668,6 +65808,11 @@ interface EditRowEndedEvent {
 }
 
 interface EditRowEndedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65699,6 +65844,11 @@ interface EditCellStartingEvent {
 }
 
 interface EditCellStartingEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65717,7 +65867,7 @@ interface EditCellStartingEventUIParam {
 	/**
 	 * Gets a reference to the editor used for editing the column.
 	 */
-	editor?: string;
+	editor?: any;
 
 	/**
 	 * Gets or set the value of the editor.
@@ -65735,6 +65885,11 @@ interface EditCellStartedEvent {
 }
 
 interface EditCellStartedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65753,7 +65908,7 @@ interface EditCellStartedEventUIParam {
 	/**
 	 * Gets a reference to the editor used for editing the column.
 	 */
-	editor?: string;
+	editor?: any;
 
 	/**
 	 * Gets or set the value of the editor.
@@ -65771,6 +65926,11 @@ interface EditCellEndingEvent {
 }
 
 interface EditCellEndingEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65789,7 +65949,7 @@ interface EditCellEndingEventUIParam {
 	/**
 	 * Gets a reference to the editor used for editing the column.
 	 */
-	editor?: string;
+	editor?: any;
 
 	/**
 	 * Gets or set the value of the editor.
@@ -65817,6 +65977,11 @@ interface EditCellEndedEvent {
 }
 
 interface EditCellEndedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the row's PK value.
 	 */
@@ -65835,7 +66000,7 @@ interface EditCellEndedEventUIParam {
 	/**
 	 * Gets a reference to the editor used for editing the column.
 	 */
-	editor?: string;
+	editor?: any;
 
 	/**
 	 * Gets the new value.
@@ -65863,6 +66028,11 @@ interface RowAddingEvent {
 }
 
 interface RowAddingEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the value for the column with the specified key.
 	 */
@@ -65879,6 +66049,11 @@ interface RowAddedEvent {
 }
 
 interface RowAddedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the value for the column with the specified key.
 	 */
@@ -65895,10 +66070,15 @@ interface RowDeletingEvent {
 }
 
 interface RowDeletingEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a jQuery object containing the TR element of the row to delete.
 	 */
-	element?: string;
+	element?: any;
 
 	/**
 	 * Gets the row's PK value.
@@ -65911,10 +66091,15 @@ interface RowDeletedEvent {
 }
 
 interface RowDeletedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a jQuery object containing the TR element of the deleted row.
 	 */
-	element?: string;
+	element?: any;
 
 	/**
 	 * Gets the row's PK value.
@@ -65926,13 +66111,23 @@ interface DataDirtyEvent {
 	(event: Event, ui: DataDirtyEventUIParam): void;
 }
 
-interface DataDirtyEventUIParam {}
+interface DataDirtyEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+}
 
 interface GeneratePrimaryKeyValueEvent {
 	(event: Event, ui: GeneratePrimaryKeyValueEventUIParam): void;
 }
 
 interface GeneratePrimaryKeyValueEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets the auto-generated primary key (the number of records in the data source + 1) or set a custom unique primary key for the new row.
 	 */
@@ -65944,10 +66139,15 @@ interface RowEditDialogBeforeOpenEvent {
 }
 
 interface RowEditDialogBeforeOpenEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a reference to row edit dialog DOM element.
 	 */
-	dialogElement?: string;
+	dialogElement?: any;
 }
 
 interface RowEditDialogAfterOpenEvent {
@@ -65955,10 +66155,15 @@ interface RowEditDialogAfterOpenEvent {
 }
 
 interface RowEditDialogAfterOpenEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a reference to row edit dialog DOM element.
 	 */
-	dialogElement?: string;
+	dialogElement?: any;
 }
 
 interface RowEditDialogBeforeCloseEvent {
@@ -65966,10 +66171,15 @@ interface RowEditDialogBeforeCloseEvent {
 }
 
 interface RowEditDialogBeforeCloseEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a reference to row edit dialog DOM element.
 	 */
-	dialogElement?: string;
+	dialogElement?: any;
 }
 
 interface RowEditDialogAfterCloseEvent {
@@ -65977,10 +66187,15 @@ interface RowEditDialogAfterCloseEvent {
 }
 
 interface RowEditDialogAfterCloseEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a reference to row edit dialog DOM element.
 	 */
-	dialogElement?: string;
+	dialogElement?: any;
 }
 
 interface RowEditDialogContentsRenderedEvent {
@@ -65988,10 +66203,15 @@ interface RowEditDialogContentsRenderedEvent {
 }
 
 interface RowEditDialogContentsRenderedEventUIParam {
+	/**
+	 * Gets a reference to GridUpdating.
+	 */
+	owner?: any;
+
 	/**
 	 * Gets a reference to row edit dialog DOM element.
 	 */
-	dialogElement?: string;
+	dialogElement?: any;
 }
 
 interface IgGridUpdating {
@@ -84620,6 +84840,13 @@ interface IgShapeChart {
 	 */
 	tooltipTemplates?: any;
 
+	/**
+	 * Gets or sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	pixelScalingRatio?: number;
+
 	/**
 	 * Gets or sets the left margin of chart title
 	 */
@@ -84856,6 +85083,11 @@ interface IgShapeChart {
 	 */
 	markerMaxCount?: number;
 
+	/**
+	 * Gets or sets whether the series animations should be allowed when a range change has been detected on an axis.
+	 */
+	animateSeriesWhenAxisRangeChanges?: boolean;
+
 	/**
 	 * Gets or sets the palette of brushes to used for coloring trend lines in this chart.
 	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
@@ -85719,6 +85951,22 @@ interface JQuery {
 	 */
 	igShapeChart(optionLiteral: 'option', optionName: "tooltipTemplates", optionValue: any): void;
 
+	/**
+	 * Gets  the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "pixelScalingRatio"): number;
+
+	/**
+	 * Sets the scaling value used to affect the pixel density of the control.
+	 * A higher scaling ratio will produce crisper visuals at the expense of memory.  Lower values will cause the control
+	 * to appear blurry.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "pixelScalingRatio", optionValue: number): void;
+
 	/**
 	 * Gets  the left margin of chart title
 	 */
@@ -86245,6 +86493,18 @@ interface JQuery {
 	 */
 	igShapeChart(optionLiteral: 'option', optionName: "markerMaxCount", optionValue: number): void;
 
+	/**
+	 * Gets  whether the series animations should be allowed when a range change has been detected on an axis.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges"): boolean;
+
+	/**
+	 * Sets whether the series animations should be allowed when a range change has been detected on an axis.
+	 *
+	 * @optionValue New value to be set.
+	 */
+	igShapeChart(optionLiteral: 'option', optionName: "animateSeriesWhenAxisRangeChanges", optionValue: boolean): void;
+
 	/**
 	 * Gets  the palette of brushes to used for coloring trend lines in this chart.
 	 * The value provided should be an array of CSS color strings or JavaScript objects defining gradients. Optionally the first element can be a string reading "RGB" or "HSV" to specify the interpolation mode of the collection
@@ -99597,7 +99857,7 @@ interface IgTreeGrid {
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 */
-	avgRowHeight?: any;
+	avgRowHeight?: number;
 
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
@@ -100879,14 +101139,14 @@ interface JQuery {
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 */
-	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight"): any;
+	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight"): number;
 
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
 	 *
 	 * @optionValue New value to be set.
 	 */
-	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight", optionValue: any): void;
+	igTreeGrid(optionLiteral: 'option', optionName: "avgRowHeight", optionValue: number): void;
 
 	/**
 	 * This option is inherited from a parent widget and it's not applicable for the igTreeGrid.
diff --git a/types/iltorb/iltorb-tests.ts b/types/iltorb/iltorb-tests.ts
index 66bda251d4..202b9ebbd0 100644
--- a/types/iltorb/iltorb-tests.ts
+++ b/types/iltorb/iltorb-tests.ts
@@ -20,6 +20,14 @@ br.compress(Buffer.from('foo', 'utf8'), onCompress);
 
 br.compress(Buffer.from('foo', 'utf8'), opts, onCompress);
 
+br
+    .compress(Buffer.from('foobar'))
+    .then(compressedData => {
+        br.decompress(compressedData).then(data => {
+            console.log(data.equals(Buffer.from('foobar')));
+        });
+    });
+
 const stream = br.compressStream();
 stream.flush();
 
diff --git a/types/iltorb/index.d.ts b/types/iltorb/index.d.ts
index 5ac707a51b..a1cf04844c 100644
--- a/types/iltorb/index.d.ts
+++ b/types/iltorb/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for iltorb 2.0
+// Type definitions for iltorb 2.3
 // Project: https://github.com/MayhemYDG/iltorb
 // Definitions by: Arturas Molcanovas <https://github.com/Alorel>
+//                 Francis Gulotta <https://github.com/reconbot>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -25,8 +26,10 @@ export type IltorbCallback = (err: Error | null | undefined, output: Buffer) =>
 
 export function compress(buffer: Buffer, options: BrotliEncodeParams, callback: IltorbCallback): void;
 export function compress(buffer: Buffer, callback: IltorbCallback): void;
+export function compress(buffer: Buffer, options?: BrotliEncodeParams): Promise<Buffer>;
 
 export function decompress(buffer: Buffer, callback: IltorbCallback): void;
+export function decompress(buffer: Buffer): Promise<Buffer>;
 
 export function compressSync(buffer: Buffer, options?: BrotliEncodeParams): Buffer;
 export function decompressSync(buffer: Buffer): Buffer;
diff --git a/types/imagemin-gifsicle/imagemin-gifsicle-tests.ts b/types/imagemin-gifsicle/imagemin-gifsicle-tests.ts
new file mode 100644
index 0000000000..0156322cd7
--- /dev/null
+++ b/types/imagemin-gifsicle/imagemin-gifsicle-tests.ts
@@ -0,0 +1,9 @@
+import imagemin = require('imagemin');
+import imageminGifsicle = require('imagemin-gifsicle');
+
+imagemin(['*.gif'], {
+    plugins: [
+        imageminGifsicle(),
+        imageminGifsicle({ colors: 255 })
+    ]
+});
diff --git a/types/imagemin-gifsicle/index.d.ts b/types/imagemin-gifsicle/index.d.ts
new file mode 100644
index 0000000000..80bc128286
--- /dev/null
+++ b/types/imagemin-gifsicle/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for imagemin-gifsicle 5.2
+// Project: https://github.com/imagemin/imagemin-gifsicle#readme
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'imagemin';
+
+declare function imageminGifsicle(options?: imageminGifsicle.Options): Plugin;
+
+declare namespace imageminGifsicle {
+    interface Options {
+        colors?: number;
+        interlaced?: boolean;
+        optimizationLevel?: number;
+    }
+}
+
+export = imageminGifsicle;
diff --git a/types/imagemin-gifsicle/tsconfig.json b/types/imagemin-gifsicle/tsconfig.json
new file mode 100644
index 0000000000..8efb698e59
--- /dev/null
+++ b/types/imagemin-gifsicle/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",
+        "imagemin-gifsicle-tests.ts"
+    ]
+}
diff --git a/types/imagemin-gifsicle/tslint.json b/types/imagemin-gifsicle/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/imagemin-gifsicle/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/imagemin-jpegtran/imagemin-jpegtran-tests.ts b/types/imagemin-jpegtran/imagemin-jpegtran-tests.ts
new file mode 100644
index 0000000000..82a8ea927f
--- /dev/null
+++ b/types/imagemin-jpegtran/imagemin-jpegtran-tests.ts
@@ -0,0 +1,9 @@
+import imagemin = require('imagemin');
+import imageminJpegtran = require('imagemin-jpegtran');
+
+imagemin(['*.jpg'], {
+    plugins: [
+        imageminJpegtran(),
+        imageminJpegtran({ progressive: true })
+    ]
+});
diff --git a/types/imagemin-jpegtran/index.d.ts b/types/imagemin-jpegtran/index.d.ts
new file mode 100644
index 0000000000..2ec98c3c17
--- /dev/null
+++ b/types/imagemin-jpegtran/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for imagemin-jpegtran 5.0
+// Project: https://github.com/imagemin/imagemin-jpegtran#readme
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'imagemin';
+
+declare function imageminJpegtran(options?: imageminJpegtran.Options): Plugin;
+
+declare namespace imageminJpegtran {
+    interface Options {
+        arithmetic?: boolean;
+        progressive?: boolean;
+    }
+}
+
+export = imageminJpegtran;
diff --git a/types/imagemin-jpegtran/tsconfig.json b/types/imagemin-jpegtran/tsconfig.json
new file mode 100644
index 0000000000..e26dc49c0e
--- /dev/null
+++ b/types/imagemin-jpegtran/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",
+        "imagemin-jpegtran-tests.ts"
+    ]
+}
diff --git a/types/imagemin-jpegtran/tslint.json b/types/imagemin-jpegtran/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/imagemin-jpegtran/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/imagemin-optipng/imagemin-optipng-tests.ts b/types/imagemin-optipng/imagemin-optipng-tests.ts
new file mode 100644
index 0000000000..ce0eb272ee
--- /dev/null
+++ b/types/imagemin-optipng/imagemin-optipng-tests.ts
@@ -0,0 +1,9 @@
+import imagemin = require('imagemin');
+import imageminOptipng = require('imagemin-optipng');
+
+imagemin(['*.png'], {
+    plugins: [
+        imageminOptipng(),
+        imageminOptipng({ optimizationLevel: 2 })
+    ]
+});
diff --git a/types/imagemin-optipng/index.d.ts b/types/imagemin-optipng/index.d.ts
new file mode 100644
index 0000000000..9ab9506205
--- /dev/null
+++ b/types/imagemin-optipng/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for imagemin-optipng 5.2
+// Project: https://github.com/imagemin/imagemin-optipng#readme
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { Plugin } from 'imagemin';
+
+declare function imageminOptipng(options?: imageminOptipng.Options): Plugin;
+
+declare namespace imageminOptipng {
+    interface Options {
+        bitDepthReduction?: boolean;
+        colorTypeReduction?: boolean;
+        optimizationLevel?: number;
+        paletteReduction?: boolean;
+    }
+}
+
+export = imageminOptipng;
diff --git a/types/imagemin-optipng/tsconfig.json b/types/imagemin-optipng/tsconfig.json
new file mode 100644
index 0000000000..586e747281
--- /dev/null
+++ b/types/imagemin-optipng/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",
+        "imagemin-optipng-tests.ts"
+    ]
+}
diff --git a/types/imagemin-optipng/tslint.json b/types/imagemin-optipng/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/imagemin-optipng/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/imagemin-svgo/imagemin-svgo-tests.ts b/types/imagemin-svgo/imagemin-svgo-tests.ts
new file mode 100644
index 0000000000..23895afcd6
--- /dev/null
+++ b/types/imagemin-svgo/imagemin-svgo-tests.ts
@@ -0,0 +1,9 @@
+import imagemin = require('imagemin');
+import imageminSvgo = require('imagemin-svgo');
+
+imagemin(['*.svg'], {
+    plugins: [
+        imageminSvgo(),
+        imageminSvgo({ floatPrecision: 2 })
+    ]
+});
diff --git a/types/imagemin-svgo/index.d.ts b/types/imagemin-svgo/index.d.ts
new file mode 100644
index 0000000000..24d3b73ca9
--- /dev/null
+++ b/types/imagemin-svgo/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for imagemin-svgo 7.0
+// Project: https://github.com/imagemin/imagemin-svgo#readme
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Plugin } from 'imagemin';
+import { Options as SvgoOptions } from 'svgo';
+
+declare function imageminSvgo(options?: imageminSvgo.Options): Plugin;
+
+declare namespace imageminSvgo {
+    type Options = SvgoOptions;
+}
+
+export = imageminSvgo;
diff --git a/types/imagemin-svgo/tsconfig.json b/types/imagemin-svgo/tsconfig.json
new file mode 100644
index 0000000000..6b4f221e13
--- /dev/null
+++ b/types/imagemin-svgo/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",
+        "imagemin-svgo-tests.ts"
+    ]
+}
diff --git a/types/imagemin-svgo/tslint.json b/types/imagemin-svgo/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/imagemin-svgo/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/imagemin/imagemin-tests.ts b/types/imagemin/imagemin-tests.ts
new file mode 100644
index 0000000000..88a91980d6
--- /dev/null
+++ b/types/imagemin/imagemin-tests.ts
@@ -0,0 +1,9 @@
+import imagemin = require('imagemin');
+
+imagemin(['*.png']).then((results: imagemin.Result[]) => { /* ... */ });
+imagemin(['*.png'], 'dist').then((results: imagemin.Result[]) => { /* ... */ });
+imagemin(['*.png'], { plugins: [] }).then((results: imagemin.Result[]) => { /* ... */ });
+imagemin(['*.png'], 'dist', { plugins: [] }).then((results: imagemin.Result[]) => { /* ... */ });
+
+imagemin.buffer(Buffer.from([/* ... */])).then((result: Buffer) => { /* ... */ });
+imagemin.buffer(Buffer.from([/* ... */]), { plugins: [] }).then((result: Buffer) => { /* ... */ });
diff --git a/types/imagemin/index.d.ts b/types/imagemin/index.d.ts
new file mode 100644
index 0000000000..c848818f31
--- /dev/null
+++ b/types/imagemin/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for imagemin 6.0
+// Project: https://github.com/imagemin/imagemin#readme
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function imagemin(input: ReadonlyArray<string>, outputOrOptions?: string | imagemin.Options): Promise<imagemin.Result[]>;
+declare function imagemin(input: ReadonlyArray<string>, output?: string, options?: imagemin.Options): Promise<imagemin.Result[]>;
+
+declare namespace imagemin {
+    type Plugin = (input: Buffer) => Promise<Buffer>;
+
+    interface Options {
+        plugins: ReadonlyArray<Plugin>;
+    }
+
+    interface Result {
+        data: Buffer;
+        path: string;
+    }
+
+    function buffer(buffer: Buffer, options?: Options): Promise<Buffer>;
+}
+
+export = imagemin;
diff --git a/types/imagemin/tsconfig.json b/types/imagemin/tsconfig.json
new file mode 100644
index 0000000000..849754b4d0
--- /dev/null
+++ b/types/imagemin/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",
+        "imagemin-tests.ts"
+    ]
+}
diff --git a/types/imagemin/tslint.json b/types/imagemin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/imagemin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/inboxsdk/inboxsdk-tests.ts b/types/inboxsdk/inboxsdk-tests.ts
new file mode 100644
index 0000000000..4f51bae92c
--- /dev/null
+++ b/types/inboxsdk/inboxsdk-tests.ts
@@ -0,0 +1,815 @@
+import ComposeView = InboxSDK.Compose.ComposeView;
+import Contact = InboxSDK.Common.Contact;
+import ThreadRowView = InboxSDK.Lists.ThreadRowView;
+import ThreadView = InboxSDK.Conversations.ThreadView;
+import SimpleElementView = InboxSDK.Common.SimpleElementView;
+import ContentPanelView = InboxSDK.Conversations.ContentPanelView;
+import MessageView = InboxSDK.Conversations.MessageView;
+import AttachmentCardView = InboxSDK.Conversations.AttachmentCardView;
+import AttachmentCardClickEvent = InboxSDK.Conversations.AttachmentCardClickEvent;
+import MessageViewLinkDescriptor = InboxSDK.Conversations.MessageViewLinkDescriptor;
+import SectionDescriptor = InboxSDK.Router.SectionDescriptor;
+import NavItemDescriptor = InboxSDK.NavMenu.NavItemDescriptor;
+
+InboxSDK.load(1, '1234').then((_sdk: InboxSDK.InboxSDKInstance) => {
+  _sdk.ButterBar.hideGmailMessage();
+});
+
+InboxSDK.load(1, '1234', {}).then(() => console.log('done'));
+InboxSDK.load(1, '1234', {
+  appIconUrl: 'url',
+  appName: 'name',
+  suppressAddonTitle: 'su'
+}).then(() => console.log('done'));
+
+InboxSDK.loadScript('https://google.com').then(() => console.log('done'));
+InboxSDK.loadScript('https://google.com', {}).then(() => console.log('done'));
+InboxSDK.loadScript('https://google.com', {nowrap: true}).then(() => console.log('done'));
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  sdk.ButterBar.showMessage({
+    text: 'text',
+  });
+
+  sdk.ButterBar.showMessage({
+    text: 'text',
+    className: 'c',
+    hideOnViewChanged: true,
+    persistent: true,
+    priority: 1,
+    time: 1,
+    messageKey: '1'
+  });
+
+  const el: HTMLElement = new HTMLElement();
+
+  sdk.ButterBar.showMessage({
+    el,
+  });
+
+  sdk.ButterBar.showMessage({
+    el,
+    className: 'c',
+    hideOnViewChanged: true,
+    persistent: true,
+    priority: 1,
+    time: 1,
+    messageKey: '1'
+  });
+
+  sdk.ButterBar.showMessage({
+    html: '<p></p>',
+  });
+
+  sdk.ButterBar.showMessage({
+    html: '<p></p>',
+    className: 'c',
+    hideOnViewChanged: true,
+    persistent: true,
+    priority: 1,
+    time: 1,
+    messageKey: '1'
+  });
+
+  sdk.ButterBar.showLoading();
+
+  sdk.ButterBar.showError({
+    text: 'error'
+  });
+
+  sdk.ButterBar.showSaving({
+    text: 'saving'
+  });
+
+  sdk.ButterBar.hideMessage('key');
+  sdk.ButterBar.hideGmailMessage();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Compose.registerComposeViewHandler((composeView: ComposeView) => {
+    composeView.addButton({
+      title: 'button title',
+      onClick: e => {
+        const eq = e.composeView === composeView;
+        const dropdownDestroyed = e.dropdown.destroyed;
+
+        e.dropdown.close();
+
+        const el: HTMLElement = e.dropdown.el;
+
+        e.dropdown.setPlacementOptions({});
+        e.dropdown.setPlacementOptions({
+          bottomBuffer: 1,
+          buffer: 1,
+          forceHAlign: true,
+          forcePosition: true,
+          forceVAlign: true,
+          hAlign: 'center',
+          position: 'middle',
+          rightBuffer: 1,
+          topBuffer: 1,
+          vAlign: 'top',
+          leftBuffer: 1
+        });
+      }
+    });
+
+    const statusBarView = composeView.addStatusBar({});
+    statusBarView.setHeight(1);
+
+    composeView.addStatusBar({
+      height: 1,
+      orderHint: 1
+    });
+
+    composeView.close();
+
+    composeView.send();
+    composeView.send({sendAndArchive: true});
+
+    const element: HTMLElement = composeView.getBodyElement();
+    const msgId: string = composeView.getInitialMessageID();
+    const threadId: string = composeView.getThreadID();
+    composeView.getDraftID().then(draftId => {
+      const id: string = draftId.toLowerCase();
+    });
+    composeView.getCurrentDraftID().then(draftId => {
+      if (draftId) {
+        const id: string = draftId.toLowerCase();
+      }
+    });
+
+    const html: string = composeView.getHTMLContent();
+    const bodyHtml: string = composeView.getSelectedBodyHTML();
+    const bodyText: string = composeView.getSelectedBodyText();
+    const subject: string = composeView.getSubject();
+    const textContent: string = composeView.getTextContent();
+    const contacts: Contact[] = composeView.getToRecipients();
+    const contactsCC: Contact[] = composeView.getCcRecipients();
+    const contactsBCC: Contact[] = composeView.getBccRecipients();
+
+    composeView.insertTextIntoBodyAtCursor('text');
+    const el1: HTMLElement = composeView.insertHTMLIntoBodyAtCursor(new HTMLElement());
+    const el2: HTMLElement = composeView.insertHTMLIntoBodyAtCursor('html');
+
+    const el3: HTMLElement = composeView.insertLinkChipIntoBodyAtCursor('text', 'http://url.com', 'http://url.com/favicon.ico');
+    const el4: HTMLElement = composeView.insertLinkIntoBodyAtCursor('text', 'http://url.com');
+
+    const inline: boolean = composeView.isInlineReplyForm();
+    const fullScreen: boolean = composeView.isFullscreen();
+    const minimized: boolean = composeView.isMinimized();
+    composeView.setFullscreen(true);
+    composeView.setMinimized(true);
+    composeView.popOut().then(view => view === composeView);
+
+    const removeColor = composeView.setTitleBarColor('red');
+    removeColor();
+
+    const isReply: boolean = composeView.isReply();
+
+    composeView.setToRecipients(['a@a.com', 'b@b.com']);
+    composeView.setCcRecipients(['a@a.com', 'b@b.com']);
+    composeView.setBccRecipients(['a@a.com', 'b@b.com']);
+
+    const fromContact: InboxSDK.Common.Contact = composeView.getFromContact();
+    const fromContacts: InboxSDK.Common.Contact[] = composeView.getFromContactChoices();
+
+    composeView.setFromEmail('a@a.com');
+    composeView.setSubject('subject');
+    composeView.setBodyHTML('<p></p>');
+    composeView.setBodyText('text');
+    composeView.attachFiles([new Blob()]).then(() => console.log());
+    composeView.attachInlineFiles([new Blob()]).then(() => console.log());
+
+    composeView.on('destroy', event => {
+      const msgId: string = event.messageID;
+      const byInbox: boolean = event.closedByInboxSDK;
+    });
+
+    composeView.on('fullscreenChanged', event => {
+      const fs: boolean = event.fullscreen;
+    });
+
+    composeView.on('fromContactChanged', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('toContactAdded', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('toContactRemoved', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('ccContactAdded', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('ccContactRemoved', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('bccContactAdded', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('bccContactRemoved', event => {
+      const c: InboxSDK.Common.Contact = event.contact;
+    });
+
+    composeView.on('recipientsChanged', event => {
+      let c: InboxSDK.Common.Contact;
+      c = event.to.added[0];
+      c = event.to.removed[0];
+      c = event.cc.added[0];
+      c = event.cc.removed[0];
+      c = event.bcc.added[0];
+      c = event.bcc.removed[0];
+    });
+
+    composeView.on('presending', event => {
+      event.cancel();
+    });
+
+    composeView.on('sent', event => {
+      event.getMessageID().then(msgId => msgId.toLowerCase());
+      event.getThreadID().then(threadId => threadId.toLowerCase());
+    });
+
+    composeView.on('discard', () => {
+      console.log();
+    });
+    composeView.on('sendCanceled', () => {
+      console.log();
+    });
+    composeView.on('sending', () => {
+      console.log();
+    });
+    composeView.on('bodyChanged', () => {
+      console.log();
+    });
+    composeView.on('minimized', () => {
+      console.log();
+    });
+    composeView.on('restored', () => {
+      console.log();
+    });
+
+    const destroyed: boolean = composeView.destroyed;
+  });
+
+  unregister();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Lists.registerThreadRowViewHandler((threadRowView: ThreadRowView) => {
+    threadRowView.addLabel({
+      title: 'title',
+      iconUrl: 'http://url.com'
+    });
+
+    threadRowView.addLabel({
+      title: 'title',
+      iconUrl: 'http://url.com',
+      backgroundColor: 'red',
+      foregroundColor: 'blue',
+      iconBackgroundColor: 'yellow',
+      iconClass: 'big'
+    });
+
+    threadRowView.addImage({
+      imageUrl: 'http://url.com'
+    });
+
+    threadRowView.addImage({
+      imageUrl: 'http://url.com',
+      imageClass: 'big',
+      tooltip: 'tooltip',
+      orderHint: 1
+    });
+
+    threadRowView.addButton({
+      title: 'title',
+      iconUrl: 'http://url.com',
+      onClick: event => {
+        const eq = event.threadRowView === threadRowView;
+        if (event.dropdown) {
+          event.dropdown.close();
+        }
+      },
+      hasDropdown: true
+    });
+
+    threadRowView.addButton({
+      title: 'title',
+      iconUrl: 'http://url.com',
+      onClick: event => {
+      },
+      hasDropdown: false,
+      iconClass: 'big'
+    });
+
+    threadRowView.addActionButton({
+      type: 'LINK',
+      title: 'title',
+      className: 'big',
+      url: 'http://url.com',
+      onClick: () => {
+      }
+    });
+
+    threadRowView.addAttachmentIcon({});
+    threadRowView.addAttachmentIcon({
+      tooltip: 'tooltip',
+      iconClass: 'big',
+      iconUrl: 'http://url.com'
+    });
+
+    threadRowView.replaceDate({
+      text: '1/1/2000'
+    });
+    threadRowView.replaceDate({
+      text: '1/1/2000',
+      textColor: 'red',
+      tooltip: 'tooltip'
+    });
+
+    threadRowView.replaceDraftLabel({
+      text: 'my draft'
+    });
+    threadRowView.replaceDraftLabel({
+      text: 'my draft',
+      count: '2'
+    });
+
+    const subject: string = threadRowView.getSubject();
+    const date: string = threadRowView.getDateString();
+    threadRowView.getThreadIDAsync().then(threadId => threadId.toLowerCase());
+    threadRowView.getThreadIDIfStableAsync().then(threadId => {
+      if (threadId) {
+        threadId.toLowerCase();
+      }
+    });
+    threadRowView.getDraftID().then(draftId => draftId.toLowerCase());
+
+    const count1: number = threadRowView.getVisibleDraftCount();
+    const count2: number = threadRowView.getVisibleMessageCount();
+
+    const contacts: InboxSDK.Common.Contact[] = threadRowView.getContacts();
+
+    threadRowView.on('destroy', () => console.log());
+
+    const destroyed: boolean = threadRowView.destroyed;
+  });
+
+  unregister();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Conversations.registerThreadViewHandler((threadView: ThreadView) => {
+    const noticeBar: SimpleElementView = threadView.addNoticeBar();
+    noticeBar.destroy();
+
+    const contentPanel: ContentPanelView = threadView.addSidebarContentPanel({
+      el: new HTMLElement(),
+      title: 'title',
+      iconUrl: 'http://url.com',
+    });
+
+    contentPanel.remove();
+    const destroyed: boolean = contentPanel.destroyed;
+    contentPanel.on('destroy', () => console.log());
+    contentPanel.on('deactivate', () => console.log());
+    contentPanel.on('activate', () => console.log());
+
+    threadView.addSidebarContentPanel({
+      el: new HTMLElement(),
+      title: 'title',
+      iconUrl: 'http://url.com',
+      appIconUrl: 'http://url.com',
+      appName: 'app name',
+      id: '1',
+      orderHint: 1,
+      hideTitleBar: true
+    });
+
+    const messageViews: MessageView[] = threadView.getMessageViews();
+    const allMessageViews: MessageView[] = threadView.getMessageViewsAll();
+    const subject: string = threadView.getSubject();
+    threadView.getThreadIDAsync().then(threadId => threadId.toLowerCase());
+
+    threadView.on('contactHover', event => {
+      const contact: Contact = event.contact;
+      const eq1 = event.messageView === messageViews[0];
+      const eq2 = event.threadView === threadView;
+      const isSender: boolean = event.contactType === 'sender';
+    });
+
+    threadView.on('destroy', () => console.log());
+  });
+
+  unregister();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Conversations.registerMessageViewHandler((messageView: MessageView) => {
+    const attachmentCardView: AttachmentCardView = messageView.addAttachmentCardView({
+      title: 'title',
+      description: 'desc',
+      previewUrl: 'http://url.com',
+      previewThumbnailUrl: 'http://url.com',
+      failoverPreviewIconUrl: 'http://url.com',
+      previewOnClick: event => {
+        const eq = event.attachmentCardView === attachmentCardView;
+        event.preventDefault();
+      },
+      fileIconImageUrl: 'http://url.com',
+      buttons: [
+        {
+          downloadUrl: 'http://url.com',
+          downloadFilename: 'file.txt',
+          openInNewTab: true,
+          onClick: () => {
+          }
+        },
+        {
+          iconUrl: 'http://url.com',
+          tooltip: 'tooltip',
+          onClick: (event: AttachmentCardClickEvent) => event.getDownloadURL().then(url => url.toLowerCase())
+        }
+      ],
+      foldColor: 'red',
+      mimeType: 'text'
+    });
+
+    const attachmentType: string = attachmentCardView.getAttachmentType();
+    const title: string = attachmentCardView.getTitle();
+    const msgView: MessageView | null = attachmentCardView.getMessageView();
+    attachmentCardView.addButton({
+      iconUrl: 'http://url.com',
+      tooltip: 'tooltip',
+      onClick: (event: AttachmentCardClickEvent) => event.getDownloadURL().then(url => url.toLowerCase())
+    });
+
+    attachmentCardView.on('destroy', () => console.log());
+    const destroyed: boolean = attachmentCardView.destroyed;
+
+    messageView.addAttachmentsToolbarButton({
+      iconUrl: 'http://url.com',
+      tooltip: 'tooltip',
+      onClick: event => {
+        const attType: string = event.attachmentCardViews[0].getAttachmentType();
+      }
+    });
+
+    messageView.addToolbarButton({
+      section: 'MORE',
+      title: 'title',
+      iconUrl: 'http://url.com',
+      iconClass: 'big',
+      onClick: () => {
+      },
+      orderHint: 1
+    });
+
+    const el: HTMLElement = messageView.getBodyElement();
+    messageView.getMessageIDAsync().then(msgId => msgId.toLowerCase());
+    const attCardViews: AttachmentCardView[] = messageView.getFileAttachmentCardViews();
+    const isQuotedArea = messageView.isElementInQuotedArea();
+    const isLoaded = messageView.isLoaded();
+    const links: MessageViewLinkDescriptor[] = messageView.getLinksInBody();
+    links[0].text.toLowerCase();
+    links[0].element.click();
+    links[0].html.toLowerCase();
+    const isInQuotedArea: boolean = links[0].isInQuotedArea;
+    links[0].href.toLowerCase();
+
+    const contact: Contact = messageView.getSender();
+    const add: string[] = messageView.getRecipientEmailAddresses();
+    messageView.getRecipientsFull().then(contacts => {
+      const c: Contact = contacts[0];
+    });
+
+    const threadView: ThreadView = messageView.getThreadView();
+    const date: string = messageView.getDateString();
+    messageView.addAttachmentIcon({
+      iconUrl: 'http://url.com',
+      iconClass: 'big',
+      onClick: () => {
+      },
+      tooltip: 'tooltip'
+    });
+
+    const eq = messageView.getViewState() === 'HIDDEN';
+
+    messageView.on('viewStateChange', event => {
+      const eq1 = event.newViewState === 'COLLAPSED';
+      const eq2 = event.oldViewState === 'EXPANDED';
+      const eq3 = event.messageView === messageView;
+    });
+
+    messageView.on('contactHover', event => {
+      event.contact.name.toLowerCase();
+    });
+
+    messageView.on('load', () => console.log());
+    messageView.on('destroy', () => console.log());
+
+    const destroyed1: boolean = messageView.destroyed;
+  });
+
+  unregister();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Conversations.registerMessageViewHandlerAll((messageView: MessageView) => {
+    const isLoaded: boolean = messageView.isLoaded();
+  });
+
+  unregister();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Conversations.registerFileAttachmentCardViewHandler((attachmentCardView: AttachmentCardView) => {
+    const messageView: MessageView | null = attachmentCardView.getMessageView();
+  });
+
+  unregister();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const unregister = sdk.Toolbars.registerThreadButton({
+    hasDropdown: true,
+    hideFor: (routeView => routeView.getParams()),
+    iconClass: 'big',
+    iconUrl: 'http://url.com',
+    keyboardShortcutHandle: {
+      remove: () => {
+      }
+    },
+    listSection: 'INBOX_STATE',
+    onClick: event => event.position === 'LIST',
+    orderHint: 1,
+    positions: ['LIST', 'ROW'],
+    threadSection: 'METADATA_STATE',
+    title: 'title'
+  });
+
+  unregister();
+
+  sdk.Toolbars.addToolbarButtonForApp({
+    iconClass: 'big',
+    arrowColor: 'red',
+    iconUrl: 'http://url.com',
+    onClick: event => event.dropdown.close(),
+    title: 'title',
+    titleClass: 'big'
+  });
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  sdk.Router.createLink('1234', {p1: 1, 0: 1}).toLowerCase();
+  sdk.Router.goto('1234', {p1: 1, 0: 1});
+
+  const unregister1 = sdk.Router.handleCustomRoute('1234', customRouteView => {
+    customRouteView.getParams();
+    customRouteView.setFullWidth(true);
+    customRouteView.getElement().click();
+  });
+
+  unregister1();
+
+  const unregister2 = sdk.Router.handleAllRoutes(routeView => {
+    routeView.getParams();
+    routeView.getRouteID();
+    routeView.getRouteType();
+    routeView.on('destroy', () => {
+    });
+    const destroyed: boolean = routeView.destroyed;
+  });
+
+  unregister2();
+
+  const unregister3 = sdk.Router.handleListRoute('ALL_MAIL', listRouteView => {
+    const sectionDescriptor: SectionDescriptor = {
+      contentElement: new HTMLElement(),
+      footerLinkText: 'text',
+      hasDropdown: true,
+      onDropdownClick: event => event.dropdown.close(),
+      onFooterLinkClick: event => {
+      },
+      onTitleLinkClick: () => {
+      },
+      subtitle: 'title',
+      tableRows: [{
+        body: 'body',
+        iconClass: 'big',
+        iconUrl: 'http://url.com',
+        isRead: 'true',
+        labels: [{
+          iconClass: 'big',
+          iconBackgroundColor: 'red',
+          foregroundColor: 'green',
+          backgroundColor: 'blue',
+          iconUrl: 'http://url.com',
+          title: 'title'
+        }],
+        onClick: () => {
+        },
+        routeID: '1234',
+        routeParams: ['p1'],
+        shortDetailText: 'text',
+        title: 'title'
+      }],
+      title: 'title',
+      titleLinkText: 'text'
+    };
+
+    listRouteView.addCollapsibleSection(sectionDescriptor);
+    listRouteView.addSection(sectionDescriptor);
+
+    listRouteView.refresh();
+  });
+
+  unregister3();
+
+  const unregister4 = sdk.Router.handleCustomListRoute('1234', (offset, max) => {
+    return {
+      threads: [
+        {
+          rfcMessageId: 'id',
+          gmailThreadId: 'id'
+        },
+        'id'
+      ],
+      total: 1,
+      hasMore: true,
+    };
+  });
+
+  unregister4();
+
+  sdk.Router.getCurrentRouteView().getRouteID().toLowerCase();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const navItemDescriptor: NavItemDescriptor = {
+    accessory: {
+      type: 'CREATE',
+      onClick: () => {
+      }
+    },
+    backgroundColor: 'red',
+    expanderForegroundColor: 'green',
+    iconClass: 'big',
+    iconUrl: 'http://url.com',
+    name: 'name',
+    onClick: event => event.preventDefault(),
+    orderHint: 1,
+    routeID: '1234',
+    routeParams: {p: 1},
+    type: 'MANAGE'
+  };
+
+  const navItem = sdk.NavMenu.addNavItem(navItemDescriptor);
+  const navItem1 = navItem.addNavItem(navItemDescriptor);
+  navItem.remove();
+  navItem1.remove();
+
+  const isCollapsed: boolean = navItem.isCollapsed();
+  navItem.setCollapsed(true);
+
+  navItem.on('destroy', () => {
+  });
+  const destroyed: boolean = navItem.destroyed;
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const modalView = sdk.Widgets.showModalView({
+    buttons: [{
+      color: 'red',
+      onClick: () => {
+      },
+      orderHint: 1,
+      text: 'text',
+      title: 'title',
+      type: 'PRIMARY_ACTION'
+    }],
+    chrome: true,
+    constrainTitleWidth: true,
+    el: new HTMLElement(),
+    showCloseButton: true,
+    title: 'title'
+  });
+
+  modalView.close();
+  modalView.on('destroy', () => {
+  });
+  const destroyed: boolean = modalView.destroyed;
+
+  const moleView = sdk.Widgets.showMoleView({
+    chrome: true,
+    className: 'big',
+    el: new HTMLElement(),
+    minimizedTitleEl: new HTMLElement(),
+    title: 'title',
+    titleEl: new HTMLElement(),
+    titleButtons: [{
+      iconClass: 'big',
+      iconUrl: 'http://url.com',
+      onClick: () => {
+      },
+      title: 'title'
+    }]
+  });
+
+  moleView.close();
+  const minimized: boolean = moleView.getMinimized();
+  moleView.setMinimized(true);
+  moleView.setTitle('title');
+  moleView.on('destroy', () => {
+  });
+  moleView.on('minimize', () => {
+  });
+  moleView.on('restore', () => {
+  });
+
+  const drawerView = sdk.Widgets.showDrawerView({
+    chrome: true,
+    closeWithCompose: true,
+    el: new HTMLElement(),
+    title: 'title'
+  });
+
+  drawerView.close();
+  drawerView.disassociateComposeView();
+  const destroyed1: boolean = drawerView.destroyed;
+  drawerView.on('destroy', () => {
+  });
+  drawerView.on('slideAnimationDone', () => {
+  });
+  drawerView.on('closing', () => {
+  });
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const searchResults = [{
+    iconUrl: 'http://url.com',
+    onClick: () => {
+    },
+    description: 'desc',
+    externalURL: 'http://url.com',
+    name: 'name',
+    routeName: 'name',
+    routeParams: ['a', 'b']
+  }, {
+    iconUrl: 'http://url.com',
+    onClick: () => {
+    },
+    descriptionHTML: 'desc',
+    externalURL: 'http://url.com',
+    nameHTML: 'name',
+    routeName: 'name',
+    routeParams: ['a', 'b']
+  }];
+
+  sdk.Search.registerSearchSuggestionsProvider(query => searchResults);
+  sdk.Search.registerSearchSuggestionsProvider(query => Promise.resolve(searchResults));
+
+  sdk.Search.registerSearchQueryRewriter({
+    term: 'a',
+    termReplacer: () => 'b'
+  });
+
+  sdk.Search.registerSearchQueryRewriter({
+    term: 'a',
+    termReplacer: () => Promise.resolve('b')
+  });
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  sdk.User.getEmailAddress().toLowerCase();
+  const isConversationViewDisabled: boolean = sdk.User.isConversationViewDisabled();
+  const isUsingGmailMaterialUI: boolean = sdk.User.isUsingGmailMaterialUI();
+  sdk.User.getLanguage().toLowerCase();
+  sdk.User.getAccountSwitcherContactList()[0].name.toLowerCase();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const panel = sdk.Global.addSidebarContentPanel({
+    el: new HTMLElement(),
+    title: 'title',
+    iconUrl: 'http://url.com'
+  });
+  panel.remove();
+});
+
+InboxSDK.load(1, '1234').then((sdk: InboxSDK.InboxSDKInstance) => {
+  const handler = sdk.Keyboard.createShortcutHandle({
+    chord: 'a',
+    description: 'b'
+  });
+
+  handler.remove();
+});
diff --git a/types/inboxsdk/index.d.ts b/types/inboxsdk/index.d.ts
new file mode 100644
index 0000000000..4ced3ce6bd
--- /dev/null
+++ b/types/inboxsdk/index.d.ts
@@ -0,0 +1,1073 @@
+// Type definitions for InboxSDK 2.0
+// Project: https://www.inboxsdk.com/
+// Definitions by: Raphaël Doursenaud <https://github.com/rdoursenaud>
+//                 Amiram Korach <https://github.com/amiram>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/*
+ * Copyright (c) 2016 GPC.solutions
+ * Copyright (c) 2018 https://propelmypr.com
+ */
+
+// tslint:disable-next-line:export-just-namespace
+export = InboxSDK;
+export as namespace InboxSDK;
+
+declare namespace InboxSDK {
+  function load(version: number, appId?: string, opts?: LoadOptions): Promise<InboxSDKInstance>;
+
+  function loadScript(url: string, options?: LoadScriptOptions): Promise<void>;
+
+// // Undocummented
+// var IMPL_VERSION: string;
+// var LOADER_VERSION: string;
+// var destroyed: boolean; //: false
+// var Logger: {
+//   error: () => any;
+//   event: () => any;
+// };
+
+  interface LoadOptions {
+    appName?: string;
+    appIconUrl?: string;
+    suppressAddonTitle?: string;
+  }
+
+  interface LoadScriptOptions {
+    nowrap?: boolean;
+  }
+
+  interface InboxSDKInstance {
+    Compose: Compose.ComposeInstance;
+    Lists: Lists.ListsInstance;
+    Conversations: Conversations.ConversationsInstance;
+    Toolbars: Toolbars.ToolbarsInstance;
+    Router: Router.RouterInstance;
+    NavMenu: NavMenu.NavMenuInstance;
+    Widgets: Widgets.WidgetsInstance;
+    ButterBar: ButterBar.ButterBarInstance;
+    Search: Search.SearchInstance;
+    User: User.UserInstance;
+    Keyboard: Keyboard.KeyboardInstance;
+    Global: Global.GlobalInstance;
+  }
+
+  namespace Common {
+    interface Contact {
+      name: string;
+      emailAddress: string;
+    }
+
+    interface DropdownView {
+      setPlacementOptions(options: PositionOptions): void;
+
+      close(): void;
+
+      reposition(): void;
+
+      el: HTMLElement;
+      destroyed: boolean;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      on(name: 'preautoclose', cb: (event: PreAutoCloseEvent) => void): void;
+    }
+
+    interface PreAutoCloseEvent {
+      type: 'outsideInteraction' | 'escape';
+      cause: Event;
+
+      cancel(): void;
+    }
+
+    interface PositionOptions {
+      position?: string;
+      forcePosition?: boolean;
+      hAlign?: string;
+      forceHAlign?: boolean;
+      vAlign?: string;
+      forceVAlign?: boolean;
+      buffer?: number;
+      topBuffer?: number;
+      bottomBuffer?: number;
+      leftBuffer?: number;
+      rightBuffer?: number;
+    }
+
+    interface SimpleElementView {
+      destroy(): void;
+
+      el: HTMLElement;
+      destroyed: boolean;
+
+      on(name: 'destroy', cb: () => void): void;
+    }
+  }
+
+  export namespace Compose {
+    interface ComposeInstance {
+      registerComposeViewHandler(handler: (composeView: ComposeView) => void): () => void;
+
+      openNewComposeView(): Promise<ComposeView>;
+    }
+
+    interface ComposeView {
+      addButton(buttonDescriptor: ComposeButtonDescriptor): void;
+
+      addStatusBar(statusBarDescriptor: StatusBarDescriptor): StatusBarView;
+
+      close(): void;
+
+      send(options?: SendOptions): void;
+
+      getBodyElement(): HTMLElement;
+
+      getInitialMessageID(): string;
+
+      getThreadID(): string;
+
+      getDraftID(): Promise<string>;
+
+      getCurrentDraftID(): Promise<string | null>;
+
+      getHTMLContent(): string;
+
+      getSelectedBodyHTML(): string;
+
+      getSelectedBodyText(): string;
+
+      getSubject(): string;
+
+      getTextContent(): string;
+
+      getToRecipients(): Common.Contact[];
+
+      getCcRecipients(): Common.Contact[];
+
+      getBccRecipients(): Common.Contact[];
+
+      insertTextIntoBodyAtCursor(text: string): void;
+
+      insertHTMLIntoBodyAtCursor(html: string | HTMLElement): HTMLElement;
+
+      insertLinkChipIntoBodyAtCursor(text: string, url: string, iconUrl: string): HTMLElement;
+
+      insertLinkIntoBodyAtCursor(text: string, url: string): HTMLElement;
+
+      isInlineReplyForm(): boolean;
+
+      isFullscreen(): boolean;
+
+      setFullscreen(minimized: boolean): void;
+
+      isMinimized(): boolean;
+
+      setMinimized(minimized: boolean): void;
+
+      popOut(): Promise<ComposeView>;
+
+      setTitleBarColor(color: string): () => void;
+
+      isReply(): boolean;
+
+      setToRecipients(emails: string[]): void;
+
+      setCcRecipients(emails: string[]): void;
+
+      setBccRecipients(emails: string[]): void;
+
+      getFromContact(): Common.Contact;
+
+      getFromContactChoices(): Common.Contact[];
+
+      setFromEmail(email: string): void;
+
+      setSubject(text: string): void;
+
+      setBodyHTML(html: string): void;
+
+      setBodyText(text: string): void;
+
+      attachFiles(files: Blob[]): Promise<void>;
+
+      attachInlineFiles(Files: Blob[]): Promise<void>;
+
+      on(name: 'destroy', cb: (event: { messageID: string, closedByInboxSDK: boolean }) => void): void;
+
+      on(name: 'fullscreenChanged', cb: (event: { fullscreen: boolean }) => void): void;
+
+      on(name: 'fromContactChanged' | 'toContactAdded' | 'toContactRemoved' | 'ccContactAdded' | 'ccContactRemoved' | 'bccContactAdded' | 'bccContactRemoved',
+         cb: (event: { contact: Common.Contact }) => void): void;
+
+      on(name: 'recipientsChanged', cb: (event: RecipientsChangedEvent) => void): void;
+
+      on(name: 'presending', cb: (event: { cancel: () => void }) => void): void;
+
+      on(name: 'sent', cb: (event: { getThreadID: () => Promise<string>, getMessageID: () => Promise<string> }) => void): void;
+
+      on(name: 'discard' | 'sendCanceled' | 'sending' | 'bodyChanged' | 'minimized' | 'restored', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface RecipientsChangedEvent {
+      to: {
+        added: Common.Contact[];
+        removed: Common.Contact[];
+      };
+      cc: {
+        added: Common.Contact[];
+        removed: Common.Contact[];
+      };
+      bcc: {
+        added: Common.Contact[];
+        removed: Common.Contact[];
+      };
+    }
+
+    interface ComposeButtonDescriptor {
+      title: string;
+      iconUrl?: string;
+      iconClass?: string;
+      onClick: (event: ComposeButtonClickEvent) => void;
+      hasDropdown?: boolean;
+      type?: 'MODIFIER' | 'SEND_ACTION';
+      orderHint?: number;
+      enabled?: boolean;
+    }
+
+    interface ComposeButtonClickEvent {
+      composeView: ComposeView;
+      dropdown: Common.DropdownView;
+    }
+
+    interface StatusBarDescriptor {
+      height?: number;
+      orderHint?: number;
+    }
+
+    interface StatusBarView extends Common.SimpleElementView {
+      setHeight(height: number): void;
+    }
+
+    interface SendOptions {
+      sendAndArchive?: boolean;
+    }
+  }
+
+  export namespace Lists {
+    interface ListsInstance {
+      registerThreadRowViewHandler(handler: (threadRowView: ThreadRowView) => any): () => void;
+    }
+
+    interface ThreadRowView {
+      addLabel(labelDescriptor: LabelDescriptor): void;
+
+      // addLabel(labelDescriptor: Stream<LabelDescriptor>): void;
+
+      addImage(imageDescriptor: ImageDescriptor): void;
+
+      // addImage(imageDescriptor: Stream<ImageDescriptor>): void;
+
+      addButton(buttonDescriptor: ThreadRowButtonDescriptor): void;
+
+      // addButton(buttonDescriptor: Stream<ThreadRowButtonDescriptor>): void;
+
+      addActionButton(buttonDescriptor: ThreadRowActionButtonDescriptor): void;
+
+      // addActionButton(buttonDescriptor: Stream<ThreadRowActionButtonDescriptor>): void;
+
+      addAttachmentIcon(threadRowAttachmentIconDescriptor: ThreadRowAttachmentIconDescriptor): void;
+
+      // addAttachmentIcon(threadRowAttachmentIconDescriptor: stream<ThreadRowAttachmentIconDescriptor>): void
+
+      replaceDate(threadRowDateDescriptor: ThreadRowDateDescriptor): void;
+
+      // replaceDate(threadRowDateDescriptor: Stream<ThreadRowDateDescriptor>): void;
+
+      replaceDraftLabel(draftLabelDescriptor: ThreadRowDraftLabelDescriptor): void;
+
+      // replaceDraftLabel(draftLabelDescriptor: Stream<ThreadRowDraftLabelDescriptor>): void;
+
+      getSubject(): string;
+
+      getDateString(): string;
+
+      getThreadIDAsync(): Promise<string>;
+
+      getThreadIDIfStableAsync(): Promise<string | null>;
+
+      getDraftID(): Promise<string>;
+
+      getVisibleDraftCount(): number;
+
+      getVisibleMessageCount(): number;
+
+      getContacts(): Common.Contact[];
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface ThreadRowButtonDescriptor {
+      title: string;
+      iconUrl: string;
+      iconClass?: string;
+      onClick: (event: ThreadRowButtonClickEvent) => void;
+      hasDropdown?: boolean;
+    }
+
+    interface ThreadRowButtonClickEvent {
+      threadRowView: ThreadRowView;
+      dropdown?: Common.DropdownView;
+    }
+
+    interface ThreadRowActionButtonDescriptor {
+      type: 'LINK';
+      title: string;
+      className?: string;
+      onClick?: (event: any) => void;
+      url: string;
+    }
+
+    interface LabelDescriptor {
+      title: string;
+      foregroundColor?: string;
+      backgroundColor?: string;
+      iconUrl: string;
+      iconClass?: string;
+      iconBackgroundColor?: string;
+    }
+
+    interface ImageDescriptor {
+      imageUrl: string;
+      imageClass?: string;
+      tooltip?: string;
+      orderHint?: number;
+    }
+
+    interface ThreadRowDateDescriptor {
+      text: string;
+      textColor?: string;
+      tooltip?: string;
+    }
+
+    interface ThreadRowAttachmentIconDescriptor {
+      iconUrl?: string;
+      iconClass?: string;
+      tooltip?: string;
+    }
+
+    interface ThreadRowDraftLabelDescriptor {
+      text: string;
+      count?: string;
+    }
+  }
+
+  export namespace Conversations {
+    interface ConversationsInstance {
+      registerThreadViewHandler(handler: (threadView: ThreadView) => void): () => void;
+
+      registerMessageViewHandler(handler: (messageView: MessageView) => void): () => void;
+
+      registerMessageViewHandlerAll(handler: (messageView: MessageView) => void): () => void;
+
+      registerFileAttachmentCardViewHandler(handler: (attachmentCardView: AttachmentCardView) => void): () => void;
+    }
+
+    interface ThreadView {
+      addNoticeBar(): Common.SimpleElementView;
+
+      addSidebarContentPanel(contentPanelDescriptor: ContentPanelDescriptor): ContentPanelView;
+
+      getMessageViews(): MessageView[];
+
+      getMessageViewsAll(): MessageView[];
+
+      getSubject(): string;
+
+      getThreadIDAsync(): Promise<string>;
+
+      on(name: 'contactHover', cb: (event: ContactHoverEvent) => void): void;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface ContactHoverEvent {
+      contact: Common.Contact;
+      contactType: 'sender' | 'recipient';
+      messageView: MessageView;
+      threadView: ThreadView;
+    }
+
+    interface MessageView {
+      addAttachmentCardView(cardOptions: AttachmentCardOptions | AttachmentCardNoPreviewOptions): AttachmentCardView;
+
+      addAttachmentsToolbarButton(buttonOptions: AttachmentsToolbarButtonDescriptor): void;
+
+      addToolbarButton(options: MessageViewToolbarButtonDescriptor): void;
+
+      getBodyElement(): HTMLElement;
+
+      getMessageIDAsync(): Promise<string>;
+
+      getFileAttachmentCardViews(): AttachmentCardView[];
+
+      isElementInQuotedArea(): boolean;
+
+      isLoaded(): boolean;
+
+      getLinksInBody(): MessageViewLinkDescriptor[];
+
+      getSender(): Common.Contact;
+
+      getRecipientEmailAddresses(): string[];
+
+      getRecipientsFull(): Promise<Common.Contact[]>;
+
+      getThreadView(): ThreadView;
+
+      getDateString(): string;
+
+      addAttachmentIcon(iconDescriptor: MessageAttachmentIconDescriptor): void;
+
+      // addAttachmentIcon(iconDescriptor: Stream<MessageAttachmentIconDescriptor>): void;
+
+      getViewState(): MessageViewViewStates;
+
+      on(name: 'viewStateChange', cb: (event: { newViewState: MessageViewViewStates, oldViewState: MessageViewViewStates, messageView: MessageView }) => void): void;
+
+      on(name: 'contactHover', cb: (event: ContactHoverEvent) => void): void;
+
+      on(name: 'destroy' | 'load', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    type MessageViewViewStates = 'HIDDEN' | 'COLLAPSED' | 'EXPANDED';
+
+    interface ContentPanelView {
+      remove(): void;
+
+      on(name: 'destroy' | 'activate' | 'deactivate', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface AttachmentCardView {
+      getAttachmentType(): string;
+
+      addButton(buttonDescriptor: CustomButtonDescriptor): void;
+
+      getTitle(): string;
+
+      /**
+       * @deprecated. Use AttachmentCardClickEvent.getDownloadURL() instead
+       */
+      getDownloadURL(): Promise<string>;
+
+      getMessageView(): MessageView | null;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    // ConversationsDescriptors
+
+    interface AttachmentCardOptions {
+      title: string;
+      description: string;
+      previewUrl: string;
+      previewThumbnailUrl: string;
+      failoverPreviewIconUrl: string;
+      previewOnClick: (event: PreviewClickEvent) => void;
+      fileIconImageUrl: string;
+      buttons: Array<DownloadButtonDescriptor | CustomButtonDescriptor>;
+      foldColor?: string;
+      mimeType?: string;
+    }
+
+    interface AttachmentCardNoPreviewOptions {
+      title: string;
+      description: string;
+      previewUrl: string;
+      iconThumbnailUrl: string;
+      previewOnClick: (event: PreviewClickEvent) => void;
+      fileIconImageUrl: string;
+      buttons: Array<DownloadButtonDescriptor | CustomButtonDescriptor>;
+      foldColor?: string;
+    }
+
+    interface PreviewClickEvent {
+      attachmentCardView: AttachmentCardView;
+
+      preventDefault(): void;
+    }
+
+    interface ContentPanelDescriptor {
+      el: HTMLElement;
+      title: string;
+      iconUrl: string;
+      appName?: string;
+      appIconUrl?: string;
+      id?: string;
+      hideTitleBar?: boolean;
+      orderHint?: number;
+    }
+
+    interface DownloadButtonDescriptor {
+      downloadUrl: string;
+      downloadFilename?: string;
+      onClick: (event: any) => void;
+      openInNewTab?: boolean;
+    }
+
+    interface CustomButtonDescriptor {
+      iconUrl: string;
+      tooltip: string;
+      onClick: (event: AttachmentCardClickEvent) => void;
+    }
+
+    interface AttachmentCardClickEvent {
+      getDownloadURL(): Promise<string>;
+    }
+
+    interface AttachmentsToolbarButtonDescriptor {
+      tooltip: string;
+      iconUrl: string;
+      onClick: (event: AttachmentsToolbarButtonEvent) => void;
+    }
+
+    interface AttachmentsToolbarButtonEvent {
+      attachmentCardViews: AttachmentCardView[];
+    }
+
+    interface MessageViewLinkDescriptor {
+      text: string;
+      html: string;
+      element: HTMLElement;
+      href: string;
+      isInQuotedArea: boolean;
+    }
+
+    interface MessageAttachmentIconDescriptor {
+      iconUrl: string;
+      iconClass?: string;
+      tooltip: string;
+      onClick?: () => void;
+    }
+
+    interface MessageViewToolbarButtonDescriptor {
+      section: 'MORE';
+      title: string;
+      iconUrl: string;
+      onClick: () => void;
+      iconClass?: string;
+      orderHint: number;
+    }
+  }
+
+  export namespace Toolbars {
+    interface ToolbarsInstance {
+      registerThreadButton(toolbarButtonDescriptor: ToolbarButtonDescriptor): () => void;
+
+      /**
+       * @deprecated. use registerThreadButton
+       * @param toolbarButtonDescriptor
+       */
+      registerToolbarButtonForList(toolbarButtonDescriptor: ToolbarButtonDescriptor): () => void;
+
+      /**
+       * @deprecated. use registerThreadButton
+       * @param toolbarButtonDescriptor
+       */
+      registerToolbarButtonForThreadView(toolbarButtonDescriptor: ToolbarButtonDescriptor): () => void;
+
+      addToolbarButtonForApp(appToolbarButtonDescriptor: AppToolbarButtonDescriptor): AppToolbarButtonView;
+    }
+
+    interface ToolbarButtonDescriptor {
+      title: string;
+      onClick: (event: ToolbarButtonEvent) => void;
+      iconUrl?: string;
+      iconClass?: string;
+      positions?: ToolbarButtonPosition[];
+      threadSection?: SectionNames;
+      listSection?: SectionNames;
+      hasDropdown?: boolean;
+      hideFor?: (routeView: Router.RouteView) => void;
+      orderHint?: number;
+      keyboardShortcutHandle?: Keyboard.KeyboardShortcutHandle;
+    }
+
+    type ToolbarButtonPosition = 'THREAD' | 'ROW' | 'LIST';
+
+    interface ToolbarButtonEvent {
+      position: ToolbarButtonPosition;
+      selectedThreadRowViews: Lists.ThreadRowView[];
+      selectedThreadViews: Conversations.ThreadView[];
+      dropdown?: Common.DropdownView;
+    }
+
+    interface AppToolbarButtonDescriptor {
+      title: string;
+      titleClass?: string;
+      iconUrl: string;
+      iconClass?: string;
+      onClick: (event: AppToolbarButtonEvent) => void;
+      arrowColor?: string;
+    }
+
+    interface AppToolbarButtonView {
+      open(): void;
+
+      close(): void;
+
+      remove(): void;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface AppToolbarButtonEvent {
+      dropdown: Common.DropdownView;
+    }
+
+    type SectionNames = 'INBOX_STATE' | 'METADATA_STATE' | 'OTHER';
+  }
+
+  export namespace Router {
+    interface RouterInstance {
+      createLink(routeID: string | NativeRouteIDs, params: RouteParams): string;
+
+      goto(routeID: string | NativeRouteIDs, params: RouteParams): void;
+
+      handleCustomRoute(routeID: string, handler: (customRouteView: CustomRouteView) => void): () => void;
+
+      handleAllRoutes(handler: (routeView: RouteView) => void): () => void;
+
+      handleListRoute(routeID: NativeListRouteIDs, handler: (listRouteView: ListRouteView) => void): () => void;
+
+      handleCustomListRoute(routeID: string, handler: (offset: number, max: number) => CustomListDescriptor | Promise<CustomListDescriptor>): () => void;
+
+      getCurrentRouteView(): RouteView;
+    }
+
+    interface CustomListDescriptor {
+      threads: Array<ThreadDescriptor | string>;
+      total?: number;
+      hasMore?: boolean;
+    }
+
+    interface ThreadDescriptor {
+      rfcMessageId?: string;
+      gmailThreadId?: string;
+    }
+
+    interface RouteParams {
+      [key: number]: string | number;
+
+      [key: string]: string | number;
+    }
+
+    interface RouteView {
+      getRouteID(): string;
+
+      getRouteType(): RouteTypes;
+
+      getParams(): RouteParams;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    type RouteTypes = 'LIST' | 'THREAD' | 'SETTINGS' | 'CHAT' | 'CUSTOM' | 'UNKNOWN';
+
+    interface CustomRouteView extends RouteView {
+      getElement(): HTMLElement;
+
+      setFullWidth(fullWidth: boolean): void;
+    }
+
+    interface ListRouteView extends RouteView {
+      addCollapsibleSection(options: SectionDescriptor): CollapsibleSectionView;
+
+      // addCollapsibleSection(options: Stream<SectionDescriptor>): CollapsibleSectionView;
+
+      addSection(options: SectionDescriptor): SectionView;
+
+      // addSection(options: Stream<SectionDescriptor>): SectionView;
+
+      refresh(): void;
+    }
+
+    interface SectionView {
+      remove(): void;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface CollapsibleSectionView extends SectionView {
+      setCollapsed(value: boolean): void;
+
+      remove(): void;
+
+      on(name: 'destroy' | 'expanded' | 'collapsed', cb: () => void): void;
+    }
+
+    interface SectionDescriptor {
+      title: string;
+      subtitle?: string;
+      titleLinkText?: string;
+      onTitleLinkClick?: () => void;
+      hasDropdown?: boolean;
+      onDropdownClick?: (event: SectionDropdownClickEvent) => void;
+      tableRows?: RowDescriptor[];
+      contentElement?: HTMLElement;
+      footerLinkText?: string;
+      onFooterLinkClick?: (event: any) => void;
+    }
+
+    interface SectionDropdownClickEvent {
+      dropdown: Common.DropdownView;
+    }
+
+    interface RowDescriptor {
+      title: string;
+      body: string;
+      shortDetailText: string;
+      isRead: string;
+      labels: Lists.LabelDescriptor[];
+      iconUrl?: string;
+      iconClass?: string;
+      routeID?: string;
+      routeParams?: string[];
+      onClick?: () => void;
+    }
+
+    type NativeRouteIDs =
+      'INBOX' |
+      'ALL_MAIL' |
+      'SENT' |
+      'STARRED' |
+      'DRAFTS' |
+      'SNOOZED' |
+      'DONE' |
+      'REMINDERS' |
+      'LABEL' |
+      'TRASH' |
+      'SPAM' |
+      'IMPORTANT' |
+      'SEARCH' |
+      'THREAD' |
+      'CHATS' |
+      'CHAT' |
+      'CONTACTS' |
+      'CONTACT' |
+      'SETTINGS' |
+      'ANY_LIST';
+
+    type NativeListRouteIDs =
+      'INBOX'
+      | 'ALL_MAIL'
+      | 'SENT'
+      | 'STARRED'
+      | 'DRAFTS'
+      | 'SNOOZED'
+      | 'DONE'
+      | 'REMINDERS'
+      | 'LABEL'
+      | 'TRASH'
+      | 'SPAM'
+      | 'IMPORTANT'
+      | 'SEARCH'
+      | 'ANY_LIST';
+  }
+
+  export namespace NavMenu {
+    interface NavMenuInstance {
+      addNavItem(navItemDescriptor: NavItemDescriptor): NavItemView;
+    }
+
+    interface NavItemView {
+      addNavItem(navItemDescriptor: NavItemDescriptor): NavItemView;
+
+      remove(): void;
+
+      isCollapsed(): boolean;
+
+      setCollapsed(collapseValue: boolean): void;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface NavItemDescriptor {
+      name: string;
+      routeID?: string;
+      routeParams?: object;
+
+      onClick?: (event: { preventDefault(): void }) => void;
+
+      orderHint?: number;
+      accessory?: CreateAccessoryDescriptor | IconButtonAccessoryDescriptor | DropdownButtonAccessoryDescriptor;
+      iconUrl?: string;
+      iconClass?: string;
+      backgroundColor?: string;
+      expanderForegroundColor?: string;
+      type?: NavItemTypes;
+    }
+
+    interface CreateAccessoryDescriptor {
+      type: 'CREATE';
+      onClick: () => void;
+    }
+
+    interface IconButtonAccessoryDescriptor {
+      type: 'ICON_BUTTON';
+      onClick: () => void;
+      iconUrl: string;
+      iconClass?: string;
+    }
+
+    interface DropdownButtonAccessoryDescriptor {
+      type: 'DROPDOWN_BUTTON';
+      buttonBackgroundColor: string;
+      buttonForegroundColor: string;
+      onClick: (event: DropdownButtonClickEvent) => void;
+    }
+
+    interface DropdownButtonClickEvent {
+      dropdown: Common.DropdownView;
+    }
+
+    type NavItemTypes = 'MANAGE' | 'NAVIGATION';
+  }
+
+  export namespace Widgets {
+    interface WidgetsInstance {
+      showModalView(options: ModalOptions): ModalView;
+
+      showMoleView(options: MoleOptions): MoleView;
+
+      showDrawerView(options: DrawerOptions): DrawerView;
+    }
+
+    interface ModalOptions {
+      el: HTMLElement;
+      chrome?: boolean;
+      constrainTitleWidth?: boolean;
+      showCloseButton?: boolean;
+      title?: string;
+      buttons?: ModalButtonDescriptor[];
+    }
+
+    interface ModalButtonDescriptor {
+      text: string;
+      title: string;
+      onClick: () => void;
+      type?: 'PRIMARY_ACTION' | 'SECONDARY_ACTION';
+      color?: string;
+      orderHint?: number;
+    }
+
+    interface MoleOptions {
+      el: HTMLElement;
+      title?: string;
+      titleEl?: HTMLElement;
+      minimizedTitleEl?: HTMLElement;
+      className?: string;
+      titleButtons?: MoleButtonDescriptor[];
+      chrome?: boolean;
+    }
+
+    interface MoleButtonDescriptor {
+      title: string;
+      iconUrl: string;
+      iconClass?: string;
+      onClick: () => void;
+    }
+
+    interface DrawerOptions {
+      el: HTMLElement;
+      chrome?: boolean;
+      title?: string;
+      composeView?: Compose.ComposeView;
+      closeWithCompose?: boolean;
+    }
+
+    interface ModalView {
+      close(): void;
+
+      on(name: 'destroy', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface MoleView {
+      close(): void;
+
+      setTitle(text: string): void;
+
+      setMinimized(minimized: boolean): void;
+
+      getMinimized(): boolean;
+
+      on(name: 'destroy' | 'minimize' | 'restore', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+
+    interface DrawerView {
+      close(): void;
+
+      associateComposeView(composeView: Compose.ComposeView, closeWithCompose: boolean): void;
+
+      disassociateComposeView(): void;
+
+      on(name: 'destroy' | 'slideAnimationDone' | 'closing', cb: () => void): void;
+
+      destroyed: boolean;
+    }
+  }
+
+  export namespace ButterBar {
+    interface ButterBarInstance {
+      showMessage(options: MessageDescriptor): object;
+
+      showLoading(): object;
+
+      showError(options: MessageDescriptor): object;
+
+      showSaving(options: SavingMessageDescriptor): object;
+
+      hideMessage(messageKey: object | string): void;
+
+      hideGmailMessage(): void;
+    }
+
+    interface MessageDescriptorBase {
+      className?: string;
+      priority?: number;
+      time?: number;
+      hideOnViewChanged?: boolean;
+      persistent?: boolean;
+      messageKey?: object | string;
+    }
+
+    interface MessageDescriptorText extends MessageDescriptorBase {
+      text: string;
+    }
+
+    interface MessageDescriptorHtml extends MessageDescriptorBase {
+      html: string;
+    }
+
+    interface MessageDescriptorHtmlElement extends MessageDescriptorBase {
+      el: HTMLElement;
+    }
+
+    type MessageDescriptor = MessageDescriptorText | MessageDescriptorHtml | MessageDescriptorHtmlElement;
+
+    interface SavingMessageDescriptorBase extends MessageDescriptorBase {
+      confirmationText?: string;
+      confirmationTime?: number;
+      showConfirmation?: boolean;
+    }
+
+    interface SavingMessageDescriptorText extends SavingMessageDescriptorBase {
+      text: string;
+    }
+
+    interface SavingMessageDescriptorHtml extends SavingMessageDescriptorBase {
+      html: string;
+    }
+
+    interface SavingMessageDescriptorHtmlElement extends SavingMessageDescriptorBase {
+      el: HTMLElement;
+    }
+
+    type SavingMessageDescriptor =
+      SavingMessageDescriptorText
+      | SavingMessageDescriptorHtml
+      | SavingMessageDescriptorHtmlElement;
+  }
+
+  export namespace Search {
+    interface SearchInstance {
+      registerSearchSuggestionsProvider(handler: (query: string) => AutocompleteSearchResult[] | Promise<AutocompleteSearchResult[]>): void;
+
+      registerSearchQueryRewriter(rewriter: SearchQueryRewriter): void;
+    }
+
+    interface AutocompleteSearchResultBase {
+      iconUrl?: string;
+      routeName?: string;
+      routeParams?: string[];
+      externalURL?: string;
+      onClick?: () => void;
+    }
+
+    interface AutocompleteSearchResultText extends AutocompleteSearchResultBase {
+      name: string;
+      description: string;
+    }
+
+    interface AutocompleteSearchResultHtml extends AutocompleteSearchResultBase {
+      nameHTML: string;
+      descriptionHTML: string;
+    }
+
+    type AutocompleteSearchResult = AutocompleteSearchResultText | AutocompleteSearchResultHtml;
+
+    interface SearchQueryRewriter {
+      term: string;
+      termReplacer: () => string | Promise<string>;
+    }
+  }
+
+  export namespace User {
+    interface UserInstance {
+      getEmailAddress(): string;
+
+      isUsingGmailMaterialUI(): boolean;
+
+      isConversationViewDisabled(): boolean;
+
+      getLanguage(): string;
+
+      getAccountSwitcherContactList(): Common.Contact[];
+    }
+  }
+
+  export namespace Keyboard {
+    interface KeyboardInstance {
+      createShortcutHandle(keyboardShortcutDescriptor: KeyboardShortcutDescriptor): KeyboardShortcutHandle;
+    }
+
+    interface KeyboardShortcutHandle {
+      remove(): void;
+    }
+
+    interface KeyboardShortcutDescriptor {
+      chord: string;
+      description: string;
+    }
+  }
+
+  export namespace Global {
+    interface GlobalInstance {
+      addSidebarContentPanel(contentPanelDescriptor: Conversations.ContentPanelDescriptor): Conversations.ContentPanelView;
+    }
+  }
+}
diff --git a/types/inboxsdk/tsconfig.json b/types/inboxsdk/tsconfig.json
new file mode 100644
index 0000000000..846443ce68
--- /dev/null
+++ b/types/inboxsdk/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",
+        "inboxsdk-tests.ts"
+    ]
+}
diff --git a/types/inboxsdk/tslint.json b/types/inboxsdk/tslint.json
new file mode 100644
index 0000000000..99ea174f67
--- /dev/null
+++ b/types/inboxsdk/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "strict-export-declare-modifiers": false
+  }
+}
diff --git a/types/inline-css/index.d.ts b/types/inline-css/index.d.ts
index 6d43b7975d..2567e01e85 100644
--- a/types/inline-css/index.d.ts
+++ b/types/inline-css/index.d.ts
@@ -2,10 +2,7 @@
 // Project: https://github.com/jonkemp/inline-css
 // Definitions by: Philip Spain <https://github.com/philipisapain>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-/// <reference types="bluebird" />
-
+// TypeScript Version: 2.8
 
 import Promise = require('bluebird');
 
diff --git a/types/inquirer/index.d.ts b/types/inquirer/index.d.ts
index d9258f7a48..5d976e896d 100644
--- a/types/inquirer/index.d.ts
+++ b/types/inquirer/index.d.ts
@@ -7,6 +7,8 @@
 //                 Jason Dreyzehner <https://github.com/bitjson>
 //                 Synarque <https://github.com/synarque>
 //                 Justin Rockwood <https://github.com/jrockwood>
+//                 Keith Kelly <https://github.com/kwkelly>
+//                 Junyoung Clare Jang <https://github.com/Ailrun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // TypeScript Version: 2.3
@@ -21,6 +23,13 @@ declare namespace inquirer {
         | Question<T>
         | ReadonlyArray<Question<T>>
         | Rx.Observable<Question<T>>;
+    interface OutputStreamOption {
+        output: NodeJS.WriteStream
+    }
+    interface InputStreamOption {
+        input: NodeJS.ReadStream
+    }
+    type StreamOptions = InputStreamOption | OutputStreamOption | (InputStreamOption & OutputStreamOption);
 
     interface Inquirer {
         restoreDefaultPrompts(): void;
@@ -32,8 +41,9 @@ declare namespace inquirer {
         registerPrompt(name: string, prompt: PromptModule): void;
         /**
          * Create a new self-contained prompt module.
+         * @param opt Object specifying input and output streams for the prompt
          */
-        createPromptModule(): PromptModule;
+        createPromptModule(opt?: StreamOptions): PromptModule;
         /**
          * Public CLI helper interface
          * @param questions Questions settings array
@@ -107,12 +117,12 @@ declare namespace inquirer {
          * Receive the user input and should return true if the value is valid, and an error message (String)
          * otherwise. If false is returned, a default error message is provided.
          */
-        validate?(input: string, answers?: T): boolean | string | Promise<boolean | string>;
+        validate?(input: any, answers?: T): boolean | string | Promise<boolean | string>;
         /**
          * Receive the user input and return the filtered value to be used inside the program.
          * The value returned will be added to the Answers hash.
          */
-        filter?(input: string): string | Promise<string>;
+        filter?(input: string): any;
         /**
          * Receive the user input and return the transformed value to be displayed to the user. The
          * transformation only impacts what is shown while editing. It does not impact the answers
diff --git a/types/inquirer/inquirer-tests.ts b/types/inquirer/inquirer-tests.ts
index aa545adae0..4c8ba9491f 100644
--- a/types/inquirer/inquirer-tests.ts
+++ b/types/inquirer/inquirer-tests.ts
@@ -626,3 +626,61 @@ async function testAsyncPrompt(): Promise<void> {
 }
 
 testAsyncPrompt();
+
+/**
+ * Different prompt output example
+ */
+
+"use strict";
+//var inquirer = require("../lib/inquirer");
+
+var questions = [
+    {
+        type: "input",
+        name: "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";
+        },
+        suffix: "!!"
+    },
+    {
+        type: "input",
+        name: "phone",
+        message: "What's your phone number",
+        validate: function(value: string): string | boolean {
+            var pass = value.match(
+                /^([01]{1})?[\-\.\s]?\(?(\d{3})\)?[\-\.\s]?(\d{3})[\-\.\s]?(\d{4})\s?((?:#|ext\.?\s?|x\.?\s?){1}(?:\d+)?)?$/i
+            );
+            if (pass) {
+                return true;
+            } else {
+                return "Please enter a valid phone number";
+            }
+        }
+    }
+];
+
+inquirer.createPromptModule({ output: process.stderr })(questions, function(answers) {
+    console.log(JSON.stringify(answers, null, "  "));
+});
+
+// Work with JS inquirer but rejected by typing.
+inquirer.prompt([
+    {
+        type: "input",
+        name: "listOfThings",
+        filter(value: string): string[] {
+            return ["abc", "def"];
+        },
+        validate(value: string[]): boolean {
+            return value.length > 0;
+        }
+    }
+]);
diff --git a/types/interact.js/index.d.ts b/types/interact.js/index.d.ts
deleted file mode 100644
index 866ced2216..0000000000
--- a/types/interact.js/index.d.ts
+++ /dev/null
@@ -1,259 +0,0 @@
-// Type definitions for Interacting for interact.js v1.0.25
-// Project: https://github.com/taye/interact.js
-// Definitions by: Douglas Eichelberger <https://github.com/dduugg>, Adi Dahiya <https://github.com/adidahiya>, Tom Hasner <https://github.com/thasner>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// API documentation: http://interactjs.io/docs
-
-declare namespace Interact {
-    interface Interactable {
-        // returns Element or string
-        accept(): any;
-        accept(newValue: Element): Interactable;
-        accept(newValue: string): Interactable;
-        actionChecker(): Function;
-        actionChecker(checker: Function): Interactable;
-        // returns boolean or {[key: string]: any}
-        autoScroll(): any;
-        autoScroll(options: boolean): Interactable;
-        autoScroll(options: {[key: string]: any}): Interactable;
-        context(): Node;
-        defaultActionChecker(event: any): string;
-        deltaSource(): string;
-        // returns Interactable if newValue is "page" or "client", otherwise returns string
-        deltaSource(newValue: String): Interactable;
-        draggable(): boolean;
-        draggable(options: boolean): Interactable;
-        draggable(options: {[key: string]: any}): Interactable;
-        dropCheck(event: MouseEvent): boolean;
-        dropCheck(event: TouchEvent): boolean;
-        dropChecker(): Function;
-        dropChecker(checker: Function): Interactable;
-        // returns boolean or {[key: string]: any}
-        dropzone(): any;
-        dropzone(options: boolean): Interactable;
-        dropzone(options: {[key: string]: any}): Interactable;
-        // return HTMLElement or SVGElement
-        element(): Element;
-        fire(iEvent: InteractEvent): Interactable;
-        // returns boolean or {[key: string]: any}
-        gesturable(): any;
-        gesturable(options: boolean): Interactable;
-        gesturable(options: {[key: string]: any}): Interactable;
-        getRect(): ClientRect;
-        // returns Element or string
-        ignoreFrom(): any;
-        ignoreFrom(newValue: string): Interactable;
-        ignoreFrom(newValue: Element): Interactable;
-        // returns boolean or {[key: string]: any}
-        inertia(): any;
-        inertia(options: boolean): Interactable;
-        inertia(options: {[key: string]: any}): Interactable;
-        off(eventType: string, listener: Function, useCapture?: boolean): Interactable;
-        on(eventType: string, listener: Function, useCapture?: boolean): Interactable;
-        origin(): Point;
-        origin(newValue: HTMLElement): Interactable;
-        origin(newValue: SVGElement): Interactable;
-        origin(newValue: Point): Interactable;
-        preventDefault(newValue: boolean | string): Interactable;
-        rectChecker(): Function;
-        rectChecker(newValue: Function): Interactable;
-        resizable(): Interactable;
-        resizable(options: boolean): Interactable;
-        resizable(options: {[key: string]: any}): Interactable;
-        restrict(): Restrict;
-        restrict(newValue: Restrict): Interactable;
-        set(options: {[key: string]: any}): Interactable;
-        // returns boolean or {[key: string]: any}
-        snap(): any;
-        snap(options: boolean): Interactable;
-        snap(options: {[key: string]: any}): Interactable;
-        squareResize(): boolean;
-        squareResize(newValue: boolean): Interactable;
-        styleCursor(): boolean;
-        styleCursor(newValue: boolean): Interactable;
-        unset(): InteractStatic;
-        validateSetting(context: string, option: string, value: any): any;
-    }
-
-    interface Coordinates {
-        clientX: number;
-        clientY: number;
-        pageX: number;
-        pageY: number;
-        timeStamp: number;
-    }
-
-    interface Debug {
-        target: any;
-        dragging: any;
-        resizing: any;
-        gesturing: any;
-        prepared: any;
-
-        prevCoords: Coordinates;
-        downCoords: Coordinates;
-
-        pointerIds: any[];
-        pointerMoves: any[];
-        addPointer: any;
-        removePointer: any;
-        recordPointers: any;
-
-        inertia: InertiaStatus;
-
-        downTime: any;
-        downEvent: any;
-        prevEvent: any;
-
-        Interactable: any;
-        IOptions: any;
-        interactables: any;
-        dropzones: any;
-        pointerIsDown: any;
-        defaultOptions: any;
-        defaultActionChecker: any;
-
-        actions: any;
-        dragMove: any;
-        resizeMove: any;
-        gestureMove: any;
-        pointerUp: any;
-        pointerDown: any;
-        pointerMove: any;
-        pointerHover: any;
-
-        events: any;
-        globalEvents: any;
-        delegatedEvents: any;
-    }
-
-    interface InertiaStatus {
-        active: boolean;
-        target: any;
-        targetElement: any;
-
-        startEvent: any;
-        pointerUp: any
-
-        xe: number;
-        ye: number;
-        duration: number;
-
-        t0: number;
-        vx0: number;
-        vys: number;
-
-        lambda_v0: number;
-        one_ve_v0: number;
-        i: any;
-    }
-
-    interface Point {
-        x: number;
-        y: number;
-    }
-
-    // value types are either ClientRect or Element
-    interface Restrict {
-        drag?: any;
-        gesture?: any;
-        resize?: any;
-        elementRect?: {[direction: string]: number};
-    }
-
-    interface InteractEvent {
-        altKey: boolean;
-        axes: string;
-        button: number
-        clientX0: number;
-        clientX: number
-        clientY0: number;
-        clientY: number
-        ctrlKey: boolean
-        dt: number;
-        duration: number;
-        dx: number;
-        dy: number;
-        metaKey: boolean;
-        pageX: number;
-        pageY: number;
-        shiftKey: boolean;
-        speed: number;
-        t0: number;
-        target: any;
-        timeStamp: number;
-        type: string;
-        velocityX: number;
-        velocityY: number;
-        x0: number;
-        y0: number;
-    }
-
-    interface TouchEvent {
-        pageX: number;
-        pageY: number;
-        type: string;
-    }
-
-    interface InteractStatic {
-        (element: HTMLElement): Interactable;
-        (element: SVGElement): Interactable;
-        (element: string): Interactable;
-        (element: string, options: {context: Element}): Interactable;
-        // returns boolean or {[key: string]: any}
-        autoScroll(): any;
-        autoScroll(options: boolean): InteractStatic;
-        autoScroll(options: {[key: string]: any}): InteractStatic;
-        currentAction(): string
-        debug(): Debug;
-        deltaSource(): string;
-        // "page" and "client" are the valid parameters
-        deltaSource(newValue: string): InteractStatic;
-        dynamicDrop(): boolean;
-        dynamicDrop(newValue: boolean): InteractStatic;
-        enableDragging(): boolean;
-        enableDragging(newValue: boolean): InteractStatic;
-        enableGesturing(): boolean;
-        enableGesturing(newValue: boolean): InteractStatic;
-        enableResizing(): boolean;
-        enableResizing(newValue: boolean): InteractStatic;
-        // returns boolean or {[key: string]: any}
-        inertia(): any;
-        inertia(options: boolean): InteractStatic;
-        inertia(options: {[key: string]: any}): InteractStatic;
-        isSet(element: Element): boolean;
-        margin(): number;
-        margin(newvalue: number): InteractStatic;
-        off(type: string, listener: Function, useCapture?: boolean): InteractStatic;
-        on(type: string, listener: Function, useCapture?: boolean): InteractStatic;
-        restrict(): Restrict;
-        restrict(newValue: Restrict): InteractStatic;
-        simulate(action: string, element: Element, pointerEvent?: any): InteractStatic;
-        // returns boolean or {[key: string]: any}
-        snap(): any;
-        snap(options: boolean): InteractStatic;
-        snap(options: {[key: string]: any}): InteractStatic;
-        stop(event: Event): InteractStatic;
-        styleCursor(): boolean;
-        styleCursor(newValue: boolean): InteractStatic;
-        supportsTouch(): boolean
-    }
-}
-
-declare var interact: Interact.InteractStatic;
-
-// CommonJS module name until version 1.2.6 is "interact.js"
- declare module "interact.js" {
-     export = interact;
- }
-
-// CommonJS module name from version 1.2.7 onward is "interactjs"
-declare module "interactjs" {
-    export = interact;
-}
-
-// AMD module name is "interact"
-declare module "interact" {
-    export = interact;
-}
diff --git a/types/interact.js/interact.js-tests.ts b/types/interact.js/interact.js-tests.ts
deleted file mode 100644
index f2a735e2da..0000000000
--- a/types/interact.js/interact.js-tests.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
-import interact = require("interact.js");
-
-var button: HTMLElement = document.createElement("BUTTON");
-var rectangle: ClientRect = {
-    left: 100,
-    width: 100,
-    right: 100,
-    top: 100,
-    bottom: 100,
-    height: 100
-};
-let context = document.createElement("a");
-let interactable = interact(".foo", {context: context});
-interactable = interact(button);
-
-interactable.draggable();
-interactable.draggable(true);
-interactable.draggable({
-    onstart: (event: Interact.InteractEvent) => {},
-    onmove : (event: Interact.InteractEvent) => {},
-    onend  : (event: Interact.InteractEvent) => {}
-});
-interactable.dropzone();
-interactable.dropzone(true);
-interactable.dropChecker(() => {});
-interactable.accept();
-interactable.accept("button");
-interactable.accept(button);
-interactable.resizable();
-interactable.resizable(true);
-interactable.squareResize();
-interactable.squareResize(true);
-interactable.gesturable();
-interactable.gesturable(true);
-interactable.gesturable({
-    onmove: () => {}
-});
-interactable.autoScroll();
-interactable.autoScroll(true);
-interactable.snap();
-interactable.snap(true);
-interactable.inertia();
-interactable.inertia({
-    resistance: 1
-});
-interactable.inertia(true);
-interactable.actionChecker();
-interactable.actionChecker((event: MouseEvent, defaultAction: string, interactable2: Interact.Interactable) => defaultAction);
-var rect: ClientRect = interactable.getRect();
-interactable.rectChecker();
-interactable.styleCursor();
-interactable.origin();
-interactable.origin({x: 0, y: 0});
-interactable.origin(button);
-interactable.deltaSource();
-interactable.deltaSource("client");
-interactable.restrict();
-interactable.restrict({
-    "drag": button,
-    "resize": button,
-    "gesture": button
-});
-interactable.context();
-interactable.ignoreFrom();
-interactable.ignoreFrom("button");
-interactable.ignoreFrom(button);
-interactable.validateSetting("restrict", "drag", button);
-interactable.element();
-interactable.on("click", () => {}, true);
-interactable.off("click", () => {}, true);
-interactable.unset();
-
-interact.isSet(button);
-interact.on("click", () => {}, true);
-interact.off("click", () => {}, true);
-interact.enableDragging();
-interact.enableDragging(true);
-interact.enableResizing();
-interact.enableResizing(true);
-interact.enableGesturing();
-interact.enableGesturing(true);
-interact.debug();
-interact.margin();
-interact.margin(10);
-interact.styleCursor();
-interact.styleCursor(true);
-interact.autoScroll(true);
-interact.autoScroll();
-interact.snap();
-interact.snap(true);
-interact.snap({
-    mode: "grid"
-});
-interact.inertia();
-interact.inertia(true);
-interact.supportsTouch();
-interact.currentAction();
-interact.dynamicDrop();
-interact.dynamicDrop(true);
-interact.deltaSource();
-interact.deltaSource("page");
-
-interact.restrict({
-    "drag": rectangle,
-    "resize": rectangle,
-    "gesture": rectangle,
-    "elementRect": { top: 0, left: 0, bottom: 1, right: 1 }
-});
diff --git a/types/intercom-client/Company.d.ts b/types/intercom-client/Company.d.ts
new file mode 100644
index 0000000000..e0b218fb8c
--- /dev/null
+++ b/types/intercom-client/Company.d.ts
@@ -0,0 +1,31 @@
+
+export type CompanyIdentifier = { id: string } | { company_id: string }
+
+export interface Company {
+    readonly "type": "company",
+    readonly "id": string,
+    readonly app_id?: string,
+    company_id?: string,
+    plan?: string | { type: string, id: string, name: string },
+    remote_created_at?: number,
+    name?: string,
+    readonly "updated_at": number,
+    readonly "created_at": number,
+    size?: number,
+    website?: string,
+    industry?: string,
+    monthly_spend?: number,
+    session_count?: number, 
+    user_count?: number,
+    custom_attributes?: {
+        [key: string]: any
+    },
+    
+}
+
+export interface List {
+    "type": "company.list",
+    "total_count": number,
+    "companies": (Company & CompanyIdentifier)[],
+    "pages": { "next"?: string, "page": number, "per_page": number, "total_pages": number }
+}
\ No newline at end of file
diff --git a/types/intercom-client/Event.d.ts b/types/intercom-client/Event.d.ts
new file mode 100644
index 0000000000..d4e5832373
--- /dev/null
+++ b/types/intercom-client/Event.d.ts
@@ -0,0 +1,24 @@
+interface IntercomUserIdId { intercom_user_id: string }
+interface UserIdId { user_id: string }
+interface EmailIdId { email: string }
+
+export type EventIdentifier = IntercomUserIdId | UserIdId | EmailIdId;
+
+export interface Event extends Partial<UserIdId>, Partial<IntercomUserIdId>, Partial<EmailIdId> {
+  readonly id: string,
+  created_at: number,
+  event_name: string,
+  metadata?: any;
+}
+
+export type ListParam = EventIdentifier & {
+  type: 'user',
+  per_page?: number, // max 100
+}
+
+export interface List {
+  "type": "event.list",
+  "total_count": number,
+  "events": (Event)[],
+  "pages": { "next"?: string, "page": number, "per_page": number, "total_pages": number }
+}
diff --git a/types/intercom-client/IntercomError.d.ts b/types/intercom-client/IntercomError.d.ts
new file mode 100644
index 0000000000..c0ed687a3c
--- /dev/null
+++ b/types/intercom-client/IntercomError.d.ts
@@ -0,0 +1,14 @@
+
+export interface IntercomError {
+  statusCode: number,
+  body: {
+    type: "error.list",
+    request_id: string,
+    errors: Array<{
+      code: string, //"400",
+      message: string
+    }>
+  },
+  headers: { status: string } & { [k: string]: string }
+}
+
diff --git a/types/intercom-client/Scroll.d.ts b/types/intercom-client/Scroll.d.ts
new file mode 100644
index 0000000000..2704a4cfbe
--- /dev/null
+++ b/types/intercom-client/Scroll.d.ts
@@ -0,0 +1,3 @@
+export declare class Scroll<T> {
+
+}
\ No newline at end of file
diff --git a/types/intercom-client/Tag.d.ts b/types/intercom-client/Tag.d.ts
new file mode 100644
index 0000000000..0faebb074b
--- /dev/null
+++ b/types/intercom-client/Tag.d.ts
@@ -0,0 +1,30 @@
+import { UserIdentifier } from "./User";
+
+export interface TagIdentifier {
+  id: string
+}
+
+export interface Tag extends Partial<TagIdentifier> {
+  readonly type: "tag",
+  readonly id: string,
+  name: string,
+}
+
+export interface List {
+  "type": "tag.list",
+  "total_count": number,
+  "tags": (Tag)[],
+  "pages": { "next"?: string, "page": number, "per_page": number, "total_pages": number }
+}
+
+interface TagUsers {
+  name: string,
+  users: UserIdentifier[]
+}
+
+interface TagCompanies {
+  name: string,
+  users: { id: string }[]
+}
+
+type TagOper = TagCompanies | TagUsers;
diff --git a/types/intercom-client/User.d.ts b/types/intercom-client/User.d.ts
new file mode 100644
index 0000000000..5b5450f35d
--- /dev/null
+++ b/types/intercom-client/User.d.ts
@@ -0,0 +1,85 @@
+import { Company } from "./Company";
+
+export type UserIdentifier = { "id": string } | { "user_id": string } | { "email": string }
+
+export interface Avatar {
+    "type": "avatar",
+    "image_url": string | null
+}
+
+export interface SocialProfile {
+    "name": "Twitter",
+    readonly "id": string | null,
+    "username": string | null,
+    "url": string | null
+}
+
+export interface Segment {
+    readonly "id": string
+}
+
+export interface Tag {
+    readonly "id": string
+}
+
+export interface LocationData {
+    "type": "location_data",
+    "city_name": string | null,
+    "continent_code": string | null,
+    "country_code": string | null,
+    "country_name": string | null,
+    "latitude": number | null,
+    "longitude": number | null,
+    "postal_code": string | null,
+    "region_name": string | null,
+    "timezone": string | null
+}
+
+export interface User {
+    "type": "user" | "contact",
+    readonly "id": string,
+    "user_id": string | null,
+    "email": string | null,
+    "app_id"?: string,
+    "phone": string | null,
+    "name": string | null,
+    readonly "updated_at": number,
+    "last_seen_ip": string | null,
+    "unsubscribed_from_emails": boolean,
+    "last_request_at": number | null,
+    "signed_up_at": number | null,
+    readonly "created_at": number,
+    "session_count": number,
+    "user_agent_data": string | null,
+    "pseudonym": string | null,
+    "anonymous": boolean,
+    "custom_attributes": {
+        [key: string]: any
+    },
+    "avatar": Avatar,
+    "location_data": LocationData | {},
+    "social_profiles": {
+        "type": "social_profile.list",
+        "social_profiles": SocialProfile[]
+    },
+    "companies": {
+        "type": "company.list",
+        "companies": Company[]
+    },
+    "segments": {
+        "type": "segment.list",
+        "segments": Segment[]
+
+    },
+    "tags": {
+        "type": "tag.list",
+        "tags": Tag[]
+    }
+}
+
+export interface List {
+    "type": "user.list",
+    "total_count": number,
+    "users": User[],
+    "pages": { "next"?: string, "page": number, "per_page": number, "total_pages": number }
+}
\ No newline at end of file
diff --git a/types/intercom-client/index.d.ts b/types/intercom-client/index.d.ts
index b68dc87e71..25b166e10d 100644
--- a/types/intercom-client/index.d.ts
+++ b/types/intercom-client/index.d.ts
@@ -1,7 +1,20 @@
 // Type definitions for intercom-client 2.9
 // Project: https://github.com/intercom/intercom-node
-// Definitions by: Jinesh Shah <https://github.com/jineshshah36>
+// Definitions by: Jinesh Shah <https://github.com/jineshshah36>, Josef Hornych <https://github.com/peping>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+/// <reference types="node" />
+
+import { List as UserList, User, UserIdentifier } from './User';
+import { CompanyIdentifier, List as CompanyList, Company } from './Company';
+import { TagIdentifier, List as TagList, Tag, TagOper } from './Tag';
+import { List as EventList, Event, ListParam as EventListParam } from './Event';
+import { Scroll } from './Scroll';
+import { IntercomError } from './IntercomError';
+
+import { IncomingMessage } from 'http';
+
+export { IntercomError };
 
 export interface IdentityVerificationOptions {
     secretKey: string;
@@ -11,3 +24,88 @@ export interface IdentityVerificationOptions {
 export const IdentityVerification: {
     userHash(opts: IdentityVerificationOptions): string;
 };
+
+export class Client {
+    constructor(auth: { token: string } | { appId: string, appApiKey: string });
+    constructor(username: string, password: string);
+
+    users: Users;
+    companies: Companies;
+    tags: Tags;
+    events: Events;
+}
+
+export class ApiResponse<T> extends IncomingMessage {
+  body: T;
+}
+
+export type callback<T> = ((d: T) => void) | ((err: IntercomError, d: T) => void);
+
+export class Users {
+    create(user: Partial<User>): Promise<ApiResponse<User>>;
+    create(user: Partial<User>, cb: callback<ApiResponse<User>>): void;
+
+    update(user: UserIdentifier & Partial<User>): Promise<ApiResponse<User>>;
+    update(user: UserIdentifier & Partial<User>, cb: callback<ApiResponse<User>>): void;
+
+    find(identifier: UserIdentifier): Promise<ApiResponse<User>>;
+    find(identifier: UserIdentifier, cb: callback<ApiResponse<User>>): void;
+
+    list(): Promise<ApiResponse<User>>;
+    list(cb: callback<ApiResponse<User>>): void;
+
+    listBy(params: {tag_id?: string, segment_id?: string}): Promise<ApiResponse<UserList>>;
+    listBy(params: {tag_id?: string, segment_id?: string}, cb: callback<ApiResponse<UserList>>): void;
+
+    scroll: Scroll<User>;
+
+    archive(): Promise<User>;
+
+    requestPermanentDeletion(): Promise<{id: number}>;
+}
+
+export class Companies {
+    create(company: CompanyIdentifier & Partial<Company>): Promise<ApiResponse<Company>>;
+    create(company: CompanyIdentifier & Partial<Company>, cb: callback<ApiResponse<Company>>): void;
+
+    update(company: CompanyIdentifier & Partial<Company>): Promise<ApiResponse<Company>>;
+    update(company: CompanyIdentifier & Partial<Company>, cb: callback<ApiResponse<Company>>): void;
+
+    find(identifier: CompanyIdentifier): Promise<ApiResponse<Company>>;
+    find(identifier: CompanyIdentifier, cb: callback<ApiResponse<Company>>): void;
+
+    list(): Promise<ApiResponse<CompanyList>>;
+    list(cb: callback<ApiResponse<CompanyList>>): void;
+
+    listBy(params: {tag_id?: string, segment_id?: string}): Promise<ApiResponse<CompanyList>>;
+    listBy(params: {tag_id?: string, segment_id?: string}, cb: callback<ApiResponse<CompanyList>>): void;
+
+    scroll: Scroll<Company>;
+
+    archive(): Promise<Company>;
+}
+
+export class Tags {
+  create(tag: Partial<Tag>): Promise<ApiResponse<Tag>>;
+  create(tag: Partial<Tag>, cb: callback<ApiResponse<Tag>>): void;
+
+  tag(tagOper: TagOper): Promise<ApiResponse<Tag>>;
+  tag(tagOper: TagOper, cb: callback<ApiResponse<Tag>>): void;
+
+  untag(tagOper: TagOper): Promise<ApiResponse<Tag>>;
+  untag(tagOper: TagOper, cb: callback<ApiResponse<Tag>>): void;
+
+  delete(tag: TagIdentifier): Promise<IncomingMessage>;
+  delete(tag: TagIdentifier, cb: callback<IncomingMessage>): void;
+
+  list(): Promise<ApiResponse<TagList>>;
+  list(cb: callback<ApiResponse<TagList>>): void;
+}
+
+export class Events {
+    create(event: Partial<Event>): Promise<IncomingMessage>;
+    create(event: Partial<Event>, cb: callback<IncomingMessage>): void;
+
+    listBy(params: EventListParam): Promise<ApiResponse<CompanyList>>;
+    listBy(params: EventListParam, cb: callback<ApiResponse<CompanyList>>): void;
+}
diff --git a/types/intercom-web/index.d.ts b/types/intercom-web/index.d.ts
index 563d241c31..eb2157d7c7 100755
--- a/types/intercom-web/index.d.ts
+++ b/types/intercom-web/index.d.ts
@@ -21,7 +21,7 @@ declare namespace Intercom_ {
       activator?: string;
     };
     company?: {
-      id: string|number,
+      id: string | number,
       name: string,
       created_at: number,
       plan?: string,
@@ -33,16 +33,17 @@ declare namespace Intercom_ {
   }
 
   type IntercomCommand = 'boot'
-    |'shutdown'
-    |'update'
-    |'hide'
-    |'show'
-    |'showMessages'
-    |'showNewMessage'
-    |'onHide'
-    |'onShow'
-    |'onActivatorClick'
-    |'trackEvent';
+    | 'shutdown'
+    | 'update'
+    | 'hide'
+    | 'show'
+    | 'showMessages'
+    | 'showNewMessage'
+    | 'onHide'
+    | 'onShow'
+    | 'onUnreadCountChange'
+    | 'onActivatorClick'
+    | 'trackEvent';
 
   interface IntercomStatic {
     (command: 'boot', param: IntercomSettings): void;
@@ -51,6 +52,7 @@ declare namespace Intercom_ {
     (command: 'showNewMessage', param?: string): void;
     (command: 'onHide' | 'onShow' | 'onActivatorClick', param?: () => void): void;
     (command: 'trackEvent', tag?: string, metadata?: any): void;
+    (command: 'onUnreadCountChange', cb: (unreadCount: number) => void): void;
     (command: IntercomCommand, param1?: any, param2?: any): void;
   }
 }
diff --git a/types/intercom-web/intercom-web-tests.ts b/types/intercom-web/intercom-web-tests.ts
index b07013322d..425aa74be4 100755
--- a/types/intercom-web/intercom-web-tests.ts
+++ b/types/intercom-web/intercom-web-tests.ts
@@ -23,6 +23,7 @@ Intercom('showMessages');
 Intercom('showNewMessage');
 Intercom('showNewMessage', 'pre-populated content');
 Intercom('onHide', () => { /* Do stuff */ });
+Intercom('onUnreadCountChange', (unreadCount: number) => { /* Do stuff */ });
 Intercom('onActivatorClick', () => { /* Do stuff */ });
 Intercom('trackEvent', 'invited-friend');
 
diff --git a/types/intl-relativeformat/index.d.ts b/types/intl-relativeformat/index.d.ts
new file mode 100644
index 0000000000..7c2fc0e57c
--- /dev/null
+++ b/types/intl-relativeformat/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for intl-relativeformat 2.1
+// Project: https://github.com/yahoo/intl-relativeformat
+// Definitions by: Mohsen Azimi <https://github.com/mohsen1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/**
+ * This package aims to provide a way to format different variations of relative time.
+ * You can use this package in the browser and on the server via Node.js.
+ *
+ * This implementation is very similar to moment.js, in concept, although it provides
+ * only formatting features based on the Unicode CLDR locale data, an industry
+ * standard that supports more than 200 languages.
+ *
+ * @see https://github.com/yahoo/intl-relativeformat
+ */
+export default class IntlRelativeFormat {
+    /**
+     * To format a date to relative time, use the IntlRelativeFormat constructor.
+     * The constructor takes two parameters:
+     *
+     * @param locales A string with a BCP 47 language tag, or an array of
+     * such strings. If you do not provide a locale, the default locale will be used.
+     * When an array of locales is provided, each item and its ancestor locales are checked
+     * and the first one with registered locale data is returned. See: Locale Resolution
+     * for more details.
+     * @see https://github.com/yahoo/intl-relativeformat#locale-resolution
+     *
+     * @param optionas object with user defined options for format styles.
+     * See: Custom Options for more details.
+     * @see https://github.com/yahoo/intl-relativeformat#custom-options
+     * Note: The rf instance should be enough for your entire application,
+     * unless you want to use custom options.
+     */
+    constructor(
+        locales: string | string[],
+        options?: Intl.DateTimeFormatOptions & {
+            /**
+             * By default, the relative time is computed to the best fit unit,
+             * but you can explicitly call it to force units to be displayed in
+             * "second", "second-short", "minute", "minute-short", "hour",
+             * "hour-short", "day", "day-short", "month", "month-short",
+             * "year" or "year-short":
+             */
+            units?:
+                | "second"
+                | "second-short"
+                | "minute"
+                | "minute-short"
+                | "hour"
+                | "hour-short"
+                | "day"
+                | "day-short"
+                | "month"
+                | "month-short"
+                | "year"
+                | "year-short";
+
+            /**
+             * By default, the relative time is computed as "best fit",
+             * which means that instead of "1 day ago", it will display "yesterday",
+             * or "in 1 year" will be "next year", etc. But you can force to always
+             * use the "numeric" alternative:
+             */
+            style?: "best fit" | "numeric";
+        }
+    );
+
+    /**
+     * This method returns an object with the options values that were resolved
+     * during instance creation. It currently only contains a locale property
+     *
+     *     var rf = new IntlRelativeFormat('en-us');
+     *     console.log(rf.resolvedOptions().locale); // => "en-US"
+     *
+     * Notice how the specified locale was the all lower-case value: "en-us",
+     * but it was resolved and normalized to: "en-US".
+     */
+    resolvedOptions(): { locale: string };
+
+    /**
+     * The format method (which takes a JavaScript date or timestamp) and optional
+     * options arguments will compare the date with "now" (or options.now),
+     * and returns the formatted string; e.g., "3 hours ago" in the corresponding
+     * locale passed into the constructor.
+     *
+     *    var output = rf.format(new Date());
+     *    console.log(output); // => "now"
+     *
+     * If you wish to specify a "now" value, it can be provided via options.now and
+     *  will be used instead of querying Date.now() to get the current "now" value.
+     */
+    format(date: Date, options?: { now?: Date }): string;
+}
diff --git a/types/intl-relativeformat/intl-relativeformat-tests.ts b/types/intl-relativeformat/intl-relativeformat-tests.ts
new file mode 100644
index 0000000000..ca3d8280ca
--- /dev/null
+++ b/types/intl-relativeformat/intl-relativeformat-tests.ts
@@ -0,0 +1,16 @@
+import IntlRelativeFormat from "intl-relativeformat";
+
+let dateFormatter = new IntlRelativeFormat("en-US");
+
+dateFormatter = new IntlRelativeFormat("en-US", {
+    units: "day"
+});
+dateFormatter = new IntlRelativeFormat("en-US", {
+    units: "day",
+    style: "numeric"
+});
+
+console.log(dateFormatter.resolvedOptions().locale);
+
+dateFormatter.format(new Date());
+dateFormatter.format(new Date(), { now: new Date() });
diff --git a/types/intl-relativeformat/tsconfig.json b/types/intl-relativeformat/tsconfig.json
new file mode 100644
index 0000000000..bfd9297169
--- /dev/null
+++ b/types/intl-relativeformat/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "intl-relativeformat-tests.ts"]
+}
diff --git a/types/intl-relativeformat/tslint.json b/types/intl-relativeformat/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/intl-relativeformat/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/intrinsic-scale/index.d.ts b/types/intrinsic-scale/index.d.ts
new file mode 100644
index 0000000000..56100aeb25
--- /dev/null
+++ b/types/intrinsic-scale/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for intrinsic-scale 3.0
+// Project: https://github.com/bfred-it/intrinsic-scale#readme
+// Definitions by: shalomdotnet <https://github.com/shalomdotnet>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function contain(parentWidth: number, parentHeight: number, childWidth: number, childHeight: number): IntrinsicScale;
+export function cover(parentWidth: number, parentHeight: number, childWidth: number, childHeight: number): IntrinsicScale;
+
+export interface IntrinsicScale {
+    width: number;
+    height: number;
+    x: number;
+    y: number;
+}
diff --git a/types/intrinsic-scale/intrinsic-scale-tests.ts b/types/intrinsic-scale/intrinsic-scale-tests.ts
new file mode 100644
index 0000000000..23c450572b
--- /dev/null
+++ b/types/intrinsic-scale/intrinsic-scale-tests.ts
@@ -0,0 +1,4 @@
+import { cover, contain } from "intrinsic-scale";
+
+const intrinsicScale = cover(100, 100, 50, 50);
+const { x, y, width, height } = contain(1, 2, 3, 4);
diff --git a/types/intrinsic-scale/tsconfig.json b/types/intrinsic-scale/tsconfig.json
new file mode 100644
index 0000000000..8fcff6913d
--- /dev/null
+++ b/types/intrinsic-scale/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",
+        "intrinsic-scale-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/intrinsic-scale/tslint.json b/types/intrinsic-scale/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/intrinsic-scale/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ioredis/index.d.ts b/types/ioredis/index.d.ts
index 84ca51982a..017fc04505 100644
--- a/types/ioredis/index.d.ts
+++ b/types/ioredis/index.d.ts
@@ -1,21 +1,23 @@
-// Type definitions for ioredis 3.2
+// Type definitions for ioredis 4.0
 // Project: https://github.com/luin/ioredis
 // 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>
+//                 Whemoon Jang <https://github.com/palindrom615>
+//                 Francis Gulotta <https://github.com/reconbot>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /* =================== USAGE ===================
     import * as Redis from "ioredis";
-    var redis = new Redis();
+    const redis = new Redis();
  =============================================== */
 
 /// <reference types="node" />
 
-import Promise = require('bluebird');
+import tls = require('tls');
 
 interface RedisStatic {
     new(port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
@@ -42,6 +44,8 @@ declare class Commander {
 }
 
 declare namespace IORedis {
+    type KeyType = string | Buffer;
+
     interface Command {
         setArgumentTransformer(name: string, fn: (args: any[]) => any[]): void;
         setReplyTransformer(name: string, fn: (result: any) => any): void;
@@ -56,240 +60,257 @@ declare namespace IORedis {
 
         send_command(command: string, ...args: 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>;
+        bitcount(key: KeyType, callback: (err: Error, res: number) => void): void;
+        bitcount(key: KeyType, start: number, end: number, callback: (err: Error, res: number) => void): void;
+        bitcount(key: KeyType): Promise<number>;
+        bitcount(key: KeyType, 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>;
+        get(key: KeyType, callback: (err: Error, res: string) => void): void;
+        get(key: KeyType): Promise<string>;
 
-        set(key: string, value: any, ...args: any[]): any;
+        getBuffer(key: KeyType, callback: (err: Error, res: Buffer) => void): void;
+        getBuffer(key: KeyType): Promise<Buffer>;
 
-        setnx(key: string, value: any, callback: (err: Error, res: any) => void): void;
-        setnx(key: string, value: any): Promise<any>;
+        set(key: KeyType, value: any, expiryMode?: string | any[], time?: number | string, setMode?: number | string): Promise<string>;
 
-        setex(key: string, seconds: number, value: any, callback: (err: Error, res: any) => void): void;
-        setex(key: string, seconds: number, value: any): Promise<any>;
+        set(key: KeyType, value: any, callback: (err: Error, res: string) => void): void;
+        set(key: KeyType, value: any, setMode: string | any[], callback: (err: Error, res: string) => void): void;
+        set(key: KeyType, value: any, expiryMode: string, time: number | string, callback: (err: Error, res: string) => void): void;
+        set(key: KeyType, value: any, expiryMode: string, time: number | string, setMode: number | string, callback: (err: Error, res: string) => void): void;
 
-        psetex(key: string, milliseconds: number, value: any, callback: (err: Error, res: any) => void): void;
-        psetex(key: string, milliseconds: number, value: any): Promise<any>;
+        setBuffer(key: KeyType, value: any, expiryMode?: string | any[], time?: number | string, setMode?: number | string): Promise<Buffer>;
 
-        append(key: string, value: any, callback: (err: Error, res: number) => void): void;
-        append(key: string, value: any): Promise<number>;
+        setBuffer(key: KeyType, value: any, callback: (err: Error, res: Buffer) => void): void;
+        setBuffer(key: KeyType, value: any, setMode: string, callback: (err: Error, res: Buffer) => void): void;
+        setBuffer(key: KeyType, value: any, expiryMode: string, time: number, callback: (err: Error, res: Buffer) => void): void;
+        setBuffer(key: KeyType, value: any, expiryMode: string, time: number | string, setMode: number | string, callback: (err: Error, res: Buffer) => void): void;
 
-        strlen(key: string, callback: (err: Error, res: number) => void): void;
-        strlen(key: string): Promise<number>;
+        setnx(key: KeyType, value: any, callback: (err: Error, res: any) => void): void;
+        setnx(key: KeyType, value: any): Promise<any>;
 
-        del(...keys: string[]): any;
+        setex(key: KeyType, seconds: number, value: any, callback: (err: Error, res: any) => void): void;
+        setex(key: KeyType, seconds: number, value: any): Promise<any>;
 
-        exists(...keys: string[]): any;
+        psetex(key: KeyType, milliseconds: number, value: any, callback: (err: Error, res: any) => void): void;
+        psetex(key: KeyType, milliseconds: number, value: any): Promise<any>;
 
-        setbit(key: string, offset: number, value: any, callback: (err: Error, res: number) => void): void;
-        setbit(key: string, offset: number, value: any): Promise<number>;
+        append(key: KeyType, value: any, callback: (err: Error, res: number) => void): void;
+        append(key: KeyType, value: any): Promise<number>;
 
-        getbit(key: string, offset: number, callback: (err: Error, res: number) => void): void;
-        getbit(key: string, offset: number): Promise<number>;
+        strlen(key: KeyType, callback: (err: Error, res: number) => void): void;
+        strlen(key: KeyType): 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>;
+        del(...keys: KeyType[]): any;
 
-        getrange(key: string, start: number, end: number, callback: (err: Error, res: string) => void): void;
-        getrange(key: string, start: number, end: number): Promise<string>;
+        exists(...keys: KeyType[]): any;
 
-        substr(key: string, start: number, end: number, callback: (err: Error, res: string) => void): void;
-        substr(key: string, start: number, end: number): Promise<string>;
+        setbit(key: KeyType, offset: number, value: any, callback: (err: Error, res: number) => void): void;
+        setbit(key: KeyType, offset: number, value: any): Promise<number>;
 
-        incr(key: string, callback: (err: Error, res: number) => void): void;
-        incr(key: string): Promise<number>;
+        getbit(key: KeyType, offset: number, callback: (err: Error, res: number) => void): void;
+        getbit(key: KeyType, offset: number): Promise<number>;
 
-        decr(key: string, callback: (err: Error, res: number) => void): void;
-        decr(key: string): Promise<number>;
+        setrange(key: KeyType, offset: number, value: any, callback: (err: Error, res: number) => void): void;
+        setrange(key: KeyType, offset: number, value: any): Promise<number>;
 
-        mget(...keys: string[]): any;
+        getrange(key: KeyType, start: number, end: number, callback: (err: Error, res: string) => void): void;
+        getrange(key: KeyType, start: number, end: number): Promise<string>;
 
-        rpush(key: string, ...values: any[]): any;
+        substr(key: KeyType, start: number, end: number, callback: (err: Error, res: string) => void): void;
+        substr(key: KeyType, start: number, end: number): Promise<string>;
 
-        lpush(key: string, ...values: any[]): any;
+        incr(key: KeyType, callback: (err: Error, res: number) => void): void;
+        incr(key: KeyType): Promise<number>;
 
-        rpushx(key: string, value: any, callback: (err: Error, res: number) => void): void;
-        rpushx(key: string, value: any): Promise<number>;
+        decr(key: KeyType, callback: (err: Error, res: number) => void): void;
+        decr(key: KeyType): Promise<number>;
 
-        lpushx(key: string, value: any, callback: (err: Error, res: number) => void): void;
-        lpushx(key: string, value: any): Promise<number>;
+        mget(...keys: KeyType[]): any;
 
-        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>;
+        rpush(key: KeyType, ...values: any[]): any;
 
-        rpop(key: string, callback: (err: Error, res: string) => void): void;
-        rpop(key: string): Promise<string>;
+        lpush(key: KeyType, ...values: any[]): any;
 
-        lpop(key: string, callback: (err: Error, res: string) => void): void;
-        lpop(key: string): Promise<string>;
+        rpushx(key: KeyType, value: any, callback: (err: Error, res: number) => void): void;
+        rpushx(key: KeyType, value: any): Promise<number>;
 
-        brpop(...keys: string[]): any;
+        lpushx(key: KeyType, value: any, callback: (err: Error, res: number) => void): void;
+        lpushx(key: KeyType, value: any): Promise<number>;
 
-        blpop(...keys: string[]): any;
+        linsert(key: KeyType, direction: "BEFORE" | "AFTER", pivot: string, value: any, callback: (err: Error, res: number) => void): void;
+        linsert(key: KeyType, direction: "BEFORE" | "AFTER", pivot: string, value: any): Promise<number>;
+
+        rpop(key: KeyType, callback: (err: Error, res: string) => void): void;
+        rpop(key: KeyType): Promise<string>;
+
+        lpop(key: KeyType, callback: (err: Error, res: string) => void): void;
+        lpop(key: KeyType): Promise<string>;
+
+        brpop(...keys: KeyType[]): any;
+
+        blpop(...keys: KeyType[]): 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>;
+        llen(key: KeyType, callback: (err: Error, res: number) => void): void;
+        llen(key: KeyType): Promise<number>;
 
-        lindex(key: string, index: number, callback: (err: Error, res: string) => void): void;
-        lindex(key: string, index: number): Promise<string>;
+        lindex(key: KeyType, index: number, callback: (err: Error, res: string) => void): void;
+        lindex(key: KeyType, 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>;
+        lset(key: KeyType, index: number, value: any, callback: (err: Error, res: any) => void): void;
+        lset(key: KeyType, 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>;
+        lrange(key: KeyType, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        lrange(key: KeyType, 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>;
+        ltrim(key: KeyType, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        ltrim(key: KeyType, 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>;
+        lrem(key: KeyType, count: number, value: any, callback: (err: Error, res: number) => void): void;
+        lrem(key: KeyType, 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;
+        sadd(key: KeyType, ...members: any[]): any;
 
-        srem(key: string, ...members: any[]): any;
+        srem(key: KeyType, ...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>;
+        sismember(key: KeyType, member: string, callback: (err: Error, res: 1 | 0) => void): void;
+        sismember(key: KeyType, member: string): Promise<1 | 0>;
 
-        scard(key: string, callback: (err: Error, res: number) => void): void;
-        scard(key: string): Promise<number>;
+        scard(key: KeyType, callback: (err: Error, res: number) => void): void;
+        scard(key: KeyType): 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>;
+        spop(key: KeyType, callback: (err: Error, res: any) => void): void;
+        spop(key: KeyType, count: number, callback: (err: Error, res: any) => void): void;
+        spop(key: KeyType, 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>;
+        srandmember(key: KeyType, callback: (err: Error, res: any) => void): void;
+        srandmember(key: KeyType, count: number, callback: (err: Error, res: any) => void): void;
+        srandmember(key: KeyType, count?: number): Promise<any>;
 
-        sinter(...keys: string[]): any;
+        sinter(...keys: KeyType[]): any;
 
-        sinterstore(destination: string, ...keys: string[]): any;
+        sinterstore(destination: string, ...keys: KeyType[]): any;
 
-        sunion(...keys: string[]): any;
+        sunion(...keys: KeyType[]): any;
 
-        sunionstore(destination: string, ...keys: string[]): any;
+        sunionstore(destination: string, ...keys: KeyType[]): any;
 
-        sdiff(...keys: string[]): any;
+        sdiff(...keys: KeyType[]): any;
 
-        sdiffstore(destination: string, ...keys: string[]): any;
+        sdiffstore(destination: string, ...keys: KeyType[]): any;
 
-        smembers(key: string, callback: (err: Error, res: any) => void): void;
-        smembers(key: string): Promise<any>;
+        smembers(key: KeyType, callback: (err: Error, res: any) => void): void;
+        smembers(key: KeyType): Promise<any>;
 
-        zadd(key: string, ...args: string[]): any;
+        zadd(key: KeyType, ...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>;
+        zincrby(key: KeyType, increment: number, member: string, callback: (err: Error, res: any) => void): void;
+        zincrby(key: KeyType, increment: number, member: string): Promise<any>;
 
-        zrem(key: string, ...members: any[]): any;
+        zrem(key: KeyType, ...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>;
+        zremrangebyscore(key: KeyType, min: number | string, max: number | string, callback: (err: Error, res: any) => void): void;
+        zremrangebyscore(key: KeyType, 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>;
+        zremrangebyrank(key: KeyType, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        zremrangebyrank(key: KeyType, start: number, stop: number): Promise<any>;
 
-        zunionstore(destination: string, numkeys: number, key: string, ...args: string[]): any;
+        zunionstore(destination: string, numkeys: number, key: KeyType, ...args: string[]): any;
 
-        zinterstore(destination: string, numkeys: number, key: string, ...args: string[]): any;
+        zinterstore(destination: string, numkeys: number, key: KeyType, ...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>;
+        zrange(key: KeyType, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        zrange(key: KeyType, start: number, stop: number, withScores: "WITHSCORES", callback: (err: Error, res: any) => void): void;
+        zrange(key: KeyType, 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>;
+        zrevrange(key: KeyType, start: number, stop: number, callback: (err: Error, res: any) => void): void;
+        zrevrange(key: KeyType, start: number, stop: number, withScores: "WITHSCORES", callback: (err: Error, res: any) => void): void;
+        zrevrange(key: KeyType, start: number, stop: number, withScores?: "WITHSCORES"): Promise<any>;
 
-        zrangebyscore(key: string, min: number | string, max: number | string, ...args: string[]): any;
+        zrangebyscore(key: KeyType, min: number | string, max: number | string, ...args: string[]): any;
 
-        zrevrangebyscore(key: string, max: number | string, min: number | string, ...args: string[]): any;
+        zrevrangebyscore(key: KeyType, 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>;
+        zcount(key: KeyType, min: number | string, max: number | string, callback: (err: Error, res: number) => void): void;
+        zcount(key: KeyType, min: number | string, max: number | string): Promise<number>;
 
-        zcard(key: string, callback: (err: Error, res: number) => void): void;
-        zcard(key: string): Promise<number>;
+        zcard(key: KeyType, callback: (err: Error, res: number) => void): void;
+        zcard(key: KeyType): Promise<number>;
 
-        zscore(key: string, member: string, callback: (err: Error, res: number) => void): void;
-        zscore(key: string, member: string): Promise<number>;
+        zscore(key: KeyType, member: string, callback: (err: Error, res: string) => void): void;
+        zscore(key: KeyType, member: string): Promise<string>;
 
-        zrank(key: string, member: string, callback: (err: Error, res: number) => void): void;
-        zrank(key: string, member: string): Promise<number>;
+        zrank(key: KeyType, member: string, callback: (err: Error, res: number) => void): void;
+        zrank(key: KeyType, member: string): Promise<number>;
 
-        zrevrank(key: string, member: string, callback: (err: Error, res: number) => void): void;
-        zrevrank(key: string, member: string): Promise<number>;
+        zrevrank(key: KeyType, member: string, callback: (err: Error, res: number) => void): void;
+        zrevrank(key: KeyType, 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>;
+        hset(key: KeyType, field: string, value: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hset(key: KeyType, field: string, value: any): Promise<0 | 1>;
+        hsetBuffer(key: KeyType, field: string, value: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hsetBuffer(key: KeyType, field: string, value: any): Promise<Buffer>;
 
-        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>;
+        hsetnx(key: KeyType, field: string, value: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hsetnx(key: KeyType, 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>;
+        hget(key: KeyType, field: string, callback: (err: Error, res: string) => void): void;
+        hget(key: KeyType, field: string): Promise<string>;
+        hgetBuffer(key: KeyType, field: string, callback: (err: Error, res: Buffer) => void): void;
+        hgetBuffer(key: KeyType, field: string): Promise<Buffer>;
 
-        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>;
+        hmset(key: KeyType, field: string, value: any, ...args: string[]): Promise<0 | 1>;
+        hmset(key: KeyType, data: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hmset(key: KeyType, data: any): Promise<0 | 1>;
 
-        hmget(key: string, ...fields: string[]): any;
+        hmget(key: KeyType, ...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>;
+        hincrby(key: KeyType, field: string, increment: number, callback: (err: Error, res: number) => void): void;
+        hincrby(key: KeyType, 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>;
+        hincrbyfloat(key: KeyType, field: string, increment: number, callback: (err: Error, res: number) => void): void;
+        hincrbyfloat(key: KeyType, field: string, increment: number): Promise<number>;
 
-        hdel(key: string, ...fields: string[]): any;
+        hdel(key: KeyType, ...fields: string[]): any;
 
-        hlen(key: string, callback: (err: Error, res: number) => void): void;
-        hlen(key: string): Promise<number>;
+        hlen(key: KeyType, callback: (err: Error, res: number) => void): void;
+        hlen(key: KeyType): Promise<number>;
 
-        hkeys(key: string, callback: (err: Error, res: any) => void): void;
-        hkeys(key: string): Promise<any>;
+        hkeys(key: KeyType, callback: (err: Error, res: any) => void): void;
+        hkeys(key: KeyType): Promise<any>;
 
-        hvals(key: string, callback: (err: Error, res: any) => void): void;
-        hvals(key: string): Promise<any>;
+        hvals(key: KeyType, callback: (err: Error, res: any) => void): void;
+        hvals(key: KeyType): Promise<any>;
 
-        hgetall(key: string, callback: (err: Error, res: any) => void): void;
-        hgetall(key: string): Promise<any>;
+        hgetall(key: KeyType, callback: (err: Error, res: any) => void): void;
+        hgetall(key: KeyType): Promise<any>;
 
-        hexists(key: string, field: string, callback: (err: Error, res: 0 | 1) => void): void;
-        hexists(key: string, field: string): Promise<0 | 1>;
+        hexists(key: KeyType, field: string, callback: (err: Error, res: 0 | 1) => void): void;
+        hexists(key: KeyType, field: string): Promise<0 | 1>;
 
-        incrby(key: string, increment: number, callback: (err: Error, res: number) => void): void;
-        incrby(key: string, increment: number): Promise<number>;
+        incrby(key: KeyType, increment: number, callback: (err: Error, res: number) => void): void;
+        incrby(key: KeyType, increment: number): Promise<number>;
 
-        incrbyfloat(key: string, increment: number, callback: (err: Error, res: number) => void): void;
-        incrbyfloat(key: string, increment: number): Promise<number>;
+        incrbyfloat(key: KeyType, increment: number, callback: (err: Error, res: number) => void): void;
+        incrbyfloat(key: KeyType, increment: number): Promise<number>;
 
-        decrby(key: string, decrement: number, callback: (err: Error, res: number) => void): void;
-        decrby(key: string, decrement: number): Promise<number>;
+        decrby(key: KeyType, decrement: number, callback: (err: Error, res: number) => void): void;
+        decrby(key: KeyType, decrement: number): Promise<number>;
 
-        getset(key: string, value: any, callback: (err: Error, res: string) => void): void;
-        getset(key: string, value: any): Promise<string>;
+        getset(key: KeyType, value: any, callback: (err: Error, res: string) => void): void;
+        getset(key: KeyType, value: any): Promise<string>;
 
-        mset(key: string, value: any, ...args: string[]): any;
+        mset(key: KeyType, value: any, ...args: string[]): any;
 
-        msetnx(key: string, value: any, ...args: string[]): any;
+        msetnx(key: KeyType, value: any, ...args: string[]): any;
 
         randomkey(callback: (err: Error, res: string) => void): void;
         randomkey(): Promise<string>;
@@ -297,26 +318,26 @@ declare namespace IORedis {
         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>;
+        move(key: KeyType, db: string, callback: (err: Error, res: 0 | 1) => void): void;
+        move(key: KeyType, db: string): Promise<0 | 1>;
 
-        rename(key: string, newkey: string, callback: (err: Error, res: string) => void): void;
-        rename(key: string, newkey: string): Promise<string>;
+        rename(key: KeyType, newkey: KeyType, callback: (err: Error, res: string) => void): void;
+        rename(key: KeyType, newkey: KeyType): Promise<string>;
 
-        renamenx(key: string, newkey: string, callback: (err: Error, res: 0 | 1) => void): void;
-        renamenx(key: string, newkey: string): Promise<0 | 1>;
+        renamenx(key: KeyType, newkey: KeyType, callback: (err: Error, res: 0 | 1) => void): void;
+        renamenx(key: KeyType, newkey: KeyType): Promise<0 | 1>;
 
-        expire(key: string, seconds: number, callback: (err: Error, res: 0 | 1) => void): void;
-        expire(key: string, seconds: number): Promise<0 | 1>;
+        expire(key: KeyType, seconds: number, callback: (err: Error, res: 0 | 1) => void): void;
+        expire(key: KeyType, 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>;
+        pexpire(key: KeyType, milliseconds: number, callback: (err: Error, res: 0 | 1) => void): void;
+        pexpire(key: KeyType, 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>;
+        expireat(key: KeyType, timestamp: number, callback: (err: Error, res: 0 | 1) => void): void;
+        expireat(key: KeyType, 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>;
+        pexpireat(key: KeyType, millisecondsTimestamp: number, callback: (err: Error, res: 0 | 1) => void): void;
+        pexpireat(key: KeyType, millisecondsTimestamp: number): Promise<0 | 1>;
 
         keys(pattern: string, callback: (err: Error, res: string[]) => void): void;
         keys(pattern: string): Promise<string[]>;
@@ -349,8 +370,8 @@ declare namespace IORedis {
         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>;
+        type(key: KeyType, callback: (err: Error, res: string) => void): void;
+        type(key: KeyType): Promise<string>;
 
         multi(commands?: string[][], options?: MultiOptions): Pipeline;
         multi(options: { pipeline: false }): Promise<string>;
@@ -370,7 +391,7 @@ declare namespace IORedis {
         flushall(callback: (err: Error, res: string) => void): void;
         flushall(): Promise<string>;
 
-        sort(key: string, ...args: string[]): any;
+        sort(key: KeyType, ...args: string[]): any;
 
         info(callback: (err: Error, res: any) => void): void;
         info(section: string, callback: (err: Error, res: any) => void): void;
@@ -382,11 +403,11 @@ declare namespace IORedis {
         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>;
+        ttl(key: KeyType, callback: (err: Error, res: number) => void): void;
+        ttl(key: KeyType): Promise<number>;
 
-        persist(key: string, callback: (err: Error, res: 0 | 1) => void): void;
-        persist(key: string): Promise<0 | 1>;
+        persist(key: KeyType, callback: (err: Error, res: 0 | 1) => void): void;
+        persist(key: KeyType): Promise<0 | 1>;
 
         slaveof(host: string, port: number, callback: (err: Error, res: string) => void): void;
         slaveof(host: string, port: number): Promise<string>;
@@ -406,7 +427,7 @@ declare namespace IORedis {
         publish(channel: string, message: string, callback: (err: Error, res: number) => void): void;
         publish(channel: string, message: string): Promise<number>;
 
-        watch(...keys: string[]): any;
+        watch(...keys: KeyType[]): any;
 
         unwatch(callback: (err: Error, res: string) => void): void;
         unwatch(): Promise<string>;
@@ -417,8 +438,8 @@ declare namespace IORedis {
 
         migrate(...args: any[]): any;
 
-        dump(key: string, callback: (err: Error, res: string) => void): void;
-        dump(key: string): Promise<string>;
+        dump(key: KeyType, callback: (err: Error, res: string) => void): void;
+        dump(key: KeyType): Promise<string>;
 
         object(subcommand: string, ...args: any[]): any;
 
@@ -435,216 +456,236 @@ declare namespace IORedis {
 
         scan(cursor: number, ...args: any[]): any;
 
-        hscan(key: string, cursor: number, ...args: any[]): any;
+        sscan(key: KeyType, cursor: number, ...args: any[]): any;
 
-        zscan(key: string, cursor: number, ...args: any[]): any;
+        hscan(key: KeyType, cursor: number, ...args: any[]): any;
 
-        pfmerge(destkey: string, ...sourcekeys: string[]): any;
+        zscan(key: KeyType, cursor: number, ...args: any[]): any;
 
-        pfadd(key: string, ...elements: string[]): any;
+        pfmerge(destkey: KeyType, ...sourcekeys: KeyType[]): any;
 
-        pfcount(...keys: string[]): any;
+        pfadd(key: KeyType, ...elements: string[]): any;
+
+        pfcount(...keys: KeyType[]): any;
 
         pipeline(commands?: string[][]): Pipeline;
 
         scanStream(options?: ScanStreamOption): NodeJS.EventEmitter;
-        hscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
-        zscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
+        sscanStream(key: KeyType, options?: ScanStreamOption): NodeJS.EventEmitter;
+        hscanStream(key: KeyType, options?: ScanStreamOption): NodeJS.EventEmitter;
+        zscanStream(key: KeyType, options?: ScanStreamOption): NodeJS.EventEmitter;
     }
 
     interface Pipeline {
-        bitcount(key: string, callback?: (err: Error, res: number) => void): Pipeline;
-        bitcount(key: string, start: number, end: number, callback?: (err: Error, res: number) => void): Pipeline;
+        redis: Redis;
+        isCluster: boolean;
+        options: RedisOptions;
+        _queue: Command[];
+        _result: any[];
+        _transactions: number;
+        _shaToScript: {};
+        bitcount(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
+        bitcount(key: KeyType, 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;
+        get(key: KeyType, callback?: (err: Error, res: string) => void): Pipeline;
+        getBuffer(key: KeyType, callback?: (err: Error, res: Buffer) => void): Pipeline;
 
-        set(key: string, value: any, ...args: any[]): Pipeline;
+        set(key: KeyType, value: any, callback?: (err: Error, res: string) => void): Pipeline;
+        set(key: KeyType, value: any, setMode: string, callback?: (err: Error, res: string) => void): Pipeline;
+        set(key: KeyType, value: any, expiryMode: string, time: number, callback?: (err: Error, res: string) => void): Pipeline;
+        set(key: KeyType, value: any, expiryMode: string, time: number, setMode: string, callback?: (err: Error, res: string) => void): Pipeline;
 
-        setnx(key: string, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+        setBuffer(key: KeyType, value: any, callback?: (err: Error, res: Buffer) => void): Pipeline;
+        setBuffer(key: KeyType, value: any, setMode: string, callback?: (err: Error, res: Buffer) => void): Pipeline;
+        setBuffer(key: KeyType, value: any, expiryMode: string, time: number, callback?: (err: Error, res: Buffer) => void): Pipeline;
+        setBuffer(key: KeyType, value: any, expiryMode: string, time: number, setMode: string, callback?: (err: Error, res: Buffer) => void): Pipeline;
 
-        setex(key: string, seconds: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+        setnx(key: KeyType, value: any, callback?: (err: Error, res: any) => void): Pipeline;
 
-        psetex(key: string, milliseconds: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+        setex(key: KeyType, seconds: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
 
-        append(key: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+        psetex(key: KeyType, milliseconds: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
 
-        strlen(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        append(key: KeyType, value: any, callback?: (err: Error, res: number) => void): Pipeline;
 
-        del(...keys: string[]): Pipeline;
+        strlen(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        exists(...keys: string[]): Pipeline;
+        del(...keys: KeyType[]): Pipeline;
 
-        setbit(key: string, offset: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+        exists(...keys: KeyType[]): Pipeline;
 
-        getbit(key: string, offset: number, callback?: (err: Error, res: number) => void): Pipeline;
+        setbit(key: KeyType, offset: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
 
-        setrange(key: string, offset: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+        getbit(key: KeyType, offset: number, callback?: (err: Error, res: number) => void): Pipeline;
 
-        getrange(key: string, start: number, end: number, callback?: (err: Error, res: string) => void): Pipeline;
+        setrange(key: KeyType, offset: number, value: any, callback?: (err: Error, res: number) => void): Pipeline;
 
-        substr(key: string, start: number, end: number, callback?: (err: Error, res: string) => void): Pipeline;
+        getrange(key: KeyType, start: number, end: number, callback?: (err: Error, res: string) => void): Pipeline;
 
-        incr(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        substr(key: KeyType, start: number, end: number, callback?: (err: Error, res: string) => void): Pipeline;
 
-        decr(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        incr(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        mget(...keys: string[]): Pipeline;
+        decr(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        rpush(key: string, ...values: any[]): Pipeline;
+        mget(...keys: KeyType[]): Pipeline;
 
-        lpush(key: string, ...values: any[]): Pipeline;
+        rpush(key: KeyType, ...values: any[]): Pipeline;
 
-        rpushx(key: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+        lpush(key: KeyType, ...values: any[]): Pipeline;
 
-        lpushx(key: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
+        rpushx(key: KeyType, 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;
+        lpushx(key: KeyType, value: any, callback?: (err: Error, res: number) => void): Pipeline;
 
-        rpop(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+        linsert(key: KeyType, direction: "BEFORE" | "AFTER", pivot: string, value: any, callback?: (err: Error, res: number) => void): Pipeline;
 
-        lpop(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+        rpop(key: KeyType, callback?: (err: Error, res: string) => void): Pipeline;
 
-        brpop(...keys: string[]): Pipeline;
+        lpop(key: KeyType, callback?: (err: Error, res: string) => void): Pipeline;
 
-        blpop(...keys: string[]): Pipeline;
+        brpop(...keys: KeyType[]): Pipeline;
+
+        blpop(...keys: KeyType[]): 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;
+        llen(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        lindex(key: string, index: number, callback?: (err: Error, res: string) => void): Pipeline;
+        lindex(key: KeyType, index: number, callback?: (err: Error, res: string) => void): Pipeline;
 
-        lset(key: string, index: number, value: any, callback?: (err: Error, res: any) => void): Pipeline;
+        lset(key: KeyType, 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;
+        lrange(key: KeyType, 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;
+        ltrim(key: KeyType, 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;
+        lrem(key: KeyType, 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;
+        sadd(key: KeyType, ...members: any[]): Pipeline;
 
-        srem(key: string, ...members: any[]): Pipeline;
+        srem(key: KeyType, ...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;
+        sismember(key: KeyType, member: string, callback?: (err: Error, res: 1 | 0) => void): Pipeline;
 
-        scard(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        scard(key: KeyType, 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;
+        spop(key: KeyType, callback?: (err: Error, res: any) => void): Pipeline;
+        spop(key: KeyType, 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;
+        srandmember(key: KeyType, callback?: (err: Error, res: any) => void): Pipeline;
+        srandmember(key: KeyType, count: number, callback?: (err: Error, res: any) => void): Pipeline;
 
-        sinter(...keys: string[]): Pipeline;
+        sinter(...keys: KeyType[]): Pipeline;
 
-        sinterstore(destination: string, ...keys: string[]): Pipeline;
+        sinterstore(destination: string, ...keys: KeyType[]): Pipeline;
 
-        sunion(...keys: string[]): Pipeline;
+        sunion(...keys: KeyType[]): Pipeline;
 
-        sunionstore(destination: string, ...keys: string[]): Pipeline;
+        sunionstore(destination: string, ...keys: KeyType[]): Pipeline;
 
-        sdiff(...keys: string[]): Pipeline;
+        sdiff(...keys: KeyType[]): Pipeline;
 
-        sdiffstore(destination: string, ...keys: string[]): Pipeline;
+        sdiffstore(destination: string, ...keys: KeyType[]): Pipeline;
 
-        smembers(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+        smembers(key: KeyType, callback?: (err: Error, res: any) => void): Pipeline;
 
-        zadd(key: string, ...args: string[]): Pipeline;
+        zadd(key: KeyType, ...args: string[]): Pipeline;
 
-        zincrby(key: string, increment: number, member: string, callback?: (err: Error, res: any) => void): Pipeline;
+        zincrby(key: KeyType, increment: number, member: string, callback?: (err: Error, res: any) => void): Pipeline;
 
-        zrem(key: string, ...members: any[]): Pipeline;
+        zrem(key: KeyType, ...members: any[]): Pipeline;
 
-        zremrangebyscore(key: string, min: number | string, max: number | string, callback?: (err: Error, res: any) => void): Pipeline;
+        zremrangebyscore(key: KeyType, 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;
+        zremrangebyrank(key: KeyType, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
 
-        zunionstore(destination: string, numkeys: number, key: string, ...args: string[]): Pipeline;
+        zunionstore(destination: string, numkeys: number, key: KeyType, ...args: string[]): Pipeline;
 
-        zinterstore(destination: string, numkeys: number, key: string, ...args: string[]): Pipeline;
+        zinterstore(destination: string, numkeys: number, key: KeyType, ...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;
+        zrange(key: KeyType, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+        zrange(key: KeyType, 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;
+        zrevrange(key: KeyType, start: number, stop: number, callback?: (err: Error, res: any) => void): Pipeline;
+        zrevrange(key: KeyType, 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;
+        zrangebyscore(key: KeyType, min: number | string, max: number | string, ...args: string[]): Pipeline;
 
-        zrevrangebyscore(key: string, max: number | string, min: number | string, ...args: string[]): Pipeline;
+        zrevrangebyscore(key: KeyType, 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;
+        zcount(key: KeyType, min: number | string, max: number | string, callback?: (err: Error, res: number) => void): Pipeline;
 
-        zcard(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        zcard(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        zscore(key: string, member: string, callback?: (err: Error, res: number) => void): Pipeline;
+        zscore(key: KeyType, member: string, callback?: (err: Error, res: number) => void): Pipeline;
 
-        zrank(key: string, member: string, callback?: (err: Error, res: number) => void): Pipeline;
+        zrank(key: KeyType, member: string, callback?: (err: Error, res: number) => void): Pipeline;
 
-        zrevrank(key: string, member: string, callback?: (err: Error, res: number) => void): Pipeline;
+        zrevrank(key: KeyType, member: string, callback?: (err: Error, res: number) => void): Pipeline;
 
-        hset(key: string, field: string, value: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        hset(key: KeyType, field: string, value: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        hsetBuffer(key: KeyType, field: string, value: any, callback?: (err: Error, res: Buffer) => void): Pipeline;
 
-        hsetnx(key: string, field: string, value: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        hsetnx(key: KeyType, field: string, value: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        hget(key: string, field: string, callback?: (err: Error, res: string) => void): Pipeline;
+        hget(key: KeyType, field: string, callback?: (err: Error, res: string) => void): Pipeline;
+        hgetBuffer(key: KeyType, field: string, callback?: (err: Error, res: Buffer) => void): Pipeline;
 
-        hmset(key: string, field: string, value: any, ...args: string[]): Pipeline;
-        hmset(key: string, data: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        hmset(key: KeyType, field: string, value: any, ...args: string[]): Pipeline;
+        hmset(key: KeyType, data: any, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        hmget(key: string, ...fields: string[]): Pipeline;
+        hmget(key: KeyType, ...fields: string[]): Pipeline;
 
-        hincrby(key: string, field: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+        hincrby(key: KeyType, 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;
+        hincrbyfloat(key: KeyType, field: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
 
-        hdel(key: string, ...fields: string[]): Pipeline;
+        hdel(key: KeyType, ...fields: string[]): Pipeline;
 
-        hlen(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        hlen(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        hkeys(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+        hkeys(key: KeyType, callback?: (err: Error, res: any) => void): Pipeline;
 
-        hvals(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+        hvals(key: KeyType, callback?: (err: Error, res: any) => void): Pipeline;
 
-        hgetall(key: string, callback?: (err: Error, res: any) => void): Pipeline;
+        hgetall(key: KeyType, callback?: (err: Error, res: any) => void): Pipeline;
 
-        hexists(key: string, field: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        hexists(key: KeyType, field: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        incrby(key: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+        incrby(key: KeyType, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
 
-        incrbyfloat(key: string, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
+        incrbyfloat(key: KeyType, increment: number, callback?: (err: Error, res: number) => void): Pipeline;
 
-        decrby(key: string, decrement: number, callback?: (err: Error, res: number) => void): Pipeline;
+        decrby(key: KeyType, decrement: number, callback?: (err: Error, res: number) => void): Pipeline;
 
-        getset(key: string, value: any, callback?: (err: Error, res: string) => void): Pipeline;
+        getset(key: KeyType, value: any, callback?: (err: Error, res: string) => void): Pipeline;
 
-        mset(key: string, value: any, ...args: string[]): Pipeline;
+        mset(key: KeyType, value: any, ...args: string[]): Pipeline;
 
-        msetnx(key: string, value: any, ...args: string[]): Pipeline;
+        msetnx(key: KeyType, 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;
+        move(key: KeyType, db: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        rename(key: string, newkey: string, callback?: (err: Error, res: string) => void): Pipeline;
+        rename(key: KeyType, newkey: KeyType, callback?: (err: Error, res: string) => void): Pipeline;
 
-        renamenx(key: string, newkey: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        renamenx(key: KeyType, newkey: KeyType, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        expire(key: string, seconds: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        expire(key: KeyType, seconds: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        pexpire(key: string, milliseconds: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        pexpire(key: KeyType, milliseconds: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        expireat(key: string, timestamp: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        expireat(key: KeyType, timestamp: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
-        pexpireat(key: string, millisecondsTimestamp: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        pexpireat(key: KeyType, millisecondsTimestamp: number, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
         keys(pattern: string, callback?: (err: Error, res: string[]) => void): Pipeline;
 
@@ -667,7 +708,7 @@ declare namespace IORedis {
 
         lastsave(callback?: (err: Error, res: number) => void): Pipeline;
 
-        type(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+        type(key: KeyType, callback?: (err: Error, res: string) => void): Pipeline;
 
         multi(callback?: (err: Error, res: string) => void): Pipeline;
 
@@ -681,7 +722,7 @@ declare namespace IORedis {
 
         flushall(callback?: (err: Error, res: string) => void): Pipeline;
 
-        sort(key: string, ...args: string[]): Pipeline;
+        sort(key: KeyType, ...args: string[]): Pipeline;
 
         info(callback?: (err: Error, res: any) => void): Pipeline;
         info(section: string, callback?: (err: Error, res: any) => void): Pipeline;
@@ -690,9 +731,9 @@ declare namespace IORedis {
 
         monitor(callback?: (err: Error, res: NodeJS.EventEmitter) => void): Pipeline;
 
-        ttl(key: string, callback?: (err: Error, res: number) => void): Pipeline;
+        ttl(key: KeyType, callback?: (err: Error, res: number) => void): Pipeline;
 
-        persist(key: string, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
+        persist(key: KeyType, callback?: (err: Error, res: 0 | 1) => void): Pipeline;
 
         slaveof(host: string, port: number, callback?: (err: Error, res: string) => void): Pipeline;
 
@@ -710,7 +751,7 @@ declare namespace IORedis {
 
         publish(channel: string, message: string, callback?: (err: Error, res: number) => void): Pipeline;
 
-        watch(...keys: string[]): Pipeline;
+        watch(...keys: KeyType[]): Pipeline;
 
         unwatch(callback?: (err: Error, res: string) => void): Pipeline;
 
@@ -720,7 +761,7 @@ declare namespace IORedis {
 
         migrate(...args: any[]): Pipeline;
 
-        dump(key: string, callback?: (err: Error, res: string) => void): Pipeline;
+        dump(key: KeyType, callback?: (err: Error, res: string) => void): Pipeline;
 
         object(subcommand: string, ...args: any[]): Pipeline;
 
@@ -736,15 +777,17 @@ declare namespace IORedis {
 
         scan(cursor: number, ...args: any[]): Pipeline;
 
-        hscan(key: string, cursor: number, ...args: any[]): Pipeline;
+        sscan(key: KeyType, cursor: number, ...args: any[]): Pipeline;
 
-        zscan(key: string, cursor: number, ...args: any[]): Pipeline;
+        hscan(key: KeyType, cursor: number, ...args: any[]): Pipeline;
 
-        pfmerge(destkey: string, ...sourcekeys: string[]): Pipeline;
+        zscan(key: KeyType, cursor: number, ...args: any[]): Pipeline;
 
-        pfadd(key: string, ...elements: string[]): Pipeline;
+        pfmerge(destkey: KeyType, ...sourcekeys: KeyType[]): Pipeline;
 
-        pfcount(...keys: string[]): Pipeline;
+        pfadd(key: KeyType, ...elements: string[]): Pipeline;
+
+        pfcount(...keys: KeyType[]): Pipeline;
     }
 
     interface NodeConfiguration {
@@ -798,6 +841,17 @@ declare namespace IORedis {
          * Fixed in: https://github.com/DefinitelyTyped/DefinitelyTyped/pull/15858
          */
         retryStrategy?(times: number): number | false;
+        /**
+         * By default, all pending commands will be flushed with an error every
+         * 20 retry attempts. That makes sure commands won't wait forever when
+         * the connection is down. You can change this behavior by setting
+         * `maxRetriesPerRequest`.
+         *
+         * Set maxRetriesPerRequest to `null` to disable this behavior, and
+         * every command will wait forever until the connection is alive again
+         * (which is the default behavior before ioredis v4).
+         */
+        maxRetriesPerRequest?: number | null;
         /**
          * 1/true means reconnect, 2 means reconnect and resend failed command. Returning false will ignore
          * the error and do nothing.
@@ -827,9 +881,7 @@ declare namespace IORedis {
          */
         autoResendUnfulfilledCommands?: boolean;
         lazyConnect?: boolean;
-        tls?: {
-            ca: Buffer;
-        };
+        tls?: tls.ConnectionOptions;
         sentinels?: Array<{ host: string; port: number; }>;
         name?: string;
         /**
diff --git a/types/ioredis/ioredis-tests.ts b/types/ioredis/ioredis-tests.ts
index e8e32062dc..848f0b2841 100644
--- a/types/ioredis/ioredis-tests.ts
+++ b/types/ioredis/ioredis-tests.ts
@@ -16,7 +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');
+redis.set('key', '100', 'XX');
+redis.set('key', '100', 'PX', 10);
+redis.set('key', '100', 'EX', 10, 'NX');
+redis.set('key', '100', 'NX', 'EX', 10);
+redis.set('key', '100', ['EX', 10, 'NX']);
+redis.setBuffer('key', '100', 'NX', 'EX', 10);
+
+redis.set('key', '100', (err, data) => {});
+redis.set('key', '100', 'XX', (err, data) => {});
+redis.set('key', '100', 'PX', 10, (err, data) => {});
+redis.set('key', '100', 'EX', 10, 'NX', (err, data) => {});
+redis.set('key', '100', ['EX', 10, 'NX'], (err, data) => {});
+redis.setBuffer('key', '100', 'NX', 'EX', 10, (err, data) => {});
+
+// Should support usage of Buffer
+redis.set(Buffer.from('key'), '100');
+redis.setBuffer(Buffer.from('key'), '100', 'NX', 'EX', 10);
 
 new Redis();       // Connect to 127.0.0.1:6379
 new Redis(6380);   // 127.0.0.1:6380
@@ -29,7 +46,11 @@ new Redis({
     password: 'auth',
     db: 0,
     retryStrategy() { return false; },
-    showFriendlyErrorStack: true
+    maxRetriesPerRequest: 20,
+    showFriendlyErrorStack: true,
+    tls: {
+        servername: 'tlsservername'
+    }
 });
 
 const pub = new Redis();
@@ -56,6 +77,10 @@ redis.on('messageBuffer', (channel: any, message: any) => {
 const pipeline = redis.pipeline();
 pipeline.set('foo', 'bar');
 pipeline.del('cc');
+pipeline.hset('hash', 'foo', 4);
+pipeline.hget('hash', 'foo');
+pipeline.hsetBuffer('hash', 'fooBuffer', 4);
+pipeline.hgetBuffer('hash', 'fooBuffer');
 pipeline.exec((err, results) => {
     // `err` is always null, and `results` is an array of responses
     // corresponding to the sequence of queued commands.
@@ -105,9 +130,6 @@ redis.multi([
     // results = [[null, 'OK'], [null, 'bar']]
 });
 
-redis.Promise.onPossiblyUnhandledRejection((error) => {
-});
-
 const keys = ['foo', 'bar'];
 redis.mget(...keys);
 
diff --git a/types/ioredis/v3/index.d.ts b/types/ioredis/v3/index.d.ts
new file mode 100644
index 0000000000..e593f4dcc3
--- /dev/null
+++ b/types/ioredis/v3/index.d.ts
@@ -0,0 +1,911 @@
+// Type definitions for ioredis 3.2
+// Project: https://github.com/luin/ioredis
+// 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>
+//                 Whemoon Jang <https://github.com/palindrom615>
+//                 Francis Gulotta <https://github.com/reconbot>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/* =================== USAGE ===================
+    import * as Redis from "ioredis";
+    var redis = new Redis();
+ =============================================== */
+
+/// <reference types="node" />
+
+import Promise = require('bluebird');
+import tls = require('tls');
+
+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;
+    (port?: number, host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    (host?: string, options?: IORedis.RedisOptions): IORedis.Redis;
+    (options?: IORedis.RedisOptions): IORedis.Redis;
+    Cluster: IORedis.Cluster;
+    Command: IORedis.Command;
+}
+
+declare var IORedis: RedisStatic;
+export = IORedis;
+
+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 {
+        Promise: typeof Promise;
+        status: string;
+        connect(callback?: () => void): Promise<any>;
+        disconnect(): void;
+        duplicate(): Redis;
+
+        send_command(command: string, ...args: 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, expiryMode?: string | any[], time?: number | string, setMode?: number | string): Promise<string>;
+
+        set(key: string, value: any, callback: (err: Error, res: string) => void): void;
+        set(key: string, value: any, setMode: string | any[], callback: (err: Error, res: string) => void): void;
+        set(key: string, value: any, expiryMode: string, time: number | string, callback: (err: Error, res: string) => void): void;
+        set(key: string, value: any, expiryMode: string, time: number | string, setMode: number | string, callback: (err: Error, res: string) => void): void;
+
+        setBuffer(key: string, value: any, expiryMode?: string | any[], time?: number | string, setMode?: number | string): Promise<Buffer>;
+
+        setBuffer(key: string, value: any, callback: (err: Error, res: Buffer) => void): void;
+        setBuffer(key: string, value: any, setMode: string, callback: (err: Error, res: Buffer) => void): void;
+        setBuffer(key: string, value: any, expiryMode: string, time: number, callback: (err: Error, res: Buffer) => void): void;
+        setBuffer(key: string, value: any, expiryMode: string, time: number | string, setMode: number | string, callback: (err: Error, res: Buffer) => void): void;
+
+        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: string) => void): void;
+        zscore(key: string, member: string): Promise<string>;
+
+        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>;
+        hsetBuffer(key: string, field: string, value: any, callback: (err: Error, res: 0 | 1) => void): void;
+        hsetBuffer(key: string, field: string, value: any): Promise<Buffer>;
+
+        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>;
+        hgetBuffer(key: string, field: string, callback: (err: Error, res: Buffer) => void): void;
+        hgetBuffer(key: string, field: string): Promise<Buffer>;
+
+        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[]): 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[]): any;
+
+        migrate(...args: 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[]): any;
+
+        evalsha(...args: any[]): any;
+
+        script(...args: any[]): any;
+
+        quit(callback: (err: Error, res: string) => void): void;
+        quit(): Promise<string>;
+
+        scan(cursor: number, ...args: any[]): any;
+
+        sscan(key: string, 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;
+        sscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
+        hscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
+        zscanStream(key: string, options?: ScanStreamOption): NodeJS.EventEmitter;
+    }
+
+    interface Pipeline {
+        redis: Redis;
+        isCluster: boolean;
+        options: RedisOptions;
+        _queue: Command[];
+        _result: any[];
+        _transactions: number;
+        _shaToScript: {};
+        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, callback?: (err: Error, res: string) => void): Pipeline;
+        set(key: string, value: any, setMode: string, callback?: (err: Error, res: string) => void): Pipeline;
+        set(key: string, value: any, expiryMode: string, time: number, callback?: (err: Error, res: string) => void): Pipeline;
+        set(key: string, value: any, expiryMode: string, time: number, setMode: string, callback?: (err: Error, res: string) => void): Pipeline;
+
+        setBuffer(key: string, value: any, callback?: (err: Error, res: Buffer) => void): Pipeline;
+        setBuffer(key: string, value: any, setMode: string, callback?: (err: Error, res: Buffer) => void): Pipeline;
+        setBuffer(key: string, value: any, expiryMode: string, time: number, callback?: (err: Error, res: Buffer) => void): Pipeline;
+        setBuffer(key: string, value: any, expiryMode: string, time: number, setMode: string, callback?: (err: Error, res: Buffer) => void): 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;
+        hsetBuffer(key: string, field: string, value: any, callback?: (err: Error, res: Buffer) => 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;
+        hgetBuffer(key: string, field: string, callback?: (err: Error, res: Buffer) => void): Pipeline;
+
+        hmset(key: string, field: string, value: any, ...args: string[]): Pipeline;
+        hmset(key: string, data: any, callback?: (err: Error, res: 0 | 1) => void): 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;
+
+        debug(...args: any[]): Pipeline;
+
+        config(...args: 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[]): Pipeline;
+
+        migrate(...args: 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[]): Pipeline;
+
+        evalsha(...args: any[]): Pipeline;
+
+        script(...args: any[]): Pipeline;
+
+        quit(callback?: (err: Error, res: string) => void): Pipeline;
+
+        scan(cursor: number, ...args: any[]): Pipeline;
+
+        sscan(key: string, 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: ClusterNode[], options?: ClusterOptions): Redis;
+        connect(callback: () => void): Promise<any>;
+        disconnect(): void;
+        nodes(role: string): Redis[];
+    }
+
+    interface RedisOptions {
+        port?: number;
+        host?: string;
+        /**
+         * 4 (IPv4) or 6 (IPv6), Defaults to 4.
+         */
+        family?: number;
+        /**
+         * Local domain socket path. If set the port, host and family will be ignored.
+         */
+        path?: string;
+        /**
+         * TCP KeepAlive on the socket with a X ms delay before start. Set to a non-number value to disable keepAlive.
+         */
+        keepAlive?: number;
+        connectionName?: string;
+        /**
+         * If set, client will send AUTH command with the value of this option when connected.
+         */
+        password?: string;
+        /**
+         * Database index to use.
+         */
+        db?: number;
+        /**
+         * When a connection is established to the Redis server, the server might still be loading
+         * the database from disk. While loading, the server not respond to any commands.
+         * To work around this, when this option is true, ioredis will check the status of the Redis server,
+         * and when the Redis server is able to process commands, a ready event will be emitted.
+         */
+        enableReadyCheck?: boolean;
+        keyPrefix?: string;
+        /**
+         * 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;
+        /**
+         * 1/true means reconnect, 2 means reconnect and resend failed command. Returning false will ignore
+         * the error and do nothing.
+         */
+        reconnectOnError?(error: Error): boolean | 1 | 2;
+        /**
+         * 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
+         * the Redis server has loaded the database from disk, otherwise means the connection to the Redis
+         * server has been established). If this option is false, when execute the command when the connection
+         * isn't ready, an error will be returned.
+         */
+        enableOfflineQueue?: boolean;
+        /**
+         * The milliseconds before a timeout occurs during the initial connection to the Redis server.
+         * default: 10000.
+         */
+        connectTimeout?: number;
+        /**
+         * After reconnected, if the previous connection was in the subscriber mode, client will auto re-subscribe these channels.
+         * default: true.
+         */
+        autoResubscribe?: boolean;
+        /**
+         * If true, client will resend unfulfilled commands(e.g. block commands) in the previous connection when reconnected.
+         * default: true.
+         */
+        autoResendUnfulfilledCommands?: boolean;
+        lazyConnect?: boolean;
+        tls?: tls.ConnectionOptions;
+        sentinels?: Array<{ host: string; port: number; }>;
+        name?: string;
+        /**
+         * Enable READONLY mode for the connection. Only available for cluster mode.
+         * default: false.
+         */
+        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
+         */
+        dropBufferSupport?: boolean;
+        /**
+         * Whether to show a friendly error stack. Will decrease the performance significantly.
+         */
+        showFriendlyErrorStack?: boolean;
+    }
+
+    interface ScanStreamOption {
+        match?: string;
+        count?: number;
+    }
+
+    interface ClusterOptions {
+        clusterRetryStrategy?(times: number): number;
+        enableOfflineQueue?: boolean;
+        enableReadyCheck?: boolean;
+        scaleReads?: string;
+        maxRedirections?: number;
+        retryDelayOnFailover?: number;
+        retryDelayOnClusterDown?: number;
+        retryDelayOnTryAgain?: number;
+        redisOptions?: RedisOptions;
+    }
+
+    interface MultiOptions {
+        pipeline: boolean;
+    }
+}
diff --git a/types/ioredis/v3/ioredis-tests.ts b/types/ioredis/v3/ioredis-tests.ts
new file mode 100644
index 0000000000..32ae5c24d5
--- /dev/null
+++ b/types/ioredis/v3/ioredis-tests.ts
@@ -0,0 +1,153 @@
+import Redis = require("ioredis");
+const redis = new Redis();
+
+redis.set('foo', 'bar');
+redis.get('foo', (err, result) => {
+    console.log(result);
+});
+
+// Or using a promise if the last argument isn't a function
+redis.get('foo').then((result: any) => {
+    console.log(result);
+});
+
+// Arguments to commands are flattened, so the following are the same:
+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');
+redis.set('key', '100', 'XX');
+redis.set('key', '100', 'PX', 10);
+redis.set('key', '100', 'EX', 10, 'NX');
+redis.set('key', '100', 'NX', 'EX', 10);
+redis.set('key', '100', ['EX', 10, 'NX']);
+redis.setBuffer('key', '100', 'NX', 'EX', 10);
+
+redis.set('key', '100', (err, data) => {});
+redis.set('key', '100', 'XX', (err, data) => {});
+redis.set('key', '100', 'PX', 10, (err, data) => {});
+redis.set('key', '100', 'EX', 10, 'NX', (err, data) => {});
+redis.set('key', '100', ['EX', 10, 'NX'], (err, data) => {});
+redis.setBuffer('key', '100', 'NX', 'EX', 10, (err, data) => {});
+
+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() { return false; },
+    showFriendlyErrorStack: true,
+    tls: {
+        servername: 'tlsservername'
+    }
+});
+
+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.
+
+    pub.publish('news', 'Hello world!');
+    pub.publish('music', 'Hello again!');
+});
+
+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);
+});
+
+// There's also an event called 'messageBuffer', which is the same as 'message' except
+// it returns buffers instead of strings.
+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.hset('hash', 'foo', 4);
+pipeline.hget('hash', 'foo');
+pipeline.hsetBuffer('hash', 'fooBuffer', 4);
+pipeline.hgetBuffer('hash', 'fooBuffer');
+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']]
+});
+
+redis.Promise.onPossiblyUnhandledRejection((error) => {
+});
+
+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/v3/tsconfig.json b/types/ioredis/v3/tsconfig.json
new file mode 100644
index 0000000000..eb6e042a5d
--- /dev/null
+++ b/types/ioredis/v3/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "ioredis": [ "ioredis/v3" ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "ioredis-tests.ts"
+    ]
+}
diff --git a/types/ioredis/v3/tslint.json b/types/ioredis/v3/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ioredis/v3/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ip-address/index.d.ts b/types/ip-address/index.d.ts
new file mode 100644
index 0000000000..59dbb07d57
--- /dev/null
+++ b/types/ip-address/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for ip-address 5.8
+// Project: https://github.com/beaugunderson/ip-address
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace ipAddress;
+
+export interface v6Helpers {
+  spanAllZeroes(s: string): string;
+  spanAll(s: string, optionalOffset?: number): string;
+  spanLeadingZeroes(address: string): string;
+  simpleGroup(addressString: string, offset?: number): string;
+}
+
+export interface TeredoObject {
+  readonly prefix: string;
+  readonly server4: string;
+  readonly client4: string;
+  readonly flags: string;
+  readonly coneNat: any;
+  readonly microsoft: {
+    readonly reserved: any,
+    readonly universalLocal: any,
+    readonly groupIndividual: any,
+    readonly nonce: any,
+  };
+  udpPort: string;
+}
+
+export interface SixToFourResponse {
+  readonly prefix: string;
+  readonly gateway: string;
+}
+
+export class Address4 {
+  constructor(address: string);
+  static fromHex(hex: string): Address4;
+  static fromInteger(integer: number): Address4;
+  static fromBigInteger(bigInteger: any): Address4;
+
+  valid: boolean;
+  address: string;
+  parsedAddress: string;
+  groups: number;
+  v4: boolean;
+  subnet: string;
+  subnetMask: number;
+
+  isValid(): boolean;
+  correctForm(): string;
+  isCorrect(): boolean;
+  toHex(): string;
+  toArray(): any;
+  toGroup6(): string;
+  bigInteger(): any;
+  startAddress(): Address4;
+  startAddressExclusive(): Address4;
+  endAddress(): Address4;
+  endAddressExclusive(): Address4;
+  mask(optionalMask?: number): string;
+  getBitsBase2(start: number, end: number): string;
+  isInSubnet(): boolean;
+  binaryZeroPad(): string;
+}
+
+export class Address6 {
+  constructor(address: string, optionalGroups?: number);
+  static fromBigInteger(bigInteger: any): Address6;
+  static fromURL(url: string): Address6;
+  static fromAddress4(address4: string): Address6;
+  static fromArpa(arpaFormAddress: string): Address6;
+  static fromByteArray(bytes: any): Address6;
+  static fromUnsignedByteArray(bytes: any): Address6;
+
+  valid: boolean;
+  address: string;
+  groups: number;
+  v4: boolean;
+  subnet: string;
+  subnetMask: number;
+
+  microsoftTranscription(): string;
+  mask(optionalMask?: number): string;
+  possibleSubnets(optionalSubnetSize?: number): string;
+  startAddress(): Address6;
+  startAddressExclusive(): Address6;
+  endAddress(): Address6;
+  endAddressExclusive(): Address6;
+  getScope(): string;
+  getType(): string;
+  getBits(start: number, end: number): any;
+  getBitsBase2(start: number, end: number): string;
+  getBitsBase16(start: number, end: number): string;
+  getBitsPastSubnet(): string;
+  reverseForm(options?: { omitSuffix: boolean }): string;
+  correctForm(): string;
+  binaryZeroPad(): string;
+  canonicalForm(): string;
+  decimal(): string;
+  bigInteger(): any;
+  to4(): string;
+  to4in6(): string;
+  inspectTeredo(): TeredoObject;
+  inspect6to4(): SixToFourResponse;
+  to6to4(): Address6;
+  toByteArray(): any;
+  toUnsignedByteArray(): any;
+}
+
+export const v6: {helpers: v6Helpers};
diff --git a/types/ip-address/ip-address-tests.ts b/types/ip-address/ip-address-tests.ts
new file mode 100644
index 0000000000..76b4e471aa
--- /dev/null
+++ b/types/ip-address/ip-address-tests.ts
@@ -0,0 +1,121 @@
+import ipAddress = require('ip-address');
+
+// Test Address4 Typings
+const address4 = new ipAddress.Address4('127.0.0.1');
+
+const address4Valid = address4.valid;
+const address4String = address4.address;
+const address4Parsed = address4.parsedAddress;
+const address4Groups = address4.groups;
+const address4v4 = address4.v4;
+const address4Subnet = address4.subnet;
+const address4Mask = address4.subnetMask;
+
+// $ExpectType Address4
+ipAddress.Address4.fromHex('127.0.0.1');
+// $ExpectType Address4
+ipAddress.Address4.fromInteger(127001);
+// $ExpectType Address4
+address4.startAddress();
+// $ExpectType Address4
+address4.startAddressExclusive();
+// $ExpectType Address4
+address4.endAddress();
+// $ExpectType Address4
+address4.endAddressExclusive();
+
+// $ExpectType string
+address4.correctForm();
+// $ExpectType string
+address4.toHex();
+// $ExpectType string
+address4.toGroup6();
+// $ExpectType string
+address4.mask();
+// $ExpectType string
+address4.mask(0);
+// $ExpectType string
+address4.getBitsBase2(0, 1);
+// $ExpectType string
+address4.binaryZeroPad();
+
+// $ExpectType boolean
+address4.isValid();
+// $ExpectType boolean
+address4.isCorrect();
+// $ExpectType boolean
+address4.isInSubnet();
+
+// Test Address6 Typings
+const address6 = new ipAddress.Address6('127.0.0.1');
+
+const address6Valid = address6.valid;
+const address6String = address6.address;
+const address6Groups = address6.groups;
+const address6v4 = address6.v4;
+const address6Subnet = address6.subnet;
+const address6Mask = address6.subnetMask;
+
+// $ExpectType Address6
+address6.startAddress();
+// $ExpectType Address6
+address6.startAddressExclusive();
+// $ExpectType Address6
+address6.endAddress();
+// $ExpectType Address6
+address6.endAddressExclusive();
+// $ExpectType Address6
+address6.to6to4();
+
+// $ExpectType string
+address6.microsoftTranscription();
+// $ExpectType string
+address6.mask();
+// $ExpectType string
+address6.mask(0);
+// $ExpectType string
+address6.possibleSubnets();
+// $ExpectType string
+address6.possibleSubnets(1);
+// $ExpectType string
+address6.getScope();
+// $ExpectType string
+address6.getType();
+// $ExpectType string
+address6.getBitsBase2(0, 1);
+// $ExpectType string
+address6.getBitsBase16(0, 1);
+// $ExpectType string
+address6.getBitsPastSubnet();
+// $ExpectType string
+address6.reverseForm();
+// $ExpectType string
+address6.correctForm();
+// $ExpectType string
+address6.binaryZeroPad();
+// $ExpectType string
+address6.canonicalForm();
+// $ExpectType string
+address6.decimal();
+// $ExpectType string
+address6.to4();
+// $ExpectType string
+address6.to4in6();
+
+// $ExpectType TeredoObject
+address6.inspectTeredo();
+
+// $ExpectType SixToFourResponse
+address6.inspect6to4();
+
+// Test v6 Typings
+const v6 = ipAddress.v6;
+
+// $ExpectType string
+v6.helpers.simpleGroup(address6.address);
+// $ExpectType string
+v6.helpers.spanAll(address6.address);
+// $ExpectType string
+v6.helpers.spanAllZeroes(address6.address);
+// $ExpectType string
+v6.helpers.spanLeadingZeroes(address6.address);
diff --git a/types/ip-address/tsconfig.json b/types/ip-address/tsconfig.json
new file mode 100644
index 0000000000..79254ab191
--- /dev/null
+++ b/types/ip-address/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": false,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"ip-address-tests.ts"
+	]
+}
diff --git a/types/ip-address/tslint.json b/types/ip-address/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/ip-address/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/is-callable/index.d.ts b/types/is-callable/index.d.ts
new file mode 100644
index 0000000000..7e2c89f845
--- /dev/null
+++ b/types/is-callable/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-callable 1.1
+// Project: https://github.com/ljharb/is-callable
+// Definitions by: Daniel <https://github.com/nieltg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isCallable(val: any): val is (...args: any[]) => any;
+
+export = isCallable;
diff --git a/types/is-callable/is-callable-tests.ts b/types/is-callable/is-callable-tests.ts
new file mode 100644
index 0000000000..7ae8518ffd
--- /dev/null
+++ b/types/is-callable/is-callable-tests.ts
@@ -0,0 +1,26 @@
+import isCallable = require("is-callable");
+
+isCallable(undefined);
+isCallable(null);
+isCallable(false);
+isCallable(true);
+isCallable([]);
+isCallable({});
+isCallable(/a/g);
+isCallable(new RegExp("a", "g"));
+isCallable(new Date());
+isCallable(42);
+isCallable(NaN);
+isCallable(Infinity);
+isCallable("foo");
+isCallable(Object("foo"));
+
+function func1() {}
+if (isCallable(func1)) {
+    func1();
+}
+
+const func2 = (x: number) => x * x;
+if (isCallable(func2)) {
+    func2(0);
+}
diff --git a/types/is-callable/tsconfig.json b/types/is-callable/tsconfig.json
new file mode 100644
index 0000000000..e1334095d7
--- /dev/null
+++ b/types/is-callable/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-callable-tests.ts"
+    ]
+}
diff --git a/types/is-callable/tslint.json b/types/is-callable/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-callable/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-running/index.d.ts b/types/is-running/index.d.ts
new file mode 100644
index 0000000000..e573a44193
--- /dev/null
+++ b/types/is-running/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for is-running 2.1
+// Project: https://github.com/nisaacson/is-running
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isRunning(pid: number): boolean;
+
+export = isRunning;
diff --git a/types/is-running/is-running-tests.ts b/types/is-running/is-running-tests.ts
new file mode 100644
index 0000000000..5f8ad2983a
--- /dev/null
+++ b/types/is-running/is-running-tests.ts
@@ -0,0 +1,4 @@
+import isRunning = require("is-running");
+
+// $ExpectType boolean
+isRunning(100);
diff --git a/types/is-running/tsconfig.json b/types/is-running/tsconfig.json
new file mode 100644
index 0000000000..3a03f10b96
--- /dev/null
+++ b/types/is-running/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",
+    "is-running-tests.ts"
+  ]
+}
diff --git a/types/is-running/tslint.json b/types/is-running/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/is-running/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/is-touch-device/index.d.ts b/types/is-touch-device/index.d.ts
new file mode 100644
index 0000000000..7a17cbea63
--- /dev/null
+++ b/types/is-touch-device/index.d.ts
@@ -0,0 +1,6 @@
+// Type definitions for is-touch-device 1.0
+// Project: https://github.com/airbnb/is-touch-device
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export default function isTouchDevice(): boolean;
diff --git a/types/is-touch-device/is-touch-device-tests.ts b/types/is-touch-device/is-touch-device-tests.ts
new file mode 100644
index 0000000000..5ae2e1eff5
--- /dev/null
+++ b/types/is-touch-device/is-touch-device-tests.ts
@@ -0,0 +1,3 @@
+import isTouchDevice from 'is-touch-device';
+
+if (isTouchDevice()) {}
diff --git a/types/is-touch-device/tsconfig.json b/types/is-touch-device/tsconfig.json
new file mode 100644
index 0000000000..4ab8fbd5cb
--- /dev/null
+++ b/types/is-touch-device/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-touch-device-tests.ts"
+    ]
+}
diff --git a/types/is-touch-device/tslint.json b/types/is-touch-device/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-touch-device/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/is-uuid/index.d.ts b/types/is-uuid/index.d.ts
new file mode 100644
index 0000000000..f6e1f8626b
--- /dev/null
+++ b/types/is-uuid/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for is-uuid 1.0
+// Project: https://github.com/afram/is-uuid#readme
+// Definitions by: André Thériault <https://github.com/tedre191>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Returns true if the value is a v1 UUID
+ * @param value The value to test
+ */
+export function v1(value: string): boolean;
+
+/**
+ * Returns true if the value is a v2 UUID
+ * @param value The value to test
+ */
+export function v2(value: string): boolean;
+
+/**
+ * Returns true if the value is a v3 UUID
+ * @param value The value to test
+ */
+export function v3(value: string): boolean;
+
+/**
+ * Returns true if the value is a v4 UUID
+ * @param value The value to test
+ */
+export function v4(value: string): boolean;
+
+/**
+ * Returns true if the value is a v5 UUID
+ * @param value The value to test
+ */
+export function v5(value: string): boolean;
+
+/**
+ * Returns true if the value is a nil UUID
+ * @param value The value to test
+ */
+export function nil(value: string): boolean;
+
+/**
+ * Returns true for v1 - v5 UUID. Will return false for nil UUID
+ * @param value The value to test
+ */
+export function anyNonNil(value: string): boolean;
diff --git a/types/is-uuid/is-uuid-tests.ts b/types/is-uuid/is-uuid-tests.ts
new file mode 100644
index 0000000000..4e07b10905
--- /dev/null
+++ b/types/is-uuid/is-uuid-tests.ts
@@ -0,0 +1,10 @@
+import * as isUUID from 'is-uuid';
+
+isUUID.v1('857b3f0a-a777-11e5-bf7f-feff819cdc9f');
+isUUID.v2('9a7b330a-a736-21e5-af7f-feaf819cdc9f');
+isUUID.v3('0a7b330a-a736-35ea-8f7f-feaf019cdc00');
+isUUID.v4('c51c80c2-66a1-442a-91e2-4f55b4256a72');
+isUUID.v5('5a2de30a-a736-5aea-8f7f-ad0f019cdc00');
+
+isUUID.anyNonNil('c51c80c2-66a1-442a-91e2-4f55b4256a72');
+isUUID.nil('00000000-0000-0000-0000-000000000000');
diff --git a/types/is-uuid/tsconfig.json b/types/is-uuid/tsconfig.json
new file mode 100644
index 0000000000..eec8e9597a
--- /dev/null
+++ b/types/is-uuid/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",
+        "is-uuid-tests.ts"
+    ]
+}
diff --git a/types/is-uuid/tslint.json b/types/is-uuid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/is-uuid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jackrabbit/index.d.ts b/types/jackrabbit/index.d.ts
index ec0ff27fa9..7be4ee23ed 100644
--- a/types/jackrabbit/index.d.ts
+++ b/types/jackrabbit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hunterloftis/jackrabbit
 // Definitions by: Elvis Adomnica <https://github.com/elvisvoer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 import { Connection, Options, Message } from 'amqplib';
 
diff --git a/types/jasmine-enzyme/index.d.ts b/types/jasmine-enzyme/index.d.ts
index fd52c65ed8..bc37eda9bf 100644
--- a/types/jasmine-enzyme/index.d.ts
+++ b/types/jasmine-enzyme/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/blainekasten/enzyme-matchers/blob/master/packages/jasmine-enzyme/README.md
 // Definitions by: Umar Bolatov <https://github.com/bolatovumar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="jasmine" />
 /// <reference types="react" />
diff --git a/types/jasmine-enzyme/jasmine-enzyme-tests.tsx b/types/jasmine-enzyme/jasmine-enzyme-tests.tsx
index 6246618d86..1ecb159779 100644
--- a/types/jasmine-enzyme/jasmine-enzyme-tests.tsx
+++ b/types/jasmine-enzyme/jasmine-enzyme-tests.tsx
@@ -253,12 +253,9 @@ describe('toHaveRef', () => {
 
 describe('toHaveState', () => {
 	class Fixture extends React.Component {
-		constructor() {
-			super({});
-			this.state = {
-				foo: false,
-			};
-		}
+		state = {
+			foo: false,
+		};
 
 		render() {
 			return (
diff --git a/types/java/index.d.ts b/types/java/index.d.ts
index cf770a8807..374224b832 100644
--- a/types/java/index.d.ts
+++ b/types/java/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for java 0.7.2
+// Type definitions for java 0.9.1
 // Project: https://github.com/joeferner/node-java
-// Definitions by: Jim Lloyd <https://github.com/jimlloyd>, Kentaro Teramoto <https://github.com/hrl7>
+// Definitions by: Jim Lloyd <https://github.com/jimlloyd>, Kentaro Teramoto <https://github.com/hrl7>, Matthieu Dartiguenave <https://github.com/darti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -39,8 +39,8 @@ declare namespace NodeJavaCore {
     asyncOptions: AsyncOptions;
     nativeBindingLocation: string;
 
-    callMethod(instance: any, className: string, methodName: string, args: any[], callback: Callback<any>): void;
-    callMethodSync(instance: any, className: string, methodName: string, ...args: any[]): any;
+    callMethod(instance: any, methodName: string, args: any[], callback: Callback<any>): void;
+    callMethodSync(instance: any, methodName: string, ...args: any[]): any;
     callStaticMethod(className: string, methodName: string, ...args: Array<any|Callback<any>>): void;
     callStaticMethodSync(className: string, methodName: string, ...args: any[]): any;
     getStaticFieldValue(className: string, fieldName: string): any;
diff --git a/types/java/java-tests.ts b/types/java/java-tests.ts
index 4c79640733..42ca007155 100644
--- a/types/java/java-tests.ts
+++ b/types/java/java-tests.ts
@@ -1,11 +1,11 @@
 import java = require('java');
-import BluePromise = require('bluebird');
+import pify = require('pify');
 
 java.asyncOptions = {
   syncSuffix: 'Sync',
   asyncSuffix: '',
   promiseSuffix: 'P',
-  promisify: BluePromise.promisify
+  promisify: pify
 };
 // todo: figure out why promise doesn't work here
 /* java.registerClientP((): Promise<void> => {
diff --git a/types/jest-each/index.d.ts b/types/jest-each/index.d.ts
index 01d13db0e4..e49f703a91 100644
--- a/types/jest-each/index.d.ts
+++ b/types/jest-each/index.d.ts
@@ -1,15 +1,15 @@
 // Type definitions for jest-each 0.3
 // Project: https://github.com/mattphillips/jest-each
-// Definitions by: Michael Utz <https://github.com/theutz>
+// Definitions by: Michael Utz <https://github.com/theutz>, Nick McCurdy <https://github.com/nickmccurdy>
 // Definitions: <https://github.com/DefinitelyTyped/DefinitelyTyped>
 // TypeScript Version: 2.1
 
-export = JestEach;
+export default JestEach;
 
 declare function JestEach(parameters: any[][]): JestEach.ReturnType;
 
 declare namespace JestEach {
-	type SyncCallback = (...args: string[]) => void;
+	type SyncCallback = (...args: any[]) => void;
 	type AsyncCallback = () => void;
 
 	type TestCallback = SyncCallback | AsyncCallback;
diff --git a/types/jest-each/jest-each-tests.ts b/types/jest-each/jest-each-tests.ts
index bbfbcabe05..c95a69d8c5 100644
--- a/types/jest-each/jest-each-tests.ts
+++ b/types/jest-each/jest-each-tests.ts
@@ -1,4 +1,4 @@
-import * as each from 'jest-each';
+import each from "jest-each";
 
 const params = [[1, 0, 1], [1, 1, 0], ['1', 'two', 'three']];
 
diff --git a/types/jest-environment-puppeteer/index.d.ts b/types/jest-environment-puppeteer/index.d.ts
index e22bee2f7d..79c25e32d8 100644
--- a/types/jest-environment-puppeteer/index.d.ts
+++ b/types/jest-environment-puppeteer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/smooth-code/jest-puppeteer/tree/master/packages/jest-environment-puppeteer
 // Definitions by: Josh Goldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { Browser, Page } from "puppeteer";
 
diff --git a/types/jest-specific-snapshot/index.d.ts b/types/jest-specific-snapshot/index.d.ts
index ef0e7f4225..61a65a416a 100644
--- a/types/jest-specific-snapshot/index.d.ts
+++ b/types/jest-specific-snapshot/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/igor-dv/jest-specific-snapshot#readme
 // Definitions by: Janeene Beeforth <https://github.com/dawnmist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="jest" />
 
diff --git a/types/jest/index.d.ts b/types/jest/index.d.ts
index 4a2153b218..a9cbdbc1e3 100644
--- a/types/jest/index.d.ts
+++ b/types/jest/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Jest 23.1
+// Type definitions for Jest 23.3
 // Project: http://facebook.github.io/jest/
 // Definitions by: Asana <https://asana.com>
 //                 Ivo Stratev <https://github.com/NoHomey>
@@ -15,6 +15,7 @@
 //                 Jeff Lau <https://github.com/UselessPickles>
 //                 Andrew Makarov <https://github.com/r3nya>
 //                 Martin Hochel <https://github.com/hotell>
+//                 Sebastian Sebald <https://github.com/sebald>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -109,6 +110,9 @@ declare namespace jest {
      * Creates a mock function. Optionally takes a mock implementation.
      */
     function fn<T extends {}>(implementation: (...args: any[]) => T): Mock<T>;
+    /**
+     * Creates a mock function. Optionally takes a mock implementation.
+     */
     function fn<T>(implementation?: (...args: any[]) => any): Mock<T>;
     /**
      * Use the automatic mocking system to generate a mocked version of the given module.
@@ -173,7 +177,25 @@ declare namespace jest {
      */
     function setTimeout(timeout: number): typeof jest;
     /**
-     * Creates a mock function similar to jest.fn but also tracks calls to object[methodName]
+     * Creates a mock function similar to jest.fn but also tracks calls to `object[methodName]`
+     *
+     * Note: By default, jest.spyOn also calls the spied method. This is different behavior from most
+     * other test libraries.
+     *
+     * @example
+     *
+     * const video = require('./video');
+     *
+     * test('plays video', () => {
+     *   const spy = jest.spyOn(video, 'play');
+     *   const isPlaying = video.play();
+     *
+     *   expect(spy).toHaveBeenCalled();
+     *   expect(isPlaying).toBe(true);
+     *
+     *   spy.mockReset();
+     *   spy.mockRestore();
+     * });
      */
     function spyOn<T extends {}, M extends keyof T>(object: T, method: M, accessType?: 'get' | 'set'): SpyInstance<T[M]>;
     /**
@@ -209,6 +231,14 @@ declare namespace jest {
         readonly name: string;
     }
 
+    interface Each {
+        (cases: any[]): (name: string, fn: (...args: any[]) => any) => void;
+        (strings: TemplateStringsArray, ...placeholders: any[]): (
+            name: string,
+            fn: (arg: any) => any
+        ) => void;
+    }
+
     /**
      * Creates a test closure
      */
@@ -225,15 +255,65 @@ declare namespace jest {
          * Only runs this test in the current file.
          */
         only: It;
+        /**
+         * Skips running this test in the current file.
+         */
         skip: It;
+        /**
+         * Experimental and should be avoided.
+         */
         concurrent: It;
+        /**
+         * Use if you keep duplicating the same test with different data. `.each` allows you to write the
+         * test once and pass data in.
+         *
+         * `.each` is available with two APIs:
+         *
+         * #### 1  `test.each(table)(name, fn)`
+         *
+         * - `table`: Array of Arrays with the arguments that are passed into the test fn for each row.
+         * - `name`: String the title of the test block.
+         * - `fn`: Function the test to be ran, this is the function that will receive the parameters in each row as function arguments.
+         *
+         *
+         * #### 2  `test.each table(name, fn)`
+         *
+         * - `table`: Tagged Template Literal
+         * - `name`: String the title of the test, use `$variable` to inject test data into the test title from the tagged template expressions.
+         * - `fn`: Function the test to be ran, this is the function that will receive the test data object..
+         *
+         * @example
+         *
+         * // API 1
+         * test.each([[1, 1, 2], [1, 2, 3], [2, 1, 3]])(
+         *   '.add(%i, %i)',
+         *   (a, b, expected) => {
+         *     expect(a + b).toBe(expected);
+         *   },
+         * );
+         *
+         * // API 2
+         * test.each`
+         * a    | b    | expected
+         * ${1} | ${1} | ${2}
+         * ${1} | ${2} | ${3}
+         * ${2} | ${1} | ${3}
+         * `('returns $expected when $a is added $b', ({a, b, expected}) => {
+         *    expect(a + b).toBe(expected);
+         * });
+         *
+         */
+        each: Each;
     }
 
     interface Describe {
         // tslint:disable-next-line ban-types
         (name: number | string | Function | FunctionLike, fn: EmptyFunction): void;
+        /** Only runs the tests inside this `describe` for the current file */
         only: Describe;
+        /** Skips running the tests inside this `describe` for the current file */
         skip: Describe;
+        each: Each;
     }
 
     interface MatcherUtils {
@@ -256,10 +336,14 @@ declare namespace jest {
             printWithType(name: string, received: any, print: (value: any) => string): string;
             stringify(object: {}, maxDepth?: number): string;
         };
+        /**
+         *  This is a deep-equality function that will return true if two objects have the same values (recursively).
+         */
+        equals(a: any, b: any): boolean;
     }
 
     interface ExpectExtendMap {
-        [key: string]: (this: MatcherUtils, received: any, ...actual: any[]) => { message(): string, pass: boolean };
+        [key: string]: (this: MatcherUtils, received: any, ...actual: any[]) => { message(): string | (() => string), pass: boolean } | Promise<{ message(): string, pass: boolean }>;
     }
 
     interface SnapshotSerializerOptions {
@@ -311,11 +395,37 @@ declare namespace jest {
          *
          * @param actual The value to apply matchers against.
          */
-        (actual: any): Matchers<void>;
+        <T = any>(actual: T): Matchers<T>;
+        /**
+         * Matches anything but null or undefined. You can use it inside `toEqual` or `toBeCalledWith` instead
+         * of a literal value. For example, if you want to check that a mock function is called with a
+         * non-null argument:
+         *
+         * @example
+         *
+         * test('map calls its argument with a non-null argument', () => {
+         *   const mock = jest.fn();
+         *   [1].map(x => mock(x));
+         *   expect(mock).toBeCalledWith(expect.anything());
+         * });
+         *
+         */
         anything(): any;
         /**
          * Matches anything that was created with the given constructor.
          * You can use it inside `toEqual` or `toBeCalledWith` instead of a literal value.
+         *
+         * @example
+         *
+         * function randocall(fn) {
+         *   return fn(Math.floor(Math.random() * 6 + 1));
+         * }
+         *
+         * test('randocall calls its callback with a number', () => {
+         *   const mock = jest.fn();
+         *   randocall(mock);
+         *   expect(mock).toBeCalledWith(expect.any(Number));
+         * });
          */
         any(classType: any): any;
         /**
@@ -507,6 +617,19 @@ declare namespace jest {
          * no matter what value you provided as the expected return value.
          */
         toHaveNthReturnedWith(nthCall: number, expected: any): R;
+        /**
+         * Use to check if property at provided reference keyPath exists for an object.
+         * For checking deeply nested properties in an object you may use dot notation or an array containing
+         * the keyPath for deep references.
+         *
+         * Optionally, you can provide a value to check if it's equal to the value present at keyPath
+         * on the target object. This matcher uses 'deep equality' (like `toEqual()`) and recursively checks
+         * the equality of all fields.
+         *
+         * @example
+         *
+         * expect(houseForSale).toHaveProperty('kitchen.area', 20);
+         */
         toHaveProperty(propertyPath: string | any[], value?: any): R;
         /**
          * Use to test that the mock function successfully returned (i.e., did not throw an error) at least one time
@@ -529,11 +652,28 @@ declare namespace jest {
          * Used to check that a JavaScript object matches a subset of the properties of an object
          */
         toMatchObject(expected: {} | any[]): R;
+        /**
+         * This ensures that a value matches the most recent snapshot with property matchers.
+         * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
+         */
+        toMatchSnapshot<T extends {[P in keyof R]: Expect['any']}>(propertyMatchers: Partial<T>, snapshotName?: string): R;
         /**
          * This ensures that a value matches the most recent snapshot.
          * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
          */
         toMatchSnapshot(snapshotName?: string): R;
+        /**
+         * This ensures that a value matches the most recent snapshot with property matchers.
+         * Instead of writing the snapshot value to a .snap file, it will be written into the source code automatically.
+         * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
+         */
+        toMatchInlineSnapshot<T extends {[P in keyof R]: Expect['any']}>(propertyMatchers: Partial<T>, snapshot?: string): R;
+        /**
+         * This ensures that a value matches the most recent snapshot with property matchers.
+         * Instead of writing the snapshot value to a .snap file, it will be written into the source code automatically.
+         * Check out [the Snapshot Testing guide](http://facebook.github.io/jest/docs/snapshot-testing.html) for more information.
+         */
+        toMatchInlineSnapshot(snapshot?: string): R;
         /**
          * Ensure that a mock function has returned (as opposed to thrown) at least once.
          */
@@ -553,15 +693,20 @@ declare namespace jest {
         /**
          * Used to test that a function throws when it is called.
          */
-        toThrow(error?: string | Constructable | RegExp): R;
+        toThrow(error?: string | Constructable | RegExp | Error): R;
         /**
          * If you want to test that a specific error is thrown inside a function.
          */
-        toThrowError(error?: string | Constructable | RegExp): R;
+        toThrowError(error?: string | Constructable | RegExp | Error): R;
         /**
          * Used to test that a function throws a error matching the most recent snapshot when it is called.
          */
         toThrowErrorMatchingSnapshot(): R;
+        /**
+         * Used to test that a function throws a error matching the most recent snapshot when it is called.
+         * Instead of writing the snapshot value to a .snap file, it will be written into the source code automatically.
+         */
+        toThrowErrorMatchingInlineSnapshot(snapshot?: string): R;
     }
 
     interface Constructable {
@@ -574,6 +719,12 @@ declare namespace jest {
     }
 
     interface SpyInstance<T = {}> extends MockInstance<T> {
+        /**
+         * Removes the mock and restores the initial implementation.
+         *
+         * This is useful when you want to mock functions in certain test cases and restore the
+         * original implementation in others.
+         */
         mockRestore(): void;
     }
 
@@ -581,6 +732,7 @@ declare namespace jest {
      * Wrap module with mock definitions
      *
      * @example
+     *
      *  jest.mock("../api");
      *  import { Api } from "../api";
      *
@@ -592,19 +744,148 @@ declare namespace jest {
     } & T;
 
     interface MockInstance<T> {
+        /** Returns the mock name string set by calling `mockFn.mockName(value)`. */
         getMockName(): string;
+        /** Provides access to the mock's metadata */
         mock: MockContext<T>;
+        /**
+         * Resets all information stored in the mockFn.mock.calls and mockFn.mock.instances arrays.
+         *
+         * Often this is useful when you want to clean up a mock's usage data between two assertions.
+         *
+         * Beware that `mockClear` will replace `mockFn.mock`, not just `mockFn.mock.calls` and `mockFn.mock.instances`.
+         * You should therefore avoid assigning mockFn.mock to other variables, temporary or not, to make sure you
+         * don't access stale data.
+         */
         mockClear(): void;
+        /**
+         * Resets all information stored in the mock, including any initial implementation and mock name given.
+         *
+         * This is useful when you want to completely restore a mock back to its initial state.
+         *
+         * Beware that `mockReset` will replace `mockFn.mock`, not just `mockFn.mock.calls` and `mockFn.mock.instances`.
+         * You should therefore avoid assigning mockFn.mock to other variables, temporary or not, to make sure you
+         * don't access stale data.
+         */
         mockReset(): void;
-        mockImplementation(fn: (...args: any[]) => any): Mock<T>;
+        /**
+         * Accepts a function that should be used as the implementation of the mock. The mock itself will still record
+         * all calls that go into and instances that come from itself – the only difference is that the implementation
+         * will also be executed when the mock is called.
+         *
+         * Note: `jest.fn(implementation)` is a shorthand for `jest.fn().mockImplementation(implementation)`.
+         */
+        mockImplementation(fn?: (...args: any[]) => any): Mock<T>;
+        /**
+         * Accepts a function that will be used as an implementation of the mock for one call to the mocked function.
+         * Can be chained so that multiple function calls produce different results.
+         *
+         * @example
+         *
+         * const myMockFn = jest
+         *   .fn()
+         *    .mockImplementationOnce(cb => cb(null, true))
+         *    .mockImplementationOnce(cb => cb(null, false));
+         *
+         * myMockFn((err, val) => console.log(val)); // true
+         *
+         * myMockFn((err, val) => console.log(val)); // false
+         */
         mockImplementationOnce(fn: (...args: any[]) => any): Mock<T>;
+        /** Sets the name of the mock`. */
         mockName(name: string): Mock<T>;
+        /**
+         * Just a simple sugar function for:
+         *
+         * @example
+         *
+         *   jest.fn(function() {
+         *     return this;
+         *   });
+         */
         mockReturnThis(): Mock<T>;
+        /**
+         * Accepts a value that will be returned whenever the mock function is called.
+         *
+         * @example
+         *
+         * const mock = jest.fn();
+         * mock.mockReturnValue(42);
+         * mock(); // 42
+         * mock.mockReturnValue(43);
+         * mock(); // 43
+         */
         mockReturnValue(value: any): Mock<T>;
+        /**
+         * Accepts a value that will be returned for one call to the mock function. Can be chained so that
+         * successive calls to the mock function return different values. When there are no more
+         * `mockReturnValueOnce` values to use, calls will return a value specified by `mockReturnValue`.
+         *
+         * @example
+         *
+         * const myMockFn = jest.fn()
+         *   .mockReturnValue('default')
+         *   .mockReturnValueOnce('first call')
+         *   .mockReturnValueOnce('second call');
+         *
+         * // 'first call', 'second call', 'default', 'default'
+         * console.log(myMockFn(), myMockFn(), myMockFn(), myMockFn());
+         *
+         */
         mockReturnValueOnce(value: any): Mock<T>;
+        /**
+         * Simple sugar function for: `jest.fn().mockImplementation(() => Promise.resolve(value));`
+         */
         mockResolvedValue(value: any): Mock<T>;
+        /**
+         * Simple sugar function for: `jest.fn().mockImplementationOnce(() => Promise.resolve(value));`
+         *
+         * @example
+         *
+         * test('async test', async () => {
+         *  const asyncMock = jest
+         *    .fn()
+         *    .mockResolvedValue('default')
+         *    .mockResolvedValueOnce('first call')
+         *    .mockResolvedValueOnce('second call');
+         *
+         *  await asyncMock(); // first call
+         *  await asyncMock(); // second call
+         *  await asyncMock(); // default
+         *  await asyncMock(); // default
+         * });
+         *
+         */
         mockResolvedValueOnce(value: any): Mock<T>;
+        /**
+         * Simple sugar function for: `jest.fn().mockImplementation(() => Promise.reject(value));`
+         *
+         * @example
+         *
+         * test('async test', async () => {
+         *   const asyncMock = jest.fn().mockRejectedValue(new Error('Async error'));
+         *
+         *   await asyncMock(); // throws "Async error"
+         * });
+         */
         mockRejectedValue(value: any): Mock<T>;
+
+        /**
+         * Simple sugar function for: `jest.fn().mockImplementationOnce(() => Promise.reject(value));`
+         *
+         * @example
+         *
+         * test('async test', async () => {
+         *  const asyncMock = jest
+         *    .fn()
+         *    .mockResolvedValueOnce('first call')
+         *    .mockRejectedValueOnce(new Error('Async error'));
+         *
+         *  await asyncMock(); // first call
+         *  await asyncMock(); // throws "Async error"
+         * });
+         *
+         */
         mockRejectedValueOnce(value: any): Mock<T>;
     }
 
diff --git a/types/jest/jest-tests.ts b/types/jest/jest-tests.ts
index bf1620f313..801c6a5a78 100644
--- a/types/jest/jest-tests.ts
+++ b/types/jest/jest-tests.ts
@@ -289,7 +289,6 @@ const spiedTarget = {
 const spy1 = jest.spyOn(spiedTarget, "returnsVoid");
 const spy2 = jest.spyOn(spiedTarget, "returnsVoid", "get");
 const spy3 = jest.spyOn(spiedTarget, "returnsString", "set");
-
 const spy1Name: string = spy1.getMockName();
 
 const spy2Calls: any[][] = spy2.mock.calls;
@@ -299,8 +298,10 @@ spy2.mockReset();
 
 const spy3Mock: jest.Mock<() => string> = spy3
     .mockImplementation(() => "")
+    .mockImplementation()
     .mockImplementation((arg: {}) => arg)
     .mockImplementation((...args: string[]) => args.join(""))
+    .mockImplementationOnce(() => "")
     .mockName("name")
     .mockReturnThis()
     .mockReturnValue("value")
@@ -425,6 +426,72 @@ expect.extend({
         };
     }
 });
+expect.extend({
+    async foo(this: jest.MatcherUtils, received: {}, ...actual: Array<{}>) {
+        return {
+            message: () => JSON.stringify(received),
+            pass: false,
+        };
+    }
+});
+expect.extend({
+    foo(this: jest.MatcherUtils) {
+        const isNot: boolean = this.isNot;
+
+        const expectedColor = this.utils.EXPECTED_COLOR("blue");
+        const receivedColor = this.utils.EXPECTED_COLOR("red");
+
+        this.utils.ensureActualIsNumber({});
+        this.utils.ensureActualIsNumber({}, "matcher");
+
+        this.utils.ensureExpectedIsNumber({});
+        this.utils.ensureExpectedIsNumber({}, "matcher");
+
+        this.utils.ensureNoExpected({});
+        this.utils.ensureNoExpected({}, "matcher");
+
+        this.utils.ensureNumbers({}, {});
+        this.utils.ensureNumbers({}, {}, "matcher");
+
+        const valueType: string = this.utils.getType({});
+
+        this.utils.matcherHint("matcher");
+        this.utils.matcherHint("matcher", "received");
+        this.utils.matcherHint("matcher", "received", "expected");
+        this.utils.matcherHint("matcher", "received", "expected", {});
+        this.utils.matcherHint("matcher", "received", "expected", {
+            isDirectExpectCall: true,
+        });
+        this.utils.matcherHint("matcher", "received", "expected", {
+            secondArgument: "",
+        });
+        this.utils.matcherHint("matcher", "received", "expected", {
+            isDirectExpectCall: true,
+            secondArgument: "",
+        });
+
+        const plural: string = this.utils.pluralize("word", 3);
+
+        const expectedPrinted: string = this.utils.printExpected({});
+
+        const receivedPrinted: string = this.utils.printReceived({});
+
+        const printedWithType: string = this.utils.printWithType(
+            "name",
+            {},
+            (value: {}) => "");
+
+        const stringified: string = this.utils.stringify({});
+        const stringifiedWithMaxDepth: string = this.utils.stringify({}, 3);
+
+        const equals: boolean = this.equals({}, {});
+
+        return {
+            message: () => "",
+            pass: false,
+        };
+    }
+});
 
 /* Basic matchers */
 
@@ -544,6 +611,21 @@ describe("", () => {
 
         expect({}).toMatchSnapshot();
         expect({}).toMatchSnapshot("snapshotName");
+        expect({ abc: "def" }).toMatchSnapshot({ abc: expect.any(String) }, "snapshotName");
+        expect({
+            one: 1,
+            two: "2",
+            date: new Date(),
+        }).toMatchSnapshot({ one: expect.any(Number), date: expect.any(Date) });
+
+        expect({}).toMatchInlineSnapshot();
+        expect({}).toMatchInlineSnapshot("snapshot");
+        expect({ abc: "def" }).toMatchInlineSnapshot({ abc: expect.any(String) }, "snapshot");
+        expect({
+            one: 1,
+            two: "2",
+            date: new Date(),
+        }).toMatchInlineSnapshot({ one: expect.any(Number), date: expect.any(Date) });
 
         expect(jest.fn()).toReturn();
 
@@ -556,15 +638,27 @@ describe("", () => {
         expect(true).toStrictEqual(false);
         expect({}).toStrictEqual({});
 
+        const errInstance = new Error();
+        const willThrow = () => { throw new Error(); };
         expect(() => {}).toThrow();
-        expect(() => { throw new Error(); }).toThrow("");
+        expect(willThrow).toThrow("");
+        expect(willThrow).toThrow(errInstance);
         expect(jest.fn()).toThrow(Error);
-        expect(jest.fn(() => { throw new Error(); })).toThrow(/foo/);
+        expect(jest.fn(willThrow)).toThrow(/foo/);
 
         expect(() => {}).toThrowErrorMatchingSnapshot();
-        expect(() => { throw new Error(); }).toThrowErrorMatchingSnapshot();
+        expect(willThrow).toThrowErrorMatchingSnapshot();
         expect(jest.fn()).toThrowErrorMatchingSnapshot();
-        expect(jest.fn(() => { throw new Error(); })).toThrowErrorMatchingSnapshot();
+        expect(jest.fn(willThrow)).toThrowErrorMatchingSnapshot();
+
+        expect(() => {}).toThrowErrorMatchingInlineSnapshot();
+        expect(() => {}).toThrowErrorMatchingInlineSnapshot('Error Message');
+        expect(willThrow).toThrowErrorMatchingInlineSnapshot();
+        expect(willThrow).toThrowErrorMatchingInlineSnapshot('Error Message');
+        expect(jest.fn()).toThrowErrorMatchingInlineSnapshot();
+        expect(jest.fn()).toThrowErrorMatchingInlineSnapshot('Error Message');
+        expect(jest.fn(willThrow)).toThrowErrorMatchingInlineSnapshot();
+        expect(jest.fn(willThrow)).toThrowErrorMatchingInlineSnapshot('Error Message');
 
         /* not */
 
@@ -956,3 +1050,105 @@ const testJestConfig = (defaults: jest.DefaultOptions) => {
       }
     };
 };
+
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/26368
+
+describe.each([[1, 1, 2], [1, 2, 3], [2, 1, 3]])(
+    ".add(%i, %i)",
+    (a: number, b: number, expected: number) => {
+        test(`returns ${expected}`, () => {
+            expect(a + b).toBe(expected);
+        });
+    }
+);
+
+interface Case {
+    a: number;
+    b: number;
+    expected: number;
+}
+
+describe.each`
+    a    | b    | expected
+    ${1} | ${1} | ${2}
+    ${1} | ${2} | ${3}
+    ${2} | ${1} | ${3}
+`("$a + $b", ({ a, b, expected }: Case) => {
+    test(`returns ${expected}`, () => {
+        expect(a + b).toBe(expected);
+    });
+});
+
+describe.only.each([[1, 1, 2], [1, 2, 3], [2, 1, 3]])(
+    ".add(%i, %i)",
+    (a, b, expected) => {
+        test(`returns ${expected}`, () => {
+            expect(a + b).toBe(expected);
+        });
+    }
+);
+
+describe.only.each`
+    a    | b    | expected
+    ${1} | ${1} | ${2}
+    ${1} | ${2} | ${3}
+    ${2} | ${1} | ${3}
+`("$a + $b", ({ a, b, expected }: Case) => {
+    test(`returns ${expected}`, () => {
+        expect(a + b).toBe(expected);
+    });
+});
+
+describe.skip.each([[1, 1, 2], [1, 2, 3], [2, 1, 3]])(
+    ".add(%i, %i)",
+    (a, b, expected) => {
+        test(`returns ${expected}`, () => {
+            expect(a + b).toBe(expected);
+        });
+    }
+);
+
+describe.skip.each`
+    a    | b    | expected
+    ${1} | ${1} | ${2}
+    ${1} | ${2} | ${3}
+    ${2} | ${1} | ${3}
+`("$a + $b", ({ a, b, expected }: Case) => {
+    test(`returns ${expected}`, () => {
+        expect(a + b).toBe(expected);
+    });
+});
+
+test.each([[1, 1, 2], [1, 2, 3], [2, 1, 3]])(
+    ".add(%i, %i)",
+    (a, b, expected) => {
+        expect(a + b).toBe(expected);
+    }
+);
+
+test.each`
+    a    | b    | expected
+    ${1} | ${1} | ${2}
+    ${1} | ${2} | ${3}
+    ${2} | ${1} | ${3}
+`("returns $expected when $a is added $b", ({ a, b, expected }: Case) => {
+    expect(a + b).toBe(expected);
+});
+
+test.only.each([[1, 1, 2], [1, 2, 3], [2, 1, 3]])(
+    ".add(%i, %i)",
+    (a, b, expected) => {
+        expect(a + b).toBe(expected);
+    }
+);
+
+test.only.each`
+    a    | b    | expected
+    ${1} | ${1} | ${2}
+    ${1} | ${2} | ${3}
+    ${2} | ${1} | ${3}
+`("returns $expected when $a is added $b", ({ a, b, expected }: Case) => {
+    expect(a + b).toBe(expected);
+});
+
+expect("").toHaveProperty("path.to.thing");
diff --git a/types/jexl/index.d.ts b/types/jexl/index.d.ts
new file mode 100644
index 0000000000..e47e8c3257
--- /dev/null
+++ b/types/jexl/index.d.ts
@@ -0,0 +1,110 @@
+// Type definitions for jexl 1.1
+// Project: https://github.com/TechnologyAdvice/jexl
+// Definitions by: Marcin Tomczyk <https://github.com/m-tomczyk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// Currently maintained by https://github.com/TomFrost/Jexl
+
+type TransformFunction = (value: any, ...args: any[]) => any;
+
+type BinaryOpFunction = (left: any, right: any) => any;
+
+type UnaryOpFunction = (right: any) => any;
+
+type EvalCallbackFunction = (err: Error | null, result: any) => void;
+
+/**
+ * Jexl is the Javascript Expression Language, capable of parsing and
+ * evaluating basic to complex expression strings, combined with advanced
+ * xpath-like drilldown into native Javascript objects.
+ */
+declare class Jexl {
+    /**
+     * Adds a binary operator to Jexl at the specified precedence. The higher the
+     * precedence, the earlier the operator is applied in the order of operations.
+     * For example, * has a higher precedence than +, because multiplication comes
+     * before division.
+     *
+     * Please see grammar.js for a listing of all default operators and their
+     * precedence values in order to choose the appropriate precedence for the
+     * new operator.
+     * @param operator The operator string to be added
+     * @param precedence The operator's precedence
+     * @param fn A function to run to calculate the result. The function
+     *      will be called with two arguments: left and right, denoting the values
+     *      on either side of the operator. It should return either the resulting
+     *      value, or a Promise that resolves with the resulting value.
+     */
+    addBinaryOp(operator: string, precedence: number, fn: BinaryOpFunction): void;
+
+    /**
+     * Adds a unary operator to Jexl. Unary operators are currently only supported
+     * on the left side of the value on which it will operate.
+     * @param operator The operator string to be added
+     * @param fn A function to run to calculate the result. The function
+     *      will be called with one argument: the literal value to the right of the
+     *      operator. It should return either the resulting value, or a Promise
+     *      that resolves with the resulting value.
+     */
+    addUnaryOp(operator: string, fn: UnaryOpFunction): void;
+
+    /**
+     * Adds or replaces a transform function in this Jexl instance.
+     * @param name The name of the transform function, as it will be used
+     *      within Jexl expressions
+     * @param fn The function to be executed when this transform is
+     *      invoked.  It will be provided with at least one argument:
+     *          - {*} value: The value to be transformed
+     *          - {...*} args: The arguments for this transform
+     */
+    addTransform(name: string, fn: TransformFunction): void;
+
+    /**
+     * Syntactic sugar for calling {@link #Jexl:addTransform} repeatedly.  This function
+     * accepts a map of one or more transform names to their transform function.
+     * @param map A map of transform names to transform functions
+     */
+    addTransforms(map: { [key: string]: TransformFunction }): void;
+
+    /**
+     * Retrieves a previously set transform function.
+     * @param name The name of the transform function
+     * @returns The transform function
+     */
+    getTransform(name: string): TransformFunction;
+
+    /**
+     * Evaluates a Jexl string within an optional context.
+     * @param expression The Jexl expression to be evaluated
+     * @param context A mapping of variables to values, which will be
+     *      made accessible to the Jexl expression when evaluating it
+     * @param cb An optional callback function to be executed when
+     *      evaluation is complete.  It will be supplied with two arguments:
+     *          - err: Present if an error occurred
+     *          - result: The result of the evaluation
+     * @returns resolves with the result of the evaluation.  Note that
+     *      if a callback is supplied, the returned promise will already have
+     *      a '.catch' attached to it in order to pass the error to the callback.
+     */
+    eval(expression: string, context?: object, cb?: EvalCallbackFunction): Promise<any>;
+
+    /**
+     * Removes a binary or unary operator from the Jexl grammar.
+     * @param operator The operator string to be removed
+     */
+    removeOp(operator: string): void;
+}
+
+/**
+ * Jexl is the Javascript Expression Language, capable of parsing and
+ * evaluating basic to complex expression strings, combined with advanced
+ * xpath-like drilldown into native Javascript objects.
+ */
+declare class BuildableJexl extends Jexl {
+    Jexl: { new(): Jexl };
+}
+
+declare const exportJexl: BuildableJexl;
+
+export = exportJexl;
diff --git a/types/jexl/jexl-tests.ts b/types/jexl/jexl-tests.ts
new file mode 100644
index 0000000000..872c9e7dd4
--- /dev/null
+++ b/types/jexl/jexl-tests.ts
@@ -0,0 +1,83 @@
+import * as jexl from "jexl";
+
+const context = {
+    name: {first: 'Sterling', last: 'Archer'},
+    assoc: [
+        {first: 'Lana', last: 'Kane'},
+        {first: 'Cyril', last: 'Figgis'},
+        {first: 'Pam', last: 'Poovey'}
+    ],
+    age: 36
+};
+
+// Filter an array
+// Output: Kane
+// $ExpectType Promise<any>
+jexl.eval('assoc[.first == "Lana"].last', context);
+
+// Do math
+// Output: 72
+// $ExpectType Promise<any>
+jexl.eval('age * (3 - 1)', context, (err, res) => {
+});
+
+// Concatenate
+// Output: Sterling Archer
+// $ExpectType Promise<any>
+jexl.eval('name.first + " " + name["la" + "st"]', context);
+
+// Compound
+// Output: true
+// $ExpectType Promise<any>
+jexl.eval('assoc[.last == "Figgis"].first == "Cyril" && assoc[.last == "Poovey"].first == "Pam"', context);
+
+// Use array indexes
+// Output: Cyril Figgis
+// $ExpectType Promise<any>
+jexl.eval('assoc[1]', context, (err, res) => {
+});
+
+// Use conditional logic
+// Output: working
+// $ExpectType Promise<any>
+jexl.eval('age > 62 ? "retired" : "working"', context);
+
+// Transform
+// $ExpectType void
+jexl.addTransform('upper', (val) => {
+    return val.toUpperCase();
+});
+// Output: DUCHESS ARCHER
+// $ExpectType Promise<any>
+jexl.eval('"duchess"|upper + " " + name.last|upper', context);
+
+// Transform asynchronously, with arguments
+// $ExpectType void
+jexl.addTransform('getStat', (val, stat) => {
+    return Promise.resolve('Test'); // Returns a promise
+});
+// Output: 184
+// $ExpectType Promise<any>
+jexl.eval('name.last|getStat("weight")', context, (err, res) => {
+});
+
+// Transform with multiple arguments
+// $ExpectType void
+jexl.addTransform('substring', (val: string, start: number, end?: number) => {
+    return val.substring(start, end);
+});
+
+// Add your own (a)synchronous operators
+// Here's a case-insensitive string equality
+// $ExpectType void
+jexl.addBinaryOp('_=', 20, (left, right) => {
+    return left.toLowerCase() === right.toLowerCase();
+});
+// Output: true
+// $ExpectType Promise<any>
+jexl.eval('"Guest" _= "gUeSt"');
+
+const newJexlInstance = new jexl.Jexl();
+
+// $ExpectType Promise<any>
+newJexlInstance.eval("true == true");
diff --git a/types/jexl/tsconfig.json b/types/jexl/tsconfig.json
new file mode 100644
index 0000000000..8db678a16d
--- /dev/null
+++ b/types/jexl/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",
+        "jexl-tests.ts"
+    ]
+}
diff --git a/types/jexl/tslint.json b/types/jexl/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jexl/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jira-client/index.d.ts b/types/jira-client/index.d.ts
new file mode 100644
index 0000000000..e92d2a2f64
--- /dev/null
+++ b/types/jira-client/index.d.ts
@@ -0,0 +1,368 @@
+// Type definitions for jira-client 6.4
+// Project: https://github.com/jira-node/node-jira-client
+// Definitions by: Anatoliy Ostapenko <https://github.com/KOPTE3>
+//                 Orta Therox <https://github.com/orta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { CoreOptions, RequestResponse } from "request";
+import { ReadStream } from "fs";
+
+declare class JiraApi {
+    private protocol: string;
+    private host: string;
+    private port: string | null;
+    private apiVersion: string;
+    private base: string;
+    private intermediatePath?: string;
+    private strictSSL: boolean;
+    private webhookVersion: string;
+    private greenhopperVersion: string;
+
+    constructor(options: JiraApi.JiraApiOptions);
+
+    findIssue(
+        issueNumber: string,
+        expand?: string,
+        fields?: string,
+        properties?: string,
+        fieldsByKeys?: boolean
+    ): Promise<JiraApi.JsonResponse>;
+
+    getUnresolvedIssueCount(version: string): Promise<number>;
+
+    getProject(project: string): Promise<JiraApi.JsonResponse>;
+
+    createProject(project: string): Promise<JiraApi.JsonResponse>;
+
+    findRapidView(projectName: string): Promise<JiraApi.JsonResponse[]>;
+
+    getLastSprintForRapidView(rapidViewId: string): Promise<JiraApi.JsonResponse>;
+
+    getSprintIssues(rapidViewId: string, sprintId: string): Promise<JiraApi.JsonResponse>;
+
+    listSprints(rapidViewId: string): Promise<JiraApi.JsonResponse>;
+
+    addIssueToSprint(issueId: string, sprintId: string): Promise<JiraApi.JsonResponse>;
+
+    issueLink(link: JiraApi.LinkObject): Promise<JiraApi.JsonResponse>;
+
+    getRemoteLinks(issueNumber: string): Promise<JiraApi.JsonResponse>;
+
+    createRemoteLink(issueNumber: string, remoteLink: JiraApi.LinkObject): Promise<JiraApi.JsonResponse>;
+
+    getVersions(project: string): Promise<JiraApi.JsonResponse>;
+
+    createVersion(version: string): Promise<JiraApi.JsonResponse>;
+
+    updateVersion(version: string): Promise<JiraApi.JsonResponse>;
+
+    deleteVersion(
+        versionId: string,
+        moveFixIssuesToId: string,
+        moveAffectedIssuesToId: string
+    ): Promise<JiraApi.JsonResponse>;
+
+    searchJira(searchString: string, optional?: JiraApi.SearchQuery): Promise<JiraApi.JsonResponse>;
+
+    createUser(user: JiraApi.UserObject): Promise<JiraApi.JsonResponse>;
+
+    searchUsers(options: JiraApi.SearchUserOptions): Promise<JiraApi.JsonResponse>;
+
+    getUsersInGroup(groupname: string, startAt?: number, maxResults?: number): Promise<JiraApi.JsonResponse>;
+
+    addNewIssue(issue: JiraApi.IssueObject): Promise<JiraApi.JsonResponse>;
+
+    addWatcher(issueKey: string, username: string): Promise<JiraApi.JsonResponse>;
+
+    deleteIssue(issueId: string): Promise<JiraApi.JsonResponse>;
+
+    updateIssue(issueId: string, issueUpdate: JiraApi.IssueObject): Promise<JiraApi.JsonResponse>;
+
+    listComponents(project: string): Promise<JiraApi.JsonResponse>;
+
+    addNewComponent(component: JiraApi.ComponentObject): Promise<JiraApi.JsonResponse>;
+
+    deleteComponent(componentId: string): Promise<JiraApi.JsonResponse>;
+
+    createCustomField(field: JiraApi.FieldObject): Promise<JiraApi.JsonResponse>;
+
+    listFields(): Promise<JiraApi.JsonResponse>;
+
+    createFieldOption(fieldKey: string, option: JiraApi.FieldOptionObject): Promise<JiraApi.JsonResponse>;
+
+    listFieldOptions(fieldKey: string): Promise<JiraApi.JsonResponse>;
+
+    upsertFieldOption(
+        fieldKey: string,
+        optionId: string,
+        option: JiraApi.FieldOptionObject
+    ): Promise<JiraApi.JsonResponse>;
+
+    getFieldOption(fieldKey: string, optionId: string): Promise<JiraApi.JsonResponse>;
+
+    deleteFieldOption(fieldKey: string, optionId: string): Promise<JiraApi.JsonResponse>;
+
+    getIssueProperty(issueNumber: string, property: string): Promise<JiraApi.JsonResponse>;
+
+    listPriorities(): Promise<JiraApi.JsonResponse>;
+
+    listTransitions(issueId: string): Promise<JiraApi.JsonResponse>;
+
+    transitionIssue(issueId: string, issueTransition: JiraApi.TransitionObject): Promise<JiraApi.JsonResponse>;
+
+    listProjects(): Promise<JiraApi.JsonResponse>;
+
+    addComment(issueId: string, comment: string): Promise<JiraApi.JsonResponse>;
+
+    updateComment(issueId: string, commentId: string, comment: string, options?: any): Promise<JiraApi.JsonResponse>;
+
+    addWorklog(
+        issueId: string,
+        worklog: JiraApi.WorklogObject,
+        newEstimate: JiraApi.EstimateObject
+    ): Promise<JiraApi.JsonResponse>;
+
+    deleteWorklog(issueId: string, worklogId: string): Promise<JiraApi.JsonResponse>;
+
+    listIssueTypes(): Promise<JiraApi.JsonResponse>;
+
+    registerWebhook(webhook: JiraApi.WebhookObject): Promise<JiraApi.JsonResponse>;
+
+    listWebhooks(): Promise<JiraApi.JsonResponse>;
+
+    getWebhook(webhookID: string): Promise<JiraApi.JsonResponse>;
+
+    deleteWebhook(webhookID: string): Promise<JiraApi.JsonResponse>;
+
+    getCurrentUser(): Promise<JiraApi.JsonResponse>;
+
+    getBacklogForRapidView(rapidViewId: string): Promise<JiraApi.JsonResponse>;
+
+    addAttachmentOnIssue(issueId: string, readStream: ReadStream): Promise<JiraApi.JsonResponse>;
+
+    issueNotify(issueId: string, notificationBody: JiraApi.NotificationObject): Promise<JiraApi.JsonResponse>;
+
+    listStatus(): Promise<JiraApi.JsonResponse>;
+
+    getDevStatusSummary(issueId: string): Promise<JiraApi.JsonResponse>;
+
+    getDevStatusDetail(issueId: string, applicationType: string, dataType: string): Promise<JiraApi.JsonResponse>;
+
+    moveToBacklog(issues: string[]): Promise<JiraApi.JsonResponse>;
+
+    getAllBoards(
+        startAt?: number,
+        maxResults?: number,
+        type?: string,
+        name?: string,
+        projectKeyOrId?: string
+    ): Promise<JiraApi.JsonResponse>;
+
+    createBoard(boardBody: JiraApi.BoardObject): Promise<JiraApi.JsonResponse>;
+
+    getBoard(boardId: string): Promise<JiraApi.JsonResponse>;
+
+    deleteBoard(boardId: string): Promise<JiraApi.JsonResponse>;
+
+    getIssuesForBacklog(
+        boardId: string,
+        startAt?: number,
+        maxResults?: number,
+        jql?: string,
+        validateQuery?: boolean,
+        fields?: string
+    ): Promise<JiraApi.JsonResponse>;
+
+    getConfiguration(boardId: string): Promise<JiraApi.JsonResponse>;
+
+    getIssuesForBoard(
+        boardId: string,
+        startAt?: number,
+        maxResults?: number,
+        jql?: string,
+        validateQuery?: boolean,
+        fields?: string
+    ): Promise<JiraApi.JsonResponse>;
+
+    getEpics(
+        boardId: string,
+        startAt?: number,
+        maxResults?: number,
+        done?: "true" | "false"
+    ): Promise<JiraApi.JsonResponse>;
+
+    getBoardIssuesForEpic(
+        boardId: string,
+        epicId: string,
+        startAt?: number,
+        maxResults?: number,
+        jql?: string,
+        validateQuery?: boolean,
+        fields?: string
+    ): Promise<JiraApi.JsonResponse>;
+
+    getProjects(boardId: string, startAt?: number, maxResults?: number): Promise<JiraApi.JsonResponse>;
+
+    getProjectsFull(boardId: string): Promise<JiraApi.JsonResponse>;
+
+    getBoardPropertiesKeys(boardId: string): Promise<JiraApi.JsonResponse>;
+
+    deleteBoardProperty(boardId: string, propertyKey: string): Promise<JiraApi.JsonResponse>;
+
+    setBoardProperty(boardId: string, propertyKey: string, body: string): Promise<JiraApi.JsonResponse>;
+
+    getBoardProperty(boardId: string, propertyKey: string): Promise<JiraApi.JsonResponse>;
+
+    getAllSprints(
+        boardId: string,
+        startAt?: number,
+        maxResults?: number,
+        state?: "future" | "active" | "closed"
+    ): Promise<JiraApi.JsonResponse>;
+
+    getBoardIssuesForSprint(
+        boardId: string,
+        sprintId: string,
+        startAt?: number,
+        maxResults?: number,
+        jql?: string,
+        validateQuery?: boolean,
+        fields?: string
+    ): Promise<JiraApi.JsonResponse>;
+
+    getAllVersions(
+        boardId: string,
+        startAt?: number,
+        maxResults?: number,
+        released?: "true" | "false"
+    ): Promise<JiraApi.JsonResponse>;
+
+    private makeRequestHeader(uri: string, options?: JiraApi.UriOptions);
+
+    private makeUri(options: JiraApi.UriOptions): string;
+
+    private makeWebhookUri(options: JiraApi.UriOptions): string;
+
+    private makeSprintQueryUri(options: JiraApi.UriOptions): string;
+
+    private makeDevStatusUri(options: JiraApi.UriOptions): string;
+
+    private makeAgileUri(options: JiraApi.UriOptions): string;
+
+    private doRequest(requestOptions: CoreOptions): Promise<RequestResponse>;
+}
+
+declare namespace JiraApi {
+    interface JiraApiOptions {
+        protocol?: string;
+        host: string;
+        port?: string;
+        username?: string;
+        password?: string;
+        apiVersion?: string;
+        base?: string;
+        intermediatePath?: string;
+        strictSSL?: boolean;
+        request?: any;
+        timeout?: number;
+        webhookVersion?: string;
+        greenhopperVersion?: string;
+        bearer?: string;
+        oauth?: OAuth;
+    }
+
+    interface OAuth {
+        consumer_key: string;
+        consumer_secret: string;
+        access_token: string;
+        access_token_secret: string;
+        signature_method?: string;
+    }
+
+    interface LinkObject {
+        [name: string]: any;
+    }
+
+    interface Query {
+        [name: string]: any;
+    }
+
+    interface JsonResponse {
+        [name: string]: any;
+    }
+
+    interface UserObject {
+        [name: string]: any;
+    }
+
+    interface IssueObject {
+        [name: string]: any;
+    }
+
+    interface ComponentObject {
+        [name: string]: any;
+    }
+
+    interface FieldObject {
+        [name: string]: any;
+    }
+
+    interface FieldOptionObject {
+        [name: string]: any;
+    }
+
+    interface TransitionObject {
+        [name: string]: any;
+    }
+
+    interface WorklogObject {
+        [name: string]: any;
+    }
+
+    interface EstimateObject {
+        [name: string]: any;
+    }
+
+    interface WebhookObject {
+        [name: string]: any;
+    }
+
+    interface NotificationObject {
+        [name: string]: any;
+    }
+
+    interface BoardObject {
+        [name: string]: any;
+    }
+
+    interface SearchUserOptions {
+        username: string;
+        startAt?: number;
+        maxResults?: number;
+        includeActive?: boolean;
+        includeInactive?: boolean;
+    }
+
+    interface SearchQuery {
+        startAt?: number;
+        maxResults?: number;
+        fields?: string[];
+    }
+
+    interface SearchQuery {
+        startAt?: number;
+        maxResults?: number;
+        fields?: string[];
+    }
+
+    interface UriOptions {
+        pathname: string;
+        query?: Query;
+        intermediatePath?: string;
+    }
+}
+
+export default JiraApi;
diff --git a/types/jira-client/jira-client-tests.ts b/types/jira-client/jira-client-tests.ts
new file mode 100644
index 0000000000..a87322e5be
--- /dev/null
+++ b/types/jira-client/jira-client-tests.ts
@@ -0,0 +1,30 @@
+import JiraApi from 'jira-client';
+
+// Initialize
+const jira = new JiraApi({
+  protocol: 'https',
+  host: 'jira.somehost.com',
+  username: 'username',
+  password: 'password',
+  apiVersion: '2',
+  strictSSL: true
+});
+
+const issueNumber = "123";
+
+jira.findIssue(issueNumber)
+  .then(issue => {
+    console.log(`Status: ${issue.fields.status.name}`);
+  })
+  .catch(err => {
+    console.error(err);
+  });
+
+async function logIssueName() {
+  try {
+    const issue = await jira.findIssue(issueNumber);
+    console.log(`Status: ${issue.fields.status.name}`);
+  } catch (err) {
+    console.error(err);
+  }
+}
diff --git a/types/jira-client/tsconfig.json b/types/jira-client/tsconfig.json
new file mode 100644
index 0000000000..b84638d545
--- /dev/null
+++ b/types/jira-client/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",
+        "jira-client-tests.ts"
+    ]
+}
diff --git a/types/jira-client/tslint.json b/types/jira-client/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jira-client/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/johnny-five/index.d.ts b/types/johnny-five/index.d.ts
index 5f0f6a9f37..eafa4038de 100644
--- a/types/johnny-five/index.d.ts
+++ b/types/johnny-five/index.d.ts
@@ -378,6 +378,8 @@ export declare class LCD {
     autoscroll(): void;
     noAutoscroll(): void;
     bgColor(color: any): void;
+    noBacklight(): void;
+    backlight(): void;
 }
 
 export interface LedOption {
diff --git a/types/joi/index.d.ts b/types/joi/index.d.ts
index dbf60400b9..5af6969665 100644
--- a/types/joi/index.d.ts
+++ b/types/joi/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for joi v13.3.0
+// Type definitions for joi 13.4
 // Project: https://github.com/hapijs/joi
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Laurence Dougal Myers <https://github.com/laurence-myers>
@@ -125,7 +125,7 @@ export interface IpOptions {
     cidr?: string;
 }
 
-export type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5'
+export type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5';
 
 export interface GuidOptions {
     version: GuidVersions[] | GuidVersions;
@@ -137,6 +137,14 @@ export interface UriOptions {
      * Can be an Array or String (strings are automatically escaped for use in a Regular Expression).
      */
     scheme?: string | RegExp | Array<string | RegExp>;
+    /**
+     * Allow relative URIs. Defaults to `false`.
+     */
+    allowRelative?: boolean;
+    /**
+     * Restrict only relative URIs. Defaults to `false`.
+     */
+    relativeOnly?: boolean;
 }
 
 export interface Base64Options {
@@ -181,8 +189,8 @@ export interface ReferenceOptions {
 }
 
 export interface IPOptions {
-    version?: Array<string>;
-    cidr?: string
+    version?: string[];
+    cidr?: string;
 }
 
 export interface StringRegexOptions {
@@ -236,7 +244,6 @@ export type Schema = AnySchema
     | LazySchema;
 
 export interface AnySchema extends JoiObject {
-
     schemaType?: Types | string;
 
     /**
@@ -441,7 +448,6 @@ export interface State {
 }
 
 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,
@@ -695,7 +701,9 @@ export interface ArraySchema extends AnySchema {
     /**
      * 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.
+     * 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;
@@ -714,6 +722,7 @@ export interface ArraySchema extends AnySchema {
      * Specifies the exact number of items in the array.
      */
     length(limit: number): this;
+    length(limit: Reference): this;
 
     /**
      * Requires the array values to be unique.
@@ -725,7 +734,6 @@ export interface ArraySchema extends AnySchema {
 }
 
 export interface ObjectSchema extends AnySchema {
-
     /**
      * Sets or extends the allowed object keys.
      */
@@ -753,8 +761,11 @@ export interface ObjectSchema extends AnySchema {
 
     /**
      * Specify validation rules for unknown keys matching a pattern.
+     *
+     * @param pattern - a pattern that can be either a regular expression or a joi schema that will be tested against the unknown key names
+     * @param schema - the schema object matching keys must validate against
      */
-    pattern(regex: RegExp, schema: SchemaLike): this;
+    pattern(pattern: RegExp | SchemaLike, 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.
@@ -880,7 +891,6 @@ export interface BinarySchema extends AnySchema {
 }
 
 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,
@@ -923,7 +933,6 @@ export interface DateSchema extends AnySchema {
 }
 
 export interface FunctionSchema extends AnySchema {
-
     /**
      * Specifies the arity of the function where:
      * @param n - the arity expected.
@@ -957,7 +966,6 @@ export interface AlternativesSchema extends AnySchema {
 }
 
 export interface LazySchema extends AnySchema {
-
 }
 
 export interface Reference extends JoiObject {
@@ -978,7 +986,7 @@ export type ExtensionBoundSchema = Schema & {
      * @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;
@@ -1119,7 +1127,7 @@ export function ref(key: string, options?: ReferenceOptions): Reference;
 export function isRef(ref: any): ref is Reference;
 
 /**
- * Get a sub-schema of an existing schema based on a `path` that can be either a string or an array 
+ * Get a sub-schema of an existing schema based on a `path` that can be either a string or an array
  * of strings For string values path separator is a dot (`.`)
  */
 export function reach(schema: ObjectSchema, path: string): Schema;
@@ -1130,7 +1138,7 @@ 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(extension: Extension|Extension[], ...extensions: (Extension|Extension[])[]): any;
+export function extend(extension: Extension|Extension[], ...extensions: Array<Extension|Extension[]>): any;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
@@ -1156,8 +1164,8 @@ export function defaults(fn: DefaultsFunction): Root;
 export function describe(schema: Schema): Description;
 
 /**
-* Whitelists a value
-*/
+ * Whitelists a value
+ */
 export function allow(value: any, ...values: any[]): Schema;
 export function allow(values: any[]): Schema;
 
@@ -1186,6 +1194,11 @@ export function not(values: any[]): Schema;
  */
 export function required(): Schema;
 
+/**
+ * Alias of `required`.
+ */
+export function exist(): 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.
  */
diff --git a/types/joi/joi-tests.ts b/types/joi/joi-tests.ts
index def9eaafd4..5defe20cc1 100644
--- a/types/joi/joi-tests.ts
+++ b/types/joi/joi-tests.ts
@@ -3,29 +3,24 @@ import Joi = require('joi');
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 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;
+declare const value: any;
+let num = 0;
+let str = '';
+declare const bool: boolean;
+declare const exp: RegExp;
+declare const obj: object;
+declare const date: Date;
+declare const err: Error;
+declare const func: 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[] = [];
+declare const numArr: number[];
+declare const strArr: string[];
+declare const expArr: RegExp[];
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 let schema: Joi.Schema = null;
-let schemaLike: Joi.SchemaLike = null;
+declare const schemaLike: Joi.SchemaLike;
 
 let anySchema: Joi.AnySchema = null;
 let numSchema: Joi.NumberSchema = null;
@@ -38,7 +33,7 @@ let funcSchema: Joi.FunctionSchema = null;
 let objSchema: Joi.ObjectSchema = null;
 let altSchema: Joi.AlternativesSchema = null;
 
-let schemaArr: Joi.Schema[] = [];
+declare const schemaArr: Joi.Schema[];
 
 let ref: Joi.Reference = null;
 let description: Joi.Description = null;
@@ -156,7 +151,7 @@ stringRegexOpts = { invert: bool };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-let validErr: Joi.ValidationError = null;
+declare const validErr: Joi.ValidationError;
 let validErrItem: Joi.ValidationErrorItem;
 let validErrFunc: Joi.ValidationErrorFunction;
 
@@ -235,13 +230,13 @@ schemaMap = {
         { c1: true },
         { c2: null }
     ]
-}
+};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 anySchema = Joi.any();
 
-namespace common {
+{ // common
     anySchema = anySchema.allow(x);
     anySchema = anySchema.allow(x, x);
     anySchema = anySchema.allow([x, x, x]);
@@ -318,11 +313,11 @@ arrSchema = arrSchema.ordered([schemaMap, schemaMap, schemaLike]);
 arrSchema = arrSchema.min(num);
 arrSchema = arrSchema.max(num);
 arrSchema = arrSchema.length(num);
+arrSchema = arrSchema.length(ref);
 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]);
@@ -332,7 +327,7 @@ arrSchema = arrSchema.items([schemaMap, schemaMap, schemaLike]);
 
 // - - - - - - - -
 
-namespace common_copy_paste {
+{ // common copy paste
     // use search & replace from any
     arrSchema = arrSchema.allow(x);
     arrSchema = arrSchema.allow(x, x);
@@ -386,7 +381,7 @@ namespace common_copy_paste {
 boolSchema = Joi.bool();
 boolSchema = Joi.boolean();
 
-namespace common_copy_paste {
+{ // common copy paste
     boolSchema = boolSchema.allow(x);
     boolSchema = boolSchema.allow(x, x);
     boolSchema = boolSchema.allow([x, x, x]);
@@ -461,7 +456,7 @@ binSchema = binSchema.min(num);
 binSchema = binSchema.max(num);
 binSchema = binSchema.length(num);
 
-namespace common {
+{ // common
     binSchema = binSchema.allow(x);
     binSchema = binSchema.allow(x, x);
     binSchema = binSchema.allow([x, x, x]);
@@ -534,7 +529,7 @@ dateSchema = dateSchema.timestamp();
 dateSchema = dateSchema.timestamp('javascript');
 dateSchema = dateSchema.timestamp('unix');
 
-namespace common {
+{ // common
     dateSchema = dateSchema.allow(x);
     dateSchema = dateSchema.allow(x, x);
     dateSchema = dateSchema.allow([x, x, x]);
@@ -610,7 +605,7 @@ numSchema = numSchema.positive();
 numSchema = numSchema.negative();
 numSchema = numSchema.port();
 
-namespace common {
+{ // common
     numSchema = numSchema.allow(x);
     numSchema = numSchema.allow(x, x);
     numSchema = numSchema.allow([x, x, x]);
@@ -728,7 +723,7 @@ objSchema = objSchema.forbiddenKeys(str);
 objSchema = objSchema.forbiddenKeys(str, str);
 objSchema = objSchema.forbiddenKeys(strArr);
 
-namespace common {
+{ // common
     objSchema = objSchema.allow(x);
     objSchema = objSchema.allow(x, x);
     objSchema = objSchema.allow([x, x, x]);
@@ -808,7 +803,7 @@ 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: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5'] });
 strSchema = strSchema.guid({ version: 'uuidv4' });
 strSchema = strSchema.hex();
 strSchema = strSchema.hex(hexOpts);
@@ -824,7 +819,7 @@ strSchema = strSchema.normalize('NFKC');
 strSchema = strSchema.base64();
 strSchema = strSchema.base64(base64Opts);
 
-namespace common {
+{ // common
     strSchema = strSchema.allow(x);
     strSchema = strSchema.allow(x, x);
     strSchema = strSchema.allow([x, x, x]);
@@ -890,11 +885,11 @@ schema = Joi.alt(schema, anySchema, boolSchema);
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-schema = Joi.lazy(() => schema)
+schema = Joi.lazy(() => schema);
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-namespace validate_tests {
+{ // validate tests
     {
         Joi.validate(value, obj);
         Joi.validate(value, schema);
@@ -924,7 +919,7 @@ namespace validate_tests {
 
     {
         let value = { username: 'example', password: 'example' };
-        let schema = Joi.object().keys({
+        const schema = Joi.object().keys({
             username: Joi.string().max(255).required(),
             password: Joi.string().regex(/^[a-zA-Z0-9]{3,255}$/).required(),
         });
@@ -950,12 +945,11 @@ namespace validate_tests {
 
         returnValue
             .then(val => JSON.stringify(val, null, 2))
-            .then(val => { throw 'one error'; })
+            .then(val => { throw new Error('one error'); })
             .catch(e => {});
     }
 }
 
-
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 schema = Joi.compile(obj);
@@ -1110,6 +1104,7 @@ schema = Joi.not(x, x);
 schema = Joi.not([x, x, x]);
 
 schema = Joi.required();
+schema = Joi.exist();
 schema = Joi.optional();
 schema = Joi.forbidden();
 schema = Joi.strip();
diff --git a/types/joi/tslint.json b/types/joi/tslint.json
index a41bf5d19a..87b70df769 100644
--- a/types/joi/tslint.json
+++ b/types/joi/tslint.json
@@ -1,79 +1,13 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
+        // All are TODOs
         "ban-types": false,
         "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
         "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
         "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "unified-signatures": false
     }
 }
diff --git a/types/joi/v10/index.d.ts b/types/joi/v10/index.d.ts
index e21edda875..8e0026a5fe 100644
--- a/types/joi/v10/index.d.ts
+++ b/types/joi/v10/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for joi v10.6.0
+// Type definitions for joi 10.6
 // Project: https://github.com/hapijs/joi
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Laurence Dougal Myers <https://github.com/laurence-myers>
@@ -114,7 +114,7 @@ export interface IpOptions {
     cidr?: string;
 }
 
-export type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5'
+export type GuidVersions = 'uuidv1' | 'uuidv2' | 'uuidv3' | 'uuidv4' | 'uuidv5';
 
 export interface GuidOptions {
     version: GuidVersions[] | GuidVersions;
@@ -160,8 +160,8 @@ export interface ReferenceOptions {
 }
 
 export interface IPOptions {
-    version?: Array<string>;
-    cidr?: string
+    version?: string[];
+    cidr?: string;
 }
 
 export interface JoiObject {
@@ -210,7 +210,6 @@ export type Schema = AnySchema
     | LazySchema;
 
 export interface AnySchema extends JoiObject {
-
     /**
      * Validates a value using the schema and options.
      */
@@ -411,7 +410,6 @@ export interface State {
 }
 
 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,
@@ -514,7 +512,6 @@ 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.
@@ -651,7 +648,9 @@ export interface ArraySchema extends AnySchema {
     /**
      * 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.
+     * 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;
@@ -670,6 +669,7 @@ export interface ArraySchema extends AnySchema {
      * Specifies the exact number of items in the array.
      */
     length(limit: number): this;
+    length(limit: Reference): this;
 
     /**
      * Requires the array values to be unique.
@@ -681,7 +681,6 @@ export interface ArraySchema extends AnySchema {
 }
 
 export interface ObjectSchema extends AnySchema {
-
     /**
      * Sets the allowed object keys.
      */
@@ -818,7 +817,6 @@ export interface BinarySchema extends AnySchema {
 }
 
 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,
@@ -861,7 +859,6 @@ export interface DateSchema extends AnySchema {
 }
 
 export interface FunctionSchema extends AnySchema {
-
     /**
      * Specifies the arity of the function where:
      * @param n - the arity expected.
@@ -895,7 +892,6 @@ export interface AlternativesSchema extends AnySchema {
 }
 
 export interface LazySchema extends AnySchema {
-
 }
 
 export interface Reference extends JoiObject {
@@ -916,7 +912,7 @@ export type ExtensionBoundSchema = Schema & {
      * @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;
@@ -1077,8 +1073,8 @@ export function extend(extention: Extension): any;
 export function describe(schema: Schema): Description;
 
 /**
-* Whitelists a value
-*/
+ * Whitelists a value
+ */
 export function allow(value: any, ...values: any[]): Schema;
 export function allow(values: any[]): Schema;
 
diff --git a/types/joi/v10/joi-tests.ts b/types/joi/v10/joi-tests.ts
index b1f125a6ea..8782a46dfa 100644
--- a/types/joi/v10/joi-tests.ts
+++ b/types/joi/v10/joi-tests.ts
@@ -2,50 +2,45 @@ 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;
+declare const value: any;
+let num = 0;
+let str = '';
+declare const bool: boolean;
+declare const exp: RegExp;
+declare const obj: object;
+declare const date: Date;
+declare const err: Error;
+declare const func: Function;
 
-var anyArr: any[] = [];
-var numArr: number[] = [];
-var strArr: string[] = [];
-var boolArr: boolean[] = [];
-var expArr: RegExp[] = [];
-var objArr: object[] = [];
-var errArr: Error[] = [];
-var funcArr: Function[] = [];
+declare const numArr: number[];
+declare const strArr: string[];
+declare const expArr: RegExp[];
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schema: Joi.Schema = null;
-var schemaLike: Joi.SchemaLike = null;
+let schema: Joi.Schema = null;
+declare const schemaLike: Joi.SchemaLike;
 
-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[] = [];
+declare const 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 +72,7 @@ validOpts = {
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var renOpts: Joi.RenameOptions = null;
+let renOpts: Joi.RenameOptions;
 
 renOpts = { alias: bool };
 renOpts = { multiple: bool };
@@ -86,7 +81,7 @@ renOpts = { ignoreUndefined: bool };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var emailOpts: Joi.EmailOptions = null;
+let emailOpts: Joi.EmailOptions;
 
 emailOpts = { errorLevel: num };
 emailOpts = { errorLevel: bool };
@@ -96,7 +91,7 @@ emailOpts = { minDomainAtoms: num };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var ipOpts: Joi.IpOptions = null;
+let ipOpts: Joi.IpOptions;
 
 ipOpts = { version: str };
 ipOpts = { version: strArr };
@@ -104,7 +99,7 @@ ipOpts = { cidr: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var uriOpts: Joi.UriOptions = null;
+let uriOpts: Joi.UriOptions;
 
 uriOpts = { scheme: str };
 uriOpts = { scheme: exp };
@@ -113,7 +108,7 @@ uriOpts = { scheme: expArr };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var whenOpts: Joi.WhenOptions = null;
+let whenOpts: Joi.WhenOptions;
 
 whenOpts = { is: x };
 whenOpts = { is: schema, then: schema };
@@ -122,7 +117,7 @@ whenOpts = { is: schemaLike, then: schemaLike, otherwise: schemaLike };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var whenSchemaOpts: Joi.WhenSchemaOptions = null;
+let whenSchemaOpts: Joi.WhenSchemaOptions;
 
 whenSchemaOpts = { then: schema };
 whenSchemaOpts = { otherwise: schema };
@@ -130,16 +125,16 @@ whenSchemaOpts = { then: schemaLike, otherwise: schemaLike };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var refOpts: Joi.ReferenceOptions = null;
+let refOpts: Joi.ReferenceOptions;
 
 refOpts = { separator: str };
 refOpts = { contextPrefix: str };
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var validErr: Joi.ValidationError = null;
-var validErrItem: Joi.ValidationErrorItem;
-var validErrFunc: Joi.ValidationErrorFunction;
+declare const validErr: Joi.ValidationError;
+let validErrItem: Joi.ValidationErrorItem;
+let validErrFunc: Joi.ValidationErrorFunction;
 
 validErrItem = {
     message: str,
@@ -184,7 +179,7 @@ anySchema = objSchema;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schemaMap: Joi.SchemaMap = null;
+let schemaMap: Joi.SchemaMap;
 
 schemaMap = {
     a: numSchema,
@@ -216,13 +211,13 @@ schemaMap = {
         { c1: true },
         { c2: null }
     ]
-}
+};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 anySchema = Joi.any();
 
-namespace common {
+{ // common
     anySchema = anySchema.allow(x);
     anySchema = anySchema.allow(x, x);
     anySchema = anySchema.allow([x, x, x]);
@@ -299,11 +294,11 @@ arrSchema = arrSchema.ordered([schemaMap, schemaMap, schemaLike]);
 arrSchema = arrSchema.min(num);
 arrSchema = arrSchema.max(num);
 arrSchema = arrSchema.length(num);
+arrSchema = arrSchema.length(ref);
 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]);
@@ -313,7 +308,7 @@ arrSchema = arrSchema.items([schemaMap, schemaMap, schemaLike]);
 
 // - - - - - - - -
 
-namespace common_copy_paste {
+{ // common copy paste
     // use search & replace from any
     arrSchema = arrSchema.allow(x);
     arrSchema = arrSchema.allow(x, x);
@@ -367,7 +362,7 @@ namespace common_copy_paste {
 boolSchema = Joi.bool();
 boolSchema = Joi.boolean();
 
-namespace common_copy_paste {
+{ // common copy paste
     boolSchema = boolSchema.allow(x);
     boolSchema = boolSchema.allow(x, x);
     boolSchema = boolSchema.allow([x, x, x]);
@@ -442,7 +437,7 @@ binSchema = binSchema.min(num);
 binSchema = binSchema.max(num);
 binSchema = binSchema.length(num);
 
-namespace common {
+{ // common
     binSchema = binSchema.allow(x);
     binSchema = binSchema.allow(x, x);
     binSchema = binSchema.allow([x, x, x]);
@@ -515,7 +510,7 @@ dateSchema = dateSchema.timestamp();
 dateSchema = dateSchema.timestamp('javascript');
 dateSchema = dateSchema.timestamp('unix');
 
-namespace common {
+{ // common
     dateSchema = dateSchema.allow(x);
     dateSchema = dateSchema.allow(x, x);
     dateSchema = dateSchema.allow([x, x, x]);
@@ -590,7 +585,7 @@ numSchema = numSchema.multiple(num);
 numSchema = numSchema.positive();
 numSchema = numSchema.negative();
 
-namespace common {
+{ // common
     numSchema = numSchema.allow(x);
     numSchema = numSchema.allow(x, x);
     numSchema = numSchema.allow([x, x, x]);
@@ -701,7 +696,7 @@ objSchema = objSchema.optionalKeys(str);
 objSchema = objSchema.optionalKeys(str, str);
 objSchema = objSchema.optionalKeys(strArr);
 
-namespace common {
+{ // common
     objSchema = objSchema.allow(x);
     objSchema = objSchema.allow(x, x);
     objSchema = objSchema.allow([x, x, x]);
@@ -780,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'] } as Joi.GuidOptions);
+strSchema = strSchema.guid({ version: ['uuidv1', 'uuidv2', 'uuidv3', 'uuidv4', 'uuidv5'] });
 strSchema = strSchema.guid({ version: 'uuidv4' });
 strSchema = strSchema.hex();
 strSchema = strSchema.hostname();
@@ -793,7 +788,7 @@ strSchema = strSchema.truncate(false);
 strSchema = strSchema.normalize();
 strSchema = strSchema.normalize('NFKC');
 
-namespace common {
+{ // common
     strSchema = strSchema.allow(x);
     strSchema = strSchema.allow(x, x);
     strSchema = strSchema.allow([x, x, x]);
@@ -859,11 +854,11 @@ schema = Joi.alt(schema, anySchema, boolSchema);
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-schema = Joi.lazy(() => schema)
+schema = Joi.lazy(() => schema);
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-namespace validate_tests {
+{ // validate tests
     {
         Joi.validate(value, obj);
         Joi.validate(value, schema);
@@ -893,7 +888,7 @@ namespace validate_tests {
 
     {
         let value = { username: 'example', password: 'example' };
-        let schema = Joi.object().keys({
+        const schema = Joi.object().keys({
             username: Joi.string().max(255).required(),
             password: Joi.string().regex(/^[a-zA-Z0-9]{3,255}$/).required(),
         });
@@ -919,7 +914,6 @@ namespace validate_tests {
     }
 }
 
-
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
 schema = Joi.compile(obj);
diff --git a/types/joi/v10/tslint.json b/types/joi/v10/tslint.json
index a41bf5d19a..0b8095b5e1 100644
--- a/types/joi/v10/tslint.json
+++ b/types/joi/v10/tslint.json
@@ -1,79 +1,12 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
+        // All are TODOs
         "ban-types": false,
         "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
         "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "unified-signatures": false
     }
 }
diff --git a/types/joi/v6/index.d.ts b/types/joi/v6/index.d.ts
index d9ee7c20d1..5f5fb5625d 100644
--- a/types/joi/v6/index.d.ts
+++ b/types/joi/v6/index.d.ts
@@ -1,778 +1,773 @@
-// Type definitions for joi v6.5.0
+// Type definitions for joi 6.5
 // Project: https://github.com/spumko/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>
+// 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>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // TODO express type of Schema in a type-parameter (.default, .valid, .example etc)
 
-declare module 'joi' {
-
-	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;
-		/**
-		 * when true, unknown keys are deleted (only when value is an object). Defaults to false.
-		 */
-		stripUnknown?: boolean;
-		/**
-		 * overrides individual error messages. Defaults to no override ({}).
-		 */
-		language?: Object;
-		/**
-		 * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
-		 */
-		presence?: string;
-		/**
-		 * provides an external data set to be used in references
-		 */
-		context?: Object;
-	}
-
-	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 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<T> {
-		/**
-		 * the required condition joi type.
-		 */
-		is: T;
-		/**
-		 * the alternative schema type if the condition is true. Required if otherwise is missing.
-		 */
-		then?: Schema;
-		/**
-		 * the alternative schema type if the condition is false. Required if then is missing
-		 */
-		otherwise?: Schema;
-	}
-
-	export interface ReferenceOptions {
-		separator?: string;
-		contextPrefix?: string;
-	}
-
-	export interface IPOptions {
-		version?: Array<string>;
-		cidr?: string
-	}
-
-	export interface ValidationError extends Error {
-		message: string;
-		details: ValidationErrorItem[];
-		simple(): string;
-		annotated(): string;
-	}
-
-	export interface ValidationErrorItem {
-		message: string;
-		type: string;
-		path: string;
-		options?: ValidationOptions;
-	}
-
-	export interface ValidationResult<T> {
-		error: ValidationError;
-		value: T;
-	}
-
-	export interface SchemaMap {
-		[key: string]: Schema;
-	}
-
-	export interface Schema extends AnySchema<Schema> {
-
-	}
-
-	export interface Reference extends Schema {
-
-	}
-
-	export interface AnySchema<T extends AnySchema<Schema>> {
-		/**
-		 * Whitelists a value
-		 */
-		allow(value: any, ...values: any[]): T;
-		allow(values: any[]): T;
-
-		/**
-		 * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
-		 */
-		valid(value: any, ...values: any[]): T;
-		valid(values: any[]): T;
-		only(value: any, ...values : any[]): T;
-		only(values: any[]): T;
-		equal(value: any, ...values : any[]): T;
-		equal(values: any[]): T;
-
-		/**
-		 * Blacklists a value
-		 */
-		invalid(value: any, ...values: any[]): T;
-		invalid(values: any[]): T;
-		disallow(value: any, ...values : any[]): T;
-		disallow(values: any[]): T;
-		not(value: any, ...values : any[]): T;
-		not(values: any[]): T;
-
-		/**
-		 * Marks a key as required which will not allow undefined as value. All keys are optional by default.
-		 */
-		required(): T;
-
-		/**
-		 * 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(): T;
-
-		/**
-		 * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
-		 */
-		forbidden(): T;
-
-		/**
-		 * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
-		 */
-		strip(): T;
-
-		/**
-		 * Annotates the key
-		 */
-		description(desc: string): T;
-
-		/**
-		 * Annotates the key
-		 */
-		notes(notes: string): T;
-		notes(notes: string[]): T;
-
-		/**
-		 * Annotates the key
-		 */
-		tags(notes: string): T;
-		tags(notes: string[]): T;
-
-		/**
-		 * Attaches metadata to the key.
-		 */
-		meta(meta: Object): T;
-
-		/**
-		 * Annotates the key with an example value, must be valid.
-		 */
-		example(value: any): T;
-
-		/**
-		 * Annotates the key with an unit name.
-		 */
-		unit(name: string): T;
-
-		/**
-		 * Overrides the global validate() options for the current key and any sub-key.
-		 */
-		options(options: ValidationOptions): T;
-
-		/**
-		 * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
-		 */
-		strict(isStrict?: boolean): T;
-
-		/**
-		 * 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): T;
-		default(): T;
-
-		/**
-		 * Returns a new type that is the result of adding the rules of one type to another.
-		 */
-		concat(schema: T): T;
-
-		/**
-		 * Converts the type into an alternatives type where the conditions are merged into the type definition where:
-		 */
-		when<U>(ref: string, options: WhenOptions<U>): AlternativesSchema;
-		when<U>(ref: Reference, options: WhenOptions<U>): AlternativesSchema;
-
-		/**
-		 * Overrides the key name in error messages.
-		 */
-		label(name: string): T;
-
-		/**
-		 * Outputs the original untouched value instead of the casted value.
-		 */
-		raw(isRaw?: boolean): T;
-
-		/**
-		 * 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?: any) : T;
-	}
-
-	export interface BooleanSchema extends AnySchema<BooleanSchema> {
-
-	}
-
-	export interface NumberSchema extends AnySchema<NumberSchema> {
-		/**
-		 * Specifies the minimum value.
-		 * It can also be a reference to another field.
-		 */
-		min(limit: number): NumberSchema;
-		min(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies the maximum value.
-		 * It can also be a reference to another field.
-		 */
-		max(limit: number): NumberSchema;
-		max(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies that the value must be greater than limit.
-		 * It can also be a reference to another field.
-		 */
-		greater(limit: number): NumberSchema;
-		greater(limit: Reference): NumberSchema;
-
-		/**
-		 * Specifies that the value must be less than limit.
-		 * It can also be a reference to another field.
-		 */
-		less(limit: number): NumberSchema;
-		less(limit: Reference): NumberSchema;
-
-		/**
-		 * Requires the number to be an integer (no floating point).
-		 */
-		integer(): NumberSchema;
-
-		/**
-		 * Specifies the maximum number of decimal places where:
-		 *  limit - the maximum number of decimal places allowed.
-		 */
-		precision(limit: number): NumberSchema;
-
-		/**
-		 * Specifies that the value must be a multiple of base.
-		 */
-		multiple(base: number): NumberSchema;
-
-		/**
-		 * Requires the number to be positive.
-		 */
-		positive(): NumberSchema;
-
-		/**
-		 * Requires the number to be negative.
-		 */
-		negative(): NumberSchema;
-	}
-
-	export interface StringSchema extends AnySchema<StringSchema> {
-		/**
-		 * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
-		 */
-		insensitive(): StringSchema;
-
-		/**
-		 * 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): StringSchema;
-		min(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * 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): StringSchema;
-		max(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * Requires the number to be a credit card number (Using Lunh Algorithm).
-		 */
-		creditCard(): StringSchema;
-
-		/**
-		 * 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): StringSchema;
-		length(limit: Reference, encoding?: string): StringSchema;
-
-		/**
-		 * 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): StringSchema;
-
-		/**
-		 * 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): StringSchema;
-		replace(pattern: string, replacement: string): StringSchema;
-
-		/**
-		 * Requires the string value to only contain a-z, A-Z, and 0-9.
-		 */
-		alphanum(): StringSchema;
-
-		/**
-		 * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
-		 */
-		token(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid email address.
-		 */
-		email(options?: EmailOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid ip address.
-		 */
-		ip(options?: IpOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid RFC 3986 URI.
-		 */
-		uri(options?: UriOptions): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid GUID.
-		 */
-		guid(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid hexadecimal string.
-		 */
-		hex(): StringSchema;
-
-		/**
-		 * Requires the string value to be a valid hostname as per RFC1123.
-		 */
-		hostname(): StringSchema;
-
-		/**
-		 * Requires the string value to be in valid ISO 8601 date format.
-		 */
-		isoDate(): StringSchema;
-
-		/**
-		 * 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(): StringSchema;
-
-		/**
-		 * 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(): StringSchema;
-
-		/**
-		 * 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(): StringSchema;
-	}
-
-	export interface ArraySchema extends AnySchema<ArraySchema> {
-		/**
-		 * Allow this array to be sparse.
-		 * enabled can be used with a falsy value to go back to the default behavior.
-		 */
-		sparse(enabled?: any): ArraySchema;
-
-		/**
-		 * 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): ArraySchema;
-
-		/**
-		 * 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(type: Schema, ...types: Schema[]): ArraySchema;
-		items(types: Schema[]): ArraySchema;
-
-		/**
-		 * Specifies the minimum number of items in the array.
-		 */
-		min(limit: number): ArraySchema;
-
-		/**
-		 * Specifies the maximum number of items in the array.
-		 */
-		max(limit: number): ArraySchema;
-
-		/**
-		 * Specifies the exact number of items in the array.
-		 */
-		length(limit: number): ArraySchema;
-
-		/**
-		 * 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(): ArraySchema;
-	}
-
-	export interface ObjectSchema extends AnySchema<ObjectSchema> {
-		/**
-		 * Sets the allowed object keys.
-		 */
-		keys(schema?: SchemaMap): ObjectSchema;
-
-		/**
-		 * Specifies the minimum number of keys in the object.
-		 */
-		min(limit: number): ObjectSchema;
-
-		/**
-		 * Specifies the maximum number of keys in the object.
-		 */
-		max(limit: number): ObjectSchema;
-
-		/**
-		 * Specifies the exact number of keys in the object.
-		 */
-		length(limit: number): ObjectSchema;
-
-		/**
-		 * Specify validation rules for unknown keys matching a pattern.
-		 */
-		pattern(regex: RegExp, schema: Schema): ObjectSchema;
-
-		/**
-		 * 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(peer1: string, ...peers: string[]): ObjectSchema;
-		and(peers: string[]): ObjectSchema;
-
-		/**
-		 * 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(peer1: string, ...peers: string[]): ObjectSchema;
-		nand(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
-		 */
-		or(peer1: string, ...peers: string[]): ObjectSchema;
-		or(peers: string[]): ObjectSchema;
-
-		/**
-		 * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
-		 */
-		xor(peer1: string, ...peers: string[]): ObjectSchema;
-		xor(peers: string[]): ObjectSchema;
-
-		/**
-		 * Requires the presence of other keys whenever the specified key is present.
-		 */
-		with(key: string, peers: string): ObjectSchema;
-		with(key: string, peers: string[]): ObjectSchema;
-
-		/**
-		 * Forbids the presence of other keys whenever the specified is present.
-		 */
-		without(key: string, peers: string): ObjectSchema;
-		without(key: string, peers: string[]): ObjectSchema;
-
-		/**
-		 * Renames a key to another name (deletes the renamed key).
-		 */
-		rename(from: string, to: string, options?: RenameOptions): ObjectSchema;
-
-		/**
-		 * Verifies an assertion where.
-		 */
-		assert(ref: string, schema: Schema, message?: string): ObjectSchema;
-		assert(ref: Reference, schema: Schema, message?: string): ObjectSchema;
-
-		/**
-		 * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
-		 */
-		unknown(allow?: boolean): ObjectSchema;
-
-		/**
-		 * 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): ObjectSchema;
-
-		/**
-		 * 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): ObjectSchema;
-		requiredKeys(children: string[]): ObjectSchema;
-		requiredKeys(child:string, ...children: string[]): ObjectSchema;
-
-		/**
-		 * 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): ObjectSchema;
-		optionalKeys(children: string[]): ObjectSchema;
-		optionalKeys(child:string, ...children: string[]): ObjectSchema;
-	}
-
-	export interface BinarySchema extends AnySchema<BinarySchema> {
-		/**
-		 * Sets the string encoding format if a string input is converted to a buffer.
-		 */
-		encoding(encoding: string): BinarySchema;
-
-		/**
-		 * Specifies the minimum length of the buffer.
-		 */
-		min(limit: number): BinarySchema;
-
-		/**
-		 * Specifies the maximum length of the buffer.
-		 */
-		max(limit: number): BinarySchema;
-
-		/**
-		 * Specifies the exact length of the buffer:
-		 */
-		length(limit: number): BinarySchema;
-	}
-
-	export interface DateSchema extends AnySchema<DateSchema> {
-
-		/**
-		 * 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): DateSchema;
-		min(date: number): DateSchema;
-		min(date: string): DateSchema;
-		min(date: Reference): DateSchema;
-
-		/**
-		 * 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): DateSchema;
-		max(date: number): DateSchema;
-		max(date: string): DateSchema;
-		max(date: Reference): DateSchema;
-
-		/**
-		 * Specifies the allowed date format:
-		 * @param format - string or array of strings that follow the moment.js format.
-		 */
-		format(format: string): DateSchema;
-		format(format: string[]): DateSchema;
-
-		/**
-		 * Requires the string value to be in valid ISO 8601 date format.
-		 */
-		iso(): DateSchema;
-	}
-
-	export interface FunctionSchema extends AnySchema<FunctionSchema> {
-
-	}
-
-	export interface AlternativesSchema extends AnySchema<FunctionSchema> {
-		try(schemas: Schema[]): AlternativesSchema;
-		when<T>(ref: string, options: WhenOptions<T>): AlternativesSchema;
-		when<T>(ref: Reference, options: WhenOptions<T>): AlternativesSchema;
-	}
-
-	// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
-
+export interface ValidationOptions {
 	/**
-	 * Generates a schema object that matches any data type.
+	 * when true, stops validation on the first error, otherwise returns all the errors found. Defaults to true.
 	 */
-	export function any(): Schema;
-
+	abortEarly?: boolean;
 	/**
-	 * Generates a schema object that matches an array data type.
+	 * when true, attempts to cast values to the required types (e.g. a string to a number). Defaults to true.
 	 */
-	export function array(): ArraySchema;
-
+	convert?: boolean;
 	/**
-	 * 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().
+	 * when true, allows object to contain unknown keys which are ignored. Defaults to false.
 	 */
-	export function bool(): BooleanSchema;
-
-	export function boolean(): BooleanSchema;
-
+	allowUnknown?: boolean;
 	/**
-	 * Generates a schema object that matches a Buffer data type (as well as the strings which will be converted to Buffers).
+	 * when true, ignores unknown keys with a function value. Defaults to false.
 	 */
-	export function binary(): BinarySchema;
-
+	skipFunctions?: boolean;
 	/**
-	 * Generates a schema object that matches a date type (as well as a JavaScript date string or number of milliseconds).
+	 * when true, unknown keys are deleted (only when value is an object). Defaults to false.
 	 */
-	export function date(): DateSchema;
-
+	stripUnknown?: boolean;
 	/**
-	 * Generates a schema object that matches a function type.
+	 * overrides individual error messages. Defaults to no override ({}).
 	 */
-	export function func(): FunctionSchema;
-
+	language?: Object;
 	/**
-	 * Generates a schema object that matches a number data type (as well as strings that can be converted to numbers).
+	 * sets the default presence requirements. Supported modes: 'optional', 'required', and 'forbidden'. Defaults to 'optional'.
 	 */
-	export function number(): NumberSchema;
-
+	presence?: string;
 	/**
-	 * Generates a schema object that matches an object data type (as well as JSON strings that parsed into objects).
+	 * provides an external data set to be used in references
 	 */
-	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: Schema[]): Schema;
-	export function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): Schema;
-
-	/**
-	 * Validates a value using the given schema and options.
-	 */
-	export function validate<T>(value: T, schema: Schema, callback: (err: ValidationError, value: T) => void): void;
-	export function validate<T>(value: T, schema: Object, callback: (err: ValidationError, value: T) => void): void;
-	export function validate<T>(value: T, schema: Object, options?: ValidationOptions, callback?: (err: ValidationError, value: T) => void): ValidationResult<T>;
-
-	/**
-	 * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
-	 */
-	export function compile(schema: Object): Schema;
-
-	/**
-	 * 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: Schema, message?: string | Error): void;
-
-	/**
-	 * Generates a reference to the value of the named key.
-	 */
-	export function ref(key: string, options?: ReferenceOptions): Reference;
+	context?: Object;
 }
+
+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 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<T> {
+	/**
+	 * the required condition joi type.
+	 */
+	is: T;
+	/**
+	 * the alternative schema type if the condition is true. Required if otherwise is missing.
+	 */
+	then?: Schema;
+	/**
+	 * the alternative schema type if the condition is false. Required if then is missing
+	 */
+	otherwise?: Schema;
+}
+
+export interface ReferenceOptions {
+	separator?: string;
+	contextPrefix?: string;
+}
+
+export interface IPOptions {
+	version?: string[];
+	cidr?: string;
+}
+
+export interface ValidationError extends Error {
+	message: string;
+	details: ValidationErrorItem[];
+	simple(): string;
+	annotated(): string;
+}
+
+export interface ValidationErrorItem {
+	message: string;
+	type: string;
+	path: string;
+	options?: ValidationOptions;
+}
+
+export interface ValidationResult<T> {
+	error: ValidationError;
+	value: T;
+}
+
+export interface SchemaMap {
+	[key: string]: Schema;
+}
+
+export interface Schema extends AnySchema<Schema> {
+}
+
+export interface Reference extends Schema {
+}
+
+export interface AnySchema<T extends AnySchema<Schema>> {
+	/**
+	 * Whitelists a value
+	 */
+	allow(value: any, ...values: any[]): T;
+	allow(values: any[]): T;
+
+	/**
+	 * Adds the provided values into the allowed whitelist and marks them as the only valid values allowed.
+	 */
+	valid(value: any, ...values: any[]): T;
+	valid(values: any[]): T;
+	only(value: any, ...values: any[]): T;
+	only(values: any[]): T;
+	equal(value: any, ...values: any[]): T;
+	equal(values: any[]): T;
+
+	/**
+	 * Blacklists a value
+	 */
+	invalid(value: any, ...values: any[]): T;
+	invalid(values: any[]): T;
+	disallow(value: any, ...values: any[]): T;
+	disallow(values: any[]): T;
+	not(value: any, ...values: any[]): T;
+	not(values: any[]): T;
+
+	/**
+	 * Marks a key as required which will not allow undefined as value. All keys are optional by default.
+	 */
+	required(): T;
+
+	/**
+	 * 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(): T;
+
+	/**
+	 * Marks a key as forbidden which will not allow any value except undefined. Used to explicitly forbid keys.
+	 */
+	forbidden(): T;
+
+	/**
+	 * Marks a key to be removed from a resulting object or array after validation. Used to sanitize output.
+	 */
+	strip(): T;
+
+	/**
+	 * Annotates the key
+	 */
+	description(desc: string): T;
+
+	/**
+	 * Annotates the key
+	 */
+	notes(notes: string): T;
+	notes(notes: string[]): T;
+
+	/**
+	 * Annotates the key
+	 */
+	tags(notes: string): T;
+	tags(notes: string[]): T;
+
+	/**
+	 * Attaches metadata to the key.
+	 */
+	meta(meta: Object): T;
+
+	/**
+	 * Annotates the key with an example value, must be valid.
+	 */
+	example(value: any): T;
+
+	/**
+	 * Annotates the key with an unit name.
+	 */
+	unit(name: string): T;
+
+	/**
+	 * Overrides the global validate() options for the current key and any sub-key.
+	 */
+	options(options: ValidationOptions): T;
+
+	/**
+	 * Sets the options.convert options to false which prevent type casting for the current key and any child keys.
+	 */
+	strict(isStrict?: boolean): T;
+
+	/**
+	 * 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): T;
+	default(): T;
+
+	/**
+	 * Returns a new type that is the result of adding the rules of one type to another.
+	 */
+	concat(schema: T): T;
+
+	/**
+	 * Converts the type into an alternatives type where the conditions are merged into the type definition where:
+	 */
+	when<U>(ref: string, options: WhenOptions<U>): AlternativesSchema;
+	when<U>(ref: Reference, options: WhenOptions<U>): AlternativesSchema;
+
+	/**
+	 * Overrides the key name in error messages.
+	 */
+	label(name: string): T;
+
+	/**
+	 * Outputs the original untouched value instead of the casted value.
+	 */
+	raw(isRaw?: boolean): T;
+
+	/**
+	 * 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?: any): T;
+}
+
+export interface BooleanSchema extends AnySchema<BooleanSchema> {
+}
+
+export interface NumberSchema extends AnySchema<NumberSchema> {
+	/**
+	 * Specifies the minimum value.
+	 * It can also be a reference to another field.
+	 */
+	min(limit: number): NumberSchema;
+	min(limit: Reference): NumberSchema;
+
+	/**
+	 * Specifies the maximum value.
+	 * It can also be a reference to another field.
+	 */
+	max(limit: number): NumberSchema;
+	max(limit: Reference): NumberSchema;
+
+	/**
+	 * Specifies that the value must be greater than limit.
+	 * It can also be a reference to another field.
+	 */
+	greater(limit: number): NumberSchema;
+	greater(limit: Reference): NumberSchema;
+
+	/**
+	 * Specifies that the value must be less than limit.
+	 * It can also be a reference to another field.
+	 */
+	less(limit: number): NumberSchema;
+	less(limit: Reference): NumberSchema;
+
+	/**
+	 * Requires the number to be an integer (no floating point).
+	 */
+	integer(): NumberSchema;
+
+	/**
+	 * Specifies the maximum number of decimal places where:
+	 *  limit - the maximum number of decimal places allowed.
+	 */
+	precision(limit: number): NumberSchema;
+
+	/**
+	 * Specifies that the value must be a multiple of base.
+	 */
+	multiple(base: number): NumberSchema;
+
+	/**
+	 * Requires the number to be positive.
+	 */
+	positive(): NumberSchema;
+
+	/**
+	 * Requires the number to be negative.
+	 */
+	negative(): NumberSchema;
+}
+
+export interface StringSchema extends AnySchema<StringSchema> {
+	/**
+	 * Allows the value to match any whitelist of blacklist item in a case insensitive comparison.
+	 */
+	insensitive(): StringSchema;
+
+	/**
+	 * 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): StringSchema;
+	min(limit: Reference, encoding?: string): StringSchema;
+
+	/**
+	 * 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): StringSchema;
+	max(limit: Reference, encoding?: string): StringSchema;
+
+	/**
+	 * Requires the number to be a credit card number (Using Lunh Algorithm).
+	 */
+	creditCard(): StringSchema;
+
+	/**
+	 * 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): StringSchema;
+	length(limit: Reference, encoding?: string): StringSchema;
+
+	/**
+	 * 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): StringSchema;
+
+	/**
+	 * 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): StringSchema;
+	replace(pattern: string, replacement: string): StringSchema;
+
+	/**
+	 * Requires the string value to only contain a-z, A-Z, and 0-9.
+	 */
+	alphanum(): StringSchema;
+
+	/**
+	 * Requires the string value to only contain a-z, A-Z, 0-9, and underscore _.
+	 */
+	token(): StringSchema;
+
+	/**
+	 * Requires the string value to be a valid email address.
+	 */
+	email(options?: EmailOptions): StringSchema;
+
+	/**
+	 * Requires the string value to be a valid ip address.
+	 */
+	ip(options?: IpOptions): StringSchema;
+
+	/**
+	 * Requires the string value to be a valid RFC 3986 URI.
+	 */
+	uri(options?: UriOptions): StringSchema;
+
+	/**
+	 * Requires the string value to be a valid GUID.
+	 */
+	guid(): StringSchema;
+
+	/**
+	 * Requires the string value to be a valid hexadecimal string.
+	 */
+	hex(): StringSchema;
+
+	/**
+	 * Requires the string value to be a valid hostname as per RFC1123.
+	 */
+	hostname(): StringSchema;
+
+	/**
+	 * Requires the string value to be in valid ISO 8601 date format.
+	 */
+	isoDate(): StringSchema;
+
+	/**
+	 * 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(): StringSchema;
+
+	/**
+	 * 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(): StringSchema;
+
+	/**
+	 * 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(): StringSchema;
+}
+
+export interface ArraySchema extends AnySchema<ArraySchema> {
+	/**
+	 * Allow this array to be sparse.
+	 * enabled can be used with a falsy value to go back to the default behavior.
+	 */
+	sparse(enabled?: any): ArraySchema;
+
+	/**
+	 * 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): ArraySchema;
+
+	/**
+	 * 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(type: Schema, ...types: Schema[]): ArraySchema;
+	items(types: Schema[]): ArraySchema;
+
+	/**
+	 * Specifies the minimum number of items in the array.
+	 */
+	min(limit: number): ArraySchema;
+
+	/**
+	 * Specifies the maximum number of items in the array.
+	 */
+	max(limit: number): ArraySchema;
+
+	/**
+	 * Specifies the exact number of items in the array.
+	 */
+	length(limit: number): ArraySchema;
+
+	/**
+	 * 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(): ArraySchema;
+}
+
+export interface ObjectSchema extends AnySchema<ObjectSchema> {
+	/**
+	 * Sets the allowed object keys.
+	 */
+	keys(schema?: SchemaMap): ObjectSchema;
+
+	/**
+	 * Specifies the minimum number of keys in the object.
+	 */
+	min(limit: number): ObjectSchema;
+
+	/**
+	 * Specifies the maximum number of keys in the object.
+	 */
+	max(limit: number): ObjectSchema;
+
+	/**
+	 * Specifies the exact number of keys in the object.
+	 */
+	length(limit: number): ObjectSchema;
+
+	/**
+	 * Specify validation rules for unknown keys matching a pattern.
+	 */
+	pattern(regex: RegExp, schema: Schema): ObjectSchema;
+
+	/**
+	 * 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(peer1: string, ...peers: string[]): ObjectSchema;
+	and(peers: string[]): ObjectSchema;
+
+	/**
+	 * 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(peer1: string, ...peers: string[]): ObjectSchema;
+	nand(peers: string[]): ObjectSchema;
+
+	/**
+	 * Defines a relationship between keys where one of the peers is required (and more than one is allowed).
+	 */
+	or(peer1: string, ...peers: string[]): ObjectSchema;
+	or(peers: string[]): ObjectSchema;
+
+	/**
+	 * Defines an exclusive relationship between a set of keys. one of them is required but not at the same time where:
+	 */
+	xor(peer1: string, ...peers: string[]): ObjectSchema;
+	xor(peers: string[]): ObjectSchema;
+
+	/**
+	 * Requires the presence of other keys whenever the specified key is present.
+	 */
+	with(key: string, peers: string): ObjectSchema;
+	with(key: string, peers: string[]): ObjectSchema;
+
+	/**
+	 * Forbids the presence of other keys whenever the specified is present.
+	 */
+	without(key: string, peers: string): ObjectSchema;
+	without(key: string, peers: string[]): ObjectSchema;
+
+	/**
+	 * Renames a key to another name (deletes the renamed key).
+	 */
+	rename(from: string, to: string, options?: RenameOptions): ObjectSchema;
+
+	/**
+	 * Verifies an assertion where.
+	 */
+	assert(ref: string, schema: Schema, message?: string): ObjectSchema;
+	assert(ref: Reference, schema: Schema, message?: string): ObjectSchema;
+
+	/**
+	 * Overrides the handling of unknown keys for the scope of the current object only (does not apply to children).
+	 */
+	unknown(allow?: boolean): ObjectSchema;
+
+	/**
+	 * 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): ObjectSchema;
+
+	/**
+	 * 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): ObjectSchema;
+	requiredKeys(children: string[]): ObjectSchema;
+	requiredKeys(child: string, ...children: string[]): ObjectSchema;
+
+	/**
+	 * 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): ObjectSchema;
+	optionalKeys(children: string[]): ObjectSchema;
+	optionalKeys(child: string, ...children: string[]): ObjectSchema;
+}
+
+export interface BinarySchema extends AnySchema<BinarySchema> {
+	/**
+	 * Sets the string encoding format if a string input is converted to a buffer.
+	 */
+	encoding(encoding: string): BinarySchema;
+
+	/**
+	 * Specifies the minimum length of the buffer.
+	 */
+	min(limit: number): BinarySchema;
+
+	/**
+	 * Specifies the maximum length of the buffer.
+	 */
+	max(limit: number): BinarySchema;
+
+	/**
+	 * Specifies the exact length of the buffer:
+	 */
+	length(limit: number): BinarySchema;
+}
+
+export interface DateSchema extends AnySchema<DateSchema> {
+	/**
+	 * 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): DateSchema;
+	min(date: number): DateSchema;
+	min(date: string): DateSchema;
+	min(date: Reference): DateSchema;
+
+	/**
+	 * 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): DateSchema;
+	max(date: number): DateSchema;
+	max(date: string): DateSchema;
+	max(date: Reference): DateSchema;
+
+	/**
+	 * Specifies the allowed date format:
+	 * @param format - string or array of strings that follow the moment.js format.
+	 */
+	format(format: string): DateSchema;
+	format(format: string[]): DateSchema;
+
+	/**
+	 * Requires the string value to be in valid ISO 8601 date format.
+	 */
+	iso(): DateSchema;
+}
+
+export interface FunctionSchema extends AnySchema<FunctionSchema> {
+}
+
+export interface AlternativesSchema extends AnySchema<FunctionSchema> {
+	try(schemas: Schema[]): AlternativesSchema;
+	when<T>(ref: string, options: WhenOptions<T>): AlternativesSchema;
+	when<T>(ref: Reference, options: WhenOptions<T>): AlternativesSchema;
+}
+
+// --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
+
+/**
+ * Generates a schema object that matches any data type.
+ */
+export function any(): Schema;
+
+/**
+ * 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: Schema[]): Schema;
+export function alternatives(type1: Schema, type2: Schema, ...types: Schema[]): Schema;
+
+/**
+ * Validates a value using the given schema and options.
+ */
+export function validate<T>(value: T, schema: Schema, callback: (err: ValidationError, value: T) => void): void;
+export function validate<T>(value: T, schema: Object, callback: (err: ValidationError, value: T) => void): void;
+export function validate<T>(value: T, schema: Object, options?: ValidationOptions, callback?: (err: ValidationError, value: T) => void): ValidationResult<T>;
+
+/**
+ * Converts literal schema definition to joi schema object (or returns the same back if already a joi schema object).
+ */
+export function compile(schema: Object): Schema;
+
+/**
+ * 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: Schema, message?: string | Error): void;
+
+/**
+ * Generates a reference to the value of the named key.
+ */
+export function ref(key: string, options?: ReferenceOptions): Reference;
diff --git a/types/joi/v6/joi-tests.ts b/types/joi/v6/joi-tests.ts
index 33923b500a..d8c5a99ae2 100644
--- a/types/joi/v6/joi-tests.ts
+++ b/types/joi/v6/joi-tests.ts
@@ -2,48 +2,42 @@ 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;
+declare const value: any;
+let num = 0;
+let str = '';
+declare const bool: boolean;
+declare const exp: RegExp;
+declare const obj: Object;
+declare const date: Date;
+declare const err: Error;
+declare const func: Function;
 
-var anyArr: any[] = [];
-var numArr: number[] = [];
-var strArr: string[] = [];
-var boolArr: boolean[] = [];
-var expArr: RegExp[] = [];
-var objArr: Object[] = [];
-var errArr: Error[] = [];
-var funcArr: Function[] = [];
+declare const strArr: string[];
+declare const expArr: RegExp[];
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schema: Joi.Schema = null;
+let schema: Joi.Schema = null;
 
-var anySchema: Joi.AnySchema<Joi.Schema> = 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<Joi.Schema> = 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[] = [];
+declare const schemaArr: Joi.Schema[];
 
-var ref: Joi.Reference = null;
+let ref: Joi.Reference = null;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var validOpts: Joi.ValidationOptions = null;
+let validOpts: Joi.ValidationOptions = null;
 
 validOpts = {abortEarly: bool};
 validOpts = {convert: bool};
@@ -56,7 +50,7 @@ validOpts = {context: obj};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var renOpts: Joi.RenameOptions = null;
+let renOpts: Joi.RenameOptions = null;
 
 renOpts = {alias: bool};
 renOpts = {multiple: bool};
@@ -65,7 +59,7 @@ renOpts = {ignoreUndefined: bool};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var emailOpts: Joi.EmailOptions = null;
+let emailOpts: Joi.EmailOptions = null;
 
 emailOpts = {errorLevel: num};
 emailOpts = {errorLevel: bool};
@@ -75,7 +69,7 @@ emailOpts = {minDomainAtoms: num};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var ipOpts: Joi.IpOptions = null;
+let ipOpts: Joi.IpOptions = null;
 
 ipOpts = {version: str};
 ipOpts = {version: strArr};
@@ -83,7 +77,7 @@ ipOpts = {cidr: str};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var uriOpts: Joi.UriOptions = null;
+let uriOpts: Joi.UriOptions = null;
 
 uriOpts = {scheme: str};
 uriOpts = {scheme: exp};
@@ -92,7 +86,7 @@ uriOpts = {scheme: expArr};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var whenOpts: Joi.WhenOptions<any> = null;
+let whenOpts: Joi.WhenOptions<any> = null;
 
 whenOpts = {is: x};
 whenOpts = {is: schema, then: schema};
@@ -100,17 +94,17 @@ whenOpts = {is: schema, otherwise: schema};
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-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;
+declare const validErr: Joi.ValidationError;
+let validErrItem: Joi.ValidationErrorItem;
 
-validErrItem= {
+validErrItem = {
 	message: str,
 	type: str,
 	path: str
@@ -149,7 +143,7 @@ anySchema = objSchema;
 
 // --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- --- ---
 
-var schemaMap: Joi.SchemaMap = null;
+let schemaMap: Joi.SchemaMap = null;
 
 schemaMap = {
 	a: numSchema,
@@ -160,7 +154,7 @@ schemaMap = {
 
 anySchema = Joi.any();
 
-namespace common {
+{ // common
 	anySchema = anySchema.allow(x);
 	anySchema = anySchema.allow(x, x);
 	anySchema = anySchema.allow([x, x, x]);
@@ -235,10 +229,9 @@ arrSchema = arrSchema.items(numSchema);
 arrSchema = arrSchema.items(numSchema, strSchema);
 arrSchema = arrSchema.items([numSchema, strSchema]);
 
-
 // - - - - - - - -
 
-namespace common_copy_paste {
+{ // common copy paste
 	// use search & replace from any
 	arrSchema = arrSchema.allow(x);
 	arrSchema = arrSchema.allow(x, x);
@@ -291,7 +284,7 @@ namespace common_copy_paste {
 boolSchema = Joi.bool();
 boolSchema = Joi.boolean();
 
-namespace common_copy_paste {
+{ // common copy paste
 	boolSchema = boolSchema.allow(x);
 	boolSchema = boolSchema.allow(x, x);
 	boolSchema = boolSchema.allow([x, x, x]);
@@ -347,7 +340,7 @@ binSchema = binSchema.min(num);
 binSchema = binSchema.max(num);
 binSchema = binSchema.length(num);
 
-namespace common {
+{ // common
 	binSchema = binSchema.allow(x);
 	binSchema = binSchema.allow(x, x);
 	binSchema = binSchema.allow([x, x, x]);
@@ -415,7 +408,7 @@ dateSchema = dateSchema.format(strArr);
 
 dateSchema = dateSchema.iso();
 
-namespace common {
+{ // common
 	dateSchema = dateSchema.allow(x);
 	dateSchema = dateSchema.allow(x, x);
 	dateSchema = dateSchema.allow([x, x, x]);
@@ -484,7 +477,7 @@ numSchema = numSchema.multiple(num);
 numSchema = numSchema.positive();
 numSchema = numSchema.negative();
 
-namespace common {
+{ // common
 	numSchema = numSchema.allow(x);
 	numSchema = numSchema.allow(x, x);
 	numSchema = numSchema.allow([x, x, x]);
@@ -593,7 +586,7 @@ objSchema = objSchema.optionalKeys(str);
 objSchema = objSchema.optionalKeys(str, str);
 objSchema = objSchema.optionalKeys(strArr);
 
-namespace common {
+{ // common
 	objSchema = objSchema.allow(x);
 	objSchema = objSchema.allow(x, x);
 	objSchema = objSchema.allow([x, x, x]);
@@ -678,7 +671,7 @@ strSchema = strSchema.lowercase();
 strSchema = strSchema.uppercase();
 strSchema = strSchema.trim();
 
-namespace common {
+{ // common
 	strSchema = strSchema.allow(x);
 	strSchema = strSchema.allow(x, x);
 	strSchema = strSchema.allow([x, x, x]);
diff --git a/types/joi/v6/tslint.json b/types/joi/v6/tslint.json
index a41bf5d19a..0b8095b5e1 100644
--- a/types/joi/v6/tslint.json
+++ b/types/joi/v6/tslint.json
@@ -1,79 +1,12 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
+        // All are TODOs
         "ban-types": false,
         "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
         "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
         "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "unified-signatures": false
     }
 }
diff --git a/types/jotform-css.js/index.d.ts b/types/jotform-css.js/index.d.ts
new file mode 100644
index 0000000000..1a712868fb
--- /dev/null
+++ b/types/jotform-css.js/index.d.ts
@@ -0,0 +1,104 @@
+// Type definitions for jotform-css.js 1.0
+// Project: https://github.com/jotform/css.js
+// Definitions by: Peter van der Woude <https://github.com/pandawood>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare global {
+	const cssjs: CssJsConstructor;
+}
+
+export interface CssJsConstructor {
+	new (): CssJs;
+}
+
+export const cssjs: CssJsConstructor;
+export default cssjs;
+
+export interface CssJs {
+	/**
+	 * Parses given css string, and returns css object
+	 * keys as selectors and values are css rules
+	 * eliminates all css comments before parsing
+	 * @param css string to be parsed
+	 * @returns css object
+	 */
+	parseCSS(css: string): CssJs;
+
+	/**
+	 * parses given string containing css directives
+	 * @param rules, css directive string eg color:white; font-size:18px;
+	 * @returns an array of objects containing ruleName:ruleValue pairs
+	 */
+	parseRules(rules: string): any[];
+
+	/**
+	 * returns the rule having given directive
+	 */
+	findCorrespondingRule(rules: string, directive: string, value?: string): string | boolean;
+
+	/**
+	 * Finds styles that have given selector, compress them and returns them
+	 */
+	findBySelector(cssObject: CssJs, selector: string, contains?: boolean): CssJs;
+
+	/**
+	 * deletes cssObjects having given selector, and returns new array
+	 */
+	deleteBySelector(cssObject: CssJs, selector: string): CssJs;
+
+	/**
+	 * Compresses given cssObjectArray and tries to minimize selector redundence
+	 */
+	compressCSS(cssObject: CssJs): CssJs;
+
+	/**
+	 * @returns diff css object contains changed values in css1 in regards to css2, false if same
+	 */
+	cssDiff(css1: CssJs, css2: CssJs): boolean;
+
+	/**
+	 * @param cssObject target css object array
+	 * @param newArray source array that will be pushed into cssObject parameter
+	 * @param reverse [optional], if given true, first parameter will be traversed on reversed order
+	 * effectively giving priority to the styles in newArray
+	 */
+	intelligentMerge(cssObject: CssJs, newArray: CssJs, reverse?: boolean): void;
+
+	/**
+	 * inserts new css objects into a bigger css object with same selectors grouped together
+	 * @param cssObject array of bigger css object to be pushed into
+	 * @param minimalObject single css object
+	 * @param reverse reverse [optional] default is false, if given, cssObject will be reversly traversed
+	 * resulting more priority in minimalObject's styles
+	 */
+	intelligentCSSPush(cssObject: CssJs, minimalObject: CssJs, reverse?: boolean): void;
+
+	/**
+	 * Filter outs rule objects whose type param equal to DELETED
+	 * @param rules array of rules
+	 */
+	compactRules(rules: string[]): string[];
+
+	/**
+	 * Computes string for ace editor using this.css or given cssBase optional parameter
+	 */
+	getCSSForEditor(parsedCss: CssJs, depth?: number): string;
+
+	/**
+	 * Given rules array, returns visually formatted css string to be used inside editor
+	 */
+	getCSSOfRules(rules: string, depth?: null): string;
+
+	/**
+	 * Given css string or objectArray, parses it and then for every selector,
+	 * prepends this.cssPreviewNamespace to prevent css collision issues
+	 * @returns object in which this css prepended
+	 */
+	applyNamespacing(parsedCss: CssJs | string, prefix: string): CssJs;
+
+	/**
+	 * @param css the original css string to be stripped out of comments
+	 * @returns cleaned CSS containing no css comments
+	 */
+	stripComments(css: string): string;
+}
diff --git a/types/jotform-css.js/test/jotform-css.js-global-tests.ts b/types/jotform-css.js/test/jotform-css.js-global-tests.ts
new file mode 100644
index 0000000000..95cb5f6be0
--- /dev/null
+++ b/types/jotform-css.js/test/jotform-css.js-global-tests.ts
@@ -0,0 +1,5 @@
+function addNamespace(cssString: string): string {
+	const parser = new cssjs();
+	const parsed = parser.applyNamespacing(cssString, "#id1");
+	return parser.getCSSForEditor(parsed);
+}
diff --git a/types/jotform-css.js/test/jotform-css.js-module-tests.ts b/types/jotform-css.js/test/jotform-css.js-module-tests.ts
new file mode 100644
index 0000000000..7f42f0275c
--- /dev/null
+++ b/types/jotform-css.js/test/jotform-css.js-module-tests.ts
@@ -0,0 +1,9 @@
+import cssjsParser = require("jotform-css.js");
+
+function addNamespace(cssString: string): string {
+	const parser = new cssjsParser.cssjs();
+	let parsed = parser.parseCSS(cssString);
+	parsed = parser.applyNamespacing(parsed, "#id1");
+	const css = parser.getCSSForEditor(parsed);
+	return css;
+}
diff --git a/types/jotform-css.js/tsconfig.json b/types/jotform-css.js/tsconfig.json
new file mode 100644
index 0000000000..948e34b5ce
--- /dev/null
+++ b/types/jotform-css.js/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
+    },
+    "files": [
+        "index.d.ts",
+        "test/jotform-css.js-global-tests.ts",
+        "test/jotform-css.js-module-tests.ts"
+    ]
+}
diff --git a/types/jotform-css.js/tslint.json b/types/jotform-css.js/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/jotform-css.js/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/jquery-animate-scroll/index.d.ts b/types/jquery-animate-scroll/index.d.ts
new file mode 100644
index 0000000000..a21b179738
--- /dev/null
+++ b/types/jquery-animate-scroll/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for JQuery Animate Scroll 1.0
+// Project: https://github.com/risan/jquery-animate-scroll
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export type Options = Partial<{
+    $container: JQuery;
+    speed: number;
+    offset: number;
+}>;
+
+declare global {
+    interface JQuery {
+        animateScroll(options?: Options): JQuery;
+        scrollHere(options?: Options): JQuery;
+    }
+
+    interface JQueryStatic {
+        scrollTo(element: JQuery, options?: Options): void;
+    }
+}
diff --git a/types/jquery-animate-scroll/jquery-animate-scroll-tests.ts b/types/jquery-animate-scroll/jquery-animate-scroll-tests.ts
new file mode 100644
index 0000000000..65bdb07aef
--- /dev/null
+++ b/types/jquery-animate-scroll/jquery-animate-scroll-tests.ts
@@ -0,0 +1,21 @@
+import { Options } from "jquery-animate-scroll";
+
+// basic usage
+$('a').animateScroll();
+
+$('#article-1').scrollHere();
+
+$.scrollTo($('#article-1'));
+
+// with options
+const options: Options = {
+  $container: $('body'),
+  speed: 1000,
+  offset: -100
+};
+
+$('a').animateScroll(options);
+
+$('#article-1').scrollHere(options);
+
+$.scrollTo($('#article-1'), options);
diff --git a/types/jquery-animate-scroll/tsconfig.json b/types/jquery-animate-scroll/tsconfig.json
new file mode 100644
index 0000000000..94883a5e7b
--- /dev/null
+++ b/types/jquery-animate-scroll/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,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-animate-scroll-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-animate-scroll/tslint.json b/types/jquery-animate-scroll/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-animate-scroll/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/jquery-gray/index.d.ts b/types/jquery-gray/index.d.ts
new file mode 100644
index 0000000000..2d48831bc2
--- /dev/null
+++ b/types/jquery-gray/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for JQuery Gray 1.6
+// Project: https://github.com/karlhorky/gray
+// Definitions by: Anderson Friaça <https://github.com/AndersonFriaca>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="jquery" />
+
+export type Classes = Partial<{
+    fade: string;
+}>;
+
+export type Options = Partial<{
+    fade: boolean;
+    classes: Classes;
+}>;
+
+declare global {
+    interface JQuery {
+        gray(options?: Options): JQuery;
+        toggleClass(className: 'grayscale-off'): JQuery;
+    }
+}
diff --git a/types/jquery-gray/jquery-gray-tests.ts b/types/jquery-gray/jquery-gray-tests.ts
new file mode 100644
index 0000000000..2e2027354f
--- /dev/null
+++ b/types/jquery-gray/jquery-gray-tests.ts
@@ -0,0 +1,16 @@
+import { Options } from "jquery-gray";
+
+// basic usage
+$('.images').gray();
+
+$('.images').toggleClass('grayscale-off');
+
+// with options
+const options: Options = {
+    fade: true,
+    classes: {
+        fade: 'grayscale-fade'
+    }
+};
+
+$('.images').gray(options);
diff --git a/types/jquery-gray/tsconfig.json b/types/jquery-gray/tsconfig.json
new file mode 100644
index 0000000000..81d0dced36
--- /dev/null
+++ b/types/jquery-gray/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,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "jquery-gray-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/jquery-gray/tslint.json b/types/jquery-gray/tslint.json
new file mode 100644
index 0000000000..d04fe2e1fa
--- /dev/null
+++ b/types/jquery-gray/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
\ No newline at end of file
diff --git a/types/jquery-toast-plugin/index.d.ts b/types/jquery-toast-plugin/index.d.ts
new file mode 100644
index 0000000000..db95a9961c
--- /dev/null
+++ b/types/jquery-toast-plugin/index.d.ts
@@ -0,0 +1,39 @@
+// Type definitions for jquery-toast-plugin 1.3
+// Project: https://github.com/kamranahmedse/jquery-toast-plugin
+// Definitions by: Viqas Hussain <https://github.com/viqashussain>
+//                 Andrew Stegmaier <https://github.com/astegmaier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="jquery"/>
+
+interface JQueryStatic {
+    toast(options: toastOptions): void;
+}
+
+interface toastOptions {
+    text: string;
+    heading?: string;
+    showHideTransition?: 'fade' | 'slide' | 'plain';
+    allowToastClose?: boolean;
+    hideAfter?: number | false;
+    loader?: boolean;
+    loaderBg?: string;
+    stack?: number | false;
+    position?: 'bottom-left' | 'bottom-right' | 'bottom-center' | 'top-right' | 'top-left' | 'top-center' | 'mid-center' | CustomPosition;
+    bgColor?: string;
+    textColor?: string;
+    textAlign?: 'left' | 'right' | 'center';
+    icon?: 'info' | 'warning' | 'error' | 'success';
+    beforeShow?: () => any;
+    afterShown?: () => any;
+    beforeHide?: () => any;
+    afterHidden?: () => any;
+}
+
+interface CustomPosition {
+    left: number | 'auto';
+    right: number | 'auto';
+    top: number | 'auto';
+    bottom: number | 'auto';
+}
diff --git a/types/jquery-toast-plugin/jquery-toast-plugin-tests.ts b/types/jquery-toast-plugin/jquery-toast-plugin-tests.ts
new file mode 100644
index 0000000000..d8f21dd200
--- /dev/null
+++ b/types/jquery-toast-plugin/jquery-toast-plugin-tests.ts
@@ -0,0 +1,52 @@
+$.toast({ text: "test" });
+
+$.toast({ text: "test", heading: "Test Heading" });
+
+$.toast({ text: "test", showHideTransition: "fade" });
+$.toast({ text: "test", showHideTransition: "slide" });
+$.toast({ text: "test", showHideTransition: "plain" });
+
+$.toast({ text: "test", allowToastClose: false });
+$.toast({ text: "test", allowToastClose: true });
+
+$.toast({ text: "test", hideAfter: 5});
+$.toast({ text: "test", hideAfter: false});
+
+$.toast({ text: "test", loader: true });
+$.toast({ text: "test", loader: false });
+
+$.toast({ text: "test", loaderBg: "#9EC600" });
+
+$.toast({ text: "test", stack: 5});
+$.toast({ text: "test", stack: false});
+
+$.toast({ text: "test", position: "bottom-left" });
+$.toast({ text: "test", position: "bottom-right" });
+$.toast({ text: "test", position: "bottom-center" });
+$.toast({ text: "test", position: "top-right" });
+$.toast({ text: "test", position: "top-left" });
+$.toast({ text: "test", position: "top-center" });
+$.toast({ text: "test", position: "mid-center" });
+$.toast({ text: "test", position: { left : "auto", right : 20, top : 20, bottom : "auto" } });
+$.toast({ text: "test", position: { left : 20, right : "auto", top : "auto", bottom : 20 } });
+
+$.toast({ text: "test", bgColor: "#9EC600" });
+
+$.toast({ text: "test", textColor: "#9EC600" });
+
+$.toast({ text: "test", textAlign: "left" });
+$.toast({ text: "test", textAlign: "right" });
+$.toast({ text: "test", textAlign: "center" });
+
+$.toast({ text: "test", icon: "info" });
+$.toast({ text: "test", icon: "warning" });
+$.toast({ text: "test", icon: "error" });
+$.toast({ text: "test", icon: "success" });
+
+$.toast({
+    text: 'Triggers the events',
+    beforeShow: () => {},
+    afterShown: () => {},
+    beforeHide: () => {},
+    afterHidden: () => {}
+});
diff --git a/types/jquery-toast-plugin/tsconfig.json b/types/jquery-toast-plugin/tsconfig.json
new file mode 100644
index 0000000000..95759d345b
--- /dev/null
+++ b/types/jquery-toast-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",
+        "jquery-toast-plugin-tests.ts"
+    ]
+}
diff --git a/types/jquery-toast-plugin/tslint.json b/types/jquery-toast-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/jquery-toast-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/jquery.fancytree/index.d.ts b/types/jquery.fancytree/index.d.ts
index c13cd7f26f..d370b06f4d 100644
--- a/types/jquery.fancytree/index.d.ts
+++ b/types/jquery.fancytree/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for jquery.fancytree 2.7.0
+// Type definitions for jquery.fancytree 2.28.2-0
 // Project: https://github.com/mar10/fancytree
 // Definitions by: Peter Palotas <https://github.com/alphaleonis>
 //                 Mahdi Abedi <https://github.com/abedi-ir>
+//                 Nikolai Ommundsen <https://github.com/niikoo>
 //                 Nitecube <https://github.com/Nitecube>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 
 ///<reference types="jquery" />
@@ -95,10 +96,10 @@ 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[];
+        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;
@@ -315,7 +316,7 @@ declare namespace Fancytree {
          * @param map callback function(NodeData) that could modify the new node
          * @returns new node.
          */
-        copyTo(node: FancytreeNode, mode?: string, map?: (node: NodeData) => void) : FancytreeNode;
+        copyTo(node: FancytreeNode, mode?: string, map?: (node: NodeData) => void): FancytreeNode;
 
         /** Count direct and indirect children.
          *
@@ -545,7 +546,7 @@ declare namespace Fancytree {
         resetLazy(): void;
 
         /** Schedule activity for delayed execution (cancel any pending request). scheduleAction('cancel') will only cancel a pending request (if any). */
-        scheduleAction(mode: string, ms: number) : void;
+        scheduleAction(mode: string, ms: number): void;
 
         /**
          * @param effects animation options.
@@ -761,7 +762,20 @@ declare namespace Fancytree {
         /** Make sure that the active node is always visible, i.e. its parents are expanded (default: true). */
         activeVisible?: boolean;
         /** Default options for ajax requests. */
-        ajax?: Object;
+        ajax?: {
+            /**
+             * HTTP Method (default: 'GET')
+             */
+            type: string;
+            /**
+             * false: Append random '_' argument to the request url to prevent caching.
+             */
+            cache: boolean;
+            /**
+             * Default 'json' -> Expect json format and pass json object to callbacks.
+             */
+            dataType: string;
+        };
         /** (default: false) Add WAI-ARIA attributes to markup */
         aria?: boolean;
         /** Activate a node when focused with the keyboard (default: true) */
@@ -771,24 +785,26 @@ 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|string|((event: JQueryEventObject, data: EventData) => 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) */
-        debugLevel?: number;
+        /** 0..4 (null: use global setting $.ui.fancytree.debugInfo) */
+        debugLevel?: 0 | 1 | 2 | 3 | 4;
         /** callback(node) is called for new nodes without a key. Must return a new unique key. (default null: generates default keys like that: "_" + counter) */
         defaultKey?: (node: FancytreeNode) => string;
         /** Accept passing ajax data in a property named `d` (default: true). */
         enableAspx?: boolean;
+        /** Enable titles (default: false) */
+        enableTitles?: boolean;
         /** List of active extensions (default: []) */
-        extensions?: string[];
+        extensions?: Array<keyof Extensions.List | string>;
         /** Set focus when node is checked by a mouse click (default: false) */
         focusOnSelect?: boolean;
         /** Add `id="..."` to node markup (default: true). */
         generateIds?: boolean;
-        /** Display node icons (default: true) */
-        icons?: boolean;
-        /** (default: "ft_") */
+        /** Node icon url, if only filename, please use imagePath to set the path */
+        icon?: boolean | string;
+        /** Prefix (default: "ft_") */
         idPrefix?: string;
         /** Path to a folder containing icons (default: null, using 'skin/' subdirectory). */
         imagePath?: string;
@@ -800,36 +816,227 @@ declare namespace Fancytree {
         minExpandLevel?: number;
         /** navigate to next node by typing the first letters (default: false) */
         quicksearch?: boolean;
+        /** Right to left mode (default: false) */
+        rtl?: false;
         /** optional margins for node.scrollIntoView() (default: {top: 0, bottom: 0}) */
-        scrollOfs?: Object;
+        scrollOfs?: { top: number, bottom: number };
         /** scrollable container for node.scrollIntoView() (default: $container) */
-        scrollParent?: JQuery;
+        scrollParent?: JQuery | null;
         /** default: multi_hier */
         selectMode?: FancytreeSelectMode;
         /** Used to Initialize the tree. */
-        source?: any;
+        source?: any[] | any;
         /** Translation table */
-        strings?: Object;
+        strings?: TranslationTable;
         /** Add tabindex='0' to container, so tree can be reached using TAB */
         tabbable?: boolean;
         /** Add tabindex='0' to node title span, so it can receive keyboard focus */
         titlesTabbable?: boolean;
         /** Animation options, false:off (default: { effect: "blind", options: {direction: "vertical", scale: "box"}, duration: 200 }) */
         toggleEffect?: JQueryUI.EffectOptions;
+        /** Tooltips */
+        tooltip?: boolean;
 
         /** (dynamic Option)Prevent (de-)selection using mouse or keyboard. */
-        unselectable?: boolean|((event: JQueryEventObject, data: Fancytree.EventData) => boolean|undefined);
+        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);
+        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);
+        unselectableStatus?: boolean | ((event: JQueryEventObject, data: Fancytree.EventData) => boolean | undefined);
+
+        ////////////////
+        // EXTENSIONS //
+        ////////////////
+        dnd5?: Extensions.DragAndDrop5;
+        filter?: Extensions.Filter;
+        table?: Extensions.Table;
+
+        /** Options for misc extensions - see docs for typings */
+        [extension: string]: any;
     }
 
+    interface TranslationTable {
+        /**
+         * "Loading..."  // &#8230; would be escaped when escapeTitles is true
+         */
+        loading: string;
+        /**
+         * "Load error!"
+         */
+        loadError: string;
+        /**
+         * "More..."
+         */
+        moreData: string;
+        /**
+         * "No data."
+         */
+        noData: string;
+    }
+
+    namespace Extensions {
+        interface List {
+            dnd5?: DragAndDrop5;
+            filter?: Filter;
+            table?: Table;
+            [extension: string]: any;
+        }
+
+        interface DragAndDrop5 {
+            /**
+             * Expand nodes after n milliseconds of hovering.
+             */
+            autoExpandMS?: number;
+            /**
+             * Absolute position offset for .fancytree-drop-marker
+             */
+            dropMarkerOffsetX?: number;
+            /**
+             * Additional offset for drop-marker with hitMode = "before"/"after"
+             */
+            dropMarkerInsertOffsetX?: number;
+            /**
+             * true: Drag multiple (i.e. selected) nodes.
+             */
+            multiSource?: boolean;
+            /**
+             * Prevent dropping nodes from different Fancytrees
+             */
+            preventForeignNodes?: boolean;
+            /**
+             * Prevent dropping items other than Fancytree nodes
+             */
+            preventNonNodes?: boolean;
+            /**
+             * Prevent dropping nodes on own descendants
+             */
+            preventRecursiveMoves?: boolean;
+            /**
+             * Prevent dropping nodes 'before self', etc.
+             */
+            preventVoidMoves?: boolean;
+            /**
+             * Enable auto-scrolling while dragging
+             */
+            scroll?: boolean;
+            /**
+             * Active top/bottom margin in pixel
+             */
+            scrollSensitivity?: number;
+            /**
+             * Pixel per event
+             */
+            scrollSpeed?: number;
+            /**
+             * Allow dragging of nodes to different IE windows, default: false
+             */
+            setTextTypeJson?: boolean;
+            /**
+             * Callback(sourceNode, data), return true, to enable dnd drag
+             */
+            dragStart?: (sourceNode: FancytreeNode, data: any) => void;
+            dragDrag?: (sourceNode: FancytreeNode, data: any) => void;
+            dragEnd?: (sourceNode: FancytreeNode, data: any) => void;
+            /**
+             * Callback(targetNode, data), return true, to enable dnd drop
+             */
+            dragEnter?: (targetNode: FancytreeNode, data: any) => void;
+            /**
+             * Events (drag over)
+             */
+            dragOver?: (targetNode: FancytreeNode, data: any) => void;
+            /**
+             * Callback(targetNode, data), return false to prevent autoExpand
+             */
+            dragExpand?: (targetNode: FancytreeNode, data: any) => void;
+            /**
+             * Events (drag drop)
+             */
+            dragDrop?: (node: FancytreeNode, data: any) => void;
+            dragLeave?: (targetNode: FancytreeNode, data: any) => void;
+            /**
+             * Support misc options
+             */
+            [key: string]: any;
+        }
+        /**
+         * Define filter-extension options
+         */
+        interface Filter {
+            /**
+             * Re-apply last filter if lazy data is loaded
+             */
+            autoApply: boolean;
+            /**
+             * Expand all branches that contain matches while filtered
+             */
+            autoExpand: boolean;
+            /**
+             * Show a badge with number of matching child nodes near parent icons
+             */
+            counter: boolean;
+            /**
+             * Match single characters in order, e.g. 'fb' will match 'FooBar'
+             */
+            fuzzy: boolean;
+            /**
+             * Hide counter badge if parent is expanded
+             */
+            hideExpandedCounter: boolean;
+            /**
+             * Hide expanders if all child nodes are hidden by filter
+             */
+            hideExpanders: boolean;
+            /**
+             * Highlight matches by wrapping inside <mark> tags
+             */
+            highlight: boolean;
+            /**
+             * Match end nodes only
+             */
+            leavesOnly: boolean;
+            /**
+             * Display a 'no data' status node if result is empty
+             */
+            nodata: boolean;
+            /**
+             * Grayout unmatched nodes (pass "hide" to remove unmatched node instead); default 'dimm'
+             */
+            mode: 'dimm' | 'string';
+            /**
+             * Support misc options
+             */
+            [key: string]: any;
+        }
+        /**
+         * Define table-extension options
+         */
+        interface Table {
+            /**
+             * Render the checkboxes into the this column index (default: nodeColumnIdx)
+             */
+            checkboxColumnIdx: any;
+            /**
+             * Indent every node level by 16px; default: 16
+             */
+            indentation: number;
+            /**
+             * Render node expander, icon, and title to this column (default: 0)
+             */
+            nodeColumnIdx: number;
+            /**
+             * Support misc options
+             */
+            [key: string]: any;
+        }
+    }
+
+
     /** 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?: boolean|string;
+        icon?: boolean | string;
         /** unique key for this node (auto-generated if omitted) */
         key?: string;
         /** (reserved) */
diff --git a/types/jquery.fancytree/jquery.fancytree-tests.ts b/types/jquery.fancytree/jquery.fancytree-tests.ts
index de1489de42..8f9707597e 100644
--- a/types/jquery.fancytree/jquery.fancytree-tests.ts
+++ b/types/jquery.fancytree/jquery.fancytree-tests.ts
@@ -1,4 +1,4 @@
-$("#tree").fancytree({
+$("#tree").fancytree(<Fancytree.FancytreeOptions>{
 	source: [
 		{ title: "Node 1", key: "1" },
 		{
@@ -12,16 +12,20 @@ $("#tree").fancytree({
 						{ title: "Node 1", key: "1" },
 						{
 							title: "Folder 2", key: "2", folder: true, children: [
-							{ title: "Node 2.1", key: "3" },
-							{ title: "Node 2.2", key: "4" },
-							{ title: "NOde 2.3", key: "5", icon: "./icon.svg", checkbox: "radio"}
-						]
+								{ title: "Node 2.1", key: "3" },
+								{ title: "Node 2.2", key: "4" },
+								{ title: "NOde 2.3", key: "5", icon: "./icon.svg", checkbox: "radio" }
+							]
 						}
 					]
 				}
 			]
 		}
 	],
+	extensions: ['dnd5'],
+	dnd5: {
+		dragDrag: (node, data) => { }
+	},
 	click: (ev: JQueryEventObject, node: Fancytree.EventData) => {
 		return true;
 	},
@@ -51,9 +55,9 @@ $("#tree").fancytree({
 
 //$("#tree").fancytree();
 
-var tree : Fancytree.Fancytree = $("#tree").fancytree("getTree");
+var tree: Fancytree.Fancytree = $("#tree").fancytree("getTree");
 
-var activeNode : Fancytree.FancytreeNode = tree.getRootNode();
+var activeNode: Fancytree.FancytreeNode = tree.getRootNode();
 
 // Sort children of active node:
 activeNode.sortChildren();
@@ -72,15 +76,15 @@ activeNode.addChildren({
 tree.loadKeyPath("/1/2", function (node, status) {
 	if (status === "loaded") {
 		console.log("loaded intermiediate node " + node);
-	} else if (status === "ok") {                
+	} else if (status === "ok") {
 		node.setActive();
 	}
 });
 
-var node = $.ui.fancytree.getNode($("#tree"));        
+var node = $.ui.fancytree.getNode($("#tree"));
 alert($.ui.fancytree.version);
-var f = $.ui.fancytree.debounce(50, (a : number) => { console.log(a); }, true);        
-f(2);   
+var f = $.ui.fancytree.debounce(50, (a: number) => { console.log(a); }, true);
+f(2);
 
 node = tree.getFirstChild();
 node.setExpanded().done(function () {
@@ -120,4 +124,4 @@ node.addChildren({
 	statusNodeType: "loading",
 	unselectableIgnore: true,
 	unselectableStatus: false,
-}, 0);
\ No newline at end of file
+}, 0);
diff --git a/types/jquery.fileupload/index.d.ts b/types/jquery.fileupload/index.d.ts
index 6ca998d41a..28bbf3c969 100644
--- a/types/jquery.fileupload/index.d.ts
+++ b/types/jquery.fileupload/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for jQuery File Upload Plugin 5.40.1
+// Type definitions for jQuery File Upload Plugin 9.22.0
 // Project: https://github.com/blueimp/jQuery-File-Upload
 // Definitions by: Rob Alarcon <https://github.com/rob-alarcon/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -6,7 +6,7 @@
 
 /// <reference types="jquery"/>
 
-// Interface options for the plugin 
+// Interface options for the plugin
 interface JQueryFileInputOptions {
 
     /**
@@ -106,8 +106,8 @@ interface JQueryFileInputOptions {
      */
     redirectParamName?: string;
 
-	// The HTTP request method must be "POST" or "PUT"
-	type?: string,
+    // The HTTP request method must be "POST" or "PUT"
+    type?: string,
 
     /**
      * Set the following option to the location of a postMessage window,
@@ -199,7 +199,7 @@ interface JQueryFileInputOptions {
      * handlers using jQuery's Deferred callbacks:
      * data.submit().done(func).fail(func).always(func);
      */
-    add?:  (e: JQueryEventObject, data: JQueryFileInputOptions) => void;
+    add?:  (e: JQueryEventObject, data: JqueryFileUploadAddObject) => void;
 
     // The plugin options are used as settings object for the ajax calls.
     // The following are jQuery ajax settings required for the file uploads:
@@ -209,7 +209,7 @@ interface JQueryFileInputOptions {
 
     cache?: boolean;
     timeout?: number;
-    
+
     active?: Function;
     progress?: (e: JQueryEventObject, data: JQueryFileUploadProgressObject) => void;
     send?: (e: JQueryEventObject, data: JQueryFileUploadProgressObject) => void;
@@ -217,13 +217,13 @@ interface JQueryFileInputOptions {
     // Validation
 
     /**
-    * The maximum allowed file size in bytes.
-    * Type: integer
-    * Default: undefined
-    * Example: 10000000 // 10 MB
-    * Note: This option has only an effect for browsers supporting the File API.
-    * @see https://github.com/blueimp/jQuery-File-Upload/wiki/Options#maxfilesize
-    */
+     * The maximum allowed file size in bytes.
+     * Type: integer
+     * Default: undefined
+     * Example: 10000000 // 10 MB
+     * Note: This option has only an effect for browsers supporting the File API.
+     * @see https://github.com/blueimp/jQuery-File-Upload/wiki/Options#maxfilesize
+     */
     maxFileSize?: number;
 
     // Other callbacks:
@@ -243,7 +243,7 @@ interface JQueryFileInputOptions {
     chunkfail?: (e: JQueryEventObject, data: JQueryFileUploadChunkObject) => void;
     chunkalways?: (e: JQueryEventObject, data: JQueryFileUploadChunkObject) => void;
 
-    // Others 
+    // Others
     url?: string;
     files?: any;
 
@@ -263,6 +263,12 @@ interface JQuery {
     fileupload(action: string, message:string, settings: JQueryFileInputOptions | string): JQueryFileUpload;
 }
 
+interface JqueryFileUploadEnhancedPromise<T> extends JQueryPromise<T>{
+    success: JQueryPromise<T>['done'],
+    error: JQueryPromise<T>['fail'],
+    complete: JQueryPromise<T>['always'],
+}
+
 interface JQuerySupport {
     fileInput?: boolean;
 }
@@ -275,6 +281,20 @@ interface JQueryFileUploadChangeObject {
     originalFiles: File[];
 }
 
+interface JqueryFileUploadConvenienceObject {
+    abort: () => JqueryFileUploadEnhancedPromise<any>;
+    process: (resolveFunc?: Function, rejectFunc?: Function) => JqueryFileUploadEnhancedPromise<any>;
+    processing: () => JqueryFileUploadEnhancedPromise<any>;
+    progress: () => JqueryFileUploadEnhancedPromise<any>;
+    response: () => JqueryFileUploadEnhancedPromise<any>;
+    submit<T>():  JqueryFileUploadEnhancedPromise<T>;
+    state: () => JqueryFileUploadEnhancedPromise<any>;
+}
+
+interface JqueryFileUploadAddObject extends JQueryFileUploadChangeObject, JqueryFileUploadConvenienceObject {
+    paramName?: string | string[];
+}
+
 interface JQueryFileUploadProgressAllObject {
     loaded?: number;
     total?: number;
@@ -304,4 +324,4 @@ interface JQueryFileUploadProgressObject extends JQueryFileInputOptions, JQueryF
 }
 
 interface JQueryFileUploadDone extends JQueryFileInputOptions, JQueryFileUploadXhr {
-}
+}
\ No newline at end of file
diff --git a/types/jquery.gridster/index.d.ts b/types/jquery.gridster/index.d.ts
index c91fd6f9e4..0106b448c6 100644
--- a/types/jquery.gridster/index.d.ts
+++ b/types/jquery.gridster/index.d.ts
@@ -10,23 +10,23 @@ gridster-0.1.0.d.ts may be freely distributed under the MIT license.
 Copyright (c) 2013 Josh Baldwin https://github.com/jbaldwin/gridster.d.ts
 
 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 
+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 
+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 
+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.
 */
 
@@ -104,7 +104,7 @@ interface GridsterOptions {
 	* Base widget dimensions in pixels.  The first index for the width and the second for the height.
 	* Default = [400, 225]
 	**/
-	widget_base_dimensions?: number[];
+	widget_base_dimensions?: ('auto'|number)[];
 
 	/**
 	* Add more columns in addition to those that have been calculated.
@@ -292,7 +292,7 @@ interface Gridster {
 	* @return Returns the instance of the Gridster class.
 	**/
 	enable(): Gridster;
-	
+
 	/**
 	* Disables dragging.
 	* @return Returns the instance of the Gridster class.
diff --git a/types/jquery.gridster/jquery.gridster-tests.ts b/types/jquery.gridster/jquery.gridster-tests.ts
index 4dc3e3f27e..6703dea785 100644
--- a/types/jquery.gridster/jquery.gridster-tests.ts
+++ b/types/jquery.gridster/jquery.gridster-tests.ts
@@ -28,6 +28,9 @@ var position = coords.col + coords.row;
 options.widget_base_dimensions = [100, 200];
 gridster.resize_widget_dimensions(options);
 
+options.widget_base_dimensions = ['auto', 200];
+gridster.resize_widget_dimensions(options);
+
 gridster.set_widget_min_size(0, [1, 2]);
 
 function noOptions() {
@@ -48,13 +51,13 @@ function widgetSelectorString() {
 	};
 
 	var grid: Gridster = $('.gridster ul').gridster(opts).data('gridster')
-} 
+}
 
 function withNamespace() {
 	var grid: Gridster = $('.gridster ul').gridster({
 		namespace: 'custom-gridster'
 	}).data('gridster')
-} 
+}
 
 function withStylesheet() {
 	var grid: Gridster = $('.gridster ul').gridster({
diff --git a/types/jquery/index.d.ts b/types/jquery/index.d.ts
index b0838f9a8d..b03a48dc6f 100644
--- a/types/jquery/index.d.ts
+++ b/types/jquery/index.d.ts
@@ -37,13 +37,12 @@ declare const $: JQueryStatic;
 
 // Used by JQuery.Event
 type _Event = Event;
-// Used by JQuery.Promise3 and JQuery.Promise
-type _Promise<T> = Promise<T>;
 
-interface JQueryStatic<TElement extends Node = HTMLElement> {
+interface JQueryStatic {
     /**
-     * @see {@link http://api.jquery.com/jquery.ajax/#jQuery-ajax1}
-     * @deprecated Use jQuery.ajaxSetup(options)
+     * @see \`{@link http://api.jquery.com/jquery.ajax/#jQuery-ajax1 }\`
+     *
+     * @deprecated Use \`{@link JQueryStatic.ajaxSetup }\`.
      */
     ajaxSettings: JQuery.AjaxSettings;
     /**
@@ -52,41 +51,44 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * any synchronous or asynchronous function.
      *
      * @param beforeStart A function that is called just before the constructor returns.
-     * @see {@link https://api.jquery.com/jQuery.Deferred/}
+     * @see \`{@link https://api.jquery.com/jQuery.Deferred/ }\`
      * @since 1.5
      */
     Deferred: JQuery.DeferredStatic;
-    Event: JQuery.EventStatic<TElement>;
+    Event: JQuery.EventStatic;
     /**
      * Hook directly into jQuery to override how particular CSS properties are retrieved or set, normalize
      * CSS property naming, or create custom properties.
      *
-     * @see {@link https://api.jquery.com/jQuery.cssHooks/}
+     * @see \`{@link https://api.jquery.com/jQuery.cssHooks/ }\`
      * @since 1.4.3
      */
-    cssHooks: JQuery.PlainObject<JQuery.CSSHook<TElement>>;
+    // Set to HTMLElement to minimize breaks but should probably be Element.
+    cssHooks: JQuery.PlainObject<JQuery.CSSHook<HTMLElement>>;
     /**
      * An object containing all CSS properties that may be used without a unit. The .css() method uses this
      * object to see if it may append px to unitless values.
      *
-     * @see {@link https://api.jquery.com/jQuery.cssNumber/}
+     * @see \`{@link https://api.jquery.com/jQuery.cssNumber/ }\`
      * @since 1.4.3
      */
     cssNumber: JQuery.PlainObject<boolean>;
-    readonly fn: JQuery<TElement>;
+    // Set to HTMLElement to minimize breaks but should probably be Element.
+    readonly fn: JQuery;
     fx: {
         /**
          * The rate (in milliseconds) at which animations fire.
          *
-         * @see {@link https://api.jquery.com/jQuery.fx.interval/}
+         * @see \`{@link https://api.jquery.com/jQuery.fx.interval/ }\`
          * @since 1.4.3
-         * @deprecated 3.0
+         *
+         * @deprecated Deprecated since 3.0. See \`{@link https://api.jquery.com/jQuery.fx.interval/ }\`.
          */
         interval: number;
         /**
          * Globally disable all animations.
          *
-         * @see {@link https://api.jquery.com/jQuery.fx.off/}
+         * @see \`{@link https://api.jquery.com/jQuery.fx.off/ }\`
          * @since 1.3
          */
         off: boolean;
@@ -95,10 +97,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
     /**
      * A Promise-like object (or "thenable") that resolves when the document is ready.
      *
-     * @see {@link https://api.jquery.com/jQuery.ready/}
+     * @see \`{@link https://api.jquery.com/jQuery.ready/ }\`
      * @since 1.8
      */
-    ready: JQuery.Thenable<JQueryStatic<TElement>>;
+    ready: JQuery.Thenable<JQueryStatic>;
     /**
      * A collection of properties that represent the presence of different browser features or bugs.
      * Intended for jQuery's internal use; specific properties may be removed when they are no longer
@@ -106,12 +108,17 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * needs, we strongly recommend the use of an external library such as Modernizr instead of dependency
      * on properties in jQuery.support.
      *
-     * @see {@link https://api.jquery.com/jQuery.support/}
+     * @see \`{@link https://api.jquery.com/jQuery.support/ }\`
      * @since 1.3
-     * @deprecated 1.9
+     *
+     * @deprecated Deprecated since 1.9. See \`{@link https://api.jquery.com/jQuery.support/ }\`.
      */
     support: JQuery.PlainObject;
-    valHooks: JQuery.PlainObject<JQuery.ValHook<TElement>>;
+    // Set to HTMLElement to minimize breaks but should probably be Element.
+    valHooks: JQuery.PlainObject<JQuery.ValHook<HTMLElement>>;
+    // HACK: This is the factory function returned when importing jQuery without a DOM. Declaring it separately breaks using the type parameter on JQueryStatic.
+    // HACK: The discriminator parameter handles the edge case of passing a Window object to JQueryStatic. It doesn't actually exist on the factory function.
+    (window: Window, discriminator: boolean): JQueryStatic;
     /**
      * Creates DOM elements on the fly from the provided string of raw HTML.
      *
@@ -119,48 +126,86 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *             A string defining a single, standalone, HTML element (e.g. <div/> or <div></div>).
      * @param ownerDocument_attributes A document in which the new elements will be created.
      *                                 An object of attributes, events, and methods to call on the newly-created element.
-     * @see {@link https://api.jquery.com/jQuery/}
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
      * @since 1.0
      * @since 1.4
      */
-    (html: JQuery.htmlString, ownerDocument_attributes: Document | JQuery.PlainObject): JQuery<TElement>;
+    // tslint:disable-next-line:no-unnecessary-generics
+    <TElement extends HTMLElement = HTMLElement>(html: JQuery.htmlString, ownerDocument_attributes?: Document | JQuery.PlainObject): JQuery<TElement>;
     /**
      * Accepts a string containing a CSS selector which is then used to match a set of elements.
      *
      * @param selector A string containing a selector expression
      * @param context A DOM Element, Document, or jQuery to use as context
-     * @see {@link https://api.jquery.com/jQuery/}
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
      * @since 1.0
      */
-    (selector: JQuery.Selector, context: Element | Document | JQuery | undefined): JQuery<TElement>;
-    // HACK: This is the factory function returned when importing jQuery without a DOM. Declaring it separately breaks using the type parameter on JQueryStatic.
-    // HACK: The discriminator parameter handles the edge case of passing a Window object to JQueryStatic. It doesn't actually exist on the factory function.
-    <FElement extends Node = HTMLElement>(window: Window, discriminator: boolean): JQueryStatic<FElement>;
+    // tslint:disable-next-line:no-unnecessary-generics
+    <TElement extends Element = HTMLElement>(selector: JQuery.Selector, context?: Element | Document | JQuery): JQuery<TElement>;
     /**
-     * Creates DOM elements on the fly from the provided string of raw HTML.
+     * Return a collection of matched elements either found in the DOM based on passed argument(s) or created
+     * by passing an HTML string.
      *
+     * @param element A DOM element to wrap in a jQuery object.
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
+     * @since 1.0
+     */
+    // Using a unified signature is not possible due to a TypeScript 2.4 bug (DefinitelyTyped#27810)
+    // tslint:disable-next-line:unified-signatures
+    <T extends Element>(element: T): JQuery<T>;
+    /**
+     * Return a collection of matched elements either found in the DOM based on passed argument(s) or created
+     * by passing an HTML string.
+     *
+     * @param elementArray An array containing a set of DOM elements to wrap in a jQuery object.
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
+     * @since 1.0
+     */
+    // Using a unified signature is not possible due to a TypeScript 2.4 bug (DefinitelyTyped#27810)
+    // tslint:disable-next-line:unified-signatures
+    <T extends Element>(elementArray: T[]): JQuery<T>;
+    /**
+     * Return a collection of matched elements either found in the DOM based on passed argument(s) or created
+     * by passing an HTML string.
+     *
+     * @param selection An existing jQuery object to clone.
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
+     * @since 1.0
+     */
+    <T>(selection: JQuery<T>): JQuery<T>;
+    /**
      * Binds a function to be executed when the DOM has finished loading.
      *
-     * @param selector_object_callback A string containing a selector expression
-     *                                 A DOM element to wrap in a jQuery object.
-     *                                 An array containing a set of DOM elements to wrap in a jQuery object.
-     *                                 A plain object to wrap in a jQuery object.
-     *                                 An existing jQuery object to clone.
-     *                                 The function to execute when the DOM is ready.
-     * @see {@link https://api.jquery.com/jQuery/}
+     * @param callback The function to execute when the DOM is ready.
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
      * @since 1.0
+     */
+    // tslint:disable-next-line:no-unnecessary-generics unified-signatures
+    <TElement = HTMLElement>(callback: ((this: Document, $: JQueryStatic) => void)): JQuery<TElement>;
+    /**
+     * Return a collection of matched elements either found in the DOM based on passed argument(s) or created by passing an HTML string.
+     *
+     * @param object A plain object to wrap in a jQuery object.
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
+     * @since 1.0
+     */
+    <T extends JQuery.PlainObject>(object: T): JQuery<T>;
+    /**
+     * Returns an empty jQuery set.
+     *
+     * @see \`{@link https://api.jquery.com/jQuery/ }\`
      * @since 1.4
      */
-    (selector_object_callback?: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery |
-        JQuery.PlainObject | Window |
-        ((this: Document, $: JQueryStatic<TElement>) => void)): JQuery<TElement>;
+    // tslint:disable-next-line:no-unnecessary-generics
+    <TElement = HTMLElement>(): JQuery<TElement>;
     /**
      * A multi-purpose callbacks list object that provides a powerful way to manage callback lists.
      *
      * @param flags An optional list of space-separated flags that change how the callback list behaves.
-     * @see {@link https://api.jquery.com/jQuery.Callbacks/}
+     * @see \`{@link https://api.jquery.com/jQuery.Callbacks/ }\`
      * @since 1.7
      */
+    // tslint:disable-next-line:ban-types no-unnecessary-generics
     Callbacks<T extends Function>(flags?: string): JQuery.Callbacks<T>;
     /**
      * Perform an asynchronous HTTP (Ajax) request.
@@ -168,7 +213,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param url A string containing the URL to which the request is sent.
      * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can
      *                 be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) below for a complete list of all settings.
-     * @see {@link https://api.jquery.com/jQuery.ajax/}
+     * @see \`{@link https://api.jquery.com/jQuery.ajax/ }\`
      * @since 1.5
      */
     ajax(url: string, settings?: JQuery.AjaxSettings): JQuery.jqXHR;
@@ -177,7 +222,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param settings A set of key/value pairs that configure the Ajax request. All settings are optional. A default can
      *                 be set for any option with $.ajaxSetup().
-     * @see {@link https://api.jquery.com/jQuery.ajax/}
+     * @see \`{@link https://api.jquery.com/jQuery.ajax/ }\`
      * @since 1.0
      */
     ajax(settings?: JQuery.AjaxSettings): JQuery.jqXHR;
@@ -187,7 +232,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param dataTypes An optional string containing one or more space-separated dataTypes
      * @param handler A handler to set default values for future Ajax requests.
-     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     * @see \`{@link https://api.jquery.com/jQuery.ajaxPrefilter/ }\`
      * @since 1.5
      */
     ajaxPrefilter(dataTypes: string,
@@ -197,7 +242,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * are processed by $.ajax().
      *
      * @param handler A handler to set default values for future Ajax requests.
-     * @see {@link https://api.jquery.com/jQuery.ajaxPrefilter/}
+     * @see \`{@link https://api.jquery.com/jQuery.ajaxPrefilter/ }\`
      * @since 1.5
      */
     ajaxPrefilter(handler: (options: JQuery.AjaxSettings, originalOptions: JQuery.AjaxSettings, jqXHR: JQuery.jqXHR) => string | void): void;
@@ -205,7 +250,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Set default values for future Ajax requests. Its use is not recommended.
      *
      * @param options A set of key/value pairs that configure the default Ajax request. All options are optional.
-     * @see {@link https://api.jquery.com/jQuery.ajaxSetup/}
+     * @see \`{@link https://api.jquery.com/jQuery.ajaxSetup/ }\`
      * @since 1.1
      */
     ajaxSetup(options: JQuery.AjaxSettings): JQuery.AjaxSettings;
@@ -214,13 +259,13 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param dataType A string identifying the data type to use
      * @param handler A handler to return the new transport object to use with the data type provided in the first argument.
-     * @see {@link https://api.jquery.com/jQuery.ajaxTransport/}
+     * @see \`{@link https://api.jquery.com/jQuery.ajaxTransport/ }\`
      * @since 1.5
      */
     ajaxTransport(dataType: string,
                   handler: (options: JQuery.AjaxSettings, originalOptions: JQuery.AjaxSettings, jqXHR: JQuery.jqXHR) => JQuery.Transport | void): void;
     /**
-     * @deprecated 3.3
+     * @deprecated Deprecated since 3.3. Internal. See \`{@link https://github.com/jquery/jquery/issues/3384 }\`.
      */
     camelCase(value: string): string;
     /**
@@ -228,7 +273,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param container The DOM element that may contain the other element.
      * @param contained The DOM element that may be contained by (a descendant of) the other element.
-     * @see {@link https://api.jquery.com/jQuery.contains/}
+     * @see \`{@link https://api.jquery.com/jQuery.contains/ }\`
      * @since 1.4
      */
     contains(container: Element, contained: Element): boolean;
@@ -239,7 +284,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param element The DOM element to query for the data.
      * @param key Name of the data stored.
-     * @see {@link https://api.jquery.com/jQuery.data/}
+     * @see \`{@link https://api.jquery.com/jQuery.data/ }\`
      * @since 1.2.3
      */
     data(element: Element, key: string, undefined: undefined): any; // tslint:disable-line:unified-signatures
@@ -249,7 +294,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param element The DOM element to associate with the data.
      * @param key A string naming the piece of data to set.
      * @param value The new data value; this can be any Javascript type except undefined.
-     * @see {@link https://api.jquery.com/jQuery.data/}
+     * @see \`{@link https://api.jquery.com/jQuery.data/ }\`
      * @since 1.2.3
      */
     data<T>(element: Element, key: string, value: T): T;
@@ -259,7 +304,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param element The DOM element to query for the data.
      * @param key Name of the data stored.
-     * @see {@link https://api.jquery.com/jQuery.data/}
+     * @see \`{@link https://api.jquery.com/jQuery.data/ }\`
      * @since 1.2.3
      * @since 1.4
      */
@@ -269,7 +314,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param element A DOM element from which to remove and execute a queued function.
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/jQuery.dequeue/}
+     * @see \`{@link https://api.jquery.com/jQuery.dequeue/ }\`
      * @since 1.3
      */
     dequeue(element: Element, queueName?: string): void;
@@ -280,7 +325,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param array The array to iterate over.
      * @param callback The function that will be executed on every object.
-     * @see {@link https://api.jquery.com/jQuery.each/}
+     * @see \`{@link https://api.jquery.com/jQuery.each/ }\`
      * @since 1.0
      */
     each<T>(array: ArrayLike<T>, callback: (this: T, indexInArray: number, value: T) => false | any): ArrayLike<T>;
@@ -291,7 +336,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param obj The object to iterate over.
      * @param callback The function that will be executed on every object.
-     * @see {@link https://api.jquery.com/jQuery.each/}
+     * @see \`{@link https://api.jquery.com/jQuery.each/ }\`
      * @since 1.0
      */
     each<T, K extends keyof T>(obj: T, callback: (this: T[K], propertyName: K, valueOfProperty: T[K]) => false | any): T;
@@ -299,7 +344,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Takes a string and throws an exception containing it.
      *
      * @param message The message to send out.
-     * @see {@link https://api.jquery.com/jQuery.error/}
+     * @see \`{@link https://api.jquery.com/jQuery.error/ }\`
      * @since 1.4.1
      */
     error(message: string): any;
@@ -307,7 +352,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Escapes any character that has a special meaning in a CSS selector.
      *
      * @param selector A string containing a selector expression to escape.
-     * @see {@link https://api.jquery.com/jQuery.escapeSelector/}
+     * @see \`{@link https://api.jquery.com/jQuery.escapeSelector/ }\`
      * @since 3.0
      */
     escapeSelector(selector: JQuery.Selector): JQuery.Selector;
@@ -316,7 +361,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend<T, U, V, W, X, Y, Z>(deep: true, target: T, object1: U, object2: V, object3: W, object4: X, object5: Y, object6: Z): T & U & V & W & X & Y & Z;
@@ -325,7 +370,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend<T, U, V, W, X, Y>(deep: true, target: T, object1: U, object2: V, object3: W, object4: X, object5: Y): T & U & V & W & X & Y;
@@ -334,7 +379,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend<T, U, V, W, X>(deep: true, target: T, object1: U, object2: V, object3: W, object4: X): T & U & V & W & X;
@@ -343,7 +388,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend<T, U, V, W>(deep: true, target: T, object1: U, object2: V, object3: W): T & U & V & W;
@@ -352,7 +397,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend<T, U, V>(deep: true, target: T, object1: U, object2: V): T & U & V;
@@ -361,7 +406,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend<T, U>(deep: true, target: T, object1: U): T & U;
@@ -370,7 +415,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param deep If true, the merge becomes recursive (aka. deep copy). Passing false for this argument is not supported.
      * @param target The object to extend. It will receive the new properties.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.1.4
      */
     extend(deep: true, target: any, object1: any, ...objects: any[]): any;
@@ -379,7 +424,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend<T, U, V, W, X, Y, Z>(target: T, object1: U, object2: V, object3: W, object4: X, object5: Y, object6: Z): T & U & V & W & X & Y & Z;
@@ -388,7 +433,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend<T, U, V, W, X, Y>(target: T, object1: U, object2: V, object3: W, object4: X, object5: Y): T & U & V & W & X & Y;
@@ -397,7 +442,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend<T, U, V, W, X>(target: T, object1: U, object2: V, object3: W, object4: X): T & U & V & W & X;
@@ -406,7 +451,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend<T, U, V, W>(target: T, object1: U, object2: V, object3: W): T & U & V & W;
@@ -415,7 +460,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend<T, U, V>(target: T, object1: U, object2: V): T & U & V;
@@ -424,7 +469,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend<T, U>(target: T, object1: U): T & U;
@@ -433,7 +478,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param target An object that will receive the new properties if additional objects are passed in or that will
      *               extend the jQuery namespace if it is the sole argument.
-     * @see {@link https://api.jquery.com/jQuery.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.extend/ }\`
      * @since 1.0
      */
     extend(target: any, object1: any, ...objects: any[]): any;
@@ -445,7 +490,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
      *                you can use null or jQuery.noop as a placeholder.
      * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @see \`{@link https://api.jquery.com/jQuery.get/ }\`
      * @since 1.0
      */
     get(url: string,
@@ -459,7 +504,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
      *                you can use null or jQuery.noop as a placeholder.
      * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @see \`{@link https://api.jquery.com/jQuery.get/ }\`
      * @since 1.0
      */
     get(url: string,
@@ -472,7 +517,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param success_data A callback function that is executed if the request succeeds. Required if dataType is provided, but
      *                     you can use null or jQuery.noop as a placeholder.
      *                     A plain object or string that is sent to the server with the request.
-     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @see \`{@link https://api.jquery.com/jQuery.get/ }\`
      * @since 1.0
      */
     get(url: string,
@@ -484,7 +529,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *                     A set of key/value pairs that configure the Ajax request. All properties except for url are
      *                     optional. A default can be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) for a
      *                     complete list of all settings. The type option will automatically be set to GET.
-     * @see {@link https://api.jquery.com/jQuery.get/}
+     * @see \`{@link https://api.jquery.com/jQuery.get/ }\`
      * @since 1.0
      * @since 1.12
      * @since 2.2
@@ -496,7 +541,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param url A string containing the URL to which the request is sent.
      * @param data A plain object or string that is sent to the server with the request.
      * @param success A callback function that is executed if the request succeeds.
-     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     * @see \`{@link https://api.jquery.com/jQuery.getJSON/ }\`
      * @since 1.0
      */
     getJSON(url: string,
@@ -508,7 +553,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param url A string containing the URL to which the request is sent.
      * @param success_data A callback function that is executed if the request succeeds.
      *                     A plain object or string that is sent to the server with the request.
-     * @see {@link https://api.jquery.com/jQuery.getJSON/}
+     * @see \`{@link https://api.jquery.com/jQuery.getJSON/ }\`
      * @since 1.0
      */
     getJSON(url: string,
@@ -518,7 +563,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param url A string containing the URL to which the request is sent.
      * @param success A callback function that is executed if the request succeeds.
-     * @see {@link https://api.jquery.com/jQuery.getScript/}
+     * @see \`{@link https://api.jquery.com/jQuery.getScript/ }\`
      * @since 1.0
      */
     getScript(url: string,
@@ -527,7 +572,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Execute some JavaScript code globally.
      *
      * @param code The JavaScript code to execute.
-     * @see {@link https://api.jquery.com/jQuery.globalEval/}
+     * @see \`{@link https://api.jquery.com/jQuery.globalEval/ }\`
      * @since 1.0.4
      */
     globalEval(code: string): void;
@@ -540,7 +585,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param invert If "invert" is false, or not provided, then the function returns an array consisting of all elements
      *               for which "callback" returns true. If "invert" is true, then the function returns an array
      *               consisting of all elements for which "callback" returns false.
-     * @see {@link https://api.jquery.com/jQuery.grep/}
+     * @see \`{@link https://api.jquery.com/jQuery.grep/ }\`
      * @since 1.0
      */
     grep<T>(array: ArrayLike<T>,
@@ -550,7 +595,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Determine whether an element has any jQuery data associated with it.
      *
      * @param element A DOM element to be checked for data.
-     * @see {@link https://api.jquery.com/jQuery.hasData/}
+     * @see \`{@link https://api.jquery.com/jQuery.hasData/ }\`
      * @since 1.5
      */
     hasData(element: Element): boolean;
@@ -558,16 +603,17 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Holds or releases the execution of jQuery's ready event.
      *
      * @param hold Indicates whether the ready hold is being requested or released
-     * @see {@link https://api.jquery.com/jQuery.holdReady/}
+     * @see \`{@link https://api.jquery.com/jQuery.holdReady/ }\`
      * @since 1.6
-     * @deprecated 3.2
+     *
+     * @deprecated Deprecated since 3.2. See \`{@link https://github.com/jquery/jquery/issues/3288 }\`.
      */
     holdReady(hold: boolean): void;
     /**
      * Modify and filter HTML strings passed through jQuery manipulation methods.
      *
      * @param html The HTML string on which to operate.
-     * @see {@link https://api.jquery.com/jQuery.htmlPrefilter/}
+     * @see \`{@link https://api.jquery.com/jQuery.htmlPrefilter/ }\`
      * @since 1.12/2.2
      */
     htmlPrefilter(html: JQuery.htmlString): JQuery.htmlString;
@@ -577,7 +623,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param value The value to search for.
      * @param array An array through which to search.
      * @param fromIndex The index of the array at which to begin the search. The default is 0, which will search the whole array.
-     * @see {@link https://api.jquery.com/jQuery.inArray/}
+     * @see \`{@link https://api.jquery.com/jQuery.inArray/ }\`
      * @since 1.2
      */
     inArray<T>(value: T, array: T[], fromIndex?: number): number;
@@ -585,16 +631,17 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Determine whether the argument is an array.
      *
      * @param obj Object to test whether or not it is an array.
-     * @see {@link https://api.jquery.com/jQuery.isArray/}
+     * @see \`{@link https://api.jquery.com/jQuery.isArray/ }\`
      * @since 1.3
-     * @deprecated 3.2
+     *
+     * @deprecated Deprecated since 3.2. Use \`{@link Array.isArray }\`.
      */
     isArray(obj: any): obj is any[];
     /**
      * Check to see if an object is empty (contains no enumerable properties).
      *
      * @param obj The object that will be checked to see if it's empty.
-     * @see {@link https://api.jquery.com/jQuery.isEmptyObject/}
+     * @see \`{@link https://api.jquery.com/jQuery.isEmptyObject/ }\`
      * @since 1.4
      */
     isEmptyObject(obj: any): boolean;
@@ -602,25 +649,28 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Determine if the argument passed is a JavaScript function object.
      *
      * @param obj Object to test whether or not it is a function.
-     * @see {@link https://api.jquery.com/jQuery.isFunction/}
+     * @see \`{@link https://api.jquery.com/jQuery.isFunction/ }\`
      * @since 1.2
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use `typeof x === "function"`.
      */
+    // tslint:disable-next-line:ban-types
     isFunction(obj: any): obj is Function;
     /**
      * Determines whether its argument represents a JavaScript number.
      *
      * @param value The value to be tested.
-     * @see {@link https://api.jquery.com/jQuery.isNumeric/}
+     * @see \`{@link https://api.jquery.com/jQuery.isNumeric/ }\`
      * @since 1.7
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Internal. See \`{@link https://github.com/jquery/jquery/issues/2960 }\`.
      */
     isNumeric(value: any): value is number;
     /**
      * Check to see if an object is a plain object (created using "{}" or "new Object").
      *
      * @param obj The object that will be checked to see if it's a plain object.
-     * @see {@link https://api.jquery.com/jQuery.isPlainObject/}
+     * @see \`{@link https://api.jquery.com/jQuery.isPlainObject/ }\`
      * @since 1.4
      */
     isPlainObject(obj: any): obj is JQuery.PlainObject;
@@ -628,16 +678,17 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Determine whether the argument is a window.
      *
      * @param obj Object to test whether or not it is a window.
-     * @see {@link https://api.jquery.com/jQuery.isWindow/}
+     * @see \`{@link https://api.jquery.com/jQuery.isWindow/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Internal. See \`{@link https://github.com/jquery/jquery/issues/3629 }\`.
      */
     isWindow(obj: any): obj is Window;
     /**
      * Check to see if a DOM node is within an XML document (or is an XML document).
      *
      * @param node The DOM node that will be checked to see if it's in an XML document.
-     * @see {@link https://api.jquery.com/jQuery.isXMLDoc/}
+     * @see \`{@link https://api.jquery.com/jQuery.isXMLDoc/ }\`
      * @since 1.1.4
      */
     isXMLDoc(node: Node): boolean;
@@ -645,7 +696,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Convert an array-like object into a true JavaScript array.
      *
      * @param obj Any object to turn into a native Array.
-     * @see {@link https://api.jquery.com/jQuery.makeArray/}
+     * @see \`{@link https://api.jquery.com/jQuery.makeArray/ }\`
      * @since 1.2
      */
     makeArray<T>(obj: ArrayLike<T>): T[];
@@ -656,10 +707,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param callback The function to process each item against. The first argument to the function is the array item, the
      *                 second argument is the index in array The function can return any value. A returned array will be
      *                 flattened into the resulting array. Within the function, this refers to the global (window) object.
-     * @see {@link https://api.jquery.com/jQuery.map/}
+     * @see \`{@link https://api.jquery.com/jQuery.map/ }\`
      * @since 1.0
      */
-    map<T, R>(array: T[], callback: (elementOfArray: T, indexInArray: number) => R): R[];
+    map<T, TReturn>(array: T[], callback: (this: Window, elementOfArray: T, indexInArray: number) => JQuery.TypeOrArray<TReturn> | null | undefined): TReturn[];
     /**
      * Translate all items in an array or object to new array of items.
      *
@@ -668,16 +719,16 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *                 second argument is the key of the object property. The function can return any value to add to the
      *                 array. A returned array will be flattened into the resulting array. Within the function, this refers
      *                 to the global (window) object.
-     * @see {@link https://api.jquery.com/jQuery.map/}
+     * @see \`{@link https://api.jquery.com/jQuery.map/ }\`
      * @since 1.6
      */
-    map<T, K extends keyof T, R>(obj: T, callback: (propertyOfObject: T[K], key: K) => R): R[];
+    map<T, K extends keyof T, TReturn>(obj: T, callback: (this: Window, propertyOfObject: T[K], key: K) => JQuery.TypeOrArray<TReturn> | null | undefined): TReturn[];
     /**
      * Merge the contents of two arrays together into the first array.
      *
      * @param first The first array-like object to merge, the elements of second added.
      * @param second The second array-like object to merge into the first, unaltered.
-     * @see {@link https://api.jquery.com/jQuery.merge/}
+     * @see \`{@link https://api.jquery.com/jQuery.merge/ }\`
      * @since 1.0
      */
     merge<T, U>(first: ArrayLike<T>, second: ArrayLike<U>): Array<T | U>;
@@ -685,23 +736,24 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Relinquish jQuery's control of the $ variable.
      *
      * @param removeAll A Boolean indicating whether to remove all jQuery variables from the global scope (including jQuery itself).
-     * @see {@link https://api.jquery.com/jQuery.noConflict/}
+     * @see \`{@link https://api.jquery.com/jQuery.noConflict/ }\`
      * @since 1.0
      */
     noConflict(removeAll?: boolean): this;
     /**
      * An empty function.
      *
-     * @see {@link https://api.jquery.com/jQuery.noop/}
+     * @see \`{@link https://api.jquery.com/jQuery.noop/ }\`
      * @since 1.4
      */
     noop(): undefined;
     /**
      * Return a number representing the current time.
      *
-     * @see {@link https://api.jquery.com/jQuery.now/}
+     * @see \`{@link https://api.jquery.com/jQuery.now/ }\`
      * @since 1.4.3
-     * @deprecated 3.3 Use Date.now().
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Date.now }\`.
      */
     now(): number;
     /**
@@ -711,7 +763,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param obj An array, a plain object, or a jQuery object to serialize.
      * @param traditional A Boolean indicating whether to perform a traditional "shallow" serialization.
-     * @see {@link https://api.jquery.com/jQuery.param/}
+     * @see \`{@link https://api.jquery.com/jQuery.param/ }\`
      * @since 1.2
      * @since 1.4
      */
@@ -722,7 +774,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param data HTML string to be parsed
      * @param context Document element to serve as the context in which the HTML fragment will be created
      * @param keepScripts A Boolean indicating whether to include scripts passed in the HTML string
-     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     * @see \`{@link https://api.jquery.com/jQuery.parseHTML/ }\`
      * @since 1.8
      */
     parseHTML(data: string, context: Document | null | undefined, keepScripts: boolean): JQuery.Node[];
@@ -732,7 +784,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param data HTML string to be parsed
      * @param context_keepScripts Document element to serve as the context in which the HTML fragment will be created
      *                            A Boolean indicating whether to include scripts passed in the HTML string
-     * @see {@link https://api.jquery.com/jQuery.parseHTML/}
+     * @see \`{@link https://api.jquery.com/jQuery.parseHTML/ }\`
      * @since 1.8
      */
     parseHTML(data: string, context_keepScripts?: Document | null | boolean): JQuery.Node[];
@@ -740,16 +792,17 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Takes a well-formed JSON string and returns the resulting JavaScript value.
      *
      * @param json The JSON string to parse.
-     * @see {@link https://api.jquery.com/jQuery.parseJSON/}
+     * @see \`{@link https://api.jquery.com/jQuery.parseJSON/ }\`
      * @since 1.4.1
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JSON.parse }\`.
      */
     parseJSON(json: string): any;
     /**
      * Parses a string into an XML document.
      *
      * @param data a well-formed XML string to be parsed
-     * @see {@link https://api.jquery.com/jQuery.parseXML/}
+     * @see \`{@link https://api.jquery.com/jQuery.parseXML/ }\`
      * @since 1.5
      */
     parseXML(data: string): XMLDocument;
@@ -761,7 +814,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
      *                can be null in that case.
      * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @see \`{@link https://api.jquery.com/jQuery.post/ }\`
      * @since 1.0
      */
     post(url: string,
@@ -775,7 +828,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param success A callback function that is executed if the request succeeds. Required if dataType is provided, but
      *                can be null in that case.
      * @param dataType The type of data expected from the server. Default: Intelligent Guess (xml, json, script, text, html).
-     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @see \`{@link https://api.jquery.com/jQuery.post/ }\`
      * @since 1.0
      */
     post(url: string,
@@ -788,7 +841,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param success_data A callback function that is executed if the request succeeds. Required if dataType is provided, but
      *                     can be null in that case.
      *                     A plain object or string that is sent to the server with the request.
-     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @see \`{@link https://api.jquery.com/jQuery.post/ }\`
      * @since 1.0
      */
     post(url: string,
@@ -800,7 +853,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *                     A set of key/value pairs that configure the Ajax request. All properties except for url are
      *                     optional. A default can be set for any option with $.ajaxSetup(). See jQuery.ajax( settings ) for a
      *                     complete list of all settings. Type will automatically be set to POST.
-     * @see {@link https://api.jquery.com/jQuery.post/}
+     * @see \`{@link https://api.jquery.com/jQuery.post/ }\`
      * @since 1.0
      * @since 1.12
      * @since 2.2
@@ -820,9 +873,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G>(fn: (a: A, b: B, c: C, d: D, e: E, f: F, g: G) => TReturn,
@@ -833,9 +887,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F>(fn: (a: A, b: B, c: C, d: D, e: E, f: F) => TReturn,
@@ -846,9 +901,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E>(fn: (a: A, b: B, c: C, d: D, e: E) => TReturn,
@@ -859,9 +915,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D>(fn: (a: A, b: B, c: C, d: D) => TReturn,
@@ -872,9 +929,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C>(fn: (a: A, b: B, c: C) => TReturn,
@@ -885,9 +943,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B>(fn: (a: A, b: B) => TReturn,
@@ -898,10 +957,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4`
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A>(fn: (a: A) => TReturn,
@@ -912,9 +972,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn>(fn: () => TReturn,
                    context: null | undefined): () => TReturn;
@@ -928,9 +989,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -943,9 +1005,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -958,9 +1021,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -973,9 +1037,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -988,9 +1053,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1003,9 +1069,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1018,9 +1085,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1033,9 +1101,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T>(fn: (t: T) => TReturn,
@@ -1050,9 +1119,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -1065,9 +1135,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -1080,9 +1151,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -1095,9 +1167,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -1110,9 +1183,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1125,9 +1199,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1140,9 +1215,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1155,9 +1231,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T, U>(fn: (t: T, u: U) => TReturn,
@@ -1172,9 +1249,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -1187,9 +1265,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -1202,9 +1281,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -1217,9 +1297,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -1232,9 +1313,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1247,9 +1329,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1262,9 +1345,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1277,9 +1361,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T, U, V>(fn: (t: T, u: U, v: V) => TReturn,
@@ -1294,9 +1379,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -1309,9 +1395,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -1324,9 +1411,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -1339,9 +1427,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -1354,9 +1443,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1369,9 +1459,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1384,9 +1475,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1399,9 +1491,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T, U, V, W>(fn: (t: T, u: U, v: V, w: W) => TReturn,
@@ -1416,9 +1509,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -1431,9 +1525,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -1446,9 +1541,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -1461,9 +1557,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -1476,9 +1573,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1491,9 +1589,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1506,9 +1605,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1521,9 +1621,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T, U, V, W, X>(fn: (t: T, u: U, v: V, w: W, x: X) => TReturn,
@@ -1538,9 +1639,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -1553,9 +1655,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -1568,9 +1671,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -1583,9 +1687,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -1598,9 +1703,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1613,9 +1719,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1628,9 +1735,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1643,9 +1751,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T, U, V, W, X, Y>(fn: (t: T, u: U, v: V, w: W, x: X, y: Y) => TReturn,
@@ -1660,9 +1769,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F, G,
@@ -1675,9 +1785,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E, F,
@@ -1690,9 +1801,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D, E,
@@ -1705,9 +1817,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C, D,
@@ -1720,9 +1833,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B, C,
@@ -1735,9 +1849,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A, B,
@@ -1750,9 +1865,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         A,
@@ -1765,9 +1881,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn,
         T, U, V, W, X, Y, Z>(fn: (t: T, u: U, v: V, w: W, x: X, y: Y, z: Z, ...args: any[]) => TReturn,
@@ -1785,9 +1902,10 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
      * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.9
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TReturn>(fn: (...args: any[]) => TReturn,
                    context: null | undefined,
@@ -1808,10 +1926,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1823,10 +1942,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1838,10 +1958,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1853,10 +1974,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1868,10 +1990,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1883,10 +2006,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1898,10 +2022,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4`
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1913,10 +2038,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn>(fn: () => TReturn,
@@ -1931,10 +2057,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1948,10 +2075,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1965,10 +2093,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1982,10 +2111,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -1999,10 +2129,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2016,10 +2147,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2033,10 +2165,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2050,10 +2183,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2069,10 +2203,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2086,10 +2221,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2103,10 +2239,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2120,10 +2257,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2137,10 +2275,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2154,10 +2293,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2171,10 +2311,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2188,10 +2329,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2207,10 +2349,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2224,10 +2367,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2241,10 +2385,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2258,10 +2403,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2275,10 +2421,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2292,10 +2439,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2309,10 +2457,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2326,10 +2475,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2345,10 +2495,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2362,10 +2513,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2379,10 +2531,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2396,10 +2549,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2413,10 +2567,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2430,10 +2585,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2447,10 +2603,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2464,10 +2621,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2483,10 +2641,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2500,10 +2659,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2517,10 +2677,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2534,10 +2695,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2551,10 +2713,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2568,10 +2731,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2585,10 +2749,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2602,10 +2767,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2621,10 +2787,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2638,10 +2805,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2655,10 +2823,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2672,10 +2841,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2689,10 +2859,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2706,10 +2877,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2723,10 +2895,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2740,10 +2913,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2759,10 +2933,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2776,10 +2951,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2793,10 +2969,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2810,10 +2987,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2827,10 +3005,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2844,10 +3023,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2861,10 +3041,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2878,10 +3059,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn,
@@ -2900,10 +3082,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param fn The function whose context will be changed.
      * @param context The object to which the context (this) of the function should be set.
      * @param additionalArguments Any number of arguments to be passed to the function referenced in the function argument.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object,
         TReturn>(fn: (...args: any[]) => TReturn,
@@ -2922,10 +3105,11 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param context The object to which the context of the function should be set.
      * @param name The name of the function whose context will be changed (should be a property of the context object).
      * @param additionalArguments Any number of arguments to be passed to the function named in the name argument.
-     * @see {@link https://api.jquery.com/jQuery.proxy/}
+     * @see \`{@link https://api.jquery.com/jQuery.proxy/ }\`
      * @since 1.4
      * @since 1.6
-     * @deprecated 3.3 Use Function#bind.
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link Function.bind }\`.
      */
     proxy<TContext extends object>(context: TContext,
                                    name: keyof TContext,
@@ -2942,7 +3126,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
      * @param newQueue The new function to add to the queue.
      *                 An array of functions to replace the current queue contents.
-     * @see {@link https://api.jquery.com/jQuery.queue/}
+     * @see \`{@link https://api.jquery.com/jQuery.queue/ }\`
      * @since 1.3
      */
     queue<T extends Element>(element: T, queueName?: string, newQueue?: JQuery.TypeOrArray<JQuery.QueueFunction<T>>): JQuery.Queue<T>;
@@ -2950,7 +3134,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Handles errors thrown synchronously in functions wrapped in jQuery().
      *
      * @param error An error thrown in the function wrapped in jQuery().
-     * @see {@link https://api.jquery.com/jQuery.readyException/}
+     * @see \`{@link https://api.jquery.com/jQuery.readyException/ }\`
      * @since 3.1
      */
     readyException(error: Error): any;
@@ -2959,7 +3143,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      *
      * @param element A DOM element from which to remove data.
      * @param name A string naming the piece of data to remove.
-     * @see {@link https://api.jquery.com/jQuery.removeData/}
+     * @see \`{@link https://api.jquery.com/jQuery.removeData/ }\`
      * @since 1.2.3
      */
     removeData(element: Element, name?: string): void;
@@ -2969,37 +3153,37 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @see \`{@link https://api.jquery.com/jQuery.speed/ }\`
      * @since 1.1
      */
-    speed(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): JQuery.EffectsOptions<TElement>;
+    speed<TElement extends Element = HTMLElement>(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): JQuery.EffectsOptions<TElement>;
     /**
      * Creates an object containing a set of properties ready to be used in the definition of custom animations.
      *
      * @param duration A string or number determining how long the animation will run.
      * @param easing_complete A string indicating which easing function to use for the transition.
      *                        A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @see \`{@link https://api.jquery.com/jQuery.speed/ }\`
      * @since 1.0
      * @since 1.1
      */
-    speed(duration: JQuery.Duration,
-          easing_complete: string | ((this: TElement) => void)): JQuery.EffectsOptions<TElement>;
+    speed<TElement extends Element = HTMLElement>(duration: JQuery.Duration,
+                                                  easing_complete: string | ((this: TElement) => void)): JQuery.EffectsOptions<TElement>;
     /**
      * Creates an object containing a set of properties ready to be used in the definition of custom animations.
      *
      * @param duration_complete_settings A string or number determining how long the animation will run.
      *                                   A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/jQuery.speed/}
+     * @see \`{@link https://api.jquery.com/jQuery.speed/ }\`
      * @since 1.0
      * @since 1.1
      */
-    speed(duration_complete_settings?: JQuery.Duration | ((this: TElement) => void) | JQuery.SpeedSettings<TElement>): JQuery.EffectsOptions<TElement>;
+    speed<TElement extends Element = HTMLElement>(duration_complete_settings?: JQuery.Duration | ((this: TElement) => void) | JQuery.SpeedSettings<TElement>): JQuery.EffectsOptions<TElement>;
     /**
      * Remove the whitespace from the beginning and end of a string.
      *
      * @param str The string to trim.
-     * @see {@link https://api.jquery.com/jQuery.trim/}
+     * @see \`{@link https://api.jquery.com/jQuery.trim/ }\`
      * @since 1.0
      */
     trim(str: string): string;
@@ -3007,19 +3191,21 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Determine the internal JavaScript [[Class]] of an object.
      *
      * @param obj Object to get the internal JavaScript [[Class]] of.
-     * @see {@link https://api.jquery.com/jQuery.type/}
+     * @see \`{@link https://api.jquery.com/jQuery.type/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. See \`{@link https://github.com/jquery/jquery/issues/3605 }`.
      */
     type(obj: any): 'array' | 'boolean' | 'date' | 'error' | 'function' | 'null' | 'number' | 'object' | 'regexp' | 'string' | 'symbol' | 'undefined';
     /**
-     * Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on
+     * @description Sorts an array of DOM elements, in place, with the duplicates removed. Note that this only works on
      * arrays of DOM elements, not strings or numbers.
      *
      * @param array The Array of DOM elements.
-     * @see {@link https://api.jquery.com/jQuery.unique/}
+     * @see \`{@link https://api.jquery.com/jQuery.unique/ }\`
      * @since 1.1.3
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQueryStatic.uniqueSort }`.
      */
     unique<T extends Element>(array: T[]): T[];
     /**
@@ -3027,7 +3213,7 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * arrays of DOM elements, not strings or numbers.
      *
      * @param array The Array of DOM elements.
-     * @see {@link https://api.jquery.com/jQuery.uniqueSort/}
+     * @see \`{@link https://api.jquery.com/jQuery.uniqueSort/ }\`
      * @since 1.12
      * @since 2.2
      */
@@ -3036,80 +3222,80 @@ interface JQueryStatic<TElement extends Node = HTMLElement> {
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
      *
-     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @see \`{@link https://api.jquery.com/jQuery.when/ }\`
      * @since 1.5
      */
     when<TR1, UR1, VR1,
-        TJ1 = any, UJ1 = any, VJ1 = any>
-        (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
-         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1,
-         deferredV: JQuery.Promise<VR1, VJ1, any> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,
+        TJ1 = any, UJ1 = any, VJ1 = any>(
+            deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1, // tslint:disable-line:use-default-type-parameter
+            deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1, // tslint:disable-line:use-default-type-parameter
+            deferredV: JQuery.Promise<VR1, VJ1, any> | JQuery.Thenable<VR1> | VR1): JQuery.Promise3<TR1, TJ1, never,  // tslint:disable-line:use-default-type-parameter
         UR1, UJ1, never,
         VR1, VJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
      *
-     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @see \`{@link https://api.jquery.com/jQuery.when/ }\`
      * @since 1.5
      */
     when<TR1, UR1,
-        TJ1 = any, UJ1 = any>
-        (deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1,
-         deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never,
+        TJ1 = any, UJ1 = any>(
+            deferredT: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1, // tslint:disable-line:use-default-type-parameter
+            deferredU: JQuery.Promise<UR1, UJ1, any> | JQuery.Thenable<UR1> | UR1): JQuery.Promise2<TR1, TJ1, never, // tslint:disable-line:use-default-type-parameter
         UR1, UJ1, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
      *
-     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @see \`{@link https://api.jquery.com/jQuery.when/ }\`
      * @since 1.5
      */
     when<TR1, TJ1,
         TR2, TJ2,
-        TR3 = never, TJ3 = never>
-        (deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
-            JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>): JQuery.Promise3<TR1, TJ1, never, TR2, TJ2, never, TR3, TJ3, never>;
+        TR3 = never, TJ3 = never>(
+            deferredT: JQuery.Promise3<TR1, TJ1, any, TR2, TJ2, any, TR3, TJ3, any> |
+                       JQuery.Promise2<TR1, TJ1, any, TR2, TJ2, any>): JQuery.Promise3<TR1, TJ1, never, TR2, TJ2, never, TR3, TJ3, never>;
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
      *
-     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @see \`{@link https://api.jquery.com/jQuery.when/ }\`
      * @since 1.5
      */
-    when<TR1, TJ1 = any>(deferred: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>;
+    when<TR1, TJ1 = any>(deferred: JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1): JQuery.Promise<TR1, TJ1, never>; // tslint:disable-line:use-default-type-parameter
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
      *
      * @param deferreds Zero or more Thenable objects.
-     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @see \`{@link https://api.jquery.com/jQuery.when/ }\`
      * @since 1.5
      */
-    when<TR1 = never, TJ1 = never>(...deferreds: Array<JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1>): JQuery.Promise<TR1, TJ1, never>;
+    when<TR1 = never, TJ1 = never>(...deferreds: Array<JQuery.Promise<TR1, TJ1, any> | JQuery.Thenable<TR1> | TR1>): JQuery.Promise<TR1, TJ1, never>; // tslint:disable-line:use-default-type-parameter
     /**
      * Provides a way to execute callback functions based on zero or more Thenable objects, usually
      * Deferred objects that represent asynchronous events.
      *
      * @param deferreds Zero or more Thenable objects.
-     * @see {@link https://api.jquery.com/jQuery.when/}
+     * @see \`{@link https://api.jquery.com/jQuery.when/ }\`
      * @since 1.5
      */
     when(...deferreds: any[]): JQuery.Promise<any, any, never>;
 }
 
-interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement> {
+interface JQuery<TElement = HTMLElement> extends Iterable<TElement> {
     /**
      * A string containing the jQuery version number.
      *
-     * @see {@link https://api.jquery.com/jquery/}
+     * @see \`{@link https://api.jquery.com/jquery/ }\`
      * @since 1.0
      */
     jquery: string;
     /**
      * The number of elements in the jQuery object.
      *
-     * @see {@link https://api.jquery.com/length/}
+     * @see \`{@link https://api.jquery.com/length/ }\`
      * @since 1.0
      */
     length: number;
@@ -3119,7 +3305,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A string representing a selector expression to find additional elements to add to the set of matched elements.
      * @param context The point in the document at which the selector should begin matching; similar to the context
      *                argument of the $(selector, context) method.
-     * @see {@link https://api.jquery.com/add/}
+     * @see \`{@link https://api.jquery.com/add/ }\`
      * @since 1.4
      */
     add(selector: JQuery.Selector, context: Element): this;
@@ -3130,7 +3316,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 One or more elements to add to the set of matched elements.
      *                 An HTML fragment to add to the set of matched elements.
      *                 An existing jQuery object to add to the set of matched elements.
-     * @see {@link https://api.jquery.com/add/}
+     * @see \`{@link https://api.jquery.com/add/ }\`
      * @since 1.0
      * @since 1.3.2
      */
@@ -3139,7 +3325,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Add the previous set of elements on the stack to the current set, optionally filtered by a selector.
      *
      * @param selector A string containing a selector expression to match the current set of elements against.
-     * @see {@link https://api.jquery.com/addBack/}
+     * @see \`{@link https://api.jquery.com/addBack/ }\`
      * @since 1.8
      */
     addBack(selector?: JQuery.Selector): this;
@@ -3151,7 +3337,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                  A function returning one or more space-separated class names to be added to the existing class
      *                  name(s). Receives the index position of the element in the set and the existing class name(s) as
      *                  arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/addClass/}
+     * @see \`{@link https://api.jquery.com/addClass/ }\`
      * @since 1.0
      * @since 1.4
      * @since 3.3
@@ -3162,7 +3348,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
      *                 jQuery objects to insert after each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/after/}
+     * @see \`{@link https://api.jquery.com/after/ }\`
      * @since 1.0
      */
     after(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
@@ -3173,7 +3359,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *           after each element in the set of matched elements. Receives the index position of the element in the
      *           set and the old HTML value of the element as arguments. Within the function, this refers to the
      *           current element in the set.
-     * @see {@link https://api.jquery.com/after/}
+     * @see \`{@link https://api.jquery.com/after/ }\`
      * @since 1.4
      * @since 1.10
      */
@@ -3182,7 +3368,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Register a handler to be called when Ajax requests complete. This is an AjaxEvent.
      *
      * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxComplete/}
+     * @see \`{@link https://api.jquery.com/ajaxComplete/ }\`
      * @since 1.0
      */
     ajaxComplete(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
@@ -3190,7 +3376,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Register a handler to be called when Ajax requests complete with an error. This is an Ajax Event.
      *
      * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxError/}
+     * @see \`{@link https://api.jquery.com/ajaxError/ }\`
      * @since 1.0
      */
     ajaxError(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxSettings: JQuery.AjaxSettings, thrownError: string) => void | false): this;
@@ -3198,7 +3384,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Attach a function to be executed before an Ajax request is sent. This is an Ajax Event.
      *
      * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxSend/}
+     * @see \`{@link https://api.jquery.com/ajaxSend/ }\`
      * @since 1.0
      */
     ajaxSend(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings) => void | false): this;
@@ -3206,7 +3392,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Register a handler to be called when the first Ajax request begins. This is an Ajax Event.
      *
      * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxStart/}
+     * @see \`{@link https://api.jquery.com/ajaxStart/ }\`
      * @since 1.0
      */
     ajaxStart(handler: (this: Document) => void | false): this;
@@ -3214,7 +3400,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Register a handler to be called when all Ajax requests have completed. This is an Ajax Event.
      *
      * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxStop/}
+     * @see \`{@link https://api.jquery.com/ajaxStop/ }\`
      * @since 1.0
      */
     ajaxStop(handler: (this: Document) => void | false): this;
@@ -3222,7 +3408,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Attach a function to be executed whenever an Ajax request completes successfully. This is an Ajax Event.
      *
      * @param handler The function to be invoked.
-     * @see {@link https://api.jquery.com/ajaxSuccess/}
+     * @see \`{@link https://api.jquery.com/ajaxSuccess/ }\`
      * @since 1.0
      */
     ajaxSuccess(handler: (this: Document, event: JQuery.Event<Document>, jqXHR: JQuery.jqXHR, ajaxOptions: JQuery.AjaxSettings, data: JQuery.PlainObject) => void | false): this;
@@ -3233,7 +3419,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/animate/}
+     * @see \`{@link https://api.jquery.com/animate/ }\`
      * @since 1.0
      */
     animate(properties: JQuery.PlainObject,
@@ -3247,7 +3433,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/animate/}
+     * @see \`{@link https://api.jquery.com/animate/ }\`
      * @since 1.0
      */
     animate(properties: JQuery.PlainObject,
@@ -3258,7 +3444,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param properties An object of CSS properties and values that the animation will move toward.
      * @param options A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/animate/}
+     * @see \`{@link https://api.jquery.com/animate/ }\`
      * @since 1.0
      */
     animate(properties: JQuery.PlainObject,
@@ -3268,7 +3454,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param properties An object of CSS properties and values that the animation will move toward.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/animate/}
+     * @see \`{@link https://api.jquery.com/animate/ }\`
      * @since 1.0
      */
     animate(properties: JQuery.PlainObject,
@@ -3278,7 +3464,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
      *                 jQuery objects to insert at the end of each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/append/}
+     * @see \`{@link https://api.jquery.com/append/ }\`
      * @since 1.0
      */
     append(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
@@ -3289,7 +3475,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *           the end of each element in the set of matched elements. Receives the index position of the element
      *           in the set and the old HTML value of the element as arguments. Within the function, this refers to
      *           the current element in the set.
-     * @see {@link https://api.jquery.com/append/}
+     * @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;
@@ -3298,7 +3484,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements
      *               will be inserted at the end of the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/appendTo/}
+     * @see \`{@link https://api.jquery.com/appendTo/ }\`
      * @since 1.0
      */
     appendTo(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
@@ -3309,7 +3495,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param value A value to set for the attribute. If null, the specified attribute will be removed (as in .removeAttr()).
      *              A function returning the value to set. this is the current element. Receives the index position of
      *              the element in the set and the old attribute value as arguments.
-     * @see {@link https://api.jquery.com/attr/}
+     * @see \`{@link https://api.jquery.com/attr/ }\`
      * @since 1.0
      * @since 1.1
      */
@@ -3319,7 +3505,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Set one or more attributes for the set of matched elements.
      *
      * @param attributes An object of attribute-value pairs to set.
-     * @see {@link https://api.jquery.com/attr/}
+     * @see \`{@link https://api.jquery.com/attr/ }\`
      * @since 1.0
      */
     attr(attributes: JQuery.PlainObject): this;
@@ -3327,7 +3513,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the value of an attribute for the first element in the set of matched elements.
      *
      * @param attributeName The name of the attribute to get.
-     * @see {@link https://api.jquery.com/attr/}
+     * @see \`{@link https://api.jquery.com/attr/ }\`
      * @since 1.0
      */
     attr(attributeName: string): string | undefined;
@@ -3336,7 +3522,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
      *                 jQuery objects to insert before each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/before/}
+     * @see \`{@link https://api.jquery.com/before/ }\`
      * @since 1.0
      */
     before(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
@@ -3347,7 +3533,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *           before each element in the set of matched elements. Receives the index position of the element in
      *           the set and the old HTML value of the element as arguments. Within the function, this refers to the
      *           current element in the set.
-     * @see {@link https://api.jquery.com/before/}
+     * @see \`{@link https://api.jquery.com/before/ }\`
      * @since 1.4
      * @since 1.10
      */
@@ -3359,10 +3545,11 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param eventType A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/bind/}
+     * @see \`{@link https://api.jquery.com/bind/ }\`
      * @since 1.0
      * @since 1.4.3
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.on }\`.
      */
     bind<TData>(eventType: string,
                 eventData: TData,
@@ -3374,10 +3561,11 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param handler A function to execute each time the event is triggered.
      *                Setting the second argument to false will attach a function that prevents the default action from
      *                occurring and stops the event from bubbling.
-     * @see {@link https://api.jquery.com/bind/}
+     * @see \`{@link https://api.jquery.com/bind/ }\`
      * @since 1.0
      * @since 1.4.3
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.on }\`.
      */
     bind(eventType: string,
          handler: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false | null | undefined): this;
@@ -3385,9 +3573,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Attach a handler to an event for the elements.
      *
      * @param events An object containing one or more DOM event types and functions to execute for them.
-     * @see {@link https://api.jquery.com/bind/}
+     * @see \`{@link https://api.jquery.com/bind/ }\`
      * @since 1.4
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.on }\`.
      */
     bind(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
     /**
@@ -3395,9 +3584,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/blur/}
+     * @see \`{@link https://api.jquery.com/blur/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     blur<TData>(eventData: TData,
                 handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3405,9 +3595,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "blur" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/blur/}
+     * @see \`{@link https://api.jquery.com/blur/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     blur(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -3415,9 +3606,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/change/}
+     * @see \`{@link https://api.jquery.com/change/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     change<TData>(eventData: TData,
                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3425,16 +3617,17 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "change" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/change/}
+     * @see \`{@link https://api.jquery.com/change/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     change(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
      * 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.
-     * @see {@link https://api.jquery.com/children/}
+     * @see \`{@link https://api.jquery.com/children/ }\`
      * @since 1.0
      */
     children(selector?: JQuery.Selector): this;
@@ -3442,7 +3635,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Remove from the queue all items that have not yet been run.
      *
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/clearQueue/}
+     * @see \`{@link https://api.jquery.com/clearQueue/ }\`
      * @since 1.4
      */
     clearQueue(queueName?: string): this;
@@ -3451,9 +3644,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/click/}
+     * @see \`{@link https://api.jquery.com/click/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     click<TData>(eventData: TData,
                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3461,9 +3655,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "click" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/click/}
+     * @see \`{@link https://api.jquery.com/click/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     click(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -3474,7 +3669,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                          to false in 1.5.1 and up.
      * @param deepWithDataAndEvents A Boolean indicating whether event handlers and data for all children of the cloned element should
      *                              be copied. By default its value matches the first argument's value (which defaults to false).
-     * @see {@link https://api.jquery.com/clone/}
+     * @see \`{@link https://api.jquery.com/clone/ }\`
      * @since 1.0
      * @since 1.5
      */
@@ -3485,7 +3680,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param selector A string containing a selector expression to match elements against.
      * @param context A DOM element within which a matching element may be found.
-     * @see {@link https://api.jquery.com/closest/}
+     * @see \`{@link https://api.jquery.com/closest/ }\`
      * @since 1.4
      */
     closest(selector: JQuery.Selector, context: Element): this;
@@ -3496,7 +3691,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A string containing a selector expression to match elements against.
      *                 A jQuery object to match elements against.
      *                 An element to match elements against.
-     * @see {@link https://api.jquery.com/closest/}
+     * @see \`{@link https://api.jquery.com/closest/ }\`
      * @since 1.3
      * @since 1.6
      */
@@ -3504,7 +3699,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the children of each element in the set of matched elements, including text and comment nodes.
      *
-     * @see {@link https://api.jquery.com/contents/}
+     * @see \`{@link https://api.jquery.com/contents/ }\`
      * @since 1.2
      */
     contents(): JQuery<TElement | Text | Comment>;
@@ -3513,9 +3708,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/contextmenu/}
+     * @see \`{@link https://api.jquery.com/contextmenu/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     contextmenu<TData>(eventData: TData,
                        handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3523,9 +3719,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "contextmenu" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/contextmenu/}
+     * @see \`{@link https://api.jquery.com/contextmenu/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     contextmenu(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -3535,7 +3732,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param value A value to set for the property.
      *              A function returning the value to set. this is the current element. Receives the index position of
      *              the element in the set and the old value as arguments.
-     * @see {@link https://api.jquery.com/css/}
+     * @see \`{@link https://api.jquery.com/css/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -3545,7 +3742,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Set one or more CSS properties for the set of matched elements.
      *
      * @param properties An object of property-value pairs to set.
-     * @see {@link https://api.jquery.com/css/}
+     * @see \`{@link https://api.jquery.com/css/ }\`
      * @since 1.0
      */
     css(properties: JQuery.PlainObject<string | number | ((this: TElement, index: number, value: string) => string | number | void | undefined)>): this;
@@ -3554,7 +3751,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param propertyName A CSS property.
      *                     An array of one or more CSS properties.
-     * @see {@link https://api.jquery.com/css/}
+     * @see \`{@link https://api.jquery.com/css/ }\`
      * @since 1.0
      */
     css(propertyName: string): string;
@@ -3562,7 +3759,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the computed style properties for the first element in the set of matched elements.
      *
      * @param propertyNames An array of one or more CSS properties.
-     * @see {@link https://api.jquery.com/css/}
+     * @see \`{@link https://api.jquery.com/css/ }\`
      * @since 1.9
      */
     css(propertyNames: string[]): JQuery.PlainObject<string>;
@@ -3571,7 +3768,7 @@ 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.
-     * @see {@link https://api.jquery.com/data/}
+     * @see \`{@link https://api.jquery.com/data/ }\`
      * @since 1.2.3
      */
     data(key: string, undefined: undefined): any; // tslint:disable-line:unified-signatures
@@ -3580,7 +3777,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param key A string naming the piece of data to set.
      * @param value The new data value; this can be any Javascript type except undefined.
-     * @see {@link https://api.jquery.com/data/}
+     * @see \`{@link https://api.jquery.com/data/ }\`
      * @since 1.2.3
      */
     data(key: string, value: any): this;
@@ -3588,7 +3785,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Store arbitrary data associated with the matched elements.
      *
      * @param obj An object of key-value pairs of data to update.
-     * @see {@link https://api.jquery.com/data/}
+     * @see \`{@link https://api.jquery.com/data/ }\`
      * @since 1.4.3
      */
     data(obj: JQuery.PlainObject): this;
@@ -3597,7 +3794,7 @@ 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.
-     * @see {@link https://api.jquery.com/data/}
+     * @see \`{@link https://api.jquery.com/data/ }\`
      * @since 1.2.3
      */
     data(key: string): any;
@@ -3605,7 +3802,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Return the value at the named data store for the first element in the jQuery collection, as set by
      * data(name, value) or by an HTML5 data-* attribute.
      *
-     * @see {@link https://api.jquery.com/data/}
+     * @see \`{@link https://api.jquery.com/data/ }\`
      * @since 1.4
      */
     data(): JQuery.PlainObject;
@@ -3614,9 +3811,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/dblclick/}
+     * @see \`{@link https://api.jquery.com/dblclick/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     dblclick<TData>(eventData: TData,
                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3624,9 +3822,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "dblclick" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/dblclick/}
+     * @see \`{@link https://api.jquery.com/dblclick/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     dblclick(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -3634,7 +3833,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param duration An integer indicating the number of milliseconds to delay execution of the next item in the queue.
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/delay/}
+     * @see \`{@link https://api.jquery.com/delay/ }\`
      * @since 1.4
      */
     delay(duration: JQuery.Duration, queueName?: string): this;
@@ -3647,9 +3846,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                  "keydown," or custom event names.
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/delegate/}
+     * @see \`{@link https://api.jquery.com/delegate/ }\`
      * @since 1.4.2
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.on }\`.
      */
     delegate<TData>(selector: JQuery.Selector,
                     eventType: string,
@@ -3663,9 +3863,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param eventType A string containing one or more space-separated JavaScript event types, such as "click" or
      *                  "keydown," or custom event names.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/delegate/}
+     * @see \`{@link https://api.jquery.com/delegate/ }\`
      * @since 1.4.2
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.on }\`.
      */
     delegate(selector: JQuery.Selector,
              eventType: string,
@@ -3676,9 +3877,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param selector A selector to filter the elements that trigger the event.
      * @param events A plain object of one or more event types and functions to execute for them.
-     * @see {@link https://api.jquery.com/delegate/}
+     * @see \`{@link https://api.jquery.com/delegate/ }\`
      * @since 1.4.3
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.on }\`.
      */
     delegate(selector: JQuery.Selector,
              events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
@@ -3686,7 +3888,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Execute the next function on the queue for the matched elements.
      *
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/dequeue/}
+     * @see \`{@link https://api.jquery.com/dequeue/ }\`
      * @since 1.2
      */
     dequeue(queueName?: string): this;
@@ -3694,7 +3896,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Remove the set of matched elements from the DOM.
      *
      * @param selector A selector expression that filters the set of matched elements to be removed.
-     * @see {@link https://api.jquery.com/detach/}
+     * @see \`{@link https://api.jquery.com/detach/ }\`
      * @since 1.4
      */
     detach(selector?: JQuery.Selector): this;
@@ -3702,14 +3904,14 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Iterate over a jQuery object, executing a function for each matched element.
      *
      * @param fn A function to execute for each matched element.
-     * @see {@link https://api.jquery.com/each/}
+     * @see \`{@link https://api.jquery.com/each/ }\`
      * @since 1.0
      */
     each(fn: (this: TElement, index: number, element: TElement) => void | false): this;
     /**
      * Remove all child nodes of the set of matched elements from the DOM.
      *
-     * @see {@link https://api.jquery.com/empty/}
+     * @see \`{@link https://api.jquery.com/empty/ }\`
      * @since 1.0
      */
     empty(): this;
@@ -3717,7 +3919,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * End the most recent filtering operation in the current chain and return the set of matched elements
      * to its previous state.
      *
-     * @see {@link https://api.jquery.com/end/}
+     * @see \`{@link https://api.jquery.com/end/ }\`
      * @since 1.0
      */
     end(): this;
@@ -3726,7 +3928,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param index An integer indicating the 0-based position of the element.
      *              An integer indicating the position of the element, counting backwards from the last element in the set.
-     * @see {@link https://api.jquery.com/eq/}
+     * @see \`{@link https://api.jquery.com/eq/ }\`
      * @since 1.1.2
      * @since 1.4
      */
@@ -3735,7 +3937,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Merge the contents of an object onto the jQuery prototype to provide new jQuery instance methods.
      *
      * @param obj An object to merge onto the jQuery prototype.
-     * @see {@link https://api.jquery.com/jQuery.fn.extend/}
+     * @see \`{@link https://api.jquery.com/jQuery.fn.extend/ }\`
      * @since 1.0
      */
     extend(obj: object): this;
@@ -3745,7 +3947,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeIn/}
+     * @see \`{@link https://api.jquery.com/fadeIn/ }\`
      * @since 1.4.3
      */
     fadeIn(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -3755,7 +3957,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeIn/}
+     * @see \`{@link https://api.jquery.com/fadeIn/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -3767,7 +3969,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                         A string indicating which easing function to use for the transition.
      *                                         A function to call once the animation is complete, called once per matched element.
      *                                         A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/fadeIn/}
+     * @see \`{@link https://api.jquery.com/fadeIn/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -3778,7 +3980,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeOut/}
+     * @see \`{@link https://api.jquery.com/fadeOut/ }\`
      * @since 1.4.3
      */
     fadeOut(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -3788,7 +3990,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeOut/}
+     * @see \`{@link https://api.jquery.com/fadeOut/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -3800,7 +4002,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                         A string indicating which easing function to use for the transition.
      *                                         A function to call once the animation is complete, called once per matched element.
      *                                         A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/fadeOut/}
+     * @see \`{@link https://api.jquery.com/fadeOut/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -3812,7 +4014,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param opacity A number between 0 and 1 denoting the target opacity.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeTo/}
+     * @see \`{@link https://api.jquery.com/fadeTo/ }\`
      * @since 1.4.3
      */
     fadeTo(duration: JQuery.Duration, opacity: number, easing: string, complete?: (this: TElement) => void): this;
@@ -3822,7 +4024,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param opacity A number between 0 and 1 denoting the target opacity.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeTo/}
+     * @see \`{@link https://api.jquery.com/fadeTo/ }\`
      * @since 1.0
      */
     fadeTo(duration: JQuery.Duration, opacity: number, complete?: (this: TElement) => void): this;
@@ -3832,7 +4034,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeToggle/}
+     * @see \`{@link https://api.jquery.com/fadeToggle/ }\`
      * @since 1.4.4
      */
     fadeToggle(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -3842,7 +4044,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/fadeToggle/}
+     * @see \`{@link https://api.jquery.com/fadeToggle/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -3854,7 +4056,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                         A string indicating which easing function to use for the transition.
      *                                         A function to call once the animation is complete, called once per matched element.
      *                                         A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/fadeToggle/}
+     * @see \`{@link https://api.jquery.com/fadeToggle/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -3866,7 +4068,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 One or more DOM elements to match the current set of elements against.
      *                 An existing jQuery object to match the current set of elements against.
      *                 A function used as a test for each element in the set. this is the current DOM element.
-     * @see {@link https://api.jquery.com/filter/}
+     * @see \`{@link https://api.jquery.com/filter/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -3877,7 +4079,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param selector A string containing a selector expression to match elements against.
      *                 An element or a jQuery object to match elements against.
-     * @see {@link https://api.jquery.com/find/}
+     * @see \`{@link https://api.jquery.com/find/ }\`
      * @since 1.0
      * @since 1.6
      */
@@ -3887,14 +4089,14 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * the matched elements.
      *
      * @param queue The name of the queue in which to stop animations.
-     * @see {@link https://api.jquery.com/finish/}
+     * @see \`{@link https://api.jquery.com/finish/ }\`
      * @since 1.9
      */
     finish(queue?: string): this;
     /**
      * Reduce the set of matched elements to the first in the set.
      *
-     * @see {@link https://api.jquery.com/first/}
+     * @see \`{@link https://api.jquery.com/first/ }\`
      * @since 1.4
      */
     first(): this;
@@ -3903,9 +4105,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focus/}
+     * @see \`{@link https://api.jquery.com/focus/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     focus<TData>(eventData: TData,
                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3913,9 +4116,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "focus" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focus/}
+     * @see \`{@link https://api.jquery.com/focus/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     focus(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -3923,9 +4127,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusin/}
+     * @see \`{@link https://api.jquery.com/focusin/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     focusin<TData>(eventData: TData,
                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3933,9 +4138,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "focusin" event.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusin/}
+     * @see \`{@link https://api.jquery.com/focusin/ }\`
      * @since 1.4
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     focusin(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -3943,9 +4149,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusout/}
+     * @see \`{@link https://api.jquery.com/focusout/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     focusout<TData>(eventData: TData,
                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -3953,23 +4160,24 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "focusout" JavaScript event.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/focusout/}
+     * @see \`{@link https://api.jquery.com/focusout/ }\`
      * @since 1.4
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     focusout(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
      * Retrieve one of the elements matched by the jQuery object.
      *
      * @param index A zero-based integer indicating which element to retrieve.
-     * @see {@link https://api.jquery.com/get/}
+     * @see \`{@link https://api.jquery.com/get/ }\`
      * @since 1.0
      */
     get(index: number): TElement;
     /**
      * Retrieve the elements matched by the jQuery object.
      *
-     * @see {@link https://api.jquery.com/get/}
+     * @see \`{@link https://api.jquery.com/get/ }\`
      * @since 1.0
      */
     get(): TElement[];
@@ -3978,7 +4186,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param selector A string containing a selector expression to match elements against.
      *                 A DOM element to match elements against.
-     * @see {@link https://api.jquery.com/has/}
+     * @see \`{@link https://api.jquery.com/has/ }\`
      * @since 1.4
      */
     has(selector: string | Element): this;
@@ -3986,7 +4194,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Determine whether any of the matched elements are assigned the given class.
      *
      * @param className The class name to search for.
-     * @see {@link https://api.jquery.com/hasClass/}
+     * @see \`{@link https://api.jquery.com/hasClass/ }\`
      * @since 1.2
      */
     hasClass(className: string): boolean;
@@ -3997,7 +4205,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              appended (as a string).
      *              A function returning the height to set. Receives the index position of the element in the set and
      *              the old height as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/height/}
+     * @see \`{@link https://api.jquery.com/height/ }\`
      * @since 1.0
      * @since 1.4.1
      */
@@ -4005,7 +4213,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the current computed height for the first element in the set of matched elements.
      *
-     * @see {@link https://api.jquery.com/height/}
+     * @see \`{@link https://api.jquery.com/height/ }\`
      * @since 1.0
      */
     height(): number | undefined;
@@ -4015,7 +4223,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/hide/}
+     * @see \`{@link https://api.jquery.com/hide/ }\`
      * @since 1.4.3
      */
     hide(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): this;
@@ -4025,7 +4233,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing_complete A string indicating which easing function to use for the transition.
      *                        A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/hide/}
+     * @see \`{@link https://api.jquery.com/hide/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -4036,7 +4244,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_complete_options A string or number determining how long the animation will run.
      *                                  A function to call once the animation is complete, called once per matched element.
      *                                  A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/hide/}
+     * @see \`{@link https://api.jquery.com/hide/ }\`
      * @since 1.0
      */
     hide(duration_complete_options?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
@@ -4046,11 +4254,12 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param handlerInOut A function to execute when the mouse pointer enters or leaves the element.
      * @param handlerOut A function to execute when the mouse pointer leaves the element.
-     * @see {@link https://api.jquery.com/hover/}
+     * @see \`{@link https://api.jquery.com/hover/ }\`
      * @since 1.0
      * @since 1.4
      */
     // HACK: The type parameter T is not used but ensures the 'event' callback parameter is typed correctly.
+    // tslint:disable-next-line:no-unnecessary-generics
     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;
     /**
@@ -4060,7 +4269,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                   A function returning the HTML content to set. Receives the index position of the element in the set
      *                   and the old HTML value as arguments. jQuery empties the element before calling the function; use the
      *                   oldhtml argument to reference the previous content. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/html/}
+     * @see \`{@link https://api.jquery.com/html/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -4068,7 +4277,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the HTML contents of the first element in the set of matched elements.
      *
-     * @see {@link https://api.jquery.com/html/}
+     * @see \`{@link https://api.jquery.com/html/ }\`
      * @since 1.0
      */
     html(): string;
@@ -4077,7 +4286,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param element The DOM element or first element within the jQuery object to look for.
      *                A selector representing a jQuery collection in which to look for an element.
-     * @see {@link https://api.jquery.com/index/}
+     * @see \`{@link https://api.jquery.com/index/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -4090,7 +4299,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              A function returning the inner height (including padding but not border) to set. Receives the index
      *              position of the element in the set and the old inner height as arguments. Within the function, this
      *              refers to the current element in the set.
-     * @see {@link https://api.jquery.com/innerHeight/}
+     * @see \`{@link https://api.jquery.com/innerHeight/ }\`
      * @since 1.8.0
      */
     innerHeight(value: string | number | ((this: TElement, index: number, height: number) => string | number)): this;
@@ -4098,7 +4307,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the current computed height for the first element in the set of matched elements, including
      * padding but not border.
      *
-     * @see {@link https://api.jquery.com/innerHeight/}
+     * @see \`{@link https://api.jquery.com/innerHeight/ }\`
      * @since 1.2.6
      */
     innerHeight(): number | undefined;
@@ -4110,7 +4319,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              A function returning the inner width (including padding but not border) to set. Receives the index
      *              position of the element in the set and the old inner width as arguments. Within the function, this
      *              refers to the current element in the set.
-     * @see {@link https://api.jquery.com/innerWidth/}
+     * @see \`{@link https://api.jquery.com/innerWidth/ }\`
      * @since 1.8.0
      */
     innerWidth(value: string | number | ((this: TElement, index: number, width: number) => string | number)): this;
@@ -4118,7 +4327,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the current computed inner width for the first element in the set of matched elements, including
      * padding but not border.
      *
-     * @see {@link https://api.jquery.com/innerWidth/}
+     * @see \`{@link https://api.jquery.com/innerWidth/ }\`
      * @since 1.2.6
      */
     innerWidth(): number | undefined;
@@ -4127,19 +4336,19 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements
      *               will be inserted after the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/insertAfter/}
+     * @see \`{@link https://api.jquery.com/insertAfter/ }\`
      * @since 1.0
      */
-    insertAfter(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
+    insertAfter(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Node> | JQuery<Node>): this;
     /**
      * Insert every element in the set of matched elements before the target.
      *
      * @param target A selector, element, array of elements, HTML string, or jQuery object; the matched set of elements
      *               will be inserted before the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/insertBefore/}
+     * @see \`{@link https://api.jquery.com/insertBefore/ }\`
      * @since 1.0
      */
-    insertBefore(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
+    insertBefore(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Node> | JQuery<Node>): this;
     /**
      * Check the current matched set of elements against a selector, element, or jQuery object and return
      * true if at least one of these elements matches the given arguments.
@@ -4150,7 +4359,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 function, this refers to the current DOM element.
      *                 An existing jQuery object to match the current set of elements against.
      *                 One or more elements to match the current set of elements against.
-     * @see {@link https://api.jquery.com/is/}
+     * @see \`{@link https://api.jquery.com/is/ }\`
      * @since 1.0
      * @since 1.6
      */
@@ -4160,9 +4369,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keydown/}
+     * @see \`{@link https://api.jquery.com/keydown/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     keydown<TData>(eventData: TData,
                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4170,9 +4380,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "keydown" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keydown/}
+     * @see \`{@link https://api.jquery.com/keydown/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     keydown(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4180,9 +4391,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keypress/}
+     * @see \`{@link https://api.jquery.com/keypress/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     keypress<TData>(eventData: TData,
                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4190,9 +4402,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "keypress" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keypress/}
+     * @see \`{@link https://api.jquery.com/keypress/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     keypress(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4200,9 +4413,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keyup/}
+     * @see \`{@link https://api.jquery.com/keyup/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     keyup<TData>(eventData: TData,
                  handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4210,15 +4424,16 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "keyup" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/keyup/}
+     * @see \`{@link https://api.jquery.com/keyup/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     keyup(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
      * Reduce the set of matched elements to the final one in the set.
      *
-     * @see {@link https://api.jquery.com/last/}
+     * @see \`{@link https://api.jquery.com/last/ }\`
      * @since 1.4
      */
     last(): this;
@@ -4228,7 +4443,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param url A string containing the URL to which the request is sent.
      * @param data A plain object or string that is sent to the server with the request.
      * @param complete A callback function that is executed when the request completes.
-     * @see {@link https://api.jquery.com/load/}
+     * @see \`{@link https://api.jquery.com/load/ }\`
      * @since 1.0
      */
     load(url: string,
@@ -4240,7 +4455,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param url A string containing the URL to which the request is sent.
      * @param complete_data A callback function that is executed when the request completes.
      *                      A plain object or string that is sent to the server with the request.
-     * @see {@link https://api.jquery.com/load/}
+     * @see \`{@link https://api.jquery.com/load/ }\`
      * @since 1.0
      */
     load(url: string,
@@ -4250,18 +4465,19 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * containing the return values.
      *
      * @param callback A function object that will be invoked for each element in the current set.
-     * @see {@link https://api.jquery.com/map/}
+     * @see \`{@link https://api.jquery.com/map/ }\`
      * @since 1.2
      */
-    map(callback: (this: TElement, index: number, domElement: TElement) => any | any[] | null | undefined): this;
+    map<TReturn>(callback: (this: TElement, index: number, domElement: TElement) => JQuery.TypeOrArray<TReturn> | null | undefined): JQuery<TReturn>;
     /**
      * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mousedown/}
+     * @see \`{@link https://api.jquery.com/mousedown/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mousedown<TData>(eventData: TData,
                      handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4269,9 +4485,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "mousedown" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mousedown/}
+     * @see \`{@link https://api.jquery.com/mousedown/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mousedown(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4279,9 +4496,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseenter/}
+     * @see \`{@link https://api.jquery.com/mouseenter/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseenter<TData>(eventData: TData,
                       handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4289,9 +4507,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to be fired when the mouse enters an element, or trigger that handler on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseenter/}
+     * @see \`{@link https://api.jquery.com/mouseenter/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseenter(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4299,9 +4518,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseleave/}
+     * @see \`{@link https://api.jquery.com/mouseleave/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseleave<TData>(eventData: TData,
                       handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4309,9 +4529,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to be fired when the mouse leaves an element, or trigger that handler on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseleave/}
+     * @see \`{@link https://api.jquery.com/mouseleave/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseleave(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4319,9 +4540,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mousemove/}
+     * @see \`{@link https://api.jquery.com/mousemove/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mousemove<TData>(eventData: TData,
                      handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4329,9 +4551,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "mousemove" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mousemove/}
+     * @see \`{@link https://api.jquery.com/mousemove/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mousemove(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4339,9 +4562,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseout/}
+     * @see \`{@link https://api.jquery.com/mouseout/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseout<TData>(eventData: TData,
                     handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4349,9 +4573,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "mouseout" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseout/}
+     * @see \`{@link https://api.jquery.com/mouseout/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseout(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4359,9 +4584,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseover/}
+     * @see \`{@link https://api.jquery.com/mouseover/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseover<TData>(eventData: TData,
                      handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4369,9 +4595,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "mouseover" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseover/}
+     * @see \`{@link https://api.jquery.com/mouseover/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseover(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4379,9 +4606,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseup/}
+     * @see \`{@link https://api.jquery.com/mouseup/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseup<TData>(eventData: TData,
                    handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -4389,9 +4617,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "mouseup" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/mouseup/}
+     * @see \`{@link https://api.jquery.com/mouseup/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     mouseup(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -4399,7 +4628,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * is provided, it retrieves the next sibling only if it matches that selector.
      *
      * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/next/}
+     * @see \`{@link https://api.jquery.com/next/ }\`
      * @since 1.0
      */
     next(selector?: JQuery.Selector): this;
@@ -4407,7 +4636,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get all following 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.
-     * @see {@link https://api.jquery.com/nextAll/}
+     * @see \`{@link https://api.jquery.com/nextAll/ }\`
      * @since 1.2
      */
     nextAll(selector?: string): this;
@@ -4418,7 +4647,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A string containing a selector expression to indicate where to stop matching following sibling elements.
      *                 A DOM node or jQuery object indicating where to stop matching following sibling elements.
      * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/nextUntil/}
+     * @see \`{@link https://api.jquery.com/nextUntil/ }\`
      * @since 1.4
      * @since 1.6
      */
@@ -4431,7 +4660,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 element's index in the jQuery collection, and element, which is the DOM element. Within the
      *                 function, this refers to the current DOM element.
      *                 An existing jQuery object to match the current set of elements against.
-     * @see {@link https://api.jquery.com/not/}
+     * @see \`{@link https://api.jquery.com/not/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -4443,7 +4672,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *               "click", "keydown.myPlugin", or ".myPlugin".
      * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/off/}
+     * @see \`{@link https://api.jquery.com/off/ }\`
      * @since 1.7
      */
     off(events: string, selector: JQuery.Selector, handler: JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
@@ -4454,7 +4683,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *               "click", "keydown.myPlugin", or ".myPlugin".
      * @param selector_handler A selector which should match the one originally passed to .on() when attaching event handlers.
      *                         A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/off/}
+     * @see \`{@link https://api.jquery.com/off/ }\`
      * @since 1.7
      */
     off(events: string, selector_handler?: JQuery.Selector | JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
@@ -4464,7 +4693,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param events An object where the string keys represent one or more space-separated event types and optional
      *               namespaces, and the values represent handler functions previously attached for the event(s).
      * @param selector A selector which should match the one originally passed to .on() when attaching event handlers.
-     * @see {@link https://api.jquery.com/off/}
+     * @see \`{@link https://api.jquery.com/off/ }\`
      * @since 1.7
      */
     off(events: JQuery.PlainObject<JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false>, selector?: JQuery.Selector): this;
@@ -4472,7 +4701,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Remove an event handler.
      *
      * @param event A jQuery.Event object.
-     * @see {@link https://api.jquery.com/off/}
+     * @see \`{@link https://api.jquery.com/off/ }\`
      * @since 1.7
      */
     off(event?: JQuery.Event<TElement>): this;
@@ -4484,21 +4713,21 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                    A function to return the coordinates to set. Receives the index of the element in the collection as
      *                    the first argument and the current coordinates as the second argument. The function should return an
      *                    object with the new top and left properties.
-     * @see {@link https://api.jquery.com/offset/}
+     * @see \`{@link https://api.jquery.com/offset/ }\`
      * @since 1.4
      */
-    offset(coordinates: JQuery.Coordinates | ((this: TElement, index: number, coords: JQuery.Coordinates) => JQuery.Coordinates)): this;
+    offset(coordinates: JQuery.CoordinatesPartial | ((this: TElement, index: number, coords: JQuery.Coordinates) => JQuery.CoordinatesPartial)): this;
     /**
      * Get the current coordinates of the first element in the set of matched elements, relative to the document.
      *
-     * @see {@link https://api.jquery.com/offset/}
+     * @see \`{@link https://api.jquery.com/offset/ }\`
      * @since 1.2
      */
     offset(): JQuery.Coordinates | undefined;
     /**
      * Get the closest ancestor element that is positioned.
      *
-     * @see {@link https://api.jquery.com/offsetParent/}
+     * @see \`{@link https://api.jquery.com/offsetParent/ }\`
      * @since 1.2.6
      */
     offsetParent(): this;
@@ -4510,7 +4739,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
      * @param data Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on<TData>(events: string,
@@ -4525,13 +4754,13 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
      * @param data Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: string,
-        selector: JQuery.Selector | null,
-        data: TData,
-        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
+    on(events: string,
+       selector: JQuery.Selector | null,
+       data: any,
+       handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
@@ -4540,7 +4769,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
      * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
      *                for a function that simply does return false.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on(events: string,
@@ -4553,19 +4782,19 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A selector string to filter the descendants of the selected elements that trigger the event. If the
      *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on(events: string,
-        selector: JQuery.Selector,
-        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
+       selector: JQuery.Selector,
+       handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
      * @param data Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on<TData>(events: string,
@@ -4577,19 +4806,19 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
      * @param data Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
-    on<TData>(events: string,
-        data: TData,
-        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
+    on(events: string,
+       data: any, // tslint:disable-line:unified-signatures
+       handler: ((event: JQueryEventObject) => void)): this;
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
      * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
      *                for a function that simply does return false.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on(events: string,
@@ -4599,11 +4828,11 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on(events: string,
-        handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
+       handler: ((event: JQueryEventObject) => void)): this; // tslint:disable-line:unified-signatures
     /**
      * Attach an event handler function for one or more events to the selected elements.
      *
@@ -4612,7 +4841,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
      *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
      * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
@@ -4625,7 +4854,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *               namespaces, and the values represent a handler function to be called for the event(s).
      * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
      *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>,
@@ -4636,7 +4865,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param events An object in which the string keys represent one or more space-separated event types and optional
      *               namespaces, and the values represent a handler function to be called for the event(s).
      * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
@@ -4646,7 +4875,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param events An object in which the string keys represent one or more space-separated event types and optional
      *               namespaces, and the values represent a handler function to be called for the event(s).
-     * @see {@link https://api.jquery.com/on/}
+     * @see \`{@link https://api.jquery.com/on/ }\`
      * @since 1.7
      */
     on(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
@@ -4658,7 +4887,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
      * @param data Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one<TData>(events: string,
@@ -4673,7 +4902,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                 selector is null or omitted, the event is always triggered when it reaches the selected element.
      * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
      *                for a function that simply does return false.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one(events: string,
@@ -4685,7 +4914,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
      * @param data Data to be passed to the handler in event.data when an event is triggered.
      * @param handler A function to execute when the event is triggered.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one<TData>(events: string,
@@ -4697,7 +4926,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param events One or more space-separated event types and optional namespaces, such as "click" or "keydown.myPlugin".
      * @param handler A function to execute when the event is triggered. The value false is also allowed as a shorthand
      *                for a function that simply does return false.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one(events: string,
@@ -4710,7 +4939,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
      *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
      * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
@@ -4723,7 +4952,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *               namespaces, and the values represent a handler function to be called for the event(s).
      * @param selector A selector string to filter the descendants of the selected elements that will call the handler. If
      *                 the selector is null or omitted, the handler is always called when it reaches the selected element.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>,
@@ -4734,7 +4963,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param events An object in which the string keys represent one or more space-separated event types and optional
      *               namespaces, and the values represent a handler function to be called for the event(s).
      * @param data Data to be passed to the handler in event.data when an event occurs.
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one<TData>(events: JQuery.PlainObject<JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>> | false>,
@@ -4744,7 +4973,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param events An object in which the string keys represent one or more space-separated event types and optional
      *               namespaces, and the values represent a handler function to be called for the event(s).
-     * @see {@link https://api.jquery.com/one/}
+     * @see \`{@link https://api.jquery.com/one/ }\`
      * @since 1.7
      */
     one(events: JQuery.PlainObject<JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false>): this;
@@ -4753,7 +4982,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param value A number representing the number of pixels, or a number along with an optional unit of measure
      *              appended (as a string).
-     * @see {@link https://api.jquery.com/outerHeight/}
+     * @see \`{@link https://api.jquery.com/outerHeight/ }\`
      * @since 1.8.0
      */
     outerHeight(value: string | number | ((this: TElement, index: number, height: number) => string | number)): this;
@@ -4762,7 +4991,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * first element in the set of matched elements.
      *
      * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     * @see {@link https://api.jquery.com/outerHeight/}
+     * @see \`{@link https://api.jquery.com/outerHeight/ }\`
      * @since 1.2.6
      */
     outerHeight(includeMargin?: boolean): number | undefined;
@@ -4773,7 +5002,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              appended (as a string).
      *              A function returning the outer width to set. Receives the index position of the element in the set
      *              and the old outer width as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/outerWidth/}
+     * @see \`{@link https://api.jquery.com/outerWidth/ }\`
      * @since 1.8.0
      */
     outerWidth(value: string | number | ((this: TElement, index: number, width: number) => string | number)): this;
@@ -4782,7 +5011,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * first element in the set of matched elements.
      *
      * @param includeMargin A Boolean indicating whether to include the element's margin in the calculation.
-     * @see {@link https://api.jquery.com/outerWidth/}
+     * @see \`{@link https://api.jquery.com/outerWidth/ }\`
      * @since 1.2.6
      */
     outerWidth(includeMargin?: boolean): number | undefined;
@@ -4790,7 +5019,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the parent of each element in the current set of matched elements, optionally filtered by a selector.
      *
      * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parent/}
+     * @see \`{@link https://api.jquery.com/parent/ }\`
      * @since 1.0
      */
     parent(selector?: JQuery.Selector): this;
@@ -4798,7 +5027,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the ancestors of each element in the current set of matched elements, optionally filtered by a selector.
      *
      * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parents/}
+     * @see \`{@link https://api.jquery.com/parents/ }\`
      * @since 1.0
      */
     parents(selector?: JQuery.Selector): this;
@@ -4809,7 +5038,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A string containing a selector expression to indicate where to stop matching ancestor elements.
      *                 A DOM node or jQuery object indicating where to stop matching ancestor elements.
      * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/parentsUntil/}
+     * @see \`{@link https://api.jquery.com/parentsUntil/ }\`
      * @since 1.4
      * @since 1.6
      */
@@ -4817,7 +5046,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the current coordinates of the first element in the set of matched elements, relative to the offset parent.
      *
-     * @see {@link https://api.jquery.com/position/}
+     * @see \`{@link https://api.jquery.com/position/ }\`
      * @since 1.2
      */
     position(): JQuery.Coordinates;
@@ -4826,7 +5055,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param contents One or more additional DOM elements, text nodes, arrays of elements and text nodes, HTML strings, or
      *                 jQuery objects to insert at the beginning of each element in the set of matched elements.
-     * @see {@link https://api.jquery.com/prepend/}
+     * @see \`{@link https://api.jquery.com/prepend/ }\`
      * @since 1.0
      */
     prepend(...contents: Array<JQuery.htmlString | JQuery.TypeOrArray<JQuery.Node | JQuery<JQuery.Node>>>): this;
@@ -4837,7 +5066,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *           the beginning of each element in the set of matched elements. Receives the index position of the
      *           element in the set and the old HTML value of the element as arguments. Within the function, this
      *           refers to the current element in the set.
-     * @see {@link https://api.jquery.com/prepend/}
+     * @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;
@@ -4846,7 +5075,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param target A selector, element, HTML string, array of elements, or jQuery object; the matched set of elements
      *               will be inserted at the beginning of the element(s) specified by this parameter.
-     * @see {@link https://api.jquery.com/prependTo/}
+     * @see \`{@link https://api.jquery.com/prependTo/ }\`
      * @since 1.0
      */
     prependTo(target: JQuery.Selector | JQuery.htmlString | JQuery.TypeOrArray<Element> | JQuery): this;
@@ -4855,7 +5084,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * is provided, it retrieves the previous sibling only if it matches that selector.
      *
      * @param selector A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prev/}
+     * @see \`{@link https://api.jquery.com/prev/ }\`
      * @since 1.0
      */
     prev(selector?: JQuery.Selector): this;
@@ -4863,7 +5092,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get all preceding 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.
-     * @see {@link https://api.jquery.com/prevAll/}
+     * @see \`{@link https://api.jquery.com/prevAll/ }\`
      * @since 1.2
      */
     prevAll(selector?: JQuery.Selector): this;
@@ -4874,7 +5103,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A string containing a selector expression to indicate where to stop matching preceding sibling elements.
      *                 A DOM node or jQuery object indicating where to stop matching preceding sibling elements.
      * @param filter A string containing a selector expression to match elements against.
-     * @see {@link https://api.jquery.com/prevUntil/}
+     * @see \`{@link https://api.jquery.com/prevUntil/ }\`
      * @since 1.4
      * @since 1.6
      */
@@ -4885,7 +5114,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param type The type of queue that needs to be observed.
      * @param target Object onto which the promise methods have to be attached
-     * @see {@link https://api.jquery.com/promise/}
+     * @see \`{@link https://api.jquery.com/promise/ }\`
      * @since 1.6
      */
     promise<T extends object>(type: string, target: T): T & JQuery.Promise<this>;
@@ -4894,7 +5123,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * queued or not, have finished.
      *
      * @param target Object onto which the promise methods have to be attached
-     * @see {@link https://api.jquery.com/promise/}
+     * @see \`{@link https://api.jquery.com/promise/ }\`
      * @since 1.6
      */
     promise<T extends object>(target: T): T & JQuery.Promise<this>;
@@ -4903,7 +5132,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * queued or not, have finished.
      *
      * @param type The type of queue that needs to be observed.
-     * @see {@link https://api.jquery.com/promise/}
+     * @see \`{@link https://api.jquery.com/promise/ }\`
      * @since 1.6
      */
     promise(type?: string): JQuery.Promise<this>;
@@ -4913,7 +5142,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param propertyName The name of the property to set.
      * @param value A function returning the value to set. Receives the index position of the element in the set and the
      *              old property value as arguments. Within the function, the keyword this refers to the current element.
-     * @see {@link https://api.jquery.com/prop/}
+     * @see \`{@link https://api.jquery.com/prop/ }\`
      * @since 1.6
      */
     prop(propertyName: string, value: (this: TElement, index: number, oldPropertyValue: any) => any): this;
@@ -4922,7 +5151,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param propertyName The name of the property to set.
      * @param value A value to set for the property.
-     * @see {@link https://api.jquery.com/prop/}
+     * @see \`{@link https://api.jquery.com/prop/ }\`
      * @since 1.6
      */
     prop(propertyName: string, value: any): this; // tslint:disable-line:unified-signatures
@@ -4930,7 +5159,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Set one or more properties for the set of matched elements.
      *
      * @param properties An object of property-value pairs to set.
-     * @see {@link https://api.jquery.com/prop/}
+     * @see \`{@link https://api.jquery.com/prop/ }\`
      * @since 1.6
      */
     prop(properties: JQuery.PlainObject): this;
@@ -4938,7 +5167,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the value of a property for the first element in the set of matched elements.
      *
      * @param propertyName The name of the property to get.
-     * @see {@link https://api.jquery.com/prop/}
+     * @see \`{@link https://api.jquery.com/prop/ }\`
      * @since 1.6
      */
     prop(propertyName: string): any | undefined;
@@ -4948,7 +5177,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param elements An array of elements to push onto the stack and make into a new jQuery object.
      * @param name The name of a jQuery method that generated the array of elements.
      * @param args The arguments that were passed in to the jQuery method (for serialization).
-     * @see {@link https://api.jquery.com/pushStack/}
+     * @see \`{@link https://api.jquery.com/pushStack/ }\`
      * @since 1.3
      */
     pushStack(elements: ArrayLike<Element>, name: string, args: any[]): this;
@@ -4956,7 +5185,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Add a collection of DOM elements onto the jQuery stack.
      *
      * @param elements An array of elements to push onto the stack and make into a new jQuery object.
-     * @see {@link https://api.jquery.com/pushStack/}
+     * @see \`{@link https://api.jquery.com/pushStack/ }\`
      * @since 1.0
      */
     pushStack(elements: ArrayLike<Element>): this;
@@ -4966,7 +5195,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
      * @param newQueue The new function to add to the queue, with a function to call that will dequeue the next item.
      *                 An array of functions to replace the current queue contents.
-     * @see {@link https://api.jquery.com/queue/}
+     * @see \`{@link https://api.jquery.com/queue/ }\`
      * @since 1.2
      */
     queue(queueName: string, newQueue: JQuery.TypeOrArray<JQuery.QueueFunction<TElement>>): this;
@@ -4975,7 +5204,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param newQueue The new function to add to the queue, with a function to call that will dequeue the next item.
      *                 An array of functions to replace the current queue contents.
-     * @see {@link https://api.jquery.com/queue/}
+     * @see \`{@link https://api.jquery.com/queue/ }\`
      * @since 1.2
      */
     queue(newQueue: JQuery.TypeOrArray<JQuery.QueueFunction<TElement>>): this;
@@ -4983,7 +5212,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Show the queue of functions to be executed on the matched elements.
      *
      * @param queueName A string containing the name of the queue. Defaults to fx, the standard effects queue.
-     * @see {@link https://api.jquery.com/queue/}
+     * @see \`{@link https://api.jquery.com/queue/ }\`
      * @since 1.2
      */
     queue(queueName?: string): JQuery.Queue<Node>;
@@ -4991,16 +5220,17 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Specify a function to execute when the DOM is fully loaded.
      *
      * @param handler A function to execute after the DOM is ready.
-     * @see {@link https://api.jquery.com/ready/}
+     * @see \`{@link https://api.jquery.com/ready/ }\`
      * @since 1.0
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use `jQuery(function() { })`.
      */
-    ready(handler: ($: JQueryStatic<TElement>) => void): this;
+    ready(handler: ($: JQueryStatic) => void): this;
     /**
      * Remove the set of matched elements from the DOM.
      *
      * @param selector A selector expression that filters the set of matched elements to be removed.
-     * @see {@link https://api.jquery.com/remove/}
+     * @see \`{@link https://api.jquery.com/remove/ }\`
      * @since 1.0
      */
     remove(selector?: string): this;
@@ -5008,7 +5238,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Remove an attribute from each element in the set of matched elements.
      *
      * @param attributeName An attribute to remove; as of version 1.7, it can be a space-separated list of attributes.
-     * @see {@link https://api.jquery.com/removeAttr/}
+     * @see \`{@link https://api.jquery.com/removeAttr/ }\`
      * @since 1.0
      */
     removeAttr(attributeName: string): this;
@@ -5019,7 +5249,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                  An array of classes to be removed from the class attribute of each matched element.
      *                  A function returning one or more space-separated class names to be removed. Receives the index
      *                  position of the element in the set and the old class value as arguments.
-     * @see {@link https://api.jquery.com/removeClass/}
+     * @see \`{@link https://api.jquery.com/removeClass/ }\`
      * @since 1.0
      * @since 1.4
      * @since 3.3
@@ -5030,7 +5260,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param name A string naming the piece of data to delete.
      *             An array or space-separated string naming the pieces of data to delete.
-     * @see {@link https://api.jquery.com/removeData/}
+     * @see \`{@link https://api.jquery.com/removeData/ }\`
      * @since 1.2.3
      * @since 1.7
      */
@@ -5039,7 +5269,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Remove a property for the set of matched elements.
      *
      * @param propertyName The name of the property to remove.
-     * @see {@link https://api.jquery.com/removeProp/}
+     * @see \`{@link https://api.jquery.com/removeProp/ }\`
      * @since 1.6
      */
     removeProp(propertyName: string): this;
@@ -5047,7 +5277,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Replace each target element with the set of matched elements.
      *
      * @param target A selector string, jQuery object, DOM element, or array of elements indicating which element(s) to replace.
-     * @see {@link https://api.jquery.com/replaceAll/}
+     * @see \`{@link https://api.jquery.com/replaceAll/ }\`
      * @since 1.2
      */
     replaceAll(target: JQuery.Selector | JQuery | JQuery.TypeOrArray<Element>): this;
@@ -5057,7 +5287,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param newContent The content to insert. May be an HTML string, DOM element, array of DOM elements, or jQuery object.
      *                   A function that returns content with which to replace the set of matched elements.
-     * @see {@link https://api.jquery.com/replaceWith/}
+     * @see \`{@link https://api.jquery.com/replaceWith/ }\`
      * @since 1.2
      * @since 1.4
      */
@@ -5067,9 +5297,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/resize/}
+     * @see \`{@link https://api.jquery.com/resize/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     resize<TData>(eventData: TData,
                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -5077,9 +5308,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "resize" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/resize/}
+     * @see \`{@link https://api.jquery.com/resize/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     resize(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -5087,9 +5319,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/scroll/}
+     * @see \`{@link https://api.jquery.com/scroll/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     scroll<TData>(eventData: TData,
                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -5097,23 +5330,24 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "scroll" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/scroll/}
+     * @see \`{@link https://api.jquery.com/scroll/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     scroll(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
      * Set the current horizontal position of the scroll bar for each of the set of matched elements.
      *
      * @param value An integer indicating the new position to set the scroll bar to.
-     * @see {@link https://api.jquery.com/scrollLeft/}
+     * @see \`{@link https://api.jquery.com/scrollLeft/ }\`
      * @since 1.2.6
      */
     scrollLeft(value: number): this;
     /**
      * Get the current horizontal position of the scroll bar for the first element in the set of matched elements.
      *
-     * @see {@link https://api.jquery.com/scrollLeft/}
+     * @see \`{@link https://api.jquery.com/scrollLeft/ }\`
      * @since 1.2.6
      */
     scrollLeft(): number | undefined;
@@ -5121,7 +5355,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Set the current vertical position of the scroll bar for each of the set of matched elements.
      *
      * @param value A number indicating the new position to set the scroll bar to.
-     * @see {@link https://api.jquery.com/scrollTop/}
+     * @see \`{@link https://api.jquery.com/scrollTop/ }\`
      * @since 1.2.6
      */
     scrollTop(value: number): this;
@@ -5129,7 +5363,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Get the current vertical position of the scroll bar for the first element in the set of matched
      * elements or set the vertical position of the scroll bar for every matched element.
      *
-     * @see {@link https://api.jquery.com/scrollTop/}
+     * @see \`{@link https://api.jquery.com/scrollTop/ }\`
      * @since 1.2.6
      */
     scrollTop(): number | undefined;
@@ -5138,9 +5372,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/select/}
+     * @see \`{@link https://api.jquery.com/select/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     select<TData>(eventData: TData,
                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -5148,22 +5383,23 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "select" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/select/}
+     * @see \`{@link https://api.jquery.com/select/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     select(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
      * Encode a set of form elements as a string for submission.
      *
-     * @see {@link https://api.jquery.com/serialize/}
+     * @see \`{@link https://api.jquery.com/serialize/ }\`
      * @since 1.0
      */
     serialize(): string;
     /**
      * Encode a set of form elements as an array of names and values.
      *
-     * @see {@link https://api.jquery.com/serializeArray/}
+     * @see \`{@link https://api.jquery.com/serializeArray/ }\`
      * @since 1.2
      */
     serializeArray(): JQuery.NameValuePair[];
@@ -5173,7 +5409,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/show/}
+     * @see \`{@link https://api.jquery.com/show/ }\`
      * @since 1.4.3
      */
     show(duration: JQuery.Duration, easing: string, complete: (this: TElement) => void): this;
@@ -5183,7 +5419,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing_complete A string indicating which easing function to use for the transition.
      *                        A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/show/}
+     * @see \`{@link https://api.jquery.com/show/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5194,7 +5430,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_complete_options A string or number determining how long the animation will run.
      *                                  A function to call once the animation is complete, called once per matched element.
      *                                  A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/show/}
+     * @see \`{@link https://api.jquery.com/show/ }\`
      * @since 1.0
      */
     show(duration_complete_options?: JQuery.Duration | ((this: TElement) => void) | JQuery.EffectsOptions<TElement>): this;
@@ -5202,7 +5438,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * 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.
-     * @see {@link https://api.jquery.com/siblings/}
+     * @see \`{@link https://api.jquery.com/siblings/ }\`
      * @since 1.0
      */
     siblings(selector?: JQuery.Selector): this;
@@ -5213,7 +5449,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              it indicates an offset from the end of the set.
      * @param end An integer indicating the 0-based position at which the elements stop being selected. If negative,
      *            it indicates an offset from the end of the set. If omitted, the range continues until the end of the set.
-     * @see {@link https://api.jquery.com/slice/}
+     * @see \`{@link https://api.jquery.com/slice/ }\`
      * @since 1.1.4
      */
     slice(start: number, end?: number): this;
@@ -5223,7 +5459,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/slideDown/}
+     * @see \`{@link https://api.jquery.com/slideDown/ }\`
      * @since 1.4.3
      */
     slideDown(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -5233,7 +5469,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/slideDown/}
+     * @see \`{@link https://api.jquery.com/slideDown/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5245,7 +5481,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                         A string indicating which easing function to use for the transition.
      *                                         A function to call once the animation is complete, called once per matched element.
      *                                         A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/slideDown/}
+     * @see \`{@link https://api.jquery.com/slideDown/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5256,7 +5492,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/slideToggle/}
+     * @see \`{@link https://api.jquery.com/slideToggle/ }\`
      * @since 1.4.3
      */
     slideToggle(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -5266,7 +5502,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/slideToggle/}
+     * @see \`{@link https://api.jquery.com/slideToggle/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5278,7 +5514,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                         A string indicating which easing function to use for the transition.
      *                                         A function to call once the animation is complete, called once per matched element.
      *                                         A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/slideToggle/}
+     * @see \`{@link https://api.jquery.com/slideToggle/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5289,7 +5525,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/slideUp/}
+     * @see \`{@link https://api.jquery.com/slideUp/ }\`
      * @since 1.4.3
      */
     slideUp(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -5299,7 +5535,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration_easing A string or number determining how long the animation will run.
      *                        A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/slideUp/}
+     * @see \`{@link https://api.jquery.com/slideUp/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5311,7 +5547,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                         A string indicating which easing function to use for the transition.
      *                                         A function to call once the animation is complete, called once per matched element.
      *                                         A map of additional options to pass to the method.
-     * @see {@link https://api.jquery.com/slideUp/}
+     * @see \`{@link https://api.jquery.com/slideUp/ }\`
      * @since 1.0
      * @since 1.4.3
      */
@@ -5322,7 +5558,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param queue The name of the queue in which to stop animations.
      * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
      * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     * @see {@link https://api.jquery.com/stop/}
+     * @see \`{@link https://api.jquery.com/stop/ }\`
      * @since 1.7
      */
     stop(queue: string, clearQueue?: boolean, jumpToEnd?: boolean): this;
@@ -5331,7 +5567,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param clearQueue A Boolean indicating whether to remove queued animation as well. Defaults to false.
      * @param jumpToEnd A Boolean indicating whether to complete the current animation immediately. Defaults to false.
-     * @see {@link https://api.jquery.com/stop/}
+     * @see \`{@link https://api.jquery.com/stop/ }\`
      * @since 1.2
      */
     stop(clearQueue?: boolean, jumpToEnd?: boolean): this;
@@ -5340,9 +5576,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param eventData An object containing data that will be passed to the event handler.
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/submit/}
+     * @see \`{@link https://api.jquery.com/submit/ }\`
      * @since 1.4.3
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     submit<TData>(eventData: TData,
                   handler: JQuery.EventHandler<TElement, TData> | JQuery.EventHandlerBase<any, JQuery.Event<TElement, TData>>): this;
@@ -5350,9 +5587,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * Bind an event handler to the "submit" JavaScript event, or trigger that event on an element.
      *
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/submit/}
+     * @see \`{@link https://api.jquery.com/submit/ }\`
      * @since 1.0
-     * @deprecated 3.3
+     *
+     * @deprecated Deprecated since 3.3. Use \`{@link JQuery.on }\` or \`{@link JQuery.trigger }\`.
      */
     submit(handler?: JQuery.EventHandler<TElement> | JQuery.EventHandlerBase<any, JQuery.Event<TElement>> | false): this;
     /**
@@ -5362,7 +5600,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *             be converted to a String representation.
      *             A function returning the text content to set. Receives the index position of the element in the set
      *             and the old text value as arguments.
-     * @see {@link https://api.jquery.com/text/}
+     * @see \`{@link https://api.jquery.com/text/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -5370,14 +5608,14 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the combined text contents of each element in the set of matched elements, including their descendants.
      *
-     * @see {@link https://api.jquery.com/text/}
+     * @see \`{@link https://api.jquery.com/text/ }\`
      * @since 1.0
      */
     text(): string;
     /**
      * Retrieve all the elements contained in the jQuery set, as an array.
      *
-     * @see {@link https://api.jquery.com/toArray/}
+     * @see \`{@link https://api.jquery.com/toArray/ }\`
      * @since 1.4
      */
     toArray(): TElement[];
@@ -5387,7 +5625,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param duration A string or number determining how long the animation will run.
      * @param easing A string indicating which easing function to use for the transition.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/toggle/}
+     * @see \`{@link https://api.jquery.com/toggle/ }\`
      * @since 1.4.3
      */
     toggle(duration: JQuery.Duration, easing: string, complete?: (this: TElement) => void): this;
@@ -5396,7 +5634,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param duration A string or number determining how long the animation will run.
      * @param complete A function to call once the animation is complete, called once per matched element.
-     * @see {@link https://api.jquery.com/toggle/}
+     * @see \`{@link https://api.jquery.com/toggle/ }\`
      * @since 1.0
      */
     toggle(duration: JQuery.Duration, complete: (this: TElement) => void): this;
@@ -5407,7 +5645,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                                          A function to call once the animation is complete, called once per matched element.
      *                                          A map of additional options to pass to the method.
      *                                          Use true to show the element or false to hide it.
-     * @see {@link https://api.jquery.com/toggle/}
+     * @see \`{@link https://api.jquery.com/toggle/ }\`
      * @since 1.0
      * @since 1.3
      */
@@ -5421,7 +5659,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                  A function that returns class names to be toggled in the class attribute of each element in the
      *                  matched set. Receives the index position of the element in the set, the old class value, and the state as arguments.
      * @param state A Boolean (not just truthy/falsy) value to determine whether the class should be added or removed.
-     * @see {@link https://api.jquery.com/toggleClass/}
+     * @see \`{@link https://api.jquery.com/toggleClass/ }\`
      * @since 1.0
      * @since 1.3
      * @since 1.4
@@ -5434,9 +5672,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * either the class's presence or the value of the state argument.
      *
      * @param state A boolean value to determine whether the class should be added or removed.
-     * @see {@link https://api.jquery.com/toggleClass/}
+     * @see \`{@link https://api.jquery.com/toggleClass/ }\`
      * @since 1.4
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. See \`{@link https://github.com/jquery/jquery/pull/2618 }\`.
      */
     toggleClass(state?: boolean): this;
     /**
@@ -5445,7 +5684,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param eventType A string containing a JavaScript event type, such as click or submit.
      *                  A jQuery.Event object.
      * @param extraParameters Additional parameters to pass along to the event handler.
-     * @see {@link https://api.jquery.com/trigger/}
+     * @see \`{@link https://api.jquery.com/trigger/ }\`
      * @since 1.0
      * @since 1.3
      */
@@ -5456,7 +5695,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param eventType A string containing a JavaScript event type, such as click or submit.
      *                  A jQuery.Event object.
      * @param extraParameters Additional parameters to pass along to the event handler.
-     * @see {@link https://api.jquery.com/triggerHandler/}
+     * @see \`{@link https://api.jquery.com/triggerHandler/ }\`
      * @since 1.2
      * @since 1.3
      */
@@ -5466,10 +5705,11 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param event 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.
-     * @see {@link https://api.jquery.com/unbind/}
+     * @see \`{@link https://api.jquery.com/unbind/ }\`
      * @since 1.0
      * @since 1.4.3
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.off }\`.
      */
     unbind(event: string, handler: JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
     /**
@@ -5477,9 +5717,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param event A string containing one or more DOM event types, such as "click" or "submit," or custom event names.
      *              A jQuery.Event object.
-     * @see {@link https://api.jquery.com/unbind/}
+     * @see \`{@link https://api.jquery.com/unbind/ }\`
      * @since 1.0
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.off }\`.
      */
     unbind(event?: string | JQuery.Event<TElement>): this;
     /**
@@ -5489,9 +5730,10 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A selector which will be used to filter the event results.
      * @param eventType A string containing a JavaScript event type, such as "click" or "keydown"
      * @param handler A function to execute each time the event is triggered.
-     * @see {@link https://api.jquery.com/undelegate/}
+     * @see \`{@link https://api.jquery.com/undelegate/ }\`
      * @since 1.4.2
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.off }\`.
      */
     undelegate(selector: JQuery.Selector, eventType: string, handler: JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false): this;
     /**
@@ -5501,10 +5743,11 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * @param selector A selector which will be used to filter the event results.
      * @param eventTypes A string containing a JavaScript event type, such as "click" or "keydown"
      *                   An object of one or more event types and previously bound functions to unbind from them.
-     * @see {@link https://api.jquery.com/undelegate/}
+     * @see \`{@link https://api.jquery.com/undelegate/ }\`
      * @since 1.4.2
      * @since 1.4.3
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.off }\`.
      */
     undelegate(selector: JQuery.Selector, eventTypes: string | JQuery.PlainObject<JQuery.EventHandlerBase<any, JQuery.Event<TElement, any>> | false>): this;
     /**
@@ -5512,10 +5755,11 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      * specific set of root elements.
      *
      * @param namespace A selector which will be used to filter the event results.
-     * @see {@link https://api.jquery.com/undelegate/}
+     * @see \`{@link https://api.jquery.com/undelegate/ }\`
      * @since 1.4.2
      * @since 1.6
-     * @deprecated 3.0
+     *
+     * @deprecated Deprecated since 3.0. Use \`{@link JQuery.off }\`.
      */
     undelegate(namespace?: string): this;
     /**
@@ -5523,7 +5767,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *
      * @param selector A selector to check the parent element against. If an element's parent does not match the selector,
      *                 the element won't be unwrapped.
-     * @see {@link https://api.jquery.com/unwrap/}
+     * @see \`{@link https://api.jquery.com/unwrap/ }\`
      * @since 1.4
      * @since 3.0
      */
@@ -5535,7 +5779,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              element to set as selected/checked.
      *              A function returning the value to set. this is the current element. Receives the index position of
      *              the element in the set and the old value as arguments.
-     * @see {@link https://api.jquery.com/val/}
+     * @see \`{@link https://api.jquery.com/val/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -5543,7 +5787,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the current value of the first element in the set of matched elements.
      *
-     * @see {@link https://api.jquery.com/val/}
+     * @see \`{@link https://api.jquery.com/val/ }\`
      * @since 1.0
      */
     val(): string | number | string[] | undefined;
@@ -5554,7 +5798,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *              appended (as a string).
      *              A function returning the width to set. Receives the index position of the element in the set and the
      *              old width as arguments. Within the function, this refers to the current element in the set.
-     * @see {@link https://api.jquery.com/width/}
+     * @see \`{@link https://api.jquery.com/width/ }\`
      * @since 1.0
      * @since 1.4.1
      */
@@ -5562,7 +5806,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
     /**
      * Get the current computed width for the first element in the set of matched elements.
      *
-     * @see {@link https://api.jquery.com/width/}
+     * @see \`{@link https://api.jquery.com/width/ }\`
      * @since 1.0
      */
     width(): number | undefined;
@@ -5575,7 +5819,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                        A callback function returning the HTML content or jQuery object to wrap around the matched elements.
      *                        Receives the index position of the element in the set as an argument. Within the function, this
      *                        refers to the current element in the set.
-     * @see {@link https://api.jquery.com/wrap/}
+     * @see \`{@link https://api.jquery.com/wrap/ }\`
      * @since 1.0
      * @since 1.4
      */
@@ -5588,7 +5832,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                        elements. Within the function, this refers to the first element in the set. Prior to jQuery 3.0, the
      *                        callback was incorrectly called for every element in the set and received the index position of the
      *                        element in the set as an argument.
-     * @see {@link https://api.jquery.com/wrapAll/}
+     * @see \`{@link https://api.jquery.com/wrapAll/ }\`
      * @since 1.2
      * @since 1.4
      */
@@ -5601,7 +5845,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
      *                        A callback function which generates a structure to wrap around the content of the matched elements.
      *                        Receives the index position of the element in the set as an argument. Within the function, this
      *                        refers to the current element in the set.
-     * @see {@link https://api.jquery.com/wrapInner/}
+     * @see \`{@link https://api.jquery.com/wrapInner/ }\`
      * @since 1.2
      * @since 1.4
      */
@@ -5611,6 +5855,7 @@ interface JQuery<TElement extends Node = HTMLElement> extends Iterable<TElement>
 }
 
 // ES5 compatibility
+// tslint:disable-next-line:no-empty-interface
 interface Iterable<T> { }
 
 declare namespace JQuery {
@@ -5679,7 +5924,7 @@ declare namespace JQuery {
         type TextStatus = SuccessTextStatus | ErrorTextStatus;
 
         interface SuccessCallback<TContext> {
-            (this: TContext, data: any, textStatus: SuccessTextStatus, jqXHR: JQuery.jqXHR): void;
+            (this: TContext, data: any, textStatus: SuccessTextStatus, jqXHR: jqXHR): void;
         }
 
         interface ErrorCallback<TContext> {
@@ -5691,7 +5936,7 @@ declare namespace JQuery {
         }
 
         /**
-         * @see {@link http://api.jquery.com/jquery.ajax/#jQuery-ajax-settings}
+         * @see \`{@link http://api.jquery.com/jquery.ajax/#jQuery-ajax-settings }\`
          */
         interface AjaxSettingsBase<TContext> {
             /**
@@ -5730,7 +5975,7 @@ declare namespace JQuery {
              * "timeout", "abort", or "parsererror"). As of jQuery 1.5, the complete setting can accept an array of
              * functions. Each function will be called in turn. This is an Ajax Event.
              */
-            complete?: TypeOrArray<Ajax.CompleteCallback<TContext>>;
+            complete?: TypeOrArray<CompleteCallback<TContext>>;
             /**
              * An object of string/regular-expression pairs that determine how jQuery will parse the response,
              * given its content type.
@@ -5819,7 +6064,7 @@ declare namespace JQuery {
              * 1.5, the error setting can accept an array of functions. Each function will be called in turn. Note:
              * This handler is not called for cross-domain script and cross-domain JSONP requests. This is an Ajax Event.
              */
-            error?: TypeOrArray<Ajax.ErrorCallback<TContext>>;
+            error?: TypeOrArray<ErrorCallback<TContext>>;
             /**
              * Whether to trigger global Ajax event handlers for this request. The default is true. Set to false to
              * prevent the global handlers like ajaxStart or ajaxStop from being triggered. This can be used to
@@ -5905,7 +6150,7 @@ declare namespace JQuery {
              * XMLHttpRequest) object. As of jQuery 1.5, the success setting can accept an array of functions. Each
              * function will be called in turn. This is an Ajax Event.
              */
-            success?: TypeOrArray<Ajax.SuccessCallback<TContext>>;
+            success?: TypeOrArray<SuccessCallback<TContext>>;
             /**
              * Set a timeout (in milliseconds) for the request. A value of 0 means there will be no timeout. This
              * will override any global timeout set with $.ajaxSetup(). The timeout period starts at the point the
@@ -6363,7 +6608,9 @@ declare namespace JQuery {
         };
 
         // Writable properties on XMLHttpRequest
-        interface XHRFields extends Partial<Pick<XMLHttpRequest, 'onreadystatechange' | 'responseType' | 'timeout' | 'withCredentials' | 'msCaching'>> { }
+        interface XHRFields extends Partial<Pick<XMLHttpRequest, 'onreadystatechange' | 'responseType' | 'timeout' | 'withCredentials'>> {
+            msCaching?: string;
+        }
     }
 
     interface Transport {
@@ -6378,7 +6625,7 @@ declare namespace JQuery {
     }
 
     /**
-     * @see {@link http://api.jquery.com/jquery.ajax/#jqXHR}
+     * @see \`{@link http://api.jquery.com/jquery.ajax/#jqXHR }\`
      */
     interface jqXHR<TResolve = any> extends Promise3<TResolve, jqXHR<TResolve>, never,
         Ajax.SuccessTextStatus, Ajax.ErrorTextStatus, never,
@@ -6391,7 +6638,7 @@ declare namespace JQuery {
         /**
          * Determine the current state of a Deferred object.
          *
-         * @see {@link https://api.jquery.com/deferred.state/}
+         * @see \`{@link https://api.jquery.com/deferred.state/ }\`
          * @since 1.7
          */
         state(): 'pending' | 'resolved' | 'rejected';
@@ -6399,19 +6646,10 @@ declare namespace JQuery {
     }
 
     namespace jqXHR {
-        /**
-         * @deprecated
-         */
         interface DoneCallback<TResolve = any, TjqXHR = jqXHR<TResolve>> extends Deferred.Callback3<TResolve, Ajax.SuccessTextStatus, TjqXHR> { }
 
-        /**
-         * @deprecated
-         */
         interface FailCallback<TjqXHR> extends Deferred.Callback3<TjqXHR, Ajax.ErrorTextStatus, string> { }
 
-        /**
-         * @deprecated
-         */
         interface AlwaysCallback<TResolve = any, TjqXHR = jqXHR<TResolve>> extends Deferred.Callback3<TResolve | TjqXHR, Ajax.TextStatus, TjqXHR | string> { }
     }
 
@@ -6419,34 +6657,35 @@ declare namespace JQuery {
 
     // region Callbacks
 
+    // tslint:disable-next-line:ban-types
     interface Callbacks<T extends Function = Function> {
         /**
          * Add a callback or a collection of callbacks to a callback list.
          *
          * @param callback A function, or array of functions, that are to be added to the callback list.
          * @param callbacks A function, or array of functions, that are to be added to the callback list.
-         * @see {@link https://api.jquery.com/callbacks.add/}
+         * @see \`{@link https://api.jquery.com/callbacks.add/ }\`
          * @since 1.7
          */
         add(callback: TypeOrArray<T>, ...callbacks: Array<TypeOrArray<T>>): this;
         /**
          * Disable a callback list from doing anything more.
          *
-         * @see {@link https://api.jquery.com/callbacks.disable/}
+         * @see \`{@link https://api.jquery.com/callbacks.disable/ }\`
          * @since 1.7
          */
         disable(): this;
         /**
          * Determine if the callbacks list has been disabled.
          *
-         * @see {@link https://api.jquery.com/callbacks.disabled/}
+         * @see \`{@link https://api.jquery.com/callbacks.disabled/ }\`
          * @since 1.7
          */
         disabled(): boolean;
         /**
          * Remove all of the callbacks from a list.
          *
-         * @see {@link https://api.jquery.com/callbacks.empty/}
+         * @see \`{@link https://api.jquery.com/callbacks.empty/ }\`
          * @since 1.7
          */
         empty(): this;
@@ -6454,7 +6693,7 @@ declare namespace JQuery {
          * Call all of the callbacks with the given arguments.
          *
          * @param args The argument or list of arguments to pass back to the callback list.
-         * @see {@link https://api.jquery.com/callbacks.fire/}
+         * @see \`{@link https://api.jquery.com/callbacks.fire/ }\`
          * @since 1.7
          */
         fire(...args: any[]): this;
@@ -6463,14 +6702,14 @@ declare namespace JQuery {
          *
          * @param context A reference to the context in which the callbacks in the list should be fired.
          * @param args An argument, or array of arguments, to pass to the callbacks in the list.
-         * @see {@link https://api.jquery.com/callbacks.fireWith/}
+         * @see \`{@link https://api.jquery.com/callbacks.fireWith/ }\`
          * @since 1.7
          */
         fireWith(context: object, args?: ArrayLike<any>): this;
         /**
          * Determine if the callbacks have already been called at least once.
          *
-         * @see {@link https://api.jquery.com/callbacks.fired/}
+         * @see \`{@link https://api.jquery.com/callbacks.fired/ }\`
          * @since 1.7
          */
         fired(): boolean;
@@ -6479,21 +6718,21 @@ declare namespace JQuery {
          * argument, determine whether it is in a list.
          *
          * @param callback The callback to search for.
-         * @see {@link https://api.jquery.com/callbacks.has/}
+         * @see \`{@link https://api.jquery.com/callbacks.has/ }\`
          * @since 1.7
          */
         has(callback?: T): boolean;
         /**
          * Lock a callback list in its current state.
          *
-         * @see {@link https://api.jquery.com/callbacks.lock/}
+         * @see \`{@link https://api.jquery.com/callbacks.lock/ }\`
          * @since 1.7
          */
         lock(): this;
         /**
          * Determine if the callbacks list has been locked.
          *
-         * @see {@link https://api.jquery.com/callbacks.locked/}
+         * @see \`{@link https://api.jquery.com/callbacks.locked/ }\`
          * @since 1.7
          */
         locked(): boolean;
@@ -6501,7 +6740,7 @@ declare namespace JQuery {
          * Remove a callback or a collection of callbacks from a callback list.
          *
          * @param callbacks A function, or array of functions, that are to be removed from the callback list.
-         * @see {@link https://api.jquery.com/callbacks.remove/}
+         * @see \`{@link https://api.jquery.com/callbacks.remove/ }\`
          * @since 1.7
          */
         remove(...callbacks: T[]): this;
@@ -6525,6 +6764,28 @@ declare namespace JQuery {
      */
     interface Thenable<T> extends PromiseLike<T> { }
 
+    // NOTE: This is a private copy of the global Promise interface. It is used by JQuery.PromiseBase to indicate compatibility with other Promise implementations.
+    //       The global Promise interface cannot be used directly as it may be modified, as in the case of @types/bluebird-global.
+    /**
+     * Represents the completion of an asynchronous operation
+     */
+    interface _Promise<T> {
+        /**
+         * Attaches callbacks for the resolution and/or rejection of the Promise.
+         * @param onfulfilled The callback to execute when the Promise is resolved.
+         * @param onrejected The callback to execute when the Promise is rejected.
+         * @returns A Promise for the completion of which ever callback is executed.
+         */
+        then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | null,
+                                             onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | null): _Promise<TResult1 | TResult2>;
+        /**
+         * Attaches a callback for only the rejection of the Promise.
+         * @param onrejected The callback to execute when the Promise is rejected.
+         * @returns A Promise for the completion of the callback.
+         */
+        catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | null): _Promise<T | TResult>;
+    }
+
     // Type parameter guide
     // --------------------
     // Each type parameter represents a parameter in one of the three possible callbacks.
@@ -6544,8 +6805,7 @@ declare namespace JQuery {
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
      *
-     * @see {@link http://api.jquery.com/Types/#Promise}
-     * @deprecated Experimental. Avoid referncing this type directly in your code.
+     * @see \`{@link http://api.jquery.com/Types/#Promise }\`
      */
     interface PromiseBase<TR, TJ, TN,
         UR, UJ, UN,
@@ -6556,7 +6816,7 @@ declare namespace JQuery {
          *
          * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
          * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-         * @see {@link https://api.jquery.com/deferred.always/}
+         * @see \`{@link https://api.jquery.com/deferred.always/ }\`
          * @since 1.6
          */
         always(alwaysCallback: TypeOrArray<Deferred.CallbackBase<TR | TJ, UR | UJ, VR | VJ, SR | SJ>>,
@@ -6566,7 +6826,7 @@ declare namespace JQuery {
          *
          * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
          * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.done/}
+         * @see \`{@link https://api.jquery.com/deferred.done/ }\`
          * @since 1.5
          */
         done(doneCallback: TypeOrArray<Deferred.CallbackBase<TR, UR, VR, SR>>,
@@ -6576,7 +6836,7 @@ declare namespace JQuery {
          *
          * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
          * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @see \`{@link https://api.jquery.com/deferred.fail/ }\`
          * @since 1.5
          */
         fail(failCallback: TypeOrArray<Deferred.CallbackBase<TJ, UJ, VJ, SJ>>,
@@ -6587,7 +6847,7 @@ declare namespace JQuery {
          * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
          * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
          *                          progress notifications.
-         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @see \`{@link https://api.jquery.com/deferred.progress/ }\`
          * @since 1.7
          */
         progress(progressCallback: TypeOrArray<Deferred.CallbackBase<TN, UN, VN, SN>>,
@@ -6596,21 +6856,21 @@ declare namespace JQuery {
          * Return a Deferred's Promise object.
          *
          * @param target Object onto which the promise methods have to be attached
-         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @see \`{@link https://api.jquery.com/deferred.promise/ }\`
          * @since 1.5
          */
         promise<TTarget extends object>(target: TTarget): this & TTarget;
         /**
          * Return a Deferred's Promise object.
          *
-         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @see \`{@link https://api.jquery.com/deferred.promise/ }\`
          * @since 1.5
          */
         promise(): this;
         /**
          * Determine the current state of a Deferred object.
          *
-         * @see {@link https://api.jquery.com/deferred.state/}
+         * @see \`{@link https://api.jquery.com/deferred.state/ }\`
          * @since 1.7
          */
         state(): 'pending' | 'resolved' | 'rejected';
@@ -6623,10 +6883,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
@@ -6639,19 +6900,19 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
             BRD | BRF | BRP, BJD | BJF | BJP, BND | BNF | BNP,
             CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP,
             RRD | RRF | RRP, RJD | RJF | RJP, RND | RNF | RNP>;
@@ -6661,10 +6922,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
@@ -6673,16 +6935,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
             BRF | BRP, BJF | BJP, BNF | BNP,
             CRF | CRP, CJF | CJP, CNF | CNP,
             RRF | RRP, RJF | RJP, RNF | RNP>;
@@ -6692,10 +6954,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
@@ -6704,16 +6967,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: null,
+                progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
             BRD | BRP, BJD | BJP, BND | BNP,
             CRD | CRP, CJD | CJP, CND | CNP,
             RRD | RRP, RJD | RJP, RND | RNP>;
@@ -6723,21 +6986,22 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: null,
+                progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
             BRP, BJP, BNP,
             CRP, CJP, CNP,
             RRP, RJP, RNP>;
@@ -6747,10 +7011,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
@@ -6759,16 +7024,16 @@ declare namespace JQuery {
             ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
             BRD | BRF, BJD | BJF, BND | BNF,
             CRD | CRF, CJD | CJF, CND | CNF,
             RRD | RRF, RJD | RJF, RND | RNF>;
@@ -6778,21 +7043,22 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: null,
-             failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter?: null): PromiseBase<ARF, AJF, ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: null,
+                failFilter: (t: TJ, u: UJ, v: VJ, ...s: SJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter?: null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -6802,21 +7068,22 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link then JQuery.PromiseBase.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
             CRD = never, CJD = never, CND = never,
-            RRD = never, RJD = never, RND = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter?: null,
-             progressFilter?: null): PromiseBase<ARD, AJD, AND,
+            RRD = never, RJD = never, RND = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter?: null,
+                progressFilter?: null): PromiseBase<ARD, AJD, AND,
             BRD, BJD, BND,
             CRD, CJD, CND,
             RRD, RJD, RND>;
@@ -6831,7 +7098,7 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
@@ -6845,19 +7112,19 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             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,
-             progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                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,
+                progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
             BRD | BRF | BRP, BJD | BJF | BJP, BND | BNF | BNP,
             CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP,
             RRD | RRF | RRP, RJD | RJF | RJP, RND | RNF | RNP>;
@@ -6867,7 +7134,7 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARF = never, AJF = never, ANF = never,
@@ -6877,16 +7144,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             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,
-             progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                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,
+                progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
             BRF | BRP, BJF | BJP, BNF | BNP,
             CRF | CRP, CJF | CJP, CNF | CNP,
             RRF | RRP, RJF | RJP, RNF | RNP>;
@@ -6896,7 +7163,7 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
@@ -6906,16 +7173,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: null,
-             progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: null,
+                progressFilter: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
             BRD | BRP, BJD | BJP, BND | BNP,
             CRD | CRP, CJD | CJP, CND | CNP,
             RRD | RRP, RJD | RJP, RND | RNP>;
@@ -6925,19 +7192,19 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: null,
+                progressFilter?: (t: TN, u: UN, v: VN, ...s: SN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
             BRP, BJP, BNP,
             CRP, CJP, CNP,
             RRP, RJP, RNP>;
@@ -6947,7 +7214,7 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
@@ -6957,16 +7224,16 @@ declare namespace JQuery {
             ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             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,
-             progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                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,
+                progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
             BRD | BRF, BJD | BJF, BND | BNF,
             CRD | CRF, CJD | CJF, CND | CNF,
             RRD | RRF, RJD | RJF, RND | RNF>;
@@ -6976,19 +7243,19 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: null,
-             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,
-             progressFilter?: null): PromiseBase<ARF, AJF, ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: null,
+                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,
+                progressFilter?: null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -6998,19 +7265,19 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
             CRD = never, CJD = never, CND = never,
-            RRD = never, RJD = never, RND = never>
-            (doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter?: null,
-             progressFilter?: null): PromiseBase<ARD, AJD, AND,
+            RRD = never, RJD = never, RND = never>(
+                doneFilter: (t: TR, u: UR, v: VR, ...s: SR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter?: null,
+                progressFilter?: null): PromiseBase<ARD, AJD, AND,
             BRD, BJD, BND,
             CRD, CJD, CND,
             RRD, RJD, RND>;
@@ -7021,17 +7288,17 @@ declare namespace JQuery {
          * Add handlers to be called when the Deferred object is rejected.
          *
          * @param failFilter A function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @see \`{@link https://api.jquery.com/deferred.catch/ }\`
          * @since 3.0
          */
         catch<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (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) | null): PromiseBase<ARF, AJF, ANF,
+            RRF = never, RJF = never, RNF = never>(
+                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) | null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -7041,7 +7308,7 @@ declare namespace JQuery {
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
      *
-     * @see {@link http://api.jquery.com/Types/#Promise}
+     * @see \`{@link http://api.jquery.com/Types/#Promise }\`
      */
     interface Promise3<TR, TJ, TN,
         UR, UJ, UN,
@@ -7054,7 +7321,7 @@ declare namespace JQuery {
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
      *
-     * @see {@link http://api.jquery.com/Types/#Promise}
+     * @see \`{@link http://api.jquery.com/Types/#Promise }\`
      */
     interface Promise2<TR, TJ, TN,
         UR, UJ, UN> extends PromiseBase<TR, TJ, TN,
@@ -7066,7 +7333,7 @@ declare namespace JQuery {
      * This object provides a subset of the methods of the Deferred object (then, done, fail, always,
      * pipe, progress, state and promise) to prevent users from changing the state of the Deferred.
      *
-     * @see {@link http://api.jquery.com/Types/#Promise}
+     * @see \`{@link http://api.jquery.com/Types/#Promise }\`
      */
     interface Promise<TR, TJ = any, TN = any> extends PromiseBase<TR, TJ, TN,
         TR, TJ, TN,
@@ -7076,7 +7343,7 @@ declare namespace JQuery {
     interface DeferredStatic {
         // https://jquery.com/upgrade-guide/3.0/#callback-exit
         exceptionHook: any;
-        <TR = any, TJ = any, TN = any>(beforeStart?: (this: JQuery.Deferred<TR, TJ, TN>, deferred: JQuery.Deferred<TR, TJ, TN>) => void): JQuery.Deferred<TR, TJ, TN>;
+        <TR = any, TJ = any, TN = any>(beforeStart?: (this: Deferred<TR, TJ, TN>, deferred: Deferred<TR, TJ, TN>) => void): Deferred<TR, TJ, TN>;
     }
 
     interface Deferred<TR, TJ = any, TN = any> {
@@ -7084,7 +7351,7 @@ declare namespace JQuery {
          * Call the progressCallbacks on a Deferred object with the given args.
          *
          * @param args Optional arguments that are passed to the progressCallbacks.
-         * @see {@link https://api.jquery.com/deferred.notify/}
+         * @see \`{@link https://api.jquery.com/deferred.notify/ }\`
          * @since 1.7
          */
         notify(...args: TN[]): this;
@@ -7093,7 +7360,7 @@ declare namespace JQuery {
          *
          * @param context Context passed to the progressCallbacks as the this object.
          * @param args An optional array of arguments that are passed to the progressCallbacks.
-         * @see {@link https://api.jquery.com/deferred.notifyWith/}
+         * @see \`{@link https://api.jquery.com/deferred.notifyWith/ }\`
          * @since 1.7
          */
         notifyWith(context: object, args?: ArrayLike<TN>): this;
@@ -7101,7 +7368,7 @@ declare namespace JQuery {
          * Reject a Deferred object and call any failCallbacks with the given args.
          *
          * @param args Optional arguments that are passed to the failCallbacks.
-         * @see {@link https://api.jquery.com/deferred.reject/}
+         * @see \`{@link https://api.jquery.com/deferred.reject/ }\`
          * @since 1.5
          */
         reject(...args: TJ[]): this;
@@ -7110,7 +7377,7 @@ declare namespace JQuery {
          *
          * @param context Context passed to the failCallbacks as the this object.
          * @param args An optional array of arguments that are passed to the failCallbacks.
-         * @see {@link https://api.jquery.com/deferred.rejectWith/}
+         * @see \`{@link https://api.jquery.com/deferred.rejectWith/ }\`
          * @since 1.5
          */
         rejectWith(context: object, args?: ArrayLike<TJ>): this;
@@ -7118,7 +7385,7 @@ declare namespace JQuery {
          * Resolve a Deferred object and call any doneCallbacks with the given args.
          *
          * @param args Optional arguments that are passed to the doneCallbacks.
-         * @see {@link https://api.jquery.com/deferred.resolve/}
+         * @see \`{@link https://api.jquery.com/deferred.resolve/ }\`
          * @since 1.5
          */
         resolve(...args: TR[]): this;
@@ -7127,7 +7394,7 @@ declare namespace JQuery {
          *
          * @param context Context passed to the doneCallbacks as the this object.
          * @param args An optional array of arguments that are passed to the doneCallbacks.
-         * @see {@link https://api.jquery.com/deferred.resolveWith/}
+         * @see \`{@link https://api.jquery.com/deferred.resolveWith/ }\`
          * @since 1.5
          */
         resolveWith(context: object, args?: ArrayLike<TR>): this;
@@ -7137,7 +7404,7 @@ declare namespace JQuery {
          *
          * @param alwaysCallback A function, or array of functions, that is called when the Deferred is resolved or rejected.
          * @param alwaysCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved or rejected.
-         * @see {@link https://api.jquery.com/deferred.always/}
+         * @see \`{@link https://api.jquery.com/deferred.always/ }\`
          * @since 1.6
          */
         always(alwaysCallback: TypeOrArray<Deferred.Callback<TR | TJ>>,
@@ -7147,7 +7414,7 @@ declare namespace JQuery {
          *
          * @param doneCallback A function, or array of functions, that are called when the Deferred is resolved.
          * @param doneCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is resolved.
-         * @see {@link https://api.jquery.com/deferred.done/}
+         * @see \`{@link https://api.jquery.com/deferred.done/ }\`
          * @since 1.5
          */
         done(doneCallback: TypeOrArray<Deferred.Callback<TR>>,
@@ -7157,7 +7424,7 @@ declare namespace JQuery {
          *
          * @param failCallback A function, or array of functions, that are called when the Deferred is rejected.
          * @param failCallbacks Optional additional functions, or arrays of functions, that are called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.fail/}
+         * @see \`{@link https://api.jquery.com/deferred.fail/ }\`
          * @since 1.5
          */
         fail(failCallback: TypeOrArray<Deferred.Callback<TJ>>,
@@ -7168,7 +7435,7 @@ declare namespace JQuery {
          * @param progressCallback A function, or array of functions, to be called when the Deferred generates progress notifications.
          * @param progressCallbacks Optional additional functions, or arrays of functions, to be called when the Deferred generates
          *                          progress notifications.
-         * @see {@link https://api.jquery.com/deferred.progress/}
+         * @see \`{@link https://api.jquery.com/deferred.progress/ }\`
          * @since 1.7
          */
         progress(progressCallback: TypeOrArray<Deferred.Callback<TN>>,
@@ -7177,21 +7444,21 @@ declare namespace JQuery {
          * Return a Deferred's Promise object.
          *
          * @param target Object onto which the promise methods have to be attached
-         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @see \`{@link https://api.jquery.com/deferred.promise/ }\`
          * @since 1.5
          */
-        promise<TTarget extends object>(target: TTarget): JQuery.Promise<TR, TJ, TN> & TTarget;
+        promise<TTarget extends object>(target: TTarget): Promise<TR, TJ, TN> & TTarget;
         /**
          * Return a Deferred's Promise object.
          *
-         * @see {@link https://api.jquery.com/deferred.promise/}
+         * @see \`{@link https://api.jquery.com/deferred.promise/ }\`
          * @since 1.5
          */
-        promise(): JQuery.Promise<TR, TJ, TN>;
+        promise(): Promise<TR, TJ, TN>;
         /**
          * Determine the current state of a Deferred object.
          *
-         * @see {@link https://api.jquery.com/deferred.state/}
+         * @see \`{@link https://api.jquery.com/deferred.state/ }\`
          * @since 1.7
          */
         state(): 'pending' | 'resolved' | 'rejected';
@@ -7204,10 +7471,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
@@ -7220,19 +7488,19 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
             BRD | BRF | BRP, BJD | BJF | BJP, BND | BNF | BNP,
             CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP,
             RRD | RRF | RRP, RJD | RJF | RJP, RND | RNF | RNP>;
@@ -7242,10 +7510,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
@@ -7254,16 +7523,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
             BRF | BRP, BJF | BJP, BNF | BNP,
             CRF | CRP, CJF | CJP, CNF | CNP,
             RRF | RRP, RJF | RJP, RNF | RNP>;
@@ -7273,10 +7542,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
@@ -7285,16 +7555,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: null,
+                progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
             BRD | BRP, BJD | BJP, BND | BNP,
             CRD | CRP, CJD | CJP, CND | CNP,
             RRD | RRP, RJD | RJP, RND | RNP>;
@@ -7304,21 +7574,22 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter?: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: null,
+                progressFilter?: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
             BRP, BJP, BNP,
             CRP, CJP, CNP,
             RRP, RJP, RNP>;
@@ -7328,10 +7599,11 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
@@ -7340,16 +7612,16 @@ declare namespace JQuery {
             ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
             BRD | BRF, BJD | BJF, BND | BNF,
             CRD | CRF, CJD | CJF, CND | CNF,
             RRD | RRF, RJD | RJF, RND | RNF>;
@@ -7359,21 +7631,22 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<AJF> | AJF,
-             progressFilter?: null): PromiseBase<ARF, AJF, ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: null,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<AJF> | AJF,
+                progressFilter?: null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -7383,21 +7656,22 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.pipe/}
+         * @see \`{@link https://api.jquery.com/deferred.pipe/ }\`
          * @since 1.6
          * @since 1.7
-         * @deprecated 1.8
+         *
+         * @deprecated Deprecated since 1.8. Use \`{@link JQuery.Deferred.then }\`.
          */
         pipe<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
             CRD = never, CJD = never, CND = never,
-            RRD = never, RJD = never, RND = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter?: null,
-             progressFilter?: null): PromiseBase<ARD, AJD, AND,
+            RRD = never, RJD = never, RND = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter?: null,
+                progressFilter?: null): PromiseBase<ARD, AJD, AND,
             BRD, BJD, BND,
             CRD, CJD, CND,
             RRD, RJD, RND>;
@@ -7412,7 +7686,7 @@ declare namespace JQuery {
          * @param doneFilter A function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
@@ -7426,19 +7700,19 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<ARF> | ARF,
-             progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<ARF> | ARF,
+                progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARF | ARP, AJD | AJF | AJP, AND | ANF | ANP,
             BRD | BRF | BRP, BJD | BJF | BJP, BND | BNF | BNP,
             CRD | CRF | CRP, CJD | CJF | CJP, CND | CNF | CNP,
             RRD | RRF | RRP, RJD | RJF | RJP, RND | RNF | RNP>;
@@ -7448,7 +7722,7 @@ declare namespace JQuery {
          * @param doneFilter A function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARF = never, AJF = never, ANF = never,
@@ -7458,16 +7732,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<ARF> | ARF,
-             progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<ARF> | ARF,
+                progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARF | ARP, AJF | AJP, ANF | ANP,
             BRF | BRP, BJF | BJP, BNF | BNP,
             CRF | CRP, CJF | CJP, CNF | CNP,
             RRF | RRP, RJF | RJP, RNF | RNP>;
@@ -7477,7 +7751,7 @@ declare namespace JQuery {
          * @param doneFilter A function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
@@ -7487,16 +7761,16 @@ declare namespace JQuery {
             ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: null,
-             progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: null,
+                progressFilter: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARD | ARP, AJD | AJP, AND | ANP,
             BRD | BRP, BJD | BJP, BND | BNP,
             CRD | CRP, CJD | CJP, CND | CNP,
             RRD | RRP, RJD | RJP, RND | RNP>;
@@ -7506,19 +7780,19 @@ declare namespace JQuery {
          * @param doneFilter A function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARP = never, AJP = never, ANP = never,
             BRP = never, BJP = never, BNP = never,
             CRP = never, CJP = never, CNP = never,
-            RRP = never, RJP = never, RNP = never>
-            (doneFilter: null,
-             failFilter: null,
-             progressFilter?: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
-                 BRP, BJP, BNP,
-                 CRP, CJP, CNP,
-                 RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
+            RRP = never, RJP = never, RNP = never>(
+                doneFilter: null,
+                failFilter: null,
+                progressFilter?: (...t: TN[]) => PromiseBase<ARP, AJP, ANP,
+                    BRP, BJP, BNP,
+                    CRP, CJP, CNP,
+                    RRP, RJP, RNP> | Thenable<ANP> | ANP): PromiseBase<ARP, AJP, ANP,
             BRP, BJP, BNP,
             CRP, CJP, CNP,
             RRP, RJP, RNP>;
@@ -7528,7 +7802,7 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
@@ -7538,16 +7812,16 @@ declare namespace JQuery {
             ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<ARF> | ARF,
-             progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<ARF> | ARF,
+                progressFilter?: null): PromiseBase<ARD | ARF, AJD | AJF, AND | ANF,
             BRD | BRF, BJD | BJF, BND | BNF,
             CRD | CRF, CJD | CJF, CND | CNF,
             RRD | RRF, RJD | RJF, RND | RNF>;
@@ -7557,19 +7831,19 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (doneFilter: null,
-             failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                 BRF, BJF, BNF,
-                 CRF, CJF, CNF,
-                 RRF, RJF, RNF> | Thenable<ARF> | ARF,
-             progressFilter?: null): PromiseBase<ARF, AJF, ANF,
+            RRF = never, RJF = never, RNF = never>(
+                doneFilter: null,
+                failFilter: (...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<ARF> | ARF,
+                progressFilter?: null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -7579,19 +7853,19 @@ declare namespace JQuery {
          * @param doneFilter An optional function that is called when the Deferred is resolved.
          * @param failFilter An optional function that is called when the Deferred is rejected.
          * @param progressFilter An optional function that is called when progress notifications are sent to the Deferred.
-         * @see {@link https://api.jquery.com/deferred.then/}
+         * @see \`{@link https://api.jquery.com/deferred.then/ }\`
          * @since 1.8
          */
         then<ARD = never, AJD = never, AND = never,
             BRD = never, BJD = never, BND = never,
             CRD = never, CJD = never, CND = never,
-            RRD = never, RJD = never, RND = never>
-            (doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
-                 BRD, BJD, BND,
-                 CRD, CJD, CND,
-                 RRD, RJD, RND> | Thenable<ARD> | ARD,
-             failFilter?: null,
-             progressFilter?: null): PromiseBase<ARD, AJD, AND,
+            RRD = never, RJD = never, RND = never>(
+                doneFilter: (...t: TR[]) => PromiseBase<ARD, AJD, AND,
+                    BRD, BJD, BND,
+                    CRD, CJD, CND,
+                    RRD, RJD, RND> | Thenable<ARD> | ARD,
+                failFilter?: null,
+                progressFilter?: null): PromiseBase<ARD, AJD, AND,
             BRD, BJD, BND,
             CRD, CJD, CND,
             RRD, RJD, RND>;
@@ -7602,17 +7876,17 @@ declare namespace JQuery {
          * Add handlers to be called when the Deferred object is rejected.
          *
          * @param failFilter A function that is called when the Deferred is rejected.
-         * @see {@link https://api.jquery.com/deferred.catch/}
+         * @see \`{@link https://api.jquery.com/deferred.catch/ }\`
          * @since 3.0
          */
         catch<ARF = never, AJF = never, ANF = never,
             BRF = never, BJF = never, BNF = never,
             CRF = never, CJF = never, CNF = never,
-            RRF = never, RJF = never, RNF = never>
-            (failFilter?: ((...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
-                BRF, BJF, BNF,
-                CRF, CJF, CNF,
-                RRF, RJF, RNF> | Thenable<ARF> | ARF) | null): PromiseBase<ARF, AJF, ANF,
+            RRF = never, RJF = never, RNF = never>(
+                failFilter?: ((...t: TJ[]) => PromiseBase<ARF, AJF, ANF,
+                    BRF, BJF, BNF,
+                    CRF, CJF, CNF,
+                    RRF, RJF, RNF> | Thenable<ARF> | ARF) | null): PromiseBase<ARF, AJF, ANF,
             BRF, BJF, BNF,
             CRF, CJF, CNF,
             RRF, RJF, RNF>;
@@ -7630,22 +7904,22 @@ declare namespace JQuery {
         }
 
         /**
-         * @deprecated
+         * @deprecated Use \`{@link JQuery.Deferred.Callback }\`.
          */
         interface DoneCallback<TResolve> extends Callback<TResolve> { }
 
         /**
-         * @deprecated
+         * @deprecated Use \`{@link JQuery.Deferred.Callback }\`.
          */
         interface FailCallback<TReject> extends Callback<TReject> { }
 
         /**
-         * @deprecated
+         * @deprecated Use \`{@link JQuery.Deferred.Callback }\`.
          */
         interface AlwaysCallback<TResolve, TReject> extends Callback<TResolve | TReject> { }
 
         /**
-         * @deprecated
+         * @deprecated Use \`{@link JQuery.Deferred.Callback }\`.
          */
         interface ProgressCallback<TNotify> extends Callback<TNotify> { }
     }
@@ -7663,14 +7937,14 @@ declare namespace JQuery {
     }
 
     /**
-     * @see {@link https://api.jquery.com/animate/#animate-properties-options}
+     * @see \`{@link https://api.jquery.com/animate/#animate-properties-options }\`
      */
     interface EffectsOptions<TElement> {
         /**
          * A function to be called when the animation on an element completes or stops without completing (its
          * Promise object is either resolved or rejected).
          */
-        always?(this: TElement, animation: JQuery.Promise<any>, jumpedToEnd: boolean): void;
+        always?(this: TElement, animation: Promise<any>, jumpedToEnd: boolean): void;
         /**
          * A function that is called once the animation on an element is complete.
          */
@@ -7678,7 +7952,7 @@ declare namespace JQuery {
         /**
          * A function to be called when the animation on an element completes (its Promise object is resolved).
          */
-        done?(this: TElement, animation: JQuery.Promise<any>, jumpedToEnd: boolean): void;
+        done?(this: TElement, animation: Promise<any>, jumpedToEnd: boolean): void;
         /**
          * A string or number determining how long the animation will run.
          */
@@ -7690,12 +7964,12 @@ declare namespace JQuery {
         /**
          * A function to be called when the animation on an element fails to complete (its Promise object is rejected).
          */
-        fail?(this: TElement, animation: JQuery.Promise<any>, jumpedToEnd: boolean): void;
+        fail?(this: TElement, animation: Promise<any>, jumpedToEnd: boolean): void;
         /**
          * A function to be called after each step of the animation, only once per animated element regardless
          * of the number of animated properties.
          */
-        progress?(this: TElement, animation: JQuery.Promise<any>, progress: number, remainingMs: number): void;
+        progress?(this: TElement, animation: Promise<any>, progress: number, remainingMs: number): void;
         /**
          * A Boolean indicating whether to place the animation in the effects queue. If false, the animation
          * will begin immediately. As of jQuery 1.7, the queue option can also accept a string, in which case
@@ -7711,7 +7985,7 @@ declare namespace JQuery {
         /**
          * A function to call when the animation on an element begins.
          */
-        start?(this: TElement, animation: JQuery.Promise<any>): void;
+        start?(this: TElement, animation: Promise<any>): void;
         /**
          * A function to be called for each animated property of each animated element. This function provides
          * an opportunity to modify the Tween object to change the value of the property before it is set.
@@ -7751,7 +8025,7 @@ declare namespace JQuery {
     }
 
     interface AnimationHook<TElement> {
-        (fx: JQuery.Tween<TElement>): void;
+        (fx: Tween<TElement>): void;
     }
 
     // endregion
@@ -7763,11 +8037,15 @@ declare namespace JQuery {
     // This should be a class but doesn't work correctly under the JQuery namespace. Event should be an inner class of jQuery.
 
     // Static members
-    interface EventStatic<TTarget = EventTarget> {
-        <T extends object>(event: string, properties?: T): JQuery.Event<TTarget> & T;
-        <T extends EventLike>(properties: T): JQuery.Event<TTarget> & T;
-        new <T extends object>(event: string, properties?: T): JQuery.Event<TTarget> & T;
-        new <T extends EventLike>(properties: T): JQuery.Event<TTarget> & T;
+    interface EventStatic {
+        // tslint:disable-next-line:no-unnecessary-generics
+        <T extends object, TTarget extends EventTarget = HTMLElement>(event: string, properties?: T): Event<TTarget> & T;
+        // tslint:disable-next-line:no-unnecessary-generics
+        <T extends EventLike, TTarget extends EventTarget = HTMLElement>(properties: T): Event<TTarget> & T;
+        // tslint:disable-next-line:no-unnecessary-generics
+        new <T extends object, TTarget extends EventTarget = HTMLElement>(event: string, properties?: T): Event<TTarget> & T;
+        // tslint:disable-next-line:no-unnecessary-generics
+        new <T extends EventLike, TTarget extends EventTarget = HTMLElement>(properties: T): Event<TTarget> & T;
     }
 
     // Instance members
@@ -7775,98 +8053,98 @@ declare namespace JQuery {
         /**
          * Indicates whether the META key was pressed when the event fired.
          *
-         * @see {@link https://api.jquery.com/event.metaKey/}
+         * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
          * @since 1.0.4
          */
         metaKey: boolean;
         /**
          * The namespace specified when the event was triggered.
          *
-         * @see {@link https://api.jquery.com/event.namespace/}
+         * @see \`{@link https://api.jquery.com/event.namespace/ }\`
          * @since 1.4.3
          */
         namespace: string;
         /**
          * The mouse position relative to the left edge of the document.
          *
-         * @see {@link https://api.jquery.com/event.pageX/}
+         * @see \`{@link https://api.jquery.com/event.pageX/ }\`
          * @since 1.0.4
          */
         pageX: number;
         /**
          * The mouse position relative to the top edge of the document.
          *
-         * @see {@link https://api.jquery.com/event.pageY/}
+         * @see \`{@link https://api.jquery.com/event.pageY/ }\`
          * @since 1.0.4
          */
         pageY: number;
         /**
          * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
          *
-         * @see {@link https://api.jquery.com/event.result/}
+         * @see \`{@link https://api.jquery.com/event.result/ }\`
          * @since 1.3
          */
         result: any;
         /**
          * The difference in milliseconds between the time the browser created the event and January 1, 1970.
          *
-         * @see {@link https://api.jquery.com/event.timeStamp/}
+         * @see \`{@link https://api.jquery.com/event.timeStamp/ }\`
          * @since 1.2.6
          */
         timeStamp: number;
         /**
          * Describes the nature of the event.
          *
-         * @see {@link https://api.jquery.com/event.type/}
+         * @see \`{@link https://api.jquery.com/event.type/ }\`
          * @since 1.0
          */
         type: string;
         /**
          * For key or mouse events, this property indicates the specific key or button that was pressed.
          *
-         * @see {@link https://api.jquery.com/event.which/}
+         * @see \`{@link https://api.jquery.com/event.which/ }\`
          * @since 1.1.3
          */
         which: number;
         /**
          * Returns whether event.preventDefault() was ever called on this event object.
          *
-         * @see {@link https://api.jquery.com/event.isDefaultPrevented/}
+         * @see \`{@link https://api.jquery.com/event.isDefaultPrevented/ }\`
          * @since 1.3
          */
         isDefaultPrevented(): boolean;
         /**
          * Returns whether event.stopImmediatePropagation() was ever called on this event object.
          *
-         * @see {@link https://api.jquery.com/event.isImmediatePropagationStopped/}
+         * @see \`{@link https://api.jquery.com/event.isImmediatePropagationStopped/ }\`
          * @since 1.3
          */
         isImmediatePropagationStopped(): boolean;
         /**
          * Returns whether event.stopPropagation() was ever called on this event object.
          *
-         * @see {@link https://api.jquery.com/event.isPropagationStopped/}
+         * @see \`{@link https://api.jquery.com/event.isPropagationStopped/ }\`
          * @since 1.3
          */
         isPropagationStopped(): boolean;
         /**
          * If this method is called, the default action of the event will not be triggered.
          *
-         * @see {@link https://api.jquery.com/event.preventDefault/}
+         * @see \`{@link https://api.jquery.com/event.preventDefault/ }\`
          * @since 1.0
          */
         preventDefault(): void;
         /**
          * Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree.
          *
-         * @see {@link https://api.jquery.com/event.stopImmediatePropagation/}
+         * @see \`{@link https://api.jquery.com/event.stopImmediatePropagation/ }\`
          * @since 1.3
          */
         stopImmediatePropagation(): void;
         /**
          * Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
          *
-         * @see {@link https://api.jquery.com/event.stopPropagation/}
+         * @see \`{@link https://api.jquery.com/event.stopPropagation/ }\`
          * @since 1.0
          */
         stopPropagation(): void;
@@ -7881,21 +8159,21 @@ declare namespace JQuery {
         /**
          * The current DOM element within the event bubbling phase.
          *
-         * @see {@link https://api.jquery.com/event.currentTarget/}
+         * @see \`{@link https://api.jquery.com/event.currentTarget/ }\`
          * @since 1.3
          */
         currentTarget: TTarget;
         /**
          * An optional object of data passed to an event method when the current executing handler is bound.
          *
-         * @see {@link https://api.jquery.com/event.data/}
+         * @see \`{@link https://api.jquery.com/event.data/ }\`
          * @since 1.1
          */
         data: TData;
         /**
          * The element where the currently-called jQuery event handler was attached.
          *
-         * @see {@link https://api.jquery.com/event.delegateTarget/}
+         * @see \`{@link https://api.jquery.com/event.delegateTarget/ }\`
          * @since 1.7
          */
         delegateTarget: TTarget;
@@ -7903,14 +8181,14 @@ declare namespace JQuery {
         /**
          * The other DOM element involved in the event, if any.
          *
-         * @see {@link https://api.jquery.com/event.relatedTarget/}
+         * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
          * @since 1.1.4
          */
         relatedTarget: TTarget | null;
         /**
          * The DOM element that initiated the event.
          *
-         * @see {@link https://api.jquery.com/event.target/}
+         * @see \`{@link https://api.jquery.com/event.target/ }\`
          * @since 1.0
          */
         target: TTarget;
@@ -7922,14 +8200,15 @@ declare namespace JQuery {
 
     // endregion
 
-    interface EventHandler<TCurrentTarget extends EventTarget, TData = null> extends EventHandlerBase<TCurrentTarget, JQuery.Event<TCurrentTarget, TData>> { }
+    interface EventHandler<TCurrentTarget, TData = null> extends EventHandlerBase<TCurrentTarget, Event<TCurrentTarget, TData>> { }
 
-    interface EventHandlerBase<TContext extends object, T> {
+    interface EventHandlerBase<TContext, T> {
         // Extra parameters can be passed from trigger()
         (this: TContext, t: T, ...args: any[]): void | false | any;
     }
 
     // Provided for convenience for use with jQuery.Event.which
+    // tslint:disable-next-line:no-const-enum
     const enum Mouse {
         None = 0,
         Left = 1,
@@ -7938,6 +8217,7 @@ declare namespace JQuery {
     }
 
     // Provided for convenience for use with jQuery.Event.which
+    // tslint:disable-next-line:no-const-enum
     const enum Key {
         Backspace = 8,
         Tab = 9,
@@ -8066,6 +8346,12 @@ declare namespace JQuery {
         top: number;
     }
 
+    // Workaround for TypeScript 2.3 which does not have support for weak types handling.
+    type CoordinatesPartial =
+        Pick<Coordinates, 'left'> |
+        Pick<Coordinates, 'top'> |
+        { [key: string]: never; };
+
     interface ValHook<TElement> {
         get?(elem: TElement): any;
         set?(elem: TElement, value: any): any;
@@ -8074,33 +8360,40 @@ declare namespace JQuery {
 
 // region Legacy types
 
-interface JQueryCallback extends JQuery.Callbacks<Function> { }
+// tslint:disable-next-line:no-empty-interface
+interface JQueryCallback extends JQuery.Callbacks { }
 interface JQueryDeferred<T> extends JQuery.Deferred<T> { }
-interface JQueryEventConstructor extends JQuery.Event<EventTarget> { }
+// tslint:disable-next-line:no-empty-interface
+interface JQueryEventConstructor extends JQuery.EventStatic { }
 interface JQueryDeferred<T> extends JQuery.Deferred<T> { }
+// tslint:disable-next-line:no-empty-interface
 interface JQueryAjaxSettings extends JQuery.AjaxSettings { }
 interface JQueryAnimationOptions extends JQuery.EffectsOptions<Element> { }
+// tslint:disable-next-line:no-empty-interface
 interface JQueryCoordinates extends JQuery.Coordinates { }
 interface JQueryGenericPromise<T> extends JQuery.Thenable<T> { }
+// tslint:disable-next-line:no-empty-interface
 interface JQueryXHR extends JQuery.jqXHR { }
 interface JQueryPromise<T> extends JQuery.Promise<T> { }
+// tslint:disable-next-line:no-empty-interface
 interface JQuerySerializeArrayElement extends JQuery.NameValuePair { }
 
 /**
- * @deprecated 1.9
+ * @deprecated Deprecated since 1.9. See \`{@link https://api.jquery.com/jQuery.support/ }\`.
  */
+// tslint:disable-next-line:no-empty-interface
 interface JQuerySupport extends JQuery.PlainObject { }
 
 // Legacy types that are not represented in the current type definitions are marked deprecated.
 
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQuery.Deferred.Callback }\` or \`{@link JQuery.Deferred.CallbackBase }\`.
  */
 interface JQueryPromiseCallback<T> {
     (value?: T, ...args: any[]): void;
 }
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQueryStatic.param JQueryStatic&#91;'param'&#93;}\`.
  */
 interface JQueryParam {
     /**
@@ -8112,102 +8405,102 @@ interface JQueryParam {
     (obj: any, traditional?: boolean): string;
 }
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQuery.Event }\`.
  */
 interface BaseJQueryEventObject extends Event {
     /**
      * The current DOM element within the event bubbling phase.
-     * @see {@link https://api.jquery.com/event.currentTarget/}
+     * @see \`{@link https://api.jquery.com/event.currentTarget/ }\`
      */
     currentTarget: Element;
     /**
      * An optional object of data passed to an event method when the current executing handler is bound.
-     * @see {@link https://api.jquery.com/event.data/}
+     * @see \`{@link https://api.jquery.com/event.data/ }\`
      */
     data: any;
     /**
      * The element where the currently-called jQuery event handler was attached.
-     * @see {@link https://api.jquery.com/event.delegateTarget/}
+     * @see \`{@link https://api.jquery.com/event.delegateTarget/ }\`
      */
     delegateTarget: Element;
     /**
      * Returns whether event.preventDefault() was ever called on this event object.
-     * @see {@link https://api.jquery.com/event.isDefaultPrevented/}
+     * @see \`{@link https://api.jquery.com/event.isDefaultPrevented/ }\`
      */
     isDefaultPrevented(): boolean;
     /**
      * Returns whether event.stopImmediatePropagation() was ever called on this event object.
-     * @see {@link https://api.jquery.com/event.isImmediatePropagationStopped/}
+     * @see \`{@link https://api.jquery.com/event.isImmediatePropagationStopped/ }\`
      */
     isImmediatePropagationStopped(): boolean;
     /**
      * Returns whether event.stopPropagation() was ever called on this event object.
-     * @see {@link https://api.jquery.com/event.isPropagationStopped/}
+     * @see \`{@link https://api.jquery.com/event.isPropagationStopped/ }\`
      */
     isPropagationStopped(): boolean;
     /**
      * The namespace specified when the event was triggered.
-     * @see {@link https://api.jquery.com/event.namespace/}
+     * @see \`{@link https://api.jquery.com/event.namespace/ }\`
      */
     namespace: string;
     /**
      * The browser's original Event object.
-     * @see {@link https://api.jquery.com/category/events/event-object/}
+     * @see \`{@link https://api.jquery.com/category/events/event-object/ }\`
      */
     originalEvent: Event;
     /**
      * If this method is called, the default action of the event will not be triggered.
-     * @see {@link https://api.jquery.com/event.preventDefault/}
+     * @see \`{@link https://api.jquery.com/event.preventDefault/ }\`
      */
     preventDefault(): any;
     /**
      * The other DOM element involved in the event, if any.
-     * @see {@link https://api.jquery.com/event.relatedTarget/}
+     * @see \`{@link https://api.jquery.com/event.relatedTarget/ }\`
      */
     relatedTarget: Element;
     /**
      * The last value returned by an event handler that was triggered by this event, unless the value was undefined.
-     * @see {@link https://api.jquery.com/event.result/}
+     * @see \`{@link https://api.jquery.com/event.result/ }\`
      */
     result: any;
     /**
      * Keeps the rest of the handlers from being executed and prevents the event from bubbling up the DOM tree.
-     * @see {@link https://api.jquery.com/event.stopImmediatePropagation/}
+     * @see \`{@link https://api.jquery.com/event.stopImmediatePropagation/ }\`
      */
     stopImmediatePropagation(): void;
     /**
      * Prevents the event from bubbling up the DOM tree, preventing any parent handlers from being notified of the event.
-     * @see {@link https://api.jquery.com/event.stopPropagation/}
+     * @see \`{@link https://api.jquery.com/event.stopPropagation/ }\`
      */
     stopPropagation(): void;
     /**
      * The DOM element that initiated the event.
-     * @see {@link https://api.jquery.com/event.target/}
+     * @see \`{@link https://api.jquery.com/event.target/ }\`
      */
     target: Element;
     /**
      * The mouse position relative to the left edge of the document.
-     * @see {@link https://api.jquery.com/event.pageX/}
+     * @see \`{@link https://api.jquery.com/event.pageX/ }\`
      */
     pageX: number;
     /**
      * The mouse position relative to the top edge of the document.
-     * @see {@link https://api.jquery.com/event.pageY/}
+     * @see \`{@link https://api.jquery.com/event.pageY/ }\`
      */
     pageY: number;
     /**
      * For key or mouse events, this property indicates the specific key or button that was pressed.
-     * @see {@link https://api.jquery.com/event.which/}
+     * @see \`{@link https://api.jquery.com/event.which/ }\`
      */
     which: number;
     /**
      * Indicates whether the META key was pressed when the event fired.
-     * @see {@link https://api.jquery.com/event.metaKey/}
+     * @see \`{@link https://api.jquery.com/event.metaKey/ }\`
      */
     metaKey: boolean;
 }
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQuery.Event }\`.
  */
 interface JQueryInputEventObject extends BaseJQueryEventObject {
     altKey: boolean;
@@ -8216,7 +8509,7 @@ interface JQueryInputEventObject extends BaseJQueryEventObject {
     shiftKey: boolean;
 }
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQuery.Event }\`.
  */
 interface JQueryMouseEventObject extends JQueryInputEventObject {
     button: number;
@@ -8230,7 +8523,7 @@ interface JQueryMouseEventObject extends JQueryInputEventObject {
     screenY: number;
 }
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQuery.Event }\`.
  */
 interface JQueryKeyEventObject extends JQueryInputEventObject {
     char: any;
@@ -8239,7 +8532,7 @@ interface JQueryKeyEventObject extends JQueryInputEventObject {
     keyCode: number;
 }
 /**
- * @deprecated
+ * @deprecated Use \`{@link JQuery.Event }\`.
  */
 interface JQueryEventObject extends BaseJQueryEventObject, JQueryInputEventObject, JQueryMouseEventObject, JQueryKeyEventObject { }
 /**
@@ -8250,13 +8543,13 @@ interface JQueryPromiseOperator<T, U> {
      ...callbacksN: Array<JQuery.TypeOrArray<JQueryPromiseCallback<any>>>): JQueryPromise<U>;
 }
 /**
- * @deprecated
+ * @deprecated Internal. See \`{@link https://github.com/jquery/api.jquery.com/issues/912 }\`.
  */
 interface JQueryEasingFunction {
     (percent: number): number;
 }
 /**
- * @deprecated
+ * @deprecated Internal. See \`{@link https://github.com/jquery/api.jquery.com/issues/912 }\`.
  */
 interface JQueryEasingFunctions {
     [name: string]: JQueryEasingFunction;
diff --git a/types/jquery/jquery-tests.ts b/types/jquery/jquery-tests.ts
index 47a85b80d2..417d2e7941 100644
--- a/types/jquery/jquery-tests.ts
+++ b/types/jquery/jquery-tests.ts
@@ -1,8 +1,4 @@
 function JQueryStatic() {
-    function type_assertion() {
-        const $Canvas = $ as JQueryStatic<HTMLCanvasElement>;
-    }
-
     function type_annotation() {
         const jq: JQueryStatic = $;
     }
@@ -21,6 +17,9 @@ function JQueryStatic() {
             }
         });
 
+        // $ExpectType JQuery<HTMLParagraphElement>
+        $<HTMLParagraphElement>('<p></p>');
+
         // $ExpectType JQuery<HTMLElement>
         $('span', new HTMLElement());
 
@@ -33,31 +32,83 @@ function JQueryStatic() {
         // $ExpectType JQuery<HTMLElement>
         $('span');
 
-        // $ExpectType JQuery<HTMLElement>
-        $('<p></p>');
+        // $ExpectType JQuery<SVGLineElement>
+        $<SVGLineElement>('.mysvgline');
 
-        // $ExpectType JQuery<HTMLElement>
-        $(new HTMLElement());
+        // $ExpectType JQuery<HTMLParagraphElement>
+        $(new HTMLParagraphElement());
 
-        // $ExpectType JQuery<HTMLElement>
-        $([new HTMLElement()]);
+        // $ExpectType JQuery<HTMLParagraphElement>
+        $([new HTMLParagraphElement()]);
 
-        // $ExpectType JQuery<HTMLElement>
+        // $ExpectType JQuery<{ foo: string; hello: string; }>
         $({ foo: 'bar', hello: 'world' });
 
-        // $ExpectType JQuery<HTMLElement>
-        $($('p'));
+        // $ExpectType JQuery<SVGSVGElement>
+        $($(document.createElementNS("http://www.w3.org/2000/svg", "svg")));
 
         // $ExpectType JQuery<HTMLElement>
         $(function($) {
             // $ExpectType Document
             this;
-            // $ExpectType JQueryStatic<HTMLElement>
+            // $ExpectType JQueryStatic
+            $;
+        });
+
+        // $ExpectType JQuery<Element>
+        $<Element>(function($) {
+            // $ExpectType Document
+            this;
+            // $ExpectType JQueryStatic
             $;
         });
 
         // $ExpectType JQuery<HTMLElement>
         $();
+
+        // $ExpectType JQuery<Element>
+        $<Element>();
+
+        // $ExpectType JQuery<HTMLSelectElement>
+        $(new HTMLSelectElement());
+
+        // $ExpectType JQuery<HTMLSelectElement>
+        $([new HTMLSelectElement()]);
+
+        // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/19597#issuecomment-378218432
+        function issue_19597_378218432() {
+            const myDiv = $(document.createElement('div'));
+            // $ExpectType JQuery<HTMLDivElement>
+            myDiv;
+            myDiv.on('click', (evt) => {
+                const target = evt.target;
+                // $ExpectType HTMLDivElement
+                target;
+            });
+            const myDiv1 = $<HTMLDivElement>(document.createElement('div'));
+
+            const myForcedDiv: JQuery<HTMLDivElement> = $(document.createElement('div')) as any;
+            myForcedDiv.on('click', (evt) => {
+                const target = evt.target; // HTMLDivElement
+                // $ExpectType HTMLDivElement
+                target;
+            });
+            const myDoc = $(document);
+            // $ExpectType JQuery<Document>
+            myDoc;
+            myDoc.on('click', (evt) => {
+                const target = evt.target;
+                // $ExpectType Document
+                target;
+            });
+            const myDocForced: JQuery<Document> = $(document);
+            const myWindow = $(window);
+            // $ExpectType JQuery<Window>
+            myWindow;
+            const myWindowForced: JQuery<Window> = $(window);
+            // $ExpectType JQuery<Window>
+            myWindowForced;
+        }
     }
 
     function ajaxSettings() {
@@ -66,7 +117,7 @@ function JQueryStatic() {
     }
 
     function Event() {
-        // $ExpectType EventStatic<HTMLElement>
+        // $ExpectType EventStatic
         $.Event;
     }
 
@@ -103,7 +154,7 @@ function JQueryStatic() {
     }
 
     function ready() {
-        // $ExpectType Thenable<JQueryStatic<HTMLElement>>
+        // $ExpectType Thenable<JQueryStatic>
         $.ready;
     }
 
@@ -699,7 +750,9 @@ function JQueryStatic() {
 
     function map() {
         // $ExpectType number[]
-        $.map([1, 2, 3], (elementOfArray, indexInArray) => {
+        $.map([1, 2, 3], function(elementOfArray, indexInArray) {
+            // $ExpectType Window
+            this;
             // $ExpectType number
             elementOfArray;
             // $ExpectType number
@@ -708,11 +761,49 @@ function JQueryStatic() {
             return 200 + 10;
         });
 
+        // $ExpectType number[]
+        $.map([1, 2, 3], function(elementOfArray, indexInArray) {
+            // $ExpectType Window
+            this;
+            // $ExpectType number
+            elementOfArray;
+            // $ExpectType number
+            indexInArray;
+
+            return [200, 10];
+        });
+
+        // $ExpectType (number | null)[]
+        $.map([1, 2, 3], function(elementOfArray, indexInArray) {
+            // $ExpectType Window
+            this;
+            // $ExpectType number
+            elementOfArray;
+            // $ExpectType number
+            indexInArray;
+
+            return [200, 10, null];
+        });
+
+        // $ExpectType (number | undefined)[]
+        $.map([1, 2, 3], function(elementOfArray, indexInArray) {
+            // $ExpectType Window
+            this;
+            // $ExpectType number
+            elementOfArray;
+            // $ExpectType number
+            indexInArray;
+
+            return [200, 10, undefined];
+        });
+
         // $ExpectType (false | 1)[]
         $.map({
             myProp: true,
             name: 'Rogers',
-        }, (propertyOfObject, key) => {
+        }, function(propertyOfObject, key) {
+            // $ExpectType Window
+            this;
             // $ExpectType string | boolean
             propertyOfObject;
             // $ExpectType "myProp" | "name"
@@ -725,6 +816,67 @@ function JQueryStatic() {
                     return false;
             }
         });
+
+        // $ExpectType (string | number | boolean)[]
+        $.map({
+            myProp: true,
+            name: 'Rogers',
+        }, function(propertyOfObject, key) {
+            // $ExpectType Window
+            this;
+            // $ExpectType string | boolean
+            propertyOfObject;
+            // $ExpectType "myProp" | "name"
+            key;
+
+            return [propertyOfObject, 24];
+        });
+
+        // $ExpectType (false | 1)[]
+        $.map({
+            myProp: true,
+            name: 'Rogers',
+            anotherProp: 70,
+        }, function(propertyOfObject, key) {
+            // $ExpectType Window
+            this;
+            // $ExpectType string | number | boolean
+            propertyOfObject;
+            // $ExpectType "myProp" | "name" | "anotherProp"
+            key;
+
+            switch (key) {
+                case 'myProp':
+                    return 1;
+                case 'name':
+                    return false;
+            }
+
+            return null;
+        });
+
+        // $ExpectType (false | 1)[]
+        $.map({
+            myProp: true,
+            name: 'Rogers',
+            anotherProp: 70,
+        }, function(propertyOfObject, key) {
+            // $ExpectType Window
+            this;
+            // $ExpectType string | number | boolean
+            propertyOfObject;
+            // $ExpectType "myProp" | "name" | "anotherProp"
+            key;
+
+            switch (key) {
+                case 'myProp':
+                    return 1;
+                case 'name':
+                    return false;
+            }
+
+            return undefined;
+        });
     }
 
     function merge() {
@@ -733,10 +885,10 @@ function JQueryStatic() {
     }
 
     function noConflict() {
-        // $ExpectType JQueryStatic<HTMLElement>
+        // $ExpectType JQueryStatic
         $.noConflict(true);
 
-        // $ExpectType JQueryStatic<HTMLElement>
+        // $ExpectType JQueryStatic
         $.noConflict();
     }
 
@@ -2021,9 +2173,8 @@ function JQueryStatic() {
 }
 
 function JQuery() {
-    function type_assertion() {
-        const $el = $(document.createElement('canvas'));
-        const $canvas = $el as JQuery<HTMLCanvasElement>;
+    function type_annotation() {
+        const $canvas: JQuery<Element> = $(document.createElement('canvas'));
     }
 
     function iterable() {
@@ -2041,7 +2192,7 @@ function JQuery() {
 
     function ajax() {
         function ajaxComplete() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<Document>
             $(document).ajaxComplete(function(event, jqXHR, ajaxOptions) {
                 // $ExpectType Document
                 this;
@@ -2057,7 +2208,7 @@ function JQuery() {
         }
 
         function ajaxError() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<Document>
             $(document).ajaxError(function(event, jqXHR, ajaxSettings, thrownError) {
                 // $ExpectType Document
                 this;
@@ -2075,7 +2226,7 @@ function JQuery() {
         }
 
         function ajaxSend() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<Document>
             $(document).ajaxSend(function(event, jqXHR, ajaxOptions) {
                 // $ExpectType Document
                 this;
@@ -2091,7 +2242,7 @@ function JQuery() {
         }
 
         function ajaxStart() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<Document>
             $(document).ajaxStart(function() {
                 // $ExpectType Document
                 this;
@@ -2101,7 +2252,7 @@ function JQuery() {
         }
 
         function ajaxStop() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<Document>
             $(document).ajaxStop(function() {
                 // $ExpectType Document
                 this;
@@ -2111,7 +2262,7 @@ function JQuery() {
         }
 
         function ajaxSuccess() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<Document>
             $(document).ajaxSuccess(function(event, jqXHR, ajaxOptions, data) {
                 // $ExpectType Document
                 this;
@@ -2611,6 +2762,18 @@ function JQuery() {
                 top: 50
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset({
+                left: 20
+            });
+
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset({});
+
+            // Weak type test. This may be removed if the TypeScript requirement is increased to 2.4+.
+            // $ExpectError
+            $('p').offset(20);
+
             // $ExpectType JQuery<HTMLElement>
             $('p').offset(function(index, coords) {
                 // $ExpectType HTMLElement
@@ -2626,6 +2789,20 @@ function JQuery() {
                 };
             });
 
+            // $ExpectType JQuery<HTMLElement>
+            $('p').offset(function(index, coords) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType Coordinates
+                coords;
+
+                return {
+                    top: 50
+                };
+            });
+
             // $ExpectType Coordinates | undefined
             $('p').offset();
         }
@@ -5208,7 +5385,7 @@ function JQuery() {
         function ready() {
             // $ExpectType JQuery<HTMLElement>
             $('p').ready(($) => {
-                // $ExpectType JQueryStatic<HTMLElement>
+                // $ExpectType JQueryStatic
                 $;
             });
         }
@@ -5510,6 +5687,12 @@ function JQuery() {
 
             // $ExpectType JQuery<HTMLElement>
             $('span').insertAfter($('p'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter(new Text('hello!'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertAfter($(new Text('hello!')));
         }
 
         function insertBefore() {
@@ -5527,6 +5710,12 @@ function JQuery() {
 
             // $ExpectType JQuery<HTMLElement>
             $('span').insertBefore($('p'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore(new Text('hello!'));
+
+            // $ExpectType JQuery<HTMLElement>
+            $('span').insertBefore($(new Text('hello!')));
         }
 
         function prependTo() {
@@ -5898,8 +6087,9 @@ function JQuery() {
         }
 
         function contents() {
-            // $ExpectType JQuery<HTMLElement | Comment | Text>
-            $('p').contents();
+            // TODO: Flaky test due to type ordering.
+            // // $ExpectType JQuery<HTMLElement | Comment | Text>
+            // $('p').contents();
         }
 
         function end() {
@@ -6131,7 +6321,7 @@ function JQuery() {
         }
 
         function map() {
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<string>
             $('p').map(function(index, domElement) {
                 // $ExpectType HTMLElement
                 this;
@@ -6143,7 +6333,7 @@ function JQuery() {
                 return 'myVal';
             });
 
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<string>
             $('p').map(function(index, domElement) {
                 // $ExpectType HTMLElement
                 this;
@@ -6155,7 +6345,7 @@ function JQuery() {
                 return ['myVal1', 'myVal2'];
             });
 
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<string | null>
             $('p').map(function(index, domElement) {
                 // $ExpectType HTMLElement
                 this;
@@ -6164,10 +6354,10 @@ function JQuery() {
                 // $ExpectType HTMLElement
                 domElement;
 
-                return null;
+                return ['myVal1', 'myVal2', null];
             });
 
-            // $ExpectType JQuery<HTMLElement>
+            // $ExpectType JQuery<string | undefined>
             $('p').map(function(index, domElement) {
                 // $ExpectType HTMLElement
                 this;
@@ -6176,8 +6366,72 @@ function JQuery() {
                 // $ExpectType HTMLElement
                 domElement;
 
-                return undefined;
+                return ['myVal1', 'myVal2', undefined];
             });
+
+            // $ExpectType JQuery<string>
+            $('p').map(function(index, domElement) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                domElement;
+
+                let value: string;
+
+                if (index % 2 === 0) {
+                    return null;
+                }
+
+                value = 'myVal';
+
+                return value;
+            });
+
+            // $ExpectType JQuery<string>
+            $('p').map(function(index, domElement) {
+                // $ExpectType HTMLElement
+                this;
+                // $ExpectType number
+                index;
+                // $ExpectType HTMLElement
+                domElement;
+
+                let value: string;
+
+                if (index % 2 === 0) {
+                    return undefined;
+                }
+
+                value = 'myVal';
+
+                return value;
+            });
+
+            // // $ExpectType JQuery<never>
+            // $('p').map(function(index, domElement) {
+            //     // $ExpectType HTMLElement
+            //     this;
+            //     // $ExpectType number
+            //     index;
+            //     // $ExpectType HTMLElement
+            //     domElement;
+            //
+            //     return null;
+            // });
+
+            // // $ExpectType JQuery<never>
+            // $('p').map(function(index, domElement) {
+            //     // $ExpectType HTMLElement
+            //     this;
+            //     // $ExpectType number
+            //     index;
+            //     // $ExpectType HTMLElement
+            //     domElement;
+            //
+            //     return undefined;
+            // });
         }
 
         function slice() {
@@ -6857,7 +7111,7 @@ function JQuery_jqXHR() {
         }
     }
 
-    function compatibleWithPromise(): Promise<any> {
+    function compatibleWithPromise(): JQuery._Promise<any> {
         return p;
     }
 
@@ -6877,6 +7131,7 @@ function JQuery_Promise3() {
     interface I8 { kind: 'I8'; }
     interface I9 { kind: 'I9'; }
 
+    // tslint:disable-next-line:ban-types
     const p: JQuery.Promise3<string, Error, number, JQuery, string, boolean, any, Function, never> = {} as any;
     const p1: JQuery.Promise3<I1, I2, I3, I4, I5, I6, I7, I8, I9> = {} as any;
     const p2: JQuery.Promise3<I2, I3, I4, I5, I6, I7, I8, I9, I1> = {} as any;
@@ -6987,7 +7242,7 @@ function JQuery_Promise3() {
             p.then(() => {
                 return $.ready;
             }).then((a) => {
-                a; // $ExpectType JQueryStatic<HTMLElement>
+                a; // $ExpectType JQueryStatic
             });
 
             p.then(() => {
@@ -7017,7 +7272,7 @@ function JQuery_Promise3() {
             p.then(null, () => {
                 return $.ready;
             }).then((a) => {
-                a; // $ExpectType JQueryStatic<HTMLElement>
+                a; // $ExpectType JQueryStatic
             });
 
             p.then(null, () => {
@@ -7254,7 +7509,7 @@ function JQuery_Promise3() {
             });
             // $ExpectType PromiseBase<any, jqXHR<any>, never, SuccessTextStatus, ErrorTextStatus, never, jqXHR<any>, string, never, never, never, never>
             a;
-            const b: JQuery.Promise3<any, JQuery.jqXHR<any>, never, JQuery.Ajax.SuccessTextStatus, JQuery.Ajax.ErrorTextStatus, never, JQuery.jqXHR<any>, string, never> = a;
+            const b: JQuery.Promise3<any, JQuery.jqXHR, never, JQuery.Ajax.SuccessTextStatus, JQuery.Ajax.ErrorTextStatus, never, JQuery.jqXHR, string, never> = a;
         }
 
         // $ExpectType PromiseBase<never, never, never, never, never, never, never, never, never, never, never, never>
@@ -7275,11 +7530,12 @@ function JQuery_Promise3() {
     }
 
     async function testAsync(p: JQuery.Promise3<string, {}, {}, {}, {}, {}, {}, {}, {}>): Promise<string> {
+        // tslint:disable-next-line:await-promise
         const s: string = await p;
         return s;
     }
 
-    function compatibleWithPromise(): Promise<any> {
+    function compatibleWithPromise(): JQuery._Promise<any> {
         return p;
     }
 
@@ -7373,7 +7629,7 @@ function JQuery_Promise2(p: JQuery.Promise2<string, Error, number, JQuery, strin
             p.then(() => {
                 return $.ready;
             }).then((a) => {
-                a; // $ExpectType JQueryStatic<HTMLElement>
+                a; // $ExpectType JQueryStatic
             });
 
             p.then(() => {
@@ -7400,7 +7656,7 @@ function JQuery_Promise2(p: JQuery.Promise2<string, Error, number, JQuery, strin
             p.then(null, () => {
                 return $.ready;
             }).then((a) => {
-                a; // $ExpectType JQueryStatic<HTMLElement>
+                a; // $ExpectType JQueryStatic
             });
 
             p.then(null, () => {
@@ -7419,11 +7675,12 @@ function JQuery_Promise2(p: JQuery.Promise2<string, Error, number, JQuery, strin
     }
 
     async function testAsync(p: JQuery.Promise2<string, {}, {}, {}, {}, {}>): Promise<string> {
+        // tslint:disable-next-line:await-promise
         const s: string = await p;
         return s;
     }
 
-    function compatibleWithPromise(): Promise<any> {
+    function compatibleWithPromise(): JQuery._Promise<any> {
         return p;
     }
 
@@ -7500,7 +7757,7 @@ function JQuery_Promise(p: JQuery.Promise<string, Error, number>) {
             p.then(() => {
                 return $.ready;
             }).then((a) => {
-                a; // $ExpectType JQueryStatic<HTMLElement>
+                a; // $ExpectType JQueryStatic
             });
 
             p.then(() => {
@@ -7524,7 +7781,7 @@ function JQuery_Promise(p: JQuery.Promise<string, Error, number>) {
             p.then(null, () => {
                 return $.ready;
             }).then((a) => {
-                a; // $ExpectType JQueryStatic<HTMLElement>
+                a; // $ExpectType JQueryStatic
             });
 
             p.then(null, () => {
@@ -7544,7 +7801,7 @@ function JQuery_Promise(p: JQuery.Promise<string, Error, number>) {
         return s;
     }
 
-    function compatibleWithPromise(): Promise<any> {
+    function compatibleWithPromise(): JQuery._Promise<any> {
         return p;
     }
 }
diff --git a/types/jquery/test/example-tests.ts b/types/jquery/test/example-tests.ts
index 728a42b3d6..60fbd431bb 100644
--- a/types/jquery/test/example-tests.ts
+++ b/types/jquery/test/example-tests.ts
@@ -1,3 +1,17 @@
+// tslint:disable:no-arg
+// tslint:disable:no-var-keyword
+// tslint:disable:object-literal-key-quotes
+// tslint:disable:object-literal-shorthand
+// tslint:disable:one-variable-per-declaration
+// tslint:disable:only-arrow-functions
+// tslint:disable:prefer-conditional-expression
+// tslint:disable:prefer-const
+// tslint:disable:prefer-for-of
+// tslint:disable:prefer-switch
+// tslint:disable:prefer-template
+// tslint:disable:space-within-parens
+// tslint:disable:triple-equals
+
 function examples() {
     function add_0() {
         $('div').css('border', '2px solid red')
@@ -816,7 +830,7 @@ function examples() {
             var len = kids.addClass('hilite').length;
 
             $('#results span:first').text(len);
-            $('#results span:last').text((<HTMLElement> event.target).tagName);
+            $('#results span:last').text(event.target.tagName);
 
             event.preventDefault();
         });
@@ -1600,7 +1614,7 @@ function examples() {
 
     function event_target_0() {
         $('body').click(function(event) {
-            $('#log').html('clicked: ' + (<HTMLElement> event.target).nodeName);
+            $('#log').html('clicked: ' + event.target.nodeName);
         });
     }
 
@@ -2320,8 +2334,8 @@ function examples() {
     }
 
     function jQuery_contains_0() {
-        $.contains(document.documentElement, document.body); // true
-        $.contains(document.body, document.documentElement); // false
+        $.contains(document.documentElement!, document.body); // true
+        $.contains(document.body, document.documentElement!); // false
     }
 
     function jQuery_data_0() {
@@ -3428,7 +3442,7 @@ function examples() {
     function map_0() {
         $('p')
             .append($('input').map(function() {
-                return $(this).val();
+                return $(this).val() as string;
             })
                 .get()
                 .join(', '));
diff --git a/types/jquery/test/jquery-no-window-module-tests.ts b/types/jquery/test/jquery-no-window-module-tests.ts
index 2f2de4cc98..783031a672 100644
--- a/types/jquery/test/jquery-no-window-module-tests.ts
+++ b/types/jquery/test/jquery-no-window-module-tests.ts
@@ -1,5 +1,5 @@
 import jQueryFactory = require('jquery');
 
 const jq = jQueryFactory(window, true);
-// $ExpectType JQueryStatic<HTMLElement>
+// $ExpectType JQueryStatic
 jq;
diff --git a/types/jquery/test/jquery-slim-no-window-module-tests.ts b/types/jquery/test/jquery-slim-no-window-module-tests.ts
index 2e104af0eb..16793e0d2c 100644
--- a/types/jquery/test/jquery-slim-no-window-module-tests.ts
+++ b/types/jquery/test/jquery-slim-no-window-module-tests.ts
@@ -1,5 +1,5 @@
 import jQueryFactory = require('jquery/dist/jquery.slim');
 
 const jq = jQueryFactory(window, true);
-// $ExpectType JQueryStatic<HTMLElement>
+// $ExpectType JQueryStatic
 jq;
diff --git a/types/jquery/test/jquery-slim-window-module-tests.ts b/types/jquery/test/jquery-slim-window-module-tests.ts
index b47707cb23..bf4331d824 100644
--- a/types/jquery/test/jquery-slim-window-module-tests.ts
+++ b/types/jquery/test/jquery-slim-window-module-tests.ts
@@ -1,5 +1,5 @@
 import jq = require('jquery/dist/jquery.slim');
 
 const $window = jq(window);
-// $ExpectType JQuery<HTMLElement>
+// $ExpectType JQuery<Window>
 $window;
diff --git a/types/jquery/test/jquery-window-module-tests.ts b/types/jquery/test/jquery-window-module-tests.ts
index 6bc5486fb9..1d554f0861 100644
--- a/types/jquery/test/jquery-window-module-tests.ts
+++ b/types/jquery/test/jquery-window-module-tests.ts
@@ -1,18 +1,5 @@
 import jq = require('jquery');
 
 const $window = jq(window);
-// $ExpectType JQuery<HTMLElement>
+// $ExpectType JQuery<Window>
 $window;
-
-class CanvasLayersDirective {
-    private readonly $renderingCanvas: JQuery<HTMLCanvasElement>;
-    private readonly $offscreenCanvas: JQuery<HTMLCanvasElement>;
-
-    constructor(elementRef: { nativeElement: any; }) {
-        // This type assertion results in an error when exporting 'typeof factory & JQueryStatic' where
-        // 'factory' is jQuery's factory function.
-        const $Canvas = $ as JQueryStatic<HTMLCanvasElement>;
-        this.$renderingCanvas = $Canvas(elementRef.nativeElement);
-        this.$offscreenCanvas = $Canvas(document.createElement('canvas'));
-    }
-}
diff --git a/types/jquery/test/learn-tests.ts b/types/jquery/test/learn-tests.ts
index 17fc7cd285..ef52084da5 100644
--- a/types/jquery/test/learn-tests.ts
+++ b/types/jquery/test/learn-tests.ts
@@ -11,7 +11,7 @@ interface GreenifyPlugin {
 }
 
 jQuery.fn.greenify = function() {
-    this.css( "color", "green" );
+    this.css("color", "green");
 };
 
-jQuery( "a" ).greenify(); // Makes all the links green.
+jQuery("a").greenify(); // Makes all the links green.
diff --git a/types/jquery/test/longdesc-tests.ts b/types/jquery/test/longdesc-tests.ts
index 3405bb83b5..5275191b5b 100644
--- a/types/jquery/test/longdesc-tests.ts
+++ b/types/jquery/test/longdesc-tests.ts
@@ -1,3 +1,14 @@
+// tslint:disable:no-var-keyword
+// tslint:disable:object-literal-key-quotes
+// tslint:disable:object-literal-shorthand
+// tslint:disable:one-variable-per-declaration
+// tslint:disable:only-arrow-functions
+// tslint:disable:prefer-const
+// tslint:disable:prefer-for-of
+// tslint:disable:prefer-template
+// tslint:disable:space-within-parens
+// tslint:disable:triple-equals
+
 function longdesc() {
     function add_0() {
         $('p').add('div').addClass('widget');
@@ -2358,9 +2369,9 @@ function longdesc() {
     }
 
     function toggle_3(display: boolean) {
-        if (display === true) {
+        if (display) {
             $('#foo').show();
-        } else if (display === false) {
+        } else {
             $('#foo').hide();
         }
     }
diff --git a/types/jquery/tsconfig.json b/types/jquery/tsconfig.json
index e481dc63c6..86c99c452f 100644
--- a/types/jquery/tsconfig.json
+++ b/types/jquery/tsconfig.json
@@ -29,4 +29,4 @@
         "test/jquery-slim-no-window-module-tests.ts",
         "test/jquery-slim-window-module-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jquery/tslint.json b/types/jquery/tslint.json
index deae83dc66..93e1f3e072 100644
--- a/types/jquery/tslint.json
+++ b/types/jquery/tslint.json
@@ -1,36 +1,12 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // All are TODOs
-        "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-const-enum": 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
+
+        "ban-types": false,
+        "no-object-literal-type-assertion": false
     }
 }
diff --git a/types/jqueryui/index.d.ts b/types/jqueryui/index.d.ts
index a02e3ceb73..7dca429ce4 100644
--- a/types/jqueryui/index.d.ts
+++ b/types/jqueryui/index.d.ts
@@ -698,6 +698,17 @@ declare namespace JQueryUI {
         value?: number;
         values?: number[];
         highlight?: boolean;
+        classes? : SliderClasses;
+    }
+
+    interface SliderClasses {
+        "ui-slider"?: string;
+        "ui-slider-horizontal"?: string;
+        "ui-slider-vertical"?: string;
+        "ui-slider-handle"?: string;
+        "ui-slider-range"?: string;
+        "ui-slider-range-min"?: string;
+        "ui-slider-range-max"?: string;
     }
 
     interface SliderUIParams {
@@ -1060,6 +1071,17 @@ declare namespace JQueryUI {
         show?: any;
     }
 
+    interface WidgetCommonProperties {
+        element: JQuery;
+        defaultElement : string;
+        document: Document;
+        namespace: string;
+        uuid: string;
+        widgetEventPrefix: string;
+        widgetFullName: string;
+        window: Window;
+    }
+
     interface Widget {
         (methodName: string): JQuery;
         (options: WidgetOptions): JQuery;
@@ -1068,8 +1090,8 @@ declare namespace JQueryUI {
         (optionLiteral: string, options: WidgetOptions): any;
         (optionLiteral: string, optionName: string, optionValue: any): JQuery;
 
-        (name: string, prototype: any): JQuery;
-        (name: string, base: Function, prototype: any): JQuery;
+        <T>(name: string, prototype: T & ThisType<T & WidgetCommonProperties>): JQuery;
+        <T>(name: string, base: Function, prototype: T & ThisType<T & WidgetCommonProperties> ): JQuery;
     }
 
     ////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/types/jqueryui/jqueryui-tests.ts b/types/jqueryui/jqueryui-tests.ts
index a9f6f0b5ff..32712b8085 100644
--- a/types/jqueryui/jqueryui-tests.ts
+++ b/types/jqueryui/jqueryui-tests.ts
@@ -1599,6 +1599,7 @@ function test_slider() {
     $(".selector").slider({ step: 5 });
     $(".selector").slider({ value: 10 });
     $(".selector").slider({ values: [10, 25] });
+    $(".selector").slider({ classes: { "ui-slider": "custom", "ui-slider-handle": "custom-handle" } } );
 }
 
 
diff --git a/types/js-yaml/index.d.ts b/types/js-yaml/index.d.ts
index da2d2a36c8..1dfa56c5a5 100644
--- a/types/js-yaml/index.d.ts
+++ b/types/js-yaml/index.d.ts
@@ -6,10 +6,8 @@
 
 export as namespace jsyaml;
 
-export type DocumentLoadResult = object | undefined;
-
-export function safeLoad(str: string, opts?: LoadOptions): DocumentLoadResult;
-export function load(str: string, opts?: LoadOptions): DocumentLoadResult;
+export function safeLoad(str: string, opts?: LoadOptions): any;
+export function load(str: string, opts?: LoadOptions): any;
 
 export class Type {
 	constructor(tag: string, opts?: TypeConstructorOptions);
@@ -30,10 +28,10 @@ export class Schema implements SchemaDefinition {
 	static create(schemas: Schema[] | Schema, types: Type[] | Type): Schema;
 }
 
-export function safeLoadAll(str: string, iterator?: undefined, opts?: LoadOptions): DocumentLoadResult[];
+export function safeLoadAll(str: string, iterator?: undefined, opts?: LoadOptions): any[];
 export function safeLoadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): undefined;
 
-export function loadAll(str: string, iterator?: undefined, opts?: LoadOptions): DocumentLoadResult[];
+export function loadAll(str: string, iterator?: undefined, opts?: LoadOptions): any[];
 
 export function loadAll(str: string, iterator: (doc: any) => void, opts?: LoadOptions): undefined;
 
diff --git a/types/js-yaml/js-yaml-tests.ts b/types/js-yaml/js-yaml-tests.ts
index 9a61da204f..2d67b99192 100644
--- a/types/js-yaml/js-yaml-tests.ts
+++ b/types/js-yaml/js-yaml-tests.ts
@@ -109,19 +109,19 @@ type.styleAliases;
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-// $ExpectType DocumentLoadResult
+// $ExpectType any
 yaml.safeLoad(str);
-// $ExpectType DocumentLoadResult
+// $ExpectType any
 yaml.safeLoad(str, loadOpts);
 
-// $ExpectType DocumentLoadResult
+// $ExpectType any
 yaml.load(str);
-// $ExpectType DocumentLoadResult
+// $ExpectType any
 yaml.load(str, loadOpts);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
 
-// $ExpectType DocumentLoadResult[]
+// $ExpectType any[]
 yaml.safeLoadAll(str);
 
 // $ExpectType undefined
@@ -132,10 +132,10 @@ yaml.safeLoadAll(str, (doc) => {
 yaml.safeLoadAll(str, (doc) => {
 	value = doc;
 }, loadOpts);
-// $ExpectType DocumentLoadResult[]
+// $ExpectType any[]
 value = yaml.safeLoadAll(str, undefined, loadOpts);
 
-// $ExpectType DocumentLoadResult[]
+// $ExpectType any[]
 value = yaml.loadAll(str);
 
 // $ExpectType undefined
@@ -146,7 +146,7 @@ yaml.loadAll(str, (doc) => {
 yaml.loadAll(str, (doc) => {
 	value = doc;
 }, loadOpts);
-// $ExpectType DocumentLoadResult[]
+// $ExpectType any[]
 value = yaml.loadAll(str, undefined, loadOpts);
 
 // -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --
diff --git a/types/jsdom/index.d.ts b/types/jsdom/index.d.ts
index 5ccdd33a65..cfb54fa25f 100644
--- a/types/jsdom/index.d.ts
+++ b/types/jsdom/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="node" />
 
 import { EventEmitter } from 'events';
-import { ElementLocation } from 'parse5';
+import { MarkupData } from 'parse5';
 import * as tough from 'tough-cookie';
 import { Script } from 'vm';
 
@@ -32,7 +32,7 @@ export class JSDOM {
     /**
      * The nodeLocation() method will find where a DOM node is within the source document, returning the parse5 location info for the node.
      */
-    nodeLocation(node: Node): ElementLocation | null;
+    nodeLocation(node: Node): MarkupData.ElementLocation | null;
 
     /**
      * The built-in vm module of Node.js allows you to create Script instances,
diff --git a/types/jsdom/jsdom-tests.ts b/types/jsdom/jsdom-tests.ts
index c672580a63..2dbbdca601 100644
--- a/types/jsdom/jsdom-tests.ts
+++ b/types/jsdom/jsdom-tests.ts
@@ -74,7 +74,7 @@ function test_serialize() {
     dom.serialize() === '<!DOCTYPE html><html><head></head><body>hello</body></html>';
 
     // Contrast with:
-    dom.window.document.documentElement.outerHTML === '<html><head></head><body>hello</body></html>';
+    dom.window.document.documentElement!.outerHTML === '<html><head></head><body>hello</body></html>';
 }
 
 function test_nodeLocation() {
diff --git a/types/jsdom/package.json b/types/jsdom/package.json
index c208056015..ef0b8c56fc 100644
--- a/types/jsdom/package.json
+++ b/types/jsdom/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "parse5": "^3.0.2"
+        "parse5": "^4.0.0"
     }
 }
diff --git a/types/jsdom/tsconfig.json b/types/jsdom/tsconfig.json
index fe7f9dd41f..d75878188a 100644
--- a/types/jsdom/tsconfig.json
+++ b/types/jsdom/tsconfig.json
@@ -15,10 +15,13 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "parse5": [ "parse5/v4" ]
+        }
     },
     "files": [
         "index.d.ts",
         "jsdom-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/jsforce/connection.d.ts b/types/jsforce/connection.d.ts
index fcf614eb92..e7fd593b01 100644
--- a/types/jsforce/connection.d.ts
+++ b/types/jsforce/connection.d.ts
@@ -10,8 +10,16 @@ import { Metadata } from './api/metadata';
 import { Bulk } from './bulk';
 import { Cache } from './cache'
 import { OAuth2, Streaming } from '.';
+import { HttpApiOptions } from './http-api'
 
-export type Callback<T> = (err: Error, result: T) => void;
+export type Callback<T> = (err: Error | null, result: T) => void;
+// The type for these options was determined by looking at the usage
+// of the options object in Connection.create and other methods
+// go to http://jsforce.github.io/jsforce/doc/connection.js.html#line568
+// and search for options
+export interface RestApiOptions {
+    headers?: { [x: string]: string }
+}
 
 // These are pulled out because according to http://jsforce.github.io/jsforce/doc/connection.js.html#line49
 // the oauth options can either be in the `oauth2` proeprty OR spread across the main connection
@@ -93,24 +101,24 @@ export type ConnectionEvent = "refresh";
  */
 export abstract class BaseConnection extends EventEmitter {
     _baseUrl(): string;
-    request(info: RequestInfo | string, options?: Object, callback?: (err: Error, Object: object) => void): Promise<Object>;
+    request(info: RequestInfo | string, options?: HttpApiOptions, callback?: (err: Error, Object: object) => void): Promise<Object>;
     query<T>(soql: string, options?: ExecuteOptions, callback?: (err: Error, result: QueryResult<T>) => void): Query<QueryResult<T>>;
     queryMore<T>(locator: string, options?: ExecuteOptions, callback?: (err: Error, result: QueryResult<T>) => void): Promise<QueryResult<T>>;
-    create<T>(type: string, records: Record<T> | Array<Record<T>>, options?: Object,
+    create<T>(type: string, records: Record<T> | Array<Record<T>>, options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    insert<T>(type: string, records: Record<T> | Array<Record<T>>, options?: Object,
+    insert<T>(type: string, records: Record<T> | Array<Record<T>>, options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    retrieve<T>(type: string, ids: string | string[], options?: Object,
+    retrieve<T>(type: string, ids: string | string[], options?: RestApiOptions,
         callback?: (err: Error, result: Record<T> | Array<Record<T>>) => void): Promise<(Record<T> | Array<Record<T>>)>;
-    update<T>(type: string, records: Record<T> | Array<Record<T>>, options?: Object,
+    update<T>(type: string, records: Record<T> | Array<Record<T>>, options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | Array<Record<T>>) => void): Promise<(RecordResult | RecordResult[])>;
-    upsert<T>(type: string, records: Record<T> | Array<Record<T>>, extIdField: string, options?: Object,
+    upsert<T>(type: string, records: Record<T> | Array<Record<T>>, extIdField: string, options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    del<T>(type: string, ids: string | string[], options?: Object,
+    del<T>(type: string, ids: string | string[], options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    delete<T>(type: string, ids: string | string[], options?: Object,
+    delete<T>(type: string, ids: string | string[], options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
-    destroy<T>(type: string, ids: string | string[], options?: Object,
+    destroy<T>(type: string, ids: string | string[], options?: RestApiOptions,
         callback?: (err: Error, result: RecordResult | RecordResult[]) => void): Promise<(RecordResult | RecordResult[])>;
     describe$: {
         /** Returns a value from the cache if it exists, otherwise calls Connection.describe */
@@ -124,7 +132,8 @@ export abstract class BaseConnection extends EventEmitter {
         clear(): void;
     }
     describeGlobal<T>(callback?: (err: Error, result: DescribeGlobalResult) => void): Promise<DescribeGlobalResult>;
-    sobject<T>(resource: string): SObject<T>;
+    // we want any object to be accepted if the user doesn't decide to give an explicit type
+    sobject<T = object>(resource: string): SObject<T>;
 }
 
 export class Connection extends BaseConnection {
diff --git a/types/jsforce/describe-result.d.ts b/types/jsforce/describe-result.d.ts
index 17da9f5917..f59df9ff59 100644
--- a/types/jsforce/describe-result.d.ts
+++ b/types/jsforce/describe-result.d.ts
@@ -70,7 +70,7 @@ export interface Field {
     caseSensitive: boolean;
     compoundFieldName?: maybe<string>;
     controllerName?: maybe<string>;
-    creatable: boolean;
+    createable: boolean;
     custom: boolean;
     defaultValue?: maybe<string | boolean>;
     defaultValueFormula?: maybe<string>;
diff --git a/types/jsforce/http-api.d.ts b/types/jsforce/http-api.d.ts
new file mode 100644
index 0000000000..1986ce0c75
--- /dev/null
+++ b/types/jsforce/http-api.d.ts
@@ -0,0 +1,5 @@
+export interface HttpApiOptions {
+    responseType?: string;
+    transport?: object;
+    noContentResponse?: object
+}
diff --git a/types/jsforce/index.d.ts b/types/jsforce/index.d.ts
index ddcb0d8260..d92677a5eb 100644
--- a/types/jsforce/index.d.ts
+++ b/types/jsforce/index.d.ts
@@ -6,7 +6,7 @@
 //                 Tim Noonan <https://github.com/tnoonan-salesforce>
 //                 Abraham White <https://github.com/whiteabelincoln>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export * from './api/analytics';
 export * from './api/chatter';
diff --git a/types/jsforce/jsforce-tests.ts b/types/jsforce/jsforce-tests.ts
index 8eb97aebc7..8e572448b4 100644
--- a/types/jsforce/jsforce-tests.ts
+++ b/types/jsforce/jsforce-tests.ts
@@ -4,12 +4,9 @@ import * as express from 'express';
 import * as glob from 'glob';
 
 import * as sf from 'jsforce';
-
-export interface DummyRecord {
-    thing: boolean;
-    other: number;
-    person: string;
-}
+import { RecordReference, Record } from 'jsforce/record';
+import { SObject } from 'jsforce/salesforce-object';
+import { RecordResult } from 'jsforce/record-result';
 
 const salesforceConnection: sf.Connection = new sf.Connection({
     instanceUrl: '',
@@ -20,7 +17,390 @@ const salesforceConnection: sf.Connection = new sf.Connection({
     },
 });
 
-salesforceConnection.sobject<DummyRecord>("Dummy").select(["thing", "other"]);
+async function testSObject(connection: sf.Connection) {
+    interface DummyRecord {
+        thing: boolean;
+        other: number;
+        person: string;
+    }
+
+    const dummySObject: SObject<DummyRecord> = connection.sobject<DummyRecord>('Dummy');
+
+    // currently untyped, but some future change may make this stricter
+    const restApiOptions = {
+        headers: { Bearer: 'I have no idea what this wants' }
+    };
+
+    { // Test SObject.record
+        // $ExpectType RecordReference<DummyRecord>
+        dummySObject.record('50130000000014C');
+    }
+
+    { // Test SObject.retrieve
+        // with single id
+        // $ExpectType Record<DummyRecord>
+        await dummySObject.retrieve('50130000000014C');
+        // with single id and rest api options
+        // $ExpectType Record<DummyRecord>
+        await dummySObject.retrieve('50130000000014C', restApiOptions);
+
+        // with single id and callback
+        dummySObject.retrieve('50130000000014C', restApiOptions, (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType Record<DummyRecord>
+        });
+
+        // with ids array
+        // $ExpectType Record<DummyRecord>[]
+        await dummySObject.retrieve(['IIIIDDD']);
+        // with ids array and rest api options
+        // $ExpectType Record<DummyRecord>[]
+        await dummySObject.retrieve(['IIIIDDD'], restApiOptions);
+
+        // with ids array and callback
+        dummySObject.retrieve(['50130000000014C'], restApiOptions, (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType Record<DummyRecord>[]
+        });
+
+        salesforceConnection.sobject<any>("ContentVersion").retrieve("world", {
+            test: "test"
+        }, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType any
+        });
+    }
+
+    { // Test SObject.update
+        // if we require that records have an id field this will fail
+        // //$ExpectError
+        await dummySObject.update({ thing: false });
+
+        // If we require that the records have an Id field
+        // await dummySObject.update({ thing: false, Id: 'asdf' }); // $ExpectType RecordResult
+
+        // invalid field
+        // $ExpectError
+        await dummySObject.update({ asdf: false });
+
+        // with rest api options
+        // $ExpectType RecordResult
+        await dummySObject.update({ thing: false }, restApiOptions);
+
+        // with callback
+        dummySObject.update({ thing: false }, (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult
+        });
+
+        dummySObject.update({ thing: false }, restApiOptions, (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult
+        });
+
+        // with multiple records
+        // $ExpectType RecordResult[]
+        await dummySObject.update([{ thing: false }]);
+
+        // with multiple records and api options
+        // $ExpectType RecordResult[]
+        await dummySObject.update([{ thing: false }], restApiOptions);
+
+        // with multiple records and callback
+        dummySObject.update([{ thing: false }], restApiOptions, (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+
+        dummySObject.update([{ thing: false }], (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+    }
+
+    { // Test SObject.updated
+        // $ExpectType UpdatedRecordsInfo
+        await dummySObject.updated(new Date(), new Date());
+
+        // $ExpectType UpdatedRecordsInfo
+        await dummySObject.updated(new Date(), 'hi');
+
+        // $ExpectType UpdatedRecordsInfo
+        await dummySObject.updated('hi', new Date());
+
+        // $ExpectType UpdatedRecordsInfo
+        await dummySObject.updated('hi', 'hi');
+
+        dummySObject.updated(new Date(), 'hi', (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType UpdatedRecordsInfo
+        });
+    }
+
+    { // Test SObject.upsert
+        const updateData = {
+            Id: 'Some ID',
+            thing: true,
+            other: 1,
+            person: 'hi'
+        };
+        // $ExpectType RecordResult
+        await dummySObject.upsert(updateData, 'Id');
+
+        // $ExpectType RecordResult
+        await dummySObject.upsert(updateData, 'Id', restApiOptions);
+
+        // $ExpectType RecordResult[]
+        await dummySObject.upsert([updateData], 'Id');
+
+        // $ExpectType RecordResult[]
+        await dummySObject.upsert([updateData], 'Id', restApiOptions);
+
+        dummySObject.upsert(updateData, 'Id', (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+
+        dummySObject.upsert(updateData, 'Id', restApiOptions, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+
+        dummySObject.upsert([updateData], 'Id', (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+
+        dummySObject.upsert([updateData], 'Id', restApiOptions, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+    }
+
+    { // Test SObject.find
+    }
+
+    { // Test SObject.findOne
+        salesforceConnection.sobject("ContentVersion").findOne<any>({ Id: '' }, (err, contentVersion) => {
+            err; // $ExpectType Error | null
+            contentVersion; // $ExpectType any
+        });
+    }
+
+    { // Test SObject.select
+
+        dummySObject.select(["thing", "other"]);
+
+        // note the following should never compile:
+        // $ExpectError
+        dummySObject.select(["lol"]);
+    }
+
+    { // Test SObject.create
+        // $ExpectType RecordResult
+        await dummySObject.create({
+            thing: true,
+            other: 1,
+            person: 'hi'
+        });
+
+        // $ExpectType RecordResult
+        await dummySObject.create({
+            thing: true,
+            other: 1,
+            person: 'hi'
+        }, restApiOptions);
+
+        // $ExpectType RecordResult[]
+        await dummySObject.create([{
+            thing: true,
+            other: 1,
+            person: 'hi'
+        }]);
+
+        // $ExpectType RecordResult[]
+        await dummySObject.create([{
+            thing: true,
+            other: 1,
+            person: 'hi'
+        }], restApiOptions);
+
+        dummySObject.create([{
+            thing: true,
+            other: 1,
+            person: 'hi'
+        }], (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+
+        dummySObject.create([{
+            thing: true,
+            other: 1,
+            person: 'hi'
+        }], restApiOptions, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+
+        salesforceConnection.sobject("Account").create({
+            Name: "Test Acc 2",
+            BillingStreet: "Maplestory street",
+            BillingPostalCode: "ME4 666"
+        }, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+
+        // callback and rest api options
+        salesforceConnection.sobject("ContentVersion").create({
+            OwnerId: '',
+            Title: 'hello',
+            PathOnClient: './hello-world.jpg',
+            VersionData: '{ Test: Data }'
+        }, restApiOptions, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+
+        salesforceConnection.sobject("ContentDocumentLink").create({
+            ContentDocumentId: '',
+            LinkedEntityId: '',
+            ShareType: "I"
+        }, (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+    }
+
+    { // Test SObject.createBulk
+        // $ExpectType Batch
+        dummySObject.createBulk();
+        // $ExpectType Batch
+        dummySObject.createBulk('hi.csv');
+        // $ExpectType Batch
+        dummySObject.createBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }]);
+        // $ExpectType Batch
+        dummySObject.createBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }], (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+        dummySObject.createBulk('hi.csv', (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+    }
+
+    { // Test SObject.deleteBulk and aliases
+        // $ExpectType Batch
+        dummySObject.deleteBulk();
+        // $ExpectType Batch
+        dummySObject.deleteBulk('hi.csv');
+        // $ExpectType Batch
+        dummySObject.deleteBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }]);
+        // $ExpectType Batch
+        dummySObject.deleteBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }], (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+        dummySObject.deleteBulk('hi.csv', (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+
+        // $ExpectType Batch
+        dummySObject.destroyBulk();
+        // $ExpectType Batch
+        dummySObject.destroyBulk('hi.csv');
+        // $ExpectType Batch
+        dummySObject.destroyBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }]);
+        // $ExpectType Batch
+        dummySObject.destroyBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }], (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+        dummySObject.destroyBulk('hi.csv', (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+    }
+
+    { // Test SObject.deleteHardBulk and aliases
+        // $ExpectType Batch
+        dummySObject.deleteHardBulk();
+        // $ExpectType Batch
+        dummySObject.deleteHardBulk('hi.csv');
+        // $ExpectType Batch
+        dummySObject.deleteHardBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }]);
+        // $ExpectType Batch
+        dummySObject.deleteHardBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }], (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+        dummySObject.deleteHardBulk('hi.csv', (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+
+        // $ExpectType Batch
+        dummySObject.destroyHardBulk();
+        // $ExpectType Batch
+        dummySObject.destroyHardBulk('hi.csv');
+        // $ExpectType Batch
+        dummySObject.destroyHardBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }]);
+        // $ExpectType Batch
+        dummySObject.destroyHardBulk([{ Id: 'hi', thing: true, other: 1, person: 'you' }], (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+        dummySObject.destroyHardBulk('hi.csv', (err, res) => {
+            err; // $ExpectType Error | null
+            res; // $ExpectType RecordResult[]
+        });
+    }
+
+    { // Test SObject.destroy and aliases
+        // $ExpectType RecordResult
+        await dummySObject.del('Id');
+        // $ExpectType RecordResult
+        await dummySObject.destroy('Id');
+        // $ExpectType RecordResult
+        await dummySObject.delete('Id');
+
+        // $ExpectType RecordResult[]
+        await dummySObject.del(['Id']);
+        // $ExpectType RecordResult[]
+        await dummySObject.destroy(['Id']);
+        // $ExpectType RecordResult[]
+        await dummySObject.delete(['Id']);
+
+        dummySObject.del('Id', (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+        dummySObject.destroy('Id', (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+        dummySObject.delete('Id', (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult
+        });
+
+        dummySObject.del(['Id'], (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+        dummySObject.destroy(['Id'], (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+        dummySObject.delete(['Id'], (err, ret) => {
+            err; // $ExpectType Error | null
+            ret; // $ExpectType RecordResult[]
+        });
+    }
+}
 
 const requestInfo: sf.RequestInfo = {
     body: '',
@@ -38,51 +418,6 @@ const queryOptions: sf.ExecuteOptions = {
 };
 salesforceConnection.query('SELECT Id, Name FROM Account', queryOptions);
 
-// note the following should never compile:
-// salesforceConnection.sobject<DummyRecord>("Dummy").select(["lol"]);
-
-salesforceConnection.sobject("Account").create({
-    Name: "Test Acc 2",
-    BillingStreet: "Maplestory street",
-    BillingPostalCode: "ME4 666"
-}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
-    if (err || !Array.isArray(ret) && !ret.success) {
-        return;
-    }
-});
-
-salesforceConnection.sobject("ContentVersion").create({
-    OwnerId: '',
-    Title: 'hello',
-    PathOnClient: './hello-world.jpg',
-    VersionData: '{ Test: Data }'
-}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
-    if (err || !Array.isArray(ret) && !ret.success) {
-        return;
-    }
-});
-
-salesforceConnection.sobject<any>("ContentVersion").retrieve("world", {
-    test: "test"
-}, (err: Error, ret) => {
-    if (err) {
-        return;
-    }
-});
-
-salesforceConnection.sobject("ContentVersion").findOne<any>({ Id: '' }, (err, contentVersion) => {
-});
-
-salesforceConnection.sobject("ContentDocumentLink").create({
-    ContentDocumentId: '',
-    LinkedEntityId: '',
-    ShareType: "I"
-}, (err: Error, ret: sf.RecordResult | sf.RecordResult[]) => {
-    if (err || !Array.isArray(ret) && !ret.success) {
-        return;
-    }
-});
-
 sf.Date.YESTERDAY;
 
 salesforceConnection.sobject<any>('Coverage__c')
@@ -230,7 +565,7 @@ async function testChatter(conn: sf.Connection): Promise<void> {
         },
         feedElementType: 'FeedItem',
         subjectId: 'me'
-    }, (err: Error, result: any) => {
+    }, (err: Error | null, result: any) => {
         if (err) {
             throw err;
         }
@@ -242,7 +577,7 @@ async function testChatter(conn: sf.Connection): Promise<void> {
                     text: 'This is new comment on the post'
                 }]
             }
-        }, (err: Error, result: any) => {
+        }, (err: Error | null, result: any) => {
             if (err) {
                 throw err;
             }
@@ -366,13 +701,15 @@ async function testDescribe() {
         object.fields.forEach(field => {
             const type: sf.FieldType = field.type;
             // following should never compile
-            // const fail = type === 'hey'
+            // $ExpectError
+            const fail = type === 'hey';
 
             const isString = type === 'string';
         });
 
         // following should never compile (if StrictNullChecks is on)
-        // object.keyPrefix.length;
+        // $ExpectError
+        object.keyPrefix.length;
 
         console.log(`${sobject.name} Label: `, object.label);
 
diff --git a/types/jsforce/quick-action.d.ts b/types/jsforce/quick-action.d.ts
new file mode 100644
index 0000000000..a67f4d4e08
--- /dev/null
+++ b/types/jsforce/quick-action.d.ts
@@ -0,0 +1,52 @@
+import { Callback } from './connection';
+import { Record } from './record';
+
+export class QuickAction {
+    /**
+     * Retrieve default field values in the action for the given record
+     * @param contextId Id of record
+     * @param callback Callback function
+     */
+    defaultValues(contextId: string, callback?: Callback<Record>): Promise<Record>;
+    /** Retrieve default field values in the action */
+    defaultValues(callback?: Callback<Record>): Promise<Record>;
+    /**
+     * Describe the action's information (including layout, etc.)
+     * @param callback Callback function
+     */
+    describe(callback?: Callback<QuickActionDescribeInfo>): Promise<QuickActionDescribeInfo>;
+    /**
+     * Execute the action for given context id and record information
+     * @param contextId Context record ID of the action
+     * @param record Input record information for the action
+     * @param callback Callback function
+     */
+    execute<T>(contextId: string, record: Record<T>, callback?: Callback<QuickActionResult>): Promise<QuickActionResult>;
+}
+
+// TODO: figure out the actual shape of this. the docs don't have it
+export type QuickActionResult = object;
+
+export interface QuickActionInfo {
+    /** Type of the action (e.g. Create, Update, Post, LogACall) */
+    type: string;
+    /** Name of the action */
+    name: string;
+    /** Label of the action */
+    label: string;
+    /** Endpoint URL information of the action */
+    urls: object;
+}
+
+export interface QuickActionDescribeInfo {
+    /** Object type used for the action */
+    contextSobjectType: string;
+    /** Object type of the action to target */
+    targetSobjectType: string;
+    /** Field name in the target object which refers parent(context) object record ID */
+    targetParentField: string;
+    /** Record type of the targeted record */
+    targetRecordTypeId: string;
+    /** Layout sections that comprise an action */
+    layout: object;
+}
diff --git a/types/jsforce/salesforce-id.d.ts b/types/jsforce/salesforce-id.d.ts
index 87d086880f..5e79506ed6 100644
--- a/types/jsforce/salesforce-id.d.ts
+++ b/types/jsforce/salesforce-id.d.ts
@@ -1,2 +1 @@
-export class SalesforceId extends String {
-}
+export type SalesforceId = string
diff --git a/types/jsforce/salesforce-object.d.ts b/types/jsforce/salesforce-object.d.ts
index ab3e398891..a2f1c5dffd 100644
--- a/types/jsforce/salesforce-object.d.ts
+++ b/types/jsforce/salesforce-object.d.ts
@@ -5,74 +5,103 @@ import { DescribeSObjectResult } from './describe-result';
 import { Query } from './query';
 import { Record, RecordReference } from './record';
 import { RecordResult } from './record-result';
-import { Connection } from './connection';
+import { Connection, RestApiOptions, Callback } from './connection';
 import { SalesforceId } from './salesforce-id';
 import { Batch, BatchResultInfo } from './batch';
+import { QuickAction, QuickActionInfo } from './quick-action';
 
 export class SObject<T> {
     record(id: SalesforceId): RecordReference<T>;
-    retrieve(id: SalesforceId, options?: Object, callback?: (err: Error, record: Record<T>) => void): Promise<Record<T>>;
-    retrieve(ids: SalesforceId[], options?: Object, callback?: (err: Error, ret: Array<Record<T>>) => void): Promise<Array<Record<T>>>;
-    update(record: Partial<T>, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult>;
-    update(records: Array<Partial<T>>, options?: Object, callback?: (err: Error, ret: RecordResult[]) => void): Promise<RecordResult[]>;
-    upsert(records: Record<T>, extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult>;
-    upsert(records: Array<Record<T>>, extIdField: SalesforceId, options?: Object, callback?: (err: Error, ret: RecordResult[]) => void): Promise<RecordResult[]>;
-    upsertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult[] | BatchResultInfo[]) => void): Batch;
+    retrieve(id: SalesforceId, callback?: Callback<Record<T>>): Promise<Record<T>>;
+    retrieve(id: SalesforceId, options?: object, callback?: Callback<Record<T>>): Promise<Record<T>>;
+    retrieve(ids: SalesforceId[], callback?: Callback<Array<Record<T>>>): Promise<Array<Record<T>>>;
+    retrieve(ids: SalesforceId[], options?: object, callback?: Callback<Array<Record<T>>>): Promise<Array<Record<T>>>;
+    // Should update require that the record Id field be provided?
+    update(record: Partial<T>, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    update(record: Partial<T>, options?: RestApiOptions, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    update(records: Array<Partial<T>>, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    update(records: Array<Partial<T>>, options?: RestApiOptions, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    // should input really be optional? the documentation says so, but how can you actually update without it?
+    updateBulk(input?: Record[] | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
+    updated(start: string | Date, end: string | Date, callback?: Callback<UpdatedRecordsInfo>): Promise<UpdatedRecordsInfo>;
+    upsert(records: Record<T>, extIdField: string, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    upsert(records: Record<T>, extIdField: string, options?: RestApiOptions, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    upsert(records: Array<Record<T>>, extIdField: string, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    upsert(records: Array<Record<T>>, extIdField: string, options?: RestApiOptions, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    upsertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[] | BatchResultInfo[]>): Batch;
 
-    find<T>(query?: any, callback?: (err: Error, ret: T[]) => void): Query<T>;
-    find<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T[]) => void): Query<T>;
-    find<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T[]) => void): Query<T>;
+    find<T>(query?: object | string, callback?: Callback<Array<Record<T>>>): Query<Array<Record<T>>>;
+    find<T>(query?: object | string, fields?: Object | string[] | string, callback?: Callback<Array<Record<T>>>): Query<Array<Record<T>>>;
+    find<T>(query?: object | string, fields?: Object | string[] | string, options?: FindOptions, callback?: Callback<Array<Record<T>>>): Query<Array<Record<T>>>;
 
-    findOne<T>(query?: any, callback?: (err: Error, ret: T) => void): Query<T>;
-    findOne<T>(query?: any, fields?: Object | string[] | string, callback?: (err: Error, ret: T) => void): Query<T>;
-    findOne<T>(query?: any, fields?: Object | string[] | string, options?: Object, callback?: (err: Error, ret: T) => void): Query<T>;
+    findOne<T>(query?: object | string, callback?: Callback<Record<T>>): Query<Record<T>>;
+    findOne<T>(query?: object | string, fields?: Object | string[] | string, callback?: Callback<Record<T>>): Query<Record<T>>;
+    findOne<T>(query?: object | string, fields?: Object | string[] | string, options?: FindOptions, callback?: Callback<Record<T>>): Query<Record<T>>;
 
     approvalLayouts$: {
         /** Returns a value from the cache if it exists, otherwise calls SObject.approvalLayouts */
-        (callback?: (layoutInfo: ApprovalLayoutInfo) => void): ApprovalLayoutInfo;
+        (callback?: Callback<ApprovalLayoutInfo>): ApprovalLayoutInfo;
         clear(): void;
     }
-    approvalLayouts(callback?: (layoutInfo: ApprovalLayoutInfo) => void): Promise<ApprovalLayoutInfo>;
-    bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream[] | string[], callback?: (err: Error, ret: RecordResult) => void): Batch;
+    approvalLayouts(callback?: Callback<ApprovalLayoutInfo>): Promise<ApprovalLayoutInfo>;
+    bulkload(operation: string, options?: { extIdField?: string }, input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
     compactLayouts$: {
         /** Returns a value from the cache if it exists, otherwise calls SObject.compactLayouts */
-        (callback?: CompactLayoutInfo): CompactLayoutInfo;
+        (callback?: Callback<CompactLayoutInfo>): CompactLayoutInfo;
         clear(): void;
     }
-    compactLayouts(callback?: CompactLayoutInfo): Promise<CompactLayoutInfo>;
-    count(conditions?: Object | string, callback?: (err: Error, num: number) => void): Promise<number>;
-    create(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
-    createBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    del(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
-    destroy(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
-    delete(ids: string | string[], callback?: (err: Error, ret: any) => void): void;
-    deleteBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    destroyBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    destroyHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    deleted(start: Date | string, end: Date | string, callback?: (info: DeletedRecordsInfo) => void): Promise<DeletedRecordsInfo>;
-    deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
-    describe(callback?: (err: Error, ret: DescribeSObjectResult) => void): Promise<DescribeSObjectResult>;
+    compactLayouts(callback?: Callback<CompactLayoutInfo>): Promise<CompactLayoutInfo>;
+    count(conditions?: object | string, callback?: Callback<number>): Query<number>;
+    create(record: T, options?: RestApiOptions, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    create(record: T, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    create(record: Array<T>, options?: RestApiOptions, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    create(record: Array<T>, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    createBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
+    del(id: string, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    del(ids: string[], callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    destroy(id: string, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    destroy(ids: string[], callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    delete(id: string, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    delete(ids: string[], callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    deleteBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
+    destroyBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
+    destroyHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
+    deleted(start: Date | string, end: Date | string, callback?: Callback<DeletedRecordsInfo>): Promise<DeletedRecordsInfo>;
+    deleteHardBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
+    describe(callback?: Callback<DescribeSObjectResult>): Promise<DescribeSObjectResult>;
     describe$: {
         /** Returns a value from the cache if it exists, otherwise calls SObject.describe */
-        (callback?: (err: Error, ret: DescribeSObjectResult) => void): DescribeSObjectResult;
+        (callback?: Callback<DescribeSObjectResult>): DescribeSObjectResult;
         clear(): void;
     }
-    insert(options: any | any[], callback?: (err: Error, ret: RecordResult | RecordResult[]) => void): Promise<RecordResult | RecordResult[]>;
-    insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: (err: Error, ret: RecordResult) => void): Batch;
+    insert(record: Record<T>, callback?: Callback<RecordResult>): Promise<RecordResult>;
+    insert(records: Array<Record<T>>, callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    insertBulk(input?: Array<Record<T>> | stream.Stream | string, callback?: Callback<RecordResult[]>): Batch;
     /** Returns a value from the cache if it exists, otherwise calls SObject.layouts */
     layouts$: {
-        (layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): LayoutInfo;
+        (layoutName?: string, callback?: Callback<LayoutInfo>): LayoutInfo;
         clear(): void;
     }
-    layouts(layoutName?: string, callback?: (err: Error, info: LayoutInfo) => void): Promise<LayoutInfo>;
+    layouts(layoutName?: string, callback?: Callback<LayoutInfo>): Promise<LayoutInfo>;
     listview(id: string): ListView;
-    listviews(callback?: (err: Error, info: ListViewsInfo) => void): Promise<ListViewsInfo>;
+    listviews(callback?: Callback<ListViewsInfo>): Promise<ListViewsInfo>;
     quickAction(actionName: string): QuickAction;
-    quickActions(callback?: (err: Error, info: any) => void): Promise<any>;
-    recent(callback?: (err: Error, ret: RecordResult) => void): Promise<RecordResult>;
-    select(callback?: (err: Error, ret: T[]) => void): Query<T[]>;
+    quickActions(callback?: Callback<QuickActionInfo[]>): Promise<QuickActionInfo[]>;
+    recent(callback?: Callback<RecordResult[]>): Promise<RecordResult[]>;
+    select(callback?: Callback<T[]>): Query<T[]>;
     // TODO:use a typed pluck to turn `fields` into a subset of T's fields so that the output is slimmed down appropriately
-    select(fields?: {[P in keyof T]: boolean}  | Array<(keyof T)> | (keyof T), callback?: (err: Error, ret: Array<Partial<T>>) => void): Query<Array<Partial<T>>>;
+    select(fields?: {[P in keyof T]: boolean}  | Array<(keyof T)> | (keyof T), callback?: Callback<Array<Partial<T>>>): Query<Array<Partial<T>>>;
+}
+
+export interface FindOptions {
+    limit?: number;
+    offset?: number;
+    skip?: number;
+}
+
+export interface UpdatedRecordsInfo {
+    latestDateCovered: string;
+    ids: string[];
 }
 
 export interface ApprovalLayoutInfo {
@@ -104,4 +133,5 @@ export class ListView {
 }
 
 export class ListViewsInfo { }
-export class QuickAction { }
+// TODO: Remove this export
+export { QuickAction } // for compatibility if anyone had imported it from this file
diff --git a/types/jsgraph/index.d.ts b/types/jsgraph/index.d.ts
new file mode 100644
index 0000000000..fe4fa42e2f
--- /dev/null
+++ b/types/jsgraph/index.d.ts
@@ -0,0 +1,174 @@
+// Type definitions for jsgraph 0.7
+// Project: https://github.com/Encapsule/jsgraph
+// Definitions by: Joel Rosinbum <https://github.com/rosinbum>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+
+declare namespace jsgraph {
+
+    interface jsGraphStatic {
+        directed: Directed;
+    }
+
+    export interface VertexRequest {
+        u: string;
+        p: any
+    }
+
+    export interface JsGraphResponse {
+        error?: any;
+        result?: any;
+    }
+
+    export interface Edge {
+        u: string;
+        v: string
+    }
+
+    export interface EdgeRequest {
+        e: Edge;
+        p: any;
+    }
+
+    export interface DirectedGraph {
+        new(): DirectedGraph;
+
+        setGraphName(name: string): JsGraphResponse;
+
+        getGraphName(): string;
+
+        setGraphDescription(description: string): JsGraphResponse;
+
+        getGraphDescription(): string;
+
+        verticesCount(): number;
+
+        getVertices(): string[];
+
+        getEdgeCount(): number;
+
+        getEdeges(): Edge[];
+
+        rootVerticesCount(): number;
+
+        getRootVertices(): string[];
+
+        leafVerticesCount(): number;
+
+        getLeafVertices(): string[];
+
+        toObject(): string;
+
+        toJSON(): string;
+
+        stringify(replacer: Function, space?: number): string;
+
+        fromObject(graph: any): JsGraphResponse;
+
+
+        //Vertex functions
+        addVertex(vertex: VertexRequest): JsGraphResponse;
+
+        removeVertex(vertex: string): boolean;
+
+        getVertexProperty(vertex: string): any;
+
+        setVertexProperty(vertex: VertexRequest): JsGraphResponse;
+
+        hasVertexProperty(vertex: string): boolean;
+
+        clearVertexProperty(vertex: string): boolean;
+
+        inDegree(vertex: string): number;
+
+        inEdges(vertex: string): Edge[];
+
+        outDegree(vertex: string): number;
+
+        outEdges(vertex: string): Edge[];
+
+        //Edge functions
+        addEdge(request: EdgeRequest): JsGraphResponse;
+
+        isEdge(edge: Edge): boolean;
+
+        removeEdge(edge: Edge): JsGraphResponse;
+
+        getEdgeProperty(edge: Edge): any;
+
+        setEdgeProperty(request: EdgeRequest): JsGraphResponse;
+
+        hasEdgeProperty(edge: Edge): boolean;
+
+        clearEdgeProperty(edge: Edge): boolean;
+
+
+    }
+
+    export interface Visitor {
+        initializeVertex(req: { u: string, g: DirectedGraph }): void;
+
+        startVertex(req: { u: string, g: DirectedGraph }): void;
+
+        discoverVertex(req: { u: string, g: DirectedGraph }): void;
+
+        examineVertex(req: { u: string, g: DirectedGraph }): void;
+
+        examineEdge(req: { e: Edge, g: DirectedGraph }): void;
+
+        nonTreeEdge(req: { e: Edge, g: DirectedGraph }): void;
+
+        grayTarget(req: { e: Edge, g: DirectedGraph }): void;
+
+        blackTarget(req: { e: Edge, g: DirectedGraph }): void;
+
+        finishVertex(req: { u: string, g: DirectedGraph }): void;
+    }
+
+    export interface TraversalContext {
+        searchStatus: string;
+        colorMap: any;
+        undiscoveredMap: any;
+    }
+
+    export interface TraversalOptions {
+        startVector: string | string[];
+        allowEmptyStartVector: boolean;
+        signalStart: boolean;
+        traverseContext: TraversalContext;
+    }
+
+    export interface TraversalParams {
+        digraph: DirectedGraph,
+        visitor: Visitor,
+        options?: TraversalOptions
+    }
+
+    export interface TraversalResult {
+        error?: any;
+        result?: TraversalContext
+    }
+
+    export type colors = { white: 0, gray: 1, black: 2 };
+
+    export interface Directed {
+        breadthFirstTraverse(params: TraversalParams): TraversalResult;
+
+        colors: colors;
+
+        create(): { result: DirectedGraph };
+
+        createTraversalContext(req: { dirgaph: DirectedGraph }): TraversalContext;
+
+        depthFirstTraverse(params: TraversalParams): TraversalResult;
+
+        transpose(graph: DirectedGraph): { error?: any, result?: DirectedGraph };
+
+        directedGraph: DirectedGraph;
+
+    }
+}
+
+declare var jsgraph: jsgraph.jsGraphStatic;
+
+export = jsgraph;
diff --git a/types/jsgraph/jsgraph-tests.ts b/types/jsgraph/jsgraph-tests.ts
new file mode 100644
index 0000000000..2fdab3c0bf
--- /dev/null
+++ b/types/jsgraph/jsgraph-tests.ts
@@ -0,0 +1,43 @@
+import * as jsgraph from 'jsgraph';
+import {Edge, JsGraphResponse} from 'jsgraph';
+
+const mygraph = jsgraph.directed.create().result;
+
+let name: string = 'my name';
+mygraph.setGraphName(name);
+name = mygraph.getGraphName();
+let description: string = 'My desc';
+mygraph.setGraphDescription(description);
+description = mygraph.getGraphDescription();
+
+let count: number = mygraph.verticesCount();
+let verticies: string [] = mygraph.getVertices();
+count = mygraph.getEdgeCount();
+let edges: Edge[] = mygraph.getEdeges();
+count = mygraph.rootVerticesCount();
+verticies = mygraph.getRootVertices();
+count = mygraph.leafVerticesCount();
+verticies = mygraph.getLeafVertices();
+let json: string = mygraph.toObject();
+json = mygraph.toJSON();
+json = mygraph.stringify( () => {return}, 2);
+const graph2 = mygraph.fromObject(mygraph);
+
+let response: JsGraphResponse = mygraph.addVertex({u: 'a', p: 'some data'});
+let bool: boolean = mygraph.removeVertex('a');
+let property: string = mygraph.getVertexProperty('a');
+mygraph.setVertexProperty({u: 'a', p: property});
+bool = mygraph.hasVertexProperty('a');
+bool = mygraph.clearVertexProperty('a');
+count = mygraph.inDegree('a');
+edges = mygraph.inEdges('a');
+count = mygraph.outDegree('a');
+edges = mygraph.outEdges('a');
+
+response = mygraph.addEdge({e: {u: 'a', v:'b'}, p: 'some data'});
+bool = mygraph.isEdge({u: 'a', v:'b'});
+response = mygraph.removeEdge({u: 'a', v: 'b'});
+property = mygraph.getEdgeProperty({u: 'a', v: 'b'});
+response = mygraph.setEdgeProperty({e: {u: 'a', v: 'b'}, p: 'some data'});
+bool = mygraph.hasEdgeProperty({u: 'a', v: 'b'});
+bool = mygraph.clearEdgeProperty({u:'a', v: 'b'});
diff --git a/types/interact.js/tsconfig.json b/types/jsgraph/tsconfig.json
similarity index 93%
rename from types/interact.js/tsconfig.json
rename to types/jsgraph/tsconfig.json
index 6d4887d0f1..22997eae59 100644
--- a/types/interact.js/tsconfig.json
+++ b/types/jsgraph/tsconfig.json
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "interact.js-tests.ts"
+        "jsgraph-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-dnd/tslint.json b/types/jsgraph/tslint.json
similarity index 100%
rename from types/react-dnd/tslint.json
rename to types/jsgraph/tslint.json
diff --git a/types/jsnox/index.d.ts b/types/jsnox/index.d.ts
index 6b626c29f0..91c4361a94 100644
--- a/types/jsnox/index.d.ts
+++ b/types/jsnox/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Steve Baker <https://github.com/stkb>
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/json-editor/index.d.ts b/types/json-editor/index.d.ts
index 280c17e70f..947dfad4bb 100644
--- a/types/json-editor/index.d.ts
+++ b/types/json-editor/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for json-editor
 // Project: https://github.com/jdorn/json-editor
 // Definitions by: York Yao <https://github.com/plantain-00/>
+//                 Felipe Provenzano <https://github.com/felipeprov/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type JSONEditorOptions<TValue> = {
@@ -75,7 +76,7 @@ type JSONEditorOptions<TValue> = {
     /**
      * The CSS theme to use.
      */
-    theme?: "barebones" | "html" | "bootstrap2" | "bootstrap3" | "foundation3" | "foundation4" | "foundation5" | "foundation6" | "jqueryui";
+    theme?: "barebones" | "html" | "bootstrap2" | "bootstrap3" | "bootstrap4" | "foundation3" | "foundation4" | "foundation5" | "foundation6" | "jqueryui";
     /**
      * If true, only required properties will be included by default.
      */
diff --git a/types/json-patch-gen/index.d.ts b/types/json-patch-gen/index.d.ts
new file mode 100644
index 0000000000..46b9a7c029
--- /dev/null
+++ b/types/json-patch-gen/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for json-patch-gen 1.0
+// Project: https://github.com/gregsexton/json-patch-gen
+// Definitions by: Konstantin Rohde <https://github.com/RohdeK>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare function diff(obj1: object | null, obj2: object | null): diff.JsonPatch[];
+
+declare namespace diff {
+  type PatchOperation = "replace" | "add" | "remove";
+
+  interface JsonPatch {
+      op: PatchOperation;
+      path: string;
+      value: any;
+  }
+}
+
+export = diff;
+export as namespace diff;
diff --git a/types/json-patch-gen/json-patch-gen-tests.ts b/types/json-patch-gen/json-patch-gen-tests.ts
new file mode 100644
index 0000000000..6f45195f22
--- /dev/null
+++ b/types/json-patch-gen/json-patch-gen-tests.ts
@@ -0,0 +1,24 @@
+import diff = require("json-patch-gen");
+
+const assertEqual = (a: object, b: object) => JSON.stringify(a) === JSON.stringify(b);
+const assertLength = (a: any[], b: number) => a.length === b;
+
+assertLength(diff({a: "a"}, {a: "a", b: "b"}), 1);
+assertEqual(diff({a: "a"}, {a: "a", b: "b"})[0], {
+  op: "add",
+  path: "/b",
+  value: "b"
+});
+
+assertLength(diff({a: "a", b: "b"}, {a: "a"}), 1);
+assertEqual(diff({a: "a", b: "b"}, {a: "a"})[0], {
+  op: "remove",
+  path: "/b"
+});
+
+assertLength(diff({a: "a"}, {a: "b"}), 1);
+assertEqual(diff({a: "a"}, {a: "b"})[0], {
+  op: "replace",
+  path: "/a",
+  value: "b"
+});
diff --git a/types/json-patch-gen/tsconfig.json b/types/json-patch-gen/tsconfig.json
new file mode 100644
index 0000000000..266cb4acae
--- /dev/null
+++ b/types/json-patch-gen/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-patch-gen-tests.ts"
+    ]
+}
diff --git a/types/json-patch-gen/tslint.json b/types/json-patch-gen/tslint.json
new file mode 100644
index 0000000000..ece4c342d1
--- /dev/null
+++ b/types/json-patch-gen/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/json-schema/index.d.ts b/types/json-schema/index.d.ts
index 4c483dd42d..314f285b59 100644
--- a/types/json-schema/index.d.ts
+++ b/types/json-schema/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for json-schema 4.0 and 6.0
+// Type definitions for json-schema 4.0, 6.0 and 7.0
 // Project: https://www.npmjs.com/package/json-schema
 // Definitions by: Boris Cherny <https://github.com/bcherny>
 //                 Cyrille Tuzi <https://github.com/cyrilletuzi>
 //                 Lucian Buzzo <https://github.com/lucianbuzzo>
+//                 Roland Groza <https://github.com/rolandjitsu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -12,7 +13,7 @@
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.1
  */
 export type JSONSchema4TypeName = 'string' | 'number' | 'integer' | 'boolean'
-                                | 'object' | 'array' | 'null' | 'any'
+    | 'object' | 'array' | 'null' | 'any'
 
 /**
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-04#section-3.5
@@ -24,183 +25,183 @@ export type JSONSchema4Type = any[] | boolean | number | null | object | string
  * @see https://tools.ietf.org/html/draft-zyp-json-schema-04
  */
 export interface JSONSchema4 {
-  id?: string
-  $ref?: string
-  $schema?: 'http://json-schema.org/schema#' | 'http://json-schema.org/hyper-schema#'
-          | 'http://json-schema.org/draft-04/schema#' | 'http://json-schema.org/draft-04/hyper-schema#'
-          | 'http://json-schema.org/draft-03/schema#' | 'http://json-schema.org/draft-03/hyper-schema#'
-          | string
+    id?: string
+    $ref?: string
+    $schema?: 'http://json-schema.org/schema#' | 'http://json-schema.org/hyper-schema#'
+    | 'http://json-schema.org/draft-04/schema#' | 'http://json-schema.org/draft-04/hyper-schema#'
+    | 'http://json-schema.org/draft-03/schema#' | 'http://json-schema.org/draft-03/hyper-schema#'
+    | string
 
-  /**
-   * This attribute is a string that provides a short description of the
-   * instance property.
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.21
-   */
-  title?: string
+    /**
+     * This attribute is a string that provides a short description of the
+     * instance property.
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.21
+     */
+    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-zyp-json-schema-03#section-5.22
-   */
-  description?: 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-zyp-json-schema-03#section-5.22
+     */
+    description?: string
 
-  default?: JSONSchema4Type
-  multipleOf?: number
-  maximum?: number
-  exclusiveMaximum?: boolean
-  minimum?: number
-  exclusiveMinimum?: boolean
-  maxLength?: number
-  minLength?: number
-  pattern?: string
+    default?: JSONSchema4Type
+    multipleOf?: number
+    maximum?: number
+    exclusiveMaximum?: boolean
+    minimum?: number
+    exclusiveMinimum?: boolean
+    maxLength?: number
+    minLength?: number
+    pattern?: string
 
-  /**
-   * May only be defined when "items" is defined, and is a tuple of JSONSchemas.
-   *
-   * This provides a definition for additional items in an array instance
-   * when tuple definitions of the items is provided.  This can be false
-   * to indicate additional items in the array are not allowed, or it can
-   * be a schema that defines the schema of the additional items.
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.6
-   */
-  additionalItems?: boolean | JSONSchema4
+    /**
+     * May only be defined when "items" is defined, and is a tuple of JSONSchemas.
+     *
+     * This provides a definition for additional items in an array instance
+     * when tuple definitions of the items is provided.  This can be false
+     * to indicate additional items in the array are not allowed, or it can
+     * be a schema that defines the schema of the additional items.
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.6
+     */
+    additionalItems?: boolean | JSONSchema4
 
-  /**
-   * This attribute defines the allowed items in an instance array, and
-   * MUST be a schema or an array of schemas.  The default value is an
-   * empty schema which allows any value for items in the instance array.
-   *
-   * When this attribute value is a schema and the instance value is an
-   * array, then all the items in the array MUST be valid according to the
-   * schema.
-   *
-   * When this attribute value is an array of schemas and the instance
-   * value is an array, each position in the instance array MUST conform
-   * to the schema in the corresponding position for this array.  This
-   * called tuple typing.  When tuple typing is used, additional items are
-   * allowed, disallowed, or constrained by the "additionalItems"
-   * (Section 5.6) attribute using the same rules as
-   * "additionalProperties" (Section 5.4) for objects.
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.5
-   */
-  items?: JSONSchema4 | JSONSchema4[]
+    /**
+     * This attribute defines the allowed items in an instance array, and
+     * MUST be a schema or an array of schemas.  The default value is an
+     * empty schema which allows any value for items in the instance array.
+     *
+     * When this attribute value is a schema and the instance value is an
+     * array, then all the items in the array MUST be valid according to the
+     * schema.
+     *
+     * When this attribute value is an array of schemas and the instance
+     * value is an array, each position in the instance array MUST conform
+     * to the schema in the corresponding position for this array.  This
+     * called tuple typing.  When tuple typing is used, additional items are
+     * allowed, disallowed, or constrained by the "additionalItems"
+     * (Section 5.6) attribute using the same rules as
+     * "additionalProperties" (Section 5.4) for objects.
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.5
+     */
+    items?: JSONSchema4 | JSONSchema4[]
 
-  maxItems?: number
-  minItems?: number
-  uniqueItems?: boolean
-  maxProperties?: number
-  minProperties?: number
+    maxItems?: number
+    minItems?: number
+    uniqueItems?: boolean
+    maxProperties?: number
+    minProperties?: number
 
-  /**
-   * This attribute indicates if the instance must have a value, and not
-   * be undefined. This is false by default, making the instance
-   * optional.
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.7
-   */
-  required?: false | string[]
+    /**
+     * This attribute indicates if the instance must have a value, and not
+     * be undefined. This is false by default, making the instance
+     * optional.
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.7
+     */
+    required?: false | string[]
 
-  /**
-   * 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-zyp-json-schema-03#section-5.4
-   */
-  additionalProperties?: boolean | JSONSchema4
+    /**
+     * 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-zyp-json-schema-03#section-5.4
+     */
+    additionalProperties?: boolean | JSONSchema4
 
-  definitions?: {
-    [k: string]: JSONSchema4
-  }
+    definitions?: {
+        [k: string]: JSONSchema4
+    }
 
-  /**
-   * This attribute is an object with property definitions that define the
-   * valid values of instance object property values. When the instance
-   * value is an object, the property values of the instance object MUST
-   * conform to the property definitions in this object. In this object,
-   * each property definition's value MUST be a schema, and the property's
-   * name MUST be the name of the instance property that it defines.  The
-   * instance property value MUST be valid according to the schema from
-   * the property definition. Properties are considered unordered, the
-   * order of the instance properties MAY be in any order.
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.2
-   */
-  properties?: {
-    [k: string]: JSONSchema4
-  }
+    /**
+     * This attribute is an object with property definitions that define the
+     * valid values of instance object property values. When the instance
+     * value is an object, the property values of the instance object MUST
+     * conform to the property definitions in this object. In this object,
+     * each property definition's value MUST be a schema, and the property's
+     * name MUST be the name of the instance property that it defines.  The
+     * instance property value MUST be valid according to the schema from
+     * the property definition. Properties are considered unordered, the
+     * order of the instance properties MAY be in any order.
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.2
+     */
+    properties?: {
+        [k: string]: JSONSchema4
+    }
 
-  /**
-   * 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/Perl 5 format, 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.
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.3
-   */
-  patternProperties?: {
-    [k: string]: JSONSchema4
-  }
-  dependencies?: {
-    [k: string]: JSONSchema4 | string[]
-  }
+    /**
+     * 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/Perl 5 format, 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.
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.3
+     */
+    patternProperties?: {
+        [k: string]: JSONSchema4
+    }
+    dependencies?: {
+        [k: string]: JSONSchema4 | string[]
+    }
 
-  /**
-   * 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-zyp-json-schema-03#section-5.19
-   */
-  enum?: JSONSchema4Type[]
+    /**
+     * 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-zyp-json-schema-03#section-5.19
+     */
+    enum?: JSONSchema4Type[]
 
-  /**
-   * A single type, or a union of simple types
-   */
-  type?: JSONSchema4TypeName | JSONSchema4TypeName[]
+    /**
+     * A single type, or a union of simple types
+     */
+    type?: JSONSchema4TypeName | JSONSchema4TypeName[]
 
-  allOf?: JSONSchema4[]
-  anyOf?: JSONSchema4[]
-  oneOf?: JSONSchema4[]
-  not?: JSONSchema4
+    allOf?: JSONSchema4[]
+    anyOf?: JSONSchema4[]
+    oneOf?: JSONSchema4[]
+    not?: JSONSchema4
 
-  /**
-   * The value of this property MUST be another schema which will provide
-   * a base schema which the current schema will inherit from.  The
-   * inheritance rules are such that any instance that is valid according
-   * to the current schema MUST be valid according to the referenced
-   * schema.  This MAY also be an array, in which case, the instance MUST
-   * be valid for all the schemas in the array.  A schema that extends
-   * another schema MAY define additional attributes, constrain existing
-   * attributes, or add other constraints.
-   *
-   * Conceptually, the behavior of extends can be seen as validating an
-   * instance against all constraints in the extending schema as well as
-   * the extended schema(s).
-   *
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.26
-   */
-  extends?: string | string[]
+    /**
+     * The value of this property MUST be another schema which will provide
+     * a base schema which the current schema will inherit from.  The
+     * inheritance rules are such that any instance that is valid according
+     * to the current schema MUST be valid according to the referenced
+     * schema.  This MAY also be an array, in which case, the instance MUST
+     * be valid for all the schemas in the array.  A schema that extends
+     * another schema MAY define additional attributes, constrain existing
+     * attributes, or add other constraints.
+     *
+     * Conceptually, the behavior of extends can be seen as validating an
+     * instance against all constraints in the extending schema as well as
+     * the extended schema(s).
+     *
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-03#section-5.26
+     */
+    extends?: string | string[]
 
-  /**
-   * @see https://tools.ietf.org/html/draft-zyp-json-schema-04#section-5.6
-   */
-  [k: string]: any
+    /**
+     * @see https://tools.ietf.org/html/draft-zyp-json-schema-04#section-5.6
+     */
+    [k: string]: any
 
-  format?: string
+    format?: string
 }
 
 /* JSON Schema 6 */
@@ -214,269 +215,396 @@ export type JSONSchema6Type = any[] | boolean | number | null | object | string
  * @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#'
+    $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
+    /**
+     * 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 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 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 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
+    /**
+     * 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 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
+    /**
+     * 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
+    /**
+     * 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.
+     * 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
+    /**
+     * 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 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
+    /**
+     * 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
+    /**
+     * 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
+    /**
+     * 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 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
+    /**
+     * 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[]
+    /**
+     * 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 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 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 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[]
-  }
+    /**
+     * 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
+    /**
+     * 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[]
+    /**
+     * 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
+    /**
+     * 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[]
+    /**
+     * 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.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.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.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-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
-  }
+    /**
+     * @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 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 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
+    /**
+     * 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[]
+    /**
+     * 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[]
 
-  /**
-   * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-8
-   */
-  format?: string
+    /**
+     * @see https://tools.ietf.org/html/draft-wright-json-schema-validation-01#section-8
+     */
+    format?: string
+}
+
+/**
+ * JSON Schema 7
+ * Draft 07
+ * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01
+ */
+
+/**
+ * Primitive type
+ * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1.1
+ */
+export type JSONSchema7TypeName = 'string' | 'number' | 'integer' | 'boolean' | 'object' | 'array' | 'null';
+export type JSONSchema7Type = JSONSchema7Array[] | boolean | number | null | object | string;
+
+// Workaround for infinite type recursion
+// https://github.com/Microsoft/TypeScript/issues/3496#issuecomment-128553540
+export interface JSONSchema7Array extends Array<JSONSchema7Type> {}
+
+/**
+ * Meta schema
+ * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-5
+ */
+export type JSONSchema7Version = 'http://json-schema.org/schema#'
+    | 'http://json-schema.org/hyper-schema#'
+    | 'http://json-schema.org/draft-07/schema#'
+    | 'http://json-schema.org/draft-07/hyper-schema#';
+
+export interface JSONSchema7 {
+    $id?: string;
+    $ref?: string;
+    $schema?: JSONSchema7Version;
+    $comment?: string;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1
+     */
+    type?: JSONSchema7TypeName | JSONSchema7TypeName[];
+    enum?: JSONSchema7Type[];
+    const?: JSONSchema7Type;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.2
+     */
+    multipleOf?: number;
+    maximum?: number;
+    exclusiveMaximum?: number;
+    minimum?: number;
+    exclusiveMinimum?: number;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.3
+     */
+    maxLength?: number;
+    minLength?: number;
+    pattern?: string;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.4
+     */
+    items?: JSONSchema7 | JSONSchema7[];
+    additionalItems?: JSONSchema7;
+    maxItems?: number;
+    minItems?: number;
+    uniqueItems?: boolean;
+    contains?: JSONSchema7;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.5
+     */
+    maxProperties?: number;
+    minProperties?: number;
+    required?: string[];
+    properties?: {
+        [key: string]: JSONSchema7;
+    };
+    patternProperties?: {
+        [key: string]: JSONSchema7;
+    };
+    additionalProperties?: JSONSchema7;
+    dependencies?: {
+        [key: string]: JSONSchema7 | string[];
+    };
+    propertyNames?: JSONSchema7;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.6
+     */
+    if?: JSONSchema7;
+    then?: JSONSchema7;
+    else?: JSONSchema7;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.7
+     */
+    allOf?: JSONSchema7[];
+    anyOf?: JSONSchema7[];
+    oneOf?: JSONSchema7[];
+    not?: JSONSchema7;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-7
+     */
+    format?: string;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-8
+     */
+    contentMediaType?: string;
+    contentEncoding?: string;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-9
+     */
+    definitions?: {
+        [key: string]: JSONSchema7;
+    };
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-10
+     */
+    title?: string;
+    description?: string;
+    default?: JSONSchema7Type;
+    readOnly?: boolean;
+    writeOnly?: boolean;
+    examples?: JSONSchema7Type;
 }
diff --git a/types/json-schema/json-schema-tests.ts b/types/json-schema/json-schema-tests.ts
index fdfe4d0435..66cf7c5af5 100644
--- a/types/json-schema/json-schema-tests.ts
+++ b/types/json-schema/json-schema-tests.ts
@@ -1,4 +1,15 @@
-import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSchema6Type, JSONSchema6TypeName } from 'json-schema'
+import {
+    JSONSchema4,
+    JSONSchema4Type,
+    JSONSchema4TypeName,
+    JSONSchema6,
+    JSONSchema6Type,
+    JSONSchema6TypeName,
+    JSONSchema7,
+    JSONSchema7Array,
+    JSONSchema7Type,
+    JSONSchema7TypeName
+} from 'json-schema'
 
 /* JSON Schema 4 */
 
@@ -85,7 +96,7 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSch
   const c: JSONSchema6Type = [1, 2]
 }
 
-// JSONSchema4
+// JSONSchema6
 () => {
   const a: JSONSchema6 = {}
   const b: JSONSchema6 = {
@@ -139,3 +150,82 @@ import { JSONSchema4, JSONSchema4Type, JSONSchema4TypeName, JSONSchema6, JSONSch
     format: 'date-time'
   }
 }
+
+/* JSON Schema 7 */
+
+// SimpleType
+() => {
+    const a: JSONSchema7TypeName = 'string'
+    const b: JSONSchema7TypeName = 'number'
+    const c: JSONSchema7TypeName = 'null'
+}
+
+// Type
+() => {
+    const a: JSONSchema7Type = 'foo'
+    const b: JSONSchema7Type = null
+    const c: JSONSchema7Type = [1, 2]
+}
+
+// JSONSchema4
+() => {
+    const a: JSONSchema7 = {}
+    const b: JSONSchema7 = {
+        $id: 'foo',
+        $ref: 'foo/bar',
+        $schema: 'http://json-schema.org/schema#',
+        $comment: 'I\'m but a simple comment',
+        title: 'foo',
+        description: 'bar',
+        default: 42,
+        multipleOf: 3,
+        maximum: 4,
+        exclusiveMaximum: 4,
+        minimum: 5,
+        exclusiveMinimum: 5,
+        maxLength: 6,
+        minLength: 7,
+        pattern: 'baz',
+        additionalItems: {},
+        items: [
+            {items: [{minLength: 4}]}
+        ],
+        maxItems: 4,
+        minItems: 5,
+        uniqueItems: true,
+        maxProperties: 10,
+        minProperties: 11,
+        required: ['foo', 'bar'],
+        additionalProperties: {},
+        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: {},
+        format: 'date-time',
+        readOnly: false,
+        writeOnly: false,
+        contentEncoding: 'base64',
+        contentMediaType: 'text',
+        else: {},
+        if: {},
+        then: {}
+    }
+}
diff --git a/types/json2csv/JSON2CSVBase.d.ts b/types/json2csv/JSON2CSVBase.d.ts
index c5f328db1f..1faf2a5318 100644
--- a/types/json2csv/JSON2CSVBase.d.ts
+++ b/types/json2csv/JSON2CSVBase.d.ts
@@ -92,9 +92,10 @@ declare abstract class JSON2CSVBase<T> {
      * Performs the flattening of a data row recursively
      *
      * @param {object} dataRow Original JSON object
+     * @param {string} separator Separator to be used as the flattened field name
      * @returns {object} Flattened object
      */
-    protected flatten(dataRow: T): object;
+    protected flatten(dataRow: T, separator: string): object;
 
     /**
      * Performs the unwind recursively in specified sequence
diff --git a/types/json2csv/JSON2CSVTransform.d.ts b/types/json2csv/JSON2CSVTransform.d.ts
index 1785e09214..f453ece8b1 100644
--- a/types/json2csv/JSON2CSVTransform.d.ts
+++ b/types/json2csv/JSON2CSVTransform.d.ts
@@ -80,9 +80,10 @@ declare class JSON2CSVTransform<T> extends Transform { // implements JSON2CSVBas
      * Performs the flattening of a data row recursively
      *
      * @param {object} dataRow Original JSON object
+     * @param {string} separator Separator to be used as the flattened field name
      * @returns {object} Flattened object
      */
-    protected flatten(dataRow: T): object;
+    protected flatten(dataRow: T, separator: string): object;
 
     /**
      * Performs the unwind recursively in specified sequence
diff --git a/types/json2csv/index.d.ts b/types/json2csv/index.d.ts
index 55a1829625..55aca2687c 100644
--- a/types/json2csv/index.d.ts
+++ b/types/json2csv/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for json2csv 4.1
+// Type definitions for json2csv 4.2
 // Project: https://github.com/zemirco/json2csv
 // Definitions by: Juanjo Diaz <https://github.com/juanjoDiaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
diff --git a/types/json2csv/json2csv-tests.ts b/types/json2csv/json2csv-tests.ts
index 67c46cd1c3..42f8a58b70 100644
--- a/types/json2csv/json2csv-tests.ts
+++ b/types/json2csv/json2csv-tests.ts
@@ -76,7 +76,7 @@ class ParserExt extends Parser<ExampleObj> {
         s = this.processValue(new Date(), true);
         s = this.processValue({}, true);
         s = this.processValue([], true);
-        const flattenedData: object = this.flatten({});
+        const flattenedData: object = this.flatten({}, '.');
         const unwindedData: object[] = this.unwindData([], []);
     }
 }
@@ -110,7 +110,7 @@ class TransformExt extends Transform<ExampleObj> {
         s = this.processValue(new Date(), true);
         s = this.processValue({}, true);
         s = this.processValue([], true);
-        const flattenedData: object = this.flatten({});
+        const flattenedData: object = this.flatten({}, '.');
         const unwindedData: object[] = this.unwindData([], []);
     }
 }
diff --git a/types/json5/index.d.ts b/types/json5/index.d.ts
index a8fc723b60..9c0cb6cde6 100644
--- a/types/json5/index.d.ts
+++ b/types/json5/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for JSON5
 // Project: http://json5.org/
 // Definitions by: Jason Swearingen <https://jasonswearingen.github.io>
+//                 Kacper Wiszczuk <https://github.com/Esemesek>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -40,5 +41,18 @@ Comments
 
 Both inline (single-line) and block (multi-line) comments are allowed.
   */
-declare var json5: JSON;
+
+type JSONReplacer = (key: string, value: any) => any | (number | string)[] | null;
+
+interface JSON5 {
+    // Old JSON methods
+    parse(text: string, reviver?: (key: any, value: any) => any): any;
+    stringify(value: any, replacer?: (key: string, value: any) => any, space?: string | number): string;
+    stringify(value: any, replacer?: (number | string)[] | null, space?: string | number): string;
+
+    // New JSON5 stringify function
+    stringify(value: any, options?: { space?: number | string, quote?: string, replacer?: JSONReplacer }): string;
+}
+
+declare var json5: JSON5;
 export = json5;
diff --git a/types/json5/json5-tests.ts b/types/json5/json5-tests.ts
index f1be5b1038..94820866f8 100644
--- a/types/json5/json5-tests.ts
+++ b/types/json5/json5-tests.ts
@@ -1,7 +1,21 @@
 
 import JSON5 = require('json5');
 
-var obj = JSON5.parse("{ key:'val', 'key2':[0,1,2,] } //comment ");
-var str = JSON5.stringify(obj, null, "\t");
-console.log(str);
+const STR = "{ key:'val', 'key2':[0,1,2,] } //comment ";
+const OBJ = { key: 'value', key2: [0, 1, 2] };
 
+function reviverFunction(key: any, value: any): any {
+    return { [key]: value };
+}
+
+function replacerFunction(key: string, value: any) {
+    return { [key]: value };
+}
+
+const str1: string = JSON5.stringify(OBJ);
+const str2: string = JSON5.stringify(OBJ, null, 4);
+const str3: string = JSON5.stringify(OBJ, undefined, '2');
+const str4: string = JSON5.stringify(OBJ, replacerFunction, 2);
+
+JSON.parse(STR);
+JSON.parse(STR, reviverFunction);
diff --git a/types/jsoneditor-for-react/index.d.ts b/types/jsoneditor-for-react/index.d.ts
index 707f03c63e..0dedfc8a64 100644
--- a/types/jsoneditor-for-react/index.d.ts
+++ b/types/jsoneditor-for-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mixj93/jsoneditor-for-react#readme
 // Definitions by: JoshGoldberg <https://github.com/joshuakgoldberg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import JSONEditor, { JSONEditorOptions } from "jsoneditor";
diff --git a/types/jsoneditor/index.d.ts b/types/jsoneditor/index.d.ts
index 175c295df6..f095cb8434 100644
--- a/types/jsoneditor/index.d.ts
+++ b/types/jsoneditor/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for jsoneditor v5.5.7
+// Type definitions for jsoneditor v5.19.0
 // Project: https://github.com/josdejong/jsoneditor
 // Definitions by: Alejandro Sánchez <https://github.com/alejo90>
+//                 Errietta Kostala <https://github.com/errietta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="ace" />
@@ -28,6 +29,7 @@ declare module 'jsoneditor' {
         modes?: Array<JSONEditorMode>;
         name?: string;
         schema?: Object;
+        schemaRefs?: Object;
         search?: boolean;
         indentation?: number;
         theme?: string;
diff --git a/types/jsoneditor/jsoneditor-tests.ts b/types/jsoneditor/jsoneditor-tests.ts
index cc659cfe04..d905e6ba76 100644
--- a/types/jsoneditor/jsoneditor-tests.ts
+++ b/types/jsoneditor/jsoneditor-tests.ts
@@ -17,6 +17,7 @@ options = {
     modes: ['tree', 'view', 'form', 'code', 'text'],
     name: 'foo',
     schema: {},
+    schemaRefs: { "otherSchema": {}},
     search: false,
     indentation: 2,
     theme: 'default'
diff --git a/types/jsonwebtoken/index.d.ts b/types/jsonwebtoken/index.d.ts
index 23d58789e1..f54d3862c9 100644
--- a/types/jsonwebtoken/index.d.ts
+++ b/types/jsonwebtoken/index.d.ts
@@ -77,10 +77,10 @@ export interface DecodeOptions {
     complete?: boolean;
     json?: boolean;
 }
-
+export type VerifyErrors=JsonWebTokenError | NotBeforeError | TokenExpiredError;
 export interface VerifyCallback {
     (
-        err: JsonWebTokenError | NotBeforeError | TokenExpiredError,
+        err: VerifyErrors,
         decoded: object | string,
     ): void;
 }
diff --git a/types/jss/index.d.ts b/types/jss/index.d.ts
index 27c8d779a6..c8e0f13c6c 100644
--- a/types/jss/index.d.ts
+++ b/types/jss/index.d.ts
@@ -3,6 +3,7 @@
 // Definitions by: Brenton Simpson <https://github.com/appsforartists>
 //                 Oleg Slobodskoi <https://github.com/kof>
 //                 Thomas Crockett <https://github.com/pelotom>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -104,13 +105,13 @@ export interface RuleOptions {
 	className: string;
 }
 export declare class SheetsRegistry {
-    constructor();
-    registry: ReadonlyArray<StyleSheet>;
-    readonly index: number;
-    add(sheet: StyleSheet): void;
-    reset(): void;
-    remove(sheet: StyleSheet): void;
-    toString(options?: ToCssOptions): string;
+	constructor();
+	registry: ReadonlyArray<StyleSheet>;
+	readonly index: number;
+	add(sheet: StyleSheet): void;
+	reset(): void;
+	remove(sheet: StyleSheet): void;
+	toString(options?: ToCssOptions): string;
 }
 export type CreateStyleSheetOptions<Name extends string = any> = Partial<{
 	media: string;
@@ -121,7 +122,7 @@ export type CreateStyleSheetOptions<Name extends string = any> = Partial<{
 	generateClassName: GenerateClassName<Name>;
 	classNamePrefix: string;
 }>;
-declare class JSS {
+export declare class JSS {
 	constructor(options?: Partial<JSSOptions>);
 	createStyleSheet<Name extends string>(
 		styles: Partial<Styles<Name>>,
@@ -137,6 +138,7 @@ declare class JSS {
  * Creates a new instance of JSS.
  */
 export function create(options?: Partial<JSSOptions>): JSS;
+export function createGenerateClassName(): GenerateClassName;
 declare const sharedInstance: JSS;
 /**
  * A global JSS instance.
diff --git a/types/jss/jss-tests.ts b/types/jss/jss-tests.ts
index 5e9a876036..4c7fcc9270 100644
--- a/types/jss/jss-tests.ts
+++ b/types/jss/jss-tests.ts
@@ -2,11 +2,12 @@
 
 import {
 	create as createJSS,
+	createGenerateClassName,
 	SheetsRegistry,
 	default as sharedInstance,
 } from 'jss';
 
-const jss = createJSS().setup({});
+const jss = createJSS().setup({ createGenerateClassName });
 jss.use({}, {}); // $ExpectType JSS
 
 const styleSheet = jss.createStyleSheet<string>(
diff --git a/types/jui-core/index.d.ts b/types/jui-core/index.d.ts
index 5a607f5721..5bc39848d0 100644
--- a/types/jui-core/index.d.ts
+++ b/types/jui-core/index.d.ts
@@ -53,7 +53,7 @@ export interface UtilBase {
     /**
      * use QuickSort
      */
-    sort(array: any[]): UtilQuickSort;
+    sort(array: any[]): (array: number[], isClone: boolean) => this;
 
     /**
      * caculate callback runtime
@@ -577,5 +577,3 @@ export interface UtilScaleOrdinal extends Function {
     rangeBands(interval: number, padding?: number, outerPadding?: number): () => void;
     invert(x: number): number;
 }
-
-export type UtilQuickSort = (array: number[], isClone: boolean) => this;
diff --git a/types/jws/index.d.ts b/types/jws/index.d.ts
index f384fadefc..fdbf1851c4 100644
--- a/types/jws/index.d.ts
+++ b/types/jws/index.d.ts
@@ -149,4 +149,5 @@ export type Algorithm = 'HS256' | 'HS384' | 'HS512' | 'RS256' |
 
 export interface Header {
     alg: Algorithm;
+    [name: string]: string;
 }
diff --git a/types/jws/jws-tests.ts b/types/jws/jws-tests.ts
index d5271b24ca..c6e62378f8 100644
--- a/types/jws/jws-tests.ts
+++ b/types/jws/jws-tests.ts
@@ -20,6 +20,13 @@ const signature = jws.sign({
   secret: 'has a van',
 });
 
+// jws.sign with extra header values
+const signatureWithHeaderParams = jws.sign({
+  header: { alg: 'HS256', foo: 'bar' },
+  payload: 'h. jon benjamin',
+  secret: 'has a van',
+});
+
 // jws.decode
 const message = jws.decode('djfakdid');
 
diff --git a/types/kafka-node/index.d.ts b/types/kafka-node/index.d.ts
index 71d1fd6728..2f44a7e767 100644
--- a/types/kafka-node/index.d.ts
+++ b/types/kafka-node/index.d.ts
@@ -9,6 +9,7 @@
 export class Client {
     constructor(connectionString: string, clientId?: string, options?: ZKOptions, noBatchOptions?: AckBatchOptions, sslOptions?: any);
     close(cb?: () => void): void;
+    loadMetadataForTopics(topics: string[], cb: (error: TopicsNotExistError | any, data: any) => any): void;
     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;
@@ -20,6 +21,8 @@ export class Client {
 export class KafkaClient extends Client {
     constructor(options?: KafkaClientOptions);
     connect(): void;
+    getListGroups(cb: (error: any, data: any) => any): void;
+    describeGroups(consumerGroups: any, cb: (error: any, data: any) => any): void;
 }
 
 export class Producer {
@@ -93,6 +96,12 @@ export class KeyedMessage {
     constructor(key: string, value: string | Buffer);
 }
 
+export class Admin {
+    constructor(kafkaClient: KafkaClient);
+    listGroups(cb: (error: any, data: any) => any): void;
+    describeGroups(consumerGroups: any, cb: (error: any, data: any) => any): void;
+}
+
 // # Interfaces
 
 export interface Message {
diff --git a/types/kafka-node/kafka-node-tests.ts b/types/kafka-node/kafka-node-tests.ts
index 0ffe5d86b7..1e433172ae 100644
--- a/types/kafka-node/kafka-node-tests.ts
+++ b/types/kafka-node/kafka-node-tests.ts
@@ -14,6 +14,8 @@ const optionsClient = new kafka.Client('localhost:2181/', 'sendMessage', {
 });
 optionsClient.topicExists(['topic'], (error: any) => {
 });
+optionsClient.loadMetadataForTopics(['topic'], (error: any, data: any) => {
+});
 optionsClient.refreshMetadata(['topic'], (error: any) => {
 });
 optionsClient.close();
@@ -48,6 +50,11 @@ const optionsProducer = new kafka.Producer(basicClient, {
   partitionerType: 0
 });
 
+optionsKafkaClient.getListGroups((error: any, data: any) => {
+});
+optionsKafkaClient.describeGroups([], (error: any, data: any) => {
+});
+
 const producer = new kafka.Producer(basicClient);
 producer.on('error', (error: Error) => {
 });
@@ -265,3 +272,9 @@ offset.fetchLatestOffsets(['t'], (err, offsets) => {
 });
 offset.fetchEarliestOffsets(['t'], (err, offsets) => {
 });
+
+const admin = new kafka.Admin(basicKafkaClient);
+admin.listGroups((err, data) => {
+});
+admin.describeGroups({}, (err, data) => {
+});
diff --git a/types/karma-coverage/index.d.ts b/types/karma-coverage/index.d.ts
index 03ca857449..50be80d5cf 100644
--- a/types/karma-coverage/index.d.ts
+++ b/types/karma-coverage/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/karma-runner/karma-coverage
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as karma from 'karma';
 import * as istanbul from 'istanbul';
diff --git a/types/karma-webpack/index.d.ts b/types/karma-webpack/index.d.ts
index 73e65a39f5..f7278b64a5 100644
--- a/types/karma-webpack/index.d.ts
+++ b/types/karma-webpack/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 
 import 'karma';
 import * as Webpack from 'webpack';
diff --git a/types/karma/index.d.ts b/types/karma/index.d.ts
index e2cce2c340..4b71c0a723 100644
--- a/types/karma/index.d.ts
+++ b/types/karma/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
@@ -248,6 +248,7 @@ declare namespace karma {
          * you can specify how many browsers should be running at once at any given point in time.
          */
         concurrency?: number;
+        customLaunchers?: { [key: string]: CustomLauncher };
         /**
          * @default []
          * @description List of files/patterns to exclude from loaded files.
@@ -294,6 +295,18 @@ declare namespace karma {
          * @description A list of log appenders to be used. See the documentation for [log4js] for more information.
          */
         loggers?: Log4jsAppenderConfigBase[];
+        /**
+         * @default []
+         * @description List of names of additional middleware you want the
+         * Karma server to use. Middleware will be used in the order listed.
+         * You must have installed the middleware via a plugin/framework
+         * (either inline or via NPM). Additional information can be found in
+         * [plugins](http://karma-runner.github.io/2.0/config/plugins.html).
+         * The plugin must provide an express/connect middleware function
+         * (details about this can be found in the
+         * [Express](http://expressjs.com/guide/using-middleware.html) docs).
+         */
+        middleware?: string[];
         /**
          * @default {}
          * @description Redefine default mapping from file extensions to MIME-type.
@@ -458,6 +471,13 @@ declare namespace karma {
          */
         nocache?: boolean;
     }
+
+    interface CustomLauncher {
+        base: string;
+        browserName?: string;
+        flags?: string[];
+        platform?: string;
+    }
 }
 
 declare var karma: karma.Karma;
diff --git a/types/karma/karma-tests.ts b/types/karma/karma-tests.ts
index b21fa88e50..a8adc36f45 100644
--- a/types/karma/karma-tests.ts
+++ b/types/karma/karma-tests.ts
@@ -88,6 +88,8 @@ module.exports = function(config: karma.Config) {
       'coverage'
     ],
 
+    middleware: ['foo', 'bar'],
+
     mime: {
       'text/x-typescript': ['ts', 'tsx']
     },
@@ -104,6 +106,12 @@ module.exports = function(config: karma.Config) {
       'Chrome',
       'Firefox'
     ],
+    customLaunchers: {
+      ChromiumHeadless_without_security: {
+        base: 'ChromiumHeadless',
+        flags: ['--no-sandbox', '--disable-setuid-sandbox'],
+      },
+    },
 
     singleRun: true
   });
diff --git a/types/keen-tracking/index.d.ts b/types/keen-tracking/index.d.ts
new file mode 100644
index 0000000000..69f513312c
--- /dev/null
+++ b/types/keen-tracking/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for keen-tracking 2.0
+// Project: https://github.com/keen/keen-tracking.js#readme
+// Definitions by: Rui Ferreira <https://github.com/rui-ferreira>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export default class KeenTracking {
+    constructor(options: { projectId: string; writeKey: string; requestType?: string });
+
+    recordEvent(
+        collectionName: string,
+        event: object
+    ): Promise<{ created: boolean }>;
+
+    recordEvents(events: {
+        [collectionName: string]: object[];
+    }): Promise<{
+        [collectionName: string]: boolean[];
+    }>;
+}
diff --git a/types/keen-tracking/keen-tracking-tests.ts b/types/keen-tracking/keen-tracking-tests.ts
new file mode 100644
index 0000000000..ce89d00bcb
--- /dev/null
+++ b/types/keen-tracking/keen-tracking-tests.ts
@@ -0,0 +1,29 @@
+import KeenTracking from "keen-tracking";
+
+// $ExpectType KeenTracking
+let tc = new KeenTracking({
+  projectId: "xpto",
+  writeKey: "XPTOQWEKASDKASD"
+});
+
+// $ExpectType KeenTracking
+tc = new KeenTracking({
+  projectId: "xpto",
+  writeKey: "XPTOQWEKASDKASD",
+  requestType: "beacon"
+});
+
+// $ExpectType Promise<{ created: boolean; }>
+tc.recordEvent("my_collection", {a: "xxx", b: 123});
+
+// $ExpectType Promise<{ [collectionName: string]: boolean[]; }>
+tc.recordEvents({
+  my_collection_1: [
+    {a: "aaa", b: 111},
+    {a: "bbb", b: 222}
+  ],
+  my_collection_2: [
+    {x: 1.0, y: {z: "ok"}},
+    {x: 2.0, y: {z: "ko"}}
+  ]
+});
diff --git a/types/keen-tracking/tsconfig.json b/types/keen-tracking/tsconfig.json
new file mode 100644
index 0000000000..c5476575c9
--- /dev/null
+++ b/types/keen-tracking/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",
+        "keen-tracking-tests.ts"
+    ]
+}
diff --git a/types/keen-tracking/tslint.json b/types/keen-tracking/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/keen-tracking/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/kendo-ui/index.d.ts b/types/kendo-ui/index.d.ts
index dc9f7d43f0..c1d114aaee 100644
--- a/types/kendo-ui/index.d.ts
+++ b/types/kendo-ui/index.d.ts
@@ -1081,6 +1081,7 @@ declare namespace kendo.data {
         query(options?: any): JQueryPromise<any>;
         read(data?: any): JQueryPromise<any>;
         remove(model: kendo.data.ObservableObject): void;
+        skip(): number;
         sort(sort: DataSourceSortItem): void;
         sort(sort: DataSourceSortItem[]): void;
         sort(): DataSourceSortItem[];
@@ -20299,16 +20300,19 @@ interface JQueryPromise<T> {
 
 interface JQuery {
 
+    data(key: any): any;
+
     kendoDraggable(): JQuery;
     kendoDraggable(options: kendo.ui.DraggableOptions): JQuery;
+    data(key: "kendoDraggable"): kendo.ui.Draggable;
 
     kendoDropTarget(): JQuery;
     kendoDropTarget(options: kendo.ui.DropTargetOptions): JQuery;
+    data(key: "kendoDropTarget"): kendo.ui.DropTarget;
 
     kendoDropTargetArea(): JQuery;
     kendoDropTargetArea(options: kendo.ui.DropTargetAreaOptions): JQuery;
-
-    data(key: any): any;
+    data(key: "kendoDropTargetArea"): kendo.ui.DropTargetArea;
 
     kendoAlert(): JQuery;
     kendoAlert(options: kendo.ui.AlertOptions): JQuery;
diff --git a/types/klaw/v1/index.d.ts b/types/klaw/v1/index.d.ts
index 74939f30c2..f65da7af6f 100644
--- a/types/klaw/v1/index.d.ts
+++ b/types/klaw/v1/index.d.ts
@@ -5,7 +5,7 @@
 
 /// <reference types="node" />
 
-import * as fs from "fs";
+import { Stats } from "fs";
 import { Readable, ReadableOptions } from 'stream';
 
 declare function K(root: string, options?: K.Options): K.Walker;
@@ -13,16 +13,16 @@ declare function K(root: string, options?: K.Options): K.Walker;
 declare namespace K {
     interface Item {
         path: string;
-        stats: fs.Stats;
+        stats: Stats;
     }
 
     type QueueMethod = "shift" | "pop";
 
     interface Options extends ReadableOptions {
         queueMethod?: QueueMethod;
-        pathSorter?: (pathA: string, pathB: string) => number;
+        pathSorter?(pathA: string, pathB: string): number;
         fs?: any; // fs or mock-fs
-        filter?: (path: string) => boolean;
+        filter?(path: string): boolean;
     }
 
     type Event = "close" | "data" | "end" | "readable" | "error";
diff --git a/types/knex-postgis/index.d.ts b/types/knex-postgis/index.d.ts
index b63c1f11dd..193c0aa4a5 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.3
+// TypeScript Version: 2.8
 
 import * as GeoJSON from 'geojson';
 import * as Knex from 'knex';
diff --git a/types/knex/index.d.ts b/types/knex/index.d.ts
index 624fde2d01..b400af2497 100644
--- a/types/knex/index.d.ts
+++ b/types/knex/index.d.ts
@@ -1,13 +1,12 @@
 // 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>
 //                 Pablo Rodríguez <https://github.com/MeLlamoPablo>
 //                 Matt R. Wilson <https://github.com/mastermatt>
 //                 Satana Charuwichitratana <https://github.com/micksatana>
 //                 Shrey Jain <https://github.com/shreyjain1994>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
@@ -21,9 +20,10 @@ type Value = string | number | boolean | Date | Array<string> | Array<number> |
 type ValueMap = { [key: string]: Value | Knex.QueryBuilder };
 type ColumnName = string | Knex.Raw | Knex.QueryBuilder | {[key: string]: string };
 type TableName = string | Knex.Raw | Knex.QueryBuilder;
+type Identifier = { [alias: string]: string };
 
 interface Knex extends Knex.QueryInterface {
-    (tableName?: TableName): Knex.QueryBuilder;
+    (tableName?: TableName | Identifier): Knex.QueryBuilder;
     VERSION: string;
     __knex__: string;
 
@@ -137,14 +137,19 @@ declare namespace Knex {
         limit(limit: number): QueryBuilder;
 
         // Aggregation
-        count(columnName?: string): QueryBuilder;
-        countDistinct(columnName?: string): QueryBuilder;
-        min(columnName: string): QueryBuilder;
-        max(columnName: string): QueryBuilder;
-        sum(columnName: string): QueryBuilder;
-        sumDistinct(columnName: string): QueryBuilder;
-        avg(columnName: string): QueryBuilder;
-        avgDistinct(columnName: string): QueryBuilder;
+        count(...columnNames: string[]): QueryBuilder;
+        count(columnName: Record<string, string | string[] | Knex.Raw> | Knex.Raw): QueryBuilder;
+        countDistinct(columnName: string | Record<string, string | Knex.Raw> | Knex.Raw): QueryBuilder;
+        min(columnName: string, ...columnNames: string[]): QueryBuilder;
+        min(columnName: Record<string, string | string[] | Knex.Raw> | Knex.Raw): QueryBuilder;
+        max(columnName: string, ...columnNames: string[]): QueryBuilder;
+        max(columnName: Record<string, string | string[] | Knex.Raw> | Knex.Raw): QueryBuilder;
+        sum(columnName: string, ...columnNames: string[]): QueryBuilder;
+        sum(columnName: Record<string, string | string[] | Knex.Raw> | Knex.Raw): QueryBuilder;
+        sumDistinct(columnName: string | Record<string, string | Knex.Raw> | Knex.Raw): QueryBuilder;
+        avg(columnName: string, ...columnNames: string[]): QueryBuilder;
+        avg(columnName: Record<string, string | string[] | Knex.Raw> | Knex.Raw): QueryBuilder;
+        avgDistinct(columnName: string | Record<string, string | Knex.Raw> | Knex.Raw): QueryBuilder;
         increment(columnName: string, amount?: number): QueryBuilder;
         decrement(columnName: string, amount?: number): QueryBuilder;
 
@@ -155,7 +160,7 @@ declare namespace Knex {
         pluck(column: string): QueryBuilder;
 
         insert(data: any, returning?: string | string[]): QueryBuilder;
-        modify(callback: QueryCallback, ...args: any[]): QueryBuilder;
+        modify(callback: QueryCallbackWithArgs, ...args: any[]): QueryBuilder;
         update(data: any, returning?: string | string[]): QueryBuilder;
         update(columnName: string, value: Value, returning?: string | string[]): QueryBuilder;
         returning(column: string | string[]): QueryBuilder;
@@ -179,7 +184,7 @@ declare namespace Knex {
     }
 
     interface Table {
-        (tableName: TableName): QueryBuilder;
+        (tableName: TableName | Identifier): QueryBuilder;
         (callback: Function): QueryBuilder;
         (raw: Raw): QueryBuilder;
     }
@@ -285,12 +290,6 @@ declare namespace Knex {
         (columnName: string): QueryBuilder;
     }
 
-    interface WhereIn {
-        (columnName: string, values: Value[]): QueryBuilder;
-        (columnName: string, callback: QueryCallback): QueryBuilder;
-        (columnName: string, query: QueryBuilder): QueryBuilder;
-    }
-
     interface WhereBetween {
         (columnName: string, range: [Value, Value]): QueryBuilder;
     }
@@ -305,7 +304,8 @@ declare namespace Knex {
     }
 
     interface WhereIn {
-        (columnName: string, values: Value[]): QueryBuilder;
+        (columnName: string, values: Value[] | QueryBuilder | QueryCallback): QueryBuilder;
+        (columnNames: string[], values: Value[][] | QueryBuilder | QueryCallback): QueryBuilder;
     }
 
     interface GroupBy extends RawQueryBuilder, ColumnNameQueryBuilder {
@@ -316,9 +316,9 @@ declare namespace Knex {
     }
 
     interface Union {
-        (callback: QueryCallback, wrap?: boolean): QueryBuilder;
-        (callbacks: QueryCallback[], wrap?: boolean): QueryBuilder;
-        (...callbacks: QueryCallback[]): QueryBuilder;
+        (callback: QueryCallback | QueryBuilder | Raw, wrap?: boolean): QueryBuilder;
+        (callbacks: (QueryCallback | QueryBuilder | Raw)[], wrap?: boolean): QueryBuilder;
+        (...callbacks: (QueryCallback | QueryBuilder | Raw)[]): QueryBuilder;
         // (...callbacks: QueryCallback[], wrap?: boolean): QueryInterface;
     }
 
@@ -360,6 +360,8 @@ declare namespace Knex {
     //
 
     type QueryCallback = (this: QueryBuilder, builder: QueryBuilder) => void;
+    type QueryCallbackWithArgs = (this: QueryBuilder, builder: QueryBuilder, ...args: any[]) => void;
+
     interface QueryBuilder extends QueryInterface, ChainableInterface {
         or: QueryBuilder;
         and: QueryBuilder;
@@ -431,7 +433,7 @@ declare namespace Knex {
         text(columnName: string, textType?: string): ColumnBuilder;
         string(columnName: string, length?: number): ColumnBuilder;
         float(columnName: string, precision?: number, scale?: number): ColumnBuilder;
-        decimal(columnName: string, precision?: number, scale?: number): ColumnBuilder;
+        decimal(columnName: string, precision?: number | null, scale?: number): ColumnBuilder;
         boolean(columnName: string): ColumnBuilder;
         date(columnName: string): ColumnBuilder;
         dateTime(columnName: string): ColumnBuilder;
@@ -538,6 +540,7 @@ declare namespace Knex {
         acquireConnectionTimeout?: number;
         useNullAsDefault?: boolean;
         searchPath?: string | string[];
+        asyncStackTraces?: boolean;
     }
 
     interface ConnectionConfig {
diff --git a/types/knex/knex-tests.ts b/types/knex/knex-tests.ts
index 9167ad3f77..e7fb3e1b81 100644
--- a/types/knex/knex-tests.ts
+++ b/types/knex/knex-tests.ts
@@ -1,7 +1,4 @@
-"use strict";
 import Knex = require('knex');
-import Promise = require('bluebird');
-import _ = require('lodash');
 
 // Initializing the Library
 var knex = Knex({
@@ -254,6 +251,58 @@ knex('users').whereRaw('id = ?', [1]);
 knex('users').whereRaw('id = :id', { id: 1 });
 knex('users').whereRaw('id = :id', { id: knex('users').select('id').limit(1) });
 
+// Aggregate functions can use string/object parameters
+knex('users').count();
+knex('users').count('*');
+knex('users').count('id', 'votes');
+knex('users').count({count: '*'});
+knex('users').count({count: ['id', 'votes']});
+knex('users').count({count: knex.raw('*')});
+knex('users').count(knex.raw('id'));
+
+knex('users').countDistinct('votes');
+knex('users').countDistinct(knex.raw('votes'));
+knex('users').countDistinct({votes: 'votes'});
+knex('users').countDistinct({votes: knex.raw('votes')});
+
+knex('users').avg('id');
+knex('users').avg('id', 'votes');
+knex('users').avg({avg: 'id'});
+knex('users').avg({avg: ['id', 'votes']});
+knex('users').avg({ab: knex.raw('a + b')});
+knex('users').avg(knex.raw('votes'));
+
+knex('users').avgDistinct('votes');
+knex('users').avgDistinct(knex.raw('votes'));
+knex('users').avgDistinct({votes: 'votes'});
+knex('users').avgDistinct({votes: knex.raw('votes')});
+
+knex('users').max('id');
+knex('users').max('id', 'votes');
+knex('users').max({max: 'id'});
+knex('users').max({max: ['id', 'votes']});
+knex('users').max({ab: knex.raw('a + b')});
+knex('users').max(knex.raw('votes'));
+
+knex('users').min('id');
+knex('users').min('id', 'votes');
+knex('users').min({min: 'id'});
+knex('users').min({min: ['id', 'votes']});
+knex('users').min({ab: knex.raw('a + b')});
+knex('users').min(knex.raw('votes'));
+
+knex('users').sum('id');
+knex('users').sum('id', 'votes');
+knex('users').sum({sum: 'id'});
+knex('users').sum({sum: ['id', 'votes']});
+knex('users').sum({ab: knex.raw('a + b')});
+knex('users').sum(knex.raw('votes'));
+
+knex('users').sumDistinct('votes');
+knex('users').sumDistinct(knex.raw('votes'));
+knex('users').sumDistinct({votes: 'votes'});
+knex('users').sumDistinct({votes: knex.raw('votes')});
+
 // Join methods
 knex('users')
   .join('contacts', 'users.id', '=', 'contacts.user_id')
@@ -767,7 +816,7 @@ knex.transaction<{ length: number }>(function(trx) {
 // transacting handles undefined
 knex.insert({ name: 'Old Books'}).transacting(undefined);
 
-knex.schema.withSchema("public").hasTable("table") as Promise<boolean>;
+knex.schema.withSchema("public").hasTable("table"); // $ExpectType Bluebird<boolean>
 
 knex.schema.createTable('users', function (table) {
   table.increments();
@@ -856,8 +905,8 @@ knex.select('name').from('users')
   .andWhere('id', '<', 200)
   .limit(10)
   .offset(x)
-  .then(function(rows: any) {
-    return _.map(rows, 'name');
+  .then(function(rows) {
+    return rows.map((r: any) => r.name);
   })
   .then(function(names: any) {
     return knex.select('id').from('nicknames').whereIn('nickname', names);
@@ -936,7 +985,7 @@ knex.select('name').from('users')
   .offset(x)
   .exec(function(err: any, rows: any[]) {
     if (err) return console.error(err);
-    knex.select('id').from('nicknames').whereIn('nickname', _.map(rows, 'name') as any)
+    knex.select('id').from('nicknames').whereIn('nickname', rows.map((r: any) => r.name))
       .exec(function(err: any, rows: any[]) {
         if (err) return console.error(err);
         console.log(rows);
@@ -1045,10 +1094,10 @@ knex('users')
   }).unionAll(function(builder) {
     let self: Knex.QueryBuilder = this;
     self = builder;
-  }).modify(function(builder) {
+  }).modify(function(builder, aBool) {
     let self: Knex.QueryBuilder = this;
     self = builder;
-  });
+  }, true);
 
 //
 // Migrations
@@ -1093,3 +1142,74 @@ knex.schema
 knex.schema.createTable('testTable', function (table) {
     table.binary('binaryKey', 16).primary(); //will make table with binaryKey type BINARY(16)
 });
+
+// allow creating decimal column that can store that can store numbers of any
+// precision and scale. (Only supported for Oracle, SQLite, Postgres)
+var knex = Knex({
+    client: 'pg'
+});
+
+knex.schema
+    .dropTableIfExists('testTable')
+    .createTable('testTable', function (table) {
+        table.decimal('dec', null);
+    })
+    .dropTable('testTable');
+
+// allow specifying an alias for a table name
+knex.schema
+    .dropTableIfExists('foo')
+    .dropTableIfExists('bar')
+    .createTable('foo', function (table) {
+        table.uuid('id').primary();
+    })
+    .createTable('bar', function (table) {
+        table.uuid('id').primary();
+    });
+
+knex({
+    table1: 'foo',
+    table2: 'bar'
+})
+    .select({
+        table1Id: 'table1.id',
+        table2Id: 'table2.id'
+    });
+
+knex('characters')
+    .select()
+    .whereIn(['name', 'class'], [['Bar', 'Fighter'], ['Foo', 'Druid']]);
+
+knex('characters')
+    .select()
+    .whereIn('name', knex('characters').select('name'));
+knex('characters')
+    .select()
+    .whereIn(['name', 'class'], knex('characters').select('name', 'class'));
+
+knex('characters')
+    .select()
+    .whereIn('name', function() {
+        this.select('name').from('characters');
+    });
+knex('characters')
+    .select()
+    .whereIn(['name', 'class'], function() {
+        this.select('name', 'class').from('characters');
+    });
+
+knex('characters')
+    .select()
+    .where({ name: 'Bar', class: 'Fighter' })
+    .union(knex('characters').select().where({ name: 'Foo', class: 'Druid' }));
+knex('characters')
+    .select()
+    .where({ name: 'Bar', class: 'Fighter' })
+    .union([knex('characters').select().where({ name: 'Foo', class: 'Druid' })]);
+knex('characters')
+    .select()
+    .where({ name: 'Bar', class: 'Fighter' })
+    .union(
+        knex('characters').select().where({ name: 'Foo', class: 'Druid' }),
+        knex('characters').select().where({ name: 'Baz', class: 'Paladin' })
+    );
diff --git a/types/knockout/index.d.ts b/types/knockout/index.d.ts
index 5076a05231..215d38e7f1 100644
--- a/types/knockout/index.d.ts
+++ b/types/knockout/index.d.ts
@@ -9,22 +9,18 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-interface KnockoutExtensionFunctions {
-    [key: string]: any;
-}
-
-interface KnockoutSubscribableFunctions<T> extends KnockoutExtensionFunctions {
+interface KnockoutSubscribableFunctions<T> {
     notifySubscribers(valueToWrite?: T, event?: string): void;
 }
 
-interface KnockoutComputedFunctions<T> extends KnockoutExtensionFunctions {
+interface KnockoutComputedFunctions<T> {
 }
 
-interface KnockoutObservableFunctions<T> extends KnockoutExtensionFunctions {
-    equalityComparer(a: any, b: any): boolean;
+interface KnockoutObservableFunctions<T> {
+    equalityComparer(a: T, b: T): boolean;
 }
 
-interface KnockoutObservableArrayFunctions<T> extends KnockoutExtensionFunctions {
+interface KnockoutObservableArrayFunctions<T> {
     // General Array functions
     indexOf(searchElement: T, fromIndex?: number): number;
     slice(start: number, end?: number): T[];
@@ -82,6 +78,10 @@ interface KnockoutComputedStatic {
 interface KnockoutComputed<T> extends KnockoutObservable<T>, KnockoutComputedFunctions<T> {
     fn: KnockoutComputedFunctions<any>;
 
+    // It's possible for a to be undefined, since the equalityComparer is run on the initial
+    // computation with undefined as the first argument. This is user-relevant for deferred computeds.
+    equalityComparer(a: T | undefined, b: T): boolean;
+
     dispose(): void;
     isActive(): boolean;
     getDependenciesCount(): number;
@@ -106,12 +106,14 @@ interface KnockoutObservableArray<T> extends KnockoutObservable<T[]>, KnockoutOb
 interface KnockoutObservableStatic {
     fn: KnockoutObservableFunctions<any>;
 
-    <T>(value?: T | null): KnockoutObservable<T>;
+    <T>(value: T): KnockoutObservable<T>;
+    <T = any>(value: null): KnockoutObservable<T | null>
+    <T = any>(): KnockoutObservable<T | undefined>
 }
 
 interface KnockoutObservable<T> extends KnockoutSubscribable<T>, KnockoutObservableFunctions<T> {
     (): T;
-    (value: T | null): void;
+    (value: T): void;
 
     peek(): T;
     valueHasMutated?:{(): void;};
diff --git a/types/knockout/test/index.ts b/types/knockout/test/index.ts
index 38f439efb7..094cab2aa1 100644
--- a/types/knockout/test/index.ts
+++ b/types/knockout/test/index.ts
@@ -601,6 +601,13 @@ function test_misc() {
 		}
 	}
 
+    ko.observable("foo").equalityComparer = (a, b) => {
+        return a.toLowerCase() === b.toLowerCase();
+    };
+    ko.computed(() => "foo").equalityComparer = (a, b) => {
+        return (a !== undefined) && a.toLowerCase() === b.toLowerCase();
+    };
+
 }
 
 interface KnockoutBindingHandlers {
@@ -750,3 +757,7 @@ interface MyObservableArray extends KnockoutObservableArray<any> {
 interface MyComputed extends KnockoutComputed<any> {
     isBeautiful?: boolean;
 }
+
+function observableAny() {
+    ko.observable<number>(5 as any); // $ExpectType KnockoutObservable<number>
+}
diff --git a/types/knockout/test/templatingBehaviors.ts b/types/knockout/test/templatingBehaviors.ts
index b69cb080f8..bf87b784da 100644
--- a/types/knockout/test/templatingBehaviors.ts
+++ b/types/knockout/test/templatingBehaviors.ts
@@ -575,7 +575,8 @@ describe('Templating', function() {
 
         // Now set the observable to null and check it's treated like an empty array
         // (because how else should null be interpreted?)
-        myArray(null);
+        // DefinitelyTyped note: while KO accepts this, I wouldn't consider it a well-typed usage of the API
+        myArray(null); // $ExpectError
         expect(testNode.childNodes[0].childNodes.length).toEqual(0);
     });
 
@@ -640,7 +641,7 @@ describe('Templating', function() {
         ko.setTemplateEngine(new dummyTemplateEngine({ myTemplate: "Value: [js: myProp().childProp]" }));
         testNode.innerHTML = "<div data-bind='template: { name: \"myTemplate\", \"if\": myProp }'></div>";
 
-        var viewModel = { myProp: ko.observable({ childProp: 'abc' }) };
+        var viewModel = { myProp: ko.observable<{childProp: string} | null>({ childProp: 'abc' }) };
         ko.applyBindings(viewModel, testNode);
 
         // Initially there is a value
@@ -678,7 +679,7 @@ describe('Templating', function() {
         ko.setTemplateEngine(new dummyTemplateEngine({ myTemplate: "Value: [js: myProp().childProp]" }));
         testNode.innerHTML = "<div data-bind='template: { name: \"myTemplate\", \"if\": myProp, foreach: [$data, $data, $data] }'></div>";
 
-        var viewModel = { myProp: ko.observable({ childProp: 'abc' }) };
+        var viewModel = { myProp: ko.observable<{childProp: string} | null>({ childProp: 'abc' }) };
         ko.applyBindings(viewModel, testNode);
         expect(testNode.childNodes[0].childNodes[0].nodeValue).toEqual("Value: abc");
         expect(testNode.childNodes[0].childNodes[1].nodeValue).toEqual("Value: abc");
diff --git a/types/knuddels-userapps-api/index.d.ts b/types/knuddels-userapps-api/index.d.ts
index 36c0c139de..1985c305a2 100644
--- a/types/knuddels-userapps-api/index.d.ts
+++ b/types/knuddels-userapps-api/index.d.ts
@@ -1,2741 +1,2975 @@
-// Type definitions for Knuddels UserApps API 1.0
+// Type definitions for Knuddels UserApps API 1.00109481
 // Project: https://developer.knuddels.de
 // Definitions by: Knuddels GmbH & Co. KG <https://github.com/Knuddels>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-// JSON definition
-interface Json {
-	[x: string]: string | number | boolean | Date | Json | JsonArray;
-}
-// tslint:disable-next-line no-empty-interface
-interface JsonArray extends Array<string | number | boolean | Date | Json | JsonArray> { }
-// serializable objects (for persistence)
-type KnuddelsSerializable = string | number | boolean | User | BotUser;
-interface KnuddelsJson {
-	[x: string]: string | number | boolean | Date | KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable;
-}
-// tslint:disable-next-line no-empty-interface
-interface KnuddelsJsonArray extends Array<string | number | boolean | Date | KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable> { }
-// "data" that may be send between apps and between server and client
-type KnuddelsEvent = string | Json | KnuddelsEventArray;
-// tslint:disable-next-line no-empty-interface
-interface KnuddelsEventArray extends Array<string | KnuddelsEvent | KnuddelsEventArray> { }
+// helper types
+export type JsonData = string | number | boolean | Date | Json | JsonArray;
+export type KnuddelsJsonData = string | number | boolean | Date | KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable;
+export type KnuddelsSerializable = string | number | boolean | User | BotUser;
+export type KnuddelsEvent = string | Json | KnuddelsEventArray;
 
-/**
- * App ist die abstrakte Klasse einer konkreten App, die ein Entwickler schreiben kann.
- * Im eigenen Javascript-Code muss eine Variable mit dem Namen <em>App</em> vorhanden sein, damit eine App lauffähig ist.
- */
-interface App {
-	/**
-	 * Dieses Methode wird aufgerufen, sobald ein Nutzer versucht den Channel zu betreten.
-	 * Die App kann nun entscheiden, ob der Nutzer den Channel betreten darf.
-	 *
-	 * <b style="color:red;">Hinweis:</b> Um ein responsives User Interface für den Nutzer,
-	 * der den Channel betreten möchte zu garantieren, muss die App innerhalb von einer Sekunde auf diese Anfrage reagieren,
-	 * damit ihre Antwort in das Ergebnis einfliesst.
-	 *
-	 * Mit bestimmten Smileyfeatures ist es derzeit trotzdem möglich, den Channel zu betreten.
-	 * Diese Nutzer können nicht ausgesperrt werden:
-	 * <ul>
-	 * <li>Channelbesitzer</li>
-	 * <li>Channelmoderatoren und HZAs</li>
-	 * <li>Admins (sofern notwendig)</li>
-	 * <li>Sysadmins</li>
-	 * <li>User Apps Team (Mitarbeiter von Knuddels)</li>
-	 * </ul>
-	 *
-	 * Ist der Channel mit einem Passwort geschützt und der Nutzer, der versucht den Channel zu betreten kennt das Passwort,
-	 * so kann er nicht aus dem Channel ausgeschlossen werden.
-	 */
-	mayJoinChannel?(user: User): ChannelJoinPermission;
-	/**
-	 * Diese Methode wird jedes Mal aufgerufen, sobald ein Nutzer versucht eine öffentliche Nachricht zu senden.
-	 * Die App kann nun entscheiden, ob die Nachricht veröffentlicht werden darf.
-	 *
-	 * Laufen mehrere Apps im selben Channel, so wird die Nachricht veröffentlicht, sofern alle Apps es erlauben.
-	 *
-	 * Dauert das Fragen aller Apps nach Erlaubnis länger als 10 Sekunden, so wird die Antwort genutzt, die bis dahin
-	 * gegeben wurde.
-	 */
-	mayShowPublicMessage?(publicMessage: PublicMessage): boolean;
-	/**
-	 * Diese Methode wird jedes Mal aufgerufen, sobald ein Nutzer versucht eine öffentliche Handlung auszuführen.
-	 * Die App kann nun entscheiden, ob die Handlung ausgeführt werden darf.
-	 *
-	 * Laufen mehrere Apps im selben Channel, so wird die Handlung ausgeführt, sofern alle Apps es erlauben.
-	 *
-	 * Dauert das Fragen aller Apps nach Erlaubnis länger als 10 Sekunden, so wird die Antwort genutzt, die bis dahin
-	 * gegeben wurde.
-	 */
-	mayShowPublicActionMessage?(publicActionMessage: PublicActionMessage): boolean;
-	/**
-	 * Diese Methode wird aufgerufen, sobald die App startet.
-	 * Dies ist der beste Zeipunkt um Werte zu initialisieren und aus der Persistenz zu lesen.
-	 */
-	onAppStart?(): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn ein User Knuddel an den BotUser gesendet hat.
-	 * Es ist die Aufgabe der App in dieser Methode zu entscheiden, ob sie die Knuddel annimmt oder ablehnt.
-	 * Wird diese Methode von der App nicht implementiert, so werden Knuddel automatisch akzeptiert.
-	 * Ist diese Methode implementiert und es treten Fehler (Exceptions, Timeout,...) auf oder der Entwickler entscheidet nicht,
-	 * was mit den Knuddel geschehen soll, so werden diese vom App-System automatisch an den Absender zurück geschickt.
-	 * <br />
-	 * <b style="color:red;">Wichtig:</b> Zum Zeitpunkt des Aufrufs dieser Methode wurden die Knuddel noch nicht an den BotUser übertragen.
-	 */
-	onBeforeKnuddelReceived?(knuddelTransfer: KnuddelTransfer): void;
-	/**
-	 * Diese Methode wird aufgerufen, sobald ein BotUser Knuddel von einem User erhalten hat.
-	 */
-	onKnuddelReceived?(sender: User, receiver: BotUser, knuddelAmount: KnuddelAmount, transferReason: string): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn die App sich darauf vorbereiten soll heruntergefahren zu werden.
-	 * Als Parameter wird die geschätzte Zeit übergeben, die die App noch hat, bis sie heruntergefahren wird
-	 * und der Aufruf App/onShutdown:event folgt.
-	 *
-	 * App/onPrepareShutdown:event kann dazu benutzt werden das Nutzererlebnis zu verbessern,
-	 * sofern eine App heruntergefahren werden muss (bsp. für Updates).
-	 * Eine Spiele-App könnte z.B. entscheiden, dass sie keine weiteren Spiele eröffnet und den Spielern offener Spiele
-	 * die Information anzeigt, wie lange das Spiel noch läuft, bevor es unentschieden endet.
-	 *
-	 * <br><br><b style="color:red;">Achtung:</b> Die Methode kann im Lebenszyklus einer App mehrfach aufgerufen werden.
-	 */
-	onPrepareShutdown?(secondsTillShutdown: number): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn ein BotUser privat angeschrieben wird.
-	 */
-	onPrivateMessage?(privateMessage: PrivateMessage): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn im Channel der App
-	 * eine öffentliche Nachricht geschrieben wird.
-	 * Für Nachrichten von BotUsern wird diese Methode nicht aufgerufen.
-	 */
-	onPublicMessage?(publicMessage: PublicMessage): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn im Channel der App
-	 * eine Event-Nachricht veröffentlicht wird.
-	 * Für Nachrichten von BotUsern wird diese Methode nicht aufgerufen.
-	 */
-	onPublicEventMessage?(publicEventMessage: PublicEventMessage): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn im Channel der App
-	 * eine öffentliche Handlung durchgeführt wird.
-	 * Für Handlungen von BotUsern wird diese Methode nicht aufgerufen.
-	 */
-	onPublicActionMessage?(publicActionMessage: PublicActionMessage): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn eine App beendet wird.
-	 * Sobald diese Methode aufgerufen wird, steht nur noch ein begrenzter Teil der API zur Verfügung.
-	 * Die App sollte den kompletten Zustand in der Persistenz speichern, sodass der Zustand
-	 * beim nächsten App/onAppStart:event wiederhergestellt werden kann.
-	 *
-	 * Während des Shutdowns können asynchrone each-Methoden, wie UserPersistenceNumbers/each:method
-	 * und UserAccess/eachAccessibleUser:method nicht zuverlässig genutzt werden.
-	 */
-	onShutdown?(): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn ein User im Channel der App
-	 * über die Systemfunktionen (/dice, /diceo) würfelt.
-	 * Die App kann auf das Ergebnis zugreifen und die Daten für die Auswertung und Entscheidungen nutzen.
-	 */
-	onUserDiced?(diceEvent: DiceEvent): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn ein User den Channel der App betritt.
-	 */
-	onUserJoined?(user: User): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn ein User den Channel der App verlässt.
-	 */
-	onUserLeft?(user: User): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn aus einer anderen App ein Event mit sendAppEvent versendet wurde.
-	 */
-	onAppEventReceived?(appInstance: AppInstance, type: string, data: KnuddelsEvent): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn aus dem HTML User Interface ein Event mit
-	 * sendEvent() gesendet wurde.
-	 */
-	onEventReceived?(user: User, type: string, data: KnuddelsEvent, appContentSession: AppContentSession): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn ein User Knuddel in seinen KnuddelAccount
-	 * eingezahlt hat.
-	 */
-	onAccountReceivedKnuddel?(sender: User, receiver: BotUser, knuddelAmount: KnuddelAmount, transferReason: string, knuddelAccount: KnuddelAccount): void;
-	/**
-	 * Diese Methode wird aufgerufen, wenn sich die Anzahl der Knuddel auf einem KnuddelAccount eines User
-	 * geändert hat.
-	 */
-	onAccountChangedKnuddelAmount?(user: User, knuddelAccount: KnuddelAccount, oldKnuddelAmount: KnuddelAmount, newKnuddelAmount: KnuddelAmount): void;
-	/**
-	 * Ermöglicht das Registrieren eigener Chatbefehle.
-	 * In einem Channel kann nur eine App laufen, die einen bestimmten Chatbefehl nutzt.
-	 * Versucht eine zweite App einen Chatbefehl zu registrieren, den eine andere
-	 * App bereits nutzt, so wird ein Fehler geloggt und die App startet nicht bzw. fährt herunter.
-	 *
-	 * Die Struktur eines registrierten Chatbefehls ist:
-	 * <code>commandName: function (user, params, command) {}</code>
-	 *
-	 *
-	 * <ul>
-	 * <li><code>commandName</code> ist der Name der Funktion, wie sie aufgerufen wird (beispielsweise /commandname)</li>
-	 * <li><code>user</code> ist der Nutzer, der die Funktion aufgerufen hat</li>
-	 * <li><code>params</code> sind die Parameter, die der Nutzer hinter dem Befehl eingegeben hat (beispielsweise /commandname params)</li>
-	 * <li><code>command</code> ist der Name des Befehl selbst (beispielsweise commandName)</li>
-	 * </ul>
-	 */
-	chatCommands?: { [commandName: string]: (user: User, params: string, command: string) => void };
+// helper interfaces
+declare global {
+	interface Json {
+		[x: string]: JsonData;
+	}
+
+	interface KnuddelsJson {
+		[x: string]: KnuddelsJsonData;
+	}
+
+	interface JsonArray extends Array<JsonData> {
+	}
+
+	interface KnuddelsJsonArray extends Array<KnuddelsJsonData> {
+	}
+
+	interface KnuddelsEventArray extends Array<string | Json | KnuddelsEventArray> {
+	}
 }
 
-/**
- * Ermöglicht Zugriff auf Informationen zu Apps und Events zwischeneinander.
- *
- * Die Instanz von <code>AppAccess</code> erhält man über den KnuddelsServer
- * mit KnuddelsServer.getAppAccess()
- */
-declare class AppAccess {
+// Apps API
+declare global {
 	/**
-	 * Liefert die Instanz der eigenen App.
+	 * @see https://developer.knuddels.de/docs/classes/App.html
 	 */
-	getOwnInstance(): AppInstance;
-	/**
-	 * Liefert die Instanzen aller anderen Apps, die gerade in diesem Channel laufen.
-	 * @since AppServer 82904
-	 */
-	getAllRunningAppsInChannel(includeSelf?: boolean): AppInstance[];
-	/**
-	 * Liefert die Instanzen aller anderen Apps, die gerade in diesem Channel laufen.
-	 * @since AppServer 82904
-	 */
-	getRunningAppInChannel(appId: string): (AppInstance|null);
-}
+	interface App {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_mayJoinChannel
+		 */
+		mayJoinChannel?(
+			user: User
+		): ChannelJoinPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_mayShowPublicMessage
+		 */
+		mayShowPublicMessage?(
+			publicMessage: PublicMessage
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_mayShowPublicActionMessage
+		 */
+		mayShowPublicActionMessage?(
+			publicActionMessage: PublicActionMessage
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onAppStart
+		 */
+		onAppStart?(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onBeforeKnuddelReceived
+		 */
+		onBeforeKnuddelReceived?(
+			knuddelTransfer: KnuddelTransfer
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onKnuddelReceived
+		 */
+		onKnuddelReceived?(
+			sender: User,
+			receiver: BotUser,
+			knuddelAmount: KnuddelAmount,
+			transferReason: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onPrepareShutdown
+		 */
+		onPrepareShutdown?(
+			secondsTillShutdown: number
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onPrivateMessage
+		 */
+		onPrivateMessage?(
+			privateMessage: PrivateMessage
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onPublicMessage
+		 */
+		onPublicMessage?(
+			publicMessage: PublicMessage
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onPublicEventMessage
+		 */
+		onPublicEventMessage?(
+			publicEventMessage: PublicEventMessage
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onPublicActionMessage
+		 */
+		onPublicActionMessage?(
+			publicActionMessage: PublicActionMessage
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onShutdown
+		 */
+		onShutdown?(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onUserDiced
+		 */
+		onUserDiced?(
+			diceEvent: DiceEvent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onUserJoined
+		 */
+		onUserJoined?(
+			user: User
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onUserLeft
+		 */
+		onUserLeft?(
+			user: User
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onAppEventReceived
+		 */
+		onAppEventReceived?(
+			appInstance: AppInstance,
+			type: string,
+			data: KnuddelsEvent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onEventReceived
+		 */
+		onEventReceived?(
+			user: User,
+			type: string,
+			data: KnuddelsEvent,
+			appContentSession: AppContentSession
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onAccountReceivedKnuddel
+		 */
+		onAccountReceivedKnuddel?(
+			sender: User,
+			receiver: BotUser,
+			knuddelAmount: KnuddelAmount,
+			transferReason: string,
+			knuddelAccount: KnuddelAccount
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onAccountChangedKnuddelAmount
+		 */
+		onAccountChangedKnuddelAmount?(
+			user: User,
+			knuddelAccount: KnuddelAccount,
+			oldKnuddelAmount: KnuddelAmount,
+			newKnuddelAmount: KnuddelAmount
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onUserDeleted
+		 */
+		onUserDeleted?(
+			userId: number,
+			userPersistence: UserPersistence
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_onDeveloperCommand
+		 * @since AppServer 108662, ChatServer 108662
+		 */
+		onDeveloperCommand?(
+			user: User,
+			params: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#method_mayUserDice
+		 */
+		mayUserDice?(
+			user: User,
+			diceConfig: DiceConfiguration
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/App.html#property_chatCommands
+		 */
+		chatCommands?: { [commandName: string]: (user: User, params: string, command: string) => void };
+	}
 
-/**
- * Repräsentiert den visuellen Inhalt einer Applikation, der Usern angezeigt werden soll.
- */
-declare class AppContent {
 	/**
-	 * Liefert den AppViewMode.
+	 * @see https://developer.knuddels.de/docs/classes/AppAccess.html
 	 */
-	getAppViewMode(): AppViewMode;
-	/**
-	 * Liefert das HTMLFile, das beim Anlegen des AppContents
-	 * genutzt wurde.
-	 */
-	getHTMLFile(): HTMLFile;
-	/**
-	 * Liefert die Breite des AppContent.
-	 */
-	getWidth(): number;
-	/**
-	 * Liefert die Höhe des AppContent.
-	 */
-	getHeight(): number;
-	/**
-	 * Liefert die LoadConfiguration, mit der die Optik beim Laden des HTML User Interface beeinflusst werden kann.
-	 */
-	getLoadConfiguration(): LoadConfiguration;
-	/**
-	 * Liefert einen AppContent, der das HTMLFile als Overlay oben rechts im Channel anzeigt.
-	 */
-	static overlayContent(htmlFile: HTMLFile, width: number, height: number): AppContent;
-	/**
-	 * Liefert einen AppContent, der das HTMLFile als Overlay (200x350) oben rechts im Channel anzeigt.
-	 */
-	static overlayContent(htmlFile: HTMLFile): AppContent;
-	/**
-	 * Liefert einen AppContent, der das HTMLFile im Applet/HTML-Chat
-	 * als Popup (300x400) und auf Android als Fullscreen-View anzeigt.
-	 */
-	static popupContent(htmlFile: HTMLFile): AppContent;
-	/**
-	 * Liefert einen AppContent, der das HTMLFile im Applet/HTML-Chat
-	 * als Popup und auf Android als Fullscreen-View anzeigt.
-	 */
-	static popupContent(htmlFile: HTMLFile, width: number, height: number): AppContent;
-	/**
-	 * Sendet Daten an alle Nutzer, die diesen AppContent geöffnet haben.
-	 */
-	sendEvent(type: string, data?: KnuddelsEvent): void;
-	/**
-	 * Liefert eine Liste aller User, die diesen AppContent
-	 * geöffnet haben.
-	 */
-	getUsers(): User[];
-	/**
-	 * Liefert eine Liste aller AppContentSessions, die dieses AppContent,
-	 * die User gerade geöffnet haben.
-	 */
-	getSessions(): AppContentSession[];
-	/**
-	 * Ersetzt den AppContent, bei allen Usern, die diesen AppContent
-	 * geöffnet haben durch den neuen AppContent.
-	 *
-	 * <br /><br /><b><font color="red">Hinweis:</font></b> Es können nur AppContent mit demselben AppViewMode
-	 * zum Ersetzen genutzt werden.
-	 */
-	replaceWithAppContent(newAppContent: AppContent): void;
-	/**
-	 * Entfernt diesen AppContent, bei allen Usern, die diesen AppContent
-	 * geöffnet haben.
-	 */
-	remove(): void;
-	/**
-	 * Fügt einen Listener hinzu, der aufgerufen wird, wenn jemand den AppContent schließt.
-	 */
-	addCloseListener(callback: { user: User; appContent: AppContent; }): void;
-}
+	class AppAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppAccess.html#method_getOwnInstance
+		 */
+		getOwnInstance(): AppInstance;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppAccess.html#method_getAllRunningAppsInChannel
+		 * @since AppServer 82904
+		 */
+		getAllRunningAppsInChannel(
+			includeSelf?: boolean
+		): AppInstance[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppAccess.html#method_getRunningAppInChannel
+		 * @since AppServer 82904
+		 */
+		getRunningAppInChannel(
+			appId: string
+		): (AppInstance|null);
+	}
 
-/**
- * Repräsentiert den visuellen Inhalt einer App, der einem User angezeigt wird.
- */
-declare class AppContentSession {
 	/**
-	 * Sendet Daten an den verbundenen Client.
+	 * @see https://developer.knuddels.de/docs/classes/AppContent.html
 	 */
-	sendEvent(type: string, data?: KnuddelsEvent): void;
-	/**
-	 * Liefert den AppViewMode.
-	 */
-	getAppViewMode(): AppViewMode;
-	/**
-	 * Entfernt die AppContentSession beim verbundenen User.
-	 */
-	remove(): void;
-	/**
-	 * Liefert den User.
-	 */
-	getUser(): User;
-	/**
-	 * Liefert den verbundenen AppContent.
-	 */
-	getAppContent(): AppContent;
-}
+	class AppContent {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getAppViewMode
+		 */
+		getAppViewMode(): AppViewMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getHTMLFile
+		 */
+		getHTMLFile(): HTMLFile;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getWidth
+		 */
+		getWidth(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getHeight
+		 */
+		getHeight(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getLoadConfiguration
+		 */
+		getLoadConfiguration(): LoadConfiguration;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_overlayContent
+		 */
+		static overlayContent(
+			htmlFile: HTMLFile,
+			width: number,
+			height: number
+		): AppContent;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_overlayContent
+		 */
+		static overlayContent(
+			htmlFile: HTMLFile
+		): AppContent;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_popupContent
+		 */
+		static popupContent(
+			htmlFile: HTMLFile
+		): AppContent;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_popupContent
+		 */
+		static popupContent(
+			htmlFile: HTMLFile,
+			width: number,
+			height: number
+		): AppContent;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_headerbarContent
+		 */
+		static headerbarContent(
+			htmlFile: HTMLFile,
+			height: number
+		): AppContent;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_sendEvent
+		 */
+		sendEvent(
+			type: string,
+			data?: KnuddelsEvent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getUsers
+		 */
+		getUsers(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_getSessions
+		 */
+		getSessions(): AppContentSession[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_replaceWithAppContent
+		 */
+		replaceWithAppContent(
+			newAppContent: AppContent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_remove
+		 */
+		remove(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_addCloseListener
+		 */
+		addCloseListener(
+			callback: {
+				user: User;
+				appContent: AppContent;
+			}
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_setAllowJFXBrowser
+		 */
+		setAllowJFXBrowser(
+			allowJFXBrowser: boolean
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContent.html#method_isAllowJFXBrowser
+		 */
+		isAllowJFXBrowser(): boolean;
+	}
 
-/**
- * Die Instanz von <code>AppInfo</code> zur laufenden App erhält man über die AppInstance
- * mit appInstance.getAppInfo()
- */
-declare class AppInfo {
 	/**
-	 * Liefert die AppUid.
-	 * Diese ist für jede Sub-Channel Instanz der App unterschiedlich.
-	 * Wenn RootAppUid == AppUid dann ist dies die Root-App-Instanz.
+	 * @see https://developer.knuddels.de/docs/classes/AppContentSession.html
 	 */
-	getAppUid(): number;
-	/**
-	 * Liefert die RootAppUid.
-	 * Diese ist für jede Sub-Channel Instanz der App gleich.
-	 * Wenn RootAppUid == AppUid dann ist dies die Root-App-Instanz.
-	 *
-	 * Sie wird für den Link für Auszahlungen aus einem Knuddel-Account benötigt: <code>/knuddelaccount payout:&lt;RootAppUid&gt;:&lt;BETRAG&gt;</code>
-	 */
-	getRootAppUid(): number;
-	/**
-	 * Liefert den in der Konfiguration eingestellten Namen der App.
-	 */
-	getAppName(): string;
-	/**
-	 * Liefert die Version der App, die in der Konfiguration eingestellt wurde.
-	 */
-	getAppVersion(): string;
-	/**
-	 * Liefert die eindeutige Id der App.
-	 * Die appId setzt sich zusammen aus
-	 * <ul>
-	 * 	<li>id des Entwicklungsservers</li>
-	 * 	<li>FTP-Nutzername</li>
-	 * 	<li>Ordnername der App -> appKey</li>
-	 * </ul>
-	 */
-	getAppId(): string;
-	/**
-	 * Liefert den eindeutigen Key der App.
-	 * Der appKey ist der Ordnername, in dem die App liegt.
-	 */
-	getAppKey(): string;
-	/**
-	 * Liefert den Entwickler der App, falls die serverId knuddelsDE oder knuddelsDEV ist, ansonsten null.
-	 */
-	getAppDeveloper(): User;
-	/**
-	 * Liefert die Liste der AppManager für diese App. Die Channelbesitzer zählen automatisch auch als AppManager.
-	 */
-	getAppManagers(): User[];
-	/**
-	 * Liefert den Steuersatz, der bei Auszahlung bereits genutzer Knuddel von einem
-	 * KnuddelAccount an einen User
-	 * anfällt. Die anfallenden Steuern werden bei Auszahlung vom BotUser
-	 * abgezogen.
-	 */
-	getTaxRate(): number;
-	/**
-	 * Liefert den KnuddelAmount, der an Steuern anfallen würde,
-	 * wenn alle User jetzt all ihre Knuddel aus ihrem
-	 * KnuddelAccount abheben würden.
-	 */
-	getTotalTaxKnuddelAmount(): KnuddelAmount;
-	/**
-	 * Liefert den KnuddelAmount, der jetzt noch vom
-	 * BotUser an KnuddelAccounts
-	 * übertragen werden kann, so dass für alle Knuddel noch die Steuern bezahlt werden können.
-	 */
-	getMaxPayoutKnuddelAmount(): KnuddelAmount;
-}
+	class AppContentSession {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContentSession.html#method_sendEvent
+		 */
+		sendEvent(
+			type: string,
+			data?: KnuddelsEvent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContentSession.html#method_getAppViewMode
+		 */
+		getAppViewMode(): AppViewMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContentSession.html#method_remove
+		 */
+		remove(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContentSession.html#method_getUser
+		 */
+		getUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppContentSession.html#method_getAppContent
+		 */
+		getAppContent(): AppContent;
+	}
 
-/**
- * Repräsentiert die Instanz einer App.
- *
- * Die eigene Instanz von <code>AppInstance</code> erhält man über das AppAccess-Objekt
- * mit appAccess.getOwnInstance()
- */
-declare class AppInstance {
 	/**
-	 * Liefert die AppInfo.
+	 * @see https://developer.knuddels.de/docs/classes/AppInfo.html
 	 */
-	getAppInfo(): AppInfo;
-	/**
-	 * Sendet ein App-Event an diese App-Instanz.
-	 */
-	sendAppEvent(type: string, data: KnuddelsEvent): void;
-	/**
-	 * Informiert, ob die aktuelle AppInstanz eine Root-Instanz ist.
-	 */
-	isRootInstance(): boolean;
-	/**
-	 * Liefert die Root-Instanz der aktuellen App-Instanz.
-	 */
-	getRootInstance(): RootAppInstance;
-	/**
-	 * Liefert alle App-Instanzen dieser App in diesem Channel und Subchannels.
-	 * Mit <code>includeSelf = false</code> kann man die eigene Instanz ausschließen.
-	 */
-	getAllInstances(includeSelf?: boolean): AppInstance[];
-	/**
-	 * Liefert den Startzeitpunkt dieser AppInstance.
-	 */
-	getStartDate(): Date;
-	/**
-	 * Liefert die Namen der ChatCommands, die diese AppInstnce derzeit registriert hat.
-	 */
-	getRegisteredChatCommandNames(): (string[]|null);
-	/**
-	 * Liefert den Namen des Channels in dem diese AppInstance läuft.
-	 */
-	getChannelName(): string;
-}
+	class AppInfo {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppUid
+		 */
+		getAppUid(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getRootAppUid
+		 */
+		getRootAppUid(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppName
+		 */
+		getAppName(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppVersion
+		 */
+		getAppVersion(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppId
+		 */
+		getAppId(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppKey
+		 */
+		getAppKey(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppDeveloper
+		 */
+		getAppDeveloper(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getAppManagers
+		 */
+		getAppManagers(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getTaxRate
+		 */
+		getTaxRate(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getTotalTaxKnuddelAmount
+		 */
+		getTotalTaxKnuddelAmount(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInfo.html#method_getMaxPayoutKnuddelAmount
+		 */
+		getMaxPayoutKnuddelAmount(): KnuddelAmount;
+	}
 
-/**
- * Jede App besitzt eine AppPersistence in der global für diese App
- * Informationen gespeichert werden können. An die Instanz der AppPersistence gelangt man durch den Aufruf
- * KnuddelsServer.getPersistence();.
- */
-declare class AppPersistence extends Persistence {
-}
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/AppInstance.html
+	 */
+	class AppInstance {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_getAppInfo
+		 */
+		getAppInfo(): AppInfo;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_sendAppEvent
+		 */
+		sendAppEvent(
+			type: string,
+			data: KnuddelsEvent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_isRootInstance
+		 */
+		isRootInstance(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_getRootInstance
+		 */
+		getRootInstance(): RootAppInstance;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_getAllInstances
+		 */
+		getAllInstances(
+			includeSelf?: boolean
+		): AppInstance[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_getStartDate
+		 */
+		getStartDate(): Date;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_getRegisteredChatCommandNames
+		 */
+		getRegisteredChatCommandNames(): (string[]|null);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppInstance.html#method_getChannelName
+		 */
+		getChannelName(): string;
+	}
 
-/**
- * Eine Instanz eines AppProfileEntry repräsentiert einen von einer App erzeugen Profileintrag in Profilen von Usern.
- */
-declare class AppProfileEntry {
 	/**
-	 * Liefert den key für den die Topliste, die den Profileintrag erzeugt angelegt wurde.
+	 * @see https://developer.knuddels.de/docs/classes/AppPersistence.html
 	 */
-	getKey(): string;
-	/**
-	 * Liefert den getDisplayType
-	 */
-	getDisplayType(): ToplistDisplayType;
-	/**
-	 * Liefert das Toplist-Objekt.
-	 */
-	getToplist(): Toplist;
-}
+	class AppPersistence extends Persistence {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppPersistence.html#method_getDatabaseFileSize
+		 */
+		getDatabaseFileSize(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppPersistence.html#method_getDatabaseFileSizeLimit
+		 */
+		getDatabaseFileSizeLimit(): number;
+	}
 
-/**
- * Mit einer Instanz von AppProfileEntryAccess kann eine App
- * AppProfileEntry-Objekte (Profileinträge) erzeugen und verwalten.
- *
- * Die Instanz für die <code>AppProfileEntryAccess</code> erhält man über das KnuddelsServer-Objekt
- * mit KnuddelsServer.getAppProfileEntryAccess()
- *
- * <br><br><b style="color:red;">Achtung:</b> Derzeit darf eine App bis zu <b>fünf</b> AppProfileEntries haben.
- * <br><br><b style="color:red;">Achtung:</b> Profileinträge werden nur dann angezeigt, wenn der Channel sichtbar ist.
- */
-declare class AppProfileEntryAccess {
 	/**
-	 * Liefert die Liste aller AppProfileEntry-Objekte, die diese App erzeugt hat.
+	 * @see https://developer.knuddels.de/docs/classes/AppProfileEntry.html
 	 */
-	getAllProfileEntries(): AppProfileEntry[];
-	/**
-	 * Liefert den AppProfileEntry für den übergebenen userPersistenceNumberKey.
-	 */
-	getAppProfileEntry(userPersistenceNumberKey: string): AppProfileEntry;
-	/**
-	 * Erzeugt oder aktualisiert ein AppProfileEntry anhand der übergebenen Toplist
-	 * und dem ToplistDisplayType und liefert den AppProfileEntry im Anschluss zurück.
-	 *
-	 * Profileinträge, die erzeugt werden, sind nur sichtbar, solange die App läuft und werden im Profil ausgeblendet, sofern die App aus ist.
-	 */
-	createOrUpdateEntry(toplist: Toplist, toplistDisplayType: ToplistDisplayType): AppProfileEntry;
-	/**
-	 * Löscht den übergebenen AppProfileEntry.
-	 */
-	removeEntry(appProfileEntry: AppProfileEntry): void;
-}
+	class AppProfileEntry {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntry.html#method_getKey
+		 */
+		getKey(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntry.html#method_getDisplayType
+		 */
+		getDisplayType(): ToplistDisplayType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntry.html#method_getToplist
+		 */
+		getToplist(): Toplist;
+	}
 
-/**
- * Liefert Informationen über einen AppServer.
- *
- * Die Instanz von <code>AppServerInfo</code> erhält man über den KnuddelsServer
- * mit KnuddelsServer.getAppServerInfo()
- */
-declare class AppServerInfo extends ServerInfo {
-}
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/AppProfileEntryAccess.html
+	 */
+	class AppProfileEntryAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntryAccess.html#method_getAllProfileEntries
+		 */
+		getAllProfileEntries(): AppProfileEntry[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntryAccess.html#method_getAppProfileEntry
+		 */
+		getAppProfileEntry(
+			userPersistenceNumberKey: string
+		): AppProfileEntry;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntryAccess.html#method_createOrUpdateEntry
+		 */
+		createOrUpdateEntry(
+			toplist: Toplist,
+			toplistDisplayType: ToplistDisplayType
+		): AppProfileEntry;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppProfileEntryAccess.html#method_removeEntry
+		 */
+		removeEntry(
+			appProfileEntry: AppProfileEntry
+		): void;
+	}
 
-/**
- * null
- */
-declare class AppViewMode {
 	/**
-	 *
+	 * @see https://developer.knuddels.de/docs/classes/AppServerInfo.html
 	 */
-	static readonly Overlay: AppViewMode;
-	/**
-	 * Zum Öffnen eines Popups durch das HTML User Interface
-	 */
-	static readonly Popup: AppViewMode;
-}
+	class AppServerInfo extends ServerInfo {
+	}
 
-/**
- * Ein BotUser repräsentiert einen Nutzer, der für die App als Nutzer im Channel interagieren kann.
- *
- * Die Instanz für den <code>Standard-BotUser</code> erhält man über das KnuddelsServer-Objekt
- * mit KnuddelsServer.getDefaultBotUser()
- */
-declare class BotUser extends User {
 	/**
-	 * Sendet eine öffentliche Nachricht in den Channel.
+	 * @see https://developer.knuddels.de/docs/classes/AppViewMode.html
 	 */
-	sendPublicMessage(message: string): void;
-	/**
-	 * Sendet eine öffentliche Handlung in den Channel.
-	 * Dies funktioniert so, als ob der BotUser /me TEXT im Chat eingeben würde.
-	 */
-	sendPublicActionMessage(actionMessage: string): void;
-	/**
-	 * Sendet eine private Nachricht an bestimmte Nutzer.
-	 */
-	sendPrivateMessage(message: string, users?: User[]): void;
-	/**
-	 * Sendet eine persistente Nachricht an einen bestimmten Nutzer.
-	 */
-	sendPostMessage(topic: string, text: string, receivingUser?: User): void;
-	/**
-	 * Transferiert eine bestimmte Anzahl Knuddel an einen Zielnutzer oder KnuddelAccount.<br /><br />
-	 * <b style="color:red;">Wichtiger Hinweis:</b> Sollte die App versuchen mehr Knuddel zu transferieren,
-	 * als sie besitzt, so wird der <code>onError</code>-Callback aufgerufen und die App transferiert so viele Knuddel, wie möglich.
-	 * Zudem werden die Schulden für den Channelbesitzer gemerkt. Sobald sich der Channelbesitzer einloggt, erhält er einen Hinweis über offene Schulden
-	 * und sollte diese direkt begleichen.
-	 * Hat ein Channelbesitzer eine gewisse Menge Schulden angesammelt, so schalten wir alle Apps in diesem Channel ab.
-	 * <br />Es können nur Knuddel transferiert werden zu Nutzern mit <code>UserType.Human</code>.
-	 */
-	transferKnuddel(
-		receivingUserOrAccount: User | KnuddelAccount,
-		knuddelAmount: KnuddelAmount,
-		displayReasonText: string): void;
-	transferKnuddel(
-		receivingUserOrAccount: User | KnuddelAccount,
-		knuddelAmount: KnuddelAmount,
-		parameters?: {
-			displayReasonText?: string;
-			transferDisplayType?: KnuddelTransferDisplayType;
-			onSuccess?(): void;
-			onError?(message: string): void;
-		}): void;
-}
+	class AppViewMode {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppViewMode.html#property_Overlay
+		 */
+		static readonly Overlay: AppViewMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppViewMode.html#property_Popup
+		 */
+		static readonly Popup: AppViewMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AppViewMode.html#property_Headerbar
+		 */
+		static readonly Headerbar: AppViewMode;
+	}
 
-/**
- * Ein Channel ist ein Raum in dem die App läuft.
- *
- * Die Instanz für den <code>Channel</code> erhält man über das KnuddelsServer-Objekt
- * mit KnuddelsServer.getChannel()
- */
-declare class Channel {
 	/**
-	 * Gibt Zugriff auf das ChannelConfiguration-Objekt des Channels.
+	 * @see https://developer.knuddels.de/docs/classes/AuthenticityClassification.html
 	 */
-	getChannelConfiguration(): ChannelConfiguration;
+	class AuthenticityClassification {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AuthenticityClassification.html#method_getDisplayText
+		 * @since AppServer 94663, ChatServer 94663
+		 */
+		getDisplayText(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AuthenticityClassification.html#property_ServiceNotAvailable
+		 */
+		static readonly ServiceNotAvailable: AuthenticityClassification;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AuthenticityClassification.html#property_Unknown
+		 */
+		static readonly Unknown: AuthenticityClassification;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AuthenticityClassification.html#property_Trusted
+		 */
+		static readonly Trusted: AuthenticityClassification;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/AuthenticityClassification.html#property_VeryTrusted
+		 */
+		static readonly VeryTrusted: AuthenticityClassification;
+	}
+
 	/**
-	 * Gibt Zugriff auf das ChannelRestrictions-Objekt des Channels.
+	 * @see https://developer.knuddels.de/docs/classes/BotUser.html
 	 */
-	getChannelRestrictions(): ChannelRestrictions;
+	class BotUser extends User {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/BotUser.html#method_sendPublicMessage
+		 */
+		sendPublicMessage(
+			message: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/BotUser.html#method_sendPublicActionMessage
+		 */
+		sendPublicActionMessage(
+			actionMessage: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/BotUser.html#method_sendPrivateMessage
+		 */
+		sendPrivateMessage(
+			message: string,
+			users?: User[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/BotUser.html#method_sendPostMessage
+		 */
+		sendPostMessage(
+			topic: string,
+			text: string,
+			receivingUser?: User
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/BotUser.html#method_transferKnuddel
+		 */
+		transferKnuddel(
+			receivingUserOrAccount: (User|KnuddelAccount),
+			knuddelAmount: KnuddelAmount,
+			parameters?: {
+				displayReasonText?: string;
+				transferDisplayType?: KnuddelTransferDisplayType;
+				onSuccess?: () => void;
+				onError?: (message: string) => void;
+			}
+		): void;
+	}
+
 	/**
-	 * Gibt Zugriff auf das ChannelDesign-Objekt des Channels.
+	 * @see https://developer.knuddels.de/docs/classes/Channel.html
+	 */
+	class Channel {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getChannelConfiguration
+		 */
+		getChannelConfiguration(): ChannelConfiguration;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getChannelRestrictions
+		 */
+		getChannelRestrictions(): ChannelRestrictions;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getChannelDesign
+		 * @since AppServer 87470, ChatServer 87470
+		 */
+		getChannelDesign(): ChannelDesign;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getOnlineUsers
+		 */
+		getOnlineUsers(
+			...userType: UserType[]
+		): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_isVideoChannel
+		 */
+		isVideoChannel(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getVideoChannelData
+		 */
+		getVideoChannelData(): VideoChannelData;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getChannelName
+		 */
+		getChannelName(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getRootChannelName
+		 */
+		getRootChannelName(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getTalkMode
+		 */
+		getTalkMode(): ChannelTalkMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_getAllUsersWithTalkPermission
+		 */
+		getAllUsersWithTalkPermission(
+			...channelTalkPermission: ChannelTalkPermission[]
+		): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Channel.html#method_isVisible
+		 * @since AppServer 82202
+		 */
+		isVisible(): boolean;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ChannelConfiguration.html
+	 */
+	class ChannelConfiguration {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelConfiguration.html#method_getChannelRights
+		 */
+		getChannelRights(): ChannelRights;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelConfiguration.html#method_getChannelInformation
+		 */
+		getChannelInformation(): ChannelInformation;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ChannelDesign.html
 	 * @since AppServer 87470, ChatServer 87470
 	 */
-	getChannelDesign(): ChannelDesign;
-	/**
-	 * Gibt Zugriff auf Nutzer, die gerade im Channel online sind.
-	 */
-	getOnlineUsers(...userType: UserType[]): User[];
-	/**
-	 * Liefert die Information, ob in diesem Channel Videos gestreamt werden können.
-	 */
-	isVideoChannel(): boolean;
-	/**
-	 * Liefert die VideoChannelData des Channels.
-	 */
-	getVideoChannelData(): VideoChannelData;
-	/**
-	 * Liefert den Namen des Channels.
-	 */
-	getChannelName(): string;
-	/**
-	 * Liefert den Namen des Root-Channels (nur relevant, falls die App Tochterchannel haben kann).
-	 */
-	getRootChannelName(): string;
-	/**
-	 * Liefert den ChannelTalkMode, in dem sich der Channel gerade befindet.
-	 */
-	getTalkMode(): ChannelTalkMode;
-	/**
-	 * Liefert alle User, die bestimmte ChannelTalkPermissions haben.
-	 */
-	getAllUsersWithTalkPermission(...channelTalkPermission: ChannelTalkPermission[]): User[];
-	/**
-	 * Liefert die Information, ob der Channel sichtbar (<code>true</code>) oder unsichtbar (<code>false</code>) ist.
-	 * @since AppServer 82202
-	 */
-	isVisible(): boolean;
-}
+	class ChannelDesign {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelDesign.html#method_getDefaultFontSize
+		 * @since AppServer 87470, ChatServer 87470
+		 */
+		getDefaultFontSize(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelDesign.html#method_getDefaultFontColor
+		 * @since AppServer 87470, ChatServer 87470
+		 */
+		getDefaultFontColor(): Color;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelDesign.html#method_getBackgroundColor
+		 * @since AppServer 87470, ChatServer 87470
+		 */
+		getBackgroundColor(): Color;
+	}
 
-/**
- * Eine ChannelConfiguration erlaubt Zugriff auf verschiedene Details
- * der Konfiguration des Channels, in dem die App läuft.
- *
- * Die Instanz für die <code>ChannelConfiguration</code> erhält man über das Channel-Objekt
- * mit channel.getChannelConfiguration()
- */
-declare class ChannelConfiguration {
 	/**
-	 * Liefert das ChannelRights-Objekt des Channels.
+	 * @see https://developer.knuddels.de/docs/classes/ChannelInformation.html
 	 */
-	getChannelRights(): ChannelRights;
-	/**
-	 * Liefert das ChannelInformation-Objekt des Channels.
-	 */
-	getChannelInformation(): ChannelInformation;
-}
+	class ChannelInformation {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelInformation.html#method_getTopic
+		 */
+		getTopic(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelInformation.html#method_setTopic
+		 */
+		setTopic(
+			topic: string,
+			showMessage: boolean
+		): void;
+	}
 
-/**
- * Ermöglicht Zugriff auf Designeinstellungen des Channels.
- * @since AppServer 87470, ChatServer 87470
- */
-declare class ChannelDesign {
 	/**
-	 * Liefert die eingestellte Standard-Schriftgröße des Channels.
-	 * @since AppServer 87470, ChatServer 87470
+	 * @see https://developer.knuddels.de/docs/classes/ChannelJoinPermission.html
 	 */
-	getDefaultFontSize(): number;
-	/**
-	 * Liefert die eingestellte Standard-Schriftfarbe des Channels.
-	 * @since AppServer 87470, ChatServer 87470
-	 */
-	getDefaultFontColor(): Color;
-	/**
-	 * Liefert die eingestellte Hintergrundfarbe des Channels.
-	 * @since AppServer 87470, ChatServer 87470
-	 */
-	getBackgroundColor(): Color;
-}
+	class ChannelJoinPermission {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelJoinPermission.html#method_accepted
+		 */
+		static accepted(): ChannelJoinPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelJoinPermission.html#method_denied
+		 */
+		static denied(
+			denyReason: string
+		): ChannelJoinPermission;
+	}
 
-/**
- * Ermöglicht Zugriff auf textuelle Channelinformationen und persistente Änderungen.
- */
-declare class ChannelInformation {
 	/**
-	 * Liefert das eingestellte Thema des Channels.
+	 * @see https://developer.knuddels.de/docs/classes/ChannelRestrictions.html
 	 */
-	getTopic(): string;
-	/**
-	 * Aktualisiert das Thema das Channels.
-	 */
-	setTopic(topic: string, showMessage: boolean): void;
-}
+	class ChannelRestrictions {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelRestrictions.html#method_getMutedUsers
+		 */
+		getMutedUsers(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelRestrictions.html#method_getColorMutedUsers
+		 */
+		getColorMutedUsers(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelRestrictions.html#method_getLockedUsers
+		 */
+		getLockedUsers(): User[];
+	}
 
-/**
- * Eine Instanz der Klasse ChannelJoinPermission wird als Rückgabewert
- * der Methode <code>App.mayJoinChannel(user)</code> benötigt.
- *
- * Hiermit wird bestimmt, ob der anfragende Nutzer den Channel betreten darf.
- *
- * Erlauben mit <code>ChannelJoinPermission.accepted()</code>
- * Verbieten mit <code>ChannelJoinPermission.denied(denyReason)</code>
- */
-declare class ChannelJoinPermission {
 	/**
-	 * Erzeugt ein ChannelJoinPermission-Objekt, das den Zugriff in den Channel erlaubt.
+	 * @see https://developer.knuddels.de/docs/classes/ChannelRights.html
 	 */
-	static accepted(): ChannelJoinPermission;
-	/**
-	 * Erzeugt ein ChannelJoinPermission-Objekt, das den Zugriff in den Channel verbietet.
-	 */
-	static denied(denyReason: string): ChannelJoinPermission;
-}
+	class ChannelRights {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelRights.html#method_getChannelOwners
+		 */
+		getChannelOwners(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelRights.html#method_getChannelModerators
+		 */
+		getChannelModerators(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelRights.html#method_getEventModerators
+		 */
+		getEventModerators(): User[];
+	}
 
-/**
- * Eine Instanz von ChannelRestrictions ermöglicht es, aktuelle Informationen über Nutzungsbeschränkungen im Channel zu erhalten.
- *
- * Die Instanz für die <code>ChannelRestrictions</code> erhält man über das Channel-Objekt
- * mit channel.getChannelRestrictions()
- */
-declare class ChannelRestrictions {
 	/**
-	 * Liefert alle User die im Channel derzeit für das Schreiben öffentlicher Nachrichten gesperrt sind.
+	 * @see https://developer.knuddels.de/docs/classes/ChannelTalkMode.html
 	 */
-	getMutedUsers(): User[];
-	/**
-	 * Liefert alle User die im Channel derzeit für das Nutzen
-	 * von Farben, Textformatierung und Smileys in öffentlichen Nachrichten gesperrt sind.
-	 */
-	getColorMutedUsers(): User[];
-	/**
-	 * Liefert alle User die für das Betreten des Channel derzeit gesperrt sind.
-	 */
-	getLockedUsers(): User[];
-}
+	class ChannelTalkMode {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkMode.html#property_Everyone
+		 */
+		static readonly Everyone: ChannelTalkMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkMode.html#property_OnlyWithTalkPermission
+		 */
+		static readonly OnlyWithTalkPermission: ChannelTalkMode;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkMode.html#property_FilteredByModerators
+		 */
+		static readonly FilteredByModerators: ChannelTalkMode;
+	}
 
-/**
- * Die Instanz für die <code>ChannelRights</code> erhält man über das ChannelConfiguration-Objekt
- * mit channelConfiguration.getChannelRights()
- */
-declare class ChannelRights {
 	/**
-	 * Liefert die Liste aller Channelbesitzer. In öffentlichen Channels sind dies alle hauptzuständigen betreuenden Mitglieder. (HZA/HZE)
+	 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html
 	 */
-	getChannelOwners(): User[];
-	/**
-	 * Liefert die Liste aller Channel-Moderatoren.
-	 */
-	getChannelModerators(): User[];
-	/**
-	 * Liefert die Liste aller Event-Moderatoren.
-	 */
-	getEventModerators(): User[];
-}
+	class ChannelTalkPermission {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html#property_NotInChannel
+		 */
+		static readonly NotInChannel: ChannelTalkPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html#property_Default
+		 */
+		static readonly Default: ChannelTalkPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html#property_TalkOnce
+		 */
+		static readonly TalkOnce: ChannelTalkPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html#property_TalkPermanent
+		 */
+		static readonly TalkPermanent: ChannelTalkPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html#property_VIP
+		 */
+		static readonly VIP: ChannelTalkPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChannelTalkPermission.html#property_Moderator
+		 */
+		static readonly Moderator: ChannelTalkPermission;
+	}
 
-/**
- * ChannelTalkMode repräsentiert das den Gesprächsmodus im Channel.
- *
- * Die Instanz für die <code>ChannelTalkMode</code> erhält man über das Channel-Objekt
- * mit channel.getTalkMode()
- */
-declare class ChannelTalkMode {
 	/**
-	 * Jeder darf gerade im Channel schreiben.
+	 * @see https://developer.knuddels.de/docs/classes/ChatServerInfo.html
 	 */
-	static readonly Everyone: ChannelTalkMode;
-	/**
-	 * Nur Personen, die besondere Rederechte haben dürfen gerade im Channel schreiben.
-	 */
-	static readonly OnlyWithTalkPermission: ChannelTalkMode;
-	/**
-	 * Nur Personen, die besondere Rederechte haben dürfen gerade im Channel schreiben.
-	 * Die Nachrichten aller anderen Nutzer werden gefiltert und ggf. von den Moderatoren zugelassen.
-	 */
-	static readonly FilteredByModerators: ChannelTalkMode;
-}
+	class ChatServerInfo extends ServerInfo {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ChatServerInfo.html#method_isTestSystem
+		 */
+		isTestSystem(): boolean;
+	}
 
-/**
- * ChannelTalkPermission repräsentiert das Rederecht eines User
- * im Channel.
- */
-declare class ChannelTalkPermission {
 	/**
-	 * Der User ist gerade nicht im Channel,
-	 * daher ist die ChannelTalkPermission nicht bekannnt.
+	 * @see https://developer.knuddels.de/docs/classes/Client.html
 	 */
-	static readonly NotInChannel: ChannelTalkPermission;
-	/**
-	 * Der User hat keine speziellen Rederechte.
-	 * Beim ChannelTalkMode Default können diese User
-	 * Nachrichten verfassen:
-	 */
-	static readonly Default: ChannelTalkPermission;
-	/**
-	 * Der User kann eine öffentliche Nachricht verfassen. Danach wechselt die
-	 * ChannelTalkPermission automatisch auf Default.
-	 */
-	static readonly TalkOnce: ChannelTalkPermission;
-	/**
-	 * Der User kann permanent öffentliche Nachrichten verfassen.
-	 */
-	static readonly TalkPermanent: ChannelTalkPermission;
-	/**
-	 * Der User ist VIP und kann öffentliche Nachrichten verfassen,
-	 * die farbig und groß dargestellt werden.
-	 */
-	static readonly VIP: ChannelTalkPermission;
-	/**
-	 * Der User ist VIP und kann öffentliche Nachrichten verfassen,
-	 * die farbig und groß dargestellt werden. Moderatoren haben zudem weitere Möglichkeiten, die in der
-	 * <a href="http://knuddels.de/doku/Moderationssystem.pdf" target="_blank">Anleitung zum Moderationssystem</a>
-	 * nachgelesen werden können.
-	 */
-	static readonly Moderator: ChannelTalkPermission;
-}
+	class Client {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_close
+		 */
+		static close(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_sendEvent
+		 */
+		static sendEvent(
+			type: string,
+			data: KnuddelsEvent
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_executeSlashCommand
+		 */
+		static executeSlashCommand(
+			command: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_includeJS
+		 */
+		static includeJS(
+			...files: string[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_addEventListener
+		 */
+		static addEventListener(
+			type: string,
+			callback: (event: {type: string, data: KnuddelsEvent}) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_dispatchEvent
+		 */
+		static dispatchEvent(
+			event: Client.Event
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_removeEventListener
+		 */
+		static removeEventListener(
+			type: string,
+			callback?: (event: {type: string, data: KnuddelsEvent}) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_includeCSS
+		 */
+		static includeCSS(
+			...files: string[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_playSound
+		 */
+		static playSound(
+			fileName: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_prefetchSound
+		 */
+		static prefetchSound(
+			fileName: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_freeSound
+		 */
+		static freeSound(
+			fileName: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_getHostFrame
+		 */
+		static getHostFrame(): Client.HostFrame;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_getNick
+		 */
+		static getNick(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_getClientType
+		 */
+		static getClientType(): ClientType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_getCacheInvalidationId
+		 */
+		static getCacheInvalidationId(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_getDirectConnection
+		 */
+		static getDirectConnection(): Promise<void>;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_addConnectionTypeChangeListener
+		 */
+		static addConnectionTypeChangeListener(
+			callback: (type: string) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#method_removeConnectionTypeChangeListener
+		 */
+		static removeConnectionTypeChangeListener(
+			callback: (type: string) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Client.html#property_pageData
+		 */
+		static pageData: Json;
+	}
 
-/**
- * Liefert Informationen über einen ChatServer.
- *
- * Die Instanz von <code>ChatServerInfo</code> erhält man über den KnuddelsServer
- * mit KnuddelsServer.getChatServerInfo()
- */
-declare class ChatServerInfo extends ServerInfo {
 	/**
-	 * Liefert die Information, ob dieser Chat-Server ein Test-System ist.
+	 * @see https://developer.knuddels.de/docs/classes/Client.Color.html
 	 */
-	isTestSystem(): boolean;
-}
+	namespace Client {
+		class Color {
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Color.html#method_fromRGB
+			 */
+			static fromRGB(
+				red: number,
+				green: number,
+				blue: number
+			): Color;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Color.html#method_fromHexString
+			 */
+			static fromHexString(
+				colorString: string
+			): Color;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Color.html#method_getRed
+			 */
+			getRed(): number;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Color.html#method_getGreen
+			 */
+			getGreen(): number;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Color.html#method_getBlue
+			 */
+			getBlue(): number;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Color.html#method_asHexString
+			 */
+			asHexString(): string;
+		}
+	}
 
-/**
- * Klasse, die es ermöglicht den Client innerhalb des HTML User Interface zu steuern und Daten an den Server zu senden.
- */
-declare class Client {
 	/**
-	 * Schließt das HTML User Interface.
+	 * @see https://developer.knuddels.de/docs/classes/Client.Event.html
 	 */
-	static close(): void;
-	/**
-	 * Sendet ein Event zum Server, das mit dem AppHook onEventReceived in der App
-	 * abgefangen werden kann.
-	 */
-	static sendEvent(type: string, data: KnuddelsEvent): void;
-	/**
-	 * Sagt dem Chatserver, dass dieser Befehl für den Nutzer, der das HTML User Interface sieht, ausgeführt werden soll.
-	 * Ist der Befehl auf einer Whitelist vom Server, so wird er sofort ausgeführt. Im anderen Falle sieht der Nutzer einen
-	 * Link zum Bestätigen, mit dem er die Aktion starten kann.
-	 *
-	 * Derzeit sind diese Befehle auf der Whitelist: w, info, wc, top, h, dice, d, diceo, w2, serverpp, knuddelaccount,
-	 * /tf-insert, /tf-inserts, /tf-insertb, /tf-insertsb, /tf-override, /tf-overrides, /tf-overrideb, /tf-overridesb, /autotype
-	 */
-	static executeSlashCommand(command: string): void;
-	/**
-	 * Bindet eine Javascript-Datei ein und sorgt dafür, dass immer die aktuellste Version vom Server geladen wird.
-	 */
-	static includeJS(...files: string[]): void;
-	/**
-	 * Registriert sich für ein bestimmtes Event, das vom Server mittels User/sendEvent:method oder vom Client via Client/dispatchEvent:method verschickt wurde.
-	 */
-	static addEventListener(type: string, callback: (event: {type: string, data: KnuddelsEvent}) => void): void;
-	/**
-	 * Sendet ein bestimmtes Event, so dass alle mit Client/addEventListener:method registrierten Listener aufgerufen werden.
-	 */
-	static dispatchEvent(event: Client.Event): void;
-	/**
-	 * Entfernt alle Event-Listener für einen bestimmten Event-Typ.
-	 */
-	static removeEventListener(type: string): void;
-	/**
-	 * Bindet eine CSS-Datei ein und sorgt dafür, dass immer die aktuellste Version vom Server geladen wird.
-	 */
-	static includeCSS(...files: string[]): void;
-	/**
-	 * Spielt einen Sound ab. Der angegebene Dateiname kann hierbei entweder absolut oder relativ zur angezeigten HTML-Datei sein.
-	 * Bisher können nur Dateien mit Wave-Format zuverlässig abgespielt werden.
-	 */
-	static playSound(fileName: string): void;
-	/**
-	 * Lädt einen Sound herunter, damit die Datei später ohne Wartezeit abgespielt werden kann.
-	 * (Android only)
-	 * Der angegebene Dateiname kann hierbei entweder absolut oder relativ zur angezeigten HTML-Datei sein.
-	 */
-	static prefetchSound(fileName: string): void;
-	/**
-	 * Gibt einen Sound wieder frei, der in nächster Zeit vom Client nicht mehr gebraucht wird.
-	 * (Android only)
-	 * Der angegebene Dateiname kann hierbei entweder absolut oder relativ zur angezeigten HTML-Datei sein.
-	 */
-	static freeSound(fileName: string): void;
-	/**
-	 * Liefert den HostFrame des aktuellen Inhalts.
-	 */
-	static getHostFrame(): Client.HostFrame;
-	/**
-	 * Liefert den Nicknamen des Users, der gerade dieses HTML User Interface angezeigt bekommt.
-	 */
-	static getNick(): string;
-	/**
-	 * Liefert den aktuellen ClientType des Nutzers, der gerade dieses HTML User Interface angezeigt bekommt.
-	 */
-	static getClientType(): ClientType;
-	/**
-	 * Liefert die Id, die beim Laden von Skripten und Stylesheets an die URL angehängt wird, um sicherzustellen, dass eine neue Version
-	 * der Datei vom Server geholt wird, statt die Datei aus dem Cache zu laden.
-	 *
-	 * Diese Id kann beim Einbinden eigener Ressourcen zum selben Zweck genutzt werden.
-	 */
-	static getCacheInvalidationId(): string;
-	/**
-	 * Beinhaltet die JSON-Daten, die beim Erstellen des HTMLFile übergeben wurden.
-	 */
-	static pageData: Json;
-}
+	namespace Client {
+		class Event {
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.Event.html#method_Event
+			 */
+			constructor(
+				type: string,
+				data: KnuddelsEvent
+			);
+		}
+	}
 
-/**
- * Klasse, mit der clientseitige Farbobjekte erstellt werden können.
- */
-declare namespace Client {
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html
+	 */
+	namespace Client {
+		class HostFrame {
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_setTitle
+			 */
+			setTitle(
+				newTitle: string
+			): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_setBackgroundColor
+			 */
+			setBackgroundColor(
+				newColor: Color,
+				durationMillis?: number
+			): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_setIcons
+			 * @since Applet: 9.0bwj, AppServer: 84904
+			 */
+			setIcons(
+				...path: string[]
+			): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_setResizable
+			 */
+			setResizable(
+				resizable: boolean
+			): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_focus
+			 * @since Applet: 9.0bwj, AppServer: 84904
+			 */
+			focus(): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_setSize
+			 * @since Applet: 9.0bwj, AppServer: 84516
+			 */
+			setSize(
+				width: number,
+				height: number
+			): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_getAppViewMode
+			 * @since Applet: 9.0byl
+			 */
+			getAppViewMode(): void;
+			/**
+			 * @see https://developer.knuddels.de/docs/classes/Client.HostFrame.html#method_getBrowserType
+			 * @since Applet: 9.0bzp
+			 */
+			getBrowserType(): void;
+		}
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ClientType.html
+	 */
+	class ClientType {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ClientType.html#property_Applet
+		 */
+		static readonly Applet: ClientType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ClientType.html#property_Browser
+		 */
+		static readonly Browser: ClientType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ClientType.html#property_Android
+		 */
+		static readonly Android: ClientType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ClientType.html#property_IOS
+		 */
+		static readonly IOS: ClientType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ClientType.html#property_Offline
+		 */
+		static readonly Offline: ClientType;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Color.html
+	 */
 	class Color {
 		/**
-		 * Erzeugt ein Color-Objekt mit RGB-Werten.
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_fromRGB
 		 */
-		static fromRGB(red: number, green: number, blue: number): Color;
+		static fromRGB(
+			red: number,
+			green: number,
+			blue: number
+		): Color;
 		/**
-		 * Erzeugt ein Color-Objekt aus einem HexString.
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_fromRGBA
 		 */
-		static fromHexString(colorString: string): Color;
+		static fromRGBA(
+			red: number,
+			green: number,
+			blue: number,
+			alpha: number
+		): Color;
 		/**
-		 * Liefert den Rot-Anteil der Farbe als Zahl zwischen 0 und 255.
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_getAlpha
 		 */
-		getRed(): number;
+		getAlpha(): number;
 		/**
-		 * Liefert den Grün-Anteil der Farbe als Zahl zwischen 0 und 255.
-		 */
-		getGreen(): number;
-		/**
-		 * Liefert den Blau-Anteil der Farbe als Zahl zwischen 0 und 255.
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_getBlue
 		 */
 		getBlue(): number;
 		/**
-		 * Liefert die Farbe als in CSS nutzbaren HexString.
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_getGreen
 		 */
-		asHexString(): string;
+		getGreen(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_getRed
+		 */
+		getRed(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_toKCode
+		 */
+		toKCode(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_asNumber
+		 */
+		asNumber(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Color.html#method_fromNumber
+		 */
+		static fromNumber(
+			value: number
+		): Color;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Dice.html
+	 */
+	class Dice {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Dice.html#method_Dice
+		 */
+		constructor(
+			count: number /* optional */,
+			value: number
+		);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Dice.html#method_getAmount
+		 */
+		getAmount(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Dice.html#method_getNumberOfSides
+		 */
+		getNumberOfSides(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html
+	 */
+	class DiceConfiguration {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html#method_isUsingOpenThrow
+		 */
+		isUsingOpenThrow(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html#method_isUsingPrivateThrow
+		 */
+		isUsingPrivateThrow(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html#method_getDices
+		 */
+		getDices(): Dice[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html#method_equals
+		 */
+		equals(
+			diceConfiguration: DiceConfiguration
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html#method_getChatCommand
+		 * @since AppServer 82248
+		 */
+		getChatCommand(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfiguration.html#method_toString
+		 * @since AppServer 108781
+		 */
+		toString(): string;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html
+	 */
+	class DiceConfigurationFactory {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html#method_addDice
+		 */
+		addDice(
+			dice: Dice
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html#method_computeCurrentDiceCount
+		 */
+		computeCurrentDiceCount(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html#method_setUseOpenThrow
+		 */
+		setUseOpenThrow(
+			shouldUseOpenThrow: boolean
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html#method_setShouldUsePrivateThrow
+		 */
+		setShouldUsePrivateThrow(
+			shouldUsePrivateThrow: boolean
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html#method_getDiceConfiguration
+		 */
+		getDiceConfiguration(): DiceConfiguration;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceConfigurationFactory.html#method_fromString
+		 */
+		static fromString(
+			diceConfigurationString: string
+		): DiceConfiguration;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/DiceEvent.html
+	 */
+	class DiceEvent {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceEvent.html#method_getUser
+		 */
+		getUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceEvent.html#method_getDiceResult
+		 */
+		getDiceResult(): DiceResult;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/DiceResult.html
+	 */
+	class DiceResult {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceResult.html#method_getDiceConfiguration
+		 */
+		getDiceConfiguration(): DiceConfiguration;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceResult.html#method_getSingleDiceResults
+		 */
+		getSingleDiceResults(): SingleDiceResult[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceResult.html#method_totalSum
+		 */
+		totalSum(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/DiceResult.html#method_toString
+		 * @since AppServer 108781
+		 */
+		toString(): string;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Domain.html
+	 */
+	class Domain {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Domain.html#method_getDomainName
+		 */
+		getDomainName(): string;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html
+	 */
+	class ExternalServerAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html#method_getAllAccessibleDomains
+		 */
+		getAllAccessibleDomains(): Domain[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html#method_canAccessURL
+		 */
+		canAccessURL(
+			urlString: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html#method_getURL
+		 */
+		getURL(
+			urlString: string,
+			parameters?: {
+				onSuccess?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+				onFailure?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+			}
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html#method_postURL
+		 */
+		postURL(
+			urlString: string,
+			parameters?: {
+				onSuccess?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+				onFailure?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+				data?: Json;
+			}
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html#method_touchURL
+		 */
+		touchURL(
+			urlString: string,
+			parameters?: {
+				onSuccess?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+				onFailure?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+			}
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerAccess.html#method_callURL
+		 */
+		callURL(
+			urlString: string,
+			parameters?: {
+				onSuccess?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+				onFailure?: (responseData: string, externalServerResponse: ExternalServerResponse) => void;
+				method?: ("GET" | "POST");
+				data?: Json;
+			}
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ExternalServerResponse.html
+	 */
+	class ExternalServerResponse {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerResponse.html#method_getURLString
+		 */
+		getURLString(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerResponse.html#method_getResponseCode
+		 */
+		getResponseCode(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerResponse.html#method_getHeaderFieldNames
+		 * @since AppServer 108668
+		 */
+		getHeaderFieldNames(): string[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerResponse.html#method_getHeaderFields
+		 */
+		getHeaderFields(): { [key: string]: string[] };
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ExternalServerResponse.html#method_getHeaderFieldValues
+		 * @since AppServer 108668
+		 */
+		getHeaderFieldValues(
+			headerFieldName: string
+		): string[];
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Gender.html
+	 */
+	class Gender {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Gender.html#property_Male
+		 */
+		static readonly Male: Gender;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Gender.html#property_Female
+		 */
+		static readonly Female: Gender;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Gender.html#property_Unknown
+		 */
+		static readonly Unknown: Gender;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/HTMLFile.html
+	 */
+	class HTMLFile {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/HTMLFile.html#method_HTMLFile
+		 */
+		constructor(
+			assetPath: string,
+			pageData?: Json
+		);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/HTMLFile.html#method_getAssetPath
+		 */
+		getAssetPath(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/HTMLFile.html#method_getPageData
+		 */
+		getPageData(): Json;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html
+	 */
+	class KnuddelAccount {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_getKnuddelAmount
+		 */
+		getKnuddelAmount(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_getKnuddelAmountUsed
+		 */
+		getKnuddelAmountUsed(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_getKnuddelAmountUnused
+		 */
+		getKnuddelAmountUnused(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_getTotalKnuddelAmountAppToUser
+		 */
+		getTotalKnuddelAmountAppToUser(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_getTotalKnuddelAmountUserToApp
+		 */
+		getTotalKnuddelAmountUserToApp(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_hasEnough
+		 */
+		hasEnough(
+			knuddelAmount: KnuddelAmount
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_getUser
+		 */
+		getUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAccount.html#method_use
+		 */
+		use(
+			knuddelAmount: KnuddelAmount,
+			displayReasonText: string,
+			parameters?: {
+				transferReason?: string;
+				onError?: (message: string) => void;
+				onSuccess?: () => void;
+			}
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html
+	 */
+	class KnuddelAmount {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_KnuddelAmount
+		 */
+		constructor(
+			knuddel: number
+		);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_fromCents
+		 */
+		static fromCents(
+			knuddel: number
+		): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_fromKnuddel
+		 */
+		static fromKnuddel(
+			knuddel: number
+		): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_getKnuddelCents
+		 */
+		getKnuddelCents(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_asNumber
+		 */
+		asNumber(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_negate
+		 */
+		negate(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelAmount.html#method_isNegative
+		 */
+		isNegative(): boolean;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html
+	 */
+	class KnuddelPot {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getId
+		 */
+		getId(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getState
+		 */
+		getState(): KnuddelPotState;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getKnuddelAmountPerParticipant
+		 */
+		getKnuddelAmountPerParticipant(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getKnuddelAmountTotal
+		 */
+		getKnuddelAmountTotal(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getParticipants
+		 */
+		getParticipants(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getMaxFeeMultiplier
+		 */
+		getMaxFeeMultiplier(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_setFee
+		 */
+		setFee(
+			feeUser: BotUser,
+			feeMultiplier: number
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getFeeUser
+		 */
+		getFeeUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_getFeeMultiplier
+		 */
+		getFeeMultiplier(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_seal
+		 */
+		seal(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_refund
+		 */
+		refund(
+			reason?: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_addWinner
+		 */
+		addWinner(
+			user: User,
+			weight?: number
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPot.html#method_payout
+		 */
+		payout(
+			text?: string
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelPotState.html
+	 */
+	class KnuddelPotState {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPotState.html#property_Open
+		 */
+		static readonly Open: KnuddelPotState;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPotState.html#property_Sealed
+		 */
+		static readonly Sealed: KnuddelPotState;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelPotState.html#property_Closed
+		 */
+		static readonly Closed: KnuddelPotState;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html
+	 */
+	class KnuddelTransfer {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_getSender
+		 */
+		getSender(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_getReceiver
+		 */
+		getReceiver(): BotUser;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_getKnuddelAmount
+		 */
+		getKnuddelAmount(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_getTransferReason
+		 */
+		getTransferReason(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_reject
+		 */
+		reject(
+			reason: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_accept
+		 */
+		accept(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_canAddToPot
+		 */
+		canAddToPot(
+			pot: KnuddelPot
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_addToPot
+		 */
+		addToPot(
+			knuddelPot: KnuddelPot
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransfer.html#method_isProcessed
+		 */
+		isProcessed(): boolean;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelTransferDisplayType.html
+	 */
+	class KnuddelTransferDisplayType {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransferDisplayType.html#property_Public
+		 */
+		static readonly Public: KnuddelTransferDisplayType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransferDisplayType.html#property_Private
+		 */
+		static readonly Private: KnuddelTransferDisplayType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelTransferDisplayType.html#property_Post
+		 */
+		static readonly Post: KnuddelTransferDisplayType;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html
+	 */
+	class KnuddelsServer {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_execute
+		 */
+		static execute(
+			fileName: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_listFiles
+		 */
+		static listFiles(
+			path: string
+		): string[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getDefaultBotUser
+		 */
+		static getDefaultBotUser(): BotUser;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getPersistence
+		 */
+		static getPersistence(): AppPersistence;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getChannel
+		 */
+		static getChannel(): Channel;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getUserAccess
+		 */
+		static getUserAccess(): UserAccess;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getPaymentAccess
+		 * @since AppServer 108571, ChatServer 108571
+		 */
+		static getPaymentAccess(): PaymentAccess;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getExternalServerAccess
+		 */
+		static getExternalServerAccess(): ExternalServerAccess;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_refreshHooks
+		 */
+		static refreshHooks(): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getDefaultLogger
+		 */
+		static getDefaultLogger(): Logger;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getFullImagePath
+		 */
+		static getFullImagePath(
+			imageName: string
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getFullSystemImagePath
+		 */
+		static getFullSystemImagePath(
+			imageName: string
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getChatServerInfo
+		 */
+		static getChatServerInfo(): ChatServerInfo;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getAppServerInfo
+		 */
+		static getAppServerInfo(): AppServerInfo;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getAppAccess
+		 */
+		static getAppAccess(): AppAccess;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_createKnuddelPot
+		 */
+		static createKnuddelPot(
+			knuddelAmount: KnuddelAmount,
+			params?: {
+				payoutTimeoutMinutes?: number;
+				shouldSealPot?: (pot: KnuddelPot) => boolean;
+				onPotSealed?: (pot: KnuddelPot) => void;
+			}
+		): KnuddelPot;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getKnuddelPot
+		 */
+		static getKnuddelPot(
+			id: number
+		): (KnuddelPot|null);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getAllKnuddelPots
+		 */
+		static getAllKnuddelPots(): KnuddelPot[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getToplistAccess
+		 */
+		static getToplistAccess(): ToplistAccess;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/KnuddelsServer.html#method_getAppProfileEntryAccess
+		 */
+		static getAppProfileEntryAccess(): AppProfileEntryAccess;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html
+	 */
+	class LoadConfiguration {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html#method_setBackgroundColor
+		 */
+		setBackgroundColor(
+			color: Color
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html#method_setBackgroundImage
+		 */
+		setBackgroundImage(
+			imageUrl: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html#method_setText
+		 */
+		setText(
+			text: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html#method_setLoadingIndicatorImage
+		 */
+		setLoadingIndicatorImage(
+			imageUrl: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html#method_setForegroundColor
+		 */
+		setForegroundColor(
+			color: Color
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/LoadConfiguration.html#method_setEnabled
+		 */
+		setEnabled(
+			enabled: boolean
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Logger.html
+	 */
+	class Logger {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Logger.html#method_debug
+		 */
+		debug(
+			...msg: any[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Logger.html#method_info
+		 */
+		info(
+			...msg: any[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Logger.html#method_warn
+		 */
+		warn(
+			...msg: any[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Logger.html#method_error
+		 */
+		error(
+			...msg: any[]
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Logger.html#method_fatal
+		 */
+		fatal(
+			...msg: any[]
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Message.html
+	 */
+	class Message {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Message.html#method_getAuthor
+		 */
+		getAuthor(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Message.html#method_getText
+		 */
+		getText(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Message.html#method_getCreationDate
+		 */
+		getCreationDate(): Date;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/OwnAppInstance.html
+	 */
+	class OwnAppInstance {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/OwnAppInstance.html#method_getOnlineUsers
+		 * @since AppServer 82560
+		 */
+		getOnlineUsers(
+			otherAppInstance: AppInstance,
+			...userType: UserType[]
+		): User[];
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/PaymentAccess.html
+	 * @since AppServer 108571, ChatServer 108571
+	 */
+	class PaymentAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/PaymentAccess.html#method_startKnuddelPurchase
+		 * @since AppServer 108571, ChatServer 108571
+		 */
+		startKnuddelPurchase(
+			user: User,
+			amount: KnuddelAmount,
+			parameters?: {
+				customMessage?: string;
+				transferReason?: string;
+				toAccount?: boolean;
+			}
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Persistence.html
+	 */
+	class Persistence {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_hasString
+		 */
+		hasString(
+			key: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_setString
+		 */
+		setString(
+			key: string,
+			value: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_getString
+		 */
+		getString(
+			key: string,
+			defaultValue?: string
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_deleteString
+		 */
+		deleteString(
+			key: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_hasNumber
+		 */
+		hasNumber(
+			key: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_setNumber
+		 */
+		setNumber(
+			key: string,
+			value: number
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_addNumber
+		 */
+		addNumber(
+			key: string,
+			value: number
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_getNumber
+		 */
+		getNumber(
+			key: string,
+			defaultValue?: number
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_deleteNumber
+		 */
+		deleteNumber(
+			key: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_hasObject
+		 */
+		hasObject(
+			key: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_setObject
+		 */
+		setObject(
+			key: string,
+			object: (KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable)
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_getObject
+		 */
+		getObject(
+			key: string,
+			defaultValue?: (KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable)
+		): (KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Persistence.html#method_deleteObject
+		 */
+		deleteObject(
+			key: string
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/PrivateMessage.html
+	 */
+	class PrivateMessage extends Message {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/PrivateMessage.html#method_getReceivingUsers
+		 */
+		getReceivingUsers(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/PrivateMessage.html#method_sendReply
+		 */
+		sendReply(
+			text: string
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/PublicActionMessage.html
+	 */
+	class PublicActionMessage extends Message {
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/PublicEventMessage.html
+	 */
+	class PublicEventMessage extends Message {
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/PublicMessage.html
+	 */
+	class PublicMessage extends Message {
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Quest.html
+	 */
+	class Quest {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Quest.html#method_setSolved
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		setSolved(
+			count?: number
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Quest.html#method_getQuestKey
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		getQuestKey(): string;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/QuestAccess.html
+	 */
+	class QuestAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/QuestAccess.html#method_getQuests
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		getQuests(): Quest[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/QuestAccess.html#method_hasQuest
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		hasQuest(
+			questKey: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/QuestAccess.html#method_getQuest
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		getQuest(
+			questKey: string
+		): (Quest|null);
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/QuestAccess.html#method_getUser
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		getUser(): User;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html
+	 */
+	class RandomOperations {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html#method_nextInt
+		 */
+		static nextInt(
+			minValue: number /* optional */,
+			maxValue: number
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html#method_nextInts
+		 */
+		static nextInts(
+			minValue: number /* optional */,
+			maxValue: number,
+			count: number,
+			onlyDifferentNumbers: boolean
+		): number[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html#method_flipTrue
+		 */
+		static flipTrue(
+			truePropability: number
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html#method_getRandomObject
+		 */
+		static getRandomObject<T>(
+			objects: T[]
+		): T;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html#method_shuffleObjects
+		 */
+		static shuffleObjects<T>(
+			objects: T[]
+		): T[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RandomOperations.html#method_getRandomString
+		 * @since AppServer 92699
+		 */
+		static getRandomString(
+			length: number,
+			allowedCharacters?: string
+		): string;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/RootAppInstance.html
+	 */
+	class RootAppInstance extends AppInstance {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RootAppInstance.html#method_updateApp
+		 */
+		updateApp(
+			message: string /* optional */,
+			logMessage?: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RootAppInstance.html#method_cancelUpdateApp
+		 * @since AppServer 98117
+		 */
+		cancelUpdateApp(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/RootAppInstance.html#method_stopApp
+		 */
+		stopApp(
+			message: string /* optional */,
+			logMessage?: string
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ServerInfo.html
+	 */
+	class ServerInfo {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ServerInfo.html#method_getServerId
+		 */
+		getServerId(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ServerInfo.html#method_getRevision
+		 */
+		getRevision(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/SingleDiceResult.html
+	 */
+	class SingleDiceResult {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/SingleDiceResult.html#method_getDice
+		 */
+		getDice(): Dice;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/SingleDiceResult.html#method_valuesRolled
+		 */
+		valuesRolled(): number[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/SingleDiceResult.html#method_sum
+		 */
+		sum(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/String.html
+	 */
+	interface String {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_escapeKCode
+		 */
+		escapeKCode(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_stripKCode
+		 */
+		stripKCode(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_startsWith
+		 */
+		startsWith(
+			prefix: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_endsWith
+		 */
+		endsWith(
+			suffix: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_getPixelWidth
+		 */
+		getPixelWidth(
+			fontSize: number,
+			isBold: boolean
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_limitString
+		 */
+		limitString(
+			fontSize: number,
+			isBold: boolean,
+			maxPixelWidth: number,
+			abbreviationMarker?: string
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_contains
+		 */
+		contains(
+			needle: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_minimalConversionCost
+		 * @since AppServer 82271
+		 */
+		minimalConversionCost(
+			otherString: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_hasOnlyNicknameCharacters
+		 * @since AppServer 82271
+		 */
+		hasOnlyNicknameCharacters(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_hasOnlyDigits
+		 * @since AppServer 82271
+		 */
+		hasOnlyDigits(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_hasOnlyAlphanumericalAndWhitespaceCharacters
+		 * @since AppServer 82271
+		 */
+		hasOnlyAlphanumericalAndWhitespaceCharacters(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_isEmpty
+		 * @since AppServer 92695
+		 */
+		isEmpty(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_toCamelCase
+		 * @since AppServer 92695
+		 */
+		toCamelCase(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_capitalize
+		 * @since AppServer 92695
+		 */
+		capitalize(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_replaceAll
+		 */
+		replaceAll(
+			search: string|RegExp,
+			replacement: string
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/String.html#method_isOk
+		 * @since ChatServer 82262, AppServer 82262
+		 */
+		isOk(): boolean;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/Toplist.html
+	 */
+	class Toplist {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_getUserPersistenceNumberKey
+		 */
+		getUserPersistenceNumberKey(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_getDisplayName
+		 */
+		getDisplayName(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_getChatCommand
+		 */
+		getChatCommand(
+			user_or_userId?: (User|number)
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_getLabel
+		 */
+		getLabel(
+			user_or_userId: (User|number)
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_addLabelChangeListener
+		 */
+		addLabelChangeListener(
+			listener: (labelChangeEvent: ToplistLabelChangeEvent) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_removeLabelChangeListener
+		 */
+		removeLabelChangeListener(
+			listener: (labelChangeEvent: ToplistLabelChangeEvent) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_addRankChangeListener
+		 */
+		addRankChangeListener(
+			listener: (rankChangeEvent: ToplistRankChangeEvent) => void
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/Toplist.html#method_removeRankChangeListener
+		 */
+		removeRankChangeListener(
+			listener: (rankChangeEvent: ToplistRankChangeEvent) => void
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ToplistAccess.html
+	 */
+	class ToplistAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistAccess.html#method_getAllToplists
+		 */
+		getAllToplists(): Toplist[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistAccess.html#method_getToplist
+		 */
+		getToplist(
+			userPersistenceNumberKey: string
+		): Toplist;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistAccess.html#method_removeToplist
+		 */
+		removeToplist(
+			toplist: Toplist
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistAccess.html#method_createOrUpdateToplist
+		 */
+		createOrUpdateToplist(
+			userPersistenceNumberKey: string,
+			displayName: string,
+			parameters?: {
+				labelMapping?: { [minValue: string]: string };
+				ascending?: boolean;
+				sortIndex?: number;
+			}
+		): Toplist;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ToplistDisplayType.html
+	 */
+	class ToplistDisplayType {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistDisplayType.html#property_Label
+		 */
+		static readonly Label: ToplistDisplayType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistDisplayType.html#property_Value
+		 */
+		static readonly Value: ToplistDisplayType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistDisplayType.html#property_LabelAndRank
+		 */
+		static readonly LabelAndRank: ToplistDisplayType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistDisplayType.html#property_ValueAndRank
+		 */
+		static readonly ValueAndRank: ToplistDisplayType;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html
+	 */
+	class ToplistLabelChangeEvent {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html#method_getToplist
+		 */
+		getToplist(): Toplist;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html#method_getOldLabel
+		 */
+		getOldLabel(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html#method_getNewLabel
+		 */
+		getNewLabel(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html#method_getUser
+		 */
+		getUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html#method_getOldValue
+		 */
+		getOldValue(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistLabelChangeEvent.html#method_getNewValue
+		 */
+		getNewValue(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html
+	 */
+	class ToplistRankChangeEvent {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getToplist
+		 */
+		getToplist(): Toplist;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getOldRank
+		 */
+		getOldRank(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getNewRank
+		 */
+		getNewRank(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getUser
+		 */
+		getUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getUsersOvertook
+		 */
+		getUsersOvertook(): User[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getOldValue
+		 */
+		getOldValue(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/ToplistRankChangeEvent.html#method_getNewValue
+		 */
+		getNewValue(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/User.html
+	 */
+	class User {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getUserId
+		 */
+		getUserId(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getNick
+		 */
+		getNick(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getAge
+		 */
+		getAge(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getGender
+		 */
+		getGender(): Gender;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getRegDate
+		 */
+		getRegDate(): Date;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getUserStatus
+		 */
+		getUserStatus(): UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getUserType
+		 */
+		getUserType(): UserType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getClientType
+		 */
+		getClientType(): ClientType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_canShowAppViewMode
+		 */
+		canShowAppViewMode(
+			mode: AppViewMode
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_canSendAppContent
+		 */
+		canSendAppContent(
+			appContent: AppContent
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isInTeam
+		 */
+		isInTeam(
+			teamName: string,
+			subTeamName?: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getPersistence
+		 */
+		getPersistence(): UserPersistence;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_sendPrivateMessage
+		 */
+		sendPrivateMessage(
+			message: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_sendPostMessage
+		 */
+		sendPostMessage(
+			topic: string,
+			text: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isChannelOwner
+		 */
+		isChannelOwner(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isLikingChannel
+		 */
+		isLikingChannel(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isChannelCoreUser
+		 * @since AppServer 92701, ChatServer 92701
+		 */
+		isChannelCoreUser(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isAppManager
+		 */
+		isAppManager(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isMuted
+		 */
+		isMuted(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isColorMuted
+		 */
+		isColorMuted(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isLocked
+		 */
+		isLocked(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isChannelModerator
+		 */
+		isChannelModerator(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isEventModerator
+		 */
+		isEventModerator(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isAppDeveloper
+		 */
+		isAppDeveloper(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getProfileLink
+		 */
+		getProfileLink(
+			displayText?: string
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isOnlineInChannel
+		 */
+		isOnlineInChannel(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getKnuddelAmount
+		 */
+		getKnuddelAmount(): KnuddelAmount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isOnline
+		 */
+		isOnline(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getReadme
+		 */
+		getReadme(): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getOnlineMinutes
+		 */
+		getOnlineMinutes(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isAway
+		 */
+		isAway(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_hasProfilePhoto
+		 */
+		hasProfilePhoto(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_sendAppContent
+		 */
+		sendAppContent(
+			appContent: AppContent
+		): AppContentSession;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getAppContentSessions
+		 */
+		getAppContentSessions(): AppContentSession[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getAppContentSession
+		 */
+		getAppContentSession(
+			appViewMode: AppViewMode
+		): AppContentSession;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_equals
+		 */
+		equals(
+			user: User
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getProfilePhoto
+		 */
+		getProfilePhoto(
+			width: number,
+			height: number
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getQuestAccess
+		 * @since AppServer 82290, ChatServer 82290
+		 */
+		getQuestAccess(): QuestAccess;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isStreamingVideo
+		 */
+		isStreamingVideo(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getKnuddelAccount
+		 */
+		getKnuddelAccount(): KnuddelAccount;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getChannelTalkPermission
+		 */
+		getChannelTalkPermission(): ChannelTalkPermission;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isProfilePhotoVerified
+		 */
+		isProfilePhotoVerified(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_isAgeVerified
+		 */
+		isAgeVerified(): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_addNicklistIcon
+		 */
+		addNicklistIcon(
+			imagePath: string,
+			imageWidth: number
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_removeNicklistIcon
+		 */
+		removeNicklistIcon(
+			imagePath: string
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_triggerDice
+		 * @since AppServer 89159, ChatServer 89159
+		 */
+		triggerDice(
+			diceConfiguration: DiceConfiguration
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/User.html#method_getAuthenticityClassification
+		 * @since AppServer 94663, ChatServer 94663
+		 */
+		getAuthenticityClassification(): AuthenticityClassification;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserAccess.html
+	 */
+	class UserAccess {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_getUserId
+		 */
+		getUserId(
+			nick: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_exists
+		 */
+		exists(
+			nick: string
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_isUserDeleted
+		 */
+		isUserDeleted(
+			userId: number
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_mayAccess
+		 */
+		mayAccess(
+			userId: number
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_getUserById
+		 */
+		getUserById(
+			userId: number
+		): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_getNick
+		 */
+		getNick(
+			userId: number
+		): string;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserAccess.html#method_eachAccessibleUser
+		 */
+		eachAccessibleUser(
+			callback: (user: User, index: number, accessibleUserCount: number, key?: string) => boolean,
+			parameters?: {
+				onStart?: (accessibleUserCount: number, key?: string) => void;
+				onEnd?: (accessibleUserCount: number, key?: string) => void;
+			}
+		): void;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserPersistence.html
+	 */
+	class UserPersistence extends Persistence {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistence.html#method_deleteAllNumbers
+		 * @since AppServer 88569
+		 */
+		deleteAllNumbers(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistence.html#method_deleteAllObjects
+		 * @since AppServer 88569
+		 */
+		deleteAllObjects(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistence.html#method_deleteAllStrings
+		 * @since AppServer 88569
+		 */
+		deleteAllStrings(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistence.html#method_deleteAll
+		 * @since AppServer 88569
+		 */
+		deleteAll(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumberEntry.html
+	 */
+	class UserPersistenceNumberEntry {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumberEntry.html#method_getUser
+		 */
+		getUser(): User;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumberEntry.html#method_getValue
+		 */
+		getValue(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumberEntry.html#method_getRank
+		 */
+		getRank(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumberEntry.html#method_getPosition
+		 */
+		getPosition(): number;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html
+	 */
+	class UserPersistenceNumbers {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getSum
+		 */
+		static getSum(
+			key: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_deleteAll
+		 */
+		static deleteAll(
+			key: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getCount
+		 */
+		static getCount(
+			key: string,
+			parameters?: {
+				minimumValue?: number;
+				maximumValue?: number;
+			}
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_updateKey
+		 */
+		static updateKey(
+			oldKeyName: string,
+			newKeyName: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_updateValue
+		 */
+		static updateValue(
+			key: string,
+			oldValue: number,
+			newValue: number
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_addNumber
+		 */
+		static addNumber(
+			key: string,
+			value: number,
+			parameters?: {
+				minimumValue?: number;
+				maximumValue?: number;
+				targetUsers?: User[];
+			}
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getSortedEntries
+		 */
+		static getSortedEntries(
+			key: string,
+			parameters?: {
+				ascending?: boolean;
+				count?: number;
+				page?: number;
+				minimumValue?: number;
+				maximumValue?: number;
+			}
+		): UserPersistenceNumberEntry[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getSortedEntriesAdjacent
+		 */
+		static getSortedEntriesAdjacent(
+			key: string,
+			user_or_userId: (User|number),
+			parameters?: {
+				ascending?: boolean;
+				count?: number;
+			}
+		): UserPersistenceNumberEntry[];
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getPosition
+		 */
+		static getPosition(
+			key: string,
+			user_or_userId: (User|number),
+			parameters?: {
+				ascending?: boolean;
+				minimumValue?: number;
+			}
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getRank
+		 */
+		static getRank(
+			key: string,
+			user_or_userId: (User|number),
+			parameters?: {
+				ascending?: boolean;
+				minimumValue?: number;
+			}
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_each
+		 */
+		static each(
+			key: string,
+			callback: (user: User, value: number, index: number, totalCount: number, key: string) => boolean,
+			parameters?: {
+				ascending?: boolean;
+				minimumValue?: number;
+				maximumValue?: number;
+				maximumCount?: number;
+				onStart?: (totalCount: number, key: string) => void;
+				onEnd?: (totalCount: number, key: string) => void;
+			}
+		): void;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceNumbers.html#method_getAllKeys
+		 * @since AppServer 82483
+		 */
+		static getAllKeys(
+			filterKey?: string
+		): string[];
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserPersistenceObjects.html
+	 */
+	class UserPersistenceObjects {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceObjects.html#method_deleteAll
+		 * @since AppServer 82478
+		 */
+		static deleteAll(
+			key: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceObjects.html#method_getAllKeys
+		 * @since AppServer 82483
+		 */
+		static getAllKeys(
+			filterKey?: string
+		): string[];
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserPersistenceStrings.html
+	 */
+	class UserPersistenceStrings {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceStrings.html#method_exists
+		 * @since AppServer 88571
+		 */
+		static exists(
+			key: string,
+			value: string,
+			ignoreCase?: boolean
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceStrings.html#method_deleteAll
+		 * @since AppServer 82478
+		 */
+		static deleteAll(
+			key: string
+		): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserPersistenceStrings.html#method_getAllKeys
+		 * @since AppServer 82483
+		 */
+		static getAllKeys(
+			filterKey?: string
+		): string[];
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserStatus.html
+	 */
+	class UserStatus {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#method_getNumericStatus
+		 */
+		getNumericStatus(): number;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#method_isAtLeast
+		 */
+		isAtLeast(
+			otherUserStatus: UserStatus
+		): boolean;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_Newbie
+		 */
+		static readonly Newbie: UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_Family
+		 */
+		static readonly Family: UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_Stammi
+		 */
+		static readonly Stammi: UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_HonoryMember
+		 */
+		static readonly HonoryMember: UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_Admin
+		 */
+		static readonly Admin: UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_SystemBot
+		 */
+		static readonly SystemBot: UserStatus;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserStatus.html#property_Sysadmin
+		 */
+		static readonly Sysadmin: UserStatus;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/UserType.html
+	 */
+	class UserType {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserType.html#property_AppBot
+		 */
+		static readonly AppBot: UserType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserType.html#property_SystemBot
+		 */
+		static readonly SystemBot: UserType;
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/UserType.html#property_Human
+		 */
+		static readonly Human: UserType;
+	}
+
+	/**
+	 * @see https://developer.knuddels.de/docs/classes/VideoChannelData.html
+	 */
+	class VideoChannelData {
+		/**
+		 * @see https://developer.knuddels.de/docs/classes/VideoChannelData.html#method_getStreamingVideoUsers
+		 */
+		getStreamingVideoUsers(): User[];
 	}
 }
-
-/**
- * Klasse, die es ermöglicht ein Event via Client/dispatchEvent:method zu versenden.
- */
-declare namespace Client {
-	class Event {
-		/**
-		 * Erzeugt ein Event.
-		 */
-		constructor(type: string, data: KnuddelsEvent);
-	}
-}
-
-/**
- * Klasse, die es ermöglicht den Inhalte zu steuern, die im Bereich liegen, der das HTML User Interface hostet.
- */
-declare namespace Client {
-	class HostFrame {
-		/**
-		 * Setzt den Titel der Seite im gezoomten Modus (nur Android).
-		 */
-		setTitle(newTitle: string): void;
-		/**
-		 * Ändert die sichtbare Hintergrundfarbe des Hostframes animiert. (Android-only)
-		 */
-		setBackgroundColor(newColor: Color, durationMillis?: number): void;
-		/**
-		 * Setzt die Icons, die als Fenster-Icon angezeigt werden sollen. (Applet-only, nur mit AppViewMode.Popup)
-		 * Die Bilder müssen von groß nach klein sortiert sein. Die größeren Bilder werden (je nach System) automatisch dann eingesetzt,
-		 * wenn größere Bilder benötigt werden (z.B. in der Task-Leiste, oder beim Alt+Tab Fenster-Wechsel).
-		 * @since Applet: 9.0bwj, AppServer: 84904
-		 */
-		setIcons(...path: string[]): void;
-		/**
-		 * Setzt, ob das Fenster resizable ist. (Applet-only, nur mit AppViewMode.Popup)
-		 */
-		setResizable(resizable: boolean): void;
-		/**
-		 * Bringt das Fenster der App (App-Popup bzw. Chat-Fenster) in den Vordergrund. (Applet-only)
-		 * @since Applet: 9.0bwj, AppServer: 84904
-		 */
-		focus(): void;
-		/**
-		 * Ändert die Größe des App-Fensters (AppViewMode.Popup) bzw. App-Overlays (AppViewMode.Overlay).
-		 * @since Applet: 9.0bwj, AppServer: 84516
-		 */
-		setSize(width: number, height: number): void;
-	}
-}
-
-/**
- * ClientType repräsentiert die Art der Chat-Verbindung des Users.
- *
- * Eine Instanz von <code>ClientType</code> erhält man über das User-Objekt
- * mit user.getClientType()
- */
-declare class ClientType {
-	/**
-	 * Der User ist mit dem Java Applet im Chat.
-	 */
-	static readonly Applet: ClientType;
-	/**
-	 * Der User ist mit dem Browser im Chat (Mini-Chat, HTML-Chat).
-	 */
-	static readonly Browser: ClientType;
-	/**
-	 * Der User ist mit der Android-App im Chat.
-	 */
-	static readonly Android: ClientType;
-	/**
-	 * Der User ist mit der iOS-App im Chat.
-	 */
-	static readonly IOS: ClientType;
-	/**
-	 * Der User ist nicht im Chat.
-	 */
-	static readonly Offline: ClientType;
-}
-
-/**
- * Klasse, mit der serverseitige Farbobjekte erstellt werden können.
- */
-declare class Color {
-	/**
-	 * Erzeugt ein serverseitiges Color-Objekt mit RGB-Werten.
-	 * Als Alpha-Wert wird automatisch 255 genutzt.
-	 */
-	static fromRGB(red: number, green: number, blue: number): Color;
-	/**
-	 * Erzeugt ein serverseitiges Color-Objekt mit RGBA-Werten.
-	 */
-	static fromRGBA(red: number, green: number, blue: number, alpha: number): Color;
-	/**
-	 * Liefert den Alpha-Wert der Farbe als Zahl zwischen 0 und 255.
-	 */
-	getAlpha(): number;
-	/**
-	 * Liefert den Blau-Anteil der Farbe als Zahl zwischen 0 und 255.
-	 */
-	getBlue(): number;
-	/**
-	 * Liefert den Grün-Anteil der Farbe als Zahl zwischen 0 und 255.
-	 */
-	getGreen(): number;
-	/**
-	 * Liefert den Rot-Anteil der Farbe als Zahl zwischen 0 und 255.
-	 */
-	getRed(): number;
-	/**
-	 * Liefert die Farbe als KCode zurück.
-	 */
-	toKCode(): string;
-	/**
-	 * Liefert die numerische Repräsentation der Farbe zurück.
-	 */
-	asNumber(): number;
-	/**
-	 * Erzeugt ein serverseitiges Color-Objekt aus der numerischen Repräsentation einer Farbe.
-	 */
-	static fromNumber(value: number): Color;
-}
-
-/**
- * Eine Instanz von Dice repräsentiert die Anzahl an Würfeln von einerm bestimmten Typ.
- */
-declare class Dice {
-	/**
-	 * Erzeugt ein Dice-Objekt mit der übergebenen Anzahl Würfel und Augenzahl.
-	 */
-	constructor(count: number /* optional */, value: number);
-	/**
-	 * Liefert die Anzahl der Würfel.
-	 */
-	getAmount(): number;
-	/**
-	 * Liefert die Anzahl der Seiten der Würfel.
-	 */
-	getNumberOfSides(): number;
-}
-
-/**
- * Eine Instanz von DiceConfiguration repräsentiert eindeutig eine Konfiguration zum würfeln.
- * Wurde gewürfelt, so können die Konfigurationen verglichen werden, um zu prüfen, ob exakt die Würfel
- * gewürfelt wurden, die gewürfelt werden sollten.
- */
-declare class DiceConfiguration {
-	/**
-	 * Informiert, ob es sich um einen offenen Würfelwurf handelt.
-	 * Offene Würfelwürfe sind speziell. Falls die Augenzahl des Würfels die Maximalsumme zeigt,
-	 * so wird noch einmal gewürfelt und die neue Zahl dazu addiert, solange bis der Würfel
-	 * nicht mehr die Maximalsumme zeigt.
-	 *
-	 * <b>Beispiel:</b> /diceo 1w4 -> 4 -> 4 -> 3 = 11
-	 */
-	isUsingOpenThrow(): boolean;
-	/**
-	 * Informiert darüber, ob die Würfel privat geworfen worden sind.
-	 * Würfelwürfe zählen als privat, wenn am Ende des Würfelbefehls ein Ausrufezeichen steht.
-	 * <b>Beispiel:</b> /dice 10w2!
-	 */
-	isUsingPrivateThrow(): boolean;
-	/**
-	 * Liefert ein Array mit Würfeln, mit denen gewürfelt wurde.
-	 */
-	getDices(): Dice[];
-	/**
-	 * Vergleicht, ob zwei Konfigurationen inhaltlich identisch sind
-	 */
-	equals(diceConfiguration: DiceConfiguration): boolean;
-	/**
-	 * Liefert den Befehl, der im Chat eingegeben werden kann, um einen Wurf auszuführen,
-	 * der zur DiceConfiguration passt.
-	 * @since AppServer 82248
-	 */
-	getChatCommand(): string;
-}
-
-/**
- * Eine Instanz einer DiceConfigurationFactory kann zur Unterstützung genutzt werden, um eine
- * DiceConfiguration zu erzeugen.
- */
-declare class DiceConfigurationFactory {
-	/**
-	 * Fügt der Konfiguration einen Würfel hinzu.
-	 */
-	addDice(dice: Dice): void;
-	/**
-	 * Liefert die Anzahl der Würfel, die zur Konfiguration gehören.
-	 */
-	computeCurrentDiceCount(): number;
-	/**
-	 * Setzt die Information, ob ein offener Wurf oder ein normaler Wurf stattfinden soll.
-	 * Offene Würfelwürfe sind speziell. Falls die Augenzahl des Würfels die Maximalsumme zeigt,
-	 * so wird noch einmal gewürfelt und die neue Zahl dazu addiert, solange bis der Würfel
-	 * nicht mehr die Maximalsumme zeigt.
-	 *
-	 * <b>Beispiel:</b> /diceo 1w4 -> 4 -> 4 -> 3 = 11
-	 */
-	setUseOpenThrow(shouldUseOpenThrow: boolean): void;
-	/**
-	 * Setzt die Information, ob der Würfelwurf privat stattfinden soll.
-	 */
-	setShouldUsePrivateThrow(shouldUsePrivateThrow: boolean): void;
-	/**
-	 * Liefert die erzeugte Würfelkonfiguration.
-	 */
-	getDiceConfiguration(): DiceConfiguration;
-	/**
-	 * Erzeugt eine Würfelkonfiguration.
-	 */
-	static fromString(diceConfigurationString: string): DiceConfiguration;
-}
-
-/**
- * Wird in der App die Methode onUserDiced überschrieben, so erhält diese bei jedem Würfelwurf ein DiceEvent.
- * Ein DiceEvent ermöglicht einem detaillierte Informationen rund um diesen Würfelwurf in Erfahrung zu bringen.
- */
-declare class DiceEvent {
-	/**
-	 * Liefert den Nutzer, der gewürfelt hat.
-	 */
-	getUser(): User;
-	/**
-	 * Liefert das DiceResult des Würfelwurfs.
-	 */
-	getDiceResult(): DiceResult;
-}
-
-/**
- * Ein DiceResult beinhaltet konkrete Informationen über einen Würfelwurf.
- */
-declare class DiceResult {
-	/**
-	 * Liefert die Konfiguration mit der gewürfelt wurde.
-	 */
-	getDiceConfiguration(): DiceConfiguration;
-	/**
-	 * Liefert ein Array mit Details zu den einzelnen Ergebnissen pro Würfeltyp.
-	 */
-	getSingleDiceResults(): SingleDiceResult[];
-	/**
-	 * Liefert die Summe der Augenzahlen aller  Würfel
-	 */
-	totalSum(): number;
-}
-
-/**
- * Die Instanz einer Domain beinhaltet alle relevanten Informationen zur Domain.
- */
-declare class Domain {
-	/**
-	 * Liefert ein den Domain-Namen der aktuellen Domain.
-	 */
-	getDomainName(): string;
-}
-
-/**
- * Die Instanz von <code>ExternalServerAccess</code> erhält man über die KnuddelsServer.getExternalServerAccess().
- * Damit der Zugriff auf einen externern Server funktioniert, muss auf dem Server eine Datei <code>knuddelsAccess.txt</code> abgelegt werden, die die FTP-User-ID des Entwicklers enthält.
- */
-declare class ExternalServerAccess {
-	/**
-	 * Liefert eine Liste aller zugreifbaren Domains
-	 */
-	getAllAccessibleDomains(): Domain[];
-	/**
-	 * Prüft den Zugriff auf eine bestimmte URL. Wird je Kombination von "Protokoll + Host + Port" geprüft.<br>
-	 * Beispiel: http://www.example.de:8080
-	 */
-	canAccessURL(urlString: string): boolean;
-	/**
-	 * Macht einen GET-Request auf die übergebene URL und liefert den Inhalt zurück.
-	 * Diese Methode ist eine Convenience-Methode für externalServerAccess.callURL().
-	 */
-	getURL(
-		urlString: string,
-		parameters?: {
-			onSuccess?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-			onFailure?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-		}): void;
-	/**
-	 * Macht einen POST-Request auf die übergebene URL und liefert den Inhalt zurück.
-	 * Diese Methode ist eine Convenience-Methode für externalServerAccess.callURL().
-	 */
-	postURL(
-		urlString: string,
-		parameters?: {
-			onSuccess?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-			onFailure?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-			data?: Json;
-		}): void;
-	/**
-	 * Macht einen GET-Request auf die übergebene URL. Im Gegensatz zum GET-Request wird der Inhalt der Webseite wird nicht ausgelesen.
-	 * Aus diesem Grund ist diese Methode schneller.
-	 * Diese Methode ist eine Convenience-Methode für externalServerAccess.callURL().
-	 */
-	touchURL(
-		urlString: string,
-		parameters?: {
-			onSuccess?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-			onFailure?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-		}): void;
-	/**
-	 * Macht einen Request auf die übergebene URL.
-	 */
-	callURL(
-		urlString: string,
-		parameters?: {
-			onSuccess?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-			onFailure?(responseData: string, externalServerResponse: ExternalServerResponse): void;
-			method?: ("GET" | "POST");
-			data?: Json;
-		}): void;
-}
-
-/**
- * Die Instanz von <code>ExternalServerResponse</code> erhält in den onSuccess- und onFailure-Callbacks der Methoden von
- * ExternalServerAccess. Es enthält alle notwendigen Daten zum Verarbeiten.
- */
-declare class ExternalServerResponse {
-	/**
-	 * Liefert die abgefragte URL.
-	 */
-	getURLString(): string;
-	/**
-	 * Liefert den <a href="https://de.wikipedia.org/wiki/HTTP-Statuscode" target="_blank">HTTP-Statuscode</a> der Seite.
-	 */
-	getResponseCode(): number;
-	/**
-	 * Liefert ein Objekt, das die Headerdaten der Antwort enthält.
-	 */
-	getHeaderFields(): { [key: string]: string[] };
-}
-
-/**
- * Gender repräsentiert das Geschlecht eines User.
- */
-declare class Gender {
-	/**
-	 * Das Geschlecht ist männlich.
-	 */
-	static readonly Male: Gender;
-	/**
-	 * Das Geschlecht ist weiblich.
-	 */
-	static readonly Female: Gender;
-	/**
-	 * Das Geschlecht ist nicht bekannt.
-	 */
-	static readonly Unknown: Gender;
-}
-
-/**
- * Repräsentiert eine HTML-Datei, die auf dem Server im Ordner /www liegt.
- */
-declare class HTMLFile {
-	/**
-	 *
-	 */
-	constructor(assetPath: string, pageData?: Json);
-	/**
-	 * Liefert den Pfad, der beim Anlegen der HTMLFile-Instanz genutzt wurde.
-	 */
-	getAssetPath(): string;
-	/**
-	 * Liefert die pageData, die beim Anlegen der HTMLFile-Instanz genutzt wurden.
-	 */
-	getPageData(): Json;
-}
-
-/**
- * Eine Instanz von KnuddelAccount ermöglicht den Zugriff auf die freigegebenen Knuddel
- *  eines bestimmten User. Knuddel können abgezogen und addiert werden.
- */
-declare class KnuddelAccount {
-	/**
-	 * Liefert den KnuddelAmount eines Users,
-	 * über den die App gerade frei verfügen kann.
-	 */
-	getKnuddelAmount(): KnuddelAmount;
-	/**
-	 * Liefert den KnuddelAmount aus dem KnuddelAccount,
-	 * der bereits von der App genutzt wurde.
-	 * Beim Auszahlen dieser Knuddel aus dem KnuddelAccount an den
-	 * User fallen Steuern an.
-	 */
-	getKnuddelAmountUsed(): KnuddelAmount;
-	/**
-	 * Liefert den KnuddelAmount aus dem KnuddelAccount,
-	 * der noch nicht von der App genutzt wurde.
-	 * Beim Auszahlen dieser Knuddel aus dem KnuddelAccount an den
-	 * User fallen <strong>keine</strong> Steuern an.
-	 */
-	getKnuddelAmountUnused(): KnuddelAmount;
-	/**
-	 * Liefert die Summe aller Transfers, die die App an diesen KnuddelAccount bzw. User überwiesen hat.
-	 */
-	getTotalKnuddelAmountAppToUser(): KnuddelAmount;
-	/**
-	 * Liefert die Summe aller Transfers, die die App von diesem KnuddelAccount bzw. User abgebucht/erhalten hat.
-	 */
-	getTotalKnuddelAmountUserToApp(): KnuddelAmount;
-	/**
-	 * Liefert die Information, ob in diesem Moment genug Knuddel verfügbar sind.
-	 */
-	hasEnough(knuddelAmount: KnuddelAmount): boolean;
-	/**
-	 * Liefert den Nutzer, dem der KnuddelAccount gehört.
-	 */
-	getUser(): User;
-	/**
-	 * Versucht eine bestimmte Menge Knuddel zu verwenden. Dies ist nur möglich, wenn der User auf seinem KnuddelAccount
-	 * genug Knuddel besitzt <strong>und</strong> online im Channel ist.
-	 * Vom KnuddelAccount des Besitzer des Channel können Knuddel auch abgebucht werden, wenn dieser nicht im Channel online ist.
-	 *
-	 * Ist das Event App.onBeforeKnuddelReceived implementiert, so wird diese direkt nach dem <code>use</code> aufgerufen,
-	 * um zu entscheiden, ob die Knuddel angenommen werden sollen.
-	 *
-	 * <br ><br ><b>Hinweis:</b> Knuddel an einen Nutzer senden kannst du mit der Methode BotUser/transferKnuddel:method.
-	 */
-	use(knuddelAmount: KnuddelAmount, displayReasonText: string, parameters?: { transferReason?: string; onError?(message: string): void; onSuccess?(): void; }): void;
-}
-
-/**
- * Eine Instanz von KnuddelAmount repräsentiert eine bestimmte Anzahl von Knuddel.
- */
-declare class KnuddelAmount {
-	/**
-	 * Erzeugt eine Instanz von KnuddelAmount mit der Anzahl Knuddel.
-	 */
-	constructor(knuddel: number);
-	/**
-	 * Erzeugt eine Instanz von KnuddelAmount mit einer bestimmten Cent-Anzahl.
-	 */
-	static fromCents(knuddel: number): KnuddelAmount;
-	/**
-	 * Erzeugt eine Instanz von KnuddelAmount mit einer bestimmten Knuddel-Anzahl.
-	 */
-	static fromKnuddel(knuddel: number): KnuddelAmount;
-	/**
-	 * Liefert die Anzahl der Knuddel in KnuddelCent zurück.
-	 */
-	getKnuddelCents(): number;
-	/**
-	 * Gibt den Wert der Knuddel als Zahl zurück.
-	 */
-	asNumber(): number;
-	/**
-	 * Liefert eine negierte Kopie des KnuddelAmount zurück.
-	 */
-	negate(): KnuddelAmount;
-	/**
-	 * Liefert die Information, ob der Knuddelwert unter 0 ist.
-	 */
-	isNegative(): boolean;
-}
-
-/**
- * Repräsentiert einen KnuddelPot.
- * Ein KnuddelPot kann nur durch Factory-Methoden des KnuddelsServer erzeugt werden:
- * KnuddelsServer/createKnuddelPot:method.
- *
- * Wird die App heruntergefahren, so werden alle KnuddelPots, die nicht gesealt sind automatisch refunded.
- */
-declare class KnuddelPot {
-	/**
-	 * Liefert die id des KnuddelPot.
-	 */
-	getId(): number;
-	/**
-	 * Liefert den Status des KnuddelPot.
-	 */
-	getState(): KnuddelPotState;
-	/**
-	 * Liefert den beim Kreieren des KnuddelPots festgelegten KnuddelAmount, den jeder Teilnehmer zahlen muss.
-	 */
-	getKnuddelAmountPerParticipant(): KnuddelAmount;
-	/**
-	 * Liefert den KnuddelAmount, der bisher insgesamt in den KnuddelPot eingezahlt wurde.
-	 */
-	getKnuddelAmountTotal(): KnuddelAmount;
-	/**
-	 * Liefert die Liste der Teilnehmer, die bisher in den KnuddelPot eingezahlt haben.
-	 */
-	getParticipants(): User[];
-	/**
-	 * Liefert den höchsten Multiplikator, der gültig ist.
-	 */
-	getMaxFeeMultiplier(): number;
-	/**
-	 * Setzt den BotUser, der den Anteil der Einzahlungen nach dem Spiel erhält
-	 * und den Anteil, vom Gesamtpot, den er erhalten soll.
-	 */
-	setFee(feeUser: BotUser, feeMultiplier: number): void;
-	/**
-	 * Liefert den mit KnuddelPot/setFee:method gesetzten BotUser an den die Gebühr ausbezahlt wird.
-	 */
-	getFeeUser(): User;
-	/**
-	 * Liefert den mit KnuddelPot/setFee:method gesetzten Multiplikator der Gebühr.
-	 */
-	getFeeMultiplier(): number;
-	/**
-	 * Versiegelt den KnuddelPot, sodass keine weiteren Einzahlungen vorgenommen
-	 * werden können und Gewinne ausgeschüttet werden können.
-	 */
-	seal(): void;
-	/**
-	 * Bezahlt alle Einsätze an die Teilnehmer zurück und informiert mit dem übergeben Text über den Grund.
-	 */
-	refund(reason?: string): void;
-	/**
-	 * Fügt einen Gewinner in die Liste der Gewinner hinzu.
-	 * Der zweite Parameter ist die Gewichtung mit der ausgezahlt werden soll.
-	 * Wird der Parameter weggelassen, so ist er automatisch 1.
-	 */
-	addWinner(user: User, weight?: number): void;
-	/**
-	 * Zahlt den KnuddelPot an die mit addWinner gesetzten Gewinner aus.
-	 */
-	payout(text?: string): void;
-}
-
-/**
- * Repräsentiert den Status eines KnuddelPot.
- */
-declare class KnuddelPotState {
-	/**
-	 * Der KnuddelPot ist geöffnet und kann neue Teilnehmer annehmen.
-	 */
-	static readonly Open: KnuddelPotState;
-	/**
-	 * Der KnuddelPot ist versiegelt und kann keine neuen Teilnehmer annehmen.
-	 */
-	static readonly Sealed: KnuddelPotState;
-	/**
-	 * Der KnuddelPot ist beendet und die Knuddel bereits ausgezahlt.
-	 */
-	static readonly Closed: KnuddelPotState;
-}
-
-/**
- * Ein KnuddelTransfer ist ein Container-Objekt für die Daten, die bei einer Knuddel-Transaktion von einem User
- * an eine App anfallen.
- *
- * Implementiert man den App-Hook <code>onBeforeKnuddelReceived</code>, so kann man dort entscheiden, ob man den KnuddelTransfer
- * annimmt oder ablehnt.
- */
-declare class KnuddelTransfer {
-	/**
-	 * Liefert den User, der den KnuddelTransfer ausgelöst hat.
-	 */
-	getSender(): User;
-	/**
-	 * Liefert den BotUser, der die Knuddel des KnuddelTransfer erhält,
-	 * wenn dieser mit accept()</code> angenommen wurde.
-	 */
-	getReceiver(): BotUser;
-	/**
-	 * Liefert die Anzahl der Knuddel, die mit diesem Transfer überwiesen werden.
-	 */
-	getKnuddelAmount(): KnuddelAmount;
-	/**
-	 * Liefert den Grund für den Transfer, der bei der Überweisung angegeben wurde mit
-	 * <code>/appknuddel BOTNICK:KNUDDEL:GRUND</code>.
-	 */
-	getTransferReason(): string;
-	/**
-	 * Lehnt die Knuddel aus dem KnuddelTransfer ab und sendet sie zurück an den Absender.
-	 * Als Grund sieht der Absender den übergebenen <code>reason</code>.
-	 *
-	 * Diese Methode wirft eine Exception, wenn sie auf einen bereits verarbeiteten Transfer aufgerufen wird.
-	 * Sie kann nur erfolgreich aus dem AppHook <code>onBeforeKnuddelReceived</code> aufgerufen werden.
-	 *
-	 * In der Methode <code>onBeforeKnuddelReceived</code> kann genau ein Aufruf einer dieser drei Methoden gemacht werden:
-	 * KnuddelTransfer/accept:method,
-	 * KnuddelTransfer/addToPot:method,
-	 * KnuddelTransfer/reject:method
-	 */
-	reject(reason: string): void;
-	/**
-	 * Nimmt die Knuddel aus dem KnuddelTransfer an und übergibt sie an den BotUser,
-	 * der mit <code>getReceiver()</code> abgefragt werden kann.
-	 *
-	 * Diese Methode wirft eine Exception, wenn sie auf einen bereits verarbeiteten Transfer aufgerufen wird.
-	 * Sie kann nur erfolgreich aus dem AppHook <code>onBeforeKnuddelReceived</code> aufgerufen werden.
-	 * In der Methode <code>onBeforeKnuddelReceived</code> kann genau ein Aufruf einer dieser drei Methoden gemacht werden:
-	 *
-	 * KnuddelTransfer/accept:method,
-	 * KnuddelTransfer/addToPot:method,
-	 * KnuddelTransfer/reject:method
-	 */
-	accept(): void;
-	/**
-	 * Liefert die Information, ob ein bestimmter KnuddelTransfer zu einem KnuddelPot hinzugefügt werden kann.
-	 */
-	canAddToPot(pot: KnuddelPot): boolean;
-	/**
-	 * Nimmt die Knuddel aus dem KnuddelTransfer an und übergibt sie an den übergebenen KnuddelPot.
-	 *
-	 * Diese Methode funktioniert analog zu KnuddelTransfer/accept:method, nur dass die Knuddel im KnuddelPot statt beim BotUser landen.
-	 *
-	 * Diese Methode wirft eine Exception, wenn sie auf einen bereits verarbeiteten Transfer aufgerufen wird.
-	 * Sie kann nur erfolgreich aus dem AppHook <code>onBeforeKnuddelReceived</code> aufgerufen werden.
-	 *
-	 * In der Methode <code>onBeforeKnuddelReceived</code> kann genau ein Aufruf einer dieser drei Methoden gemacht werden:
-	 * KnuddelTransfer/accept:method,
-	 * KnuddelTransfer/addToPot:method,
-	 * KnuddelTransfer/reject:method
-	 */
-	addToPot(knuddelPot: KnuddelPot): void;
-	/**
-	 * Liefert die Information, ob der KnuddelTransfer bereits verarbeitet wurde.
-	 * Falls die Methode <code>false</code> zurückliefert muss noch entschieden werden, ob der
-	 * KnuddelTransfer angenommen oder abgelehnt wird.
-	 */
-	isProcessed(): boolean;
-}
-
-/**
- * KnuddelTransferDisplayType repräsentiert die Art der Darstellung einer Knuddel-Überweisung.
- */
-declare class KnuddelTransferDisplayType {
-	/**
-	 * Nachricht wird öffentlich angezeigt.
-	 */
-	static readonly Public: KnuddelTransferDisplayType;
-	/**
-	 * Nachricht wird privat angezeigt.
-	 */
-	static readonly Private: KnuddelTransferDisplayType;
-	/**
-	 * Nachricht wird als /m zugestellt.
-	 */
-	static readonly Post: KnuddelTransferDisplayType;
-}
-
-/**
- * KnuddelsServer ist die 'Einstiegsklasse'. Mit den statischen Methoden des KnuddelsServer erhält man Zugriff auf viele
- * Objekte und Klassen, die im Verlauf der App-Entwicklung benötigt werden.
- */
-declare class KnuddelsServer {
-	/**
-	 * Liefert den BotUser, der standardmäßig zur App gehört.
-	 */
-	static getDefaultBotUser(): BotUser;
-	/**
-	 * Liefert die AppPersistence, mit der sich Zahlen, Strings und Javascript-Objekte langfristig und über die Session einer App hinaus gespeichert werden können.
-	 */
-	static getPersistence(): AppPersistence;
-	/**
-	 * Liefert den Channel in dem die App läuft.
-	 */
-	static getChannel(): Channel;
-	/**
-	 * Liefert das UserAccess-Objekt, über das
-	 * User zugreifbar werden.
-	 */
-	static getUserAccess(): UserAccess;
-	/**
-	 * Liefert ein ExternalServerAccess-Objekt, mit dem
-	 * andere Server angesteuert werden können.
-	 */
-	static getExternalServerAccess(): ExternalServerAccess;
-	/**
-	 * Aktualisiert die Liste der genutzten Hooks. Werden zur Laufzeit chatCommands oder App-Hooks (wie mayJoinChannel) dynamisch erzeugt oder gelöscht, so muss danach <code>refreshHooks()</code>
-	 * aufgerufen werden, damit diese Änderung wirksam wird.
-	 */
-	static refreshHooks(): void;
-	/**
-	 * Liefert den Standard-Logger für diese App. Alles, was geloggt wird, wird vom Nutzer "App-Logs" als private Nachricht zugestellt.
-	 */
-	static getDefaultLogger(): Logger;
-	/**
-	 * Liefert den Pfad eines Bildes zur Integration in der eigenen App.
-	 * Alle Bilder, die im Ordner /www in der App abgelegt werden können hier referenziert werden.
-	 */
-	static getFullImagePath(imageName: string): string;
-	/**
-	 * Liefert den Pfad eines <b>Systembildes</b> zur Integration in der eigenen App.
-	 * Alle Bilder, die unter <a href="http://apps4.knuddels.biz/kimg/" target="_blank">http://apps4.knuddels.biz/kimg/</a>
-	 * erreichbar sind können hier referenziert werden.
-	 */
-	static getFullSystemImagePath(imageName: string): string;
-	/**
-	 * Liefert die Informationen über den ChatServer auf dem die App läuft.
-	 */
-	static getChatServerInfo(): ChatServerInfo;
-	/**
-	 * Liefert die Informationen über den AppServer auf dem die App läuft.
-	 */
-	static getAppServerInfo(): AppServerInfo;
-	/**
-	 * Liefert das AppAccess-Object.
-	 */
-	static getAppAccess(): AppAccess;
-	/**
-	 * Erzeugt einen KnuddelPot.
-	 *
-	 * Ist ein KnuddelPot 30 Minuten nach dem Erzeugen noch nicht gesealt,
-	 * so wird vom Server automatisch ein KnuddelPot/refund:method ausgelöst.
-	 */
-	static createKnuddelPot(
-		knuddelAmount: KnuddelAmount,
-		params?: {
-			payoutTimeoutMinutes?: number;
-			shouldSealPot?(pot: KnuddelPot): boolean;
-			onPotSealed?(pot: KnuddelPot): void;
-		}): KnuddelPot;
-	/**
-	 * Liefert den KnuddelPot mit der angegeben id.
-	 */
-	static getKnuddelPot(id: number): (KnuddelPot|null);
-	/**
-	 * Liefert alle für die App noch verwaltbaren KnuddelPot-Objekte.
-	 */
-	static getAllKnuddelPots(): KnuddelPot[];
-	/**
-	 * Liefert das ToplistAccess-Objekt, über das
-	 * Toplisten erzeugt und verwaltet werden können.
-	 */
-	static getToplistAccess(): ToplistAccess;
-	/**
-	 * Liefert das AppProfileEntryAccess-Objekt, über das
-	 * App-Profileinträge erzeugt und verwaltet werden können.
-	 */
-	static getAppProfileEntryAccess(): AppProfileEntryAccess;
-}
-
-/**
- * Mit einer Instanz einer LoadConfiguration kann gestaltet werden, wie der Inhalt des HTML User Interface aussieht, bevor es fertig geladen ist.
- */
-declare class LoadConfiguration {
-	/**
-	 * Setzt die Farbe des Hintergrundes vom Loading-View, der angezeigt wird, während das HTML User Interface lädt. (standardmäßig weiß)
-	 */
-	setBackgroundColor(color: Color): void;
-	/**
-	 * Setzt das Hintergrundbild vom Loading-View, das angezeigt wird, während das HTML User Interface lädt. (standardmäßig nicht gesetzt)
-	 */
-	setBackgroundImage(imageUrl: string): void;
-	/**
-	 * Setzt den Text des Ladehinweiseses im Loading-View, der angezeigt wird, während das HTML User Interface lädt. (standardmäßig "Lädt...")
-	 * Hinweis: Wird mit setLoadingIndicatorImage ein Loaading-Indicator-Bild gesetzt, so wird der mit setText gesetzte Texte ignoriert.
-	 */
-	setText(text: string): void;
-	/**
-	 * Setzt ein Loading-Indicator-Bild im Loading-View, das angezeigt wird, während das HTML User Interface lädt. (standardmäßig nicht gesetzt)
-	 * Hinweis: Wird mit setLoadingIndicatorImage ein Loaading-Indicator-Bild gesetzt, so wird der mit setText gesetzte Texte ignoriert.
-	 */
-	setLoadingIndicatorImage(imageUrl: string): void;
-	/**
-	 * Setzt die Farbe des Textes im Loading-View, der angezeigt wird, während das HTML User Interface lädt. (standardmäßig schwarz)
-	 */
-	setForegroundColor(color: Color): void;
-	/**
-	 * Aktiviert/Deaktiviert die Nutzung vom Loading-View. (standardmäßig aktiviert)
-	 * Es kann sinnvoll sein, den Loading-View zu deaktivieren, wenn man selbst einen komplett eigenen Loading-View in seine App einbauen möchte.
-	 */
-	setEnabled(enabled: boolean): void;
-}
-
-/**
- * Eine Instanz eines Logger ermöglicht das Loggen von Inhalten.
- *
- * Diese erhält man über das KnuddelsServer-Objekt
- * mit KnuddelsServer.getDefaultLogger()
- *
- * Die Log-Einträge werden je nach Einstellungen im /apps-Fenster an den Besitzer des Channels,
- * die App-Manager und den App-Entwickler zugestellt.
- */
-declare class Logger {
-	/**
-	 * Logge einen Text mit Level DEBUG. Dieser wird im Chat allen dafür registrierten AppManagern per /p vom App-Logs-User zugestellt. Siehe: /apps, Tab: Logs.
-	 *
-	 * Die Methode erwartet beliebig viele Strings als Parameter. Diese werden vor dem Logging mit einem Leerzeichen gejoint.
-	 */
-	debug(...msg: any[]): void;
-	/**
-	 * Logge einen Text mit Level INFO. Dieser wird im Chat allen dafür registrierten AppManagern per /p vom App-Logs-User zugestellt. Siehe: /apps, Tab: Logs.
-	 *
-	 * Die Methode erwartet beliebig viele Strings als Parameter. Diese werden vor dem Logging mit einem Leerzeichen gejoint.
-	 */
-	info(...msg: any[]): void;
-	/**
-	 * Logge einen Text mit Level WARN. Dieser wird im Chat allen dafür registrierten AppManagern per /p vom App-Logs-User zugestellt, sowie im /apps Fenster im Log angezeigt. Siehe: /apps, Tab: Logs.
-	 *
-	 * Die Methode erwartet beliebig viele Strings als Parameter. Diese werden vor dem Logging mit einem Leerzeichen gejoint.
-	 */
-	warn(...msg: any[]): void;
-	/**
-	 * Logge einen Text mit Level ERROR. Dieser wird im Chat allen dafür registrierten AppManagern per /p vom App-Logs-User zugestellt, sowie im /apps Fenster im Log angezeigt. Siehe: /apps, Tab: Logs.
-	 *
-	 * Die Methode erwartet beliebig viele Strings als Parameter. Diese werden vor dem Logging mit einem Leerzeichen gejoint.
-	 */
-	error(...msg: any[]): void;
-	/**
-	 * Logge einen Text mit Level FATAL. Dieser wird im Chat allen dafür registrierten AppManagern per /p vom App-Logs-User zugestellt, sowie im /apps Fenster im Log angezeigt. Siehe: /apps, Tab: Logs.
-	 *
-	 * Die Methode erwartet beliebig viele Strings als Parameter. Diese werden vor dem Logging mit einem Leerzeichen gejoint.
-	 */
-	fatal(...msg: any[]): void;
-}
-
-/**
- * Message ist eine abstrakte Klasse und repräsentiert eine Nachricht im Chat.
- */
-declare class Message {
-	/**
-	 * Liefert den User, der die Nachricht verfasst hat.
-	 */
-	getAuthor(): User;
-	/**
-	 * Liefert den Inhalt der Nachricht.
-	 */
-	getText(): string;
-	/**
-	 * Liefert den genauen Zeitpunkt, zu dem die Nachricht erstellt wurde.
-	 */
-	getCreationDate(): Date;
-}
-
-/**
- * Repräsentiert die Instanz der konkreten App, auf die dieser Code Zugriff hat.
- *
- * Die Instanz von <code>OwnAppInstance</code> erhält man über das AppAccess-Objekt
- * mit appAccess.getOwnInstance()
- */
-declare class OwnAppInstance {
-	/**
-	 * Gibt Zugriff auf Nutzer, die gerade im Channel dieser AppInstance online sind.
-	 * @since AppServer 82560
-	 */
-	getOnlineUsers(otherAppInstance: AppInstance, ...userType: UserType[]): User[];
-}
-
-/**
- * Eine Instanz von Persistence ermöglicht die persistente Speicherung von Zahlen, Zeichenketten und JSON-Objekten.
- * Es gibt die zwei Arten AppPersistence und UserPersistence
- *
- * Jeder eigene Datentyp hat seinen eigenen Namensraum.
- * So kann derselbe <code>key</code> für eine Zahl, Zeichenkette und auch JSON-Objekt genutzt werden.
- *
- * <br /><br /><b>Hinweis: </b>Mit der Persistence gespeicherte Informationen überleben
- * sogar die Deinstallation und Neuinstallation der App.
- */
-declare class Persistence {
-	/**
-	 * Informiert darüber, ob unter dem <code>key</code> ein String abgespeichert ist.
-	 */
-	hasString(key: string): boolean;
-	/**
-	 * Setzt die Zeichenkette <code>value</code> für den <code>key</code>.
-	 * Falls bereits eine Zeichenkette für den <code>key</code> existiert, so wird diese überschrieben.
-	 */
-	setString(key: string, value: string): void;
-	/**
-	 * Liefert die Zeichenkette, die für den <code>key</code> gespeichert ist.
-	 * Falls für <code>key</code> keine Zeichenkette gespeichert ist, so gibt die Methode
-	 * den <code>defaultValue</code> zurück.
-	 */
-	getString(key: string, defaultValue?: string): string;
-	/**
-	 * Löscht die Zeichenkette, die unter <code>key</code> gespeichert ist.
-	 */
-	deleteString(key: string): void;
-	/**
-	 * Informiert darüber, ob unter dem <code>key</code> eine Zahl abgespeichert ist.
-	 */
-	hasNumber(key: string): boolean;
-	/**
-	 * Setzt die Zahl <code>value</code> für den <code>key</code>.
-	 * Falls bereits eine Zahl für den <code>key</code> existiert, so wird diese überschrieben.
-	 */
-	setNumber(key: string, value: number): void;
-	/**
-	 * Addiert den übergebenen <code>value</code> auf die unter dem Key <code>key</code> vorhandenen Wert drauf.
-	 * Value kann auch negativ sein um eine Subtraktion durchzuführen.
-	 * Falls keine Zahl für den <code>key</code> existiert, so wird der <code>value</code> für <code>key</code> gespeichert.
-	 */
-	addNumber(key: string, value: number): number;
-	/**
-	 * Liefert die Zahl, die für den <code>key</code> gespeichert ist.
-	 * Falls für <code>key</code> keine Zahl gespeichert ist, so gibt die Methode
-	 * den <code>defaultValue</code> zurück.
-	 */
-	getNumber(key: string, defaultValue?: number): number;
-	/**
-	 * Löscht die Zahl, die unter <code>key</code> gespeichert ist.
-	 */
-	deleteNumber(key: string): void;
-	/**
-	 * Informiert darüber, ob unter dem <code>key</code> ein Objekt abgespeichert ist.
-	 */
-	hasObject(key: string): boolean;
-	/**
-	 * Setzt das Objekt <code>value</code> für den <code>key</code>.
-	 * Falls bereits ein Objekt für den <code>key</code> existiert, so wird dieses überschrieben.
-	 * Das als JSON serialisierte Objekt darf maximal 100kb groß sein.
-	 */
-	setObject(key: string, object: (KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable)): void;
-	/**
-	 * Liefert das Objekt, das für den <code>key</code> gespeichert ist.
-	 * Falls für <code>key</code> kein Objekt gespeichert ist, so gibt die Methode
-	 * den <code>defaultValue</code> zurück.
-	 */
-	getObject(key: string, defaultValue?: (KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable)): (KnuddelsJson | KnuddelsJsonArray | KnuddelsSerializable);
-	/**
-	 * Löscht das Objekt, das unter <code>key</code> gespeichert ist.
-	 */
-	deleteObject(key: string): void;
-}
-
-/**
- * Eine Instanz von PrivateMessage repräsentiert eine private Nachricht im Chat.
- * Die App erhält sämtliche private Nachrichten, die an einen ihrer BotUser
- * geschickt werden.
- *
- * <br /><br /><b>Hinweis:</b> Eine App hat keinen Zugriff auf private Nachrichten,
- * die Nutzer untereinander schreiben, ohne dass ein BotUser als Empfänger involviert ist.
- */
-declare class PrivateMessage extends Message {
-	/**
-	 * Liefert die Liste der Empfänger der Nachricht.
-	 */
-	getReceivingUsers(): User[];
-	/**
-	 * Sendet eine private Nachricht an alle Beteiligten des Gespräches.
-	 */
-	sendReply(text: string): void;
-}
-
-/**
- * Eine Instanz von PublicActionMessage repräsentiert eine öffentliche Handlung im Chat.
- * Die App erhält die öffentlichen Handlungen.
- */
-declare class PublicActionMessage extends Message {
-}
-
-/**
- * Eine Instanz von PublicEventMessage repräsentiert ein öffentliches Event im Chat.
- * Die App erhält die öffentlichen Events.
- */
-declare class PublicEventMessage extends Message {
-}
-
-/**
- * Eine Instanz von PublicMessage repräsentiert eine öffentliche Nachricht im Chat.
- * Die App erhält die öffentlichen Nachrichten, die geschrieben werden.
- */
-declare class PublicMessage extends Message {
-}
-
-/**
- * Eine Quest ist eine konkrete Aufgabe, die ein  User in der App zu erledigen hat.
- *
- * Im Blog findest du Informationen darüber, wie man eine Quest für seine App erhält:
- * https://blog.developer.knuddels.de/2015/10/29/how-to-get-a-quest/
- */
-declare class Quest {
-	/**
-	 * Löst ein Quest-Event aus.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	setSolved(count?: number): void;
-	/**
-	 * Liefert den Key der Quest.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	getQuestKey(): string;
-}
-
-/**
- * Ein QuestAccess-Objekt ermöglicht den Zugriff auf die Quests, die ein Nutzer des Chats, für die laufende App hat.
- *
- * Im Blog findest du Informationen darüber, wie man eine Quest für seine App erhält:
- * https://blog.knuddels.de/2015/10/29/how-to-get-a-quest/
- */
-declare class QuestAccess {
-	/**
-	 * Liefert die Quests
-	 * für diesen Nutzer in dieser App.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	getQuests(): Quest[];
-	/**
-	 * Liefert die Information, ob eine bestimmte Quest offen ist.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	hasQuest(questKey: string): boolean;
-	/**
-	 * Liefert eine bestimmte Quest, falls vorhanden.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	getQuest(questKey: string): (Quest|null);
-	/**
-	 * Liefert den User, der zu diesem QuestAccess-Objekt gehört.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	getUser(): User;
-}
-
-/**
- * RandomOperations bietet eine Sammlung verschiedener Zufallsoperationen, die man für Glücksspiele und Ähnliches nutzen kann.
- */
-declare class RandomOperations {
-	/**
-	 * Liefert eine Zufallszahl zwischen <code>minValue</code> (inklusiv) und <code>maxValue</code> (exklusiv).
-	 */
-	static nextInt(minValue: number /* optional */, maxValue: number): number;
-	/**
-	 * Liefert ein Array mit Zufallszahlen zwischen minValue (inklusiv) und <code>n</code> (exklusiv).
-	 */
-	static nextInts(minValue: number /* optional */, maxValue: number, count: number, onlyDifferentNumbers: boolean): number[];
-	/**
-	 * Liefert <code>true</code> in <code>truePropability</code>/1 Fällen
-	 */
-	static flipTrue(truePropability: number): boolean;
-	/**
-	 * Liefert ein zufälliges Objekt aus einem Array.
-	 * Falls das Array leer ist, wird <code>null</code> zurückgeliefert.
-	 */
-	static getRandomObject<T>(objects: T[]): T;
-	/**
-	 * Mischt das Array der übergebenen Objekte und liefert es zurück.
-	 */
-	static shuffleObjects<T>(objects: T[]): T[];
-	/**
-	 * Liefert einen zufälligen String zurück.
-	 * @since AppServer 92699
-	 */
-	static getRandomString(length: number, allowedCharacters?: string): string;
-}
-
-/**
- * Repräsentiert die Root-Instanz einer App, die im Hauptchannel läuft.
- *
- * Die Instanz für die <code>RootAppInstance</code> erhält man über das AppInstance-Objekt
- * mit appInstance.getRootInstance()
- */
-declare class RootAppInstance extends AppInstance {
-	/**
-	 * Aktualisiert diese App im Channel (und ggf. vorhandenen Tochterchanneln) auf die neueste Version.
-	 */
-	updateApp(message: string /* optional */, logMessage?: string): void;
-	/**
-	 * Stoppt diese App.
-	 */
-	stopApp(message: string /* optional */, logMessage?: string): void;
-}
-
-/**
- * Liefert Informationen über einen Server.
- */
-declare class ServerInfo {
-	/**
-	 * Liefert die interne ServerId des Servers.
-	 */
-	getServerId(): string;
-	/**
-	 * Liefert die Code-Revision des Servers.
-	 */
-	getRevision(): number;
-}
-
-/**
- * Ein SingleDiceResult enthält das Ergebnis aller Würfel desselben Typs.
- * Würfelt man beispielsweise mit der Konfiguration "1w2 + 10w5" so gibt es im <code>DiceResult</code>
- * zwei SingleDiceResult-Objekte. Eines für "1w2" und eines für "10w5".
- */
-declare class SingleDiceResult {
-	/**
-	 * Liefert den Würfel zurück, durch den dieses SingleDiceResult erzeugt wurde.
-	 */
-	getDice(): Dice;
-	/**
-	 * Liefert die Ziffern, die gewürfelt wurden.
-	 */
-	valuesRolled(): number[];
-	/**
-	 * Liefert die Summe der Augenzahlen des SingleDiceResult.
-	 */
-	sum(): number;
-}
-
-/**
- * Diese Dokumentation beschreibt, welche Erweiterungen am <b>serverseitigen String-Objekt</b> vorgenommen wurden.
- */
-interface String {
-	/**
-	 * Die Methode liefert den <code>String</code> zurück, auf dem sie aufgerufen wurde mit KCode escaped.
-	 */
-	escapeKCode(): string;
-	/**
-	 * Entfernt jeglichen KCode aus dem <code>String</code> und gibt ihn zurück.
-	 */
-	stripKCode(): string;
-	/**
-	 * Diese Methode liefert die Information, ob der <code>String</code> auf dem die Methode aufgerufen wurde
-	 * mit einem bestimmten Prefix beginnt.
-	 */
-	startsWith(prefix: string): boolean;
-	/**
-	 * Diese Methode liefert die Information, ob der <code>String</code> auf dem die Methode aufgerufen wurde
-	 * mit einem bestimmten Suffix endet.
-	 */
-	endsWith(suffix: string): boolean;
-	/**
-	 * Liefert die Breite des Strings in der Schriftart Arial mit der gegeben Schriftgröße und Information, ob Text fett dargestellt werden soll.
-	 */
-	getPixelWidth(fontSize: number, isBold: boolean): number;
-	/**
-	 * Liefert einen  <code>String</code>, der in der Schriftart Arial mit der gegeben Schriftgröße und Information, ob Text fett dargestellt werden soll
-	 * maximal <code>maxPixelWidth</code> breit ist. Wird der Text dafür gekürzt, so wird an das Ende <code>abbreviationMarker</code> angehangen.
-	 * Falls <code>abbreviationMarker</code> nicht übergeben wurde, so ist es automatisch '...'.
-	 */
-	limitString(fontSize: number, isBold: boolean, maxPixelWidth: number, abbreviationMarker?: string): string;
-	/**
-	 * Liefert die Information, ob ein bestimmter <code>String</code> in diesem <code>String</code> vorhanden ist.
-	 */
-	contains(needle: string): boolean;
-	/**
-	 * Liefert die Levenshtein-Distanz zum übergebenen  <code>String</code>.
-	 * Levenshtein-Distanz: Minimale Anzahl von Einfüge-, Lösch- und Ersetz-Operationen, um die erste Zeichenkette in die zweite umzuwandeln.
-	 * @since AppServer 82271
-	 */
-	minimalConversionCost(otherString: string): number;
-	/**
-	 * Liefert die Information, ob der <code>String</code> nur aus Zeichen besteht, die in einem Nicknamen
-	 * vorkommen dürfen.
-	 * @since AppServer 82271
-	 */
-	hasOnlyNicknameCharacters(): boolean;
-	/**
-	 * Liefert die Information, ob der <code>String</code> nur aus Zeichen besteht, die Nummern sind.
-	 * @since AppServer 82271
-	 */
-	hasOnlyDigits(): boolean;
-	/**
-	 * Liefert die Information, ob der <code>String</code> nur aus Zeichen besteht, die alphanumerisch + Whitespaces sind.
-	 * @since AppServer 82271
-	 */
-	hasOnlyAlphanumericalAndWhitespaceCharacters(): boolean;
-	/**
-	 * Liefert die Information, ob der <code>String</code> leer oder <code>null</code> ist.
-	 * @since AppServer 92695
-	 */
-	isEmpty(): boolean;
-	/**
-	 * Liefert den <code>String</code> in CamelCase.
-	 * @since AppServer 92695
-	 */
-	toCamelCase(): string;
-	/**
-	 * Liefert den <code>String</code> mit dem ersten Buchstaben als Großbuchstaben.
-	 * @since AppServer 92695
-	 */
-	capitalize(): string;
-	/**
-	 * Erstellt eine Kopie des  <code>String</code>, in dem alle Vorkommnisse des  <code>String</code> <code>search</code> in <code>replacement</code>
-	 * ersetzt werden und liefert diesen zurück.
-	 */
-	replaceAll(search: string | RegExp, replacement: string): string;
-	/**
-	 * Prüft primitiv, ob der <code>String</code> laut Knuddels-Filterregeln ok ist.
-	 * @since ChatServer 82262, AppServer 82262
-	 */
-	isOk(): boolean;
-}
-
-/**
- * Eine Instanz einer Toplist repräsentiert eine eigene Topliste für einen bestimmten userPersistenceNumberKey.
- */
-declare class Toplist {
-	/**
-	 * Liefert den userPersistenceNumberKey mit dem die Topliste erzeugt wurde.
-	 */
-	getUserPersistenceNumberKey(): string;
-	/**
-	 * Liefert den Anzeigenamen der Topliste.
-	 */
-	getDisplayName(): string;
-	/**
-	 * Liefert den Befehl, der im Chat eingegeben werden kann, um diese Topliste zu öffnen.
-	 * Wird ein User oder eine userId übergeben, so öffnet sich die Topliste mit diesem Nutzer im Fokus.
-	 */
-	getChatCommand(user_or_userId?: (User|number)): string;
-	/**
-	 * Liefert den Anzeigenamen für den übergebenen User oder eine userId.
-	 */
-	getLabel(user_or_userId: (User|number)): string;
-	/**
-	 * Legt einen Change-Listener an, der jedes mal aufgerufen wird, wenn ein User
-	 * einen neuen Anzeigenamen erhält.
-	 */
-	addLabelChangeListener(listener: (labelChangeEvent: ToplistLabelChangeEvent) => void): void;
-	/**
-	 * Löscht einen LabelChangeListener, der mit Toplist/addLabelChangeListener:method erzeugt wurde.
-	 */
-	removeLabelChangeListener(listener: (labelChangeEvent: ToplistLabelChangeEvent) => void): void;
-	/**
-	 * Legt einen Change-Listener an, der jedes mal aufgerufen wird, wenn ein sich der Rang User eines Nutzers ändert.
-	 */
-	addRankChangeListener(listener: (rankChangeEvent: ToplistRankChangeEvent) => void): void;
-	/**
-	 * Löscht einen RankChangeListener, der mit Toplist/addRankChangeListener:method erzeugt wurde.
-	 */
-	removeRankChangeListener(listener: (rankChangeEvent: ToplistRankChangeEvent) => void): void;
-}
-
-/**
- * Mit einer Instanz von ToplistAccess kann eine App
- * Toplist erzeugen und verwalten.
- *
- * Die Instanz für die <code>ToplistAccess</code> erhält man über das KnuddelsServer-Objekt
- * mit KnuddelsServer.getToplistAccess()
- */
-declare class ToplistAccess {
-	/**
-	 * Liefert die Liste aller Toplisten, die diese App erzeugt hat.
-	 */
-	getAllToplists(): Toplist[];
-	/**
-	 * Liefert die Toplist mit dem Persistenz-Key zurück.
-	 */
-	getToplist(userPersistenceNumberKey: string): Toplist;
-	/**
-	 * Löscht die übergebene Toplist oder die Toplist mit dem Persistenz-Key.
-	 */
-	removeToplist(toplist: Toplist): void;
-	/**
-	 * Erzeugt oder aktualisiert die Toplist für den übergebenen userPersistenceNumberKey.
-	 */
-	createOrUpdateToplist(userPersistenceNumberKey: string, displayName: string, parameters?: { labelMapping?: { [minValue: string]: string }; ascending?: boolean; }): Toplist;
-}
-
-/**
- * ToplistDisplayType repräsentiert den Anzeigetyp eines Toplisteneintrags im Profil vonUsern.
- */
-declare class ToplistDisplayType {
-	/**
-	 * Nur Anzeigename anzeigen.
-	 */
-	static readonly Label: ToplistDisplayType;
-	/**
-	 * Gespeicherten Wert anzeigen.
-	 */
-	static readonly Value: ToplistDisplayType;
-	/**
-	 * Anzeigename und Rang anzeigen.
-	 */
-	static readonly LabelAndRank: ToplistDisplayType;
-	/**
-	 * Wert und Rang anzeigen.
-	 */
-	static readonly ValueAndRank: ToplistDisplayType;
-}
-
-/**
- * ToplistLabelChangeEvents erhalten EventListener die bei einer
- * Toplist mit der Methode Toplist/addLabelChangeListener:method
- * erzeugt wurden, nachdem sich der Anzeigename für einen User geändert hat.
- *
- * Das ToplistLabelChangeEvent enthält alle wichtigen Daten, um auf die Änderung zu reagieren
- * und dem User beispielsweise für den Aufstieg zu gratulieren.
- */
-declare class ToplistLabelChangeEvent {
-	/**
-	 * Liefert die zugehörige Toplist.
-	 */
-	getToplist(): Toplist;
-	/**
-	 * Liefert den vorherigen Anzeigenamen. Hatte der User vorher keinen
-	 * Anzeigenamen, so ist dieser Wert <code>null</code>.
-	 */
-	getOldLabel(): string;
-	/**
-	 * Liefert den neuen Anzeigenamen. Hatte der User nun keinen
-	 * Anzeigenamen mehr, so ist dieser Wert <code>null</code>.
-	 */
-	getNewLabel(): string;
-	/**
-	 * Liefert den User für den das Event ausgelöst wurde.
-	 */
-	getUser(): User;
-	/**
-	 * Liefert den Wert, der vor der Änderung gespeichert war.
-	 */
-	getOldValue(): number;
-	/**
-	 * Liefert den neuen Wert.
-	 */
-	getNewValue(): number;
-}
-
-/**
- * ToplistRankChangeEvents erhalten EventListener die bei einer
- * Toplist mit der Methode Toplist/addRankChangeListener:method
- * erzeugt wurden, nachdem sich der Rang für einen User geändert hat.
- *
- * Das ToplistRankChangeEvent enthält alle wichtigen Daten, um auf die Änderung zu reagieren
- * und den überholten Usern eine Nachricht zu senden.
- */
-declare class ToplistRankChangeEvent {
-	/**
-	 * Liefert die zugehörige Toplist.
-	 */
-	getToplist(): Toplist;
-	/**
-	 * Liefert den Toplisten-Rang, den der User vor der Änderung hatte.
-	 */
-	getOldRank(): number;
-	/**
-	 * Liefert den neuen Toplisten-Rang, des Users.
-	 */
-	getNewRank(): number;
-	/**
-	 * Liefert den User für den das Event ausgelöst wurde.
-	 */
-	getUser(): User;
-	/**
-	 * Liefert die User, die bei dieser Änderung überholt worden sind.
-	 * <br><br><b style="color:red;">Achtung:</b> Wenn mehr als <b>10 User</b>
-	 * überholt wurden, so liefert die Methode die besten 10 überholten User.
-	 */
-	getUsersOvertook(): User[];
-	/**
-	 * Liefert den Wert, der vor der Änderung gespeichert war.
-	 */
-	getOldValue(): number;
-	/**
-	 * Liefert den neuen Wert.
-	 */
-	getNewValue(): number;
-}
-
-/**
- * Ein User ist ein Nutzer des Chats, in dem die App läuft.
- */
-declare class User {
-	/**
-	 * Liefert die eindeutige Nutzerkennung des Nutzers.
-	 */
-	getUserId(): number;
-	/**
-	 * Liefert den Nicknamen des Nutzers.
-	 */
-	getNick(): string;
-	/**
-	 * Liefert das Alter des Nutzers. Bei Nutzern, die bereits sehr lange in der Plattform sind kann es vorkommen, dass kein Alter angegeben wurde. In diesem Fall ist das Alter <code>0</code>.
-	 */
-	getAge(): number;
-	/**
-	 * Liefert das Geschlecht des Nutzers.
-	 */
-	getGender(): Gender;
-	/**
-	 * Liefert den Zeitpunkt der Registrierung des Nutzers.
-	 */
-	getRegDate(): Date;
-	/**
-	 * Liefert den UserStatus des Nutzers.
-	 */
-	getUserStatus(): UserStatus;
-	/**
-	 * Liefert den UserType des Nutzers.
-	 */
-	getUserType(): UserType;
-	/**
-	 * Liefert den aktuellen ClientType des Nutzers oder Offline wenn er nicht im Chat online ist.
-	 */
-	getClientType(): ClientType;
-	/**
-	 * Prüft ob der Client des Users den übergebenen AppViewMode (für User/sendAppContent:method) anzeigen kann.
-	 */
-	canShowAppViewMode(mode: AppViewMode): boolean;
-	/**
-	 * Prüft ob der Client des User's den übergebenen AppContent anzeigen kann.
-	 */
-	canSendAppContent(appContent: AppContent): boolean;
-	/**
-	 * Prüft, ob der User in dem angegebenen Team ist.
-	 * Dies funktioniert derzeit nur für Teams, die eine eigene /fa haben.
-	 *
-	 * <b style="color:red;">Achtung:</b> Bei Nutzern, die neu in ein Team kommen, funktioniert die Abfrage erst dann korrekt,
-	 * wenn er sich neu in den Channel eingeloggt hat.
-	 */
-	isInTeam(teamName: string, subTeamName?: string): boolean;
-	/**
-	 * Liefert ein UserPersistence-Objekt für diesen Nutzer. Mit diesem Objekt kann eine App sich Dinge über diesen speziellen Nutzer merken.
-	 */
-	getPersistence(): UserPersistence;
-	/**
-	 * Shortcut-Funktion um mit dem DefaultBotUser eine private Nachricht zu versenden.
-	 */
-	sendPrivateMessage(message: string): void;
-	/**
-	 * Shortcut-Funktion um mit dem DefaultBotUser eine /m zu versenden.
-	 */
-	sendPostMessage(topic: string, text: string): void;
-	/**
-	 * Liefert die Information, ob dieser Nutzer Channelbesitzer im Channel der App ist.
-	 */
-	isChannelOwner(): boolean;
-	/**
-	 * Liefert die Information, ob der Channel der App
-	 *  ein Lieblingschannel des Nutzers ist.
-	 */
-	isLikingChannel(): boolean;
-	/**
-	 * Liefert die Information, ob der Nutzer im harten Kern des Channels der App ist.
-	 * @since AppServer 92701, ChatServer 92701
-	 */
-	isChannelCoreUser(): boolean;
-	/**
-	 * Liefert die Information, ob dieser Nutzer ein AppManager für diese App ist. Die Channelbesitzer zählen automatisch auch als AppManager.
-	 */
-	isAppManager(): boolean;
-	/**
-	 * Liefert Information, ob dieser Nutzer derzeit für das Schreiben öffentlicher Nachrichten im Channel gesperrt ist.
-	 */
-	isMuted(): boolean;
-	/**
-	 * Liefert Information, ob dieser Nutzer beim Schreiben öffentlicher Nachrichten im Channel
-	 * derzeit für die Verwendung von Textformatierungen, Farben und Smileys gesperrt ist.
-	 */
-	isColorMuted(): boolean;
-	/**
-	 * Liefert Information, ob dieser Nutzer derzeit für das Betreten des Channel gesperrt ist.
-	 */
-	isLocked(): boolean;
-	/**
-	 * Liefert Information, ob dieser Nutzer Channelmoderator im Channel der App ist.
-	 */
-	isChannelModerator(): boolean;
-	/**
-	 * Liefert Information, ob dieser Nutzer Eventmoderator im Channel der App ist.
-	 */
-	isEventModerator(): boolean;
-	/**
-	 * Liefert Information, ob dieser Nutzers der Entwickler der App ist.
-	 */
-	isAppDeveloper(): boolean;
-	/**
-	 * Liefert einen Link zum Profil des Nutzers, den man im Chat anzeigen kann.
-	 */
-	getProfileLink(displayText?: string): string;
-	/**
-	 * Liefert die Information, ob der Nutzer online im Channel der App ist.
-	 */
-	isOnlineInChannel(): boolean;
-	/**
-	 * Liefert die Anzahl der Knuddel, die der Nutzer besitzt.
-	 */
-	getKnuddelAmount(): KnuddelAmount;
-	/**
-	 * Liefert die Information, ob der Nutzer irgendwo im Chat online ist.
-	 */
-	isOnline(): boolean;
-	/**
-	 * Liefert die Readme des Nutzers, die er mit /readme TEXT in sein Profil gesetzt hat.
-	 */
-	getReadme(): string;
-	/**
-	 * Liefert die vom Nutzer verbrachte Zeit im gesamten Chatsystem In Minuten.
-	 * <b>Hinweis:</b> Die Minutenzahl wird derzeit immer nur zu dem Zeitpunkt aktualisiert,
-	 * wenn der Nutzer offline geht.
-	 */
-	getOnlineMinutes(): number;
-	/**
-	 * Liefert die Information, ob der Nutzer sich mittels /away-Funktion kurz abgemeldet hat.
-	 */
-	isAway(): boolean;
-	/**
-	 * Liefert die Information, ob der Nutzer ein Profilfoto hat.
-	 */
-	hasProfilePhoto(): boolean;
-	/**
-	 * (Er)setzt den übergebenen AppContent beim Nutzer.
-	 */
-	sendAppContent(appContent: AppContent): AppContentSession;
-	/**
-	 * Liefert alle AppContentSession, die der User
-	 * aktuell geöffnet hat.
-	 */
-	getAppContentSessions(): AppContentSession[];
-	/**
-	 * Liefert die AppContentSession, die der User
-	 * mit einem bestimmten AppViewMode aktuell geöffnet hat.
-	 */
-	getAppContentSession(appViewMode: AppViewMode): AppContentSession;
-	/**
-	 * Vergleicht den übergebenen Nutzer und liefert <code>true</code>, falls der übergebene Nutzer
-	 * identisch ist mit dem aktuellen Nutzer.
-	 */
-	equals(user: User): boolean;
-	/**
-	 * Liefert die URL zum Profilfoto des Nutzers. Die übergebene Breite und Höhe
-	 * liefern dem Server einen Anhaltswert, um das bestmögliche Foto zu finden,
-	 * sind aber keine Garantie, dass das Foto diese Ausmaße haben wird.
-	 */
-	getProfilePhoto(width: number, height: number): string;
-	/**
-	 * Liefert das QuestAccess-Objekt
-	 * für diesen Nutzer in dieser App.
-	 * @since AppServer 82290, ChatServer 82290
-	 */
-	getQuestAccess(): QuestAccess;
-	/**
-	 * Liefert die Information, ob der Nutzer gerade sein Video streamt.
-	 */
-	isStreamingVideo(): boolean;
-	/**
-	 * Liefert den KnuddelAccount des Nutzers.
-	 */
-	getKnuddelAccount(): KnuddelAccount;
-	/**
-	 * Liefert die ChannelTalkPermission für diesen Nutzer in diesem
-	 * Channel.
-	 */
-	getChannelTalkPermission(): ChannelTalkPermission;
-	/**
-	 * Liefert die Information, ob der User ein verifiziertes Profilbild hat.
-	 */
-	isProfilePhotoVerified(): boolean;
-	/**
-	 * Liefert die Information, ob das Alter des Users verifiziert ist.
-	 */
-	isAgeVerified(): boolean;
-	/**
-	 * Setzt dem Nutzer ein Icon in die Nickliste, das auf der rechten Seite seines Nicks angezeigt wird.
-	 * Der Eintrag wird automatisch entfernt, sobald der Nutzer den Channel verlässt,
-	 * kann aber auch mit User/removeNicklistIcon:method
-	 * entfernt werden.
-	 */
-	addNicklistIcon(imagePath: string, imageWidth: number): void;
-	/**
-	 * Entfernt dem Nutzer ein über die API gesetztes Icon in die Nickliste.
-	 */
-	removeNicklistIcon(imagePath: string): void;
-	/**
-	 * Startet einen Würfelwurf für den Nutzer, falls er online im Channel ist und er nicht gemuted ist.
-	 * @since AppServer 89159, ChatServer 89159
-	 */
-	triggerDice(diceConfiguration: DiceConfiguration): void;
-}
-
-/**
- * Mit einer Instanz von UserAccess kann eine App
- * auf User zugreifen, die bereits einmal im Channel waren,
- * als die App lief. Für alle nicht zugreifbaren User kann man via UserAccess den korrekt geschriebenen Nicknamen erhalten.
- *
- * Die Instanz für die <code>UserAccess</code> erhält man über das KnuddelsServer-Objekt
- * mit KnuddelsServer.getUserAccess()
- */
-declare class UserAccess {
-	/**
-	 * Liefert die userId des Nutzers mit dem übergebenen Nicknamen.
-	 */
-	getUserId(nick: string): number;
-	/**
-	 * Informiert darüber, ob ein Nutzer mit dem übergebenen Nicknamen existiert.
-	 */
-	exists(nick: string): boolean;
-	/**
-	 * Informiert darüber, ob der Nutzer mit der übergebenen userId geladen werden darf. Neben dem AppDeveloper können nur Nutzer geladen werden, die sich einmal im Channel befanden, als die App
-	 * lief.
-	 */
-	mayAccess(userId: number): boolean;
-	/**
-	 * Liefert den Nutzer mit der übergebenen userId. Neben dem AppDeveloper können nur Nutzer geladen werden, die sich einmal im Channel befanden, als die App lief. Es wird empfohlen vor der
-	 * Abfrage von <code>getUserById(userId)</code> mit UserAccess/mayAccess:method abzufragen, ob dies funktionieren wird.
-	 */
-	getUserById(userId: number): User;
-	/**
-	 * Liefert den Nicknamen des Nutzers mit der übergebenen userId in der korrekten Schreibweise.
-	 */
-	getNick(userId: number): string;
-	/**
-	 * Loopt über alle zugreifbaren User sortiert nach Registrierzeitpunkt und
-	 * führt für jeden User das übergebene Callback aus.
-	 */
-	eachAccessibleUser(
-		callback: (user: User, index: number, accessibleUserCount: number, key?: string) => boolean,
-		parameters?: {
-			onStart?(accessibleUserCount: number, key?: string): void;
-			onEnd?(accessibleUserCount: number, key?: string): void;
-		}): void;
-}
-
-/**
- * Für jeden User kann eine UserPersistence angefordert werden, um sich
- * für einen bestimmten Nutzer Dinge persistent zu merken.
- */
-declare class UserPersistence extends Persistence {
-	/**
-	 * Löscht alle Zahlenwerte, die in dieser UserPersistence gespeichert sind.
-	 * @since AppServer 88569
-	 */
-	deleteAllNumbers(): number;
-	/**
-	 * Löscht alle Objekte, die in dieser UserPersistence gespeichert sind.
-	 * @since AppServer 88569
-	 */
-	deleteAllObjects(): number;
-	/**
-	 * Löscht alle Zeichenketten, die in dieser UserPersistence gespeichert sind.
-	 * @since AppServer 88569
-	 */
-	deleteAllStrings(): number;
-	/**
-	 * Löscht alle Daten, die in dieser UserPersistence gespeichert sind.
-	 * @since AppServer 88569
-	 */
-	deleteAll(): number;
-}
-
-/**
- * Diese Klasse repräsentiert einen Eintrag der Persistenz.
- */
-declare class UserPersistenceNumberEntry {
-	/**
-	 * Liefert den Nutzer.
-	 */
-	getUser(): User;
-	/**
-	 * Liefert den Wert.
-	 */
-	getValue(): number;
-	/**
-	 * Liefert den Rang des Elements in der Persistenz.
-	 */
-	getRank(): number;
-	/**
-	 * Liefert die Position des Elements in der Persistenz.
-	 */
-	getPosition(): number;
-}
-
-/**
- * Mit dieser Klasse ist es möglich nicht User-spezifische Abfragen auf die <code>UserPersistence</code> auszuführen.
- */
-declare class UserPersistenceNumbers {
-	/**
-	 * Liefert die Summe aller via <code>UserPersistence</code> gespeicherten Zahlen für den übergebenen <code>key</code>.
-	 */
-	static getSum(key: string): number;
-	/**
-	 * Löscht alle gespeicherten Zahlen-Werte für den übergebenen <code>key</code>.
-	 */
-	static deleteAll(key: string): number;
-	/**
-	 * Liefert die Anzahl aller unterschiedlichen Nutzer, die Werte für einen bestimmten <code>key</code> gespeichert haben.
-	 * Hierbei kann optional der Wertebereich über die <code>parameters</code> eingegrenzt werden.
-	 */
-	static getCount(key: string, parameters?: { minimumValue?: number; maximumValue?: number; }): number;
-	/**
-	 * Ändert einen bestimmten <code>key</code> bei allen UserPersistence.
-	 */
-	static updateKey(oldKeyName: string, newKeyName: string): number;
-	/**
-	 * Ändert alle Werte für einen bestimmten <code>key</code>, die vorher einen bestimmten anderen Wert hatten in der UserPersistence.
-	 * <br /><strong>Hinweis:</strong> Da diese Methode ein Batch-Update ist werden keine Change-Listener (ToplistRankChangeEvent, ToplistLabelChangeEvent) ausgelöst.
-	 */
-	static updateValue(key: string, oldValue: number, newValue: number): number;
-	/**
-	 * Addiert einen Wert für Einträge mit einem bestimmten <code>key</code> in der UserPersistence.
-	 * <br /><strong>Hinweis:</strong> Da diese Methode ein Batch-Update ist werden keine Change-Listener (ToplistRankChangeEvent, ToplistLabelChangeEvent) ausgelöst.
-	 */
-	static addNumber(key: string, value: number, parameters?: { minimumValue?: number; maximumValue?: number; targetUsers?: User[]; }): number;
-	/**
-	 * Liefert ein Array mit <code>UserPersistenceNumberEntry</code>-Objekten für einen bestimmten <code>key</code>.
-	 * Hierdurch kann beispielsweise eine blätterbare Topliste abgebildet werden.
-	 */
-	static getSortedEntries(key: string, parameters?: { ascending?: boolean; count?: number; page?: number; minimumValue?: number; maximumValue?: number; }): UserPersistenceNumberEntry[];
-	/**
-	 * Liefert ein Array mit <code>UserPersistenceNumberEntry</code>-Objekten für einen bestimmten <code>key</code>. Hierbei werden die nähesten Elemente gewählt,
-	 * die am übergebenen User/UserId liegen.
-	 *
-	 * Beispiel: Der Nutzer ist in der Liste auf Position 20, dann werden die Resultate von 14-24 bei einem Count von 10 ausgegeben.
-	 * Beispiel: Der Nutzer ist in der Liste auf Position 3, dann werden die Resultate von 1-10 bei einem Count von 10 ausgegeben.
-	 */
-	static getSortedEntriesAdjacent(key: string, user_or_userId: (User|number), parameters?: { ascending?: boolean; count?: number; }): UserPersistenceNumberEntry[];
-	/**
-	 * Liefert die absolute Position des Nutzers in der Liste. Die Position ist im Gegensatz zum Rang immer eindeutig.
-	 *
-	 * Bei gleichem Wert hat der Nutzer die höhere Position, der zuerst einen Eintrag in der Persistenz hatte.
-	 *
-	 * Mit der Methode UserPersistenceNumbers/getRank:method kann man den Rang des Nutzers herausfinden. Dieser ist identisch, wenn
-	 * unterschiedliche Nutzer denselben Wert haben.
-	 */
-	static getPosition(key: string, user_or_userId: (User|number), parameters?: { ascending?: boolean; minimumValue?: number; }): number;
-	/**
-	 * Liefert den Rang des Nutzers. Der Rang ist nicht eindeutig. Bei gleicher Punktzahl haben Nutzer denselben Rang.
-	 * Mit der Methode UserPersistenceNumbers/getPosition:method kann man die Position eindeutige Position, statt des Ranges herausfinden.
-	 */
-	static getRank(key: string, user_or_userId: (User|number), parameters?: { ascending?: boolean; minimumValue?: number; }): number;
-	/**
-	 * Ruft eine Funktion für alle Nutzer auf, die einen bestimmten <code>key</code> in der <code>UserPersistence</code> gesetzt haben.
-	 * Hierbei greifen die übergebenen Filter.
-	 */
-	static each(
-		key: string,
-		callback: { user: User; value: number; index: number; totalCount: number; key: string; },
-		parameters?: {
-			ascending?: boolean;
-			minimumValue?: number;
-			maximumValue?: number;
-			maximumCount?: number;
-			onStart?(totalCount: number, key: string): void;
-			onEnd?(totalCount: number, key: string): void;
-		}): void;
-	/**
-	 * Liefert alle keys, die für User in der Persistence
-	 * gespeichert wurden.
-	 * @since AppServer 82483
-	 */
-	static getAllKeys(filterKey?: string): string[];
-}
-
-/**
- * Mit dieser Klasse ist es möglich nicht User-spezifische Abfragen auf die <code>UserPersistence</code> auszuführen.
- */
-declare class UserPersistenceObjects {
-	/**
-	 * Löscht alle gespeicherten Objekte für den übergebenen <code>key</code>.
-	 * @since AppServer 82478
-	 */
-	static deleteAll(key: string): number;
-	/**
-	 * Liefert alle keys, die für User in der Persistence
-	 * gespeichert wurden.
-	 * @since AppServer 82483
-	 */
-	static getAllKeys(filterKey?: string): string[];
-}
-
-/**
- * Mit dieser Klasse ist es möglich nicht User-spezifische Abfragen auf die <code>UserPersistence</code> auszuführen.
- */
-declare class UserPersistenceStrings {
-	/**
-	 * Liefert die Information, ob für einen bestimmten key und value bei einem beliebigen Nutzer eine Paarung existiert.
-	 * @since AppServer 88571
-	 */
-	static exists(key: string, value: string, ignoreCase?: boolean): boolean;
-	/**
-	 * Löscht alle gespeicherten Strings für den übergebenen <code>key</code>.
-	 * @since AppServer 82478
-	 */
-	static deleteAll(key: string): number;
-	/**
-	 * Liefert alle keys, die für User in der Persistence
-	 * gespeichert wurden.
-	 * @since AppServer 82483
-	 */
-	static getAllKeys(filterKey?: string): string[];
-}
-
-/**
- * Repräsentiert den Status eines User.
- */
-declare class UserStatus {
-	/**
-	 * Liefert den numerischen Wert das UserStatus.
-	 */
-	getNumericStatus(): number;
-	/**
-	 * Liefert die Information ob der aktuelle UserStatus mindestens so hoch ist, wie der übergebene UserStatus.
-	 */
-	isAtLeast(otherUserStatus: UserStatus): boolean;
-	/**
-	 *
-	 */
-	static readonly Newbie: UserStatus;
-	/**
-	 *
-	 */
-	static readonly Family: UserStatus;
-	/**
-	 *
-	 */
-	static readonly Stammi: UserStatus;
-	/**
-	 *
-	 */
-	static readonly HonoryMember: UserStatus;
-	/**
-	 *
-	 */
-	static readonly Admin: UserStatus;
-	/**
-	 *
-	 */
-	static readonly SystemBot: UserStatus;
-	/**
-	 *
-	 */
-	static readonly Sysadmin: UserStatus;
-}
-
-/**
- * Repräsentiert den Typ eines User.
- */
-declare class UserType {
-	/**
-	 * Bot der App.
-	 */
-	static readonly AppBot: UserType;
-	/**
-	 * Bot des Knuddels-Chatsystems.
-	 */
-	static readonly SystemBot: UserType;
-	/**
-	 * Menschlicher User.
-	 */
-	static readonly Human: UserType;
-}
-
-/**
- * VideoChannelData hält Informationen zu laufenden Video-Streams im Channel bereit.
- */
-declare class VideoChannelData {
-	/**
-	 * Liefert alle User die im Channel derzeit ihr Video streamen.
-	 */
-	getStreamingVideoUsers(): User[];
-}
diff --git a/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts b/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts
index 4ee25c84ec..25319722c0 100644
--- a/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts
+++ b/types/knuddels-userapps-api/knuddels-userapps-api-tests.ts
@@ -8,7 +8,7 @@ class Server implements App {
 	onAppStart() {
 		KnuddelsServer.getChannel()
 			.getOnlineUsers(UserType.Human)
-			.forEach((user) => {
+			.forEach((user: User) => {
 				this.onUserJoined(user);
 			});
 	}
@@ -23,7 +23,9 @@ class Server implements App {
 	onUserLeft(user: User) {
 		if (this.usersPlaying.get(user.getNick()) === 1) {
 			KnuddelsServer.getDefaultBotUser()
-				.transferKnuddel(user, new KnuddelAmount(1), 'Du hast den Channel verlassen.');
+				.transferKnuddel(user, new KnuddelAmount(1), {
+					displayReasonText: 'Du hast den Channel verlassen.'
+				});
 
 			this.usersPlaying.delete(user.getNick());
 		}
@@ -39,8 +41,10 @@ class Server implements App {
 				const user = KnuddelsServer.getUserAccess()
 					.getUserById(userId);
 
-				KnuddelsServer.getDefaultBotUser()
-					.transferKnuddel(user, new KnuddelAmount(1), 'Die App fährt gleich herunter.');
+					KnuddelsServer.getDefaultBotUser()
+					.transferKnuddel(user, new KnuddelAmount(1), {
+						displayReasonText: 'Die App fährt gleich herunter.'
+					});
 				user.getAppContentSessions()
 					.forEach((session: AppContentSession) => {
 						session.remove();
@@ -104,7 +108,9 @@ class Server implements App {
 
 				if (hasWon) {
 					KnuddelsServer.getDefaultBotUser()
-						.transferKnuddel(user, new KnuddelAmount(2), 'Richtig getippt...');
+						.transferKnuddel(user, new KnuddelAmount(2), {
+							displayReasonText: 'Richtig getippt...'
+						});
 				}
 
 				setTimeout(() => {
diff --git a/types/koa-better-body/index.d.ts b/types/koa-better-body/index.d.ts
new file mode 100644
index 0000000000..ab7cf5b21f
--- /dev/null
+++ b/types/koa-better-body/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for koa-better-body 3.0
+// Project: https://github.com/tunnckoCore/koa-better-body
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Context } from 'koa';
+
+declare function KoaBetterBody(options?: KoaBetterBody.Options): KoaBetterBody.Body;
+
+declare namespace KoaBetterBody {
+  interface Options {
+    fields?: boolean | string;
+    files?: boolean | string;
+    multipart?: boolean;
+    textLimit?: string;
+    formLimit?: string;
+    urlencodedLimit?: string;
+    jsonLimit?: string;
+    bufferLimit?: string;
+    jsonStrict?: boolean;
+    detectJSON?: () => any;
+    strict?: boolean;
+    delimiter?: symbol;
+    decodeURIComponent?: any;
+    maxKeys?: number;
+    buffer?: boolean;
+  }
+
+  type Body = (context: Context, next: () => void) => Generator;
+}
+
+export = KoaBetterBody;
diff --git a/types/koa-better-body/koa-better-body-tests.ts b/types/koa-better-body/koa-better-body-tests.ts
new file mode 100644
index 0000000000..2f4deb2d49
--- /dev/null
+++ b/types/koa-better-body/koa-better-body-tests.ts
@@ -0,0 +1,11 @@
+import body = require('koa-better-body');
+
+// $ExpectType Body
+body();
+
+const testOptions: body.Options = {
+  jsonLimit: '100mb',
+};
+
+// $ExpectType Body
+body(testOptions);
diff --git a/types/koa-better-body/tsconfig.json b/types/koa-better-body/tsconfig.json
new file mode 100644
index 0000000000..74a794a11c
--- /dev/null
+++ b/types/koa-better-body/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "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-better-body-tests.ts"
+	]
+}
diff --git a/types/koa-better-body/tslint.json b/types/koa-better-body/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/koa-better-body/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/koa-bodyparser/index.d.ts b/types/koa-bodyparser/index.d.ts
index 256a2fad0a..deb1eb04e9 100644
--- a/types/koa-bodyparser/index.d.ts
+++ b/types/koa-bodyparser/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for koa-bodyparser 4.2
+// Type definitions for koa-bodyparser 5.0
 // Project: https://github.com/koajs/bodyparser
-// Definitions by: Jerry Chin <https://github.com/hellopao>
+// Definitions by: Jerry Chin <https://github.com/hellopao>, Anup Kishore <https://github.com/anup-2s>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -18,56 +18,59 @@ import * as Koa from "koa";
 
 declare module "koa" {
     interface Request {
-        body: any;
-        rawBody: any;
+        body: {} | null | undefined;
+        rawBody: {} | null | undefined;
     }
 }
 
-declare function bodyParser(opts?: {
-    /**
-     *  parser will only parse when request type hits enableTypes, default is ['json', 'form'].
-     */
-    enableTypes?: string[];
-    /**
-     * requested encoding. Default is utf-8 by co-body
-     */
-    encode?: string;
+declare function bodyParser(opts?: bodyParser.Options): Koa.Middleware;
 
-    /**
-     * limit of the urlencoded body. If the body ends up being larger than this limit
-     * a 413 error code is returned. Default is 56kb
-     */
-    formLimit?: string;
+declare namespace bodyParser {
+    interface Options {
+        /**
+         *  parser will only parse when request type hits enableTypes, default is ['json', 'form'].
+         */
+        enableTypes?: string[];
+        /**
+         * requested encoding. Default is utf-8 by co-body
+         */
+        encode?: string;
 
-    /**
-     * limit of the json body. Default is 1mb
-     */
-    jsonLimit?: string;
+        /**
+         * limit of the urlencoded body. If the body ends up being larger than this limit
+         * a 413 error code is returned. Default is 56kb
+         */
+        formLimit?: string;
 
-    /**
-     * when set to true, JSON parser will only accept arrays and objects. Default is true
-     */
-    strict?: boolean;
+        /**
+         * limit of the json body. Default is 1mb
+         */
+        jsonLimit?: string;
 
-    /**
-     * custom json request detect function. Default is null
-     */
-    detectJSON?: (ctx: Koa.Context) => boolean;
+        /**
+         * when set to true, JSON parser will only accept arrays and objects. Default is true
+         */
+        strict?: boolean;
 
-    /**
-     * support extend types
-     */
-    extendTypes?: {
-        json?: string[];
-        form?: string[];
-        text?: string[];
+        /**
+         * custom json request detect function. Default is null
+         */
+        detectJSON?: (ctx: Koa.Context) => boolean;
+
+        /**
+         * support extend types
+         */
+        extendTypes?: {
+            json?: string[];
+            form?: string[];
+            text?: string[];
+        };
+
+        /**
+         * support custom error handle
+         */
+        onerror?: (err: Error, ctx: Koa.Context) => void;
     }
+}
 
-    /**
-     * support custom error handle
-     */
-    onerror?: (err: Error, ctx: Koa.Context) => void;
-}): Koa.Middleware;
-
-declare namespace bodyParser { }
 export = bodyParser;
diff --git a/types/koa-convert/index.d.ts b/types/koa-convert/index.d.ts
new file mode 100644
index 0000000000..ed5cd38480
--- /dev/null
+++ b/types/koa-convert/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for koa-convert 1.2
+// Project: https://github.com/koajs/convert
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Context, Middleware } from "koa";
+
+declare function convert(
+    mw: (context: Context, next: () => void) => Generator
+): Middleware;
+
+export = convert;
diff --git a/types/koa-convert/koa-convert-tests.ts b/types/koa-convert/koa-convert-tests.ts
new file mode 100644
index 0000000000..0a795e522b
--- /dev/null
+++ b/types/koa-convert/koa-convert-tests.ts
@@ -0,0 +1,16 @@
+import convert = require('koa-convert');
+import Koa = require('koa');
+
+const app = new Koa();
+
+app.use(modernMiddleware);
+
+app.use(convert(legacyMiddleware));
+
+function * legacyMiddleware(next: any) {
+  yield next;
+}
+
+function modernMiddleware(ctx: Koa.Context, next: any) {
+  return next().then(() => {});
+}
diff --git a/types/koa-convert/tsconfig.json b/types/koa-convert/tsconfig.json
new file mode 100644
index 0000000000..c86211adaa
--- /dev/null
+++ b/types/koa-convert/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "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-convert-tests.ts"
+	]
+}
diff --git a/types/koa-convert/tslint.json b/types/koa-convert/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/koa-convert/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/koa-cors/index.d.ts b/types/koa-cors/index.d.ts
new file mode 100644
index 0000000000..4b996b7b07
--- /dev/null
+++ b/types/koa-cors/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for koa-cors 0.0
+// Project: https://github.com/evert0n/koa-cors
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Middleware, Request } from 'koa';
+
+declare function koaCors(options?: koaCors.Options): Middleware;
+
+declare namespace koaCors {
+    interface Options {
+        credentials?: true;
+        expose?: string | ReadonlyArray<string>;
+        headers?: string | ReadonlyArray<string>;
+        maxAge?: number;
+        methods?: string | ReadonlyArray<string>;
+        origin?: boolean | string | ((request: Request) => string);
+    }
+}
+
+export = koaCors;
diff --git a/types/koa-cors/koa-cors-tests.ts b/types/koa-cors/koa-cors-tests.ts
new file mode 100644
index 0000000000..943e11ae5f
--- /dev/null
+++ b/types/koa-cors/koa-cors-tests.ts
@@ -0,0 +1,6 @@
+import Koa = require('koa');
+import koaCors = require('koa-cors');
+
+const app = new Koa();
+app.use(koaCors());
+app.use(koaCors({ origin: '*' }));
diff --git a/types/koa-cors/tsconfig.json b/types/koa-cors/tsconfig.json
new file mode 100644
index 0000000000..69cf8667e4
--- /dev/null
+++ b/types/koa-cors/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-cors-tests.ts"
+    ]
+}
diff --git a/types/koa-cors/tslint.json b/types/koa-cors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-cors/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
index 268e261134..f8bfccd030 100644
--- a/types/koa-csrf/index.d.ts
+++ b/types/koa-csrf/index.d.ts
@@ -24,7 +24,7 @@ export = koaCsrf;
 import { Middleware } from 'koa';
 
 declare module "koa" {
-    interface Request {
+    interface Context {
         csrf: string;
     }
 }
diff --git a/types/koa-html-minifier/index.d.ts b/types/koa-html-minifier/index.d.ts
new file mode 100644
index 0000000000..6c0c58db12
--- /dev/null
+++ b/types/koa-html-minifier/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for koa-html-minifier 1.0
+// Project: https://github.com/koajs/html-minifier
+// Definitions by: Romain Faust <https://github.com/romain-faust>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Options as HtmlMinifierOptions } from 'html-minifier';
+import { Middleware } from 'koa';
+
+declare function koaHtmlMinifier(options?: koaHtmlMinifier.Options): Middleware;
+
+declare namespace koaHtmlMinifier {
+    type Options = HtmlMinifierOptions;
+}
+
+export = koaHtmlMinifier;
diff --git a/types/koa-html-minifier/koa-html-minifier-tests.ts b/types/koa-html-minifier/koa-html-minifier-tests.ts
new file mode 100644
index 0000000000..e84c6d81d1
--- /dev/null
+++ b/types/koa-html-minifier/koa-html-minifier-tests.ts
@@ -0,0 +1,6 @@
+import Koa = require('koa');
+import koaHtmlMinifier = require('koa-html-minifier');
+
+const app = new Koa();
+app.use(koaHtmlMinifier());
+app.use(koaHtmlMinifier({ collapseWhitespace: true }));
diff --git a/types/koa-html-minifier/tsconfig.json b/types/koa-html-minifier/tsconfig.json
new file mode 100644
index 0000000000..9a46770f6f
--- /dev/null
+++ b/types/koa-html-minifier/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-html-minifier-tests.ts"
+    ]
+}
diff --git a/types/koa-html-minifier/tslint.json b/types/koa-html-minifier/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-html-minifier/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-joi-router/index.d.ts b/types/koa-joi-router/index.d.ts
index bf3f387d31..e9e8670726 100644
--- a/types/koa-joi-router/index.d.ts
+++ b/types/koa-joi-router/index.d.ts
@@ -1,30 +1,36 @@
 // Type definitions for koa-joi-router 5.0
 // Project: https://github.com/koajs/joi-router
 // Definitions by: Matthew Bull <https://github.com/wingsbob>
+//                 Dave Welsh <https://github.com/move-zig>
 // 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 Spec {
+        method: string;
+        path: string|RegExp;
+        handler: (ctx: Context) => void;
+        validate?: {
+            header?: Joi.AnySchema|{[key: string]: Joi.AnySchema};
+            query?: Joi.AnySchema|{[key: string]: Joi.AnySchema};
+            params?: Joi.AnySchema|{[key: string]: Joi.AnySchema};
+            body?: Joi.AnySchema|{[key: string]: Joi.AnySchema};
+            maxBody?: number;
+            failure?: number;
+            type?: 'form'|'json'|'multipart';
+            output?: {[status: number]: Joi.AnySchema};
+            continueOnError?: boolean;
+        };
+    }
+
     interface Request extends Koa.Request {
         body: any;
         params: {[key: string]: string};
diff --git a/types/koa-joi-router/koa-joi-router-tests.ts b/types/koa-joi-router/koa-joi-router-tests.ts
index 76a392bdec..90dac8d752 100644
--- a/types/koa-joi-router/koa-joi-router-tests.ts
+++ b/types/koa-joi-router/koa-joi-router-tests.ts
@@ -2,7 +2,7 @@ import router = require('koa-joi-router');
 
 const { Joi } = router;
 
-const spec1 = {
+const spec1: router.Spec = {
     path: '/user',
     method: 'POST',
     handler: (ctx: router.Context) => ctx.body = '',
@@ -10,7 +10,7 @@ const spec1 = {
 
 router().route(spec1);
 
-const spec2 = {
+const spec2: router.Spec = {
   method: 'PATCH',
   path: '/user',
   validate: {
@@ -21,7 +21,7 @@ const spec2 = {
 
 router().route(spec2);
 
-const spec3 = {
+const spec3: router.Spec = {
   method: 'PATCH',
   path: '/user',
   validate: {
@@ -33,7 +33,7 @@ const spec3 = {
 
 router().route(spec3);
 
-const spec4 = {
+const spec4: router.Spec = {
   method: 'PATCH',
   path: '/user',
   validate: {
@@ -50,7 +50,7 @@ const spec4 = {
 
 router().route(spec4);
 
-const spec5 = {
+const spec5: router.Spec = {
   method: 'PUT',
   path: '/user',
   handler: (ctx: router.Context) => {
@@ -61,7 +61,7 @@ const spec5 = {
 
 router().route(spec5);
 
-const spec6 = {
+const spec6: router.Spec = {
   method: 'GET',
   path: '/user',
   handler: (ctx: router.Context) => {
@@ -72,6 +72,39 @@ const spec6 = {
 
 router().route(spec6);
 
+const spec7: router.Spec = {
+  method: 'GET',
+  path: '/user',
+  validate: {
+    query: {
+      id: Joi.number(),
+      name: Joi.string(),
+    }
+  },
+  handler: (ctx: router.Context) => {
+    ctx.status = 201;
+    ctx.body = ctx.request.params;
+  },
+};
+
+router().route(spec7);
+
+const spec8: router.Spec = {
+  method: 'POST',
+  path: '/user',
+  validate: {
+    header: {
+      authentication: Joi.string(),
+    }
+  },
+  handler: (ctx: router.Context) => {
+    ctx.status = 201;
+    ctx.body = ctx.request.params;
+  },
+};
+
+router().route(spec8);
+
 router().route([spec1, spec2, spec3]);
 
 router().routes.map(({ path }) => path);
diff --git a/types/koa-logger-winston/index.d.ts b/types/koa-logger-winston/index.d.ts
index ccb63ccd68..f6196b167b 100644
--- a/types/koa-logger-winston/index.d.ts
+++ b/types/koa-logger-winston/index.d.ts
@@ -7,11 +7,11 @@
 /// <reference types="node"/>
 
 import { Middleware } from 'koa';
-import { LoggerInstance } from 'winston';
+import { Logger } from 'winston';
 
 export = logger;
 
-declare function logger(logger: LoggerInstance): Middleware;
+declare function logger(logger: Logger): Middleware;
 
 declare namespace logger {
 }
diff --git a/types/koa-logger-winston/koa-logger-winston-tests.ts b/types/koa-logger-winston/koa-logger-winston-tests.ts
index 7bec5877f4..f2af3c650a 100644
--- a/types/koa-logger-winston/koa-logger-winston-tests.ts
+++ b/types/koa-logger-winston/koa-logger-winston-tests.ts
@@ -1,6 +1,6 @@
 import koa = require('koa');
 import logger = require('koa-logger-winston');
-import * as winston from 'winston';
+import { createLogger } from 'winston';
 
 const app = new koa();
-app.use(logger(new winston.Logger()));
+app.use(logger(createLogger()));
diff --git a/types/koa-logger-winston/package.json b/types/koa-logger-winston/package.json
new file mode 100644
index 0000000000..0aa4cf368f
--- /dev/null
+++ b/types/koa-logger-winston/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "winston": "^3.0.0"
+    }
+}
diff --git a/types/koa-pug/index.d.ts b/types/koa-pug/index.d.ts
index 347e4004c7..62352af7c0 100644
--- a/types/koa-pug/index.d.ts
+++ b/types/koa-pug/index.d.ts
@@ -10,6 +10,9 @@ export = Pug;
 
 /** main module */
 declare class Pug {
+    locals: {
+      [key: string]: any;
+    };
     constructor(options?: Pug.PugOptions);
     use(app: koa): void;
 }
diff --git a/types/koa-redis-cache/index.d.ts b/types/koa-redis-cache/index.d.ts
new file mode 100644
index 0000000000..58f7f120ca
--- /dev/null
+++ b/types/koa-redis-cache/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for koa-redis-cache 3.0
+// Project: https://github.com/coderhaoxin/koa-redis-cache
+// Definitions by: Dima Mukhin <https://github.com/dimamukhin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as Koa from "koa";
+import * as Redis from "redis";
+
+type onErrorCallback = (error: Error) => void;
+
+type getPrefixCallback = (ctx: Koa.Context) => string;
+
+declare namespace cache {
+    interface CacheOptions {
+        /**
+         * redis key prefix, default is koa-redis-cache:
+         * If a function is supplied, its signature should be function(ctx) {} and it should return a string to use as the redis key prefix
+         */
+        prefix?: string | getPrefixCallback;
+
+        /**
+         * redis expire time (second), default is 30 * 60 (30 min)
+         */
+        expire?: number;
+
+        /**
+         * if the passParam exists in the query string, skip the cache
+         */
+        passParam?: string;
+
+        /**
+         * max length of body size (in bytes) to cache.
+         * if the size of the body exceeds maxLength, the body will not be cached.
+         * default is: Infinity
+         */
+        maxLength?: number;
+
+        /**
+         * the routes to cache, default is ['(.*)'].
+         * can be set to an array of routes (string), or an array of RouteOptions
+         */
+        routes?: RouteOptions[] | string[];
+
+        /**
+         * the routes to exclude, default is [].
+         * example: ['/api/(.*)', '/view/:id']
+         */
+        exclude?: string[];
+
+        /**
+         * callback function for error, default is function() {}
+         */
+        onerror?: onErrorCallback;
+
+        /**
+         * redis options
+         */
+        redis?: RedisOptions;
+    }
+
+    interface RouteOptions {
+        /**
+         * the route to cache, example: '/api/(.*)'
+         */
+        route: string;
+
+        /**
+         * expiration time in seconds for cached responses for the route
+         */
+        expire?: number;
+    }
+
+    interface RedisOptions {
+        /**
+         * host name of the redis server, default: 'localhost'
+         */
+        host?: string;
+
+        /**
+         * port number of the redis server, default: 6379
+         */
+        port?: number;
+
+        /**
+         * node_redis options
+         */
+        options?: Redis.ClientOpts;
+    }
+}
+
+declare function cache(opts?: cache.CacheOptions): Koa.Middleware;
+
+export = cache;
diff --git a/types/koa-redis-cache/koa-redis-cache-tests.ts b/types/koa-redis-cache/koa-redis-cache-tests.ts
new file mode 100644
index 0000000000..b83d0b3aea
--- /dev/null
+++ b/types/koa-redis-cache/koa-redis-cache-tests.ts
@@ -0,0 +1,34 @@
+import * as Koa from "koa";
+import * as cache from 'koa-redis-cache';
+
+const app = new Koa();
+
+const routeOptions: cache.RouteOptions[] = [
+    {
+        route: '/api/test',
+        expire: 60
+    },
+    {
+        route: '/api/users'
+    }
+];
+
+const redisOptions: cache.RedisOptions = {
+    port: 6379,
+    host: 'localhost'
+};
+
+const options: cache.CacheOptions = {
+    prefix: (ctx: Koa.Context) => 'koa-redis-cache:',
+    expire: 30 * 30,
+    passParam: 'skip',
+    maxLength: 1024,
+    routes: routeOptions,
+    exclude: ['/api/(.*)', '/view/:id'],
+    onerror: (error: Error) => console.log(error),
+    redis: redisOptions
+};
+
+app.use(cache(options));
+
+app.listen(80);
diff --git a/types/koa-redis-cache/tsconfig.json b/types/koa-redis-cache/tsconfig.json
new file mode 100644
index 0000000000..897679810e
--- /dev/null
+++ b/types/koa-redis-cache/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-redis-cache-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/koa-redis-cache/tslint.json b/types/koa-redis-cache/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa-redis-cache/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/koa-response-time/index.d.ts b/types/koa-response-time/index.d.ts
index 17c3525682..d8315353fa 100644
--- a/types/koa-response-time/index.d.ts
+++ b/types/koa-response-time/index.d.ts
@@ -1,8 +1,11 @@
 // Type definitions for koa-response-time 2.0
 // Project: https://github.com/koajs/response-time#readme
 // Definitions by: Thor Sedeke <https://github.com/thorsedeke>
+//                 Steven McDowall <https://github.com/sjmcdowall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-declare function koa_response_time(): any;
+import { Middleware } from 'koa';
+
+declare function koa_response_time(): Middleware;
 export = koa_response_time;
diff --git a/types/koa-route/index.d.ts b/types/koa-route/index.d.ts
index 33840d2842..7f2584dbfa 100644
--- a/types/koa-route/index.d.ts
+++ b/types/koa-route/index.d.ts
@@ -1,63 +1,66 @@
 // Type definitions for koa-route 3.2
 // Project: https://github.com/koajs/route#readme
 // Definitions by: Mike Cook <https://github.com/migstopheles>
+//                 Jaco Greeff <https://github.com/jacogr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as Koa from 'koa';
 import * as pathToRegexp from 'path-to-regexp';
 
-type RoutePath = string | RegExp | Array<string | RegExp>;
+declare namespace KoaRoute {
+    type Path = string | RegExp | Array<string | RegExp>;
 
-type RouteHandler = (this: Koa.Context, ctx: Koa.Context, ...params: any[]) => any;
+    type Handler = (this: Koa.Context, ctx: Koa.Context, ...params: any[]) => any;
 
-type CreateRoute = (routeFunc: RouteHandler) => Koa.Middleware;
+    type CreateRoute = (routeFunc: Handler) => Koa.Middleware;
 
-interface RouteMethod {
-    (path: RoutePath): CreateRoute;
-    (path: RoutePath, fn: RouteHandler, opts?: pathToRegexp.ParseOptions & pathToRegexp.RegExpOptions): Koa.Middleware;
+    interface Method {
+        (path: Path): CreateRoute;
+        (path: Path, fn: Handler, opts?: pathToRegexp.ParseOptions & pathToRegexp.RegExpOptions): Koa.Middleware;
+    }
+
+    type CreateMethod = (method: string) => Method;
+
+    interface Routes {
+        all: Method;
+        acl: Method;
+        bind: Method;
+        checkout: Method;
+        connect: Method;
+        copy: Method;
+        delete: Method;
+        del: Method;
+        get: Method;
+        head: Method;
+        link: Method;
+        lock: Method;
+        msearch: Method;
+        merge: Method;
+        mkactivity: Method;
+        mkcalendar: Method;
+        mkcol: Method;
+        move: Method;
+        notify: Method;
+        options: Method;
+        patch: Method;
+        post: Method;
+        propfind: Method;
+        proppatch: Method;
+        purge: Method;
+        put: Method;
+        rebind: Method;
+        report: Method;
+        search: Method;
+        subscribe: Method;
+        trace: Method;
+        unbind: Method;
+        unlink: Method;
+        unlock: Method;
+        unsubscribe: Method;
+    }
 }
 
-type CreateRouteMethod = (method: string) => RouteMethod;
-
-interface KoaRoutes {
-    all: CreateRouteMethod;
-    acl: RouteMethod;
-    bind: RouteMethod;
-    checkout: RouteMethod;
-    connect: RouteMethod;
-    copy: RouteMethod;
-    delete: RouteMethod;
-    del: RouteMethod;
-    get: RouteMethod;
-    head: RouteMethod;
-    link: RouteMethod;
-    lock: RouteMethod;
-    msearch: RouteMethod;
-    merge: RouteMethod;
-    mkactivity: RouteMethod;
-    mkcalendar: RouteMethod;
-    mkcol: RouteMethod;
-    move: RouteMethod;
-    notify: RouteMethod;
-    options: RouteMethod;
-    patch: RouteMethod;
-    post: RouteMethod;
-    propfind: RouteMethod;
-    proppatch: RouteMethod;
-    purge: RouteMethod;
-    put: RouteMethod;
-    rebind: RouteMethod;
-    report: RouteMethod;
-    search: RouteMethod;
-    subscribe: RouteMethod;
-    trace: RouteMethod;
-    unbind: RouteMethod;
-    unlink: RouteMethod;
-    unlock: RouteMethod;
-    unsubscribe: RouteMethod;
-}
-
-declare const routes: KoaRoutes;
+declare const routes: KoaRoute.Routes;
 
 export = routes;
diff --git a/types/koa-router/index.d.ts b/types/koa-router/index.d.ts
index 1ade4b135b..f8a31e71cb 100644
--- a/types/koa-router/index.d.ts
+++ b/types/koa-router/index.d.ts
@@ -1,6 +1,9 @@
 // Type definitions for koa-router v7.x
-// Project: https://github.com/alexmingoia/koa-router/
-// Definitions by: Jerry Chin <https://github.com/hellopao>, Pavel Ivanov <https://github.com/schfkt>
+// Project: https://github.com/alexmingoia/koa-router#readme
+// Definitions by: Jerry Chin <https://github.com/hellopao>
+//                 Pavel Ivanov <https://github.com/schfkt>
+//                 JounQin <https://github.com/JounQin>
+//                 Romain Faust <https://github.com/romain-faust>
 // Definitions: https://github.com/hellopao/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -20,18 +23,7 @@ declare module "koa" {
     }
 }
 
-declare module Layer {
-
-    export interface ILayerOptions {
-        name: string;
-        sensitive?: boolean;
-        strict?: boolean;
-    }
-
-}
-
-declare module Router {
-
+declare namespace Router {
     export interface IRouterOptions {
         /**
          * Prefix for all routes.
@@ -60,6 +52,10 @@ declare module Router {
          * url params
          */
         params: any;
+        /**
+         * the router instance
+         */
+        router: Router;
     }
 
     export interface IMiddleware {
@@ -85,68 +81,70 @@ declare module Router {
         methodNotAllowed?: () => any;
     }
 
-}
+    export interface ILayerOptions {
+        name: string;
+        sensitive?: boolean;
+        strict?: boolean;
+    }
 
-declare class ParamName {
-    asterisk: boolean;
-    delimiter: string;
-    name: string;
-    optional: boolean;
-    partial: boolean;
-    pattern: string;
-    prefix: string;
-    repeat: string;
-}
+    export class ParamName {
+        asterisk: boolean;
+        delimiter: string;
+        name: string;
+        optional: boolean;
+        partial: boolean;
+        pattern: string;
+        prefix: string;
+        repeat: string;
+    }
 
-declare class Layer {
+    export class Layer {
+        opts: ILayerOptions;
+        name: string;
+        methods: string[];
+        paramNames: ParamName[];
+        stack: Router.IMiddleware[];
+        regexp: RegExp;
+        path: string;
 
-    opts: Layer.ILayerOptions;
-    name: string;
-    methods: string[];
-    paramNames: ParamName[];
-    stack: Router.IMiddleware[];
-    regexp: RegExp;
-    path: string;
+        constructor(path: string | RegExp, methods: string[], middleware: Router.IMiddleware, opts?: ILayerOptions);
+        constructor(path: string | RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: ILayerOptions);
 
-    constructor(path: string | RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Layer.ILayerOptions);
-    constructor(path: string | RegExp, methods: string[], middleware: Array<Router.IMiddleware>, opts?: Layer.ILayerOptions);
+        /**
+         * Returns whether request `path` matches route.
+         */
+        match(path: string): boolean;
 
-    /**
-     * Returns whether request `path` matches route.
-     */
-    match(path: string): boolean;
+        /**
+         * Returns map of URL parameters for given `path` and `paramNames`.
+         */
+        params(path: string | RegExp, captures: string[], existingParams?: Object): Object;
 
-    /**
-     * Returns map of URL parameters for given `path` and `paramNames`.
-     */
-    params(path: string | RegExp, captures: string[], existingParams?: Object): Object;
+        /**
+         * Returns array of regexp url path captures.
+         */
+        captures(path: string): string[];
 
-    /**
-     * Returns array of regexp url path captures.
-     */
-    captures(path: string): string[];
+        /**
+         * Generate URL for route using given `params`.
+         */
+        url(params: Object): string;
 
-    /**
-     * Generate URL for route using given `params`.
-     */
-    url(params: Object): string;
+        /**
+         * Run validations on route named parameters.
+         */
+        param(param: string, fn: Router.IMiddleware): Layer;
 
-    /**
-     * Run validations on route named parameters.
-     */
-    param(param: string, fn: Router.IMiddleware): Layer;
-
-    /**
-     * Prefix route path.
-     */
-    setPrefix(prefix: string): Layer;
+        /**
+         * Prefix route path.
+         */
+        setPrefix(prefix: string): Layer;
+    }
 }
 
 declare class Router {
-
     params: Object;
-
-    stack: Array<Layer>;
+    stack: Array<Router.Layer>;
 
     /**
      * Create a new router.
@@ -225,19 +223,19 @@ declare class Router {
     /**
      * Returns router middleware which dispatches a route matching the request.
      */
-    routes(): Router.IMiddleware;
+    routes(): Koa.Middleware;
 
     /**
      * Returns router middleware which dispatches a route matching the request.
      */
-    middleware(): Router.IMiddleware;
+    middleware(): Koa.Middleware;
 
     /**
      * Returns separate middleware for responding to `OPTIONS` requests with
      * an `Allow` header containing the allowed methods, as well as responding
      * with `405 Method Not Allowed` and `501 Not Implemented` as appropriate.
      */
-    allowedMethods(options?: Router.IRouterAllowedMethodsOptions): Router.IMiddleware;
+    allowedMethods(options?: Router.IRouterAllowedMethodsOptions): Koa.Middleware;
 
     /**
      * Redirect `source` to `destination` URL with optional 30x status `code`.
@@ -249,12 +247,12 @@ declare class Router {
     /**
      * Create and register a route.
      */
-    register(path: string | RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Object): Layer;
+    register(path: string | RegExp, methods: string[], middleware: Router.IMiddleware, opts?: Object): Router.Layer;
 
     /**
      * Lookup route with given `name`.
      */
-    route(name: string): Layer;
+    route(name: string): Router.Layer;
     route(name: string): boolean;
 
     /**
diff --git a/types/koa-router/koa-router-tests.ts b/types/koa-router/koa-router-tests.ts
index bbd525897c..b2bec9ad0c 100644
--- a/types/koa-router/koa-router-tests.ts
+++ b/types/koa-router/koa-router-tests.ts
@@ -8,26 +8,35 @@ const router = new Router({
 });
 
 router
-  .param('id', function(id, ctx, next) {
-    next();
-  })
-  .get('/', function (ctx, next) {
-    ctx.body = 'Hello World!';
-  })
-  .post('/users', function (ctx, next) {
-    // ...
-  })
-  .put('/users/:id', function (ctx, next) {
-    ctx.body = ctx.params.id;
-  })
-  .del('/users/:id', function () {
-    // ...
-  });
+    .param('id', function (id, ctx, next) {
+        next();
+    })
+    .get('/', function (ctx, next) {
+        ctx.body = 'Hello World!';
+    })
+    .get('/users/:id', function (ctx, next) {
+        ctx.body = ctx.router.url('user-accounts', { id: ctx.params.id })
+    })
+    .get('user-accounts', '/users/:id/accounts', function (ctx, next) {
+        // ...
+    })
+    .post('/users', function (ctx, next) {
+        // ...
+    })
+    .put('/users/:id', function (ctx, next) {
+        ctx.body = ctx.params.id;
+    })
+    .del('/users/:id', function () {
+        // ...
+    });
 
 router.get('user', '/users/:id', function (ctx) {
     ctx.body = "sdsd";
 });
 
+let layer: Router.Layer
+let layerOptions: Router.ILayerOptions
+
 app.use(router.routes());
 app.use(router.allowedMethods());
 
diff --git a/types/koa-websocket/index.d.ts b/types/koa-websocket/index.d.ts
index e7a6c39a7d..91b50b5ace 100644
--- a/types/koa-websocket/index.d.ts
+++ b/types/koa-websocket/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for koa-websocket 2.1
+// Type definitions for koa-websocket 5.0
 // Project: https://github.com/kudos/koa-websocket
-// Definitions by: My Self <https://github.com/me>
+// Definitions by: Maël Lavault <https://github.com/moimael>
+//                 Jaco Greeff <https://github.com/jacogr>
+//                 Martin Ždila <https://github.com/zdila>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -9,26 +11,32 @@ import * as ws from 'ws';
 import * as http from 'http';
 import * as https from 'https';
 
-type KoaWebsocketConnectionHandler = (socket: ws) => void;
-type KoaWebsocketMiddleware = (this: KoaWebsocketMiddlewareContext, context: Koa.Context, next: () => Promise<any>) => any;
-interface KoaWebsocketMiddlewareContext extends Koa.Context {
-    websocket: ws;
-    path: string;
+declare namespace KoaWebsocket {
+    type ConnectionHandler = (socket: ws) => void;
+
+    type Middleware = (this: MiddlewareContext, context: Koa.Context, next: () => Promise<any>) => any;
+
+    interface MiddlewareContext extends Koa.Context {
+        websocket: ws;
+        path: string;
+    }
+
+    class Server {
+        app: Koa;
+        middleware: Koa.Middleware[];
+
+        constructor(app: Koa);
+
+        listen(options: ws.ServerOptions): ws.Server;
+        onConnection(handler: ConnectionHandler): void;
+        use(middleware: Middleware): this;
+    }
+
+    interface App extends Koa {
+        ws: Server;
+    }
 }
 
-declare class KoaWebsocketServer {
-    app: Koa;
-    middleware: Koa.Middleware[];
+declare function KoaWebsocket(app: Koa, wsOptions?: ws.ServerOptions, httpsOptions?: https.ServerOptions): KoaWebsocket.App;
 
-    constructor(app: Koa);
-    listen(server: http.Server | https.Server): ws.Server;
-    onConnection(handler: KoaWebsocketConnectionHandler): void;
-    use(middleware: KoaWebsocketMiddleware): this;
-}
-
-interface KoaWebsocketApp extends Koa {
-    ws: KoaWebsocketServer;
-}
-
-declare function websockets(app: Koa): KoaWebsocketApp;
-export = websockets;
+export = KoaWebsocket;
diff --git a/types/koa2-session-redis/index.d.ts b/types/koa2-session-redis/index.d.ts
new file mode 100644
index 0000000000..24e85e1674
--- /dev/null
+++ b/types/koa2-session-redis/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for koa2-session-redis 0.0
+// Project: https://github.com/lonord/koa2-session-redis
+// Definitions by: Dima Mukhin <https://github.com/DimaMukhin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import * as Redis from 'redis';
+import * as session from 'koa-session';
+
+export = RedisStore;
+
+declare class RedisStore implements session.stores {
+    constructor(config?: Redis.ClientOpts);
+
+    /**
+     * get session object by key
+     */
+    get(key: string): any;
+
+    /**
+     * set session object for key, with a maxAge (in ms)
+     */
+    set(key: string, sess: Partial<session.Session> & { _expire?: number, _maxAge?: number }, maxAge: session.opts["maxAge"]): any;
+
+    /**
+     * destroy session for key
+     */
+    destroy(key: string): any;
+
+    /**
+     * sends the quit command to the redis server and ends cleanly right after all running commands were properly handled
+     */
+    quit(): void;
+}
diff --git a/types/koa2-session-redis/koa2-session-redis-tests.ts b/types/koa2-session-redis/koa2-session-redis-tests.ts
new file mode 100644
index 0000000000..7623b30aca
--- /dev/null
+++ b/types/koa2-session-redis/koa2-session-redis-tests.ts
@@ -0,0 +1,15 @@
+import * as session from 'koa-session';
+import * as Koa from 'koa';
+import RedisStore = require('koa2-session-redis');
+
+const app = new Koa();
+
+const CONFIG = {
+    store: new RedisStore({
+        host: '127.0.0.1',
+        port: 6379,
+        max_attempts: 0
+    })
+};
+
+app.use(session(CONFIG, app));
diff --git a/types/koa2-session-redis/tsconfig.json b/types/koa2-session-redis/tsconfig.json
new file mode 100644
index 0000000000..e96bc50af3
--- /dev/null
+++ b/types/koa2-session-redis/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",
+        "koa2-session-redis-tests.ts"
+    ]
+}
diff --git a/types/koa2-session-redis/tslint.json b/types/koa2-session-redis/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/koa2-session-redis/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 25d337716e..da58136652 100644
--- a/types/koa__cors/index.d.ts
+++ b/types/koa__cors/index.d.ts
@@ -1,10 +1,13 @@
 // Type definitions for @koa/cors 2.2
 // 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 by: Xavier Stouder <https://github.com/Xstoudi>
+//                 Izayoi Ko <https://github.com/izayoiko>
+//                 Steve Hipwell <https://github.com/stevehipwell>
+//                 Steven McDowall <https://github.com/sjmcdowall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-import * as Koa from "koa";
+import * as Koa from 'koa';
 
 export = cors;
 
@@ -12,7 +15,7 @@ declare function cors(options?: cors.Options): Koa.Middleware;
 
 declare namespace cors {
     interface Options {
-        origin?: ((req: Koa.Request) => string) | string;
+        origin?: ((ctx: Koa.Context) => string) | string;
         allowMethods?: string[] | string;
         exposeHeaders?: string[] | string;
         allowHeaders?: string[] | string;
diff --git a/types/koa__cors/koa__cors-tests.ts b/types/koa__cors/koa__cors-tests.ts
index 135845f205..25f068eb13 100644
--- a/types/koa__cors/koa__cors-tests.ts
+++ b/types/koa__cors/koa__cors-tests.ts
@@ -3,3 +3,11 @@ import cors = require('@koa/cors');
 
 const app = new Koa();
 app.use(cors());
+
+// Trying using cors() passing in a function ..
+function testCorsFunction(ctx: Koa.Context) {
+    const requestOrigin = ctx.request.origin;
+    return requestOrigin;
+}
+
+app.use(cors({ origin: testCorsFunction }));
diff --git a/types/lazy.js/index.d.ts b/types/lazy.js/index.d.ts
index 3a44d2ce40..cea9ef0dea 100644
--- a/types/lazy.js/index.d.ts
+++ b/types/lazy.js/index.d.ts
@@ -4,259 +4,283 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare namespace LazyJS {
-
     interface LazyStatic {
-
-        (value: string): StringLikeSequence;
-        <T>(value: T[]): ArrayLikeSequence<T>;
-        (value: any[]): ArrayLikeSequence<any>;
-        <T>(value: Object): ObjectLikeSequence<T>;
-        (value: Object): ObjectLikeSequence<any>;
-
-        strict(): LazyStatic;
-
-        generate<T>(generatorFn: GeneratorCallback<T>, length?: number): GeneratedSequence<T>;
-
-        range(to: number): GeneratedSequence<number>;
-        range(from: number, to: number, step?: number): GeneratedSequence<number>;
-
-        repeat<T>(value: T, count?: number): GeneratedSequence<T>;
-
-        on<T>(eventType: string): Sequence<T>;
-
-        readFile(path: string): StringLikeSequence;
-        makeHttpRequest(path: string): StringLikeSequence;
+      (value: string): StringLikeSequence;
+      <T>(value: T[]): ArrayLikeSequence<T>;
+      (value: any[]): ArrayLikeSequence<any>;
+      <T>(value: Object): ObjectLikeSequence<T>;
+      (value: Object): ObjectLikeSequence<any>;
+  
+      strict(): LazyStatic;
+  
+      generate<T>(
+        generatorFn: GeneratorCallback<T>,
+        length?: number
+      ): GeneratedSequence<T>;
+  
+      range(to: number): GeneratedSequence<number>;
+      range(from: number, to: number, step?: number): GeneratedSequence<number>;
+  
+      repeat<T>(value: T, count?: number): GeneratedSequence<T>;
+  
+      on<T>(eventType: string): Sequence<T>;
+  
+      readFile(path: string): StringLikeSequence;
+      makeHttpRequest(path: string): StringLikeSequence;
     }
-
+  
     interface ArrayLike<T> {
-        length: number;
-        [index: number]: T;
+      length: number;
+      [index: number]: T;
     }
-
+  
     interface Callback {
-        (): void;
+      (): void;
     }
-
+  
     interface ErrorCallback {
-        (error: any): void;
+      (error: any): void;
     }
-
+  
     interface ValueCallback<T> {
-        (value: T): void;
+      (value: T): void;
     }
-
+  
     interface GetKeyCallback<T> {
-        (value: T): string;
+      (value: T): string;
     }
-
-    interface TestCallback<T> {
-        (value: T): boolean;
+  
+    interface TestCallback<T, U> {
+      (value: T, index: U): boolean;
     }
-
+  
     interface MapCallback<T, U> {
-        (value: T): U;
+      (value: T): U;
     }
-
+  
     interface MapStringCallback {
-        (value: string): string;
+      (value: string): string;
     }
-
+  
     interface NumberCallback<T> {
-        (value: T): number;
+      (value: T): number;
     }
-
+  
     interface MemoCallback<T, U> {
-        (memo: U, value: T): U;
+      (memo: U, value: T): U;
     }
-
+  
     interface GeneratorCallback<T> {
-        (index: number): T;
+      (index: number): T;
     }
-
+  
     interface CompareCallback {
-        (x: any, y: any): number;
+      (x: any, y: any): number;
     }
-
+  
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+  
     interface Iterator<T> {
-        new (sequence: Sequence<T>): Iterator<T>;
-        current(): T;
-        moveNext(): boolean;
+      new (sequence: Sequence<T>): Iterator<T>;
+      current(): T;
+      moveNext(): boolean;
     }
-
+  
     interface GeneratedSequence<T> extends Sequence<T> {
-        new(generatorFn: GeneratorCallback<T>, length: number): GeneratedSequence<T>;
-        length(): number;
+      new (generatorFn: GeneratorCallback<T>, length: number): GeneratedSequence<
+        T
+      >;
+      length(): number;
     }
-
+  
     interface AsyncSequence<T> extends SequenceBase<T> {
-        each(callback: ValueCallback<T>): AsyncHandle<T>;
+      each(callback: ValueCallback<T>): AsyncHandle<T>;
     }
-
+  
     interface AsyncHandle<T> {
-        cancel(): void;
-        onComplete(callback: Callback): void;
-        onError(callback: ErrorCallback): void;
+      cancel(): void;
+      onComplete(callback: Callback): void;
+      onError(callback: ErrorCallback): void;
     }
-
+  
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+  
     namespace Sequence {
-        function define(methodName: string[], overrides: Object): Function;
+      function define(methodName: string[], overrides: Object): Function;
     }
-
+  
     interface Sequence<T> extends SequenceBase<T> {
-        each(eachFn: ValueCallback<T>): Sequence<T>;
+      each(eachFn: ValueCallback<T>): Sequence<T>;
     }
-
+  
     interface SequenceBase<T> extends SequenceBaser<T> {
-        first(): any;
-        first(count: number): Sequence<T>;
-        indexOf(value: any, startIndex?: number): Sequence<T>;
-
-        last(): any;
-        last(count: number): Sequence<T>;
-        lastIndexOf(value: any): Sequence<T>;
-
-        reverse(): Sequence<T>;
+      first(): any;
+      first(count: number): Sequence<T>;
+      indexOf(value: any, startIndex?: number): Sequence<T>;
+  
+      last(): any;
+      last(count: number): Sequence<T>;
+      lastIndexOf(value: any): Sequence<T>;
+  
+      reverse(): Sequence<T>;
     }
-
+  
     interface SequenceBaser<T> {
-        // TODO improve define() (needs ugly overload)
-        async(interval: number): AsyncSequence<T>;
-        chunk(size: number): Sequence<T>;
-        compact(): Sequence<T>;
-        concat(var_args: T[]): Sequence<T>;
-        consecutive(length: number): Sequence<T>;
-        contains(value: T): boolean;
-        countBy(keyFn: GetKeyCallback<T>): ObjectLikeSequence<T>;
-        countBy(propertyName: string): ObjectLikeSequence<T>;
-        dropWhile(predicateFn: TestCallback<T>): Sequence<T>;
-        every(predicateFn: TestCallback<T>): boolean;
-        filter(predicateFn: TestCallback<T>): Sequence<T>;
-        find(predicateFn: TestCallback<T>): T;
-        findWhere(properties: Object): T;
-
-        flatten(): Sequence<T>;
-        groupBy(keyFn: GetKeyCallback<T>): ObjectLikeSequence<T>;
-        initial(count?: number): Sequence<T>;
-        intersection(var_args: T[]): Sequence<T>;
-        invoke(methodName: string): Sequence<T>;
-        isEmpty(): boolean;
-        join(delimiter?: string): string;
-        map<U>(mapFn: MapCallback<T, U>): Sequence<U>;
-
-        max(valueFn?: NumberCallback<T>): T;
-        min(valueFn?: NumberCallback<T>): T;
-        none(valueFn?: TestCallback<T>): boolean;
-        pluck(propertyName: string): Sequence<any>;
-        reduce<U>(aggregatorFn: MemoCallback<T, U>, memo?: U): U;
-        reduceRight<U>(aggregatorFn: MemoCallback<T, U>, memo: U): U;
-        reject(predicateFn: TestCallback<T>): Sequence<T>;
-        rest(count?: number): Sequence<T>;
-        shuffle(): Sequence<T>;
-        some(predicateFn?: TestCallback<T>): boolean;
-        sort(sortFn?: CompareCallback, descending?: boolean): Sequence<T>;
-        sortBy(sortFn: string, descending?: boolean): Sequence<T>;
-        sortBy(sortFn: NumberCallback<T>, descending?: boolean): Sequence<T>;
-        sortedIndex(value: T): Sequence<T>;
-        size(): number;
-        sum(valueFn?: NumberCallback<T>): T;
-        takeWhile(predicateFn: TestCallback<T>): Sequence<T>;
-        union(var_args: T[]): Sequence<T>;
-        uniq(): Sequence<T>;
-        where(properties: Object): Sequence<T>;
-        without(...var_args: T[]): Sequence<T>;
-        without(var_args: T[]): Sequence<T>;
-        zip(var_args: T[]): Sequence<T>;
-
-        toArray(): T[];
-        toObject(): Object;
+      // TODO improve define() (needs ugly overload)
+      async(interval: number): AsyncSequence<T>;
+      chunk(size: number): Sequence<T>;
+      compact(): Sequence<T>;
+      concat(var_args: T[]): Sequence<T>;
+      consecutive(length: number): Sequence<T>;
+      contains(value: T): boolean;
+      countBy(keyFn: GetKeyCallback<T>): ObjectLikeSequence<T>;
+      countBy(propertyName: string): ObjectLikeSequence<T>;
+      dropWhile(predicateFn: TestCallback<T, string | number>): Sequence<T>;
+      every(predicateFn: TestCallback<T, string | number>): boolean;
+      filter(predicateFn: TestCallback<T, string | number>): Sequence<T>;
+      find(predicateFn: TestCallback<T, string | number>): T;
+      findWhere(properties: Object): T;
+      flatten(): Sequence<T>;
+      groupBy(keyFn: GetKeyCallback<T>): ObjectLikeSequence<T>;
+      initial(count?: number): Sequence<T>;
+      intersection(var_args: T[]): Sequence<T>;
+      invoke(methodName: string): Sequence<T>;
+      isEmpty(): boolean;
+      join(delimiter?: string): string;
+      map<U>(mapFn: MapCallback<T, U>): Sequence<U>;
+      max(valueFn?: NumberCallback<T>): T;
+      min(valueFn?: NumberCallback<T>): T;
+      none(valueFn?: TestCallback<T, string | number>): boolean;
+      pluck(propertyName: string): Sequence<any>;
+      reduce<U>(aggregatorFn: MemoCallback<T, U>, memo?: U): U;
+      reduceRight<U>(aggregatorFn: MemoCallback<T, U>, memo: U): U;
+      reject(predicateFn: TestCallback<T, string | number>): Sequence<T>;
+      rest(count?: number): Sequence<T>;
+      shuffle(): Sequence<T>;
+      size(): number;
+      some(predicateFn?: TestCallback<T, string | number>): boolean;
+      sort(sortFn?: CompareCallback, descending?: boolean): Sequence<T>;
+      sortBy(sortFn: NumberCallback<T>, descending?: boolean): Sequence<T>;
+      sortBy(sortFn: string, descending?: boolean): Sequence<T>;
+      sortedIndex(value: T): Sequence<T>;
+      sum(valueFn?: NumberCallback<T>): T;
+      takeWhile(predicateFn: TestCallback<T, string | number>): Sequence<T>;
+      toArray(): T[];
+      toObject(): Object;
+      union(var_args: T[]): Sequence<T>;
+      uniq(): Sequence<T>;
+      where(properties: Object): Sequence<T>;
+      without(...var_args: T[]): Sequence<T>;
+      without(var_args: T[]): Sequence<T>;
+      zip(var_args: T[]): Sequence<T>;
     }
-
+  
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+  
     namespace ArrayLikeSequence {
-        function define(methodName: string[], overrides: Object): Function;
+      function define(methodName: string[], overrides: Object): Function;
     }
-
+  
     interface ArrayLikeSequence<T> extends Sequence<T> {
-        // define()X;
-        concat(var_args: T[]): ArrayLikeSequence<T>;
-        first(count?: number): ArrayLikeSequence<T>;
-        get(index: number): T;
-        length(): number;
-        map<U>(mapFn: MapCallback<T, U>): ArrayLikeSequence<U>;
-        pop(): ArrayLikeSequence<T>;
-        rest(count?: number): ArrayLikeSequence<T>;
-        reverse(): ArrayLikeSequence<T>;
-        shift(): ArrayLikeSequence<T>;
-        slice(begin: number, end?: number): ArrayLikeSequence<T>;
+      // define()X;
+      concat(var_args: T[]): ArrayLikeSequence<T>;
+      first(count?: number): ArrayLikeSequence<T>;
+      get(index: number): T;
+      length(): number;
+      map<U>(mapFn: MapCallback<T, U>): ArrayLikeSequence<U>;
+      pop(): ArrayLikeSequence<T>;
+      push(value: T): ArrayLikeSequence<T>;
+      rest(count?: number): ArrayLikeSequence<T>;
+      reverse(): ArrayLikeSequence<T>;
+      shift(): ArrayLikeSequence<T>;
+      slice(begin: number, end?: number): ArrayLikeSequence<T>;
+      unshift(value: T): ArrayLikeSequence<T>;
+      
+      dropWhile(predicateFn: TestCallback<T, number>): Sequence<T>;
+      every(predicateFn: TestCallback<T, number>): boolean;
+      filter(predicateFn: TestCallback<T, number>): Sequence<T>;
+      find(predicateFn: TestCallback<T, number>): T;
+      none(valueFn?: TestCallback<T, number>): boolean;
+      reject(predicateFn: TestCallback<T, number>): Sequence<T>;
+      some(predicateFn?: TestCallback<T, number>): boolean;
+      takeWhile(predicateFn: TestCallback<T, number>): Sequence<T>;
     }
-
+  
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+  
     namespace ObjectLikeSequence {
-        function define(methodName: string[], overrides: Object): Function;
+      function define(methodName: string[], overrides: Object): Function;
     }
-
+  
     interface ObjectLikeSequence<T> extends Sequence<T> {
-        assign(other: Object): ObjectLikeSequence<T>;
-        // throws error
-        //async(): X;
-        defaults(defaults: Object): ObjectLikeSequence<T>;
-        functions(): Sequence<T>;
-        get(property: string): ObjectLikeSequence<T>;
-        invert(): ObjectLikeSequence<T>;
-        keys(): Sequence<string>;
-        merge(others: Object | ObjectLikeSequence<T>, mergeFn?: Function): ObjectLikeSequence<T>;
-        omit(properties: string[]): ObjectLikeSequence<T>;
-        pairs(): Sequence<T>;
-        pick(properties: string[]): ObjectLikeSequence<T>;
-        toArray(): T[];
-        toObject(): Object;
-        values(): Sequence<T>;
+      assign(other: Object): ObjectLikeSequence<T>;
+      // throws error
+      //async(): X;
+      defaults(defaults: Object): ObjectLikeSequence<T>;
+      functions(): Sequence<T>;
+      get(property: string): ObjectLikeSequence<T>;
+      invert(): ObjectLikeSequence<T>;
+      keys(): Sequence<string>;
+      merge(others: Object | ObjectLikeSequence<T>, mergeFn?: Function): ObjectLikeSequence<T>;
+      omit(properties: string[]): ObjectLikeSequence<T>;
+      pairs(): Sequence<T>;
+      pick(properties: string[]): ObjectLikeSequence<T>;
+      toArray(): T[];
+      toObject(): Object;
+      values(): Sequence<T>;
+      watch(propertyNames: string | string[]): Sequence<{property: string; value: any;}>;
+      
+      dropWhile(predicateFn: TestCallback<T, string>): Sequence<T>;
+      every(predicateFn: TestCallback<T, string>): boolean;
+      filter(predicateFn: TestCallback<T, string>): Sequence<T>;
+      find(predicateFn: TestCallback<T, string>): T;
+      none(valueFn?: TestCallback<T, string>): boolean;
+      reject(predicateFn: TestCallback<T, string>): Sequence<T>;
+      some(predicateFn?: TestCallback<T, string>): boolean;
+      takeWhile(predicateFn: TestCallback<T, string>): Sequence<T>;
     }
-
+  
     // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
+  
     namespace StringLikeSequence {
-        function define(methodName: string[], overrides: Object): Function;
+      function define(methodName: string[], overrides: Object): Function;
     }
-
+  
     interface StringLikeSequence extends SequenceBaser<string> {
-        charAt(index: number): string;
-        charCodeAt(index: number): number;
-        contains(value: string): boolean;
-        endsWith(suffix: string): boolean;
+      charAt(index: number): string;
+      charCodeAt(index: number): number;
+      contains(value: string): boolean;
+      endsWith(suffix: string): boolean;
+      first(): string;
+      indexOf(substring: string, startIndex?: number): number;
+      last(): string;
+      last(count: number): StringLikeSequence;
+      lastIndexOf(substring: string, startIndex?: number): number;
+      mapString(mapFn: MapStringCallback): StringLikeSequence;
+      match(pattern: RegExp): StringLikeSequence;
+      reverse(): StringLikeSequence;
+      split(delimiter: RegExp): StringLikeSequence;
+      split(delimiter: string): StringLikeSequence;
+      startsWith(prefix: string): boolean;
+      substring(start: number, stop?: number): StringLikeSequence;
+      toLowerCase(): StringLikeSequence;
+      toUpperCase(): StringLikeSequence;
 
-        first(): string;
-        first(count: number): StringLikeSequence;
-
-        indexOf(substring: string, startIndex?: number): number;
-
-        last(): string;
-        last(count: number): StringLikeSequence;
-
-        lastIndexOf(substring: string, startIndex?: number): number;
-        mapString(mapFn: MapStringCallback): StringLikeSequence;
-        match(pattern: RegExp): StringLikeSequence;
-        reverse(): StringLikeSequence;
-
-        split(delimiter: string): StringLikeSequence;
-        split(delimiter: RegExp): StringLikeSequence;
-
-        startsWith(prefix: string): boolean;
-        substring(start: number, stop?: number): StringLikeSequence;
-        toLowerCase(): StringLikeSequence;
-        toUpperCase(): StringLikeSequence;
+      dropWhile(predicateFn: TestCallback<string, number>): Sequence<string>;
+      every(predicateFn: TestCallback<string, number>): boolean;
+      filter(predicateFn: TestCallback<string, number>): Sequence<string>;
+      find(predicateFn: TestCallback<string, number>): string;
+      first(count: number): StringLikeSequence;
+      none(valueFn?: TestCallback<string, number>): boolean;
+      reject(predicateFn: TestCallback<string, number>): Sequence<string>;
+      some(predicateFn?: TestCallback<string, number>): boolean;
+      takeWhile(predicateFn: TestCallback<string, number>): Sequence<string>;
     }
-}
-
-declare var Lazy: LazyJS.LazyStatic;
-
-declare module 'lazy.js' {
-export = Lazy;
-}
-
+  }
+  
+  declare var Lazy: LazyJS.LazyStatic;
+  
+  declare module 'lazy.js' {
+    export = Lazy;
+  }
+  
\ No newline at end of file
diff --git a/types/leaflet-editable/index.d.ts b/types/leaflet-editable/index.d.ts
index 932ca33fd2..f73befb161 100644
--- a/types/leaflet-editable/index.d.ts
+++ b/types/leaflet-editable/index.d.ts
@@ -124,6 +124,11 @@ declare module 'leaflet' {
          * When you need to stop any ongoing drawing, without needing to know which editor is active.
          */
         stopDrawing(): void;
+
+        /**
+         * When you need to commit any ongoing drawing, without needing to know which editor is active.
+         */
+        commitDrawing(): void;
     }
 
     let Editable: EditableStatic;
diff --git a/types/leaflet-editable/leaflet-editable-tests.ts b/types/leaflet-editable/leaflet-editable-tests.ts
index 23bcc988fb..e804fcc250 100644
--- a/types/leaflet-editable/leaflet-editable-tests.ts
+++ b/types/leaflet-editable/leaflet-editable-tests.ts
@@ -31,6 +31,7 @@ const map: L.Map = L.map('div', {
 
 const currentPoly: L.Polygon|L.Polyline| L.Marker = map.editTools.currentPolygon;
 map.editTools.stopDrawing();
+map.editTools.commitDrawing();
 
 const marker: L.Marker = map.editTools.startMarker(L.latLng(0, 0), { draggable: true });
 marker.disable();
diff --git a/types/leaflet-routing-machine/index.d.ts b/types/leaflet-routing-machine/index.d.ts
index 16da37f7c5..2ec6d9ef27 100644
--- a/types/leaflet-routing-machine/index.d.ts
+++ b/types/leaflet-routing-machine/index.d.ts
@@ -111,6 +111,7 @@ declare module 'leaflet' {
             profile?: string;
             polylinePrecision?: number;
             useHints?: boolean;
+            routingOptions?: any;
         }
 
         class Formatter {
@@ -190,6 +191,7 @@ declare module 'leaflet' {
             allowUTurns: boolean;
             geometryOnly: boolean;
             fileFormat: string;
+            simplifyGeometry: boolean;
         }
 
         // tslint:disable-next-line interface-name
diff --git a/types/leaflet/index.d.ts b/types/leaflet/index.d.ts
index 89f9625114..0822dea605 100644
--- a/types/leaflet/index.d.ts
+++ b/types/leaflet/index.d.ts
@@ -390,6 +390,7 @@ export interface LayerOptions {
 
 export interface InteractiveLayerOptions extends LayerOptions {
     interactive?: boolean;
+    bubblingMouseEvents?: boolean;
 }
 
 export class Layer extends Evented {
@@ -542,12 +543,13 @@ export namespace tileLayer {
     function wms(baseUrl: string, options?: WMSOptions): TileLayer.WMS;
 }
 
-export interface ImageOverlayOptions extends LayerOptions {
+export interface ImageOverlayOptions extends InteractiveLayerOptions {
     opacity?: number;
     alt?: string;
     interactive?: boolean;
     attribution?: string;
     crossOrigin?: boolean;
+    className?: string;
 }
 
 export class ImageOverlay extends Layer {
@@ -610,10 +612,10 @@ export interface PolylineOptions extends PathOptions {
 }
 
 export class Polyline<T extends geojson.GeometryObject = geojson.LineString | geojson.MultiLineString, P = any> extends Path {
-    constructor(latlngs: LatLngExpression[], options?: PolylineOptions);
+    constructor(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions);
     toGeoJSON(): geojson.Feature<T, P>;
     getLatLngs(): LatLng[] | LatLng[][] | LatLng[][][];
-    setLatLngs(latlngs: LatLngExpression[]): this;
+    setLatLngs(latlngs: LatLngExpression[] | LatLngExpression[][] | LatLngExpression[][][]): this;
     isEmpty(): boolean;
     getCenter(): LatLng;
     getBounds(): LatLngBounds;
@@ -623,13 +625,13 @@ export class Polyline<T extends geojson.GeometryObject = geojson.LineString | ge
     options: PolylineOptions;
 }
 
-export function polyline(latlngs: LatLngExpression[], options?: PolylineOptions): Polyline;
+export function polyline(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions): Polyline;
 
 export class Polygon<P = any> extends Polyline<geojson.Polygon | geojson.MultiPolygon, P> {
-    constructor(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions);
+    constructor(latlngs: LatLngExpression[] | LatLngExpression[][] | LatLngExpression[][][], options?: PolylineOptions);
 }
 
-export function polygon(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions): Polygon;
+export function polygon(latlngs: LatLngExpression[] | LatLngExpression[][] | LatLngExpression[][][], options?: PolylineOptions): Polygon;
 
 export class Rectangle<P = any> extends Polygon<P> {
     constructor(latLngBounds: LatLngBoundsExpression, options?: PolylineOptions);
@@ -1404,6 +1406,7 @@ export class Map extends Evented {
     scrollWheelZoom: Handler;
     tap?: Handler;
     touchZoom: Handler;
+    zoomControl: Control.Zoom;
 
     options: MapOptions;
 }
diff --git a/types/leaflet/leaflet-tests.ts b/types/leaflet/leaflet-tests.ts
index a22ab91248..66f12fd0ed 100644
--- a/types/leaflet/leaflet-tests.ts
+++ b/types/leaflet/leaflet-tests.ts
@@ -251,6 +251,29 @@ tileLayer = new L.TileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png');
 tileLayer = new L.TileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', tileLayerOptions);
 tileLayer = new L.TileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png?{foo}&{bar}&{abc}', {foo: 'bar', bar: (data: any) => 'foo', abc: () => ''});
 
+// imageOverlay
+let imageOverlayOptions: L.ImageOverlayOptions;
+imageOverlayOptions = {
+    opacity: 100,
+    alt: 'alt',
+    interactive: true,
+    attribution: 'attribution',
+    crossOrigin: true,
+    className: 'className',
+    bubblingMouseEvents: false,
+    pane: 'pane'
+};
+
+const imageOverlayBounds = latLngBounds;
+let imageOverlay: L.ImageOverlay;
+imageOverlay = L.imageOverlay('https://www.google.ru/images/branding/googlelogo/2x/googlelogo_color_120x44dp.png', imageOverlayBounds);
+imageOverlay = L.imageOverlay('https://www.google.ru/images/branding/googlelogo/2x/googlelogo_color_120x44dp.png', imageOverlayBounds, imageOverlayOptions);
+imageOverlay = L.imageOverlay('https://www.google.ru/images/branding/googlelogo/2x/googlelogo_color_120x44dp.png', imageOverlayBounds, {
+    opacity: 100,
+    alt: 'alt',
+    className: 'className',
+});
+
 const eventHandler = () => {};
 const domEvent: Event = {} as Event;
 L.DomEvent
@@ -450,15 +473,58 @@ L.marker([1, 2], {
 	className: 'my-div-icon'
 }));
 
-const latLngs = [
-  {lat: 0, lng: 0},
-  {lat: 1, lng: 1}
-];
-const polygon = new L.Polygon(latLngs);
-const polygonExclusion = new L.Polygon([latLngs, latLngs]);
+let polygon: L.Polygon;
 
-L.polygon(latLngs).addTo(map);
-L.polygon([latLngs, latLngs]).addTo(map);
+// simple polygon
+const simplePolygonLatLngs: L.LatLngExpression[] = [[37, -109.05], [41, -109.03], [41, -102.05], [37, -102.04]];
+polygon = L.polygon(simplePolygonLatLngs);
+polygon = new L.Polygon(simplePolygonLatLngs);
+polygon.setLatLngs(simplePolygonLatLngs);
+const simplePolygonLatLngs2: L.LatLng[] = polygon.getLatLngs() as L.LatLng[];
+
+// complex polygon (polygon with holes)
+const complexPolygonLatLngs: L.LatLngExpression[][] = [
+	[[37, -109.05], [41, -109.03], [41, -102.05], [37, -102.04]], // outer ring
+	[[37.29, -108.58], [40.71, -108.58], [40.71, -102.50], [37.29, -102.50]] // hole
+];
+polygon = L.polygon(complexPolygonLatLngs);
+polygon = new L.Polygon(complexPolygonLatLngs);
+polygon.setLatLngs(complexPolygonLatLngs);
+const complexPolygonLatLngs2: L.LatLng[][] = polygon.getLatLngs() as L.LatLng[][];
+
+// multi polygon
+const multiPolygonLatLngs: L.LatLngExpression[][][] = [
+	[ // first polygon
+	  [[37, -109.05], [41, -109.03], [41, -102.05], [37, -102.04]], // outer ring
+	  [[37.29, -108.58], [40.71, -108.58], [40.71, -102.50], [37.29, -102.50]] // hole
+	],
+	[ // second polygon
+	  [[41, -111.03], [45, -111.04], [45, -104.05], [41, -104.05]]
+	]
+];
+polygon = L.polygon(multiPolygonLatLngs);
+polygon = new L.Polygon(multiPolygonLatLngs);
+polygon.setLatLngs(multiPolygonLatLngs);
+const multiPolygonLatLngs2: L.LatLng[][][] = polygon.getLatLngs() as L.LatLng[][][];
+
+let polyline: L.Polyline;
+
+// simple polyline
+const simplePolylineLatLngs: L.LatLngExpression[] = [[45.51, -122.68], [37.77, -122.43], [34.04, -118.2]];
+polyline = L.polyline(simplePolylineLatLngs);
+polyline = new L.Polyline(simplePolylineLatLngs);
+polyline.setLatLngs(simplePolylineLatLngs);
+const simplePolylineLatLngs2: L.LatLng[] = polyline.getLatLngs() as L.LatLng[];
+
+// multi polyline
+const multiPolylineLatLngs: L.LatLngExpression[][] = [
+    [[45.51, -122.68], [37.77, -122.43], [34.04, -118.2]],
+    [[40.78, -73.91], [41.83, -87.62], [32.76, -96.72]]
+];
+polyline = L.polyline(multiPolylineLatLngs);
+polyline = new L.Polyline(multiPolylineLatLngs);
+polyline.setLatLngs(multiPolylineLatLngs);
+const multiPolylineLatLngs2: L.LatLng[][] = polyline.getLatLngs() as L.LatLng[][];
 
 L.Util.extend({});
 L.Util.create({});
@@ -489,7 +555,7 @@ interface MyProperties {
 	testProperty: string;
 }
 
-(L.polygon(latLngs) as L.Polygon<MyProperties>).feature.properties.testProperty = "test";
+(L.polygon(simplePolygonLatLngs) as L.Polygon<MyProperties>).feature.properties.testProperty = "test";
 
 (L.marker([1, 2], {
 	icon: L.icon({
diff --git a/types/less/index.d.ts b/types/less/index.d.ts
index bca5c21c33..7d69273a52 100644
--- a/types/less/index.d.ts
+++ b/types/less/index.d.ts
@@ -52,6 +52,11 @@ declare namespace Less {
     interface StaticOptions {
         async: boolean;
         fileAsync: boolean;
+        modifyVars: { [variable: string]: string };
+    }
+
+    interface ImportManager {
+        contents: { [fileName: string]: string };
     }
 
     interface Options {
@@ -76,21 +81,33 @@ declare namespace Less {
         map: string;
         imports: string[];
     }
+
+    interface RefreshOutput {
+        endTime: Date;
+        startTime: Date;
+        sheets: number;
+        totalMilliseconds: number;
+    }
 }
 
 interface LessStatic {
     options: Less.StaticOptions;
-    
-    modifyVars(vars: { [name: string]: string }): void;
-    
+
+    importManager?: Less.ImportManager;
+    sheets: HTMLLinkElement[];
+
+    modifyVars(vars: { [name: string]: string }): Promise<Less.RefreshOutput>;
+
     refreshStyles(): void;
-    
+
     render(input: string, callback: (error: Less.RenderError, output: Less.RenderOutput) => void): void;
     render(input: string, options: Less.Options, callback: (error: Less.RenderError, output: Less.RenderOutput) => void): void;
 
     render(input: string): Promise<Less.RenderOutput>;
     render(input: string, options: Less.Options): Promise<Less.RenderOutput>;
 
+    refresh(reload?: boolean, modifyVars?: { [variable: string]: string }, clearFileCache?: boolean): Promise<Less.RefreshOutput>;
+
     version: number[];
     
     watch(): void;
diff --git a/types/less/less-tests.ts b/types/less/less-tests.ts
index 5d0029475a..20a1f587a9 100644
--- a/types/less/less-tests.ts
+++ b/types/less/less-tests.ts
@@ -39,8 +39,22 @@ less.render("h1 { background: red; }", options);
 less.modifyVars({
   '@buttonFace': '#5B83AD',
   '@buttonText': '#D9EEF2'
+}).then((output) => {
+    console.log('Successfully modified vars.');
 });
 
 less.refreshStyles();
 
 less.watch();
+
+less.refresh(true, {
+    '@buttonFace': '#5B83AD'
+}, true).then((output) => {
+    console.log('successfully refreshed less files');
+});
+
+if (less.importManager) {
+    for (let fileName in less.importManager.contents) {
+        let fileContents = less.importManager.contents[fileName];
+    }
+}
\ No newline at end of file
diff --git a/types/level-codec/index.d.ts b/types/level-codec/index.d.ts
new file mode 100644
index 0000000000..a106350215
--- /dev/null
+++ b/types/level-codec/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for level-codec 9.0
+// Project: https://github.com/Level/codec
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface CodecEncoder {
+    encode: (val: any) => any;
+    decode: (val: any) => any;
+    buffer: boolean;
+    type: string;
+}
+export interface CodecOptions {
+    keyEncoding?: string | CodecEncoder;
+    valueEncoding?: string | CodecEncoder;
+}
+export interface Codec {
+    encodeKey(key: any, opts?: CodecOptions, batchOpts?: CodecOptions): any;
+    encodeValue(value: any, opts?: CodecOptions, batchOpts?: CodecOptions): any;
+    decodeKey(key: any, opts?: CodecOptions): any;
+    decodeValue(value: any, opts?: CodecOptions): any;
+    encodeBatch(ops: any, opts?: CodecOptions): any;
+    encodeLtgt(ltgt: any): any;
+    createStreamDecoder(opts: CodecOptions): any;
+    keyAsBuffer(opts?: CodecOptions): any;
+    valueAsBuffer(opts?: CodecOptions): any;
+}
+export interface CodecConstructor {
+    new (options?: CodecOptions): Codec;
+    (options?: CodecOptions): Codec;
+}
+
+export const Codec: CodecConstructor;
diff --git a/types/level-codec/level-codec-tests.ts b/types/level-codec/level-codec-tests.ts
new file mode 100644
index 0000000000..371966844f
--- /dev/null
+++ b/types/level-codec/level-codec-tests.ts
@@ -0,0 +1,12 @@
+import { Codec } from "level-codec";
+
+const test = (codec: Codec) => {
+    return codec.keyAsBuffer();
+};
+
+test(new Codec({ keyEncoding: "hex" }));
+test(new Codec());
+
+// new not needed
+test(Codec({ keyEncoding: "hex" }));
+test(Codec());
diff --git a/types/level-codec/tsconfig.json b/types/level-codec/tsconfig.json
new file mode 100644
index 0000000000..0381e4eb12
--- /dev/null
+++ b/types/level-codec/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",
+        "level-codec-tests.ts"
+    ]
+}
diff --git a/types/level-codec/tslint.json b/types/level-codec/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/level-codec/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/leveldown/index.d.ts b/types/leveldown/index.d.ts
index 51630dc602..a281478b43 100644
--- a/types/leveldown/index.d.ts
+++ b/types/leveldown/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for LevelDown 1.7
 // Project: https://github.com/level/leveldown
 // Definitions by: Thiago de Arruda <https://github.com/tarruda>
+//                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -137,9 +138,11 @@ interface LevelDown {
     iterator(options?: ValueAsStringIteratorOptions): ValueAsStringIterator;
     iterator(options?: KeyAndValueAsStringIteratorOptions): KeyAndValueAsStringIterator;
     iterator(options?: KeyAndValueAsBufferIteratorOptions): KeyAndValueAsBufferIterator;
+}
+
+interface Constructor {
+    (location: string): LevelDown;
     destroy(location: string, callback: ErrCallback): void;
     repair(location: string, callback: ErrCallback): void;
 }
-
-type Constructor = (location: string) => LevelDown;
 }
diff --git a/types/leveldown/leveldown-tests.ts b/types/leveldown/leveldown-tests.ts
index 0aa9b3625e..7b00db1a96 100644
--- a/types/leveldown/leveldown-tests.ts
+++ b/types/leveldown/leveldown-tests.ts
@@ -82,5 +82,5 @@ db.approximateSize("k1", "k2", (err, size) => {
 
 db.compactRange("k1", "k2", (err) => {});
 
-db.destroy("/path/to/db", (err) => {});
-db.repair("/path/to/db", (err) => {});
+leveldown.destroy("/path/to/db", (err) => {});
+leveldown.repair("/path/to/db", (err) => {});
diff --git a/types/libsodium-wrappers/index.d.ts b/types/libsodium-wrappers/index.d.ts
new file mode 100644
index 0000000000..e9213da782
--- /dev/null
+++ b/types/libsodium-wrappers/index.d.ts
@@ -0,0 +1,1086 @@
+// Type definitions for libsodium-wrappers 0.7
+// Project: https://github.com/jedisct1/libsodium.js
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export type Uint8ArrayOutputFormat = 'uint8array';
+
+export type StringOutputFormat = 'text' | 'hex' | 'base64';
+
+export type KeyType = 'curve25519' | 'ed25519' | 'x25519';
+
+export enum base64_variants {
+    ORIGINAL,
+    ORIGINAL_NO_PADDING,
+    URLSAFE,
+    URLSAFE_NO_PADDING,
+}
+
+export interface CryptoBox {
+    ciphertext: Uint8Array;
+    mac: Uint8Array;
+}
+
+export interface StringCryptoBox {
+    ciphertext: string;
+    mac: string;
+}
+
+export interface CryptoKX {
+    sharedRx: Uint8Array;
+    sharedTx: Uint8Array;
+}
+
+export interface StringCryptoKX {
+    sharedRx: string;
+    sharedTx: string;
+}
+
+export interface KeyPair {
+    keyType: KeyType;
+    privateKey: Uint8Array;
+    publicKey: Uint8Array;
+}
+
+export interface StringKeyPair {
+    keyType: KeyType;
+    privateKey: string;
+    publicKey: string;
+}
+
+export interface SecretBox {
+    cipher: Uint8Array;
+    mac: Uint8Array;
+}
+
+export interface StringSecretBox {
+    cipher: string;
+    mac: string;
+}
+
+export interface generichash_state_address {
+    name: string;
+}
+
+export interface onetimeauth_state_address {
+    name: string;
+}
+
+export interface state_address {
+    name: string;
+}
+
+export interface secretstream_xchacha20poly1305_state_address {
+    name: string;
+}
+
+export interface sign_state_address {
+    name: string;
+}
+
+export const SODIUM_LIBRARY_VERSION_MAJOR: number;
+
+export const SODIUM_LIBRARY_VERSION_MINOR: number;
+
+export const SODIUM_VERSION_STRING: string;
+
+export const crypto_aead_chacha20poly1305_ABYTES: number;
+
+export const crypto_aead_chacha20poly1305_KEYBYTES: number;
+
+export const crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX: number;
+
+export const crypto_aead_chacha20poly1305_NPUBBYTES: number;
+
+export const crypto_aead_chacha20poly1305_NSECBYTES: number;
+
+export const crypto_aead_chacha20poly1305_ietf_ABYTES: number;
+
+export const crypto_aead_chacha20poly1305_ietf_KEYBYTES: number;
+
+export const crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX: number;
+
+export const crypto_aead_chacha20poly1305_ietf_NPUBBYTES: number;
+
+export const crypto_aead_chacha20poly1305_ietf_NSECBYTES: number;
+
+export const crypto_aead_xchacha20poly1305_ietf_ABYTES: number;
+
+export const crypto_aead_xchacha20poly1305_ietf_KEYBYTES: number;
+
+export const crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX: number;
+
+export const crypto_aead_xchacha20poly1305_ietf_NPUBBYTES: number;
+
+export const crypto_aead_xchacha20poly1305_ietf_NSECBYTES: number;
+
+export const crypto_auth_BYTES: number;
+
+export const crypto_auth_KEYBYTES: number;
+
+export const crypto_box_BEFORENMBYTES: number;
+
+export const crypto_box_MACBYTES: number;
+
+export const crypto_box_MESSAGEBYTES_MAX: number;
+
+export const crypto_box_NONCEBYTES: number;
+
+export const crypto_box_PUBLICKEYBYTES: number;
+
+export const crypto_box_SEALBYTES: number;
+
+export const crypto_box_SECRETKEYBYTES: number;
+
+export const crypto_box_SEEDBYTES: number;
+
+export const crypto_core_hchacha20_CONSTBYTES: number;
+
+export const crypto_core_hchacha20_INPUTBYTES: number;
+
+export const crypto_core_hchacha20_KEYBYTES: number;
+
+export const crypto_core_hchacha20_OUTPUTBYTES: number;
+
+export const crypto_generichash_BYTES: number;
+
+export const crypto_generichash_BYTES_MAX: number;
+
+export const crypto_generichash_BYTES_MIN: number;
+
+export const crypto_generichash_KEYBYTES: number;
+
+export const crypto_generichash_KEYBYTES_MAX: number;
+
+export const crypto_generichash_KEYBYTES_MIN: number;
+
+export const crypto_hash_BYTES: number;
+
+export const crypto_kdf_BYTES_MAX: number;
+
+export const crypto_kdf_BYTES_MIN: number;
+
+export const crypto_kdf_CONTEXTBYTES: number;
+
+export const crypto_kdf_KEYBYTES: number;
+
+export const crypto_kx_PUBLICKEYBYTES: number;
+
+export const crypto_kx_SECRETKEYBYTES: number;
+
+export const crypto_kx_SEEDBYTES: number;
+
+export const crypto_kx_SESSIONKEYBYTES: number;
+
+export const crypto_pwhash_ALG_ARGON2I13: number;
+
+export const crypto_pwhash_ALG_ARGON2ID13: number;
+
+export const crypto_pwhash_ALG_DEFAULT: number;
+
+export const crypto_pwhash_BYTES_MAX: number;
+
+export const crypto_pwhash_BYTES_MIN: number;
+
+export const crypto_pwhash_MEMLIMIT_INTERACTIVE: number;
+
+export const crypto_pwhash_MEMLIMIT_MAX: number;
+
+export const crypto_pwhash_MEMLIMIT_MIN: number;
+
+export const crypto_pwhash_MEMLIMIT_MODERATE: number;
+
+export const crypto_pwhash_MEMLIMIT_SENSITIVE: number;
+
+export const crypto_pwhash_OPSLIMIT_INTERACTIVE: number;
+
+export const crypto_pwhash_OPSLIMIT_MAX: number;
+
+export const crypto_pwhash_OPSLIMIT_MIN: number;
+
+export const crypto_pwhash_OPSLIMIT_MODERATE: number;
+
+export const crypto_pwhash_OPSLIMIT_SENSITIVE: number;
+
+export const crypto_pwhash_PASSWD_MAX: number;
+
+export const crypto_pwhash_PASSWD_MIN: number;
+
+export const crypto_pwhash_SALTBYTES: number;
+
+export const crypto_pwhash_STRBYTES: number;
+
+export const crypto_pwhash_STRPREFIX: string;
+
+export const crypto_pwhash_STR_VERIFY: number;
+
+export const crypto_scalarmult_BYTES: number;
+
+export const crypto_scalarmult_SCALARBYTES: number;
+
+export const crypto_secretbox_KEYBYTES: number;
+
+export const crypto_secretbox_MACBYTES: number;
+
+export const crypto_secretbox_MESSAGEBYTES_MAX: number;
+
+export const crypto_secretbox_NONCEBYTES: number;
+
+export const crypto_secretstream_xchacha20poly1305_ABYTES: number;
+
+export const crypto_secretstream_xchacha20poly1305_HEADERBYTES: number;
+
+export const crypto_secretstream_xchacha20poly1305_KEYBYTES: number;
+
+export const crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX: number;
+
+export const crypto_secretstream_xchacha20poly1305_MESSAGESBYTES_MAX: number;
+
+export const crypto_secretstream_xchacha20poly1305_NPUBBYTES: number;
+
+export const crypto_secretstream_xchacha20poly1305_TAG_FINAL: number;
+
+export const crypto_secretstream_xchacha20poly1305_TAG_MESSAGE: number;
+
+export const crypto_secretstream_xchacha20poly1305_TAG_PUSH: number;
+
+export const crypto_secretstream_xchacha20poly1305_TAG_REKEY: number;
+
+export const crypto_shorthash_BYTES: number;
+
+export const crypto_shorthash_KEYBYTES: number;
+
+export const crypto_sign_BYTES: number;
+
+export const crypto_sign_MESSAGEBYTES_MAX: number;
+
+export const crypto_sign_PUBLICKEYBYTES: number;
+
+export const crypto_sign_SECRETKEYBYTES: number;
+
+export const crypto_sign_SEEDBYTES: number;
+
+export const crypto_stream_MESSAGEBYTES_MAX: number;
+
+export const crypto_stream_chacha20_ietf_MESSAGEBYTES_MAX: number;
+
+export const crypto_stream_xchacha20_MESSAGEBYTES_MAX: number;
+
+export const randombytes_SEEDBYTES: number;
+
+export const ready: Promise<void>;
+
+export function add(a: Uint8Array, b: Uint8Array): void;
+
+export function compare(b1: Uint8Array, b2: Uint8Array): number;
+
+export function crypto_aead_chacha20poly1305_decrypt(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_decrypt(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_chacha20poly1305_decrypt_detached(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    mac?: Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_decrypt_detached(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    mac?: Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_chacha20poly1305_encrypt(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_encrypt(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_chacha20poly1305_encrypt_detached(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): CryptoBox;
+
+export function crypto_aead_chacha20poly1305_encrypt_detached(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringCryptoBox;
+
+export function crypto_aead_chacha20poly1305_ietf_decrypt(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_ietf_decrypt(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_chacha20poly1305_ietf_decrypt_detached(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    mac?: Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_ietf_decrypt_detached(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    mac?: Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_chacha20poly1305_ietf_encrypt(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_ietf_encrypt(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_chacha20poly1305_ietf_encrypt_detached(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): CryptoBox;
+
+export function crypto_aead_chacha20poly1305_ietf_encrypt_detached(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringCryptoBox;
+
+export function crypto_aead_chacha20poly1305_ietf_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_ietf_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_aead_chacha20poly1305_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_aead_chacha20poly1305_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_aead_xchacha20poly1305_ietf_decrypt(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_xchacha20poly1305_ietf_decrypt(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_xchacha20poly1305_ietf_decrypt_detached(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    mac?: Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_xchacha20poly1305_ietf_decrypt_detached(
+    secret_nonce?: string | Uint8Array | null,
+    ciphertext?: string | Uint8Array,
+    mac?: Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_xchacha20poly1305_ietf_encrypt(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_aead_xchacha20poly1305_ietf_encrypt(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_aead_xchacha20poly1305_ietf_encrypt_detached(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): CryptoBox;
+
+export function crypto_aead_xchacha20poly1305_ietf_encrypt_detached(
+    message?: string | Uint8Array,
+    additional_data?: string | Uint8Array | null,
+    secret_nonce?: string | Uint8Array | null,
+    public_nonce?: Uint8Array,
+    key?: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringCryptoBox;
+
+export function crypto_aead_xchacha20poly1305_ietf_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_aead_xchacha20poly1305_ietf_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_auth(
+    message: string | Uint8Array,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_auth(
+    message: string | Uint8Array,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_auth_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_auth_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_auth_verify(tag: Uint8Array, message: string | Uint8Array, key: Uint8Array): boolean;
+
+export function crypto_box_beforenm(
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_beforenm(
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_detached(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): CryptoBox;
+
+export function crypto_box_detached(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringCryptoBox;
+
+export function crypto_box_easy(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_easy(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_easy_afternm(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    sharedKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_easy_afternm(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    sharedKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_keypair(outputFormat?: Uint8ArrayOutputFormat | null): KeyPair;
+
+export function crypto_box_keypair(outputFormat?: StringOutputFormat | null): StringKeyPair;
+
+export function crypto_box_open_detached(
+    ciphertext: string | Uint8Array,
+    mac: Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_open_detached(
+    ciphertext: string | Uint8Array,
+    mac: Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_open_easy(
+    ciphertext: string | Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_open_easy(
+    ciphertext: string | Uint8Array,
+    nonce: Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_open_easy_afternm(
+    ciphertext: string | Uint8Array,
+    nonce: Uint8Array,
+    sharedKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_open_easy_afternm(
+    ciphertext: string | Uint8Array,
+    nonce: Uint8Array,
+    sharedKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_seal(
+    message: string | Uint8Array,
+    publicKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_seal(
+    message: string | Uint8Array,
+    publicKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_seal_open(
+    ciphertext: string | Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_box_seal_open(
+    ciphertext: string | Uint8Array,
+    publicKey: Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_box_seed_keypair(seed: Uint8Array, outputFormat?: Uint8ArrayOutputFormat | null): KeyPair;
+
+export function crypto_box_seed_keypair(seed: Uint8Array, outputFormat?: StringOutputFormat | null): StringKeyPair;
+
+export function crypto_generichash(
+    hash_length?: number,
+    message?: string | Uint8Array,
+    key?: string | Uint8Array | null,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_generichash(
+    hash_length?: number,
+    message?: string | Uint8Array,
+    key?: string | Uint8Array | null,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_generichash_final(
+    state_address: generichash_state_address,
+    hash_length: number,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_generichash_final(
+    state_address: generichash_state_address,
+    hash_length: number,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_generichash_init(key?: string | Uint8Array | null, hash_length?: number): state_address;
+
+export function crypto_generichash_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_generichash_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_generichash_update(
+    state_address: generichash_state_address,
+    message_chunk: string | Uint8Array,
+): void;
+
+export function crypto_hash(message: string | Uint8Array, outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_hash(message: string | Uint8Array, outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_kdf_derive_from_key(
+    subkey_len: number,
+    subkey_id: number,
+    ctx: string,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_kdf_derive_from_key(
+    subkey_len: number,
+    subkey_id: number,
+    ctx: string,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_kdf_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_kdf_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_kx_client_session_keys(
+    clientPublicKey: Uint8Array,
+    clientSecretKey: Uint8Array,
+    serverPublicKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): CryptoKX;
+
+export function crypto_kx_client_session_keys(
+    clientPublicKey: Uint8Array,
+    clientSecretKey: Uint8Array,
+    serverPublicKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringCryptoKX;
+
+export function crypto_kx_keypair(outputFormat?: Uint8ArrayOutputFormat | null): KeyPair;
+
+export function crypto_kx_keypair(outputFormat?: StringOutputFormat | null): StringKeyPair;
+
+export function crypto_kx_seed_keypair(seed: Uint8Array, outputFormat?: Uint8ArrayOutputFormat | null): KeyPair;
+
+export function crypto_kx_seed_keypair(seed: Uint8Array, outputFormat?: StringOutputFormat | null): StringKeyPair;
+
+export function crypto_kx_server_session_keys(
+    serverPublicKey: Uint8Array,
+    serverSecretKey: Uint8Array,
+    clientPublicKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): CryptoKX;
+
+export function crypto_kx_server_session_keys(
+    serverPublicKey: Uint8Array,
+    serverSecretKey: Uint8Array,
+    clientPublicKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringCryptoKX;
+
+export function crypto_pwhash(
+    keyLength: number,
+    password: string | Uint8Array,
+    salt: Uint8Array,
+    opsLimit: number,
+    memLimit: number,
+    algorithm: number,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_pwhash(
+    keyLength: number,
+    password: string | Uint8Array,
+    salt: Uint8Array,
+    opsLimit: number,
+    memLimit: number,
+    algorithm: number,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_pwhash_str(password: string | Uint8Array, opsLimit: number, memLimit: number): string;
+
+export function crypto_pwhash_str_verify(hashed_password: string, password: string | Uint8Array): boolean;
+
+export function crypto_scalarmult(
+    privateKey: Uint8Array,
+    publicKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_scalarmult(
+    privateKey: Uint8Array,
+    publicKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_scalarmult_base(
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_scalarmult_base(privateKey: Uint8Array, outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_secretbox_detached(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): SecretBox;
+
+export function crypto_secretbox_detached(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): StringSecretBox;
+
+export function crypto_secretbox_easy(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_secretbox_easy(
+    message: string | Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_secretbox_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_secretbox_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_secretbox_open_detached(
+    ciphertext: string | Uint8Array,
+    mac: Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_secretbox_open_detached(
+    ciphertext: string | Uint8Array,
+    mac: Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_secretbox_open_easy(
+    ciphertext: string | Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_secretbox_open_easy(
+    ciphertext: string | Uint8Array,
+    nonce: Uint8Array,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_secretstream_xchacha20poly1305_init_pull(header: Uint8Array, key: Uint8Array): state_address;
+
+export function crypto_secretstream_xchacha20poly1305_init_push(
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): { state: state_address; header: Uint8Array };
+
+export function crypto_secretstream_xchacha20poly1305_init_push(
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): { state: state_address; header: string };
+
+export function crypto_secretstream_xchacha20poly1305_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_secretstream_xchacha20poly1305_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_secretstream_xchacha20poly1305_pull(
+    state_address?: secretstream_xchacha20poly1305_state_address,
+    cipher?: string | Uint8Array,
+    ad?: string | Uint8Array | null,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): { message: Uint8Array; tag: Uint8Array };
+
+export function crypto_secretstream_xchacha20poly1305_pull(
+    state_address?: secretstream_xchacha20poly1305_state_address,
+    cipher?: string | Uint8Array,
+    ad?: string | Uint8Array | null,
+    outputFormat?: StringOutputFormat | null,
+): { message: string; tag: Uint8Array };
+
+export function crypto_secretstream_xchacha20poly1305_push(
+    state_address?: secretstream_xchacha20poly1305_state_address,
+    message_chunk?: string | Uint8Array,
+    ad?: string | Uint8Array | null,
+    tag?: number,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_secretstream_xchacha20poly1305_push(
+    state_address?: secretstream_xchacha20poly1305_state_address,
+    message_chunk?: string | Uint8Array,
+    ad?: string | Uint8Array | null,
+    tag?: number,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_secretstream_xchacha20poly1305_rekey(
+    state_address: secretstream_xchacha20poly1305_state_address,
+): true;
+
+export function crypto_shorthash(
+    message: string | Uint8Array,
+    key: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_shorthash(
+    message: string | Uint8Array,
+    key: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_shorthash_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_shorthash_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function crypto_sign(
+    message: string | Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_sign(
+    message: string | Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_sign_detached(
+    message: string | Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_sign_detached(
+    message: string | Uint8Array,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_sign_ed25519_pk_to_curve25519(
+    edPk: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_sign_ed25519_pk_to_curve25519(
+    edPk: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_sign_ed25519_sk_to_curve25519(
+    edSk: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_sign_ed25519_sk_to_curve25519(
+    edSk: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_sign_final_create(
+    state_address: sign_state_address,
+    privateKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_sign_final_create(
+    state_address: sign_state_address,
+    privateKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_sign_final_verify(
+    state_address: sign_state_address,
+    signature: Uint8Array,
+    publicKey: Uint8Array,
+): boolean;
+
+export function crypto_sign_init(): state_address;
+
+export function crypto_sign_keypair(outputFormat?: Uint8ArrayOutputFormat | null): KeyPair;
+
+export function crypto_sign_keypair(outputFormat?: StringOutputFormat | null): StringKeyPair;
+
+export function crypto_sign_open(
+    signedMessage: string | Uint8Array,
+    publicKey: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function crypto_sign_open(
+    signedMessage: string | Uint8Array,
+    publicKey: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function crypto_sign_seed_keypair(seed: Uint8Array, outputFormat?: Uint8ArrayOutputFormat | null): KeyPair;
+
+export function crypto_sign_seed_keypair(seed: Uint8Array, outputFormat?: StringOutputFormat | null): StringKeyPair;
+
+export function crypto_sign_update(state_address: sign_state_address, message_chunk: string | Uint8Array): void;
+
+export function crypto_sign_verify_detached(
+    signature: Uint8Array,
+    message: string | Uint8Array,
+    publicKey: Uint8Array,
+): boolean;
+
+export function crypto_stream_keygen(outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function crypto_stream_keygen(outputFormat?: StringOutputFormat | null): string;
+
+export function from_base64(input: string, variant: base64_variants): Uint8Array;
+
+export function from_hex(input: string): Uint8Array;
+
+export function from_string(str: string): Uint8Array;
+
+export function increment(bytes: Uint8Array): void;
+
+export function is_zero(bytes: Uint8Array): boolean;
+
+export function memcmp(b1: Uint8Array, b2: Uint8Array): boolean;
+
+export function memzero(bytes: Uint8Array): void;
+
+export function pad(buf: Uint8Array, blocksize: number): Uint8Array;
+
+export function randombytes_buf(length: number, outputFormat?: Uint8ArrayOutputFormat | null): Uint8Array;
+
+export function randombytes_buf(length: number, outputFormat?: StringOutputFormat | null): string;
+
+export function randombytes_buf_deterministic(
+    length: number,
+    seed: Uint8Array,
+    outputFormat?: Uint8ArrayOutputFormat | null,
+): Uint8Array;
+
+export function randombytes_buf_deterministic(
+    length: number,
+    seed: Uint8Array,
+    outputFormat?: StringOutputFormat | null,
+): string;
+
+export function randombytes_close(): void;
+
+export function randombytes_random(): number;
+
+export function randombytes_set_implementation(implementation: Uint8Array): void;
+
+export function randombytes_stir(): void;
+
+export function randombytes_uniform(upper_bound: number): number;
+
+export function sodium_version_string(): string;
+
+export function symbols(): string[];
+
+export function to_base64(input: string | Uint8Array, variant: base64_variants): string;
+
+export function to_hex(input: string | Uint8Array): string;
+
+export function to_string(bytes: Uint8Array): string;
+
+export function unpad(buf: Uint8Array, blocksize: number): Uint8Array;
diff --git a/types/libsodium-wrappers/libsodium-wrappers-tests.ts b/types/libsodium-wrappers/libsodium-wrappers-tests.ts
new file mode 100644
index 0000000000..302421a96d
--- /dev/null
+++ b/types/libsodium-wrappers/libsodium-wrappers-tests.ts
@@ -0,0 +1,22 @@
+import * as _sodium from 'libsodium-wrappers';
+
+_sodium.ready.then(() => {
+  const sodium = _sodium;
+
+  const key = sodium.crypto_secretstream_xchacha20poly1305_keygen();
+
+  const res = sodium.crypto_secretstream_xchacha20poly1305_init_push(key);
+  const [state_out, header] = [res.state, res.header];
+  const c1 = sodium.crypto_secretstream_xchacha20poly1305_push(state_out,
+    sodium.from_string('message 1'), null,
+    sodium.crypto_secretstream_xchacha20poly1305_TAG_MESSAGE);
+  const c2 = sodium.crypto_secretstream_xchacha20poly1305_push(state_out,
+    sodium.from_string('message 2'), null,
+    sodium.crypto_secretstream_xchacha20poly1305_TAG_FINAL);
+
+  const state_in = sodium.crypto_secretstream_xchacha20poly1305_init_pull(header, key);
+  const r1 = sodium.crypto_secretstream_xchacha20poly1305_pull(state_in, c1);
+  const [m1, tag1] = [sodium.to_string(r1.message), r1.tag];
+  const r2 = sodium.crypto_secretstream_xchacha20poly1305_pull(state_in, c2);
+  const [m2, tag2] = [sodium.to_string(r2.message), r2.tag];
+});
diff --git a/types/libsodium-wrappers/tsconfig.json b/types/libsodium-wrappers/tsconfig.json
new file mode 100644
index 0000000000..f366b5643e
--- /dev/null
+++ b/types/libsodium-wrappers/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",
+        "libsodium-wrappers-tests.ts"
+    ]
+}
diff --git a/types/libsodium-wrappers/tslint.json b/types/libsodium-wrappers/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/libsodium-wrappers/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/libxmljs/index.d.ts b/types/libxmljs/index.d.ts
index 7fc9e9e2bf..4305c662a8 100644
--- a/types/libxmljs/index.d.ts
+++ b/types/libxmljs/index.d.ts
@@ -12,16 +12,14 @@ export const libxml_version: string;
 export const libxml_parser_version: string;
 
 // tslint:disable-next-line:strict-export-declare-modifiers
-interface ParseOptions {
-    [optionName: string]: string;
-}
+interface StringMap { [key: string]: string; }
 
-export function parseXml(source: string, options?: ParseOptions): Document;
-export function parseXmlString(source: string, options?: ParseOptions): Document;
+export function parseXml(source: string, options?: StringMap): Document;
+export function parseXmlString(source: string, options?: StringMap): Document;
 
-export function parseHtml(source: string, options?: ParseOptions): Document;
-export function parseHtmlString(source: string, options?: ParseOptions): Document;
-export function parseHtmlFragment(source: string, options?: ParseOptions): Document;
+export function parseHtml(source: string, options?: StringMap): Document;
+export function parseHtmlString(source: string, options?: StringMap): Document;
+export function parseHtmlFragment(source: string, options?: StringMap): Document;
 
 export function memoryUsage(): number;
 export function nodeCount(): number;
@@ -41,7 +39,7 @@ export class Document {
     encoding(): string;
     encoding(enc: string): this;
     find(xpath: string): Element[];
-    get(xpath: string): Element|null;
+    get(xpath: string, namespaces?: StringMap): Element|null;
     node(name: string, content?: string): Element;
     root(): Element|null;
     root(newRoot: Node): Node;
@@ -98,7 +96,7 @@ export class Element extends Node {
     text(): string;
     text(newText: string): this;
     attr(name: string): Attribute|null;
-    attr(attrObject: { [key: string]: string; }): this;
+    attr(attrObject: StringMap): this;
     attrs(): Attribute[];
 
     doc(): Document;
@@ -115,7 +113,7 @@ export class Element extends Node {
     addNextSibling(siblingNode: Node): Node;
 
     find(xpath: string, ns_uri?: string): Node[];
-    find(xpath: string, namespaces: { [key: string]: string; }): Node[];
+    find(xpath: string, namespaces: StringMap): Node[];
     get(xpath: string, ns_uri?: string): Element|null;
 
     defineNamespace(prefixOrHref: string, hrefInCaseOfPrefix?: string): Namespace;
diff --git a/types/libxmljs/libxmljs-tests.ts b/types/libxmljs/libxmljs-tests.ts
index 367d74c69d..fe720cc242 100644
--- a/types/libxmljs/libxmljs-tests.ts
+++ b/types/libxmljs/libxmljs-tests.ts
@@ -47,3 +47,18 @@ const doc = new libxmljs.Document();
     .node('sibling', 'with content!');
 
 const {name, externalId, systemId} = doc.getDtd();
+
+const xmlWithNs =  '<?xml version="1.0" encoding="UTF-8"?>' +
+           '<root>' +
+               '<child xmlns:a="http://test.com/test" foo="bar">' +
+                   '<a:grandchild baz="fizbuzz">grandchild content</a:grandchild>' +
+               '</child>' +
+               '<sibling>with content!</sibling>' +
+           '</root>';
+
+const xmlDocWithNs = libxmljs.parseXml(xmlWithNs);
+
+// xpath queries
+const gchildWithNs = xmlDocWithNs.get('//a:grandchild', {a: 'http://test.com/test'})!;
+
+console.log(gchildWithNs.text());  // prints "grandchild content"
diff --git a/types/linear-gradient/index.d.ts b/types/linear-gradient/index.d.ts
new file mode 100644
index 0000000000..0f1110efae
--- /dev/null
+++ b/types/linear-gradient/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for linear-gradient 1.0
+// Project: https://github.com/karmadata/linear-gradient#readme
+// Definitions by: Jack Works <https://github.com/Jack-Works>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Color = [number, number, number];
+declare class Gradient {
+    constructor(colors: Color[]);
+    /**
+     * the input value should be normalized to the range between 0 and 1
+     */
+    calcArray(normalizedPercent: number): Color;
+    /**
+     * the input value should be normalized to the range between 0 and 1
+     */
+    calcHex(normalizedPrecent: number): string;
+}
+export = Gradient;
diff --git a/types/linear-gradient/linear-gradient-tests.ts b/types/linear-gradient/linear-gradient-tests.ts
new file mode 100644
index 0000000000..15b4550643
--- /dev/null
+++ b/types/linear-gradient/linear-gradient-tests.ts
@@ -0,0 +1,23 @@
+import Gradient = require("linear-gradient");
+
+// instantiate with an RGB palette
+const grad1 = new Gradient([
+    [0, 0, 0],
+    [0, 80, 0],
+    [0, 160, 80],
+    [80, 80, 80],
+    [160, 40, 40],
+    [255, 0, 0]
+]);
+
+// now we are ready to calculate the colors
+// the input value should be normalized to the range between 0 and 1
+
+(grad1.calcArray(0)); // -> [0,0,0] (0 -> first color of the palette)
+(grad1.calcArray(1)); // -> [255,0,0] (1 -> last color of the palette)
+(grad1.calcArray(0.25)); // -> [0,100,20] (weighted average between [0,80,0] and [0,160,80])
+(grad1.calcArray(0.5));
+(grad1.calcArray(0.75));
+
+(grad1.calcHex(1));  // -> '#ffffff'
+(grad1.calcHex(0.25));   // -> '#006416'
diff --git a/types/linear-gradient/tsconfig.json b/types/linear-gradient/tsconfig.json
new file mode 100644
index 0000000000..da95f86d4b
--- /dev/null
+++ b/types/linear-gradient/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "strictFunctionTypes": true,
+        "esModuleInterop": true,
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "linear-gradient-tests.ts"
+    ]
+}
diff --git a/types/linear-gradient/tslint.json b/types/linear-gradient/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/linear-gradient/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/lingui__core/formats.d.ts b/types/lingui__core/formats.d.ts
new file mode 100644
index 0000000000..841f6404e8
--- /dev/null
+++ b/types/lingui__core/formats.d.ts
@@ -0,0 +1,2 @@
+export function date(language: string, format?: Intl.DateTimeFormatOptions): (value: Date) => string;
+export function number(language: string, format?: Intl.NumberFormatOptions): (value: number) => string;
diff --git a/types/lingui__core/i18n.d.ts b/types/lingui__core/i18n.d.ts
new file mode 100644
index 0000000000..49f663a6a8
--- /dev/null
+++ b/types/lingui__core/i18n.d.ts
@@ -0,0 +1,69 @@
+import { SelectProps, PluralProps } from "./select";
+
+// In flowtype, MessageOptions is declared as exact type
+export interface MessageOptions {
+    defaults?: string;
+    formats?: object;
+}
+
+export interface LanguageData {
+    plurals?: (n: number, pluralType?: "cardinal" | "ordinal") => string;
+}
+
+export interface Messages {
+    [key: string]: string | ((context: (name: string, type?: string, format?: any) => string) => (string | string[]));
+}
+
+export interface Catalog {
+    messages: Messages;
+    languageData?: LanguageData;
+}
+
+export interface Catalogs {
+    [key: string]: Catalog;
+}
+
+export interface setupI18nProps {
+    language?: string;
+    catalogs?: Catalogs;
+    development?: object;
+}
+
+export class I18n {
+    t(strings: TemplateStringsArray, ...values: any[]): string;
+
+    t(id: string): (strings: TemplateStringsArray, ...values: any[]) => string;
+
+    select(config: SelectProps): string;
+
+    select(id: string, config: SelectProps): string;
+
+    plural(config: PluralProps): string;
+
+    plural(id: string, config: PluralProps): string;
+
+    selectOrdinal(config: PluralProps): string;
+
+    selectOrdinal(id: string, config: PluralProps): string;
+
+    constructor();
+
+    availableLanguages: string[];
+    language: string;
+    messages: Messages;
+    languageData: LanguageData;
+
+    load(catalogs: Catalogs): void;
+
+    activate(language: string): void;
+
+    use(language: string): I18n;
+
+    _(id: string, values?: object, messageOptions?: MessageOptions): string;
+
+    pluralForm(n: number, pluralType?: "cardinal" | "ordinal"): string;
+}
+
+export function setupI18n(params?: setupI18nProps): I18n;
+
+export const i18n: I18n;
diff --git a/types/lingui__core/index.d.ts b/types/lingui__core/index.d.ts
new file mode 100644
index 0000000000..c0aa933bee
--- /dev/null
+++ b/types/lingui__core/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for @lingui/core 2.1
+// Project: https://lingui.github.io/js-lingui/
+// Definitions by: Jeow Li Huan <https://github.com/huan086>
+// Definitions: https://github.com/huan086/lingui-typings
+
+export {
+    i18n,
+    setupI18n,
+    Catalog,
+    Catalogs,
+    MessageOptions,
+    LanguageData,
+    I18n
+} from './i18n';
+
+export {
+    date,
+    number
+} from './formats';
+
+export function i18nMark(id: string): string;
diff --git a/types/lingui__core/lingui__core-tests.ts b/types/lingui__core/lingui__core-tests.ts
new file mode 100644
index 0000000000..799bc5812b
--- /dev/null
+++ b/types/lingui__core/lingui__core-tests.ts
@@ -0,0 +1,89 @@
+import {
+    i18n,
+    setupI18n,
+    Catalog,
+    Catalogs,
+    MessageOptions,
+    LanguageData,
+    I18n,
+    date,
+    number,
+    i18nMark
+} from '@lingui/core';
+
+const age = 12;
+const templateResult: string = i18n.t`${age} years old`;
+const templateIdResult: string = i18n.t('templateId')`${age} years old`;
+const translateResult: string = i18n._('age', { age }, { defaults: '{age} years old' });
+
+const count = 42;
+
+const pluralResult: string = i18n.plural({
+    value: count,
+    0: 'no books',
+    one: '# book',
+    other: '# books'
+});
+const pluralIdResult: string = i18n.plural('pluralId', {
+    value: count,
+    0: 'no books',
+    one: '# book',
+    other: '# books'
+});
+
+const selectOrdinalResult: string = i18n.selectOrdinal({
+    value: count,
+    0: 'Zeroth book',
+    one: '#st book',
+    two: '#nd book',
+    few: '#rd book',
+    other: '#th book'
+});
+const selectOrdinalIdResult: string = i18n.selectOrdinal('selectOrdinalId', {
+    value: count,
+    0: 'Zeroth book',
+    one: '#st book',
+    two: '#nd book',
+    few: '#rd book',
+    other: '#th book'
+});
+
+const gender = 'female';
+const numOfGuests = 2;
+const host = 'Amy';
+const guest = 'Bob';
+const selectResult = i18n.select({
+    value: gender,
+    female: i18n.plural({
+        value: numOfGuests,
+        offset: 1,
+        0: i18n.t`${host} does not give a party.`,
+        1: i18n.t`${host} invites ${guest} to her party.`,
+        2: i18n.t`${host} invites ${guest} and one other person to her party.`,
+        other: i18n.t`${host} invites ${guest} and # other people to her party.`
+    }),
+    male: 'male',
+    other: 'other'
+});
+
+const selectIdResult = i18n.select('selectId', {
+    value: gender,
+    female: 'female',
+    male: 'male',
+    other: 'other'
+});
+
+const catalog: Catalog = {
+    messages: {
+        age(a) {
+            return [a('age'), 'años de edad'];
+        }
+    }
+};
+const catalogs: Catalogs = { es: catalog };
+const setupResult: I18n = setupI18n({ catalogs, language: 'es' });
+
+const formattedDate: string = date('en', { timeZone: 'UTC' })(new Date());
+const formattedNumber: string = number('en', { style: 'currency', currency: 'EUR' })(1234.56);
+
+const mark: string = i18nMark('mark');
diff --git a/types/lingui__core/select.d.ts b/types/lingui__core/select.d.ts
new file mode 100644
index 0000000000..6a2eb51db9
--- /dev/null
+++ b/types/lingui__core/select.d.ts
@@ -0,0 +1,20 @@
+export interface PluralForms {
+    zero?: string;
+    one?: string;
+    two?: string;
+    few?: string;
+    many?: string;
+    other: string;
+    [exact: number]: string;
+}
+
+export interface PluralProps extends PluralForms {
+    value: number;
+    offset?: number;
+}
+
+export interface SelectProps {
+    value: string;
+    other: string;
+    [selectForm: string]: string;
+}
diff --git a/types/lingui__core/tsconfig.json b/types/lingui__core/tsconfig.json
new file mode 100644
index 0000000000..e01d974c46
--- /dev/null
+++ b/types/lingui__core/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,
+        "paths": {
+            "@lingui/core": [
+                "lingui__core"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "lingui__core-tests.ts"
+    ]
+}
diff --git a/types/lingui__core/tslint.json b/types/lingui__core/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lingui__core/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/lingui__react/I18nProvider.d.ts b/types/lingui__react/I18nProvider.d.ts
new file mode 100644
index 0000000000..9eb0158fac
--- /dev/null
+++ b/types/lingui__react/I18nProvider.d.ts
@@ -0,0 +1,14 @@
+import { Component, ReactNode } from 'react';
+import { I18n, Catalogs } from '@lingui/core';
+
+// tslint:disable-next-line:interface-name
+export interface I18nProviderProps {
+    children?: ReactNode;
+    language: string;
+    catalogs?: Catalogs;
+    i18n?: I18n;
+
+    defaultRender?: ReactNode;
+}
+
+export default class I18nProvider extends Component<I18nProviderProps> { }
diff --git a/types/lingui__react/Render.d.ts b/types/lingui__react/Render.d.ts
new file mode 100644
index 0000000000..d9ccf003c0
--- /dev/null
+++ b/types/lingui__react/Render.d.ts
@@ -0,0 +1,6 @@
+import { ReactNode } from 'react';
+
+export interface RenderProps {
+    render?: ReactNode;
+    className?: string;
+}
diff --git a/types/lingui__react/Select.d.ts b/types/lingui__react/Select.d.ts
new file mode 100644
index 0000000000..044d4bf473
--- /dev/null
+++ b/types/lingui__react/Select.d.ts
@@ -0,0 +1,26 @@
+import { Component, ReactNode } from 'react';
+import { RenderProps } from './Render';
+
+export interface PluralPropsWithoutI18n extends RenderProps {
+    id?: string;
+    value: number | string;
+    offset?: number | string;
+    zero?: ReactNode;
+    one?: ReactNode;
+    two?: ReactNode;
+    few?: ReactNode;
+    many?: ReactNode;
+    other: ReactNode;
+    [exact: string]: ReactNode;
+}
+
+export interface SelectPropsWithoutI18n extends RenderProps {
+    id?: string;
+    value: string;
+    other: ReactNode;
+    [exact: string]: ReactNode;
+}
+
+export class Select extends Component<SelectPropsWithoutI18n> { }
+export class Plural extends Component<PluralPropsWithoutI18n> { }
+export class SelectOrdinal extends Component<PluralPropsWithoutI18n> { }
diff --git a/types/lingui__react/Trans.d.ts b/types/lingui__react/Trans.d.ts
new file mode 100644
index 0000000000..c1834b770d
--- /dev/null
+++ b/types/lingui__react/Trans.d.ts
@@ -0,0 +1,13 @@
+import { Component, ReactElement, ReactNode } from 'react';
+import { RenderProps } from './Render';
+
+export interface TransPropsWithoutI18n extends RenderProps {
+    id?: string;
+    defaults?: string;
+    values?: object;
+    formats?: object;
+    components?: ReadonlyArray<ReactElement<any>>;
+    children?: ReactNode;
+}
+
+export default class Trans extends Component<TransPropsWithoutI18n> { }
diff --git a/types/lingui__react/createFormat.d.ts b/types/lingui__react/createFormat.d.ts
new file mode 100644
index 0000000000..49bebb079e
--- /dev/null
+++ b/types/lingui__react/createFormat.d.ts
@@ -0,0 +1,6 @@
+import { RenderProps } from './Render';
+
+export interface FormatPropsWithoutI18n<V, FormatOptions> extends RenderProps {
+    value: V;
+    format?: FormatOptions;
+}
diff --git a/types/lingui__react/index.d.ts b/types/lingui__react/index.d.ts
new file mode 100644
index 0000000000..1fbe1e5c05
--- /dev/null
+++ b/types/lingui__react/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for @lingui/react 2.1
+// Project: https://lingui.github.io/js-lingui/
+// Definitions by: Jeow Li Huan <https://github.com/huan086>
+// Definitions: https://github.com/huan086/lingui-typings
+// TypeScript Version: 2.8
+
+import { ComponentClass } from 'react';
+
+import { FormatPropsWithoutI18n } from './createFormat';
+
+export { default as withI18n, withI18nProps } from './withI18n';
+
+export { default as I18nProvider } from './I18nProvider';
+export { default as Trans } from './Trans';
+export { Plural, Select, SelectOrdinal } from './Select';
+
+export const DateFormat: ComponentClass<FormatPropsWithoutI18n<Date, Intl.DateTimeFormatOptions>>;
+export const NumberFormat: ComponentClass<FormatPropsWithoutI18n<number, Intl.NumberFormatOptions>>;
+
+export function i18nMark(id: string): string;
diff --git a/types/lingui__react/lingui__react-tests.tsx b/types/lingui__react/lingui__react-tests.tsx
new file mode 100644
index 0000000000..3fc8cebebb
--- /dev/null
+++ b/types/lingui__react/lingui__react-tests.tsx
@@ -0,0 +1,102 @@
+import * as React from 'react';
+import { Catalog, Catalogs, I18n } from '@lingui/core';
+import {
+    withI18n,
+    I18nProvider,
+    Trans,
+    Plural,
+    Select,
+    SelectOrdinal,
+    DateFormat,
+    NumberFormat,
+    i18nMark
+} from '@lingui/react';
+
+const catalog: Catalog = {
+    messages: {
+        ageId(a) {
+            return [a('age'), 'años de edad'];
+        }
+    }
+};
+const catalogs: Catalogs = { es: catalog };
+
+interface LocalizeAttributeBaseProps {
+    i18n: I18n;
+    age: number;
+}
+
+const LocalizeAttributeBase = (props: LocalizeAttributeBaseProps) => {
+    const { i18n, age } = props;
+    return (
+        <span title={i18n.t`Age: ${age}`} aria-label={i18n.t('ageId')`${age} years old`}>Attributes</span>
+    );
+};
+
+const LocalizeAttribute = withI18n()(LocalizeAttributeBase);
+const LocalizeOptionAttribute = withI18n({ update: true, withRef: true, withHash: true })(LocalizeAttributeBase);
+
+const App = () => {
+    const name = 'Ken';
+    const numBooks = 58;
+    const gender = 'male';
+    const price = 21.35;
+    const lastLogin = new Date();
+    return (
+        <I18nProvider language="es" catalogs={catalogs}>
+            <LocalizeAttribute age={23} />
+            <LocalizeOptionAttribute age={23} />
+            <Trans>Name {name} in <code>Trans</code>.</Trans>
+            <Trans id="transId">Name {name} in <code>Trans</code> with <code>id</code>.</Trans>
+            <Plural id="msg.plural"
+                    value={numBooks}
+                    _0={<Trans>{name} has no books</Trans>}
+                    one={<Trans>{name} has # book</Trans>}
+                    other={<Trans>{name} has # books</Trans>}
+                    _999999="Just a string"
+            />
+            <Plural value={numBooks}
+                    _0={<Trans>{name} has no books</Trans>}
+                    one={<Trans>{name} has # book</Trans>}
+                    other={<Trans>{name} has # books</Trans>}
+                    _999999="Just a string"
+            />
+            <Select id="msg.select"
+                    value={gender}
+                    male={<Trans>{name} and his friends</Trans>}
+                    female={<Trans>{name} and her friends</Trans>}
+                    other={<Trans>{name} and their friends</Trans>}
+                    _999999="Just a string"
+            />
+            <Select value={gender}
+                    male={<Trans>{name} and his friends</Trans>}
+                    female={<Trans>{name} and her friends</Trans>}
+                    other={<Trans>{name} and their friends</Trans>}
+                    _999999="Just a string"
+            />
+            <SelectOrdinal id="msg.selectOrdinal"
+                           value={numBooks}
+                           _0={<Trans>No books from {name}</Trans>}
+                           one={<Trans>#st book from {name}</Trans>}
+                           two={<Trans>#nd book from {name}</Trans>}
+                           other={<Trans>#th book from {name}</Trans>}
+                           _999999="Just a string"
+            />
+            <SelectOrdinal value={numBooks}
+                           _0={<Trans>No books from {name}</Trans>}
+                           one={<Trans>#st book from {name}</Trans>}
+                           two={<Trans>#nd book from {name}</Trans>}
+                           other={<Trans>#th book from {name}</Trans>}
+                           _999999="Just a string"
+            />
+            <Trans>Last login on <DateFormat format={{ timeZone: 'UTC' }} value={lastLogin} />.</Trans>
+            <Trans>
+                Price of book: <NumberFormat
+                format={{ style: 'currency', currency: 'EUR', minimumFractionDigits: 2 }}
+                value={price} />.
+            </Trans>
+        </I18nProvider>
+    );
+};
+
+const mark: string = i18nMark('mark');
diff --git a/types/lingui__react/tsconfig.json b/types/lingui__react/tsconfig.json
new file mode 100644
index 0000000000..3b53ee659c
--- /dev/null
+++ b/types/lingui__react/tsconfig.json
@@ -0,0 +1,33 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@lingui/core": [
+                "lingui__core"
+            ],
+            "@lingui/react": [
+                "lingui__react"
+            ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "lingui__react-tests.tsx"
+    ]
+}
diff --git a/types/lingui__react/tslint.json b/types/lingui__react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/lingui__react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/lingui__react/withI18n.d.ts b/types/lingui__react/withI18n.d.ts
new file mode 100644
index 0000000000..00595ee2d5
--- /dev/null
+++ b/types/lingui__react/withI18n.d.ts
@@ -0,0 +1,18 @@
+import { ComponentClass, StatelessComponent } from 'react';
+import { I18n } from '@lingui/core';
+import { withI18nProps } from './withI18n';
+
+export type ComponentConstructor<P> = ComponentClass<P> | StatelessComponent<P>;
+
+export interface withI18nOptions {
+    update?: boolean;
+    withRef?: boolean;
+    withHash?: boolean;
+}
+
+export interface withI18nProps {
+    i18n: I18n;
+}
+
+export default function withI18n(options?: withI18nOptions):
+    <P>(WrappedComponent: ComponentConstructor<P>) => ComponentClass<Pick<P, Exclude<keyof P, keyof withI18nProps>>>;
diff --git a/types/local-storage/index.d.ts b/types/local-storage/index.d.ts
new file mode 100644
index 0000000000..3452837374
--- /dev/null
+++ b/types/local-storage/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for local-storage 1.4
+// Project: https://github.com/bevacqua/local-storage
+// Definitions by: Sasha Grin <https://github.com/tup1tsa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type Listener = (newValue: any, oldValue: any, url: string) => any;
+
+interface Accessor {
+    /**
+     * Invokes set if value is present and get otherwise
+     * https://github.com/bevacqua/local-storage#lskey-value
+     */
+    (key: string, value: any): boolean;
+    (key: string): any;
+
+    /**
+     * Internally uses JSON.parse to parse value from storage without try/catch
+     * https://github.com/bevacqua/local-storage#lsgetkey
+     */
+    get(key: string): any;
+
+    /**
+     * Internally uses JSON.stringify before saving.
+     * https://github.com/bevacqua/local-storage#lssetkey-value
+     */
+    set(key: string, value: any): boolean;
+
+    /** https://github.com/bevacqua/local-storage#lsremovekey */
+    remove(key: string): boolean;
+
+    /** https://github.com/bevacqua/local-storage#lsclear */
+    clear(): boolean;
+
+    /** https://github.com/bevacqua/local-storage#lsonkey-fn */
+    on(key: string, callback: Listener): void;
+
+    /** https://github.com/bevacqua/local-storage#lsoffkey-fn */
+    off(key: string, callback: Listener): void;
+}
+
+declare const accessor: Accessor;
+export = accessor;
diff --git a/types/local-storage/local-storage-tests.ts b/types/local-storage/local-storage-tests.ts
new file mode 100644
index 0000000000..410c3cac8e
--- /dev/null
+++ b/types/local-storage/local-storage-tests.ts
@@ -0,0 +1,13 @@
+import ls = require('local-storage');
+
+ls('foo');
+ls('foo', 'bar');
+ls.get('foo');
+ls.set('foo', 'bar');
+ls.remove('foo');
+ls.clear();
+
+const callback = (newValue: any, oldValue: any, url: string) => null;
+
+ls.on('foo', callback);
+ls.off('foo', callback);
diff --git a/types/local-storage/tsconfig.json b/types/local-storage/tsconfig.json
new file mode 100644
index 0000000000..f046bae993
--- /dev/null
+++ b/types/local-storage/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",
+        "local-storage-tests.ts"
+    ]
+}
diff --git a/types/local-storage/tslint.json b/types/local-storage/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/local-storage/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/lodash-es/index.d.ts b/types/lodash-es/index.d.ts
index 13695ae66b..3ea316d67b 100644
--- a/types/lodash-es/index.d.ts
+++ b/types/lodash-es/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.6
 
 export { default as add } from "./add";
 export { default as after } from "./after";
diff --git a/types/lodash.add/index.d.ts b/types/lodash.add/index.d.ts
index cf4d56c857..00d16b08e6 100644
--- a/types/lodash.add/index.d.ts
+++ b/types/lodash.add/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.after/index.d.ts b/types/lodash.after/index.d.ts
index 1ae97b9d14..6187f9676f 100644
--- a/types/lodash.after/index.d.ts
+++ b/types/lodash.after/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ary/index.d.ts b/types/lodash.ary/index.d.ts
index e531510b51..c55dadc0c1 100644
--- a/types/lodash.ary/index.d.ts
+++ b/types/lodash.ary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assign/index.d.ts b/types/lodash.assign/index.d.ts
index b67043e98d..fa4c94932f 100644
--- a/types/lodash.assign/index.d.ts
+++ b/types/lodash.assign/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assignin/index.d.ts b/types/lodash.assignin/index.d.ts
index 439719e86d..f7b2d7a70f 100644
--- a/types/lodash.assignin/index.d.ts
+++ b/types/lodash.assignin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assigninwith/index.d.ts b/types/lodash.assigninwith/index.d.ts
index accce5fc2b..6d4a04fd2b 100644
--- a/types/lodash.assigninwith/index.d.ts
+++ b/types/lodash.assigninwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.assignwith/index.d.ts b/types/lodash.assignwith/index.d.ts
index e7b5995e43..57600a053d 100644
--- a/types/lodash.assignwith/index.d.ts
+++ b/types/lodash.assignwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.at/index.d.ts b/types/lodash.at/index.d.ts
index 583429203d..edff6471b4 100644
--- a/types/lodash.at/index.d.ts
+++ b/types/lodash.at/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.attempt/index.d.ts b/types/lodash.attempt/index.d.ts
index e0ce882cfd..c6b29b05b4 100644
--- a/types/lodash.attempt/index.d.ts
+++ b/types/lodash.attempt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.before/index.d.ts b/types/lodash.before/index.d.ts
index de95e6b630..7e4add0ab1 100644
--- a/types/lodash.before/index.d.ts
+++ b/types/lodash.before/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bind/index.d.ts b/types/lodash.bind/index.d.ts
index 5d77adb483..c2a5d00e9e 100644
--- a/types/lodash.bind/index.d.ts
+++ b/types/lodash.bind/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bindall/index.d.ts b/types/lodash.bindall/index.d.ts
index 3b82e474d7..183812c630 100644
--- a/types/lodash.bindall/index.d.ts
+++ b/types/lodash.bindall/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.bindkey/index.d.ts b/types/lodash.bindkey/index.d.ts
index 409f354486..6ba68efdec 100644
--- a/types/lodash.bindkey/index.d.ts
+++ b/types/lodash.bindkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.camelcase/index.d.ts b/types/lodash.camelcase/index.d.ts
index 84db84fcbd..cac7ee844d 100644
--- a/types/lodash.camelcase/index.d.ts
+++ b/types/lodash.camelcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.capitalize/index.d.ts b/types/lodash.capitalize/index.d.ts
index 6947e9d64e..a6fc0db0a2 100644
--- a/types/lodash.capitalize/index.d.ts
+++ b/types/lodash.capitalize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.castarray/index.d.ts b/types/lodash.castarray/index.d.ts
index 9e4c42e74f..8173acc5bb 100644
--- a/types/lodash.castarray/index.d.ts
+++ b/types/lodash.castarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ceil/index.d.ts b/types/lodash.ceil/index.d.ts
index 7f20ecb363..fece48100d 100644
--- a/types/lodash.ceil/index.d.ts
+++ b/types/lodash.ceil/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.chunk/index.d.ts b/types/lodash.chunk/index.d.ts
index d075dd66a7..a6907e5bae 100644
--- a/types/lodash.chunk/index.d.ts
+++ b/types/lodash.chunk/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clamp/index.d.ts b/types/lodash.clamp/index.d.ts
index 77147ed5cd..402cebf9e6 100644
--- a/types/lodash.clamp/index.d.ts
+++ b/types/lodash.clamp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clone/index.d.ts b/types/lodash.clone/index.d.ts
index b4d0bc67a9..8517afee09 100644
--- a/types/lodash.clone/index.d.ts
+++ b/types/lodash.clone/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonedeep/index.d.ts b/types/lodash.clonedeep/index.d.ts
index 963377d1d3..a1766a12e5 100644
--- a/types/lodash.clonedeep/index.d.ts
+++ b/types/lodash.clonedeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonedeepwith/index.d.ts b/types/lodash.clonedeepwith/index.d.ts
index 6447552df4..0977563508 100644
--- a/types/lodash.clonedeepwith/index.d.ts
+++ b/types/lodash.clonedeepwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.clonewith/index.d.ts b/types/lodash.clonewith/index.d.ts
index f59a907439..0caf99deb8 100644
--- a/types/lodash.clonewith/index.d.ts
+++ b/types/lodash.clonewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.compact/index.d.ts b/types/lodash.compact/index.d.ts
index 050b20533d..7ed354f717 100644
--- a/types/lodash.compact/index.d.ts
+++ b/types/lodash.compact/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.concat/index.d.ts b/types/lodash.concat/index.d.ts
index 7cfb3874a1..8c88e834a7 100644
--- a/types/lodash.concat/index.d.ts
+++ b/types/lodash.concat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.cond/index.d.ts b/types/lodash.cond/index.d.ts
index 0322422601..8570a945da 100644
--- a/types/lodash.cond/index.d.ts
+++ b/types/lodash.cond/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.constant/index.d.ts b/types/lodash.constant/index.d.ts
index e9ee61b0c7..15a624e90e 100644
--- a/types/lodash.constant/index.d.ts
+++ b/types/lodash.constant/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.countby/index.d.ts b/types/lodash.countby/index.d.ts
index e3ebd4821e..5d352a8b48 100644
--- a/types/lodash.countby/index.d.ts
+++ b/types/lodash.countby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.create/index.d.ts b/types/lodash.create/index.d.ts
index 84ad457cec..5be60d77f3 100644
--- a/types/lodash.create/index.d.ts
+++ b/types/lodash.create/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.curry/index.d.ts b/types/lodash.curry/index.d.ts
index bf3c1875e1..9f00457f3f 100644
--- a/types/lodash.curry/index.d.ts
+++ b/types/lodash.curry/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.curryright/index.d.ts b/types/lodash.curryright/index.d.ts
index 2ed61f1770..a19422b8cc 100644
--- a/types/lodash.curryright/index.d.ts
+++ b/types/lodash.curryright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.debounce/index.d.ts b/types/lodash.debounce/index.d.ts
index ed9bc53bbe..c6e5fe52cb 100644
--- a/types/lodash.debounce/index.d.ts
+++ b/types/lodash.debounce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.deburr/index.d.ts b/types/lodash.deburr/index.d.ts
index 3e174b1751..c75b793a43 100644
--- a/types/lodash.deburr/index.d.ts
+++ b/types/lodash.deburr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defaults/index.d.ts b/types/lodash.defaults/index.d.ts
index cd51c34dfd..85309c3f62 100644
--- a/types/lodash.defaults/index.d.ts
+++ b/types/lodash.defaults/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defaultsdeep/index.d.ts b/types/lodash.defaultsdeep/index.d.ts
index 70520ce9d2..8fd5eceea6 100644
--- a/types/lodash.defaultsdeep/index.d.ts
+++ b/types/lodash.defaultsdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.defer/index.d.ts b/types/lodash.defer/index.d.ts
index 92dff1c42a..1ba71f43a6 100644
--- a/types/lodash.defer/index.d.ts
+++ b/types/lodash.defer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.delay/index.d.ts b/types/lodash.delay/index.d.ts
index b1397d5842..b6d6dc253d 100644
--- a/types/lodash.delay/index.d.ts
+++ b/types/lodash.delay/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.difference/index.d.ts b/types/lodash.difference/index.d.ts
index b71232c680..8584bdc360 100644
--- a/types/lodash.difference/index.d.ts
+++ b/types/lodash.difference/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.differenceby/index.d.ts b/types/lodash.differenceby/index.d.ts
index 5ee942c04f..c72ec8a20e 100644
--- a/types/lodash.differenceby/index.d.ts
+++ b/types/lodash.differenceby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.differencewith/index.d.ts b/types/lodash.differencewith/index.d.ts
index 6229b0e1f4..f1dbdf9e06 100644
--- a/types/lodash.differencewith/index.d.ts
+++ b/types/lodash.differencewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.divide/index.d.ts b/types/lodash.divide/index.d.ts
index be1cd64bdc..d111dae3b6 100644
--- a/types/lodash.divide/index.d.ts
+++ b/types/lodash.divide/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.drop/index.d.ts b/types/lodash.drop/index.d.ts
index 8a5394de1b..49734fc833 100644
--- a/types/lodash.drop/index.d.ts
+++ b/types/lodash.drop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.dropright/index.d.ts b/types/lodash.dropright/index.d.ts
index 71fb6fa56f..7239b9ebfa 100644
--- a/types/lodash.dropright/index.d.ts
+++ b/types/lodash.dropright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.droprightwhile/index.d.ts b/types/lodash.droprightwhile/index.d.ts
index 0235d60521..4ccfa00c7f 100644
--- a/types/lodash.droprightwhile/index.d.ts
+++ b/types/lodash.droprightwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.dropwhile/index.d.ts b/types/lodash.dropwhile/index.d.ts
index 221c4daacf..4dcc629786 100644
--- a/types/lodash.dropwhile/index.d.ts
+++ b/types/lodash.dropwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.endswith/index.d.ts b/types/lodash.endswith/index.d.ts
index e8cb7b1474..14c8d65424 100644
--- a/types/lodash.endswith/index.d.ts
+++ b/types/lodash.endswith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.eq/index.d.ts b/types/lodash.eq/index.d.ts
index c70a65c000..db03c67aa4 100644
--- a/types/lodash.eq/index.d.ts
+++ b/types/lodash.eq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.escape/index.d.ts b/types/lodash.escape/index.d.ts
index c728b36aa3..6df7eda743 100644
--- a/types/lodash.escape/index.d.ts
+++ b/types/lodash.escape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.escaperegexp/index.d.ts b/types/lodash.escaperegexp/index.d.ts
index 2ddabe7909..eff6aeb8d8 100644
--- a/types/lodash.escaperegexp/index.d.ts
+++ b/types/lodash.escaperegexp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.every/index.d.ts b/types/lodash.every/index.d.ts
index c59fdc2c6f..3106368cb8 100644
--- a/types/lodash.every/index.d.ts
+++ b/types/lodash.every/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.fill/index.d.ts b/types/lodash.fill/index.d.ts
index 179d88d23c..6a7f90cf09 100644
--- a/types/lodash.fill/index.d.ts
+++ b/types/lodash.fill/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.filter/index.d.ts b/types/lodash.filter/index.d.ts
index 210e450a5c..e5a3859a0e 100644
--- a/types/lodash.filter/index.d.ts
+++ b/types/lodash.filter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.find/index.d.ts b/types/lodash.find/index.d.ts
index dd0415380d..4b4b1f20c9 100644
--- a/types/lodash.find/index.d.ts
+++ b/types/lodash.find/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findindex/index.d.ts b/types/lodash.findindex/index.d.ts
index 94968a8c8e..2f935455ce 100644
--- a/types/lodash.findindex/index.d.ts
+++ b/types/lodash.findindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findkey/index.d.ts b/types/lodash.findkey/index.d.ts
index 14aec1059c..2aa119a378 100644
--- a/types/lodash.findkey/index.d.ts
+++ b/types/lodash.findkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlast/index.d.ts b/types/lodash.findlast/index.d.ts
index 6943ff76e7..6d1d0ef3ab 100644
--- a/types/lodash.findlast/index.d.ts
+++ b/types/lodash.findlast/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlastindex/index.d.ts b/types/lodash.findlastindex/index.d.ts
index 1e28a3227b..3d603cf6ff 100644
--- a/types/lodash.findlastindex/index.d.ts
+++ b/types/lodash.findlastindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.findlastkey/index.d.ts b/types/lodash.findlastkey/index.d.ts
index 5cb63dd295..4708fba2cb 100644
--- a/types/lodash.findlastkey/index.d.ts
+++ b/types/lodash.findlastkey/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.first/index.d.ts b/types/lodash.first/index.d.ts
index 7db99885f0..7a14e5fc40 100644
--- a/types/lodash.first/index.d.ts
+++ b/types/lodash.first/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmap/index.d.ts b/types/lodash.flatmap/index.d.ts
index 2a17dd14cb..b934345e81 100644
--- a/types/lodash.flatmap/index.d.ts
+++ b/types/lodash.flatmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmapdeep/index.d.ts b/types/lodash.flatmapdeep/index.d.ts
index aecfd03b25..0d70f9138e 100644
--- a/types/lodash.flatmapdeep/index.d.ts
+++ b/types/lodash.flatmapdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatmapdepth/index.d.ts b/types/lodash.flatmapdepth/index.d.ts
index c478b9cf9c..b5f690e357 100644
--- a/types/lodash.flatmapdepth/index.d.ts
+++ b/types/lodash.flatmapdepth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flatten/index.d.ts b/types/lodash.flatten/index.d.ts
index 7eb99d2252..766108b8b8 100644
--- a/types/lodash.flatten/index.d.ts
+++ b/types/lodash.flatten/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flattendeep/index.d.ts b/types/lodash.flattendeep/index.d.ts
index 81eb64304e..9cd6dd213a 100644
--- a/types/lodash.flattendeep/index.d.ts
+++ b/types/lodash.flattendeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flattendepth/index.d.ts b/types/lodash.flattendepth/index.d.ts
index c1e6250db6..b8de6e67bb 100644
--- a/types/lodash.flattendepth/index.d.ts
+++ b/types/lodash.flattendepth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flip/index.d.ts b/types/lodash.flip/index.d.ts
index 9a6d9104a2..4dedd9c4a4 100644
--- a/types/lodash.flip/index.d.ts
+++ b/types/lodash.flip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.floor/index.d.ts b/types/lodash.floor/index.d.ts
index 349cea39cc..6e906c8527 100644
--- a/types/lodash.floor/index.d.ts
+++ b/types/lodash.floor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flow/index.d.ts b/types/lodash.flow/index.d.ts
index 4a39afe588..905b15658a 100644
--- a/types/lodash.flow/index.d.ts
+++ b/types/lodash.flow/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.flowright/index.d.ts b/types/lodash.flowright/index.d.ts
index 7b3ea759f6..1448c48053 100644
--- a/types/lodash.flowright/index.d.ts
+++ b/types/lodash.flowright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.foreach/index.d.ts b/types/lodash.foreach/index.d.ts
index c3d4641a4a..32068bef80 100644
--- a/types/lodash.foreach/index.d.ts
+++ b/types/lodash.foreach/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.foreachright/index.d.ts b/types/lodash.foreachright/index.d.ts
index 682378c876..d0838f880b 100644
--- a/types/lodash.foreachright/index.d.ts
+++ b/types/lodash.foreachright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forin/index.d.ts b/types/lodash.forin/index.d.ts
index 7f822797ec..15160e9b11 100644
--- a/types/lodash.forin/index.d.ts
+++ b/types/lodash.forin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forinright/index.d.ts b/types/lodash.forinright/index.d.ts
index 115d09d658..ca16e9d84f 100644
--- a/types/lodash.forinright/index.d.ts
+++ b/types/lodash.forinright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forown/index.d.ts b/types/lodash.forown/index.d.ts
index 54aadc20e7..ee2c6fa068 100644
--- a/types/lodash.forown/index.d.ts
+++ b/types/lodash.forown/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.forownright/index.d.ts b/types/lodash.forownright/index.d.ts
index 4a3aa0bf0b..63311de202 100644
--- a/types/lodash.forownright/index.d.ts
+++ b/types/lodash.forownright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.frompairs/index.d.ts b/types/lodash.frompairs/index.d.ts
index 19928340e7..23df262b5b 100644
--- a/types/lodash.frompairs/index.d.ts
+++ b/types/lodash.frompairs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.functions/index.d.ts b/types/lodash.functions/index.d.ts
index bb77ea1251..774965a4e0 100644
--- a/types/lodash.functions/index.d.ts
+++ b/types/lodash.functions/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.functionsin/index.d.ts b/types/lodash.functionsin/index.d.ts
index cebc553525..ff8e82356a 100644
--- a/types/lodash.functionsin/index.d.ts
+++ b/types/lodash.functionsin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.get/index.d.ts b/types/lodash.get/index.d.ts
index a6d4a9be1f..b961e34f87 100644
--- a/types/lodash.get/index.d.ts
+++ b/types/lodash.get/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.groupby/index.d.ts b/types/lodash.groupby/index.d.ts
index eb0f85d289..bae0166900 100644
--- a/types/lodash.groupby/index.d.ts
+++ b/types/lodash.groupby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.gt/index.d.ts b/types/lodash.gt/index.d.ts
index 6938b03faa..3da1ad1633 100644
--- a/types/lodash.gt/index.d.ts
+++ b/types/lodash.gt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.gte/index.d.ts b/types/lodash.gte/index.d.ts
index 73e4deb68c..78de8e60df 100644
--- a/types/lodash.gte/index.d.ts
+++ b/types/lodash.gte/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.has/index.d.ts b/types/lodash.has/index.d.ts
index 67e575b4ff..c2f5da7951 100644
--- a/types/lodash.has/index.d.ts
+++ b/types/lodash.has/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.hasin/index.d.ts b/types/lodash.hasin/index.d.ts
index 99aadf474b..619bc11335 100644
--- a/types/lodash.hasin/index.d.ts
+++ b/types/lodash.hasin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.head/index.d.ts b/types/lodash.head/index.d.ts
index c6afdb8bc4..7060dea1bc 100644
--- a/types/lodash.head/index.d.ts
+++ b/types/lodash.head/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.identity/index.d.ts b/types/lodash.identity/index.d.ts
index 110c86e51a..65a568a732 100644
--- a/types/lodash.identity/index.d.ts
+++ b/types/lodash.identity/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.includes/index.d.ts b/types/lodash.includes/index.d.ts
index aa04de2f79..627a174174 100644
--- a/types/lodash.includes/index.d.ts
+++ b/types/lodash.includes/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.indexof/index.d.ts b/types/lodash.indexof/index.d.ts
index e15360bb80..98267c8c95 100644
--- a/types/lodash.indexof/index.d.ts
+++ b/types/lodash.indexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.initial/index.d.ts b/types/lodash.initial/index.d.ts
index 1f194debe3..8e4554e85f 100644
--- a/types/lodash.initial/index.d.ts
+++ b/types/lodash.initial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.inrange/index.d.ts b/types/lodash.inrange/index.d.ts
index 94e7f73542..66ffbcf901 100644
--- a/types/lodash.inrange/index.d.ts
+++ b/types/lodash.inrange/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersection/index.d.ts b/types/lodash.intersection/index.d.ts
index 2859ce8356..db56bd9ad9 100644
--- a/types/lodash.intersection/index.d.ts
+++ b/types/lodash.intersection/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersectionby/index.d.ts b/types/lodash.intersectionby/index.d.ts
index 3c511c9df5..0b17495dd1 100644
--- a/types/lodash.intersectionby/index.d.ts
+++ b/types/lodash.intersectionby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.intersectionwith/index.d.ts b/types/lodash.intersectionwith/index.d.ts
index 5330a706ab..646f60b95b 100644
--- a/types/lodash.intersectionwith/index.d.ts
+++ b/types/lodash.intersectionwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invert/index.d.ts b/types/lodash.invert/index.d.ts
index 4d53ea9262..d87b20287d 100644
--- a/types/lodash.invert/index.d.ts
+++ b/types/lodash.invert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invertby/index.d.ts b/types/lodash.invertby/index.d.ts
index cfcd2b081a..eb7eb2ee2a 100644
--- a/types/lodash.invertby/index.d.ts
+++ b/types/lodash.invertby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invoke/index.d.ts b/types/lodash.invoke/index.d.ts
index 830cf62111..c912aa0666 100644
--- a/types/lodash.invoke/index.d.ts
+++ b/types/lodash.invoke/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.invokemap/index.d.ts b/types/lodash.invokemap/index.d.ts
index 2d900e2df8..3b910216e2 100644
--- a/types/lodash.invokemap/index.d.ts
+++ b/types/lodash.invokemap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarguments/index.d.ts b/types/lodash.isarguments/index.d.ts
index e18ec066fb..683cfa2f41 100644
--- a/types/lodash.isarguments/index.d.ts
+++ b/types/lodash.isarguments/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarray/index.d.ts b/types/lodash.isarray/index.d.ts
index ac20907ca5..0a8cc51877 100644
--- a/types/lodash.isarray/index.d.ts
+++ b/types/lodash.isarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraybuffer/index.d.ts b/types/lodash.isarraybuffer/index.d.ts
index 281039c9d3..0d9180fa3c 100644
--- a/types/lodash.isarraybuffer/index.d.ts
+++ b/types/lodash.isarraybuffer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraylike/index.d.ts b/types/lodash.isarraylike/index.d.ts
index ab3faedb29..d7d826b62c 100644
--- a/types/lodash.isarraylike/index.d.ts
+++ b/types/lodash.isarraylike/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isarraylikeobject/index.d.ts b/types/lodash.isarraylikeobject/index.d.ts
index 14c1e379ac..e817ab932b 100644
--- a/types/lodash.isarraylikeobject/index.d.ts
+++ b/types/lodash.isarraylikeobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isboolean/index.d.ts b/types/lodash.isboolean/index.d.ts
index 0c7f7072e5..1870287eea 100644
--- a/types/lodash.isboolean/index.d.ts
+++ b/types/lodash.isboolean/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isbuffer/index.d.ts b/types/lodash.isbuffer/index.d.ts
index bcd8e847d9..eff600740f 100644
--- a/types/lodash.isbuffer/index.d.ts
+++ b/types/lodash.isbuffer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isdate/index.d.ts b/types/lodash.isdate/index.d.ts
index c3e8765c79..c41e8d5130 100644
--- a/types/lodash.isdate/index.d.ts
+++ b/types/lodash.isdate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iselement/index.d.ts b/types/lodash.iselement/index.d.ts
index 9d37c9f6a3..e1295e1136 100644
--- a/types/lodash.iselement/index.d.ts
+++ b/types/lodash.iselement/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isempty/index.d.ts b/types/lodash.isempty/index.d.ts
index acda30346c..3ce119387f 100644
--- a/types/lodash.isempty/index.d.ts
+++ b/types/lodash.isempty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isequal/index.d.ts b/types/lodash.isequal/index.d.ts
index 27e871a425..07fc7af364 100644
--- a/types/lodash.isequal/index.d.ts
+++ b/types/lodash.isequal/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isequalwith/index.d.ts b/types/lodash.isequalwith/index.d.ts
index e283b51d7f..2d3b4bcbbe 100644
--- a/types/lodash.isequalwith/index.d.ts
+++ b/types/lodash.isequalwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iserror/index.d.ts b/types/lodash.iserror/index.d.ts
index 6e2eb3947c..ed6fd0cbb1 100644
--- a/types/lodash.iserror/index.d.ts
+++ b/types/lodash.iserror/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isfinite/index.d.ts b/types/lodash.isfinite/index.d.ts
index 4c43de9347..f45109c32b 100644
--- a/types/lodash.isfinite/index.d.ts
+++ b/types/lodash.isfinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isfunction/index.d.ts b/types/lodash.isfunction/index.d.ts
index a375218990..3930b74f24 100644
--- a/types/lodash.isfunction/index.d.ts
+++ b/types/lodash.isfunction/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isinteger/index.d.ts b/types/lodash.isinteger/index.d.ts
index c8a6a693f7..284bedd3ac 100644
--- a/types/lodash.isinteger/index.d.ts
+++ b/types/lodash.isinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.islength/index.d.ts b/types/lodash.islength/index.d.ts
index c5130042d2..8e4b70ebbc 100644
--- a/types/lodash.islength/index.d.ts
+++ b/types/lodash.islength/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismap/index.d.ts b/types/lodash.ismap/index.d.ts
index 2ce5560325..59de035b0d 100644
--- a/types/lodash.ismap/index.d.ts
+++ b/types/lodash.ismap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismatch/index.d.ts b/types/lodash.ismatch/index.d.ts
index 5ee7eaaf3f..a551e40bdb 100644
--- a/types/lodash.ismatch/index.d.ts
+++ b/types/lodash.ismatch/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ismatchwith/index.d.ts b/types/lodash.ismatchwith/index.d.ts
index 1622ed59b5..12c28e91d0 100644
--- a/types/lodash.ismatchwith/index.d.ts
+++ b/types/lodash.ismatchwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnan/index.d.ts b/types/lodash.isnan/index.d.ts
index 24e826a815..8f91fd9fe4 100644
--- a/types/lodash.isnan/index.d.ts
+++ b/types/lodash.isnan/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnative/index.d.ts b/types/lodash.isnative/index.d.ts
index 48d0a3c53f..79a21741b6 100644
--- a/types/lodash.isnative/index.d.ts
+++ b/types/lodash.isnative/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnil/index.d.ts b/types/lodash.isnil/index.d.ts
index 8782f0aa5b..07878b327c 100644
--- a/types/lodash.isnil/index.d.ts
+++ b/types/lodash.isnil/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnull/index.d.ts b/types/lodash.isnull/index.d.ts
index 58d5bdb2ce..82b0e5c73b 100644
--- a/types/lodash.isnull/index.d.ts
+++ b/types/lodash.isnull/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isnumber/index.d.ts b/types/lodash.isnumber/index.d.ts
index 36b7de6eb1..e49243cb92 100644
--- a/types/lodash.isnumber/index.d.ts
+++ b/types/lodash.isnumber/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isobject/index.d.ts b/types/lodash.isobject/index.d.ts
index 902998daa4..0fac0100ea 100644
--- a/types/lodash.isobject/index.d.ts
+++ b/types/lodash.isobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isobjectlike/index.d.ts b/types/lodash.isobjectlike/index.d.ts
index 797b274722..de57ad36b1 100644
--- a/types/lodash.isobjectlike/index.d.ts
+++ b/types/lodash.isobjectlike/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isplainobject/index.d.ts b/types/lodash.isplainobject/index.d.ts
index 669b9b7f41..13b2a28614 100644
--- a/types/lodash.isplainobject/index.d.ts
+++ b/types/lodash.isplainobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isregexp/index.d.ts b/types/lodash.isregexp/index.d.ts
index b8fc8f3277..bd5056a919 100644
--- a/types/lodash.isregexp/index.d.ts
+++ b/types/lodash.isregexp/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.issafeinteger/index.d.ts b/types/lodash.issafeinteger/index.d.ts
index e51dc9d86e..e0cf8e9aeb 100644
--- a/types/lodash.issafeinteger/index.d.ts
+++ b/types/lodash.issafeinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isset/index.d.ts b/types/lodash.isset/index.d.ts
index ae2fd521ea..34bbe7b6b7 100644
--- a/types/lodash.isset/index.d.ts
+++ b/types/lodash.isset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isstring/index.d.ts b/types/lodash.isstring/index.d.ts
index e449e3cd93..a2ccd5c3aa 100644
--- a/types/lodash.isstring/index.d.ts
+++ b/types/lodash.isstring/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.issymbol/index.d.ts b/types/lodash.issymbol/index.d.ts
index 3e7bcdc20e..4e7938ac12 100644
--- a/types/lodash.issymbol/index.d.ts
+++ b/types/lodash.issymbol/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.istypedarray/index.d.ts b/types/lodash.istypedarray/index.d.ts
index eda11a9bfd..e66c1b8591 100644
--- a/types/lodash.istypedarray/index.d.ts
+++ b/types/lodash.istypedarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isundefined/index.d.ts b/types/lodash.isundefined/index.d.ts
index e20ed9994d..3eb831c31d 100644
--- a/types/lodash.isundefined/index.d.ts
+++ b/types/lodash.isundefined/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isweakmap/index.d.ts b/types/lodash.isweakmap/index.d.ts
index 67cd9bd5cc..da7a801f7b 100644
--- a/types/lodash.isweakmap/index.d.ts
+++ b/types/lodash.isweakmap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.isweakset/index.d.ts b/types/lodash.isweakset/index.d.ts
index 68838c2b0a..aba0c5c1ea 100644
--- a/types/lodash.isweakset/index.d.ts
+++ b/types/lodash.isweakset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.iteratee/index.d.ts b/types/lodash.iteratee/index.d.ts
index 80c826d910..bb4f570b04 100644
--- a/types/lodash.iteratee/index.d.ts
+++ b/types/lodash.iteratee/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.join/index.d.ts b/types/lodash.join/index.d.ts
index aeaad585ad..d3c396c919 100644
--- a/types/lodash.join/index.d.ts
+++ b/types/lodash.join/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.kebabcase/index.d.ts b/types/lodash.kebabcase/index.d.ts
index c0e85de37d..3ebd5c0bac 100644
--- a/types/lodash.kebabcase/index.d.ts
+++ b/types/lodash.kebabcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keyby/index.d.ts b/types/lodash.keyby/index.d.ts
index a2d4a8cd99..cdfe5b371f 100644
--- a/types/lodash.keyby/index.d.ts
+++ b/types/lodash.keyby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keys/index.d.ts b/types/lodash.keys/index.d.ts
index 50adc1e081..c29e6dd6a2 100644
--- a/types/lodash.keys/index.d.ts
+++ b/types/lodash.keys/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.keysin/index.d.ts b/types/lodash.keysin/index.d.ts
index 26a053b7ad..3bae82e618 100644
--- a/types/lodash.keysin/index.d.ts
+++ b/types/lodash.keysin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.last/index.d.ts b/types/lodash.last/index.d.ts
index 32d4639f29..40507c89a6 100644
--- a/types/lodash.last/index.d.ts
+++ b/types/lodash.last/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lastindexof/index.d.ts b/types/lodash.lastindexof/index.d.ts
index f91f201f00..0f4bd029d1 100644
--- a/types/lodash.lastindexof/index.d.ts
+++ b/types/lodash.lastindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lowercase/index.d.ts b/types/lodash.lowercase/index.d.ts
index 6cd4d3a7ea..8fd634dce9 100644
--- a/types/lodash.lowercase/index.d.ts
+++ b/types/lodash.lowercase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lowerfirst/index.d.ts b/types/lodash.lowerfirst/index.d.ts
index 6d13ec3e95..ec21074bc8 100644
--- a/types/lodash.lowerfirst/index.d.ts
+++ b/types/lodash.lowerfirst/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lt/index.d.ts b/types/lodash.lt/index.d.ts
index 2fe1c396bc..76e9f7232a 100644
--- a/types/lodash.lt/index.d.ts
+++ b/types/lodash.lt/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.lte/index.d.ts b/types/lodash.lte/index.d.ts
index 3528d7671b..5f41829f56 100644
--- a/types/lodash.lte/index.d.ts
+++ b/types/lodash.lte/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mapkeys/index.d.ts b/types/lodash.mapkeys/index.d.ts
index cc6f6823a8..2da90122d3 100644
--- a/types/lodash.mapkeys/index.d.ts
+++ b/types/lodash.mapkeys/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mapvalues/index.d.ts b/types/lodash.mapvalues/index.d.ts
index 2defd677fe..c1c8339228 100644
--- a/types/lodash.mapvalues/index.d.ts
+++ b/types/lodash.mapvalues/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.matches/index.d.ts b/types/lodash.matches/index.d.ts
index 9d28a8aa5b..7825c18641 100644
--- a/types/lodash.matches/index.d.ts
+++ b/types/lodash.matches/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.matchesproperty/index.d.ts b/types/lodash.matchesproperty/index.d.ts
index 36c3250256..f507730b82 100644
--- a/types/lodash.matchesproperty/index.d.ts
+++ b/types/lodash.matchesproperty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.max/index.d.ts b/types/lodash.max/index.d.ts
index fd01d46610..3082ad8431 100644
--- a/types/lodash.max/index.d.ts
+++ b/types/lodash.max/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.maxby/index.d.ts b/types/lodash.maxby/index.d.ts
index b465d155d7..ad7950063a 100644
--- a/types/lodash.maxby/index.d.ts
+++ b/types/lodash.maxby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mean/index.d.ts b/types/lodash.mean/index.d.ts
index 05b99d9695..41d1e354db 100644
--- a/types/lodash.mean/index.d.ts
+++ b/types/lodash.mean/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.meanby/index.d.ts b/types/lodash.meanby/index.d.ts
index a069413179..3eee444d11 100644
--- a/types/lodash.meanby/index.d.ts
+++ b/types/lodash.meanby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.memoize/index.d.ts b/types/lodash.memoize/index.d.ts
index 5360723233..415e831a9c 100644
--- a/types/lodash.memoize/index.d.ts
+++ b/types/lodash.memoize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.merge/index.d.ts b/types/lodash.merge/index.d.ts
index 898e1064a6..a4c293fda9 100644
--- a/types/lodash.merge/index.d.ts
+++ b/types/lodash.merge/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mergewith/index.d.ts b/types/lodash.mergewith/index.d.ts
index 3cfba6ef0c..7a6eff8ac1 100644
--- a/types/lodash.mergewith/index.d.ts
+++ b/types/lodash.mergewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.method/index.d.ts b/types/lodash.method/index.d.ts
index bf30adcae7..1ca04640dd 100644
--- a/types/lodash.method/index.d.ts
+++ b/types/lodash.method/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.methodof/index.d.ts b/types/lodash.methodof/index.d.ts
index 16ceaf50fd..de42a138d7 100644
--- a/types/lodash.methodof/index.d.ts
+++ b/types/lodash.methodof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.min/index.d.ts b/types/lodash.min/index.d.ts
index 55019b86c8..0aee524043 100644
--- a/types/lodash.min/index.d.ts
+++ b/types/lodash.min/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.minby/index.d.ts b/types/lodash.minby/index.d.ts
index a3acf0b5bc..d76ec94610 100644
--- a/types/lodash.minby/index.d.ts
+++ b/types/lodash.minby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.mixin/index.d.ts b/types/lodash.mixin/index.d.ts
index 43c70210a4..cb702b1640 100644
--- a/types/lodash.mixin/index.d.ts
+++ b/types/lodash.mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.negate/index.d.ts b/types/lodash.negate/index.d.ts
index cf5f8ede55..aaf870172e 100644
--- a/types/lodash.negate/index.d.ts
+++ b/types/lodash.negate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.noop/index.d.ts b/types/lodash.noop/index.d.ts
index a453235435..06d52fa333 100644
--- a/types/lodash.noop/index.d.ts
+++ b/types/lodash.noop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.now/index.d.ts b/types/lodash.now/index.d.ts
index 9949432edc..a8fd64978a 100644
--- a/types/lodash.now/index.d.ts
+++ b/types/lodash.now/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.nth/index.d.ts b/types/lodash.nth/index.d.ts
index 9ec5caf822..106f634cab 100644
--- a/types/lodash.nth/index.d.ts
+++ b/types/lodash.nth/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.ntharg/index.d.ts b/types/lodash.ntharg/index.d.ts
index d3f152f32c..587f9418b6 100644
--- a/types/lodash.ntharg/index.d.ts
+++ b/types/lodash.ntharg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.omit/index.d.ts b/types/lodash.omit/index.d.ts
index 73930dd4e4..945fd29746 100644
--- a/types/lodash.omit/index.d.ts
+++ b/types/lodash.omit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.omitby/index.d.ts b/types/lodash.omitby/index.d.ts
index 869ef1af22..7e5ff364a0 100644
--- a/types/lodash.omitby/index.d.ts
+++ b/types/lodash.omitby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.once/index.d.ts b/types/lodash.once/index.d.ts
index f12e9c4804..cc1b543125 100644
--- a/types/lodash.once/index.d.ts
+++ b/types/lodash.once/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.orderby/index.d.ts b/types/lodash.orderby/index.d.ts
index cf9d775606..4f44153aaf 100644
--- a/types/lodash.orderby/index.d.ts
+++ b/types/lodash.orderby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.over/index.d.ts b/types/lodash.over/index.d.ts
index 69d1b48ba4..bd9622c09e 100644
--- a/types/lodash.over/index.d.ts
+++ b/types/lodash.over/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.overargs/index.d.ts b/types/lodash.overargs/index.d.ts
index 303bb623c5..014718136d 100644
--- a/types/lodash.overargs/index.d.ts
+++ b/types/lodash.overargs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.overevery/index.d.ts b/types/lodash.overevery/index.d.ts
index a6c165e00f..5c1c41e4c3 100644
--- a/types/lodash.overevery/index.d.ts
+++ b/types/lodash.overevery/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.oversome/index.d.ts b/types/lodash.oversome/index.d.ts
index 66504f71b8..62debc56ed 100644
--- a/types/lodash.oversome/index.d.ts
+++ b/types/lodash.oversome/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pad/index.d.ts b/types/lodash.pad/index.d.ts
index ed988734f3..a839afa7b8 100644
--- a/types/lodash.pad/index.d.ts
+++ b/types/lodash.pad/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.padend/index.d.ts b/types/lodash.padend/index.d.ts
index 913dc6f2e1..403eb20f4e 100644
--- a/types/lodash.padend/index.d.ts
+++ b/types/lodash.padend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.padstart/index.d.ts b/types/lodash.padstart/index.d.ts
index 89ea86a238..d7a53dc384 100644
--- a/types/lodash.padstart/index.d.ts
+++ b/types/lodash.padstart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.parseint/index.d.ts b/types/lodash.parseint/index.d.ts
index a12494974f..a484898083 100644
--- a/types/lodash.parseint/index.d.ts
+++ b/types/lodash.parseint/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partial/index.d.ts b/types/lodash.partial/index.d.ts
index 016722790f..e359b2e88d 100644
--- a/types/lodash.partial/index.d.ts
+++ b/types/lodash.partial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partialright/index.d.ts b/types/lodash.partialright/index.d.ts
index 1f750892dc..9a611e74a4 100644
--- a/types/lodash.partialright/index.d.ts
+++ b/types/lodash.partialright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.partition/index.d.ts b/types/lodash.partition/index.d.ts
index 15f7fe78c7..00d4217734 100644
--- a/types/lodash.partition/index.d.ts
+++ b/types/lodash.partition/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pick/index.d.ts b/types/lodash.pick/index.d.ts
index d8e9744b37..df8123935c 100644
--- a/types/lodash.pick/index.d.ts
+++ b/types/lodash.pick/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pickby/index.d.ts b/types/lodash.pickby/index.d.ts
index fba3a8aaa9..f645edf4af 100644
--- a/types/lodash.pickby/index.d.ts
+++ b/types/lodash.pickby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.property/index.d.ts b/types/lodash.property/index.d.ts
index 96a0a281c1..db33432a2b 100644
--- a/types/lodash.property/index.d.ts
+++ b/types/lodash.property/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.propertyof/index.d.ts b/types/lodash.propertyof/index.d.ts
index 1037d965e6..bc577bb158 100644
--- a/types/lodash.propertyof/index.d.ts
+++ b/types/lodash.propertyof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pull/index.d.ts b/types/lodash.pull/index.d.ts
index 4b2a7a53c1..ea8d9ce465 100644
--- a/types/lodash.pull/index.d.ts
+++ b/types/lodash.pull/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullall/index.d.ts b/types/lodash.pullall/index.d.ts
index 2c6c5b518f..ab0bf70f99 100644
--- a/types/lodash.pullall/index.d.ts
+++ b/types/lodash.pullall/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullallby/index.d.ts b/types/lodash.pullallby/index.d.ts
index 10981f9d3b..95e3faf7b1 100644
--- a/types/lodash.pullallby/index.d.ts
+++ b/types/lodash.pullallby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullallwith/index.d.ts b/types/lodash.pullallwith/index.d.ts
index 78c1e388be..b7ef8fe66d 100644
--- a/types/lodash.pullallwith/index.d.ts
+++ b/types/lodash.pullallwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.pullat/index.d.ts b/types/lodash.pullat/index.d.ts
index 28b8826f4d..d27e13e939 100644
--- a/types/lodash.pullat/index.d.ts
+++ b/types/lodash.pullat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.random/index.d.ts b/types/lodash.random/index.d.ts
index c31cf46029..88faece9b8 100644
--- a/types/lodash.random/index.d.ts
+++ b/types/lodash.random/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.range/index.d.ts b/types/lodash.range/index.d.ts
index 0b3c1169be..63471fc4b7 100644
--- a/types/lodash.range/index.d.ts
+++ b/types/lodash.range/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rangeright/index.d.ts b/types/lodash.rangeright/index.d.ts
index 376af8b00a..a9db5fc861 100644
--- a/types/lodash.rangeright/index.d.ts
+++ b/types/lodash.rangeright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rearg/index.d.ts b/types/lodash.rearg/index.d.ts
index 6732b14c5b..4e66aa6a78 100644
--- a/types/lodash.rearg/index.d.ts
+++ b/types/lodash.rearg/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reduce/index.d.ts b/types/lodash.reduce/index.d.ts
index adc342bbe2..959385250f 100644
--- a/types/lodash.reduce/index.d.ts
+++ b/types/lodash.reduce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reduceright/index.d.ts b/types/lodash.reduceright/index.d.ts
index 3f1b5492b7..81fa92950a 100644
--- a/types/lodash.reduceright/index.d.ts
+++ b/types/lodash.reduceright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reject/index.d.ts b/types/lodash.reject/index.d.ts
index 2d673d2563..2b6ba750f4 100644
--- a/types/lodash.reject/index.d.ts
+++ b/types/lodash.reject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.remove/index.d.ts b/types/lodash.remove/index.d.ts
index ea7ed20396..a600613fac 100644
--- a/types/lodash.remove/index.d.ts
+++ b/types/lodash.remove/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.repeat/index.d.ts b/types/lodash.repeat/index.d.ts
index de43ada46e..f589dcf17c 100644
--- a/types/lodash.repeat/index.d.ts
+++ b/types/lodash.repeat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.replace/index.d.ts b/types/lodash.replace/index.d.ts
index 63909ebbee..029c35d7b4 100644
--- a/types/lodash.replace/index.d.ts
+++ b/types/lodash.replace/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.rest/index.d.ts b/types/lodash.rest/index.d.ts
index b99496af83..9037abfcdb 100644
--- a/types/lodash.rest/index.d.ts
+++ b/types/lodash.rest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.result/index.d.ts b/types/lodash.result/index.d.ts
index 2cf36f8192..096fe0cc48 100644
--- a/types/lodash.result/index.d.ts
+++ b/types/lodash.result/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.reverse/index.d.ts b/types/lodash.reverse/index.d.ts
index bfd74a2cda..7633952e42 100644
--- a/types/lodash.reverse/index.d.ts
+++ b/types/lodash.reverse/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.round/index.d.ts b/types/lodash.round/index.d.ts
index 77f121f0c6..12a4b6770b 100644
--- a/types/lodash.round/index.d.ts
+++ b/types/lodash.round/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sample/index.d.ts b/types/lodash.sample/index.d.ts
index 68ee7aa532..ca1331a292 100644
--- a/types/lodash.sample/index.d.ts
+++ b/types/lodash.sample/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.samplesize/index.d.ts b/types/lodash.samplesize/index.d.ts
index 1bc0ee6d64..64574c1b0a 100644
--- a/types/lodash.samplesize/index.d.ts
+++ b/types/lodash.samplesize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.set/index.d.ts b/types/lodash.set/index.d.ts
index 06f1d1bf63..b94a5a8912 100644
--- a/types/lodash.set/index.d.ts
+++ b/types/lodash.set/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.setwith/index.d.ts b/types/lodash.setwith/index.d.ts
index 761958e066..6324d2ed60 100644
--- a/types/lodash.setwith/index.d.ts
+++ b/types/lodash.setwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.shuffle/index.d.ts b/types/lodash.shuffle/index.d.ts
index 7878ce6f6d..722a855e06 100644
--- a/types/lodash.shuffle/index.d.ts
+++ b/types/lodash.shuffle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.size/index.d.ts b/types/lodash.size/index.d.ts
index 53404c04b5..1c26366438 100644
--- a/types/lodash.size/index.d.ts
+++ b/types/lodash.size/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.slice/index.d.ts b/types/lodash.slice/index.d.ts
index fb4deb9865..1c3063e813 100644
--- a/types/lodash.slice/index.d.ts
+++ b/types/lodash.slice/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.snakecase/index.d.ts b/types/lodash.snakecase/index.d.ts
index 9f02ab6662..c0eb9e2892 100644
--- a/types/lodash.snakecase/index.d.ts
+++ b/types/lodash.snakecase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.some/index.d.ts b/types/lodash.some/index.d.ts
index 8de3af0b27..dd4b5a6393 100644
--- a/types/lodash.some/index.d.ts
+++ b/types/lodash.some/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortby/index.d.ts b/types/lodash.sortby/index.d.ts
index 5621511817..2f5c9c3859 100644
--- a/types/lodash.sortby/index.d.ts
+++ b/types/lodash.sortby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindex/index.d.ts b/types/lodash.sortedindex/index.d.ts
index 7f81b5a186..85a996c023 100644
--- a/types/lodash.sortedindex/index.d.ts
+++ b/types/lodash.sortedindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindexby/index.d.ts b/types/lodash.sortedindexby/index.d.ts
index c7f9b999ee..d4453c2d5c 100644
--- a/types/lodash.sortedindexby/index.d.ts
+++ b/types/lodash.sortedindexby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedindexof/index.d.ts b/types/lodash.sortedindexof/index.d.ts
index 5c12749cfa..7a6ccf1a1c 100644
--- a/types/lodash.sortedindexof/index.d.ts
+++ b/types/lodash.sortedindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindex/index.d.ts b/types/lodash.sortedlastindex/index.d.ts
index cd682d759b..42cfe82665 100644
--- a/types/lodash.sortedlastindex/index.d.ts
+++ b/types/lodash.sortedlastindex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindexby/index.d.ts b/types/lodash.sortedlastindexby/index.d.ts
index 1958286065..b65e41a423 100644
--- a/types/lodash.sortedlastindexby/index.d.ts
+++ b/types/lodash.sortedlastindexby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sortedlastindexof/index.d.ts b/types/lodash.sortedlastindexof/index.d.ts
index 1589506948..0da507fa35 100644
--- a/types/lodash.sortedlastindexof/index.d.ts
+++ b/types/lodash.sortedlastindexof/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sorteduniq/index.d.ts b/types/lodash.sorteduniq/index.d.ts
index 1e7d07ede8..c192b0194b 100644
--- a/types/lodash.sorteduniq/index.d.ts
+++ b/types/lodash.sorteduniq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sorteduniqby/index.d.ts b/types/lodash.sorteduniqby/index.d.ts
index c369bd0b56..b21474755b 100644
--- a/types/lodash.sorteduniqby/index.d.ts
+++ b/types/lodash.sorteduniqby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.split/index.d.ts b/types/lodash.split/index.d.ts
index a79efa7fca..0f67699d83 100644
--- a/types/lodash.split/index.d.ts
+++ b/types/lodash.split/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.spread/index.d.ts b/types/lodash.spread/index.d.ts
index db633a1a02..d9f630fe18 100644
--- a/types/lodash.spread/index.d.ts
+++ b/types/lodash.spread/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.startcase/index.d.ts b/types/lodash.startcase/index.d.ts
index cdd264aa98..b984bd7def 100644
--- a/types/lodash.startcase/index.d.ts
+++ b/types/lodash.startcase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.startswith/index.d.ts b/types/lodash.startswith/index.d.ts
index 4158b60dfc..41bab99c58 100644
--- a/types/lodash.startswith/index.d.ts
+++ b/types/lodash.startswith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.subtract/index.d.ts b/types/lodash.subtract/index.d.ts
index 8d89b2fc46..32869bb8e5 100644
--- a/types/lodash.subtract/index.d.ts
+++ b/types/lodash.subtract/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sum/index.d.ts b/types/lodash.sum/index.d.ts
index baddaeab51..cf041f00b3 100644
--- a/types/lodash.sum/index.d.ts
+++ b/types/lodash.sum/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.sumby/index.d.ts b/types/lodash.sumby/index.d.ts
index 4ec3e0246b..c4e6e8bbd1 100644
--- a/types/lodash.sumby/index.d.ts
+++ b/types/lodash.sumby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tail/index.d.ts b/types/lodash.tail/index.d.ts
index 2deb621088..cababa89cc 100644
--- a/types/lodash.tail/index.d.ts
+++ b/types/lodash.tail/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.take/index.d.ts b/types/lodash.take/index.d.ts
index 7cfbc6ccbc..4e63eb0fda 100644
--- a/types/lodash.take/index.d.ts
+++ b/types/lodash.take/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takeright/index.d.ts b/types/lodash.takeright/index.d.ts
index fed2b72c0c..7459b3c1da 100644
--- a/types/lodash.takeright/index.d.ts
+++ b/types/lodash.takeright/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takerightwhile/index.d.ts b/types/lodash.takerightwhile/index.d.ts
index 5f684dcd27..bd689ec0c6 100644
--- a/types/lodash.takerightwhile/index.d.ts
+++ b/types/lodash.takerightwhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.takewhile/index.d.ts b/types/lodash.takewhile/index.d.ts
index 9db2b65e58..d38f753408 100644
--- a/types/lodash.takewhile/index.d.ts
+++ b/types/lodash.takewhile/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.template/index.d.ts b/types/lodash.template/index.d.ts
index e88967701c..1631671432 100644
--- a/types/lodash.template/index.d.ts
+++ b/types/lodash.template/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.throttle/index.d.ts b/types/lodash.throttle/index.d.ts
index e0e8d29860..fa727a83e8 100644
--- a/types/lodash.throttle/index.d.ts
+++ b/types/lodash.throttle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.times/index.d.ts b/types/lodash.times/index.d.ts
index 75bb899eac..15f34ce730 100644
--- a/types/lodash.times/index.d.ts
+++ b/types/lodash.times/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toarray/index.d.ts b/types/lodash.toarray/index.d.ts
index 26a3017456..f4046569c4 100644
--- a/types/lodash.toarray/index.d.ts
+++ b/types/lodash.toarray/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tofinite/index.d.ts b/types/lodash.tofinite/index.d.ts
index 51a9dc58c2..f15e09f061 100644
--- a/types/lodash.tofinite/index.d.ts
+++ b/types/lodash.tofinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tointeger/index.d.ts b/types/lodash.tointeger/index.d.ts
index eb844baf5d..4f2da6588d 100644
--- a/types/lodash.tointeger/index.d.ts
+++ b/types/lodash.tointeger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tolength/index.d.ts b/types/lodash.tolength/index.d.ts
index 1cfb860836..2895322b86 100644
--- a/types/lodash.tolength/index.d.ts
+++ b/types/lodash.tolength/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tolower/index.d.ts b/types/lodash.tolower/index.d.ts
index 6406b08bc6..442a460251 100644
--- a/types/lodash.tolower/index.d.ts
+++ b/types/lodash.tolower/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tonumber/index.d.ts b/types/lodash.tonumber/index.d.ts
index cf0096a674..b81b2a825a 100644
--- a/types/lodash.tonumber/index.d.ts
+++ b/types/lodash.tonumber/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topairs/index.d.ts b/types/lodash.topairs/index.d.ts
index 3daaaf7b42..9c63367ea0 100644
--- a/types/lodash.topairs/index.d.ts
+++ b/types/lodash.topairs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topairsin/index.d.ts b/types/lodash.topairsin/index.d.ts
index f43a72c808..4cba676436 100644
--- a/types/lodash.topairsin/index.d.ts
+++ b/types/lodash.topairsin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.topath/index.d.ts b/types/lodash.topath/index.d.ts
index dfc2a64527..72dbf5bb70 100644
--- a/types/lodash.topath/index.d.ts
+++ b/types/lodash.topath/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toplainobject/index.d.ts b/types/lodash.toplainobject/index.d.ts
index be29c91a9c..1c9d08f979 100644
--- a/types/lodash.toplainobject/index.d.ts
+++ b/types/lodash.toplainobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tosafeinteger/index.d.ts b/types/lodash.tosafeinteger/index.d.ts
index 0b9778b896..fdf18d94f2 100644
--- a/types/lodash.tosafeinteger/index.d.ts
+++ b/types/lodash.tosafeinteger/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.tostring/index.d.ts b/types/lodash.tostring/index.d.ts
index 950f766fc7..9b11dbd864 100644
--- a/types/lodash.tostring/index.d.ts
+++ b/types/lodash.tostring/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.toupper/index.d.ts b/types/lodash.toupper/index.d.ts
index e5da52e231..5f40e81f49 100644
--- a/types/lodash.toupper/index.d.ts
+++ b/types/lodash.toupper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.transform/index.d.ts b/types/lodash.transform/index.d.ts
index 0af3c0bf7b..07ebf4dc0b 100644
--- a/types/lodash.transform/index.d.ts
+++ b/types/lodash.transform/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trim/index.d.ts b/types/lodash.trim/index.d.ts
index 196ea54450..e5af08651b 100644
--- a/types/lodash.trim/index.d.ts
+++ b/types/lodash.trim/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trimend/index.d.ts b/types/lodash.trimend/index.d.ts
index 77b7885ae3..cad13c3d63 100644
--- a/types/lodash.trimend/index.d.ts
+++ b/types/lodash.trimend/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.trimstart/index.d.ts b/types/lodash.trimstart/index.d.ts
index 3518b77968..2254f4304f 100644
--- a/types/lodash.trimstart/index.d.ts
+++ b/types/lodash.trimstart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.truncate/index.d.ts b/types/lodash.truncate/index.d.ts
index d66553480e..6b121e1bb0 100644
--- a/types/lodash.truncate/index.d.ts
+++ b/types/lodash.truncate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unary/index.d.ts b/types/lodash.unary/index.d.ts
index 02cbd46979..bc884ea223 100644
--- a/types/lodash.unary/index.d.ts
+++ b/types/lodash.unary/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unescape/index.d.ts b/types/lodash.unescape/index.d.ts
index 49bcfd4021..0405506765 100644
--- a/types/lodash.unescape/index.d.ts
+++ b/types/lodash.unescape/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.union/index.d.ts b/types/lodash.union/index.d.ts
index 022fc39c87..11ec95f768 100644
--- a/types/lodash.union/index.d.ts
+++ b/types/lodash.union/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unionby/index.d.ts b/types/lodash.unionby/index.d.ts
index 7ae2cc8b21..9f3c35288d 100644
--- a/types/lodash.unionby/index.d.ts
+++ b/types/lodash.unionby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unionwith/index.d.ts b/types/lodash.unionwith/index.d.ts
index 98f097fe34..c70a5f1e98 100644
--- a/types/lodash.unionwith/index.d.ts
+++ b/types/lodash.unionwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniq/index.d.ts b/types/lodash.uniq/index.d.ts
index 5c112f9725..eaf546733c 100644
--- a/types/lodash.uniq/index.d.ts
+++ b/types/lodash.uniq/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqby/index.d.ts b/types/lodash.uniqby/index.d.ts
index 0e70630932..909655b16e 100644
--- a/types/lodash.uniqby/index.d.ts
+++ b/types/lodash.uniqby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqueid/index.d.ts b/types/lodash.uniqueid/index.d.ts
index c701f01e8c..1804767b5d 100644
--- a/types/lodash.uniqueid/index.d.ts
+++ b/types/lodash.uniqueid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uniqwith/index.d.ts b/types/lodash.uniqwith/index.d.ts
index f2fa72f46d..501276eeae 100644
--- a/types/lodash.uniqwith/index.d.ts
+++ b/types/lodash.uniqwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unset/index.d.ts b/types/lodash.unset/index.d.ts
index f5db38b23e..e23af76a42 100644
--- a/types/lodash.unset/index.d.ts
+++ b/types/lodash.unset/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unzip/index.d.ts b/types/lodash.unzip/index.d.ts
index 9ec1528f8e..d227c85725 100644
--- a/types/lodash.unzip/index.d.ts
+++ b/types/lodash.unzip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.unzipwith/index.d.ts b/types/lodash.unzipwith/index.d.ts
index a7908aadf3..548451e15d 100644
--- a/types/lodash.unzipwith/index.d.ts
+++ b/types/lodash.unzipwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.update/index.d.ts b/types/lodash.update/index.d.ts
index dcefdc0bad..9eee12bc18 100644
--- a/types/lodash.update/index.d.ts
+++ b/types/lodash.update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.updatewith/index.d.ts b/types/lodash.updatewith/index.d.ts
index 0d3376763c..4d74417a57 100644
--- a/types/lodash.updatewith/index.d.ts
+++ b/types/lodash.updatewith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.uppercase/index.d.ts b/types/lodash.uppercase/index.d.ts
index ab82b68f76..fa5aadcfcc 100644
--- a/types/lodash.uppercase/index.d.ts
+++ b/types/lodash.uppercase/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.upperfirst/index.d.ts b/types/lodash.upperfirst/index.d.ts
index fd287a12f2..6dc6737ae3 100644
--- a/types/lodash.upperfirst/index.d.ts
+++ b/types/lodash.upperfirst/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.values/index.d.ts b/types/lodash.values/index.d.ts
index d74cd1acec..532dcc62c7 100644
--- a/types/lodash.values/index.d.ts
+++ b/types/lodash.values/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.valuesin/index.d.ts b/types/lodash.valuesin/index.d.ts
index 6b550a46b2..0a9640af4e 100644
--- a/types/lodash.valuesin/index.d.ts
+++ b/types/lodash.valuesin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.without/index.d.ts b/types/lodash.without/index.d.ts
index 0a38a9092f..b0670dd01f 100644
--- a/types/lodash.without/index.d.ts
+++ b/types/lodash.without/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.words/index.d.ts b/types/lodash.words/index.d.ts
index 684a0201f3..a16a995921 100644
--- a/types/lodash.words/index.d.ts
+++ b/types/lodash.words/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.wrap/index.d.ts b/types/lodash.wrap/index.d.ts
index 3aa609e890..6117d407c6 100644
--- a/types/lodash.wrap/index.d.ts
+++ b/types/lodash.wrap/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xor/index.d.ts b/types/lodash.xor/index.d.ts
index 251ea35fa3..9874aaa7da 100644
--- a/types/lodash.xor/index.d.ts
+++ b/types/lodash.xor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xorby/index.d.ts b/types/lodash.xorby/index.d.ts
index b1e82c927b..1e68620ffc 100644
--- a/types/lodash.xorby/index.d.ts
+++ b/types/lodash.xorby/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.xorwith/index.d.ts b/types/lodash.xorwith/index.d.ts
index 2dedfcdec6..639ecbc496 100644
--- a/types/lodash.xorwith/index.d.ts
+++ b/types/lodash.xorwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zip/index.d.ts b/types/lodash.zip/index.d.ts
index 8f63020540..dc6bab3162 100644
--- a/types/lodash.zip/index.d.ts
+++ b/types/lodash.zip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipobject/index.d.ts b/types/lodash.zipobject/index.d.ts
index 4c600d75c3..529d362a5b 100644
--- a/types/lodash.zipobject/index.d.ts
+++ b/types/lodash.zipobject/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipobjectdeep/index.d.ts b/types/lodash.zipobjectdeep/index.d.ts
index 5147f6b847..39e7f389fe 100644
--- a/types/lodash.zipobjectdeep/index.d.ts
+++ b/types/lodash.zipobjectdeep/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash.zipwith/index.d.ts b/types/lodash.zipwith/index.d.ts
index a4c045454e..5cd0f33de8 100644
--- a/types/lodash.zipwith/index.d.ts
+++ b/types/lodash.zipwith/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lodash/common/common.d.ts b/types/lodash/common/common.d.ts
index d0856a006b..864450b1bd 100644
--- a/types/lodash/common/common.d.ts
+++ b/types/lodash/common/common.d.ts
@@ -3,7 +3,7 @@ import _ = require("../index");
 type GlobalPartial<T> = Partial<T>;
 declare module "../index" {
     type PartialObject<T> = GlobalPartial<T>;
-    type Many<T> = T | T[]; // TODO: Should be ReadonlyArray<T>, but requires ts2.5 to not infinitely loop
+    type Many<T> = T | ReadonlyArray<T>;
     interface LoDashStatic {
         /**
         * Creates a lodash object which wraps value to enable implicit method chain sequences.
@@ -179,16 +179,17 @@ declare module "../index" {
     }
 
     type NotVoid = {} | null | undefined;
+    type IterateeShorthand<T> = PropertyName | [PropertyName, any] | PartialDeep<T>;
     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 | [string, any] | PartialDeep<T>;
+    type ListIteratee<T> = ListIterator<T, NotVoid> | IterateeShorthand<T>;
+    type ListIterateeCustom<T, TResult> = ListIterator<T, TResult> | IterateeShorthand<T>;
     type ListIteratorTypeGuard<T, S extends T> = (value: T, index: number, collection: List<T>) => value is S;
 
     // 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 | [string, any] | PartialDeep<TObject[keyof TObject]>;
+    type ObjectIteratee<TObject> = ObjectIterator<TObject, NotVoid> | IterateeShorthand<TObject[keyof TObject]>;
+    type ObjectIterateeCustom<TObject, TResult> = ObjectIterator<TObject, TResult> | IterateeShorthand<TObject[keyof TObject]>;
     type ObjectIteratorTypeGuard<TObject, S extends TObject[keyof TObject]> = (value: TObject[keyof TObject], key: string, collection: TObject) => value is S;
 
     type StringIterator<TResult> = (char: string, index: number, string: string) => TResult;
@@ -207,10 +208,11 @@ declare module "../index" {
     type MemoVoidDictionaryIterator<T, TResult> = (acc: TResult, curr: T, key: string, dict: Dictionary<T>) => void;
     type MemoVoidIteratorCapped<T, TResult> = (acc: TResult, curr: T) => void;
 
-    type ValueIteratee<T> = ((value: T) => NotVoid) | string | [string, any] | PartialDeep<T>;
-    type ValueIterateeCustom<T, TResult> = ((value: T) => TResult) | string | [string, any] | PartialDeep<T>;
+    type ValueIteratee<T> = ((value: T) => NotVoid) | IterateeShorthand<T>;
+    type ValueIterateeCustom<T, TResult> = ((value: T) => TResult) | IterateeShorthand<T>;
     type ValueIteratorTypeGuard<T, S extends T> = (value: T) => value is S;
-    type ValueKeyIteratee<T> = ((value: T, key: string) => NotVoid) | string | [string, any] | PartialDeep<T>;
+    type ValueKeyIteratee<T> = ((value: T, key: string) => NotVoid) | IterateeShorthand<T>;
+    type ValueKeyIterateeTypeGuard<T, S extends T> = (value: T, key: string) => value is S;
     type Comparator<T> = (a: T, b: T) => boolean;
     type Comparator2<T1, T2> = (a: T1, b: T2) => boolean;
 
@@ -263,6 +265,6 @@ declare module "../index" {
     type DictionaryIteratorTypeGuard<T, S extends T> = ObjectIteratorTypeGuard<Dictionary<T>, S>;
     // NOTE: keys of objects at run time are always strings, even when a NumericDictionary is being iterated.
     type NumericDictionaryIterator<T, TResult> = (value: T, key: string, 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 NumericDictionaryIteratee<T> = NumericDictionaryIterator<T, NotVoid> | IterateeShorthand<T>;
+    type NumericDictionaryIterateeCustom<T, TResult> = NumericDictionaryIterator<T, TResult> | IterateeShorthand<T>;
 }
diff --git a/types/lodash/common/function.d.ts b/types/lodash/common/function.d.ts
index 71ec3bb884..66dc75a296 100644
--- a/types/lodash/common/function.d.ts
+++ b/types/lodash/common/function.d.ts
@@ -840,14 +840,30 @@ declare module "../index" {
          * @param predicate The predicate to negate.
          * @return Returns the new function.
          */
-        negate<T extends (...args: any[]) => any>(predicate: T): T;
+        negate(predicate: () => boolean): () => boolean;
+        negate<A1>(predicate: (a1: A1) => boolean): (a1: A1) => boolean;
+        negate<A1, A2>(predicate: (a1: A1, a2: A2) => boolean): (a1: A1, a2: A2) => boolean;
+        negate(predicate: (...args: any[]) => any): (...args: any[]) => boolean;
     }
 
-    interface LoDashWrapper<TValue> {
+    interface LoDashImplicitWrapper<TValue> {
         /**
          * @see _.negate
          */
-        negate(): this;
+        negate(this: LoDashImplicitWrapper<() => boolean>): LoDashImplicitWrapper<() => boolean>;
+        negate<A1>(this: LoDashImplicitWrapper<(a1: A1) => boolean>): LoDashImplicitWrapper<(a1: A1) => boolean>;
+        negate<A1, A2>(this: LoDashImplicitWrapper<(a1: A1, a2: A2) => boolean>): LoDashImplicitWrapper<(a1: A1, a2: A2) => boolean>;
+        negate(this: LoDashImplicitWrapper<(...args: any[]) => any>): LoDashImplicitWrapper<(...args: any[]) => boolean>;
+    }
+
+    interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.negate
+         */
+        negate(this: LoDashExplicitWrapper<() => boolean>): LoDashExplicitWrapper<() => boolean>;
+        negate<A1>(this: LoDashExplicitWrapper<(a1: A1) => boolean>): LoDashExplicitWrapper<(a1: A1) => boolean>;
+        negate<A1, A2>(this: LoDashExplicitWrapper<(a1: A1, a2: A2) => boolean>): LoDashExplicitWrapper<(a1: A1, a2: A2) => boolean>;
+        negate(this: LoDashExplicitWrapper<(...args: any[]) => any>): LoDashExplicitWrapper<(...args: any[]) => boolean>;
     }
 
     // once
diff --git a/types/lodash/common/object.d.ts b/types/lodash/common/object.d.ts
index 5e2d539c23..b136e9469b 100644
--- a/types/lodash/common/object.d.ts
+++ b/types/lodash/common/object.d.ts
@@ -2951,6 +2951,22 @@ declare module "../index" {
          * _.omitBy(object, _.isNumber);
          * // => { 'b': '2' }
          */
+        omitBy<T>(
+            object: Dictionary<T> | null | undefined,
+            predicate?: ValueKeyIteratee<T>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T>(
+            object: NumericDictionary<T> | null | undefined,
+            predicate?: ValueKeyIteratee<T>
+        ): NumericDictionary<T>;
+
+        /**
+         * @see _.omitBy
+         */
         omitBy<T extends object>(
             object: T | null | undefined,
             predicate: ValueKeyIteratee<T[keyof T]>
@@ -2958,6 +2974,22 @@ declare module "../index" {
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashImplicitWrapper<NumericDictionary<T>>;
+
         /**
          * @see _.omitBy
          */
@@ -2968,6 +3000,22 @@ declare module "../index" {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.omitBy
+         */
+        omitBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashExplicitWrapper<NumericDictionary<T>>;
+
         /**
          * @see _.omitBy
          */
@@ -3063,6 +3111,38 @@ declare module "../index" {
          * _.pickBy(object, _.isNumber);
          * // => { 'a': 1, 'c': 3 }
          */
+        pickBy<T, S extends T>(
+            object: Dictionary<T> | null | undefined,
+            predicate: ValueKeyIterateeTypeGuard<T, S>
+        ): Dictionary<S>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T, S extends T>(
+            object: NumericDictionary<T> | null | undefined,
+            predicate: ValueKeyIterateeTypeGuard<T, S>
+        ): NumericDictionary<S>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T>(
+            object: Dictionary<T> | null | undefined,
+            predicate?: ValueKeyIteratee<T>
+        ): Dictionary<T>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T>(
+            object: NumericDictionary<T> | null | undefined,
+            predicate?: ValueKeyIteratee<T>
+        ): NumericDictionary<T>;
+
+        /**
+         * @see _.pickBy
+         */
         pickBy<T extends object>(
             object: T | null | undefined,
             predicate?: ValueKeyIteratee<T[keyof T]>
@@ -3070,6 +3150,38 @@ declare module "../index" {
     }
 
     interface LoDashImplicitWrapper<TValue> {
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T, S extends T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            predicate: ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashImplicitWrapper<Dictionary<S>>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T, S extends T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate: ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashImplicitWrapper<NumericDictionary<S>>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T>(
+            this: LoDashImplicitWrapper<Dictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashImplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T>(
+            this: LoDashImplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashImplicitWrapper<NumericDictionary<T>>;
+
         /**
          * @see _.pickBy
          */
@@ -3080,6 +3192,38 @@ declare module "../index" {
     }
 
     interface LoDashExplicitWrapper<TValue> {
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T, S extends T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            predicate: ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashExplicitWrapper<Dictionary<S>>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T, S extends T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate: ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashExplicitWrapper<NumericDictionary<S>>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T>(
+            this: LoDashExplicitWrapper<Dictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashExplicitWrapper<Dictionary<T>>;
+
+        /**
+         * @see _.pickBy
+         */
+        pickBy<T>(
+            this: LoDashExplicitWrapper<NumericDictionary<T> | null | undefined>,
+            predicate?: ValueKeyIteratee<T>
+        ): LoDashExplicitWrapper<NumericDictionary<T>>;
+
         /**
          * @see _.pickBy
          */
diff --git a/types/lodash/fp.d.ts b/types/lodash/fp.d.ts
index da68ea250e..cdc850d444 100644
--- a/types/lodash/fp.d.ts
+++ b/types/lodash/fp.d.ts
@@ -300,7 +300,12 @@ declare namespace _ {
     }
     type LodashCloneWith2x1<T, TResult> = (value: T) => TResult | T;
     type LodashCompact = <T>(array: lodash.List<T | null | undefined | false | "" | 0> | null | undefined) => T[];
-    type LodashNegate = <T extends (...args: any[]) => any>(predicate: T) => T;
+    interface LodashNegate {
+        (predicate: () => boolean): () => boolean;
+        <A1>(predicate: (a1: A1) => boolean): (a1: A1) => boolean;
+        <A1, A2>(predicate: (a1: A1, a2: A2) => boolean): (a1: A1, a2: A2) => boolean;
+        (predicate: (...args: any[]) => any): (...args: any[]) => boolean;
+    }
     interface LodashFlowRight {
         <R2, R1>(f2: (a: R1) => R2, f1: () => R1): () => R2;
         <R3, R2, R1>(f3: (a: R2) => R3, f2: (a: R1) => R2, f1: () => R1): () => R3;
@@ -2289,11 +2294,21 @@ declare namespace _ {
     }
     interface LodashOmitBy {
         <T>(predicate: lodash.ValueKeyIteratee<T>): LodashOmitBy1x1<T>;
-        <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashOmitBy1x2<T>;
+        <T>(predicate: lodash.__, object: lodash.Dictionary<T> | null | undefined): LodashOmitBy1x2<T>;
+        <T>(predicate: lodash.ValueKeyIteratee<T>, object: lodash.Dictionary<T> | null | undefined): lodash.Dictionary<T>;
+        <T>(predicate: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashOmitBy2x2<T>;
+        <T>(predicate: lodash.ValueKeyIteratee<T>, object: lodash.NumericDictionary<T> | null | undefined): lodash.NumericDictionary<T>;
+        <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashOmitBy3x2<T>;
         <T extends object>(predicate: lodash.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): lodash.PartialObject<T>;
     }
-    type LodashOmitBy1x1<T> = <T1 extends object>(object: T1 | null | undefined) => lodash.PartialObject<T1>;
-    type LodashOmitBy1x2<T> = (predicate: lodash.ValueKeyIteratee<T[keyof T]>) => lodash.PartialObject<T>;
+    interface LodashOmitBy1x1<T> {
+        (object: lodash.Dictionary<T> | null | undefined): lodash.Dictionary<T>;
+        (object: lodash.NumericDictionary<T> | null | undefined): lodash.NumericDictionary<T>;
+        <T1 extends object>(object: T1 | null | undefined): lodash.PartialObject<T1>;
+    }
+    type LodashOmitBy1x2<T> = (predicate: lodash.ValueKeyIteratee<T>) => lodash.Dictionary<T>;
+    type LodashOmitBy2x2<T> = (predicate: lodash.ValueKeyIteratee<T>) => lodash.NumericDictionary<T>;
+    type LodashOmitBy3x2<T> = (predicate: lodash.ValueKeyIteratee<T[keyof T]>) => lodash.PartialObject<T>;
     type LodashOnce = <T extends (...args: any[]) => any>(func: T) => T;
     interface LodashOrderBy {
         <T>(iteratees: lodash.Many<(value: T) => lodash.NotVoid>): LodashOrderBy1x1<T>;
@@ -2872,12 +2887,35 @@ declare namespace _ {
     type LodashPick2x1 = <T>(object: T | null | undefined) => lodash.PartialDeep<T>;
     type LodashPick2x2<T> = (props: lodash.PropertyPath) => lodash.PartialDeep<T>;
     interface LodashPickBy {
-        <T>(predicate: lodash.ValueKeyIteratee<T>): LodashPickBy1x1<T>;
-        <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashPickBy1x2<T>;
+        <T, S extends T>(predicate: lodash.ValueKeyIterateeTypeGuard<T, S>): LodashPickBy1x1<T, S>;
+        <T>(predicate: lodash.__, object: lodash.Dictionary<T> | null | undefined): LodashPickBy1x2<T>;
+        <T, S extends T>(predicate: lodash.ValueKeyIterateeTypeGuard<T, S>, object: lodash.Dictionary<T> | null | undefined): lodash.Dictionary<S>;
+        <T>(predicate: lodash.__, object: lodash.NumericDictionary<T> | null | undefined): LodashPickBy2x2<T>;
+        <T, S extends T>(predicate: lodash.ValueKeyIterateeTypeGuard<T, S>, object: lodash.NumericDictionary<T> | null | undefined): lodash.NumericDictionary<S>;
+        <T>(predicate: lodash.ValueKeyIteratee<T>): LodashPickBy3x1<T>;
+        <T>(predicate: lodash.ValueKeyIteratee<T>, object: lodash.Dictionary<T> | null | undefined): lodash.Dictionary<T>;
+        <T>(predicate: lodash.ValueKeyIteratee<T>, object: lodash.NumericDictionary<T> | null | undefined): lodash.NumericDictionary<T>;
+        <T extends object>(predicate: lodash.__, object: T | null | undefined): LodashPickBy5x2<T>;
         <T extends object>(predicate: lodash.ValueKeyIteratee<T[keyof T]>, object: T | null | undefined): lodash.PartialObject<T>;
     }
-    type LodashPickBy1x1<T> = <T1 extends object>(object: T1 | null | undefined) => lodash.PartialObject<T1>;
-    type LodashPickBy1x2<T> = (predicate: lodash.ValueKeyIteratee<T[keyof T]>) => lodash.PartialObject<T>;
+    interface LodashPickBy1x1<T, S> {
+        (object: lodash.Dictionary<T> | null | undefined): lodash.Dictionary<S>;
+        (object: lodash.NumericDictionary<T> | null | undefined): lodash.NumericDictionary<S>;
+    }
+    interface LodashPickBy1x2<T> {
+        <S extends T>(predicate: lodash.ValueKeyIterateeTypeGuard<T, S>): lodash.Dictionary<S>;
+        (predicate: lodash.ValueKeyIteratee<T>): lodash.Dictionary<T>;
+    }
+    interface LodashPickBy2x2<T> {
+        <S extends T>(predicate: lodash.ValueKeyIterateeTypeGuard<T, S>): lodash.NumericDictionary<S>;
+        (predicate: lodash.ValueKeyIteratee<T>): lodash.NumericDictionary<T>;
+    }
+    interface LodashPickBy3x1<T> {
+        (object: lodash.Dictionary<T> | null | undefined): lodash.Dictionary<T>;
+        (object: lodash.NumericDictionary<T> | null | undefined): lodash.NumericDictionary<T>;
+        <T1 extends object>(object: T1 | null | undefined): lodash.PartialObject<T1>;
+    }
+    type LodashPickBy5x2<T> = (predicate: lodash.ValueKeyIteratee<T[keyof T]>) => lodash.PartialObject<T>;
     interface LodashProp {
         <TObject extends object, TKey extends keyof TObject>(path: TKey | [TKey]): LodashProp1x1<TObject, TKey>;
         <TObject extends object>(path: lodash.__, object: TObject): LodashProp1x2<TObject>;
@@ -4760,6 +4798,6 @@ declare namespace _ {
         zipObjectDeep: LodashZipObjectDeep;
         zipWith: LodashZipWith;
         __: lodash.__;
-        placehodler: lodash.__;
+        placeholder: lodash.__;
     }
 }
diff --git a/types/lodash/index.d.ts b/types/lodash/index.d.ts
index 67e9c8f0cb..95228b8c29 100644
--- a/types/lodash/index.d.ts
+++ b/types/lodash/index.d.ts
@@ -10,7 +10,7 @@
 //                 Jack Moore <https://github.com/jtmthf>,
 //                 Dominique Rau <https://github.com/DomiR>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 /// <reference path="./common/common.d.ts" />
 /// <reference path="./common/array.d.ts" />
diff --git a/types/lodash/lodash-tests.ts b/types/lodash/lodash-tests.ts
index 88a5a88bfc..0515136714 100644
--- a/types/lodash/lodash-tests.ts
+++ b/types/lodash/lodash-tests.ts
@@ -1238,8 +1238,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.unionBy(list, list, valueIterator); // $ExpectType AbcObject[]
     _.unionBy(list, list, list, list, list, list, valueIterator); // $ExpectType AbcObject[]
     _.unionBy(list, list, "a"); // $ExpectType AbcObject[]
-    // <AbcObject> param needed for TS 2.3
-    _.unionBy<AbcObject>(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
+    _.unionBy(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
     _.unionBy(list, list, {a: 1}); // $ExpectType AbcObject[]
     _.unionBy(list, list, list, list, list, list, {a: 1}); // $ExpectType AbcObject[]
 
@@ -1247,8 +1246,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _(list).unionBy(list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).unionBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).unionBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    // <AbcObject> param needed for TS 2.3
-    _(list).unionBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).unionBy(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).unionBy(list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).unionBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
@@ -1256,8 +1254,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.chain(list).unionBy(list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    // <AbcObject> param needed for TS 2.3
-    _.chain(list).unionBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).unionBy(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).unionBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
@@ -1403,8 +1400,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.xorBy(list, list, valueIterator); // $ExpectType AbcObject[]
     _.xorBy(list, list, list, list, list, list, valueIterator); // $ExpectType AbcObject[]
     _.xorBy(list, list, "a"); // $ExpectType AbcObject[]
-    // <AbcObject> param needed for TS 2.3
-    _.xorBy<AbcObject>(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
+    _.xorBy(list, list, list, list, list, list, "a"); // $ExpectType AbcObject[]
     _.xorBy(list, list, {a: 1}); // $ExpectType AbcObject[]
     _.xorBy(list, list, list, list, list, list, {a: 1}); // $ExpectType AbcObject[]
 
@@ -1412,8 +1408,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _(list).xorBy(list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).xorBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).xorBy(list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    // <AbcObject> param needed for TS 2.3
-    _(list).xorBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
+    _(list).xorBy(list, list, list, list, list, "a"); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).xorBy(list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).xorBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
 
@@ -1421,8 +1416,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.chain(list).xorBy(list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, list, list, list, list, valueIterator); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    // <AbcObject> param needed for TS 2.3
-    _.chain(list).xorBy<AbcObject>(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(list).xorBy(list, list, list, list, list, "a"); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).xorBy(list, list, list, list, list, {a: 1}); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
@@ -2177,14 +2171,14 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
     // $ExpectType NumericDictionary<AbcObject>
     _.forEach(numericDictionary, (value, index, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
 
     // $ExpectType NumericDictionary<AbcObject> | null | undefined
     _.forEach(nilNumericDictionary, (value, index, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
@@ -2261,14 +2255,14 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
     // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
     _(numericDictionary).forEach((value, index, collection) => {
-        // Broken in TS 2.4: value; // AbcObject
+        value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
 
     // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
     _(nilNumericDictionary).forEach((value, index, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
@@ -2331,14 +2325,14 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
     // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
     _.chain(numericDictionary).forEach((value, index, collection) => {
-        // Broken in TS 2.4: value; // AbcObject
+        value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
 
     // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject> | null | undefined>
     _.chain(nilNumericDictionary).forEach((value, index, collection) => {
-        // Broken in TS 2.4: value; // AbcObject
+        value; // $ExpectType AbcObject
         index; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
     });
@@ -2545,69 +2539,67 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 // _.keyBy
 {
     const valueIterator = (value: AbcObject) => "";
+    const subKey: string | number | symbol = anything;
 
     _.keyBy("abcd"); // $ExpectType Dictionary<string>
     _.keyBy("abcd", stringIterator); // $ExpectType Dictionary<string>
     _.keyBy(list); // $ExpectType Dictionary<AbcObject>
     _.keyBy(list, valueIterator); // $ExpectType Dictionary<AbcObject>
-    _.keyBy(list, "a"); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(list, subKey); // $ExpectType Dictionary<AbcObject>
     _.keyBy(list, { a: 42 }); // $ExpectType Dictionary<AbcObject>
     _.keyBy(dictionary); // $ExpectType Dictionary<AbcObject>
     _.keyBy(dictionary, valueIterator); // $ExpectType Dictionary<AbcObject>
-    _.keyBy(dictionary, "a"); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(dictionary, subKey); // $ExpectType Dictionary<AbcObject>
     _.keyBy(dictionary, { a: 42 }); // $ExpectType Dictionary<AbcObject>
-    // These fail in TS 2.4
-    // _.keyBy(numericDictionary); // Dictionary<AbcObject>
-    // _.keyBy(numericDictionary, valueIterator); // Dictionary<AbcObject>
-    // _.keyBy(numericDictionary, "a"); // Dictionary<AbcObject>
-    // _.keyBy(numericDictionary, { a: 42 }); // Dictionary<AbcObject>
+    _.keyBy(numericDictionary); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(numericDictionary, valueIterator); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(numericDictionary, "a"); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(numericDictionary, subKey); // $ExpectType Dictionary<AbcObject>
+    _.keyBy(numericDictionary, { a: 42 }); // $ExpectType Dictionary<AbcObject>
 
     _("abcd").keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
     _("abcd").keyBy(stringIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string>>
     _(list).keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(list).keyBy(valueIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-    _(list).keyBy("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(list).keyBy(subKey); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(list).keyBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(dictionary).keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(dictionary).keyBy(valueIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-    _(dictionary).keyBy("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(dictionary).keyBy(subKey); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(dictionary).keyBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
-    // These fail in TS 2.4
-    // _(numericDictionary).keyBy(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    // _(numericDictionary).keyBy(valueIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    // _(numericDictionary).keyBy("a"); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    // _(numericDictionary).keyBy({ a: 42 }); // LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).keyBy(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).keyBy(valueIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).keyBy(subKey); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).keyBy({ a: 42 }); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
     _.chain("abcd").keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
     _.chain("abcd").keyBy(stringIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string>>
     _.chain(list).keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(list).keyBy(valueIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-    _.chain(list).keyBy("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(list).keyBy(subKey); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(list).keyBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(dictionary).keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(dictionary).keyBy(valueIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-    _.chain(dictionary).keyBy("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(dictionary).keyBy(subKey); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(dictionary).keyBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
-    // These fail in TS 2.4
-    // _.chain(numericDictionary).keyBy(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    // _.chain(numericDictionary).keyBy(valueIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    // _.chain(numericDictionary).keyBy("a"); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    // _.chain(numericDictionary).keyBy({ a: 42 }); // LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).keyBy(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).keyBy(valueIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).keyBy(subKey); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).keyBy({ a: 42 }); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
 
     fp.keyBy(valueIterator, list); // $ExpectType Dictionary<AbcObject>
     fp.keyBy(valueIterator)(list); // $ExpectType Dictionary<AbcObject>
-    fp.keyBy("a", list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(subKey, list); // $ExpectType Dictionary<AbcObject>
     fp.keyBy({ a: 42 }, list); // $ExpectType Dictionary<AbcObject>
-    fp.keyBy(["a", 42], list); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy([subKey, 42], list); // $ExpectType Dictionary<AbcObject>
     fp.keyBy(valueIterator, dictionary); // $ExpectType Dictionary<AbcObject>
-    fp.keyBy("a", dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(subKey, dictionary); // $ExpectType Dictionary<AbcObject>
     fp.keyBy({ a: 42 }, dictionary); // $ExpectType Dictionary<AbcObject>
-    fp.keyBy(["a", 42], dictionary); // $ExpectType Dictionary<AbcObject>
-    // These fail in TS 2.4
-    // fp.keyBy(valueIterator, numericDictionary); // Dictionary<AbcObject>
-    // fp.keyBy("a", numericDictionary); // Dictionary<AbcObject>
-    // fp.keyBy({ a: 42 }, numericDictionary); // Dictionary<AbcObject>
-    // fp.keyBy(["a", 42], numericDictionary); // Dictionary<AbcObject>
+    fp.keyBy([subKey, 42], dictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(valueIterator, numericDictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy(subKey, numericDictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy({ a: 42 }, numericDictionary); // $ExpectType Dictionary<AbcObject>
+    fp.keyBy([subKey, 42], numericDictionary); // $ExpectType Dictionary<AbcObject>
 }
 
 // _.invoke
@@ -2707,7 +2699,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.map(numericDictionary);  // $ExpectType AbcObject[]
     // $ExpectType number[]
     _.map(numericDictionary, (value, key, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        value; // $ExpectType AbcObject
         key; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
         return 0;
@@ -2741,7 +2733,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _(numericDictionary).map();  // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     // $ExpectType LoDashImplicitWrapper<number[]>
     _(numericDictionary).map((value, key, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        value; // $ExpectType AbcObject
         key; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
         return 0;
@@ -2775,7 +2767,7 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.chain(numericDictionary).map();  // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     // $ExpectType LoDashExplicitWrapper<number[]>
     _.chain(numericDictionary).map((value, key, collection) => {
-        /* Broken in TS 2.4: value; // AbcObject */
+        value; // $ExpectType AbcObject
         key; // $ExpectType string
         collection; // $ExpectType NumericDictionary<AbcObject>
         return 0;
@@ -3036,74 +3028,76 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
 
 // _.some
 {
+    const subKey: string | number | symbol = anything;
+
     _.some(list); // $ExpectType boolean
     _.some(list, listIterator); // $ExpectType boolean
-    _.some(list, "a"); // $ExpectType boolean
-    _.some(list, ["a", 42]); // $ExpectType boolean
+    _.some(list, subKey); // $ExpectType boolean
+    _.some(list, [subKey, 42]); // $ExpectType boolean
     _.some(list, { a: 42 }); // $ExpectType boolean
 
     _.some(dictionary); // $ExpectType boolean
     _.some(dictionary, dictionaryIterator); // $ExpectType boolean
-    _.some(dictionary, "a"); // $ExpectType boolean
-    _.some(dictionary, ["a", 42]); // $ExpectType boolean
+    _.some(dictionary, subKey); // $ExpectType boolean
+    _.some(dictionary, [subKey, 42]); // $ExpectType boolean
     _.some(dictionary, { a: 42 }); // $ExpectType boolean
 
     _.some(numericDictionary); // $ExpectType boolean
     _.some(numericDictionary, numericDictionaryIterator); // $ExpectType boolean
-    _.some(numericDictionary, "a"); // $ExpectType boolean
-    _.some(numericDictionary, ["a", 42]); // $ExpectType boolean
+    _.some(numericDictionary, subKey); // $ExpectType boolean
+    _.some(numericDictionary, [subKey, 42]); // $ExpectType boolean
     _.some(numericDictionary, { a: 42 }); // $ExpectType boolean
 
     _(list).some(); // $ExpectType boolean
     _(list).some(listIterator); // $ExpectType boolean
-    _(list).some("a"); // $ExpectType boolean
-    _(list).some(["a", 42]); // $ExpectType boolean
+    _(list).some(subKey); // $ExpectType boolean
+    _(list).some([subKey, 42]); // $ExpectType boolean
     _(list).some({ a: 42 }); // $ExpectType boolean
 
     _(dictionary).some(); // $ExpectType boolean
     _(dictionary).some(dictionaryIterator); // $ExpectType boolean
-    _(dictionary).some("a"); // $ExpectType boolean
-    _(dictionary).some(["a", 42]); // $ExpectType boolean
+    _(dictionary).some(subKey); // $ExpectType boolean
+    _(dictionary).some([subKey, 42]); // $ExpectType boolean
     _(dictionary).some({ a: 42 }); // $ExpectType boolean
 
     _(numericDictionary).some(); // $ExpectType boolean
     _(numericDictionary).some(numericDictionaryIterator); // $ExpectType boolean
-    _(numericDictionary).some("a"); // $ExpectType boolean
-    _(numericDictionary).some(["a", 42]); // $ExpectType boolean
+    _(numericDictionary).some(subKey); // $ExpectType boolean
+    _(numericDictionary).some([subKey, 42]); // $ExpectType boolean
     _(numericDictionary).some({ a: 42 }); // $ExpectType boolean
 
     _.chain(list).some(); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(list).some(listIterator); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(list).some("a"); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(list).some(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).some(subKey); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(list).some([subKey, 42]); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(list).some({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
     _.chain(dictionary).some(); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(dictionary).some(dictionaryIterator); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(dictionary).some("a"); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(dictionary).some(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).some(subKey); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(dictionary).some([subKey, 42]); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(dictionary).some({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
     _.chain(numericDictionary).some(); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(numericDictionary).some(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(numericDictionary).some("a"); // $ExpectType LoDashExplicitWrapper<boolean>
-    _.chain(numericDictionary).some(["a", 42]); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).some(subKey); // $ExpectType LoDashExplicitWrapper<boolean>
+    _.chain(numericDictionary).some([subKey, 42]); // $ExpectType LoDashExplicitWrapper<boolean>
     _.chain(numericDictionary).some({ a: 42 }); // $ExpectType LoDashExplicitWrapper<boolean>
 
     fp.some(valueIterator, list); // $ExpectType boolean
-    fp.some("a")(list); // $ExpectType boolean
+    fp.some(subKey)(list); // $ExpectType boolean
     fp.some({ a: 42 }, list); // $ExpectType boolean
-    fp.some(["a", 42], list); // $ExpectType boolean
+    fp.some([subKey, 42], list); // $ExpectType boolean
 
     fp.some(valueIterator, dictionary); // $ExpectType boolean
-    fp.some("a")(dictionary); // $ExpectType boolean
+    fp.some(subKey)(dictionary); // $ExpectType boolean
     fp.some({ a: 42 })(dictionary); // $ExpectType boolean
-    fp.some(["a", 42])(dictionary); // $ExpectType boolean
+    fp.some([subKey, 42])(dictionary); // $ExpectType boolean
 
     fp.some(valueIterator, numericDictionary); // $ExpectType boolean
-    fp.some("a")(numericDictionary); // $ExpectType boolean
+    fp.some(subKey)(numericDictionary); // $ExpectType boolean
     fp.some({ a: 42 })(numericDictionary); // $ExpectType boolean
-    fp.some(["a", 42])(numericDictionary); // $ExpectType boolean
+    fp.some([subKey, 42])(numericDictionary); // $ExpectType boolean
 }
 
 // _.sortBy
@@ -3163,27 +3157,24 @@ _.chain([1, 2, 3, 4]).unshift(5, 6); // $ExpectType LoDashExplicitWrapper<number
     _.orderBy(list, [(value) => 1, (value) => 2], [true, false]); // $ExpectType AbcObject[]
     _.orderBy(dictionary, (value) => 1); // $ExpectType AbcObject[]
     _.orderBy(dictionary, (value) => 1, true); // $ExpectType AbcObject[]
-    // These fail in TS 2.4
-    // _.orderBy(numericDictionary, (value) => 1); // AbcObject[]
-    // _.orderBy(numericDictionary, (value) => 1, true); // AbcObject[]
+    _.orderBy(numericDictionary, (value) => 1); // $ExpectType AbcObject[]
+    _.orderBy(numericDictionary, (value) => 1, true); // $ExpectType AbcObject[]
 
     _(list).orderBy((value) => 1); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).orderBy((value) => 1, true); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(list).orderBy([(value) => 1, (value) => 2], true); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(dictionary).orderBy((value) => 1); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
     _(dictionary).orderBy((value) => 1, true); // $ExpectType LoDashImplicitWrapper<AbcObject[]>
-    // These fail in TS 2.4
-    // _(numericDictionary).orderBy((value) => 1); // LoDashImplicitWrapper<AbcObject[]>
-    // _(numericDictionary).orderBy((value) => 1, true); // LoDashImplicitWrapper<AbcObject[]>
+    _(numericDictionary).orderBy((value) => 1); // LoDashImplicitWrapper<AbcObject[]>
+    _(numericDictionary).orderBy((value) => 1, true); // LoDashImplicitWrapper<AbcObject[]>
 
     _.chain(list).orderBy((value) => 1); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).orderBy((value) => 1, true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(list).orderBy([(value) => 1, (value) => 2], true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(dictionary).orderBy((value) => 1); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
     _.chain(dictionary).orderBy((value) => 1, true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
-    // These fail in TS 2.4
-    // _.chain(numericDictionary).orderBy((value) => 1); // LoDashExplicitWrapper<AbcObject[]>
-    // _.chain(numericDictionary).orderBy((value) => 1, true); // LoDashExplicitWrapper<AbcObject[]>
+    _.chain(numericDictionary).orderBy((value) => 1); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
+    _.chain(numericDictionary).orderBy((value) => 1, true); // $ExpectType LoDashExplicitWrapper<AbcObject[]>
 
     fp.orderBy(fp.identity, "asc", "bca"); // $ExpectType string[]
     fp.orderBy(fp.identity, true, "bca"); // $ExpectType string[]
@@ -3516,6 +3507,18 @@ fp.now(); // $ExpectType number
     _((a1: number, a2: number): boolean => true).negate(); // $ExpectType LoDashImplicitWrapper<(a1: number, a2: number) => boolean>
     _.chain((a1: number, a2: number): boolean => true).negate(); // $ExpectType LoDashExplicitWrapper<(a1: number, a2: number) => boolean>
     fp.negate((a1: number, a2: number): boolean => true); // $ExpectType (a1: number, a2: number) => boolean
+
+    const userDefinedTypeGuard = (item: any): item is number => typeof item === "number";
+
+    _.negate(userDefinedTypeGuard); // $ExpectType (a1: any) => boolean
+    _(userDefinedTypeGuard).negate(); // $ExpectType LoDashImplicitWrapper<(a1: any) => boolean>
+    _.chain(userDefinedTypeGuard).negate(); // $ExpectType LoDashExplicitWrapper<(a1: any) => boolean>
+    fp.negate(userDefinedTypeGuard); // $ExpectType (a1: any) => boolean
+
+    _.negate((a1: number, a2: number, a3: number): boolean => true); // $ExpectType (...args: any[]) => boolean
+    _((a1: number, a2: number, a3: number): boolean => true).negate(); // $ExpectType LoDashImplicitWrapper<(...args: any[]) => boolean>
+    _.chain((a1: number, a2: number, a3: number): boolean => true).negate(); // $ExpectType LoDashExplicitWrapper<(...args: any[]) => boolean>
+    fp.negate((a1: number, a2: number, a3: number): boolean => true); // $ExpectType (...args: any[]) => boolean
 }
 
 // _.once
@@ -3673,14 +3676,14 @@ fp.now(); // $ExpectType number
 
     {
         const customizer = (x: number): string | undefined => "";
+        const value: number = anything;
 
-        _.cloneWith(42, customizer); // string | 42
-        _(42).cloneWith(customizer); // string | 42
-        _.chain(42).cloneWith(customizer); // string | 42
+        _.cloneWith(value, customizer); // string | number
+        _(value).cloneWith(customizer); // string | number
+        _.chain(value).cloneWith(customizer); // string | number
 
-        // Note: TS 2.5 fails without explicit <42, string>
-        fp.cloneWith<42, string>(customizer, 42); // $ExpectType string | 42
-        fp.cloneWith<42, string>(customizer)(42); // $ExpectType string | 42
+        fp.cloneWith(customizer, value); // $ExpectType string | number
+        fp.cloneWith(customizer)(value); // $ExpectType string | number
     }
 }
 
@@ -4973,17 +4976,7 @@ fp.now(); // $ExpectType number
     _.create(prototype, properties); // $ExpectType { a: number; } & { b: string; }
     _(prototype).create(properties); // $ExpectType LoDashImplicitWrapper<{ a: number; } & { b: string; }>
     _.chain(prototype).create(properties); // $ExpectType LoDashExplicitWrapper<{ a: number; } & { b: string; }>
-    // We can't expectType for this line because it fails in TS2.3
-    const result: { a: number; } = fp.create(prototype);
-}
-
-{
-    const obj = { a: "" };
-    const s1 = { b: 1 };
-    const s2 = { c: 1 };
-    const s3 = { d: 1 };
-    const s4 = { e: 1 };
-    const s5 = { f: 1 };
+    fp.create(prototype); // $ExpectType { a: number; }
 }
 
 // _.defaultsDeep
@@ -5297,12 +5290,10 @@ fp.now(); // $ExpectType number
     _.mapKeys(dictionary, ""); // $ExpectType Dictionary<AbcObject>
     _.mapKeys(dictionary, {}); // $ExpectType Dictionary<AbcObject>
 
-    /* Broken in TS 2.4
-    _.mapKeys(numericDictionary); // Dictionary<AbcObject>
-    _.mapKeys(numericDictionary, numericDictionaryIterator); // Dictionary<AbcObject>
-    _.mapKeys(numericDictionary, ""); // Dictionary<AbcObject>
-    _.mapKeys(numericDictionary, {}); // Dictionary<AbcObject>
-    */
+    _.mapKeys(numericDictionary); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(numericDictionary, numericDictionaryIterator); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(numericDictionary, ""); // $ExpectType Dictionary<AbcObject>
+    _.mapKeys(numericDictionary, {}); // $ExpectType Dictionary<AbcObject>
 
     _.mapKeys(abcObject); // $ExpectType Dictionary<string | number | boolean>
     _.mapKeys(abcObject, abcObjectIterator); // $ExpectType Dictionary<string | number | boolean>
@@ -5318,12 +5309,10 @@ fp.now(); // $ExpectType number
     _(dictionary).mapKeys(""); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(dictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
-    /* Broken in TS 2.4
-    _(numericDictionary).mapKeys(); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    _(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    _(numericDictionary).mapKeys(""); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    _(numericDictionary).mapKeys({}); // LoDashImplicitWrapper<Dictionary<AbcObject>>
-    */
+    _(numericDictionary).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).mapKeys(numericDictionaryIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).mapKeys(""); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
+    _(numericDictionary).mapKeys({}); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
 
     _(abcObject).mapKeys(); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
     _(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashImplicitWrapper<Dictionary<string | number | boolean>>
@@ -5339,12 +5328,10 @@ fp.now(); // $ExpectType number
     _.chain(dictionary).mapKeys(""); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(dictionary).mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
 
-    /* Broken in TS 2.4
-    _.chain(numericDictionary).mapKeys(); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    _.chain(numericDictionary).mapKeys(numericDictionaryIterator); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    _.chain(numericDictionary).mapKeys(""); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    _.chain(numericDictionary).mapKeys({}); // LoDashExplicitWrapper<Dictionary<AbcObject>>
-    */
+    _.chain(numericDictionary).mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).mapKeys(numericDictionaryIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).mapKeys(""); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
+    _.chain(numericDictionary).mapKeys({}); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
 
     _.chain(abcObject).mapKeys(); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
     _.chain(abcObject).mapKeys(abcObjectIterator); // $ExpectType LoDashExplicitWrapper<Dictionary<string | number | boolean>>
@@ -5538,88 +5525,125 @@ fp.now(); // $ExpectType number
     const dictionary: _.Dictionary<AbcObject> = anything;
     const numericDictionary: _.NumericDictionary<AbcObject> = anything;
 
-    _.omit(obj, "a"); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.4
+    _.omit(obj, "a"); // $ExpectType Pick<AbcObject, "b" | "c">
     _.omit(obj, ["b", 1], 0, "a"); // $ExpectType Partial<AbcObject>
     _.omit(dictionary, "a"); // $ExpectType Dictionary<AbcObject>
     _.omit(numericDictionary, "a");  // $ExpectType NumericDictionary<AbcObject>
 
-    _(obj).omit("a"); // ExpectType LoDashImplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
+    _(obj).omit("a"); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "b" | "c">>
     _(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(dictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<Dictionary<AbcObject>>
     _(numericDictionary).omit("a"); // $ExpectType LoDashImplicitWrapper<NumericDictionary<AbcObject>>
 
-    _.chain(obj).omit("a"); // ExpectType LoDashExplicitWrapper<Pick<AbcObject, "b" | "c">>   // NOTE: ExpectType disabled because it fails in TS2.4
+    _.chain(obj).omit("a"); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "b" | "c">>
     _.chain(obj).omit(["b", 1], 0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(dictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<Dictionary<AbcObject>>
     _.chain(numericDictionary).omit("a"); // $ExpectType LoDashExplicitWrapper<NumericDictionary<AbcObject>>
 
-    fp.omit("a", obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.4
-    fp.omit("a")(obj); // ExpectType Pick<AbcObject, "b" | "c">   // NOTE: ExpectType disabled because it fails in TS2.3
-    fp.omit(["a", "b"])(obj); // ExpectType Pick<AbcObject, "c">   // NOTE: ExpectType disabled because it fails in TS2.3
+    fp.omit("a", obj); // $ExpectType Pick<AbcObject, "b" | "c">
+    fp.omit("a")(obj); // $ExpectType Partial<AbcObject>
+    fp.omit(["a", "b"])(obj); // $ExpectType Partial<AbcObject>
 }
 
 // _.omitBy
 {
     const obj: AbcObject | null | undefined = anything;
+    const dictionary: _.Dictionary<boolean> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<boolean> | null | undefined = anything;
     const predicate = (element: string | number | boolean, key: string) => true;
+    const predicate2 = (element: boolean, key: string) => true;
 
     _.omitBy(obj, predicate); // $ExpectType Partial<AbcObject>
+    _.omitBy(dictionary, predicate2); // $ExpectType Dictionary<boolean>
+    _.omitBy(numericDictionary, predicate2); // $ExpectType NumericDictionary<boolean>
     _(obj).omitBy(predicate); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(dictionary).omitBy(predicate2); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+    _(numericDictionary).omitBy(predicate2); // $ExpectType LoDashImplicitWrapper<NumericDictionary<boolean>>
     _.chain(obj).omitBy(predicate); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(dictionary).omitBy(predicate2); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+    _.chain(numericDictionary).omitBy(predicate2); // $ExpectType LoDashExplicitWrapper<NumericDictionary<boolean>>
     fp.omitBy(predicate, obj); // $ExpectType Partial<AbcObject>
-    fp.omitBy(predicate)(obj); // $ExpectType Partial<AbcObject>
+    fp.omitBy(predicate2)(dictionary); // $ExpectType Dictionary<boolean>
+    fp.omitBy(predicate2)(numericDictionary); // $ExpectType NumericDictionary<boolean>
 }
 
 // _.pick
 {
     const obj1: AbcObject | null | undefined = anything;
     const obj2: AbcObject = anything;
-    const readonlyArray: string[] = ["a", "b"]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+    const readonlyArray: ReadonlyArray<string> = ["a", "b"];
     const literalsArray: Array<"a" | "b"> = ["a", "b"];
-    const roLiteralsArray: Array<"a" | "b"> = literalsArray; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+    const roLiteralsArray: ReadonlyArray<"a" | "b"> = literalsArray;
 
     _.pick(obj1, "a"); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, 0, "a"); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, ["b", 1], 0, "a"); // $ExpectType PartialDeep<AbcObject>
     _.pick(obj1, readonlyArray); // $ExpectType PartialDeep<AbcObject>
-    // Broken in TS 2.4
-    // _.pick(obj2, "a", "b"); // Pick<AbcObject, "a" | "b">
-    _.pick(obj2, literalsArray); // $ExpectType Pick<AbcObject, "a" | "b">
-    _.pick(obj2, roLiteralsArray); // $ExpectType Pick<AbcObject, "a" | "b">
+    _.pick(obj2, "a", "b"); // $ExpectType Pick<AbcObject, "a" | "b">
+    // We can't use ExpectType here because typescript keeps changing what order the types appear.
+    let result1: Pick<AbcObject, "a" | "b">;
+    result1 = _.pick(obj2, literalsArray);
+    result1 = _.pick(obj2, roLiteralsArray);
 
     _(obj1).pick("a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(["b", 1], 0, "a"); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
     _(obj1).pick(readonlyArray); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
-    // Broken in TS 2.4
-    // _(obj2).pick("a", "b"); // LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
-    _(obj2).pick(literalsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
-    _(obj2).pick(roLiteralsArray); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    _(obj2).pick("a", "b"); // $ExpectType LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>
+    let result2: _.LoDashImplicitWrapper<Pick<AbcObject, "a" | "b">>;
+    result2 = _(obj2).pick(literalsArray);
+    result2 = _(obj2).pick(roLiteralsArray);
 
     _.chain(obj1).pick("a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(["b", 1], 0, "a"); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
     _.chain(obj1).pick(readonlyArray); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
-    // Broken in TS 2.4
-    // _.chain(obj2).pick("a", "b"); // LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
-    _.chain(obj2).pick(literalsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
-    _.chain(obj2).pick(roLiteralsArray); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    _.chain(obj2).pick("a", "b"); // $ExpectType LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>
+    let result3: _.LoDashExplicitWrapper<Pick<AbcObject, "a" | "b">>;
+    result3 = _.chain(obj2).pick(literalsArray);
+    result3 = _.chain(obj2).pick(roLiteralsArray);
 
     fp.pick<AbcObject, "a">("a", obj2); // $ExpectType Pick<AbcObject, "a">
     fp.pick<AbcObject, "a">("a")(obj2); // $ExpectType Pick<AbcObject, "a">
-    fp.pick<AbcObject, "a" | "b">(literalsArray)(obj2); // $ExpectType Pick<AbcObject, "a" | "b">
+    result1 = fp.pick<AbcObject, "a" | "b">(literalsArray)(obj2);
 }
 
 // _.pickBy
 {
     const obj: AbcObject | null | undefined = anything;
+    const dictionary: _.Dictionary<boolean> | null | undefined = anything;
+    const numericDictionary: _.NumericDictionary<boolean> | null | undefined = anything;
     const predicate = (element: string | number | boolean, key: string) => true;
+    const predicate2 = (element: boolean, key: string) => true;
 
     _.pickBy(obj, predicate); // $ExpectType Partial<AbcObject>
+    _.pickBy(dictionary, predicate2); // $ExpectType Dictionary<boolean>
+    _.pickBy(numericDictionary, predicate2); // $ExpectType NumericDictionary<boolean>
     _(obj).pickBy(predicate); // $ExpectType LoDashImplicitWrapper<Partial<AbcObject>>
+    _(dictionary).pickBy(predicate2); // $ExpectType LoDashImplicitWrapper<Dictionary<boolean>>
+    _(numericDictionary).pickBy(predicate2); // $ExpectType LoDashImplicitWrapper<NumericDictionary<boolean>>
     _.chain(obj).pickBy(predicate); // $ExpectType LoDashExplicitWrapper<Partial<AbcObject>>
+    _.chain(dictionary).pickBy(predicate2); // $ExpectType LoDashExplicitWrapper<Dictionary<boolean>>
+    _.chain(numericDictionary).pickBy(predicate2); // $ExpectType LoDashExplicitWrapper<NumericDictionary<boolean>>
     fp.pickBy(predicate, obj); // $ExpectType Partial<AbcObject>
-    fp.pickBy(predicate)(obj); // $ExpectType Partial<AbcObject>
+    fp.pickBy(predicate2)(dictionary); // $ExpectType Dictionary<boolean>
+    fp.pickBy(predicate2)(numericDictionary); // $ExpectType NumericDictionary<boolean>
+
+    const mixedDictionary: _.Dictionary<string | number> | null | undefined = anything;
+
+    const userDefinedTypeGuard = (item: string | number): item is number => typeof item === "number";
+
+    _.pickBy(mixedDictionary, userDefinedTypeGuard); // $ExpectType Dictionary<number>
+    _(mixedDictionary).pickBy(userDefinedTypeGuard); // $ExpectType LoDashImplicitWrapper<Dictionary<number>>
+    _.chain(mixedDictionary).pickBy(userDefinedTypeGuard); // $ExpectType LoDashExplicitWrapper<Dictionary<number>>
+    fp.pickBy(userDefinedTypeGuard)(mixedDictionary); // $ExpectType Dictionary<number>
+
+    const mixedNumericDictionary: _.NumericDictionary<string | number> | null | undefined = anything;
+
+    _.pickBy(mixedNumericDictionary, userDefinedTypeGuard); // $ExpectType NumericDictionary<number>
+    _(mixedNumericDictionary).pickBy(userDefinedTypeGuard); // $ExpectType LoDashImplicitWrapper<NumericDictionary<number>>
+    _.chain(mixedNumericDictionary).pickBy(userDefinedTypeGuard); // $ExpectType LoDashExplicitWrapper<NumericDictionary<number>>
+    fp.pickBy(userDefinedTypeGuard)(mixedNumericDictionary); // $ExpectType NumericDictionary<number>
 }
 
 // _.result
@@ -6034,7 +6058,7 @@ fp.now(); // $ExpectType number
 
 // _.prototype.concat
 {
-    const numberROA: number[] = [0]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+    const numberROA: ReadonlyArray<number> = [0];
 
     _.concat(1); // $ExpectType number[]
     _.concat([1]); // $ExpectType number[]
@@ -6057,7 +6081,7 @@ fp.now(); // $ExpectType number
     _.chain(numberROA).concat(numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
     _.chain(numberROA).concat(numberROA, numberROA); // $ExpectType LoDashExplicitWrapper<number[]>
 
-    const objectROA: AbcObject[] = [{ a: 1, b: 'foo', c: true }]; // TODO: Should be ReadonlyArray, but see comment on type Many<T>
+    const objectROA: ReadonlyArray<AbcObject> = [{ a: 1, b: 'foo', c: true }];
 
     _.concat(abcObject, abcObject); // $ExpectType AbcObject[]
     _.concat(abcObject, [abcObject], objectROA); // $ExpectType AbcObject[]
diff --git a/types/lodash/scripts/generate-fp.ts b/types/lodash/scripts/generate-fp.ts
index 9a03fef544..817b485cf2 100644
--- a/types/lodash/scripts/generate-fp.ts
+++ b/types/lodash/scripts/generate-fp.ts
@@ -118,7 +118,7 @@ async function main() {
         "    interface LoDashFp {",
         ...interfaceGroups.map(g => `        ${g.functionName}: ${g.interfaces[0].name};`),
         "        __: lodash.__;",
-        "        placehodler: lodash.__;",
+        "        placeholder: lodash.__;",
         "    }",
         "}",
         "",
diff --git a/types/lodash/scripts/generate-lowdb.ts b/types/lodash/scripts/generate-lowdb.ts
index 13fbd18fe4..5b8e1269bd 100644
--- a/types/lodash/scripts/generate-lowdb.ts
+++ b/types/lodash/scripts/generate-lowdb.ts
@@ -92,11 +92,11 @@ async function main() {
         'import _ = require("lodash");',
         'declare module "./index" {',
         "    interface LoDashExplicitSyncWrapper<TValue> {",
-        syncFunctions, // TODO: write sync?
+        syncFunctions,
         "    }",
         "",
         "    interface LoDashExplicitAsyncWrapper<TValue> {",
-        asyncFunctions, // TODO: write async?
+        asyncFunctions,
         "    }",
         "}",
         "",
diff --git a/types/lodash/scripts/generate-modules.ts b/types/lodash/scripts/generate-modules.ts
index a15462ba11..28d5e585c3 100644
--- a/types/lodash/scripts/generate-modules.ts
+++ b/types/lodash/scripts/generate-modules.ts
@@ -56,7 +56,7 @@ async function globalDefinitionText(moduleName: string): Promise<string> {
 // Project: http://lodash.com/
 // Definitions by: Brian Zengel <https://github.com/bczengel>, Ilya Mochalov <https://github.com/chrootsu>, Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.6
 
 // Generated from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/lodash/scripts/generate-modules.ts
 
diff --git a/types/lolex/index.d.ts b/types/lolex/index.d.ts
index fc6dcc3b4b..1727c97ad3 100644
--- a/types/lolex/index.d.ts
+++ b/types/lolex/index.d.ts
@@ -184,7 +184,7 @@ export interface LolexInstallOpts {
     /**
      * Installs lolex with the specified unix epoch (default: 0)
      */
-    now?: number;
+    now?: number | Date;
 
     /**
      * An array with explicit function names to hijack. When not set, lolex will automatically fake all methods except nextTick
diff --git a/types/lolex/lolex-tests.ts b/types/lolex/lolex-tests.ts
index 4de6ecc7a6..f698eac3cc 100644
--- a/types/lolex/lolex-tests.ts
+++ b/types/lolex/lolex-tests.ts
@@ -25,6 +25,15 @@ lolex.install<lolex.BrowserClock>({
 	toFake: ["setTimeout", "nextTick", "hrtime"]
 });
 
+lolex.install<lolex.BrowserClock>({
+	advanceTimeDelta: 20,
+	loopLimit: 10,
+	now: new Date(0),
+	shouldAdvanceTime: true,
+	target: {},
+	toFake: ["setTimeout", "nextTick", "hrtime"]
+});
+
 const browserNow: number = browserClock.now;
 const browserDate: Date = new browserClock.Date();
 
diff --git a/types/lowdb/_lodash.d.ts b/types/lowdb/_lodash.d.ts
index a7d2c424f0..ca8aace259 100644
--- a/types/lowdb/_lodash.d.ts
+++ b/types/lowdb/_lodash.d.ts
@@ -805,6 +805,10 @@ declare module "./index" {
             ...args: any[]
         ): LoDashExplicitSyncWrapper<number>;
         memoize(resolver?: (...args: any[]) => any): LoDashExplicitSyncWrapper<TValue & _.MemoizedFunction>;
+        negate(this: LoDashExplicitSyncWrapper<() => boolean>): LoDashExplicitSyncWrapper<() => boolean>;
+        negate<A1>(this: LoDashExplicitSyncWrapper<(a1: A1) => boolean>): LoDashExplicitSyncWrapper<(a1: A1) => boolean>;
+        negate<A1, A2>(this: LoDashExplicitSyncWrapper<(a1: A1, a2: A2) => boolean>): LoDashExplicitSyncWrapper<(a1: A1, a2: A2) => boolean>;
+        negate(this: LoDashExplicitSyncWrapper<(...args: any[]) => any>): LoDashExplicitSyncWrapper<(...args: any[]) => boolean>;
         overArgs(...transforms: Array<_.Many<(...args: any[]) => any>>): LoDashExplicitSyncWrapper<(...args: any[]) => any>;
         partial: _.ExplicitPartial;
         partialRight: _.ExplicitPartialRight;
@@ -1273,6 +1277,14 @@ declare module "./index" {
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
             ...paths: Array<_.Many<_.PropertyName>>
         ): LoDashExplicitSyncWrapper<_.PartialObject<T>>;
+        omitBy<T>(
+            this: LoDashExplicitSyncWrapper<_.Dictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitSyncWrapper<_.Dictionary<T>>;
+        omitBy<T>(
+            this: LoDashExplicitSyncWrapper<_.NumericDictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitSyncWrapper<_.NumericDictionary<T>>;
         omitBy<T extends object>(
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
             predicate: _.ValueKeyIteratee<T[keyof T]>
@@ -1285,6 +1297,22 @@ declare module "./index" {
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
             ...props: _.PropertyPath[]
         ): LoDashExplicitSyncWrapper<_.PartialObject<T>>;
+        pickBy<T, S extends T>(
+            this: LoDashExplicitSyncWrapper<_.Dictionary<T> | null | undefined>,
+            predicate: _.ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashExplicitSyncWrapper<_.Dictionary<S>>;
+        pickBy<T, S extends T>(
+            this: LoDashExplicitSyncWrapper<_.NumericDictionary<T> | null | undefined>,
+            predicate: _.ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashExplicitSyncWrapper<_.NumericDictionary<S>>;
+        pickBy<T>(
+            this: LoDashExplicitSyncWrapper<_.Dictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitSyncWrapper<_.Dictionary<T>>;
+        pickBy<T>(
+            this: LoDashExplicitSyncWrapper<_.NumericDictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitSyncWrapper<_.NumericDictionary<T>>;
         pickBy<T extends object>(
             this: LoDashExplicitSyncWrapper<T | null | undefined>,
             predicate?: _.ValueKeyIteratee<T[keyof T]>
@@ -2373,6 +2401,10 @@ declare module "./index" {
             ...args: any[]
         ): LoDashExplicitAsyncWrapper<number>;
         memoize(resolver?: (...args: any[]) => any): LoDashExplicitAsyncWrapper<TValue & _.MemoizedFunction>;
+        negate(this: LoDashExplicitAsyncWrapper<() => boolean>): LoDashExplicitAsyncWrapper<() => boolean>;
+        negate<A1>(this: LoDashExplicitAsyncWrapper<(a1: A1) => boolean>): LoDashExplicitAsyncWrapper<(a1: A1) => boolean>;
+        negate<A1, A2>(this: LoDashExplicitAsyncWrapper<(a1: A1, a2: A2) => boolean>): LoDashExplicitAsyncWrapper<(a1: A1, a2: A2) => boolean>;
+        negate(this: LoDashExplicitAsyncWrapper<(...args: any[]) => any>): LoDashExplicitAsyncWrapper<(...args: any[]) => boolean>;
         overArgs(...transforms: Array<_.Many<(...args: any[]) => any>>): LoDashExplicitAsyncWrapper<(...args: any[]) => any>;
         partial: _.ExplicitPartial;
         partialRight: _.ExplicitPartialRight;
@@ -2841,6 +2873,14 @@ declare module "./index" {
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,
             ...paths: Array<_.Many<_.PropertyName>>
         ): LoDashExplicitAsyncWrapper<_.PartialObject<T>>;
+        omitBy<T>(
+            this: LoDashExplicitAsyncWrapper<_.Dictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitAsyncWrapper<_.Dictionary<T>>;
+        omitBy<T>(
+            this: LoDashExplicitAsyncWrapper<_.NumericDictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitAsyncWrapper<_.NumericDictionary<T>>;
         omitBy<T extends object>(
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,
             predicate: _.ValueKeyIteratee<T[keyof T]>
@@ -2853,6 +2893,22 @@ declare module "./index" {
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,
             ...props: _.PropertyPath[]
         ): LoDashExplicitAsyncWrapper<_.PartialObject<T>>;
+        pickBy<T, S extends T>(
+            this: LoDashExplicitAsyncWrapper<_.Dictionary<T> | null | undefined>,
+            predicate: _.ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashExplicitAsyncWrapper<_.Dictionary<S>>;
+        pickBy<T, S extends T>(
+            this: LoDashExplicitAsyncWrapper<_.NumericDictionary<T> | null | undefined>,
+            predicate: _.ValueKeyIterateeTypeGuard<T, S>
+        ): LoDashExplicitAsyncWrapper<_.NumericDictionary<S>>;
+        pickBy<T>(
+            this: LoDashExplicitAsyncWrapper<_.Dictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitAsyncWrapper<_.Dictionary<T>>;
+        pickBy<T>(
+            this: LoDashExplicitAsyncWrapper<_.NumericDictionary<T> | null | undefined>,
+            predicate?: _.ValueKeyIteratee<T>
+        ): LoDashExplicitAsyncWrapper<_.NumericDictionary<T>>;
         pickBy<T extends object>(
             this: LoDashExplicitAsyncWrapper<T | null | undefined>,
             predicate?: _.ValueKeyIteratee<T[keyof T]>
diff --git a/types/lunr/index.d.ts b/types/lunr/index.d.ts
index e16851b52b..da87ae95d8 100644
--- a/types/lunr/index.d.ts
+++ b/types/lunr/index.d.ts
@@ -238,7 +238,6 @@ declare namespace lunr {
          * A query builder callback provides a query object to be used to express
          * the query to perform on the index.
          *
-         * @callback lunr.Index~queryBuilder
          * @param query - The query object to build up.
          */
         type QueryBuilder = (this: Query, query: Query) => void;
@@ -658,7 +657,6 @@ declare namespace lunr {
          * A token update function is used when updating or optionally
          * when cloning a token.
          *
-         * @callback lunr.Token~updateFunction
          * @param str - The string representation of the token.
          * @param metadata - All metadata associated with this token.
          */
diff --git a/types/luxon/index.d.ts b/types/luxon/index.d.ts
index 94623c5abb..e96e389894 100644
--- a/types/luxon/index.d.ts
+++ b/types/luxon/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for luxon 0.5
+// Type definitions for luxon 1.2
 // Project: https://github.com/moment/luxon#readme
 // Definitions by: Colby DeHart <https://github.com/colbydehart>
 //                 Hyeonseok Yang <https://github.com/FourwingsY>
@@ -180,14 +180,14 @@ declare module 'luxon' {
             zoneName: string;
             diff(
                 other: DateTime,
-                unit?: string | string[],
+                unit?: DurationUnit | DurationUnit[],
                 options?: DiffOptions
             ): Duration;
-            diffNow(unit?: string | string[], options?: DiffOptions): Duration;
-            endOf(unit: string): DateTime;
+            diffNow(unit?: DurationUnit | DurationUnit[], options?: DiffOptions): Duration;
+            endOf(unit: DurationUnit): DateTime;
             equals(other: DateTime): boolean;
-            get(unit: string): number;
-            hasSame(other: DateTime, unit: string): boolean;
+            get(unit: keyof DateTime): number;
+            hasSame(other: DateTime, unit: DurationUnit): boolean;
             minus(duration: Duration | number | DurationObject): DateTime;
             plus(duration: Duration | number | DurationObject): DateTime;
             reconfigure(properties: LocaleOptions): DateTime;
@@ -195,7 +195,8 @@ declare module 'luxon' {
             set(values: DateObjectUnits): DateTime;
             setLocale(locale: any): DateTime;
             setZone(zone: string | Zone, options?: ZoneOptions): DateTime;
-            startOf(unit: string): DateTime;
+            startOf(unit: DurationUnit): DateTime;
+            toBSON(): Date;
             toFormat(format: string, options?: ToFormatOptions): string;
             toHTTP(): string;
             toISO(options?: ISOTimeOptions): string;
@@ -207,8 +208,9 @@ declare module 'luxon' {
             toLocal(): DateTime;
             toLocaleParts(options?: DateTimeFormatOptions): any[];
             toLocaleString(options?: DateTimeFormatOptions): string;
-            toObject(options?: { includeConfig?: boolean }): DateObject;
             toMillis(): number;
+            toMillis(): number;
+            toObject(options?: { includeConfig?: boolean }): DateObject;
             toRFC2822(): string;
             toSQL(options?: Object): string;
             toSQLDate(): string;
@@ -238,6 +240,9 @@ declare module 'luxon' {
 
         type DurationObject = DurationObjectUnits & DurationOptions;
 
+        type DurationUnit = 'year' | 'years' | 'quarter' | 'quarters' | 'month' | 'months' | 'week' | 'weeks' | 'day' | 'days'
+                            | 'hour' | 'hours' | 'minute' | 'minutes' | 'second' | 'seconds' | 'millisecond' | 'milliseconds';
+
         class Duration {
             static fromISO(text: string, options?: DurationOptions): Duration;
             static fromMillis(
@@ -261,16 +266,16 @@ declare module 'luxon' {
             seconds: number;
             weeks: number;
             years: number;
-            as(unit: string): number;
+            as(unit: DurationUnit): number;
             equals(other: Duration): boolean;
-            get(unit: string): number;
+            get(unit: DurationUnit): 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;
+            shiftTo(...units: DurationUnit[]): Duration;
             toFormat(format: string, options?: ToFormatOptions): string;
             toISO(): string;
             toJSON(): string;
@@ -278,6 +283,7 @@ declare module 'luxon' {
                 includeConfig?: boolean;
             }): DurationObject;
             toString(): string;
+            valueOf(): number;
         }
 
         type EraLength = 'short' | 'long';
@@ -313,8 +319,8 @@ declare module 'luxon' {
         }
 
         type IntervalObject = {
-            start: DateTime;
-            end: DateTime;
+            start?: DateTime;
+            end?: DateTime;
         };
 
         class Interval {
@@ -332,8 +338,8 @@ declare module 'luxon' {
             ): Interval;
             static fromISO(string: string, options?: DateTimeOptions): Interval;
             static invalid(reason?: string): Interval;
-            static merge(intervals: Interval[]): [Interval];
-            static xor(intervals: Interval[]): [Interval];
+            static merge(intervals: Interval[]): Interval[];
+            static xor(intervals: Interval[]): Interval[];
             end: DateTime;
             invalidReason: string;
             isValid: boolean;
@@ -341,23 +347,23 @@ declare module 'luxon' {
             abutsEnd(other: Interval): boolean;
             abutsStart(other: Interval): boolean;
             contains(dateTime: DateTime): boolean;
-            count(unit?: string): number;
+            count(unit?: DurationUnit): number;
             difference(...intervals: Interval[]): Interval[];
             divideEqually(numberOfParts?: number): Interval[];
             engulfs(other: Interval): boolean;
             equals(other: Interval): boolean;
-            hasSame(unit: string): boolean;
+            hasSame(unit: DurationUnit): boolean;
             intersection(other: Interval): Interval;
             isAfter(dateTime: DateTime): boolean;
             isBefore(dateTime: DateTime): boolean;
             isEmpty(): boolean;
-            length(unit?: string): number;
+            length(unit?: DurationUnit): number;
             overlaps(other: Interval): boolean;
             set(values: IntervalObject): Interval;
             splitAt(...dateTimes: DateTime[]): Interval[];
             splitBy(duration: Duration | DurationObject | number): Interval[];
             toDuration(
-                unit: string | string[],
+                unit: DurationUnit | DurationUnit[],
                 options?: DiffOptions
             ): Duration;
             toFormat(
@@ -396,6 +402,10 @@ declare module 'luxon' {
             equals(other: Zone): boolean;
             offset(ts: number): number;
         }
+
+        class IANAZone extends Zone {
+            constructor(ianaString: string);
+        }
     }
 
     export = luxon;
diff --git a/types/luxon/luxon-tests.ts b/types/luxon/luxon-tests.ts
index 4396e8d7a2..017f07b0c6 100644
--- a/types/luxon/luxon-tests.ts
+++ b/types/luxon/luxon-tests.ts
@@ -1,4 +1,4 @@
-import { DateTime, Duration, Interval, Info, Settings } from 'luxon';
+import { DateTime, Duration, Interval, Info, Settings, IANAZone } from 'luxon';
 
 /* DateTime */
 const dt = DateTime.local(2017, 5, 15, 8, 30);
@@ -13,6 +13,11 @@ const fromObject = DateTime.fromObject({
     numberingSystem: 'beng'
 });
 
+const ianaZone = new IANAZone('America/Los_Angeles');
+const ianaZoneTest = DateTime.fromObject({
+    zone: ianaZone
+});
+
 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
 
@@ -73,6 +78,7 @@ const i = Interval.fromDateTimes(now, later);
 i.length();
 i.length('years');
 i.contains(DateTime.local(2019));
+i.set({end: DateTime.local(2020)});
 
 i.toISO();
 i.toString();
diff --git a/types/mali-compose/index.d.ts b/types/mali-compose/index.d.ts
new file mode 100644
index 0000000000..87b23087d3
--- /dev/null
+++ b/types/mali-compose/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for mali 1.1
+// Project: https://github.com/malijs/mali-compose
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import { Context } from "mali";
+
+declare function compose(
+    middleware: ReadonlyArray<
+        (ctx: Context, next: () => Promise<void>) => Promise<void>
+    >
+): (context: Context, next: () => Promise<void>) => Promise<void>;
+
+export = compose;
diff --git a/types/mali-compose/mali-compose-tests.ts b/types/mali-compose/mali-compose-tests.ts
new file mode 100644
index 0000000000..190ab46458
--- /dev/null
+++ b/types/mali-compose/mali-compose-tests.ts
@@ -0,0 +1,39 @@
+import compose = require('mali-compose');
+import { Context } from 'mali';
+
+type middleware = (context: Context, next: () => Promise<void>) => Promise<void>;
+
+const arr: number[] = [];
+const stack: middleware[] = [];
+
+function _sleep(ms: number) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+stack.push(async (ctx: Context, next: () => Promise<void>) => {
+    arr.push(1);
+    await _sleep(1);
+    await next();
+    await _sleep(1);
+    arr.push(6);
+  });
+
+stack.push(async (ctx: Context, next: () => Promise<void>) => {
+  arr.push(2);
+  await _sleep(1);
+  await next();
+  await _sleep(1);
+  arr.push(5);
+});
+
+stack.push(async (ctx: Context, next: () => Promise<void>) => {
+  arr.push(3);
+  await _sleep(1);
+  await next();
+  await _sleep(1);
+  arr.push(4);
+});
+
+compose(stack);
+compose([]);
+compose([compose(stack)]);
diff --git a/types/mali-compose/tsconfig.json b/types/mali-compose/tsconfig.json
new file mode 100644
index 0000000000..e0afe50e85
--- /dev/null
+++ b/types/mali-compose/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"mali-compose-tests.ts"
+	]
+}
diff --git a/types/mali-compose/tslint.json b/types/mali-compose/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/mali-compose/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/mali/index.d.ts b/types/mali/index.d.ts
new file mode 100644
index 0000000000..1c73b18c75
--- /dev/null
+++ b/types/mali/index.d.ts
@@ -0,0 +1,77 @@
+// Type definitions for mali 0.9
+// Project: https://github.com/malijs/mali
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { EventEmitter } from 'events';
+import { Stream } from 'stream';
+
+declare class Mali extends EventEmitter {
+  constructor(path: any, name?: string | ReadonlyArray<string>, options?: any);
+  name: string;
+  env: string;
+  ports: ReadonlyArray<string | number>; // ? not sure which it is
+  silent: boolean;
+
+  addService(path: any, name: string | ReadonlyArray<string>, options?: any): void;
+  use(service?: any, name?: any, fns?: any): void;
+  start(port?: any, creds?: any, options?: any): any; // gnarly type asserting for these functions so Im just gonna let them handle it.
+  toJSON(): any;
+  close(): void;
+  inspect(): any;
+}
+
+declare namespace Mali {
+  interface Context {
+    name: string;
+    fullName: string;
+    service: string;
+    package: string;
+    app: any; // ? app
+    call: any;
+    request: Request;
+    response: Response;
+    req: any; // ?
+    res: any; // ?
+    type: string;
+    metadata: string;
+    get(field: string): any;
+    set(field: any, val?: any): void; // do I need `?:` if its of type `any`?
+    sendMetadata(md: any): void;
+    getStatus(field: string): any;
+    setStatus(field: any, val?: any): void; // ^
+  }
+
+  class Request {
+    constructor(call: any, type: string);
+    call: any;
+    type: string;
+    metadata: any;
+    req: any; // ?
+
+    getMetadata(): any;
+    get(field: string): any;
+  }
+
+  class Response {
+    constructor(call: any, type: string);
+    call: any;
+    type: string;
+    metadata: any;
+    status: any;
+    res: any; // ?
+    set(field: any, val?: any): void; // is `val?:` necessary when its of type `any`?
+    get(field: string): any;
+    getMetadata(): any;
+    sendMetadata(md?: any): void;
+    getStatus(field: string): any;
+    setStatus(field: any, val?: any): void; // ^ same as above
+  }
+
+  function exec(ctx: Context, handler: any, cb?: any): void;
+}
+
+export = Mali;
diff --git a/types/mali/mali-tests.ts b/types/mali/mali-tests.ts
new file mode 100644
index 0000000000..d6d33a263f
--- /dev/null
+++ b/types/mali/mali-tests.ts
@@ -0,0 +1,16 @@
+// example from https://github.com/malijs/mali#example
+
+import Mali = require('mali');
+import path = require('path');
+
+const PROTO_PATH = path.resolve(__dirname, '../protos/helloworld.proto');
+
+async function sayHello(ctx: Mali.Context) {
+  ctx.res = { message: 'Hello '.concat(ctx.req.name) };
+}
+
+const app = new Mali(PROTO_PATH);
+// $ExpectType void
+app.use({sayHello});
+// $ExpectType any
+app.start('127.0.0.1:50051');
diff --git a/types/mali/tsconfig.json b/types/mali/tsconfig.json
new file mode 100644
index 0000000000..1a4f86d02c
--- /dev/null
+++ b/types/mali/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "mali-tests.ts"
+	]
+}
diff --git a/types/mali/tslint.json b/types/mali/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/mali/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/mapbox-gl/index.d.ts b/types/mapbox-gl/index.d.ts
index 5a5e581b0a..3f09b5d6de 100644
--- a/types/mapbox-gl/index.d.ts
+++ b/types/mapbox-gl/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mapbox GL JS v0.45.0
+// Type definitions for Mapbox GL JS v0.48.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
@@ -6,6 +6,9 @@
 
 /// <reference types="geojson" />
 
+export = mapboxgl;
+export as namespace mapboxgl;
+
 declare namespace mapboxgl {
     let accessToken: string;
     let version: string;
@@ -26,17 +29,15 @@ declare namespace mapboxgl {
     export class Map extends Evented {
         constructor(options?: MapboxOptions);
 
-        addControl(control: Control, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
+        addControl(control: Control | IControl, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
 
-        addControl(control: IControl, position?: 'top-right' | 'top-left' | 'bottom-right' | 'bottom-left'): this;
+        removeControl(control: Control | IControl): this;
 
-        removeControl(control: Control): this;
+        resize(eventData?: EventData): this;
 
-        removeControl(control: IControl): this;
+        getBounds(): LngLatBounds;
 
-        resize(): this;
-
-        getBounds(): mapboxgl.LngLatBounds;
+        getMaxBounds(): LngLatBounds;
 
         setMaxBounds(lnglatbounds?: LngLatBoundsLike): this;
 
@@ -48,6 +49,10 @@ declare namespace mapboxgl {
 
         getMaxZoom(): number;
 
+        getRenderWorldCopies(): boolean;
+
+        setRenderWorldCopies(renderWorldCopies?: boolean): this;
+
         project(lnglat: LngLatLike): mapboxgl.Point;
 
         unproject(point: PointLike): mapboxgl.LngLat;
@@ -58,17 +63,17 @@ declare namespace mapboxgl {
 
         isRotating(): boolean;
 
-        queryRenderedFeatures(pointOrBox?: PointLike | PointLike[], parameters?: { layers?: string[], filter?: any[] }): GeoJSON.Feature<GeoJSONGeometry>[];
+        queryRenderedFeatures(pointOrBox?: PointLike | PointLike[], parameters?: { layers?: string[], filter?: any[] }): GeoJSON.Feature<GeoJSON.Geometry>[];
 
-        querySourceFeatures(sourceID: string, parameters?: { sourceLayer?: string, filter?: any[] }): GeoJSON.Feature<GeoJSONGeometry>[];
+        querySourceFeatures(sourceID: string, parameters?: { sourceLayer?: string, filter?: any[] }): GeoJSON.Feature<GeoJSON.Geometry>[];
 
-        setStyle(style: mapboxgl.Style | string): this;
+        setStyle(style: mapboxgl.Style | string, options?: { diff?: boolean, localIdeographFontFamily?: string }): this;
 
         getStyle(): mapboxgl.Style;
 
         isStyleLoaded(): boolean;
 
-        addSource(id: string, source: VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
+        addSource(id: string, source: VectorSource | RasterSource | RasterDemSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw): this;
 
         isSourceLoaded(id: string): boolean;
 
@@ -76,9 +81,9 @@ declare namespace mapboxgl {
 
         removeSource(id: string): this;
 
-        getSource(id: string): VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource;
+        getSource(id: string): VectorSource | RasterSource | RasterDemSource | GeoJSONSource | ImageSource | VideoSource;
 
-        addImage(name: string, image: HTMLImageElement | ArrayBufferView, options?: { width?: number, height?: number, pixelRatio?: number }): this;
+        addImage(name: string, image: HTMLImageElement | ArrayBufferView | { width: number, height: number, data: Uint8Array | Uint8ClampedArray } | ImageData, options?: { pixelRatio?: number, sdf?: any }): this;
 
         hasImage(name: string): boolean;
 
@@ -86,6 +91,8 @@ declare namespace mapboxgl {
 
         loadImage(url: string, callback: Function): this;
 
+        listImages(): string[];
+
         addLayer(layer: mapboxgl.Layer, before?: string): this;
 
         moveLayer(id: string, beforeId?: string): this;
@@ -96,7 +103,7 @@ declare namespace mapboxgl {
 
         setFilter(layer: string, filter?: any[]): this;
 
-        setLayerZoomRange(layerId: string, minzoom?: number, maxzoom?: number): this;
+        setLayerZoomRange(layerId: string, minzoom: number, maxzoom: number): this;
 
         getFilter(layer: string): any[];
 
@@ -108,10 +115,14 @@ declare namespace mapboxgl {
 
         getLayoutProperty(layer: string, name: string, klass?: string): any;
 
-        setLight(options: mapboxgl.Light, lightOptions: any): this;
+        setLight(options: mapboxgl.Light, lightOptions?: any): this;
 
         getLight(): mapboxgl.Light;
 
+        setFeatureState(feature: {source?: string, sourceLayer?: string, id?: string}, state: any): void;
+
+        getFeatureState(feature: {source?: string, sourceLayer?: string, id?: string}): any;
+
         getContainer(): HTMLElement;
 
         getCanvasContainer(): HTMLElement;
@@ -134,7 +145,7 @@ declare namespace mapboxgl {
 
         setCenter(center: LngLatLike, eventData?: mapboxgl.EventData): this;
 
-        panBy(offset: number[], options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
+        panBy(offset: PointLike, options?: mapboxgl.AnimationOptions, eventData?: mapboxgl.EventData): this;
 
         panTo(lnglat: LngLatLike, options?: mapboxgl.AnimationOptions, eventdata?: mapboxgl.EventData): this;
 
@@ -162,6 +173,8 @@ declare namespace mapboxgl {
 
         setPitch(pitch: number, eventData?: EventData): this;
 
+        cameraForBounds(bounds: LngLatBoundsLike, options?: {padding?: number | PaddingOptions, offset?: PointLike, maxZoom?: number}): CameraOptions;
+
         fitBounds(bounds: LngLatBoundsLike, options?: mapboxgl.FitBoundsOptions, eventData?: mapboxgl.EventData): this;
 
         jumpTo(options: mapboxgl.CameraOptions, eventData?: mapboxgl.EventData): this;
@@ -204,9 +217,19 @@ declare namespace mapboxgl {
         /** initial map center */
         center?: LngLatLike;
 
+        clickTolerance?: number;
+
+        collectResourceTiming?: boolean;
+
+        crossSourceCollisions?: boolean;
+
         /** ID of the container element */
         container?: string | Element;
 
+        /** String or strings to show in an AttributionControl.
+         * Only applicable if options.attributionControl is `true`. */
+        customAttribution?: string | string[];
+
         /** If true, enable the "drag to pan" interaction (see DragPanHandler). */
         dragPan?: boolean;
 
@@ -219,6 +242,8 @@ declare namespace mapboxgl {
         /** If true, the map will track and update the page URL according to map position */
         hash?: boolean;
 
+        fadeDuration?: number;
+
         /** If true, map creation will fail if the implementation determines that the performance of the created WebGL context would be dramatically lower than expected. */
         failIfMajorPerformanceCaveat?: boolean;
 
@@ -228,6 +253,8 @@ declare namespace mapboxgl {
         /** If true, enable keyboard shortcuts (see KeyboardHandler). */
         keyboard?: boolean;
 
+        localIdeographFontFamily?: string;
+
         logoPosition?: 'top-left' | 'top-right' | 'bottom-left' | 'bottom-right';
 
         /** If set, the map is constrained to the given bounds. */
@@ -244,6 +271,8 @@ declare namespace mapboxgl {
 
         pitch?: number;
 
+        pitchWithRotate?: boolean;
+
         refreshExpiredTiles?: boolean;
 
         renderWorldCopies?: boolean;
@@ -257,6 +286,8 @@ declare namespace mapboxgl {
         /** If  true, the map will automatically resize when the browser window resizes */
         trackResize?: boolean;
 
+        transformRequest?: Function;
+
         /** If true, enable the "pinch to rotate and zoom" interaction (see TouchZoomRotateHandler). */
         touchZoomRotate?: boolean;
 
@@ -414,7 +445,7 @@ declare namespace mapboxgl {
      * Attribution
      */
     export class AttributionControl extends Control {
-        constructor(options?: { compact?: boolean });
+        constructor(options?: { compact?: boolean, customAttribution?: string | string[] });
     }
 
     /**
@@ -464,6 +495,8 @@ declare namespace mapboxgl {
         anchor?: Anchor;
 
         offset?: number | PointLike | { [key: string]: PointLike; };
+
+        className?: string;
     }
 
     export interface Style {
@@ -498,11 +531,9 @@ declare namespace mapboxgl {
     }
 
     export interface Source {
-        type: 'vector' | 'raster' | 'geojson' | 'image' | 'video' | 'canvas';
+        type: 'vector' | 'raster' | 'raster-dem' | 'geojson' | 'image' | 'video' | 'canvas';
     }
 
-    export type GeoJSONGeometry = GeoJSON.Point | GeoJSON.LineString | GeoJSON.MultiPoint | GeoJSON.Polygon | GeoJSON.MultiLineString | GeoJSON.MultiPolygon | GeoJSON.GeometryCollection;
-
     /**
      * GeoJSONSource
      */
@@ -516,14 +547,22 @@ declare namespace mapboxgl {
 
         constructor(options?: mapboxgl.GeoJSONSourceOptions);
 
-        setData(data: GeoJSON.Feature<GeoJSONGeometry> | GeoJSON.FeatureCollection<GeoJSONGeometry> | String): this;
+        setData(data: GeoJSON.Feature<GeoJSON.Geometry> | GeoJSON.FeatureCollection<GeoJSON.Geometry> | String): this;
+
+        getClusterExpansionZoom(clusterId: number, callback: (error: any, zoom: number) => void): this;
+
+        getClusterChildren(clusterId: number, callback: (error: any, features: GeoJSON.Feature<GeoJSON.Geometry>[]) => void): this;
+
+        getClusterLeaves(cluserId: number, limit: number, offset: number, callback: (error: any, features: GeoJSON.Feature<GeoJSON.Geometry>[]) => void): this;
     }
 
     export interface GeoJSONSourceOptions {
-        data?: GeoJSON.Feature<GeoJSONGeometry> | GeoJSON.FeatureCollection<GeoJSONGeometry> | string;
+        data?: GeoJSON.Feature<GeoJSON.Geometry> | GeoJSON.FeatureCollection<GeoJSON.Geometry> | string;
 
         maxzoom?: number;
 
+        attribution?: string;
+
         buffer?: number;
 
         tolerance?: number;
@@ -589,6 +628,10 @@ declare namespace mapboxgl {
 
         canvas: string | HTMLCanvasElement;
 
+        play(): void;
+
+        pause(): void;
+
         getCanvas(): HTMLCanvasElement;
 
         setCoordinates(coordinates: number[][]): this;
@@ -606,17 +649,35 @@ declare namespace mapboxgl {
         type: 'vector';
         url?: string;
         tiles?: string[];
+        bounds?: number[];
+        scheme?: 'xyz' | 'tms';
         minzoom?: number;
         maxzoom?: number;
+        attribution?: string;
     }
 
     interface RasterSource extends Source {
         type: 'raster';
         url?: string;
         tiles?: string[];
+        bounds?: number[];
         minzoom?: number;
         maxzoom?: number;
         tileSize?: number;
+        scheme?: 'xyz' | 'tms';
+        attribution?: string;
+    }
+
+    interface RasterDemSource extends Source {
+        type: 'raster-dem';
+        url?: string;
+        tiles?: string[];
+        bounds?: number[];
+        minzoom?: number;
+        maxzoom?: number;
+        tileSize?: number;
+        attribution?: string;
+        encoding?: 'terrarium' | 'mapbox';
     }
 
     /**
@@ -710,9 +771,9 @@ declare namespace mapboxgl {
 
         clone(): Point;
 
-        add(p: number): Point;
+        add(p: Point): Point;
 
-        sub(p: number): Point;
+        sub(p: Point): Point;
 
         mult(k: number): Point;
 
@@ -750,7 +811,7 @@ declare namespace mapboxgl {
     /**
      * Marker
      */
-    export class Marker {
+    export class Marker extends Evented {
         constructor(options?: mapboxgl.MarkerOptions);
 
         constructor(element?: HTMLElement, options?: mapboxgl.MarkerOptions);
@@ -763,15 +824,21 @@ declare namespace mapboxgl {
 
         setLngLat(lngLat: LngLatLike): this;
 
+        getElement(): HTMLElement;
+
         setPopup(popup?: Popup): this;
 
         getPopup(): Popup;
 
+        togglePopup(): this;
+
         getOffset(): PointLike;
 
         setOffset(offset: PointLike): this;
 
-        togglePopup(): this;
+        setDraggable(shouldBeDraggable: boolean): this;
+
+        isDraggable(): boolean;
     }
 
     export interface MarkerOptions {
@@ -782,6 +849,8 @@ declare namespace mapboxgl {
         anchor?: Anchor;
 
         color?: string
+
+        draggable?: boolean;
     }
 
     /**
@@ -829,6 +898,7 @@ declare namespace mapboxgl {
 
     export class MapTouchEvent {
         type: string;
+        target: Map;
         map: Map;
         originalEvent: TouchEvent;
         point: mapboxgl.Point;
@@ -965,7 +1035,7 @@ declare namespace mapboxgl {
         metadata?: any;
         ref?: string;
 
-        source?: string | VectorSource | RasterSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw;
+        source?: string | VectorSource | RasterSource | RasterDemSource | GeoJSONSource | ImageSource | VideoSource | GeoJSONSourceRaw;
 
         'source-layer'?: string;
 
@@ -985,7 +1055,7 @@ declare namespace mapboxgl {
         base?: number;
         type?: 'identity' | 'exponential' | 'interval' | 'categorical';
         default?: any;
-        'colorSpace'?: 'rgb' | 'lab' | 'interval';
+        'colorSpace'?: 'rgb' | 'lab' | 'hcl';
     }
 
     export interface BackgroundLayout {
@@ -1006,14 +1076,14 @@ declare namespace mapboxgl {
     }
 
     export interface FillPaint {
-        'fill-antialias'?: boolean;
+        'fill-antialias'?: boolean | Expression;
         'fill-opacity'?: number | StyleFunction | Expression;
         'fill-opacity-transition'?: Transition;
         'fill-color'?: string | StyleFunction | Expression;
         'fill-color-transition'?: Transition;
         'fill-outline-color'?: string | StyleFunction | Expression;
         'fill-outline-color-transition'?: Transition;
-        'fill-translate'?: number[] | Expression;
+        'fill-translate'?: number[];
         'fill-translate-transition'?: Transition;
         'fill-translate-anchor'?: 'map' | 'viewport';
         'fill-pattern'?: string;
@@ -1044,7 +1114,7 @@ declare namespace mapboxgl {
         visibility?: 'visible' | 'none';
 
         'line-cap'?: 'butt' | 'round' | 'square';
-        'line-join'?: 'bevel' | 'round' | 'miter';
+        'line-join'?: 'bevel' | 'round' | 'miter' | Expression;
         'line-miter-limit'?: number | Expression;
         'line-round-limit'?: number | Expression;
     }
@@ -1075,7 +1145,7 @@ declare namespace mapboxgl {
     export interface SymbolLayout {
         visibility?: 'visible' | 'none';
 
-        'symbol-placement'?: 'point' | 'line';
+        'symbol-placement'?: 'point' | 'line' | 'line-center';
         'symbol-spacing'?: number | Expression;
         'symbol-avoid-edges'?: boolean;
         'icon-allow-overlap'?: boolean | StyleFunction;
@@ -1090,7 +1160,7 @@ declare namespace mapboxgl {
         'icon-padding'?: number | Expression;
         'icon-keep-upright'?: boolean;
         'icon-offset'?: number[] | StyleFunction | Expression;
-        'icon-anchor'?: Anchor;
+        'icon-anchor'?: Anchor | StyleFunction | Expression;
         'icon-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'text-pitch-alignment'?: 'map' | 'viewport' | 'auto';
         'text-rotation-alignment'?: 'map' | 'viewport' | 'auto';
@@ -1101,7 +1171,7 @@ declare namespace mapboxgl {
         'text-line-height'?: number | Expression;
         'text-letter-spacing'?: number | Expression;
         'text-justify'?: 'left' | 'center' | 'right';
-        'text-anchor'?: Anchor;
+        'text-anchor'?: Anchor | StyleFunction | Expression;
         'text-max-angle'?: number | Expression;
         'text-rotate'?: number | StyleFunction | Expression;
         'text-padding'?: number | Expression;
@@ -1160,6 +1230,7 @@ declare namespace mapboxgl {
         'raster-contrast'?: number | Expression;
         'raster-contrast-transition'?: Transition;
         'raster-fade-duration'?: number | Expression;
+        'raster-resample'?: 'linear' | 'nearest';
     }
 
     export interface CircleLayout {
@@ -1220,11 +1291,3 @@ declare namespace mapboxgl {
         'hillshade-accent-color-transition'?: Transition;
     }
 }
-
-declare module 'mapbox-gl' {
-    export = mapboxgl;
-}
-
-declare module 'mapbox-gl/dist/mapbox-gl' {
-    export = mapboxgl;
-}
diff --git a/types/mapbox-gl/mapbox-gl-tests.ts b/types/mapbox-gl/mapbox-gl-tests.ts
index fa62007088..783ee86f74 100644
--- a/types/mapbox-gl/mapbox-gl-tests.ts
+++ b/types/mapbox-gl/mapbox-gl-tests.ts
@@ -17,7 +17,8 @@ let map = new mapboxgl.Map({
 	minZoom: 1,
 	maxZoom: 2,
 	interactive: true,
-	attributionControl: false,
+	attributionControl: true,
+	customAttribution: '© YourCo',
 	bearingSnap: 7,
 	scrollZoom: true,
 	maxBounds: [[-100,-90],[100,90]],
@@ -225,7 +226,7 @@ map.addLayer({
 /**
  * Popup
  */
-var popup = new mapboxgl.Popup({closeOnClick: false, closeButton: true, anchor: 'top-right', offset: {'top': [0,0], 'bottom': [25,-50]} })
+var popup = new mapboxgl.Popup({closeOnClick: false, closeButton: true, anchor: 'top-right', offset: {'top': [0,0], 'bottom': [25,-50]}, className: 'custom-class' })
 	.setLngLat([-50, 50])
 	.setHTML('<h1>Hello World!</h1>')
 	.addTo(map);
@@ -387,6 +388,16 @@ let marker = new mapboxgl.Marker(undefined, {offset: [10, 0]})
 	.addTo(map);
 
 marker.remove();
+
+/*
+ * LngLatBounds
+ */
 let bool:boolean
 let bounds = new mapboxgl.LngLatBounds()
 bool = bounds.isEmpty()
+
+/*
+ * AttributionControl
+ */
+let attributionControl = new mapboxgl.AttributionControl({ compact: false, customAttribution: '© YourCo' });
+attributionControl.on('click', () => {});
diff --git a/types/mapbox__geo-viewport/index.d.ts b/types/mapbox__geo-viewport/index.d.ts
new file mode 100644
index 0000000000..6cfa8638f8
--- /dev/null
+++ b/types/mapbox__geo-viewport/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for @mapbox/geo-viewport 0.3
+// Project: https://github.com/mapbox/geo-viewport
+// Definitions by: Fabio Berta <https://github.com/fnberta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface GeoViewport {
+    center: [number, number];
+    zoom: number;
+}
+
+export type BoundingBox = [number, number, number, number];
+
+export function viewport(bounds: BoundingBox, dimensions: [number, number], minzoom?: number, maxzoom?: number, tileSize?: number): GeoViewport;
+
+export function bounds(viewport: { lon: number; lat: number } | [number, number], zoom: number, dimensions: [number, number], tileSize?: number): BoundingBox;
diff --git a/types/mapbox__geo-viewport/mapbox__geo-viewport-tests.ts b/types/mapbox__geo-viewport/mapbox__geo-viewport-tests.ts
new file mode 100644
index 0000000000..7a8ac93fea
--- /dev/null
+++ b/types/mapbox__geo-viewport/mapbox__geo-viewport-tests.ts
@@ -0,0 +1,15 @@
+import { viewport, bounds } from '@mapbox/geo-viewport';
+
+const geoViewport = viewport([
+    5.668343999999995,
+    45.111511000000014,
+    5.852471999999996,
+    45.26800200000002,
+], [640, 480]);
+
+const boundingBox = bounds({
+    lon: 100,
+    lat: 200,
+}, 14, [640, 480]);
+
+const boundingBox2 = bounds([100, 200], 14, [640, 480]);
diff --git a/types/mapbox__geo-viewport/tsconfig.json b/types/mapbox__geo-viewport/tsconfig.json
new file mode 100644
index 0000000000..82825c8c50
--- /dev/null
+++ b/types/mapbox__geo-viewport/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@mapbox/geo-viewport": [
+                "mapbox__geo-viewport"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "mapbox__geo-viewport-tests.ts"
+    ]
+}
diff --git a/types/mapbox__geo-viewport/tslint.json b/types/mapbox__geo-viewport/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mapbox__geo-viewport/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mapbox__polyline/index.d.ts b/types/mapbox__polyline/index.d.ts
new file mode 100644
index 0000000000..84845edb35
--- /dev/null
+++ b/types/mapbox__polyline/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for mapbox__polyline 1.0
+// Project: https://github.com/mapbox/polyline
+// Definitions by: Arseniy Maximov <https://github.com/Kern0>
+//                 Marko Klopets <https://github.com/mklopets>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="geojson" />
+
+export function decode(string: string, precision?: number): number[][];
+export function encode(coordinates: number[][], precision?: number): string;
+export function fromGeoJSON(geojson: GeoJSON.LineString | GeoJSON.Feature<GeoJSON.LineString>, precision?: number): string;
+export function toGeoJSON(string: string, precision?: number): GeoJSON.LineString;
+
+export as namespace polyline;
diff --git a/types/mapbox__polyline/mapbox__polyline-tests.ts b/types/mapbox__polyline/mapbox__polyline-tests.ts
new file mode 100644
index 0000000000..d1cf46553f
--- /dev/null
+++ b/types/mapbox__polyline/mapbox__polyline-tests.ts
@@ -0,0 +1,25 @@
+const decodedString: number[][] = polyline.decode('_p~iF~ps|U_ulLnnqC_mqNvxq`@');
+const decodedStringWithPrecision: number[][] = polyline.decode('_p~iF~ps|U_ulLnnqC_mqNvxq`@', 2);
+
+const encoded: string = polyline.encode([[38.5, -120.2], [40.7, -120.95], [43.252, -126.453]]);
+const encodedWithPrecision: string = polyline.encode([[38.5, -120.2], [40.7, -120.95], [43.252, -126.453]], 2);
+
+const fromGeoJSON: string = polyline.fromGeoJSON({
+    type: 'Feature',
+    geometry: {
+        type: 'LineString',
+        coordinates: [[-120.2, 38.5], [-120.95, 40.7], [-126.453, 43.252]]
+    },
+    properties: {}
+});
+const fromGeoJSONWithPrecision: string = polyline.fromGeoJSON({
+    type: 'Feature',
+    geometry: {
+        type: 'LineString',
+        coordinates: [[-120.2, 38.5], [-120.95, 40.7], [-126.453, 43.252]]
+    },
+    properties: {}
+}, 3);
+
+const toGeoJSON: GeoJSON.LineString = polyline.toGeoJSON('_p~iF~ps|U_ulLnnqC_mqNvxq`@');
+const toGeoJSONWithPrecision: GeoJSON.LineString = polyline.toGeoJSON('_p~iF~ps|U_ulLnnqC_mqNvxq`@', 6);
diff --git a/types/mapbox__polyline/tsconfig.json b/types/mapbox__polyline/tsconfig.json
new file mode 100644
index 0000000000..2d044d5adc
--- /dev/null
+++ b/types/mapbox__polyline/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",
+        "mapbox__polyline-tests.ts"
+    ]
+}
diff --git a/types/mapbox__polyline/tslint.json b/types/mapbox__polyline/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mapbox__polyline/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/markdown-it/index.d.ts b/types/markdown-it/index.d.ts
index 5f5129e8b0..24513c3e56 100644
--- a/types/markdown-it/index.d.ts
+++ b/types/markdown-it/index.d.ts
@@ -97,7 +97,7 @@ declare module MarkdownIt {
     type TokenRender = (tokens: Token[], index: number, options: any, env: any, self: Renderer) => void;
 
     interface Rule {
-        (state: any): void;
+        (state: any, silent?: boolean): void;
     }
 
     interface Ruler {
diff --git a/types/markdown-pdf/index.d.ts b/types/markdown-pdf/index.d.ts
new file mode 100644
index 0000000000..1df6a9f314
--- /dev/null
+++ b/types/markdown-pdf/index.d.ts
@@ -0,0 +1,92 @@
+// Type definitions for MarkdownPDF (markdown-pdf) 9.0
+// Project: https://github.com/alanshaw/markdown-pdf
+// Definitions by: Ange PICARD <https://github.com/MonsieurMan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = MarkdownPDF;
+
+declare function MarkdownPDF(options?: MarkdownPDF.Options): MarkdownPDF.OptionsBuilder;
+
+declare namespace MarkdownPDF {
+    /** Configuration options */
+    interface Options {
+        /** Current working directory. */
+        cwd?: string;
+        /** Path to the phantomjs library. */
+        phantomPath?: string;
+        /** Path to custom CSS file, relative to current directory. */
+        cssPath?: string;
+        /** Path to custorm highlight CSS file (for code highlighting with highlight.js), relative to the current directory. */
+        highlightCssPath?: string;
+        /** Path to CommonJS module which sets the page header and footer (see runnings.js). */
+        runningsPath?: string;
+        /** Delay (in ms) before the PDF is rendered. */
+        renderDelay?: number;
+        /** If renderDelay option isn't set, this is the timeout (in ms) before the page is rendered in case the page.onLoadFinished event doesn't fire. */
+        loadTimeout?: number;
+        /** Supported dimension units are: 'mm', 'cm', 'in', 'px' */
+        paperBorder?: string;
+        paperFormat?: PaperFormat;
+        paperOrientation?: PaperOrientation;
+        /** A function that returns a through2 stream that transforms the markdown before it is converted to HTML. */
+        preProcessMd?: () => any;
+        /** A function that returns a through2 stream that transforms the HTML before it is converted to PDF. */
+        preProcessHtml?: () => any;
+        /** A config object that is passed to remarkable, the underlying markdown parser */
+        remarkable?: any; // FIXME: remarkable config types
+    }
+    type PaperFormat = "A3" | "A4" | "A5" | "Legal" | "Letter" | "Tabloid";
+    type PaperOrientation = "portait" | "landscape";
+
+    interface OptionsBuilder {
+        /** Create a readable stream and pipe it to markdown pdf. */
+        from: FromOptionsBuilder & FromFunction;
+        /** Concatenates stream and pipe them to markdown pdf. */
+        concat: ConcatOptionsBuilder;
+    }
+
+    type FromFunction =
+        /** Create a readable stream from path and pipe to markdown-pdf. path can be a single path or array of paths. */
+        (path: string | string[]) => ToOptionsBuilder;
+    interface FromOptionsBuilder {
+        /** Create a readable stream from string and pipe to markdown-pdf. string can be a single string or array of strings. */
+        string(markdown: string | string[]): ToOptionsBuilder;
+        /** Create a readable stream from path and pipe to markdown-pdf. path can be a single path or array of paths. */
+        path(path: string | string[], opts: any): ToOptionsBuilder;
+    }
+
+    interface ConcatOptionsBuilder {
+        from: ConcatFromOptionsBuilder;
+    }
+    interface ConcatFromOptionsBuilder {
+        /** Create and concatenate readable streams from strings and pipe to markdown-pdf. */
+        strings(markdownTexts: string[], opts: any): ToOptionsBuilder;
+        /** Create and concatenate readable streams from paths and pipe to markdown-pdf. */
+        paths(paths: string[], opts: any): ToOptionsBuilder;
+    }
+
+    interface ToOptionsBuilder {
+        to: ToBuilder & ToFunction;
+    }
+
+    interface ToBuilder {
+        /**
+         * Create a writeable stream to path and pipe output from markdown-pdf to it.
+         * path can be a single path, or array of output paths if you specified an array of inputs.
+         * The callback function cb will be invoked when data has finished being written.
+         */
+        path(path: string, callback?: () => void): void;
+        /** Create a concat-stream and pipe output from markdown-pdf to it. The callback function cb will be invoked when the buffer has been created. */
+        buffer(opts: any, callback?: () => void): void;
+        /** Create a concat-stream and pipe output from markdown-pdf to it. The callback function cb will be invoked when the string has been created. */
+        string(opts: any, callback?: () => void): void;
+    }
+
+    type ToFunction =
+        /**
+         * Create a writeable stream to path and pipe output from markdown-pdf to it.
+         * path can be a single path, or array of output paths if you specified an array of inputs.
+         * The callback function cb will be invoked when data has finished being written.
+         */
+        (path: string, callback?: () => void) => void;
+}
diff --git a/types/markdown-pdf/markdown-pdf-tests.ts b/types/markdown-pdf/markdown-pdf-tests.ts
new file mode 100644
index 0000000000..429028bf8b
--- /dev/null
+++ b/types/markdown-pdf/markdown-pdf-tests.ts
@@ -0,0 +1,11 @@
+import mdPdf = require('markdown-pdf');
+
+mdPdf().from('path').to('path', () => { }); // $ExpectType void
+mdPdf().from.string('markdown').to('path', () => { }); // $ExpectType void
+mdPdf({ paperOrientation: 'landscape', paperFormat: 'A3' }).from('lol').to('lol', () => { }); // $ExpectType void
+mdPdf().concat.from.paths(['lol', 'lol'], {}).to('path', () => { }); // $ExpectType void
+mdPdf().concat.from.strings(['lol', 'lol'], {}).to('path', () => { }); // $ExpectType void
+mdPdf().from('path').to.path('path', () => { }); // $ExpectType void
+mdPdf().from('path').to('path'); // $ExpectType void
+
+mdPdf({ paperFormat: 'wrongFormat' }); // $ExpectError
diff --git a/types/markdown-pdf/tsconfig.json b/types/markdown-pdf/tsconfig.json
new file mode 100644
index 0000000000..8ce150383b
--- /dev/null
+++ b/types/markdown-pdf/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",
+        "markdown-pdf-tests.ts"
+    ]
+}
diff --git a/types/markdown-pdf/tslint.json b/types/markdown-pdf/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/markdown-pdf/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/marked/index.d.ts b/types/marked/index.d.ts
index 034c0cca18..c99f38aa6c 100644
--- a/types/marked/index.d.ts
+++ b/types/marked/index.d.ts
@@ -1,5 +1,5 @@
 // Type definitions for Marked 0.4
-// Project: https://github.com/chjj/marked
+// Project: https://github.com/markedjs/marked
 // Definitions by: William Orr <https://github.com/worr>
 //                 BendingBender <https://github.com/BendingBender>
 //                 CrossR <https://github.com/CrossR>
diff --git a/types/marko/express.d.ts b/types/marko/express.d.ts
new file mode 100644
index 0000000000..e9bac4091d
--- /dev/null
+++ b/types/marko/express.d.ts
@@ -0,0 +1,20 @@
+import * as express from 'express';
+import Template from './src/runtime/html/Template';
+import { IRouterMatcher as ExpressRouterMatcher, NextFunction, PathParams } from 'express-serve-static-core';
+
+declare function m(): m.Application;
+
+declare namespace m {
+    interface Response extends express.Response {
+        marko(template: Template, data?: any): void;
+    }
+
+    interface Application extends express.Application {
+        get: ((name: string) => any) & ExpressRouterMatcher<this> & MarkoRouterMatcher;
+    }
+
+    type MarkoRouterMatcher = (path: PathParams, ...handlers: RequestHandler[]) => Application;
+    type RequestHandler = (req: express.Request, res: Response, next?: NextFunction) => any;
+}
+
+export = m;
diff --git a/types/marko/index.d.ts b/types/marko/index.d.ts
new file mode 100644
index 0000000000..0c94aaa956
--- /dev/null
+++ b/types/marko/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for marko 4.6
+// Project: http://markojs.com
+// Definitions by: Timur Manyanov <https://github.com/darkwebdev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { AsyncStream, Template } from './src/runtime/html';
+
+export function createOut(globalData: any): AsyncStream;
+
+export interface TemplateOptions {
+    buffer?: boolean;
+    writeToDisk?: boolean;
+}
+
+export function load(templatePath: string, options?: TemplateOptions): Template;
+export function load(templatePath: string, templateSrc: string, options?: TemplateOptions): Template;
diff --git a/types/marko/marko-tests.ts b/types/marko/marko-tests.ts
new file mode 100644
index 0000000000..623ad12e5f
--- /dev/null
+++ b/types/marko/marko-tests.ts
@@ -0,0 +1,174 @@
+import { createServer } from 'http';
+import { createWriteStream } from 'fs';
+import express = require('express');
+import asyncWriter = require('async-writer');
+
+import markoExpress = require('marko/express');
+import { load } from 'marko';
+import { createWriter, AsyncStream, Template, RenderResult } from 'marko/src/runtime/html';
+import { Component } from 'marko/src/components';
+import { buildTaglibLookup, taglibFinder } from 'marko/src/compiler';
+
+// tslint:disable-next-line no-var-requires
+const template: Template = require('template.marko');
+
+// Working with document
+
+(document: Document) => {
+    // $ExpectType RenderResult
+    template
+        .renderSync({ name: 'Marko' })
+        .appendTo(document.body);
+
+    createServer((req, res) => {
+        res.setHeader('content-type', 'text/html');
+        // $ExpectType void
+        template.render({ name: 'Marko' }, res);
+    }).listen(8080);
+
+    template
+        .render({ $global: { flags: ['mobile'] } })
+        .then((result) => {
+            // $ExpectType RenderResult
+            result.appendTo(document.body);
+        });
+
+    template.render({}, (err: Error | null, result: RenderResult) => {
+        // $ExpectType RenderResult
+        result.appendTo(document.body);
+    });
+};
+
+// WriteStream tests
+
+const writeStream = createWriteStream('template.html', { encoding: 'utf8' });
+
+// $ExpectType void
+template.render({ name: 'Frank' }, writeStream);
+
+// $ExpectType WriteStream
+template.stream({}).pipe(writeStream);
+
+(req: Request) => {
+    // $ExpectType Readable
+    template.stream({ name: 'Frank' });
+};
+
+// rendering tests
+
+const out = template.createOut();
+
+// $ExpectType void
+template.render({}, out);
+out.on('finish', () => {
+    // $ExpectType string
+    out.getOutput();
+});
+out.end();
+
+// $ExpectType void
+template.render({ name: 'Frank' }, process.stdout);
+
+// $ExpectType string
+template.renderToString({ label: 'Click me!' });
+
+template.renderToString({}, (err, html) => {
+    // $ExpectType string
+    html;
+});
+
+// AsyncStream/AsyncWriter tests
+
+const writer: AsyncStream = createWriter(process.stdout);
+
+// $ExpectType void
+template.render({ name: 'Frank' }, writer);
+writer.end();
+
+const asyncWriterInstance = asyncWriter.create(process.stdout);
+
+// $ExpectType AsyncWriter
+asyncWriterInstance.write('Hello');
+
+const asyncOut = asyncWriterInstance.beginAsync();
+
+setTimeout(() => {
+    asyncOut.write('World');
+    asyncOut.end();
+}, 100);
+
+template.render({}, asyncWriterInstance);
+
+// Component tests
+
+(component: Component) => {
+    // $ExpectType HTMLElement
+    component.getEl('header');
+
+    // $ExpectType HTMLElement[]
+    component.getEls('colors');
+
+    // $ExpectType Component
+    component.getComponent('myFancyButton');
+};
+
+// markoExpress() tests
+
+const app = express() as markoExpress.Application;
+
+// $ExpectType Application
+app.use(markoExpress());
+
+// $ExpectType Application
+app.get('/', (req: express.Request, res: markoExpress.Response) => {
+    // $ExpectType void
+    res.marko(template, {
+        name: 'Frank',
+        count: 30,
+        colors: ['red', 'green', 'blue']
+    });
+});
+
+// Taglib tests
+
+const lookup = buildTaglibLookup('some/dir');
+
+lookup.forEachTag(tag => {
+    // $ExpectType string
+    tag.name;
+});
+
+lookup.forEachAttribute('div', attr => {
+    // $ExpectType string | undefined
+    attr.name;
+});
+
+// $ExpectType Attribute | undefined
+lookup.getAttribute('foo', 'cat');
+
+// $ExpectType void
+taglibFinder.excludeDir('dir/Path');
+
+// $ExpectType void
+taglibFinder.excludePackage('packageName');
+
+// load() tests
+
+const isomorphicTemplate = load(require.resolve('./template.marko'));
+isomorphicTemplate.render({ name: 'Frank' }, process.stdout);
+
+const serverTemplateFromFile = load('./sample.marko', { writeToDisk: false });
+serverTemplateFromFile.render({ name: 'Frank' }, process.stdout);
+
+const serverTemplateFromString = load('sample.marko', '<div>Hello $!{data.name}</div>');
+serverTemplateFromString.render({ name: 'Frank' }, process.stdout);
+
+// node-require tests
+
+import { install, getExtensions } from 'marko/node-require';
+
+// $ExpectType void
+install();
+
+// $ExpectType any
+getExtensions();
diff --git a/types/marko/node-require.d.ts b/types/marko/node-require.d.ts
new file mode 100644
index 0000000000..eccf99e526
--- /dev/null
+++ b/types/marko/node-require.d.ts
@@ -0,0 +1,3 @@
+export function install(options?: any): void;
+
+export function getExtensions(): any;
diff --git a/types/marko/src/compiler/config.d.ts b/types/marko/src/compiler/config.d.ts
new file mode 100644
index 0000000000..c4d006280f
--- /dev/null
+++ b/types/marko/src/compiler/config.d.ts
@@ -0,0 +1,11 @@
+export default interface Config {
+    checkUpToDate?: boolean;
+    writeToDisk?: boolean;
+    assumeUpToDate?: boolean;
+    preserveWhitespace?: boolean;
+    output?: 'vdom' | 'html';
+    writeVersionComment?: boolean;
+    ignoreUnrecognizedTags?: boolean;
+    escapeAtTags?: boolean;
+    autoKeyEnabled?: boolean;
+}
diff --git a/types/marko/src/compiler/index.d.ts b/types/marko/src/compiler/index.d.ts
new file mode 100644
index 0000000000..cdc73b0c7c
--- /dev/null
+++ b/types/marko/src/compiler/index.d.ts
@@ -0,0 +1,45 @@
+import Config from './config';
+import * as taglibLookup from './taglib-lookup';
+import * as taglibLoader from './taglib-loader';
+import * as taglibFinder from './taglib-finder';
+import * as modules from './modules';
+
+export const isVDOMSupported: true;
+export const builder: any;
+export const defaultOptions: Config;
+export const config: Config;
+
+export function createBuilder(options: any): any;
+
+export function compileFile(filename: string, optionsOrCallback?: any, callback?: any): any;
+
+export function compile(src: any, filename: string, optionsOrCallback: any, callback?: any): any;
+
+export function compileForBrowser(src: any, filename: string, optionsOrCallback: any, callback?: any): any;
+
+export function compileFileForBrowser(filename: string, optionsOrCallback?: any, callback?: any): any;
+
+export function parseRaw(templateSrc: any, filename: string): any;
+
+export function createInlineCompiler(filename: string, userOptions?: any): any;
+
+export function checkUpToDate(templateFile: any, templateJsFile: any): boolean;
+
+export function getLastModified(path: string, optionsOrCallback: any, callback: any): void;
+
+export function createWalker(options: any): any;
+
+export function configure(newConfig?: Config): void;
+
+export function clearCaches(): void;
+
+export function buildTaglibLookup(dirname: string): taglibLookup.TaglibLookup;
+
+export function registerTaglib(filePath: string): void;
+
+export {
+    taglibLookup,
+    taglibLoader,
+    taglibFinder,
+    modules
+};
diff --git a/types/marko/src/compiler/modules.d.ts b/types/marko/src/compiler/modules.d.ts
new file mode 100644
index 0000000000..4b128b2230
--- /dev/null
+++ b/types/marko/src/compiler/modules.d.ts
@@ -0,0 +1,7 @@
+export function require(path: string): any;
+
+export function resolve(path: string): string;
+
+export function resolveFrom(from: string, target: string): string | null;
+
+export function deresolve(targetFilename: string, from: string): string;
diff --git a/types/marko/src/compiler/taglib-finder/index.d.ts b/types/marko/src/compiler/taglib-finder/index.d.ts
new file mode 100644
index 0000000000..2f16371ab8
--- /dev/null
+++ b/types/marko/src/compiler/taglib-finder/index.d.ts
@@ -0,0 +1,11 @@
+import Taglib from '../taglib-loader/Taglib';
+
+export function find(dirname: string, registeredTaglibs: Taglib[]): Taglib[];
+
+export function excludeDir(dir: string): void;
+
+export function excludePackage(name: string): void;
+
+export function reset(): void;
+
+export function clearCache(): void;
diff --git a/types/marko/src/compiler/taglib-loader/Attribute.d.ts b/types/marko/src/compiler/taglib-loader/Attribute.d.ts
new file mode 100644
index 0000000000..5eea79f6ce
--- /dev/null
+++ b/types/marko/src/compiler/taglib-loader/Attribute.d.ts
@@ -0,0 +1,22 @@
+export default class Attribute {
+    type: string | null;
+    key: string;
+    filePath: string;
+    ref?: string;
+    name?: string;
+    preserveName?: string;
+    targetProperty: string | null;
+    defaultValue: string;
+    pattern?: any;
+    setFlag: string | null;
+    setContextFlag: string;
+    required: boolean;
+    ignore: boolean;
+    dynamicAttribute: boolean;
+    allowExpressions: boolean;
+    removeDashes: boolean;
+    autocomplete: boolean;
+    html: boolean;
+    deprecated: any;
+    enum: any;
+}
diff --git a/types/marko/src/compiler/taglib-loader/Tag.d.ts b/types/marko/src/compiler/taglib-loader/Tag.d.ts
new file mode 100644
index 0000000000..7172ad3f89
--- /dev/null
+++ b/types/marko/src/compiler/taglib-loader/Tag.d.ts
@@ -0,0 +1,69 @@
+import Taglib from './Taglib';
+import Attribute from './Attribute';
+import Transformer from './Transformer';
+
+declare class Tag {
+  name: string;
+  dir: string;
+  taglibId: string | null;
+  taglibPath: string | null;
+  attributes: { [name: string]: Attribute };
+  attributeGroups: string[];
+  transformers: { [path: string]: Transformer };
+  patternAttributes: Attribute[];
+  renderer: any;
+  template: any;
+  codeGeneratorModulePath: string | null;
+  nodeFactoryPath: string | null;
+  nestedVariables: any;
+  importedVariables: any;
+  bodyFunction: any;
+  nestedTags: { [name: string]: Tag } | null;
+  isNestedTag: boolean;
+  isRepeated: boolean | null;
+  parentTagName: string | null;
+  openTagOnly: any;
+  body: any;
+  type: any;
+  targetProperty?: string;
+
+  constructor(filePath?: string);
+
+  addAttribute(attr: Attribute): void;
+
+  addImportedVariable(importedVariable: any): void;
+
+  addNestedTag(nestedTag: Tag): void;
+
+  addNestedVariable(nestedVariable: any): void;
+
+  addTransformer(transformer: Transformer): void;
+
+  forEachAttribute(callback: (attr: Attribute) => void, thisObj?: any): void;
+
+  forEachImportedVariable(callback: (importedVariable: any) => void, thisObj?: any): void;
+
+  forEachNestedTag(callback: (nestedTag: Tag) => void, thisObj?: any): void;
+
+  forEachTransformer(callback: (transformer: Transformer) => void, thisObj?: any): void;
+
+  forEachVariable(callback: (nestedVariable: any) => void, thisObj?: any): void;
+
+  getAttribute(attrName: string): Attribute | undefined;
+
+  getNodeFactory(): any;
+
+  hasAttribute(attrName: string): boolean;
+
+  hasNestedTags(): boolean;
+
+  hasTransformers(): boolean;
+
+  setBodyFunction(name: string, params: any): void;
+
+  setBodyProperty(propertyName: string): void;
+
+  setTaglib(taglib: Taglib): void;
+}
+
+export = Tag;
diff --git a/types/marko/src/compiler/taglib-loader/Taglib.d.ts b/types/marko/src/compiler/taglib-loader/Taglib.d.ts
new file mode 100644
index 0000000000..15492613c3
--- /dev/null
+++ b/types/marko/src/compiler/taglib-loader/Taglib.d.ts
@@ -0,0 +1,38 @@
+import Attribute from './Attribute';
+import Transformer from './Transformer';
+import Tag = require('./Tag');
+
+export default class Taglib {
+  id: string;
+  /** @deprecated */
+  path: string;
+  filePath: string;
+  dirname: string;
+  tags: { [name: string]: Tag };
+  attributes: { [key: string]: Attribute };
+  attributeGroups: { [name: string]: Attribute };
+  patternAttributes: Attribute[];
+  textTransformers: Transformer[];
+  transformers: Transformer[];
+  inputFilesLookup: any;
+  imports: any;
+  importsLookup: any;
+
+  constructor(filePath: string);
+
+  addAttribute(attribute: Attribute): void;
+
+  getAttribute(name: string): Attribute | undefined;
+
+  addTag(tag: Tag): void;
+
+  addTransformer(transformer: Transformer): void;
+
+  addTextTransformer(transformer: Transformer): void;
+
+  addImport(path: string): void;
+
+  forEachTag(callback: (tag: Tag) => void, thisObj?: any): void;
+
+  toJSON(): any;
+}
diff --git a/types/marko/src/compiler/taglib-loader/Transformer.d.ts b/types/marko/src/compiler/taglib-loader/Transformer.d.ts
new file mode 100644
index 0000000000..5c47692074
--- /dev/null
+++ b/types/marko/src/compiler/taglib-loader/Transformer.d.ts
@@ -0,0 +1,14 @@
+import Tag = require('./Tag');
+
+export default class Transformer {
+    id: number;
+    name: string | null;
+    tag: Tag | null;
+    path: string | null;
+    priority: any;
+    properties: any;
+    taglibId: string;
+
+    constructor();
+    getFunc(): any;
+}
diff --git a/types/marko/src/compiler/taglib-loader/index.d.ts b/types/marko/src/compiler/taglib-loader/index.d.ts
new file mode 100644
index 0000000000..6382ad6cd3
--- /dev/null
+++ b/types/marko/src/compiler/taglib-loader/index.d.ts
@@ -0,0 +1,14 @@
+import _Taglib from './Taglib';
+import Tag = require('./Tag');
+
+export class Taglib extends _Taglib {}
+
+export function createTaglib(filePath: string): Taglib;
+
+export function loadTaglibFromProps(taglib: Taglib, taglibProps: any): Taglib;
+
+export function loadTaglibFromFile(filePath: string): Taglib;
+
+export function loadTag(tagProps: any, filePath: string): Tag;
+
+export function clearCache(): void;
diff --git a/types/marko/src/compiler/taglib-lookup/TaglibLookup.d.ts b/types/marko/src/compiler/taglib-lookup/TaglibLookup.d.ts
new file mode 100644
index 0000000000..c90535d2d1
--- /dev/null
+++ b/types/marko/src/compiler/taglib-lookup/TaglibLookup.d.ts
@@ -0,0 +1,41 @@
+import Taglib from '../taglib-loader/Taglib';
+import Tag = require('../taglib-loader/Tag');
+import Attribute from '../taglib-loader/Attribute';
+import Transformer from '../taglib-loader/Transformer';
+
+export interface Element {
+  tagName: string;
+}
+
+export default class TaglibLookup {
+  merged: {
+    attributeGroups: any;
+  };
+  taglibsById: { [id: string]: Taglib };
+
+  constructor();
+
+  hasTaglib(taglib: Taglib): boolean;
+
+  addTaglib(taglib: Taglib): void;
+
+  getTagsSorted(): Tag[];
+
+  forEachTag(callback: (tag: Tag) => void | boolean): void;
+
+  forEachAttribute(tagName: string, callback: (attrDef: Attribute, tag: Tag) => void): void;
+
+  getTag(element: string | Element): Tag | undefined;
+
+  getAttribute(element: string | Element, attr: string | { name: string }): Attribute | undefined;
+
+  forEachTemplateTransformer(callback: (trans: Transformer) => any, thisObj?: any): void;
+
+  forEachNodeTransformer(node: any, callback: (trans: Transformer) => any, thisObj?: any): void;
+
+  forEachTagTransformer(element: string | Element, callback: (trans: Transformer) => any, thisObj?: any): void;
+
+  forEachTextTransformer(callback: (trans: Transformer) => any, thisObj?: any): void;
+
+  getInputFiles(): string[];
+}
diff --git a/types/marko/src/compiler/taglib-lookup/index.d.ts b/types/marko/src/compiler/taglib-lookup/index.d.ts
new file mode 100644
index 0000000000..fa4cb321ef
--- /dev/null
+++ b/types/marko/src/compiler/taglib-lookup/index.d.ts
@@ -0,0 +1,12 @@
+import Taglib from '../taglib-loader/Taglib';
+import _TaglibLookup from './TaglibLookup';
+
+export class TaglibLookup extends _TaglibLookup {}
+
+export const registeredTaglibs: Taglib[];
+
+export function registerTaglib(taglib: Taglib): void;
+
+export function buildLookup(dirname: string): TaglibLookup;
+
+export function clearCache(): void;
diff --git a/types/marko/src/components/Component.d.ts b/types/marko/src/components/Component.d.ts
new file mode 100644
index 0000000000..91cdb40bfe
--- /dev/null
+++ b/types/marko/src/components/Component.d.ts
@@ -0,0 +1,28 @@
+import { EventEmitter } from 'events';
+import DomElement from '../runtime/DomElement';
+
+export default interface Component extends EventEmitter, DomElement {
+  /** @deprecated */
+  el: HTMLElement;
+  /** @deprecated */
+  els: HTMLElement[];
+  id: string;
+  input: any;
+  state: any;
+  destroy(): void;
+  elId(key: string, index?: number): string;
+  forceUpdate(): void;
+  getComponent(key: string, index?: number): Component;
+  getComponents(key: string): Component[];
+  getEl(key?: string, index?: number): HTMLElement;
+  getElId(key: string, index?: number): string;
+  getEls(key?: string): HTMLElement[];
+  isDestroyed(): boolean;
+  replaceState(newState: any): void;
+  setState(name: string, value: any): void;
+  setState(name: any): void;
+  setStateDirty(name: string, value?: any): void;
+  shouldUpdate(newState: any, newProps: any): boolean;
+  update(): void;
+  (id: string): this;
+}
diff --git a/types/marko/src/components/index.d.ts b/types/marko/src/components/index.d.ts
new file mode 100644
index 0000000000..cda052eefc
--- /dev/null
+++ b/types/marko/src/components/index.d.ts
@@ -0,0 +1,8 @@
+import _Component from './Component';
+
+export function writeInitComponentsCode(fromOut: any, targetOut: any, shouldIncludeAll: any): void;
+
+export function getRenderedComponents(out: any): any;
+
+// tslint:disable-next-line no-empty-interface
+export interface Component extends _Component {}
diff --git a/types/marko/src/components/taglib/TransformHelper/getComponentFiles.d.ts b/types/marko/src/components/taglib/TransformHelper/getComponentFiles.d.ts
new file mode 100644
index 0000000000..70456b82c3
--- /dev/null
+++ b/types/marko/src/components/taglib/TransformHelper/getComponentFiles.d.ts
@@ -0,0 +1,12 @@
+declare function getComponentFiles(filename: string): getComponentFiles.ComponentFiles | null;
+
+declare namespace getComponentFiles {
+  interface ComponentFiles {
+    styles: string[];
+    file: string | null;
+    browserFile: string | null;
+    package: string | null;
+  }
+}
+
+export = getComponentFiles;
diff --git a/types/marko/src/runtime/Async.d.ts b/types/marko/src/runtime/Async.d.ts
new file mode 100644
index 0000000000..41b03e30d6
--- /dev/null
+++ b/types/marko/src/runtime/Async.d.ts
@@ -0,0 +1,15 @@
+import { EventEmitter } from 'events';
+
+export default interface Async extends EventEmitter, Promise<any> {
+    sync(): void;
+    isSync(): boolean;
+    write(str?: string): this;
+    w(str?: string): this;
+    beginAsync(options?: any): this;
+    error(e: Error): this;
+    flush(): void;
+    createOut(): this;
+    endElement(): void;
+    onLast(callback: any): this;
+    c(componentDef: any, key: any, customEvents: any): void;
+}
diff --git a/types/marko/src/runtime/DomElement.d.ts b/types/marko/src/runtime/DomElement.d.ts
new file mode 100644
index 0000000000..2615151ff8
--- /dev/null
+++ b/types/marko/src/runtime/DomElement.d.ts
@@ -0,0 +1,8 @@
+export default interface DomElement {
+    appendTo(referenceEl: string | Node): this;
+    prependTo(referenceEl: string | Node): this;
+    replace(referenceEl: string | Node): this;
+    replaceChildrenOf(referenceEl: string | Node): this;
+    insertBefore(referenceEl: string | Node): this;
+    insertAfter(referenceEl: string | Node): this;
+}
diff --git a/types/marko/src/runtime/html/AsyncStream.d.ts b/types/marko/src/runtime/html/AsyncStream.d.ts
new file mode 100644
index 0000000000..2523a5015b
--- /dev/null
+++ b/types/marko/src/runtime/html/AsyncStream.d.ts
@@ -0,0 +1,15 @@
+import Async from '../Async';
+
+export default interface AsyncStream extends Async {
+    DEFAULT_TIMEOUT: number;
+    INCLUDE_STACK: boolean;
+
+    (global: any, writer?: any, parentOut?: any, shouldBuffer?: boolean): this;
+    enableAsyncStackTrace(): void;
+    text(str: any): void;
+    element(tagName: string, elementAttrs: any, openTagOnly: boolean): void;
+    beginElement(name: string, elementAttrs: any): void;
+    end(data?: any): this;
+    /** @deprecated */
+    getOutput(): string;
+}
diff --git a/types/marko/src/runtime/html/RenderResult.d.ts b/types/marko/src/runtime/html/RenderResult.d.ts
new file mode 100644
index 0000000000..c2d3f06d47
--- /dev/null
+++ b/types/marko/src/runtime/html/RenderResult.d.ts
@@ -0,0 +1,13 @@
+import DomElement from '../DomElement';
+import Component from '../../components/Component';
+
+export default interface RenderResult extends DomElement {
+    document: Document | false;
+
+    (out: any): this;
+    getComponent(): Component;
+    getComponents(selector?: any): Component[];
+    afterInsert(doc: Document): this;
+    getNode(doc: Document): Node;
+    getOutput(): any;
+}
diff --git a/types/marko/src/runtime/html/Template.d.ts b/types/marko/src/runtime/html/Template.d.ts
new file mode 100644
index 0000000000..587ad81ab3
--- /dev/null
+++ b/types/marko/src/runtime/html/Template.d.ts
@@ -0,0 +1,47 @@
+/// <reference types="node" />
+
+import * as stream from 'stream';
+import { ServerResponse } from 'http';
+import AsyncStream from './AsyncStream';
+import RenderResult from './RenderResult';
+import AsyncVDOMBuilder from '../vdom/AsyncVDOMBuilder';
+import { AsyncWriter } from 'async-writer';
+
+export class Readable extends stream.Readable {
+  _t: any;
+  _d: any;
+  _shouldBuffer: boolean;
+  _rendered: boolean;
+
+  constructor(template: Template, data: any, options: any);
+
+  write(data: any): void;
+}
+
+export interface Renderable {
+  createOut: any;
+
+  renderToString(data?: any): string;
+
+  renderToString(data: any, callback: (err: Error | null, result: string) => void): undefined;
+
+  renderSync(data?: any): RenderResult;
+
+  render(data?: any): Promise<RenderResult>;
+
+  render(data: any, out: AsyncStream | AsyncWriter | AsyncVDOMBuilder | stream.Writable |
+    ((err: any, result: RenderResult) => void)): void;
+}
+
+export default interface Template extends Renderable {
+  path: string;
+  _: any;
+  ___shouldBuffer: boolean;
+  meta: any;
+
+  (path: string, renderFunc: any, options: any): Template;
+
+  createOut(globalData?: any, writer?: any, parentOut?: any, buffer?: any): AsyncStream;
+
+  stream(data: any): Readable;
+}
diff --git a/types/marko/src/runtime/html/index.d.ts b/types/marko/src/runtime/html/index.d.ts
new file mode 100644
index 0000000000..25cd87e4bc
--- /dev/null
+++ b/types/marko/src/runtime/html/index.d.ts
@@ -0,0 +1,16 @@
+import MarkoAsyncStream from './AsyncStream';
+import MarkoTemplate from './Template';
+import MarkoRenderResult from './RenderResult';
+
+export function createWriter(writer: any): AsyncStream;
+
+export function enableAsyncStackTrace(): void;
+
+// tslint:disable-next-line no-empty-interface
+export interface Template extends MarkoTemplate {}
+
+// tslint:disable-next-line no-empty-interface
+export interface AsyncStream extends MarkoAsyncStream {}
+
+// tslint:disable-next-line no-empty-interface
+export interface RenderResult extends MarkoRenderResult {}
diff --git a/types/marko/src/runtime/vdom/AsyncVDOMBuilder.d.ts b/types/marko/src/runtime/vdom/AsyncVDOMBuilder.d.ts
new file mode 100644
index 0000000000..98e876576f
--- /dev/null
+++ b/types/marko/src/runtime/vdom/AsyncVDOMBuilder.d.ts
@@ -0,0 +1,25 @@
+import Component from '../../components/Component';
+import Async from '../Async';
+
+export default interface AsyncVDOMBuilder extends Async {
+    isVDOM: true;
+    data: any;
+    global: any;
+
+    (globalData?: any, parentNode?: any, parentOut?: any): this;
+    bc(component: Component): any;
+    n(node: any, component: Component): this;
+    node(node: any): this;
+    h(html?: string): this;
+    html(html?: string): this;
+    ed(tagName: string, attrs: any, key: string, component: Component, childCount: number, flags?: number, props?: any): any;
+    bed(tagName: string, attrs: any, key: string, component: Component, childCount: number, flags?: number, props?: any): this;
+    ee(): void;
+    comment(comment: any): this;
+    t(text: any): this | string | void;
+    text(text: any): this | string | void;
+    element(tagName: string, attrs: any, key: string, component: Component, childCount: number, flags?: number, props?: any): any;
+    be(tagName: string, attrs: any, key: string, component: Component, childCount: number, flags?: number, props?: any): this;
+    beginElement(tagName: string, attrs: any, key: string, component: Component, childCount: number, flags?: number, props?: any): this;
+    end(): this;
+}
diff --git a/types/marko/tsconfig.json b/types/marko/tsconfig.json
new file mode 100644
index 0000000000..2d9f2eb4f9
--- /dev/null
+++ b/types/marko/tsconfig.json
@@ -0,0 +1,45 @@
+{
+    "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",
+        "express.d.ts",
+        "node-require.d.ts",
+        "marko-tests.ts",
+        "src/compiler/index.d.ts",
+        "src/compiler/config.d.ts",
+        "src/compiler/modules.d.ts",
+        "src/compiler/taglib-finder/index.d.ts",
+        "src/compiler/taglib-loader/index.d.ts",
+        "src/compiler/taglib-loader/Attribute.d.ts",
+        "src/compiler/taglib-loader/Tag.d.ts",
+        "src/compiler/taglib-loader/Taglib.d.ts",
+        "src/compiler/taglib-loader/Transformer.d.ts",
+        "src/compiler/taglib-lookup/index.d.ts",
+        "src/compiler/taglib-lookup/TaglibLookup.d.ts",
+        "src/components/index.d.ts",
+        "src/components/Component.d.ts",
+        "src/components/taglib/TransformHelper/getComponentFiles.d.ts",
+        "src/runtime/Async.d.ts",
+        "src/runtime/DomElement.d.ts",
+        "src/runtime/html/index.d.ts",
+        "src/runtime/html/Template.d.ts",
+        "src/runtime/html/RenderResult.d.ts",
+        "src/runtime/html/AsyncStream.d.ts",
+        "src/runtime/vdom/AsyncVDOMBuilder.d.ts"
+    ]
+}
diff --git a/types/marko/tslint.json b/types/marko/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/marko/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/match-sorter/index.d.ts b/types/match-sorter/index.d.ts
new file mode 100644
index 0000000000..e1a7e8efe4
--- /dev/null
+++ b/types/match-sorter/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for match-sorter 2.2
+// Project: https://github.com/kentcdodds/match-sorter#readme
+// Definitions by: Claas Ahlrichs <https://github.com/claasahl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace matchSorter {
+    namespace rankings {
+        const CASE_SENSITIVE_EQUAL: 9;
+        const EQUAL: 8;
+        const STARTS_WITH: 7;
+        const WORD_STARTS_WITH: 6;
+        const STRING_CASE: 5;
+        const STRING_CASE_ACRONYM: 4;
+        const CONTAINS: 3;
+        const ACRONYM: 2;
+        const MATCHES: 1;
+        const NO_MATCH: 0;
+    }
+}
+
+interface MinRanking {
+    minRanking: number;
+    key: string;
+}
+
+interface MaxRanking {
+    maxRanking: number;
+    key: string;
+}
+
+interface MinMaxRanking {
+    minRanking: number;
+    maxRanking: number;
+    key: string;
+}
+
+interface Options<T> {
+    keys?: Array<(string | ((item: T) => string) | MinRanking | MaxRanking | MinMaxRanking)>;
+    threshold?: number;
+    keepDiacritics?: boolean;
+}
+
+/**
+ * Takes an array of items and a value and returns a new array with the items that match the given value
+ * @param items - the items to sort
+ * @param value - the value to use for ranking
+ * @param options - Some options to configure the sorter
+ * @return the new sorted array
+ */
+declare function matchSorter<T>(items: T[], value: string, options?: Options<T>): T[];
+
+export = matchSorter;
diff --git a/types/match-sorter/match-sorter-tests.ts b/types/match-sorter/match-sorter-tests.ts
new file mode 100644
index 0000000000..e1496cba9f
--- /dev/null
+++ b/types/match-sorter/match-sorter-tests.ts
@@ -0,0 +1,130 @@
+import matchSorter = require('match-sorter');
+
+// # Basic Sample
+{
+  const list = ['hi', 'hey', 'hello', 'sup', 'yo'];
+  matchSorter(list, 'h'); // ['hi', 'hey', 'hello']
+  matchSorter(list, 'y'); // ['yo', 'hey']
+  matchSorter(list, 'z'); // []
+}
+
+// # Advanced options
+
+// ## keys: [string]
+{
+  const objList = [
+    {name: 'Janice', color: 'Green'},
+    {name: 'Fred', color: 'Orange'},
+    {name: 'George', color: 'Blue'},
+    {name: 'Jen', color: 'Red'},
+  ];
+  matchSorter(objList, 'g', {keys: ['name', 'color']});
+  // [{name: 'George', color: 'Blue'}, {name: 'Janice', color: 'Green'}, {name: 'Fred', color: 'Orange'}]
+
+  matchSorter(objList, 're', {keys: ['color', 'name']});
+  // [{name: 'Jen', color: 'Red'}, {name: 'Janice', color: 'Green'}, {name: 'Fred', color: 'Orange'}, {name: 'George', color: 'Blue'}]
+}
+
+// ### Array of values
+{
+  const iceCreamYum = [
+    {favoriteIceCream: ['mint', 'chocolate']},
+    {favoriteIceCream: ['candy cane', 'brownie']},
+    {favoriteIceCream: ['birthday cake', 'rocky road', 'strawberry']},
+  ];
+  matchSorter(iceCreamYum, 'cc', {keys: ['favoriteIceCream']});
+  // [{favoriteIceCream: ['candy cane', 'brownie']}, {favoriteIceCream: ['mint', 'chocolate']}]
+}
+
+// ### Nested Keys
+{
+  const nestedObjList = [
+    {name: {first: 'Janice'}},
+    {name: {first: 'Fred'}},
+    {name: {first: 'George'}},
+    {name: {first: 'Jen'}},
+  ];
+  matchSorter(nestedObjList, 'j', {keys: ['name.first']});
+  // [{name: {first: 'Janice'}}, {name: {first: 'Jen'}}]
+}
+{
+  const nestedObjList = [
+    {name: [{first: 'Janice'}]},
+    {name: [{first: 'Fred'}]},
+    {name: [{first: 'George'}]},
+    {name: [{first: 'Jen'}]},
+  ];
+  matchSorter(nestedObjList, 'j', {keys: ['name.0.first']});
+  // [{name: {first: 'Janice'}}, {name: {first: 'Jen'}}]
+  // matchSorter(nestedObjList, 'j', {keys: ['name[0].first']}) does not work
+}
+
+// ### Property Callbacks
+{
+  const list = [{name: 'Janice'}, {name: 'Fred'}, {name: 'George'}, {name: 'Jen'}];
+  matchSorter(list, 'j', {keys: [item => item.name]});
+  // [{name: 'Janice'}, {name: 'Jen'}]
+}
+
+// ### Min and Max Ranking
+{
+  const tea = [
+    {tea: 'Earl Grey', alias: 'A'},
+    {tea: 'Assam', alias: 'B'},
+    {tea: 'Black', alias: 'C'},
+  ];
+  matchSorter(tea, 'A', {
+    keys: ['tea', {maxRanking: matchSorter.rankings.STARTS_WITH, key: 'alias'}],
+  });
+  // without maxRanking, Earl Grey would come first because the alias "A" would be CASE_SENSITIVE_EQUAL
+  // `tea` key comes before `alias` key, so Assam comes first even though both match as STARTS_WITH
+  // [{tea: 'Assam', alias: 'B'}, {tea: 'Earl Grey', alias: 'A'},{tea: 'Black', alias: 'C'}]
+}
+{
+  const tea = [
+    {tea: 'Milk', alias: 'moo'},
+    {tea: 'Oolong', alias: 'B'},
+    {tea: 'Green', alias: 'C'},
+  ];
+  matchSorter(tea, 'oo', {
+    keys: ['tea', {minRanking: matchSorter.rankings.EQUAL, key: 'alias'}],
+  });
+  // minRanking bumps Milk up to EQUAL from CONTAINS (alias)
+  // Oolong matches as STARTS_WITH
+  // Green is missing due to no match
+  // [{tea: 'Milk', alias: 'moo'}, {tea: 'Oolong', alias: 'B'}]
+}
+
+// ## threshold: number
+{
+  const fruit = ['orange', 'apple', 'grape', 'banana'];
+  matchSorter(fruit, 'ap', {threshold: matchSorter.rankings.NO_MATCH});
+  // ['apple', 'grape', 'orange', 'banana'] (returns all items, just sorted by best match)
+
+  const things = ['google', 'airbnb', 'apple', 'apply', 'app'];
+  matchSorter(things, 'app', {threshold: matchSorter.rankings.EQUAL});
+  // ['app'] (only items that are equal)
+
+  const otherThings = ['fiji apple', 'google', 'app', 'crabapple', 'apple', 'apply'];
+  matchSorter(otherThings, 'app', {threshold: matchSorter.rankings.WORD_STARTS_WITH});
+  // ['app', 'apple', 'apply', 'fiji apple'] (everything that matches with "word starts with" or better)
+}
+
+// ## keepDiacritics: boolean
+{
+  const thingsWithDiacritics = [
+    'jalapeño',
+    'à la carte',
+    'café',
+    'papier-mâché',
+    'à la mode',
+  ];
+  matchSorter(thingsWithDiacritics, 'aa');
+  // ['jalapeño', 'à la carte', 'à la mode', 'papier-mâché']
+
+  matchSorter(thingsWithDiacritics, 'aa', {keepDiacritics: true});
+  // ['jalapeño', 'à la carte']
+
+  matchSorter(thingsWithDiacritics, 'à', {keepDiacritics: true});
+  // ['à la carte', 'à la mode']
+}
diff --git a/types/match-sorter/tsconfig.json b/types/match-sorter/tsconfig.json
new file mode 100644
index 0000000000..7bdcd8a2d6
--- /dev/null
+++ b/types/match-sorter/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "esModuleInterop": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "match-sorter-tests.ts"
+    ]
+}
diff --git a/types/match-sorter/tslint.json b/types/match-sorter/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/match-sorter/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/material-ui-datatables/index.d.ts b/types/material-ui-datatables/index.d.ts
index e456f84e7d..ece700fe23 100644
--- a/types/material-ui-datatables/index.d.ts
+++ b/types/material-ui-datatables/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/material-ui-pagination/index.d.ts b/types/material-ui-pagination/index.d.ts
index 3e76401f43..1b91e0db3d 100644
--- a/types/material-ui-pagination/index.d.ts
+++ b/types/material-ui-pagination/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/lo-tp/material-ui-pagination
 // Definitions by: m0a <https://m0a.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 import * as React from 'react';
 export interface PaginationProps {
 	total: number;
diff --git a/types/material-ui-pagination/material-ui-pagination-tests.tsx b/types/material-ui-pagination/material-ui-pagination-tests.tsx
index d680f95e1f..7bce93709c 100644
--- a/types/material-ui-pagination/material-ui-pagination-tests.tsx
+++ b/types/material-ui-pagination/material-ui-pagination-tests.tsx
@@ -17,12 +17,9 @@ interface PagerState {
 }
 
 class Pager extends React.Component<{}, PagerState> {
-	constructor() {
-		super({});
-		this.state = {
-			pageIndex: 0
-		};
-	}
+	state = {
+		pageIndex: 0
+	};
 	setPageIndex = (pageIndex: number) => {
 		this.setState({ pageIndex });
 	}
diff --git a/types/material-ui/index.d.ts b/types/material-ui/index.d.ts
index 2d8631eb22..285d949d70 100644
--- a/types/material-ui/index.d.ts
+++ b/types/material-ui/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for material-ui 0.20
+// Type definitions for material-ui 0.21
 // Project: https://github.com/callemall/material-ui
 // Definitions by: Nathan Brown <https://github.com/ngbrown>
 //                 Igor Beagorudsky <https://github.com/theigor>
@@ -12,8 +12,9 @@
 //                 Dan Jones <https://github.com/dan-j>
 //                 Daisuke Mino <https://github.com/minodisk>
 //                 Sam Walsh <https://github.com/samwalshnz>
+//                 Tim de Koning <https://github.com/reggino>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 /// <reference types="react-addons-linked-state-mixin" />
@@ -1144,12 +1145,8 @@ declare namespace __MaterialUI {
     }
 
     namespace List {
-        export interface ListProps {
-            // <Paper/> is the element that get the 'other' properties
-            style?: React.CSSProperties;
-        }
-        export class List extends React.Component<ListProps> {
-        }
+        export interface ListProps extends React.HTMLAttributes<{}> {}
+        export class List extends React.Component<ListProps> {}
 
         export interface ListItemProps extends EnhancedButtonProps {
             // <EnhancedButton/> is the element that get the 'other' properties
@@ -1911,6 +1908,8 @@ declare namespace __MaterialUI {
         minlength?: string;
         step?: number;
         autoComplete?: string;
+        placeholder?: string;
+        title?: string;
     }
     export class TextField extends React.Component<TextFieldProps> {
         blur(): void;
diff --git a/types/material-ui/material-ui-tests.tsx b/types/material-ui/material-ui-tests.tsx
index a7bb59fcf8..9cc7143d9b 100644
--- a/types/material-ui/material-ui-tests.tsx
+++ b/types/material-ui/material-ui-tests.tsx
@@ -2372,13 +2372,9 @@ const AppBarExampleIconMenu = () => (
 
 // "http://www.material-ui.com/#/components/auto-complete"
 export class AutoCompleteExampleSimple extends Component<{}, {dataSource: string[]}> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      dataSource: [],
-    };
-  }
+  state = {
+    dataSource: [],
+  };
 
   handleUpdateInput = (value) => {
     this.setState({
@@ -2536,7 +2532,7 @@ const AutoCompleteExampleFilters = () => (
 
 // "http://www.material-ui.com/#/components/avatar"
 const AvatarExampleSimple = () => (
-  <List>
+  <List className="foo">
     <ListItem
       disabled={true}
       leftAvatar={
@@ -2959,12 +2955,9 @@ const CardExampleWithoutAvatar = () => (
 );
 
 class CardExampleControlled extends Component<{}, {expanded: boolean}> {
-  constructor(props) {
-    super(props);
-    this.state = {
-      expanded: false,
-    };
-  }
+  state = {
+    expanded: false,
+  };
 
   handleExpandChange = (expanded) => {
     this.setState({expanded});
@@ -3082,95 +3075,90 @@ interface DatePickerExampleToggleState {
 }
 
 class DatePickerExampleToggle extends Component<{}, DatePickerExampleToggleState> {
-  constructor(props) {
-    super(props);
+    static initState() {
+        const minDate = new Date();
+        const maxDate = new Date();
+        minDate.setFullYear(minDate.getFullYear() - 1);
+        minDate.setHours(0, 0, 0, 0);
+        maxDate.setFullYear(maxDate.getFullYear() + 1);
+        maxDate.setHours(0, 0, 0, 0);
 
-    const minDate = new Date();
-    const maxDate = new Date();
-    minDate.setFullYear(minDate.getFullYear() - 1);
-    minDate.setHours(0, 0, 0, 0);
-    maxDate.setFullYear(maxDate.getFullYear() + 1);
-    maxDate.setHours(0, 0, 0, 0);
+        return {
+            minDate,
+            maxDate,
+            autoOk: false,
+            disableYearSelection: false
+        };
+    }
+    state = DatePickerExampleToggle.initState();
 
-    this.state = {
-      minDate,
-      maxDate,
-      autoOk: false,
-      disableYearSelection: false,
-    };
-  }
+    handleChangeMinDate = (event, date) => {
+        this.setState({
+            minDate: date
+        });
+    }
 
-  handleChangeMinDate = (event, date) => {
-    this.setState({
-      minDate: date,
-    });
-  }
+    handleChangeMaxDate = (event, date) => {
+        this.setState({
+            maxDate: date
+        });
+    }
 
-  handleChangeMaxDate = (event, date) => {
-    this.setState({
-      maxDate: date,
-    });
-  }
+    handleToggle = (event, toggled) => {
+        this.setState({
+            [event.target.name]: toggled
+        });
+    }
 
-  handleToggle = (event, toggled) => {
-    this.setState({
-      [event.target.name]: toggled,
-    });
-  }
-
-  render() {
-    return (
-      <div>
-        <DatePicker
-          floatingLabelText="Ranged Date Picker"
-          autoOk={this.state.autoOk}
-          minDate={this.state.minDate}
-          maxDate={this.state.maxDate}
-          disableYearSelection={this.state.disableYearSelection}
-        />
-        <div style={optionsStyle}>
-          <DatePicker
-            onChange={this.handleChangeMinDate}
-            autoOk={this.state.autoOk}
-            floatingLabelText="Min Date"
-            defaultDate={this.state.minDate}
-            disableYearSelection={this.state.disableYearSelection}
-          />
-          <DatePicker
-            onChange={this.handleChangeMaxDate}
-            autoOk={this.state.autoOk}
-            floatingLabelText="Max Date"
-            defaultDate={this.state.maxDate}
-            disableYearSelection={this.state.disableYearSelection}
-          />
-          <Toggle
-            name="autoOk"
-            value="autoOk"
-            label="Auto Ok"
-            toggled={this.state.autoOk}
-            onToggle={this.handleToggle}
-          />
-          <Toggle
-            name="disableYearSelection"
-            value="disableYearSelection"
-            label="Disable Year Selection"
-            toggled={this.state.disableYearSelection}
-            onToggle={this.handleToggle}
-          />
-        </div>
-      </div>
-    );
-  }
+    render() {
+        return (
+            <div>
+                <DatePicker
+                    floatingLabelText="Ranged Date Picker"
+                    autoOk={this.state.autoOk}
+                    minDate={this.state.minDate}
+                    maxDate={this.state.maxDate}
+                    disableYearSelection={this.state.disableYearSelection}
+                />
+                <div style={optionsStyle}>
+                    <DatePicker
+                        onChange={this.handleChangeMinDate}
+                        autoOk={this.state.autoOk}
+                        floatingLabelText="Min Date"
+                        defaultDate={this.state.minDate}
+                        disableYearSelection={this.state.disableYearSelection}
+                    />
+                    <DatePicker
+                        onChange={this.handleChangeMaxDate}
+                        autoOk={this.state.autoOk}
+                        floatingLabelText="Max Date"
+                        defaultDate={this.state.maxDate}
+                        disableYearSelection={this.state.disableYearSelection}
+                    />
+                    <Toggle
+                        name="autoOk"
+                        value="autoOk"
+                        label="Auto Ok"
+                        toggled={this.state.autoOk}
+                        onToggle={this.handleToggle}
+                    />
+                    <Toggle
+                        name="disableYearSelection"
+                        value="disableYearSelection"
+                        label="Disable Year Selection"
+                        toggled={this.state.disableYearSelection}
+                        onToggle={this.handleToggle}
+                    />
+                </div>
+            </div>
+        );
+    }
 }
 
 class DatePickerExampleControlled extends Component<{}, {controlledDate?: Date}> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      controlledDate: null,
-    };
-  }
+  state = {
+    controlledDate: null,
+  };
 
   handleChange = (event, date) => {
     this.setState({
@@ -3545,10 +3533,7 @@ const DividerExampleMenu = () => (
 
 // "http://www.material-ui.com/#/components/drawer"
 class DrawerSimpleExample extends Component<{}, {open?: boolean}> {
-  constructor(props) {
-    super(props);
-    this.state = {open: false};
-  }
+  state = {open: false};
 
   handleToggle = () => this.setState({open: !this.state.open});
 
@@ -3569,10 +3554,7 @@ class DrawerSimpleExample extends Component<{}, {open?: boolean}> {
 }
 
 class DrawerUndockedExample extends Component<{}, {open?: boolean}> {
-  constructor(props) {
-    super(props);
-    this.state = {open: false};
-  }
+  state = {open: false};
 
   handleToggle = () => this.setState({open: !this.state.open});
 
@@ -3600,10 +3582,7 @@ class DrawerUndockedExample extends Component<{}, {open?: boolean}> {
 }
 
 class DrawerOpenRightExample extends Component<{}, {open?: boolean}> {
-  constructor(props) {
-    super(props);
-    this.state = {open: false};
-  }
+  state = {open: false};
 
   handleToggle = () => this.setState({open: !this.state.open});
 
@@ -4522,14 +4501,11 @@ interface IconMenuExampleControlledState {
 }
 
 class IconMenuExampleControlled extends Component<{}, IconMenuExampleControlledState> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      valueSingle: '3',
-      valueMultiple: ['3', '5'],
-    };
-  }
+  state = {
+    valueSingle: '3',
+    valueMultiple: ['3', '5'],
+    openMenu: false
+  };
 
   handleChangeSingle = (event, value) => {
     this.setState({
@@ -4698,10 +4674,7 @@ const IconMenuExampleNested = () => (
 
 // "http://www.material-ui.com/#/components/dropdown-menu"
 class DropDownMenuSimpleExample extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 1};
-  }
+  state = {value: 1};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -4734,10 +4707,7 @@ class DropDownMenuSimpleExample extends Component<{}, {value?: number}> {
 }
 
 class DropDownMenuOpenImmediateExample extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 2};
-  }
+  state = {value: 2};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -4771,10 +4741,7 @@ for (let i = 0; i < 100; i++) {
 }
 
 class DropDownMenuLongMenuExample extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 10};
-  }
+  state = {value: 10};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -4788,10 +4755,7 @@ class DropDownMenuLongMenuExample extends Component<{}, {value?: number}> {
 }
 
 class DropDownMenuLabeledExample extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 2};
-  }
+  state = {value: 2};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -4840,13 +4804,10 @@ const PaperExampleCircle = () => (
 
 // "http://www.material-ui.com/#/components/popover"
 class PopoverExampleSimple extends Component<{}, {open?: boolean, anchorEl?: ReactInstance}> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      open: false,
-    };
-  }
+  state = {
+    open: false,
+    anchorEl: null
+  };
 
   handleClick = (event) => {
     // This prevents ghost click.
@@ -4891,13 +4852,10 @@ class PopoverExampleSimple extends Component<{}, {open?: boolean, anchorEl?: Rea
 }
 
 class PopoverExampleAnimation extends Component<{}, {open?: boolean, anchorEl?: ReactInstance}> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      open: false,
-    };
-  }
+  state = {
+    open: false,
+    anchorEl: null
+  };
 
   handleClick = (event) => {
     // This prevents ghost click.
@@ -4949,21 +4907,17 @@ interface PopoverExampleConfigurableState {
 }
 
 class PopoverExampleConfigurable extends Component<{}, PopoverExampleConfigurableState> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      open: false,
-      anchorOrigin: {
+  state: PopoverExampleConfigurableState = {
+    open: false,
+    anchorOrigin: {
         horizontal: 'left',
         vertical: 'bottom',
-      },
-      targetOrigin: {
+    },
+    targetOrigin: {
         horizontal: 'left',
         vertical: 'top',
-      },
-    };
-  }
+    },
+  };
 
   handleClick = (event) => {
     // This prevents ghost click.
@@ -5110,13 +5064,9 @@ const CircularProgressExampleSimple = () => (
 class CircularProgressExampleDeterminate extends Component<{}, {completed?: number}> {
   private timer: number;
 
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      completed: 0,
-    };
-  }
+  state = {
+    completed: 0,
+  };
 
   componentDidMount() {
     this.timer = setTimeout(() => this.progress(5), 1000);
@@ -5155,13 +5105,9 @@ const LinearProgressExampleSimple = () => (
 class LinearProgressExampleDeterminate extends Component<{}, {completed?: number}> {
   private timer: number;
 
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      completed: 0,
-    };
-  }
+  state = {
+    completed: 0,
+  };
 
   componentDidMount() {
     this.timer = setTimeout(() => this.progress(5), 1000);
@@ -5250,10 +5196,7 @@ const RefreshIndicatorExampleLoading = () => (
 
 // "http://www.material-ui.com/#/components/select-field"
 class SelectFieldExampleSimple extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 1};
-  }
+  state = {value: 1};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -5302,10 +5245,7 @@ class SelectFieldExampleSimple extends Component<{}, {value?: number}> {
 }
 
 class SelectFieldLongMenuExample extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 10};
-  }
+  state = {value: 10};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -5319,10 +5259,7 @@ class SelectFieldLongMenuExample extends Component<{}, {value?: number}> {
 }
 
 class SelectFieldExampleCustomLabel extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: 1};
-  }
+  state = {value: 1};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -5347,10 +5284,7 @@ const itemsPeriod = [
 ];
 
 export default class SelectFieldExampleFloatingLabel extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: null};
-  }
+  state = {value: null};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -5380,10 +5314,7 @@ export default class SelectFieldExampleFloatingLabel extends Component<{}, {valu
 }
 
 class SelectFieldExampleError extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: null};
-  }
+  state = {value: null};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -5429,10 +5360,7 @@ const names = [
 ];
 
 class SelectFieldExampleMultiSelect extends Component<{}, {values?: string[]}> {
-  constructor(props) {
-    super(props);
-    this.state = {values: []};
-  }
+  state = {values: []};
 
   handleChange = (event, index, values) => this.setState({values});
 
@@ -5477,10 +5405,7 @@ const persons = [
 ];
 
 class SelectFieldExampleSelectionRenderer extends Component<{}, {values?: string[]}> {
-  constructor(props) {
-    super(props);
-    this.state = {values: []};
-  }
+  state = {values: []};
 
   handleChange = (event, index, values) => this.setState({values});
 
@@ -5523,10 +5448,7 @@ class SelectFieldExampleSelectionRenderer extends Component<{}, {values?: string
 }
 
 class SelectFieldExampleDropDownMenu extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {value: null};
-  }
+  state = {value: null};
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -5735,12 +5657,7 @@ const ToggleExampleSimple = () => (
 
 // "http://material-ui.com/#/components/snackbar"
 class SnackbarExampleSimple extends Component<{}, {open?: boolean}> {
-  constructor(props) {
-    super(props);
-    this.state = {
-      open: false,
-    };
-  }
+  state = { open: false, };
 
   handleClick = () => {
     this.setState({
@@ -5774,14 +5691,11 @@ class SnackbarExampleSimple extends Component<{}, {open?: boolean}> {
 }
 
 class SnackbarExampleAction extends Component<{}, {open?: boolean, autoHideDuration?: number, message?: string}> {
-  constructor(props) {
-    super(props);
-    this.state = {
-      autoHideDuration: 4000,
-      message: 'Event added to your calendar',
-      open: false,
-    };
-  }
+  state = {
+    autoHideDuration: 4000,
+    message: 'Event added to your calendar',
+    open: false,
+  };
 
   handleClick = () => {
     this.setState({
@@ -5836,16 +5750,11 @@ class SnackbarExampleAction extends Component<{}, {open?: boolean, autoHideDurat
 }
 
 class SnackbarExampleTwice extends Component<{}, {open?: boolean, message?: string}> {
-  private timer: number;
-
-  constructor(props) {
-    super(props);
-    this.state = {
-      message: 'Event 1 added to your calendar',
-      open: false,
-    };
-    this.timer = undefined;
-  }
+  state = {
+    message: 'Event 1 added to your calendar',
+    open: false,
+  };
+  private timer?: number;
 
   componentWillUnMount() {
     clearTimeout(this.timer);
@@ -6516,22 +6425,18 @@ interface TableExampleComplexState {
 }
 
 class TableExampleComplex extends Component<{}, TableExampleComplexState> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      fixedHeader: true,
-      fixedFooter: true,
-      stripedRows: false,
-      showRowHover: false,
-      selectable: true,
-      multiSelectable: false,
-      enableSelectAll: false,
-      deselectOnClickaway: true,
-      showCheckboxes: true,
-      height: '300px',
-    };
-  }
+  state = {
+    fixedHeader: true,
+    fixedFooter: true,
+    stripedRows: false,
+    showRowHover: false,
+    selectable: true,
+    multiSelectable: false,
+    enableSelectAll: false,
+    deselectOnClickaway: true,
+    showCheckboxes: true,
+    height: '300px',
+  };
 
   handleToggle = (event, toggled) => {
     this.setState({
@@ -6711,12 +6616,9 @@ const TabsExampleSimple = () => (
 );
 
 class TabsExampleControlled extends Component<{}, {value?: string}> {
-  constructor(props) {
-    super(props);
-    this.state = {
-      value: 'a',
-    };
-  }
+  state = {
+    value: 'a',
+  };
 
   handleChange = (value) => {
     this.setState({
@@ -6916,13 +6818,9 @@ const TextFieldExampleDisabled = () => (
 );
 
 class TextFieldExampleControlled extends Component<{}, {value?: string}> {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      value: 'Property Value',
-    };
-  }
+  state = {
+    value: 'Property Value',
+  };
 
   handleChange = (event) => {
     this.setState({
@@ -6962,10 +6860,7 @@ const TimePickerExampleSimple = () => (
 );
 
 class TimePickerExampleComplex extends Component<{}, {value24?: Date, value12?: Date}> {
-  constructor(props) {
-    super(props);
-    this.state = {value24: null, value12: null};
-  }
+  state = {value24: null, value12: null};
 
   handleChangeTimePicker24 = (event, date) => {
     this.setState({value24: date});
@@ -7007,12 +6902,9 @@ const TimePickerInternational = () => (
 
 // "http://www.material-ui.com/#/components/toolbar"
 class ToolbarExamplesSimple extends Component<{}, {value?: number}> {
-  constructor(props) {
-    super(props);
-    this.state = {
-      value: 3,
-    };
-  }
+  state = {
+    value: 3
+  };
 
   handleChange = (event, index, value) => this.setState({value});
 
@@ -7056,12 +6948,9 @@ const componentWithWidth = withWidth()(ToolbarExamplesSimple);
 class BottomNavigationExample extends Component<{}, {
   index?: number
 }> {
-  constructor() {
-    super({});
-    this.state = {
-      index: 0
-    };
-  }
+  state = {
+    index: 0
+  };
   render() {
     return <BottomNavigation selectedIndex={this.state.index}>
       <BottomNavigationItem label='0' icon={<ActionHome/>} onClick={() => this.setState({index: 0})}/>
diff --git a/types/material__menu/constants.d.ts b/types/material__menu/constants.d.ts
index 8bec0c2e0c..8c76365ef8 100644
--- a/types/material__menu/constants.d.ts
+++ b/types/material__menu/constants.d.ts
@@ -66,12 +66,12 @@ export interface CornerBit extends MDCNumbers {
  * Likewise END maps to RIGHT or LEFT depending on the directionality.
  */
 export interface Corner extends MDCNumbers {
-  TOP_LEFT: 0;
-  TOP_RIGHT: CornerBit["RIGHT"];
-  BOTTOM_LEFT: CornerBit["BOTTOM"];
-  BOTTOM_RIGHT: CornerBit["BOTTOM"] | CornerBit["RIGHT"];
-  TOP_START: CornerBit["FLIP_RTL"];
-  TOP_END: CornerBit["FLIP_RTL"] | CornerBit["RIGHT"];
-  BOTTOM_START: CornerBit["BOTTOM"] | CornerBit["FLIP_RTL"];
-  BOTTOM_END: CornerBit["BOTTOM"] | CornerBit["RIGHT"] | CornerBit["FLIP_RTL"];
+    TOP_LEFT: 0;
+    TOP_RIGHT: 4;
+    BOTTOM_LEFT: 1;
+    BOTTOM_RIGHT: 5;
+    TOP_START: 8;
+    TOP_END: 12;
+    BOTTOM_START: 9;
+    BOTTOM_END: 13;
 }
diff --git a/types/material__menu/foundation.d.ts b/types/material__menu/foundation.d.ts
index d2fe3a2c4a..db94bb7d48 100644
--- a/types/material__menu/foundation.d.ts
+++ b/types/material__menu/foundation.d.ts
@@ -40,7 +40,7 @@ export default class MDCMenuFoundation extends MDCFoundation<MDCMenuFoundation>
     /**
      * @param corner Default anchor corner alignment of top-left menu corner.
      */
-    setAnchorCorner(corner: Corner): void;
+    setAnchorCorner(corner: number): void;
 
     /**
      * @param margin 4-plet of margins from anchor.
diff --git a/types/material__menu/index.d.ts b/types/material__menu/index.d.ts
index 3c50c13690..1762aa3721 100644
--- a/types/material__menu/index.d.ts
+++ b/types/material__menu/index.d.ts
@@ -39,7 +39,7 @@ export class MDCMenu extends MDCComponent<MDCMenuAdapter, MDCMenuFoundation> {
     /**
      * @param corner Default anchor corner alignment of top-left menu corner.
      */
-    setAnchorCorner(corner: Corner): void;
+    setAnchorCorner(corner: number): void;
 
     setAnchorMargin(margin: AnchorMargin): void;
 
diff --git a/types/materialize-css/common.d.ts b/types/materialize-css/common.d.ts
index 605e9389be..a37afbbb34 100644
--- a/types/materialize-css/common.d.ts
+++ b/types/materialize-css/common.d.ts
@@ -43,7 +43,7 @@ declare namespace M {
         previousMonth: string;
         nextMonth: string;
         months: string[];
-        monthsShort: string;
+        monthsShort: string[];
         weekdays: string[];
         weekdaysShort: string[];
         weekdaysAbbrev: string[];
diff --git a/types/materialize-css/test/inputfields.test.ts b/types/materialize-css/test/inputfields.test.ts
index ecde571537..15ea61c1ee 100644
--- a/types/materialize-css/test/inputfields.test.ts
+++ b/types/materialize-css/test/inputfields.test.ts
@@ -1,6 +1,6 @@
 import * as materialize from "materialize-css";
 
-const elem = document.querySelector('.whatever')!;
+const elem = document.querySelector('.whatever') as HTMLElement;
 
 M.textareaAutoResize(elem);
 M.textareaAutoResize($(elem));
diff --git a/types/mathjs/index.d.ts b/types/mathjs/index.d.ts
index eda68ade10..71f89b3e1a 100644
--- a/types/mathjs/index.d.ts
+++ b/types/mathjs/index.d.ts
@@ -2647,7 +2647,6 @@ declare namespace math {
     interface Unit {
         valueOf(): string;
         clone(): Unit;
-        isDerived(): boolean;
         hasBase(base: any): boolean;
         equalBase(unit: Unit): boolean;
         equals(unit: Unit): boolean;
@@ -2658,13 +2657,12 @@ declare namespace math {
         to(unit: string): Unit;
         toNumber(unit: string): number;
         toNumeric(unit: string): number | Fraction | BigNumber;
+        toSI(): Unit;
         toString(): string;
         toJSON(): MathJSON;
         formatUnits(): string;
         format(options: FormatOptions): string;
-        parse(str: DOMStringList): Unit;
-        isValuelessUnit(name: string): boolean;
-        fromJSON(json: MathJSON): Unit;
+        splitUnit(parts: ReadonlyArray<string | Unit>): Unit[];
     }
 
     interface CreateUnitOptions {
diff --git a/types/mathjs/mathjs-tests.ts b/types/mathjs/mathjs-tests.ts
index c1e32a7d9a..7c3dfaec35 100644
--- a/types/mathjs/mathjs-tests.ts
+++ b/types/mathjs/mathjs-tests.ts
@@ -339,6 +339,12 @@ Units examples
 
 	// the expression parser supports units too
 	math.eval('2 inch to cm');
+
+	// units can be converted to SI
+	math.unit('1 inch').toSI();
+
+	// units can be split into other units
+	math.unit('1 m').splitUnit(['ft', 'in']);
 }
 
 /*
diff --git a/types/maxmind/index.d.ts b/types/maxmind/index.d.ts
index c93c59a72a..dd0a8ee63d 100644
--- a/types/maxmind/index.d.ts
+++ b/types/maxmind/index.d.ts
@@ -17,7 +17,10 @@ export declare interface Options {
     cache?: {
         max?: number;
         maxAge?: number;
-    }
+    };
+    watchForUpdates?: boolean;
+    watchForUpdatesNonPersistent?: boolean;
+    watchForUpdatesHook?: () => void;
 }
 
 export declare interface Metadata {
diff --git a/types/megajs/index.d.ts b/types/megajs/index.d.ts
new file mode 100644
index 0000000000..8162d6d648
--- /dev/null
+++ b/types/megajs/index.d.ts
@@ -0,0 +1,116 @@
+// Type definitions for megajs 0.14
+// Project: https://github.com/qgustavor/mega
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Readable, Writable, Stream } from 'stream';
+
+export interface AccountInfo {
+  type: string;
+  spaceUsed: number;
+  spaceTotal: number;
+  downloadBandwidthUsed: number;
+  downloadBandwidthTotal: number;
+  sharedBandwidthUsed: number;
+  sharedBandwidthLimit: number;
+}
+
+export interface DownloadOptions {
+  maxConnections?: number;
+  initialChunkSize?: number;
+  chunkSizeIncrement?: number;
+  maxChunkSize?: number;
+  returnCiphertext?: boolean;
+  start?: any;
+  end?: any;
+}
+
+export interface UploadOptions {
+  name: string;
+  attributes?: object;
+  size?: any;
+  thumbnailImage?: Buffer | Readable;
+  previewImage?: Buffer | Readable;
+}
+
+export interface LinkOptions {
+  noKey?: boolean;
+  key?: string | Buffer;
+}
+
+export interface MakeDirectoryOptions {
+  name: string;
+  attributes?: object;
+  key?: string | Buffer;
+}
+
+export interface FileOptions {
+  downloadId: string;
+  key: string;
+  directory: boolean;
+}
+
+export interface StorageOptions {
+  email: string;
+  password: string;
+  keepalive?: boolean;
+  autologin?: boolean;
+  autoload?: boolean;
+}
+
+export class File {
+  constructor(options: FileOptions | string);
+  static fromURL(options: FileOptions | string): File;
+  static unpackAttributes(at: any): JSON;
+  name: string;
+  attributes: object;
+  size: number;
+  key: Buffer;
+  timestamp: number;
+  nodeId: string;
+  downloadId: string;
+  directory: boolean;
+  children: ReadonlyArray<File>;
+  loadAttributes(cb?: any): Readable;
+  download(options?: DownloadOptions, cb?: any): Readable;
+}
+
+export class Storage {
+  constructor(options: StorageOptions, callback?: any);
+  static fromJSON(json: JSON): Storage;
+  name: string;
+  key: Buffer;
+  sid: string;
+  files: {[id in string]: MutableFile};
+  root: MutableFile;
+  trash: MutableFile;
+  inbox: MutableFile;
+  mounts: ReadonlyArray<File>;
+  upload(options: UploadOptions | string, buffer?: Buffer, cb?: any): Writable;
+  mkdir(options: MakeDirectoryOptions | string, cb: (err: Error | undefined, file: MutableFile) => void): Readable;
+  reload(cb: any): Readable;
+  login(cb: any): Readable;
+  getAccountInfo(cb: any): AccountInfo;
+  toJSON(): JSON;
+}
+
+export class MutableFile extends File {
+  constructor(options: FileOptions | string, storage: Storage);
+  upload(options: UploadOptions | string, buffer?: Buffer, cb?: any): Writable;
+  mkdir(options: MakeDirectoryOptions | string, cb?: any): Readable;
+  importFile(file: File | string, cb: (err: Error | undefined, file: MutableFile) => void): Readable;
+  link(options: LinkOptions | undefined, cb: (err: Error | undefined, url: string) => void): Readable;
+  shareFolder(options: LinkOptions | undefined, cb: (err: Error | undefined, url: string) => void): Readable;
+  delete(permanent: true | undefined, cb: (err: Error | undefined) => void): Readable;
+  moveTo(target: MutableFile | string, cb: (err: Error | undefined) => void): Readable;
+  setAttributes(attributes: object, cb: (err: Error | undefined) => void): Readable;
+  uploadAttribute(type: string | number, opt?: Buffer | Stream, cb?: any): Readable;
+  rename(newFileName: string, cb: (err: Error | undefined) => void): Readable;
+  setLabel(label: string, cb: (err: Error | undefined) => void): Readable;
+  setFavorite(isFavorite: boolean, cb: (err: Error | undefined) => void): Readable;
+}
+
+export default function mega(options: StorageOptions, cb?: any): Storage;
diff --git a/types/megajs/megajs-tests.ts b/types/megajs/megajs-tests.ts
new file mode 100644
index 0000000000..862373c85a
--- /dev/null
+++ b/types/megajs/megajs-tests.ts
@@ -0,0 +1,9 @@
+import mega from 'megajs';
+
+// $ExpectType Storage
+mega({email: 'test@test.net', password: '1234'});
+
+// tslint:disable-next-line no-duplicate-imports
+import { Storage } from 'megajs';
+
+const storage = new Storage({email: 'test@test.net', password: '1234'});
diff --git a/types/megajs/tsconfig.json b/types/megajs/tsconfig.json
new file mode 100644
index 0000000000..0e6bb53df1
--- /dev/null
+++ b/types/megajs/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"megajs-tests.ts"
+	]
+}
diff --git a/types/megajs/tslint.json b/types/megajs/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/megajs/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/memjs/index.d.ts b/types/memjs/index.d.ts
new file mode 100644
index 0000000000..8ab8290ae3
--- /dev/null
+++ b/types/memjs/index.d.ts
@@ -0,0 +1,410 @@
+// Type definitions for memjs 1.2
+// Project: http://github.com/memcachier/memjs
+// Definitions by: Zongmin Lei <https://github.com/leizongmin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+export interface ClientOptions {
+    /**
+     * `failoverTime` - how much to wait until retring a failed server. Default
+     * is 60 seconds.
+     */
+    failoverTime?: number;
+    /**
+     * `retries` - the number of times to retry an operation in lieu of failures
+     * (default 2)
+     */
+    retries?: number;
+    /**
+     * `retry_delay` - default is 0.2
+     */
+    retry_delay?: number;
+    /**
+     * `expires` - the default expiration in seconds to use (default 0 - never
+     * expire). If `expires` is greater than 30 days (60 x 60 x 24 x 30), it is
+     * treated as a UNIX time (number of seconds since January 1, 1970).
+     */
+    expires?: number;
+    /**
+     * `logger` - a logger object that responds to `log(string)` method calls.
+     */
+    logger?: {
+        log(...args: any[]): void;
+    };
+}
+export class Client {
+    /**
+     * Creates a new client given an optional config string and optional hash of
+     * options. The config string should be of the form:
+     *
+     *     "[user:pass@]server1[:11211],[user:pass@]server2[:11211],..."
+     *
+     * If the argument is not given, fallback on the `MEMCACHIER_SERVERS` environment
+     * variable, `MEMCACHE_SERVERS` environment variable or `"localhost:11211"`.
+     *
+     * The options hash may contain the options:
+     *
+     * * `retries` - the number of times to retry an operation in lieu of failures
+     * (default 2)
+     * * `expires` - the default expiration in seconds to use (default 0 - never
+     * expire). If `expires` is greater than 30 days (60 x 60 x 24 x 30), it is
+     * treated as a UNIX time (number of seconds since January 1, 1970).
+     * * `logger` - a logger object that responds to `log(string)` method calls.
+     * * `failover` - whether to failover to next server. Defaults to false.
+     * * `failoverTime` - how much to wait until retring a failed server. Default
+     *                    is 60 seconds.
+     *
+     *   ~~~~
+     *     log(msg1[, msg2[, msg3[...]]])
+     *   ~~~~
+     *
+     *   Defaults to `console`.
+     *
+     * Or options for the servers including:
+     * * `username` and `password` for fallback SASL authentication credentials.
+     * * `timeout` in seconds to determine failure for operations. Default is 0.5
+     *             seconds.
+     * * 'conntimeout' in seconds to connection failure. Default is twice the value
+     *                 of `timeout`.
+     * * `keepAlive` whether to enable keep-alive functionality. Defaults to false.
+     * * `keepAliveDelay` in seconds to the initial delay before the first keepalive
+     *                    probe is sent on an idle socket. Defaults is 30 seconds.
+     */
+    static create(serversStr?: string, options?: ClientOptions): Client;
+
+    servers: string[];
+
+    /**
+     * Client initializer takes a list of Servers and an options dictionary. See Client.create for details.
+     * @param servers
+     * @param options
+     */
+    constructor(servers: string, options?: ClientOptions);
+
+    /**
+     * Chooses the server to talk to by hashing the given key.
+     * @param key
+     */
+    server(key: string): string;
+
+    /**
+     * GET
+     *
+     * Retrieves the value at the given key in memcache.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, value, flags)
+     *
+     * _value_ and _flags_ are both `Buffer`s. If the key is not found, the
+     * callback is invoked with null for both arguments and no error
+     * @param key
+     * @param callback
+     */
+    get(
+        key: string,
+        callback: (err?: Error | null, value?: Buffer, flags?: Buffer) => void
+    ): void;
+
+    /**
+     * SET
+     *
+     * Sets the given _key_ and _value_ in memcache.
+     *
+     * The options dictionary takes:
+     * * _expires_: overrides the default expiration (see `Client.create`) for this
+     *              particular key-value pair.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param value
+     * @param options
+     * @param callback
+     */
+    set(
+        key: string,
+        value: string | Buffer,
+        options: { expires?: number },
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * ADD
+     *
+     * Adds the given _key_ and _value_ to memcache. The operation only succeeds
+     * if the key is not already set.
+     *
+     * The options dictionary takes:
+     * * _expires_: overrides the default expiration (see `Client.create`) for this
+     *              particular key-value pair.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param value
+     * @param options
+     * @param callback
+     */
+    add(
+        key: string,
+        value: string | Buffer,
+        options: { expires?: number },
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * REPLACE
+     *
+     * Replaces the given _key_ and _value_ to memcache. The operation only succeeds
+     * if the key is already present.
+     *
+     * The options dictionary takes:
+     * * _expires_: overrides the default expiration (see `Client.create`) for this
+     *              particular key-value pair.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param value
+     * @param options
+     * @param callback
+     */
+    replace(
+        key: string,
+        value: string | Buffer,
+        options: { expires?: number },
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * DELETE
+     *
+     * Deletes the given _key_ from memcache. The operation only succeeds
+     * if the key is already present.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param callback
+     */
+    delete(
+        key: string,
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * INCREMENT
+     *
+     * Increments the given _key_ in memcache.
+     *
+     * The options dictionary takes:
+     * * _initial_: the value for the key if not already present, defaults to 0.
+     * * _expires_: overrides the default expiration (see `Client.create`) for this
+     *              particular key-value pair.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, success, value)
+     * @param key
+     * @param amount
+     * @param options
+     * @param callback
+     */
+    increment(
+        key: string,
+        amount: number,
+        options: { initial?: number; expires?: number },
+        callback: (
+            err?: Error | null,
+            success?: boolean,
+            value?: number
+        ) => void
+    ): void;
+
+    /**
+     * DECREMENT
+     *
+     * Decrements the given _key_ in memcache.
+     *
+     * The options dictionary takes:
+     * * _initial_: the value for the key if not already present, defaults to 0.
+     * * _expires_: overrides the default expiration (see `Client.create`) for this
+     *              particular key-value pair.
+     *
+     * The callback signature is:
+     *
+     *     callback(err, success, value)
+     * @param key
+     * @param amount
+     * @param options
+     * @param callback
+     */
+    decrement(
+        key: string,
+        amount: number,
+        options: { initial?: number; expires?: number },
+        callback: (
+            err?: Error | null,
+            success?: boolean,
+            value?: number
+        ) => void
+    ): void;
+
+    /**
+     * APPEND
+     *
+     * Append the given _value_ to the value associated with the given _key_ in
+     * memcache. The operation only succeeds if the key is already present. The
+     * callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param value
+     * @param callback
+     */
+    append(
+        key: string,
+        value: string | Buffer,
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * PREPEND
+     *
+     * Prepend the given _value_ to the value associated with the given _key_ in
+     * memcache. The operation only succeeds if the key is already present. The
+     * callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param value
+     * @param callback
+     */
+    prepend(
+        key: string,
+        value: string | Buffer,
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * TOUCH
+     *
+     * Touch sets an expiration value, given by _expires_, on the given _key_ in
+     * memcache. The operation only succeeds if the key is already present. The
+     * callback signature is:
+     *
+     *     callback(err, success)
+     * @param key
+     * @param expires
+     * @param callback
+     */
+    touch(
+        key: string,
+        expires: number,
+        callback: (err?: Error | null, success?: boolean) => void
+    ): void;
+
+    /**
+     * FLUSH
+     *
+     * Flushes the cache on each connected server. The callback signature is:
+     *
+     *     callback(lastErr, results)
+     *
+     * where _lastErr_ is the last error encountered (or null, in the common case
+     * of no errors). _results_ is a dictionary mapping `"hostname:port"` to either
+     * `true` (if the operation was successful), or an error.
+     * @param callback
+     */
+    flush(
+        callback: (
+            err?: Error | null,
+            results?: Record<string, boolean>
+        ) => void
+    ): void;
+
+    /**
+     * STATS_WITH_KEY
+     *
+     * Sends a memcache stats command with a key to each connected server. The
+     * callback is invoked **ONCE PER SERVER** and has the signature:
+     *
+     *     callback(err, server, stats)
+     *
+     * _server_ is the `"hostname:port"` of the server, and _stats_ is a dictionary
+     * mapping the stat name to the value of the statistic as a string.
+     * @param key
+     * @param callback
+     */
+    statsWithKey(
+        key: string,
+        callback: (
+            err?: Error | null,
+            server?: string,
+            stats?: Record<string, string>
+        ) => void
+    ): void;
+
+    /**
+     * RESET_STATS
+     *
+     * Reset the statistics each server is keeping back to zero. This doesn't clear
+     * stats such as item count, but temporary stats such as total number of
+     * connections over time.
+     *
+     * The callback is invoked **ONCE PER SERVER** and has the signature:
+     *
+     *     callback(err, server)
+     *
+     * _server_ is the `"hostname:port"` of the server.
+     * @param callback
+     */
+    resetStats(callback: (err?: Error | null, server?: string) => void): void;
+
+    /**
+     * QUIT
+     *
+     * Closes the connection to each server, notifying them of this intention. Note
+     * that quit can race against already outstanding requests when those requests
+     * fail and are retried, leading to the quit command winning and closing the
+     * connection before the retries complete.
+     */
+    quit(): void;
+
+    /**
+     * CLOSE
+     *
+     * Closes (abruptly) connections to all the servers.
+     */
+    close(): void;
+
+    /**
+     * Perform a generic single response operation (get, set etc) on a server
+     * serv: the server to perform the operation on
+     * request: a buffer containing the request
+     * seq: the sequence number of the operation. It is used to pin the callbacks
+     *      to a specific operation and should never change during a `perform`.
+     * callback: a callback invoked when a response is received or the request
+     *           fails
+     * retries: number of times to retry request on failure
+     * @param key
+     * @param request
+     * @param seq
+     * @param callback
+     * @param retries
+     */
+    perform(
+        key: string,
+        request: Buffer,
+        seq: number,
+        callback: () => void,
+        retries: number
+    ): void;
+}
diff --git a/types/memjs/memjs-tests.ts b/types/memjs/memjs-tests.ts
new file mode 100644
index 0000000000..2e3c34a3b5
--- /dev/null
+++ b/types/memjs/memjs-tests.ts
@@ -0,0 +1,10 @@
+import * as memjs from "memjs";
+
+const client = memjs.Client.create();
+
+client.set("hello", "world", { expires: 600 }, (err, val) => {
+    console.log(err, val);
+});
+client.get("hello", (err, val) => {
+    console.log(err, val);
+});
diff --git a/types/memjs/tsconfig.json b/types/memjs/tsconfig.json
new file mode 100644
index 0000000000..8df1e4876a
--- /dev/null
+++ b/types/memjs/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",
+        "memjs-tests.ts"
+    ]
+}
diff --git a/types/memjs/tslint.json b/types/memjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/memjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/memoize-one/index.d.ts b/types/memoize-one/index.d.ts
index caac3a4429..71f785e73c 100644
--- a/types/memoize-one/index.d.ts
+++ b/types/memoize-one/index.d.ts
@@ -1,12 +1,9 @@
 // Type definitions for memoize-one 3.1
 // Project: https://github.com/alexreardon/memoize-one#readme
-// Definitions by: Karol Majewski <https://github.com/karol-majewski>
+// Definitions by: Karol Majewski <https://github.com/karol-majewski>, Frank Li <https://github.com/franklixuefei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export = memoizeOne;
+declare function memoizeOne<T extends (...args: any[]) => any>(resultFn: T, isEqual?: EqualityFn): T;
+export type EqualityFn = (a: any, b: any) => boolean;
 
-declare function memoizeOne<T extends (...args: any[]) => any>(resultFn: T, isEqual?: memoizeOne.EqualityFn): T;
-
-declare namespace memoizeOne {
-    type EqualityFn = (a: any, b: any) => boolean;
-}
+export default memoizeOne;
diff --git a/types/memoize-one/memoize-one-tests.ts b/types/memoize-one/memoize-one-tests.ts
index 7ab20ac891..4feddf6e57 100644
--- a/types/memoize-one/memoize-one-tests.ts
+++ b/types/memoize-one/memoize-one-tests.ts
@@ -1,4 +1,4 @@
-import memoizeOne = require('memoize-one');
+import memoizeOne, { EqualityFn } from 'memoize-one';
 
 declare function add(a: number, b: number): number ;
 declare function lousyEqualityFn(a: any, b: any): boolean;
@@ -30,4 +30,4 @@ memoizeOne(add, (a: string, b: string) => 0); // $ExpectError
 /**
  * The `EqualityFn` type is publicly accessible.
  */
-const simpleIsEqual: memoizeOne.EqualityFn = (x: number, y: number): boolean => (x === y);
+const simpleIsEqual: EqualityFn = (x: number, y: number): boolean => (x === y);
diff --git a/types/merge-stream/index.d.ts b/types/merge-stream/index.d.ts
index 5a5493b06e..9f085fc61c 100644
--- a/types/merge-stream/index.d.ts
+++ b/types/merge-stream/index.d.ts
@@ -1,17 +1,17 @@
-// Type definitions for merge-stream v1.1.0
+// Type definitions for merge-stream 1.1
 // Project: https://github.com/grncdr/merge-stream
-// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>, Tom X. Tobin <http://tomxtobin.com/>, Daniel Zazula <https://github.com/daniel-zazula>
+// Definitions by: Keita Kagurazaka <https://github.com/k-kagurazaka>
+//                 Tom X. Tobin <https://github.com/tomxtobin>
+//                 Daniel Zazula <https://github.com/daniel-zazula>
+//                 Daniel Cassidy <https://github.com/djcsdy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node"/>
 
-
-interface IMergedStream extends NodeJS.ReadWriteStream {
-    add(source: NodeJS.ReadableStream): IMergedStream;
-    add(source: NodeJS.ReadableStream[]): IMergedStream;
+interface MergedStream extends NodeJS.ReadWriteStream {
+    add(source: NodeJS.ReadableStream | ReadonlyArray<NodeJS.ReadableStream>): MergedStream;
     isEmpty(): boolean;
 }
 
-declare function merge<T extends NodeJS.ReadableStream>(streams: T[]): IMergedStream;
-declare function merge<T extends NodeJS.ReadableStream>(...streams: T[]): IMergedStream;
+declare function merge<T extends NodeJS.ReadableStream>(...streams: Array<T | ReadonlyArray<T>>): MergedStream;
 export = merge;
diff --git a/types/merge-stream/merge-stream-tests.ts b/types/merge-stream/merge-stream-tests.ts
index a12e7f9c65..495ab31409 100644
--- a/types/merge-stream/merge-stream-tests.ts
+++ b/types/merge-stream/merge-stream-tests.ts
@@ -1,23 +1,22 @@
-
 import stream = require("stream");
 import Stream = stream.Readable;
 import merge = require("merge-stream");
 
-var stream1 = new Stream();
-var stream2 = new Stream();
+const stream1 = new Stream();
+const stream2 = new Stream();
 
-var merged = merge(stream1, stream2);
+const merged = merge(stream1, stream2);
 
-var stream3 = new Stream();
+const stream3 = new Stream();
 merged.add(stream3);
 
-var stream4 = new Stream();
-var stream5 = new Stream();
+const stream4 = new Stream();
+const 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);
+const stream6 = new Stream();
+const stream7 = new Stream();
+const streamArray = [stream6, stream7];
+const merged2 = merge(streamArray);
diff --git a/types/merge-stream/tsconfig.json b/types/merge-stream/tsconfig.json
index d68bbea99f..92082068cf 100644
--- a/types/merge-stream/tsconfig.json
+++ b/types/merge-stream/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",
         "merge-stream-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/merge-stream/tslint.json b/types/merge-stream/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/merge-stream/tslint.json
+++ b/types/merge-stream/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/mermaid/index.d.ts b/types/mermaid/index.d.ts
new file mode 100644
index 0000000000..055886cf46
--- /dev/null
+++ b/types/mermaid/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for mermaid 8.0
+// Project: https://github.com/knsv/mermaid#readme
+// Definitions by: Geoffrey Gilmore <https://github.com/ggilmore>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import mermaidAPI from "./mermaidAPI";
+
+/**
+ * ## init
+ * Function that goes through the document to find the chart definitions in there and render them.
+ *
+ * The function tags the processed attributes with the attribute data-processed and ignores found elements with the
+ * attribute already set. This way the init function can be triggered several times.
+ *
+ * Optionally, `init` can accept in the second argument one of the following:
+ * - a DOM Node
+ * - an array of DOM nodes (as would come from a jQuery selector)
+ * - a W3C selector, a la `.mermaid`
+ *
+ * ```mermaid
+ * graph LR;
+ *  a(Find elements)-->b{Processed}
+ *  b-->|Yes|c(Leave element)
+ *  b-->|No |d(Transform)
+ * ```
+ * Renders the mermaid diagrams
+ * @param nodes a css selector or an array of nodes
+ */
+declare function init(nodes: string | Node | NodeList): void;
+
+declare function initialize(config: mermaidAPI.Config): void;
+
+/**
+ * ##contentLoaded
+ * Callback function that is called when page is loaded. This functions fetches configuration for mermaid rendering and
+ * calls init for rendering the mermaid diagrams on the page.
+ */
+declare function contentLoaded(): void;
+
+export interface Mermaid {
+    startOnLoad: boolean;
+    htmlLabels: boolean;
+
+    mermaidAPI: typeof mermaidAPI;
+    parse: typeof mermaidAPI.parse;
+    render: typeof mermaidAPI.render;
+
+    init: typeof init;
+    initialize: typeof initialize;
+
+    contentLoaded: typeof contentLoaded;
+}
+
+declare const mermaid: Mermaid;
+
+export default mermaid;
+
+export as namespace mermaid;
diff --git a/types/mermaid/mermaid-tests.ts b/types/mermaid/mermaid-tests.ts
new file mode 100644
index 0000000000..6d5b218ce4
--- /dev/null
+++ b/types/mermaid/mermaid-tests.ts
@@ -0,0 +1,28 @@
+import mermaid from "mermaid";
+
+const config = {
+    startOnLoad: true,
+    flowchart: {
+        useMaxWidth: false,
+        htmlLabels: true
+    }
+};
+
+mermaid.initialize(config);
+
+// mermaidAPI usage
+
+const { mermaidAPI } = mermaid;
+mermaidAPI.initalize({});
+
+const element = document.querySelector("#graphDiv")!;
+
+const insertSvg = (
+    svgCode: string,
+    bindFunctions: (element: Element) => void
+) => {
+    element.innerHTML = svgCode;
+};
+
+const graphDefinition = "graph TB\na-->b";
+const graph = mermaidAPI.render("graphDiv", graphDefinition, insertSvg);
diff --git a/types/mermaid/mermaidAPI.d.ts b/types/mermaid/mermaidAPI.d.ts
new file mode 100644
index 0000000000..11077d88c4
--- /dev/null
+++ b/types/mermaid/mermaidAPI.d.ts
@@ -0,0 +1,248 @@
+declare namespace mermaidAPI {
+    type Theme = "default" | "forest" | "dark" | "netural";
+
+    enum LogLevel {
+        Debug = 1,
+        Info,
+        Warn,
+        Error,
+        Fatal
+    }
+
+    interface FlowChartConfig {
+        /**
+         * **htmlLabels** - Flag for setting whether or not a html tag should be used for rendering labels
+         * on the edges
+         * default: true
+         */
+        htmlLabels?: boolean;
+
+        /**
+         * default: 'linear'
+         */
+        curve?: string;
+    }
+
+    interface SequenceDiagramConfig {
+        /**
+         * **diagramMarginX** - margin to the right and left of the sequence diagram
+         * default: 50
+         */
+        diagramMarginX?: number;
+
+        /**
+         * **diagramMarginY** - margin to the over and under the sequence diagram
+         * default: 10
+         */
+        diagramMarginY?: number;
+
+        /**
+         * **actorMargin** - Margin between actors
+         * default: 10
+         */
+        actorMargin?: number;
+
+        /**
+         * **width** - Width of actor boxes
+         * default: 150
+         */
+        width?: number;
+
+        /**
+         * **height** - Height of actor boxes
+         * default: 65
+         */
+        height?: number;
+
+        /**
+         * **boxMargin** - Margin around loop boxes
+         * default: 10
+         */
+        boxMargin?: number;
+
+        /**
+         * **boxTextMargin** - margin around the text in loop/alt/opt boxes
+         * default: 5
+         */
+        boxTextMargin?: number;
+
+        /**
+         * **noteMargin** - margin around notes
+         * default: 10
+         */
+        noteMargin?: number;
+
+        /**
+         * **messageMargin** - Space between messages
+         * default: 35
+         */
+        messageMargin?: number;
+
+        /**
+         * **mirrorActors** - mirror actors under diagram
+         * default: true
+         */
+        mirrorActors?: boolean;
+
+        /**
+         * **bottomMarginAdj** - Depending on css styling this might need adjustment.
+         * Prolongs the edge of the diagram downwards
+         * default: 1
+         */
+        bottomMarginAdj?: number;
+
+        /**
+         * **useMaxWidth** - when this flag is set the height and width is set to 100% and is then scaling with the
+         * available space if not the absolute space required is used
+         * default: true
+         */
+        useMaxWidth?: boolean;
+    }
+
+    interface GnattConfig {
+        /**
+         * **titleTopMargin** - margin top for the text over the gantt diagram
+         * default: 25
+         */
+        titleTopMargin?: number;
+
+        /**
+         * **barHeight** - the height of the bars in the graph
+         * default: 20
+         */
+        barHeight?: number;
+
+        /**
+         * **barGap** - the margin between the different activities in the gantt diagram
+         * default: 4
+         */
+        barGap?: number;
+
+        /**
+         *  **topPadding** - margin between title and gantt diagram and between axis and gantt diagram.
+         * default: 50
+         */
+        topPadding?: number;
+
+        /**
+         *  **leftPadding** - the space allocated for the section name to the left of the activities.
+         * default: 75
+         */
+        leftPadding?: number;
+
+        /**
+         *  **gridLineStartPadding** - Vertical starting position of the grid lines
+         * default: 35
+         */
+        gridLineStartPadding?: number;
+
+        /**
+         *  **fontSize** - font size ...
+         * default: 11
+         */
+        fontSize?: number;
+
+        /**
+         * **fontFamily** - font family ...
+         * default:  '"Open-Sans", "sans-serif"'
+         */
+        fontFamily?: string;
+
+        /**
+         * **numberSectionStyles** - the number of alternating section styles
+         * default: 4
+         */
+        numberSectionStyles?: number;
+
+        /**
+         * **axisFormat** - datetime format of the axis, this might need adjustment to match your locale and preferences
+         * default: '%Y-%m-%d'
+         */
+        axisFormat?: string;
+    }
+
+    interface Config {
+        theme?: Theme;
+
+        /**
+         * logLevel , decides the amount of logging to be used.
+         * default: LogLevel.Fatal
+         */
+        logLevel?: LogLevel;
+
+        /**
+         * **startOnLoad** - This options controls whether or mermaid starts when the page loads
+         * default: true
+         */
+        startOnLoad?: boolean;
+
+        /**
+         * **arrowMarkerAbsolute** - This options controls whether or arrow markers in html code will be absolute paths or
+         * an anchor, #. This matters if you are using base tag settings.
+         * default: false
+         */
+        arrowMarkerAbsolute?: boolean;
+
+        /**
+         * ### flowchart
+         * *The object containing configurations specific for flowcharts*
+         */
+        flowchart?: FlowChartConfig;
+
+        /**
+         * ###  sequenceDiagram
+         * The object containing configurations specific for sequence diagrams
+         */
+        sequence?: SequenceDiagramConfig;
+
+        /**
+         * ### gantt
+         * The object containing configurations specific for gantt diagrams*
+         */
+        gnatt?: GnattConfig;
+
+        class?: any;
+        git?: any;
+    }
+
+    /**
+     * ##render
+     * Function that renders an svg with a graph from a chart definition. Usage example below.
+     *
+     * ```
+     * mermaidAPI.initialize({
+     *      startOnLoad:true
+     *  });
+     *  $(function(){
+     *      const graphDefinition = 'graph TB\na-->b';
+     *      const cb = function(svgGraph){
+     *          console.log(svgGraph);
+     *      };
+     *      mermaidAPI.render('id1',graphDefinition,cb);
+     *  });
+     * ```
+     * @param id the id of the element to be rendered
+     * @param txt the graph definition
+     * @param cb callback which is called after rendering is finished with the svg code as inparam.
+     * @param container selector to element in which a div with the graph temporarily will be inserted. In one is
+     * provided a hidden div will be inserted in the body of the page instead. The element will be removed when rendering is
+     * completed.
+     */
+    function render(
+        id: string,
+        txt: string,
+        cb: (
+            svgCode: string,
+            bindFunctions: (element: Element) => void
+        ) => void,
+        container?: string
+    ): string;
+
+    function parse(text: string): any;
+
+    function initalize(options: Config): void;
+
+    function getConfig(): Config;
+}
+
+export default mermaidAPI;
diff --git a/types/mermaid/tsconfig.json b/types/mermaid/tsconfig.json
new file mode 100644
index 0000000000..5ead0b83e6
--- /dev/null
+++ b/types/mermaid/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "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", "mermaidAPI.d.ts", "mermaid-tests.ts"]
+}
diff --git a/types/mermaid/tslint.json b/types/mermaid/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mermaid/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/meteor-univserse-i18n/index.d.ts b/types/meteor-universe-i18n/index.d.ts
similarity index 100%
rename from types/meteor-univserse-i18n/index.d.ts
rename to types/meteor-universe-i18n/index.d.ts
diff --git a/types/meteor-univserse-i18n/meteor-univserse-i18n-tests.ts b/types/meteor-universe-i18n/meteor-universe-i18n-tests.ts
similarity index 100%
rename from types/meteor-univserse-i18n/meteor-univserse-i18n-tests.ts
rename to types/meteor-universe-i18n/meteor-universe-i18n-tests.ts
diff --git a/types/meteor-universe-i18n/tsconfig.json b/types/meteor-universe-i18n/tsconfig.json
new file mode 100644
index 0000000000..3b4c98a86d
--- /dev/null
+++ b/types/meteor-universe-i18n/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",
+        "meteor-universe-i18n-tests.ts"
+    ]
+}
diff --git a/types/meteor-universe-i18n/tslint.json b/types/meteor-universe-i18n/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/meteor-universe-i18n/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/meteor/accounts.d.ts b/types/meteor/accounts-base.d.ts
similarity index 51%
rename from types/meteor/accounts.d.ts
rename to types/meteor/accounts-base.d.ts
index b4e78c1664..6e25e71b07 100644
--- a/types/meteor/accounts.d.ts
+++ b/types/meteor/accounts-base.d.ts
@@ -1,54 +1,3 @@
-interface URLS {
-    resetPassword: (token: string) => string;
-    verifyEmail: (token: string) => string;
-    enrollAccount: (token: string) => string;
-}
-
-interface EmailFields {
-    from?: () => string;
-    subject?: (user: Meteor.User) => string;
-    text?: (user: Meteor.User, url: string) => string;
-    html?: (user: Meteor.User, url: string) => string;
-}
-
-declare module Accounts {
-    var urls: URLS;
-
-    function user(): Meteor.User;
-
-    function userId(): string;
-
-    function createUser(options: {
-        username?: string;
-        email?: string;
-        password?: string;
-        profile?: Object;
-    }, callback?: Function): string;
-
-    function config(options: {
-        sendVerificationEmail?: boolean;
-        forbidClientAccountCreation?: boolean;
-        restrictCreationByEmailDomain?: string | Function;
-        loginExpirationInDays?: number;
-        oauthSecretKey?: string;
-        passwordResetTokenExpirationInDays?: number;
-        passwordEnrollTokenExpirationInDays?: number;
-        ambiguousErrorMessages?: boolean;
-    }): void;
-
-    function onLogin(func: Function): {
-        stop: () => void
-    };
-
-    function onLoginFailure(func: Function): {
-        stop: () => void
-    };
-
-    function loginServicesConfigured(): boolean;
-
-    function onPageLoadLogin(func: Function): void;
-}
-
 declare module "meteor/accounts-base" {
     interface URLS {
         resetPassword: (token: string) => string;
@@ -56,6 +5,13 @@ declare module "meteor/accounts-base" {
         enrollAccount: (token: string) => string;
     }
 
+    interface EmailFields {
+        from?: () => string;
+        subject?: (user: Meteor.User) => string;
+        text?: (user: Meteor.User, url: string) => string;
+        html?: (user: Meteor.User, url: string) => string;
+    }
+
     module Accounts {
         var urls: URLS;
 
@@ -93,42 +49,7 @@ declare module "meteor/accounts-base" {
 
         function onPageLoadLogin(func: Function): void;
     }
-}
 
-declare module Accounts {
-    function changePassword(oldPassword: string, newPassword: string, callback?: Function): void;
-
-    function forgotPassword(options: {
-        email?: string;
-    }, callback?: Function): void;
-
-    function resetPassword(token: string, newPassword: string, callback?: Function): void;
-
-    function verifyEmail(token: string, callback?: Function): void;
-
-    function onEmailVerificationLink(callback: Function): void;
-
-    function onEnrollmentLink(callback: Function): void;
-
-    function onResetPasswordLink(callback: Function): void;
-
-    function loggingIn(): boolean;
-
-    function logout(callback?: Function): void;
-
-    function logoutOtherClients(callback?: Function): void;
-
-    var ui: {
-        config(options: {
-            requestPermissions?: Object;
-            requestOfflineToken?: Object;
-            forceApprovalPrompt?: Object;
-            passwordSignupFields?: string;
-        }): void;
-    };
-}
-
-declare module "meteor/accounts-base" {
     module Accounts {
         function changePassword(oldPassword: string, newPassword: string, callback?: Function): void;
 
@@ -161,72 +82,6 @@ declare module "meteor/accounts-base" {
             }): void;
         };
     }
-}
-
-interface Header {
-    [id: string]: string;
-}
-
-interface EmailTemplates {
-    from: string;
-    siteName: string;
-    headers?: Header;
-    resetPassword: EmailFields;
-    enrollAccount: EmailFields;
-    verifyEmail: EmailFields;
-}
-
-declare module Accounts {
-    var emailTemplates: EmailTemplates;
-
-    function addEmail(userId: string, newEmail: string, verified?: boolean): void;
-
-    function removeEmail(userId: string, email: string): void;
-
-    function onCreateUser(func: Function): void;
-
-    function findUserByEmail(email: string): Object;
-
-    function findUserByUsername(username: string): Object;
-
-    function sendEnrollmentEmail(userId: string, email?: string): void;
-
-    function sendResetPasswordEmail(userId: string, email?: string): void;
-
-    function sendVerificationEmail(userId: string, email?: string): void;
-
-    function setUsername(userId: string, newUsername: string): void;
-
-    function setPassword(userId: string, newPassword: string, options?: {
-        logout?: Object;
-    }): void;
-
-    function validateNewUser(func: Function): boolean;
-
-    function validateLoginAttempt(func: Function): {
-        stop: () => void
-    };
-
-    function _hashPassword(password: string): { digest: string; algorithm: string; };
-
-    interface IValidateLoginAttemptCbOpts {
-        type: string;
-        allowed: boolean;
-        error: Meteor.Error;
-        user: Meteor.User;
-        connection: Meteor.Connection;
-        methodName: string;
-        methodArguments: any[];
-    }
-}
-
-declare module "meteor/accounts-base" {
-    interface EmailFields {
-        from?: () => string;
-        subject?: (user: Meteor.User) => string;
-        text?: (user: Meteor.User, url: string) => string;
-        html?: (user: Meteor.User, url: string) => string;
-    }
 
     interface Header {
         [id: string]: string;
@@ -284,23 +139,11 @@ declare module "meteor/accounts-base" {
             methodArguments: any[];
         }
     }
-}
 
-declare module Accounts {
-    function onLogout(func: Function): void;
-}
-
-declare module "meteor/accounts-base" {
     module Accounts {
         function onLogout(func: Function): void;
     }
-}
 
-declare module Accounts {
-    function onLogout(func: (user: Meteor.User, connection: Meteor.Connection) => void): void;
-}
-
-declare module "meteor/accounts-base" {
     module Accounts {
         function onLogout(func: (user: Meteor.User, connection: Meteor.Connection) => void): void;
     }
diff --git a/types/meteor/blaze.d.ts b/types/meteor/blaze.d.ts
index dbb562558d..bd3b3cf79e 100644
--- a/types/meteor/blaze.d.ts
+++ b/types/meteor/blaze.d.ts
@@ -1,112 +1,3 @@
-
-declare module Blaze {
-    var View: ViewStatic;
-
-    interface ViewStatic {
-        new (name?: string, renderFunction?: Function): View;
-    }
-
-    interface View {
-        name: string;
-        parentView: View;
-        isCreated: boolean;
-        isRendered: boolean;
-        isDestroyed: boolean;
-        renderCount: number;
-        autorun(runFunc: (computation: Tracker.Computation) => void): Tracker.Computation;
-        onViewCreated(func: Function): void;
-        onViewReady(func: Function): void;
-        onViewDestroyed(func: Function): void;
-        firstNode(): Node;
-        lastNode(): Node;
-        template: Template;
-        templateInstance(): TemplateInstance;
-    }
-    var currentView: View;
-
-    function isTemplate(value: any): boolean;
-
-    interface HelpersMap {
-        [key: string]: Function;
-    }
-
-    interface EventsMap {
-        [key: string]: Function;
-    }
-
-    var Template: TemplateStatic;
-
-    interface TemplateStatic {
-        new (viewName?: string, renderFunction?: Function): Template;
-
-        registerHelper(name: string, func: Function): void;
-        instance(): TemplateInstance;
-        currentData(): any;
-        parentData(numLevels: number): any;
-    }
-
-    interface Template {
-        viewName: string;
-        renderFunction: Function;
-        constructView(): View;
-        head: Template;
-        find(selector: string): HTMLElement;
-        findAll(selector: string): HTMLElement[];
-        $: any;
-        onCreated(cb: Function): void;
-        onRendered(cb: Function): void;
-        onDestroyed(cb: Function): void;
-        created: Function;
-        rendered: Function;
-        destroyed: Function;
-        helpers(helpersMap: HelpersMap): void;
-        events(eventsMap: EventsMap): void;
-    }
-
-    var TemplateInstance: TemplateInstanceStatic;
-
-    interface TemplateInstanceStatic {
-        new (view: View): TemplateInstance;
-    }
-
-    interface TemplateInstance {
-        $(selector: string): any;
-        autorun(runFunc: (computation: Tracker.Computation) => void): Tracker.Computation;
-        data: Object;
-        find(selector: string): HTMLElement;
-        findAll(selector: string): HTMLElement[];
-        firstNode: Object;
-        lastNode: Object;
-        subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
-        subscriptionsReady(): boolean;
-        view: Object;
-    }
-
-    function Each(argFunc: Function, contentFunc: Function, elseFunc?: Function): View;
-
-    function Unless(conditionFunc: Function, contentFunc: Function, elseFunc?: Function): View;
-
-    function If(conditionFunc: Function, contentFunc: Function, elseFunc?: Function): View;
-
-    function Let(bindings: Function, contentFunc: Function): View;
-
-    function With(data: Object | Function, contentFunc: Function): View;
-
-    function getData(elementOrView?: HTMLElement | View): Object;
-
-    function getView(element?: HTMLElement): View;
-
-    function remove(renderedView: View): void;
-
-    function render(templateOrView: Template | View, parentNode: Node, nextNode?: Node, parentView?: View): View;
-
-    function renderWithData(templateOrView: Template | View, data: Object | Function, parentNode: Node, nextNode?: Node, parentView?: View): View;
-
-    function toHTML(templateOrView: Template | View): string;
-
-    function toHTMLWithData(templateOrView: Template | View, data: Object | Function): string;
-}
-
 declare module "meteor/blaze" {
     module Blaze {
         var View: ViewStatic;
diff --git a/types/meteor/browser-policy-common.d.ts b/types/meteor/browser-policy-common.d.ts
index 6d82eab683..8926938976 100644
--- a/types/meteor/browser-policy-common.d.ts
+++ b/types/meteor/browser-policy-common.d.ts
@@ -1,39 +1,3 @@
-
-declare module BrowserPolicy {
-    var framing: {
-        disallow(): void;
-        restrictToOrigin(origin: string): void;
-        allowAll(): void;
-    };
-
-    var content: {
-        allowEval(): void;
-        allowInlineStyles(): void;
-        allowInlineScripts(): void;
-        allowSameOriginForAll(): void;
-        allowDataUrlForAll(): void;
-        allowOriginForAll(origin: string): void;
-        allowImageOrigin(origin: string): void;
-        allowMediaOrigin(origin: string): void;
-        allowFontOrigin(origin: string): void;
-        allowStyleOrigin(origin: string): void;
-        allowScriptOrigin(origin: string): void;
-        allowFrameOrigin(origin: string): void;
-        allowContentTypeSniffing(): void;
-        allowAllContentOrigin(): void;
-        allowAllContentDataUrl(): void;
-        allowAllContentSameOrigin(): void;
-
-        disallowAll(): void;
-        disallowInlineStyles(): void;
-        disallowEval(): void;
-        disallowInlineScripts(): void;
-        disallowFont(): void;
-        disallowObject(): void;
-        disallowAllContent(): void;
-    };
-}
-
 declare module "meteor/browser-policy-common" {
     module BrowserPolicy {
         var framing: {
@@ -55,10 +19,13 @@ declare module "meteor/browser-policy-common" {
             allowStyleOrigin(origin: string): void;
             allowScriptOrigin(origin: string): void;
             allowFrameOrigin(origin: string): void;
+            allowFrameAncestorsOrigin(origin: string): void;
             allowContentTypeSniffing(): void;
             allowAllContentOrigin(): void;
             allowAllContentDataUrl(): void;
             allowAllContentSameOrigin(): void;
+            allowConnectOrigin(origin: string): void;
+            allowObjectOrigin(origin: string): void;
 
             disallowAll(): void;
             disallowInlineStyles(): void;
@@ -67,6 +34,7 @@ declare module "meteor/browser-policy-common" {
             disallowFont(): void;
             disallowObject(): void;
             disallowAllContent(): void;
+            disallowConnect(): void;
         };
     }
 }
diff --git a/types/meteor/check.d.ts b/types/meteor/check.d.ts
index 57482cd3f5..065850fb4e 100644
--- a/types/meteor/check.d.ts
+++ b/types/meteor/check.d.ts
@@ -1,27 +1,3 @@
-
-declare module Match {
-    var Any: any;
-    var String: any;
-    var Integer: any;
-    var Boolean: any;
-    var undefined: any;
-    var Object: any;
-
-    function Maybe(pattern: any): boolean;
-
-    function Optional(pattern: any): boolean;
-
-    function ObjectIncluding(dico: any): boolean;
-
-    function OneOf(...patterns: any[]): any;
-
-    function Where(condition: any): any;
-
-    function test(value: any, pattern: any): boolean;
-}
-
-declare function check(value: any, pattern: any): void;
-
 declare module "meteor/check" {
     module Match {
         var Any: any;
diff --git a/types/meteor/ddp-rate-limiter.d.ts b/types/meteor/ddp-rate-limiter.d.ts
index dc906f4ac1..86e47bf9ac 100644
--- a/types/meteor/ddp-rate-limiter.d.ts
+++ b/types/meteor/ddp-rate-limiter.d.ts
@@ -1,18 +1,3 @@
-
-declare module DDPRateLimiter {
-    interface Matcher {
-        type?: string | ((type: string) => boolean);
-        name?: string | ((name: string) => boolean);
-        userId?: string | ((userId: string) => boolean);
-        connectionId?: string | ((connectionId: string) => boolean);
-        clientAddress?: string | ((clientAddress: string) => boolean);
-    }
-
-    function addRule(matcher: Matcher, numRequests: number, timeInterval: number): string;
-
-    function removeRule(ruleId: string): boolean;
-}
-
 declare module "meteor/ddp-rate-limiter" {
     module DDPRateLimiter {
         interface Matcher {
diff --git a/types/meteor/ddp.d.ts b/types/meteor/ddp.d.ts
index 083244d601..ea4ca4fc96 100644
--- a/types/meteor/ddp.d.ts
+++ b/types/meteor/ddp.d.ts
@@ -1,42 +1,3 @@
-
-
-declare module DDP {
-    interface DDPStatic {
-        subscribe(name: string, ...rest: any[]): Meteor.SubscriptionHandle;
-        call(method: string, ...parameters: any[]): void;
-        apply(method: string, ...parameters: any[]): void;
-        methods(IMeteorMethodsDictionary: any): any;
-        status(): DDPStatus;
-        reconnect(): void;
-        disconnect(): void;
-        onReconnect(): void;
-    }
-
-    function _allSubscriptionsReady(): boolean;
-
-    type Status = 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline';
-
-    interface DDPStatus {
-        connected: boolean;
-        status: Status;
-        retryCount: number;
-        retryTime?: number;
-        reason?: string;
-    }
-
-    function connect(url: string): DDPStatic;
-}
-
-declare module DDPCommon {
-    interface MethodInvocation {
-        new (options: {}): MethodInvocation;
-
-        unblock(): void;
-
-        setUserId(userId: number): void;
-    }
-}
-
 declare module "meteor/ddp" {
     module DDP {
         interface DDPStatic {
diff --git a/types/meteor/ejson.d.ts b/types/meteor/ejson.d.ts
index aa5cd0f5f9..3c9f161097 100644
--- a/types/meteor/ejson.d.ts
+++ b/types/meteor/ejson.d.ts
@@ -1,41 +1,3 @@
-interface EJSONableCustomType {
-    clone?(): EJSONableCustomType;
-    equals?(other: Object): boolean;
-    toJSONValue(): JSONable;
-    typeName(): string;
-}
-interface EJSONable {
-    [key: string]: number | string | boolean | Object | number[] | string[] | Object[] | Date | Uint8Array | EJSONableCustomType | undefined | null;
-}
-interface JSONable {
-    [key: string]: number | string | boolean | Object | number[] | string[] | Object[] | undefined | null;
-}
-interface EJSON extends EJSONable { }
-
-declare module EJSON {
-    function addType(name: string, factory: (val: JSONable) => EJSONableCustomType): void;
-
-    function clone<T>(val: T): T;
-
-    function equals(a: EJSON, b: EJSON, options?: {
-        keyOrderSensitive?: boolean;
-    }): boolean;
-
-    function fromJSONValue(val: JSONable): any;
-
-    function isBinary(x: Object): boolean;
-    var newBinary: any;
-
-    function parse(str: string): EJSON;
-
-    function stringify(val: EJSON, options?: {
-        indent?: boolean | number | string;
-        canonical?: boolean;
-    }): string;
-
-    function toJSONValue(val: EJSON): JSONable;
-}
-
 declare module "meteor/ejson" {
     interface EJSONableCustomType {
         clone?(): EJSONableCustomType;
diff --git a/types/meteor/email.d.ts b/types/meteor/email.d.ts
index 0e0e81590d..464dbed8a9 100644
--- a/types/meteor/email.d.ts
+++ b/types/meteor/email.d.ts
@@ -1,38 +1,3 @@
-declare module Email {
-    function send(options: {
-        from?: string;
-        to?: string | string[];
-        cc?: string | string[];
-        bcc?: string | string[];
-        replyTo?: string | string[];
-        subject?: string;
-        text?: string;
-        html?: string;
-        headers?: Object;
-        attachments?: Object[];
-        mailComposer?: MailComposer;
-    }): void;
-}
-
-interface MailComposerOptions {
-    escapeSMTP: boolean;
-    encoding: string;
-    charset: string;
-    keepBcc: boolean;
-    forceEmbeddedImages: boolean;
-}
-
-declare var MailComposer: MailComposerStatic;
-interface MailComposerStatic {
-    new (options: MailComposerOptions): MailComposer;
-}
-interface MailComposer {
-    addHeader(name: string, value: string): void;
-    setMessageOption(from: string, to: string, body: string, html: string): void;
-    streamMessage(): void;
-    pipe(stream: any /** fs.WriteStream **/): void;
-}
-
 declare module "meteor/email" {
     module Email {
         function send(options: {
diff --git a/types/meteor/globals/README.md b/types/meteor/globals/README.md
new file mode 100644
index 0000000000..b9e3615b2b
--- /dev/null
+++ b/types/meteor/globals/README.md
@@ -0,0 +1,3 @@
+This `globals/` directory is generated by `scripts/generate-globals`!  To update
+this directory, edit the corresponding files outside `globals/` and re-run
+`scripts/generate-globals`.
\ No newline at end of file
diff --git a/types/meteor/globals/accounts-base.d.ts b/types/meteor/globals/accounts-base.d.ts
new file mode 100644
index 0000000000..f7b914f734
--- /dev/null
+++ b/types/meteor/globals/accounts-base.d.ts
@@ -0,0 +1,148 @@
+declare interface URLS {
+    resetPassword: (token: string) => string;
+    verifyEmail: (token: string) => string;
+    enrollAccount: (token: string) => string;
+}
+
+declare interface EmailFields {
+    from?: () => string;
+    subject?: (user: Meteor.User) => string;
+    text?: (user: Meteor.User, url: string) => string;
+    html?: (user: Meteor.User, url: string) => string;
+}
+
+declare module Accounts {
+    var urls: URLS;
+
+    function user(): Meteor.User;
+
+    function userId(): string;
+
+    function createUser(options: {
+        username?: string;
+        email?: string;
+        password?: string;
+        profile?: Object;
+    }, callback?: Function): string;
+
+    function config(options: {
+        sendVerificationEmail?: boolean;
+        forbidClientAccountCreation?: boolean;
+        restrictCreationByEmailDomain?: string | Function;
+        loginExpirationInDays?: number;
+        oauthSecretKey?: string;
+        passwordResetTokenExpirationInDays?: number;
+        passwordEnrollTokenExpirationInDays?: number;
+        ambiguousErrorMessages?: boolean;
+    }): void;
+
+    function onLogin(func: Function): {
+        stop: () => void
+    };
+
+    function onLoginFailure(func: Function): {
+        stop: () => void
+    };
+
+    function loginServicesConfigured(): boolean;
+
+    function onPageLoadLogin(func: Function): void;
+}
+
+declare module Accounts {
+    function changePassword(oldPassword: string, newPassword: string, callback?: Function): void;
+
+    function forgotPassword(options: {
+        email?: string;
+    }, callback?: Function): void;
+
+    function resetPassword(token: string, newPassword: string, callback?: Function): void;
+
+    function verifyEmail(token: string, callback?: Function): void;
+
+    function onEmailVerificationLink(callback: Function): void;
+
+    function onEnrollmentLink(callback: Function): void;
+
+    function onResetPasswordLink(callback: Function): void;
+
+    function loggingIn(): boolean;
+
+    function logout(callback?: Function): void;
+
+    function logoutOtherClients(callback?: Function): void;
+
+    var ui: {
+        config(options: {
+            requestPermissions?: Object;
+            requestOfflineToken?: Object;
+            forceApprovalPrompt?: Object;
+            passwordSignupFields?: string;
+        }): void;
+    };
+}
+
+declare interface Header {
+    [id: string]: string;
+}
+
+declare interface EmailTemplates {
+    from: string;
+    siteName: string;
+    headers?: Header;
+    resetPassword: EmailFields;
+    enrollAccount: EmailFields;
+    verifyEmail: EmailFields;
+}
+
+declare module Accounts {
+    var emailTemplates: EmailTemplates;
+
+    function addEmail(userId: string, newEmail: string, verified?: boolean): void;
+
+    function removeEmail(userId: string, email: string): void;
+
+    function onCreateUser(func: Function): void;
+
+    function findUserByEmail(email: string): Object;
+
+    function findUserByUsername(username: string): Object;
+
+    function sendEnrollmentEmail(userId: string, email?: string): void;
+
+    function sendResetPasswordEmail(userId: string, email?: string): void;
+
+    function sendVerificationEmail(userId: string, email?: string): void;
+
+    function setUsername(userId: string, newUsername: string): void;
+
+    function setPassword(userId: string, newPassword: string, options?: {
+        logout?: Object;
+    }): void;
+
+    function validateNewUser(func: Function): boolean;
+
+    function validateLoginAttempt(func: Function): {
+        stop: () => void
+    };
+
+    function _hashPassword(password: string): { digest: string; algorithm: string; };
+
+    interface IValidateLoginAttemptCbOpts {
+        type: string;
+        allowed: boolean;
+        error: Meteor.Error;
+        user: Meteor.User;
+        connection: Meteor.Connection;
+        methodName: string;
+        methodArguments: any[];
+    }
+}
+
+declare module Accounts {
+    function onLogout(func: Function): void;
+}
+
+declare module Accounts {
+    function onLogout(func: (user: Meteor.User, connection: Meteor.Connection) => void): void;
+}
diff --git a/types/meteor/globals/blaze.d.ts b/types/meteor/globals/blaze.d.ts
new file mode 100644
index 0000000000..2082382100
--- /dev/null
+++ b/types/meteor/globals/blaze.d.ts
@@ -0,0 +1,107 @@
+declare module Blaze {
+    var View: ViewStatic;
+
+    interface ViewStatic {
+        new (name?: string, renderFunction?: Function): View;
+    }
+
+    interface View {
+        name: string;
+        parentView: View;
+        isCreated: boolean;
+        isRendered: boolean;
+        isDestroyed: boolean;
+        renderCount: number;
+        autorun(runFunc: (computation: Tracker.Computation) => void): Tracker.Computation;
+        onViewCreated(func: Function): void;
+        onViewReady(func: Function): void;
+        onViewDestroyed(func: Function): void;
+        firstNode(): Node;
+        lastNode(): Node;
+        template: Template;
+        templateInstance(): TemplateInstance;
+    }
+    var currentView: View;
+
+    function isTemplate(value: any): boolean;
+
+    interface HelpersMap {
+        [key: string]: Function;
+    }
+
+    interface EventsMap {
+        [key: string]: Function;
+    }
+
+    var Template: TemplateStatic;
+
+    interface TemplateStatic {
+        new (viewName?: string, renderFunction?: Function): Template;
+
+        registerHelper(name: string, func: Function): void;
+        instance(): TemplateInstance;
+        currentData(): any;
+        parentData(numLevels: number): any;
+    }
+
+    interface Template {
+        viewName: string;
+        renderFunction: Function;
+        constructView(): View;
+        head: Template;
+        find(selector: string): HTMLElement;
+        findAll(selector: string): HTMLElement[];
+        $: any;
+        onCreated(cb: Function): void;
+        onRendered(cb: Function): void;
+        onDestroyed(cb: Function): void;
+        created: Function;
+        rendered: Function;
+        destroyed: Function;
+        helpers(helpersMap: HelpersMap): void;
+        events(eventsMap: EventsMap): void;
+    }
+
+    var TemplateInstance: TemplateInstanceStatic;
+
+    interface TemplateInstanceStatic {
+        new (view: View): TemplateInstance;
+    }
+
+    interface TemplateInstance {
+        $(selector: string): any;
+        autorun(runFunc: (computation: Tracker.Computation) => void): Tracker.Computation;
+        data: Object;
+        find(selector: string): HTMLElement;
+        findAll(selector: string): HTMLElement[];
+        firstNode: Object;
+        lastNode: Object;
+        subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
+        subscriptionsReady(): boolean;
+        view: Object;
+    }
+
+    function Each(argFunc: Function, contentFunc: Function, elseFunc?: Function): View;
+
+    function Unless(conditionFunc: Function, contentFunc: Function, elseFunc?: Function): View;
+
+    function If(conditionFunc: Function, contentFunc: Function, elseFunc?: Function): View;
+
+    function Let(bindings: Function, contentFunc: Function): View;
+
+    function With(data: Object | Function, contentFunc: Function): View;
+
+    function getData(elementOrView?: HTMLElement | View): Object;
+
+    function getView(element?: HTMLElement): View;
+
+    function remove(renderedView: View): void;
+
+    function render(templateOrView: Template | View, parentNode: Node, nextNode?: Node, parentView?: View): View;
+
+    function renderWithData(templateOrView: Template | View, data: Object | Function, parentNode: Node, nextNode?: Node, parentView?: View): View;
+
+    function toHTML(templateOrView: Template | View): string;
+
+    function toHTMLWithData(templateOrView: Template | View, data: Object | Function): string;
+}
diff --git a/types/meteor/globals/browser-policy-common.d.ts b/types/meteor/globals/browser-policy-common.d.ts
new file mode 100644
index 0000000000..826065844f
--- /dev/null
+++ b/types/meteor/globals/browser-policy-common.d.ts
@@ -0,0 +1,34 @@
+declare module BrowserPolicy {
+    var framing: {
+        disallow(): void;
+        restrictToOrigin(origin: string): void;
+        allowAll(): void;
+    };
+
+    var content: {
+        allowEval(): void;
+        allowInlineStyles(): void;
+        allowInlineScripts(): void;
+        allowSameOriginForAll(): void;
+        allowDataUrlForAll(): void;
+        allowOriginForAll(origin: string): void;
+        allowImageOrigin(origin: string): void;
+        allowMediaOrigin(origin: string): void;
+        allowFontOrigin(origin: string): void;
+        allowStyleOrigin(origin: string): void;
+        allowScriptOrigin(origin: string): void;
+        allowFrameOrigin(origin: string): void;
+        allowContentTypeSniffing(): void;
+        allowAllContentOrigin(): void;
+        allowAllContentDataUrl(): void;
+        allowAllContentSameOrigin(): void;
+
+        disallowAll(): void;
+        disallowInlineStyles(): void;
+        disallowEval(): void;
+        disallowInlineScripts(): void;
+        disallowFont(): void;
+        disallowObject(): void;
+        disallowAllContent(): void;
+    };
+}
diff --git a/types/meteor/globals/check.d.ts b/types/meteor/globals/check.d.ts
new file mode 100644
index 0000000000..1b1ec39736
--- /dev/null
+++ b/types/meteor/globals/check.d.ts
@@ -0,0 +1,22 @@
+declare module Match {
+    var Any: any;
+    var String: any;
+    var Integer: any;
+    var Boolean: any;
+    var undefined: any;
+    var Object: any;
+
+    function Maybe(pattern: any): boolean;
+
+    function Optional(pattern: any): boolean;
+
+    function ObjectIncluding(dico: any): boolean;
+
+    function OneOf(...patterns: any[]): any;
+
+    function Where(condition: any): any;
+
+    function test(value: any, pattern: any): boolean;
+}
+
+declare function check(value: any, pattern: any): void;
diff --git a/types/meteor/globals/ddp-rate-limiter.d.ts b/types/meteor/globals/ddp-rate-limiter.d.ts
new file mode 100644
index 0000000000..5093837eb1
--- /dev/null
+++ b/types/meteor/globals/ddp-rate-limiter.d.ts
@@ -0,0 +1,13 @@
+declare module DDPRateLimiter {
+    interface Matcher {
+        type?: string | ((type: string) => boolean);
+        name?: string | ((name: string) => boolean);
+        userId?: string | ((userId: string) => boolean);
+        connectionId?: string | ((connectionId: string) => boolean);
+        clientAddress?: string | ((clientAddress: string) => boolean);
+    }
+
+    function addRule(matcher: Matcher, numRequests: number, timeInterval: number): string;
+
+    function removeRule(ruleId: string): boolean;
+}
diff --git a/types/meteor/globals/ddp.d.ts b/types/meteor/globals/ddp.d.ts
new file mode 100644
index 0000000000..2b92528391
--- /dev/null
+++ b/types/meteor/globals/ddp.d.ts
@@ -0,0 +1,36 @@
+declare module DDP {
+    interface DDPStatic {
+        subscribe(name: string, ...rest: any[]): Meteor.SubscriptionHandle;
+        call(method: string, ...parameters: any[]): void;
+        apply(method: string, ...parameters: any[]): void;
+        methods(IMeteorMethodsDictionary: any): any;
+        status(): DDPStatus;
+        reconnect(): void;
+        disconnect(): void;
+        onReconnect(): void;
+    }
+
+    function _allSubscriptionsReady(): boolean;
+
+    type Status = 'connected' | 'connecting' | 'failed' | 'waiting' | 'offline';
+
+    interface DDPStatus {
+        connected: boolean;
+        status: Status;
+        retryCount: number;
+        retryTime?: number;
+        reason?: string;
+    }
+
+    function connect(url: string): DDPStatic;
+}
+
+declare module DDPCommon {
+    interface MethodInvocation {
+        new (options: {}): MethodInvocation;
+
+        unblock(): void;
+
+        setUserId(userId: number): void;
+    }
+}
diff --git a/types/meteor/globals/ejson.d.ts b/types/meteor/globals/ejson.d.ts
new file mode 100644
index 0000000000..3a85075c6b
--- /dev/null
+++ b/types/meteor/globals/ejson.d.ts
@@ -0,0 +1,37 @@
+declare interface EJSONableCustomType {
+    clone?(): EJSONableCustomType;
+    equals?(other: Object): boolean;
+    toJSONValue(): JSONable;
+    typeName(): string;
+}
+declare interface EJSONable {
+    [key: string]: number | string | boolean | Object | number[] | string[] | Object[] | Date | Uint8Array | EJSONableCustomType | undefined | null;
+}
+declare interface JSONable {
+    [key: string]: number | string | boolean | Object | number[] | string[] | Object[] | undefined | null;
+}
+declare interface EJSON extends EJSONable { }
+
+declare module EJSON {
+    function addType(name: string, factory: (val: JSONable) => EJSONableCustomType): void;
+
+    function clone<T>(val: T): T;
+
+    function equals(a: EJSON, b: EJSON, options?: {
+        keyOrderSensitive?: boolean;
+    }): boolean;
+
+    function fromJSONValue(val: JSONable): any;
+
+    function isBinary(x: Object): boolean;
+    var newBinary: any;
+
+    function parse(str: string): EJSON;
+
+    function stringify(val: EJSON, options?: {
+        indent?: boolean | number | string;
+        canonical?: boolean;
+    }): string;
+
+    function toJSONValue(val: EJSON): JSONable;
+}
diff --git a/types/meteor/globals/email.d.ts b/types/meteor/globals/email.d.ts
new file mode 100644
index 0000000000..f80528893b
--- /dev/null
+++ b/types/meteor/globals/email.d.ts
@@ -0,0 +1,34 @@
+declare module Email {
+    function send(options: {
+        from?: string;
+        to?: string | string[];
+        cc?: string | string[];
+        bcc?: string | string[];
+        replyTo?: string | string[];
+        subject?: string;
+        text?: string;
+        html?: string;
+        headers?: Object;
+        attachments?: Object[];
+        mailComposer?: MailComposer;
+    }): void;
+}
+
+declare interface MailComposerOptions {
+    escapeSMTP: boolean;
+    encoding: string;
+    charset: string;
+    keepBcc: boolean;
+    forceEmbeddedImages: boolean;
+}
+
+declare var MailComposer: MailComposerStatic;
+declare interface MailComposerStatic {
+    new (options: MailComposerOptions): MailComposer;
+}
+declare interface MailComposer {
+    addHeader(name: string, value: string): void;
+    setMessageOption(from: string, to: string, body: string, html: string): void;
+    streamMessage(): void;
+    pipe(stream: any /** fs.WriteStream **/): void;
+}
diff --git a/types/meteor/globals/http.d.ts b/types/meteor/globals/http.d.ts
new file mode 100644
index 0000000000..88a67fe790
--- /dev/null
+++ b/types/meteor/globals/http.d.ts
@@ -0,0 +1,48 @@
+declare module HTTP {
+    interface HTTPRequest {
+        content?: string;
+        data?: any;
+        query?: string;
+        params?: {
+            [id: string]: string
+        };
+        auth?: string;
+        headers?: {
+            [id: string]: string
+        };
+        timeout?: number;
+        followRedirects?: boolean;
+    }
+
+    interface HTTPResponse {
+        statusCode?: number;
+        headers?: {
+            [id: string]: string
+        };
+        content?: string;
+        data?: any;
+    }
+
+    function call(method: string, url: string, options?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
+
+    function del(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
+
+    function get(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
+
+    function post(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
+
+    function put(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
+
+    function call(method: string, url: string, options?: {
+        content?: string;
+        data?: Object;
+        query?: string;
+        params?: Object;
+        auth?: string;
+        headers?: Object;
+        timeout?: number;
+        followRedirects?: boolean;
+        npmRequestOptions?: Object;
+        beforeSend?: Function;
+    }, asyncCallback?: Function): HTTP.HTTPResponse;
+}
diff --git a/types/meteor/globals/meteor.d.ts b/types/meteor/globals/meteor.d.ts
new file mode 100644
index 0000000000..7a90b0611e
--- /dev/null
+++ b/types/meteor/globals/meteor.d.ts
@@ -0,0 +1,220 @@
+declare module Meteor {
+    /** Global props **/
+    var isClient: boolean;
+    var isCordova: boolean;
+    var isServer: boolean;
+    var isProduction: boolean;
+    var release: string;
+    /** Global props **/
+
+    /** Settings **/
+    interface Settings {
+        public: {
+            [id: string]: any
+        }, [id: string]: any
+    }
+    var settings: Settings;
+    /** Settings **/
+
+    /** User **/
+    interface UserEmail {
+        address: string;
+        verified: boolean;
+    }
+    interface User {
+        _id?: string;
+        username?: string;
+        emails?: UserEmail[];
+        createdAt?: number;
+        profile?: any;
+        services?: any;
+    }
+
+    function user(): User;
+
+    function userId(): string;
+    var users: Mongo.Collection<User>;
+    /** User **/
+
+    /** Error **/
+    var Error: ErrorStatic;
+    interface ErrorStatic {
+        new (error: string | number, reason?: string, details?: string): Error;
+    }
+    interface Error {
+        error: string | number;
+        reason?: string;
+        details?: string;
+    }
+    /** Error **/
+
+    /** Method **/
+    function methods(methods: Object): void;
+
+    function call(name: string, ...args: any[]): any;
+
+    function apply(name: string, args: EJSONable[], options?: {
+        wait?: boolean;
+        onResultReceived?: Function;
+        returnStubValue?: boolean;
+        throwStubExceptions?: boolean;
+    }, asyncCallback?: Function): any;
+    /** Method **/
+
+    /** Url **/
+    function absoluteUrl(path?: string, options?: {
+        secure?: boolean;
+        replaceLocalhost?: boolean;
+        rootUrl?: string;
+    }): string;
+    /** Url **/
+
+    /** Timeout **/
+    function setInterval(func: Function, delay: number): number;
+
+    function setTimeout(func: Function, delay: number): number;
+
+    function clearInterval(id: number): void;
+
+    function clearTimeout(id: number): void;
+
+    function defer(func: Function): void;
+    /** Timeout **/
+
+    /** utils **/
+    function startup(func: Function): void;
+
+    function wrapAsync(func: Function, context?: Object): any;
+
+    function bindEnvironment(func: Function): any;
+    /** utils **/
+
+    /** Pub/Sub **/
+    interface SubscriptionHandle {
+        stop(): void;
+        ready(): boolean;
+    }
+    interface LiveQueryHandle {
+        stop(): void;
+    }
+    /** Pub/Sub **/
+}
+
+declare module Meteor {
+    /** Login **/
+    interface LoginWithExternalServiceOptions {
+        requestPermissions?: string[];
+        requestOfflineToken?: Boolean;
+        forceApprovalPrompt?: Boolean;
+        loginUrlParameters?: Object;
+        redirectUrl?: string;
+        loginHint?: string;
+        loginStyle?: string;
+    }
+
+    function loginWithMeteorDeveloperAccount(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loginWithFacebook(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loginWithGithub(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loginWithGoogle(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loginWithMeetup(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loginWithTwitter(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loginWithWeibo(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
+
+    function loggingIn(): boolean;
+
+    function loginWith<ExternalService>(options?: {
+        requestPermissions?: string[];
+        requestOfflineToken?: boolean;
+        loginUrlParameters?: Object;
+        userEmail?: string;
+        loginStyle?: string;
+        redirectUrl?: string;
+    }, callback?: Function): void;
+
+    function loginWithPassword(user: Object | string, password: string, callback?: Function): void;
+
+    function loginWithToken(token: string, callback?: Function): void;
+
+    function logout(callback?: Function): void;
+
+    function logoutOtherClients(callback?: Function): void;
+    /** Login **/
+
+    /** Event **/
+    interface Event {
+        type: string;
+        target: HTMLElement;
+        currentTarget: HTMLElement;
+        which: number;
+        stopPropagation(): void;
+        stopImmediatePropagation(): void;
+        preventDefault(): void;
+        isPropagationStopped(): boolean;
+        isImmediatePropagationStopped(): boolean;
+        isDefaultPrevented(): boolean;
+    }
+    interface EventHandlerFunction extends Function {
+        (event?: Meteor.Event, templateInstance?: Blaze.TemplateInstance): void;
+    }
+    interface EventMap {
+        [id: string]: Meteor.EventHandlerFunction;
+    }
+    /** Event **/
+
+    /** Connection **/
+    function reconnect(): void;
+
+    function disconnect(): void;
+    /** Connection **/
+
+    /** Status **/
+    function status(): DDP.DDPStatus;
+    /** Status **/
+
+    /** Pub/Sub **/
+    function subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
+    /** Pub/Sub **/
+}
+
+declare module Meteor {
+    /** Connection **/
+    interface Connection {
+        id: string;
+        close: Function;
+        onClose: Function;
+        clientAddress: string;
+        httpHeaders: Object;
+    }
+
+    function onConnection(callback: Function): void;
+    /** Connection **/
+
+    function publish(name: string, func: Function): void;
+
+    function _debug(...args: any[]): void;
+}
+
+declare interface Subscription {
+    added(collection: string, id: string, fields: Object): void;
+    changed(collection: string, id: string, fields: Object): void;
+    connection: Meteor.Connection;
+    error(error: Error): void;
+    onStop(func: Function): void;
+    ready(): void;
+    removed(collection: string, id: string): void;
+    stop(): void;
+    userId: string;
+}
+
+declare module Meteor {
+    /** Global props **/
+    var isDevelopment: boolean;
+    var isTest: boolean;
+    /** Global props **/
+}
diff --git a/types/meteor/globals/mongo.d.ts b/types/meteor/globals/mongo.d.ts
new file mode 100644
index 0000000000..108008febe
--- /dev/null
+++ b/types/meteor/globals/mongo.d.ts
@@ -0,0 +1,234 @@
+declare module Mongo {
+
+    type BsonType = 1 | "double" |
+        2 | "string" |
+        3 | "object" |
+        4 | "array" |
+        5 | "binData" |
+        6 | "undefined" |
+        7 | "objectId" |
+        8 | "bool" |
+        9 | "date" |
+        10 | "null" |
+        11 | "regex" |
+        12 | "dbPointer" |
+        13 | "javascript" |
+        14 | "symbol" |
+        15 | "javascriptWithScope" |
+        16 | "int" |
+        17 | "timestamp" |
+        18 | "long" |
+        19 | "decimal" |
+        -1 | "minKey" |
+        127 | "maxKey" | "number"
+
+    type FieldExpression<T> = {
+        $eq?: T,
+        $gt?: T,
+        $gte?: T,
+        $lt?: T,
+        $lte?: T,
+        $in?: T[],
+        $nin?: T[],
+        $ne?: T,
+        $exists?: boolean,
+        $type?: BsonType[] | BsonType,
+        $not?: FieldExpression<T>,
+        $expr?: FieldExpression<T>,
+        $jsonSchema?: any,
+        $mod?: number[],
+        $regex?: RegExp | string,
+        $options?: string,
+        $text?: { $search: string, $language?: string, $caseSensitive?: boolean, $diacriticSensitive?: boolean },
+        $where?: string | Function,
+        $geoIntersects?: any,
+        $geoWithin?: any,
+        $near?: any,
+        $nearSphere?: any,
+        $all?: T[],
+        $elemMatch?: T extends {} ? Query<T> : FieldExpression<T>,
+        $size?: number,
+        $bitsAllClear?: any,
+        $bitsAllSet?: any,
+        $bitsAnyClear?: any,
+        $bitsAnySet?: any,
+        $comment?: string
+    }
+
+    type Flatten<T> = T extends any[] ? T[0] : T
+
+    type Query<T> = {
+        [P in keyof T]?: Flatten<T[P]> | RegExp | FieldExpression<Flatten<T[P]>>
+    } & {
+            $or?: Query<T>[],
+            $and?: Query<T>[],
+            $nor?: Query<T>[]
+        } & Dictionary<any>
+
+    type QueryWithModifiers<T> = {
+        $query: Query<T>,
+        $comment?: string,
+        $explain?: any,
+        $hint?: any,
+        $maxScan?: any,
+        $max?: any,
+        $maxTimeMS?: any,
+        $min?: any,
+        $orderby?: any,
+        $returnKey?: any,
+        $showDiskLoc?: any,
+        $natural?: any
+    }
+
+    type Selector<T> = Query<T> | QueryWithModifiers<T>
+
+    type Dictionary<T> = { [key: string]: T }
+    type PartialMapTo<T, M> = Partial<Record<keyof T, M>>
+    type OnlyArrays<T> = T extends any[] ? T : never;
+    type OnlyElementsOfArrays<T> = T extends any[] ? Partial<T[0]> : never
+    type ElementsOf<T> = {
+        [P in keyof T]?: OnlyElementsOfArrays<T[P]>
+    }
+    type PushModifier<T> = {
+        [P in keyof T]?:
+        OnlyElementsOfArrays<T[P]> |
+        { $each?: T[P], $position?: number, $slice?: number, $sort?: 1 | -1 | Dictionary<number> }
+    }
+    type ArraysOrEach<T> = {
+        [P in keyof T]?: OnlyArrays<T[P]> | { $each: T[P] }
+    }
+    type CurrentDateModifier = { $type: "timestamp" | "date" } | true
+    type Modifier<T> = T | {
+        $currentDate?: Partial<Record<keyof T, CurrentDateModifier>> & Dictionary<CurrentDateModifier>,
+        $inc?: PartialMapTo<T, number> & Dictionary<number>,
+        $min?: PartialMapTo<T, Date | number> & Dictionary<Date | number>,
+        $max?: PartialMapTo<T, Date | number> & Dictionary<Date | number>,
+        $mul?: PartialMapTo<T, number> & Dictionary<number>,
+        $rename?: PartialMapTo<T, string> & Dictionary<string>,
+        $set?: Partial<T> & Dictionary<any>,
+        $setOnInsert?: Partial<T> & Dictionary<any>,
+        $unset?: PartialMapTo<T, boolean | 1 | 0> & Dictionary<any>,
+        $addToSet?: ArraysOrEach<T> & Dictionary<any>,
+        $push?: PushModifier<T> & Dictionary<any>,
+        $pull?: ElementsOf<T> & Dictionary<any>,
+        $pullAll?: Partial<T> & Dictionary<any>,
+        $pop?: PartialMapTo<T, 1 | -1> & Dictionary<1 | -1>,
+    }
+
+
+    interface SortSpecifier { }
+    interface FieldSpecifier {
+        [id: string]: Number;
+    }
+
+    var Collection: CollectionStatic;
+    interface CollectionStatic {
+        new <T>(name: string, options?: {
+            connection?: Object | null;
+            idGeneration?: string;
+            transform?: Function;
+        }): Collection<T>;
+    }
+    interface Collection<T> {
+        allow(options: {
+            insert?: (userId: string, doc: T) => boolean;
+            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+            remove?: (userId: string, doc: T) => boolean;
+            fetch?: string[];
+            transform?: Function;
+        }): boolean;
+        deny(options: {
+            insert?: (userId: string, doc: T) => boolean;
+            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
+            remove?: (userId: string, doc: T) => boolean;
+            fetch?: string[];
+            transform?: Function;
+        }): boolean;
+        find(selector?: Selector<T> | ObjectID | string, options?: {
+            sort?: SortSpecifier;
+            skip?: number;
+            limit?: number;
+            fields?: FieldSpecifier;
+            reactive?: boolean;
+            transform?: Function;
+        }): Cursor<T>;
+        findOne(selector?: Selector<T> | ObjectID | string, options?: {
+            sort?: SortSpecifier;
+            skip?: number;
+            fields?: FieldSpecifier;
+            reactive?: boolean;
+            transform?: Function;
+        }): T;
+        insert(doc: T, callback?: Function): string;
+        rawCollection(): any;
+        rawDatabase(): any;
+        remove(selector: Selector<T> | ObjectID | string, callback?: Function): number;
+        update(selector: Selector<T> | ObjectID | string, modifier: Modifier<T>, options?: {
+            multi?: boolean;
+            upsert?: boolean;
+        }, callback?: Function): number;
+        upsert(selector: Selector<T> | ObjectID | string, modifier: Modifier<T>, options?: {
+            multi?: boolean;
+        }, callback?: Function): {
+                numberAffected?: number; insertedId?: string;
+            };
+        _ensureIndex(keys: {
+            [key: string]: number | string
+        } | string, options?: {
+            [key: string]: any
+        }): void;
+        _dropIndex(keys: {
+            [key: string]: number | string
+        } | string): void;
+    }
+
+    var Cursor: CursorStatic;
+    interface CursorStatic {
+        new <T>(): Cursor<T>;
+    }
+    interface ObserveCallbacks {
+        added?(document: Object): void;
+        addedAt?(document: Object, atIndex: number, before: Object): void;
+        changed?(newDocument: Object, oldDocument: Object): void;
+        changedAt?(newDocument: Object, oldDocument: Object, indexAt: number): void;
+        removed?(oldDocument: Object): void;
+        removedAt?(oldDocument: Object, atIndex: number): void;
+        movedTo?(document: Object, fromIndex: number, toIndex: number, before: Object): void;
+    }
+    interface ObserveChangesCallbacks {
+        added?(id: string, fields: Object): void;
+        addedBefore?(id: string, fields: Object, before: Object): void;
+        changed?(id: string, fields: Object): void;
+        movedBefore?(id: string, before: Object): void;
+        removed?(id: string): void;
+    }
+    interface Cursor<T> {
+        count(applySkipLimit?: boolean): number;
+        fetch(): Array<T>;
+        forEach(callback: (doc: T, index: number, cursor: Cursor<T>) => void, thisArg?: any): void;
+        map<U>(callback: (doc: T, index: number, cursor: Cursor<T>) => U, thisArg?: any): Array<U>;
+        observe(callbacks: ObserveCallbacks): Meteor.LiveQueryHandle;
+        observeChanges(callbacks: ObserveChangesCallbacks): Meteor.LiveQueryHandle;
+    }
+
+    var ObjectID: ObjectIDStatic;
+    interface ObjectIDStatic {
+        new(hexString?: string): ObjectID;
+    }
+    interface ObjectID {
+        toHexString(): string;
+        equals(otherID: ObjectID): boolean;
+    }
+
+    function setConnectionOptions(options: any): void;
+}
+
+declare module Mongo {
+    interface AllowDenyOptions {
+        insert?: (userId: string, doc: any) => boolean;
+        update?: (userId: string, doc: any, fieldNames: string[], modifier: any) => boolean;
+        remove?: (userId: string, doc: any) => boolean;
+        fetch?: string[];
+        transform?: Function;
+    }
+}
diff --git a/types/meteor/globals/random.d.ts b/types/meteor/globals/random.d.ts
new file mode 100644
index 0000000000..db334d98c6
--- /dev/null
+++ b/types/meteor/globals/random.d.ts
@@ -0,0 +1,13 @@
+declare module Random {
+    function id(numberOfChars?: number): string;
+
+    function secret(numberOfChars?: number): string;
+
+    function fraction(): number;
+    // @param numberOfDigits, @returns a random hex string of the given length
+    function hexString(numberOfDigits: number): string;
+    // @param array, @return a random element in array
+    function choice(array: any[]): string;
+    // @param str, @return a random char in str
+    function choice(str: string): string;
+}
diff --git a/types/meteor/globals/reactive-var.d.ts b/types/meteor/globals/reactive-var.d.ts
new file mode 100644
index 0000000000..5d322ad27b
--- /dev/null
+++ b/types/meteor/globals/reactive-var.d.ts
@@ -0,0 +1,8 @@
+declare var ReactiveVar: ReactiveVarStatic;
+declare interface ReactiveVarStatic {
+    new <T>(initialValue: T, equalsFunc?: Function): ReactiveVar<T>;
+}
+declare interface ReactiveVar<T> {
+    get(): T;
+    set(newValue: T): void;
+}
diff --git a/types/meteor/globals/session.d.ts b/types/meteor/globals/session.d.ts
new file mode 100644
index 0000000000..1e7c4f24f2
--- /dev/null
+++ b/types/meteor/globals/session.d.ts
@@ -0,0 +1,9 @@
+declare module Session {
+    function equals(key: string, value: string | number | boolean | any): boolean;
+
+    function get(key: string): any;
+
+    function set(key: string, value: EJSONable | any): void;
+
+    function setDefault(key: string, value: EJSONable | any): void;
+}
diff --git a/types/meteor/globals/templating.d.ts b/types/meteor/globals/templating.d.ts
new file mode 100644
index 0000000000..5962fb9a71
--- /dev/null
+++ b/types/meteor/globals/templating.d.ts
@@ -0,0 +1,6 @@
+declare var Template: TemplateStatic;
+declare interface TemplateStatic extends Blaze.TemplateStatic {
+    new (viewName?: string, renderFunction?: Function): Blaze.Template;
+    body: Blaze.Template;
+    [index: string]: any | Blaze.Template;
+}
diff --git a/types/meteor/globals/tiny-test.d.ts b/types/meteor/globals/tiny-test.d.ts
new file mode 100644
index 0000000000..1289d87d23
--- /dev/null
+++ b/types/meteor/globals/tiny-test.d.ts
@@ -0,0 +1,36 @@
+declare interface ILengthAble {
+    length: number;
+}
+
+declare interface ITinytestAssertions {
+    ok(doc: Object): void;
+    expect_fail(): void;
+    fail(doc: Object): void;
+    runId(): string;
+    equal<T>(actual: T, expected: T, message?: string, not?: boolean): void;
+    notEqual<T>(actual: T, expected: T, message?: string): void;
+    instanceOf(obj: Object, klass: Function, message?: string): void;
+    notInstanceOf(obj: Object, klass: Function, message?: string): void;
+    matches(actual: any, regexp: RegExp, message?: string): void;
+    notMatches(actual: any, regexp: RegExp, message?: string): void;
+    throws(f: Function, expected?: string | RegExp): void;
+    isTrue(v: boolean, msg?: string): void;
+    isFalse(v: boolean, msg?: string): void;
+    isNull(v: any, msg?: string): void;
+    isNotNull(v: any, msg?: string): void;
+    isUndefined(v: any, msg?: string): void;
+    isNotUndefined(v: any, msg?: string): void;
+    isNan(v: any, msg?: string): void;
+    isNotNan(v: any, msg?: string): void;
+    include<T>(s: Array<T> | Object | string, value: any, msg?: string, not?: boolean): void;
+
+    notInclude<T>(s: Array<T> | Object | string, value: any, msg?: string, not?: boolean): void;
+    length(obj: ILengthAble, expected_length: number, msg?: string): void;
+    _stringEqual(actual: string, expected: string, msg?: string): void;
+}
+
+declare module Tinytest {
+    function add(description: string, func: (test: ITinytestAssertions) => void): void;
+
+    function addAsync(description: string, func: (test: ITinytestAssertions) => void): void;
+}
diff --git a/types/meteor/globals/tools.d.ts b/types/meteor/globals/tools.d.ts
new file mode 100644
index 0000000000..ecba67f06b
--- /dev/null
+++ b/types/meteor/globals/tools.d.ts
@@ -0,0 +1,102 @@
+declare module App {
+    function accessRule(pattern: string, options?: {
+        type?: string;
+        launchExternal?: boolean;
+    }): void;
+
+    function configurePlugin(id: string, config: Object): void;
+
+    function icons(icons: Object): void;
+
+    function info(options: {
+        id?: string;
+        version?: string;
+        name?: string;
+        description?: string;
+        author?: string;
+        email?: string;
+        website?: string;
+    }): void;
+
+    function launchScreens(launchScreens: Object): void;
+
+    function setPreference(name: string, value: string, platform?: string): void;
+}
+
+declare function execFileAsync(command: string, args?: any[], options?: {
+    cwd?: Object;
+    env?: Object;
+    stdio?: any[] | string;
+    destination?: any;
+    waitForClose?: string;
+}): any;
+declare function execFileSync(command: string, args?: any[], options?: {
+    cwd?: Object;
+    env?: Object;
+    stdio?: any[] | string;
+    destination?: any;
+    waitForClose?: string;
+}): String;
+
+declare module Assets {
+    function getBinary(assetPath: string, asyncCallback?: Function): EJSON;
+
+    function getText(assetPath: string, asyncCallback?: Function): string;
+
+    function absoluteFilePath(assetPath: string): string;
+}
+
+declare module Cordova {
+    function depends(dependencies: {
+        [id: string]: string
+    }): void;
+}
+
+declare module Npm {
+    function depends(dependencies: {
+        [id: string]: string
+    }): void;
+
+    function require(name: string): any;
+}
+
+declare namespace Package {
+    function describe(options: {
+        summary?: string;
+        version?: string;
+        name?: string;
+        git?: string;
+        documentation?: string;
+        debugOnly?: boolean;
+        prodOnly?: boolean;
+        testOnly?: boolean;
+    }): void;
+
+    function onTest(func: (api: PackageAPI) => void): void;
+
+    function onUse(func: (api: PackageAPI) => void): void;
+
+    function registerBuildPlugin(options?: {
+        name?: string;
+        use?: string | string[];
+        sources?: string[];
+        npmDependencies?: Object;
+    }): void;
+}
+
+declare interface PackageAPI {
+    new (): PackageAPI;
+    addAssets(filenames: string | string[], architecture: string | string[]): void;
+    addFiles(filenames: string | string[], architecture?: string | string[], options?: {
+        bare?: boolean;
+    }): void;
+    export(exportedObjects: string | string[], architecture?: string | string[], exportOptions?: Object, testOnly?: boolean): void;
+    imply(packageNames: string | string[], architecture?: string | string[]): void;
+    use(packageNames: string | string[], architecture?: string | string[], options?: {
+        weak?: boolean;
+        unordered?: boolean;
+    }): void;
+    versionsFrom(meteorRelease: string | string[]): void;
+}
+
+declare var console: Console;
diff --git a/types/meteor/globals/tracker.d.ts b/types/meteor/globals/tracker.d.ts
new file mode 100644
index 0000000000..15c1be408a
--- /dev/null
+++ b/types/meteor/globals/tracker.d.ts
@@ -0,0 +1,37 @@
+declare module Tracker {
+    function Computation(): void;
+    interface Computation {
+        firstRun: boolean;
+        invalidate(): void;
+        invalidated: boolean;
+        onInvalidate(callback: Function): void;
+        onStop(callback: Function): void;
+        stop(): void;
+        stopped: boolean;
+    }
+    var currentComputation: Computation;
+
+    var Dependency: DependencyStatic;
+    interface DependencyStatic {
+        new (): Dependency;
+    }
+    interface Dependency {
+        changed(): void;
+        depend(fromComputation?: Computation): boolean;
+        hasDependents(): boolean;
+    }
+
+    var active: boolean;
+
+    function afterFlush(callback: Function): void;
+
+    function autorun(runFunc: (computation: Computation) => void, options?: {
+        onError?: Function;
+    }): Computation;
+
+    function flush(): void;
+
+    function nonreactive(func: Function): void;
+
+    function onInvalidate(callback: Function): void;
+}
diff --git a/types/meteor/http.d.ts b/types/meteor/http.d.ts
index 0d8bb6afa1..166a5cf96a 100644
--- a/types/meteor/http.d.ts
+++ b/types/meteor/http.d.ts
@@ -1,52 +1,3 @@
-declare module HTTP {
-    interface HTTPRequest {
-        content?: string;
-        data?: any;
-        query?: string;
-        params?: {
-            [id: string]: string
-        };
-        auth?: string;
-        headers?: {
-            [id: string]: string
-        };
-        timeout?: number;
-        followRedirects?: boolean;
-    }
-
-    interface HTTPResponse {
-        statusCode?: number;
-        headers?: {
-            [id: string]: string
-        };
-        content?: string;
-        data?: any;
-    }
-
-    function call(method: string, url: string, options?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-
-    function del(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-
-    function get(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-
-    function post(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-
-    function put(url: string, callOptions?: HTTP.HTTPRequest, asyncCallback?: Function): HTTP.HTTPResponse;
-
-    function call(method: string, url: string, options?: {
-        content?: string;
-        data?: Object;
-        query?: string;
-        params?: Object;
-        auth?: string;
-        headers?: Object;
-        timeout?: number;
-        followRedirects?: boolean;
-        npmRequestOptions?: Object;
-        beforeSend?: Function;
-    }, asyncCallback?: Function): HTTP.HTTPResponse;
-}
-
 declare module "meteor/http" {
     module HTTP {
         interface HTTPRequest {
diff --git a/types/meteor/index.d.ts b/types/meteor/index.d.ts
index fad7da05bf..0822bab8e7 100644
--- a/types/meteor/index.d.ts
+++ b/types/meteor/index.d.ts
@@ -11,25 +11,43 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-/// <reference path="./accounts.d.ts" />
+/// <reference path="./accounts-base.d.ts" />
+/// <reference path="./globals/accounts-base.d.ts" />
 /// <reference path="./blaze.d.ts" />
+/// <reference path="./globals/blaze.d.ts" />
 /// <reference path="./browser-policy-common.d.ts" />
+/// <reference path="./globals/browser-policy-common.d.ts" />
 /// <reference path="./check.d.ts" />
+/// <reference path="./globals/check.d.ts" />
 /// <reference path="./ddp-rate-limiter.d.ts" />
+/// <reference path="./globals/ddp-rate-limiter.d.ts" />
 /// <reference path="./ddp.d.ts" />
+/// <reference path="./globals/ddp.d.ts" />
 /// <reference path="./ejson.d.ts" />
+/// <reference path="./globals/ejson.d.ts" />
 /// <reference path="./email.d.ts" />
+/// <reference path="./globals/email.d.ts" />
 /// <reference path="./http.d.ts" />
+/// <reference path="./globals/http.d.ts" />
 /// <reference path="./meteor.d.ts" />
+/// <reference path="./globals/meteor.d.ts" />
 /// <reference path="./mongo.d.ts" />
+/// <reference path="./globals/mongo.d.ts" />
 /// <reference path="./random.d.ts" />
+/// <reference path="./globals/random.d.ts" />
 /// <reference path="./reactive-var.d.ts" />
+/// <reference path="./globals/reactive-var.d.ts" />
 /// <reference path="./server-render.d.ts" />
 /// <reference path="./service-configuration.d.ts" />
 /// <reference path="./session.d.ts" />
+/// <reference path="./globals/session.d.ts" />
 /// <reference path="./templating.d.ts" />
+/// <reference path="./globals/templating.d.ts" />
 /// <reference path="./tiny-test.d.ts" />
+/// <reference path="./globals/tiny-test.d.ts" />
 /// <reference path="./tools.d.ts" />
+/// <reference path="./globals/tools.d.ts" />
 /// <reference path="./tracker.d.ts" />
+/// <reference path="./globals/tracker.d.ts" />
 /// <reference path="./underscore.d.ts" />
 /// <reference path="./webapp.d.ts" />
diff --git a/types/meteor/meteor.d.ts b/types/meteor/meteor.d.ts
index 07c1365459..ca08c31c98 100644
--- a/types/meteor/meteor.d.ts
+++ b/types/meteor/meteor.d.ts
@@ -1,105 +1,3 @@
-declare module Meteor {
-    /** Global props **/
-    var isClient: boolean;
-    var isCordova: boolean;
-    var isServer: boolean;
-    var isProduction: boolean;
-    var release: string;
-    /** Global props **/
-
-    /** Settings **/
-    interface Settings {
-        public: {
-            [id: string]: any
-        }, [id: string]: any
-    }
-    var settings: Settings;
-    /** Settings **/
-
-    /** User **/
-    interface UserEmail {
-        address: string;
-        verified: boolean;
-    }
-    interface User {
-        _id?: string;
-        username?: string;
-        emails?: UserEmail[];
-        createdAt?: number;
-        profile?: any;
-        services?: any;
-    }
-
-    function user(): User;
-
-    function userId(): string;
-    var users: Mongo.Collection<User>;
-    /** User **/
-
-    /** Error **/
-    var Error: ErrorStatic;
-    interface ErrorStatic {
-        new (error: string | number, reason?: string, details?: string): Error;
-    }
-    interface Error {
-        error: string | number;
-        reason?: string;
-        details?: string;
-    }
-    /** Error **/
-
-    /** Method **/
-    function methods(methods: Object): void;
-
-    function call(name: string, ...args: any[]): any;
-
-    function apply(name: string, args: EJSONable[], options?: {
-        wait?: boolean;
-        onResultReceived?: Function;
-        returnStubValue?: boolean;
-        throwStubExceptions?: boolean;
-    }, asyncCallback?: Function): any;
-    /** Method **/
-
-    /** Url **/
-    function absoluteUrl(path?: string, options?: {
-        secure?: boolean;
-        replaceLocalhost?: boolean;
-        rootUrl?: string;
-    }): string;
-    /** Url **/
-
-    /** Timeout **/
-    function setInterval(func: Function, delay: number): number;
-
-    function setTimeout(func: Function, delay: number): number;
-
-    function clearInterval(id: number): void;
-
-    function clearTimeout(id: number): void;
-
-    function defer(func: Function): void;
-    /** Timeout **/
-
-    /** utils **/
-    function startup(func: Function): void;
-
-    function wrapAsync(func: Function, context?: Object): any;
-
-    function bindEnvironment(func: Function): any;
-    /** utils **/
-
-    /** Pub/Sub **/
-    interface SubscriptionHandle {
-        stop(): void;
-        ready(): boolean;
-    }
-    interface LiveQueryHandle {
-        stop(): void;
-    }
-    /** Pub/Sub **/
-}
-
 declare module "meteor/meteor" {
     module Meteor {
         /** Global props **/
@@ -202,91 +100,7 @@ declare module "meteor/meteor" {
         }
         /** Pub/Sub **/
     }
-}
 
-declare module Meteor {
-    /** Login **/
-    interface LoginWithExternalServiceOptions {
-        requestPermissions?: string[];
-        requestOfflineToken?: Boolean;
-        forceApprovalPrompt?: Boolean;
-        loginUrlParameters?: Object;
-        redirectUrl?: string;
-        loginHint?: string;
-        loginStyle?: string;
-    }
-
-    function loginWithMeteorDeveloperAccount(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loginWithFacebook(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loginWithGithub(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loginWithGoogle(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loginWithMeetup(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loginWithTwitter(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loginWithWeibo(options?: Meteor.LoginWithExternalServiceOptions, callback?: Function): void;
-
-    function loggingIn(): boolean;
-
-    function loginWith<ExternalService>(options?: {
-        requestPermissions?: string[];
-        requestOfflineToken?: boolean;
-        loginUrlParameters?: Object;
-        userEmail?: string;
-        loginStyle?: string;
-        redirectUrl?: string;
-    }, callback?: Function): void;
-
-    function loginWithPassword(user: Object | string, password: string, callback?: Function): void;
-
-    function loginWithToken(token: string, callback?: Function): void;
-
-    function logout(callback?: Function): void;
-
-    function logoutOtherClients(callback?: Function): void;
-    /** Login **/
-
-    /** Event **/
-    interface Event {
-        type: string;
-        target: HTMLElement;
-        currentTarget: HTMLElement;
-        which: number;
-        stopPropagation(): void;
-        stopImmediatePropagation(): void;
-        preventDefault(): void;
-        isPropagationStopped(): boolean;
-        isImmediatePropagationStopped(): boolean;
-        isDefaultPrevented(): boolean;
-    }
-    interface EventHandlerFunction extends Function {
-        (event?: Meteor.Event, templateInstance?: Blaze.TemplateInstance): void;
-    }
-    interface EventMap {
-        [id: string]: Meteor.EventHandlerFunction;
-    }
-    /** Event **/
-
-    /** Connection **/
-    function reconnect(): void;
-
-    function disconnect(): void;
-    /** Connection **/
-
-    /** Status **/
-    function status(): DDP.DDPStatus;
-    /** Status **/
-
-    /** Pub/Sub **/
-    function subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
-    /** Pub/Sub **/
-}
-
-declare module "meteor/meteor" {
     module Meteor {
         /** Login **/
         interface LoginWithExternalServiceOptions {
@@ -368,39 +182,7 @@ declare module "meteor/meteor" {
         function subscribe(name: string, ...args: any[]): Meteor.SubscriptionHandle;
         /** Pub/Sub **/
     }
-}
 
-declare module Meteor {
-    /** Connection **/
-    interface Connection {
-        id: string;
-        close: Function;
-        onClose: Function;
-        clientAddress: string;
-        httpHeaders: Object;
-    }
-
-    function onConnection(callback: Function): void;
-    /** Connection **/
-
-    function publish(name: string, func: Function): void;
-
-    function _debug(...args: any[]): void;
-}
-
-interface Subscription {
-    added(collection: string, id: string, fields: Object): void;
-    changed(collection: string, id: string, fields: Object): void;
-    connection: Meteor.Connection;
-    error(error: Error): void;
-    onStop(func: Function): void;
-    ready(): void;
-    removed(collection: string, id: string): void;
-    stop(): void;
-    userId: string;
-}
-
-declare module "meteor/meteor" {
     module Meteor {
         /** Connection **/
         interface Connection {
@@ -430,16 +212,7 @@ declare module "meteor/meteor" {
         stop(): void;
         userId: string;
     }
-}
 
-declare module Meteor {
-    /** Global props **/
-    var isDevelopment: boolean;
-    var isTest: boolean;
-    /** Global props **/
-}
-
-declare module "meteor/meteor" {
     module Meteor {
         /** Global props **/
         var isDevelopment: boolean;
diff --git a/types/meteor/mongo.d.ts b/types/meteor/mongo.d.ts
index 771d24edc1..ced791205b 100644
--- a/types/meteor/mongo.d.ts
+++ b/types/meteor/mongo.d.ts
@@ -1,230 +1,6 @@
-declare module Mongo {
-
-    type BsonType = 1 | "double" |
-        2 | "string" |
-        3 | "object" |
-        4 | "array" |
-        5 | "binData" |
-        6 | "undefined" |
-        7 | "objectId" |
-        8 | "bool" |
-        9 | "date" |
-        10 | "null" |
-        11 | "regex" |
-        12 | "dbPointer" |
-        13 | "javascript" |
-        14 | "symbol" |
-        15 | "javascriptWithScope" |
-        16 | "int" |
-        17 | "timestamp" |
-        18 | "long" |
-        19 | "decimal" |
-        -1 | "minKey" |
-        127 | "maxKey" | "number"
-
-    type FieldExpression<T> = {
-        $eq?: T,
-        $gt?: T,
-        $gte?: T,
-        $lt?: T,
-        $lte?: T,
-        $in?: T[],
-        $nin?: T[],
-        $ne?: T,
-        $exists?: boolean,
-        $type?: BsonType[] | BsonType,
-        $not?: FieldExpression<T>,
-        $expr?: FieldExpression<T>,
-        $jsonSchema?: any,
-        $mod?: number[],
-        $regex?: RegExp | string,
-        $options?: string,
-        $text?: { $search: string, $language?: string, $caseSensitive?: boolean, $diacriticSensitive?: boolean },
-        $where?: string | Function,
-        $geoIntersects?: any,
-        $geoWithin?: any,
-        $near?: any,
-        $nearSphere?: any,
-        $all?: T[],
-        $elemMatch?: T extends {} ? Query<T> : FieldExpression<T>,
-        $size?: number,
-        $bitsAllClear?: any,
-        $bitsAllSet?: any,
-        $bitsAnyClear?: any,
-        $bitsAnySet?: any,
-        $comment?: string
-    }
-
-    type Flatten<T> = T extends any[] ? T[0] : T
-
-    type Query<T> = {
-        [P in keyof T]?: Flatten<T[P]> | RegExp | FieldExpression<Flatten<T[P]>>
-    } & {
-            $or?: Query<T>[],
-            $and?: Query<T>[],
-            $nor?: Query<T>[]
-        } & Dictionary<any>
-
-    type QueryWithModifiers<T> = {
-        $query: Query<T>,
-        $comment?: string,
-        $explain?: any,
-        $hint?: any,
-        $maxScan?: any,
-        $max?: any,
-        $maxTimeMS?: any,
-        $min?: any,
-        $orderby?: any,
-        $returnKey?: any,
-        $showDiskLoc?: any,
-        $natural?: any
-    }
-
-    type Selector<T> = Query<T> | QueryWithModifiers<T>
-
-    type Dictionary<T> = { [key: string]: T }
-    type PartialMapTo<T, M> = Partial<Record<keyof T, M>>
-    type OnlyArrays<T> = T extends any[] ? T : never;
-    type OnlyElementsOfArrays<T> = T extends any[] ? Partial<T[0]> : never
-    type ElementsOf<T> = {
-        [P in keyof T]?: OnlyElementsOfArrays<T[P]>
-    }
-    type PushModifier<T> = {
-        [P in keyof T]?:
-        OnlyElementsOfArrays<T[P]> |
-        { $each?: T[P], $position?: number, $slice?: number, $sort?: 1 | -1 | Dictionary<number> }
-    }
-    type ArraysOrEach<T> = {
-        [P in keyof T]?: OnlyArrays<T[P]> | { $each: T[P] }
-    }
-    type CurrentDateModifier = { $type: "timestamp" | "date" } | true
-    type Modifier<T> = T | {
-        $currentDate?: Partial<Record<keyof T, CurrentDateModifier>> & Dictionary<CurrentDateModifier>,
-        $inc?: PartialMapTo<T, number> & Dictionary<number>,
-        $min?: PartialMapTo<T, Date | number> & Dictionary<Date | number>,
-        $max?: PartialMapTo<T, Date | number> & Dictionary<Date | number>,
-        $mul?: PartialMapTo<T, number> & Dictionary<number>,
-        $rename?: PartialMapTo<T, string> & Dictionary<string>,
-        $set?: Partial<T> & Dictionary<any>,
-        $setOnInsert?: Partial<T> & Dictionary<any>,
-        $unset?: PartialMapTo<T, boolean | 1 | 0> & Dictionary<any>,
-        $addToSet?: ArraysOrEach<T> & Dictionary<any>,
-        $push?: PushModifier<T> & Dictionary<any>,
-        $pull?: ElementsOf<T> & Dictionary<any>,
-        $pullAll?: Partial<T> & Dictionary<any>,
-        $pop?: PartialMapTo<T, 1 | -1> & Dictionary<1 | -1>,
-    }
-
-
-    interface SortSpecifier { }
-    interface FieldSpecifier {
-        [id: string]: Number;
-    }
-
-    var Collection: CollectionStatic;
-    interface CollectionStatic {
-        new <T>(name: string, options?: {
-            connection?: Object | null;
-            idGeneration?: string;
-            transform?: Function;
-        }): Collection<T>;
-    }
-    interface Collection<T> {
-        allow(options: {
-            insert?: (userId: string, doc: T) => boolean;
-            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-            remove?: (userId: string, doc: T) => boolean;
-            fetch?: string[];
-            transform?: Function;
-        }): boolean;
-        deny(options: {
-            insert?: (userId: string, doc: T) => boolean;
-            update?: (userId: string, doc: T, fieldNames: string[], modifier: any) => boolean;
-            remove?: (userId: string, doc: T) => boolean;
-            fetch?: string[];
-            transform?: Function;
-        }): boolean;
-        find(selector?: Selector<T> | ObjectID | string, options?: {
-            sort?: SortSpecifier;
-            skip?: number;
-            limit?: number;
-            fields?: FieldSpecifier;
-            reactive?: boolean;
-            transform?: Function;
-        }): Cursor<T>;
-        findOne(selector?: Selector<T> | ObjectID | string, options?: {
-            sort?: SortSpecifier;
-            skip?: number;
-            fields?: FieldSpecifier;
-            reactive?: boolean;
-            transform?: Function;
-        }): T;
-        insert(doc: T, callback?: Function): string;
-        rawCollection(): any;
-        rawDatabase(): any;
-        remove(selector: Selector<T> | ObjectID | string, callback?: Function): number;
-        update(selector: Selector<T> | ObjectID | string, modifier: Modifier<T>, options?: {
-            multi?: boolean;
-            upsert?: boolean;
-        }, callback?: Function): number;
-        upsert(selector: Selector<T> | ObjectID | string, modifier: Modifier<T>, options?: {
-            multi?: boolean;
-        }, callback?: Function): {
-                numberAffected?: number; insertedId?: string;
-            };
-        _ensureIndex(keys: {
-            [key: string]: number | string
-        } | string, options?: {
-            [key: string]: any
-        }): void;
-        _dropIndex(keys: {
-            [key: string]: number | string
-        } | string): void;
-    }
-
-    var Cursor: CursorStatic;
-    interface CursorStatic {
-        new <T>(): Cursor<T>;
-    }
-    interface ObserveCallbacks {
-        added?(document: Object): void;
-        addedAt?(document: Object, atIndex: number, before: Object): void;
-        changed?(newDocument: Object, oldDocument: Object): void;
-        changedAt?(newDocument: Object, oldDocument: Object, indexAt: number): void;
-        removed?(oldDocument: Object): void;
-        removedAt?(oldDocument: Object, atIndex: number): void;
-        movedTo?(document: Object, fromIndex: number, toIndex: number, before: Object): void;
-    }
-    interface ObserveChangesCallbacks {
-        added?(id: string, fields: Object): void;
-        addedBefore?(id: string, fields: Object, before: Object): void;
-        changed?(id: string, fields: Object): void;
-        movedBefore?(id: string, before: Object): void;
-        removed?(id: string): void;
-    }
-    interface Cursor<T> {
-        count(applySkipLimit?: boolean): number;
-        fetch(): Array<T>;
-        forEach(callback: < T > (doc: T, index: number, cursor: Cursor<T>) => void, thisArg?: any): void;
-        map<U>(callback: (doc: T, index: number, cursor: Cursor<T>) => U, thisArg?: any): Array<U>;
-        observe(callbacks: ObserveCallbacks): Meteor.LiveQueryHandle;
-        observeChanges(callbacks: ObserveChangesCallbacks): Meteor.LiveQueryHandle;
-    }
-
-    var ObjectID: ObjectIDStatic;
-    interface ObjectIDStatic {
-        new(hexString?: string): ObjectID;
-    }
-    interface ObjectID {
-        toHexString(): string;
-        equals(otherID: ObjectID): boolean;
-    }
-
-    function setConnectionOptions(options: any): void;
-}
-
 declare module "meteor/mongo" {
     module Mongo {
+
         type BsonType = 1 | "double" |
             2 | "string" |
             3 | "object" |
@@ -340,6 +116,7 @@ declare module "meteor/mongo" {
             $pop?: PartialMapTo<T, 1 | -1> & Dictionary<1 | -1>,
         }
 
+
         interface SortSpecifier { }
         interface FieldSpecifier {
             [id: string]: Number;
@@ -446,19 +223,7 @@ declare module "meteor/mongo" {
 
         function setConnectionOptions(options: any): void;
     }
-}
 
-declare module Mongo {
-    interface AllowDenyOptions {
-        insert?: (userId: string, doc: any) => boolean;
-        update?: (userId: string, doc: any, fieldNames: string[], modifier: any) => boolean;
-        remove?: (userId: string, doc: any) => boolean;
-        fetch?: string[];
-        transform?: Function;
-    }
-}
-
-declare module "meteor/mongo" {
     module Mongo {
         interface AllowDenyOptions {
             insert?: (userId: string, doc: any) => boolean;
diff --git a/types/meteor/random.d.ts b/types/meteor/random.d.ts
index 6a0232088f..775616396e 100644
--- a/types/meteor/random.d.ts
+++ b/types/meteor/random.d.ts
@@ -1,17 +1,3 @@
-declare module Random {
-    function id(numberOfChars?: number): string;
-
-    function secret(numberOfChars?: number): string;
-
-    function fraction(): number;
-    // @param numberOfDigits, @returns a random hex string of the given length
-    function hexString(numberOfDigits: number): string;
-    // @param array, @return a random element in array
-    function choice(array: any[]): string;
-    // @param str, @return a random char in str
-    function choice(str: string): string;
-}
-
 declare module "meteor/random" {
     module Random {
         function id(numberOfChars?: number): string;
diff --git a/types/meteor/reactive-var.d.ts b/types/meteor/reactive-var.d.ts
index 8426433b7f..ec399d598f 100644
--- a/types/meteor/reactive-var.d.ts
+++ b/types/meteor/reactive-var.d.ts
@@ -1,12 +1,3 @@
-declare var ReactiveVar: ReactiveVarStatic;
-interface ReactiveVarStatic {
-    new <T>(initialValue: T, equalsFunc?: Function): ReactiveVar<T>;
-}
-interface ReactiveVar<T> {
-    get(): T;
-    set(newValue: T): void;
-}
-
 declare module "meteor/reactive-var" {
     var ReactiveVar: ReactiveVarStatic;
     interface ReactiveVarStatic {
diff --git a/types/meteor/scripts/generate-globals b/types/meteor/scripts/generate-globals
new file mode 100755
index 0000000000..3c5f8fc781
--- /dev/null
+++ b/types/meteor/scripts/generate-globals
@@ -0,0 +1,79 @@
+#!/usr/bin/env node
+
+/*
+For a Meteor package that is exposed as both a global and an ES6 module, we
+unfortunately need to provide two copies of the typings for compatibility with
+existing code that expects to augment and use either the global or the ES6
+module.  We maintain the module typings by hand and use this script to generate
+the global typings in the `globals/` subdirectory.  Not every package is exposed
+globally; `generate-globals` reads `tsconfig.json` to get the list of expected
+files in `globals/`.  Similarly, we maintain `meteor-tests.ts` (which tests the
+the modules that also have globals) by hand, and this script generates
+`globals/meteor-tests.ts` (which tests the globals).
+
+Usage: scripts/generate-globals
+
+This script may be used by Meteor typings packages in DefinitelyTyped other than
+`meteor` itself.
+
+Inspired by prior art (but not believed to constitute a derivative work):
+https://github.com/meteor-typings/meteor/blob/09ef92da99549ac090603ce70cfa632db4fad6e7/gulpfile.js#L43
+*/
+
+// @ts-check
+
+// We are relying on the following modules to be transitive dependencies of
+// DefinitelyTyped and npm 5 to install them in a place visible to us. :/
+let ts = require("typescript");
+let path = require("path");
+let os = require("os");
+let fs = require("fs");
+let mkdirp = require("mkdirp");
+let rimraf = require("rimraf");
+
+function formatDiagnostic(diag) {
+    return ts.flattenDiagnosticMessageText(diag.messageText, os.EOL);
+}
+
+let rcfResult = ts.readConfigFile("tsconfig.json", (path) => {
+    try {
+        return fs.readFileSync(path, "UTF-8");
+    } catch (e) {
+        return undefined;
+    }
+});
+let configObject = rcfResult.config;
+if (!configObject) {
+    throw new Error(formatDiagnostic(rcfResult.error));
+}
+rimraf.sync("globals");
+rimraf.sync("test/globals");
+let readmeText = `This \`globals/\` directory is generated by \`scripts/generate-globals\`!  To update
+this directory, edit the corresponding files outside \`globals/\` and re-run
+\`scripts/generate-globals\`.`.replace("\n", os.EOL);
+mkdirp.sync("globals");
+fs.writeFileSync("globals/README.md", readmeText, "UTF-8");
+mkdirp.sync("test/globals");
+fs.writeFileSync("test/globals/README.md", readmeText, "UTF-8");
+for (let outFile of configObject.files) {
+    let m = /^(test\/)?globals\/(.*)$/.exec(outFile);
+    if (m) {
+        let inFile = (m[1] || "") + m[2];
+        let inLines = fs.readFileSync(inFile, "UTF-8").split(os.EOL);
+        let isTest = !!m[1];
+        let outLines = inLines.map((l) => {
+            if (/^import /.test(l)) return null;
+            if (isTest) {
+                return l;
+            } else {
+                let m2;
+                if ((m2 = /^    ([^} ].*)$/.exec(l)) != null) return "declare " + m2[1];
+                if ((m2 = /^    (.*)$/.exec(l)) != null) return m2[1];
+                if (l == "") return l;
+                return null;  // Strip `declare module "..." {` and `}`.
+            }
+        }).filter((l) => l != null);
+        mkdirp.sync(path.dirname(outFile));
+        fs.writeFileSync(outFile, outLines.join(os.EOL), "UTF-8");
+    }
+}
diff --git a/types/meteor/session.d.ts b/types/meteor/session.d.ts
index 3dad5e682c..221e0e379e 100644
--- a/types/meteor/session.d.ts
+++ b/types/meteor/session.d.ts
@@ -1,14 +1,3 @@
-
-declare module Session {
-    function equals(key: string, value: string | number | boolean | any): boolean;
-
-    function get(key: string): any;
-
-    function set(key: string, value: EJSONable | any): void;
-
-    function setDefault(key: string, value: EJSONable | any): void;
-}
-
 declare module "meteor/session" {
     module Session {
         function equals(key: string, value: string | number | boolean | any): boolean;
diff --git a/types/meteor/templating.d.ts b/types/meteor/templating.d.ts
index e3b05109fb..0d8da7e899 100644
--- a/types/meteor/templating.d.ts
+++ b/types/meteor/templating.d.ts
@@ -1,11 +1,3 @@
-
-declare var Template: TemplateStatic;
-interface TemplateStatic extends Blaze.TemplateStatic {
-    new (viewName?: string, renderFunction?: Function): Blaze.Template;
-    body: Blaze.Template;
-    [index: string]: any | Blaze.Template;
-}
-
 declare module "meteor/templating" {
     var Template: TemplateStatic;
     interface TemplateStatic extends Blaze.TemplateStatic {
diff --git a/types/meteor/test/globals/README.md b/types/meteor/test/globals/README.md
new file mode 100644
index 0000000000..b9e3615b2b
--- /dev/null
+++ b/types/meteor/test/globals/README.md
@@ -0,0 +1,3 @@
+This `globals/` directory is generated by `scripts/generate-globals`!  To update
+this directory, edit the corresponding files outside `globals/` and re-run
+`scripts/generate-globals`.
\ No newline at end of file
diff --git a/types/meteor/test/globals/meteor-tests.ts b/types/meteor/test/globals/meteor-tests.ts
new file mode 100644
index 0000000000..c2145be0a6
--- /dev/null
+++ b/types/meteor/test/globals/meteor-tests.ts
@@ -0,0 +1,785 @@
+// This file may use only modules that have corresponding globals, because
+// `globals/meteor-tests.ts` is generated from it.  Tests that involve modules
+// that don't have corresponding globals belong in
+// `meteor-tests-module-only.ts`.
+
+/**
+ * All code below was copied from the examples at http://docs.meteor.com/.
+ * When necessary, code was added to make the examples work (e.g. declaring a variable
+ * that was assumed to have been declared earlier)
+ */
+
+/*********************************** Begin setup for tests ******************************/
+
+// Avoid conflicts between `meteor-tests.ts` and `globals/meteor-tests.ts`.
+namespace MeteorTests {
+
+var Rooms = new Mongo.Collection('rooms');
+var Messages = new Mongo.Collection('messages');
+interface MonkeyDAO {
+    _id: string;
+    name: string;
+}
+var Monkeys = new Mongo.Collection<MonkeyDAO>('monkeys');
+//var x = new Mongo.Collection<xDAO>('x');
+//var y = new Mongo.Collection<yDAO>('y');
+/********************************** End setup for tests *********************************/
+
+
+/**
+ * From Core, Meteor.startup section
+ * Tests Meteor.isServer, Meteor.startup, Collection.insert(), Collection.find()
+ */
+if (Meteor.isServer) {
+    Meteor.startup(function () {
+        if (Rooms.find().count() === 0) {
+            Rooms.insert({ name: "Initial room" });
+        }
+    });
+}
+
+/**
+ * From Publish and Subscribe, Meteor.publish section
+ **/
+Meteor.publish("rooms", function () {
+    return Rooms.find({}, { fields: { secretInfo: 0 } });
+});
+
+Meteor.publish("adminSecretInfo", function () {
+    return Rooms.find({ admin: this.userId }, { fields: { secretInfo: 1 } });
+});
+
+Meteor.publish("roomAndMessages", function (roomId: string) {
+    check(roomId, String);
+    return [
+        Rooms.find({ _id: roomId }, { fields: { secretInfo: 0 } }),
+        Messages.find({ roomId: roomId })
+    ];
+});
+
+/**
+ * Also from Publish and Subscribe, Meteor.publish section
+ */
+Meteor.publish("counts-by-room", function (roomId: string) {
+    var self = this;
+    check(roomId, String);
+    var count = 0;
+    var initializing = true;
+    var handle = Messages.find({ roomId: roomId }).observeChanges({
+        added: function (id: any) {
+            count++;
+            // if (!initializing)
+            //   this.changed("counts", roomId, {count: count});
+        },
+        removed: function (id: any) {
+            count--;
+            // Todo: Not sure how to define in typescript
+            //      self.changed("counts", roomId, {count: count});
+        }
+    });
+
+    initializing = false;
+
+    // Todo: Not sure how to define in typescript
+    //  self.added("counts", roomId, {count: count});
+    self.ready();
+
+    self.onStop(function () {
+        handle.stop();
+    });
+});
+
+var Counts = new Mongo.Collection("counts");
+
+Tracker.autorun(function () {
+    Meteor.subscribe("counts-by-room", Session.get("roomId"));
+});
+
+// Checking status
+let status: DDP.Status = 'connected';
+
+console.log("Current room has " +
+    Counts.find(Session.get("roomId")).count +
+    " messages.");
+
+/**
+ * From Publish and Subscribe, Meteor.subscribe section
+ */
+Meteor.subscribe("allplayers");
+
+/**
+ * Also from Meteor.subscribe section
+ */
+Tracker.autorun(function () {
+    Meteor.subscribe("chat", { room: Session.get("current-room") });
+    Meteor.subscribe("privateMessages");
+});
+
+/**
+ * From Methods, Meteor.methods section
+ */
+Meteor.methods({
+    foo: function (arg1: string, arg2: number[]) {
+        check(arg1, String);
+        check(arg2, [Number]);
+
+        var you_want_to_throw_an_error = true;
+        if (you_want_to_throw_an_error)
+            throw new Meteor.Error("404", "Can't find my pants");
+        return "some return value";
+    },
+
+    bar: function () {
+        // .. do other stuff ..
+        return "baz";
+    }
+});
+
+/**
+ * From Methods, Meteor.Error section
+ */
+function meteorErrorTestFunction1() {
+    throw new Meteor.Error("logged-out",
+        "The user must be logged in to post a comment.");
+}
+
+function meteorErrorTestFunction2() {
+    throw new Meteor.Error(403,
+        "The user must be logged in to post a comment.");
+}
+
+Meteor.call("methodName", function (error: Meteor.Error) {
+    if (error.error === "logged-out") {
+        Session.set("errorMessage", "Please log in to post a comment.");
+    }
+});
+var error = new Meteor.Error("logged-out", "The user must be logged in to post a comment.");
+console.log(error.error === "logged-out");
+console.log(error.reason === "The user must be logged in to post a comment.");
+console.log(error.details !== "");
+
+/**
+ * From Methods, Meteor.call section
+ */
+Meteor.call('foo', 1, 2, function (error: any, result: any) { });
+var result = Meteor.call('foo', 1, 2);
+
+/**
+ * From Collections, Mongo.Collection section
+ */
+// DA: I added the "var" keyword in there
+
+interface ChatroomsDAO {
+    _id?: string;
+}
+interface MessagesDAO {
+    _id?: string;
+}
+var Chatrooms = new Mongo.Collection<ChatroomsDAO>("chatrooms");
+Messages = new Mongo.Collection<MessagesDAO>("messages");
+
+var myMessages: any[] = Messages.find({ userId: Session.get('myUserId') }).fetch();
+
+Messages.insert({ text: "Hello, world!" });
+
+Messages.update(myMessages[0]._id, { $set: { important: true } });
+
+var Posts = new Mongo.Collection("posts");
+Posts.insert({ title: "Hello world", body: "First post" });
+
+// Couldn't find assert() in the meteor docs
+//assert(Posts.find().count() === 1);
+
+/**
+ * Todo: couldn't figure out how to make this next line work with Typescript
+ * since there is already a Collection constructor with a different signature
+ *
+ var Scratchpad = new Mongo.Collection;
+ for (var i = 0; i < 10; i++)
+ Scratchpad.insert({number: i * 2});
+ assert(Scratchpad.find({number: {$lt: 9}}).count() === 5);
+ **/
+
+class Animal {
+    constructor(doc: any) {}
+}
+
+interface AnimalDAO {
+    _id?: string;
+    name: string;
+    sound: string;
+    makeNoise?: () => void;
+}
+
+// Define a Collection that uses Animal as its document
+var Animals = new Mongo.Collection<AnimalDAO>("Animals", {
+    transform: function (doc: any): Animal { return new Animal(doc); }
+});
+
+// Create an Animal and call its makeNoise method
+Animals.insert({ name: "raptor", sound: "roar" });
+Animals.findOne({ name: "raptor" }).makeNoise(); // prints "roar"
+
+/**
+ * From Collections, Collection.insert section
+ */
+// DA: I added the variable declaration statements to make this work
+var Lists = new Mongo.Collection('Lists');
+var Items = new Mongo.Collection('Lists');
+
+var groceriesId = Lists.insert({ name: "Groceries" });
+Items.insert({ list: groceriesId, name: "Watercress" });
+Items.insert({ list: groceriesId, name: "Persimmons" });
+
+/**
+ * From Collections, collection.update section
+ */
+var Players = new Mongo.Collection('Players');
+
+Template['adminDashboard'].events({
+    'click .givePoints': function () {
+        Players.update(Session.get("currentPlayer"), { $inc: { score: 5 } });
+    }
+});
+
+/**
+ * Also from Collections, collection.update section
+ */
+Meteor.methods({
+    declareWinners: function () {
+        Players.update({ score: { $gt: 10 } },
+            { $addToSet: { badges: "Winner" } },
+            { multi: true });
+    }
+});
+
+/**
+ * From Collections, collection.remove section
+ */
+Template['chat'].events({
+    'click .remove': function () {
+        Messages.remove(this._id);
+    }
+});
+
+// DA: I added this next line
+var Logs = new Mongo.Collection('logs');
+
+Meteor.startup(function () {
+    if (Meteor.isServer) {
+        Logs.remove({});
+        Players.remove({ karma: { $lt: -2 } });
+    }
+});
+
+/***
+ * From Collections, collection.allow section
+ */
+
+interface iPost {
+    _id: string;
+    owner: string;
+    userId: string;
+    locked: boolean;
+}
+
+Posts = new Mongo.Collection<iPost>("posts");
+
+Posts.allow({
+    insert: function (userId: string, doc: iPost) {
+        // the user must be logged in, and the document must be owned by the user
+        return (userId && doc.owner === userId);
+    },
+    update: function (userId: string, doc: iPost, fields: string[], modifier: any) {
+        // can only change your own documents
+        return doc.owner === userId;
+    },
+    remove: function (userId: string, doc: iPost) {
+        // can only remove your own documents
+        return doc.owner === userId;
+    },
+    fetch: ['owner']
+});
+
+Posts.deny({
+    update: function (userId: string, doc: iPost, fields: string[], modifier: any) {
+        // can't change owners
+        return doc.userId !== userId;
+    },
+    remove: function (userId: string, doc: iPost) {
+        // can't remove locked documents
+        return doc.locked;
+    },
+    fetch: ['locked'] // no need to fetch 'owner'
+});
+
+/**
+ * From Collections, cursor.forEach section
+ */
+var topPosts = Posts.find({}, { sort: { score: -1 }, limit: 5 });
+var count = 0;
+topPosts.forEach(function (post: { title: string }) {
+    console.log("Title of post " + count + ": " + post.title);
+    count += 1;
+});
+
+/**
+ * From Collections, cursor.observeChanges section
+ */
+// DA: I added this line to make it work
+var Users = new Mongo.Collection('users');
+
+var count1 = 0;
+var query = Users.find({ admin: true, onlineNow: true });
+var handle = query.observeChanges({
+    added: function (id: string, user: { name: string }) {
+        count1++;
+        console.log(user.name + " brings the total to " + count1 + " admins.");
+    },
+    removed: function () {
+        count1--;
+        console.log("Lost one. We're now down to " + count1 + " admins.");
+    }
+});
+
+let cursor: Mongo.Cursor<Object>;
+
+// After five seconds, stop keeping the count.
+setTimeout(function () { handle.stop(); }, 5000);
+
+// Additional testing for Mongo.Collection<T>
+enum InlineObjectType {
+    Invalid,
+    Link,
+    Image,
+    Video,
+    Person
+}
+interface CommentsDAO {
+    text: string;
+    authorId: string;
+    inlineLinks: { objectType: InlineObjectType, objectId: string, objectUrl: string }[],
+    tags: string[],
+    viewNumber: number,
+    private: boolean
+}
+
+var Comments = new Mongo.Collection<CommentsDAO>("comments");
+
+Comments.find({ text: { $regex: /test/ } });
+Comments.find({ viewNumber: { $gt: 100 } });
+Comments.find({ viewNumber: { $not: { $lt: 100, $gt: 1000 } } });
+Comments.find({ tags: { $in: [ "tag-1", "tag-2", "tag-3" ] } });
+Comments.find({ $or: [ { text: "hello" }, { text: "world" } ] });
+Comments.find({ $or: [ 
+    { text: "hello" }, 
+    { text: "world", viewNumber: { $gt: 0 } } 
+], authorId: "test-author-id" });
+Comments.find({ $and: [ 
+    { $or: [{ authorId: "author-id-1" }, { authorId: "author-id-2" }] }, 
+    { $or: [{ tags: "tag-1" }, { tags: "tag-2" }] }
+]});
+
+Comments.find({ inlineLinks: { $exists: true, $type: "array" } });
+Comments.find({ inlineLinks: { $elemMatch: { 
+    objectType: InlineObjectType.Image, 
+    objectUrl: { $regex: "https://(www\.?)youtube\.com" } 
+} } });
+Comments.find({ "inlineLinks.objectType": InlineObjectType.Person });
+Comments.find({ tags: "tag-1" });
+Comments.find({ tags: { $all: ["tag-1", "tag2"] } });
+
+Comments.update({ viewNumber: { $exists: false } }, { $set: { viewNumber: 0 } });
+Comments.update({ authorId: "author-id-1" }, { $push: { tags: "test-tag-1" } });
+Comments.update({ authorId: "author-id-1" }, { $push: { tags: { $each: [ "test-tag-2", "test-tag-3" ] } } });
+
+Comments.update({ authorId: "author-id-1" }, { $push: { inlineLinks: {
+    objectId: "test-object-id",
+    objectType: InlineObjectType.Link,
+    objectUrl: "https://test.url/"
+} } });
+Comments.update({ viewNumber: { $exists: false } }, { $set: { viewNumber: 0 } });
+Comments.update({ private: true }, { $unset: { tags: true } });
+
+/**
+ * From Sessions, Session.set section
+ */
+Tracker.autorun(function () {
+    Meteor.subscribe("chat-history", { room: Session.get("currentRoomId") });
+});
+
+// Causes the function passed to Tracker.autorun to be re-run, so
+// that the chat-history subscription is moved to the room "home".
+Session.set("currentRoomId", "home");
+
+/**
+ * From Sessions, Session.get section
+ */
+// Page will say "We've always been at war with Eastasia"
+
+// DA: commented out since transpiler didn't like append()
+//document.body.append(frag1);
+
+// Page will change to say "We've always been at war with Eurasia"
+Session.set("enemy", "Eurasia");
+
+/**
+ * From Sessions, Session.equals section
+ */
+var value: string;
+Session.get("key") === value;
+Session.equals("key", value);
+
+/**
+ * From Accounts, Meteor.users section
+ */
+Meteor.publish("userData", function () {
+    return Meteor.users.find({ _id: this.userId },
+        { fields: { 'other': 1, 'things': 1 } });
+});
+
+Meteor.users.deny({ update: function () { return true; } });
+
+/**
+ * From Accounts, Meteor.loginWithExternalService section
+ */
+Meteor.loginWithGithub({
+    requestPermissions: ['user', 'public_repo']
+}, function (err: Meteor.Error) {
+    if (err)
+        Session.set('errorMessage', err.reason || 'Unknown error');
+});
+
+/**
+ * From Accounts, Accounts.ui.config section
+ */
+Accounts.ui.config({
+    requestPermissions: {
+        facebook: ['user_likes'],
+        github: ['user', 'repo']
+    },
+    requestOfflineToken: {
+        google: true
+    },
+    passwordSignupFields: 'USERNAME_AND_OPTIONAL_EMAIL'
+});
+
+/**
+ * From Accounts, Accounts.validateNewUser section
+ */
+Accounts.validateNewUser(function (user: { username: string }) {
+    if (user.username && user.username.length >= 3)
+        return true;
+    throw new Meteor.Error("403", "Username must have at least 3 characters");
+});
+// Validate username, without a specific error message.
+Accounts.validateNewUser(function (user: { username: string }) {
+    return user.username !== "root";
+});
+
+/**
+ * From Accounts, Accounts.onCreateUser section
+ */
+Accounts.onCreateUser(function (options: { profile: any }, user: { profile: any, dexterity: number }) {
+    var d6 = function () { return Math.floor(Math.random() * 6) + 1; };
+    user.dexterity = d6() + d6() + d6();
+    // We still want the default hook's 'profile' behavior.
+    if (options.profile)
+        user.profile = options.profile;
+    return user;
+});
+
+/**
+ * From Passwords, Accounts.emailTemplates section
+ */
+Accounts.emailTemplates.siteName = "AwesomeSite";
+Accounts.emailTemplates.from = "AwesomeSite Admin <accounts@example.com>";
+Accounts.emailTemplates.enrollAccount.subject = function (user: { profile: { name: string } }) {
+    return "Welcome to Awesome Town, " + user.profile.name;
+};
+Accounts.emailTemplates.enrollAccount.text = function (user: any, url: string) {
+    return "You have been selected to participate in building a better future!"
+        + " To activate your account, simply click the link below:\n\n"
+        + url;
+};
+
+/**
+ * From Templates, Template.myTemplate.helpers section
+ */
+Template['adminDashboard'].helpers({
+    foo: function () {
+        return Session.get("foo");
+    }
+});
+
+Template['newTemplate'].helpers({
+    helperName: function () {
+    }
+});
+
+Template['newTemplate'].created = function () {
+
+};
+
+Template['newTemplate'].rendered = function () {
+
+};
+
+Template['newTemplate'].destroyed = function () {
+
+};
+
+Template['newTemplate'].events({
+    'click .something': function (event: Meteor.Event, template: Blaze.TemplateInstance) {
+    }
+});
+
+Template.registerHelper('testHelper', function () {
+    return 'tester';
+});
+
+var instance = Template.instance();
+var data = Template.currentData();
+var data = Template.parentData(1);
+var body = Template.body;
+
+/**
+ * From Match section
+ */
+var Chats = new Mongo.Collection('chats');
+
+Meteor.publish("chats-in-room", function (roomId: string) {
+    // Make sure roomId is a string, not an arbitrary mongo selector object.
+    check(roomId, String);
+    return Chats.find({ room: roomId });
+});
+
+Meteor.methods({
+    addChat: function (roomId: string, message: { text: string, timestamp: Date, tags: string }) {
+        check(roomId, String);
+        check(message, {
+            text: String,
+            timestamp: Date,
+            // Optional, but if present must be an array of strings.
+            tags: Match.Optional('Test String')
+        });
+
+        // ... do something with the message ...
+    }
+});
+
+/**
+ * From Match patterns section
+ */
+var pat = { name: Match.Optional('test') };
+check({ name: "something" }, pat) // OK
+check({}, pat) // OK
+check({ name: undefined }, pat) // Throws an exception
+
+// Outside an object
+check(undefined, Match.Optional('test')); // OK
+
+/**
+ * From Deps, Tracker.autorun section
+ */
+Tracker.autorun(function () {
+    var oldest = Monkeys.findOne('age = 20');
+
+    if (oldest)
+        Session.set("oldest", oldest.name);
+});
+
+Tracker.autorun(function (c) {
+    if (!Session.equals("shouldAlert", true))
+        return;
+
+    c.stop();
+    alert("Oh no!");
+});
+
+/**
+ * From Deps, Deps.Computation
+ */
+if (Tracker.active) {
+    Tracker.onInvalidate(function () {
+        console.log('invalidated');
+    });
+}
+
+/**
+ * From Tracker, Tracker.Dependency
+ */
+var weather = "sunny";
+var weatherDep = new Tracker.Dependency;
+
+var getWeather = function () {
+    weatherDep.depend();
+    return weather;
+};
+
+var setWeather = function (w: string) {
+    weather = w;
+    // (could add logic here to only call changed()
+    // if the new value is different from the old)
+    weatherDep.changed();
+};
+
+/**
+ * From HTTP, HTTP.call section
+ */
+Meteor.methods({
+    checkTwitter: function (userId: string) {
+        check(userId, String);
+        this.unblock();
+        var result = HTTP.call("GET", "http://api.twitter.com/xyz",
+            { params: { user: userId } });
+        if (result.statusCode === 200)
+            return true
+        return false;
+    }
+});
+
+
+HTTP.call("POST", "http://api.twitter.com/xyz",
+    { data: { some: "json", stuff: 1 } },
+    function (error: Meteor.Error, result: any) {
+        if (result.statusCode === 200) {
+            Session.set("twizzled", true);
+        }
+    });
+
+/**
+ * From Email, Email.send section
+ */
+Meteor.methods({
+    sendEmail: function (to: string, from: string, subject: string, text: string) {
+        check([to, from, subject, text], [String]);
+
+        // Let other method calls from the same client start running,
+        // without waiting for the email sending to complete.
+        this.unblock();
+    }
+});
+
+// In your client code: asynchronously send an email
+Meteor.call('sendEmail',
+    'alice@example.com',
+    'Hello from Meteor!',
+    'This is a test of Email.send.');
+
+var testTemplate = new Blaze.Template('foo');
+var testView = new Blaze.View('foo');
+Blaze.Template.instance();
+
+declare var el: HTMLElement;
+Blaze.render(testTemplate, el);
+Blaze.renderWithData(testTemplate, { testData: 123 }, el);
+Blaze.remove(testView);
+Blaze.getData(el);
+Blaze.getData(testView);
+Blaze.toHTML(testTemplate);
+Blaze.toHTML(testView);
+Blaze.toHTMLWithData(testTemplate, { test: 1 });
+Blaze.toHTMLWithData(testTemplate, function () { });
+Blaze.toHTMLWithData(testView, { test: 1 });
+Blaze.toHTMLWithData(testView, function () { });
+
+var reactiveVar1 = new ReactiveVar<string>('test value');
+var reactiveVar2 = new ReactiveVar<string>('test value', function (oldVal: any) { return true; });
+
+var varValue: string = reactiveVar1.get();
+reactiveVar1.set('new value');
+
+// Covers this PR:  https://github.com/DefinitelyTyped/DefinitelyTyped/pull/8233
+var isConfigured: boolean = Accounts.loginServicesConfigured();
+Accounts.onPageLoadLogin(function () {
+    // do something
+});
+
+// Covers this PR:  https://github.com/DefinitelyTyped/DefinitelyTyped/pull/8065
+var loginOpts = <Meteor.LoginWithExternalServiceOptions>{
+    requestPermissions: ["a", "b"],
+    requestOfflineToken: true,
+    loginUrlParameters: { asdf: 1, qwer: "1234" },
+    loginHint: "Help me",
+    loginStyle: "Bold and powerful",
+    redirectUrl: "popup",
+    profile: "asdfasdf"
+};
+Meteor.loginWithMeteorDeveloperAccount(loginOpts, function (error: Meteor.Error) { });
+
+Accounts.emailTemplates.siteName = "AwesomeSite";
+Accounts.emailTemplates.from = "AwesomeSite Admin <accounts@example.com>";
+Accounts.emailTemplates.headers = { asdf: 'asdf', qwer: 'qwer' };
+
+Accounts.emailTemplates.enrollAccount.subject = function (user: Meteor.User) {
+    return "Welcome to Awesome Town, " + user.profile.name;
+};
+Accounts.emailTemplates.enrollAccount.html = function (user: Meteor.User, url: string) {
+    return "<h1>Some html here</h1>";
+};
+Accounts.emailTemplates.enrollAccount.from = function () {
+    return "asdf@asdf.com";
+};
+Accounts.emailTemplates.enrollAccount.text = function (user: Meteor.User, url: string) {
+    return "You have been selected to participate in building a better future!"
+        + " To activate your account, simply click the link below:\n\n"
+        + url;
+};
+
+var handle = Accounts.validateLoginAttempt(function (attemptInfoObject: Accounts.IValidateLoginAttemptCbOpts) {
+    var type: string = attemptInfoObject.type;
+    var allowed: boolean = attemptInfoObject.allowed;
+    var error: Meteor.Error = attemptInfoObject.error;
+    var user: Meteor.User = attemptInfoObject.user;
+    var connection: Meteor.Connection = attemptInfoObject.connection;
+    var methodName: string = attemptInfoObject.methodName;
+    var methodArguments: any[] = attemptInfoObject.methodArguments;
+    return true;
+});
+handle.stop();
+
+
+// Covers https://github.com/meteor-typings/meteor/issues/8
+const publicSetting = Meteor.settings.public['somePublicSetting'];
+const deeperPublicSetting = Meteor.settings.public['somePublicSetting']['deeperSetting'];
+const privateSetting = Meteor.settings['somePrivateSetting'];
+const deeperPrivateSetting = Meteor.settings['somePrivateSettings']['deeperSetting'];
+
+
+// Covers https://github.com/meteor-typings/meteor/issues/9
+const username = (<HTMLInputElement>Template.instance().find('#username')).value;
+
+
+// Covers https://github.com/meteor-typings/meteor/issues/3
+BrowserPolicy.framing.disallow();
+BrowserPolicy.content.allowEval();
+
+
+// Covers https://github.com/meteor-typings/meteor/issues/18
+if (Meteor.isDevelopment) {
+    Rooms._dropIndex({ field: 1 });
+}
+
+
+// Covers https://github.com/meteor-typings/meteor/issues/20
+Rooms.find().count(true);
+
+
+// Covers https://github.com/meteor-typings/meteor/issues/21
+if (Meteor.isTest) {
+    // do something
+}
+
+DDPRateLimiter.addRule({ userId: 'foo' }, 5, 1000);
+
+DDPRateLimiter.addRule({ userId: userId => userId == 'foo' }, 5, 1000);
+
+Template.instance().autorun(() => { }).stop();
+
+// Mongo Collection without connection (local collection)
+const collectionWithoutConnection = new Mongo.Collection<MonkeyDAO>("monkey", {
+    connection: null
+});
+
+}  // End of namespace
diff --git a/types/meteor/test/meteor-tests-module-only.ts b/types/meteor/test/meteor-tests-module-only.ts
new file mode 100644
index 0000000000..3591b90635
--- /dev/null
+++ b/types/meteor/test/meteor-tests-module-only.ts
@@ -0,0 +1,8 @@
+// This file is for tests that involve modules that don't have corresponding
+// globals.
+
+import { onPageLoad } from "meteor/server-render";
+import { ServiceConfiguration } from "meteor/service-configuration";
+import { WebApp } from "meteor/webapp";
+
+// We have no actual tests beyond the imports yet.
diff --git a/types/meteor/meteor-tests.ts b/types/meteor/test/meteor-tests.ts
similarity index 98%
rename from types/meteor/meteor-tests.ts
rename to types/meteor/test/meteor-tests.ts
index a321e4a409..c7fde5b8be 100644
--- a/types/meteor/meteor-tests.ts
+++ b/types/meteor/test/meteor-tests.ts
@@ -1,10 +1,14 @@
+// This file may use only modules that have corresponding globals, because
+// `globals/meteor-tests.ts` is generated from it.  Tests that involve modules
+// that don't have corresponding globals belong in
+// `meteor-tests-module-only.ts`.
+
 /**
  * All code below was copied from the examples at http://docs.meteor.com/.
  * When necessary, code was added to make the examples work (e.g. declaring a variable
  * that was assumed to have been declared earlier)
  */
 
-
 /*********************************** Begin setup for tests ******************************/
 import { Mongo } from "meteor/mongo";
 import { Meteor } from "meteor/meteor";
@@ -19,6 +23,9 @@ import { Accounts } from "meteor/accounts-base";
 import { BrowserPolicy } from "meteor/browser-policy-common";
 import { DDPRateLimiter } from "meteor/ddp-rate-limiter";
 
+// Avoid conflicts between `meteor-tests.ts` and `globals/meteor-tests.ts`.
+namespace MeteorTests {
+
 var Rooms = new Mongo.Collection('rooms');
 var Messages = new Mongo.Collection('messages');
 interface MonkeyDAO {
@@ -786,3 +793,5 @@ Template.instance().autorun(() => { }).stop();
 const collectionWithoutConnection = new Mongo.Collection<MonkeyDAO>("monkey", {
     connection: null
 });
+
+}  // End of namespace
diff --git a/types/meteor/tiny-test.d.ts b/types/meteor/tiny-test.d.ts
index 15e0939684..8d149e0711 100644
--- a/types/meteor/tiny-test.d.ts
+++ b/types/meteor/tiny-test.d.ts
@@ -1,41 +1,3 @@
-
-interface ILengthAble {
-    length: number;
-}
-
-interface ITinytestAssertions {
-    ok(doc: Object): void;
-    expect_fail(): void;
-    fail(doc: Object): void;
-    runId(): string;
-    equal<T>(actual: T, expected: T, message?: string, not?: boolean): void;
-    notEqual<T>(actual: T, expected: T, message?: string): void;
-    instanceOf(obj: Object, klass: Function, message?: string): void;
-    notInstanceOf(obj: Object, klass: Function, message?: string): void;
-    matches(actual: any, regexp: RegExp, message?: string): void;
-    notMatches(actual: any, regexp: RegExp, message?: string): void;
-    throws(f: Function, expected?: string | RegExp): void;
-    isTrue(v: boolean, msg?: string): void;
-    isFalse(v: boolean, msg?: string): void;
-    isNull(v: any, msg?: string): void;
-    isNotNull(v: any, msg?: string): void;
-    isUndefined(v: any, msg?: string): void;
-    isNotUndefined(v: any, msg?: string): void;
-    isNan(v: any, msg?: string): void;
-    isNotNan(v: any, msg?: string): void;
-    include<T>(s: Array<T> | Object | string, value: any, msg?: string, not?: boolean): void;
-
-    notInclude<T>(s: Array<T> | Object | string, value: any, msg?: string, not?: boolean): void;
-    length(obj: ILengthAble, expected_length: number, msg?: string): void;
-    _stringEqual(actual: string, expected: string, msg?: string): void;
-}
-
-declare module Tinytest {
-    function add(description: string, func: (test: ITinytestAssertions) => void): void;
-
-    function addAsync(description: string, func: (test: ITinytestAssertions) => void): void;
-}
-
 declare module "meteor/tiny-test" {
     interface ILengthAble {
         length: number;
diff --git a/types/meteor/tools.d.ts b/types/meteor/tools.d.ts
index a23a2bafaa..f45f75d0cc 100644
--- a/types/meteor/tools.d.ts
+++ b/types/meteor/tools.d.ts
@@ -1,107 +1,3 @@
-
-declare module App {
-    function accessRule(pattern: string, options?: {
-        type?: string;
-        launchExternal?: boolean;
-    }): void;
-
-    function configurePlugin(id: string, config: Object): void;
-
-    function icons(icons: Object): void;
-
-    function info(options: {
-        id?: string;
-        version?: string;
-        name?: string;
-        description?: string;
-        author?: string;
-        email?: string;
-        website?: string;
-    }): void;
-
-    function launchScreens(launchScreens: Object): void;
-
-    function setPreference(name: string, value: string, platform?: string): void;
-}
-
-declare function execFileAsync(command: string, args?: any[], options?: {
-    cwd?: Object;
-    env?: Object;
-    stdio?: any[] | string;
-    destination?: any;
-    waitForClose?: string;
-}): any;
-declare function execFileSync(command: string, args?: any[], options?: {
-    cwd?: Object;
-    env?: Object;
-    stdio?: any[] | string;
-    destination?: any;
-    waitForClose?: string;
-}): String;
-
-declare module Assets {
-    function getBinary(assetPath: string, asyncCallback?: Function): EJSON;
-
-    function getText(assetPath: string, asyncCallback?: Function): string;
-
-    function absoluteFilePath(assetPath: string): string;
-}
-
-declare module Cordova {
-    function depends(dependencies: {
-        [id: string]: string
-    }): void;
-}
-
-declare module Npm {
-    function depends(dependencies: {
-        [id: string]: string
-    }): void;
-
-    function require(name: string): any;
-}
-
-declare namespace Package {
-    function describe(options: {
-        summary?: string;
-        version?: string;
-        name?: string;
-        git?: string;
-        documentation?: string;
-        debugOnly?: boolean;
-        prodOnly?: boolean;
-        testOnly?: boolean;
-    }): void;
-
-    function onTest(func: (api: PackageAPI) => void): void;
-
-    function onUse(func: (api: PackageAPI) => void): void;
-
-    function registerBuildPlugin(options?: {
-        name?: string;
-        use?: string | string[];
-        sources?: string[];
-        npmDependencies?: Object;
-    }): void;
-}
-
-interface PackageAPI {
-    new (): PackageAPI;
-    addAssets(filenames: string | string[], architecture: string | string[]): void;
-    addFiles(filenames: string | string[], architecture?: string | string[], options?: {
-        bare?: boolean;
-    }): void;
-    export(exportedObjects: string | string[], architecture?: string | string[], exportOptions?: Object, testOnly?: boolean): void;
-    imply(packageNames: string | string[], architecture?: string | string[]): void;
-    use(packageNames: string | string[], architecture?: string | string[], options?: {
-        weak?: boolean;
-        unordered?: boolean;
-    }): void;
-    versionsFrom(meteorRelease: string | string[]): void;
-}
-
-declare var console: Console;
-
 declare module "meteor/tools" {
     module App {
         function accessRule(pattern: string, options?: {
@@ -135,7 +31,6 @@ declare module "meteor/tools" {
         destination?: any;
         waitForClose?: string;
     }): any;
-
     function execFileSync(command: string, args?: any[], options?: {
         cwd?: Object;
         env?: Object;
diff --git a/types/meteor/tracker.d.ts b/types/meteor/tracker.d.ts
index 495ae46abd..8a8b69c8da 100644
--- a/types/meteor/tracker.d.ts
+++ b/types/meteor/tracker.d.ts
@@ -1,42 +1,3 @@
-
-declare module Tracker {
-    function Computation(): void;
-    interface Computation {
-        firstRun: boolean;
-        invalidate(): void;
-        invalidated: boolean;
-        onInvalidate(callback: Function): void;
-        onStop(callback: Function): void;
-        stop(): void;
-        stopped: boolean;
-    }
-    var currentComputation: Computation;
-
-    var Dependency: DependencyStatic;
-    interface DependencyStatic {
-        new (): Dependency;
-    }
-    interface Dependency {
-        changed(): void;
-        depend(fromComputation?: Computation): boolean;
-        hasDependents(): boolean;
-    }
-
-    var active: boolean;
-
-    function afterFlush(callback: Function): void;
-
-    function autorun(runFunc: (computation: Computation) => void, options?: {
-        onError?: Function;
-    }): Computation;
-
-    function flush(): void;
-
-    function nonreactive(func: Function): void;
-
-    function onInvalidate(callback: Function): void;
-}
-
 declare module "meteor/tracker" {
     module Tracker {
         function Computation(): void;
diff --git a/types/meteor/tsconfig.json b/types/meteor/tsconfig.json
index b6cfc721f1..7ad451fd56 100644
--- a/types/meteor/tsconfig.json
+++ b/types/meteor/tsconfig.json
@@ -18,27 +18,49 @@
         "forceConsistentCasingInFileNames": true
     },
     "files": [
-        "accounts.d.ts",
+        "accounts-base.d.ts",
+        "globals/accounts-base.d.ts",
         "blaze.d.ts",
+        "globals/blaze.d.ts",
         "browser-policy-common.d.ts",
+        "globals/browser-policy-common.d.ts",
         "check.d.ts",
+        "globals/check.d.ts",
         "ddp-rate-limiter.d.ts",
+        "globals/ddp-rate-limiter.d.ts",
         "ddp.d.ts",
+        "globals/ddp.d.ts",
         "ejson.d.ts",
+        "globals/ejson.d.ts",
         "email.d.ts",
+        "globals/email.d.ts",
         "http.d.ts",
+        "globals/http.d.ts",
         "meteor.d.ts",
+        "globals/meteor.d.ts",
         "mongo.d.ts",
+        "globals/mongo.d.ts",
+        "random.d.ts",
+        "globals/random.d.ts",
         "reactive-var.d.ts",
+        "globals/reactive-var.d.ts",
         "server-render.d.ts",
         "service-configuration.d.ts",
         "session.d.ts",
+        "globals/session.d.ts",
+        "templating.d.ts",
+        "globals/templating.d.ts",
         "tiny-test.d.ts",
+        "globals/tiny-test.d.ts",
         "tools.d.ts",
+        "globals/tools.d.ts",
         "tracker.d.ts",
+        "globals/tracker.d.ts",
         "underscore.d.ts",
         "webapp.d.ts",
         "index.d.ts",
-        "meteor-tests.ts"
+        "test/meteor-tests.ts",
+        "test/globals/meteor-tests.ts",
+        "test/meteor-tests-module-only.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/micro-cors/index.d.ts b/types/micro-cors/index.d.ts
new file mode 100644
index 0000000000..eb91dde7f2
--- /dev/null
+++ b/types/micro-cors/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for micro-cors 0.1
+// Project: https://github.com/possibilities/micro-cors#readme
+// Definitions by: Callum Denby <https://github.com/CallumDenby>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { RequestHandler } from "micro";
+
+interface Options {
+    maxAge?: string;
+    origin?: string;
+    allowHeaders?: string[];
+    allowMethods?: string[];
+    exposeHeaders?: string[];
+}
+
+declare function micro_cors(options?: Options): (handler: RequestHandler) => RequestHandler;
+
+export = micro_cors;
diff --git a/types/micro-cors/micro-cors-tests.ts b/types/micro-cors/micro-cors-tests.ts
new file mode 100644
index 0000000000..b69b157c03
--- /dev/null
+++ b/types/micro-cors/micro-cors-tests.ts
@@ -0,0 +1,18 @@
+import cors = require('micro-cors');
+import micro from 'micro';
+
+const handler = cors();
+
+cors({ allowMethods: ['PUT', 'POST'] });
+
+cors({
+    maxAge: '1000',
+    origin: '*',
+    allowHeaders: [],
+    allowMethods: [],
+    exposeHeaders: []
+});
+
+handler(async (req, res) => {});
+handler((req, res) => {});
+micro(handler((req, res) => {}));
diff --git a/types/micro-cors/tsconfig.json b/types/micro-cors/tsconfig.json
new file mode 100644
index 0000000000..e44b2c9151
--- /dev/null
+++ b/types/micro-cors/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",
+        "micro-cors-tests.ts"
+    ]
+}
diff --git a/types/micro-cors/tslint.json b/types/micro-cors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/micro-cors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/microrouter/index.d.ts b/types/microrouter/index.d.ts
index 934affd630..c4927ecf9b 100644
--- a/types/microrouter/index.d.ts
+++ b/types/microrouter/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for microrouter 2.2
+// Type definitions for microrouter 3.1
 // Project: https://github.com/pedronauck/micro-router#readme
 // Definitions by: Mathieu Dutour <https://github.com/mathieudutour>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -21,6 +21,7 @@ export type AugmentedRequestHandler = (
 export type RouteHandler = (path: string, handler: AugmentedRequestHandler) => RequestHandler;
 
 export function router(...routes: RequestHandler[]): RequestHandler;
+export function withNamespace(namespace: string): (...routes: RequestHandler[]) => RequestHandler;
 
 export const get: RouteHandler;
 export const post: RouteHandler;
diff --git a/types/millisecond/index.d.ts b/types/millisecond/index.d.ts
new file mode 100644
index 0000000000..94da379679
--- /dev/null
+++ b/types/millisecond/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for millisecond 0.1
+// Project: https://github.com/unshiftio/millisecond
+// Definitions by: Aayush Kapoor <https://github.com/xeoneux>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function millisecond(ms: string | number): number;
+
+declare namespace millisecond { }
+
+export = millisecond;
diff --git a/types/millisecond/millisecond-tests.ts b/types/millisecond/millisecond-tests.ts
new file mode 100644
index 0000000000..fea9bc47e8
--- /dev/null
+++ b/types/millisecond/millisecond-tests.ts
@@ -0,0 +1,4 @@
+import * as millisecond from "millisecond";
+
+millisecond(100);
+millisecond("1 years");
diff --git a/types/millisecond/tsconfig.json b/types/millisecond/tsconfig.json
new file mode 100644
index 0000000000..8d84f8f844
--- /dev/null
+++ b/types/millisecond/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es2015"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "millisecond-tests.ts"
+    ]
+}
diff --git a/types/millisecond/tslint.json b/types/millisecond/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/millisecond/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/minimal-bit-array/index.d.ts b/types/minimal-bit-array/index.d.ts
new file mode 100644
index 0000000000..f5172fbd47
--- /dev/null
+++ b/types/minimal-bit-array/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for minimal-bit-array 1.0
+// Project: https://github.com/mikolalysenko/minimal-bit-array
+// Definitions by: Olegs Jeremejevs <https://github.com/jeremejevs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace BitArray {
+  interface BitArrayJSON {
+    bits: number[];
+    length: number;
+  }
+}
+
+declare class BitArray {
+  static fromJSON(bitArrayJSON: BitArray.BitArrayJSON): BitArray;
+
+  length: number;
+  bits: Uint32Array;
+
+  constructor(length: number);
+
+  get(index: number): boolean;
+  set(index: number, value: any): boolean;
+  toJSON(): BitArray.BitArrayJSON;
+}
+
+export = BitArray;
diff --git a/types/minimal-bit-array/minimal-bit-array-tests.ts b/types/minimal-bit-array/minimal-bit-array-tests.ts
new file mode 100644
index 0000000000..135b2908f2
--- /dev/null
+++ b/types/minimal-bit-array/minimal-bit-array-tests.ts
@@ -0,0 +1,9 @@
+import * as BitArray from "minimal-bit-array";
+
+new BitArray('abc'); // $ExpectError
+const bitArray: BitArray = new BitArray(123);
+bitArray.get(12); // $ExpectType boolean
+bitArray.set(34, true); // $ExpectType boolean
+bitArray.set(34, 'someTruthyValue');
+const json: BitArray.BitArrayJSON = bitArray.toJSON();
+const bitArrayClone: BitArray = BitArray.fromJSON(json);
diff --git a/types/minimal-bit-array/tsconfig.json b/types/minimal-bit-array/tsconfig.json
new file mode 100644
index 0000000000..6858a768bd
--- /dev/null
+++ b/types/minimal-bit-array/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",
+        "minimal-bit-array-tests.ts"
+    ]
+}
diff --git a/types/minimal-bit-array/tslint.json b/types/minimal-bit-array/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/minimal-bit-array/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/minio/index.d.ts b/types/minio/index.d.ts
index bdbcb8032a..53ca4fa6cd 100644
--- a/types/minio/index.d.ts
+++ b/types/minio/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for minio 5.1
+// Type definitions for minio 6.0
 // Project: https://github.com/minio/minio-js#readme
 // Definitions by: Barin Britva <https://github.com/barinbritva>
 //                 Lubomir Kaplan <https://github.com/castorw>
+//                 Panagiotis Kapros <https://github.com/loremaps>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
@@ -22,6 +23,8 @@ export interface ClientOptions {
     secure?: boolean;
     port?: number;
     region?: Region;
+    transport?: any;
+    sessionToken?: string;
 }
 
 export interface BucketItemFromList {
@@ -44,9 +47,9 @@ export interface BucketItem {
 
 export interface BucketItemStat {
     size: number;
-    contentType: string;
     etag: string;
     lastModified: Date;
+    metaData: ItemBucketMetadata;
 }
 
 export interface IncompleteUploadedBucketItem {
@@ -66,6 +69,10 @@ export interface PostPolicyResult {
     };
 }
 
+export interface ItemBucketMetadata {
+    [key: string]: any;
+}
+
 // No need to export this. But without it - linter error.
 export class TargetConfig {
     setId(id: any): void;
@@ -110,11 +117,11 @@ export class Client {
 
     putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, callback: ResultCallback<string>): void;
     putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size: number, callback: ResultCallback<string>): void;
-    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size: number, cotentType: string, callback: ResultCallback<string>): void;
-    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size?: number, cotentType?: string): Promise<string>;
+    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size: number, metaData: ItemBucketMetadata, callback: ResultCallback<string>): void;
+    putObject(bucketName: string, objectName: string, stream: Stream|Buffer|string, size?: number, metaData?: ItemBucketMetadata): Promise<string>;
 
-    fPutObject(bucketName: string, objectName: string, filePath: string, contentType: string, callback: ResultCallback<string>): void;
-    fPutObject(bucketName: string, objectName: string, filePath: string, contentType: string): Promise<string>;
+    fPutObject(bucketName: string, objectName: string, filePath: string, metaData: ItemBucketMetadata, callback: ResultCallback<string>): void;
+    fPutObject(bucketName: string, objectName: string, filePath: string, metaData: ItemBucketMetadata): Promise<string>;
 
     copyObject(bucketName: string, objectName: string, sourceObject: string, conditions: CopyConditions, callback: ResultCallback<BucketItemCopy>): void;
     copyObject(bucketName: string, objectName: string, sourceObject: string, conditions: CopyConditions): Promise<BucketItemCopy>;
@@ -125,6 +132,9 @@ export class Client {
     removeObject(bucketName: string, objectName: string, callback: NoResultCallback): void;
     removeObject(bucketName: string, objectName: string): Promise<void>;
 
+    removeObjects(bucketName: string, objectsList: string[], callback: NoResultCallback): void;
+    removeObjects(bucketName: string, objectsList: string[]): Promise<void>;
+
     removeIncompleteUpload(bucketName: string, objectName: string, callback: NoResultCallback): void;
     removeIncompleteUpload(bucketName: string, objectName: string): Promise<void>;
 
diff --git a/types/minio/minio-tests.ts b/types/minio/minio-tests.ts
index 05f8283d32..46d83201f7 100644
--- a/types/minio/minio-tests.ts
+++ b/types/minio/minio-tests.ts
@@ -44,15 +44,21 @@ minio.getPartialObject('testBucket', 'hello.jpg', 10, 20);
 minio.fGetObject('testBucket', 'hello.jpg', 'file/path', (error: Error|null) => { console.log(error); });
 minio.fGetObject('testBucket', 'hello.jpg', 'file/path');
 
+const metaData = {
+    'Content-Type': 'text/html',
+    'Content-Language': 123,
+    'X-Amz-Meta-Testing': 1234,
+    example: 5678
+};
 minio.putObject('testBucket', 'hello.jpg', new Stream(), (error: Error|null, etag: string) => { console.log(error, etag); });
 minio.putObject('testBucket', 'hello.jpg', new Buffer('string'), 100, (error: Error|null, etag: string) => { console.log(error, etag); });
-minio.putObject('testBucket', 'hello.txt', 'hello.txt content', 100, 'text/plain', (error: Error|null, etag: string) => { console.log(error, etag); });
+minio.putObject('testBucket', 'hello.txt', 'hello.txt content', 100, metaData, (error: Error|null, etag: string) => { console.log(error, etag); });
 minio.putObject('testBucket', 'hello.jpg', new Stream());
 minio.putObject('testBucket', 'hello.jpg', new Buffer('string'), 100);
-minio.putObject('testBucket', 'hello.txt', 'hello.txt content', 100, 'text/plain');
+minio.putObject('testBucket', 'hello.txt', 'hello.txt content', 100, metaData);
 
-minio.fPutObject('testBucket', 'hello.jpg', 'file/path', 'image/jpg', (error: Error|null, etag: string) => { console.log(error, etag); });
-minio.fPutObject('testBucket', 'hello.jpg', 'file/path', 'image/jpg');
+minio.fPutObject('testBucket', 'hello.jpg', 'file/path', metaData, (error: Error|null, etag: string) => { console.log(error, etag); });
+minio.fPutObject('testBucket', 'hello.jpg', 'file/path', metaData);
 
 const conditions = new Minio.CopyConditions();
 conditions.setMatchETag('bd891862ea3e22c93ed53a098218791d');
@@ -65,6 +71,9 @@ minio.statObject('testBucket', 'hello.jpg');
 minio.removeObject('testBucket', 'hello.jpg', (error: Error|null) => { console.log(error); });
 minio.removeObject('testBucket', 'hello.jpg');
 
+minio.removeObjects('testBucket', ['hello.jpg', 'hello.txt'], (error: Error|null) => { console.log(error); });
+minio.removeObjects('testBucket', ['hello.jpg', 'hello.txt']);
+
 minio.removeIncompleteUpload('testBucket', 'hello.jpg', (error: Error|null) => { console.log(error); });
 minio.removeIncompleteUpload('testBucket', 'hello.jpg');
 
diff --git a/types/mocha/index.d.ts b/types/mocha/index.d.ts
index 1ada77c0a4..868a6c332d 100644
--- a/types/mocha/index.d.ts
+++ b/types/mocha/index.d.ts
@@ -9,9 +9,6 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
-export = Mocha;
-export as namespace Mocha;
-
 /**
  * Mocha API
  *
@@ -426,7 +423,9 @@ declare namespace Mocha {
      * @returns [bdd] `Suite`
      * @returns [tdd] `void`
      */
-    type PendingSuiteFunction = (title: string, fn: (this: Suite) => void) => Suite | void;
+    interface PendingSuiteFunction {
+        (title: string, fn: (this: Suite) => void): Suite | void;
+    }
 
     interface TestFunction {
         /**
@@ -2623,234 +2622,365 @@ declare namespace Mocha {
     // #endregion
 }
 
-declare global {
-    // #region Test interface augmentations
+// #region Test interface augmentations
 
-    /**
-     * Triggers root suite execution.
-     *
-     * - _Only available if flag --delay is passed into Mocha._
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#runWithSuite
-     */
-    function run(): void;
+/**
+ * Triggers root suite execution.
+ *
+ * - _Only available if flag --delay is passed into Mocha._
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#runWithSuite
+ */
+declare function run(): void;
 
-    /**
-     * Execute before running tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#before
-     */
-    var before: Mocha.HookFunction;
+/**
+ * Execute before running tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#before
+ */
+declare var before: Mocha.HookFunction;
 
-    /**
-     * Execute before running tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#before
-     */
-    var suiteSetup: Mocha.HookFunction;
+/**
+ * Execute before running tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#before
+ */
+declare var suiteSetup: Mocha.HookFunction;
 
-    /**
-     * Execute after running tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#after
-     */
-    var after: Mocha.HookFunction;
+/**
+ * Execute after running tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#after
+ */
+declare var after: Mocha.HookFunction;
 
-    /**
-     * Execute after running tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#after
-     */
-    var suiteTeardown: Mocha.HookFunction;
+/**
+ * Execute after running tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#after
+ */
+declare var suiteTeardown: Mocha.HookFunction;
 
-    /**
-     * Execute before each test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#beforeEach
-     */
-    var beforeEach: Mocha.HookFunction;
+/**
+ * Execute before each test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#beforeEach
+ */
+declare var beforeEach: Mocha.HookFunction;
 
-    /**
-     * Execute before each test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#beforeEach
-     */
-    var setup: Mocha.HookFunction;
+/**
+ * Execute before each test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#beforeEach
+ */
+declare var setup: Mocha.HookFunction;
 
-    /**
-     * Execute after each test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#afterEach
-     */
-    var afterEach: Mocha.HookFunction;
+/**
+ * Execute after each test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#afterEach
+ */
+declare var afterEach: Mocha.HookFunction;
 
-    /**
-     * Execute after each test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     *
-     * @see https://mochajs.org/api/global.html#afterEach
-     */
-    var teardown: Mocha.HookFunction;
+/**
+ * Execute after each test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ *
+ * @see https://mochajs.org/api/global.html#afterEach
+ */
+declare var teardown: Mocha.HookFunction;
 
-    /**
-     * Describe a "suite" containing nested suites and tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var describe: Mocha.SuiteFunction;
+/**
+ * Describe a "suite" containing nested suites and tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var describe: Mocha.SuiteFunction;
 
-    /**
-     * Describe a "suite" containing nested suites and tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var context: Mocha.SuiteFunction;
+/**
+ * Describe a "suite" containing nested suites and tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var context: Mocha.SuiteFunction;
 
-    /**
-     * Describe a "suite" containing nested suites and tests.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var suite: Mocha.SuiteFunction;
+/**
+ * Describe a "suite" containing nested suites and tests.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var suite: Mocha.SuiteFunction;
 
-    /**
-     * Pending suite.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var xdescribe: Mocha.PendingSuiteFunction;
+/**
+ * Pending suite.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var xdescribe: Mocha.PendingSuiteFunction;
 
-    /**
-     * Pending suite.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var xcontext: Mocha.PendingSuiteFunction;
+/**
+ * Pending suite.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var xcontext: Mocha.PendingSuiteFunction;
 
-    /**
-     * Describes a test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var it: Mocha.TestFunction;
+/**
+ * Describes a test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var it: Mocha.TestFunction;
 
-    /**
-     * Describes a test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var specify: Mocha.TestFunction;
+/**
+ * Describes a test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var specify: Mocha.TestFunction;
 
-    /**
-     * Describes a test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var test: Mocha.TestFunction;
+/**
+ * Describes a test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var test: Mocha.TestFunction;
 
-    /**
-     * Describes a pending test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var xit: Mocha.PendingTestFunction;
+/**
+ * Describes a pending test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var xit: Mocha.PendingTestFunction;
 
-    /**
-     * Describes a pending test case.
-     *
-     * - _Only available when invoked via the mocha CLI._
-     */
-    var xspecify: Mocha.PendingTestFunction;
+/**
+ * Describes a pending test case.
+ *
+ * - _Only available when invoked via the mocha CLI._
+ */
+declare var xspecify: Mocha.PendingTestFunction;
 
-    // #endregion Test interface augmentations
+// #endregion Test interface augmentations
 
-    // #region Reporter augmentations
+// #region Reporter augmentations
 
-    // Forward declaration for `HTMLLIElement` from lib.dom.d.ts.
-    // Required by Mocha.reporters.HTML.
-    // NOTE: Mocha *must not* have a direct dependency on DOM types.
+// Forward declaration for `HTMLLIElement` from lib.dom.d.ts.
+// Required by Mocha.reporters.HTML.
+// NOTE: Mocha *must not* have a direct dependency on DOM types.
+// tslint:disable-next-line no-empty-interface
+interface HTMLLIElement { }
+
+// Augments the DOM `Window` object when lib.dom.d.ts is loaded.
+// tslint:disable-next-line no-empty-interface
+interface Window extends Mocha.MochaGlobals { }
+
+declare namespace NodeJS {
+    // Forward declaration for `NodeJS.EventEmitter` from node.d.ts.
+    // Required by Mocha.Runnable, Mocha.Runner, and Mocha.Suite.
+    // NOTE: Mocha *must not* have a direct dependency on @types/node.
     // tslint:disable-next-line no-empty-interface
-    interface HTMLLIElement { }
+    interface EventEmitter { }
 
-    // Augments the DOM `Window` object when lib.dom.d.ts is loaded.
+    // Augments NodeJS's `global` object when node.d.ts is loaded
     // tslint:disable-next-line no-empty-interface
-    interface Window extends Mocha.MochaGlobals { }
+    interface Global extends Mocha.MochaGlobals { }
+}
 
-    namespace NodeJS {
-        // Forward declaration for `NodeJS.EventEmitter` from node.d.ts.
-        // Required by Mocha.Runnable, Mocha.Runner, and Mocha.Suite.
-        // NOTE: Mocha *must not* have a direct dependency on @types/node.
-        // tslint:disable-next-line no-empty-interface
-        interface EventEmitter { }
+// #endregion Reporter augmentations
 
-        // Augments NodeJS's `global` object when node.d.ts is loaded
-        // tslint:disable-next-line no-empty-interface
-        interface Global extends Mocha.MochaGlobals { }
-    }
+// #region Browser augmentations
 
-    // #endregion Reporter augmentations
-
-    // #region Browser augmentations
+/**
+ * Mocha global.
+ *
+ * - _Only supported in the browser._
+ */
+declare const mocha: BrowserMocha;
 
+interface BrowserMocha extends Mocha {
     /**
-     * Mocha global.
+     * Function to allow assertion libraries to throw errors directly into mocha.
+     * This is useful when running tests in a browser because window.onerror will
+     * only receive the 'message' attribute of the Error.
      *
      * - _Only supported in the browser._
      */
-    const mocha: BrowserMocha;
-
-    interface BrowserMocha extends Mocha {
-        /**
-         * Function to allow assertion libraries to throw errors directly into mocha.
-         * This is useful when running tests in a browser because window.onerror will
-         * only receive the 'message' attribute of the Error.
-         *
-         * - _Only supported in the browser._
-         */
-        throwError(err: any): never;
-
-        /**
-         * Setup mocha with the given settings options.
-         *
-         * - _Only supported in the browser._
-         */
-        setup(opts?: Mocha.Interface | MochaSetupOptions): this;
-    }
+    throwError(err: any): never;
 
     /**
-     * Options to pass to `mocha.setup` in the browser.
+     * Setup mocha with the given settings options.
+     *
+     * - _Only supported in the browser._
      */
-    interface MochaSetupOptions extends Mocha.MochaOptions {
-        // TODO: This does not seem to be supported according to the source. Should it be removed?
-        require?: string[];
-        fullTrace?: boolean;
-    }
+    setup(opts?: Mocha.Interface | MochaSetupOptions): this;
+}
+
+/**
+ * Options to pass to `mocha.setup` in the browser.
+ */
+interface MochaSetupOptions extends Mocha.MochaOptions {
+    /** @deprecated This is not used by Mocha. Use `files` instead. */
+    require?: string[];
+    fullTrace?: boolean;
+}
+
+// #endregion Browser augmentations
+
+// #region Deprecations
+
+/** @deprecated use `Mocha.Done` instead. */
+type MochaDone = Mocha.Done;
+
+/** @deprecated use `Mocha.ReporterConstructor` instead. */
+type ReporterConstructor = Mocha.ReporterConstructor;
+
+// #endregion Deprecations
+
+declare module "mocha" {
+    export = Mocha;
+}
+
+declare module "mocha/lib/ms" {
+    export = milliseconds;
+    /**
+     * Parse the given `str` and return milliseconds.
+     *
+     * @see {@link https://mochajs.org/api/module-milliseconds.html}
+     * @see {@link https://mochajs.org/api/module-milliseconds.html#~parse}
+     */
+    function milliseconds(val: string): number;
+
+    /**
+     * Format for `ms`.
+     *
+     * @see {@link https://mochajs.org/api/module-milliseconds.html}
+     * @see {@link https://mochajs.org/api/module-milliseconds.html#~format}
+     */
+    function milliseconds(val: number): string;
+}
+
+declare module "mocha/lib/interfaces/common" {
+    export = common;
+
+    function common(suites: Mocha.Suite[], context: Mocha.MochaGlobals, mocha: Mocha): common.CommonFunctions;
+
+    namespace common {
+        interface CommonFunctions {
+            /**
+             * This is only present if flag --delay is passed into Mocha. It triggers
+             * root suite execution.
+             */
+            runWithSuite(suite: Mocha.Suite): () => void;
+
+            /**
+             * Execute before running tests.
+             */
+            before(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute before running tests.
+             */
+            before(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute after running tests.
+             */
+            after(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute after running tests.
+             */
+            after(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute before each test case.
+             */
+            beforeEach(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute before each test case.
+             */
+            beforeEach(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute after each test case.
+             */
+            afterEach(fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            /**
+             * Execute after each test case.
+             */
+            afterEach(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
+
+            suite: SuiteFunctions;
+            test: TestFunctions;
+        }
+
+        interface CreateOptions {
+            /** Title of suite */
+            title: string;
+
+            /** Suite function */
+            fn?: (this: Mocha.Suite) => void;
+
+            /** Is suite pending? */
+            pending?: boolean;
+
+            /** Filepath where this Suite resides */
+            file?: string;
+
+            /** Is suite exclusive? */
+            isOnly?: boolean;
+        }
+
+        interface SuiteFunctions {
+            /**
+             * Create an exclusive Suite; convenience function
+             */
+            only(opts: CreateOptions): Mocha.Suite;
 
-    // #endregion Browser augmentations
+            /**
+             * Create a Suite, but skip it; convenience function
+             */
+            skip(opts: CreateOptions): Mocha.Suite;
 
-    // #region Deprecations
+            /**
+             * Creates a suite.
+             */
+            create(opts: CreateOptions): Mocha.Suite;
+        }
 
-    /** @deprecated use `Mocha.DoneCallback` instead. */
-    type MochaDone = Mocha.Done;
+        interface TestFunctions {
+            /**
+             * Exclusive test-case.
+             */
+            only(mocha: Mocha, test: Mocha.Test): Mocha.Test;
 
-    /** @deprecated use `Mocha.ReporterConstructor` instead. */
-    type ReporterConstructor = Mocha.ReporterConstructor;
+            /**
+             * Pending test case.
+             */
+            skip(title: string): void;
 
-    // #endregion Deprecations
+            /**
+             * Number of retry attempts
+             */
+            retries(n: number): void;
+        }
+    }
 }
diff --git a/types/mocha/lib/interfaces/common.d.ts b/types/mocha/lib/interfaces/common.d.ts
deleted file mode 100644
index 9756482354..0000000000
--- a/types/mocha/lib/interfaces/common.d.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-import Mocha = require("../../");
-
-export = common;
-
-declare function common(suites: Mocha.Suite[], context: Mocha.MochaGlobals, mocha: Mocha): common.CommonFunctions;
-
-declare namespace common {
-    interface CommonFunctions {
-        /**
-         * This is only present if flag --delay is passed into Mocha. It triggers
-         * root suite execution.
-         */
-        runWithSuite(suite: Mocha.Suite): () => void;
-
-        /**
-         * Execute before running tests.
-         */
-        before(fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute before running tests.
-         */
-        before(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute after running tests.
-         */
-        after(fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute after running tests.
-         */
-        after(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute before each test case.
-         */
-        beforeEach(fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute before each test case.
-         */
-        beforeEach(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute after each test case.
-         */
-        afterEach(fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        /**
-         * Execute after each test case.
-         */
-        afterEach(name: string, fn?: Mocha.Func | Mocha.AsyncFunc): void;
-
-        suite: SuiteFunctions;
-        test: TestFunctions;
-    }
-
-    interface CreateOptions {
-        /** Title of suite */
-        title: string;
-
-        /** Suite function */
-        fn?: (this: Mocha.Suite) => void;
-
-        /** Is suite pending? */
-        pending?: boolean;
-
-        /** Filepath where this Suite resides */
-        file?: string;
-
-        /** Is suite exclusive? */
-        isOnly?: boolean;
-    }
-
-    interface SuiteFunctions {
-        /**
-         * Create an exclusive Suite; convenience function
-         */
-        only(opts: CreateOptions): Mocha.Suite;
-
-        /**
-         * Create a Suite, but skip it; convenience function
-         */
-        skip(opts: CreateOptions): Mocha.Suite;
-
-        /**
-         * Creates a suite.
-         */
-        create(opts: CreateOptions): Mocha.Suite;
-    }
-
-    interface TestFunctions {
-        /**
-         * Exclusive test-case.
-         */
-        only(mocha: Mocha, test: Mocha.Test): Mocha.Test;
-
-        /**
-         * Pending test case.
-         */
-        skip(title: string): void;
-
-        /**
-         * Number of retry attempts
-         */
-        retries(n: number): void;
-    }
-}
diff --git a/types/mocha/lib/ms.d.ts b/types/mocha/lib/ms.d.ts
deleted file mode 100644
index 3b89a55fc5..0000000000
--- a/types/mocha/lib/ms.d.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-export = milliseconds;
-
-/**
- * Parse the given `str` and return milliseconds.
- *
- * @see {@link https://mochajs.org/api/module-milliseconds.html}
- * @see {@link https://mochajs.org/api/module-milliseconds.html#~parse}
- */
-declare function milliseconds(val: string): number;
-
-/**
- * Format for `ms`.
- *
- * @see {@link https://mochajs.org/api/module-milliseconds.html}
- * @see {@link https://mochajs.org/api/module-milliseconds.html#~format}
- */
-declare function milliseconds(val: number): string;
diff --git a/types/mocha/mocha-tests.ts b/types/mocha/mocha-tests.ts
index b80d7b415d..b21abb9ffd 100644
--- a/types/mocha/mocha-tests.ts
+++ b/types/mocha/mocha-tests.ts
@@ -748,16 +748,14 @@ function test_reporter_string(localMocha: LocalMocha) {
     // $ExpectType BrowserMocha
     mocha.reporter('html');
 
-    // $ExpectType Mocha
-    localMocha.reporter('html');
+    const m: Mocha = localMocha.reporter('html');
 }
 
 function test_reporter_function(localMocha: LocalMocha) {
     // $ExpectType BrowserMocha
     mocha.reporter(class extends LocalMocha.reporters.Base { });
 
-    // $ExpectType Mocha
-    localMocha.reporter(class extends LocalMocha.reporters.Base { });
+    const m: Mocha = localMocha.reporter(class extends LocalMocha.reporters.Base { });
 }
 
 function test_browser_mocha_setup_slow_option() {
@@ -836,63 +834,51 @@ function test_browser_mocha_setup_all_options() {
 }
 
 function test_constructor_slow_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ slow: 25 });
+    const m: Mocha = new LocalMocha({ slow: 25 });
 }
 
 function test_constructor_timeout_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ timeout: 25 });
+    const m: Mocha = new LocalMocha({ timeout: 25 });
 }
 
 function test_constructor_globals_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ globals: ['mocha'] });
+    const m: Mocha = new LocalMocha({ globals: ['mocha'] });
 }
 
 function test_constructor_ui_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ ui: 'bdd' });
+    const m: Mocha = new LocalMocha({ ui: 'bdd' });
 }
 
 function test_constructor_reporter_string_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ reporter: 'html' });
+    const m: Mocha = new LocalMocha({ reporter: 'html' });
 }
 
 function test_constructor_reporter_function_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ reporter: class extends LocalMocha.reporters.Base { } });
+    const m: Mocha = new LocalMocha({ reporter: class extends LocalMocha.reporters.Base { } });
 }
 
 function test_constructor_bail_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ bail: false });
+    const m: Mocha = new LocalMocha({ bail: false });
 }
 
 function test_constructor_ignore_leaks_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ ignoreLeaks: false });
+    const m: Mocha = new LocalMocha({ ignoreLeaks: false });
 }
 
 function test_constructor_grep_string_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ grep: "describe" });
+    const m: Mocha = new LocalMocha({ grep: "describe" });
 }
 
 function test_constructor_grep_regex_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ grep: new RegExp('describe') });
+    const m: Mocha = new LocalMocha({ grep: new RegExp('describe') });
 }
 
 function test_constructor_grep_regex_literal_option() {
-    // $ExpectType Mocha
-    new LocalMocha({ grep: /(expect|should)/i });
+    const m: Mocha = new LocalMocha({ grep: /(expect|should)/i });
 }
 
 function test_constructor_all_options() {
-    // $ExpectType Mocha
-    new LocalMocha({
+    const m: Mocha = new LocalMocha({
         slow: 25,
         timeout: 25,
         ui: 'bdd',
@@ -1154,8 +1140,7 @@ function test_suite_events(suite: LocalMocha.Suite) {
         context;
         // $ExpectType string
         file;
-        // $ExpectType Mocha
-        mocha;
+        const m: Mocha = mocha;
     });
 
     // $ExpectType Suite
@@ -1164,8 +1149,7 @@ function test_suite_events(suite: LocalMocha.Suite) {
         module;
         // $ExpectType string
         file;
-        // $ExpectType Mocha
-        mocha;
+        const m: Mocha = mocha;
     });
 
     // $ExpectType Suite
@@ -1174,8 +1158,7 @@ function test_suite_events(suite: LocalMocha.Suite) {
         context;
         // $ExpectType string
         file;
-        // $ExpectType Mocha
-        mocha;
+        const m: Mocha = mocha;
     });
 }
 
@@ -1261,3 +1244,42 @@ function test_interfaces_common(suites: Mocha.Suite[], context: Mocha.MochaGloba
     funcs.test.skip(string);
     funcs.test.retries(number);
 }
+
+// mocha-typescript (https://www.npmjs.com/package/mocha-typescript/) augments
+// the mocha functions and enables them to work as test class decorators.
+declare module "mocha" {
+    interface SuiteFunction {
+        <TFunction extends Function>(target: TFunction): TFunction | void;
+    }
+    interface PendingSuiteFunction {
+        <TFunction extends Function>(target: TFunction): TFunction | void;
+    }
+    interface ExclusiveSuiteFunction {
+        <TFunction extends Function>(target: TFunction): TFunction | void;
+    }
+    interface TestFunction {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    interface PendingTestFunction {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+    interface ExclusiveTestFunction {
+        (target: Object, propertyKey: string | symbol): void;
+    }
+}
+
+@suite
+class TestClass1 {
+    @test method1() {}
+    @test.only method2() {}
+    @test.skip method3() {}
+}
+
+@suite.skip
+class TestClass2 {
+}
+
+@suite.only
+class TestClass3 {
+}
+// end of augmentations used by mocha-typescript
diff --git a/types/mocha/tsconfig.json b/types/mocha/tsconfig.json
index f26091927f..73966aa544 100644
--- a/types/mocha/tsconfig.json
+++ b/types/mocha/tsconfig.json
@@ -15,12 +15,11 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "experimentalDecorators": true
     },
     "files": [
         "index.d.ts",
-        "lib/ms.d.ts",
-        "lib/interfaces/common.d.ts",
         "mocha-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/mocha/tslint.json b/types/mocha/tslint.json
index 1e7d1ca65a..fce65c808b 100644
--- a/types/mocha/tslint.json
+++ b/types/mocha/tslint.json
@@ -5,6 +5,7 @@
         "interface-name": false,
         "ban-types": false,
         "no-single-declare-module": false,
-        "no-declare-current-package": false
+        "no-declare-current-package": false,
+        "callable-types": false
     }
 }
diff --git a/types/mock-knex/index.d.ts b/types/mock-knex/index.d.ts
index bad0aadb01..8a77dbbb14 100644
--- a/types/mock-knex/index.d.ts
+++ b/types/mock-knex/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
@@ -52,6 +52,11 @@ export interface Tracker extends EventEmitter {
         event: "query",
         callback: (query: QueryDetails, step: number) => void
     ): this;
+
+    once(
+        event: "query",
+        callback: (query: QueryDetails, step: number) => void
+    ): this;
 }
 
 /**
@@ -73,7 +78,7 @@ export interface QueryDetails extends Knex.Sql {
      *
      * @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;
+    response(values: any, options?: QueryDetailsResponseOption): void;
 }
 
 export interface QueryDetailsResponseOption {
diff --git a/types/mockjs/index.d.ts b/types/mockjs/index.d.ts
index a0ca673b0a..9be645b791 100644
--- a/types/mockjs/index.d.ts
+++ b/types/mockjs/index.d.ts
@@ -58,7 +58,7 @@ declare namespace mockjs {
     character(pool?: S): S;
 
     // Random.string
-    string(pool: S | N, min?: N, max?: N): S;
+    string(pool?: S | N, min?: N, max?: N): S;
 
     // Random.range
     range(start?: N, stop?: N, step?: N): N;
diff --git a/types/moment-duration-format/index.d.ts b/types/moment-duration-format/index.d.ts
index 1716d55d83..760b7b8263 100644
--- a/types/moment-duration-format/index.d.ts
+++ b/types/moment-duration-format/index.d.ts
@@ -90,3 +90,7 @@ declare module "moment" {
 
     type TemplateFunction = ((this: DurationFormatSettings) => string);
 }
+
+declare function momentDurationFormatSetup(_moment: typeof moment): void;
+
+export = momentDurationFormatSetup;
diff --git a/types/moment-duration-format/test/module-tests.ts b/types/moment-duration-format/test/module-tests.ts
new file mode 100644
index 0000000000..9178e9c414
--- /dev/null
+++ b/types/moment-duration-format/test/module-tests.ts
@@ -0,0 +1,4 @@
+import moment = require("moment");
+import momentDurationFormatSetup = require("moment-duration-format");
+
+momentDurationFormatSetup(moment);
diff --git a/types/moment-duration-format/tsconfig.json b/types/moment-duration-format/tsconfig.json
index 997b0f907e..b41c97ed28 100644
--- a/types/moment-duration-format/tsconfig.json
+++ b/types/moment-duration-format/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
-        "moment-duration-format-tests.ts"
+        "moment-duration-format-tests.ts",
+        "test/module-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/moment-shortformat/index.d.ts b/types/moment-shortformat/index.d.ts
new file mode 100644
index 0000000000..d5125aac49
--- /dev/null
+++ b/types/moment-shortformat/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for moment-shortformat 2.1
+// Project: https://github.com/researchgate/moment-shortformat#readme
+// Definitions by: whatasoda <https://github.com/whatasoda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace moment;
+
+import moment = require('moment');
+
+export = moment;
+
+declare module 'moment' {
+    interface Moment {
+        short(withoutPreOrSuffix?: boolean, now?: Moment): string;
+    }
+}
diff --git a/types/moment-shortformat/moment-shortformat-tests.ts b/types/moment-shortformat/moment-shortformat-tests.ts
new file mode 100644
index 0000000000..84f754a750
--- /dev/null
+++ b/types/moment-shortformat/moment-shortformat-tests.ts
@@ -0,0 +1,20 @@
+import moment = require('moment');
+import 'moment-shortformat';
+
+let formatted: string;
+/*~ Formats time relative to current time. */
+formatted = moment(moment().valueOf() + (36e5 * 5)).short(); // 'in 5h'
+formatted = moment(moment().valueOf() - (36e5 * 5)).short(); // '5h ago'
+formatted = moment(moment().valueOf() + (36e5 * 5)).short(true); // '5h'
+formatted = moment(moment().valueOf() - (36e5 * 5)).short(true); // '5h'
+
+/*~ Times greater than 1 week are converted to dates like Mar 7,
+ *~ or if the year of the date does not match the current year
+ *~ it is convert to Mar 7, 2031
+ */
+formatted = moment(moment().valueOf() + 6048e5).short(); // 'Mar 7'
+
+/*~ Using a different "now" */
+formatted = moment(moment().valueOf() + (36e5 * 5)).short(
+  false, moment(moment().valueOf() + (36e5 * 3))
+); // 'in 2h'
diff --git a/types/moment-shortformat/package.json b/types/moment-shortformat/package.json
new file mode 100644
index 0000000000..ce4991b0e9
--- /dev/null
+++ b/types/moment-shortformat/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": ">=2.22.2"
+    }
+}
diff --git a/types/moment-shortformat/tsconfig.json b/types/moment-shortformat/tsconfig.json
new file mode 100644
index 0000000000..96fd6c6524
--- /dev/null
+++ b/types/moment-shortformat/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-shortformat-tests.ts"
+    ]
+}
diff --git a/types/moment-shortformat/tslint.json b/types/moment-shortformat/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/moment-shortformat/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 fac79f728f..1d05b96f36 100644
--- a/types/moment-timezone/index.d.ts
+++ b/types/moment-timezone/index.d.ts
@@ -36,7 +36,7 @@ declare module "moment" {
         (date: moment.Moment, timezone: string): moment.Moment;
         (date: any, timezone: string): moment.Moment;
 
-        zone(timezone: string): MomentZone;
+        zone(timezone: string): MomentZone | null;
 
         add(packedZoneString: string): void;
         add(packedZoneString: string[]): void;
@@ -53,7 +53,7 @@ declare module "moment" {
         names(): string[];
         guess(ignoreCache?: boolean): string;
 
-        setDefault(timezone: string): void;
+        setDefault(timezone: string): MomentTimezone;
     }
 
     interface Moment {
diff --git a/types/money-math/index.d.ts b/types/money-math/index.d.ts
new file mode 100644
index 0000000000..a86734c477
--- /dev/null
+++ b/types/money-math/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for money-math 2.5
+// Project: https://github.com/ikr/money-math#readme
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Money;
+
+export function add(a: string, b: string): string;
+export function subtract(a: string, b: string): string;
+export function mul(a: string, b: string): string;
+export function div(a: string, b: string): string;
+export function percent(a: string, b: string): string;
+export function cmp(a: string, b: string): 0 | number;
+export function isEqual(a: string, b: string): boolean;
+export function isZero(value: string): boolean;
+export function isNegative(value: string): boolean;
+export function isPositive(value: string): boolean;
+export function floatToAmount(value: number): string;
+export function format(currency: 'CHF' | 'CNY' | 'EUR' | 'GBP' | 'JPY' | 'LTL' | 'PLN' | 'SEK' | 'SKK' | 'UAH' | 'USD' | string, value: string): string;
+export function roundUpTo5Cents(value: string): string;
+export function roundTo5Cents(value: string): string;
diff --git a/types/money-math/money-math-tests.ts b/types/money-math/money-math-tests.ts
new file mode 100644
index 0000000000..9b93824ca1
--- /dev/null
+++ b/types/money-math/money-math-tests.ts
@@ -0,0 +1,18 @@
+import * as money from 'money-math';
+
+money.add("16.11", "17.07");        // "33.18"
+money.subtract("16.00", "7.00");    // "9.00"
+money.mul("24.00", "0.25");         // "6.00"
+money.div("64.00", "2.00");         // "32.00"
+money.percent("200.00", "3.25");    // "6.50"
+money.cmp("100.00", "200.00");      // -1
+money.isEqual("100.00", "100.00");  // true
+money.isZero("0.00");               // true
+money.isNegative("-1.00");          // true
+money.isPositive("-1.00");          // false
+
+money.format("JPY", "236800.00");   // "236,800"
+money.floatToAmount(56.345);        // "56.35"
+
+money.roundUpTo5Cents("42.02");     // "42.05"
+money.roundTo5Cents("442.26");      // "442.25"
diff --git a/types/money-math/tsconfig.json b/types/money-math/tsconfig.json
new file mode 100644
index 0000000000..fd8b7d167d
--- /dev/null
+++ b/types/money-math/tsconfig.json
@@ -0,0 +1,23 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": [
+			"es6"
+		],
+		"strictFunctionTypes": true,
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts",
+		"money-math-tests.ts"
+	]
+}
\ No newline at end of file
diff --git a/types/money-math/tslint.json b/types/money-math/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/money-math/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mongodb-memory-server/index.d.ts b/types/mongodb-memory-server/index.d.ts
new file mode 100644
index 0000000000..bfb14ed97d
--- /dev/null
+++ b/types/mongodb-memory-server/index.d.ts
@@ -0,0 +1,153 @@
+// Type definitions for mongodb-memory-server 1.8
+// Project: https://github.com/nodkz/mongodb-memory-server
+// Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import { ChildProcess } from "child_process";
+
+import MongoMemoryServer = _MongoMemoryServer.MongoMemoryServer;
+import MongoInstance = _MongoInstance.MongodbInstance;
+import MongoBinary = _MongoBinary.MongoBinary;
+
+export default MongoMemoryServer;
+export { MongoMemoryServer, MongoInstance, MongoBinary };
+
+// exports from the ./util/MongoBinary.js.flow file
+declare namespace _MongoBinary {
+    interface MongoBinaryCache {
+        [version: string]: string;
+    }
+
+    interface MongoBinaryOpts {
+        version?: string;
+        downloadDir?: string;
+        platform?: string;
+        arch?: string;
+        debug?: boolean | ((...args: any[]) => any);
+    }
+
+    // disable error for a class with all static functions,
+    // so the TypeScript declaration would map the implementation with flow types for easier support.
+    // tslint:disable-next-line:no-unnecessary-class
+    class MongoBinary {
+        static cache: MongoBinaryCache;
+
+        static getPath(opts?: MongoBinaryOpts): Promise<string>;
+        static hasValidBinPath(files: string[]): boolean;
+    }
+}
+
+// exports from the ./util/MongoInstance.js.flow file
+declare namespace _MongoInstance {
+    interface MongodOps {
+        // instance options
+        instance: {
+            port: number,
+            storageEngine?: string,
+            dbPath: string,
+            debug?: boolean | ((...args: any[]) => any),
+        };
+
+        // mongo binary options
+        binary?: _MongoBinary.MongoBinaryOpts;
+
+        // child process spawn options
+        spawn?: {
+            cwd?: string,
+            env?: object,
+            argv0?: string,
+            stdio?: string | any[],
+            detached?: boolean,
+            uid?: number,
+            gid?: number,
+            shell?: boolean | string,
+        };
+
+        debug?: boolean | ((...args: any[]) => any);
+    }
+
+    class MongodbInstance {
+        static childProcessList: ChildProcess[];
+
+        opts: MongodOps;
+        debug: ((...args: any[]) => any);
+        childProcess: ChildProcess;
+        killerProcess: ChildProcess;
+        instanceReady: ((...args: any[]) => any);
+        instanceFailed: ((...args: any[]) => any);
+
+        static run(opts: MongodOps): Promise<MongodbInstance>;
+
+        constructor(opts: MongodOps);
+
+        prepareCommandArgs(): string[];
+        run(): Promise<MongodbInstance>;
+        kill(): Promise<MongodbInstance>;
+        getPid(): number | undefined;
+        _launchMongod(mongoBin: string): ChildProcess;
+        _launchKiller(parentPid: number, childPid: number): ChildProcess;
+        errorHandler(err: string): void;
+        closeHandler(code: number): void;
+        stderrHandler(message: string | Buffer): void;
+        stdoutHandler(message: string | Buffer): void;
+    }
+}
+
+// exports from the MongoMemoryServer.js.flow file
+declare namespace _MongoMemoryServer {
+    interface MongoMemoryServerOptsT {
+        instance: {
+            port?: number,
+            dbPath?: string,
+            dbName?: string,
+            storageEngine?: string,
+            debug?: boolean | ((...args: any[]) => any),
+        };
+        binary: {
+            version?: string,
+            downloadDir?: string,
+            platform?: string,
+            arch?: string,
+            debug?: boolean | ((...args: any[]) => any),
+        };
+        debug?: boolean;
+        spawn: any;
+        autoStart?: boolean;
+    }
+
+    interface MongoInstanceDataT {
+        port: number;
+        dbPath: string;
+        dbName: string;
+        uri: string;
+        storageEngine: string;
+        instance: _MongoInstance.MongodbInstance;
+        childProcess: ChildProcess;
+        tmpDir?: {
+            name: string,
+            removeCallback: ((...args: any[]) => any),
+        };
+    }
+
+    class MongoMemoryServer {
+        isRunning: boolean;
+        runningInstance: Promise<MongoInstanceDataT> | undefined;
+        opts: MongoMemoryServerOptsT;
+        debug: ((...args: any[]) => any);
+
+        constructor(opts?: Partial<MongoMemoryServerOptsT>);
+
+        start(): Promise<boolean>;
+        _startUpInstance(): Promise<MongoInstanceDataT>;
+        stop(): Promise<boolean>;
+        getInstanceData(): Promise<MongoInstanceDataT>;
+        getUri(otherDbName?: string | boolean): Promise<string>;
+        getConnectionString(otherDbName?: string | boolean): Promise<string>;
+        getPort(): Promise<number>;
+        getDbPath(): Promise<string>;
+        getDbName(): Promise<string>;
+    }
+}
diff --git a/types/mongodb-memory-server/mongodb-memory-server-tests.ts b/types/mongodb-memory-server/mongodb-memory-server-tests.ts
new file mode 100644
index 0000000000..62abb2651b
--- /dev/null
+++ b/types/mongodb-memory-server/mongodb-memory-server-tests.ts
@@ -0,0 +1,15 @@
+import MongodbMemoryServer from 'mongodb-memory-server';
+
+// Simple server start example from https://www.npmjs.com/package/mongodb-memory-server
+async function simpleServerStart() {
+    const mongod = new MongodbMemoryServer();
+
+    const uri = await mongod.getConnectionString();
+    const port = await mongod.getPort();
+    const dbPath = await mongod.getDbPath();
+    const dbName = await mongod.getDbName();
+
+    // you may stop mongod manually
+    mongod.stop();
+    // or it will be stopped automatically when you exit from script
+}
diff --git a/types/mongodb-memory-server/tsconfig.json b/types/mongodb-memory-server/tsconfig.json
new file mode 100644
index 0000000000..29046ccb01
--- /dev/null
+++ b/types/mongodb-memory-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",
+        "mongodb-memory-server-tests.ts"
+    ]
+}
diff --git a/types/mongodb-memory-server/tslint.json b/types/mongodb-memory-server/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mongodb-memory-server/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mongodb-uri/index.d.ts b/types/mongodb-uri/index.d.ts
new file mode 100644
index 0000000000..6d6d9c1839
--- /dev/null
+++ b/types/mongodb-uri/index.d.ts
@@ -0,0 +1,101 @@
+// Type definitions for mongodb-uri 0.9
+// Project: https://github.com/mongolab/mongodb-uri-node
+// Definitions by: mernxl <https://github.com/mernxl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface Host {
+    host: string;
+    port?: number;
+}
+
+export interface parserOptions {
+    scheme: string;
+}
+
+export interface UriObject {
+    scheme: string;
+    hosts: Host[];
+
+    username?: string;
+    password?: string;
+    database?: string;
+    options?: any;
+}
+
+export class MongodbUriParser {
+    constructor(options?: parserOptions);
+
+    /**
+     * Takes a URI of the form:
+     *
+     *   mongodb://[username[:password]@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database]][?options]
+     *
+     * scheme and hosts will always be present. Other fields will only be present in the result if they were
+     * present in the input.
+     */
+    parse(uri: string): UriObject;
+
+    /**
+     * Takes a URI object and returns a URI string of the form:
+     *
+     *   mongodb://[username[:password]@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database]][?options]
+     *
+     */
+    format(uriObject?: UriObject): string;
+
+    /**
+     * Takes either a URI object or string and returns a Mongoose connection string. Specifically, instead of listing all
+     * hosts and ports in a single URI, a Mongoose connection string contains a list of URIs each with a single host and
+     * port pair.
+     *
+     * Useful in environments where a MongoDB URI environment variable is provided, but needs to be programmatically
+     * transformed into a string digestible by mongoose.connect()--for example, when deploying to a PaaS like Heroku
+     * using a MongoDB add-on like MongoLab.
+     *
+     */
+    formatMongoose(uri: UriObject | string): string;
+}
+
+/**
+ * Takes a URI of the form:
+ *
+ *   mongodb://[username[:password]@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database]][?options]
+ *
+ * and returns an object of the form:
+ *
+ *   {
+ *     scheme: !String,
+ *     username: String=,
+ *     password: String=,
+ *     hosts: [ { host: !String, port: Number= }, ... ],
+ *     database: String=,
+ *     options: Object=
+ *   }
+ *
+ * scheme and hosts will always be present. Other fields will only be present in the result if they were
+ * present in the input.
+ *
+ */
+export function parse(uri: string): UriObject;
+
+/**
+ * Takes a URI object and returns a URI string of the form:
+ *
+ *   mongodb://[username[:password]@]host1[:port1][,host2[:port2],...[,hostN[:portN]]][/[database]][?options]
+ *
+ * @param uriObject
+ */
+export function format(uriObject?: UriObject): string;
+
+/**
+ * Takes either a URI object or string and returns a Mongoose connection string. Specifically, instead of listing all
+ * hosts and ports in a single URI, a Mongoose connection string contains a list of URIs each with a single host and
+ * port pair.
+ *
+ * Useful in environments where a MongoDB URI environment variable is provided, but needs to be programmatically
+ * transformed into a string digestible by mongoose.connect()--for example, when deploying to a PaaS like Heroku
+ * using a MongoDB add-on like MongoLab.
+ *
+ * @param  uri
+ */
+export function formatMongoose(uri: UriObject | string): string;
diff --git a/types/mongodb-uri/mongodb-uri-tests.ts b/types/mongodb-uri/mongodb-uri-tests.ts
new file mode 100644
index 0000000000..2befe964ed
--- /dev/null
+++ b/types/mongodb-uri/mongodb-uri-tests.ts
@@ -0,0 +1,12 @@
+import { format, formatMongoose, MongodbUriParser, parse } from 'mongodb-uri';
+
+const urlString = 'mongodb://localhost';
+const parser = new MongodbUriParser();
+
+const parsed1 = parser.parse(urlString);
+const urlString1 = parser.format(parsed1);
+const formatMongoose1 = parser.formatMongoose(parsed1);
+
+const parsed2 = parse(urlString);
+const urlString2 = format(parsed2);
+const formatMongoose2 = formatMongoose(parsed2);
diff --git a/types/mongodb-uri/tsconfig.json b/types/mongodb-uri/tsconfig.json
new file mode 100644
index 0000000000..68ca627c9a
--- /dev/null
+++ b/types/mongodb-uri/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",
+        "mongodb-uri-tests.ts"
+    ]
+}
diff --git a/types/mongodb-uri/tslint.json b/types/mongodb-uri/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/mongodb-uri/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/mongodb/index.d.ts b/types/mongodb/index.d.ts
index 273a0716b2..5791b906f1 100644
--- a/types/mongodb/index.d.ts
+++ b/types/mongodb/index.d.ts
@@ -1,8 +1,7 @@
-// Type definitions for MongoDB v3.0
+// Type definitions for MongoDB v3.1
 // 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>
@@ -10,10 +9,15 @@
 //                 Alexander Christie <https://github.com/AJCStriker>
 //                 Julien Chaumond <https://github.com/julien-c>
 //                 Dan Aprahamian <https://github.com/daprahamian>
+//                 Denys Bushulyak <https://github.com/denys-bushulyak>
+//                 Bastien Arata <https://github.com/BastienAr>
+//                 Wan Bachtiar <https://github.com/sindbach>
+//                 Geraldine Lemeur <https://github.com/geraldinelemeur>
+//                 Jimmy Shimizu <https://github.com/jishi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-// Documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/
+// Documentation : http://mongodb.github.io/node-mongodb-native/3.1/api/
 
 /// <reference types="node" />
 /// <reference types="bson" />
@@ -22,38 +26,38 @@ 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 function connect(uri: string, options?: MongoClientOptions): Promise<MongoClient>;
+export function connect(uri: string, callback: MongoCallback<MongoClient>): void;
+export function connect(uri: string, options: MongoClientOptions, callback: MongoCallback<MongoClient>): void;
 
-export { Binary, Double, Long, Decimal128, MaxKey, MinKey, ObjectID, ObjectId, Timestamp, DBRef } from 'bson';
+export { Binary, DBRef, Decimal128, Double, Long, MaxKey, MinKey, ObjectID, ObjectId, Timestamp } from 'bson';
 
-// Class documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html
+// Class documentation : http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html
 export class MongoClient extends EventEmitter {
     constructor(uri: string, options?: MongoClientOptions);
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#.connect */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/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
+     * http://mongodb.github.io/node-mongodb-native/3.1/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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#db */
     db(dbName?: string, options?: MongoClientCommonOption): Db
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#isConnected */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#isConnected */
     isConnected(options?: MongoClientCommonOption): boolean;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoClient.html#logout */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#startSession */
     startSession(options?: any): ClientSession;
 }
 
@@ -74,14 +78,14 @@ export interface MongoCallback<T> {
     (error: MongoError, result: T): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/MongoError.html */
+/** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/MongoClient.html#.connect */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/MongoClient.html#.connect */
 export interface MongoClientOptions extends
     DbCreateOptions,
     ServerOptions,
@@ -101,7 +105,9 @@ export interface MongoClientOptions extends
     auth?: {
         user: string;
         password: string;
-    }
+    },
+    // Determines whether or not to use the new url parser
+    useNewUrlParser?: boolean
 }
 
 export interface SSLOptions {
@@ -142,7 +148,7 @@ export interface HighAvailabilityOptions {
     domainsEnabled?: boolean;
 }
 
-// See http://mongodb.github.io/node-mongodb-native/3.0/api/ReadPreference.html
+// See http://mongodb.github.io/node-mongodb-native/3.1/api/ReadPreference.html
 export class ReadPreference {
     constructor(mode: string, tags: Object);
     mode: string;
@@ -157,7 +163,7 @@ export class ReadPreference {
     static isValid(mode: string): boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html */
 export interface DbCreateOptions extends CommonOptions {
     // If the database authentication is dependent on another databaseName.
     authSource?: string;
@@ -190,21 +196,23 @@ export interface DbCreateOptions extends CommonOptions {
     bufferMaxEntries?: number;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/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 KeepAlive enabled on the socket. default:true
+    keepAlive?: boolean;
+    // TCP KeepAlive initial delay before sending first keep-alive packet when idle. default:300000
+    keepAliveInitialDelay?: number;
     // TCP Connection timeout setting. default 0
     connectTimeoutMS?: number;
     // TCP Socket timeout setting. default 0
     socketTimeoutMS?: number;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Server.html */
 export interface ServerOptions extends SSLOptions {
     // Default: 30;
     reconnectTries?: number;
@@ -219,14 +227,14 @@ export interface ServerOptions extends SSLOptions {
     domainsEnabled?: boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Mongos.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/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/3.0/api/ReplSet.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/ReplSet.html */
 export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
     // The max staleness to secondary reads (values under 10 seconds cannot be guaranteed);
     maxStalenessSeconds?: number;
@@ -240,7 +248,7 @@ export interface ReplSetOptions extends SSLOptions, HighAvailabilityOptions {
 
 export type ProfilingLevel = 'off' | 'slow_only' | 'all';
 
-// Class documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html
+// Class documentation : http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html
 export class Db extends EventEmitter {
     constructor(databaseName: string, serverConfig: Server | ReplSet | Mongos, options?: DbCreateOptions);
 
@@ -252,69 +260,69 @@ export class Db extends EventEmitter {
     slaveOk: boolean;
     writeConcern: any;
 
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#addUser */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#admin */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#admin */
     admin(): Admin;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#collection */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#collections */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#collections */
     collections(): Promise<Collection<Default>[]>;
     collections(callback: MongoCallback<Collection<Default>[]>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#command */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#createCollection */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#createIndex */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#dropCollection */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#dropCollection */
     dropCollection(name: string): Promise<boolean>;
     dropCollection(name: string, callback: MongoCallback<boolean>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#dropDatabase */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#dropDatabase */
     dropDatabase(): Promise<any>;
     dropDatabase(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#executeDbAdminCommand */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#indexInformation */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#listCollections */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#profilingInfo */
     /** @deprecated Query the system.profile collection directly. */
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#profilingLevel */
     profilingLevel(callback: MongoCallback<ProfilingLevel>): void;
     profilingLevel(options?: { session?: ClientSession }): Promise<ProfilingLevel>;
     profilingLevel(options: { session?: ClientSession }, callback: MongoCallback<ProfilingLevel>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#removeUser */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#removeUser */
     removeUser(username: string, callback: MongoCallback<any>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#setProfilingLevel */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#setProfilingLevel */
     setProfilingLevel(level: ProfilingLevel, callback: MongoCallback<ProfilingLevel>): void;
     setProfilingLevel(level: ProfilingLevel, options?: { session?: ClientSession }): Promise<ProfilingLevel>;
     setProfilingLevel(level: ProfilingLevel, options: { session?: ClientSession }, callback: MongoCallback<ProfilingLevel>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#stats */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#stats */
     stats(callback: MongoCallback<any>): void;
     stats(options?: { scale?: number }): Promise<any>;
     stats(options: { scale?: number }, callback: MongoCallback<any>): void;
@@ -331,34 +339,34 @@ export interface CommonOptions {
     session?: ClientSession;
 }
 
-// Deprecated http://mongodb.github.io/node-mongodb-native/3.0/api/Server.html
+// Deprecated http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/ReplSet.html
+// Deprecated http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/ReplSet.html
+// Deprecated http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Db.html#addUser */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#addUser */
 export interface DbAddUserOptions extends CommonOptions {
     customData?: Object;
     roles?: Object[];
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#createCollection */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#createCollection */
 export interface CollectionCreateOptions extends CommonOptions {
     raw?: boolean;
     pkFactory?: Object;
@@ -380,7 +388,7 @@ export interface CollectionCreateOptions extends CommonOptions {
     collation?: object;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#collection */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#collection */
 export interface DbCollectionOptions extends CommonOptions {
     raw?: boolean;
     pkFactory?: Object;
@@ -390,7 +398,7 @@ export interface DbCollectionOptions extends CommonOptions {
     readConcern?: { level: Object };
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Db.html#createIndex */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Db.html#createIndex */
 export interface IndexOptions extends CommonOptions {
     // Creates an unique index.
     unique?: boolean;
@@ -415,59 +423,60 @@ export interface IndexOptions extends CommonOptions {
     // Creates a partial index based on the given filter object (MongoDB 3.2 or higher)
     partialFilterExpression?: any;
     collation?: Object;
+    default_language?: string
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html */
 export interface Admin {
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#addUser */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Admin.html#buildInfo */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#buildInfo */
     buildInfo(): Promise<any>;
     buildInfo(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#command */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Admin.html#listDatabases */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#listDatabases */
     listDatabases(): Promise<any>;
     listDatabases(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#ping */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#ping */
     ping(): Promise<any>;
     ping(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#removeUser */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Admin.html#replSetGetStatus */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#replSetGetStatus */
     replSetGetStatus(): Promise<any>;
     replSetGetStatus(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#serverInfo */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#serverInfo */
     serverInfo(): Promise<any>;
     serverInfo(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#serverStatus */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#serverStatus */
     serverStatus(): Promise<any>;
     serverStatus(callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#validateCollection */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Admin.html#addUser */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#addUser */
 export interface AddUserOptions extends CommonOptions {
     fsync: boolean;
     customData?: Object;
     roles?: Object[]
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Admin.html#removeUser */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Admin.html#removeUser */
 export interface FSyncOptions extends CommonOptions {
     fsync?: boolean
 }
 
-// Documentation : http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html
+// Documentation : http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html
 export interface Collection<TSchema = Default> {
     // Get the collection name.
     collectionName: string;
@@ -480,175 +489,190 @@ export interface Collection<TSchema = Default> {
     // Get current index hint for collection.
     hint: any;
     /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#aggregate */
+    aggregate<T = TSchema>(callback: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
     aggregate<T = TSchema>(pipeline: Object[], callback: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
-    aggregate<T = TSchema>(pipeline: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
+    aggregate<T = TSchema>(pipeline?: Object[], options?: CollectionAggregationOptions, callback?: MongoCallback<AggregationCursor<T>>): AggregationCursor<T>;
     /** 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/3.0/api/Collection.html#count */
+    bulkWrite(operations: Object[], options?: CollectionBulkWriteOptions): Promise<BulkWriteOpResultObject>;
+    bulkWrite(operations: Object[], options: CollectionBulkWriteOptions, callback: MongoCallback<BulkWriteOpResultObject>): void;
+    /**
+     * http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#count
+     * @deprecated Use countDocuments or estimatedDocumentCount
+     */
+    count(callback: MongoCallback<number>): void;
     count(query: Object, callback: MongoCallback<number>): void;
-    count(query: Object, options?: MongoCountPreferences): Promise<number>;
+    count(query?: Object, options?: MongoCountPreferences): Promise<number>;
     count(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#createIndex */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#countDocuments */
+    countDocuments(callback: MongoCallback<number>): void;
+    countDocuments(query: Object, callback: MongoCallback<number>): void;
+    countDocuments(query?: Object, options?: MongoCountPreferences): Promise<number>;
+    countDocuments(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#createIndexes and  http://docs.mongodb.org/manual/reference/command/createIndexes/ */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#createIndexes and  http://docs.mongodb.org/manual/reference/command/createIndexes/ */
     createIndexes(indexSpecs: Object[], callback: MongoCallback<any>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#deleteMany */
     deleteMany(filter: FilterQuery<TSchema>, callback: MongoCallback<DeleteWriteOpResultObject>): void;
     deleteMany(filter: FilterQuery<TSchema>, options?: CommonOptions): Promise<DeleteWriteOpResultObject>;
     deleteMany(filter: FilterQuery<TSchema>, options: CommonOptions, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#deleteOne */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#deleteOne */
     deleteOne(filter: FilterQuery<TSchema>, callback: MongoCallback<DeleteWriteOpResultObject>): void;
     deleteOne(filter: FilterQuery<TSchema>, options?: CommonOptions & { bypassDocumentValidation?: boolean }): Promise<DeleteWriteOpResultObject>;
     deleteOne(filter: FilterQuery<TSchema>, options: CommonOptions & { bypassDocumentValidation?: boolean }, callback: MongoCallback<DeleteWriteOpResultObject>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#distinct */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#distinct */
     distinct(key: string, query: Object, callback: MongoCallback<any>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#drop */
     drop(options?: {session: ClientSession}): Promise<any>;
     drop(callback: MongoCallback<any>): void;
     drop(options: {session: ClientSession}, callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#dropIndex */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#dropIndex */
     dropIndex(indexName: string, callback: MongoCallback<any>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#dropIndexes */
     dropIndexes(options?: {session?: ClientSession, maxTimeMS?: number}): Promise<any>;
     dropIndexes(callback?: MongoCallback<any>): void;
     dropIndexes(options: {session?: ClientSession, maxTimeMS?: number}, callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#find */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#estimatedDocumentCount */
+    estimatedDocumentCount(callback: MongoCallback<number>): void;
+    estimatedDocumentCount(query: Object, callback: MongoCallback<number>): void;
+    estimatedDocumentCount(query?: Object, options?: MongoCountPreferences): Promise<number>;
+    estimatedDocumentCount(query: Object, options: MongoCountPreferences, callback: MongoCallback<number>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#find */
     find<T = TSchema>(query?: FilterQuery<TSchema>): Cursor<T>;
     /** @deprecated */
     find<T = TSchema>(query: FilterQuery<TSchema>, options?: FindOneOptions): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOne */
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, callback: MongoCallback<T | null>): void;
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, options?: FindOneOptions): Promise<T | null>;
     findOne<T = TSchema>(filter: FilterQuery<TSchema>, options: FindOneOptions, callback: MongoCallback<T | null>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndDelete */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndDelete */
     findOneAndDelete(filter: FilterQuery<TSchema>, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     findOneAndDelete(filter: FilterQuery<TSchema>, options?: { projection?: Object, sort?: Object, maxTimeMS?: number, session?: ClientSession }): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
     findOneAndDelete(filter: FilterQuery<TSchema>, 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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndReplace */
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
     findOneAndReplace(filter: FilterQuery<TSchema>, replacement: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndUpdate */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndUpdate */
     findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
     findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, options?: FindOneAndReplaceOption): Promise<FindAndModifyWriteOpResultObject<TSchema>>;
     findOneAndUpdate(filter: FilterQuery<TSchema>, update: Object, options: FindOneAndReplaceOption, callback: MongoCallback<FindAndModifyWriteOpResultObject<TSchema>>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoHaystackSearch */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#geoNear */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#group */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#indexes */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#indexes */
     indexes(options?: {session: ClientSession}): Promise<any>;
     indexes(callback: MongoCallback<any>): void;
     indexes(options: {session?: ClientSession}, callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#indexExists */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#indexExists */
     indexExists(indexes: string | string[], callback: MongoCallback<boolean>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#indexInformation */
     indexInformation(callback: MongoCallback<any>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#initializeOrderedBulkOp */
     initializeOrderedBulkOp(options?: CommonOptions): OrderedBulkOperation;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#initializeUnorderedBulkOp */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#initializeUnorderedBulkOp */
     initializeUnorderedBulkOp(options?: CommonOptions): UnorderedBulkOperation;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertOne */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#insertMany */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#insertOne */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#isCapped */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#isCapped */
     isCapped(options?: {session: ClientSession}): Promise<any>;
     isCapped(callback: MongoCallback<any>): void;
     isCapped(options: {session: ClientSession}, callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#listIndexes */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#options */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#options */
     options(options?: {session: ClientSession}): Promise<any>;
     options(callback: MongoCallback<any>): void;
     options(options: {session: ClientSession}, callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#parallelCollectionScan */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/Collection.html#reIndex */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#reIndex */
     reIndex(options?: {session: ClientSession}): Promise<any>;
     reIndex(callback: MongoCallback<any>): void;
     reIndex(options: {session: ClientSession}, callback: MongoCallback<any>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#remove */
+    /** http://mongodb.github.io/node-mongodb-native/3.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?: CommonOptions & { single?: boolean }): Promise<WriteOpResult>;
     /** @deprecated Use use deleteOne, deleteMany or bulkWrite */
     remove(selector: Object, options?: CommonOptions & { single?: boolean }, callback?: MongoCallback<WriteOpResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#rename */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#rename */
     rename(newName: string, callback: MongoCallback<Collection<TSchema>>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#replaceOne */
     replaceOne(filter: FilterQuery<TSchema>, doc: Object, callback: MongoCallback<ReplaceWriteOpResult>): void;
     replaceOne(filter: FilterQuery<TSchema>, doc: Object, options?: ReplaceOneOptions): Promise<ReplaceWriteOpResult>;
     replaceOne(filter: FilterQuery<TSchema>, doc: Object, options: ReplaceOneOptions, callback: MongoCallback<ReplaceWriteOpResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#save */
+    /** http://mongodb.github.io/node-mongodb-native/3.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?: CommonOptions): Promise<WriteOpResult>;
     /** @deprecated Use insertOne, insertMany, updateOne or updateMany */
     save(doc: Object, options: CommonOptions, callback: MongoCallback<WriteOpResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#stats */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#stats */
     stats(callback: MongoCallback<CollStats>): void;
     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 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#update */
     /** @deprecated use updateOne, updateMany or bulkWrite */
     update(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<WriteOpResult>): void;
     /** @deprecated use updateOne, updateMany or bulkWrite */
     update(filter: FilterQuery<TSchema>, update: Object, options?: ReplaceOneOptions & { multi?: boolean }): Promise<WriteOpResult>;
     /** @deprecated use updateOne, updateMany or bulkWrite */
     update(filter: FilterQuery<TSchema>, update: Object, options: ReplaceOneOptions & { multi?: boolean }, callback: MongoCallback<WriteOpResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#updateMany */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#updateMany */
     updateMany(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
     updateMany(filter: FilterQuery<TSchema>, update: Object, options?: CommonOptions & { upsert?: boolean }): Promise<UpdateWriteOpResult>;
     updateMany(filter: FilterQuery<TSchema>, update: Object, options: CommonOptions & { upsert?: boolean }, callback: MongoCallback<UpdateWriteOpResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#updateOne */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#updateOne */
     updateOne(filter: FilterQuery<TSchema>, update: Object, callback: MongoCallback<UpdateWriteOpResult>): void;
     updateOne(filter: FilterQuery<TSchema>, update: Object, options?: ReplaceOneOptions): Promise<UpdateWriteOpResult>;
     updateOne(filter: FilterQuery<TSchema>, update: Object, options: ReplaceOneOptions, callback: MongoCallback<UpdateWriteOpResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#watch */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#watch */
     watch(pipeline?: Object[], options?: ChangeStreamOptions & { session?: ClientSession }): ChangeStream;
 }
 
@@ -867,7 +891,7 @@ export interface WiredTigerData {
     };
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#aggregate */
+/** http://mongodb.github.io/node-mongodb-native/3.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
@@ -893,7 +917,7 @@ export interface CollectionAggregationOptions {
 
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertMany */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#insertMany */
 export interface CollectionInsertManyOptions extends CommonOptions {
     // Serialize functions on any object.
     serializeFunctions?: boolean;
@@ -905,17 +929,19 @@ export interface CollectionInsertManyOptions extends CommonOptions {
     ordered?: boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#bulkWrite */
-export interface CollectionBluckWriteOptions extends CommonOptions {
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#bulkWrite */
+export interface CollectionBulkWriteOptions extends CommonOptions {
     // 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;
+    //Force server to assign _id values instead of driver.
+    forceServerObjectId?: boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~BulkWriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~BulkWriteOpResult */
 export interface BulkWriteOpResultObject {
     insertedCount?: number;
     matchedCount?: number;
@@ -927,7 +953,7 @@ export interface BulkWriteOpResultObject {
     result?: any;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#count */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#count */
 export interface MongoCountPreferences {
     // The limit of documents to count.
     limit?: number;
@@ -941,7 +967,7 @@ export interface MongoCountPreferences {
     session?: ClientSession;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~deleteWriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~deleteWriteOpResult */
 export interface DeleteWriteOpResultObject {
     //The raw result returned from MongoDB, field will vary depending on server version.
     result: {
@@ -956,7 +982,7 @@ export interface DeleteWriteOpResultObject {
     deletedCount?: number;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~findAndModifyWriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~findAndModifyWriteOpResult */
 export interface FindAndModifyWriteOpResultObject<TSchema = Default> {
     //Document returned from findAndModify command.
     value?: TSchema;
@@ -966,7 +992,7 @@ export interface FindAndModifyWriteOpResultObject<TSchema = Default> {
     ok?: number;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOneAndReplace */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOneAndReplace */
 export interface FindOneAndReplaceOption {
     projection?: Object;
     sort?: Object;
@@ -976,7 +1002,7 @@ export interface FindOneAndReplaceOption {
     session?: ClientSession;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoHaystackSearch */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#geoHaystackSearch */
 export interface GeoHaystackSearchOptions {
     readPreference?: ReadPreference | string;
     maxDistance?: number;
@@ -985,7 +1011,7 @@ export interface GeoHaystackSearchOptions {
     session?: ClientSession;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#geoNear */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#geoNear */
 export interface GeoNearOptions {
     readPreference?: ReadPreference | string;
     num?: number;
@@ -998,27 +1024,27 @@ export interface GeoNearOptions {
     includeLocs?: boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Code.html */
+/** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/OrderedBulkOperation.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/OrderedBulkOperation.html */
 export interface OrderedBulkOperation {
     length: number;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/OrderedBulkOperation.html#execute */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/OrderedBulkOperation.html#find */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/OrderedBulkOperation.html#find */
     find(selector: Object): FindOperatorsOrdered;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/OrderedBulkOperation.html#insert */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/OrderedBulkOperation.html#insert */
     insert(doc: Object): OrderedBulkOperation;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/BulkWriteResult.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/BulkWriteResult.html */
 export interface BulkWriteResult {
     ok: number;
     nInserted: number;
@@ -1039,7 +1065,7 @@ export interface BulkWriteResult {
     hasWriteErrors(): boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/WriteError.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/WriteError.html */
 export interface WriteError {
     //Write concern error code.
     code: number;
@@ -1049,7 +1075,7 @@ export interface WriteError {
     errmsg: string;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/WriteConcernError.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/WriteConcernError.html */
 export interface WriteConcernError {
     //Write concern error code.
     code: number;
@@ -1057,7 +1083,7 @@ export interface WriteConcernError {
     errmsg: string;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/FindOperatorsOrdered.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/FindOperatorsOrdered.html */
 export interface FindOperatorsOrdered {
     delete(): OrderedBulkOperation;
     deleteOne(): OrderedBulkOperation;
@@ -1067,21 +1093,21 @@ export interface FindOperatorsOrdered {
     upsert(): FindOperatorsOrdered;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/UnorderedBulkOperation.html */
 export interface UnorderedBulkOperation {
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/lib_bulk_unordered.js.html line 339 */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/lib_bulk_unordered.js.html line 339 */
     length: number;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html#execute */
+    /** http://mongodb.github.io/node-mongodb-native/3.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/3.0/api/UnorderedBulkOperation.html#find */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/UnorderedBulkOperation.html#find */
     find(selector: Object): FindOperatorsUnordered;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/UnorderedBulkOperation.html#insert */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/UnorderedBulkOperation.html#insert */
     insert(doc: Object): UnorderedBulkOperation;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/FindOperatorsUnordered.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/FindOperatorsUnordered.html */
 export interface FindOperatorsUnordered {
     length: number;
     remove(): UnorderedBulkOperation;
@@ -1092,7 +1118,7 @@ export interface FindOperatorsUnordered {
     upsert(): FindOperatorsUnordered;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#findOne */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#findOne */
 export interface FindOneOptions {
     limit?: number;
     sort?: Array<any> | Object;
@@ -1122,7 +1148,7 @@ export interface FindOneOptions {
     session?: ClientSession;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~insertWriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~insertWriteOpResult */
 export interface InsertWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
@@ -1131,7 +1157,7 @@ export interface InsertWriteOpResult {
     result: { ok: number, n: number }
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#insertOne */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#insertOne */
 export interface CollectionInsertOneOptions extends CommonOptions {
     // Serialize functions on any object.
     serializeFunctions?: boolean;
@@ -1141,7 +1167,7 @@ export interface CollectionInsertOneOptions extends CommonOptions {
     bypassDocumentValidation?: boolean
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~insertOneWriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~insertOneWriteOpResult */
 export interface InsertOneWriteOpResult {
     insertedCount: number;
     ops: Array<any>;
@@ -1150,7 +1176,7 @@ export interface InsertOneWriteOpResult {
     result: { ok: number, n: number }
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#parallelCollectionScan */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#parallelCollectionScan */
 export interface ParallelCollectionScanOptions {
     readPreference?: ReadPreference | string;
     batchSize?: number;
@@ -1159,13 +1185,13 @@ export interface ParallelCollectionScanOptions {
     session?: ClientSession;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#replaceOne */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#replaceOne */
 export interface ReplaceOneOptions extends CommonOptions {
     upsert?: boolean;
     bypassDocumentValidation?: boolean;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~updateWriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~updateWriteOpResult */
 export interface UpdateWriteOpResult {
     result: { ok: number, n: number, nModified: number };
     connection: any;
@@ -1180,7 +1206,7 @@ export interface ReplaceWriteOpResult extends UpdateWriteOpResult {
     ops: Array<any>
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#mapReduce */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#mapReduce */
 export interface MapReduceOptions {
     readPreference?: ReadPreference | string;
     out?: Object;
@@ -1196,106 +1222,107 @@ export interface MapReduceOptions {
     session?: ClientSession;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Collection.html#~WriteOpResult */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#~WriteOpResult */
 export interface WriteOpResult {
     ops: Array<any>;
     connection: any;
     result: any;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#~resultCallback */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#~resultCallback */
 export type CursorResult = any | void | boolean;
 
 type Default = any;
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html */
 export class Cursor<T = Default> extends Readable {
 
     sortValue: string;
     timeout: boolean;
     readPreference: ReadPreference;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#addCursorFlag */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#addCursorFlag */
     addCursorFlag(flag: string, value: boolean): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#addQueryModifier */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#addQueryModifier */
     addQueryModifier(name: string, value: boolean): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#batchSize */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#batchSize */
     batchSize(value: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#clone */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#clone */
     clone(): Cursor<T>; // still returns the same type
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#close */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#close */
     close(): Promise<CursorResult>;
     close(callback: MongoCallback<CursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#collation */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#collation */
     collation(value: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#comment */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#comment */
     comment(value: string): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#count */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/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/3.0/api/Cursor.html#explain */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#explain */
     explain(): Promise<CursorResult>;
     explain(callback: MongoCallback<CursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#filter */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#filter */
     filter(filter: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#forEach */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#forEach */
     forEach(iterator: IteratorCallback<T>, callback: EndCallback): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#hasNext */
+    forEach(iterator: IteratorCallback<T>): Promise<void>;
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#hasNext */
     hasNext(): Promise<boolean>;
     hasNext(callback: MongoCallback<boolean>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#hint */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#hint */
     hint(hint: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#isClosed */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#isClosed */
     isClosed(): boolean;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#limit */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#limit */
     limit(value: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#map */
-    map<U>(transform: (T) => U): Cursor<U>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#max */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#map */
+    map<U>(transform: (document: T) => U): Cursor<U>;
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#max */
     max(max: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#maxAwaitTimeMS */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#maxAwaitTimeMS */
     maxAwaitTimeMS(value: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#maxScan */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#maxScan */
     maxScan(maxScan: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#maxTimeMS */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#maxTimeMS */
     maxTimeMS(value: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#min */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#min */
     min(min: number): Cursor<T>;
-    /** 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/3.0/api/Cursor.html#project */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#next */
+    next(): Promise<T | null>;
+    next(callback: MongoCallback<T | null>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#project */
     project(value: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#read */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#read */
     read(size: number): string | Buffer | void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#next */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#next */
     returnKey(returnKey: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#rewind */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#rewind */
     rewind(): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#setCursorOption */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#setCursorOption */
     setCursorOption(field: string, value: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#setReadPreference */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#setReadPreference */
     setReadPreference(readPreference: string | ReadPreference): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#showRecordId */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#showRecordId */
     showRecordId(showRecordId: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#skip */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#skip */
     skip(value: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#snapshot */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#snapshot */
     snapshot(snapshot: Object): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#sort */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#sort */
     sort(keyOrList: string | Object[] | Object, direction?: number): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#stream */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#stream */
     stream(options?: { transform?: Function }): Cursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#toArray */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#toArray */
     toArray(): Promise<T[]>;
     toArray(callback: MongoCallback<T[]>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#unshift */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#unshift */
     unshift(stream: Buffer | string): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#count */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#count */
 export interface CursorCommentOptions {
     skip?: number;
     limit?: number;
@@ -1304,123 +1331,123 @@ export interface CursorCommentOptions {
     readPreference?: ReadPreference | string;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#~iteratorCallback */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#~iteratorCallback */
 export interface IteratorCallback<T> {
     (doc: T): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Cursor.html#~endCallback */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Cursor.html#~endCallback */
 export interface EndCallback {
     (error: MongoError): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#~resultCallback */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#~resultCallback */
 export type AggregationCursorResult = any | void;
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html */
 export class AggregationCursor<T = Default> extends Readable {
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#batchSize */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#batchSize */
     batchSize(value: number): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#clone */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#clone */
     clone(): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#close */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#close */
     close(): Promise<AggregationCursorResult>;
     close(callback: MongoCallback<AggregationCursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#each */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#each */
     each(callback: MongoCallback<AggregationCursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#explain */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#explain */
     explain(): Promise<AggregationCursorResult>;
     explain(callback: MongoCallback<AggregationCursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#geoNear */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#geoNear */
     geoNear(document: Object): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#group */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#group */
     group(document: Object): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#isClosed */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#isClosed */
     isClosed(): boolean;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#limit */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#limit */
     limit(value: number): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#match */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#match */
     match(document: Object): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#maxTimeMS */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#maxTimeMS */
     maxTimeMS(value: number): AggregationCursor<T>;
-    /** 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/3.0/api/AggregationCursor.html#out */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#next */
+    next(): Promise<T | null>;
+    next(callback: MongoCallback<T | null>): void;
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#out */
     out(destination: string): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#project */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#project */
     project(document: Object): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#read */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#read */
     read(size: number): string | Buffer | void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#redact */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#redact */
     redact(document: Object): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#rewind */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#rewind */
     rewind(): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#setEncoding */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#setEncoding */
     skip(value: number): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#sort */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#sort */
     sort(document: Object): AggregationCursor<T>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#toArray */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#toArray */
     toArray(): Promise<T[]>;
     toArray(callback: MongoCallback<T[]>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#unshift */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#unshift */
     unshift(stream: Buffer | string): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/AggregationCursor.html#unwind */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/AggregationCursor.html#unwind */
     unwind(field: string): AggregationCursor<T>;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html */
 export class CommandCursor extends Readable {
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#batchSize */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#batchSize */
     batchSize(value: number): CommandCursor;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#clone */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#clone */
     clone(): CommandCursor;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#close */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#close */
     close(): Promise<AggregationCursorResult>;
     close(callback: MongoCallback<AggregationCursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#each */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#each */
     each(callback: MongoCallback<AggregationCursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#isClosed */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#isClosed */
     isClosed(): boolean;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#maxTimeMS */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#maxTimeMS */
     maxTimeMS(value: number): CommandCursor;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#next */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#next */
     next(): Promise<AggregationCursorResult>;
     next(callback: MongoCallback<AggregationCursorResult>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#read */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#read */
     read(size: number): string | Buffer | void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#rewind */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#rewind */
     rewind(): CommandCursor;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#setReadPreference */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#setReadPreference */
     setReadPreference(readPreference: string | ReadPreference): CommandCursor;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#toArray */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#toArray */
     toArray(): Promise<any[]>;
     toArray(callback: MongoCallback<any[]>): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/CommandCursor.html#unshift */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/CommandCursor.html#unshift */
     unshift(stream: Buffer | string): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html */
 export class GridFSBucket {
     constructor(db: Db, options?: GridFSBucketOptions);
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#delete */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#delete */
     delete(id: ObjectID, callback?: GridFSBucketErrorCallback): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#drop */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#drop */
     drop(callback?: GridFSBucketErrorCallback): void;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#find */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#find */
     find(filter?: Object, options?: GridFSBucketFindOptions): Cursor<any>;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openDownloadStream */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#openDownloadStream */
     openDownloadStream(id: ObjectID, options?: { start: number, end: number }): GridFSBucketReadStream;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openDownloadStreamByName */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#openDownloadStreamByName */
     openDownloadStreamByName(filename: string, options?: { revision: number, start: number, end: number }): GridFSBucketReadStream;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openUploadStream */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#openUploadStream */
     openUploadStream(filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openUploadStreamWithId */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#openUploadStreamWithId */
     openUploadStreamWithId(id: GridFSBucketWriteStreamId, filename: string, options?: GridFSBucketOpenUploadStreamOptions): GridFSBucketWriteStream;
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#rename */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#rename */
     rename(id: ObjectID, filename: string, callback?: GridFSBucketErrorCallback): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html */
 export interface GridFSBucketOptions {
     bucketName?: string;
     chunkSizeBytes?: number;
@@ -1428,12 +1455,12 @@ export interface GridFSBucketOptions {
     ReadPreference?: Object;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#~errorCallback */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#~errorCallback */
 export interface GridFSBucketErrorCallback {
     (err?: MongoError): void;
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#find */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#find */
 export interface GridFSBucketFindOptions {
     batchSize?: number;
     limit?: number;
@@ -1443,7 +1470,7 @@ export interface GridFSBucketFindOptions {
     sort?: Object;
 }
 
-/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucket.html#openUploadStream */
+/** https://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucket.html#openUploadStream */
 export interface GridFSBucketOpenUploadStreamOptions {
     chunkSizeBytes?: number,
     metadata?: Object,
@@ -1451,13 +1478,13 @@ export interface GridFSBucketOpenUploadStreamOptions {
     aliases?: Array<string>
 }
 
-/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketReadStream.html */
+/** https://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucketReadStream.html */
 export class GridFSBucketReadStream extends Readable {
     id: ObjectID;
     constructor(chunks: Collection<any>, files: Collection<any>, readPreference: Object, filter: Object, options?: GridFSBucketReadStreamOptions);
 }
 
-/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketReadStream.html */
+/** https://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucketReadStream.html */
 export interface GridFSBucketReadStreamOptions {
     sort?: number,
     skip?: number,
@@ -1465,13 +1492,13 @@ export interface GridFSBucketReadStreamOptions {
     end?: number
 }
 
-/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketWriteStream.html */
+/** https://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucketWriteStream.html */
 export class GridFSBucketWriteStream extends Writable {
     id: GridFSBucketWriteStreamId;
     constructor(bucket: GridFSBucket, filename: string, options?: GridFSBucketWriteStreamOptions);
 }
 
-/** https://mongodb.github.io/node-mongodb-native/3.0/api/GridFSBucketWriteStream.html */
+/** https://mongodb.github.io/node-mongodb-native/3.1/api/GridFSBucketWriteStream.html */
 export interface GridFSBucketWriteStreamOptions {
     id?: GridFSBucketWriteStreamId,
     chunkSizeBytes?: number,
@@ -1480,26 +1507,26 @@ export interface GridFSBucketWriteStreamOptions {
     j?: number
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/ChangeStream.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/ChangeStream.html */
 export class ChangeStream extends Readable {
     constructor(changeDomain: Db | Collection, pipeline: Object[], options?: ChangeStreamOptions);
 
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/ChangeStream.html#close */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/ChangeStream.html#close */
     close(): Promise<any>;
     close(callback: MongoCallback<any>): void;
 
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/ChangeStream.html#hasNext */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/ChangeStream.html#hasNext */
     hasNext(): Promise<any>;
     hasNext(callback: MongoCallback<any>): void;
 
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/ChangeStream.html#isClosed */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/ChangeStream.html#isClosed */
     isClosed(): boolean;
 
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/ChangeStream.html#next */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/ChangeStream.html#next */
     next(): Promise<any>;
     next(callback: MongoCallback<any>): void;
 
-    /** http://mongodb.github.io/node-mongodb-native/3.0/api/ChangeStream.html#stream */
+    /** http://mongodb.github.io/node-mongodb-native/3.1/api/ChangeStream.html#stream */
     stream(options?: { transform: Function }): Cursor;
 }
 
@@ -1529,7 +1556,7 @@ export interface LoggerState {
     date: number
 }
 
-/** http://mongodb.github.io/node-mongodb-native/3.0/api/Logger.html */
+/** http://mongodb.github.io/node-mongodb-native/3.1/api/Logger.html */
 export class Logger {
     constructor(className: string, options?: LoggerOptions)
     // Log a message at the debug level
diff --git a/types/mongodb/mongodb-tests.ts b/types/mongodb/mongodb-tests.ts
index bdbddb1250..5ffaf6818f 100644
--- a/types/mongodb/mongodb-tests.ts
+++ b/types/mongodb/mongodb-tests.ts
@@ -2,6 +2,8 @@
 import mongodb = require('mongodb');
 var MongoClient = mongodb.MongoClient;
 
+const connectionString = 'mongodb://127.0.0.1:27017/test';
+
 var format = require('util').format;
 let options: mongodb.MongoClientOptions = {
     authSource: ' ',
@@ -27,15 +29,38 @@ let options: mongodb.MongoClientOptions = {
     sslCert: new Buffer(999),
     sslKey: new Buffer(999),
     sslPass: new Buffer(999),
-    promoteBuffers: false
+    promoteBuffers: false,
+    useNewUrlParser: false
 }
-MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mongodb.MongoError, client: mongodb.MongoClient) {
+MongoClient.connect(connectionString, 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.count(function (err: mongodb.MongoError, count: any) {
+        // Intentionally omitted type annotation from 'count'.
+        // This way it requires a more accurate typedef which allows inferring that it's a number.
+        collection.countDocuments(function (err: mongodb.MongoError, count) {
+            console.log(format("count = %s", count));
+        });
+
+        collection.countDocuments().then(function (count: number) {
+            console.log(format("count = %s", count));
+        });
+
+        collection.countDocuments({ foo: 1 }, function (err: mongodb.MongoError, count: number) {
+            console.log(format("count = %s", count));
+        });
+
+        collection.countDocuments({ foo: 1 }).then(function (count: number) {
+            console.log(format("count = %s", count));
+        });
+
+        collection.countDocuments({ foo: 1 }, { limit: 10 }, function (err: mongodb.MongoError, count: number) {
+            console.log(format("count = %s", count));
+        });
+
+        collection.countDocuments({ foo: 1 }, { limit: 10 }).then(function (count: number) {
             console.log(format("count = %s", count));
         });
 
@@ -99,6 +124,31 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mo
         let payment: { total: number };
         type payment = typeof payment;
         let cursor: mongodb.AggregationCursor<payment> = collection.aggregate<payment>([{}])
+
+        collection.aggregate([{ $match: { bar: 1 } }, { $limit: 10 }])
+        collection.aggregate([{ $match: { bar: 1 } }]).limit(10)
+        collection.aggregate([]).match({ bar: 1 }).limit(10)
+        collection.aggregate().match({ bar: 1 }).limit(10)
+
+        collection.aggregate<payment>(
+            [{ $match: { bar: 1 } }],
+            function (err: mongodb.MongoError, cursor: mongodb.AggregationCursor<payment>) {
+                cursor.limit(10)
+            }
+        )
+
+        collection.aggregate<payment>(
+            [],
+            function (err: mongodb.MongoError, cursor: mongodb.AggregationCursor<payment>) {
+                cursor.match({ bar: 1 }).limit(10)
+            }
+        )
+
+        collection.aggregate<payment>(
+            function (err: mongodb.MongoError, cursor: mongodb.AggregationCursor<payment>) {
+                cursor.match({ bar: 1 }).limit(10)
+            }
+        )
     }
 
     // test for new typings
@@ -118,3 +168,11 @@ MongoClient.connect('mongodb://127.0.0.1:27017/test', options, function (err: mo
         const res: mongodb.Cursor<TestCollection> = testCollection.find({ _id: 123 });
     }
 })
+
+let testFunc = async () => {
+    let testClient: mongodb.MongoClient;
+    testClient = await mongodb.connect(connectionString);
+};
+
+mongodb.connect(connectionString, (err: mongodb.MongoError, client: mongodb.MongoClient) => {});
+mongodb.connect(connectionString, options, (err: mongodb.MongoError, client: mongodb.MongoClient) => {});
diff --git a/types/mongodb/tsconfig.json b/types/mongodb/tsconfig.json
index 8ed16ed7e6..aae592b3bd 100644
--- a/types/mongodb/tsconfig.json
+++ b/types/mongodb/tsconfig.json
@@ -4,7 +4,7 @@
         "lib": [
             "es6"
         ],
-        "noImplicitAny": false,
+        "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
diff --git a/types/mongodb/v2/index.d.ts b/types/mongodb/v2/index.d.ts
index ec3e3965ba..bc23cdf893 100644
--- a/types/mongodb/v2/index.d.ts
+++ b/types/mongodb/v2/index.d.ts
@@ -2,7 +2,6 @@
 // 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>
@@ -22,7 +21,7 @@ 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';
+export { Binary, DBRef, Decimal128, Double, Int32, Long, MaxKey, MinKey, ObjectID, ObjectId, Timestamp } from 'bson';
 
 // Class documentation : http://mongodb.github.io/node-mongodb-native/2.1/api/MongoClient.html
 export class MongoClient {
@@ -158,8 +157,10 @@ export interface SocketOptions {
     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 KeepAlive enabled on the socket. default:true
+    keepAlive?: boolean;
+    // TCP KeepAlive initial delay before sending first keep-alive packet when idle. default:300000
+    keepAliveInitialDelay?: number;
     // TCP Connection timeout setting. default 0
     connectTimeoutMS?: number;
     // TCP Socket timeout setting. default 0
@@ -480,8 +481,8 @@ export interface Collection<TSchema = Default> {
     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;
+    bulkWrite(operations: Object[], options?: CollectionBulkWriteOptions): Promise<BulkWriteOpResultObject>;
+    bulkWrite(operations: Object[], options: CollectionBulkWriteOptions, 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>;
@@ -851,7 +852,7 @@ export interface CollectionInsertManyOptions {
 }
 
 //http://mongodb.github.io/node-mongodb-native/2.1/api/Collection.html#bulkWrite
-export interface CollectionBluckWriteOptions {
+export interface CollectionBulkWriteOptions {
     // The write concern.
     w?: number | string;
     // The write concern timeout.
@@ -860,6 +861,8 @@ export interface CollectionBluckWriteOptions {
     j?: boolean;
     // Serialize functions on any object.
     serializeFunctions?: boolean;
+    //Force server to assign _id values instead of driver.
+    forceServerObjectId?: boolean;
     // Execute write operation in ordered or unordered fashion.
     ordered?: boolean;
     // Allow driver to bypass schema validation in MongoDB 3.2 or higher.
diff --git a/types/mongoose-simple-random/mongoose-simple-random-tests.ts b/types/mongoose-simple-random/mongoose-simple-random-tests.ts
index 1ed3051652..19412dd154 100644
--- a/types/mongoose-simple-random/mongoose-simple-random-tests.ts
+++ b/types/mongoose-simple-random/mongoose-simple-random-tests.ts
@@ -1,10 +1,6 @@
 import * as mongoose from 'mongoose';
 import mongoose_simple_random = require("mongoose-simple-random");
 
-// test compatibility with other libraries - from @types/mongoose
-import * as _ from 'lodash';
-import * as fs from "fs";
-
 mongoose.Model.findRandom({
     username: { $ne: "DummyUser" },
     rating: {
diff --git a/types/mongoose/index.d.ts b/types/mongoose/index.d.ts
index a94f3a691d..94aacd244e 100644
--- a/types/mongoose/index.d.ts
+++ b/types/mongoose/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Mongoose 5.0.15
+// Type definitions for Mongoose 5.2.3
 // Project: http://mongoosejs.com/
 // Definitions by: horiuchi <https://github.com/horiuchi>
 //                 sindrenm <https://github.com/sindrenm>
@@ -7,6 +7,10 @@
 //                 jendrikw <https://github.com/jendrikw>
 //                 Ethan Resnick <https://github.com/ethanresnick>
 //                 vologa <https://github.com/vologab>
+//                 jussikinnula <https://github.com/jussikinnula>
+//                 ondratra <https://github.com/ondratra>
+//                 alfirin <https://github.com/alfirin>
+//                 Idan Dardikman <https://github.com/idandrd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -148,7 +152,8 @@ declare module "mongoose" {
    * @param fn plugin callback
    * @param opts optional options
    */
-  export function plugin(fn: Function, opts?: any): typeof mongoose;
+  export function plugin(fn: Function): typeof mongoose;
+  export function plugin<T>(fn: Function, opts: T): typeof mongoose;
 
   /** Sets mongoose options */
   export function set(key: string, value: any): void;
@@ -377,6 +382,9 @@ declare module "mongoose" {
     ciphers?: string;
     ecdhCurve?: string;
 
+    /** Flag for using new URL string parser instead of current (deprecated) one */
+    useNewUrlParser?: boolean;
+
     // TODO
     safe?: any;
     fsync?: any;
@@ -649,7 +657,8 @@ declare module "mongoose" {
      * Registers a plugin for this schema.
      * @param plugin callback
      */
-    plugin(plugin: (schema: Schema, options?: any) => void, opts?: any): this;
+    plugin(plugin: (schema: Schema) => void): this;
+    plugin<T>(plugin: (schema: Schema, options: T) => void, opts: T): this;
 
     /**
      * Defines a post hook for the document
@@ -761,8 +770,8 @@ declare module "mongoose" {
      * @param key option name
      * @param value if not passed, the current option value is returned
      */
-    set(key: string): any;
-    set(key: string, value: any): this;
+    set<T extends keyof SchemaOptions>(key: T): SchemaOptions[T];
+    set<T extends keyof SchemaOptions>(key: T, value: SchemaOptions[T]): this;
 
     /**
      * Adds static "class" methods to Models compiled from this schema.
@@ -791,17 +800,19 @@ declare module "mongoose" {
     methods: any;
     /** Object of currently defined statics on this schema. */
     statics: any;
+    /** Object of currently defined query helpers on this schema. */
+    query: any;
     /** The original object passed to the schema constructor */
     obj: any;
   }
 
   // Hook functions: https://github.com/vkarpov15/hooks-fixed
   interface HookSyncCallback<T> {
-    (this: T, next: HookNextFunction): Promise<any> | void;
+    (this: T, next: HookNextFunction, docs: any[]): Promise<any> | void;
   }
 
   interface HookAsyncCallback<T> {
-    (this: T, next: HookNextFunction, done: HookDoneFunction): Promise<any> | void;
+    (this: T, next: HookNextFunction, done: HookDoneFunction, docs: any[]): Promise<any> | void;
   }
 
   interface HookErrorCallback {
@@ -854,6 +865,8 @@ declare module "mongoose" {
     typeKey?: string;
     /** defaults to false */
     useNestedStrict?: boolean;
+    /** defaults to false */
+    usePushEach?: boolean;
     /** defaults to true */
     validateBeforeSave?: boolean;
     /** defaults to "__v" */
@@ -963,8 +976,8 @@ declare module "mongoose" {
      */
     validate?: RegExp | [RegExp, string] |
       SchemaTypeOpts.ValidateFn<T> | [SchemaTypeOpts.ValidateFn<T>, string] |
-      SchemaTypeOpts.ValidateOpts | SchemaTypeOpts.ValidateOpts[] |
-      SchemaTypeOpts.AsyncValidateOpts | SchemaTypeOpts.AsyncValidateOpts[];
+      SchemaTypeOpts.ValidateOpts | SchemaTypeOpts.AsyncValidateOpts |
+      (SchemaTypeOpts.ValidateOpts | SchemaTypeOpts.AsyncValidateOpts)[];
 
     /** Declares an unique index. */
     unique?: boolean | any;
@@ -1592,6 +1605,41 @@ declare module "mongoose" {
     count(callback?: (err: any, count: number) => void): Query<number>;
     count(criteria: any, callback?: (err: any, count: number) => void): Query<number>;
 
+    /**
+     * Specifies this query as a `countDocuments()` query. Behaves like `count()`,
+     * except it always does a full collection scan when passed an empty filter `{}`.
+     *
+     * There are also minor differences in how `countDocuments()` handles
+     * [`$where` and a couple geospatial operators](http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#countDocuments).
+     * versus `count()`.
+     *
+     * Passing a `callback` executes the query.
+     *
+     * This function triggers the following middleware.
+     *
+     * - `countDocuments()`
+     *
+     *
+     * @param {Object} [criteria] mongodb selector
+     * @param {Function} [callback] optional params are (error, count)
+     * @return {Query} this
+    */
+    countDocuments(callback?: (err: any, count: number) => void): Query<number>;
+    countDocuments(criteria: any, callback?: (err: any, count: number) => void): Query<number>;
+
+    /**
+     * Estimates the number of documents in the MongoDB collection. Faster than
+     * using `countDocuments()` for large collections because
+     * `estimatedDocumentCount()` uses collection metadata rather than scanning
+     * the entire collection.
+     *
+     * @param {Object} [options] passed transparently to the [MongoDB driver](http://mongodb.github.io/node-mongodb-native/3.1/api/Collection.html#estimatedDocumentCount)
+     * @param {Function} [callback] optional params are (error, count)
+     * @return {Query} this
+     */
+    estimatedDocumentCount(callback?: (err: any, count: number) => void): Query<number>;
+    estimatedDocumentCount(options: any, callback?: (err: any, count: number) => void): Query<number>;
+
     /**
      * Returns a wrapper around a mongodb driver cursor. A Query<T>Cursor exposes a
      * Streams3-compatible interface, as well as a .next() function.
@@ -2274,6 +2322,12 @@ declare module "mongoose" {
     /** Adds a collation. */
     collation(options: CollationOptions): this;
 
+    /**
+     * Appends a new $count operator to this aggregate pipeline.
+     * @param countName name of the count field
+     */
+    count(countName: string): this;
+
     /**
      * Sets the cursor option option for the aggregation query (ignored for < 2.6.0).
      * Note the different syntax below: .exec() returns a cursor object, and no callback
@@ -2355,6 +2409,13 @@ declare module "mongoose" {
      */
     read(pref: string, tags?: any[]): this;
 
+    /**
+     * Appends a new $replaceRoot operator to this aggregate pipeline.
+     * Note that the $replaceRoot operator requires field strings to start with '$'. If you are passing in a string Mongoose will prepend '$' if the specified field doesn't start '$'. If you are passing in an object the strings in your expression will not be altered.
+     * @param newRoot field or document which will become the new root document
+     */
+    replaceRoot(newRoot: string | object): this;
+
     /**
      * Appends new custom $sample operator(s) to this aggregate pipeline.
      * @param size number of random documents to pick
@@ -2567,6 +2628,34 @@ declare module "mongoose" {
     /** Counts number of matching documents in a database collection. */
     count(conditions: any, callback?: (err: any, count: number) => void): Query<number>;
 
+    /**
+     * Counts number of documents matching `criteria` in a database collection.
+     *
+     * If you want to count all documents in a large collection,
+     * use the `estimatedDocumentCount()` instead.
+     * If you call `countDocuments({})`, MongoDB will always execute
+     * a full collection scan and **not** use any indexes.
+     *
+     * @param {Object} filter
+     * @param {Function} [callback]
+     * @return {Query}
+     */
+    countDocuments(callback?: (err: any, count: number) => void): Query<number>;
+    countDocuments(criteria: any, callback?: (err: any, count: number) => void): Query<number>;
+
+    /**
+     * Estimates the number of documents in the MongoDB collection. Faster than
+     * using `countDocuments()` for large collections because
+     * `estimatedDocumentCount()` uses collection metadata rather than scanning
+     * the entire collection.
+     *
+     * @param {Object} [options]
+     * @param {Function} [callback]
+     * @return {Query}
+     */
+    estimatedDocumentCount(callback?: (err: any, count: number) => void): Query<number>;
+    estimatedDocumentCount(options: any, callback?: (err: any, count: number) => void): Query<number>;
+
     /**
      * Shortcut for saving one or more documents to the database. MyModel.create(docs)
      * does new MyModel(doc).save() for every doc in docs.
@@ -2904,6 +2993,8 @@ declare module "mongoose" {
     rawResult?: boolean;
     /** overwrites the schema's strict mode option for this update */
     strict?: boolean;
+    /** The context option lets you set the value of this in update validators to the underlying query. */
+    context?: string;
   }
 
   interface ModelFindOneAndUpdateOptions extends ModelFindByIdAndUpdateOptions {
diff --git a/types/mongoose/mongoose-tests.ts b/types/mongoose/mongoose-tests.ts
index 90259483f2..af8770dc28 100644
--- a/types/mongoose/mongoose-tests.ts
+++ b/types/mongoose/mongoose-tests.ts
@@ -1,9 +1,5 @@
 import * as mongoose from 'mongoose';
 
-// test compatibility with other libraries
-import * as _ from 'lodash';
-var fs = require('fs');
-
 // dummy variables
 var cb = function () {};
 
@@ -28,7 +24,8 @@ const connection2: Promise<mongoose.Mongoose> = mongoose.connect(connectUri, {
     autoIndex: true
   },
   mongos: true,
-  bufferCommands: false
+  bufferCommands: false,
+  useNewUrlParser: true
 });
 const connection3: null = mongoose.connect(connectUri, function (error) {
   error.stack;
@@ -296,7 +293,7 @@ schema.method('name', cb).method({
 });
 schema.path('a', mongoose.Schema.Types.Buffer).path('a');
 schema.pathType('m1').toLowerCase();
-schema.plugin(function (schema, opts) {
+schema.plugin(function (schema: mongoose.Schema, opts?: any) {
   schema.get('path');
   if (opts) {
     opts.hasOwnProperty('');
@@ -393,23 +390,23 @@ preHookTestSchemaArr.push(
 
 // Model<Document>
 preHookTestSchemaArr.push(
-  schema.pre("insertMany", function(next) {
+  schema.pre("insertMany", function(next, docs) {
     const isDefaultType: mongoose.Model<mongoose.Document> = this;
   }, err => {})
 );
 preHookTestSchemaArr.push(
-  schema.pre<PreHookTestModelInterface<PreHookTestDocumentInterface>>("insertMany", function(next) {
+  schema.pre<PreHookTestModelInterface<PreHookTestDocumentInterface>>("insertMany", function(next, docs) {
     const isSpecificType: PreHookTestModelInterface<PreHookTestDocumentInterface> = this;
     return Promise.resolve("")
   }, err => {})
 );
 preHookTestSchemaArr.push(
-  schema.pre("insertMany", true, function(next, done) {
+  schema.pre("insertMany", true, function(next, done, docs) {
     const isDefaultType: mongoose.Model<mongoose.Document> = this;
   }, err => {})
 );
 preHookTestSchemaArr.push(
-  schema.pre<PreHookTestModelInterface<PreHookTestDocumentInterface>>("insertMany", true, function(next, done) {
+  schema.pre<PreHookTestModelInterface<PreHookTestDocumentInterface>>("insertMany", true, function(next, done, docs) {
     const isSpecificType: PreHookTestModelInterface<PreHookTestDocumentInterface> = this;
     return Promise.resolve("")
   }, err => {})
@@ -432,7 +429,7 @@ schema.queue('m1', [1, 2, 3]).queue('m2', [[]]);
 schema.remove('path');
 schema.remove(['path1', 'path2', 'path3']);
 schema.requiredPaths(true)[0].toLowerCase();
-schema.set('key', 999).set('key');
+schema.set('id', true).set('id');
 schema.static('static', cb).static({
   s1: cb,
   s2: cb
@@ -567,25 +564,25 @@ new mongoose.Schema({
   }
 });
 
-(new mongoose.Schema({})).plugin(function (schema: any, options: any) {
+(new mongoose.Schema({})).plugin<any>(function (schema: mongoose.Schema, options: any) {
   schema.add({ lastMod: Date })
   schema.pre('save', function (next: Function) {
-    this.lastMod = new Date
+    (this as any).lastMod = new Date
     next()
   })
   if (options && options['index']) {
     schema.path('lastMod').index(options['index'])
   }
-}, { index: true }).plugin(function (schema: any, options: any) {
+}, { index: true }).plugin<any>(function (schema: mongoose.Schema, options: any) {
   schema.add({ lastMod: Date })
   schema.pre('save', function (next: Function) {
-    this.lastMod = new Date
+    (this as any).lastMod = new Date
     next()
   })
   if (options && options['index']) {
     schema.path('lastMod').index(options['index'])
   }
-});
+}, {index: true});
 
 new mongoose.Schema({foo: String}, {strict: 'throw'});
 
@@ -595,6 +592,35 @@ export default function(schema: mongoose.Schema) {
   });
 }
 
+// plugins
+function MyPlugin(schema: mongoose.Schema, opts?: string) {
+}
+new mongoose.Schema({})
+    .plugin(MyPlugin)
+
+interface PluginOption {
+    modelName: string;
+    timestamp: string;
+}
+
+function logger(modelName: string, timestamp: string) {
+    // call special logger with options
+}
+
+function AwesomeLoggerPlugin(schema: mongoose.Schema, options: PluginOption) {
+    if (options) {
+        schema.pre('save', function (next: Function) {
+            logger(options.modelName, options.timestamp)
+        })
+    }
+}
+
+new mongoose.Schema({})
+    .plugin<PluginOption>(AwesomeLoggerPlugin, {modelName: 'Executive', timestamp: 'yyyy/MM/dd'})
+
+mongoose.plugin<PluginOption>(AwesomeLoggerPlugin, {modelName: 'Executive', timestamp: 'yyyy/MM/dd'})
+
+
 /*
  * section document.js
  * http://mongoosejs.com/docs/api.html#document-js
@@ -746,7 +772,7 @@ interface MyEntity extends mongoose.Document {
   sub: mongoose.Types.Array<MySubEntity>
 }
 var myEntity = <MyEntity> {};
-var subDocArray = _.filter(myEntity.sub, function (sd) {
+var subDocArray = myEntity.sub.filter(sd => {
   sd.property1;
   sd.property2.toLowerCase();
   return true;
@@ -1200,6 +1226,7 @@ aggregate.allowDiskUse(true).allowDiskUse(false, []);
 aggregate.append({ $project: { field: 1 }}, { $limit: 2 });
 aggregate.append([{ $match: { daw: 'Logic Audio X' }} ]);
 aggregate.collation({ locale: 'en_US', strength: 1 });
+aggregate.count('countName');
 aggregate.cursor({ batchSize: 1000 }).exec().each(cb);
 aggregate.exec().then(cb).catch(cb);
 aggregate.option({foo: 'bar'}).exec();
@@ -1237,6 +1264,8 @@ aggregate.project({
 })
 aggregate.project({ salary_k: { $divide: [ "$salary", 1000 ]}});
 aggregate.read('primaryPreferred').read('pp');
+aggregate.replaceRoot("user");
+aggregate.replaceRoot({x: {$concat: ['$this', '$that']}});
 aggregate.sample(3).sample(3);
 aggregate.skip(10).skip(10);
 aggregate.sort({ field: 'asc', test: -1 });
diff --git a/types/mongoose/v3/index.d.ts b/types/mongoose/v3/index.d.ts
index 805f3f1de2..40e254deda 100644
--- a/types/mongoose/v3/index.d.ts
+++ b/types/mongoose/v3/index.d.ts
@@ -14,7 +14,8 @@ declare module "mongoose" {
 
   function model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
   function modelNames(): string[];
-  function plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
+  function plugin(plugin: (schema: Schema) => void): Mongoose;
+  function plugin<T>(plugin: (schema: Schema, options: T) => void, options: T): Mongoose;
 
   function get(key: string): any;
   function set(key: string, value: any): void;
@@ -33,7 +34,8 @@ declare module "mongoose" {
     get(key: string): any;
     model<T extends Document>(name: string, schema?: Schema, collection?: string, skipInit?: boolean): Model<T>;
     modelNames(): string[];
-    plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Mongoose;
+    plugin(plugin: (schema: Schema) => void): Mongoose;
+    plugin<T>(plugin: (schema: Schema, options: T) => void, options: T): Mongoose;
     set(key: string, value: any): void;
 
     mongo: any;
@@ -273,7 +275,8 @@ declare module "mongoose" {
     path(path: string): any;
     path(path: string, constructor: any): Schema;
     pathType(path: string): string;
-    plugin(plugin: (schema: Schema, options?: Object) => void, options?: Object): Schema;
+    plugin(plugin: (schema: Schema) => void): Schema;
+    plugin<T>(plugin: (schema: Schema, options: T) => void, options: T): Schema;
 
     pre(method: string, fn: HookSyncCallback, errorCb?: HookErrorCallback): Schema;
     pre(method: string, isAsync: boolean, fn: HookAsyncCallback, errorCb?: HookErrorCallback): Schema;
diff --git a/types/mongoose/v3/mongoose-tests.ts b/types/mongoose/v3/mongoose-tests.ts
index ee56b9cc1b..4659348fd7 100644
--- a/types/mongoose/v3/mongoose-tests.ts
+++ b/types/mongoose/v3/mongoose-tests.ts
@@ -387,4 +387,27 @@ var eq = id.equals(id2);
 
 var kitty1 = new Kitty({});
 var kitty2 = new Kitty({});
-var kittyEq = kitty1._id.equals(kitty2._id);
\ No newline at end of file
+var kittyEq = kitty1._id.equals(kitty2._id);
+
+// plugins
+interface PluginOption {
+    modelName: string;
+    timestamp: string;
+}
+
+function logger(modelName: string, timestamp: string) {
+    // call special logger with options
+}
+
+function AwesomeLoggerPlugin(schema: mongoose.Schema, options?: PluginOption) {
+    if (options) {
+        schema.pre('save', function (next: Function) {
+            logger(options.modelName, options.timestamp)
+        })
+    }
+}
+
+new mongoose.Schema({})
+    .plugin<PluginOption>(AwesomeLoggerPlugin, {modelName: 'Executive', timestamp: 'yyyy/MM/dd'})
+
+mongoose.plugin<PluginOption>(AwesomeLoggerPlugin, {modelName: 'Executive', timestamp: 'yyyy/MM/dd'})
diff --git a/types/mongoose/v4/index.d.ts b/types/mongoose/v4/index.d.ts
index c680f3c980..ee3cd4c045 100644
--- a/types/mongoose/v4/index.d.ts
+++ b/types/mongoose/v4/index.d.ts
@@ -173,7 +173,8 @@ declare module "mongoose" {
    * @param fn plugin callback
    * @param opts optional options
    */
-  export function plugin(fn: Function, opts?: any): typeof mongoose;
+  export function plugin(fn: Function): typeof mongoose;
+  export function plugin<T>(fn: Function, opts: T): typeof mongoose;
 
   /** Sets mongoose options */
   export function set(key: string, value: any): void;
@@ -678,7 +679,8 @@ declare module "mongoose" {
      * Registers a plugin for this schema.
      * @param plugin callback
      */
-    plugin(plugin: (schema: Schema, options?: any) => void, opts?: any): this;
+    plugin(plugin: (schema: Schema) => void): this;
+    plugin<T>(plugin: (schema: Schema, options: T) => void, opts: T): this;
 
     /**
      * Defines a post hook for the document
@@ -754,6 +756,8 @@ declare module "mongoose" {
     methods: any;
     /** Object of currently defined statics on this schema. */
     statics: any;
+    /** Object of currently defined query helpers on this schema. */
+    query: any;
     /** The original object passed to the schema constructor */
     obj: any;
   }
diff --git a/types/mongoose/v4/mongoose-tests.ts b/types/mongoose/v4/mongoose-tests.ts
index 170a005b49..b2d2a834fd 100644
--- a/types/mongoose/v4/mongoose-tests.ts
+++ b/types/mongoose/v4/mongoose-tests.ts
@@ -1,9 +1,5 @@
 import * as mongoose from 'mongoose';
 
-// test compatibility with other libraries
-import * as _ from 'lodash';
-var fs = require('fs');
-
 // dummy variables
 var cb = function () {};
 
@@ -266,7 +262,7 @@ schema.method('name', cb).method({
 });
 schema.path('a', mongoose.Schema.Types.Buffer).path('a');
 schema.pathType('m1').toLowerCase();
-schema.plugin(function (schema, opts) {
+schema.plugin(function (schema: mongoose.Schema, opts?: any) {
   schema.get('path');
   if (opts) {
     opts.hasOwnProperty('');
@@ -428,7 +424,30 @@ new mongoose.Schema({
   if (options && options['index']) {
     schema.path('lastMod').index(options['index'])
   }
-});
+}, {index: true});
+
+// plugins
+interface PluginOption {
+  modelName: string;
+  timestamp: string;
+}
+
+function logger(modelName: string, timestamp: string) {
+    // call special logger with options
+}
+
+function AwesomeLoggerPlugin(schema: mongoose.Schema, options?: PluginOption) {
+  if (options) {
+      schema.pre('save', function (next: Function) {
+          logger(options.modelName, options.timestamp)
+      })
+  }
+}
+
+new mongoose.Schema({})
+    .plugin<PluginOption>(AwesomeLoggerPlugin, {modelName: 'Executive', timestamp: 'yyyy/MM/dd'})
+
+mongoose.plugin<PluginOption>(AwesomeLoggerPlugin, {modelName: 'Executive', timestamp: 'yyyy/MM/dd'})
 
 export default function(schema: mongoose.Schema) {
   schema.pre('init', function(this: mongoose.Document, next: (err?: Error) => void, data: any): void {
@@ -576,7 +595,7 @@ interface MyEntity extends mongoose.Document {
   sub: mongoose.Types.Array<MySubEntity>
 }
 var myEntity = <MyEntity> {};
-var subDocArray = _.filter(myEntity.sub, function (sd) {
+var subDocArray = myEntity.sub.filter(sd => {
   sd.property1;
   sd.property2.toLowerCase();
   return true;
diff --git a/types/moo/index.d.ts b/types/moo/index.d.ts
index 9cf67c3299..fa3a59d2ab 100644
--- a/types/moo/index.d.ts
+++ b/types/moo/index.d.ts
@@ -50,7 +50,7 @@ export interface Rule {
     };
 }
 export interface Rules {
-    [x: string]: RegExp | string | string[] | Rule;
+    [x: string]: RegExp | string | string[] | Rule | Rule[];
 }
 
 export interface Lexer {
diff --git a/types/moo/moo-tests.ts b/types/moo/moo-tests.ts
index 6f0c18ae2d..c82bedd219 100644
--- a/types/moo/moo-tests.ts
+++ b/types/moo/moo-tests.ts
@@ -75,3 +75,13 @@ lexer.next();
 lexer.next();
 lexer.reset('a different line\n', info);
 lexer.next();
+
+// Transform: https://github.com/no-context/moo#transform
+moo.compile({
+    STRING: [
+        { match: /"""[^]*?"""/, lineBreaks: true, value: x => x.slice(3, -3) },
+        { match: /"(?:\\["\\rn]|[^"\\])*?"/, lineBreaks: true, value: x => x.slice(1, -1) },
+        { match: /'(?:\\['\\rn]|[^'\\])*?'/, lineBreaks: true, value: x => x.slice(1, -1) },
+    ],
+    // ...
+});
diff --git a/types/moonjs/index.d.ts b/types/moonjs/index.d.ts
index 13dcbbe04e..c003f7ad58 100644
--- a/types/moonjs/index.d.ts
+++ b/types/moonjs/index.d.ts
@@ -22,11 +22,11 @@ declare namespace Moon {
     }
 
     interface MoonConstructor {
-        new <Props extends string, Data, Methods>(options?: ConstructorOptions<Props, Data, Methods>): Instance<Data & Methods & Record<Props, any>>;
+        new <Props extends string = never, Data = {}, Methods = {}>(options?: ConstructorOptions<Props, Data, Methods>): Instance<Data & Methods & Record<Props, any>>;
     }
 
     interface MoonStatic extends MoonConstructor {
-        component<Props extends string, Data, Methods>(name: string, options: ComponentOptions<Props, Data, Methods>): MoonConstructor;
+        component<Props extends string = never, Data = {}, Methods = {}>(name: string, options: ComponentOptions<Props, Data, Methods>): MoonConstructor;
         config: MoonConfig;
         use(plugin: object): void;
         compile(template: string): void;
diff --git a/types/moonjs/moonjs-tests.ts b/types/moonjs/moonjs-tests.ts
index aa6527ea82..34d1d8d359 100644
--- a/types/moonjs/moonjs-tests.ts
+++ b/types/moonjs/moonjs-tests.ts
@@ -17,6 +17,7 @@ const count = app.get("count");
 count;                          // $ExpectType number
 app.get("increment")();         // $ExpectType void
 app.callMethod("increment");    // $ExpectType any
+app.get("blahblahblah");        // $ExpectError
 
 app.destroy();
 
diff --git a/types/mosca/index.d.ts b/types/mosca/index.d.ts
new file mode 100644
index 0000000000..aee3625d10
--- /dev/null
+++ b/types/mosca/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for mosca 2.8
+// Project: https://github.com/mcollina/mosca
+// Definitions by: Joao Gabriel Gouveia <https://github.com/GabrielGouv>
+//                 Jerray Fu <https://github.com/jerray>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export class Server {
+    id: string;
+    opts: any;
+    modernOpts: any;
+    clients: any;
+    closed: boolean;
+
+    constructor(opts: any, callback?: () => void);
+
+    on(when: string, callback: (() => void) | ((client: Client) => void) | ((packet: Packet, client: Client) => void)): void;
+    once(when: string, callback: () => void): void;
+    toString(): string;
+    subscribe(topic: string, callback: () => void, done: () => void): void;
+    publish(message: Message, callback: (obj: any, packet: Packet) => void): void;
+    authenticate(client: Client, username: string, password: string,
+        callback: (obj: any, authenticated: boolean) => void): void;
+    published(packet: Packet, client: Client, callback: (obj: any) => void): void;
+    authorizePublish(client: Client, topic: string, payload: string,
+        callback: (obj: any, authorized: boolean) => void): void;
+    authorizeSubscribe(client: Client, topic: string, callback: (obj: any, authorized: boolean) => void): void;
+    authorizeForward(client: Client, packet: Packet, callback: (obj: any, authorized: boolean) => void): void;
+    storePacket(packet: Packet, callback: () => void): void;
+    deleteOfflinePacket(client: Client, messageId: number, callback: () => void): void;
+    forwardRetained(pattern: string, client: Client, callback: () => void): void;
+    restoreClientSubscriptions(client: Client, callback: () => void): void;
+    forwardOfflinePackets(client: Client, callback: () => void): void;
+    updateOfflinePacket(client: Client, originMessageId: number, packet: Packet,
+        callback: (obj: any, packet: Packet) => void): void;
+    persistClient(client: Client, callback: () => void): void;
+    close(callback?: () => void): void;
+    attachHttpServer(server: any, path?: any): void;
+}
+
+export class Client {
+    id: string;
+    connection: any;
+    server: Server;
+    logger: any;
+    subscriptions: any;
+    nextId: number;
+    inflight: any;
+    inflightCounter: number;
+
+    constructor(connection: any, server: Server);
+
+    close(callback?: () => void, reason?: string): void;
+}
+
+export class Stats {
+    maxConnectedClients: number;
+    connectedClients: number;
+    lastIntervalConnectedClients: number;
+    publishedMessages: number;
+    lastIntervalPublishedMessages: number;
+    started: Date;
+    load: any;
+
+    wire(server: Server): void;
+}
+
+export class Authorizer {
+    users: any;
+
+    addUser(username: string, password: string, authorizePublish: string,
+        authorizeSubscribe: string, callback: (func: any) => void): void;
+}
+
+export interface Packet {
+    topic: string;
+    payload: any;
+    messageId: string;
+    qos: number;
+    retain: boolean;
+}
+
+export interface Message {
+    topic: string;
+    payload: any;
+    qos: number;
+    retain: boolean;
+}
+
+export namespace persistence {
+    interface Persistence {
+        wire(server: Server): void;
+    }
+    type FactoryFunc = (options: { [key: string]: any }) => Persistence;
+
+    const Redis: FactoryFunc;
+    const Mongo: FactoryFunc;
+    const LevelUp: FactoryFunc;
+    const Memory: FactoryFunc;
+}
diff --git a/types/mosca/mosca-tests.ts b/types/mosca/mosca-tests.ts
new file mode 100644
index 0000000000..e03b664b1b
--- /dev/null
+++ b/types/mosca/mosca-tests.ts
@@ -0,0 +1,16 @@
+import { Server, Client, Packet } from 'mosca';
+
+const settings = {
+    port: 1883,
+    host: '0.0.0.0'
+};
+
+const server = new Server(settings);
+
+server.on('ready', () => {});
+
+server.on('clientConnected', (client: Client) => {});
+
+server.on('clientDisconnected', (client: Client) => {});
+
+server.on('published', (packet: Packet, client: Client) => {});
diff --git a/types/mosca/tsconfig.json b/types/mosca/tsconfig.json
new file mode 100644
index 0000000000..58b3dcaaf8
--- /dev/null
+++ b/types/mosca/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",
+        "mosca-tests.ts"
+    ]
+}
diff --git a/types/mosca/tslint.json b/types/mosca/tslint.json
new file mode 100644
index 0000000000..6746359dda
--- /dev/null
+++ b/types/mosca/tslint.json
@@ -0,0 +1,3 @@
+{ 
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/move-concurrently/index.d.ts b/types/move-concurrently/index.d.ts
index 277c1299f1..75434a4224 100644
--- a/types/move-concurrently/index.d.ts
+++ b/types/move-concurrently/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/move-concurrently
 // Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 /**
  * Recursively moves from to to and resolves its promise when finished. If to already exists then the promise will be rejected with an EEXIST error.
diff --git a/types/mozilla-readability/tsconfig.json b/types/mozilla-readability/tsconfig.json
index 6ec688cf2f..9679936061 100644
--- a/types/mozilla-readability/tsconfig.json
+++ b/types/mozilla-readability/tsconfig.json
@@ -15,10 +15,13 @@
         ],
         "types": [],
         "noEmit": true,
-        "forceConsistentCasingInFileNames": true
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "parse5": [ "parse5/v4" ]
+        }
     },
     "files": [
         "index.d.ts",
         "mozilla-readability-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/mssql/index.d.ts b/types/mssql/index.d.ts
index 272abb5e39..d4558737ba 100644
--- a/types/mssql/index.d.ts
+++ b/types/mssql/index.d.ts
@@ -1,7 +1,14 @@
 // Type definitions for mssql 4.0.5
 // Project: https://www.npmjs.com/package/mssql
-// Definitions by: COLSA Corporation <http://www.colsa.com/>, Ben Farr <https://github.com/jaminfarr>, Vitor Buzinaro <https://github.com/buzinas>, Matt Richardson <https://github.com/mrrichar>, Jørgen Elgaard Larsen <https://github.com/elhaard>, Peter Keuter <https://github.com/pkeuter>
+// Definitions by: COLSA Corporation <http://www.colsa.com/>
+//                 Ben Farr <https://github.com/jaminfarr>
+//                 Vitor Buzinaro <https://github.com/buzinas>
+//                 Matt Richardson <https://github.com/mrrichar>
+//                 Jørgen Elgaard Larsen <https://github.com/elhaard>
+//                 Peter Keuter <https://github.com/pkeuter>
+//                 David Gasperoni <https://github.com/mcdado>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="node" />
 
@@ -195,6 +202,7 @@ export declare class ConnectionPool extends events.EventEmitter {
     public close(): Promise<void>;
     public close(callback: (err: any) => void): void;
     public request(): Request;
+    public transaction(): Transaction;
 }
 
 export declare class ConnectionError implements Error {
@@ -291,6 +299,7 @@ export declare class Transaction extends events.EventEmitter {
     public commit(callback: (err?: any) => void): void;
     public rollback(): Promise<void>;
     public rollback(callback: (err?: any) => void): void;
+    public request(): Request;
 }
 
 export declare class TransactionError implements Error {
@@ -311,8 +320,10 @@ export declare class PreparedStatement extends events.EventEmitter {
     public output(name: string, type: (() => ISqlType) | ISqlType): PreparedStatement;
     public prepare(statement?: string): Promise<void>;
     public prepare(statement?: string, callback?: (err?: Error) => void): PreparedStatement;
-    public execute(values: Object): Promise<void>;
-    public execute(values: Object, callback: (err?: Error) => void): Request;
+    public execute(values: Object): Promise<IProcedureResult<any>>;
+    public execute<Entity>(values: Object): Promise<IProcedureResult<Entity>>;
+    public execute(values: Object, callback: (err?: Error, result?: IProcedureResult<any>) => void): Request;
+    public execute<Entity>(values: Object, callback: (err?: Error, result?: IProcedureResult<Entity>) => void): Request;
     public unprepare(): Promise<void>;
     public unprepare(callback: (err?: Error) => void): PreparedStatement;
 }
diff --git a/types/mssql/msnodesqlv8.d.ts b/types/mssql/msnodesqlv8.d.ts
new file mode 100644
index 0000000000..27d51e2daa
--- /dev/null
+++ b/types/mssql/msnodesqlv8.d.ts
@@ -0,0 +1,2 @@
+// Export the same API as index.d.ts (which implicitly uses the "msnodesqlv8" driver):
+export * from '.';
diff --git a/types/mssql/mssql-tests.ts b/types/mssql/mssql-tests.ts
index 9d9e72bd4f..72bbc15126 100644
--- a/types/mssql/mssql-tests.ts
+++ b/types/mssql/mssql-tests.ts
@@ -1,4 +1,5 @@
 import * as sql from 'mssql';
+import * as msnodesqlv8 from 'mssql/msnodesqlv8';
 
 interface Entity {
     value: number;
@@ -203,3 +204,10 @@ function test_classes_extend_eventemitter() {
 
     preparedStatment.on('error', () => { })
 }
+
+async function test_msnodesqlv8() {
+    const connection = new msnodesqlv8.ConnectionPool({ server: "localhost", database: "master", options: { trustedConnection: true } });
+    await connection.connect();
+    const result = await connection.query`SELECT * FROM sys.databases`;
+    await connection.close();
+}
diff --git a/types/mssql/tsconfig.json b/types/mssql/tsconfig.json
index 51f03fd652..d53105dc0a 100644
--- a/types/mssql/tsconfig.json
+++ b/types/mssql/tsconfig.json
@@ -18,6 +18,7 @@
     },
     "files": [
         "index.d.ts",
+        "msnodesqlv8.d.ts",
         "mssql-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/muicss/index.d.ts b/types/muicss/index.d.ts
index f195ae5d23..813abbfdcc 100644
--- a/types/muicss/index.d.ts
+++ b/types/muicss/index.d.ts
@@ -2,6 +2,6 @@
 // Project: https://www.muicss.com/
 // Definitions by: Samuel Neff <https://github.com/samuelneff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 // all definitions in react.d.ts and subdirs
diff --git a/types/mustache/index.d.ts b/types/mustache/index.d.ts
index 26a00fc796..2b0ab91cd0 100644
--- a/types/mustache/index.d.ts
+++ b/types/mustache/index.d.ts
@@ -1,53 +1,247 @@
-// Type definitions for Mustache 0.8.2
+// Type definitions for Mustache 0.8.3
 // Project: https://github.com/janl/mustache.js
-// Definitions by: Mark Ashley Bell <https://github.com/markashleybell>
+// Definitions by: Mark Ashley Bell <https://github.com/markashleybell>, Manuel Thalmann <https://github.com/manuth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
+/**
+ * Provides the functionality to render templates with `{{mustaches}}`.
+ */
+interface MustacheStatic {
+    /**
+     * The name of the module.
+     */
+    name: string;
 
-interface MustacheScanner {
+    /**
+     * The version of the module.
+     */
+    version: string;
+
+    /**
+     * The opening and closing tags to parse.
+     */
+    tags: string;
+
+    /**
+     * A simple string scanner that is used by the template parser to find tokens in template strings.
+     */
+    Scanner: typeof MustacheScanner
+
+    /**
+     * Represents a rendering context by wrapping a view object and maintaining a reference to the parent context.
+     */
+    Context: typeof MustacheContext;
+
+    /**
+     * A Writer knows how to take a stream of tokens and render them to a `string`, given a context.
+     *
+     * It also maintains a cache of templates to avoid the need to parse the same template twice.
+     */
+    Writer: typeof MustacheWriter;
+
+    /**
+     * Escapes HTML-characters.
+     *
+     * @param value
+     * The string to escape.
+     */
+    escape: (value: string) => string;
+
+    /**
+     * Clears all cached templates in this writer.
+     */
+    clearCache(): void;
+
+    /**
+     * Parses and caches the given template in the default writer and returns the array of tokens it contains.
+     *
+     * Doing this ahead of time avoids the need to parse templates on the fly as they are rendered.
+     *
+     * @param template
+     * The template to parse.
+     *
+     * @param tags
+     * The tags to use.
+     */
+    parse(template: string, tags?: string[]): any;
+
+    /**
+     * Renders the `template` with the given `view` and `partials` using the default writer.
+     *
+     * @param template
+     * The template to render.
+     *
+     * @param view
+     * The view to render the template with.
+     *
+     * @param partials
+     * Either an object that contains the names and templates of partials that are used in a template
+     *
+     * -- or --
+     *
+     * A function that is used to load partial template on the fly that takes a single argument: the name of the partial.
+     */
+    render(template: string, view: any | MustacheContext, partials?: any): string;
+
+    /**
+     * Renders the `template` with the given `view` and `partials` using the default writer.
+     *
+     * @param template
+     * The template to render.
+     *
+     * @param view
+     * The view to render the template with.
+     *
+     * @param partials
+     * Either an object that contains the names and templates of partials that are used in a template
+     *
+     * -- or --
+     *
+     * A function that is used to load partial template on the fly that takes a single argument: the name of the partial.
+     */
+    to_html(template: string, view: any | MustacheContext, partials?: any, send?: any): any;
+}
+
+/**
+ * A simple string scanner that is used by the template parser to find tokens in template strings.
+ */
+declare class MustacheScanner {
     string: string;
     tail: string;
     pos: number;
 
+    /**
+     * Initializes a new instance of the `MustacheScanner` class.
+     */
+    constructor(string: string);
+
+    /**
+     * Returns `true` if the tail is empty (end of string).
+     */
     eos(): boolean;
+
+    /**
+     * Tries to match the given regular expression at the current position.
+     *
+     * @param re
+     * The regex-pattern to match.
+     *
+     * @returns
+     * The matched text if it can match, the empty string otherwise.
+     */
     scan(re: RegExp): string;
+
+    /**
+     * Skips all text until the given regular expression can be matched.
+     *
+     * @param re
+     * The regex-pattern to match.
+     *
+     * @returns
+     * Returns the skipped string, which is the entire tail if no match can be made.
+     */
     scanUntil(re: RegExp): string;
 }
 
-interface MustacheContext {
+/**
+ * Represents a rendering context by wrapping a view object and maintaining a reference to the parent context.
+ */
+declare class MustacheContext {
     view: any;
     parentContext: MustacheContext;
 
+    /**
+     * Initializes a new instance of the `MustacheContenxt` class.
+     */
+    constructor(view: any, parentContext: MustacheContext);
+
+    /**
+     * Initializes a new instance of the `MustacheContenxt` class.
+     */
+    constructor(view: any);
+
+    /**
+     * Creates a new context using the given view with this context as the parent.
+     *
+     * @param view
+     * The view to create the new context with.
+     */
     push(view: any): MustacheContext;
+
+    /**
+     * Returns the value of the given name in this context, traversing up the context hierarchy if the value is absent in this context's view.
+     *
+     * @param name
+     * The name to look up.
+     */
     lookup(name: string): any;
 }
 
-interface MustacheWriter {
-    (view: any): string;
+/**
+ * A Writer knows how to take a stream of tokens and render them to a `string`, given a context.
+ *
+ * It also maintains a cache of templates to avoid the need to parse the same template twice.
+ */
+declare class MustacheWriter {
+    /**
+     * Initializes a new instance of the `MustacheWriter` class.
+     */
+    constructor();
 
+    /**
+     * Clears all cached templates in this writer.
+     */
     clearCache(): void;
+
+    /**
+     * Parses and caches the given `template` and returns the array of tokens that is generated from the parse.
+     *
+     * @param template
+     * The template to parse.
+     */
     parse(template: string, tags?: any): any;
-    render(template: string, view: any, partials: any): string;
+
+    /**
+     * High-level method that is used to render the given `template` with the given `view`.
+     *
+     * @param template
+     * The template to render.
+     *
+     * @param view
+     * The view to render the template with.
+     *
+     * @param partials
+     * Either an object that contains the names and templates of partials that are used in a template
+     *
+     * -- or --
+     *
+     * A function that is used to load partial template on the fly that takes a single argument: the name of the partial.
+     */
+    render(template: string, view: any | MustacheContext, partials: any): string;
+
+    /**
+     * Low-level method that renders the given array of `tokens` using the given `context` and `partials`.
+     *
+     * @param tokens
+     * The tokens to render.
+     *
+     * @param context
+     * The context to use for rendering the tokens.
+     *
+     * @param partials
+     * The partials to use for rendering the tokens.
+     *
+     * @param originalTemplate
+     * An object used to extract the portion of the original template that was contained in a higher-order section.
+     *
+     * If the template doesn't use higher-order sections, this argument may be omitted.
+     */
     renderTokens(tokens: string[], context: MustacheContext, partials: any, originalTemplate: any): string;
 }
 
-interface MustacheStatic {
-    name: string;
-    version: string;
-    tags: string;
-    Scanner: MustacheScanner;
-    Context: MustacheContext;
-    Writer: MustacheWriter;
-    escape: any;
-
-    clearCache(): MustacheWriter;
-    parse(template: string, tags?: any): any;
-    render(template: string, view: any, partials?: any): string;
-    to_html(template: string, view: any, partials?: any, send?: any): any;
-}
-
+/**
+ * Provides the functionality to render templates with `{{mustaches}}`.
+ */
 declare var Mustache: MustacheStatic;
-
-declare module 'mustache' {
-	export = Mustache;
-}
+export = Mustache;
+export as namespace Mustache;
diff --git a/types/mustache/mustache-tests.ts b/types/mustache/mustache-tests.ts
index ad9c410d76..30c920a30a 100644
--- a/types/mustache/mustache-tests.ts
+++ b/types/mustache/mustache-tests.ts
@@ -12,3 +12,18 @@ var output2 = Mustache.render(template2, view2);
 var view3 = { firstName: "John", lastName: "Smith", blogURL: "http://testblog.com" };
 var template3 = "<h1>{{firstName}} {{lastName}}</h1>Blog: {{blogURL}}";
 var html = Mustache.to_html(template3, view3);
+
+var view4 = new class extends Mustache.Context
+{
+    constructor()
+    {
+        super({});
+    }
+
+    public lookup(name: string)
+    {
+        return name.toUpperCase();
+    }
+};
+var template4 = "Hello, {{firstName}} {{lastName}}";
+var html4 = Mustache.render(template4, view4);
\ No newline at end of file
diff --git a/types/n3/index.d.ts b/types/n3/index.d.ts
index c773c85a28..dd2d5ca394 100644
--- a/types/n3/index.d.ts
+++ b/types/n3/index.d.ts
@@ -1,125 +1,220 @@
-// Type definitions for N3
+// Type definitions for N3 1.0
 // Project: https://github.com/RubenVerborgh/N3.js
 // Definitions by: Fred Eisele <https://github.com/phreed>
+//                 Ruben Taelman <https://github.com/rubensworks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 /// <reference types="node" />
 
-
 import * as fs from "fs";
 import * as stream from "stream";
+import * as RDF from "rdf-js";
+import { EventEmitter } from "events";
 
-declare namespace N3 {
-
-    type ErrorCallback = (err: Error, result: any) => void;
-
-    interface Prefixes {
-        [key: string]: string;
-    }
-
-    interface LiteralValue {
-        value: string | number;
-    }
-
-    interface Triple {
-        subject: string,
-        predicate: string,
-        object: string,
-        graph?: string
-    }
-
-    interface BlankTriple {
-        predicate: string,
-        object: string
-    }
-
-
-    interface ParserConstructor {
-        new (options?: ParserOptions): N3Parser;
-        (options?: ParserOptions): N3Parser;
-    }
-    const Parser: ParserConstructor;
-
-    interface StreamParserConstructor {
-        new (options?: ParserOptions): N3StreamParser;
-        (options?: ParserOptions): N3StreamParser;
-    }
-    const StreamParser: StreamParserConstructor;
-
-    interface ParserOptions {
-        format?: string,
-        prefixes?: string[]
-    }
-
-    interface ParseCallback {
-        (error: Error, triple: Triple, prefixes: Prefixes): void;
-    }
-
-    interface Logger {
-        (message?: any, ...optionalParams: any[]): void;
-    }
-    interface N3Parser {
-        parse(input: string, callback: ParseCallback): void;
-        parse(subject: string, predicate: string, object: string): void;
-        parse(triple: Triple): void;
-        parse(stream: fs.ReadStream, log: Logger): void;
-    }
-
-    interface N3StreamParser extends N3Parser, fs.WriteStream {
-        pipe<T extends NodeJS.WritableStream | N3StreamWriter>(consumer: T): T;
-    }
-
-
-    interface WriterConstructor {
-        new (options?: WriterOptions): N3Writer;
-        (options?: WriterOptions): N3Writer;
-
-        new (fd: any, options?: WriterOptions): N3Writer;
-        (fd: any, options?: WriterOptions): N3Writer;
-    }
-    const Writer: WriterConstructor;
-
-    interface N3Writer {
-        addTriple(subject: string, predicate: string, object: string): void;
-        addTriple(subject: string, predicate: string, object: string[]): void;
-        addTriple(triple: Triple): void;
-        end(err?: ErrorCallback, result?: any): void;
-        blank(ns: string, name: string): string;
-        blank(triple: BlankTriple[]): string;
-        list(triple: string[]): string[];
-    }
-
-    function StreamWriter(options: WriterOptions): N3StreamWriter;
-
-    interface N3StreamWriter extends N3Writer {
-        pipe(consumer: NodeJS.WritableStream): void;
-        pipe(consumer: stream.Writable): void;
-    }
-
-    interface WriterOptions {
-        format?: string,
-        prefixes?: Prefixes
-    }
-
-    interface N3StoreWriter extends N3Writer {
-        find(subject: string, predicate: string | null, object: string | null): Triple[];
-    }
-    function Store(): N3StoreWriter;
-
-    namespace Util {
-        function createLiteral(value: any): string;
-        function createLiteral(value: any, type: string): string;
-
-        function isIRI(value: string): boolean;
-        function isLiteral(value: string): boolean;
-        function getLiteralValue(value: string): string;
-        function getLiteralLanguage(value: string): string;
-        function getLiteralType(value: string): string;
-        function isBlank(value: string): boolean;
-        function isPrefixedName(name: string): boolean;
-        function expandPrefixedName(name: string, prefixes: Prefixes): string;
-    }
+export interface Prefixes {
+    [key: string]: RDF.NamedNode;
 }
 
-export = N3;
+export class Term implements RDF.Term {
+    termType: "NamedNode" | "BlankNode" | "Literal" | "Variable" | "DefaultGraph";
+    id: string;
+    value: string;
+    constructor(iri: string);
+    toJSON(): string;
+    equals(other: RDF.Term): boolean;
+    static subclass(type: any): void;
+}
 
+export class NamedNode extends Term implements RDF.NamedNode {
+    termType: "NamedNode";
+    value: string;
+    constructor(iri: string);
+}
+
+export class BlankNode extends Term implements RDF.BlankNode {
+    static nextId: number;
+    termType: "BlankNode";
+    value: string;
+    constructor(name: string);
+}
+
+export class Variable extends Term implements RDF.Variable {
+    termType: "Variable";
+    value: string;
+    constructor(name: string);
+}
+
+export class Literal extends Term implements RDF.Literal {
+    static readonly langStringDatatype: NamedNode;
+    termType: "Literal";
+    value: string;
+    language: string;
+    datatype: RDF.NamedNode;
+    datatypeString: string;
+    constructor(id: string);
+}
+
+export class DefaultGraph extends Term implements RDF.DefaultGraph {
+    termType: "DefaultGraph";
+    value: "";
+    constructor();
+}
+
+export class Quad implements RDF.Quad {
+    constructor(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term, graph?: RDF.Term);
+    subject: RDF.Term;
+    predicate: RDF.Term;
+    object: RDF.Term;
+    graph: RDF.Term;
+    equals(other: RDF.Quad): boolean;
+    toJSON(): string;
+}
+
+export class Triple extends Quad implements RDF.Triple {}
+
+export namespace DataFactory {
+    function namedNode(value: string): RDF.NamedNode;
+    function blankNode(value?: string): RDF.BlankNode;
+    function literal(value: string | number, languageOrDatatype?: string | RDF.NamedNode): RDF.Literal;
+    function variable(value: string): RDF.Variable;
+    function defaultGraph(): RDF.DefaultGraph;
+    function triple(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term): RDF.Quad;
+    function quad(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term, graph?: RDF.Term): RDF.Quad;
+}
+
+export type ErrorCallback = (err: Error, result: any) => void;
+export type QuadCallback = (result: Quad) => void;
+export type QuadPredicate = (result: Quad) => boolean;
+
+export type OTerm = RDF.Term | string | null;
+
+export type Logger = (message?: any, ...optionalParams: any[]) => void;
+
+export interface BlankTriple {
+    predicate: RDF.Term;
+    object: RDF.Term;
+}
+
+export interface ParserConstructor {
+    new (options?: ParserOptions): N3Parser;
+    (options?: ParserOptions): N3Parser;
+}
+export const Parser: ParserConstructor;
+
+export interface ParserOptions {
+    format?: string;
+    prefixes?: string[];
+    factory?: RDF.DataFactory;
+    baseIRI?: string;
+}
+
+export type ParseCallback = (error: Error, quad: Quad, prefixes: Prefixes) => void;
+
+export interface N3Parser {
+    parse(input: string, callback: ParseCallback): void;
+}
+
+export interface StreamParserConstructor {
+  new (options?: ParserOptions): N3StreamParser;
+  (options?: ParserOptions): N3StreamParser;
+}
+export const StreamParser: StreamParserConstructor;
+
+export interface N3StreamParser extends RDF.Stream, NodeJS.WritableStream, RDF.Sink {
+    // Below are the NodeJS.ReadableStream methods,
+    // we can not extend the interface directly,
+    // as `read` clashes with RDF.Sink.
+    readable: boolean;
+    // read(size?: number): string | Buffer; // Overwritten by RDF.Stream
+    setEncoding(encoding: string | null): void;
+    pause(): this;
+    resume(): this;
+    isPaused(): boolean;
+    pipe<T extends NodeJS.WritableStream | RDF.Stream>(destination: T, options?: { end?: boolean; }): T;
+    unpipe(destination?: NodeJS.WritableStream | RDF.Stream): void;
+    unshift(chunk: string | Buffer): void;
+    wrap(oldStream: NodeJS.ReadableStream | RDF.Stream): NodeJS.ReadableStream;
+}
+
+export interface WriterOptions {
+    format?: string;
+    prefixes?: Prefixes;
+}
+
+export interface WriterConstructor {
+    new (options?: WriterOptions): N3Writer;
+    new (fd: any, options?: WriterOptions): N3Writer;
+    (options?: WriterOptions): N3Writer;
+    (fd: any, options?: WriterOptions): N3Writer;
+}
+export const Writer: WriterConstructor;
+
+export interface N3Writer {
+    quadToString(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term, graph?: RDF.Term): string;
+    quadsToString(quads: RDF.Quad[]): string;
+    addQuad(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term | RDF.Term[], graph?: RDF.Term, done?: () => void): void;
+    addQuad(quad: RDF.Quad): void;
+    addQuads(quads: RDF.Quad[]): void;
+    end(err?: ErrorCallback, result?: string): void;
+    blank(predicate: RDF.Term, object: RDF.Term): RDF.Term;
+    blank(triple: BlankTriple | RDF.Quad | BlankTriple[] | RDF.Quad[]): RDF.Term;
+    list(triple: RDF.Term[]): RDF.Term[];
+}
+
+export interface StreamWriterConstructor {
+  new (options?: WriterOptions): N3StreamWriter;
+  new (fd: any, options?: WriterOptions): N3StreamWriter;
+  (options?: WriterOptions): N3StreamWriter;
+  (fd: any, options?: WriterOptions): N3StreamWriter;
+}
+export const StreamWriter: StreamWriterConstructor;
+
+export interface N3StreamWriter extends NodeJS.ReadWriteStream, RDF.Source {}
+
+export interface N3Store extends RDF.Sink {
+    readonly size: number;
+    addQuad(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term | RDF.Term[], graph?: RDF.Term, done?: () => void): void;
+    addQuad(quad: RDF.Quad): void;
+    addQuads(quads: RDF.Quad[]): void;
+    removeQuad(subject: RDF.Term, predicate: RDF.Term, object: RDF.Term | RDF.Term[], graph?: RDF.Term, done?: () => void): void;
+    removeQuad(quad: RDF.Quad): void;
+    removeQuads(quads: RDF.Quad[]): void;
+    getQuads(subject: OTerm, predicate: OTerm, object: OTerm | OTerm[], graph: OTerm): Quad[];
+    countQuads(subject: OTerm, predicate: OTerm, object: OTerm, graph: OTerm): number;
+    forEach(callback: QuadCallback, subject: OTerm, predicate: OTerm, object: OTerm, graph: OTerm): void;
+    every(callback: QuadPredicate, subject: OTerm, predicate: OTerm, object: OTerm, graph: OTerm): boolean;
+    some(callback: QuadPredicate, subject: OTerm, predicate: OTerm, object: OTerm, graph: OTerm): boolean;
+    getSubjects(predicate: OTerm, object: OTerm, graph: OTerm): RDF.Term[];
+    forSubjects(callback: QuadCallback, predicate: OTerm, object: OTerm, graph: OTerm): void;
+    getPredicates(subject: OTerm, object: OTerm, graph: OTerm): RDF.Term[];
+    forPredicates(callback: QuadCallback, subject: OTerm, object: OTerm, graph: OTerm): void;
+    getObjects(subject: OTerm, predicate: OTerm, graph: OTerm): RDF.Term[];
+    forObjects(callback: QuadCallback, subject: OTerm, predicate: OTerm, graph: OTerm): void;
+    getGraphs(subject: OTerm, predicate: OTerm, object: OTerm): RDF.Term[];
+    forGraphs(callback: QuadCallback, subject: OTerm, predicate: OTerm, object: OTerm): void;
+    createBlankNode(suggestedName?: string): BlankNode;
+
+    // match, removeMatches and deleteGraph are missing for full RDF.Store adherence
+    remove(stream: stream.Stream): EventEmitter;
+}
+export interface StoreConstructor {
+  new (triples?: RDF.Quad[], options?: StoreOptions): N3Store;
+  (triples?: RDF.Quad[], options?: StoreOptions): N3Store;
+}
+export const Store: StoreConstructor;
+
+export interface StoreOptions {
+    factory?: RDF.DataFactory;
+}
+
+export namespace Util {
+    function isNamedNode(value: RDF.Term | null): boolean;
+    function isBlankNode(value: RDF.Term | null): boolean;
+    function isLiteral(value: RDF.Term | null): boolean;
+    function isVariable(value: RDF.Term | null): boolean;
+    function isDefaultGraph(value: RDF.Term | null): boolean;
+    function inDefaultGraph(value: RDF.Quad): boolean;
+    function prefix(iri: string, factory?: RDF.DataFactory): (suffix: string) => RDF.NamedNode;
+    function prefixes(defaultPrefixes: Prefixes, factory?: RDF.DataFactory): (iri: string) => (suffix: string) => RDF.NamedNode;
+}
diff --git a/types/n3/n3-tests.ts b/types/n3/n3-tests.ts
index d3c664c61e..367b602c8a 100644
--- a/types/n3/n3-tests.ts
+++ b/types/n3/n3-tests.ts
@@ -1,10 +1,10 @@
 import * as N3 from "n3";
+import * as RDF from "rdf-js";
 import * as fs from "fs";
 import * as stream from "stream";
 
 function test_serialize() {
-
-    var writer: N3.N3Writer = N3.Writer(
+    const writer: N3.N3Writer = new N3.Writer(
         {
             format: "ttl",
             prefixes: {
@@ -13,169 +13,171 @@ function test_serialize() {
                 g: "http://base.google.com/ns/1.0"
             }
         });
-    writer.addTriple({
-        subject: "subject-name",
-        predicate: "predicate-name",
-        object: N3.Util.createLiteral(12)
-    });
+    writer.addQuad(N3.DataFactory.quad(
+      N3.DataFactory.namedNode("subject-name"),
+      N3.DataFactory.namedNode("predicate-name"),
+      N3.DataFactory.literal(12)
+    ));
 
     writer.end((error, result) => {
         console.log(`result ${result}`);
     });
 }
 
-/**
+/*
 The following tests are taken from ...
 https://github.com/RubenVerborgh/N3.js/blob/master/README.md
 */
 
 function test_doc_rdf_to_triples_1() {
-    var parser = N3.Parser();
-    parser.parse('@prefix c: <http://example.org/cartoons#>.\n' +
-        'c:Tom a c:Cat.\n' +
-        'c:Jerry a c:Mouse;\n' +
-        '        c:smarterThan c:Tom.',
-        function (error: Error, triple: N3.Triple, prefixes: N3.Prefixes) {
-            if (triple)
-                console.log(triple.subject, triple.predicate, triple.object, '.');
+    const parser: N3.N3Parser = new N3.Parser();
+    parser.parse(`@prefix c: <http://example.org/cartoons#>.
+        c:Tom a c:Cat.
+        c:Jerry a c:Mouse;
+                c:smarterThan c:Tom.`,
+        (error: Error, quad: RDF.Quad, prefixes: N3.Prefixes) => {
+            if (quad)
+                console.log(quad.subject, quad.predicate, quad.object, quad.graph, '.');
             else
-                console.log("# That's all, folks!", prefixes)
+                console.log("# That's all, folks!", prefixes);
         });
 }
 
 function test_doc_rdf_to_triples_2() {
-    var parser1 = N3.Parser({ format: 'N-Triples' });
-    var parser2 = N3.Parser({ format: 'application/trig' });
+    const parser1: N3.N3Parser = new N3.Parser({ format: 'N-Triples' });
+    const parser2: N3.N3Parser = new N3.Parser({ format: 'application/trig' });
     // Notation3 (N3) is supported only through the format argument:
 
-    var parser3 = N3.Parser({ format: 'N3' });
-    var parser4 = N3.Parser({ format: 'Notation3' });
-    var parser5 = N3.Parser({ format: 'text/n3' });
+    const parser3: N3.N3Parser = N3.Parser({ format: 'N3' });
+    const parser4: N3.N3Parser = N3.Parser({ format: 'Notation3' });
+    const parser5: N3.N3Parser = N3.Parser({ format: 'text/n3' });
 }
 
 function test_doc_rdf_stream_to_triples_1() {
-    var parser = N3.Parser();
-    var rdfStream = fs.createReadStream('cartoons.ttl');
-    parser.parse(rdfStream, console.log);
+    const parser: N3.N3Parser = new N3.Parser();
+    parser.parse('abc', console.log);
 
-    var streamParser = N3.StreamParser();
-    var rdfStream = fs.createReadStream('cartoons.ttl');
-    rdfStream.pipe(streamParser);
+    const streamParser: N3.N3StreamParser = N3.StreamParser();
+    const quad: RDF.Quad = streamParser.read();
+    const rdfStream = fs.createReadStream('cartoons.ttl');
+    const pipedStreamParser: N3.N3StreamParser = rdfStream.pipe(streamParser);
     streamParser.pipe(new class SlowConsumer extends stream.Writable {
         constructor() {
             super({ objectMode: true });
-            this._write = function (triple, encoding, done) {
-                console.log(triple);
+            this._write = (quad: RDF.Quad, encoding, done) => {
+                console.log(quad);
                 setTimeout(done, 1000);
             };
         }
-    });
+    }());
 }
 
 function test_doc_from_triples_to_string() {
-    var writer = N3.Writer({ prefixes: { c: 'http://example.org/cartoons#' } });
-    writer.addTriple('http://example.org/cartoons#Tom',
-        'http://www.w3.org/1999/02/22-rdf-syntax-ns#type',
-        'http://example.org/cartoons#Cat');
-    writer.addTriple({
-        subject: 'http://example.org/cartoons#Tom',
-        predicate: 'http://example.org/cartoons#name',
-        object: '"Tom"'
-    });
-    writer.end(function (error, result) { console.log(result); });
+    const writer: N3.N3Writer = new N3.Writer({ prefixes: { c: 'http://example.org/cartoons#' } });
+    writer.addQuad(N3.DataFactory.quad(
+        N3.DataFactory.namedNode('http://example.org/cartoons#Tom'),
+        N3.DataFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
+        N3.DataFactory.namedNode('http://example.org/cartoons#Cat')
+    ));
+    writer.addQuad(N3.DataFactory.quad(
+      N3.DataFactory.namedNode('http://example.org/cartoons#Tom'),
+      N3.DataFactory.namedNode('http://example.org/cartoons#name'),
+      N3.DataFactory.literal('Tom'),
+    ));
+    writer.end((error, result: string) => { console.log(result); });
 
-    var writer1 = N3.Writer({ format: 'N-Triples' });
-    var writer2 = N3.Writer({ format: 'application/trig' });
+    const writer1: N3.N3Writer = N3.Writer({ format: 'N-Triples' });
+    const writer2: N3.N3Writer = N3.Writer({ format: 'application/trig' });
 }
 
 function test_doc_from_triples_to_rdf_stream() {
-    var writer = N3.Writer(process.stdout, { prefixes: { c: 'http://example.org/cartoons#' } });
-    writer.addTriple('http://example.org/cartoons#Tom',
-        'http://www.w3.org/1999/02/22-rdf-syntax-ns#type',
-        'http://example.org/cartoons#Cat');
-    writer.addTriple({
-        subject: 'http://example.org/cartoons#Tom',
-        predicate: 'http://example.org/cartoons#name',
-        object: '"Tom"'
-    });
+    const writer: N3.N3Writer = new N3.Writer(process.stdout, { prefixes: { c: N3.DataFactory.namedNode('http://example.org/cartoons#') } });
+    writer.addQuad(N3.DataFactory.quad(
+      N3.DataFactory.namedNode('http://example.org/cartoons#Tom'),
+      N3.DataFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
+      N3.DataFactory.namedNode('http://example.org/cartoons#Cat'),
+    ));
+    writer.addQuad(N3.DataFactory.quad(
+      N3.DataFactory.namedNode('http://example.org/cartoons#Tom'),
+      N3.DataFactory.namedNode('http://example.org/cartoons#name'),
+      N3.DataFactory.literal('Tom'),
+    ));
     writer.end();
 }
 
 function test_doc_from_triple_stream_to_rdf_stream() {
-    var streamParser = new N3.StreamParser(),
-        inputStream = fs.createReadStream('cartoons.ttl'),
-        streamWriter = /* new */ N3.StreamWriter({ prefixes: { c: 'http://example.org/cartoons#' } });
+    const streamParser: N3.N3StreamParser = new N3.StreamParser();
+    const inputStream = fs.createReadStream('cartoons.ttl');
+    const streamWriter: N3.N3StreamWriter = new N3.StreamWriter({ prefixes: { c: N3.DataFactory.namedNode('http://example.org/cartoons#') } });
     inputStream.pipe(streamParser);
     streamParser.pipe(streamWriter);
     streamWriter.pipe(process.stdout);
 }
 
 function test_doc_blank_nodes_and_lists() {
-    var writer = N3.Writer({
+    const writer: N3.N3Writer = new N3.Writer({
         prefixes: {
             c: 'http://example.org/cartoons#',
             foaf: 'http://xmlns.com/foaf/0.1/'
         }
     });
-    writer.addTriple(writer.blank('http://xmlns.com/foaf/0.1/givenName', '"Tom"@en'),
-        'http://www.w3.org/1999/02/22-rdf-syntax-ns#type',
-        'http://example.org/cartoons#Cat');
-    writer.addTriple('http://example.org/cartoons#Jerry',
-        'http://xmlns.com/foaf/0.1/knows',
+    writer.addQuad(writer.blank(N3.DataFactory.namedNode('http://xmlns.com/foaf/0.1/givenName'), N3.DataFactory.literal('Tom', 'en')),
+        N3.DataFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
+        N3.DataFactory.namedNode('http://example.org/cartoons#Cat'));
+    writer.addQuad(N3.DataFactory.namedNode('http://example.org/cartoons#Jerry'),
+        N3.DataFactory.namedNode('http://xmlns.com/foaf/0.1/knows'),
         writer.blank([{
-            predicate: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#type',
-            object: 'http://example.org/cartoons#Cat'
+            predicate: N3.DataFactory.namedNode('http://www.w3.org/1999/02/22-rdf-syntax-ns#type'),
+            object: N3.DataFactory.namedNode('http://example.org/cartoons#Cat')
         }, {
-            predicate: 'http://xmlns.com/foaf/0.1/givenName',
-            object: '"Tom"@en',
+            predicate: N3.DataFactory.namedNode('http://xmlns.com/foaf/0.1/givenName'),
+            object: N3.DataFactory.literal('Tom', 'en'),
         }]));
-    writer.addTriple('http://example.org/cartoons#Mammy',
-        'http://example.org/cartoons#hasPets',
+    writer.addQuad(N3.DataFactory.namedNode('http://example.org/cartoons#Mammy'),
+        N3.DataFactory.namedNode('http://example.org/cartoons#hasPets'),
         writer.list([
-            'http://example.org/cartoons#Tom',
-            'http://example.org/cartoons#Jerry'
+            N3.DataFactory.namedNode('http://example.org/cartoons#Tom'),
+            N3.DataFactory.namedNode('http://example.org/cartoons#Jerry')
         ]));
-    writer.end(function (error, result) { console.log(result); });
+    writer.end((error, result) => { console.log(result); });
 }
 
 function test_doc_storing() {
-    var store = N3.Store();
-    store.addTriple('http://ex.org/Pluto', 'http://ex.org/type', 'http://ex.org/Dog');
-    store.addTriple('http://ex.org/Mickey', 'http://ex.org/type', 'http://ex.org/Mouse');
+    const store: N3.N3Store = new N3.Store();
+    store.addQuad(N3.DataFactory.namedNode('http://ex.org/Pluto'), N3.DataFactory.namedNode('http://ex.org/type'), N3.DataFactory.namedNode('http://ex.org/Dog'));
+    store.addQuad(N3.DataFactory.quad(N3.DataFactory.namedNode('http://ex.org/Mickey'), N3.DataFactory.namedNode('http://ex.org/type'), N3.DataFactory.namedNode('http://ex.org/Mouse')));
+    store.addQuads([N3.DataFactory.quad(N3.DataFactory.namedNode('http://ex.org/Mickey'), N3.DataFactory.namedNode('http://ex.org/type'), N3.DataFactory.namedNode('http://ex.org/Mouse'))]);
+    store.removeQuad(N3.DataFactory.namedNode('http://ex.org/Mickey'), N3.DataFactory.namedNode('http://ex.org/type'), N3.DataFactory.namedNode('http://ex.org/Mouse'));
+    store.removeQuad(N3.DataFactory.quad(N3.DataFactory.namedNode('http://ex.org/Mickey'), N3.DataFactory.namedNode('http://ex.org/type'), N3.DataFactory.namedNode('http://ex.org/Mouse')));
+    store.removeQuads([N3.DataFactory.quad(N3.DataFactory.namedNode('http://ex.org/Mickey'), N3.DataFactory.namedNode('http://ex.org/type'), N3.DataFactory.namedNode('http://ex.org/Mouse'))]);
 
-    var mickey = store.find('http://ex.org/Mickey', null, null)[0];
+    const bnode1: RDF.BlankNode = store.createBlankNode();
+    const bnode2: RDF.BlankNode = store.createBlankNode('abc');
+
+    const mickey: RDF.Quad = store.getQuads(N3.DataFactory.namedNode('http://ex.org/Mickey'), null, null, null)[0];
     console.log(mickey.subject, mickey.predicate, mickey.object, '.');
 }
 
 function test_doc_utility() {
-    var N3Util = N3.Util;
-    N3Util.isIRI('http://example.org/cartoons#Mickey'); // true
+    const N3Util = N3.Util;
+    N3Util.isNamedNode(N3.DataFactory.namedNode('http://example.org/cartoons#Mickey')); // true
 
-    N3Util.isLiteral('"Mickey Mouse"'); // true
-    N3Util.getLiteralValue('"Mickey Mouse"'); // 'Mickey Mouse'
-    N3Util.isLiteral('"Mickey Mouse"@en'); // true
-    N3Util.getLiteralLanguage('"Mickey Mouse"@en'); // 'en'
-    N3Util.isLiteral('"3"^^http://www.w3.org/2001/XMLSchema#integer'); // true
-    N3Util.getLiteralType('"3"^^http://www.w3.org/2001/XMLSchema#integer'); // 'http://www.w3.org/2001/XMLSchema#integer'
-    N3Util.isLiteral('"http://example.org/"'); // true
-    N3Util.getLiteralValue('"http://example.org/"'); // 'http://example.org/'
+    N3Util.isLiteral(N3.DataFactory.literal('Mickey Mouse')); // true
+    N3Util.isLiteral(N3.DataFactory.literal('Mickey Mouse', 'en')); // true
+    N3Util.isLiteral(N3.DataFactory.literal('3', N3.DataFactory.namedNode('http://www.w3.org/2001/XMLSchema#integer'))); // true
+    N3Util.isLiteral(N3.DataFactory.literal('http://example.org/')); // true
 
-    N3Util.isLiteral('"This word is "quoted"!"'); // true
-    N3Util.isLiteral('"3"^^http://www.w3.org/2001/XMLSchema#integer'); // true
+    N3Util.isLiteral(N3.DataFactory.literal('This word is "quoted"!')); // true
+    N3Util.isLiteral(N3.DataFactory.literal('3', N3.DataFactory.namedNode('http://www.w3.org/2001/XMLSchema#integer'))); // true
 
     new N3.Parser().parse('<a> <b> "This word is \\"quoted\\"!".', console.log);
     // { subject: 'a', predicate: 'b', object: '"This word is "quoted"!"' }
 
-    N3Util.createLiteral('My text', 'en-gb');
-    N3Util.createLiteral('123', 'http://www.w3.org/2001/XMLSchema#integer');
-    N3Util.createLiteral(123);
-    N3Util.createLiteral(false);
+    N3Util.isBlankNode(N3.DataFactory.blankNode('b1')); // true
+    N3Util.isNamedNode(N3.DataFactory.blankNode('b1')); // false
+    N3Util.isLiteral(N3.DataFactory.blankNode('b1')); // false
 
-    N3Util.isBlank('_:b1'); // true
-    N3Util.isIRI('_:b1'); // false
-    N3Util.isLiteral('_:b1'); // false
-
-    var prefixes: N3.Prefixes = { rdfs: 'http://www.w3.org/2000/01/rdf-schema#' };
-    N3Util.isPrefixedName('rdfs:label'); // true;
-    N3Util.expandPrefixedName('rdfs:label', prefixes); // http://www.w3.org/2000/01/rdf-schema#label
+    const prefixes: N3.Prefixes = { rdfs: N3.DataFactory.namedNode('http://www.w3.org/2000/01/rdf-schema#') };
+    const namedNode1: RDF.NamedNode = N3Util.prefix('http://www.w3.org/2000/01/rdf-schema#')('label');
+    const namedNode2: RDF.NamedNode = N3Util.prefixes(prefixes)('rdfs')('label');
 }
diff --git a/types/n3/tsconfig.json b/types/n3/tsconfig.json
index 4ba121903d..11e61e58e3 100644
--- a/types/n3/tsconfig.json
+++ b/types/n3/tsconfig.json
@@ -21,4 +21,4 @@
         "index.d.ts",
         "n3-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/n3/tslint.json b/types/n3/tslint.json
index a41bf5d19a..d88586e5bd 100644
--- a/types/n3/tslint.json
+++ b/types/n3/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+  "extends": "dtslint/dt.json"
 }
diff --git a/types/named-routes/index.d.ts b/types/named-routes/index.d.ts
new file mode 100644
index 0000000000..b983ba1911
--- /dev/null
+++ b/types/named-routes/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for named-routes 2.0
+// Project: https://github.com/alubbe/named-routes#readme
+// Definitions by: Philipp Katz <https://github.com/qqilihq>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as express from 'express';
+
+declare module 'express-serve-static-core' {
+    interface Application {
+        namedRoutes: NamedRouter;
+    }
+    // tslint:disable-next-line interface-name
+    interface IRouterMatcher<T> {
+        (path: PathParams, name: string, ...handlers: RequestHandler[]): T;
+        (path: PathParams, name: string, ...handlers: RequestHandlerParams[]): T;
+    }
+}
+
+interface RouterOptions {
+    caseSensitive: boolean;
+}
+
+interface RouteOptions {
+    name: string;
+    recursiveWildcard: boolean;
+    caseSensitive: boolean;
+    wildcardInPairs: boolean;
+}
+
+interface RouteParams {
+    [ key: string ]: string | string[] | number | number[] | boolean | boolean[] | null;
+}
+
+declare class NamedRouter {
+    constructor(options?: Partial<RouterOptions>);
+    match(req: express.Request): boolean | object;
+    add(method: string, path: string, callbacks: express.RequestHandler | express.RequestHandler[], options?: Partial<RouteOptions>): void;
+    build(name: string, params?: RouteParams, method?: string): string;
+    registerAppHelpers(app: express.Express): NamedRouter;
+    param(name: string, callback: express.RequestHandler): NamedRouter;
+    param(callback: express.RequestHandler): NamedRouter;
+    dispatch(req: express.Request, res?: express.Response, next?: express.NextFunction): void;
+    extendExpress(app: express.Express | express.Router): NamedRouter;
+}
+
+export = NamedRouter;
diff --git a/types/named-routes/named-routes-tests.ts b/types/named-routes/named-routes-tests.ts
new file mode 100644
index 0000000000..9b424a2c45
--- /dev/null
+++ b/types/named-routes/named-routes-tests.ts
@@ -0,0 +1,35 @@
+import NamedRouter = require('named-routes');
+import * as express from 'express';
+const app = express();
+
+// constructor and `RouterOptions`
+let router = new NamedRouter();
+router = new NamedRouter({ caseSensitive: true });
+
+router.extendExpress(app); // $ExpectType NamedRouter
+router.registerAppHelpers(app); // $ExpectType NamedRouter
+app.get('/path/:id', 'foo', () => {}); // $ExpectType Express
+app.namedRoutes.build('foo', { id: 1 }); // $ExpectType string
+
+const expressRouter = express.Router();
+router.extendExpress(expressRouter); // $ExpectType NamedRouter
+expressRouter.post('/path/:id', 'foo', () => {}); // $ExpectType Router
+
+// `RouteOptions`
+router.add('get', '/path/:id', () => {}); // $ExpectType void
+router.add('get', '/path/:id', () => {}, { name: 'foo' }); // $ExpectType void
+router.add('get', '/path/:id', () => {}, { name: 'foo', recursiveWildcard: true }); // $ExpectType void
+router.add('get', '/path/:id', () => {}, { name: 'foo', caseSensitive: true }); // $ExpectType void
+router.add('get', '/path/:id', () => {}, { name: 'foo', wildcardInPairs: true }); // $ExpectType void
+
+// `RouteParams`
+router.build('foo', { string: 'a' }); // $ExpectType string
+router.build('foo', { stringArray: [ 'a', 'b' ] }); // $ExpectType string
+router.build('foo', { number: 1 }); // $ExpectType string
+router.build('foo', { numberArray: [ 1, 2 ] }); // $ExpectType string
+router.build('foo', { boolean: true }); // $ExpectType string
+router.build('foo', { booleanArray: [ true, false ] }); // $ExpectType string
+router.build('foo', { null: null }); // $ExpectType string
+
+const req: express.Request = {} as any;
+router.dispatch(req); // $ExpectType void
diff --git a/types/named-routes/tsconfig.json b/types/named-routes/tsconfig.json
new file mode 100644
index 0000000000..28060f592f
--- /dev/null
+++ b/types/named-routes/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",
+        "named-routes-tests.ts"
+    ]
+}
diff --git a/types/named-routes/tslint.json b/types/named-routes/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/named-routes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nano/index.d.ts b/types/nano/index.d.ts
index 7fafa72382..3e3faeb3cb 100644
--- a/types/nano/index.d.ts
+++ b/types/nano/index.d.ts
@@ -855,6 +855,9 @@ declare namespace nano {
     descending?: boolean;
 
     // Stop returning records when the specified key is reached.
+    endkey?: string;
+
+    // Stop returning records when the specified key is reached. end_key is an alias for endkey
     end_key?: string;
 
     // Stop returning records when the specified document ID is reached.
@@ -883,6 +886,9 @@ declare namespace nano {
     stale?: string;
 
     // Return records starting with the specified key.
+    startkey?: string;
+
+    // Return records starting with the specified key. start_key is an alias for startkey
     start_key?: string;
 
     // Return records starting with the specified document ID.
diff --git a/types/nanoevents/index.d.ts b/types/nanoevents/index.d.ts
new file mode 100644
index 0000000000..0da2f0add3
--- /dev/null
+++ b/types/nanoevents/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for nanoevents 1.0
+// Project: https://github.com/ai/nanoevents#readme
+// Definitions by: nju33 <https://github.com/nju33>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare function unbind(): void;
+
+declare class NanoEvents<T extends object> {
+    on<U extends keyof T>(name: U, callBack: (arg: T[U]) => any): typeof unbind;
+    emit<U extends keyof T>(name: U, value: T[U]): void;
+}
+
+export = NanoEvents;
diff --git a/types/nanoevents/nanoevents-tests.ts b/types/nanoevents/nanoevents-tests.ts
new file mode 100644
index 0000000000..7e6eaa8cd8
--- /dev/null
+++ b/types/nanoevents/nanoevents-tests.ts
@@ -0,0 +1,8 @@
+import NanoEvents = require('nanoevents');
+import unbindAll = require('nanoevents/unbind-all');
+
+const emitter = new NanoEvents<{foo: {foo: string}, bar: {bar: string}}>();
+const unbind = emitter.on('foo', action => action.foo);
+emitter.emit('bar', {bar: 'test'});
+unbind();
+unbindAll(emitter);
diff --git a/types/nanoevents/tsconfig.json b/types/nanoevents/tsconfig.json
new file mode 100644
index 0000000000..d3291ed1d9
--- /dev/null
+++ b/types/nanoevents/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
+    },
+    "files": [
+        "index.d.ts",
+        "nanoevents-tests.ts",
+        "unbind-all.d.ts"
+    ]
+}
diff --git a/types/nanoevents/tslint.json b/types/nanoevents/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nanoevents/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nanoevents/unbind-all.d.ts b/types/nanoevents/unbind-all.d.ts
new file mode 100644
index 0000000000..1f5662e493
--- /dev/null
+++ b/types/nanoevents/unbind-all.d.ts
@@ -0,0 +1,5 @@
+import NanoEmitter = require('.');
+
+declare function unbindAll(emitter: NanoEmitter<any>): void;
+
+export = unbindAll;
diff --git a/types/nanographql/index.d.ts b/types/nanographql/index.d.ts
new file mode 100644
index 0000000000..aca13fdaa5
--- /dev/null
+++ b/types/nanographql/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for nanographql 2.0
+// Project: https://github.com/yoshuawuyts/nanographql
+// Definitions by: Christopher Dieringer <https://github.com/cdaringe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export = nanographql;
+
+declare function nanographql(query: TemplateStringsArray | string): (variables?: object) => string;
diff --git a/types/nanographql/nanographql-tests.ts b/types/nanographql/nanographql-tests.ts
new file mode 100644
index 0000000000..22ff648033
--- /dev/null
+++ b/types/nanographql/nanographql-tests.ts
@@ -0,0 +1,24 @@
+import gql = require('nanographql');
+
+// TemplateStringArray query test
+const templateStringQueryFactory = gql`
+query($name: String!) {
+    movie (name: $name) {
+        releaseDate
+    }
+}
+`;
+const templatedQuery = templateStringQueryFactory({ name: 'Back to the Future' });
+JSON.parse(templatedQuery);
+
+// string query test
+const stringField = 'movie';
+const strinQueryFactory = gql(`
+    query($name: String!) {
+        ${stringField} (name: $name) {
+            releaseDate
+        }
+    }
+`);
+const stringQuery = strinQueryFactory({ name: 'Back to the Future' });
+JSON.parse(stringQuery);
diff --git a/types/nanographql/tsconfig.json b/types/nanographql/tsconfig.json
new file mode 100644
index 0000000000..6784900b60
--- /dev/null
+++ b/types/nanographql/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",
+        "nanographql-tests.ts"
+    ]
+}
diff --git a/types/nanographql/tslint.json b/types/nanographql/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/nanographql/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/nanoid/async-browser.d.ts b/types/nanoid/async-browser.d.ts
new file mode 100644
index 0000000000..7d96f06f29
--- /dev/null
+++ b/types/nanoid/async-browser.d.ts
@@ -0,0 +1,3 @@
+declare function nanoidAsyncBrowser(size?: number): Promise<string>;
+
+export = nanoidAsyncBrowser;
diff --git a/types/nanoid/async.d.ts b/types/nanoid/async.d.ts
new file mode 100644
index 0000000000..a455681f11
--- /dev/null
+++ b/types/nanoid/async.d.ts
@@ -0,0 +1,8 @@
+interface NanoidAsync {
+  (size?: number): Promise<string>;
+  (size: number | null, callback: (error: Error | null, id: string) => any): void;
+}
+
+declare const nanoidAsync: NanoidAsync;
+
+export = nanoidAsync;
diff --git a/types/nanoid/index.d.ts b/types/nanoid/index.d.ts
index 5ec4ccc025..ec18370859 100644
--- a/types/nanoid/index.d.ts
+++ b/types/nanoid/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for nanoid 1.0
+// Type definitions for nanoid 1.2
 // Project: https://github.com/ai/nanoid
 // Definitions by: Ruben Schmidmeister <https://github.com/bash>
+//                 Daniel Zhang <https://github.com/fadezhanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare function nanoid(size?: number): string;
diff --git a/types/nanoid/nanoid-tests.ts b/types/nanoid/nanoid-tests.ts
index 063bb3317d..e026ec0659 100644
--- a/types/nanoid/nanoid-tests.ts
+++ b/types/nanoid/nanoid-tests.ts
@@ -4,6 +4,8 @@ import generate = require('nanoid/generate');
 import random = require('nanoid/random');
 import randomBrowser = require('nanoid/random-browser');
 import url = require('nanoid/url');
+import nanoidAsync = require('nanoid/async');
+import nanoidAsyncBrowser = require('nanoid/async-browser');
 
 const _random = (size: number) => [1, 2, 3, 4];
 
@@ -13,5 +15,12 @@ format(_random, "abcdef", 5);
 generate('0123456789абвгдеё', 5);
 random(10);
 randomBrowser(10);
+nanoidAsync().then((id) => console.log(id));
+nanoidAsync(10).then((id) => console.log(id));
+nanoidAsync(null, (error, id) => {
+  console.log(error, id);
+});
+nanoidAsyncBrowser().then((id) => console.log(id));
+nanoidAsyncBrowser(10).then((id) => console.log(id));
 
 console.log(url);
diff --git a/types/nanoid/tsconfig.json b/types/nanoid/tsconfig.json
index cab6900700..1051097a89 100644
--- a/types/nanoid/tsconfig.json
+++ b/types/nanoid/tsconfig.json
@@ -17,6 +17,8 @@
         "strictFunctionTypes": true
     },
     "files": [
+        "async-browser.d.ts",
+        "async.d.ts",
         "format.d.ts",
         "generate.d.ts",
         "index.d.ts",
@@ -25,4 +27,4 @@
         "random.d.ts",
         "url.d.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/navermaps/index.d.ts b/types/navermaps/index.d.ts
index ec857696bf..8ba4d52bd5 100644
--- a/types/navermaps/index.d.ts
+++ b/types/navermaps/index.d.ts
@@ -39,7 +39,7 @@ declare namespace naver.maps {
    */
    interface MapEventListener {
      eventName: string;
-     listener: () => any;
+     listener: (event: any) => any;
      listenerId: string;
      target: any;
    }
@@ -1303,14 +1303,14 @@ declare namespace naver.maps {
 
   function Event(): void;
   namespace Event {
-    function addDOMListener(element: HTMLElement, eventName: string, listener: () => any): void;
-    function addListener(target: any, eventName: string, listener: () => any): MapEventListener;
+    function addDOMListener(element: HTMLElement, eventName: string, listener: (event: any) => any): void;
+    function addListener(target: any, eventName: string, listener: (event: any) => any): MapEventListener;
     function clearInstanceListeners(target: any): void;
     function clearListeners(target: any, fromEventName: string): void;
     function forward(source: any, fromEventName: string, target: any, toEventName: string): MapEventListener;
     function hasListener(target: any, eventName: string): boolean;
-    function once(target: any, eventName: string, listener: () => any): MapEventListener;
-    function removeDOMListener(element: HTMLElement, eventName: string, listener: () => any): void;
+    function once(target: any, eventName: string, listener: (event: any) => any): MapEventListener;
+    function removeDOMListener(element: HTMLElement, eventName: string, listener: (event: any) => any): void;
     function removeDOMListener(listeners: DOMEventListener | DOMEventListener[]): void;
     function removeListener(listeners: MapEventListener | MapEventListener[]): void;
     function resumeDispatch(target: any, eventName: string): void;
diff --git a/types/navigation-react/index.d.ts b/types/navigation-react/index.d.ts
index 3d98c0d5a5..330f0e9a52 100644
--- a/types/navigation-react/index.d.ts
+++ b/types/navigation-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://grahammendick.github.io/navigation/
 // Definitions by: Graham Mendick <https://github.com/grahammendick>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { StateNavigator } from 'navigation';
 import { Component, HTMLProps } from 'react';
diff --git a/types/nested-error-stacks/index.d.ts b/types/nested-error-stacks/index.d.ts
new file mode 100644
index 0000000000..29d629a50b
--- /dev/null
+++ b/types/nested-error-stacks/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for nested-error-stacks 2.1
+// Project: https://github.com/mdlavin/nested-error-stacks
+// Definitions by: Wouter van Heeswijk <https://github.com/woutervh->
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class NestedError extends Error {
+    constructor(message?: any, nested?: Error);
+}
+
+export = NestedError;
diff --git a/types/nested-error-stacks/nested-error-stacks-tests.ts b/types/nested-error-stacks/nested-error-stacks-tests.ts
new file mode 100644
index 0000000000..52a9a55495
--- /dev/null
+++ b/types/nested-error-stacks/nested-error-stacks-tests.ts
@@ -0,0 +1,6 @@
+import NestedErrorStacks = require('nested-error-stacks');
+
+const error = new NestedErrorStacks('Top level error', new Error('Nested error'));
+const message = error.message;
+const name = error.name;
+const stack = error.stack;
diff --git a/types/nested-error-stacks/tsconfig.json b/types/nested-error-stacks/tsconfig.json
new file mode 100644
index 0000000000..2954204b36
--- /dev/null
+++ b/types/nested-error-stacks/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",
+        "nested-error-stacks-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/nested-error-stacks/tslint.json b/types/nested-error-stacks/tslint.json
new file mode 100644
index 0000000000..b4b47a0378
--- /dev/null
+++ b/types/nested-error-stacks/tslint.json
@@ -0,0 +1,3 @@
+{
+	"extends": "dtslint/dt.json"
+}
diff --git a/types/new-relic-browser/index.d.ts b/types/new-relic-browser/index.d.ts
index 0064ee4ad2..581d6efb52 100644
--- a/types/new-relic-browser/index.d.ts
+++ b/types/new-relic-browser/index.d.ts
@@ -3,8 +3,6 @@
 // Definitions by: Rene Hamburger <https://github.com/renehamburger>, Piotr Kubisa <https://github.com/piotrkubisa>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare const newrelic: NewRelic.Browser;
-
 declare namespace NewRelic {
     interface Browser {
         /**
@@ -15,7 +13,7 @@ declare namespace NewRelic {
          * @param releaseId The ID or version of this release; for example, a version number, build number
          *   from your CI environment, GitHub SHA, GUID, or a hash of the contents. Since New Relic converts this
          *   value into a string, you can also use null or undefined if necessary
-         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/addRelease
+         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/add-release
          */
         addRelease(releaseName: string, releaseId: string): void;
 
@@ -25,9 +23,9 @@ declare namespace NewRelic {
          * @param name Name or category of the action. Reports to Insights as the actionName attribute.
          * @param attributes JSON object with one or more key/value pairs.
          *   The key will report to Insights as its own PageAction attribute with the specified values.
-         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/addPageAction
+         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/add-page-action
          */
-        addPageAction(name: string, attributes: { [key: string]: string }): void;
+        addPageAction(name: string, attributes: { [key: string]: string | number }): void;
 
         /**
          * Adds a JavaScript object with a custom name, start time, etc. to an in-progress session trace.
@@ -53,7 +51,7 @@ declare namespace NewRelic {
          *
          * @param Provide a meaningful error message that you can use when analyzing data on
          *   New Relic Browser's JavaScript errors page.
-         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/noticeError
+         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/notice-error
          */
         noticeError(error: any): void;
 
@@ -65,7 +63,7 @@ declare namespace NewRelic {
          * @param value Value of the attribute. Appears as the value in the named attribute column in the
          *   PageView event. It will appear as a column in the PageAction event if you are using it. Custom attribute
          *   values cannot be complex objects, only simple types such as strings and numbers.
-         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/setCustomAttribute
+         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/set-custom-attribute
          */
         setCustomAttribute(name: string, value: string): void;
 
@@ -74,7 +72,7 @@ declare namespace NewRelic {
          *
          * @param filterCallback The callback will be called with each error, so it is not
          *   specific to one error. `err` will usually be an error object, but it can be other data types.
-         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/setErrorHandler
+         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/set-error-handler
          */
         setErrorHandler(filterCallback: (err: any) => boolean): void;
 
@@ -86,7 +84,7 @@ declare namespace NewRelic {
          *   To further group these custom transactions, provide a custom host. Otherwise, the page views will be
          *   assigned the default domain custom.transaction. Segments within the name must be explicitly added to
          *   the Whitelist segments in your URL whitelist settings if they do not already appear.
-         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/setPageViewName
+         * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/set-pageview-name
          */
         setPageViewName(name: string, host?: string): void;
 
@@ -186,7 +184,7 @@ declare namespace NewRelic {
          * Adds a custom SPA attribute only to the current interaction in New Relic Browser.
          *
          * @param key Used as the attribute name on the BrowserInteraction event.
-         * @param Used as the attribute value on the BrowserInteraction event. This can be a
+         * @param value Used as the attribute value on the BrowserInteraction event. This can be a
          *   string, number, boolean, or object. If it is an object, New Relic serializes it to a JSON string.
          * @returns This method returns the same API object created by interaction().
          * @see https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api/spa-set-attribute
@@ -205,3 +203,6 @@ declare namespace NewRelic {
         setName(name: string, trigger?: string): BrowserInteraction;
     }
 }
+
+declare const api: NewRelic.Browser;
+export = api;
diff --git a/types/new-relic-browser/new-relic-browser-tests.ts b/types/new-relic-browser/new-relic-browser-tests.ts
index b9f75b142d..b593f335e1 100644
--- a/types/new-relic-browser/new-relic-browser-tests.ts
+++ b/types/new-relic-browser/new-relic-browser-tests.ts
@@ -1,3 +1,5 @@
+import newrelic = require("new-relic-browser");
+
 // The following tests are largely taken straight from the examples at https://docs.newrelic.com/docs/browser/new-relic-browser/browser-agent-spa-api
 
 // --- NewRelic.Browser methods ----------------------------------------------
@@ -7,6 +9,7 @@ newrelic.addRelease('checkout page', 'a818994');
 
 // addPageAction()
 newrelic.addPageAction('copy-text-button', { result: 'success' });
+newrelic.addPageAction('async-action', { duration: 3000 });
 
 // addToTrace()
 newrelic.addToTrace({
diff --git a/types/next-redux-wrapper/index.d.ts b/types/next-redux-wrapper/index.d.ts
index cdbcb7b9e5..16af858743 100644
--- a/types/next-redux-wrapper/index.d.ts
+++ b/types/next-redux-wrapper/index.d.ts
@@ -1,66 +1,48 @@
-// Type definitions for next-redux-wrapper 1.4
+// Type definitions for next-redux-wrapper 2.0
 // Project: https://github.com/kirill-konshin/next-redux-wrapper
 // Definitions by: Steve <https://github.com/stevegeek>
+//                 Jungwoo-An <https://github.com/Jungwoo-An>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
 /// <reference types="node" />
-/*~ Note that ES6 modules cannot directly export callable functions.
- *~ This file should be imported using the CommonJS-style:
- *~   import x = require('next-redux-wrapper');
- *~
- *~ Refer to the documentation to understand common
- *~ workarounds for this limitation of ES6 modules.
- */
 
-import * as React from 'react';
 import { IncomingMessage, ServerResponse } from 'http';
+import { ComponentType } from 'react';
 import {
-    Store, Component,
     MapDispatchToPropsParam, MapStateToPropsParam,
     MergeProps, Options as ConnectOptions
 } from 'react-redux';
-
-export = nextReduxWrapper;
-
-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>) => nextReduxWrapper.NextReduxWrappedComponent<TOwnProps>;
-declare function nextReduxWrapper<TInitialState = any, TStateProps = any, TDispatchProps = any, TOwnProps = any, TMergedProps = any>(
-    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>) => nextReduxWrapper.NextReduxWrappedComponent<TOwnProps>;
+import { Store } from 'redux';
 
 declare namespace nextReduxWrapper {
-    interface NextPageComponentMethods {
-        getInitialProps(props: any): Promise<any>;
-    }
-    type NextReduxWrappedComponent<P> = Component<P> & 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;
+    interface Options {
         storeKey?: string;
-        mapStateToProps?: MapStateToPropsParam<TStateProps, TOwnProps, any>;
-        mapDispatchToProps?: MapDispatchToPropsParam<TDispatchProps, TOwnProps>;
-        mergeProps?: MergeProps<TStateProps, TDispatchProps, TOwnProps, TMergedProps>;
-        connectOptions?: ConnectOptions;
+        debug?: boolean;
     }
-    interface StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> extends Options<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> {
+
+    interface StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> extends Options {
         isServer: boolean;
         req?: IncomingMessage;
         res?: ServerResponse;
         query?: any;
     }
 
-    function setPromise(Promise: any): void;
-    function setDebug(debug: boolean): void;
+    interface NextPageComponentMethods {
+        getInitialProps(props: any): Promise<any>;
+    }
+
+    type NextReduxWrappedComponent<P> = ComponentType<P> & NextPageComponentMethods;
+
+    type NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps> = (
+        initialState: TInitialState,
+        options: StoreCreatorOptions<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>
+    ) => Store<TInitialState>;
 }
+
+declare function nextReduxWrapper<TInitialState = any, TStateProps = any, TDispatchProps = any, TOwnProps = any, TMergedProps = any>(
+    makeStore: nextReduxWrapper.NextStoreCreator<TInitialState, TStateProps, TDispatchProps, TOwnProps, TMergedProps>,
+    config?: nextReduxWrapper.Options
+): (ComponentType: ComponentType<TOwnProps & TMergedProps>) => nextReduxWrapper.NextReduxWrappedComponent<TOwnProps>;
+
+export default nextReduxWrapper;
diff --git a/types/next-redux-wrapper/next-redux-wrapper-tests.tsx b/types/next-redux-wrapper/next-redux-wrapper-tests.tsx
index 89e358afb2..2d338ec220 100644
--- a/types/next-redux-wrapper/next-redux-wrapper-tests.tsx
+++ b/types/next-redux-wrapper/next-redux-wrapper-tests.tsx
@@ -1,18 +1,17 @@
 import * as React from 'react';
-import withRedux = require('next-redux-wrapper');
+import withRedux from 'next-redux-wrapper';
 import { createStore, Reducer, Store, AnyAction } from 'redux';
-import { StoreCreatorOptions } from 'next-redux-wrapper';
 
 interface InitialState {
     foo: string;
 }
 
-const reducer: Reducer<InitialState> = (state: InitialState = {foo: ''}, action: AnyAction): InitialState => {
+const reducer: Reducer<InitialState> = (state: InitialState = { foo: '' }, action: AnyAction): InitialState => {
     switch (action.type) {
         case 'FOO':
-            return {...state, foo: action.payload};
-    default:
-        return state;
+            return { ...state, foo: action.payload };
+        default:
+            return state;
     }
 };
 
@@ -29,14 +28,10 @@ interface Props {
     custom: string;
 }
 
-interface ReduxStore {
-    foo: string;
-}
-
 class Page extends React.Component<OwnProps & Props> {
-    static getInitialProps({store, isServer, pathname, query}: any) {
-        store.dispatch({type: 'FOO', payload: 'foo'});
-        return {custom: 'custom'};
+    static getInitialProps({ store, isServer, pathname, query }: any) {
+        store.dispatch({ type: 'FOO', payload: 'foo' });
+        return { custom: 'custom' };
     }
     render() {
         return (
@@ -53,48 +48,17 @@ type DispatchProps = Props;
 type MergedProps = Props;
 
 // Test various typings
-const Com1 = withRedux(makeStore, (state: ReduxStore) => ({foo: state.foo}))(Page);
 
-const Com2 = withRedux(makeStore, (state: ReduxStore) => ({foo: state.foo}))(Page);
-
-const Com3 = withRedux<InitialState>(makeStore, (state: ReduxStore) => ({foo: state.foo}))(Page);
-
-const Com4 = withRedux<InitialState, ConnectStateProps>(
-    makeStore,
-    (state: ReduxStore) => ({foo: state.foo, custom: 'hi'})
-)(Page);
-
-const Com5 = withRedux<InitialState, ConnectStateProps, DispatchProps, OwnProps, MergedProps>(
-    makeStore,
-    (state: ReduxStore) => ({foo: state.foo, custom: 'hi'}),
-    undefined,
-    (state: Props) => ({foo: state.foo, custom: 'hi'})
-)(Page);
-
-const Com6 = withRedux<InitialState, ConnectStateProps, DispatchProps, OwnProps, MergedProps>(
-    (initialState: InitialState, options: StoreCreatorOptions<InitialState, ConnectStateProps, DispatchProps, OwnProps, MergedProps>) => {
+const Com1 = withRedux<InitialState, ConnectStateProps, DispatchProps, OwnProps, MergedProps>(
+    (initialState: InitialState, options) => {
         if (options.isServer || options.req || options.query || options.res) {
             const a = 1;
         }
         return createStore(reducer, initialState);
     },
-    (state: ReduxStore) => ({foo: state.foo, custom: 'hi'}),
-    undefined,
-    (state: Props) => ({foo: state.foo, custom: 'hi'})
 )(Page);
 
-const Com7 = withRedux({
-    createStore: makeStore,
-    mapStateToProps: (state: ReduxStore) => ({foo: state.foo})
-})(Page);
+const Com2 = withRedux(makeStore)(Page);
 
-const com1Instance = (<Com1 />);
+const com1Instance = (<Com1 bar="foo" />);
 const com2Instance = (<Com2 />);
-const com3Instance = (<Com3 />);
-const com4Instance = (<Com4 />);
-const com5Instance = (<Com5 bar="foo" />);
-const com6Instance = (<Com6 bar="foo" />);
-const com7Instance = (<Com7 />);
-
-withRedux.setPromise(Promise);
-withRedux.setDebug(true);
diff --git a/types/next/app.d.ts b/types/next/app.d.ts
index 18bca653cf..d077c0e95a 100644
--- a/types/next/app.d.ts
+++ b/types/next/app.d.ts
@@ -1,18 +1,19 @@
 import * as React from "react";
 import { NextContext } from ".";
-import { SingletonRouter } from "./router";
+import { RouterProps, DefaultQuery } from "./router";
 
-export interface AppComponentProps {
+export interface AppComponentProps<Q = DefaultQuery> {
     Component: React.ComponentType<any>;
+    router: RouterProps<Q>;
     pageProps: any;
 }
 
-export interface AppComponentContext {
+export interface AppComponentContext<Q = DefaultQuery> {
     Component: React.ComponentType<any>;
-    router: SingletonRouter;
-    ctx: NextContext;
+    router: RouterProps<Q>;
+    ctx: NextContext<Q>;
 }
 
-export class Container extends React.Component {}
+export class Container extends React.Component { }
 
-export default class App<TProps = {}> extends React.Component<TProps & AppComponentProps> {}
+export default class App<TProps = {}, Q = DefaultQuery> extends React.Component<TProps & AppComponentProps<Q>> { }
diff --git a/types/next/document.d.ts b/types/next/document.d.ts
index 38e20e00c0..0b21fb53c8 100644
--- a/types/next/document.d.ts
+++ b/types/next/document.d.ts
@@ -1,33 +1,62 @@
 import * as React from "react";
+
 import { NextContext } from ".";
 
-export interface DocumentProps {
-    __NEXT_DATA__?: any;
-    dev?: boolean;
-    chunks?: string[];
+export interface RenderPageResponse {
+    buildManifest: { [key: string]: any };
+    chunks: {
+        names: string[];
+        filenames: string[];
+    };
     html?: string;
-    head?: Array<React.ReactElement<any>>;
-    errorHtml?: string;
-    styles?: Array<React.ReactElement<any>>;
+    head: Array<React.ReactElement<any>>;
+    errorHtml: string;
+}
 
+export interface PageProps {
+    url: string;
+}
+
+export interface AnyPageProps extends PageProps {
     [key: string]: any;
 }
 
+export type Enhancer<E extends PageProps = AnyPageProps, P extends any = E> = (page: React.ComponentType<P>) => React.ComponentType<E>;
+
 /**
  * Context object used inside `Document`
  */
 export interface NextDocumentContext extends NextContext {
     /** A callback that executes the actual React rendering logic (synchronously) */
-    renderPage(
-        cb?: (enhancer: () => JSX.Element) => React.ComponentType<any>
-    ): {
-        [key: string]: any
-    };
+    renderPage<E extends PageProps = AnyPageProps, P extends any = E>(enhancer?: Enhancer<E, P>): RenderPageResponse; // tslint:disable-line:no-unnecessary-generics
 }
 
-export class Head extends React.Component<any> {}
+export interface DocumentProps {
+    __NEXT_DATA__?: any;
+    dev?: boolean;
+    chunks?: {
+        names: string[];
+        filenames: string[];
+    };
+    html?: string;
+    head?: Array<React.ReactElement<any>>;
+    errorHtml?: string;
+    styles?: Array<React.ReactElement<any>>;
+    [key: string]: any;
+}
+
+export interface HeadProps {
+    nonce?: string;
+    [key: string]: any;
+}
+
+export interface NextScriptProps {
+    nonce?: string;
+}
+
+export class Head extends React.Component<HeadProps> {}
 export class Main extends React.Component {}
-export class NextScript extends React.Component {}
+export class NextScript extends React.Component<NextScriptProps> {}
 export default class extends React.Component<DocumentProps> {
-    static getInitialProps(ctx: NextContext): DocumentProps;
+    static getInitialProps(ctx: NextDocumentContext): Promise<DocumentProps> | DocumentProps;
 }
diff --git a/types/next/index.d.ts b/types/next/index.d.ts
index 95395bc2b8..399963cbd8 100644
--- a/types/next/index.d.ts
+++ b/types/next/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for next 6.0
+// Type definitions for next 6.1
 // Project: https://github.com/zeit/next.js
 // Definitions by: Drew Hays <https://github.com/dru89>
 //                 Brice BERNARD <https://github.com/brikou>
 //                 James Hegedus <https://github.com/jthegedus>
 //                 Resi Respati <https://github.com/resir014>
 //                 Scott Jones <https://github.com/scottdj92>
+//                 Joao Vieira <https://github.com/joaovieira>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
@@ -15,24 +16,22 @@ import * as url from "url";
 
 import { Response as NodeResponse } from "node-fetch";
 
+import { SingletonRouter } from './router';
+
 declare namespace next {
+    /** Map object used in query strings. */
+    type QueryStringMapObject = Record<string, string | string[] | undefined>;
+
     /**
      * Context object used in methods like `getInitialProps()`
-     * <<https://github.com/zeit/next.js/issues/1651>>
+     * https://github.com/zeit/next.js/blob/6.1.1/server/render.js#L77
+     * https://github.com/zeit/next.js/blob/6.1.1/readme.md#fetching-data-and-component-lifecycle
      */
-    interface NextContext {
+    interface NextContext<Q = QueryStringMapObject> {
         /** path section of URL */
         pathname: string;
         /** query string section of URL parsed as an object */
-        query: {
-            [key: string]:
-                | boolean
-                | boolean[]
-                | number
-                | number[]
-                | string
-                | string[];
-        };
+        query: Q;
         /** String of the actual path (including the query) shows in the browser */
         asPath: string;
         /** HTTP request object (server only) */
@@ -45,16 +44,19 @@ declare namespace next {
         err?: Error;
     }
 
-    type NextSFC<TProps = {}> = NextStatelessComponent<TProps>;
-    interface NextStatelessComponent<TProps = {}>
+    type NextSFC<TProps = {}, Q = QueryStringMapObject> = NextStatelessComponent<TProps, Q>;
+    interface NextStatelessComponent<TProps = {}, Q = QueryStringMapObject>
         extends React.StatelessComponent<TProps> {
-        getInitialProps?: (ctx: NextContext) => Promise<TProps>;
+        getInitialProps?: (ctx: NextContext<Q>) => Promise<TProps>;
     }
 
     type UrlLike = url.UrlObject | url.Url;
 
+    /**
+     * Next.js config schema.
+     * https://github.com/zeit/next.js/blob/6.1.1/server/config.js#L10
+     */
     interface ServerConfig {
-        // known keys
         webpack?: any;
         webpackDevMiddleware?: any;
         poweredByHeader?: boolean;
@@ -62,11 +64,20 @@ declare namespace next {
         assetPrefix?: string;
         configOrigin?: string;
         useFileSystemPublicRoutes?: boolean;
+        generateBuildId?: () => string;
+        generateEtags?: boolean;
+        pageExtensions?: string[];
+        publicRuntimeConfig?: object;
+        serverRuntimeConfig?: object;
 
-        // and since this is a config, it can take anything else, too.
+        // Plugin can define their own keys.
         [key: string]: any;
     }
 
+    /**
+     * Options passed to the Server constructor in Node.js.
+     * https://github.com/zeit/next.js/blob/6.1.1/server/index.js#L30
+     */
     interface ServerOptions {
         dir?: string;
         dev?: boolean;
@@ -75,8 +86,36 @@ declare namespace next {
         conf?: ServerConfig;
     }
 
+    /**
+     * Next.js server instance API.
+     */
     interface Server {
-        setAssetPrefix: (cdnUrl: string) => void;
+        // From constructor
+        // https://github.com/zeit/next.js/blob/6.1.1/server/index.js#L30
+        dir: string;
+        dev: boolean;
+        quiet: boolean;
+        router: SingletonRouter;
+        http: null | http.Server;
+        nextConfig: ServerConfig;
+        distDir: string;
+        buildId: string;
+        hotReloader: any;
+        renderOpts: {
+            dev: string;
+            staticMarkup: boolean;
+            distDir: string;
+            hotReloader: any;
+            buildId: string;
+            availableChunks: object;
+            generateETags: boolean;
+            runtimeConfig?: object;
+        };
+
+        getHotReloader(
+            dir: string,
+            options: { quiet: boolean; config: ServerConfig; buildId: string }
+        ): any;
         handleRequest(
             req: http.IncomingMessage,
             res: http.ServerResponse,
@@ -87,6 +126,8 @@ declare namespace next {
             res: http.ServerResponse,
             parsedUrl?: UrlLike
         ) => Promise<void>;
+        setAssetPrefix(prefix: string): void;
+
         prepare(): Promise<void>;
         close(): Promise<void>;
         defineRoutes(): Promise<void>;
@@ -101,66 +142,34 @@ declare namespace next {
             req: http.IncomingMessage,
             res: http.ServerResponse,
             pathname: string,
-            query?: {
-                [key: string]:
-                    | boolean
-                    | boolean[]
-                    | number
-                    | number[]
-                    | string
-                    | string[];
-            },
+            query?: QueryStringMapObject,
             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[];
-            }
+            query?: QueryStringMapObject
         ): Promise<string>;
+        renderError(
+            err: any,
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            pathname: string,
+            query?: QueryStringMapObject
+        ): Promise<void>;
         renderErrorToHTML(
             err: any,
             req: http.IncomingMessage,
             res: http.ServerResponse,
             pathname: string,
-            query?: {
-                [key: string]:
-                    | boolean
-                    | boolean[]
-                    | number
-                    | number[]
-                    | string
-                    | string[];
-            }
+            query?: QueryStringMapObject
         ): Promise<string>;
+        render404(
+            req: http.IncomingMessage,
+            res: http.ServerResponse,
+            parsedUrl?: UrlLike
+        ): Promise<void>;
 
         serveStatic(
             req: http.IncomingMessage,
@@ -168,19 +177,9 @@ declare namespace next {
             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;
+        getCompilationError(): Promise<any>;
         send404(res: http.ServerResponse): void;
     }
 }
diff --git a/types/next/router.d.ts b/types/next/router.d.ts
index 544c29bc7e..be3665e3d5 100644
--- a/types/next/router.d.ts
+++ b/types/next/router.d.ts
@@ -3,63 +3,100 @@ import * as url from "url";
 
 type UrlLike = url.UrlObject | url.Url;
 
+type EventName = 'routeChangeStart'
+    | 'routeChangeComplete'
+    | 'routeChangeError'
+    | 'beforeHistoryChange'
+    | 'hashChangeStart'
+    | 'hashChangeComplete';
+
+interface RouteChangeError {
+    cancelled: boolean;
+}
+
+type EventHandler = (url: string) => any;
+type ErrorEventHandler = (err: RouteChangeError, url: string) => any;
+
 export interface EventChangeOptions {
     shallow?: boolean;
     [key: string]: any;
 }
 
+export type PopStateCallback = (state: any) => boolean | undefined;
+
 export type RouterCallback = () => void;
-export interface RouterProps {
-    // router properties
-    readonly components: {
-        [key: string]: { Component: React.ComponentType<any>; err: any };
-    };
+
+export interface DefaultQuery {
+    [key: string]:
+    | boolean
+    | boolean[]
+    | number
+    | number[]
+    | string
+    | string[];
+}
+
+export interface RouterProps<Q = DefaultQuery> {
+    // url property fields
     readonly pathname: string;
     readonly route: string;
     readonly asPath?: string;
-    readonly query?: {
-        [key: string]:
-            | boolean
-            | boolean[]
-            | number
-            | number[]
-            | string
-            | string[];
+    readonly query?: Q;
+
+    // property fields
+    readonly components: {
+        [key: string]: { Component: React.ComponentType<any>; err: any };
     };
 
-    // router methods
-    reload(route: string): Promise<void>;
+    // core method fields
     back(): void;
+    beforePopState(cb: PopStateCallback): boolean;
+    prefetch(url: string): Promise<React.ComponentType<any>>;
     push(
         url: string | UrlLike,
         as?: string | UrlLike,
         options?: EventChangeOptions,
     ): Promise<boolean>;
+    reload(route: string): Promise<void>;
     replace(
         url: string | UrlLike,
         as?: string | UrlLike,
         options?: EventChangeOptions,
     ): Promise<boolean>;
-    prefetch(url: string): Promise<React.ComponentType<any>>;
 
-    // router events
+    // events (deprecated soonish)
     onAppUpdated?(nextRoute: string): void;
-    onRouteChangeStart?(url: string): void;
     onBeforeHistoryChange?(as: string): void;
+    onHashChangeStart?(url: string): void;
+    onHashChangeComplete?(url: string): void;
     onRouteChangeComplete?(url: string): void;
-    onRouteChangeError?(error: any, url: string): void;
+    onRouteChangeError?(error: RouteChangeError, url: string): void;
+    onRouteChangeStart?(url: string): void;
+
+    // events API (6.1.1+)
+    readonly events: {
+        on: (eventName: EventName, handler: EventHandler | ErrorEventHandler) => void;
+        off: (eventName: EventName, handler: (url: string) => any) => void;
+    };
 }
 
-export interface SingletonRouter {
-    router: RouterProps;
+export interface SingletonRouter<Q = DefaultQuery> extends RouterProps<Q> {
+    router: RouterProps<Q> | null;
     readyCallbacks: RouterCallback[];
     ready(cb: RouterCallback): void;
 }
 
-export function withRouter<T extends {}>(
-    Component: React.ComponentType<T & SingletonRouter>,
+export interface WithRouterProps<Q = DefaultQuery> {
+    router: SingletonRouter<Q>;
+}
+
+// Manually disabling the no-unnecessary-generics rule so users can
+// retain type inference if they warp their component in withRouter
+// without defining props explicitly
+export function withRouter<T extends {}, Q = DefaultQuery>(
+    // tslint:disable-next-line:no-unnecessary-generics
+    Component: React.ComponentType<T & WithRouterProps<Q>>,
 ): React.ComponentType<T>;
 
-export const Singleton: SingletonRouter;
-export type ImperativeRouter = RouterProps;
-export default Singleton;
+declare const Router: SingletonRouter;
+export default Router;
diff --git a/types/next/test/next-app-tests.tsx b/types/next/test/next-app-tests.tsx
index 3e7c56f87c..14ef737a06 100644
--- a/types/next/test/next-app-tests.tsx
+++ b/types/next/test/next-app-tests.tsx
@@ -17,7 +17,7 @@ class TestApp extends App<NextComponentProps> {
     }
 
     render() {
-        const { Component, pageProps } = this.props;
+        const { Component, router, pageProps } = this.props;
         return (
             <Container>
                 <Component {...pageProps} />
diff --git a/types/next/test/next-document-tests.tsx b/types/next/test/next-document-tests.tsx
index 2b3257cd25..40f01adfef 100644
--- a/types/next/test/next-document-tests.tsx
+++ b/types/next/test/next-document-tests.tsx
@@ -1,7 +1,7 @@
-import Document, { Head, Main, NextScript, NextDocumentContext } from 'next/document';
+import Document, { DocumentProps, Enhancer, Head, Main, NextScript, NextDocumentContext, PageProps } from 'next/document';
 import * as React from "react";
 
-const results = (
+const basicResults = (
     <Document any="property" should="work" here>
         <Head some="more" properties>
             <meta name="description" content="Head can have children, too!" />
@@ -11,16 +11,25 @@ const results = (
     </Document>
 );
 
-const Wrapper: React.SFC = ({ children }) => <React.Fragment>{children}</React.Fragment>;
+const withNonce = (
+    <Document>
+        <Head nonce="12345" />
+        <NextScript nonce="12345" />
+    </Document>
+);
 
-export default class MyDocument extends Document {
+class MyDoc extends Document {
     static async getInitialProps({ renderPage }: NextDocumentContext) {
-        // Without callback
-        const page = renderPage();
-        // With callback
-        const differentPage = renderPage(App => props => <Wrapper><App {...props} /></Wrapper>);
+        // without callback
+        const _page = renderPage();
+
+        // with callback
+        const enhancer: Enhancer<PageProps, {}> = (App) => (props) => (<App />);
+        const { html, head, errorHtml, chunks, buildManifest } = renderPage(enhancer);
+
         const style = {};
-        return { ...page, style };
+
+        return { html, head, errorHtml, chunks, buildManifest, style };
     }
 
     render() {
@@ -33,8 +42,45 @@ export default class MyDocument extends Document {
                 <body>
                     <Main />
                     <NextScript />
+                    {this.props.children}
                 </body>
             </html>
         );
     }
 }
+
+const extendedResults = (
+    <MyDoc any="property" should="work" here>
+        <Head some="more" properties>
+            <meta name="description" content="Head can have children, too!" />
+        </Head>
+        <h1>Hey there</h1>
+    </MyDoc>
+);
+
+const renderPage: NextDocumentContext['renderPage'] = (enhancer) => ({
+    buildManifest: {},
+    chunks: { names: [], filenames: [] },
+    html: '',
+    head: [<React.Fragment />],
+    errorHtml: '',
+});
+
+interface PageInitialProps extends PageProps {
+    foo: string;
+    bar: number;
+}
+
+interface ProcessedInitialProps {
+    fooLength: number;
+    bar: boolean;
+}
+
+const enhancerExplicit: Enhancer<PageProps, {}> = (App) => (props) => (<App />);
+const enhancerInferred = (App: React.ComponentType<ProcessedInitialProps>) => ({ foo, bar }: PageInitialProps) => (<App fooLength={foo.length} bar={!!bar} />);
+const explicitEnhancerRenderResponse = renderPage(enhancerExplicit);
+const inferredEnhancerRenderResponse = renderPage(enhancerInferred);
+const defaultedTypesRenderResponse = renderPage((App) => (props) => (<App url={props.url} />));
+const defaultedTypesExtendedRenderResponse = renderPage((App) => (props) => (<App foo="bar" url={props.url} />));
+const explicitTypesRenderResponseOne = renderPage<PageProps, {}>((App) => (props) => (<App />));
+const explicitTypesRenderResponseTwo = renderPage<PageInitialProps, ProcessedInitialProps>((App) => ({ foo, bar }) => (<App fooLength={foo.length} bar={!!bar} />));
diff --git a/types/next/test/next-router-tests.tsx b/types/next/test/next-router-tests.tsx
index 822b9b8e6f..04fa50b912 100644
--- a/types/next/test/next-router-tests.tsx
+++ b/types/next/test/next-router-tests.tsx
@@ -1,4 +1,4 @@
-import Router, * as r from "next/router";
+import Router, { withRouter, WithRouterProps } from "next/router";
 import * as React from "react";
 import * as qs from "querystring";
 
@@ -13,8 +13,8 @@ Router.ready(() => {
 
 // Access readonly properties of the router.
 
-Object.keys(Router.router.components).forEach(key => {
-    const c = Router.router.components[key];
+Object.keys(Router.components).forEach(key => {
+    const c = Router.components[key];
     c.err.isAnAny;
 
     return <c.Component />;
@@ -26,52 +26,83 @@ function split(routeLike: string) {
     });
 }
 
-if (Router.router.asPath) {
-    split(Router.router.asPath);
-    split(Router.router.asPath);
+if (Router.asPath) {
+    split(Router.asPath);
+    split(Router.asPath);
 }
 
-split(Router.router.pathname);
+split(Router.pathname);
 
-const query = `?${qs.stringify(Router.router.query)}`;
+const query = `?${qs.stringify(Router.query)}`;
 
 // Assign some callback methods.
-Router.router.onAppUpdated = (nextRoute: string) => console.log(nextRoute);
-Router.router.onRouteChangeStart = (url: string) =>
-    console.log("Route is starting to change.", url);
-Router.router.onBeforeHistoryChange = (as: string) =>
-    console.log("History hasn't changed yet.", as);
-Router.router.onRouteChangeComplete = (url: string) =>
-    console.log("Route chaneg is complete.", url);
-Router.router.onRouteChangeError = (err: any, url: string) =>
-    console.log("Route is starting to change.", url, err);
+Router.events.on('routeChangeStart', (url: string) => console.log("Route is starting to change.", url));
+Router.events.on('beforeHistoryChange', (as: string) => console.log("History hasn't changed yet.", as));
+Router.events.on('routeChangeComplete', (url: string) => console.log("Route change is complete.", url));
+Router.events.on('routeChangeError', (err: any, url: string) => console.log("Route change errored.", err, url));
 
 // Call methods on the router itself.
-Router.router.reload("/route").then(() => console.log("route was reloaded"));
-Router.router.back();
+Router.reload("/route").then(() => console.log("route was reloaded"));
+Router.back();
+Router.beforePopState(({ url }) => !!url);
 
-Router.router.push("/route").then((success: boolean) =>
+Router.push("/route").then((success: boolean) =>
     console.log("route push success: ", success),
 );
-Router.router.push("/route", "/asRoute").then((success: boolean) =>
+Router.push("/route", "/asRoute").then((success: boolean) =>
     console.log("route push success: ", success),
 );
-Router.router.push("/route", "/asRoute", { shallow: false }).then((success: boolean) =>
+Router.push("/route", "/asRoute", { shallow: false }).then((success: boolean) =>
     console.log("route push success: ", success),
 );
 
-Router.router.replace("/route").then((success: boolean) =>
+Router.replace("/route").then((success: boolean) =>
     console.log("route replace success: ", success),
 );
-Router.router.replace("/route", "/asRoute").then((success: boolean) =>
+Router.replace("/route", "/asRoute").then((success: boolean) =>
     console.log("route replace success: ", success),
 );
-Router.router.replace("/route", "/asRoute", {
+Router.replace("/route", "/asRoute", {
     shallow: false,
 }).then((success: boolean) => console.log("route replace success: ", success));
 
-Router.router.prefetch("/route").then(Component => {
+Router.prefetch("/route").then(Component => {
     const element = <Component />;
 });
 
-r.withRouter(props => <div />);
+interface TestComponentProps {
+    testValue: string;
+}
+
+class TestComponent extends React.Component<TestComponentProps & WithRouterProps> {
+    state = { ready: false };
+
+    constructor(props: TestComponentProps & WithRouterProps) {
+        super(props);
+        props.router.ready(() => {
+            this.setState({ ready: true });
+        });
+    }
+
+    render() {
+        return (
+            <div>
+                <h1>{this.state.ready ? 'Ready' : 'Not Ready'}</h1>
+                <h2>Route: {this.props.router.route}</h2>
+                <p>Another prop: {this.props.testValue}</p>
+            </div>
+        );
+    }
+}
+
+withRouter(TestComponent);
+
+interface TestSFCQuery {
+    test?: string;
+}
+
+interface TestSFCProps extends WithRouterProps<TestSFCQuery> { }
+
+const TestSFC: React.SFC<TestSFCProps> = ({ router }) => {
+    return <div>{router.query && router.query.test}</div>;
+};
diff --git a/types/next/test/next-tests.ts b/types/next/test/next-tests.ts
index ddbc51ee33..2e717f6698 100644
--- a/types/next/test/next-tests.ts
+++ b/types/next/test/next-tests.ts
@@ -10,13 +10,22 @@ const server = createServer({
         distDir: "./dist",
         useFileSystemPublicRoutes: false,
         anotherProperty: {
-            key: true,
-        },
-    },
+            key: true
+        }
+    }
 });
 
-const voidFunc = () => {};
-const stringFunc = (x: string) => x.split("\n");
+const {
+    dir,
+    dev,
+    quiet,
+    router,
+    nextConfig,
+    distDir,
+    buildId
+ } = server;
+ const { assetPrefix } = nextConfig;
+ const voidFunc = () => {};
 
 server.prepare().then(voidFunc);
 server.close().then(voidFunc);
@@ -68,11 +77,9 @@ function handle(req: http.IncomingMessage, res: http.ServerResponse) {
 
     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.getCompilationError().then(err => err.thisIsAnAny);
     server.send404(res);
 }
diff --git a/types/ngreact/index.d.ts b/types/ngreact/index.d.ts
index 6db92506ce..1f4a31b6be 100644
--- a/types/ngreact/index.d.ts
+++ b/types/ngreact/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ngReact/ngReact
 // Definitions by: Vicky Lai <https://github.com/velveret>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="angular"/>
 /// <reference types="react"/>
diff --git a/types/nock/index.d.ts b/types/nock/index.d.ts
index 90eae08189..afebacf1e5 100644
--- a/types/nock/index.d.ts
+++ b/types/nock/index.d.ts
@@ -1,17 +1,20 @@
-// Type definitions for nock v9.1.3
+// Type definitions for nock v9.3.3
 // Project: https://github.com/node-nock/nock
 // 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>
 //                 Garanzha Dmitriy <https://github.com/damour>
+//                 GP <https://github.com/paambaati>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
 
+import { Url } from 'url';
+
 export = nock;
 
-declare function nock(basePath: string | RegExp, options?: nock.Options): nock.Scope;
+declare function nock(basePath: string | RegExp | Url, options?: nock.Options): nock.Scope;
 
 declare namespace nock {
     export function cleanAll(): void;
diff --git a/types/nock/nock-tests.ts b/types/nock/nock-tests.ts
index 7ed4ecc25d..06f8458bcb 100644
--- a/types/nock/nock-tests.ts
+++ b/types/nock/nock-tests.ts
@@ -1,5 +1,6 @@
 import nock = require('nock');
 import * as fs from 'fs';
+import { URL } from 'url';
 
 var scope: nock.Scope;
 var inst: nock.Interceptor;
@@ -144,6 +145,11 @@ var couchdb = nock('http://myapp.iriscouch.com')
                   email: 'pedro.teixeira@gmail.com'
                  });
 
+// Using URL as input
+var scope = nock(new URL('https://example.org/'))
+    .get('/resource')
+    .reply(200, 'url matched');
+
 // Specifying hostname
 var scope = nock('http://www.example.com')
     .get('/resource')
diff --git a/types/node-dijkstra/index.d.ts b/types/node-dijkstra/index.d.ts
new file mode 100644
index 0000000000..20c97d7425
--- /dev/null
+++ b/types/node-dijkstra/index.d.ts
@@ -0,0 +1,148 @@
+// Type definitions for node-dijkstra 2.5
+// Project: https://github.com/albertorestifo/node-dijkstra
+// Definitions by: Jorge López <https://github.com/nokutu>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare class Graph {
+    /**
+     * Creates a new Graph, optionally initializing it a nodes graph representation.
+     *
+     * A graph representation is an object that has as keys the name of the point and as values
+     * the points reachable from that node, with the cost to get there:
+     *
+     *     {
+     *       node (Number|String): {
+     *         neighbor (Number|String): cost (Number),
+     *         ...,
+     *       },
+     *     }
+     *
+     * In alternative to an object, you can pass a `Map` of `Map`. This will
+     * allow you to specify numbers as keys.
+     *
+     * @param [graph] - Initial graph definition
+     * @example
+     *
+     * const route = new Graph();
+     *
+     * // Pre-populated graph
+     * const route = new Graph({
+     *   A: { B: 1 },
+     *   B: { A: 1, C: 2, D: 4 },
+     * });
+     *
+     * // Passing a Map
+     * const g = new Map()
+     *
+     * const a = new Map()
+     * a.set('B', 1)
+     *
+     * const b = new Map()
+     * b.set('A', 1)
+     * b.set('C', 2)
+     * b.set('D', 4)
+     *
+     * g.set('A', a)
+     * g.set('B', b)
+     *
+     * const route = new Graph(g)
+     */
+    constructor(nodes?: any[]);
+
+    /**
+     * Adds a node to the graph
+     *
+     * @param name      - Name of the node
+     * @param neighbors - Neighboring nodes and cost to reach them
+     * @example
+     *
+     * const route = new Graph();
+     *
+     * route.addNode('A', { B: 1 });
+     *
+     * // It's possible to chain the calls
+     * route
+     *   .addNode('B', { A: 1 })
+     *   .addNode('C', { A: 3 });
+     *
+     * // The neighbors can be expressed in a Map
+     * const d = new Map()
+     * d.set('A', 2)
+     * d.set('B', 8)
+     *
+     * route.addNode('D', d)
+     */
+    addNode(name: string, neighbors: any): Graph;
+
+    /**
+     * Removes a node and all of its references from the graph
+     *
+     * @param key - Key of the node to remove from the graph
+     * @example
+     *
+     * const route = new Graph({
+     *   A: { B: 1, C: 5 },
+     *   B: { A: 3 },
+     *   C: { B: 2, A: 2 },
+     * });
+     *
+     * route.removeNode('C');
+     * // The graph now is:
+     * // { A: { B: 1 }, B: { A: 3 } }
+     */
+    removeNode(name: string): Graph;
+
+    /**
+     * Compute the shortest path between the specified nodes
+     *
+     * @param start     - Starting node
+     * @param goal      - Node we want to reach
+     * @param [options] - Options
+     *
+     * @param [options.trim]    - Exclude the origin and destination nodes from the result
+     * @param [options.reverse] - Return the path in reversed order
+     * @param [options.cost]    - Also return the cost of the path when set to true
+     *
+     * @return Computed path between the nodes.
+     *
+     *  When `option.cost` is set to true, the returned value will be an object with shape:
+     *    - `path` *(Array)*: Computed path between the nodes
+     *    - `cost` *(Number)*: Cost of the path
+     *
+     * @example
+     *
+     * const route = new Graph()
+     *
+     * route.addNode('A', { B: 1 })
+     * route.addNode('B', { A: 1, C: 2, D: 4 })
+     * route.addNode('C', { B: 2, D: 1 })
+     * route.addNode('D', { C: 1, B: 4 })
+     *
+     * route.path('A', 'D') // => ['A', 'B', 'C', 'D']
+     *
+     * // trimmed
+     * route.path('A', 'D', { trim: true }) // => [B', 'C']
+     *
+     * // reversed
+     * route.path('A', 'D', { reverse: true }) // => ['D', 'C', 'B', 'A']
+     *
+     * // include the cost
+     * route.path('A', 'D', { cost: true })
+     * // => {
+     * //       path: [ 'A', 'B', 'C', 'D' ],
+     * //       cost: 4
+     * //    }
+     */
+    path(start: any, goal: any, options ?: PathOption): any;
+}
+
+interface PathOption {
+    trim ?: boolean;
+    reverse ?: boolean;
+    cost ?: boolean;
+    avoid ?: any[];
+}
+
+export = Graph;
diff --git a/types/node-dijkstra/node-dijkstra-tests.ts b/types/node-dijkstra/node-dijkstra-tests.ts
new file mode 100644
index 0000000000..b6a8fbff9a
--- /dev/null
+++ b/types/node-dijkstra/node-dijkstra-tests.ts
@@ -0,0 +1,12 @@
+import Graph = require('node-dijkstra');
+
+const graph = new Graph();
+const graph2 = new Graph([{A: {B: 1}}]);
+
+graph
+    .addNode('A', {B: 1})
+    .removeNode('C');
+
+graph2.path('A', 'B');
+graph.path('A', 'B', {cost: false, reverse: true});
+graph.path('A', 'B', {cost: true});
diff --git a/types/node-dijkstra/tsconfig.json b/types/node-dijkstra/tsconfig.json
new file mode 100644
index 0000000000..41f3b852bf
--- /dev/null
+++ b/types/node-dijkstra/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "esModuleInterop": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "node-dijkstra-tests.ts"
+    ]
+}
diff --git a/types/node-dijkstra/tslint.json b/types/node-dijkstra/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-dijkstra/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-fetch/index.d.ts b/types/node-fetch/index.d.ts
index b203744a72..4b12734363 100644
--- a/types/node-fetch/index.d.ts
+++ b/types/node-fetch/index.d.ts
@@ -102,7 +102,7 @@ export class Headers implements Iterable<[string, string]> {
     get(name: string): string | null;
     getAll(name: string): string[];
     has(name: string): boolean;
-    raw(): { [k: string]: string };
+    raw(): { [k: string]: string[] };
     set(name: string, value: string): void;
 
     // Iterator methods
diff --git a/types/node-fetch/node-fetch-tests.ts b/types/node-fetch/node-fetch-tests.ts
index 6f78a512cf..7561ae1b0f 100644
--- a/types/node-fetch/node-fetch-tests.ts
+++ b/types/node-fetch/node-fetch-tests.ts
@@ -44,7 +44,7 @@ function test_fetchUrlWithRequestObject() {
 	const request: Request = new Request("http://www.andlabs.net/html5/uCOR.php", requestOptions);
 	const timeout: number = request.timeout;
 	const size: number = request.size;
-	const agent: Agent = request.agent;
+	const agent: Agent | undefined = request.agent;
 	const protocol: string = request.protocol;
 
 	handlePromise(fetch(request));
@@ -71,3 +71,9 @@ function handlePromise(promise: Promise<Response>, isArrayBuffer: boolean = fals
 		console.log(text);
 	});
 }
+
+function test_headersRaw() {
+	const headers = new Headers();
+	const myHeader = 'foo';
+	headers.raw()[myHeader]; // $ExpectType string[]
+}
diff --git a/types/node-fetch/tsconfig.json b/types/node-fetch/tsconfig.json
index 98a8d56ff1..d349bf9665 100644
--- a/types/node-fetch/tsconfig.json
+++ b/types/node-fetch/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/node-forge/README.md b/types/node-forge/README.md
new file mode 100644
index 0000000000..fcac651de8
--- /dev/null
+++ b/types/node-forge/README.md
@@ -0,0 +1,29 @@
+# DefinitelyTyped for node-forge
+
+## Current node-forge Version
+`v0.7.6`
+## Usage
+
+```bash
+npm install --save-dev @types/node-forge
+npm install --save node-forge
+```
+
+example:
+```ts
+import * as forge from "node-forge";
+
+Buffer.isBuffer(forge.pki.ed25519.generateKeyPair().publicKey) // true
+```
+## License
+BSD-2-Clause
+
+## dependencies
+`@types/node`
+
+## Author
+[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)
+[Beeno Tung](https://github.com/beenotung)
diff --git a/types/node-forge/index.d.ts b/types/node-forge/index.d.ts
index 65ff4edb47..e30a217ddc 100644
--- a/types/node-forge/index.d.ts
+++ b/types/node-forge/index.d.ts
@@ -1,10 +1,14 @@
-// Type definitions for node-forge 0.7.5
+// Type definitions for node-forge 0.7.6
 // 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>
+//                 Beeno Tung <https://github.com/beenotung>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/// <reference types="node" />
 
 declare module "node-forge" {
     type Byte = string;
@@ -73,6 +77,33 @@ declare module "node-forge" {
             function generateKeyPair(options?: GenerateKeyPairOptions, callback?: (err: Error, keypair: KeyPair) => void): KeyPair;
         }
 
+        namespace ed25519 {
+
+            type NativeBuffer = Buffer | Uint8Array;
+
+            namespace constants {
+                const PUBLIC_KEY_BYTE_LENGTH = 32;
+                const PRIVATE_KEY_BYTE_LENGTH = 64;
+                const SEED_BYTE_LENGTH = 32;
+                const SIGN_BYTE_LENGTH = 64;
+                const HASH_BYTE_LENGTH = 64;
+            }
+
+            function generateKeyPair(options?: { seed?: Buffer | Uint8Array | string }): {
+                publicKey: NativeBuffer;
+                privateKey: NativeBuffer;
+            };
+
+            function publicKeyFromPrivateKey(options: { privateKey: NativeBuffer }): NativeBuffer;
+
+            function sign(options: { privateKey: NativeBuffer }): NativeBuffer;
+
+            function verify(options: {
+                signature: Buffer | Uint8Array | util.ByteBuffer | string,
+                publicKey: NativeBuffer
+            }): boolean;
+        }
+
         interface CertificateFieldOptions {
             name?: string;
             type?: string;
diff --git a/types/node-ipc/index.d.ts b/types/node-ipc/index.d.ts
index 82e5cfa568..92eaaea49d 100644
--- a/types/node-ipc/index.d.ts
+++ b/types/node-ipc/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for node-ipc 9.1
 // Project: http://riaevangelist.github.io/node-ipc/
-// Definitions by: Arvitaly <https://github.com/arvitaly>
+// Definitions by: Arvitaly <https://github.com/arvitaly>, gjurgens <https://github.com/gjurgens>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
 import { Socket } from "net";
@@ -178,6 +178,10 @@ declare namespace NodeIPC {
          */
         on(event: "data", callback: (buffer: Buffer) => void): Client;
         emit(event: string, value?: any): Client;
+        /**
+         * Unbind subscribed events
+         */
+        off(event: string, handler: any): Client;
     }
     interface Server extends Client {
         /**
diff --git a/types/node-ipc/node-ipc-tests.ts b/types/node-ipc/node-ipc-tests.ts
index 9befb80b06..91644f3cf7 100644
--- a/types/node-ipc/node-ipc-tests.ts
+++ b/types/node-ipc/node-ipc-tests.ts
@@ -63,3 +63,4 @@ declare const socket: Socket;
 ipc.server.emit(socket, myBuffer);
 ipc.server.emit([10, 20, 30]);
 ipc.server.emit({ address: 'localhost', port: 8000 }, "message", { id: ipc.config.id, message: 'Goodbye' });
+ipc.server.off("error", "*");
diff --git a/types/node-localstorage/index.d.ts b/types/node-localstorage/index.d.ts
new file mode 100644
index 0000000000..960d40f1da
--- /dev/null
+++ b/types/node-localstorage/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for node-localstorage 1.3
+// Project: https://github.com/lmaccherone/node-localstorage
+// Definitions by: Allen Gammel <https://github.com/intolerance>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { EventEmitter } from 'events';
+
+/**
+ * A drop-in substitute for the browser native localStorage API that runs on node.js.
+ * Copyright (c) 2012, Lawrence S. Maccherone, Jr. -- https://github.com/lmaccherone/node-localstorage
+ * (MIT License)
+ */
+export class LocalStorage extends EventEmitter {
+    /**
+     * The number of keys in the local storage.
+     */
+    length: number;
+    /**
+     * Clears the local storage
+     */
+    clear(): void;
+    /**
+     * Gets the value of the given [key]
+     * @param key The key whose value you want to retrieve.
+     */
+    getItem(key: string): string | null;
+    /**
+     * Retrieves the value of the key at the [index].
+     * @param index The index of the key in which you want to return the value of.
+     */
+    key(index: number): string;
+    /**
+     * Removes the specified [key] from local storage.
+     * @param key The key you want to remove.
+     */
+    removeItem(key: string): void;
+    /**
+     * Stores a `key` and it's `value` in to the local store.
+     * @param key Unique identifier for the new local storage item
+     * @param value The value of the item
+     */
+    setItem(key: string, value: string): void;
+    /**
+     * Internal event `storage` is fired on the `removeItem`, `setItem` and `clear` methods, if subscribed.
+     * @param eventName The only `eventName` that is supported is `storage`.
+     * @param callback The call back type is of `StorageEvent`.
+     */
+    on(eventName: 'storage', callback: (event: StorageEvent) => void): this;
+    /**
+     * Creates a new LocalStorage instance
+     * @param location The location in which the local storage resides
+     * @param quota The partitioned size of the local storage
+     */
+    constructor(location: string, quota?: number);
+}
+export class JSONStorage extends LocalStorage {
+    /**
+     * Gets the value of the given `key`. This method performs a `JSON.parse` on the `value` before returning it.
+     * @param key The key whose value you want to retrieve.
+     * @returns `Array of Objects` or an `Object`. This `getItem` method performs a `JSON.parse` on the `value` before returning it.
+     */
+    getItem(key: string): any;
+    /**
+     * Stores a `key` and it's `value` in to the local store. The given `value` will have `JSON.stringify` performed on it prior to storing.
+     * @param key Unique identifier for the new local storage item
+     * @param value The value associated with the `key`. This `setItem` method performs a `JSON.stringify` on the value before storage. The `value` *must* be a valid `JSON` object.
+     */
+    setItem(key: string, value: any): void;
+    /**
+     * Creates a new LocalStorage instance
+     * @param location The location in which the local storage resides
+     * @param quota The partitioned size of the local storage
+     */
+    constructor(location: string, quota?: number);
+}
+
+/**
+ * Contains information regarding a `storage` event.
+ */
+export class StorageEvent {
+    /**
+     * Affected `key`.
+     */
+    key: string;
+    /**
+     * Previous `value` associated with the `key`.
+     */
+    oldValue: string;
+    /**
+     * Current `value` associated with the `key`.
+     */
+    newValue: string;
+    /**
+     * The current `process.pid` for the calling process.
+     */
+    url: string;
+    /**
+     * The location of the storage area. Defaults to `localStorage`.
+     */
+    storageArea: string;
+    /**
+     * Creates an object containing information regarding a `storage` event.
+     * @param key Affected `key`.
+     * @param oldValue Previous `value` associated with the `key`.
+     * @param newValue Current `value` associated with the `key`.
+     * @param url The current `process.pid` for the calling process.
+     * @param storageArea The location of the storage area. Defaults to `localStorage`.
+     */
+    constructor(key: string, oldValue: string, newValue: string, url: string, storageArea: string);
+}
+
+/**
+ * Provides a specific `Error` object for **Quota Exceeded Errors**.
+ */
+export class QUOTA_EXCEEDED_ERR extends Error {
+    /**
+     * Message explaining the error.
+     */
+    message: string;
+    /**
+     * Creates a specific `Error` object for **Quota Exceeded Errors**.
+     * @param message Message explaining the error.
+     */
+    constructor(message: string);
+}
diff --git a/types/node-localstorage/node-localstorage-tests.ts b/types/node-localstorage/node-localstorage-tests.ts
new file mode 100644
index 0000000000..25c27e622c
--- /dev/null
+++ b/types/node-localstorage/node-localstorage-tests.ts
@@ -0,0 +1,58 @@
+import { LocalStorage, JSONStorage } from 'node-localstorage';
+
+const jsonStore = new JSONStorage('./jsonStore');
+const textStore = new LocalStorage('./textStore');
+
+interface Person {
+  givenName: string;
+  middleName: string;
+  familyName: string;
+}
+
+const mjkModel: Person = {
+  givenName: 'Maynard',
+  middleName: 'James',
+  familyName: 'Keenan',
+};
+
+textStore.clear();
+jsonStore.clear();
+
+textStore.on('storage', (event) => {
+  if (textStore.getItem(event.key) !== event.newValue) {
+    throw new Error('textStore: An error occurred with the event handler.');
+  }
+});
+
+jsonStore.on('storage', (event) => {
+  if (jsonStore.getItem(event.key) !== event.newValue) {
+    throw new Error('jsonStore: An error occurred with the event handler.');
+  }
+});
+
+textStore.setItem('tool', '46&2');
+
+if (textStore.getItem('tool') !== '46&2') {
+  throw new Error('.setItem method is not working!');
+}
+
+jsonStore.setItem('mjk', mjkModel);
+
+if (jsonStore.getItem('mjk') === null) {
+  throw new Error('.getItem failed.');
+}
+
+const mjkTest: Person = jsonStore.getItem('mjk');
+
+if (mjkTest === null || mjkTest.givenName !== mjkModel.givenName || mjkTest.middleName !== mjkModel.middleName || mjkTest.familyName !== mjkModel.familyName) {
+  throw new Error('.setItem method is not working!');
+}
+
+const keyCheck = textStore.key(0);
+
+if (keyCheck && keyCheck !== 'tool') {
+  throw new Error('.key method has failed.');
+}
+
+textStore.clear();
+jsonStore.clear();
diff --git a/types/node-localstorage/tsconfig.json b/types/node-localstorage/tsconfig.json
new file mode 100644
index 0000000000..9411b285e2
--- /dev/null
+++ b/types/node-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",
+        "node-localstorage-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/node-localstorage/tslint.json b/types/node-localstorage/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/node-localstorage/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/node-memwatch/index.d.ts b/types/node-memwatch/index.d.ts
new file mode 100644
index 0000000000..5c95fe61bf
--- /dev/null
+++ b/types/node-memwatch/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for node-memwatch 1.0
+// Project: https://github.com/eduardbcom/node-memwatch#readme
+// Definitions by: Eunchong Yu <https://github.com/Kroisse>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import { EventEmitter } from 'events';
+
+export = memwatch;
+
+declare const memwatch: MemWatch;
+
+interface MemWatch extends EventEmitter {
+    on(eventName: "leak", callback: (event: LeakInformation) => void): this;
+    on(eventName: "stats", callback: (event: StatsInformation) => void): this;
+
+    /**
+     * Force V8 to do a full GC and heap compaction.
+     *
+     * It's intended to be used for debugging. Calling it in production is highly discouraged.
+     */
+    gc(): void;
+
+    HeapDiff: typeof HeapDiff;
+}
+
+interface StatsInformation {
+    current_base: number;
+    estimated_base: number;
+    heap_compactions: number;
+    max: number;
+    min: number;
+    num_full_gc: number;
+    num_inc_gc: number;
+    usage_trend: number;
+}
+
+interface LeakInformation {
+    /**
+     * Amount of heap growth in bytes.
+     */
+    growth: number;
+
+    /**
+     * Human-readable description.
+     */
+    reason: string;
+}
+
+/**
+ * Compare the state of your heap between two points in time, telling you what has been allocated, and what has been released.
+ */
+declare class HeapDiff {
+    constructor();
+
+    /**
+     * Compute the diff.
+     */
+    end: () => HeapDiffInformation;
+}
+
+interface HeapDiffInformation {
+    before: HeapDiffSnapshot;
+    after: HeapDiffSnapshot;
+    change: HeapDiffChange;
+}
+
+interface HeapDiffSnapshot {
+    nodes: number;
+    size_bytes: number;
+    size: string;
+}
+
+interface HeapDiffChange {
+    size_bytes: number;
+    size: string;
+    freed_nodes: number;
+    allocated_nodes: number;
+    details: HeapDiffDetail[];
+}
+
+interface HeapDiffDetail {
+    what: string;
+    size_bytes: number;
+    size: string;
+    "+": number;
+    "-": number;
+}
diff --git a/types/node-memwatch/node-memwatch-tests.ts b/types/node-memwatch/node-memwatch-tests.ts
new file mode 100644
index 0000000000..94910abe3b
--- /dev/null
+++ b/types/node-memwatch/node-memwatch-tests.ts
@@ -0,0 +1,14 @@
+import memwatch = require("node-memwatch");
+
+memwatch.on("stats", info => {
+    info.estimated_base;
+});
+
+memwatch.on("leak", info => {
+    info.growth;
+});
+
+const hd = new memwatch.HeapDiff();
+const diff = hd.end();
+diff.change.allocated_nodes;
+diff.change.details[0].what;
diff --git a/types/node-memwatch/tsconfig.json b/types/node-memwatch/tsconfig.json
new file mode 100644
index 0000000000..8be1b35873
--- /dev/null
+++ b/types/node-memwatch/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",
+        "node-memwatch-tests.ts"
+    ]
+}
diff --git a/types/node-memwatch/tslint.json b/types/node-memwatch/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-memwatch/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-mysql-wrapper/index.d.ts b/types/node-mysql-wrapper/index.d.ts
index 170ff5eca0..82170b4704 100644
--- a/types/node-mysql-wrapper/index.d.ts
+++ b/types/node-mysql-wrapper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nodets/node-mysql-wrapper
 // Definitions by: Makis Maropoulos <https://github.com/kataras>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 ///<reference path="./my-meteor.d.ts" />
 
diff --git a/types/node-ssdp/index.d.ts b/types/node-ssdp/index.d.ts
new file mode 100644
index 0000000000..3ae4da7643
--- /dev/null
+++ b/types/node-ssdp/index.d.ts
@@ -0,0 +1,159 @@
+// Type definitions for node-ssdp 3.3
+// Project: https://github.com/diversario/node-ssdp#readme
+// Definitions by: Olivia Trewin <https://github.com/OrionNebula>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as events from 'events';
+import * as dgram from 'dgram';
+
+export interface SsdpHeaders {
+	/**
+	 * Available while handling an SSDP response. A URL where the service description can be found.
+	 */
+	LOCATION?: string;
+	ST?: string;
+	/**
+	 * Available while handling an SSDP response. The Unique Service Name (USN) of the responding device.
+	 */
+	USN?: string;
+	[key: string]: string | number | boolean | null | undefined | symbol;
+}
+
+export interface SsdpOptions {
+	/**
+	 * SSDP signature
+	 * @default 'node.js/NODE_VERSION UPnP/1.1 node-ssdp/PACKAGE_VERSION'
+	 */
+	ssdpSig?: string;
+	/**
+	 * SSDP multicast group
+	 * @default '239.255.255.250'
+	 */
+	ssdpIp?: string;
+	/**
+	 * Multicast TTL
+	 * @default 4
+	 */
+	ssdpTtl?: number;
+	/**
+	 * SSDP port
+	 * @default 1900
+	 */
+	ssdpPort?: number;
+	/** Path to SSDP description file */
+	description?: string;
+	/** Additional headers */
+    headers?: SsdpHeaders;
+    /** A logger function to use instead of the default. The first argument to the function can contain a format string. */
+	customLogger?: (format: string, ...args: any[]) => void;
+}
+
+export interface ClientOptions extends SsdpOptions {
+	/** List of interfaces to explicitly bind. By default, bind to all available interfaces. */
+	interfaces?: string[];
+	/** Bind sockets to each discovered interface explicitly instead of relying on the system. Might help with issues with multiple NICs. */
+	explicitSocketBind?: boolean;
+	/**
+	 * When true socket.bind() will reuse the address, even if another process has already bound a socket on it.
+	 * @default true
+	 */
+	reuseAddr?: boolean;
+}
+
+export interface ServiceDescriptionLocation {
+	/**
+	 * Location protocol.
+	 * @default 'http://'
+	 */
+	protocol?: string;
+	/**
+	 * Location port.
+	 */
+	port: number;
+	/**
+	 * Location path.
+	 */
+	path: string;
+}
+
+export interface ServerOptions extends ClientOptions {
+	/**
+	 * URL pointing to description of your service, or a function that returns that URL.
+	 * For cases where there are multiple network interfaces or the IP of the host isn't known in advance,
+	 * it's possible to specify location as an object. Host will be set to the IP of the responding interface.
+	 */
+	location?: string | ServiceDescriptionLocation;
+	/**
+	 * SSDP Unique Device Name
+	 * @default 'uuid:f40c2981-7329-40b7-8b04-27f187aecfb5'
+	 */
+	udn?: string;
+	/**
+	 * Allow wildcards in M-SEARCH packets (non-standard)
+	 * @default false
+	 */
+	allowWildcards?: boolean;
+	/**
+	 * When true the SSDP server will not advertise the root device (i.e. the bare UDN). In some scenarios, this advertisement is not needed.
+	 * @default false
+	 */
+	suppressRootDeviceAdvertisements?: boolean;
+	/**
+	 * Interval at which to send out advertisement (ms)
+	 * @default 10000
+	 */
+	adInterval?: number;
+	/**
+	 * Packet TTL
+	 * @default 1800
+	 */
+	ttl?: number;
+}
+
+export abstract class Base extends events.EventEmitter {
+	constructor(opts?: SsdpOptions);
+
+	addUSN(device: string): void;
+}
+
+export class Client extends Base {
+	constructor(opts?: ClientOptions);
+
+	/**
+	 * Start the listener for multicast notifications from SSDP devices
+	 * @param cb callback to socket.bind
+	 * @returns promise when socket.bind is ready
+	 */
+	start(cb?: (error: Error) => void): Promise<void>;
+	/**
+	 * Close UDP socket.
+	 */
+	stop(): void;
+	search(serviceType: string): void | Promise<void>;
+
+	on(event: 'response', listener: (headers: SsdpHeaders, statusCode: number, rinfo: dgram.RemoteInfo) => void): this;
+	once(event: 'response', listener: (headers: SsdpHeaders, statusCode: number, rinfo: dgram.RemoteInfo) => void): this;
+	emit(event: 'response', headers: SsdpHeaders, statusCode: number, rinfo: dgram.RemoteInfo): boolean;
+}
+
+export class Server extends Base {
+	constructor(opts?: ServerOptions);
+
+	/**
+	 * Binds UDP socket to an interface/port and starts advertising.
+	 * @param cb callback to socket.bind
+	 * @returns promise when socket.bind is ready
+	 */
+	start(cb?: (error: Error) => void): void | Promise<void>;
+	/**
+	 * Advertise shutdown and close UDP socket.
+	 */
+	stop(): void;
+	advertise(alive?: boolean): void;
+
+	on(event: 'advertise-alive' | 'advertise-bye', listener: (headers: SsdpHeaders) => void): this;
+	once(event: 'advertise-alive' | 'advertise-bye', listener: (headers: SsdpHeaders) => void): this;
+	emit(event: 'advertise-alive' | 'advertise-bye', headers: SsdpHeaders): boolean;
+}
diff --git a/types/node-ssdp/node-ssdp-tests.ts b/types/node-ssdp/node-ssdp-tests.ts
new file mode 100644
index 0000000000..dbd2536e78
--- /dev/null
+++ b/types/node-ssdp/node-ssdp-tests.ts
@@ -0,0 +1,73 @@
+import { Client, Server } from 'node-ssdp';
+
+// Taken from https://github.com/diversario/node-ssdp#usage---client
+
+const client = new Client({
+	interfaces: [],
+	customLogger: format => {},
+	explicitSocketBind: true,
+	reuseAddr: true,
+	ssdpPort: 0,
+	description: '',
+	headers: {
+		key: 'value'
+	},
+	ssdpIp: '',
+	ssdpSig: '',
+	ssdpTtl: 0
+});
+
+client.on('response', (headers, statusCode, rinfo) => {
+	console.log('Got a response to an m-search.');
+});
+
+// search for a service type
+client.search('urn:schemas-upnp-org:service:ContentDirectory:1');
+
+// Or get a list of all services on the network
+
+client.search('ssdp:all');
+
+const server = new Server({
+	interfaces: [],
+	customLogger: format => {},
+	explicitSocketBind: true,
+	reuseAddr: true,
+	ssdpPort: 0,
+	location: {
+		protocol: 'http://',
+		path: '',
+		port: 80
+	},
+	suppressRootDeviceAdvertisements: true,
+	adInterval: 0,
+	allowWildcards: false,
+	description: '',
+	headers: {
+		key: 'value'
+	},
+	ssdpIp: '',
+	ssdpSig: '',
+	ssdpTtl: 0,
+	ttl: 0,
+	udn: ''
+});
+
+// Taken from https://github.com/diversario/node-ssdp#usage---server
+
+server.addUSN('upnp:rootdevice');
+server.addUSN('urn:schemas-upnp-org:device:MediaServer:1');
+server.addUSN('urn:schemas-upnp-org:service:ContentDirectory:1');
+server.addUSN('urn:schemas-upnp-org:service:ConnectionManager:1');
+
+server.on('advertise-alive', (headers) => {
+	// Expire old devices from your cache.
+	// Register advertising device somewhere (as designated in http headers heads)
+});
+
+server.on('advertise-bye', (headers) => {
+	// Remove specified device from cache.
+});
+
+// start the server
+server.start();
diff --git a/types/node-ssdp/tsconfig.json b/types/node-ssdp/tsconfig.json
new file mode 100644
index 0000000000..a85ee0905f
--- /dev/null
+++ b/types/node-ssdp/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",
+        "node-ssdp-tests.ts"
+    ]
+}
diff --git a/types/node-ssdp/tslint.json b/types/node-ssdp/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-ssdp/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-telegram-bot-api/index.d.ts b/types/node-telegram-bot-api/index.d.ts
index 32f4ae8d85..934daa3fe3 100644
--- a/types/node-telegram-bot-api/index.d.ts
+++ b/types/node-telegram-bot-api/index.d.ts
@@ -904,96 +904,96 @@ declare class TelegramBot extends EventEmitter {
 
     hasOpenWebHook(): boolean;
 
-    getMe(): Promise<TelegramBot.User | Error>;
+    getMe(): Promise<TelegramBot.User>;
 
     setWebHook(url: string, options?: TelegramBot.SetWebHookOptions): Promise<any>;
 
-    deleteWebHook(): Promise<boolean | Error>;
+    deleteWebHook(): Promise<boolean>;
 
-    getWebHookInfo(): Promise<TelegramBot.WebhookInfo | Error>;
+    getWebHookInfo(): Promise<TelegramBot.WebhookInfo>;
 
-    getUpdates(options?: TelegramBot.GetUpdatesOptions): Promise<TelegramBot.Update[] | Error>;
+    getUpdates(options?: TelegramBot.GetUpdatesOptions): Promise<TelegramBot.Update[]>;
 
     processUpdate(update: TelegramBot.Update): void;
 
-    sendMessage(chatId: number | string, text: string, options?: TelegramBot.SendMessageOptions): Promise<TelegramBot.Message | Error>;
+    sendMessage(chatId: number | string, text: string, options?: TelegramBot.SendMessageOptions): Promise<TelegramBot.Message>;
 
-    answerInlineQuery(inlineQueryId: string, results: ReadonlyArray<TelegramBot.InlineQueryResult>, options?: TelegramBot.AnswerInlineQueryOptions): Promise<boolean | Error>;
+    answerInlineQuery(inlineQueryId: string, results: ReadonlyArray<TelegramBot.InlineQueryResult>, options?: TelegramBot.AnswerInlineQueryOptions): Promise<boolean>;
 
-    forwardMessage(chatId: number | string, fromChatId: number | string, messageId: number | string, options?: TelegramBot.ForwardMessageOptions): Promise<TelegramBot.Message | Error>;
+    forwardMessage(chatId: number | string, fromChatId: number | string, messageId: number | string, options?: TelegramBot.ForwardMessageOptions): Promise<TelegramBot.Message>;
 
-    sendPhoto(chatId: number | string, photo: string | Stream | Buffer, options?: TelegramBot.SendPhotoOptions): Promise<TelegramBot.Message | Error>;
+    sendPhoto(chatId: number | string, photo: string | Stream | Buffer, options?: TelegramBot.SendPhotoOptions): Promise<TelegramBot.Message>;
 
-    sendAudio(chatId: number | string, audio: string | Stream | Buffer, options?: TelegramBot.SendAudioOptions): Promise<TelegramBot.Message | Error>;
+    sendAudio(chatId: number | string, audio: string | Stream | Buffer, options?: TelegramBot.SendAudioOptions): Promise<TelegramBot.Message>;
 
-    sendDocument(chatId: number | string, doc: string | Stream | Buffer, options?: TelegramBot.SendDocumentOptions, fileOpts?: any): Promise<TelegramBot.Message | Error>;
+    sendDocument(chatId: number | string, doc: string | Stream | Buffer, options?: TelegramBot.SendDocumentOptions, fileOpts?: any): Promise<TelegramBot.Message>;
 
-    sendMediaGroup(chatId: number | string, media: ReadonlyArray<TelegramBot.InputMedia>, options?: TelegramBot.SendMediaGroupOptions): Promise<TelegramBot.Message | Error>;
+    sendMediaGroup(chatId: number | string, media: ReadonlyArray<TelegramBot.InputMedia>, options?: TelegramBot.SendMediaGroupOptions): Promise<TelegramBot.Message>;
 
-    sendSticker(chatId: number | string, sticker: string | Stream | Buffer, options?: TelegramBot.SendStickerOptions): Promise<TelegramBot.Message | Error>;
+    sendSticker(chatId: number | string, sticker: string | Stream | Buffer, options?: TelegramBot.SendStickerOptions): Promise<TelegramBot.Message>;
 
-    sendVideo(chatId: number | string, video: string | Stream | Buffer, options?: TelegramBot.SendVideoOptions): Promise<TelegramBot.Message | Error>;
+    sendVideo(chatId: number | string, video: string | Stream | Buffer, options?: TelegramBot.SendVideoOptions): Promise<TelegramBot.Message>;
 
-    sendVideoNote(chatId: number | string, videoNote: string | Stream | Buffer, options?: TelegramBot.SendVideoNoteOptions): Promise<TelegramBot.Message | Error>;
+    sendVideoNote(chatId: number | string, videoNote: string | Stream | Buffer, options?: TelegramBot.SendVideoNoteOptions): Promise<TelegramBot.Message>;
 
-    sendVoice(chatId: number | string, voice: string | Stream | Buffer, options?: TelegramBot.SendVoiceOptions): Promise<TelegramBot.Message | Error>;
+    sendVoice(chatId: number | string, voice: string | Stream | Buffer, options?: TelegramBot.SendVoiceOptions): Promise<TelegramBot.Message>;
 
-    sendChatAction(chatId: number | string, action: TelegramBot.ChatAction): Promise<boolean | Error>;
+    sendChatAction(chatId: number | string, action: TelegramBot.ChatAction): Promise<boolean>;
 
-    kickChatMember(chatId: number | string, userId: string): Promise<boolean | Error>;
+    kickChatMember(chatId: number | string, userId: string): Promise<boolean>;
 
-    unbanChatMember(chatId: number | string, userId: string): Promise<boolean | Error>;
+    unbanChatMember(chatId: number | string, userId: string): Promise<boolean>;
 
-    restrictChatMember(chatId: number | string, userId: string, options?: TelegramBot.RestrictChatMemberOptions): Promise<boolean | Error>;
+    restrictChatMember(chatId: number | string, userId: string, options?: TelegramBot.RestrictChatMemberOptions): Promise<boolean>;
 
-    promoteChatMember(chatId: number | string, userId: string, options?: TelegramBot.PromoteChatMemberOptions): Promise<boolean | Error>;
+    promoteChatMember(chatId: number | string, userId: string, options?: TelegramBot.PromoteChatMemberOptions): Promise<boolean>;
 
-    exportChatInviteLink(chatId: number | string): Promise<string | Error>;
+    exportChatInviteLink(chatId: number | string): Promise<string>;
 
-    setChatPhoto(chatId: number | string, photo: string | Stream | Buffer): Promise<boolean | Error>;
+    setChatPhoto(chatId: number | string, photo: string | Stream | Buffer): Promise<boolean>;
 
-    deleteChatPhoto(chatId: number | string): Promise<boolean | Error>;
+    deleteChatPhoto(chatId: number | string): Promise<boolean>;
 
-    setChatTitle(chatId: number | string, title: string): Promise<boolean | Error>;
+    setChatTitle(chatId: number | string, title: string): Promise<boolean>;
 
-    setChatDescription(chatId: number | string, description: string): Promise<boolean | Error>;
+    setChatDescription(chatId: number | string, description: string): Promise<boolean>;
 
-    pinChatMessage(chatId: number | string, messageId: string): Promise<boolean | Error>;
+    pinChatMessage(chatId: number | string, messageId: string): Promise<boolean>;
 
-    unpinChatMessage(chatId: number | string): Promise<boolean | Error>;
+    unpinChatMessage(chatId: number | string): Promise<boolean>;
 
-    answerCallbackQuery(callbackQueryId: string, options?: Partial<TelegramBot.AnswerCallbackQueryOptions>): Promise<boolean | Error>;
+    answerCallbackQuery(callbackQueryId: string, options?: Partial<TelegramBot.AnswerCallbackQueryOptions>): Promise<boolean>;
 
     /**
      * @deprecated since version 0.30.0
      */
-    answerCallbackQuery(options?: TelegramBot.AnswerCallbackQueryOptions): Promise<boolean | Error>;
+    answerCallbackQuery(options?: TelegramBot.AnswerCallbackQueryOptions): Promise<boolean>;
 
-    editMessageText(text: string, options?: TelegramBot.EditMessageTextOptions): Promise<TelegramBot.Message | boolean | Error>;
+    editMessageText(text: string, options?: TelegramBot.EditMessageTextOptions): Promise<TelegramBot.Message | boolean>;
 
-    editMessageCaption(caption: string, options?: TelegramBot.EditMessageCaptionOptions): Promise<TelegramBot.Message | boolean | Error>;
+    editMessageCaption(caption: string, options?: TelegramBot.EditMessageCaptionOptions): Promise<TelegramBot.Message | boolean>;
 
-    editMessageReplyMarkup(replyMarkup: TelegramBot.InlineKeyboardMarkup, options?: TelegramBot.EditMessageReplyMarkupOptions): Promise<TelegramBot.Message | boolean | Error>;
+    editMessageReplyMarkup(replyMarkup: TelegramBot.InlineKeyboardMarkup, options?: TelegramBot.EditMessageReplyMarkupOptions): Promise<TelegramBot.Message | boolean>;
 
-    getUserProfilePhotos(userId: number | string, options?: TelegramBot.GetUserProfilePhotosOptions): Promise<TelegramBot.UserProfilePhotos | Error>;
+    getUserProfilePhotos(userId: number | string, options?: TelegramBot.GetUserProfilePhotosOptions): Promise<TelegramBot.UserProfilePhotos>;
 
-    sendLocation(chatId: number | string, latitude: number, longitude: number, options?: TelegramBot.SendLocationOptions): Promise<TelegramBot.Message | Error>;
+    sendLocation(chatId: number | string, latitude: number, longitude: number, options?: TelegramBot.SendLocationOptions): Promise<TelegramBot.Message>;
 
-    editMessageLiveLocation(latitude: number, longitude: number, options?: TelegramBot.EditMessageLiveLocationOptions): Promise<TelegramBot.Message | boolean | Error>;
+    editMessageLiveLocation(latitude: number, longitude: number, options?: TelegramBot.EditMessageLiveLocationOptions): Promise<TelegramBot.Message | boolean>;
 
-    stopMessageLiveLocation(options?: TelegramBot.StopMessageLiveLocationOptions): Promise<TelegramBot.Message | boolean | Error>;
+    stopMessageLiveLocation(options?: TelegramBot.StopMessageLiveLocationOptions): Promise<TelegramBot.Message | boolean>;
 
-    sendVenue(chatId: number | string, latitude: number, longitude: number, title: string, address: string, options?: TelegramBot.SendVenueOptions): Promise<TelegramBot.Message | Error>;
+    sendVenue(chatId: number | string, latitude: number, longitude: number, title: string, address: string, options?: TelegramBot.SendVenueOptions): Promise<TelegramBot.Message>;
 
-    sendContact(chatId: number | string, phoneNumber: string, firstName: string, options?: TelegramBot.SendContactOptions): Promise<TelegramBot.Message | Error>;
+    sendContact(chatId: number | string, phoneNumber: string, firstName: string, options?: TelegramBot.SendContactOptions): Promise<TelegramBot.Message>;
 
-    getFile(fileId: string): Promise<TelegramBot.File | Error>;
+    getFile(fileId: string): Promise<TelegramBot.File>;
 
-    getFileLink(fileId: string): Promise<string | Error>;
+    getFileLink(fileId: string): Promise<string>;
 
     getFileStream(fileId: string): Readable;
 
-    downloadFile(fileId: string, downloadDir: string): Promise<string | Error>;
+    downloadFile(fileId: string, downloadDir: string): Promise<string>;
 
     onText(regexp: RegExp, callback: ((msg: TelegramBot.Message, match: RegExpExecArray | null) => void)): void;
 
@@ -1003,34 +1003,34 @@ declare class TelegramBot extends EventEmitter {
 
     removeReplyListener(replyListenerId: number): TelegramBot.ReplyListener;
 
-    getChat(chatId: number | string): Promise<TelegramBot.Chat | Error>;
+    getChat(chatId: number | string): Promise<TelegramBot.Chat>;
 
-    getChatAdministrators(chatId: number | string): Promise<TelegramBot.ChatMember[] | Error>;
+    getChatAdministrators(chatId: number | string): Promise<TelegramBot.ChatMember[]>;
 
-    getChatMembersCount(chatId: number | string): Promise<number | Error>;
+    getChatMembersCount(chatId: number | string): Promise<number>;
 
-    getChatMember(chatId: number | string, userId: string): Promise<TelegramBot.ChatMember | Error>;
+    getChatMember(chatId: number | string, userId: string): Promise<TelegramBot.ChatMember>;
 
-    leaveChat(chatId: number | string): Promise<boolean | Error>;
+    leaveChat(chatId: number | string): Promise<boolean>;
 
-    setChatStickerSet(chatId: number | string, stickerSetName: string): Promise<boolean | Error>;
+    setChatStickerSet(chatId: number | string, stickerSetName: string): Promise<boolean>;
 
-    deleteChatStickerSet(chatId: number | string): Promise<boolean | Error>;
+    deleteChatStickerSet(chatId: number | string): Promise<boolean>;
 
-    sendGame(chatId: number | string, gameShortName: string, options?: TelegramBot.SendGameOptions): Promise<TelegramBot.Message | Error>;
+    sendGame(chatId: number | string, gameShortName: string, options?: TelegramBot.SendGameOptions): Promise<TelegramBot.Message>;
 
-    setGameScore(userId: string, score: number, options?: TelegramBot.SetGameScoreOptions): Promise<TelegramBot.Message | boolean | Error>;
+    setGameScore(userId: string, score: number, options?: TelegramBot.SetGameScoreOptions): Promise<TelegramBot.Message | boolean>;
 
-    getGameHighScores(userId: string, options?: TelegramBot.GetGameHighScoresOptions): Promise<TelegramBot.GameHighScore[] | Error>;
+    getGameHighScores(userId: string, options?: TelegramBot.GetGameHighScoresOptions): Promise<TelegramBot.GameHighScore[]>;
 
-    deleteMessage(chatId: number | string, messageId: string, options?: any): Promise<boolean | Error>;
+    deleteMessage(chatId: number | string, messageId: string, options?: any): Promise<boolean>;
 
     sendInvoice(chatId: number | string, title: string, description: string, payload: string, providerToken: string, startParameter: string, currency: string,
-                prices: ReadonlyArray<TelegramBot.LabeledPrice>, options?: TelegramBot.SendInvoiceOptions): Promise<TelegramBot.Message | Error>;
+                prices: ReadonlyArray<TelegramBot.LabeledPrice>, options?: TelegramBot.SendInvoiceOptions): Promise<TelegramBot.Message>;
 
-    answerShippingQuery(shippingQueryId: string, ok: boolean, options?: TelegramBot.AnswerShippingQueryOptions): Promise<boolean | Error>;
+    answerShippingQuery(shippingQueryId: string, ok: boolean, options?: TelegramBot.AnswerShippingQueryOptions): Promise<boolean>;
 
-    answerPreCheckoutQuery(preCheckoutQueryId: string, ok: boolean, options?: TelegramBot.AnswerPreCheckoutQueryOptions): Promise<boolean | Error>;
+    answerPreCheckoutQuery(preCheckoutQueryId: string, ok: boolean, options?: TelegramBot.AnswerPreCheckoutQueryOptions): Promise<boolean>;
 }
 
 export = TelegramBot;
diff --git a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
index b4b09485cb..49368e74ec 100644
--- a/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
+++ b/types/node-telegram-bot-api/node-telegram-bot-api-tests.ts
@@ -9,6 +9,9 @@ MyTelegramBot.openWebHook();
 MyTelegramBot.closeWebHook();
 MyTelegramBot.hasOpenWebHook();
 MyTelegramBot.getMe();
+MyTelegramBot.getMe().then((value: TelegramBot.User) => {
+    const username = value.username;
+});
 MyTelegramBot.setWebHook('http://typescriptlang.org', {max_connections: 100});
 MyTelegramBot.deleteWebHook();
 MyTelegramBot.getWebHookInfo();
diff --git a/types/node-vault/index.d.ts b/types/node-vault/index.d.ts
index 835e364ae7..f21d625822 100644
--- a/types/node-vault/index.d.ts
+++ b/types/node-vault/index.d.ts
@@ -111,7 +111,7 @@ declare namespace NodeVault {
         debug?(...args: any[]): any;
         tv4?(...args: any[]): any;
         commands?: Array<{ method: string, path: string, scheme: any }>;
-        mustache?: MustacheStatic;
+        mustache?: typeof mustache;
         "request-promise"?: any;
         Promise?: PromiseConstructor;
 
diff --git a/types/node-zopfli-es/index.d.ts b/types/node-zopfli-es/index.d.ts
new file mode 100644
index 0000000000..e015655d8b
--- /dev/null
+++ b/types/node-zopfli-es/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for node-zopfli-es 0.0
+// Project: https://github.com/jaeh/node-zopfli-es
+// Definitions by: Alorel <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Transform } from 'stream';
+
+declare class Zopfli extends Transform {
+    constructor(format?: Zopfli.Format, options?: Zopfli.Options);
+
+    static createGzip(options?: Zopfli.Options): Zopfli;
+    static createDeflate(options?: Zopfli.Options): Zopfli;
+    static createZlib(options?: Zopfli.Options): Zopfli;
+
+    static gzipSync(options?: Zopfli.Options): Buffer;
+    static deflateSync(options?: Zopfli.Options): Buffer;
+    static zlibSync(options?: Zopfli.Options): Buffer;
+
+    static deflate(input: Buffer, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static deflate(input: Buffer, cb: (err: Error, out: Buffer) => void): void;
+    static deflate(input: Buffer, options?: Zopfli.Options): Promise<Buffer>;
+
+    static gzip(input: Buffer, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static gzip(input: Buffer, cb: (err: Error, out: Buffer) => void): void;
+    static gzip(input: Buffer, options?: Zopfli.Options): Promise<Buffer>;
+
+    static zlib(input: Buffer, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static zlib(input: Buffer, cb: (err: Error, out: Buffer) => void): void;
+    static zlib(input: Buffer, options?: Zopfli.Options): Promise<Buffer>;
+
+    static compress(input: Buffer, format: Zopfli.Format, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static compress(input: Buffer, format: Zopfli.Format, cb: (err: Error, out: Buffer) => void): void;
+    static compress(input: Buffer, format: Zopfli.Format, options?: Zopfli.Options): Promise<Buffer>;
+}
+
+declare namespace Zopfli {
+    type Format = 'deflate' | 'gzip' | 'zlib';
+
+    interface Options {
+        verbose?: boolean;
+        verbose_more?: boolean;
+        /**
+         * Maximum amount of times to rerun forward and backward pass to optimize LZ77 compression cost.
+         * Good values: 10, 15 for small files, 5 for files over several MB in size or it will be too slow.
+         */
+        numiterations?: number;
+        /**
+         * If true, splits the data in multiple deflate blocks with optimal choice for the block boundaries.
+         * Block splitting gives better compression.
+         */
+        blocksplitting?: boolean;
+        /**
+         * If true, chooses the optimal block split points only after doing the iterative LZ77 compression.
+         * If false, chooses the block split points first, then does iterative LZ77 on each individual block.
+         * Depending on the file, either first or last gives the best compression.
+         */
+        blocksplittinglast?: boolean;
+        /**
+         * Maximum amount of blocks to split into (0 for unlimited,
+         * but this can give extreme results that hurt compression on some files).
+         */
+        blocksplittingmax?: number;
+    }
+}
+
+export = Zopfli;
diff --git a/types/node-zopfli-es/node-zopfli-es-tests.ts b/types/node-zopfli-es/node-zopfli-es-tests.ts
new file mode 100644
index 0000000000..3f3294cf3f
--- /dev/null
+++ b/types/node-zopfli-es/node-zopfli-es-tests.ts
@@ -0,0 +1,51 @@
+import * as Zopfli from 'node-zopfli-es';
+import * as fs from 'fs';
+
+const opts: Zopfli.Options = {
+    verbose: true,
+    numiterations: 1
+};
+let input: Buffer = Buffer.from('foo');
+const read = fs.createReadStream('foo');
+const write = fs.createWriteStream('foo');
+
+function cb(e: Error, b: Buffer): void {}
+function then(b: Buffer): void {}
+
+Zopfli.zlib(input, cb);
+Zopfli.zlib(input, opts, cb);
+Zopfli.zlib(input, opts).then(then);
+Zopfli.zlib(input).then(then);
+
+Zopfli.gzip(input, cb);
+Zopfli.gzip(input, opts, cb);
+Zopfli.gzip(input, opts).then(then);
+Zopfli.gzip(input).then(then);
+
+Zopfli.deflate(input, cb);
+Zopfli.deflate(input, opts, cb);
+Zopfli.deflate(input, opts).then(then);
+Zopfli.deflate(input).then(then);
+
+Zopfli.compress(input, 'zlib', cb);
+Zopfli.compress(input, 'zlib', opts, cb);
+Zopfli.compress(input, 'zlib', opts).then(then);
+Zopfli.compress(input, 'zlib').then(then);
+
+input = Zopfli.gzipSync();
+input = Zopfli.gzipSync(opts);
+
+input = Zopfli.deflateSync();
+input = Zopfli.deflateSync(opts);
+
+input = Zopfli.zlibSync();
+input = Zopfli.zlibSync(opts);
+
+read.pipe(Zopfli.createGzip()).pipe(write);
+read.pipe(Zopfli.createGzip(opts)).pipe(write);
+
+read.pipe(Zopfli.createDeflate()).pipe(write);
+read.pipe(Zopfli.createDeflate(opts)).pipe(write);
+
+read.pipe(Zopfli.createZlib()).pipe(write);
+read.pipe(Zopfli.createZlib(opts)).pipe(write);
diff --git a/types/node-zopfli-es/tsconfig.json b/types/node-zopfli-es/tsconfig.json
new file mode 100644
index 0000000000..bbd6de30e8
--- /dev/null
+++ b/types/node-zopfli-es/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",
+        "node-zopfli-es-tests.ts"
+    ]
+}
diff --git a/types/node-zopfli-es/tslint.json b/types/node-zopfli-es/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-zopfli-es/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node-zopfli/index.d.ts b/types/node-zopfli/index.d.ts
new file mode 100644
index 0000000000..b658c87d97
--- /dev/null
+++ b/types/node-zopfli/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for node-zopfli 2.0
+// Project: https://github.com/pierreinglebert/node-zopfli
+// Definitions by: Alorel <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Transform } from 'stream';
+
+declare class Zopfli extends Transform {
+    constructor(format?: Zopfli.Format, options?: Zopfli.Options);
+
+    static createGzip(options?: Zopfli.Options): Zopfli;
+    static createDeflate(options?: Zopfli.Options): Zopfli;
+    static createZlib(options?: Zopfli.Options): Zopfli;
+
+    static gzipSync(options?: Zopfli.Options): Buffer;
+    static deflateSync(options?: Zopfli.Options): Buffer;
+    static zlibSync(options?: Zopfli.Options): Buffer;
+
+    static deflate(input: Buffer, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static deflate(input: Buffer, cb: (err: Error, out: Buffer) => void): void;
+    static deflate(input: Buffer, options?: Zopfli.Options): Promise<Buffer>;
+
+    static gzip(input: Buffer, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static gzip(input: Buffer, cb: (err: Error, out: Buffer) => void): void;
+    static gzip(input: Buffer, options?: Zopfli.Options): Promise<Buffer>;
+
+    static zlib(input: Buffer, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static zlib(input: Buffer, cb: (err: Error, out: Buffer) => void): void;
+    static zlib(input: Buffer, options?: Zopfli.Options): Promise<Buffer>;
+
+    static compress(input: Buffer, format: Zopfli.Format, options: Zopfli.Options, cb: (err: Error, out: Buffer) => void): void;
+    static compress(input: Buffer, format: Zopfli.Format, cb: (err: Error, out: Buffer) => void): void;
+    static compress(input: Buffer, format: Zopfli.Format, options?: Zopfli.Options): Promise<Buffer>;
+}
+
+declare namespace Zopfli {
+    type Format = 'deflate' | 'gzip' | 'zlib';
+
+    interface Options {
+        verbose?: boolean;
+        verbose_more?: boolean;
+        /**
+         * Maximum amount of times to rerun forward and backward pass to optimize LZ77 compression cost.
+         * Good values: 10, 15 for small files, 5 for files over several MB in size or it will be too slow.
+         */
+        numiterations?: number;
+        /**
+         * If true, splits the data in multiple deflate blocks with optimal choice for the block boundaries.
+         * Block splitting gives better compression.
+         */
+        blocksplitting?: boolean;
+        /**
+         * If true, chooses the optimal block split points only after doing the iterative LZ77 compression.
+         * If false, chooses the block split points first, then does iterative LZ77 on each individual block.
+         * Depending on the file, either first or last gives the best compression.
+         */
+        blocksplittinglast?: boolean;
+        /**
+         * Maximum amount of blocks to split into (0 for unlimited,
+         * but this can give extreme results that hurt compression on some files).
+         */
+        blocksplittingmax?: number;
+    }
+}
+
+export = Zopfli;
diff --git a/types/node-zopfli/node-zopfli-tests.ts b/types/node-zopfli/node-zopfli-tests.ts
new file mode 100644
index 0000000000..38ca70a2ec
--- /dev/null
+++ b/types/node-zopfli/node-zopfli-tests.ts
@@ -0,0 +1,51 @@
+import * as Zopfli from 'node-zopfli';
+import * as fs from 'fs';
+
+const opts: Zopfli.Options = {
+    verbose: true,
+    numiterations: 1
+};
+let input: Buffer = Buffer.from('foo');
+const read = fs.createReadStream('foo');
+const write = fs.createWriteStream('foo');
+
+function cb(e: Error, b: Buffer): void {}
+function then(b: Buffer): void {}
+
+Zopfli.zlib(input, cb);
+Zopfli.zlib(input, opts, cb);
+Zopfli.zlib(input, opts).then(then);
+Zopfli.zlib(input).then(then);
+
+Zopfli.gzip(input, cb);
+Zopfli.gzip(input, opts, cb);
+Zopfli.gzip(input, opts).then(then);
+Zopfli.gzip(input).then(then);
+
+Zopfli.deflate(input, cb);
+Zopfli.deflate(input, opts, cb);
+Zopfli.deflate(input, opts).then(then);
+Zopfli.deflate(input).then(then);
+
+Zopfli.compress(input, 'zlib', cb);
+Zopfli.compress(input, 'zlib', opts, cb);
+Zopfli.compress(input, 'zlib', opts).then(then);
+Zopfli.compress(input, 'zlib').then(then);
+
+input = Zopfli.gzipSync();
+input = Zopfli.gzipSync(opts);
+
+input = Zopfli.deflateSync();
+input = Zopfli.deflateSync(opts);
+
+input = Zopfli.zlibSync();
+input = Zopfli.zlibSync(opts);
+
+read.pipe(Zopfli.createGzip()).pipe(write);
+read.pipe(Zopfli.createGzip(opts)).pipe(write);
+
+read.pipe(Zopfli.createDeflate()).pipe(write);
+read.pipe(Zopfli.createDeflate(opts)).pipe(write);
+
+read.pipe(Zopfli.createZlib()).pipe(write);
+read.pipe(Zopfli.createZlib(opts)).pipe(write);
diff --git a/types/node-zopfli/tsconfig.json b/types/node-zopfli/tsconfig.json
new file mode 100644
index 0000000000..0c36150068
--- /dev/null
+++ b/types/node-zopfli/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",
+        "node-zopfli-tests.ts"
+    ]
+}
diff --git a/types/node-zopfli/tslint.json b/types/node-zopfli/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/node-zopfli/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/node/index.d.ts b/types/node/index.d.ts
index 5d6b9e9d79..ea3a5e8c47 100644
--- a/types/node/index.d.ts
+++ b/types/node/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Node.js 10.3.x
+// Type definitions for Node.js 10.9.x
 // Project: http://nodejs.org/
 // Definitions by: Microsoft TypeScript <http://typescriptlang.org>
 //                 DefinitelyTyped <https://github.com/DefinitelyTyped/DefinitelyTyped>
@@ -25,6 +25,10 @@
 //                 Alexander T. <https://github.com/a-tarasyuk>
 //                 Lishude <https://github.com/islishude>
 //                 Andrew Makarov <https://github.com/r3nya>
+//                 Zane Hannan AU <https://github.com/ZaneHannanAU>
+//                 Thomas den Hollander <https://github.com/ThomasdenH>
+//                 Eugene Y. Q. Shen <https://github.com/eyqs>
+//                 Matthieu Sieben <https://github.com/matthieusieben>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -170,6 +174,10 @@ interface SymbolConstructor {
     readonly asyncIterator: symbol;
 }
 declare var Symbol: SymbolConstructor;
+interface SharedArrayBuffer {
+    readonly byteLength: number;
+    slice(begin?: number, end?: number): SharedArrayBuffer;
+}
 
 // Node.js ESNEXT support
 interface String {
@@ -179,11 +187,11 @@ interface String {
     trimRight(): string;
 }
 
-/************************************************
-*                                               *
-*                   GLOBAL                      *
-*                                               *
-************************************************/
+/*-----------------------------------------------*
+ *                                               *
+ *                   GLOBAL                      *
+ *                                               *
+ ------------------------------------------------*/
 declare var process: NodeJS.Process;
 declare var global: NodeJS.Global;
 declare var console: Console;
@@ -347,13 +355,13 @@ declare var Buffer: {
     new(array: Uint8Array): Buffer;
     /**
      * Produces a Buffer backed by the same allocated memory as
-     * the given {ArrayBuffer}.
+     * the given {ArrayBuffer}/{SharedArrayBuffer}.
      *
      *
      * @param arrayBuffer The ArrayBuffer with which to share memory.
      * @deprecated since v10.0.0 - Use `Buffer.from(arrayBuffer[, byteOffset[, length]])` instead.
      */
-    new(arrayBuffer: ArrayBuffer): Buffer;
+    new(arrayBuffer: ArrayBuffer | SharedArrayBuffer): Buffer;
     /**
      * Allocates a new buffer containing the given {array} of octets.
      *
@@ -375,20 +383,26 @@ declare var Buffer: {
      * 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()
+     * @param arrayBuffer The .buffer property of any TypedArray or a new ArrayBuffer()
      */
-    from(arrayBuffer: ArrayBuffer, byteOffset?: number, length?: number): Buffer;
+    from(arrayBuffer: ArrayBuffer | SharedArrayBuffer, byteOffset?: number, length?: number): Buffer;
     /**
      * Creates a new Buffer using the passed {data}
      * @param data data to create a new Buffer
      */
-    from(data: any[] | string | ArrayBuffer | Uint8Array /*| TypedArray*/): Buffer;
+    from(data: any[]): Buffer;
+    from(data: Uint8Array): 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;
+    /**
+     * Creates a new Buffer using the passed {data}
+     * @param values to create a new Buffer
+     */
+    of(...items: number[]): Buffer;
     /**
      * Returns true if {obj} is a Buffer
      *
@@ -406,10 +420,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. (TypedArray is also allowed, but it is only available starting ES2017)
+     * @param string string to test.
      * @param encoding encoding used to evaluate (defaults to 'utf8')
      */
-    byteLength(string: string | Buffer | DataView | ArrayBuffer, encoding?: string): number;
+    byteLength(string: string | NodeJS.TypedArray | DataView | ArrayBuffer | SharedArrayBuffer, encoding?: string): number;
     /**
      * Returns a buffer which is the result of concatenating all the buffers in the list together.
      *
@@ -455,11 +469,11 @@ declare var Buffer: {
     poolSize: number;
 };
 
-/************************************************
+/*----------------------------------------------*
 *                                               *
 *               GLOBAL INTERFACES               *
 *                                               *
-************************************************/
+*-----------------------------------------------*/
 declare namespace NodeJS {
     export interface InspectOptions {
         showHidden?: boolean;
@@ -469,6 +483,7 @@ declare namespace NodeJS {
         showProxy?: boolean;
         maxArrayLength?: number | null;
         breakLength?: number;
+        compact?: boolean;
     }
 
     export interface ConsoleConstructor {
@@ -685,7 +700,7 @@ declare namespace NodeJS {
         columns?: number;
         rows?: number;
         _write(chunk: any, encoding: string, callback: Function): void;
-        _destroy(err: Error, callback: Function): void;
+        _destroy(err: Error | null, callback: Function): void;
         _final(callback: Function): void;
         setDefaultEncoding(encoding: string): this;
         cork(): void;
@@ -698,7 +713,7 @@ declare namespace NodeJS {
         isRaw?: boolean;
         setRawMode?(mode: boolean): void;
         _read(size: number): void;
-        _destroy(err: Error, callback: Function): void;
+        _destroy(err: Error | null, callback: Function): void;
         push(chunk: any, encoding?: string): boolean;
         destroy(error?: Error): void;
     }
@@ -814,7 +829,7 @@ declare namespace NodeJS {
         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: Signals, signal: Signals): boolean;
         emit(event: "newListener", eventName: string | symbol, listener: (...args: any[]) => void): this;
         emit(event: "removeListener", eventName: string, listener: (...args: any[]) => void): this;
 
@@ -968,15 +983,17 @@ declare namespace NodeJS {
 
         constructor(id: string, parent?: Module);
     }
+
+    type TypedArray = Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
 }
 
 interface IterableIterator<T> { }
 
-/************************************************
+/*----------------------------------------------*
 *                                               *
 *                   MODULES                     *
 *                                               *
-************************************************/
+*-----------------------------------------------*/
 declare module "buffer" {
     export var INSPECT_MAX_BYTES: number;
     var BuffType: typeof Buffer;
@@ -1078,6 +1095,7 @@ declare module "http" {
         'transfer-encoding'?: string;
         'tk'?: string;
         'upgrade'?: string;
+        'user-agent'?: string;
         'vary'?: string;
         'via'?: string;
         'warning'?: string;
@@ -1140,7 +1158,6 @@ declare module "http" {
         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;
@@ -1237,9 +1254,14 @@ declare module "http" {
          * Maximum number of sockets to leave open in a free state. Only relevant if keepAlive is set to true. Default = 256.
          */
         maxFreeSockets?: number;
+        /**
+         * Socket timeout in milliseconds. This will set the timeout after the socket is connected.
+         */
+        timeout?: number;
     }
 
     export class Agent {
+        maxFreeSockets: number;
         maxSockets: number;
         sockets: any;
         requests: any;
@@ -1269,7 +1291,9 @@ declare module "http" {
     // 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 request(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
     export function get(options: RequestOptions | string | URL, callback?: (res: IncomingMessage) => void): ClientRequest;
+    export function get(url: string | URL, options: RequestOptions, callback?: (res: IncomingMessage) => void): ClientRequest;
     export var globalAgent: Agent;
 }
 
@@ -1542,7 +1566,7 @@ declare module "zlib" {
         level?: number; // compression only
         memLevel?: number; // compression only
         strategy?: number; // compression only
-        dictionary?: any; // deflate/inflate only, empty dictionary by default
+        dictionary?: Buffer | NodeJS.TypedArray | DataView | ArrayBuffer; // deflate/inflate only, empty dictionary by default
     }
 
     export interface Zlib {
@@ -1575,7 +1599,7 @@ declare module "zlib" {
     export function createInflateRaw(options?: ZlibOptions): InflateRaw;
     export function createUnzip(options?: ZlibOptions): Unzip;
 
-    type InputType = string | Buffer | DataView | ArrayBuffer /* | TypedArray */;
+    type InputType = string | Buffer | DataView | ArrayBuffer | NodeJS.TypedArray;
     export function deflate(buf: InputType, callback: (error: Error | null, result: Buffer) => void): void;
     export function deflate(buf: InputType, options: ZlibOptions, callback: (error: Error | null, result: Buffer) => void): void;
     export function deflateSync(buf: InputType, options?: ZlibOptions): Buffer;
@@ -1688,6 +1712,7 @@ declare module "os" {
         netmask: string;
         mac: string;
         internal: boolean;
+        cidr: string | null;
     }
 
     export interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
@@ -1871,7 +1896,9 @@ declare module "https" {
 
     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 request(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     export function get(options: RequestOptions | string | URL, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
+    export function get(url: string | URL, options: RequestOptions, callback?: (res: http.IncomingMessage) => void): http.ClientRequest;
     export var globalAgent: Agent;
 }
 
@@ -2178,11 +2205,13 @@ declare module "child_process" {
         keepOpen?: boolean;
     }
 
+    export type StdioOptions = "pipe" | "ignore" | "inherit" | Array<("pipe" | "ipc" | "ignore" | "inherit" | stream.Stream | number | null | undefined)>;
+
     export interface SpawnOptions {
-        argv0?: string;
         cwd?: string;
-        env?: any;
-        stdio?: any;
+        env?: NodeJS.ProcessEnv;
+        argv0?: string;
+        stdio?: StdioOptions;
         detached?: boolean;
         uid?: number;
         gid?: number;
@@ -2195,7 +2224,7 @@ declare module "child_process" {
 
     export interface ExecOptions {
         cwd?: string;
-        env?: any;
+        env?: NodeJS.ProcessEnv;
         shell?: string;
         timeout?: number;
         maxBuffer?: number;
@@ -2213,24 +2242,31 @@ declare module "child_process" {
         encoding: string | null; // specify `null`.
     }
 
+    export interface ExecException extends Error {
+        cmd?: string;
+        killed?: boolean;
+        code?: number;
+        signal?: string;
+    }
+
     // no `options` definitely means stdout/stderr are `string`.
-    export function exec(command: string, callback?: (error: Error | null, stdout: string, stderr: string) => void): ChildProcess;
+    export function exec(command: string, callback?: (error: ExecException | 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;
+    export function exec(command: string, options: { encoding: "buffer" | null } & ExecOptions, callback?: (error: ExecException | 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;
+    export function exec(command: string, options: { encoding: BufferEncoding } & ExecOptions, callback?: (error: ExecException | 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;
+    export function exec(command: string, options: { encoding: string } & ExecOptions, callback?: (error: ExecException | 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;
+    export function exec(command: string, options: ExecOptions, callback?: (error: ExecException | 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;
+    export function exec(command: string, options: ({ encoding?: string | null } & ExecOptions) | undefined | null, callback?: (error: ExecException | 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 {
@@ -2243,7 +2279,7 @@ declare module "child_process" {
 
     export interface ExecFileOptions {
         cwd?: string;
-        env?: any;
+        env?: NodeJS.ProcessEnv;
         timeout?: number;
         maxBuffer?: number;
         killSignal?: string;
@@ -2310,32 +2346,32 @@ declare module "child_process" {
 
     export interface ForkOptions {
         cwd?: string;
-        env?: any;
+        env?: NodeJS.ProcessEnv;
         execPath?: string;
         execArgv?: string[];
         silent?: boolean;
-        stdio?: any[];
+        stdio?: StdioOptions;
+        windowsVerbatimArguments?: boolean;
         uid?: number;
         gid?: number;
-        windowsVerbatimArguments?: boolean;
     }
     export function fork(modulePath: string, args?: ReadonlyArray<string>, options?: ForkOptions): ChildProcess;
 
     export interface SpawnSyncOptions {
-        argv0?: string;
+        argv0?: string; // Not specified in the docs
         cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
+        input?: string | Buffer | Uint8Array;
+        stdio?: StdioOptions;
+        env?: NodeJS.ProcessEnv;
         uid?: number;
         gid?: number;
         timeout?: number;
-        killSignal?: string;
+        killSignal?: string | number;
         maxBuffer?: number;
         encoding?: string;
         shell?: boolean | string;
-        windowsHide?: boolean;
         windowsVerbatimArguments?: boolean;
+        windowsHide?: boolean;
     }
     export interface SpawnSyncOptionsWithStringEncoding extends SpawnSyncOptions {
         encoding: BufferEncoding;
@@ -2362,14 +2398,14 @@ declare module "child_process" {
 
     export interface ExecSyncOptions {
         cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
+        input?: string | Buffer | Uint8Array;
+        stdio?: StdioOptions;
+        env?: NodeJS.ProcessEnv;
         shell?: string;
         uid?: number;
         gid?: number;
         timeout?: number;
-        killSignal?: string;
+        killSignal?: string | number;
         maxBuffer?: number;
         encoding?: string;
         windowsHide?: boolean;
@@ -2387,16 +2423,17 @@ declare module "child_process" {
 
     export interface ExecFileSyncOptions {
         cwd?: string;
-        input?: string | Buffer;
-        stdio?: any;
-        env?: any;
+        input?: string | Buffer | Uint8Array;
+        stdio?: StdioOptions;
+        env?: NodeJS.ProcessEnv;
         uid?: number;
         gid?: number;
         timeout?: number;
-        killSignal?: string;
+        killSignal?: string | number;
         maxBuffer?: number;
         encoding?: string;
         windowsHide?: boolean;
+        shell?: boolean | string;
     }
     export interface ExecFileSyncOptionsWithStringEncoding extends ExecFileSyncOptions {
         encoding: BufferEncoding;
@@ -2491,7 +2528,7 @@ declare module "url" {
         append(name: string, value: string): void;
         delete(name: string): void;
         entries(): IterableIterator<[string, string]>;
-        forEach(callback: (value: string, name: string) => void): void;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
         get(name: string): string | null;
         getAll(name: string): string[];
         has(name: string): boolean;
@@ -2560,11 +2597,26 @@ declare module "dns" {
         ttl: number;
     }
 
+    /** @deprecated Use AnyARecord or AnyAaaaRecord instead. */
+    export type AnyRecordWithTtl = AnyARecord | AnyAaaaRecord;
+
+    export interface AnyARecord extends RecordWithTtl {
+        type: "A";
+    }
+
+    export interface AnyAaaaRecord extends RecordWithTtl {
+        type: "AAAA";
+    }
+
     export interface MxRecord {
         priority: number;
         exchange: string;
     }
 
+    export interface AnyMxRecord extends MxRecord {
+        type: "MX";
+    }
+
     export interface NaptrRecord {
         flags: string;
         service: string;
@@ -2574,6 +2626,10 @@ declare module "dns" {
         preference: number;
     }
 
+    export interface AnyNaptrRecord extends NaptrRecord {
+        type: "NAPTR";
+    }
+
     export interface SoaRecord {
         nsname: string;
         hostmaster: string;
@@ -2584,6 +2640,10 @@ declare module "dns" {
         minttl: number;
     }
 
+    export interface AnySoaRecord extends SoaRecord {
+        type: "SOA";
+    }
+
     export interface SrvRecord {
         priority: number;
         weight: number;
@@ -2591,9 +2651,45 @@ declare module "dns" {
         name: string;
     }
 
+    export interface AnySrvRecord extends SrvRecord {
+        type: "SRV";
+    }
+
+    export interface AnyTxtRecord {
+        type: "TXT";
+        entries: string[];
+    }
+
+    export interface AnyNsRecord {
+        type: "NS";
+        value: string;
+    }
+
+    export interface AnyPtrRecord {
+        type: "PTR";
+        value: string;
+    }
+
+    export interface AnyCnameRecord {
+        type: "CNAME";
+        value: string;
+    }
+
+    export type AnyRecord = AnyARecord |
+        AnyAaaaRecord |
+        AnyCnameRecord |
+        AnyMxRecord |
+        AnyNaptrRecord |
+        AnyNsRecord |
+        AnyPtrRecord |
+        AnySoaRecord |
+        AnySrvRecord |
+        AnyTxtRecord;
+
     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: "ANY", callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => 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;
@@ -2602,17 +2698,18 @@ declare module "dns" {
     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;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]) => 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: "ANY"): Promise<AnyRecord[]>;
         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 __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
     }
 
     export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
@@ -2638,16 +2735,53 @@ declare module "dns" {
     }
 
     export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolveCname {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export namespace resolveMx {
+        export function __promisify__(hostname: string): Promise<MxRecord[]>;
+    }
+
     export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export namespace resolveNaptr {
+        export function __promisify__(hostname: string): Promise<NaptrRecord[]>;
+    }
+
     export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolveNs {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolvePtr {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export namespace resolveSoa {
+        export function __promisify__(hostname: string): Promise<SoaRecord>;
+    }
+
     export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export namespace resolveSrv {
+        export function __promisify__(hostname: string): Promise<SrvRecord[]>;
+    }
+
     export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export namespace resolveTxt {
+        export function __promisify__(hostname: string): Promise<string[][]>;
+    }
+
+    export function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    export namespace resolveAny {
+        export function __promisify__(hostname: string): Promise<AnyRecord[]>;
+    }
 
     export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
     export function setServers(servers: string[]): void;
+    export function getServers(): string[];
 
     // Error codes
     export var NODATA: string;
@@ -2674,6 +2808,25 @@ declare module "dns" {
     export var LOADIPHLPAPI: string;
     export var ADDRGETNETWORKPARAMS: string;
     export var CANCELLED: string;
+
+    export class Resolver {
+        getServers: typeof getServers;
+        setServers: typeof setServers;
+        resolve: typeof resolve;
+        resolve4: typeof resolve4;
+        resolve6: typeof resolve6;
+        resolveAny: typeof resolveAny;
+        resolveCname: typeof resolveCname;
+        resolveMx: typeof resolveMx;
+        resolveNaptr: typeof resolveNaptr;
+        resolveNs: typeof resolveNs;
+        resolvePtr: typeof resolvePtr;
+        resolveSoa: typeof resolveSoa;
+        resolveSrv: typeof resolveSrv;
+        resolveTxt: typeof resolveTxt;
+        reverse: typeof reverse;
+        cancel(): void;
+    }
 }
 
 declare module "net" {
@@ -2730,7 +2883,6 @@ declare module "net" {
 
         bufferSize: number;
         setEncoding(encoding?: string): this;
-        destroy(err?: any): void;
         pause(): this;
         resume(): this;
         setTimeout(timeout: number, callback?: Function): this;
@@ -3096,7 +3248,6 @@ declare module "fs" {
 
     export class ReadStream extends stream.Readable {
         close(): void;
-        destroy(): void;
         bytesRead: number;
         path: string | Buffer;
 
@@ -4434,6 +4585,17 @@ declare module "fs" {
         /** Constant for fs.access(). File can be executed by the calling process. */
         export const X_OK: number;
 
+        // File Copy Constants
+
+        /** Constant for fs.copyFile. Flag indicating the destination file should not be overwritten if it already exists. */
+        export const COPYFILE_EXCL: number;
+
+        /** Constant for fs.copyFile. copy operation will attempt to create a copy-on-write reflink. If the underlying platform does not support copy-on-write, then a fallback copy mechanism is used. */
+        export const COPYFILE_FICLONE: number;
+
+        /** Constant for fs.copyFile. Copy operation will attempt to create a copy-on-write reflink. If the underlying platform does not support copy-on-write, then the operation will fail with an error. */
+        export const COPYFILE_FICLONE_FORCE: number;
+
         // File Open Constants
 
         /** Constant for fs.open(). Flag indicating to open a file for read-only access. */
@@ -4547,9 +4709,6 @@ 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;
     }
 
     /**
@@ -5691,10 +5850,12 @@ declare module "tls" {
 }
 
 declare module "crypto" {
+    import * as stream from "stream";
+
     export interface Certificate {
-        exportChallenge(spkac: string | Buffer): Buffer;
-        exportPublicKey(spkac: string | Buffer): Buffer;
-        verifySpkac(spkac: Buffer): boolean;
+        exportChallenge(spkac: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
+        exportPublicKey(spkac: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
+        verifySpkac(spkac: Buffer | NodeJS.TypedArray | DataView): boolean;
     }
     export var Certificate: {
         new(): Certificate;
@@ -5715,8 +5876,8 @@ declare module "crypto" {
     }
     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;
+    export function createHash(algorithm: string, options?: stream.TransformOptions): Hash;
+    export function createHmac(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Hmac;
 
     type Utf8AsciiLatin1Encoding = "utf8" | "ascii" | "latin1";
     type HexBase64Latin1Encoding = "latin1" | "hex" | "base64";
@@ -5725,72 +5886,116 @@ declare module "crypto" {
     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;
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Hash;
+        update(data: string, 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;
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Hmac;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Hmac;
         digest(): Buffer;
         digest(encoding: HexBase64Latin1Encoding): string;
     }
-
+    export type CipherCCMTypes = 'aes-128-ccm' | 'aes-192-ccm' | 'aes-256-ccm';
+    export type CipherGCMTypes = 'aes-128-gcm' | 'aes-192-gcm' | 'aes-256-gcm';
+    export interface CipherCCMOptions extends stream.TransformOptions {
+        authTagLength: number;
+    }
+    export interface CipherGCMOptions extends stream.TransformOptions {
+        authTagLength?: number;
+    }
     /** @deprecated since v10.0.0 use createCipheriv() */
-    export function createCipher(algorithm: string, password: any): Cipher;
-    export function createCipheriv(algorithm: string, key: any, iv: any): Cipher;
+    export function createCipher(algorithm: CipherCCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): CipherCCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    export function createCipher(algorithm: CipherGCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): CipherGCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    export function createCipher(algorithm: string, password: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Cipher;
+
+    export function createCipheriv(algorithm: CipherCCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): CipherCCM;
+    export function createCipheriv(algorithm: CipherGCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): CipherGCM;
+    export function createCipheriv(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Cipher;
+
     export interface Cipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer | DataView): Buffer;
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Buffer;
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding): Buffer;
-        update(data: Buffer | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: Buffer | NodeJS.TypedArray | DataView, output_encoding: HexBase64BinaryEncoding): string;
+        update(data: Buffer | NodeJS.TypedArray | DataView, input_encoding: any, output_encoding: HexBase64BinaryEncoding): string;
+        // second arg ignored
         update(data: string, input_encoding: Utf8AsciiBinaryEncoding, output_encoding: HexBase64BinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
         setAutoPadding(auto_padding?: boolean): this;
+        // getAuthTag(): Buffer;
+        // setAAD(buffer: Buffer): this; // docs only say buffer
+    }
+    export interface CipherCCM extends Cipher {
+        setAAD(buffer: Buffer, options: { plaintextLength: number }): this;
+        getAuthTag(): Buffer;
+    }
+    export interface CipherGCM extends Cipher {
+        setAAD(buffer: Buffer, options?: { plaintextLength: number }): this;
         getAuthTag(): Buffer;
-        setAAD(buffer: Buffer): this;
     }
     /** @deprecated since v10.0.0 use createCipheriv() */
-    export function createDecipher(algorithm: string, password: any): Decipher;
-    export function createDecipheriv(algorithm: string, key: any, iv: any): Decipher;
+    export function createDecipher(algorithm: CipherCCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): DecipherCCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    export function createDecipher(algorithm: CipherGCMTypes, password: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): DecipherGCM;
+    /** @deprecated since v10.0.0 use createCipheriv() */
+    export function createDecipher(algorithm: string, password: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Decipher;
+
+    export function createDecipheriv(algorithm: CipherCCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options: CipherCCMOptions): DecipherCCM;
+    export function createDecipheriv(algorithm: CipherGCMTypes, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: CipherGCMOptions): DecipherGCM;
+    export function createDecipheriv(algorithm: string, key: string | Buffer | NodeJS.TypedArray | DataView, iv: string | Buffer | NodeJS.TypedArray | DataView, options?: stream.TransformOptions): Decipher;
+
     export interface Decipher extends NodeJS.ReadWriteStream {
-        update(data: Buffer | DataView): Buffer;
+        update(data: Buffer | NodeJS.TypedArray | DataView): Buffer;
         update(data: string, input_encoding: HexBase64BinaryEncoding): Buffer;
-        update(data: Buffer | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        update(data: Buffer | NodeJS.TypedArray | DataView, input_encoding: any, output_encoding: Utf8AsciiBinaryEncoding): string;
+        // second arg is ignored
         update(data: string, input_encoding: HexBase64BinaryEncoding, output_encoding: Utf8AsciiBinaryEncoding): string;
         final(): Buffer;
         final(output_encoding: string): string;
         setAutoPadding(auto_padding?: boolean): this;
-        setAuthTag(tag: Buffer): this;
-        setAAD(buffer: Buffer): this;
+        // setAuthTag(tag: Buffer | NodeJS.TypedArray | DataView): this;
+        // setAAD(buffer: Buffer | NodeJS.TypedArray | DataView): this;
     }
-    export function createSign(algorithm: string): Signer;
+    export interface DecipherCCM extends Decipher {
+        setAuthTag(buffer: Buffer | NodeJS.TypedArray | DataView): this;
+        setAAD(buffer: Buffer | NodeJS.TypedArray | DataView, options: { plaintextLength: number }): this;
+    }
+    export interface DecipherGCM extends Decipher {
+        setAuthTag(buffer: Buffer | NodeJS.TypedArray | DataView): this;
+        setAAD(buffer: Buffer | NodeJS.TypedArray | DataView, options?: { plaintextLength: number }): this;
+    }
+
+    export function createSign(algorithm: string, options?: stream.WritableOptions): 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;
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Signer;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Signer;
+        sign(private_key: string | { key: string; passphrase: string, padding?: number, saltLength?: number }): Buffer;
+        sign(private_key: string | { key: string; passphrase: string, padding?: number, saltLength?: number }, output_format: HexBase64Latin1Encoding): string;
     }
-    export function createVerify(algorith: string): Verify;
+    export function createVerify(algorith: string, options?: stream.WritableOptions): 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;
+        update(data: string | Buffer | NodeJS.TypedArray | DataView): Verify;
+        update(data: string, input_encoding: Utf8AsciiLatin1Encoding): Verify;
+        verify(object: string | Object, signature: Buffer | NodeJS.TypedArray | 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_length: number, generator?: number | Buffer | NodeJS.TypedArray | DataView): DiffieHellman;
+    export function createDiffieHellman(prime: Buffer | NodeJS.TypedArray | DataView): 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: number | Buffer | NodeJS.TypedArray | DataView): 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: Buffer | NodeJS.TypedArray | DataView): Buffer;
         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: Buffer | NodeJS.TypedArray | DataView, output_encoding: HexBase64Latin1Encoding): string;
         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
         getPrime(): Buffer;
         getPrime(encoding: HexBase64Latin1Encoding): string;
@@ -5800,26 +6005,36 @@ declare module "crypto" {
         getPublicKey(encoding: HexBase64Latin1Encoding): string;
         getPrivateKey(): Buffer;
         getPrivateKey(encoding: HexBase64Latin1Encoding): string;
-        setPublicKey(public_key: Buffer): void;
+        setPublicKey(public_key: Buffer | NodeJS.TypedArray | DataView): void;
         setPublicKey(public_key: string, encoding: string): void;
-        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: Buffer | NodeJS.TypedArray | DataView): 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 pbkdf2(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, iterations: number, keylen: number, digest: string, callback: (err: Error | null, derivedKey: Buffer) => any): void;
+    export function pbkdf2Sync(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, 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 randomBytes(size: number, callback: (err: Error | null, 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 function pseudoRandomBytes(size: number, callback: (err: Error | null, buf: Buffer) => void): void;
+
+    export function randomFillSync<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset?: number, size?: number): T;
+    export function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, callback: (err: Error | null, buf: T) => void): void;
+    export function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset: number, callback: (err: Error | null, buf: T) => void): void;
+    export function randomFill<T extends Buffer | NodeJS.TypedArray | DataView>(buffer: T, offset: number, size: number, callback: (err: Error | null, buf: T) => void): void;
+
+    export interface ScryptOptions {
+        N?: number;
+        r?: number;
+        p?: number;
+        maxmem?: number;
+    }
+    export function scrypt(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, keylen: number, callback: (err: Error | null, derivedKey: Buffer) => void): void;
+    export function scrypt(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, keylen: number, options: ScryptOptions, callback: (err: Error | null, derivedKey: Buffer) => void): void;
+    export function scryptSync(password: string | Buffer | NodeJS.TypedArray | DataView, salt: string | Buffer | NodeJS.TypedArray | DataView, keylen: number, options?: ScryptOptions): Buffer;
+
     export interface RsaPublicKey {
         key: string;
         padding?: number;
@@ -5829,29 +6044,30 @@ declare module "crypto" {
         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 publicEncrypt(public_key: string | RsaPublicKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    export function privateDecrypt(private_key: string | RsaPrivateKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    export function privateEncrypt(private_key: string | RsaPrivateKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
+    export function publicDecrypt(public_key: string | RsaPublicKey, buffer: Buffer | NodeJS.TypedArray | DataView): Buffer;
     export function getCiphers(): string[];
     export function getCurves(): string[];
     export function getHashes(): string[];
-    export interface ECDH {
-        convertKey(key: string | Buffer /*| TypedArray*/ | DataView, curve: string, inputEncoding?: string, outputEncoding?: string, format?: string): Buffer | string;
+    export class ECDH {
+        static convertKey(key: string | Buffer | NodeJS.TypedArray | DataView, curve: string, inputEncoding?: HexBase64Latin1Encoding, outputEncoding?: "latin1" | "hex" | "base64", format?: "uncompressed" | "compressed" | "hybrid"): Buffer | string;
         generateKeys(): Buffer;
         generateKeys(encoding: HexBase64Latin1Encoding, format?: ECDHKeyFormat): string;
-        computeSecret(other_public_key: Buffer): Buffer;
+        computeSecret(other_public_key: Buffer | NodeJS.TypedArray | DataView): Buffer;
         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding): Buffer;
+        computeSecret(other_public_key: Buffer | NodeJS.TypedArray | DataView, output_encoding: HexBase64Latin1Encoding): string;
         computeSecret(other_public_key: string, input_encoding: HexBase64Latin1Encoding, output_encoding: HexBase64Latin1Encoding): string;
         getPrivateKey(): Buffer;
         getPrivateKey(encoding: HexBase64Latin1Encoding): string;
         getPublicKey(): Buffer;
         getPublicKey(encoding: HexBase64Latin1Encoding, format?: ECDHKeyFormat): string;
-        setPrivateKey(private_key: Buffer): void;
+        setPrivateKey(private_key: Buffer | NodeJS.TypedArray | DataView): void;
         setPrivateKey(private_key: string, encoding: HexBase64Latin1Encoding): void;
     }
     export function createECDH(curve_name: string): ECDH;
-    export function timingSafeEqual(a: Buffer, b: Buffer): boolean;
+    export function timingSafeEqual(a: Buffer | NodeJS.TypedArray | DataView, b: Buffer | NodeJS.TypedArray | DataView): boolean;
     /** @deprecated since v10.0.0 */
     export var DEFAULT_ENCODING: string;
 }
@@ -5870,8 +6086,8 @@ declare module "stream" {
             highWaterMark?: number;
             encoding?: string;
             objectMode?: boolean;
-            read?: (this: Readable, size?: number) => any;
-            destroy?: (error?: Error) => any;
+            read?(this: Readable, size: number): void;
+            destroy?(this: Readable, error: Error | null, callback: (error: Error | null) => void): void;
         }
 
         export class Readable extends Stream implements NodeJS.ReadableStream {
@@ -5889,7 +6105,7 @@ declare module "stream" {
             unshift(chunk: any): void;
             wrap(oldStream: NodeJS.ReadableStream): this;
             push(chunk: any, encoding?: string): boolean;
-            _destroy(err: Error, callback: Function): void;
+            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
             destroy(error?: Error): void;
 
             /**
@@ -5901,66 +6117,66 @@ declare module "stream" {
              * 4. readable
              * 5. error
              */
-            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: "data", listener: (chunk: any) => void): this;
             addListener(event: "end", listener: () => void): this;
             addListener(event: "readable", listener: () => void): this;
             addListener(event: "error", listener: (err: Error) => void): this;
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-            emit(event: string | symbol, ...args: any[]): boolean;
             emit(event: "close"): boolean;
-            emit(event: "data", chunk: Buffer | string): boolean;
+            emit(event: "data", chunk: any): boolean;
             emit(event: "end"): boolean;
             emit(event: "readable"): boolean;
             emit(event: "error", err: Error): boolean;
+            emit(event: string | symbol, ...args: any[]): 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: "data", listener: (chunk: any) => void): this;
             on(event: "end", listener: () => void): this;
             on(event: "readable", listener: () => void): this;
             on(event: "error", listener: (err: Error) => void): this;
+            on(event: string | symbol, listener: (...args: any[]) => 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: "data", listener: (chunk: any) => void): this;
             once(event: "end", listener: () => void): this;
             once(event: "readable", listener: () => void): this;
             once(event: "error", listener: (err: Error) => void): this;
+            once(event: string | symbol, listener: (...args: any[]) => 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: "data", listener: (chunk: any) => void): this;
             prependListener(event: "end", listener: () => void): this;
             prependListener(event: "readable", listener: () => void): this;
             prependListener(event: "error", listener: (err: Error) => void): this;
+            prependListener(event: string | symbol, listener: (...args: any[]) => 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: "data", listener: (chunk: any) => void): this;
             prependOnceListener(event: "end", listener: () => void): this;
             prependOnceListener(event: "readable", listener: () => void): this;
             prependOnceListener(event: "error", listener: (err: Error) => void): this;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => 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: "data", listener: (chunk: any) => void): this;
             removeListener(event: "end", listener: () => void): this;
             removeListener(event: "readable", listener: () => void): this;
             removeListener(event: "error", listener: (err: Error) => void): this;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-            [Symbol.asyncIterator](): AsyncIterableIterator<Buffer | string>;
+            [Symbol.asyncIterator](): AsyncIterableIterator<any>;
         }
 
         export interface WritableOptions {
             highWaterMark?: number;
             decodeStrings?: boolean;
             objectMode?: boolean;
-            write?: (chunk: any, encoding: string, callback: Function) => any;
-            writev?: (chunks: Array<{ chunk: any, encoding: string }>, callback: Function) => any;
-            destroy?: (error?: Error) => any;
-            final?: (callback: (error?: Error) => void) => void;
+            write?(this: Writable, chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
+            writev?(this: Writable, chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
+            destroy?(this: Writable, error: Error | null, callback: (error: Error | null) => void): void;
+            final?(this: Writable, callback: (error?: Error | null) => void): void;
         }
 
         export class Writable extends Stream implements NodeJS.WritableStream {
@@ -5968,16 +6184,16 @@ declare module "stream" {
             readonly writableHighWaterMark: number;
             readonly writableLength: number;
             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;
+            _write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
+            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
+            _final(callback: (error?: Error | null) => void): void;
+            write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean;
+            write(chunk: any, encoding?: string, cb?: (error: Error | null | undefined) => void): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(cb?: Function): void;
-            end(chunk: any, cb?: Function): void;
-            end(chunk: any, encoding?: string, cb?: Function): void;
+            end(cb?: () => void): void;
+            end(chunk: any, cb?: () => void): void;
+            end(chunk: any, encoding?: string, cb?: () => void): void;
             cork(): void;
             uncork(): void;
             destroy(error?: Error): void;
@@ -5992,67 +6208,72 @@ declare module "stream" {
              * 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;
+            addListener(event: string | symbol, listener: (...args: any[]) => void): this;
 
-            emit(event: string | symbol, ...args: any[]): boolean;
             emit(event: "close"): boolean;
-            emit(event: "drain", chunk: Buffer | string): boolean;
+            emit(event: "drain"): boolean;
             emit(event: "error", err: Error): boolean;
             emit(event: "finish"): boolean;
             emit(event: "pipe", src: Readable): boolean;
             emit(event: "unpipe", src: Readable): boolean;
+            emit(event: string | symbol, ...args: any[]): 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;
+            on(event: string | symbol, listener: (...args: any[]) => 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;
+            once(event: string | symbol, listener: (...args: any[]) => 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;
+            prependListener(event: string | symbol, listener: (...args: any[]) => 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;
+            prependOnceListener(event: string | symbol, listener: (...args: any[]) => 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;
+            removeListener(event: string | symbol, listener: (...args: any[]) => void): this;
         }
 
         export interface DuplexOptions extends ReadableOptions, WritableOptions {
             allowHalfOpen?: boolean;
             readableObjectMode?: boolean;
             writableObjectMode?: boolean;
+            read?(this: Duplex, size: number): void;
+            write?(this: Duplex, chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
+            writev?(this: Duplex, chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
+            final?(this: Duplex, callback: (error?: Error | null) => void): void;
+            destroy?(this: Duplex, error: Error | null, callback: (error: Error | null) => void): void;
         }
 
         // Note: Duplex extends both Readable and Writable.
@@ -6061,31 +6282,36 @@ declare module "stream" {
             readonly writableHighWaterMark: number;
             readonly writableLength: number;
             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;
+            _write(chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
+            _writev?(chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
+            _destroy(error: Error | null, callback: (error: Error | null) => void): void;
+            _final(callback: (error?: Error | null) => void): void;
+            write(chunk: any, cb?: (error: Error | null | undefined) => void): boolean;
+            write(chunk: any, encoding?: string, cb?: (error: Error | null | undefined) => void): boolean;
             setDefaultEncoding(encoding: string): this;
-            end(cb?: Function): void;
-            end(chunk: any, cb?: Function): void;
-            end(chunk: any, encoding?: string, cb?: Function): void;
+            end(cb?: () => void): void;
+            end(chunk: any, cb?: () => void): void;
+            end(chunk: any, encoding?: string, cb?: () => void): void;
             cork(): void;
             uncork(): void;
         }
 
-        type TransformCallback = (err?: Error, data?: any) => void;
+        type TransformCallback = (error?: Error, data?: any) => void;
 
         export interface TransformOptions extends DuplexOptions {
-            transform?: (chunk: any, encoding: string, callback: TransformCallback) => any;
-            flush?: (callback: TransformCallback) => any;
+            read?(this: Transform, size: number): void;
+            write?(this: Transform, chunk: any, encoding: string, callback: (error?: Error | null) => void): void;
+            writev?(this: Transform, chunks: Array<{ chunk: any, encoding: string }>, callback: (error?: Error | null) => void): void;
+            final?(this: Transform, callback: (error?: Error | null) => void): void;
+            destroy?(this: Transform, error: Error | null, callback: (error: Error | null) => void): void;
+            transform?(this: Transform, chunk: any, encoding: string, callback: TransformCallback): void;
+            flush?(this: Transform, callback: TransformCallback): void;
         }
 
         export class Transform extends Duplex {
             constructor(opts?: TransformOptions);
             _transform(chunk: any, encoding: string, callback: TransformCallback): void;
-            destroy(error?: Error): void;
+            _flush(callback: TransformCallback): void;
         }
 
         export class PassThrough extends Transform { }
@@ -6112,6 +6338,7 @@ declare module "stream" {
 declare module "util" {
     export interface InspectOptions extends NodeJS.InspectOptions { }
     export function format(format: any, ...param: any[]): string;
+    export function formatWithOptions(inspectOptions: InspectOptions, format: string, ...param: any[]): string;
     /** @deprecated since v0.11.3 - use `console.error()` instead. */
     export function debug(string: string): void;
     /** @deprecated since v0.11.3 - use `console.error()` instead. */
@@ -6190,17 +6417,17 @@ declare module "util" {
 
     export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
     export function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
-    export function promisify(fn: (callback: (err: Error | null) => void) => void): () => Promise<void>;
+    export function promisify(fn: (callback: (err?: Error | null) => void) => void): () => Promise<void>;
     export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err?: Error | null) => void) => void): (arg1: T1) => Promise<void>;
     export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err?: Error | null) => 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;
@@ -6234,7 +6461,7 @@ declare module "util" {
         export function isSharedArrayBuffer(object: any): boolean;
         export function isStringObject(object: any): boolean;
         export function isSymbolObject(object: any): boolean;
-        export function isTypedArray(object: any): object is Uint8Array | Uint8ClampedArray | Uint16Array | Uint32Array | Int8Array | Int16Array | Int32Array | Float32Array | Float64Array;
+        export function isTypedArray(object: any): object is NodeJS.TypedArray;
         export function isUint8Array(object: any): object is Uint8Array;
         export function isUint8ClampedArray(object: any): object is Uint8ClampedArray;
         export function isUint16Array(object: any): object is Uint16Array;
@@ -6253,19 +6480,7 @@ declare module "util" {
           options?: { fatal?: boolean; ignoreBOM?: boolean }
         );
         decode(
-          input?:
-            Int8Array
-            | Int16Array
-            | Int32Array
-            | Uint8Array
-            | Uint16Array
-            | Uint32Array
-            | Uint8ClampedArray
-            | Float32Array
-            | Float64Array
-            | DataView
-            | ArrayBuffer
-            | null,
+          input?: NodeJS.TypedArray | DataView | ArrayBuffer | null,
           options?: { stream?: boolean }
         ): string;
     }
@@ -6278,7 +6493,7 @@ declare module "util" {
 }
 
 declare module "assert" {
-    function internal(value: any, message?: string): void;
+    function internal(value: any, message?: string | Error): void;
     namespace internal {
         export class AssertionError implements Error {
             name: string;
@@ -6287,46 +6502,44 @@ declare module "assert" {
             expected: any;
             operator: string;
             generatedMessage: boolean;
+            code: 'ERR_ASSERTION';
 
             constructor(options?: {
                 message?: string; actual?: any; expected?: any;
-                operator?: string; stackStartFunction?: Function
+                operator?: string; stackStartFn?: Function
             });
         }
 
-        export function fail(message: string): never;
-        /** @deprecated since v10.0.0 */
-        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
-        export function ok(value: any, message?: string): void;
-        /** @deprecated use strictEqual() */
-        export function equal(actual: any, expected: any, message?: string): void;
-        /** @deprecated use notStrictEqual() */
-        export function notEqual(actual: any, expected: any, message?: string): void;
-        /** @deprecated use deepStrictEqual() */
-        export function deepEqual(actual: any, expected: any, message?: string): void;
-        /** @deprecated use notDeepStrictEqual() */
-        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 fail(message?: string | Error): never;
+        /** @deprecated since v10.0.0 - use fail([message]) or other assert functions instead. */
+        export function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
+        export function ok(value: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use strictEqual() instead. */
+        export function equal(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use notStrictEqual() instead. */
+        export function notEqual(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use deepStrictEqual() instead. */
+        export function deepEqual(actual: any, expected: any, message?: string | Error): void;
+        /** @deprecated since v9.9.0 - use notDeepStrictEqual() instead. */
+        export function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
+        export function strictEqual(actual: any, expected: any, message?: string | Error): void;
+        export function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): 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 throws(block: Function, message?: string | Error): void;
+        export function throws(block: Function, error: RegExp | Function | Object | Error, message?: string | Error): void;
+        export function doesNotThrow(block: Function, message?: string | Error): void;
+        export function doesNotThrow(block: Function, error: RegExp | Function, message?: string | Error): void;
 
         export function ifError(value: any): void;
 
-        export function rejects(block: Function | Promise<any>, message?: string): Promise<void>;
-        export function rejects(block: Function | Promise<any>, error: Function | RegExp | Object | Error, message?: string): Promise<void>;
-        export function doesNotReject(block: Function | Promise<any>, message?: string): Promise<void>;
-        export function doesNotReject(block: Function | Promise<any>, error: Function | RegExp | Object | Error, message?: string): Promise<void>;
+        export function rejects(block: Function | Promise<any>, message?: string | Error): Promise<void>;
+        export function rejects(block: Function | Promise<any>, error: RegExp | Function | Object | Error, message?: string | Error): Promise<void>;
+        export function doesNotReject(block: Function | Promise<any>, message?: string | Error): Promise<void>;
+        export function doesNotReject(block: Function | Promise<any>, error: RegExp | Function, message?: string | Error): Promise<void>;
+
+        export var strict: typeof internal;
     }
 
     export = internal;
@@ -6610,6 +6823,9 @@ declare module "constants" {
     export var R_OK: number;
     export var W_OK: number;
     export var X_OK: number;
+    export var COPYFILE_EXCL: number;
+    export var COPYFILE_FICLONE: number;
+    export var COPYFILE_FICLONE_FORCE: number;
     export var UV_UDP_REUSEADDR: number;
     export var SIGQUIT: number;
     export var SIGTRAP: number;
@@ -7087,13 +7303,16 @@ declare module "http2" {
         readonly alpnProtocol?: string;
         close(callback?: () => void): void;
         readonly closed: boolean;
+        readonly connecting: boolean;
         destroy(error?: Error, code?: number): void;
         readonly destroyed: boolean;
         readonly encrypted?: boolean;
-        goaway(code?: number, lastStreamID?: number, opaqueData?: Buffer | DataView /*| TypedArray*/): void;
+        goaway(code?: number, lastStreamID?: number, opaqueData?: Buffer | DataView | NodeJS.TypedArray): void;
         readonly localSettings: Settings;
         readonly originSet?: string[];
         readonly pendingSettingsAck: boolean;
+        ping(callback: (err: Error | null, duration: number, payload: Buffer) => void): boolean;
+        ping(payload: Buffer | DataView | NodeJS.TypedArray , callback: (err: Error | null, duration: number, payload: Buffer) => void): boolean;
         ref(): void;
         readonly remoteSettings: Settings;
         rstStream(stream: Http2Stream, code?: number): void;
diff --git a/types/node/inspector.d.ts b/types/node/inspector.d.ts
index 955239b486..474c481d5a 100644
--- a/types/node/inspector.d.ts
+++ b/types/node/inspector.d.ts
@@ -15,26 +15,1075 @@ declare module "inspector" {
         params: T;
     }
 
-    export namespace Schema {
+    export namespace Console {
         /**
-         * Description of the protocol domain.
+         * Console message.
          */
-        export interface Domain {
+        export interface ConsoleMessage {
             /**
-             * Domain name.
+             * Message source.
              */
-            name: string;
+            source: string;
             /**
-             * Domain version.
+             * Message severity.
              */
-            version: string;
+            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 GetDomainsReturnType {
+        export interface MessageAddedEventDataType {
             /**
-             * List of supported domains.
+             * Console message that has been added.
              */
-            domains: Schema.Domain[];
+            message: Console.ConsoleMessage;
+        }
+    }
+
+    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 `Debugger.scriptParsed`.
+             */
+            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.
+             */
+            functionLocation?: Debugger.Location;
+            /**
+             * Location in the source code.
+             */
+            location: Debugger.Location;
+            /**
+             * JavaScript script name or url.
+             */
+            url: string;
+            /**
+             * Scope chain for this call frame.
+             */
+            scopeChain: Debugger.Scope[];
+            /**
+             * `this` 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 `global` and `with` 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.
+         */
+        export interface SearchMatch {
+            /**
+             * Line number in resource content.
+             */
+            lineNumber: number;
+            /**
+             * Line with match content.
+             */
+            lineContent: string;
+        }
+
+        export interface BreakLocation {
+            /**
+             * Script identifier as reported in the `Debugger.scriptParsed`.
+             */
+            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 ContinueToLocationParameterType {
+            /**
+             * Location to continue to.
+             */
+            location: Debugger.Location;
+            targetCallFrames?: 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 `releaseObjectGroup`).
+             */
+            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 `setPauseOnException` 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.
+             */
+            throwOnSideEffect?: boolean;
+        }
+
+        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 GetScriptSourceParameterType {
+            /**
+             * Id of the script to get source for.
+             */
+            scriptId: Runtime.ScriptId;
+        }
+
+        export interface GetStackTraceParameterType {
+            stackTraceId: Runtime.StackTraceId;
+        }
+
+        export interface PauseOnAsyncCallParameterType {
+            /**
+             * Debugger will pause when async call with given stack trace is started.
+             */
+            parentStackTraceId: Runtime.StackTraceId;
+        }
+
+        export interface RemoveBreakpointParameterType {
+            breakpointId: Debugger.BreakpointId;
+        }
+
+        export interface RestartFrameParameterType {
+            /**
+             * Call frame identifier to evaluate on.
+             */
+            callFrameId: Debugger.CallFrameId;
+        }
+
+        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 SetAsyncCallStackDepthParameterType {
+            /**
+             * Maximum depth of async call stacks. Setting to `0` 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 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 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 `url` or
+`urlRegex` must be specified.
+             */
+            urlRegex?: string;
+            /**
+             * Script hash of the resources to set breakpoint on.
+             */
+            scriptHash?: 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 SetBreakpointsActiveParameterType {
+            /**
+             * New value for breakpoints active state.
+             */
+            active: boolean;
+        }
+
+        export interface SetPauseOnExceptionsParameterType {
+            /**
+             * Pause on exceptions mode.
+             */
+            state: string;
+        }
+
+        export interface SetReturnValueParameterType {
+            /**
+             * New return value.
+             */
+            newValue: Runtime.CallArgument;
+        }
+
+        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 SetSkipAllPausesParameterType {
+            /**
+             * New value for skip pauses state.
+             */
+            skip: 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 StepIntoParameterType {
+            /**
+             * Debugger will issue additional Debugger.paused notification if any async task is scheduled
+before next pause.
+             * @experimental
+             */
+            breakOnAsyncCall?: boolean;
+        }
+
+        export interface EnableReturnType {
+            /**
+             * Unique identifier of the debugger.
+             * @experimental
+             */
+            debuggerId: Runtime.UniqueDebuggerId;
+        }
+
+        export interface EvaluateOnCallFrameReturnType {
+            /**
+             * Object wrapper for the evaluation result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface GetPossibleBreakpointsReturnType {
+            /**
+             * List of the possible breakpoint locations.
+             */
+            locations: Debugger.BreakLocation[];
+        }
+
+        export interface GetScriptSourceReturnType {
+            /**
+             * Script source.
+             */
+            scriptSource: string;
+        }
+
+        export interface GetStackTraceReturnType {
+            stackTrace: Runtime.StackTrace;
+        }
+
+        export interface RestartFrameReturnType {
+            /**
+             * New stack trace.
+             */
+            callFrames: Debugger.CallFrame[];
+            /**
+             * Async stack trace, if any.
+             */
+            asyncStackTrace?: Runtime.StackTrace;
+            /**
+             * Async stack trace, if any.
+             * @experimental
+             */
+            asyncStackTraceId?: Runtime.StackTraceId;
+        }
+
+        export interface SearchInContentReturnType {
+            /**
+             * List of search matches.
+             */
+            result: Debugger.SearchMatch[];
+        }
+
+        export interface SetBreakpointReturnType {
+            /**
+             * Id of the created breakpoint for further reference.
+             */
+            breakpointId: Debugger.BreakpointId;
+            /**
+             * Location this breakpoint resolved into.
+             */
+            actualLocation: Debugger.Location;
+        }
+
+        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 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;
+            /**
+             * Async stack trace, if any.
+             * @experimental
+             */
+            asyncStackTraceId?: Runtime.StackTraceId;
+            /**
+             * Exception details if any.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        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;
+            /**
+             * Async stack trace, if any.
+             * @experimental
+             */
+            asyncStackTraceId?: Runtime.StackTraceId;
+            /**
+             * Just scheduled async call will have this stack trace as parent stack during async execution.
+This field is available only after `Debugger.stepInto` call with `breakOnAsynCall` flag.
+             * @experimental
+             */
+            asyncCallStackTraceId?: Runtime.StackTraceId;
+        }
+
+        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.
+             */
+            hasSourceURL?: boolean;
+            /**
+             * True, if this script is ES6 module.
+             */
+            isModule?: boolean;
+            /**
+             * This script length.
+             */
+            length?: number;
+            /**
+             * JavaScript top stack frame of where the script parsed event was triggered if available.
+             * @experimental
+             */
+            stackTrace?: Runtime.StackTrace;
+        }
+
+        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.
+             */
+            hasSourceURL?: boolean;
+            /**
+             * True, if this script is ES6 module.
+             */
+            isModule?: boolean;
+            /**
+             * This script length.
+             */
+            length?: number;
+            /**
+             * JavaScript top stack frame of where the script parsed event was triggered if available.
+             * @experimental
+             */
+            stackTrace?: Runtime.StackTrace;
+        }
+    }
+
+    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 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 GetObjectByHeapObjectIdParameterType {
+            objectId: HeapProfiler.HeapSnapshotObjectId;
+            /**
+             * Symbolic group name that can be used to release multiple objects.
+             */
+            objectGroup?: string;
+        }
+
+        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 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 GetHeapObjectIdReturnType {
+            /**
+             * Id of the heap snapshot object corresponding to the passed remote object id.
+             */
+            heapSnapshotObjectId: HeapProfiler.HeapSnapshotObjectId;
+        }
+
+        export interface GetObjectByHeapObjectIdReturnType {
+            /**
+             * Evaluation result.
+             */
+            result: Runtime.RemoteObject;
+        }
+
+        export interface GetSamplingProfileReturnType {
+            /**
+             * Return the sampling profile being collected.
+             */
+            profile: HeapProfiler.SamplingHeapProfile;
+        }
+
+        export interface StopSamplingReturnType {
+            /**
+             * Recorded sampling heap profile.
+             */
+            profile: HeapProfiler.SamplingHeapProfile;
+        }
+
+        export interface AddHeapSnapshotChunkEventDataType {
+            chunk: string;
+        }
+
+        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[];
+        }
+
+        export interface LastSeenObjectIdEventDataType {
+            lastSeenObjectId: number;
+            timestamp: number;
+        }
+
+        export interface ReportHeapSnapshotProgressEventDataType {
+            done: number;
+            total: number;
+            finished?: boolean;
+        }
+    }
+
+    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.
+             */
+            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.
+             */
+            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.
+         */
+        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.
+         */
+        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.
+         */
+        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.
+         */
+        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[];
+        }
+
+        /**
+         * Describes a type collected during runtime.
+         * @experimental
+         */
+        export interface TypeObject {
+            /**
+             * Name of a type collected with type profiling.
+             */
+            name: string;
+        }
+
+        /**
+         * Source offset and types for a parameter or return value.
+         * @experimental
+         */
+        export interface TypeProfileEntry {
+            /**
+             * Source offset of the parameter or end of function for return values.
+             */
+            offset: number;
+            /**
+             * The types for this parameter or return value.
+             */
+            types: Profiler.TypeObject[];
+        }
+
+        /**
+         * Type profile data collected during runtime for a JavaScript script.
+         * @experimental
+         */
+        export interface ScriptTypeProfile {
+            /**
+             * JavaScript script id.
+             */
+            scriptId: Runtime.ScriptId;
+            /**
+             * JavaScript script name or url.
+             */
+            url: string;
+            /**
+             * Type profile entries for parameters and return values of the functions in the script.
+             */
+            entries: Profiler.TypeProfileEntry[];
+        }
+
+        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;
+            /**
+             * Collect block-based coverage.
+             */
+            detailed?: boolean;
+        }
+
+        export interface GetBestEffortCoverageReturnType {
+            /**
+             * Coverage data for the current isolate.
+             */
+            result: Profiler.ScriptCoverage[];
+        }
+
+        export interface StopReturnType {
+            /**
+             * Recorded profile.
+             */
+            profile: Profiler.Profile;
+        }
+
+        export interface TakePreciseCoverageReturnType {
+            /**
+             * Coverage data for the current isolate.
+             */
+            result: Profiler.ScriptCoverage[];
+        }
+
+        export interface TakeTypeProfileReturnType {
+            /**
+             * Type profile for all scripts since startTypeProfile() was turned on.
+             */
+            result: Profiler.ScriptTypeProfile[];
+        }
+
+        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 interface ConsoleProfileStartedEventDataType {
+            id: string;
+            /**
+             * Location of console.profile().
+             */
+            location: Debugger.Location;
+            /**
+             * Profile title passed as an argument to console.profile().
+             */
+            title?: string;
         }
     }
 
@@ -50,7 +1099,8 @@ declare module "inspector" {
         export type RemoteObjectId = string;
 
         /**
-         * Primitive value which cannot be JSON-stringified.
+         * Primitive value which cannot be JSON-stringified. Includes values `-0`, `NaN`, `Infinity`,
+`-Infinity`, and bigint literals.
          */
         export type UnserializableValue = string;
 
@@ -63,11 +1113,11 @@ declare module "inspector" {
              */
             type: string;
             /**
-             * Object subtype hint. Specified for <code>object</code> type values only.
+             * Object subtype hint. Specified for `object` type values only.
              */
             subtype?: string;
             /**
-             * Object class (constructor) name. Specified for <code>object</code> type values only.
+             * Object class (constructor) name. Specified for `object` type values only.
              */
             className?: string;
             /**
@@ -75,7 +1125,8 @@ declare module "inspector" {
              */
             value?: any;
             /**
-             * Primitive value which can not be JSON-stringified does not have <code>value</code>, but gets this property.
+             * Primitive value which can not be JSON-stringified does not have `value`, but gets this
+property.
              */
             unserializableValue?: Runtime.UnserializableValue;
             /**
@@ -87,7 +1138,7 @@ declare module "inspector" {
              */
             objectId?: Runtime.RemoteObjectId;
             /**
-             * Preview containing abbreviated property values. Specified for <code>object</code> type values only.
+             * Preview containing abbreviated property values. Specified for `object` type values only.
              * @experimental
              */
             preview?: Runtime.ObjectPreview;
@@ -118,7 +1169,7 @@ declare module "inspector" {
              */
             type: string;
             /**
-             * Object subtype hint. Specified for <code>object</code> type values only.
+             * Object subtype hint. Specified for `object` type values only.
              */
             subtype?: string;
             /**
@@ -134,7 +1185,7 @@ declare module "inspector" {
              */
             properties: Runtime.PropertyPreview[];
             /**
-             * List of the entries. Specified for <code>map</code> and <code>set</code> subtype values only.
+             * List of the entries. Specified for `map` and `set` subtype values only.
              */
             entries?: Runtime.EntryPreview[];
         }
@@ -160,7 +1211,7 @@ declare module "inspector" {
              */
             valuePreview?: Runtime.ObjectPreview;
             /**
-             * Object subtype hint. Specified for <code>object</code> type values only.
+             * Object subtype hint. Specified for `object` type values only.
              */
             subtype?: string;
         }
@@ -196,19 +1247,23 @@ declare module "inspector" {
              */
             writable?: boolean;
             /**
-             * A function which serves as a getter for the property, or <code>undefined</code> if there is no getter (accessor descriptors only).
+             * A function which serves as a getter for the property, or `undefined` 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).
+             * A function which serves as a setter for the property, or `undefined` 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.
+             * 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.
+             * True if this property shows up during enumeration of the properties on the corresponding
+object.
              */
             enumerable: boolean;
             /**
@@ -220,7 +1275,7 @@ declare module "inspector" {
              */
             isOwn?: boolean;
             /**
-             * Property symbol object, if the property is of the <code>symbol</code> type.
+             * Property symbol object, if the property is of the `symbol` type.
              */
             symbol?: Runtime.RemoteObject;
         }
@@ -240,11 +1295,12 @@ declare module "inspector" {
         }
 
         /**
-         * 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.
+         * Represents function call argument. Either remote object id `objectId`, primitive `value`,
+unserializable primitive value or neither of (for undefined) them should be specified.
          */
         export interface CallArgument {
             /**
-             * Primitive value.
+             * Primitive value or serializable javascript object.
              */
             value?: any;
             /**
@@ -267,7 +1323,8 @@ declare module "inspector" {
          */
         export interface ExecutionContextDescription {
             /**
-             * Unique id of the execution context. It can be used to specify in which execution context script evaluation should be performed.
+             * Unique id of the execution context. It can be used to specify in which execution context
+script evaluation should be performed.
              */
             id: Runtime.ExecutionContextId;
             /**
@@ -285,7 +1342,8 @@ declare module "inspector" {
         }
 
         /**
-         * Detailed information about exception (or error) that was thrown during script compilation or execution.
+         * Detailed information about exception (or error) that was thrown during script compilation or
+execution.
          */
         export interface ExceptionDetails {
             /**
@@ -362,7 +1420,8 @@ declare module "inspector" {
          */
         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.
+             * String label of this stack trace. For async traces this may be a name of the function that
+initiated the async call.
              */
             description?: string;
             /**
@@ -374,51 +1433,26 @@ declare module "inspector" {
              */
             parent?: Runtime.StackTrace;
             /**
-             * Creation frame of the Promise which produced the next synchronous trace when resolved, if available.
+             * Asynchronous JavaScript stack trace that preceded this stack, if available.
              * @experimental
              */
-            promiseCreationFrame?: Runtime.CallFrame;
+            parentId?: Runtime.StackTraceId;
         }
 
-        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;
+        /**
+         * Unique identifier of current debugger.
+         * @experimental
+         */
+        export type UniqueDebuggerId = string;
+
+        /**
+         * If `debuggerId` is set stack trace comes from another debugger and can be resolved there. This
+allows to track cross-debugger calls. See `Runtime.StackTrace` and `Debugger.paused` for usages.
+         * @experimental
+         */
+        export interface StackTraceId {
+            id: string;
+            debuggerId?: Runtime.UniqueDebuggerId;
         }
 
         export interface AwaitPromiseParameterType {
@@ -437,20 +1471,23 @@ declare module "inspector" {
         }
 
         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.
+             * Identifier of the object to call function on. Either objectId or executionContextId should
+be specified.
+             */
+            objectId?: Runtime.RemoteObjectId;
+            /**
+             * 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.
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause
+execution. Overrides `setPauseOnException` state.
              */
             silent?: boolean;
             /**
@@ -464,52 +1501,23 @@ declare module "inspector" {
             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.
+             * Whether execution should `await` for resulting value and return once awaited promise is
+resolved.
              */
             awaitPromise?: boolean;
-        }
-
-        export interface GetPropertiesParameterType {
             /**
-             * Identifier of the object to return properties for.
+             * Specifies execution context which global object will be used to call function on. Either
+executionContextId or objectId should be specified.
              */
-            objectId: Runtime.RemoteObjectId;
+            executionContextId?: Runtime.ExecutionContextId;
             /**
-             * If true, returns properties belonging only to the element itself, not to its prototype chain.
+             * Symbolic group name that can be used to release multiple objects. If objectGroup is not
+specified and objectId is, objectGroup will be inherited from object.
              */
-            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;
+            objectGroup?: string;
         }
 
         export interface CompileScriptParameterType {
@@ -526,18 +1534,123 @@ declare module "inspector" {
              */
             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.
+             * 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 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 `setPauseOnException` 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.
+             */
+            userGesture?: boolean;
+            /**
+             * Whether execution should `await` for resulting value and return once awaited promise is
+resolved.
+             */
+            awaitPromise?: boolean;
+            /**
+             * Whether to throw an exception if side effect cannot be ruled out during evaluation.
+             * @experimental
+             */
+            throwOnSideEffect?: 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 GlobalLexicalScopeNamesParameterType {
+            /**
+             * Specifies in which execution context to lookup global scope variables.
+             */
+            executionContextId?: Runtime.ExecutionContextId;
+        }
+
+        export interface QueryObjectsParameterType {
+            /**
+             * Identifier of the prototype to return objects for.
+             */
+            prototypeObjectId: Runtime.RemoteObjectId;
+            /**
+             * Symbolic group name that can be used to release the results.
+             */
+            objectGroup?: string;
+        }
+
+        export interface ReleaseObjectParameterType {
+            /**
+             * Identifier of the object to release.
+             */
+            objectId: Runtime.RemoteObjectId;
+        }
+
+        export interface ReleaseObjectGroupParameterType {
+            /**
+             * Symbolic object group name.
+             */
+            objectGroup: string;
+        }
+
         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.
+             * 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;
             /**
@@ -545,7 +1658,8 @@ declare module "inspector" {
              */
             objectGroup?: string;
             /**
-             * In silent mode exceptions thrown during evaluation are not reported and do not pause execution. Overrides <code>setPauseOnException</code> state.
+             * In silent mode exceptions thrown during evaluation are not reported and do not pause
+execution. Overrides `setPauseOnException` state.
              */
             silent?: boolean;
             /**
@@ -561,20 +1675,14 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should `await` for resulting value and return once awaited promise is
+resolved.
              */
             awaitPromise?: boolean;
         }
 
-        export interface EvaluateReturnType {
-            /**
-             * Evaluation result.
-             */
-            result: Runtime.RemoteObject;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: Runtime.ExceptionDetails;
+        export interface SetCustomObjectFormatterEnabledParameterType {
+            enabled: boolean;
         }
 
         export interface AwaitPromiseReturnType {
@@ -599,6 +1707,46 @@ declare module "inspector" {
             exceptionDetails?: Runtime.ExceptionDetails;
         }
 
+        export interface CompileScriptReturnType {
+            /**
+             * Id of the script.
+             */
+            scriptId?: Runtime.ScriptId;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface EvaluateReturnType {
+            /**
+             * Evaluation result.
+             */
+            result: Runtime.RemoteObject;
+            /**
+             * Exception details.
+             */
+            exceptionDetails?: Runtime.ExceptionDetails;
+        }
+
+        export interface GetIsolateIdReturnType {
+            /**
+             * The isolate id.
+             */
+            id: string;
+        }
+
+        export interface GetHeapUsageReturnType {
+            /**
+             * Used heap size in bytes.
+             */
+            usedSize: number;
+            /**
+             * Allocated heap size in bytes.
+             */
+            totalSize: number;
+        }
+
         export interface GetPropertiesReturnType {
             /**
              * Object properties.
@@ -614,15 +1762,15 @@ declare module "inspector" {
             exceptionDetails?: Runtime.ExceptionDetails;
         }
 
-        export interface CompileScriptReturnType {
+        export interface GlobalLexicalScopeNamesReturnType {
+            names: string[];
+        }
+
+        export interface QueryObjectsReturnType {
             /**
-             * Id of the script.
+             * Array with objects.
              */
-            scriptId?: Runtime.ScriptId;
-            /**
-             * Exception details.
-             */
-            exceptionDetails?: Runtime.ExceptionDetails;
+            objects: Runtime.RemoteObject;
         }
 
         export interface RunScriptReturnType {
@@ -636,39 +1784,6 @@ declare module "inspector" {
             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.
@@ -691,959 +1806,73 @@ declare module "inspector" {
              */
             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.
+             * 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 ExceptionRevokedEventDataType {
+            /**
+             * Reason describing why exception was revoked.
+             */
+            reason: string;
+            /**
+             * The id of revoked exception, as reported in `exceptionThrown`.
+             */
+            exceptionId: number;
+        }
+
+        export interface ExceptionThrownEventDataType {
+            /**
+             * Timestamp of the exception.
+             */
+            timestamp: Runtime.Timestamp;
+            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 InspectRequestedEventDataType {
             object: Runtime.RemoteObject;
             hints: {};
         }
     }
 
-    export namespace Debugger {
+    export namespace Schema {
         /**
-         * Breakpoint identifier.
+         * Description of the protocol domain.
          */
-        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 {
+        export interface Domain {
             /**
-             * New value for skip pauses state.
+             * Domain name.
              */
-            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;
+            name: string;
             /**
-             * If true, treats string parameter as regex.
+             * Domain version.
              */
-            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;
+            version: string;
         }
 
-        export interface HeapStatsUpdateEventDataType {
+        export interface GetDomainsReturnType {
             /**
-             * 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.
+             * List of supported domains.
              */
-            statsUpdate: number[];
+            domains: Schema.Domain[];
         }
     }
 
@@ -1673,15 +1902,291 @@ declare module "inspector" {
         post(method: string, callback?: (err: Error | null, params?: {}) => void): void;
 
         /**
-         * Returns supported domains.
+         * Does nothing.
          */
-        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;
+        post(method: "Console.clearMessages", 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;
+
+        /**
+         * Enables console domain, sends the messages collected so far to the client by means of the
+`messageAdded` notification.
+         */
+        post(method: "Console.enable", callback?: (err: Error | null) => 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;
+
+        /**
+         * Disables debugger for given page.
+         */
+        post(method: "Debugger.disable", callback?: (err: Error | null) => 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, params: Debugger.EnableReturnType) => 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;
+
+        /**
+         * Returns possible locations for breakpoint. scriptId in start and end range locations should be
+the same.
+         */
+        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;
+
+        /**
+         * 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;
+
+        /**
+         * Returns stack trace with given `stackTraceId`.
+         * @experimental
+         */
+        post(method: "Debugger.getStackTrace", params?: Debugger.GetStackTraceParameterType, callback?: (err: Error | null, params: Debugger.GetStackTraceReturnType) => void): void;
+        post(method: "Debugger.getStackTrace", callback?: (err: Error | null, params: Debugger.GetStackTraceReturnType) => void): void;
+
+        /**
+         * Stops on the next JavaScript statement.
+         */
+        post(method: "Debugger.pause", callback?: (err: Error | null) => void): void;
+
+        /**
+         * @experimental
+         */
+        post(method: "Debugger.pauseOnAsyncCall", params?: Debugger.PauseOnAsyncCallParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.pauseOnAsyncCall", callback?: (err: Error | null) => 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;
+
+        /**
+         * 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;
+
+        /**
+         * Resumes JavaScript execution.
+         */
+        post(method: "Debugger.resume", callback?: (err: Error | null) => void): void;
+
+        /**
+         * This method is deprecated - use Debugger.stepInto with breakOnAsyncCall and
+Debugger.pauseOnAsyncTask instead. 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;
+
+        /**
+         * Searches for given string in script content.
+         */
+        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;
+
+        /**
+         * 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;
+
+        /**
+         * 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;
+
+        /**
+         * 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
+`locations` property. Further matching script parsing will result in subsequent
+`breakpointResolved` 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;
+
+        /**
+         * 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;
+
+        /**
+         * Defines pause on exceptions state. Can be set to stop on all exceptions, uncaught exceptions or
+no exceptions. Initial pause on exceptions state is `none`.
+         */
+        post(method: "Debugger.setPauseOnExceptions", params?: Debugger.SetPauseOnExceptionsParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setPauseOnExceptions", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Changes return value in top frame. Available only at return break position.
+         * @experimental
+         */
+        post(method: "Debugger.setReturnValue", params?: Debugger.SetReturnValueParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Debugger.setReturnValue", callback?: (err: Error | null) => 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;
+
+        /**
+         * 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;
+
+        /**
+         * 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;
+
+        /**
+         * Steps into the function call.
+         */
+        post(method: "Debugger.stepInto", params?: Debugger.StepIntoParameterType, callback?: (err: Error | null) => void): void;
+        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;
+
+        /**
+         * Steps over the statement.
+         */
+        post(method: "Debugger.stepOver", callback?: (err: Error | null) => 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.collectGarbage", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.disable", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.enable", 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.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;
+
+        post(method: "HeapProfiler.getSamplingProfile", callback?: (err: Error | null, params: HeapProfiler.GetSamplingProfileReturnType) => 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.startTrackingHeapObjects", params?: HeapProfiler.StartTrackingHeapObjectsParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "HeapProfiler.startTrackingHeapObjects", callback?: (err: Error | null) => void): void;
+
+        post(method: "HeapProfiler.stopSampling", callback?: (err: Error | null, params: HeapProfiler.StopSamplingReturnType) => 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: "Profiler.disable", callback?: (err: Error | null) => void): void;
+
+        post(method: "Profiler.enable", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Collect coverage data for the current isolate. The coverage data may be incomplete due to
+garbage collection.
+         */
+        post(method: "Profiler.getBestEffortCoverage", callback?: (err: Error | null, params: Profiler.GetBestEffortCoverageReturnType) => 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;
+
+        /**
+         * 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.
+         */
+        post(method: "Profiler.startPreciseCoverage", params?: Profiler.StartPreciseCoverageParameterType, callback?: (err: Error | null) => void): void;
+        post(method: "Profiler.startPreciseCoverage", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Enable type profile.
+         * @experimental
+         */
+        post(method: "Profiler.startTypeProfile", callback?: (err: Error | null) => void): void;
+
+        post(method: "Profiler.stop", callback?: (err: Error | null, params: Profiler.StopReturnType) => void): void;
+
+        /**
+         * Disable precise code coverage. Disabling releases unnecessary execution count records and allows
+executing optimized code.
+         */
+        post(method: "Profiler.stopPreciseCoverage", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Disable type profile. Disabling releases type profile data collected so far.
+         * @experimental
+         */
+        post(method: "Profiler.stopTypeProfile", callback?: (err: Error | null) => void): void;
+
+        /**
+         * Collect coverage data for the current isolate, and resets execution counters. Precise code
+coverage needs to have started.
+         */
+        post(method: "Profiler.takePreciseCoverage", callback?: (err: Error | null, params: Profiler.TakePreciseCoverageReturnType) => void): void;
+
+        /**
+         * Collect type profile.
+         * @experimental
+         */
+        post(method: "Profiler.takeTypeProfile", callback?: (err: Error | null, params: Profiler.TakeTypeProfileReturnType) => void): void;
         /**
          * Add handler to promise with given promise object id.
          */
@@ -1689,17 +2194,70 @@ declare module "inspector" {
         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.
+         * 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.
+         * 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;
+
+        /**
+         * 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;
+
+        /**
+         * Enables reporting of execution contexts creation by means of `executionContextCreated` 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;
+
+        /**
+         * 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;
+
+        /**
+         * Returns the isolate id.
+         * @experimental
+         */
+        post(method: "Runtime.getIsolateId", callback?: (err: Error | null, params: Runtime.GetIsolateIdReturnType) => void): void;
+
+        /**
+         * Returns the JavaScript heap usage.
+It is the total usage of the corresponding isolate not scoped to a particular Runtime.
+         * @experimental
+         */
+        post(method: "Runtime.getHeapUsage", callback?: (err: Error | null, params: Runtime.GetHeapUsageReturnType) => 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;
 
+        /**
+         * Returns all let, const and class variables from global scope.
+         */
+        post(method: "Runtime.globalLexicalScopeNames", params?: Runtime.GlobalLexicalScopeNamesParameterType, callback?: (err: Error | null, params: Runtime.GlobalLexicalScopeNamesReturnType) => void): void;
+        post(method: "Runtime.globalLexicalScopeNames", callback?: (err: Error | null, params: Runtime.GlobalLexicalScopeNamesReturnType) => void): void;
+
+        post(method: "Runtime.queryObjects", params?: Runtime.QueryObjectsParameterType, callback?: (err: Error | null, params: Runtime.QueryObjectsReturnType) => void): void;
+        post(method: "Runtime.queryObjects", callback?: (err: Error | null, params: Runtime.QueryObjectsReturnType) => void): void;
+
         /**
          * Releases remote object with given id.
          */
@@ -1718,19 +2276,10 @@ declare module "inspector" {
         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.
+         * Runs script with given id in a given 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;
+        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;
 
         /**
          * @experimental
@@ -1739,245 +2288,15 @@ declare module "inspector" {
         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.
+         * Terminate current or next JavaScript execution.
+Will cancel the termination when the outer-most script execution ends.
          * @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;
-
+        post(method: "Runtime.terminateExecution", callback?: (err: Error | null) => void): void;
         /**
-         * Continues execution until specific location is reached.
+         * Returns supported domains.
          */
-        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;
+        post(method: "Schema.getDomains", callback?: (err: Error | null, params: Schema.GetDomainsReturnType) => void): void;
 
         // Events
 
@@ -1989,49 +2308,9 @@ declare module "inspector" {
         addListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
 
         /**
-         * Issued when new execution context is created.
+         * Issued when new console message is added.
          */
-        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;
+        addListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
 
         /**
          * Fired when breakpoint is resolved to an actual script and location.
@@ -2049,52 +2328,97 @@ declare module "inspector" {
         addListener(event: "Debugger.resumed", listener: () => void): this;
 
         /**
-         * Issued when new console message is added.
+         * Fired when virtual machine fails to parse the script.
          */
-        addListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+        addListener(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => void): this;
 
         /**
-         * Sent when new profile recording is started using console.profile() call.
+         * Fired when virtual machine parses script. This event is also fired for all known and uncollected
+scripts upon enabling debugger.
          */
-        addListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+        addListener(event: "Debugger.scriptParsed", listener: (message: InspectorNotification<Debugger.ScriptParsedEventDataType>) => 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;
 
+        /**
+         * 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;
+
+        addListener(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+        addListener(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        addListener(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => void): this;
+
+        /**
+         * Sent when new profile recording is started using console.profile() call.
+         */
+        addListener(event: "Profiler.consoleProfileStarted", listener: (message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>) => void): this;
+
+        /**
+         * Issued when console API was called.
+         */
+        addListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => void): this;
+
+        /**
+         * Issued when unhandled exception was revoked.
+         */
+        addListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
+
+        /**
+         * Issued when exception was thrown and unhandled.
+         */
+        addListener(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => 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 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;
+
         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: "Console.messageAdded", message: InspectorNotification<Console.MessageAddedEventDataType>): 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: "Debugger.scriptFailedToParse", message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>): boolean;
+        emit(event: "Debugger.scriptParsed", message: InspectorNotification<Debugger.ScriptParsedEventDataType>): 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;
+        emit(event: "HeapProfiler.lastSeenObjectId", message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>): boolean;
+        emit(event: "HeapProfiler.reportHeapSnapshotProgress", message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>): boolean;
+        emit(event: "HeapProfiler.resetProfiles"): boolean;
+        emit(event: "Profiler.consoleProfileFinished", message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>): boolean;
+        emit(event: "Profiler.consoleProfileStarted", message: InspectorNotification<Profiler.ConsoleProfileStartedEventDataType>): boolean;
+        emit(event: "Runtime.consoleAPICalled", message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>): boolean;
+        emit(event: "Runtime.exceptionRevoked", message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>): boolean;
+        emit(event: "Runtime.exceptionThrown", message: InspectorNotification<Runtime.ExceptionThrownEventDataType>): 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.inspectRequested", message: InspectorNotification<Runtime.InspectRequestedEventDataType>): boolean;
 
         on(event: string, listener: (...args: any[]) => void): this;
 
@@ -2104,49 +2428,9 @@ declare module "inspector" {
         on(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
 
         /**
-         * Issued when new execution context is created.
+         * Issued when new console message is added.
          */
-        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;
+        on(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
 
         /**
          * Fired when breakpoint is resolved to an actual script and location.
@@ -2164,29 +2448,74 @@ declare module "inspector" {
         on(event: "Debugger.resumed", listener: () => void): this;
 
         /**
-         * Issued when new console message is added.
+         * Fired when virtual machine fails to parse the script.
          */
-        on(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+        on(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => 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;
+
+        on(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => 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;
+
+        /**
+         * 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;
+
+        on(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+        on(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        on(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => 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;
+        /**
+         * Issued when console API was called.
+         */
+        on(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => 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.
+         * Issued when unhandled exception was revoked.
          */
-        on(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+        on(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
 
         /**
-         * If heap objects tracking has been started then backend may send update for one or more fragments
+         * Issued when exception was thrown and unhandled.
          */
-        on(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+        on(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => 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 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;
 
         once(event: string, listener: (...args: any[]) => void): this;
 
@@ -2196,49 +2525,9 @@ declare module "inspector" {
         once(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
 
         /**
-         * Issued when new execution context is created.
+         * Issued when new console message is added.
          */
-        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;
+        once(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
 
         /**
          * Fired when breakpoint is resolved to an actual script and location.
@@ -2256,29 +2545,74 @@ declare module "inspector" {
         once(event: "Debugger.resumed", listener: () => void): this;
 
         /**
-         * Issued when new console message is added.
+         * Fired when virtual machine fails to parse the script.
          */
-        once(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+        once(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => 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;
+
+        once(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => 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;
+
+        /**
+         * 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;
+
+        once(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+        once(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        once(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => 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;
+        /**
+         * Issued when console API was called.
+         */
+        once(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => 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.
+         * Issued when unhandled exception was revoked.
          */
-        once(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+        once(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
 
         /**
-         * If heap objects tracking has been started then backend may send update for one or more fragments
+         * Issued when exception was thrown and unhandled.
          */
-        once(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+        once(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => 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 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;
 
         prependListener(event: string, listener: (...args: any[]) => void): this;
 
@@ -2288,49 +2622,9 @@ declare module "inspector" {
         prependListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
 
         /**
-         * Issued when new execution context is created.
+         * Issued when new console message is added.
          */
-        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;
+        prependListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
 
         /**
          * Fired when breakpoint is resolved to an actual script and location.
@@ -2348,29 +2642,74 @@ declare module "inspector" {
         prependListener(event: "Debugger.resumed", listener: () => void): this;
 
         /**
-         * Issued when new console message is added.
+         * Fired when virtual machine fails to parse the script.
          */
-        prependListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+        prependListener(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => 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;
+
+        prependListener(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => 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;
+
+        /**
+         * 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;
+
+        prependListener(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+        prependListener(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        prependListener(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => 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;
+        /**
+         * Issued when console API was called.
+         */
+        prependListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => 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.
+         * Issued when unhandled exception was revoked.
          */
-        prependListener(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+        prependListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
 
         /**
-         * If heap objects tracking has been started then backend may send update for one or more fragments
+         * Issued when exception was thrown and unhandled.
          */
-        prependListener(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+        prependListener(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => 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 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;
 
         prependOnceListener(event: string, listener: (...args: any[]) => void): this;
 
@@ -2380,49 +2719,9 @@ declare module "inspector" {
         prependOnceListener(event: "inspectorNotification", listener: (message: InspectorNotification<{}>) => void): this;
 
         /**
-         * Issued when new execution context is created.
+         * Issued when new console message is added.
          */
-        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;
+        prependOnceListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
 
         /**
          * Fired when breakpoint is resolved to an actual script and location.
@@ -2440,29 +2739,74 @@ declare module "inspector" {
         prependOnceListener(event: "Debugger.resumed", listener: () => void): this;
 
         /**
-         * Issued when new console message is added.
+         * Fired when virtual machine fails to parse the script.
          */
-        prependOnceListener(event: "Console.messageAdded", listener: (message: InspectorNotification<Console.MessageAddedEventDataType>) => void): this;
+        prependOnceListener(event: "Debugger.scriptFailedToParse", listener: (message: InspectorNotification<Debugger.ScriptFailedToParseEventDataType>) => 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;
+
+        prependOnceListener(event: "HeapProfiler.addHeapSnapshotChunk", listener: (message: InspectorNotification<HeapProfiler.AddHeapSnapshotChunkEventDataType>) => 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;
+
+        /**
+         * 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;
+
+        prependOnceListener(event: "HeapProfiler.reportHeapSnapshotProgress", listener: (message: InspectorNotification<HeapProfiler.ReportHeapSnapshotProgressEventDataType>) => void): this;
+        prependOnceListener(event: "HeapProfiler.resetProfiles", listener: () => void): this;
+        prependOnceListener(event: "Profiler.consoleProfileFinished", listener: (message: InspectorNotification<Profiler.ConsoleProfileFinishedEventDataType>) => 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;
+        /**
+         * Issued when console API was called.
+         */
+        prependOnceListener(event: "Runtime.consoleAPICalled", listener: (message: InspectorNotification<Runtime.ConsoleAPICalledEventDataType>) => 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.
+         * Issued when unhandled exception was revoked.
          */
-        prependOnceListener(event: "HeapProfiler.lastSeenObjectId", listener: (message: InspectorNotification<HeapProfiler.LastSeenObjectIdEventDataType>) => void): this;
+        prependOnceListener(event: "Runtime.exceptionRevoked", listener: (message: InspectorNotification<Runtime.ExceptionRevokedEventDataType>) => void): this;
 
         /**
-         * If heap objects tracking has been started then backend may send update for one or more fragments
+         * Issued when exception was thrown and unhandled.
          */
-        prependOnceListener(event: "HeapProfiler.heapStatsUpdate", listener: (message: InspectorNotification<HeapProfiler.HeapStatsUpdateEventDataType>) => void): this;
+        prependOnceListener(event: "Runtime.exceptionThrown", listener: (message: InspectorNotification<Runtime.ExceptionThrownEventDataType>) => 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 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;
     }
 
     // Top Level API
diff --git a/types/node/node-tests.ts b/types/node/node-tests.ts
index c8f61b948a..542e8111a2 100644
--- a/types/node/node-tests.ts
+++ b/types/node/node-tests.ts
@@ -87,6 +87,8 @@ namespace assert_tests {
         assert.strictEqual(1, 1, "uses === comparator");
 
         assert.throws(() => { throw new Error("a hammer at your face"); }, undefined, "DODGED IT");
+
+        assert.strict.strict.deepEqual([[[1, 2, 3]], 4, 5], [[[1, 2, '3']], 4, 5]);
     }
 }
 
@@ -390,8 +392,12 @@ namespace fs_tests {
     {
         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.copyFile('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_FICLONE, (err) => console.error(err));
+        fs.copyFile('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_FICLONE_FORCE, (err) => console.error(err));
 
         fs.copyFileSync('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL);
+        fs.copyFileSync('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_FICLONE);
+        fs.copyFileSync('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_FICLONE_FORCE);
 
         const cf = util.promisify(fs.copyFile);
         cf('/path/to/src', '/path/to/dest', fs.constants.COPYFILE_EXCL).then(console.log);
@@ -440,6 +446,11 @@ function bufferTests() {
         const arrUint8: Uint8Array = new Uint8Array(2);
         const buf5: Buffer = Buffer.from(arrUint8);
         const buf6: Buffer = Buffer.from(buf1);
+        const sharedArrayBuffer: SharedArrayBuffer = {
+            byteLength: 10,
+            slice: (begin?: number, end?: number) => sharedArrayBuffer
+        };
+        const buf7: Buffer = Buffer.from(sharedArrayBuffer);
     }
 
     // Class Method: Buffer.from(arrayBuffer[, byteOffset[, length]])
@@ -684,9 +695,10 @@ namespace url_tests {
         const searchParams = new url.URLSearchParams('abc=123');
 
         assert.equal(searchParams.toString(), 'abc=123');
-        searchParams.forEach((value: string, name: string): void => {
+        searchParams.forEach((value: string, name: string, me: url.URLSearchParams): void => {
             assert.equal(name, 'abc');
             assert.equal(value, '123');
+            assert.equal(me, searchParams);
         });
 
         assert.equal(searchParams.get('abc'), '123');
@@ -756,7 +768,8 @@ namespace util_tests {
             customInspect: false,
             showProxy: true,
             maxArrayLength: 10,
-            breakLength: 20
+            breakLength: 20,
+            compact: true
         });
         util.inspect(["This is nice"], {
             colors: true,
@@ -764,10 +777,13 @@ namespace util_tests {
             customInspect: false,
             showProxy: true,
             maxArrayLength: null,
-            breakLength: Infinity
+            breakLength: Infinity,
+            compact: false
         });
         assert(typeof util.inspect.custom === 'symbol');
 
+        util.formatWithOptions({ colors: true }, 'See object %O', { foo: 42 });
+
         // util.callbackify
         // tslint:disable-next-line no-unnecessary-class
         class callbackifyTest {
@@ -848,6 +864,7 @@ namespace util_tests {
         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 => { });
+        var cbOptionalError: () => Promise<void> = util.promisify((cb: (err?: Error | null) => void): void => { cb(); });
         assert(typeof util.promisify.custom === 'symbol');
         // util.deprecate
         const foo = () => {};
@@ -944,74 +961,149 @@ const unzipped: Buffer = zlib.unzipSync(compressMe);
 function simplified_stream_ctor_test() {
     new stream.Readable({
         read(size) {
-            size.toFixed();
+            // $ExpectType Readable
+            this;
+            // $ExpectType number
+            size;
         },
-        destroy(error) {
-            error.stack;
+        destroy(error, cb) {
+            // $ExpectType Error
+            error;
+            // $ExpectType (error: Error) => void
+            cb;
         }
     });
 
     new stream.Writable({
         write(chunk, enc, cb) {
-            chunk.slice(1);
-            enc.charAt(0);
-            cb();
+            // $ExpectType Writable
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType (error?: Error) => void
+            cb;
         },
         writev(chunks, cb) {
-            chunks[0].chunk.slice(0);
-            chunks[0].encoding.charAt(0);
-            cb();
+            // $ExpectType Writable
+            this;
+            // $ExpectType { chunk: any; encoding: string; }[]
+            chunks;
+            // $ExpectType (error?: Error) => void
+            cb;
         },
-        destroy(error) {
-            error.stack;
+        destroy(error, cb) {
+            // $ExpectType Writable
+            this;
+            // $ExpectType Error
+            error;
+            // $ExpectType (error: Error) => void
+            cb;
         },
         final(cb) {
-            cb(null);
+            // $ExpectType Writable
+            this;
+            // $ExpectType (error?: Error) => void
+            cb;
         }
     });
 
     new stream.Duplex({
         read(size) {
-            size.toFixed();
+            // $ExpectType Duplex
+            this;
+            // $ExpectType number
+            size;
         },
         write(chunk, enc, cb) {
-            chunk.slice(1);
-            enc.charAt(0);
-            cb();
+            // $ExpectType Duplex
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType (error?: Error) => void
+            cb;
         },
         writev(chunks, cb) {
-            chunks[0].chunk.slice(0);
-            chunks[0].encoding.charAt(0);
-            cb();
+            // $ExpectType Duplex
+            this;
+            // $ExpectType { chunk: any; encoding: string; }[]
+            chunks;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        destroy(error, cb) {
+            // $ExpectType Duplex
+            this;
+            // $ExpectType Error
+            error;
+            // $ExpectType (error: Error) => void
+            cb;
+        },
+        final(cb) {
+            // $ExpectType Duplex
+            this;
+            // $ExpectType (error?: Error) => void
+            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();
+            // $ExpectType Transform
+            this;
+            // $ExpectType number
+            size;
         },
         write(chunk, enc, cb) {
-            chunk.slice(1);
-            enc.charAt(0);
-            cb();
+            // $ExpectType Transform
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType (error?: Error) => void
+            cb;
         },
         writev(chunks, cb) {
-            chunks[0].chunk.slice(0);
-            chunks[0].encoding.charAt(0);
-            cb();
+            // $ExpectType Transform
+            this;
+            // $ExpectType { chunk: any; encoding: string; }[]
+            chunks;
+            // $ExpectType (error?: Error) => void
+            cb;
         },
-        destroy(error) {
-            error.stack;
+        destroy(error, cb) {
+            // $ExpectType Transform
+            this;
+            // $ExpectType Error
+            error;
+            // $ExpectType (error: Error) => void
+            cb;
+        },
+        final(cb) {
+            // $ExpectType Transform
+            this;
+            // $ExpectType (error?: Error) => void
+            cb;
+        },
+        transform(chunk, enc, cb) {
+            // $ExpectType Transform
+            this;
+            // $ExpectType any
+            chunk;
+            // $ExpectType string
+            enc;
+            // $ExpectType TransformCallback
+            cb;
+        },
+        flush(cb) {
+            // $ExpectType TransformCallback
+            cb;
         },
         allowHalfOpen: true,
         readableObjectMode: true,
@@ -1041,6 +1133,12 @@ namespace crypto_tests {
             .update(new DataView(new Buffer('world').buffer)).digest('hex');
     }
 
+    {
+        // crypto_hash_int8array_test
+        var hashResult: string = crypto.createHash('md5')
+            .update(new Int8Array(new Buffer('world').buffer)).digest('hex');
+    }
+
     {
         // crypto_hmac_string_test
         var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
@@ -1058,6 +1156,12 @@ namespace crypto_tests {
             .update(new DataView(new Buffer('world').buffer)).digest('hex');
     }
 
+    {
+        // crypto_hmac_int8array_test
+        var hmacResult: string = crypto.createHmac('md5', 'hello')
+            .update(new Int8Array(new Buffer('world').buffer)).digest('hex');
+    }
+
     {
         let hmac: crypto.Hmac;
         (hmac = crypto.createHmac('md5', 'hello')).end('world', 'utf8', () => {
@@ -1104,8 +1208,7 @@ namespace crypto_tests {
     {
         // 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 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));
@@ -1124,6 +1227,57 @@ namespace crypto_tests {
     }
 
     {
+        const key = 'keykeykeykeykeykeykeykey';
+        const nonce = crypto.randomBytes(12);
+        const aad = Buffer.from('0123456789', 'hex');
+
+        const cipher = crypto.createCipheriv('aes-192-ccm', key, nonce, {
+            authTagLength: 16
+        });
+        const plaintext = 'Hello world';
+        cipher.setAAD(aad, {
+            plaintextLength: Buffer.byteLength(plaintext)
+        });
+        const ciphertext = cipher.update(plaintext, 'utf8');
+        cipher.final();
+        const tag = cipher.getAuthTag();
+
+        const decipher = crypto.createDecipheriv('aes-192-ccm', key, nonce, {
+            authTagLength: 16
+        });
+        decipher.setAuthTag(tag);
+        decipher.setAAD(aad, {
+            plaintextLength: ciphertext.length
+        });
+        const receivedPlaintext: string = decipher.update(ciphertext, null, 'utf8');
+        decipher.final();
+    }
+
+    {
+        const key = 'keykeykeykeykeykeykeykey';
+        const nonce = crypto.randomBytes(12);
+        const aad = Buffer.from('0123456789', 'hex');
+
+        const cipher = crypto.createCipheriv('aes-192-gcm', key, nonce);
+        const plaintext = 'Hello world';
+        cipher.setAAD(aad, {
+            plaintextLength: Buffer.byteLength(plaintext)
+        });
+        const ciphertext = cipher.update(plaintext, 'utf8');
+        cipher.final();
+        const tag = cipher.getAuthTag();
+
+        const decipher = crypto.createDecipheriv('aes-192-gcm', key, nonce);
+        decipher.setAuthTag(tag);
+        decipher.setAAD(aad, {
+            plaintextLength: ciphertext.length
+        });
+        const receivedPlaintext: string = decipher.update(ciphertext, null, 'utf8');
+        decipher.final();
+    }
+
+    {
+        // crypto_timingsafeequal_buffer_test
         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]);
@@ -1133,6 +1287,91 @@ namespace crypto_tests {
     }
 
     {
+        // crypto_timingsafeequal_uint32array_test
+        let arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        let arr2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        let arr3: Uint32Array = Uint32Array.of(5, 4, 3, 2, 1);
+
+        assert(crypto.timingSafeEqual(arr1, arr2));
+        assert(!crypto.timingSafeEqual(arr1, arr3));
+    }
+
+    {
+        // crypto_timingsafeequal_safe_typedarray_variant_test
+        let arr1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        let arr2: Int32Array = Int32Array.of(1, 2, 3, 4, 5);
+        let arr3: Uint32Array = Uint32Array.of(5, 4, 3, 2, 1);
+
+        assert(crypto.timingSafeEqual(arr1, arr2));
+        assert(!crypto.timingSafeEqual(arr1, arr3));
+    }
+
+    {
+        // crypto_timingsafeequal_safe_int8array_variant_test
+        let arr1: Int8Array = Int8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+        let arr2: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+        let arr3: Uint8ClampedArray = Uint8ClampedArray.of(1, 2, 3, 4, 5, ~0, ~1, ~2, ~3, ~4);
+
+        assert(crypto.timingSafeEqual(arr1, arr2)); // binary same
+        assert(!crypto.timingSafeEqual(arr1, arr3)); // binary differ
+    }
+
+    {
+        // crypto_timingsafeequal_safe_arraybufferiew_variant_test
+        /* throws as of v10.4.1 */
+        // let arr1: Uint8Array = Uint8Array.of(1, 0, 2, 0, 3, 0, 4, 0);
+        // let arr2: Uint16Array = Uint16Array.of(1, 2, 3, 4);
+        // let arr3: Uint32Array = Uint8ClampedArray.of(131073, 262147);
+
+        // assert(crypto.timingSafeEqual(arr1, arr2)); // binary same
+        // assert(crypto.timingSafeEqual(arr1, arr3)); // binary same
+    }
+
+    {
+        // crypto_timingsafeequal_unsafe_arraybufferiew_variant_test
+        /* dumps core as of v10.4.1 */
+        // let arr1: Uint8Array = Uint8Array.of(1, 2, 3, 4);
+        // let arr2: Uint16Array = Uint16Array.of(1, 2, 3, 4);
+        // let arr3: Uint32Array = Uint8ClampedArray.of(1, 2, 3, 4);
+
+        // assert(!crypto.timingSafeEqual(arr1, arr2)); // dumps core
+        // assert(!crypto.timingSafeEqual(arr1, arr3)); // dumps core
+    }
+
+    {
+        // crypto_timingsafeequal_dataview_test
+        let dv1B: Uint8Array = Uint8Array.of(1, 2, 3, 4, 5);
+        let dv2B: Int8Array = Int8Array.of(1, 2, 3, 4, 5);
+        let dv3B: Buffer = Buffer.of(5, 4, 3, 2, 1);
+        let dv4B: Uint8ClampedArray = Uint8ClampedArray.of(5, 4, 3, 2, 1);
+        let dv1: DataView = new DataView(dv1B.buffer, dv1B.byteOffset, dv1B.byteLength);
+        let dv2: DataView = new DataView(dv2B.buffer, dv2B.byteOffset, dv2B.byteLength);
+        let dv3: DataView = new DataView(dv3B.buffer, dv3B.byteOffset, dv3B.byteLength);
+        let dv4: DataView = new DataView(dv4B.buffer, dv4B.byteOffset, dv4B.byteLength);
+
+        assert(crypto.timingSafeEqual(dv1, dv2));
+        assert(crypto.timingSafeEqual(dv1, dv1B));
+        assert(crypto.timingSafeEqual(dv2, dv1B));
+        assert(crypto.timingSafeEqual(dv3, dv4));
+
+        assert(!crypto.timingSafeEqual(dv1, dv3));
+        assert(!crypto.timingSafeEqual(dv2, dv3));
+        assert(!crypto.timingSafeEqual(dv1, dv4));
+        // ... I'm not going to write all those tests.
+    }
+
+    {
+        // crypto_timingsafeequal_uint32array_test
+        let ui32_1: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        let ui32_2: Uint32Array = Uint32Array.of(1, 2, 3, 4, 5);
+        let ui32_3: Uint32Array = Uint32Array.of(5, 4, 3, 2, 1);
+
+        assert(crypto.timingSafeEqual(ui32_1, ui32_2));
+        assert(!crypto.timingSafeEqual(ui32_1, ui32_3));
+    }
+
+    {
+        // crypto_randomfill_buffer_test
         let buffer: Buffer = new Buffer(10);
         crypto.randomFillSync(buffer);
         crypto.randomFillSync(buffer, 2);
@@ -1142,14 +1381,56 @@ namespace crypto_tests {
         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_uint8array_test
+        let ui8arr: Uint8Array = new Uint8Array(10);
+        crypto.randomFillSync(ui8arr);
+        crypto.randomFillSync(ui8arr, 2);
+        crypto.randomFillSync(ui8arr, 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 {});
+        crypto.randomFill(ui8arr, (err: Error, buf: Uint8Array) => void {});
+        crypto.randomFill(ui8arr, 2, (err: Error, buf: Uint8Array) => void {});
+        crypto.randomFill(ui8arr, 2, 3, (err: Error, buf: Uint8Array) => void {});
+
+        // crypto_randomfill_int32array_test
+        let i32arr: Int32Array = new Int32Array(10);
+        crypto.randomFillSync(i32arr);
+        crypto.randomFillSync(i32arr, 2);
+        crypto.randomFillSync(i32arr, 2, 3);
+
+        crypto.randomFill(i32arr, (err: Error, buf: Int32Array) => void {});
+        crypto.randomFill(i32arr, 2, (err: Error, buf: Int32Array) => void {});
+        crypto.randomFill(i32arr, 2, 3, (err: Error, buf: Int32Array) => void {});
+    }
+
+    {
+        // scrypt
+        const pwd: string | Buffer | Int32Array | DataView = Buffer.alloc(16);
+        const salt: string | Buffer | Int32Array | DataView = Buffer.alloc(16);
+        crypto.scrypt(pwd, salt, 64, (err: Error | null, derivedKey: Buffer): void => {});
+        const opts: crypto.ScryptOptions = {
+            N: 16384,
+            r: 8,
+            p: 1,
+            maxmem: 32 * 1024 * 1024
+        };
+        crypto.scrypt(pwd, salt, 64, opts, (err: Error | null, derivedKey: Buffer): void => {});
+        crypto.scrypt(pwd, salt, 64, { maxmem: 16 * 1024 * 1024 }, (err: Error | null, derivedKey: Buffer): void => {});
+        let buf: Buffer = crypto.scryptSync(pwd, salt, 64);
+        buf = crypto.scryptSync(pwd, salt, 64, opts);
+        buf = crypto.scryptSync(pwd, salt, 64, { N: 1024 });
+    }
+
+    {
+        let key: string | Buffer = Buffer.from("buf");
+        let curve = "secp256k1";
+        let ret: string | Buffer = crypto.ECDH.convertKey(key, curve);
+        key = "0xfff";
+        ret = crypto.ECDH.convertKey(key, curve);
+        ret = crypto.ECDH.convertKey(key, curve, "hex");
+        ret = crypto.ECDH.convertKey(key, curve, "hex", "hex");
+        ret = crypto.ECDH.convertKey(key, curve, "hex", "hex", "uncompressed");
+        ret = crypto.ECDH.convertKey(key, curve, "hex", "hex", "compressed");
+        ret = crypto.ECDH.convertKey(key, curve, "hex", "hex", "hybrid");
     }
 }
 
@@ -1467,7 +1748,8 @@ namespace http_tests {
             keepAlive: true,
             keepAliveMsecs: 10000,
             maxSockets: Infinity,
-            maxFreeSockets: 256
+            maxFreeSockets: 256,
+            timeout: 15000
         });
 
         var agent: http.Agent = http.globalAgent;
@@ -1478,7 +1760,25 @@ namespace http_tests {
     }
 
     {
+        http.get('http://www.example.com/xyz');
         http.request('http://www.example.com/xyz');
+
+        http.get('http://www.example.com/xyz', (res: http.IncomingMessage): void => {});
+        http.request('http://www.example.com/xyz', (res: http.IncomingMessage): void => {});
+
+        http.get(new url.URL('http://www.example.com/xyz'));
+        http.request(new url.URL('http://www.example.com/xyz'));
+
+        http.get(new url.URL('http://www.example.com/xyz'), (res: http.IncomingMessage): void => {});
+        http.request(new url.URL('http://www.example.com/xyz'), (res: http.IncomingMessage): void => {});
+
+        const opts: http.RequestOptions = {
+            path: '"/some/path'
+        };
+        http.get(new url.URL('http://www.example.com'), opts);
+        http.request(new url.URL('http://www.example.com'), opts);
+        http.get(new url.URL('http://www.example.com/xyz'), opts, (res: http.IncomingMessage): void => {});
+        http.request(new url.URL('http://www.example.com/xyz'), opts, (res: http.IncomingMessage): void => {});
     }
 
     {
@@ -1524,7 +1824,8 @@ namespace https_tests {
         keepAliveMsecs: 10000,
         maxSockets: Infinity,
         maxFreeSockets: 256,
-        maxCachedSessions: 100
+        maxCachedSessions: 100,
+        timeout: 15000
     });
 
     var agent: https.Agent = https.globalAgent;
@@ -1539,8 +1840,26 @@ namespace https_tests {
         agent: undefined
     });
 
+    https.get('http://www.example.com/xyz');
     https.request('http://www.example.com/xyz');
 
+    https.get('http://www.example.com/xyz', (res: http.IncomingMessage): void => {});
+    https.request('http://www.example.com/xyz', (res: http.IncomingMessage): void => {});
+
+    https.get(new url.URL('http://www.example.com/xyz'));
+    https.request(new url.URL('http://www.example.com/xyz'));
+
+    https.get(new url.URL('http://www.example.com/xyz'), (res: http.IncomingMessage): void => {});
+    https.request(new url.URL('http://www.example.com/xyz'), (res: http.IncomingMessage): void => {});
+
+    const opts: https.RequestOptions = {
+        path: '/some/path'
+    };
+    https.get(new url.URL('http://www.example.com'), opts);
+    https.request(new url.URL('http://www.example.com'), opts);
+    https.get(new url.URL('http://www.example.com/xyz'), opts, (res: http.IncomingMessage): void => {});
+    https.request(new url.URL('http://www.example.com/xyz'), opts, (res: http.IncomingMessage): void => {});
+
     https.globalAgent.options.ca = [];
 
     {
@@ -2098,6 +2417,7 @@ namespace child_process_tests {
         childProcess.exec("echo test", { windowsHide: true });
         childProcess.spawn("echo", ["test"], { windowsHide: true });
         childProcess.spawn("echo", ["test"], { windowsHide: true, argv0: "echo-test" });
+        childProcess.spawn("echo", ["test"], { stdio: [0xdeadbeef, "inherit", undefined, "pipe"] });
         childProcess.spawnSync("echo test");
         childProcess.spawnSync("echo test", {windowsVerbatimArguments: false});
         childProcess.spawnSync("echo test", {windowsVerbatimArguments: false, argv0: "echo-test"});
@@ -3129,6 +3449,9 @@ namespace dns_tests {
     dns.resolve("nodejs.org", "AAAA", (err, addresses) => {
         const _addresses: string[] = addresses;
     });
+    dns.resolve("nodejs.org", "ANY", (err, addresses) => {
+        const _addresses: dns.AnyRecord[] = addresses;
+    });
     dns.resolve("nodejs.org", "MX", (err, addresses) => {
         const _addresses: dns.MxRecord[] = addresses;
     });
@@ -3158,6 +3481,14 @@ namespace dns_tests {
             const _addresses: string[] | dns.RecordWithTtl[] = addresses;
         });
     }
+    {
+        const resolver = new dns.Resolver();
+        resolver.setServers(["4.4.4.4"]);
+        resolver.resolve("nodejs.org", (err, addresses) => {
+            const _addresses: string[] = addresses;
+        });
+        resolver.cancel();
+    }
 }
 
 /*****************************************************************************
@@ -3472,6 +3803,7 @@ namespace http2_tests {
         let pendingSettingsAck: boolean = http2Session.pendingSettingsAck;
         let settings: http2.Settings = http2Session.localSettings;
         let closed: boolean = http2Session.closed;
+        let connecting: boolean = http2Session.connecting;
         settings = http2Session.remoteSettings;
 
         http2Session.ref();
@@ -3518,6 +3850,10 @@ namespace http2_tests {
         });
 
         http2Session.settings(settings);
+
+      http2Session.ping((err: Error | null, duration: number, payload: Buffer) => {});
+      http2Session.ping(Buffer.from(''), (err: Error | null, duration: number, payload: Buffer) => {});
+      http2Session.ping(new DataView(new Int8Array(1).buffer), (err: Error | null, duration: number, payload: Buffer) => {});
     }
 
     // Http2Stream
diff --git a/types/node/v0/index.d.ts b/types/node/v0/index.d.ts
index b88dd54a0c..3bc1b3ed5d 100644
--- a/types/node/v0/index.d.ts
+++ b/types/node/v0/index.d.ts
@@ -573,41 +573,42 @@ declare module "http" {
      */
     export interface 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 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;
+        maxFreeSockets: number;
+        maxSockets: number;
+        sockets: any;
+        requests: any;
 
-		constructor(opts?: AgentOptions);
+        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;
-	}
+        /**
+         * 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[];
 
@@ -1857,7 +1858,7 @@ declare module "util" {
 }
 
 declare module "assert" {
-    function internal (value: any, message?: string): void;
+    function internal(value: any, message?: string): void;
     namespace internal {
         export class AssertionError implements Error {
             name: string;
@@ -1867,8 +1868,10 @@ declare module "assert" {
             operator: string;
             generatedMessage: boolean;
 
-            constructor(options?: {message?: string; actual?: any; expected?: any;
-                                  operator?: string; stackStartFunction?: Function});
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFn?: Function
+            });
         }
 
         export function fail(actual?: any, expected?: any, message?: string, operator?: string): never;
@@ -1876,22 +1879,14 @@ declare module "assert" {
         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 notDeepEqual(actual: 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 var throws: {
-            (block: Function, message?: string): void;
-            (block: Function, error: Function, message?: string): void;
-            (block: Function, error: RegExp, message?: string): void;
-            (block: Function, error: (err: any) => boolean, message?: string): void;
-        };
 
-        export var doesNotThrow: {
-            (block: Function, message?: string): void;
-            (block: Function, error: Function, message?: string): void;
-            (block: Function, error: RegExp, message?: string): void;
-            (block: Function, error: (err: any) => boolean, message?: string): void;
-        };
+        export function throws(block: Function, message?: string): void;
+        export function throws(block: Function, error: RegExp | Function, message?: string): void;
+        export function doesNotThrow(block: Function, message?: string): void;
+        export function doesNotThrow(block: Function, error: RegExp | Function, message?: string): void;
 
         export function ifError(value: any): void;
     }
diff --git a/types/node/v0/node-tests.ts b/types/node/v0/node-tests.ts
index d8e0a40699..37ef4f9e81 100644
--- a/types/node/v0/node-tests.ts
+++ b/types/node/v0/node-tests.ts
@@ -179,37 +179,37 @@ function stream_readable_pipe_test() {
 var hmacResult: string = crypto.createHmac('md5', 'hello').update('world').digest('hex');
 
 function crypto_cipher_decipher_string_test() {
-	var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-	var clearText:string = "This is the clear text.";
-	var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-	var cipherText:string = cipher.update(clearText, "utf8", "hex");
-	cipherText += cipher.final("hex");
+    var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+    var clearText:string = "This is the clear text.";
+    var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+    var cipherText:string = cipher.update(clearText, "utf8", "hex");
+    cipherText += cipher.final("hex");
 
-	var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-	var clearText2:string = decipher.update(cipherText, "hex", "utf8");
-	clearText2 += decipher.final("utf8");
+    var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+    var clearText2:string = decipher.update(cipherText, "hex", "utf8");
+    clearText2 += decipher.final("utf8");
 
-	assert.equal(clearText2, clearText);
+    assert.equal(clearText2, clearText);
 }
 
 function crypto_cipher_decipher_buffer_test() {
-	var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
-	var clearText:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
-	var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
-	var cipherBuffers:Buffer[] = [];
-	cipherBuffers.push(cipher.update(clearText));
-	cipherBuffers.push(cipher.final());
+    var key:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 1, 2, 3, 4, 5, 6, 7]);
+    var clearText:Buffer = new Buffer([1, 2, 3, 4, 5, 6, 7, 8, 9, 8, 7, 6, 5, 4]);
+    var cipher:crypto.Cipher = crypto.createCipher("aes-128-ecb", key);
+    var cipherBuffers:Buffer[] = [];
+    cipherBuffers.push(cipher.update(clearText));
+    cipherBuffers.push(cipher.final());
 
-	var cipherText:Buffer = Buffer.concat(cipherBuffers);
+    var cipherText:Buffer = Buffer.concat(cipherBuffers);
 
-	var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
-	var decipherBuffers:Buffer[] = [];
-	decipherBuffers.push(decipher.update(cipherText));
-	decipherBuffers.push(decipher.final());
+    var decipher:crypto.Decipher = crypto.createDecipher("aes-128-ecb", key);
+    var decipherBuffers:Buffer[] = [];
+    decipherBuffers.push(decipher.update(cipherText));
+    decipherBuffers.push(decipher.final());
 
-	var clearText2:Buffer = Buffer.concat(decipherBuffers);
+    var clearText2:Buffer = Buffer.concat(decipherBuffers);
 
-	assert.deepEqual(clearText2, clearText);
+    assert.deepEqual(clearText2, clearText);
 }
 
 ////////////////////////////////////////////////////
@@ -242,14 +242,14 @@ namespace http_tests {
     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 = new http.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256
+    });
 
-	var agent: http.Agent = http.globalAgent;
+    var agent: http.Agent = http.globalAgent;
 
     http.request('http://www.example.com/xyz');
 }
diff --git a/types/node/v4/index.d.ts b/types/node/v4/index.d.ts
index 3b5a8e4594..6ebd6b2839 100644
--- a/types/node/v4/index.d.ts
+++ b/types/node/v4/index.d.ts
@@ -707,6 +707,7 @@ declare module "http" {
         'transfer-encoding'?: string;
         'tk'?: string;
         'upgrade'?: string;
+        'user-agent'?: string;
         'vary'?: string;
         'via'?: string;
         'warning'?: string;
@@ -854,6 +855,7 @@ declare module "http" {
     }
 
     export class Agent {
+        maxFreeSockets: number;
         maxSockets: number;
         sockets: any;
         requests: any;
@@ -2439,7 +2441,7 @@ declare module "util" {
 }
 
 declare module "assert" {
-    function internal (value: any, message?: string): void;
+    function internal(value: any, message?: string): void;
     namespace internal {
         export class AssertionError implements Error {
             name: string;
@@ -2449,8 +2451,10 @@ declare module "assert" {
             operator: string;
             generatedMessage: boolean;
 
-            constructor(options?: {message?: string; actual?: any; expected?: any;
-                                  operator?: string; stackStartFunction?: Function});
+            constructor(options?: {
+                message?: string; actual?: any; expected?: any;
+                operator?: string; stackStartFn?: Function
+            });
         }
 
         export function fail(actual: any, expected: any, message?: string, operator?: string): never;
@@ -2458,21 +2462,16 @@ declare module "assert" {
         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 notDeepEqual(actual: 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 throws(block: Function, error: RegExp | Function, 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 doesNotThrow(block: Function, error: RegExp | Function, message?: string): void;
 
         export function ifError(value: any): void;
     }
diff --git a/types/node/v6/index.d.ts b/types/node/v6/index.d.ts
index ded12da186..8a9ee77904 100644
--- a/types/node/v6/index.d.ts
+++ b/types/node/v6/index.d.ts
@@ -776,6 +776,7 @@ declare module "http" {
         'transfer-encoding'?: string;
         'tk'?: string;
         'upgrade'?: string;
+        'user-agent'?: string;
         'vary'?: string;
         'via'?: string;
         'warning'?: string;
@@ -929,6 +930,7 @@ declare module "http" {
     }
 
     export class Agent {
+        maxFreeSockets: number;
         maxSockets: number;
         sockets: any;
         requests: any;
@@ -2001,7 +2003,7 @@ declare module "url" {
         append(name: string, value: string): void;
         delete(name: string): void;
         entries(): Iterator<string[]>;
-        forEach(callback: (value: string, name: string) => void): void;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
         get(name: string): string | null;
         getAll(name: string): string[];
         has(name: string): boolean;
@@ -3943,30 +3945,26 @@ declare module "assert" {
 
             constructor(options?: {
                 message?: string; actual?: any; expected?: any;
-                operator?: string; stackStartFunction?: Function
+                operator?: string; stackStartFn?: Function
             });
         }
 
-        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
+        export function fail(message?: string): never;
+        export function fail(actual: any, expected: any, message?: string, operator?: string, stackStartFn?: Function): never;
         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 notDeepEqual(actual: 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 throws(block: Function, error: RegExp | Function, 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 doesNotThrow(block: Function, error: RegExp | Function, message?: string): void;
 
         export function ifError(value: any): void;
     }
diff --git a/types/node/v6/node-tests.ts b/types/node/v6/node-tests.ts
index 6ab45137c4..5ca32d660c 100644
--- a/types/node/v6/node-tests.ts
+++ b/types/node/v6/node-tests.ts
@@ -538,9 +538,10 @@ namespace url_tests {
         const searchParams = new url.URLSearchParams('abc=123');
 
         assert.equal(searchParams.toString(), 'abc=123');
-        searchParams.forEach((value: string, name: string): void => {
+        searchParams.forEach((value: string, name: string, me: url.URLSearchParams): void => {
             assert.equal(name, 'abc');
             assert.equal(value, '123');
+            assert.equal(me, searchParams);
         });
 
         assert.equal(searchParams.get('abc'), '123');
@@ -785,13 +786,13 @@ namespace crypto_tests {
         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");
+    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");
+    clearText2 += decipher.final("utf8");
 
-	assert.equal(clearText2, clearText);
+    assert.equal(clearText2, clearText);
     }
 
     {
@@ -800,19 +801,19 @@ namespace crypto_tests {
         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());
+    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());
+    decipherBuffers.push(decipher.update(cipherText));
+    decipherBuffers.push(decipher.final());
 
         let clearText2: Buffer = Buffer.concat(decipherBuffers);
 
-	assert.deepEqual(clearText2, clearText);
+    assert.deepEqual(clearText2, clearText);
     }
 
     {
@@ -838,8 +839,8 @@ namespace tls_tests {
     var blah = ctx.context;
 
     var connOpts: tls.ConnectionOptions = {
-	host: "127.0.0.1",
-	port: 55
+    host: "127.0.0.1",
+    port: 55
     };
     var tlsSocket = tls.connect(connOpts);
     }
@@ -1042,14 +1043,14 @@ namespace http_tests {
     }
 
     {
-	var agent: http.Agent = new http.Agent({
-		keepAlive: true,
-		keepAliveMsecs: 10000,
-		maxSockets: Infinity,
-		maxFreeSockets: 256
-	});
+    var agent: http.Agent = new http.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256
+    });
 
-	var agent: http.Agent = http.globalAgent;
+    var agent: http.Agent = http.globalAgent;
 
         http.request({ agent: false });
         http.request({ agent: agent });
diff --git a/types/node/v7/index.d.ts b/types/node/v7/index.d.ts
index fd9b32f673..11dc0e4f5a 100644
--- a/types/node/v7/index.d.ts
+++ b/types/node/v7/index.d.ts
@@ -773,6 +773,7 @@ declare module "http" {
         'transfer-encoding'?: string;
         'tk'?: string;
         'upgrade'?: string;
+        'user-agent'?: string;
         'vary'?: string;
         'via'?: string;
         'warning'?: string;
@@ -926,6 +927,7 @@ declare module "http" {
     }
 
     export class Agent {
+        maxFreeSockets: number;
         maxSockets: number;
         sockets: any;
         requests: any;
@@ -2044,7 +2046,7 @@ declare module "url" {
         append(name: string, value: string): void;
         delete(name: string): void;
         entries(): Iterator<string[]>;
-        forEach(callback: (value: string, name: string) => void): void;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
         get(name: string): string | null;
         getAll(name: string): string[];
         has(name: string): boolean;
@@ -3987,30 +3989,26 @@ declare module "assert" {
 
             constructor(options?: {
                 message?: string; actual?: any; expected?: any;
-                operator?: string; stackStartFunction?: Function
+                operator?: string; stackStartFn?: Function
             });
         }
 
-        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
+        export function fail(message?: string): never;
+        export function fail(actual: any, expected: any, message?: string, operator?: string, stackStartFn?: Function): never;
         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 notDeepEqual(actual: 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 throws(block: Function, error: RegExp | Function, 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 doesNotThrow(block: Function, error: RegExp | Function, message?: string): void;
 
         export function ifError(value: any): void;
     }
diff --git a/types/node/v7/node-tests.ts b/types/node/v7/node-tests.ts
index a74a438665..764dc6e8d0 100644
--- a/types/node/v7/node-tests.ts
+++ b/types/node/v7/node-tests.ts
@@ -520,9 +520,10 @@ namespace url_tests {
         const searchParams = new url.URLSearchParams('abc=123');
 
         assert.equal(searchParams.toString(), 'abc=123');
-        searchParams.forEach((value: string, name: string): void => {
+        searchParams.forEach((value: string, name: string, me: url.URLSearchParams): void => {
             assert.equal(name, 'abc');
             assert.equal(value, '123');
+            assert.equal(me, searchParams);
         });
 
         assert.equal(searchParams.get('abc'), '123');
@@ -1024,14 +1025,14 @@ namespace http_tests {
     }
 
     {
-	var agent: http.Agent = new http.Agent({
-		keepAlive: true,
-		keepAliveMsecs: 10000,
-		maxSockets: Infinity,
-		maxFreeSockets: 256
-	});
+    var agent: http.Agent = new http.Agent({
+        keepAlive: true,
+        keepAliveMsecs: 10000,
+        maxSockets: Infinity,
+        maxFreeSockets: 256
+    });
 
-	var agent: http.Agent = http.globalAgent;
+    var agent: http.Agent = http.globalAgent;
 
         http.request({ agent: false });
         http.request({ agent: agent });
@@ -1055,7 +1056,7 @@ namespace http_tests {
         request.abort();
     }
 
-	// http request options
+    // http request options
     {
         const requestOpts: http.RequestOptions = {
             timeout: 30000
diff --git a/types/node/v8/index.d.ts b/types/node/v8/index.d.ts
index 3e153570d6..4cf8dc2a78 100644
--- a/types/node/v8/index.d.ts
+++ b/types/node/v8/index.d.ts
@@ -532,7 +532,7 @@ declare namespace NodeJS {
         columns?: number;
         rows?: number;
         _write(chunk: any, encoding: string, callback: Function): void;
-        _destroy(err: Error, callback: Function): void;
+        _destroy(err: Error | undefined, callback: Function): void;
         _final(callback: Function): void;
         setDefaultEncoding(encoding: string): this;
         cork(): void;
@@ -544,7 +544,7 @@ declare namespace NodeJS {
         isRaw?: boolean;
         setRawMode?(mode: boolean): void;
         _read(size: number): void;
-        _destroy(err: Error, callback: Function): void;
+        _destroy(err: Error | undefined, callback: Function): void;
         push(chunk: any, encoding?: string): boolean;
         destroy(error?: Error): void;
     }
@@ -977,6 +977,7 @@ declare module "http" {
         'transfer-encoding'?: string;
         'tk'?: string;
         'upgrade'?: string;
+        'user-agent'?: string;
         'vary'?: string;
         'via'?: string;
         'warning'?: string;
@@ -1139,6 +1140,7 @@ declare module "http" {
     }
 
     export class Agent {
+        maxFreeSockets: number;
         maxSockets: number;
         sockets: any;
         requests: any;
@@ -1587,6 +1589,7 @@ declare module "os" {
         netmask: string;
         mac: string;
         internal: boolean;
+        cidr: string | null;
     }
 
     export interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
@@ -2377,7 +2380,7 @@ declare module "url" {
         append(name: string, value: string): void;
         delete(name: string): void;
         entries(): IterableIterator<[string, string]>;
-        forEach(callback: (value: string, name: string) => void): void;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
         get(name: string): string | null;
         getAll(name: string): string[];
         has(name: string): boolean;
@@ -2464,11 +2467,23 @@ declare module "dns" {
         ttl: number;
     }
 
+    export interface AnyARecord extends RecordWithTtl {
+        type: "A";
+    }
+
+    export interface AnyAaaaRecord extends RecordWithTtl {
+        type: "AAAA";
+    }
+
     export interface MxRecord {
         priority: number;
         exchange: string;
     }
 
+    export interface AnyMxRecord extends MxRecord {
+        type: "MX";
+    }
+
     export interface NaptrRecord {
         flags: string;
         service: string;
@@ -2478,6 +2493,10 @@ declare module "dns" {
         preference: number;
     }
 
+    export interface AnyNaptrRecord extends NaptrRecord {
+        type: "NAPTR";
+    }
+
     export interface SoaRecord {
         nsname: string;
         hostmaster: string;
@@ -2488,6 +2507,10 @@ declare module "dns" {
         minttl: number;
     }
 
+    export interface AnySoaRecord extends SoaRecord {
+        type: "SOA";
+    }
+
     export interface SrvRecord {
         priority: number;
         weight: number;
@@ -2495,9 +2518,45 @@ declare module "dns" {
         name: string;
     }
 
+    export interface AnySrvRecord extends SrvRecord {
+        type: "SRV";
+    }
+
+    export interface AnyTxtRecord {
+        type: "TXT";
+        entries: string[];
+    }
+
+    export interface AnyNsRecord {
+        type: "NS";
+        value: string;
+    }
+
+    export interface AnyPtrRecord {
+        type: "PTR";
+        value: string;
+    }
+
+    export interface AnyCnameRecord {
+        type: "CNAME";
+        value: string;
+    }
+
+    export type AnyRecord = AnyARecord |
+        AnyAaaaRecord |
+        AnyCnameRecord |
+        AnyMxRecord |
+        AnyNaptrRecord |
+        AnyNsRecord |
+        AnyPtrRecord |
+        AnySoaRecord |
+        AnySrvRecord |
+        AnyTxtRecord;
+
     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: "ANY", callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => 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;
@@ -2506,17 +2565,18 @@ declare module "dns" {
     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;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]) => 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: "ANY"): Promise<AnyRecord[]>;
         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 __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
     }
 
     export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
@@ -2542,16 +2602,53 @@ declare module "dns" {
     }
 
     export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolveCname {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export namespace resolveMx {
+        export function __promisify__(hostname: string): Promise<MxRecord[]>;
+    }
+
     export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export namespace resolveNaptr {
+        export function __promisify__(hostname: string): Promise<NaptrRecord[]>;
+    }
+
     export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolveNs {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolvePtr {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export namespace resolveSoa {
+        export function __promisify__(hostname: string): Promise<SoaRecord>;
+    }
+
     export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export namespace resolveSrv {
+        export function __promisify__(hostname: string): Promise<SrvRecord[]>;
+    }
+
     export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export namespace resolveTxt {
+        export function __promisify__(hostname: string): Promise<string[][]>;
+    }
+
+    export function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    export namespace resolveAny {
+        export function __promisify__(hostname: string): Promise<AnyRecord[]>;
+    }
 
     export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
     export function setServers(servers: string[]): void;
+    export function getServers(): string[];
 
     // Error codes
     export var NODATA: string;
@@ -2578,6 +2675,25 @@ declare module "dns" {
     export var LOADIPHLPAPI: string;
     export var ADDRGETNETWORKPARAMS: string;
     export var CANCELLED: string;
+
+    export class Resolver {
+        getServers: typeof getServers;
+        setServers: typeof setServers;
+        resolve: typeof resolve;
+        resolve4: typeof resolve4;
+        resolve6: typeof resolve6;
+        resolveAny: typeof resolveAny;
+        resolveCname: typeof resolveCname;
+        resolveMx: typeof resolveMx;
+        resolveNaptr: typeof resolveNaptr;
+        resolveNs: typeof resolveNs;
+        resolvePtr: typeof resolvePtr;
+        resolveSoa: typeof resolveSoa;
+        resolveSrv: typeof resolveSrv;
+        resolveTxt: typeof resolveTxt;
+        reverse: typeof reverse;
+        cancel(): void;
+    }
 }
 
 declare module "net" {
@@ -5298,7 +5414,7 @@ declare module "stream" {
             encoding?: string;
             objectMode?: boolean;
             read?: (this: Readable, size?: number) => any;
-            destroy?: (error?: Error) => any;
+            destroy?: (error: Error | null, callback: (error?: Error) => void) => void;
         }
 
         export class Readable extends Stream implements NodeJS.ReadableStream {
@@ -5315,7 +5431,7 @@ declare module "stream" {
             unshift(chunk: any): void;
             wrap(oldStream: NodeJS.ReadableStream): this;
             push(chunk: any, encoding?: string): boolean;
-            _destroy(err: Error, callback: Function): void;
+            _destroy(error: Error | null, callback: (error?: Error) => void): void;
             destroy(error?: Error): void;
 
             /**
@@ -5383,7 +5499,7 @@ declare module "stream" {
             objectMode?: boolean;
             write?: (chunk: any, encoding: string, callback: Function) => any;
             writev?: (chunks: Array<{ chunk: any, encoding: string }>, callback: Function) => any;
-            destroy?: (error?: Error) => any;
+            destroy?: (error: Error | null, callback: (error?: Error) => void) => void;
             final?: (callback: (error?: Error) => void) => void;
         }
 
@@ -5393,7 +5509,7 @@ declare module "stream" {
             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;
+            _destroy(error: Error | null, callback: (error?: Error) => void): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
@@ -5485,7 +5601,7 @@ declare module "stream" {
             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;
+            _destroy(error: Error | null, callback: (error?: Error) => void): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
@@ -5574,17 +5690,17 @@ declare module "util" {
 
     export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
     export function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
-    export function promisify(fn: (callback: (err: Error | null) => void) => void): () => Promise<void>;
+    export function promisify(fn: (callback: (err?: Error | null) => void) => void): () => Promise<void>;
     export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err?: Error | null) => void) => void): (arg1: T1) => Promise<void>;
     export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err?: Error | null) => 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;
@@ -5633,34 +5749,30 @@ declare module "assert" {
             expected: any;
             operator: string;
             generatedMessage: boolean;
+            code: 'ERR_ASSERTION';
 
             constructor(options?: {
                 message?: string; actual?: any; expected?: any;
-                operator?: string; stackStartFunction?: Function
+                operator?: string; stackStartFn?: Function
             });
         }
 
-        export function fail(message: string): never;
-        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
+        export function fail(message?: string): never;
+        export function fail(actual: any, expected: any, message?: string, operator?: string, stackStartFn?: Function): never;
         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 notDeepEqual(actual: 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 throws(block: Function, error: RegExp | Function, 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 doesNotThrow(block: Function, error: RegExp | Function, message?: string): void;
 
         export function ifError(value: any): void;
     }
diff --git a/types/node/v8/inspector.d.ts b/types/node/v8/inspector.d.ts
index 955239b486..19bba5af01 100644
--- a/types/node/v8/inspector.d.ts
+++ b/types/node/v8/inspector.d.ts
@@ -244,7 +244,7 @@ declare module "inspector" {
          */
         export interface CallArgument {
             /**
-             * Primitive value.
+             * Primitive value or serializable javascript object.
              */
             value?: any;
             /**
@@ -416,7 +416,7 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should <code>await</code> for resulting value and return once awaited promise is resolved.
              */
             awaitPromise?: boolean;
         }
@@ -468,7 +468,7 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should <code>await</code> for resulting value and return once awaited promise is resolved.
              */
             awaitPromise?: boolean;
         }
@@ -561,11 +561,18 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should <code>await</code> for resulting value and return once awaited promise is resolved.
              */
             awaitPromise?: boolean;
         }
 
+        export interface QueryObjectsParameterType {
+            /**
+             * Identifier of the prototype to return objects for.
+             */
+            prototypeObjectId: Runtime.RemoteObjectId;
+        }
+
         export interface EvaluateReturnType {
             /**
              * Evaluation result.
@@ -636,6 +643,13 @@ declare module "inspector" {
             exceptionDetails?: Runtime.ExceptionDetails;
         }
 
+        export interface QueryObjectsReturnType {
+            /**
+             * Array with objects.
+             */
+            objects: Runtime.RemoteObject;
+        }
+
         export interface ExecutionContextCreatedEventDataType {
             /**
              * A newly created execution context.
@@ -1476,6 +1490,10 @@ declare module "inspector" {
              * Collect accurate call counts beyond simple 'covered' or 'not covered'.
              */
             callCount?: boolean;
+            /**
+             * Collect block-based coverage.
+             */
+            detailed?: boolean;
         }
 
         export interface StopReturnType {
@@ -1749,6 +1767,12 @@ declare module "inspector" {
          */
         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;
+
+        /**
+         * @experimental
+         */
+        post(method: "Runtime.queryObjects", params?: Runtime.QueryObjectsParameterType, callback?: (err: Error | null, params: Runtime.QueryObjectsReturnType) => void): void;
+        post(method: "Runtime.queryObjects", callback?: (err: Error | null, params: Runtime.QueryObjectsReturnType) => 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.
          */
diff --git a/types/node/v8/node-tests.ts b/types/node/v8/node-tests.ts
index dee74cc036..e1d14b9089 100644
--- a/types/node/v8/node-tests.ts
+++ b/types/node/v8/node-tests.ts
@@ -654,9 +654,10 @@ namespace url_tests {
         const searchParams = new url.URLSearchParams('abc=123');
 
         assert.equal(searchParams.toString(), 'abc=123');
-        searchParams.forEach((value: string, name: string): void => {
+        searchParams.forEach((value: string, name: string, me: url.URLSearchParams): void => {
             assert.equal(name, 'abc');
             assert.equal(value, '123');
+            assert.equal(me, searchParams);
         });
 
         assert.equal(searchParams.get('abc'), '123');
@@ -818,6 +819,8 @@ namespace util_tests {
         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 => { });
+        // The following test requires typescript >= 2.4, but definitions currently tested with typescript@2.1
+        // var cbOptionalError: () => Promise<void> = util.promisify((cb: (err?: Error | null) => void): void => { cb(); });
         assert(typeof util.promisify.custom === 'symbol');
         // util.deprecate
         const foo = () => {};
@@ -913,8 +916,9 @@ function simplified_stream_ctor_test() {
         read(size) {
             size.toFixed();
         },
-        destroy(error) {
+        destroy(error, cb) {
             error.stack;
+            cb(error);
         }
     });
 
@@ -929,8 +933,9 @@ function simplified_stream_ctor_test() {
             chunks[0].encoding.charAt(0);
             cb();
         },
-        destroy(error) {
+        destroy(error, cb) {
             error.stack;
+            cb(error);
         },
         final(cb) {
             cb(null);
@@ -951,6 +956,10 @@ function simplified_stream_ctor_test() {
             chunks[0].encoding.charAt(0);
             cb();
         },
+        destroy(error, cb) {
+            error.stack;
+            cb(error);
+        },
         readableObjectMode: true,
         writableObjectMode: true
     });
@@ -977,8 +986,9 @@ function simplified_stream_ctor_test() {
             chunks[0].encoding.charAt(0);
             cb();
         },
-        destroy(error) {
+        destroy(error, cb) {
             error.stack;
+            cb(error);
         },
         allowHalfOpen: true,
         readableObjectMode: true,
@@ -3119,6 +3129,14 @@ namespace dns_tests {
             const _addresses: string[] | dns.RecordWithTtl[] = addresses;
         });
     }
+    {
+        const resolver = new dns.Resolver();
+        resolver.setServers(["4.4.4.4"]);
+        resolver.resolve("nodejs.org", (err, addresses) => {
+            const _addresses: string[] = addresses;
+        });
+        resolver.cancel();
+    }
 }
 
 /*****************************************************************************
diff --git a/types/node/v9/index.d.ts b/types/node/v9/index.d.ts
index d11f93e382..e1b44f5602 100644
--- a/types/node/v9/index.d.ts
+++ b/types/node/v9/index.d.ts
@@ -25,6 +25,7 @@
 //                 Alexander T. <https://github.com/a-tarasyuk>
 //                 Lishude <https://github.com/islishude>
 //                 Andrew Makarov <https://github.com/r3nya>
+//                 Eugene Y. Q. Shen <https://github.com/eyqs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** inspector module types */
@@ -674,7 +675,7 @@ declare namespace NodeJS {
         columns?: number;
         rows?: number;
         _write(chunk: any, encoding: string, callback: Function): void;
-        _destroy(err: Error, callback: Function): void;
+        _destroy(err: Error | undefined, callback: Function): void;
         _final(callback: Function): void;
         setDefaultEncoding(encoding: string): this;
         cork(): void;
@@ -687,7 +688,7 @@ declare namespace NodeJS {
         isRaw?: boolean;
         setRawMode?(mode: boolean): void;
         _read(size: number): void;
-        _destroy(err: Error, callback: Function): void;
+        _destroy(err: Error | undefined, callback: Function): void;
         push(chunk: any, encoding?: string): boolean;
         destroy(error?: Error): void;
     }
@@ -1065,6 +1066,7 @@ declare module "http" {
         'transfer-encoding'?: string;
         'tk'?: string;
         'upgrade'?: string;
+        'user-agent'?: string;
         'vary'?: string;
         'via'?: string;
         'warning'?: string;
@@ -1227,6 +1229,7 @@ declare module "http" {
     }
 
     export class Agent {
+        maxFreeSockets: number;
         maxSockets: number;
         sockets: any;
         requests: any;
@@ -1675,6 +1678,7 @@ declare module "os" {
         netmask: string;
         mac: string;
         internal: boolean;
+        cidr: string | null;
     }
 
     export interface NetworkInterfaceInfoIPv4 extends NetworkInterfaceBase {
@@ -2458,7 +2462,7 @@ declare module "url" {
         append(name: string, value: string): void;
         delete(name: string): void;
         entries(): IterableIterator<[string, string]>;
-        forEach(callback: (value: string, name: string) => void): void;
+        forEach(callback: (value: string, name: string, searchParams: this) => void): void;
         get(name: string): string | null;
         getAll(name: string): string[];
         has(name: string): boolean;
@@ -2545,11 +2549,23 @@ declare module "dns" {
         ttl: number;
     }
 
+    export interface AnyARecord extends RecordWithTtl {
+        type: "A";
+    }
+
+    export interface AnyAaaaRecord extends RecordWithTtl {
+        type: "AAAA";
+    }
+
     export interface MxRecord {
         priority: number;
         exchange: string;
     }
 
+    export interface AnyMxRecord extends MxRecord {
+        type: "MX";
+    }
+
     export interface NaptrRecord {
         flags: string;
         service: string;
@@ -2559,6 +2575,10 @@ declare module "dns" {
         preference: number;
     }
 
+    export interface AnyNaptrRecord extends NaptrRecord {
+        type: "NAPTR";
+    }
+
     export interface SoaRecord {
         nsname: string;
         hostmaster: string;
@@ -2569,6 +2589,10 @@ declare module "dns" {
         minttl: number;
     }
 
+    export interface AnySoaRecord extends SoaRecord {
+        type: "SOA";
+    }
+
     export interface SrvRecord {
         priority: number;
         weight: number;
@@ -2576,9 +2600,45 @@ declare module "dns" {
         name: string;
     }
 
+    export interface AnySrvRecord extends SrvRecord {
+        type: "SRV";
+    }
+
+    export interface AnyTxtRecord {
+        type: "TXT";
+        entries: string[];
+    }
+
+    export interface AnyNsRecord {
+        type: "NS";
+        value: string;
+    }
+
+    export interface AnyPtrRecord {
+        type: "PTR";
+        value: string;
+    }
+
+    export interface AnyCnameRecord {
+        type: "CNAME";
+        value: string;
+    }
+
+    export type AnyRecord = AnyARecord |
+        AnyAaaaRecord |
+        AnyCnameRecord |
+        AnyMxRecord |
+        AnyNaptrRecord |
+        AnyNsRecord |
+        AnyPtrRecord |
+        AnySoaRecord |
+        AnySrvRecord |
+        AnyTxtRecord;
+
     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: "ANY", callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => 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;
@@ -2587,17 +2647,18 @@ declare module "dns" {
     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;
+    export function resolve(hostname: string, rrtype: string, callback: (err: NodeJS.ErrnoException, addresses: string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]) => 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: "ANY"): Promise<AnyRecord[]>;
         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 __promisify__(hostname: string, rrtype: string): Promise<string[] | MxRecord[] | NaptrRecord[] | SoaRecord | SrvRecord[] | string[][] | AnyRecord[]>;
     }
 
     export function resolve4(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
@@ -2623,16 +2684,53 @@ declare module "dns" {
     }
 
     export function resolveCname(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolveCname {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolveMx(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: MxRecord[]) => void): void;
+    export namespace resolveMx {
+        export function __promisify__(hostname: string): Promise<MxRecord[]>;
+    }
+
     export function resolveNaptr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: NaptrRecord[]) => void): void;
+    export namespace resolveNaptr {
+        export function __promisify__(hostname: string): Promise<NaptrRecord[]>;
+    }
+
     export function resolveNs(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolveNs {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolvePtr(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[]) => void): void;
+    export namespace resolvePtr {
+        export function __promisify__(hostname: string): Promise<string[]>;
+    }
+
     export function resolveSoa(hostname: string, callback: (err: NodeJS.ErrnoException, address: SoaRecord) => void): void;
+    export namespace resolveSoa {
+        export function __promisify__(hostname: string): Promise<SoaRecord>;
+    }
+
     export function resolveSrv(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: SrvRecord[]) => void): void;
+    export namespace resolveSrv {
+        export function __promisify__(hostname: string): Promise<SrvRecord[]>;
+    }
+
     export function resolveTxt(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: string[][]) => void): void;
+    export namespace resolveTxt {
+        export function __promisify__(hostname: string): Promise<string[][]>;
+    }
+
+    export function resolveAny(hostname: string, callback: (err: NodeJS.ErrnoException, addresses: AnyRecord[]) => void): void;
+    export namespace resolveAny {
+        export function __promisify__(hostname: string): Promise<AnyRecord[]>;
+    }
 
     export function reverse(ip: string, callback: (err: NodeJS.ErrnoException, hostnames: string[]) => void): void;
     export function setServers(servers: string[]): void;
+    export function getServers(): string[];
 
     // Error codes
     export var NODATA: string;
@@ -2659,6 +2757,25 @@ declare module "dns" {
     export var LOADIPHLPAPI: string;
     export var ADDRGETNETWORKPARAMS: string;
     export var CANCELLED: string;
+
+    export class Resolver {
+        getServers: typeof getServers;
+        setServers: typeof setServers;
+        resolve: typeof resolve;
+        resolve4: typeof resolve4;
+        resolve6: typeof resolve6;
+        resolveAny: typeof resolveAny;
+        resolveCname: typeof resolveCname;
+        resolveMx: typeof resolveMx;
+        resolveNaptr: typeof resolveNaptr;
+        resolveNs: typeof resolveNs;
+        resolvePtr: typeof resolvePtr;
+        resolveSoa: typeof resolveSoa;
+        resolveSrv: typeof resolveSrv;
+        resolveTxt: typeof resolveTxt;
+        reverse: typeof reverse;
+        cancel(): void;
+    }
 }
 
 declare module "net" {
@@ -5375,7 +5492,7 @@ declare module "stream" {
             encoding?: string;
             objectMode?: boolean;
             read?: (this: Readable, size?: number) => any;
-            destroy?: (error?: Error) => any;
+            destroy?: (error: Error | null, callback: (error?: Error) => void) => void;
         }
 
         export class Readable extends Stream implements NodeJS.ReadableStream {
@@ -5393,7 +5510,7 @@ declare module "stream" {
             unshift(chunk: any): void;
             wrap(oldStream: NodeJS.ReadableStream): this;
             push(chunk: any, encoding?: string): boolean;
-            _destroy(err: Error, callback: Function): void;
+            _destroy(error: Error | null, callback: (error?: Error) => void): void;
             destroy(error?: Error): void;
 
             /**
@@ -5461,7 +5578,7 @@ declare module "stream" {
             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;
+            destroy?: (error: Error | null, callback: (error?: Error) => void) => void;
             final?: (callback: (error?: Error) => void) => void;
         }
 
@@ -5472,7 +5589,7 @@ declare module "stream" {
             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;
+            _destroy(error: Error | null, callback: (error?: Error) => void): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
@@ -5565,7 +5682,7 @@ declare module "stream" {
             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;
+            _destroy(error: Error | null, callback: (error?: Error) => void): void;
             _final(callback: Function): void;
             write(chunk: any, cb?: Function): boolean;
             write(chunk: any, encoding?: string, cb?: Function): boolean;
@@ -5657,17 +5774,17 @@ declare module "util" {
 
     export function promisify<TCustom extends Function>(fn: CustomPromisify<TCustom>): TCustom;
     export function promisify<TResult>(fn: (callback: (err: Error | null, result: TResult) => void) => void): () => Promise<TResult>;
-    export function promisify(fn: (callback: (err: Error | null) => void) => void): () => Promise<void>;
+    export function promisify(fn: (callback: (err?: Error | null) => void) => void): () => Promise<void>;
     export function promisify<T1, TResult>(fn: (arg1: T1, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1) => Promise<TResult>;
-    export function promisify<T1>(fn: (arg1: T1, callback: (err: Error | null) => void) => void): (arg1: T1) => Promise<void>;
+    export function promisify<T1>(fn: (arg1: T1, callback: (err?: Error | null) => void) => void): (arg1: T1) => Promise<void>;
     export function promisify<T1, T2, TResult>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null, result: TResult) => void) => void): (arg1: T1, arg2: T2) => Promise<TResult>;
-    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err: Error | null) => void) => void): (arg1: T1, arg2: T2) => Promise<void>;
+    export function promisify<T1, T2>(fn: (arg1: T1, arg2: T2, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3) => Promise<void>;
+    export function promisify<T1, T2, T3>(fn: (arg1: T1, arg2: T2, arg3: T3, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4) => Promise<void>;
+    export function promisify<T1, T2, T3, T4>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, callback: (err?: Error | null) => 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 | null, 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 | null) => void) => void): (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5) => Promise<void>;
+    export function promisify<T1, T2, T3, T4, T5>(fn: (arg1: T1, arg2: T2, arg3: T3, arg4: T4, arg5: T5, callback: (err?: Error | null) => 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;
@@ -5707,7 +5824,7 @@ declare module "util" {
 }
 
 declare module "assert" {
-    function internal(value: any, message?: string): void;
+    function internal(value: any, message?: string | Error): void;
     namespace internal {
         export class AssertionError implements Error {
             name: string;
@@ -5716,34 +5833,30 @@ declare module "assert" {
             expected: any;
             operator: string;
             generatedMessage: boolean;
+            code: 'ERR_ASSERTION';
 
             constructor(options?: {
                 message?: string; actual?: any; expected?: any;
-                operator?: string; stackStartFunction?: Function
+                operator?: string; stackStartFn?: Function
             });
         }
 
-        export function fail(message: string): never;
-        export function fail(actual: any, expected: any, message?: string, operator?: string): never;
-        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 fail(message?: string | Error): never;
+        export function fail(actual: any, expected: any, message?: string | Error, operator?: string, stackStartFn?: Function): never;
+        export function ok(value: any, message?: string | Error): void;
+        export function equal(actual: any, expected: any, message?: string | Error): void;
+        export function notEqual(actual: any, expected: any, message?: string | Error): void;
+        export function deepEqual(actual: any, expected: any, message?: string | Error): void;
+        export function notDeepEqual(actual: any, expected: any, message?: string | Error): void;
+        export function strictEqual(actual: any, expected: any, message?: string | Error): void;
+        export function notStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        export function deepStrictEqual(actual: any, expected: any, message?: string | Error): void;
+        export function notDeepStrictEqual(actual: any, expected: any, message?: string | Error): 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 throws(block: Function, message?: string | Error): void;
+        export function throws(block: Function, error: RegExp | Function, message?: string | Error): void;
+        export function doesNotThrow(block: Function, message?: string | Error): void;
+        export function doesNotThrow(block: Function, error: RegExp | Function, message?: string | Error): void;
 
         export function ifError(value: any): void;
     }
diff --git a/types/node/v9/inspector.d.ts b/types/node/v9/inspector.d.ts
index 955239b486..7088455c8c 100644
--- a/types/node/v9/inspector.d.ts
+++ b/types/node/v9/inspector.d.ts
@@ -244,7 +244,7 @@ declare module "inspector" {
          */
         export interface CallArgument {
             /**
-             * Primitive value.
+             * Primitive value or serializable javascript object.
              */
             value?: any;
             /**
@@ -416,7 +416,7 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should <code>await</code> for resulting value and return once awaited promise is resolved.
              */
             awaitPromise?: boolean;
         }
@@ -468,7 +468,7 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should <code>await</code> for resulting value and return once awaited promise is resolved.
              */
             awaitPromise?: boolean;
         }
@@ -561,11 +561,25 @@ declare module "inspector" {
              */
             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.
+             * Whether execution should <code>await</code> for resulting value and return once awaited promise is resolved.
              */
             awaitPromise?: boolean;
         }
 
+        export interface QueryObjectsParameterType {
+            /**
+             * Identifier of the prototype to return objects for.
+             */
+            prototypeObjectId: Runtime.RemoteObjectId;
+        }
+
+        export interface GlobalLexicalScopeNamesParameterType {
+            /**
+             * Specifies in which execution context to lookup global scope variables.
+             */
+            executionContextId?: Runtime.ExecutionContextId;
+        }
+
         export interface EvaluateReturnType {
             /**
              * Evaluation result.
@@ -636,6 +650,17 @@ declare module "inspector" {
             exceptionDetails?: Runtime.ExceptionDetails;
         }
 
+        export interface QueryObjectsReturnType {
+            /**
+             * Array with objects.
+             */
+            objects: Runtime.RemoteObject;
+        }
+
+        export interface GlobalLexicalScopeNamesReturnType {
+            names: string[];
+        }
+
         export interface ExecutionContextCreatedEventDataType {
             /**
              * A newly created execution context.
@@ -1476,6 +1501,10 @@ declare module "inspector" {
              * Collect accurate call counts beyond simple 'covered' or 'not covered'.
              */
             callCount?: boolean;
+            /**
+             * Collect block-based coverage.
+             */
+            detailed?: boolean;
         }
 
         export interface StopReturnType {
@@ -1749,6 +1778,19 @@ declare module "inspector" {
          */
         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;
+
+        /**
+         * @experimental
+         */
+        post(method: "Runtime.queryObjects", params?: Runtime.QueryObjectsParameterType, callback?: (err: Error | null, params: Runtime.QueryObjectsReturnType) => void): void;
+        post(method: "Runtime.queryObjects", callback?: (err: Error | null, params: Runtime.QueryObjectsReturnType) => void): void;
+
+        /**
+         * Returns all let, const and class variables from global scope.
+         * @experimental
+         */
+        post(method: "Runtime.globalLexicalScopeNames", params?: Runtime.GlobalLexicalScopeNamesParameterType, callback?: (err: Error | null, params: Runtime.GlobalLexicalScopeNamesReturnType) => void): void;
+        post(method: "Runtime.globalLexicalScopeNames", callback?: (err: Error | null, params: Runtime.GlobalLexicalScopeNamesReturnType) => 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.
          */
diff --git a/types/node/v9/node-tests.ts b/types/node/v9/node-tests.ts
index 72ce012a3c..03f641e216 100644
--- a/types/node/v9/node-tests.ts
+++ b/types/node/v9/node-tests.ts
@@ -680,9 +680,10 @@ namespace url_tests {
         const searchParams = new url.URLSearchParams('abc=123');
 
         assert.equal(searchParams.toString(), 'abc=123');
-        searchParams.forEach((value: string, name: string): void => {
+        searchParams.forEach((value: string, name: string, me: url.URLSearchParams): void => {
             assert.equal(name, 'abc');
             assert.equal(value, '123');
+            assert.equal(me, searchParams);
         });
 
         assert.equal(searchParams.get('abc'), '123');
@@ -844,6 +845,7 @@ namespace util_tests {
         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 => { });
+        var cbOptionalError: () => Promise<void> = util.promisify((cb: (err?: Error | null) => void): void => { cb(); });
         assert(typeof util.promisify.custom === 'symbol');
         // util.deprecate
         const foo = () => {};
@@ -942,8 +944,9 @@ function simplified_stream_ctor_test() {
         read(size) {
             size.toFixed();
         },
-        destroy(error) {
+        destroy(error, cb) {
             error.stack;
+            cb(error);
         }
     });
 
@@ -958,8 +961,9 @@ function simplified_stream_ctor_test() {
             chunks[0].encoding.charAt(0);
             cb();
         },
-        destroy(error) {
+        destroy(error, cb) {
             error.stack;
+            cb(error);
         },
         final(cb) {
             cb(null);
@@ -980,6 +984,10 @@ function simplified_stream_ctor_test() {
             chunks[0].encoding.charAt(0);
             cb();
         },
+        destroy(error, cb) {
+            error.stack;
+            cb(error);
+        },
         readableObjectMode: true,
         writableObjectMode: true
     });
@@ -1006,8 +1014,9 @@ function simplified_stream_ctor_test() {
             chunks[0].encoding.charAt(0);
             cb();
         },
-        destroy(error) {
+        destroy(error, cb) {
             error.stack;
+            cb(error);
         },
         allowHalfOpen: true,
         readableObjectMode: true,
@@ -3152,6 +3161,14 @@ namespace dns_tests {
             const _addresses: string[] | dns.RecordWithTtl[] = addresses;
         });
     }
+    {
+        const resolver = new dns.Resolver();
+        resolver.setServers(["4.4.4.4"]);
+        resolver.resolve("nodejs.org", (err, addresses) => {
+            const _addresses: string[] = addresses;
+        });
+        resolver.cancel();
+    }
 }
 
 /*****************************************************************************
diff --git a/types/nodegit/repository.d.ts b/types/nodegit/repository.d.ts
index b94d7bd626..20da9ce052 100644
--- a/types/nodegit/repository.d.ts
+++ b/types/nodegit/repository.d.ts
@@ -78,7 +78,7 @@ export class Repository {
     /**
      * Creates a branch with the passed in name pointing to the commit
      */
-    createBranch(name: string, commit: Commit | string | Oid, force: boolean, signature: Signature, logMessage: string): Promise<Reference>;
+    createBranch(name: string, commit: Commit | string | Oid, force: boolean): Promise<Reference>;
     /**
      * Look up a refs's commit.
      */
@@ -136,7 +136,7 @@ export class Repository {
     /**
      * Instantiate a new revision walker for browsing the Repository"s history. See also Commit.prototype.history()
      */
-    createRevWalk(string: string | Oid): Revwalk;
+    createRevWalk(): Revwalk;
     /**
      * Retrieve the master branch commit.
      */
diff --git a/types/nodemailer/index.d.ts b/types/nodemailer/index.d.ts
index 0b46c67789..31175bd148 100644
--- a/types/nodemailer/index.d.ts
+++ b/types/nodemailer/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/nodemailer/nodemailer
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Piotr Roszatycki <https://github.com/dex4er>
+//                 Daniel Chao <https://github.com/bioball>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
diff --git a/types/nodemailer/lib/json-transport.d.ts b/types/nodemailer/lib/json-transport.d.ts
index f6792f4402..239decbdb6 100644
--- a/types/nodemailer/lib/json-transport.d.ts
+++ b/types/nodemailer/lib/json-transport.d.ts
@@ -15,6 +15,7 @@ declare namespace JSONTransport {
 
     interface Options extends MailOptions, TransportOptions {
         jsonTransport: true;
+        skipEncoding?: boolean;
     }
 
     interface SentMessageInfo {
diff --git a/types/nodemailer/lib/mailer/index.d.ts b/types/nodemailer/lib/mailer/index.d.ts
index f9d36d7efb..00cf40839c 100644
--- a/types/nodemailer/lib/mailer/index.d.ts
+++ b/types/nodemailer/lib/mailer/index.d.ts
@@ -165,7 +165,7 @@ declare class Mail extends EventEmitter {
     verify(callback: (err: Error | null, success: true) => void): void;
     verify(): Promise<true>;
 
-    use(step: string, plugin: Mail.PluginFunction): void; // TODO Plugin?
+    use(step: string, plugin: Mail.PluginFunction): this;
 
     /** Sends an email using the preselected transport object */
     sendMail(mailOptions: Mail.Options, callback: (err: Error | null, info: SentMessageInfo) => void): void;
diff --git a/types/nodemailer/lib/sendmail-transport.d.ts b/types/nodemailer/lib/sendmail-transport/index.d.ts
similarity index 84%
rename from types/nodemailer/lib/sendmail-transport.d.ts
rename to types/nodemailer/lib/sendmail-transport/index.d.ts
index 92e461b01b..d1bc9b888b 100644
--- a/types/nodemailer/lib/sendmail-transport.d.ts
+++ b/types/nodemailer/lib/sendmail-transport/index.d.ts
@@ -1,14 +1,12 @@
 /// <reference types="node" />
 
-import { EventEmitter } from 'events';
+import { Transport, TransportOptions } from '../..';
 
-import { Transport, TransportOptions } from '..';
+import * as shared from '../shared';
 
-import * as shared from './shared';
-
-import Mail = require('./mailer');
-import MailMessage = require('./mailer/mail-message');
-import MimeNode = require('./mime-node');
+import Mail = require('../mailer');
+import MailMessage = require('../mailer/mail-message');
+import MimeNode = require('../mime-node');
 
 declare namespace SendmailTransport {
     type MailOptions = Mail.Options;
diff --git a/types/nodemailer/lib/sendmail-transport/le-unix.d.ts b/types/nodemailer/lib/sendmail-transport/le-unix.d.ts
new file mode 100644
index 0000000000..5f5a3bb25d
--- /dev/null
+++ b/types/nodemailer/lib/sendmail-transport/le-unix.d.ts
@@ -0,0 +1,7 @@
+/// <reference types="node" />
+
+import { Transform } from 'stream';
+
+declare class LeUnix extends Transform {}
+
+export = LeUnix;
diff --git a/types/nodemailer/lib/sendmail-transport/le-windows.d.ts b/types/nodemailer/lib/sendmail-transport/le-windows.d.ts
new file mode 100644
index 0000000000..67ab01ff43
--- /dev/null
+++ b/types/nodemailer/lib/sendmail-transport/le-windows.d.ts
@@ -0,0 +1,7 @@
+/// <reference types="node" />
+
+import { Transform } from 'stream';
+
+declare class LeWindows extends Transform {}
+
+export = LeWindows;
diff --git a/types/nodemailer/nodemailer-tests.ts b/types/nodemailer/nodemailer-tests.ts
index 0caa84b0e0..140b351c6b 100644
--- a/types/nodemailer/nodemailer-tests.ts
+++ b/types/nodemailer/nodemailer-tests.ts
@@ -21,6 +21,8 @@ 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 LeWindows = require('nodemailer/lib/sendmail-transport/le-windows');
+import LeUnix = require('nodemailer/lib/sendmail-transport/le-unix');
 
 import * as fs from 'fs';
 import * as stream from 'stream';
@@ -722,6 +724,24 @@ function sendmail_test() {
     });
 }
 
+// line ending transforms using windows-style newlines
+
+function sendmail_line_endings_windows_test() {
+    function process_le(mail: MailMessage) {
+        const input = mail.message.createReadStream();
+        input.pipe(new LeWindows());
+    }
+}
+
+// line ending transforms using unix-style newlines
+
+function sendmail_line_endings_unix_test() {
+    function process_le(mail: MailMessage) {
+        const input = mail.message.createReadStream();
+        input.pipe(new LeUnix());
+    }
+}
+
 // 5. SES transport
 
 // Send a message using SES transport
@@ -812,7 +832,8 @@ function stream_buffer_unix_newlines_test() {
 
 function json_test() {
     const transporter = nodemailer.createTransport({
-        jsonTransport: true
+        jsonTransport: true,
+        skipEncoding: true
     });
     transporter.sendMail({
         from: 'sender@example.com',
diff --git a/types/nodemailer/tsconfig.json b/types/nodemailer/tsconfig.json
index f2c1ffbbe8..5977291812 100644
--- a/types/nodemailer/tsconfig.json
+++ b/types/nodemailer/tsconfig.json
@@ -31,7 +31,9 @@
         "lib/mime-funcs/mime-types.d.ts",
         "lib/mime-node.d.ts",
         "lib/qp.d.ts",
-        "lib/sendmail-transport.d.ts",
+        "lib/sendmail-transport/index.d.ts",
+        "lib/sendmail-transport/le-unix.d.ts",
+        "lib/sendmail-transport/le-windows.d.ts",
         "lib/ses-transport.d.ts",
         "lib/shared.d.ts",
         "lib/smtp-connection.d.ts",
diff --git a/types/npmlog/index.d.ts b/types/npmlog/index.d.ts
index 5487c76dc7..9457012e3d 100644
--- a/types/npmlog/index.d.ts
+++ b/types/npmlog/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for npmlog 4.1
 // Project: https://github.com/npm/npmlog#readme
 // Definitions by: Daniel Schmidt <https://github.com/DanielMSchmidt>
+//                 Zhu Zijia <https://github.com/littlepiggy03>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -32,39 +33,34 @@ export interface MessageObject {
 }
 
 // TODO: newStream, newGroup, setGaugeTemplate and setGaugeTemplateSet need to be added
-interface npmlog {
-    log(level: LogLevels | string, prefix: string, message: string, ...args: any[]): void;
 
-    silly(prefix: string, message: string, ...args: any[]): void;
-    verbose(prefix: string, message: string, ...args: any[]): void;
-    info(prefix: string, message: string, ...args: any[]): void;
-    http(prefix: string, message: string, ...args: any[]): void;
-    warn(prefix: string, message: string, ...args: any[]): void;
-    error(prefix: string, message: string, ...args: any[]): void;
+export function log(level: LogLevels | string, prefix: string, message: string, ...args: any[]): void;
 
-    level: string;
-    record: MessageObject[];
-    maxRecordSize: number;
-    prefixStyle: StyleObject;
-    headingStyle: StyleObject;
-    heading: string;
-    stream: any; // Defaults to process.stderr
+export function silly(prefix: string, message: string, ...args: any[]): void;
+export function verbose(prefix: string, message: string, ...args: any[]): void;
+export function info(prefix: string, message: string, ...args: any[]): void;
+export function http(prefix: string, message: string, ...args: any[]): void;
+export function warn(prefix: string, message: string, ...args: any[]): void;
+export function error(prefix: string, message: string, ...args: any[]): void;
 
-    enableColor(): void;
-    disableColor(): void;
+export let level: string;
+export let record: MessageObject[];
+export let maxRecordSize: number;
+export let prefixStyle: StyleObject;
+export let headingStyle: StyleObject;
+export let heading: string;
+export let stream: any; // Defaults to process.stderr
 
-    enableProgress(): void;
-    disableProgress(): void;
+export function enableColor(): void;
+export function disableColor(): void;
 
-    enableUnicode(): void;
-    disableUnicode(): void;
+export function enableProgress(): void;
+export function disableProgress(): void;
 
-    pause(): void;
-    resume(): void;
+export function enableUnicode(): void;
+export function disableUnicode(): void;
 
-    addLevel(level: string, n: number, style?: StyleObject, disp?: string): void;
-}
+export function pause(): void;
+export function resume(): void;
 
-declare const logger: npmlog;
-
-export default logger;
+export function addLevel(level: string, n: number, style?: StyleObject, disp?: string): void;
diff --git a/types/npmlog/npmlog-tests.ts b/types/npmlog/npmlog-tests.ts
index 8f90bea7ce..451b49302d 100644
--- a/types/npmlog/npmlog-tests.ts
+++ b/types/npmlog/npmlog-tests.ts
@@ -1,4 +1,4 @@
-import npmlog from "npmlog";
+import * as npmlog from "npmlog";
 
 const prefix = "str";
 const message = "otherStr";
@@ -12,7 +12,8 @@ npmlog.http(prefix, message);
 npmlog.warn(prefix, message);
 npmlog.error(prefix, message);
 
-npmlog.level = "silly";
+// ES6 module does't support changing variable exported by `export let`
+// npmlog.level = "silly";
 
 npmlog.enableColor();
 npmlog.disableColor();
diff --git a/types/ns-api/index.d.ts b/types/ns-api/index.d.ts
index 267bb319c5..598c7dd493 100644
--- a/types/ns-api/index.d.ts
+++ b/types/ns-api/index.d.ts
@@ -10,47 +10,27 @@ interface nsApi {
     /**
      * Vertrektijden - departure times
      *
-     * @callback callback
      * @param station - Station ID
-     * @param callback - `function (err, data) {}`
      */
     vertrektijden(station: string, callback: (err: string, data: {}) => void): void;
 
     /**
      * Reisadvies - travel advise
-     *
-     * @callback callback
-     * @param params - Parameters
-     * @param callback - `function (err, data) {}`
      */
     reisadvies(params: {}, callback: (err: string, data: {}) => void): void;
 
-    /**
-     * Prijzen - tariffs
-     *
-     * @callback callback
-     * @param params - Parameters
-     * @param callback - `function (err, data) {}`
-     */
+    /** Prijzen - tariffs */
     prijzen(params: {}, callback: (err: any, data: {}) => void): void;
 
     /**
      * List available stations
      *
-     * @callback callback
      * @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;
 
-    /**
-     * List disruptions
-     *
-     * @callback callback
-     * @param params - Parameters
-     * @param callback - `function (err, data) {}`
-     */
+    /** List disruptions */
     storingen(params: {}, callback: (err: string, data: {}) => void): void;
 }
 
diff --git a/types/nuka-carousel/index.d.ts b/types/nuka-carousel/index.d.ts
index b06403e703..dcecb92a99 100644
--- a/types/nuka-carousel/index.d.ts
+++ b/types/nuka-carousel/index.d.ts
@@ -2,21 +2,21 @@
 // Project: https://github.com/FormidableLabs/nuka-carousel
 // Definitions by: Roman Charugin <https://github.com/Romic>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
 export default class Carousel extends React.Component<CarouselProps, CarouselState> {}
 
-export type CellAlignProp = 'left' | 'center' | 'right';
+export type CarouselCellAlignProp = 'left' | 'center' | 'right';
 
-export type HeightModeProp = 'first' | 'current' | 'max';
+export type CarouselHeightModeProp = 'first' | 'current' | 'max';
 
-export type SlidesToScrollProp = number | 'auto';
+export type CarouselSlidesToScrollProp = number | 'auto';
 
-export type SlideWidthProp = string | number;
+export type CarouselSlideWidthProp = string | number;
 
-export interface SlideRenderControlProps {
+export interface CarouselSlideRenderControlProps {
   /**
    * Current slide index
    */
@@ -64,7 +64,7 @@ export interface SlideRenderControlProps {
   goToSlide: (index: number) => void;
 }
 
-export type RenderControl = (props: SlideRenderControlProps) => JSX.Element;
+export type CarouselRenderControl = (props: CarouselSlideRenderControlProps) => JSX.Element;
 
 export interface CarouselProps {
   /**
@@ -92,7 +92,7 @@ export interface CarouselProps {
    * When displaying more than one slide,
    * sets which position to anchor the current slide to
    */
-  cellAlign?: CellAlignProp;
+  cellAlign?: CarouselCellAlignProp;
   /**
    * Space between slides, as an integer, but reflected as px
    */
@@ -131,7 +131,7 @@ export interface CarouselProps {
    * Change the height of the slides based either on the first slide,
    * the current slide, or the maximum height of all slides.
    */
-  heightMode?: HeightModeProp;
+  heightMode?: CarouselHeightModeProp;
   /**
    * Initial height of the slides (px)
    */
@@ -147,39 +147,39 @@ export interface CarouselProps {
   /**
    * Function for rendering top left control
    */
-  renderTopLeftControls?: RenderControl;
+  renderTopLeftControls?: CarouselRenderControl;
   /**
    * Function for rendering top center control
    */
-  renderTopCenterControls?: RenderControl;
+  renderTopCenterControls?: CarouselRenderControl;
   /**
    * Function for rendering top right control
    */
-  renderTopRightControls?: RenderControl;
+  renderTopRightControls?: CarouselRenderControl;
   /**
    * Function for rendering center left control
    */
-  renderCenterLeftControls?: RenderControl;
+  renderCenterLeftControls?: CarouselRenderControl;
   /**
    * Function for rendering center center control
    */
-  renderCenterCenterControls?: RenderControl;
+  renderCenterCenterControls?: CarouselRenderControl;
   /**
    * Function for rendering center right control
    */
-  renderCenterRightControls?: RenderControl;
+  renderCenterRightControls?: CarouselRenderControl;
   /**
    * Function for rendering bottom left control
    */
-  renderBottomLeftControls?: RenderControl;
+  renderBottomLeftControls?: CarouselRenderControl;
   /**
    * Function for rendering bottom center control
    */
-  renderBottomCenterControls?: RenderControl;
+  renderBottomCenterControls?: CarouselRenderControl;
   /**
    * Function for rendering bottom right control
    */
-  renderBottomRightControls?: RenderControl;
+  renderBottomRightControls?: CarouselRenderControl;
   /**
    * Manually set the index of the slide to be shown
    */
@@ -188,7 +188,7 @@ export interface CarouselProps {
    * Slides to scroll at once. Set to "auto"
    * to always scroll the current number of visible slides
    */
-  slidesToScroll?: SlidesToScrollProp;
+  slidesToScroll?: CarouselSlidesToScrollProp;
   /**
    * Slides to show at once
    */
@@ -198,7 +198,7 @@ export interface CarouselProps {
    * @example '20px'
    * @example 0.8
    */
-  slideWidth?: SlideWidthProp;
+  slideWidth?: CarouselSlideWidthProp;
   /**
    * Animation duration
    */
@@ -252,7 +252,7 @@ export interface CarouselState {
   /**
    * Current slide width
    */
-  slideWidth: SlideWidthProp;
+  slideWidth: CarouselSlideWidthProp;
   /**
    * Current top value
    */
diff --git a/types/numeral/index.d.ts b/types/numeral/index.d.ts
index 3a22584b3c..e2fa03204f 100644
--- a/types/numeral/index.d.ts
+++ b/types/numeral/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for Numeral.js
 // Project: https://github.com/adamwdraper/Numeral-js
 // Definitions by: Vincent Bortone <https://github.com/vbortone>
+//                 Behind The Math <https://github.com/BehindTheMath>
+//                 Kenneth Luján <https://github.com/klujanrosas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 
@@ -22,6 +24,14 @@ interface NumeralJSLocale {
 	};
 }
 
+interface NumeralJSOptions {
+	currentLocale: string;
+	zeroFormat: string;
+	nullFormat: string;
+	defaultFormat: string;
+	scalePercentBy100: boolean;
+}
+
 type RoundingFunction = (value: number) => number;
 
 // http://numeraljs.com/#custom-formats
@@ -41,6 +51,7 @@ interface Numeral {
 	(value?: any): Numeral;
 	version: string;
 	isNumeral: boolean;
+	options: NumeralJSOptions;
 
 	/**
 	 * This function sets the current locale.  If no arguments are passed in,
@@ -48,6 +59,15 @@ interface Numeral {
 	 */
 	locale(key?: string): string;
 
+	/**
+	 * This function provides access to the loaded locale data.  If
+	 * no arguments are passed in, it will simply return the current
+	 * global locale object.
+	 *
+	 * @param key Locale key, e.g 'es' for a spanish locale definition
+	 */
+	localeData(key?: string): NumeralJSLocale;
+
 	/**
 	 * Registers a language definition or a custom format definition.
 	 *
@@ -62,7 +82,6 @@ interface Numeral {
 	defaultFormat(format: string): void;
 	clone(): Numeral;
 	format(inputString?: string, roundingFunction?: RoundingFunction): string;
-	formatCurrency(inputString?: string): string;
 	unformat(inputString: string): number;
 	value(): number;
 	valueOf(): number;
diff --git a/types/numeral/numeral-tests.ts b/types/numeral/numeral-tests.ts
index b58d6e7411..f32275e28f 100644
--- a/types/numeral/numeral-tests.ts
+++ b/types/numeral/numeral-tests.ts
@@ -90,3 +90,20 @@ numeral.locale('fr');
 // return the current locale
 numeral.locale();
 // 'fr'
+
+// return the current locale data
+numeral.localeData()
+
+// return a specific locale data
+const localeData = numeral.localeData('es')
+
+// test accessing locale data
+const currencySymbol = localeData.currency.symbol
+const billionShorthand = localeData.abbreviations.billion
+const decimalDelimiter = localeData.delimiters.decimal
+const ordinalResult = localeData.ordinal(2)
+
+// test changing an option
+numeral.options.scalePercentBy100 = false
+numeral(50).format('0%')
+// '50%'
diff --git a/types/numjs/index.d.ts b/types/numjs/index.d.ts
index d663d9e0e8..76d1317d37 100644
--- a/types/numjs/index.d.ts
+++ b/types/numjs/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for numjs 0.14
 // Project: https://github.com/nicolaspanel/numjs#readme
 // Definitions by: taoqf <https://github.com/taoqf>
+//                 matt <https://github.com/mattmm3d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -12,7 +13,7 @@ export type NdType<T> = BaseNdArray.DataType | BaseNdArray.Data<T>;
 export interface NdArray<T = number> extends BaseNdArray<T> {
 	ndim: number;
 	T: NdArray<T>;
-	slice(...args: number[]): NdArray<T>;
+	slice(...args: Array<number|number[]>): NdArray<T>;
 
 	/**
 	 * Return a copy of the array collapsed into one dimension using row-major order (C-style)
diff --git a/types/nunjucks/index.d.ts b/types/nunjucks/index.d.ts
index d307bd27d5..13869f0d60 100644
--- a/types/nunjucks/index.d.ts
+++ b/types/nunjucks/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for nunjucks 3.0
+// Type definitions for nunjucks 3.1
 // Project: http://mozilla.github.io/nunjucks/
 // Definitions by: Ruben Slabbert <https://github.com/RubenSlabbert>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -95,6 +95,7 @@ export function installJinjaCompat(): void;
 export interface ILoader {
     async?: boolean;
     getSource(name: string): LoaderSource;
+    getSource(name: string, callback: (err?: any, result?: LoaderSource) => void): void;
     extend?(extender: ILoader): ILoader;
 }
 
@@ -128,7 +129,7 @@ export class FileSystemLoader extends Loader implements ILoader {
     constructor(searchPaths?: string | string[], opts?: FileSystemLoaderOptions);
 }
 
-export class WebLoader implements ILoader {
+export class WebLoader extends Loader implements ILoader {
     constructor(baseUrl: string, opts?: any);
     getSource(name: string): LoaderSource;
 }
@@ -137,3 +138,13 @@ export class PrecompiledLoader extends Loader implements ILoader {
     init(searchPaths: string[], opts: any): void;
     getSource(name: string): LoaderSource;
 }
+
+export namespace runtime {
+    class SafeString {
+        constructor(val: string);
+        val: string;
+        length: number;
+        valueOf(): string;
+        toString(): string;
+    }
+}
diff --git a/types/nunjucks/nunjucks-tests.ts b/types/nunjucks/nunjucks-tests.ts
index 9f3afcddfe..6dd4d8fed7 100644
--- a/types/nunjucks/nunjucks-tests.ts
+++ b/types/nunjucks/nunjucks-tests.ts
@@ -52,3 +52,5 @@ class MyLoader extends nunjucks.Loader implements nunjucks.ILoader {
 }
 
 env = new nunjucks.Environment(new MyLoader());
+
+new nunjucks.runtime.SafeString("an unsafe string");
diff --git a/types/nunjucks/tslint.json b/types/nunjucks/tslint.json
index 2c7c1bed53..65fb79195f 100644
--- a/types/nunjucks/tslint.json
+++ b/types/nunjucks/tslint.json
@@ -1,6 +1,7 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "interface-name": false
+        "interface-name": false,
+        "no-unnecessary-class": false // to allow SafeString class
     }
 }
diff --git a/types/oauth2-server/index.d.ts b/types/oauth2-server/index.d.ts
index 6729a05e7e..6c20aab221 100644
--- a/types/oauth2-server/index.d.ts
+++ b/types/oauth2-server/index.d.ts
@@ -1,7 +1,8 @@
 // Type definitions for Node OAuth2 Server 3.0
 // Project: https://github.com/oauthjs/node-oauth2-server
 // Definitions by:  Robbie Van Gorkom <https://github.com/vangorra>,
-//                  Charles Irick <https://github.com/cirick>
+//                  Charles Irick <https://github.com/cirick>,
+//                  Daniel Fischer <https://github.com/d-fischer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -263,7 +264,7 @@ declare namespace OAuth2Server {
          * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
          */
-        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
+        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string | Falsey>): Promise<string | Falsey>;
     }
 
     interface PasswordModel extends BaseModel, RequestAuthenticationModel {
@@ -283,7 +284,7 @@ declare namespace OAuth2Server {
          * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
          */
-        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
+        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string | Falsey>): Promise<string | Falsey>;
     }
 
     interface RefreshTokenModel extends BaseModel, RequestAuthenticationModel {
@@ -317,7 +318,7 @@ declare namespace OAuth2Server {
          * Invoked to check if the requested scope is valid for a particular client/user combination.
          *
          */
-        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string[] | Falsey>): Promise<string[] | Falsey>;
+        validateScope?(user: User, client: Client, scope: string, callback?: Callback<string | Falsey>): Promise<string | Falsey>;
     }
 
     interface ExtensionModel extends BaseModel, RequestAuthenticationModel {}
@@ -380,6 +381,39 @@ declare namespace OAuth2Server {
         user: User;
         [key: string]: any;
     }
+
+    class OAuthError extends Error {
+        constructor(messageOrError: string | Error, properties?: object);
+
+        /**
+         * The HTTP error code.
+         */
+        code: number;
+
+        /**
+         * The OAuth error code.
+         */
+        name: string;
+
+        /**
+         * A human-readable error message.
+         */
+        message: string;
+    }
+
+    class AccessDeniedError extends OAuthError {}
+    class InsufficientScopeError extends OAuthError {}
+    class InvalidArgumentError extends OAuthError {}
+    class InvalidClientError extends OAuthError {}
+    class InvalidGrantError extends OAuthError {}
+    class InvalidRequestError extends OAuthError {}
+    class InvalidScopeError extends OAuthError {}
+    class InvalidTokenError extends OAuthError {}
+    class ServerError extends OAuthError {}
+    class UnauthorizedClientError extends OAuthError {}
+    class UnauthorizedRequestError extends OAuthError {}
+    class UnsupportedGrantTypeError extends OAuthError {}
+    class UnsupportedResponseTypeError extends OAuthError {}
 }
 
 export = OAuth2Server;
diff --git a/types/obj-file-parser/index.d.ts b/types/obj-file-parser/index.d.ts
new file mode 100644
index 0000000000..fcd48013f8
--- /dev/null
+++ b/types/obj-file-parser/index.d.ts
@@ -0,0 +1,55 @@
+// Type definitions for obj-file-parser 0.5
+// Project: https://github.com/wesunwin/obj-file-parser
+// Definitions by: Ben Coleman <https://github.com/benc-uk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace ObjFileParser;
+
+/* Class module */
+declare class ObjFileParser {
+    constructor(fileContents: any, defaultModelName?: any);
+    parse(): ObjFileParser.ObjFile;
+}
+
+/* Additional exported interfaces */
+declare namespace ObjFileParser {
+    interface ObjFile {
+        models: ObjModel[];
+        materialLibraries: any[];
+    }
+
+    interface ObjModel {
+        name: string;
+        vertices: Vertex[];
+        textureCoords: VertexTexture[];
+        vertexNormals: Vertex[];
+        faces: Face[];
+    }
+
+    interface Face {
+        material: any;
+        group: string;
+        smoothingGroup: number;
+        vertices: FaceVertex[];
+    }
+
+    interface FaceVertex {
+        vertexIndex: number;
+        textureCoordsIndex: number;
+        vertexNormalIndex: number;
+    }
+
+    interface Vertex {
+        x: number;
+        y: number;
+        z: number;
+    }
+
+    interface VertexTexture {
+        u: number;
+        v: number;
+        w: number;
+    }
+}
+
+export = ObjFileParser;
diff --git a/types/obj-file-parser/obj-file-parser-tests.ts b/types/obj-file-parser/obj-file-parser-tests.ts
new file mode 100644
index 0000000000..8d3cbd6c6a
--- /dev/null
+++ b/types/obj-file-parser/obj-file-parser-tests.ts
@@ -0,0 +1,53 @@
+const testObjFile = `
+# cube.obj
+# Example object
+
+o cube
+
+v  0.0  0.0  0.0
+v  0.0  0.0  1.0
+v  0.0  1.0  0.0
+v  0.0  1.0  1.0
+v  1.0  0.0  0.0
+v  1.0  0.0  1.0
+v  1.0  1.0  0.0
+v  1.0  1.0  1.0
+
+vn  0.0  0.0  1.0
+vn  0.0  0.0 -1.0
+vn  0.0  1.0  0.0
+vn  0.0 -1.0  0.0
+vn  1.0  0.0  0.0
+vn -1.0  0.0  0.0
+
+g cube-faces
+
+f  1//2  7//2  5//2
+f  1//2  3//2  7//2
+f  1//6  4//6  3//6
+f  1//6  2//6  4//6
+f  3//3  8//3  7//3
+f  3//3  4//3  8//3
+f  5//5  7//5  8//5
+f  5//5  8//5  6//5
+f  1//4  5//4  6//4
+f  1//4  6//4  2//4
+f  2//1  6//1  8//1
+f  2//1  8//1  4//1`;
+
+// Create parser and load test OBJ
+const parser = new ObjFileParser(testObjFile, 'test');
+const file = parser.parse();
+
+// get first model in file
+const model: ObjFileParser.ObjModel = file.models[0];
+// gets object name
+const name: string = model.name;
+// gets first face in model
+const face: ObjFileParser.Face = model.faces[0];
+// gets first vertex in face
+const faceVert: ObjFileParser.FaceVertex = face.vertices[0];
+// gets vertex
+const vertPoints: ObjFileParser.Vertex = model.vertices[faceVert.vertexIndex];
+// gets x value of vertex
+const x = vertPoints.x;
diff --git a/types/obj-file-parser/tsconfig.json b/types/obj-file-parser/tsconfig.json
new file mode 100644
index 0000000000..22abf3d224
--- /dev/null
+++ b/types/obj-file-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",
+        "obj-file-parser-tests.ts"
+    ]
+}
diff --git a/types/obj-file-parser/tslint.json b/types/obj-file-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/obj-file-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/object-keys/index.d.ts b/types/object-keys/index.d.ts
new file mode 100644
index 0000000000..fa277d74fe
--- /dev/null
+++ b/types/object-keys/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for object-keys 1.0
+// Project: https://github.com/ljharb/object-keys#readme
+// Definitions by: Vitor Luiz Cavalcanti <https://github.com/VitorLuizC>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare function objectKeys(object: object): string[];
+
+declare namespace objectKeys {
+    function shim(): typeof objectKeys;
+}
+
+export = objectKeys;
diff --git a/types/object-keys/object-keys-tests.ts b/types/object-keys/object-keys-tests.ts
new file mode 100644
index 0000000000..29920c0d08
--- /dev/null
+++ b/types/object-keys/object-keys-tests.ts
@@ -0,0 +1,17 @@
+import keys = require('object-keys');
+
+keys({ A: 1, B: 2, C: 3 });
+// => string[]
+
+keys.shim();
+// typeof keys
+
+keys([ 0, 1, 2, 3 ]);
+// => string[]
+
+keys(() => 0);
+// => string[]
+
+function testArguments() {
+    keys(arguments);
+}
diff --git a/types/object-keys/tsconfig.json b/types/object-keys/tsconfig.json
new file mode 100644
index 0000000000..3ab9e5dab9
--- /dev/null
+++ b/types/object-keys/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-keys-tests.ts"
+    ]
+}
diff --git a/types/object-keys/tslint.json b/types/object-keys/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/object-keys/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/object.getownpropertydescriptors/index.d.ts b/types/object.getownpropertydescriptors/index.d.ts
new file mode 100644
index 0000000000..2bfc646938
--- /dev/null
+++ b/types/object.getownpropertydescriptors/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for object.getownpropertydescriptors 2.0
+// Project: https://github.com/ljharb/object.getownpropertydescriptors#readme
+// Definitions by: Vitor Luiz Cavalcanti <https://github.com/VitorLuizC>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/**
+ * Returns an object containing all own property descriptors of an object
+ * @param o - Object that contains the properties and methods. This can be an object that you created or an existing Document Object Model (DOM) object.
+ */
+declare function getOwnPropertyDescriptors <T extends object>(o: T): { [K in keyof T]: TypedPropertyDescriptor<T[K]> } & PropertyDescriptorMap;
+
+declare namespace getOwnPropertyDescriptors {
+    function shim(): typeof getOwnPropertyDescriptors;
+    function getPolyfill(): typeof getOwnPropertyDescriptors;
+    function implementation(): typeof getOwnPropertyDescriptors;
+}
+
+export = getOwnPropertyDescriptors;
diff --git a/types/object.getownpropertydescriptors/object.getownpropertydescriptors-tests.ts b/types/object.getownpropertydescriptors/object.getownpropertydescriptors-tests.ts
new file mode 100644
index 0000000000..3212a87af1
--- /dev/null
+++ b/types/object.getownpropertydescriptors/object.getownpropertydescriptors-tests.ts
@@ -0,0 +1,27 @@
+import descriptors = require('object.getownpropertydescriptors');
+
+descriptors({ language: 'TypeScript' });
+// => { language: TypedPropertyDescriptor<string>; }
+
+const { language } = descriptors({ language: 'TypeScript' });
+
+language;
+// => {
+//      writable: undefined | boolean,
+//      enumerable: undefined | boolean,
+//      configurable: undefined | boolean,
+//      get: undefined | (() => string),
+//      set: undefined | ((value: string) => void),
+//      value: undefined | string
+// }
+
+descriptors.shim();
+// => typeof descriptors
+
+const getOwnPropertyDescriptorsPolyfill = descriptors.getPolyfill();
+
+getOwnPropertyDescriptorsPolyfill({ name: 'object.getownpropertydescriptors' });
+// => { name: TypedPropertyDescriptor<string>; }
+
+descriptors.implementation();
+// => typeof descriptors
diff --git a/types/object.getownpropertydescriptors/tsconfig.json b/types/object.getownpropertydescriptors/tsconfig.json
new file mode 100644
index 0000000000..4afa48dce3
--- /dev/null
+++ b/types/object.getownpropertydescriptors/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.getownpropertydescriptors-tests.ts"
+    ]
+}
diff --git a/types/object.getownpropertydescriptors/tslint.json b/types/object.getownpropertydescriptors/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/object.getownpropertydescriptors/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/office-js/index.d.ts b/types/office-js/index.d.ts
index 809a710809..99d7ddac1b 100644
--- a/types/office-js/index.d.ts
+++ b/types/office-js/index.d.ts
@@ -1,6 +1,6 @@
 // Type definitions for Office.js
 // Project: http://dev.office.com
-// Definitions by: OfficeDev <https://github.com/OfficeDev>, Lance Austin <https://github.com/LanceEA>, Michael Zlatkovsky <https://github.com/Zlatkovsky>, Kim Brandl <https://github.com/kbrandl>, Ricky Kirkham <https://github.com/Rick-Kirkham>, Alex Jerabek <https://github.com/AlexJerabek>
+// Definitions by: OfficeDev <https://github.com/OfficeDev>, Lance Austin <https://github.com/LanceEA>, Michael Zlatkovsky <https://github.com/Zlatkovsky>, Kim Brandl <https://github.com/kbrandl>, Ricky Kirkham <https://github.com/Rick-Kirkham>, Alex Jerabek <https://github.com/AlexJerabek>, Elizabeth Samuel <https://github.com/ElizabethSamuel-MSFT>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -25,7 +25,9 @@ declare namespace Office {
         startCustomFunctions(): Promise<void>;
     }
 
-    /** A Promise object. Promises can be chained via ".then", and errors can be caught via ".catch". When a browser-provided native Promise implementation is available, Office.Promise will switch to use the native Promise instead. */
+    /** A Promise object. Promises can be chained via ".then", and errors can be caught via ".catch". 
+     * When a browser-provided native Promise implementation is available, Office.Promise will switch to use the native Promise instead.
+     */
     var Promise: IPromiseConstructor;
 
     // Note: this is a copy of the PromiseConstructor object from
@@ -229,7 +231,7 @@ declare namespace Office {
         resolve<T>(value: T | PromiseLike<T>): Promise<T>;
 
         /**
-         * Creates a new resolved promise .
+         * Creates a new resolved promise.
          * @returns A resolved promise.
          */
         resolve(): Promise<void>;
@@ -237,29 +239,75 @@ declare namespace Office {
 
     /**
      * Gets the Context object that represents the runtime environment of the add-in and provides access to the top-level objects of the API.
+     * 
+     * @remarks
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      */
     var context: Context;
     /**
      * Occurs when the runtime environment is loaded and the add-in is ready to start interacting with the application and hosted document. 
      * 
-     * The reason parameter of the initialize event listener function returns an `InitializationReason` enumeration value that specifies how initialization occurred. A task pane or content add-in can be initialized in two ways:
+     * The reason parameter of the initialize event listener function returns an `InitializationReason` enumeration value that specifies how 
+     * initialization occurred. A task pane or content add-in can be initialized in two ways:
      * 
-     *  - The user just inserted it from Recently Used Add-ins section of the Add-in drop-down list on the Insert tab of the ribbon in the Office host application, or from Insert add-in dialog box.
+     *  - The user just inserted it from Recently Used Add-ins section of the Add-in drop-down list on the Insert tab of the ribbon in the Office 
+     * host application, or from Insert add-in dialog box.
      * 
      *  - The user opened a document that already contains the add-in.
      * 
-     * *Note*: The reason parameter of the initialize event listener function only returns an `InitializationReason` enumeration value for task pane and content add-ins. It does not return a value for Outlook add-ins.
+     * *Note*: The reason parameter of the initialize event listener function only returns an `InitializationReason` enumeration value for task pane 
+     * and content add-ins. It does not return a value for Outlook add-ins.
      * 
      * @remarks
-     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this method.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      * 
      * @param reason Indicates how the app was initialized.
      */
     function initialize(reason: InitializationReason): void;
     /**
-    * Ensures that the Office JavaScript APIs are ready to be called by the add-in. If the framework hasn't initialized yet, the callback or promise will wait until the Office host is ready to accept API calls.
-    * Note that though this API is intended to be used inside an Office add-in, it can also be used outside the add-in. In that case, once Office.js determines that it is running outside of an Office host application, it will call the callback and resolve the promise with "null" for both the host and platform.
-    * @param callback - An optional callback method, that will receive the host and platform info. Alternatively, rather than use a callback, an add-in may simply wait for the Promise returned by the function to resolve.
+    * Ensures that the Office JavaScript APIs are ready to be called by the add-in. If the framework hasn't initialized yet, the callback or promise 
+    * will wait until the Office host is ready to accept API calls. Note that though this API is intended to be used inside an Office add-in, it can 
+    * also be used outside the add-in. In that case, once Office.js determines that it is running outside of an Office host application, it will call 
+    * the callback and resolve the promise with "null" for both the host and platform.
+    * 
+    * @param callback - An optional callback method, that will receive the host and platform info. 
+    *                   Alternatively, rather than use a callback, an add-in may simply wait for the Promise returned by the function to resolve.
     * @returns A Promise that contains the host and platform info, once initialization is completed.
     */
     function onReady(callback?: (info: { host: HostType, platform: PlatformType }) => any): Promise<{ host: HostType, platform: PlatformType }>;
@@ -267,7 +315,25 @@ declare namespace Office {
      * Toggles on and off the `Office` alias for the full `Microsoft.Office.WebExtension` namespace.
      * 
      * @remarks
-     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this method.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      * 
      * @param useShortNamespace True to use the shortcut alias; otherwise false to disable it. The default is true.
      */
@@ -275,10 +341,29 @@ declare namespace Office {
     // Enumerations
     /**
      * Specifies the result of an asynchronous call.
+     * 
      * @remarks
-     * Returned by the status property of the AsyncResult object.
-     *
-     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     * 
+     * Returned by the `status` property of the {@link Office.AsyncResult | AsyncResult} object.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      */
     enum AsyncResultStatus {
         /**
@@ -294,7 +379,22 @@ declare namespace Office {
      * Specifies whether the add-in was just inserted or was already contained in the document.
      *
      * @remarks
-     * Hosts: Excel, Project, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum InitializationReason {
         /**
@@ -310,7 +410,26 @@ declare namespace Office {
      * Specifies the host Office application in which the add-in is running.
      *
      * @remarks
-     * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td> Y               </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      */
     enum HostType {
         /**
@@ -346,7 +465,26 @@ declare namespace Office {
      * Specifies the OS or other platform on which the Office host application is running.
      *
      * @remarks
-     * Hosts: Excel, Word, PowerPoint, Outlook, OneNote, Project, Access
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> OneNote    </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td> Y               </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      */
     enum PlatformType {
         /**
@@ -379,49 +517,126 @@ declare namespace Office {
         * An object which encapsulates the result of an asynchronous request, including status and error information if the request failed.
         *
         * @remarks
-        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+        * <table><tr><td>Hosts</td><td>Access, Excel, Outlook, PowerPoint, Project, Word</td></tr></table>
         *
-        * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access from the `callback` function's only parameter.
+        * When the function you pass to the `callback` parameter of an "Async" method executes, it receives an AsyncResult object that you can access 
+        * from the `callback` function's only parameter.
         */
-        interface AsyncResult {
+        interface AsyncResult<T> {
         /**
-        * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. This the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
+        * Gets the user-defined item passed to the optional `asyncContext` parameter of the invoked method in the same state as it was passed in. 
+        * This returns the user-defined item (which can be of any JavaScript type: String, Number, Boolean, Object, Array, Null, or Undefined) passed 
+        * to the optional `asyncContext` parameter of the invoked method. Returns Undefined, if you didn't pass anything to the asyncContext parameter.
         *
         * @remarks
-        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td>                            </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *  </table>
         */
         asyncContext: any;
         /**
-        * Gets the {@link Office.AsyncResultStatus} of the asynchronous operation.
-        *
-        * @remarks
-        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
-        */
-        status: AsyncResultStatus;
-        /**
         * Gets an {@link Office.Error} object that provides a description of the error, if any error occurred.
         *
         * @remarks
-        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *  </table>
         */
-        error: Error;
+        error: Office.Error;
+        /**
+        * Gets the {@link Office.AsyncResultStatus} of the asynchronous operation.
+        *
+        * @remarks
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *  </table>
+        */
+        status: AsyncResultStatus;
         /**
         * Gets the payload or content of this asynchronous operation, if any.
-
+        * 
         * @remarks
-        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the `getSelectedDataAsync` and `setSelectedDataAsync` methods of the Document object.
+        * You access the AsyncResult object in the function passed as the argument to the callback parameter of an "Async" method, such as the 
+        * `getSelectedDataAsync` and `setSelectedDataAsync` methods of the {@link Office.Document | Document} object.
         *
-        * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic. For a complete listing of the "Async" methods, see the Remarks section of the AsyncResult object topic.
-        *
-        * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+        * Note: What the value property returns for a particular "Async" method varies depending on the purpose and context of that method. 
+        * To determine what is returned by the value property for an "Async" method, refer to the "Callback value" section of the method's topic.
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *  </table>
         */
-        value: any;
+        value: T;
     }
     /**
      * Represents the runtime environment of the add-in and provides access to key objects of the API. 
+     * The current context exists as a property of Office. It is accessed using `Office.context`.
      *
      * @remarks 
-     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word 
+     * <table><tr><td>Hosts</td><td>Access, Excel, Outlook, PowerPoint, Project, Word </td></tr></table>
      */     
     interface Context {
         /**
@@ -432,11 +647,53 @@ declare namespace Office {
         * True, if the current platform allows the add-in to display a UI for selling or upgrading; otherwise returns False.
         * 
         * @remarks
-        * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on the Windows desktop or for Office Online in the browser, do allow such links. If you want the UI of your add-in to provide a link to an external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
+        * The iOS App Store doesn't support apps with add-ins that provide links to additional payment systems. However, Office Add-ins running on 
+        * the Windows desktop or for Office Online in the browser do allow such links. If you want the UI of your add-in to provide a link to an 
+        * external payment system on platforms other than iOS, you can use the commerceAllowed property to control when that link is displayed.
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y               </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y               </td></tr>
+        *  </table>
         */
         commerceAllowed: boolean;
         /**
         * Gets the locale (language) specified by the user for editing the document or item.
+        * 
+        * @remarks
+        * The `contentLanguage` value reflects the **Editing Language** setting specified with **File > Options > Language** in the Office host 
+        * application.
+        * 
+        * In content add-ins for Access web apps, the `contentLanguage` property gets the add-in culture (e.g., "en-GB").
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *  </table>
         */
         contentLanguage: string;
         /**
@@ -445,14 +702,62 @@ declare namespace Office {
         diagnostics: ContextInformation;
         /**
         * Gets the locale (language) specified by the user for the UI of the Office host application.
+        * 
         * @remarks
-        * When using in Outlook,the applicable modes are Compose or read.
+        * 
+        * The returned value is a string in the RFC 1766 Language tag format, such as en-US.
+        * 
+        * The `displayLanguage` value reflects the current **Display Language** setting specified with **File > Options > Language** in the Office 
+        * host application.
+        * 
+        * In content add-ins for Access web apps, the `displayLanguage property` gets the add-in language (e.g., "en-US").
+        * 
+        * When using in Outlook, the applicable modes are Compose or read.
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td><td>                 </td><td>                </td></tr>
+        *  </table>
         */
         displayLanguage: string;
         /**
         * Gets an object that represents the document the content or task pane add-in is interacting with.
+        * 
+        * @remarks
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *  </table>
         */
-        document: Document;
+        document: Office.Document;
         /**
         * Contains the Office application host in which the add-in is running.
         */
@@ -475,11 +780,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        mailbox: Mailbox;
+        mailbox: Office.Mailbox;
         /**
         * Provides access to the properties for Office theme colors.
         */
@@ -495,21 +800,40 @@ declare namespace Office {
         /**
          * Gets an object that represents the custom settings or state of a mail add-in saved to a user's mailbox.
          *
-         * The RoamingSettings object lets you store and access data for a mail add-in that is stored in a user's mailbox, so that is available to that add-in when it is running from any host client application used to access that mailbox.
+         * The RoamingSettings object lets you store and access data for a mail add-in that is stored in a user's mailbox, so that is available to 
+         * that add-in when it is running from any host client application used to access that mailbox.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        roamingSettings: RoamingSettings;
+        roamingSettings: Office.RoamingSettings;
         /**
-        * Specifies whether the platform and device allows touch interaction.
+        * Specifies whether the platform and device allows touch interaction. 
+        * True if the add-in is running on a touch device, such as an iPad; false otherwise.
         * 
         * @remarks
-        * Use the touchEnabled property to determine when your add-in is running on a touch device and if necessary, adjust the kind of controls, and size and spacing of elements in your add-in's UI to accommodate touch interactions.
+        * Use the touchEnabled property to determine when your add-in is running on a touch device and if necessary, adjust the kind of controls, and 
+        * size and spacing of elements in your add-in's UI to accommodate touch interactions.
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this enumeration.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y               </td></tr>
+        *   <tr><td><strong> PowerPoint </strong></td><td> Y               </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y               </td></tr>
+        *  </table>
         */
         touchEnabled: boolean;
         /**
@@ -521,9 +845,27 @@ declare namespace Office {
      * Provides specific information about an error that occurred during an asynchronous data operation.
      *
      * @remarks
-     * The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous data operation, such as the setSelectedDataAsync method of the Document object.
-     *
-     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     * The Error object is accessed from the AsyncResult object that is returned in the function passed as the callback argument of an asynchronous 
+     * data operation, such as the setSelectedDataAsync method of the Document object.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      */
     interface Error {
         /**
@@ -541,31 +883,44 @@ declare namespace Office {
     }
     namespace AddinCommands {
         /**
-         * The event object is passed as a parameter to add-in functions invoked by UI-less command buttons. The object allows the add-in to identify which button was clicked and to signal the host that it has completed its processing.
-         * 
-         * [Api set: Mailbox 1.3]
+         * The event object is passed as a parameter to add-in functions invoked by UI-less command buttons. The object allows the add-in to identify 
+         * which button was clicked and to signal the host that it has completed its processing.
          * 
          * @remarks
          * 
-         * Hosts: Excel, Outlook, PowerPoint, Word
+         * <table><tr><td>Add-in type</td><td>Content, task pane, Outlook</td></tr>
          * 
-         * Add-in type: Content, task pane, Outlook
-         * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or Read</td></tr></table>
          */
         interface Event {
             
             /**
-             * Information about the control that triggered calling this function
+             * Information about the control that triggered calling this function.
+             * 
+             * **Support details**
+             * 
+             * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+             * An empty cell indicates that the Office host application doesn't support this property.
+             * 
+             * For more information about Office host application and server requirements, see 
+             * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+             * 
+             * *Supported hosts, by platform*
+             *  <table>
+             *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
+             *  </table>
              */
             source:Source;
-
             /**
              * Indicates that the add-in has completed processing that was triggered by an add-in command button or event handler.
              * 
-             * This method must be called at the end of a function which was invoked by an add-in command defined with an Action element with an xsi:type attribute set to ExecuteFunction. Calling this method signals the host client that the function is complete and that it can clean up any state involved with invoking the function. For example, if the user closes Outlook before this method is called, Outlook will warn that a function is still executing.
+             * This method must be called at the end of a function which was invoked by an add-in command defined with an Action element with an 
+             * xsi:type attribute set to ExecuteFunction. Calling this method signals the host client that the function is complete and that it can 
+             * clean up any state involved with invoking the function. For example, if the user closes Outlook before this method is called, Outlook 
+             * will warn that a function is still executing.
              * 
              * This method must be called in an event handler added via Office.context.mailbox.addHandlerAsync after completing processing of the event.
              * 
@@ -573,12 +928,31 @@ declare namespace Office {
              *
              * @remarks
              * 
-             * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+             * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
              *
-             * Applicable Outlook mode: Compose or read
+             * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+             * 
+             * **Support details**
+             * 
+             * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+             * An empty cell indicates that the Office host application doesn't support this method.
+             * 
+             * For more information about Office host application and server requirements, see 
+             * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+             * 
+             * *Supported hosts, by platform*
+             *  <table>
+             *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+             *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Outlook    </strong></td><td> Y (Mailbox 1.3)            </td><td>                            </td><td>                 </td></tr>
+             *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+             *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+             *  </table>
              * 
              * @param options Optional. An object literal that contains one or more of the following properties.
-             *        allowEvent: A boolean value. When the completed method is used to signal completion of an event handler, this value indicates of the handled event should continue execution or be canceled. For example, an add-in that handles the ItemSend event can set allowEvent = false to cancel sending of the message.
+             *        allowEvent: A boolean value. When the completed method is used to signal completion of an event handler, 
+             *                    this value indicates of the handled event should continue execution or be canceled. 
+             *                    For example, an add-in that handles the ItemSend event can set allowEvent = false to cancel sending of the message.
              */
             completed(options?: any): void;
         }
@@ -589,30 +963,42 @@ declare namespace Office {
         interface Source {
 
             /**
-             * The id of the control that triggered calling this function. The id comes from the manifest and is the unique ID of your Office Add-in as a GUID.
+             * The id of the control that triggered calling this function. The id comes from the manifest and is the unique ID of your Office Add-in 
+             * as a GUID.
              */
             id: string;
         }
     }
     /**
      * Provides objects and methods that you can use to create and manipulate UI components, such as dialog boxes, in your Office Add-ins.
+     * 
+     * Visit "{@link https://docs.microsoft.com/office/dev/add-ins/develop/dialog-api-in-office-add-ins | Use the Dialog API in your Office Add-ins}" 
+     * for more information.
      */
     interface UI {
         /**
         * Displays a dialog to show or collect information from the user or to facilitate Web navigation.
         *
         * @remarks
-        * Hosts: Word, Excel, Outlook, PowerPoint
+        * <table><tr><td>Hosts</td><td>Word, Excel, Outlook, PowerPoint</td></tr>
         *
-        * Requirement sets: DialogApi, Mailbox 1.4
+        * <tr><td>Requirement sets</td><td>DialogApi, Mailbox 1.4</td></tr></table>
+        * 
+        * This method is available in the DialogApi requirement set for Word, Excel, or PowerPoint add-ins, and in the Mailbox requirement set 1.4 
+        * for Outlook. For more on how to specify a requirement set in your manifest, see 
+        * {@link https://docs.microsoft.com/en-us/office/dev/add-ins/develop/specify-office-hosts-and-api-requirements | Specify Office hosts and API requirements}.
         *
-        * The initial page must be on the same domain as the parent page (the startAddress parameter). After the initial page loads, you can go to other domains.
+        * The initial page must be on the same domain as the parent page (the startAddress parameter). After the initial page loads, you can go to 
+        * other domains.
         *
-        * Any page calling office.context.ui.messageParent must also be on the same domain as the parent page.
+        * Any page calling `office.context.ui.messageParent` must also be on the same domain as the parent page.
+        * 
+        * **Design considerations**:
         *
         * The following design considerations apply to dialog boxes:
         *
-        * - An Office Add-in can have only one dialog box open at any time.
+        * - An Office Add-in task pane can have only one dialog box open at any time. Multiple dialogs can be open at the same time from Add-in 
+        * Commands (custom ribbon buttons or menu items).
         *
         * - Every dialog box can be moved and resized by the user.
         *
@@ -624,19 +1010,70 @@ declare namespace Office {
         *
         * - Display authentication pages to collect user credentials.
         *
-        * - Display an error/progress/input screen from a ShowTaspane or ExecuteAction command.
+        * - Display an error/progress/input screen from a ShowTaskpane or ExecuteAction command.
         *
         * - Temporarily increase the surface area that a user has available to complete a task.
         *
         * Do not use a dialog box to interact with a document. Use a task pane instead.
+        * 
+        * For a design pattern that you can use to create a dialog box, see 
+        * {@link https://github.com/OfficeDev/Office-Add-in-UX-Design-Patterns/blob/master/Patterns/Client_Dialog.md | Client Dialog}  in the Office 
+        * Add-in UX Design Patterns repository on GitHub.
+        * 
+        * **displayDialogAsync Errors**:
+        * 
+        * <table>
+        *   <tr>
+        *     <th>Code number</th>
+        *     <th>Meaning</th>
+        *   </tr>
+        *   <tr>
+        *     <td>12004</td>
+        *     <td>The domain of the URL passed to displayDialogAsync is not trusted. The domain must be either the same domain as the host page (including protocol and port number), or it must be registered in the <AppDomains> section of the add-in manifest.</td>
+        *   </tr>
+        *   <tr>
+        *     <td>12005</td>
+        *     <td>The URL passed to displayDialogAsync uses the HTTP protocol. HTTPS is required. (In some versions of Office, the error message returned with 12005 is the same one returned for 12004.)</td>
+        *   </tr>
+        *   <tr>
+        *     <td>12007</td>
+        *     <td>A dialog box is already opened from the task pane. A task pane add-in can only have one dialog box open at a time.</td>
+        *   </tr>
+        * </table>
+        * 
+        * In the callback function passed to the displayDialogAsync method, you can use the properties of the AsyncResult object to return the 
+        * following information.
+        * 
+        * <table>
+        *   <tr>
+        *     <th>Property</th>
+        *     <th>Use to</th>
+        *   </tr>
+        *   <tr>
+        *     <td>AsyncResult.value</td>
+        *     <td>Access the Dialog object.</td>
+        *   </tr>
+        *   <tr>
+        *     <td>AsyncResult.status</td>
+        *     <td>Determine the success or failure of the operation.</td>
+        *   </tr>
+        *   <tr>
+        *     <td>AsyncResult.error</td>
+        *     <td>Access an Error object that provides error information if the operation failed.</td>
+        *   </tr>
+        *   <tr>
+        *     <td>AsyncResult.asyncContext</td>
+        *     <td>Access your user-defined object or value, if you passed one as the asyncContext parameter.</td>
+        *   </tr>
+        * </table>
         *
         * @param startAddress - Accepts the initial HTTPS URL that opens in the dialog.
-        * @param options - Optional. Accepts a DialogOptions object to define dialog display.
-        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a DialogHandler object.
+        * @param options - Optional. Accepts an {@link Office.DialogOptions} object to define dialog display.
+        * @param callback - Optional. Accepts a callback method to handle the dialog creation attempt. If successful, the AsyncResult.value is a Dialog object.
         */
-        displayDialogAsync(startAddress: string, options?: DialogOptions, callback?: (result: AsyncResult) => void): void;
+        displayDialogAsync(startAddress: string, options?: DialogOptions, callback?: (result: AsyncResult<Dialog>) => void): void;
         /**
-         * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent.
+         * Delivers a message from the dialog box to its parent/opener page. The page calling this API must be on the same domain as the parent. 
          * @param messageObject Accepts a message from the dialog to deliver to the add-in.
          */
         messageParent(messageObject: any): void;
@@ -644,18 +1081,20 @@ declare namespace Office {
          * Closes the UI container where the JavaScript is executing.
          *
          * @remarks
+         * <table><tr><td>Hosts</td><td>Excel, Word, PowerPoint, Outlook (Minimum requirement set: Mailbox 1.5)</td></tr></table>
+         * 
          * 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 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.
-         *
-         * Hosts: Excel, Word, PowerPoint, Outlook (Minimum requirement set: Mailbox 1.5)
          */
         closeContainer(): void;
     }
+
     /**
      * Provides information about what Requirement Sets are supported in current environment.
      */
@@ -666,7 +1105,8 @@ declare namespace Office {
         * @param minVersion - The minimum required version; e.g., "1.4".
         */
        isSetSupported(name: string, minVersion?: number): boolean;
-}
+    }
+
     /**
      * Provides options for how a dialog is displayed.
      */
@@ -680,32 +1120,43 @@ declare namespace Office {
          */
         width?: number,
         /**
-         * Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. This is best for user experience and performance.
+         * Determines whether the dialog box should be displayed within an IFrame. This setting is only applicable in Office Online clients, and is 
+         * ignored by other platforms. If false (default), the dialog will be displayed as a new browser window (pop-up). Recommended for 
+         * authentication pages that cannot be displayed in an IFrame. If true, the dialog will be displayed as a floating overlay with an IFrame. 
+         * This is best for user experience and performance.
          */
         displayInIframe?: boolean
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
     /**
-     * The Office Auth namespace, Office.context.auth, provides a method that allows the Office host to obtain and access the add-in token. Indirectly, enable the add-in to access the signed-in user's Microsoft Graph data without requiring the user to sign in a second time.
+     * The Office Auth namespace, Office.context.auth, provides a method that allows the Office host to obtain an access token to the add-in's web application. 
+     * Indirectly, this also enables the add-in to access the signed-in user's Microsoft Graph data without requiring the user to sign in a second time.
+     * 
+     * @beta 
      */
     interface Auth {
         /**
-        * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Allows add-ins to identify users. Server side code can use this token to access Microsoft Graph for the add-in's web application by using the {@link https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of | "on behalf of" OAuth flow}.
+        * Calls the Azure Active Directory V 2.0 endpoint to get an access token to your add-in's web application. Enables add-ins to identify users. 
+        * Server side code can use this token to access Microsoft Graph for the add-in's web application by using the 
+        * {@link https://docs.microsoft.com/azure/active-directory/develop/active-directory-v2-protocols-oauth-on-behalf-of | "on behalf of" OAuth flow}.
+        * 
+        * Important: In Outlook, this API is not supported if the add-in is loaded in an Outlook.com or Gmail mailbox.
         *
         * @remarks
-        * Hosts: Excel, OneNote, Outlook, PowerPoint, Word
+        * <table><tr><td>Hosts</td><td>Excel, OneNote, Outlook, PowerPoint, Word</td></tr>
         *
-        * Requirement sets: IdentityAPI
-        *
-        * This API requires a single sign-on configuration that bridges the add-in to an Azure application. Office users sign-in with Organizational Accounts and Microsoft Accounts. Microsoft Azure returns tokens intended for both user account types to access resources in the Microsoft Graph.
+        * <tr><td>Requirement sets</td><td>{@link https://docs.microsoft.com/office/dev/add-ins/develop/specify-office-hosts-and-api-requirements | IdentityAPI}</td></tr></table>
         *
         * @param options - Optional. Accepts an AuthOptions object to define sign-on behaviors.
-        * @param callback - Optional. Accepts a callback method to handle the token acquisition attempt. If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+        * @param callback - Optional. Accepts a callback method that can parse the token for the user's ID or use the token in the "on behalf of" flow to get access to Microsoft Graph. 
+        *                   If AsyncResult.status is "succeeded", then AsyncResult.value is the raw AAD v. 2.0-formatted access token.
+        * 
+        * @beta
         */
-        getAccessTokenAsync(options?: AuthOptions, callback?: (result: AsyncResult) => void): void;
+        getAccessTokenAsync(options?: AuthOptions, callback?: (result: AsyncResult<string>) => void): void;
 
     }
     /**
@@ -713,19 +1164,24 @@ declare namespace Office {
      */
     interface AuthOptions {
         /**
-         * Causes Office to display the add-in consent experience. Useful if the add-in's Azure permissions have changed or if the user's consent has been revoked.
+         * Causes Office to display the add-in consent experience. Useful if the add-in's Azure permissions have changed or if the user's consent has 
+         * been revoked.
          */
         forceConsent?: boolean,
         /**
-         * Prompts the user to add (or to switch if already added) his or her Office account.
+         * Prompts the user to add their Office account (or to switch to it, if it is already added).
          */
         forceAddAccount?: boolean,
         /**
-         * Causes Office to prompt the user to provide the additional factor when the tenancy being targeted by Microsoft Graph requires multifactor authentication. The string value identifies the type of additional factor that is required. In most cases, you won't know at development time whether the user's tenant requires an additional factor or what the string should be. So this option would be used in a "second try" call of getAccessTokenAsync after Microsoft Graph has sent an error requesting the additional factor and containing the string that should be used with the authChallenge option.
+         * Causes Office to prompt the user to provide the additional factor when the tenancy being targeted by Microsoft Graph requires multifactor 
+         * authentication. The string value identifies the type of additional factor that is required. In most cases, you won't know at development 
+         * time whether the user's tenant requires an additional factor or what the string should be. So this option would be used in a "second try" 
+         * call of getAccessTokenAsync after Microsoft Graph has sent an error requesting the additional factor and containing the string that should 
+         * be used with the authChallenge option.
          */
         authChallenge?: string
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -734,7 +1190,7 @@ declare namespace Office {
      */
     interface AsyncContextOptions {
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -763,11 +1219,12 @@ declare namespace Office {
      */
     interface GetBindingDataOptions {
         /**
-         * The expected shape of the selection. Use Office.CoercionType or text value. Default: The original, uncoerced type of the binding.
+         * The expected shape of the selection. Use {@link Office.CoercionType} or text value. Default: The original, uncoerced type of the binding.
          */
         coercionType?: Office.CoercionType | string
         /**
-         * Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. Default: Unformatted data.
+         * Specifies whether values, such as numbers and dates, are returned with their formatting applied. Use Office.ValueFormat or text value. 
+         * Default: Unformatted data.
          */
         valueFormat?: Office.ValueFormat | string
         /**
@@ -787,7 +1244,8 @@ declare namespace Office {
         */
         columnCount?: number
         /**
-        * Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. Use Office.FilterType or text value.
+        * Specify whether to get only the visible (filtered in) data or all the data (default is all). Useful when filtering data. 
+        * Use Office.FilterType or text value.
         */
         filterType?: Office.FilterType | string
         /**
@@ -795,7 +1253,7 @@ declare namespace Office {
         */
         rows?: string
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -807,8 +1265,10 @@ declare namespace Office {
      */
     interface SetBindingDataOptions {
         /**
-         * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}},
-        {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
+         * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of 
+         * columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. 
+         * 
+         * Example: `[{cells: Office.Table.Data, format: {fontColor: "yellow"}}, {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]`
          */
         cellFormat?: Array<RangeFormatConfiguration>
         /**
@@ -824,19 +1284,22 @@ declare namespace Office {
         */
         rows?: string
         /**
-        * Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set starting in the first row.
+        * Specifies the zero-based starting row for a subset of the data in the binding. Only for table or matrix bindings. If omitted, data is set 
+        * starting in the first row.
         */
         startRow?: number
         /**
-        * Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in the first column.
+        * Specifies the zero-based starting column for a subset of the data. Only for table or matrix bindings. If omitted, data is set starting in 
+        * the first column.
         */
         startColumn?: number
         /**
-        * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
+        * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. 
+        * Example: `{bandedRows: true,  filterButton: false}`
         */
         tableOptions?: object
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -845,7 +1308,8 @@ declare namespace Office {
      */
     interface RangeFormatConfiguration {
         /**
-         * Specifies the range. Example of using Office.Table enum: Office.Table.All. Example of using RangeCoordinates: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
+         * Specifies the range. Example of using Office.Table enum: Office.Table.All. Example of using RangeCoordinates: {row: 3, column: 4} specifies 
+         * the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
          */
          cells: Office.Table | RangeCoordinates
         /**
@@ -854,7 +1318,8 @@ declare namespace Office {
          format: object
     }
     /**
-     * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 3, column: 4} specifies the cell in the 3rd (zero-based) row in the 4th (zero-based) column.
+     * Specifies a cell, or row, or column, by its zero-based row and/or column number. Example: {row: 3, column: 4} specifies the cell in the 3rd 
+     * (zero-based) row in the 4th (zero-based) column.
      */
     interface RangeCoordinates {
         /**
@@ -875,7 +1340,7 @@ declare namespace Office {
          */
         handler?: string
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -888,7 +1353,7 @@ declare namespace Office {
          */
         id?: string
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -901,15 +1366,18 @@ declare namespace Office {
          */
         id?: string
         /**
-         * Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. If no promptText argument is passed, "Please make a selection" is displayed.
+         * Specifies the string to display in the prompt UI that tells the user what to select. Limited to 200 characters. 
+         * If no promptText argument is passed, "Please make a selection" is displayed.
          */
         promptText?: string
         /**
-         * Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. The headers provided in the TableData object specify the labels used in the field selection UI. Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
+         * Specifies a table of sample data displayed in the prompt UI as an example of the kinds of fields (columns) that can be bound by your add-in. 
+         * The headers provided in the TableData object specify the labels used in the field selection UI. 
+         * Note: This parameter is used only in add-ins for Access. It is ignored if provided when calling the method in an add-in for Excel.
          */
         sampleData?: Office.TableData
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -926,7 +1394,7 @@ declare namespace Office {
          */
         columns?: Array<string>
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -939,7 +1407,7 @@ declare namespace Office {
          */
         sliceSize?: number
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -952,11 +1420,12 @@ declare namespace Office {
          */
         valueFormat?: Office.ValueFormat | string
         /**
-         * Specify whether to get only the visible (that is, filtered-in) data or all the data. Useful when filtering data. Use Office.FilterType or string equivalent. This parameter is ignored in Word documents.
+         * Specify whether to get only the visible (that is, filtered-in) data or all the data. Useful when filtering data. 
+         * Use {@link Office.FilterType} or string equivalent. This parameter is ignored in Word documents.
          */
         filterType?: Office.FilterType | string
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -964,21 +1433,25 @@ declare namespace Office {
      * Provides options for whether to select the location that is navigated to.
      *
      * @remarks
-     * The behavior caused by the options.selectionMode option varies by host:
+     * The behavior caused by the {@link Office.SelectionMode | options.selectionMode} option varies by host:
      *
-     * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
+     * In Excel: `Office.SelectionMode.Selected` selects all content in the binding, or named item. `Office.SelectionMode.None` for text bindings, 
+     * selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
      *
-     * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
+     * In PowerPoint: `Office.SelectionMode.Selected` selects the slide title or first textbox on the slide. 
+     * `Office.SelectionMode.None` doesn't select anything.
      *
-     * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
+     * In Word: `Office.SelectionMode.Selected` selects all content in the binding. `Office.SelectionMode.None` for text bindings, moves the cursor to 
+     * the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
      */
     interface GoToByIdOptions {
         /**
-         * Specifies whether the location specified by the id parameter is selected (highlighted). Use Office.SelectionMode or string equivalent. See the Remarks for more information.
+         * Specifies whether the location specified by the id parameter is selected (highlighted). 
+         * Use {@link Office.SelectionMode} or string equivalent. See the Remarks for more information.
          */
         selectionMode?: Office.SelectionMode | string
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -987,8 +1460,10 @@ declare namespace Office {
      */
     interface SetSelectedDataOptions {
         /**
-         * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. Example: [{cells: Office.Table.Data, format: {fontColor: "yellow"}},
-        {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]
+         * Use only with binding type table and when a TableData object is passed for the data parameter. An array of objects that specify a range of 
+         * columns, rows, or cells and specify, as key-value pairs, the cell formatting to apply to that range. 
+         * 
+         * Example: `[{cells: Office.Table.Data, format: {fontColor: "yellow"}}, {cells: {row: 3, column: 4}, format: {borderColor: "white", fontStyle: "bold"}}]`
          */
         cellFormat?: Array<RangeFormatConfiguration>
         /**
@@ -996,27 +1471,34 @@ declare namespace Office {
          */
         coercionType?: Office.CoercionType | string
         /**
-         * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. Example: {bandedRows: true,  filterButton: false}
+         * For an inserted table, a list of key-value pairs that specify table formatting options, such as header row, total row, and banded rows. 
+         * Example: `{bandedRows: true,  filterButton: false}`
          */
         tableOptions?: object
         /**
-        * This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+        * This option is applicable for inserting images. Indicates the insert location in relation to the top of the slide for PowerPoint, and its 
+        * relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
         */
         imageTop?: number
         /**
-        * This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+        * This option is applicable for inserting images. Indicates the image width. If this option is provided without the imageHeight, the image 
+        * will scale to match the value of the image width. If both image width and image height are provided, the image will be resized accordingly. 
+        * If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
         */
         imageWidth?: number
         /**
-        * This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
+        * This option is applicable for inserting images. Indicates the insert location in relation to the left side of the slide for PowerPoint, and 
+        * its relation to the currently selected cell in Excel. This value is ignored for Word. This value is in points.
         */
         imageLeft?: number
         /**
-        * This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
+        * This option is applicable for inserting images. Indicates the image height. If this option is provided without the imageWidth, the image 
+        * will scale to match the value of the image height. If both image width and image height are provided, the image will be resized accordingly. 
+        * If neither the image height or width is provided, the default image size and aspect ratio will be used. This value is in points.
         */
         imageHeight?: number
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
@@ -1029,17 +1511,35 @@ declare namespace Office {
          */
         overwriteIfStale?: boolean
         /**
-         * A user-defined item of any type that is returned, unchanged, in the value property of the AsyncResult object that is passed to a callback.
+         * A user-defined item of any type that is returned, unchanged, in the asyncContext property of the AsyncResult object that is passed to a callback.
          */
         asyncContext?: any
     }
     /**
      * Provides access to the properties for Office theme colors.
      *
-     * Using Office theme colors lets you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and task pane add-ins.
+     * Using Office theme colors lets you coordinate the color scheme of your add-in with the current Office theme selected by the user with File > 
+     * Office Account > Office Theme UI, which is applied across all Office host applications. Using Office theme colors is appropriate for mail and 
+     * task pane add-ins.
      *
      * @remarks
-     * Hosts: Excel, Outlook, Powerpoint, Project, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that these properties are supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td></tr>
+     *  </table>
      */
     interface OfficeTheme {
         /**
@@ -1060,11 +1560,11 @@ declare namespace Office {
         controlForegroundColor: string;
     }
     /**
-     * Dialog object returned as part of the displayDialogAsync callback. The object exposes methods for registering event handlers and closing the dialog
+     * The object that is returned when `UI.displayDialogAsync` is called. It exposes methods for registering event handlers and closing the dialog.
      */
-    interface DialogHandler {
+    interface Dialog {
         /**
-         * When called from an active add-in dialog, asynchronously closes the dialog.
+         * Called from a parent page to close the corresponding dialog box. 
          */
         close(): void;
         /**
@@ -1075,21 +1575,57 @@ declare namespace Office {
          * - DialogEventReceived. Triggered when the dialog box has been closed or otherwise unloaded.
          */
         addEventHandler(eventType: Office.EventType, handler: Function): void;
+        /**
+         * FOR INTERNAL USE ONLY. DO NOT CALL IN YOUR CODE.
+         */
+        sendMessage(name: string): void;
     }
 }
 
 declare namespace Office {
     /**
      * Returns a promise of an object described in the expression. Callback is invoked only if method fails.
+     * 
      * @param expression The object to be retrieved. Example "bindings#BindingName", retrieves a binding promise for a binding named 'BindingName'
-     * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+     * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+     * 
+     * @remarks
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this method.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
-    function select(expression: string, callback?: (result: AsyncResult) => void): Binding;
+    function select(expression: string, callback?: (result: AsyncResult<any>) => void): Binding;
     // Enumerations
     /**
      * Specifies the state of the active view of the document, for example, whether the user can edit the document.
      * @remarks
-     * Hosts: PowerPoint
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     enum ActiveView {
         /**
@@ -1104,7 +1640,22 @@ declare namespace Office {
     /**
      * Specifies the type of the binding object that should be returned.
      * @remarks
-     * Hosts: Access, Excel, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     enum BindingType {
         /**
@@ -1112,11 +1663,12 @@ declare namespace Office {
          */
         Text,
         /**
-         * Tabular data without a header row. Data is returned as an array of arrays, for example in this form: [[row1column1, row1column2],[row2column1, row2column2]]
+         * Tabular data without a header row. Data is returned as an array of arrays, for example in this form: 
+         * [[row1column1, row1column2],[row2column1, row2column2]]
          */
         Matrix,
         /**
-         * Tabular data with a header row. Data is returned as a TableData object.
+         * Tabular data with a header row. Data is returned as a {@link Office.TableData | TableData} object.
          */
         Table
     }
@@ -1124,58 +1676,96 @@ declare namespace Office {
      * Specifies how to coerce data returned or set by the invoked method.
      *
      * @remarks
-     * PowerPoint supports only Office.CoercionType.Text, Office.CoercionType.Image, and Office.CoercionType.SlideRange. Project supports only Office.CoercionType.Text.
-     *
-     * Hosts: Access, Excel, Outlook, PowerPoint, Project, Word
+     * PowerPoint supports only `Office.CoercionType.Text`, `Office.CoercionType.Image`, and `Office.CoercionType.SlideRange`.
+     * 
+     * Project supports only `Office.CoercionType.Text`.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th><th> OWA for Devices </th><th> Office for Mac </th></tr>
+     *   <tr><td><strong> Access     </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td><td> Y               </td><td> Y              </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td><td>                 </td><td>                </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td><td>                 </td><td>                </td></tr>
+     *  </table>
      */
     enum CoercionType {
         /**
-         * Return or set data as text (string).Data is returned or set as a one-dimensional run of characters.
+         * Return or set data as text (string). Data is returned or set as a one-dimensional run of characters.
          */
         Text,
         /**
-         * Return or set data as tabular data with no headers. Data is returned or set as an array of arrays containing one-dimensional runs of characters. For example, three rows of  string values in two columns would be: [["R1C1", "R1C2"], ["R2C1", "R2C2"], ["R3C1", "R3C2"]].
-         * @remarks
-         * Only applies to data in Excel and Word.
+         * Return or set data as tabular data with no headers. Data is returned or set as an array of arrays containing one-dimensional runs of 
+         * characters. For example, three rows of  string values in two columns would be: [["R1C1", "R1C2"], ["R2C1", "R2C2"], ["R3C1", "R3C2"]].
+         *
+         * Note: Only applies to data in Excel and Word.
          */
         Matrix,
         /**
          * Return or set data as tabular data with optional headers. Data is returned or set as an array of arrays with optional headers.
-         * @remarks
-         * Only applies to data in Access, Excel and Word.
+         * 
+         * Note: Only applies to data in Access, Excel, and Word.
          */
         Table,
         /**
          * Return or set data as HTML.
-         * @remarks
-         * Only applies to data in add-ins for Word and Outlook add-ins for Outlook (compose mode).
+         * 
+         * Note: Only applies to data in add-ins for Word and Outlook add-ins for Outlook (compose mode).
          */
         Html,
         /**
          * Return or set data as Office Open XML.
-         * @remarks
-         * Only applies to data in Word.
+         * 
+         * Note: Only applies to data in Word.
          */
         Ooxml,
         /**
-         * Return a JSON object that contains an array of the ids, titles, and indexes of the selected slides.For example,  {"slides":[{"id":257,"title":"Slide 2","index":2},{"id":256,"title":"Slide 1","index":1}]} for a selection of two slides.
-         * @remarks
-         * Only applies to data in PowerPoint when calling the Document.getSelectedData method to get the current slide or selected range of slides.
+         * Return a JSON object that contains an array of the ids, titles, and indexes of the selected slides. For example, 
+         * `{"slides":[{"id":257,"title":"Slide 2","index":2},{"id":256,"title":"Slide 1","index":1}]}` for a selection of two slides.
+         * 
+         * Note: Only applies to data in PowerPoint when calling the {@link Office.Document | Document}.getSelectedData method to get the current 
+         * slide or selected range of slides.
          */
         SlideRange,
         /**
         * Data is returned or set as an image stream.
-        * @remarks
-        * Only applies to data in Excel, Word and PowerPoint.
+        * Note: Only applies to data in Excel, Word and PowerPoint.
         */
         Image
     }
     /**
      * Specifies whether the document in the associated application is read-only or read-write.
+     * 
      * @remarks
-     * Returned by the mode property of the Document object.
-     *
-     * Hosts: Excel, PowerPoint, Project, Word
+     *  
+     * Returned by the mode property of the {@link Office.Document | Document} object.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum DocumentMode {
         /**
@@ -1191,9 +1781,21 @@ declare namespace Office {
      * Specifies the type of the XML node.
      *
      * @remarks
-     * Hosts: Word
+     * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
      * 
-     * Available in Requirement set: CustomXmlParts
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     enum CustomXMLNodeType {
         /**
@@ -1226,36 +1828,105 @@ declare namespace Office {
         Text,
     }
     /**
-     * Specifies the kind of event that was raised. Returned by the type property of an EventNameEventArgs object.
+     * Specifies the kind of event that was raised. Returned by the `type` property of an *EventArgs object.
+     * 
+     * Add-ins for Project support the `Office.EventType.ResourceSelectionChanged`, `Office.EventType.TaskSelectionChanged`, and 
+     * `Office.EventType.ViewSelectionChanged` event types.
+     * 
+     * <table>BindingDataChanged and BindingSelectionChanged hosts</td><td>Access, Excel, Word</td></tr></table>
      *
      * @remarks
-     * Add-ins for Project support the Office.EventType.ResourceSelectionChanged, Office.EventType.TaskSelectionChanged, and Office.EventType.ViewSelectionChanged event types.
-     *
-     * Hosts: Access, Excel, PowerPoint, Project, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Outlook    </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum EventType {
         /**
          * A Document.ActiveViewChanged event was raised.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this enumeration.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         ActiveViewChanged,
         /**
-         * Occurs when data within the binding is changed.
-         *
+         * Triggers when the appointment date or time of the selected series was changed in Outlook.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @beta
+         */
+        AppointmentTimeChanged,
+        /**
+         * Occurs when data within the binding is changed. 
+         * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. 
+         * The event handler receives an argument of type {@link Office.BindingDataChangedEventArgs}.
+         * 
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * To add an event handler for the BindingDataChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingDataChangedEventArgs.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this enumeration.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         BindingDataChanged,
         /**
-         * Occurs when the selection is changed within the binding.
-         *
+         * Occurs when the selection is changed within the binding. To add an event handler for the BindingSelectionChanged event of a binding, use 
+         * the addHandlerAsync method of the Binding object. The event handler receives an argument of type {@link Office.BindingSelectionChangedEventArgs}.
+         * 
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: BindingEvents
-         *
-         * To add an event handler for the BindingSelectionChanged event of a binding, use the addHandlerAsync method of the Binding object. The event handler receives an argument of type BindingSelectionChangedEventArgs.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this enumeration.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         BindingSelectionChanged,
         /**
@@ -1268,26 +1939,55 @@ declare namespace Office {
         DialogEventReceived,
         /**
          * Triggers when a document level selection happens
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this enumeration.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+         *  </table>
          */
         DocumentSelectionChanged,
         /**
-         * A Document.SelectionChanged event was raised.
+         * Triggers when the selected Outlook item was changed.
+         * 
+         * [Api set: Mailbox 1.1]
          */
         ItemChanged,
         /**
-         * Triggers when a customXmlPart node was deleted
+         * Triggers when a customXmlPart node was deleted.
          */
         NodeDeleted,
         /**
-         * Triggers when a customXmlPart node was inserted
+         * Triggers when a customXmlPart node was inserted.
          */
         NodeInserted,
         /**
-         * Triggers when a customXmlPart node was replaced
+         * Triggers when a customXmlPart node was replaced.
          */
         NodeReplaced,
         /**
-         * The recurrence pattern of the selected series has changed.
+         * Triggers when the recipient list of the selected item was changed in Outlook.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @beta
+         */
+        RecipientsChanged,
+        /**
+         * Triggers when the recurrence pattern of the selected series was changed in Outlook.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @beta
          */
         RecurrencePatternChanged,
         /**
@@ -1296,6 +1996,23 @@ declare namespace Office {
         ResourceSelectionChanged,
         /**
          * A Settings.settingsChanged event was raised.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         SettingsChanged,
         /**
@@ -1311,7 +2028,23 @@ declare namespace Office {
      * Specifies the format in which to return the document.
      *
      * @remarks
-     * Hosts: PowerPoint, Word
+     * FileType.Text is only supported in Word, FileType.Pdf is only supported in Word for Windows, Word for Mac, Word Online, and PowerPoint.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     enum FileType {
         /**
@@ -1319,7 +2052,7 @@ declare namespace Office {
          */
         Text,
         /**
-         * Returns the entire document (.pptx, .docx, or .xslx) in Office Open XML (OOXML) format as a byte array.
+         * Returns the entire document (.pptx, .docx, or .xlsx) in Office Open XML (OOXML) format as a byte array.
          */
         Compressed,
         /**
@@ -1331,7 +2064,22 @@ declare namespace Office {
      * Specifies whether filtering from the host application is applied when the data is retrieved.
      *
      * @remarks
-     * Hosts: Excel, Project, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum FilterType {
         /**
@@ -1347,32 +2095,107 @@ declare namespace Office {
      * Specifies the type of place or object to navigate to.
      *
      * @remarks
-     * Hosts: Excel, PowerPoint, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum GoToType {
         /**
          * Goes to a binding object using the specified binding id.
+         * 
+         * Supported hosts: Excel, Word
          */
         Binding,
         /**
          * Goes to a named item using that item's name.
          * In Excel, you can use any structured reference for a named range or table: "Worksheet2!Table1"
+         * 
+         * Supported hosts: Excel
          */
         NamedItem,
         /**
          * Goes to a slide using the specified id.
+         * 
+         * Supported hosts: PowerPoint
          */
         Slide,
         /**
-         * Goes to the specified index by slide number or Office.Index
+         * Goes to the specified index by slide number or {@link Office.Index}.
+         * 
+         * Supported hosts: PowerPoint
          */
         Index
     }
     /**
-     * Specifies whether to select (highlight) the location to navigate to (when using the Document.goToByIdAsync method).
+     * Specifies the relative PowerPoint slide.
+     * 
+     * @remarks
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
+     */
+    enum Index {
+        /**
+         * Represents the first PowerPoint slide
+         */
+        First,
+        /**
+         * Represents the last PowerPoint slide
+         */
+        Last,
+        /**
+         * Represents the next PowerPoint slide
+         */
+        Next,
+        /**
+         * Represents the previous PowerPoint slide
+         */
+        Previous
+    }
+    /**
+     * Specifies whether to select (highlight) the location to navigate to (when using the {@link Office.Document | Document}.goToByIdAsync method).
      *
      * @remarks
-     * Hosts: Excel, PowerPoint, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum SelectionMode {
         Default,
@@ -1381,7 +2204,7 @@ declare namespace Office {
          */
         Selected,
         /**
-         * The cursor is moved the beginning of the location.
+         * The cursor is moved to the beginning of the location.
          */
         None
     }
@@ -1389,9 +2212,25 @@ declare namespace Office {
      * Specifies whether values, such as numbers and dates, returned by the invoked method are returned with their formatting applied.
      *
      * @remarks
-     * For example, if the valueFormat parameter is specified as "formatted", a number formatted as currency, or a date formatted as mm/dd/yy in the host application will have its formatting preserved. If the valueFormat parameter is specified as "unformatted", a date will be returned in its underlying sequential serial number form.
-     *
-     * Hosts: Excel, Project, Word
+     * For example, if the valueFormat parameter is specified as "formatted", a number formatted as currency, or a date formatted as mm/dd/yy in the 
+     * host application will have its formatting preserved. If the valueFormat parameter is specified as "unformatted", a date will be returned in its 
+     * underlying sequential serial number form.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     enum ValueFormat {
         /**
@@ -1408,82 +2247,199 @@ declare namespace Office {
     * Represents a binding to a section of the document.
     *
     * @remarks
-    * Hosts: Access, Excel, Word
-    *
-    * Available in Requirement sets: MatrixBinding, TableBinding, TextBinding
+    * <table><tr><td>Requirement Sets</td><td>MatrixBinding, TableBinding, TextBinding</td></tr></table>
     *
     * The Binding object exposes the functionality possessed by all bindings regardless of type.
     *
-    * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: MatrixBinding, TableBinding, or TextBinding. All three of these objects inherit the getDataAsync and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- and table-specific features, such as counting the number of rows and columns.
+    * The Binding object is never called directly. It is the abstract parent class of the objects that represent each type of binding: 
+    * {@link Office.MatrixBinding}, {@link Office.TableBinding}, or {@link Office.TextBinding}. All three of these objects inherit the getDataAsync 
+    * and setDataAsync methods from the Binding object that enable to you interact with the data in the binding. They also inherit the id and type 
+    * properties for querying those property values. Additionally, the MatrixBinding and TableBinding objects expose additional methods for matrix- 
+    * and table-specific features, such as counting the number of rows and columns.
+    * 
+    * **Support details**
+    * 
+    * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+    * An empty cell indicates that the Office host application doesn't support this interface.
+    * 
+    * For more information about Office host application and server requirements, see 
+    * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+    * 
+    * *Supported hosts, by platform*
+    *  <table>
+    *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+    *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+    *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+    *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+    *  </table>
     */
     interface Binding {
+
+
         /**
         * Get the Document object associated with the binding.
-        *
-        * @remarks
-        * Hosts: Access, Excel, Word
         */
-        document: Document;
+        document: Office.Document;
         /**
-         * A string that uniquely identifies this binding among the bindings in the same Document object.
-         *
-         * @remarks
-         * Hosts: Access, Excel, Word
+         * A string that uniquely identifies this binding among the bindings in the same {@link Office.Document} object.
          */
         id: string;
         /**
         * Gets the type of the binding.
-        *
-        * @remarks
-        * Hosts: Access, Excel, Word
         */
-        type: BindingType;
+        type: Office.BindingType;
         /**
-         * Adds an event handler to the object for the specified event type.
+         * Adds an event handler to the object for the specified {@link Office.EventType}. Supported EventTypes are 
+         * `Office.EventType.BindingDataChanged` and `Office.EventType.BindingSelectionChanged`.
          *
          * @remarks
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          *
-         * @param eventType The event type. For example, for bindings, it can be **Office.EventType.BindingSelectionChanged**, **Office.EventType.BindingDataChanged**, or the corresponding text values of these enumerations.
-         * @param handler The event handler function to add.
+         * @param eventType The event type. For bindings, it can be `Office.EventType.BindingDataChanged` or `Office.EventType.BindingSelectionChanged`.
+         * @param handler The event handler function to add, whose only parameter is of type {@link Office.BindingDataChangedEventArgs} or {@link Office.BindingSelectionChangedEventArgs}.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: Office.AsyncResult<void>) => void): void;
         /**
          * Returns the data contained within the binding.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
          *
-         * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
-         *
-         * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
+         * When called from a MatrixBinding or TableBinding, the getDataAsync method will return a subset of the bound values if the optional startRow, 
+         * startColumn, rowCount, and columnCount parameters are specified (and they specify a contiguous and valid range).
          *
          * @param options Provides options for how to get the data in a binding.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the values in the specified binding. 
+         *                  If the `coercionType` parameter is specified (and the call is successful), the data is returned in the format described in the CoercionType enumeration topic.
          */
-        getDataAsync(options?: GetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
+        getDataAsync<T>(options?: GetBindingDataOptions, callback?: (result: AsyncResult<T>) => void): void;
         /**
          * Removes the specified handler from the binding for the specified event type.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
+         * <table><tr><td>Requirement Sets</td><td>BindingEvents</td></tr></table>
          *
-         * Available in Requirement set: BindingEvents
-         *
-         * @param eventType The event type. For binding can be 'bindingDataChanged' and 'bindingSelectionChanged'
+         * @param eventType The event type. For bindings, it can be `Office.EventType.BindingDataChanged` or `Office.EventType.BindingSelectionChanged`.
          * @param options Provides options to determine which event handler or handlers are removed.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Writes data to the bound section of the document represented by the specified binding object.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
          *
-         * Available in Requirement sets: MatrixBindings, TableBindings, TextBindings
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
+         * 
+         * The value passed for data contains the data to be written in the binding. The kind of value passed determines what will be written as 
+         * described in the following table.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>`data` value</th>
+         *     <th>Data written</th>
+         *   </tr>
+         *   <tr>
+         *     <td>A string</td>
+         *     <td>Plain text or anything that can be coerced to a string will be written.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>An array of arrays ("matrix")</td>
+         *     <td>Tabular data without headers will be written. For example, to write data to three rows in two columns, you can pass an array like this: `[["R1C1", "R1C2"], ["R2C1", "R2C2"], ["R3C1", "R3C2"]]`. To write a single column of three rows, pass an array like this: `[["R1C1"], ["R2C1"], ["R3C1"]]`.</td>
+         *   </tr>
+         *    <tr>
+         *     <td>An {@link Office.TableData} object</td>
+         *     <td>A table with headers will be written.</td>
+         *   </tr>
+         * </table>
+         * 
+         * Additionally, these application-specific actions apply when writing data to a binding. For Word, the specified data is written to the 
+         * binding as follows:
+         * 
+         * <table>
+         *   <tr>
+         *     <th>`data` value</th>
+         *     <th>Data written</th>
+         *   </tr>
+         *   <tr>
+         *     <td>A string</td>
+         *     <td>The specified text is written.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>An array of arrays ("matrix") or an {@link Office.TableData} object</td>
+         *     <td>A Word table is written.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>HTML</td>
+         *     <td>The specified HTML is written. If any of the HTML you write is invalid, Word will not raise an error. Word will write as much of the HTML as it can and will omit any invalid data.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office Open XML ("Open XML")</td>
+         *     <td>The specified the XML is written.</td>
+         *   </tr>
+         * </table>
+         * 
+         * For Excel, the specified data is written to the binding as follows:
+         * 
+         * <table>
+         *   <tr>
+         *     <th>`data` value</th>
+         *     <th>Data written</th>
+         *   </tr>
+         *   <tr>
+         *     <td>A string</td>
+         *     <td>The specified text is inserted as the value of the first bound cell.You can also specify a valid formula to add that formula to the bound cell. For example, setting  data to `"=SUM(A1:A5)"` will total the values in the specified range. However, when you set a formula on the bound cell, after doing so, you can't read the added formula (or any pre-existing formula) from the bound cell. If you call the Binding.getDataAsync method on the bound cell to read its data, the method can return only the data displayed in the cell (the formula's result).</td>
+         *   </tr>
+         *   <tr>
+         *     <td>An array of arrays ("matrix"), and the shape exactly matches the shape of the binding specified</td>
+         *     <td>The set of rows and columns are written.You can also specify an array of arrays that contain valid formulas to add them to the bound cells. For example, setting  data to `[["=SUM(A1:A5)","=AVERAGE(A1:A5)"]]` will add those two formulas to a binding that contains two cells. Just as when setting a formula on a single bound cell, you can't read the added formulas (or any pre-existing formulas) from the binding with the `Binding.getDataAsync` method - it returns only the data displayed in the bound cells.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>An {@link Office.TableData} object, and the shape of the table matches the bound table.</td>
+         *     <td>The specified set of rows and/or headers are written, if no other data in surrounding cells will be overwritten. Note: If you specify formulas in the TableData object you pass for the *data* parameter, you might not get the results you expect due to the "calculated columns" feature of Excel, which automatically duplicates formulas within a column. To work around this when you want to write *data* that contains formulas to a bound table, try specifying the data as an array of arrays (instead of a TableData object), and specify the *coercionType* as Microsoft.Office.Matrix or "matrix".</td>
+         *   </tr>
+         * </table>
+         * 
+         * For Excel Online:
+         * 
+         *  - The total number of cells in the value passed to the data parameter can't exceed 20,000 in a single call to this method.
+         * 
+         *  - The number of formatting groups passed to the cellFormat parameter can't exceed 100. 
+         * A single formatting group consists of a set of formatting applied to a specified range of cells.
+         * 
+         * In all other cases, an error is returned.
+         * 
+         * The setDataAsync method will write data in a subset of a table or matrix binding if the optional startRow and startColumn parameters are 
+         * specified, and they specify a valid range.
+         * 
+         * In the callback function passed to the setDataAsync method, you can use the properties of the AsyncResult object to return the following 
+         * information.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Always returns undefined because there is no object or data to retrieve.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
          *
          * @param data The data to be set in the current selection. Possible data types by host:
          *
@@ -1499,723 +2455,1649 @@ declare namespace Office {
          *
          * @param options Provides options for how to set the data in a binding.
          *
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        setDataAsync(data: TableData | any, options?: SetBindingDataOptions, callback?: (result: AsyncResult) => void): void;
+        setDataAsync(data: TableData | any, options?: SetBindingDataOptions, callback?: (result: AsyncResult<void>) => void): void;
     }
+
+    /**
+     * Provides information about the binding that raised the DataChanged event.
+     * 
+     * @remarks
+     * <table><tr><td>Hosts</td><td>Access, Excel, Word</td></tr></table>
+     */
+    interface BindingDataChangedEventArgs {
+        /**
+         * Gets an {@link Office.Binding} object that represents the binding that raised the DataChanged event.
+         */
+        binding: Binding;
+
+        /**
+         * Gets an {@link Office.EventType} enumeration value that identifies the kind of event that was raised.
+         */
+        type: EventType;
+    }
+
+    /**
+     * Provides information about the binding that raised the SelectionChanged event.
+     * 
+     * @remarks
+     * <table><tr><td>Hosts</td><td>Access, Excel, Word</td></tr></table>
+     */
+    interface BindingSelectionChangedEventArgs {
+        /**
+         * Gets an {@link Office.Binding} object that represents the binding that raised the SelectionChanged event.
+         */
+        binding: Binding;
+        /**
+         * Gets the number of columns selected. If a single cell is selected returns 1. 
+         * 
+         * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned. 
+         * 
+         * For Word, this property will work only for bindings of {@link Office.BindingType} "table". If the binding is of type "matrix", null is 
+         * returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property 
+         * to work correctly.
+         */
+        columnCount: number;
+        /**
+         * Gets the number of rows selected. If a single cell is selected returns 1. 
+         * 
+         * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned. 
+         * 
+         * For Word, this property will work only for bindings of {@link Office.BindingType} "table". If the binding is of type "matrix", null is 
+         * returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property 
+         * to work correctly.
+         */
+        rowCount: number;
+        /**
+         * The zero-based index of the first column of the selection counting from the leftmost column in the binding. 
+         * 
+         * If the user makes a non-contiguous selection, the coordinates for the last contiguous selection within the binding are returned. 
+         * 
+         * For Word, this property will work only for bindings of {@link Office.BindingType} "table". If the binding is of type "matrix", null is 
+         * returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property 
+         * to work correctly.
+         */
+        startColumn: number;
+        /**
+         * The zero-based index of the first row of the selection counting from the first row in the binding. 
+         * 
+         * If the user makes a non-contiguous selection, the coordinates for the last contiguous selection within the binding are returned. 
+         * 
+         * For Word, this property will work only for bindings of {@link Office.BindingType} "table". If the binding is of type "matrix", null is 
+         * returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property 
+         * to work correctly.
+         */
+        startRow: number;
+        /**
+         * Gets an {@link Office.EventType} enumeration value that identifies the kind of event that was raised.
+         */
+        type: EventType;
+    }
+
     /**
     * Represents the bindings the add-in has within the document.
-    *
-    * @remarks
-    * Hosts:
     */
     interface Bindings {
         /**
-        * Gets a Document object that represents the document associated with this set of bindings.
-        *
-        *remarks
-        * Hosts: Access, Excel, Word
-        */
+         * Gets an {@link Office.Document} object that represents the document associated with this set of bindings.
+         *
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this property.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
+         */
         document: Document;
         /**
          * Creates a binding against a named object in the document.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
          *
          * For Excel, the itemName parameter can refer to a named range or a table.
          *
-         * By default, adding a table in Excel assigns the name "Table1" for the first table you add, "Table2" for the second table you add, and so on. To assign a meaningful name for a table in the Excel UI, use the Table Name property on the Table Tools | Design tab of the ribbon.
+         * By default, adding a table in Excel assigns the name "Table1" for the first table you add, "Table2" for the second table you add, and so on. 
+         * To assign a meaningful name for a table in the Excel UI, use the Table Name property on the Table Tools | Design tab of the ribbon.
          *
-         *     Note: In Excel, when specifying a table as a named item, you must fully qualify the name to include the worksheet name in the name of the table in this format: "Sheet1!Table1"
+         *     Note: In Excel, when specifying a table as a named item, you must fully qualify the name to include the worksheet name in the name of 
+         * the table in this format: "Sheet1!Table1"
          *
-         * For Word, the itemName parameter refers to the Title property of a Rich Text content control. (You can't bind to content controls other than the Rich Text content control.)
+         * For Word, the itemName parameter refers to the Title property of a Rich Text content control. (You can't bind to content controls other 
+         * than the Rich Text content control).
          *
-         * By default, a content control has no Title value assigned. To assign a meaningful name in the Word UI, after inserting a Rich Text content control from the Controls group on the Developer tab of the ribbon, use the Properties command in the Controls group to display the Content Control Properties dialog box. Then set the Title property of the content control to the name you want to reference from your code.
+         * By default, a content control has no Title value assigned. To assign a meaningful name in the Word UI, after inserting a Rich Text content 
+         * control from the Controls group on the Developer tab of the ribbon, use the Properties command in the Controls group to display the Content 
+         * Control Properties dialog box. Then set the Title property of the content control to the name you want to reference from your code.
          *
-         *     Note: In Word, if there are multiple Rich Text content controls with the same Title property value (name), and you try to bind to one these content controls with this method (by specifying its name as the itemName parameter), the operation will fail.
+         *     Note: In Word, if there are multiple Rich Text content controls with the same Title property value (name), and you try to bind to one 
+         * these content controls with this method (by specifying its name as the itemName parameter), the operation will fail.
          *
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          * @param itemName Name of the bindable object in the document. For Example 'MyExpenses' table in Excel."
-         * @param bindingType The Office BindingType for the data. The method returns null if the selected object cannot be coerced into the specified type.
+         * @param bindingType The {@link Office.BindingType} for the data. The method returns null if the selected object cannot be coerced into the specified type.
          * @param options Provides options for configuring the binding that is created.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the Binding object that represents the specified named item.
          */
-        addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: AddBindingFromNamedItemOptions, callback?: (result: AsyncResult) => void): void;
+        addFromNamedItemAsync(itemName: string, bindingType: BindingType, options?: AddBindingFromNamedItemOptions, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Create a binding by prompting the user to make a selection on the document.
          *
          * @remarks
-         * Hosts: Access, Excel
+         * <table><tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
          *
-         * Available in Requirement set: Not in a set
+         * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. 
+         * The method fails if the specified selection cannot be bound.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
-         * Adds a binding object of the specified type to the Bindings collection, which will be identified with the supplied id. The method fails if the specified selection cannot be bound.
-         *
-         * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
+         * @param bindingType Specifies the type of the binding object to create. Required. 
+         *                    Returns null if the selected object cannot be coerced into the specified type.
          * @param options Provides options for configuring the prompt and identifying the binding that is created.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the Binding object that represents the selection specified by the user.
          */
-        addFromPromptAsync(bindingType: BindingType, options?: AddBindingFromPromptOptions, callback?: (result: AsyncResult) => void): void;
+        addFromPromptAsync(bindingType: BindingType, options?: AddBindingFromPromptOptions, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Create a binding based on the user's current selection.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
          *
          * Adds the specified type of binding object to the Bindings collection, which will be identified with the supplied id.
          *
-         * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter.If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and then call the addFromSelectionAsync method to reestablish the binding with a new type.
+         * Note In Excel, if you call the addFromSelectionAsync method passing in the Binding.id of an existing binding, the Binding.type of that 
+         * binding is used, and its type cannot be changed by specifying a different value for the bindingType parameter. 
+         * If you need to use an existing id and change the bindingType, call the Bindings.releaseByIdAsync method first to release the binding, and 
+         * then call the addFromSelectionAsync method to reestablish the binding with a new type.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
-         * @param bindingType Specifies the type of the binding object to create. Required. Returns null if the selected object cannot be coerced into the specified type.
+         * @param bindingType Specifies the type of the binding object to create. Required. 
+         *                    Returns null if the selected object cannot be coerced into the specified type.
          * @param options Provides options for configuring the prompt and identifying the binding that is created.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the Binding object that represents the selection specified by the user.
          */
-        addFromSelectionAsync(bindingType: BindingType, options?: AddBindingFromSelectionOptions, callback?: (result: AsyncResult) => void): void;
+        addFromSelectionAsync(bindingType: BindingType, options?: AddBindingFromSelectionOptions, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Gets all bindings that were previously created.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is an array that contains each binding created for the referenced Bindings object.
          */
-        getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAllAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Binding[]>) => void): void;
         /**
          * Retrieves a binding based on its Name
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: CustomXmlParts, MatrixBindings, TableBindings, TextBindings
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts, MatrixBindings, TableBindings, TextBindings</td></tr></table>
          *
          * Fails if the specified id does not exist.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param id Specifies the unique name of the binding object. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the Binding object specified by the id in the call.
           */
-        getByIdAsync(id: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Binding>) => void): void;
         /**
          * Removes the binding from the document
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: MatrixBindings, TableBindings, TextBindings
+         * <table><tr><td>Requirement Sets</td><td>MatrixBindings, TableBindings, TextBindings</td></tr></table>
          *
          * Fails if the specified id does not exist.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param id Specifies the unique name to be used to identify the binding object. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        releaseByIdAsync(id: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        releaseByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
      * Represents an XML node in a tree in a document.
      *
      * @remarks
-     * Hosts: Word
-     *
-     * Available in Requirement set: CustomXmlParts
+     * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     interface CustomXmlNode {
         /**
          * Gets the base name of the node without the namespace prefix, if one exists.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          */
         baseName: string;
         /**
          * Retrieves the string GUID of the CustomXMLPart.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          */
         namespaceUri: string;
         /**
          * Gets the type of the CustomXMLNode.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          */
         nodeType: string;
         /**
          * Gets the nodes associated with the XPath expression.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param xPath The XPath expression that specifies the nodes to get. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is an array of CustomXmlNode objects that represent the nodes specified by the XPath expression passed to the `xPath` parameter.
          */
-        getNodesAsync(xPath: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getNodesAsync(xPath: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
         /**
          * Gets the node value.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a string that contains the value of the referenced node.
          */
-        getNodeValueAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getNodeValueAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the text of an XML node in a custom XML part.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a string that contains the inner text of the referenced nodes.
          */
-        getTextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getTextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the node's XML.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a string that contains the XML of the referenced node.
          */
-        getXmlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getXmlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Sets the node value.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param value The value to be set on the node
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        setNodeValueAsync(value: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setNodeValueAsync(value: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously sets the text of an XML node in a custom XML part.
          *
          * @remarks
-         * Hosts: Word
+         * <table><tr><td>Hosts</td><td>Word</td></tr>
          *
-         * Available in Requirement set: CustomXmlParts
+         * <tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param text Required. The text value of the XML node.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        setTextAsync(text: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setTextAsync(text: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets the node XML.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
          *
          * @param xml The XML to be set on the node
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        setXmlAsync(xml: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setXmlAsync(xml: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
-     * Represents a single CustomXMLPart in a CustomXMLParts collection.
+     * Represents a single CustomXMLPart in an {@link Office.CustomXmlParts} collection.
      *
      * @remarks
-     * Hosts: Word
-     *
-     * Available in Requirement set: CustomXmlParts
+     * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     interface CustomXmlPart {
         /**
          * True, if the custom XML part is built in; otherwise false.
-         *
-         * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
          */
         builtIn: boolean;
         /**
          * Gets the GUID of the CustomXMLPart.
-         *
-         * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
          */
         id: string;
         /**
-         * Gets the set of namespace prefix mappings (CustomXMLPrefixMappings) used against the current CustomXMLPart.
-         *
-         * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
+         * Gets the set of namespace prefix mappings ({@link Office.CustomXmlPrefixMappings}) used against the current CustomXmlPart.
          */
         namespaceManager: CustomXmlPrefixMappings;
+
         /**
          * Adds an event handler to the object using the specified event type.
          *
          * @remarks
-         * Hosts: Word
          *
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
          *
-         * @param eventType Specifies the type of event to add. Required. For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
-         * @param handler The event handler function to add, whose only parameter is of type NodeDeletedEventArgs, NodeInsertedEventArgs, or NodeReplaceEventArgs. Required.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback..
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param eventType Specifies the type of event to add. For a CustomXmlPart object, the eventType parameter can be specified as 
+         *                  `Office.EventType.NodeDeleted`, `Office.EventType.NodeInserted`, and `Office.EventType.NodeReplaced`.
+         * @param handler The event handler function to add, whose only parameter is of type {@link Office.NodeDeletedEventArgs}, 
+         *                {@link Office.NodeInsertedEventArgs}, or {@link Office.NodeReplacedEventArgs}
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        addHandlerAsync(eventType: EventType, handler: (result: any) => void, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: Office.EventType, handler: (result: any) => void, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Deletes the Custom XML Part.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        deleteAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        deleteAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously gets any CustomXmlNodes in this custom XML part which match the specified XPath.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
          *
          * @param xPath An XPath expression that specifies the nodes you want returned. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is an array of CustomXmlNode objects that represent the nodes specified by the XPath expression passed to the xPath parameter.
         */
-        getNodesAsync(xPath: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getNodesAsync(xPath: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlNode[]>) => void): void;
         /**
          * Asynchronously gets the XML inside this custom XML part.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a string that contains the XML of the referenced CustomXmlPart object.
         */
-        getXmlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getXmlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Removes an event handler for the specified event type.
          *
          * @remarks
-         * Hosts: Word
          *
-         * Available in Requirement set: CustomXmlParts
-         *
-         * @param eventType Specifies the type of event to remove. Required.For a CustomXmlPart object event, the eventType parameter can be specified as Office.EventType.DataNodeDeleted, Office.EventType.DataNodeInserted, Office.EventType.DataNodeReplaced, or the corresponding text values of these enumerations.
+         * @param eventType Specifies the type of event to remove. For a CustomXmlPart object, the eventType parameter can be specified as 
+         *                  `Office.EventType.NodeDeleted`, `Office.EventType.NodeInserted`, and `Office.EventType.NodeReplaced`.
+         * @param handler The name of the handler to remove.
          * @param options Provides options to determine which event handler or handlers are removed.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        removeHandlerAsync(eventType: EventType, handler?: (result: any) => void, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: Office.EventType, handler?: (result: any) => void, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
     }
+
+    /**
+     * Provides information about the deleted node that raised the nodeDeleted event.
+     * 
+     * @remarks
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
+     */
+    interface NodeDeletedEventArgs {
+        /**
+         * Gets whether the node was deleted as part of an Undo/Redo action by the user.
+         */
+        isUndoRedo: boolean;
+        /**
+         * Gets the former next sibling of the node that was just deleted from the {@link Office.CustomXmlPart} object.
+         */
+        oldNextSibling: CustomXmlNode;
+        /**
+         * Gets the node which was just deleted from the {@link Office.CustomXmlPart} object.
+         * 
+         * Note that this node may have children, if a subtree is being removed from the document. Also, this node will be a "disconnected" node in 
+         * that you can query down from the node, but you cannot query up the tree - the node appears to exist alone.
+         */
+        oldNode: CustomXmlNode;
+    }
+
+    /**
+     * Provides information about the inserted node that raised the nodeInserted event.
+     * 
+     * @remarks
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
+     */
+    interface NodeInsertedEventArgs  {
+        /**
+         * Gets whether the node was inserted as part of an Undo/Redo action by the user.
+         */
+        isUndoRedo: boolean;
+        /**
+         * Gets the node that was just added to the CustomXMLPart object.
+         * 
+         * Note that this node may have children, if a subtree was just added to the document.
+         */
+        newNode: CustomXmlNode;
+    }
+    
+    /**
+     * Provides information about the replaced node that raised the nodeReplaced event.
+     * 
+     * @remarks
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
+     */
+    interface NodeReplacedEventArgs  {
+        /**
+         * Gets whether the replaced node was inserted as part of an undo or redo operation by the user.
+         */
+        isUndoRedo: boolean;
+        /**
+         * Gets the node that was just added to the CustomXMLPart object.
+         * 
+         * Note that this node may have children, if a subtree was just added to the document.
+         */
+        newNode: CustomXmlNode;
+        /**
+         * Gets the node which was just deleted (replaced) from the CustomXmlPart object.
+         * 
+         * Note that this node may have children, if a subtree is being removed from the document. Also, this node will be a "disconnected" node in 
+         * that you can query down from the node, but you cannot query up the tree - the node appears to exist alone.
+         */
+        oldNode: CustomXmlNode;
+    }
+
     /**
      * Represents a collection of CustomXmlPart objects.
      *
      * @remarks
-     * Hosts: Word
-     *
-     * Available in Requirement set: CustomXmlParts
+     * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     interface CustomXmlParts {
         /**
          * Asynchronously adds a new custom XML part to a file.
          *
-         * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
-         *
          * @param xml The XML to add to the newly created custom XML part.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the newly created CustomXmlPart object.
          */
-        addAsync(xml: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addAsync(xml: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
         /**
          * Asynchronously gets the specified custom XML part by its id.
          *
-         * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
-         *
          * @param id The GUID of the custom XML part, including opening and closing braces.
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback..
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a CustomXmlPart object that represents the specified custom XML part.
+         *                  If there is no custom XML part with the specified id, the method returns null.
          */
-        getByIdAsync(id: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getByIdAsync(id: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart>) => void): void;
         /**
          * Asynchronously gets the specified custom XML part(s) by its namespace.
          *
-         * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
-         *
          * @param ns  The namespace URI.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is an array of CustomXmlPart objects that match the specified namespace.
         */
-        getByNamespaceAsync(ns: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getByNamespaceAsync(ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<CustomXmlPart[]>) => void): void;
     }
     /**
      * Represents a collection of CustomXmlPart objects.
      *
      * @remarks
-     * Hosts: Word
+     *
+     * <table><tr><td>Requirement Sets</td><td>CustomXmlParts</td></tr></table>
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+     *  </table>
      */
     interface CustomXmlPrefixMappings {
         /**
          * Asynchronously adds a prefix to namespace mapping to use when querying an item.
          *
          * @remarks
-         * Hosts: Word
-         *
-         * Available in Requirement set: CustomXmlParts
-         *
          * If no namespace is assigned to the requested prefix, the method returns an empty string ("").
          *
          * @param prefix Specifies the prefix to add to the prefix mapping list. Required.
          * @param ns Specifies the namespace URI to assign to the newly added prefix. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        addNamespaceAsync(prefix: string, ns: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addNamespaceAsync(prefix: string, ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously gets the namespace mapped to the specified prefix.
          *
          * @remarks
-         * Hosts: Word
          *
-         * Available in Requirement set: CustomXmlParts
-         *
-         * If the prefix already exists in the namespace manager, this method will overwrite the mapping of that prefix except when the prefix is one added or used by the data store internally, in which case it will return an error.
+         * If the prefix already exists in the namespace manager, this method will overwrite the mapping of that prefix except when the prefix is one 
+         * added or used by the data store internally, in which case it will return an error.
          *
          * @param prefix TSpecifies the prefix to get the namespace for. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a string that contains the namespace mapped to the specified prefix.
          */
-        getNamespaceAsync(prefix: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getNamespaceAsync(prefix: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Asynchronously gets the prefix for the specified namespace.
          *
          * @remarks
-         * Hosts: Word
          *
-         * Available in Requirement set: CustomXmlParts
-         *
-         * If no prefix is assigned to the requested namespace, the method returns an empty string (""). If there are multiple prefixes specified in the namespace manager, the method returns the first prefix that matches the supplied namespace.
+         * If no prefix is assigned to the requested namespace, the method returns an empty string (""). If there are multiple prefixes specified in 
+         * the namespace manager, the method returns the first prefix that matches the supplied namespace.
          *
          * @param ns Specifies the namespace to get the prefix for. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is a string that contains the prefix of the specified namespace.
         */
-        getPrefixAsync(ns: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getPrefixAsync(ns: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
     }
     /**
      * An abstract class that represents the document the add-in is interacting with.
      *
      * @remarks
-     * Hosts: Access, Excel, PowerPoint, Project, Word
+     * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr></table>
      */
     interface Document {
         /**
          * Gets an object that provides access to the bindings defined in the document.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current document or worksheet, use Office.context.document in your script.
+         * You don't instantiate the Document object directly in your script. To call members of the Document object to interact with the current 
+         * document or worksheet, use `Office.context.document` in your script.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this property.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         bindings: Bindings;
         /**
          * Gets an object that represents the custom XML parts in the document.
          *
          * @remarks
-         * Hosts: Word
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this property.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *  </table>
          */
         customXmlParts: CustomXmlParts;
         /**
          * Gets the mode the document is in.
          *
          * @remarks
-         * Hosts: Word
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this property.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         mode: DocumentMode;
         /**
          * Gets an object that represents the saved custom settings of the content or task pane add-in for the current document.
          *
          * @remarks
-         * Hosts: Word
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this property.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         settings: Settings;
         /**
          * Gets the URL of the document that the host application currently has open. Returns null if the URL is unavailable.
          *
          * @remarks
-         * Hosts: Word
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this property.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          */
         url: string;
         /**
          * Adds an event handler for a Document object event.
          *
          * @remarks
-         * Hosts: Excel, PowerPoint, Project, Word
-         *
-         * Available in Requirement set: DocumentEvents
+         * <table><tr><td>Requirement Sets</td><td>DocumentEvents</td></tr></table>
          *
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
-         * @param eventType For a Document object event, the eventType parameter can be specified as Office.EventType.Document.SelectionChanged or Office.EventType.Document.ActiveViewChanged, or the corresponding text value of this enumeration.
-         * @param handler The event handler function to add, whose only parameter is of type DocumentSelectionChangedEventArgs. Required.
+         * @param eventType For a Document object event, the eventType parameter can be specified as `Office.EventType.Document.SelectionChanged` or 
+         *                  `Office.EventType.Document.ActiveViewChanged`, or the corresponding text value of this enumeration.
+         * @param handler The event handler function to add, whose only parameter is of type {@link Office.DocumentSelectionChangedEventArgs}. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Returns the state of the current view of the presentation (edit or read).
          *
          * @remarks
-         * Hosts: Excel, PowerPoint, Word
-         *
-         * Available in Requirement set: ActiveView
+         * <table><tr><td>Requirement Sets</td><td>ActiveView</td></tr></table>
          *
          * Can trigger an event when the view changes.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td>                            </td><td>                            </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td>                            </td><td>                            </td><td> Y               </td></tr>
+         *  </table>
          *
-         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback..
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the state of the presentation's current view. 
+         *                  The value returned can be either "edit" or "read". "edit" corresponds to any of the views in which you can edit slides, 
+         *                  such as Normal or Outline View. "read" corresponds to either Slide Show or Reading View.
         */
-        getActiveViewAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getActiveViewAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<"edit" | "read">) => void): void;
         /**
-         * Returns the entire document file in slices of up to 4194304 bytes (4 MB). For add-ins for iOS, file slice is supported up to 65536 (64 KB). Note that specifying file slice size of above permitted limit will result in an "Internal Error" failure.
+         * Returns the entire document file in slices of up to 4194304 bytes (4 MB). For add-ins for iOS, file slice is supported up to 65536 (64 KB). 
+         * Note that specifying file slice size of above permitted limit will result in an "Internal Error" failure.
          *
          * @remarks
-         * Hosts: Excel, PowerPoint, Word
+         * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
          *
-         * Available in Requirement set: File
+         * For add-ins running in Office host applications other than Office for iOS, the getFileAsync method supports getting files in slices of up 
+         * to 4194304 bytes (4 MB). For add-ins running in Office for iOS apps, the getFileAsync method supports getting files in slices of up to 
+         * 65536 (64 KB).
          *
-         * For add-ins running in Office host applications other than Office for iOS, the getFileAsync method supports getting files in slices of up to 4194304 bytes (4 MB). For add-ins running in Office for iOS apps, the getFileAsync method supports getting files in slices of up to 65536 (64 KB).
+         * The fileType parameter can be specified by using the {@link Office.FileType} enumeration or text values. But the possible values vary with 
+         * the host:
          *
-         * The fileType parameter can be specified by using the FileType enumeration or text values. But the possible values vary with the host:
+         * Excel Online, Win32, Mac, and iOS: `Office.FileType.Compressed`
          *
-         * Excel Online, Win32, Mac, and iOS: Office.FileType.Compressed
+         * PowerPoint on Windows desktop, Mac, and iPad, and PowerPoint Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`
          *
-         * PowerPoint on Windows desktop, Mac, and iPad, and PowerPoint Online: Office.FileType.Compressed, Office.FileType.Pdf
+         * Word on Windows desktop, Word on Mac, and Word Online: `Office.FileType.Compressed`, `Office.FileType.Pdf`, `Office.FileType.Text`
          *
-         * Word on Windows desktop, Word on Mac, and Word Online: Office.FileType.Compressed, Office.FileType.Pdf, Office.FileType.Text
-         *
-         * Word on iPad: Office.FileType.Compressed, Office.FileType.Text
+         * Word on iPad: `Office.FileType.Compressed`, `Office.FileType.Text`
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td>                            </td><td>                 </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param fileType The format in which the file will be returned
          * @param options Provides options for setting the size of slices that the document will be divided into.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the File object.
          */
-        getFileAsync(fileType: FileType, options?: GetFileOptions, callback?: (result: AsyncResult) => void): void;
+        getFileAsync(fileType: FileType, options?: GetFileOptions, callback?: (result: AsyncResult<Office.File>) => void): void;
         /**
          * Gets file properties of the current document.
          *
          * @remarks
-         * Hosts: Excel, PowerPoint, Word
+         * <table><tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
          *
-         * Available in Requirement set: not in a set
-         *
-         * You get the file's URL with the url property ( asyncResult.value.url).
+         * You get the file's URL with the url property `asyncResult.value.url`.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the file's properties (with the URL found at `asyncResult.value.url`).
         */
-        getFilePropertiesAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getFilePropertiesAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.FileProperties>) => void): void;
         /**
          * Reads the data contained in the current selection in the document.
          *
          * @remarks
-         * Hosts: Access, Excel, PowerPoint, Project, Word
-         *
-         * Available in Requirement set: Selection
-         *
-         * The possible values for the coercionType parameter vary by the host:
-         *
-         * Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online only: Office.CoercionType.Text (string)
-         *
-         * Excel, Word, and Word Online only: Office.CoercionType.Matrix (array of arrays)
-         *
-         * Access, Excel, Word, and Word Online only: Office.CoercionType.Table (TableData object)
-         *
-         * Word only: Office.CoercionType.Html
-         *
-         * Word and Word Online only: Office.CoercionType.Ooxml (Office Open XML)
-         *
-         * PowerPoint and PowerPoint Online only: Office.CoercionType.SlideRange
-         *
-         * @param coercionType The type of data structure to return.
+         * <table><tr><td>Requirement Sets</td><td>Selection</td></tr></table>
+         * 
+         * In the callback function that is passed to the getSelectedDataAsync method, you can use the properties of the AsyncResult object to return 
+         * the following information.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Always returns undefined because there is no object or data to retrieve.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
+         * 
+         * The possible values for the {@link Office.CoercionType} parameter vary by the host. 
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Host</th>
+         *     <th>Supported coercionType</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online</td>
+         *     <td>`Office.CoercionType.Text` (string)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, Word, and Word Online</td>
+         *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Access, Excel, Word, and Word Online</td>
+         *     <td>`Office.CoercionType.Table` (TableData object)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Html`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word and Word Online </td>
+         *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PowerPoint and PowerPoint Online</td>
+         *     <td>`Office.CoercionType.SlideRange`</td>
+         *   </tr>
+         * </table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *  </table>
+         * 
+         * @param coercionType The type of data structure to return. See the remarks section for each host's supported coercion types.
+         * 
          * @param options Provides options for customizing what data is returned and how it is formatted.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * 
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the data in the current selection. 
+         *                  This is returned in the data structure or format you specified with the coercionType parameter. 
+         *                  (See Remarks for more information about data coercion.)
          */
-        getSelectedDataAsync(coercionType: CoercionType, options?: GetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
+        getSelectedDataAsync<T>(coerciontype: Office.CoercionType, options?: GetSelectedDataOptions, callback?: (result: AsyncResult<T>) => void): void;
         /**
          * Goes to the specified object or location in the document.
          *
          * @remarks
-         * Hosts: Excel, PowerPoint, Word
-         *
-         * Available in Requirement set: not in a set
+         * <table><tr><td>Requirement Sets</td><td>not in a set</td></tr></table>
          *
          * PowerPoint doesn't support the goToByIdAsync method in Master Views.
          *
          * The behavior caused by the selectionMode option varies by host:
          *
-         * In Excel: Office.SelectionMode.Selected selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
+         * In Excel: `Office.SelectionMode.Selected` selects all content in the binding, or named item. Office.SelectionMode.None for text bindings, 
+         * selects the cell; for matrix bindings, table bindings, and named items, selects the first data cell (not first cell in header row for tables).
          *
-         * In PowerPoint: Office.SelectionMode.Selected selects the slide title or first textbox on the slide. Office.SelectionMode.None Doesn't select anything.
+         * In PowerPoint: `Office.SelectionMode.Selected` selects the slide title or first textbox on the slide. 
+         * `Office.SelectionMode.None` doesn't select anything.
          *
-         * In Word: Office.SelectionMode.Selected selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
+         * In Word: `Office.SelectionMode.Selected` selects all content in the binding. Office.SelectionMode.None for text bindings, moves the cursor 
+         * to the beginning of the text; for matrix bindings and table bindings, selects the first data cell (not first cell in header row for tables).
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param id The identifier of the object or location to go to.
          * @param goToType The type of the location to go to.
          * @param options Provides options for whether to select the location that is navigated to.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the current view.
          */
-        goToByIdAsync(id: string | number, goToType: GoToType, options?: GoToByIdOptions, callback?: (result: AsyncResult) => void): void;
+        goToByIdAsync(id: string | number, goToType: GoToType, options?: GoToByIdOptions, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Removes an event handler for the specified event type.
          *
          * @remarks
-         * Hosts: Excel, PowerPoint, Project, Word
-         *
-         * Available in Requirement set: DocumentEvents
+         * <table><tr><td>Requirement Sets</td><td>DocumentEvents</td></tr></table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param eventType The event type. For document can be 'Document.SelectionChanged' or 'Document.ActiveViewChanged'.
-         * @param options Provides options to determine which event handler or handlers are removed.         *
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param options Provides options to determine which event handler or handlers are removed.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Writes the specified data into the current selection.
          *
          * @remarks
-         * Hosts: Access, Excel, PowerPoint, Project, Word, Word Online
-         *
-         * Available in Requirement set: Selection
-         *
-         * The possible CoercionTypes that can be used for the data parameter, or for the coercionType option, vary by host:
-         *
-         * Office.CoercionType.Text: Excel, Word, PowerPoint
-         *
-         * Office.CoercionType.Matrix: Excel, Word
-         *
-         * Office.CoercionType.Table: Access, Excel, Word
-         *
-         * Office.CoercionType.Html: Word
-         *
-         * Office.CoercionType.Ooxml: Word
-         *
-         * Office.CoercionType.Image: Excel, Word, PowerPoint
-         *
-         * @param data The data to be set. Either a string or CoercionType value, 2d array or TableData object.
+         * <table><tr><td>Requirement Sets</td><td>Selection</td></tr></table>
+         * 
+         * **Application-specific behaviors**
+         * 
+         * The following application-specific actions apply when writing data to a selection.
+         * 
+         * <table>
+         * <tr><td>Word</td><td>If there is no selection and the insertion point is at a valid location, the specified `data` is inserted at the insertion point</td><td>If `data` is a string, the specified text is inserted.</td></tr>
+         * <tr><td></td><td></td><td>If `data` is an array of arrays ("matrix") or a TableData object, a new Word table is inserted.</td></tr>
+         * <tr><td></td><td></td><td>If `data` is HTML, the specified HTML is inserted. (Important: If any of the HTML you insert is invalid, Word won't raise an error. Word will insert as much of the HTML as it can and omits any invalid data).</td></tr>
+         * <tr><td></td><td></td><td>If `data` is Office Open XML, the specified XML is inserted.</td></tr>
+         * <tr><td></td><td></td><td>If `data` is a base64 encoded image stream, the specified image is inserted.</td></tr></td></tr>
+         * <tr><td></td><td>If there is a selection</td><td>It will be replaced with the specified `data` following the same rules as above.</td></tr>
+         * <tr><td></td><td>Insert images</td><td>Inserted images are placed inline. The imageLeft and imageTop parameters are ignored. The image aspect ratio is always locked. If only one of the imageWidth and imageHeight parameter is given, the other value will be automatically scaled to keep the original aspect ratio.</td></tr>
+         * 
+         * <tr><td>Excel</td><td>If a single cell is selected</td><td>If `data` is a string, the specified text is inserted as the value of the current cell.</td></tr>
+         * <tr><td></td><td></td><td>If `data` is an array of arrays ("matrix"), the specified set of rows and columns are inserted, if no other data in surrounding cells will be overwritten.</td></tr>
+         * <tr><td></td><td></td><td>If `data` is a TableData object, a new Excel table with the specified set of rows and headers is inserted, if no other data in surrounding cells will be overwritten.</td></tr>
+         * <tr><td></td><td>If multiple cells are selected</td><td>If the shape does not match the shape of `data`, an error is returned.</td></tr>
+         * <tr><td></td><td></td><td>If the shape of the selection exactly matches the shape of `data`, the values of the selected cells are updated based on the values in `data`.</td></tr>
+         * <tr><td></td><td>Insert images</td><td>Inserted images are floating. The position imageLeft and imageTop parameters are relative to currently selected cell(s). Negative imageLeft and imageTop values are allowed and possibly readjusted by Excel to position the image inside a worksheet. Image aspect ratio is locked unless both imageWidth and imageHeight parameters are provided. If only one of the imageWidth and imageHeight parameter is given, the other value will be automatically scaled to keep the original aspect ratio.</td></tr>
+         * <tr><td></td><td>All other cases</td><td>An error is returned.</td></tr>
+         * 
+         * <tr><td>Excel Online</td><td>In addition to the behaviors described for Excel above, these limits apply when writing data in Excel Online</td><td>The total number of cells you can write to a worksheet with the `data` parameter can't exceed 20,000 in a single call to this method.</td></tr>
+         * <tr><td></td><td></td><td>The number of formatting groups passed to the `cellFormat` parameter can't exceed 100. A single formatting group consists of a set of formatting applied to a specified range of cells.</td></tr>
+         * 
+         * <tr><td>PowerPoint</td><td>Insert image</td><td>Inserted images are floating. The position imageLeft and imageTop parameters are optional but if provided, both should be present. If a single value is provided, it will be ignored. Negative imageLeft and imageTop values are allowed and can position an image outside of a slide. If no optional parameter is given and slide has a placeholder, the image will replace the placeholder in the slide. Image aspect ratio will be locked unless both imageWidth and imageHeight parameters are provided. If only one of the imageWidth and imageHeight parameter is given, the other value will be automatically scaled to keep the original aspect ratio.</td></tr>
+         * </table>
+         * 
+         * The possible values for the {@link Office.CoercionType} parameter vary by the host. 
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Host</th>
+         *     <th>Supported coercionType</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, Excel Online, PowerPoint, PowerPoint Online, Word, and Word Online</td>
+         *     <td>`Office.CoercionType.Text` (string)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Excel, Word, and Word Online</td>
+         *     <td>`Office.CoercionType.Matrix` (array of arrays)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Access, Excel, Word, and Word Online</td>
+         *     <td>`Office.CoercionType.Table` (TableData object)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word</td>
+         *     <td>`Office.CoercionType.Html`</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Word and Word Online </td>
+         *     <td>`Office.CoercionType.Ooxml` (Office Open XML)</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PowerPoint and PowerPoint Online</td>
+         *     <td>`Office.CoercionType.SlideRange`</td>
+         *   </tr>
+         * </table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td> y                          </td><td>                            </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
+         * 
+         * @param data The data to be set. Either a string or  {@link Office.CoercionType} value, 2d array or TableData object.
+         * 
+         * If the value passed for `data` is:
+         * 
+         * - A string: Plain text or anything that can be coerced to a string will be inserted. 
+         * In Excel, you can also specify data as a valid formula to add that formula to the selected cell. For example, setting data to "=SUM(A1:A5)" 
+         * will total the values in the specified range. However, when you set a formula on the bound cell, after doing so, you can't read the added 
+         * formula (or any pre-existing formula) from the bound cell. If you call the Document.getSelectedDataAsync method on the selected cell to 
+         * read its data, the method can return only the data displayed in the cell (the formula's result).
+         * 
+         * - An array of arrays ("matrix"): Tabular data without headers will be inserted. For example, to write data to three rows in two columns, 
+         * you can pass an array like this: [["R1C1", "R1C2"], ["R2C1", "R2C2"], ["R3C1", "R3C2"]]. To write a single column of three rows, pass an 
+         * array like this: [["R1C1"], ["R2C1"], ["R3C1"]]
+         * 
+         * In Excel, you can also specify data as an array of arrays that contains valid formulas to add them to the selected cells. For example if no 
+         * other data will be overwritten, setting data to [["=SUM(A1:A5)","=AVERAGE(A1:A5)"]] will add those two formulas to the selection. Just as 
+         * when setting a formula on a single cell as "text", you can't read the added formulas (or any pre-existing formulas) after they have been 
+         * set - you can only read the formulas' results.
+         * 
+         * - A TableData object: A table with headers will be inserted.
+         * In Excel, if you specify formulas in the TableData object you pass for the data parameter, you might not get the results you expect due to 
+         * the "calculated columns" feature of Excel, which automatically duplicates formulas within a column. To work around this when you want to 
+         * write `data` that contains formulas to a selected table, try specifying the data as an array of arrays (instead of a TableData object), and 
+         * specify the coercionType as Microsoft.Office.Matrix or "matrix".
+         * 
          * @param options Provides options for how to insert data to the selection.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The AsyncResult.value property always returns undefined because there is no object or data to retrieve.
          */
-        setSelectedDataAsync(data: string | TableData | any[][], options?: SetSelectedDataOptions, callback?: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string | TableData | any[][], options?: SetSelectedDataOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Project documents only. Get Project field (Ex. ProjectWebAccessURL).
          * @param fieldId Project level fields.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result contains the `fieldValue` property, which represents the value of the specified field.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getProjectFieldAsync(fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getProjectFieldAsync(fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get resource field for provided resource Id. (Ex.ResourceName)
          * @param resourceId Either a string or value of the Resource Id.
          * @param fieldId Resource Fields.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the GUID of the resource as a string.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getResourceFieldAsync(resourceId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getResourceFieldAsync(resourceId: string, fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected Resource's Id.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the GUID of the resource as a string.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getSelectedResourceAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getSelectedResourceAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected Task's Id.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the GUID of the resource as a string.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getSelectedTaskAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getSelectedTaskAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Project documents only. Get the current selected View Type (Ex. Gantt) and View Name.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result contains the following properties:
+         *                  `viewName` - The name of the view, as a ProjectViewTypes constant.
+         *                  `viewType` - The type of view, as the integer value of a ProjectViewTypes constant.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getSelectedViewAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getSelectedViewAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get the Task Name, WSS Task Id, and ResourceNames for given taskId.
          * @param taskId Either a string or value of the Task Id.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result contains the following properties:
+         *                  `taskName` - The name of the task.
+         *                  `wssTaskId` - The ID of the task in the synchronized SharePoint task list. If the project is not synchronized with a SharePoint task list, the value is 0.
+         *                  `resourceNames` - The comma-separated list of the names of resources that are assigned to the task.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getTaskAsync(taskId: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getTaskAsync(taskId: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get task field for provided task Id. (Ex. StartDate).
          * @param taskId Either a string or value of the Task Id.
          * @param fieldId Task Fields.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result contains the `fieldValue` property, which represents the value of the specified field.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getTaskFieldAsync(taskId: string, fieldId: number, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getTaskFieldAsync(taskId: string, fieldId: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
         /**
          * Project documents only. Get the WSS Url and list name for the Tasks List, the MPP is synced too.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result contains the following properties:
+         *                  `listName` - the name of the synchronized SharePoint task list.
+         *                  `serverUrl` - the URL of the synchronized SharePoint task list.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
          */
-        getWSSUrlAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getWSSUrlAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<any>) => void): void;
+        /**
+         * Project documents only. Get the maximum index of the collection of resources in the current project.
+         * 
+         * Important: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the highest index number in the current project's resource collection.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
+         */
+        getMaxResourceIndexAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<number>) => void): void;
+        /**
+         * Project documents only. Get the maximum index of the collection of tasks in the current project.
+         * 
+         * Important: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the highest index number in the current project's task collection.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
+         */
+        getMaxTaskIndexAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<number>) => void): void;
+        /**
+         * Project documents only. Get the GUID of the resource that has the specified index in the resource collection.
+         * 
+         * Important: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @param resourceIndex The index of the resource in the collection of resources for the project.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the GUID of the resource as a string.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
+         */
+        getResourceByIndexAsync(resourceIndex: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Project documents only. Get the GUID of the task that has the specified index in the task collection.
+         * 
+         * Important: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @param taskIndex The index of the task in the collection of tasks for the project.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the GUID of the task as a string.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
+         */
+        getTaskByIndexAsync(taskIndex: number, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Project documents only. Set resource field for specified resource Id.
+         * 
+         * Important: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @param resourceId Either a string or value of the Resource Id.
+         * @param fieldId Resource Fields.
+         * @param fieldValue Value of the target field.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
+         */
+        setResourceFieldAsync(resourceId: string, fieldId: number, fieldValue: string | number | boolean | object, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Project documents only. Set task field for specified task Id.
+         * 
+         * Important: This API works only in Project 2016 on Windows desktop.
+         * 
+         * @param taskId Either a string or value of the Task Id.
+         * @param fieldId Task Fields.
+         * @param fieldValue Value of the target field.
+         * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         * 
+         * @remarks
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser)</th></tr>
+         *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                           </td></tr>
+         *  </table>
+         */
+        setTaskFieldAsync(taskId: string, fieldId: number, fieldValue: string | number | boolean | object, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
      * Provides information about the document that raised the SelectionChanged event.
      */
     interface DocumentSelectionChangedEventArgs {
         /**
-         * Gets a Document object that represents the document that raised the SelectionChanged event.
+         * Gets an {@link Office.Document} object that represents the document that raised the SelectionChanged event.
          */
         document: Document;
         /**
-         * Get an EventType enumeration value that identifies the kind of event that was raised.
+         * Get an {@link Office.EventType} enumeration value that identifies the kind of event that was raised.
          */
         type: EventType;
     }
@@ -2224,23 +4106,32 @@ declare namespace Office {
      *
      * @remarks
      * Access the File object with the AsyncResult.value property in the callback function passed to the Document.getFileAsync method.
-     *
-     * Hosts: PowerPoint, Word
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     interface File {
         /**
          * Gets the document file size in bytes.
          *
          * @remarks
-         * Hosts: PowerPoint, Word
-         *
-         * Available in Requirement set: File
+         * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
          */
         size: number;
         /**
          * Gets the number of slices into which the file is divided.
-         * @remarks
-         * Hosts: PowerPoint, Word
          */
         sliceCount: number;
         /**
@@ -2248,44 +4139,77 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync method to close the file when you are finished working with it.
+         * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
          * 
-         * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * No more than two documents are allowed to be in memory; otherwise the Document.getFileAsync operation will fail. Use the File.closeAsync 
+         * method to close the file when you are finished working with it.
          * 
-         * |Property |Use to...|
-         * |---------|---------|
-         * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
-         * |AsyncResult.status|Determine the success or failure of the operation.|
-         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * In the callback function passed to the closeAsync method, you can use the properties of the AsyncResult object to return the following 
+         * information.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Always returns undefined because there is no object or data to retrieve.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
          *
-         * Hosts: PowerPoint, Word
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
-         *
-         * Available in Requirement set: File
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        closeAsync(callback?: (result: AsyncResult) => void): void;
+        closeAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Returns the specified slice.
          * 
          * @remarks
+         * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
          * 
-         * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * In the callback function passed to the getSliceAsync method, you can use the properties of the AsyncResult object to return the following 
+         * information.
          * 
-         * |Property |Use to...|
-         * |---------|---------|
-         * |AsyncResult.value|Access the Slice object.|
-         * |AsyncResult.status|Determine the success or failure of the operation.|
-         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Access the Slice object.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
          * 
-         * Hosts: PowerPoint, Word
          * @param sliceIndex Specifies the zero-based index of the slice to be retrieved. Required.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
-         *
-         * Available in Requirement set: File
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is the {@link Office.Slice} object.
          */
-        getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult) => void): void;
+        getSliceAsync(sliceIndex: number, callback?: (result: AsyncResult<Office.Slice>) => void): void;
     }
     interface FileProperties {
         /**
@@ -2294,32 +4218,45 @@ declare namespace Office {
         url: string
     }
     /**
-    * Represents a binding in two dimensions of rows and columns.
-    *
-    * @remarks
-         * Hosts: Excel, Word
-    *
-    * Available in Requirement set: MatrixBindings
-    *
-    * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
-    */
+     * Represents a binding in two dimensions of rows and columns.
+     *
+     * @remarks
+     * <table><tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
+     *
+     * The MatrixBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
+     */
     interface MatrixBinding extends Binding {
         /**
         * Gets the number of columns in the matrix data structure, as an integer value.
         *
         * @remarks
-        * Hosts: Access, Excel, PowerPoint, Project, Word
+        * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
         *
-        * Available in Requirement set: MatrixBindings
+        * <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
         */
         columnCount: number;
         /**
         * Gets the number of rows in the matrix data structure, as an integer value.
         *
         * @remarks
-        * Hosts: Access, Excel, PowerPoint, Project, Word
+        * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Project, Word</td></tr>
         *
-        * Available in Requirement set: MatrixBindings
+        * <tr><td>Requirement Sets</td><td>MatrixBindings</td></tr></table>
         */
         rowCount: number;
     }
@@ -2327,51 +4264,99 @@ declare namespace Office {
      * Represents custom settings for a task pane or content add-in that are stored in the host document as name/value pairs.
      *
      * @remarks
-     * The settings created by using the methods of the Settings object are saved per add-in and per document. That is, they are available only to the add-in that created them, and only from the document in which they are saved.
+     * <table><tr><td>Hosts</td><td>Access, Excel, PowerPoint, Word</td></tr>
+     *
+     * <tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+     * 
+     * The settings created by using the methods of the Settings object are saved per add-in and per document. 
+     * That is, they are available only to the add-in that created them, and only from the document in which they are saved.
      *
      * The name of a setting is a string, while the value can be a string, number, boolean, null, object, or array.
      *
-     * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object when the add-in is activated. The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
-     *
-     * Hosts: Access, Excel, PowerPoint, Word
-     *
-     * Available in Requirement set: Settings
+     * The Settings object is automatically loaded as part of the Document object, and is available by calling the settings property of that object 
+     * when the add-in is activated. 
+     * 
+     * The developer is responsible for calling the saveAsync method after adding or deleting settings to save the settings in the document.
      */
     interface Settings {
         /**
          * Adds an event handler for the settingsChanged event.
          *
-         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+         * Important: Your add-in's code can register a handler for the settingsChanged event when the add-in is running with any Excel client, but 
+         * the event will fire only when the add-in is loaded with a spreadsheet that is opened in Excel Online, and more than one user is editing the 
+         * spreadsheet (co-authoring). Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
          *
          * @remarks
+         *
+         * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+         * 
          * You can add multiple event handlers for the specified eventType as long as the name of each event handler function is unique.
-         * 
-         * In the callback function passed to the addHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
-         * 
-         * |Property |Use to...|
-         * |---------|---------|
-         * |AsyncResult.value|Always returns undefined because there is no data or object to retrieve when adding an event handler.|
-         * |AsyncResult.status|Determine the success or failure of the operation.|
-         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
-         *
-         * Hosts: Excel
-         *
-         * Available in Requirement set: Settings
          *
          * @param eventType Specifies the type of event to add. Required.
-         * @param handler The event handler function to add. Required.
+         * @param handler The event handler function to add, whose only parameter is of type {@link Office.SettingsChangedEventArgs}. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Always returns undefined because there is no data or object to retrieve when adding an event handler.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *  </table>
          */
-        addHandlerAsync(eventType: EventType, handler: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: Office.EventType, handler: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Retrieves the specified setting.
          *
          * @remarks
-         * Hosts: Access, Excel, PowerPoint, Word
-         *
-         * Available in Requirement set: Settings
+         * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param settingName The case-sensitive name of the setting to retrieve.
          * @returns An object that has property names mapped to JSON serialized values.
@@ -2381,38 +4366,90 @@ declare namespace Office {
          * Reads all settings persisted in the document and refreshes the content or task pane add-in's copy of those settings held in memory.
          *
          * @remarks
-         * This method is useful in Word and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler for the settingsChanged event of the add-in will refresh the settings values for all users.
          * 
-         * The refreshAsync method can be called from add-ins created for Excel, but since it doesn't support coauthoring there is no reason to do so.
-         *
-         * In the callback function passed to the refreshAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
          * 
-         * |Property |Use to...|
-         * |---------|---------|
-         * |AsyncResult.value|Access a Settings object with the refreshed values.|
-         * |AsyncResult.status|Determine the success or failure of the operation.|
-         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
+         * This method is useful in Excel, Word, and PowerPoint coauthoring scenarios when multiple instances of the same add-in are working against 
+         * the same document. Because each add-in is working against an in-memory copy of the settings loaded from the document at the time the user 
+         * opened it, the settings values used by each user can get out of sync. This can happen whenever an instance of the add-in calls the 
+         * Settings.saveAsync method to persist all of that user's settings to the document. Calling the refreshAsync method from the event handler 
+         * for the settingsChanged event of the add-in will refresh the settings values for all users.
+         *
+         * In the callback function passed to the refreshAsync method, you can use the properties of the AsyncResult object to return the following 
+         * information.
          * 
-         * Hosts: Access, Excel, PowerPoint, Word
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Access a Settings object with the refreshed values.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
-         * Available in Requirement set: Settings
-         *
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
-
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is an {@link Office.Settings} object with the refreshed values.
          */
-        refreshAsync(callback?: (result: AsyncResult) => void): void;
+        refreshAsync(callback?: (result: AsyncResult<Office.Settings>) => void): void;
         /**
          * Removes the specified setting.
          *
-         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must call the Settings.saveAsync method.
+         * Important: Be aware that the Settings.remove method affects only the in-memory copy of the settings property bag. To persist the removal of 
+         * the specified setting in the document, at some point after calling the Settings.remove method and before the add-in is closed, you must 
+         * call the Settings.saveAsync method.
          *
          * @remarks
+         * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+         * 
          * null is a valid value for a setting. Therefore, assigning null to the setting will not remove it from the settings property bag.
-         *
-         * Hosts: Access, Excel, PowerPoint, Word
-         *
-         * Available in Requirement set: Settings
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td>                            </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param settingName The case-sensitive name of the setting to remove.
          */
@@ -2421,317 +4458,736 @@ declare namespace Office {
          * Removes an event handler for the settingsChanged event.
          *
          * @remarks
-         * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType will be removed.
          *
-         * Hosts: Access, Excel, PowerPoint
-         *
-         * Available in Requirement set: Settings
+         * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+         * 
+         * If the optional handler parameter is omitted when calling the removeHandlerAsync method, all event handlers for the specified eventType 
+         * will be removed.
+         * 
+         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback 
+         * function's only parameter.
+         * 
+         * In the callback function passed to the removeHandlerAsync method, you can use the properties of the AsyncResult object to return the 
+         * following information.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param eventType Specifies the type of event to remove. Required.
          * @param options Provides options to determine which event handler or handlers are removed.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
-         * @remarks
-         * When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
-         * In the callback function passed to the removeHandlerAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        removeHandlerAsync(eventType: EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult) => void): void;
+        removeHandlerAsync(eventType: Office.EventType, options?: RemoveHandlerOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Persists the in-memory copy of the settings property bag in the document.
+         * 
          * @remarks
-         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
+         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the 
+         * set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are 
+         * available the next time the add-in is used, use the saveAsync method.
          *
-         * Note: The saveAsync method persists the in-memory settings property bag into the document file; however, the changes to the document file itself are saved only when the user (or AutoRecover setting) saves the document to the file system. The refreshAsync method is only useful in coauthoring scenarios (which are only supported in Word) when other instances of the same add-in might change the settings and those changes should be made available to all instances.
+         * Note: The saveAsync method persists the in-memory settings property bag into the document file. However, the changes to the document file 
+         * itself are saved only when the user (or AutoRecover setting) saves the document to the file system. The refreshAsync method is only useful 
+         * in coauthoring scenarios when other instances of the same add-in might change the settings and those changes should be made available to 
+         * all instances.
          * 
-         * In the callback function passed to the saveAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Always returns undefined because there is no object or data to retrieve.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          * 
-         * |Property |Use to...|
-         * |---------|---------|
-         * |AsyncResult.value|Always returns undefined because there is no object or data to retrieve.|
-         * |AsyncResult.status|Determine the success or failure of the operation.|
-         * |AsyncResult.error|Access an Error object that provides error information if the operation failed.|
-         * |AsyncResult.asyncContext|A user-defined item of any type that is returned in the AsyncResult object without being altered.|
-         *
-         * Hosts: Access, Excel, PowerPoint, Word
          * @param options Provides options for saving settings.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult. When the function you passed to the callback parameter executes, it receives an AsyncResult object that you can access from the callback function's only parameter.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        saveAsync(options?: SaveSettingsOptions, callback?: (result: AsyncResult) => void): void;
+        saveAsync(options?: SaveSettingsOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets or creates the specified setting.
          *
-         * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in the document.
+         * Important: Be aware that the Settings.set method affects only the in-memory copy of the settings property bag. 
+         * To make sure that additions or changes to settings will be available to your add-in the next time the document is opened, at some point 
+         * after calling the Settings.set method and before the add-in is closed, you must call the Settings.saveAsync method to persist settings in 
+         * the document.
          *
          * @remarks
-         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
-         *
-         * Hosts: Access, Excel, PowerPoint, Word
-         *
-         * Available in Requirement set: Settings
-         *
+         * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+         * 
+         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name 
+         * in the in-memory copy of the settings property bag. After you call the Settings.saveAsync method, the value is stored in the document as 
+         * the serialized JSON representation of its data type. A maximum of 2MB is available for the settings of each add-in.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
+         * 
          * @param settingName The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
          */
         set(name: string, value: any): void;
     }
+    /**
+     * Provides information about the settings that raised the settingsChanged event.
+     * 
+     * @remarks
+     * <table><tr><td>Requirement Sets</td><td>Settings</td></tr></table>
+     * 
+     * To add an event handler for the settingsChanged event, use the addHandlerAsync method of the 
+     * {@link Office.Settings} object.
+     * 
+     * The settingsChanged event fires only when your add-in's script calls the Settings.saveAsync method to persist 
+     * the in-memory copy of the settings into the document file. The settingsChanged event is not triggered when the 
+     * Settings.set or Settings.remove methods are called.
+     * 
+     * The settingsChanged event was designed to let you to handle potential conflicts when two or more users are 
+     * attempting to save settings at the same time when your add-in is used in a shared (co-authored) document.
+     * 
+     * **Important:** Your add-in's code can register a handler for the settingsChanged event when the add-in 
+     * is running with any Excel client, but the event will fire only when the add-in is loaded with a spreadsheet 
+     * that is opened in Excel Online, and more than one user is editing the spreadsheet (co-authoring). 
+     * Therefore, effectively the settingsChanged event is supported only in Excel Online in co-authoring scenarios.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td>                 </td></tr>
+     *  </table>
+     */
+    interface SettingsChangedEventArgs {
+        /**
+         * Gets an {@link Office.Settings} object that represents the settings that raised the settingsChanged event.
+         */
+        settings: Settings;
+        /**
+         * Get an {@link Office.EventType} enumeration value that identifies the kind of event that was raised.
+         */
+        type: EventType;
+    }
     /**
      * Represents a slice of a document file.
      *
      * @remarks
+     * <table><tr><td>Requirement Sets</td><td>File</td></tr></table>
+     * 
      * The Slice object is accessed with the File.getSliceAsync method.
-     *
-     * Hosts: PowerPoint, Word
-     *
-     * Available in Requirement set: File
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> PowerPoint </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     interface Slice {
         /**
-         * Gets the raw data of the file slice in Office.FileType.Text ("text") or Office.FileType.Compressed ("compressed") format as specified by the fileType parameter of the call to the Document.getFileAsync method.
+         * Gets the raw data of the file slice in `Office.FileType.Text` ("text") or `Office.FileType.Compressed` ("compressed") format as specified 
+         * by the fileType parameter of the call to the Document.getFileAsync method.
          *
          * @remarks
+         * 
          * Files in the "compressed" format will return a byte array that can be transformed to a base64-encoded string if required.
-         *
-         * Hosts: PowerPoint, Word
-         *
-         * Available in Requirement set: File
          */
         data: any;
         /**
          * Gets the zero-based index of the file slice.
-         *
-         * @remarks
-         * Hosts: PowerPoint, Word
-         *
-         * Available in Requirement set: File
          */
         index: number;
         /**
          * Gets the size of the slice in bytes.
-         *
-         * @remarks
-         * Hosts: PowerPoint, Word
-         *
-         * Available in Requirement set: File
          */
         size: number;
     }
     /**
-    * Represents a binding in two dimensions of rows and columns, optionally with headers.
-    *
-    * @remarks
-    * Hosts: Access, Excel, PowerPoint, Project, Word
-    *
-    * Available in Requirement set: TableBindings
-    *
-    * The TableBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object.
-    *
-    * For Excel, note that after you establish a table binding in Excel, each new row a user adds to the table is automatically included in the binding and rowCount increases.
-    */
+     * Represents a binding in two dimensions of rows and columns, optionally with headers.
+     *
+     * @remarks
+     * <table><tr><td>Requirement Sets</td><td>TableBindings</td></tr></table>
+     *
+     * The TableBinding object inherits the `id` property, `type` property, `getDataAsync` method, and `setDataAsync` method from the 
+     * {@link Office.Binding} object.
+     *
+     * For Excel, note that after you establish a table binding, each new row a user adds to the table is automatically included in the binding and 
+     * rowCount increases.
+     */
     interface TableBinding extends Binding {
         /**
         * Gets the number of columns in the TableBinding, as an integer value.
         *
         * @remarks
-        * Hosts: Access, Excel,Word
-        *
-        * Available in Requirement set: TableBindings
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this property.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *  </table>
         */
         columnCount: number;
         /**
         * True, if the table has headers; otherwise false.
         *
         * @remarks
-        * Hosts: Access, Excel, PowerPoint, Project, Word
-        *
-        * Available in Requirement set: TableBindings
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this property.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *  </table>
         */
         hasHeaders: boolean;
          /**
         * Gets the number of rows in the TableBinding, as an integer value.
         *
         * @remarks
-        * Hosts: Access, Excel,Word
-        *
-        * Available in Requirement set: TableBindings
-        *
-        * When you insert an empty table by selecting a single row in Excel 2013 and Excel Online (using Table on the Insert tab), both Office host applications create a single row of headers followed by a single blank row. However, if your add-in's script creates a binding for this newly inserted table (for example, by using the addFromSelectionAsync method), and then checks the value of the rowCount property, the value returned will differ depending whether the spreadsheet is open in Excel 2013 or Excel Online.
-
+        * When you insert an empty table by selecting a single row in Excel 2013 and Excel Online (using Table on the Insert tab), both Office host 
+        * applications create a single row of headers followed by a single blank row. However, if your add-in's script creates a binding for this 
+        * newly inserted table (for example, by using the {@link Office.Bindings}.addFromSelectionAsync method), and then checks the value of the 
+        * rowCount property, the value returned will differ depending whether the spreadsheet is open in Excel 2013 or Excel Online.
+        * 
         * - In Excel on the desktop, rowCount will return 0 (the blank row following the headers is not counted).
         *
         * - In Excel Online, rowCount will return 1 (the blank row following the headers is counted).
         *
-        * You can work around this difference in your script by checking if rowCount == 1, and if so, then checking if the row contains all empty strings.
+        * You can work around this difference in your script by checking if rowCount == 1, and if so, then checking if the row contains all empty 
+        * strings.
         *
         * In content add-ins for Access, for performance reasons the rowCount property always returns -1.
+        * 
+        * **Support details**
+        * 
+        * A capital Y in the following matrix indicates that this property is supported in the corresponding Office host application. 
+        * An empty cell indicates that the Office host application doesn't support this property.
+        * 
+        * For more information about Office host application and server requirements, see 
+        * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+        * 
+        * *Supported hosts, by platform*
+        *  <table>
+        *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+        *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+        *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+        *  </table>
         */
         rowCount: number;
         /**
          * Adds the specified data to the table as additional columns.
          *
          * @remarks
-         * Hosts: Excel, Word
          *
-         * Available in Requirement set: TableBindings
+         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more 
+         * columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
          *
-         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
+         * The success or failure of an addColumnsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be 
+         * completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
          *
-         * The success or failure of an addColumnsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
+         *  - Each row in the array you pass as the data argument must have the same number of rows as the table being updated. If not, the entire 
+         * operation will fail.
          *
-         *  - Each row in the array you pass as the data argument must have the same number of rows as the table being updated. If not, the entire operation will fail.
-         *
-         *  - Each row and cell in the array must successfully add that row or cell to the table in the newly added column(s). If any row or cell fails to be set for any reason, the entire operation will fail.
+         *  - Each row and cell in the array must successfully add that row or cell to the table in the newly added column(s). If any row or cell 
+         * fails to be set for any reason, the entire operation will fail.
          *
          *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
          *
-         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
+         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in 
+         * a single call to this method.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+        * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param tableData An array of arrays ("matrix") or a TableData object that contains one or more columns of data to add to the table. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        addColumnsAsync(tableData: TableData | any[][], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addColumnsAsync(tableData: TableData | any[][], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Adds the specified data to the table as additional rows.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
          *
-         * Available in Requirement set: TableBindings
+         * The success or failure of an addRowsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be 
+         * completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
          *
-         * To add one or more columns specifying the values of the data and headers, pass a TableData object as the data parameter. To add one or more columns specifying only the data, pass an array of arrays ("matrix") as the data parameter.
+         *  - Each row in the array you pass as the data argument must have the same number of columns as the table being updated. If not, the entire 
+         * operation will fail.
          *
-         * The success or failure of an addRowsAsync operation is atomic. That is, the entire add columns operation must succeed, or it will be completely rolled back (and the AsyncResult.status property returned to the callback will report failure):
-         *
-         *  - Each row in the array you pass as the data argument must have the same number of columns as the table being updated. If not, the entire operation will fail.
-         *
-         *  - Each column and cell in the array must successfully add that column or cell to the table in the newly added rows(s). If any column or cell fails to be set for any reason, the entire operation will fail.
+         *  - Each column and cell in the array must successfully add that column or cell to the table in the newly added rows(s). If any column or 
+         * cell fails to be set for any reason, the entire operation will fail.
          *
          *  - If you pass a TableData object as the data argument, the number of header rows must match that of the table being updated.
          *
-         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in a single call to this method.
+         * Additional remark for Excel Online: The total number of cells in the TableData object passed to the data parameter can't exceed 20,000 in 
+         * a single call to this method.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param rows An array of arrays ("matrix") or a TableData object that contains one or more rows of data to add to the table. Required.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        addRowsAsync(rows: TableData | any[][], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addRowsAsync(rows: TableData | any[][], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Deletes all non-header rows and their values in the table, shifting appropriately for the host application.
          *
          * @remarks
-         * Hosts: Access, Excel, Word
-         *
-         * Available in Requirement set: TableBindings
          *
          * In Excel, if the table has no header row, this method will delete the table itself.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Access     </strong></td><td>                            </td><td> Y                          </td><td>                 </td></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        deleteAllDataValuesAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        deleteAllDataValuesAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Clears formatting on the bound table.
          *
          * @remarks
-         * Hosts: Excel
-         *
-         * Available in Requirement set: Not in a set
-         *
          * See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table | Format tables in add-ins for Excel} for more information.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        clearFormatsAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        clearFormatsAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Gets the formatting on specified items in the table.
+         * 
+         * @remarks
+         * 
+         * **Returned format structure**
+         * 
+         * Each JavaScript object in the return value array has this form: `{cells:{ cell_range }, format:{ format_definition }}`
+         * 
+         * The `cells:` property specifies the range you want format using one of the following values:
+         * 
+         * **Supported ranges in cells property**
+         * 
+         * <table>
+         *   <tr>
+         *     <th>cells range settings</th>
+         *     <th>Description</th>
+         *   </tr>
+         *   <tr>
+         *     <td>{row: n}</td>
+         *     <td>Specifies the range that is the zero-based nth row of data in the table.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>{column: n}</td>
+         *     <td>Specifies the range that is the zero-based nth column of data in the table.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>{row: i, column: j}</td>
+         *     <td>Specifies the single cell that is the ith row and jth column of the table.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office.Table.All</td>
+         *     <td>Specifies the entire table, including column headers, data, and totals (if any).</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office.Table.Data</td>
+         *     <td>Specifies only the data in the table (no headers and totals).</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office.Table.Headers</td>
+         *     <td>Specifies only the header row.</td>
+         *   </tr>
+         * </table>
+         * 
+         * The `format:` property specifies values that correspond to a subset of the settings available in the Format Cells dialog box in Excel (Right-click > Format Cells or Home > Format > Format Cells).
+         * 
          * @param cellReference An object literal containing name-value pairs that specify the range of cells to get formatting from.
          * @param formats An array specifying the format properties to get.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         *                  The `value` property of the result is an array containing one or more JavaScript objects specifying the formatting of their corresponding cells. 
          */
-        getFormatsAsync(cellReference?: any, formats?: any[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getFormatsAsync(cellReference?: any, formats?: any[], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult< ({ cells: any, format: any})[]>) => void): void;
         /**
          * Sets formatting on specified items and data in the table.
          *
          * @remarks
-         * Hosts: Excel
+         * 
+         * **Specifying the cellFormat parameter**
+         * 
+         * Use the cellFormat parameter to set or change cell formatting values, such as width, height, font, background, alignment, and so on. 
+         * The value you pass as the cellFormat parameter is an array that contains a list of one or more JavaScript objects that specify which cells 
+         * to target (`cells:`) and the formats (`format:`) to apply to them.
+         * 
+         * Each JavaScript object in the cellFormat array has this form: `{cells:{ cell_range }, format:{ format_definition }}`
+         * 
+         * The `cells:` property specifies the range you want format using one of the following values:
+         * 
+         * **Supported ranges in cells property**
+         * 
+         * <table>
+         *   <tr>
+         *     <th>cells range settings</th>
+         *     <th>Description</th>
+         *   </tr>
+         *   <tr>
+         *     <td>{row: n}</td>
+         *     <td>Specifies the range that is the zero-based nth row of data in the table.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>{column: n}</td>
+         *     <td>Specifies the range that is the zero-based nth column of data in the table.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>{row: i, column: j}</td>
+         *     <td>Specifies the single cell that is the ith row and jth column of the table.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office.Table.All</td>
+         *     <td>Specifies the entire table, including column headers, data, and totals (if any).</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office.Table.Data</td>
+         *     <td>Specifies only the data in the table (no headers and totals).</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Office.Table.Headers</td>
+         *     <td>Specifies only the header row.</td>
+         *   </tr>
+         * </table>
+         * 
+         * The `format:` property specifies values that correspond to a subset of the settings available in the Format Cells dialog box in Excel 
+         * (Right-click > Format Cells or Home > Format > Format Cells).
+         * 
+         * You specify the value of the `format:` property as a list of one or more property name - value pairs in a JavaScript object literal. The 
+         * property name specifies the name of the formatting property to set, and value specifies the property value. 
+         * You can specify multiple values for a given format, such as both a font's color and size. 
+         * 
+         * Here's three `format:` property value examples:
+         * 
+         * `//Set cells: font color to green and size to 15 points.`
+         * 
+         * `format: {fontColor : "green", fontSize : 15}`
+         * 
+         * `//Set cells: border to dotted blue.`
+         * 
+         * `format: {borderStyle: "dotted", borderColor: "blue"}`
+         * 
+         * `//Set cells: background to red and alignment to centered.`
+         * 
+         * `format: {backgroundColor: "red", alignHorizontal: "center"}`
+         * 
+         * 
+         * You can specify number formats by specifying the number formatting "code" string in the `numberFormat:` property. 
+         * The number format strings you can specify correspond to those you can set in Excel using the Custom category on the Number tab of the Format Cells dialog box. 
+         * This example shows how to format a number as a percentage with two decimal places:
+         * 
+         * `format: {numberFormat:"0.00%"}`
+         * 
+         * For more detail, see how to {@link https://support.office.com/article/create-or-delete-a-custom-number-format-78f2a361-936b-4c03-8772-09fab54be7f4 | Create a custom number format}.
+         * 
+         * To set formatting on tables when writing data, use the tableOptions and cellFormat optional parameters of the 
+         * `Document.setSelectedDataAsync` or `TableBinding.setDataAsync` methods.
+         * 
+         * Setting formatting with the optional parameters of the `Document.setSelectedDataAsync` and `TableBinding.setDataAsync` methods only works 
+         * to set formatting when writing data the first time. 
+         * To make formatting changes after writing data, use the following methods:
+         * 
+         *  - To update cell formatting, such as font color and style, use the `TableBinding.setFormatsAsync` method (this method).
+         * 
+         *  - To update table options, such as banded rows and filter buttons, use the `TableBinding.setTableOptions` method.
+         * 
+         *  - To clear formatting, use the `TableBinding.clearFormats` method.
+         * 
+         * For more details and examples, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table | How to format tables in add-ins for Excel}.
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
-         * Available in Requirement set: Not in a set
-         *
-         * @param formatsInfo Array elements are themselves three-element arrays:[target, type, formats]
-         *
-         *       target: The identifier of the item to format. String.
-         *
-         *       type: The kind of item to format. String.
-         *
-         *       formats: An object literal containing a list of property name-value pairs that define the formatting to apply.
+         * @param cellFormat An array that contains one or more JavaScript objects that specify which cells to target and the formatting to apply to them.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
          */
-        setFormatsAsync(formatsInfo?: any[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setFormatsAsync(cellFormat: any[], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Updates table formatting options on the bound table.
          *
          * @remarks
-         * Hosts: Excel
+         * <table><tr><td>Hosts</td><td>Excel</td></tr>
          *
-         * Available in Requirement set: Not in a set
+         * <tr><td>Requirement Sets</td><td>Not in a set</td></tr></table>
+         * 
+         * In the callback function passed to the goToByIdAsync method, you can use the properties of the AsyncResult object to return the following information.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Property</th>
+         *     <th>Use to...</th>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.value</td>
+         *     <td>Always returns undefined because there is no data or object to retrieve when setting formats.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.status</td>
+         *     <td>Determine the success or failure of the operation.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.error</td>
+         *     <td>Access an Error object that provides error information if the operation failed.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>AsyncResult.asyncContext</td>
+         *     <td>A user-defined item of any type that is returned in the AsyncResult object without being altered.</td>
+         *   </tr>
+         * </table>
+         * 
+         * **Support details**
+         * 
+         * A capital Y in the following matrix indicates that this method is supported in the corresponding Office host application. 
+         * An empty cell indicates that the Office host application doesn't support this method.
+         * 
+         * For more information about Office host application and server requirements, see 
+         * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+         * 
+         * *Supported hosts, by platform*
+         *  <table>
+         *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+         *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+         *  </table>
          *
          * @param tableOptions An object literal containing a list of property name-value pairs that define the table options to apply.
          * @param options Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type AsyncResult.
+         * @param callback Optional. A function that is invoked when the callback returns, whose only parameter is of type {@link Office.AsyncResult}.
+         * 
          */
-        setTableOptionsAsync(tableOptions: any, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setTableOptionsAsync(tableOptions: any, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
     }
     /**
-     * Represents the data in a table or a TableBinding.
+     * Represents the data in a table or a {@link Office.TableBinding}.
      *
      * @remarks
-     * Hosts: Excel, Word
+     * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
      *
-     * Available in Requirement set: TableBindings
+     * <tr><td>Requirement Sets</td><td>TableBindings</td></tr></table>
      */
     class TableData {
         constructor(rows: any[][], headers: any[]);
         constructor();
         /**
          * Gets or sets the headers of the table.
+         * 
          * @remarks
-         * To specify headers, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify headers for a two-column table you would set the header property to [['header1', 'header2']].
+         * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
          *
-         * If you specify null for the headers property (or leaving the property empty when you construct a TableData object), the following results occur when your code executes:
+         * <tr><td>Requirement Sets</td><td>TableBindings</td></tr></table>
+         * 
+         * To specify headers, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify headers 
+         * for a two-column table you would set the header property to [['header1', 'header2']].
+         *
+         * If you specify null for the headers property (or leaving the property empty when you construct a TableData object), the following results 
+         * occur when your code executes:
          *
          * - If you insert a new table, the default column headers for the table are created.
          *
          * - If you overwrite or update an existing table, the existing headers are not altered.
-         *
-         * Hosts: Excel, Word
-         *
-         * Available in Requirement set: TableBindings
          */
         headers: any[];
         /**
-         * Gets or sets the rows in the table. Returns an array of arrays that contains the data in the table. Returns an empty array ``, if there are no rows.
+         * Gets or sets the rows in the table. Returns an array of arrays that contains the data in the table. Returns an empty array ``, if there are 
+         * no rows.
+         * 
          * @remarks
-         * To specify rows, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify two rows of string values in a two-column table you would set the rows property to [['a', 'b'], ['c', 'd']].
+         * <table><tr><td>Hosts</td><td>Excel, Word</td></tr>
          *
-         * If you specify null for the rows property (or leave the property empty when you construct a TableData object), the following results occur when your code executes:
+         * <tr><td>Requirement Sets</td><td>TableBindings</td></tr></table>
+         * 
+         * To specify rows, you must specify an array of arrays that corresponds to the structure of the table. For example, to specify two rows of 
+         * string values in a two-column table you would set the rows property to [['a', 'b'], ['c', 'd']].
+         *
+         * If you specify null for the rows property (or leave the property empty when you construct a TableData object), the following results occur 
+         * when your code executes:
          *
          * - If you insert a new table, a blank row will be inserted.
          *
          * - If you overwrite or update an existing table, the existing rows are not altered.
-         *
-         * Hosts: Excel, Word
-         *
-         * Available in Requirement set: TableBindings
          */
         rows: any[][];
     }
     /**
-     * Specifies enumerated values for the cells: property in the cellFormat parameter of {@link https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table | table formatting methods}.
+     * Specifies enumerated values for the `cells` property in the cellFormat parameter of 
+     * {@link https://docs.microsoft.com/en-us/office/dev/add-ins/excel/excel-add-ins-tables#format-a-table | table formatting methods}.
      *
      * @remarks
-     * Hosts: Excel
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
      */
     enum Table {
         /**
@@ -2748,23 +5204,50 @@ declare namespace Office {
         Headers
     }
     /**
-    * Represents a bound text selection in the document.
-    *
-    * @remarks
-    * Hosts: Access, Excel, PowerPoint, Project, Word
-    *
-    * Available in Requirement set: TextBindings
-    *
-    * The TextBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the Binding object. It does not implement any additional properties or methods of its own.
-    */
-    interface TextBinding extends Binding { }
-    /**
-     * Specifies the project fields that are available as a parameter for the getProjectFieldAsync method.
+     * Represents a bound text selection in the document.
      *
      * @remarks
-     * A ProjectProjectFields constant can be used as a parameter of the getProjectFieldAsync method.
+     * <table><tr><td>Requirement Sets</td><td>TextBindings</td></tr></table>
      *
-     * Hosts: Project
+     * The TextBinding object inherits the id property, type property, getDataAsync method, and setDataAsync method from the {@link Office.Binding} 
+     * object. It does not implement any additional properties or methods of its own.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this interface is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this interface.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th><th> Office for iPad </th></tr>
+     *   <tr><td><strong> Excel      </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *   <tr><td><strong> Word       </strong></td><td> Y                          </td><td> Y                          </td><td> Y               </td></tr>
+     *  </table>
+     */
+    interface TextBinding extends Binding { }
+    /**
+     * Specifies the project fields that are available as a parameter for the {@link Office.Document | Document}.getProjectFieldAsync method.
+     *
+     * @remarks
+     * 
+     * A ProjectProjectFields constant can be used as a parameter of the {@link Office.Document | Document}.getProjectFieldAsync method.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *  </table>
      */
     enum ProjectProjectFields {
         /**
@@ -2776,7 +5259,8 @@ declare namespace Office {
          */
         CurrencySymbol,
         /**
-         * The placement of the currency symbol: Not specified = -1; Before the value with no space ($0) = 0; After the value with no space (0$) = 1; Before the value with a space ($ 0) = 2; After the value with a space (0 $) = 3.
+         * The placement of the currency symbol: Not specified = -1; Before the value with no space ($0) = 0; After the value with no space (0$) = 1; 
+         * Before the value with a space ($ 0) = 2; After the value with a space (0 $) = 3.
          */
         CurrencySymbolPosition,
         DurationUnits,
@@ -2818,16 +5302,33 @@ declare namespace Office {
         WSSList
     }
     /**
-     * Specifies the resource fields that are available as a parameter for the getResourceFieldAsync method.
+     * Specifies the resource fields that are available as a parameter for the {@link Office.Document | Document}.getResourceFieldAsync method.
      *
      * @remarks
-     * A ProjectResourceFields constant can be used as a parameter of the getResourceFieldAsync method.
+     * A ProjectResourceFields constant can be used as a parameter of the {@link Office.Document | Document}.getResourceFieldAsync method.
      *
-     * For more information about working with fields in Project, see {@link https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460 | Available fields} reference. In Project Help, search for Available fields.
+     * For more information about working with fields in Project, see 
+     * {@link https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460 | Available fields} reference. In 
+     * Project Help, search for Available fields.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *  </table>
      */
     enum ProjectResourceFields {
         /**
-         * The accrual method that defines how a task accrues the cost of the resource: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how a task accrues the cost of the resource: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Accrual,
         /**
@@ -3628,14 +6129,28 @@ declare namespace Office {
         Text9
     }
     /**
-     * Specifies the task fields that are available as a parameter for the getTaskFieldAsync method.
+     * Specifies the task fields that are available as a parameter for the {@link Office.Document | Document}.getTaskFieldAsync method.
      *
      * @remarks
-     * A ProjectTaskFields constant can be used as a parameter of the getTaskFieldAsync method.
+     * A ProjectTaskFields constant can be used as a parameter of the {@link Office.Document | Document}.getTaskFieldAsync method.
      *
-     * For more information about working with fields in Project, see the {@link https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460 | Available fields} reference. In Project Help, search for Available fields.
-     *
-     * Hosts: Project
+     * For more information about working with fields in Project, see the 
+     * {@link https://support.office.com/article/Available-fields-reference-615a4563-1cc3-40f4-b66f-1b17e793a460 | Available fields} reference. 
+     * In Project Help, search for Available fields.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *  </table>
      */
     enum ProjectTaskFields {
         /**
@@ -3891,7 +6406,8 @@ declare namespace Office {
          */
         Baseline10FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline10FixedCostAccrual,
         /**
@@ -3927,7 +6443,8 @@ declare namespace Office {
          */
         Baseline1FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline1FixedCostAccrual,
         /**
@@ -3963,7 +6480,8 @@ declare namespace Office {
          */
         Baseline2FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline2FixedCostAccrual,
         /**
@@ -3999,7 +6517,8 @@ declare namespace Office {
          */
         Baseline3FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline3FixedCostAccrual,
         /**
@@ -4035,7 +6554,8 @@ declare namespace Office {
          */
         Baseline4FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline4FixedCostAccrual,
         /**
@@ -4071,7 +6591,8 @@ declare namespace Office {
          */
         Baseline5FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline5FixedCostAccrual,
         /**
@@ -4107,7 +6628,8 @@ declare namespace Office {
          */
         Baseline6FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline6FixedCostAccrual,
         /**
@@ -4143,7 +6665,8 @@ declare namespace Office {
          */
         Baseline7FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline7FixedCostAccrual,
         /**
@@ -4179,7 +6702,8 @@ declare namespace Office {
          */
         Baseline8FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline8FixedCostAccrual,
         /**
@@ -4215,7 +6739,8 @@ declare namespace Office {
          */
         Baseline9FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         Baseline9FixedCostAccrual,
         /**
@@ -4251,7 +6776,8 @@ declare namespace Office {
          */
         BaselineFixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         BaselineFixedCostAccrual,
         /**
@@ -4281,7 +6807,8 @@ declare namespace Office {
          */
         ConstraintDate,
         /**
-         * A constraint type for the task: As Soon As Possible = 0, As Late As Possible = 1, Must Start On = 2, Must Finish On = 3, Start No Earlier Than = 4, Start No Later Than = 5, Finish No Earlier Than = 6, Finish No Later Than = 7.
+         * A constraint type for the task: As Soon As Possible = 0, As Late As Possible = 1, Must Start On = 2, Must Finish On = 3, 
+         * Start No Earlier Than = 4, Start No Later Than = 5, Finish No Earlier Than = 6, Finish No Later Than = 7.
          */
         ConstraintType,
         /**
@@ -4425,7 +6952,8 @@ declare namespace Office {
          */
         FixedCost,
         /**
-         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
+         * The accrual method that defines how the baseline task accrues fixed costs: Accrues when the task starts = 1, 
+         * accrues when the task ends = 2, accrues as the task progresses (prorated) = 3.
          */
         FixedCostAccrual,
         /**
@@ -4766,12 +7294,25 @@ declare namespace Office {
         WSSID
     }
     /**
-     * Specifies the types of views that the getSelectedViewAsync method can recognize.
+     * Specifies the types of views that the {@link Office.Document | Document}.getSelectedViewAsync method can recognize.
      *
      * @remarks
-     * The getSelectedViewAsync method returns the ProjectViewTypes constant value and name that corresponds to the active view.
-     *
-     * Hosts: Project
+     * The {@link Office.Document | Document}.getSelectedViewAsync method returns the ProjectViewTypes constant value and name that corresponds to the 
+     * active view.
+     * 
+     * **Support details**
+     * 
+     * A capital Y in the following matrix indicates that this enumeration is supported in the corresponding Office host application. 
+     * An empty cell indicates that the Office host application doesn't support this enumeration.
+     * 
+     * For more information about Office host application and server requirements, see 
+     * {@link https://docs.microsoft.com/office/dev/add-ins/concepts/requirements-for-running-office-add-ins | Requirements for running Office Add-ins}.
+     * 
+     * *Supported hosts, by platform*
+     *  <table>
+     *   <tr><th>                    </th><th> Office for Windows desktop </th><th> Office Online (in browser) </th></tr>
+     *   <tr><td><strong> Project    </strong></td><td> Y                          </td><td>                            </td></tr>
+     *  </table>
      */
     enum ProjectViewTypes {
         /**
@@ -4862,21 +7403,23 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum AttachmentType {
             /**
              * The attachment is a file
              */
-            File,
+            File = "file",
             /**
              * The attachment is an Exchange item
              */
-            Item,
+            Item = "item",
             /**
              * The attachment is stored in a cloud location, such as OneDrive. The id property of the attachment contains a URL to the file.
              */
-            Cloud
+            Cloud = "cloud"
         }
         /**
          * Specifies the day of week or type of day.
@@ -4884,7 +7427,11 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
+         * 
+         * @beta
          */
         enum Days {
             /**
@@ -4934,37 +7481,39 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum EntityType {
             /**
              * Specifies that the entity is a meeting suggestion.
              */
-            MeetingSuggestion,
+            MeetingSuggestion = "meetingSuggestion",
             /**
              * Specifies that the entity is a task suggestion.
              */
-            TaskSuggestion,
+            TaskSuggestion = "taskSuggestion",
             /**
              * Specifies that the entity is a postal address.
              */
-            Address,
+            Address = "address",
             /**
              * Specifies that the entity is an SMTP email address.
              */
-            EmailAddress,
+            EmailAddress = "emailAddress",
             /**
              * Specifies that the entity is an Internet URL.
              */
-            Url,
+            Url = "url",
             /**
              * Specifies that the entity is a US phone number.
              */
-            PhoneNumber,
+            PhoneNumber = "phoneNumber",
             /**
              * Specifies that the entity is a contact.
              */
-            Contact
+            Contact = "contact"
         }
         /**
          * Specifies the notification message type for an appointment or message.
@@ -4972,21 +7521,23 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum ItemNotificationMessageType {
             /**
              * The notificationMessage is a progress indicator.
              */
-            ProgressIndicator,
+            ProgressIndicator = "progressIndicator",
             /**
              * The notificationMessage is an informational message.
              */
-            InformationalMessage,
+            InformationalMessage = "informationalMessage",
             /**
              * The notificationMessage is an error message.
              */
-            ErrorMessage
+            ErrorMessage = "errorMessage"
         }
         /**
          * Specifies an item's type.
@@ -4994,17 +7545,19 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum ItemType {
             /**
              * An email, meeting request, meeting response, or meeting cancellation.
              */
-            Message,
+            Message = "message",
             /**
              * An appointment item.
              */
-            Appointment
+            Appointment = "appointment"
         }
         /**
          * Specifies the month.
@@ -5012,7 +7565,11 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
+         *
+         * @beta
          */
         enum Month {
             /**
@@ -5064,31 +7621,51 @@ declare namespace Office {
              */
             Dec = "dec"
         }
+        /**
+         * Represents the current view of Outlook Web App.
+         */
+        enum OWAView {
+            /**
+             * One column view. Displayed when the screen is narrow. Outlook Web App uses this single-column layout on the entire screen of a smartphone.
+             */
+            OneColumn = "OneColumn",
+            /**
+             * Two column view. Displayed when the screen is wider. Outlook Web App uses this view on most tablets.
+             */
+            TwoColumns = "TwoColumns",
+            /**
+             Three column view. Displayed when the screen is wide. For example, Outlook Web App uses this view in a full screen window on a desktop 
+             computer.
+             */
+            ThreeColumns = "ThreeColumns"
+        }
         /**
          * Specifies the type of recipient for an appointment.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum RecipientType {
             /**
              * Specifies that the recipient is a distribution list containing a list of email addresses.
              */
-            DistributionList,
+            DistributionList = "distributionList",
             /**
              * Specifies that the recipient is an SMTP email address that is on the Exchange server.
              */
-            User,
+            User = "user",
             /**
              * Specifies that the recipient is an SMTP email address that is not on the Exchange server.
              */
-            ExternalUser,
+            ExternalUser = "externalUser",
             /**
              * Specifies that the recipient is not one of the other recipient types.
              */
-            Other
+            Other = "other"
         }
         /**
          * Specifies the time zone applied to the recurrence.
@@ -5096,7 +7673,11 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
+         *
+         * @beta
          */
         enum RecurrenceTimeZone {
             /**
@@ -5652,7 +8233,11 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
+         *
+         * @beta
          */
         enum RecurrenceType {
             /**
@@ -5682,29 +8267,31 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum ResponseType {
             /**
              * There has been no response from the attendee.
              */
-            None,
+            None = "none",
             /**
              * The attendee is the meeting organizer.
              */
-            Organizer,
+            Organizer = "organizer",
             /**
              * The meeting request was tentatively accepted by the attendee.
              */
-            Tentative,
+            Tentative = "tentative",
             /**
              * The meeting request was accepted by the attendee.
              */
-            Accepted,
+            Accepted = "accepted",
             /**
              * The meeting request was declined by the attendee.
              */
-            Declined
+            Declined = "declined"
         }
         /**
          * Specifies the version of the REST API that corresponds to a REST-formatted item ID.
@@ -5712,21 +8299,23 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
          */
         enum RestVersion {
             /**
              * Version 1.0.
              */
-            v1_0,
+            v1_0 = "v1.0",
             /**
              * Version 2.0.
              */
-            v2_0,
+            v2_0 = "v2.0",
             /**
              * Beta.
              */
-            Beta
+            Beta = "beta"
         }
         /**
          * Specifies the week of the month.
@@ -5734,7 +8323,11 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>
+         * {@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}
+         * </td><td>Compose or read</td></tr></table>
+         *
+         * @beta
          */
         enum WeekNumber {
             /**
@@ -5759,9 +8352,6 @@ declare namespace Office {
             Last = "last"
         }
     }
-    interface AsyncContextOptions {
-        asyncContext?: any;
-    }
     interface CoercionTypeOptions {
         coercionType?: CoercionType;
     }
@@ -5775,6 +8365,164 @@ declare namespace Office {
          */
         Subject
     }
+    /**
+     * The AppointmentForm namespace is used to access the currently selected appointment.
+     *
+     * [Api set: Mailbox 1.0]
+     *
+     * @remarks
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+     *
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+     */
+    interface AppointmentForm {
+        /**
+         * Gets an object that provides methods for manipulating the body of an item.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        body: string;
+        /**
+         * Gets or sets the date and time that the appointment is to end.
+         *
+         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to 
+         * convert the end property value to the client's local date and time.
+         *
+         * *Read mode*
+         *
+         * The end property returns a Date object.
+         *
+         * *Compose mode*
+         *
+         * The end property returns a Time object.
+         *
+         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on 
+         * the client to UTC for the server.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        end: Date;
+        /**
+        * Gets or sets the location of an appointment.
+        *
+        * *Read mode*
+        *
+        * The location property returns a string that contains the location of the appointment.
+        *
+        * *Compose mode*
+        *
+        * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
+        *
+        * [Api set: Mailbox 1.0]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+        */
+        location: string;
+        /**
+        * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
+        *
+        * *Read mode*
+        *
+        * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
+        *
+        * *Compose mode*
+        *
+        * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
+        *
+        * [Api set: Mailbox 1.0]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+        */
+       optionalAttendees: string[] | EmailAddressDetails[];
+       resources: string[];
+        /**
+         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
+         *
+         * *Read mode*
+         *
+         * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
+         *
+         * *Compose mode*
+         *
+         * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        requiredAttendees: string[] | EmailAddressDetails[];
+        /**
+         * Gets or sets the date and time that the appointment is to begin.
+         *
+         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method 
+         * to convert the value to the client's local date and time.
+         *
+         * *Read mode*
+         *
+         * The start property returns a Date object.
+         *
+         * *Compose mode*
+         *
+         * The start property returns a Time object.
+         *
+         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on 
+         * the client to UTC for the server.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        start: Date;
+        /**
+         * Gets or sets the description that appears in the subject field of an item.
+         *
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         *
+         * *Read mode*
+         *
+         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
+         *
+         * *Compose mode*
+         *
+         * The subject property returns a Subject object that provides methods to get and set the subject.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        subject: string;
+    }
     /**
      * Represents an attachment on an item from the server. Read mode only.
      *
@@ -5783,9 +8531,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface AttachmentDetails {
         /**
@@ -5814,14 +8562,15 @@ declare namespace Office {
         size: number;
     }
     /**
-     * The body object provides methods for adding and updating the content of the message or appointment. It is returned in the body property of the selected item.
+     * The body object provides methods for adding and updating the content of the message or appointment. 
+     * It is returned in the body property of the selected item.
      *
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface Body {
         /**
@@ -5829,39 +8578,49 @@ declare namespace Office {
          *
          * This method returns the entire current body in the format specified by coercionType.
          *
-         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. 
+         * The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. 
+         * The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         * 
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `getAsync(coerciontype: Office.CoercionType, callback: (result: AsyncResult<Office.Body>) => void): void;`
+         * 
          * @param coercionType The format for the returned body.
          * @param options Optional. An object literal that contains one or more of the following properties:
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The body is provided in the requested format in the asyncResult.value property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. 
+         *                  The body is provided in the requested format in the asyncResult.value property.
          */
-        getAsync(coercionType: CoercionType, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAsync(coerciontype: Office.CoercionType, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.Body>) => void): void;
         /**
          * Returns the current body in a specified format.
          *
          * This method returns the entire current body in the format specified by coercionType.
          *
-         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. 
+         * The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. 
+         * The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param coercionType The format for the returned body.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The body is provided in the requested format in the asyncResult.value property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  The body is provided in the requested format in the asyncResult.value property.
          */
-        getAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
+        getAsync(coerciontype: Office.CoercionType, callback: (result: AsyncResult<Office.Body>) => void): void;
 
         /**
          * Gets a value that indicates whether the content is in HTML or text format.
@@ -5869,92 +8628,110 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The content type is returned as one of the CoercionType values in the asyncResult.value property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  The content type is returned as one of the CoercionType values in the asyncResult.value property.
          */
-        getTypeAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getTypeAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.CoercionType>) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
          *
-         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * The prependAsync method inserts the specified string at the beginning of the item body. 
+         * After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
-         * Applicable Outlook mode: Compose
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         * 
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-         * prependAsync(data: string, callback: (result: AsyncResult) => void): void;
-         * prependAsync(data: string): void;
+         * 
+         * `prependAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
+         * 
+         * `prependAsync(data: string, callback: (result: AsyncResult<void>) => void): void;`
+         * 
+         * `prependAsync(data: string): void;`
          *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  Any errors encountered will be provided in the asyncResult.error property.
          */
-        prependAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        prependAsync(data: string, options?: Office.AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
          *
-         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * The prependAsync method inserts the specified string at the beginning of the item body. 
+         * After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
-         * Applicable Outlook mode: Compose
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         * 
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr></table>
          *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
          */
-        prependAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        prependAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Adds the specified content to the beginning of the item body.
          *
-         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * The prependAsync method inserts the specified string at the beginning of the item body. 
+         * After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
-         * Applicable Outlook mode: Compose
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr></table>
          *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  Any errors encountered will be provided in the asyncResult.error property.
          */
-        prependAsync(data: string, callback: (result: AsyncResult) => void): void;
+        prependAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
         /**
          * Adds the specified content to the beginning of the item body.
          *
-         * The prependAsync method inserts the specified string at the beginning of the item body. After insertion, the cursor is returned to its original place, relative to the inserted content.
+         * The prependAsync method inserts the specified string at the beginning of the item body. 
+         * After insertion, the cursor is returned to its original place, relative to the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
-         * Applicable Outlook mode: Compose
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr></table>
          *
          * @param data The string to be inserted at the beginning of the body. The string is limited to 1,000,000 characters.
          */
@@ -5962,96 +8739,105 @@ declare namespace Office {
         /**
          * Replaces the entire body with the specified text.
          *
-         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. 
+         * The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method 
+         * previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-         * setAsync(data: string, callback: (result: AsyncResult) => void): void;
-         * setAsync(data: string): void;         *
+         * 
+         * `setAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
+         * 
+         * `setAsync(data: string, callback: (result: AsyncResult<void>) => void): void;`
+         * 
+         * `setAsync(data: string): void;`
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  Any errors encountered will be provided in the asyncResult.error property.
          */
-        setAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(data: string, options?: Office.AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Replaces the entire body with the specified text.
          *
-         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. 
+         * The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method 
+         * previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
          */
-        setAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        setAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Replaces the entire body with the specified text.
          *
-         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. 
+         * The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method 
+         * previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  Any errors encountered will be provided in the asyncResult.error property.
          */
-        setAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
         /**
          * Replaces the entire body with the specified text.
          *
-         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent. The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
+         * When working with HTML-formatted bodies, it is important to note that the Body.getAsync and Body.setAsync methods are not idempotent.
+         *  The value returned from the getAsync method will not necessarily be exactly the same as the value that was passed in the setAsync method 
+         * previously. The client may modify the value passed to setAsync in order to make it render efficiently with its rendering engine.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          */
@@ -6060,96 +8846,105 @@ declare namespace Office {
         /**
          * Replaces the selection in the body with the specified text.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in 
+         * the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the 
+         * UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-         * setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
-         * setSelectedDataAsync(data: string): void;         *
-         *         *
+         * 
+         * `setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
+         * 
+         * `setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;`
+         * 
+         * `setSelectedDataAsync(data: string): void;`
+         *         
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  Any errors encountered will be provided in the asyncResult.error property.
          */
-        setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string, options?: Office.AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Replaces the selection in the body with the specified text.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in 
+         * the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the 
+         * UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *        coercionType: The desired format for the body. The string in the data parameter will be converted to this format.
          */
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Replaces the selection in the body with the specified text.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in 
+         * the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the 
+         * UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  Any errors encountered will be provided in the asyncResult.error property.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                  Any errors encountered will be provided in the asyncResult.error property.
          */
-        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
         /**
          * Replaces the selection in the body with the specified text.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the body of the item, or, if text is selected in 
+         * the editor, it replaces the selected text. If the cursor was never in the body of the item, or if the body of the item lost focus in the 
+         * UI, the string will be inserted at the top of the body content. After insertion, the cursor is placed at the end of the inserted content.
          *
-         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" (please see the Examples section for a sample).
+         * When including links in HTML markup, you can disable online link preview by setting the id attribute on the anchor (<a>) to "LPNoLP" 
+         * (please see the Examples section for a sample).
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.
-         *
-         * InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The data parameter is longer than 1,000,000 characters.</td></tr><tr><td></td><td>InvalidFormatError - The options.coercionType parameter is set to Office.CoercionType.Html and the message body is in plain text.</td></tr></table>
          *
          * @param data The string that will replace the existing body. The string is limited to 1,000,000 characters.
          */
@@ -6158,14 +8953,15 @@ declare namespace Office {
     /**
      * Represents a contact stored on the server. Read mode only.
      *
-     * The list of contacts associated with an email message or appointment is returned in the contacts property of the Entities object that is returned by the getEntities or getEntitiesByType method of the active item.
+     * The list of contacts associated with an email message or appointment is returned in the contacts property of the {@link Office.Entities} object 
+     * that is returned by the getEntities or getEntitiesByType method of the active item.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface Contact {
         /**
@@ -6194,16 +8990,19 @@ declare namespace Office {
         urls: Array<string>;
     }
     /**
-     * The CustomProperties object represents custom properties that are specific to a particular item and specific to a mail add-in for Outlook. For example, there might be a need for a mail add-in to save some data that is specific to the current email message that activated the add-in. If the user revisits the same message in the future and activates the mail add-in again, the add-in will be able to retrieve the data that had been saved as custom properties.
+     * The CustomProperties object represents custom properties that are specific to a particular item and specific to a mail add-in for Outlook. 
+     * For example, there might be a need for a mail add-in to save some data that is specific to the current email message that activated the add-in. 
+     * If the user revisits the same message in the future and activates the mail add-in again, the add-in will be able to retrieve the data that had 
+     * been saved as custom properties.
      *
      * Because Outlook for Mac doesn't cache custom properties, if the user's network goes down, mail add-ins cannot access their custom properties.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface CustomProperties {
         /**
@@ -6214,9 +9013,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         get(name: string): any;
         /**
@@ -6224,14 +9023,16 @@ declare namespace Office {
          *
          * The set method sets the specified property to the specified value. You must use the saveAsync method to save the property to the server.
          *
-         * The set method creates a new property if the specified property does not already exist; otherwise, the existing value is replaced with the new value. The value parameter can be of any type; however, it is always passed to the server as a string.
+         * The set method creates a new property if the specified property does not already exist; 
+         * otherwise, the existing value is replaced with the new value. 
+         * The value parameter can be of any type; however, it is always passed to the server as a string.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param name The name of the property to be set.
          * @param value The value of the property to be set.
@@ -6246,29 +9047,35 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         remove(name: string): void;
         /**
          * Saves item-specific custom properties to the server.
          *
-         * You must call the saveAsync method to persist any changes made with the set method or the remove method of the CustomProperties object. The saving action is asynchronous.
+         * You must call the saveAsync method to persist any changes made with the set method or the remove method of the CustomProperties object. 
+         * The saving action is asynchronous.
          *
-         * It's a good practice to have your callback function check for and handle errors from saveAsync. In particular, a read add-in can be activated while the user is in a connected state in a read form, and subsequently the user becomes disconnected. If the add-in calls saveAsync while in the disconnected state, saveAsync would return an error. Your callback method should handle this error accordingly.
+         * It's a good practice to have your callback function check for and handle errors from saveAsync. 
+         * In particular, a read add-in can be activated while the user is in a connected state in a read form, and subsequently the user becomes 
+         * disconnected. 
+         * If the add-in calls saveAsync while in the disconnected state, saveAsync would return an error. 
+         * Your callback method should handle this error accordingly.
          *
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          * @param asyncContext Optional. Any state data that is passed to the callback method.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        saveAsync(callback?: (result: AsyncResult) => void, asyncContext?: any): void;
+        saveAsync(callback?: (result: AsyncResult<void>) => void, asyncContext?: any): void;
     }
     /**
      * Provides diagnostic information to an Outlook add-in.
@@ -6276,9 +9083,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface Diagnostics {
         /**
@@ -6289,22 +9096,23 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         hostName: string;
         /**
          * Gets a string that represents the version of either the host application or the Exchange Server.
          *
-         * If the mail add-in is running on the Outlook desktop client or Outlook for iOS, the hostVersion property returns the version of the host application, Outlook. In Outlook Web App, the property returns the version of the Exchange Server. An example is the string 15.0.468.0.
+         * If the mail add-in is running on the Outlook desktop client or Outlook for iOS, the hostVersion property returns the version of the host 
+         * application, Outlook. In Outlook Web App, the property returns the version of the Exchange Server. An example is the string 15.0.468.0.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         hostVersion: string;
         /**
@@ -6316,20 +9124,22 @@ declare namespace Office {
          *
          * Outlook Web App has three views that correspond to the width of the screen and the window, and the number of columns that can be displayed:
          *
-         * - OneColumn, which is displayed when the screen is narrow. Outlook Web App uses this single-column layout on the entire screen of a smartphone.
+         * - OneColumn, which is displayed when the screen is narrow. Outlook Web App uses this single-column layout on the entire screen of a 
+         * smartphone.
          *
          * - TwoColumns, which is displayed when the screen is wider. Outlook Web App uses this view on most tablets.
          *
-         * - ThreeColumns, which is displayed when the screen is wide. For example, Outlook Web App uses this view in a full screen window on a desktop computer.
+         * - ThreeColumns, which is displayed when the screen is wide. For example, Outlook Web App uses this view in a full screen window on a 
+         * desktop computer.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        OWAView: "string";
+        OWAView: MailboxEnums.OWAView | "OneColumn" | "TwoColumns" | "ThreeColumns";
     }
     /**
      * Provides the email properties of the sender or specified recipients of an email message or appointment.
@@ -6337,9 +9147,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface EmailAddressDetails {
         /**
@@ -6351,7 +9161,9 @@ declare namespace Office {
          */
         displayName: string;
         /**
-         * Gets the response that an attendee returned for an appointment. This property applies to only an attendee of an appointment, as represented by the optionalAttendees or requiredAttendees property. This property returns undefined in other scenarios.
+         * Gets the response that an attendee returned for an appointment. 
+         * This property applies to only an attendee of an appointment, as represented by the optionalAttendees or requiredAttendees property. 
+         * This property returns undefined in other scenarios.
          */
         appointmentResponse: Office.MailboxEnums.ResponseType;
         /**
@@ -6365,9 +9177,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface EmailUser {
         /**
@@ -6382,24 +9194,32 @@ declare namespace Office {
     /**
      * Represents a collection of entities found in an email message or appointment. Read mode only.
      *
-     * The Entities object is a container for the entity arrays returned by the getEntities and getEntitiesByType methods when the item (either an email message or an appointment) contains one or more entities that have been found by the server. You can use these entities in your code to provide additional context information to the viewer, such as a map to an address found in the item, or to open a dialer for a phone number found in the item.
+     * The Entities object is a container for the entity arrays returned by the getEntities and getEntitiesByType methods when the item 
+     * (either an email message or an appointment) contains one or more entities that have been found by the server. 
+     * You can use these entities in your code to provide additional context information to the viewer, such as a map to an address found in the item, 
+     * or to open a dialer for a phone number found in the item.
      *
-     * If no entities of the type specified in the property are present in the item, the property associated with that entity is null. For example, if a message contains a street address and a phone number, the addresses property and phoneNumbers property would contain information, and the other properties would be null.
+     * If no entities of the type specified in the property are present in the item, the property associated with that entity is null. 
+     * For example, if a message contains a street address and a phone number, the addresses property and phoneNumbers property would contain 
+     * information, and the other properties would be null.
      *
-     * To be recognized as an address, the string must contain a United States postal address that has at least a subset of the elements of a street number, street name, city, state, and zip code.
+     * To be recognized as an address, the string must contain a United States postal address that has at least a subset of the elements of a street 
+     * number, street name, city, state, and zip code.
      *
      * To be recognized as a phone number, the string must contain a North American phone number format.
      *
-     * Entity recognition relies on natural language recognition that is based on machine learning of large amounts of data. The recognition of an entity is non-deterministic and success sometimes relies on the particular context in the item.
+     * Entity recognition relies on natural language recognition that is based on machine learning of large amounts of data. 
+     * The recognition of an entity is non-deterministic and success sometimes relies on the particular context in the item.
      *
-     * When the property arrays are returned by the getEntitiesByType method, only the property for the specified entity contains data; all other properties are null.
+     * When the property arrays are returned by the getEntitiesByType method, only the property for the specified entity contains data; 
+     * all other properties are null.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface Entities {
         /**
@@ -6438,9 +9258,11 @@ declare namespace Office {
      * [Api set: Mailbox Preview]
      * 
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      * 
-     * Applicable Outlook mode: Compose
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+     * 
+     * @beta
      */
     export interface From {
         /**
@@ -6448,413 +9270,115 @@ declare namespace Office {
          * 
          * The getAsync method starts an asynchronous call to the Exchange server to get the from value of a message.
          * 
-         * The from value of the item is provided as an EmailAddressDetails in the asyncResult.value property.
+         * The from value of the item is provided as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
          * 
          * [Api set: Mailbox Preview]
          * 
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
-         * In addition to this signature, the method also has the following signatures:
-         * getAsync(callback?: (result: AsyncResult) => void): void;
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `getAsync(callback?: (result: AsyncResult<Office.EmailAddressDetails>) => void): void;`
          * 
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an Office.AsyncResult object.
+         *                  The `value` property of the result is message's from value, as an EmailAddressDetails object.
          */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAsync(options: Office.AsyncContextOptions, callback: (result: AsyncResult<Office.EmailAddressDetails>) => void): void;
         /**
          * Gets the from value of a message.
          * 
          * The getAsync method starts an asynchronous call to the Exchange server to get the from value of a message.
          * 
-         * The from value of the item is provided as an EmailAddressDetails in the asyncResult.value property.
+         * The from value of the item is provided as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
          * 
          * [Api set: Mailbox Preview]
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an Office.AsyncResult object.
+         *                  The `value` property of the result is message's from value, as an EmailAddressDetails object.
          */
-        getAsync(callback?: (result: AsyncResult) => void): void;
+        getAsync(callback?: (result: AsyncResult<Office.EmailAddressDetails>) => void): void;
     }
 
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
+     * Represents the appointment organizer, even if an alias or a delegate was used to create the appointment. 
+     * This object provides a method to get the organizer value of an appointment in an Outlook add-in.
+     * 
+     * [Api set: Mailbox Preview]
+     * 
+     * @remarks
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+     * 
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+     * 
+     * @beta
+     */
+    export interface Organizer {
+        /**
+         * Gets the organizer value of an appointment as an {@link Office.EmailAddressDetails} in the asyncResult.value property.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         * 
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         *                  The `value` property of the result is message's organizer value, as an EmailAddressDetails object.
+         */
+        getAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.EmailAddressDetails>) => void): void;
+    }
+
+    /**
+     * The subclass of {@link Office.Item} dealing with appointments.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
      */
     interface Appointment extends Item {
     }
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
+     * The appointment organizer mode of {@link Office.Item | Office.context.mailbox.item}.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of `Office.context.mailbox.item`. Refer to the Object Model pages for more information.
      */
     interface AppointmentCompose extends Appointment, ItemCompose {
-        /**
-         * Gets or sets the date and time that the appointment is to end.
-         *
-         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
-         *
-         * *Compose mode*
-         *
-         * The end property returns a Time object.
-         *
-         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        end: Time;
-        /**
-         * Gets or sets the location of an appointment.
-         *
-         * *Compose mode*
-         *
-         * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        location: Location;
-        /**
-         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
-         *
-         * *Compose mode*
-         *
-         * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        optionalAttendees: Recipients;
-        /**
-         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
-         *
-         * *Compose mode*
-         *
-         * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        requiredAttendees: Recipients;
-        /**
-         * Gets or sets the date and time that the appointment is to begin.
-         *
-         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
-         *
-         * *Compose mode*
-         *
-         * The start property returns a Time object.
-         *
-         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        start: Time;
-    }
-    /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
-     */
-    interface AppointmentRead extends Appointment, ItemRead {
-        /**
-         * Gets the date and time that the appointment is to end.
-         *
-         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
-         *
-         * The end property returns a Date object.
-         *
-         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        end: Date;
-        /**
-         * Gets the location of an appointment.
-         *
-         * The location property returns a string that contains the location of the appointment.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        location: string;
-        /**
-         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
-         *
-         * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        optionalAttendees: EmailAddressDetails[];
-        /**
-         * Gets the email address of the meeting organizer for a specified meeting. Read mode only.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Read
-         */
-        organizer: EmailAddressDetails;
-        /**
-         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
-         *
-         * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        requiredAttendees: EmailAddressDetails[];
-        /**
-         * Gets the date and time that the appointment is to begin.
-         *
-         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
-         *
-         * The start property returns a Date object.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        start: Date;
-    }
-
-    interface AppointmentForm {
-        /**
+         /**
          * Gets an object that provides methods for manipulating the body of an item.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
-        body: string;
+        body: Office.Body;
         /**
-         * Gets or sets the date and time that the appointment is to end.
-         *
-         * The end property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
-         *
-         * *Read mode*
-         *
-         * The end property returns a Date object.
-         *
-         * *Compose mode*
-         *
-         * The end property returns a Time object.
-         *
-         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
+         * Gets the date and time that an item was created.  Read mode only.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
-         */
-        end: Date;
-        /**
-        * Gets or sets the location of an appointment.
-        *
-        * *Read mode*
-        *
-        * The location property returns a string that contains the location of the appointment.
-        *
-        * *Compose mode*
-        *
-        * The location property returns a Location object that provides methods that are used to get and set the location of the appointment.
-        *
-        * [Api set: Mailbox 1.0]
-        *
-        * @remarks
-        *
-        * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-        * Applicable Outlook mode: Compose or read
-        */
-        location: string;
-        /**
-        * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
-        *
-        * *Read mode*
-        *
-        * The optionalAttendees property returns an array that contains an EmailAddressDetails object for each optional attendee to the meeting.
-        *
-        * *Compose mode*
-        *
-        * The optionalAttendees property returns a Recipients object that provides methods to get or update the optional attendees for a meeting.
-        *
-        * [Api set: Mailbox 1.0]
-        *
-        * @remarks
-        *
-        * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-        *
-        * Applicable Outlook mode: Compose or read
-        */
-       optionalAttendees: string[] | EmailAddressDetails[];
-       resources: string[];
-        /**
-         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
-         *
-         * *Read mode*
-         *
-         * The requiredAttendees property returns an array that contains an EmailAddressDetails object for each required attendee to the meeting.
-         *
-         * *Compose mode*
-         *
-         * The requiredAttendees property returns a Recipients object that provides methods to get or update the required attendees for a meeting.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        requiredAttendees: string[] | EmailAddressDetails[];
-        /**
-         * Gets or sets the date and time that the appointment is to begin.
-         *
-         * The start property is expressed as a Coordinated Universal Time (UTC) date and time value. You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
-         *
-         * *Read mode*
-         *
-         * The start property returns a Date object.
-         *
-         * *Compose mode*
-         *
-         * The start property returns a Time object.
-         *
-         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on the client to UTC for the server.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        start: Date;
-        /**
-         * Gets or sets the description that appears in the subject field of an item.
-         *
-         * The subject property gets or sets the entire subject of the item, as sent by the email server.
-         *
-         * *Read mode*
-         *
-         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
-         *
-         * *Compose mode*
-         *
-         * The subject property returns a Subject object that provides methods to get and set the subject.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        subject: string;
-    }
-
-    /**
-     * The item namespace is used to access the currently selected message, meeting request, or appointment. You can determine the type of the item by using the itemType property.
-     *
-     * [Api set: Mailbox 1.0]
-     *
-     * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
-     *
-     * Applicable Outlook mode: Compose or read
-     */
-    interface Item {
-        /**
-         * Gets an object that provides methods for manipulating the body of an item.
-         *
-         * [Api set: Mailbox 1.1]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        body: Body;
-        /**
-         * Gets the date and time that an item was created. Read mode only.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
         dateTimeCreated: Date;
         /**
@@ -6864,13 +9388,31 @@ declare namespace Office {
          *
          * @remarks
          *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         *
          * Note: This member is not supported in Outlook for iOS or Outlook for Android.
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Read
          */
         dateTimeModifed: Date;
+        /**
+         * Gets or sets the date and time that the appointment is to end.
+         *
+         * The end property is an {@link Office.Time} object expressed as a Coordinated Universal Time (UTC) date and time value. 
+         * You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
+         *
+         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on 
+         * the client to UTC for the server.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         */
+        end: Time;
         /**
          * Gets the type of item that an instance represents.
          *
@@ -6880,11 +9422,24 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
         itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Gets or sets the {@link Office.Location} of an appointment. The location property returns a Location object that provides methods that are 
+         * used to get and set the location of the appointment.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         */
+        location: Location;
         /**
          * Gets the notification messages for an item.
          *
@@ -6892,160 +9447,120 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
-        notificationMessages: NotificationMessages;
-
+        notificationMessages: Office.NotificationMessages;
         /**
-         * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. Read and compose modes for appointment items. Read mode for meeting request items.
+         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item. 
+         * The optionalAttendees property returns an {@link Office.Recipients} object that provides methods to get or update the optional attendees 
+         * for a meeting.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         */
+        optionalAttendees: Recipients;
+        /**
+         * Gets the organizer for the specified meeting. 
          * 
-         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance in a series. null is returned for single appointments and meeting requests of single appointments. undefined is returned for messages that are not meeting requests.
+         * The organizer property returns an {@link Office.Organizer | Organizer} object that provides a method to get the organizer value.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         *
+         * @beta
+         */
+        organizer: Office.Organizer;
+        /**
+         * Gets or sets the recurrence pattern of an appointment.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance 
+         * in a series. `null` is returned for single appointments and meeting requests of single appointments.
          * 
          * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
          * 
-         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment and NOT a part of a series.
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single 
+         * appointment and NOT a part of a series.
          * 
          * [Api set: Mailbox Preview]
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * 
+         * @beta
          */
         recurrence: Recurrence;
-
+        /**
+         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item. 
+         * The requiredAttendees property returns an {@link Office.Recipients} object that provides methods to get or update the required attendees 
+         * for a meeting.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         */
+        requiredAttendees: Recipients;
         /**
          * Gets the id of the series that an instance belongs to.
          * 
-         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. 
+         * However, in iOS and Android, the seriesId returns the REST ID of the parent item.
          * 
-         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. The seriesId property is not identical to the Outlook IDs used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. 
+         * The seriesId property is not identical to the Outlook IDs used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
          * 
-         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests and returns undefined for any other items that are not meeting requests.
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests 
+         * and returns undefined for any other items that are not meeting requests.
          * 
          * [Api set: Mailbox Preview]
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * 
+         * @beta
          */
         seriesId: string;
-
         /**
-         * Adds an event handler for a supported event.
-         * 
-         * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
-         * 
-         * [Api set: Mailbox Preview]
+         * Gets or sets the date and time that the appointment is to begin.
+         *
+         * The start property is an {@link Office.Time} object expressed as a Coordinated Universal Time (UTC) date and time value. 
+         * You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
+         *
+         * When you use the Time.setAsync method to set the start time, you should use the convertToUtcClientTime method to convert the local time on 
+         * the client to UTC for the server.
+         *
+         * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
-         * 
-         * In addition to this signature, the method also has the following signatures:
-         * addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
-         * 
-         * @param eventType The event that should invoke the handler.
-         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
-         * @param options Optional. An object literal that contains one or more of the following properties.
-         *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
-        addHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
-
-        /**
-         * Adds an event handler for a supported event.
-         * 
-         * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
-         * 
-         * [Api set: Mailbox Preview]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         * 
-         * @param eventType The event that should invoke the handler.
-         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
-         */
-        addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
-
-       /**
-        * Asynchronously loads custom properties for this add-in on the selected item.
-        *
-        * Custom properties are stored as key/value pairs on a per-app, per-item basis. This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
-        *
-        * The custom properties are provided as a CustomProperties object in the asyncResult.value property. This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to the server.
-        *
-        * [Api set: Mailbox 1.0]
-        *
-        * @remarks
-        *
-        * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-        *
-        * Applicable Outlook mode: Compose or read
-        *
-        * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
-        * @param userContext Optional. Developers can provide any object they wish to access in the callback function. This object can be accessed by the asyncResult.asyncContext property in the callback function.
-        */
-       loadCustomPropertiesAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
-
-       /**
-        * Removes an event handler for a supported event.
-        * 
-        * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
-        * 
-         * [Api set: Mailbox Preview]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         * 
-         * In addition to this signature, the method also has the following signatures:
-         * removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
-         * 
-         * @param eventType The event that should invoke the handler.
-         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
-         * @param options Optional. An object literal that contains one or more of the following properties.
-         *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
-        */
-       removeHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult) => void): void;
-
-       /**
-        * Removes an event handler for a supported event.
-        * 
-        * Currently the only supported event type is Office.EventType.RecurrencePatternChanged, which is invoked when the user changes the recurrence pattern of a series.
-        * 
-         * [Api set: Mailbox Preview]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         * 
-         * @param eventType The event that should invoke the handler.
-         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
-        */
-       removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult) => void): void;
-    }
-    /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
-     */
-    interface ItemCompose extends Item {
+        start: Time;
         /**
          * Gets or sets the description that appears in the subject field of an item.
          *
@@ -7057,9 +9572,9 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
         subject: Subject;
         /**
@@ -7072,31 +9587,30 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * AttachmentSizeExceeded - The attachment is larger than allowed.
-         *
-         * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          * 
          * In addition to this signature, the method also has the following signatures:
-         * addFileAttachmentAsync(uri: string, attachmentName: string): void;
-         * addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
-         * addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult) => void): void;
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string): void;`
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;`
          *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         *        inInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. 
+         *                 On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
-        addFileAttachmentAsync(uri: string, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addFileAttachmentAsync(uri: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Adds a file to a message or appointment as an attachment.
          *
@@ -7107,17 +9621,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * AttachmentSizeExceeded - The attachment is larger than allowed.
-         *
-         * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
@@ -7133,25 +9641,19 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * AttachmentSizeExceeded - The attachment is larger than allowed.
-         *
-         * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         *        inInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body and should not be displayed in the attachment list.
          */
-        addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
+        addFileAttachmentAsync(uri: string, attachmentName: string, options: Office.AsyncContextOptions): void;
         /**
          * Adds a file to a message or appointment as an attachment.
          *
@@ -7162,75 +9664,156 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * AttachmentSizeExceeded - The attachment is larger than allowed.
-         *
-         * FileTypeNotSupported - The attachment has an extension that is not allowed.
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          *
          * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. 
+         *                 On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
-        addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult) => void): void;
-
+        addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;
         /**
-         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         * Adds a file to a message or appointment as an attachment.
          *
-         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * The addFileAttachmentFromBase64Async method uploads the file from the base64 encoding and attaches it to the item in the compose form. This method returns the attachment identifier in the AsyncResult.value object.
          *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
          *
-         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * @param base64File The base64 encoded content of an image or file to be added to an email or event.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body and should not be displayed in the attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. 
+         *                  On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                  If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * addItemAttachmentAsync(itemId: any, attachmentName: string): void;
-         * addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
-         * addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult) => void): void;
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;`
          *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult. 
+         *                 On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
-         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
          *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
          *
-         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
@@ -7239,182 +9822,234 @@ declare namespace Office {
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
-         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
          *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
          *
-         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, options: AsyncContextOptions): void;
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;
         /**
          * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
          *
-         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the callback method, if needed.
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
          *
          * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
          *
-         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that you are editing; however, this is not supported and is not recommended.
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors:
-         *
-         * NumberOfAttachmentsExceeded - The message or appointment has too many attachments.
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
          *
          * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
          * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult. 
+         *                 On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
          */
-        addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult) => void): void;
-
+        addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;
         /**
          * Closes the current item that is being composed
          *
-         * The behaviors of the close method depends on the current state of the item being composed. If the item has unsaved changes, the client prompts the user to save, discard, or close the action.
+         * The behaviors of the close method depends on the current state of the item being composed. 
+         * If the item has unsaved changes, the client prompts the user to save, discard, or close the action.
          *
          * In the Outlook desktop client, if the message is an inline reply, the close method has no effect.
          *
-         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, discard, or cancel even if no changes have occurred since the item was last saved.
+         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, 
+         * discard, or cancel even if no changes have occurred since the item was last saved.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          */
         close(): void;
         /**
          * Gets initialization data passed when the add-in is activated by an actionable message.
          *
          * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
-         *
+         * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
          *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         * 
          * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Read
-         *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
          */
-        getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
-                /**
+        getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
-         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. 
+         * If a field other than the body or subject is selected, the method returns the InvalidSelection error.
          *
-         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         * To access the selected data from the callback method, call asyncResult.value.data. 
+         * To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
          *
-         * [Api set: Mailbox 1.0]
+         * [Api set: Mailbox 1.2]
          *
          * @returns
          * The selected data as a string with format determined by coercionType.
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
-         * 
-         * In addition to this signature, the method also has these signatures:
-         * getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          *
-         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. 
+         *                     If HTML, the method returns the selected text, whether it is plaintext or HTML.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
          */
-        getSelectedDataAsync(coercionType: CoercionType, options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getSelectedDataAsync(coerciontype: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: AsyncResult<any>) => void): void;
          /**
          * Asynchronously returns selected data from the subject or body of a message.
          *
-         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. 
+         * If a field other than the body or subject is selected, the method returns the InvalidSelection error.
          *
-         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         * To access the selected data from the callback method, call asyncResult.value.data. 
+         * To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
          *
-         * [Api set: Mailbox 1.0]
+         * [Api set: Mailbox 1.2]
          *
          * @returns
          * The selected data as a string with format determined by coercionType.
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
          *
-         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. If HTML, the method returns the selected text, whether it is plaintext or HTML.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. 
+         *                     If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        getSelectedDataAsync(coercionType: CoercionType, callback: (result: AsyncResult) => void): void;
+        getSelectedDataAsync(coerciontype: Office.CoercionType, callback: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously loads custom properties for this add-in on the selected item.
+         *
+         * Custom properties are stored as key/value pairs on a per-app, per-item basis. 
+         * This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the 
+         * current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
+         *
+         * The custom properties are provided as a CustomProperties object in the asyncResult.value property. 
+         * This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to 
+         * the server.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+         *
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         * @param userContext Optional. Developers can provide any object they wish to access in the callback function. 
+         *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
+         */
+        loadCustomPropertiesAsync(callback: (result: AsyncResult<Office.CustomProperties>) => void, userContext?: any): void;
         /**
          * Removes an attachment from a message or appointment.
          *
-         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          * 
          * In addition to this signature, the method also has the following signatures:
-         * removeAttachmentAsync(attachmentIndex: string): void;
-         * removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
-         * removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult) => void): void;
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string): void;`
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
-        removeAttachmentAsync(attachmentIndex: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        removeAttachmentAsync(attachmentIndex: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Removes an attachment from a message or appointment.
          *
-         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          */
@@ -7422,51 +10057,118 @@ declare namespace Office {
         /**
          * Removes an attachment from a message or appointment.
          *
-         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        removeAttachmentAsync(attachmentIndex: string, options: AsyncContextOptions): void;
+        removeAttachmentAsync(attachmentIndex: string, options: Office.AsyncContextOptions): void;
         /**
          * Removes an attachment from a message or appointment.
          *
-         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form to continue in a separate window.
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. 
+         * In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
          * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
          */
-        removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult) => void): void;
-
+        removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult<void>) => void): void;
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrencePatternChanged`.
+        * 
+        * [Api set: Mailbox Preview]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+        * 
+        * In addition to this signature, the method also has the following signature:
+        * 
+        * `removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+        * 
+        * @param eventType The event that should invoke the handler.
+        * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+        *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+        * @param options Optional. An object literal that contains one or more of the following properties.
+        *        asyncContext: Developers can provide any object they wish to access in the callback method.
+        * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+        *                 asyncResult, which is an Office.AsyncResult object.
+        * 
+        * @beta
+        */
+       removeHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and `Office.EventType.RecurrencePatternChanged`.
+        * 
+        * [Api set: Mailbox Preview]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr></table>
+        * 
+        * @param eventType The event that should invoke the handler.
+        * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+        *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+        * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+        *                 asyncResult, which is an Office.AsyncResult object.
+        * 
+        * @beta
+        */
+       removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously saves an item.
          *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
          *
-         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
          *
-         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
          *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
          *
@@ -7478,30 +10180,39 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          * 
          * In addition to this signature, the method also has the following signatures:
-         * saveAsync(): void;
-         * saveAsync(options: AsyncContextOptions): void;
-         * saveAsync(callback: (result: AsyncResult) => void): void;
+         * 
+         * `saveAsync(): void;`
+         * 
+         * `saveAsync(options: Office.AsyncContextOptions): void;`
+         * 
+         * `saveAsync(callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult. 
          */
-        saveAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        saveAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously saves an item.
          *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
          *
-         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
          *
-         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
          *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
          *
@@ -7513,22 +10224,28 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
          */
         saveAsync(): void;
         /**
          * Asynchronously saves an item.
          *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
          *
-         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
          *
-         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
          *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
          *
@@ -7540,24 +10257,29 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        saveAsync(options: AsyncContextOptions): void;
+        saveAsync(options: Office.AsyncContextOptions): void;
         /**
          * Asynchronously saves an item.
          *
-         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. In Outlook in cached mode, the item is saved to the local cache.
          *
-         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
          *
-         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that when Outlook is in cached mode, it may take some time before the item is actually synced to the server. Until the item is synced, using the itemId will return an error.
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
          *
          * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
          *
@@ -7569,124 +10291,212 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
          */
-        saveAsync(callback: (result: AsyncResult) => void): void;
+        saveAsync(callback: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
          *
          * [Api set: Mailbox 1.2]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          * 
          * In addition to this signature, the method also has the following signatures:
-         * setSelectedDataAsync(data: string): void;
-         * setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
-         * setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+         * 
+         * `setSelectedDataAsync(data: string): void;`
+         * 
+         * `setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
+         * 
+         * `setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;`
          *
-        * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. 
+         *                      If the field is an HTML editor, only the text data is inserted, even if the data is HTML. 
+         *                      If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the 
+         *                      default style is applied in Outlook. 
+         *                      If the field is a text field, an InvalidDataFormat error is returned. 
+         *                      If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; 
+         *                      if the field is text, then plain text is used.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        setSelectedDataAsync(data: string, options?: AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string, options?: Office.AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
          *
          * [Api set: Mailbox 1.2]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
-         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          */
         setSelectedDataAsync(data: string): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
          *
          * [Api set: Mailbox 1.2]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
-         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. If the field is an HTML editor, only the text data is inserted, even if the data is HTML. If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; if the field is text, then plain text is used.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. 
+         *                      If the field is an HTML editor, only the text data is inserted, even if the data is HTML. 
+         *                      If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the 
+         *                      default style is applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. 
+         *                      If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; 
+         *                      if the field is text, then plain text is used.
          */
-        setSelectedDataAsync(data: string, options: AsyncContextOptions & CoercionTypeOptions): void;
+        setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;
         /**
          * Asynchronously inserts data into the body or subject of a message.
          *
-         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. After insertion, the cursor is placed at the end of the inserted content.
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
          *
          * [Api set: Mailbox 1.2]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
          *
-         * Errors: InvalidAttachmentId - The attachment identifier does not exist.
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
          *
-         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        setSelectedDataAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
     }
+
     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
+     * The appointment attendee mode of {@link Office.Item | Office.context.mailbox.item}.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of 'Office.context.mailbox.item'. Refer to the Object Model pages for more information.
      */
-    interface ItemRead extends Item {
+    interface AppointmentRead extends Appointment, ItemRead {
         /**
-         * Gets an array of attachments for the item. Read mode only.
+         * Gets an array of attachments for the item.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         *
+         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see 
+         * {@link https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519 | Blocked attachments in Outlook}.
+         *
+         */
+        attachments: Office.AttachmentDetails[];
+        /**
+         * Gets an object that provides methods for manipulating the body of an item.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        body: Office.Body;
+        /**
+         * Gets the date and time that an item was created. Read mode only.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. For more information, see {@link https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519 | Blocked attachments in Outlook}.
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Read
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
-        attachments: AttachmentDetails[];
+        dateTimeCreated: Date;
         /**
-         * Gets the Exchange Web Services item class of the selected item. Read mode only.
+         * Gets the date and time that an item was last modified. Read mode only.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         *
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         */
+        dateTimeModifed: Date;
+        /**
+         * Gets the date and time that the appointment is to end.
+         *
+         * The end property is a Date object expressed as a Coordinated Universal Time (UTC) date and time value. 
+         * You can use the convertToLocalClientTime method to convert the end property value to the client's local date and time.
+         *
+         * When you use the Time.setAsync method to set the end time, you should use the convertToUtcClientTime method to convert the local time on 
+         * the client to UTC for the server.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        end: Date;
+        /**
+         * Gets the Exchange Web Services item class of the selected item.
          *
-         * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or appointment item.
          *
          * You can create custom message classes that extends a default message class, for example, a custom appointment message class IPM.Appointment.Contoso.
          *
@@ -7694,46 +10504,212 @@ declare namespace Office {
          *
          * @remarks
          *
-         * |Type|Description|Item Class|
-         * |-----------|------------|------------|
-         * |Appointment items|These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurence.|IPM.Appointment,IPM.Appointment.Occurence|
-         * |Message items|These include email messages that have the default message class IPM.Note, and meeting requests, responses, and cancellations, that use IPM.Schedule.Meeting as the base message class.|IPM.Note,IPM.Schedule.Meeting.Request,IPM.Schedule.Meeting.Neg,IPM.Schedule.Meeting.Pos,IPM.Schedule.Meeting.Tent,IPM.Schedule.Meeting.Canceled|
-         * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         * 
+         * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or appointment item.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Type</th>
+         *     <th>Description</th>
+         *     <th>Item Class</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Appointment items</td>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurence</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Message items</td>
+         *     <td>These include email messages that have the default message class IPM.Note, and meeting requests, responses, and cancellations, that use IPM.Schedule.Meeting as the base message class.</td>
+         *     <td>IPM.Note,IPM.Schedule.Meeting.Request,IPM.Schedule.Meeting.Neg,IPM.Schedule.Meeting.Pos,IPM.Schedule.Meeting.Tent,IPM.Schedule.Meeting.Canceled</td>
+         *   </tr>
+         * </table>
+         * 
          */
         itemClass: string;
         /**
-         * Gets the Exchange Web Services item identifier for the current item. Read mode only.
+         * Gets the Exchange Web Services item identifier for the current item.
          *
-         * The itemId property is not available in compose mode. If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier in the AsyncResult.value parameter in the callback function.
+         * The itemId property is not available in compose mode. 
+         * If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier 
+         * in the AsyncResult.value parameter in the callback function.
          *
-         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. For more details, see Use the Outlook REST APIs from an Outlook add-in.
+         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. 
+         * The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api#get-the-item-id | Use the Outlook REST APIs from an Outlook add-in}.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
         itemId: string;
         /**
-         * Gets the subject of an item, with all prefixes removed (including RE: and FWD:). Read mode only.
+         * Gets the type of item that an instance represents.
          *
-         * The normalizedSubject property gets the subject of the item, with any standard prefixes (such as RE: and FW:) that are added by email programs. To get the subject of the item with the prefixes intact, use the subject property.
+         * The itemType property returns one of the ItemType enumeration values, indicating whether the item object instance is a message or an appointment.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Gets the location of an appointment.
+         *
+         * The location property returns a string that contains the location of the appointment.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        location: string;
+        /**
+         * Gets the subject of an item, with all prefixes removed (including RE: and FWD:).
+         *
+         * The normalizedSubject property gets the subject of the item, with any standard prefixes (such as RE: and FW:) that are added by email programs. 
+         * To get the subject of the item with the prefixes intact, use the subject property.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
         normalizedSubject: string;
+        /**
+         * Gets the notification messages for an item.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        notificationMessages: Office.NotificationMessages;
+        /**
+         * Provides access to the optional attendees of an event. The type of object and level of access depends on the mode of the current item.
+         *
+         * The optionalAttendees property returns an array that contains an {@link Office.EmailAddressDetails} object for each optional attendee to 
+         * the meeting.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        optionalAttendees: EmailAddressDetails[];
+        /**
+         * Gets the email address of the meeting organizer for a specified meeting.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        organizer: EmailAddressDetails;
+        /**
+         * Gets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance 
+         * in a series. `null` is returned for single appointments and meeting requests of single appointments.
+         * 
+         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
+         * 
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single 
+         * appointment and NOT a part of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         * 
+         * @beta
+         */
+        recurrence: Recurrence;
+        /**
+         * Provides access to the required attendees of an event. The type of object and level of access depends on the mode of the current item.
+         *
+         * The requiredAttendees property returns an array that contains an {@link Office.EmailAddressDetails} object for each required attendee to 
+         * the meeting.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        requiredAttendees: EmailAddressDetails[];
+        /**
+         * Gets the date and time that the appointment is to begin.
+         *
+         * The start property is a Date object expressed as a Coordinated Universal Time (UTC) date and time value. 
+         * You can use the convertToLocalClientTime method to convert the value to the client's local date and time.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         */
+        start: Date;
+        /**
+         * Gets the id of the series that an instance belongs to.
+         * 
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. 
+         * However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * 
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. 
+         * The seriesId property is not identical to the Outlook IDs used by the Outlook REST API. Before making REST API calls using this value, it 
+         * should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
+         * 
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests 
+         * and returns undefined for any other items that are not meeting requests.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         * 
+         * @beta
+         */
+        seriesId: string;
         /**
          * Gets the description that appears in the subject field of an item.
          *
@@ -7745,32 +10721,89 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
         subject: string;
+
         /**
-         * Displays a reply form that includes the sender and all recipients of the selected message or the organizer and all attendees of the selected appointment.
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes the sender and all recipients of the selected message or the organizer and all attendees of the 
+         * selected appointment.
          *
          * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
          *
          * If any of the string parameters exceed their limits, displayReplyAllForm throws an exception.
          *
-         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and 
+         * attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. 
+         * If this isn't possible, then no error message is thrown.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          *
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
          *  OR
-         * A ReplyFormData object that contains body or attachment data and a callback function
+         * An {@link Office.ReplyFormData} object that contains body or attachment data and a callback function
          */
         displayReplyAllForm(formData: string | ReplyFormData): void;
         /**
@@ -7780,7 +10813,9 @@ declare namespace Office {
          *
          * If any of the string parameters exceed their limits, displayReplyForm throws an exception.
          *
-         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. If this isn't possible, then no error message is thrown.
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and 
+         * attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. 
+         * If this isn't possible, then no error message is thrown.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -7788,54 +10823,68 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          *
          * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
          * OR
-         * A ReplyFormData object that contains body or attachment data and a callback function.
+         * An {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
          */
         displayReplyForm(formData: string | ReplyFormData): void;
         /**
          * Gets initialization data passed when the add-in is {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | activated by an actionable message}.
          * 
-         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
-         *
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web 
+         * for Office 365.
+         * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          * 
-         * In addition to this signature, the method also has the following signatures:
-         * getInitializationContextAsync(callback?: (result: AsyncResult) => void): void;
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `getInitializationContextAsync(callback?: (result: AsyncResult<string>) => void): void;`
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
          */
-        getInitializationContextAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets initialization data passed when the add-in is {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | activated by an actionable message}.
          * 
          * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
-         *
+         * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          * 
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object. On success, the initialization data is provided in the asyncResult.value property as a string. If there is no initialization context, the asyncResult object will contain an Error object with its code property set to 9020 and its name property set to GenericResponseError.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
          */
-        getInitializationContextAsync(callback?: (result: AsyncResult) => void): void;
+        getInitializationContextAsync(callback?: (result: AsyncResult<string>) => void): void;
         /**
-         * Gets the entities found in the selected item.
+         * Gets the entities found in the selected item's body.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -7843,46 +10892,81 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
         getEntities(): Entities;
         /**
-         * Gets an array of all the entities of the specified entity type found in the selected item.
+         * Gets an array of all the entities of the specified entity type found in the selected item's body.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
+         * 
+         * @param entityType One of the EntityType enumeration values.
          *
          * @returns
-         * If the value passed in entityType is not a valid member of the EntityType enumeration, the method returns null. If no entities of the specified type are present on the item, the method returns an empty array. Otherwise, the type of the objects in the returned array depends on the type of entity requested in the entityType parameter.
+         * If the value passed in entityType is not a valid member of the EntityType enumeration, the method returns null. 
+         * If no entities of the specified type are present in the item's body, the method returns an empty array. 
+         * Otherwise, the type of the objects in the returned array depends on the type of entity requested in the entityType parameter.
          *
          * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          * 
          * While the minimum permission level to use this method is Restricted, some entity types require ReadItem to access, as specified in the following table.
          * 
-         * |Value of entityType|Type of objects in returned array|Required Permission Level|
-         * |-------|-----------|----------|
-         * |Address|String|Restricted|
-         * |Contact|Contact|ReadItem|
-         * |EmailAddress|String|ReadItem|
-         * |MeetingSuggestion|MeetingSuggestion|ReadItem|
-         * |PhoneNumber|PhoneNumber|Restricted|
-         * |TaskSuggestion|TaskSuggestion|ReadItem|
-         * |URL|String|Restricted|
-         * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
-         *
-         * Applicable Outlook mode: Read
-         *
-         * @param entityType One of the EntityType enumeration values.
+         * <table>
+         *   <tr>
+         *     <th>Value of entityType</th>
+         *     <th>Type of objects in returned array</th>
+         *     <th>Required Permission Leve</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Address</td>
+         *     <td>String</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Contact</td>
+         *     <td>Contact</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>EmailAddress</td>
+         *     <td>String</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>MeetingSuggestion</td>
+         *     <td>MeetingSuggestion</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PhoneNumber</td>
+         *     <td>PhoneNumber</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         *   <tr>
+         *     <td>TaskSuggestion</td>
+         *     <td>TaskSuggestion</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>URL</td>
+         *     <td>String</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         * </table>
          */
         getEntitiesByType(entityType: Office.MailboxEnums.EntityType): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
         /**
          * Returns well-known entities in the selected item that pass the named filter defined in the manifest XML file.
          *
-         * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element in the manifest XML file with the specified FilterName element value.
+         * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element 
+         * in the manifest XML file with the specified FilterName element value.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -7890,41 +10974,55 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          *
          * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
-         * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, the method returns null. If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, the method return an empty array.
+         * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, 
+         * the method returns null. 
+         * If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, 
+         * the method return an empty array.
          */
         getFilteredEntitiesByName(name: string): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
         /**
          * Returns string values in the selected item that match the regular expressions defined in the manifest XML file.
          *
-         * The getRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
+         * The getRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or 
+         * ItemHasKnownEntity rule element in the manifest XML file. 
+         * For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. 
+         * The PropertyName simple type defines the supported properties.
          *
-         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body.
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. 
+         * Instead, use the Body.getAsync method to retrieve the entire body.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.0]
          *
          * @returns
-         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. 
+         * The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule 
+         * or the FilterName attribute of the matching ItemHasKnownEntity rule.
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
         getRegExMatches(): any;
         /**
          * Returns string values in the selected item that match the named regular expression defined in the manifest XML file.
          *
-         * The getRegExMatchesByName method returns the strings that match the regular expression defined in the ItemHasRegularExpressionMatch rule element in the manifest XML file with the specified RegExName element value.
+         * The getRegExMatchesByName method returns the strings that match the regular expression defined in the ItemHasRegularExpressionMatch rule 
+         * element in the manifest XML file with the specified RegExName element value.
          *
-         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -7935,9 +11033,9 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          *
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
@@ -7951,107 +11049,1789 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          *
          * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
          */
         getSelectedEntities(): Entities;
         /**
-         * Returns string values in a highlighted match that match the regular expressions defined in the manifest XML file. Highlighted matches apply to contextual add-ins.
+         * Returns string values in a highlighted match that match the regular expressions defined in the manifest XML file. 
+         * Highlighted matches apply to contextual add-ins.
          *
-         * The getSelectedRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
+         * The getSelectedRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or 
+         * ItemHasKnownEntity rule element in the manifest XML file. 
+         * For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. 
+         * The PropertyName simple type defines the supported properties.
          *
-         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body and should not attempt to return the entire body of the item. Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. Instead, use the Body.getAsync method to retrieve the entire body.
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. 
+         * Instead, use the Body.getAsync method to retrieve the entire body.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
          * [Api set: Mailbox 1.6]
          *
          * @returns
-         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. 
+         * The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule 
+         * or the FilterName attribute of the matching ItemHasKnownEntity rule.
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
          */
         getSelectedRegExMatches(): any;
-    }
-    /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
-     */
-    interface Message extends Item {
-        /**
-         * Gets an identifier for the email conversation that contains a particular message.
-         *
-         * You can get an integer for this property if your mail app is activated in read forms or responses in compose forms. If subsequently the user changes the subject of the reply message, upon sending the reply, the conversation ID for that message will change and that value you obtained earlier will no longer apply.
-         *
-         * You get null for this property for a new item in a compose form. If the user sets a subject and saves the item, the conversationId property will return a value.
-         *
-         * [Api set: Mailbox 1.0]
-         *
-         * @remarks
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
-         */
-        conversationId: string;
+       /**
+        * Asynchronously loads custom properties for this add-in on the selected item.
+        *
+        * Custom properties are stored as key/value pairs on a per-app, per-item basis. 
+        * This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the 
+        * current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
+        *
+        * The custom properties are provided as a CustomProperties object in the asyncResult.value property. 
+        * This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to 
+        * the server.
+        *
+        * [Api set: Mailbox 1.0]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+        *
+        * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+        *                 type Office.AsyncResult.
+        * @param userContext Optional. Developers can provide any object they wish to access in the callback function. 
+        *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
+        */
+       loadCustomPropertiesAsync(callback: (result: AsyncResult<Office.CustomProperties>) => void, userContext?: any): void;
+
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrencePatternChanged`.
+        * 
+        * [Api set: Mailbox Preview]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+        * 
+        * In addition to this signature, the method also has the following signature:
+        * 
+        * `removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+        * 
+        * @param eventType The event that should invoke the handler.
+        * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+        *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+        * @param options Optional. An object literal that contains one or more of the following properties.
+        *        asyncContext: Developers can provide any object they wish to access in the callback method.
+        * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+        *                 asyncResult, which is an Office.AsyncResult object.
+        * 
+        * @beta
+        */
+       removeHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrencePatternChanged`.
+        * 
+        * [Api set: Mailbox Preview]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Attendee</td></tr></table>
+        * 
+        * @param eventType The event that should invoke the handler.
+        * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+        *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+        * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+        *                 asyncResult, which is an Office.AsyncResult object.
+        * 
+        * @beta
+        */
+       removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void; 
     }
 
-     /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
+    /**
+     * The item namespace is used to access the currently selected message, meeting request, or appointment. 
+     * You can determine the type of the item by using the `itemType` property.
+     *
+     * [Api set: Mailbox 1.0]
+     *
+     * @remarks
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+     *
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
-    interface MessageCompose extends Message, ItemCompose {
+    interface Item {
         /**
-         * Gets an object that provides methods to get or update the recipients on the Bcc (blind carbon copy) line of a message. Compose mode only.
+         * Gets an object that provides methods for manipulating the body of an item.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        bcc: Recipients;
+        body: Office.Body;
         /**
-         * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the current item.
-         *
-         * *Compose mode*
-         *
-         * The cc property returns a Recipients object that provides methods to get or update the recipients on the Cc line of the message.
+         * Gets the date and time that an item was created. Read mode only.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
          */
-        cc: Recipients;
+        dateTimeCreated: Date;
         /**
-         * Gets the email address of the sender of a message.
+         * Gets the date and time that an item was last modified. Read mode only.
          *
-         * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
+         * [Api set: Mailbox 1.0]
          *
-         * The from property returns a From object that provides a method to get the from value.
+         * @remarks
          *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         */
+        dateTimeModifed: Date;
+        /**
+         * Gets the type of item that an instance represents.
+         *
+         * The itemType property returns one of the ItemType enumeration values, indicating whether the item object instance is a message or 
+         * an appointment.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Gets the notification messages for an item.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        notificationMessages: Office.NotificationMessages;
+
+        /**
+         * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. 
+         * Read and compose modes for appointment items. Read mode for meeting request items.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance 
+         * in a series. `null` is returned for single appointments and meeting requests of single appointments. 
+         * `undefined` is returned for messages that are not meeting requests.
+         * 
+         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
+         * 
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment 
+         * and NOT a part of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         * 
+         * @beta
+         */
+        recurrence: Office.Recurrence;
+
+        /**
+         * Gets the id of the series that an instance belongs to.
+         * 
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. 
+         * However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * 
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. 
+         * The seriesId property is not identical to the Outlook IDs used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
+         * 
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests 
+         * and returns undefined for any other items that are not meeting requests.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         * 
+         * @beta
+         */
+        seriesId: string;
+
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and `Office.EventType.RecurrencePatternChanged`.
+         * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
          */
-        from: From;
+        addHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+
         /**
-         * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the current item.
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+
+       /**
+        * Asynchronously loads custom properties for this add-in on the selected item.
+        *
+        * Custom properties are stored as key/value pairs on a per-app, per-item basis. 
+        * This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the 
+        * current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
+        *
+        * The custom properties are provided as a CustomProperties object in the asyncResult.value property. 
+        * This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to 
+        * the server.
+        *
+        * [Api set: Mailbox 1.0]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+        *
+        * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+        *                 type Office.AsyncResult.
+        * @param userContext Optional. Developers can provide any object they wish to access in the callback function. 
+        *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
+        */
+       loadCustomPropertiesAsync(callback: (result: AsyncResult<Office.CustomProperties>) => void, userContext?: any): void;
+
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrencePatternChanged`.
+        * 
+        * [Api set: Mailbox Preview]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+        * 
+        * In addition to this signature, the method also has the following signature:
+        * 
+        * `removeHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+        * 
+        * @param eventType The event that should invoke the handler.
+        * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+        *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+        * @param options Optional. An object literal that contains one or more of the following properties.
+        *        asyncContext: Developers can provide any object they wish to access in the callback method.
+        * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+        *                 asyncResult, which is an Office.AsyncResult object.
+        * 
+        * @beta
+        */
+       removeHandlerAsync(eventType: Office.EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+
+       /**
+        * Removes an event handler for a supported event.
+        * 
+        * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+        * `Office.EventType.RecurrencePatternChanged`.
+        * 
+        * [Api set: Mailbox Preview]
+        *
+        * @remarks
+        *
+        * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+        *
+        * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+        * 
+        * @param eventType The event that should invoke the handler.
+        * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+        *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+        * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+        *                 asyncResult, which is an Office.AsyncResult object.
+        * 
+        * @beta
+        */
+       removeHandlerAsync(eventType: Office.EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+    }
+    /**
+     * The compose mode of {@link Office.Item | Office.context.mailbox.item}.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of `Office.context.mailbox.item`. Refer to the Object Model pages for more information.
+     */
+    interface ItemCompose extends Item {
+        /**
+         * Gets or sets the description that appears in the subject field of an item.
+         *
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         *
+         * The subject property returns a Subject object that provides methods to get and set the subject.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        subject: Subject;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string): void;`
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;`
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the 
+         *        attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type asyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the 
+         *        attachment list.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string, options: Office.AsyncContextOptions): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;
+
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentFromBase64Async method uploads the file from the base64 encoding and attaches it to the item in the compose form. This method returns the attachment identifier in the AsyncResult.value object.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * @param base64File The base64 encoded content of an image or file to be added to an email or event.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body and should not be displayed in the attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. 
+         *                  On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                  If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the 
+         * callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;`
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the 
+         * callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the 
+         * callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the 
+         * callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;
+
+        /**
+         * Closes the current item that is being composed
+         *
+         * The behaviors of the close method depends on the current state of the item being composed. 
+         * If the item has unsaved changes, the client prompts the user to save, discard, or close the action.
+         *
+         * In the Outlook desktop client, if the message is an inline reply, the close method has no effect.
+         *
+         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, 
+         * discard, or cancel even if no changes have occurred since the item was last saved.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         */
+        close(): void;
+        /**
+         * Gets initialization data passed when the add-in is activated by an actionable message.
+         *
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web for Office 365.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
+         *
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously returns selected data from the subject or body of a message.
+         *
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. 
+         * If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         *
+         * To access the selected data from the callback method, call asyncResult.value.data. To access the source property that the selection comes 
+         * from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @returns
+         * The selected data as a string with format determined by coercionType.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         *
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string , removing any HTML tags present. 
+         *                     If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        getSelectedDataAsync(coerciontype: Office.CoercionType, callback: (result: AsyncResult<any>) => void): void;
+        /**
+         * Asynchronously returns selected data from the subject or body of a message.
+         *
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. 
+         * If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         *
+         * To access the selected data from the callback method, call asyncResult.value.data. 
+         * To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @returns
+         * The selected data as a string with format determined by coercionType.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
+         *
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string, removing any HTML tags present. 
+         *                     If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        getSelectedDataAsync(coerciontype: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: AsyncResult<any>) => void): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string): void;`
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult<void>) => void): void;`
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        removeAttachmentAsync(attachmentIndex: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         */
+        removeAttachmentAsync(attachmentIndex: string): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        removeAttachmentAsync(attachmentIndex: string, options: Office.AsyncContextOptions): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type {@link Offfice.AsyncResult}. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult<void>) => void): void;
+
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `saveAsync(): void;`
+         * 
+         * `saveAsync(options: Office.AsyncContextOptions): void;`
+         * 
+         * `saveAsync(callback: (result: AsyncResult<void>) => void): void;`
+         *
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        saveAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         */
+        saveAsync(): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        saveAsync(options: Office.AsyncContextOptions): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        saveAsync(callback: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `setSelectedDataAsync(data: string): void;`
+         * 
+         * `setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
+         * 
+         * `setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;`
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. 
+         *        If the field is an HTML editor, only the text data is inserted, even if the data is HTML. 
+         *        If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is 
+         *        applied in Outlook. 
+         *        If the field is a text field, an InvalidDataFormat error is returned. 
+         *        If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; 
+         *        if the field is text, then plain text is used.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         */
+        setSelectedDataAsync(data: string, options?: Office.AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         */
+        setSelectedDataAsync(data: string): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. 
+         *        If the field is an HTML editor, only the text data is inserted, even if the data is HTML. 
+         *        If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is 
+         *        applied in Outlook. 
+         *        If the field is a text field, an InvalidDataFormat error is returned. 
+         *        If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; 
+         *        if the field is text, then plain text is used.
+         */
+        setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         */
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
+    }
+    /**
+     * The read mode of {@link Office.Item | Office.context.mailbox.item}.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of `Office.context.mailbox.item`. Refer to the Object Model pages for more information.
+     */
+    interface ItemRead extends Item {
+        /**
+         * Gets an array of attachments for the item.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. 
+         * For more information, see 
+         * {@link https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519 | Blocked attachments in Outlook}.
+         *
+         */
+        attachments: Office.AttachmentDetails[];
+        /**
+         * Gets the Exchange Web Services item class of the selected item.
+         *
+         *
+         * You can create custom message classes that extends a default message class, for example, a custom appointment message class 
+         * IPM.Appointment.Contoso.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * 
+         * The itemClass property specifies the message class of the selected item. The following are the default message classes for the message or 
+         * appointment item.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Type</th>
+         *     <th>Description</th>
+         *     <th>Item Class</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Appointment items</td>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurence</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Message items</td>
+         *     <td>These include email messages that have the default message class IPM.Note, and meeting requests, responses, and cancellations, that use IPM.Schedule.Meeting as the base message class.</td>
+         *     <td>IPM.Note,IPM.Schedule.Meeting.Request,IPM.Schedule.Meeting.Neg,IPM.Schedule.Meeting.Pos,IPM.Schedule.Meeting.Tent,IPM.Schedule.Meeting.Canceled</td>
+         *   </tr>
+         * </table>
+         */
+        itemClass: string;
+        /**
+         * Gets the Exchange Web Services item identifier for the current item.
+         *
+         * The itemId property is not available in compose mode. 
+         * If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier 
+         * in the AsyncResult.value parameter in the callback function.
+         *
+         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. 
+         * The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api#get-the-item-id | Use the Outlook REST APIs from an Outlook add-in}.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         */
+        itemId: string;
+        /**
+         * Gets the subject of an item, with all prefixes removed (including RE: and FWD:).
+         *
+         * The normalizedSubject property gets the subject of the item, with any standard prefixes (such as RE: and FW:) that are added by 
+         * email programs. To get the subject of the item with the prefixes intact, use the subject property.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         */
+        normalizedSubject: string;
+        /**
+         * Gets the description that appears in the subject field of an item.
+         *
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         *
+         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        subject: string;
+        /**
+         * Displays a reply form that includes the sender and all recipients of the selected message or the organizer and all attendees of the 
+         * selected appointment.
+         *
+         * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
+         *
+         * If any of the string parameters exceed their limits, displayReplyAllForm throws an exception.
+         *
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and 
+         * attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. 
+         * If this isn't possible, then no error message is thrown.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+         *  OR
+         * An {@link Office.ReplyFormData} object that contains body or attachment data and a callback function
+         */
+        displayReplyAllForm(formData: string | ReplyFormData): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
+         *
+         * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
+         *
+         * If any of the string parameters exceed their limits, displayReplyForm throws an exception.
+         *
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and 
+         * attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. 
+         * If this isn't possible, then no error message is thrown.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
+         * OR
+         * An {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         */
+        displayReplyForm(formData: string | ReplyFormData): void;
+        /**
+         * Gets initialization data passed when the add-in is {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | activated by an actionable message}.
+         * 
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web 
+         * for Office 365.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `getInitializationContextAsync(callback?: (result: AsyncResult<string>) => void): void;`
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets initialization data passed when the add-in is {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | activated by an actionable message}.
+         * 
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web 
+         * for Office 365.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * 
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the entities found in the selected item's body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         */
+        getEntities(): Entities;
+        /**
+         * Gets an array of all the entities of the specified entity type found in the selected item's body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         * 
+         * @param entityType One of the EntityType enumeration values.
+         *
+         * @returns
+         * If the value passed in entityType is not a valid member of the EntityType enumeration, the method returns null. 
+         * If no entities of the specified type are present in the item's body, the method returns an empty array. 
+         * Otherwise, the type of the objects in the returned array depends on the type of entity requested in the entityType parameter.
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * 
+         * While the minimum permission level to use this method is Restricted, some entity types require ReadItem to access, as specified in the 
+         * following table.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Value of entityType</th>
+         *     <th>Type of objects in returned array</th>
+         *     <th>Required Permission Leve</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Address</td>
+         *     <td>String</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Contact</td>
+         *     <td>Contact</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>EmailAddress</td>
+         *     <td>String</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>MeetingSuggestion</td>
+         *     <td>MeetingSuggestion</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PhoneNumber</td>
+         *     <td>PhoneNumber</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         *   <tr>
+         *     <td>TaskSuggestion</td>
+         *     <td>TaskSuggestion</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>URL</td>
+         *     <td>String</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         * </table>
+         */
+        getEntitiesByType(entityType: Office.MailboxEnums.EntityType): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
+        /**
+         * Returns well-known entities in the selected item that pass the named filter defined in the manifest XML file.
+         *
+         * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element 
+         * in the manifest XML file with the specified FilterName element value.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
+         * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, 
+         * the method returns null. 
+         * If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, 
+         * the method return an empty array.
+         */
+        getFilteredEntitiesByName(name: string): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
+        /**
+         * Returns string values in the selected item that match the regular expressions defined in the manifest XML file.
+         *
+         * The getRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or 
+         * ItemHasKnownEntity rule element in the manifest XML file. 
+         * For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. 
+         * The PropertyName simple type defines the supported properties.
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. 
+         * Instead, use the Body.getAsync method to retrieve the entire body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @returns
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. 
+         * The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule 
+         * or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         */
+        getRegExMatches(): any;
+        /**
+         * Returns string values in the selected item that match the named regular expression defined in the manifest XML file.
+         *
+         * The getRegExMatchesByName method returns the strings that match the regular expression defined in the ItemHasRegularExpressionMatch rule 
+         * element in the manifest XML file with the specified RegExName element value.
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @returns
+         * An array that contains the strings that match the regular expression defined in the manifest XML file.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
+         */
+        getRegExMatchesByName(name: string): string[];
+        /**
+         * Gets the entities found in a highlighted match a user has selected. Highlighted matches apply to contextual add-ins.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.6]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         *
+         * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
+         */
+        getSelectedEntities(): Entities;
+        /**
+         * Returns string values in a highlighted match that match the regular expressions defined in the manifest XML file. 
+         * Highlighted matches apply to contextual add-ins.
+         *
+         * The getSelectedRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or 
+         * ItemHasKnownEntity rule element in the manifest XML file. For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. The PropertyName simple type defines the supported properties.
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. 
+         * Instead, use the Body.getAsync method to retrieve the entire body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.6]
+         *
+         * @returns
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. 
+         * The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule 
+         * or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         */
+        getSelectedRegExMatches(): any;
+    }
+    /**
+     * A subclass of {@link Office.Item} for messages.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of `Office.context.mailbox.item`. Refer to the Object Model pages for more information.
+     */
+    interface Message extends Item {
+        /**
+         * Gets an identifier for the email conversation that contains a particular message.
+         *
+         * You can get an integer for this property if your mail app is activated in read forms or responses in compose forms. 
+         * If subsequently the user changes the subject of the reply message, upon sending the reply, the conversation ID for that message will 
+         * change and that value you obtained earlier will no longer apply.
+         *
+         * You get null for this property for a new item in a compose form. 
+         * If the user sets a subject and saves the item, the conversationId property will return a value.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        conversationId: string;
+    }
+
+     /**
+     * The message compose mode of {@link Office.Item | Office.context.mailbox.item}.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of `Office.context.mailbox.item`. Refer to the Object Model pages for more information.
+     */
+    interface MessageCompose extends Message, ItemCompose {
+        /**
+         * Gets an object that provides methods to get or update the recipients on the Bcc (blind carbon copy) line of a message.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        bcc: Recipients;
+        /**
+         * Gets an object that provides methods for manipulating the body of an item.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        body: Office.Body;
+        /**
+         * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the 
+         * current item.
+         *
+         * The cc property returns a {@link Office.Recipients} object that provides methods to get or update the recipients on the Cc line of 
+         * the message.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        cc: Recipients;
+        /**
+         * Gets an identifier for the email conversation that contains a particular message.
+         *
+         * You can get an integer for this property if your mail app is activated in read forms or responses in compose forms. 
+         * If subsequently the user changes the subject of the reply message, upon sending the reply, the conversation ID for that message will change 
+         * and that value you obtained earlier will no longer apply.
+         *
+         * You get null for this property for a new item in a compose form. 
+         * If the user sets a subject and saves the item, the conversationId property will return a value.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        conversationId: string;
+        /**
+         * Gets the date and time that an item was created. Read mode only.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        dateTimeCreated: Date;
+        /**
+         * Gets the date and time that an item was last modified. Read mode only.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         *
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         */
+        dateTimeModifed: Date;
+        /**
+         * Gets the email address of the sender of a message.
+         *
+         * The from and sender properties represent the same person unless the message is sent by a delegate. 
+         * In that case, the from property represents the delegator, and the sender property represents the delegate.
+         *
+         * The from property returns a From object that provides a method to get the from value.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         *
+         * @beta
+         */
+        from: Office.From;
+        /**
+         * Gets the type of item that an instance represents.
+         *
+         * The itemType property returns one of the ItemType enumeration values, indicating whether the item object instance is a message or 
+         * an appointment.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Gets the notification messages for an item.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        notificationMessages: Office.NotificationMessages;
+        /**
+         * Gets or sets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. 
+         * Read and compose modes for appointment items. Read mode for meeting request items.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance 
+         * in a series. `null` is returned for single appointments and meeting requests of single appointments. 
+         * `undefined` is returned for messages that are not meeting requests.
+         * 
+         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
+         * 
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment 
+         * and NOT a part of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         * 
+         * @beta
+         */
+        recurrence: Recurrence;
+        /**
+         * Gets the id of the series that an instance belongs to.
+         * 
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. 
+         * However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * 
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. 
+         * The seriesId property is not identical to the Outlook IDs used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
+         * 
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests 
+         * and returns undefined for any other items that are not meeting requests.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         * 
+         * @beta
+         */
+        seriesId: string;
+        /**
+         * Gets or sets the description that appears in the subject field of an item.
+         *
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         *
+         * The subject property returns a Subject object that provides methods to get and set the subject.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        subject: Subject;
+        /**
+         * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the 
+         * current item.
          *
          * The to property returns a Recipients object that provides methods to get or update the recipients on the To line of the message.
          *
@@ -8059,34 +12839,962 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
          */
         to: Recipients;
-    }
-    /**
-     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
-     */
-    interface MessageRead extends Message, ItemRead {
+
         /**
-         * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the current item.
+         * Adds a file to a message or appointment as an attachment.
          *
-         * The cc property returns an array that contains an EmailAddressDetails object for each recipient listed on the Cc line of the message. The collection is limited to a maximum of 100 members.
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string): void;`
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;`
+         * 
+         * `addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;`
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the 
+         *        attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string, options?: AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body and should not be displayed in the attachment list.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string, options: AsyncContextOptions): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentAsync method uploads the file at the specified URI and attaches it to the item in the compose form.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param uri The URI that provides the location of the file to attach to the message or appointment. The maximum length is 2048 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addFileAttachmentAsync(uri: string, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds a file to a message or appointment as an attachment.
+         *
+         * The addFileAttachmentFromBase64Async method uploads the file from the base64 encoding and attaches it to the item in the compose form. This method returns the attachment identifier in the AsyncResult.value object.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Appointment Organizer</td></tr>
+         *
+         * <tr><td>Errors</td><td>AttachmentSizeExceeded - The attachment is larger than allowed.</td></tr><tr><td></td><td>FileTypeNotSupported - The attachment has an extension that is not allowed.</td></tr><tr><td></td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * @param base64File The base64 encoded content of an image or file to be added to an email or event.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        isInline: If true, indicates that the attachment will be shown inline in the message body and should not be displayed in the attachment list.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type asyncResult. 
+         *                  On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                  If uploading the attachment fails, the asyncResult object will contain an Error object that provides a description of the error.
+         */
+        addFileAttachmentFromBase64Async(base64File: string, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. You can use the options parameter to pass state information to the 
+         * callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         * 
+         * In addition to the main signature, this method also has these signatures:
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string): void;`
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;`
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, options: Office.AsyncContextOptions): void;
+        /**
+         * Adds an Exchange item, such as a message, as an attachment to the message or appointment.
+         *
+         * The addItemAttachmentAsync method attaches the item with the specified Exchange identifier to the item in the compose form. 
+         * If you specify a callback method, the method is called with one parameter, asyncResult, which contains either the attachment identifier or 
+         * a code that indicates any error that occurred while attaching the item. 
+         * You can use the options parameter to pass state information to the callback method, if needed.
+         *
+         * You can subsequently use the identifier with the removeAttachmentAsync method to remove the attachment in the same session.
+         *
+         * If your Office add-in is running in Outlook Web App, the addItemAttachmentAsync method can attach items to items other than the item that 
+         * you are editing; however, this is not supported and is not recommended.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>NumberOfAttachmentsExceeded - The message or appointment has too many attachments.</td></tr></table>
+         *
+         * @param itemId The Exchange identifier of the item to attach. The maximum length is 100 characters.
+         * @param attachmentName The name of the attachment that is shown while the attachment is uploading. The maximum length is 255 characters.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. On success, the attachment identifier will be provided in the asyncResult.value property. 
+         *                 If adding the attachment fails, the asyncResult object will contain an Error object that provides a description of 
+         *                 the error.
+         */
+        addItemAttachmentAsync(itemId: any, attachmentName: string, callback: (result: AsyncResult<string>) => void): void;
+        /**
+         * Closes the current item that is being composed
+         *
+         * The behaviors of the close method depends on the current state of the item being composed. 
+         * If the item has unsaved changes, the client prompts the user to save, discard, or close the action.
+         *
+         * In the Outlook desktop client, if the message is an inline reply, the close method has no effect.
+         *
+         * Note: In Outlook on the web, if the item is an appointment and it has previously been saved using saveAsync, the user is prompted to save, 
+         * discard, or cancel even if no changes have occurred since the item was last saved.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         */
+        close(): void;
+        /**
+         * Gets initialization data passed when the add-in is activated by an actionable message.
+         *
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web 
+         * for Office 365.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         *
+         * More information on {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | actionable messages}.
+         *
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Asynchronously returns selected data from the subject or body of a message.
+         *
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. 
+         * If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         *
+         * To access the selected data from the callback method, call asyncResult.value.data. 
+         * To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @returns
+         * The selected data as a string with format determined by coercionType.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         *
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string, removing any HTML tags present. 
+         *                     If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        getSelectedDataAsync(coerciontype: Office.CoercionType, callback: (result: AsyncResult<any>) => void): void;
+        /**
+         * Asynchronously returns selected data from the subject or body of a message.
+         *
+         * If there is no selection but the cursor is in the body or subject, the method returns null for the selected data. 
+         * If a field other than the body or subject is selected, the method returns the InvalidSelection error.
+         *
+         * To access the selected data from the callback method, call asyncResult.value.data. 
+         * To access the source property that the selection comes from, call asyncResult.value.sourceProperty, which will be either body or subject.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @returns
+         * The selected data as a string with format determined by coercionType.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         *
+         * @param coercionType Requests a format for the data. If Text, the method returns the plain text as a string, removing any HTML tags present. 
+         *                     If HTML, the method returns the selected text, whether it is plaintext or HTML.
+         * @param options An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        getSelectedDataAsync(coerciontype: Office.CoercionType, options: Office.AsyncContextOptions, callback: (result: AsyncResult<any>) => void): void;
+        /**
+         * Asynchronously loads custom properties for this add-in on the selected item.
+         *
+         * Custom properties are stored as key/value pairs on a per-app, per-item basis. 
+         * This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the 
+         * current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
+         *
+         * The custom properties are provided as a CustomProperties object in the asyncResult.value property. 
+         * This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to 
+         * the server.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         *
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         * @param userContext Optional. Developers can provide any object they wish to access in the callback function. 
+         *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
+         */
+        loadCustomPropertiesAsync(callback: (result: AsyncResult<Office.CustomProperties>) => void, userContext?: any): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string): void;`
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult<void>) => void): void;`
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        removeAttachmentAsync(attachmentIndex: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         */
+        removeAttachmentAsync(attachmentIndex: string): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        removeAttachmentAsync(attachmentIndex: string, options: Office.AsyncContextOptions): void;
+        /**
+         * Removes an attachment from a message or appointment.
+         *
+         * The removeAttachmentAsync method removes the attachment with the specified identifier from the item. 
+         * As a best practice, you should use the attachment identifier to remove an attachment only if the same mail app has added that attachment 
+         * in the same session. In Outlook Web App and OWA for Devices, the attachment identifier is valid only within the same session. 
+         * A session is over when the user closes the app, or if the user starts composing in an inline form and subsequently pops out the inline form 
+         * to continue in a separate window.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param attachmentIndex The identifier of the attachment to remove. The maximum length of the string is 100 characters.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If removing the attachment fails, the asyncResult.error property will contain an error code with the reason for the failure.
+         */
+        removeAttachmentAsync(attachmentIndex: string, callback: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        removeHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `saveAsync(): void;`
+         * 
+         * `saveAsync(options: Office.AsyncContextOptions): void;`
+         * 
+         * `saveAsync(callback: (result: AsyncResult<void>) => void): void;`
+         *
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         */
+        saveAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         */
+        saveAsync(): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         */
+        saveAsync(options: Office.AsyncContextOptions): void;
+        /**
+         * Asynchronously saves an item.
+         *
+         * When invoked, this method saves the current message as a draft and returns the item id via the callback method. 
+         * In Outlook Web App or Outlook in online mode, the item is saved to the server. 
+         * In Outlook in cached mode, the item is saved to the local cache.
+         *
+         * Since appointments have no draft state, if saveAsync is called on an appointment in compose mode, the item will be saved as a normal 
+         * appointment on the user's calendar. For new appointments that have not been saved before, no invitation will be sent. 
+         * Saving an existing appointment will send an update to added or removed attendees.
+         *
+         * Note: If your add-in calls saveAsync on an item in compose mode in order to get an itemId to use with EWS or the REST API, be aware that 
+         * when Outlook is in cached mode, it may take some time before the item is actually synced to the server. 
+         * Until the item is synced, using the itemId will return an error.
+         *
+         * Note: The following clients have different behavior for saveAsync on appointments in compose mode:
+         *
+         * - Mac Outlook does not support saveAsync on a meeting in compose mode. Calling saveAsync on a meeting in Mac Outlook will return an error.
+         *
+         * - Outlook on the web always sends an invitation or update when saveAsync is called on an appointment in compose mode.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         */
+        saveAsync(callback: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signatures:
+         * 
+         * `setSelectedDataAsync(data: string): void;`
+         * 
+         * `setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;`
+         * 
+         * `setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;`
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. 
+         *        If the field is an HTML editor, only the text data is inserted, even if the data is HTML. 
+         *        If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is 
+         *        applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. 
+         *        If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; 
+         *        if the field is text, then plain text is used.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         */
+        setSelectedDataAsync(data: string, options?: Office.AsyncContextOptions & CoercionTypeOptions, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         */
+        setSelectedDataAsync(data: string): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         *        coercionType: If text, the current style is applied in Outlook Web App and Outlook. 
+         *        If the field is an HTML editor, only the text data is inserted, even if the data is HTML. 
+         *        If html and the field supports HTML (the subject doesn't), the current style is applied in Outlook Web App and the default style is 
+         *        applied in Outlook. If the field is a text field, an InvalidDataFormat error is returned. 
+         *        If coercionType is not set, the result depends on the field: if the field is HTML then HTML is used; 
+         *        if the field is text, then plain text is used.
+         */
+        setSelectedDataAsync(data: string, options: Office.AsyncContextOptions & CoercionTypeOptions): void;
+        /**
+         * Asynchronously inserts data into the body or subject of a message.
+         *
+         * The setSelectedDataAsync method inserts the specified string at the cursor location in the subject or body of the item, or, if text is 
+         * selected in the editor, it replaces the selected text. If the cursor is not in the body or subject field, an error is returned. 
+         * After insertion, the cursor is placed at the end of the inserted content.
+         *
+         * [Api set: Mailbox 1.2]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Compose</td></tr>
+         *
+         * <tr><td>Errors</td><td>InvalidAttachmentId - The attachment identifier does not exist.</td></tr></table>
+         *
+         * @param data The data to be inserted. Data is not to exceed 1,000,000 characters. 
+         *             If more than 1,000,000 characters are passed in, an ArgumentOutOfRange exception is thrown.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 typeOffice.AsyncResult.
+         */
+        setSelectedDataAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
+    }
+    /**
+     * The message read mode of {@link Office.Item | Office.context.mailbox.item}.
+     * 
+     * Important: This is an internal Outlook object, not directly exposed through existing interfaces. 
+     * You should treat this as a mode of Office.context.mailbox.item. Refer to the Object Model pages for more information.
+     */
+    interface MessageRead extends Message, ItemRead {
+        /**
+         * Gets an array of attachments for the item.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * Note: Certain types of files are blocked by Outlook due to potential security issues and are therefore not returned. 
+         * For more information, see 
+         * {@link https://support.office.com/article/Blocked-attachments-in-Outlook-434752E1-02D3-4E90-9124-8B81E49A8519 | Blocked attachments in Outlook}.
+         *
+         */
+        attachments: Office.AttachmentDetails[];
+        /**
+         * Gets an object that provides methods for manipulating the body of an item.
+         *
+         * [Api set: Mailbox 1.1]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        body: Office.Body;
+        /**
+         * Provides access to the Cc (carbon copy) recipients of a message. The type of object and level of access depends on the mode of the 
+         * current item.
+         *
+         * The cc property returns an array that contains an EmailAddressDetails object for each recipient listed on the Cc line of the message. 
+         * The collection is limited to a maximum of 100 members.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
          */
         cc: EmailAddressDetails[];
+        /**
+         * Gets an identifier for the email conversation that contains a particular message.
+         *
+         * You can get an integer for this property if your mail app is activated in read forms or responses in compose forms. 
+         * If subsequently the user changes the subject of the reply message, upon sending the reply, the conversation ID for that message will change 
+         * and that value you obtained earlier will no longer apply.
+         *
+         * You get null for this property for a new item in a compose form. 
+         * If the user sets a subject and saves the item, the conversationId property will return a value.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        conversationId: string;
+        /**
+         * Gets the date and time that an item was created. Read mode only.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        dateTimeCreated: Date;
+        /**
+         * Gets the date and time that an item was last modified. Read mode only.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         */
+        dateTimeModifed: Date;
         /**
          * Gets the email address of the sender of a message.
          *
-         * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
+         * The from and sender properties represent the same person unless the message is sent by a delegate. 
+         * In that case, the from property represents the delegator, and the sender property represents the delegate.
          *
          * Note: The recipientType property of the EmailAddressDetails object in the from property is undefined.
          * 
@@ -8096,27 +13804,178 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
          */
         from: EmailAddressDetails;
         /**
-         * Gets the Internet message identifier for an email message. Read mode only.
+         * Gets the Internet message identifier for an email message.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
          */
         internetMessageId: string;
         /**
-         * Gets the email address of the sender of an email message. Read mode only.
+         * Gets the Exchange Web Services item class of the selected item.
+         * 
+         * You can create custom message classes that extends a default message class, for example, a custom appointment message class 
+         * IPM.Appointment.Contoso.
          *
-         * The from and sender properties represent the same person unless the message is sent by a delegate. In that case, the from property represents the delegator, and the sender property represents the delegate.
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+		 
+         * The itemClass property specifies the message class of the selected item. 
+         * The following are the default message classes for the message or appointment item.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Type</th>
+         *     <th>Description</th>
+         *     <th>Item Class</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Appointment items</td>
+         *     <td>These are calendar items of the item class IPM.Appointment or IPM.Appointment.Occurence.</td>
+         *     <td>IPM.Appointment,IPM.Appointment.Occurence</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Message items</td>
+         *     <td>These include email messages that have the default message class IPM.Note, and meeting requests, responses, and cancellations, that use IPM.Schedule.Meeting as the base message class.</td>
+         *     <td>IPM.Note,IPM.Schedule.Meeting.Request,IPM.Schedule.Meeting.Neg,IPM.Schedule.Meeting.Pos,IPM.Schedule.Meeting.Tent,IPM.Schedule.Meeting.Canceled</td>
+         *   </tr>
+         * </table>
+         * 
+         */
+        itemClass: string;
+        /**
+         * Gets the Exchange Web Services item identifier for the current item.
+         *
+         * The itemId property is not available in compose mode. 
+         * If an item identifier is required, the saveAsync method can be used to save the item to the store, which will return the item identifier 
+         * in the AsyncResult.value parameter in the callback function.
+         *
+         * Note: The identifier returned by the itemId property is the same as the Exchange Web Services item identifier. 
+         * The itemId property is not identical to the Outlook Entry ID or the ID used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api#get-the-item-id | Use the Outlook REST APIs from an Outlook add-in}.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        itemId: string;
+        /**
+         * Gets the type of item that an instance represents.
+         *
+         * The itemType property returns one of the ItemType enumeration values, indicating whether the item object instance is a message or 
+         * an appointment.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        itemType: Office.MailboxEnums.ItemType;
+        /**
+         * Gets the subject of an item, with all prefixes removed (including RE: and FWD:).
+         *
+         * The normalizedSubject property gets the subject of the item, with any standard prefixes (such as RE: and FW:) that are added by 
+         * email programs. 
+         * To get the subject of the item with the prefixes intact, use the subject property.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        normalizedSubject: string;
+        /**
+         * Gets the notification messages for an item.
+         *
+         * [Api set: Mailbox 1.3]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        notificationMessages: Office.NotificationMessages;
+        /**
+         * Gets the recurrence pattern of an appointment. Gets the recurrence pattern of a meeting request. 
+         * Read and compose modes for appointment items. Read mode for meeting request items.
+         * 
+         * The recurrence property returns a recurrence object for recurring appointments or meetings requests if an item is a series or an instance 
+         * in a series. `null` is returned for single appointments and meeting requests of single appointments. 
+         * `undefined` is returned for messages that are not meeting requests.
+         * 
+         * Note: Meeting requests have an itemClass value of IPM.Schedule.Meeting.Request.
+         * 
+         * Note: If the recurrence object is null, this indicates that the object is a single appointment or a meeting request of a single appointment 
+         * and NOT a part of a series.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * @beta
+         */
+        recurrence: Recurrence;
+        /**
+         * Gets the id of the series that an instance belongs to.
+         * 
+         * In OWA and Outlook, the seriesId returns the Exchange Web Services (EWS) ID of the parent (series) item that this item belongs to. 
+         * However, in iOS and Android, the seriesId returns the REST ID of the parent item.
+         * 
+         * Note: The identifier returned by the seriesId property is the same as the Exchange Web Services item identifier. 
+         * The seriesId property is not identical to the Outlook IDs used by the Outlook REST API. 
+         * Before making REST API calls using this value, it should be converted using Office.context.mailbox.convertToRestId. 
+         * For more details, see {@link https://docs.microsoft.com/outlook/add-ins/use-rest-api | Use the Outlook REST APIs from an Outlook add-in}.
+         * 
+         * The seriesId property returns null for items that do not have parent items such as single appointments, series items, or meeting requests 
+         * and returns undefined for any other items that are not meeting requests.
+         * 
+         * [Api set: Mailbox Preview]
+         * 
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         * 
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * @beta
+         */
+        seriesId: string;
+        /**
+         * Gets the email address of the sender of an email message.
+         *
+         * The from and sender properties represent the same person unless the message is sent by a delegate. 
+         * In that case, the from property represents the delegator, and the sender property represents the delegate.
          *
          * Note: The recipientType property of the EmailAddressDetails object in the sender property is undefined.
          *
@@ -8124,25 +13983,485 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
          */
         sender: EmailAddressDetails;
         /**
-         * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the current item.
+         * Gets the description that appears in the subject field of an item.
          *
-         * The to property returns an array that contains an EmailAddressDetails object for each recipient listed on the To line of the message. The collection is limited to a maximum of 100 members.
+         * The subject property gets or sets the entire subject of the item, as sent by the email server.
+         *
+         * The subject property returns a string. Use the normalizedSubject property to get the subject minus any leading prefixes such as RE: and FW:.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        subject: string;
+        /**
+         * Provides access to the recipients on the To line of a message. The type of object and level of access depends on the mode of the 
+         * current item.
+         *
+         * The to property returns an array that contains an EmailAddressDetails object for each recipient listed on the To line of the message. 
+         * The collection is limited to a maximum of 100 members.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
          */
         to: EmailAddressDetails[];
+
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+
+        /**
+         * Adds an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        addHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Displays a reply form that includes the sender and all recipients of the selected message or the organizer and all attendees of the 
+         * selected appointment.
+         *
+         * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
+         *
+         * If any of the string parameters exceed their limits, displayReplyAllForm throws an exception.
+         *
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and 
+         * attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. 
+         * If this isn't possible, then no error message is thrown.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB
+         *  OR
+         * An {@link Office.ReplyFormData} object that contains body or attachment data and a callback function
+         */
+        displayReplyAllForm(formData: string | ReplyFormData): void;
+        /**
+         * Displays a reply form that includes only the sender of the selected message or the organizer of the selected appointment.
+         *
+         * In Outlook Web App, the reply form is displayed as a pop-out form in the 3-column view and a pop-up form in the 2- or 1-column view.
+         *
+         * If any of the string parameters exceed their limits, displayReplyForm throws an exception.
+         *
+         * When attachments are specified in the formData.attachments parameter, Outlook and Outlook Web App attempt to download all attachments and 
+         * attach them to the reply form. If any attachments fail to be added, an error is shown in the form UI. 
+         * If this isn't possible, then no error message is thrown.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * @param formData A string that contains text and HTML and that represents the body of the reply form. The string is limited to 32 KB.
+         * OR
+         * An {@link Office.ReplyFormData} object that contains body or attachment data and a callback function.
+         */
+        displayReplyForm(formData: string | ReplyFormData): void;
+        /**
+         * Gets initialization data passed when the add-in is 
+         * {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | activated by an actionable message}.
+         * 
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the web 
+         * for Office 365.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `getInitializationContextAsync(callback?: (result: AsyncResult<string>) => void): void;`
+         * 
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets initialization data passed when the add-in is 
+         * {@link https://docs.microsoft.com/outlook/actionable-messages/invoke-add-in-from-actionable-message | activated by an actionable message}.
+         * 
+         * Note: This method is only supported by Outlook 2016 for Windows (Click-to-Run versions greater than 16.0.8413.1000) and Outlook on the 
+         * web for Office 365.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object. 
+         *                 On success, the initialization data is provided in the asyncResult.value property as a string. 
+         *                 If there is no initialization context, the asyncResult object will contain an Error object with its code property 
+         *                 set to 9020 and its name property set to GenericResponseError.
+         *
+         * @beta
+         */
+        getInitializationContextAsync(callback?: (result: AsyncResult<string>) => void): void;
+        /**
+         * Gets the entities found in the selected item's body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        getEntities(): Entities;
+        /**
+         * Gets an array of all the entities of the specified entity type found in the selected item's body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @param entityType One of the EntityType enumeration values.
+         * 
+         * @returns
+         * If the value passed in entityType is not a valid member of the EntityType enumeration, the method returns null. 
+         * If no entities of the specified type are present in the item's body, the method returns an empty array. 
+         * Otherwise, the type of the objects in the returned array depends on the type of entity requested in the entityType parameter.
+         *
+         * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
+         * 
+         * While the minimum permission level to use this method is Restricted, some entity types require ReadItem to access, as specified in the 
+         * following table.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Value of entityType</th>
+         *     <th>Type of objects in returned array</th>
+         *     <th>Required Permission Leve</th>
+         *   </tr>
+         *   <tr>
+         *     <td>Address</td>
+         *     <td>String</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         *   <tr>
+         *     <td>Contact</td>
+         *     <td>Contact</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>EmailAddress</td>
+         *     <td>String</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>MeetingSuggestion</td>
+         *     <td>MeetingSuggestion</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>PhoneNumber</td>
+         *     <td>PhoneNumber</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         *   <tr>
+         *     <td>TaskSuggestion</td>
+         *     <td>TaskSuggestion</td>
+         *     <td>ReadItem</td>
+         *   </tr>
+         *   <tr>
+         *     <td>URL</td>
+         *     <td>String</td>
+         *     <td>Restricted</td>
+         *   </tr>
+         * </table>
+         */
+        getEntitiesByType(entityType: Office.MailboxEnums.EntityType): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
+        /**
+         * Returns well-known entities in the selected item that pass the named filter defined in the manifest XML file.
+         *
+         * The getFilteredEntitiesByName method returns the entities that match the regular expression defined in the ItemHasKnownEntity rule element 
+         * in the manifest XML file with the specified FilterName element value.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * @param name The name of the ItemHasKnownEntity rule element that defines the filter to match.
+         * @returns If there is no ItemHasKnownEntity element in the manifest with a FilterName element value that matches the name parameter, 
+         * the method returns null. 
+         * If the name parameter does match an ItemHasKnownEntity element in the manifest, but there are no entities in the current item that match, 
+         * the method return an empty array.
+         */
+        getFilteredEntitiesByName(name: string): (string | Contact | MeetingSuggestion | PhoneNumber | TaskSuggestion)[];
+        /**
+         * Returns string values in the selected item that match the regular expressions defined in the manifest XML file.
+         *
+         * The getRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or 
+         * ItemHasKnownEntity rule element in the manifest XML file. 
+         * For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. 
+         * The PropertyName simple type defines the supported properties.
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. 
+         * Instead, use the Body.getAsync method to retrieve the entire body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @returns
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. 
+         * The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule 
+         * or the FilterName attribute of the matching ItemHasKnownEntity rule.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        getRegExMatches(): any;
+        /**
+         * Returns string values in the selected item that match the named regular expression defined in the manifest XML file.
+         *
+         * The getRegExMatchesByName method returns the strings that match the regular expression defined in the ItemHasRegularExpressionMatch rule 
+         * element in the manifest XML file with the specified RegExName element value.
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @returns
+         * An array that contains the strings that match the regular expression defined in the manifest XML file.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
+         */
+        getRegExMatchesByName(name: string): string[];
+        /**
+         * Gets the entities found in a highlighted match a user has selected. Highlighted matches apply to contextual add-ins.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.6]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * @param name The name of the ItemHasRegularExpressionMatch rule element that defines the filter to match.
+         */
+        getSelectedEntities(): Entities;
+        /**
+         * Returns string values in a highlighted match that match the regular expressions defined in the manifest XML file. 
+         * Highlighted matches apply to contextual add-ins.
+         *
+         * The getSelectedRegExMatches method returns the strings that match the regular expression defined in each ItemHasRegularExpressionMatch or 
+         * ItemHasKnownEntity rule element in the manifest XML file. 
+         * For an ItemHasRegularExpressionMatch rule, a matching string has to occur in the property of the item that is specified by that rule. 
+         * The PropertyName simple type defines the supported properties.
+         *
+         * If you specify an ItemHasRegularExpressionMatch rule on the body property of an item, the regular expression should further filter the body 
+         * and should not attempt to return the entire body of the item. 
+         * Using a regular expression such as .* to obtain the entire body of an item does not always return the expected results. 
+         * Instead, use the Body.getAsync method to retrieve the entire body.
+         *
+         * Note: This method is not supported in Outlook for iOS or Outlook for Android.
+         *
+         * [Api set: Mailbox 1.6]
+         *
+         * @returns
+         * An object that contains arrays of strings that match the regular expressions defined in the manifest XML file. 
+         * The name of each array is equal to the corresponding value of the RegExName attribute of the matching ItemHasRegularExpressionMatch rule or 
+         * the FilterName attribute of the matching ItemHasKnownEntity rule.
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         */
+        getSelectedRegExMatches(): any;
+        /**
+         * Asynchronously loads custom properties for this add-in on the selected item.
+         *
+         * Custom properties are stored as key/value pairs on a per-app, per-item basis. 
+         * This method returns a CustomProperties object in the callback, which provides methods to access the custom properties specific to the 
+         * current item and the current add-in. Custom properties are not encrypted on the item, so this should not be used as secure storage.
+         *
+         * The custom properties are provided as a CustomProperties object in the asyncResult.value property. 
+         * This object can be used to get, set, and remove custom properties from the item and save changes to the custom property set back to 
+         * the server.
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         *
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         * @param userContext Optional. Developers can provide any object they wish to access in the callback function. 
+         *                    This object can be accessed by the asyncResult.asyncContext property in the callback function.
+         */
+        loadCustomPropertiesAsync(callback: (result: AsyncResult<Office.CustomProperties>) => void, userContext?: any): void;
+        /**
+         * Removes an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;`
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+         * @param options Optional. An object literal that contains one or more of the following properties.
+         *        asyncContext: Developers can provide any object they wish to access in the callback method.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        removeHandlerAsync(eventType:EventType, handler: any, options?: any, callback?: (result: AsyncResult<void>) => void): void;
+        /**
+         * Removes an event handler for a supported event.
+         * 
+         * Currently the supported event types are `Office.EventType.AppointmentTimeChanged`, `Office.EventType.RecipientsChanged`, and 
+         * `Office.EventType.RecurrencePatternChanged`.
+         * 
+         * [Api set: Mailbox Preview]
+         *
+         * @remarks
+         *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Message Read</td></tr></table>
+         * 
+         * @param eventType The event that should invoke the handler.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to removeHandlerAsync.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         * 
+         * @beta
+         */
+        removeHandlerAsync(eventType:EventType, handler: any, callback?: (result: AsyncResult<void>) => void): void;
     }
 
     /**
@@ -8152,9 +14471,9 @@ declare namespace Office {
      *
      * @remarks
      *
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface LocalClientTime {
         /**
@@ -8196,93 +14515,105 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
      */
     interface Location {
         /**
          * Gets the location of an appointment.
          *
-         * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. The location of the appointment is provided as a string in the asyncResult.value property.
+         * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. 
+         * The location of the appointment is provided as a string in the asyncResult.value property.
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
-         * In addition to this signature, the method also has the following signatures:
-         * getAsync(callback: (result: AsyncResult) => void): void;
+         * In addition to this signature, the method also has the following signature:
+         * 
+         * `getAsync(callback: (result: AsyncResult<string>) => void): void;`
          * 
          */
-        getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the location of an appointment.
          *
-         * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. The location of the appointment is provided as a string in the asyncResult.value property.
+         * The getAsync method starts an asynchronous call to the Exchange server to get the location of an appointment. 
+         * The location of the appointment is provided as a string in the asyncResult.value property.
          *
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          */
-        getAsync(callback: (result: AsyncResult) => void): void;
+        getAsync(callback: (result: AsyncResult<string>) => void): void;
         /**
          * Sets the location of an appointment.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. 
+         * Setting the location of an appointment overwrites the current location.
          *
          * @param location The location of the appointment. The string is limited to 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If setting the location fails, the asyncResult.error property will contain an error code.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
          * 
          * In addition to this signature, the method also has the following signatures:
-         * setAsync(location: string): void;
-         * setAsync(location: string, options: AsyncContextOptions): void;
-         * setAsync(location: string, callback: (result: AsyncResult) => void): void;
+         * 
+         * `setAsync(location: string): void;`
+         * 
+         * `setAsync(location: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `setAsync(location: string, callback: (result: AsyncResult<void>) => void): void;`
          */
-        setAsync(location: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(location: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets the location of an appointment.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. 
+         * Setting the location of an appointment overwrites the current location.
          *
          * @param location The location of the appointment. The string is limited to 255 characters.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
          */
         setAsync(location: string): void;
         /**
          * Sets the location of an appointment.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. 
+         * Setting the location of an appointment overwrites the current location.
          *
          * @param location The location of the appointment. The string is limited to 255 characters.
          * @param options Optional. An object literal that contains one or more of the following properties.
@@ -8291,31 +14622,33 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
          */
-        setAsync(location: string, options: AsyncContextOptions): void;
+        setAsync(location: string, options: Office.AsyncContextOptions): void;
         /**
          * Sets the location of an appointment.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. Setting the location of an appointment overwrites the current location.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the location of an appointment. 
+         * Setting the location of an appointment overwrites the current location.
          *
          * @param location The location of the appointment. The string is limited to 255 characters.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the location fails, the asyncResult.error property will contain an error code.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If setting the location fails, the asyncResult.error property will contain an error code.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The location parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The location parameter is longer than 255 characters.</td></tr></table>
          */
-        setAsync(location: string, callback: (result: AsyncResult) => void): void;
+        setAsync(location: string, callback: (result: AsyncResult<void>) => void): void;
     }
     /**
      * Provides access to the Outlook Add-in object model for Microsoft Outlook and Microsoft Outlook on the web.
@@ -8331,29 +14664,58 @@ declare namespace Office {
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface Mailbox {
+        /**
+         * Provides diagnostic information to an Outlook add-in.
+         * 
+         * Contains the following members:
+         * 
+         *  - hostName (string): A string that represents the name of the host application. 
+         * It be one of the following values: Outlook, Mac Outlook, OutlookIOS, or OutlookWebApp.
+         * 
+         *  - hostVersion (string): A string that represents the version of either the host application or the Exchange Server. 
+         * If the mail add-in is running on the Outlook desktop client or Outlook for iOS, the hostVersion property returns the version of the 
+         * host application, Outlook. In Outlook Web App, the property returns the version of the Exchange Server. An example is the string 15.0.468.0.
+         * 
+         *  - OWAView (MailboxEnums.OWAView or string): An enum (or string literal) that represents the current view of Outlook Web App. 
+         * If the host application is not Outlook Web App, then accessing this property results in undefined. 
+         * Outlook Web App has three views (OneColumn - displayed when the screen is narrow, TwoColumns - displayed when the screen is wider, 
+         * and ThreeColumns - displayed when the screen is wide) that correspond to the width of the screen and the window, and the number of columns 
+         * that can be displayed.
+         *
+         *  More information is under {@link Office.Diagnostics}. 
+         *
+         * [Api set: Mailbox 1.0]
+         *
+         * @remarks
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         */
+        diagnostics: Office.Diagnostics;
         /**
          * Gets the URL of the Exchange Web Services (EWS) endpoint for this email account. Read mode only.
          *
          * Your app must have the ReadItem permission specified in its manifest to call the ewsUrl member in read mode.
          *
-         * In compose mode you must call the saveAsync method before you can use the ewsUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
-         *
-         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
+         * In compose mode you must call the saveAsync method before you can use the ewsUrl member. 
+         * Your app must have ReadWriteItem permissions to call the saveAsync method.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         *
          * The ewsUrl value can be used by a remote service to make EWS calls to the user's mailbox. For example, you can create a remote service to {@link https://msdn.microsoft.com/library/office/dn148008.aspx | get attachments from the selected item}.
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
+         * Note: This member is not supported in Outlook for iOS or Outlook for Android.
          */
         ewsUrl: string;
         /**
@@ -8367,42 +14729,54 @@ declare namespace Office {
          *
          * Your app must have the ReadItem permission specified in its manifest to call the restUrl member in read mode.
          *
-         * In compose mode you must call the saveAsync method before you can use the restUrl member. Your app must have ReadWriteItem permissions to call the saveAsync method.
+         * In compose mode you must call the saveAsync method before you can use the restUrl member. 
+         * Your app must have ReadWriteItem permissions to call the saveAsync method.
          *
          * [Api set: Mailbox 1.5]
          *
          * @remarks
          *
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
+         *
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+         *
          * The restUrl value can be used to make {@link https://docs.microsoft.com/outlook/rest/ | REST API} calls to the user's mailbox.
-         *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
-         *
-         * Applicable Outlook mode: Compose or read
          */
         restUrl: string;
+        /**
+         * Information about the user associated with the mailbox. This includes their account type, display name, email adddress, and time zone.
+         * 
+         * More information is under {@link Office.UserProfile}
+         */
+        userProfile: Office.UserProfile;
         /**
          * Adds an event handler for a supported event.
          *
-         * Currently the only supported event type is Office.EventType.ItemChanged, which is invoked when the user selects a new item. This event is used by add-ins that implement a pinnable taskpane, and allows the add-in to refresh the taskpane UI based on the currently selected item.
+         * Currently the only supported event type is Office.EventType.ItemChanged, which is invoked when the user selects a new item. 
+         * This event is used by add-ins that implement a pinnable taskpane, and allows the add-in to refresh the taskpane UI based on the currently 
+         * selected item.
          *
          * [Api set: Mailbox 1.5]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param eventType The event that should invoke the handler.
-         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
+         * @param handler The function to handle the event. The function must accept a single parameter, which is an object literal. 
+         *                The type property on the parameter will match the eventType parameter passed to addHandlerAsync.
          * @param options Optional. Provides an option for preserving context data of any type, unchanged, for use in a callback.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        addHandlerAsync(eventType: Office.EventType, handler: (type: Office.EventType) => void, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addHandlerAsync(eventType: Office.EventType, handler: (type: EventType) => void, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Converts an item ID formatted for REST into EWS format.
          *
-         * Item IDs retrieved via a REST API (such as the Outlook Mail API or the Microsoft Graph) use a different format than the format used by Exchange Web Services (EWS). The convertToEwsId method converts a REST-formatted ID into the proper format for EWS.
+         * Item IDs retrieved via a REST API (such as the Outlook Mail API or the Microsoft Graph) use a different format than the format used by 
+         * Exchange Web Services (EWS). The convertToEwsId method converts a REST-formatted ID into the proper format for EWS.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -8410,9 +14784,9 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param itemId An item ID formatted for the Outlook REST APIs.
          * @param restVersion A value indicating the version of the Outlook REST API used to retrieve the item ID.
@@ -8421,17 +14795,23 @@ declare namespace Office {
         /**
          * Gets a dictionary containing time information in local client time.
          *
-         * The dates and times used by a mail app for Outlook or Outlook Web App can use different time zones. Outlook uses the client computer time zone; Outlook Web App uses the time zone set on the Exchange Admin Center (EAC). You should handle date and time values so that the values you display on the user interface are always consistent with the time zone that the user expects.
+         * The dates and times used by a mail app for Outlook or Outlook Web App can use different time zones. 
+         * Outlook uses the client computer time zone; Outlook Web App uses the time zone set on the Exchange Admin Center (EAC). 
+         * You should handle date and time values so that the values you display on the user interface are always consistent with the time zone that 
+         * the user expects.
          *
-         * If the mail app is running in Outlook, the convertToLocalClientTime method will return a dictionary object with the values set to the client computer time zone. If the mail app is running in Outlook Web App, the convertToLocalClientTime method will return a dictionary object with the values set to the time zone specified in the EAC.
+         * If the mail app is running in Outlook, the convertToLocalClientTime method will return a dictionary object with the values set to the 
+         * client computer time zone. 
+         * If the mail app is running in Outlook Web App, the convertToLocalClientTime method will return a dictionary object with the values set to 
+         * the time zone specified in the EAC.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param timeValue A Date object.
          */
@@ -8444,12 +14824,14 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
+         * 
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the {@link https://msdn.microsoft.com/office/office365/APi/mail-rest-operations | Outlook Mail API} or the {@link http://graph.microsoft.io/ | Microsoft Graph}. The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
-         *
-         * Applicable Outlook mode: Compose or read
+         * Item IDs retrieved via EWS or via the itemId property use a different format than the format used by REST APIs (such as the 
+         * {@link https://msdn.microsoft.com/office/office365/APi/mail-rest-operations | Outlook Mail API} or the {@link http://graph.microsoft.io/ | Microsoft Graph}. 
+         * The convertToRestId method converts an EWS-formatted ID into the proper format for REST.
          *
          * @param itemId An item ID formatted for Exchange Web Services (EWS)
          * @param restVersion A value indicating the version of the Outlook REST API that the converted ID will be used with.
@@ -8458,15 +14840,16 @@ declare namespace Office {
         /**
          * Gets a Date object from a dictionary containing time information.
          *
-         * The convertToUtcClientTime method converts a dictionary containing a local date and time to a Date object with the correct values for the local date and time.
+         * The convertToUtcClientTime method converts a dictionary containing a local date and time to a Date object with the correct values for the 
+         * local date and time.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param input The local time value to convert.
          * @returns A Date object with the time expressed in UTC.
@@ -8475,13 +14858,17 @@ declare namespace Office {
         /**
          * Displays an existing calendar appointment.
          *
-         * The displayAppointmentForm method opens an existing calendar appointment in a new window on the desktop or in a dialog box on mobile devices.
+         * The displayAppointmentForm method opens an existing calendar appointment in a new window on the desktop or in a dialog box on 
+         * mobile devices.
          *
-         * In Outlook for Mac, you can use this method to display a single appointment that is not part of a recurring series, or the master appointment of a recurring series, but you cannot display an instance of the series. This is because in Outlook for Mac, you cannot access the properties (including the item ID) of instances of a recurring series.
+         * In Outlook for Mac, you can use this method to display a single appointment that is not part of a recurring series, or the 
+         * master appointment of a recurring series, but you cannot display an instance of the series. 
+         * This is because in Outlook for Mac, you cannot access the properties (including the item ID) of instances of a recurring series.
          *
          * In Outlook Web App, this method opens the specified form only if the body of the form is less than or equal to 32KB number of characters.
          *
-         * If the specified item identifier does not identify an existing appointment, a blank pane opens on the client computer or device, and no error message will be returned.
+         * If the specified item identifier does not identify an existing appointment, a blank pane opens on the client computer or device, and 
+         * no error message will be returned.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -8489,9 +14876,9 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param itemId The Exchange Web Services (EWS) identifier for an existing calendar appointment.
          */
@@ -8503,9 +14890,11 @@ declare namespace Office {
          *
          * In Outlook Web App, this method opens the specified form only if the body of the form is less than or equal to 32 KB number of characters.
          *
-         * If the specified item identifier does not identify an existing message, no message will be displayed on the client computer, and no error message will be returned.
+         * If the specified item identifier does not identify an existing message, no message will be displayed on the client computer, and 
+         * no error message will be returned.
          *
-         * Do not use the displayMessageForm with an itemId that represents an appointment. Use the displayAppointmentForm method to display an existing appointment, and displayNewAppointmentForm to display a form to create a new appointment.
+         * Do not use the displayMessageForm with an itemId that represents an appointment. Use the displayAppointmentForm method to display 
+         * an existing appointment, and displayNewAppointmentForm to display a form to create a new appointment.
          *
          * Note: This method is not supported in Outlook for iOS or Outlook for Android.
          *
@@ -8513,9 +14902,9 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param itemId The Exchange Web Services (EWS) identifier for an existing message.
          */
@@ -8523,11 +14912,16 @@ declare namespace Office {
         /**
          * Displays a form for creating a new calendar appointment.
          *
-         * The displayNewAppointmentForm method opens a form that enables the user to create a new appointment or meeting. If parameters are specified, the appointment form fields are automatically populated with the contents of the parameters.
+         * The displayNewAppointmentForm method opens a form that enables the user to create a new appointment or meeting. 
+         * If parameters are specified, the appointment form fields are automatically populated with the contents of the parameters.
          *
-         * In Outlook Web App and OWA for Devices, this method always displays a form with an attendees field. If you do not specify any attendees as input arguments, the method displays a form with a Save button. If you have specified attendees, the form would include the attendees and a Send button.
+         * In Outlook Web App and OWA for Devices, this method always displays a form with an attendees field. 
+         * If you do not specify any attendees as input arguments, the method displays a form with a Save button. 
+         * If you have specified attendees, the form would include the attendees and a Send button.
          *
-         * In the Outlook rich client and Outlook RT, if you specify any attendees or resources in the requiredAttendees, optionalAttendees, or resources parameter, this method displays a meeting form with a Send button. If you don't specify any recipients, this method displays an appointment form with a Save & Close button.
+         * In the Outlook rich client and Outlook RT, if you specify any attendees or resources in the requiredAttendees, optionalAttendees, or 
+         * resources parameter, this method displays a meeting form with a Send button. 
+         * If you don't specify any recipients, this method displays an appointment form with a Save & Close button.
          *
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
          *
@@ -8537,9 +14931,9 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
          *
          * @param parameters An AppointmentForm describing the new appointment. All properties are optional.
          */
@@ -8547,7 +14941,8 @@ declare namespace Office {
         /**
          * Displays a form for creating a new message.
          *
-         * The displayNewMessageForm method opens a form that enables the user to create a new message. If parameters are specified, the message form fields are automatically populated with the contents of the parameters.
+         * The displayNewMessageForm method opens a form that enables the user to create a new message. If parameters are specified, the message form 
+         * fields are automatically populated with the contents of the parameters.
          *
          * If any of the parameters exceed the specified size limits, or if an unknown parameter name is specified, an exception is thrown.
          *
@@ -8555,38 +14950,60 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
          *
          * @param parameters A dictionary containing all values to be filled in for the user in the new form. All parameters are optional.
-         *        toRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the To line. The array is limited to a maximum of 100 entries.
-         *        ccRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the Cc line. The array is limited to a maximum of 100 entries.
-         *        bccRecipients: An array of strings containing the email addresses or an array containing an EmailAddressDetails object for each of the recipients on the Bcc line. The array is limited to a maximum of 100 entries.
+         * 
+         *        toRecipients: An array of strings containing the email addresses or an array containing an {@link Office.EmailAddressDetails} object 
+         *        for each of the recipients on the To line. The array is limited to a maximum of 100 entries.
+         * 
+         *        ccRecipients: An array of strings containing the email addresses or an array containing an {@link Office.EmailAddressDetails} object 
+         *        for each of the recipients on the Cc line. The array is limited to a maximum of 100 entries.
+         * 
+         *        bccRecipients: An array of strings containing the email addresses or an array containing an {@link Office.EmailAddressDetails} object 
+         *        for each of the recipients on the Bcc line. The array is limited to a maximum of 100 entries.
+         * 
          *        subject: A string containing the subject of the message. The string is limited to a maximum of 255 characters.
+         * 
          *        htmlBody: The HTML body of the message. The body content is limited to a maximum size of 32 KB.
+         * 
          *        attachments: An array of JSON objects that are either file or item attachments.
+         * 
          *        attachments.type: Indicates the type of attachment. Must be file for a file attachment or item for an item attachment.
+         * 
          *        attachments.name: A string that contains the name of the attachment, up to 255 characters in length.
+         * 
          *        attachments.url: Only used if type is set to file. The URI of the location for the file.
-         *        attachments.isInline: Only used if type is set to file. If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
-         *        attachments.itemId: Only used if type is set to item. The EWS item id of the attachment. This is a string up to 100 characters.
+         * 
+         *        attachments.isInline: Only used if type is set to file. If true, indicates that the attachment will be shown inline in the 
+         *        message body, and should not be displayed in the attachment list.
+         * 
+         *        attachments.itemId: Only used if type is set to item. The EWS item id of the existing e-mail you want to attach to the new message. 
+         *        This is a string up to 100 characters.
          */
         displayNewMessageForm(parameters: any): void;
         /**
          * Gets a string that contains a token used to call REST APIs or Exchange Web Services.
          *
-         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
+         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. 
+         * The lifetime of the callback token is 5 minutes.
          *
          * *REST Tokens*
          *
-         * When a REST token is requested (options.isRest = true), the resulting token will not work to authenticate Exchange Web Services calls. The token will be limited in scope to read-only access to the current item and its attachments, unless the add-in has specified the ReadWriteMailbox permission in its manifest. If the ReadWriteMailbox permission is specified, the resulting token will grant read/write access to mail, calendar, and contacts, including the ability to send mail.
+         * When a REST token is requested (options.isRest = true), the resulting token will not work to authenticate Exchange Web Services calls. 
+         * The token will be limited in scope to read-only access to the current item and its attachments, unless the add-in has specified the 
+         * ReadWriteMailbox permission in its manifest. 
+         * If the ReadWriteMailbox permission is specified, the resulting token will grant read/write access to mail, calendar, and contacts, 
+         * including the ability to send mail.
          *
          * The add-in should use the restUrl property to determine the correct URL to use when making REST API calls.
          *
          * *EWS Tokens*
          *
-         * When an EWS token is requested (options.isRest = false), the resulting token will not work to authenticate REST API calls. The token will be limited in scope to accessing the current item.
+         * When an EWS token is requested (options.isRest = false), the resulting token will not work to authenticate REST API calls. 
+         * The token will be limited in scope to accessing the current item.
          *
          * The add-in should use the ewsUrl property to determine the correct URL to use when making EWS calls.
          *
@@ -8596,65 +15013,78 @@ declare namespace Office {
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose and read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
          * 
-         * In addition to this signature, the method has the following signature:
-         * getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
-         * getCallbackTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
+         * In addition to this signature, the method has the following signatures:
+         * 
+         * `getCallbackTokenAsync(callback: (result: AsyncResult<string>) => void): void;`
+         * 
+         * `getCallbackTokenAsync(callback: (result: AsyncResult<string>) => void, userContext?: any): void;`
          *
          * @param options An object literal that contains one or more of the following properties.
          *        isRest: Determines if the token provided will be used for the Outlook REST APIs or Exchange Web Services. Default value is false.
          *        asyncContext: Any state data that is passed to the asynchronous method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. The token is provided as a string in the asyncResult.value property.
          */
-        getCallbackTokenAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getCallbackTokenAsync(options: Office.AsyncContextOptions & { isRest?: boolean }, callback: (result: AsyncResult<string>) => void): void;
         /**
          * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
          *
-         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
+         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. 
+         * The lifetime of the callback token is 5 minutes.
          *
-         * You can pass the token and an attachment identifier or item identifier to a third-party system. The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
+         * You can pass the token and an attachment identifier or item identifier to a third-party system. 
+         * The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or 
+         * GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
          *
          * Your app must have the ReadItem permission specified in its manifest to call the getCallbackTokenAsync method in read mode.
          *
-         * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. Your app must have ReadWriteItem permissions to call the saveAsync method.
+         * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. 
+         * Your app must have ReadWriteItem permissions to call the saveAsync method.
          *
          * [Api set: Mailbox 1.5]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose and read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
          *
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. 
+         *                 The token is provided as a string in the asyncResult.value property.
          */
-        getCallbackTokenAsync(callback: (result: AsyncResult) => void): void;
+        getCallbackTokenAsync(callback: (result: AsyncResult<string>) => void): void;
         /**
          * Gets a string that contains a token used to get an attachment or item from an Exchange Server.
          *
-         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. The lifetime of the callback token is 5 minutes.
+         * The getCallbackTokenAsync method makes an asynchronous call to get an opaque token from the Exchange Server that hosts the user's mailbox. 
+         * The lifetime of the callback token is 5 minutes.
          *
-         * You can pass the token and an attachment identifier or item identifier to a third-party system. The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
+         * You can pass the token and an attachment identifier or item identifier to a third-party system. 
+         * The third-party system uses the token as a bearer authorization token to call the Exchange Web Services (EWS) GetAttachment or 
+         * GetItem operation to return an attachment or item. For example, you can create a remote service to get attachments from the selected item.
          *
          * Your app must have the ReadItem permission specified in its manifest to call the getCallbackTokenAsync method in read mode.
          *
-         * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. Your app must have ReadWriteItem permissions to call the saveAsync method.
+         * In compose mode you must call the saveAsync method to get an item identifier to pass to the getCallbackTokenAsync method. 
+         * Your app must have ReadWriteItem permissions to call the saveAsync method.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose and read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
          *
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. The token is provided as a string in the asyncResult.value property.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. The token is provided as a string in the asyncResult.value property.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
-        getCallbackTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
+        getCallbackTokenAsync(callback: (result: AsyncResult<string>) => void, userContext?: any): void;
         /**
          * Gets a token identifying the user and the Office Add-in.
          *
@@ -8664,16 +15094,19 @@ declare namespace Office {
          *
          * @remarks
          *
-         * The getUserIdentityTokenAsync method returns a token that you can use to identify and {@link https://msdn.microsoft.com/library/office/fp179828.aspx | authenticate the add-in and user with a third-party system}.
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
          *
-         * Applicable Outlook mode: Compose and read
+         * The getUserIdentityTokenAsync method returns a token that you can use to identify and 
+         * {@link https://msdn.microsoft.com/library/office/fp179828.aspx | authenticate the add-in and user with a third-party system}.
          *
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         *                 The token is provided as a string in the asyncResult.value property.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.|
          */
-        getUserIdentityTokenAsync(callback: (result: AsyncResult) => void, userContext?: any): void;
+        getUserIdentityTokenAsync(callback: (result: AsyncResult<string>) => void, userContext?: any): void;
         /**
          * Makes an asynchronous request to an Exchange Web Services (EWS) service on the Exchange server that hosts the user's mailbox.
          *
@@ -8685,50 +15118,66 @@ declare namespace Office {
          *
          * The XML request must specify UTF-8 encoding. <?xml version="1.0" encoding="utf-8"?>
          *
-         * Your add-in must have the ReadWriteMailbox permission to use the makeEwsRequestAsync method. For information about using the ReadWriteMailbox permission and the EWS operations that you can call with the makeEwsRequestAsync method, see Specify permissions for mail add-in access to the user's mailbox.
+         * Your add-in must have the ReadWriteMailbox permission to use the makeEwsRequestAsync method. 
+         * For information about using the ReadWriteMailbox permission and the EWS operations that you can call with the makeEwsRequestAsync method, 
+         * see {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Specify permissions for mail add-in access to the user's mailbox}.
          *
-         * The XML result of the EWS call is provided as a string in the asyncResult.value property. If the result exceeds 1 MB in size, an error message is returned instead.
+         * The XML result of the EWS call is provided as a string in the asyncResult.value property. 
+         * If the result exceeds 1 MB in size, an error message is returned instead.
          *
-         * Note: This method is not supported in the following scenarios. - In Outlook for iOS or Outlook for Android - When the add-in is loaded in a Gmail mailbox
+         * Note: This method is not supported in the following scenarios:
+         * 
+         * - In Outlook for iOS or Outlook for Android.
+         * 
+         * - When the add-in is loaded in a Gmail mailbox.
          *
-         * Note: The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the makeEwsRequestAsync method to make EWS requests.
+         * Note: The server administrator must set OAuthAuthentication to true on the Client Access Server EWS directory to enable the 
+         * makeEwsRequestAsync method to make EWS requests.
          *
          * *Version differences*
          *
-         * When you use the makeEwsRequestAsync method in mail apps running in Outlook versions earlier than version 15.0.4535.1004, you should set the encoding value to ISO-8859-1.
+         * When you use the makeEwsRequestAsync method in mail apps running in Outlook versions earlier than version 15.0.4535.1004, you should set 
+         * the encoding value to ISO-8859-1.
          *
-         * <?xml version="1.0" encoding="iso-8859-1"?>
+         * `<?xml version="1.0" encoding="iso-8859-1"?>`
          *
-         * You do not need to set the encoding value when your mail app is running in Outlook on the web. You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property.
+         * You do not need to set the encoding value when your mail app is running in Outlook on the web. 
+         * You can determine whether your mail app is running in Outlook or Outlook on the web by using the mailbox.diagnostics.hostName property. 
+         * You can determine what version of Outlook is running by using the mailbox.diagnostics.hostVersion property.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteMailbox
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteMailbox</td></tr>
          *
-         * Applicable Outlook mode: Compose and read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose and read</td></tr></table>
          *
          * @param data The EWS request.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                 The `value` property of the result is the XML of the EWS request provided as a string. 
+         *                 If the result exceeds 1 MB in size, an error message is returned instead.
          * @param userContext Optional. Any state data that is passed to the asynchronous method.
          */
-        makeEwsRequestAsync(data: any, callback: (result: AsyncResult) => void, userContext?: any): void;
+        makeEwsRequestAsync(data: any, callback: (result: AsyncResult<string>) => void, userContext?: any): void;
     }
 
     /**
      * Represents a suggested meeting found in an item. Read mode only.
      *
-     * The list of meetings suggested in an email message is returned in the meetingSuggestions property of the Entities object that is returned when the getEntities or getEntitiesByType method is called on the active item.
+     * The list of meetings suggested in an email message is returned in the meetingSuggestions property of the Entities object that is returned when 
+     * the getEntities or getEntitiesByType method is called on the active item.
      *
-     * The start and end values are string representations of a Date object that contains the date and time at which the suggested meeting is to begin and end. The values are in the default time zone specified for the current user.
+     * The start and end values are string representations of a Date object that contains the date and time at which the suggested meeting is to 
+     * begin and end. 
+     * The values are in the default time zone specified for the current user.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface MeetingSuggestion {
         /**
@@ -8762,9 +15211,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.3]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface NotificationMessageDetails {
         /**
@@ -8772,19 +15221,27 @@ declare namespace Office {
          */
         key?: string;
         /**
-         * Specifies the Office.MailboxEnums.ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. Including them will result in an ArgumentException. If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
+         * Specifies the ItemNotificationMessageType of message. If type is ProgressIndicator or ErrorMessage, an icon is automatically supplied and 
+         * the message is not persistent. Therefore the icon and persistent properties are not valid for these types of messages. 
+         * Including them will result in an ArgumentException. 
+         * If type is ProgressIndicator, the developer should remove or replace the progress indicator when the action is complete.
          */
         type: Office.MailboxEnums.ItemNotificationMessageType;
         /**
-         * A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
+         * A reference to an icon that is defined in the manifest in the Resources section. It appears in the infobar area. 
+         * It is only applicable if the type is InformationalMessage. Specifying this parameter for an unsupported type results in an exception.
          */
         icon?: string;
         /**
-         * The text of the notification message. Maximum length is 150 characters. If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
+         * The text of the notification message. Maximum length is 150 characters. 
+         * If the developer passes in a longer string, an ArgumentOutOfRange exception is thrown.
          */
         message: string;
         /**
-         * Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. If false, it is removed when the user navigates to a different item. For error notifications, the message persists until the user sees it once. Specifying this parameter for an unsupported type throws an exception.
+         * Only applicable when type is InformationalMessage. If true, the message remains until removed by this add-in or dismissed by the user. 
+         * If false, it is removed when the user navigates to a different item. 
+         * For error notifications, the message persists until the user sees it once. 
+         * Specifying this parameter for an unsupported type throws an exception.
          */
         persistent?: Boolean;
     }
@@ -8794,9 +15251,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.3]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface NotificationMessages {
         /**
@@ -8804,40 +15261,48 @@ declare namespace Office {
          *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
          *
-         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
+         * @param key  A developer-specified key used to reference this notification message. 
+         *             Developers can use it to modify this message later. It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. 
+         *                    It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          * 
          * In addition to this signature, the method also has the following signatures:
-         * addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
-         * addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
-         * addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
+         * 
+         * `addAsync(key: string, JSONmessage: NotificationMessageDetails): void;`
+         * 
+         * `addAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;`
+         * 
+         * `addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult<void>) => void): void;`
          * 
          */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Adds a notification to an item.
          *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
          *
-         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. 
+         *             It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. 
+         *                    It contains a NotificationMessageDetails object.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         addAsync(key: string, JSONmessage: NotificationMessageDetails): void;
         /**
@@ -8845,97 +15310,109 @@ declare namespace Office {
          *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
          *
-         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. 
+         *             It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. 
+         *                    It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;
         /**
          * Adds a notification to an item.
          *
          * There are a maximum of 5 notifications per message. Setting more will return a NumberOfNotificationMessagesExceeded error.
          *
-         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the notification message to be added to the item. It contains a NotificationMessageDetails object.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param key  A developer-specified key used to reference this notification message. Developers can use it to modify this message later. 
+         *             It can't be longer than 32 characters.
+         * @param JSONmessage A JSON object that contains the notification message to be added to the item. 
+         *                    It contains a NotificationMessageDetails object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
+        addAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult<void>) => void): void;
         /**
          * Returns all keys and messages for an item.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * getAllAsync(callback: (result: AsyncResult) => void): void;
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `getAllAsync(callback: (result: AsyncResult<Office.NotificationMessageDetails[]>) => void): void;`
          *
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                 The `value` property of the result is an array of NotificationMessageDetails objects.
          */
-        getAllAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAllAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.NotificationMessageDetails[]>) => void): void;
         /**
          * Returns all keys and messages for an item.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type Office.AsyncResult.
+         *                 The `value` property of the result is an array of NotificationMessageDetails objects.
          */
-        getAllAsync(callback: (result: AsyncResult) => void): void;
+        getAllAsync(callback: (result: AsyncResult<Office.NotificationMessageDetails[]>) => void): void;
         /**
          * Removes a notification message for an item.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * removeAsync(key: string): void;
-         * removeAsync(key: string, options: AsyncContextOptions): void;
-         * removeAsync(key: string, callback: (result: AsyncResult) => void): void;         * 
+         * 
+         * `removeAsync(key: string): void;`
+         * 
+         * `removeAsync(key: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `removeAsync(key: string, callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param key The key for the notification message to remove.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        removeAsync(key: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        removeAsync(key: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Removes a notification message for an item.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param key The key for the notification message to remove.
          */
@@ -8946,29 +15423,30 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param key The key for the notification message to remove.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        removeAsync(key: string, options: AsyncContextOptions): void;
+        removeAsync(key: string, options: Office.AsyncContextOptions): void;
         /**
          * Removes a notification message for an item.
          *
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param key The key for the notification message to remove.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        removeAsync(key: string, callback: (result: AsyncResult) => void): void;
+        removeAsync(key: string, callback: (result: AsyncResult<void>) => void): void;
         /**
          * Replaces a notification message that has a given key with another message.
          *
@@ -8977,22 +15455,27 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
-         * replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
-         * replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
+         * 
+         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;`
+         * 
+         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;`
+         * 
+         * `replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. 
+         *                    It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Replaces a notification message that has a given key with another message.
          *
@@ -9001,12 +15484,13 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. 
+         *                    It contains a NotificationMessageDetails object.
          */
         replaceAsync(key: string, JSONmessage: NotificationMessageDetails): void;
         /**
@@ -9017,16 +15501,17 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. 
+         *                    It contains a NotificationMessageDetails object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: AsyncContextOptions): void;
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, options: Office.AsyncContextOptions): void;
         /**
          * Replaces a notification message that has a given key with another message.
          *
@@ -9035,27 +15520,30 @@ declare namespace Office {
          * [Api set: Mailbox 1.3]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param key The key for the notification message to replace. It can't be longer than 32 characters.
-         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. It contains a NotificationMessageDetails object.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param JSONmessage A JSON object that contains the new notification message to replace the existing message. 
+         *                    It contains a NotificationMessageDetails object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult) => void): void;
+        replaceAsync(key: string, JSONmessage: NotificationMessageDetails, callback: (result: AsyncResult<void>) => void): void;
     }
     /**
      * Represents a phone number identified in an item. Read mode only.
      *
-     * An array of PhoneNumber objects containing the phone numbers found in an email message is returned in the phoneNumbers property of the Entities object that is returned when you call the getEntities method on the selected item.
+     * An array of PhoneNumber objects containing the phone numbers found in an email message is returned in the phoneNumbers property of the 
+     * Entities object that is returned when you call the getEntities method on the selected item.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface PhoneNumber {
         /**
@@ -9075,9 +15563,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
      */
     interface Recipients {
         /**
@@ -9094,23 +15582,27 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
-         * addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
-         * addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
+         * 
+         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;`
+         * 
+         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;`
+         * 
+         * `addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
-        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Adds a recipient list to the existing recipients for an appointment or message.
          *
@@ -9125,11 +15617,11 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          *
          * @param recipients The recipients to add to the recipients list.
          */
@@ -9141,24 +15633,24 @@ declare namespace Office {
          *
          * - Strings containing SMTP email addresses
          *
-         * - EmailUser objects
+         * - {@link Office.EmailUser} objects
          *
-         * - EmailAddressDetails objects
+         * - {@link Office.EmailAddressDetails} objects
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;
         /**
          * Adds a recipient list to the existing recipients for an appointment or message.
          *
@@ -9166,58 +15658,64 @@ declare namespace Office {
          *
          * - Strings containing SMTP email addresses
          *
-         * - EmailUser objects
+         * - {@link Office.EmailUser} objects
          *
-         * - EmailAddressDetails objects
+         * - {@link Office.EmailAddressDetails} objects
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          *
          * @param recipients The recipients to add to the recipients list.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If adding the recipients fails, the asyncResult.error property will contain an error code.
          */
-        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
+        addAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult<void>) => void): void;
         /**
          * Gets a recipient list for an appointment or message.
          *
-         * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
+         * When the call completes, the asyncResult.value property will contain an array of {@link Office.EmailAddressDetails} objects.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * getAsync(callback: (result: AsyncResult) => void): void;
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `getAsync(callback: (result: AsyncResult<Office.EmailAddressDetails[]>) => void): void;`
          *
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         *                 The `value` property of the result is an array of EmailAddressDetails objects.
          */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAsync(options: Office.AsyncContextOptions, callback: (result: AsyncResult<Office.EmailAddressDetails[]>) => void): void;
         /**
          * Gets a recipient list for an appointment or message.
          *
-         * When the call completes, the asyncResult.value property will contain an array of EmailAddressDetails objects.
+         * When the call completes, the asyncResult.value property will contain an array of {@link Office.EmailAddressDetails} objects.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          *
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         *                 The `value` property of the result is an array of EmailAddressDetails objects.
          */
-        getAsync(callback: (result: AsyncResult) => void): void;
+        getAsync(callback: (result: AsyncResult<Office.EmailAddressDetails[]>) => void): void;
         /**
          * Sets a recipient list for an appointment or message.
          *
@@ -9227,30 +15725,36 @@ declare namespace Office {
          *
          * - Strings containing SMTP email addresses
          *
-         * - EmailUser objects
+         * - {@link Office.EmailUser} objects
          *
-         * - EmailAddressDetails objects
+         * - {@link Office.EmailAddressDetails} objects
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;
-         * setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
-         * setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
+         * 
+         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[]): void;`
+         * 
+         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;`
+         * 
+         * `setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         *                 If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred 
+         *                 while adding the data.
          */
-        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets a recipient list for an appointment or message.
          *
@@ -9260,18 +15764,18 @@ declare namespace Office {
          *
          * - Strings containing SMTP email addresses
          *
-         * - EmailUser objects
+         * - {@link Office.EmailUser} objects
          *
-         * - EmailAddressDetails objects
+         * - {@link Office.EmailAddressDetails} objects
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          *
          * @param recipients The recipients to add to the recipients list.
          */
@@ -9285,24 +15789,24 @@ declare namespace Office {
          *
          * - Strings containing SMTP email addresses
          *
-         * - EmailUser objects
+         * - {@link Office.EmailUser} objects
          *
-         * - EmailAddressDetails objects
+         * - {@link Office.EmailAddressDetails} objects
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          *
          * @param recipients The recipients to add to the recipients list.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: AsyncContextOptions): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], options: Office.AsyncContextOptions): void;
         /**
          * Sets a recipient list for an appointment or message.
          *
@@ -9312,46 +15816,83 @@ declare namespace Office {
          *
          * - Strings containing SMTP email addresses
          *
-         * - EmailUser objects
+         * - {@link Office.EmailUser} objects
          *
-         * - EmailAddressDetails objects
+         * - {@link Office.EmailAddressDetails} objects
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.
+         * <tr><td>Errors</td><td>NumberOfRecipientsExceeded - The number of recipients exceeded 100 entries.</td></tr></table>
          *
          * @param recipients The recipients to add to the recipients list.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.  If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred while adding the data.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If setting the recipients fails the asyncResult.error property will contain a code that indicates any error that occurred 
+         *                 while adding the data.
          */
-        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult) => void): void;
+        setAsync(recipients: (string | EmailUser | EmailAddressDetails)[], callback: (result: AsyncResult<void>) => void): void;
 
     }
 
     /**
-     * The recurrence object provides methods to get and set the recurrence pattern of appointments but only get the recurrence pattern of meeting requests. It will have a dictionary with the following keys: seriesTime, recurrenceType, recurrenceProperties, and recurrenceTimeZone (optional).
-     * 
+     * The recurrence object provides methods to get and set the recurrence pattern of appointments but only get the recurrence pattern of 
+     * meeting requests. 
+     * It will have a dictionary with the following keys: seriesTime, recurrenceType, recurrenceProperties, and recurrenceTimeZone (optional).
      * 
      * [Api set: Mailbox Preview]
      * 
      * @remarks
      * 
-     * |State|Editable?|Viewable?|
-     * |-----|---------|---------|
-     * |Appointment Organizer - Compose Series|Yes (setAsync)|Yes (getAsync)|
-     * |Appointment Organizer - Compose Instance|No (setAsync returns error)|Yes (getAsync)|
-     * |Appointment Attendee - Read Series|No (setAsync not available)|Yes (item.recurrence)|
-     * |Appointment Attendee - Read Instance|No (setAsync not available)|Yes (item.recurrence)|
-     * |Meeting Request - Read Series|No (setAsync not available)|Yes (item.recurrence)|
-     * |Meeting Request - Read Instance|No (setAsync not available)|Yes (item.recurrence)|
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      * 
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      * 
-     * Applicable Outlook mode: Compose or read
+     * **States**
+     * 
+     * <table>
+     *   <tr>
+     *     <th>State</th>
+     *     <th>Editable?</th>
+     *     <th>Viewable?</th>
+     *   </tr>
+     *   <tr>
+     *     <td>Appointment Organizer - Compose Series</td>
+     *     <td>Yes (setAsync)</td>
+     *     <td>Yes (getAsync)</td>
+     *   </tr>
+     *   <tr>
+     *     <td>Appointment Organizer - Compose Instance</td>
+     *     <td>No (setAsync returns error)</td>
+     *     <td>Yes (getAsync)</td>
+     *   </tr>
+     *   <tr>
+     *     <td>Appointment Attendee - Read Series</td>
+     *     <td>No (setAsync not available)</td>
+     *     <td>Yes (item.recurrence)</td>
+     *   </tr>
+     *   <tr>
+     *     <td>Appointment Attendee - Read Instance</td>
+     *     <td>No (setAsync not available)</td>
+     *     <td>Yes (item.recurrence)</td>
+     *   </tr>
+     *   <tr>
+     *     <td>Meeting Request - Read Series</td>
+     *     <td>No (setAsync not available)</td>
+     *     <td>Yes (item.recurrence)</td>
+     *   </tr>
+     *   <tr>
+     *     <td>Meeting Request - Read Instance</td>
+     *     <td>No (setAsync not available)</td>
+     *     <td>Yes (item.recurrence)</td>
+     *   </tr>
+     * </table>
+     * 
+     * @beta
      */
     export interface Recurrence {
         /**
@@ -9361,9 +15902,9 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         recurrenceProperties: RecurrenceProperties;
         /**
@@ -9373,11 +15914,11 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        recurrenceTimeZone: MailboxEnums.RecurrenceTimeZone;
+        recurrenceTimeZone: Office.MailboxEnums.RecurrenceTimeZone;
 
         /**
          * Gets or sets the type of the recurring appointment series.
@@ -9386,24 +15927,26 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        recurrenceType: MailboxEnums.RecurrenceType;
+        recurrenceType: Office.MailboxEnums.RecurrenceType;
 
         /**
-         * This object enables you to manage the start and end dates of the recurring appointment series and the usual start and end times of instances. **This object is not in UTC time.** Instead, it is set in the time zone specified by the recurrenceTimeZone value or defaulted to the item's time zone.
+         * The {@link Office.SeriesTime} object enables you to manage the start and end dates of the recurring appointment series and the usual start 
+         * and end times of instances. **This object is not in UTC time.** 
+         * Instead, it is set in the time zone specified by the recurrenceTimeZone value or defaulted to the item's time zone.
          * 
          * [Api set: Mailbox Preview]
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
-        seriesTime: SeriesTime;
+        seriesTime: Office.SeriesTime;
 
         /**
          * Returns the current recurrence object of an appointment series.
@@ -9414,18 +15957,21 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * getAsync(callback?: (result: AsyncResult) => void): void;
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `getAsync(callback?: (result: AsyncResult<Office.Recurrence>) => void): void;`
          * 
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         *                 The `value` property of the result is a Recurrence object.
          */
-        getAsync(options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        getAsync(options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<Office.Recurrence>) => void): void;
 
         /**
          * Returns the current recurrence object of an appointment series.
@@ -9436,13 +15982,15 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          * 
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
+         *                 The `value` property of the result is a Recurrence object.
          */
-        getAsync(callback?: (result: AsyncResult) => void): void;
+        getAsync(callback?: (result: AsyncResult<Office.Recurrence>) => void): void;
 
         /**
          * Sets the recurrence pattern of an appointment series.
@@ -9453,21 +16001,23 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: InvalidEndTime - The appointment end time is before its start time.
+         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before its start time.</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * setAsync(recurrencePattern: Recurrence, callback?: (result: AsyncResult) => void): void;
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `setAsync(recurrencePattern: Recurrence, callback?: (result: AsyncResult<void>) => void): void;`
          * 
          * @param recurrencePattern A recurrence object.
          * @param options Optional. An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
          */
-        setAsync(recurrencePattern: Recurrence, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(recurrencePattern: Recurrence, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
 
         /**
          * Sets the recurrence pattern of an appointment series.
@@ -9478,16 +16028,17 @@ declare namespace Office {
          * 
          * @remarks
          * 
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          * 
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: InvalidEndTime - The appointment end time is before its start time.
+         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before its start time.</td></tr></table>
          * 
          * @param recurrencePattern A recurrence object.
-         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter, 
+         *                 asyncResult, which is an Office.AsyncResult object.
          */
-        setAsync(recurrencePattern: Recurrence, callback?: (result: AsyncResult) => void): void;
+        setAsync(recurrencePattern: Recurrence, callback?: (result: AsyncResult<void>) => void): void;
     }
 
     /**
@@ -9497,9 +16048,11 @@ declare namespace Office {
      * 
      * @remarks
      * 
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      * 
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+     * 
+     * @beta
      */
     export interface RecurrenceProperties {
         /**
@@ -9513,23 +16066,24 @@ declare namespace Office {
         /**
          * Represents the day of the week or type of day, for example, weekend day vs weekday.
          */
-        dayOfWeek: MailboxEnums.Days;
+        dayOfWeek: Office.MailboxEnums.Days;
         /**
          * Represents the set of days for this recurrence. Valid values are: 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', and 'Sun'.
          */
-        days: MailboxEnums.Days[];
+        days: Office.MailboxEnums.Days[];
         /**
          * Represents the number of the week in the selected month e.g. 'first' for first week of the month.
          */
-        weekNumber: MailboxEnums.WeekNumber;
+        weekNumber: Office.MailboxEnums.WeekNumber;
         /**
          * Represents the month.
          */
-        month: MailboxEnums.Month;
+        month: Office.MailboxEnums.Month;
         /**
-         * Represents your chosen first day of the week otherwise the default is the value in the current user's settings. Valid values are: 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', and 'Sun'.
+         * Represents your chosen first day of the week otherwise the default is the value in the current user's settings. 
+         * Valid values are: 'Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', and 'Sun'.
          */
-        firstDayOfWeek: MailboxEnums.Days;
+        firstDayOfWeek: Office.MailboxEnums.Days;
     }
 
     /**
@@ -9549,7 +16103,8 @@ declare namespace Office {
          */
         url?: string;
         /**
-         * Only used if type is set to file. If true, indicates that the attachment will be shown inline in the message body, and should not be displayed in the attachment list.
+         * Only used if type is set to file. If true, indicates that the attachment will be shown inline in the message body, and should not be 
+         * displayed in the attachment list.
          */
         inLine?: boolean;
         /**
@@ -9567,31 +16122,38 @@ declare namespace Office {
          */
         htmlBody?: string;
         /**
-         * An array of ReplyFormAttachments that are either file or item attachments.
+         * An array of {@link Office.ReplyFormAttachment} that are either file or item attachments.
          */
         attachments?: ReplyFormAttachment[];
         /**
-         * When the reply display call completes, the function passed in the callback parameter is called with a single parameter, asyncResult, which is an AsyncResult object.
+         * When the reply display call completes, the function passed in the callback parameter is called with a single parameter, 
+         * asyncResult, which is an Office.AsyncResult object.
          */
-        callback?: (result: AsyncResult) => void;
+        callback?: (result: AsyncResult<any>) => void;
     }
     /**
-     * The settings created by using the methods of the RoamingSettings object are saved per add-in and per user. That is, they are available only to the add-in that created them, and only from the user's mail box in which they are saved.
+     * The settings created by using the methods of the RoamingSettings object are saved per add-in and per user. 
+     * That is, they are available only to the add-in that created them, and only from the user's mail box in which they are saved.
      *
-     * While the Outlook Add-in API limits access to these settings to only the add-in that created them, these settings should not be considered secure storage. They can be accessed by Exchange Web Services or Extended MAPI. They should not be used to store sensitive information such as user credentials or security tokens.
+     * While the Outlook Add-in API limits access to these settings to only the add-in that created them, these settings should not be considered 
+     * secure storage. They can be accessed by Exchange Web Services or Extended MAPI. 
+     * They should not be used to store sensitive information such as user credentials or security tokens.
      *
      * The name of a setting is a String, while the value can be a String, Number, Boolean, null, Object, or Array.
      *
      * The RoamingSettings object is accessible via the roamingSettings property in the Office.context namespace.
      *
-     * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. For task panes, this means that it is only initialized when the task pane first opens. If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
+     * Important: The RoamingSettings object is initialized from the persisted storage only when the add-in is first loaded. 
+     * For task panes, this means that it is only initialized when the task pane first opens. 
+     * If the task pane navigates to another page or reloads the current page, the in-memory object is reset to its initial values, even if 
+     * your add-in has persisted changes. The persisted changes will not be available until the task pane is closed and reopened.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface RoamingSettings {
         /**
@@ -9600,9 +16162,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param name The case-sensitive name of the setting to retrieve.
          * @returns Type: String | Number | Boolean | Object | Array
@@ -9614,9 +16176,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param name The case-sensitive name of the setting to remove.
          */
@@ -9624,22 +16186,26 @@ declare namespace Office {
         /**
          * Saves the settings.
          *
-         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use the set and get methods to work with the in-memory copy of the settings property bag. When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
+         * Any settings previously saved by an add-in are loaded when it is initialized, so during the lifetime of the session you can just use 
+         * the set and get methods to work with the in-memory copy of the settings property bag. 
+         * When you want to persist the settings so that they are available the next time the add-in is used, use the saveAsync method.
          *
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
-         * @param callback Optional? When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback Optional. When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
          */
-        saveAsync(callback?: (result: AsyncResult) => void): void;
+        saveAsync(callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets or creates the specified setting.
          *
-         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name. The value is stored in the document as the serialized JSON representation of its data type.
+         * The set method creates a new setting of the specified name if it does not already exist, or sets an existing setting of the specified name. 
+         * The value is stored in the document as the serialized JSON representation of its data type.
          *
          * A maximum of 2MB is available for the settings of each add-in, and each individual setting is limited to 32KB.
          *
@@ -9648,9 +16214,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: Restricted
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>Restricted</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
          * @param name The case-sensitive name of the setting to set or create.
          * @param value Specifies the value to be stored.
@@ -9659,14 +16225,17 @@ declare namespace Office {
     }
 
     /**
-     * The SeriesTime object provides methods to get and set the dates and times of appointments in a recurring series and get the dates and times of meeting requests in a recurring series.
+     * The SeriesTime object provides methods to get and set the dates and times of appointments in a recurring series and get the dates and times of 
+     * meeting requests in a recurring series.
      * 
      * [Api set: Mailbox Preview]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
+     * 
+     * @beta
      */
     interface SeriesTime {
         /**
@@ -9675,9 +16244,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         getDuration(): number;
 
@@ -9687,21 +16256,23 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         getEndDate(): string;
 
         /**
-         * Gets the end time of a usual appointment or meeting request instance of a recurrence pattern in whichever time zone that the user or add-in set the recurrence pattern using the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} format: "THH:mm:ss:mmm"
+         * Gets the end time of a usual appointment or meeting request instance of a recurrence pattern in whichever time zone that the user or 
+         * add-in set the recurrence pattern using the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} format: 
+         * "THH:mm:ss:mmm"
          * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         getEndTime(): string;
 
@@ -9711,21 +16282,22 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         getStartDate(): string;
 
         /**
-         * Gets the start time of a usual appointment instance of a recurrence pattern in whichever time zone that the user/add-in set the recurrence pattern using the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} format: "THH:mm:ss:mmm"
+         * Gets the start time of a usual appointment instance of a recurrence pattern in whichever time zone that the user/add-in set the 
+         * recurrence pattern using the following {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} format: "THH:mm:ss:mmm"
          * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         getStartTime(): string;
 
@@ -9735,9 +16307,9 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
          * @param minutes The length of the appointment in minutes.
          */
@@ -9749,15 +16321,16 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: Invalid date format - The date is not in an acceptable format.
+         * <tr><td>Errors</td><td>Invalid date format - The date is not in an acceptable format.</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * setEndDate(date: string): void;
-         * Where date is the end date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `setEndDate(date: string): void;` (Where date is the end date of the recurring appointment series represented in the 
+         * {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD").
          * 
          * @param year The year value of the end date.
          * @param month The month value of the end date. Valid range is 0-11 where 0 represents the 1st month and 11 represents the 12th month.
@@ -9770,11 +16343,11 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: Invalid date format - The date is not in an acceptable format.
+         * <tr><td>Errors</td><td>Invalid date format - The date is not in an acceptable format.</td></tr></table>
          * 
          * @param date End date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
          */
@@ -9785,15 +16358,15 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: Invalid date format - The date is not in an acceptable format.
+         * <tr><td>Errors</td><td>Invalid date format - The date is not in an acceptable format.</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * setStartDate(date: string): void;
-         * Where date is the start date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `setStartDate(date: string): void;` (Where date is the start date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD").
          *  
          * @param year The year value of the start date.
          * @param month The month value of the start date. Valid range is 0-11 where 0 represents the 1st month and 11 represents the 12th month.
@@ -9807,31 +16380,32 @@ declare namespace Office {
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: Invalid date format - The date is not in an acceptable format.
+         * <tr><td>Errors</td><td>Invalid date format - The date is not in an acceptable format.</td></tr></table>
          * 
          * @param date Start date of the recurring appointment series represented in the {@link https://www.iso.org/iso-8601-date-and-time-format.html | ISO 8601} date format: "YYYY-MM-DD".
          */
         setStartDate(date:string): void;
 
         /**
-         * Sets the start time of all instances of a recurring appointment series in whichever time zone the recurrence pattern is set (the item's time zone is used by default).
+         * Sets the start time of all instances of a recurring appointment series in whichever time zone the recurrence pattern is set 
+         * (the item's time zone is used by default).
          * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: Invalid time format - The time is not in an acceptable format.
+         * <tr><td>Errors</td><td>Invalid time format - The time is not in an acceptable format.</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * setStartTime(time: string): void;
-         * Where time is the start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm". 
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `setStartTime(time: string): void;` (Where time is the start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm").
          * 
          * @param hours The hour value of the start time. Valid range: 0-24.
          * @param minutes The minute value of the start time. Valid range: 0-59.
@@ -9839,16 +16413,17 @@ declare namespace Office {
         setStartTime(hours: number, minutes: number): void;
 
         /**
-         * Sets the start time of all instances of a recurring appointment series in whichever time zone the recurrence pattern is set (the item's time zone is used by default).
+         * Sets the start time of all instances of a recurring appointment series in whichever time zone the recurrence pattern is set 
+         * (the item's time zone is used by default).
          * 
          * [Api set: Mailbox Preview]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          * 
-         * Errors: Invalid time format - The time is not in an acceptable format.
+         * <tr><td>Errors</td><td>Invalid time format - The time is not in an acceptable format.</td></tr></table>
          * 
          * @param time Start time of all instances represented by standard datetime string format: "THH:mm:ss:mmm".
          */
@@ -9861,9 +16436,9 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
      */
     interface Subject {
         /**
@@ -9874,70 +16449,81 @@ declare namespace Office {
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * getAsync(callback: (result: AsyncResult) => void): void;
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `getAsync(callback: (result: AsyncResult<string>) => void): void;`
          *
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult.
+         *                 The `value` property of the result is the subject of the item.
          */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAsync(options: Office.AsyncContextOptions, callback: (result: AsyncResult<string>) => void): void;
         /**
          * Gets the subject of an appointment or message.
+         * 
          * The getAsync method starts an asynchronous call to the Exchange server to get the subject of an appointment or message.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         *                  The `value` property of the result is the subject of the item.
          */
-        getAsync(callback: (result: AsyncResult) => void): void;
+        getAsync(callback: (result: AsyncResult<string>) => void): void;
         /**
          * Sets the subject of an appointment or message.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. 
+         * Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * setAsync(subject: string): void;
-         * setAsync(subject: string, options: AsyncContextOptions): void;
-         * setAsync(subject: string, callback: (result: AsyncResult) => void): void;
+         * 
+         * `setAsync(subject: string): void;`
+         * 
+         * `setAsync(subject: string, options: Office.AsyncContextOptions): void;`
+         * 
+         * `setAsync(subject: string, callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
          */
-        setAsync(subject: string, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(subject: string, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets the subject of an appointment or message.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. 
+         * Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
          *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          */
@@ -9945,53 +16531,57 @@ declare namespace Office {
         /**
          * Sets the subject of an appointment or message.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. 
+         * Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
          *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        setAsync(data: string, options: AsyncContextOptions): void;
+        setAsync(data: string, options: Office.AsyncContextOptions): void;
         /**
          * Sets the subject of an appointment or message.
          *
-         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
+         * The setAsync method starts an asynchronous call to the Exchange server to set the subject of an appointment or message. 
+         * Setting the subject overwrites the current subject, but leaves any prefixes, such as "Fwd:" or "Re:" in place.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: DataExceedsMaximumSize - The subject parameter is longer than 255 characters.
+         * <tr><td>Errors</td><td>DataExceedsMaximumSize - The subject parameter is longer than 255 characters.</td></tr></table>
          *
          * @param subject The subject of the appointment or message. The string is limited to 255 characters.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. If setting the subject fails, the asyncResult.error property will contain an error code.
          */
-        setAsync(data: string, callback: (result: AsyncResult) => void): void;
+        setAsync(data: string, callback: (result: AsyncResult<void>) => void): void;
 
     }
     /**
      * Represents a suggested task identified in an item. Read mode only.
      *
-     * The list of tasks suggested in an email message is returned in the taskSuggestions property of the [Entities]Entities object that is returned when the getEntities or getEntitiesByType method is called on the active item.
+     * The list of tasks suggested in an email message is returned in the taskSuggestions property of the {@link Office.Entities | Entities} object 
+     * that is returned when the getEntities or getEntitiesByType method is called on the active item.
      *
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Read</td></tr></table>
      */
     interface TaskSuggestion {
         /**
@@ -10009,88 +16599,100 @@ declare namespace Office {
      * [Api set: Mailbox 1.1]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
      */
     interface Time {
         /**
          * Gets the start or end time of an appointment.
          *
-         * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
+         * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). 
+         * You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          * 
-         * In addition to the main signature, this method also has these signatures:
-         * getAsync(callback: (result: AsyncResult) => void): void;
+         * In addition to the main signature, this method also has this signature:
+         * 
+         * `getAsync(callback: (result: AsyncResult<Date>) => void): void;`
          *
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         *                  The `value` property of the result is a Date object.
          */
-        getAsync(options: AsyncContextOptions, callback: (result: AsyncResult) => void): void;
+        getAsync(options: Office.AsyncContextOptions, callback: (result: AsyncResult<Date>) => void): void;
         /**
          * Gets the start or end time of an appointment.
          *
-         * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
+         * The date and time is provided as a Date object in the asyncResult.value property. The value is in Coordinated Universal Time (UTC). 
+         * You can convert the UTC time to the local client time by using the convertToLocalClientTime method.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr></table>
          *
          * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult.
+         *                  The `value` property of the result is a Date object.
          */
-        getAsync(callback: (result: AsyncResult) => void): void;
+        getAsync(callback: (result: AsyncResult<Date>) => void): void;
         /**
          * Sets the start or end time of an appointment.
          *
-         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as 
+         * previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
          *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
          * 
          * In addition to the main signature, this method also has these signatures:
-         * setAsync(dateTime: Date): void;
-         * setAsync(dateTime: Date, options: AsyncContextOptions): void;
-         * setAsync(dateTime: Date, callback: (result: AsyncResult) => void): void;
+         * 
+         * `setAsync(dateTime: Date): void;`
+         * 
+         * `setAsync(dateTime: Date, options: Office.AsyncContextOptions): void;`
+         * 
+         * `setAsync(dateTime: Date, callback: (result: AsyncResult<void>) => void): void;`
          *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the date and time fails, the asyncResult.error property will contain an error code.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If setting the date and time fails, the asyncResult.error property will contain an error code.
          */
-        setAsync(dateTime: Date, options?: AsyncContextOptions, callback?: (result: AsyncResult) => void): void;
+        setAsync(dateTime: Date, options?: Office.AsyncContextOptions, callback?: (result: AsyncResult<void>) => void): void;
         /**
          * Sets the start or end time of an appointment.
          *
-         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as 
+         * previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
          *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
          *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          */
@@ -10098,57 +16700,63 @@ declare namespace Office {
         /**
          * Sets the start or end time of an appointment.
          *
-         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as 
+         * previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
          *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
          *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
          * @param options An object literal that contains one or more of the following properties.
          *        asyncContext: Developers can provide any object they wish to access in the callback method.
          */
-        setAsync(dateTime: Date, options: AsyncContextOptions): void;
+        setAsync(dateTime: Date, options: Office.AsyncContextOptions): void;
         /**
          * Sets the start or end time of an appointment.
          *
-         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
+         * If the setAsync method is called on the start property, the end property will be adjusted to maintain the duration of the appointment as 
+         * previously set. If the setAsync method is called on the end property, the duration of the appointment will be extended to the new end time.
          *
          * The time must be in UTC; you can get the correct UTC time by using the convertToUtcClientTime method.
          *
          * [Api set: Mailbox 1.1]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadWriteItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadWriteItem</td></tr>
          *
-         * Applicable Outlook mode: Compose
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose</td></tr>
          *
-         * Errors: InvalidEndTime - The appointment end time is before the appointment start time.
+         * <tr><td>Errors</td><td>InvalidEndTime - The appointment end time is before the appointment start time.</td></tr></table>
          *
          * @param dateTime A date-time object in Coordinated Universal Time (UTC).
-         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of type AsyncResult. If setting the date and time fails, the asyncResult.error property will contain an error code.
+         * @param callback When the method completes, the function passed in the callback parameter is called with a single parameter of 
+         *                 type Office.AsyncResult. 
+         *                 If setting the date and time fails, the asyncResult.error property will contain an error code.
          */
-        setAsync(dateTime: Date, callback: (result: AsyncResult) => void): void;
+        setAsync(dateTime: Date, callback: (result: AsyncResult<void>) => void): void;
 
     }
     /**
+     * Information about the user associated with the mailbox. This includes their account type, display name, email adddress, and time zone.
+     * 
      * [Api set: Mailbox 1.0]
      *
      * @remarks
-     * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+     * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
      *
-     * Applicable Outlook mode: Compose or read
+     * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
      */
     interface UserProfile {
         /**
-         * Gets the account type of the user associated with the mailbox. The possible values are listed in the following table.
+         * Gets the account type of the user associated with the mailbox. 
          *
          * Note: This member is currently only supported in Outlook 2016 for Mac, build 16.9.1212 and greater.
          *
@@ -10156,16 +16764,34 @@ declare namespace Office {
          *
          * @remarks
          *
-         * |Value    |Description   |
-         * |---------|--------------|
-         * |enterprise |The mailbox is on an on-premises Exchange server.|
-         * |gmail |The mailbox is associated with a Gmail account.|
-         * |office365 |The mailbox is associated with an Office 365 work or school account.|
-         * |outlookCom |The mailbox is associated with a personal Outlook.com account.|
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          *
-         * Applicable Outlook mode: Compose or read
+         * The possible account types are listed in the following table.
+         * 
+         * <table>
+         *   <tr>
+         *     <th>Value</th>
+         *     <th>Description?</th>
+         *   </tr>
+         *   <tr>
+         *     <td>enterprise</td>
+         *     <td>The mailbox is on an on-premises Exchange server.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>gmail</td>
+         *     <td>The mailbox is associated with a Gmail account.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>office365</td>
+         *     <td>The mailbox is associated with an Office 365 work or school account.</td>
+         *   </tr>
+         *   <tr>
+         *     <td>outlookCom</td>
+         *     <td>The mailbox is associated with a personal Outlook.com account.</td>
+         *   </tr>
+         * </table>
          */
         accountType: string;
         /**
@@ -10174,9 +16800,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         displayName: string;
         /**
@@ -10185,9 +16811,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         emailAddress: string;
         /**
@@ -10196,9 +16822,9 @@ declare namespace Office {
          * [Api set: Mailbox 1.0]
          *
          * @remarks
-         * {@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}: ReadItem
+         * <table><tr><td>{@link https://docs.microsoft.com/outlook/add-ins/understanding-outlook-add-in-permissions | Minimum permission level}</td><td>ReadItem</td></tr>
          *
-         * Applicable Outlook mode: Compose or read
+         * <tr><td>{@link https://docs.microsoft.com/outlook/add-ins/#extension-points | Applicable Outlook mode}</td><td>Compose or read</td></tr></table>
          */
         timeZone: string;
     }
@@ -10220,22 +16846,67 @@ declare namespace Office {
 ////////////////////////////////////////////////////////////////
 
 declare namespace OfficeExtension {
-    /** An abstract proxy object that represents an object in an Office document. You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the proxy object state with the document by calling "context.sync()". */
+    /**
+     * An abstract proxy object that represents an object in an Office document. 
+     * You create proxy objects from the context (or from other proxy objects), add commands to a queue to act on the object, and then synchronize the 
+     * proxy object state with the document by calling `context.sync()`.
+     */
     class ClientObject {
         /** The request context associated with the object */
         context: ClientRequestContext;
-        /** Returns a boolean value for whether the corresponding object is a null object. You must call "context.sync()" before reading the isNullObject property. */
+        /**
+         *  Returns a boolean value for whether the corresponding object is a null object. You must call `context.sync()` before reading the 
+         * isNullObject property.
+         */
         isNullObject: boolean;
     }
 }
 
 declare namespace OfficeExtension {
+    /**
+     * Specifies which properties of an object should be loaded. This load happens when the sync() method is executed.
+     * This synchronizes the states between Office objects and corresponding JavaScript proxy objects.
+     * 
+     * @remarks
+     * 
+     * For Word, the preferred method for specifying the properties and paging information is by using a string literal. 
+     * The first two examples show the preferred way to request the text and font size properties for paragraphs in a paragraph collection:
+     * 
+     * `context.load(paragraphs, 'text, font/size');`
+     * 
+     * `paragraphs.load('text, font/size');`
+     * 
+     * Here is a similar example using object notation (includes paging):
+     * 
+     * `context.load(paragraphs, {select: 'text, font/size', expand: 'font', top: 50, skip: 0});`
+     * 
+     * `paragraphs.load({select: 'text, font/size', expand: 'font', top: 50, skip: 0});`
+     * 
+     * Note that if we don't specify the specific properties on the font object in the select statement, the expand statement by itself would 
+     * indicate that all of the font properties are loaded.
+     */
     interface LoadOption {
+        /**
+         * A comma-delimited string, or array of strings, that specifies the properties/relationships to load.
+         */
         select?: string | string[];
+        /**
+         * A comma-delimited string, or array of strings, that specifies the relationships to load.
+         */
         expand?: string | string[];
+        /**
+         * Only usable on collection types. Specifies the maximum number of collection items that can be included in the result.
+         */
         top?: number;
+        /**
+         * Only usable on collection types. Specifies the number of items in the collection that are to be skipped and not included in the result. 
+         * If top is specified, the result set will start after skipping the specified number of items.
+         */
         skip?: number;
     }
+    /**
+     * Provides an option for suppressing an error when the object that is used to set multiple properties tries to set read-only properties.
+     */
     interface UpdateOptions {
         /**
          * Throw an error if the passed-in property list includes read-only properties (default = true).
@@ -10243,6 +16914,23 @@ declare namespace OfficeExtension {
         throwOnReadOnly?: boolean
     }
 
+    /**
+     * Additional options passed into `{Host}.run(...)`.
+     */
+    export interface RunOptions<T> {
+        /**
+         * The URL of the remote workbook and the request headers to be sent.
+         */
+        session?: RequestUrlAndHeaderInfo | T;
+    
+        /**
+         *  A previously-created context, or API object, or array of objects. 
+         * The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up 
+         * by `context.sync()`.
+         */
+        previousObjects?: ClientObject | ClientObject[] | ClientRequestContext;
+    }
+
     /** Contains debug information about the request context. */
     interface RequestContextDebugInfo {
         /**
@@ -10253,7 +16941,10 @@ declare namespace OfficeExtension {
         pendingStatements: string[];
     }
 
-    /** An abstract RequestContext object that facilitates requests to the host Office application. The "Excel.run" and "Word.run" methods provide a request context. */
+    /**
+     * An abstract RequestContext object that facilitates requests to the host Office application. 
+     * The `Excel.run` and `Word.run` methods provide a request context.
+     */
     class ClientRequestContext {
         constructor(url?: string);
 
@@ -10263,23 +16954,39 @@ declare namespace OfficeExtension {
         /** Request headers */
         requestHeaders: { [name: string]: string };
 
-        /** Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties. */
+        /**
+         * Queues up a command to load the specified properties of the object. You must call `context.sync()` before reading the properties. 
+         * 
+         * @param object The object whose properties are loaded.
+         * @param option A  comma-delimited string, or array of strings, that specifies the properties/relationships to load, or an 
+         * {@link OfficeExtension.LoadOption} object.
+         */
         load(object: ClientObject, option?: string | string[] | LoadOption): void;
 
         /**
         * Queues up a command to recursively load the specified properties of the object and its navigation properties.
-        * You must call "context.sync()" before reading the properties.
+        * 
+        * You must call `context.sync()` before reading the properties.
         *
         * @param object The object to be loaded.
-        * @param options The key-value pairing of load options for the types, such as { "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }
+        * @param options The key-value pairing of load options for the types, such as 
+        *                `{ "Workbook": "worksheets,tables",  "Worksheet": "tables",  "Tables": "name" }`
         * @param maxDepth The maximum recursive depth.
         */
         loadRecursive(object: ClientObject, options: { [typeName: string]: string | string[] | LoadOption }, maxDepth?: number): void;
 
-        /** Adds a trace message to the queue. If the promise returned by "context.sync()" is rejected due to an error, this adds a ".traceMessages" array to the OfficeExtension.Error object, containing all trace messages that were executed. These messages can help you monitor the program execution sequence and detect the cause of the error. */
+        /**
+         * Adds a trace message to the queue. If the promise returned by `context.sync()` is rejected due to an error, this adds a ".traceMessages" 
+         * array to the OfficeExtension.Error object, containing all trace messages that were executed. 
+         * These messages can help you monitor the program execution sequence and detect the cause of the error. 
+         */
         trace(message: string): void;
 
-        /** Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context and retrieving properties of loaded Office objects for use in your code.�This method returns a promise, which is resolved when the synchronization is complete. */
+        /**
+         * Synchronizes the state between JavaScript proxy objects and the Office document, by executing instructions queued on the request context 
+         * and retrieving properties of loaded Office objects for use in your code. 
+         * This method returns a promise, which is resolved when the synchronization is complete.
+         */
         sync<T>(passThroughValue?: T): Promise<T>;
 
         /** Debug information */
@@ -10302,9 +17009,9 @@ declare namespace OfficeExtension {
 }
 
 declare namespace OfficeExtension {
-    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after "context.sync()" is invoked. */
+    /** Contains the result for methods that return primitive types. The object's value property is retrieved from the document after `context.sync()` is invoked. */
     class ClientResult<T> {
-        /** The value of the result that is retrieved from the document after "context.sync()" is invoked. */
+        /** The value of the result that is retrieved from the document after `context.sync()` is invoked. */
         value: T;
     }
 }
@@ -10315,14 +17022,19 @@ declare namespace OfficeExtension {
         /**
          * Determines whether to log additional error information upon failure.
          *
-         * When this property is set to true, the error object will include a "debugInfo.fullStatements" property that lists all statements in the batch request, including all statements that precede and follow the point of failure.
+         * When this property is set to true, the error object will include a "debugInfo.fullStatements" property that lists all statements in the 
+         * batch request, including all statements that precede and follow the point of failure.
          *
-         * Setting this property to true will negatively impact performance and will log all statements in the batch request, including any statements that may contain potentially-sensitive data.
-         * It is recommended that you only set this property to true during debugging and that you never log the value of error.debugInfo.fullStatements to an external database or analytics service.
+         * Setting this property to true will negatively impact performance and will log all statements in the batch request, including any statements 
+         * that may contain potentially-sensitive data.
+         * It is recommended that you only set this property to true during debugging and that you never log the value of 
+         * error.debugInfo.fullStatements to an external database or analytics service.
          */
         extendedErrorLogging: boolean;
     };
-
+    /**
+     * Provides information about an error.
+     */
     interface DebugInfo {
         /** Error code string, such as "InvalidArgument". */
         code: string;
@@ -10330,24 +17042,22 @@ declare namespace OfficeExtension {
         message: string;
         /** Inner error, if applicable. */
         innerError?: DebugInfo | string;
-
         /** The object type and property or method name (or similar information), if available. */
         errorLocation?: string;
-
         /**
          * The statement that caused the error, if available.
          *
-         * This statement will never contain any potentially-sensitive data and may not match the code exactly as written, but will be a close approximation.
+         * This statement will never contain any potentially-sensitive data and may not match the code exactly as written, 
+         * but will be a close approximation.
          */
         statements?: string;
-
         /**
          * The statements that closely precede and follow the statement that caused the error, if available.
          *
-         * These statements will never contain any potentially-sensitive data and may not match the code exactly as written, but will be a close approximation.
+         * These statements will never contain any potentially-sensitive data and may not match the code exactly as written, 
+         * but will be a close approximation.
          */
         surroundingStatements?: string[];
-
         /**
          * All statements in the batch request (including any potentially-sensitive information that was specified in the request), if available.
          *
@@ -10356,7 +17066,7 @@ declare namespace OfficeExtension {
         fullStatements?: string[];
     }
 
-    /** The error object returned by "context.sync()", if a promise is rejected due to an error while processing the request. */
+    /** The error object returned by `context.sync()`, if a promise is rejected due to an error while processing the request. */
     class Error {
         /** Error name: "OfficeExtension.Error".*/
         name: string;
@@ -10366,9 +17076,13 @@ declare namespace OfficeExtension {
         stack: string;
         /** Error code string, such as "InvalidArgument". */
         code: string;
-        /** Trace messages (if any) that were added via a "context.trace()" invocation before calling "context.sync()". If there was an error, this contains all trace messages that were executed before the error occurred. These messages can help you monitor the program execution sequence and detect the case of the error. */
+        /**
+         * Trace messages (if any) that were added via a `context.trace()` invocation before calling `context.sync()`. 
+         * If there was an error, this contains all trace messages that were executed before the error occurred. 
+         * These messages can help you monitor the program execution sequence and detect the case of the error.
+         */
         traceMessages: Array<string>;
-        /** Debug info (useful for detailed logging of the error, i.e., via JSON.stringify(...)). */
+        /** Debug info (useful for detailed logging of the error, i.e., via `JSON.stringify(...)`). */
         debugInfo: DebugInfo;
         /** Inner error, if applicable. */
         innerError: Error;
@@ -10393,7 +17107,13 @@ declare namespace OfficeExtension {
 }
 
 declare namespace OfficeExtension {
-    /** A Promise object that represents a deferred interaction with the host Office application. The publicly-consumable OfficeExtension.Promise is available starting in ExcelApi 1.2 and WordApi 1.2. Promises can be chained via ".then", and errors can be caught via ".catch". Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. When a browser-provided native Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead. */
+    /**
+     * A Promise object that represents a deferred interaction with the host Office application. 
+     * The publicly-consumable {@link Office.OfficeExtension.Promise} is available starting in ExcelApi 1.2 and WordApi 1.2. 
+     * Promises can be chained via ".then", and errors can be caught via ".catch". 
+     * Remember to always use a ".catch" on the outer promise, and to return intermediary promises so as not to break the promise chain. 
+     * When a browser-provided native Promise implementation is available, OfficeExtension.Promise will switch to use the native Promise instead.
+     */
     const Promise: Office.IPromiseConstructor;
     type IPromise<T> = Promise<T>;
 }
@@ -10401,13 +17121,39 @@ declare namespace OfficeExtension {
 declare namespace OfficeExtension {
     /** Collection of tracked objects, contained within a request context. See "context.trackedObjects" for more information. */
     class TrackedObjects {
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+        /** 
+         * Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. 
+         * If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, 
+         * and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object 
+         * to the tracked object collection when the object was first created. 
+         * 
+         * This method also has the following signature: 
+         * 
+         * `add(objects: ClientObject[]): void;` Where objects is an array of objects to be tracked.
+         */
         add(object: ClientObject): void;
-        /** Track a new object for automatic adjustment based on surrounding changes in the document. Only some object types require this. If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object to the tracked object collection when the object was first created. */
+        /**
+         * Track a set of objects  for automatic adjustment based on surrounding changes in the document. Only some object types require this. 
+         * If you are using an object across ".sync" calls and outside the sequential execution of a ".run" batch, 
+         * and get an "InvalidObjectPath" error when setting a property or invoking a method on the object, you needed to have added the object 
+         * to the tracked object collection when the object was first created.
+         */
         add(objects: ClientObject[]): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+        /** 
+         * Release the memory associated with an object that was previously added to this collection. 
+         * Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. 
+         * You will need to call `context.sync()` before the memory release takes effect.
+         * 
+         * This method also has the following signature: 
+         * 
+         * `remove(objects: ClientObject[]): void;` Where objects is an array of objects to be removed.
+         */
         remove(object: ClientObject): void;
-        /** Release the memory associated with an object that was previously added to this collection. Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. You will need to call "context.sync()" before the memory release takes effect. */
+        /**
+         * Release the memory associated with an object that was previously added to this collection. 
+         * Having many tracked objects slows down the host application, so please remember to free any objects you add, once you're done using them. 
+         * You will need to call `context.sync()` before the memory release takes effect.
+         */
         remove(objects: ClientObject[]): void;
     }
 }
@@ -10663,36 +17409,26 @@ declare namespace Excel {
         readonly application: Application;
         readonly runtime: Runtime;
     }
+    interface RunOptions extends OfficeExtension.RunOptions<Session> {
+        /**
+         * Determines whether Excel will delay the batch request until the user exits cell edit mode.
+         *
+         * When false, if the user is in cell edit when the batch request is processed by the host, the batch will automatically fail.
+         * When true, the batch request will be executed immediately if the user is not in cell edit mode, but if the user is in cell edit mode the batch request will be delayed until the user exits cell edit mode.
+         */
+        delayForCellEdit?: boolean;
+    }
     /**
      * Executes a batch script that performs actions on the Excel object model, using a new RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
     function run<T>(batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
-    /**
-     * Executes a batch script that performs actions on the Excel object model, using a new remote RequestContext. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
-     * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
-     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
-     */
-    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
-    /**
-     * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
-     * @param contextObject - A previously-created object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
-     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
-     */
-    function run<T>(contextObject: OfficeExtension.ClientRequestContext, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
      * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
     function run<T>(object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
-    /**
-     * Executes a batch script that performs actions on the Excel object model, using the remote RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
-     * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
-     * @param object - A previously-created API object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
-     * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
-     */
-    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      * Executes a batch script that performs actions on the Excel object model, using the RequestContext of previously-created API objects.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
@@ -10700,12 +17436,30 @@ declare namespace Excel {
      */
     function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
-     * Executes a batch script that performs actions on the Excel object model, using the remote RequestContext of previously-created API objects.
-     * @param requestInfo - The URL of the remote workbook and the request headers to be sent.
-     * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
+    * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created API object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+    * @param options - The additional options for this Excel.run which specify previous objects, whether to delay the request for cell edit, session info, etc.
+    * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
+    */
+    function run<T>(options: Excel.RunOptions, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
+    /**
+     * Executes a batch script that performs actions on the Excel object model, using the RequestContext of a previously-created object. When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     *
+     * @remarks
+     *
+     * In addition to this signature, the method also has the following signatures:
+     *
+     * `run<T>(object: OfficeExtension.ClientObject, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;`
+     *
+     * `run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;`
+     *
+     * `run<T>(options: Excel.RunOptions, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;`
+     *
+     * `run<T>(batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;`
+     *
+     * @param context - A previously-created object. The batch will use the same RequestContext as the passed-in object, which means that any changes applied to the object will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Excel application. Since the Office add-in and the Excel application run in two different processes, the RequestContext is required to get access to the Excel object model from the add-in.
      */
-    function run<T>(requestInfo: OfficeExtension.RequestUrlAndHeaderInfo | Session, objects: OfficeExtension.ClientObject[], batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
+    function run<T>(context: OfficeExtension.ClientRequestContext, batch: (context: Excel.RequestContext) => Promise<T>): Promise<T>;
     /**
      *
      * Provides information about the binding that raised the SelectionChanged event.
@@ -10717,33 +17471,21 @@ declare namespace Excel {
          *
          * Gets the Binding object that represents the binding that raised the SelectionChanged event.
          *
-         * @remarks
-         * Hosts: Access, Excel, Word
-         *
          * [Api set: ExcelApi 1.2]
          */
         binding: Excel.Binding;
         /**
          *
-         * Gets the number of columns selected. The number of columns selected. If a single cell is selected returns 1.
+         * Gets the number of columns selected.
          *
          * [Api set: ExcelApi 1.2]
-         *
-         * @remarks
-         * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned.
-         *
-         * For Word, this property will work only for bindings of BindingType "table". If the binding is of type "matrix", null is returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property to work correctly.
          */
         columnCount: number;
         /**
-         * Gets the number of columns selected. The number of columns selected. If a single cell is selected returns 1.
+         *
+         * Gets the number of rows selected.
          *
          * [Api set: ExcelApi 1.2]
-         *
-         * @remarks
-         * If the user makes a non-contiguous selection, the count for the last contiguous selection within the binding is returned.
-         *
-         * For Word, this property will work only for bindings of BindingType "table". If the binding is of type "matrix", null is returned. Also, the call will fail if the table contains merged cells, because the structure of the table must be uniform for this property to work correctly.
          */
         rowCount: number;
         /**
@@ -11030,7 +17772,7 @@ declare namespace Excel {
         tableId: string;
         /**
          *
-         * Gets the type of the event. See Excel.EventType for details.
+         * Gets the type of the event. See Excel.EventType for details. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -11121,15 +17863,25 @@ declare namespace Excel {
     class Application extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+         * Returns the calculation mode used in the workbook, as defined by the constants in Excel.CalculationMode. Possible values are: `Automatic`, where Excel controls recalculation; `AutomaticExceptTables`, where Excel controls recalculation but ignores changes in tables; `Manual`, where calculation is done when the user requests it.
          *
          * [Api set: ExcelApi 1.1 for get, 1.8 for set]
          */
         calculationMode: Excel.CalculationMode | "Automatic" | "AutomaticExceptTables" | "Manual";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Application): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ApplicationUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Application): void;
+        set(properties: Excel.Application): void;
         /**
          *
          * Recalculate all currently opened workbooks in Excel.
@@ -11157,6 +17909,18 @@ declare namespace Excel {
         suspendApiCalculationUntilNextSync(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Application` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Application` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Application` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ApplicationLoadOptions): Excel.Application;
         load(option?: string | string[]): Excel.Application;
@@ -11175,106 +17939,116 @@ declare namespace Excel {
     class Workbook extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the Excel application instance that contains this workbook.
+         * Represents the Excel application instance that contains this workbook. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly application: Excel.Application;
         /**
          *
-         * Represents a collection of bindings that are part of the workbook.
+         * Represents a collection of bindings that are part of the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly bindings: Excel.BindingCollection;
         /**
          *
-         * Represents the collection of custom XML parts contained by this workbook.
+         * Represents the collection of custom XML parts contained by this workbook. Read-only.
          *
          * [Api set: ExcelApi 1.5]
          */
         readonly customXmlParts: Excel.CustomXmlPartCollection;
         /**
          *
-         * Represents all data connections in the workbook.
+         * Represents all data connections in the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly dataConnections: Excel.DataConnectionCollection;
         /**
          *
-         * Represents a collection of worksheet functions that can be used for computation.
+         * Represents a collection of worksheet functions that can be used for computation. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly functions: Excel.Functions;
         /**
          *
-         * Represents a collection of workbook scoped named items (named ranges and constants).
+         * Represents a collection of workbook scoped named items (named ranges and constants). Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly names: Excel.NamedItemCollection;
         /**
          *
-         * Represents a collection of PivotTables associated with the workbook.
+         * Represents a collection of PivotTables associated with the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.3]
          */
         readonly pivotTables: Excel.PivotTableCollection;
         /**
          *
-         * Gets the workbook properties.
+         * Gets the workbook properties. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly properties: Excel.DocumentProperties;
         /**
          *
-         * Returns workbook protection object for a workbook.
+         * Returns workbook protection object for a workbook. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly protection: Excel.WorkbookProtection;
         /**
          *
-         * Represents a collection of Settings associated with the workbook.
+         * Represents a collection of Settings associated with the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.4]
          */
         readonly settings: Excel.SettingCollection;
         /**
          *
-         * Represents a collection of styles associated with the workbook.
+         * Represents a collection of styles associated with the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly styles: Excel.StyleCollection;
         /**
          *
-         * Represents a collection of tables associated with the workbook.
+         * Represents a collection of tables associated with the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly tables: Excel.TableCollection;
         /**
          *
-         * Represents a collection of worksheets associated with the workbook.
+         * Represents a collection of worksheets associated with the workbook. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly worksheets: Excel.WorksheetCollection;
         /**
          *
-         * Gets the workbook name.
+         * Gets the workbook name. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly name: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Workbook): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.WorkbookUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Workbook): void;
+        set(properties: Excel.Workbook): void;
         /**
          *
          * Gets the currently active cell from the workbook.
@@ -11284,13 +18058,25 @@ declare namespace Excel {
         getActiveCell(): Excel.Range;
         /**
          *
-         * Gets the currently selected range from the workbook.
+         * Gets the currently selected single range from the workbook. If there are multiple ranges selected, this method will throw an error.
          *
          * [Api set: ExcelApi 1.1]
          */
         getSelectedRange(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Workbook` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Workbook` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Workbook` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.WorkbookLoadOptions): Excel.Workbook;
         load(option?: string | string[]): Excel.Workbook;
@@ -11303,6 +18089,8 @@ declare namespace Excel {
          * Occurs when the selection in the document is changed.
          *
          * [Api set: ExcelApi 1.2]
+         *
+         * @eventproperty
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.SelectionChangedEventArgs>;
         toJSON(): Excel.Interfaces.WorkbookData;
@@ -11314,6 +18102,13 @@ declare namespace Excel {
      * [Api set: ExcelApi 1.7]
      */
     class WorkbookProtection extends OfficeExtension.ClientObject {
+        /**
+         *
+         * Indicates if the workbook is protected. Read-Only.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        readonly protected: boolean;
         /**
          *
          * Protects a workbook. Fails if the workbook has been protected.
@@ -11332,9 +18127,28 @@ declare namespace Excel {
          * @param password workbook protection password.
          */
         unprotect(password?: string): void;
-        toJSON(): {
-            [key: string]: string;
-        };
+        /**
+         * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.WorkbookProtection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.WorkbookProtection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.WorkbookProtection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
+         */
+        load(option?: Excel.Interfaces.WorkbookProtectionLoadOptions): Excel.WorkbookProtection;
+        load(option?: string | string[]): Excel.WorkbookProtection;
+        load(option?: {
+            select?: string;
+            expand?: string;
+        }): Excel.WorkbookProtection;
+        toJSON(): Excel.Interfaces.WorkbookProtectionData;
     }
     /**
      *
@@ -11345,42 +18159,42 @@ declare namespace Excel {
     class Worksheet extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns collection of charts that are part of the worksheet.
+         * Returns collection of charts that are part of the worksheet. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly charts: Excel.ChartCollection;
         /**
          *
-         * Gets an object that can be used to manipulate frozen panes on the worksheet.
+         * Gets an object that can be used to manipulate frozen panes on the worksheet. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly freezePanes: Excel.WorksheetFreezePanes;
         /**
          *
-         * Collection of names scoped to the current worksheet.
+         * Collection of names scoped to the current worksheet. Read-only.
          *
          * [Api set: ExcelApi 1.4]
          */
         readonly names: Excel.NamedItemCollection;
         /**
          *
-         * Collection of PivotTables that are part of the worksheet.
+         * Collection of PivotTables that are part of the worksheet. Read-only.
          *
          * [Api set: ExcelApi 1.3]
          */
         readonly pivotTables: Excel.PivotTableCollection;
         /**
          *
-         * Returns sheet protection object for a worksheet.
+         * Returns sheet protection object for a worksheet. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly protection: Excel.WorksheetProtection;
         /**
          *
-         * Collection of tables that are part of the worksheet.
+         * Collection of tables that are part of the worksheet. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -11437,10 +18251,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1 for reading visibility; 1.2 for setting it.]
          */
         visibility: Excel.SheetVisibility | "Visible" | "Hidden" | "VeryHidden";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Worksheet): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.WorksheetUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Worksheet): void;
+        set(properties: Excel.Worksheet): void;
         /**
          *
          * Activate the worksheet in the Excel UI.
@@ -11453,6 +18277,8 @@ declare namespace Excel {
          * Calculates all cells on a worksheet.
          *
          * [Api set: ExcelApi 1.6]
+         *
+         * @param markAllDirty True, to mark all as dirty.
          */
         calculate(markAllDirty: boolean): void;
         /**
@@ -11460,11 +18286,21 @@ declare namespace Excel {
          * Copy a worksheet and place it at the specified position. Return the copied worksheet.
          *
          * [Api set: ExcelApi 1.7]
-         * 
-         * @param positionType Specifies where to put the copy relative to the worksheet specified in relativeTo param. Can be Excel.WorksheetPositionType or string equivalent. Must not be Excel.WorksheetPositionType.none or "None".
-         * @param relativeTo Specifies the worksheet that is the basis for intepreting the positionType param. If not specified, the worksheet on which the copy() is called is assumed.
+         *
+         * @param positionType Optional.
+         * @param relativeTo Optional.
          */
-        copy(positionType?: Excel.WorksheetPositionType | string, relativeTo?: Excel.Worksheet): Excel.Worksheet;
+        copy(positionType?: Excel.WorksheetPositionType, relativeTo?: Excel.Worksheet): Excel.Worksheet;
+        /**
+         *
+         * Copy a worksheet and place it at the specified position. Return the copied worksheet.
+         *
+         * [Api set: ExcelApi 1.7]
+         *
+         * @param positionType Optional.
+         * @param relativeTo Optional.
+         */
+        copy(positionType?: "None" | "Before" | "After" | "Beginning" | "End", relativeTo?: Excel.Worksheet): Excel.Worksheet;
         /**
          *
          * Deletes the worksheet from the workbook.
@@ -11474,7 +18310,7 @@ declare namespace Excel {
         delete(): void;
         /**
          *
-         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it's stays within the worksheet grid.
+         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it stays within the worksheet grid.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -11488,7 +18324,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.5]
          *
-         * @param visibleOnly If true, considers only visible worksheets, skipping over any hidden ones.
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getNext(visibleOnly?: boolean): Excel.Worksheet;
         /**
@@ -11497,7 +18333,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.5]
          *
-         * @param visibleOnly If true, considers only visible worksheets, skipping over any hidden ones.
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getNextOrNullObject(visibleOnly?: boolean): Excel.Worksheet;
         /**
@@ -11506,7 +18342,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.5]
          *
-         * @param visibleOnly If true, considers only visible worksheets, skipping over any hidden ones.
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getPrevious(visibleOnly?: boolean): Excel.Worksheet;
         /**
@@ -11515,16 +18351,16 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.5]
          *
-         * @param visibleOnly If true, considers only visible worksheets, skipping over any hidden ones.
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getPreviousOrNullObject(visibleOnly?: boolean): Excel.Worksheet;
         /**
          *
-         * Gets the range object specified by the address or name.
+         * Gets the range object, representing a single rectangular block of cells, specified by the address or name.
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param address The address or the name of the range. If not specified, the entire worksheet range is returned.
+         * @param address Optional. The string representing the address or name of the range. For example, "A1:B2". If not specified, the entire worksheet range is returned.
          */
         getRange(address?: string): Excel.Range;
         /**
@@ -11541,11 +18377,11 @@ declare namespace Excel {
         getRangeByIndexes(startRow: number, startColumn: number, rowCount: number, columnCount: number): Excel.Range;
         /**
          *
-         * The used range is the smallest range that encompasses any cells that have a value or formatting assigned to them. If the entire worksheet is blank, this function will return the top left cell (i.e.,: it will *not* throw an error).
+         * The used range is the smallest range that encompasses any cells that have a value or formatting assigned to them. If the entire worksheet is blank, this function will return the top left cell (i.e. it will *not* throw an error).
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param valuesOnly Considers only cells with values as used cells (ignoring formatting). [Api set: ExcelApi 1.2]
+         * @param valuesOnly Optional. If true, considers only cells with values as used cells (ignoring formatting). [Api set: ExcelApi 1.2]
          */
         getUsedRange(valuesOnly?: boolean): Excel.Range;
         /**
@@ -11554,11 +18390,23 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.4]
          *
-         * @param valuesOnly Considers only cells with values as used cells.
+         * @param valuesOnly Optional. Considers only cells with values as used cells.
          */
         getUsedRangeOrNullObject(valuesOnly?: boolean): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Worksheet` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Worksheet` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Worksheet` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.WorksheetLoadOptions): Excel.Worksheet;
         load(option?: string | string[]): Excel.Worksheet;
@@ -11571,6 +18419,8 @@ declare namespace Excel {
          * Occurs when the worksheet is activated.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onActivated: OfficeExtension.EventHandlers<Excel.WorksheetActivatedEventArgs>;
         /**
@@ -11578,6 +18428,8 @@ declare namespace Excel {
          * Occurs when data changed on a specific worksheet.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onChanged: OfficeExtension.EventHandlers<Excel.WorksheetChangedEventArgs>;
         /**
@@ -11585,13 +18437,17 @@ declare namespace Excel {
          * Occurs when the worksheet is deactivated.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onDeactivated: OfficeExtension.EventHandlers<Excel.WorksheetDeactivatedEventArgs>;
         /**
          *
-         * Occurs when the selection changed on a specific worksheet.
+         * Occurs when the selection changes on a specific worksheet.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.WorksheetSelectionChangedEventArgs>;
         toJSON(): Excel.Interfaces.WorksheetData;
@@ -11611,7 +18467,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param name The name of the worksheet to be added. If specified, name should be unqiue. If not specified, Excel determines the name of the new worksheet.
+         * @param name Optional. The name of the worksheet to be added. If specified, name should be unqiue. If not specified, Excel determines the name of the new worksheet.
          */
         add(name?: string): Excel.Worksheet;
         /**
@@ -11626,14 +18482,17 @@ declare namespace Excel {
          * Gets the number of worksheets in the collection.
          *
          * [Api set: ExcelApi 1.4]
+         *
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getCount(visibleOnly?: boolean): OfficeExtension.ClientResult<number>;
         /**
          *
          * Gets the first worksheet in the collection.
-            If true, considers only visible worksheets, skipping over any hidden ones.
          *
          * [Api set: ExcelApi 1.5]
+         *
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getFirst(visibleOnly?: boolean): Excel.Worksheet;
         /**
@@ -11657,13 +18516,26 @@ declare namespace Excel {
         /**
          *
          * Gets the last worksheet in the collection.
-            If true, considers only visible worksheets, skipping over any hidden ones.
          *
          * [Api set: ExcelApi 1.5]
+         *
+         * @param visibleOnly Optional. If true, considers only visible worksheets, skipping over any hidden ones.
          */
         getLast(visibleOnly?: boolean): Excel.Worksheet;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.WorksheetCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.WorksheetCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.WorksheetCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.WorksheetCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.WorksheetCollection;
         load(option?: string | string[]): Excel.WorksheetCollection;
@@ -11673,6 +18545,8 @@ declare namespace Excel {
          * Occurs when any worksheet in the workbook is activated.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onActivated: OfficeExtension.EventHandlers<Excel.WorksheetActivatedEventArgs>;
         /**
@@ -11680,6 +18554,8 @@ declare namespace Excel {
          * Occurs when a new worksheet is added to the workbook.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onAdded: OfficeExtension.EventHandlers<Excel.WorksheetAddedEventArgs>;
         /**
@@ -11687,6 +18563,8 @@ declare namespace Excel {
          * Occurs when any worksheet in the workbook is deactivated.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onDeactivated: OfficeExtension.EventHandlers<Excel.WorksheetDeactivatedEventArgs>;
         /**
@@ -11694,6 +18572,8 @@ declare namespace Excel {
          * Occurs when a worksheet is deleted from the workbook.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onDeleted: OfficeExtension.EventHandlers<Excel.WorksheetDeletedEventArgs>;
         toJSON(): Excel.Interfaces.WorksheetCollectionData;
@@ -11707,14 +18587,14 @@ declare namespace Excel {
     class WorksheetProtection extends OfficeExtension.ClientObject {
         /**
          *
-         * Sheet protection options.
+         * Sheet protection options. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly options: Excel.WorksheetProtectionOptions;
         /**
          *
-         * Indicates if the worksheet is protected. Read-Only.
+         * Indicates if the worksheet is protected. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -11725,8 +18605,8 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2 for options; 1.7 for password]
          *
-         * @param options sheet protection options.
-         * @param password sheet protection password.
+         * @param options Optional. Sheet protection options.
+         * @param password Optional. Sheet protection password.
          */
         protect(options?: Excel.WorksheetProtectionOptions, password?: string): void;
         /**
@@ -11740,6 +18620,18 @@ declare namespace Excel {
         unprotect(password?: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.WorksheetProtection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.WorksheetProtection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.WorksheetProtection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.WorksheetProtectionLoadOptions): Excel.WorksheetProtection;
         load(option?: string | string[]): Excel.WorksheetProtection;
@@ -11868,7 +18760,7 @@ declare namespace Excel {
          *
          * @param frozenRange A range that represents the cells to be frozen, or null to remove all frozen panes.
          */
-        freezeAt(frozenRange: Excel.Range | string): void;
+        freezeAt(frozenRange: Range | string): void;
         /**
          *
          * Freeze the first column(s) of the worksheet in place.
@@ -11924,7 +18816,7 @@ declare namespace Excel {
     class Range extends OfficeExtension.ClientObject {
         /**
          *
-         * Collection of ConditionalFormats that intersect the range.
+         * Collection of ConditionalFormats that intersect the range. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -11938,21 +18830,21 @@ declare namespace Excel {
         readonly format: Excel.RangeFormat;
         /**
          *
-         * Represents the range sort of the current range.
+         * Represents the range sort of the current range. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly sort: Excel.RangeSort;
         /**
          *
-         * The worksheet containing the current range.
+         * The worksheet containing the current range. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly worksheet: Excel.Worksheet;
         /**
          *
-         * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
+         * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. "Sheet1!A1:B4"). Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -12018,7 +18910,7 @@ declare namespace Excel {
         formulasR1C1: any[][];
         /**
          *
-         * Represents if all cells of the current range are hidden.
+         * Represents if all cells of the current range are hidden. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -12032,14 +18924,14 @@ declare namespace Excel {
         hyperlink: Excel.RangeHyperlink;
         /**
          *
-         * Represents if the current range is an entire column.
+         * Represents if the current range is an entire column. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly isEntireColumn: boolean;
         /**
          *
-         * Represents if the current range is an entire row.
+         * Represents if the current range is an entire row. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -12106,16 +18998,26 @@ declare namespace Excel {
         readonly valueTypes: Excel.RangeValueType[][];
         /**
          *
-         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
             When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
          *
          * [Api set: ExcelApi 1.1]
          */
         values: any[][];
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Range): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Range): void;
+        set(properties: Excel.Range): void;
         /**
          *
          * Calculates a range of cells on a worksheet.
@@ -12129,7 +19031,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param applyTo Determines the type of clear action. See Excel.ClearApplyTo for details.
+         * @param applyTo Optional. Determines the type of clear action. See Excel.ClearApplyTo for details.
          */
         clear(applyTo?: Excel.ClearApplyTo): void;
         /**
@@ -12138,7 +19040,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param applyTo Determines the type of clear action. See Excel.ClearApplyTo for details.
+         * @param applyTo Optional. Determines the type of clear action. See Excel.ClearApplyTo for details.
          */
         clear(applyTo?: "All" | "Formats" | "Contents" | "Hyperlinks" | "RemoveHyperlinks"): void;
         /**
@@ -12171,16 +19073,16 @@ declare namespace Excel {
         getAbsoluteResizedRange(numRows: number, numColumns: number): Excel.Range;
         /**
          *
-         * Gets the smallest range object that encompasses the given ranges. For example, the GetBoundingRect of "B2:C5" and "D10:E15" is "B2:E16".
+         * Gets the smallest range object that encompasses the given ranges. For example, the GetBoundingRect of "B2:C5" and "D10:E15" is "B2:E15".
          *
          * [Api set: ExcelApi 1.1]
          *
          * @param anotherRange The range object or address or range name.
          */
-        getBoundingRect(anotherRange: Excel.Range | string): Excel.Range;
+        getBoundingRect(anotherRange: Range | string): Excel.Range;
         /**
          *
-         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it's stays within the worksheet grid. The returned cell is located relative to the top left cell of the range.
+         * Gets the range object containing the single cell based on row and column numbers. The cell can be outside the bounds of its parent range, so long as it stays within the worksheet grid. The returned cell is located relative to the top left cell of the range.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -12203,7 +19105,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          *
-         * @param count The number of columns to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
+         * @param count Optional. The number of columns to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
          */
         getColumnsAfter(count?: number): Excel.Range;
         /**
@@ -12212,19 +19114,19 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          *
-         * @param count The number of columns to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
+         * @param count Optional. The number of columns to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
          */
         getColumnsBefore(count?: number): Excel.Range;
         /**
          *
-         * Gets an object that represents the entire column of the range (for example, if the current range represents cells "B4:E11", it's `getEntireColumn` is a range that represents columns "B:E").
+         * Gets an object that represents the entire column of the range (for example, if the current range represents cells "B4:E11", its `getEntireColumn` is a range that represents columns "B:E").
          *
          * [Api set: ExcelApi 1.1]
          */
         getEntireColumn(): Excel.Range;
         /**
          *
-         * Gets an object that represents the entire row of the range (for example, if the current range represents cells "B4:E11", it's `GetEntireRow` is a range that represents rows "4:11").
+         * Gets an object that represents the entire row of the range (for example, if the current range represents cells "B4:E11", its `GetEntireRow` is a range that represents rows "4:11").
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -12244,7 +19146,7 @@ declare namespace Excel {
          *
          * @param anotherRange The range object or range address that will be used to determine the intersection of ranges.
          */
-        getIntersection(anotherRange: Excel.Range | string): Excel.Range;
+        getIntersection(anotherRange: Range | string): Excel.Range;
         /**
          *
          * Gets the range object that represents the rectangular intersection of the given ranges. If no intersection is found, will return a null object.
@@ -12253,7 +19155,7 @@ declare namespace Excel {
          *
          * @param anotherRange The range object or range address that will be used to determine the intersection of ranges.
          */
-        getIntersectionOrNullObject(anotherRange: Excel.Range | string): Excel.Range;
+        getIntersectionOrNullObject(anotherRange: Range | string): Excel.Range;
         /**
          *
          * Gets the last cell within the range. For example, the last cell of "B2:D5" is "D5".
@@ -12292,7 +19194,7 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          *
          * @param deltaRows The number of rows by which to expand the bottom-right corner, relative to the current range. Use a positive number to expand the range, or a negative number to decrease it.
-         * @param deltaColumns The number of columnsby which to expand the bottom-right corner, relative to the current range. Use a positive number to expand the range, or a negative number to decrease it.
+         * @param deltaColumns The number of columns by which to expand the bottom-right corner, relative to the current range. Use a positive number to expand the range, or a negative number to decrease it.
          */
         getResizedRange(deltaRows: number, deltaColumns: number): Excel.Range;
         /**
@@ -12310,7 +19212,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          *
-         * @param count The number of rows to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
+         * @param count Optional. The number of rows to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
          */
         getRowsAbove(count?: number): Excel.Range;
         /**
@@ -12319,7 +19221,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          *
-         * @param count The number of rows to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
+         * @param count Optional. The number of rows to include in the resulting range. In general, use a positive number to create a range outside the current range. You can also use a negative number to create a range within the current range. The default value is 1.
          */
         getRowsBelow(count?: number): Excel.Range;
         /**
@@ -12378,13 +19280,12 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          *
-         * @param across Set true to merge cells in each row of the specified range as separate merged cells. The default value is false.
+         * @param across Optional. Set true to merge cells in each row of the specified range as separate merged cells. The default value is false.
          */
         merge(across?: boolean): void;
         /**
          *
          * Selects the specified range in the Excel UI.
-            If multiple selection is not supported on the platform and the range has multiple areas, the "InvalidReference" error will be returned.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -12405,6 +19306,18 @@ declare namespace Excel {
         unmerge(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Range` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Range` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Range` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeLoadOptions): Excel.Range;
         load(option?: string | string[]): Excel.Range;
@@ -12429,6 +19342,12 @@ declare namespace Excel {
      * [Api set: ExcelApi 1.2]
      */
     interface RangeReference {
+        /**
+         *
+         * Gets or sets the address of the range; for example 'SheetName!A1:B5'.
+         *
+         * [Api set: ExcelApi 1.2]
+         */
         address: string;
     }
     /**
@@ -12476,14 +19395,14 @@ declare namespace Excel {
     class RangeView extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents a collection of range views associated with the range.
+         * Represents a collection of range views associated with the range. Read-only.
          *
          * [Api set: ExcelApi 1.3]
          */
         readonly rows: Excel.RangeViewCollection;
         /**
          *
-         * Represents the cell addresses of the RangeView.
+         * Represents the cell addresses of the RangeView. Read-only.
          *
          * [Api set: ExcelApi 1.3]
          */
@@ -12553,15 +19472,25 @@ declare namespace Excel {
         readonly valueTypes: Excel.RangeValueType[][];
         /**
          *
-         * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
          *
          * [Api set: ExcelApi 1.3]
          */
         values: any[][];
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.RangeView): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeViewUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: RangeView): void;
+        set(properties: Excel.RangeView): void;
         /**
          *
          * Gets the parent range associated with the current RangeView.
@@ -12571,6 +19500,18 @@ declare namespace Excel {
         getRange(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeView` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeView` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeView` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeViewLoadOptions): Excel.RangeView;
         load(option?: string | string[]): Excel.RangeView;
@@ -12598,7 +19539,7 @@ declare namespace Excel {
         getCount(): OfficeExtension.ClientResult<number>;
         /**
          *
-         * Gets a RangeView Row via it's index. Zero-Indexed.
+         * Gets a RangeView Row via its index. Zero-Indexed.
          *
          * [Api set: ExcelApi 1.3]
          *
@@ -12607,6 +19548,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.RangeView;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeViewCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeViewCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeViewCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeViewCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.RangeViewCollection;
         load(option?: string | string[]): Excel.RangeViewCollection;
@@ -12615,7 +19568,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a collection of worksheet objects that are part of the workbook.
+     * Represents a collection of key-value pair setting objects that are part of the workbook. The scope is limited to per file and add-in (task-pane or content) combination.
      *
      * [Api set: ExcelApi 1.4]
      */
@@ -12659,6 +19612,18 @@ declare namespace Excel {
         getItemOrNullObject(key: string): Excel.Setting;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.SettingCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.SettingCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.SettingCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.SettingCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.SettingCollection;
         load(option?: string | string[]): Excel.SettingCollection;
@@ -12668,13 +19633,15 @@ declare namespace Excel {
          * Occurs when the Settings in the document are changed.
          *
          * [Api set: ExcelApi 1.4]
+         *
+         * @eventproperty
          */
         readonly onSettingsChanged: OfficeExtension.EventHandlers<Excel.SettingsChangedEventArgs>;
         toJSON(): Excel.Interfaces.SettingCollectionData;
     }
     /**
      *
-     * Setting represents a key-value pair of a setting persisted to the document.
+     * Setting represents a key-value pair of a setting persisted to the document (per file per add-in). These custom key-value pair can be used to store state or lifecycle information needed by the content or task-pane add-in. Note that settings are persisted in the document and hence it is not a place to store any sensitive or protected information such as user information and password.
      *
      * [Api set: ExcelApi 1.4]
      */
@@ -12696,10 +19663,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.4]
          */
         value: any;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Setting): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.SettingUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Setting): void;
+        set(properties: Excel.Setting): void;
         /**
          *
          * Deletes the setting.
@@ -12709,6 +19686,18 @@ declare namespace Excel {
         delete(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Setting` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Setting` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Setting` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.SettingLoadOptions): Excel.Setting;
         load(option?: string | string[]): Excel.Setting;
@@ -12720,7 +19709,7 @@ declare namespace Excel {
     }
     /**
      *
-     * A collection of all the nameditem objects that are part of the workbook or worksheet, depending on how it was reached.
+     * A collection of all the NamedItem objects that are part of the workbook or worksheet, depending on how it was reached.
      *
      * [Api set: ExcelApi 1.1]
      */
@@ -12735,10 +19724,10 @@ declare namespace Excel {
          *
          * @param name The name of the named item.
          * @param reference The formula or the range that the name will refer to.
-         * @param comment The comment associated with the named item
+         * @param comment Optional. The comment associated with the named item.
          * @returns
          */
-        add(name: string, reference: Excel.Range | string, comment?: string): Excel.NamedItem;
+        add(name: string, reference: Range | string, comment?: string): Excel.NamedItem;
         /**
          *
          * Adds a new name to the collection of the given scope using the user's locale for the formula.
@@ -12747,7 +19736,7 @@ declare namespace Excel {
          *
          * @param name The "name" of the named item.
          * @param formula The formula in the user's locale that the name will refer to.
-         * @param comment The comment associated with the named item
+         * @param comment Optional. The comment associated with the named item.
          * @returns
          */
         addFormulaLocal(name: string, formula: string, comment?: string): Excel.NamedItem;
@@ -12760,24 +19749,36 @@ declare namespace Excel {
         getCount(): OfficeExtension.ClientResult<number>;
         /**
          *
-         * Gets a nameditem object using its name
+         * Gets a NamedItem object using its name.
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param name nameditem name.
+         * @param name Nameditem name.
          */
         getItem(name: string): Excel.NamedItem;
         /**
          *
-         * Gets a nameditem object using its name. If the nameditem object does not exist, will return a null object.
+         * Gets a NamedItem object using its name. If the nameditem object does not exist, will return a null object.
          *
          * [Api set: ExcelApi 1.4]
          *
-         * @param name nameditem name.
+         * @param name Nameditem name.
          */
         getItemOrNullObject(name: string): Excel.NamedItem;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.NamedItemCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.NamedItemCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.NamedItemCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.NamedItemCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.NamedItemCollection;
         load(option?: string | string[]): Excel.NamedItemCollection;
@@ -12786,21 +19787,21 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, reference to a range. This object can be used to obtain range object associated with names.
+     * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, or a reference to a range. This object can be used to obtain range object associated with names.
      *
      * [Api set: ExcelApi 1.1]
      */
     class NamedItem extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns an object containing values and types of the named item.
+         * Returns an object containing values and types of the named item. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly arrayValues: Excel.NamedItemArrayValues;
         /**
          *
-         * Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+         * Returns the worksheet on which the named item is scoped to. Throws an error if the item is scoped to the workbook instead.
          *
          * [Api set: ExcelApi 1.4]
          */
@@ -12835,7 +19836,7 @@ declare namespace Excel {
         readonly name: string;
         /**
          *
-         * Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+         * Indicates whether the name is scoped to the workbook or to a specific worksheet. Possible values are: Worksheet, Workbook. Read-only.
          *
          * [Api set: ExcelApi 1.4]
          */
@@ -12861,10 +19862,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         visible: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.NamedItem): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.NamedItemUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: NamedItem): void;
+        set(properties: Excel.NamedItem): void;
         /**
          *
          * Deletes the given name.
@@ -12888,6 +19899,18 @@ declare namespace Excel {
         getRangeOrNullObject(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.NamedItem` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.NamedItem` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.NamedItem` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.NamedItemLoadOptions): Excel.NamedItem;
         load(option?: string | string[]): Excel.NamedItem;
@@ -12920,6 +19943,18 @@ declare namespace Excel {
         readonly values: any[][];
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.NamedItemArrayValues` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.NamedItemArrayValues` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.NamedItemArrayValues` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.NamedItemArrayValuesLoadOptions): Excel.NamedItemArrayValues;
         load(option?: string | string[]): Excel.NamedItemArrayValues;
@@ -12980,6 +20015,18 @@ declare namespace Excel {
         getText(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Binding` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Binding` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Binding` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.BindingLoadOptions): Excel.Binding;
         load(option?: string | string[]): Excel.Binding;
@@ -12992,13 +20039,17 @@ declare namespace Excel {
          * Occurs when data or formatting within the binding is changed.
          *
          * [Api set: ExcelApi 1.2]
+         *
+         * @eventproperty
          */
         readonly onDataChanged: OfficeExtension.EventHandlers<Excel.BindingDataChangedEventArgs>;
         /**
          *
-         * Occurs when the selection is changed within the binding.
+         * Occurs when the selected content in the binding is changed.
          *
          * [Api set: ExcelApi 1.2]
+         *
+         * @eventproperty
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.BindingSelectionChangedEventArgs>;
         toJSON(): Excel.Interfaces.BindingData;
@@ -13029,7 +20080,7 @@ declare namespace Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          */
-        add(range: Excel.Range | string, bindingType: Excel.BindingType, id: string): Excel.Binding;
+        add(range: Range | string, bindingType: Excel.BindingType, id: string): Excel.Binding;
         /**
          *
          * Add a new binding to a particular Range.
@@ -13040,7 +20091,7 @@ declare namespace Excel {
          * @param bindingType Type of binding. See Excel.BindingType.
          * @param id Name of binding.
          */
-        add(range: Excel.Range | string, bindingType: "Range" | "Table" | "Text", id: string): Excel.Binding;
+        add(range: Range | string, bindingType: "Range" | "Table" | "Text", id: string): Excel.Binding;
         /**
          *
          * Add a new binding based on a named item in the workbook.
@@ -13123,6 +20174,18 @@ declare namespace Excel {
         getItemOrNullObject(id: string): Excel.Binding;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.BindingCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.BindingCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.BindingCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.BindingCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.BindingCollection;
         load(option?: string | string[]): Excel.BindingCollection;
@@ -13151,10 +20214,10 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param address A Range object, or a string address or name of the range representing the data source. If the address does not contain a sheet name, the currently-active sheet is used. [Api set: ExcelApi 1.1 for string parameter; 1.3 for accepting a Range object as well]
+         * @param address A Range object, or a string address or name of the range representing the data source. If the address does not contain a sheet name, the currently-active sheet is used. [Api set: ExcelApi 1.1 / 1.3.  Prior to ExcelApi 1.3, this parameter must be a string. Starting with Excel Api 1.3, this parameter may be a Range object or a string.]
          * @param hasHeaders Boolean value that indicates whether the data being imported has column labels. If the source does not contain headers (i.e,. when this property set to false), Excel will automatically generate header shifting the data down by one row.
          */
-        add(address: Excel.Range | string, hasHeaders: boolean): Excel.Table;
+        add(address: Range | string, hasHeaders: boolean): Excel.Table;
         /**
          *
          * Gets the number of tables in the collection.
@@ -13191,15 +20254,29 @@ declare namespace Excel {
         getItemOrNullObject(key: string): Excel.Table;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableCollection;
         load(option?: string | string[]): Excel.TableCollection;
         load(option?: OfficeExtension.LoadOption): Excel.TableCollection;
         /**
          *
-         * Occurs when data changed on any table in a workbook, or a worksheet.
+         * Occurs when data changes on any table in a workbook, or a worksheet.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onChanged: OfficeExtension.EventHandlers<Excel.TableChangedEventArgs>;
         toJSON(): Excel.Interfaces.TableCollectionData;
@@ -13213,28 +20290,28 @@ declare namespace Excel {
     class Table extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents a collection of all the columns in the table.
+         * Represents a collection of all the columns in the table. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly columns: Excel.TableColumnCollection;
         /**
          *
-         * Represents a collection of all the rows in the table.
+         * Represents a collection of all the rows in the table. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly rows: Excel.TableRowCollection;
         /**
          *
-         * Represents the sorting for the table.
+         * Represents the sorting for the table. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly sort: Excel.TableSort;
         /**
          *
-         * The worksheet containing the current table.
+         * The worksheet containing the current table. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -13309,10 +20386,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         style: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Table): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Table): void;
+        set(properties: Excel.Table): void;
         /**
          *
          * Clears all the filters currently applied on the table.
@@ -13371,6 +20458,18 @@ declare namespace Excel {
         reapplyFilters(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Table` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Table` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Table` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableLoadOptions): Excel.Table;
         load(option?: string | string[]): Excel.Table;
@@ -13380,16 +20479,20 @@ declare namespace Excel {
         }): Excel.Table;
         /**
          *
-         * Occurs when data changed on a specific table.
+         * Occurs when data in cells changes on a specific table.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onChanged: OfficeExtension.EventHandlers<Excel.TableChangedEventArgs>;
         /**
          *
-         * Occurs when the selection changed on a specific table.
+         * Occurs when the selection changes on a specific table.
          *
          * [Api set: ExcelApi 1.7]
+         *
+         * @eventproperty
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Excel.TableSelectionChangedEventArgs>;
         toJSON(): Excel.Interfaces.TableData;
@@ -13416,9 +20519,9 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1 requires an index smaller than the total column count; 1.4 allows index to be optional (null or -1) and will append a column at the end; 1.4 allows name parameter at creation time.]
          *
-         * @param index Specifies the relative position of the new column. If null or -1, the addition happens at the end. Columns with a higher index will be shifted to the side. Zero-indexed.
-         * @param values A 2-dimensional array of unformatted values of the table column.
-         * @param name Specifies the name of the new column. If null, the default name will be used.
+         * @param index Optional. Specifies the relative position of the new column. If null or -1, the addition happens at the end. Columns with a higher index will be shifted to the side. Zero-indexed.
+         * @param values Optional. A 2-dimensional array of unformatted values of the table column.
+         * @param name Optional. Specifies the name of the new column. If null, the default name will be used.
          */
         add(index?: number, values?: Array<Array<boolean | string | number>> | boolean | string | number, name?: string): Excel.TableColumn;
         /**
@@ -13457,6 +20560,18 @@ declare namespace Excel {
         getItemOrNullObject(key: number | string): Excel.TableColumn;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableColumnCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableColumnCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableColumnCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableColumnCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableColumnCollection;
         load(option?: string | string[]): Excel.TableColumnCollection;
@@ -13472,7 +20587,7 @@ declare namespace Excel {
     class TableColumn extends OfficeExtension.ClientObject {
         /**
          *
-         * Retrieve the filter applied to the column.
+         * Retrieve the filter applied to the column. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -13500,15 +20615,25 @@ declare namespace Excel {
         name: string;
         /**
          *
-         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
          *
          * [Api set: ExcelApi 1.1]
          */
         values: any[][];
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.TableColumn): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableColumnUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TableColumn): void;
+        set(properties: Excel.TableColumn): void;
         /**
          *
          * Deletes the column from the table.
@@ -13546,6 +20671,18 @@ declare namespace Excel {
         getTotalRowRange(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableColumn` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableColumn` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableColumn` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableColumnLoadOptions): Excel.TableColumn;
         load(option?: string | string[]): Excel.TableColumn;
@@ -13558,11 +20695,11 @@ declare namespace Excel {
     /**
      *
      * Represents a collection of all the rows that are part of the table.
-
-            Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
-            a TableRow object represent the physical location of the table row, but not the data.
-            That is, if the data is sorted or if new rows are added, a table row will continue
-            to point at the index for which it was created.
+            
+             Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+             a TableRow object represent the physical location of the table row, but not the data.
+             That is, if the data is sorted or if new rows are added, a table row will continue
+             to point at the index for which it was created.
      *
      * [Api set: ExcelApi 1.1]
      */
@@ -13579,16 +20716,16 @@ declare namespace Excel {
         /**
          *
          * Adds one or more rows to the table. The return object will be the top of the newly added row(s).
-
-            Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
-            a TableRow object represent the physical location of the table row, but not the data.
-            That is, if the data is sorted or if new rows are added, a table row will continue
-            to point at the index for which it was created.
+            
+             Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+             a TableRow object represent the physical location of the table row, but not the data.
+             That is, if the data is sorted or if new rows are added, a table row will continue
+             to point at the index for which it was created.
          *
          * [Api set: ExcelApi 1.1 for adding a single row; 1.4 allows adding of multiple rows.]
          *
-         * @param index Specifies the relative position of the new row. If null or -1, the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed.
-         * @param values A 2-dimensional array of unformatted values of the table row.
+         * @param index Optional. Specifies the relative position of the new row. If null or -1, the addition happens at the end. Any rows below the inserted row are shifted downwards. Zero-indexed.
+         * @param values Optional. A 2-dimensional array of unformatted values of the table row.
          */
         add(index?: number, values?: Array<Array<boolean | string | number>> | boolean | string | number): Excel.TableRow;
         /**
@@ -13601,11 +20738,11 @@ declare namespace Excel {
         /**
          *
          * Gets a row based on its position in the collection.
-
-            Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
-            a TableRow object represent the physical location of the table row, but not the data.
-            That is, if the data is sorted or if new rows are added, a table row will continue
-            to point at the index for which it was created.
+            
+             Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+             a TableRow object represent the physical location of the table row, but not the data.
+             That is, if the data is sorted or if new rows are added, a table row will continue
+             to point at the index for which it was created.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -13614,6 +20751,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.TableRow;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableRowCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableRowCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableRowCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableRowCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.TableRowCollection;
         load(option?: string | string[]): Excel.TableRowCollection;
@@ -13623,11 +20772,11 @@ declare namespace Excel {
     /**
      *
      * Represents a row in a table.
-
-            Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
-            a TableRow object represent the physical location of the table row, but not the data.
-            That is, if the data is sorted or if new rows are added, a table row will continue
-            to point at the index for which it was created.
+            
+             Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+             a TableRow object represent the physical location of the table row, but not the data.
+             That is, if the data is sorted or if new rows are added, a table row will continue
+             to point at the index for which it was created.
      *
      * [Api set: ExcelApi 1.1]
      */
@@ -13641,15 +20790,25 @@ declare namespace Excel {
         readonly index: number;
         /**
          *
-         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+         * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
          *
          * [Api set: ExcelApi 1.1]
          */
         values: any[][];
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.TableRow): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableRowUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TableRow): void;
+        set(properties: Excel.TableRow): void;
         /**
          *
          * Deletes the row from the table.
@@ -13666,6 +20825,18 @@ declare namespace Excel {
         getRange(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableRow` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableRow` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableRow` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableRowLoadOptions): Excel.TableRow;
         load(option?: string | string[]): Excel.TableRow;
@@ -13684,28 +20855,28 @@ declare namespace Excel {
     class RangeFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Collection of border objects that apply to the overall range.
+         * Collection of border objects that apply to the overall range. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly borders: Excel.RangeBorderCollection;
         /**
          *
-         * Returns the fill object defined on the overall range.
+         * Returns the fill object defined on the overall range. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.RangeFill;
         /**
          *
-         * Returns the font object defined on the overall range.
+         * Returns the font object defined on the overall range. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.RangeFont;
         /**
          *
-         * Returns the format protection object for a range.
+         * Returns the format protection object for a range. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -13752,7 +20923,7 @@ declare namespace Excel {
         useStandardHeight: boolean;
         /**
          *
-         * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+         * Indicates whether the column width of the Range object equals the standard width of the sheet.
             Returns True if the column width of the Range object equals the standard width of the sheet.
             Returns Null if the range contains more than one column and the columns aren't all the same height.
             Returns False otherwise.
@@ -13774,10 +20945,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         wrapText: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.RangeFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: RangeFormat): void;
+        set(properties: Excel.RangeFormat): void;
         /**
          *
          * Changes the width of the columns of the current range to achieve the best fit, based on the current data in the columns.
@@ -13794,6 +20975,18 @@ declare namespace Excel {
         autofitRows(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeFormatLoadOptions): Excel.RangeFormat;
         load(option?: string | string[]): Excel.RangeFormat;
@@ -13824,12 +21017,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          */
         locked: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.FormatProtection): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.FormatProtectionUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: FormatProtection): void;
+        set(properties: Excel.FormatProtection): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.FormatProtection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.FormatProtection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.FormatProtection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.FormatProtectionLoadOptions): Excel.FormatProtection;
         load(option?: string | string[]): Excel.FormatProtection;
@@ -13853,10 +21068,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         color: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.RangeFill): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeFillUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: RangeFill): void;
+        set(properties: Excel.RangeFill): void;
         /**
          *
          * Resets the range background.
@@ -13866,6 +21091,18 @@ declare namespace Excel {
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeFill` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeFill` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeFill` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeFillLoadOptions): Excel.RangeFill;
         load(option?: string | string[]): Excel.RangeFill;
@@ -13910,12 +21147,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         weight: Excel.BorderWeight | "Hairline" | "Thin" | "Medium" | "Thick";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.RangeBorder): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: RangeBorder): void;
+        set(properties: Excel.RangeBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeBorder` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeBorder` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeBorder` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeBorderLoadOptions): Excel.RangeBorder;
         load(option?: string | string[]): Excel.RangeBorder;
@@ -13943,7 +21202,7 @@ declare namespace Excel {
         readonly count: number;
         /**
          *
-         * Gets a border object using its name
+         * Gets a border object using its name.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -13952,7 +21211,7 @@ declare namespace Excel {
         getItem(index: Excel.BorderIndex): Excel.RangeBorder;
         /**
          *
-         * Gets a border object using its name
+         * Gets a border object using its name.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -13961,7 +21220,7 @@ declare namespace Excel {
         getItem(index: "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight" | "InsideVertical" | "InsideHorizontal" | "DiagonalDown" | "DiagonalUp"): Excel.RangeBorder;
         /**
          *
-         * Gets a border object using its index
+         * Gets a border object using its index.
          *
          * [Api set: ExcelApi 1.1]
          *
@@ -13970,6 +21229,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.RangeBorder;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeBorderCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeBorderCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeBorderCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeBorderCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.RangeBorderCollection;
         load(option?: string | string[]): Excel.RangeBorderCollection;
@@ -14025,12 +21296,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         underline: Excel.RangeUnderlineStyle | "None" | "Single" | "Double" | "SingleAccountant" | "DoubleAccountant";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.RangeFont): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeFontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: RangeFont): void;
+        set(properties: Excel.RangeFont): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.RangeFont` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.RangeFont` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.RangeFont` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.RangeFontLoadOptions): Excel.RangeFont;
         load(option?: string | string[]): Excel.RangeFont;
@@ -14063,10 +21356,10 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          *
          * @param type Represents the type of a chart. See Excel.ChartType for details.
-         * @param sourceData The range corresponding to the source data.
-         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
+         * @param sourceData The Range object corresponding to the source data.
+         * @param seriesBy Optional. Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
          */
-        add(type: Excel.ChartType, sourceData: Excel.Range | string, seriesBy?: Excel.ChartSeriesBy): Excel.Chart;
+        add(type: Excel.ChartType, sourceData: Range, seriesBy?: Excel.ChartSeriesBy): Excel.Chart;
         /**
          *
          * Creates a new chart.
@@ -14074,10 +21367,10 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          *
          * @param type Represents the type of a chart. See Excel.ChartType for details.
-         * @param sourceData The range corresponding to the source data.
-         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
+         * @param sourceData The Range object corresponding to the source data.
+         * @param seriesBy Optional. Specifies the way columns or rows are used as data series on the chart. See Excel.ChartSeriesBy for details.
          */
-        add(type: "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar", sourceData: Excel.Range | string, seriesBy?: "Auto" | "Columns" | "Rows"): Excel.Chart;
+        add(type: "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel", sourceData: Range, seriesBy?: "Auto" | "Columns" | "Rows"): Excel.Chart;
         /**
          *
          * Returns the number of charts in the worksheet.
@@ -14115,6 +21408,18 @@ declare namespace Excel {
         getItemOrNullObject(name: string): Excel.Chart;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartCollection;
         load(option?: string | string[]): Excel.ChartCollection;
@@ -14130,14 +21435,14 @@ declare namespace Excel {
     class Chart extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents chart axes.
+         * Represents chart axes. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly axes: Excel.ChartAxes;
         /**
          *
-         * Represents the datalabels on the chart.
+         * Represents the datalabels on the chart. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -14151,28 +21456,28 @@ declare namespace Excel {
         readonly format: Excel.ChartAreaFormat;
         /**
          *
-         * Represents the legend for the chart.
+         * Represents the legend for the chart. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly legend: Excel.ChartLegend;
         /**
          *
-         * Represents either a single series or collection of series in the chart.
+         * Represents either a single series or collection of series in the chart. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly series: Excel.ChartSeriesCollection;
         /**
          *
-         * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+         * Represents the title of the specified chart, including the text, visibility, position, and formating of the title. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly title: Excel.ChartTitle;
         /**
          *
-         * The worksheet containing the current chart.
+         * The worksheet containing the current chart. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -14183,7 +21488,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.7]
          */
-        chartType: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+        chartType: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel";
         /**
          *
          * Represents the height, in points, of the chart object.
@@ -14233,10 +21538,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Chart): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Chart): void;
+        set(properties: Excel.Chart): void;
         /**
          *
          * Deletes the chart object.
@@ -14253,7 +21568,7 @@ declare namespace Excel {
          *
          * @param height (Optional) The desired height of the resulting image.
          * @param width (Optional) The desired width of the resulting image.
-         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set)."
+         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set).
          */
         getImage(width?: number, height?: number, fittingMode?: Excel.ImageFittingMode): OfficeExtension.ClientResult<string>;
         /**
@@ -14265,7 +21580,7 @@ declare namespace Excel {
          *
          * @param height (Optional) The desired height of the resulting image.
          * @param width (Optional) The desired width of the resulting image.
-         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set)."
+         * @param fittingMode (Optional) The method used to scale the chart to the specified to the specified dimensions (if both height and width are set).
          */
         getImage(width?: number, height?: number, fittingMode?: "Fit" | "FitAndCenter" | "Fill"): OfficeExtension.ClientResult<string>;
         /**
@@ -14274,20 +21589,20 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param sourceData The range corresponding to the source data.
-         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, Columns. See Excel.ChartSeriesBy for details.
+         * @param sourceData The range object corresponding to the source data.
+         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, and Columns. See Excel.ChartSeriesBy for details.
          */
-        setData(sourceData: Excel.Range | string, seriesBy?: Excel.ChartSeriesBy): void;
+        setData(sourceData: Range, seriesBy?: Excel.ChartSeriesBy): void;
         /**
          *
          * Resets the source data for the chart.
          *
          * [Api set: ExcelApi 1.1]
          *
-         * @param sourceData The range corresponding to the source data.
-         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, Columns. See Excel.ChartSeriesBy for details.
+         * @param sourceData The range object corresponding to the source data.
+         * @param seriesBy Specifies the way columns or rows are used as data series on the chart. Can be one of the following: Auto (default), Rows, and Columns. See Excel.ChartSeriesBy for details.
          */
-        setData(sourceData: Excel.Range | string, seriesBy?: "Auto" | "Columns" | "Rows"): void;
+        setData(sourceData: Range, seriesBy?: "Auto" | "Columns" | "Rows"): void;
         /**
          *
          * Positions the chart relative to cells on the worksheet.
@@ -14297,9 +21612,21 @@ declare namespace Excel {
          * @param startCell The start cell. This is where the chart will be moved to. The start cell is the top-left or top-right cell, depending on the user's right-to-left display settings.
          * @param endCell (Optional) The end cell. If specified, the chart's width and height will be set to fully cover up this cell/range.
          */
-        setPosition(startCell: Excel.Range | string, endCell?: Excel.Range | string): void;
+        setPosition(startCell: Range | string, endCell?: Range | string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Chart` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Chart` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Chart` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartLoadOptions): Excel.Chart;
         load(option?: string | string[]): Excel.Chart;
@@ -14318,31 +21645,53 @@ declare namespace Excel {
     class ChartAreaFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the border format of chart area, which includes color, linestyle and weight.
+         * Represents the border format of chart area, which includes color, linestyle, and weight. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly border: Excel.ChartBorder;
         /**
          *
-         * Represents the fill format of an object, which includes background formatting information.
+         * Represents the fill format of an object, which includes background formatting information. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for the current object.
+         * Represents the font attributes (font name, font size, color, etc.) for the current object. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartAreaFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartAreaFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartAreaFormat): void;
+        set(properties: Excel.ChartAreaFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartAreaFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartAreaFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartAreaFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartAreaFormatLoadOptions): Excel.ChartAreaFormat;
         load(option?: string | string[]): Excel.ChartAreaFormat;
@@ -14374,8 +21723,8 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.7]
          *
-         * @param name Name of the series.
-         * @param index Index value of the series to be added. Zero-indexed.
+         * @param name Optional. Name of the series.
+         * @param index Optional. Index value of the series to be added. Zero-indexed.
          */
         add(name?: string, index?: number): Excel.ChartSeries;
         /**
@@ -14396,6 +21745,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.ChartSeries;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartSeriesCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartSeriesCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartSeriesCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartSeriesCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartSeriesCollection;
         load(option?: string | string[]): Excel.ChartSeriesCollection;
@@ -14411,21 +21772,21 @@ declare namespace Excel {
     class ChartSeries extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart series, which includes fill and line formatting.
+         * Represents the formatting of a chart series, which includes fill and line formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartSeriesFormat;
         /**
          *
-         * Represents a collection of all points in the series.
+         * Represents a collection of all points in the series. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly points: Excel.ChartPointsCollection;
         /**
          *
-         * Represents a collection of trendlines in the series.
+         * Represents a collection of trendlines in the series. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -14436,7 +21797,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.7]
          */
-        chartType: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+        chartType: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel";
         /**
          *
          * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
@@ -14518,15 +21879,25 @@ declare namespace Excel {
         showShadow: boolean;
         /**
          *
-         * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+         * Boolean value representing if the series is smooth or not. Only applicable to line and scatter charts.
          *
          * [Api set: ExcelApi 1.7]
          */
         smooth: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartSeries): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartSeriesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartSeries): void;
+        set(properties: Excel.ChartSeries): void;
         /**
          *
          * Deletes the chart series.
@@ -14542,7 +21913,7 @@ declare namespace Excel {
          *
          * @param sourceData The Range object corresponding to the source data.
          */
-        setBubbleSizes(sourceData: Excel.Range): void;
+        setBubbleSizes(sourceData: Range): void;
         /**
          *
          * Set values for a chart series. For scatter chart, it means Y axis values.
@@ -14551,7 +21922,7 @@ declare namespace Excel {
          *
          * @param sourceData The Range object corresponding to the source data.
          */
-        setValues(sourceData: Excel.Range): void;
+        setValues(sourceData: Range): void;
         /**
          *
          * Set values of X axis for a chart series. Only works for scatter charts.
@@ -14560,9 +21931,21 @@ declare namespace Excel {
          *
          * @param sourceData The Range object corresponding to the source data.
          */
-        setXAxisValues(sourceData: Excel.Range): void;
+        setXAxisValues(sourceData: Range): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartSeries` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartSeries` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartSeries` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartSeriesLoadOptions): Excel.ChartSeries;
         load(option?: string | string[]): Excel.ChartSeries;
@@ -14574,31 +21957,53 @@ declare namespace Excel {
     }
     /**
      *
-     * encapsulates the format properties for the chart series
+     * Encapsulates the format properties for the chart series
      *
      * [Api set: ExcelApi 1.1]
      */
     class ChartSeriesFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of a chart series, which includes background formating information.
+         * Represents the fill format of a chart series, which includes background formating information. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents line formatting.
+         * Represents line formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly line: Excel.ChartLineFormat;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartSeriesFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartSeriesFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartSeriesFormat): void;
+        set(properties: Excel.ChartSeriesFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartSeriesFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartSeriesFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartSeriesFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartSeriesFormatLoadOptions): Excel.ChartSeriesFormat;
         load(option?: string | string[]): Excel.ChartSeriesFormat;
@@ -14642,6 +22047,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.ChartPoint;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartPointsCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartPointsCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartPointsCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartPointsCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartPointsCollection;
         load(option?: string | string[]): Excel.ChartPointsCollection;
@@ -14657,7 +22074,7 @@ declare namespace Excel {
     class ChartPoint extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns the data label of a chart point.
+         * Returns the data label of a chart point. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -14671,7 +22088,7 @@ declare namespace Excel {
         readonly format: Excel.ChartPointFormat;
         /**
          *
-         * Represents whether a data point has datalabel. Not applicable for surface charts.
+         * Represents whether a data point has a data label. Not applicable for surface charts.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -14711,12 +22128,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         readonly value: any;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartPoint): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartPointUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartPoint): void;
+        set(properties: Excel.ChartPoint): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartPoint` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartPoint` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartPoint` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartPointLoadOptions): Excel.ChartPoint;
         load(option?: string | string[]): Excel.ChartPoint;
@@ -14735,24 +22174,46 @@ declare namespace Excel {
     class ChartPointFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the border format of a chart data point, which includes color, style and weight information.
+         * Represents the border format of a chart data point, which includes color, style, and weight information. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly border: Excel.ChartBorder;
         /**
          *
-         * Represents the fill format of a chart, which includes background formating information.
+         * Represents the fill format of a chart, which includes background formating information. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartPointFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartPointFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartPointFormat): void;
+        set(properties: Excel.ChartPointFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartPointFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartPointFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartPointFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartPointFormatLoadOptions): Excel.ChartPointFormat;
         load(option?: string | string[]): Excel.ChartPointFormat;
@@ -14771,37 +22232,47 @@ declare namespace Excel {
     class ChartAxes extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the category axis in a chart.
+         * Represents the category axis in a chart. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly categoryAxis: Excel.ChartAxis;
         /**
          *
-         * Represents the series axis of a 3-dimensional chart.
+         * Represents the series axis of a 3-dimensional chart. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly seriesAxis: Excel.ChartAxis;
         /**
          *
-         * Represents the value axis in an axis.
+         * Represents the value axis in an axis. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly valueAxis: Excel.ChartAxis;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartAxes): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartAxesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartAxes): void;
+        set(properties: Excel.ChartAxes): void;
         /**
          *
          * Returns the specific axis identified by type and group.
          *
          * [Api set: ExcelApi 1.7]
          *
-         * @param type Specifies the axis type. See Excel.ChartAxis for details.
-         * @param group Specifies the axis group. See Excel.ChartAxis for details.
+         * @param type Specifies the axis type. See Excel.ChartAxisType for details.
+         * @param group Optional. Specifies the axis group. See Excel.ChartAxisGroup for details.
          */
         getItem(type: Excel.ChartAxisType, group?: Excel.ChartAxisGroup): Excel.ChartAxis;
         /**
@@ -14810,12 +22281,24 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.7]
          *
-         * @param type Specifies the axis type. See Excel.ChartAxis for details.
-         * @param group Specifies the axis group. See Excel.ChartAxis for details.
+         * @param type Specifies the axis type. See Excel.ChartAxisType for details.
+         * @param group Optional. Specifies the axis group. See Excel.ChartAxisGroup for details.
          */
         getItem(type: "Invalid" | "Category" | "Value" | "Series", group?: "Primary" | "Secondary"): Excel.ChartAxis;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartAxes` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartAxes` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartAxes` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartAxesLoadOptions): Excel.ChartAxes;
         load(option?: string | string[]): Excel.ChartAxes;
@@ -14834,35 +22317,35 @@ declare namespace Excel {
     class ChartAxis extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart object, which includes line and font formatting.
+         * Represents the formatting of a chart object, which includes line and font formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartAxisFormat;
         /**
          *
-         * Returns a gridlines object that represents the major gridlines for the specified axis.
+         * Returns a Gridlines object that represents the major gridlines for the specified axis. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly majorGridlines: Excel.ChartGridlines;
         /**
          *
-         * Returns a Gridlines object that represents the minor gridlines for the specified axis.
+         * Returns a Gridlines object that represents the minor gridlines for the specified axis. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly minorGridlines: Excel.ChartGridlines;
         /**
          *
-         * Represents the axis title.
+         * Represents the axis title. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly title: Excel.ChartAxisTitle;
         /**
          *
-         * Represents the group for the specified axis. See Excel.ChartAxisGroup for details.
+         * Represents the group for the specified axis. See Excel.ChartAxisGroup for details. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -14883,7 +22366,7 @@ declare namespace Excel {
         categoryType: Excel.ChartAxisCategoryType | "Automatic" | "TextAxis" | "DateAxis";
         /**
          *
-         * Represents the custom axis display unit value. Read Only. To set this property, please use the SetCustomDisplayUnit(double) method.
+         * Represents the custom axis display unit value. Read-only. To set this property, please use the SetCustomDisplayUnit(double) method.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -14897,14 +22380,14 @@ declare namespace Excel {
         displayUnit: Excel.ChartAxisDisplayUnit | "None" | "Hundreds" | "Thousands" | "TenThousands" | "HundredThousands" | "Millions" | "TenMillions" | "HundredMillions" | "Billions" | "Trillions" | "Custom";
         /**
          *
-         * Represents the height, in points, of the chart axis. Null if the axis's not visible.
+         * Represents the height, in points, of the chart axis. Null if the axis is not visible. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly height: number;
         /**
          *
-         * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis's not visible.
+         * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis is not visible. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -14967,7 +22450,7 @@ declare namespace Excel {
         minorTimeUnitScale: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
         /**
          *
-         * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+         * Represents the interval between two minor tick marks. Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -15016,7 +22499,7 @@ declare namespace Excel {
         tickMarkSpacing: number;
         /**
          *
-         * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis's not visible.
+         * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis is not visible. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -15037,15 +22520,25 @@ declare namespace Excel {
         visible: boolean;
         /**
          *
-         * Represents the width, in points, of the chart axis. Null if the axis's not visible.
+         * Represents the width, in points, of the chart axis. Null if the axis is not visible. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartAxis): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartAxisUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartAxis): void;
+        set(properties: Excel.ChartAxis): void;
         /**
          *
          * Sets all the category names for the specified axis.
@@ -15054,18 +22547,30 @@ declare namespace Excel {
          *
          * @param sourceData The Range object corresponding to the source data.
          */
-        setCategoryNames(sourceData: Excel.Range): void;
+        setCategoryNames(sourceData: Range): void;
         /**
          *
          * Sets the axis display unit to a custom value.
          *
          * [Api set: ExcelApi 1.7]
          *
-         * @param value Custom value of the display unit
+         * @param value Custom value of the display unit.
          */
         setCustomDisplayUnit(value: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartAxis` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartAxis` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartAxis` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartAxisLoadOptions): Excel.ChartAxis;
         load(option?: string | string[]): Excel.ChartAxis;
@@ -15084,24 +22589,46 @@ declare namespace Excel {
     class ChartAxisFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for a chart axis element.
+         * Represents the font attributes (font name, font size, color, etc.) for a chart axis element. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
         /**
          *
-         * Represents chart line formatting.
+         * Represents chart line formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly line: Excel.ChartLineFormat;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartAxisFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartAxisFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartAxisFormat): void;
+        set(properties: Excel.ChartAxisFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartAxisFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartAxisFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartAxisFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartAxisFormatLoadOptions): Excel.ChartAxisFormat;
         load(option?: string | string[]): Excel.ChartAxisFormat;
@@ -15120,7 +22647,7 @@ declare namespace Excel {
     class ChartAxisTitle extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of chart axis title.
+         * Represents the formatting of chart axis title. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -15139,12 +22666,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         visible: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartAxisTitle): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartAxisTitleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartAxisTitle): void;
+        set(properties: Excel.ChartAxisTitle): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartAxisTitle` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartAxisTitle` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartAxisTitle` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartAxisTitleLoadOptions): Excel.ChartAxisTitle;
         load(option?: string | string[]): Excel.ChartAxisTitle;
@@ -15163,17 +22712,39 @@ declare namespace Excel {
     class ChartAxisTitleFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object.
+         * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartAxisTitleFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartAxisTitleFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartAxisTitleFormat): void;
+        set(properties: Excel.ChartAxisTitleFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartAxisTitleFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartAxisTitleFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartAxisTitleFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartAxisTitleFormatLoadOptions): Excel.ChartAxisTitleFormat;
         load(option?: string | string[]): Excel.ChartAxisTitleFormat;
@@ -15192,7 +22763,7 @@ declare namespace Excel {
     class ChartDataLabels extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the format of chart data labels, which includes fill and font formatting.
+         * Represents the format of chart data labels, which includes fill and font formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -15253,12 +22824,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         showValue: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartDataLabels): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartDataLabelsUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartDataLabels): void;
+        set(properties: Excel.ChartDataLabels): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartDataLabels` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartDataLabels` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartDataLabels` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartDataLabelsLoadOptions): Excel.ChartDataLabels;
         load(option?: string | string[]): Excel.ChartDataLabels;
@@ -15331,12 +22924,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         showValue: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartDataLabel): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartDataLabelUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartDataLabel): void;
+        set(properties: Excel.ChartDataLabel): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartDataLabel` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartDataLabel` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartDataLabel` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartDataLabelLoadOptions): Excel.ChartDataLabel;
         load(option?: string | string[]): Excel.ChartDataLabel;
@@ -15355,24 +22970,46 @@ declare namespace Excel {
     class ChartDataLabelFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of the current chart data label.
+         * Represents the fill format of the current chart data label. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for a chart data label.
+         * Represents the font attributes (font name, font size, color, etc.) for a chart data label. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartDataLabelFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartDataLabelFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartDataLabelFormat): void;
+        set(properties: Excel.ChartDataLabelFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartDataLabelFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartDataLabelFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartDataLabelFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartDataLabelFormatLoadOptions): Excel.ChartDataLabelFormat;
         load(option?: string | string[]): Excel.ChartDataLabelFormat;
@@ -15391,7 +23028,7 @@ declare namespace Excel {
     class ChartGridlines extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of chart gridlines.
+         * Represents the formatting of chart gridlines. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -15403,12 +23040,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         visible: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartGridlines): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartGridlinesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartGridlines): void;
+        set(properties: Excel.ChartGridlines): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartGridlines` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartGridlines` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartGridlines` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartGridlinesLoadOptions): Excel.ChartGridlines;
         load(option?: string | string[]): Excel.ChartGridlines;
@@ -15427,17 +23086,39 @@ declare namespace Excel {
     class ChartGridlinesFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents chart line formatting.
+         * Represents chart line formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly line: Excel.ChartLineFormat;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartGridlinesFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartGridlinesFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartGridlinesFormat): void;
+        set(properties: Excel.ChartGridlinesFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartGridlinesFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartGridlinesFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartGridlinesFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartGridlinesFormatLoadOptions): Excel.ChartGridlinesFormat;
         load(option?: string | string[]): Excel.ChartGridlinesFormat;
@@ -15456,14 +23137,14 @@ declare namespace Excel {
     class ChartLegend extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart legend, which includes fill and font formatting.
+         * Represents the formatting of a chart legend, which includes fill and font formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartLegendFormat;
         /**
          *
-         * Represents a collection of legendEntries in the legend.
+         * Represents a collection of legendEntries in the legend. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -15524,12 +23205,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartLegend): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartLegendUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartLegend): void;
+        set(properties: Excel.ChartLegend): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartLegend` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartLegend` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartLegend` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartLegendLoadOptions): Excel.ChartLegend;
         load(option?: string | string[]): Excel.ChartLegend;
@@ -15553,12 +23256,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         visible: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartLegendEntry): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartLegendEntryUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartLegendEntry): void;
+        set(properties: Excel.ChartLegendEntry): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartLegendEntry` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartLegendEntry` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartLegendEntry` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartLegendEntryLoadOptions): Excel.ChartLegendEntry;
         load(option?: string | string[]): Excel.ChartLegendEntry;
@@ -15595,6 +23320,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.ChartLegendEntry;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartLegendEntryCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartLegendEntryCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartLegendEntryCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartLegendEntryCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartLegendEntryCollection;
         load(option?: string | string[]): Excel.ChartLegendEntryCollection;
@@ -15610,24 +23347,46 @@ declare namespace Excel {
     class ChartLegendFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the fill format of an object, which includes background formating information.
+         * Represents the fill format of an object, which includes background formating information. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes such as font name, font size, color, etc. of a chart legend.
+         * Represents the font attributes such as font name, font size, color, etc. of a chart legend. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartLegendFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartLegendFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartLegendFormat): void;
+        set(properties: Excel.ChartLegendFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartLegendFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartLegendFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartLegendFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartLegendFormatLoadOptions): Excel.ChartLegendFormat;
         load(option?: string | string[]): Excel.ChartLegendFormat;
@@ -15646,14 +23405,14 @@ declare namespace Excel {
     class ChartTitle extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the formatting of a chart title, which includes fill and font formatting.
+         * Represents the formatting of a chart title, which includes fill and font formatting. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly format: Excel.ChartTitleFormat;
         /**
          *
-         * Returns the height, in points, of the chart title. Read-only. Null if chart title is not visible.
+         * Returns the height, in points, of the chart title. Null if chart title is not visible. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -15667,7 +23426,7 @@ declare namespace Excel {
         horizontalAlignment: Excel.ChartTextHorizontalAlignment | "Center" | "Left" | "Right" | "Justify" | "Distributed";
         /**
          *
-         * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+         * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title is not visible.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -15709,7 +23468,7 @@ declare namespace Excel {
         textOrientation: number;
         /**
          *
-         * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+         * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title is not visible.
          *
          * [Api set: ExcelApi 1.7]
          */
@@ -15730,18 +23489,28 @@ declare namespace Excel {
         visible: boolean;
         /**
          *
-         * Returns the width, in points, of the chart title. Read-only. Null if chart title is not visible.
+         * Returns the width, in points, of the chart title. Null if chart title is not visible. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartTitle): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartTitleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartTitle): void;
+        set(properties: Excel.ChartTitle): void;
         /**
          *
-         * Get the substring of a chart title. Line break '\n' also counts one charater.
+         * Get the substring of a chart title. Line break '\n' also counts one character.
          *
          * [Api set: ExcelApi 1.7]
          *
@@ -15755,11 +23524,23 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.7]
          *
-         * @param formula a string that present the formula to set
+         * @param formula A string that represents the formula to set.
          */
         setFormula(formula: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartTitle` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartTitle` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartTitle` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartTitleLoadOptions): Excel.ChartTitle;
         load(option?: string | string[]): Excel.ChartTitle;
@@ -15783,12 +23564,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         readonly font: Excel.ChartFont;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartFormatString): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartFormatStringUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartFormatString): void;
+        set(properties: Excel.ChartFormatString): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartFormatString` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartFormatString` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartFormatString` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartFormatStringLoadOptions): Excel.ChartFormatString;
         load(option?: string | string[]): Excel.ChartFormatString;
@@ -15807,31 +23610,53 @@ declare namespace Excel {
     class ChartTitleFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the border format of chart title, which includes color, linestyle and weight.
+         * Represents the border format of chart title, which includes color, linestyle, and weight. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly border: Excel.ChartBorder;
         /**
          *
-         * Represents the fill format of an object, which includes background formating information.
+         * Represents the fill format of an object, which includes background formating information. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly fill: Excel.ChartFill;
         /**
          *
-         * Represents the font attributes (font name, font size, color, etc.) for an object.
+         * Represents the font attributes (font name, font size, color, etc.) for an object. Read-only.
          *
          * [Api set: ExcelApi 1.1]
          */
         readonly font: Excel.ChartFont;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartTitleFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartTitleFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartTitleFormat): void;
+        set(properties: Excel.ChartTitleFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartTitleFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartTitleFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartTitleFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartTitleFormatLoadOptions): Excel.ChartTitleFormat;
         load(option?: string | string[]): Excel.ChartTitleFormat;
@@ -15900,12 +23725,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         weight: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartBorder): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartBorder): void;
+        set(properties: Excel.ChartBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartBorder` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartBorder` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartBorder` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartBorderLoadOptions): Excel.ChartBorder;
         load(option?: string | string[]): Excel.ChartBorder;
@@ -15917,7 +23764,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Enapsulates the formatting options for line elements.
+     * Encapsulates the formatting options for line elements.
      *
      * [Api set: ExcelApi 1.1]
      */
@@ -15943,10 +23790,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         weight: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartLineFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartLineFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartLineFormat): void;
+        set(properties: Excel.ChartLineFormat): void;
         /**
          *
          * Clear the line format of a chart element.
@@ -15956,6 +23813,18 @@ declare namespace Excel {
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartLineFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartLineFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartLineFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartLineFormatLoadOptions): Excel.ChartLineFormat;
         load(option?: string | string[]): Excel.ChartLineFormat;
@@ -16014,12 +23883,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.1]
          */
         underline: Excel.ChartUnderlineStyle | "None" | "Single";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartFont): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartFontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartFont): void;
+        set(properties: Excel.ChartFont): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartFont` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartFont` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartFont` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartFontLoadOptions): Excel.ChartFont;
         load(option?: string | string[]): Excel.ChartFont;
@@ -16078,10 +23969,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         type: Excel.ChartTrendlineType | "Linear" | "Exponential" | "Logarithmic" | "MovingAverage" | "Polynomial" | "Power";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartTrendline): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartTrendlineUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartTrendline): void;
+        set(properties: Excel.ChartTrendline): void;
         /**
          *
          * Delete the trendline object.
@@ -16091,6 +23992,18 @@ declare namespace Excel {
         delete(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartTrendline` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartTrendline` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartTrendline` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartTrendlineLoadOptions): Excel.ChartTrendline;
         load(option?: string | string[]): Excel.ChartTrendline;
@@ -16145,6 +24058,18 @@ declare namespace Excel {
         getItem(index: number): Excel.ChartTrendline;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartTrendlineCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartTrendlineCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartTrendlineCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartTrendlineCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ChartTrendlineCollection;
         load(option?: string | string[]): Excel.ChartTrendlineCollection;
@@ -16160,17 +24085,39 @@ declare namespace Excel {
     class ChartTrendlineFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents chart line formatting.
+         * Represents chart line formatting. Read-only.
          *
          * [Api set: ExcelApi 1.7]
          */
         readonly line: Excel.ChartLineFormat;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ChartTrendlineFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ChartTrendlineFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ChartTrendlineFormat): void;
+        set(properties: Excel.ChartTrendlineFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ChartTrendlineFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ChartTrendlineFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ChartTrendlineFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ChartTrendlineFormatLoadOptions): Excel.ChartTrendlineFormat;
         load(option?: string | string[]): Excel.ChartTrendlineFormat;
@@ -16194,10 +24141,10 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          *
          * @param fields The list of conditions to sort on.
-         * @param matchCase Whether to have the casing impact string ordering.
-         * @param hasHeaders Whether the range has a header.
-         * @param orientation Whether the operation is sorting rows or columns.
-         * @param method The ordering method used for Chinese characters.
+         * @param matchCase Optional. Whether to have the casing impact string ordering.
+         * @param hasHeaders Optional. Whether the range has a header.
+         * @param orientation Optional. Whether the operation is sorting rows or columns.
+         * @param method Optional. The ordering method used for Chinese characters.
          */
         apply(fields: Excel.SortField[], matchCase?: boolean, hasHeaders?: boolean, orientation?: Excel.SortOrientation, method?: Excel.SortMethod): void;
         /**
@@ -16207,10 +24154,10 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          *
          * @param fields The list of conditions to sort on.
-         * @param matchCase Whether to have the casing impact string ordering.
-         * @param hasHeaders Whether the range has a header.
-         * @param orientation Whether the operation is sorting rows or columns.
-         * @param method The ordering method used for Chinese characters.
+         * @param matchCase Optional. Whether to have the casing impact string ordering.
+         * @param hasHeaders Optional. Whether the range has a header.
+         * @param orientation Optional. Whether the operation is sorting rows or columns.
+         * @param method Optional. The ordering method used for Chinese characters.
          */
         apply(fields: Excel.SortField[], matchCase?: boolean, hasHeaders?: boolean, orientation?: "Rows" | "Columns", method?: "PinYin" | "StrokeCount"): void;
         toJSON(): {
@@ -16226,21 +24173,21 @@ declare namespace Excel {
     class TableSort extends OfficeExtension.ClientObject {
         /**
          *
-         * Represents the current conditions used to last sort the table.
+         * Represents the current conditions used to last sort the table. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly fields: Excel.SortField[];
         /**
          *
-         * Represents whether the casing impacted the last sort of the table.
+         * Represents whether the casing impacted the last sort of the table. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
         readonly matchCase: boolean;
         /**
          *
-         * Represents Chinese character ordering method last used to sort the table.
+         * Represents Chinese character ordering method last used to sort the table. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -16252,8 +24199,8 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          *
          * @param fields The list of conditions to sort on.
-         * @param matchCase Whether to have the casing impact string ordering.
-         * @param method The ordering method used for Chinese characters.
+         * @param matchCase Optional. Whether to have the casing impact string ordering.
+         * @param method Optional. The ordering method used for Chinese characters.
          */
         apply(fields: Excel.SortField[], matchCase?: boolean, method?: Excel.SortMethod): void;
         /**
@@ -16263,8 +24210,8 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.2]
          *
          * @param fields The list of conditions to sort on.
-         * @param matchCase Whether to have the casing impact string ordering.
-         * @param method The ordering method used for Chinese characters.
+         * @param matchCase Optional. Whether to have the casing impact string ordering.
+         * @param method Optional. The ordering method used for Chinese characters.
          */
         apply(fields: Excel.SortField[], matchCase?: boolean, method?: "PinYin" | "StrokeCount"): void;
         /**
@@ -16283,6 +24230,18 @@ declare namespace Excel {
         reapply(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TableSort` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TableSort` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TableSort` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TableSortLoadOptions): Excel.TableSort;
         load(option?: string | string[]): Excel.TableSort;
@@ -16351,7 +24310,7 @@ declare namespace Excel {
     class Filter extends OfficeExtension.ClientObject {
         /**
          *
-         * The currently applied filter on the given column.
+         * The currently applied filter on the given column. Read-only.
          *
          * [Api set: ExcelApi 1.2]
          */
@@ -16394,24 +24353,24 @@ declare namespace Excel {
         applyCellColorFilter(color: string): void;
         /**
          *
-         * Apply a "Icon" filter to the column for the given criteria strings.
+         * Apply an "Icon" filter to the column for the given criteria strings.
          *
          * [Api set: ExcelApi 1.2]
          *
          * @param criteria1 The first criteria string.
-         * @param criteria2 The second criteria string.
-         * @param oper The operator that describes how the two criteria are joined.
+         * @param criteria2 Optional. The second criteria string.
+         * @param oper Optional. The operator that describes how the two criteria are joined.
          */
         applyCustomFilter(criteria1: string, criteria2?: string, oper?: Excel.FilterOperator): void;
         /**
          *
-         * Apply a "Icon" filter to the column for the given criteria strings.
+         * Apply an "Icon" filter to the column for the given criteria strings.
          *
          * [Api set: ExcelApi 1.2]
          *
          * @param criteria1 The first criteria string.
-         * @param criteria2 The second criteria string.
-         * @param oper The operator that describes how the two criteria are joined.
+         * @param criteria2 Optional. The second criteria string.
+         * @param oper Optional. The operator that describes how the two criteria are joined.
          */
         applyCustomFilter(criteria1: string, criteria2?: string, oper?: "And" | "Or"): void;
         /**
@@ -16443,7 +24402,7 @@ declare namespace Excel {
         applyFontColorFilter(color: string): void;
         /**
          *
-         * Apply a "Icon" filter to the column for the given icon.
+         * Apply an "Icon" filter to the column for the given icon.
          *
          * [Api set: ExcelApi 1.2]
          *
@@ -16474,9 +24433,9 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          *
-         * @param values The list of values to show.
+         * @param values The list of values to show. This must be an array of strings or an array of Excel.FilterDateTime objects.
          */
-        applyValuesFilter(values: Array<string | Excel.FilterDatetime>): void;
+        applyValuesFilter(values: Array<string | FilterDatetime>): void;
         /**
          *
          * Clear the filter on the given column.
@@ -16486,6 +24445,18 @@ declare namespace Excel {
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Filter` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Filter` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Filter` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.FilterLoadOptions): Excel.Filter;
         load(option?: string | string[]): Excel.Filter;
@@ -16513,7 +24484,7 @@ declare namespace Excel {
          *
          * The first criterion used to filter data. Used as an operator in the case of "custom" filtering.
              For example ">50" for number greater than 50 or "=*s" for values ending in "s".
-
+            
              Used as a number in the case of top/bottom items/percents. E.g. "5" for the top 5 items if filterOn is set to "topItems"
          *
          * [Api set: ExcelApi 1.2]
@@ -16560,7 +24531,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.2]
          */
-        values?: Array<string | Excel.FilterDatetime>;
+        values?: Array<string | FilterDatetime>;
     }
     /**
      *
@@ -16661,6 +24632,18 @@ declare namespace Excel {
         getOnlyItemOrNullObject(): Excel.CustomXmlPart;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CustomXmlPartScopedCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CustomXmlPartScopedCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CustomXmlPartScopedCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CustomXmlPartScopedCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.CustomXmlPartScopedCollection;
         load(option?: string | string[]): Excel.CustomXmlPartScopedCollection;
@@ -16691,7 +24674,7 @@ declare namespace Excel {
          *
          * [Api set: ExcelApi 1.5]
          *
-         * @param namespaceUri
+         * @param namespaceUri This must be a fully qualified schema URI; for example, "http://schemas.contoso.com/review/1.0".
          */
         getByNamespace(namespaceUri: string): Excel.CustomXmlPartScopedCollection;
         /**
@@ -16722,6 +24705,18 @@ declare namespace Excel {
         getItemOrNullObject(id: string): Excel.CustomXmlPart;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CustomXmlPartCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CustomXmlPartCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CustomXmlPartCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CustomXmlPartCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.CustomXmlPartCollection;
         load(option?: string | string[]): Excel.CustomXmlPartCollection;
@@ -16774,6 +24769,18 @@ declare namespace Excel {
         setXml(xml: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CustomXmlPart` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CustomXmlPart` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CustomXmlPart` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CustomXmlPartLoadOptions): Excel.CustomXmlPart;
         load(option?: string | string[]): Excel.CustomXmlPart;
@@ -16826,6 +24833,18 @@ declare namespace Excel {
         refreshAll(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.PivotTableCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.PivotTableCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.PivotTableCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.PivotTableCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.PivotTableCollection;
         load(option?: string | string[]): Excel.PivotTableCollection;
@@ -16848,7 +24867,7 @@ declare namespace Excel {
         readonly worksheet: Excel.Worksheet;
         /**
          *
-         * Id of the PivotTable.
+         * Id of the PivotTable. Read-only.
          *
          * [Api set: ExcelApi 1.5]
          */
@@ -16860,10 +24879,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.3]
          */
         name: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.PivotTable): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.PivotTableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: PivotTable): void;
+        set(properties: Excel.PivotTable): void;
         /**
          *
          * Refreshes the PivotTable.
@@ -16873,6 +24902,18 @@ declare namespace Excel {
         refresh(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.PivotTable` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.PivotTable` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.PivotTable` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.PivotTableLoadOptions): Excel.PivotTable;
         load(option?: string | string[]): Excel.PivotTable;
@@ -16973,12 +25014,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         title: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.DocumentProperties): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.DocumentPropertiesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: DocumentProperties): void;
+        set(properties: Excel.DocumentProperties): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.DocumentProperties` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.DocumentProperties` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.DocumentProperties` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.DocumentPropertiesLoadOptions): Excel.DocumentProperties;
         load(option?: string | string[]): Excel.DocumentProperties;
@@ -17016,10 +25079,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         value: any;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.CustomProperty): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.CustomPropertyUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: CustomProperty): void;
+        set(properties: Excel.CustomProperty): void;
         /**
          *
          * Deletes the custom property.
@@ -17029,6 +25102,18 @@ declare namespace Excel {
         delete(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CustomProperty` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CustomProperty` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CustomProperty` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CustomPropertyLoadOptions): Excel.CustomProperty;
         load(option?: string | string[]): Excel.CustomProperty;
@@ -17091,6 +25176,18 @@ declare namespace Excel {
         getItemOrNullObject(key: string): Excel.CustomProperty;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CustomPropertyCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CustomPropertyCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CustomPropertyCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CustomPropertyCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.CustomPropertyCollection;
         load(option?: string | string[]): Excel.CustomPropertyCollection;
@@ -17159,6 +25256,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.ConditionalFormat;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalFormatCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalFormatCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalFormatCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalFormatCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ConditionalFormatCollection;
         load(option?: string | string[]): Excel.ConditionalFormatCollection;
@@ -17175,7 +25284,7 @@ declare namespace Excel {
         /**
          *
          * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-            For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17183,77 +25292,77 @@ declare namespace Excel {
         /**
          *
          * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-            For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly cellValueOrNullObject: Excel.CellValueConditionalFormat;
         /**
          *
-         * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+         * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly colorScale: Excel.ColorScaleConditionalFormat;
         /**
          *
-         * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+         * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly colorScaleOrNullObject: Excel.ColorScaleConditionalFormat;
         /**
          *
-         * Returns the custom conditional format properties if the current conditional format is a custom type.
+         * Returns the custom conditional format properties if the current conditional format is a custom type. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly custom: Excel.CustomConditionalFormat;
         /**
          *
-         * Returns the custom conditional format properties if the current conditional format is a custom type.
+         * Returns the custom conditional format properties if the current conditional format is a custom type. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly customOrNullObject: Excel.CustomConditionalFormat;
         /**
          *
-         * Returns the data bar properties if the current conditional format is a data bar.
+         * Returns the data bar properties if the current conditional format is a data bar. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly dataBar: Excel.DataBarConditionalFormat;
         /**
          *
-         * Returns the data bar properties if the current conditional format is a data bar.
+         * Returns the data bar properties if the current conditional format is a data bar. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly dataBarOrNullObject: Excel.DataBarConditionalFormat;
         /**
          *
-         * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+         * Returns the IconSet conditional format properties if the current conditional format is an IconSet type. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly iconSet: Excel.IconSetConditionalFormat;
         /**
          *
-         * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+         * Returns the IconSet conditional format properties if the current conditional format is an IconSet type. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly iconSetOrNullObject: Excel.IconSetConditionalFormat;
         /**
          *
-         * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+         * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly preset: Excel.PresetCriteriaConditionalFormat;
         /**
          *
-         * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+         * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17261,7 +25370,7 @@ declare namespace Excel {
         /**
          *
          * Returns the specific text conditional format properties if the current conditional format is a text type.
-            For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text". Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17269,7 +25378,7 @@ declare namespace Excel {
         /**
          *
          * Returns the specific text conditional format properties if the current conditional format is a text type.
-            For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text". Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17277,7 +25386,7 @@ declare namespace Excel {
         /**
          *
          * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-            For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17285,14 +25394,14 @@ declare namespace Excel {
         /**
          *
          * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-            For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly topBottomOrNullObject: Excel.TopBottomConditionalFormat;
         /**
          *
-         * The Priority of the Conditional Format within the current ConditionalFormatCollection.
+         * The Priority of the Conditional Format within the current ConditionalFormatCollection. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17303,7 +25412,7 @@ declare namespace Excel {
             changes other conditional formats' priorities, to allow for a contiguous priority order.
             Use a negative priority to begin from the back.
             Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
-            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17318,15 +25427,25 @@ declare namespace Excel {
         stopIfTrue: boolean;
         /**
          *
-         * A type of conditional format. Only one can be set at a time. Read-Only.
+         * A type of conditional format. Only one can be set at a time. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly type: Excel.ConditionalFormatType | "Custom" | "DataBar" | "ColorScale" | "IconSet" | "TopBottom" | "PresetCriteria" | "ContainsText" | "CellValue";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalFormat): void;
+        set(properties: Excel.ConditionalFormat): void;
         /**
          *
          * Deletes this conditional format.
@@ -17336,20 +25455,32 @@ declare namespace Excel {
         delete(): void;
         /**
          *
-         * Returns the range the conditonal format is applied to or a null object if the range is discontiguous. Read-only.
+         * Returns the range the conditonal format is applied to. Throws an error if the conditional format is applied to multiple ranges. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         getRange(): Excel.Range;
         /**
          *
-         * Returns the range the conditonal format is applied to or a null object if the range is discontiguous. Read-only.
+         * Returns the range the conditonal format is applied to, or a null object if the conditional format is applied to multiple ranges. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         getRangeOrNullObject(): Excel.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalFormatLoadOptions): Excel.ConditionalFormat;
         load(option?: string | string[]): Excel.ConditionalFormat;
@@ -17368,14 +25499,14 @@ declare namespace Excel {
     class DataBarConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Representation of all values to the left of the axis in an Excel data bar.
+         * Representation of all values to the left of the axis in an Excel data bar. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly negativeFormat: Excel.ConditionalDataBarNegativeFormat;
         /**
          *
-         * Representation of all values to the right of the axis in an Excel data bar.
+         * Representation of all values to the right of the axis in an Excel data bar. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17423,12 +25554,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         upperBoundRule: Excel.ConditionalDataBarRule;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.DataBarConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.DataBarConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: DataBarConditionalFormat): void;
+        set(properties: Excel.DataBarConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.DataBarConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.DataBarConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.DataBarConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.DataBarConditionalFormatLoadOptions): Excel.DataBarConditionalFormat;
         load(option?: string | string[]): Excel.DataBarConditionalFormat;
@@ -17467,12 +25620,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         gradientFill: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalDataBarPositiveFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalDataBarPositiveFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalDataBarPositiveFormat): void;
+        set(properties: Excel.ConditionalDataBarPositiveFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalDataBarPositiveFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalDataBarPositiveFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalDataBarPositiveFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalDataBarPositiveFormatLoadOptions): Excel.ConditionalDataBarPositiveFormat;
         load(option?: string | string[]): Excel.ConditionalDataBarPositiveFormat;
@@ -17518,12 +25693,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         matchPositiveFillColor: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalDataBarNegativeFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalDataBarNegativeFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalDataBarNegativeFormat): void;
+        set(properties: Excel.ConditionalDataBarNegativeFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalDataBarNegativeFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalDataBarNegativeFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalDataBarNegativeFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalDataBarNegativeFormatLoadOptions): Excel.ConditionalDataBarNegativeFormat;
         load(option?: string | string[]): Excel.ConditionalDataBarNegativeFormat;
@@ -17564,24 +25761,46 @@ declare namespace Excel {
     class CustomConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly format: Excel.ConditionalRangeFormat;
         /**
          *
-         * Represents the Rule object on this conditional format.
+         * Represents the Rule object on this conditional format. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly rule: Excel.ConditionalFormatRule;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.CustomConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.CustomConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: CustomConditionalFormat): void;
+        set(properties: Excel.CustomConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CustomConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CustomConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CustomConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CustomConditionalFormatLoadOptions): Excel.CustomConditionalFormat;
         load(option?: string | string[]): Excel.CustomConditionalFormat;
@@ -17619,12 +25838,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         formulaR1C1: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalFormatRule): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalFormatRuleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalFormatRule): void;
+        set(properties: Excel.ConditionalFormatRule): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalFormatRule` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalFormatRule` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalFormatRule` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalFormatRuleLoadOptions): Excel.ConditionalFormatRule;
         load(option?: string | string[]): Excel.ConditionalFormatRule;
@@ -17643,7 +25884,7 @@ declare namespace Excel {
     class IconSetConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
+         * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula, and operator will be ignored when set.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17669,12 +25910,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         style: Excel.IconSet | "Invalid" | "ThreeArrows" | "ThreeArrowsGray" | "ThreeFlags" | "ThreeTrafficLights1" | "ThreeTrafficLights2" | "ThreeSigns" | "ThreeSymbols" | "ThreeSymbols2" | "FourArrows" | "FourArrowsGray" | "FourRedToBlack" | "FourRating" | "FourTrafficLights" | "FiveArrows" | "FiveArrowsGray" | "FiveRating" | "FiveQuarters" | "ThreeStars" | "ThreeTriangles" | "FiveBoxes";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.IconSetConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.IconSetConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: IconSetConditionalFormat): void;
+        set(properties: Excel.IconSetConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.IconSetConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.IconSetConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.IconSetConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.IconSetConditionalFormatLoadOptions): Excel.IconSetConditionalFormat;
         load(option?: string | string[]): Excel.IconSetConditionalFormat;
@@ -17741,12 +26004,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         readonly threeColorScale: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ColorScaleConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ColorScaleConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ColorScaleConditionalFormat): void;
+        set(properties: Excel.ColorScaleConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ColorScaleConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ColorScaleConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ColorScaleConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ColorScaleConditionalFormatLoadOptions): Excel.ColorScaleConditionalFormat;
         load(option?: string | string[]): Excel.ColorScaleConditionalFormat;
@@ -17787,7 +26072,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a Color Scale Criterion which contains a type, value and a color.
+     * Represents a Color Scale Criterion which contains a type, value, and a color.
      *
      * [Api set: ExcelApi 1.6]
      */
@@ -17823,7 +26108,7 @@ declare namespace Excel {
     class TopBottomConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17835,12 +26120,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalTopBottomRule;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.TopBottomConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TopBottomConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TopBottomConditionalFormat): void;
+        set(properties: Excel.TopBottomConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TopBottomConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TopBottomConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TopBottomConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions): Excel.TopBottomConditionalFormat;
         load(option?: string | string[]): Excel.TopBottomConditionalFormat;
@@ -17874,7 +26181,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents the the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror.
+     * Represents the the preset criteria conditional format such as above average, below average, unique values, contains blank, nonblank, error, and noerror.
      *
      * [Api set: ExcelApi 1.6]
      */
@@ -17893,12 +26200,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalPresetCriteriaRule;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.PresetCriteriaConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.PresetCriteriaConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: PresetCriteriaConditionalFormat): void;
+        set(properties: Excel.PresetCriteriaConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.PresetCriteriaConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.PresetCriteriaConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.PresetCriteriaConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions): Excel.PresetCriteriaConditionalFormat;
         load(option?: string | string[]): Excel.PresetCriteriaConditionalFormat;
@@ -17932,7 +26261,7 @@ declare namespace Excel {
     class TextConditionalFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+         * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -17944,12 +26273,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalTextComparisonRule;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.TextConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TextConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TextConditionalFormat): void;
+        set(properties: Excel.TextConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.TextConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.TextConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.TextConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.TextConditionalFormatLoadOptions): Excel.TextConditionalFormat;
         load(option?: string | string[]): Excel.TextConditionalFormat;
@@ -18002,12 +26353,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         rule: Excel.ConditionalCellValueRule;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.CellValueConditionalFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.CellValueConditionalFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: CellValueConditionalFormat): void;
+        set(properties: Excel.CellValueConditionalFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.CellValueConditionalFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.CellValueConditionalFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.CellValueConditionalFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.CellValueConditionalFormatLoadOptions): Excel.CellValueConditionalFormat;
         load(option?: string | string[]): Excel.CellValueConditionalFormat;
@@ -18019,7 +26392,7 @@ declare namespace Excel {
     }
     /**
      *
-     * Represents a Cell Value Conditional Format Rule
+     * Represents a cell value conditional format rule.
      *
      * [Api set: ExcelApi 1.6]
      */
@@ -18055,21 +26428,21 @@ declare namespace Excel {
     class ConditionalRangeFormat extends OfficeExtension.ClientObject {
         /**
          *
-         * Collection of border objects that apply to the overall conditional format range.
+         * Collection of border objects that apply to the overall conditional format range. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly borders: Excel.ConditionalRangeBorderCollection;
         /**
          *
-         * Returns the fill object defined on the overall conditional format range.
+         * Returns the fill object defined on the overall conditional format range. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly fill: Excel.ConditionalRangeFill;
         /**
          *
-         * Returns the font object defined on the overall conditional format range.
+         * Returns the font object defined on the overall conditional format range. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -18081,12 +26454,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         numberFormat: any;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalRangeFormat): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalRangeFormatUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalRangeFormat): void;
+        set(properties: Excel.ConditionalRangeFormat): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalRangeFormat` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalRangeFormat` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalRangeFormat` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalRangeFormatLoadOptions): Excel.ConditionalRangeFormat;
         load(option?: string | string[]): Excel.ConditionalRangeFormat;
@@ -18098,7 +26493,7 @@ declare namespace Excel {
     }
     /**
      *
-     * This object represents the font attributes (font style,, color, etc.) for an object.
+     * This object represents the font attributes (font style, color, etc.) for an object.
      *
      * [Api set: ExcelApi 1.6]
      */
@@ -18138,10 +26533,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         underline: Excel.ConditionalRangeFontUnderlineStyle | "None" | "Single" | "Double";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalRangeFont): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalRangeFontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalRangeFont): void;
+        set(properties: Excel.ConditionalRangeFont): void;
         /**
          *
          * Resets the font formats.
@@ -18151,6 +26556,18 @@ declare namespace Excel {
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalRangeFont` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalRangeFont` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalRangeFont` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalRangeFontLoadOptions): Excel.ConditionalRangeFont;
         load(option?: string | string[]): Excel.ConditionalRangeFont;
@@ -18174,10 +26591,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         color: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalRangeFill): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalRangeFillUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalRangeFill): void;
+        set(properties: Excel.ConditionalRangeFill): void;
         /**
          *
          * Resets the fill.
@@ -18187,6 +26614,18 @@ declare namespace Excel {
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalRangeFill` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalRangeFill` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalRangeFill` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalRangeFillLoadOptions): Excel.ConditionalRangeFill;
         load(option?: string | string[]): Excel.ConditionalRangeFill;
@@ -18224,12 +26663,34 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.6]
          */
         style: Excel.ConditionalRangeBorderLineStyle | "None" | "Continuous" | "Dash" | "DashDot" | "DashDotDot" | "Dot";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.ConditionalRangeBorder): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ConditionalRangeBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ConditionalRangeBorder): void;
+        set(properties: Excel.ConditionalRangeBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalRangeBorder` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalRangeBorder` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalRangeBorder` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalRangeBorderLoadOptions): Excel.ConditionalRangeBorder;
         load(option?: string | string[]): Excel.ConditionalRangeBorder;
@@ -18248,28 +26709,28 @@ declare namespace Excel {
     class ConditionalRangeBorderCollection extends OfficeExtension.ClientObject {
         /**
          *
-         * Gets the top border
+         * Gets the bottom border. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly bottom: Excel.ConditionalRangeBorder;
         /**
          *
-         * Gets the top border
+         * Gets the left border. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly left: Excel.ConditionalRangeBorder;
         /**
          *
-         * Gets the top border
+         * Gets the right border. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
         readonly right: Excel.ConditionalRangeBorder;
         /**
          *
-         * Gets the top border
+         * Gets the top border. Read-only.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -18285,7 +26746,7 @@ declare namespace Excel {
         readonly count: number;
         /**
          *
-         * Gets a border object using its name
+         * Gets a border object using its name.
          *
          * [Api set: ExcelApi 1.6]
          *
@@ -18294,7 +26755,7 @@ declare namespace Excel {
         getItem(index: Excel.ConditionalRangeBorderIndex): Excel.ConditionalRangeBorder;
         /**
          *
-         * Gets a border object using its name
+         * Gets a border object using its name.
          *
          * [Api set: ExcelApi 1.6]
          *
@@ -18303,7 +26764,7 @@ declare namespace Excel {
         getItem(index: "EdgeTop" | "EdgeBottom" | "EdgeLeft" | "EdgeRight"): Excel.ConditionalRangeBorder;
         /**
          *
-         * Gets a border object using its index
+         * Gets a border object using its index.
          *
          * [Api set: ExcelApi 1.6]
          *
@@ -18312,6 +26773,18 @@ declare namespace Excel {
         getItemAt(index: number): Excel.ConditionalRangeBorder;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.ConditionalRangeBorderCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.ConditionalRangeBorderCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.ConditionalRangeBorderCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.ConditionalRangeBorderCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.ConditionalRangeBorderCollection;
         load(option?: string | string[]): Excel.ConditionalRangeBorderCollection;
@@ -18472,10 +26945,20 @@ declare namespace Excel {
          * [Api set: ExcelApi 1.7]
          */
         wrapText: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Excel.Style): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.StyleUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Style): void;
+        set(properties: Excel.Style): void;
         /**
          *
          * Deletes this style.
@@ -18485,6 +26968,18 @@ declare namespace Excel {
         delete(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.Style` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.Style` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.Style` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.StyleLoadOptions): Excel.Style;
         load(option?: string | string[]): Excel.Style;
@@ -18523,6 +27018,18 @@ declare namespace Excel {
         getItem(name: string): Excel.Style;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Excel.StyleCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Excel.StyleCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Excel.StyleCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.StyleCollectionLoadOptions & Excel.Interfaces.CollectionLoadOptions): Excel.StyleCollection;
         load(option?: string | string[]): Excel.StyleCollection;
@@ -18916,8 +27423,10 @@ declare namespace Excel {
         area = "Area",
         doughnut = "Doughnut",
         radar = "Radar",
+        histogram = "Histogram",
+        pareto = "Pareto",
+        regionMap = "RegionMap",
     }
-
     /**
      * [Api set: ExcelApi 1.1]
      */
@@ -19035,7 +27544,7 @@ declare namespace Excel {
         hyperlinks = "Hyperlinks",
         /**
          *
-         * Removes hyperlinks and formatting for the cell but leaves content, conditional formats and data validation intact.
+         * Removes hyperlinks and formatting for the cell but leaves content, conditional formats, and data validation intact.
          *
          */
         removeHyperlinks = "RemoveHyperlinks",
@@ -19470,6 +27979,7 @@ declare namespace Excel {
         justify = "Justify",
         distributed = "Distributed",
     }
+
     /**
      * [Api set: ExcelApi 1.7]
      */
@@ -19556,88 +28066,118 @@ declare namespace Excel {
     enum EventType {
         /**
          *
-         * WorksheetChanged represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when data changes.
+         * WorksheetChanged represents the type of event registered on Worksheet or WorksheetCollection, and occurs when data changes.
          *
          */
         worksheetChanged = "WorksheetChanged",
         /**
          *
-         * WorksheetSelectionChanged represents the type of event that is registered on Worksheet, and occurs when selection changes.
+         * WorksheetSelectionChanged represents the type of event registered on Worksheet, and occurs when selection changes.
          *
          */
         worksheetSelectionChanged = "WorksheetSelectionChanged",
         /**
          *
-         * WorksheetAdded represents the type of event that is registered on WorksheetCollection, and occurs when a new worksheet is added to the workbook.
+         * WorksheetAdded represents the type of event registered on WorksheetCollection, and occurs when a new worksheet is added to the workbook.
          *
          */
         worksheetAdded = "WorksheetAdded",
         /**
          *
-         * WorksheetActivated represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when worksheet activates.
+         * WorksheetActivated represents the type of event registered on Worksheet or WorksheetCollection, and occurs when worksheet activates.
          *
          */
         worksheetActivated = "WorksheetActivated",
         /**
          *
-         * WorksheetDeactivated represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when worksheet deactivates.
+         * WorksheetDeactivated represents the type of event registered on Worksheet or WorksheetCollection, and occurs when worksheet deactivates.
          *
          */
         worksheetDeactivated = "WorksheetDeactivated",
         /**
          *
-         * TableChanged represents the type of event that is registered on Table, and occurs when data changes.
+         * TableChanged represents the type of event registered on Table, and occurs when data changes.
          *
          */
         tableChanged = "TableChanged",
         /**
          *
-         * TableSelectionChanged represents the type of event that is registered on Table, and occurs when selection changes.
+         * TableSelectionChanged represents the type of event registered on Table, and occurs when selection changes.
          *
          */
         tableSelectionChanged = "TableSelectionChanged",
         /**
          *
-         * WorksheetDeleted represents the type of event that is registered on WorksheetCollection, and occurs when a worksheet is deleted from the workbook.
+         * WorksheetDeleted represents the type of event registered on WorksheetCollection, and occurs when a worksheet is deleted from the workbook.
          *
          */
         worksheetDeleted = "WorksheetDeleted",
         /**
          *
-         * ChartAdded represents the type of event that is registered on ChartCollection, and occurs when a new chart is added to the worksheet.
+         * ChartAdded represents the type of event registered on ChartCollection, and occurs when a new chart is added to the worksheet.
          *
          */
         chartAdded = "ChartAdded",
         /**
          *
-         * ChartActivated represents the type of event that is registered on Chart or ChartCollection, and occurs when chart activates.
+         * ChartActivated represents the type of event registered on Chart or ChartCollection, and occurs when chart activates.
          *
          */
         chartActivated = "ChartActivated",
         /**
          *
-         * ChartDeactivated represents the type of event that is registered on Chart or ChartCollection, and occurs when chart deactivates.
+         * ChartDeactivated represents the type of event registered on Chart or ChartCollection, and occurs when chart deactivates.
          *
          */
         chartDeactivated = "ChartDeactivated",
         /**
          *
-         * ChartDeleted represents the type of event that is registered on ChartCollection, and occurs when a chart is deleted from the worksheet.
+         * ChartDeleted represents the type of event registered on ChartCollection, and occurs when a chart is deleted from the worksheet.
          *
          */
         chartDeleted = "ChartDeleted",
         /**
          *
-         * WorksheetCalculated represents the type of event that is registered on Worksheet or WorksheetCollection, and occurs when a worksheet is calculated.
+         * WorksheetCalculated represents the type of event registered on Worksheet or WorksheetCollection, and occurs when a worksheet is calculated.
          *
          */
         worksheetCalculated = "WorksheetCalculated",
         /**
          *
-         * ChartActivated represents the type of event that is registered on Chart or ChartCollection, and occurs when chart activates.
+         * VisualSelectionChanged represents the type of event registered on VisualCollection, and occurs when visual selection changes.
          *
          */
         visualSelectionChanged = "VisualSelectionChanged",
+        /**
+         *
+         * AgaveVisualUpdate represents the type of an event that is associated with an agave visual, and carries a new data view following a data change
+         *
+         */
+        agaveVisualUpdate = "AgaveVisualUpdate",
+        /**
+         *
+         * TableAdded represents the type of event registered on TableCollection, and occurs when a table is added.
+         *
+         */
+        tableAdded = "TableAdded",
+        /**
+         *
+         * TableDeleted represents the type of event that is registered on TableCollection, and occurs when a table is deleted.
+         *
+         */
+        tableDeleted = "TableDeleted",
+        /**
+         *
+         * ShapeActivated represents the type of event that is registered on Shape, and occurs when shape activates.
+         *
+         */
+        shapeActivated = "ShapeActivated",
+        /**
+         *
+         * ShapeDeactivated represents the type of event that is registered on Shape, and occurs when shape deactivates.
+         *
+         */
+        shapeDeactivated = "ShapeDeactivated",
     }
     /**
      * [Api set: ExcelApi 1.7]
@@ -19690,52 +28230,6 @@ declare namespace Excel {
         portrait = "Portrait",
         landscape = "Landscape",
     }
-    /**
-     * [Api set: ExcelApi 1.7]
-     */
-    enum PaperType {
-        letter = "Letter",
-        letterSmall = "LetterSmall",
-        tabloid = "Tabloid",
-        ledger = "Ledger",
-        legal = "Legal",
-        statement = "Statement",
-        executive = "Executive",
-        a3 = "A3",
-        a4 = "A4",
-        a4Small = "A4Small",
-        a5 = "A5",
-        b4 = "B4",
-        b5 = "B5",
-        folio = "Folio",
-        quatro = "Quatro",
-        paper10x14 = "Paper10x14",
-        paper11x17 = "Paper11x17",
-        note = "Note",
-        envelope9 = "Envelope9",
-        envelope10 = "Envelope10",
-        envelope11 = "Envelope11",
-        envelope12 = "Envelope12",
-        envelope14 = "Envelope14",
-        csheet = "Csheet",
-        dsheet = "Dsheet",
-        esheet = "Esheet",
-        envelopeDL = "EnvelopeDL",
-        envelopeC5 = "EnvelopeC5",
-        envelopeC3 = "EnvelopeC3",
-        envelopeC4 = "EnvelopeC4",
-        envelopeC6 = "EnvelopeC6",
-        envelopeC65 = "EnvelopeC65",
-        envelopeB4 = "EnvelopeB4",
-        envelopeB5 = "EnvelopeB5",
-        envelopeB6 = "EnvelopeB6",
-        envelopeItaly = "EnvelopeItaly",
-        envelopeMonarch = "EnvelopeMonarch",
-        envelopePersonal = "EnvelopePersonal",
-        fanfoldUS = "FanfoldUS",
-        fanfoldStdGerman = "FanfoldStdGerman",
-        fanfoldLegalGerman = "FanfoldLegalGerman",
-    }
     /**
      * [Api set: ExcelApi 1.7]
      */
@@ -19818,15 +28312,6 @@ declare namespace Excel {
         accent6_60 = "Accent6_60",
         explanatoryText = "ExplanatoryText",
     }
-    /**
-     * [Api set: ExcelApi 1.7]
-     */
-    enum PrintErrorType {
-        errorsDisplayed = "ErrorsDisplayed",
-        errorsBlank = "ErrorsBlank",
-        errorsDash = "ErrorsDash",
-        errorsNotAvailable = "ErrorsNotAvailable",
-    }
     /**
      * [Api set: ExcelApi 1.7]
      */
@@ -19860,6 +28345,18 @@ declare namespace Excel {
         readonly value: T;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): FunctionResult<T>` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): FunctionResult<T>` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): FunctionResult<T>` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Excel.Interfaces.FunctionResultLoadOptions): FunctionResult<T>;
         load(option?: string | string[]): FunctionResult<T>;
@@ -23633,16 +32130,25 @@ declare namespace Excel {
         unsupportedOperation = "UnsupportedOperation",
         invalidOperationInCellEditMode = "InvalidOperationInCellEditMode",
     }
-    namespace Interfaces {
+    module Interfaces {
+        /**
+        * Provides ways to load properties of only a subset of members of a collection.
+        */
         interface CollectionLoadOptions {
+            /**
+            * Specify the number of items in the queried collection to be included in the result.
+            */
             $top?: number;
+            /**
+            * Specify the number of items in the collection that are to be skipped and not included in the result. If top is specified, the selection of result will start after skipping the specified number of items.
+            */
             $skip?: number;
         }
         /** An interface for updating data on the Application object, for use in "application.set({ ... })". */
         interface ApplicationUpdateData {
             /**
              *
-             * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+             * Returns the calculation mode used in the workbook, as defined by the constants in Excel.CalculationMode. Possible values are: `Automatic`, where Excel controls recalculation; `AutomaticExceptTables`, where Excel controls recalculation but ignores changes in tables; `Manual`, where calculation is done when the user requests it.
              *
              * [Api set: ExcelApi 1.1 for get, 1.8 for set]
              */
@@ -23784,7 +32290,7 @@ declare namespace Excel {
             style?: string;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
             When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
@@ -23823,7 +32329,7 @@ declare namespace Excel {
             numberFormat?: any[][];
             /**
              *
-             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -23964,7 +32470,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -23978,7 +32484,7 @@ declare namespace Excel {
         interface TableRowUpdateData {
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -24049,7 +32555,7 @@ declare namespace Excel {
             useStandardHeight?: boolean;
             /**
              *
-             * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+             * Indicates whether the column width of the Range object equals the standard width of the sheet.
             Returns True if the column width of the Range object equals the standard width of the sheet.
             Returns Null if the range contains more than one column and the columns aren't all the same height.
             Returns False otherwise.
@@ -24208,7 +32714,7 @@ declare namespace Excel {
             legend?: Excel.Interfaces.ChartLegendUpdateData;
             /**
             *
-            * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            * Represents the title of the specified chart, including the text, visibility, position, and formating of the title.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -24219,7 +32725,7 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.7]
              */
-            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel";
             /**
              *
              * Represents the height, in points, of the chart object.
@@ -24267,7 +32773,7 @@ declare namespace Excel {
         interface ChartAreaFormatUpdateData {
             /**
             *
-            * Represents the border format of chart area, which includes color, linestyle and weight.
+            * Represents the border format of chart area, which includes color, linestyle, and weight.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -24299,7 +32805,7 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.7]
              */
-            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel";
             /**
              *
              * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
@@ -24381,7 +32887,7 @@ declare namespace Excel {
             showShadow?: boolean;
             /**
              *
-             * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             * Boolean value representing if the series is smooth or not. Only applicable to line and scatter charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -24419,7 +32925,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartPointFormatUpdateData;
             /**
              *
-             * Represents whether a data point has datalabel. Not applicable for surface charts.
+             * Represents whether a data point has a data label. Not applicable for surface charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -24457,7 +32963,7 @@ declare namespace Excel {
         interface ChartPointFormatUpdateData {
             /**
             *
-            * Represents the border format of a chart data point, which includes color, style and weight information.
+            * Represents the border format of a chart data point, which includes color, style, and weight information.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -24498,7 +33004,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartAxisFormatUpdateData;
             /**
             *
-            * Returns a gridlines object that represents the major gridlines for the specified axis.
+            * Returns a Gridlines object that represents the major gridlines for the specified axis.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -24603,7 +33109,7 @@ declare namespace Excel {
             minorTimeUnitScale?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
             /**
              *
-             * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+             * Represents the interval between two minor tick marks. Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -24979,7 +33485,7 @@ declare namespace Excel {
             horizontalAlignment?: Excel.ChartTextHorizontalAlignment | "Center" | "Left" | "Right" | "Justify" | "Distributed";
             /**
              *
-             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title is not visible.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -25021,7 +33527,7 @@ declare namespace Excel {
             textOrientation?: number;
             /**
              *
-             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title is not visible.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -25055,7 +33561,7 @@ declare namespace Excel {
         interface ChartTitleFormatUpdateData {
             /**
             *
-            * Represents the border format of chart title, which includes color, linestyle and weight.
+            * Represents the border format of chart title, which includes color, linestyle, and weight.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -25402,14 +33908,14 @@ declare namespace Excel {
             iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatUpdateData;
             /**
             *
-            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
             preset?: Excel.Interfaces.PresetCriteriaConditionalFormatUpdateData;
             /**
             *
-            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -25452,7 +33958,7 @@ declare namespace Excel {
             changes other conditional formats' priorities, to allow for a contiguous priority order.
             Use a negative priority to begin from the back.
             Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
-            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -25628,7 +34134,7 @@ declare namespace Excel {
         interface IconSetConditionalFormatUpdateData {
             /**
              *
-             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
+             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula, and operator will be ignored when set.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -25833,28 +34339,28 @@ declare namespace Excel {
         interface ConditionalRangeBorderCollectionUpdateData {
             /**
             *
-            * Gets the top border
+            * Gets the bottom border.
             *
             * [Api set: ExcelApi 1.6]
             */
             bottom?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
             /**
             *
-            * Gets the top border
+            * Gets the left border.
             *
             * [Api set: ExcelApi 1.6]
             */
             left?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
             /**
             *
-            * Gets the top border
+            * Gets the right border.
             *
             * [Api set: ExcelApi 1.6]
             */
             right?: Excel.Interfaces.ConditionalRangeBorderUpdateData;
             /**
             *
-            * Gets the top border
+            * Gets the top border.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -25998,7 +34504,7 @@ declare namespace Excel {
         interface ApplicationData {
             /**
              *
-             * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+             * Returns the calculation mode used in the workbook, as defined by the constants in Excel.CalculationMode. Possible values are: `Automatic`, where Excel controls recalculation; `AutomaticExceptTables`, where Excel controls recalculation but ignores changes in tables; `Manual`, where calculation is done when the user requests it.
              *
              * [Api set: ExcelApi 1.1 for get, 1.8 for set]
              */
@@ -26008,115 +34514,132 @@ declare namespace Excel {
         interface WorkbookData {
             /**
             *
-            * Represents the Excel application instance that contains this workbook.
+            * Represents the Excel application instance that contains this workbook. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             application?: Excel.Interfaces.ApplicationData;
             /**
             *
-            * Represents a collection of bindings that are part of the workbook.
+            * Represents a collection of bindings that are part of the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             bindings?: Excel.Interfaces.BindingData[];
             /**
             *
-            * Represents the collection of custom XML parts contained by this workbook.
+            * Represents the collection of custom XML parts contained by this workbook. Read-only.
             *
             * [Api set: ExcelApi 1.5]
             */
             customXmlParts?: Excel.Interfaces.CustomXmlPartData[];
             /**
             *
-            * Represents a collection of workbook scoped named items (named ranges and constants).
+            * Represents a collection of workbook scoped named items (named ranges and constants). Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             names?: Excel.Interfaces.NamedItemData[];
             /**
             *
-            * Represents a collection of PivotTables associated with the workbook.
+            * Represents a collection of PivotTables associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.3]
             */
             pivotTables?: Excel.Interfaces.PivotTableData[];
             /**
             *
-            * Gets the workbook properties.
+            * Gets the workbook properties. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
             properties?: Excel.Interfaces.DocumentPropertiesData;
             /**
             *
-            * Represents a collection of Settings associated with the workbook.
+            * Returns workbook protection object for a workbook. Read-only.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            protection?: Excel.Interfaces.WorkbookProtectionData;
+            /**
+            *
+            * Represents a collection of Settings associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.4]
             */
             settings?: Excel.Interfaces.SettingData[];
             /**
             *
-            * Represents a collection of styles associated with the workbook.
+            * Represents a collection of styles associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
             styles?: Excel.Interfaces.StyleData[];
             /**
             *
-            * Represents a collection of tables associated with the workbook.
+            * Represents a collection of tables associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             tables?: Excel.Interfaces.TableData[];
             /**
             *
-            * Represents a collection of worksheets associated with the workbook.
+            * Represents a collection of worksheets associated with the workbook. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             worksheets?: Excel.Interfaces.WorksheetData[];
             /**
              *
-             * Gets the workbook name.
+             * Gets the workbook name. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
             name?: string;
         }
+        /** An interface describing the data returned by calling "workbookProtection.toJSON()". */
+        interface WorkbookProtectionData {
+            /**
+             *
+             * Indicates if the workbook is protected. Read-Only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            protected?: boolean;
+        }
         /** An interface describing the data returned by calling "worksheet.toJSON()". */
         interface WorksheetData {
             /**
             *
-            * Returns collection of charts that are part of the worksheet.
+            * Returns collection of charts that are part of the worksheet. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             charts?: Excel.Interfaces.ChartData[];
             /**
             *
-            * Collection of names scoped to the current worksheet.
+            * Collection of names scoped to the current worksheet. Read-only.
             *
             * [Api set: ExcelApi 1.4]
             */
             names?: Excel.Interfaces.NamedItemData[];
             /**
             *
-            * Collection of PivotTables that are part of the worksheet.
+            * Collection of PivotTables that are part of the worksheet. Read-only.
             *
             * [Api set: ExcelApi 1.3]
             */
             pivotTables?: Excel.Interfaces.PivotTableData[];
             /**
             *
-            * Returns sheet protection object for a worksheet.
+            * Returns sheet protection object for a worksheet. Read-only.
             *
             * [Api set: ExcelApi 1.2]
             */
             protection?: Excel.Interfaces.WorksheetProtectionData;
             /**
             *
-            * Collection of tables that are part of the worksheet.
+            * Collection of tables that are part of the worksheet. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -26182,14 +34705,14 @@ declare namespace Excel {
         interface WorksheetProtectionData {
             /**
              *
-             * Sheet protection options.
+             * Sheet protection options. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
             options?: Excel.WorksheetProtectionOptions;
             /**
              *
-             * Indicates if the worksheet is protected. Read-Only.
+             * Indicates if the worksheet is protected. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -26199,7 +34722,7 @@ declare namespace Excel {
         interface RangeData {
             /**
             *
-            * Collection of ConditionalFormats that intersect the range.
+            * Collection of ConditionalFormats that intersect the range. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -26213,14 +34736,14 @@ declare namespace Excel {
             format?: Excel.Interfaces.RangeFormatData;
             /**
             *
-            * The worksheet containing the current range.
+            * The worksheet containing the current range. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             worksheet?: Excel.Interfaces.WorksheetData;
             /**
              *
-             * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
+             * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. "Sheet1!A1:B4"). Read-only.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -26286,7 +34809,7 @@ declare namespace Excel {
             formulasR1C1?: any[][];
             /**
              *
-             * Represents if all cells of the current range are hidden.
+             * Represents if all cells of the current range are hidden. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -26300,14 +34823,14 @@ declare namespace Excel {
             hyperlink?: Excel.RangeHyperlink;
             /**
              *
-             * Represents if the current range is an entire column.
+             * Represents if the current range is an entire column. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
             isEntireColumn?: boolean;
             /**
              *
-             * Represents if the current range is an entire row.
+             * Represents if the current range is an entire row. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -26374,7 +34897,7 @@ declare namespace Excel {
             valueTypes?: Excel.RangeValueType[][];
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
             When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
@@ -26385,14 +34908,14 @@ declare namespace Excel {
         interface RangeViewData {
             /**
             *
-            * Represents a collection of range views associated with the range.
+            * Represents a collection of range views associated with the range. Read-only.
             *
             * [Api set: ExcelApi 1.3]
             */
             rows?: Excel.Interfaces.RangeViewData[];
             /**
              *
-             * Represents the cell addresses of the RangeView.
+             * Represents the cell addresses of the RangeView. Read-only.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -26462,7 +34985,7 @@ declare namespace Excel {
             valueTypes?: Excel.RangeValueType[][];
             /**
              *
-             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -26501,14 +35024,14 @@ declare namespace Excel {
         interface NamedItemData {
             /**
             *
-            * Returns an object containing values and types of the named item.
+            * Returns an object containing values and types of the named item. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
             arrayValues?: Excel.Interfaces.NamedItemArrayValuesData;
             /**
             *
-            * Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+            * Returns the worksheet on which the named item is scoped to. Throws an error if the item is scoped to the workbook instead.
             *
             * [Api set: ExcelApi 1.4]
             */
@@ -26543,7 +35066,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+             * Indicates whether the name is scoped to the workbook or to a specific worksheet. Possible values are: Worksheet, Workbook. Read-only.
              *
              * [Api set: ExcelApi 1.4]
              */
@@ -26616,28 +35139,28 @@ declare namespace Excel {
         interface TableData {
             /**
             *
-            * Represents a collection of all the columns in the table.
+            * Represents a collection of all the columns in the table. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             columns?: Excel.Interfaces.TableColumnData[];
             /**
             *
-            * Represents a collection of all the rows in the table.
+            * Represents a collection of all the rows in the table. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             rows?: Excel.Interfaces.TableRowData[];
             /**
             *
-            * Represents the sorting for the table.
+            * Represents the sorting for the table. Read-only.
             *
             * [Api set: ExcelApi 1.2]
             */
             sort?: Excel.Interfaces.TableSortData;
             /**
             *
-            * The worksheet containing the current table.
+            * The worksheet containing the current table. Read-only.
             *
             * [Api set: ExcelApi 1.2]
             */
@@ -26721,7 +35244,7 @@ declare namespace Excel {
         interface TableColumnData {
             /**
             *
-            * Retrieve the filter applied to the column.
+            * Retrieve the filter applied to the column. Read-only.
             *
             * [Api set: ExcelApi 1.2]
             */
@@ -26749,7 +35272,7 @@ declare namespace Excel {
             name?: string;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -26770,7 +35293,7 @@ declare namespace Excel {
             index?: number;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -26780,28 +35303,28 @@ declare namespace Excel {
         interface RangeFormatData {
             /**
             *
-            * Collection of border objects that apply to the overall range.
+            * Collection of border objects that apply to the overall range. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             borders?: Excel.Interfaces.RangeBorderData[];
             /**
             *
-            * Returns the fill object defined on the overall range.
+            * Returns the fill object defined on the overall range. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             fill?: Excel.Interfaces.RangeFillData;
             /**
             *
-            * Returns the font object defined on the overall range.
+            * Returns the font object defined on the overall range. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             font?: Excel.Interfaces.RangeFontData;
             /**
             *
-            * Returns the format protection object for a range.
+            * Returns the format protection object for a range. Read-only.
             *
             * [Api set: ExcelApi 1.2]
             */
@@ -26848,7 +35371,7 @@ declare namespace Excel {
             useStandardHeight?: boolean;
             /**
              *
-             * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
+             * Indicates whether the column width of the Range object equals the standard width of the sheet.
             Returns True if the column width of the Range object equals the standard width of the sheet.
             Returns Null if the range contains more than one column and the columns aren't all the same height.
             Returns False otherwise.
@@ -26986,14 +35509,14 @@ declare namespace Excel {
         interface ChartData {
             /**
             *
-            * Represents chart axes.
+            * Represents chart axes. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             axes?: Excel.Interfaces.ChartAxesData;
             /**
             *
-            * Represents the datalabels on the chart.
+            * Represents the datalabels on the chart. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27007,28 +35530,28 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartAreaFormatData;
             /**
             *
-            * Represents the legend for the chart.
+            * Represents the legend for the chart. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             legend?: Excel.Interfaces.ChartLegendData;
             /**
             *
-            * Represents either a single series or collection of series in the chart.
+            * Represents either a single series or collection of series in the chart. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             series?: Excel.Interfaces.ChartSeriesData[];
             /**
             *
-            * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            * Represents the title of the specified chart, including the text, visibility, position, and formating of the title. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             title?: Excel.Interfaces.ChartTitleData;
             /**
             *
-            * The worksheet containing the current chart.
+            * The worksheet containing the current chart. Read-only.
             *
             * [Api set: ExcelApi 1.2]
             */
@@ -27039,7 +35562,7 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.7]
              */
-            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel";
             /**
              *
              * Represents the height, in points, of the chart object.
@@ -27094,14 +35617,14 @@ declare namespace Excel {
         interface ChartAreaFormatData {
             /**
             *
-            * Represents the border format of chart area, which includes color, linestyle and weight.
+            * Represents the border format of chart area, which includes color, linestyle, and weight. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
             border?: Excel.Interfaces.ChartBorderData;
             /**
             *
-            * Represents the font attributes (font name, font size, color, etc.) for the current object.
+            * Represents the font attributes (font name, font size, color, etc.) for the current object. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27115,21 +35638,21 @@ declare namespace Excel {
         interface ChartSeriesData {
             /**
             *
-            * Represents the formatting of a chart series, which includes fill and line formatting.
+            * Represents the formatting of a chart series, which includes fill and line formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartSeriesFormatData;
             /**
             *
-            * Represents a collection of all points in the series.
+            * Represents a collection of all points in the series. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             points?: Excel.Interfaces.ChartPointData[];
             /**
             *
-            * Represents a collection of trendlines in the series.
+            * Represents a collection of trendlines in the series. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -27140,7 +35663,7 @@ declare namespace Excel {
              *
              * [Api set: ExcelApi 1.7]
              */
-            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar";
+            chartType?: Excel.ChartType | "Invalid" | "ColumnClustered" | "ColumnStacked" | "ColumnStacked100" | "3DColumnClustered" | "3DColumnStacked" | "3DColumnStacked100" | "BarClustered" | "BarStacked" | "BarStacked100" | "3DBarClustered" | "3DBarStacked" | "3DBarStacked100" | "LineStacked" | "LineStacked100" | "LineMarkers" | "LineMarkersStacked" | "LineMarkersStacked100" | "PieOfPie" | "PieExploded" | "3DPieExploded" | "BarOfPie" | "XYScatterSmooth" | "XYScatterSmoothNoMarkers" | "XYScatterLines" | "XYScatterLinesNoMarkers" | "AreaStacked" | "AreaStacked100" | "3DAreaStacked" | "3DAreaStacked100" | "DoughnutExploded" | "RadarMarkers" | "RadarFilled" | "Surface" | "SurfaceWireframe" | "SurfaceTopView" | "SurfaceTopViewWireframe" | "Bubble" | "Bubble3DEffect" | "StockHLC" | "StockOHLC" | "StockVHLC" | "StockVOHLC" | "CylinderColClustered" | "CylinderColStacked" | "CylinderColStacked100" | "CylinderBarClustered" | "CylinderBarStacked" | "CylinderBarStacked100" | "CylinderCol" | "ConeColClustered" | "ConeColStacked" | "ConeColStacked100" | "ConeBarClustered" | "ConeBarStacked" | "ConeBarStacked100" | "ConeCol" | "PyramidColClustered" | "PyramidColStacked" | "PyramidColStacked100" | "PyramidBarClustered" | "PyramidBarStacked" | "PyramidBarStacked100" | "PyramidCol" | "3DColumn" | "Line" | "3DLine" | "3DPie" | "Pie" | "XYScatter" | "3DArea" | "Area" | "Doughnut" | "Radar" | "Histogram" | "Pareto" | "RegionMap" | "Treemap" | "Waterfall" | "Sunburst" | "Funnel";
             /**
              *
              * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
@@ -27222,7 +35745,7 @@ declare namespace Excel {
             showShadow?: boolean;
             /**
              *
-             * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             * Boolean value representing if the series is smooth or not. Only applicable to line and scatter charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27232,7 +35755,7 @@ declare namespace Excel {
         interface ChartSeriesFormatData {
             /**
             *
-            * Represents line formatting.
+            * Represents line formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27246,7 +35769,7 @@ declare namespace Excel {
         interface ChartPointData {
             /**
             *
-            * Returns the data label of a chart point.
+            * Returns the data label of a chart point. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -27260,7 +35783,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartPointFormatData;
             /**
              *
-             * Represents whether a data point has datalabel. Not applicable for surface charts.
+             * Represents whether a data point has a data label. Not applicable for surface charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27305,7 +35828,7 @@ declare namespace Excel {
         interface ChartPointFormatData {
             /**
             *
-            * Represents the border format of a chart data point, which includes color, style and weight information.
+            * Represents the border format of a chart data point, which includes color, style, and weight information. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -27315,21 +35838,21 @@ declare namespace Excel {
         interface ChartAxesData {
             /**
             *
-            * Represents the category axis in a chart.
+            * Represents the category axis in a chart. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             categoryAxis?: Excel.Interfaces.ChartAxisData;
             /**
             *
-            * Represents the series axis of a 3-dimensional chart.
+            * Represents the series axis of a 3-dimensional chart. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             seriesAxis?: Excel.Interfaces.ChartAxisData;
             /**
             *
-            * Represents the value axis in an axis.
+            * Represents the value axis in an axis. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27339,35 +35862,35 @@ declare namespace Excel {
         interface ChartAxisData {
             /**
             *
-            * Represents the formatting of a chart object, which includes line and font formatting.
+            * Represents the formatting of a chart object, which includes line and font formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartAxisFormatData;
             /**
             *
-            * Returns a gridlines object that represents the major gridlines for the specified axis.
+            * Returns a Gridlines object that represents the major gridlines for the specified axis. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             majorGridlines?: Excel.Interfaces.ChartGridlinesData;
             /**
             *
-            * Returns a Gridlines object that represents the minor gridlines for the specified axis.
+            * Returns a Gridlines object that represents the minor gridlines for the specified axis. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             minorGridlines?: Excel.Interfaces.ChartGridlinesData;
             /**
             *
-            * Represents the axis title.
+            * Represents the axis title. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             title?: Excel.Interfaces.ChartAxisTitleData;
             /**
              *
-             * Represents the group for the specified axis. See Excel.ChartAxisGroup for details.
+             * Represents the group for the specified axis. See Excel.ChartAxisGroup for details. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27402,7 +35925,7 @@ declare namespace Excel {
             crossesAt?: number;
             /**
              *
-             * Represents the custom axis display unit value. Read Only. To set this property, please use the SetCustomDisplayUnit(double) method.
+             * Represents the custom axis display unit value. Read-only. To set this property, please use the SetCustomDisplayUnit(double) method.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27416,14 +35939,14 @@ declare namespace Excel {
             displayUnit?: Excel.ChartAxisDisplayUnit | "None" | "Hundreds" | "Thousands" | "TenThousands" | "HundredThousands" | "Millions" | "TenMillions" | "HundredMillions" | "Billions" | "Trillions" | "Custom";
             /**
              *
-             * Represents the height, in points, of the chart axis. Null if the axis's not visible.
+             * Represents the height, in points, of the chart axis. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
             height?: number;
             /**
              *
-             * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis's not visible.
+             * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27486,7 +36009,7 @@ declare namespace Excel {
             minorTimeUnitScale?: Excel.ChartAxisTimeUnit | "Days" | "Months" | "Years";
             /**
              *
-             * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+             * Represents the interval between two minor tick marks. Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -27535,7 +36058,7 @@ declare namespace Excel {
             tickMarkSpacing?: number;
             /**
              *
-             * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis's not visible.
+             * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27556,7 +36079,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Represents the width, in points, of the chart axis. Null if the axis's not visible.
+             * Represents the width, in points, of the chart axis. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27566,14 +36089,14 @@ declare namespace Excel {
         interface ChartAxisFormatData {
             /**
             *
-            * Represents the font attributes (font name, font size, color, etc.) for a chart axis element.
+            * Represents the font attributes (font name, font size, color, etc.) for a chart axis element. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             font?: Excel.Interfaces.ChartFontData;
             /**
             *
-            * Represents chart line formatting.
+            * Represents chart line formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27583,7 +36106,7 @@ declare namespace Excel {
         interface ChartAxisTitleData {
             /**
             *
-            * Represents the formatting of chart axis title.
+            * Represents the formatting of chart axis title. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27607,7 +36130,7 @@ declare namespace Excel {
         interface ChartAxisTitleFormatData {
             /**
             *
-            * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object.
+            * Represents the font attributes, such as font name, font size, color, etc. of chart axis title object. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27617,7 +36140,7 @@ declare namespace Excel {
         interface ChartDataLabelsData {
             /**
             *
-            * Represents the format of chart data labels, which includes fill and font formatting.
+            * Represents the format of chart data labels, which includes fill and font formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27742,7 +36265,7 @@ declare namespace Excel {
         interface ChartDataLabelFormatData {
             /**
             *
-            * Represents the font attributes (font name, font size, color, etc.) for a chart data label.
+            * Represents the font attributes (font name, font size, color, etc.) for a chart data label. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27752,7 +36275,7 @@ declare namespace Excel {
         interface ChartGridlinesData {
             /**
             *
-            * Represents the formatting of chart gridlines.
+            * Represents the formatting of chart gridlines. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27769,7 +36292,7 @@ declare namespace Excel {
         interface ChartGridlinesFormatData {
             /**
             *
-            * Represents chart line formatting.
+            * Represents chart line formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27779,14 +36302,14 @@ declare namespace Excel {
         interface ChartLegendData {
             /**
             *
-            * Represents the formatting of a chart legend, which includes fill and font formatting.
+            * Represents the formatting of a chart legend, which includes fill and font formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartLegendFormatData;
             /**
             *
-            * Represents a collection of legendEntries in the legend.
+            * Represents a collection of legendEntries in the legend. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -27866,7 +36389,7 @@ declare namespace Excel {
         interface ChartLegendFormatData {
             /**
             *
-            * Represents the font attributes such as font name, font size, color, etc. of a chart legend.
+            * Represents the font attributes such as font name, font size, color, etc. of a chart legend. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -27876,14 +36399,14 @@ declare namespace Excel {
         interface ChartTitleData {
             /**
             *
-            * Represents the formatting of a chart title, which includes fill and font formatting.
+            * Represents the formatting of a chart title, which includes fill and font formatting. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
             format?: Excel.Interfaces.ChartTitleFormatData;
             /**
              *
-             * Returns the height, in points, of the chart title. Read-only. Null if chart title is not visible.
+             * Returns the height, in points, of the chart title. Null if chart title is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27897,7 +36420,7 @@ declare namespace Excel {
             horizontalAlignment?: Excel.ChartTextHorizontalAlignment | "Center" | "Left" | "Right" | "Justify" | "Distributed";
             /**
              *
-             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title is not visible.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27939,7 +36462,7 @@ declare namespace Excel {
             textOrientation?: number;
             /**
              *
-             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title is not visible.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27960,7 +36483,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Returns the width, in points, of the chart title. Read-only. Null if chart title is not visible.
+             * Returns the width, in points, of the chart title. Null if chart title is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -27980,14 +36503,14 @@ declare namespace Excel {
         interface ChartTitleFormatData {
             /**
             *
-            * Represents the border format of chart title, which includes color, linestyle and weight.
+            * Represents the border format of chart title, which includes color, linestyle, and weight. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
             border?: Excel.Interfaces.ChartBorderData;
             /**
             *
-            * Represents the font attributes (font name, font size, color, etc.) for an object.
+            * Represents the font attributes (font name, font size, color, etc.) for an object. Read-only.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -28139,7 +36662,7 @@ declare namespace Excel {
         interface ChartTrendlineFormatData {
             /**
             *
-            * Represents chart line formatting.
+            * Represents chart line formatting. Read-only.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -28149,21 +36672,21 @@ declare namespace Excel {
         interface TableSortData {
             /**
              *
-             * Represents the current conditions used to last sort the table.
+             * Represents the current conditions used to last sort the table. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
             fields?: Excel.SortField[];
             /**
              *
-             * Represents whether the casing impacted the last sort of the table.
+             * Represents whether the casing impacted the last sort of the table. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
             matchCase?: boolean;
             /**
              *
-             * Represents Chinese character ordering method last used to sort the table.
+             * Represents Chinese character ordering method last used to sort the table. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -28173,7 +36696,7 @@ declare namespace Excel {
         interface FilterData {
             /**
              *
-             * The currently applied filter on the given column.
+             * The currently applied filter on the given column. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -28219,7 +36742,7 @@ declare namespace Excel {
             worksheet?: Excel.Interfaces.WorksheetData;
             /**
              *
-             * Id of the PivotTable.
+             * Id of the PivotTable. Read-only.
              *
              * [Api set: ExcelApi 1.5]
              */
@@ -28356,7 +36879,7 @@ declare namespace Excel {
             /**
             *
             * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-            For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28364,77 +36887,77 @@ declare namespace Excel {
             /**
             *
             * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-            For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             cellValueOrNullObject?: Excel.Interfaces.CellValueConditionalFormatData;
             /**
             *
-            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             colorScale?: Excel.Interfaces.ColorScaleConditionalFormatData;
             /**
             *
-            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type.
+            * Returns the ColorScale conditional format properties if the current conditional format is an ColorScale type. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             colorScaleOrNullObject?: Excel.Interfaces.ColorScaleConditionalFormatData;
             /**
             *
-            * Returns the custom conditional format properties if the current conditional format is a custom type.
+            * Returns the custom conditional format properties if the current conditional format is a custom type. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             custom?: Excel.Interfaces.CustomConditionalFormatData;
             /**
             *
-            * Returns the custom conditional format properties if the current conditional format is a custom type.
+            * Returns the custom conditional format properties if the current conditional format is a custom type. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             customOrNullObject?: Excel.Interfaces.CustomConditionalFormatData;
             /**
             *
-            * Returns the data bar properties if the current conditional format is a data bar.
+            * Returns the data bar properties if the current conditional format is a data bar. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             dataBar?: Excel.Interfaces.DataBarConditionalFormatData;
             /**
             *
-            * Returns the data bar properties if the current conditional format is a data bar.
+            * Returns the data bar properties if the current conditional format is a data bar. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             dataBarOrNullObject?: Excel.Interfaces.DataBarConditionalFormatData;
             /**
             *
-            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             iconSet?: Excel.Interfaces.IconSetConditionalFormatData;
             /**
             *
-            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type.
+            * Returns the IconSet conditional format properties if the current conditional format is an IconSet type. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatData;
             /**
             *
-            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
             preset?: Excel.Interfaces.PresetCriteriaConditionalFormatData;
             /**
             *
-            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28442,7 +36965,7 @@ declare namespace Excel {
             /**
             *
             * Returns the specific text conditional format properties if the current conditional format is a text type.
-            For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text". Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28450,7 +36973,7 @@ declare namespace Excel {
             /**
             *
             * Returns the specific text conditional format properties if the current conditional format is a text type.
-            For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text". Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28458,7 +36981,7 @@ declare namespace Excel {
             /**
             *
             * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-            For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28466,14 +36989,14 @@ declare namespace Excel {
             /**
             *
             * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-            For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatData;
             /**
              *
-             * The Priority of the Conditional Format within the current ConditionalFormatCollection.
+             * The Priority of the Conditional Format within the current ConditionalFormatCollection. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -28484,7 +37007,7 @@ declare namespace Excel {
             changes other conditional formats' priorities, to allow for a contiguous priority order.
             Use a negative priority to begin from the back.
             Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
-            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -28499,7 +37022,7 @@ declare namespace Excel {
             stopIfTrue?: boolean;
             /**
              *
-             * A type of conditional format. Only one can be set at a time. Read-Only.
+             * A type of conditional format. Only one can be set at a time. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -28509,14 +37032,14 @@ declare namespace Excel {
         interface DataBarConditionalFormatData {
             /**
             *
-            * Representation of all values to the left of the axis in an Excel data bar.
+            * Representation of all values to the left of the axis in an Excel data bar. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             negativeFormat?: Excel.Interfaces.ConditionalDataBarNegativeFormatData;
             /**
             *
-            * Representation of all values to the right of the axis in an Excel data bar.
+            * Representation of all values to the right of the axis in an Excel data bar. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28626,14 +37149,14 @@ declare namespace Excel {
         interface CustomConditionalFormatData {
             /**
             *
-            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             format?: Excel.Interfaces.ConditionalRangeFormatData;
             /**
             *
-            * Represents the Rule object on this conditional format.
+            * Represents the Rule object on this conditional format. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28667,7 +37190,7 @@ declare namespace Excel {
         interface IconSetConditionalFormatData {
             /**
              *
-             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
+             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula, and operator will be ignored when set.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -28715,7 +37238,7 @@ declare namespace Excel {
         interface TopBottomConditionalFormatData {
             /**
             *
-            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28749,7 +37272,7 @@ declare namespace Excel {
         interface TextConditionalFormatData {
             /**
             *
-            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties.
+            * Returns a format object, encapsulating the conditional formats font, fill, borders, and other properties. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -28783,21 +37306,21 @@ declare namespace Excel {
         interface ConditionalRangeFormatData {
             /**
             *
-            * Collection of border objects that apply to the overall conditional format range.
+            * Collection of border objects that apply to the overall conditional format range. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             borders?: Excel.Interfaces.ConditionalRangeBorderData[];
             /**
             *
-            * Returns the fill object defined on the overall conditional format range.
+            * Returns the fill object defined on the overall conditional format range. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
             fill?: Excel.Interfaces.ConditionalRangeFillData;
             /**
             *
-            * Returns the font object defined on the overall conditional format range.
+            * Returns the font object defined on the overall conditional format range. Read-only.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -29067,7 +37590,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Returns the calculation mode used in the workbook. See Excel.CalculationMode for details.
+             * Returns the calculation mode used in the workbook, as defined by the constants in Excel.CalculationMode. Possible values are: `Automatic`, where Excel controls recalculation; `AutomaticExceptTables`, where Excel controls recalculation but ignores changes in tables; `Manual`, where calculation is done when the user requests it.
              *
              * [Api set: ExcelApi 1.1 for get, 1.8 for set]
              */
@@ -29104,6 +37627,13 @@ declare namespace Excel {
             properties?: Excel.Interfaces.DocumentPropertiesLoadOptions;
             /**
             *
+            * Returns workbook protection object for a workbook.
+            *
+            * [Api set: ExcelApi 1.7]
+            */
+            protection?: Excel.Interfaces.WorkbookProtectionLoadOptions;
+            /**
+            *
             * Represents a collection of tables associated with the workbook.
             *
             * [Api set: ExcelApi 1.1]
@@ -29111,12 +37641,28 @@ declare namespace Excel {
             tables?: Excel.Interfaces.TableCollectionLoadOptions;
             /**
              *
-             * Gets the workbook name.
+             * Gets the workbook name. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
             name?: boolean;
         }
+        /**
+         *
+         * Represents the protection of a workbook object.
+         *
+         * [Api set: ExcelApi 1.7]
+         */
+        interface WorkbookProtectionLoadOptions {
+            $all?: boolean;
+            /**
+             *
+             * Indicates if the workbook is protected. Read-Only.
+             *
+             * [Api set: ExcelApi 1.7]
+             */
+            protected?: boolean;
+        }
         /**
          *
          * An Excel worksheet is a grid of cells. It can contain data, tables, charts, etc.
@@ -29291,14 +37837,14 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Sheet protection options.
+             * Sheet protection options. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
             options?: boolean;
             /**
              *
-             * Indicates if the worksheet is protected. Read-Only.
+             * Indicates if the worksheet is protected. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -29328,7 +37874,7 @@ declare namespace Excel {
             worksheet?: Excel.Interfaces.WorksheetLoadOptions;
             /**
              *
-             * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. Sheet1!A1:B4). Read-only.
+             * Represents the range reference in A1-style. Address value will contain the Sheet reference (e.g. "Sheet1!A1:B4"). Read-only.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -29371,7 +37917,7 @@ declare namespace Excel {
             /**
              *
              * Represents the formula in A1-style notation.
-                When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -29379,7 +37925,7 @@ declare namespace Excel {
             /**
              *
              * Represents the formula in A1-style notation, in the user's language and number-formatting locale.  For example, the English "=SUM(A1, 1.5)" formula would become "=SUMME(A1; 1,5)" in German.
-                When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -29387,14 +37933,14 @@ declare namespace Excel {
             /**
              *
              * Represents the formula in R1C1-style notation.
-                When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+            When setting formulas to a range, the value argument can be either a single value (a string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.2]
              */
             formulasR1C1?: boolean;
             /**
              *
-             * Represents if all cells of the current range are hidden.
+             * Represents if all cells of the current range are hidden. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -29408,14 +37954,14 @@ declare namespace Excel {
             hyperlink?: boolean;
             /**
              *
-             * Represents if the current range is an entire column.
+             * Represents if the current range is an entire column. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
             isEntireColumn?: boolean;
             /**
              *
-             * Represents if the current range is an entire row.
+             * Represents if the current range is an entire row. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -29423,7 +37969,7 @@ declare namespace Excel {
             /**
              *
              * Represents Excel's number format code for the given range.
-                When setting number format to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+            When setting number format to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -29431,7 +37977,7 @@ declare namespace Excel {
             /**
              *
              * Represents Excel's number format code for the given range as a string in the language of the user.
-                When setting number format local to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+            When setting number format local to a range, the value argument can be either a single value (string) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -29460,8 +38006,8 @@ declare namespace Excel {
             /**
              *
              * Represents the style of the current range.
-                If the styles of the cells are inconsistent, null will be returned.
-                For custom styles, the style name will be returned. For built-in styles, a string representing a value in the BuiltInStyle enum will be returned.
+            If the styles of the cells are inconsistent, null will be returned.
+            For custom styles, the style name will be returned. For built-in styles, a string representing a value in the BuiltInStyle enum will be returned.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -29482,8 +38028,8 @@ declare namespace Excel {
             valueTypes?: boolean;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
-                When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
+            When setting values to a range, the value argument can be either a single value (string, number or boolean) or a two-dimensional array. If the argument is a single value, it will be applied to all cells in the range.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -29499,7 +38045,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Represents the cell addresses of the RangeView.
+             * Represents the cell addresses of the RangeView. Read-only.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -29569,7 +38115,7 @@ declare namespace Excel {
             valueTypes?: boolean;
             /**
              *
-             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -29585,7 +38131,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the cell addresses of the RangeView.
+             * For EACH ITEM in the collection: Represents the cell addresses of the RangeView. Read-only.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -29655,7 +38201,7 @@ declare namespace Excel {
             valueTypes?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * For EACH ITEM in the collection: Represents the raw values of the specified range view. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.3]
              */
@@ -29663,7 +38209,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a collection of worksheet objects that are part of the workbook.
+         * Represents a collection of key-value pair setting objects that are part of the workbook. The scope is limited to per file and add-in (task-pane or content) combination.
          *
          * [Api set: ExcelApi 1.4]
          */
@@ -29686,7 +38232,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Setting represents a key-value pair of a setting persisted to the document.
+         * Setting represents a key-value pair of a setting persisted to the document (per file per add-in). These custom key-value pair can be used to store state or lifecycle information needed by the content or task-pane add-in. Note that settings are persisted in the document and hence it is not a place to store any sensitive or protected information such as user information and password.
          *
          * [Api set: ExcelApi 1.4]
          */
@@ -29709,7 +38255,7 @@ declare namespace Excel {
         }
         /**
          *
-         * A collection of all the nameditem objects that are part of the workbook or worksheet, depending on how it was reached.
+         * A collection of all the NamedItem objects that are part of the workbook or worksheet, depending on how it was reached.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -29724,7 +38270,7 @@ declare namespace Excel {
             arrayValues?: Excel.Interfaces.NamedItemArrayValuesLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+            * For EACH ITEM in the collection: Returns the worksheet on which the named item is scoped to. Throws an error if the item is scoped to the workbook instead.
             *
             * [Api set: ExcelApi 1.4]
             */
@@ -29759,7 +38305,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+             * For EACH ITEM in the collection: Indicates whether the name is scoped to the workbook or to a specific worksheet. Possible values are: Worksheet, Workbook. Read-only.
              *
              * [Api set: ExcelApi 1.4]
              */
@@ -29788,7 +38334,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, reference to a range. This object can be used to obtain range object associated with names.
+         * Represents a defined name for a range of cells or value. Names can be primitive named objects (as seen in the type below), range object, or a reference to a range. This object can be used to obtain range object associated with names.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -29803,7 +38349,7 @@ declare namespace Excel {
             arrayValues?: Excel.Interfaces.NamedItemArrayValuesLoadOptions;
             /**
             *
-            * Returns the worksheet on which the named item is scoped to. Throws an error if the items is scoped to the workbook instead.
+            * Returns the worksheet on which the named item is scoped to. Throws an error if the item is scoped to the workbook instead.
             *
             * [Api set: ExcelApi 1.4]
             */
@@ -29838,7 +38384,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * Indicates whether the name is scoped to the workbook or to a specific worksheet. Read-only.
+             * Indicates whether the name is scoped to the workbook or to a specific worksheet. Possible values are: Worksheet, Workbook. Read-only.
              *
              * [Api set: ExcelApi 1.4]
              */
@@ -30186,7 +38732,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * For EACH ITEM in the collection: Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -30230,7 +38776,7 @@ declare namespace Excel {
             name?: boolean;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -30239,11 +38785,11 @@ declare namespace Excel {
         /**
          *
          * Represents a collection of all the rows that are part of the table.
-
-                Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
-                a TableRow object represent the physical location of the table row, but not the data.
-                That is, if the data is sorted or if new rows are added, a table row will continue
-                to point at the index for which it was created.
+            
+             Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+             a TableRow object represent the physical location of the table row, but not the data.
+             That is, if the data is sorted or if new rows are added, a table row will continue
+             to point at the index for which it was created.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -30258,7 +38804,7 @@ declare namespace Excel {
             index?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * For EACH ITEM in the collection: Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -30267,11 +38813,11 @@ declare namespace Excel {
         /**
          *
          * Represents a row in a table.
-
-                Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
-                a TableRow object represent the physical location of the table row, but not the data.
-                That is, if the data is sorted or if new rows are added, a table row will continue
-                to point at the index for which it was created.
+            
+             Note that unlike Ranges or Columns, which will adjust if new rows/columns are added before them,
+             a TableRow object represent the physical location of the table row, but not the data.
+             That is, if the data is sorted or if new rows are added, a table row will continue
+             to point at the index for which it was created.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -30286,7 +38832,7 @@ declare namespace Excel {
             index?: boolean;
             /**
              *
-             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cell that contain an error will return the error string.
+             * Represents the raw values of the specified range. The data returned could be of type string, number, or a boolean. Cells that contain an error will return the error string.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -30352,8 +38898,8 @@ declare namespace Excel {
             /**
              *
              * Gets or sets the text orientation of all the cells within the range.
-                The text orientation should be an integer either from -90 to 90, or 180 for vertically-oriented text.
-                If the orientation within a range are not uniform, then null will be returned.
+            The text orientation should be an integer either from -90 to 90, or 180 for vertically-oriented text.
+            If the orientation within a range are not uniform, then null will be returned.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -30361,19 +38907,19 @@ declare namespace Excel {
             /**
              *
              * Determines if the row height of the Range object equals the standard height of the sheet.
-                Returns True if the row height of the Range object equals the standard height of the sheet.
-                Returns Null if the range contains more than one row and the rows aren't all the same height.
-                Returns False otherwise.
+            Returns True if the row height of the Range object equals the standard height of the sheet.
+            Returns Null if the range contains more than one row and the rows aren't all the same height.
+            Returns False otherwise.
              *
              * [Api set: ExcelApi 1.7]
              */
             useStandardHeight?: boolean;
             /**
              *
-             * Indicates whether the columnwidth of the Range object equals the standard width of the sheet.
-                Returns True if the column width of the Range object equals the standard width of the sheet.
-                Returns Null if the range contains more than one column and the columns aren't all the same height.
-                Returns False otherwise.
+             * Indicates whether the column width of the Range object equals the standard width of the sheet.
+            Returns True if the column width of the Range object equals the standard width of the sheet.
+            Returns Null if the range contains more than one column and the columns aren't all the same height.
+            Returns False otherwise.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -30602,7 +39148,7 @@ declare namespace Excel {
             series?: Excel.Interfaces.ChartSeriesCollectionLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            * For EACH ITEM in the collection: Represents the title of the specified chart, including the text, visibility, position, and formating of the title.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -30716,7 +39262,7 @@ declare namespace Excel {
             series?: Excel.Interfaces.ChartSeriesCollectionLoadOptions;
             /**
             *
-            * Represents the title of the specified chart, including the text, visibility, position and formating of the title.
+            * Represents the title of the specified chart, including the text, visibility, position, and formating of the title.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -30795,7 +39341,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Represents the border format of chart area, which includes color, linestyle and weight.
+            * Represents the border format of chart area, which includes color, linestyle, and weight.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -30840,7 +39386,7 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
-                Throws an invalid argument exception on invalid charts.
+            Throws an invalid argument exception on invalid charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -30855,7 +39401,7 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
-                specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+            specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -30918,7 +39464,7 @@ declare namespace Excel {
             showShadow?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             * For EACH ITEM in the collection: Boolean value representing if the series is smooth or not. Only applicable to line and scatter charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -30956,7 +39502,7 @@ declare namespace Excel {
             /**
              *
              * Represents the doughnut hole size of a chart series.  Only valid on doughnut and doughnutExploded charts.
-                Throws an invalid argument exception on invalid charts.
+            Throws an invalid argument exception on invalid charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -30971,7 +39517,7 @@ declare namespace Excel {
             /**
              *
              * Represents the gap width of a chart series.  Only valid on bar and column charts, as well as
-                specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
+            specific classes of line and pie charts.  Throws an invalid argument exception on invalid charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31034,7 +39580,7 @@ declare namespace Excel {
             showShadow?: boolean;
             /**
              *
-             * Boolean value representing if the series is smooth or not. Only applicable for line and scatter charts.
+             * Boolean value representing if the series is smooth or not. Only applicable to line and scatter charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31042,7 +39588,7 @@ declare namespace Excel {
         }
         /**
          *
-         * encapsulates the format properties for the chart series
+         * Encapsulates the format properties for the chart series
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -31080,7 +39626,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartPointFormatLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Represents whether a data point has datalabel. Not applicable for surface charts.
+             * For EACH ITEM in the collection: Represents whether a data point has a data label. Not applicable for surface charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31145,7 +39691,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartPointFormatLoadOptions;
             /**
              *
-             * Represents whether a data point has datalabel. Not applicable for surface charts.
+             * Represents whether a data point has a data label. Not applicable for surface charts.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31196,7 +39742,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Represents the border format of a chart data point, which includes color, style and weight information.
+            * Represents the border format of a chart data point, which includes color, style, and weight information.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -31249,7 +39795,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartAxisFormatLoadOptions;
             /**
             *
-            * Returns a gridlines object that represents the major gridlines for the specified axis.
+            * Returns a Gridlines object that represents the major gridlines for the specified axis.
             *
             * [Api set: ExcelApi 1.1]
             */
@@ -31270,7 +39816,7 @@ declare namespace Excel {
             title?: Excel.Interfaces.ChartAxisTitleLoadOptions;
             /**
              *
-             * Represents the group for the specified axis. See Excel.ChartAxisGroup for details.
+             * Represents the group for the specified axis. See Excel.ChartAxisGroup for details. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31305,7 +39851,7 @@ declare namespace Excel {
             crossesAt?: boolean;
             /**
              *
-             * Represents the custom axis display unit value. Read Only. To set this property, please use the SetCustomDisplayUnit(double) method.
+             * Represents the custom axis display unit value. Read-only. To set this property, please use the SetCustomDisplayUnit(double) method.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31319,14 +39865,14 @@ declare namespace Excel {
             displayUnit?: boolean;
             /**
              *
-             * Represents the height, in points, of the chart axis. Null if the axis's not visible.
+             * Represents the height, in points, of the chart axis. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
             height?: boolean;
             /**
              *
-             * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis's not visible.
+             * Represents the distance, in points, from the left edge of the axis to the left of chart area. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31389,7 +39935,7 @@ declare namespace Excel {
             minorTimeUnitScale?: boolean;
             /**
              *
-             * Represents the interval between two minor tick marks. "Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
+             * Represents the interval between two minor tick marks. Can be set to a numeric value or an empty string (for automatic axis values). The returned value is always a number.
              *
              * [Api set: ExcelApi 1.1]
              */
@@ -31438,7 +39984,7 @@ declare namespace Excel {
             tickMarkSpacing?: boolean;
             /**
              *
-             * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis's not visible.
+             * Represents the distance, in points, from the top edge of the axis to the top of chart area. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31459,7 +40005,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Represents the width, in points, of the chart axis. Null if the axis's not visible.
+             * Represents the width, in points, of the chart axis. Null if the axis is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31863,7 +40409,7 @@ declare namespace Excel {
             format?: Excel.Interfaces.ChartTitleFormatLoadOptions;
             /**
              *
-             * Returns the height, in points, of the chart title. Read-only. Null if chart title is not visible.
+             * Returns the height, in points, of the chart title. Null if chart title is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31877,7 +40423,7 @@ declare namespace Excel {
             horizontalAlignment?: boolean;
             /**
              *
-             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title's not visible.
+             * Represents the distance, in points, from the left edge of chart title to the left edge of chart area. Null if chart title is not visible.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31919,7 +40465,7 @@ declare namespace Excel {
             textOrientation?: boolean;
             /**
              *
-             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title's not visible.
+             * Represents the distance, in points, from the top edge of chart title to the top of chart area. Null if chart title is not visible.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31940,7 +40486,7 @@ declare namespace Excel {
             visible?: boolean;
             /**
              *
-             * Returns the width, in points, of the chart title. Read-only. Null if chart title is not visible.
+             * Returns the width, in points, of the chart title. Null if chart title is not visible. Read-only.
              *
              * [Api set: ExcelApi 1.7]
              */
@@ -31972,7 +40518,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
             *
-            * Represents the border format of chart title, which includes color, linestyle and weight.
+            * Represents the border format of chart title, which includes color, linestyle, and weight.
             *
             * [Api set: ExcelApi 1.7]
             */
@@ -32017,7 +40563,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Enapsulates the formatting options for line elements.
+         * Encapsulates the formatting options for line elements.
          *
          * [Api set: ExcelApi 1.1]
          */
@@ -32224,21 +40770,21 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * Represents the current conditions used to last sort the table.
+             * Represents the current conditions used to last sort the table. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
             fields?: boolean;
             /**
              *
-             * Represents whether the casing impacted the last sort of the table.
+             * Represents whether the casing impacted the last sort of the table. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
             matchCase?: boolean;
             /**
              *
-             * Represents Chinese character ordering method last used to sort the table.
+             * Represents Chinese character ordering method last used to sort the table. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -32254,7 +40800,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * The currently applied filter on the given column.
+             * The currently applied filter on the given column. Read-only.
              *
              * [Api set: ExcelApi 1.2]
              */
@@ -32263,8 +40809,8 @@ declare namespace Excel {
         /**
          *
          * A scoped collection of custom XML parts.
-                A scoped collection is the result of some operation, e.g. filtering by namespace.
-                A scoped collection cannot be scoped any further.
+            A scoped collection is the result of some operation, e.g. filtering by namespace.
+            A scoped collection cannot be scoped any further.
          *
          * [Api set: ExcelApi 1.5]
          */
@@ -32348,7 +40894,7 @@ declare namespace Excel {
             worksheet?: Excel.Interfaces.WorksheetLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Id of the PivotTable.
+             * For EACH ITEM in the collection: Id of the PivotTable. Read-only.
              *
              * [Api set: ExcelApi 1.5]
              */
@@ -32378,7 +40924,7 @@ declare namespace Excel {
             worksheet?: Excel.Interfaces.WorksheetLoadOptions;
             /**
              *
-             * Id of the PivotTable.
+             * Id of the PivotTable. Read-only.
              *
              * [Api set: ExcelApi 1.5]
              */
@@ -32548,7 +41094,7 @@ declare namespace Excel {
             /**
             *
             * For EACH ITEM in the collection: Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-                For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32556,7 +41102,7 @@ declare namespace Excel {
             /**
             *
             * For EACH ITEM in the collection: Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-                For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32619,14 +41165,14 @@ declare namespace Excel {
             iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * For EACH ITEM in the collection: Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
             preset?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions;
             /**
             *
-            * For EACH ITEM in the collection: Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * For EACH ITEM in the collection: Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32634,7 +41180,7 @@ declare namespace Excel {
             /**
             *
             * For EACH ITEM in the collection: Returns the specific text conditional format properties if the current conditional format is a text type.
-                For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text".
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32642,7 +41188,7 @@ declare namespace Excel {
             /**
             *
             * For EACH ITEM in the collection: Returns the specific text conditional format properties if the current conditional format is a text type.
-                For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text".
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32650,7 +41196,7 @@ declare namespace Excel {
             /**
             *
             * For EACH ITEM in the collection: Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-                For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32658,14 +41204,14 @@ declare namespace Excel {
             /**
             *
             * For EACH ITEM in the collection: Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-                For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items.
             *
             * [Api set: ExcelApi 1.6]
             */
             topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: The Priority of the Conditional Format within the current ConditionalFormatCollection.
+             * For EACH ITEM in the collection: The Priority of the Conditional Format within the current ConditionalFormatCollection. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32673,10 +41219,10 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: The priority (or index) within the conditional format collection that this conditional format currently exists in. Changing this also
-                changes other conditional formats' priorities, to allow for a contiguous priority order.
-                Use a negative priority to begin from the back.
-                Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
-                Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+            changes other conditional formats' priorities, to allow for a contiguous priority order.
+            Use a negative priority to begin from the back.
+            Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32684,14 +41230,14 @@ declare namespace Excel {
             /**
              *
              * For EACH ITEM in the collection: If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
-                Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
+            Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
              *
              * [Api set: ExcelApi 1.6]
              */
             stopIfTrue?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A type of conditional format. Only one can be set at a time. Read-Only.
+             * For EACH ITEM in the collection: A type of conditional format. Only one can be set at a time. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32708,7 +41254,7 @@ declare namespace Excel {
             /**
             *
             * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-                For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32716,7 +41262,7 @@ declare namespace Excel {
             /**
             *
             * Returns the cell value conditional format properties if the current conditional format is a CellValue type.
-                For example to format all cells between 5 and 10.
+            For example to format all cells between 5 and 10.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32779,14 +41325,14 @@ declare namespace Excel {
             iconSetOrNullObject?: Excel.Interfaces.IconSetConditionalFormatLoadOptions;
             /**
             *
-            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
             preset?: Excel.Interfaces.PresetCriteriaConditionalFormatLoadOptions;
             /**
             *
-            * Returns the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror properties.
+            * Returns the preset criteria conditional format. See Excel.PresetCriteriaConditionalFormat for more details.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32794,7 +41340,7 @@ declare namespace Excel {
             /**
             *
             * Returns the specific text conditional format properties if the current conditional format is a text type.
-                For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text".
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32802,7 +41348,7 @@ declare namespace Excel {
             /**
             *
             * Returns the specific text conditional format properties if the current conditional format is a text type.
-                For example to format cells matching the word "Text".
+            For example to format cells matching the word "Text".
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32810,7 +41356,7 @@ declare namespace Excel {
             /**
             *
             * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-                For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items.
             *
             * [Api set: ExcelApi 1.6]
             */
@@ -32818,14 +41364,14 @@ declare namespace Excel {
             /**
             *
             * Returns the Top/Bottom conditional format properties if the current conditional format is an TopBottom type.
-                For example to format the top 10% or bottom 10 items.
+            For example to format the top 10% or bottom 10 items.
             *
             * [Api set: ExcelApi 1.6]
             */
             topBottomOrNullObject?: Excel.Interfaces.TopBottomConditionalFormatLoadOptions;
             /**
              *
-             * The Priority of the Conditional Format within the current ConditionalFormatCollection.
+             * The Priority of the Conditional Format within the current ConditionalFormatCollection. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32833,10 +41379,10 @@ declare namespace Excel {
             /**
              *
              * The priority (or index) within the conditional format collection that this conditional format currently exists in. Changing this also
-                changes other conditional formats' priorities, to allow for a contiguous priority order.
-                Use a negative priority to begin from the back.
-                Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
-                Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it.
+            changes other conditional formats' priorities, to allow for a contiguous priority order.
+            Use a negative priority to begin from the back.
+            Priorities greater than than bounds will get and set to the maximum (or minimum if negative) priority.
+            Also note that if you change the priority, you have to re-fetch a new copy of the object at that new priority location if you want to make further changes to it. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32844,14 +41390,14 @@ declare namespace Excel {
             /**
              *
              * If the conditions of this conditional format are met, no lower-priority formats shall take effect on that cell.
-                Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
+            Null on databars, icon sets, and colorscales as there's no concept of StopIfTrue for these
              *
              * [Api set: ExcelApi 1.6]
              */
             stopIfTrue?: boolean;
             /**
              *
-             * A type of conditional format. Only one can be set at a time. Read-Only.
+             * A type of conditional format. Only one can be set at a time. Read-only.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32882,7 +41428,7 @@ declare namespace Excel {
             /**
              *
              * HTML color code representing the color of the Axis line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
-                "" (empty string) if no axis is present or set.
+            "" (empty string) if no axis is present or set.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32934,7 +41480,7 @@ declare namespace Excel {
             /**
              *
              * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
-                "" (empty string) if no border is present or set.
+            "" (empty string) if no border is present or set.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -32965,7 +41511,7 @@ declare namespace Excel {
             /**
              *
              * HTML color code representing the color of the border line, of the form #RRGGBB (e.g. "FFA500") or as a named HTML color (e.g. "orange").
-                "Empty String" if no border is present or set.
+            "Empty String" if no border is present or set.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -33055,7 +41601,7 @@ declare namespace Excel {
             $all?: boolean;
             /**
              *
-             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula and operator will be ignored when set.
+             * An array of Criteria and IconSets for the rules and potential custom icons for conditional icons. Note that for the first criterion only the custom icon can be modified, while type, formula, and operator will be ignored when set.
              *
              * [Api set: ExcelApi 1.6]
              */
@@ -33130,7 +41676,7 @@ declare namespace Excel {
         }
         /**
          *
-         * Represents the the preset criteria conditional format such as above average/below average/unique values/contains blank/nonblank/error/noerror.
+         * Represents the the preset criteria conditional format such as above average, below average, unique values, contains blank, nonblank, error, and noerror.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -33236,7 +41782,7 @@ declare namespace Excel {
         }
         /**
          *
-         * This object represents the font attributes (font style,, color, etc.) for an object.
+         * This object represents the font attributes (font style, color, etc.) for an object.
          *
          * [Api set: ExcelApi 1.6]
          */
@@ -33712,14 +42258,14 @@ declare namespace Excel {
 declare namespace Word {
     /**
      *
-     * The Application object.
+     * Represents the application object.
      *
      * [Api set: WordApi 1.3]
      */
     class Application extends OfficeExtension.ClientObject {
         /**
          *
-         * Creates a new hidden document by using an optional base64 encoded .docx file.
+         * Creates a new document by using an optional base64 encoded .docx file.
          *
          * [Api set: WordApi 1.3]
          *
@@ -33757,7 +42303,7 @@ declare namespace Word {
         readonly font: Word.Font;
         /**
          *
-         * Gets the collection of inlinePicture objects in the body. The collection does not include floating images. Read-only.
+         * Gets the collection of InlinePicture objects in the body. The collection does not include floating images. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
@@ -33853,10 +42399,20 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         readonly type: Word.BodyType | "Unknown" | "MainDoc" | "Section" | "Header" | "Footer" | "TableCell";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Body): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.BodyUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Body): void;
+        set(properties: Word.Body): void;
         /**
          *
          * Clears the contents of the body object. The user can perform the undo operation on the cleared content.
@@ -33884,7 +42440,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: Word.RangeLocation): Word.Range;
         /**
@@ -33893,7 +42449,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
@@ -33925,42 +42481,42 @@ declare namespace Word {
         insertContentControl(): Word.ContentControl;
         /**
          *
-         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a document into the body at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted in the document.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted in the document.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
@@ -33985,22 +42541,22 @@ declare namespace Word {
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
@@ -34049,31 +42605,31 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
-         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts text into the body at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Performs a search with the specified searchOptions on the scope of the body object. The search results are a collection of range objects.
+         * Performs a search with the specified SearchOptions on the scope of the body object. The search results are a collection of range objects.
          *
          * [Api set: WordApi 1.1]
          *
-         * @param searchText Required. The search text.
+         * @param searchText Required. The search text. Can be a maximum of 255 characters.
          * @param searchOptions Optional. Options for the search.
          */
         search(searchText: string, searchOptions?: Word.SearchOptions | {
@@ -34091,7 +42647,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -34100,11 +42656,23 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Body` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Body` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Body` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.BodyLoadOptions): Word.Body;
         load(option?: string | string[]): Word.Body;
@@ -34222,7 +42790,7 @@ declare namespace Word {
         readonly tables: Word.TableCollection;
         /**
          *
-         * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+         * Gets or sets the appearance of the content control. The value can be 'BoundingBox', 'Tags', or 'Hidden'.
          *
          * [Api set: WordApi 1.1]
          */
@@ -34318,10 +42886,20 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         readonly type: Word.ContentControlType | "Unknown" | "RichTextInline" | "RichTextParagraphs" | "RichTextTableCell" | "RichTextTableRow" | "RichTextTable" | "PlainTextInline" | "PlainTextParagraph" | "Picture" | "BuildingBlockGallery" | "CheckBox" | "ComboBox" | "DropDownList" | "DatePicker" | "RepeatingSection" | "RichText" | "PlainText";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.ContentControl): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ContentControlUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ContentControl): void;
+        set(properties: Word.ContentControl): void;
         /**
          *
          * Clears the contents of the content control. The user can perform the undo operation on the cleared content.
@@ -34358,7 +42936,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Before', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Before', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: Word.RangeLocation): Word.Range;
         /**
@@ -34367,7 +42945,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Before', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Before', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
@@ -34377,176 +42955,176 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
         getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before' or 'After'. This method cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before', or 'After'. This method cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          *
          * [Api set: WordApi 1.1]
          *
          * @param breakType Required. Type of break.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'.
          */
         insertBreak(breakType: Word.BreakType, insertLocation: Word.InsertLocation): void;
         /**
          *
-         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before' or 'After'. This method cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * Inserts a break at the specified location in the main document. The insertLocation value can be 'Start', 'End', 'Before', or 'After'. This method cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          *
          * [Api set: WordApi 1.1]
          *
          * @param breakType Required. Type of break.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'.
          */
         insertBreak(breakType: "Page" | "Next" | "SectionNext" | "SectionContinuous" | "SectionEven" | "SectionOdd" | "Line", insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): void;
         /**
          *
-         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a document into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts HTML into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.2]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted in the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
         /**
          *
-         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts an inline picture into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.2]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted in the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
-         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts OOXML into the content control at the specified location.  The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
-         * @param paragraphText Required. The paragrph text to be inserted.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          */
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
-         * @param paragraphText Required. The paragrph text to be inserted.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * @param paragraphText Required. The paragraph text to be inserted.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          */
         insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
          *
-         * Inserts a table with the specified number of rows and columns into, or next to, a content control. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns into, or next to, a content control. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.3]
          *
          * @param rowCount Required. The number of rows in the table.
          * @param columnCount Required. The number of columns in the table.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
         insertTable(rowCount: number, columnCount: number, insertLocation: Word.InsertLocation, values?: string[][]): Word.Table;
         /**
          *
-         * Inserts a table with the specified number of rows and columns into, or next to, a content control. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         * Inserts a table with the specified number of rows and columns into, or next to, a content control. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.3]
          *
          * @param rowCount Required. The number of rows in the table.
          * @param columnCount Required. The number of columns in the table.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'. 'Before' and 'After' cannot be used with 'RichTextTable', 'RichTextTableRow' and 'RichTextTableCell' content controls.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
         insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
-         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. The text to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts text into the content control at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. The text to be inserted in to the content control.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'. 'Replace' cannot be used with 'RichTextTable' and 'RichTextTableRow' content controls.
          */
         insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Performs a search with the specified searchOptions on the scope of the content control object. The search results are a collection of range objects.
+         * Performs a search with the specified SearchOptions on the scope of the content control object. The search results are a collection of range objects.
          *
          * [Api set: WordApi 1.1]
          *
@@ -34568,7 +43146,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -34577,7 +43155,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
@@ -34589,11 +43167,23 @@ declare namespace Word {
          * @param delimiters Required. The delimiters as an array of strings.
          * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates that the paragraph boundaries are also used as delimiters.
          * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
         split(delimiters: string[], multiParagraphs?: boolean, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.ContentControl` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.ContentControl` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.ContentControl` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ContentControlLoadOptions): Word.ContentControl;
         load(option?: string | string[]): Word.ContentControl;
@@ -34613,7 +43203,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains a collection of [contentControl](contentControl.md) objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
+     * Contains a collection of {@link Word.ContentControl} objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
      *
      * [Api set: WordApi 1.1]
      */
@@ -34690,6 +43280,18 @@ declare namespace Word {
         getItem(index: number): Word.ContentControl;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.ContentControlCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.ContentControlCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.ContentControlCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ContentControlCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.ContentControlCollection;
         load(option?: string | string[]): Word.ContentControlCollection;
@@ -34732,10 +43334,20 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         value: any;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.CustomProperty): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.CustomPropertyUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: CustomProperty): void;
+        set(properties: Word.CustomProperty): void;
         /**
          *
          * Deletes the custom property.
@@ -34745,6 +43357,18 @@ declare namespace Word {
         delete(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.CustomProperty` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.CustomProperty` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.CustomProperty` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.CustomPropertyLoadOptions): Word.CustomProperty;
         load(option?: string | string[]): Word.CustomProperty;
@@ -34764,7 +43388,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains the collection of [customProperty](customProperty.md) objects.
+     * Contains the collection of {@link Word.CustomProperty} objects.
      *
      * [Api set: WordApi 1.3]
      */
@@ -34815,6 +43439,18 @@ declare namespace Word {
         getItemOrNullObject(key: string): Word.CustomProperty;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.CustomPropertyCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.CustomPropertyCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.CustomPropertyCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.CustomPropertyCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.CustomPropertyCollection;
         load(option?: string | string[]): Word.CustomPropertyCollection;
@@ -34871,10 +43507,20 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         readonly saved: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Document): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.DocumentUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Document): void;
+        set(properties: Word.Document): void;
         /**
          *
          * Gets the current selection of the document. Multiple selections are not supported.
@@ -34891,6 +43537,18 @@ declare namespace Word {
         save(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Document` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Document` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Document` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.DocumentLoadOptions): Word.Document;
         load(option?: string | string[]): Word.Document;
@@ -34950,13 +43608,23 @@ declare namespace Word {
          * [Api set: WordApiHiddenDocument 1.3]
          */
         readonly saved: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.DocumentCreated): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.DocumentCreatedUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: DocumentCreated): void;
+        set(properties: Word.DocumentCreated): void;
         /**
          *
-         * Open the document.
+         * Opens the document.
          *
          * [Api set: WordApi 1.3]
          */
@@ -34970,6 +43638,18 @@ declare namespace Word {
         save(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.DocumentCreated` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.DocumentCreated` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.DocumentCreated` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.DocumentCreatedLoadOptions): Word.DocumentCreated;
         load(option?: string | string[]): Word.DocumentCreated;
@@ -35120,12 +43800,34 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         title: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.DocumentProperties): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.DocumentPropertiesUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: DocumentProperties): void;
+        set(properties: Word.DocumentProperties): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.DocumentProperties` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.DocumentProperties` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.DocumentProperties` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.DocumentPropertiesLoadOptions): Word.DocumentProperties;
         load(option?: string | string[]): Word.DocumentProperties;
@@ -35166,14 +43868,14 @@ declare namespace Word {
         color: string;
         /**
          *
-         * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+         * Gets or sets a value that indicates whether the font has a double strikethrough. True if the font is formatted as double strikethrough text, otherwise, false.
          *
          * [Api set: WordApi 1.1]
          */
         doubleStrikeThrough: boolean;
         /**
          *
-         * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, or an empty string for mixed highlight colors, or null for no highlight color.
+         * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
          *
          * [Api set: WordApi 1.1]
          */
@@ -35201,7 +43903,7 @@ declare namespace Word {
         size: number;
         /**
          *
-         * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+         * Gets or sets a value that indicates whether the font has a strikethrough. True if the font is formatted as strikethrough text, otherwise, false.
          *
          * [Api set: WordApi 1.1]
          */
@@ -35227,12 +43929,34 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         underline: Word.UnderlineType | "Mixed" | "None" | "Hidden" | "DotLine" | "Single" | "Word" | "Double" | "Thick" | "Dotted" | "DottedHeavy" | "DashLine" | "DashLineHeavy" | "DashLineLong" | "DashLineLongHeavy" | "DotDashLine" | "DotDashLineHeavy" | "TwoDotDashLine" | "TwoDotDashLineHeavy" | "Wave" | "WaveHeavy" | "WaveDouble";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Font): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.FontUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Font): void;
+        set(properties: Word.Font): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Font` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Font` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Font` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.FontLoadOptions): Word.Font;
         load(option?: string | string[]): Word.Font;
@@ -35308,7 +44032,7 @@ declare namespace Word {
         readonly parentTableOrNullObject: Word.Table;
         /**
          *
-         * Gets or sets a string that represents the alternative text associated with the inline image
+         * Gets or sets a string that represents the alternative text associated with the inline image.
          *
          * [Api set: WordApi 1.1]
          */
@@ -35348,10 +44072,20 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.InlinePicture): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.InlinePictureUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: InlinePicture): void;
+        set(properties: Word.InlinePicture): void;
         /**
          *
          * Deletes the inline picture from the document.
@@ -35386,7 +44120,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', or 'End'.
          */
         getRange(rangeLocation?: Word.RangeLocation): Word.Range;
         /**
@@ -35395,7 +44129,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start' or 'End'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', or 'End'.
          */
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
@@ -35467,22 +44201,22 @@ declare namespace Word {
         insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before' or 'After'.
+         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.2]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Before', or 'After'.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
         /**
          *
-         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before' or 'After'.
+         * Inserts an inline picture at the specified location. The insertLocation value can be 'Replace', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.2]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Before', or 'After'.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
@@ -35551,7 +44285,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.2]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -35560,11 +44294,23 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.2]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.InlinePicture` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.InlinePicture` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.InlinePicture` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.InlinePictureLoadOptions): Word.InlinePicture;
         load(option?: string | string[]): Word.InlinePicture;
@@ -35584,7 +44330,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains a collection of [inlinePicture](inlinePicture.md) objects.
+     * Contains a collection of {@link Word.InlinePicture} objects.
      *
      * [Api set: WordApi 1.1]
      */
@@ -35607,6 +44353,18 @@ declare namespace Word {
         getFirstOrNullObject(): Word.InlinePicture;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.InlinePictureCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.InlinePictureCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.InlinePictureCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.InlinePictureCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.InlinePictureCollection;
         load(option?: string | string[]): Word.InlinePictureCollection;
@@ -35623,7 +44381,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains a collection of [paragraph](paragraph.md) objects.
+     * Contains a collection of {@link Word.Paragraph} objects.
      *
      * [Api set: WordApi 1.3]
      */
@@ -35651,7 +44409,7 @@ declare namespace Word {
         readonly levelExistences: boolean[];
         /**
          *
-         * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+         * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number', or 'Picture'. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
@@ -35676,22 +44434,22 @@ declare namespace Word {
         getLevelString(level: number): OfficeExtension.ClientResult<string>;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.3]
          *
          * @param paragraphText Required. The paragraph text to be inserted.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'.
          */
         insertParagraph(paragraphText: string, insertLocation: Word.InsertLocation): Word.Paragraph;
         /**
          *
-         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before' or 'After'.
+         * Inserts a paragraph at the specified location. The insertLocation value can be 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.3]
          *
          * @param paragraphText Required. The paragraph text to be inserted.
-         * @param insertLocation Required. The value can be 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Start', 'End', 'Before', or 'After'.
          */
         insertParagraph(paragraphText: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Paragraph;
         /**
@@ -35701,7 +44459,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param level Required. The level in the list.
-         * @param alignment Required. The level alignment that can be 'left', 'centered' or 'right'.
+         * @param alignment Required. The level alignment that can be 'Left', 'Centered', or 'Right'.
          */
         setLevelAlignment(level: number, alignment: Word.Alignment): void;
         /**
@@ -35711,7 +44469,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param level Required. The level in the list.
-         * @param alignment Required. The level alignment that can be 'left', 'centered' or 'right'.
+         * @param alignment Required. The level alignment that can be 'Left', 'Centered', or 'Right'.
          */
         setLevelAlignment(level: number, alignment: "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified"): void;
         /**
@@ -35783,6 +44541,18 @@ declare namespace Word {
         setLevelStartingNumber(level: number, startingNumber: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.List` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.List` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.List` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ListLoadOptions): Word.List;
         load(option?: string | string[]): Word.List;
@@ -35802,7 +44572,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains a collection of [list](list.md) objects.
+     * Contains a collection of {@link Word.List} objects.
      *
      * [Api set: WordApi 1.3]
      */
@@ -35852,6 +44622,18 @@ declare namespace Word {
         getItem(index: number): Word.List;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.ListCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.ListCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.ListCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ListCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.ListCollection;
         load(option?: string | string[]): Word.ListCollection;
@@ -35882,7 +44664,7 @@ declare namespace Word {
         level: number;
         /**
          *
-         * Gets the list item bullet, number or picture as a string. Read-only.
+         * Gets the list item bullet, number, or picture as a string. Read-only.
          *
          * [Api set: WordApi 1.3]
          */
@@ -35894,26 +44676,36 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         readonly siblingIndex: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.ListItem): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ListItemUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ListItem): void;
+        set(properties: Word.ListItem): void;
         /**
          *
-         * Gets the list item parent, or the closest ancestor if the parent does not exist. Throws if the list item has no ancester.
+         * Gets the list item parent, or the closest ancestor if the parent does not exist. Throws if the list item has no ancestor.
          *
          * [Api set: WordApi 1.3]
          *
-         * @param parentOnly Optional. Specified only the list item's parent will be returned. The default is false that specifies to get the lowest ancestor.
+         * @param parentOnly Optional. Specifies only the list item's parent will be returned. The default is false that specifies to get the lowest ancestor.
          */
         getAncestor(parentOnly?: boolean): Word.Paragraph;
         /**
          *
-         * Gets the list item parent, or the closest ancestor if the parent does not exist. Returns a null object if the list item has no ancester.
+         * Gets the list item parent, or the closest ancestor if the parent does not exist. Returns a null object if the list item has no ancestor.
          *
          * [Api set: WordApi 1.3]
          *
-         * @param parentOnly Optional. Specified only the list item's parent will be returned. The default is false that specifies to get the lowest ancestor.
+         * @param parentOnly Optional. Specifies only the list item's parent will be returned. The default is false that specifies to get the lowest ancestor.
          */
         getAncestorOrNullObject(parentOnly?: boolean): Word.Paragraph;
         /**
@@ -35922,11 +44714,23 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param directChildrenOnly Optional. Specified only the list item's direct children will be returned. The default is false that indicates to get all descendant items.
+         * @param directChildrenOnly Optional. Specifies only the list item's direct children will be returned. The default is false that indicates to get all descendant items.
          */
         getDescendants(directChildrenOnly?: boolean): Word.ParagraphCollection;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.ListItem` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.ListItem` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.ListItem` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ListItemLoadOptions): Word.ListItem;
         load(option?: string | string[]): Word.ListItem;
@@ -35967,7 +44771,7 @@ declare namespace Word {
         readonly font: Word.Font;
         /**
          *
-         * Gets the collection of inlinePicture objects in the paragraph. The collection does not include floating images. Read-only.
+         * Gets the collection of InlinePicture objects in the paragraph. The collection does not include floating images. Read-only.
          *
          * [Api set: WordApi 1.1]
          */
@@ -36093,7 +44897,7 @@ declare namespace Word {
         lineSpacing: number;
         /**
          *
-         * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+         * Gets or sets the amount of spacing, in grid lines, after the paragraph.
          *
          * [Api set: WordApi 1.1]
          */
@@ -36161,10 +44965,20 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         readonly text: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Paragraph): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.ParagraphUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Paragraph): void;
+        set(properties: Word.Paragraph): void;
         /**
          *
          * Lets the paragraph join an existing list at the specified level. Fails if the paragraph cannot join the list or if the paragraph is already a list item.
@@ -36244,7 +45058,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: Word.RangeLocation): Word.Range;
         /**
@@ -36253,7 +45067,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
@@ -36263,7 +45077,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
         getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
@@ -36295,82 +45109,82 @@ declare namespace Word {
         insertContentControl(): Word.ContentControl;
         /**
          *
-         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a document into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted in the paragraph.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts HTML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted in the paragraph.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
         /**
          *
-         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts a picture into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
-         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted in the paragraph.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts OOXML into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted in the paragraph.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
@@ -36419,27 +45233,27 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
-         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start' or 'End'.
+         * Inserts text into the paragraph at the specified location. The insertLocation value can be 'Replace', 'Start', or 'End'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start' or 'End'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', or 'End'.
          */
         insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Performs a search with the specified searchOptions on the scope of the paragraph object. The search results are a collection of range objects.
+         * Performs a search with the specified SearchOptions on the scope of the paragraph object. The search results are a collection of range objects.
          *
          * [Api set: WordApi 1.1]
          *
@@ -36461,7 +45275,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -36470,7 +45284,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
@@ -36481,7 +45295,7 @@ declare namespace Word {
          *
          * @param delimiters Required. The delimiters as an array of strings.
          * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
         split(delimiters: string[], trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
         /**
@@ -36493,6 +45307,18 @@ declare namespace Word {
         startNewList(): Word.List;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Paragraph` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Paragraph` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Paragraph` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ParagraphLoadOptions): Word.Paragraph;
         load(option?: string | string[]): Word.Paragraph;
@@ -36512,7 +45338,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains a collection of [paragraph](paragraph.md) objects.
+     * Contains a collection of {@link Word.Paragraph} objects.
      *
      * [Api set: WordApi 1.1]
      */
@@ -36549,6 +45375,18 @@ declare namespace Word {
         getLastOrNullObject(): Word.Paragraph;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.ParagraphCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.ParagraphCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.ParagraphCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.ParagraphCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.ParagraphCollection;
         load(option?: string | string[]): Word.ParagraphCollection;
@@ -36696,10 +45534,20 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         readonly text: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Range): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.RangeUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Range): void;
+        set(properties: Word.Range): void;
         /**
          *
          * Clears the contents of the range object. The user can perform the undo operation on the cleared content.
@@ -36762,7 +45610,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the returned range. Default is false which indicates that spacing characters at the start and end of the range are included.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the returned range. Default is false which indicates that spacing characters at the start and end of the range are included.
          */
         getNextTextRange(endingMarks: string[], trimSpacing?: boolean): Word.Range;
         /**
@@ -36772,7 +45620,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the returned range. Default is false which indicates that spacing characters at the start and end of the range are included.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the returned range. Default is false which indicates that spacing characters at the start and end of the range are included.
          */
         getNextTextRangeOrNullObject(endingMarks: string[], trimSpacing?: boolean): Word.Range;
         /**
@@ -36788,7 +45636,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: Word.RangeLocation): Word.Range;
         /**
@@ -36797,7 +45645,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After' or 'Content'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', 'After', or 'Content'.
          */
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
@@ -36807,7 +45655,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param endingMarks Required. The punctuation marks and/or other ending marks as an array of strings.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
         getTextRanges(endingMarks: string[], trimSpacing?: boolean): Word.RangeCollection;
         /**
@@ -36839,82 +45687,82 @@ declare namespace Word {
         insertContentControl(): Word.ContentControl;
         /**
          *
-         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertFileFromBase64(base64File: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts a document at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param base64File Required. The base64 encoded content of a .docx file.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertFileFromBase64(base64File: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertHtml(html: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts HTML at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param html Required. The HTML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertHtml(html: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
          *
-         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.2]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: Word.InsertLocation): Word.InlinePicture;
         /**
          *
-         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts a picture at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.2]
          *
          * @param base64EncodedImage Required. The base64 encoded image to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertInlinePictureFromBase64(base64EncodedImage: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.InlinePicture;
         /**
          *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertOoxml(ooxml: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts OOXML at the specified location.  The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param ooxml Required. The OOXML to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertOoxml(ooxml: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
@@ -36963,22 +45811,22 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
-         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertText(text: string, insertLocation: Word.InsertLocation): Word.Range;
         /**
          *
-         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * Inserts text at the specified location. The insertLocation value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          *
          * [Api set: WordApi 1.1]
          *
          * @param text Required. Text to be inserted.
-         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before' or 'After'.
+         * @param insertLocation Required. The value can be 'Replace', 'Start', 'End', 'Before', or 'After'.
          */
         insertText(text: string, insertLocation: "Before" | "After" | "Start" | "End" | "Replace"): Word.Range;
         /**
@@ -37001,7 +45849,7 @@ declare namespace Word {
         intersectWithOrNullObject(range: Word.Range): Word.Range;
         /**
          *
-         * Performs a search with the specified searchOptions on the scope of the range object. The search results are a collection of range objects.
+         * Performs a search with the specified SearchOptions on the scope of the range object. The search results are a collection of range objects.
          *
          * [Api set: WordApi 1.1]
          *
@@ -37023,7 +45871,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -37032,7 +45880,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
@@ -37044,11 +45892,23 @@ declare namespace Word {
          * @param delimiters Required. The delimiters as an array of strings.
          * @param multiParagraphs Optional. Indicates whether a returned child range can cover multiple paragraphs. Default is false which indicates that the paragraph boundaries are also used as delimiters.
          * @param trimDelimiters Optional. Indicates whether to trim delimiters from the ranges in the range collection. Default is false which indicates that the delimiters are included in the ranges returned in the range collection.
-         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
+         * @param trimSpacing Optional. Indicates whether to trim spacing characters (spaces, tabs, column breaks, and paragraph end marks) from the start and end of the ranges returned in the range collection. Default is false which indicates that spacing characters at the start and end of the ranges are included in the range collection.
          */
         split(delimiters: string[], multiParagraphs?: boolean, trimDelimiters?: boolean, trimSpacing?: boolean): Word.RangeCollection;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Range` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Range` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Range` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.RangeLoadOptions): Word.Range;
         load(option?: string | string[]): Word.Range;
@@ -37068,7 +45928,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains a collection of [range](range.md) objects.
+     * Contains a collection of {@link Word.Range} objects.
      *
      * [Api set: WordApi 1.1]
      */
@@ -37091,6 +45951,18 @@ declare namespace Word {
         getFirstOrNullObject(): Word.Range;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.RangeCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.RangeCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.RangeCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.RangeCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.RangeCollection;
         load(option?: string | string[]): Word.RangeCollection;
@@ -37129,7 +46001,7 @@ declare namespace Word {
         ignoreSpace: boolean;
         /**
          *
-         * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+         * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box.
          *
          * [Api set: WordApi 1.1]
          */
@@ -37162,12 +46034,34 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         matchWildcards: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.SearchOptions): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.SearchOptionsUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: SearchOptions): void;
+        set(properties: Word.SearchOptions): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.SearchOptions` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.SearchOptions` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.SearchOptions` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.SearchOptionsLoadOptions): Word.SearchOptions;
         load(option?: string | string[]): Word.SearchOptions;
@@ -37195,17 +46089,27 @@ declare namespace Word {
          * [Api set: WordApi 1.1]
          */
         readonly body: Word.Body;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Section): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.SectionUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Section): void;
+        set(properties: Word.Section): void;
         /**
          *
          * Gets one of the section's footers.
          *
          * [Api set: WordApi 1.1]
          *
-         * @param type Required. The type of footer to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         * @param type Required. The type of footer to return. This value can be: 'Primary', 'FirstPage', or 'EvenPages'.
          */
         getFooter(type: Word.HeaderFooterType): Word.Body;
         /**
@@ -37214,7 +46118,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param type Required. The type of footer to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         * @param type Required. The type of footer to return. This value can be: 'Primary', 'FirstPage', or 'EvenPages'.
          */
         getFooter(type: "Primary" | "FirstPage" | "EvenPages"): Word.Body;
         /**
@@ -37223,7 +46127,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param type Required. The type of header to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         * @param type Required. The type of header to return. This value can be: 'Primary', 'FirstPage', or 'EvenPages'.
          */
         getHeader(type: Word.HeaderFooterType): Word.Body;
         /**
@@ -37232,7 +46136,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.1]
          *
-         * @param type Required. The type of header to return. This value can be: 'primary', 'firstPage' or 'evenPages'.
+         * @param type Required. The type of header to return. This value can be: 'Primary', 'FirstPage', or 'EvenPages'.
          */
         getHeader(type: "Primary" | "FirstPage" | "EvenPages"): Word.Body;
         /**
@@ -37251,6 +46155,18 @@ declare namespace Word {
         getNextOrNullObject(): Word.Section;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Section` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Section` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Section` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.SectionLoadOptions): Word.Section;
         load(option?: string | string[]): Word.Section;
@@ -37270,7 +46186,7 @@ declare namespace Word {
     }
     /**
      *
-     * Contains the collection of the document's [section](section.md) objects.
+     * Contains the collection of the document's {@link Word.Section} objects.
      *
      * [Api set: WordApi 1.1]
      */
@@ -37293,6 +46209,18 @@ declare namespace Word {
         getFirstOrNullObject(): Word.Section;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.SectionCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.SectionCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.SectionCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.SectionCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.SectionCollection;
         load(option?: string | string[]): Word.SectionCollection;
@@ -37386,7 +46314,7 @@ declare namespace Word {
         readonly tables: Word.TableCollection;
         /**
          *
-         * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+         * Gets or sets the alignment of the table against the page column. The value can be 'Left', 'Centered', or 'Right'.
          *
          * [Api set: WordApi 1.3]
          */
@@ -37400,7 +46328,7 @@ declare namespace Word {
         headerRowCount: number;
         /**
          *
-         * Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+         * Gets and sets the horizontal alignment of every cell in the table. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
          *
          * [Api set: WordApi 1.3]
          */
@@ -37428,7 +46356,7 @@ declare namespace Word {
         readonly rowCount: number;
         /**
          *
-         * Gets and sets the shading color.
+         * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
          *
          * [Api set: WordApi 1.3]
          */
@@ -37491,7 +46419,7 @@ declare namespace Word {
         values: string[][];
         /**
          *
-         * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+         * Gets and sets the vertical alignment of every cell in the table. The value can be 'Top', 'Center', or 'Bottom'.
          *
          * [Api set: WordApi 1.3]
          */
@@ -37503,10 +46431,20 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.Table): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Table): void;
+        set(properties: Word.Table): void;
         /**
          *
          * Adds columns to the start or end of the table, using the first or last existing column as a template. This is applicable to uniform tables. The string values, if specified, are set in the newly inserted rows.
@@ -37643,7 +46581,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          */
         getCellPadding(cellPaddingLocation: Word.CellPaddingLocation): OfficeExtension.ClientResult<number>;
         /**
@@ -37652,7 +46590,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          */
         getCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right"): OfficeExtension.ClientResult<number>;
         /**
@@ -37703,7 +46641,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End' or 'After'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', or 'After'.
          */
         getRange(rangeLocation?: Word.RangeLocation): Word.Range;
         /**
@@ -37712,7 +46650,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End' or 'After'.
+         * @param rangeLocation Optional. The range location can be 'Whole', 'Start', 'End', or 'After'.
          */
         getRange(rangeLocation?: "Whole" | "Start" | "End" | "Before" | "After" | "Content"): Word.Range;
         /**
@@ -37768,7 +46706,7 @@ declare namespace Word {
         insertTable(rowCount: number, columnCount: number, insertLocation: "Before" | "After" | "Start" | "End" | "Replace", values?: string[][]): Word.Table;
         /**
          *
-         * Performs a search with the specified searchOptions on the scope of the table object. The search results are a collection of range objects.
+         * Performs a search with the specified SearchOptions on the scope of the table object. The search results are a collection of range objects.
          *
          * [Api set: WordApi 1.3]
          *
@@ -37790,7 +46728,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -37799,7 +46737,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
@@ -37808,7 +46746,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
         setCellPadding(cellPaddingLocation: Word.CellPaddingLocation, cellPadding: number): void;
@@ -37818,12 +46756,24 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
         setCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right", cellPadding: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.Table` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.Table` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.Table` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableLoadOptions): Word.Table;
         load(option?: string | string[]): Word.Table;
@@ -37866,6 +46816,18 @@ declare namespace Word {
         getFirstOrNullObject(): Word.Table;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.TableCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.TableCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.TableCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.TableCollection;
         load(option?: string | string[]): Word.TableCollection;
@@ -37917,7 +46879,7 @@ declare namespace Word {
         readonly cellCount: number;
         /**
          *
-         * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+         * Gets and sets the horizontal alignment of every cell in the row. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
          *
          * [Api set: WordApi 1.3]
          */
@@ -37945,7 +46907,7 @@ declare namespace Word {
         readonly rowIndex: number;
         /**
          *
-         * Gets and sets the shading color.
+         * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
          *
          * [Api set: WordApi 1.3]
          */
@@ -37959,15 +46921,25 @@ declare namespace Word {
         values: string[][];
         /**
          *
-         * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+         * Gets and sets the vertical alignment of the cells in the row. The value can be 'Top', 'Center', or 'Bottom'.
          *
          * [Api set: WordApi 1.3]
          */
         verticalAlignment: Word.VerticalAlignment | "Mixed" | "Top" | "Center" | "Bottom";
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.TableRow): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableRowUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TableRow): void;
+        set(properties: Word.TableRow): void;
         /**
          *
          * Clears the contents of the row.
@@ -38006,7 +46978,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          */
         getCellPadding(cellPaddingLocation: Word.CellPaddingLocation): OfficeExtension.ClientResult<number>;
         /**
@@ -38015,7 +46987,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          */
         getCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right"): OfficeExtension.ClientResult<number>;
         /**
@@ -38056,7 +47028,7 @@ declare namespace Word {
         insertRows(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", rowCount: number, values?: string[][]): Word.TableRowCollection;
         /**
          *
-         * Performs a search with the specified searchOptions on the scope of the row. The search results are a collection of range objects.
+         * Performs a search with the specified SearchOptions on the scope of the row. The search results are a collection of range objects.
          *
          * [Api set: WordApi 1.3]
          *
@@ -38078,7 +47050,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: Word.SelectionMode): void;
         /**
@@ -38087,7 +47059,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param selectionMode Optional. The selection mode can be 'Select', 'Start' or 'End'. 'Select' is the default.
+         * @param selectionMode Optional. The selection mode can be 'Select', 'Start', or 'End'. 'Select' is the default.
          */
         select(selectionMode?: "Select" | "Start" | "End"): void;
         /**
@@ -38096,7 +47068,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
         setCellPadding(cellPaddingLocation: Word.CellPaddingLocation, cellPadding: number): void;
@@ -38106,12 +47078,24 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
         setCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right", cellPadding: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.TableRow` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.TableRow` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.TableRow` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableRowLoadOptions): Word.TableRow;
         load(option?: string | string[]): Word.TableRow;
@@ -38154,6 +47138,18 @@ declare namespace Word {
         getFirstOrNullObject(): Word.TableRow;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.TableRowCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.TableRowCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.TableRowCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableRowCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.TableRowCollection;
         load(option?: string | string[]): Word.TableRowCollection;
@@ -38212,7 +47208,7 @@ declare namespace Word {
         columnWidth: number;
         /**
          *
-         * Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+         * Gets and sets the horizontal alignment of the cell. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
          *
          * [Api set: WordApi 1.3]
          */
@@ -38240,7 +47236,7 @@ declare namespace Word {
         value: string;
         /**
          *
-         * Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+         * Gets and sets the vertical alignment of the cell. The value can be 'Top', 'Center', or 'Bottom'.
          *
          * [Api set: WordApi 1.3]
          */
@@ -38252,10 +47248,20 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         readonly width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.TableCell): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableCellUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TableCell): void;
+        set(properties: Word.TableCell): void;
         /**
          *
          * Deletes the column containing this cell. This is applicable to uniform tables.
@@ -38294,7 +47300,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          */
         getCellPadding(cellPaddingLocation: Word.CellPaddingLocation): OfficeExtension.ClientResult<number>;
         /**
@@ -38303,7 +47309,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          */
         getCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right"): OfficeExtension.ClientResult<number>;
         /**
@@ -38327,7 +47333,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param insertLocation Required. It can be 'Before' or 'After'.
-         * @param columnCount Required. Number of columns to add
+         * @param columnCount Required. Number of columns to add.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
         insertColumns(insertLocation: Word.InsertLocation, columnCount: number, values?: string[][]): void;
@@ -38338,7 +47344,7 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          *
          * @param insertLocation Required. It can be 'Before' or 'After'.
-         * @param columnCount Required. Number of columns to add
+         * @param columnCount Required. Number of columns to add.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
         insertColumns(insertLocation: "Before" | "After" | "Start" | "End" | "Replace", columnCount: number, values?: string[][]): void;
@@ -38370,7 +47376,7 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
         setCellPadding(cellPaddingLocation: Word.CellPaddingLocation, cellPadding: number): void;
@@ -38380,12 +47386,24 @@ declare namespace Word {
          *
          * [Api set: WordApi 1.3]
          *
-         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom' or 'Right'.
+         * @param cellPaddingLocation Required. The cell padding location can be 'Top', 'Left', 'Bottom', or 'Right'.
          * @param cellPadding Required. The cell padding.
          */
         setCellPadding(cellPaddingLocation: "Top" | "Left" | "Bottom" | "Right", cellPadding: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.TableCell` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.TableCell` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.TableCell` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableCellLoadOptions): Word.TableCell;
         load(option?: string | string[]): Word.TableCell;
@@ -38428,6 +47446,18 @@ declare namespace Word {
         getFirstOrNullObject(): Word.TableCell;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.TableCellCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.TableCellCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.TableCellCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableCellCollectionLoadOptions & Word.Interfaces.CollectionLoadOptions): Word.TableCellCollection;
         load(option?: string | string[]): Word.TableCellCollection;
@@ -38444,14 +47474,14 @@ declare namespace Word {
     }
     /**
      *
-     * Specifies the border style
+     * Specifies the border style.
      *
      * [Api set: WordApi 1.3]
      */
     class TableBorder extends OfficeExtension.ClientObject {
         /**
          *
-         * Gets or sets the table border color, as a hex value or name.
+         * Gets or sets the table border color.
          *
          * [Api set: WordApi 1.3]
          */
@@ -38470,12 +47500,34 @@ declare namespace Word {
          * [Api set: WordApi 1.3]
          */
         width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Word.TableBorder): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
         set(properties: Interfaces.TableBorderUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TableBorder): void;
+        set(properties: Word.TableBorder): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Word.TableBorder` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Word.TableBorder` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Word.TableBorder` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Word.Interfaces.TableBorderLoadOptions): Word.TableBorder;
         load(option?: string | string[]): Word.TableBorder;
@@ -38503,8 +47555,23 @@ declare namespace Word {
         unknown = "Unknown",
         richTextInline = "RichTextInline",
         richTextParagraphs = "RichTextParagraphs",
+        /**
+         *
+         * Contains a whole cell.
+         *
+         */
         richTextTableCell = "RichTextTableCell",
+        /**
+         *
+         * Contains a whole row.
+         *
+         */
         richTextTableRow = "RichTextTableRow",
+        /**
+         *
+         * Contains a whole table.
+         *
+         */
         richTextTable = "RichTextTable",
         plainTextInline = "PlainTextInline",
         plainTextParagraph = "PlainTextParagraph",
@@ -38515,6 +47582,11 @@ declare namespace Word {
         dropDownList = "DropDownList",
         datePicker = "DatePicker",
         repeatingSection = "RepeatingSection",
+        /**
+         *
+         * Identifies a rich text content control.
+         *
+         */
         richText = "RichText",
         plainText = "PlainText",
     }
@@ -38525,8 +47597,23 @@ declare namespace Word {
      * [Api set: WordApi]
      */
     enum ContentControlAppearance {
+        /**
+         *
+         * Represents a content control shown as a shaded rectangle or bounding box (with optional title).
+         *
+         */
         boundingBox = "BoundingBox",
+        /**
+         *
+         * Represents a content control shown as start and end markers.
+         *
+         */
         tags = "Tags",
+        /**
+         *
+         * Represents a content control that is not shown.
+         *
+         */
         hidden = "Hidden",
     }
     /**
@@ -38537,6 +47624,11 @@ declare namespace Word {
      */
     enum UnderlineType {
         mixed = "Mixed",
+        /**
+         *
+         * No underline.
+         *
+         */
         none = "None",
         /**
          *
@@ -38548,34 +47640,79 @@ declare namespace Word {
          * @deprecated DotLine is no longer supported.
          */
         dotLine = "DotLine",
+        /**
+         *
+         * A single underline. This is the default value.
+         *
+         */
         single = "Single",
+        /**
+         *
+         * Only underline individual words.
+         *
+         */
         word = "Word",
+        /**
+         *
+         * A double underline.
+         *
+         */
         double = "Double",
+        /**
+         *
+         * A single thick underline.
+         *
+         */
         thick = "Thick",
+        /**
+         *
+         * A dotted underline.
+         *
+         */
         dotted = "Dotted",
         dottedHeavy = "DottedHeavy",
+        /**
+         *
+         * A single dash underline.
+         *
+         */
         dashLine = "DashLine",
         dashLineHeavy = "DashLineHeavy",
         dashLineLong = "DashLineLong",
         dashLineLongHeavy = "DashLineLongHeavy",
+        /**
+         *
+         * An alternating dot-dash underline.
+         *
+         */
         dotDashLine = "DotDashLine",
         dotDashLineHeavy = "DotDashLineHeavy",
+        /**
+         *
+         * An alternating dot-dot-dash underline.
+         *
+         */
         twoDotDashLine = "TwoDotDashLine",
         twoDotDashLineHeavy = "TwoDotDashLineHeavy",
+        /**
+         *
+         * A single wavy underline.
+         *
+         */
         wave = "Wave",
         waveHeavy = "WaveHeavy",
         waveDouble = "WaveDouble",
     }
     /**
      *
-     * Page break, line break, and four section breaks
+     * Specifies the form of a break.
      *
      * [Api set: WordApi]
      */
     enum BreakType {
         /**
          *
-         * Page break.
+         * Page break at the insertion point.
          *
          */
         page = "Page",
@@ -38586,25 +47723,25 @@ declare namespace Word {
         next = "Next",
         /**
          *
-         * Section break, with the new section starting on the next page.
+         * Section break on next page.
          *
          */
         sectionNext = "SectionNext",
         /**
          *
-         * Section break, with the new section starting on the same page.
+         * New section without a corresponding page break.
          *
          */
         sectionContinuous = "SectionContinuous",
         /**
          *
-         * Section break, with the new section starting on the next even-numbered page.
+         * Section break with the next section beginning on the next even-numbered page. If the section break falls on an even-numbered page, Word leaves the next odd-numbered page blank.
          *
          */
         sectionEven = "SectionEven",
         /**
          *
-         * Section break, with the new section starting on the next odd-numbered page.
+         * Section break with the next section beginning on the next odd-numbered page. If the section break falls on an odd-numbered page, Word leaves the next even-numbered page blank.
          *
          */
         sectionOdd = "SectionOdd",
@@ -38622,10 +47759,35 @@ declare namespace Word {
      * [Api set: WordApi]
      */
     enum InsertLocation {
+        /**
+         *
+         * Add content before the contents of the calling object.
+         *
+         */
         before = "Before",
+        /**
+         *
+         * Add content after the contents of the calling object.
+         *
+         */
         after = "After",
+        /**
+         *
+         * Prepend content to the contents of the calling object.
+         *
+         */
         start = "Start",
+        /**
+         *
+         * Append content to the contents of the calling object.
+         *
+         */
         end = "End",
+        /**
+         *
+         * Replace the contents of the current object.
+         *
+         */
         replace = "Replace",
     }
     /**
@@ -38633,18 +47795,58 @@ declare namespace Word {
      */
     enum Alignment {
         mixed = "Mixed",
+        /**
+         *
+         * Unknown alignment.
+         *
+         */
         unknown = "Unknown",
+        /**
+         *
+         * Alignment to the left.
+         *
+         */
         left = "Left",
+        /**
+         *
+         * Alignment to the center.
+         *
+         */
         centered = "Centered",
+        /**
+         *
+         * Alignment to the right.
+         *
+         */
         right = "Right",
+        /**
+         *
+         * Fully justified alignment.
+         *
+         */
         justified = "Justified",
     }
     /**
      * [Api set: WordApi]
      */
     enum HeaderFooterType {
+        /**
+         *
+         * Returns the header or footer on all pages of a section, with the first page or odd pages excluded if they are different.
+         *
+         */
         primary = "Primary",
+        /**
+         *
+         * Returns the header or footer on the first page of a section.
+         *
+         */
         firstPage = "FirstPage",
+        /**
+         *
+         * Returns all headers or footers on even-numbered pages of a section.
+         *
+         */
         evenPages = "EvenPages",
     }
     /**
@@ -38689,30 +47891,130 @@ declare namespace Word {
      * [Api set: WordApi]
      */
     enum RangeLocation {
+        /**
+         *
+         * The object's whole range. If the object is a paragraph content control or table content control, the EOP or Table characters after the content control are also included.
+         *
+         */
         whole = "Whole",
+        /**
+         *
+         * The starting point of the object. For content control, it is the point after the opening tag.
+         *
+         */
         start = "Start",
+        /**
+         *
+         * The ending point of the object. For paragraph, it is the point before the EOP. For content control, it is the point before the closing tag.
+         *
+         */
         end = "End",
+        /**
+         *
+         * For content control only. It is the point before the opening tag.
+         *
+         */
         before = "Before",
+        /**
+         *
+         * The point after the object. If the object is a paragraph content control or table content control, it is the point after the EOP or Table characters.
+         *
+         */
         after = "After",
+        /**
+         *
+         * The range between 'Start' and 'End'.
+         *
+         */
         content = "Content",
     }
     /**
      * [Api set: WordApi]
      */
     enum LocationRelation {
+        /**
+         *
+         * Indicates that this instance and the range are in different sub-documents.
+         *
+         */
         unrelated = "Unrelated",
+        /**
+         *
+         * Indicates that this instance and the range represent the same range.
+         *
+         */
         equal = "Equal",
+        /**
+         *
+         * Indicates that this instance contains the range and that it shares the same start character. The range does not share the same end character as this instance.
+         *
+         */
         containsStart = "ContainsStart",
+        /**
+         *
+         * Indicates that this instance contains the range and that it shares the same end character. The range does not share the same start character as this instance.
+         *
+         */
         containsEnd = "ContainsEnd",
+        /**
+         *
+         * Indicates that this instance contains the range, with the exception of the start and end character of this instance.
+         *
+         */
         contains = "Contains",
+        /**
+         *
+         * Indicates that this instance is inside the range and that it shares the same start character. The range does not share the same end character as this instance.
+         *
+         */
         insideStart = "InsideStart",
+        /**
+         *
+         * Indicates that this instance is inside the range and that it shares the same end character. The range does not share the same start character as this instance.
+         *
+         */
         insideEnd = "InsideEnd",
+        /**
+         *
+         * Indicates that this instance is inside the range. The range does not share the same start and end characters as this instance.
+         *
+         */
         inside = "Inside",
+        /**
+         *
+         * Indicates that this instance occurs before, and is adjacent to, the range.
+         *
+         */
         adjacentBefore = "AdjacentBefore",
+        /**
+         *
+         * Indicates that this instance starts before the range and overlaps the range’s first character.
+         *
+         */
         overlapsBefore = "OverlapsBefore",
+        /**
+         *
+         * Indicates that this instance occurs before the range.
+         *
+         */
         before = "Before",
+        /**
+         *
+         * Indicates that this instance occurs after, and is adjacent to, the range.
+         *
+         */
         adjacentAfter = "AdjacentAfter",
+        /**
+         *
+         * Indicates that this instance starts inside the range and overlaps the range’s last character.
+         *
+         */
         overlapsAfter = "OverlapsAfter",
+        /**
+         *
+         * Indicates that this instance occurs after the range.
+         *
+         */
         after = "After",
     }
     /**
@@ -39056,9 +48358,18 @@ declare namespace Word {
         itemNotFound = "ItemNotFound",
         notImplemented = "NotImplemented",
     }
-    namespace Interfaces {
+    module Interfaces {
+        /**
+        * Provides ways to load properties of only a subset of members of a collection.
+        */
         interface CollectionLoadOptions {
+            /**
+            * Specify the number of items in the queried collection to be included in the result.
+            */
             $top?: number;
+            /**
+            * Specify the number of items in the collection that are to be skipped and not included in the result. If top is specified, the selection of result will start after skipping the specified number of items.
+            */
             $skip?: number;
         }
         /** An interface for updating data on the Body object, for use in "body.set({ ... })". */
@@ -39096,7 +48407,7 @@ declare namespace Word {
             font?: Word.Interfaces.FontUpdateData;
             /**
              *
-             * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             * Gets or sets the appearance of the content control. The value can be 'BoundingBox', 'Tags', or 'Hidden'.
              *
              * [Api set: WordApi 1.1]
              */
@@ -39308,14 +48619,14 @@ declare namespace Word {
             color?: string;
             /**
              *
-             * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+             * Gets or sets a value that indicates whether the font has a double strikethrough. True if the font is formatted as double strikethrough text, otherwise, false.
              *
              * [Api set: WordApi 1.1]
              */
             doubleStrikeThrough?: boolean;
             /**
              *
-             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, or an empty string for mixed highlight colors, or null for no highlight color.
+             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
              * [Api set: WordApi 1.1]
              */
@@ -39343,7 +48654,7 @@ declare namespace Word {
             size?: number;
             /**
              *
-             * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+             * Gets or sets a value that indicates whether the font has a strikethrough. True if the font is formatted as strikethrough text, otherwise, false.
              *
              * [Api set: WordApi 1.1]
              */
@@ -39374,7 +48685,7 @@ declare namespace Word {
         interface InlinePictureUpdateData {
             /**
              *
-             * Gets or sets a string that represents the alternative text associated with the inline image
+             * Gets or sets a string that represents the alternative text associated with the inline image.
              *
              * [Api set: WordApi 1.1]
              */
@@ -39486,7 +48797,7 @@ declare namespace Word {
             lineSpacing?: number;
             /**
              *
-             * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             * Gets or sets the amount of spacing, in grid lines, after the paragraph.
              *
              * [Api set: WordApi 1.1]
              */
@@ -39598,7 +48909,7 @@ declare namespace Word {
             ignoreSpace?: boolean;
             /**
              *
-             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box.
              *
              * [Api set: WordApi 1.1]
              */
@@ -39657,7 +48968,7 @@ declare namespace Word {
             font?: Word.Interfaces.FontUpdateData;
             /**
              *
-             * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             * Gets or sets the alignment of the table against the page column. The value can be 'Left', 'Centered', or 'Right'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39671,14 +48982,14 @@ declare namespace Word {
             headerRowCount?: number;
             /**
              *
-             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
             horizontalAlignment?: Word.Alignment | "Mixed" | "Unknown" | "Left" | "Centered" | "Right" | "Justified";
             /**
              *
-             * Gets and sets the shading color.
+             * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39741,7 +49052,7 @@ declare namespace Word {
             values?: string[][];
             /**
              *
-             * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of every cell in the table. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39769,7 +49080,7 @@ declare namespace Word {
             font?: Word.Interfaces.FontUpdateData;
             /**
              *
-             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39783,7 +49094,7 @@ declare namespace Word {
             preferredHeight?: number;
             /**
              *
-             * Gets and sets the shading color.
+             * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39797,7 +49108,7 @@ declare namespace Word {
             values?: string[][];
             /**
              *
-             * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of the cells in the row. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39825,7 +49136,7 @@ declare namespace Word {
             columnWidth?: number;
             /**
              *
-             * Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of the cell. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39846,7 +49157,7 @@ declare namespace Word {
             value?: string;
             /**
              *
-             * Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of the cell. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39860,7 +49171,7 @@ declare namespace Word {
         interface TableBorderUpdateData {
             /**
              *
-             * Gets or sets the table border color, as a hex value or name.
+             * Gets or sets the table border color.
              *
              * [Api set: WordApi 1.3]
              */
@@ -39898,7 +49209,7 @@ declare namespace Word {
             font?: Word.Interfaces.FontData;
             /**
             *
-            * Gets the collection of inlinePicture objects in the body. The collection does not include floating images. Read-only.
+            * Gets the collection of InlinePicture objects in the body. The collection does not include floating images. Read-only.
             *
             * [Api set: WordApi 1.1]
             */
@@ -40090,7 +49401,7 @@ declare namespace Word {
             tables?: Word.Interfaces.TableData[];
             /**
              *
-             * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             * Gets or sets the appearance of the content control. The value can be 'BoundingBox', 'Tags', or 'Hidden'.
              *
              * [Api set: WordApi 1.1]
              */
@@ -40449,14 +49760,14 @@ declare namespace Word {
             color?: string;
             /**
              *
-             * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+             * Gets or sets a value that indicates whether the font has a double strikethrough. True if the font is formatted as double strikethrough text, otherwise, false.
              *
              * [Api set: WordApi 1.1]
              */
             doubleStrikeThrough?: boolean;
             /**
              *
-             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, or an empty string for mixed highlight colors, or null for no highlight color.
+             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
              * [Api set: WordApi 1.1]
              */
@@ -40484,7 +49795,7 @@ declare namespace Word {
             size?: number;
             /**
              *
-             * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+             * Gets or sets a value that indicates whether the font has a strikethrough. True if the font is formatted as strikethrough text, otherwise, false.
              *
              * [Api set: WordApi 1.1]
              */
@@ -40564,7 +49875,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableData;
             /**
              *
-             * Gets or sets a string that represents the alternative text associated with the inline image
+             * Gets or sets a string that represents the alternative text associated with the inline image.
              *
              * [Api set: WordApi 1.1]
              */
@@ -40634,7 +49945,7 @@ declare namespace Word {
             levelExistences?: boolean[];
             /**
              *
-             * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+             * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number', or 'Picture'. Read-only.
              *
              * [Api set: WordApi 1.3]
              */
@@ -40655,7 +49966,7 @@ declare namespace Word {
             level?: number;
             /**
              *
-             * Gets the list item bullet, number or picture as a string. Read-only.
+             * Gets the list item bullet, number, or picture as a string. Read-only.
              *
              * [Api set: WordApi 1.3]
              */
@@ -40686,7 +49997,7 @@ declare namespace Word {
             font?: Word.Interfaces.FontData;
             /**
             *
-            * Gets the collection of inlinePicture objects in the paragraph. The collection does not include floating images. Read-only.
+            * Gets the collection of InlinePicture objects in the paragraph. The collection does not include floating images. Read-only.
             *
             * [Api set: WordApi 1.1]
             */
@@ -40812,7 +50123,7 @@ declare namespace Word {
             lineSpacing?: number;
             /**
              *
-             * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             * Gets or sets the amount of spacing, in grid lines, after the paragraph.
              *
              * [Api set: WordApi 1.1]
              */
@@ -41036,7 +50347,7 @@ declare namespace Word {
             ignoreSpace?: boolean;
             /**
              *
-             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box.
              *
              * [Api set: WordApi 1.1]
              */
@@ -41158,7 +50469,7 @@ declare namespace Word {
             tables?: Word.Interfaces.TableData[];
             /**
              *
-             * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             * Gets or sets the alignment of the table against the page column. The value can be 'Left', 'Centered', or 'Right'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41172,7 +50483,7 @@ declare namespace Word {
             headerRowCount?: number;
             /**
              *
-             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41200,7 +50511,7 @@ declare namespace Word {
             rowCount?: number;
             /**
              *
-             * Gets and sets the shading color.
+             * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41263,7 +50574,7 @@ declare namespace Word {
             values?: string[][];
             /**
              *
-             * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of every cell in the table. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41312,7 +50623,7 @@ declare namespace Word {
             cellCount?: number;
             /**
              *
-             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41340,7 +50651,7 @@ declare namespace Word {
             rowIndex?: number;
             /**
              *
-             * Gets and sets the shading color.
+             * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41354,7 +50665,7 @@ declare namespace Word {
             values?: string[][];
             /**
              *
-             * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of the cells in the row. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41403,7 +50714,7 @@ declare namespace Word {
             columnWidth?: number;
             /**
              *
-             * Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of the cell. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41431,7 +50742,7 @@ declare namespace Word {
             value?: string;
             /**
              *
-             * Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of the cell. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41452,7 +50763,7 @@ declare namespace Word {
         interface TableBorderData {
             /**
              *
-             * Gets or sets the table border color, as a hex value or name.
+             * Gets or sets the table border color.
              *
              * [Api set: WordApi 1.3]
              */
@@ -41624,7 +50935,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
             /**
              *
-             * Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             * Gets or sets the appearance of the content control. The value can be 'BoundingBox', 'Tags', or 'Hidden'.
              *
              * [Api set: WordApi 1.1]
              */
@@ -41723,7 +51034,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains a collection of [contentControl](contentControl.md) objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
+         * Contains a collection of {@link Word.ContentControl} objects. Content controls are bounded and potentially labeled regions in a document that serve as containers for specific types of content. Individual content controls may contain contents such as images, tables, or paragraphs of formatted text. Currently, only rich text content controls are supported.
          *
          * [Api set: WordApi 1.1]
          */
@@ -41787,7 +51098,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Gets or sets the appearance of the content control. The value can be 'boundingBox', 'tags' or 'hidden'.
+             * For EACH ITEM in the collection: Gets or sets the appearance of the content control. The value can be 'BoundingBox', 'Tags', or 'Hidden'.
              *
              * [Api set: WordApi 1.1]
              */
@@ -41916,7 +51227,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains the collection of [customProperty](customProperty.md) objects.
+         * Contains the collection of {@link Word.CustomProperty} objects.
          *
          * [Api set: WordApi 1.3]
          */
@@ -42163,14 +51474,14 @@ declare namespace Word {
             color?: boolean;
             /**
              *
-             * Gets or sets a value that indicates whether the font has a double strike through. True if the font is formatted as double strikethrough text, otherwise, false.
+             * Gets or sets a value that indicates whether the font has a double strikethrough. True if the font is formatted as double strikethrough text, otherwise, false.
              *
              * [Api set: WordApi 1.1]
              */
             doubleStrikeThrough?: boolean;
             /**
              *
-             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, or an empty string for mixed highlight colors, or null for no highlight color.
+             * Gets or sets the highlight color. To set it, use a value either in the '#RRGGBB' format or the color name. To remove highlight color, set it to null. The returned highlight color can be in the '#RRGGBB' format, an empty string for mixed highlight colors, or null for no highlight color.
              *
              * [Api set: WordApi 1.1]
              */
@@ -42198,7 +51509,7 @@ declare namespace Word {
             size?: boolean;
             /**
              *
-             * Gets or sets a value that indicates whether the font has a strike through. True if the font is formatted as strikethrough text, otherwise, false.
+             * Gets or sets a value that indicates whether the font has a strikethrough. True if the font is formatted as strikethrough text, otherwise, false.
              *
              * [Api set: WordApi 1.1]
              */
@@ -42284,7 +51595,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
             /**
              *
-             * Gets or sets a string that represents the alternative text associated with the inline image
+             * Gets or sets a string that represents the alternative text associated with the inline image.
              *
              * [Api set: WordApi 1.1]
              */
@@ -42327,7 +51638,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains a collection of [inlinePicture](inlinePicture.md) objects.
+         * Contains a collection of {@link Word.InlinePicture} objects.
          *
          * [Api set: WordApi 1.1]
          */
@@ -42384,7 +51695,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Gets or sets a string that represents the alternative text associated with the inline image
+             * For EACH ITEM in the collection: Gets or sets a string that represents the alternative text associated with the inline image.
              *
              * [Api set: WordApi 1.1]
              */
@@ -42427,7 +51738,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains a collection of [paragraph](paragraph.md) objects.
+         * Contains a collection of {@link Word.Paragraph} objects.
          *
          * [Api set: WordApi 1.3]
          */
@@ -42449,7 +51760,7 @@ declare namespace Word {
             levelExistences?: boolean;
             /**
              *
-             * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+             * Gets all 9 level types in the list. Each type can be 'Bullet', 'Number', or 'Picture'. Read-only.
              *
              * [Api set: WordApi 1.3]
              */
@@ -42457,7 +51768,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains a collection of [list](list.md) objects.
+         * Contains a collection of {@link Word.List} objects.
          *
          * [Api set: WordApi 1.3]
          */
@@ -42479,7 +51790,7 @@ declare namespace Word {
             levelExistences?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets all 9 level types in the list. Each type can be 'Bullet', 'Number' or 'Picture'. Read-only.
+             * For EACH ITEM in the collection: Gets all 9 level types in the list. Each type can be 'Bullet', 'Number', or 'Picture'. Read-only.
              *
              * [Api set: WordApi 1.3]
              */
@@ -42502,7 +51813,7 @@ declare namespace Word {
             level?: boolean;
             /**
              *
-             * Gets the list item bullet, number or picture as a string. Read-only.
+             * Gets the list item bullet, number, or picture as a string. Read-only.
              *
              * [Api set: WordApi 1.3]
              */
@@ -42651,7 +51962,7 @@ declare namespace Word {
             lineSpacing?: boolean;
             /**
              *
-             * Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             * Gets or sets the amount of spacing, in grid lines, after the paragraph.
              *
              * [Api set: WordApi 1.1]
              */
@@ -42722,7 +52033,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains a collection of [paragraph](paragraph.md) objects.
+         * Contains a collection of {@link Word.Paragraph} objects.
          *
          * [Api set: WordApi 1.1]
          */
@@ -42856,7 +52167,7 @@ declare namespace Word {
             lineSpacing?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets or sets the amount of spacing, in grid lines. after the paragraph.
+             * For EACH ITEM in the collection: Gets or sets the amount of spacing, in grid lines, after the paragraph.
              *
              * [Api set: WordApi 1.1]
              */
@@ -43027,7 +52338,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains a collection of [range](range.md) objects.
+         * Contains a collection of {@link Word.Range} objects.
          *
          * [Api set: WordApi 1.1]
          */
@@ -43149,7 +52460,7 @@ declare namespace Word {
             ignoreSpace?: boolean;
             /**
              *
-             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box (Edit menu).
+             * Gets or sets a value that indicates whether to perform a case sensitive search. Corresponds to the Match case check box in the Find and Replace dialog box.
              *
              * [Api set: WordApi 1.1]
              */
@@ -43201,7 +52512,7 @@ declare namespace Word {
         }
         /**
          *
-         * Contains the collection of the document's [section](section.md) objects.
+         * Contains the collection of the document's {@link Word.Section} objects.
          *
          * [Api set: WordApi 1.1]
          */
@@ -43281,7 +52592,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
             /**
              *
-             * Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             * Gets or sets the alignment of the table against the page column. The value can be 'Left', 'Centered', or 'Right'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43295,7 +52606,7 @@ declare namespace Word {
             headerRowCount?: boolean;
             /**
              *
-             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of every cell in the table. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43323,7 +52634,7 @@ declare namespace Word {
             rowCount?: boolean;
             /**
              *
-             * Gets and sets the shading color.
+             * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43386,7 +52697,7 @@ declare namespace Word {
             values?: boolean;
             /**
              *
-             * Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of every cell in the table. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43465,7 +52776,7 @@ declare namespace Word {
             parentTableOrNullObject?: Word.Interfaces.TableLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Gets or sets the alignment of the table against the page column. The value can be 'left', 'centered' or 'right'.
+             * For EACH ITEM in the collection: Gets or sets the alignment of the table against the page column. The value can be 'Left', 'Centered', or 'Right'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43479,7 +52790,7 @@ declare namespace Word {
             headerRowCount?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of every cell in the table. The value can be 'left', 'centered', 'right', or 'justified'.
+             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of every cell in the table. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43507,7 +52818,7 @@ declare namespace Word {
             rowCount?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the shading color.
+             * For EACH ITEM in the collection: Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43570,7 +52881,7 @@ declare namespace Word {
             values?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the vertical alignment of every cell in the table. The value can be 'top', 'center' or 'bottom'.
+             * For EACH ITEM in the collection: Gets and sets the vertical alignment of every cell in the table. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43614,7 +52925,7 @@ declare namespace Word {
             cellCount?: boolean;
             /**
              *
-             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of every cell in the row. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43642,7 +52953,7 @@ declare namespace Word {
             rowIndex?: boolean;
             /**
              *
-             * Gets and sets the shading color.
+             * Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43656,7 +52967,7 @@ declare namespace Word {
             values?: boolean;
             /**
              *
-             * Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of the cells in the row. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43693,7 +53004,7 @@ declare namespace Word {
             cellCount?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of every cell in the row. The value can be 'left', 'centered', 'right', or 'justified'.
+             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of every cell in the row. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43721,7 +53032,7 @@ declare namespace Word {
             rowIndex?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the shading color.
+             * For EACH ITEM in the collection: Gets and sets the shading color. Color is specified in "#RRGGBB" format or by using the color name.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43735,7 +53046,7 @@ declare namespace Word {
             values?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the vertical alignment of the cells in the row. The value can be 'top', 'center' or 'bottom'.
+             * For EACH ITEM in the collection: Gets and sets the vertical alignment of the cells in the row. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43786,7 +53097,7 @@ declare namespace Word {
             columnWidth?: boolean;
             /**
              *
-             * Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             * Gets and sets the horizontal alignment of the cell. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43814,7 +53125,7 @@ declare namespace Word {
             value?: boolean;
             /**
              *
-             * Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             * Gets and sets the vertical alignment of the cell. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43872,7 +53183,7 @@ declare namespace Word {
             columnWidth?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of the cell. The value can be 'left', 'centered', 'right', or 'justified'.
+             * For EACH ITEM in the collection: Gets and sets the horizontal alignment of the cell. The value can be 'Left', 'Centered', 'Right', or 'Justified'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43900,7 +53211,7 @@ declare namespace Word {
             value?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets and sets the vertical alignment of the cell. The value can be 'top', 'center' or 'bottom'.
+             * For EACH ITEM in the collection: Gets and sets the vertical alignment of the cell. The value can be 'Top', 'Center', or 'Bottom'.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43915,7 +53226,7 @@ declare namespace Word {
         }
         /**
          *
-         * Specifies the border style
+         * Specifies the border style.
          *
          * [Api set: WordApi 1.3]
          */
@@ -43923,7 +53234,7 @@ declare namespace Word {
             $all?: boolean;
             /**
              *
-             * Gets or sets the table border color, as a hex value or name.
+             * Gets or sets the table border color.
              *
              * [Api set: WordApi 1.3]
              */
@@ -43969,6 +53280,13 @@ declare namespace Word {
      * Executes a batch script that performs actions on the Word object model, using the RequestContext of previously-created API objects.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared RequestContext, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in a RequestContext and returns a promise (typically, just the result of "context.sync()"). The context parameter facilitates requests to the Word application. Since the Office add-in and the Word application run in two different processes, the RequestContext is required to get access to the Word object model from the add-in.
+     * 
+     * @remarks
+     * In addition to this signature, the method also has the following signatures:
+     * 
+     * `run<T>(batch: (context: Word.RequestContext) => Promise<T>): Promise<T>;`
+     * 
+     * `run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Word.RequestContext) => Promise<T>): Promise<T>;`
      */
     function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Word.RequestContext) => Promise<T>): Promise<T>;
 }
@@ -44051,14 +53369,14 @@ declare namespace OneNote {
          *
          * Gets the active Paragraph if one exists, If no Paragraph is active, throws ItemNotFound.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         getActiveParagraph(): OneNote.Paragraph;
         /**
          *
          * Gets the active Paragraph if one exists, otherwise returns null.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         getActiveParagraphOrNull(): OneNote.Paragraph;
         /**
@@ -44075,15 +53393,9 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         getActiveSectionOrNull(): OneNote.Section;
-        /**
-         *
-         * The collection of pages in the section. Read only
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        getSelectedPages(): OneNote.PageCollection;
-        getWindowSize(): OfficeExtension.ClientResult<Array<number>>;
+        getWindowSize(): OfficeExtension.ClientResult<number[]>;
         insertHtmlAtCurrentPosition(html: string): void;
+        isViewingDeletedNotes(): OfficeExtension.ClientResult<boolean>;
         /**
          *
          * Opens the specified page in the application instance.
@@ -44104,6 +53416,18 @@ declare namespace OneNote {
         navigateToPageWithClientUrl(url: string): OneNote.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Application` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Application` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Application` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.ApplicationLoadOptions): OneNote.Application;
         load(option?: string | string[]): OneNote.Application;
@@ -44127,13 +53451,6 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly page: OneNote.Page;
-        /**
-         *
-         * Gets the ink analysis paragraphs in this page. Read-only.
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        readonly paragraphs: OneNote.InkAnalysisParagraphCollection;
         /**
          *
          * Gets the ID of the InkAnalysis object. Read-only.
@@ -44141,17 +53458,34 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly id: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.InkAnalysisUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.InkAnalysis): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.InkAnalysisUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: InkAnalysis): void;
+        set(properties: OneNote.InkAnalysis): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysis` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysis` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysis` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisLoadOptions): OneNote.InkAnalysis;
         load(option?: string | string[]): OneNote.InkAnalysis;
@@ -44197,17 +53531,34 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly id: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.InkAnalysisParagraphUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.InkAnalysisParagraph): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.InkAnalysisParagraphUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: InkAnalysisParagraph): void;
+        set(properties: OneNote.InkAnalysisParagraph): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysisParagraph` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysisParagraph` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysisParagraph` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisParagraphLoadOptions): OneNote.InkAnalysisParagraph;
         load(option?: string | string[]): OneNote.InkAnalysisParagraph;
@@ -44233,7 +53584,7 @@ declare namespace OneNote {
      */
     class InkAnalysisParagraphCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.InkAnalysisParagraph>;
+        readonly items: OneNote.InkAnalysisParagraph[];
         /**
          *
          * Returns the number of InkAnalysisParagraphs in the page. Read-only.
@@ -44261,6 +53612,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.InkAnalysisParagraph;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysisParagraphCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysisParagraphCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysisParagraphCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisParagraphCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkAnalysisParagraphCollection;
         load(option?: string | string[]): OneNote.InkAnalysisParagraphCollection;
@@ -44303,17 +53666,34 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly id: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.InkAnalysisLineUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.InkAnalysisLine): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.InkAnalysisLineUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: InkAnalysisLine): void;
+        set(properties: OneNote.InkAnalysisLine): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysisLine` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysisLine` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysisLine` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisLineLoadOptions): OneNote.InkAnalysisLine;
         load(option?: string | string[]): OneNote.InkAnalysisLine;
@@ -44339,7 +53719,7 @@ declare namespace OneNote {
      */
     class InkAnalysisLineCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.InkAnalysisLine>;
+        readonly items: OneNote.InkAnalysisLine[];
         /**
          *
          * Returns the number of InkAnalysisLines in the page. Read-only.
@@ -44367,6 +53747,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.InkAnalysisLine;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysisLineCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysisLineCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysisLineCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisLineCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkAnalysisLineCollection;
         load(option?: string | string[]): OneNote.InkAnalysisLineCollection;
@@ -44415,25 +53807,42 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        readonly strokePointers: Array<OneNote.InkStrokePointer>;
+        readonly strokePointers: OneNote.InkStrokePointer[];
         /**
          *
          * The words that were recognized in this ink word, in order of likelihood. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        readonly wordAlternates: Array<string>;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.InkAnalysisWordUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        readonly wordAlternates: string[];
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.InkAnalysisWord): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.InkAnalysisWordUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: InkAnalysisWord): void;
+        set(properties: OneNote.InkAnalysisWord): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysisWord` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysisWord` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysisWord` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisWordLoadOptions): OneNote.InkAnalysisWord;
         load(option?: string | string[]): OneNote.InkAnalysisWord;
@@ -44459,7 +53868,7 @@ declare namespace OneNote {
      */
     class InkAnalysisWordCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.InkAnalysisWord>;
+        readonly items: OneNote.InkAnalysisWord[];
         /**
          *
          * Returns the number of InkAnalysisWords in the page. Read-only.
@@ -44487,6 +53896,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.InkAnalysisWord;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkAnalysisWordCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkAnalysisWordCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkAnalysisWordCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkAnalysisWordCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkAnalysisWordCollection;
         load(option?: string | string[]): OneNote.InkAnalysisWordCollection;
@@ -44531,6 +53952,18 @@ declare namespace OneNote {
         readonly id: string;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.FloatingInk` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.FloatingInk` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.FloatingInk` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.FloatingInkLoadOptions): OneNote.FloatingInk;
         load(option?: string | string[]): OneNote.FloatingInk;
@@ -44571,6 +54004,18 @@ declare namespace OneNote {
         readonly id: string;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkStroke` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkStroke` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkStroke` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkStrokeLoadOptions): OneNote.InkStroke;
         load(option?: string | string[]): OneNote.InkStroke;
@@ -44596,7 +54041,7 @@ declare namespace OneNote {
      */
     class InkStrokeCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.InkStroke>;
+        readonly items: OneNote.InkStroke[];
         /**
          *
          * Returns the number of InkStrokes in the page. Read-only.
@@ -44624,6 +54069,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.InkStroke;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkStrokeCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkStrokeCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkStrokeCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkStrokeCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkStrokeCollection;
         load(option?: string | string[]): OneNote.InkStrokeCollection;
@@ -44670,11 +54127,23 @@ declare namespace OneNote {
          *
          * The words that were recognized in this ink word, in order of likelihood. Read-only.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
-        readonly wordAlternates: Array<string>;
+        readonly wordAlternates: string[];
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkWord` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkWord` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkWord` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkWordLoadOptions): OneNote.InkWord;
         load(option?: string | string[]): OneNote.InkWord;
@@ -44700,7 +54169,7 @@ declare namespace OneNote {
      */
     class InkWordCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.InkWord>;
+        readonly items: OneNote.InkWord[];
         /**
          *
          * Returns the number of InkWords in the page. Read-only.
@@ -44728,6 +54197,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.InkWord;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.InkWordCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.InkWordCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.InkWordCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.InkWordCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.InkWordCollection;
         load(option?: string | string[]): OneNote.InkWordCollection;
@@ -44784,6 +54265,13 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly id: string;
+        /**
+         *
+         * True if the Notebook is not created by the user (i.e. 'Misplaced Sections'). Read only
+         *
+         * [Api set: OneNoteApi 1.2]
+         */
+        readonly isVirtual: boolean;
         /**
          *
          * Gets the name of the notebook. Read-only.
@@ -44813,11 +54301,23 @@ declare namespace OneNote {
          *
          * Gets the REST API ID.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Notebook` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Notebook` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Notebook` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.NotebookLoadOptions): OneNote.Notebook;
         load(option?: string | string[]): OneNote.Notebook;
@@ -44843,7 +54343,7 @@ declare namespace OneNote {
      */
     class NotebookCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.Notebook>;
+        readonly items: OneNote.Notebook[];
         /**
          *
          * Returns the number of notebooks in the collection. Read-only.
@@ -44880,6 +54380,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.Notebook;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.NotebookCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.NotebookCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.NotebookCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.NotebookCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.NotebookCollection;
         load(option?: string | string[]): OneNote.NotebookCollection;
@@ -44979,11 +54491,23 @@ declare namespace OneNote {
          *
          * Gets the REST API ID.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.SectionGroup` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.SectionGroup` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.SectionGroup` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.SectionGroupLoadOptions): OneNote.SectionGroup;
         load(option?: string | string[]): OneNote.SectionGroup;
@@ -45009,7 +54533,7 @@ declare namespace OneNote {
      */
     class SectionGroupCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.SectionGroup>;
+        readonly items: OneNote.SectionGroup[];
         /**
          *
          * Returns the number of section groups in the collection. Read-only.
@@ -45046,6 +54570,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.SectionGroup;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.SectionGroupCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.SectionGroupCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.SectionGroupCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.SectionGroupCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.SectionGroupCollection;
         load(option?: string | string[]): OneNote.SectionGroupCollection;
@@ -45109,6 +54645,20 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly id: string;
+        /**
+         *
+         * True if this section is encrypted with a password. Read only
+         *
+         * [Api set: OneNoteApi 1.2]
+         */
+        readonly isEncrypted: boolean;
+        /**
+         *
+         * True if this section is locked. Read only
+         *
+         * [Api set: OneNoteApi 1.2]
+         */
+        readonly isLocked: boolean;
         /**
          *
          * Gets the name of the section. Read-only.
@@ -45154,7 +54704,7 @@ declare namespace OneNote {
          *
          * Gets the REST API ID.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
@@ -45166,9 +54716,31 @@ declare namespace OneNote {
          * @param location The location of the new section relative to the current section.
          * @param title The name of the new section.
          */
-        insertSectionAsSibling(location: string, title: string): OneNote.Section;
+        insertSectionAsSibling(location: OneNote.InsertLocation, title: string): OneNote.Section;
+        /**
+         *
+         * Inserts a new section before or after the current section.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param location The location of the new section relative to the current section.
+         * @param title The name of the new section.
+         */
+        insertSectionAsSibling(location: "Before" | "After", title: string): OneNote.Section;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Section` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Section` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Section` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.SectionLoadOptions): OneNote.Section;
         load(option?: string | string[]): OneNote.Section;
@@ -45194,7 +54766,7 @@ declare namespace OneNote {
      */
     class SectionCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.Section>;
+        readonly items: OneNote.Section[];
         /**
          *
          * Returns the number of sections in the collection. Read-only.
@@ -45231,6 +54803,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.Section;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.SectionCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.SectionCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.SectionCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.SectionCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.SectionCollection;
         load(option?: string | string[]): OneNote.SectionCollection;
@@ -45315,15 +54899,20 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly webUrl: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.PageUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.Page): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.PageUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Page): void;
+        set(properties: OneNote.Page): void;
         /**
          *
          * Adds an Outline to the page at the specified position.
@@ -45332,14 +54921,14 @@ declare namespace OneNote {
          *
          * @param left The left position of the top, left corner of the Outline.
          * @param top The top position of the top, left corner of the Outline.
-         * @param html An HTML string that describes the visual presentation of the Outline. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
+         * @param html An HTML string that describes the visual presentation of the Outline. See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/onenote/onenote-add-ins-page-content#supported-html | Supported HTML} for the OneNote add-ins JavaScript API.
          */
         addOutline(left: number, top: number, html: string): OneNote.Outline;
         /**
          *
          * Return a json string with node id and content in html format.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         analyzePage(): OfficeExtension.ClientResult<string>;
         /**
@@ -45371,14 +54960,14 @@ declare namespace OneNote {
          *
          * Gets the REST API ID.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         getRestApiId(): OfficeExtension.ClientResult<string>;
         /**
          *
          * Does the page has content title.
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          */
         hasTitleContent(): OfficeExtension.ClientResult<boolean>;
         /**
@@ -45390,9 +54979,31 @@ declare namespace OneNote {
          * @param location The location of the new page relative to the current page.
          * @param title The title of the new page.
          */
-        insertPageAsSibling(location: string, title: string): OneNote.Page;
+        insertPageAsSibling(location: OneNote.InsertLocation, title: string): OneNote.Page;
+        /**
+         *
+         * Inserts a new page before or after the current page.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param location The location of the new page relative to the current page.
+         * @param title The title of the new page.
+         */
+        insertPageAsSibling(location: "Before" | "After", title: string): OneNote.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Page` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Page` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Page` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.PageLoadOptions): OneNote.Page;
         load(option?: string | string[]): OneNote.Page;
@@ -45418,7 +55029,7 @@ declare namespace OneNote {
      */
     class PageCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.Page>;
+        readonly items: OneNote.Page[];
         /**
          *
          * Returns the number of pages in the collection. Read-only.
@@ -45455,6 +55066,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.PageCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.PageCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.PageCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.PageCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.PageCollection;
         load(option?: string | string[]): OneNote.PageCollection;
@@ -45531,16 +55154,21 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        readonly type: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.PageContentUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        readonly type: OneNote.PageContentType | "Outline" | "Image" | "Ink" | "Other";
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.PageContent): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.PageContentUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: PageContent): void;
+        set(properties: OneNote.PageContent): void;
         /**
          *
          * Deletes the PageContent object.
@@ -45550,6 +55178,18 @@ declare namespace OneNote {
         delete(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.PageContent` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.PageContent` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.PageContent` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.PageContentLoadOptions): OneNote.PageContent;
         load(option?: string | string[]): OneNote.PageContent;
@@ -45575,7 +55215,7 @@ declare namespace OneNote {
      */
     class PageContentCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.PageContent>;
+        readonly items: OneNote.PageContent[];
         /**
          *
          * Returns the number of page contents in the collection. Read-only.
@@ -45603,6 +55243,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.PageContent;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.PageContentCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.PageContentCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.PageContentCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.PageContentCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.PageContentCollection;
         load(option?: string | string[]): OneNote.PageContentCollection;
@@ -45651,7 +55303,7 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          *
-         * @param html The HTML string to append. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
+         * @param html The HTML string to append. See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/onenote/onenote-add-ins-page-content#supported-html | Supported HTML} for the OneNote add-ins JavaScript API.
          */
         appendHtml(html: string): void;
         /**
@@ -45684,7 +55336,7 @@ declare namespace OneNote {
          * @param columnCount Required. The number of columns in the table.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        appendTable(rowCount: number, columnCount: number, values?: Array<Array<string>>): OneNote.Table;
+        appendTable(rowCount: number, columnCount: number, values?: string[][]): OneNote.Table;
         /**
          *
          * Check if the outline is title outline.
@@ -45694,6 +55346,18 @@ declare namespace OneNote {
         isTitle(): OfficeExtension.ClientResult<boolean>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Outline` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Outline` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Outline` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.OutlineLoadOptions): OneNote.Outline;
         load(option?: string | string[]): OneNote.Outline;
@@ -45801,16 +55465,21 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        readonly type: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ParagraphUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        readonly type: OneNote.ParagraphType | "RichText" | "Image" | "Table" | "Ink" | "Other";
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.Paragraph): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.ParagraphUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Paragraph): void;
+        set(properties: OneNote.Paragraph): void;
         /**
          *
          * Add NoteTag to the paragraph.
@@ -45820,7 +55489,17 @@ declare namespace OneNote {
          * @param type The type of the NoteTag.
          * @param status The status of the NoteTag.
          */
-        addNoteTag(type: string, status: string): OneNote.NoteTag;
+        addNoteTag(type: OneNote.NoteTagType, status: OneNote.NoteTagStatus): OneNote.NoteTag;
+        /**
+         *
+         * Add NoteTag to the paragraph.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param type The type of the NoteTag.
+         * @param status The status of the NoteTag.
+         */
+        addNoteTag(type: "Unknown" | "ToDo" | "Important" | "Question" | "Contact" | "Address" | "PhoneNumber" | "Website" | "Idea" | "Critical" | "ToDoPriority1" | "ToDoPriority2", status: "Unknown" | "Normal" | "Completed" | "Disabled" | "OutlookTask" | "TaskNotSyncedYet" | "TaskRemoved"): OneNote.NoteTag;
         /**
          *
          * Deletes the paragraph
@@ -45842,9 +55521,19 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          *
          * @param insertLocation The location of new contents relative to the current Paragraph.
-         * @param html An HTML string that describes the visual presentation of the content. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
+         * @param html An HTML string that describes the visual presentation of the content. See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/onenote/onenote-add-ins-page-content#supported-html | Supported HTML} for the OneNote add-ins JavaScript API.
          */
-        insertHtmlAsSibling(insertLocation: string, html: string): void;
+        insertHtmlAsSibling(insertLocation: OneNote.InsertLocation, html: string): void;
+        /**
+         *
+         * Inserts the specified HTML content
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param insertLocation The location of new contents relative to the current Paragraph.
+         * @param html An HTML string that describes the visual presentation of the content. See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/onenote/onenote-add-ins-page-content#supported-html | Supported HTML} for the OneNote add-ins JavaScript API.
+         */
+        insertHtmlAsSibling(insertLocation: "Before" | "After", html: string): void;
         /**
          *
          * Inserts the image at the specified insert location..
@@ -45856,7 +55545,19 @@ declare namespace OneNote {
          * @param width Optional. Width in the unit of Points. The default value is null and image width will be respected.
          * @param height Optional. Height in the unit of Points. The default value is null and image height will be respected.
          */
-        insertImageAsSibling(insertLocation: string, base64EncodedImage: string, width: number, height: number): OneNote.Image;
+        insertImageAsSibling(insertLocation: OneNote.InsertLocation, base64EncodedImage: string, width: number, height: number): OneNote.Image;
+        /**
+         *
+         * Inserts the image at the specified insert location..
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param insertLocation The location of the table relative to the current Paragraph.
+         * @param base64EncodedImage HTML string to append.
+         * @param width Optional. Width in the unit of Points. The default value is null and image width will be respected.
+         * @param height Optional. Height in the unit of Points. The default value is null and image height will be respected.
+         */
+        insertImageAsSibling(insertLocation: "Before" | "After", base64EncodedImage: string, width: number, height: number): OneNote.Image;
         /**
          *
          * Inserts the paragraph text at the specifiec insert location.
@@ -45866,7 +55567,17 @@ declare namespace OneNote {
          * @param insertLocation The location of the table relative to the current Paragraph.
          * @param paragraphText HTML string to append.
          */
-        insertRichTextAsSibling(insertLocation: string, paragraphText: string): OneNote.RichText;
+        insertRichTextAsSibling(insertLocation: OneNote.InsertLocation, paragraphText: string): OneNote.RichText;
+        /**
+         *
+         * Inserts the paragraph text at the specifiec insert location.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param insertLocation The location of the table relative to the current Paragraph.
+         * @param paragraphText HTML string to append.
+         */
+        insertRichTextAsSibling(insertLocation: "Before" | "After", paragraphText: string): OneNote.RichText;
         /**
          *
          * Adds a table with the specified number of rows and columns before or after the current paragraph.
@@ -45878,9 +55589,33 @@ declare namespace OneNote {
          * @param columnCount The number of columns in the table.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        insertTableAsSibling(insertLocation: string, rowCount: number, columnCount: number, values?: Array<Array<string>>): OneNote.Table;
+        insertTableAsSibling(insertLocation: OneNote.InsertLocation, rowCount: number, columnCount: number, values?: string[][]): OneNote.Table;
+        /**
+         *
+         * Adds a table with the specified number of rows and columns before or after the current paragraph.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param insertLocation The location of the table relative to the current Paragraph.
+         * @param rowCount The number of rows in the table.
+         * @param columnCount The number of columns in the table.
+         * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
+         */
+        insertTableAsSibling(insertLocation: "Before" | "After", rowCount: number, columnCount: number, values?: string[][]): OneNote.Table;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Paragraph` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Paragraph` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Paragraph` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.ParagraphLoadOptions): OneNote.Paragraph;
         load(option?: string | string[]): OneNote.Paragraph;
@@ -45906,7 +55641,7 @@ declare namespace OneNote {
      */
     class ParagraphCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.Paragraph>;
+        readonly items: OneNote.Paragraph[];
         /**
          *
          * Returns the number of paragraphs in the page. Read-only.
@@ -45934,6 +55669,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.Paragraph;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.ParagraphCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.ParagraphCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.ParagraphCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.ParagraphCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.ParagraphCollection;
         load(option?: string | string[]): OneNote.ParagraphCollection;
@@ -45968,16 +55715,28 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        readonly status: string;
+        readonly status: OneNote.NoteTagStatus | "Unknown" | "Normal" | "Completed" | "Disabled" | "OutlookTask" | "TaskNotSyncedYet" | "TaskRemoved";
         /**
          *
          * Gets the type of the NoteTag object. Read-only.
          *
          * [Api set: OneNoteApi 1.1]
          */
-        readonly type: string;
+        readonly type: OneNote.NoteTagType | "Unknown" | "ToDo" | "Important" | "Question" | "Contact" | "Address" | "PhoneNumber" | "Website" | "Idea" | "Critical" | "ToDoPriority1" | "ToDoPriority2";
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.NoteTag` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.NoteTag` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.NoteTag` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.NoteTagLoadOptions): OneNote.NoteTag;
         load(option?: string | string[]): OneNote.NoteTag;
@@ -46034,12 +55793,24 @@ declare namespace OneNote {
          *
          * Get the HTML of the rich text
          *
-         * [Api set: OneNoteApi]
+         * [Api set: OneNoteApi 1.1]
          * @returns The html of the rich text
          */
         getHtml(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.RichText` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.RichText` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.RichText` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.RichTextLoadOptions): OneNote.RichText;
         load(option?: string | string[]): OneNote.RichText;
@@ -46120,15 +55891,20 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ImageUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.Image): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.ImageUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Image): void;
+        set(properties: OneNote.Image): void;
         /**
          *
          * Gets the base64-encoded binary representation of the Image.
@@ -46139,6 +55915,18 @@ declare namespace OneNote {
         getBase64Image(): OfficeExtension.ClientResult<string>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Image` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Image` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Image` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.ImageLoadOptions): OneNote.Image;
         load(option?: string | string[]): OneNote.Image;
@@ -46205,15 +55993,20 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         readonly rowCount: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.Table): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.TableUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Table): void;
+        set(properties: OneNote.Table): void;
         /**
          *
          * Adds a column to the end of the table. Values, if specified, are set in the new column. Otherwise the column is empty.
@@ -46222,7 +56015,7 @@ declare namespace OneNote {
          *
          * @param values Optional. Strings to insert in the new column, specified as an array. Must not have more values than rows in the table.
          */
-        appendColumn(values?: Array<string>): void;
+        appendColumn(values?: string[]): void;
         /**
          *
          * Adds a row to the end of the table. Values, if specified, are set in the new row. Otherwise the row is empty.
@@ -46231,7 +56024,7 @@ declare namespace OneNote {
          *
          * @param values Optional. Strings to insert in the new row, specified as an array. Must not have more values than columns in the table.
          */
-        appendRow(values?: Array<string>): OneNote.TableRow;
+        appendRow(values?: string[]): OneNote.TableRow;
         /**
          *
          * Clears the contents of the table.
@@ -46258,7 +56051,7 @@ declare namespace OneNote {
          * @param index Index where the column will be inserted in the table.
          * @param values Optional. Strings to insert in the new column, specified as an array. Must not have more values than rows in the table.
          */
-        insertColumn(index: number, values?: Array<string>): void;
+        insertColumn(index: number, values?: string[]): void;
         /**
          *
          * Inserts a row at the given index in the table. Values, if specified, are set in the new row. Otherwise the row is empty.
@@ -46268,10 +56061,29 @@ declare namespace OneNote {
          * @param index Index where the row will be inserted in the table.
          * @param values Optional. Strings to insert in the new row, specified as an array. Must not have more values than columns in the table.
          */
-        insertRow(index: number, values?: Array<string>): OneNote.TableRow;
+        insertRow(index: number, values?: string[]): OneNote.TableRow;
+        /**
+         *
+         * Sets the shading color of all cells in the table.
+            The color code to set the cells to.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
         setShadingColor(colorCode: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.Table` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.Table` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.Table` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.TableLoadOptions): OneNote.Table;
         load(option?: string | string[]): OneNote.Table;
@@ -46347,10 +56159,39 @@ declare namespace OneNote {
          * @param insertLocation Where the new rows should be inserted relative to the current row.
          * @param values Strings to insert in the new row, specified as an array. Must not have more cells than in the current row. Optional.
          */
-        insertRowAsSibling(insertLocation: string, values?: Array<string>): OneNote.TableRow;
+        insertRowAsSibling(insertLocation: OneNote.InsertLocation, values?: string[]): OneNote.TableRow;
+        /**
+         *
+         * Inserts a row before or after the current row.
+         *
+         * [Api set: OneNoteApi 1.1]
+         *
+         * @param insertLocation Where the new rows should be inserted relative to the current row.
+         * @param values Strings to insert in the new row, specified as an array. Must not have more cells than in the current row. Optional.
+         */
+        insertRowAsSibling(insertLocation: "Before" | "After", values?: string[]): OneNote.TableRow;
+        /**
+         *
+         * Sets the shading color of all cells in the row.
+            The color code to set the cells to.
+         *
+         * [Api set: OneNoteApi 1.1]
+         */
         setShadingColor(colorCode: string): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.TableRow` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.TableRow` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.TableRow` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.TableRowLoadOptions): OneNote.TableRow;
         load(option?: string | string[]): OneNote.TableRow;
@@ -46376,7 +56217,7 @@ declare namespace OneNote {
      */
     class TableRowCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.TableRow>;
+        readonly items: OneNote.TableRow[];
         /**
          *
          * Returns the number of table rows in this collection. Read-only.
@@ -46404,6 +56245,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.TableRow;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.TableRowCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.TableRowCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.TableRowCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.TableRowCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.TableRowCollection;
         load(option?: string | string[]): OneNote.TableRowCollection;
@@ -46467,22 +56320,27 @@ declare namespace OneNote {
          * [Api set: OneNoteApi 1.1]
          */
         shadingColor: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.TableCellUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: OneNote.TableCell): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.TableCellUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: TableCell): void;
+        set(properties: OneNote.TableCell): void;
         /**
          *
          * Adds the specified HTML to the bottom of the TableCell.
          *
          * [Api set: OneNoteApi 1.1]
          *
-         * @param html The HTML string to append. See [supported HTML](../../docs/onenote/onenote-add-ins-page-content.md#supported-html) for the OneNote add-ins JavaScript API.
+         * @param html The HTML string to append. See {@link https://docs.microsoft.com/en-us/office/dev/add-ins/onenote/onenote-add-ins-page-content#supported-html | Supported HTML} for the OneNote add-ins JavaScript API.
          */
         appendHtml(html: string): void;
         /**
@@ -46515,7 +56373,7 @@ declare namespace OneNote {
          * @param columnCount Required. The number of columns in the table.
          * @param values Optional 2D array. Cells are filled if the corresponding strings are specified in the array.
          */
-        appendTable(rowCount: number, columnCount: number, values?: Array<Array<string>>): OneNote.Table;
+        appendTable(rowCount: number, columnCount: number, values?: string[][]): OneNote.Table;
         /**
          *
          * Clears the contents of the cell.
@@ -46525,6 +56383,18 @@ declare namespace OneNote {
         clear(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.TableCell` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.TableCell` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.TableCell` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.TableCellLoadOptions): OneNote.TableCell;
         load(option?: string | string[]): OneNote.TableCell;
@@ -46550,7 +56420,7 @@ declare namespace OneNote {
      */
     class TableCellCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<OneNote.TableCell>;
+        readonly items: OneNote.TableCell[];
         /**
          *
          * Returns the number of tablecells in this collection. Read-only.
@@ -46578,6 +56448,18 @@ declare namespace OneNote {
         getItemAt(index: number): OneNote.TableCell;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): OneNote.TableCellCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): OneNote.TableCellCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): OneNote.TableCellCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: OneNote.Interfaces.TableCellCollectionLoadOptions & OneNote.Interfaces.CollectionLoadOptions): OneNote.TableCellCollection;
         load(option?: string | string[]): OneNote.TableCellCollection;
@@ -46594,7 +56476,7 @@ declare namespace OneNote {
     }
     /**
      *
-     * Represents data obtained by OCR (optical character recognition) of an image
+     * Represents data obtained by OCR (optical character recognition) of an image.
      *
      * [Api set: OneNoteApi 1.1]
      */
@@ -46616,7 +56498,7 @@ declare namespace OneNote {
     }
     /**
      *
-     * Weak reference to an ink stroke object and its content parent
+     * Weak reference to an ink stroke object and its content parent.
      *
      * [Api set: OneNoteApi 1.1]
      */
@@ -46636,66 +56518,6 @@ declare namespace OneNote {
          */
         inkStrokeId: string;
     }
-    /**
-     *
-     * Service token for Application::_GetServiceToken.
-     *
-     * [Api set: OneNoteApi 1.1]
-     */
-    interface ServiceToken {
-        /**
-         *
-         * Account type
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        accountType: string;
-        /**
-         *
-         * //
-            Header name of the service token
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        headerName: string;
-        /**
-         *
-         * Header value of the service token
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        headerValue: string;
-    }
-    /**
-     *
-     * Account information.
-     *
-     * [Api set: OneNoteApi 1.1]
-     */
-    interface AccountInfo {
-        /**
-         *
-         * Account type
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        accountType: string;
-        /**
-         *
-         * Account email
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        email: string;
-        /**
-         *
-         * //
-            Account user name
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        userName: string;
-    }
     /**
      *
      * List information for paragraph.
@@ -46726,7 +56548,7 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        listType: string;
+        listType: OneNote.ListType | "None" | "Number" | "Bullet";
         /**
          *
          * //
@@ -46734,338 +56556,153 @@ declare namespace OneNote {
          *
          * [Api set: OneNoteApi 1.1]
          */
-        numberType: string;
+        numberType: OneNote.NumberType | "None" | "Arabic" | "UCRoman" | "LCRoman" | "UCLetter" | "LCLetter" | "Ordinal" | "Cardtext" | "Ordtext" | "Hex" | "ChiManSty" | "DbNum1" | "DbNum2" | "Aiueo" | "Iroha" | "DbChar" | "SbChar" | "DbNum3" | "DbNum4" | "Circlenum" | "DArabic" | "DAiueo" | "DIroha" | "ArabicLZ" | "Bullet" | "Ganada" | "Chosung" | "GB1" | "GB2" | "GB3" | "GB4" | "Zodiac1" | "Zodiac2" | "Zodiac3" | "TpeDbNum1" | "TpeDbNum2" | "TpeDbNum3" | "TpeDbNum4" | "ChnDbNum1" | "ChnDbNum2" | "ChnDbNum3" | "ChnDbNum4" | "KorDbNum1" | "KorDbNum2" | "KorDbNum3" | "KorDbNum4" | "Hebrew1" | "Arabic1" | "Hebrew2" | "Arabic2" | "Hindi1" | "Hindi2" | "Hindi3" | "Thai1" | "Thai2" | "NumInDash" | "LCRus" | "UCRus" | "LCGreek" | "UCGreek" | "Lim" | "Custom";
     }
     /**
-     *
-     * Account information.
-     *
      * [Api set: OneNoteApi 1.1]
      */
-    interface LoggingInfo {
-        /**
-         *
-         * //
-            Correlation Id
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        correlationId: string;
-        /**
-         *
-         * //
-            UI Language
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        market: string;
-        /**
-         *
-         * //
-            Session Id
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        sessionId: string;
-        /**
-         *
-         * //
-            UI Language
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        uiLanguage: string;
-        /**
-         *
-         * //
-            User Id
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        userId: string;
+    enum InsertLocation {
+        before = "Before",
+        after = "After",
     }
     /**
-     *
-     * Account information.
-     *
      * [Api set: OneNoteApi 1.1]
      */
-    interface LogData {
+    enum PageContentType {
+        outline = "Outline",
+        image = "Image",
+        ink = "Ink",
+        other = "Other",
+    }
+    /**
+     * [Api set: OneNoteApi 1.1]
+     */
+    enum ParagraphType {
+        richText = "RichText",
+        image = "Image",
+        table = "Table",
+        ink = "Ink",
+        other = "Other",
+    }
+    /**
+     * [Api set: OneNoteApi 1.1]
+     */
+    enum NoteTagType {
+        unknown = "Unknown",
+        toDo = "ToDo",
+        important = "Important",
+        question = "Question",
+        contact = "Contact",
+        address = "Address",
+        phoneNumber = "PhoneNumber",
+        website = "Website",
+        idea = "Idea",
+        critical = "Critical",
+        toDoPriority1 = "ToDoPriority1",
+        toDoPriority2 = "ToDoPriority2",
+    }
+    /**
+     * [Api set: OneNoteApi 1.1]
+     */
+    enum NoteTagStatus {
+        unknown = "Unknown",
+        normal = "Normal",
+        completed = "Completed",
+        disabled = "Disabled",
+        outlookTask = "OutlookTask",
+        taskNotSyncedYet = "TaskNotSyncedYet",
+        taskRemoved = "TaskRemoved",
+    }
+    /**
+     * [Api set: OneNoteApi 1.1]
+     */
+    enum ListType {
+        none = "None",
+        number = "Number",
+        bullet = "Bullet",
+    }
+    /**
+     * [Api set: OneNoteApi 1.1]
+     */
+    enum NumberType {
+        none = "None",
+        arabic = "Arabic",
+        ucroman = "UCRoman",
+        lcroman = "LCRoman",
+        ucletter = "UCLetter",
+        lcletter = "LCLetter",
+        ordinal = "Ordinal",
+        cardtext = "Cardtext",
+        ordtext = "Ordtext",
+        hex = "Hex",
+        chiManSty = "ChiManSty",
+        dbNum1 = "DbNum1",
+        dbNum2 = "DbNum2",
+        aiueo = "Aiueo",
+        iroha = "Iroha",
+        dbChar = "DbChar",
+        sbChar = "SbChar",
+        dbNum3 = "DbNum3",
+        dbNum4 = "DbNum4",
+        circlenum = "Circlenum",
+        darabic = "DArabic",
+        daiueo = "DAiueo",
+        diroha = "DIroha",
+        arabicLZ = "ArabicLZ",
+        bullet = "Bullet",
+        ganada = "Ganada",
+        chosung = "Chosung",
+        gb1 = "GB1",
+        gb2 = "GB2",
+        gb3 = "GB3",
+        gb4 = "GB4",
+        zodiac1 = "Zodiac1",
+        zodiac2 = "Zodiac2",
+        zodiac3 = "Zodiac3",
+        tpeDbNum1 = "TpeDbNum1",
+        tpeDbNum2 = "TpeDbNum2",
+        tpeDbNum3 = "TpeDbNum3",
+        tpeDbNum4 = "TpeDbNum4",
+        chnDbNum1 = "ChnDbNum1",
+        chnDbNum2 = "ChnDbNum2",
+        chnDbNum3 = "ChnDbNum3",
+        chnDbNum4 = "ChnDbNum4",
+        korDbNum1 = "KorDbNum1",
+        korDbNum2 = "KorDbNum2",
+        korDbNum3 = "KorDbNum3",
+        korDbNum4 = "KorDbNum4",
+        hebrew1 = "Hebrew1",
+        arabic1 = "Arabic1",
+        hebrew2 = "Hebrew2",
+        arabic2 = "Arabic2",
+        hindi1 = "Hindi1",
+        hindi2 = "Hindi2",
+        hindi3 = "Hindi3",
+        thai1 = "Thai1",
+        thai2 = "Thai2",
+        numInDash = "NumInDash",
+        lcrus = "LCRus",
+        ucrus = "UCRus",
+        lcgreek = "LCGreek",
+        ucgreek = "UCGreek",
+        lim = "Lim",
+        custom = "Custom",
+    }
+    enum ErrorCodes {
+        generalException = "GeneralException",
+    }
+    module Interfaces {
         /**
-         *
-         * //
-            None PII
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        isNonPII: boolean;
-        /**
-         *
-         * //
-            data tag
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        tag: string;
-        /**
-         *
-         * //
-            data value
-         *
-         * [Api set: OneNoteApi 1.1]
-         */
-        value: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace InsertLocation {
-        var before: string;
-        var after: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace Platform {
-        var other: string;
-        var web: string;
-        var uwp: string;
-        var win32: string;
-        var mac: string;
-        var ios: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace Alignment {
-        var left: string;
-        var centered: string;
-        var right: string;
-        var justified: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace Selected {
-        var notSelected: string;
-        var partialSelected: string;
-        var selected: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace PageContentType {
-        var outline: string;
-        var image: string;
-        var ink: string;
-        var other: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace ParagraphType {
-        var richText: string;
-        var image: string;
-        var table: string;
-        var ink: string;
-        var other: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace NoteTagType {
-        var unknown: string;
-        var toDo: string;
-        var important: string;
-        var question: string;
-        var contact: string;
-        var address: string;
-        var phoneNumber: string;
-        var website: string;
-        var idea: string;
-        var critical: string;
-        var toDoPriority1: string;
-        var toDoPriority2: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace NoteTagStatus {
-        var unknown: string;
-        var normal: string;
-        var completed: string;
-        var disabled: string;
-        var outlookTask: string;
-        var taskNotSyncedYet: string;
-        var taskRemoved: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace ServiceId {
-        var form: string;
-        var entity: string;
-        var graph: string;
-        var oneService: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace IdentityFilter {
-        var selection: string;
-        var activeProfile: string;
-        var liveId: string;
-        var orgId: string;
-        var adal: string;
-        var notebook: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace ListType {
-        var none: string;
-        var number: string;
-        var bullet: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace AccountType {
-        var other: string;
-        var liveId: string;
-        var orgId: string;
-        var adal: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace LogLevel {
-        var trace: string;
-        var data: string;
-        var exception: string;
-        var warning: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace EventFlag {
-        /**
-         *
-         * DefaultEventFlags
-         *
-         */
-        var defaultFlag: string;
-        /**
-         *
-         * CriticalDataEventFlags
-         *
-         */
-        var criticalFlag: string;
-        /**
-         *
-         * MeasureDataEventFlags
-         *
-         */
-        var measureFlag: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace NumberType {
-        var none: string;
-        var arabic: string;
-        var ucroman: string;
-        var lcroman: string;
-        var ucletter: string;
-        var lcletter: string;
-        var ordinal: string;
-        var cardtext: string;
-        var ordtext: string;
-        var hex: string;
-        var chiManSty: string;
-        var dbNum1: string;
-        var dbNum2: string;
-        var aiueo: string;
-        var iroha: string;
-        var dbChar: string;
-        var sbChar: string;
-        var dbNum3: string;
-        var dbNum4: string;
-        var circlenum: string;
-        var darabic: string;
-        var daiueo: string;
-        var diroha: string;
-        var arabicLZ: string;
-        var bullet: string;
-        var ganada: string;
-        var chosung: string;
-        var gb1: string;
-        var gb2: string;
-        var gb3: string;
-        var gb4: string;
-        var zodiac1: string;
-        var zodiac2: string;
-        var zodiac3: string;
-        var tpeDbNum1: string;
-        var tpeDbNum2: string;
-        var tpeDbNum3: string;
-        var tpeDbNum4: string;
-        var chnDbNum1: string;
-        var chnDbNum2: string;
-        var chnDbNum3: string;
-        var chnDbNum4: string;
-        var korDbNum1: string;
-        var korDbNum2: string;
-        var korDbNum3: string;
-        var korDbNum4: string;
-        var hebrew1: string;
-        var arabic1: string;
-        var hebrew2: string;
-        var arabic2: string;
-        var hindi1: string;
-        var hindi2: string;
-        var hindi3: string;
-        var thai1: string;
-        var thai2: string;
-        var numInDash: string;
-        var lcrus: string;
-        var ucrus: string;
-        var lcgreek: string;
-        var ucgreek: string;
-        var lim: string;
-        var custom: string;
-    }
-    /**
-     * [Api set: OneNoteApi]
-     */
-    namespace ControlId {
-        var preinstallClassNotebook: string;
-        var distributePageId: string;
-        var distributeSection: string;
-        var reviewStudentWork: string;
-        var openTabForCreateClassNotebook: string;
-        var openTabForManageStudent: string;
-        var openTabForManageTeacher: string;
-        var openTabForGetNotebookLink: string;
-        var openTabForTeacherTraining: string;
-        var openTabForAddinGuide: string;
-        var openTabForEducationBlog: string;
-        var openTabForEducatorCommunity: string;
-        var openTabToSendFeedback: string;
-        var openTabForViewKnowledgeBase: string;
-        var openTabForSuggestingFeature: string;
-        var createAssignment: string;
-        var connections: string;
-        var mapClassNotebooks: string;
-        var mapStudents: string;
-        var manageClasses: string;
-    }
-    namespace ErrorCodes {
-        var generalException: string;
-    }
-    namespace Interfaces {
+        * Provides ways to load properties of only a subset of members of a collection.
+        */
         interface CollectionLoadOptions {
+            /**
+            * Specify the number of items in the queried collection to be included in the result.
+            */
             $top?: number;
+            /**
+            * Specify the number of items in the collection that are to be skipped and not included in the result. If top is specified, the selection of result will start after skipping the specified number of items.
+            */
             $skip?: number;
         }
         /** An interface for updating data on the InkAnalysis object, for use in "inkAnalysis.set({ ... })". */
@@ -47395,14 +57032,14 @@ declare namespace OneNote {
              *
              * [Api set: OneNoteApi 1.1]
              */
-            strokePointers?: Array<OneNote.InkStrokePointer>;
+            strokePointers?: OneNote.InkStrokePointer[];
             /**
              *
              * The words that were recognized in this ink word, in order of likelihood. Read-only.
              *
              * [Api set: OneNoteApi 1.1]
              */
-            wordAlternates?: Array<string>;
+            wordAlternates?: string[];
         }
         /** An interface describing the data returned by calling "inkAnalysisWordCollection.toJSON()". */
         interface InkAnalysisWordCollectionData {
@@ -47480,9 +57117,9 @@ declare namespace OneNote {
              *
              * The words that were recognized in this ink word, in order of likelihood. Read-only.
              *
-             * [Api set: OneNoteApi]
+             * [Api set: OneNoteApi 1.1]
              */
-            wordAlternates?: Array<string>;
+            wordAlternates?: string[];
         }
         /** An interface describing the data returned by calling "inkWordCollection.toJSON()". */
         interface InkWordCollectionData {
@@ -47525,6 +57162,13 @@ declare namespace OneNote {
              * [Api set: OneNoteApi 1.1]
              */
             id?: string;
+            /**
+             *
+             * True if the Notebook is not created by the user (i.e. 'Misplaced Sections'). Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isVirtual?: boolean;
             /**
              *
              * Gets the name of the notebook. Read-only.
@@ -47644,6 +57288,20 @@ declare namespace OneNote {
              * [Api set: OneNoteApi 1.1]
              */
             id?: string;
+            /**
+             *
+             * True if this section is encrypted with a password. Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isEncrypted?: boolean;
+            /**
+             *
+             * True if this section is locked. Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isLocked?: boolean;
             /**
              *
              * Gets the name of the section. Read-only.
@@ -47790,7 +57448,7 @@ declare namespace OneNote {
              *
              * [Api set: OneNoteApi 1.1]
              */
-            type?: string;
+            type?: OneNote.PageContentType | "Outline" | "Image" | "Ink" | "Other";
         }
         /** An interface describing the data returned by calling "pageContentCollection.toJSON()". */
         interface PageContentCollectionData {
@@ -47905,7 +57563,7 @@ declare namespace OneNote {
              *
              * [Api set: OneNoteApi 1.1]
              */
-            type?: string;
+            type?: OneNote.ParagraphType | "RichText" | "Image" | "Table" | "Ink" | "Other";
         }
         /** An interface describing the data returned by calling "paragraphCollection.toJSON()". */
         interface ParagraphCollectionData {
@@ -47926,14 +57584,14 @@ declare namespace OneNote {
              *
              * [Api set: OneNoteApi 1.1]
              */
-            status?: string;
+            status?: OneNote.NoteTagStatus | "Unknown" | "Normal" | "Completed" | "Disabled" | "OutlookTask" | "TaskNotSyncedYet" | "TaskRemoved";
             /**
              *
              * Gets the type of the NoteTag object. Read-only.
              *
              * [Api set: OneNoteApi 1.1]
              */
-            type?: string;
+            type?: OneNote.NoteTagType | "Unknown" | "ToDo" | "Important" | "Question" | "Contact" | "Address" | "PhoneNumber" | "Website" | "Idea" | "Critical" | "ToDoPriority1" | "ToDoPriority2";
         }
         /** An interface describing the data returned by calling "richText.toJSON()". */
         interface RichTextData {
@@ -48161,6 +57819,7 @@ declare namespace OneNote {
         interface TableCellCollectionData {
             items?: OneNote.Interfaces.TableCellData[];
         }
+        
         /**
          *
          * Represents the top-level object that contains all globally addressable OneNote objects such as notebooks, the active notebook, and the active section.
@@ -48524,7 +58183,7 @@ declare namespace OneNote {
              *
              * The words that were recognized in this ink word, in order of likelihood. Read-only.
              *
-             * [Api set: OneNoteApi]
+             * [Api set: OneNoteApi 1.1]
              */
             wordAlternates?: boolean;
         }
@@ -48561,7 +58220,7 @@ declare namespace OneNote {
              *
              * For EACH ITEM in the collection: The words that were recognized in this ink word, in order of likelihood. Read-only.
              *
-             * [Api set: OneNoteApi]
+             * [Api set: OneNoteApi 1.1]
              */
             wordAlternates?: boolean;
         }
@@ -48608,6 +58267,13 @@ declare namespace OneNote {
              * [Api set: OneNoteApi 1.1]
              */
             id?: boolean;
+            /**
+             *
+             * True if the Notebook is not created by the user (i.e. 'Misplaced Sections'). Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isVirtual?: boolean;
             /**
              *
              * Gets the name of the notebook. Read-only.
@@ -48659,6 +58325,13 @@ declare namespace OneNote {
              * [Api set: OneNoteApi 1.1]
              */
             id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True if the Notebook is not created by the user (i.e. 'Misplaced Sections'). Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isVirtual?: boolean;
             /**
              *
              * For EACH ITEM in the collection: Gets the name of the notebook. Read-only.
@@ -48847,6 +58520,20 @@ declare namespace OneNote {
              * [Api set: OneNoteApi 1.1]
              */
             id?: boolean;
+            /**
+             *
+             * True if this section is encrypted with a password. Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isEncrypted?: boolean;
+            /**
+             *
+             * True if this section is locked. Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isLocked?: boolean;
             /**
              *
              * Gets the name of the section. Read-only.
@@ -48912,6 +58599,20 @@ declare namespace OneNote {
              * [Api set: OneNoteApi 1.1]
              */
             id?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True if this section is encrypted with a password. Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isEncrypted?: boolean;
+            /**
+             *
+             * For EACH ITEM in the collection: True if this section is locked. Read only
+             *
+             * [Api set: OneNoteApi 1.2]
+             */
+            isLocked?: boolean;
             /**
              *
              * For EACH ITEM in the collection: Gets the name of the section. Read-only.
@@ -49793,7 +59494,7 @@ declare namespace OneNote {
     }
 }
 declare namespace OneNote {
-    class RequestContext extends OfficeExtension.ClientRequestContext {
+    class RequestContext extends OfficeCore.RequestContext {
         constructor(url?: string);
         readonly application: Application;
     }
@@ -49812,6 +59513,13 @@ declare namespace OneNote {
      * Executes a batch script that performs actions on the OneNote object model, using the request context of previously-created API objects.
      * @param object - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared request context, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in an OneNote.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * 
+     * @remarks
+     * In addition to this signature, the method also has the following signatures:
+     * 
+     * `run<T>(batch: (context: OneNote.RequestContext) => Promise<T>): Promise<T>;`
+     * 
+     * `run<T>(objects: OfficeExtension.ClientObject[], batch: (context: OneNote.RequestContext) => Promise<T>): Promise<T>;`
      */
     function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: OneNote.RequestContext) => Promise<T>): Promise<T>;
 }
@@ -49848,7 +59556,7 @@ declare namespace Visio {
         pageName: string;
         /**
          *
-         * Gets the shape object that raised the ShapeMouseEnter event.
+         * Gets the name of the shape object that raised the ShapeMouseEnter event.
          *
          * [Api set:  1.1]
          */
@@ -49870,7 +59578,7 @@ declare namespace Visio {
         pageName: string;
         /**
          *
-         * Gets the shape object that raised the ShapeMouseLeave event.
+         * Gets the name of the shape object that raised the ShapeMouseLeave event.
          *
          * [Api set:  1.1]
          */
@@ -49892,7 +59600,7 @@ declare namespace Visio {
         pageName: string;
         /**
          *
-         * Gets the success/failure of the PageLoadComplete event.
+         * Gets the success or failure of the PageLoadComplete event.
          *
          * [Api set:  1.1]
          */
@@ -49914,7 +59622,7 @@ declare namespace Visio {
         document: Visio.Document;
         /**
          *
-         * Gets the success/failure of the DataRefreshComplete event.
+         * Gets the success or failure of the DataRefreshComplete event.
          *
          * [Api set:  1.1]
          */
@@ -49936,22 +59644,44 @@ declare namespace Visio {
         pageName: string;
         /**
          *
-         * Gets the ShapeCollection object that raised the SelectionChanged event.
+         * Gets the array of shape names that raised the SelectionChanged event.
          *
          * [Api set:  1.1]
          */
-        shapeNames: Array<string>;
+        shapeNames: string[];
     }
     /**
      *
-     * Provides information about the drawing that raised the DiagramLoadComplete event.
+     * Provides information about the success or failure of the DocumentLoadComplete event.
      *
      * [Api set:  1.1]
      */
     interface DocumentLoadCompleteEventArgs {
         /**
          *
-         * Gets the success/failure of the DocumentLoadComplete event.
+         * Gets the success or failure of the DocumentLoadComplete event.
+         *
+         * [Api set:  1.1]
+         */
+        success: boolean;
+    }
+    /**
+     *
+     * Provides information about the page that raised the PageRenderComplete event.
+     *
+     * [Api set:  1.1]
+     */
+    interface PageRenderCompleteEventArgs {
+        /**
+         *
+         * Gets the name of the page that raised the PageLoad event.
+         *
+         * [Api set:  1.1]
+         */
+        pageName: string;
+        /**
+         *
+         * Gets the success/failure of the PageRender event.
          *
          * [Api set:  1.1]
          */
@@ -49966,36 +59696,66 @@ declare namespace Visio {
     class Application extends OfficeExtension.ClientObject {
         /**
          *
-         * Show/Hide the application borders.
+         * Show or hide the iFrame application borders.
          *
          * [Api set:  1.1]
          */
         showBorders: boolean;
         /**
          *
-         * Show or Hide the standard toolbars.
+         * Show or hide the standard toolbars.
          *
          * [Api set:  1.1]
          */
         showToolbars: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ApplicationUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.Application): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.ApplicationUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Application): void;
+        set(properties: Visio.Application): void;
         /**
          *
-         * Show or Hide a particular toolbar.
+         * Sets the visibility of a specific toolbar in the application.
          *
          * [Api set:  1.1]
+         *
+         * @param id The type of the Toolbar
+         * @param show Whether the toolbar is visibile or not.
          */
-        showToolbar(id: string, show: boolean): void;
+        showToolbar(id: Visio.ToolBarType, show: boolean): void;
+        /**
+         *
+         * Sets the visibility of a specific toolbar in the application.
+         *
+         * [Api set:  1.1]
+         *
+         * @param id The type of the Toolbar
+         * @param show Whether the toolbar is visibile or not.
+         */
+        showToolbar(id: "CommandBar" | "PageNavigationBar" | "StatusBar", show: boolean): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Application` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Application` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Application` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.ApplicationLoadOptions): Visio.Application;
         load(option?: string | string[]): Visio.Application;
@@ -50028,20 +59788,25 @@ declare namespace Visio {
         readonly pages: Visio.PageCollection;
         /**
          *
-         * Returns the DocumentView object.
+         * Returns the DocumentView object. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly view: Visio.DocumentView;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.DocumentUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.Document): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.DocumentUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Document): void;
+        set(properties: Visio.Document): void;
         /**
          *
          * Returns the Active Page of the document.
@@ -50067,6 +59832,18 @@ declare namespace Visio {
         startDataRefresh(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Document` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Document` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Document` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.DocumentLoadOptions): Visio.Document;
         load(option?: string | string[]): Visio.Document;
@@ -50079,6 +59856,8 @@ declare namespace Visio {
          * Occurs when the data is refreshed in the diagram.
          *
          * [Api set:  1.1]
+         *
+         * @eventproperty
          */
         readonly onDataRefreshComplete: OfficeExtension.EventHandlers<Visio.DataRefreshCompleteEventArgs>;
         /**
@@ -50086,6 +59865,8 @@ declare namespace Visio {
          * Occurs when the Document is loaded, refreshed, or changed.
          *
          * [Api set:  1.1]
+         *
+         * @eventproperty
          */
         readonly onDocumentLoadComplete: OfficeExtension.EventHandlers<Visio.DocumentLoadCompleteEventArgs>;
         /**
@@ -50093,6 +59874,8 @@ declare namespace Visio {
          * Occurs when the page is finished loading.
          *
          * [Api set:  1.1]
+         *
+         * @eventproperty
          */
         readonly onPageLoadComplete: OfficeExtension.EventHandlers<Visio.PageLoadCompleteEventArgs>;
         /**
@@ -50100,6 +59883,8 @@ declare namespace Visio {
          * Occurs when the current selection of shapes changes.
          *
          * [Api set:  1.1]
+         *
+         * @eventproperty
          */
         readonly onSelectionChanged: OfficeExtension.EventHandlers<Visio.SelectionChangedEventArgs>;
         /**
@@ -50107,6 +59892,8 @@ declare namespace Visio {
          * Occurs when the user moves the mouse pointer into the bounding box of a shape.
          *
          * [Api set:  1.1]
+         *
+         * @eventproperty
          */
         readonly onShapeMouseEnter: OfficeExtension.EventHandlers<Visio.ShapeMouseEnterEventArgs>;
         /**
@@ -50114,6 +59901,8 @@ declare namespace Visio {
          * Occurs when the user moves the mouse out of the bounding box of a shape.
          *
          * [Api set:  1.1]
+         *
+         * @eventproperty
          */
         readonly onShapeMouseLeave: OfficeExtension.EventHandlers<Visio.ShapeMouseLeaveEventArgs>;
         toJSON(): Visio.Interfaces.DocumentData;
@@ -50148,22 +59937,39 @@ declare namespace Visio {
         disableZoom: boolean;
         /**
          *
-         * Disable Hyperlinks.
+         * Hide Diagram Boundary.
          *
          * [Api set:  1.1]
          */
         hideDiagramBoundary: boolean;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.DocumentViewUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.DocumentView): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.DocumentViewUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: DocumentView): void;
+        set(properties: Visio.DocumentView): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.DocumentView` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.DocumentView` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.DocumentView` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.DocumentViewLoadOptions): Visio.DocumentView;
         load(option?: string | string[]): Visio.DocumentView;
@@ -50182,21 +59988,21 @@ declare namespace Visio {
     class Page extends OfficeExtension.ClientObject {
         /**
          *
-         * All shapes in the page. Read-only.
+         * All shapes in the Page, including subshapes. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly allShapes: Visio.ShapeCollection;
         /**
          *
-         * Returns the Comments Collection
+         * Returns the Comments Collection.  Read-only.
          *
          * [Api set:  1.1]
          */
         readonly comments: Visio.CommentCollection;
         /**
          *
-         * Shapes at root level, in the page. Read-only.
+         * All top-level shapes in the Page.Read-only.
          *
          * [Api set:  1.1]
          */
@@ -50217,7 +60023,7 @@ declare namespace Visio {
         readonly height: number;
         /**
          *
-         * Index of the Page.
+         * Index of the Page. Read-only.
          *
          * [Api set:  1.1]
          */
@@ -50243,15 +60049,20 @@ declare namespace Visio {
          * [Api set:  1.1]
          */
         readonly width: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.PageUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.Page): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.PageUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Page): void;
+        set(properties: Visio.Page): void;
         /**
          *
          * Set the page as Active Page of the document.
@@ -50261,6 +60072,18 @@ declare namespace Visio {
         activate(): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Page` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Page` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Page` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.PageLoadOptions): Visio.Page;
         load(option?: string | string[]): Visio.Page;
@@ -50279,20 +60102,25 @@ declare namespace Visio {
     class PageView extends OfficeExtension.ClientObject {
         /**
          *
-         * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+         * Get and set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
          *
          * [Api set:  1.1]
          */
         zoom: number;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.PageViewUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.PageView): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.PageViewUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: PageView): void;
+        set(properties: Visio.PageView): void;
         /**
          *
          * Pans the Visio drawing to place the specified shape in the center of the view.
@@ -50343,6 +60171,18 @@ declare namespace Visio {
         setPosition(Position: Visio.Position): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.PageView` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.PageView` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.PageView` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.PageViewLoadOptions): Visio.PageView;
         load(option?: string | string[]): Visio.PageView;
@@ -50360,7 +60200,7 @@ declare namespace Visio {
      */
     class PageCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Visio.Page>;
+        readonly items: Visio.Page[];
         /**
          *
          * Gets the number of pages in the collection.
@@ -50379,6 +60219,18 @@ declare namespace Visio {
         getItem(key: number | string): Visio.Page;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.PageCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.PageCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.PageCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.PageCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.PageCollection;
         load(option?: string | string[]): Visio.PageCollection;
@@ -50393,7 +60245,7 @@ declare namespace Visio {
      */
     class ShapeCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Visio.Shape>;
+        readonly items: Visio.Shape[];
         /**
          *
          * Gets the number of Shapes in the collection.
@@ -50412,6 +60264,18 @@ declare namespace Visio {
         getItem(key: number | string): Visio.Shape;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.ShapeCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.ShapeCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.ShapeCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.ShapeCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.ShapeCollection;
         load(option?: string | string[]): Visio.ShapeCollection;
@@ -50427,7 +60291,7 @@ declare namespace Visio {
     class Shape extends OfficeExtension.ClientObject {
         /**
          *
-         * Returns the Comments Collection
+         * Returns the Comments Collection. Read-only.
          *
          * [Api set:  1.1]
          */
@@ -50448,7 +60312,7 @@ declare namespace Visio {
         readonly shapeDataItems: Visio.ShapeDataItemCollection;
         /**
          *
-         * Gets SubShape Collection.
+         * Gets SubShape Collection. Read-only.
          *
          * [Api set:  1.1]
          */
@@ -50462,14 +60326,14 @@ declare namespace Visio {
         readonly view: Visio.ShapeView;
         /**
          *
-         * Shape's Identifier.
+         * Shape's identifier. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly id: number;
         /**
          *
-         * Shape's name.
+         * Shape's name. Read-only.
          *
          * [Api set:  1.1]
          */
@@ -50483,20 +60347,25 @@ declare namespace Visio {
         select: boolean;
         /**
          *
-         * Shape's Text.
+         * Shape's text. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly text: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ShapeUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.Shape): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.ShapeUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Shape): void;
+        set(properties: Visio.Shape): void;
         /**
          *
          * Returns the BoundingBox object that specifies bounding box of the shape.
@@ -50506,6 +60375,18 @@ declare namespace Visio {
         getBounds(): OfficeExtension.ClientResult<Visio.BoundingBox>;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Shape` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Shape` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Shape` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.ShapeLoadOptions): Visio.Shape;
         load(option?: string | string[]): Visio.Shape;
@@ -50529,29 +60410,48 @@ declare namespace Visio {
          * [Api set:  1.1]
          */
         highlight: Visio.Highlight;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.ShapeViewUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.ShapeView): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.ShapeViewUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: ShapeView): void;
+        set(properties: Visio.ShapeView): void;
         /**
          *
          * Adds an overlay on top of the shape.
          *
          * [Api set:  1.1]
          *
-         * @param OverlayType An Overlay Type -Text, Image.
+         * @param OverlayType An Overlay Type. Can be 'Text' or 'Image'.
          * @param Content Content of Overlay.
-         * @param OverlayHorizontalAlignment Horizontal Alignment of Overlay - Left, Center, Right
-         * @param OverlayVerticalAlignment Vertical Alignment of Overlay - Top, Middle, Bottom
+         * @param OverlayHorizontalAlignment Horizontal Alignment of Overlay. Can be 'Left', 'Center', or 'Right'.
+         * @param OverlayVerticalAlignment Vertical Alignment of Overlay. Can be 'Top', 'Middle', 'Bottom'.
          * @param Width Overlay Width.
          * @param Height Overlay Height.
          */
-        addOverlay(OverlayType: string, Content: string, OverlayHorizontalAlignment: string, OverlayVerticalAlignment: string, Width: number, Height: number): OfficeExtension.ClientResult<number>;
+        addOverlay(OverlayType: Visio.OverlayType, Content: string, OverlayHorizontalAlignment: Visio.OverlayHorizontalAlignment, OverlayVerticalAlignment: Visio.OverlayVerticalAlignment, Width: number, Height: number): OfficeExtension.ClientResult<number>;
+        /**
+         *
+         * Adds an overlay on top of the shape.
+         *
+         * [Api set:  1.1]
+         *
+         * @param OverlayType An Overlay Type. Can be 'Text' or 'Image'.
+         * @param Content Content of Overlay.
+         * @param OverlayHorizontalAlignment Horizontal Alignment of Overlay. Can be 'Left', 'Center', or 'Right'.
+         * @param OverlayVerticalAlignment Vertical Alignment of Overlay. Can be 'Top', 'Middle', 'Bottom'.
+         * @param Width Overlay Width.
+         * @param Height Overlay Height.
+         */
+        addOverlay(OverlayType: "Text" | "Image", Content: string, OverlayHorizontalAlignment: "Left" | "Center" | "Right", OverlayVerticalAlignment: "Top" | "Middle" | "Bottom", Width: number, Height: number): OfficeExtension.ClientResult<number>;
         /**
          *
          * Removes particular overlay or all overlays on the Shape.
@@ -50563,6 +60463,18 @@ declare namespace Visio {
         removeOverlay(OverlayId: number): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.ShapeView` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.ShapeView` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.ShapeView` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.ShapeViewLoadOptions): Visio.ShapeView;
         load(option?: string | string[]): Visio.ShapeView;
@@ -50660,7 +60572,7 @@ declare namespace Visio {
      */
     class ShapeDataItemCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Visio.ShapeDataItem>;
+        readonly items: Visio.ShapeDataItem[];
         /**
          *
          * Gets the number of Shape Data Items.
@@ -50679,6 +60591,18 @@ declare namespace Visio {
         getItem(key: string): Visio.ShapeDataItem;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.ShapeDataItemCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.ShapeDataItemCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.ShapeDataItemCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.ShapeDataItemCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.ShapeDataItemCollection;
         load(option?: string | string[]): Visio.ShapeDataItemCollection;
@@ -50694,34 +60618,46 @@ declare namespace Visio {
     class ShapeDataItem extends OfficeExtension.ClientObject {
         /**
          *
-         * A string that specifies the format of the shape data item.
+         * A string that specifies the format of the shape data item. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly format: string;
         /**
          *
-         * A string that specifies the formatted value of the shape data item.
+         * A string that specifies the formatted value of the shape data item. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly formattedValue: string;
         /**
          *
-         * A string that specifies the label of the shape data item.
+         * A string that specifies the label of the shape data item. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly label: string;
         /**
          *
-         * A string that specifies the value of the shape data item.
+         * A string that specifies the value of the shape data item. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly value: string;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.ShapeDataItem` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.ShapeDataItem` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.ShapeDataItem` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.ShapeDataItemLoadOptions): Visio.ShapeDataItem;
         load(option?: string | string[]): Visio.ShapeDataItem;
@@ -50739,7 +60675,7 @@ declare namespace Visio {
      */
     class HyperlinkCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Visio.Hyperlink>;
+        readonly items: Visio.Hyperlink[];
         /**
          *
          * Gets the number of hyperlinks.
@@ -50758,6 +60694,18 @@ declare namespace Visio {
         getItem(Key: number | string): Visio.Hyperlink;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.HyperlinkCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.HyperlinkCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.HyperlinkCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.HyperlinkCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.HyperlinkCollection;
         load(option?: string | string[]): Visio.HyperlinkCollection;
@@ -50773,34 +60721,46 @@ declare namespace Visio {
     class Hyperlink extends OfficeExtension.ClientObject {
         /**
          *
-         * Gets the address of the Hyperlink object.
+         * Gets the address of the Hyperlink object. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly address: string;
         /**
          *
-         * Gets the description of a hyperlink.
+         * Gets the description of a hyperlink. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly description: string;
         /**
          *
-         * Gets the extra info of a hyperlink.
+         * Gets the extra URL request information used to resolve the hyperlink's URL. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly extraInfo: string;
         /**
          *
-         * Gets the sub-address of the Hyperlink object.
+         * Gets the sub-address of the Hyperlink object. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly subAddress: string;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Hyperlink` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Hyperlink` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Hyperlink` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.HyperlinkLoadOptions): Visio.Hyperlink;
         load(option?: string | string[]): Visio.Hyperlink;
@@ -50818,10 +60778,10 @@ declare namespace Visio {
      */
     class CommentCollection extends OfficeExtension.ClientObject {
         /** Gets the loaded child items in this collection. */
-        readonly items: Array<Visio.Comment>;
+        readonly items: Visio.Comment[];
         /**
          *
-         * Gets the number of Shape Data Items.
+         * Gets the number of Comments.
          *
          * [Api set:  1.1]
          */
@@ -50837,6 +60797,18 @@ declare namespace Visio {
         getItem(key: string): Visio.Comment;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.CommentCollection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.CommentCollection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.CommentCollection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.CommentCollectionLoadOptions & Visio.Interfaces.CollectionLoadOptions): Visio.CommentCollection;
         load(option?: string | string[]): Visio.CommentCollection;
@@ -50852,36 +60824,53 @@ declare namespace Visio {
     class Comment extends OfficeExtension.ClientObject {
         /**
          *
-         * A string that specifies the label of the shape data item.
+         * A string that specifies the name of the author of the comment.
          *
          * [Api set:  1.1]
          */
         author: string;
         /**
          *
-         * A string that specifies the format of the shape data item.
+         * A string that specifies the date when the comment was created.
          *
          * [Api set:  1.1]
          */
         date: string;
         /**
          *
-         * A string that specifies the value of the shape data item.
+         * A string that contains the comment text.
          *
          * [Api set:  1.1]
          */
         text: string;
-        /** Sets multiple properties on the object at the same time, based on JSON input. */
-        set(properties: Interfaces.CommentUpdateData, options?: {
-            /**
-             * Throw an error if the passed-in property list includes read-only properties (default = true).
-             */
-            throwOnReadOnly?: boolean;
-        }): void;
+        /** Sets multiple properties of an object at the same time. You can pass either a plain object with the appropriate properties, or another API object of the same type.
+         *
+         * @remarks
+         *
+         * This method has the following additional signature:
+         *
+         * `set(properties: Visio.Comment): void`
+         *
+         * @param properties A JavaScript object with properties that are structured isomorphically to the properties of the object on which the method is called.
+         * @param options Provides an option to suppress errors if the properties object tries to set any read-only properties.
+         */
+        set(properties: Interfaces.CommentUpdateData, options?: OfficeExtension.UpdateOptions): void;
         /** Sets multiple properties on the object at the same time, based on an existing loaded object. */
-        set(properties: Comment): void;
+        set(properties: Visio.Comment): void;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Comment` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Comment` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Comment` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: Visio.Interfaces.CommentLoadOptions): Visio.Comment;
         load(option?: string | string[]): Visio.Comment;
@@ -50900,13 +60889,25 @@ declare namespace Visio {
     class Selection extends OfficeExtension.ClientObject {
         /**
          *
-         * Gets the Shapes of the Selection
+         * Gets the Shapes of the Selection. Read-only.
          *
          * [Api set:  1.1]
          */
         readonly shapes: Visio.ShapeCollection;
         /**
          * Queues up a command to load the specified properties of the object. You must call "context.sync()" before reading the properties.
+         *
+         * @remarks
+         *
+         * In addition to this signature, this method has the following signatures:
+         *
+         * `load(option?: string | string[]): Visio.Selection` - Where option is a comma-delimited string or an array of strings that specify the properties/relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; }): Visio.Selection` - Where option.select is a comma-delimited string that specifies the properties/relationships to load, and options.expand is a comma-delimited string that specifies the relationships to load.
+         *
+         * `load(option?: { select?: string; expand?: string; top?: number; skip?: number }): Visio.Selection` - Only available on collection types. It is similar to the preceding signature. Option.top specifies the maximum number of collection items that can be included in the result. Option.skip specifies the number of items that are to be skipped and not included in the result. If option.top is specified, the result set will start after skipping the specified number of items.
+         *
+         * @param options Provides options for which properties of the object to load.
          */
         load(option?: string | string[]): Visio.Selection;
         load(option?: {
@@ -50921,25 +60922,25 @@ declare namespace Visio {
      *
      * [Api set:  1.1]
      */
-    namespace OverlayHorizontalAlignment {
+    enum OverlayHorizontalAlignment {
         /**
          *
          * left
          *
          */
-        var left: string;
+        left = "Left",
         /**
          *
          * center
          *
          */
-        var center: string;
+        center = "Center",
         /**
          *
          * right
          *
          */
-        var right: string;
+        right = "Right",
     }
     /**
      *
@@ -50947,25 +60948,25 @@ declare namespace Visio {
      *
      * [Api set:  1.1]
      */
-    namespace OverlayVerticalAlignment {
+    enum OverlayVerticalAlignment {
         /**
          *
          * top
          *
          */
-        var top: string;
+        top = "Top",
         /**
          *
          * middle
          *
          */
-        var middle: string;
+        middle = "Middle",
         /**
          *
          * bottom
          *
          */
-        var bottom: string;
+        bottom = "Bottom",
     }
     /**
      *
@@ -50973,19 +60974,19 @@ declare namespace Visio {
      *
      * [Api set:  1.1]
      */
-    namespace OverlayType {
+    enum OverlayType {
         /**
          *
          * text
          *
          */
-        var text: string;
+        text = "Text",
         /**
          *
          * image
          *
          */
-        var image: string;
+        image = "Image",
     }
     /**
      *
@@ -50993,51 +60994,60 @@ declare namespace Visio {
      *
      * [Api set:  1.1]
      */
-    namespace ToolBarType {
+    enum ToolBarType {
         /**
          *
          * CommandBar
          *
          */
-        var commandBar: string;
+        commandBar = "CommandBar",
         /**
          *
          * PageNavigationBar
          *
          */
-        var pageNavigationBar: string;
+        pageNavigationBar = "PageNavigationBar",
         /**
          *
          * StatusBar
          *
          */
-        var statusBar: string;
+        statusBar = "StatusBar",
     }
-    namespace ErrorCodes {
-        var accessDenied: string;
-        var generalException: string;
-        var invalidArgument: string;
-        var itemNotFound: string;
-        var notImplemented: string;
-        var unsupportedOperation: string;
+    enum ErrorCodes {
+        accessDenied = "AccessDenied",
+        generalException = "GeneralException",
+        invalidArgument = "InvalidArgument",
+        itemNotFound = "ItemNotFound",
+        notImplemented = "NotImplemented",
+        unsupportedOperation = "UnsupportedOperation",
     }
-    namespace Interfaces {
+    module Interfaces {
+        /**
+        * Provides ways to load properties of only a subset of members of a collection.
+        */
         interface CollectionLoadOptions {
+            /**
+            * Specify the number of items in the queried collection to be included in the result.
+            */
             $top?: number;
+            /**
+            * Specify the number of items in the collection that are to be skipped and not included in the result. If top is specified, the selection of result will start after skipping the specified number of items.
+            */
             $skip?: number;
         }
         /** An interface for updating data on the Application object, for use in "application.set({ ... })". */
         interface ApplicationUpdateData {
             /**
              *
-             * Show/Hide the application borders.
+             * Show or hide the iFrame application borders.
              *
              * [Api set:  1.1]
              */
             showBorders?: boolean;
             /**
              *
-             * Show or Hide the standard toolbars.
+             * Show or hide the standard toolbars.
              *
              * [Api set:  1.1]
              */
@@ -51085,7 +61095,7 @@ declare namespace Visio {
             disableZoom?: boolean;
             /**
              *
-             * Disable Hyperlinks.
+             * Hide Diagram Boundary.
              *
              * [Api set:  1.1]
              */
@@ -51105,7 +61115,7 @@ declare namespace Visio {
         interface PageViewUpdateData {
             /**
              *
-             * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+             * Get and set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
              *
              * [Api set:  1.1]
              */
@@ -51162,21 +61172,21 @@ declare namespace Visio {
         interface CommentUpdateData {
             /**
              *
-             * A string that specifies the label of the shape data item.
+             * A string that specifies the name of the author of the comment.
              *
              * [Api set:  1.1]
              */
             author?: string;
             /**
              *
-             * A string that specifies the format of the shape data item.
+             * A string that specifies the date when the comment was created.
              *
              * [Api set:  1.1]
              */
             date?: string;
             /**
              *
-             * A string that specifies the value of the shape data item.
+             * A string that contains the comment text.
              *
              * [Api set:  1.1]
              */
@@ -51186,14 +61196,14 @@ declare namespace Visio {
         interface ApplicationData {
             /**
              *
-             * Show/Hide the application borders.
+             * Show or hide the iFrame application borders.
              *
              * [Api set:  1.1]
              */
             showBorders?: boolean;
             /**
              *
-             * Show or Hide the standard toolbars.
+             * Show or hide the standard toolbars.
              *
              * [Api set:  1.1]
              */
@@ -51217,7 +61227,7 @@ declare namespace Visio {
             pages?: Visio.Interfaces.PageData[];
             /**
             *
-            * Returns the DocumentView object.
+            * Returns the DocumentView object. Read-only.
             *
             * [Api set:  1.1]
             */
@@ -51248,7 +61258,7 @@ declare namespace Visio {
             disableZoom?: boolean;
             /**
              *
-             * Disable Hyperlinks.
+             * Hide Diagram Boundary.
              *
              * [Api set:  1.1]
              */
@@ -51258,21 +61268,21 @@ declare namespace Visio {
         interface PageData {
             /**
             *
-            * All shapes in the page. Read-only.
+            * All shapes in the Page, including subshapes. Read-only.
             *
             * [Api set:  1.1]
             */
             allShapes?: Visio.Interfaces.ShapeData[];
             /**
             *
-            * Returns the Comments Collection
+            * Returns the Comments Collection.  Read-only.
             *
             * [Api set:  1.1]
             */
             comments?: Visio.Interfaces.CommentData[];
             /**
             *
-            * Shapes at root level, in the page. Read-only.
+            * All top-level shapes in the Page.Read-only.
             *
             * [Api set:  1.1]
             */
@@ -51293,7 +61303,7 @@ declare namespace Visio {
             height?: number;
             /**
              *
-             * Index of the Page.
+             * Index of the Page. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51324,7 +61334,7 @@ declare namespace Visio {
         interface PageViewData {
             /**
              *
-             * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+             * Get and set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
              *
              * [Api set:  1.1]
              */
@@ -51342,7 +61352,7 @@ declare namespace Visio {
         interface ShapeData {
             /**
             *
-            * Returns the Comments Collection
+            * Returns the Comments Collection. Read-only.
             *
             * [Api set:  1.1]
             */
@@ -51363,7 +61373,7 @@ declare namespace Visio {
             shapeDataItems?: Visio.Interfaces.ShapeDataItemData[];
             /**
             *
-            * Gets SubShape Collection.
+            * Gets SubShape Collection. Read-only.
             *
             * [Api set:  1.1]
             */
@@ -51377,14 +61387,14 @@ declare namespace Visio {
             view?: Visio.Interfaces.ShapeViewData;
             /**
              *
-             * Shape's Identifier.
+             * Shape's identifier. Read-only.
              *
              * [Api set:  1.1]
              */
             id?: number;
             /**
              *
-             * Shape's name.
+             * Shape's name. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51398,7 +61408,7 @@ declare namespace Visio {
             select?: boolean;
             /**
              *
-             * Shape's Text.
+             * Shape's text. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51422,28 +61432,28 @@ declare namespace Visio {
         interface ShapeDataItemData {
             /**
              *
-             * A string that specifies the format of the shape data item.
+             * A string that specifies the format of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             format?: string;
             /**
              *
-             * A string that specifies the formatted value of the shape data item.
+             * A string that specifies the formatted value of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             formattedValue?: string;
             /**
              *
-             * A string that specifies the label of the shape data item.
+             * A string that specifies the label of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             label?: string;
             /**
              *
-             * A string that specifies the value of the shape data item.
+             * A string that specifies the value of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51457,28 +61467,28 @@ declare namespace Visio {
         interface HyperlinkData {
             /**
              *
-             * Gets the address of the Hyperlink object.
+             * Gets the address of the Hyperlink object. Read-only.
              *
              * [Api set:  1.1]
              */
             address?: string;
             /**
              *
-             * Gets the description of a hyperlink.
+             * Gets the description of a hyperlink. Read-only.
              *
              * [Api set:  1.1]
              */
             description?: string;
             /**
              *
-             * Gets the extra info of a hyperlink.
+             * Gets the extra URL request information used to resolve the hyperlink's URL. Read-only.
              *
              * [Api set:  1.1]
              */
             extraInfo?: string;
             /**
              *
-             * Gets the sub-address of the Hyperlink object.
+             * Gets the sub-address of the Hyperlink object. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51492,21 +61502,21 @@ declare namespace Visio {
         interface CommentData {
             /**
              *
-             * A string that specifies the label of the shape data item.
+             * A string that specifies the name of the author of the comment.
              *
              * [Api set:  1.1]
              */
             author?: string;
             /**
              *
-             * A string that specifies the format of the shape data item.
+             * A string that specifies the date when the comment was created.
              *
              * [Api set:  1.1]
              */
             date?: string;
             /**
              *
-             * A string that specifies the value of the shape data item.
+             * A string that contains the comment text.
              *
              * [Api set:  1.1]
              */
@@ -51516,7 +61526,7 @@ declare namespace Visio {
         interface SelectionData {
             /**
             *
-            * Gets the Shapes of the Selection
+            * Gets the Shapes of the Selection. Read-only.
             *
             * [Api set:  1.1]
             */
@@ -51532,14 +61542,14 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * Show/Hide the application borders.
+             * Show or hide the iFrame application borders.
              *
              * [Api set:  1.1]
              */
             showBorders?: boolean;
             /**
              *
-             * Show or Hide the standard toolbars.
+             * Show or hide the standard toolbars.
              *
              * [Api set:  1.1]
              */
@@ -51599,7 +61609,7 @@ declare namespace Visio {
             disableZoom?: boolean;
             /**
              *
-             * Disable Hyperlinks.
+             * Hide Diagram Boundary.
              *
              * [Api set:  1.1]
              */
@@ -51629,7 +61639,7 @@ declare namespace Visio {
             height?: boolean;
             /**
              *
-             * Index of the Page.
+             * Index of the Page. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51666,7 +61676,7 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * Get/Set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
+             * Get and set Page's Zoom level. The value can be between 10 and 400 and denotes the percentage of zoom.
              *
              * [Api set:  1.1]
              */
@@ -51696,7 +61706,7 @@ declare namespace Visio {
             height?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Index of the Page.
+             * For EACH ITEM in the collection: Index of the Page. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51740,14 +61750,14 @@ declare namespace Visio {
             view?: Visio.Interfaces.ShapeViewLoadOptions;
             /**
              *
-             * For EACH ITEM in the collection: Shape's Identifier.
+             * For EACH ITEM in the collection: Shape's identifier. Read-only.
              *
              * [Api set:  1.1]
              */
             id?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Shape's name.
+             * For EACH ITEM in the collection: Shape's name. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51761,7 +61771,7 @@ declare namespace Visio {
             select?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Shape's Text.
+             * For EACH ITEM in the collection: Shape's text. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51784,14 +61794,14 @@ declare namespace Visio {
             view?: Visio.Interfaces.ShapeViewLoadOptions;
             /**
              *
-             * Shape's Identifier.
+             * Shape's identifier. Read-only.
              *
              * [Api set:  1.1]
              */
             id?: boolean;
             /**
              *
-             * Shape's name.
+             * Shape's name. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51805,7 +61815,7 @@ declare namespace Visio {
             select?: boolean;
             /**
              *
-             * Shape's Text.
+             * Shape's text. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51837,28 +61847,28 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the format of the shape data item.
+             * For EACH ITEM in the collection: A string that specifies the format of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             format?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the formatted value of the shape data item.
+             * For EACH ITEM in the collection: A string that specifies the formatted value of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             formattedValue?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the label of the shape data item.
+             * For EACH ITEM in the collection: A string that specifies the label of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             label?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the value of the shape data item.
+             * For EACH ITEM in the collection: A string that specifies the value of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51874,28 +61884,28 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * A string that specifies the format of the shape data item.
+             * A string that specifies the format of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             format?: boolean;
             /**
              *
-             * A string that specifies the formatted value of the shape data item.
+             * A string that specifies the formatted value of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             formattedValue?: boolean;
             /**
              *
-             * A string that specifies the label of the shape data item.
+             * A string that specifies the label of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
             label?: boolean;
             /**
              *
-             * A string that specifies the value of the shape data item.
+             * A string that specifies the value of the shape data item. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51911,28 +61921,28 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets the address of the Hyperlink object.
+             * For EACH ITEM in the collection: Gets the address of the Hyperlink object. Read-only.
              *
              * [Api set:  1.1]
              */
             address?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets the description of a hyperlink.
+             * For EACH ITEM in the collection: Gets the description of a hyperlink. Read-only.
              *
              * [Api set:  1.1]
              */
             description?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets the extra info of a hyperlink.
+             * For EACH ITEM in the collection: Gets the extra URL request information used to resolve the hyperlink's URL. Read-only.
              *
              * [Api set:  1.1]
              */
             extraInfo?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: Gets the sub-address of the Hyperlink object.
+             * For EACH ITEM in the collection: Gets the sub-address of the Hyperlink object. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51948,28 +61958,28 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * Gets the address of the Hyperlink object.
+             * Gets the address of the Hyperlink object. Read-only.
              *
              * [Api set:  1.1]
              */
             address?: boolean;
             /**
              *
-             * Gets the description of a hyperlink.
+             * Gets the description of a hyperlink. Read-only.
              *
              * [Api set:  1.1]
              */
             description?: boolean;
             /**
              *
-             * Gets the extra info of a hyperlink.
+             * Gets the extra URL request information used to resolve the hyperlink's URL. Read-only.
              *
              * [Api set:  1.1]
              */
             extraInfo?: boolean;
             /**
              *
-             * Gets the sub-address of the Hyperlink object.
+             * Gets the sub-address of the Hyperlink object. Read-only.
              *
              * [Api set:  1.1]
              */
@@ -51985,21 +61995,21 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the label of the shape data item.
+             * For EACH ITEM in the collection: A string that specifies the name of the author of the comment.
              *
              * [Api set:  1.1]
              */
             author?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the format of the shape data item.
+             * For EACH ITEM in the collection: A string that specifies the date when the comment was created.
              *
              * [Api set:  1.1]
              */
             date?: boolean;
             /**
              *
-             * For EACH ITEM in the collection: A string that specifies the value of the shape data item.
+             * For EACH ITEM in the collection: A string that contains the comment text.
              *
              * [Api set:  1.1]
              */
@@ -52015,21 +62025,21 @@ declare namespace Visio {
             $all?: boolean;
             /**
              *
-             * A string that specifies the label of the shape data item.
+             * A string that specifies the name of the author of the comment.
              *
              * [Api set:  1.1]
              */
             author?: boolean;
             /**
              *
-             * A string that specifies the format of the shape data item.
+             * A string that specifies the date when the comment was created.
              *
              * [Api set:  1.1]
              */
             date?: boolean;
             /**
              *
-             * A string that specifies the value of the shape data item.
+             * A string that contains the comment text.
              *
              * [Api set:  1.1]
              */
@@ -52066,6 +62076,15 @@ declare namespace Visio {
      * Executes a batch script that performs actions on the Visio object model, using the request context of previously-created API objects.
      * @param objects - An array of previously-created API objects. The array will be validated to make sure that all of the objects share the same context. The batch will use this shared request context, which means that any changes applied to these objects will be picked up by "context.sync()".
      * @param batch - A function that takes in a Visio.RequestContext and returns a promise (typically, just the result of "context.sync()"). When the promise is resolved, any tracked objects that were automatically allocated during execution will be released.
+     * 
+     * @remarks
+     * In addition to this signature, the method also has the following signatures:
+     * 
+     * `run<T>(batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;`
+     * 
+     * `run<T>(object: OfficeExtension.ClientObject | OfficeExtension.EmbeddedSession, batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;`
+     * 
+     * `run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;`
      */
     function run<T>(objects: OfficeExtension.ClientObject[], batch: (context: Visio.RequestContext) => Promise<T>): Promise<T>;
 }
@@ -52074,3 +62093,21 @@ declare namespace Visio {
 ////////////////////////////////////////////////////////////////
 //////////////////////// End Visio APIs ////////////////////////
 ////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////
+
+
+
+
+////////////////////////////////////////////////////////////////
+///////////////////// Begin PowerPoint APIs ////////////////////
+////////////////////////////////////////////////////////////////
+
+// Empty placeholder, for now
+
+////////////////////////////////////////////////////////////////
+////////////////////// End PowerPoint APIs /////////////////////
+////////////////////////////////////////////////////////////////
diff --git a/types/office-js/office-js-tests.ts b/types/office-js/office-js-tests.ts
index f6ebe63a96..43249712e1 100644
--- a/types/office-js/office-js-tests.ts
+++ b/types/office-js/office-js-tests.ts
@@ -316,3 +316,21 @@ async function test_interfaces() {
 		range.set(rangeSettables);
 	});
 }
+
+async function testResumeExistingObject () {
+	let range: Excel.Range;
+	await Excel.run(async context => {
+		range = context.workbook.getSelectedRange();
+		await context.sync();
+	});
+
+	await Excel.run(range, async context => {
+		range.clear();
+		await context.sync();
+	});
+
+	await Excel.run({delayForCellEdit: true, previousObjects: range}, async context => {
+		range.clear();
+		await context.sync();
+	});
+}
diff --git a/types/oja/index.d.ts b/types/oja/index.d.ts
new file mode 100644
index 0000000000..f1d123d3f0
--- /dev/null
+++ b/types/oja/index.d.ts
@@ -0,0 +1,90 @@
+// Type definitions for oja 1.1
+// Project: https://github.com/dimichgh/oja#readme
+// Definitions by: Laurens Stötzel <https://github.com/buffcode>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import { Readable } from "stream";
+import { EventEmitter } from "events";
+export type ConsumerCallback = (payload: any, runtime: Flow) => void;
+
+export type Primitive =
+    | boolean
+    | number
+    | string
+    | symbol
+    | null
+    | undefined;
+
+export interface State {
+    queue: string[];
+    pending: string[];
+}
+
+export type DefinitionFunction = (publisher: StageContext, runtime: Flow) => any;
+
+export type AddableFunction = (runtime: Flow) => void;
+export type AddableToAction = Action | AddableFunction;
+
+export class EventContext {
+    new(context: EventContext | object): this;
+    stageContext(topics: string | ReadonlyArray<string>): StageContext;
+    state(): State;
+    repub(type: string, handler: (event: any) => void): void;
+    on(type: string, handler: (event: any) => void): this;
+    once(type: string, handler: (event: any) => void): this;
+    emit(name: string, value: any): this;
+    get(name: string): any;
+}
+
+export class StageContext extends EventContext {
+    pub(data: any): void;
+}
+
+export class ReadableStream extends Readable {
+    new(topic: string, emitter: EventEmitter): this;
+    push(data: any): boolean;
+}
+
+export class Flow {
+    constructor(baseFlow?: Flow);
+    consume(topic: string | ReadonlyArray<string>, callback: ConsumerCallback): this;
+    consume(topic: string): Promise<any>;
+    consume(
+        topics: ReadonlyArray<string>
+    ): Promise<{
+        [key: string]: string;
+    }>;
+    consumeStream(
+        topic: string,
+        callback: (stream: ReadableStream) => void
+    ): this;
+    consumeStream(topic: string): ReadableStream;
+    getReader(
+        topic: string
+    ): {
+        next(): Promise<any>;
+    };
+    define(topics: string | ReadonlyArray<string>): StageContext;
+    define(
+        topic: string,
+        data: Promise<Primitive> | DefinitionFunction | object | Primitive
+      ): this;
+    catch(callback: (err: any) => void): this;
+    timeout(topics: string |  ReadonlyArray<string>, ms: number): this;
+    state(): State;
+}
+
+export class Action extends Flow {
+    constructor();
+    activate(): this;
+    execute(): void;
+    add(...child: AddableToAction[]): this;
+}
+
+export class FunctionAction extends Action {
+    constructor(callback: (runtime: FunctionAction) => any);
+    execute(): any;
+}
diff --git a/types/oja/oja-tests.ts b/types/oja/oja-tests.ts
new file mode 100644
index 0000000000..9ee12587af
--- /dev/null
+++ b/types/oja/oja-tests.ts
@@ -0,0 +1,278 @@
+import { Action, Flow, StageContext } from "oja";
+
+new Action().activate();
+
+class MyAction extends Action {
+    execute() {
+        this.define('foo', 'bar');
+    }
+}
+
+new MyAction()
+    .activate()
+    .consume('foo', data => console.log(data));
+
+class Greet extends Action {
+    execute() {
+        this.define('greet', 'Hello');
+    }
+}
+
+// demonstrate generic function instead of action object
+function who(flow: Flow) {
+    // demonstrate re-mapping
+    flow.consume('name', name => {
+        flow.define('who', name);
+    });
+}
+
+class Greeting extends Action {
+    execute() {
+        this.consume(['greet', 'who'], data => {
+            this.define('greeting', `${data.greet} ${data.who}`);
+        });
+    }
+}
+
+const helloAction = new Greeting();
+helloAction
+    .add(new Greet())
+    .add(who)
+    .activate()
+    .define('name', 'World')
+    .consume('greeting', console.log); // prints Hello World
+
+// create consumer component
+const flow = new Flow();
+const consumer = flow.consume('foo');
+consumer.then(foo => {
+    console.log(foo); // prints 'bar'
+});
+
+// define producer component
+const producer = flow.define('foo');
+// publish
+producer.pub('bar');
+
+flow
+    .consume('foo', foo => {
+        console.log(foo); // prints 'bar'
+    })
+    .define('foo', 'bar');
+
+// Consuming multiple events for the given topic
+// create consumer component
+flow
+    .consume('foo', foo => {
+        console.log(foo); // prints 'bar1' and 'bar2'
+    })
+    // generate events
+    .define('foo', 'bar1')
+    .define('foo', 'bar2');
+
+// Consuming events as a stream
+const buffer: any[] = [];
+// create consumer stream
+const stream = flow.consumeStream('foo');
+stream.on('data', data => buffer.push(data));
+stream.on('end', () => {
+    console.log(buffer); // prints one, two, three
+});
+// generate some data
+flow.define('foo', 'one');
+flow.define('foo', 'two');
+flow.define('foo', 'three');
+flow.define('foo', null);
+
+// create consumer stream
+const reader = flow.getReader('foo');
+// generate some data
+flow.define('foo', 'one');
+flow.define('foo', 'two');
+flow.define('foo', 'three');
+flow.define('foo', null);
+
+async function read() {
+    while (true) {
+        const data = await reader.next();
+        if (data === undefined) {
+            break;
+        }
+        console.log(data);
+    }
+}
+
+read();
+
+// Consuming multiple topics in one short
+// consume multiple topics
+flow.consume(['foo', 'qoo'], input => {
+    console.log(input.foo);     // prints faa
+    console.log(input.qoo);     // prints qaa
+});
+flow.define('foo', 'faa');
+flow.define('qoo', 'qaa');
+
+// Using promise
+// create consumer component
+flow
+    .consume('foo', foo => {
+        console.log(foo); // prints 'bar'
+    })
+    .define('foo', new Promise(resolve => {
+        resolve('bar');
+    }));
+
+// Multiple consumers, single producer
+// create consumer component
+flow
+    .consume('foo', foo => {
+        console.log(foo); // prints 'bar'
+    })
+    .consume('foo', foo => {
+        console.log(foo); // prints 'bar'
+    })
+    .define('foo', 'bar');
+
+// NOTE: the order of consume/define does not matter
+// create consumer component
+flow
+    .consume('foo', (foo, runtime) => {
+        console.log(foo); // prints 'faa'
+        runtime.define('qoo', 'qaa'); // can consume and produce new data
+    })
+    .consume('qoo', (qoo, runtime) => {
+        console.log(qoo); // prints 'qaa'
+        runtime.define('woo', Promise.resolve('waa')); // can use async promise
+    })
+    // start chain reaction here
+    .define('foo', 'faa')
+    // lets produce multiple events via event emitter
+    .consume('woo', (woo, runtime) => {
+        console.log(woo); // prints waa
+        // define as event emitter
+        const roo = runtime.define('roo');
+        // simulate async flow with two event emitted
+        setImmediate(() => {
+            // generate multiple events
+            roo.pub('raa1');
+            roo.pub('raa2');
+        });
+    })
+    // validate
+    .consume('roo', roo => {
+        console.log(roo);   // prints raa1 and raa2
+    })
+    // consume multiple topics
+    .consume(['foo', 'qoo'], input => {
+        console.log(input.foo);     // prints faa
+        console.log(input.qoo);     // prints qaa
+    })
+    // can consume inside consume
+    .consume('foo', (foo, runtime) => {
+        console.log(foo);     // prints faa
+        runtime.consume('qoo', qoo => {
+            console.log(qoo);     // prints qaa
+        });
+        // or
+        flow.consume('qoo', qoo => {
+            console.log(qoo);     // prints qaa
+        });
+    })
+    // can generate multiple events using pub
+    .define('doo', (publisher: StageContext) => {
+        publisher.pub('daa1');
+        publisher.pub('daa2');
+        publisher.pub('daa3');
+        publisher.pub(null);
+    })
+    .consume('doo', doo => {
+        console.log(doo); // prints daa1, daa2, daa3, null
+    })
+    .consumeStream('doo', stream => {
+        stream.on('data', console.log); // prints daa1, daa2, daa3
+        stream.on('end', () => console.log('end of "doo"'));
+    })
+    // NOTE: we can consume first event via promise if we are not interested in the rest
+    .consume('doo').then(doo => {
+    console.log(doo); // prints daa1
+});
+
+// for debug you can listen to all events
+flow.consume('*', evt => {
+    console.log(`Event type: ${evt.name}, data: ${evt.data}`);
+});
+
+// Join flows together
+const base = new Flow();
+base.define('foo', 'bar');
+let subFlow = new Flow(base);
+subFlow.consume('foo', foo => {
+    console.log(foo); // prints bar
+});
+
+base.consume('shared', (_, rt) => {
+    rt.define('foo', 'bar');
+});
+subFlow = new Flow(base);
+flow.consume('foo', foo => {
+    console.log(foo); // prints bar
+});
+flow.define('shared', ''); // trigger the chain
+
+// Timeouts
+flow
+    .timeout(['foo', 'bar'], 300)   // 300 ms
+    .define('bar', 'boo')
+    .catch(err => {
+        console.log(err.message); // prints "Topic/s (foo) timed out, pending topics (too)"
+    });
+
+// Querying for state
+console.log(flow.state()); // prints [foo, too]
+
+// Throwing error
+flow.define('error', new Error('Boom'));
+// or
+flow.define('error', Promise.reject(new Error('Boom')));
+// or
+flow.define('data', () => {
+    return new Error('Boom');
+});
+// or
+flow.define('data', (runtime: StageContext) => {
+    runtime.pub(new Error('Boom'));
+});
+
+// Catching error
+flow.catch(err => {
+    console.log(err);   // prints Boom if linked to the above flow
+});
+// Or
+flow.consume('error', err => {
+    console.log(err);   // prints Boom if linked to the above flow
+});
+
+// Error stops flow
+flow
+    .define('foo', 'faa')
+    .define('boo', 'baa')
+    .define('error', new Error('Boom'))
+    .define('too', 'taa')
+    .consume('foo', foo => {
+        console.log(foo); // prints faa
+    })
+    .consume('boo', foo => {
+        console.log(foo); // prints baa
+    })
+    .consume('too', too => {
+        // will never happen
+        throw new Error('Should never happen');
+    })
+    .catch(err => { // catch error
+        console.log(err);   // print Boom
+    });
+
+// Composing complex flows
+const baseFlow = new Flow();
+new Flow(baseFlow);
diff --git a/types/oja/tsconfig.json b/types/oja/tsconfig.json
new file mode 100644
index 0000000000..6fac615aaa
--- /dev/null
+++ b/types/oja/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",
+        "oja-tests.ts"
+    ]
+}
diff --git a/types/oja/tslint.json b/types/oja/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/oja/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/omggif/index.d.ts b/types/omggif/index.d.ts
new file mode 100644
index 0000000000..f7d374ddbb
--- /dev/null
+++ b/types/omggif/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for omggif 1.0
+// Project: https://github.com/deanm/omggif
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+export interface GifOptions {
+    background?: number;
+    loop?: number;
+    palette?: number[];
+}
+
+export interface FrameOptions {
+    delay?: number;
+    disposal?: number;
+    palette?: number[] | null;
+    transparent?: number;
+}
+
+export interface Frame {
+    data_length: number;
+    data_offset: number;
+    delay: number;
+    disposal: number;
+    has_local_palette: boolean;
+    height: number;
+    interlaced: boolean;
+    palette_offset: number | null;
+    palette_size: number | null;
+    transparent_index: number | null;
+    width: number;
+    x: number;
+    y: number;
+}
+
+export class GifWriter {
+    height: number;
+    width: number;
+
+    constructor(buf: Buffer, width: number, height: number, gopts?: GifOptions);
+
+    addFrame(x: number, y: number, w: number, h: number, indexed_pixels: number[], opts?: FrameOptions): number;
+    end(): number;
+    getOutputBuffer(): Buffer;
+    getOutputBufferPosition(): number;
+    setOutputBuffer(v: Buffer): void;
+    setOutputBufferPosition(v: number): void;
+}
+
+export class GifReader {
+    constructor(buf: Buffer);
+
+    decodeAndBlitFrameBGRA(frame_num: number, pixels: number[]): void;
+    decodeAndBlitFrameRGBA(frame_num: number, pixels: number[]): void;
+    frameInfo(frame_num: number): Frame;
+    loopCount(): number;
+    numFrames(): number;
+}
diff --git a/types/omggif/omggif-tests.ts b/types/omggif/omggif-tests.ts
new file mode 100644
index 0000000000..c20df1f446
--- /dev/null
+++ b/types/omggif/omggif-tests.ts
@@ -0,0 +1,84 @@
+import * as omggif from 'omggif';
+
+// (c) Dean McNamee <dean@gmail.com>, 2013.
+// Node omggif example to write out a few example images.
+
+// Needs to be large enough for the final full file size.  Can be any type of
+// buffer that supports [] (an Array, Uint8Array, Node Buffer, etc).
+const buf = new Buffer(1024 * 1024);
+
+function gen_static_global() {
+    const gf = new omggif.GifWriter(buf, 2, 2, { palette: [0xff0000, 0x0000ff] });
+    gf.addFrame(0, 0, 2, 2, [0, 1, 1, 0]);
+    return gf.end();
+}
+
+function gen_anim() {
+    // The loop parameter is the number of times to loop, or 0 for forever.
+    // A value of 1 will play twice (first time, and then one loop time).
+    // To play only once do not specify loop or pass null.
+    const gf = new omggif.GifWriter(buf, 2, 2, { loop: 1 });
+    gf.addFrame(0, 0, 2, 2, [0, 1, 1, 0], { palette: [0xff0000, 0x0000ff] });
+    gf.addFrame(0, 0, 2, 2, [1, 0, 0, 1], {
+        palette: [0xff0000, 0x0000ff],
+        delay: 10,
+    }); // Delay in hundredths of a sec (100 = 1s).
+    return gf.end();
+}
+
+function gen_gray_strip() {
+    const gf = new omggif.GifWriter(buf, 256, 1);
+    const palette = [];
+    const indices = [];
+    for (let i = 0; i < 256; ++i) {
+        palette.push((i << 16) | (i << 8) | i);
+        indices.push(i);
+    }
+    gf.addFrame(0, 0, 256, 1, indices, { palette });
+    return gf.end();
+}
+
+// More than 8-bit color (via tiling of several frames).  Browsers seem to
+// treat this as an animation though, with an enforced minimum time between
+// frames which makes it animated instead of the intended static image.
+function gen_color_strip() {
+    const gf = new omggif.GifWriter(buf, 256, 256, {
+        palette: [0x000000, 0xff0000],
+        background: 1,
+    });
+
+    const indices = [];
+    for (let i = 0; i < 256; ++i) indices.push(i);
+
+    for (let j = 0; j < 256; ++j) {
+        const palette = [];
+        for (let i = 0; i < 256; ++i) palette.push((j << 16) | (i << 8) | i);
+        gf.addFrame(0, j, 256, 1, indices, { palette, disposal: 1 });
+    }
+    return gf.end();
+}
+
+// 1x1 white, generates the same as Google's 35 byte __utm.gif, except for some
+// reason that I'm not sure of they set their background index to 255.
+function gen_empty_white() {
+    const gf = new omggif.GifWriter(buf, 1, 1, { palette: [0xffffff, 0x000000] });
+    gf.addFrame(0, 0, 1, 1, [0]);
+    return gf.end();
+}
+
+// with lzw block of 256.
+// see: https://github.com/deanm/omggif/issues/5
+function gen_block256() {
+    const width = 4840;
+    const gf = new omggif.GifWriter(buf, width, 1, {
+        palette: [0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000, 0x000000],
+    });
+    const stream = Array(width);
+    for (let i = 0; i < width; ++i) stream[i] = i & 0x7;
+    gf.addFrame(0, 0, width, 1, stream, { transparent: 0 });
+    const data = buf.slice(0, gf.end());
+    // Make sure it decodes.
+    const gr = new omggif.GifReader(data);
+    const frameInfo = gr.frameInfo(0);
+    return frameInfo;
+}
diff --git a/types/omggif/tsconfig.json b/types/omggif/tsconfig.json
new file mode 100644
index 0000000000..fdc89342ec
--- /dev/null
+++ b/types/omggif/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",
+        "omggif-tests.ts"
+    ]
+}
diff --git a/types/omggif/tslint.json b/types/omggif/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/omggif/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/onoff/index.d.ts b/types/onoff/index.d.ts
index c080025735..72c25d11f5 100644
--- a/types/onoff/index.d.ts
+++ b/types/onoff/index.d.ts
@@ -12,7 +12,8 @@ declare namespace __ONOFF {
     var version:string;
 
     interface GpioOptions {
-        debounceTimeout:number;
+        debounceTimeout?:number;
+        activeLow?:boolean;
     }
 
     class Gpio {
@@ -50,4 +51,4 @@ declare namespace __ONOFF {
         unexport():void;
     }
 
-}
\ No newline at end of file
+}
diff --git a/types/openfin/index.d.ts b/types/openfin/index.d.ts
index 9428247938..275effa162 100644
--- a/types/openfin/index.d.ts
+++ b/types/openfin/index.d.ts
@@ -1188,6 +1188,10 @@ declare namespace fin {
      * The new window appears in the same process as the parent window.
      */
     interface OpenFinWindow {
+        /**
+         * uuid of the application that the window belongs to.
+         */
+        uuid: string;
         /**
          * Name of window
          */
diff --git a/types/openlayers/index.d.ts b/types/openlayers/index.d.ts
index a4d4f52d5e..3214bad15c 100644
--- a/types/openlayers/index.d.ts
+++ b/types/openlayers/index.d.ts
@@ -9,6 +9,7 @@
 //                 Yair Tawil <https://github.com/yairtawil>
 //                 Pierre Marchand <https://github.com/pierremarc>
 //                 Hauke Stieler <https://github.com/hauke96>
+//                 Guillaume Beraudo <https://github.com/gberaudo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Definitions partially generated using tsd-jsdoc (https://github.com/englercj/tsd-jsdoc)
 
@@ -1715,7 +1716,7 @@ export class Feature extends Object {
      * representing the current style of this feature.
      * @api stable
      */
-    getStyleFunction(): (ol.FeatureStyleFunction);
+    getStyleFunction(): (ol.FeatureStyleFunction | undefined);
 
     /**
      * Set the default geometry for the feature.  This will update the property
@@ -1734,7 +1735,7 @@ export class Feature extends Object {
      * @api stable
      * @observable
      */
-    setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction)): void;
+    setStyle(style: (ol.style.Style | ol.style.Style[] | ol.FeatureStyleFunction | ol.StyleFunction | null)): void;
 
     /**
      * Set the feature id.  The feature id is considered stable and may be used when
@@ -6412,7 +6413,7 @@ export namespace layer {
          * @return Layer style function.
          * @api stable
          */
-        getStyleFunction(): (ol.StyleFunction);
+        getStyleFunction(): (ol.StyleFunction | undefined);
 
         /**
          * Set the style for features.  This can be a single style object, an array
@@ -6424,7 +6425,7 @@ export namespace layer {
          * @param style Layer style.
          * @api stable
          */
-        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction | null | undefined)): void;
     }
 
     /**
@@ -8472,7 +8473,7 @@ export namespace source {
          * @return Layer style function.
          * @api stable
          */
-        getStyleFunction(): (ol.StyleFunction);
+        getStyleFunction(): (ol.StyleFunction | undefined);
 
         /**
          * Set the style for features.  This can be a single style object, an array
@@ -8484,7 +8485,7 @@ export namespace source {
          * @param style Layer style.
          * @api stable
          */
-        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction)): void;
+        setStyle(style: (ol.style.Style | ol.style.Style[] | ol.StyleFunction | null | undefined)): void;
     }
 
     /**
@@ -10135,6 +10136,13 @@ export namespace style {
          */
         getLineDash(): number[];
 
+        /**
+         * Get the line dash offset style for the stroke.
+         * @return Line dash offset
+         * @api
+         */
+        getLineDashOffset(): number;
+
         /**
          * Get the line join type for the stroke.
          * @return Line join.
@@ -10186,6 +10194,14 @@ export namespace style {
          */
         setLineDash(lineDash: number[]): void;
 
+        /**
+         * Set the line dash offset.
+         *
+         * @param lineDashOffset Line dash offset.
+         * @api
+         */
+        setLineDashOffset(lineDashOffset: number): void;
+
         /**
          * Set the line join.
          *
@@ -10816,7 +10832,7 @@ export type FeatureLoader = (extent: ol.Extent, resolution: number, proj: ol.pro
  * {@link ol.Feature} to be styled.
  *
  */
-export type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[]);
+export type FeatureStyleFunction = (resolution: number) => (ol.style.Style | ol.style.Style[] | null);
 
 /**
  * {@link ol.source.Vector} sources use a function of this type to get the url
@@ -10966,7 +10982,7 @@ export interface StyleImageOptions {
  * or an array of them. This way e.g. a vector layer can be styled.
  *
  */
-export type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[]);
+export type StyleFunction = (feature: (ol.Feature | ol.render.Feature), resolution: number) => (ol.style.Style | ol.style.Style[] | null);
 
 /**
  * A function that takes an {@link ol.Feature} as argument and returns an
@@ -12347,6 +12363,7 @@ export namespace olx {
             lineCap?: string;
             lineJoin?: string;
             lineDash?: number[];
+            lineDashOffset?: number;
             miterLimit?: number;
             width?: number;
         }
diff --git a/types/openlayers/openlayers-tests.ts b/types/openlayers/openlayers-tests.ts
index d97a96c9de..d631a9e9bb 100644
--- a/types/openlayers/openlayers-tests.ts
+++ b/types/openlayers/openlayers-tests.ts
@@ -74,6 +74,7 @@ const style = new ol.style.Style();
 const styleArray: ol.style.Style[] = [];
 const styleFunction: ol.StyleFunction = (feature, resolution) => style;
 let styleRegularShape: ol.style.RegularShape;
+let styleStroke: ol.style.Stroke;
 const tilegrid = new ol.tilegrid.TileGrid({resolutions: numberArray});
 const transformFn: ol.TransformFunction = (array, out, dimension) => numberArray;
 let units: ol.proj.Units;
@@ -411,11 +412,20 @@ feature.setGeometry(geometry);
 feature.setGeometryName(stringValue);
 feature.setId(stringValue);
 feature.setId(numberValue);
+feature.setStyle(null);
 feature.setStyle(style);
 feature.setStyle(styleArray);
 feature.setStyle(featureStyleFunction);
 feature.setStyle(styleFunction);
 feature.setProperties(object);
+const nullStyleFunction = (feature: (ol.Feature|ol.render.Feature), resolution: number): null => {
+    return null;
+};
+const nullFeatureStyleFunction = (resolution: number): null => {
+  return null;
+};
+feature.setStyle(nullStyleFunction);
+feature.setStyle(nullFeatureStyleFunction);
 
 //
 // ol.View
@@ -571,6 +581,10 @@ const vectorLayer: ol.layer.Vector = new ol.layer.Vector({
     zIndex: -1
 });
 
+vectorLayer.setStyle(nullStyleFunction);
+vectorLayer.setStyle(null);
+vectorLayer.setStyle(undefined);
+
 //
 // ol.layer.VectorTile
 //
@@ -1110,6 +1124,35 @@ styleRegularShape = new ol.style.RegularShape({
     points: 4,
 });
 
+//
+// ol.style.Stroke
+//
+
+styleStroke = new ol.style.Stroke();
+styleStroke.setColor('#FF0000');
+styleStroke.setColor('red');
+styleStroke.setColor('#CCC');
+styleStroke.setColor('rgb(255, 255, 255)');
+styleStroke.setColor('rgb(255, 255, 255, 0.7)');
+styleStroke.setLineCap('butt');
+styleStroke.setLineCap('round');
+styleStroke.setLineCap('square');
+styleStroke.setLineJoin('bevel');
+styleStroke.setLineJoin('round');
+styleStroke.setLineJoin('miter');
+styleStroke.setLineDash([10, 5]);
+styleStroke.setLineDashOffset(10);
+styleStroke.setMiterLimit(20);
+styleStroke.setWidth(5);
+
+const strokeColor: ol.Color|ol.ColorLike = styleStroke.getColor();
+const strokeLineCap: string = styleStroke.getLineCap();
+const strokeLineJoin: string = styleStroke.getLineJoin();
+const strokeLineDash: number[] = styleStroke.getLineDash();
+const strokeLineDashOffset: number = styleStroke.getLineDashOffset();
+const strokeMiterLimit: number = styleStroke.getMiterLimit();
+const strokeWidth: number = styleStroke.getWidth();
+
 //
 // ol.proj
 //
diff --git a/types/ora/v0/index.d.ts b/types/ora/v0/index.d.ts
index 536d858bd7..771f6beef6 100644
--- a/types/ora/v0/index.d.ts
+++ b/types/ora/v0/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for ora v0.3.0
+// Type definitions for ora 0.3
 // Project: https://github.com/sindresorhus/ora
-// Definitions by: Basarat Ali Syed <https://github.com/basarat/>, Christian Rackerseder <https://github.com/screendriver>
+// Definitions by: Basarat Ali Syed <https://github.com/basarat>, Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
diff --git a/types/ora/v0/tslint.json b/types/ora/v0/tslint.json
index a41bf5d19a..3db14f85ea 100644
--- a/types/ora/v0/tslint.json
+++ b/types/ora/v0/tslint.json
@@ -1,79 +1 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
-}
+{ "extends": "dtslint/dt.json" }
diff --git a/types/orientjs/index.d.ts b/types/orientjs/index.d.ts
index 19f615efd0..31980678bb 100644
--- a/types/orientjs/index.d.ts
+++ b/types/orientjs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/orientechnologies/orientjs
 // Definitions by: [Saeed Tabrizi] <https://github.com/saeedtabrizi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 // Last Update  : 20-7-2017
 // Compatible with Orientdb >= 2.2.15 and orientjs >= 2.2.x features .
diff --git a/types/overwatch-api/index.d.ts b/types/overwatch-api/index.d.ts
new file mode 100644
index 0000000000..bd7af1dcf0
--- /dev/null
+++ b/types/overwatch-api/index.d.ts
@@ -0,0 +1,329 @@
+// Type definitions for overwatch-api 0.5
+// Project: https://github.com/alfg/overwatch-api
+// Definitions by: Joshua Hall <https://github.com/JoshuaHall>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.1
+
+export type callbackFunc<T> = (err: Error | null, data: T) => void;
+
+export type OverwatchPlatform = "pc" | "xbl" | "psn";
+export type OverwatchServerRegion = "us" | "eu" | "kr" | "cn" | "global";
+export type OverwatchHero =
+    | "Zarya"
+    | "Mercy"
+    | "Reinhardt"
+    | "Zenyatta"
+    | "Hanzo"
+    | "Orisa"
+    | "Genji"
+    | "Roadhog"
+    | "McCree"
+    | "Tracer"
+    | "Ana"
+    | "Winston"
+    | "D.Va"
+    | "Moira"
+    | "Junkrat"
+    | "Soldier: 76"
+    | "Brigitte"
+    | "Lúcio"
+    | "Torbjörn"
+    | "Reaper"
+    | "Pharah"
+    | "Widowmaker"
+    | "Bastion"
+    | "Symmetra"
+    | "Mei"
+    | "Sombra"
+    | "Doomfist";
+
+export interface GameType {
+    won: number;
+    played: number;
+}
+
+export type QuickplayGameType = GameType;
+
+export interface CompetitiveGameType extends GameType {
+    lost: number;
+    draw: number;
+    win_rate: number;
+}
+
+export interface GameTypes {
+    quickplay: QuickplayGameType;
+    competitive: CompetitiveGameType;
+}
+
+export interface Playtime {
+    quickplay: string;
+    competitive: string;
+}
+
+export interface CompetitiveRankInfo {
+    rank: number;
+    rank_img: string;
+}
+
+export interface OverwatchApiResponse {
+    username: string;
+    level: number;
+    portrait: string;
+    private: boolean;
+}
+
+export interface ProfileApiResponse extends OverwatchApiResponse {
+    games: GameTypes;
+    playtime: Playtime;
+    competitive: CompetitiveRankInfo;
+    levelFrame: string;
+    star: string;
+}
+
+export interface TopHeroStats {
+    hero: OverwatchHero;
+    img: string;
+}
+
+export interface HeroTimePlayed extends TopHeroStats {
+    played: string;
+}
+
+export interface HeroGamesWon extends TopHeroStats {
+    games_won: string;
+}
+
+export interface HeroWinRate extends TopHeroStats {
+    win_rate: string;
+}
+
+export interface Stat {
+    title: string;
+    value: string;
+}
+
+export interface StatsByGameType<T> {
+    quickplay: T[];
+    competitive: T[];
+}
+
+export interface StatByGameType<T, U> {
+    quickplay: T;
+    competitive: U;
+}
+
+export interface QuickplayTopHeroData {
+    played: HeroTimePlayed[];
+    games_won: HeroGamesWon[];
+}
+
+export interface CompetitiveTopHeroData extends QuickplayTopHeroData {
+    win_rate: HeroWinRate[];
+}
+
+export interface StatsCategories {
+    top_heroes: StatByGameType<
+        QuickplayTopHeroData,
+        CompetitiveTopHeroData
+    >;
+    combat: StatsByGameType<Stat>;
+    match_awards: StatsByGameType<Stat>;
+    assists: StatsByGameType<Stat>;
+    average: StatsByGameType<Stat>;
+    miscellaneous: StatsByGameType<Stat>;
+    best: StatsByGameType<Stat>;
+    game: StatsByGameType<Stat>;
+}
+
+export interface StatsApiResponse extends OverwatchApiResponse {
+    stats: StatsCategories;
+}
+
+export function getProfile(
+    platform: OverwatchPlatform,
+    region: OverwatchServerRegion,
+    tag: string,
+    callback: callbackFunc<ProfileApiResponse>,
+): void;
+export function getStats(
+    platform: OverwatchPlatform,
+    region: OverwatchServerRegion,
+    tag: string,
+    callback: callbackFunc<StatsApiResponse>,
+): void;
+export namespace owl {
+    interface ApiResponse<T> {
+        data: T;
+    }
+
+    interface StandingInfo {
+        matchWin: number;
+        matchLoss: number;
+        matchDraw: number;
+        matchBye: number;
+        gameWin: number;
+        gameLoss: number;
+        gameTie: number;
+        gamePointsFor: number;
+        gamePointsAgainst: number;
+        placement: number;
+    }
+
+    interface StandingComparison {
+        key: string;
+        value: number;
+    }
+
+    interface StageStandingInfo extends PreseasonStandingInfo {
+        isPlayoffWinner: boolean;
+    }
+
+    interface Stages {
+        stage1: StageStandingInfo;
+        stage2: StageStandingInfo;
+        stage3: StageStandingInfo;
+        stage4: StageStandingInfo;
+    }
+
+    interface PreseasonStandingInfo extends StandingInfo {
+        comparisons: StandingComparison[];
+    }
+
+    interface TeamStandingInfo {
+        id: number;
+        divisionId: number;
+        name: string;
+        abbreviatedName: string;
+        league: StandingInfo;
+        stages: Stages;
+        preseason: PreseasonStandingInfo;
+    }
+
+    interface LiveMatchData {
+        liveMatch: {};
+    }
+
+    interface TournamentData {
+        id: number;
+        type: string;
+    }
+
+    interface MatchScores {
+        value: number;
+    }
+
+    interface TeamData {
+        id: number;
+        availableLanguages: string[];
+        handle: string;
+        name: string;
+        homeLocation: string;
+        primaryColor: string;
+        secondaryColor: string;
+        game: string;
+        abbreviatedName: string;
+        addressCountry: string;
+        logo: string;
+        icon: string;
+        secondaryPhoto: string;
+        type: string;
+    }
+
+    interface MatchGameScore {
+        team1: number;
+        team2: number;
+    }
+
+    interface MatchGameAttributeData {
+        instanceID: string;
+        map: string;
+        mapScore: MatchGameScore;
+    }
+
+    type ScoreTuple = [number, number];
+
+    interface MatchGameData {
+        id: number;
+        points: ScoreTuple;
+        attributes: MatchGameAttributeData;
+        attributesVersion: string;
+        state: string;
+        status: string;
+        statusReason: string;
+        stats: null;
+        handle: string;
+    }
+
+    interface MatchVideoData {
+        name: number;
+        description: string;
+        vodLink: string;
+        youtubeId: string;
+        thumbnailUrl: string;
+    }
+
+    interface MatchTournamentData {
+        id: number;
+        type: string;
+        location: string;
+    }
+
+    interface MatchData {
+        id: number;
+        competitors: TeamData[];
+        scores: MatchScores[];
+        conclusionValue: number;
+        conclusionStrategy: string;
+        winner: TeamData;
+        state: string;
+        status: string;
+        statusReason: string;
+        attributes: {};
+        games: MatchGameData[];
+        clientHints: any[];
+        dateCreated: number;
+        flags: any[];
+        handle: string;
+        startDate: string;
+        endDate: string;
+        showStartTime: boolean;
+        showEndTime: boolean;
+        startDateTS: number;
+        endDateTS: number;
+        youtubeId: string;
+        wins: ScoreTuple;
+        ties: ScoreTuple;
+        losses: ScoreTuple;
+        videos: MatchVideoData[];
+        tournament: MatchTournamentData;
+    }
+
+    interface WeekData {
+        id: number;
+        startDate: number;
+        endDate: number;
+        matches: MatchData[];
+        name: string;
+    }
+
+    interface StageScheduleInfo {
+        id: number;
+        slug: string;
+        enabled: boolean;
+        name: string;
+        tournament: TournamentData[];
+        matches: MatchData[];
+        weeks: WeekData[];
+    }
+
+    interface ScheduleInfo {
+        startDate: string;
+        endDate: string;
+        stages: StageScheduleInfo[];
+    }
+
+    function getLiveMatch(callback: callbackFunc<ApiResponse<LiveMatchData>>): void;
+    function getStandings(callback: callbackFunc<ApiResponse<TeamStandingInfo[]>>): void;
+    function getSchedule(callback: callbackFunc<ApiResponse<ScheduleInfo>>): void;
+}
diff --git a/types/overwatch-api/overwatch-api-tests.ts b/types/overwatch-api/overwatch-api-tests.ts
new file mode 100644
index 0000000000..9364e87780
--- /dev/null
+++ b/types/overwatch-api/overwatch-api-tests.ts
@@ -0,0 +1,51 @@
+import { getProfile, OverwatchPlatform, OverwatchServerRegion, ProfileApiResponse, owl, getStats, StatsApiResponse, CompetitiveTopHeroData } from 'overwatch-api';
+
+const platform: OverwatchPlatform = 'pc';
+const region: OverwatchServerRegion = 'us';
+const battleTag = 'sparK#12434';
+
+getProfile(platform, region, battleTag, (err: Error | null, data: ProfileApiResponse) => {
+    if (err === null) {
+        if (data.private) {
+            console.log(`Profile for battletag ${battleTag} is private, cannot retrieve profile`);
+        } else {
+            console.log(`Username: ${data.username}`);
+            console.log(`Level: ${data.level}`);
+            console.log(`Rank: ${data.competitive.rank} SR`);
+            console.log(`Win Rate in Competitive: ${data.games.competitive.win_rate}`);
+        }
+    } else {
+        console.log(err);
+    }
+});
+
+getStats(platform, region, battleTag, (err: Error | null, data: StatsApiResponse) => {
+    if (err === null) {
+        if (data.private) {
+            console.log(`Profile for battletag ${battleTag} is private, cannot retrieve stats`);
+        } else {
+            console.log(`Username: ${data.username}`);
+            console.log(`Level: ${data.level}`);
+            console.log(`Competitive Stats`);
+            const topHeroesComp: CompetitiveTopHeroData = data.stats.top_heroes.competitive;
+            console.log(`Hero with most games won: ${topHeroesComp.games_won[0].hero}`);
+            console.log(`Hero with highest winrate: ${topHeroesComp.win_rate[0].hero}`);
+            console.log(`Hero with most time played ${topHeroesComp.played[0].hero}\n`);
+
+            for (const stat of data.stats.game.competitive) {
+                console.log(`${stat.title}: ${stat.value}`);
+            }
+        }
+    } else {
+        console.log(err);
+    }
+});
+
+owl.getStandings((err: Error | null, data: owl.ApiResponse<owl.TeamStandingInfo[]>) => {
+    if (err === null) {
+        const standingInfo: owl.TeamStandingInfo = data.data[0];
+        console.log(`${standingInfo.name} - ${standingInfo.abbreviatedName}`);
+    } else {
+        console.log(err);
+    }
+});
diff --git a/types/overwatch-api/tsconfig.json b/types/overwatch-api/tsconfig.json
new file mode 100644
index 0000000000..284f7c4d4c
--- /dev/null
+++ b/types/overwatch-api/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",
+        "overwatch-api-tests.ts"
+    ]
+}
diff --git a/types/overwatch-api/tslint.json b/types/overwatch-api/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/overwatch-api/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 b1b093ef77..9b4fbe5e89 100644
--- a/types/owl.carousel/index.d.ts
+++ b/types/owl.carousel/index.d.ts
@@ -61,6 +61,7 @@ declare namespace OwlCarousel {
         dotsContainer?: string | boolean;
         checkVisible?: boolean;
         slideTransition?: string;
+        autoHeight?: boolean;
         // CLASSES
         refreshClass?: string;
         loadingClass?: string;
diff --git a/types/p-cancelable/index.d.ts b/types/p-cancelable/index.d.ts
index 4f26cd17ca..775400bca8 100644
--- a/types/p-cancelable/index.d.ts
+++ b/types/p-cancelable/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for p-cancelable 0.3
+// Type definitions for p-cancelable 0.5
 // Project: https://github.com/sindresorhus/p-cancelable#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,20 +11,21 @@ interface PCancelableConstructor extends PromiseConstructor {
     readonly prototype: PCancelable.PCancelable<any>;
     readonly CancelError: PCancelable.CancelErrorConstructor;
     fn<T, R>(wrapper: (onCancel: (fn?: () => void) => void, input: T) => PromiseLike<R>): (input: T) => PCancelable.PCancelable<R>;
-    new<T>(executor: (onCancel: (fn?: () => void) => void, resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void): PCancelable.PCancelable<T>;
+    new<T>(executor: (resolve: (value?: T | PromiseLike<T>) => void, reject: (reason?: any) => void, onCancel: (fn?: () => void) => void) => void): PCancelable.PCancelable<T>;
 }
 
 declare namespace PCancelable {
     interface PCancelable<T> extends Promise<T> {
-        readonly canceled: boolean;
-        cancel(): void;
+        readonly isCanceled: boolean;
+        cancel(reason?: string): void;
     }
 
     interface CancelErrorConstructor extends ErrorConstructor {
-        new (): CancelError;
+        new (reason?: string): CancelError;
     }
 
     interface CancelError extends Error {
         readonly name: 'CancelError';
+        readonly isCanceled: boolean;
     }
 }
diff --git a/types/p-cancelable/p-cancelable-tests.ts b/types/p-cancelable/p-cancelable-tests.ts
index ca5f728e18..8bd3790e08 100644
--- a/types/p-cancelable/p-cancelable-tests.ts
+++ b/types/p-cancelable/p-cancelable-tests.ts
@@ -3,7 +3,7 @@
 import PCancelableCtor = require('p-cancelable');
 import { EventEmitter } from "events";
 
-const cancelablePromise: PCancelableCtor.PCancelable<{}> = new PCancelableCtor((onCancel, resolve, reject) => {
+const cancelablePromise: PCancelableCtor.PCancelable<{}> = new PCancelableCtor((resolve, reject, onCancel) => {
     class Worker extends EventEmitter {
         close() {
         }
@@ -24,7 +24,7 @@ cancelablePromise
         console.log('Operation finished successfully:', value);
     })
     .catch(reason => {
-        if (cancelablePromise.canceled) {
+        if (cancelablePromise.isCanceled) {
             // Handle the cancelation here
             console.log('Operation was canceled');
             return;
@@ -56,7 +56,7 @@ const fn = PCancelableCtor.fn((onCancel: (fn?: () => void) => void, input: strin
 const promise = fn('input');
 let num: number;
 promise.then(innum => num = innum);
-if (!promise.canceled) {
+if (!promise.isCanceled) {
     promise.cancel();
 }
 
diff --git a/types/p-catch-if/index.d.ts b/types/p-catch-if/index.d.ts
new file mode 100644
index 0000000000..a832b88534
--- /dev/null
+++ b/types/p-catch-if/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for p-catch-if 1.0
+// Project: https://github.com/sindresorhus/p-catch-if#readme
+// Definitions by: Linus Unnebäck <https://github.com/LinusU>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace pCatchIf {
+    type Predicate = ErrorConstructor | ReadonlyArray<ErrorConstructor> | boolean | ((err: Error) => boolean | PromiseLike<boolean>);
+}
+
+declare function pCatchIf<T>(predicate: pCatchIf.Predicate, fn: (err: Error) => T): (err: Error) => T;
+
+export = pCatchIf;
diff --git a/types/p-catch-if/p-catch-if-tests.ts b/types/p-catch-if/p-catch-if-tests.ts
new file mode 100644
index 0000000000..f42679cce6
--- /dev/null
+++ b/types/p-catch-if/p-catch-if-tests.ts
@@ -0,0 +1,39 @@
+import pCatchIf = require('p-catch-if');
+
+/**** Setup "fake" environemt ****/
+
+declare function getData(): Promise<{}>;
+declare function retry<T>(fn: () => T): T;
+declare function recordError(err: Error): undefined;
+declare function isProduction(): boolean;
+declare function sendError(err: Error): Promise<undefined>;
+declare function checkResults(): Promise<boolean>;
+
+declare const TimeoutError: ErrorConstructor;
+declare const NetworkError: ErrorConstructor;
+declare const UnicornError: ErrorConstructor;
+
+declare const console: { error(): undefined };
+
+/**** Use examples from the official library's readme.md ****/
+
+// error constructor
+getData().catch(pCatchIf(TimeoutError, () => retry(getData)));
+
+// multiple error constructors
+getData().catch(pCatchIf([NetworkError, TimeoutError], () => retry(getData)));
+
+// boolean
+getData().catch(pCatchIf(isProduction, recordError));
+
+// function
+const hasUnicornMessage = (err: Error) => err.message.includes('unicorn');
+getData().catch(pCatchIf(hasUnicornMessage, console.error));
+
+// promise-returning function
+const handler = (err: Error) => sendError(err).then(checkResults);
+getData().catch(pCatchIf(handler, console.error));
+
+// can also be nested
+const validateMessage = (err: Error) => err.message === 'Too many rainbows';
+getData().catch(pCatchIf(UnicornError, pCatchIf(validateMessage, console.error)));
diff --git a/types/p-catch-if/tsconfig.json b/types/p-catch-if/tsconfig.json
new file mode 100644
index 0000000000..bdabef2511
--- /dev/null
+++ b/types/p-catch-if/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",
+        "p-catch-if-tests.ts"
+    ]
+}
diff --git a/types/p-catch-if/tslint.json b/types/p-catch-if/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/p-catch-if/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/p-limit/index.d.ts b/types/p-limit/index.d.ts
index 416622298b..af0306cdd9 100644
--- a/types/p-limit/index.d.ts
+++ b/types/p-limit/index.d.ts
@@ -1,10 +1,18 @@
-// Type definitions for p-limit 1.1
+// Type definitions for p-limit 2.0
 // Project: https://github.com/sindresorhus/p-limit#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
+//                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare namespace pLimit {}
-
 export = pLimit;
 
-declare function pLimit(concurrency: number): <T>(fn: () => PromiseLike<T>) => Promise<T>;
+declare function limit<T, A, B, C, D, E, F>(cb: (a: A, b: B, c: C, d: D, e: E, f: F, ...args: any[]) => PromiseLike<T> | T, a: A, b: B, c: C, d: D, e: E, f: F, ...args: any[]): Promise<T>;
+declare function limit<T, A, B, C, D, E, F>(cb: (a: A, b: B, c: C, d: D, e: E, f: F) => PromiseLike<T> | T, a: A, b: B, c: C, d: D, e: E, f: F): Promise<T>;
+declare function limit<T, A, B, C, D, E>(cb: (a: A, b: B, c: C, d: D, e: E) => PromiseLike<T> | T, a: A, b: B, c: C, d: D, e: E): Promise<T>;
+declare function limit<T, A, B, C, D>(cb: (a: A, b: B, c: C, d: D) => PromiseLike<T> | T, a: A, b: B, c: C, d: D): Promise<T>;
+declare function limit<T, A, B, C>(cb: (a: A, b: B, c: C) => PromiseLike<T> | T, a: A, b: B, c: C): Promise<T>;
+declare function limit<T, A, B>(cb: (a: A, b: B) => PromiseLike<T> | T, a: A, b: B): Promise<T>;
+declare function limit<T, A>(cb: (a: A) => PromiseLike<T> | T, a: A): Promise<T>;
+declare function limit<T>(cb: () => PromiseLike<T> | T): Promise<T>;
+
+declare function pLimit(concurrency: number): typeof limit;
diff --git a/types/p-limit/p-limit-tests.ts b/types/p-limit/p-limit-tests.ts
index e04b895e87..51dcb394fe 100644
--- a/types/p-limit/p-limit-tests.ts
+++ b/types/p-limit/p-limit-tests.ts
@@ -11,3 +11,25 @@ const input = [
 Promise.all(input).then(result => {
     const str: string | undefined = result[0];
 });
+
+let str: string;
+
+declare function a(a: string): string;
+declare function b(a: string, b: number): string;
+declare function c(a: string, b: number, c: boolean): string;
+declare function d(a: string, b: number, c: boolean, d: symbol): string;
+declare function e(a: string, b: number, c: boolean, d: symbol, e: 'yes' | 'no'): string;
+declare function f(a: string, b: number, c: boolean, d: symbol, e: 'yes' | 'no', f: 1 | 2): string;
+declare function g(a: string, b: number, c: boolean, d: symbol, e: 'yes' | 'no', f: 1 | 2, g: true): string;
+
+limit(a, 'test').then(v => { str = v; });
+limit(b, 'test', 1).then(v => { str = v; });
+limit(c, 'test', 1, false).then(v => { str = v; });
+limit(d, 'test', 1, false, Symbol('test')).then(v => { str = v; });
+limit(e, 'test', 1, false, Symbol('test'), 'no').then(v => { str = v; });
+limit(f, 'test', 1, false, Symbol('test'), 'no', 2).then(v => { str = v; });
+limit(g, 'test', 1, false, Symbol('test'), 'no', 2, true).then(v => { str = v; });
+
+declare function add(...args: number[]): number;
+
+limit(add, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13).then(v => (v === 91));
diff --git a/types/p-progress/index.d.ts b/types/p-progress/index.d.ts
new file mode 100644
index 0000000000..8eb745683c
--- /dev/null
+++ b/types/p-progress/index.d.ts
@@ -0,0 +1,175 @@
+// Type definitions for p-progress 0.2
+// Project: https://github.com/sindresorhus/p-progress#readme
+// Definitions by: icopp <https://github.com/icopp>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+declare namespace pProgress {
+    interface Options {
+        /**
+         * Number of concurrently pending promises.
+         *
+         * To run the promises in series, set it to 1.
+         *
+         * When this option is set, the first argument must be an array of
+         * promise-returning functions.
+         *
+         * Minimum 1.
+         *
+         * @default {Infinity}
+         */
+        concurrency?: number;
+    }
+}
+
+type PromiseFactory<T> = () => Promise<T> | PromiseLike<T>;
+
+declare class PProgress<T> extends Promise<T> {
+    /**
+     * The current progress percentage of the promise as a number between 0 and
+     * 1.
+     */
+    progress: number;
+
+    /**
+     * Convenience method to run multiple promises and get a total progress of
+     * all of them. It counts normal promises with progress `0` when pending and
+     * progress `1` when resolved. For PProgress type promises, it listens to
+     * their onProgress() method for more fine grained progress reporting. You
+     * can mix and match normal promises and PProgress promises.
+     *
+     * @param promises Array of promises or promise-returning functions.
+     * @throws {TypeError}
+     */
+    static all<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>,
+            PromiseFactory<T5>,
+            PromiseFactory<T6>,
+            PromiseFactory<T7>,
+            PromiseFactory<T8>,
+            PromiseFactory<T9>,
+            PromiseFactory<T10>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4, T5, T6, T7, T8, T9, T10]>;
+    static all<T1, T2, T3, T4, T5, T6, T7, T8, T9>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>,
+            PromiseFactory<T5>,
+            PromiseFactory<T6>,
+            PromiseFactory<T7>,
+            PromiseFactory<T8>,
+            PromiseFactory<T9>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4, T5, T6, T7, T8, T9]>;
+    static all<T1, T2, T3, T4, T5, T6, T7, T8>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>,
+            PromiseFactory<T5>,
+            PromiseFactory<T6>,
+            PromiseFactory<T7>,
+            PromiseFactory<T8>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4, T5, T6, T7, T8]>;
+    static all<T1, T2, T3, T4, T5, T6, T7>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>,
+            PromiseFactory<T5>,
+            PromiseFactory<T6>,
+            PromiseFactory<T7>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4, T5, T6, T7]>;
+    static all<T1, T2, T3, T4, T5, T6>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>,
+            PromiseFactory<T5>,
+            PromiseFactory<T6>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4, T5, T6]>;
+    static all<T1, T2, T3, T4, T5>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>,
+            PromiseFactory<T5>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4, T5]>;
+    static all<T1, T2, T3, T4>(
+        promises: [
+            PromiseFactory<T1>,
+            PromiseFactory<T2>,
+            PromiseFactory<T3>,
+            PromiseFactory<T4>
+        ],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3, T4]>;
+    static all<T1, T2, T3>(
+        promises: [PromiseFactory<T1>, PromiseFactory<T2>, PromiseFactory<T3>],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2, T3]>;
+    static all<T1, T2>(
+        promises: [PromiseFactory<T1>, PromiseFactory<T2>],
+        options?: pProgress.Options
+    ): PProgress<[T1, T2]>;
+    static all<T1>(
+        promises: [PromiseFactory<T1>],
+        options?: pProgress.Options
+    ): PProgress<[T1]>;
+    static all<TAll>(
+        promises: Array<PromiseFactory<TAll>>,
+        options?: pProgress.Options
+    ): PProgress<TAll>;
+
+    /**
+     * Same as the Promise constructor, but with an appended `progress`
+     * parameter in `executor`.
+     *
+     * @param progress
+     *  Call this with progress updates. It expects a number between 0 and 1.
+     *
+     *  Multiple calls with the same number will result in only one
+     *  `onProgress()` event.
+     *
+     *  Progress percentage `1` is reported for you when the promise resolves.
+     *  If you set it yourself, it will simply be ignored.
+     */
+    constructor(
+        executor: (
+            resolve: (value?: T | PromiseLike<T>) => void,
+            reject: (reason?: any) => void,
+            progress: (progress: number) => void
+        ) => void
+    );
+
+    /**
+     * Accepts a function that gets `instance.progress` as an argument and is
+     * called for every progress event.
+     *
+     * @throws {TypeError}
+     */
+    onProgress(cb: (progress: number) => void): void;
+}
+
+export = PProgress;
diff --git a/types/p-progress/p-progress-tests.ts b/types/p-progress/p-progress-tests.ts
new file mode 100644
index 0000000000..eb70dec355
--- /dev/null
+++ b/types/p-progress/p-progress-tests.ts
@@ -0,0 +1,31 @@
+import PProgress = require("p-progress");
+
+new PProgress(async (resolve, reject, progress) => {
+    try {
+        await Promise.resolve("sindresorhus.com");
+        progress(0.5);
+
+        await Promise.resolve("ava.li");
+        progress(1);
+
+        resolve();
+    } catch (e) {
+        reject(e);
+    }
+}).onProgress(progress => {
+    progress;
+});
+
+PProgress.all(
+    [
+        () => Promise.resolve("sindresorhus.com"),
+        () => Promise.resolve("ava.li"),
+        () => Promise.resolve(),
+        () => Promise.resolve(1)
+    ],
+    { concurrency: 2 }
+).then(result => {
+    const str: string = result[0];
+    const str2: string = result[1];
+    const num: number = result[3];
+});
diff --git a/types/p-progress/tsconfig.json b/types/p-progress/tsconfig.json
new file mode 100644
index 0000000000..1cd7ff1976
--- /dev/null
+++ b/types/p-progress/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",
+        "p-progress-tests.ts"
+    ]
+}
diff --git a/types/p-progress/tslint.json b/types/p-progress/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/p-progress/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/p-retry/index.d.ts b/types/p-retry/index.d.ts
index 784f637549..c1791fcc63 100644
--- a/types/p-retry/index.d.ts
+++ b/types/p-retry/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for p-retry 1.0
+// Type definitions for p-retry 2.0
 // Project: https://github.com/sindresorhus/p-retry#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,7 +8,7 @@ import { OperationOptions } from 'retry';
 
 export = pRetry;
 
-declare function pRetry<T>(input: (attemptCount: number) => PromiseLike<T> | T, options?: OperationOptions): Promise<T>;
+declare function pRetry<T>(input: (attemptCount: number) => PromiseLike<T> | T, options?: pRetry.Options): Promise<T>;
 
 declare namespace pRetry {
     class AbortError extends Error {
@@ -16,4 +16,13 @@ declare namespace pRetry {
         readonly originalError: Error;
         constructor(message: string | Error);
     }
+
+    interface FailedAttemptError extends Error {
+        attemptNumber: number;
+        attemptsLeft: number;
+    }
+
+    interface Options extends OperationOptions {
+        onFailedAttempt?: (error: FailedAttemptError) => void;
+    }
 }
diff --git a/types/p-retry/p-retry-tests.ts b/types/p-retry/p-retry-tests.ts
index 72962d553e..1b58960e95 100644
--- a/types/p-retry/p-retry-tests.ts
+++ b/types/p-retry/p-retry-tests.ts
@@ -11,6 +11,11 @@ const run = () => fetch('https://sindresorhus.com/unicorn')
         return response.text();
     });
 
-pRetry(run, {retries: 5}).then(result => {
+pRetry(run, {
+    retries: 5,
+    onFailedAttempt: error => {
+        console.log(`Attempt ${error.attemptNumber} failed. There are ${error.attemptsLeft} attempts left.`);
+    }
+}).then(result => {
     const str: string = result;
 });
diff --git a/types/p-timeout/index.d.ts b/types/p-timeout/index.d.ts
index 882cc7adc8..40e1dc6410 100644
--- a/types/p-timeout/index.d.ts
+++ b/types/p-timeout/index.d.ts
@@ -5,8 +5,8 @@
 
 export = pTimeout;
 
-declare function pTimeout<T>(input: Promise<T>, ms: number, message?: string | pTimeout.TimeoutError): Promise<T>;
-declare function pTimeout<T, R>(input: Promise<T>, ms: number, fallback: () => R | Promise<R>): Promise<T | R>;
+declare function pTimeout<T>(input: PromiseLike<T>, ms: number, message?: string | pTimeout.TimeoutError): Promise<T>;
+declare function pTimeout<T, R>(input: PromiseLike<T>, ms: number, fallback: () => R | Promise<R>): Promise<T | R>;
 
 declare namespace pTimeout {
     class TimeoutError extends Error {
diff --git a/types/p-try/index.d.ts b/types/p-try/index.d.ts
index 82eca22d8c..9c76ef19e1 100644
--- a/types/p-try/index.d.ts
+++ b/types/p-try/index.d.ts
@@ -1,8 +1,16 @@
-// Type definitions for p-try 1.0
+// Type definitions for p-try 2.0
 // Project: https://github.com/sindresorhus/p-try#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
+//                 Linus Unnebäck <https://github.com/LinusU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = pTry;
 
+declare function pTry<T, A, B, C, D, E, F>(cb: (a: A, b: B, c: C, d: D, e: E, f: F, ...args: any[]) => Promise<T> | PromiseLike<T> | T, a: A, b: B, c: C, d: D, e: E, f: F, ...args: any[]): Promise<T>;
+declare function pTry<T, A, B, C, D, E, F>(cb: (a: A, b: B, c: C, d: D, e: E, f: F) => Promise<T> | PromiseLike<T> | T, a: A, b: B, c: C, d: D, e: E, f: F): Promise<T>;
+declare function pTry<T, A, B, C, D, E>(cb: (a: A, b: B, c: C, d: D, e: E) => Promise<T> | PromiseLike<T> | T, a: A, b: B, c: C, d: D, e: E): Promise<T>;
+declare function pTry<T, A, B, C, D>(cb: (a: A, b: B, c: C, d: D) => Promise<T> | PromiseLike<T> | T, a: A, b: B, c: C, d: D): Promise<T>;
+declare function pTry<T, A, B, C>(cb: (a: A, b: B, c: C) => Promise<T> | PromiseLike<T> | T, a: A, b: B, c: C): Promise<T>;
+declare function pTry<T, A, B>(cb: (a: A, b: B) => Promise<T> | PromiseLike<T> | T, a: A, b: B): Promise<T>;
+declare function pTry<T, A>(cb: (a: A) => Promise<T> | PromiseLike<T> | T, a: A): Promise<T>;
 declare function pTry<T>(cb: () => Promise<T> | PromiseLike<T> | T): Promise<T>;
diff --git a/types/p-try/p-try-tests.ts b/types/p-try/p-try-tests.ts
index 054d92e22f..d4db28020e 100644
--- a/types/p-try/p-try-tests.ts
+++ b/types/p-try/p-try-tests.ts
@@ -14,3 +14,23 @@ pTry(() => Promise.resolve('foo')).then(value => {
 pTry(throws).then(value => {
     str = value;
 });
+
+declare function a(a: string): string;
+declare function b(a: string, b: number): string;
+declare function c(a: string, b: number, c: boolean): string;
+declare function d(a: string, b: number, c: boolean, d: symbol): string;
+declare function e(a: string, b: number, c: boolean, d: symbol, e: 'yes' | 'no'): string;
+declare function f(a: string, b: number, c: boolean, d: symbol, e: 'yes' | 'no', f: 1 | 2): string;
+declare function g(a: string, b: number, c: boolean, d: symbol, e: 'yes' | 'no', f: 1 | 2, g: true): string;
+
+pTry(a, 'test').then(v => { str = v; });
+pTry(b, 'test', 1).then(v => { str = v; });
+pTry(c, 'test', 1, false).then(v => { str = v; });
+pTry(d, 'test', 1, false, Symbol('test')).then(v => { str = v; });
+pTry(e, 'test', 1, false, Symbol('test'), 'no').then(v => { str = v; });
+pTry(f, 'test', 1, false, Symbol('test'), 'no', 2).then(v => { str = v; });
+pTry(g, 'test', 1, false, Symbol('test'), 'no', 2, true).then(v => { str = v; });
+
+declare function add(...args: number[]): number;
+
+pTry(add, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13).then(v => (v === 91));
diff --git a/types/page/index.d.ts b/types/page/index.d.ts
index 0f9317c6a4..afd42e0f43 100644
--- a/types/page/index.d.ts
+++ b/types/page/index.d.ts
@@ -1,7 +1,9 @@
-// Type definitions for page v1.5.0
+// Type definitions for page v1.8.6
 // Project: http://visionmedia.github.io/page.js/
 // Definitions by: Alan Norbauer <http://alan.norbauer.com/>
+//                 James Garbutt <https://github.com/43081j>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 declare namespace PageJS {
     interface Static {
@@ -64,7 +66,7 @@ declare namespace PageJS {
          *
          * If you wish to load serve initial content from the server you likely will want to set dispatch to false.
          */
-        (options: Options): void;
+        (options: Partial<Options>): void;
         /**
          * Register page's popstate / click bindings. If you're doing selective binding you'll like want to pass { click: false } to specify this yourself. The following options are available:
          *
@@ -125,7 +127,7 @@ declare namespace PageJS {
          *
          * Identical to page([options]).
          */
-        start(options: Options): void;
+        start(options: Partial<Options>): void;
         /**
          * Register page's popstate / click bindings. If you're doing selective binding you'll like want to pass { click: false } to specify this yourself. The following options are available:
          *
@@ -205,19 +207,23 @@ declare namespace PageJS {
         /**
          * bind to click events (default = true)
          */
-        click?: boolean;
+        click: boolean;
         /**
          * bind to popstate (default = true)
          */
-        popstate?: boolean;
+        popstate: boolean;
         /**
          * perform initial dispatch (default = true)
          */
-        dispatch?: boolean;
+        dispatch: boolean;
         /**
          * add #!before urls (default = false)
          */
-        hashbang?: boolean;
+        hashbang: boolean;
+        /**
+         * remove URL encoding frfrom path components
+         */
+        decodeURLComponents: boolean;
     }
 
     interface Callback {
@@ -279,8 +285,8 @@ declare namespace PageJS {
 }
 
 declare module "page" {
-    var page: PageJS.Static;
-    export = page;
+    const page: PageJS.Static;
+    export default page;
 }
 
 declare var page: PageJS.Static;
diff --git a/types/page/page-tests.ts b/types/page/page-tests.ts
index 9d78998672..cf22ecfc64 100644
--- a/types/page/page-tests.ts
+++ b/types/page/page-tests.ts
@@ -1,6 +1,4 @@
-
-
-import page = require("page");
+import page from 'page';
 
 //***********************************************************************
 // Basic Example
@@ -13,6 +11,16 @@ page('/contact', contact);
 page('/contact/:contactName', contact);
 page('/contact/inline/:contactName', ctx => { });
 page();
+page({
+    click: false,
+    popstate: true,
+    dispatch: false,
+    hashbang: true,
+    decodeURLComponents: false
+});
+page({
+    hashbang: true
+});
 
 var index: PageJS.Callback = function() {
     document.querySelector('p')
@@ -82,4 +90,4 @@ var show: PageJS.Callback = function (ctx) {
 function notfound() {
     document.querySelector('p')
     .textContent = 'not found';
-}
\ No newline at end of file
+}
diff --git a/types/papaparse/index.d.ts b/types/papaparse/index.d.ts
index d97a25010b..de820c771f 100644
--- a/types/papaparse/index.d.ts
+++ b/types/papaparse/index.d.ts
@@ -1,12 +1,17 @@
-// Type definitions for PapaParse v4.1
+// Type definitions for PapaParse v4.5
 // Project: https://github.com/mholt/PapaParse
 // 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>
+//                 Alberto Restifo <https://github.com/albertorestifo>
+//                 Behind The Math <https://github.com/BehindTheMath>
+//                 3af <https://github.com/3af>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
+import "node";
+
 export as namespace Papa;
 
 /**
@@ -16,7 +21,9 @@ export function parse(csvString: string, config?: ParseConfig): ParseResult;
 
 export function parse(file: File, config?: ParseConfig): ParseResult;
 
-export function parse(stream: ReadableStream, config?: ParseConfig): ParseResult;
+export function parse(stream: NodeJS.ReadableStream, config?: ParseConfig): ParseResult;
+
+export function parse(stream: typeof NODE_STREAM_INPUT, config?: ParseConfig): NodeJS.ReadableStream;
 
 /**
  * Unparses javascript data objects and returns a csv string
@@ -45,6 +52,9 @@ export const WORKERS_SUPPORTED: boolean;
 // The relative path to Papa Parse. This is automatically detected when Papa Parse is loaded synchronously.
 export const SCRIPT_PATH: string;
 
+// When passed to Papa Parse a Readable stream is returned.
+export const NODE_STREAM_INPUT = 1;
+
 /**
  * Configurable Properties
  */
@@ -84,6 +94,7 @@ export interface ParseConfig {
     newline?: string;              // default: "\r\n"
     quoteChar?: string;            // default: '"'
     header?: boolean;              // default: false
+    trimHeaders?: boolean;         // default: false
     dynamicTyping?: boolean;       // default: false
     preview?: number;              // default: 0
     encoding?: string;             // default: ""
@@ -100,12 +111,16 @@ export interface ParseConfig {
     error?(error: ParseError, file?: File): void;       // default: undefined
     chunk?(results: ParseResult, parser: Parser): void; // default: undefined
     beforeFirstChunk?(chunk: string): string | void;    // default: undefined
+    transform?(value: string, field: string | number): any; // default: undefined
 }
 
 export interface UnparseConfig {
-    quotes?: boolean;    // default: false
-    delimiter?: string;  // default: ","
-    newline?: string;    // default: "\r\n"
+    quotes?: boolean;      // default: false
+	quoteChar?: string;    // default: '"'
+	escapeChar?: string;   // default: '"'
+	delimiter?: string;    // default: ","
+	header?: boolean;      // default: true
+	newline?: string;      // default: "\r\n"
 }
 
 export interface UnparseObject {
@@ -126,6 +141,7 @@ export interface ParseMeta {
     aborted: boolean;      // Whether process was aborted
     fields: Array<string>; // Array of field names
     truncated: boolean;    // Whether preview consumed all input
+    cursor: number;
 }
 
 /**
diff --git a/types/papaparse/papaparse-tests.ts b/types/papaparse/papaparse-tests.ts
index 1e527c4c32..5db22091ca 100644
--- a/types/papaparse/papaparse-tests.ts
+++ b/types/papaparse/papaparse-tests.ts
@@ -20,6 +20,7 @@ res.errors[0].code;
 Papa.parse("3,3,3", {
 	delimiter: ';',
 	comments: false,
+    trimHeaders: false,
 
 	step: function (results, p) {
 		p.abort();
@@ -30,12 +31,18 @@ Papa.parse("3,3,3", {
 var file = new File(null, null, null);
 
 Papa.parse(file, {
+    transform: function(value, field) {
+
+    },
 	complete: function (a, b) {
 		a.meta.fields;
 		b.name;
 	}
 });
 
+
+Papa.parse(Papa.NODE_STREAM_INPUT);
+
 /**
  * Unparsing
  */
diff --git a/types/paper/index.d.ts b/types/paper/index.d.ts
index 5b3e46a146..ff75266725 100644
--- a/types/paper/index.d.ts
+++ b/types/paper/index.d.ts
@@ -1,6 +1,9 @@
-// Type definitions for Paper.js v0.9.24
+// Type definitions for Paper.js v0.11.5
 // Project: http://paperjs.org/
-// Definitions by: Clark Stevenson <https://github.com/clark-stevenson>, Jon Lucas <https://github.com/Xakaloz>
+// Definitions by:  Clark Stevenson <https://github.com/clark-stevenson>,
+//                  Jon Lucas <https://github.com/Xakaloz>,
+//                  Sebastian Lopez <https://github.com/sebaswebdev>
+//                  Ryan Friedman <https://github.com/rfried>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 type NativeMouseEvent = MouseEvent;
@@ -88,6 +91,18 @@ declare module paper {
          */
         constructor(a: number, c: number, b: number, d: number, tx: number, ty: number);
 
+        /**
+         * Creates a 2D affine transformation matrix
+         * @param array - the matrix values to initialize this matrix with
+         */
+        constructor(values: number[]);
+
+        /**
+         * Creates a 2D affine transformation matrix
+         * @param matrix - the matrix to copy the values from
+         */
+        constructor(matrix: Matrix);
+
         /**
          * The value that affects the transformation along the x axis when scaling or rotating, positioned at (0, 0) in the transformation matrix.
          */
@@ -122,25 +137,30 @@ declare module paper {
          * The transform values as an array, in the same sequence as they are passed to initialize(a, c,b,d,tx,ty).
          * Read only.
          */
-        values: number;
+        readonly values: number[];
 
         /**
          * The translation of the matrix as a vector.
          * Read only.
          */
-        translation: Point;
+        readonly translation: Point;
 
         /**
          * The scaling values of the matrix, if it can be decomposed.
          * Read only.
          */
-        scaling: Point;
+        readonly scaling: Point;
 
         /**
          * The rotation angle of the matrix, if it can be decomposed.
          * Read only.
          */
-        rotation: number;
+        readonly rotation: number;
+
+        /**
+         * Sets this transform to the matrix defaults
+         */
+        set(): Matrix;
 
         /**
          * Sets this transform to the matrix specified by the 6 values.
@@ -153,6 +173,18 @@ declare module paper {
          */
         set(a: number, c: number, b: number, d: number, tx: number, ty: number): Matrix;
 
+        /**
+         * Sets a 2D affine transformation matrix
+         * @param array - the matrix values to set this matrix with
+         */
+        set(values: number[]): Matrix;
+
+        /**
+         * Sets a 2D affine transformation matrix
+         * @param matrix - the matrix to set the values from
+         */
+        set(matrix: Matrix): Matrix;
+
         /**
          * Returns a copy of this transform
          */
@@ -178,7 +210,7 @@ declare module paper {
          * Attempts to apply the matrix to the content of item that it belongs to, meaning its transformation is baked into the item's content or children.
          * @param recursively - controls whether to apply transformations recursively on children
          */
-        apply(): boolean;
+        apply(recursively: boolean): boolean;
 
         /**
          * Concatenates this transform with a translate transformation.
@@ -213,7 +245,7 @@ declare module paper {
          * @param angle - the angle of rotation measured in degrees
          * @param center - the anchor point to rotate around
          */
-        rotate(angle: number, center?: Point): Matrix;
+        rotate(angle: number, center: Point): Matrix;
 
         /**
          * Concatenates this transform with a rotation transformation around an anchor point.
@@ -271,6 +303,30 @@ declare module paper {
          */
         chain(mx: Matrix): Matrix;
 
+        /**
+         * Prepends the specified matrix to this matrix. This is the equivalent of multiplying (specified matrix) * (this matrix).
+         * @param mx - the transform to concatenate
+         */
+        append(mx: Matrix): Matrix;
+
+        /**
+         * Pre-concatenates the given affine transform to this transform.
+         * @param mx - the transform to preconcatenate
+         */
+        prepend(mx: Matrix): Matrix;
+
+        /**
+         * Returns a new matrix as the result of appending the specified matrix to this matrix. This is the equivalent of multiplying (this matrix) * (specified matrix).
+         * @param mx - the transform to concatenate
+         */
+        appended(mx: Matrix): Matrix;
+
+        /**
+         * Returns a new matrix as the result of prepending the specified matrix to this matrix. This is the equivalent of multiplying (specified matrix) s* (this matrix).
+         * @param mx - the transform to concatenate
+         */
+        prepended(mx: Matrix): Matrix;
+
         /**
          * Returns whether this transform is the identity transform
          */
@@ -310,9 +366,14 @@ declare module paper {
          * Attempts to decompose the affine transformation described by this matrix into scaling, rotation and shearing, and returns an object with these properties if it succeeded, null otherwise.
          */
         decompose(): any;
+        
+        /**
+         * Inverts the matrix, causing it to perform the opposite transformation. If the matrix is not invertible (in which case isSingular() returns true), null is returned.
+         */
+        invert(): Matrix;
 
         /**
-         * Creates the inversion of the transformation of the matrix and returns it as a new insteance. If the matrix is not invertible (in which case isSingular() returns true), null is returned.
+         * Creates the inversion of the transformation of the matrix and returns it as a new instance. If the matrix is not invertible (in which case isSingular() returns true), null is returned.
          */
         inverted(): Matrix;
 
@@ -410,13 +471,44 @@ declare module paper {
          * Angles between 0 and 90 degrees are in quadrant 1. Angles between 90 and 180 degrees are in quadrant 2, angles between 180 and 270 degrees are in quadrant 3 and angles between 270 and 360 degrees are in quadrant 4.
          * Read only.
          */
-        quadrant: number;
+        readonly quadrant: number;
 
         /**
          * This property is only present if the point is an anchor or control point of a Segment or a Curve. In this case, it returns true it is selected, false otherwise
          */
         selected: boolean;
 
+        /**
+         * Sets the Point object with the given x and y coordinates.
+         * @param x - the x coordinate
+         * @param y - the y coordinate
+         */
+        set(x: number, y: number): Point;
+
+        /**
+         * Sets the Point object using the numbers in the given array as coordinates.
+         * @param array - an array of numbers to use as coordinates
+         */
+        set(values: number[]): Point;
+
+        /**
+         * Sets the Point object using the properties in the given object.
+         * @param object - the object describing the point's properties
+         */
+        set(object: any): Point;
+
+        /**
+         * Sets the Point object using the width and height values of the given Size object.
+         * @param size - the size width and height to use
+         */
+        set(size: Size): Point;
+
+        /**
+         * Sets the Point object using the coordinates of the given Point object.
+         * @param point - the point to copy
+         */
+        set(point: Point): Point;
+
         /**
          * Checks whether the coordinates of the point are equal to that of the supplied point.
          * @param point - the point to check against
@@ -514,7 +606,14 @@ declare module paper {
         /**
          * Checks if this point has an undefined value for at least one of its coordinates.
          */
-        isNan(): boolean;
+        isNaN(): boolean;
+
+        /**
+         * Checks if the vector is within the specified quadrant. Note that if the vector lies on the boundary between two quadrants, true will be returned for both quadrants.
+         * @param quadrant
+         * @returns true if either x or y are not a number, false otherwise
+         */
+        isInQuadrant(quadrant: number): boolean;
 
         /**
          * Returns the dot product of the point and another point.
@@ -561,6 +660,7 @@ declare module paper {
          */
         add(point: Point): Point;
         add(point: number[]): Point;
+        add(point: number): Point;
 
         /*
          * Returns a new point
@@ -568,6 +668,7 @@ declare module paper {
          */
         subtract(point: Point): Point;
         subtract(point: number[]): Point;
+        subtract(point: number): Point;
 
         /*
          * Returns the new multiplied point
@@ -585,6 +686,14 @@ declare module paper {
         divide(point: number[]): Point;
         divide(point: number): Point;
 
+        /**
+         * The modulo operator returns the integer remainders of dividing the point by the supplied value as a new point
+         * @param point - The point you want to divide with
+         */
+        modulo(point: Point): Point;
+        modulo(point: number[]): Point;
+        modulo(point: number): Point;
+
     }
     /**
      * A Rectangle specifies an area that is enclosed by it's top-left point (x, y), its width, and its height. It should not be confused with a rectangular path, it is not an item.
@@ -725,7 +834,7 @@ declare module paper {
          * The area of the rectangle in square points.
          * Read only.
          */
-        area: number;
+        readonly area: number;
 
         /**
          * Specifies whether an item's bounds are selected and will also mark the item as selected.
@@ -733,6 +842,41 @@ declare module paper {
          */
         selected: boolean;
 
+        /**
+         * Sets the Rectangle object.
+         * @param point - the top-left point of the rectangle
+         * @param size - the size of the rectangle
+         */
+        set(point: Point, size: Size): Rectangle;
+
+        /**
+         * Sets the Rectangle object.
+         * @param object - an object containing properties to be set on the rectangle.
+         */
+        set(object: any): Rectangle;
+
+        /**
+         * Sets the Rectangle object.
+         * @param x - the left coordinate
+         * @param y - the top coordinate
+         * @param width - the width
+         * @param height - the height
+         */
+        set(x: number, y: number, width: number, height: number): Rectangle;
+
+        /**
+         * Sets the Rectangle object from the passed points. These do not necessarily need to be the top left and bottom right corners, the constructor figures out how to fit a rectangle between them.
+         * @param from - The first point defining the rectangle
+         * @param to - The second point defining the rectangle
+         */
+        set(from: Point, to: Point): Rectangle;
+
+        /**
+         * Sets the Rectangle object from the passed rectangle object.
+         * @param rt - the rectangle to copy from
+         */
+        set(rt: Rectangle): Rectangle;
+
         /**
          * Returns a copy of the rectangle.
          */
@@ -769,8 +913,10 @@ declare module paper {
         /**
          * Tests if the interior of this rectangle intersects the interior of another rectangle. Rectangles just touching each other are considered as non-intersecting.
          * @param rect - the specified rectangle
+         * @param epsilon - the epsilon against which to compare the rectangle’s dimensions. default 0
+         * @returns true if the rectangle and the specified rectangle intersect each other, false
          */
-        intersects(rect: Rectangle): boolean;
+        intersects(rect: Rectangle, epsilon?: number): boolean;
 
         /**
          * Returns a new rectangle representing the intersection of this rectangle with the specified rectangle.
@@ -885,9 +1031,9 @@ declare module paper {
         height: number;
 
         /**
-         * WARNING - This seems undocumented/incorrect
+         * Checks whether the width and height of the size are equal to those of the supplied size.
          */
-        equals(): boolean;
+        equals(size: Size): boolean;
 
         /**
          * Returns a copy of the size.
@@ -907,7 +1053,7 @@ declare module paper {
         /**
          * Checks if the width or the height of the size are NaN.
          */
-        isNan(): boolean;
+        isNaN(): boolean;
 
         /**
          * Returns a new size with rounded width and height values. The object itself is not modified!
@@ -935,6 +1081,7 @@ declare module paper {
          */
         add(size: Size): Size;
         add(size: number[]): Size;
+        add(size: number): Size;
 
         /*
          * Returns a new size
@@ -942,6 +1089,7 @@ declare module paper {
          */
         subtract(size: Size): Size;
         subtract(size: number[]): Size;
+        subtract(size: number): Size;
 
         /*
          * Returns the new multiplied size
@@ -959,6 +1107,14 @@ declare module paper {
         divide(size: number[]): Size;
         divide(size: number): Size;
 
+        /**
+         * Returns the new modulo size
+         * @param size - The size you want to modulo with
+         */
+        modulo(size: Size): Size;
+        modulo(size: number[]): Size;
+        modulo(size: number): Size;
+
     }
     export interface IFrameEvent {
 
@@ -1016,7 +1172,7 @@ declare module paper {
          * The reference to the active project's view.
          * Read Only.
          */
-        view: View;
+        readonly view: View;
 
         /**
          * The reference to the active tool.
@@ -1028,6 +1184,15 @@ declare module paper {
          */
         tools: Tool[];
 
+        /**
+         * Compiles the PaperScript code into a compiled function and executes it. The compiled function receives all properties of this PaperScope as arguments, to emulate a global scope with unaffected performance. It also installs global view and tool handlers automatically on the respective objects.
+         * @param code - the PaperScript code
+         * @param options [optional] - the compilation options
+         * @param options.url - the url of the source, for source-map debugging
+         * @param options.source - the source to be used for the source- mapping, in case the code that’s passed in has already been mingled.
+         */
+        execute(code: string, option?:{url?:string; source?:string; }): void;
+
         /**
          * Injects the paper scope into any other given scope. Can be used for examle to inject the currently active PaperScope into the window's global scope, to emulate PaperScript-style globally accessible Paper classes and objects
          * Please note: Using this method may override native constructors (e.g. Path, RGBColor). This may cause problems when using Paper.js in conjunction with other libraries that rely on these constructors. Keep the library scoped if you encounter issues caused by this.
@@ -1048,10 +1213,83 @@ declare module paper {
 
         /**
          * Retrieves a PaperScope object with the given scope id.
-         * @param id -
+         * @param id - scope id to retrieve
          */
         static get(id: string): PaperScope;
 
+    }
+    export interface IHitTestOptions{
+
+        /**
+         * the tolerance of the hit-test in points. Can also be controlled through paperScope.settings.hitTolerance
+         */
+        tolerance?: number;
+
+        /**
+         * only hit-test again a certain item class and its sub-classes: Group, Layer, Path, CompoundPath, Shape, Raster, PlacedSymbol, PointText, etc.
+         */
+        class?: string;
+
+        /**
+         * a match function to be called for each found hit result: Return true to return the result, false to keep searching
+         */
+        match?: (hit: HitResult) => boolean;
+
+        /**
+         * hit-test the fill of items.
+         */
+        fill?: boolean;
+
+        /**
+         * hit-test the stroke of path items, taking into account the setting of stroke color and width.
+         */
+        stroke?: boolean;
+
+        /**
+         * hit-test for segment.point of Path items.
+         */
+        segments?: boolean;
+
+        /**
+         * hit-test the curves of path items, without taking the stroke color or width into account.
+         */
+        curves?: boolean;
+
+        /**
+         * hit-test for the handles.  (segment.handleIn / segment.handleOut) of path segments.
+         */
+        handles?: boolean;
+
+        /**
+         * only hit-test for the first or last segment points of open path items.
+         */
+        ends?: boolean;
+
+        /**
+         * hit-test the item.position of of items, which depends on the setting of item.pivot.
+         */
+        position?: boolean;
+
+        /**
+         * hit-test the rectangle.center of the bounding rectangle of items (item.bounds).
+         */
+        center?: boolean;
+
+        /**
+         * hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
+         */
+        bounds?: boolean;
+
+        /**
+         * hit-test items that have Item#guide set to true.
+         */
+        guides?: boolean;
+
+        /**
+         * only hit selected items.
+         */
+        selected?: boolean;
+        
     }
     /**
      * The Item type allows you to access and modify the items in Paper.js projects. Its functionality is inherited by different project item types such as Path, CompoundPath, Group, Layer and Raster. They each add a layer of functionality that is unique to their type, but share the underlying properties and functions that they inherit from Item.
@@ -1077,7 +1315,7 @@ declare module paper {
          * The unique id of the item.
          * Read Only.
          */
-        id: number;
+        readonly id: number;
 
         /**
          * The class name of the item as a string.
@@ -1115,7 +1353,12 @@ declare module paper {
          * Specifies whether the item is selected. This will also return true for Group items if they are partially selected, e.g. groups containing selected or partially selected paths.
          * Paper.js draws the visual outlines of selected items on top of your project. This can be useful for debugging, as it allows you to see the construction of paths, position of path curves, individual segment points and bounding boxes of symbol and raster items.
          */
-        selected: boolean;
+        selected: boolean;        
+
+        /**
+         * Specifies whether the item and all children are selected.
+         */
+        fullySelected: boolean;
 
         /**
          * Specifies whether the item defines a clip mask. This can only be set on paths, compound paths, and text frame objects, and only if the item is already contained within a clipping group.
@@ -1171,7 +1414,12 @@ declare module paper {
          * The item's global transformation matrix in relation to the global project coordinate space. Note that the view's transformations resulting from zooming and panning are not factored in.
          * Read Only.
          */
-        globalMatrix: Matrix;
+        readonly globalMatrix: Matrix;
+
+        /**
+         * The item’s global matrix in relation to the view coordinate space. This means that the view’s transformations resulting from zooming and panning are factored in.
+         */
+        readonly viewMatrix: Matrix;
 
         /**
          * Controls whether the transformations applied to the item (e.g. through transform(matrix), rotate(angle), scale(scale), etc.) are stored in its matrix property, or whether they are directly applied to its contents or children (passed on to the segments in Path items, the children of Group items, etc.).
@@ -1182,19 +1430,19 @@ declare module paper {
          * The project that this item belongs to.
          * Read only.
          */
-        project: Project;
+        readonly project: Project;
 
         /**
          * The view that this item belongs to.
          * Read Only.
          */
-        view: View;
+        readonly view: View;
 
         /**
          * The layer that this item is contained within.
          * Read Only.
          */
-        layer: Layer;
+        readonly layer: Layer;
 
         /**
          * The item that this item is contained within.
@@ -1210,30 +1458,30 @@ declare module paper {
         /**
          * The first item contained within this item. This is a shortcut for accessing item.children[0].
          */
-        firstChild: Item;
+        readonly firstChild: Item;
 
         /**
          * The last item contained within this item.This is a shortcut for accessing item.children[item.children.length - 1].
          */
-        lastChild: Item;
+        readonly lastChild: Item;
 
         /**
          * The next item on the same level as this item.
          * Read Only.
          */
-        nextSibling: Item;
+        readonly nextSibling: Item;
 
         /**
          * The previous item on the same level as this item.
          * Read Only.
          */
-        previousSibling: Item;
+        readonly previousSibling: Item;
 
         /**
          * The index of this item within the list of its parent's children.
          * Read only.
          */
-        index: number;
+        readonly index: number;
 
         /**
          * The color of the stroke.
@@ -1289,10 +1537,29 @@ declare module paper {
         fillColor: Color | string;
 
         /**
-         * The fill rule.
+         * The fill-rule with which the shape gets filled. Please note that only modern browsers support fill-rules other than 'nonzero'.
+         * Values - 'nonzero', 'evenodd'
+         * Default - 'nonzero'
          */
         fillRule: string;
 
+        /**
+         * The shadow color.
+         */
+        shadowColor: Color | string;
+
+        /**
+         * The shadow’s blur radius.
+         * Default - 0
+         */
+        shadowBlur: number;
+
+        /**
+         * The shadow’s offset.
+         * Default - 0
+         */
+        shadowOffset: number;
+
         /**
          * The color the item is highlighted with when selected. If the item does not specify its own color, the color defined by its layer is used instead.
          */
@@ -1306,45 +1573,53 @@ 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.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseDown: (event: MouseEvent) => void;
+        onMouseDown: (event: MouseEvent) => void | boolean;
 
         /**
          * 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.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseDrag: (event: MouseEvent) => void;
+        onMouseDrag: (event: MouseEvent) => void | boolean;
 
         /**
          * 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.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseUp: (event: MouseEvent) => void;
+        onMouseUp: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse clicks on the item. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onClick: (event: MouseEvent) => void;
+        onClick: (event: MouseEvent) => void | boolean;
 
         /**
-         * The function to be called when the mouse double clicks on the item. The function receives a MouseEvent object which contains information about the mouse event.
+         * The function to be called when the mouse double clicks on the item. The function receives a MouseEvent object which contains information about the mouse event.         * 
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onDoubleClick: (event: MouseEvent) => void;
+        onDoubleClick: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called repeatedly when the mouse moves on top of the item. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseMove: (event: MouseEvent) => void;
+        onMouseMove: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse moves over the item. This function will only be called again, once the mouse moved outside of the item first. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseEnter: (event: MouseEvent) => void;
+        onMouseEnter: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse moves out of the item.
          * The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseLeave: (event: MouseEvent) => void;
+        onMouseLeave: (event: MouseEvent) => void | boolean;
 
         /**
          * Sets those properties of the passed object literal on this item to the values defined in the object literal, if the item has property of the given name (or a setter defined for it).
@@ -1353,23 +1628,31 @@ declare module paper {
 
         /**
          * Clones the item within the same project and places the copy above the item.
-         * @param options [optional] - object with 2 parameters
-         * insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
-         * deep: specifies whether the item’s children should also be cloned — default: true
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
          */
-        clone(options?: { insert?: boolean, deep?: boolean }): Item;
+        clone(options?: { insert?: boolean; deep?: boolean; }): Item;
 
         /**
-         * When passed a project, copies the item to the project, or duplicates it within the same project. When passed an item, copies the item into the specified item.
-         * @param item - the item or project to copy the item to
+         * Copies the content of the specified item over to this item.
+         * @param source - the item to copy the content from
          */
-        copyTo(item: Item): Item;
+        copyContent(source: Item): void;
+
+        /**
+         * Copies all attributes of the specified item over to this item. This includes its style, visibility, matrix, pivot, blend-mode, opacity, selection state, data, name, etc.
+         * @param source - the item to copy the attributes from
+         * @param excludeMatrix - whether to exclude the transformation matrix when copying all attributes
+         */
+        copyAttributes(source: Item, excludeMatrix: boolean): void;
 
         /**
          * Rasterizes the item into a newly created Raster object. The item itself is not removed after rasterization.
          * @param resolution [optional] - the resolution of the raster in pixels per inch (DPI). If not specified, the value of view.resolution is used. default: view.resolution
+         * @param insert [optional] - specifies whether the raster should be inserted into the scene graph. When set to true, it is inserted above the original — default: true
          */
-        rasterize(resolution?: number): Raster;
+        rasterize(resolution?: number, insert?: boolean): Raster;
 
         /**
          * Checks whether the item's geometry contains the given point.
@@ -1390,23 +1673,46 @@ declare module paper {
         intersects(item: Item): boolean;
 
         /**
-         * Perform a hit-test on the items contained within the project at the location of the specified point.
+         * Performs a hit-test on the item and its children (if it is a Group or Layer) at the location of the specified point, returning the first found hit.
          * The options object allows you to control the specifics of the hit-test and may contain a combination of the following values:
          * @param point - the point where the hit-test should be performed
          * @param options.tolerance -the tolerance of the hit-test in points. Can also be controlled through paperScope.settings.hitTolerance
          * @param options.class - only hit-test again a certain item class and its sub-classes: Group, Layer, Path, CompoundPath, Shape, Raster, PlacedSymbol, PointText, etc.
+         * @param options.match -a match function to be called for each found hit result: Return true to return the result, false to keep searching
          * @param options.fill - hit-test the fill of items.
          * @param options.stroke - hit-test the stroke of path items, taking into account the setting of stroke color and width.
          * @param options.segments - hit-test for segment.point of Path items.
          * @param options.curves - hit-test the curves of path items, without taking the stroke color or width into account.
          * @param options.handles - hit-test for the handles.  (segment.handleIn / segment.handleOut) of path segments.
          * @param options.ends - only hit-test for the first or last segment points of open path items.
-         * @param options.bounds - hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
+         * @param options.position - hit-test the item.position of of items, which depends on the setting of item.pivot.
          * @param options.center - hit-test the rectangle.center of the bounding rectangle of items (item.bounds).
+         * @param options.bounds - hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
          * @param options.guides - hit-test items that have Item#guide set to true.
          * @param options.selected - only hit selected items.
          */
-        hitTest(point: Point, options?: { tolerance?: number; class?: string; fill?: boolean; stroke?: boolean; segments?: boolean; curves?: boolean; handles?: boolean; ends?: boolean; bounds?: boolean; center?: boolean; guides?: boolean; selected?: boolean; match?: (hit: HitResult) => boolean; }): HitResult;
+        hitTest(point: Point, options?: IHitTestOptions): HitResult;
+
+        /**
+         * Performs a hit-test on the item and its children (if it is a Group or Layer) at the location of the specified point, returning all found hits.
+         * The options object allows you to control the specifics of the hit-test and may contain a combination of the following values:
+         * @param point - the point where the hit-test should be performed
+         * @param options.tolerance -the tolerance of the hit-test in points. Can also be controlled through paperScope.settings.hitTolerance
+         * @param options.class - only hit-test again a certain item class and its sub-classes: Group, Layer, Path, CompoundPath, Shape, Raster, PlacedSymbol, PointText, etc.
+         * @param options.match -a match function to be called for each found hit result: Return true to return the result, false to keep searching
+         * @param options.fill - hit-test the fill of items.
+         * @param options.stroke - hit-test the stroke of path items, taking into account the setting of stroke color and width.
+         * @param options.segments - hit-test for segment.point of Path items.
+         * @param options.curves - hit-test the curves of path items, without taking the stroke color or width into account.
+         * @param options.handles - hit-test for the handles.  (segment.handleIn / segment.handleOut) of path segments.
+         * @param options.ends - only hit-test for the first or last segment points of open path items.
+         * @param options.position - hit-test the item.position of of items, which depends on the setting of item.pivot.
+         * @param options.center - hit-test the rectangle.center of the bounding rectangle of items (item.bounds).
+         * @param options.bounds - hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
+         * @param options.guides - hit-test items that have Item#guide set to true.
+         * @param options.selected - only hit selected items.
+         * */
+        hitTestAll(point: Point, options?: IHitTestOptions): HitResult[];
 
         /**
          * Checks whether the item matches the criteria described by the given object, by iterating over all of its properties and matching against their values through matches(name, compare).
@@ -1427,6 +1733,9 @@ declare module paper {
          * Fetch the descendants (children or children of children) of this item that match the properties in the specified object.
          * Extended matching is possible by providing a compare function or regular expression. Matching points, colors only work as a comparison of the full object, not partial matching (e.g. only providing the x- coordinate to match all points with that x-value). Partial matching does work for item.data.
          * Matching items against a rectangular area is also possible, by setting either match.inside or match.overlapping to a rectangle describing the area in which the items either have to be fully or partly contained.
+         * @param match.recursive - whether to loop recursively through all children, or stop at the current level — default: true
+         * @param match.match - a match function to be called for each item, allowing the definition of more flexible item checks that are not bound to properties. If no other match properties are defined, this function can also be passed instead of the options object
+         * @param match.class - the constructor function of the item type to match against
          * @param match.inside - the rectangle in which the items need to be fully contained.
          * @param match.overlapping - the rectangle with which the items need to at least partly overlap.
          */
@@ -1445,7 +1754,7 @@ declare module paper {
          * @param options.asString - whether the JSON is returned as a Object or a String.
          * @param options.precision - the amount of fractional digits in numbers used in JSON data.
          */
-        exportJSON(options?: { asString?: boolean; precision?: number }): string;
+        exportJSON(options?: { asString?: boolean; precision?: number; }): string;
 
         /**
          * Imports (deserializes) the stored JSON data into the project.
@@ -1455,22 +1764,37 @@ declare module paper {
 
         /**
          * Exports the project with all its layers and child items as an SVG DOM, all contained in one top level SVG group node.
-         * @param options [optional] the export options, default: { asString: false, precision: 5, matchShapes: false }
+         * @param options [optional] the export options, default: { asString: false, precision: 5, matchShapes: false, bounds: 'view', matrix: paper.view.matrix, embedImages: true  }
          * @param options.asString - whether a SVG node or a String is to be returned.
          * @param options.precision - the amount of fractional digits in numbers used in SVG data.
          * @param options.matchShapes - whether path items should tried to be converted to shape items, if their geometries can be made to match
+         * @param options.bounds - the bounds of the area to export, either as a string (‘view’, content’), or a Rectangle object: 'view' uses the view bounds, 'content' uses the stroke bounds of all content.
+         * @param options.matrix - the matrix with which to transform the exported content: If options.bounds is set to 'view', paper.view.matrix is used, for all other settings of options.bounds the identity matrix is used.
+         * @param options.embedImages: whether raster images should be embedded as base64 data inlined in the xlink:href attribute, or kept as a link to their external URL.
          */
-        exportSVG(options?: { asString?: boolean; precision?: number; matchShapes?: boolean }): SVGElement;
+        exportSVG(options?: { asString?: boolean; precision?: number; matchShapes?: boolean; bounds?: string | Rectangle; matrix?: Matrix; embedImages?: boolean; }): SVGElement;
 
         /**
          * Converts the provided SVG content into Paper.js items and adds them to the active layer of this project.
          * Note that the project is not cleared first. You can call project.clear() to do so.
          * @param svg - the SVG content to import
-         * @param options [optional] - the import options, default: { expandShapes: false }
+         * @param options [optional] - the import options, default: { expandShapes: false, insert: true, applyMatrix: paperScope.settings.applyMatrix }
          * @param options.expandShapes - whether imported shape items should be expanded to path items.
+         * @param options.onLoad - the callback function to call once the SVG content is loaded from the given URL receiving two arguments: the converted item and the original svg data as a string. Only required when loading from external resources.
+         * @param options.onError - the callback function to call if an error occurs during loading. Only required when loading from external resources.
+         * @param options.insert: Boolean — whether the imported items should be added to the item that importSVG() is called on.
+         * @param options.applyMatrix  Boolean — whether the imported items should have their transformation matrices applied to their contents or not.
          */
-        importSVG(svg: SVGElement | string, options?: any): Item;
+        importSVG(svg: SVGElement | string, options?: { expandShapes?: boolean; onLoad?: (item: Item, svg: string) => void; onError?: (message: string, status: number) => void; insert?: true; applyMatrix?: Matrix; }): Item;
 
+         /**
+         * Converts the provided SVG content into Paper.js items and adds them to the active layer of this project.
+         * Note that the project is not cleared first. You can call project.clear() to do so.
+         * @param svg - the SVG content to import
+         * @param onLoad [optional] - the callback function to call once the SVG content is loaded from the given URL receiving two arguments: the converted item and the original svg data as a string. Only required when loading from external resources.
+         */
+        importSVG(svg: SVGElement | string, onLoad?: (item: Item, svg: string) => void): Item;
+        
         /**
          * Adds the specified item as a child of this item at the end of the its children list. You can use this function for groups, compound paths and layers.
          * @param item - the item to add as a child
@@ -1509,6 +1833,18 @@ declare module paper {
          */
         insertBelow(item: Item): Item;
 
+        /**
+         * Inserts the specified item as a child of this item by appending it to the list of children and moving it above all other children. You can use this function for groups, compound paths and layers.
+         * @param item - the item to be appended as a child
+         */
+        appendTop(item: Item): Item;
+
+        /**
+         * Inserts the specified item as a child of this item by appending it to the list of children and moving it below all other children. You can use this function for groups, compound paths and layers.
+         * @param item - the item to be appended as a child
+         */
+        appendBelow(item: Item): Item;
+
         /**
          * Moves this item above the specified item. Returns true if the item
          * was moved.
@@ -1534,9 +1870,22 @@ declare module paper {
         bringToFront(): void;
 
         /**
-         * If this is a group, layer or compound-path with only one child-item, the child-item is moved outside and the parent is erased. Otherwise, the item itself is returned unmodified.
+         * Adds it to the specified owner, which can be either a Item or a Project.
+         * @param owner - the item or project to add the item to
          */
-        reduce(): Item;
+        addTo(owner: Project | Layer | Group | CompoundPath): Item;
+        
+        /**
+         * Clones the item and adds it to the specified owner, which can be either a Item or a Project.
+         * @param owner - the item or project to copy the item to
+         */
+        copyTo(owner: Project | Layer | Group | CompoundPath): Item;
+        
+        /**
+         * If this is a group, layer or compound-path with only one child-item, the child-item is moved outside and the parent is erased. Otherwise, the item itself is returned unmodified.
+         * @param options [optional]
+         */
+        reduce(options?: any): Item;
 
         /**
          * Removes the item and all its children from the project. The item is not destroyed and can be inserted again after removal.
@@ -1556,10 +1905,10 @@ declare module paper {
 
         /**
          * Removes the children from the specified from index to the to index from the parent's children array.
-         * @param from - the beginning index, inclusive
-         * @param to [optional] - the ending index, exclusive, default: children.length
+         * @param start - the beginning index, inclusive
+         * @param end [optional] - the ending index, exclusive, default: children.length
          */
-        removeChildren(from: number, to?: number): Item[];
+        removeChildren(start: number, end?: number): Item[];
 
         /**
          * Reverses the order of the item's children
@@ -1739,44 +2088,54 @@ declare module paper {
          */
         fitBounds(rectangle: Rectangle, fill?: boolean): void;
 
-        //I cannot use function: Function as it is a reserved keyword
-
         /**
-         * Attach an event handler to the tool.
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
-         * @param function - The function to be called when the event occurs
+         * Attach an event handler to the item.
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param callback - The function to be called when the event occurs
          */
-        on(type: string, callback: (event: ToolEvent) => void): Tool;
-
+        on(type: string, callback: (event: MouseEvent) => void | boolean): Item;
         /**
-         * Attach one or more event handlers to the tool.
-         * @param param - an object literal containing one or more of the following properties: mousedown, mouseup, mousedrag, mousemove, keydown, keyup
+         * Attach an event handler to the item.
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param callback - The function to be called when the event occurs
          */
-        on(param: any): Tool;
+        on(type: string, callback: (event: IFrameEvent) => void | boolean): Item;
 
         /**
-         * Detach an event handler from the tool.
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
+         * Attach one or more event handlers to the item.
+         * @param object - an object containing one or more of the following properties: frame, mousedown, mouseup, mousedrag, click, doubleclick, mousemove, mouseenter, mouseleave
+         */
+        on(object: { frame?: (event: IFrameEvent) => void; mousedown?: (event: MouseEvent) => void | boolean; mouseup?: (event: MouseEvent) => void | boolean; mousedrag?: (event: MouseEvent) => void | boolean; click?: (event: MouseEvent) => void | boolean; doubleclick?: (event: MouseEvent) => void | boolean; mousemove?: (event: MouseEvent) => void | boolean; mouseenter?: (event: MouseEvent) => void | boolean; mouseleave?: (event: MouseEvent) => void | boolean; }): Item;
+
+        /**
+         * Detach an event handler from the item.
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          * @param function - The function to be detached
          */
-        off(type: string, callback: (event: ToolEvent) => void): Tool;
+        off(type: string, callback: (event: MouseEvent) => void | boolean): Item;
+        /**
+         * Detach an event handler from the item.
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param function - The function to be detached
+         */
+        off(type: string, callback: (event: IFrameEvent) => void | boolean): Item;
 
         /**
          * Detach one or more event handlers from the tool.
-         * @param param -  an object literal containing one or more of the following properties: mousedown, mouseup, mousedrag, mousemove, keydown, keyup
+         * @param object - an object containing one or more of the following properties: frame, mousedown, mouseup, mousedrag, click, doubleclick, mousemove, mouseenter, mouseleave
          */
-        off(param: any): Tool;
+        off(object: { frame?: (event: IFrameEvent) => void; mousedown?: (event: MouseEvent) => void | boolean; mouseup?: (event: MouseEvent) => void | boolean; mousedrag?: (event: MouseEvent) => void | boolean; click?: (event: MouseEvent) => void | boolean; doubleclick?: (event: MouseEvent) => void | boolean; mousemove?: (event: MouseEvent) => void | boolean; mouseenter?: (event: MouseEvent) => void | boolean; mouseleave?: (event: MouseEvent) => void | boolean; }): Item;
 
         /**
          * Emit an event on the tool.
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          * @param event - an object literal containing properties describing the event.
          */
         emit(type: string, event: any): boolean;
 
         /**
          * Check if the tool has one or more event handlers of the specified type.
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          */
         responds(type: string): boolean;//I cannot use function: Function as it is a reserved keyword
 
@@ -1785,49 +2144,49 @@ declare module paper {
          * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
          * @param function - The function to be called when the event occurs
          */
-        on(type: string, callback: () => void): Item;
+        on(type: string, callback: (event: Event | MouseEvent) => void | boolean): Item;
 
         /**
          * Attaches one or more event handlers to the item.
-         * @param param - an object literal containing one or more of the following properties: mousedown, mouseup, mousedrag, mousemove, keydown, keyup
+         * @param param - an object containing one or more of the following properties: frame, mousedown, mouseup, mousedrag, click, doubleclick, mousemove, mouseenter, mouseleave
          */
         on(param: any): Item;
 
         /**
          * Detach an event handler from the item.
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          * @param function - The function to be detached
          */
-        off(type: string, callback: (event: ToolEvent) => void): Item;
+        off(type: string, callback: (event: Event | MouseEvent) => void | boolean): Item;
 
         /**
          * Detach one or more event handlers to the item.
-         * @param param -  an object literal containing one or more of the following properties: mousedown, mouseup, mousedrag, mousemove, keydown, keyup
+         * @param param - an object containing one or more of the following properties: frame, mousedown, mouseup, mousedrag, click, doubleclick, mousemove, mouseenter, mouseleave
          */
         off(param: any): Item;
 
         /**
          * Emit an event on the item.
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          * @param event - an object literal containing properties describing the event.
          */
         emit(type: string, event: any): boolean;
 
         /**
          * Check if the item has one or more event handlers of the specified type..
-         * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
+         * @param type - the type of event: ‘frame’, mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          */
         responds(type: string): boolean;
 
         /**
          * Removes the item when the events specified in the passed object literal occur.
-         * @param object - The object literal can contain the following values
-         * @param object.move - Remove the item when the next tool.onMouseMove event is fired
-         * @param object.drag - Remove the item when the next tool.onMouseDrag event is fired
-         * @param object.down - Remove the item when the next tool.onMouseDown event is fired
-         * @param object.up - Remove the item when the next tool.onMouseUp event is fired
+         * @param options - The object literal can contain the following values
+         * @param options.move - Remove the item when the next tool.onMouseMove event is fired
+         * @param options.drag - Remove the item when the next tool.onMouseDrag event is fired
+         * @param options.down - Remove the item when the next tool.onMouseDown event is fired
+         * @param options.up - Remove the item when the next tool.onMouseUp event is fired
          */
-        removeOn(object: { move?: boolean; drag?: boolean; down?: boolean; up?: boolean; }): void;
+        removeOn(options: { move?: boolean; drag?: boolean; down?: boolean; up?: boolean; }): void;
 
         /**
          * Removes the item when the next tool.onMouseMove event is fired.
@@ -1867,6 +2226,14 @@ declare module paper {
          */
         constructor(object?: any);
 
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): Group;
+
         /**
          * Specifies whether the group item is to be clipped.
          * When setting to true, the first child in the group is automatically defined as the clipping mask.
@@ -1967,6 +2334,20 @@ declare module paper {
          */
         radius: number | Size;
 
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): Shape;
+
+        /**
+         * Creates a new path item with same geometry as this shape item, and inherits all settings from it, similar to item.clone().
+         * @param insert - specifies whether the new path should be inserted into the scene graph. When set to true, it is inserted above the shape item — optional, default: true
+         */
+        toPath(insert?: boolean): Shape;
+
     }
     /**
      * The Raster item represents an image in a Paper.js project.
@@ -1996,11 +2377,16 @@ declare module paper {
          */
         height: number;
 
+        /**
+         * The loading state of the raster image.
+         */
+        readonly loaded: boolean;
+
         /**
          * The resolution of the raster at its current size, in PPI (pixels per inch).
          * Read Only.
          */
-        resolution: Size;
+        readonly resolution: Size;
 
         /**
          * The HTMLImageElement of the raster, if one is associated.
@@ -2022,6 +2408,29 @@ declare module paper {
          */
         source: HTMLImageElement | HTMLCanvasElement | string;
 
+        /**
+         * The crossOrigin value to be used when loading the image resource, in order to support CORS. Note that this needs to be set before setting the source property in order to always work (e.g. when the image is cached in the browser).
+         */
+        crossOrigin: string;
+
+        /**
+         * The event handler function to be called when the underlying image has finished loading and is ready to be used. This is also triggered when the image is already loaded, or when a canvas is used instead of an image.
+         */
+        onLoad: any;
+
+        /**
+         * The event handler function to be called when there is an error loading the underlying image.
+         */
+        onError: any;
+
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): Raster;
+
         /**
          * Extracts a part of the Raster's content as a sub image, and returns it as a Canvas object.
          * @param rect - the boundaries of the sub image in pixel coordinates
@@ -2093,7 +2502,6 @@ declare module paper {
         getImageData(rect: Rectangle): ImageData;
 
         /**
-         *
          *
          * @param data
          * @param point
@@ -2117,6 +2525,14 @@ declare module paper {
          */
         symbol: Symbol;
 
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): PlacedSymbol;
+
     }
     /**
      * A HitResult object contains information about the results of a hit test. It is returned by item.hitTest(point) and project.hitTest(point).
@@ -2166,22 +2582,175 @@ declare module paper {
      */
     export class PathItem extends Item {
 
+        /**
+         * Creates a path item from the given SVG path-data, determining if the data describes a plain path or a compound-path with multiple sub-paths.
+         * @param pathData - the SVG path-data to parse
+         */
+        static create(pathData: string): Path | CompoundPath;
+
+        /**
+         * Creates a path item from the given segments array, determining if the array describes a plain path or a compound-path with multiple sub-paths.
+         * @param segments - the segments array to parse
+         */
+        static create(segments: number[] | any[]): Path | CompoundPath;
+
+        /**
+         * Creates a path item from the given object, determining if the contained information describes a plain path or a compound-path with multiple sub-paths.
+         * @param object - an object containing the properties describing the item to be created
+         */
+        static create(object: any): Path | CompoundPath;
+
+        /**
+         * Returns a point that is guaranteed to be inside the path.
+         */
+        readonly interiorPoint: Point;
+
+        /**
+         * Specifies whether the path as a whole is oriented clock-wise, by looking at the path’s area. Note that self-intersecting paths and sub-paths of different orientation can result in areas that cancel each other out.
+         */
+        clockwise: boolean;
+        
         /**
          * The path's geometry, formatted as SVG style path data.
          */
         pathData: string;
 
         /**
-         * Returns all intersections between two PathItem items as an array of CurveLocation objects. CompoundPath items are also supported.
-         * @param path - the other item to find the intersections with
-         * @param sorted [optional] - specifies whether the returned CurveLocation objects should be sorted by path and offset, default: false
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
          */
-        getIntersections(path: PathItem, sorted?: boolean): CurveLocation[];
+        clone(options?: { insert?: boolean; deep?: boolean; }): PathItem;
 
         /**
-         * Smooth bezier curves without changing the amount of segments or their points, by only smoothing and adjusting their handle points, for both open ended and closed paths.
+         * Merges the geometry of the specified path from this path's geometry and returns the result as a new path item.
+         * @param path - the path to unite with
+         * @param options [optional] - the boolean operation options. default { insert: true }
+         * @param options.insert - whether the resulting item should be inserted back into the scene graph, above both paths involved in the operation.
          */
-        smooth(): void;
+        unite(path: PathItem, options?: { insert?: boolean; }): PathItem;
+
+        /**
+         * Intersects the geometry of the specified path with this path's geometry and returns the result as a new path item.
+         * @param path - the path to intersect with
+         * @param options [optional] - the boolean operation options. default { insert: true, trace: true }
+         * @param options.insert - whether the resulting item should be inserted back into the scene graph, above both paths involved in the operation.
+         * @param options.trace - whether the tracing method is used, treating both paths as areas when determining which parts of the paths are to be kept in the result, or whether the first path is only to be split at intersections, keeping the parts of the curves that intersect with the area of the second path. 
+         */
+        intersect(path: PathItem, options?: { insert?: boolean; trace?: boolean; }): PathItem;
+
+        /**
+         * Subtracts the geometry of the specified path from this path's geometry and returns the result as a new path item.
+         * @param path - the path to subtract
+         * @param options [optional] - the boolean operation options. default { insert: true, trace: true }
+         * @param options.insert - whether the resulting item should be inserted back into the scene graph, above both paths involved in the operation.
+         * @param options.trace - whether the tracing method is used, treating both paths as areas when determining which parts of the paths are to be kept in the result, or whether the first path is only to be split at intersections, keeping the parts of the curves that intersect with the area of the second path. 
+         */
+        subtract(path: PathItem, options?: { insert?: boolean; trace?: boolean; }): PathItem;
+
+        /**
+         * Excludes the intersection of the geometry of the specified path with this path's geometry and returns the result as a new group item.
+         * @param path - the path to exclude the intersection of
+         * @param options [optional] - the boolean operation options. default { insert: true }
+         * @param options.insert - whether the resulting item should be inserted back into the scene graph, above both paths involved in the operation.
+         */
+        exclude(path: PathItem, options?: { insert?: boolean; }): PathItem;
+
+        /**
+         * Splits the geometry of this path along the geometry of the specified path returns the result as a new group item.
+         * @param path - the path to divide by
+         * @param options [optional] - the boolean operation options. default { insert: true, trace: true }
+         * @param options.insert - whether the resulting item should be inserted back into the scene graph, above both paths involved in the operation.
+         * @param options.trace - whether the tracing method is used, treating both paths as areas when determining which parts of the paths are to be kept in the result, or whether the first path is only to be split at intersections, keeping the parts of the curves that intersect with the area of the second path.
+        */
+        divide(path: PathItem, options?: { insert?: boolean; trace?: boolean; }): PathItem;
+
+        /**
+         * Fixes the orientation of the sub-paths of a compound-path, assuming that non of its sub-paths intersect, by reorienting them so that they are of different winding direction than their containing paths, except for disjoint sub-paths, i.e. islands, which are oriented so that they have the same winding direction as the the biggest path.
+         * @param nonZero [optional] - controls if the non-zero fill-rule is to be applied, by counting the winding of each nested path and discarding sub-paths that do not contribute to the final result. default: false
+         * @param clockwise [optional] - if provided, the orientation of the root paths will be set to the orientation specified by clockwise, otherwise the orientation of the largest root child is used.
+         */
+        reorient(nonZero?: boolean, clockwise?: boolean): PathItem;
+
+        /**
+         * Returns all intersections between two PathItem items as an array of CurveLocation objects. CompoundPath items are also supported.
+         * @param path - the other item to find the intersections with
+         * @param include [optional] - a callback function that can be used to filter out undesired locations right while they are collected. When defined, it shall return true to include a location, false otherwise. — optional
+        */
+        getIntersections(path: PathItem, include?: (location: CurveLocation) => boolean): CurveLocation[];
+
+        /**
+         * Returns all crossings between two PathItem items as an array of CurveLocation objects. CompoundPath items are also supported. Crossings are intersections where the paths actually are crossing each other, as opposed to simply touching.
+         * @param path - the other item to find the crossings with
+         */
+        getCrossings(path: PathItem): CurveLocation[];
+
+        /**
+         * Returns the nearest location on the path item to the specified point.
+         * @param point - the point for which we search the nearest location
+         */
+        getNearestLocation(point: Point): CurveLocation;
+
+        /**
+         * Returns the nearest point on the path item to the specified point.
+         * @param point - the point for which we search the nearest point
+         */
+        getNearestPoint(point: Point): Point;
+
+        /**
+         * Reverses the orientation of the path item. When called on CompoundPath items, each of the nested paths is reversed. On Path items, the sequence of path.segments is reversed.
+         */
+        reverse(): void;
+
+        /**
+         * Flattens the curves in path items to a sequence of straight lines, by subdividing them enough times until the specified maximum error is met.
+         * @param flatness [optional] - the maximum error between the flattened lines and the original curves. default: 0.25
+         */
+        flatten(flatness?: number): void;
+
+        /**
+         * Smooths the path item without changing the amount of segments in the path or moving the segments’ locations, by smoothing and adjusting the angle and length of the segments’ handles based on the position and distance of neighboring segments.
+         * Smoothing works both for open paths and closed paths, and can be applied to the full path, as well as a sub-range of it. If a range is defined using the options.from and options.to properties, only the curve handles inside that range are touched. If one or both limits of the range are specified in negative indices, the indices are wrapped around the end of the curve. That way, a smoothing range in a close path can even wrap around the connection between the last and the first segment.
+         * Four different smoothing methods are available:
+         *   'continuous' smooths the path item by adjusting its curve handles so that the first and second derivatives of all involved curves are continuous across their boundaries.
+         *      This method tends to result in the smoothest results, but does not allow for further parametrization of the handles.
+         *   'asymmetric' is based on the same principle as 'continuous' but uses different factors so that the result is asymmetric. This used to the only method available until v0.10.0, and is currently still the default when no method is specified, for reasons of backward compatibility. It will eventually be removed.
+         *   'catmull-rom' uses the Catmull-Rom spline to smooth the segment.
+         *      The optionally passed factor controls the knot parametrization of the algorithm:
+         *        0.0: the standard, uniform Catmull-Rom spline
+         *        0.5: the centripetal Catmull-Rom spline, guaranteeing no self-intersections
+         *        1.0: the chordal Catmull-Rom spline
+         *   'geometric' use a simple heuristic and empiric geometric method to smooth the segment’s handles. The handles were weighted, meaning that big differences in distances between the segments will lead to probably undesired results.
+         *      The optionally passed factor defines the tension parameter (0…1), controlling the amount of smoothing as a factor by which to scale each handle.
+         * @param options [optional] - default { type:'asymmetric', factor: 0.5 for 'catmull-rom', 0.4 for 'geometric' }
+         * @param options.type - the type of smoothing method: ‘continuous’, ‘asymmetric’, ‘catmull-rom’, ‘geometric’ — default: ‘asymmetric’
+         * @param options.factor - the factor parameterizing the smoothing method — default: 0.5 for 'catmull-rom', 0.4 for 'geometric'
+         * @param options.from - the segment or curve at which to start smoothing, if not the full path shall be smoothed (inclusive). This can either be a segment index, or a segment or curve object that is part of the path. If the passed number is negative, the index is wrapped around the end of the path.
+         * @param options.to - the segment or curve to which the handles of the path shall be processed (inclusive). This can either be a segment index, or a segment or curve object that is part of the path. If the passed number is negative, the index is wrapped around the end of the path.
+         */
+        smooth(options?: { type?: string; factor?: number; from?: number | Segment | Curve; to?: number | Segment | Curve; }): void;
+
+        /**
+         * Fits a sequence of as few curves as possible through the path’s anchor points, ignoring the path items’s curve-handles, with an allowed maximum error. When called on CompoundPath items, each of the nested paths is simplified. On Path items, the path.segments array is processed and replaced by the resulting sequence of fitted curves.
+         * This method can be used to process and simplify the point data received from a mouse or touch device.
+         * @param tolerance [optional] - the allowed maximum error when fitting the curves through the segment points. default: 2.5
+         */
+        simplify(tolerance?: number): boolean;
+
+        /**
+         * Interpolates between the two specified path items and uses the result as the geometry for this path item. The number of children and segments in the two paths involved in the operation should be the same.
+         * @param from - the path item defining the geometry when factor is 0
+         * @param to - the path item defining the geometry when factor is 1
+         * @param factor - the interpolation coefficient, typically between 0 and 1, but extrapolation is possible too
+         */
+        interpolate(from: PathItem, to: PathItem, factor: number): void;
+
+        /**
+         * Compares the geometry of two paths to see if they describe the same shape, detecting cases where paths start in different segments or even use different amounts of curves to describe the same shape, as long as their orientation is the same, and their segments and handles really result in the same visual appearance of curves.
+         * @param path - the path to compare this path’s geometry with
+         */
+        compare(path: PathItem): boolean;
 
         /**
          * On a normal empty Path, the point is simply added as the path's first segment. If called on a CompoundPath, a new Path is created as a child and the point is added as its first segment.
@@ -2194,6 +2763,28 @@ declare module paper {
          * @param point - the end point of the line
          */
         lineTo(point: Point): void;
+        
+        /**
+         * Draws an arc from the position of the last segment point in the path that goes through the specified through point, to the specified to point by adding one or more segments to the path.
+         * @param through - the point where the arc should pass through
+         * @param to - the point where the arc should end
+         */
+        arcTo(through: Point, to: Point): void;
+
+        /**
+         * Draws an arc from the position of the last segment point in the path to the specified point by adding one or more segments to the path.
+         * @param to - the point where the arc should end
+         * @param clockwise [optional] - specifies whether the arc should be drawn in clockwise direction. default: true
+         */
+        arcTo(to: Point, clockwise?: boolean): void;
+
+        /**
+         * Draws a curve from the position of the last segment point in the path that goes through the specified through point, to the specified to point by adding one segment to the path.
+         * @param through - the point through which the curve should go
+         * @param to - the point where the curve should end
+         * @param time [optional] - the curve-time parameter at which the through point is to be located. default: 0.5
+         */
+        curveTo(through: Point, to: Point, time?: number): void;
 
         /**
          * Adds a cubic bezier curve to the path, defined by two handles and a to point.
@@ -2210,33 +2801,11 @@ declare module paper {
          */
         quadraticCurveTo(handle: Point, to: Point): void;
 
-        /**
-         * Draws a curve from the position of the last segment point in the path that goes through the specified through point, to the specified to point by adding one segment to the path.
-         * @param through - the point through which the curve should go
-         * @param to - the point where the curve should end
-         * @param parameter [optional] - default: 0.5
-         */
-        curveTo(through: Point, to: Point, parameter?: number): void;
-
-        /**
-         * Draws an arc from the position of the last segment point in the path that goes through the specified through point, to the specified to point by adding one or more segments to the path.
-         * @param through - the point where the arc should pass through
-         * @param to - the point where the arc should end
-         */
-        arcTo(through: Point, to: Point): void;
-
-        /**
-         * Draws an arc from the position of the last segment point in the path to the specified point by adding one or more segments to the path.
-         * @param to - the point where the arc should end
-         * @param closewise [optional] - specifies whether the arc should be drawn in clockwise direction. optional, default: true
-         */
-        arcTo(to: Point, clockwise?: boolean): void;
-
         /**
          * Closes the path. When closed, Paper.js connects the first and last segment of the path with an additional curve.
-         * @param join - controls whether the method should attempt to merge the first segment with the last if they lie in the same location.
+         * @param tolerance [optional] - the maximum distance allowed when merging the first and last locations in the newly closed path. default: 0
          */
-        closePath(join: boolean): void;
+        closePath(tolerance?: number): void;
 
         /**
          * If called on a CompoundPath, a new Path is created as a child and a point is added as its first segment relative to the position of the last segment of the current path.
@@ -2246,76 +2815,47 @@ declare module paper {
 
         /**
          * Adds a segment relative to the last segment point of the path.
-         * @param to - the vector which is added to the position of the last segment of the path, to get to the position of the new segment.
+         * @param point - the vector which is added to the position of the last segment of the path, to get to the position of the new segment.
          */
-        lineBy(to: Point): void;
+        lineBy(point: Point): void;
 
         /**
-         *
-         * @param through -
-         * @param to -
-         * @param parameter [optional] - default 0.5
-         */
-        curveBy(through: Point, to: Point, parameter?: number): void;
-
-        /**
-         *
-         * @param handle1 -
-         * @param handle2 -
-         * @param to -
-         */
-        cubicCurveBy(handle1: Point, handle2: Point, to: Point): void;
-
-        /**
-         *
-         * @param handle -
-         * @param to -
-         */
-        quadraticCurveBy(handle: Point, to: Point): void;
-
-        /**
-         *
-         * @param through -
-         * @param to -
+         * Adds an arc from the position of the last segment in the path, passing through the specified through vector, to the specified to vector, all specified relatively to it by these given vectors, by adding one or more segments to the path.
+         * @param through - the vector where the arc should pass through
+         * @param to - the vector where the arc should end
          */
         arcBy(through: Point, to: Point): void;
 
         /**
-         *
-         * @param to -
-         * @param clockwise [optional] - default: true
+         * Adds an arc from the position of the last segment in the path to the to vector specified relatively to it, by adding one or more segments to the path.
+         * @param to - the vector where the arc should end
+         * @param clockwise [optional] - specifies whether the arc should be drawn in clockwise direction. default: true
          */
         arcBy(to: Point, clockwise?: boolean): void;
 
         /**
-         * Merges the geometry of the specified path from this path's geometry and returns the result as a new path item.
-         * @param path - the path to unite with
+         * Adds a curve from the last segment in the path through the specified through vector, to the specified to vector, all specified relatively to it by these given vectors, by adding one segment to the path.
+         * @param through - the vector through which the curve should pass
+         * @param to - the destination vector of the newly added curve
+         * @param time [optional] - the curve-time parameter at which the through point is to be located. default: 0.5
          */
-        unite(path: PathItem): PathItem;
+        curveBy(through: Point, to: Point, time?: number): void;
 
         /**
-         * Intersects the geometry of the specified path with this path's geometry and returns the result as a new path item.
-         * @param path - the path to intersect with
+         * Adds a cubic bezier curve to the path, from the last segment to the to the specified to vector, with the curve itself defined by two specified handles.
+         * @param handle1 - the location of the first handle of the newly added curve
+         * @param handle2 - the location of the second handle of the newly added curve
+         * @param to - the destination point of the newly added curve
          */
-        intersect(path: PathItem): PathItem;
+        cubicCurveBy(handle1: Point, handle2: Point, to: Point): void;
 
         /**
-         * Subtracts the geometry of the specified path from this path's geometry and returns the result as a new path item.
-         * @param - the path to subtract
+         * Adds a quadratic bezier curve to the path, from the last segment to the specified destination point, with the curve itself defined by the specified handle.
+         * Note that Paper.js only stores cubic curves, so the handle is actually converted.
+         * @param handle - the handle of the newly added quadratic curve out of which the values for segment.handleOut of the resulting cubic curve’s first segment and segment.handleIn of its second segment are calculated
+         * @param to - the destination point of the newly added curve
          */
-        subtract(path: PathItem): PathItem;
-
-        /**
-         * Excludes the intersection of the geometry of the specified path with this path's geometry and returns the result as a new group item.
-         * @param - the path to exclude the intersection of
-         */
-        exclude(path: PathItem): PathItem;
-
-        /**
-         * Splits the geometry of this path along the geometry of the specified path returns the result as a new group item.
-         * @param - the path to divide by
-         */
-        divide(path: PathItem): PathItem;
+        quadraticCurveBy(handle: Point, to: Point): void;
 
     }
     /**
@@ -2327,7 +2867,7 @@ declare module paper {
          * Creates a new path item and places it at the top of the active layer.
          * @param segments [optional] - An array of segments (or points to be converted to segments) that will be added to the path
          */
-        constructor(segments?: Segment[] | Point[]);
+        constructor(segments?: Segment[] | Point[] | number[][]);
 
         /**
          * Creates a new path item from an object description and places it at the top of the active layer.
@@ -2341,6 +2881,14 @@ declare module paper {
          */
         constructor(pathData?: string);
 
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): Path;
+
         /**
          * The segments contained within the path.
          * Array of Segment objects
@@ -2351,31 +2899,32 @@ declare module paper {
          * The first Segment contained within the path.
          * Read only.
          */
-        firstSegment: Segment;
+        readonly firstSegment: Segment;
 
         /**
          * The last Segment contained within the path
          * Read only.
          */
-        lastSegment: Segment;
+        readonly lastSegment: Segment;
 
         /**
          * The curves contained within the path.
          * Array of Curve objects
+         * Read only.
          */
-        curves: Curve[];
+        readonly curves: Curve[];
 
         /**
          * The first Curve contained within the path.
          * Read only.
          */
-        firstCurve: Curve;
+        readonly firstCurve: Curve;
 
         /**
          * The last Curve contained within the path.
          * Read only.
          */
-        lastCurve: Curve;
+        readonly lastCurve: Curve;
 
         /**
          * Specifies whether the path is closed. If it is closed, Paper.js connects the first and last segments.
@@ -2386,70 +2935,54 @@ declare module paper {
          * The approximate length of the path in points.
          * Read only.
          */
-        length: number;
+        readonly length: number;
 
         /**
          * The area of the path in square points. Self-intersecting paths can contain sub-areas that cancel each other out.
          * Read only.
          */
-        area: number;
+        readonly area: number;
 
         /**
-         * Specifies whether the path and all its segments are selected. Cannot be true on an empty path.
-         */
-        fullySelected: boolean;
-
-        /**
-         * Specifies whether the path is oriented clock-wise.
-         */
-        clockwise: boolean;
-
-        /**
-         * Returns a point that is guaranteed to be inside the path.
-         * Read only.
-         */
-        interiorPoint: Point;
-
-        /**
-         * Adds one or more segments to the end of the segments array of this path.
+         * Adds one segment to the end of the segments array of this path.
          * @param segment - the segment or point to be added.
          * Returns the added segment. This is not necessarily the same object, e.g. if the segment to be added already belongs to another path.
          */
-        add(segment: Segment | Point): Segment;
+        add(segment: Segment | Point | number[]): Segment;
 
         /**
-         * Inserts one or more segments at a given index in the list of this path's segments.
+         * Inserts one segment at a given index in the list of this path's segments.
          * @param index - the index at which to insert the segment.
          * @param segment - the segment or point to be inserted.
          * Returns the added segment. This is not necessarily the same object, e.g. if the segment to be added already belongs to another path.
          */
-        insert(index: number, segment: Segment | Point): Segment;
+        insert(index: number, segment: Segment | Point | number[]): Segment;
 
         /**
          * Adds an array of segments (or types that can be converted to segments) to the end of the segments array.
          * @param segments - Array of Segment objects
-         * Returns an array of the added segments. These segments are not necessarily the same objects, e.g. if the segment to be added already belongs to another path.
+         * @returns an array of the added segments. These segments are not necessarily the same objects, e.g. if the segment to be added already belongs to another path.
          */
-        addSegments(segments: Segment[]): Segment[];
+        addSegments(segments: Segment[] | Point[] | number[][]): Segment[];
 
         /**
          * Inserts an array of segments at a given index in the path's segments array.
          * @param index - the index at which to insert the segments.
          * @param segments - the segments to be inserted.
-         * Returns an array of the added segments. These segments are not necessarily the same objects, e.g. if the segment to be added already belongs to another path.
+         * @returns an array of the added segments. These segments are not necessarily the same objects, e.g. if the segment to be added already belongs to another path.
          */
-        insertSegments(index: number, segments: Segment[]): Segment[];
+        insertSegments(index: number, segments: Segment[] | Point[] | number[][]): Segment[];
 
         /**
          * Removes the segment at the specified index of the path's segments array.
          * @param index - the index of the segment to be removed
-         * Returns the removed segment
+         * @returns the removed segment
          */
         removeSegment(index: number): Segment;
 
         /**
          * Removes all segments from the path's segments array.
-         * Returns an array containing the removed segments
+         * @returns an array containing the removed segments
          */
         removeSegments(): Segment[];
 
@@ -2457,55 +2990,76 @@ declare module paper {
          * Removes the segments from the specified from index to the to index from the path's segments array.
          * @param from - the beginning index, inclusive
          * @param to [optional = segments.length] - the ending index
-         * Returns an array containing the removed segments
+         * @returns an array containing the removed segments
          */
         removeSegments(from: number, to?: number): Segment[];
 
         /**
-         * Converts the curves in a path to straight lines with an even distribution of points. The distance between the produced segments is as close as possible to the value specified by the maxDistance parameter.
-         * @param maxDistance - the maximum distance between the points
+         * Checks if any of the curves in the path have curve handles set.
          */
-        flatten(maxDistance: number): void;
+        hasHandles(): boolean;
 
         /**
-         * Smooths a path by simplifying it. The path.segments array is analyzed and replaced by a more optimal set of segments, reducing memory usage and speeding up drawing.
-         * @param tolerance [optional = 2.5] -
+         * Clears the path’s handles by setting their coordinates to zero, turning the path into a polygon (or a polyline if it isn’t closed).
          */
-        simplify(tolerance?: number): void;
+        clearHandles(): void;
+        
+        /**
+         * Divides the path on the curve at the given location into two curves, by inserting a new segment at the given location.
+         * @param location - the curve location at which to divide the existing curve by inserting a new segment
+         * @returns the newly inserted segment if the location is valid, {code null} otherwise
+         */
+        divideAt(location: CurveLocation): Path;
+
+        /**
+         * Divides the path on the curve at the given offset into two curves, by inserting a new segment at the given location.
+         * @param offset - the offset at which to divide the existing curve by inserting a new segment
+         * @returns the newly inserted segment if the location is valid, {code null} otherwise
+         */
+        divideAt(offset: number): Path;
 
         /**
          * Splits the path at the given offset. After splitting, the path will be open. If the path was open already, splitting will result in two paths.
          * @param offset - the offset at which to split the path as a number between 0 and path.length
-         * Returns the newly created path after splitting, if any
+         * @returns the newly created path after splitting, if any
          */
         split(offset: number): Path;
 
         /**
          * Splits the path at the given curve location. After splitting, the path will be open. If the path was open already, splitting will result in two paths.
          * @param location - the curve location at which to split the path
-         * Returns the newly created path after splitting, if any
+         * @returns the newly created path after splitting, if any
          */
         split(location: CurveLocation): Path;
 
         /**
          * Splits the path at the given curve index and parameter. After splitting, the path will be open. If the path was open already, splitting will result in two paths.
          * @param index - the index of the curve in the path.curves array at which to split
-         * @param parameter - the parameter at which the curve will be split
-         * Returns the newly created path after splitting, if any
+         * @param offset - the offset at which to split the path as a number between 0 and path.length
+         * @returns the newly created path after splitting, if any
          */
-        split(index: number, parameter: number): Path;
-
-        /**
-         * Reverses the orientation of the path, by reversing all its segments.
-         */
-        reverse(): void;
+        split(index: number, offset: number): Path;
 
         /**
          * Joins the path with the specified path, which will be removed in the process.
          * @param path - the path to join this path with
-         * Returns the joined path
+         * @param tolerance [optional] - the tolerance with which to decide if two segments are to be considered the same location when joining. default: 0
+         * @returns the joined path
          */
-        join(path: Path): Path;
+        join(path: Path, tolerance?: number): Path;
+
+        /**
+         * Reduces the path by removing curves that have a length of 0, and unnecessary segments between two collinear flat curves.
+         * @param options [optional] - options for reducing the path. default { simplify: false }
+         * @param options.simplify - whether to be slightly tolerant of length when reducing the path. It not set the tolerance will be 1e-7 instead of 0.
+         */
+        reducePath(options?: { simplify?: boolean; }): void;
+
+        /**
+         * Attempts to create a new shape item with same geometry as this path item, and inherits all settings from it, similar to item.clone().
+         * @param insert [optional] - specifies whether the new shape should be inserted into the scene graph. When set to true, it is inserted above the path item. default: true
+         */
+        toShape(insert?: boolean): Shape;
 
         /**
          * Returns the curve location of the specified point if it lies on the path, null otherwise.
@@ -2521,46 +3075,53 @@ declare module paper {
 
         /**
          * Returns the curve location of the specified offset on the path.
-         * @param offset - the offset on the path, where 0 is at the beginning of the path and path.length at the end.
-         * @param isParameter [optional=false] -
+         * @param offset - the offset or time on the path, where 0 is at the beginning of the path and path.length at the end.
+         * @param isTime [optional=false] -
          */
-        getLocationAt(offset: number, isParameter?: boolean): CurveLocation;
+        getLocationAt(offset: number, isTime?: boolean): CurveLocation;
 
         /**
          * Calculates the point on the path at the given offset. Returns the point at the given offset
-         * @param offset - the offset on the path, where 0 is at the beginning of the path and path.length at the end.
-         * @param isParameter [optional=false] -
+         * @param offset - the offset or time on the path, where 0 is at the beginning of the path and path.length at the end.
+         * @param isTime [optional=false] -
          */
-        getPointAt(offset: number, isPatameter?: boolean): Point;
+        getPointAt(offset: number, isTime?: boolean): Point;
 
         /**
          * Calculates the tangent vector of the path at the given offset. Returns the tangent vector at the given offset
-         * @param offset - the offset on the path, where 0 is at the beginning of the path and path.length at the end.
-         * @param isParameter [optional=false] -
+         * @param offset - the offset or time on the path, where 0 is at the beginning of the path and path.length at the end.
+         * @param isTime [optional=false] -
          */
-        getTangentAt(offset: number, isPatameter?: boolean): Point;
+        getTangentAt(offset: number, isTime?: boolean): Point;
 
         /**
          * Calculates the normal vector of the path at the given offset. Returns the normal vector at the given offset
-         * @param offset - the offset on the path, where 0 is at the beginning of the path and path.length at the end.
-         * @param isParameter [optional=false] -
+         * @param offset - the offset or time on the path, where 0 is at the beginning of the path and path.length at the end.
+         * @param isTime [optional=false] -
          */
-        getNormalAt(offset: number, isParameter?: boolean): Point;
+        getNormalAt(offset: number, isTime?: boolean): Point;
+
+        /**
+         * Calculates the weighted tangent vector of the path at the given offset.
+         * @param offset - the offset or time on the path, where 0 is at the beginning of the path and path.length at the end.
+         * @param isTime [optional=false] -
+         */
+        getWeightedTangentAt(offset: number, isTime?: boolean): Point;
+
+        /**
+         * Calculates the weighted normal vector of the path at the given offset.
+         * @param offset - the offset or time on the path, where 0 is at the beginning of the path and path.length at the end.
+         * @param isTime [optional=false] -
+         */
+        getWeightedNormalAt(offset: number, isTime?: boolean): Point;
 
         /**
          * Calculates the curvature of the path at the given offset. Curvatures indicate how sharply a path changes direction. A straight line has zero curvature, where as a circle has a constant curvature. The path's radius at the given offset is the reciprocal value of its curvature.
          * @param offset - the offset on the path, where 0 is at the beginning of the path and path.length at the end.
-         * @param isParameter [optional=false] -
-         * @param point - the point for which we search the nearest location
+         * @param isTime [optional=false] -
+         * @param point [optional] - the point for which we search the nearest location
          */
-        getCurvatureAt(offset: number, isParameter?: boolean, point?: Point): number;
-
-        /**
-         * Returns the nearest point on the path to the specified point.
-         * @param point - the point for which we search the nearest point
-         */
-        getNearestPoint(point: Point): Point;
-
+        getCurvatureAt(offset: number, isTime?: boolean, point?: Point): number;
 
     }
     module Path {
@@ -2577,6 +3138,14 @@ declare module paper {
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): Line;
         }
 
         export class Circle extends Path {
@@ -2592,6 +3161,14 @@ declare module paper {
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): Circle;
         }
 
         export class Rectangle extends Path {
@@ -2600,7 +3177,7 @@ declare module paper {
              * @param rectangle - the rectangle object describing the geometry of the rectangular path to be created.
              * @param radius [optional] - the size of the rounded corners default: null
              */
-            constructor(rectangle: Rectangle, radius?: number);
+            constructor(rectangle: paper.Rectangle, radius?: number);
 
             /**
              * Creates a rectangular path item from a point and a size object.
@@ -2621,6 +3198,14 @@ declare module paper {
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): Rectangle;
         }
 
         export class Ellipse extends Path {
@@ -2628,13 +3213,22 @@ declare module paper {
              * Creates an elliptical path item.
              * @param rectangle - the rectangle circumscribing the ellipse
              */
-            constructor(rectangle: Rectangle);
+            constructor(rectangle: paper.Rectangle);
 
             /**
              * Creates an elliptical path item from the properties described by an object literal.
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+            
+            
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): Ellipse;
         }
 
         export class Arc extends Path {
@@ -2651,6 +3245,14 @@ declare module paper {
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+            
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): Arc;
         }
 
         export class RegularPolygon extends Path {
@@ -2667,6 +3269,14 @@ declare module paper {
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+            
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): RegularPolygon;
         }
 
         export class Star extends Path {
@@ -2684,6 +3294,14 @@ declare module paper {
              * @param object - an object literal containing properties describing the path's attributes
              */
             constructor(object: any);
+            
+            /**
+             * Clones the item within the same project and places the copy above the item.
+             * @param options [optional] - default: { insert: true, deep: true }
+             * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+             * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+             */
+            clone(options?: { insert?: boolean; deep?: boolean; }): Star;
         }
     }
 
@@ -2703,53 +3321,61 @@ declare module paper {
          * @param pathData - the SVG path-data that describes the geometry of this path.
          */
         constructor(pathData: string);
-
+        
         /**
-         * Specifies whether the compound path is oriented clock-wise.
+         * Specifies whether the path is closed. If it is closed, Paper.js connects the first and last segments.
          */
-        clockwise: boolean;
+        closed: boolean;
 
         /**
          * The first Segment contained within the path.
          * Read Only
          */
-        firstSegment: Segment;
+        readonly firstSegment: Segment;
 
         /**
          * The last Segment contained within the path.
          * Read Only
          */
-        lastSegment: Segment;
+        readonly lastSegment: Segment;
 
         /**
          * All the curves contained within the compound-path, from all its child Path items.
          * Read Only
          */
-        curves: Curve[];
+        readonly curves: Curve[];
 
         /**
          * The first Curve contained within the path.
          * Read Only
          */
-        firstCurve: Curve;
+        readonly firstCurve: Curve;
 
         /**
          * The last Curve contained within the path.
          * Read only.
          */
-        lastCurve: Curve;
+        readonly lastCurve: Curve;
 
         /**
          * The area of the path in square points. Self-intersecting paths can contain sub-areas that cancel each other out.
          * Read Only.
          */
-        area: number;
+        readonly area: number;
 
         /**
-         * Reverses the orientation of all nested paths.
+         * The approximate length of the path in points.
+         * Read only.
          */
-        reverse(): void;
-
+        readonly length: number;
+        
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): CompoundPath;
     }
     /**
      * The Segment object represents the points of a path through which its Curve objects pass. The segments of a path can be accessed through its path.segments array.
@@ -2786,11 +3412,6 @@ declare module paper {
          */
         handleOut: Point;
 
-        /**
-         * Specifies whether the segment has no handles defined, meaning it connects two straight lines.
-         */
-        linear: boolean;
-
         /**
          * Specifies whether the point of the segment is selected.
          */
@@ -2800,48 +3421,83 @@ declare module paper {
          * The index of the segment in the path.segments array that the segment belongs to.
          * Read Only
          */
-        index: number;
+        readonly index: number;
 
         /**
          * The path that the segment belongs to.
          * Read Only
          */
-        path: Path;
+        readonly path: Path;
 
         /**
          * The curve that the segment belongs to. For the last segment of an open path, the previous segment is returned.
          * Read only.
          */
-        curve: Curve;
+        readonly curve: Curve;
 
         /**
          * The curve location that describes this segment's position ont the path.
          * Read Only.
          */
-        location: CurveLocation;
+        readonly location: CurveLocation;
 
         /**
          * The next segment in the path.segments array that the segment belongs to. If the segments belongs to a closed path, the first segment is returned for the last segment of the path.
          * Read Only.
          */
-        next: Segment;
+        readonly next: Segment;
 
         /**
          * The previous segment in the path.segments array that the segment belongs to. If the segments belongs to a closed path, the last segment is returned for the first segment of the path.
          * Read Only.
          */
-        previous: Segment;
+        readonly previous: Segment;
 
         /**
-         * Returns true if the the two segments are the beginning of two lines and if these two lines are running parallel.
-         * @param segment
+         * Checks if the segment has any curve handles set.
          */
-        isColinear(segment: Segment): boolean;
+        hasHandles(): boolean;
 
         /**
-         * Returns true if the segment at the given index is the beginning of an orthogonal arc segment. The code looks at the length of the handles and their relation to the distance to the imaginary corner point. If the relation is kappa, then it's an arc.
+         * Checks if the segment connects two curves smoothly, meaning that its two handles are collinear and segment does not form a corner.
          */
-        isArc(): boolean;
+        isSmooth(): boolean;
+
+        /**
+         * Clears the segment’s handles by setting their coordinates to zero, turning the segment into a corner.
+         */
+        clearHandles(): void;
+
+        /**
+         * Smooths the bezier curves that pass through this segment by taking into account the segment’s position and distance to the neighboring segments and changing the direction and length of the segment’s handles accordingly without moving the segment itself.
+         * Two different smoothing methods are available:
+         *   'catmull-rom' uses the Catmull-Rom spline to smooth the segment.
+         *      The optionally passed factor controls the knot parametrization of the algorithm:
+         *        0.0: the standard, uniform Catmull-Rom spline
+         *        0.5: the centripetal Catmull-Rom spline, guaranteeing no self-intersections
+         *        1.0: the chordal Catmull-Rom spline
+         *   'geometric' use a simple heuristic and empiric geometric method to smooth the segment’s handles. The handles were weighted, meaning that big differences in distances between the segments will lead to probably undesired results.
+         * The optionally passed factor defines the tension parameter (0…1), controlling the amount of smoothing as a factor by which to scale each handle.
+         * @param options [optional] - the smoothing options. default { type: 'catmull-rom', factor: 0.5 for 'catmull-rom', 0.4 for 'geometric'}
+         * @param options.type - the type of smoothing method: ‘catmull-rom’, ‘geometric’
+         * @param options.factor - the factor parameterizing the smoothing method — default: 0.5 for 'catmull-rom', 0.4 for 'geometric'
+         */
+        smooth(options?:{ type?: string; factor?: number; }): void;
+
+        /**
+         * Checks if the this is the first segment in the path.segments array.
+         */
+        isFirst(): boolean;
+
+        /**
+         * Checks if the this is the last segment in the path.segments array.
+         */
+        isLast(): boolean;
+
+        /**
+         * Returns the reversed the segment, without modifying the segment itself.
+         */
+        reversed(): Segment;
 
         /**
          * Returns the reversed the segment, without modifying the segment itself.
@@ -2853,6 +3509,17 @@ declare module paper {
          */
         remove(): boolean;
 
+                /**
+         * Checks whether the segment is equal to that of the supplied segment.
+         * @param segment - the segment to check against
+         */
+        equals(segment: Segment): boolean;
+
+        /**
+         * Returns a copy of the segment.
+         */
+        clone(): Segment;
+
         /**
          * A string representation of the segment
          */
@@ -2864,6 +3531,14 @@ declare module paper {
          */
         transform(matrix: Matrix): void;
 
+        /**
+         * Interpolates between the two specified segments and sets the point and handles of this segment accordingly.
+         * @param from - the segment defining the geometry when factor is 0
+         * @param to - the segment defining the geometry when factor is 1
+         * @param factor - the interpolation coefficient, typically between 0 and 1, but extrapolation is possible too
+         */
+        interpolate(from: Segment, to: Segment, factor: number): void;
+
     }
     /**
      * The Curve object represents the parts of a path that are connected by two following Segment objects. The curves of a path can be accessed through its path.curves array.
@@ -2911,48 +3586,68 @@ declare module paper {
          * The first segment of the curve.
          * Read Only.
          */
-        segment1: Segment;
+        readonly segment1: Segment;
 
         /**
          * The second segment of the curve.
          * Read only.
          */
-        segment2: Segment;
+        readonly segment2: Segment;
 
         /**
          * The path that the curve belongs to.
          * Read only.
          */
-        path: Path;
+        readonly path: Path;
 
         /**
          * The index of the curve in the path.curves array.
          * Read Only.
          */
-        index: number;
+        readonly index: number;
 
         /**
          * The next curve in the path.curves array that the curve belongs to.
          * Read Only
          */
-        next: Curve;
+        readonly next: Curve;
 
         /**
          * The previous curve in the path.curves array that the curve belongs to.
          * Read Only.
          */
-        previous: Curve;
+        readonly previous: Curve;
 
         /**
          * Specifies whether the points and handles of the curve are selected.
          */
         selected: boolean;
 
+        /**
+         * An array of 8 float values, describing this curve’s geometry in four absolute x/y pairs (point1, handle1, handle2, point2). This format is used internally for efficient processing of curve geometries, e.g. when calculating intersections or bounds.
+         * Note that the handles are converted to absolute coordinates.
+         * Read only.
+         */
+        readonly values: number[];
+
+        /**
+         * An array of 4 point objects, describing this curve’s geometry in absolute coordinates (point1, handle1, handle2, point2).
+         * Note that the handles are converted to absolute coordinates.
+         * Read only.
+         */
+        readonly points: Point[];
+
         /**
          * The approximated length of the curve in points.
          * Read Only.
          */
-        length: number;
+        readonly length: number;
+
+        /**
+         * The area that the curve’s geometry is covering.
+         * Read only.
+         */
+        readonly area: number;
 
         /**
          * The bounding rectangle of the curve excluding stroke width.
@@ -2970,21 +3665,67 @@ declare module paper {
         handleBounds: Rectangle;
 
         /**
-         * Checks if this curve is linear, meaning it does not define any curve handle.
+         * Returns a copy of the curve.
          */
-        isLinear(): boolean;
+        clone(): Curve;
 
         /**
-         * TODO?
+         * Returns a string representation of the curve
          */
-        //isHorizontal(): boolean;
+        toString(): string;
+
+        /**
+         * Determines the type of cubic Bézier curve via discriminant classification, as well as the curve-time parameters of the associated points of inflection, loops, cusps, etc.
+         * Returns  the curve classification information as an object
+         *      type - the type of Bézier curve, possible values are: ‘line’, ‘quadratic’, ‘serpentine’, ‘cusp’, ‘loop’, ‘arch’
+         *      roots - the curve-time parameters of the associated points of inflection for serpentine curves, loops, cusps, etc
+         */
+        classify(): { type: string, roots: number[] };
+
+        /**
+         * Removes the curve from the path that it belongs to, by removing its second segment and merging its handle with the first segment.
+         */
+        remove(): boolean;
+
+        /**
+         * Checks if the this is the first curve in the path.curves array.
+         */
+        isFirst(): boolean;
+
+        /**
+         * Checks if the this is the last curve in the path.curves array.
+         */
+        isLast(): boolean;
+
+        /**
+         * Creates a new curve as a sub-curve from this curve, its range defined by the given curve-time parameters. If from is larger than to, then the resulting curve will have its direction reversed.
+         * @param from - the curve-time parameter at which the sub-curve starts
+         * @param to - the curve-time parameter at which the sub-curve ends
+         */
+        getPart(from: number, to: number): Curve;
 
         /**
          * Divides the curve into two curves at the given offset. The curve itself is modified and becomes the first part, the second part is returned as a new curve. If the modified curve belongs to a path item, the second part is also added to the path.
-         * @param offset [optional] - the offset on the curve at which to split, or the curve time parameter if isParameter is true  default: 0.5
-         * @param isParameter [optional] - pass true if offset is a curve time parameter. default: false
+         * @param offset [optional] - the offset on the curve at which to split, or the curve time parameter if isParameter is true. default: 0.5
+         * @param isTime [optional] - pass true if offset is a curve time parameter. default: false
+         * @returns the second part of the divided curve if the location is valid, {code null} otherwise
          */
-        divide(offset?: number, isParameter?: boolean): Curve;
+        divide(offset?: number, isTime?: boolean): Curve;
+
+        /**
+         * Divides the curve into two curves at the given offset or location. The curve itself is modified and becomes the first part, the second part is returned as a new curve. If the curve belongs to a path item, a new segment is inserted into the path at the given location, and the second part becomes a part of the path as well.
+         * @param location - the offset or location on the curve at which to divide
+         * @returns the second part of the divided curve if the location is valid, {code null} otherwise
+         */
+        divideAt(location: number | CurveLocation): Curve;
+
+        /**
+         * Divides the curve into two curves at the given offset or location. The curve itself is modified and becomes the first part, the second part is returned as a new curve. If the curve belongs to a path item, a new segment is inserted into the path at the given location, and the second part becomes a part of the path as well.
+         * @param time - the curve-time parameter on the curve at which to divide
+         * @param setHandles - whether to set handles on the new curves. default is the output of hasHandles().
+         * @returns the second part of the divided curve if the location is valid, {code null} otherwise
+         */
+        divideAtTime(time: number, setHandles?:boolean): Curve;
 
         /**
          * Splits the path this curve belongs to at the given offset. After splitting, the path will be open. If the path was open already, splitting will result in two paths.
@@ -2993,46 +3734,100 @@ declare module paper {
          */
         split(offset?: number, isParameter?: boolean): Path;
 
+        /**
+         * Splits the path this curve belongs to at the given offset. After splitting, the path will be open. If the path was open already, splitting will result in two paths.
+         * @param location - the offset or location on the curve at which to split
+         * @returns the newly created path after splitting, if any
+         */
+        splitAt(location: number | CurveLocation): Path;
+
+        /**
+         * Splits the path this curve belongs to at the given offset. After splitting, the path will be open. If the path was open already, splitting will result in two paths.
+         * @param time - the curve-time parameter on the curve at which to split
+         */
+        splitAtTime(time: number): Path;
+
         /**
          * Returns a reversed version of the curve, without modifying the curve itself.
          */
-        reverse(): Curve;
+        reversed(): Curve;
+        
+        /**
+         * Clears the curve’s handles by setting their coordinates to zero, turning the curve into a straight line.
+         */
+        clearHandles(): void;
 
         /**
-         * Removes the curve from the path that it belongs to, by merging its two path segments.
-         * returns true if the curve was removed, false otherwise
+         * Checks if this curve has any curve handles set.
          */
-        remove(): boolean;
+        hasHandles(): boolean;
 
         /**
-         * Returns a copy of the curve.
+         * Checks if this curve has any length.
+         * @param epsilon [optional] - the epsilon against which to compare the curve’s length. default: 0
          */
-        clone(): Curve;
+        hasLength(epsilon?: number): boolean;
 
         /**
-         * returns a string representation of the curve
+         * Checks if this curve appears as a straight line. This can mean that it has no handles defined, or that the handles run collinear with the line that connects the curve’s start and end point, not falling outside of the line.
          */
-        toString(): string;
+        isStraight(): boolean;
+
+        /**
+         * Checks if this curve is linear, meaning it does not define any curve handle.
+         */
+        isLinear(): boolean;
+
+        /**
+         * Checks if the the two curves describe straight lines that are collinear, meaning they run in parallel.
+         * @param curve - the other curve to check against
+         */
+        isCollinear(curve: Curve): boolean;
+
+        /**
+         * Checks if the curve is a straight horizontal line.
+         */
+        isHorizontal(): boolean;
+
+        /**
+         * Checks if the curve is a straight vertical line.
+         */
+        isVertical(): boolean;
 
         /**
          * Calculates the curve time parameter of the specified offset on the path, relative to the provided start parameter. If offset is a negative value, the parameter is searched to the left of the start parameter. If no start parameter is provided, a default of 0 for positive values of offset and 1 for negative values of offset.
-         * @param offset -
-         * @param start [optional] -
+         * @param offset - the offset at which to find the curve-time, in curve length units
+         * @param start [optional] - the curve-time in relation to which the offset is determined
+         * @deprecated use getTimeAt instead
          */
-        getParameterAt(offset: Point, start?: number): number;
+        getParameterAt(offset: number, start?: number): number;
 
         /**
          * Returns the curve time parameter of the specified point if it lies on the curve, null otherwise.
          * @param point - the point on the curve.
+         * @deprecated use getTimeOf instead
          */
         getParameterOf(point: Point): number;
 
         /**
          * Calculates the curve location at the specified offset or curve time parameter.
          * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
-         * @param isParameter [optional] - pass true if offset is a curve time parameter.  default: false
+         * @param isTime [optional] - pass true if offset is a curve time parameter.  default: false
          */
-        getLocationAt(offset: number, isParameter?: boolean): CurveLocation;
+        getLocationAt(offset: number, isTime?: boolean): CurveLocation;
+
+        /**
+         * Calculates the curve-time parameter of the specified offset on the path, relative to the provided start parameter. If offset is a negative value, the parameter is searched to the left of the start parameter. If no start parameter is provided, a default of 0 for positive values of offset and 1 for negative values of offset.
+         * @param offset - the offset at which to find the curve-time, in curve length units
+         * @param start [optional] - the curve-time in relation to which the offset is determined
+         */
+        getTimeAt(offset: number, start?: number): number;
+
+        /**
+         * Calculates the curve offset at the specified curve-time parameter on the curve.
+         * @param time - the curve-time parameter on the curve
+         */
+        getOffsetAtTime(time: number): number;
 
         /**
          * Returns the curve location of the specified point if it lies on the curve, null otherwise.
@@ -3046,33 +3841,71 @@ declare module paper {
          */
         getOffsetOf(point: Point): number;
 
+        /**
+         * Returns the curve-time parameter of the specified point if it lies on the curve, null otherwise. Note that if there is more than one possible solution in a self-intersecting curve, the first found result is returned.
+         * @param point - the point on the curve
+         */
+        getTimeOf(point: Point): number;
+
+        /**
+         * Returns the nearest location on the curve to the specified point.
+         * @param point - the point for which we search the nearest location
+         */
+        getNearestLocation(point: Point): CurveLocation;
+
+        /**
+         * Returns the nearest point on the curve to the specified point.
+         * @param point - the point for which we search the nearest point
+         */
+        getNearestPoint(point: Point): Point;
+
         /**
          * Calculates the point on the curve at the given offset.
          * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
-         * @param isParameter [optional] - pass true if offset is a curve time parameter. default: false
+         * @param isTime [optional] - pass true if offset is a curve time parameter. default: false
          */
-        getPointAt(offset: number, isParameter?: boolean): Point;
+        getPointAt(offset: number, isTime?: boolean): Point;
 
         /**
          * Calculates the tangent vector of the curve at the given offset.
          * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
-         * @param isParameter [optional] - pass true if offset is a curve time parameter. default: false
+         * @param isTime [optional] - pass true if offset is a curve time parameter. default: false
          */
-        getTangentAt(offset: number, isParameter?: boolean): Point;
+        getTangentAt(offset: number, isTime?: boolean): Point;
 
         /**
          * Calculates the normal vector of the curve at the given offset.
          * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
-         * @param isParameter [optional] - pass true if offset is a curve time parameter. default: false
+         * @param isTime [optional] - pass true if offset is a curve time parameter. default: false
          */
-        getNormalAt(offset: number, isParameter?: boolean): Point;
+        getNormalAt(offset: number, isTime?: boolean): Point;
+
+        /**
+         * Calculates the weighted tangent vector of the curve at the given offset.
+         * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
+         * @param isTime [optional] - pass true if offset is a curve time parameter. default: false
+         */
+        getWeightedTangentAt(offset: number, isTime?: boolean): Point;
+
+        /**
+         * Calculates the weighted normal vector of the curve at the given offset.
+         * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
+         * @param isTime [optional] - pass true if offset is a curve time parameter. default: false
+         */
+        getWeightedNormalAt(offset: number, isTime?: boolean): Point;
 
         /**
          * Calculates the curvature of the curve at the given offset. Curvatures indicate how sharply a curve changes direction. A straight line has zero curvature, where as a circle has a constant curvature. The curve's radius at the given offset is the reciprocal value of its curvature.
          * @param offset - the offset on the curve, or the curve time parameter if isParameter is true
-         * @param isParameter - pass true if offset is a curve time parameter. default: false
+         * @param isTime - pass true if offset is a curve time parameter. default: false
          */
-        getCurvatureAt(offset: number, isParameter?: boolean): Point;
+        getCurvatureAt(offset: number, isTime?: boolean): Point;
+
+        /**
+         * Returns all intersections between two Curve objects as an array of CurveLocation objects.
+         * @param curve - the other curve to find the intersections with (if the curve itself or null is passed, the self intersection of the curve is returned, if it exists)
+         */
+        getIntersections(curve: Curve): CurveLocation[];
 
     }
     /**
@@ -3084,73 +3917,98 @@ declare module paper {
         /**
          * Creates a new CurveLocation object.
          * @param curve -
-         * @param parameter -
-         * @param point -
+         * @param time -
+         * @param point [optional]
          */
-        constructor(curve: Curve, parameter: number, point: Point);
+        constructor(curve: Curve, time: number, point?: Point);
 
         /**
          * The segment of the curve which is closer to the described location.
          * Read Only
          */
-        segment: Segment;
+        readonly segment: Segment;
 
         /**
          * The curve that this location belongs to.
          * Read Only
          */
-        curve: Curve;
-
-        /**
-         * The curve location on the intersecting curve, if this location is the result of a call to pathItem.getIntersections(path) / Curve#getIntersections(curve).
-         * Read Only
-         */
-        intersection: CurveLocation;
+        readonly curve: Curve;
 
         /**
          * The path this curve belongs to, if any.
          * Read Only
          */
-        path: Path;
+        readonly path: Path;
 
         /**
          * The index of the curve within the path.curves list, if the curve is part of a Path item.
          * Read Only.
          */
-        index: number;
+        readonly index: number;
+
+        /**
+         * The curve parameter, as used by various bezier curve calculations. It is value between 0 (beginning of the curve) and 1 (end of the curve).
+         * Read only.
+         * @deprecated use time instead
+         */
+        readonly parameter: number;
+
+        /**
+         * The curve-time parameter, as used by various bezier curve calculations. It is value between 0 (beginning of the curve) and 1 (end of the curve).
+         * Read Only.
+         */
+        readonly time: number;
+
+        /**
+         * The point which is defined by the curve and time.
+         * Read Only.
+         */
+        readonly point: Point;
 
         /**
          * The length of the path from its beginning up to the location described by this object. If the curve is not part of a path, then the length within the curve is returned instead.
          * Read only.
          */
-        offset: number;
+        readonly offset: number;
 
         /**
          * The length of the curve from its beginning up to the location described by this object.
          * Read Only.
          */
-        curveOffset: number;
+        readonly curveOffset: number;
 
         /**
-         * The curve parameter, as used by various bezier curve calculations. It is value between 0 (beginning of the curve) and 1 (end of the curve).
-         * Read only.
+         * The curve location on the intersecting curve, if this location is the result of a call to pathItem.getIntersections(path) / Curve#getIntersections(curve).
+         * Read Only.
          */
-        parameter: number;
+        readonly intersection: CurveLocation;
 
         /**
-         * The point which is defined by the curve and parameter.
+         * The tangential vector to the curve at the given location.
          * Read only.
          */
-        point: Point;
+        readonly tangent: Point;
+
+        /**
+         * The normal vector to the curve at the given location.
+         * Read only.
+         */
+        readonly normal: Point;
+
+        /**
+         * The curvature of the curve at the given location.
+         * Read only.
+         */
+        readonly curvature: number;
 
         /**
          * The distance from the queried point to the returned location.
          * Read Only.
          */
-        distance: number;
+        readonly distance: number;
 
         /**
-         * Checks whether tow CurveLocation objects are describing the same location on a path, by applying the same tolerances as elsewhere when dealing with curve time parameters.
+         * Checks whether two CurveLocation objects are describing the same location on a path, by applying the same tolerances as elsewhere when dealing with curve time parameters.
          * @param location CurveLocation
          */
         equals(location: CurveLocation): boolean;
@@ -3160,6 +4018,21 @@ declare module paper {
          */
         toString(): string;
 
+        /**
+         * Checks if the location is an intersection with another curve and is merely touching the other curve, as opposed to crossing it.
+         */
+        isTouching(): boolean;
+
+        /**
+         * Checks if the location is an intersection with another curve and is crossing the other curve, as opposed to just touching it.
+         */
+        isCrossing(): boolean;
+
+        /**
+         * Checks if the location is an intersection with another curve and is part of an overlap between the two involved paths.
+         */
+        hasOverlap(): boolean;
+
     }
     /**
      * A Project object in Paper.js is what usually is referred to as the document: The top level object that holds all the items contained in the scene graph. As the term document is already taken in the browser context, it is called Project.
@@ -3179,7 +4052,7 @@ declare module paper {
          * The reference to the project's view.
          * Read only.
          */
-        view: View;
+        readonly view: View;
 
         /**
          * The currently active path style. All selected items and newly created items will be styled with this style.
@@ -3190,23 +4063,30 @@ declare module paper {
          * The index of the project in the paperScope.projects list.
          * Read Only
          */
-        index: number;
+        readonly index: number;
 
         /**
          * The layers contained within the project.
+         * Read Only.
          */
-        layers: Layer[];
+        readonly layers: Layer[];
 
         /**
          * The layer which is currently active. New items will be created on this layer by default.
          * Read Only.
          */
-        activeLayer: Layer;
+        readonly activeLayer: Layer;
 
         /**
          * The symbols contained within the project.
          */
-        symbols: Symbol[];
+        readonly symbols: Symbol[];
+
+        /**
+         * The selected items contained within the project.
+         * Read only.
+         */
+        readonly selectedItems: Item[];
 
         /**
          * Activates this project, so all newly created items will be placed in it.
@@ -3237,7 +4117,7 @@ declare module paper {
          * Deselects all selected items in the project.
          */
         deselectAll(): void;
-         
+
         /**
          * Adds the specified layer at the end of the this project’s layers list.
          */
@@ -3249,28 +4129,56 @@ declare module paper {
         insertLayer(index: number, layer: Layer): Layer;
 
         /**
-         * Perform a hit-test on the items contained within the project at the location of the specified point.
+         * Perform a hit-test on the items and its children within the project at the location of the specified point.
          * The options object allows you to control the specifics of the hit-test and may contain a combination of the following values:
          * @param point - the point where the hit-test should be performed
          * @param options.tolerance -the tolerance of the hit-test in points. Can also be controlled through paperScope.settings.hitTolerance
          * @param options.class - only hit-test again a certain item class and its sub-classes: Group, Layer, Path, CompoundPath, Shape, Raster, PlacedSymbol, PointText, etc.
+         * @param options.match -a match function to be called for each found hit result: Return true to return the result, false to keep searching
          * @param options.fill - hit-test the fill of items.
          * @param options.stroke - hit-test the stroke of path items, taking into account the setting of stroke color and width.
          * @param options.segments - hit-test for segment.point of Path items.
          * @param options.curves - hit-test the curves of path items, without taking the stroke color or width into account.
          * @param options.handles - hit-test for the handles.  (segment.handleIn / segment.handleOut) of path segments.
          * @param options.ends - only hit-test for the first or last segment points of open path items.
-         * @param options.bounds - hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
+         * @param options.position - hit-test the item.position of of items, which depends on the setting of item.pivot.
          * @param options.center - hit-test the rectangle.center of the bounding rectangle of items (item.bounds).
+         * @param options.bounds - hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
          * @param options.guides - hit-test items that have Item#guide set to true.
          * @param options.selected - only hit selected items.
          */
-        hitTest(point: Point, options?: { tolerance?: number; class?: string; fill?: boolean; stroke?: boolean; segments?: boolean; curves?: boolean; handles?: boolean; ends?: boolean; bounds?: boolean; center?: boolean; guides?: boolean; selected?: boolean; }): HitResult;
+        hitTest(point: Point, options?: IHitTestOptions): HitResult;
+
+        /**
+         * Performs a hit-test on the item and its children (if it is a Group or Layer) at the location of the specified point, returning all found hits.
+         * The options object allows you to control the specifics of the hit-test and may contain a combination of the following values:
+         * @param point - the point where the hit-test should be performed
+         * @param options.tolerance -the tolerance of the hit-test in points. Can also be controlled through paperScope.settings.hitTolerance
+         * @param options.class - only hit-test again a certain item class and its sub-classes: Group, Layer, Path, CompoundPath, Shape, Raster, PlacedSymbol, PointText, etc.
+         * @param options.match -a match function to be called for each found hit result: Return true to return the result, false to keep searching
+         * @param options.fill - hit-test the fill of items.
+         * @param options.stroke - hit-test the stroke of path items, taking into account the setting of stroke color and width.
+         * @param options.segments - hit-test for segment.point of Path items.
+         * @param options.curves - hit-test the curves of path items, without taking the stroke color or width into account.
+         * @param options.handles - hit-test for the handles.  (segment.handleIn / segment.handleOut) of path segments.
+         * @param options.ends - only hit-test for the first or last segment points of open path items.
+         * @param options.position - hit-test the item.position of of items, which depends on the setting of item.pivot.
+         * @param options.center - hit-test the rectangle.center of the bounding rectangle of items (item.bounds).
+         * @param options.bounds - hit-test the corners and side-centers of the bounding rectangle of items (item.bounds).
+         * @param options.guides - hit-test items that have Item#guide set to true.
+         * @param options.selected - only hit selected items.
+         * */
+        hitTestAll(point: Point, options?: IHitTestOptions): HitResult[];
 
         /**
          * Fetch items contained within the project whose properties match the criteria in the specified object.
          * Extended matching is possible by providing a compare function or regular expression. Matching points, colors only work as a comparison of the full object, not partial matching (e.g. only providing the x- coordinate to match all points with that x-value). Partial matching does work for item.data.
          * Matching items against a rectangular area is also possible, by setting either match.inside or match.overlapping to a rectangle describing the area in which the items either have to be fully or partly contained.
+         * @param match.recursive - whether to loop recursively through all children, or stop at the current level — default: true
+         * @param match.match - a match function to be called for each item, allowing the definition of more flexible item checks that are not bound to properties. If no other match properties are defined, this function can also be passed instead of the options object
+         * @param match.class - the constructor function of the item type to match against
+         * @param match.inside - the rectangle in which the items need to be fully contained.
+         * @param match.overlapping - the rectangle with which the items need to at least partly overlap.
          */
         getItems(match: any): Item[];
 
@@ -3296,22 +4204,37 @@ declare module paper {
 
         /**
          * Exports the project with all its layers and child items as an SVG DOM, all contained in one top level SVG group node.
-         * @param options [optional] the export options, default: { asString: false, precision: 5, matchShapes: false }
+         * @param options [optional] the export options, default: { asString: false, precision: 5, matchShapes: false, bounds: 'view', matrix: paper.view.matrix, embedImages: true  }
          * @param options.asString - whether a SVG node or a String is to be returned.
          * @param options.precision - the amount of fractional digits in numbers used in SVG data.
          * @param options.matchShapes - whether path items should tried to be converted to shape items, if their geometries can be made to match
+         * @param options.bounds - the bounds of the area to export, either as a string (‘view’, content’), or a Rectangle object: 'view' uses the view bounds, 'content' uses the stroke bounds of all content.
+         * @param options.matrix - the matrix with which to transform the exported content: If options.bounds is set to 'view', paper.view.matrix is used, for all other settings of options.bounds the identity matrix is used.
+         * @param options.embedImages: whether raster images should be embedded as base64 data inlined in the xlink:href attribute, or kept as a link to their external URL.
          */
-        exportSVG(options?: { asString?: boolean; precision?: number; matchShapes?: boolean }): SVGElement;
+        exportSVG(options?: { asString?: boolean; precision?: number; matchShapes?: boolean; bounds?: string | Rectangle; matrix?: Matrix; embedImages?: boolean; }): SVGElement;
 
         /**
          * Converts the provided SVG content into Paper.js items and adds them to the active layer of this project.
          * Note that the project is not cleared first. You can call project.clear() to do so.
          * @param svg - the SVG content to import
-         * @param options [optional] - the import options, default: { expandShapes: false }
+         * @param options [optional] - the import options, default: { expandShapes: false, insert: true, applyMatrix: paperScope.settings.applyMatrix }
          * @param options.expandShapes - whether imported shape items should be expanded to path items.
+         * @param options.onLoad - the callback function to call once the SVG content is loaded from the given URL receiving two arguments: the converted item and the original svg data as a string. Only required when loading from external resources.
+         * @param options.onError - the callback function to call if an error occurs during loading. Only required when loading from external resources.
+         * @param options.insert: Boolean — whether the imported items should be added to the item that importSVG() is called on.
+         * @param options.applyMatrix  Boolean — whether the imported items should have their transformation matrices applied to their contents or not.
          */
-        importSVG(svg: SVGElement | string, options?: any): Item;
+        importSVG(svg: SVGElement | string, options?: { expandShapes?: boolean; onLoad?: (item: Item, svg: string) => void; onError?: (message: string, status: number) => void; insert?: true; applyMatrix?: Matrix; }): Item;
 
+         /**
+         * Converts the provided SVG content into Paper.js items and adds them to the active layer of this project.
+         * Note that the project is not cleared first. You can call project.clear() to do so.
+         * @param svg - the SVG content to import
+         * @param onLoad [optional] - the callback function to call once the SVG content is loaded from the given URL receiving two arguments: the converted item and the original svg data as a string. Only required when loading from external resources.
+         */
+        importSVG(svg: SVGElement | string, onLoad?: (item: Item, svg: string) => void): Item;
+        
     }
     /**
      * Symbols allow you to place multiple instances of an item in your project. This can save memory, since all instances of a symbol simply refer to the original item and it can speed up moving around complex objects, since internal properties such as segment lists and gradient positions don't need to be updated with every transformation.
@@ -3329,7 +4252,7 @@ declare module paper {
          * The project that this symbol belongs to.
          * Read Only.
          */
-        project: Project;
+        readonly project: Project;
 
         /**
          * The symbol definition.
@@ -3347,6 +4270,12 @@ declare module paper {
          */
         clone(): Symbol;
 
+        /**
+         * Checks whether the symbol’s definition is equal to the supplied symbol.
+         * @param symbol Symbol
+         */
+        equals(symbol: Symbol): boolean;
+
     }
     /**
      * Style is used for changing the visual styles of items contained within a Paper.js project and is returned by item.style and project.currentStyle.
@@ -3359,7 +4288,7 @@ declare module paper {
          * The view that this style belongs to.
          * Read only.
          */
-        view?: View;
+        readonly view?: View;
 
         /**
          * The color of the stroke.
@@ -3368,38 +4297,45 @@ declare module paper {
 
         /**
          * The width of the stroke.
+         * Default: 1
          */
         strokeWidth?: number;
 
         /**
          * The shape to be used at the beginning and end of open Path items, when they have a stroke.
-         * String('round', 'square', 'butt'
+         * Values: 'round', 'square', 'butt'
+         * Default: 'butt'
          */
         strokeCap?: string;
 
         /**
          * The shape to be used at the segments and corners of Path items when they have a stroke.
-         * String('miter', 'round', 'bevel')
+         * Values: 'miter', 'round', 'bevel'
+         * Default: 'miter'
          */
         strokeJoin?: string;
 
         /**
          * Specifies whether the stroke is to be drawn taking the current affine transformation into account (the default behavior), or whether it should appear as a non-scaling stroke.
+         * Default: true
          */
         strokeScaling?: boolean;
 
         /**
          * The dash offset of the stroke.
+         * Default: 0
          */
         dashOffset?: number;
 
         /**
          * Specifies an array containing the dash and gap lengths of the stroke.
+         * Default: []
          */
         dashArray?: number[];
 
         /**
          * The miter limit of the stroke. When two line segments meet at a sharp angle and miter joins have been specified for strokeJoin, it is possible for the miter to extend far beyond the strokeWidth of the path. The miterLimit imposes a limit on the ratio of the miter length to the strokeWidth.
+         * Default: 10
          */
         miterLimit?: number;
 
@@ -3408,6 +4344,13 @@ declare module paper {
          */
         fillColor?: Color | string;
 
+        /**
+         * The fill-rule with which the shape gets filled. Please note that only modern browsers support fill-rules other than 'nonzero'.
+         * Values: 'nonzero', 'evenodd'
+         * Default: 'nonzero'
+         */
+        fillRule?: string;
+
         /**
          * The shadow color.
          */
@@ -3415,11 +4358,13 @@ declare module paper {
 
         /**
          * The shadow's blur radius.
+         * Default: 0
          */
         shadowBlur?: number;
 
         /**
          * The shadow's offset.
+         * Default: 0
          */
         shadowOffset?: Point;
 
@@ -3429,27 +4374,33 @@ declare module paper {
         selectedColor?: Color | string;
 
         /**
-         * The font-family to be used in text content. default 'sans-serif'
+         * The font-family to be used in text content.
+         * Default: 'sans-serif'
          */
         fontFamily?: string;
 
         /**
          * The font-weight to be used in text content.
+         * Default: 'normal'
          */
         fontWeight?: string | number;
 
         /**
          * The font size of text content, as {@Number} in pixels, or as {@String} with optional units 'px', 'pt' and 'em'.
+         * Default: 10
          */
         fontSize?: string | number;
 
         /**
          * The text leading of text content.
+         * Default: fontSize * 1.2
          */
         leading?: number | string;
 
         /**
-         * The justification of text paragraphs. default "left"
+         * The justification of text paragraphs.
+         * Values: 'left', 'right', 'center'
+         * Default: 'left'
          */
         justification?: string;
 
@@ -3549,10 +4500,10 @@ declare module paper {
         constructor(color: Gradient, origin: Point, destination: Point, highlight?: Point);
 
         /**
-         * Creates a RGB Color object.
-         * @param hex - the RGB color in hex, i.e. #000000
+         * Creates a RGB Color object from CSS string
+         * @param css - the RGB color in hex, i.e. #000000, rbga, i.e. rgba(0,0,0,0) or named color.
          */
-        constructor(hex: string);
+        constructor(css: string);
 
         /**
          * The type of the color as a string.
@@ -3564,7 +4515,7 @@ declare module paper {
          * The color components that define the color, including the alpha value if defined.
          * Read Only.
          */
-        components: number;
+        readonly components: number;
 
         /**
          * The color's alpha value as a number between 0 and 1.
@@ -3614,14 +4565,61 @@ declare module paper {
         lightness: number;
 
         /**
-         * The gradient object describing the type of gradient and the stops.
+         * The gradient object describing the type of gradient and the stops. Only defined if the color was constructed as a gradient.
          */
-        gradient: Gradient;
+        gradient?: Gradient;
+
+         /**
+         * The starting point of the gradient. Only defined if the color was constructed as a gradient.
+         */
+        origin?: Point;
+
+         /**
+         * The ending point of the gradient. Only defined if the color was constructed as a gradient.
+         */
+        destination?: Point;
 
         /**
-         * The highlight point of the gradient.
+         * The highlight point of the gradient. Only defined if the color was constructed as a gradient.
          */
-        highlight: Point;
+        highlight?: Point;
+
+        /**
+         * Sets color to a RGB Color object.
+         * @param red - the amount of red in the color as a value between 0 and 1
+         * @param green - the amount of green in the color as a value between 0 and 1
+         * @param blue - the amount of blue in the color as a value between 0 and 1
+         * @param alpha [optional] - the alpha of the color as a value between 0 and 1
+         */
+        set(red: number, green: number, blue: number, alpha?: number): void;
+
+        /**
+         * Sets color to a gray Color object.
+         * @param gray - the amount of gray in the color as a value between 0 and 1
+         * @param alpha [optional] - the alpha of the color as a value between 0 and 1
+         */
+        set(gray: number, alpha?: number): void;
+
+        /**
+         * Sets color to a HSB, HSL or gradient Color object from the properties of the provided object:
+         * @param object - an object describing the components and properties of the color.
+         */
+        set(object: IHSBColor | IHSLColor | IGradientColor): void;
+
+        /**
+         * Sets color to a gradient Color object.
+         * @param gradient -
+         * @param origin -
+         * @param destination -
+         * @param highlight [optional] -
+         */
+        set(color: Gradient, origin: Point, destination: Point, highlight?: Point): void;
+
+        /**
+         * Sets color to a RGB Color object from CSS string
+         * @param css - the RGB color in hex, i.e. #000000, rbga, i.e. rgba(0,0,0,0) or named color.
+         */
+        set(css: string): void;
 
         /**
          * Converts the color another type.
@@ -3662,12 +4660,73 @@ declare module paper {
          */
         transform(matrix: Matrix): void;
 
+        /**
+         * Returns the addition of the supplied value to both coordinates of the color as a new color. The object itself is not modified!
+         * @param number - the number to add
+         */
+        add(number: number): Color;
+
+        /**
+         * Returns the addition of the supplied color to the color as a new color. The object itself is not modified!
+         * @param color - the color to add
+         */
+        add(color: Color): Color;
+        
+        /**
+         * Returns the subtraction of the supplied value to both coordinates of the color as a new color. The object itself is not modified!
+         * @param number - the number to subtract
+         */
+        subtract(number: number): Color;
+
+        /**
+         * Returns the subtraction of the supplied color to the color as a new color. The object itself is not modified!
+         * @param color - the color to subtract
+         */
+        subtract(color: Color): Color;
+        
+        /**
+         * Returns the multiplication of the supplied value to both coordinates of the color as a new color. The object itself is not modified!
+         * @param number - the number to multiply
+         */
+        multiply(number: number): Color;
+
+        /**
+         * Returns the multiplication of the supplied color to the color as a new color. The object itself is not modified!
+         * @param color - the color to multiply
+         */
+        multiply(color: Color): Color;
+
+        /**
+         * Returns the division of the supplied value to both coordinates of the color as a new color. The object itself is not modified!
+         * @param number - the number to divide
+         */
+        divide(number: number): Color;
+
+        /**
+         * Returns the division of the supplied color to the color as a new color. The object itself is not modified!
+         * @param color - the color to divide
+         */
+        divide(color: Color): Color;
+
     }
     /**
      * The Gradient object.
      */
     export class Gradient {
 
+        /**
+         * Creates a Gradient object.
+         * @param stops [optional] - Array of GradientStops
+         * @param radial [optional] - Whether the gradient is radial or linear
+         */
+        constructor(stops?:GradientStop[] | string[] | (string|number)[][], radial?:boolean);
+        
+        /**
+         * Creates a Gradient object.
+         * @param object [optional] - an object literal containing the properties to be set on the group.
+         */
+        constructor(object?:any);
+
         /**
          * The gradient stops on the gradient ramp.
          */
@@ -3700,12 +4759,30 @@ declare module paper {
          * @param color [optional] - the color of the stop, default: new Color(0, 0, 0)
          * @param rampPoint [optional] - the position of the stop on the gradient ramp as a value between 0 and 1, default: 0
          */
-        constructor(color?: Color, rampPoint?: number);
+        constructor(color?: Color | string, rampPoint?: number);
+        
+        /**
+         * Creates a new GradientStop object.
+         * @param object [optional] - an object literal containing the properties to be set on the group.
+         */
+        constructor(object?: any);
+
+        /**
+         * Creates a new GradientStop object.
+         * @param array [optional] - an object literal containing the properties to be set on the group.
+         */
+        constructor(array?: [string, number]);
+
+        /**
+         * The ramp-point of the gradient stop as a value between 0 and 1.
+         * @deprecated use offset instead.
+         */
+        rampPoint: number;
 
         /**
          * The ramp-point of the gradient stop as a value between 0 and 1.
          */
-        rampPoint: number;
+        offset: number;
 
         /**
          * The color of the gradient stop.
@@ -3723,25 +4800,30 @@ declare module paper {
      */
     export class View {
 
+        /**
+         * Controls whether the view is automatically updated in the next animation frame on changes, or whether you prefer to manually call update() or requestUpdate() after changes. Note that this is true by default, except for Node.js, where manual updates make more sense.
+         */
+        autoUpdate: boolean;
+
         /**
          * The underlying native element.
          * Read Only.
          */
-        element: HTMLCanvasElement;
+        readonly element: HTMLCanvasElement;
 
         /**
          * The ratio between physical pixels and device-independent pixels (DIPs) of the underlying canvas / device.
          * It is 1 for normal displays, and 2 or more for high-resolution displays.
          * Read only.
          */
-        pixelRatio: number;
+        readonly pixelRatio: number;
 
         /**
          * The resoltuion of the underlying canvas / device in pixel per inch (DPI).
          * It is 72 for normal displays, and 144 for high-resolution displays with a pixel-ratio of 2.
          * Read only.
          */
-        resolution: number;
+        readonly resolution: number;
 
         /**
          * The size of the view. Changing the view's size will resize it's underlying element.
@@ -3758,7 +4840,7 @@ declare module paper {
          * The size of the visible area in project coordinates.
          * Read only.
          */
-        size: Size;
+        readonly size: Size;
 
         /**
          * The center of the visible area in project coordinates.
@@ -3770,6 +4852,21 @@ declare module paper {
          */
         zoom: number;
 
+        /**
+         * The current rotation angle of the view, as described by its matrix.
+         */
+        rotation: number;
+
+        /**
+         * The current scale factor of the view, as described by its matrix.
+         */
+        scaling: number;
+
+        /**
+         * The view’s transformation matrix, defining the view onto the project’s contents (position, zoom level, rotation, etc).
+         */
+        matrix: Matrix;
+
         /**
          * Handler function to be called on each frame of an animation.
          * The function receives an event object which contains information about the frame event:
@@ -3783,45 +4880,53 @@ 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.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseDown: (event: MouseEvent) => void;
+        onMouseDown: (event: MouseEvent) => void | boolean;
 
         /**
          * 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.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseDrag: (event: MouseEvent) => void;
+        onMouseDrag: (event: MouseEvent) => void | boolean;
 
         /**
          * 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.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseUp: (event: MouseEvent) => void;
+        onMouseUp: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse clicks on the item. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onClick: (event: MouseEvent) => void;
+        onClick: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse double clicks on the item. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onDoubleClick: (event: MouseEvent) => void;
+        onDoubleClick: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called repeatedly when the mouse moves on top of the item. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseMove: (event: MouseEvent) => void;
+        onMouseMove: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse moves over the item. This function will only be called again, once the mouse moved outside of the item first. The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseEnter: (event: MouseEvent) => void;
+        onMouseEnter: (event: MouseEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse moves out of the item.
          * The function receives a MouseEvent object which contains information about the mouse event.
+         * Note that such mouse events bubble up the scene graph hierarchy and will reach the view, unless they are stopped with event.stopPropagation() or by returning false from the handler.
          */
-        onMouseLeave: (event: MouseEvent) => void;
+        onMouseLeave: (event: MouseEvent) => void | boolean;
 
         /**
          * Removes this view from the project and frees the associated element.
@@ -3833,6 +4938,11 @@ declare module paper {
          */
         isVisible(): boolean;
 
+        /**
+         * Checks whether the view is inserted into the browser DOM.
+         */
+        isInserted(): boolean;
+
         /**
          * Scrolls the view by the given vector.
          * @param point - the vector to scroll by
@@ -3855,25 +4965,99 @@ declare module paper {
         update(): void;
 
         /**
-         *
-         * @param point -
+         * Requests an update of the view if there are changes through the browser’s requestAnimationFrame() mechanism for smooth animation. Note that when using built-in event handlers for interaction, animation and load events, updates are automatically invoked for you automatically at the end.
+         */
+        requestUpdate(): void;
+
+        /**
+         * Translates (scrolls) the view by the given offset vector.
+         * @param delta - the offset to translate the view by
+         */
+        translate(delta: Point): void;
+
+        /**
+         * Rotates the view by a given angle around the given center point.
+         * Angles are oriented clockwise and measured in degrees.
+         * @param angle - the rotation angle
+         * @param center [optional] - default: view.center
+         */
+        rotate(angle:number, center?: Point): void;
+
+        /**
+         * Scales the view by the given value from its center point, or optionally from a supplied point.
+         * @param scale -  the scale factor
+         * @param center [optional] - default: view.center
+         */
+        scale(scale: number, center?: Point): void;
+
+        /**
+         * Scales the view by the given values from its center point, or optionally from a supplied point.
+         * @param hor - the horizontal scale factor
+         * @param ver - the vertical scale factor
+         * @param center [optional] - default: view.center
+         */
+        scale(hor: number, ver: number, center?: Point): void;
+
+        /**
+         * Shears the view by the given value from its center point, or optionally from a supplied point.
+         * @param shear -  the shear factor
+         * @param center [optional] - default: view.center
+         */
+        shear(shear: Point, center?: Point): void;
+
+        /**
+         * Shears the view by the given values from its center point, or optionally from a supplied point.
+         * @param hor - the horizontal shear factor
+         * @param ver - the vertical shear factor
+         * @param center [optional] - default: view.center
+         */
+        shear(hor: number, ver: number, center?: Point): void;
+
+        /**
+         * Skews the view by the given value from its center point, or optionally from a supplied point.
+         * @param skew -  the horziontal and vertical skew angles in degrees
+         * @param center [optional] - default: view.center
+         */
+        skew(skew: Point, center?: Point): void;
+
+        /**
+         * Skews the view by the given values from its center point, or optionally from a supplied point.
+         * @param hor - the horizontal skew angle in degrees
+         * @param ver - the vertical skew angle in degrees
+         * @param center [optional] - default: view.center
+         */
+        skew(hor: number, ver: number, center?: Point): void;
+
+        /**
+         * Converts the passed point from project coordinate space to view coordinate space, which is measured in browser pixels in relation to the position of the view element.
+         * @param point - the point in project coordinates to be converted
          */
         projectToView(point: Point): Point;
 
         /**
-         *
-         * @param point -
+         * Converts the passed point from view coordinate space to project coordinate space.
+         * @param point - the point in view coordinates to be converted
          */
         viewToProject(point: Point): Point;
 
-        //I cannot use function: Function as it is a reserved keyword
+        /**
+         * Determines and returns the event location in project coordinate space.
+         * @param event - the native event object for which to determine the location.
+         */
+        getEventPoint(event: Event): Point;
 
         /**
          * Attach an event handler to the view.
-         * @param type - String('frame'|'resize') the event type
-         * @param function - The function to be called when the event occurs
+         * @param type - the event type: ‘frame’, ‘resize’, ‘mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param callback - The function to be called when the event occurs
          */
-        on(type: string, callback: (event: Event) => void): Item;
+        on(type: string, callback: (event: Event) => void | boolean): Item;
+        /**
+         * Attach an event handler to the view.
+         * @param type - the event type: ‘frame’, ‘resize’, ‘mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param callback - The function to be called when the event occurs
+         */
+        on(type: string, callback: (event: IFrameEvent) => void | boolean): Item;
 
         /**
          * Attach one or more event handlers to the view.
@@ -3882,10 +5066,16 @@ declare module paper {
 
         /**
          * Detach an event handler from the view.
-         * @param type - String('frame'|'resize') the event type
-         * @param function - The function to be detached
+         * @param type - the event type: ‘frame’, ‘resize’, ‘mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param callback - The function to be detached
          */
-        off(type: string, callback: (event: Event) => void): Item;
+        off(type: string, callback: (event: Event) => void | boolean): Item;
+        /**
+         * Detach an event handler from the view.
+         * @param type - the event type: ‘frame’, ‘resize’, ‘mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
+         * @param callback - The function to be detached
+         */       
+        off(type: string, callback: (event: IFrameEvent) => void | boolean): Item;
 
         /**
          * Detach one or more event handlers from the view.
@@ -3895,14 +5085,14 @@ declare module paper {
 
         /**
          * Emit an event on the view.
-         * @param type - String('frame'|'resize') the event type
+         * @param type - the event type: ‘frame’, ‘resize’, ‘mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          * @param event - an object literal containing properties describing the event.
          */
         emit(type: string, event: any): boolean;
 
         /**
          * Check if the view has one or more event handlers of the specified type.
-         * @param type - String('frame'|'resize') the event type
+         * @param type - the event type: ‘frame’, ‘resize’, ‘mousedown’, ‘mouseup’, ‘mousedrag’, ‘click’, ‘doubleclick’, ‘mousemove’, ‘mouseenter’, ‘mouseleave’
          */
         responds(type: string): boolean;
 
@@ -3936,36 +5126,36 @@ declare module paper {
         /**
          * The function to be called when the mouse button is pushed down. The function receives a ToolEvent object which contains information about the mouse event.
          */
-        onMouseDown: (event: ToolEvent) => void;
+        onMouseDown: (event: ToolEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse position changes while the mouse is being dragged. The function receives a ToolEvent object which contains information about the mouse event.
          */
-        onMouseDrag: (event: ToolEvent) => void;
+        onMouseDrag: (event: ToolEvent) => void | boolean;
 
         /**
          * The function to be called the mouse moves within the project view. The function receives a ToolEvent object which contains information about the mouse event.
          */
-        onMouseMove: (event: ToolEvent) => void;
+        onMouseMove: (event: ToolEvent) => void | boolean;
 
         /**
          * The function to be called when the mouse button is released. The function receives a ToolEvent object which contains information about the mouse event.
          */
-        onMouseUp: (event: ToolEvent) => void;
+        onMouseUp: (event: ToolEvent) => void | boolean;
 
         /**
          * The function to be called when the user presses a key on the keyboard.
          * The function receives a KeyEvent object which contains information about the keyboard event.
          * If the function returns false, the keyboard event will be prevented from bubbling up. This can be used for example to stop the window from scrolling, when you need the user to interact with arrow keys.
          */
-        onKeyDown: (event: KeyEvent) => void;
+        onKeyDown: (event: KeyEvent) => void | boolean;
 
         /**
          * The function to be called when the user releases a key on the keyboard.
          * The function receives a KeyEvent object which contains information about the keyboard event.
          * If the function returns false, the keyboard event will be prevented from bubbling up. This can be used for example to stop the window from scrolling, when you need the user to interact with arrow keys.
          */
-        onKeyUp: (event: KeyEvent) => void;
+        onKeyUp: (event: KeyEvent) => void | boolean;
 
         /**
          * Activates this tool, meaning paperScope.tool will point to it and it will be the one that recieves mouse events.
@@ -3977,14 +5167,12 @@ declare module paper {
          */
         remove(): void;
 
-        //I cannot use function: Function as it is a reserved keyword
-
         /**
          * Attach an event handler to the tool.
          * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
          * @param function - The function to be called when the event occurs
          */
-        on(type: string, callback: (event: ToolEvent) => void): Tool;
+        on(type: string, callback: (event: ToolEvent | KeyEvent) => void | boolean): Tool;
 
         /**
          * Attach one or more event handlers to the tool.
@@ -3997,7 +5185,7 @@ declare module paper {
          * @param type - String('mousedown'|'mouseup'|'mousedrag'|'mousemove'|'keydown'|'keyup') the event type
          * @param function - The function to be detached
          */
-        off(type: string, callback: (event: ToolEvent) => void): Tool;
+        off(type: string, callback: (event: ToolEvent | KeyEvent) => void | boolean): Tool;
 
         /**
          * Detach one or more event handlers from the tool.
@@ -4022,9 +5210,32 @@ declare module paper {
     export class Event {
 
         /**
+         * The time at which the event was created, in milliseconds since the epoch.
+         * Read only.
+         */
+        readonly timeStamp: number;
+
+        /**
+         * The current state of the keyboard modifiers.
          * Read Only
          */
-        modifiers: any;
+        readonly modifiers: any;
+
+        /**
+         * Cancels the event if it is cancelable, without stopping further propagation of the event.
+         */
+        preventDefault(): void;
+
+        /**
+         * Prevents further propagation of the current event.
+         */
+        stopPropagation(): void;
+
+        /**
+         * Cancels the event if it is cancelable, and stops stopping further propagation of the event. This is has the same effect as calling both stopPropagation() and preventDefault().
+         * Any handler can also return false to indicate that stop() should be called right after.
+         */
+        stop(): void;
 
     }
     /**
@@ -4081,6 +5292,20 @@ declare module paper {
     }
     export class Key {
 
+        /**
+         * 
+         * The current state of the keyboard modifiers.
+         *   modifiers.shift - true if the shift key is pressed, false otherwise.
+         *   modifiers.control - true if the control key is pressed, false otherwise.
+         *   modifiers.alt — true if the alt/option key is pressed, false otherwise.
+         *   modifiers.meta — true if the meta/windows/command key is pressed, false otherwise.
+         *   modifiers.capsLock — true if the caps-lock key is active, false otherwise.
+         *   modifiers.space — true if the space key is pressed, false otherwise.
+         *   modifiers.option — true if the alt/option key is pressed, false otherwise. This is the same as modifiers.alt
+         *   modifiers.command — true if the meta key is pressed on Mac, or the control key is pressed on Windows and Linux, false otherwise.
+         */
+        static modifiers: { shift: boolean, control: boolean, alt: boolean, meta: boolean, capsLock: boolean, space: boolean, option: boolean, command: boolean};
+
         /**
          * Checks whether the specified key is pressed.
          * @param key - One of: 'backspace', 'enter', 'shift', 'control', 'option', 'pause', 'caps-lock', 'escape', 'space', 'end', 'home', 'left', 'up', 'right', 'down', 'delete', 'command'
@@ -4127,30 +5352,43 @@ declare module paper {
 
         /**
          * The font-family to be used in text content.
+         * Default: 'sans-serif'
          */
         fontFamily: string;
 
         /**
          * The font-weight to be used in text content.
+         * Default: 'normal'
          */
         fontWeight: string | number;
 
         /**
          * The font size of text content, as {@Number} in pixels, or as {@String} with optional units 'px', 'pt' and 'em'.
+         * Default: 10
          */
         fontSize: string | number;
 
         /**
          * The text leading of text content.
+         * Default: fontSize * 1.2
          */
         leading: string | number;
 
         /**
          * The justification of text paragraphs.
-         * String('left', 'right', 'center')
+         * Values: 'left', 'right', 'center'
+         * Default: 'left'
          */
         justification: string;
 
+        /**
+         * Clones the item within the same project and places the copy above the item.
+         * @param options [optional] - default: { insert: true, deep: true }
+         * @param options.insert: specifies whether the copy should be inserted into the DOM. When set to true, it is inserted above the original. default: true
+         * @param options.deep: specifies whether the item’s children should also be cloned — default: true
+         */
+        clone(options?: { insert?: boolean; deep?: boolean; }): TextItem;
+
     }
     /**
      * A PointText item represents a piece of typography in your Paper.js project which starts from a certain point and extends by the amount of characters contained in it.
@@ -4224,32 +5462,6 @@ declare module paper {
          */
         type: 'mousedown' | 'mouseup' | 'mousedrag' | 'click' | 'doubleclick' | 'mousemove' | 'mouseenter' | 'mouseleave';
 
-        /**
-         * The time at which the event was created, in milliseconds since the
-         * epoch.
-         */
-        timeStamp(): number;
-
-        /**
-         * Cancels the event if it is cancelable, without stopping further
-         * propagation of the event.
-         */
-        preventDefault(): void;
-
-        /**
-         * Prevents further propagation of the current event.
-         */
-        stopPropagation(): void;
-
-        /**
-         * Cancels the event if it is cancelable, and stops stopping further
-         * propagation of the event. This is has the same effect as calling
-         * both stopPropagation() and preventDefault().
-         *
-         * Any handler can also return false to indicate that stop() should be
-         * called right after.
-         */
-        stop(): void;
     }
 }
 
diff --git a/types/paper/paper-tests.ts b/types/paper/paper-tests.ts
index 444ffb8725..165c64b2d8 100644
--- a/types/paper/paper-tests.ts
+++ b/types/paper/paper-tests.ts
@@ -1,19 +1,19 @@
 import paper = require('paper');
 
-var canvas = document.createElement('canvas')
+let canvas = document.createElement('canvas')
 
 paper.setup(canvas);
 
 // Circle
-var path = new paper.Path.Circle({
+let path = new paper.Path.Circle({
 	center: [80, 50],
 	radius: 35,
 	fillColor: 'red'
 });
 
 // Dotted Line Tool
-var dottedLinePath: paper.Path;
-var dottedLineTool = new paper.Tool();
+let dottedLinePath: paper.Path = new paper.Path;
+let dottedLineTool = new paper.Tool();
 
 dottedLineTool.onMouseDown = function(event: any) {
     new paper.Layer().activate();
@@ -34,3 +34,15225 @@ dottedLineTool.onMouseUp = function(event: any) {
     dottedLinePath.smooth();
     dottedLinePath.simplify();
 };
+
+// Hit Test stuff
+// These objects are to make sure older code which didn't have the IHitTestOptions available still work.
+let hitOptionsEmpty = {};
+let hitOptionsPartial = {tolerance: 0, extra: true};
+let hitOptionsFull = {tolerance: 0, class: 'Path', match: (hit: paper.HitResult)=>{return true;}, fill: true, stroke: false, segments: true, curves: false, handles: true, ends: true, position: false, center: true, bounds: true, guides: false, selected: true};
+// These objects are to make sure new code which uses the IHitTestOptions work.
+let hitOptionsInterfaceEmpty:paper.IHitTestOptions = {};
+let hitOptionsInterfacePartial:paper.IHitTestOptions = {match: (hit: paper.HitResult)=>{return true;}};
+let hitOptionsInterfaceFull:paper.IHitTestOptions = {tolerance: 0, class: 'Path', match: (hit: paper.HitResult)=>{return true;}, fill: true, stroke: false, segments: true, curves: false, handles: true, ends: true, position: false, center: true, bounds: true, guides: false, selected: true};
+let compoundPath: paper.CompoundPath = new paper.CompoundPath(dottedLinePath);
+let hitTestPoint = dottedLinePath.segments[0].point;
+let hitTestResult: paper.HitResult;
+let hitTestResults: paper.HitResult[];
+// These are Item hit tests
+hitTestResult = compoundPath.hitTest(hitTestPoint);
+hitTestResult = compoundPath.hitTest(hitTestPoint, hitOptionsEmpty);
+hitTestResult = compoundPath.hitTest(hitTestPoint, hitOptionsPartial);
+hitTestResult = compoundPath.hitTest(hitTestPoint, hitOptionsFull);
+hitTestResult = compoundPath.hitTest(hitTestPoint, hitOptionsInterfaceEmpty);
+hitTestResult = compoundPath.hitTest(hitTestPoint, hitOptionsInterfacePartial);
+hitTestResult = compoundPath.hitTest(hitTestPoint, hitOptionsInterfaceFull);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint, hitOptionsEmpty);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint, hitOptionsPartial);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint, hitOptionsFull);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint, hitOptionsInterfaceEmpty);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint, hitOptionsInterfacePartial);
+hitTestResults = compoundPath.hitTestAll(hitTestPoint, hitOptionsInterfaceFull);
+// These are project hit tests
+hitTestResult = paper.project.hitTest(hitTestPoint);
+hitTestResult = paper.project.hitTest(hitTestPoint, hitOptionsEmpty);
+hitTestResult = paper.project.hitTest(hitTestPoint, hitOptionsPartial);
+hitTestResult = paper.project.hitTest(hitTestPoint, hitOptionsFull);
+hitTestResult = paper.project.hitTest(hitTestPoint, hitOptionsInterfaceEmpty);
+hitTestResult = paper.project.hitTest(hitTestPoint, hitOptionsInterfacePartial);
+hitTestResult = paper.project.hitTest(hitTestPoint, hitOptionsInterfaceFull);
+hitTestResults = paper.project.hitTestAll(hitTestPoint);
+hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsEmpty);
+hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsPartial);
+hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsFull);
+hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfaceEmpty);
+hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfacePartial);
+hitTestResults = paper.project.hitTestAll(hitTestPoint, hitOptionsInterfaceFull);
+
+function Examples() {
+    function BooleanOperations(){
+        let text = new paper.PointText({
+            position: paper.view.center.add(new paper.Point([0, 200])),
+            fillColor: 'black',
+            justification: 'center',
+            fontSize: 20
+        });
+        
+        let originals = new paper.Group({ insert: false }); // Don't insert in DOM.
+        
+        let square = new paper.Path.Rectangle({
+            position: paper.view.center,
+            size: 300,
+            parent: originals,
+            fillColor: 'white'
+        });
+        
+        // Make a ring using subtraction of two circles:
+        let inner = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 100,
+            parent: originals,
+            fillColor: 'white'
+        });
+        
+        let outer = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 140,
+            parent: originals,
+            fillColor: 'white'
+        });
+        
+        let ring = outer.subtract(inner);
+        
+        let operations = ['unite', 'intersect', 'subtract', 'exclude', 'divide'];
+        let colors = ['red', 'green', 'blue', 'black'];
+        let curIndex = -1;
+        let operation: string;
+        let result: paper.PathItem | null;
+        let activeItem: paper.PathItem | null;
+        
+        // Change the mode every 3 seconds:
+        setInterval(setMode, 3000);
+        
+        // Set the initial mode:
+        setMode();
+        
+        function setMode() {
+            curIndex++;
+            if (curIndex == operations.length * 2)
+                curIndex = 0;
+            operation = operations[curIndex % operations.length];
+        }
+        
+        function onMouseDown(event: paper.ToolEvent) {
+            let hitResult = originals.hitTest(event.point);
+            activeItem = hitResult && hitResult.item as paper.PathItem;
+        }
+        
+        function onMouseDrag(event: paper.ToolEvent) {
+            if (activeItem)
+                activeItem.position = event.point;
+        }
+        
+        function onMouseUp() {
+            activeItem = null;
+            square.position = paper.view.center;
+        }
+        
+        function onFrame(event: paper.IFrameEvent) {
+            if (activeItem != ring) {
+                // Move the ring around:
+                let offset = new paper.Point(140, 80).multiply(new paper.Point([Math.sin(event.count / 60), Math.sin(event.count / 40)]));
+                ring.position = paper.view.center.add(offset);
+            }
+        
+            // Remove the result of the last path operation:
+            if (result)
+                result.remove();
+        
+            function performOperation(operation:string, primaryItem:paper.PathItem, secondaryItem:paper.PathItem){
+                switch(operation){
+                    case 'unite':
+                        return primaryItem.unite(secondaryItem);
+                    case 'intersect':
+                        return primaryItem.intersect(secondaryItem);
+                    case 'subtract':
+                        return primaryItem.subtract(secondaryItem);
+                    case 'exclude':
+                        return primaryItem.exclude(secondaryItem);
+                    case 'divide':
+                        return primaryItem.divide(secondaryItem);
+                    default:
+                        return null;
+                }
+            }
+            // Perform the path operation on the ring:
+            if (curIndex < operations.length) {
+                result = performOperation(operation, square, ring);
+                text.content = 'square.' + operation + '(ring)';
+            } else {
+                result = performOperation(operation, square, ring);
+                text.content = 'ring.' + operation + '(square)';
+            }
+            if(result){
+                result.selected = true;
+                result.fillColor = colors[curIndex % colors.length];
+                result.moveBelow(text);
+            }
+        
+            // If the result is a group, color each of its children differently:
+            if (result instanceof paper.Group) {
+                for (let i = 0; i < result.children.length; i++) {
+                    result.children[i].fillColor = colors[i];
+                }
+            }
+        };
+        
+        function onResize() {
+            text.position = paper.view.center.add(new paper.Point([0, 200]));
+            square.position = paper.view.center;
+        }
+    }
+
+    function CandyCrash(){
+        // kynd.info 2014
+        class Ball{
+            radius: number;
+            point: paper.Point;
+            vector: paper.Point;
+            maxVec: number;
+            numSegment: number;
+            boundOffset: number[];
+            boundOffsetBuff: number[];
+            sidePoints: paper.Point[];
+            path: paper.Path;
+
+            constructor(r: number, p: paper.Point, v: paper.Point) {
+                this.radius = r;
+                this.point = p;
+                this.vector = v;
+                this.maxVec = 15;
+                this.numSegment = Math.floor(r / 3 + 2);
+                this.boundOffset = [];
+                this.boundOffsetBuff = [];
+                this.sidePoints = [];
+                this.path = new paper.Path({
+                    fillColor: {
+                        hue: Math.random() * 360,
+                        saturation: 1,
+                        brightness: 1
+                    },
+                    blendMode: 'lighter'
+                });
+
+                for (let i = 0; i < this.numSegment; i ++) {
+                    this.boundOffset.push(this.radius);
+                    this.boundOffsetBuff.push(this.radius);
+                    this.path.add(new paper.Point({}));
+                    this.sidePoints.push(new paper.Point({
+                        angle: 360 / this.numSegment * i,
+                        length: 1
+                    }));
+                }
+            }
+            iterate() {
+                this.checkBorders();
+                if (this.vector.length > this.maxVec)
+                    this.vector.length = this.maxVec;
+                this.point = this.point.add(this.vector);
+                this.updateShape();
+            }
+            checkBorders() {
+                let size = paper.view.size;
+                if (this.point.x < -this.radius)
+                    this.point.x = size.width + this.radius;
+                if (this.point.x > size.width + this.radius)
+                    this.point.x = -this.radius;
+                if (this.point.y < -this.radius)
+                    this.point.y = size.height + this.radius;
+                if (this.point.y > size.height + this.radius)
+                    this.point.y = -this.radius;
+            }
+            updateShape() {
+                let segments = this.path.segments;
+                for (let i = 0; i < this.numSegment; i ++)
+                    segments[i].point = this.getSidePoint(i);
+
+                this.path.smooth();
+                for (let i = 0; i < this.numSegment; i ++) {
+                    if (this.boundOffset[i] < this.radius / 4)
+                        this.boundOffset[i] = this.radius / 4;
+                    let next = (i + 1) % this.numSegment;
+                    let prev = (i > 0) ? i - 1 : this.numSegment - 1;
+                    let offset = this.boundOffset[i];
+                    offset += (this.radius - offset) / 15;
+                    offset += ((this.boundOffset[next] + this.boundOffset[prev]) / 2 - offset) / 3;
+                    this.boundOffsetBuff[i] = this.boundOffset[i] = offset;
+                }
+            }
+            react(b:Ball) {
+                let dist = this.point.getDistance(b.point);
+                if (dist < this.radius + b.radius && dist != 0) {
+                    let overlap = this.radius + b.radius - dist;
+                    let direc = (this.point.subtract(b.point)).normalize(overlap * 0.015);
+                    this.vector = this.vector.add(direc);
+                    b.vector = b.vector.subtract(direc);
+
+                    this.calcBounds(b);
+                    b.calcBounds(this);
+                    this.updateBounds();
+                    b.updateBounds();
+                }
+            }
+            getBoundOffset(p:paper.Point) {
+                let diff = this.point.subtract(p);
+                let angle = (diff.angle + 180) % 360;
+                return this.boundOffset[Math.floor(angle / 360 * this.boundOffset.length)];
+            }
+            calcBounds(b:Ball) {
+                for (let i = 0; i < this.numSegment; i ++) {
+                    let tp = this.getSidePoint(i);
+                    let bLen = b.getBoundOffset(tp);
+                    let td = tp.getDistance(b.point);
+                    if (td < bLen) {
+                        this.boundOffsetBuff[i] -= (bLen  - td) / 2;
+                    }
+                }
+            }
+            getSidePoint(index: number) {
+                return this.point.add(this.sidePoints[index].multiply(this.boundOffset[index]));
+            }
+            updateBounds() {
+                for (let i = 0; i < this.numSegment; i ++)
+                    this.boundOffset[i] = this.boundOffsetBuff[i];
+            }
+        }
+        //--------------------- main ---------------------
+        let balls: Ball[] = [];
+        let numBalls = 18;
+        for (let i = 0; i < numBalls; i++) {
+            let position = paper.Point.random().multiply(new paper.Point(paper.view.size));
+            let vector = new paper.Point({
+                angle: 360 * Math.random(),
+                length: Math.random() * 10
+            });
+            let radius = Math.random() * 60 + 60;
+            balls.push(new Ball(radius, position, vector));
+        }
+
+        function onFrame() {
+            for (let i = 0; i < balls.length - 1; i++) {
+                for (let j = i + 1; j < balls.length; j++) {
+                    balls[i].react(balls[j]);
+                }
+            }
+            for (let i = 0, l = balls.length; i < l; i++) {
+                balls[i].iterate();
+            }
+        }    
+    }
+    function SatieLikedToDraw(){        
+        let leftPath = new paper.Path({
+            strokeColor: 'red',
+            opacity: 0.5
+        });
+        
+        let rightPath = new paper.Path({
+            strokeColor: 'green',
+            opacity: 0.5
+        });
+        
+        let amount = 8;
+        let step = paper.view.size.width / (amount + 1);
+        let flip = true;
+        
+        for (let i = 0; i <= amount; i++) {
+            leftPath.add(new paper.Point(i * step, 0));
+            rightPath.add(new paper.Point(i * step, 0));
+        }
+        
+        let group = new paper.Group({
+            children: [leftPath, rightPath],
+            transformContent: false,
+            strokeWidth: 30,
+            strokeJoin: 'round',
+            strokeCap: 'butt',
+            pivot: leftPath.position,
+            position: paper.view.center
+        });
+        
+        function onMouseDown() {
+            flip = !flip;
+        }
+        
+        function onKeyDown(event: paper.KeyEvent) {
+            if (event.key === 'space')
+                group.fullySelected = !group.fullySelected;
+        }
+        
+        let audio: any;
+        let source: AudioBufferSourceNode; 
+        let analyserL: AnalyserNode;
+        let analyserR: AnalyserNode;
+        let freqByteData: Uint8Array;
+        
+        paper.view.onFrame = function() {
+            let step = paper.view.size.width / (amount + 1);
+            let scale = paper.view.size.height / 1.75;
+            analyserL.getByteFrequencyData(freqByteData);
+            let leftBands = getEqualizerBands(freqByteData);
+            analyserR.getByteFrequencyData(freqByteData);
+            let rightBands = getEqualizerBands(freqByteData);
+            for (let i = 1; i <= amount; i++) {
+                leftPath.segments[i].point = new paper.Point([i * step, -leftBands[i - 1] * scale]);
+                rightPath.segments[i].point = new paper.Point([i * step, -rightBands[i - 1] * scale * (flip ? -1 : 1)]);
+            }
+            leftPath.smooth();
+            rightPath.smooth();
+            group.pivot = new paper.Point([leftPath.position.x, 0]);
+            group.position = paper.view.center;
+        }
+        
+        // Pause animation until we have data
+        paper.view.pause();
+        
+        let AudioContext = (window as any).AudioContext || (window as any).webkitAudioContext;
+        if (AudioContext) {
+            audio = new AudioContext();
+            source = audio.createBufferSource();
+            // Create two separate analyzers for left and right channel.
+            analyserL = audio.createAnalyser();
+            analyserL.smoothingTimeConstant = 0.25;
+            analyserL.fftSize = Math.pow(2, amount) * 2;
+            analyserR = audio.createAnalyser();
+            analyserR.smoothingTimeConstant = analyserL.smoothingTimeConstant;
+            analyserR.fftSize = analyserL.fftSize;
+            // Create the buffer to receive the analyzed data.
+            freqByteData = new Uint8Array(analyserL.frequencyBinCount);
+            // Create a splitter to feed them both
+            let splitter = audio.createChannelSplitter();
+            // Connect audio processing graph
+            source.connect(splitter);
+            splitter.connect(analyserL, 0, 0);
+            splitter.connect(analyserR, 1, 0);
+            // Connect source to output also so we can hear it
+            source.connect(audio.destination);
+            loadAudioBuffer('http://assets.paperjs.org/audio/gnossienne.mp3');
+        } else {
+            // TODO: Print error message
+            alert('Audio not supported');
+        }
+        
+        function loadAudioBuffer(url: string) {
+            // Load asynchronously
+            let request = new XMLHttpRequest();
+            request.open("GET", url, true);
+            request.responseType = "arraybuffer";
+        
+            request.onload = function() { 
+                audio.decodeAudioData(
+                    request.response,
+                    function(buffer: AudioBuffer) {
+                        source.buffer = buffer;
+                        source.loop = true;
+                        source.start(0);
+                        paper.view.play();
+                    },
+                    
+                    function() {
+                        alert("Error loading MP3");
+                    }
+                );
+            };
+            request.send();
+        }
+        
+        function getEqualizerBands(data:Uint8Array) {
+            let bands:number[] = [];
+            let amount = Math.sqrt(data.length) / 2;
+            for(let i = 0; i < amount; i++) {
+                let start = Math.pow(2, i) - 1;
+                let end = start * 2 + 1;
+                let sum = 0;
+                for (let j = start; j < end; j++) {
+                    sum += data[j];
+                }
+                let avg = sum / (255 * (end - start));
+                bands[i] = Math.sqrt(avg / Math.sqrt(2));
+            }
+            return bands;
+        }
+    }
+    function Chain(){
+        // Adapted from the following Processing example:
+        // http://processing.org/learning/topics/follow3.html
+
+        // The amount of points in the path:
+        let points = 25;
+
+        // The distance between the points:
+        let length = 35;
+
+        let path = new paper.Path({
+            strokeColor: '#E4141B',
+            strokeWidth: 20,
+            strokeCap: 'round'
+        });
+
+        let start = paper.view.center.divide(new paper.Point([10, 1]));
+        for (let i = 0; i < points; i++)
+            path.add(start.add(new paper.Point(i * length, 0)));
+
+        function onMouseMove(event: paper.ToolEvent) {
+            path.firstSegment.point = event.point;
+            for (let i = 0; i < points - 1; i++) {
+                let segment = path.segments[i];
+                let nextSegment = segment.next;
+                let vector = segment.point.subtract(nextSegment.point);
+                vector.length = length;
+                nextSegment.point = segment.point.subtract(vector);
+            }
+            path.smooth({ type: 'continuous' });
+        }
+
+        function onMouseDown(event: paper.ToolEvent) {
+            path.fullySelected = true;
+            path.strokeColor = '#e08285';
+        }
+
+        function onMouseUp(event: paper.ToolEvent) {
+            path.fullySelected = false;
+            path.strokeColor = '#e4141b';
+        }
+    }
+    function TadPoles(){
+        // Adapted from Flocking Processing example by Daniel Schiffman:
+        // http://processing.org/learning/topics/flocking.html
+
+        class Boid {
+            acceleration: paper.Point;
+            vector: paper.Point;
+            position: paper.Point;
+            radius: number;
+            maxSpeed: number;
+            maxForce: number;
+            amount: number;
+            count: number;
+            lastLoc: paper.Point;
+            path: paper.Path;
+            shortPath: paper.Path;
+            head: paper.Shape;
+
+            constructor(position: paper.Point, maxSpeed: number, maxForce: number) {
+                let strength = Math.random() * 0.5;
+                this.acceleration = new paper.Point({});
+                this.vector = paper.Point.random().multiply(2).subtract(1);
+                this.position = position.clone();
+                this.radius = 30;
+                this.maxSpeed = maxSpeed + strength;
+                this.maxForce = maxForce + strength;
+                this.amount = strength * 10 + 10;
+                this.count = 0;
+                this.createItems();
+            }
+            run(boids: Boid[]) {
+                this.lastLoc = this.position.clone();
+                if (!groupTogether) {
+                    this.flock(boids);
+                } else {
+                    this.align(boids);
+                }
+                this.borders();
+                this.update();
+                this.calculateTail();
+                this.moveHead();
+            }
+            calculateTail() {
+                let segments = this.path.segments,
+                    shortSegments = this.shortPath.segments;
+                let speed = this.vector.length;
+                let pieceLength = 5 + speed / 3;
+                let point = this.position;
+                segments[0].point = shortSegments[0].point = point;
+                // Chain goes the other way than the movement
+                let lastVector = this.vector.multiply(-1);
+                for (let i = 1; i < this.amount; i++) {
+                    let vector = segments[i].point.subtract(point);
+                    this.count += speed * 10;
+                    let wave = Math.sin((this.count + i * 3) / 300);
+                    let sway = lastVector.rotate(90).normalize(wave);
+                    point = point.add(lastVector.normalize(pieceLength).add(sway));
+                    segments[i].point = point;
+                    if (i < 3)
+                        shortSegments[i].point = point;
+                    lastVector = vector;
+                }
+                this.path.smooth();
+            }
+            createItems() {
+                this.head = paper.Shape.Ellipse({
+                    center: [0, 0],
+                    size: [13, 8],
+                    fillColor: 'white'
+                });
+
+                this.path = new paper.Path({
+                    strokeColor: 'white',
+                    strokeWidth: 2,
+                    strokeCap: 'round'
+                });
+                for (let i = 0; i < this.amount; i++)
+                    this.path.add(new paper.Point({}));
+
+                this.shortPath = new paper.Path({
+                    strokeColor: 'white',
+                    strokeWidth: 4,
+                    strokeCap: 'round'
+                });
+                for (let i = 0; i < Math.min(3, this.amount); i++)
+                    this.shortPath.add(new paper.Point({}));
+            }
+            moveHead() {
+                this.head.position = this.position;
+                this.head.rotation = this.vector.angle;
+            }
+            // We accumulate a new acceleration each time based on three rules
+            flock(boids:Boid[]) {
+                let separation = this.separate(boids).multiply(3);
+                let alignment = this.align(boids);
+                let cohesion = this.cohesion(boids);
+                this.acceleration = this.acceleration.add(separation).add(alignment).add(cohesion);
+            }
+            update() {
+                // Update velocity
+                this.vector = this.vector.add(this.acceleration);
+                // Limit speed (vector#limit?)
+                this.vector.length = Math.min(this.maxSpeed, this.vector.length);
+                this.position = this.position.add(this.vector);
+                // Reset acceleration to 0 each cycle
+                this.acceleration = new paper.Point({});
+            }
+            seek(target:paper.Point) {
+                this.acceleration = this.acceleration.add(this.steer(target, false));
+            }
+            arrive(target:paper.Point) {
+                this.acceleration = this.acceleration.add(this.steer(target, true));
+            }
+            borders() {
+                let vector = new paper.Point({});
+                let position = this.position;
+                let radius = this.radius;
+                let size = paper.view.size;
+                if (position.x < -radius) vector.x = size.width + radius;
+                if (position.y < -radius) vector.y = size.height + radius;
+                if (position.x > size.width + radius) vector.x = -size.width -radius;
+                if (position.y > size.height + radius) vector.y = -size.height -radius;
+                if (!vector.isZero()) {
+                    this.position = this.position.add(vector);
+                    let segments = this.path.segments;
+                    for (let i = 0; i < this.amount; i++) {
+                        segments[i].point = segments[i].point.add(vector);
+                    }
+                }
+            }
+            // A method that calculates a steering vector towards a target
+            // Takes a second argument, if true, it slows down as it approaches
+            // the target
+            steer(target: paper.Point, slowdown:boolean) {
+                let steer:paper.Point;
+                let desired = target.subtract(this.position);
+                let distance = desired.length;
+                // Two options for desired vector magnitude
+                // (1 -- based on distance, 2 -- maxSpeed)
+                if (slowdown && distance < 100) {
+                    // This damping is somewhat arbitrary:
+                    desired.length = this.maxSpeed * (distance / 100);
+                } else {
+                    desired.length = this.maxSpeed;
+                }
+                steer = desired.subtract(this.vector);
+                steer.length = Math.min(this.maxForce, steer.length);
+                return steer;
+            }
+            separate(boids:Boid[]) {
+                let desiredSeperation = 60;
+                let steer = new paper.Point({});
+                let count = 0;
+                // For every boid in the system, check if it's too close
+                for (let i = 0, l = boids.length; i < l; i++) {
+                    let other = boids[i];
+                    let vector = this.position.subtract(other.position);
+                    let distance = vector.length;
+                    if (distance > 0 && distance < desiredSeperation) {
+                        // Calculate vector pointing away from neighbor
+                        steer= steer.add(vector.normalize(1 / distance));
+                        count++;
+                    }
+                }
+                // Average -- divide by how many
+                if (count > 0)
+                    steer = steer.divide(count);
+                if (!steer.isZero()) {
+                    // Implement Reynolds: Steering = Desired - Velocity
+                    steer.length = this.maxSpeed;
+                    steer = steer.subtract(this.vector);
+                    steer.length = Math.min(steer.length, this.maxForce);
+                }
+                return steer;
+            }
+            // Alignment
+            // For every nearby boid in the system, calculate the average velocity
+            align(boids: Boid[]) {
+                let neighborDist = 25;
+                let steer = new paper.Point({});
+                let count = 0;
+                for (let i = 0, l = boids.length; i < l; i++) {
+                    let other = boids[i];
+                    let distance = this.position.getDistance(other.position);
+                    if (distance > 0 && distance < neighborDist) {
+                        steer = steer.add(other.vector);
+                        count++;
+                    }
+                }
+
+                if (count > 0)
+                    steer = steer.divide(count);
+                if (!steer.isZero()) {
+                    // Implement Reynolds: Steering = Desired - Velocity
+                    steer.length = this.maxSpeed;
+                    steer = steer.subtract(this.vector);
+                    steer.length = Math.min(steer.length, this.maxForce);
+                }
+                return steer;
+            }
+            // Cohesion
+            // For the average location (i.e. center) of all nearby boids,
+            // calculate steering vector towards that location
+            cohesion(boids:Boid[]) {
+                let neighborDist = 100;
+                let sum = new paper.Point({});
+                let count = 0;
+                for (let i = 0, l = boids.length; i < l; i++) {
+                    let other = boids[i];
+                    let distance = this.position.getDistance(other.position);
+                    if (distance > 0 && distance < neighborDist) {
+                        sum = sum.add(other.position); // Add location
+                        count++;
+                    }
+                }
+                if (count > 0) {
+                    sum = sum.divide(count);
+                    // Steer towards the location
+                    return this.steer(sum, false);
+                }
+                return sum;
+            }
+        }
+
+        let heartPath = new paper.Path('M514.69629,624.70313c-7.10205,-27.02441 -17.2373,-52.39453 -30.40576,-76.10059c-13.17383,-23.70703 -38.65137,-60.52246 -76.44434,-110.45801c-27.71631,-36.64355 -44.78174,-59.89355 -51.19189,-69.74414c-10.5376,-16.02979 -18.15527,-30.74951 -22.84717,-44.14893c-4.69727,-13.39893 -7.04297,-26.97021 -7.04297,-40.71289c0,-25.42432 8.47119,-46.72559 25.42383,-63.90381c16.94775,-17.17871 37.90527,-25.76758 62.87354,-25.76758c25.19287,0 47.06885,8.93262 65.62158,26.79834c13.96826,13.28662 25.30615,33.10059 34.01318,59.4375c7.55859,-25.88037 18.20898,-45.57666 31.95215,-59.09424c19.00879,-18.32178 40.99707,-27.48535 65.96484,-27.48535c24.7373,0 45.69531,8.53564 62.87305,25.5957c17.17871,17.06592 25.76855,37.39551 25.76855,60.98389c0,20.61377 -5.04102,42.08691 -15.11719,64.41895c-10.08203,22.33203 -29.54687,51.59521 -58.40723,87.78271c-37.56738,47.41211 -64.93457,86.35352 -82.11328,116.8125c-13.51758,24.0498 -23.82422,49.24902 -30.9209,75.58594z');
+
+        let boids:Boid[] = [];
+        let groupTogether = false;
+
+        // Add the boids:
+        for (let i = 0; i < 30; i++) {
+            let position = paper.Point.random().multiply(new paper.Point(paper.view.size));
+            boids.push(new Boid(position, 10, 0.05));
+        }
+
+
+        function onFrame(event: paper.IFrameEvent) {
+            for (let i = 0, l = boids.length; i < l; i++) {
+                if (groupTogether) {
+                    let length = ((i + event.count / 30) % l) / l * heartPath.length;
+                    let point = heartPath.getPointAt(length);
+                    if (point)
+                        boids[i].arrive(point);
+                }
+                boids[i].run(boids);
+            }
+        }
+
+        // Reposition the heart path whenever the window is resized:
+        function onResize(event:paper.Event) {
+            heartPath.fitBounds(paper.view.bounds);
+            heartPath.scale(0.8);
+        }
+
+        function onMouseDown(event:paper.ToolEvent) {
+            groupTogether = !groupTogether;
+        }
+
+        function onKeyDown(event:paper.KeyEvent) {
+            if (event.key == 'space') {
+                let layer = paper.project.activeLayer;
+                layer.selected = !layer.selected;
+                return false;
+            }
+        }
+    }
+    function NyanRainbow(){
+        // A tribute to Nyan Cat http://www.youtube.com/watch?v=QH2-TGUlwu4
+        let mediaElement: any;
+        let playing = false;
+        /*MediaElement('nyan', {
+            pluginPath: '/assets/mediaelement/',
+            success: function(me) {
+                mediaElement = me;
+                me.play();
+                me.addEventListener('timeupdate', function(time: any) {
+                    if (me.currentTime > 3.7)
+                        playing = true;
+                });
+            }
+        });*/
+
+        let mousePos = paper.view.center .add(new paper.Point([paper.view.bounds.width / 3, 100]));
+        let position = paper.view.center;
+
+        function onFrame(event:paper.IFrameEvent) {
+            position = position.add((mousePos.subtract(position)).divide(10));
+            let vector = (paper.view.center.subtract(position)).divide(10);
+            moveStars(vector.multiply(3));
+            moveRainbow(vector, event);
+        }
+
+        function onMouseMove(event:paper.ToolEvent) {
+            mousePos = event.point;
+        }
+
+        function onKeyDown(event:paper.KeyEvent) {
+            if (event.key == 'space')
+                paper.project.activeLayer.selected = !paper.project.activeLayer.selected;
+        }
+
+        let moveStars: (vector:paper.Point)=>void = moveStarsFunctionCreator();
+        function moveStarsFunctionCreator(): (vector:paper.Point)=>void {
+            // The amount of symbol we want to place;
+            let count = 50;
+
+            // Create a symbol, which we will use to place instances of later:
+            let path = new paper.Path.Circle({
+                center: [0, 0],
+                radius: 5,
+                fillColor: 'white',
+                strokeColor: 'black'
+            });
+
+            let symbol = new paper.Symbol(path);
+
+            // Place the instances of the symbol:
+            for (let i = 0; i < count; i++) {
+                // The center position is a random point in the paper.view:
+                let center = paper.Point.random().multiply(new paper.Point(paper.view.size));
+                let placed = symbol.place(center);
+                placed.scale(i / count + 0.01);
+                placed.data = {
+                    vector: new paper.Point({
+                        angle: Math.random() * 360,
+                        length : (i / count) * Math.random() / 5
+                    })
+                };
+            }
+
+            let vector = new paper.Point({
+                angle: 45,
+                length: 0
+            });
+
+            function keepInView(item:paper.Item) {
+                let position = item.position;
+                let viewBounds = paper.view.bounds;
+                if (position.isInside(viewBounds))
+                    return;
+                let itemBounds = item.bounds;
+                if (position.x > viewBounds.width + 5) {
+                    position.x = -item.bounds.width;
+                }
+
+                if (position.x < -itemBounds.width - 5) {
+                    position.x = viewBounds.width;
+                }
+
+                if (position.y > viewBounds.height + 5) {
+                    position.y = -itemBounds.height;
+                }
+
+                if (position.y < -itemBounds.height - 5) {
+                    position.y = viewBounds.height
+                }
+            }
+
+            return function(vector:paper.Point) {
+                // Run through the active layer's children list and change
+                // the position of the placed symbols:
+                let layer = paper.project.activeLayer;
+                for (let i = 0; i < count; i++) {
+                    let item = layer.children[i];
+                    let size = item.bounds.size;
+                    let length = vector.length / 10 * size.width / 10;
+                    item.position += vector.normalize(length) + item.data.vector;
+                    keepInView(item);
+                }
+            };
+        };
+
+        let moveRainbow: (vector:paper.Point, event:paper.IFrameEvent)=>void = moveRainbowunctionCreator();
+        function moveRainbowunctionCreator(): (vector:paper.Point, event: paper.IFrameEvent)=>void {
+            let paths:paper.Path[] = [];
+            let colors = ['red', 'orange', 'yellow', 'lime', 'blue', 'purple'];
+            for (let i = 0; i < colors.length; i++) {
+                let path = new paper.Path({
+                    fillColor: colors[i]
+                });
+                paths.push(path);
+            }
+
+            let count = 30;
+            let group = new paper.Group(paths);
+            let headGroup:paper.Group;
+            let eyePosition = new paper.Point({});
+            let eyeFollow = (paper.Point.random().subtract(0.5));
+            let blinkTime = 200;
+            function createHead(vector: paper.Point, count: number) {
+                let eyeVector = (eyePosition.subtract(eyeFollow));
+                eyePosition = eyePosition.subtract(eyeVector.divide(4));
+                if (eyeVector.length < 0.00001)
+                    eyeFollow = (paper.Point.random().subtract(0.5));
+                if (headGroup)
+                    headGroup.remove();
+                let top = paths[0].lastSegment.point;
+                let bottom = paths[paths.length - 1].firstSegment.point;
+                let radius = (bottom.subtract(top)).length / 2;
+                let circle = new paper.Path.Circle({
+                    center: top.add((bottom.subtract(top)).divide(2)),
+                    radius: radius,
+                    fillColor: 'black'
+                });
+                circle.scale(vector.length / 100, 1);
+                circle.rotate(vector.angle);
+
+                let innerCircle = circle.clone();
+                innerCircle.scale(0.5);
+                innerCircle.fillColor = (count % blinkTime < 3)
+                    || (count % (blinkTime + 5) < 3) ? 'black' : 'white';
+                if (count % (blinkTime + 40) == 0)
+                    blinkTime = Math.round(Math.random() * 40) + 200;
+                let eye = circle.clone();
+                eye.position = eye.position.add(eyePosition.multiply(radius));
+                eye.scale(0.15, innerCircle.position);
+                eye.fillColor = 'black';
+                headGroup = new paper.Group([circle, innerCircle, eye]);
+            }
+
+            return function(v:paper.Point, event:paper.IFrameEvent) {
+                let vector:paper.Point = (paper.view.center.subtract(position)).divide(10);
+
+                if (vector.length < 5)
+                    vector.length = 5;
+                count += vector.length / 100;
+                group.translate(vector);
+                let rotated = vector.rotate(90);
+                let middle = paths.length / 2;
+                for (let j = 0; j < paths.length; j++) {
+                    let path = paths[j];
+                    let nyanSwing = playing ? Math.sin(event.count / 2) * vector.length : 1;
+                    let unitLength = vector.length * (2 + Math.sin(event.count / 10)) / 2;
+                    let length = (j - middle) * unitLength + nyanSwing;
+                    let top = paper.view.center.add(rotated.normalize(length));
+                    let bottom = paper.view.center.add(rotated.normalize(length + unitLength));
+                    path.add(top);
+                    path.insert(0, bottom);
+                    if (path.segments.length > 200) {
+                        let index = Math.round(path.segments.length / 2);
+                        path.segments[index].remove();
+                        path.segments[index - 1].remove();
+                    }
+                    path.smooth();
+                }
+                createHead(vector, event.count);
+                if (mediaElement)
+                    mediaElement.setVolume(vector.length / 200);
+            }
+        }
+    }
+    function RoundedRectangles(){
+        let mousePoint = paper.view.center;
+        let amount = 25;
+        let colors = ['red', 'white', 'blue', 'white'];
+        
+        for (let i = 0; i < amount; i++) {
+            let rect = new paper.Rectangle(new paper.Point([0, 0]), new paper.Point([25, 25]));
+            rect.center = mousePoint;
+            let path = new paper.Path.Rectangle(rect, 6);
+            path.fillColor = colors[i % 4];
+            let scale = (1 - i / amount) * 20;
+            path.scale(scale);
+        }
+        
+        function onMouseMove(event: paper.ToolEvent) {
+            mousePoint = event.point;
+        }
+        
+        let children = paper.project.activeLayer.children;
+        function onFrame(event: paper.IFrameEvent) {
+            for (let i = 0, l = children.length; i < l; i++) {
+                let item = children[i];
+                let delta = (mousePoint.subtract(item.position)).divide(i + 5);
+                item.rotate(Math.sin((event.count + i) / 10) * 7);
+                if (delta.length > 0.1)
+                    item.position = item.position.add(delta);
+            }
+        }
+    }
+    function RadialRainbows(){
+        let point = paper.view.center;
+
+        let colors:paper.Color[] = [];
+        let cycles = 4;
+        for (let i = 0, l = 60; i < l; i++) {
+            let brightness = 1 - (i / l) * 1.5;
+            let hue = i / l * cycles * 360;
+            let color = new paper.Color({
+                hue: hue,
+                saturation: 1,
+                brightness: brightness
+            });
+            colors.push(color);
+        }
+
+        let radius = Math.max(paper.view.size.width, paper.view.size.height) * 0.75;
+
+        let path = new paper.Path.Rectangle({
+            rectangle: paper.view.bounds,
+            fillColor: {
+                origin: point,
+                destination: point.add(new paper.Point([radius, 0])),
+                gradient: {
+                    stops: colors,
+                    radial: true
+                }
+            }
+        });
+
+        let color = path.fillColor as paper.Color;
+        let gradient = color.gradient;
+        let mouseDown = false;
+        let mousePoint = paper.view.center;
+
+        function onMouseDown(event: paper.ToolEvent) {
+            mouseDown = true;
+            mousePoint = event.point;
+        }
+
+        function onMouseDrag(event: paper.ToolEvent) {
+            mousePoint = event.point;
+        }
+
+        function onMouseUp(event: paper.ToolEvent) {
+            vector.length = 10;
+            mouseDown = false;
+        }
+
+        let grow = false;
+        let vector = new paper.Point(150, 0);
+
+        function onFrame() {
+            if(gradient){
+                for (let i = 0, l = gradient.stops.length; i < l; i++)
+                    gradient.stops[i].color.hue -= 20;
+                if (grow && vector.length > 300) {
+                    grow = false;
+                } else if (!grow && vector.length < 75) {
+                    grow = true;
+                }
+                if (mouseDown) {
+                    point = point.add((mousePoint.subtract(point)).divide(10));
+                } else {
+                    vector.length += (grow ? 1 : -1);
+                    vector.angle += 5;
+                }
+                color.highlight = mouseDown ? point : point.add(vector);
+            }
+        }
+
+        function onResize(event: paper.Event) {
+            point = paper.view.center;
+            path.bounds = paper.view.bounds;
+            let color = path.fillColor as paper.Color;
+            color.origin = point;
+            let radius = Math.max(paper.view.size.width, paper.view.size.height) * 0.75;
+            color.destination = point.add(new paper.Point([radius, 0]));
+        }
+    }
+    function MetaBalls(){
+        // Ported from original Metaball script by SATO Hiroyuki
+        // http://park12.wakwak.com/~shp/lc/et/en_aics_script.html
+        paper.project.currentStyle = {
+            fillColor: 'black'
+        };
+
+        let ballPositions = [[255, 129], [610, 73], [486, 363],
+            [117, 459], [484, 726], [843, 306], [789, 615], [1049, 82],
+            [1292, 428], [1117, 733], [1352, 86], [92, 798]];
+
+        let handle_len_rate = 2.4;
+        let circlePaths:paper.Path[] = [];
+        let radius = 50;
+        for (let i = 0, l = ballPositions.length; i < l; i++) {
+            let circlePath = new paper.Path.Circle({
+                center: ballPositions[i],
+                radius: 50
+            });
+            circlePaths.push(circlePath);
+        }
+
+        let largeCircle = new paper.Path.Circle({
+            center: [676, 433],
+            radius: 100
+        });
+        circlePaths.push(largeCircle);
+
+        function onMouseMove(event:paper.ToolEvent) {
+            largeCircle.position = event.point;
+            generateConnections(circlePaths);
+        }
+
+        let connections = new paper.Group();
+        function generateConnections(paths:paper.Path[]) {
+            // Remove the last connection paths:
+            connections.children = [];
+
+            for (let i = 0, l = paths.length; i < l; i++) {
+                for (let j = i - 1; j >= 0; j--) {
+                    let path = metaball(paths[i], paths[j], 0.5, handle_len_rate, 300);
+                    if (path) {
+                        connections.appendTop(path);
+                        path.removeOnMove();
+                    }
+                }
+            }
+        }
+
+        generateConnections(circlePaths);
+
+        // ---------------------------------------------
+        function metaball(ball1:paper.Path, ball2:paper.Path, v:number, handle_len_rate:number, maxDistance:number) {
+            let center1 = ball1.position;
+            let center2 = ball2.position;
+            let radius1 = ball1.bounds.width / 2;
+            let radius2 = ball2.bounds.width / 2;
+            let pi2 = Math.PI / 2;
+            let d = center1.getDistance(center2);
+            let u1:number;
+            let u2:number;
+
+            if (radius1 == 0 || radius2 == 0)
+                return;
+
+            if (d > maxDistance || d <= Math.abs(radius1 - radius2)) {
+                return;
+            } else if (d < radius1 + radius2) { // case circles are overlapping
+                u1 = Math.acos((radius1 * radius1 + d * d - radius2 * radius2) /
+                        (2 * radius1 * d));
+                u2 = Math.acos((radius2 * radius2 + d * d - radius1 * radius1) /
+                        (2 * radius2 * d));
+            } else {
+                u1 = 0;
+                u2 = 0;
+            }
+
+            let angle1 = (center2.subtract(center1)).angleInRadians;
+            let angle2 = Math.acos((radius1 - radius2) / d);
+            let angle1a = angle1 + u1 + (angle2 - u1) * v;
+            let angle1b = angle1 - u1 - (angle2 - u1) * v;
+            let angle2a = angle1 + Math.PI - u2 - (Math.PI - u2 - angle2) * v;
+            let angle2b = angle1 - Math.PI + u2 + (Math.PI - u2 - angle2) * v;
+            let p1a = center1.add(getVector(angle1a, radius1));
+            let p1b = center1.add(getVector(angle1b, radius1));
+            let p2a = center2.add(getVector(angle2a, radius2));
+            let p2b = center2.add(getVector(angle2b, radius2));
+
+            // define handle length by the distance between
+            // both ends of the curve to draw
+            let totalRadius = (radius1 + radius2);
+            let d2 = Math.min(v * handle_len_rate, (p1a.subtract(p2a)).length / totalRadius);
+
+            // case circles are overlapping:
+            d2 *= Math.min(1, d * 2 / (radius1 + radius2));
+
+            radius1 *= d2;
+            radius2 *= d2;
+
+            let path = new paper.Path({
+                segments: [p1a, p2a, p2b, p1b],
+                style: ball1.style,
+                closed: true
+            });
+            let segments = path.segments;
+            segments[0].handleOut = getVector(angle1a - pi2, radius1);
+            segments[1].handleIn = getVector(angle2a + pi2, radius2);
+            segments[2].handleOut = getVector(angle2b - pi2, radius2);
+            segments[3].handleIn = getVector(angle1b + pi2, radius1);
+            return path;
+        }
+
+        // ------------------------------------------------
+        function getVector(radians:number, length:number) {
+            return new paper.Point({
+                // Convert radians to degrees:
+                angle: radians * 180 / Math.PI,
+                length: length
+            });
+        }
+    }
+    function Voronoi(){
+        let voronoi:any = {};
+        let sites = generateBeeHivePoints(paper.view.size.divide(200), true);
+        let bbox:any;
+        let diagram:any;
+        let oldSize = paper.view.size;
+        let spotColor = new paper.Color('red');
+        let mousePos = paper.view.center;
+        let selected = false;
+
+        onResize();
+
+        function onMouseDown(event: paper.ToolEvent) {
+            sites.push(event.point);
+            renderDiagram();
+        }
+
+        function onMouseMove(event: paper.ToolEvent) {
+            mousePos = event.point;
+            if (event.count == 0)
+                sites.push(event.point);
+            sites[sites.length - 1] = event.point;
+            renderDiagram();
+        }
+
+        function renderDiagram() {
+            paper.project.activeLayer.children = [];
+            let diagram = voronoi.compute(sites, bbox);
+            if (diagram) {
+                for (let i = 0, l = sites.length; i < l; i++) {
+                    let cell = diagram.cells[(sites[i] as any).voronoiId];
+                    if (cell) {
+                        let halfedges = cell.halfedges,
+                            length = halfedges.length;
+                        if (length > 2) {
+                            let points:paper.Point[] = [];
+                            for (let j = 0; j < length; j++) {
+                                let v = halfedges[j].getEndpoint();
+                                points.push(new paper.Point(v));
+                            }
+                            createPath(points, sites[i]);
+                        }
+                    }
+                }
+            }
+        }
+
+        function removeSmallBits(path:paper.Path) {
+            let averageLength = path.length / path.segments.length;
+            let min = path.length / 50;
+            for(let i = path.segments.length - 1; i >= 0; i--) {
+                let segment = path.segments[i];
+                let cur = segment.point;
+                let nextSegment = segment.next;
+                let next = nextSegment.point.add(nextSegment.handleIn);
+                if (cur.getDistance(next) < min) {
+                    segment.remove();
+                }
+            }
+        }
+
+        function generateBeeHivePoints(size:paper.Size, loose: boolean) {
+            let points:paper.Point[] = [];
+            let col = paper.view.size.divide(size);
+            for(let i = -1; i < size.width + 1; i++) {
+                for(let j = -1; j < size.height + 1; j++) {
+                    let point = new paper.Point(i, j).divide(new paper.Point(size)).multiply(new paper.Point(paper.view.size)).add(new paper.Point(col).divide(2));
+                    if(j % 2)
+                        point = point.add(new paper.Point(col.width / 2, 0));
+                    if(loose)
+                        point = point.add(new paper.Point(col).divide(4).multiply(paper.Point.random()).subtract(new paper.Point(col.divide(4))));
+                    points.push(point);
+                }
+            }
+            return points;
+        }
+        function createPath(points: paper.Point[], center: paper.Point) {
+            let path = new paper.Path();
+            if (!selected) { 
+                path.fillColor = spotColor;
+            } else {
+                path.fullySelected = selected;
+            }
+            path.closed = true;
+
+            for (let i = 0, l = points.length; i < l; i++) {
+                let point = points[i];
+                let next = points[(i + 1) == points.length ? 0 : i + 1];
+                let vector = (next.subtract(point)).divide(2);
+                path.add(new paper.Point({
+                    point: point.add(vector),
+                    handleIn: vector.multiply(-1),
+                    handleOut: vector
+                }));
+            }
+            path.scale(0.95);
+            removeSmallBits(path);
+            return path;
+        }
+
+        function onResize() {
+            let margin = 20;
+            bbox = {
+                xl: margin,
+                xr: paper.view.bounds.width - margin,
+                yt: margin,
+                yb: paper.view.bounds.height - margin
+            };
+            for (let i = 0, l = sites.length; i < l; i++) {
+                sites[i] = sites[i].multiply(new paper.Point(paper.view.size.divide(oldSize)));
+            }
+            oldSize = paper.view.size;
+            renderDiagram();
+        }
+
+        function onKeyDown(event: paper.KeyEvent) {
+            if (event.key == 'space') {
+                selected = !selected;
+                renderDiagram();
+            }
+        }
+    }
+    function FutureSplash(){
+        // Code ported to Paper.js from http://the389.com/9/1/
+        // with permission.
+
+        let values = {
+            friction: 0.8,
+            timeStep: 0.01,
+            amount: 15,
+            mass: 2,
+            count: 0,
+            invMass: 1/2
+        };
+        values.invMass = 1 / values.mass;
+
+        let path: paper.Path;
+        let springs: Spring[];
+        let size = paper.view.size.multiply(new paper.Size([1.2, 1]));
+
+        class SpringPoint extends paper.Point{
+            fixed: boolean;
+            px: number;
+            py: number;
+        }
+
+        class Spring {
+            a: SpringPoint;
+            b: SpringPoint;
+            restLength: number;
+            strength: number;
+            mamb: number;            
+
+            constructor(a:SpringPoint, b:SpringPoint, strength:number, restLength:number=0){
+                this.a = a;
+                this.b = b;
+                this.restLength = restLength || 80;
+                this.strength = strength ? strength : 0.55;
+                this.mamb = values.invMass * values.invMass;
+            }
+            update() {
+                let delta = this.b.subtract(this.a);
+                let dist = delta.length;
+                let normDistStrength = (dist - this.restLength) /
+                        (dist * this.mamb) * this.strength;
+                delta.y *= normDistStrength * values.invMass * 0.2;
+                if (!this.a.fixed)
+                    this.a.y += delta.y;
+                if (!this.b.fixed)
+                    this.b.y -= delta.y;
+            }
+        };
+
+
+        function createPath(strength: number) {
+            let path = new paper.Path({
+                fillColor: 'black'
+            });
+            springs = [];
+            for (let i = 0; i <= values.amount; i++) {
+                let segment = path.add(new paper.Point(i / values.amount, 0.5).multiply(new paper.Point(size)));
+                let point = segment.point as SpringPoint;
+                if (i == 0 || i == values.amount)
+                    point.y += size.height;
+                point.px = point.x;
+                point.py = point.y;
+                // The first two and last two points are fixed:
+                point.fixed = i < 2 || i > values.amount - 2;
+                if (i > 0) {
+                    let spring = new Spring(segment.previous.point as SpringPoint, point, strength);
+                    springs.push(spring);
+                }
+            }
+            path.position.x -= size.width / 4;
+            return path;
+        }
+
+        function onResize() {
+            if (path)
+                path.remove();
+            size = paper.view.bounds.size.multiply(new paper.Size([2, 1]));
+            path = createPath(0.1);
+        }
+
+        function onMouseMove(event: paper.ToolEvent) {
+            let location = path.getNearestLocation(event.point);
+            let segment = location.segment;
+            let point = segment.point as SpringPoint;
+
+            if (!point.fixed && location.distance < size.height / 4) {
+                let y = event.point.y;
+                point.y += (y - point.y) / 6;
+                if (segment.previous && !(segment.previous.point as SpringPoint).fixed) {
+                    let previous = segment.previous.point;
+                    previous.y += (y - previous.y) / 24;
+                }
+                if (segment.next && !(segment.next.point as SpringPoint).fixed) {
+                    let next = segment.next.point;
+                    next.y += (y - next.y) / 24;
+                }
+            }
+        }
+
+        function onFrame(event:paper.IFrameEvent) {
+            updateWave(path);
+        }
+
+        function updateWave(path:paper.Path) {
+            let force = 1 - values.friction * values.timeStep * values.timeStep;
+            for (let i = 0, l = path.segments.length; i < l; i++) {
+                let point = path.segments[i].point as SpringPoint;
+                let dy = (point.y - point.py) * force;
+                point.py = point.y;
+                point.y = Math.max(point.y + dy, 0);
+            }
+
+            for (let j = 0, l = springs.length; j < l; j++) {
+                springs[j].update();
+            }
+            path.smooth({ type: 'continuous' });
+        }
+
+        function onKeyDown(event:paper.KeyEvent) {
+            if (event.key == 'space') {
+                path.fullySelected = !path.fullySelected;
+                path.fillColor = path.fullySelected ? new paper.Color('') : 'black';
+            }
+        }
+    }
+    function Smoothing(){
+        let width: number;
+        let height: number;
+        let center: paper.Point;
+        let points = 10;
+        let smooth = true;
+        let path = new paper.Path();
+        let mousePos = paper.view.center.divide(2);
+        let pathHeight = mousePos.y;
+        path.fillColor = 'black';
+        initializePath();
+
+        function initializePath() {
+            center = paper.view.center;
+            width = paper.view.size.width;
+            height = paper.view.size.height / 2;
+            path.segments = [];
+            path.add(paper.view.bounds.bottomLeft);
+            for (let i = 1; i < points; i++) {
+                let point = new paper.Point(width / points * i, center.y);
+                path.add(point);
+            }
+            path.add(paper.view.bounds.bottomRight);
+            path.fullySelected = true;
+        }
+
+        function onFrame(event:paper.IFrameEvent) {
+            pathHeight += (center.y - mousePos.y - pathHeight) / 10;
+            for (let i = 1; i < points; i++) {
+                let sinSeed = event.count + (i + i % 10) * 100;
+                let sinHeight = Math.sin(sinSeed / 200) * pathHeight;
+                let yPos = Math.sin(sinSeed / 100) * sinHeight + height;
+                path.segments[i].point.y = yPos;
+            }
+            if (smooth)
+                path.smooth({ type: 'continuous' });
+        }
+
+        function onMouseMove(event:paper.ToolEvent) {
+            mousePos = event.point;
+        }
+
+        function onMouseDown(event:paper.ToolEvent) {
+            smooth = !smooth;
+            if (!smooth) {
+                // If smooth has been turned off, we need to reset
+                // the handles of the path:
+                for (let i = 0, l = path.segments.length; i < l; i++) {
+                    let segment = path.segments[i];
+                    segment.clearHandles();
+                }
+            }
+        }
+
+        // Reposition the path whenever the window is resized:
+        function onResize(event:paper.Event) {
+            initializePath();
+        }
+    }
+    function SpiralRaster(){
+        // Please note: dragging and dropping images only works for
+        // certain browsers when serving this script online:
+        let path:paper.Path;
+        let position:paper.Point;
+        let max:number;
+        let count = 0;
+        let grow = false;
+
+        // As the web is asynchronous, we need to wait for the raster to
+        // load before we can perform any operation on its pixels.
+        let raster = new paper.Raster('mona');
+        raster.visible = false;
+        raster.on('load', resetSpiral);
+
+        let text = new paper.PointText({
+            justification: 'right',
+            fontSize: 12,
+            content: (window as any).FileReader
+                ? 'drag & drop an image from your desktop to rasterize it'
+                : 'to drag & drop images, please use Webkit, Firefox, Chrome or IE 10'
+        });
+
+        function onFrame(event:paper.IFrameEvent) {
+            if (grow) {
+                if (raster.loaded && (paper.view.center.subtract(position)).length < max) {
+                    for (let i = 0, l = count / 36 + 1; i < l; i++) {
+                        growSpiral();
+                    }
+                    path.smooth();
+                } else {
+                    grow = false;
+                }
+            }
+        }
+
+        function growSpiral() {
+                count++;
+                let vector = new paper.Point({
+                    angle: count * 5,
+                    length: count / 100
+                });
+                let rot = vector.rotate(90);
+                let color = raster.getAverageColor(position.add(vector.divide(2)));
+                let value = color ? (1 - color.gray) * 3.7 : 0;
+                rot.length = Math.max(value, 0.2);
+                path.add(position.add(vector).subtract(rot));
+                path.insert(0, position.add(vector).add(rot));
+                position = position.add(vector);
+        }
+
+        function resetSpiral() {
+            grow = true;
+
+            // Transform the raster, so it fills the paper.view:
+            raster.fitBounds(paper.view.bounds);
+
+            if (path)
+                path.remove();
+
+            position = paper.view.center;
+            count = 0;
+            path = new paper.Path({
+                fillColor: 'black',
+                closed: true
+            });
+
+            position = paper.view.center;
+            max = Math.min(raster.bounds.width, raster.bounds.height) * 0.5;
+        }
+
+        function onResize() {
+            if (raster.loaded)
+                resetSpiral();
+            text.point = paper.view.bounds.bottomRight.subtract(new paper.Point([30, 30]));
+        }
+
+        function onKeyDown(event:paper.KeyEvent) {
+            if (event.key == 'space') {
+                path.selected = !path.selected;
+            }
+        }
+
+        function onDocumentDrag(event:Event) {
+            event.preventDefault();
+        }
+
+        function onDocumentDrop(event:Event) {
+            event.preventDefault();
+
+            let file = (event as any).dataTransfer.files[0];
+            let reader = new FileReader();
+
+            reader.onload = function (event) {
+                let image = document.createElement('img');
+                image.onload = function () {
+                    raster = new paper.Raster(image);
+                    raster.visible = false;
+                    resetSpiral();
+                };
+                if(event.target)
+                    image.src = (event.target as any).result;
+            };
+            reader.readAsDataURL(file);
+        }
+
+        document.addEventListener('drop', onDocumentDrop, false);
+        document.addEventListener('dragover', onDocumentDrag, false);
+        document.addEventListener('dragleave', onDocumentDrag, false);
+    }
+    function DivisionRaster(){
+        // Based on 'JPEG Raster' by Jonathan Puckey:
+        // http://www.flickr.com/photos/puckey/3179779686/in/photostream/
+
+        // Create a raster item:
+        let raster = new paper.Raster('mona.jpg');
+        let loaded = false;
+
+        raster.on('load', function(event: paper.Event) {
+            loaded = true;
+            paper.view.onResize(event);
+        });
+
+        // Make the raster invisible:
+        raster.visible = false;
+
+        let lastPos = paper.view.center;
+        function moveHandler(this: paper.Path, event:paper.MouseEvent) {
+            if (!loaded)
+                return;
+            if (lastPos.getDistance(event.point) < 10)
+                return;
+            lastPos = event.point;
+
+            let size: paper.Size = this.bounds.size.clone();
+            let isLandscape = size.width > size.height;
+
+            // If the path is in landscape orientation, we're going to
+            // split the path horizontally, otherwise vertically:
+
+            size= size.divide(new paper.Size(isLandscape ? [2, 1] : [1, 2]));
+
+            let path = new paper.Path.Rectangle({
+                point: this.bounds.topLeft.floor(),
+                size: size.ceil(),
+                onMouseMove: moveHandler
+            });
+            path.fillColor = raster.getAverageColor(path);
+
+            let path2 = new paper.Path.Rectangle({
+                point: isLandscape
+                    ? this.bounds.topCenter.ceil()
+                    : this.bounds.leftCenter.ceil(),
+                size: size.floor(),
+                onMouseMove: moveHandler
+            });
+            path2.fillColor = raster.getAverageColor(path2);
+
+            this.remove();
+        }
+
+        function onResize(event:paper.Event) {
+            if (!loaded)
+                return;
+            paper.project.activeLayer.removeChildren();
+
+            // Transform the raster so that it fills the bounding rectangle
+            // of the paper.view:
+            raster.fitBounds(paper.view.bounds, true);
+
+            // Create a path that fills the paper.view, and fill it with
+            // the average color of the raster:
+            new paper.Path.Rectangle({
+                rectangle: paper.view.bounds,
+                fillColor: raster.getAverageColor(paper.view.bounds),
+                onMouseMove: moveHandler
+            });
+        }
+    }
+    function Qbertify(){
+        // Please note: dragging and dropping images only works for
+        // certain browsers when serving this script online:
+
+        let values = {
+            amount: 30
+        };
+
+        let raster: paper.Raster;
+        let group: paper.Group;
+        let piece = createPiece();
+        let count = 0;
+
+        handleImage('mona');
+
+        let text = new paper.PointText({
+            point: paper.view.center,
+            justification: 'center',
+            fillColor: 'white',
+            fontSize: 15,
+            content: (window as any).FileReader
+                ? 'Drag & drop an image from your desktop'
+                : 'To drag & drop images, please use Webkit, Firefox, Chrome or IE 10'
+        });
+
+        function createPiece() {
+            let group = new paper.Group();
+            let hexagon = new paper.Path.RegularPolygon({
+                center: paper.view.center,
+                sides: 6,
+                radius: 50,
+                fillColor: 'gray',
+                parent: group
+            });
+            for (let i = 0; i < 2; i++) {
+                let path = new paper.Path({
+                    closed: true,
+                    parent: group,
+                    fillColor: i == 0 ? 'white' : 'black'
+                });
+                for (let j = 0; j < 3; j++) {
+                    let index = (i * 2 + j) % hexagon.segments.length;
+                    path.add(hexagon.segments[index].clone());
+                }
+                path.add(hexagon.bounds.center);
+            }
+            // Remove the group from the document, so it is not drawn:
+            group.remove();
+            return group;
+        }
+
+        function handleImage(image:HTMLImageElement|string) {
+            count = 0;
+            let size = piece.bounds.size;
+
+            if (group)
+                group.remove();
+
+            // As the web is asynchronous, we need to wait for the raster to
+            // load before we can perform any operation on its pixels.
+            raster = new paper.Raster(image);
+            raster.visible = false;
+            raster.on('load', function() {
+                // Transform the raster, so it fills the paper.view:
+                raster.fitBounds(paper.view.bounds, true);
+                group = new paper.Group();
+                for (let y = 0; y < values.amount; y++) {
+                    for (let x = 0; x < values.amount; x++) {
+                        let copy = piece.clone();
+                        copy.position = copy.position.add(new paper.Point(size.multiply(new paper.Size([x + (y % 2 ? 0.5 : 0), y * 0.75]))));
+                        group.addChild(copy);
+                    }
+                }
+
+                // Transform the group so it covers the paper.view:
+                group.fitBounds(paper.view.bounds, true);
+                group.scale(1.1);
+            })
+        }
+
+        function onFrame(event:paper.IFrameEvent) {
+            if (!group)
+                return;
+            // Loop through the uncolored hexagons in the group and fill them
+            // with the average color:
+            let length = Math.min(count + values.amount, group.children.length);
+            for (let i = count; i < length; i++) {
+                piece = group.children[i] as paper.Group;
+                let hexagon = piece.children[0] as paper.Path;
+                let color = raster.getAverageColor(hexagon);
+                if (color) {
+                    hexagon.fillColor = color;
+                    let top = piece.children[1];
+                    top.fillColor = color.clone();
+                    top.fillColor.brightness *= 1.5;
+
+                    let right = piece.children[2];
+                    right.fillColor = color.clone();
+                    right.fillColor.brightness *= 0.5;
+                }
+            }
+            count += values.amount;
+        }
+
+        function onResize() {
+            paper.project.activeLayer.position = paper.view.center;
+        }
+
+        function onDocumentDrag(event:Event) {
+            event.preventDefault();
+        }
+
+        function onDocumentDrop(event:Event) {
+            event.preventDefault();
+
+            let file = (event as any).dataTransfer.files[0];
+            let reader = new FileReader();
+
+            reader.onload = function(event) {
+                let image = document.createElement('img');
+                image.onload = function () {
+                    handleImage(image);
+                    paper.view.draw();
+                };
+                image.src = (event as any).target.result;
+            };
+            reader.readAsDataURL(file);
+        }
+
+        document.addEventListener('drop', onDocumentDrop, false);
+        document.addEventListener('dragover', onDocumentDrag, false);
+        document.addEventListener('dragleave', onDocumentDrag, false);
+    }
+    function PathIntersections(){
+        // Imported SVG Groups have their applyMatrix flag turned off by
+        // default. This is required for SVG importing to work correctly. Turn
+        // it on now, so we don't have to deal with nested coordinate spaces.
+        let words = paper.project.importSVG((document.getElementById('svg') as any) as SVGElement);
+        words.visible = true; // Turn off the effect of display:none;
+        words.fillColor = new paper.Color('');
+        words.strokeColor = 'black';
+        let yesGroup = words.getItem({name:'yes'}) as paper.Group;
+
+        let noGroup = words.getItem({name:'no'}) as paper.Group;
+        // Resize the words to fit snugly inside the paper.view:
+        words.fitBounds(paper.view.bounds);
+        words.scale(0.8);
+
+        yesGroup.position = paper.view.center;
+        noGroup.position = new paper.Point([-900, -900]);
+
+        function onMouseMove(event:paper.MouseEvent) {
+            noGroup.position = event.point;
+            for (let i = 0; i < yesGroup.children.length; i++) {
+                for (let j = 0; j < noGroup.children.length; j++) {
+                    showIntersections(noGroup.children[j] as paper.PathItem, yesGroup.children[i] as paper.PathItem)
+                }
+            }
+        }
+0
+        function showIntersections(path1:paper.PathItem, path2:paper.PathItem) {
+            let intersections = path1.getIntersections(path2);
+            for (let i = 0; i < intersections.length; i++) {
+                new paper.Path.Circle({
+                    center: intersections[i].point,
+                    radius: 5,
+                    fillColor: '#009dec'
+                }).removeOnMove();
+            }
+        }
+    }
+    function PathSimplification(){
+        let path:paper.Path;
+
+        let textItem = new paper.PointText({
+            content: 'Click and drag to draw a line.',
+            point: new paper.Point(20, 30),
+            fillColor: 'black',
+        });
+
+        function onMouseDown(event:paper.ToolEvent) {
+            // If we produced a path before, deselect it:
+            if (path) {
+                path.selected = false;
+            }
+
+            // Create a new path and set its stroke color to black:
+            path = new paper.Path({
+                segments: [event.point],
+                strokeColor: 'black',
+                // Select the path, so we can see its segment points:
+                fullySelected: true
+            });
+        }
+
+        // While the user drags the mouse, points are added to the path
+        // at the position of the mouse:
+        function onMouseDrag(event:paper.ToolEvent) {
+            path.add(event.point);
+
+            // Update the content of the text item to show how many
+            // segments it has:
+            textItem.content = 'Segment count: ' + path.segments.length;
+        }
+
+        // When the mouse is released, we simplify the path:
+        function onMouseUp(event:paper.ToolEvent) {
+            let segmentCount = path.segments.length;
+
+            // When the mouse is released, simplify it:
+            path.simplify(10);
+
+            // Select the path, so we can see its segments:
+            path.fullySelected = true;
+
+            let newSegmentCount = path.segments.length;
+            let difference = segmentCount - newSegmentCount;
+            let percentage = 100 - Math.round(newSegmentCount / segmentCount * 100);
+            textItem.content = difference + ' of the ' + segmentCount + ' segments were removed. Saving ' + percentage + '%';
+        }
+    }
+    function HitTesting(){
+        let values = {
+            paths: 50,
+            minPoints: 5,
+            maxPoints: 15,
+            minRadius: 30,
+            maxRadius: 90
+        };
+        
+        let hitOptions = {
+            segments: true,
+            stroke: true,
+            fill: true,
+            tolerance: 5
+        };
+        
+        createPaths();
+        
+        function createPaths() {
+            let radiusDelta = values.maxRadius - values.minRadius;
+            let pointsDelta = values.maxPoints - values.minPoints;
+            for (let i = 0; i < values.paths; i++) {
+                let radius = values.minRadius + Math.random() * radiusDelta;
+                let points = values.minPoints + Math.floor(Math.random() * pointsDelta);
+                let path = createBlob(paper.Point.random().multiply(new paper.Point(paper.view.size)), radius, points);
+                let lightness = (Math.random() - 0.5) * 0.4 + 0.4;
+                let hue = Math.random() * 360;
+                path.fillColor = new paper.Color({ hue: hue, saturation: 1, lightness: lightness });
+                path.strokeColor = 'black';
+            };
+        }
+        
+        function createBlob(center:paper.Point, maxRadius:number, points:number) {
+            let path = new paper.Path();
+            path.closed = true;
+            for (let i = 0; i < points; i++) {
+                let delta = new paper.Point({
+                    length: (maxRadius * 0.5) + (Math.random() * maxRadius * 0.5),
+                    angle: (360 / points) * i
+                });
+                path.add(center.add(delta));
+            }
+            path.smooth();
+            return path;
+        }
+        
+        let segment:paper.Segment | null;
+        let path:paper.Path | null;
+        let movePath = false;
+        function onMouseDown(event:paper.ToolEvent) {
+            segment = path = null;
+            let hitResult = paper.project.hitTest(event.point, hitOptions);
+            if (!hitResult)
+                return;
+        
+            if (event.modifiers.shift) {
+                if (hitResult.type == 'segment') {
+                    hitResult.segment.remove();
+                };
+                return;
+            }
+        
+            if (hitResult) {
+                path = hitResult.item as paper.Path;
+                if (hitResult.type == 'segment') {
+                    segment = hitResult.segment;
+                } else if (hitResult.type == 'stroke') {
+                    let location = hitResult.location;
+                    segment = path.insert(location.index + 1, event.point);
+                    path.smooth();
+                }
+            }
+            movePath = hitResult.type == 'fill';
+            if (movePath)
+                paper.project.activeLayer.addChild(hitResult.item);
+        }
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            paper.project.activeLayer.selected = false;
+            if (event.item)
+                event.item.selected = true;
+        }
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            if (segment) {
+                segment.point= segment.point.add(event.delta);
+                if(path)
+                    path.smooth();
+            } else if (path) {
+                path.position = path.position.add(event.delta);
+            }
+        }
+    }
+    function BouncingBalls(){
+        class Ball{
+            point: paper.Point;
+            vector:paper.Point;
+            dampen:number;
+            gravity:number;
+            bounce:number;
+            radius: number;
+            item: paper.Item;
+
+            constructor(point:paper.Point, vector:paper.Point) {
+                if (!vector || vector.isZero()) {
+                    this.vector = paper.Point.random().multiply(5);
+                } else {
+                    this.vector = vector.multiply(2);;
+                }
+                this.point = point;
+                this.dampen = 0.4;
+                this.gravity = 3;
+                this.bounce = -0.6;
+            
+                let color = new paper.Color({
+                    hue: Math.random() * 360,
+                    saturation: 1,
+                    brightness: 1
+                });
+                let gradient = new paper.Gradient([new paper.GradientStop(color), new paper.GradientStop(new paper.Color('black'))], true);
+            
+                let radius = this.radius = 50 * Math.random() + 30;
+                // Wrap CompoundPath in a Group, since CompoundPaths directly 
+                // applies the transformations to the content, just like Path.
+                let ball = new paper.CompoundPath({
+                    children: [
+                        new paper.Path.Circle({
+                            radius: radius
+                        }),
+                        new paper.Path.Circle({
+                            center: radius / 8,
+                            radius: radius / 3
+                        })
+                    ],
+                    fillColor: new paper.Color(gradient, new paper.Point([0]), new paper.Point([radius]), new paper.Point([radius / 8])),
+                });
+            
+                this.item = new paper.Group({
+                    children: [ball],
+                    transformContent: false,
+                    position: this.point
+                });
+            }
+            iterate() {
+                let size = paper.view.size;
+                this.vector.y += this.gravity;
+                this.vector.x *= 0.99;
+                let pre = this.point.add(this.vector);
+                if (pre.x < this.radius || pre.x > size.width - this.radius)
+                    this.vector.x *= -this.dampen;
+                if (pre.y < this.radius || pre.y > size.height - this.radius) {
+                    if (Math.abs(this.vector.x) < 3)
+                        this.vector = paper.Point.random().multiply(new paper.Point([150, 100]).add(new paper.Point([-75, 20])));
+                    this.vector.y *= this.bounce;
+                }
+            
+                let max = paper.Point.max(new paper.Point([this.radius]), this.point.add(this.vector));
+                this.item.position = this.point = paper.Point.min(max, new paper.Point(size).subtract(this.radius));
+                this.item.rotate(this.vector.x);
+            }
+        }        
+        
+        let balls:Ball[] = [];
+        for (let i = 0; i < 10; i++) {
+            let position = paper.Point.random().multiply(new paper.Point(paper.view.size));
+            let vector = (paper.Point.random().subtract(new paper.Point([0.5, 0])).multiply(new paper.Point([50, 100])));
+            let ball = new Ball(position, vector);
+            balls.push(ball);
+        }
+        
+        let textItem = new paper.PointText({
+            point: [20, 30],
+            fillColor: 'black',
+            content: 'Click, drag and release to add balls.'
+        });
+        
+        let lastDelta:paper.Point|null;
+        function onMouseDrag(event:paper.ToolEvent) {
+            lastDelta = event.delta;
+        }
+        
+        function onMouseUp(event:paper.ToolEvent) {
+            if(lastDelta){
+                let ball = new Ball(event.point, lastDelta);
+                balls.push(ball);
+            }
+            lastDelta = null;
+        }
+        
+        function onFrame() {
+            for (let i = 0, l = balls.length; i < l; i++)
+                balls[i].iterate();
+        }
+    }
+}
+
+function APIReferenceExamples() {
+    function Color0() {
+    
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30.
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // Pass a color name to the fillColor property, which is internally
+        // converted to a Color.
+        circle.fillColor = 'green';
+    
+    }
+    function Color1() {
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30.
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // Pass a hex string to the fillColor property, which is internally
+        // converted to a Color.
+        circle.fillColor = '#ff0000';
+    
+    }
+    function Color2() {
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // 100% red, 0% blue, 50% blue:
+        circle.fillColor = new paper.Color(1, 0, 0.5);
+    
+    }
+    function Color3() {
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // Create a GrayColor with 50% gray:
+        circle.fillColor = new paper.Color(0.5);
+    
+    }
+    function Color4() {
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // Create an HSB Color with a hue of 90 degrees, a saturation
+        // 100% and a brightness of 100%:
+        circle.fillColor = new paper.Color({ hue: 90, saturation: 1, brightness: 1 });
+    
+    }
+    function Color5() {
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // Create an HSL Color with a hue of 90 degrees, a saturation
+        // 100% and a lightness of 50%:
+        circle.fillColor = new paper.Color({ hue: 90, saturation: 1, lightness: 0.5 });
+    
+    }
+    function Color6() {
+        
+        // Define two points which we will be using to construct
+        // the path and to position the gradient color:
+        let topLeft = paper.view.center.subtract(new paper.Point([80, 80]));
+        let bottomRight = paper.view.center.add(new paper.Point([80, 80]));
+        
+        let path = new paper.Path.Rectangle({
+         topLeft: topLeft,
+         bottomRight: bottomRight,
+         // Fill the path with a gradient of three color stops
+         // that runs between the two points we defined earlier:
+         fillColor: {
+             stops: ['yellow', 'red', 'blue'],
+             origin: topLeft,
+             destination: bottomRight
+         }
+        });
+    
+    }
+    function Color7() {
+        
+        // Define two points which we will be using to construct
+        // the path and to position the gradient color:
+        let topLeft = paper.view.center.subtract(new paper.Point([80, 80]));
+        let bottomRight = paper.view.center.add(new paper.Point([80, 80]));
+        
+        // Create a rectangle shaped path between
+        // the topLeft and bottomRight points:
+        let path = new paper.Path.Rectangle(topLeft, bottomRight);
+        
+        // Create the gradient, passing it an array of colors to be converted
+        // to evenly distributed color stops:
+        let gradient = new paper.Gradient(['yellow','red','blue']);
+        
+        // Have the gradient color run between the topLeft and
+        // bottomRight points we defined earlier:
+        let gradientColor = new paper.Color(gradient, topLeft, bottomRight);
+        
+        // Set the fill color of the path to the gradient color:
+        path.fillColor = gradientColor;
+    
+    }
+    function Color8() {
+        
+        // Create a circle shaped path at the center of the paper.view
+        // with a radius of 80:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 80
+        });
+        
+        // The stops array: yellow mixes with red between 0 and 15%,
+        // 15% to 30% is pure red, red mixes with black between 30% to 100%:
+        let stops = [
+            ['yellow', 0],
+            ['red', 0.15],
+            ['red', 0.3],
+            ['black', 0.9]
+        ];
+        
+        // Create a radial gradient using the color stops array:
+        let gradient = new paper.Gradient(stops, true);
+        
+        // We will use the center point of the circle shaped path as
+        // the origin point for our gradient color
+        let from = path.position;
+        
+        // The destination point of the gradient color will be the
+        // center point of the path + 80pt in horizontal direction:
+        let to = path.position.add(new paper.Point([80, 0]));
+        
+        // Create the gradient color:
+        let gradientColor = new paper.Color(gradient, from, to);
+        
+        // Set the fill color of the path to the gradient color:
+        path.fillColor = gradientColor;
+    
+    }
+    function Color9() {
+        
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // Fill the circle with red and give it a 20pt green stroke:
+        circle.style = {
+         fillColor: 'red',
+         strokeColor: 'green',
+         strokeWidth: 20
+        };
+        
+        // Make the stroke half transparent:
+        (circle.strokeColor as paper.Color).alpha = 0.5;
+    
+    }
+    function Color10() {
+        
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        circle.fillColor = new paper.Color('blue');
+        
+        // Blue + red = purple:
+        circle.fillColor.red = 1;
+    
+    }
+    function Color11() {
+        
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // First we set the fill color to red:
+        circle.fillColor = new paper.Color('red');
+        
+        // Red + green = yellow:
+        circle.fillColor.green = 1;
+    
+    }
+    function Color12() {
+        
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        // First we set the fill color to red:
+        circle.fillColor = new paper.Color('red');
+        
+        // Red + blue = purple:
+        circle.fillColor.blue = 1;
+    
+    }
+    function Color13() {
+        
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        circle.fillColor = new paper.Color('red');
+        circle.fillColor.hue += 30;
+    
+    }
+    function Color14() {
+        
+        // Create a rectangle shaped path, using the dimensions
+        // of the paper.view:
+        let path = new paper.Path.Rectangle(paper.view.bounds);
+        path.fillColor = new paper.Color('red');
+        
+        function onFrame(event:paper.IFrameEvent) {
+         (path.fillColor as paper.Color).hue += 0.5;
+        }
+    
+    }
+    function Color15() {
+        
+        let path = new paper.Path.Circle({
+         center: paper.view.center,
+         radius: paper.view.bounds.height * 0.4
+        });
+        
+        path.fillColor = new paper.Color({ 
+            gradient: new paper.Gradient({ 
+                stops: ['yellow', 'red', 'black'], 
+                radial: true }),
+            origin: path.position, 
+            destination: path.bounds.rightCenter
+        });
+        
+        function onMouseMove(event:paper.ToolEvent) {
+         // Set the origin highlight of the path's gradient color
+         // to the position of the mouse:
+         (path.fillColor as paper.Color).highlight = event.point;
+        }
+    
+    }
+    function CompoundPath0() {
+        
+        let path = new paper.CompoundPath({
+            children: [
+                new paper.Path.Circle({
+                    center: new paper.Point(50, 50),
+                    radius: 30
+                }),
+                new paper.Path.Circle({
+                    center: new paper.Point(50, 50),
+                    radius: 10
+                })
+            ],
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function CompoundPath1() {
+        
+        let pathData = 'M20,50c0,-16.56854 13.43146,-30 30,-30c16.56854,0 30,13.43146 30,30c0,16.56854 -13.43146,30 -30,30c-16.56854,0 -30,-13.43146 -30,-30z M50,60c5.52285,0 10,-4.47715 10,-10c0,-5.52285 -4.47715,-10 -10,-10c-5.52285,0 -10,4.47715 -10,10c0,5.52285 4.47715,10 10,10z';
+        let path = new paper.CompoundPath(pathData);
+        path.fillColor = 'black';
+    
+    }
+    function CompoundPath2() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function CompoundPath3() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function CompoundPath4() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function CompoundPath5() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function CompoundPath6() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function CompoundPath7() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function CompoundPath8() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function CompoundPath9() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function CompoundPath10() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function CompoundPath11() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function CompoundPath12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function CompoundPath13() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function CompoundPath14() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function CompoundPath15() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function CompoundPath16() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function CompoundPath17() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function CompoundPath18() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function CompoundPath19() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function CompoundPath20() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function CompoundPath21() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function CompoundPath22() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function CompoundPath23() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function CompoundPath24() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function CompoundPath25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function CompoundPath26() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function CompoundPath27() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function CompoundPath28() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function CompoundPath29() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function CompoundPath30() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function CompoundPath31() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function CompoundPath32() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function CompoundPath33() {
+        
+        function enter(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function CompoundPath34() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function CompoundPath35() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function CompoundPath36() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function CompoundPath37() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function CompoundPath38() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function CompoundPath39() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function CompoundPath40() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function CompoundPath41() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function CompoundPath42() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function CompoundPath43() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function CompoundPath44() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function CompoundPath45() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function CompoundPath46() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function CompoundPath47() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function CompoundPath48() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Item, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Item, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function CompoundPath49() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Item, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Item, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function CompoundPath50() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function CompoundPath51() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function CompoundPath52() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function CompoundPath53() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function CompoundPath54() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function CompoundPath55() {
+        
+        let path = new paper.Path.Rectangle(new paper.Point(30, 25), new paper.Size(50, 50));
+        path.strokeColor = 'black';
+        
+        let secondPath = path.clone();
+        let intersectionGroup = new paper.Group();
+        
+        function onFrame(event:paper.IFrameEvent) {
+            secondPath.rotate(1);
+        
+            let intersections = path.getIntersections(secondPath);
+            intersectionGroup.removeChildren();
+        
+            for (let i = 0; i < intersections.length; i++) {
+                let intersectionPath = new paper.Path.Circle({
+                    center: intersections[i].point,
+                    radius: 4,
+                    fillColor: 'red',
+                    parent: intersectionGroup
+                });
+            }
+        }
+    
+    }
+    function CompoundPath56() {
+        
+        let star = new paper.Path.Star({
+            center: paper.view.center,
+            points: 10,
+            radius1: 30,
+            radius2: 60,
+            strokeColor: 'black'
+        });
+        
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 3,
+            fillColor: 'red'
+        });
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Get the nearest point from the mouse position
+            // to the star shaped path:
+            let nearestPoint = star.getNearestPoint(event.point);
+        
+            // Move the red circle to the nearest point:
+            circle.position = nearestPoint;
+        }
+    
+    }
+    function CompoundPath57() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Select the path, so we can inspect its segments:
+        path.selected = true;
+        
+        // Create a copy of the path and move it by 150 points:
+        let copy = path.clone();
+        copy.position.x += 150;
+        
+        // Flatten the copied path, with a maximum error of 4 points:
+        copy.flatten(4);
+    
+    }
+    function CompoundPath58() {
+        
+        // Create a rectangular path with its top-left point at
+        // {x: 30, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [30, 25],
+            size: [50, 50],
+            strokeColor: 'black',
+        });
+        
+        // Select the path, so we can see its handles:
+        path.fullySelected = true;
+        
+        // Create a copy of the path and move it 100 to the right:
+        let copy = path.clone();
+        copy.position.x += 100;
+        
+        // Smooth the segments of the copy:
+        copy.smooth({ type: 'continuous' });
+    
+    }
+    function CompoundPath59() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        path.add(new paper.Point(30, 50));
+        
+        let y = 5;
+        let x = 3;
+        
+        for (let i = 0; i < 28; i++) {
+            y *= -1.1;
+            x *= 1.1;
+            path.lineBy(new paper.Point(x, y));
+        }
+        
+        // Create a copy of the path and move it 100 down:
+        let copy = path.clone();
+        copy.position.y += 120;
+        
+        // Select the path, so we can see its handles:
+        copy.fullySelected = true;
+        
+        // Smooth the path using centripetal Catmull-Rom splines:
+        copy.smooth({ type: 'catmull-rom', factor: 0.5 });
+    
+    }
+    function CompoundPath60() {
+        
+        // Create 5 rectangles, next to each other:
+        let paths:paper.Path[] = [];
+        for (let i = 0; i < 5; i++) {
+            paths.push(new paper.Path.Rectangle({
+                point: [30 + i * 100, 30],
+                size: [50, 50],
+                fullySelected: true
+            }));
+        }
+        // Smooth a range, using segments:
+        paths[1].smooth({
+            type: 'continuous',
+            from: paths[1].segments[0],
+            to: paths[1].segments[2]
+        });
+        
+        // Smooth a range, using curves:
+        paths[2].smooth({
+            type: 'continuous',
+            from: paths[2].curves[0],
+            to: paths[2].curves[1]
+        });
+        
+        // Smooth a range, using indices:
+        paths[3].smooth({ type: 'continuous', from: 0, to: 2 });
+        
+        // Smooth a range, using negative indices:
+        paths[4].smooth({ type: 'continuous', from: -1, to: 1 });
+    
+    }
+    function CompoundPath61() {
+        
+        let path: paper.Path | null;
+        function onMouseDown(event:paper.ToolEvent) {
+            // If we already made a path before, deselect it:
+            if (path) {
+                path.selected = false;
+            }
+        
+            // Create a new path and add the position of the mouse
+            // as its first segment. Select it, so we can see the
+            // segment points:
+            path = new paper.Path({
+                segments: [event.point],
+                strokeColor: 'black',
+                selected: true
+            });
+        }
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // On every drag event, add a segment to the path
+            // at the position of the mouse:
+            if(path){
+                path.add(event.point);
+            }
+        }
+        
+        function onMouseUp(event:paper.ToolEvent) {
+            // When the mouse is released, simplify the path:
+            if(path){
+                path.simplify();
+                path.selected = true;
+            }
+        }
+    
+    }
+    function CompoundPath62() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        let firstPoint = new paper.Point(30, 75);
+        path.add(firstPoint);
+        
+        // The point through which we will create the arc:
+        let throughPoint = new paper.Point(40, 40);
+        
+        // The point at which the arc will end:
+        let toPoint = new paper.Point(130, 75);
+        
+        // Draw an arc through 'throughPoint' to 'toPoint'
+        path.arcTo(throughPoint, toPoint);
+        
+        // Add a red circle shaped path at the position of 'throughPoint':
+        let circle = new paper.Path.Circle(throughPoint, 3);
+        circle.fillColor = 'red';
+    
+    }
+    function CompoundPath63() {
+        
+        let myPath: paper.Path | null;
+        function onMouseDrag(event:paper.ToolEvent) {
+            // If we created a path before, remove it:
+            if (myPath) {
+                myPath.remove();
+            }
+        
+            // Create a new path and add a segment point to it
+            // at {x: 150, y: 150):
+            myPath = new paper.Path();
+            myPath.add(new paper.Point(150, 150));
+        
+            // Draw an arc through the position of the mouse to 'toPoint'
+            let toPoint = new paper.Point(350, 150);
+            myPath.arcTo(event.point, toPoint);
+        
+            // Select the path, so we can see its segments:
+            myPath.selected = true;
+        }
+        
+        // When the mouse is released, deselect the path
+        // and fill it with black.
+        function onMouseUp(event:paper.ToolEvent) {
+            if(myPath){
+                myPath.selected = false;
+                myPath.fillColor = 'black';
+            }
+        }
+    
+    }
+    function CompoundPath64() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        path.add(new paper.Point(30, 75));
+        path.arcTo(new paper.Point(130, 75));
+        
+        let path2 = new paper.Path();
+        path2.strokeColor = 'red';
+        path2.add(new paper.Point(180, 25));
+        
+        // To draw an arc in anticlockwise direction,
+        // we pass `false` as the second argument to arcTo:
+        path2.arcTo(new paper.Point(280, 25), false);
+    
+    }
+    function CompoundPath65() {
+        
+        let myPath:paper.Path;
+        
+        // The mouse has to move at least 20 points before
+        // the next mouse drag event is fired:
+        paper.tool.minDistance = 20;
+        
+        // When the user clicks, create a new path and add
+        // the current mouse position to it as its first segment:
+        function onMouseDown(event:paper.ToolEvent) {
+            myPath = new paper.Path();
+            myPath.strokeColor = 'black';
+            myPath.add(event.point);
+        }
+        
+        // On each mouse drag event, draw an arc to the current
+        // position of the mouse:
+        function onMouseDrag(event:paper.ToolEvent) {
+            myPath.arcTo(event.point);
+        }
+    
+    }
+    function CompoundPath66() {
+        
+        let myPath: paper.Path | null;
+        function onMouseMove(event:paper.ToolEvent) {
+            // If we created a path before, remove it:
+            if (myPath) {
+                myPath.remove();
+            }
+        
+            // Create a new path and add a segment point to it
+            // at {x: 150, y: 150):
+            myPath = new paper.Path();
+            myPath.add(new paper.Point(150, 150));
+        
+            // Draw a curve through the position of the mouse to 'toPoint'
+            let toPoint = new paper.Point(350, 150);
+            myPath.curveTo(event.point, toPoint);
+        
+            // Select the path, so we can see its segments:
+            myPath.selected = true;
+        }
+    
+    }
+    function CompoundPath67() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        // Add a segment at {x: 50, y: 50}
+        path.add(new paper.Point(25, 25));
+        
+        // Add a segment relative to the last segment of the path.
+        // 50 in x direction and 0 in y direction, becomes {x: 75, y: 25}
+        path.lineBy(new paper.Point(50, 0));
+        
+        // 0 in x direction and 50 in y direction, becomes {x: 75, y: 75}
+        path.lineBy(new paper.Point(0, 50));
+    
+    }
+    function CompoundPath68() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        // Add the first segment at {x: 50, y: 50}
+        path.add(paper.view.center);
+        
+        // Loop 500 times:
+        for (let i = 0; i < 500; i++) {
+            // Create a vector with an ever increasing length
+            // and an angle in increments of 45 degrees
+            let vector = new paper.Point({
+                angle: i * 45,
+                length: i / 2
+            });
+            // Add the vector relatively to the last segment point:
+            path.lineBy(vector);
+        }
+        
+        // Smooth the handles of the path:
+        path.smooth();
+        
+        // Uncomment the following line and click on 'run' to see
+        // the construction of the path:
+        // path.selected = true;
+    
+    }
+    function Gradient0() {
+        
+        // Define two points which we will be using to construct
+        // the path and to position the gradient color:
+        let topLeft = paper.view.center.subtract(new paper.Point([80, 80]));
+        let bottomRight = paper.view.center.add(new paper.Point([80, 80]));
+        
+        // Create a rectangle shaped path between
+        // the topLeft and bottomRight points:
+        let path = new paper.Path.Rectangle({
+            topLeft: topLeft,
+            bottomRight: bottomRight,
+            // Fill the path with a gradient of three color stops
+            // that runs between the two points we defined earlier:
+            fillColor: {
+                gradient: {
+                    stops: ['yellow', 'red', 'blue']
+                },
+                origin: topLeft,
+                destination: bottomRight
+            }
+        });
+    
+    }
+    function Gradient1() {
+        
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: paper.view.bounds.height * 0.4
+        });
+        
+        // Fill the path with a radial gradient color with three stops:
+        // yellow from 0% to 5%, mix between red from 5% to 20%,
+        // mix between red and black from 20% to 100%:
+        path.fillColor = new paper.Color({
+            gradient: new paper.Gradient({
+                stops: [['yellow', 0.05], ['red', 0.2], ['black', 1]],
+                radial: true
+            }),
+            origin: path.position,
+            destination: path.bounds.rightCenter
+        });
+    
+    }
+    function GradientStop0() {
+        
+        // Create a circle shaped path at the center of the paper.view,
+        // using 40% of the height of the paper.view as its radius
+        // and fill it with a radial gradient color:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: paper.view.bounds.height * 0.4
+        });
+        
+        path.fillColor = new paper.Color({
+            gradient: new paper.Gradient({
+                stops: [['yellow', 0.05], ['red', 0.2], ['black', 1]],
+                radial: true
+            }),
+            origin: path.position,
+            destination: path.bounds.rightCenter
+        });
+        
+        let gradient = path.fillColor.gradient;
+        
+        // This function is called each frame of the animation:
+        function onFrame(event:paper.IFrameEvent) {
+            if(gradient){
+                let blackStop = gradient.stops[2];
+                // Animate the offset between 0.7 and 0.9:
+                blackStop.offset = Math.sin(event.time * 5) * 0.1 + 0.8;
+            
+                // Animate the offset between 0.2 and 0.4
+                let redStop = gradient.stops[1];
+                redStop.offset = Math.sin(event.time * 3) * 0.1 + 0.3;
+            }
+        }
+    
+    }
+    function GradientStop1() {
+        
+        // Create a circle shaped path at the center of the paper.view,
+        // using 40% of the height of the paper.view as its radius
+        // and fill it with a radial gradient color:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: paper.view.bounds.height * 0.4
+        });
+        
+        path.fillColor = new paper.Color({
+            gradient: new paper.Gradient({
+                stops: [['yellow', 0.05], ['red', 0.2], ['black', 1]],
+                radial: true
+            }),
+            origin: path.position,
+            destination: path.bounds.rightCenter
+        });
+        
+        let redStop:paper.GradientStop;
+        let blackStop:paper.GradientStop;
+        if(path.fillColor.gradient){
+            redStop = path.fillColor.gradient.stops[1];
+            blackStop = path.fillColor.gradient.stops[2];
+        }
+        
+        // This function is called each frame of the animation:
+        function onFrame(event:paper.IFrameEvent) {
+            // Animate the offset between 0.7 and 0.9:
+            blackStop.offset = Math.sin(event.time * 5) * 0.1 + 0.8;
+        
+            // Animate the offset between 0.2 and 0.4
+            redStop.offset = Math.sin(event.time * 3) * 0.1 + 0.3;
+        }
+    
+    }
+    function Group0() {
+        
+        let path = new paper.Path([new paper.Point([100, 100]), new paper.Point([100, 200])]);
+        let path2 = new paper.Path([new paper.Point([50, 150]), new paper.Point([150, 150])]);
+        
+        // Create a group from the two paths:
+        let group = new paper.Group([path, path2]);
+        
+        // Set the stroke color of all items in the group:
+        group.strokeColor = 'black';
+        
+        // Move the group to the center of the paper.view:
+        group.position = paper.view.center;
+    
+    }
+    function Group1() {
+        
+        let group = new paper.Group();
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a new circle shaped path at the position
+            // of the mouse:
+            let path = new paper.Path.Circle(event.point, 5);
+            path.fillColor = 'black';
+        
+            // Add the path to the group's children list:
+            group.addChild(path);
+        }
+        
+        function onFrame(event:paper.IFrameEvent) {
+            // Rotate the group by 1 degree from
+            // the centerpoint of the paper.view:
+            group.rotate(1, paper.view.center);
+        }
+    
+    }
+    function Group2() {
+        
+        let path = new paper.Path([new paper.Point([100, 100]), new paper.Point([100, 200])]);
+        let path2 = new paper.Path([new paper.Point([50, 150]), new paper.Point([150, 150])]);
+        
+        // Create a group from the two paths:
+        let group = new paper.Group({
+            children: [path, path2],
+            // Set the stroke color of all items in the group:
+            strokeColor: 'black',
+            // Move the group to the center of the paper.view:
+            position: paper.view.center
+        });
+    
+    }
+    function Group3() {
+        
+        let star = new paper.Path.Star({
+            center: paper.view.center,
+            points: 6,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'red'
+        });
+        
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            strokeColor: 'black'
+        });
+        
+        // Create a group of the two items and clip it:
+        let group = new paper.Group([circle, star]);
+        group.clipped = true;
+        
+        // Lets animate the circle:
+        function onFrame(event:paper.IFrameEvent) {
+            let offset = Math.sin(event.count / 30) * 30;
+            circle.position.x = paper.view.center.x + offset;
+        }
+    
+    }
+    function Group4() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function Group5() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function Group6() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function Group7() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function Group8() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function Group9() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function Group10() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function Group11() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function Group12() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function Group13() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function Group14() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function Group15() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function Group16() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function Group17() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Group18() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Group19() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Group20() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Group21() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Group22() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Group23() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function Group24() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function Group25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Group26() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Group27() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function Group28() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Group29() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Group30() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Group31() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Group32() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Group33() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function Group34() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function Group35() {
+        
+        function enter(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function Group36() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Group37() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function Group38() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function Group39() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function Group40() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Group41() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function Group42() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function Group43() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function Group44() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function Group45() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function Group46() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function Group47() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function Group48() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function Group49() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function Group50() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function Group51() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function Group52() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function Group53() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function Group54() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function Group55() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function Group56() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Item0() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function Item1() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function Item2() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function Item3() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function Item4() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function Item5() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function Item6() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function Item7() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function Item8() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function Item9() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function Item10() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function Item11() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function Item12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function Item13() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Item14() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Item15() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Item16() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Item17() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Item18() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Item19() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function Item20() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function Item21() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Item22() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Item23() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function Item24() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Item25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Item26() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Item27() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Item28() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Item29() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function Item30() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function Item31() {
+        
+        function enter(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function Item32() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Item33() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function Item34() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function Item35() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function Item36() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Item37() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function Item38() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function Item39() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function Item40() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function Item41() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function Item42() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function Item43() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function Item44() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function Item45() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function Item46() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function Item47() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function Item48() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function Item49() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function Item50() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function Item51() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function Item52() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Layer0() {
+        
+        let path = new paper.Path([[100, 100], [100, 200]]);
+        let path2 = new paper.Path([[50, 150], [150, 150]]);
+        
+        // Create a layer. The properties in the object literal
+        // are set on the newly created layer.
+        let layer = new paper.Layer({
+            children: [path, path2],
+            strokeColor: 'black',
+            position: paper.view.center
+        });
+    
+    }
+    function Layer1() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function Layer2() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function Layer3() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function Layer4() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function Layer5() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function Layer6() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function Layer7() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function Layer8() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function Layer9() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function Layer10() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function Layer11() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function Layer12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function Layer13() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function Layer14() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Layer15() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Layer16() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Layer17() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Layer18() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Layer19() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Layer20() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function Layer21() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function Layer22() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Layer23() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Layer24() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function Layer25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Layer26() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Layer27() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Layer28() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Layer29() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Layer30() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function Layer31() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function Layer32() {
+        
+        function enter(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function Layer33() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Layer34() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function Layer35() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function Layer36() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function Layer37() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Layer38() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function Layer39() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function Layer40() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function Layer41() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function Layer42() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function Layer43() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function Layer44() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function Layer45() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function Layer46() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function Layer47() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function Layer48() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function Layer49() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function Layer50() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function Layer51() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function Layer52() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function Layer53() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Layer54() {
+        
+        let star = new paper.Path.Star({
+            center: paper.view.center,
+            points: 6,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'red'
+        });
+        
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            strokeColor: 'black'
+        });
+        
+        // Create a group of the two items and clip it:
+        let group = new paper.Group([circle, star]);
+        group.clipped = true;
+        
+        // Lets animate the circle:
+        function onFrame(event:paper.IFrameEvent) {
+            let offset = Math.sin(event.count / 30) * 30;
+            circle.position.x = paper.view.center.x + offset;
+        }
+    
+    }
+    function Path0() {
+        
+        let path = new paper.Path({
+            segments: [[20, 20], [80, 80], [140, 20]],
+            fillColor: 'black',
+            closed: true
+        });
+    
+    }
+    function Path1() {
+        
+        let path = new paper.Path({
+            segments: [[20, 20], [80, 80], [140, 20]],
+            strokeColor: 'red',
+            strokeWidth: 20,
+            strokeCap: 'round',
+            selected: true
+        });
+    
+    }
+    function Path2() {
+        
+        let pathData = 'M100,50c0,27.614-22.386,50-50,50S0,77.614,0,50S22.386,0,50,0S100,22.386,100,50';
+        let path = new paper.Path(pathData);
+        path.fillColor = 'red';
+    
+    }
+    function Path3() {
+        
+        let from = new paper.Point(20, 20);
+        let to = new paper.Point(80, 80);
+        let path = new paper.Path.Line(from, to);
+        path.strokeColor = 'black';
+    
+    }
+    function Path4() {
+        
+        let path = new paper.Path.Line({
+            from: [20, 20],
+            to: [80, 80],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path5() {
+        
+        let path = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        path.strokeColor = 'black';
+    
+    }
+    function Path6() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path7() {
+        
+        let rectangle = new paper.Rectangle(new paper.Point(20, 20), new paper.Size(60, 60));
+        let path = new paper.Path.Rectangle(rectangle);
+        path.strokeColor = 'black';
+    
+    }
+    function Path8() {
+        
+        let rectangle = new paper.Rectangle(new paper.Point(20, 20), new paper.Size(60, 60));
+        let cornerSize = new paper.Size(10, 10);
+        let path = new paper.Path.Rectangle(rectangle, cornerSize.height);
+        path.strokeColor = 'black';
+    
+    }
+    function Path9() {
+        
+        let point = new paper.Point(20, 20);
+        let size = new paper.Size(60, 60);
+        let path = new paper.Path.Rectangle(point, size);
+        path.strokeColor = 'black';
+    
+    }
+    function Path10() {
+        
+        let from = new paper.Point(20, 20);
+        let to = new paper.Point(80, 80);
+        let path = new paper.Path.Rectangle(from, to);
+        path.strokeColor = 'black';
+    
+    }
+    function Path11() {
+        
+        let path = new paper.Path.Rectangle({
+            point: [20, 20],
+            size: [60, 60],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path12() {
+        
+        let path = new paper.Path.Rectangle({
+            from: [20, 20],
+            to: [80, 80],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path13() {
+        
+        let path = new paper.Path.Rectangle({
+            rectangle: {
+                topLeft: [20, 20],
+                bottomRight: [80, 80]
+            },
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path14() {
+        
+        let path = new paper.Path.Rectangle({
+         topLeft: [20, 20],
+            bottomRight: [80, 80],
+            radius: 10,
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path15() {
+        
+        let rectangle = new paper.Rectangle(new paper.Point(20, 20), new paper.Size(180, 60));
+        let path = new paper.Path.Ellipse(rectangle);
+        path.fillColor = 'black';
+    
+    }
+    function Path16() {
+        
+        let path = new paper.Path.Ellipse({
+            point: [20, 20],
+            size: [180, 60],
+            fillColor: 'black'
+        });
+    
+    }
+    function Path17() {
+        
+        let shape = new paper.Path.Ellipse({
+            center: [110, 50],
+            radius: [90, 30],
+            fillColor: 'black'
+        });
+    
+    }
+    function Path18() {
+        
+        let from = new paper.Point(20, 20);
+        let through = new paper.Point(60, 20);
+        let to = new paper.Point(80, 80);
+        let path = new paper.Path.Arc(from, through, to);
+        path.strokeColor = 'black';
+    
+    }
+    function Path19() {
+        
+        let path = new paper.Path.Arc({
+            from: [20, 20],
+            through: [60, 20],
+            to: [80, 80],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Path20() {
+        
+        let center = new paper.Point(50, 50);
+        let sides = 3;
+        let radius = 40;
+        let triangle = new paper.Path.RegularPolygon(center, sides, radius);
+        triangle.fillColor = 'black';
+    
+    }
+    function Path21() {
+        
+        let triangle = new paper.Path.RegularPolygon({
+            center: [50, 50],
+            sides: 10,
+            radius: 40,
+            fillColor: 'black'
+        });
+    
+    }
+    function Path22() {
+        
+        let center = new paper.Point(50, 50);
+        let points = 12;
+        let radius1 = 25;
+        let radius2 = 40;
+        let path = new paper.Path.Star(center, points, radius1, radius2);
+        path.fillColor = 'black';
+    
+    }
+    function Path23() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 25,
+            radius2: 40,
+            fillColor: 'black'
+        });
+    
+    }
+    function Path24() {
+        
+        let myPath = new paper.Path();
+        myPath.strokeColor = 'black';
+        myPath.add(new paper.Point(50, 75));
+        myPath.add(new paper.Point(100, 25));
+        myPath.add(new paper.Point(150, 75));
+        
+        // Close the path:
+        myPath.closed = true;
+    
+    }
+    function Path25() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.fullySelected = true;
+        
+        let path2 = new paper.Path.Circle({
+            center: [180, 50],
+            radius: 35
+        });
+        
+        // Deselect the second segment of the second path:
+        path2.segments[1].selected = false;
+        
+        // If the path is fully selected (which it is),
+        // set its fill color to red:
+        if (path.fullySelected) {
+            path.fillColor = 'red';
+        }
+        
+        // If the second path is fully selected (which it isn't, since we just
+        // deselected its second segment),
+        // set its fill color to red:
+        if (path2.fullySelected) {
+            path2.fillColor = 'red';
+        }
+    
+    }
+    function Path26() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        // Add a segment at {x: 30, y: 75}
+        path.add(new paper.Point(30, 75));
+        
+        // Add two segments in one go at {x: 100, y: 20}
+        // and {x: 170, y: 75}:
+        path.addSegments([new paper.Point(100, 20), new paper.Point(170, 75)]);
+    
+    }
+    function Path27() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        // Add a segment at {x: 30, y: 75}
+        path.add([30, 75]);
+        
+        // Add two segments in one go at {x: 100, y: 20}
+        // and {x: 170, y: 75}:
+        path.addSegments([[100, 20], [170, 75]]);
+    
+    }
+    function Path28() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        // Add a segment at {x: 30, y: 75}
+        path.add(new paper.Point({x: 30, y: 75}));
+        
+        // Add two segments in one go at {x: 100, y: 20}
+        // and {x: 170, y: 75}:
+        path.addSegments([new paper.Point({x: 100, y: 20}), new paper.Point({x: 170, y: 75})]);
+    
+    }
+    function Path29() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(30, 75));
+        
+        // Add a segment with handles:
+        let point = new paper.Point(100, 20);
+        let handleIn = new paper.Point(-50, 0);
+        let handleOut = new paper.Point(50, 0);
+        let added = path.add(new paper.Segment(point, handleIn, handleOut));
+        
+        // Select the added segment, so we can see its handles:
+        added.selected = true;
+        
+        path.add(new paper.Point(170, 75));
+    
+    }
+    function Path30() {
+        
+        let myPath = new paper.Path();
+        myPath.strokeColor = 'black';
+        myPath.add(new paper.Point(50, 75));
+        myPath.add(new paper.Point(150, 75));
+        
+        // Insert a new segment into myPath at index 1:
+        myPath.insert(1, new paper.Point(100, 25));
+        
+        // Select the segment which we just inserted:
+        myPath.segments[1].selected = true;
+    
+    }
+    function Path31() {
+        
+        let myPath = new paper.Path();
+        myPath.strokeColor = 'black';
+        myPath.add(new paper.Point(50, 75));
+        myPath.add(new paper.Point(150, 75));
+        
+        // Insert two segments into myPath at index 1:
+        myPath.insertSegments(1, [[80, 25], [120, 25]]);
+        
+        // Select the segments which we just inserted:
+        myPath.segments[1].selected = true;
+        myPath.segments[2].selected = true;
+    
+    }
+    function Path32() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        let points = [new paper.Point(30, 50), new paper.Point(170, 50)];
+        path.addSegments(points);
+    
+    }
+    function Path33() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        let array = [[30, 75], [100, 20], [170, 75]];
+        path.addSegments(array);
+    
+    }
+    function Path34() {
+        
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        path.addSegments([[30, 75], [100, 20], [170, 75]]);
+        
+        let path2 = new paper.Path();
+        path2.strokeColor = 'red';
+        
+        // Add the second and third segments of path to path2:
+        path2.addSegments([path.segments[1], path.segments[2]]);
+        
+        // Move path2 30pt to the right:
+        path2.position.x += 30;
+    
+    }
+    function Path35() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let path = new paper.Path.Circle({
+            center: new paper.Point(80, 50),
+            radius: 35,
+            strokeColor: 'black'
+        });
+        
+        // Remove its second segment:
+        path.removeSegment(1);
+        
+        // Select the path, so we can see its segments:
+        path.selected = true;
+    
+    }
+    function Path36() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let path = new paper.Path.Circle({
+            center: new paper.Point(80, 50),
+            radius: 35,
+            strokeColor: 'black'
+        });
+        
+        // Remove the segments from index 1 till index 2:
+        path.removeSegments(1, 2);
+        
+        // Select the path, so we can see its segments:
+        path.selected = true;
+    
+    }
+    function Path37() {
+        
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 40,
+            strokeColor: 'black'
+        });
+        
+        let pointOnCircle = paper.view.center.add(new paper.Point({
+            length: 40,
+            angle: 30
+        }));
+        
+        let location = path.getNearestLocation(pointOnCircle);
+        
+        path.split(location);
+        path.lastSegment.selected = true;
+    
+    }
+    function Path38() {
+        
+        let path = new paper.Path([[20, 20], [50, 80], [80, 20]]);
+        path.strokeColor = 'black';
+        
+        // Split the path half-way:
+        let path2 = path.split(path.length / 2);
+        
+        // Give the resulting path a red stroke-color
+        // and move it 20px to the right:
+        path2.strokeColor = 'red';
+        path2.position.x += 20;
+    
+    }
+    function Path39() {
+        
+        let path = new paper.Path.Rectangle({
+            from: [20, 20],
+            to: [80, 80],
+            strokeColor: 'black'
+        });
+        
+        // Split the path half-way:
+        path.split(path.length / 2);
+        
+        // Move the first segment, to show where the path
+        // was split:
+        path.firstSegment.point.x += 20;
+        
+        // Select the first segment:
+        path.firstSegment.selected = true;
+    
+    }
+    function Path40() {
+        
+        let path = new paper.Path({
+            segments: [[30, 25], [30, 75]],
+            strokeColor: 'black'
+        });
+        
+        let path2 = new paper.Path({
+            segments: [[200, 25], [200, 75]],
+            strokeColor: 'black'
+        });
+        
+        // Join the paths:
+        path.join(path2);
+    
+    }
+    function Path41() {
+        
+        let path = new paper.Path({
+            segments: [[30, 25], [30, 75]],
+            strokeColor: 'black'
+        });
+        
+        let path2 = new paper.Path({
+            segments: [[30, 25], [80, 25]],
+            strokeColor: 'black'
+        });
+        
+        // Join the paths:
+        path.join(path2);
+        
+        // After joining, path with have 3 segments, since it
+        // shared its first segment point with the first
+        // segment point of path2.
+        
+        // Select the path to show that they have joined:
+        path.selected = true;
+    
+    }
+    function Path42() {
+        
+        let path = new paper.Path({
+            segments: [[30, 25], [80, 25], [80, 75]],
+            strokeColor: 'black'
+        });
+        
+        let path2 = new paper.Path({
+            segments: [[30, 25], [30, 75], [80, 75]],
+            strokeColor: 'black'
+        });
+        
+        // Join the paths:
+        path.join(path2);
+        
+        // Because the paths were joined at two points, the path is closed
+        // and has 4 segments.
+        
+        // Select the path to show that they have joined:
+        path.selected = true;
+    
+    }
+    function Path43() {
+        
+        // Create an arc shaped path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(40, 100));
+        path.arcTo(new paper.Point(150, 100));
+        
+        // We're going to be working with a third of the length
+        // of the path as the offset:
+        let offset = path.length / 3;
+        
+        // Find the point on the path:
+        let point = path.getPointAt(offset);
+        
+        // Create a small circle shaped path at the point:
+        let circle = new paper.Path.Circle({
+            center: point,
+            radius: 3,
+            fillColor: 'red'
+        });
+    
+    }
+    function Path44() {
+        
+        // Create an arc shaped path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(40, 100));
+        path.arcTo(new paper.Point(150, 100));
+        
+        let amount = 5;
+        let length = path.length;
+        for (let i = 0; i < amount + 1; i++) {
+            let offset = i / amount * length;
+        
+            // Find the point on the path at the given offset:
+            let point = path.getPointAt(offset);
+        
+            // Create a small circle shaped path at the point:
+            let circle = new paper.Path.Circle({
+                center: point,
+                radius: 3,
+                fillColor: 'red'
+            });
+        }
+    
+    }
+    function Path45() {
+        
+        // Create an arc shaped path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(40, 100));
+        path.arcTo(new paper.Point(150, 100));
+        
+        // We're going to be working with a third of the length
+        // of the path as the offset:
+        let offset = path.length / 3;
+        
+        // Find the point on the path:
+        let point = path.getPointAt(offset);
+        
+        // Find the tangent vector at the given offset
+        // and give it a length of 60:
+        let tangent = path.getTangentAt(offset).multiply(60);
+        
+        let line = new paper.Path({
+            segments: [point, point.add(tangent)],
+            strokeColor: 'red'
+        })
+    
+    }
+    function Path46() {
+        
+        // Create an arc shaped path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(40, 100));
+        path.arcTo(new paper.Point(150, 100));
+        
+        let amount = 6;
+        let length = path.length;
+        for (let i = 0; i < amount + 1; i++) {
+            let offset = i / amount * length;
+        
+            // Find the point on the path at the given offset:
+            let point = path.getPointAt(offset);
+        
+            // Find the tangent vector on the path at the given offset
+            // and give it a length of 60:
+            let tangent = path.getTangentAt(offset).multiply(60);
+        
+            let line = new paper.Path({
+                segments: [point, point.add(tangent)],
+                strokeColor: 'red'
+            })
+        }
+    
+    }
+    function Path47() {
+        
+        // Create an arc shaped path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(40, 100));
+        path.arcTo(new paper.Point(150, 100));
+        
+        // We're going to be working with a third of the length
+        // of the path as the offset:
+        let offset = path.length / 3;
+        
+        // Find the point on the path:
+        let point = path.getPointAt(offset);
+        
+        // Find the normal vector on the path at the given offset
+        // and give it a length of 30:
+        let normal = path.getNormalAt(offset).multiply(30);
+        
+        let line = new paper.Path({
+            segments: [point, point.add(normal)],
+            strokeColor: 'red'
+        });
+    
+    }
+    function Path48() {
+        
+        // Create an arc shaped path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        path.add(new paper.Point(40, 100));
+        path.arcTo(new paper.Point(150, 100));
+        
+        let amount = 10;
+        let length = path.length;
+        for (let i = 0; i < amount + 1; i++) {
+            let offset = i / amount * length;
+        
+            // Find the point on the path at the given offset:
+            let point = path.getPointAt(offset);
+        
+            // Find the normal vector on the path at the given offset
+            // and give it a length of 30:
+            let normal = path.getNormalAt(offset).multiply(30);
+        
+            let line = new paper.Path({
+                segments: [point, point.add(normal)],
+                strokeColor: 'red'
+            });
+        }
+    
+    }
+    function Path49() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function Path50() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function Path51() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function Path52() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function Path53() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function Path54() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function Path55() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function Path56() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function Path57() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function Path58() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function Path59() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function Path60() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function Path61() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function Path62() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Path63() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Path64() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Path65() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Path66() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Path67() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Path68() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function Path69() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function Path70() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Path71() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Path72() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function Path73() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Path74() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Path75() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Path76() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Path77() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Path78() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function Path79() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function Path80() {
+        
+        function enter(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function Path81() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Path82() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function Path83() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function Path84() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function Path85() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Path86() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function Path87() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function Path88() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function Path89() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function Path90() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function Path91() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function Path92() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function Path93() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function Path94() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function Path95() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function Path96() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function Path97() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function Path98() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function Path99() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function Path100() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function Path101() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Path102() {
+        
+        let path = new paper.Path.Rectangle(new paper.Point(30, 25), new paper.Size(50, 50));
+        path.strokeColor = 'black';
+        
+        let secondPath = path.clone();
+        let intersectionGroup = new paper.Group();
+        
+        function onFrame(event:paper.IFrameEvent) {
+            secondPath.rotate(1);
+        
+            let intersections = path.getIntersections(secondPath);
+            intersectionGroup.removeChildren();
+        
+            for (let i = 0; i < intersections.length; i++) {
+                let intersectionPath = new paper.Path.Circle({
+                    center: intersections[i].point,
+                    radius: 4,
+                    fillColor: 'red',
+                    parent: intersectionGroup
+                });
+            }
+        }
+    
+    }
+    function Path103() {
+        
+        let star = new paper.Path.Star({
+            center: paper.view.center,
+            points: 10,
+            radius1: 30,
+            radius2: 60,
+            strokeColor: 'black'
+        });
+        
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 3,
+            fillColor: 'red'
+        });
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Get the nearest point from the mouse position
+            // to the star shaped path:
+            let nearestPoint = star.getNearestPoint(event.point);
+        
+            // Move the red circle to the nearest point:
+            circle.position = nearestPoint;
+        }
+    
+    }
+    function Path104() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Select the path, so we can inspect its segments:
+        path.selected = true;
+        
+        // Create a copy of the path and move it by 150 points:
+        let copy = path.clone();
+        copy.position.x += 150;
+        
+        // Flatten the copied path, with a maximum error of 4 points:
+        copy.flatten(4);
+    
+    }
+    function Path105() {
+        
+        // Create a rectangular path with its top-left point at
+        // {x: 30, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [30, 25],
+            size: [50, 50],
+            strokeColor: 'black',
+        });
+        
+        // Select the path, so we can see its handles:
+        path.fullySelected = true;
+        
+        // Create a copy of the path and move it 100 to the right:
+        let copy = path.clone();
+        copy.position.x += 100;
+        
+        // Smooth the segments of the copy:
+        copy.smooth({ type: 'continuous' });
+    
+    }
+    function Path106() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        path.add(new paper.Point(30, 50));
+        
+        let y = 5;
+        let x = 3;
+        
+        for (let i = 0; i < 28; i++) {
+            y *= -1.1;
+            x *= 1.1;
+            path.lineBy(new paper.Point(x, y));
+        }
+        
+        // Create a copy of the path and move it 100 down:
+        let copy = path.clone();
+        copy.position.y += 120;
+        
+        // Select the path, so we can see its handles:
+        copy.fullySelected = true;
+        
+        // Smooth the path using centripetal Catmull-Rom splines:
+        copy.smooth({ type: 'catmull-rom', factor: 0.5 });
+    
+    }
+    function Path107() {
+        
+        // Create 5 rectangles, next to each other:
+        let paths:paper.Path[] = [];
+        for (let i = 0; i < 5; i++) {
+            paths.push(new paper.Path.Rectangle({
+                point: [30 + i * 100, 30],
+                size: [50, 50],
+                fullySelected: true
+            }));
+        }
+        // Smooth a range, using segments:
+        paths[1].smooth({
+            type: 'continuous',
+            from: paths[1].segments[0],
+            to: paths[1].segments[2]
+        });
+        
+        // Smooth a range, using curves:
+        paths[2].smooth({
+            type: 'continuous',
+            from: paths[2].curves[0],
+            to: paths[2].curves[1]
+        });
+        
+        // Smooth a range, using indices:
+        paths[3].smooth({ type: 'continuous', from: 0, to: 2 });
+        
+        // Smooth a range, using negative indices:
+        paths[4].smooth({ type: 'continuous', from: -1, to: 1 });
+    
+    }
+    function Path108() {
+        
+        let path: paper.Path | null;
+        function onMouseDown(event:paper.ToolEvent) {
+            // If we already made a path before, deselect it:
+            if (path) {
+                path.selected = false;
+            }
+        
+            // Create a new path and add the position of the mouse
+            // as its first segment. Select it, so we can see the
+            // segment points:
+            path = new paper.Path({
+                segments: [event.point],
+                strokeColor: 'black',
+                selected: true
+            });
+        }
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // On every drag event, add a segment to the path
+            // at the position of the mouse:
+            if(path)
+                path.add(event.point);
+        }
+        
+        function onMouseUp(event:paper.ToolEvent) {
+            // When the mouse is released, simplify the path:
+            if(path){
+                path.simplify();
+                path.selected = true;
+            }
+        }
+    
+    }
+    function Path109() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        let firstPoint = new paper.Point(30, 75);
+        path.add(firstPoint);
+        
+        // The point through which we will create the arc:
+        let throughPoint = new paper.Point(40, 40);
+        
+        // The point at which the arc will end:
+        let toPoint = new paper.Point(130, 75);
+        
+        // Draw an arc through 'throughPoint' to 'toPoint'
+        path.arcTo(throughPoint, toPoint);
+        
+        // Add a red circle shaped path at the position of 'throughPoint':
+        let circle = new paper.Path.Circle(throughPoint, 3);
+        circle.fillColor = 'red';
+    
+    }
+    function Path110() {
+        
+        let myPath:paper.Path | null;
+        function onMouseDrag(event:paper.ToolEvent) {
+            // If we created a path before, remove it:
+            if (myPath) {
+                myPath.remove();
+            }
+        
+            // Create a new path and add a segment point to it
+            // at {x: 150, y: 150):
+            myPath = new paper.Path();
+            myPath.add(new paper.Point(150, 150));
+        
+            // Draw an arc through the position of the mouse to 'toPoint'
+            let toPoint = new paper.Point(350, 150);
+            myPath.arcTo(event.point, toPoint);
+        
+            // Select the path, so we can see its segments:
+            myPath.selected = true;
+        }
+        
+        // When the mouse is released, deselect the path
+        // and fill it with black.
+        function onMouseUp(event:paper.ToolEvent) {
+            if(myPath){
+                myPath.selected = false;
+                myPath.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Path111() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        path.add(new paper.Point(30, 75));
+        path.arcTo(new paper.Point(130, 75));
+        
+        let path2 = new paper.Path();
+        path2.strokeColor = 'red';
+        path2.add(new paper.Point(180, 25));
+        
+        // To draw an arc in anticlockwise direction,
+        // we pass `false` as the second argument to arcTo:
+        path2.arcTo(new paper.Point(280, 25), false);
+    
+    }
+    function Path112() {
+        
+        let myPath:paper.Path;
+        
+        // The mouse has to move at least 20 points before
+        // the next mouse drag event is fired:
+        paper.tool.minDistance = 20;
+        
+        // When the user clicks, create a new path and add
+        // the current mouse position to it as its first segment:
+        function onMouseDown(event:paper.ToolEvent) {
+            myPath = new paper.Path();
+            myPath.strokeColor = 'black';
+            myPath.add(event.point);
+        }
+        
+        // On each mouse drag event, draw an arc to the current
+        // position of the mouse:
+        function onMouseDrag(event:paper.ToolEvent) {
+            myPath.arcTo(event.point);
+        }
+    
+    }
+    function Path113() {
+        
+        let myPath: paper.Path | null;
+        function onMouseMove(event:paper.ToolEvent) {
+            // If we created a path before, remove it:
+            if (myPath) {
+                myPath.remove();
+            }
+        
+            // Create a new path and add a segment point to it
+            // at {x: 150, y: 150):
+            myPath = new paper.Path();
+            myPath.add(new paper.Point(150, 150));
+        
+            // Draw a curve through the position of the mouse to 'toPoint'
+            let toPoint = new paper.Point(350, 150);
+            myPath.curveTo(event.point, toPoint);
+        
+            // Select the path, so we can see its segments:
+            myPath.selected = true;
+        }
+    
+    }
+    function Path114() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        // Add a segment at {x: 50, y: 50}
+        path.add(new paper.Point(25, 25));
+        
+        // Add a segment relative to the last segment of the path.
+        // 50 in x direction and 0 in y direction, becomes {x: 75, y: 25}
+        path.lineBy(new paper.Point(50, 0));
+        
+        // 0 in x direction and 50 in y direction, becomes {x: 75, y: 75}
+        path.lineBy(new paper.Point(0, 50));
+    
+    }
+    function Path115() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        // Add the first segment at {x: 50, y: 50}
+        path.add(paper.view.center);
+        
+        // Loop 500 times:
+        for (let i = 0; i < 500; i++) {
+            // Create a vector with an ever increasing length
+            // and an angle in increments of 45 degrees
+            let vector = new paper.Point({
+                angle: i * 45,
+                length: i / 2
+            });
+            // Add the vector relatively to the last segment point:
+            path.lineBy(vector);
+        }
+        
+        // Smooth the handles of the path:
+        path.smooth();
+        
+        // Uncomment the following line and click on 'run' to see
+        // the construction of the path:
+        // path.selected = true;
+    
+    }
+    function PathItem0() {
+        
+        let path = new paper.Path.Rectangle(new paper.Point(30, 25), new paper.Size(50, 50));
+        path.strokeColor = 'black';
+        
+        let secondPath = path.clone();
+        let intersectionGroup = new paper.Group();
+        
+        function onFrame(event:paper.IFrameEvent) {
+            secondPath.rotate(1);
+        
+            let intersections = path.getIntersections(secondPath);
+            intersectionGroup.removeChildren();
+        
+            for (let i = 0; i < intersections.length; i++) {
+                let intersectionPath = new paper.Path.Circle({
+                    center: intersections[i].point,
+                    radius: 4,
+                    fillColor: 'red',
+                    parent: intersectionGroup
+                });
+            }
+        }
+    
+    }
+    function PathItem1() {
+        
+        let star = new paper.Path.Star({
+            center: paper.view.center,
+            points: 10,
+            radius1: 30,
+            radius2: 60,
+            strokeColor: 'black'
+        });
+        
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 3,
+            fillColor: 'red'
+        });
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Get the nearest point from the mouse position
+            // to the star shaped path:
+            let nearestPoint = star.getNearestPoint(event.point);
+        
+            // Move the red circle to the nearest point:
+            circle.position = nearestPoint;
+        }
+    
+    }
+    function PathItem2() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Select the path, so we can inspect its segments:
+        path.selected = true;
+        
+        // Create a copy of the path and move it by 150 points:
+        let copy = path.clone();
+        copy.position.x += 150;
+        
+        // Flatten the copied path, with a maximum error of 4 points:
+        copy.flatten(4);
+    
+    }
+    function PathItem3() {
+        
+        // Create a rectangular path with its top-left point at
+        // {x: 30, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [30, 25],
+            size: [50, 50],
+            strokeColor: 'black',
+        });
+        
+        // Select the path, so we can see its handles:
+        path.fullySelected = true;
+        
+        // Create a copy of the path and move it 100 to the right:
+        let copy = path.clone();
+        copy.position.x += 100;
+        
+        // Smooth the segments of the copy:
+        copy.smooth({ type: 'continuous' });
+    
+    }
+    function PathItem4() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        path.add(new paper.Point(30, 50));
+        
+        let y = 5;
+        let x = 3;
+        
+        for (let i = 0; i < 28; i++) {
+            y *= -1.1;
+            x *= 1.1;
+            path.lineBy(new paper.Point(x, y));
+        }
+        
+        // Create a copy of the path and move it 100 down:
+        let copy = path.clone();
+        copy.position.y += 120;
+        
+        // Select the path, so we can see its handles:
+        copy.fullySelected = true;
+        
+        // Smooth the path using centripetal Catmull-Rom splines:
+        copy.smooth({ type: 'catmull-rom', factor: 0.5 });
+    
+    }
+    function PathItem5() {
+        
+        // Create 5 rectangles, next to each other:
+        let paths:paper.Path[] = [];
+        for (let i = 0; i < 5; i++) {
+            paths.push(new paper.Path.Rectangle({
+                point: [30 + i * 100, 30],
+                size: [50, 50],
+                fullySelected: true
+            }));
+        }
+        // Smooth a range, using segments:
+        paths[1].smooth({
+            type: 'continuous',
+            from: paths[1].segments[0],
+            to: paths[1].segments[2]
+        });
+        
+        // Smooth a range, using curves:
+        paths[2].smooth({
+            type: 'continuous',
+            from: paths[2].curves[0],
+            to: paths[2].curves[1]
+        });
+        
+        // Smooth a range, using indices:
+        paths[3].smooth({ type: 'continuous', from: 0, to: 2 });
+        
+        // Smooth a range, using negative indices:
+        paths[4].smooth({ type: 'continuous', from: -1, to: 1 });
+    
+    }
+    function PathItem6() {
+        
+        let path:paper.Path | null;
+        function onMouseDown(event:paper.ToolEvent) {
+            // If we already made a path before, deselect it:
+            if (path) {
+                path.selected = false;
+            }
+        
+            // Create a new path and add the position of the mouse
+            // as its first segment. Select it, so we can see the
+            // segment points:
+            path = new paper.Path({
+                segments: [event.point],
+                strokeColor: 'black',
+                selected: true
+            });
+        }
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // On every drag event, add a segment to the path
+            // at the position of the mouse:
+            if(path)
+                path.add(event.point);
+        }
+        
+        function onMouseUp(event:paper.ToolEvent) {
+            // When the mouse is released, simplify the path:
+            if(path){
+                path.simplify();
+                path.selected = true;
+            }
+        }
+    
+    }
+    function PathItem7() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        let firstPoint = new paper.Point(30, 75);
+        path.add(firstPoint);
+        
+        // The point through which we will create the arc:
+        let throughPoint = new paper.Point(40, 40);
+        
+        // The point at which the arc will end:
+        let toPoint = new paper.Point(130, 75);
+        
+        // Draw an arc through 'throughPoint' to 'toPoint'
+        path.arcTo(throughPoint, toPoint);
+        
+        // Add a red circle shaped path at the position of 'throughPoint':
+        let circle = new paper.Path.Circle(throughPoint, 3);
+        circle.fillColor = 'red';
+    
+    }
+    function PathItem8() {
+        
+        let myPath: paper.Path | null;
+        function onMouseDrag(event:paper.ToolEvent) {
+            // If we created a path before, remove it:
+            if (myPath) {
+                myPath.remove();
+            }
+        
+            // Create a new path and add a segment point to it
+            // at {x: 150, y: 150):
+            myPath = new paper.Path();
+            myPath.add(new paper.Point(150, 150));
+        
+            // Draw an arc through the position of the mouse to 'toPoint'
+            let toPoint = new paper.Point(350, 150);
+            myPath.arcTo(event.point, toPoint);
+        
+            // Select the path, so we can see its segments:
+            myPath.selected = true;
+        }
+        
+        // When the mouse is released, deselect the path
+        // and fill it with black.
+        function onMouseUp(event:paper.ToolEvent) {
+            if(myPath){
+                myPath.selected = false;
+                myPath.fillColor = 'black';
+            }
+        }
+    
+    }
+    function PathItem9() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        path.add(new paper.Point(30, 75));
+        path.arcTo(new paper.Point(130, 75));
+        
+        let path2 = new paper.Path();
+        path2.strokeColor = 'red';
+        path2.add(new paper.Point(180, 25));
+        
+        // To draw an arc in anticlockwise direction,
+        // we pass `false` as the second argument to arcTo:
+        path2.arcTo(new paper.Point(280, 25), false);
+    
+    }
+    function PathItem10() {
+        
+        let myPath:paper.Path | null;
+        
+        // The mouse has to move at least 20 points before
+        // the next mouse drag event is fired:
+        paper.tool.minDistance = 20;
+        
+        // When the user clicks, create a new path and add
+        // the current mouse position to it as its first segment:
+        function onMouseDown(event:paper.ToolEvent) {
+            myPath = new paper.Path();
+            myPath.strokeColor = 'black';
+            myPath.add(event.point);
+        }
+        
+        // On each mouse drag event, draw an arc to the current
+        // position of the mouse:
+        function onMouseDrag(event:paper.ToolEvent) {
+            if(myPath)
+                myPath.arcTo(event.point);
+        }
+    
+    }
+    function PathItem11() {
+        
+        let myPath:paper.Path | null;
+        function onMouseMove(event:paper.ToolEvent) {
+            // If we created a path before, remove it:
+            if (myPath) {
+                myPath.remove();
+            }
+        
+            // Create a new path and add a segment point to it
+            // at {x: 150, y: 150):
+            myPath = new paper.Path();
+            myPath.add(new paper.Point(150, 150));
+        
+            // Draw a curve through the position of the mouse to 'toPoint'
+            let toPoint = new paper.Point(350, 150);
+            myPath.curveTo(event.point, toPoint);
+        
+            // Select the path, so we can see its segments:
+            myPath.selected = true;
+        }
+    
+    }
+    function PathItem12() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        // Add a segment at {x: 50, y: 50}
+        path.add(new paper.Point(25, 25));
+        
+        // Add a segment relative to the last segment of the path.
+        // 50 in x direction and 0 in y direction, becomes {x: 75, y: 25}
+        path.lineBy(new paper.Point(50, 0));
+        
+        // 0 in x direction and 50 in y direction, becomes {x: 75, y: 75}
+        path.lineBy(new paper.Point(0, 50));
+    
+    }
+    function PathItem13() {
+        
+        let path = new paper.Path();
+        path.strokeColor = 'black';
+        
+        // Add the first segment at {x: 50, y: 50}
+        path.add(paper.view.center);
+        
+        // Loop 500 times:
+        for (let i = 0; i < 500; i++) {
+            // Create a vector with an ever increasing length
+            // and an angle in increments of 45 degrees
+            let vector = new paper.Point({
+                angle: i * 45,
+                length: i / 2
+            });
+            // Add the vector relatively to the last segment point:
+            path.lineBy(vector);
+        }
+        
+        // Smooth the handles of the path:
+        path.smooth();
+        
+        // Uncomment the following line and click on 'run' to see
+        // the construction of the path:
+        // path.selected = true;
+    
+    }
+    function PathItem14() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function PathItem15() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function PathItem16() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function PathItem17() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function PathItem18() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function PathItem19() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function PathItem20() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function PathItem21() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function PathItem22() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function PathItem23() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function PathItem24() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function PathItem25() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function PathItem26() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function PathItem27() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function PathItem28() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function PathItem29() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function PathItem30() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function PathItem31() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function PathItem32() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function PathItem33() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function PathItem34() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function PathItem35() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PathItem36() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function PathItem37() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function PathItem38() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PathItem39() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PathItem40() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function PathItem41() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PathItem42() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function PathItem43() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function PathItem44() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function PathItem45() {
+        
+        function enter(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function PathItem46() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PathItem47() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function PathItem48() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function PathItem49() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function PathItem50() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function PathItem51() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function PathItem52() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function PathItem53() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function PathItem54() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function PathItem55() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function PathItem56() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function PathItem57() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function PathItem58() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function PathItem59() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function PathItem60() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function PathItem61() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function PathItem62() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function PathItem63() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function PathItem64() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function PathItem65() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function PathItem66() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Point0() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40
+        });
+        
+        // Select the third segment point:
+        path.segments[2].point.selected = true;
+        
+        // Select the item's position, which is the pivot point
+        // around which it is transformed:
+        path.position.selected = true;
+    
+    }
+    function PointText0() {
+        
+        let text = new paper.PointText(new paper.Point(200, 50));
+        text.justification = 'center';
+        text.fillColor = 'black';
+        text.content = 'The contents of the point text';
+    
+    }
+    function PointText1() {
+        
+        let text = new paper.PointText({
+            point: [50, 50],
+            content: 'The contents of the point text',
+            fillColor: 'black',
+            fontFamily: 'Courier New',
+            fontWeight: 'bold',
+            fontSize: 25
+        });
+    
+    }
+    function PointText2() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function PointText3() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function PointText4() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function PointText5() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function PointText6() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function PointText7() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function PointText8() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function PointText9() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function PointText10() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function PointText11() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function PointText12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function PointText13() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function PointText14() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function PointText15() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function PointText16() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function PointText17() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function PointText18() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function PointText19() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function PointText20() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function PointText21() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function PointText22() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function PointText23() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PointText24() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function PointText25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function PointText26() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PointText27() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PointText28() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function PointText29() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PointText30() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function PointText31() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function PointText32() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function PointText33() {
+        
+        function enter(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path, event:paper.MouseEvent) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function PointText34() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function PointText35() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function PointText36() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function PointText37() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function PointText38() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function PointText39() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function PointText40() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function PointText41() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function PointText42() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function PointText43() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function PointText44() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function PointText45() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function PointText46() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function PointText47() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function PointText48() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function PointText49() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function PointText50() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function PointText51() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function PointText52() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function PointText53() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function PointText54() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function PointText55() {
+        
+        // Create a point-text item at {x: 30, y: 30}:
+        let text = new paper.PointText(new paper.Point(30, 30));
+        text.fillColor = 'black';
+        
+        // Set the content of the text item:
+        text.content = 'Hello world';
+    
+    }
+    function PointText56() {
+        
+        // Create a point-text item at {x: 30, y: 30}:
+        let text = new paper.PointText(new paper.Point(30, 30));
+        text.fillColor = 'black';
+        
+        text.content = 'Move your mouse over the paper.view, to see its position';
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Each time the mouse is moved, set the content of
+            // the point text to describe the position of the mouse:
+            text.content = 'Your position is: ' + event.point.toString();
+        }
+    
+    }
+    function Project0() {
+        
+        paper.project.currentStyle = {
+            fillColor: 'red',
+            strokeColor: 'black',
+            strokeWidth: 5
+        }
+        
+        // The following paths will take over all style properties of
+        // the current style:
+        let path = new paper.Path.Circle(new paper.Point(75, 50), 30);
+        let path2 = new paper.Path.Circle(new paper.Point(175, 50), 20);
+    
+    }
+    function Project1() {
+        
+        paper.project.currentStyle.fillColor = 'red';
+        
+        // The following path will take over the fill color we just set:
+        let path = new paper.Path.Circle(new paper.Point(75, 50), 30);
+        let path2 = new paper.Path.Circle(new paper.Point(175, 50), 20);
+    
+    }
+    function Project2() {
+        
+        let path1 = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: [150, 50],
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // Select path2:
+        path2.selected = true;
+        
+        // Fetch all selected path items:
+        let items = paper.project.getItems({
+            selected: true,
+            class: paper.Path
+        });
+        
+        // Change the fill color of the selected path to red:
+        items[0].fillColor = 'red';
+    
+    }
+    function Project3() {
+        
+        let path1 = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: [150, 50],
+            radius: 25,
+            fillColor: 'purple'
+        });
+        
+        // Fetch all items with a purple fill color:
+        let items = paper.project.getItems({
+            fillColor: 'purple'
+        });
+        
+        // Select the fetched item:
+        items[0].selected = true;
+    
+    }
+    function Project4() {
+        
+        let path1 = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: [150, 50],
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // Fetch all path items positioned at {x: 150, y: 150}:
+        let items = paper.project.getItems({
+            position: [150, 50]
+        });
+        
+        // Select the fetched path:
+        items[0].selected = true;
+    
+    }
+    function Project5() {
+        
+        // Create a circle shaped path:
+        let path1 = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with 50% opacity:
+        let path2 = new paper.Path.Circle({
+            center: [150, 50],
+            radius: 25,
+            fillColor: 'black',
+            opacity: 0.5
+        });
+        
+        // Fetch all items whose opacity is smaller than 1
+        let items = paper.project.getItems({
+            opacity: function(value:number) {
+                return value < 1;
+            }
+        });
+        
+        // Select the fetched item:
+        items[0].selected = true;
+    
+    }
+    function Project6() {
+        
+        // Create a rectangle shaped path (4 segments):
+        let path1 = new paper.Path.Rectangle({
+            from: [25, 25],
+            to: [75, 75],
+            strokeColor: 'black',
+            strokeWidth: 10
+        });
+        
+        // Create a line shaped path (2 segments):
+        let path2 = new paper.Path.Line({
+            from: [125, 50],
+            to: [175, 50],
+            strokeColor: 'black',
+            strokeWidth: 10
+        });
+        
+        // Fetch all paths with 2 segments:
+        let items = paper.project.getItems({
+            class: paper.Path,
+         segments: function(segments: paper.Segment[]) {
+                return segments.length == 2;
+         }
+        });
+        
+        // Select the fetched path:
+        items[0].selected = true;
+    
+    }
+    function Project7() {
+        
+        // Create a black circle shaped path:
+        let path1 = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 25,
+            fillColor: 'black',
+            data: {
+                person: {
+                    name: 'john',
+                    length: 200,
+                    hair: true
+                }
+            }
+        });
+        
+        // Create a red circle shaped path:
+        let path2 = new paper.Path.Circle({
+            center: [150, 50],
+            radius: 25,
+            fillColor: 'red',
+            data: {
+                person: {
+                    name: 'john',
+                    length: 180,
+                    hair: false
+                }
+            }
+        });
+        
+        // Fetch all items whose data object contains a person
+        // object whose name is john and length is 180:
+        let items = paper.project.getItems({
+            data: {
+                person: {
+                    name: 'john',
+                    length: 180
+                }
+            }
+        });
+        
+        // Select the fetched item:
+        items[0].selected = true;
+    
+    }
+    function Project8() {
+        
+        // Create a path named 'aardvark':
+        let path1 = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 25,
+            fillColor: 'black',
+            name: 'aardvark'
+        });
+        
+        // Create a path named 'apple':
+        let path2 = new paper.Path.Circle({
+            center: [150, 50],
+            radius: 25,
+            fillColor: 'black',
+            name: 'apple'
+        });
+        
+        // Create a path named 'banana':
+        path2 = new paper.Path.Circle({
+            center: [250, 50],
+            radius: 25,
+            fillColor: 'black',
+            name: 'banana'
+        });
+        
+        // Fetch all items that have a name starting with 'a':
+        let items = paper.project.getItems({
+            name: /^a/
+        });
+        
+        // Change the fill color of the matched items:
+        for (let i = 0; i < items.length; i++) {
+         items[i].fillColor = 'red';
+        }
+    
+    }
+    function Raster0() {
+        
+        let url = 'http://assets.paperjs.org/images/marilyn.jpg';
+        let raster = new paper.Raster(url);
+        
+        // If you create a Raster using a url, you can use the onLoad
+        // handler to do something once it is loaded:
+        raster.onLoad = function() {
+            console.log('The image has loaded.');
+        };
+    
+    }
+    function Raster1() {
+        
+        let raster = new paper.Raster({
+            source: 'http://assets.paperjs.org/images/marilyn.jpg',
+            position: paper.view.center
+        });
+        
+        raster.scale(0.5);
+        raster.rotate(10);
+    
+    }
+    function Raster2() {
+        
+        let raster = new paper.Raster();
+        raster.source = 'http://paperjs.org/about/paper-js.gif';
+        raster.position = paper.view.center;
+    
+    }
+    function Raster3() {
+        
+        let raster = new paper.Raster({
+            source: 'http://paperjs.org/about/paper-js.gif',
+            position: paper.view.center
+        });
+    
+    }
+    function Raster4() {
+        
+        let raster = new paper.Raster({
+            crossOrigin: 'anonymous',
+            source: 'http://assets.paperjs.org/images/marilyn.jpg',
+            position: paper.view.center
+        });
+        
+        console.log(paper.view.element.toDataURL('image/png').substring(0, 32));
+    
+    }
+    function Raster5() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function Raster6() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function Raster7() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function Raster8() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function Raster9() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function Raster10() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function Raster11() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function Raster12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function Raster13() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function Raster14() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function Raster15() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function Raster16() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function Raster17() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function Raster18() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Raster19() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Raster20() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Raster21() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Raster22() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Raster23() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Raster24() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function Raster25() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function Raster26() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Raster27() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Raster28() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function Raster29() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Raster30() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Raster31() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Raster32() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Raster33() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Raster34() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function Raster35() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function Raster36() {
+        
+        function enter(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function Raster37() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Raster38() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function Raster39() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function Raster40() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function Raster41() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Raster42() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function Raster43() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function Raster44() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function Raster45() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function Raster46() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function Raster47() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function Raster48() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function Raster49() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function Raster50() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function Raster51() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function Raster52() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function Raster53() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function Raster54() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function Raster55() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function Raster56() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function Raster57() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Rectangle0() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            selected: true
+        });
+        
+        path.bounds.selected = true;
+    
+    }
+    function Rectangle1() {
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 30.
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        circle.fillColor = 'red';
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Check whether the mouse position intersects with the
+            // bounding box of the item:
+            if (circle.bounds.contains(event.point)) {
+                // If it intersects, fill it with green:
+                circle.fillColor = 'green';
+            } else {
+                // If it doesn't intersect, fill it with red:
+                circle.fillColor = 'red';
+            }
+        }
+    
+    }
+    function Rectangle2() {
+        
+        // All newly created paths will inherit these styles:
+        paper.project.currentStyle = {
+            fillColor: 'green',
+            strokeColor: 'black'
+        };
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 45.
+        let largeCircle = new paper.Path.Circle(new paper.Point(80, 50), 45);
+        
+        // Create a smaller circle shaped path in the same position
+        // with a radius of 30.
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Move the circle to the position of the mouse:
+            circle.position = event.point;
+        
+            // Check whether the bounding box of the smaller circle
+            // is contained within the bounding box of the larger item:
+            if (largeCircle.bounds.contains(circle.bounds)) {
+                // If it does, fill it with green:
+                circle.fillColor = 'green';
+                largeCircle.fillColor = 'green';
+            } else {
+                // If doesn't, fill it with red:
+                circle.fillColor = 'red';
+                largeCircle.fillColor = 'red';
+            }
+        }
+    
+    }
+    function Rectangle3() {
+        
+        // All newly created paths will inherit these styles:
+        paper.project.currentStyle = {
+            fillColor: 'green',
+            strokeColor: 'black'
+        };
+        
+        // Create a circle shaped path at {x: 80, y: 50}
+        // with a radius of 45.
+        let largeCircle = new paper.Path.Circle(new paper.Point(80, 50), 45);
+        
+        // Create a smaller circle shaped path in the same position
+        // with a radius of 30.
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Move the circle to the position of the mouse:
+            circle.position = event.point;
+        
+            // Check whether the bounding box of the two circle
+            // shaped paths intersect:
+            if (largeCircle.bounds.intersects(circle.bounds)) {
+                // If it does, fill it with green:
+                circle.fillColor = 'green';
+                largeCircle.fillColor = 'green';
+            } else {
+                // If doesn't, fill it with red:
+                circle.fillColor = 'red';
+                largeCircle.fillColor = 'red';
+            }
+        }
+    
+    }
+    function Rectangle4() {
+        
+        // Create two rectangles that overlap each other
+        let size = new paper.Size(50, 50);
+        let rectangle1 = new paper.Rectangle(new paper.Point(25, 15), size);
+        let rectangle2 = new paper.Rectangle(new paper.Point(50, 40), size);
+        
+        // The rectangle that represents the intersection of the
+        // two rectangles:
+        let intersected = rectangle1.intersect(rectangle2);
+        
+        // To visualize the intersecting of the rectangles, we will
+        // create rectangle shaped paths using the Path.Rectangle
+        // constructor.
+        
+        // Have all newly created paths inherit a black stroke:
+        paper.project.currentStyle.strokeColor = 'black';
+        
+        // Create two rectangle shaped paths using the abstract rectangles
+        // we created before:
+        new paper.Path.Rectangle(rectangle1);
+        new paper.Path.Rectangle(rectangle2);
+        
+        // Create a path that represents the intersected rectangle,
+        // and fill it with red:
+        let intersectionPath = new paper.Path.Rectangle(intersected);
+        intersectionPath.fillColor = 'red';
+    
+    }
+    function Segment0() {
+        
+        let handleIn = new paper.Point(-80, -100);
+        let handleOut = new paper.Point(80, 100);
+        
+        let firstPoint = new paper.Point(100, 50);
+        let firstSegment = new paper.Segment(firstPoint, undefined, handleOut);
+        
+        let secondPoint = new paper.Point(300, 50);
+        let secondSegment = new paper.Segment(secondPoint, handleIn, undefined);
+        
+        let path = new paper.Path([firstSegment, secondSegment]);
+        path.strokeColor = 'black';
+    
+    }
+    function Segment1() {
+        
+        let firstSegment = new paper.Segment({
+            point: [100, 50],
+            handleOut: [80, 100]
+        });
+        
+        let secondSegment = new paper.Segment({
+            point: [300, 50],
+            handleIn: [-80, -100]
+        });
+        
+        let path = new paper.Path({
+            segments: [firstSegment, secondSegment],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Segment2() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40
+        });
+        
+        // Select the third segment point:
+        path.segments[2].selected = true;
+    
+    }
+    function Shape0() {
+        
+        let shape = paper.Shape.Circle(new paper.Point(80, 50), 30);
+        shape.strokeColor = 'black';
+    
+    }
+    function Shape1() {
+        
+        let shape = paper.Shape.Circle({
+            center: [80, 50],
+            radius: 30,
+            strokeColor: 'black'
+        });
+    
+    }
+    function Shape2() {
+        
+        let rectangle = new paper.Rectangle(new paper.Point(20, 20), new paper.Size(60, 60));
+        let shape = paper.Shape.Rectangle(rectangle);
+        shape.strokeColor = 'black';
+    
+    }
+    function Shape3() {
+        
+        let rectangle = new paper.Rectangle(new paper.Point(20, 20), new paper.Size(60, 60));
+        let cornerSize = new paper.Size(10, 10);
+        let shape = paper.Shape.Rectangle([rectangle, cornerSize]);
+        shape.strokeColor = 'black';
+    
+    }
+    function Shape4() {
+        
+        let point = new paper.Point(20, 20);
+        let size = new paper.Size(60, 60);
+        let shape = paper.Shape.Rectangle(point, size);
+        shape.strokeColor = 'black';
+    
+    }
+    function Shape5() {
+        
+        let from = new paper.Point(20, 20);
+        let to = new paper.Point(80, 80);
+        let shape = paper.Shape.Rectangle(from, to);
+        shape.strokeColor = 'black';
+    
+    }
+    function Shape6() {
+        
+        let shape = paper.Shape.Rectangle({
+            point: [20, 20],
+            size: [60, 60],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Shape7() {
+        
+        let shape = paper.Shape.Rectangle({
+            from: [20, 20],
+            to: [80, 80],
+            strokeColor: 'black'
+        });
+    
+    }
+    function Shape8() {
+        
+        let shape = paper.Shape.Rectangle({
+            rectangle: {
+                topLeft: [20, 20],
+                bottomRight: [80, 80]
+            },
+            strokeColor: 'black'
+        });
+    
+    }
+    function Shape9() {
+        
+        let shape = paper.Shape.Rectangle({
+         topLeft: [20, 20],
+            bottomRight: [80, 80],
+            radius: 10,
+            strokeColor: 'black'
+        });
+    
+    }
+    function Shape10() {
+        
+        let rectangle = new paper.Rectangle(new paper.Point(20, 20), new paper.Size(180, 60));
+        let shape = paper.Shape.Ellipse(rectangle);
+        shape.fillColor = 'black';
+    
+    }
+    function Shape11() {
+        
+        let shape = paper.Shape.Ellipse({
+            point: [20, 20],
+            size: [180, 60],
+            fillColor: 'black'
+        });
+    
+    }
+    function Shape12() {
+        
+        let shape = paper.Shape.Ellipse({
+            center: [110, 50],
+            radius: [90, 30],
+            fillColor: 'black'
+        });
+    
+    }
+    function Shape13() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function Shape14() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function Shape15() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function Shape16() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function Shape17() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function Shape18() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function Shape19() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function Shape20() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function Shape21() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function Shape22() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function Shape23() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function Shape24() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function Shape25() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function Shape26() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Shape27() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Shape28() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Shape29() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Shape30() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Shape31() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Shape32() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function Shape33() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function Shape34() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Shape35() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Shape36() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function Shape37() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Shape38() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Shape39() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Shape40() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Shape41() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function Shape42() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function Shape43() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function Shape44() {
+        
+        function enter(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function Shape45() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function Shape46() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function Shape47() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function Shape48() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function Shape49() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function Shape50() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function Shape51() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function Shape52() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function Shape53() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function Shape54() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function Shape55() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function Shape56() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function Shape57() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function Shape58() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function Shape59() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function Shape60() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function Shape61() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function Shape62() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function Shape63() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function Shape64() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function Shape65() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Style0() {
+        
+        let path = new paper.Path.Circle(new paper.Point(80, 50), 30);
+        path.style = {
+            fillColor: new paper.Color(1, 0, 0),
+            strokeColor: 'black',
+            strokeWidth: 5
+        };
+    
+    }
+    function Style1() {
+        
+        let text = new paper.PointText(paper.view.center);
+        text.content = 'Hello world.';
+        text.style = {
+            fontFamily: 'Courier New',
+            fontWeight: 'bold',
+            fontSize: 20,
+            fillColor: 'red',
+            justification: 'center'
+        };
+    
+    }
+    function Style2() {
+        
+        let path1 = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 30
+        });
+        
+        let path2 = new paper.Path.Rectangle({
+            from: [170, 20],
+            to: [230, 80]
+        });
+        
+        let group = new paper.Group([path1, path2]);
+        
+        // All styles set on a group are automatically
+        // set on the children of the group:
+        group.style = {
+            strokeColor: 'black',
+            dashArray: [4, 10],
+            strokeWidth: 4,
+            strokeCap: 'round'
+        };
+    
+    }
+    function Style3() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 35);
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Style4() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 35);
+        
+        // Set its stroke color to black:
+        circle.strokeColor = 'black';
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function Style5() {
+        
+        let line = new paper.Path([new paper.Point(80, 50), new paper.Point(420, 50)]);
+        line.strokeColor = 'black';
+        line.strokeWidth = 20;
+        
+        // Select the path, so we can see where the stroke is formed:
+        line.selected = true;
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function Style6() {
+        
+        let path = new paper.Path();
+        path.add(new paper.Point(80, 100));
+        path.add(new paper.Point(120, 40));
+        path.add(new paper.Point(160, 100));
+        path.strokeColor = 'black';
+        path.strokeWidth = 20;
+        
+        // Select the path, so we can see where the stroke is formed:
+        path.selected = true;
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function Style7() {
+        
+        let path = new paper.Path.Circle(new paper.Point(80, 50), 40);
+        path.strokeWidth = 2;
+        path.strokeColor = 'black';
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function Style8() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle(new paper.Point(80, 50), 35);
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function Style9() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function SymbolDefinition0() {
+        
+        let path = new paper.Path.Star(new paper.Point(0, 0), 6, 5, 13);
+        path.style = {
+            fillColor: 'white',
+            strokeColor: 'black'
+        };
+        
+        // Create a symbol definition from the path:
+        let definition = new paper.Symbol(path);
+        
+        // Place 100 instances of the symbol definition:
+        for (let i = 0; i < 100; i++) {
+            // Place an instance of the symbol definition in the project:
+            let instance = definition.place();
+        
+            // Move the instance to a random position within the paper.view:
+            instance.position = paper.Point.random().multiply(new paper.Point(paper.view.size));
+        
+            // Rotate the instance by a random amount between
+            // 0 and 360 degrees:
+            instance.rotate(Math.random() * 360);
+        
+            // Scale the instance between 0.25 and 1:
+            instance.scale(0.25 + Math.random() * 0.75);
+        }
+    
+    }
+    function SymbolItem0() {
+        
+        let path = new paper.Path.Star({
+            center: new paper.Point(0, 0),
+            points: 6,
+            radius1: 5,
+            radius2: 13,
+            fillColor: 'white',
+            strokeColor: 'black'
+        });
+        
+        // Create a symbol definition from the path:
+        let definition = new paper.Symbol(path);
+        
+        // Place 100 instances of the symbol:
+        for (let i = 0; i < 100; i++) {
+            // Place an instance of the symbol in the project:
+            let instance = new paper.PlacedSymbol(definition);
+        
+            // Move the instance to a random position within the paper.view:
+            instance.position = paper.Point.random().multiply(new paper.Point(paper.view.size));
+        
+            // Rotate the instance by a random amount between
+            // 0 and 360 degrees:
+            instance.rotate(Math.random() * 360);
+        
+            // Scale the instance between 0.25 and 1:
+            instance.scale(0.25 + Math.random() * 0.75);
+        }
+    
+    }
+    function SymbolItem1() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function SymbolItem2() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function SymbolItem3() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function SymbolItem4() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function SymbolItem5() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function SymbolItem6() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function SymbolItem7() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function SymbolItem8() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function SymbolItem9() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function SymbolItem10() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function SymbolItem11() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function SymbolItem12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function SymbolItem13() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function SymbolItem14() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function SymbolItem15() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function SymbolItem16() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function SymbolItem17() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function SymbolItem18() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function SymbolItem19() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function SymbolItem20() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function SymbolItem21() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function SymbolItem22() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function SymbolItem23() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function SymbolItem24() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function SymbolItem25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function SymbolItem26() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function SymbolItem27() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function SymbolItem28() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function SymbolItem29() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function SymbolItem30() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function SymbolItem31() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function SymbolItem32() {
+        
+        function enter(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function SymbolItem33() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function SymbolItem34() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function SymbolItem35() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function SymbolItem36() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function SymbolItem37() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function SymbolItem38() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function SymbolItem39() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function SymbolItem40() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function SymbolItem41() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function SymbolItem42() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function SymbolItem43() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function SymbolItem44() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function SymbolItem45() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function SymbolItem46() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function SymbolItem47() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function SymbolItem48() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function SymbolItem49() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function SymbolItem50() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function SymbolItem51() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function SymbolItem52() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function SymbolItem53() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function TextItem0() {
+        
+        // Create a point-text item at {x: 30, y: 30}:
+        let text = new paper.PointText(new paper.Point(30, 30));
+        text.fillColor = 'black';
+        
+        // Set the content of the text item:
+        text.content = 'Hello world';
+    
+    }
+    function TextItem1() {
+        
+        // Create a point-text item at {x: 30, y: 30}:
+        let text = new paper.PointText(new paper.Point(30, 30));
+        text.fillColor = 'black';
+        
+        text.content = 'Move your mouse over the paper.view, to see its position';
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Each time the mouse is moved, set the content of
+            // the point text to describe the position of the mouse:
+            text.content = 'Your position is: ' + event.point.toString();
+        }
+    
+    }
+    function TextItem2() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and add path to it as a child:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'red';
+    
+    }
+    function TextItem3() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30
+        });
+        circle.style = {
+            fillColor: 'blue',
+            strokeColor: 'red',
+            strokeWidth: 5
+        };
+    
+    }
+    function TextItem4() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(180, 50),
+            radius: 20
+        });
+        
+        // Copy the path style of path:
+        path2.style = path.style;
+    
+    }
+    function TextItem5() {
+        
+        let myStyle = {
+            fillColor: 'red',
+            strokeColor: 'blue',
+            strokeWidth: 4
+        };
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 30
+        });
+        path.style = myStyle;
+        
+        let path2 = new paper.Path.Circle({
+            center: new paper.Point(150, 50),
+            radius: 20
+        });
+        path2.style = myStyle;
+    
+    }
+    function TextItem6() {
+        
+        let path = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Hide the path:
+        path.visible = false;
+    
+    }
+    function TextItem7() {
+        
+        // Create a white rectangle in the background
+        // with the same dimensions as the paper.view:
+        let background = new paper.Path.Rectangle(paper.view.bounds);
+        background.fillColor = 'white';
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue'
+        });
+        
+        // Set the blend mode of circle2:
+        circle2.blendMode = 'multiply';
+    
+    }
+    function TextItem8() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'red'
+        });
+        
+        let circle2 = new paper.Path.Circle({
+            center: new paper.Point(120, 50),
+            radius: 35,
+            fillColor: 'blue',
+            strokeColor: 'green',
+            strokeWidth: 10
+        });
+        
+        // Make circle2 50% transparent:
+        circle2.opacity = 0.5;
+    
+    }
+    function TextItem9() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        path.selected = true; // Select the path
+    
+    }
+    function TextItem10() {
+        
+        // Create a circle at position { x: 10, y: 10 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(10, 10),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle to { x: 20, y: 20 }
+        circle.position = new paper.Point(20, 20);
+        
+        // Move the circle 100 points to the right and 50 points down
+        circle.position = circle.position.add(new paper.Point(100, 50));
+    
+    }
+    function TextItem11() {
+        
+        // Create a circle at position { x: 20, y: 20 }
+        let circle = new paper.Path.Circle({
+            center: new paper.Point(20, 20),
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Move the circle 100 points to the right
+        circle.position.x += 100;
+    
+    }
+    function TextItem12() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // Access the path through the group's children array:
+        group.children[0].fillColor = 'red';
+    
+    }
+    function TextItem13() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        // Set the name of the path:
+        path.name = 'example';
+        
+        // Create a group and move the path into it:
+        let group = new paper.Group();
+        group.addChild(path);
+        
+        // The path can be accessed by name:
+        group.getItem('example').fillColor = 'orange';
+    
+    }
+    function TextItem14() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        let group = new paper.Group();
+        group.children = [path];
+        
+        // The path is the first child of the group:
+        group.firstChild.fillColor = 'green';
+    
+    }
+    function TextItem15() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set its stroke color to RGB red:
+        circle.strokeColor = new paper.Color(1, 0, 0);
+    
+    }
+    function TextItem16() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            strokeColor: 'red'
+        });
+        
+        // Set its stroke width to 10:
+        circle.strokeWidth = 10;
+    
+    }
+    function TextItem17() {
+        
+        let line = new paper.Path({
+            segments: [[80, 50], [420, 50]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            selected: true
+        });
+        
+        // Set the stroke cap of the line to be round:
+        line.strokeCap = 'round';
+        
+        // Copy the path and set its stroke cap to be square:
+        let line2 = line.clone();
+        line2.position.y += 50;
+        line2.strokeCap = 'square';
+        
+        // Make another copy and set its stroke cap to be butt:
+        line2 = line.clone();
+        line2.position.y += 100;
+        line2.strokeCap = 'butt';
+    
+    }
+    function TextItem18() {
+        
+        let path = new paper.Path({
+            segments: [[80, 100], [120, 40], [160, 100]],
+            strokeColor: 'black',
+            strokeWidth: 20,
+            // Select the path, in order to see where the stroke is formed:
+            selected: true
+        });
+        
+        let path2 = path.clone();
+        path2.position.x += path2.bounds.width * 1.5;
+        path2.strokeJoin = 'round';
+        
+        let path3 = path2.clone();
+        path3.position.x += path3.bounds.width * 1.5;
+        path3.strokeJoin = 'bevel';
+    
+    }
+    function TextItem19() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 40,
+            strokeWidth: 2,
+            strokeColor: 'black'
+        });
+        
+        // Set the dashed stroke to [10pt dash, 4pt gap]:
+        path.dashArray = [10, 4];
+    
+    }
+    function TextItem20() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 35:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        // Set the fill color of the circle to RGB red:
+        circle.fillColor = new paper.Color(1, 0, 0);
+    
+    }
+    function TextItem21() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35,
+            fillColor: 'white',
+            // Set the shadow color of the circle to RGB black:
+            shadowColor: new paper.Color(0, 0, 0),
+            // Set the shadow blur radius to 12:
+            shadowBlur: 12,
+            // Offset the shadow by { x: 5, y: 5 }
+            shadowOffset: new paper.Point(5, 5)
+        });
+    
+    }
+    function TextItem22() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        path.onFrame = function(this:paper.Path) {
+            // Every frame, rotate the path by 3 degrees:
+            this.rotate(3);
+        }
+    
+    }
+    function TextItem23() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is pressed on the item,
+        // set its fill color to red:
+        path.onMouseDown = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function TextItem24() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is pressed on the item, remove it:
+            path.onMouseDown = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function TextItem25() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 50,
+            fillColor: 'blue'
+        });
+        
+        // Install a drag event handler that moves the path along.
+        path.onMouseDrag = function(this:paper.Path, event:paper.MouseEvent) {
+            path.position = path.position.add(event.delta);
+        }
+    
+    }
+    function TextItem26() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is released over the item,
+        // set its fill color to red:
+        path.onMouseUp = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function TextItem27() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is clicked on the item,
+        // set its fill color to red:
+        path.onClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function TextItem28() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse clicks on the item, remove it:
+            path.onClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function TextItem29() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse is double clicked on the item,
+        // set its fill color to red:
+        path.onDoubleClick = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function TextItem30() {
+        
+        // Loop 30 times:
+        for (let i = 0; i < 30; i++) {
+            // Create a circle shaped path at a random position
+            // in the paper.view:
+            let path = new paper.Path.Circle({
+                center: paper.Point.random().multiply(new paper.Point(paper.view.size)),
+                radius: 25,
+                fillColor: 'black',
+                strokeColor: 'white'
+            });
+        
+            // When the mouse is double clicked on the item, remove it:
+            path.onDoubleClick = function(this:paper.Path) {
+                this.remove();
+            }
+        }
+    
+    }
+    function TextItem31() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+            let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+            });
+        
+        // When the mouse moves on top of the item, set its opacity
+        // to a random value between 0 and 1:
+        path.onMouseMove = function(this:paper.Path) {
+            this.opacity = Math.random();
+        }
+    
+    }
+    function TextItem32() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.onMouseEnter = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+    
+    }
+    function TextItem33() {
+        
+        function enter(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+        
+        function leave(this:paper.Path) {
+            this.fillColor = 'black';
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle(event.point, 25);
+            path.fillColor = 'black';
+        
+            // When the mouse enters the item, set its fill color to red:
+            path.onMouseEnter = enter;
+        
+            // When the mouse leaves the item, set its fill color to black:
+            path.onMouseLeave = leave;
+        }
+    
+    }
+    function TextItem34() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse leaves the item, set its fill color to red:
+        path.onMouseLeave = function(this:paper.Path) {
+            this.fillColor = 'red';
+        }
+    
+    }
+    function TextItem35() {
+        
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 35
+        });
+        
+        circle.set({
+            strokeColor: 'red',
+            strokeWidth: 10,
+            fillColor: 'black',
+            selected: true
+        });
+    
+    }
+    function TextItem36() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 10,
+            fillColor: 'red'
+        });
+        
+        // Make 20 copies of the circle:
+        for (let i = 0; i < 20; i++) {
+            let copy = circle.clone();
+        
+            // Distribute the copies horizontally, so we can see them:
+            copy.position.x += i * copy.bounds.width;
+        }
+    
+    }
+    function TextItem37() {
+        
+        let circle = new paper.Path.Circle({
+            center: [50, 50],
+            radius: 5,
+            fillColor: 'red'
+        });
+        
+        // Create a rasterized version of the path:
+        let raster = circle.rasterize();
+        
+        // Move it 100pt to the right:
+        raster.position.x += 100;
+        
+        // Scale the path and the raster by 300%, so we can compare them:
+        circle.scale(5);
+        raster.scale(5);
+    
+    }
+    function TextItem38() {
+        
+        let path = new paper.Path.Star({
+            center: [50, 50],
+            points: 12,
+            radius1: 20,
+            radius2: 40,
+            fillColor: 'black'
+        });
+        
+        // Whenever the user presses the mouse:
+        function onMouseDown(event:paper.ToolEvent) {
+            // If the position of the mouse is within the path,
+            // set its fill color to red, otherwise set it to
+            // black:
+            if (path.contains(event.point)) {
+                path.fillColor = 'red';
+            } else {
+                path.fillColor = 'black';
+            }
+        }
+    
+    }
+    function TextItem39() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 80, y: 25} and a size of {width: 50, height: 50}:
+        let path = new paper.Path.Rectangle(new paper.Point(80, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        // Rotate the path by 30 degrees:
+        path.rotate(30);
+    
+    }
+    function TextItem40() {
+        
+        // Create a rectangle shaped path with its top left
+        // point at {x: 175, y: 50} and a size of {width: 100, height: 100}:
+        let topLeft = new paper.Point(175, 50);
+        let size = new paper.Size(100, 100);
+        let path = new paper.Path.Rectangle(topLeft, size);
+        path.fillColor = 'black';
+        
+        // Draw a circle shaped path in the center of the paper.view,
+        // to show the rotation point:
+        let circle = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 5,
+            fillColor: 'white'
+        });
+        
+        // Each frame rotate the path 3 degrees around the center point
+        // of the paper.view:
+        function onFrame(event:paper.IFrameEvent) {
+            path.rotate(3, paper.view.center);
+        }
+    
+    }
+    function TextItem41() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path by 150% from its center point
+        circle.scale(1.5);
+    
+    }
+    function TextItem42() {
+        
+        // Create a circle shaped path at { x: 80, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path 150% from its bottom left corner
+        circle.scale(1.5, circle.bounds.bottomLeft);
+    
+    }
+    function TextItem43() {
+        
+        // Create a circle shaped path at { x: 100, y: 50 }
+        // with a radius of 20:
+        let circle = new paper.Path.Circle({
+            center: [100, 50],
+            radius: 20,
+            fillColor: 'red'
+        });
+        
+        // Scale the path horizontally by 300%
+        circle.scale(3, 1);
+    
+    }
+    function TextItem44() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds);
+    
+    }
+    function TextItem45() {
+        
+        // Create a rectangle shaped path with its top left corner
+        // at {x: 80, y: 25} and a size of {width: 75, height: 50}:
+        let path = new paper.Path.Rectangle({
+            point: [80, 25],
+            size: [75, 50],
+            fillColor: 'black'
+        });
+        
+        // Create a circle shaped path with its center at {x: 80, y: 50}
+        // and a radius of 30.
+        let circlePath = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the circlePath to the bounding rectangle of
+        // the rectangular path:
+        circlePath.fitBounds(path.bounds, true);
+    
+    }
+    function TextItem46() {
+        
+        let path = new paper.Path.Circle({
+            center: [80, 50],
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        // Fit the path to the bounding rectangle of the paper.view:
+        path.fitBounds(paper.view.bounds);
+    
+    }
+    function TextItem47() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25,
+            fillColor: 'black'
+        });
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on('mouseenter', function(this:paper.Path) {
+            this.fillColor = 'red';
+        });
+        
+        // When the mouse leaves the item, set its fill color to black:
+        path.on('mouseleave', function(this:paper.Path) {
+            this.fillColor = 'black';
+        });
+    
+    }
+    function TextItem48() {
+        
+        // Create a circle shaped path at the center of the paper.view:
+        let path = new paper.Path.Circle({
+            center: paper.view.center,
+            radius: 25
+        });
+        path.fillColor = 'black';
+        
+        // When the mouse enters the item, set its fill color to red:
+        path.on({
+            mouseenter: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        });
+    
+    }
+    function TextItem49() {
+        
+        let pathHandlers = {
+            mouseenter: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'red';
+            },
+            mouseleave: function(this:paper.Path, event:paper.MouseEvent) {
+                this.fillColor = 'black';
+            }
+        }
+        
+        // When the mouse is pressed:
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the position of the mouse:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 25,
+                fillColor: 'black'
+            });
+        
+            // Attach the handers inside the object literal to the path:
+            path.on(pathHandlers);
+        }
+    
+    }
+    function TextItem50() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path on the next onMouseDrag or onMouseDown event:
+            path.removeOn({
+                drag: true,
+                down: true
+            });
+        }
+    
+    }
+    function TextItem51() {
+        
+        function onMouseMove(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next move event, automatically remove the path:
+            path.removeOnMove();
+        }
+    
+    }
+    function TextItem52() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, next time the mouse is pressed:
+            path.removeOnDown();
+        }
+    
+    }
+    function TextItem53() {
+        
+        function onMouseDrag(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // On the next drag event, automatically remove the path:
+            path.removeOnDrag();
+        }
+    
+    }
+    function TextItem54() {
+        
+        function onMouseDown(event:paper.ToolEvent) {
+            // Create a circle shaped path at the mouse position,
+            // with a radius of 10:
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        
+            // Remove the path, when the mouse is released:
+            path.removeOnUp();
+        }
+    
+    }
+    function Tool0() {
+        
+        let path:paper.Path;
+        
+        // Only execute onMouseDrag when the mouse
+        // has moved at least 10 points:
+        paper.tool.minDistance = 10;
+        
+        paper.tool.onMouseDown = function(this:paper.Tool, event:paper.ToolEvent) {
+            // Create a new path every time the mouse is clicked
+            path = new paper.Path();
+            path.add(event.point);
+            path.strokeColor = 'black';
+        }
+        
+        paper.tool.onMouseDrag = function(this:paper.Tool, event:paper.ToolEvent) {
+            // Add a point to the path every time the mouse is dragged
+            path.add(event.point);
+        }
+    
+    }
+    function Tool1() {
+        
+        paper.tool.onMouseDown = function(event:paper.ToolEvent) {
+            // Create a new circle shaped path with a radius of 10
+            // at the position of the mouse (event.point):
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        }
+    
+    }
+    function Tool2() {
+        
+        // Create an empty path:
+        let path = new paper.Path({
+            strokeColor: 'black'
+        });
+        
+        paper.tool.onMouseDrag = function(event:paper.ToolEvent) {
+            // Add a segment to the path at the position of the mouse:
+            path.add(event.point);
+        }
+    
+    }
+    function Tool3() {
+        
+        // Create a circle shaped path with a radius of 10 at {x: 0, y: 0}:
+        let path = new paper.Path.Circle({
+            center: [0, 0],
+            radius: 10,
+            fillColor: 'black'
+        });
+        
+        paper.tool.onMouseMove = function(event:paper.ToolEvent) {
+            // Whenever the user moves the mouse, move the path
+            // to that position:
+            path.position = event.point;
+        }
+    
+    }
+    function Tool4() {
+        
+        paper.tool.onMouseUp = function(event:paper.ToolEvent) {
+            // Create a new circle shaped path with a radius of 10
+            // at the position of the mouse (event.point):
+            let path = new paper.Path.Circle({
+                center: event.point,
+                radius: 10,
+                fillColor: 'black'
+            });
+        }
+    
+    }
+    function Tool5() {
+        
+        // Create a circle shaped path:
+        let path = new paper.Path.Circle({
+            center: new paper.Point(50, 50),
+            radius: 30,
+            fillColor: 'red'
+        });
+        
+        paper.tool.onKeyDown = function(event:paper.KeyEvent) {
+            if (event.key == 'space') {
+                // Scale the path by 110%:
+                path.scale(1.1);
+        
+                // Prevent the key event from bubbling
+                return false;
+            }
+        }
+    
+    }
+    function View0() {
+        
+        // Create a rectangle shaped path with its top left point at:
+        // {x: 50, y: 25} and a size of {width: 50, height: 50}
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        paper.view.onFrame = function(event:paper.IFrameEvent) {
+            // Every frame, rotate the path by 3 degrees:
+            path.rotate(3);
+        }
+    
+    }
+    function View1() {
+        
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+
+        let frameHandler = function(event: paper.IFrameEvent){
+            // Every frame, rotate the path by 3 degrees:
+            path.rotate(3);
+        };
+        
+        paper.view.on('frame', frameHandler);
+    
+    }
+    function View2() {
+        
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        let frameHandler = function(event:paper.IFrameEvent) {
+            // Every frame, rotate the path by 3 degrees:
+            path.rotate(3);
+        };
+        
+        paper.view.on({
+            frame: frameHandler
+        });
+    
+    }
+    function View3() {
+        
+        let path = new paper.Path.Rectangle(new paper.Point(50, 25), new paper.Size(50, 50));
+        path.fillColor = 'black';
+        
+        let frameHandler = function(event:paper.IFrameEvent) {
+            // Every frame, rotate the path by 3 degrees:
+            path.rotate(3);
+        };
+        
+        paper.view.on({
+            frame: frameHandler
+        });
+        
+        // When the user presses the mouse,
+        // detach the frame handler from the paper.view:
+        function onMouseDown(event:paper.ToolEvent) {
+            paper.view.off('frame');
+        }
+    
+    }
+    
+}
diff --git a/types/parallel-transform/index.d.ts b/types/parallel-transform/index.d.ts
new file mode 100644
index 0000000000..da7c64fb1c
--- /dev/null
+++ b/types/parallel-transform/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for parallel-transform 1.1
+// Project: https://github.com/mafintosh/parallel-transform
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import { Transform, TransformOptions, TransformCallback } from "stream";
+
+type OnTransform = (chunk: any, callback: TransformCallback) => void;
+
+declare namespace ParallelTransform {
+    interface Options extends TransformOptions {
+        ordered?: boolean;
+    }
+}
+
+declare const ParallelTransform: {
+    (maxParallel: number, opts: ParallelTransform.Options | undefined | null, ontransform: OnTransform): Transform;
+    (opts: ParallelTransform.Options | number | undefined | null, ontransform: OnTransform): Transform;
+    (ontransform: OnTransform): Transform;
+    new(maxParallel: number, opts: ParallelTransform.Options | undefined | null, ontransform: OnTransform): Transform;
+    new(opts: ParallelTransform.Options | number | undefined | null, ontransform: OnTransform): Transform;
+    new(ontransform: OnTransform): Transform;
+};
+
+export = ParallelTransform;
diff --git a/types/parallel-transform/parallel-transform-tests.ts b/types/parallel-transform/parallel-transform-tests.ts
new file mode 100644
index 0000000000..227cccd53b
--- /dev/null
+++ b/types/parallel-transform/parallel-transform-tests.ts
@@ -0,0 +1,19 @@
+import transform = require("parallel-transform");
+
+let stream = transform(10, (data, callback) => {
+    setTimeout(() => callback(undefined, data), Math.random() * 1000);
+});
+
+stream.write("1");
+stream.write("2");
+stream.write("3");
+stream.write("4");
+stream.end();
+
+stream.on("data", data => console.log(data.toString()));
+stream.on("end", () => "end of stream");
+
+stream = transform(10, { objectMode: false },
+    (data, callback) => callback(undefined, data));
+
+stream = transform({ ordered: false }, (data, callback) => callback(new Error("fail"), null));
diff --git a/types/parallel-transform/tsconfig.json b/types/parallel-transform/tsconfig.json
new file mode 100644
index 0000000000..524fa6e5aa
--- /dev/null
+++ b/types/parallel-transform/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",
+        "parallel-transform-tests.ts"
+    ]
+}
diff --git a/types/parallel-transform/tslint.json b/types/parallel-transform/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parallel-transform/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse-git-config/index.d.ts b/types/parse-git-config/index.d.ts
index b3302106b0..3ca55b897a 100644
--- a/types/parse-git-config/index.d.ts
+++ b/types/parse-git-config/index.d.ts
@@ -39,7 +39,7 @@ interface Parse {
     /**
      * Returns an object with only the properties that had ini-style keys converted to objects.
      */
-    keys(config: Config): Config;
+    expandKeys(config: Config): Config;
 }
 
 // no-empty-interface is disabled for a better debugging experience. Empty interfaces are used to alias a type alias.
@@ -49,6 +49,8 @@ interface Options extends Pick<_Options, keyof _Options> { }
 interface _Options {
     cwd: string;
     path: string;
+    include?: boolean;
+    expandKeys?: boolean;
 }
 
 type ParseCallback = ((err: Error | null, config: Config) => void);
diff --git a/types/parse-git-config/parse-git-config-tests.ts b/types/parse-git-config/parse-git-config-tests.ts
index c5ce43040a..a6d2a4c983 100644
--- a/types/parse-git-config/parse-git-config-tests.ts
+++ b/types/parse-git-config/parse-git-config-tests.ts
@@ -99,12 +99,12 @@ function test_sync() {
     }
 }
 
-function test_keys() {
+function test_expandKeys() {
     const config = {
         'foo "bar"': { doStuff: true },
         'foo "baz"': { doStuff: true }
     };
-    const keys = parse.keys(config);
+    const keys = parse.expandKeys(config);
 
     keys.foo.bar.doStuff === true;
     keys.foo.baz.doStuff === true;
diff --git a/types/parse-github-url/index.d.ts b/types/parse-github-url/index.d.ts
new file mode 100644
index 0000000000..c5793277e8
--- /dev/null
+++ b/types/parse-github-url/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for parse-github-url 1.0
+// Project: https://github.com/jonschlinkert/parse-github-url
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import { Url } from 'url';
+
+declare namespace gh {
+    interface Result extends Url {
+        filepath: string | null;
+        owner: string | null;
+        name: string | null;
+        repo: string | null;
+        repository: string | null;
+        branch: string;
+    }
+}
+
+declare function gh(url: string): gh.Result | null;
+
+export = gh;
diff --git a/types/parse-github-url/parse-github-url-tests.ts b/types/parse-github-url/parse-github-url-tests.ts
new file mode 100644
index 0000000000..7c5a7c50f7
--- /dev/null
+++ b/types/parse-github-url/parse-github-url-tests.ts
@@ -0,0 +1,3 @@
+import gh = require('parse-github-url');
+
+gh('github:monkey/business'); // $ExpectType Result | null
diff --git a/types/parse-github-url/tsconfig.json b/types/parse-github-url/tsconfig.json
new file mode 100644
index 0000000000..e5a7fcab63
--- /dev/null
+++ b/types/parse-github-url/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",
+        "parse-github-url-tests.ts"
+    ]
+}
diff --git a/types/parse-github-url/tslint.json b/types/parse-github-url/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parse-github-url/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parse/index.d.ts b/types/parse/index.d.ts
index 908281f84d..80bd1d7c46 100644
--- a/types/parse/index.d.ts
+++ b/types/parse/index.d.ts
@@ -922,17 +922,19 @@ declare namespace Parse {
             installationId?: String;
             master?: boolean;
             user?: User;
+            ip: string;
+            headers: any;
+            triggerName: string;
+            log: any;
             object: Object;
+            original?: Parse.Object;
         }
 
-
         interface AfterSaveRequest extends TriggerRequest { }
         interface AfterDeleteRequest extends TriggerRequest { }
         interface BeforeDeleteRequest extends TriggerRequest { }
         interface BeforeDeleteResponse extends FunctionResponse { }
-        interface BeforeSaveRequest extends TriggerRequest {
-            original?: Parse.Object;
-        }
+        interface BeforeSaveRequest extends TriggerRequest { }
         interface BeforeSaveResponse extends FunctionResponse {
             success: () => void;
         }
@@ -953,11 +955,20 @@ declare namespace Parse {
             readPreference?: ReadPreferenceOption
         }
 
+        interface AfterFindRequest extends TriggerRequest {
+            objects: Object[]
+        }
+
+        interface AfterFindResponse extends FunctionResponse {
+            success: (objects: Object[]) => void;
+        }
+
         function afterDelete(arg1: any, func?: (request: AfterDeleteRequest) => void): void;
         function afterSave(arg1: any, func?: (request: AfterSaveRequest) => void): void;
         function beforeDelete(arg1: any, func?: (request: BeforeDeleteRequest, response: BeforeDeleteResponse) => void): void;
         function beforeSave(arg1: any, func?: (request: BeforeSaveRequest, response: BeforeSaveResponse) => void): void;
-        function beforeFind(arg1: any, func?: (request: BeforeFindRequest, response: BeforeFindRequest) => void): void;
+        function beforeFind(arg1: any, func?: (request: BeforeFindRequest) => void): void;
+        function afterFind(arg1: any, func?: (request: AfterFindRequest, response: AfterFindResponse) => void): void;
         function define(name: string, func?: (request: FunctionRequest, response: FunctionResponse) => void): void;
         function httpRequest(options: HTTPOptions): Promise<HttpResponse>;
         function job(name: string, func?: (request: JobRequest, status: JobStatus) => void): HttpResponse;
diff --git a/types/parse5-htmlparser2-tree-adapter/index.d.ts b/types/parse5-htmlparser2-tree-adapter/index.d.ts
index 12aa70219b..a7833580a4 100644
--- a/types/parse5-htmlparser2-tree-adapter/index.d.ts
+++ b/types/parse5-htmlparser2-tree-adapter/index.d.ts
@@ -6,205 +6,207 @@
 
 import * as parse5 from "parse5";
 
-/**
- * htmlparser2 tree adapter Node interface.
- */
-export interface Node {
+declare namespace treeAdapter {
     /**
-     * The type of the node. E.g. {@link Document} will have `type` equal to 'root'`.
+     * htmlparser2 tree adapter Node interface.
      */
-    type: string;
-    /**
-     * [DOM spec](https://dom.spec.whatwg.org/#dom-node-nodetype)-compatible node {@link type}.
-     */
-    nodeType: number;
-    /**
-     * Parent node.
-     */
-    parent: ParentNode;
-    /**
-     * Same as {@link parent}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
-     */
-    parentNode: ParentNode;
-    /**
-     * Previous sibling.
-     */
-    prev: Node;
-    /**
-     * Same as {@link prev}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
-     */
-    previousSibling: Node;
-    /**
-     * Next sibling.
-     */
-    next: Node;
-    /**
-     * Same as {@link next}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
-     */
-    nextSibling: Node;
-}
+    interface Node {
+        /**
+         * The type of the node. E.g. {@link Document} will have `type` equal to 'root'`.
+         */
+        type: string;
+        /**
+         * [DOM spec](https://dom.spec.whatwg.org/#dom-node-nodetype)-compatible node {@link type}.
+         */
+        nodeType: number;
+        /**
+         * Parent node.
+         */
+        parent: ParentNode;
+        /**
+         * Same as {@link parent}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+         */
+        parentNode: ParentNode;
+        /**
+         * Previous sibling.
+         */
+        prev: Node;
+        /**
+         * Same as {@link prev}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+         */
+        previousSibling: Node;
+        /**
+         * Next sibling.
+         */
+        next: Node;
+        /**
+         * Same as {@link next}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+         */
+        nextSibling: Node;
+    }
 
-/**
- * htmlparser2 tree adapter ParentNode interface.
- */
-export interface ParentNode extends Node {
     /**
-     * Child nodes.
+     * htmlparser2 tree adapter ParentNode interface.
      */
-    children: Node[];
-    /**
-     * Same as {@link children}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
-     */
-    childNodes: Node[];
-    /**
-     * First child of the node.
-     */
-    firstChild: Node;
-    /**
-     * Last child of the node.
-     */
-    lastChild: Node;
-}
+    interface ParentNode extends Node {
+        /**
+         * Child nodes.
+         */
+        children: Node[];
+        /**
+         * Same as {@link children}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+         */
+        childNodes: Node[];
+        /**
+         * First child of the node.
+         */
+        firstChild: Node;
+        /**
+         * Last child of the node.
+         */
+        lastChild: Node;
+    }
 
-/**
- * htmlparser2 tree adapter DocumentType interface.
- */
-export interface DocumentType extends Node {
     /**
-     * The type of the node.
+     * htmlparser2 tree adapter DocumentType interface.
      */
-    type: "directive";
-    /**
-     * Node name.
-     */
-    name: "!doctype";
-    /**
-     * Serialized doctype {@link name}, {@link publicId} and {@link systemId}.
-     */
-    data: string;
-    /**
-     * Document type name.
-     */
-    "x-name": string;
-    /**
-     * Document type public identifier.
-     */
-    "x-publicId": string;
-    /**
-     * Document type system identifier.
-     */
-    "x-systemId": string;
-}
+    interface DocumentType extends Node {
+        /**
+         * The type of the node.
+         */
+        type: "directive";
+        /**
+         * Node name.
+         */
+        name: "!doctype";
+        /**
+         * Serialized doctype {@link name}, {@link publicId} and {@link systemId}.
+         */
+        data: string;
+        /**
+         * Document type name.
+         */
+        "x-name": string;
+        /**
+         * Document type public identifier.
+         */
+        "x-publicId": string;
+        /**
+         * Document type system identifier.
+         */
+        "x-systemId": string;
+    }
 
-/**
- * htmlparser2 tree adapter Document interface.
- */
-export interface Document extends ParentNode {
     /**
-     * The type of the node.
+     * htmlparser2 tree adapter Document interface.
      */
-    type: "root";
-    /**
-     * The name of the node.
-     */
-    name: "root";
-    /**
-     * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
-     */
-    "x-mode": parse5.DocumentMode;
-}
+    interface Document extends ParentNode {
+        /**
+         * The type of the node.
+         */
+        type: "root";
+        /**
+         * The name of the node.
+         */
+        name: "root";
+        /**
+         * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+         */
+        "x-mode": parse5.DocumentMode;
+    }
 
-/**
- * htmlparser2 tree adapter DocumentFragment interface.
- */
-export interface DocumentFragment extends ParentNode {
     /**
-     * The type of the node.
+     * htmlparser2 tree adapter DocumentFragment interface.
      */
-    type: "root";
-    /**
-     * The name of the node.
-     */
-    name: "root";
-}
+    interface DocumentFragment extends ParentNode {
+        /**
+         * The type of the node.
+         */
+        type: "root";
+        /**
+         * The name of the node.
+         */
+        name: "root";
+    }
 
-/**
- * htmlparser2 tree adapter Element interface.
- */
-export interface Element extends ParentNode {
     /**
-     * The name of the node. Equals to element {@link tagName}.
+     * htmlparser2 tree adapter Element interface.
      */
-    name: string;
-    /**
-     * Element tag name.
-     */
-    tagName: string;
-    /**
-     * Element namespace.
-     */
-    namespace: string;
-    /**
-     * Element attributes.
-     */
-    attribs: { [name: string]: string };
-    /**
-     * Element attribute namespaces.
-     */
-    "x-attribsNamespace": { [name: string]: string };
-    /**
-     * Element attribute namespace-related prefixes.
-     */
-    "x-attribsPrefix": { [name: string]: string };
-    /**
-     * Element source code location info. Available if location info is enabled via ParserOptions.
-     */
-    sourceCodeLocation?: parse5.ElementLocation;
-}
+    interface Element extends ParentNode {
+        /**
+         * The name of the node. Equals to element {@link tagName}.
+         */
+        name: string;
+        /**
+         * Element tag name.
+         */
+        tagName: string;
+        /**
+         * Element namespace.
+         */
+        namespace: string;
+        /**
+         * Element attributes.
+         */
+        attribs: { [name: string]: string };
+        /**
+         * Element attribute namespaces.
+         */
+        "x-attribsNamespace": { [name: string]: string };
+        /**
+         * Element attribute namespace-related prefixes.
+         */
+        "x-attribsPrefix": { [name: string]: string };
+        /**
+         * Element source code location info. Available if location info is enabled via ParserOptions.
+         */
+        sourceCodeLocation?: parse5.ElementLocation;
+    }
 
-/**
- * htmlparser2 tree adapter CommentNode interface.
- */
-export interface CommentNode extends Node {
     /**
-     * The name of the node.
+     * htmlparser2 tree adapter CommentNode interface.
      */
-    name: "comment";
-    /**
-     * Comment text.
-     */
-    data: string;
-    /**
-     * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
-     */
-    nodeValue: string;
-    /**
-     * Comment source code location info. Available if location info is enabled via ParserOptions.
-     */
-    sourceCodeLocation?: parse5.Location;
-}
+    interface CommentNode extends Node {
+        /**
+         * The name of the node.
+         */
+        name: "comment";
+        /**
+         * Comment text.
+         */
+        data: string;
+        /**
+         * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+         */
+        nodeValue: string;
+        /**
+         * Comment source code location info. Available if location info is enabled via ParserOptions.
+         */
+        sourceCodeLocation?: parse5.Location;
+    }
 
-/**
- * htmlparser2 tree adapter TextNode interface.
- */
-export interface TextNode extends Node {
     /**
-     * The name of the node.
+     * htmlparser2 tree adapter TextNode interface.
      */
-    name: "text";
-    /**
-     * Text content.
-     */
-    data: string;
-    /**
-     * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
-     */
-    nodeValue: string;
-    /**
-     * Comment source code location info. Available if location info is enabled via ParserOptions.
-     */
-    sourceCodeLocation?: parse5.Location;
+    interface TextNode extends Node {
+        /**
+         * The name of the node.
+         */
+        name: "text";
+        /**
+         * Text content.
+         */
+        data: string;
+        /**
+         * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+         */
+        nodeValue: string;
+        /**
+         * Comment source code location info. Available if location info is enabled via ParserOptions.
+         */
+        sourceCodeLocation?: parse5.Location;
+    }
 }
 
 declare const treeAdapter: parse5.TreeAdapter;
-export default treeAdapter;
+export = treeAdapter;
diff --git a/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts b/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts
index e14ad9da3b..95a84d7a0d 100644
--- a/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts
+++ b/types/parse5-htmlparser2-tree-adapter/parse5-htmlparser2-tree-adapter-tests.ts
@@ -1,5 +1,5 @@
 import { parse } from "parse5";
-import treeAdapter, {
+import {
     Node,
     ParentNode,
     Document,
@@ -8,6 +8,7 @@ import treeAdapter, {
     TextNode,
     CommentNode
 } from "parse5-htmlparser2-tree-adapter";
+import treeAdapter = require('parse5-htmlparser2-tree-adapter');
 
 // htmlparser2 AST
 const htmlparser2Document = parse("<html>", {
diff --git a/types/parse5-parser-stream/index.d.ts b/types/parse5-parser-stream/index.d.ts
index ac10af57af..f8d117ea64 100644
--- a/types/parse5-parser-stream/index.d.ts
+++ b/types/parse5-parser-stream/index.d.ts
@@ -33,7 +33,7 @@ import * as parse5 from "parse5";
  * });
  * ```
  */
-export default class ParserStream<TDocument> extends stream.Writable {
+declare class ParserStream<TDocument> extends stream.Writable {
     /**
      * @param options - Parsing options.
      */
@@ -90,3 +90,7 @@ export default class ParserStream<TDocument> extends stream.Writable {
      */
     on(event: string, listener: (...params: any[]) => any): this;
 }
+
+declare namespace ParserStream {}
+
+export = ParserStream;
diff --git a/types/parse5-parser-stream/parse5-parser-stream-tests.ts b/types/parse5-parser-stream/parse5-parser-stream-tests.ts
index 6793ce7fa9..87ae6cdfa7 100644
--- a/types/parse5-parser-stream/parse5-parser-stream-tests.ts
+++ b/types/parse5-parser-stream/parse5-parser-stream-tests.ts
@@ -1,5 +1,5 @@
 import * as parse5 from "parse5";
-import ParserStream from "parse5-parser-stream";
+import * as ParserStream from "parse5-parser-stream";
 import { createReadStream } from "fs";
 
 const defaultAdapter = new Object() as parse5.TreeAdapter;
diff --git a/types/parse5-plain-text-conversion-stream/index.d.ts b/types/parse5-plain-text-conversion-stream/index.d.ts
index d5ac51ba18..21aac5aa97 100644
--- a/types/parse5-plain-text-conversion-stream/index.d.ts
+++ b/types/parse5-plain-text-conversion-stream/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import ParserStream from "parse5-parser-stream";
+import * as ParserStream from "parse5-parser-stream";
 
 /**
  * Converts plain text files into HTML document as required by [HTML specification](https://html.spec.whatwg.org/#read-text).
@@ -28,6 +28,10 @@ import ParserStream from "parse5-parser-stream";
  * file.pipe(converter);
  * ```
  */
-export default class PlainTextConversionStream<TDocument> extends ParserStream<
+declare class PlainTextConversionStream<TDocument> extends ParserStream<
     TDocument
 > {}
+
+declare namespace PlainTextConversionStream {}
+
+export = PlainTextConversionStream;
diff --git a/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts b/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts
index 00f6728dc2..bf7bed5419 100644
--- a/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts
+++ b/types/parse5-plain-text-conversion-stream/parse5-plain-text-conversion-stream-tests.ts
@@ -1,5 +1,5 @@
 import * as parse5 from "parse5";
-import PlainTextConversionStream from "parse5-plain-text-conversion-stream";
+import * as PlainTextConversionStream from "parse5-plain-text-conversion-stream";
 import { createReadStream } from "fs";
 
 const defaultAdapter = new Object() as parse5.TreeAdapter;
diff --git a/types/parse5-sax-parser/index.d.ts b/types/parse5-sax-parser/index.d.ts
index 0d98fb51e2..fee95802b8 100644
--- a/types/parse5-sax-parser/index.d.ts
+++ b/types/parse5-sax-parser/index.d.ts
@@ -9,84 +9,86 @@
 import * as stream from "stream";
 import * as parse5 from "parse5";
 
-export interface StartTagToken {
-    /**
-     * Tag name.
-     */
-    tagName: string;
-    /**
-     * List of attributes.
-     */
-    attrs: parse5.Attribute[];
-    /**
-     * Indicates if the tag is self-closing.
-     */
-    selfClosing: boolean;
-    /**
-     * Start tag source code location info. Available if location info is enabled via {@link SAXParserOptions}.
-     */
-    sourceCodeLocation?: parse5.StartTagLocation;
-}
+declare namespace SAXParser {
+    interface StartTagToken {
+        /**
+         * Tag name.
+         */
+        tagName: string;
+        /**
+         * List of attributes.
+         */
+        attrs: parse5.Attribute[];
+        /**
+         * Indicates if the tag is self-closing.
+         */
+        selfClosing: boolean;
+        /**
+         * Start tag source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+         */
+        sourceCodeLocation?: parse5.StartTagLocation;
+    }
 
-export interface EndTagToken {
-    /**
-     * Tag name.
-     */
-    tagName: string;
-    /**
-     * End tag source code location info. Available if location info is enabled via {@link SAXParserOptions}.
-     */
-    sourceCodeLocation?: parse5.Location;
-}
+    interface EndTagToken {
+        /**
+         * Tag name.
+         */
+        tagName: string;
+        /**
+         * End tag source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+         */
+        sourceCodeLocation?: parse5.Location;
+    }
 
-export interface CommentToken {
-    /**
-     * Comment text.
-     */
-    text: string;
-    /**
-     * Comment source code location info. Available if location info is enabled via {@link SAXParserOptions}.
-     */
-    sourceCodeLocation?: parse5.Location;
-}
+    interface CommentToken {
+        /**
+         * Comment text.
+         */
+        text: string;
+        /**
+         * Comment source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+         */
+        sourceCodeLocation?: parse5.Location;
+    }
 
-export interface TextToken {
-    /**
-     * Text content.
-     */
-    text: string;
-    /**
-     * Text content source code location info. Available if location info is enabled via {@link SAXParserOptions}.
-     */
-    sourceCodeLocation?: parse5.Location;
-}
+    interface TextToken {
+        /**
+         * Text content.
+         */
+        text: string;
+        /**
+         * Text content source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+         */
+        sourceCodeLocation?: parse5.Location;
+    }
 
-export interface DoctypeToken {
-    /**
-     * Document type name.
-     */
-    name: string;
-    /**
-     * Document type public identifier.
-     */
-    publicId: string;
-    /**
-     * Document type system identifier.
-     */
-    systemId: string;
-    /**
-     * Document type declaration source code location info. Available if location info is enabled via {@link SAXParserOptions}.
-     */
-    sourceCodeLocation?: parse5.Location;
-}
+    interface DoctypeToken {
+        /**
+         * Document type name.
+         */
+        name: string;
+        /**
+         * Document type public identifier.
+         */
+        publicId: string;
+        /**
+         * Document type system identifier.
+         */
+        systemId: string;
+        /**
+         * Document type declaration source code location info. Available if location info is enabled via {@link SAXParserOptions}.
+         */
+        sourceCodeLocation?: parse5.Location;
+    }
 
-export interface SAXParserOptions {
-    /**
-     * Enables source code location information for the tokens.
-     * When enabled, each token event handler will receive {@link Location} (or {@link StartTagLocation})
-     * object as its last argument.
-     */
-    sourceCodeLocationInfo?: boolean;
+    interface SAXParserOptions {
+        /**
+         * Enables source code location information for the tokens.
+         * When enabled, each token event handler will receive {@link Location} (or {@link StartTagLocation})
+         * object as its last argument.
+         */
+        sourceCodeLocationInfo?: boolean;
+    }
 }
 
 /**
@@ -119,43 +121,43 @@ export interface SAXParserOptions {
  * });
  * ```
  */
-export default class SAXParser extends stream.Transform {
+declare class SAXParser extends stream.Transform {
     /**
      * @param options - Parsing options.
      */
-    constructor(options?: SAXParserOptions);
+    constructor(options?: SAXParser.SAXParserOptions);
 
     /**
      * Raised when the parser encounters a start tag.
      *
      * @param listener.startTag - Start tag token.
      */
-    on(event: "startTag", listener: (startTag: StartTagToken) => void): this;
+    on(event: "startTag", listener: (startTag: SAXParser.StartTagToken) => void): this;
 
     /**
      * Raised when parser encounters an end tag.
      *
      * @param listener.endTag - End tag token.
      */
-    on(event: "endTag", listener: (endTag: EndTagToken) => void): this;
+    on(event: "endTag", listener: (endTag: SAXParser.EndTagToken) => void): this;
     /**
      * Raised when parser encounters text content.
      *
      * @param listener.text - Text token.
      */
-    on(event: "text", listener: (text: TextToken) => void): this;
+    on(event: "text", listener: (text: SAXParser.TextToken) => void): this;
     /**
      * Raised when parser encounters a comment.
      *
      * @param listener.comment - Comment content.
      */
-    on(event: "comment", listener: (comment: CommentToken) => void): this;
+    on(event: "comment", listener: (comment: SAXParser.CommentToken) => void): this;
     /**
      * Raised when parser encounters a [document type declaration](https://en.wikipedia.org/wiki/Document_type_declaration).
      *
      * @param listener.doctype - Document type token.
      */
-    on(event: "doctype", listener: (doctype: DoctypeToken) => void): this;
+    on(event: "doctype", listener: (doctype: SAXParser.DoctypeToken) => void): this;
     /**
      * TransformStream events
      */
@@ -190,3 +192,5 @@ export default class SAXParser extends stream.Transform {
      */
     stop(): void;
 }
+
+export = SAXParser;
diff --git a/types/parse5-sax-parser/parse5-sax-parser-tests.ts b/types/parse5-sax-parser/parse5-sax-parser-tests.ts
index 75fd4c25b2..1614a3a080 100644
--- a/types/parse5-sax-parser/parse5-sax-parser-tests.ts
+++ b/types/parse5-sax-parser/parse5-sax-parser-tests.ts
@@ -1,10 +1,11 @@
-import SAXParser, {
+import {
     StartTagToken,
     EndTagToken,
     CommentToken,
     TextToken,
     DoctypeToken
 } from "parse5-sax-parser";
+import SAXParser = require("parse5-sax-parser");
 import { createReadStream, createWriteStream } from "fs";
 
 let sax = new SAXParser();
diff --git a/types/parse5-serializer-stream/index.d.ts b/types/parse5-serializer-stream/index.d.ts
index d96db5e40c..8eb13be944 100644
--- a/types/parse5-serializer-stream/index.d.ts
+++ b/types/parse5-serializer-stream/index.d.ts
@@ -30,7 +30,7 @@ import * as parse5 from "parse5";
  * serializer.pipe(file);
  * ```
  */
-export default class SerializerStream extends stream.Readable {
+declare class SerializerStream extends stream.Readable {
     /**
      * Streaming AST node to an HTML serializer. A readable stream.
      *
@@ -39,3 +39,7 @@ export default class SerializerStream extends stream.Readable {
      */
     constructor(node: parse5.Node, options?: parse5.SerializerOptions);
 }
+
+declare namespace SerializerStream {}
+
+export = SerializerStream;
diff --git a/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts b/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts
index 3f5a8fbb96..bcb9e699fc 100644
--- a/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts
+++ b/types/parse5-serializer-stream/parse5-serializer-stream-tests.ts
@@ -1,5 +1,5 @@
 import { parse, TreeAdapter } from "parse5";
-import SerializerStream from "parse5-serializer-stream";
+import * as SerializerStream from "parse5-serializer-stream";
 import { createReadStream, createWriteStream } from "fs";
 
 const document = parse("<html>");
diff --git a/types/parse5/v4/index.d.ts b/types/parse5/v4/index.d.ts
new file mode 100644
index 0000000000..1f8b5a8df7
--- /dev/null
+++ b/types/parse5/v4/index.d.ts
@@ -0,0 +1,1081 @@
+// Type definitions for parse5 4.0
+// Project: https://github.com/inikulin/parse5
+// Definitions by:  Ivan Nikulin <https://github.com/inikulin>
+//                  Andy Patterson <https://github.com/andnp>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+import * as stream from "stream";
+
+// Markup data
+//-----------------------------------------------------------------------------------
+declare namespace MarkupData {
+    interface Location {
+        /**
+         * One-based line index
+         */
+        line: number;
+        /**
+         * One-based column index
+         */
+        col: number;
+        /**
+         * Zero-based first character index
+         */
+        startOffset: number;
+        /**
+         * Zero-based last character index
+         */
+        endOffset: number;
+    }
+
+    interface AttributesLocation {
+        [attributeName: string]: Location;
+    }
+
+    interface StartTagLocation extends Location {
+        /**
+         * Start tag attributes' location info
+         */
+        attrs: AttributesLocation
+    }
+
+    interface ElementLocation extends StartTagLocation {
+        /**
+         * Element's start tag location info.
+         */
+        startTag: StartTagLocation;
+        /**
+         * Element's end tag location info.
+         */
+        endTag: Location;
+    }
+}
+
+// Options
+//-----------------------------------------------------------------------------------
+declare namespace Options {
+    export interface ParserOptions {
+        /**
+         * Enables source code location information. When enabled, each node (except the root node) will have a `__location` property.
+         * If the node is not an empty element, `__location` will be a {@link MarkupData.ElementLocation} object, otherwise it will be {@link MarkupData.Location}.
+         * If the element was implicitly created by the parser (as part of [tree correction](https://html.spec.whatwg.org/multipage/syntax.html#an-introduction-to-error-handling-and-strange-cases-in-the-parser)), its `__location` property will be `undefined`.
+         *
+         * **Default:** `false`
+         */
+        locationInfo?: boolean;
+        /**
+         * Specifies the resulting tree format.
+         *
+         * **Default:** `treeAdapters.default`
+         */
+        treeAdapter?: AST.TreeAdapter;
+    }
+
+    export interface SAXParserOptions {
+        /**
+         * Enables source code location information for the tokens.
+         * When enabled, each token event handler will receive {@link MarkupData.Location} (or {@link MarkupData.StartTagLocation})
+         * object as its last argument.
+         */
+        locationInfo?: boolean;
+    }
+
+    export interface SerializerOptions {
+        /***
+         * Specifies input tree format.
+         *
+         * **Default:** `treeAdapters.default`
+         */
+        treeAdapter?: AST.TreeAdapter;
+    }
+}
+
+
+// AST
+//-----------------------------------------------------------------------------------
+declare namespace AST {
+    /**
+     * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+     */
+    type DocumentMode = 'no-quirks' | 'quirks' | 'limited-quirks';
+
+    // Default tree adapter
+    namespace Default {
+        /**
+         * Element attribute.
+         */
+        interface Attribute {
+            /**
+             * The name of the attribute.
+             */
+            name: string;
+            /**
+             * The value of the attribute.
+             */
+            value: string;
+            /**
+             * The namespace of the attribute.
+             */
+            namespace?: string;
+            /**
+             * The namespace-related prefix of the attribute.
+             */
+            prefix?: string;
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} Node interface.
+         */
+        interface Node {
+            /**
+             * The name of the node. E.g. {@link Document} will have `nodeName` equal to '#document'`.
+             */
+            nodeName: string;
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} ParentNode interface.
+         */
+        interface ParentNode {
+            /**
+             * Child nodes.
+             */
+            childNodes: Node[];
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} DocumentType interface.
+         */
+        export interface DocumentType extends Node {
+            /**
+             * The name of the node.
+             */
+            nodeName: '#documentType';
+            /**
+             * Document type name.
+             */
+            name: string;
+            /**
+             * Document type public identifier.
+             */
+            publicId: string;
+            /**
+             * Document type system identifier.
+             */
+            systemId: string;
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} Document interface.
+         */
+        export interface Document extends ParentNode {
+            /**
+             * The name of the node.
+             */
+            nodeName: '#document';
+            /**
+             * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+             */
+            mode: DocumentMode;
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} DocumentFragment interface.
+         */
+        export interface DocumentFragment extends ParentNode {
+            /**
+             * The name of the node.
+             */
+            nodeName: '#document-fragment';
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} Element interface.
+         */
+        export interface Element extends ParentNode {
+            /**
+             * The name of the node. Equals to element {@link tagName}.
+             */
+            nodeName: string;
+            /**
+             * Element tag name.
+             */
+            tagName: string;
+            /**
+             * Element namespace.
+             */
+            namespaceURI: string;
+            /**
+             * List of element attributes.
+             */
+            attrs: Attribute[];
+            /**
+             * Parent node.
+             */
+            parentNode: ParentNode;
+            /**
+             * Element source code location info. Available if location info is enabled via {@link Options.ParserOptions}.
+             */
+            __location?: MarkupData.ElementLocation;
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} CommentNode interface.
+         */
+        export interface CommentNode extends Node {
+            /**
+             * The name of the node.
+             */
+            nodeName: '#comment';
+            /**
+             * Comment text.
+             */
+            data: string;
+            /**
+             * Parent node.
+             */
+            parentNode: ParentNode;
+            /**
+             * Comment source code location info. Available if location info is enabled via {@link Options.ParserOptions}.
+             */
+            __location?: MarkupData.Location;
+        }
+
+        /**
+         * [Default tree adapter]{@link parse5.treeAdapters} TextNode interface.
+         */
+        export interface TextNode extends Node {
+            /**
+             * The name of the node.
+             */
+            nodeName: '#text';
+            /**
+             * Text content.
+             */
+            value: string;
+            /**
+             * Parent node.
+             */
+            parentNode: ParentNode;
+            /**
+             * Text node source code location info. Available if location info is enabled via {@link Options.ParserOptions}.
+             */
+            __location?: MarkupData.Location;
+        }
+    }
+
+
+    // htmlparser2 tree adapter
+    namespace HtmlParser2 {
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} Node interface.
+         */
+        interface Node {
+            /**
+             * The type of the node. E.g. {@link Document} will have `type` equal to 'root'`.
+             */
+            type: string;
+            /**
+             * [DOM spec](https://dom.spec.whatwg.org/#dom-node-nodetype)-compatible node {@link type}.
+             */
+            nodeType: number;
+            /**
+             * Parent node.
+             */
+            parent: ParentNode;
+            /**
+             * Same as {@link parent}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+             */
+            parentNode: ParentNode;
+            /**
+             * Previous sibling.
+             */
+            prev: Node;
+            /**
+             * Same as {@link prev}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+             */
+            previousSibling: Node;
+            /**
+             * Next sibling.
+             */
+            next: Node;
+            /**
+             * Same as {@link next}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+             */
+            nextSibling: Node;
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} ParentNode interface.
+         */
+        interface ParentNode extends Node {
+            /**
+             * Child nodes.
+             */
+            children: Node[];
+            /**
+             * Same as {@link children}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+             */
+            childNodes: Node[];
+            /**
+             * First child of the node.
+             */
+            firstChild: Node;
+            /**
+             * Last child of the node.
+             */
+            lastChild: Node;
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} DocumentType interface.
+         */
+        export interface DocumentType extends Node {
+            /**
+             * The type of the node.
+             */
+            type: 'directive';
+            /**
+             * Node name.
+             */
+            name: '!doctype';
+            /**
+             * Serialized doctype {@link name}, {@link publicId} and {@link systemId}.
+             */
+            data: string;
+            /**
+             * Document type name.
+             */
+            'x-name':string;
+            /**
+             * Document type public identifier.
+             */
+            'x-publicId': string;
+            /**
+             * Document type system identifier.
+             */
+            'x-systemId': string;
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} Document interface.
+         */
+        export interface Document extends ParentNode {
+            /**
+             * The type of the node.
+             */
+            type: 'root';
+            /**
+             * The name of the node.
+             */
+            name: 'root';
+            /**
+             * [Document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+             */
+            'x-mode': DocumentMode;
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} DocumentFragment interface.
+         */
+        export interface DocumentFragment extends ParentNode {
+            /**
+             * The type of the node.
+             */
+            type: 'root';
+            /**
+             * The name of the node.
+             */
+            name: 'root';
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} Element interface.
+         */
+        export interface Element extends ParentNode {
+            /**
+             * The name of the node. Equals to element {@link tagName}.
+             */
+            name: string;
+            /**
+             * Element tag name.
+             */
+            tagName: string;
+            /**
+             * Element namespace.
+             */
+            namespace: string;
+            /**
+             * Element attributes.
+             */
+            attribs: { [name: string]: string };
+            /**
+             * Element attribute namespaces.
+             */
+            'x-attribsNamespace': { [name: string]: string };
+            /**
+             * Element attribute namespace-related prefixes.
+             */
+            'x-attribsPrefix': { [name: string]: string };
+            /**
+             * Element source code location info. Available if location info is enabled via {@link Options.ParserOptions}.
+             */
+            __location?: MarkupData.ElementLocation;
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} CommentNode interface.
+         */
+        export interface CommentNode extends Node {
+            /**
+             * The name of the node.
+             */
+            name: 'comment';
+            /**
+             * Comment text.
+             */
+            data: string;
+            /**
+             * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+             */
+            nodeValue: string;
+            /**
+             * Comment source code location info. Available if location info is enabled via {@link Options.ParserOptions}.
+             */
+            __location?: MarkupData.Location;
+        }
+
+        /**
+         * [htmlparser2 tree adapter]{@link parse5.treeAdapters} TextNode interface.
+         */
+        export interface TextNode extends Node {
+            /**
+             * The name of the node.
+             */
+            name: 'text';
+            /**
+             * Text content.
+             */
+            data: string;
+            /**
+             * Same as {@link data}. [DOM spec](https://dom.spec.whatwg.org)-compatible alias.
+             */
+            nodeValue: string;
+            /**
+             * Comment source code location info. Available if location info is enabled via {@link Options.ParserOptions}.
+             */
+            __location?: MarkupData.Location;
+        }
+    }
+
+
+    // Unions
+    // NOTE: we use `Object` in unions to support custom tree adapter implementations.
+    // TypeScript Handbook suggests to always use `any` instead of `Object`, but in that
+    // case language service hints `any` as type, instead of actual union name.
+    /**
+     * Generic Node interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.Node}) to get access to the properties.
+     */
+    type Node = Default.Node | HtmlParser2.Node | Object;
+    /**
+     * Generic ParentNode interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.ParentNode}) to get access to the properties.
+     */
+    type ParentNode = Default.ParentNode | HtmlParser2.ParentNode | Object;
+    /**
+     * Generic DocumentType interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.DocumentType}) to get access to the properties.
+     */
+    type DocumentType = Default.DocumentType | HtmlParser2.DocumentType | Object;
+    /**
+     * Generic Document interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.Document}) to get access to the properties.
+     */
+    type Document = Default.Document | HtmlParser2.Document | Object;
+    /**
+     * Generic DocumentFragment interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.DocumentFragment}) to get access to the properties.
+     */
+    type DocumentFragment = Default.DocumentFragment | HtmlParser2.DocumentFragment | Object;
+    /**
+     * Generic Element interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.Element}) to get access to the properties.
+     */
+    type Element = Default.Element | HtmlParser2.Element | Object;
+    /**
+     * Generic TextNode interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.TextNode}) to get access to the properties.
+     */
+    type TextNode = Default.TextNode | HtmlParser2.TextNode | Object;
+    /**
+     * Generic CommentNode interface.
+     * Cast to the actual AST interface (e.g. {@link parse5.AST.Default.CommentNode}) to get access to the properties.
+     */
+    type CommentNode = Default.CommentNode | HtmlParser2.CommentNode | Object;
+
+
+    // Tree adapter interface
+    //-----------------------------------------------------------------------------------
+
+    /**
+     * Tree adapter is a set of utility functions that provides minimal required abstraction layer beetween parser and a specific AST format.
+     * Note that `TreeAdapter` is not designed to be a general purpose AST manipulation library. You can build such library
+     * on top of existing `TreeAdapter` or use one of the existing libraries from npm.
+     *
+     * @see [default implementation](https://github.com/inikulin/parse5/blob/master/lib/tree_adapters/default.js)
+     */
+    export interface TreeAdapter {
+        /**
+         * Creates a document node.
+         */
+        createDocument(): AST.Document;
+        /**
+         * Creates a document fragment node.
+         */
+        createDocumentFragment(): AST.DocumentFragment;
+        /**
+         * Creates an element node.
+         *
+         * @param tagName - Tag name of the element.
+         * @param namespaceURI - Namespace of the element.
+         * @param attrs - Attribute name-value pair array. Foreign attributes may contain `namespace` and `prefix` fields as well.
+         */
+        createElement(tagName: string, namespaceURI: string, attrs: AST.Default.Attribute[]): AST.Element;
+        /**
+         * Creates a comment node.
+         *
+         * @param data - Comment text.
+         */
+        createCommentNode(data: string): AST.CommentNode;
+        /**
+         * Appends a child node to the given parent node.
+         *
+         * @param parentNode - Parent node.
+         * @param newNode -  Child node.
+         */
+        appendChild(parentNode: AST.ParentNode, newNode: AST.Node): void;
+        /**
+         * Inserts a child node to the given parent node before the given reference node.
+         *
+         * @param parentNode - Parent node.
+         * @param newNode -  Child node.
+         * @param referenceNode -  Reference node.
+         */
+        insertBefore(parentNode: AST.ParentNode, newNode: AST.Node, referenceNode: AST.Node): void;
+        /**
+         * Sets the `<template>` element content element.
+         *
+         * @param templateElement - `<template>` element.
+         * @param contentElement -  Content element.
+         */
+        setTemplateContent(templateElement: AST.Element, contentElement: AST.DocumentFragment): void;
+        /**
+         * Returns the `<template>` element content element.
+         *
+         * @param templateElement - `<template>` element.
+         */
+        getTemplateContent(templateElement: AST.Element): AST.DocumentFragment;
+        /**
+         * Sets the document type. If the `document` already contains a document type node, the `name`, `publicId` and `systemId`
+         * properties of this node will be updated with the provided values. Otherwise, creates a new document type node
+         * with the given properties and inserts it into the `document`.
+         *
+         * @param document - Document node.
+         * @param name -  Document type name.
+         * @param publicId - Document type public identifier.
+         * @param systemId - Document type system identifier.
+         */
+        setDocumentType(document: AST.Document, name: string, publicId: string, systemId: string): void;
+        /**
+         * Sets the [document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+         *
+         * @param document - Document node.
+         * @param mode - Document mode.
+         */
+        setDocumentMode(document: AST.Document, mode: AST.DocumentMode): void;
+        /**
+         * Returns [document mode](https://dom.spec.whatwg.org/#concept-document-limited-quirks).
+         *
+         * @param document - Document node.
+         */
+        getDocumentMode(document: AST.Document): AST.DocumentMode;
+        /**
+         * Removes a node from its parent.
+         *
+         * @param node - Node to remove.
+         */
+        detachNode(node: AST.Node): void;
+        /**
+         * Inserts text into a node. If the last child of the node is a text node, the provided text will be appended to the
+         * text node content. Otherwise, inserts a new text node with the given text.
+         *
+         * @param parentNode - Node to insert text into.
+         * @param text - Text to insert.
+         */
+        insertText(parentNode: AST.ParentNode, text: string): void;
+        /**
+         * Inserts text into a sibling node that goes before the reference node. If this sibling node is the text node,
+         * the provided text will be appended to the text node content. Otherwise, inserts a new sibling text node with
+         * the given text before the reference node.
+         *
+         * @param parentNode - Node to insert text into.
+         * @param text - Text to insert.
+         * @param referenceNode - Node to insert text before.
+         */
+        insertTextBefore(parentNode: AST.ParentNode, text: string, referenceNode: AST.Node): void;
+        /**
+         * Copies attributes to the given element. Only attributes that are not yet present in the element are copied.
+         *
+         * @param recipient - Element to copy attributes into.
+         * @param attrs - Attributes to copy.
+         */
+        adoptAttributes(recipient: AST.Element, attrs: AST.Default.Attribute[]): void;
+        /**
+         * Returns the first child of the given node.
+         *
+         * @param node - Node.
+         */
+        getFirstChild(node: AST.ParentNode): AST.Node;
+        /**
+         * Returns the given node's children in an array.
+         *
+         * @param node - Node.
+         */
+        getChildNodes(node: AST.ParentNode): AST.Node[];
+        /**
+         * Returns the given node's parent.
+         *
+         * @param node - Node.
+         */
+        getParentNode(node: AST.Node): AST.ParentNode;
+        /**
+         * Returns the given element's attributes in an array, in the form of name-value pairs.
+         * Foreign attributes may contain `namespace` and `prefix` fields as well.
+         *
+         * @param element - Element.
+         */
+        getAttrList(element: AST.Element): AST.Default.Attribute[];
+        /**
+         * Returns the given element's tag name.
+         *
+         * @param element - Element.
+         */
+        getTagName(element: AST.Element): string;
+        /**
+         * Returns the given element's namespace.
+         *
+         * @param element - Element.
+         */
+        getNamespaceURI(element: AST.Element): string;
+        /**
+         * Returns the given text node's content.
+         *
+         * @param textNode - Text node.
+         */
+        getTextNodeContent(textNode: AST.TextNode): string;
+        /**
+         * Returns the given comment node's content.
+         *
+         * @param commentNode - Comment node.
+         */
+        getCommentNodeContent(commentNode: AST.CommentNode): string;
+        /**
+         * Returns the given document type node's name.
+         *
+         * @param doctypeNode - Document type node.
+         */
+        getDocumentTypeNodeName(doctypeNode: AST.DocumentType): string;
+        /**
+         * Returns the given document type node's public identifier.
+         *
+         * @param doctypeNode - Document type node.
+         */
+        getDocumentTypeNodePublicId(doctypeNode: AST.DocumentType): string;
+        /**
+         * Returns the given document type node's system identifier.
+         *
+         * @param doctypeNode - Document type node.
+         */
+        getDocumentTypeNodeSystemId(doctypeNode: AST.DocumentType): string;
+        /**
+         * Determines if the given node is a text node.
+         *
+         * @param node - Node.
+         */
+        isTextNode(node: AST.Node): boolean;
+        /**
+         * Determines if the given node is a comment node.
+         *
+         * @param node - Node.
+         */
+        isCommentNode(node: AST.Node): boolean;
+        /**
+         * Determines if the given node is a document type node.
+         *
+         * @param node - Node.
+         */
+        isDocumentTypeNode(node: AST.Node): boolean;
+        /**
+         * Determines if the given node is an element.
+         *
+         * @param node - Node.
+         */
+        isElementNode(node: AST.Node): boolean;
+    }
+}
+
+
+// Included tree adapters
+//-----------------------------------------------------------------------------------
+
+/**
+ * Provides built-in tree adapters that can be used for parsing and serialization.
+ *
+ * @example
+ *```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * // Uses the default tree adapter for parsing.
+ * const document = parse5.parse('<div></div>', {
+ *     treeAdapter: parse5.treeAdapters.default
+ * });
+ *
+ * // Uses the htmlparser2 tree adapter with the SerializerStream.
+ * const serializer = new parse5.SerializerStream(node, {
+ *     treeAdapter: parse5.treeAdapters.htmlparser2
+ * });
+ * ```
+ */
+export var treeAdapters: {
+    /**
+     * Default tree format for parse5.
+     */
+    default: AST.TreeAdapter,
+    /**
+     * Quite popular [htmlparser2](https://github.com/fb55/htmlparser2) tree format
+     * (e.g. used by [cheerio](https://github.com/MatthewMueller/cheerio) and [jsdom](https://github.com/tmpvar/jsdom)).
+     */
+    htmlparser2: AST.TreeAdapter
+};
+
+
+// Shorthand methods
+//-----------------------------------------------------------------------------------
+
+/**
+ * Parses an HTML string.
+ *
+ * @param html - Input HTML string.
+ * @param options - Parsing options.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * const document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
+ *
+ * console.log(document.childNodes[1].tagName); //> 'html'
+ * ```
+ */
+export function parse(html: string, options?: Options.ParserOptions): AST.Document;
+
+/**
+ * Parses an HTML fragment.
+ *
+ * @param fragmentContext - Parsing context element. If specified, given fragment will be parsed as if it was set to the context element's `innerHTML` property.
+ * @param html - Input HTML fragment string.
+ * @param options - Parsing options.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * const documentFragment = parse5.parseFragment('<table></table>');
+ *
+ * console.log(documentFragment.childNodes[0].tagName); //> 'table'
+ *
+ * // Parses the html fragment in the context of the parsed <table> element.
+ * const trFragment = parser.parseFragment(documentFragment.childNodes[0], '<tr><td>Shake it, baby</td></tr>');
+ *
+ * console.log(trFragment.childNodes[0].childNodes[0].tagName); //> 'td'
+ * ```
+ */
+export function parseFragment(fragmentContext: AST.Element, html: string, options?: Options.ParserOptions): AST.DocumentFragment;
+export function parseFragment(html: string, options?: Options.ParserOptions): AST.DocumentFragment;
+
+/**
+ * Serializes an AST node to an HTML string.
+ *
+ * @param node - Node to serialize.
+ * @param options - Serialization options.
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ *
+ * const document = parse5.parse('<!DOCTYPE html><html><head></head><body>Hi there!</body></html>');
+ *
+ * // Serializes a document.
+ * const html = parse5.serialize(document);
+ *
+ * // Serializes the <html> element content.
+ * const str = parse5.serialize(document.childNodes[1]);
+ *
+ * console.log(str); //> '<head></head><body>Hi there!</body>'
+ * ```
+ */
+export function serialize(node: AST.Node, options?: Options.SerializerOptions): string;
+
+
+// Parser stream
+//-----------------------------------------------------------------------------------
+
+/**
+ * Streaming HTML parser with scripting support.
+ * A [writable stream](https://nodejs.org/api/stream.html#stream_class_stream_writable).
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const http = require('http');
+ *
+ * // Fetch the page content and obtain it's <head> node
+ * http.get('http://inikulin.github.io/parse5/', res => {
+ *    const parser = new parse5.ParserStream();
+ *
+ *    parser.once('finish', () => {
+ *        console.log(parser.document.childNodes[1].childNodes[0].tagName); //> 'head'
+ *    });
+ *
+ *    res.pipe(parser);
+ * });
+ * ```
+ */
+export class ParserStream extends stream.Writable {
+    /**
+     * @param options - Parsing options.
+     */
+    constructor(options?: Options.ParserOptions);
+
+    /**
+     * The resulting document node.
+     */
+    document: AST.Document;
+
+    /**
+     * Raised then parser encounters a `<script>` element.
+     * If this event has listeners, parsing will be suspended once it is emitted.
+     * So, if `<script>` has the `src` attribute, you can fetch it, execute and then resume parsing just like browsers do.
+     *
+     * @param listener.scriptElement - The script element that caused the event.
+     * @param listener.documentWrite - Write additional `html` at the current parsing position. Suitable for implementing the DOM `document.write` and `document.writeln` methods.
+     * @param listener.documentWrite.html - HTML to write.
+     * @param listener.resume - Resumes parsing.
+     *
+     * @example
+     * ```js
+     *
+     * const parse = require('parse5');
+     * const http = require('http');
+     *
+     * const parser = new parse5.ParserStream();
+     *
+     * parser.on('script', (scriptElement, documentWrite, resume) => {
+     *     const src = parse5.treeAdapters.default.getAttrList(scriptElement)[0].value;
+     *
+     *     http.get(src, res => {
+     *        // Fetch the script content, execute it with DOM built around `parser.document` and
+     *        // `document.write` implemented using `documentWrite`.
+     *        ...
+     *        // Then resume parsing.
+     *        resume();
+     *     });
+     * });
+     *
+     * parser.end('<script src="example.com/script.js"></script>');
+     * ```
+     */
+    on(event: 'script', listener: (scriptElement: AST.Element, documentWrite: (html: string) => void, resume: () => void) => void): this;
+    /**
+     * WritableStream events
+     */
+    on(event: string, listener: Function): this;
+}
+
+
+// Plaint text conversion stream
+//-----------------------------------------------------------------------------------
+
+/**
+ * Converts plain text files into HTML document as required by [HTML specification](https://html.spec.whatwg.org/#read-text).
+ * A [writable stream](https://nodejs.org/api/stream.html#stream_class_stream_writable).
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const fs = require('fs');
+ *
+ * const file = fs.createReadStream('war_and_peace.txt');
+ * const converter = new parse5.PlainTextConversionStream();
+ *
+ * converter.once('finish', () => {
+ *     console.log(converter.document.childNodes[1].childNodes[0].tagName); //> 'head'
+ * });
+ *
+ * file.pipe(converter);
+ * ```
+ */
+export class PlainTextConversionStream extends ParserStream { }
+
+
+// SAX parser
+//-----------------------------------------------------------------------------------
+/**
+ * Streaming [SAX](https://en.wikipedia.org/wiki/Simple_API_for_XML)-style HTML parser.
+ * A [transform stream](https://nodejs.org/api/stream.html#stream_class_stream_transform)
+ * (which means you can pipe *through* it, see example).
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const http = require('http');
+ * const fs = require('fs');
+ *
+ * const file = fs.createWriteStream('/home/google.com.html');
+ * const parser = new parse5.SAXParser();
+ *
+ * parser.on('text', text => {
+ *    // Handle page text content
+ *    ...
+ * });
+ *
+ * http.get('http://google.com', res => {
+ *    // SAXParser is the Transform stream, which means you can pipe
+ *    // through it. So, you can analyze page content and, e.g., save it
+ *    // to the file at the same time:
+ *    res.pipe(parser).pipe(file);
+ * });
+ * ```
+ */
+export class SAXParser extends stream.Transform {
+    /**
+     * @param options - Parsing options.
+     */
+    constructor(options?: Options.SAXParserOptions);
+
+    /**
+     * Raised when the parser encounters a start tag.
+     *
+     * @param listener.name - Tag name.
+     * @param listener.attrs - List of attributes.
+     * @param listener.selfClosing - Indicates if the tag is self-closing.
+     * @param listener.location - Start tag source code location info. Available if location info is enabled via {@link Options.SAXParserOptions}.
+     */
+    on(event: 'startTag', listener: (name: string, attrs: AST.Default.Attribute[], selfClosing: boolean, location?: MarkupData.StartTagLocation) => void): this;
+    /**
+     * Raised then parser encounters an end tag.
+     *
+     * @param listener.name - Tag name.
+     * @param listener.location - End tag source code location info. Available if location info is enabled via {@link Options.SAXParserOptions}.
+     */
+    on(event: 'endTag', listener: (name: string, location?: MarkupData.Location) => void): this;
+    /**
+     * Raised then parser encounters a comment.
+     *
+     * @param listener.text - Comment text.
+     * @param listener.location - Comment source code location info. Available if location info is enabled via {@link Options.SAXParserOptions}.
+     */
+    on(event: 'comment', listener: (text: string, location?: MarkupData.Location) => void): this;
+    /**
+     * Raised then parser encounters text content.
+     *
+     * @param listener.text - Text content.
+     * @param listener.location - Text content code location info. Available if location info is enabled via {@link Options.SAXParserOptions}.
+     */
+    on(event: 'text', listener: (text: string, location?: MarkupData.Location) => void): this;
+    /**
+     * Raised then parser encounters a [document type declaration](https://en.wikipedia.org/wiki/Document_type_declaration).
+     *
+     * @param listener.name - Document type name.
+     * @param listener.publicId - Document type public identifier.
+     * @param listener.systemId - Document type system identifier.
+     * @param listener.location - Document type declaration source code location info. Available if location info is enabled via {@link Options.SAXParserOptions}.
+     */
+    on(event: 'doctype', listener: (name: string, publicId: string, systemId: string, location?: MarkupData.Location) => void): this;
+    /**
+     * TransformStream events
+     */
+    on(event: string, listener: Function): this;
+
+    /**
+     * Stops parsing. Useful if you want the parser to stop consuming CPU time once you've obtained the desired info
+     * from the input stream. Doesn't prevent piping, so that data will flow through the parser as usual.
+     *
+     * @example
+     * ```js
+     *
+     * const parse5 = require('parse5');
+     * const http = require('http');
+     * const fs = require('fs');
+     *
+     * const file = fs.createWriteStream('google.com.html');
+     * const parser = new parse5.SAXParser();
+     *
+     * parser.on('doctype', (name, publicId, systemId) => {
+     *    // Process doctype info ans stop parsing
+     *    ...
+     *    parser.stop();
+     * });
+     *
+     * http.get('http://google.com', res => {
+     *    // Despite the fact that parser.stop() was called whole
+     *    // content of the page will be written to the file
+     *    res.pipe(parser).pipe(file);
+     * });
+     * ```
+     */
+    stop(): void;
+}
+
+
+// Serializer stream
+//-----------------------------------------------------------------------------------
+
+/**
+ * Streaming AST node to an HTML serializer.
+ * A [readable stream](https://nodejs.org/api/stream.html#stream_class_stream_readable).
+ *
+ * @example
+ * ```js
+ *
+ * const parse5 = require('parse5');
+ * const fs = require('fs');
+ *
+ * const file = fs.createWriteStream('/home/index.html');
+ *
+ * // Serializes the parsed document to HTML and writes it to the file.
+ * const document = parse5.parse('<body>Who is John Galt?</body>');
+ * const serializer = new parse5.SerializerStream(document);
+ *
+ * serializer.pipe(file);
+ * ```
+ */
+export class SerializerStream extends stream.Readable {
+    /**
+     * Streaming AST node to an HTML serializer. A readable stream.
+     *
+     * @param node - Node to serialize.
+     * @param options - Serialization options.
+     */
+    constructor(node: AST.Node, options?: Options.SerializerOptions);
+}
diff --git a/types/parse5/v4/parse5-tests.ts b/types/parse5/v4/parse5-tests.ts
new file mode 100644
index 0000000000..70a7b370f2
--- /dev/null
+++ b/types/parse5/v4/parse5-tests.ts
@@ -0,0 +1,89 @@
+import * as parse5 from "parse5";
+
+// Shorthands
+// parse
+const document = parse5.parse("<html>");
+
+document; // $ExpectType Document
+
+const defaultAdapter = new Object() as parse5.AST.TreeAdapter;
+
+parse5.parse("<html>", {}); // $ExpectType Document
+parse5.parse("<html>", { treeAdapter: defaultAdapter }); // $ExpectType Document
+
+let opt = {
+    sourceCodeLocationInfo: true,
+    scriptingEnabled: false,
+    treeAdapter: defaultAdapter
+};
+
+parse5.parse("<html>", opt); // $ExpectType Document
+
+opt = {
+    sourceCodeLocationInfo: true,
+    scriptingEnabled: false,
+    treeAdapter: defaultAdapter
+};
+
+parse5.parse("<html>", opt); // $ExpectType Document
+
+// parseFragment
+const fragment = parse5.parseFragment("<div>");
+
+fragment; // $ExpectType DocumentFragment
+
+parse5.parseFragment("<div>", {});
+parse5.parseFragment("<div>", { treeAdapter: defaultAdapter });
+
+const element = (parse5.parseFragment(
+    "<div>"
+)) as parse5.AST.Element;
+
+parse5.parseFragment(element, "<div>");
+parse5.parseFragment(element, "<div>", {});
+parse5.parseFragment(element, "<div>", {
+    treeAdapter: defaultAdapter
+});
+
+// serialize
+const html = parse5.serialize(element);
+
+html; // $ExpectType string
+
+parse5.serialize(element, { treeAdapter: defaultAdapter });
+parse5.serialize(element, { treeAdapter: defaultAdapter });
+
+
+const adapter = defaultAdapter;
+
+adapter.createDocument(); // $ExpectType Document
+adapter.createDocumentFragment(); // $ExpectType DocumentFragment
+adapter.createElement("div", "namespace", [{ name: "someAttr", value: "42" }]); // $ExpectType Element
+adapter.createCommentNode("foo"); // $ExpectType CommentNode
+
+adapter.appendChild(document, element);
+adapter.insertBefore(document, element, element);
+adapter.setTemplateContent(element, fragment);
+
+adapter.getTemplateContent(element); // $ExpectType DocumentFragment
+
+adapter.setDocumentType(document, "name", "publicId", "systemId");
+adapter.setDocumentMode(document, "quirks");
+
+adapter.getDocumentMode(document); // $ExpectType DocumentMode
+
+adapter.detachNode(element);
+adapter.insertText(element, "text");
+adapter.insertTextBefore(document, "text", element);
+adapter.adoptAttributes(element, [{ name: "someAttr", value: "42" }]);
+
+adapter.getFirstChild(element); // $ExpectType Node
+adapter.getChildNodes(element)[0]; // $ExpectType Node
+adapter.getParentNode(element); // $ExpectType ParentNode
+adapter.getAttrList(element)[0]; // $ExpectType Attribute
+adapter.getTagName(element); // $ExpectType string
+adapter.getNamespaceURI(element); // $ExpectType string
+adapter.isTextNode(element); // $ExpectType boolean
+adapter.isCommentNode(element); // $ExpectType boolean
+adapter.isDocumentTypeNode(element); // $ExpectType boolean
+adapter.isElementNode(element); // $ExpectType boolean
diff --git a/types/parse5/v4/tsconfig.json b/types/parse5/v4/tsconfig.json
new file mode 100644
index 0000000000..97e1cf7849
--- /dev/null
+++ b/types/parse5/v4/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "parse5": [ "parse5/v4" ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "parse5-tests.ts"
+    ]
+}
diff --git a/types/parse5/v4/tslint.json b/types/parse5/v4/tslint.json
new file mode 100644
index 0000000000..7646a8bd15
--- /dev/null
+++ b/types/parse5/v4/tslint.json
@@ -0,0 +1,17 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "comment-format": false,
+        "strict-export-declare-modifiers": false,
+        "semicolon": false,
+        "max-line-length": false,
+        "no-consecutive-blank-lines": false,
+        "typedef-whitespace": false,
+        "whitespace": false,
+        "ban-types": false,
+        "no-unnecessary-qualifier": false,
+        "jsdoc-format": false,
+        "no-var-keyword": false,
+        "unified-signatures": false
+    }
+}
diff --git a/types/parsecurrency/index.d.ts b/types/parsecurrency/index.d.ts
new file mode 100644
index 0000000000..0e9402ba13
--- /dev/null
+++ b/types/parsecurrency/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for parsecurrency 0.2
+// Project: https://github.com/mktj/parsecurrency#readme
+// Definitions by: Cristian Greco <https://github.com/cristianrgreco>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+interface ParsedCurrency {
+    raw: string;
+    value: number;
+    integer: string;
+    decimals: string;
+    currency: string;
+    symbol: string;
+    decimalSeparator: string;
+    groupSeparator: string;
+}
+
+declare function parsecurrency(currency: string): ParsedCurrency;
+
+export = parsecurrency;
diff --git a/types/parsecurrency/parsecurrency-tests.ts b/types/parsecurrency/parsecurrency-tests.ts
new file mode 100644
index 0000000000..70a575c46c
--- /dev/null
+++ b/types/parsecurrency/parsecurrency-tests.ts
@@ -0,0 +1,12 @@
+import parsecurrency = require("parsecurrency");
+
+const {
+    raw,
+    value,
+    integer,
+    decimals,
+    currency,
+    symbol,
+    decimalSeparator,
+    groupSeparator
+} = parsecurrency("$100");
diff --git a/types/parsecurrency/tsconfig.json b/types/parsecurrency/tsconfig.json
new file mode 100644
index 0000000000..6fc20c3d2d
--- /dev/null
+++ b/types/parsecurrency/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",
+        "parsecurrency-tests.ts"
+    ]
+}
diff --git a/types/parsecurrency/tslint.json b/types/parsecurrency/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/parsecurrency/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/parsimmon/index.d.ts b/types/parsimmon/index.d.ts
index 96909be96a..d8ea7c3b17 100644
--- a/types/parsimmon/index.d.ts
+++ b/types/parsimmon/index.d.ts
@@ -1,12 +1,13 @@
-// Type definitions for Parsimmon 1.6
+// Type definitions for Parsimmon 1.10
 // Project: https://github.com/jneen/parsimmon
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
 //                 Boris Cherny <https://github.com/bcherny>
 //                 Benny van Reeven <https://github.com/bvanreeven>
 //                 Leonard Thieu <https://github.com/leonard-thieu>
+//                 Jonathan Frere <https://github.com/MrJohz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 /**
  * **NOTE:** You probably will never need to use this function. Most parsing
@@ -126,6 +127,14 @@ declare namespace Parsimmon {
 		 */
 		// tslint:disable-next-line:unified-signatures
 		then<U>(anotherParser: Parser<U>): Parser<U>;
+		/**
+		 * Transforms the input of parser with the given function.
+		 */
+		contramap<U>(fn: (input: T) => U): Parser<U>;
+		/**
+		 * Transforms the input and output of parser with the given function.
+		 */
+		promap<U, V>(inputFn: (input: T) => U, outputFn: (output: U) => V): Parser<V>;
 		/**
 		 * returns wrapper(this) from the parser. Useful for custom functions used
 		 * to wrap your parsers, while keeping with Parsimmon chaining style.
@@ -151,6 +160,10 @@ declare namespace Parsimmon {
 		 * expects otherParser after parser, but preserves the yield value of parser.
 		 */
 		skip<U>(otherParser: Parser<U>): Parser<T>;
+		/**
+		 * Expects the parser before before parser and after after parser.
+		 */
+		wrap(before: Parser<any>, after: Parser<any>): Parser<T>;
 		/**
 		 * Returns a parser that looks for anything but whatever anotherParser wants to
 		 * parse, and does not consume it. Yields the same result as parser. Equivalent to
@@ -163,6 +176,17 @@ declare namespace Parsimmon {
 		 * parser.skip(Parsimmon.lookahead(anotherParser)).
 		 */
 		lookahead(arg: Parser<any> | string | RegExp): Parser<T>;
+		/**
+		 * Equivalent to parser.tieWith("").
+		 *
+		 * Note: parser.tie() is usually used after Parsimmon.seq(...parsers) or parser.many().
+		 */
+		tie(): Parser<string>;
+		/**
+		 * When called on a parser yielding an array of strings, yields all their strings
+		 * concatenated with the separator. Asserts that its input is actually an array of strings.
+		 */
+		tieWith(join: string): Parser<string>;
 		/**
 		 * expects parser zero or more times, and yields an array of the results.
 		 */
@@ -198,7 +222,34 @@ declare namespace Parsimmon {
 		 * Returns a new parser whose failure message is description.
 		 * For example, string('x').desc('the letter x') will indicate that 'the letter x' was expected.
 		 */
-		desc(description: string): Parser<T>;
+		desc(description: string | string[]): Parser<T>;
+
+		// Fantasy land support
+
+		/**
+		 * Returns Parsimmon.fail("fantasy-land/empty").
+		 */
+		empty(): Parser<never>;
+		/**
+		 * Takes parser which returns a function and applies it to the parsed value of otherParser.
+		 */
+		ap<U>(otherParser: Parser<(t: T) => U>): Parser<U>;
+		/**
+		 * Equivalent to Parsimmon.sepBy(parser, separator).
+		 *
+		 * Expects zero or more matches for parser, separated by the parser separator, yielding an array.
+		 */
+		sepBy<U>(separator: Parser<U>): Parser<T[]>;
+		/**
+		 * Equivalent to Parsimmon.sepBy(parser, separator).
+		 *
+		 * Expects one or more matches for parser, separated by the parser separator, yielding an array.
+		 */
+		sepBy1<U>(separator: Parser<U>): Parser<T[]>;
+		/**
+		 * Equivalent to Parsimmon.of(result).
+		 */
+		of<U>(result: U): Parser<U>;
 	}
 
 	/**
@@ -265,7 +316,7 @@ declare namespace Parsimmon {
 	 * 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): FailureReply;
+	function makeFailure(furthest: number, expectation: string | string[]): FailureReply;
 
 	/**
 	 * Returns true if obj is a Parsimmon parser, otherwise false.
@@ -287,6 +338,11 @@ declare namespace Parsimmon {
 	 */
 	function noneOf(string: string): Parser<string>;
 
+	/**
+	 * Parsers a single character in from begin to end, inclusive.
+	 */
+	function range(begin: string, end: string): Parser<string>;
+
 	/**
 	 * Returns a parser that looks for a match to the regexp and yields the given match group
 	 * (defaulting to the entire match). The regexp will always match starting at the current
@@ -358,6 +414,8 @@ 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>;
 
+	function seqObj<T, Key extends keyof T = keyof T>(...args: Array<[Key, Parser<T[Key]>] | Parser<any>>): Parser<{ [K in Key]: T[K] }>;
+
 	interface SuccessReply<T> {
 		status: true;
 		index: number;
@@ -413,6 +471,11 @@ declare namespace Parsimmon {
 	 */
 	function fail(message: string): Parser<never>;
 
+	/**
+	 * Returns Parsimmon.fail("fantasy-land/empty").
+	 */
+	function empty(): Parser<never>;
+
 	/**
 	 * is equivalent to Parsimmon.regex(/[a-z]/i)
 	 */
@@ -437,6 +500,41 @@ declare namespace Parsimmon {
 	 * is equivalent to Parsimmon.regex(/\s*`/)
 	 */
 	const optWhitespace: Parser<string>;
+	/**
+	 * Equivalent to Parsimmon.string("\r").
+	 *
+	 * This parser checks for the "carriage return" character, which is used as the
+	 * line terminator for classic Mac OS 9 text files.
+	 */
+	const cr: Parser<string>;
+	/**
+	 * Equivalent to Parsimmon.string("\n").
+	 *
+	 * This parser checks for the "line feed" character, which is used as the line
+	 * terminator for Linux and macOS text files.
+	 */
+	const lf: Parser<string>;
+	/**
+	 * Equivalent to Parsimmon.string("\r\n").
+	 *
+	 * This parser checks for the "carriage return" character followed by the "line
+	 * feed" character, which is used as the line terminator for Windows text files
+	 * and HTTP headers.
+	 */
+	const crlf: Parser<string>;
+	/**
+	 * This flexible parser will match any kind of text file line ending.
+	 */
+	const newline: Parser<string>;
+	/**
+	 * Equivalent to Parsimmon.alt(Parsimmon.newline, Parsimmon.eof).
+	 *
+	 * This is the most general purpose "end of line" parser. It allows the "end of file"
+	 * in addition to all three text file line endings from Parsimmon.newline. This is
+	 * important because text files frequently do not have line terminators at the
+	 * end ("trailing newline").
+	 */
+	const end: Parser<undefined | string>;
 	/**
 	 * consumes and yields the next character of the stream.
 	 */
@@ -461,6 +559,23 @@ declare namespace Parsimmon {
 	 * Returns a parser yield a string containing all the next characters that pass the predicate
 	 */
 	function takeWhile(predicate: (char: string) => boolean): Parser<string>;
+	/**
+	 * Returns a parser that yields a byte (as a number) that matches the given input;
+	 * similar to Parsimmon.digit and Parsimmon.letter.
+	 */
+	 function byte(int: number): Parser<number>;
+	/**
+	 * Returns a parser that yields a byte (as a number) that matches the given input;
+	 * similar to Parsimmon.digit and Parsimmon.letter.
+	 */
+	function bitSeq(alignments: number[]): Parser<number[]>;
+	/**
+	 * Works like Parsimmon.bitSeq except each item in the array is either a number of
+	 * bits or pair (array with length = 2) of name and bits. The bits are parsed in order
+	 * and put into an object based on the name supplied. If there's no name for the bits,
+	 * it will be parsed but discarded from the returned value.
+	 */
+	function bitSeqObj<Key extends string>(namedAlignments: Array<[Key, number] | number>): Parser<{ [K in Key]: number }>;
 }
 
 export = Parsimmon;
diff --git a/types/parsimmon/parsimmon-tests.ts b/types/parsimmon/parsimmon-tests.ts
index dbcf3d0753..0f2d296c5a 100644
--- a/types/parsimmon/parsimmon-tests.ts
+++ b/types/parsimmon/parsimmon-tests.ts
@@ -69,6 +69,7 @@ let fooReply: Reply<Foo>;
 
 fooReply = P.makeSuccess(0, foo);
 fooReply = P.makeFailure(0, '');
+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));
@@ -97,10 +98,27 @@ barPar = fooPar.map((f) => {
 	return bar;
 });
 
+strPar = P.string(str);
+
+strPar = strPar.contramap((f) => {
+	f; // $ExpectType string
+	return f.toUpperCase();
+});
+
+barPar = strPar.promap((f) => {
+	f; // $ExpectType string
+	return 3;
+}, (f) => {
+	f; // $ExpectType number
+	return bar;
+});
+
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
 fooPar = fooPar.skip(barPar);
 
+fooPar = fooPar.wrap(barPar, strPar);
+
 barPar = barPar = fooPar.result(bar);
 
 fooOrBarPar = fooPar.fallback(bar);
@@ -116,6 +134,7 @@ fooArrPar = fooPar.atLeast(num);
 fooMarkPar = fooPar.mark();
 
 fooPar = fooPar.desc(str);
+fooPar = fooPar.desc([str, str]);
 
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
@@ -128,6 +147,19 @@ fooArrPar = P.seq(fooPar, fooPar);
 const par: Parser<[Bar, Foo, number]> = P.seq(barPar, fooPar, numPar);
 const par2: Parser<number> = P.seq(barPar, fooPar, numPar).map(([a, b, c]: [Bar, Foo, number]) => 42);
 
+interface SeqObj {
+	first: number;
+	second: string;
+	third: Foo;
+}
+
+const seqObjPar: Parser<SeqObj> = P.seqObj<SeqObj>(
+	['first', numPar],
+	barPar,
+	fooArrPar,
+	['third', fooPar],
+	['second', strPar]);
+
 fooPar = P.custom<Foo>((success, failure) => (stream, i) => { str = stream; num = i; return success(num, foo); });
 fooPar = P.custom<Foo>((success, failure) => (stream, i) => failure(num, str));
 
@@ -141,6 +173,36 @@ fooPar = P.lazy(() => {
 voidPar = P.fail(str);
 fooPar = P.fail(str);
 
+fooPar = P.empty(); // $ExpectType Parser<never>
+
+// --  --  --  --  --  --  --  --  --  --  --  --  --
+
+const bytePar: Parser<number> = P.byte(3);
+
+const byteParMany: Parser<number[]> = P.bitSeq([1, 2, 5, 1]);
+
+interface ByteSeqObj {
+	first: number;
+	second: number;
+	third: number;
+}
+
+const byteParObj: Parser<ByteSeqObj> = P.bitSeqObj([
+	['first', 3],
+	6,
+	['second', 8],
+	7,
+	['third', 9],
+]);
+
+const byteParObjErr: Parser<ByteSeqObj> = P.bitSeqObj([ // $ExpectError
+	['first', 3],
+	6,
+	['second', 8],
+	7,
+	/* missing 'third' key */
+]);
+
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
 strPar = P.letter;
@@ -152,6 +214,12 @@ strPar = P.digits;
 strPar = P.whitespace;
 strPar = P.optWhitespace;
 
+strPar = P.cr;
+strPar = P.lf;
+strPar = P.crlf;
+strPar = P.newline;
+const voidOrStrPar: Parser<undefined | string> = P.end;
+
 strPar = P.any;
 strPar = P.all;
 voidPar = P.eof;
@@ -166,6 +234,8 @@ bool = P.isParser(42);
 strPar = P.oneOf('a');
 strPar = P.noneOf('a');
 
+strPar = P.range('a', 'z');
+
 strPar = P.regex(/foo/);
 strPar = P.regex(/foo/, 3);
 strPar = P.regexp(/bar/);
@@ -176,6 +246,10 @@ emptyStrPar = P.lookahead(str);
 emptyStrPar = P.lookahead(/foo/);
 emptyStrPar = P.lookahead(fooPar);
 
+strPar = strPar.tie();
+
+strPar = strPar.tieWith("");
+
 fooPar = P.of(foo);
 
 str = P.formatError('foo', strPar.parse('bar'));
@@ -214,6 +288,22 @@ function makeNode<Name extends string>(name: Name) {
 let node: P.Parser<P.Node<'identifier', string>> = P.letters.node('identifier');
 node = P.letters.thru(makeNode('identifier'));
 
+// --  --  --  --  --  --  --  --  --  --  --  --  --
+// Fantasy Land support
+
+fooPar = fooPar.empty(); // $ExpectType Parser<never>
+
+// example taken from the documentation for the #ap method
+numPar = P.digit
+  .ap(P.digit
+    .map(s => (t: string) =>
+      Number(s) + Number(t)));
+
+fooArrPar = fooPar.sepBy(barPar);
+fooArrPar = fooPar.sepBy1(barPar);
+
+fooPar = barPar.of(foo);
+
 // --  --  --  --  --  --  --  --  --  --  --  --  --
 
 let language: Language;
diff --git a/types/passport-cognito/index.d.ts b/types/passport-cognito/index.d.ts
new file mode 100644
index 0000000000..d9dcbe38db
--- /dev/null
+++ b/types/passport-cognito/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for passport-cognito 0.1
+// Project: https://github.com/kndt84/passport-cognito
+// Definitions by: Maksym Butsykin <https://github.com/mbutsykin>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import passport = require('passport');
+import express = require('express');
+
+export interface CognitoStrategyOptions {
+  userPoolId: string;
+  clientId: string;
+  region: string;
+}
+
+export type CognitoVerifyFunction = (
+  accessToken: string,
+  idToken: string,
+  refreshToken: string,
+  user: object,
+  done: (error: any, user?: any) => void,
+) => any;
+
+export class Strategy extends passport.Strategy {
+  constructor(options: CognitoStrategyOptions, verify: CognitoVerifyFunction);
+
+  name: string;
+  authenticate(req: express.Request, options?: object): void;
+}
diff --git a/types/passport-cognito/passport-cognito-tests.ts b/types/passport-cognito/passport-cognito-tests.ts
new file mode 100644
index 0000000000..02c80e8734
--- /dev/null
+++ b/types/passport-cognito/passport-cognito-tests.ts
@@ -0,0 +1,23 @@
+/**
+ * Created by Maksym Butsykin <https://github.com/mbutsykin>
+ */
+
+import passport = require("passport");
+import cognito = require("passport-cognito");
+
+passport.use(
+    new cognito.Strategy(
+        {
+            clientId: "clientId",
+            region: "region",
+            userPoolId: "userPoolId"
+        },
+        (
+            accessToken: string,
+            idToken: string,
+            refreshToken: string,
+            user: object,
+            cb: (err: Error | null, user?: object | false) => void
+        ) => {}
+    )
+);
diff --git a/types/passport-cognito/tsconfig.json b/types/passport-cognito/tsconfig.json
new file mode 100644
index 0000000000..eedb7f9a0f
--- /dev/null
+++ b/types/passport-cognito/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",
+        "passport-cognito-tests.ts"
+    ]
+}
diff --git a/types/passport-cognito/tslint.json b/types/passport-cognito/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/passport-cognito/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/passport-github2/index.d.ts b/types/passport-github2/index.d.ts
index 902bcea6e0..91adbb6567 100644
--- a/types/passport-github2/index.d.ts
+++ b/types/passport-github2/index.d.ts
@@ -1,18 +1,20 @@
-// Type definitions for passport-github 1.1
+// Type definitions for passport-github2 1.2
 // Project: https://github.com/jaredhanson/passport-github
 // Definitions by: Yasunori Ohoka <https://github.com/yasupeke>
 //                 Maarten Mulders <https://github.com/mthmulders>
+//                 Christoph Werner <https://github.com/codepunkt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import passport = require('passport');
+import oauth2 = require('passport-oauth2');
 import express = require('express');
 
 export interface Profile extends passport.Profile {
     profileUrl: string;
 }
 
-export interface StrategyOption {
+export interface StrategyOption extends passport.AuthenticateOptions {
     clientID: string;
     clientSecret: string;
     callbackURL: string;
@@ -28,9 +30,38 @@ export interface StrategyOption {
     userProfileURL?: string;
 }
 
-export class Strategy extends passport.Strategy {
-    constructor(options: StrategyOption, verify: (accessToken: string, refreshToken: string, profile: Profile, done: (error: any, user?: any) => void) => void);
-    userProfile: (accessToken: string, done?: (error: any, profile: Profile) => void) => void;
+export type OAuth2StrategyOptionsWithoutRequiredURLs = Pick<
+    oauth2._StrategyOptionsBase,
+    Exclude<keyof oauth2._StrategyOptionsBase , 'authorizationURL' | 'tokenURL'>
+>;
+
+export interface _StrategyOptionsBase extends OAuth2StrategyOptionsWithoutRequiredURLs {
+    clientID: string;
+    clientSecret: string;
+    callbackURL: string;
+
+    scope?: string[];
+    userAgent?: string;
+    state?: boolean;
+
+    authorizationURL?: string;
+    tokenURL?: string;
+    scopeSeparator?: string;
+    customHeaders?: string;
+    userProfileURL?: string;
+}
+
+export interface StrategyOptions extends _StrategyOptionsBase {
+    passReqToCallback?: false;
+}
+export interface StrategyOptionsWithRequest extends _StrategyOptionsBase {
+    passReqToCallback: true;
+}
+
+export class Strategy extends oauth2.Strategy {
+    constructor(options: StrategyOptions, verify: oauth2.VerifyFunction);
+    constructor(options: StrategyOptionsWithRequest, verify: oauth2.VerifyFunctionWithRequest);
+    userProfile(accessToken: string, done: (err?: Error | null, profile?: any) => void): void;
 
     name: string;
     authenticate(req: express.Request, options?: passport.AuthenticateOptions): void;
diff --git a/types/passport-github2/passport-github2-tests.ts b/types/passport-github2/passport-github2-tests.ts
index efe5508ebd..c8126ee41a 100644
--- a/types/passport-github2/passport-github2-tests.ts
+++ b/types/passport-github2/passport-github2-tests.ts
@@ -1,6 +1,7 @@
 /**
  * Created by jcabresos on 4/19/2014.
  */
+import express = require('express');
 import passport = require('passport');
 import github = require('passport-github2');
 
@@ -40,3 +41,18 @@ passport.use(new github.Strategy(
         });
     })
 );
+
+passport.use(new github.Strategy(
+    {
+        callbackURL,
+        clientID,
+        clientSecret,
+        passReqToCallback: true
+    },
+    (request: express.Request, accessToken: string, refreshToken: string, profile: github.Profile, done: (error: any, user?: any) => void) => {
+        User.findOrCreate(profile.id, profile.provider, (err, user) => {
+            if (err) { done(err); return; }
+            done(null, user);
+        });
+    })
+);
diff --git a/types/passport-google-oauth/index.d.ts b/types/passport-google-oauth/index.d.ts
index 8b45504cb2..26ee9888b7 100644
--- a/types/passport-google-oauth/index.d.ts
+++ b/types/passport-google-oauth/index.d.ts
@@ -53,6 +53,7 @@ interface IOAuth2StrategyOption {
     callbackURL: string;
     authorizationURL?: string;
     tokenURL?: string;
+    userProfileURL?: string;
     accessType?: string;
     approval_prompt?: string;
     prompt?: string;
diff --git a/types/passport-saml/index.d.ts b/types/passport-saml/index.d.ts
index 5e24211008..d9c86a9b23 100644
--- a/types/passport-saml/index.d.ts
+++ b/types/passport-saml/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for passport-saml 0.15
 // Project: https://github.com/bergie/passport-saml
 // Definitions by: Chris Barth <https://github.com/cjbarth>
+//                 Damian Assennato <https://github.com/dassennato>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -62,6 +63,7 @@ export interface SamlConfig {
     cacheProvider?: CacheProvider;
 
     // Passport
+    name?: string;
     passReqToCallback?: boolean;
 
     // Logout
diff --git a/types/passport-saml/passport-saml-tests.ts b/types/passport-saml/passport-saml-tests.ts
index 45a3d18923..615c1b7320 100644
--- a/types/passport-saml/passport-saml-tests.ts
+++ b/types/passport-saml/passport-saml-tests.ts
@@ -5,6 +5,7 @@ import fs = require('fs');
 
 const samlStrategy = new SamlStrategy.Strategy(
 	{
+		name: 'samlCustomName',
 		path: '/login/callback',
 		entryPoint: 'https://openidp.feide.no/simplesaml/saml2/idp/SSOService.php',
 		issuer: 'passport-saml',
@@ -29,6 +30,6 @@ const samlStrategy = new SamlStrategy.Strategy(
 );
 
 passport.use(samlStrategy);
-passport.authenticate('saml', {failureRedirect: '/', failureFlash: true});
+passport.authenticate('samlCustomName', {failureRedirect: '/', failureFlash: true});
 
 const metadata = samlStrategy.generateServiceProviderMetadata("decryptionCert");
diff --git a/types/passport-strategy/index.d.ts b/types/passport-strategy/index.d.ts
index f8b227bfd6..33b35ddbaf 100644
--- a/types/passport-strategy/index.d.ts
+++ b/types/passport-strategy/index.d.ts
@@ -16,7 +16,7 @@
 import passport = require('passport');
 import express = require('express');
 
-declare class Strategy extends passport.Strategy {
+declare class Strategy implements passport.Strategy {
     /**
      * Performs authentication for the request.
      * Note: Virtual function - re-implement in the strategy.
@@ -45,7 +45,7 @@ declare class Strategy extends passport.Strategy {
      * @param {Object} info
      * @api public
      */
-    success(user: any, info: any): void;
+    success(user: any, info?: any): void;
 
     /**
      * Fail authentication, with optional `challenge` and `status`, defaulting
diff --git a/types/passport-strategy/passport-strategy-tests.ts b/types/passport-strategy/passport-strategy-tests.ts
index e9c6fd604f..4b8090d241 100644
--- a/types/passport-strategy/passport-strategy-tests.ts
+++ b/types/passport-strategy/passport-strategy-tests.ts
@@ -33,7 +33,7 @@ export class Strategy extends passport.Strategy {
 
         var self = this;
 
-        function verified(err: Error, user: any, info: any) {
+        function verified(err: Error, user: any, info?: any) {
             if (err) {
                 return self.error(err);
             }
@@ -43,6 +43,6 @@ export class Strategy extends passport.Strategy {
             self.success(user, info);
         }
 
-        verified(null, {}, {});
+        verified(null, {});
     }
 }
diff --git a/types/passport/index.d.ts b/types/passport/index.d.ts
index 0be63d337e..fe0c26c775 100644
--- a/types/passport/index.d.ts
+++ b/types/passport/index.d.ts
@@ -12,7 +12,7 @@ declare global {
     namespace Express {
         interface Request {
             authInfo?: any;
-            user?: User;
+            user?: any;
 
             // These declarations are merged into express's Request type
             login(user: any, done: (err: any) => void): void;
@@ -26,9 +26,6 @@ declare global {
             isAuthenticated(): boolean;
             isUnauthenticated(): boolean;
         }
-        interface User {
-            [_: string]: any;
-        }
     }
 }
 
diff --git a/types/pbkdf2/index.d.ts b/types/pbkdf2/index.d.ts
new file mode 100644
index 0000000000..80e3678dc6
--- /dev/null
+++ b/types/pbkdf2/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for pbkdf2 3.0
+// Project: https://github.com/crypto-browserify/pbkdf2
+// Definitions by: Timon Engelke <https://github.com/timonegk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, callback: (err: Error, derivedKey: Buffer) => void): void;
+export function pbkdf2(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest: string, callback: (err: Error, derivedKey: Buffer) => void): void;
+export function pbkdf2Sync(password: string | Buffer, salt: string | Buffer, iterations: number, keylen: number, digest?: string): Buffer;
diff --git a/types/pbkdf2/pbkdf2-tests.ts b/types/pbkdf2/pbkdf2-tests.ts
new file mode 100644
index 0000000000..cf1a30c4bb
--- /dev/null
+++ b/types/pbkdf2/pbkdf2-tests.ts
@@ -0,0 +1,6 @@
+import * as pbkdf2 from "pbkdf2";
+
+pbkdf2.pbkdf2("password", "salt", 1000, 32, "sha1", (err, derivedKey) => {}); // $ExpectType void
+pbkdf2.pbkdf2("password", "salt", 1000, 32, (err, derivedKey) => {}); // $ExpectType void
+pbkdf2.pbkdf2Sync("password", "salt", 1000, 32, "sha1"); // $ExpectType Buffer
+pbkdf2.pbkdf2Sync("password", "salt", 1000, 32); // $ExpectType Buffer
diff --git a/types/pbkdf2/tsconfig.json b/types/pbkdf2/tsconfig.json
new file mode 100644
index 0000000000..955d8232ec
--- /dev/null
+++ b/types/pbkdf2/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",
+        "pbkdf2-tests.ts"
+    ]
+}
diff --git a/types/pbkdf2/tslint.json b/types/pbkdf2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pbkdf2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pg-large-object/index.d.ts b/types/pg-large-object/index.d.ts
new file mode 100644
index 0000000000..64a450d545
--- /dev/null
+++ b/types/pg-large-object/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for pg-large-object 2.0
+// Project: https://github.com/Joris-van-der-Wel/node-pg-large-object#readme
+// Definitions by: Mateusz Krupa <https://github.com/mateuszkrupa>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="node" />
+
+import stream = require("stream");
+import pg = require("pg");
+
+export class LargeObject {
+  static readonly SEEK_SET: number;
+  static readonly SEEK_CUR: number;
+  static readonly SEEK_END: number;
+  constructor(query: any, oid: number, fd: any);
+  close(callback: (error: Error) => void): void;
+  closeAsync(): Promise<any>;
+  read(length: number, callback: (error: Error, data: Buffer) => void): void;
+  readAsync(length: number): Promise<Buffer>;
+  write(buffer: Buffer, callback?: (error: Error) => void): void;
+  writeAsync(buffer: Buffer): Promise<any>;
+  seek(position: number, ref: number, callback?: (error: Error, position: number) => void): void;
+  seekAsync(position: number, ref: number): Promise<number>;
+  tell(callback: (error: Error, position: number) => void): void;
+  tellAsync(): Promise<number>;
+  size(callback: (error: Error, size: number) => void): void;
+  sizeAsync(): Promise<number>;
+  truncate(length: number, callback?: (error: Error) => void): void;
+  truncateAsync(length: number): Promise<any>;
+  getReadableStream(bufferSize?: number): ReadStream;
+  getWritableStream(bufferSize?: number): WriteStream;
+}
+
+export interface LargeObjectManagerSettings {
+  pg?: pg.Client;
+  pgPromise?: object; // module: pg-promise/Task
+}
+
+export class LargeObjectManager {
+  static readonly WRITE: number;
+  static readonly READ: number;
+  static readonly READWRITE: number;
+  constructor(options: LargeObjectManagerSettings|object);
+  open(oid: number, mode: number, callback: (error: Error, result: LargeObject) => void): void;
+  openAsync(oid: number, mode: number): Promise<LargeObject>;
+  create(callback: (error: Error, oid: number) => void): void;
+  createAsync(): Promise<number>;
+  openAndReadableStream(oid: number, bufferSize: number, callback: (error: Error, size: number, stream: ReadStream) => void): void;
+  openAndReadableStreamAsync(oid: number, bufferSize?: number): Promise<[number, ReadStream]>;
+  createAndWritableStream(bufferSize?: number, callback?: (error: Error, oid: number, stream: WriteStream) => void): void;
+  createAndWritableStreamAsync(bufferSize?: number): Promise<[number, WriteStream]>;
+  unlink(oid: number, callback?: (error: Error) => void): void;
+  unlinkAsync(oid: number): Promise<any>;
+}
+
+export class ReadStream extends stream.Readable {}
+
+export class WriteStream extends stream.Writable {}
diff --git a/types/pg-large-object/pg-large-object-tests.ts b/types/pg-large-object/pg-large-object-tests.ts
new file mode 100644
index 0000000000..42a939572b
--- /dev/null
+++ b/types/pg-large-object/pg-large-object-tests.ts
@@ -0,0 +1,56 @@
+import {
+  LargeObject,
+  LargeObjectManager,
+  LargeObjectManagerSettings,
+  ReadStream,
+  WriteStream
+} from "pg-large-object";
+import { Buffer } from "buffer";
+import pg = require("pg");
+
+const buffer = new Buffer("");
+const bufferSize = 16384;
+const length = 16384;
+const oid = 1;
+const seekSetConst = LargeObject.SEEK_SET; // $ExpectType number
+const seekCurConst = LargeObject.SEEK_CUR; // $ExpectType number
+const seekEndConst = LargeObject.SEEK_END; // $ExpectType number
+
+const lo = new LargeObject({}, oid, {});
+lo.close((error: Error) => {}); // $ExpectType void
+lo.closeAsync(); // $ExpectType Promise<any>
+lo.read(length, (error: Error, data: Buffer) => {}); // $ExpectType void
+lo.readAsync(length); // $ExpectType Promise<Buffer>
+lo.write(buffer, (error: Error) => {}); // $ExpectType void
+lo.writeAsync(buffer); // $ExpectType Promise<any>
+lo.seek(0, LargeObject.SEEK_CUR, (error: Error, position: number) => {}); // $ExpectType void
+lo.seekAsync(0, LargeObject.SEEK_CUR); // $ExpectType Promise<number>
+lo.tell((error: Error, position: number) => {}); // $ExpectType void
+lo.tellAsync(); // $ExpectType Promise<number>
+lo.size((error: Error, size: number) => {}); // $ExpectType void
+lo.sizeAsync(); //// $ExpectType Promise<number>
+lo.truncate(length, (error: Error) => {}); // $ExpectType void
+lo.truncateAsync(length); // $ExpectType Promise<any>
+lo.getReadableStream(bufferSize); // $ExpectType ReadStream
+lo.getWritableStream(bufferSize); // $ExpectType WriteStream
+
+const writeConst = LargeObjectManager.WRITE; // $ExpectType number
+const readConst = LargeObjectManager.READ; // $ExpectType number
+const readWriteConst = LargeObjectManager.READWRITE; // $ExpectType number
+const config: LargeObjectManagerSettings = {
+  pg: new pg.Client(),
+  pgPromise: {}
+};
+
+const lom = new LargeObjectManager(config);
+lom.open(oid, LargeObjectManager.READWRITE, (error: Error, result: LargeObject) => {}); // $ExpectType void
+lom.openAsync(oid, LargeObjectManager.READWRITE); // $ExpectType Promise<LargeObject>
+lom.create((error: Error, oid: number) => {}); // $ExpectType void
+lom.createAsync(); // $ExpectType Promise<number>
+lom.unlink(oid, (error: Error) => {}); // $ExpectType void
+lom.unlinkAsync(oid); // $ExpectType Promise<any>
+lom.openAndReadableStream(oid, bufferSize, (error: Error, size: number, stream: ReadStream) => {}); // $ExpectType void
+lom.openAndReadableStreamAsync(oid, bufferSize); // $ExpectType Promise<[number, ReadStream]>
+lom.createAndWritableStream(bufferSize, (error: Error, oid: number, stream: WriteStream) => {}); // $ExpectType void
+lom.createAndWritableStreamAsync(bufferSize); // $ExpectType Promise<[number, WriteStream]>
+lom.unlinkAsync(oid); // $ExpectType Promise<any>
diff --git a/types/pg-large-object/tsconfig.json b/types/pg-large-object/tsconfig.json
new file mode 100644
index 0000000000..6a23534d14
--- /dev/null
+++ b/types/pg-large-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",
+        "pg-large-object-tests.ts"
+    ]
+}
diff --git a/types/pg-large-object/tslint.json b/types/pg-large-object/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pg-large-object/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pg-query-stream/index.d.ts b/types/pg-query-stream/index.d.ts
index 34331358e7..ce1efedf5a 100644
--- a/types/pg-query-stream/index.d.ts
+++ b/types/pg-query-stream/index.d.ts
@@ -6,6 +6,7 @@
 /// <reference types="node" />
 
 import stream = require("stream");
+import pg = require("pg");
 
 declare namespace QueryStream {
     interface Options {
@@ -14,11 +15,12 @@ declare namespace QueryStream {
     }
 }
 
-declare class QueryStream extends stream.Readable {
+declare class QueryStream extends stream.Readable implements pg.Submittable {
     batchSize: number;
     text: string;
     values?: any[];
     constructor(text: string, values?: any[], options?: QueryStream.Options);
+    submit(connection: pg.Connection): void;
 }
 
 export = QueryStream;
diff --git a/types/pg/index.d.ts b/types/pg/index.d.ts
index ffb2379a7c..621a3aa1b8 100644
--- a/types/pg/index.d.ts
+++ b/types/pg/index.d.ts
@@ -17,6 +17,7 @@ export interface ConnectionConfig {
     host?: string;
     connectionString?: string;
     keepAlive?: boolean;
+    stream?: stream.Duplex;
 }
 
 export interface Defaults extends ConnectionConfig {
@@ -50,6 +51,10 @@ export interface QueryConfig {
     values?: any[];
 }
 
+export interface Submittable {
+    submit: (connection: Connection) => void;
+}
+
 export interface QueryArrayConfig extends QueryConfig {
     rowMode: 'array';
 }
@@ -89,6 +94,48 @@ export interface ResultBuilder extends QueryResult {
     addRow(row: any): void;
 }
 
+export interface QueryParse {
+    name: string;
+    text: string;
+    types: string[];
+}
+
+export interface BindConfig {
+    portal?: string;
+    statement?: string;
+    binary?: string;
+    values?: Array<(Buffer | null | undefined | string)>;
+}
+
+export interface ExecuteConfig {
+    portal?: string;
+    rows?: string;
+}
+
+export interface MessageConfig {
+    type: string;
+    name?: string;
+}
+
+export class Connection extends events.EventEmitter {
+    readonly stream: stream.Duplex;
+
+    constructor(config?: ConnectionConfig);
+
+    bind(config: BindConfig | null, more: boolean): void;
+    execute(config: ExecuteConfig | null, more: boolean): void;
+    parse(query: QueryParse, more: boolean): void;
+
+    query(text: string): void;
+
+    describe(msg: MessageConfig, more: boolean): void;
+    close(msg: MessageConfig, more: boolean): void;
+
+    flush(): void;
+    sync(): void;
+    end(): void;
+}
+
 export class Pool extends events.EventEmitter {
     // `new Pool('pg://user@localhost/mydb')` is not allowed.
     // But it passes type check because of issue:
@@ -105,7 +152,7 @@ export class Pool extends events.EventEmitter {
     end(): Promise<void>;
     end(callback: () => void): void;
 
-    query(queryStream: QueryConfig & stream.Readable): stream.Readable;
+    query<T extends Submittable>(queryStream: T): T;
     query(queryConfig: QueryArrayConfig): Promise<QueryArrayResult>;
     query(queryConfig: QueryConfig): Promise<QueryResult>;
     query(queryTextOrConfig: string | QueryConfig, values?: any[]): Promise<QueryResult>;
@@ -123,7 +170,7 @@ export class ClientBase extends events.EventEmitter {
     connect(): Promise<void>;
     connect(callback: (err: Error) => void): void;
 
-    query(queryStream: QueryConfig & stream.Readable): stream.Readable;
+    query<T extends Submittable>(queryStream: T): T;
     query(queryConfig: QueryArrayConfig): Promise<QueryArrayResult>;
     query(queryConfig: QueryConfig): Promise<QueryResult>;
     query(queryTextOrConfig: string | QueryConfig, values?: any[]): Promise<QueryResult>;
diff --git a/types/phantom/index.d.ts b/types/phantom/index.d.ts
index 4b45ed8338..34f8afe929 100644
--- a/types/phantom/index.d.ts
+++ b/types/phantom/index.d.ts
@@ -3,9 +3,27 @@
 // Definitions by: horiuchi <https://github.com/horiuchi>, Random <https://github.com/llRandom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export function create(args?: string[]): Promise<PhantomJS>;
+export function create(args?: string[], config?: {
+    phantomPath?: string,
+    shimPath?: string,
+    logger?: {
+        info?: winstonLeveledLogMethod,
+        debug?: winstonLeveledLogMethod,
+        error?: winstonLeveledLogMethod,
+        warn?: winstonLeveledLogMethod,
+    },
+    logLevel?: 'debug' | 'info' | 'warn' | 'error',
+}): Promise<PhantomJS>;
+
+export interface winstonLeveledLogMethod {
+    (message: string, callback: (...args: any[]) => void): any;
+    (message: string, meta: any, callback: (...args: any[]) => void): any;
+    (message: string, ...meta: any[]): any;
+    (infoObject: any): any;
+}
 
 export interface PhantomJS {
+    callback(fn: (pageNum: number, numPages: number) => string): IPhantomCallback;
     createPage(): Promise<WebPage>;
     exit(returnValue?: number): void;
 }
@@ -13,6 +31,48 @@ export interface PhantomJS {
 export interface WebPage {
     open(url: string): Promise<string>;
     open(url: string, settings: IOpenWebPageSettings): Promise<string>;
+    on(event: 'onResourceRequested', runOnPhantom: false, listener: (requestData: IRequestData, networkRequest: { abort: () => void, changeUrl: (newUrl: string) => void, setHeader: (key: string, value: string) => void }) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceRequested', listener: (requestData: IRequestData, networkRequest: { abort: () => void, changeUrl: (newUrl: string) => void, setHeader: (key: string, value: string) => void }) => void): Promise<{ pageId: string }>;
+    on(event: 'onLoadFinished', runOnPhantom: false, listener: (status: 'success' | 'fail') => void): Promise<{ pageId: string }>;
+    on(event: 'onLoadFinished', listener: (status: 'success' | 'fail') => void): Promise<{ pageId: string }>;
+    on(event: 'onAlert', runOnPhantom: false, listener: (msg: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onAlert', listener: (msg: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onCallback', runOnPhantom: false, listener: (data: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onCallback', listener: (data: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onClosing', runOnPhantom: false, listener: (closingPage: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onClosing', listener: (closingPage: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onConfirm', runOnPhantom: false, listener: (msg: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onConfirm', listener: (msg: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onConsoleMessage', runOnPhantom: false, listener: (msg: string, lineNum: number, sourceId: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onConsoleMessage', listener: (msg: string, lineNum: number, sourceId: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onError', runOnPhantom: false, listener: (msg: string, trace: { file: string, line: string, function: string }[]) => void): Promise<{ pageId: string }>;
+    on(event: 'onError', listener: (msg: string, trace: { file: string, line: string, function: string }[]) => void): Promise<{ pageId: string }>;
+    on(event: 'onFilePicker', runOnPhantom: false, listener: (oldFile: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onFilePicker', listener: (oldFile: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onInitialized', runOnPhantom: false, listener: () => void): Promise<{ pageId: string }>;
+    on(event: 'onInitialized', listener: () => void): Promise<{ pageId: string }>;
+    on(event: 'onLoadStarted', runOnPhantom: false, listener: () => void): Promise<{ pageId: string }>;
+    on(event: 'onLoadStarted', listener: () => void): Promise<{ pageId: string }>;
+    on(event: 'onNavigationRequested', runOnPhantom: false, listener: (url: string, type: 'Undefined' | 'LinkClicked' | 'FormSubmitted' | 'BackOrForward' | 'Reload' | 'FormResubmitted' | 'Other', willNavigate: boolean, main: boolean) => void): Promise<{ pageId: string }>;
+    on(event: 'onNavigationRequested', listener: (url: string, type: 'Undefined' | 'LinkClicked' | 'FormSubmitted' | 'BackOrForward' | 'Reload' | 'FormResubmitted' | 'Other', willNavigate: boolean, main: boolean) => void): Promise<{ pageId: string }>;
+    on(event: 'onPageCreated', runOnPhantom: false, listener: (newPage: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onPageCreated', listener: (newPage: any) => void): Promise<{ pageId: string }>;
+    on(event: 'onPrompt', runOnPhantom: false, listener: (msg: string, defaultVal: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onPrompt', listener: (msg: string, defaultVal: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceError', runOnPhantom: false, listener: (resourceError: { id: string, url: string, errorCode: number, errorString: string }) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceError', listener: (resourceError: { id: string, url: string, errorCode: number, errorString: string }) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceReceived', runOnPhantom: false, listener: (response: IResponse) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceReceived', listener: (response: IResponse) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceTimeout', runOnPhantom: false, listener: (request: IRequestData & { errorCode: number, errorString: string }) => void): Promise<{ pageId: string }>;
+    on(event: 'onResourceTimeout', listener: (request: IRequestData & { errorCode: number, errorString: string }) => void): Promise<{ pageId: string }>;
+    on(event: 'onUrlChanged', runOnPhantom: false, listener: (targetUrl: string) => void): Promise<{ pageId: string }>;
+    on(event: 'onUrlChanged', listener: (targetUrl: string) => void): Promise<{ pageId: string }>;
+    off(event: 'onResourceRequested' | 'onLoadFinished' | 'onAlert'
+        | 'onCallback' | 'onClosing' | 'onConfirm'
+        | 'onConsoleMessage' | 'onError' | 'onFilePicker'
+        | 'onInitialized' | 'onLoadStarted' | 'onNavigationRequested'
+        | 'onPageCreated' | 'onPrompt' | 'onResourceError'
+        | 'onResourceReceived' | 'onResourceTimeout' | 'onUrlChanged'): Promise<{ pageId: string }>;
     close(): Promise<void>;
 
     evaluate<R>(callback: () => R): Promise<R>;
@@ -31,9 +91,29 @@ export interface WebPage {
 
     setContent(html: string, url: string): Promise<string>;
 
+    property(key: 'content' | 'plainText'
+        | 'focusedFrameName' | 'frameContent'
+        | 'frameName' | 'framePlainText' | 'frameTitle'
+        | 'libraryPath' | 'offlineStoragePath' | 'title' | 'url' | 'windowName'): Promise<string>;
+    property(key: 'framesName' | 'pagesWindowName' | 'pages'): Promise<string[]>;
+    property(key: 'canGoBack' | 'canGoForward' | 'navigationLocked' | 'ownsPages'): Promise<boolean>;
+    property(key: 'framesCount' | 'offlineStorageQuota' | 'zoomFactor'): Promise<number>;
+    property(key: 'clipRect'): Promise<{
+        top: number, left: number, width: number, height: number
+    }>;
+    property(key: 'cookies'): Promise<ICookie[]>;
+    property(key: 'customHeaders'): Promise<{ [key: string]: string }>;
+    property(key: 'paperSize'): Promise<IPaperSizeOptions>;
+    property(key: 'scrollPosition'): Promise<{ top: number, left: number }>;
+    property(key: 'viewportSize'): Promise<{ width: number, height: number }>;
     property<T>(key: string): Promise<T>;
     property<T>(key: string, value: T): Promise<void>;
 
+    setting(key: 'javascriptEnabled' | 'loadImages'
+        | 'localToRemoteUrlAccessEnabled' | 'XSSAuditingEnabled'
+        | 'webSecurityEnabled'): Promise<boolean>;
+    setting(key: 'userAgent' | 'userName' | 'password'): Promise<string>;
+    setting(key: 'resourceTimeout'): Promise<number>;
     setting<T>(key: string): Promise<T>;
     setting<T>(key: string, value: T): Promise<T>;
 
@@ -55,14 +135,53 @@ export interface ICookie {
 export interface IPaperSizeOptions {
     width?: string;
     height?: string;
-    format?: string;
-    orientation?: string;
-    margin?: any; // string | { top?: string; left?: string; bottom?: string; right?: string;  }
+    format?: 'A3' | 'A4' | 'A5' | 'Legal' | 'Letter' | 'Tabloid';
+    orientation?: 'portrait' | 'landscape';
+    margin?: string | { top?: string; left?: string; bottom?: string; right?: string; };
+    header?: {
+        height: string,
+        contents: IPhantomCallback
+    };
+    footer?: {
+        height: string;
+        contents: IPhantomCallback
+    };
 }
 
 export interface IOpenWebPageSettings {
-    operation?: string;
-    encoding?: string;
+    operation?: 'GET' | 'POST' | 'HEAD' | 'DELETE' | 'PUT' | string;
+    encoding?: 'utf8' | string;
     headers?: { [s: string]: string };
     data?: string;
 }
+
+/**
+ * The phantom.callback object
+ */
+export interface IPhantomCallback {
+    transform: true;
+    target: Function;
+    method: 'callback';
+    parent: 'phantom'
+}
+
+export interface IResponse {
+    id: string;
+    url: string;
+    time: Date;
+    headers: { name: string, value: string }[];
+    bodySize: number;
+    contentType: string;
+    redirectURL: string;
+    stage: 'start' | 'end';
+    status: number;
+    statusText: string;
+}
+
+export interface IRequestData {
+    id: number;
+    method: string;
+    url: string;
+    time: Date;
+    headers: { name: string, value: string }[];
+}
diff --git a/types/phonegap-nfc/index.d.ts b/types/phonegap-nfc/index.d.ts
index ff980eea33..abc460947d 100644
--- a/types/phonegap-nfc/index.d.ts
+++ b/types/phonegap-nfc/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/chariotsolutions/phonegap-nfc
 // Definitions by: Michael Desigaud <https://github.com/michaeldesigaud>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
 
 interface Document {
     addEventListener(type: 'deviceready', listener: (ev: Event) => any, useCapture?: boolean): void;
diff --git a/types/phonegap-nfc/phonegap-nfc-tests.ts b/types/phonegap-nfc/phonegap-nfc-tests.ts
index b61009a7da..1e5a16010f 100644
--- a/types/phonegap-nfc/phonegap-nfc-tests.ts
+++ b/types/phonegap-nfc/phonegap-nfc-tests.ts
@@ -97,30 +97,5 @@ let eventTarget: EventTarget = {
     removeEventListener(type: string, listener: EventListenerOrEventListenerObject, useCapture?: boolean) { return; }
 }
 
-let ndefTagEvent = {
-    bubbles: false,
-    cancelBubble: false,
-    cancelable: false,
-    currentTarget: eventTarget,
-    defaultPrevented: false,
-    eventPhase: 2,
-    isTrusted: true,
-    returnValue: true,
-    srcElement: new Element(),
-    target: eventTarget,
-    timeStamp: 1394448136236,
-    type: "ndef",
-    initEvent(eventTypeArg: string, canBubbleArg: boolean, cancelableArg: boolean) { return; },
-    preventDefault() { return; },
-    stopImmediatePropagation() { return; },
-    stopPropagation() { return; },
-    AT_TARGET: 0,
-    BUBBLING_PHASE: 0,
-    CAPTURING_PHASE: 0,
-    NONE: 0,
-    scoped: false,
-    deepPath(): any { },
-    tag: ndefTag
-};
-
-let event: NdefTagEvent = ndefTagEvent;
\ No newline at end of file
+let ndefTagEvent = { ...(undefined as Event), tag: ndefTag };
+let event: NdefTagEvent = ndefTagEvent;
diff --git a/types/phonegap/index.d.ts b/types/phonegap/index.d.ts
index 60ad5d2fd9..926140c3f9 100644
--- a/types/phonegap/index.d.ts
+++ b/types/phonegap/index.d.ts
@@ -526,7 +526,7 @@ declare var Media: {
     new(src: string, onSuccess: (arg: any) => any, onError: (error: any) => any): Media;
 }
 
-interface Notification {
+interface PhonegapNotification {
     alert(message: string, alertCallback: Function, title?: string, buttonName?: string): void;
     confirm(message: string, confirmCallback: Function, title?: string, buttonLabels?: string): void;
 	confirm(message: string, confirmCallback: Function, title?: string, buttonLabels?: string[]): void;
@@ -614,7 +614,7 @@ interface /*PhoneGapNavigator extends*/ Navigator {
     contacts: Contacts;
     device: Device;
     globalization: Globalization;
-    notification: Notification;
+    notification: PhonegapNotification;
     splashscreen: Splashscreen;
 }
 
diff --git a/types/physijs/index.d.ts b/types/physijs/index.d.ts
index 86ea3b9f38..79698c4697 100644
--- a/types/physijs/index.d.ts
+++ b/types/physijs/index.d.ts
@@ -143,8 +143,8 @@ declare namespace Physijs {
         onSimulationResume():void;
         removeConstraint(constraint:Constraint):void;
         execute(cmd:string, params:any):void;
-        add(object:THREE.Object3D):void;
-        remove(object:THREE.Object3D):void;
+        add(object:THREE.Object3D):this;
+        remove(object:THREE.Object3D):this;
         setFixedTimeStep(fixedTimeStep:number):void;
         setGravity(gravity:THREE.Vector3):void;
         simulate(timeStep?:number, maxSubSteps?:number):boolean;
diff --git a/types/pidusage/index.d.ts b/types/pidusage/index.d.ts
index fbe98309b7..b16dada0ef 100644
--- a/types/pidusage/index.d.ts
+++ b/types/pidusage/index.d.ts
@@ -1,12 +1,50 @@
-// Type definitions for pidusage 1.1
+// Type definitions for pidusage 2.0
 // Project: https://github.com/soyuka/pidusage
 // Definitions by: Cyril Schumacher <https://github.com/cyrilschumacher>
+//                 wujingtao <https://github.com/mx601595686>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare function pidusage(pid: number | string, callback: (err: Error | null, stats: Stat) => void): void;
+declare function pidusage(pids: Array<number | string>, callback: (err: Error | null, stats: { [key: string]: Stat }) => void): void;
+declare function pidusage(pid: number | string): Promise<Stat>;
+declare function pidusage(pids: Array<number | string>): Promise<{ [key: string]: Stat }>;
+
+export default pidusage;
 
 export interface Stat {
-    cpu: number;
-    memory: number;
-}
+        /**
+         * percentage (from 0 to 100*vcore)
+         */
+        cpu: number;
 
-export function stat(pid: number, callback: (error: Error, stat: Stat) => void): void;
-export function unmonitor(pid: number): void;
+        /**
+         * bytes
+         */
+        memory: number;
+
+        /**
+         * PPID
+         */
+        ppid: number;
+
+        /**
+         * PID
+         */
+        pid: number;
+
+        /**
+         * ms user + system time
+         */
+        ctime: number;
+
+        /**
+         * ms since the start of the process
+         */
+        elapsed: number;
+
+        /**
+         * ms since epoch
+         */
+        timestamp: number;
+    }
diff --git a/types/pidusage/pidusage-tests.ts b/types/pidusage/pidusage-tests.ts
index b1d16cbc16..614569dfa3 100644
--- a/types/pidusage/pidusage-tests.ts
+++ b/types/pidusage/pidusage-tests.ts
@@ -1,8 +1,38 @@
-import pusage = require("pidusage");
+import pidusage, { Stat } from 'pidusage';
 
-pusage.stat(0, (err: Error, stat: pusage.Stat) => {
-	const cpu = stat.cpu;
-	const memory = stat.memory;
+let cpu: number;
+let memory: number;
+let ppid: number;
+let pid: number;
+let ctime: number;
+let elapsed: number;
+let timestamp: number;
+
+pidusage(1, (err: Error | null, stats: Stat) => {
+    cpu = stats.cpu;
+    memory = stats.memory;
+    ppid = stats.ppid;
+    pid = stats.pid;
+    ctime = stats.ctime;
+    elapsed = stats.elapsed;
+    timestamp = stats.timestamp;
 });
 
-pusage.unmonitor(0);
+pidusage('two', (err: Error | null, stats: Stat) => {
+    cpu = stats.cpu;
+    memory = stats.memory;
+    ppid = stats.ppid;
+    pid = stats.pid;
+    ctime = stats.ctime;
+    elapsed = stats.elapsed;
+    timestamp = stats.timestamp;
+});
+
+pidusage([1, 'two'], (err: Error | null, stats: { [key: string]: Stat }) => {
+    const one: Stat = stats[1];
+    const two: Stat = stats.two;
+});
+
+const stats_1: Promise<Stat> = pidusage(1);
+const stats_two: Promise<Stat> = pidusage('two');
+const stats_obj: Promise<{ [key: string]: Stat }> = pidusage([1, 'two']);
diff --git a/types/pino/index.d.ts b/types/pino/index.d.ts
index 0f98e0a622..42d7a4d1f6 100644
--- a/types/pino/index.d.ts
+++ b/types/pino/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for pino 4.16
+// Type definitions for pino 5.20
 // Project: https://github.com/pinojs/pino.git
 // Definitions by: Peter Snider <https://github.com/psnider>
 //                 BendingBender <https://github.com/BendingBender>
 //                 Christian Rackerseder <https://github.com/screendriver>
+//                 GP <https://github.com/paambaati>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -19,7 +20,7 @@ export = P;
  * relative protocol is enabled. Default: process.stdout
  * @returns a new logger instance.
  */
-declare function P(optionsOrStream?: P.LoggerOptions | stream.Writable | stream.Duplex | stream.Transform): P.Logger;
+declare function P(optionsOrStream?: P.LoggerOptions | stream.Writable | stream.Duplex | stream.Transform | NodeJS.WritableStream): P.Logger;
 
 /**
  * @param [options]: an options object
@@ -27,7 +28,7 @@ declare function P(optionsOrStream?: P.LoggerOptions | stream.Writable | stream.
  * relative protocol is enabled. Default: process.stdout
  * @returns a new logger instance.
  */
-declare function P(options: P.LoggerOptions, stream: stream.Writable | stream.Duplex | stream.Transform): P.Logger;
+declare function P(options: P.LoggerOptions, stream: stream.Writable | stream.Duplex | stream.Transform | NodeJS.WritableStream): P.Logger;
 
 declare namespace P {
     /**
@@ -145,6 +146,10 @@ declare namespace P {
          * requires supplying a level value via `levelVal`. Default: 'info'.
          */
         level?: LevelWithSilent | string;
+        /**
+         * Outputs the level as a string instead of integer. Default: `false`.
+         */
+        useLevelLabels?: boolean;
         /**
          * When defining a custom log level via level, set to an integer value to define the new level. Default: `undefined`.
          */
@@ -268,6 +273,10 @@ declare namespace P {
          * You can pass `'silent'` to disable logging.
          */
         level: LevelWithSilent | string;
+        /**
+         * Outputs the level as a string instead of integer.
+         */
+        useLevelLabels: boolean;
         /**
          * Returns the integer value for the logger instance's logging level.
          */
diff --git a/types/pino/pino-tests.ts b/types/pino/pino-tests.ts
index 6d226a1d92..356f84da30 100644
--- a/types/pino/pino-tests.ts
+++ b/types/pino/pino-tests.ts
@@ -93,3 +93,10 @@ log.level = 'info';
 
 pino.levels.values.error === 50;
 pino.levels.labels[50] === 'error';
+
+const logstderr: pino.Logger = pino(process.stderr);
+logstderr.error('on stderr instead of stdout');
+
+log.useLevelLabels = true;
+log.info('lol');
+log.level === 'info';
diff --git a/types/pixi.js/index.d.ts b/types/pixi.js/index.d.ts
index ff2759998b..5e1ca464e2 100644
--- a/types/pixi.js/index.d.ts
+++ b/types/pixi.js/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for Pixi.js 4.7
+// Type definitions for pixi.js 4.8
 // Project: https://github.com/pixijs/pixi.js/tree/dev
-// Definitions by: clark-stevenson <https://github.com/pixijs/pixi-typescript>
+// Definitions by: clark-stevenson <https://github.com/clark-stevenson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
@@ -22,8 +22,15 @@ declare namespace PIXI {
     const TEXT_GRADIENT: typeof CONST.TEXT_GRADIENT;
     const UPDATE_PRIORITY: typeof CONST.UPDATE_PRIORITY;
 
-    function autoDetectRenderer(width: number, height: number, options?: PIXI.RendererOptions, forceCanvas?: boolean): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
-    function autoDetectRenderer(options?: PIXI.RendererOptions): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    function autoDetectRenderer(
+        width: number,
+        height: number,
+        options?: PIXI.RendererOptions,
+        forceCanvas?: boolean
+    ): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
+    function autoDetectRenderer(
+        options?: PIXI.RendererOptions
+    ): PIXI.WebGLRenderer | PIXI.CanvasRenderer;
     const loader: PIXI.loaders.Loader;
 
     //////////////////////////////////////////////////////////////////////////////
@@ -39,18 +46,18 @@ declare namespace PIXI {
         let SPRITE_BATCH_SIZE: number;
         let RETINA_PREFIX: RegExp;
         const RENDER_OPTIONS: {
-            view: HTMLCanvasElement | null,
-            antialias: boolean,
-            forceFXAA: boolean,
-            autoResize: boolean,
-            transparent: boolean,
-            backgroundColor: number,
-            clearBeforeRender: boolean,
-            preserveDrawingBuffer: boolean,
-            roundPixels: boolean
-            width: number,
-            height: number,
-            legacy: boolean,
+            view: HTMLCanvasElement | null;
+            antialias: boolean;
+            forceFXAA: boolean;
+            autoResize: boolean;
+            transparent: boolean;
+            backgroundColor: number;
+            clearBeforeRender: boolean;
+            preserveDrawingBuffer: boolean;
+            roundPixels: boolean;
+            width: number;
+            height: number;
+            legacy: boolean;
         };
         let TRANSFORM_MODE: number;
         let GC_MODE: number;
@@ -84,7 +91,9 @@ declare namespace PIXI {
             protected children: AccessibleTarget[];
             protected isActive: boolean;
 
-            protected updateAccessibleObjects(displayObject: DisplayObject): void;
+            protected updateAccessibleObjects(
+                displayObject: DisplayObject
+            ): void;
             protected update(): void;
             protected capHitArea(hitArea: HitArea): void;
             protected addChild(displayObject: DisplayObject): void;
@@ -92,7 +101,7 @@ declare namespace PIXI {
             protected _onFocus(e: interaction.InteractionEvent): void;
             protected _onFocusOut(e: interaction.InteractionEvent): void;
             protected _onKeyDown(e: interaction.InteractionEvent): void;
-            protected _onMouseMove(): void;
+            protected _onMouseMove(e: MouseEvent): void;
 
             destroy(): void;
         }
@@ -153,8 +162,8 @@ declare namespace PIXI {
             TRIANGLE_FAN: number;
         };
         const SCALE_MODES: {
-            LINEAR: number,
-            NEAREST: number
+            LINEAR: number;
+            NEAREST: number;
         };
         const GC_MODES: {
             AUTO: number;
@@ -200,9 +209,22 @@ declare namespace PIXI {
 
     // display
 
+    interface StageOptions {
+        children?: boolean;
+        texture?: boolean;
+        baseTexture?: boolean;
+    }
+
     class Application {
-        constructor(options?: ApplicationOptions)
-        constructor(width?: number, height?: number, options?: ApplicationOptions, noWebGL?: boolean, sharedTicker?: boolean, sharedLoader?: boolean);
+        constructor(options?: ApplicationOptions);
+        constructor(
+            width?: number,
+            height?: number,
+            options?: ApplicationOptions,
+            noWebGL?: boolean,
+            sharedTicker?: boolean,
+            sharedLoader?: boolean
+        );
 
         private _ticker: ticker.Ticker;
 
@@ -215,7 +237,10 @@ declare namespace PIXI {
         stop(): void;
         start(): void;
         render(): void;
-        destroy(removeView?: boolean): void;
+        destroy(
+            removeView?: boolean,
+            stageOptions?: StageOptions | boolean
+        ): void;
         readonly view: HTMLCanvasElement;
     }
 
@@ -237,8 +262,19 @@ declare namespace PIXI {
         getRectangle(rect?: Rectangle): Rectangle;
         addPoint(point: Point): void;
         addQuad(vertices: number[]): Bounds | undefined;
-        addFrame(transform: Transform, x0: number, y0: number, x1: number, y1: number): void;
-        addVertices(transform: Transform, vertices: number[], beginOffset: number, endOffset: number): void;
+        addFrame(
+            transform: Transform,
+            x0: number,
+            y0: number,
+            x1: number,
+            y1: number
+        ): void;
+        addVertices(
+            transform: Transform,
+            vertices: number[],
+            beginOffset: number,
+            endOffset: number
+        ): void;
         addBounds(bounds: Bounds): void;
         addBoundsMask(bounds: Bounds, mask: Bounds): void;
         addBoundsArea(bounds: Bounds, area: Rectangle): void;
@@ -253,7 +289,10 @@ declare namespace PIXI {
         height: number;
 
         protected onChildrenChange: (...args: any[]) => void;
-        addChild<T extends DisplayObject>(child: T, ...additionalChildren: DisplayObject[]): T;
+        addChild<T extends DisplayObject>(
+            child: T,
+            ...additionalChildren: DisplayObject[]
+        ): T;
         addChildAt<T extends DisplayObject>(child: T, index: number): T;
         swapChildren(child: DisplayObject, child2: DisplayObject): void;
         getChildIndex(child: DisplayObject): number;
@@ -273,16 +312,31 @@ declare namespace PIXI {
         renderCanvas(renderer: CanvasRenderer): void;
         destroy(options?: DestroyOptions | boolean): void;
 
-        once(event: "added" | "removed", fn: (displayObject: DisplayObject) => void, context?: any): this;
+        once(
+            event: "added" | "removed",
+            fn: (displayObject: DisplayObject) => void,
+            context?: any
+        ): this;
         //tslint:disable-next-line:ban-types forbidden-types
         once(event: string, fn: Function, context?: any): this;
-        on(event: "added" | "removed", fn: (displayObject: DisplayObject) => void, context?: any): this;
+        on(
+            event: "added" | "removed",
+            fn: (displayObject: DisplayObject) => void,
+            context?: any
+        ): this;
         //tslint:disable-next-line:ban-types forbidden-types
         on(event: string, fn: Function, context?: any): this;
         //tslint:disable-next-line:ban-types forbidden-types
-        off(event: "added" | "removed" | string, fn?: Function, context?: any): this;
+        off(
+            event: "added" | "removed" | string,
+            fn?: Function,
+            context?: any
+        ): this;
     }
-    class DisplayObject extends utils.EventEmitter implements interaction.InteractiveTarget, accessibility.AccessibleTarget {
+    class DisplayObject extends utils.EventEmitter
+        implements
+            interaction.InteractiveTarget,
+            accessibility.AccessibleTarget {
         // begin extras.cacheAsBitmap
         protected _cacheAsBitmap: boolean;
         protected _cacheData: boolean;
@@ -290,7 +344,9 @@ declare namespace PIXI {
         protected _renderCachedWebGL(renderer: WebGLRenderer): void;
         protected _initCachedDisplayObject(renderer: WebGLRenderer): void;
         protected _renderCachedCanvas(renderer: CanvasRenderer): void;
-        protected _initCachedDisplayObjectCanvas(renderer: CanvasRenderer): void;
+        protected _initCachedDisplayObjectCanvas(
+            renderer: CanvasRenderer
+        ): void;
         protected _calculateCachedBounds(): Rectangle;
         protected _getCachedLocalBounds(): Rectangle;
         protected _destroyCachedDisplayObject(): void;
@@ -315,10 +371,18 @@ declare namespace PIXI {
         // begin interactive target
         interactive: boolean;
         interactiveChildren: boolean;
-        hitArea: PIXI.Rectangle | PIXI.Circle | PIXI.Ellipse | PIXI.Polygon | PIXI.RoundedRectangle | PIXI.HitArea;
+        hitArea:
+            | PIXI.Rectangle
+            | PIXI.Circle
+            | PIXI.Ellipse
+            | PIXI.Polygon
+            | PIXI.RoundedRectangle
+            | PIXI.HitArea;
         buttonMode: boolean;
         cursor: string;
-        trackedPointers(): { [key: number]: interaction.InteractionTrackingData; };
+        trackedPointers(): {
+            [key: number]: interaction.InteractionTrackingData;
+        };
         // Deprecated
         defaultCursor: string;
         // end interactive target
@@ -360,23 +424,62 @@ declare namespace PIXI {
         //creates and returns a new point
         toGlobal(position: PointLike): Point;
         //modifies the x and y of the passed point and returns it
-        toGlobal<T extends PointLike>(position: PointLike, point?: T, skipUpdate?: boolean): T;
+        toGlobal<T extends PointLike>(
+            position: PointLike,
+            point?: T,
+            skipUpdate?: boolean
+        ): T;
         //creates and returns a new point
         toLocal(position: PointLike, from?: DisplayObject): Point;
         //modifies the x and y of the passed point and returns it
-        toLocal<T extends PointLike>(position: PointLike, from?: DisplayObject, point?: T, skipUpdate?: boolean): T;
+        toLocal<T extends PointLike>(
+            position: PointLike,
+            from?: DisplayObject,
+            point?: T,
+            skipUpdate?: boolean
+        ): T;
         renderWebGL(renderer: WebGLRenderer): void;
         renderCanvas(renderer: CanvasRenderer): void;
         setParent(container: Container): Container;
-        setTransform(x?: number, y?: number, scaleX?: number, scaleY?: number, rotation?: number, skewX?: number, skewY?: number, pivotX?: number, pivotY?: number): DisplayObject;
+        setTransform(
+            x?: number,
+            y?: number,
+            scaleX?: number,
+            scaleY?: number,
+            rotation?: number,
+            skewX?: number,
+            skewY?: number,
+            pivotX?: number,
+            pivotY?: number
+        ): DisplayObject;
         destroy(): void;
 
-        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;
+        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;
-        off(event: interaction.InteractionEventTypes, fn?: (event: interaction.InteractionEvent) => void, context?: any): this;
-        addListener(event: interaction.InteractionEventTypes, fn: (event: interaction.InteractionEvent) => void, context?: any): 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;
     }
     class TransformBase {
         static IDENTITY: TransformBase;
@@ -441,8 +544,17 @@ declare namespace PIXI {
             fillAlpha: number,
             fill: boolean,
             nativeLines: boolean,
-            shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any);
+            shape:
+                | Circle
+                | Rectangle
+                | Ellipse
+                | Polygon
+                | RoundedRectangle
+                | any,
+            lineAlignment?: number
+        );
         lineWidth: number;
+        lineAlignment: number;
         nativeLines: boolean;
         lineColor: number;
         lineAlpha: number;
@@ -451,20 +563,42 @@ declare namespace PIXI {
         fillAlpha: number;
         protected _fillTint: number;
         fill: boolean;
-        protected holes: Circle[] | Rectangle[] | Ellipse[] | Polygon[] | RoundedRectangle[] | any[];
+        protected holes:
+            | Circle[]
+            | Rectangle[]
+            | Ellipse[]
+            | Polygon[]
+            | RoundedRectangle[]
+            | any[];
         shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any;
         type?: number;
         clone(): GraphicsData;
-        addHole(shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any): void;
+        addHole(
+            shape:
+                | Circle
+                | Rectangle
+                | Ellipse
+                | Polygon
+                | RoundedRectangle
+                | any
+        ): void;
         destroy(options?: DestroyOptions | boolean): void;
     }
     class Graphics extends Container {
+        static CURVES: {
+            adaptive: boolean;
+            maxLength: number;
+            minSegments: number;
+            maxSegments: number;
+        };
+
         constructor(nativeLines?: boolean);
 
         fillAlpha: number;
         lineWidth: number;
         nativeLines: boolean;
         lineColor: number;
+        lineAlignment: number;
         protected graphicsData: GraphicsData[];
         tint: number;
         protected _prevTint: number;
@@ -485,21 +619,88 @@ declare namespace PIXI {
         static _SPRITE_TEXTURE: Texture;
 
         clone(): Graphics;
-        lineStyle(lineWidth?: number, color?: number, alpha?: number): Graphics;
+        protected _quadraticCurveLength(
+            fromX: number,
+            fromY: number,
+            cpX: number,
+            cpY: number,
+            toX: number,
+            toY: number
+        ): number;
+        protected _bezierCurveLength(
+            fromX: number,
+            fromY: number,
+            cpX: number,
+            cpY: number,
+            cpX2: number,
+            cpY2: number,
+            toX: number,
+            toY: number
+        ): number;
+        protected _segmentsCount(length: number): number;
+        lineStyle(
+            lineWidth?: number,
+            color?: number,
+            alpha?: number,
+            alignment?: number
+        ): Graphics;
         moveTo(x: number, y: number): Graphics;
         lineTo(x: number, y: number): Graphics;
-        quadraticCurveTo(cpX: number, cpY: number, toX: number, toY: number): Graphics;
-        bezierCurveTo(cpX: number, cpY: number, cpX2: number, cpY2: number, toX: number, toY: number): Graphics;
-        arcTo(x1: number, y1: number, x2: number, y2: number, radius: number): Graphics;
-        arc(cx: number, cy: number, radius: number, startAngle: number, endAngle: number, anticlockwise?: boolean): Graphics;
+        quadraticCurveTo(
+            cpX: number,
+            cpY: number,
+            toX: number,
+            toY: number
+        ): Graphics;
+        bezierCurveTo(
+            cpX: number,
+            cpY: number,
+            cpX2: number,
+            cpY2: number,
+            toX: number,
+            toY: number
+        ): Graphics;
+        arcTo(
+            x1: number,
+            y1: number,
+            x2: number,
+            y2: number,
+            radius: number
+        ): Graphics;
+        arc(
+            cx: number,
+            cy: number,
+            radius: number,
+            startAngle: number,
+            endAngle: number,
+            anticlockwise?: boolean
+        ): Graphics;
         beginFill(color: number, alpha?: number): Graphics;
         endFill(): Graphics;
         drawRect(x: number, y: number, width: number, height: number): Graphics;
-        drawRoundedRect(x: number, y: number, width: number, height: number, radius: number): Graphics;
+        drawRoundedRect(
+            x: number,
+            y: number,
+            width: number,
+            height: number,
+            radius: number
+        ): Graphics;
         drawCircle(x: number, y: number, radius: number): Graphics;
-        drawEllipse(x: number, y: number, width: number, height: number): Graphics;
+        drawEllipse(
+            x: number,
+            y: number,
+            width: number,
+            height: number
+        ): Graphics;
         drawPolygon(path: number[] | Point[] | Polygon): Graphics;
-        drawStar(x: number, y: number, points: number, radius: number, innerRadius: number, rotation?: number): Graphics;
+        drawStar(
+            x: number,
+            y: number,
+            points: number,
+            radius: number,
+            innerRadius: number,
+            rotation?: number
+        ): Graphics;
         clear(): Graphics;
         isFastRect(): boolean;
         protected _renderCanvas(renderer: CanvasRenderer): void;
@@ -507,7 +708,15 @@ declare namespace PIXI {
         protected _renderSpriteRect(renderer: PIXI.SystemRenderer): void;
         containsPoint(point: Point): boolean;
         updateLocalBounds(): void;
-        drawShape(shape: Circle | Rectangle | Ellipse | Polygon | RoundedRectangle | any): GraphicsData;
+        drawShape(
+            shape:
+                | Circle
+                | Rectangle
+                | Ellipse
+                | Polygon
+                | RoundedRectangle
+                | any
+        ): GraphicsData;
         generateCanvasTexture(scaleMode?: number, resolution?: number): Texture;
         closePath(): Graphics;
         addHole(): Graphics;
@@ -517,7 +726,11 @@ declare namespace PIXI {
         constructor(renderer: SystemRenderer);
         render(graphics: Graphics): void;
         protected updateGraphicsTint(graphics: Graphics): void;
-        protected renderPolygon(points: Point[], close: boolean, context: CanvasRenderingContext2D): void;
+        protected renderPolygon(
+            points: Point[],
+            close: boolean,
+            context: CanvasRenderingContext2D
+        ): void;
         destroy(): void;
     }
     class GraphicsRenderer extends ObjectRenderer {
@@ -532,10 +745,18 @@ declare namespace PIXI {
         destroy(): void;
         render(graphics: Graphics): void;
         protected updateGraphics(graphics: PIXI.Graphics): void;
-        getWebGLData(webGL: WebGLRenderingContext, type: number, nativeLines: number): WebGLGraphicsData;
+        getWebGLData(
+            webGL: WebGLRenderingContext,
+            type: number,
+            nativeLines: number
+        ): WebGLGraphicsData;
     }
     class WebGLGraphicsData {
-        constructor(gl: WebGLRenderingContext, shader: glCore.GLShader, attribsState: glCore.AttribState);
+        constructor(
+            gl: WebGLRenderingContext,
+            shader: glCore.GLShader,
+            attribsState: glCore.AttribState
+        );
 
         gl: WebGLRenderingContext;
         color: number[];
@@ -554,7 +775,7 @@ declare namespace PIXI {
         upload(): void;
         destroy(): void;
     }
-    class PrimitiveShader extends glCore.GLShader { }
+    class PrimitiveShader extends glCore.GLShader {}
 
     // math
 
@@ -579,10 +800,22 @@ declare namespace PIXI {
         function rotate180(rotation: number): number;
         function isVertical(rotation: number): boolean;
         function byDirection(dx: number, dy: number): number;
-        function matrixAppendRotationInv(matrix: Matrix, rotation: number, tx: number, ty: number): void;
+        function matrixAppendRotationInv(
+            matrix: Matrix,
+            rotation: number,
+            tx: number,
+            ty: number
+        ): void;
     }
     class Matrix {
-        constructor(a?: number, b?: number, c?: number, d?: number, tx?: number, ty?: number);
+        constructor(
+            a?: number,
+            b?: number,
+            c?: number,
+            d?: number,
+            tx?: number,
+            ty?: number
+        );
 
         a: number;
         b: number;
@@ -592,7 +825,14 @@ declare namespace PIXI {
         ty: number;
 
         fromArray(array: number[]): void;
-        set(a: number, b: number, c: number, d: number, tx: number, ty: number): Matrix;
+        set(
+            a: number,
+            b: number,
+            c: number,
+            d: number,
+            tx: number,
+            ty: number
+        ): Matrix;
         toArray(transpose?: boolean, out?: number[]): number[];
         apply(pos: Point, newPos?: Point): Point;
         applyInverse(pos: Point, newPos?: Point): Point;
@@ -600,7 +840,17 @@ declare namespace PIXI {
         scale(x: number, y: number): Matrix;
         rotate(angle: number): Matrix;
         append(matrix: Matrix): Matrix;
-        setTransform(x: number, y: number, pivotX: number, pivotY: number, scaleX: number, scaleY: number, rotation: number, skewX: number, skewY: number): PIXI.Matrix;
+        setTransform(
+            x: number,
+            y: number,
+            pivotX: number,
+            pivotY: number,
+            scaleX: number,
+            scaleY: number,
+            rotation: number,
+            skewX: number,
+            skewY: number
+        ): PIXI.Matrix;
         prepend(matrix: Matrix): Matrix;
         invert(): Matrix;
         identity(): Matrix;
@@ -695,7 +945,13 @@ declare namespace PIXI {
         enlarge(rectangle: Rectangle): void;
     }
     class RoundedRectangle implements HitArea {
-        constructor(x?: number, y?: number, width?: number, height?: number, radius?: number);
+        constructor(
+            x?: number,
+            y?: number,
+            width?: number,
+            height?: number,
+            radius?: number
+        );
 
         x: number;
         y: number;
@@ -811,11 +1067,15 @@ declare namespace PIXI {
         accessibility: accessibility.AccessibilityManager;
         interaction: interaction.InteractionManager;
     }
-    interface RendererPlugins extends DefaultRendererPlugins {
-    }
+    interface RendererPlugins extends DefaultRendererPlugins {}
     class SystemRenderer extends utils.EventEmitter {
         constructor(system: string, options?: RendererOptions);
-        constructor(system: string, screenWidth?: number, screenHeight?: number, options?: RendererOptions);
+        constructor(
+            system: string,
+            screenWidth?: number,
+            screenHeight?: number,
+            options?: RendererOptions
+        );
 
         type: number;
         options: RendererOptions;
@@ -838,7 +1098,12 @@ declare namespace PIXI {
         protected _lastObjectRendered: DisplayObject;
 
         resize(screenWidth: number, screenHeight: number): void;
-        generateTexture(displayObject: DisplayObject, scaleMode?: number, resolution?: number, region?: Rectangle): RenderTexture;
+        generateTexture(
+            displayObject: DisplayObject,
+            scaleMode?: number,
+            resolution?: number,
+            region?: Rectangle
+        ): RenderTexture;
         render(...args: any[]): void;
         destroy(removeView?: boolean): void;
     }
@@ -846,19 +1111,29 @@ declare namespace PIXI {
         extract: extract.CanvasExtract;
         prepare: prepare.CanvasPrepare;
     }
-    interface CanvasRendererPlugins extends DefaultCanvasRendererPlugins, RendererPlugins {
-    }
+    interface CanvasRendererPlugins
+        extends DefaultCanvasRendererPlugins,
+            RendererPlugins {}
     class CanvasRenderer extends SystemRenderer {
         // plugintarget mixin start
-        static __plugins: { [pluginName: string]: { new(renderer: CanvasRenderer): any; } };
-        static registerPlugin(pluginName: string, ctor: { new(renderer: CanvasRenderer): any; }): void;
+        static __plugins: {
+            [pluginName: string]: { new (renderer: CanvasRenderer): any };
+        };
+        static registerPlugin(
+            pluginName: string,
+            ctor: { new (renderer: CanvasRenderer): any }
+        ): void;
         plugins: any;
         initPlugins(): void;
         destroyPlugins(): void;
         // plugintarget mixin end
 
         constructor(options?: RendererOptions);
-        constructor(screenWidth?: number, screenHeight?: number, options?: RendererOptions);
+        constructor(
+            screenWidth?: number,
+            screenHeight?: number,
+            options?: RendererOptions
+        );
 
         protected _activeBlendMode: number;
         rootContext: CanvasRenderingContext2D;
@@ -870,18 +1145,44 @@ declare namespace PIXI {
 
         context: CanvasRenderingContext2D | null;
 
-        render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void;
+        render(
+            displayObject: PIXI.DisplayObject,
+            renderTexture?: PIXI.RenderTexture,
+            clear?: boolean,
+            transform?: PIXI.Transform,
+            skipUpdateTransform?: boolean
+        ): void;
         setBlendMode(blendMode: number): void;
         destroy(removeView?: boolean): void;
         clear(clearColor?: string): void;
         invalidateBlendMode(): void;
 
-        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;
+        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;
-        off(event: "prerender" | "postrender", fn?: () => void, context?: any): this;
-        addListener(event: "prerender" | "postrender", fn: () => void, context?: any): this;
+        off(
+            event: "prerender" | "postrender",
+            fn?: () => void,
+            context?: any
+        ): this;
+        addListener(
+            event: "prerender" | "postrender",
+            fn: () => void,
+            context?: any
+        ): this;
     }
     class CanvasMaskManager {
         constructor(renderer: CanvasRenderer);
@@ -906,28 +1207,36 @@ declare namespace PIXI {
         destroy(): void;
     }
 
-    interface WebGLRendererOptions extends RendererOptions {
-    }
+    interface WebGLRendererOptions extends RendererOptions {}
     interface DefaultWebGLRendererPlugins {
         extract: extract.WebGLExtract;
         prepare: prepare.WebGLPrepare;
     }
-    interface WebGLRendererPlugins extends DefaultWebGLRendererPlugins, RendererPlugins {
-    }
-    interface WebGLRendererOptions extends RendererOptions {
-    }
+    interface WebGLRendererPlugins
+        extends DefaultWebGLRendererPlugins,
+            RendererPlugins {}
+    interface WebGLRendererOptions extends RendererOptions {}
     class WebGLRenderer extends SystemRenderer {
         //tslint:disable-next-line:ban-types forbidden-types
         // plugintarget mixin start
-        static __plugins: { [pluginName: string]: { new(renderer: WebGLRenderer): any; } };
-        static registerPlugin(pluginName: string, ctor: { new(renderer: WebGLRenderer): any; }): void;
+        static __plugins: {
+            [pluginName: string]: { new (renderer: WebGLRenderer): any };
+        };
+        static registerPlugin(
+            pluginName: string,
+            ctor: { new (renderer: WebGLRenderer): any }
+        ): void;
         plugins: any;
         initPlugins(): void;
         destroyPlugins(): void;
         // plugintarget mixin end
 
         constructor(options?: WebGLRendererOptions);
-        constructor(screenWidth?: number, screenHeight?: number, options?: WebGLRendererOptions);
+        constructor(
+            screenWidth?: number,
+            screenHeight?: number,
+            options?: WebGLRendererOptions
+        );
 
         protected _contextOptions: {
             alpha: boolean;
@@ -955,18 +1264,36 @@ declare namespace PIXI {
         _activeRenderTarget: RenderTarget;
         protected _initContext(): void;
 
-        render(displayObject: PIXI.DisplayObject, renderTexture?: PIXI.RenderTexture, clear?: boolean, transform?: PIXI.Transform, skipUpdateTransform?: boolean): void;
+        render(
+            displayObject: PIXI.DisplayObject,
+            renderTexture?: PIXI.RenderTexture,
+            clear?: boolean,
+            transform?: PIXI.Transform,
+            skipUpdateTransform?: boolean
+        ): void;
         setObjectRenderer(objectRenderer: ObjectRenderer): void;
         flush(): void;
         setBlendMode(blendMode: number): void;
         clear(clearColor?: number): void;
         setTransform(matrix: Matrix): void;
-        clearRenderTexture(renderTexture: RenderTexture, clearColor?: number): WebGLRenderer;
-        bindRenderTexture(renderTexture: RenderTexture, transform: Transform): WebGLRenderer;
+        clearRenderTexture(
+            renderTexture: RenderTexture,
+            clearColor?: number
+        ): WebGLRenderer;
+        bindRenderTexture(
+            renderTexture: RenderTexture,
+            transform: Transform
+        ): WebGLRenderer;
         bindRenderTarget(renderTarget: RenderTarget): WebGLRenderer;
         bindShader(shader: Shader, autoProject?: boolean): WebGLRenderer;
-        bindTexture(texture: Texture | BaseTexture, location?: number, forceLocation?: boolean): number;
-        unbindTexture(texture: Texture | BaseTexture): WebGLRenderer | undefined;
+        bindTexture(
+            texture: Texture | BaseTexture,
+            location?: number,
+            forceLocation?: boolean
+        ): number;
+        unbindTexture(
+            texture: Texture | BaseTexture
+        ): WebGLRenderer | undefined;
         createVao(): glCore.VertexArrayObject;
         bindVao(vao: glCore.VertexArrayObject): WebGLRenderer;
         reset(): WebGLRenderer;
@@ -974,17 +1301,59 @@ declare namespace PIXI {
         handleContextRestored: () => void;
         destroy(removeView?: boolean): void;
 
-        on(event: "prerender" | "postrender", fn: () => void, context?: any): this;
-        on(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
-        once(event: "prerender" | "postrender", fn: () => void, context?: any): this;
-        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;
-        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;
-        addListener(event: "context", fn: (gl: WebGLRenderingContext) => void, context?: any): this;
+        on(
+            event: "prerender" | "postrender",
+            fn: () => void,
+            context?: any
+        ): this;
+        on(
+            event: "context",
+            fn: (gl: WebGLRenderingContext) => void,
+            context?: any
+        ): this;
+        once(
+            event: "prerender" | "postrender",
+            fn: () => void,
+            context?: any
+        ): this;
+        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;
+        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;
+        addListener(
+            event: "context",
+            fn: (gl: WebGLRenderingContext) => void,
+            context?: any
+        ): this;
     }
     class WebGLState {
         constructor(gl: WebGLRenderingContext);
@@ -1067,7 +1436,16 @@ declare namespace PIXI {
         bounds: Rectangle;
     }
     class RenderTarget {
-        constructor(gl: WebGLRenderingContext, width: number, height: number, scaleMode: number, resolution: number, root?: boolean);
+        protected filterPoolKey: string;
+
+        constructor(
+            gl: WebGLRenderingContext,
+            width: number,
+            height: number,
+            scaleMode: number,
+            resolution: number,
+            root?: boolean
+        );
 
         gl: WebGLRenderingContext;
         frameBuffer: glCore.GLFramebuffer;
@@ -1084,7 +1462,7 @@ declare namespace PIXI {
         stencilBuffer: glCore.GLFramebuffer;
         stencilMaskStack: Graphics[];
         filterData: {
-            index: number,
+            index: number;
             stack: FilterDataStackItem[];
         };
         scaleMode: number;
@@ -1094,7 +1472,10 @@ declare namespace PIXI {
         attachStencilBuffer(): void;
         setFrame(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
         activate(): void;
-        calculateProjection(destinationFrame: Rectangle, sourceFrame: Rectangle): void;
+        calculateProjection(
+            destinationFrame: Rectangle,
+            sourceFrame: Rectangle
+        ): void;
         resize(width: number, height: number): void;
         destroy(): void;
     }
@@ -1128,7 +1509,12 @@ declare namespace PIXI {
         onPrerender(): void;
         pushFilter(target: RenderTarget, filters: Array<Filter<any>>): void;
         popFilter(): void;
-        applyFilter(shader: glCore.GLShader | Filter<any>, inputTarget: RenderTarget, outputTarget: RenderTarget, clear?: boolean): void;
+        applyFilter(
+            shader: glCore.GLShader | Filter<any>,
+            inputTarget: RenderTarget,
+            outputTarget: RenderTarget,
+            clear?: boolean
+        ): void;
         syncUniforms(shader: glCore.GLShader, filter: Filter<any>): void;
         getRenderTarget(clear?: boolean, resolution?: number): RenderTarget;
         returnRenderTarget(renderTarget: RenderTarget): RenderTarget;
@@ -1137,7 +1523,12 @@ declare namespace PIXI {
         calculateSpriteMatrix(outputMatrix: Matrix, sprite: Sprite): Matrix;
         destroy(contextLost?: boolean): void;
         emptyPool(): void;
-        getPotRenderTarget(gl: WebGLRenderingContext, minWidth: number, minHeight: number, resolution: number): RenderTarget;
+        getPotRenderTarget(
+            gl: WebGLRenderingContext,
+            minWidth: number,
+            minHeight: number,
+            resolution: number
+        ): RenderTarget;
         freePotRenderTarget(renderTarget: RenderTarget): void;
     }
     class StencilMaskStack {
@@ -1158,7 +1549,10 @@ declare namespace PIXI {
         popSpriteMask(): void;
         pushStencilMask(maskData: Sprite | Graphics): void;
         popStencilMask(): void;
-        pushScissorMask(target: RenderTarget, maskData: Sprite | Graphics): void;
+        pushScissorMask(
+            target: RenderTarget,
+            maskData: Sprite | Graphics
+        ): void;
         popScissorMask(): void;
     }
     class StencilManager extends WebGLManager {
@@ -1190,7 +1584,11 @@ declare namespace PIXI {
     }
     type UniformDataMap<U> = { [K in keyof U]: UniformData<U[K]> };
     class Filter<U extends Object> {
-        constructor(vertexSrc?: string, fragmentSrc?: string, uniforms?: UniformDataMap<U>);
+        constructor(
+            vertexSrc?: string,
+            fragmentSrc?: string,
+            uniforms?: UniformDataMap<U>
+        );
 
         protected _blendMode: number;
         vertexSrc?: string;
@@ -1204,7 +1602,13 @@ declare namespace PIXI {
         resolution: number;
         enabled: boolean;
         autoFit: boolean;
-        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget, clear?: boolean, currentState?: any): void;
+        apply(
+            filterManager: FilterManager,
+            input: RenderTarget,
+            output: RenderTarget,
+            clear?: boolean,
+            currentState?: any
+        ): void;
 
         static defaultVertexSrc: string;
         static defaultFragmentSrc: string;
@@ -1219,7 +1623,11 @@ declare namespace PIXI {
 
         maskSprite: Sprite;
         maskMatrix: Matrix;
-        apply(filterManager: FilterManager, input: RenderTarget, output: RenderTarget): void;
+        apply(
+            filterManager: FilterManager,
+            input: RenderTarget,
+            output: RenderTarget
+        ): void;
     }
 
     // sprites
@@ -1260,9 +1668,21 @@ declare namespace PIXI {
         containsPoint(point: Point): boolean;
         destroy(options?: DestroyOptions | boolean): void;
 
-        static from(source: number | string | BaseTexture | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): Sprite;
+        static from(
+            source:
+                | number
+                | string
+                | BaseTexture
+                | HTMLImageElement
+                | HTMLCanvasElement
+                | HTMLVideoElement
+        ): Sprite;
         static fromFrame(frameId: string): Sprite;
-        static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
+        static fromImage(
+            imageId: string,
+            crossorigin?: boolean,
+            scaleMode?: number
+        ): Sprite;
     }
     class BatchBuffer {
         vertices: ArrayBuffer;
@@ -1304,10 +1724,25 @@ declare namespace PIXI {
         destroy(): void;
     }
     namespace CanvasTinter {
-        function getTintedTexture(sprite: Sprite, color: number): HTMLCanvasElement;
-        function tintWithMultiply(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        function tintWithOverlay(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
-        function tintWithPerPixel(texture: Texture, color: number, canvas: HTMLCanvasElement): void;
+        function getTintedTexture(
+            sprite: Sprite,
+            color: number
+        ): HTMLCanvasElement;
+        function tintWithMultiply(
+            texture: Texture,
+            color: number,
+            canvas: HTMLCanvasElement
+        ): void;
+        function tintWithOverlay(
+            texture: Texture,
+            color: number,
+            canvas: HTMLCanvasElement
+        ): void;
+        function tintWithPerPixel(
+            texture: Texture,
+            color: number,
+            canvas: HTMLCanvasElement
+        ): void;
         function roundColor(color: number): number;
 
         let cacheStepsPerColorChannel: number;
@@ -1326,7 +1761,13 @@ declare namespace PIXI {
         dropShadowBlur?: number;
         dropShadowColor?: string | number;
         dropShadowDistance?: number;
-        fill?: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
+        fill?:
+            | string
+            | string[]
+            | number
+            | number[]
+            | CanvasGradient
+            | CanvasPattern;
         fillGradientType?: number;
         fillGradientStops?: number[];
         fontFamily?: string | string[];
@@ -1343,13 +1784,14 @@ declare namespace PIXI {
         strokeThickness?: number;
         textBaseline?: string;
         trim?: boolean;
+        whiteSpace?: string;
         wordWrap?: boolean;
         wordWrapWidth?: number;
         leading?: number;
     }
 
     class TextStyle implements TextStyleOptions {
-        constructor(style: TextStyleOptions)
+        constructor(style: TextStyleOptions);
 
         styleID: number;
 
@@ -1372,8 +1814,20 @@ declare namespace PIXI {
         dropShadowColor: string | number;
         protected _dropShadowDistance: number;
         dropShadowDistance: number;
-        protected _fill: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
-        fill: string | string[] | number | number[] | CanvasGradient | CanvasPattern;
+        protected _fill:
+            | string
+            | string[]
+            | number
+            | number[]
+            | CanvasGradient
+            | CanvasPattern;
+        fill:
+            | string
+            | string[]
+            | number
+            | number[]
+            | CanvasGradient
+            | CanvasPattern;
         protected _fillGradientType: number;
         fillGradientType: number;
         protected _fillGradientStops: number[];
@@ -1408,6 +1862,8 @@ declare namespace PIXI {
         textBaseline: string;
         protected _trim: boolean;
         trim: boolean;
+        protected _whiteSpace: string;
+        whiteSpace: string;
         protected _wordWrap: boolean;
         wordWrap: boolean;
         protected _wordWrapWidth: number;
@@ -1415,9 +1871,15 @@ declare namespace PIXI {
         toFontString(): string;
     }
     class TextMetrics {
-        protected _canvas: HTMLCanvasElement;
-        protected _context: CanvasRenderingContext2D;
-        protected _fonts: FontMetrics;
+        static METRICS_STRING: string;
+        static BASELINE_SYMBOL: string;
+        static BASELINE_MULTIPLIER: number;
+
+        static _canvas: HTMLCanvasElement;
+        static _context: CanvasRenderingContext2D;
+        static _fonts: FontMetrics;
+        static _newLines: number[];
+        static _breakingSpaces: number[];
 
         text: string;
         style: TextStyle;
@@ -1429,13 +1891,57 @@ declare namespace PIXI {
         maxLineWidth: number;
         fontProperties: any;
 
-        constructor(text: string, style: TextStyle, width: number, height: number, lines: number[], lineWidths: number[], lineHeight: number, maxLineWidth: number, fontProperties: any);
+        constructor(
+            text: string,
+            style: TextStyle,
+            width: number,
+            height: number,
+            lines: number[],
+            lineWidths: number[],
+            lineHeight: number,
+            maxLineWidth: number,
+            fontProperties: any
+        );
 
+        static measureText(
+            text: string,
+            style: TextStyle,
+            wordWrap?: boolean,
+            canvas?: HTMLCanvasElement
+        ): TextMetrics;
+        static wordWrap(
+            text: string,
+            style: TextStyle,
+            canvas?: HTMLCanvasElement
+        ): string;
+        static wordWrap(
+            text: string,
+            style: TextStyle,
+            canvas?: HTMLCanvasElement
+        ): string;
         static addLine(line: string, newLine?: boolean): string;
-        static measureText(text: string, style: TextStyle, wordWrap?: boolean, canvas?: HTMLCanvasElement): TextMetrics;
-        static wordWrap(text: string, style: TextStyle, canvas?: HTMLCanvasElement): string;
+        static getFromCache(
+            key: string,
+            letterSpacing: number,
+            cache: any,
+            context: CanvasRenderingContext2D
+        ): number;
+        static collapseSpaces(whiteSpace?: string): boolean;
+        static collapseNewlines(whiteSpace?: string): boolean;
+        static trimRight(text?: string): string;
+        static isNewline(char?: string): boolean;
+        static isBreakingSpace(char?: string): boolean;
+        static tokenize(text?: string): string[];
+        static canBreakWords(token?: string, breakWords?: boolean): boolean;
+        static canBreakChars(
+            char: string,
+            nextChar: string,
+            token: string,
+            index: number,
+            breakWords?: boolean
+        ): boolean;
         static measureFont(font: string): FontMetrics;
-        static getFromCache(key: string, letterSpacing: number, cache: any, context: CanvasRenderingContext2D): number;
+        static clearMetrics(font: string): void;
     }
     interface FontMetrics {
         ascent: number;
@@ -1443,7 +1949,11 @@ declare namespace PIXI {
         fontSize: number;
     }
     class Text extends Sprite {
-        constructor(text?: string, style?: TextStyleOptions, canvas?: HTMLCanvasElement);
+        constructor(
+            text?: string,
+            style?: TextStyleOptions,
+            canvas?: HTMLCanvasElement
+        );
 
         canvas: HTMLCanvasElement;
         context: CanvasRenderingContext2D;
@@ -1461,20 +1971,33 @@ declare namespace PIXI {
         text: string;
 
         protected updateText(respectDirty?: boolean): void;
-        protected drawLetterSpacing(text: string, x: number, y: number, isStroke?: boolean): void;
+        protected drawLetterSpacing(
+            text: string,
+            x: number,
+            y: number,
+            isStroke?: boolean
+        ): void;
         protected updateTexture(): void;
         renderWebGL(renderer: WebGLRenderer): void;
         protected _renderCanvas(renderer: CanvasRenderer): void;
         getLocalBounds(rect?: Rectangle): Rectangle;
         protected _calculateBounds(): void;
         protected _onStyleChange: () => void;
-        protected _generateFillStyle(style: TextStyle, lines: string[]): string | number | CanvasGradient;
+        protected _generateFillStyle(
+            style: TextStyle,
+            lines: string[]
+        ): string | number | CanvasGradient;
         destroy(options?: DestroyOptions | boolean): void;
         dirty: boolean;
     }
     // textures
     class BaseRenderTexture extends BaseTexture {
-        constructor(width?: number, height?: number, scaleMode?: number, resolution?: number);
+        constructor(
+            width?: number,
+            height?: number,
+            scaleMode?: number,
+            resolution?: number
+        );
 
         height: number;
         width: number;
@@ -1483,24 +2006,52 @@ declare namespace PIXI {
         resolution: number;
         scaleMode: number;
         hasLoaded: boolean;
-        protected _glRenderTargets: { [n: number]: WebGLTexture; };
-        protected _canvasRenderTarget: { [n: number]: WebGLTexture; };
+        protected _glRenderTargets: { [n: number]: WebGLTexture };
+        protected _canvasRenderTarget: { [n: number]: WebGLTexture };
         valid: boolean;
 
         resize(width: number, height: number): void;
         destroy(): void;
 
-        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;
+        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;
-        off(event: "update", fn?: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
-        addListener(event: "update", fn: (baseRenderTexture: BaseRenderTexture) => void, context?: any): this;
+        off(
+            event: "update",
+            fn?: (baseRenderTexture: BaseRenderTexture) => void,
+            context?: any
+        ): this;
+        addListener(
+            event: "update",
+            fn: (baseRenderTexture: BaseRenderTexture) => void,
+            context?: any
+        ): this;
     }
     class BaseTexture extends utils.EventEmitter {
-        static from(source: string | HTMLImageElement | HTMLCanvasElement, scaleMode?: number, sourceScale?: number): BaseTexture;
+        static from(
+            source: string | HTMLImageElement | HTMLCanvasElement,
+            scaleMode?: number,
+            sourceScale?: number
+        ): BaseTexture;
 
-        constructor(source?: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement, scaleMode?: number, resolution?: number);
+        constructor(
+            source?: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement,
+            scaleMode?: number,
+            resolution?: number
+        );
 
         protected uuid?: number;
         protected touched: number;
@@ -1536,23 +2087,56 @@ declare namespace PIXI {
         protected _loadSvgSourceUsingDataUri(dataUri: string): void;
         protected _loadSvgSourceUsingXhr(): void;
         protected _loadSvgSourceUsingString(svgString: string): void;
-        protected loadSource(source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement): void;
+        protected loadSource(
+            source: HTMLImageElement | HTMLCanvasElement | HTMLVideoElement
+        ): void;
         protected _sourceLoaded(): void;
         destroy(): void;
         dispose(): void;
         updateSourceImage(newSrc: string): void;
 
-        static fromImage(imageUrl: string, crossorigin?: boolean, scaleMode?: number, sourceScale?: number): BaseTexture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number, origin?: string): BaseTexture;
+        static fromImage(
+            imageUrl: string,
+            crossorigin?: boolean,
+            scaleMode?: number,
+            sourceScale?: number
+        ): BaseTexture;
+        static fromCanvas(
+            canvas: HTMLCanvasElement,
+            scaleMode?: number,
+            origin?: string
+        ): BaseTexture;
         static addToCache(baseTexture: BaseTexture, id: string): void;
         static removeFromCache(baseTexture: string | BaseTexture): BaseTexture;
 
-        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;
-        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;
+        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;
+        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;
     }
     class RenderTexture extends Texture {
         constructor(baseRenderTexture: BaseRenderTexture, frame?: Rectangle);
@@ -1560,12 +2144,27 @@ declare namespace PIXI {
         protected legacyRenderer: any;
         valid: boolean;
 
-        resize(width: number, height: number, doNotResizeBaseTexture?: boolean): void;
+        resize(
+            width: number,
+            height: number,
+            doNotResizeBaseTexture?: boolean
+        ): void;
 
-        static create(width?: number, height?: number, scaleMode?: number, resolution?: number): RenderTexture;
+        static create(
+            width?: number,
+            height?: number,
+            scaleMode?: number,
+            resolution?: number
+        ): RenderTexture;
     }
     class Texture extends utils.EventEmitter {
-        constructor(baseTexture: BaseTexture, frame?: Rectangle, orig?: Rectangle, trim?: Rectangle, rotate?: number);
+        constructor(
+            baseTexture: BaseTexture,
+            frame?: Rectangle,
+            orig?: Rectangle,
+            trim?: Rectangle,
+            rotate?: number
+        );
 
         noFrame: boolean;
         baseTexture: BaseTexture;
@@ -1586,13 +2185,37 @@ declare namespace PIXI {
         clone(): Texture;
         _updateUvs(): void;
 
-        static fromImage(imageUrl: string, crossOrigin?: boolean, scaleMode?: number, sourceScale?: number): Texture;
+        static fromImage(
+            imageUrl: string,
+            crossOrigin?: boolean,
+            scaleMode?: number,
+            sourceScale?: number
+        ): Texture;
         static fromFrame(frameId: string): Texture;
-        static fromCanvas(canvas: HTMLCanvasElement, scaleMode?: number, origin?: string): Texture;
-        static fromVideo(video: HTMLVideoElement | string, scaleMode?: number): Texture;
+        static fromCanvas(
+            canvas: HTMLCanvasElement,
+            scaleMode?: number,
+            origin?: string
+        ): Texture;
+        static fromVideo(
+            video: HTMLVideoElement | string,
+            scaleMode?: number
+        ): Texture;
         static fromVideoUrl(videoUrl: string, scaleMode?: number): Texture;
-        static from(source: number | string | HTMLImageElement | HTMLCanvasElement | HTMLVideoElement | BaseTexture): Texture;
-        static fromLoader(source: HTMLImageElement | HTMLCanvasElement, imageUrl: string, name?: string): Texture;
+        static from(
+            source:
+                | number
+                | string
+                | HTMLImageElement
+                | HTMLCanvasElement
+                | HTMLVideoElement
+                | BaseTexture
+        ): Texture;
+        static fromLoader(
+            source: HTMLImageElement | HTMLCanvasElement,
+            imageUrl: string,
+            name?: string
+        ): Texture;
         static addToCache(texture: Texture, id: string): void;
         static removeFromCache(texture: string | Texture): Texture;
 
@@ -1609,12 +2232,32 @@ declare namespace PIXI {
         static EMPTY: Texture;
         static WHITE: Texture;
 
-        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;
+        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;
-        off(event: "update", fn?: (texture: Texture) => void, context?: any): this;
-        addListener(event: "update", fn: (texture: Texture) => void, context?: any): 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);
@@ -1645,24 +2288,40 @@ declare namespace PIXI {
 
         uvsUint32: Uint32Array;
 
-        protected set(frame: Rectangle, baseFrame: Rectangle, rotate: number): void;
+        protected set(
+            frame: Rectangle,
+            baseFrame: Rectangle,
+            rotate: number
+        ): void;
     }
 
     class Spritesheet {
         static BATCH_SIZE: number;
 
-        constructor(baseTexture: BaseTexture, data: any, resolutionFilename?: string);
+        constructor(
+            baseTexture: BaseTexture,
+            data: any,
+            resolutionFilename?: string
+        );
 
         baseTexture: BaseTexture;
-        textures: { [key: string]: Texture; };
+        textures: { [key: string]: Texture };
         data: any;
         resolution: number;
         protected _frames: any;
         protected _frameKeys: string;
         protected _batchIndex: number;
-        protected _callback: (spriteSheet: this, textures: { [key: string]: Texture; }) => void;
+        protected _callback: (
+            spriteSheet: this,
+            textures: { [key: string]: Texture }
+        ) => void;
         protected _updateResolution(resolutionFilename: string): number;
-        parse(callback: (spriteSheet: this, textures: { [key: string]: Texture; }) => void): void;
+        parse(
+            callback: (
+                spriteSheet: this,
+                textures: { [key: string]: Texture }
+            ) => void
+        ): void;
         protected _processFrames(initialFrameIndex: number): void;
         protected _parseComplete(): void;
         protected _nextBatch(): void;
@@ -1684,9 +2343,17 @@ declare namespace PIXI {
         protected _isSourcePlaying(): boolean;
         protected _isSourceReady(): boolean;
 
-        static fromVideo(video: HTMLVideoElement, scaleMode?: number): VideoBaseTexture;
-        static fromUrl(videoSrc: string | any | string[] | any[], crossOrigin?: boolean): VideoBaseTexture;
-        static fromUrls(videoSrc: string | any | string[] | any[]): VideoBaseTexture;
+        static fromVideo(
+            video: HTMLVideoElement,
+            scaleMode?: number
+        ): VideoBaseTexture;
+        static fromUrl(
+            videoSrc: string | any | string[] | any[],
+            crossOrigin?: boolean
+        ): VideoBaseTexture;
+        static fromUrls(
+            videoSrc: string | any | string[] | any[]
+        ): VideoBaseTexture;
 
         source: HTMLVideoElement;
         protected loadSource(source: HTMLVideoElement): void;
@@ -1698,7 +2365,12 @@ declare namespace PIXI {
         const shared: Ticker;
 
         class TickerListener {
-            constructor(fn: (deltaTime: number) => void, context?: any, priority?: number, once?: boolean);
+            constructor(
+                fn: (deltaTime: number) => void,
+                context?: any,
+                priority?: number,
+                once?: boolean
+            );
             fn: (deltaTime: number) => void;
             context: any;
             priority: number;
@@ -1728,8 +2400,16 @@ declare namespace PIXI {
             protected _cancelIfNeeded(): void;
             protected _startIfPossible(): void;
 
-            add(fn: (deltaTime: number) => void, context?: any, priority?: number): Ticker;
-            addOnce(fn: (deltaTime: number) => void, context?: any, priority?: number): Ticker;
+            add(
+                fn: (deltaTime: number) => void,
+                context?: any,
+                priority?: number
+            ): Ticker;
+            addOnce(
+                fn: (deltaTime: number) => void,
+                context?: any,
+                priority?: number
+            ): Ticker;
             //tslint:disable-next-line:ban-types forbidden-types
             remove(fn: Function, context?: any, priority?: number): Ticker;
             protected _addListener(listener: TickerListener): Ticker;
@@ -1746,7 +2426,13 @@ declare namespace PIXI {
     // shader
 
     class Shader extends glCore.GLShader {
-        constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[], attributeLocations?: { [key: string]: number }, precision?: string);
+        constructor(
+            gl: WebGLRenderingContext,
+            vertexSrc: string | string[],
+            fragmentSrc: string | string[],
+            attributeLocations?: { [key: string]: number },
+            precision?: string
+        );
     }
 
     //////////////////////////////////////////////////////////////////////////////
@@ -1762,7 +2448,9 @@ declare namespace PIXI {
             image(target?: DisplayObject | RenderTexture): HTMLImageElement;
             base64(target?: DisplayObject | RenderTexture): string;
             canvas(target?: DisplayObject | RenderTexture): HTMLCanvasElement;
-            pixels(renderTexture?: DisplayObject | RenderTexture): Uint8ClampedArray;
+            pixels(
+                renderTexture?: DisplayObject | RenderTexture
+            ): Uint8ClampedArray;
 
             destroy(): void;
         }
@@ -1786,31 +2474,42 @@ declare namespace PIXI {
 
     namespace extras {
         interface BitmapTextStyle {
-            font?: string | {
-                name?: string;
-                size?: number;
-            };
+            font?:
+                | string
+                | {
+                      name?: string;
+                      size?: number;
+                  };
             align?: string;
             tint?: number;
         }
         class BitmapText extends Container {
-            static registerFont(xml: XMLDocument, texture: Texture): any;
+            static registerFont(
+                xml: XMLDocument,
+                textures: Texture | Texture[] | { [key: string]: Texture }
+            ): any;
 
             constructor(text: string, style?: BitmapTextStyle);
 
+            letterSpacing: number;
+            protected _letterSpacing: number;
             protected _textWidth: number;
             protected _textHeight: number;
             textWidth: number;
             textHeight: number;
             protected _glyphs: Sprite[];
-            protected _font: string | {
-                name?: string;
-                size?: number;
-            };
-            font: string | {
-                name?: string;
-                size?: number;
-            };
+            protected _font:
+                | string
+                | {
+                      name?: string;
+                      size?: number;
+                  };
+            font:
+                | string
+                | {
+                      name?: string;
+                      size?: number;
+                  };
             protected _text: string;
             protected _maxWidth: number;
             maxWidth: number;
@@ -1835,7 +2534,10 @@ declare namespace PIXI {
             time?: number;
         }
         class AnimatedSprite extends Sprite {
-            constructor(textures: Texture[] | AnimatedSpriteTextureTimeObject[], autoUpdate?: boolean);
+            constructor(
+                textures: Texture[] | AnimatedSpriteTextureTimeObject[],
+                autoUpdate?: boolean
+            );
 
             protected _autoUpdate: boolean;
             protected _textures: Texture[];
@@ -1900,11 +2602,34 @@ declare namespace PIXI {
             containsPoint(point: Point): boolean;
             destroy(options?: DestroyOptions | boolean): void;
 
-            static from(source: number | string | BaseTexture | HTMLCanvasElement | HTMLVideoElement, width?: number, height?: number): TilingSprite;
-            static fromFrame(frameId: string, width?: number, height?: number): TilingSprite;
+            static from(
+                source:
+                    | number
+                    | string
+                    | BaseTexture
+                    | HTMLCanvasElement
+                    | HTMLVideoElement,
+                width?: number,
+                height?: number
+            ): TilingSprite;
+            static fromFrame(
+                frameId: string,
+                width?: number,
+                height?: number
+            ): TilingSprite;
             // if you remove the next line, the class will break. https://github.com/pixijs/pixi-typescript/issues/96
-            static fromImage(imageId: string, crossorigin?: boolean, scaleMode?: number): Sprite;
-            static fromImage(imageId: string, width?: number, height?: number, crossorigin?: boolean, scaleMode?: number): TilingSprite;
+            static fromImage(
+                imageId: string,
+                crossorigin?: boolean,
+                scaleMode?: number
+            ): Sprite;
+            static fromImage(
+                imageId: string,
+                width?: number,
+                height?: number,
+                crossorigin?: boolean,
+                scaleMode?: number
+            ): TilingSprite;
 
             width: number;
             height: number;
@@ -1921,9 +2646,14 @@ declare namespace PIXI {
     //////////////////////////////////////////////////////////////////////////////
 
     namespace filters {
-        class FXAAFilter extends Filter<{}> { }
-        class BlurFilter extends Filter<{}>  {
-            constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
+        class FXAAFilter extends Filter<{}> {}
+        class BlurFilter extends Filter<{}> {
+            constructor(
+                strength?: number,
+                quality?: number,
+                resolution?: number,
+                kernelSize?: number
+            );
 
             blurXFilter: BlurXFilter;
             blurYFilter: BlurYFilter;
@@ -1940,7 +2670,12 @@ declare namespace PIXI {
             strength: number;
         }
         class BlurXFilter extends Filter<BlurXFilterUniforms> {
-            constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
+            constructor(
+                strength?: number,
+                quality?: number,
+                resolution?: number,
+                kernelSize?: number
+            );
 
             protected _quality: number;
 
@@ -1955,7 +2690,12 @@ declare namespace PIXI {
             strength: number;
         }
         class BlurYFilter extends Filter<BlurYFilterUniforms> {
-            constructor(strength?: number, quality?: number, resolution?: number, kernelSize?: number);
+            constructor(
+                strength?: number,
+                quality?: number,
+                resolution?: number,
+                kernelSize?: number
+            );
 
             protected _quality: number;
 
@@ -1995,7 +2735,13 @@ declare namespace PIXI {
             kodachrome(multiply?: boolean): void;
             browni(multiply?: boolean): void;
             vintage(multiply?: boolean): void;
-            colorTone(desaturation: number, toned: number, lightColor: string, darkColor: string, multiply?: boolean): void;
+            colorTone(
+                desaturation: number,
+                toned: number,
+                lightColor: string,
+                darkColor: string,
+                multiply?: boolean
+            ): void;
             night(intensity: number, multiply?: boolean): void;
             predator(amount: number, multiply?: boolean): void;
             lsd(multiply?: boolean): void;
@@ -2039,10 +2785,16 @@ declare namespace PIXI {
         interface InteractiveTarget {
             interactive: boolean;
             interactiveChildren: boolean;
-            hitArea: PIXI.Rectangle | PIXI.Circle | PIXI.Ellipse | PIXI.Polygon | PIXI.RoundedRectangle | PIXI.HitArea;
+            hitArea:
+                | PIXI.Rectangle
+                | PIXI.Circle
+                | PIXI.Ellipse
+                | PIXI.Polygon
+                | PIXI.RoundedRectangle
+                | PIXI.HitArea;
             buttonMode: boolean;
             cursor: string;
-            trackedPointers(): { [key: number]: InteractionTrackingData; };
+            trackedPointers(): { [key: number]: InteractionTrackingData };
 
             // Deprecated
             defaultCursor: string;
@@ -2084,29 +2836,62 @@ declare namespace PIXI {
             readonly pointerID: number;
             copyEvent(event: Touch | MouseEvent | PointerEvent): void;
             reset(): void;
-            getLocalPosition(displayObject: DisplayObject, point?: Point, globalPos?: Point): Point;
+            getLocalPosition(
+                displayObject: DisplayObject,
+                point?: Point,
+                globalPos?: Point
+            ): Point;
         }
-        type InteractionPointerEvents = "pointerdown" | "pointercancel" | "pointerup" |
-            "pointertap" | "pointerupoutside" | "pointermove" | "pointerover" | "pointerout";
-        type InteractionTouchEvents = "touchstart" | "touchcancel" | "touchend" |
-            "touchendoutside" | "touchmove" | "tap";
-        type InteractionMouseEvents = "rightdown" | "mousedown" | "rightup" | "mouseup" |
-            "rightclick" | "click" | "rightupoutside" | "mouseupoutside" | "mousemove" |
-            "mouseover" | "mouseout" | "mouseover";
+        type InteractionPointerEvents =
+            | "pointerdown"
+            | "pointercancel"
+            | "pointerup"
+            | "pointertap"
+            | "pointerupoutside"
+            | "pointermove"
+            | "pointerover"
+            | "pointerout";
+        type InteractionTouchEvents =
+            | "touchstart"
+            | "touchcancel"
+            | "touchend"
+            | "touchendoutside"
+            | "touchmove"
+            | "tap";
+        type InteractionMouseEvents =
+            | "rightdown"
+            | "mousedown"
+            | "rightup"
+            | "mouseup"
+            | "rightclick"
+            | "click"
+            | "rightupoutside"
+            | "mouseupoutside"
+            | "mousemove"
+            | "mouseover"
+            | "mouseout"
+            | "mouseover";
         type InteractionPixiEvents = "added" | "removed";
-        type InteractionEventTypes = InteractionPointerEvents | InteractionTouchEvents | InteractionMouseEvents | InteractionPixiEvents;
+        type InteractionEventTypes =
+            | InteractionPointerEvents
+            | InteractionTouchEvents
+            | InteractionMouseEvents
+            | InteractionPixiEvents;
         interface InteractionManagerOptions {
             autoPreventDefault?: boolean;
             interactionFrequency?: number;
         }
         class InteractionManager extends utils.EventEmitter {
-            constructor(renderer: CanvasRenderer | WebGLRenderer | SystemRenderer, options?: InteractionManagerOptions);
+            constructor(
+                renderer: CanvasRenderer | WebGLRenderer | SystemRenderer,
+                options?: InteractionManagerOptions
+            );
 
             renderer: SystemRenderer;
             autoPreventDefault: boolean;
             interactionFrequency: number;
             mouse: InteractionData;
-            activeInteractionData: { [key: number]: InteractionData; };
+            activeInteractionData: { [key: number]: InteractionData };
             interactionDataPool: InteractionData[];
             eventData: InteractionEvent;
             protected interactionDOMElement: HTMLElement;
@@ -2116,15 +2901,49 @@ declare namespace PIXI {
             readonly supportsTouchEvents: boolean;
             readonly supportsPointerEvents: boolean;
             protected onPointerUp: (event: PointerEvent) => void;
-            protected processPointerUp: (interactionEvent: InteractionEvent, displayObject: Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected processPointerUp: (
+                interactionEvent: InteractionEvent,
+                displayObject:
+                    | Container
+                    | PIXI.Sprite
+                    | PIXI.extras.TilingSprite,
+                hit: boolean
+            ) => void;
             protected onPointerCancel: (event: PointerEvent) => void;
-            protected processPointerCancel: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite) => void;
+            protected processPointerCancel: (
+                interactionEvent: InteractionEvent,
+                displayObject:
+                    | PIXI.Container
+                    | PIXI.Sprite
+                    | PIXI.extras.TilingSprite
+            ) => void;
             protected onPointerDown: (event: PointerEvent) => void;
-            protected processPointerDown: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected processPointerDown: (
+                interactionEvent: InteractionEvent,
+                displayObject:
+                    | PIXI.Container
+                    | PIXI.Sprite
+                    | PIXI.extras.TilingSprite,
+                hit: boolean
+            ) => void;
             protected onPointerMove: (event: PointerEvent) => void;
-            protected processPointerMove: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected processPointerMove: (
+                interactionEvent: InteractionEvent,
+                displayObject:
+                    | PIXI.Container
+                    | PIXI.Sprite
+                    | PIXI.extras.TilingSprite,
+                hit: boolean
+            ) => void;
             protected onPointerOut: (event: PointerEvent) => void;
-            protected processPointerOverOut: (interactionEvent: InteractionEvent, displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite, hit: boolean) => void;
+            protected processPointerOverOut: (
+                interactionEvent: InteractionEvent,
+                displayObject:
+                    | PIXI.Container
+                    | PIXI.Sprite
+                    | PIXI.extras.TilingSprite,
+                hit: boolean
+            ) => void;
             protected onPointerOver: (event: PointerEvent) => void;
             cursorStyles: {
                 default: string;
@@ -2135,17 +2954,27 @@ declare namespace PIXI {
             protected _tempPoint: Point;
             resolution: number;
             hitTest(globalPoint: Point, root?: Container): DisplayObject;
-            setTargetElement(element: HTMLCanvasElement, resolution?: number): void;
+            setTargetElement(
+                element: HTMLCanvasElement,
+                resolution?: number
+            ): void;
             protected addEvents(): void;
             protected removeEvents(): void;
             update(deltaTime?: number): void;
             setCursorMode(mode: string): void;
-            protected dispatchEvent(displayObject: Container | Sprite | extras.TilingSprite, eventString: string, eventData: any): void;
+            protected dispatchEvent(
+                displayObject: Container | Sprite | extras.TilingSprite,
+                eventString: string,
+                eventData: any
+            ): void;
             mapPositionToPoint(point: Point, x: number, y: number): void;
             //tslint:disable-next-line:ban-types forbidden-types
             protected processInteractive(
                 interactionEvent: InteractionEvent,
-                displayObject: PIXI.Container | PIXI.Sprite | PIXI.extras.TilingSprite,
+                displayObject:
+                    | PIXI.Container
+                    | PIXI.Sprite
+                    | PIXI.extras.TilingSprite,
                 func?: Function,
                 hitTest?: boolean,
                 interactive?: boolean
@@ -2156,10 +2985,20 @@ declare namespace PIXI {
                 cancelled: boolean,
                 func: Function
             ): void;
-            protected getInteractionDataForPointerId(pointerId: number): InteractionData;
-            protected releaseInteractionDataForPointerId(event: PointerEvent): void;
-            protected configureInteractionEventForDOMEvent(interactionEvent: InteractionEvent, pointerEvent: PointerEvent, interactionData: InteractionData): InteractionEvent;
-            protected normalizeToPointerData(event: TouchEvent | MouseEvent | PointerEvent): PointerEvent[];
+            protected getInteractionDataForPointerId(
+                pointerId: number
+            ): InteractionData;
+            protected releaseInteractionDataForPointerId(
+                event: PointerEvent
+            ): void;
+            protected configureInteractionEventForDOMEvent(
+                interactionEvent: InteractionEvent,
+                pointerEvent: PointerEvent,
+                interactionData: InteractionData
+            ): InteractionEvent;
+            protected normalizeToPointerData(
+                event: TouchEvent | MouseEvent | PointerEvent
+            ): PointerEvent[];
             destroy(): void;
 
             // Deprecated
@@ -2216,7 +3055,10 @@ declare namespace PIXI {
             loadType?: number;
             xhrType?: string;
             metaData?: {
-                loadElement?: HTMLImageElement | HTMLAudioElement | HTMLVideoElement;
+                loadElement?:
+                    | HTMLImageElement
+                    | HTMLAudioElement
+                    | HTMLVideoElement;
                 skipSource?: boolean;
                 mimeType?: string | string[];
             };
@@ -2266,9 +3108,18 @@ declare namespace PIXI {
 
             add(...params: any[]): this;
             //tslint:disable-next-line:ban-types forbidden-types
-            add(name: string, url: string, options?: LoaderOptions, cb?: Function): this;
+            add(
+                name: string,
+                url: string,
+                options?: LoaderOptions,
+                cb?: Function
+            ): this;
             //tslint:disable-next-line:ban-types forbidden-types
-            add(obj: string | any | any[], options?: LoaderOptions, cb?: Function): this;
+            add(
+                obj: string | any | any[],
+                options?: LoaderOptions,
+                cb?: Function
+            ): this;
 
             //tslint:disable-next-line:ban-types forbidden-types
             pre(fn: Function): this;
@@ -2280,7 +3131,10 @@ declare namespace PIXI {
 
             protected _prepareUrl(url: string): string;
             //tslint:disable-next-line:ban-types forbidden-types
-            protected _loadResource(resource: Resource, dequeue: Function): void;
+            protected _loadResource(
+                resource: Resource,
+                dequeue: Function
+            ): void;
             protected _onStart(): void;
             protected _onComplete(): void;
             protected _onLoad(resource: Resource): void;
@@ -2289,26 +3143,83 @@ declare namespace PIXI {
 
             // depreciation
 
-            on(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): this;
-            on(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            on(event: "load" | "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            on(event: "start", fn: (loader: loaders.Loader) => void, context?: any): this;
+            on(
+                event: "complete",
+                fn: (loader: loaders.Loader, object: any) => void,
+                context?: any
+            ): this;
+            on(
+                event: "error",
+                fn: (
+                    error: Error,
+                    loader: loaders.Loader,
+                    resource: Resource
+                ) => void,
+                context?: any
+            ): this;
+            on(
+                event: "load" | "progress",
+                fn: (loader: loaders.Loader, resource: Resource) => void,
+                context?: any
+            ): this;
+            on(
+                event: "start",
+                fn: (loader: loaders.Loader) => void,
+                context?: any
+            ): this;
 
-            once(event: "complete", fn: (loader: loaders.Loader, object: any) => void, context?: any): this;
-            once(event: "error", fn: (error: Error, loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            once(event: "load" | "progress", fn: (loader: loaders.Loader, resource: Resource) => void, context?: any): this;
-            once(event: "start", fn: (loader: loaders.Loader) => void, context?: any): this;
+            once(
+                event: "complete",
+                fn: (loader: loaders.Loader, object: any) => void,
+                context?: any
+            ): this;
+            once(
+                event: "error",
+                fn: (
+                    error: Error,
+                    loader: loaders.Loader,
+                    resource: Resource
+                ) => void,
+                context?: any
+            ): this;
+            once(
+                event: "load" | "progress",
+                fn: (loader: loaders.Loader, resource: Resource) => void,
+                context?: any
+            ): this;
+            once(
+                event: "start",
+                fn: (loader: loaders.Loader) => void,
+                context?: any
+            ): this;
             //tslint:disable-next-line:ban-types forbidden-types
-            off(event: "complete" | "error" | "load" | "progress" | "start" | string, fn?: Function, context?: any): this;
+            off(
+                event:
+                    | "complete"
+                    | "error"
+                    | "load"
+                    | "progress"
+                    | "start"
+                    | string,
+                fn?: Function,
+                context?: any
+            ): this;
         }
         interface TextureDictionary {
             [index: string]: PIXI.Texture;
         }
         class Resource {
-            static setExtensionLoadType(extname: string, loadType: number): void;
+            static setExtensionLoadType(
+                extname: string,
+                loadType: number
+            ): void;
             static setExtensionXhrType(extname: string, xhrType: string): void;
 
-            constructor(name: string, url: string | string[], options?: LoaderOptions);
+            constructor(
+                name: string,
+                url: string | string[],
+                options?: LoaderOptions
+            );
 
             protected _flags: number;
 
@@ -2364,7 +3275,11 @@ declare namespace PIXI {
             protected _loadSourceElement(type: string): void;
             protected _loadXhr(): void;
             protected _loadXdr(): void;
-            protected _createSource(type: string, url: string, mime?: string): HTMLSourceElement;
+            protected _createSource(
+                type: string,
+                url: string,
+                mime?: string
+            ): HTMLSourceElement;
             protected _onError(event?: any): void;
             protected _onProgress(event?: any): void;
             protected _xhrOnError(): void;
@@ -2426,7 +3341,13 @@ declare namespace PIXI {
 
     namespace mesh {
         class Mesh extends Container {
-            constructor(texture: Texture, vertices?: Float32Array, uvs?: Float32Array, indices?: Uint16Array, drawMode?: number);
+            constructor(
+                texture: Texture,
+                vertices?: Float32Array,
+                uvs?: Float32Array,
+                indices?: Uint16Array,
+                drawMode?: number
+            );
 
             protected _texture: Texture;
             uvs: Float32Array;
@@ -2434,6 +3355,8 @@ declare namespace PIXI {
             indices: Uint16Array;
             dirty: number;
             indexDirty: number;
+            vertexDirty: number;
+            autoUpdate: boolean;
             dirtyVertex: boolean;
             protected _geometryVersion: number;
             blendMode: number;
@@ -2442,7 +3365,7 @@ declare namespace PIXI {
             drawMode: number;
             texture: Texture;
             tintRgb: Float32Array;
-            protected _glDatas: { [n: number]: any; };
+            protected _glDatas: { [n: number]: any };
             protected _uvTransform: extras.TextureMatrix;
             uploadUvTransform: boolean;
             multiplyUvs(): void;
@@ -2469,7 +3392,12 @@ declare namespace PIXI {
             render(mesh: Mesh): void;
             protected _renderTriangleMesh(mesh: Mesh): void;
             protected _renderTriangles(mesh: Mesh): void;
-            protected _renderDrawTriangle(mesh: Mesh, index0: number, index1: number, index2: number): void;
+            protected _renderDrawTriangle(
+                mesh: Mesh,
+                index0: number,
+                index1: number,
+                index2: number
+            ): void;
             protected renderMeshFlat(mesh: Mesh): void;
 
             destroy(): void;
@@ -2483,7 +3411,11 @@ declare namespace PIXI {
         }
 
         class Plane extends Mesh {
-            constructor(texture: Texture, verticesX?: number, verticesY?: number);
+            constructor(
+                texture: Texture,
+                verticesX?: number,
+                verticesY?: number
+            );
             protected _ready: boolean;
             verticesX: number;
             verticesY: number;
@@ -2495,7 +3427,13 @@ declare namespace PIXI {
         }
 
         class NineSlicePlane extends Plane {
-            constructor(texture: Texture, leftWidth?: number, topHeight?: number, rightWidth?: number, bottomHeight?: number);
+            constructor(
+                texture: Texture,
+                leftWidth?: number,
+                topHeight?: number,
+                rightWidth?: number,
+                bottomHeight?: number
+            );
 
             width: number;
             height: number;
@@ -2517,7 +3455,16 @@ declare namespace PIXI {
 
             updateHorizontalVertices(): void;
             updateVerticalVertices(): void;
-            protected drawSegment(context: CanvasRenderingContext2D | WebGLRenderingContext, textureSource: any, w: number, h: number, x1: number, y1: number, x2: number, y2: number): void;
+            protected drawSegment(
+                context: CanvasRenderingContext2D | WebGLRenderingContext,
+                textureSource: any,
+                w: number,
+                h: number,
+                x1: number,
+                y1: number,
+                x2: number,
+                y2: number
+            ): void;
             protected _refresh(): void;
         }
 
@@ -2549,14 +3496,19 @@ declare namespace PIXI {
             alpha?: boolean;
         }
         class ParticleContainer extends Container {
-            constructor(maxSize?: number, properties?: ParticleContainerProperties, batchSize?: number, autoResize?: boolean);
+            constructor(
+                maxSize?: number,
+                properties?: ParticleContainerProperties,
+                batchSize?: number,
+                autoResize?: boolean
+            );
             protected _tint: number;
             protected tintRgb: number | any[];
             tint: number;
             protected _properties: boolean[];
             protected _maxSize: number;
             protected _batchSize: number;
-            protected _glBuffers: { [n: number]: WebGLBuffer; };
+            protected _glBuffers: { [n: number]: WebGLBuffer };
             protected _bufferUpdateIDs: number[];
             protected _updateID: number;
             interactiveChildren: boolean;
@@ -2571,7 +3523,12 @@ declare namespace PIXI {
             destroy(options?: DestroyOptions | boolean): void;
         }
         class ParticleBuffer {
-            constructor(gl: WebGLRenderingContext, properties: any, dynamicPropertyFlags: any[], size: number);
+            constructor(
+                gl: WebGLRenderingContext,
+                properties: any,
+                dynamicPropertyFlags: any[],
+                size: number
+            );
 
             gl: WebGLRenderingContext;
             size: number;
@@ -2593,7 +3550,14 @@ declare namespace PIXI {
         interface ParticleRendererProperty {
             attribute: number;
             size: number;
-            uploadFunction(children: PIXI.DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            uploadFunction(
+                children: PIXI.DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
             unsignedByte: any;
             offset: number;
         }
@@ -2607,13 +3571,57 @@ declare namespace PIXI {
 
             start(): void;
             generateBuffers(container: ParticleContainer): ParticleBuffer[];
-            protected _generateOneMoreBuffer(container: ParticleContainer): ParticleBuffer;
-            uploadVertices(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-            uploadPosition(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-            uploadRotation(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-            uploadUvs(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-            uploadTint(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
-            uploadAlpha(children: DisplayObject[], startIndex: number, amount: number, array: number[], stride: number, offset: number): void;
+            protected _generateOneMoreBuffer(
+                container: ParticleContainer
+            ): ParticleBuffer;
+            uploadVertices(
+                children: DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
+            uploadPosition(
+                children: DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
+            uploadRotation(
+                children: DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
+            uploadUvs(
+                children: DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
+            uploadTint(
+                children: DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
+            uploadAlpha(
+                children: DisplayObject[],
+                startIndex: number,
+                amount: number,
+                array: number[],
+                stride: number,
+                offset: number
+            ): void;
             destroy(): void;
 
             indices: Uint16Array;
@@ -2624,7 +3632,10 @@ declare namespace PIXI {
     //////////////////////////////////////////////////////////////////////////////
     namespace prepare {
         type AddHook = (item: any, queue: any[]) => boolean;
-        type UploadHook<UploadHookSource> = (prepare: UploadHookSource, item: any) => boolean;
+        type UploadHook<UploadHookSource> = (
+            prepare: UploadHookSource,
+            item: any
+        ) => boolean;
         abstract class BasePrepare<UploadHookSource> {
             constructor(renderer: SystemRenderer);
 
@@ -2640,15 +3651,44 @@ declare namespace PIXI {
             protected delayedTick: () => void;
 
             //tslint:disable-next-line:ban-types forbidden-types
-            upload(item: Function | DisplayObject | Container | BaseTexture | Texture | Graphics | Text | any, done?: () => void): void;
+            upload(
+                item:
+                    | Function
+                    | DisplayObject
+                    | Container
+                    | BaseTexture
+                    | Texture
+                    | Graphics
+                    | Text
+                    | any,
+                done?: () => void
+            ): void;
             protected tick(): void;
             protected prepareItems(): void;
             registerFindHook(addHook: AddHook): this;
             registerUploadHook(uploadHook: UploadHook<UploadHookSource>): this;
-            protected findMultipleBaseTextures(item: PIXI.DisplayObject, queue: any[]): boolean;
-            protected findBaseTexture(item: PIXI.DisplayObject, queue: any[]): boolean;
-            protected findTexture(item: PIXI.DisplayObject, queue: any[]): boolean;
-            add(item: PIXI.DisplayObject | PIXI.Container | PIXI.BaseTexture | PIXI.Texture | PIXI.Graphics | PIXI.Text | any): this;
+            protected findMultipleBaseTextures(
+                item: PIXI.DisplayObject,
+                queue: any[]
+            ): boolean;
+            protected findBaseTexture(
+                item: PIXI.DisplayObject,
+                queue: any[]
+            ): boolean;
+            protected findTexture(
+                item: PIXI.DisplayObject,
+                queue: any[]
+            ): boolean;
+            add(
+                item:
+                    | PIXI.DisplayObject
+                    | PIXI.Container
+                    | PIXI.BaseTexture
+                    | PIXI.Texture
+                    | PIXI.Graphics
+                    | PIXI.Text
+                    | any
+            ): this;
             destroy(): void;
         }
         class CanvasPrepare extends BasePrepare<CanvasPrepare> {
@@ -2717,10 +3757,22 @@ declare namespace PIXI {
              */
             failIfMajorPerformanceCaveat?: boolean;
         }
-        function createContext(view: HTMLCanvasElement, options?: ContextOptions): WebGLRenderingContext;
-        function setVertexAttribArrays(gl: WebGLRenderingContext, attribs: Attrib[], state?: WebGLState): WebGLRenderingContext | undefined;
+        function createContext(
+            view: HTMLCanvasElement,
+            options?: ContextOptions
+        ): WebGLRenderingContext;
+        function setVertexAttribArrays(
+            gl: WebGLRenderingContext,
+            attribs: Attrib[],
+            state?: WebGLState
+        ): WebGLRenderingContext | undefined;
         class GLBuffer {
-            constructor(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number);
+            constructor(
+                gl: WebGLRenderingContext,
+                type: number,
+                data: ArrayBuffer | ArrayBufferView | any,
+                drawType: number
+            );
 
             protected _updateID?: number;
             gl: WebGLRenderingContext;
@@ -2729,17 +3781,38 @@ declare namespace PIXI {
             drawType: number;
             data: ArrayBuffer | ArrayBufferView | any;
 
-            upload(data?: ArrayBuffer | ArrayBufferView | any, offset?: number, dontBind?: boolean): void;
+            upload(
+                data?: ArrayBuffer | ArrayBufferView | any,
+                offset?: number,
+                dontBind?: boolean
+            ): void;
             bind(): void;
 
-            static createVertexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
-            static createIndexBuffer(gl: WebGLRenderingContext, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
-            static create(gl: WebGLRenderingContext, type: number, data: ArrayBuffer | ArrayBufferView | any, drawType: number): GLBuffer;
+            static createVertexBuffer(
+                gl: WebGLRenderingContext,
+                data: ArrayBuffer | ArrayBufferView | any,
+                drawType: number
+            ): GLBuffer;
+            static createIndexBuffer(
+                gl: WebGLRenderingContext,
+                data: ArrayBuffer | ArrayBufferView | any,
+                drawType: number
+            ): GLBuffer;
+            static create(
+                gl: WebGLRenderingContext,
+                type: number,
+                data: ArrayBuffer | ArrayBufferView | any,
+                drawType: number
+            ): GLBuffer;
 
             destroy(): void;
         }
         class GLFramebuffer {
-            constructor(gl: WebGLRenderingContext, width: number, height: number);
+            constructor(
+                gl: WebGLRenderingContext,
+                width: number,
+                height: number
+            );
 
             gl: WebGLRenderingContext;
             frameBuffer: WebGLFramebuffer;
@@ -2756,11 +3829,27 @@ declare namespace PIXI {
             resize(width: number, height: number): void;
             destroy(): void;
 
-            static createRGBA(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
-            static createFloat32(gl: WebGLRenderingContext, width: number, height: number, data: ArrayBuffer | ArrayBufferView | any): GLFramebuffer;
+            static createRGBA(
+                gl: WebGLRenderingContext,
+                width: number,
+                height: number,
+                data: ArrayBuffer | ArrayBufferView | any
+            ): GLFramebuffer;
+            static createFloat32(
+                gl: WebGLRenderingContext,
+                width: number,
+                height: number,
+                data: ArrayBuffer | ArrayBufferView | any
+            ): GLFramebuffer;
         }
         class GLShader {
-            constructor(gl: WebGLRenderingContext, vertexSrc: string | string[], fragmentSrc: string | string[], precision?: string, attributeLocations?: { [key: string]: number });
+            constructor(
+                gl: WebGLRenderingContext,
+                vertexSrc: string | string[],
+                fragmentSrc: string | string[],
+                precision?: string,
+                attributeLocations?: { [key: string]: number }
+            );
 
             gl: WebGLRenderingContext;
             program?: WebGLProgram | null;
@@ -2772,7 +3861,13 @@ declare namespace PIXI {
             destroy(): void;
         }
         class GLTexture {
-            constructor(gl: WebGLRenderingContext, width?: number, height?: number, format?: number, type?: number);
+            constructor(
+                gl: WebGLRenderingContext,
+                width?: number,
+                height?: number,
+                format?: number,
+                type?: number
+            );
 
             gl: WebGLRenderingContext;
             texture: WebGLTexture;
@@ -2783,8 +3878,18 @@ declare namespace PIXI {
             format: number;
             type: number;
 
-            upload(source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement): void;
-            uploadData(data: ArrayBuffer | ArrayBufferView, width: number, height: number): void;
+            upload(
+                source:
+                    | HTMLImageElement
+                    | ImageData
+                    | HTMLVideoElement
+                    | HTMLCanvasElement
+            ): void;
+            uploadData(
+                data: ArrayBuffer | ArrayBufferView,
+                width: number,
+                height: number
+            ): void;
             bind(location?: number): void;
             unbind(): void;
             minFilter(linear: boolean): void;
@@ -2797,8 +3902,21 @@ declare namespace PIXI {
             enableWrapMirrorRepeat(): void;
             destroy(): void;
 
-            static fromSource(gl: WebGLRenderingContext, source: HTMLImageElement | ImageData | HTMLVideoElement | HTMLCanvasElement, premultipleAlpha?: boolean): GLTexture;
-            static fromData(gl: WebGLRenderingContext, data: number[], width: number, height: number): GLTexture;
+            static fromSource(
+                gl: WebGLRenderingContext,
+                source:
+                    | HTMLImageElement
+                    | ImageData
+                    | HTMLVideoElement
+                    | HTMLCanvasElement,
+                premultipleAlpha?: boolean
+            ): GLTexture;
+            static fromData(
+                gl: WebGLRenderingContext,
+                data: number[],
+                width: number,
+                height: number
+            ): GLTexture;
         }
         interface Attrib {
             attribute: {
@@ -2838,7 +3956,14 @@ declare namespace PIXI {
             bind(): this;
             unbind(): this;
             activate(): this;
-            addAttribute(buffer: GLBuffer, attribute: Attrib, type?: number, normalized?: boolean, stride?: number, start?: number): 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;
@@ -2871,13 +3996,30 @@ declare namespace PIXI {
         function skipHello(): void;
         function isWebGLSupported(): boolean;
         function sign(n: number): number;
-        function removeItems<T>(arr: T[], startIdx: number, removeCount: number): void;
-        function correctBlendMode(blendMode: number, premultiplied: boolean): number;
+        function removeItems<T>(
+            arr: T[],
+            startIdx: number,
+            removeCount: number
+        ): void;
+        function correctBlendMode(
+            blendMode: number,
+            premultiplied: boolean
+        ): number;
         function clearTextureCache(): void;
         function destroyTextureCache(): void;
         function premultiplyTint(tint: number, alpha: number): number;
-        function premultiplyRgba(rgb: Float32Array | number[], alpha: number, out?: Float32Array, premultiply?: boolean): Float32Array;
-        function premultiplyTintToRgba(tint: number, alpha: number, out?: Float32Array, premultiply?: boolean): Float32Array;
+        function premultiplyRgba(
+            rgb: Float32Array | number[],
+            alpha: number,
+            out?: Float32Array,
+            premultiply?: boolean
+        ): Float32Array;
+        function premultiplyTintToRgba(
+            tint: number,
+            alpha: number,
+            out?: Float32Array,
+            premultiply?: boolean
+        ): Float32Array;
         const premultiplyBlendMode: number[][];
         const TextureCache: any;
         const BaseTextureCache: any;
@@ -2922,7 +4064,7 @@ declare namespace PIXI {
         class EventEmitter {
             static prefixed: string | boolean;
             static EventEmitter: {
-                new(): EventEmitter;
+                new (): EventEmitter;
                 prefixed: string | boolean;
             };
             /**
@@ -2938,7 +4080,7 @@ declare namespace PIXI {
              *
              * @returns {(string | symbol)[]}
              */
-            eventNames(): Array<(string | symbol)>;
+            eventNames(): Array<string | symbol>;
             /**
              * Return the listeners registered for a given event.
              *
@@ -2994,7 +4136,12 @@ declare namespace PIXI {
              * @returns {EventEmitter} `this`.
              */
             //tslint:disable-next-line:ban-types forbidden-types
-            removeListener(event: string | symbol, fn?: Function, context?: any, once?: boolean): this;
+            removeListener(
+                event: string | symbol,
+                fn?: Function,
+                context?: any,
+                once?: boolean
+            ): this;
             /**
              * Remove all listeners, or those of the specified event.
              *
@@ -3006,14 +4153,23 @@ declare namespace PIXI {
              * Alias method for `removeListener`
              */
             //tslint:disable-next-line:ban-types forbidden-types
-            off(event: string | symbol, fn?: Function, context?: any, once?: boolean): this;
+            off(
+                event: string | symbol,
+                fn?: Function,
+                context?: any,
+                once?: boolean
+            ): this;
             /**
              * Alias method for `on`
              */
             //tslint:disable-next-line:ban-types forbidden-types
-            addListener(event: string | symbol, fn: Function, context?: any): this;
+            addListener(
+                event: string | symbol,
+                fn: Function,
+                context?: any
+            ): this;
             /**
-             * This function doesn't apply anymore.
+             * This function doesn"t apply anymore.
              * @deprecated
              */
             setMaxListeners(): this;
diff --git a/types/pkg-conf/index.d.ts b/types/pkg-conf/index.d.ts
new file mode 100644
index 0000000000..6a783c1891
--- /dev/null
+++ b/types/pkg-conf/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for pkg-conf 2.1
+// Project: https://github.com/sindresorhus/pkg-conf#readme
+// Definitions by: Jorge Gonzalez <https://github.com/jorgegonzalez>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare namespace pkgConf {
+    type AnyJson = boolean | number | string | null | JsonArray | JsonMap;
+    interface JsonArray extends Array<AnyJson> { }
+    interface JsonMap {
+        [key: string]: AnyJson;
+    }
+
+    interface Options {
+        // Directory to start looking up for a package.json file.
+        // Default: process.cwd()
+        cwd?: string;
+        // Default config.
+        defaults?: object;
+        // Skip package.json files that have the namespaced config explicitly set to false.
+        skipOnFalse?: boolean;
+    }
+
+    // Returns the config.
+    function sync(namespace: string, options?: Options): JsonMap;
+    // Pass in the config returned from any of the above methods.
+    // Returns the filepath to the package.json file or null when not found.
+    function filepath(config: JsonMap): string | null;
+}
+
+// Returns a Promise for the config.
+declare function pkgConf(namespace: string, options?: pkgConf.Options): Promise<pkgConf.JsonMap>;
+
+export = pkgConf;
diff --git a/types/pkg-conf/pkg-conf-tests.ts b/types/pkg-conf/pkg-conf-tests.ts
new file mode 100644
index 0000000000..bf2dee1e2f
--- /dev/null
+++ b/types/pkg-conf/pkg-conf-tests.ts
@@ -0,0 +1,6 @@
+import pkgConf = require('pkg-conf');
+
+pkgConf('name'); // $ExpectType Promise<JsonMap>
+const config = pkgConf.sync('bugs'); // $ExpectType JsonMap
+pkgConf.filepath(config); // $ExpectType string | null
+config.url; // $ExpectType AnyJson
diff --git a/types/pkg-conf/tsconfig.json b/types/pkg-conf/tsconfig.json
new file mode 100644
index 0000000000..449922d19e
--- /dev/null
+++ b/types/pkg-conf/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-conf-tests.ts"
+    ]
+}
diff --git a/types/pkg-conf/tslint.json b/types/pkg-conf/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/pkg-conf/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/playcanvas/engine/framework/components/animation/component.d.ts b/types/playcanvas/engine/framework/components/animation/component.d.ts
index ca0547b6fe..7be1b5ea3b 100644
--- a/types/playcanvas/engine/framework/components/animation/component.d.ts
+++ b/types/playcanvas/engine/framework/components/animation/component.d.ts
@@ -46,6 +46,6 @@ declare namespace pc {
         * @param {String} name The name of the animation asset
         * @returns {pc.Animation} An Animation
         */
-        getAnimation(name: string): void;
+        getAnimation(name: string): pc.Animation;
     }
 }
diff --git a/types/plotly.js/index.d.ts b/types/plotly.js/index.d.ts
index d16a80818a..fa312dbb0f 100644
--- a/types/plotly.js/index.d.ts
+++ b/types/plotly.js/index.d.ts
@@ -1,13 +1,15 @@
 // Type definitions for plotly.js 1.38
 // Project: https://plot.ly/javascript/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>
-// 				Martin Duparc <https://github.com/martinduparc>
-// 				Frederik Aalund <https://github.com/frederikaalund>
-// 				taoqf <https://github.com/taoqf>
-// 				Dadstart <https://github.com/Dadstart>
-// 				Jared Szechy <https://github.com/szechyjs>
-// 				Drew Diamantoukos <https://github.com/MercifulCode>
-// 				Sooraj Pudiyadath <https://github.com/soorajpudiyadath>
+//                 Martin Duparc <https://github.com/martinduparc>
+//                 Frederik Aalund <https://github.com/frederikaalund>
+//                 taoqf <https://github.com/taoqf>
+//                 Dadstart <https://github.com/Dadstart>
+//                 Jared Szechy <https://github.com/szechyjs>
+//                 Drew Diamantoukos <https://github.com/MercifulCode>
+//                 Sooraj Pudiyadath <https://github.com/soorajpudiyadath>
+//                 Jon Freedman <https://github.com/jonfreedman>
+//                 Megan Riel-Mehan <https://github.com/meganrm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -27,14 +29,14 @@ export interface Point {
 }
 
 export interface PlotScatterDataPoint {
-  curveNumber: number;
-  data: ScatterData;
-  pointIndex: number;
-  pointNumber: number;
-  x: number;
-  xaxis: LayoutAxis;
-  y: number;
-  yaxis: LayoutAxis;
+	curveNumber: number;
+	data: PlotData;
+	pointIndex: number;
+	pointNumber: number;
+	x: number;
+	xaxis: LayoutAxis;
+	y: number;
+	yaxis: LayoutAxis;
 }
 
 export interface PlotMouseEvent {
@@ -48,13 +50,22 @@ export interface PlotCoordinate {
 	pointNumber: number;
 }
 
+export interface SelectionRange {
+	x: number[];
+	y: number[];
+}
+
+export type PlotSelectedData = Partial<PlotScatterDataPoint>;
+
 export interface PlotSelectionEvent {
-	points: PlotCoordinate[];
+	points: PlotScatterDataPoint[];
+	range?: SelectionRange;
+	lassoPoints?: SelectionRange;
 }
 
 export type PlotRestyleEvent = [
-	any,  // update object -- attribute updated: new value
-	number[]       // array of traces updated
+	any,		// update object -- attribute updated: new value
+	number[]	// array of traces updated
 ];
 
 export interface PlotAxis {
@@ -74,13 +85,76 @@ export interface PlotRelayoutEvent {
 	scene: PlotScene;
 }
 
+export interface ClickAnnotationEvent {
+	index: number;
+	annotation: Annotations;
+	fullAnnotation: Annotations;
+	event: MouseEvent;
+}
+
+export interface FrameAnimationEvent {
+	name: string;
+	frame: Frame;
+	animation: {
+		frame: {
+			duration: number;
+			redraw: boolean;
+		};
+		transition: Transition;
+	};
+}
+
+export interface LegendClickEvent {
+	event: MouseEvent;
+	node: PlotlyHTMLElement;
+	curveNumber: number;
+	expandedIndex: number;
+	data: Data[];
+	layout: Partial<Layout>;
+	frames: Frame[];
+	config: Partial<Config>;
+	fullData: Data[];
+	fullLayout: Partial<Layout>;
+}
+
+export interface SliderChangeEvent {
+	slider: Slider;
+	step: SliderStep;
+	interaction: boolean;
+	previousActive: number;
+}
+
+export interface SliderStartEvent {
+	slider: Slider;
+}
+
+export interface SliderEndEvent {
+	slider: Slider;
+	step: SliderStep;
+}
+
+export interface BeforePlotEvent {
+	data: Data[];
+	layout: Partial<Layout>;
+	config: Partial<Config>;
+}
+
 export interface PlotlyHTMLElement extends HTMLElement {
 	on(event: 'plotly_click' | 'plotly_hover' | 'plotly_unhover', callback: (event: PlotMouseEvent) => void): void;
 	on(event: 'plotly_selecting' | 'plotly_selected', callback: (event: PlotSelectionEvent) => void): void;
 	on(event: 'plotly_restyle', callback: (data: PlotRestyleEvent) => void): void;
 	on(event: 'plotly_relayout', callback: (event: PlotRelayoutEvent) => void): void;
-	// on(event: 'plotly_event', callback: (data: any) => void): void;
-	on(event: 'plotly_afterplot' | 'plotly_autosize' | 'plotly_deselect' | 'plotly_doubleclick' | 'plotly_redraw' | 'plotly_animated', callback: () => void): void;
+	on(event: 'plotly_clickannotation', callback: (event: ClickAnnotationEvent) => void): void;
+	on(event: 'plotly_animatingframe', callback: (event: FrameAnimationEvent) => void): void;
+	on(event: 'plotly_legendclick' | 'plotly_legenddoubleclick', callback: (event: LegendClickEvent) => boolean): void;
+	on(event: 'plotly_sliderchange', callback: (event: SliderChangeEvent) => void): void;
+	on(event: 'plotly_sliderend', callback: (event: SliderEndEvent) => void): void;
+	on(event: 'plotly_sliderstart', callback: (event: SliderStartEvent) => void): void;
+	on(event: 'plotly_event', callback: (data: any) => void): void;
+	on(event: 'plotly_beforeplot', callback: (event: BeforePlotEvent) => boolean): void;
+	on(event: 'plotly_afterexport' | 'plotly_afterplot' | 'plotly_animated' | 'plotly_animationinterrupted' | 'plotly_autosize' |
+		'plotly_beforeexport' | 'plotly_deselect' | 'plotly_doubleclick' | 'plotly_framework' | 'plotly_redraw' |
+		'plotly_transitioning' | 'plotly_transitioninterrupted', callback: () => void): void;
 }
 
 export interface ToImgopts {
@@ -114,6 +188,8 @@ export function prependTraces(root: Root, update: Data | Data[], indices: number
 export function toImage(root: Root, opts: ToImgopts): Promise<string>;
 export function downloadImage(root: Root, opts: DownloadImgopts): Promise<string>;
 export function react(root: Root, data: Data[], layout?: Partial<Layout>, config?: Partial<Config>): Promise<PlotlyHTMLElement>;
+export function addFrames(root: Root, frames: Array<Partial<Frame>>): Promise<PlotlyHTMLElement>;
+export function deleteFrames(root: Root, frames: number[]): Promise<PlotlyHTMLElement>;
 
 // Layout
 export interface Layout {
@@ -121,11 +197,19 @@ export interface Layout {
 	titlefont: Partial<Font>;
 	autosize: boolean;
 	showlegend: boolean;
-    paper_bgcolor: Color;
-    plot_bgcolor: Color;
-    separators: string;
-    hidesources: boolean;
-    xaxis: Partial<LayoutAxis>;
+	paper_bgcolor: Color;
+	plot_bgcolor: Color;
+	separators: string;
+	hidesources: boolean;
+	xaxis: Partial<LayoutAxis>;
+	xaxis2: Partial<LayoutAxis>;
+	xaxis3: Partial<LayoutAxis>;
+	xaxis4: Partial<LayoutAxis>;
+	xaxis5: Partial<LayoutAxis>;
+	xaxis6: Partial<LayoutAxis>;
+	xaxis7: Partial<LayoutAxis>;
+	xaxis8: Partial<LayoutAxis>;
+	xaxis9: Partial<LayoutAxis>;
 	yaxis: Partial<LayoutAxis>;
 	yaxis2: Partial<LayoutAxis>;
 	yaxis3: Partial<LayoutAxis>;
@@ -140,8 +224,8 @@ export interface Layout {
 	width: number;
 	hovermode: 'closest' | 'x' | 'y' | false;
 	hoverlabel: Partial<Label>;
-    calendar: Calendar;
-    'xaxis.range': [Datum, Datum];
+	calendar: Calendar;
+	'xaxis.range': [Datum, Datum];
 	'xaxis.range[0]': Datum;
 	'xaxis.range[1]': Datum;
 	'yaxis.range': [Datum, Datum];
@@ -151,20 +235,20 @@ export interface Layout {
 	'xaxis.type': AxisType;
 	'xaxis.autorange': boolean;
 	'yaxis.autorange': boolean;
-    ternary: {}; // TODO
-    geo: {}; // TODO
-    mapbox: {}; // TODO
-    radialaxis: {}; // TODO
-    angularaxis: {}; // TODO
-    direction: 'clockwise' | 'counterclockwise';
-    dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
-    orientation: number;
-    annotations: Array<Partial<Annotations>>;
-    shapes: Array<Partial<Shape>>;
-    images: Array<Partial<Image>>;
-    updatemenus: {}; // TODO
-    sliders: {}; // TODO
-    legend: Partial<Legend>;
+	ternary: {}; // TODO
+	geo: {}; // TODO
+	mapbox: {}; // TODO
+	radialaxis: {}; // TODO
+	angularaxis: {}; // TODO
+	direction: 'clockwise' | 'counterclockwise';
+	dragmode: 'zoom' | 'pan' | 'select' | 'lasso' | 'orbit' | 'turntable';
+	orientation: number;
+	annotations: Array<Partial<Annotations>>;
+	shapes: Array<Partial<Shape>>;
+	images: Array<Partial<Image>>;
+	updatemenus: {}; // TODO
+	sliders: Array<Partial<Slider>>;
+	legend: Partial<Legend>;
 	font: Partial<Font>;
 	scene: Partial<Scene>;
 }
@@ -183,80 +267,80 @@ export interface Legend extends Label {
 export type AxisType = '-' | 'linear' | 'log' | 'date' | 'category';
 
 export interface Axis {
-    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;
+	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';
+	'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>;
+	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;
+	spikesides: boolean;
+	showbackground: boolean;
+	backgroundcolor: Color;
+	showaxeslabels: boolean;
 }
 
 export interface ShapeLine {
@@ -308,38 +392,38 @@ export interface Icon {
 
 export interface ModeBarButton {
 	/** name / id of the buttons (for tracking) */
-    name: string;
+	name: string;
 
 	/**
 	 * text that appears while hovering over the button,
 	 * enter null, false or '' for no hover text
 	 */
-    title: string;
+	title: string;
 
 	/**
 	 * svg icon object associated with the button
 	 * can be linked to Plotly.Icons to use the default plotly icons
 	 */
-    icon: string | Icon;
+	icon: string | Icon;
 
 	/** icon positioning */
-    gravity?: string;
+	gravity?: string;
 
 	/**
 	 * click handler associated with the button, a function of
 	 * 'gd' (the main graph object) and
 	 * 'ev' (the event object)
 	 */
-    click: ButtonClickEvent;
+	click: ButtonClickEvent;
 
 	/**
 	 * attribute associated with button,
 	 * use this with 'val' to keep track of the state
 	 */
-    attr?: string;
+	attr?: string;
 
 	/** initial 'attr' value, can be a function of gd */
-    val?: any;
+	val?: any;
 
 	/** is the button a toggle button? */
 	toggle?: boolean;
@@ -347,17 +431,18 @@ export interface ModeBarButton {
 
 // Data
 
-export type Datum = string | number | Date;
+export type Datum = string | number | Date | null;
 export type TypedArray = Int8Array | Uint8Array | Int16Array | Uint16Array | Int32Array | Uint32Array | Uint8ClampedArray | Float32Array | Float64Array;
 
 export type Dash = 'solid' | 'dot' | 'dash' | 'longdash' | 'dashdot' | 'longdashdot';
 
-export type Data = Partial<ScatterData>;
+export type Data = Partial<PlotData>;
 export type Color = string | Array<string | undefined | null> | Array<Array<string | undefined | null>>;
-
+export type DataTransform = Partial<Transform>;
+export type ScatterData = PlotData;
 // Bar Scatter
-export interface ScatterData {
-	type: 'bar' | 'pointcloud' | 'scatter' | 'scattergl' | 'scatter3d' |'surface';
+export interface PlotData {
+	type: 'bar' | 'histogram' | 'pointcloud' | 'scatter' | 'scattergl' | 'scatter3d' | 'surface';
 	x: Datum[] | Datum[][] | TypedArray;
 	y: Datum[] | Datum[][] | TypedArray;
 	z: Datum[] | Datum[][] | Datum[][][] | TypedArray;
@@ -372,7 +457,7 @@ export interface ScatterData {
 	'line.shape': 'linear' | 'spline' | 'hv' | 'vh' | 'hvh' | 'vhv';
 	'line.smoothing': number;
 	'line.simplify': boolean;
-	marker: Partial<ScatterMarker>;
+	marker: Partial<PlotMarker>;
 	'marker.symbol': string | string[]; // Drawing.symbolList
 	'marker.color': Color;
 	'marker.opacity': number | number[];
@@ -388,31 +473,64 @@ export interface ScatterData {
 	mode: 'lines' | 'markers' | 'text' | 'lines+markers' | 'text+markers' | 'text+lines' | 'text+lines+markers' | 'none';
 	hoveron: 'points' | 'fills';
 	hoverinfo: 'all' | 'name' | 'none' | 'skip' | 'text' |
-               'x' | 'x+text' | 'x+name' |
-               'x+y' | 'x+y+text' | 'x+y+name' |
-               'x+y+z' | 'x+y+z+text' | 'x+y+z+name' |
-               'y+x' | 'y+x+text' | 'y+x+name' |
-               'y+z' | 'y+z+text' | 'y+z+name' |
-               'y+x+z' | 'y+x+z+text' | 'y+x+z+name' |
-               'z+x' | 'z+x+text' | 'z+x+name' |
-               'z+y+x' | 'z+y+x+text' | 'z+y+x+name' |
-               'z+x+y' | 'z+x+y+text' | 'z+x+y+name';
+	'x' | 'x+text' | 'x+name' |
+	'x+y' | 'x+y+text' | 'x+y+name' |
+	'x+y+z' | 'x+y+z+text' | 'x+y+z+name' |
+	'y+x' | 'y+x+text' | 'y+x+name' |
+	'y+z' | 'y+z+text' | 'y+z+name' |
+	'y+x+z' | 'y+x+z+text' | 'y+x+z+name' |
+	'z+x' | 'z+x+text' | 'z+x+name' |
+	'z+y+x' | 'z+y+x+text' | 'z+y+x+name' |
+	'z+x+y' | 'z+x+y+text' | 'z+x+y+name';
 	hoverlabel: Partial<Label>;
 	fill: 'none' | 'tozeroy' | 'tozerox' | 'tonexty' | 'tonextx' | 'toself' | 'tonext';
 	fillcolor: string;
 	legendgroup: string;
 	name: string;
 	connectgaps: boolean;
+	visible: boolean | 'legendonly';
+	transforms: DataTransform[];
+	orientation: 'v' | 'h';
 }
 
+/**
+ * These interfaces are based on attribute descriptions in
+ * https://github.com/plotly/plotly.js/tree/9d6144304308fc3007f0facf2535d38ea3e9b26c/src/transforms
+ */
+
+export interface TransformStyle {
+	target: number | string | number[] | string[];
+	value: Partial<PlotData>;
+}
+
+export interface TransformAggregation {
+	target: string;
+	func?: 'count' | 'sum' | 'avg' | 'median' | 'mode' | 'rms' | 'stddev' | 'min' | 'max' | 'first' | 'last';
+	funcmode?: 'sample' | 'population';
+	enabled?: boolean;
+}
+
+export interface Transform {
+	type: 'aggregate' | 'filter' | 'groupby' | 'sort';
+	enabled: boolean;
+	target: number | string | number[] | string[];
+	operation: string;
+	aggregations: TransformAggregation[];
+	preservegaps: boolean;
+	groups: string | number[] | string[];
+	nameformat: string;
+	styles: TransformStyle[];
+	value: any;
+	order: 'ascending' | 'descending';
+}
 /**
  * Any combination of "x", "y", "z", "text", "name" joined with a "+" OR "all" or "none" or "skip".
  * examples: "x", "y", "x+y", "x+y+z", "all"
  * default: "all"
  */
-export interface ScatterMarker {
+export interface PlotMarker {
 	symbol: string | string[]; // Drawing.symbolList
-	color: Color | number[];
+	color: Color | Color[];
 	colorscale: string | string[] | Array<Array<(string | number)>>;
 	cauto: boolean;
 	cmax: number;
@@ -428,78 +546,73 @@ export interface ScatterMarker {
 	sizemode: 'diameter' | 'area';
 	showscale: boolean;
 	line: Partial<ScatterMarkerLine>;
+	width: number;
 	colorbar: {
-        thicknessmode: 'fraction' | 'pixels',
-        thickness: number,
-        lenmode: 'fraction' | 'pixels',
-        len: number,
-        x: number,
-        xanchor: 'left' | 'center' | 'right',
-        xpad: number,
-        y: number,
-        yanchor: 'top' | 'middle' | 'bottom',
-        ypad: number,
-        outlinecolor: Color,
-        outlinewidth: number,
-        bordercolor: Color,
-        borderwidth: Color,
-        bgcolor: Color,
-        tickmode: 'auto' | 'linear' | 'array',
-        nticks: number,
-        tick0: number | string,
-        dtick: number | string,
-        tickvals: Datum[] | Datum[][] | Datum[][][] | TypedArray,
-        ticktext: Datum[] | Datum[][] | Datum[][][] | TypedArray,
-        ticks: 'outside' | 'inside' | '',
-        ticklen: number,
-        tickwidth: number,
-        tickcolor: Color,
-        showticklabels: boolean,
-        tickfont: {
-            family: string,
-            size: number,
-            color: Color,
-        },
-        tickangle: number,
-        tickformat: string,
-        tickformatstops: {
-            dtickrange: any[],
-            value: string,
-        },
-        tickprefix: string,
-        showtickprefix: 'all' | 'first' | 'last' | 'none',
-        ticksuffix: string,
-        showticksuffix: 'all' | 'first' | 'last' | 'none',
-        separatethousands: boolean,
-        exponentformat: 'none' | 'e' | 'E' | 'power' | 'SI' | 'B',
-        showexponent: 'all' | 'first' | 'last' | 'none',
-        title: string,
-        titlefont: {
-            family: string,
-            size: number,
-            color: Color,
-        },
-        titleside: 'right' | 'top' | 'bottom',
-        tickvalssrc: any,
-        ticktextsrc: any,
-    };
+		thicknessmode: 'fraction' | 'pixels',
+		thickness: number,
+		lenmode: 'fraction' | 'pixels',
+		len: number,
+		x: number,
+		xanchor: 'left' | 'center' | 'right',
+		xpad: number,
+		y: number,
+		yanchor: 'top' | 'middle' | 'bottom',
+		ypad: number,
+		outlinecolor: Color,
+		outlinewidth: number,
+		bordercolor: Color,
+		borderwidth: Color,
+		bgcolor: Color,
+		tickmode: 'auto' | 'linear' | 'array',
+		nticks: number,
+		tick0: number | string,
+		dtick: number | string,
+		tickvals: Datum[] | Datum[][] | Datum[][][] | TypedArray,
+		ticktext: Datum[] | Datum[][] | Datum[][][] | TypedArray,
+		ticks: 'outside' | 'inside' | '',
+		ticklen: number,
+		tickwidth: number,
+		tickcolor: Color,
+		showticklabels: boolean,
+		tickfont: Font,
+		tickangle: number,
+		tickformat: string,
+		tickformatstops: {
+			dtickrange: any[],
+			value: string,
+		},
+		tickprefix: string,
+		showtickprefix: 'all' | 'first' | 'last' | 'none',
+		ticksuffix: string,
+		showticksuffix: 'all' | 'first' | 'last' | 'none',
+		separatethousands: boolean,
+		exponentformat: 'none' | 'e' | 'E' | 'power' | 'SI' | 'B',
+		showexponent: 'all' | 'first' | 'last' | 'none',
+		title: string,
+		titlefont: Font,
+		titleside: 'right' | 'top' | 'bottom',
+		tickvalssrc: any,
+		ticktextsrc: any,
+	};
 	gradient: {
-        type: 'radial' | 'horizontal' | 'vertical' | 'none',
-        color: Color,
-        typesrc: any,
-        colorsrc: any,
-    };
+		type: 'radial' | 'horizontal' | 'vertical' | 'none',
+		color: Color,
+		typesrc: any,
+		colorsrc: any,
+	};
 }
 
+export type ScatterMarker = PlotMarker;
+
 export interface ScatterMarkerLine {
-    width: number | number[];
-    color: Color;
-    colorscale: string | string[];
-    cauto: boolean;
-    cmax: number;
-    cmin: number;
-    autocolorscale: boolean;
-    reversescale: boolean;
+	width: number | number[];
+	color: Color;
+	colorscale: string | string[];
+	cauto: boolean;
+	cmax: number;
+	cmin: number;
+	autocolorscale: boolean;
+	reversescale: boolean;
 }
 
 export interface ScatterLine {
@@ -512,9 +625,20 @@ export interface ScatterLine {
 }
 
 export interface Font {
+	/**
+	 * HTML font family - the typeface that will be applied by the web browser.
+	 * The web browser will only be able to apply a font if it is available on the system
+	 * which it operates. Provide multiple font families, separated by commas, to indicate
+	 * the preference in which to apply fonts if they aren't available on the system.
+	 * The plotly service (at https://plot.ly or on-premise) generates images on a server,
+	 * where only a select number of fonts are installed and supported.
+	 * These include *Arial*, *Balto*, *Courier New*, *Droid Sans*, *Droid Serif*,
+	 * *Droid Sans Mono*, *Gravitas One*, *Old Standard TT*, *Open Sans*, *Overpass*,
+	 * *PT Sans Narrow*, *Raleway*, *Times New Roman*.
+	 */
 	family: string;
 	size: number;
-	color: string;
+	color: Color;
 }
 
 export interface Edits {
@@ -671,276 +795,276 @@ export interface Label {
 }
 
 export interface Annotations extends Label {
-  /** Determines whether or not this annotation is visible. */
-  visible: boolean;
+	/** Determines whether or not this annotation is visible. */
+	visible: boolean;
 
-  /**
-   * Sets the text associated with this annotation.
-   * Plotly uses a subset of HTML tags to do things like
-   * newline (<br>), bold (<b></b>), italics (<i></i>),
-   * hyperlinks (<a href='...'></a>). Tags <em>, <sup>, <sub>
-   * <span> are also supported.
-   */
-  text: string;
+	/**
+	 * Sets the text associated with this annotation.
+	 * Plotly uses a subset of HTML tags to do things like
+	 * newline (<br>), bold (<b></b>), italics (<i></i>),
+	 * hyperlinks (<a href='...'></a>). Tags <em>, <sup>, <sub>
+	 * <span> are also supported.
+	 */
+	text: string;
 
-  /** Sets the angle at which the `text` is drawn with respect to the horizontal. */
-  textangle: string;
+	/** Sets the angle at which the `text` is drawn with respect to the horizontal. */
+	textangle: string;
 
-  /**
-   * Sets an explicit width for the text box. null (default) lets the
-   * text set the box width. Wider text will be clipped.
-   * There is no automatic wrapping; use <br> to start a new line.
-   */
-  width: number;
+	/**
+	 * Sets an explicit width for the text box. null (default) lets the
+	 * text set the box width. Wider text will be clipped.
+	 * There is no automatic wrapping; use <br> to start a new line.
+	 */
+	width: number;
 
-  /**
-   * Sets an explicit height for the text box. null (default) lets the
-   * text set the box height. Taller text will be clipped.
-   */
-  height: number;
+	/**
+	 * Sets an explicit height for the text box. null (default) lets the
+	 * text set the box height. Taller text will be clipped.
+	 */
+	height: number;
 
-  /** Sets the opacity of the annotation (text + arrow). */
-  opacity: number;
+	/** Sets the opacity of the annotation (text + arrow). */
+	opacity: number;
 
-  /**
-   * Sets the horizontal alignment of the `text` within the box.
-   * Has an effect only if `text` spans more two or more lines
-   * (i.e. `text` contains one or more <br> HTML tags) or if an
-   * explicit width is set to override the text width.
-   */
-  align: 'left' | 'center' | 'right';
+	/**
+	 * Sets the horizontal alignment of the `text` within the box.
+	 * Has an effect only if `text` spans more two or more lines
+	 * (i.e. `text` contains one or more <br> HTML tags) or if an
+	 * explicit width is set to override the text width.
+	 */
+	align: 'left' | 'center' | 'right';
 
-  /**
-   * Sets the vertical alignment of the `text` within the box.
-   * Has an effect only if an explicit height is set to override the text height.
-   */
-  valign: 'top' | 'middle' | 'bottom';
+	/**
+	 * Sets the vertical alignment of the `text` within the box.
+	 * Has an effect only if an explicit height is set to override the text height.
+	 */
+	valign: 'top' | 'middle' | 'bottom';
 
-  /** Sets the padding (in px) between the `text` and the enclosing border. */
-  borderpad: number;
+	/** Sets the padding (in px) between the `text` and the enclosing border. */
+	borderpad: number;
 
-  /** Sets the width (in px) of the border enclosing the annotation `text`. */
-  borderwidth: number;
+	/** Sets the width (in px) of the border enclosing the annotation `text`. */
+	borderwidth: number;
 
-  /**
-   * Determines whether or not the annotation is drawn with an arrow.
-   * If *true*, `text` is placed near the arrow's tail.
-   * If *false*, `text` lines up with the `x` and `y` provided.
-   */
-  showarrow: boolean;
+	/**
+	 * Determines whether or not the annotation is drawn with an arrow.
+	 * If *true*, `text` is placed near the arrow's tail.
+	 * If *false*, `text` lines up with the `x` and `y` provided.
+	 */
+	showarrow: boolean;
 
-  /** Sets the color of the annotation arrow. */
-  arrowcolor: string;
+	/** Sets the color of the annotation arrow. */
+	arrowcolor: string;
 
-  /** Sets the end annotation arrow head style. */
-  arrowhead: number;
+	/** Sets the end annotation arrow head style. */
+	arrowhead: number;
 
-  /** Sets the start annotation arrow head style. */
-  startarrowhead: number;
+	/** Sets the start annotation arrow head style. */
+	startarrowhead: number;
 
-  /** Sets the annotation arrow head position. */
-  arrowside: 'end' | 'start';
+	/** Sets the annotation arrow head position. */
+	arrowside: 'end' | 'start';
 
-  /**
-   * Sets the size of the end annotation arrow head, relative to `arrowwidth`.
-   * A value of 1 (default) gives a head about 3x as wide as the line.
-   */
-  arrowsize: number;
+	/**
+	 * Sets the size of the end annotation arrow head, relative to `arrowwidth`.
+	 * A value of 1 (default) gives a head about 3x as wide as the line.
+	 */
+	arrowsize: number;
 
-  /**
-   * Sets the size of the start annotation arrow head, relative to `arrowwidth`.
-   * A value of 1 (default) gives a head about 3x as wide as the line.
-   */
-  startarrowsize: number;
+	/**
+	 * Sets the size of the start annotation arrow head, relative to `arrowwidth`.
+	 * A value of 1 (default) gives a head about 3x as wide as the line.
+	 */
+	startarrowsize: number;
 
-  /** Sets the width (in px) of annotation arrow line. */
-  arrowwidth: number;
+	/** Sets the width (in px) of annotation arrow line. */
+	arrowwidth: number;
 
-  /**
-   * Sets a distance, in pixels, to move the end arrowhead away from the
-   * position it is pointing at, for example to point at the edge of
-   * a marker independent of zoom. Note that this shortens the arrow
-   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
-   * which moves everything by this amount.
-   */
-  standoff: number;
+	/**
+	 * Sets a distance, in pixels, to move the end arrowhead away from the
+	 * position it is pointing at, for example to point at the edge of
+	 * a marker independent of zoom. Note that this shortens the arrow
+	 * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+	 * which moves everything by this amount.
+	 */
+	standoff: number;
 
-  /**
-   * Sets a distance, in pixels, to move the start arrowhead away from the
-   * position it is pointing at, for example to point at the edge of
-   * a marker independent of zoom. Note that this shortens the arrow
-   * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
-   * which moves everything by this amount.
-   */
-  startstandoff: number;
+	/**
+	 * Sets a distance, in pixels, to move the start arrowhead away from the
+	 * position it is pointing at, for example to point at the edge of
+	 * a marker independent of zoom. Note that this shortens the arrow
+	 * from the `ax` / `ay` vector, in contrast to `xshift` / `yshift`
+	 * which moves everything by this amount.
+	 */
+	startstandoff: number;
 
-  /**
-   * Sets the x component of the arrow tail about the arrow head.
-   * If `axref` is `pixel`, a positive (negative)
-   * component corresponds to an arrow pointing
-   * from right to left (left to right).
-   * If `axref` is an axis, this is an absolute value on that axis,
-   * like `x`, NOT a relative value.
-   */
-  ax: number;
+	/**
+	 * Sets the x component of the arrow tail about the arrow head.
+	 * If `axref` is `pixel`, a positive (negative)
+	 * component corresponds to an arrow pointing
+	 * from right to left (left to right).
+	 * If `axref` is an axis, this is an absolute value on that axis,
+	 * like `x`, NOT a relative value.
+	 */
+	ax: number;
 
-  /**
-   * Sets the y component of the arrow tail about the arrow head.
-   * If `ayref` is `pixel`, a positive (negative)
-   * component corresponds to an arrow pointing
-   * from bottom to top (top to bottom).
-   * If `ayref` is an axis, this is an absolute value on that axis,
-   * like `y`, NOT a relative value.
-   */
-  ay: number;
+	/**
+	 * Sets the y component of the arrow tail about the arrow head.
+	 * If `ayref` is `pixel`, a positive (negative)
+	 * component corresponds to an arrow pointing
+	 * from bottom to top (top to bottom).
+	 * If `ayref` is an axis, this is an absolute value on that axis,
+	 * like `y`, NOT a relative value.
+	 */
+	ay: number;
 
-  /**
-   * Indicates in what terms the tail of the annotation (ax,ay)
-   * is specified. If `pixel`, `ax` is a relative offset in pixels
-   * from `x`. If set to an x axis id (e.g. *x* or *x2*), `ax` is
-   * specified in the same terms as that axis. This is useful
-   * for trendline annotations which should continue to indicate
-   * the correct trend when zoomed.
-   */
-  axref: 'pixel';
+	/**
+	 * Indicates in what terms the tail of the annotation (ax,ay)
+	 * is specified. If `pixel`, `ax` is a relative offset in pixels
+	 * from `x`. If set to an x axis id (e.g. *x* or *x2*), `ax` is
+	 * specified in the same terms as that axis. This is useful
+	 * for trendline annotations which should continue to indicate
+	 * the correct trend when zoomed.
+	 */
+	axref: 'pixel';
 
-  /**
-   * Indicates in what terms the tail of the annotation (ax,ay)
-   * is specified. If `pixel`, `ay` is a relative offset in pixels
-   * from `y`. If set to a y axis id (e.g. *y* or *y2*), `ay` is
-   * specified in the same terms as that axis. This is useful
-   * for trendline annotations which should continue to indicate
-   * the correct trend when zoomed.
-   */
-  ayref: 'pixel';
+	/**
+	 * Indicates in what terms the tail of the annotation (ax,ay)
+	 * is specified. If `pixel`, `ay` is a relative offset in pixels
+	 * from `y`. If set to a y axis id (e.g. *y* or *y2*), `ay` is
+	 * specified in the same terms as that axis. This is useful
+	 * for trendline annotations which should continue to indicate
+	 * the correct trend when zoomed.
+	 */
+	ayref: 'pixel';
 
-  /**
-   * Sets the annotation's x coordinate axis.
-   * If set to an x axis id (e.g. *x* or *x2*), the `x` position refers to an x coordinate
-   * If set to *paper*, the `x` position refers to the distance from
-   * the left side of the plotting area in normalized coordinates
-   * where 0 (1) corresponds to the left (right) side.
-   */
-  xref: 'paper' | 'x';
+	/**
+	 * Sets the annotation's x coordinate axis.
+	 * If set to an x axis id (e.g. *x* or *x2*), the `x` position refers to an x coordinate
+	 * If set to *paper*, the `x` position refers to the distance from
+	 * the left side of the plotting area in normalized coordinates
+	 * where 0 (1) corresponds to the left (right) side.
+	 */
+	xref: 'paper' | 'x';
 
-  /**
-   * Sets the annotation's x position.
-   * If the axis `type` is *log*, then you must take the log of your desired range.
-   * If the axis `type` is *date*, it should be date strings, like date data,
-   * though Date objects and unix milliseconds will be accepted and converted to strings.
-   * If the axis `type` is *category*, it should be numbers, using the scale where each
-   * category is assigned a serial number from zero in the order it appears.
-   */
-  x: number | string;
+	/**
+	 * Sets the annotation's x position.
+	 * If the axis `type` is *log*, then you must take the log of your desired range.
+	 * If the axis `type` is *date*, it should be date strings, like date data,
+	 * though Date objects and unix milliseconds will be accepted and converted to strings.
+	 * If the axis `type` is *category*, it should be numbers, using the scale where each
+	 * category is assigned a serial number from zero in the order it appears.
+	 */
+	x: number | string;
 
-  /**
-   * Sets the text box's horizontal position anchor
-   * This anchor binds the `x` position to the *left*, *center* or *right* of the annotation.
-   * For example, if `x` is set to 1, `xref` to *paper* and `xanchor` to *right* then the
-   * right-most portion of the annotation lines up with the right-most edge of the plotting area.
-   * If *auto*, the anchor is equivalent to *center* for data-referenced annotations or if there
-   * is an arrow, whereas for paper-referenced with no arrow, the anchor picked corresponds to the closest side.
-   */
-  xanchor: 'auto' | 'left' | 'center' | 'right';
+	/**
+	 * Sets the text box's horizontal position anchor
+	 * This anchor binds the `x` position to the *left*, *center* or *right* of the annotation.
+	 * For example, if `x` is set to 1, `xref` to *paper* and `xanchor` to *right* then the
+	 * right-most portion of the annotation lines up with the right-most edge of the plotting area.
+	 * If *auto*, the anchor is equivalent to *center* for data-referenced annotations or if there
+	 * is an arrow, whereas for paper-referenced with no arrow, the anchor picked corresponds to the closest side.
+	 */
+	xanchor: 'auto' | 'left' | 'center' | 'right';
 
-  /**
-   * Shifts the position of the whole annotation and arrow to the
-   * right (positive) or left (negative) by this many pixels.
-   */
-  xshift: number;
+	/**
+	 * Shifts the position of the whole annotation and arrow to the
+	 * right (positive) or left (negative) by this many pixels.
+	 */
+	xshift: number;
 
-  /**
-   * Sets the annotation's y coordinate axis.
-   * If set to an y axis id (e.g. *y* or *y2*), the `y` position refers to an y coordinate
-   * If set to *paper*, the `y` position refers to the distance from
-   * the bottom of the plotting area in normalized coordinates
-   * where 0 (1) corresponds to the bottom (top).
-   */
-  yref: 'paper' | 'y';
+	/**
+	 * Sets the annotation's y coordinate axis.
+	 * If set to an y axis id (e.g. *y* or *y2*), the `y` position refers to an y coordinate
+	 * If set to *paper*, the `y` position refers to the distance from
+	 * the bottom of the plotting area in normalized coordinates
+	 * where 0 (1) corresponds to the bottom (top).
+	 */
+	yref: 'paper' | 'y';
 
-  /**
-   * Sets the annotation's y position.
-   * If the axis `type` is *log*, then you must take the log of your desired range.
-   * If the axis `type` is *date*, it should be date strings, like date data,
-   * though Date objects and unix milliseconds will be accepted and converted to strings.
-   * If the axis `type` is *category*, it should be numbers, using the scale where each
-   * category is assigned a serial number from zero in the order it appears.
-   */
-  y: number | string;
+	/**
+	 * Sets the annotation's y position.
+	 * If the axis `type` is *log*, then you must take the log of your desired range.
+	 * If the axis `type` is *date*, it should be date strings, like date data,
+	 * though Date objects and unix milliseconds will be accepted and converted to strings.
+	 * If the axis `type` is *category*, it should be numbers, using the scale where each
+	 * category is assigned a serial number from zero in the order it appears.
+	 */
+	y: number | string;
 
-  /**
-   * Sets the text box's vertical position anchor
-   * This anchor binds the `y` position to the *top*, *middle* or *bottom* of the annotation.
-   * For example, if `y` is set to 1, `yref` to *paper* and `yanchor` to *top* then the
-   * top-most portion of the annotation lines up with the top-most edge of the plotting area.
-   * If *auto*, the anchor is equivalent to *middle* for data-referenced annotations or if
-   * there is an arrow, whereas for paper-referenced with no arrow, the anchor picked
-   * corresponds to the closest side.
-   */
-  yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+	/**
+	 * Sets the text box's vertical position anchor
+	 * This anchor binds the `y` position to the *top*, *middle* or *bottom* of the annotation.
+	 * For example, if `y` is set to 1, `yref` to *paper* and `yanchor` to *top* then the
+	 * top-most portion of the annotation lines up with the top-most edge of the plotting area.
+	 * If *auto*, the anchor is equivalent to *middle* for data-referenced annotations or if
+	 * there is an arrow, whereas for paper-referenced with no arrow, the anchor picked
+	 * corresponds to the closest side.
+	 */
+	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
 
-  /**
-   * Shifts the position of the whole annotation and arrow up
-   * (positive) or down (negative) by this many pixels.
-   */
-  yshift: number;
+	/**
+	 * Shifts the position of the whole annotation and arrow up
+	 * (positive) or down (negative) by this many pixels.
+	 */
+	yshift: number;
 
-  /**
-   * Makes this annotation respond to clicks on the plot.
-   * If you click a data point that exactly matches the `x` and `y` values of this annotation,
-   * and it is hidden (visible: false), it will appear. In *onoff* mode, you must click the same
-   * point again to make it disappear, so if you click multiple points, you can show multiple
-   * annotations. In *onout* mode, a click anywhere else in the plot (on another data point or not)
-   * will hide this annotation. If you need to show/hide this annotation in response to different
-   * `x` or `y` values, you can set `xclick` and/or `yclick`. This is useful for example to label
-   * the side of a bar. To label markers though, `standoff` is preferred over `xclick` and `yclick`.
-   */
-  clicktoshow: false | 'onoff' | 'onout';
+	/**
+	 * Makes this annotation respond to clicks on the plot.
+	 * If you click a data point that exactly matches the `x` and `y` values of this annotation,
+	 * and it is hidden (visible: false), it will appear. In *onoff* mode, you must click the same
+	 * point again to make it disappear, so if you click multiple points, you can show multiple
+	 * annotations. In *onout* mode, a click anywhere else in the plot (on another data point or not)
+	 * will hide this annotation. If you need to show/hide this annotation in response to different
+	 * `x` or `y` values, you can set `xclick` and/or `yclick`. This is useful for example to label
+	 * the side of a bar. To label markers though, `standoff` is preferred over `xclick` and `yclick`.
+	 */
+	clicktoshow: false | 'onoff' | 'onout';
 
-  /**
-   * Toggle this annotation when clicking a data point whose `x` value
-   * is `xclick` rather than the annotation's `x` value.
-   */
-  xclick: any;
+	/**
+	 * Toggle this annotation when clicking a data point whose `x` value
+	 * is `xclick` rather than the annotation's `x` value.
+	 */
+	xclick: any;
 
-  /**
-   * Toggle this annotation when clicking a data point whose `y` value
-   * is `yclick` rather than the annotation's `y` value.
-   */
-  yclick: any;
+	/**
+	 * Toggle this annotation when clicking a data point whose `y` value
+	 * is `yclick` rather than the annotation's `y` value.
+	 */
+	yclick: any;
 
-  /**
-   * Sets text to appear when hovering over this annotation.
-   * If omitted or blank, no hover label will appear.
-   */
-  hovertext: string;
+	/**
+	 * Sets text to appear when hovering over this annotation.
+	 * If omitted or blank, no hover label will appear.
+	 */
+	hovertext: string;
 
-  hoverlabel: Partial<Label>;
+	hoverlabel: Partial<Label>;
 
-  /**
-   * Determines whether the annotation text box captures mouse move and click events,
-   * or allows those events to pass through to data points in the plot that may be
-   * behind the annotation. By default `captureevents` is *false* unless `hovertext`
-   * is provided. If you use the event `plotly_clickannotation` without `hovertext`
-   * you must explicitly enable `captureevents`.
-   */
+	/**
+	 * Determines whether the annotation text box captures mouse move and click events,
+	 * or allows those events to pass through to data points in the plot that may be
+	 * behind the annotation. By default `captureevents` is *false* unless `hovertext`
+	 * is provided. If you use the event `plotly_clickannotation` without `hovertext`
+	 * you must explicitly enable `captureevents`.
+	 */
 	captureevents: boolean;
 }
 
 export interface Image {
-  visible: boolean;
-  source: string;
-  layer: 'above' | 'below';
-  sizex: number;
-  sizey: number;
-  sizing: 'fill' | 'contain' | 'stretch';
-  opacity: number;
-  x: number | string;
-  y: number | string;
-  xanchor: 'left' | 'center' | 'right';
-  yanchor: 'top' | 'middle' | 'bottom';
-  xref: 'paper' | 'x';
-  yref: 'paper' | 'y';
+	visible: boolean;
+	source: string;
+	layer: 'above' | 'below';
+	sizex: number;
+	sizey: number;
+	sizing: 'fill' | 'contain' | 'stretch';
+	opacity: number;
+	x: number | string;
+	y: number | string;
+	xanchor: 'left' | 'center' | 'right';
+	yanchor: 'top' | 'middle' | 'bottom';
+	xref: 'paper' | 'x';
+	yref: 'paper' | 'y';
 }
 
 export interface Scene {
@@ -959,6 +1083,226 @@ export interface Scene {
 }
 
 export interface Domain {
-    x: number[];
-    y: number[];
+	x: number[];
+	y: number[];
+}
+
+export interface Frame {
+	/**
+	 * An identifier that specifies the group to which the frame belongs,
+	 * used by animate to select a subset of frames.
+	 */
+	group: string;
+	/**
+	 * A label by which to identify the frame
+	 */
+	name: string;
+	/**
+	 * A list of trace indices that identify the respective traces in the
+	 * data attribute
+	 */
+	traces: number[];
+	/**
+	 * The name of the frame into which this frame's properties are merged
+	 * before applying. This is used to unify properties and avoid needing
+	 * to specify the same values for the same properties in multiple frames.
+	 */
+	baseframe: string;
+	/**
+	 * A list of traces this frame modifies. The format is identical to the
+	 * normal trace definition.
+	 */
+	data: Data[];
+	/**
+	 * Layout properties which this frame modifies. The format is identical
+	 * to the normal layout definition.
+	 */
+	layout: Partial<Layout>;
+}
+
+export interface Transition {
+	/**
+	 * Sets the duration of the slider transition
+	 */
+	duration: number;
+	/**
+	 * Sets the easing function of the slider transition
+	 */
+	easing: 'linear' | 'quad' | 'cubic' | 'sin' | 'exp' | 'circle' | 'elastic' | 'back' | 'bounce' | 'linear-in' |
+	'quad-in' | 'cubic-in' | 'sin-in' | 'exp-in' | 'circle-in' | 'elastic-in' | 'back-in' | 'bounce-in' |
+	'linear-out' | 'quad-out' | 'cubic-out' | 'sin-out' | 'exp-out' | 'circle-out' | 'elastic-out' | 'back-out' |
+	'bounce-out' | 'linear-in-out' | 'quad-in-out' | 'cubic-in-out' | 'sin-in-out' | 'exp-in-out' |
+	'circle-in-out' | 'elastic-in-out' | 'back-in-out' | 'bounce-in-out';
+}
+
+export interface SliderStep {
+	/**
+	 * Determines whether or not this step is included in the slider.
+	 */
+	visible: boolean;
+	/**
+	 * Sets the Plotly method to be called when the slider value is changed.
+	 * If the `skip` method is used, the API slider will function as normal
+	 * but will perform no API calls and will not bind automatically to state
+	 * updates. This may be used to create a component interface and attach to
+	 * slider events manually via JavaScript.
+	 */
+	method: 'animate' | 'relayout' | 'restyle' | 'skip' | 'update';
+	/**
+	 * Sets the arguments values to be passed to the Plotly
+	 * method set in `method` on slide.
+	 */
+	args: any[];
+	/**
+	 * Sets the text label to appear on the slider
+	 */
+	label: string;
+	/**
+	 * Sets the value of the slider step, used to refer to the step programatically.
+	 * Defaults to the slider label if not provided.
+	 */
+	value: string;
+	/**
+	 * When true, the API method is executed. When false, all other behaviors are the same
+	 * and command execution is skipped. This may be useful when hooking into, for example,
+	 * the `plotly_sliderchange` method and executing the API command manually without losing
+	 * the benefit of the slider automatically binding to the state of the plot through the
+	 * specification of `method` and `args`.
+	 */
+	execute: boolean;
+}
+
+export interface Padding {
+	/**
+	 * The amount of padding (in px) along the top of the component.
+	 */
+	t: number;
+	/**
+	 * The amount of padding (in px) on the right side of the component.
+	 */
+	r: number;
+	/**
+	 * The amount of padding (in px) along the bottom of the component.
+	 */
+	b: number;
+	/**
+	 * The amount of padding (in px) on the left side of the component.
+	 */
+	l: number;
+	editType: 'arraydraw';
+}
+
+export interface Slider {
+	/**
+	 * Determines whether or not the slider is visible.
+	 */
+	visible: boolean;
+	/**
+	 * Determines which button (by index starting from 0) is
+	 * considered active.
+	 */
+	active: number;
+	steps: Array<Partial<SliderStep>>;
+	/**
+	 * Determines whether this slider length
+	 * is set in units of plot *fraction* or in *pixels.
+	 * Use `len` to set the value.
+	 */
+	lenmode: 'fraction' | 'pixels';
+	/**
+	 * Sets the length of the slider
+	 * This measure excludes the padding of both ends.
+	 * That is, the slider's length is this length minus the
+	 * padding on both ends.
+	 */
+	len: number;
+	/**
+	 * Sets the x position (in normalized coordinates) of the slider.
+	 */
+	x: number;
+	/**
+	 * Sets the y position (in normalized coordinates) of the slider.
+	 */
+	y: number;
+	/**
+	 * Set the padding of the slider component along each side.
+	 */
+	pad: Partial<Padding>;
+	/**
+	 * Sets the slider's horizontal position anchor.
+	 * This anchor binds the `x` position to the *left*, *center*
+	 * or *right* of the range selector.
+	 */
+	xanchor: 'auto' | 'left' | 'center' | 'right';
+	/**
+	 * Sets the slider's vertical position anchor
+	 * This anchor binds the `y` position to the *top*, *middle*
+	 * or *bottom* of the range selector.
+	 */
+	yanchor: 'auto' | 'top' | 'middle' | 'bottom';
+	transition: Transition;
+	currentvalue: {
+		/**
+		 * Shows the currently-selected value above the slider.
+		 */
+		visible: boolean;
+		/**
+		 * The alignment of the value readout relative to the length of the slider.
+		 */
+		xanchor: 'left' | 'center' | 'right';
+		/**
+		 * The amount of space, in pixels, between the current value label
+		 * and the slider.
+		 */
+		offset: number;
+		/**
+		 * When currentvalue.visible is true, this sets the prefix of the label.
+		 */
+		prefix: string;
+		/**
+		 * When currentvalue.visible is true, this sets the suffix of the label.
+		 */
+		suffix: string;
+		/**
+		 * Sets the font of the current value label text.
+		 */
+		font: Partial<Font>;
+	};
+	/**
+	 * Sets the font of the slider step labels.
+	 */
+	font: Font;
+	/**
+	 * Sets the background color of the slider grip
+	 * while dragging.
+	 */
+	activebgcolor: Color;
+	/**
+	 * Sets the background color of the slider.
+	 */
+	bgcolor: Color;
+	/**
+	 * Sets the color of the border enclosing the slider.
+	 */
+	bordercolor: Color;
+	/**
+	 * Sets the width (in px) of the border enclosing the slider.
+	 */
+	borderwidth: number;
+	/**
+	 * Sets the length in pixels of step tick marks
+	 */
+	ticklen: number;
+	/**
+	 * Sets the color of the border enclosing the slider.
+	 */
+	tickcolor: Color;
+	/**
+	 * Sets the tick width (in px).
+	 */
+	tickwidth: number;
+	/**
+	 * Sets the length in pixels of minor step tick marks
+	 */
+	minorticklen: number;
 }
diff --git a/types/plotly.js/test/core-tests.ts b/types/plotly.js/test/core-tests.ts
index 21e7396d9b..6e35de55c6 100644
--- a/types/plotly.js/test/core-tests.ts
+++ b/types/plotly.js/test/core-tests.ts
@@ -127,7 +127,7 @@ const graphDiv = '#test';
 	const update = {
 		title: 'some new title', // updates the title
 		'xaxis.range': [0, 5],   // updates the xaxis range
-		'yaxis.range[1]': 15     // updates the end of the yaxis range
+		'yaxis.range[1]': 15	 // updates the end of the yaxis range
 	} as Layout;
 	Plotly.relayout(graphDiv, update);
 })();
@@ -251,6 +251,37 @@ function rand() {
 })();
 //////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////////////////////////////
+// Plotly.addFrames + Plotly.deleteFrames as per https://plot.ly/javascript/animations/
+(() => {
+	const n = 100;
+	const frames = [
+		{name: 'sine', data: [{x: new Array<number>(100), y: new Array<number>(n)}]},
+		{name: 'cosine', data: [{x: new Array<number>(100), y: new Array<number>(n)}]},
+		{name: 'circle', data: [{x: new Array<number>(100), y: new Array<number>(n)}]},
+	];
+
+	for (let i = 0; i < n; i++) {
+		const t = i / (n - 1) * 2 - 1;
+
+		// A sine wave:
+		frames[0].data[0].x[i] = t * Math.PI;
+		frames[0].data[0].y[i] = Math.sin(t * Math.PI);
+
+		// A cosine wave:
+		frames[1].data[0].x[i] = t * Math.PI;
+		frames[1].data[0].y[i] = Math.cos(t * Math.PI);
+
+		// A circle:
+		frames[2].data[0].x[i] = Math.sin(t * Math.PI);
+		frames[2].data[0].y[i] = Math.cos(t * Math.PI);
+	}
+	Plotly.addFrames(graphDiv, frames);
+
+	Plotly.deleteFrames(graphDiv, [2]);
+})();
+//////////////////////////////////////////////////////////////////////
+
 //////////////////////////////////////////////////////////////////////
 // Using events
 (async () => {
@@ -340,8 +371,70 @@ function rand() {
 		Plotly.restyle('myDiv', update);
 	});
 
+	myPlot.on('plotly_beforeplot', (event) => {
+		console.log('plotting');
+		const okToPlot = true;
+		return okToPlot;
+	});
+
 	myPlot.on('plotly_afterplot', () => {
 		console.log('done plotting');
 	});
+
+	myPlot.on('plotly_animatingframe', (event) => {
+		console.log(`animating ${event.frame.name} with ${event.animation.transition.easing}`);
+	});
+
+	myPlot.on('plotly_legendclick', (event) => {
+		console.log('clicked on legend');
+		const clickVal = true;
+		return clickVal;
+	});
+
+	myPlot.on('plotly_legenddoubleclick', (event) => {
+		console.log('dbl clicked on legend');
+		const dblClickVal = true;
+		return dblClickVal;
+	});
+
+	myPlot.on('plotly_sliderchange', (event) => {
+		console.log(`Slider at [${event.slider.x},${event.slider.y} with ${event.step.method}`);
+	});
+
+	myPlot.on('plotly_sliderstart', (event) => {
+		console.log(`Slider at [${event.slider.x},${event.slider.y}`);
+	});
+
+	myPlot.on('plotly_sliderend', (event) => {
+		console.log(`Slider at [${event.slider.x},${event.slider.y} with ${event.step.method}`);
+	});
+
+	myPlot.on('plotly_beforeexport', () => {
+		console.log('starting export');
+	});
+
+	myPlot.on('plotly_afterexport', () => {
+		console.log('done exporting');
+	});
+
+	myPlot.on('plotly_animated', () => {
+		console.log('done animation');
+	});
+
+	myPlot.on('plotly_animationinterrupted', () => {
+		console.log('animation interrupted');
+	});
+
+	myPlot.on('plotly_framework', () => {
+		console.log('framework');
+	});
+
+	myPlot.on('plotly_transitioning', () => {
+		console.log('starting transition');
+	});
+
+	myPlot.on('plotly_transitioninterrupted', () => {
+		console.log('transition interrupted');
+	});
 })();
 //////////////////////////////////////////////////////////////////////
diff --git a/types/plotly.js/test/index-tests.ts b/types/plotly.js/test/index-tests.ts
index f33886d841..d4b274b321 100644
--- a/types/plotly.js/test/index-tests.ts
+++ b/types/plotly.js/test/index-tests.ts
@@ -1,32 +1,142 @@
 import * as Plotly from 'plotly.js';
-import { ScatterData, Layout, PlotlyHTMLElement, newPlot } from 'plotly.js';
+import { Layout, PlotData, PlotlyHTMLElement, newPlot } from 'plotly.js';
 
 const graphDiv = '#test';
 
 //////////////////////////////////////////////////////////////////////
 // Plotly.newPlot
+// combination of https://plot.ly/javascript/multiple-transforms/#all-transforms and
+// https://plot.ly/javascript/2d-density-plots/
+
 (() => {
+	const testrows = [
+		{
+			country: "Afghanistan",
+			year: 2002,
+			pop: 8425333,
+			continent: "Asia",
+			lifeExp: 28.801,
+			gdpPercap: 779.4453145
+		},
+		{
+			country: "Argentina",
+			year: 2002,
+			pop: 38331121,
+			continent: "Americas",
+			lifeExp: 74.34,
+			gdpPercap: 8797.640716
+		},
+		{
+			country: "Australia",
+			year: 2002,
+			pop: 13177000,
+			continent: "Oceania",
+			lifeExp: 71.93,
+			gdpPercap: 16788.62948
+		},
+		{
+			country: "Austria",
+			year: 2002,
+			pop: 7914969,
+			continent: "Europe",
+			lifeExp: 76.04,
+			gdpPercap: 27042.01868
+		},
+		{
+			country: "Austria",
+			year: 2001,
+			pop: 7914969,
+			continent: "Europe",
+			lifeExp: 76.04,
+			gdpPercap: 27042.01868
+		},
+	];
+
+	interface DataRow {
+		[key: string]: string | number;
+	}
+
+	function unpack(rows: DataRow[], key: string) {
+		return rows.map((row: DataRow) => row[key]);
+	}
+
 	const trace1 = {
-		x: [1999, 2000, 2001, 2002],
-		y: [10, 15, 13, 17],
-		type: 'scatter'
-	} as ScatterData;
+		mode: 'markers',
+		x: unpack(testrows, 'lifeExp'),
+		y: unpack(testrows, 'gdpPercap'),
+		text: unpack(testrows, 'continent'),
+		marker: {
+			size: unpack(testrows, 'pop'),
+			sizemode: "area",
+			sizeref: 200000
+		},
+		type: 'scatter',
+		transforms: [
+			{
+				type: 'filter',
+				target: unpack(testrows, 'year'),
+				operation: '=',
+				value: '2002'
+			}, {
+				type: 'groupby',
+				nameformat: `%{group}`,
+				groups: unpack(testrows, 'continent'),
+				styles: [
+					{ target: 'Asia', value: { marker: { color: 'red' } } },
+					{ target: 'Europe', value: { marker: { color: 'blue' } } },
+					{ target: 'Americas', value: { marker: { color: 'orange' } } },
+					{ target: 'Africa', value: { marker: { color: 'green' } } },
+					{ target: 'Oceania', value: { marker: { color: 'purple' } } }
+				]
+			}, {
+				type: 'aggregate',
+				groups: unpack(testrows, 'continent'),
+				aggregations: [
+					{ target: 'x', func: 'avg' },
+					{ target: 'y', func: 'avg' },
+					{ target: 'marker.size', func: 'sum' }
+				]
+			}]
+	} as PlotData;
 	const trace2 = {
-		x: [1999, 2000, 2001, 2002],
-		y: [16, 5, 11, 9],
-		type: 'scatter'
-	} as ScatterData;
-	const data = [trace1, trace2];
+		yaxis: 'y2',
+		x: unpack(testrows, 'lifeExp'),
+		name: 'x density',
+		marker: { color: 'rgb(102,0,0)' },
+		type: 'histogram'
+	} as PlotData;
+	const trace3 = {
+		xaxis: 'x2',
+		y: unpack(testrows, 'gdpPercap'),
+		name: 'y density',
+		marker: { color: 'rgb(102,0,0)' },
+		type: 'histogram'
+	} as PlotData;
+	const data = [trace1, trace2, trace3];
 	const layout = {
-		title: 'Sales Growth',
+		title: 'Gapminder',
 		xaxis: {
-			title: 'Year',
+			title: 'Life Expectancy',
+			domain: [0, 0.85],
 			showgrid: false,
 			zeroline: false
 		},
 		yaxis: {
-			title: 'Percent',
-			showline: false
+			title: 'GDP per Cap',
+			showline: false,
+			domain: [0, 0.85],
+			showgrid: false,
+			zeroline: false
+		},
+		xaxis2: {
+			domain: [0.85, 1],
+			showgrid: false,
+			zeroline: false
+		},
+		yaxis2: {
+			domain: [0.85, 1],
+			showgrid: false,
+			zeroline: false
 		}
 	};
 	Plotly.newPlot(graphDiv, data, layout);
@@ -38,7 +148,7 @@ const graphDiv = '#test';
 		x: [1999, 2000, 2001, 2002],
 		y: [10, 9, 8, 7],
 		type: 'scatter'
-	} as ScatterData];
+	} as PlotData];
 	const layout2 = { title: 'Revenue' };
 	Plotly.newPlot(graphDiv, data2, layout2);
 })();
@@ -127,7 +237,7 @@ const graphDiv = '#test';
 	const update = {
 		title: 'some new title', // updates the title
 		'xaxis.range': [0, 5],   // updates the xaxis range
-		'yaxis.range[1]': 15     // updates the end of the yaxis range
+		'yaxis.range[1]': 15	 // updates the end of the yaxis range
 	} as Layout;
 	Plotly.relayout(graphDiv, update);
 })();
@@ -251,6 +361,37 @@ function rand() {
 })();
 //////////////////////////////////////////////////////////////////////
 
+//////////////////////////////////////////////////////////////////////
+// Plotly.addFrames + Plotly.deleteFrames as per https://plot.ly/javascript/animations/
+(() => {
+	const n = 100;
+	const frames = [
+		{name: 'sine', data: [{x: new Array<number>(100), y: new Array<number>(n)}]},
+		{name: 'cosine', data: [{x: new Array<number>(100), y: new Array<number>(n)}]},
+		{name: 'circle', data: [{x: new Array<number>(100), y: new Array<number>(n)}]},
+	];
+
+	for (let i = 0; i < n; i++) {
+		const t = i / (n - 1) * 2 - 1;
+
+		// A sine wave:
+		frames[0].data[0].x[i] = t * Math.PI;
+		frames[0].data[0].y[i] = Math.sin(t * Math.PI);
+
+		// A cosine wave:
+		frames[1].data[0].x[i] = t * Math.PI;
+		frames[1].data[0].y[i] = Math.cos(t * Math.PI);
+
+		// A circle:
+		frames[2].data[0].x[i] = Math.sin(t * Math.PI);
+		frames[2].data[0].y[i] = Math.cos(t * Math.PI);
+	}
+	Plotly.addFrames(graphDiv, frames);
+
+	Plotly.deleteFrames(graphDiv, [2]);
+})();
+//////////////////////////////////////////////////////////////////////
+
 //////////////////////////////////////////////////////////////////////
 // Using events
 (async () => {
@@ -340,8 +481,70 @@ function rand() {
 		Plotly.restyle('myDiv', update);
 	});
 
+	myPlot.on('plotly_beforeplot', (event) => {
+		console.log('plotting');
+		const okToPlot = true;
+		return okToPlot;
+	});
+
 	myPlot.on('plotly_afterplot', () => {
 		console.log('done plotting');
 	});
+
+	myPlot.on('plotly_animatingframe', (event) => {
+		console.log(`animating ${event.frame.name} with ${event.animation.transition.easing}`);
+	});
+
+	myPlot.on('plotly_legendclick', (event) => {
+		console.log('clicked on legend');
+		const clickVal = true;
+		return clickVal;
+	});
+
+	myPlot.on('plotly_legenddoubleclick', (event) => {
+		console.log('dbl clicked on legend');
+		const dblClickVal = true;
+		return dblClickVal;
+	});
+
+	myPlot.on('plotly_sliderchange', (event) => {
+		console.log(`Slider at [${event.slider.x},${event.slider.y} with ${event.step.method}`);
+	});
+
+	myPlot.on('plotly_sliderstart', (event) => {
+		console.log(`Slider at [${event.slider.x},${event.slider.y}`);
+	});
+
+	myPlot.on('plotly_sliderend', (event) => {
+		console.log(`Slider at [${event.slider.x},${event.slider.y} with ${event.step.method}`);
+	});
+
+	myPlot.on('plotly_beforeexport', () => {
+		console.log('starting export');
+	});
+
+	myPlot.on('plotly_afterexport', () => {
+		console.log('done exporting');
+	});
+
+	myPlot.on('plotly_animated', () => {
+		console.log('done animation');
+	});
+
+	myPlot.on('plotly_animationinterrupted', () => {
+		console.log('animation interrupted');
+	});
+
+	myPlot.on('plotly_framework', () => {
+		console.log('framework');
+	});
+
+	myPlot.on('plotly_transitioning', () => {
+		console.log('starting transition');
+	});
+
+	myPlot.on('plotly_transitioninterrupted', () => {
+		console.log('transition interrupted');
+	});
 })();
 //////////////////////////////////////////////////////////////////////
diff --git a/types/plotly.js/tslint.json b/types/plotly.js/tslint.json
index 993aa8344b..fe603cb969 100644
--- a/types/plotly.js/tslint.json
+++ b/types/plotly.js/tslint.json
@@ -3,6 +3,7 @@
 	"rules": {
 		// TODOs
 		"no-duplicate-imports": false,
-		"no-object-literal-type-assertion": false
+		"no-object-literal-type-assertion": false,
+		"indent": [true, "tabs", 1]
 	}
 }
diff --git a/types/pluralize/index.d.ts b/types/pluralize/index.d.ts
index 7a11a23839..14da5f38ec 100644
--- a/types/pluralize/index.d.ts
+++ b/types/pluralize/index.d.ts
@@ -1,79 +1,78 @@
 // Type definitions for pluralize
 // Project: https://www.npmjs.com/package/pluralize
 // Definitions by: Syu Kato <https://github.com/ukyo>
+//                 Karol Majewski <https://github.com/karol-majewski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-interface PluralizeStatic {
-    /**
-     * Pluralize or singularize a word based on the passed in count.
-     *
-     * @param word
-     * @param count
-     * @param inclusive
-     */
-    (word: string, count?: number, inclusive?: boolean): string;
+/**
+ * Pluralize or singularize a word based on the passed in count.
+ *
+ * @param word
+ * @param count
+ * @param inclusive
+ */
+declare function pluralize(word: string, count?: number, inclusive?: boolean): string;
 
-    /**
-     * Pluralize a word based.
-     *
-     * @param word
-     */
-    plural(word: string): string;
+declare namespace pluralize {
+  /**
+   * Pluralize a word based.
+   *
+   * @param word
+   */
+  function plural(word: string): string;
 
-    /**
-     * Singularize a word based.
-     *
-     * @param word
-     */
-    singular(word: string): string;
+  /**
+   * Singularize a word based.
+   *
+   * @param word
+   */
+  function singular(word: string): string;
 
-    /**
-     * Add a pluralization rule to the collection.
-     *
-     * @param rule
-     * @param replacement
-     */
-    addPluralRule(rule: string|RegExp, replacemant: string): void;
+  /**
+   * Add a pluralization rule to the collection.
+   *
+   * @param rule
+   * @param replacement
+   */
+  function addPluralRule(rule: string | RegExp, replacemant: string): void;
 
-    /**
-     * Add a singularization rule to the collection.
-     *
-     * @param rule
-     * @param replacement
-     */
-    addSingularRule(rule: string|RegExp, replacemant: string): void;
+  /**
+   * Add a singularization rule to the collection.
+   *
+   * @param rule
+   * @param replacement
+   */
+  function addSingularRule(rule: string | RegExp, replacemant: string): void;
 
-    /**
-     * Add an irregular word definition.
-     *
-     * @param single
-     * @param plural
-     */
-    addIrregularRule(single: string, plural: string): void;
+  /**
+   * Add an irregular word definition.
+   *
+   * @param single
+   * @param plural
+   */
+  function addIrregularRule(single: string, plural: string): void;
 
-    /**
-     * Add an uncountable word rule.
-     *
-     * @param word
-     */
-    addUncountableRule(word: string|RegExp): void;
+  /**
+   * Add an uncountable word rule.
+   *
+   * @param word
+   */
+  function addUncountableRule(word: string | RegExp): void;
 
-    /**
-     * Test if provided word is plural.
-     *
-     * @param word
-     */
-    isPlural(word: string): boolean;
+  /**
+   * Test if provided word is plural.
+   *
+   * @param word
+   */
+  function isPlural(word: string): boolean;
 
-    /**
-     * Test if provided word is singular.
-     *
-     * @param word
-     */
-    isSingular(word: string): boolean;
+  /**
+   * Test if provided word is singular.
+   *
+   * @param word
+   */
+  function isSingular(word: string): boolean;
 }
 
-declare module "pluralize" {
-    export = pluralize;
-}
-declare var pluralize: PluralizeStatic;
+export = pluralize;
+export as namespace pluralize;
diff --git a/types/png.js/index.d.ts b/types/png.js/index.d.ts
new file mode 100644
index 0000000000..a7d05fd837
--- /dev/null
+++ b/types/png.js/index.d.ts
@@ -0,0 +1,58 @@
+// Type definitions for png.js 0.2
+// Project: https://github.com/arian/pngjs
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+type BitDepth = 2 | 4 | 8 | 16;
+type ColorType = 0 | 2 | 3 | 4 | 6;
+type ParseCallback = (err: Error | undefined, png: PNG) => void;
+
+interface ParseOptions {
+    data?: boolean;
+}
+
+declare class PNGReader {
+    bytes: Uint8Array | number[] | Buffer;
+    dataChunks: number[][];
+    i: number;
+    png: PNG;
+
+    constructor(bytes: Uint8Array | string | Buffer | ArrayBuffer);
+    parse(callback: ParseCallback): void;
+    parse(options: ParseOptions, callback: ParseCallback): void;
+}
+
+declare class PNG {
+    alpha: boolean;
+    bitDepth: BitDepth;
+    colors: number;
+    colorType: ColorType;
+    compressionMethod: 0;
+    filterMethod: 0;
+    height: number;
+    interlaceMethod: 0 | 1;
+    palette: number[] | null;
+    pixelBits: number;
+    pixels: Buffer | null;
+    width: number;
+
+    getBitDepth(): BitDepth;
+    getColorType(): ColorType;
+    getCompressionMethod(): 0;
+    getFilterMethod(): 0;
+    getHeight(): number;
+    getInterlaceMethod(): 0 | 1;
+    getPalette(): number[];
+    getPixel(x: number, y: number): [number, number, number, number];
+    getWidth(): number;
+    setBitDepth(bitDepth: BitDepth): void;
+    setColorType(colorType: ColorType): void;
+    setCompressionMethod(compressionMethod: 0): void;
+    setFilterMethod(filterMethod: 0): void;
+    setHeight(height: number): void;
+    setInterlaceMethod(interlaceMethod: 0 | 1): void;
+    setPalette(palette: number[]): void;
+    setWidth(width: number): void;
+}
+
+export = PNGReader;
diff --git a/types/png.js/png.js-tests.ts b/types/png.js/png.js-tests.ts
new file mode 100644
index 0000000000..86cc504a75
--- /dev/null
+++ b/types/png.js/png.js-tests.ts
@@ -0,0 +1,37 @@
+/// <reference types="node" />
+
+import PNGReader = require('png.js');
+
+const buffer = new Buffer([]);
+const reader1 = new PNGReader(buffer);
+
+reader1.parse((err, png) => {
+  if (err) throw err;
+
+	png.getWidth();
+  png.getHeight();
+  png.getPixel(1, 0)[0];
+  png.getBitDepth();
+  png.getColorType();
+  png.getCompressionMethod();
+  png.getFilterMethod();
+  png.getInterlaceMethod();
+  png.getPalette();
+});
+
+const bytes = new Uint8Array(0);
+const reader2 = new PNGReader(bytes);
+
+reader2.parse({data: false}, (err, png) => {
+  if (err) throw err;
+
+	png.getWidth();
+  png.getHeight();
+  png.getPixel(1, 0)[2];
+  png.getBitDepth();
+  png.getColorType();
+  png.getCompressionMethod();
+  png.getFilterMethod();
+  png.getInterlaceMethod();
+  png.getPalette();
+});
diff --git a/types/png.js/tsconfig.json b/types/png.js/tsconfig.json
new file mode 100644
index 0000000000..595988b23f
--- /dev/null
+++ b/types/png.js/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",
+        "png.js-tests.ts"
+    ]
+}
diff --git a/types/png.js/tslint.json b/types/png.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/png.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/pngjs/index.d.ts b/types/pngjs/index.d.ts
index d5476e9e1f..f5ac2e6d2a 100644
--- a/types/pngjs/index.d.ts
+++ b/types/pngjs/index.d.ts
@@ -85,7 +85,7 @@ export interface PackerOptions {
 
 export type PNGOptions = BaseOptions & ParserOptions & PackerOptions;
 
-export type ColorType = 0 | 1 | 2 | 4;
+export type ColorType = 0 | 2 | 4 | 6;
 
 export interface Metadata {
 	width: number;
diff --git a/types/polyfill-service/index.d.ts b/types/polyfill-service/index.d.ts
new file mode 100644
index 0000000000..da4418f8cf
--- /dev/null
+++ b/types/polyfill-service/index.d.ts
@@ -0,0 +1,42 @@
+// Type definitions for polyfill-service 3.25
+// Project: https://github.com/financial-times/polyfill-service#readme
+// Definitions by: Arturas Molcanovas <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export type PolyfillFlag = 'gated' | 'always';
+export type Unknown = 'polyfill' | 'ignore';
+
+export interface Feature {
+    flags?: PolyfillFlag[];
+}
+
+export interface Features {
+    [feature: string]: Feature;
+}
+
+export interface GetPolyfillsOptions {
+    uaString: string;
+    features?: Features;
+    excludes?: string[];
+}
+
+export interface GetPolyfillStringOptions extends GetPolyfillsOptions {
+    minify?: boolean;
+    unknown?: Unknown;
+}
+
+export interface PolyfillSpec {
+    aliasOf?: Set<string>;
+    flags: Set<PolyfillFlag>;
+}
+
+export interface GetPolyfillsResponse {
+    [name: string]: PolyfillSpec;
+}
+
+export function listAllPolyfills(): Promise<ReadonlyArray<string>>;
+
+export function getPolyfillString(options: GetPolyfillStringOptions): Promise<string>;
+
+export function getPolyfills(options: GetPolyfillsOptions): Promise<GetPolyfillsResponse>;
diff --git a/types/polyfill-service/polyfill-service-tests.ts b/types/polyfill-service/polyfill-service-tests.ts
new file mode 100644
index 0000000000..b74bfbd7f7
--- /dev/null
+++ b/types/polyfill-service/polyfill-service-tests.ts
@@ -0,0 +1,43 @@
+import * as svc from 'polyfill-service';
+
+const o: svc.GetPolyfillsOptions = {
+    uaString: ''
+};
+
+o.excludes = ['foo'];
+o.features = {
+    foo: {},
+    bar: {flags: ['gated', 'always']}
+};
+
+const o2: svc.GetPolyfillStringOptions = {
+    uaString: ''
+};
+
+o2.excludes = ['foo'];
+o2.features = {
+    foo: {},
+    bar: {flags: ['gated', 'always']}
+};
+o2.minify = true;
+o2.minify = false;
+o2.unknown = 'polyfill';
+o2.unknown = 'ignore';
+
+svc.listAllPolyfills().then(v => {
+    v[0].toLocaleLowerCase();
+});
+
+svc.getPolyfillString(o2).then(s => {
+    s.toLocaleUpperCase();
+});
+
+svc.getPolyfills(o).then(r => {
+    const p = r.Symbol;
+    p.flags.clear();
+
+    const a = p.aliasOf;
+    if (a) {
+        a.clear();
+    }
+});
diff --git a/types/polyfill-service/tsconfig.json b/types/polyfill-service/tsconfig.json
new file mode 100644
index 0000000000..c2c1abf8c0
--- /dev/null
+++ b/types/polyfill-service/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",
+        "polyfill-service-tests.ts"
+    ]
+}
diff --git a/types/polyfill-service/tslint.json b/types/polyfill-service/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/polyfill-service/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/polymer-ts/index.d.ts b/types/polymer-ts/index.d.ts
index bf7daf936f..7ab10afa47 100644
--- a/types/polymer-ts/index.d.ts
+++ b/types/polymer-ts/index.d.ts
@@ -58,7 +58,7 @@ declare namespace polymer {
         setScrollDirection(direction: string, node: HTMLElement): void;
         shift(path: string, value: any): any;
         splice(path: string, start: number, deleteCount: number, ...items: any[]): any;
-        toggleAttribute(name: string, bool: boolean, node?: HTMLElement): void;
+        toggleAttribute(name: string, force?: boolean, node?: HTMLElement): boolean;
         toggleClass(name: string, bool: boolean, node?: HTMLElement): void;
         transform(transform: string, node?: HTMLElement): void;
         translate3d(x: any, y: any, z: any, node?: HTMLElement): void;
diff --git a/types/polymer/index.d.ts b/types/polymer/index.d.ts
index 569842066a..1b67f4c6d5 100644
--- a/types/polymer/index.d.ts
+++ b/types/polymer/index.d.ts
@@ -263,7 +263,7 @@ declare global {
       setAttribute(name: string, value: any):void;
 
       removeAttribute(name: string):void;
-        
+
       observeNodes(callback: (info: ObservedNodeInfo) => void): {};
 
       unobserveNodes(observer: {}): void;
@@ -340,6 +340,12 @@ declare global {
       whenLoaded(cb: Function): void;
     }
 
+    interface Templatizer {
+      templatize(template: HTMLTemplateElement, mutableData?: boolean): void;
+      stamp(model: {}): Base;
+      modelForElement: (elem: HTMLElement) => Base;
+    }
+
     interface PolymerStatic {
       Settings: Settings;
 
@@ -351,12 +357,14 @@ declare global {
 
       Class(prototype: Base | { new (): Base }): CustomElementConstructor;
 
-      RenderStatus: RenderStatus
+      RenderStatus: RenderStatus;
 
       ArraySplice: ArraySplice;
 
       /** @deprecated */
-      ImportStatus: ImportStatus
+      ImportStatus: ImportStatus;
+
+      Templatizer: Templatizer;
     }
   }
 
diff --git a/types/polymer/polymer-tests.ts b/types/polymer/polymer-tests.ts
index 2b6631ffb7..ce55ac325d 100644
--- a/types/polymer/polymer-tests.ts
+++ b/types/polymer/polymer-tests.ts
@@ -1,6 +1,8 @@
 Polymer({
   is: "my-element",
 
+  behaviors: [Polymer.Templatizer],
+
   properties: {
     prop1: String,
     prop2: {
@@ -24,6 +26,11 @@ Polymer({
   },
 
   ready: function () {
+    const template = Polymer.dom(this).querySelector('template');
+    if (template) {
+      this.templatize(template);
+      const instance = this.stamp({item: {}});
+    }
     this.textContent = 'My element!';
     this.$.name.textContent = this.name;
     this.serialize({});
diff --git a/types/postmark/index.d.ts b/types/postmark/index.d.ts
index 8a054e17e0..24810299a7 100644
--- a/types/postmark/index.d.ts
+++ b/types/postmark/index.d.ts
@@ -1,216 +1,668 @@
-// Type definitions for postmark 1.3
+// Type definitions for postmark 1.4
 // Project: http://wildbit.github.io/postmark.js
 // Definitions by: Ben Bayard <https://github.com/benbayard>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-interface PostmarkError {
-    status: number;
-    message: string;
-    code: number;
-}
-
-interface PostmarkMessageHeader {
-    Name: string;
-    Value: string;
-}
-
-interface PostmarkAttachment {
-    Content: string;
-    Name: string;
-    ContentType: string;
-}
-
-interface Filter {
-    count: number;
-    offset: number;
-}
-
-interface PostmarkMessageWithTemplate {
-    To: string;
-    From: string;
-    Cc?: string;
-    Bcc?: string;
-    ReplyTo?: string;
-    TemplateId?: string;
-    TemplateModel?: any;
-    Tag?: string;
-    Subject?: string;
-    TrackOpens?: boolean;
-    TrackLinks?: string;
-    Headers?: PostmarkMessageHeader[];
-}
-
-interface PostmarkMessage {
-    To: string;
-    From: string;
-    Cc?: string;
-    Bcc?: string;
-    ReplyTo?: string;
-    Tag?: string;
-    Subject?: string;
-    HTMLBody?: string;
-    TextBody?: string;
-    TrackOpens?: boolean;
-    TrackLinks?: string;
-    Headers?: PostmarkMessageHeader[];
-    Attachments?: PostmarkAttachment[];
-}
-
-interface Sender {
-    Color: string;
-    RawEmailEnabled: boolean;
-    SmtpApiActivated: boolean;
-    DeliveryHookUrl: string;
-    InboundHookUrl: string;
-    BounceHookUrl: boolean;
-    IncludeBounceContentInHook: boolean;
-    OpenHookUrl: boolean;
-    PostFirstOpenOnly: boolean;
-    TrackOpens: boolean;
-    TrackLinks: string;
-    InboundDomain: string;
-    InboundSpamThreshold: number;
-}
-
-interface TemplateValidator<T extends object> {
-    Subject: string;
-    HtmlBody: string;
-    TextBody: string;
-    TestRenderModel?: T;
-    InlineCssForHtmlTestRender?: boolean;
-}
-
-type PostmarkCallback<T extends object = any> = ((e: PostmarkError, ret: T) => void) | undefined;
-
-interface SimpleOptions {
-    ssl: boolean;
-    requestHost: string;
-}
-
-interface Options extends SimpleOptions {
-    requestFactory(
-        options: SimpleOptions
-    ): (
-        path?: string,
-        type?: string,
-        content?: PostmarkMessage,
-        callback?: PostmarkCallback
-    ) => any;
-}
-
-declare class Client {
-    constructor(serverKey: string, options?: Partial<Options>);
-    send(message: PostmarkMessage, callback: PostmarkCallback): void;
-    sendEmailWithTemplate(
-        message: PostmarkMessageWithTemplate,
-        callback: PostmarkCallback
-    ): void;
-    batch(message: PostmarkMessage[], callback: PostmarkCallback): void;
-    sendEmail(message: PostmarkMessage, callback: PostmarkCallback): void;
-    sendEmailBatch(message: PostmarkMessage[], callback: PostmarkCallback): void;
-    getDeliveryStatistics(callback: PostmarkCallback): void;
-    getBounces(filter: Partial<Filter>, callback: PostmarkCallback): void;
-    getBounce(id: number, callback: PostmarkCallback): void;
-    getBounceDump(id: number, callback: PostmarkCallback): void;
-    activateBounce(id: number, callback: PostmarkCallback): void;
-    getBounceTags(callback: PostmarkCallback): void;
-    getServer(callback: PostmarkCallback): void;
-    editServer<T extends keyof Sender>(options: Pick<Sender, T>, callback: PostmarkCallback): void;
-    getOutboundMessages(filter: Partial<Filter>, callback: PostmarkCallback): void;
-    getOutboundMessageDetails(id: number, callback: PostmarkCallback): void;
-    getMessageOpens(filter: Partial<Filter>, callback: PostmarkCallback): void;
-    getMessageOpensForSingleMessage(id: number, filter: Partial<Filter>, callback: PostmarkCallback): void;
-    getInboundMessages(filter: Partial<Filter>, callback: PostmarkCallback): void;
-    getInboundMessageDetails(id: number, callback: PostmarkCallback): void;
-    bypassBlockedInboundMessage(id: number, callback: PostmarkCallback): void;
-    retryInboundHookForMessage(id: number, callback: PostmarkCallback): void;
-    getOuboundOverview(filter: Partial<Filter>, callback: PostmarkCallback): void;
-    validateTemplate<T extends object>(templateObject: TemplateValidator<T>, callback: PostmarkCallback): void;
-}
-
-interface CreateSignature {
-    FromEmail: string;
-    Name: string;
-    ReplyToEmail?: string;
-    ReturnPathDomain?: string;
-}
-
-interface CreateServer {
-    Name: string;
-    Color?: string;
-    RawEmailEnabled?: boolean;
-    SmtpApiActivated?: boolean;
-    DeliveryHookUrl?: string;
-    InboundHookUrl?: string;
-    BounceHookUrl?: string;
-    IncludeBounceContentInHook?: boolean;
-    OpenHookUrl?: string;
-    PostFirstOpenOnly?: boolean;
-    TrackOpens?: boolean;
-    TrackLinks?: string;
-    InboundDomain?: string;
-    InboundSpamThreshold?: number;
-}
-
-interface CreateDomain {
-    Name: string;
-    ReturnPathDomain?: string;
-}
-
-declare class AdminClient {
-    constructor(apiKey: string, options: Partial<Options>);
-    listSenderSignatures(query: Partial<Filter>, callback: PostmarkCallback): void;
-    createSenderSignature(options: CreateSignature, callback: PostmarkCallback): void;
-    editSenderSignature<T extends keyof CreateSignature>(
-        id: number,
-        options: Partial<Pick<CreateSignature, T>>,
-        callback: PostmarkCallback
-    ): void;
-    deleteSenderSignature(id: number, callback: PostmarkCallback): void;
-    resendSenderSignatureConfirmation(id: number, callback: PostmarkCallback): void;
-    verifySenderSignatureSPF(id: number, callback: PostmarkCallback): void;
-    requestNewDKIMForSenderSignature(id: number, callback: PostmarkCallback): void;
-    getServer(id: number, callback: PostmarkCallback): void;
-    createServer(options: CreateServer, callback: PostmarkCallback): void;
-    editServer<T extends keyof CreateServer>(
-        id: number,
-        options: Pick<CreateServer, T>,
-        callback: PostmarkCallback
-    ): void;
-    deleteServer(id: number, callback: PostmarkCallback): void;
-    listServers(query: Partial<Filter>, callback: PostmarkCallback): void;
-    listDomains(query: Partial<Filter>, callback: PostmarkCallback): void;
-    getDomain(id: number, callback: PostmarkCallback): void;
-    createDomain(
-        options: CreateDomain,
-        callback: PostmarkCallback
-    ): void;
-    editDomain<T extends keyof CreateDomain>(
-        id: number,
-        options: Pick<CreateDomain, T>,
-        callback: PostmarkCallback
-    ): void;
-    deleteDomain(id: number, callback: PostmarkCallback): void;
-    verifyDomainSPF(id: number, callback: PostmarkCallback): void;
-    rotateDKIMForDomain(id: number, callback: PostmarkCallback): void;
-}
-
-interface ClientClass {
-    new(serverKey: string, options: Partial<Options>): Client;
-}
-
-interface AdminClientClass {
-    new(apiKey: string, options: Partial<Options>): AdminClient;
-}
-
-interface Postmark {
-    (apiKey: string, options: Partial<Options>): void;
-    defaults: Options;
-    Client: ClientClass;
-    AdminClient: AdminClientClass;
-}
-
-declare var postmark: Postmark;
+// TypeScript Version: 2.4
 
 export = postmark;
+
+declare const postmark: Postmark.Postmark;
+declare namespace Postmark {
+    const defaults: Options;
+
+    interface PostmarkError {
+        status: number;
+        message: string;
+        code: number;
+    }
+
+    interface PostmarkMessageHeader {
+        Name: string;
+        Value: string;
+    }
+
+    interface PostmarkAttachment {
+        Content: string;
+        Name: string;
+        ContentType: string;
+    }
+
+    interface Filter {
+        count?: number;
+        offset?: number;
+    }
+
+    interface PostmarkMessageWithTemplate {
+        To: string;
+        From: string;
+        Cc?: string;
+        Bcc?: string;
+        ReplyTo?: string;
+        TemplateId?: string;
+        TemplateModel?: any;
+        Tag?: string;
+        Subject?: string;
+        TrackOpens?: boolean;
+        TrackLinks?: string;
+        Headers?: PostmarkMessageHeader[];
+    }
+
+    interface PostmarkMessage {
+        To: string;
+        From: string;
+        Cc?: string;
+        Bcc?: string;
+        ReplyTo?: string;
+        Tag?: string;
+        Subject?: string;
+        HTMLBody?: string;
+        TextBody?: string;
+        TrackOpens?: boolean;
+        TrackLinks?: string;
+        Headers?: PostmarkMessageHeader[];
+        Attachments?: PostmarkAttachment[];
+    }
+
+    interface Sender {
+        Color: string;
+        RawEmailEnabled: boolean;
+        SmtpApiActivated: boolean;
+        DeliveryHookUrl: string;
+        InboundHookUrl: string;
+        BounceHookUrl: boolean;
+        IncludeBounceContentInHook: boolean;
+        OpenHookUrl: boolean;
+        PostFirstOpenOnly: boolean;
+        TrackOpens: boolean;
+        TrackLinks: string;
+        InboundDomain: string;
+        InboundSpamThreshold: number;
+    }
+
+    interface TemplateValidator<T extends object> {
+        Subject: string;
+        HtmlBody: string;
+        TextBody: string;
+        TestRenderModel?: T;
+        InlineCssForHtmlTestRender?: boolean;
+    }
+
+    type PostmarkCallback<T extends object = any> = ((e: PostmarkError, ret: T) => undefined) | undefined;
+
+    interface SimpleOptions {
+        ssl: boolean;
+        requestHost: string;
+    }
+
+    interface Options extends SimpleOptions {
+        requestFactory(
+            options: SimpleOptions
+        ): (
+            path?: string,
+            type?: string,
+            content?: PostmarkMessage,
+            callback?: PostmarkCallback
+        ) => any;
+    }
+
+    class Client {
+        constructor(serverKey: string, options?: Partial<Options>);
+
+        send(message: PostmarkMessage): Promise<SendStatus>;
+        send(message: PostmarkMessage, callback: PostmarkCallback<SendStatus>): undefined;
+
+        sendEmailWithTemplate(message: PostmarkMessageWithTemplate): Promise<SendStatus>;
+        sendEmailWithTemplate(message: PostmarkMessageWithTemplate, callback: PostmarkCallback<SendStatus>): undefined;
+
+        batch(message: PostmarkMessage[]): Promise<SendStatus[]>;
+        batch(message: PostmarkMessage[], callback: PostmarkCallback<SendStatus[]>): undefined;
+
+        sendEmail(message: PostmarkMessage): Promise<SendStatus>;
+        sendEmail(message: PostmarkMessage, callback: PostmarkCallback<SendStatus>): undefined;
+
+        sendEmailBatch(message: PostmarkMessage[]): Promise<SendStatus[]>;
+        sendEmailBatch(message: PostmarkMessage[], callback: PostmarkCallback<SendStatus[]>): undefined;
+
+        // stats
+        getDeliveryStatistics(): Promise<DeliveryStats>;
+        getDeliveryStatistics(callback: PostmarkCallback<DeliveryStats>): undefined;
+
+        // bounces
+        getBounces(filter: BounceFilter): Promise<BouncesResult>;
+        getBounces(filter: BounceFilter, callback?: PostmarkCallback<BouncesResult>): undefined;
+
+        getBounce(id: number): Promise<Bounce>;
+        getBounce(id: number, callback?: PostmarkCallback<Bounce>): undefined;
+
+        getBounceDump(id: number): Promise<BounceDump>;
+        getBounceDump(id: number, callback?: PostmarkCallback<BounceDump>): undefined;
+
+        activateBounce(id: number): Promise<ActivatedBounceResult>;
+        activateBounce(id: number, callback?: PostmarkCallback<ActivatedBounceResult>): undefined;
+
+        getBounceTags(): Promise<string[]>;
+        getBounceTags(callback?: PostmarkCallback<string[]>): undefined;
+
+        // server
+        getServer(): Promise<Server>;
+        getServer(callback?: PostmarkCallback<Server>): undefined;
+
+        editServer(server: Partial<Server>): Promise<Server>;
+        editServer(server: Partial<Server>, callback?: PostmarkCallback<Server>): undefined;
+
+        // message info
+        getOutboundMessages(filter: OutboundMessageFilter): Promise<OutboundMessagesResult>;
+        getOutboundMessages(filter: OutboundMessageFilter, callback?: PostmarkCallback<OutboundMessagesResult>): undefined;
+
+        getOutboundMessageDetails(id: number): Promise<OutboundMessage>;
+        getOutboundMessageDetails(id: number, callback?: PostmarkCallback<OutboundMessage>): undefined;
+
+        getMessageOpens(filter: OpenMessageFilter): Promise<MessageOpensResult>;
+        getMessageOpens(filter: OpenMessageFilter, callback?: PostmarkCallback<MessageOpensResult>): undefined;
+
+        getMessageOpensForSingleMessage(id: number, filter: Filter): Promise<MessageOpensResult>;
+        getMessageOpensForSingleMessage(id: number, filter: Filter, callback?: PostmarkCallback<MessageOpensResult>): undefined;
+
+        getInboundMessages(filter: InboundMessageFilter): Promise<InboundMessagesResult>;
+        getInboundMessages(filter: InboundMessageFilter, callback?: PostmarkCallback<InboundMessagesResult>): undefined;
+
+        getInboundMessageDetails(id: number): Promise<InboundMessage>;
+        getInboundMessageDetails(id: number, callback?: PostmarkCallback<InboundMessage>): undefined;
+
+        bypassBlockedInboundMessage(id: number): Promise<GenericResult>;
+        bypassBlockedInboundMessage(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        getOuboundOverview(filter: BaseFilter): Promise<OutboundOverview>;
+        getOuboundOverview(filter: BaseFilter, callback?: PostmarkCallback<OutboundOverview>): undefined;
+
+        retryInboundHookForMessage(id: number): Promise<GenericResult>;
+        retryInboundHookForMessage(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        // templates
+        getTemplate(id: number): Promise<Template>;
+        getTemplate(id: number, callback?: PostmarkCallback<Template>): undefined;
+
+        createTemplate(template: Partial<Template>): Promise<TemplateBase>;
+        createTemplate(template: Partial<Template>, callback?: PostmarkCallback<TemplateBase>): undefined;
+
+        editTemplate(template: Partial<Template>): Promise<TemplateBase>;
+        editTemplate(template: Partial<Template>, callback?: PostmarkCallback<TemplateBase>): undefined;
+
+        getTemplates(filter: Filter): Promise<TemplatesResult>;
+        getTemplates(filter: Filter, callback?: PostmarkCallback<TemplatesResult>): undefined;
+
+        deleteTemplate(id: number): Promise<GenericResult>;
+        deleteTemplate(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        validateTemplate<T extends object>(templateObject: TemplateValidator<T>): Promise<TemplateValidationResult<T>>;
+        validateTemplate<T extends object>(templateObject: TemplateValidator<T>, callback?: PostmarkCallback<TemplateValidationResult<T>>): undefined;
+    }
+
+    interface CreateSignature extends UpdateSignature {
+        FromEmail: string;
+    }
+
+    interface CreateServer {
+        Name: string;
+        Color?: string;
+        RawEmailEnabled?: boolean;
+        SmtpApiActivated?: boolean;
+        DeliveryHookUrl?: string;
+        InboundHookUrl?: string;
+        BounceHookUrl?: string;
+        IncludeBounceContentInHook?: boolean;
+        OpenHookUrl?: string;
+        PostFirstOpenOnly?: boolean;
+        TrackOpens?: boolean;
+        TrackLinks?: string;
+        InboundDomain?: string;
+        InboundSpamThreshold?: number;
+    }
+
+    interface CreateDomain {
+        Name: string;
+        ReturnPathDomain?: string;
+    }
+
+    class AdminClient {
+        constructor(apiKey: string, options: Partial<Options>);
+        listSenderSignatures(query: Filter): Promise<SenderSignaturesResults>;
+        listSenderSignatures(query: Filter, callback?: PostmarkCallback<SenderSignaturesResults>): undefined;
+
+        createSenderSignature(options: CreateSignature): Promise<SenderSignature>;
+        createSenderSignature(options: CreateSignature, callback?: PostmarkCallback<SenderSignature>): undefined;
+
+        editSenderSignature(id: number, options: UpdateSignature): Promise<SenderSignature>;
+        editSenderSignature(id: number, options: UpdateSignature, callback?: PostmarkCallback<SenderSignature>): undefined;
+
+        deleteSenderSignature(id: number): Promise<GenericResult>;
+        deleteSenderSignature(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        resendSenderSignatureConfirmation(id: number): Promise<GenericResult>;
+        resendSenderSignatureConfirmation(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        verifySenderSignatureSPF(id: number): Promise<SenderSignature>;
+        verifySenderSignatureSPF(id: number, callback?: PostmarkCallback<SenderSignature>): undefined;
+
+        requestNewDKIMForSenderSignature(id: number): Promise<GenericResult>;
+        requestNewDKIMForSenderSignature(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        // servers
+        getServer(id: number): Promise<Server>;
+        getServer(id: number, callback?: PostmarkCallback<Server>): undefined;
+
+        createServer(options: CreateServer): Promise<Server>;
+        createServer(options: CreateServer, callback?: PostmarkCallback<Server>): undefined;
+
+        editServer(id: number, options: Partial<CreateServer>): Promise<Server>;
+        editServer(id: number, options: Partial<CreateServer>, callback?: PostmarkCallback<Server>): undefined;
+
+        deleteServer(id: number): Promise<GenericResult>;
+        deleteServer(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        listServers(query: ServerFilter): Promise<ServersResult>;
+        listServers(query: ServerFilter, callback?: PostmarkCallback<ServersResult>): undefined;
+
+        // domains
+        listDomains(query: Filter): Promise<DomainsResult>;
+        listDomains(query: Filter, callback?: PostmarkCallback<DomainsResult>): undefined;
+
+        getDomain(id: number): Promise<Domain>;
+        getDomain(id: number, callback?: PostmarkCallback<Domain>): undefined;
+
+        createDomain(options: CreateDomain): Promise<Domain>;
+        createDomain(options: CreateDomain, callback?: PostmarkCallback<Domain>): undefined;
+
+        editDomain(id: number, options: Partial<CreateDomain>): Promise<Domain>;
+        editDomain(id: number, options: Partial<CreateDomain>, callback?: PostmarkCallback<Domain>): undefined;
+
+        deleteDomain(id: number): Promise<GenericResult>;
+        deleteDomain(id: number, callback?: PostmarkCallback<GenericResult>): undefined;
+
+        verifyDomainSPF(id: number): Promise<SenderSignature>;
+        verifyDomainSPF(id: number, callback?: PostmarkCallback<SenderSignature>): undefined;
+
+        rotateDKIMForDomain(id: number): Promise<RotateDKIMResult>;
+        rotateDKIMForDomain(id: number, callback?: PostmarkCallback<RotateDKIMResult>): undefined;
+    }
+
+    interface ClientClass {
+        new(serverKey: string, options: Partial<Options>): Client;
+    }
+
+    interface AdminClientClass {
+        new(apiKey: string, options: Partial<Options>): AdminClient;
+    }
+
+    interface Postmark {
+        (apiKey: string, options: Partial<Options>): Client;
+        defaults: Options;
+        Client: ClientClass;
+        AdminClient: AdminClientClass;
+    }
+
+    // server
+    interface Server extends Sender {
+        ID: number;
+        ApiTokens: string[];
+        ServerLink: string;
+        Name: string;
+    }
+
+    interface SendStatus {
+        To: string;
+        SubmittedAt: string;
+        MessageID: string;
+        ErrorCode: number;
+        Message: string;
+    }
+
+    // validation
+    interface ValidationError {
+        Message: string;
+        Line: number;
+        CharacterPosition: number;
+    }
+
+    interface ValidationSet {
+        ContentIsValid: boolean;
+        ValidationErrors: ValidationError[];
+        RenderedContent: string;
+    }
+
+    interface TemplateValidator<T extends object> {
+        Subject: string;
+        HtmlBody: string;
+        TextBody: string;
+        TestRenderModel?: T;
+        InlineCssForHtmlTestRender?: boolean;
+    }
+
+    // templates
+    interface TemplateBase {
+        Name: string;
+        TemplateId: number;
+        Active: boolean;
+    }
+
+    interface Template extends TemplateBase {
+        Subject: string;
+        HtmlBody: string;
+        TextBody: string;
+        AssociatedServerId: number;
+    }
+
+    // filters
+    interface BaseFilter extends Filter {
+        tag?: string;
+        todate?: string;
+        fromdate?: string;
+    }
+    interface BounceFilter extends BaseFilter {
+        type?: string;
+        inactive?: boolean;
+        emailFilter?: string;
+        messageID?: string;
+    }
+
+    interface OutboundMessageFilter extends BaseFilter {
+        recipient?: string;
+        fromemail?: string;
+        status?: string;
+    }
+
+    interface InboundMessageFilter extends OutboundMessageFilter {
+        mailboxhash?: string;
+        subject?: string;
+    }
+
+    interface OpenMessageFilter extends BaseFilter {
+        client_name?: string;
+        client_company?: string;
+        client_family?: string;
+        os_name?: string;
+        os_family?: string;
+        os_company?: string;
+        platform?: string;
+        region?: string;
+        city?: string;
+    }
+
+    interface ServerFilter extends Filter {
+        name?: string;
+    }
+
+    // bounces
+    interface Bounce {
+        ID: number;
+        Type: string;
+        TypeCode: number;
+        Name: string;
+        Tag: string;
+        MessageID: string;
+        ServerID: number;
+        Description: string;
+        Details: string;
+        Email: string;
+        From: string;
+        Subject: string;
+        BouncedAt: string;
+        DumpAvailable: boolean;
+        Inactive: boolean;
+        CanActivate: boolean;
+        Content: string;
+    }
+
+    interface BounceDump {
+        Body: string;
+    }
+
+    // tracking info
+    interface VendorTrackingInfo {
+        Name: string;
+        Company: string;
+        Family: string;
+    }
+
+    interface GeoTrackingInfo {
+        CountryISOCode: string;
+        Country: string;
+        RegionISOCode: string;
+        Region: string;
+        City: string;
+        Zip: string;
+        Coords: string;
+        IP: string;
+    }
+
+    interface BounceStats {
+        Name: string;
+        Count: number;
+        Type: string | undefined;
+    }
+
+    interface DeliveryStats {
+        InactiveMails: number;
+        Bounces: BounceStats[];
+    }
+
+    interface MessageOpens {
+        FirstOpen: boolean;
+        Client: VendorTrackingInfo;
+        OS: VendorTrackingInfo;
+        Platform: string;
+        UserAgent: string;
+        ReadSeconds: number;
+        Geo: GeoTrackingInfo;
+        MessageID: string;
+        ReceivedAt: string;
+        Tag: string;
+        Recipient: string;
+    }
+
+    interface ExpandedEmail {
+        Email: string;
+        Name: string;
+    }
+
+    // message events
+    interface MessageEvents {
+        Recipient: string;
+        Type: string;
+        ReceivedAt: string;
+        Details: MessageEventDetails;
+    }
+
+    interface MessageEventDetails {
+        Summary?: string;
+        BounceID?: string;
+        Link?: string;
+        ClickLocation?: string;
+        DeliveryMessage?: string;
+        DestinationServer?: string;
+        DestinationIP?: string;
+    }
+
+    // messages
+    interface MessageBase {
+        Tag: string;
+        MessageID: string;
+        From: string;
+        Cc: string;
+        Subject: string;
+        Status: string;
+        Attachments: PostmarkAttachment[];
+    }
+
+    interface OutboundMessageBase extends MessageBase {
+        To: ExpandedEmail[];
+        Recipients: string[];
+        ReceivedAt: string;
+        TrackOpens: boolean;
+        TrackLinks: string;
+    }
+
+    interface OutboundMessage extends OutboundMessageBase {
+        TextBody: string;
+        HtmlBody: string;
+        Body: string;
+        MessageEvents: MessageEvents[];
+    }
+
+    interface InboundMessageBase extends MessageBase {
+        FromName: string;
+        FromFull: ExpandedEmail;
+        To: string;
+        ToFull: ExpandedEmail[];
+        CcFull: ExpandedEmail[];
+        ReplyTo: string;
+        OriginalRecipient: string;
+        Date: string;
+        MailboxHash: string;
+    }
+
+    interface InboundMessage extends InboundMessageBase {
+        TextBody: string;
+        HtmlBody: string;
+        Headers: PostmarkMessageHeader[];
+        BlockedReason?: string;
+        MessageEvents: MessageEvents[];
+    }
+
+    // Results
+    interface GenericResult {
+        Message: string;
+        ErrorCode?: number;
+    }
+
+    interface PaginatedResult {
+        TotalCount: number;
+    }
+
+    interface ActivatedBounceResult extends GenericResult {
+        Bounce: Bounce;
+    }
+
+    interface BouncesResult extends PaginatedResult {
+        Bounces: Bounce[];
+    }
+
+    interface TemplatesResult extends PaginatedResult {
+        Templates: TemplateBase[];
+    }
+
+    interface MessageOpensResult extends PaginatedResult {
+        Opens: MessageOpens[];
+    }
+
+    interface OutboundMessagesResult extends PaginatedResult {
+        Messages: OutboundMessageBase[];
+    }
+
+    interface InboundMessagesResult extends PaginatedResult {
+        InboundMessages: InboundMessageBase[];
+    }
+
+    interface TemplateValidationResult<T extends object = any> {
+        AllContentIsValid: boolean;
+        HtmlBody: ValidationSet;
+        TextBody: ValidationSet;
+        Subject: ValidationSet;
+        SuggestedTemplateModel: T;
+    }
+
+    interface SenderSignaturesResults extends PaginatedResult {
+        SenderSignatures: SenderSignatureBase[];
+    }
+
+    interface ServersResult extends PaginatedResult {
+        Servers: Server[];
+    }
+
+    interface DomainsResult extends PaginatedResult {
+        Domains: DomainBase[];
+    }
+
+    // sender signature
+    interface SenderSignatureBase {
+        Domain: string;
+        EmailAddress: string;
+        Name: string;
+        ReplyToEmailAddress: string;
+        Confirmed: boolean;
+        ID: number;
+    }
+
+    interface SPFRecord {
+        SPFHost: string;
+        SPFTextValue: string;
+        SPFVerified: boolean;
+    }
+
+    interface DKIMKey {
+        WeakDKIM: boolean;
+        DKIMHost: string;
+        DKIMVerified: boolean;
+        DKIMTextValue: string;
+        DKIMPendingHost: string;
+        DKIMPendingTextValue: string;
+        DKIMRevokedHost: string;
+        DKIMRevokedTextValue: string;
+        SafeToRemoveRevokedKeyFromDNS: boolean;
+        DKIMUpdateStatus: string;
+    }
+
+    interface VerificationDetails extends SPFRecord, DKIMKey {
+        ReturnPathDomain: string;
+        ReturnPathDomainCNAMEValue: string;
+    }
+
+    interface SenderSignature extends SenderSignatureBase, VerificationDetails {
+        ReturnPathDomainVerified: boolean;
+    }
+
+    interface UpdateSignature {
+        Name: string;
+        ReplyToEmail?: string;
+        ReturnPathDomain?: string;
+    }
+
+    // domain
+    interface DomainBase {
+        ID: number;
+        Name: string;
+        SPFVerified: boolean;
+        DKIMVerified: boolean;
+        WeakDKIM: boolean;
+        ReturnPathDomainVerified: boolean;
+    }
+
+    interface Domain extends DomainBase, VerificationDetails {
+    }
+
+    interface RotateDKIMResult extends DKIMKey {
+        Name: string;
+        ID: string;
+    }
+
+    // outbound overview
+    interface OutboundOverview {
+        Sent: number;
+        Bounced: number;
+        SMTPApiErrors: number;
+        BounceRate: number;
+        SpamComplaints: number;
+        SpamComplaintsRate: number;
+        Opens: number;
+        UniqueOpens: number;
+        Tracked: number;
+        WithLinkTracking: number;
+        WithOpenTracking: number;
+        TotalTrackedLinksSent: number;
+        UniqueLinksClicked: number;
+        TotalClicks: number;
+        WithClientRecorded: number;
+        WithPlatformRecorded: number;
+        WithReadTimeRecorded: number;
+    }
+}
diff --git a/types/postmark/postmark-tests.ts b/types/postmark/postmark-tests.ts
index 451b0051f4..f18bff2ef6 100644
--- a/types/postmark/postmark-tests.ts
+++ b/types/postmark/postmark-tests.ts
@@ -11,7 +11,7 @@ const templateValidator = {
   TextBody: '123535',
 };
 
-declare function callback(err: any, data: any): void;
+declare function callback(err: any, data: any): undefined;
 
 const client = new postmark.Client('124345', options);
 const adminClient = new postmark.AdminClient('1123235', options);
@@ -40,16 +40,40 @@ client.retryInboundHookForMessage(1, callback);
 client.getOuboundOverview(filter, callback);
 client.validateTemplate(templateValidator, callback);
 
+client.send(message).then(() => { });
+client.sendEmailWithTemplate(templateMessage).then(() => { });
+client.batch([message, message]).then(() => { });
+client.sendEmail(message).then(() => { });
+client.sendEmailBatch([message, message]).then(() => { });
+client.getDeliveryStatistics().then(() => { });
+client.getBounces(filter).then(() => { });
+client.getBounce(1).then(() => { });
+client.getBounceDump(1).then(() => { });
+client.activateBounce(1).then(() => { });
+client.getBounceTags().then(() => { });
+client.getServer().then(() => { });
+client.editServer(editSender).then(() => { });
+client.getOutboundMessages(filter).then(() => { });
+client.getOutboundMessageDetails(1).then(() => { });
+client.getMessageOpens(filter).then(() => { });
+client.getMessageOpensForSingleMessage(1, filter).then(() => { });
+client.getInboundMessages(filter).then(() => { });
+client.getInboundMessageDetails(1).then(() => { });
+client.bypassBlockedInboundMessage(1).then(() => { });
+client.retryInboundHookForMessage(1).then(() => { });
+client.getOuboundOverview(filter).then(() => { });
+client.validateTemplate(templateValidator).then(() => { });
+
 adminClient.listSenderSignatures(filter, callback);
 adminClient.createSenderSignature({FromEmail: '', Name: ''}, callback);
-adminClient.editSenderSignature(0, {ReplyToEmail: '123'}, callback);
+adminClient.editSenderSignature(0, {Name: '123'}, callback);
 adminClient.deleteSenderSignature(0, callback);
 adminClient.resendSenderSignatureConfirmation(0, callback);
 adminClient.verifySenderSignatureSPF(0, callback);
 adminClient.requestNewDKIMForSenderSignature(0, callback);
 adminClient.getServer(0, callback);
 adminClient.createServer({Name: '123'}, callback);
-adminClient.editServer(0, {Color: 'black'}, callback);
+adminClient.editServer(0, {Name: 'black'}, callback);
 adminClient.deleteServer(0, callback);
 adminClient.listServers(filter, callback);
 adminClient.listDomains(filter, callback);
@@ -59,3 +83,23 @@ adminClient.editDomain(0, {ReturnPathDomain: '/'}, callback);
 adminClient.deleteDomain(0, callback);
 adminClient.verifyDomainSPF(0, callback);
 adminClient.rotateDKIMForDomain(0, callback);
+
+adminClient.listSenderSignatures(filter).then(() => { });
+adminClient.createSenderSignature({ FromEmail: '', Name: '' }).then(() => { });
+adminClient.editSenderSignature(0, { Name: 'somename', ReplyToEmail: '123' }).then(() => { });
+adminClient.deleteSenderSignature(0).then(() => { });
+adminClient.resendSenderSignatureConfirmation(0).then(() => { });
+adminClient.verifySenderSignatureSPF(0).then(() => { });
+adminClient.requestNewDKIMForSenderSignature(0).then(() => { });
+adminClient.getServer(0).then(() => { });
+adminClient.createServer({ Name: '123' }).then(() => { });
+adminClient.editServer(0, { Name: 'black' }).then(() => { });
+adminClient.deleteServer(0).then(() => { });
+adminClient.listServers(filter).then(() => { });
+adminClient.listDomains(filter).then(() => { });
+adminClient.getDomain(0).then(() => { });
+adminClient.createDomain({ Name: '1234' }).then(() => { });
+adminClient.editDomain(0, { ReturnPathDomain: '/' }).then(() => { });
+adminClient.deleteDomain(0).then(() => { });
+adminClient.verifyDomainSPF(0).then(() => { });
+adminClient.rotateDKIMForDomain(0).then(() => { });
diff --git a/types/pouchdb-core/index.d.ts b/types/pouchdb-core/index.d.ts
index 7534ad902c..0dbf5def5b 100644
--- a/types/pouchdb-core/index.d.ts
+++ b/types/pouchdb-core/index.d.ts
@@ -511,6 +511,10 @@ declare namespace PouchDB {
           interval?: number;
         }
 
+        interface PutOptions extends Options {
+          force?: boolean;
+        }
+
         interface RemoveAttachmentResponse extends BasicResponse {
             id: DocumentId;
             rev: RevisionId;
@@ -622,7 +626,7 @@ declare namespace PouchDB {
         };
     }
 
-    interface Database<Content extends {} = {}>  {
+    interface Database<Content extends {} = {}> extends EventEmitter {
         /** The name passed to the PouchDB constructor and unique identifier of the database. */
         name: string;
 
@@ -722,7 +726,7 @@ declare namespace PouchDB {
          * see inconsistent results.
          */
         put<Model>(doc: Core.PutDocument<Content & Model>,
-                   options: Core.Options | null,
+                   options: Core.PutOptions | null,
                    callback: Core.Callback<Core.Response>): void;
 
         /**
@@ -735,7 +739,7 @@ declare namespace PouchDB {
          * see inconsistent results.
          */
         put<Model>(doc: Core.PutDocument<Content & Model>,
-                   options?: Core.Options): Promise<Core.Response>;
+                   options?: Core.PutOptions): Promise<Core.Response>;
 
         /** Remove a doc from the database */
         remove(doc: Core.RemoveDocument,
diff --git a/types/pouchdb-core/pouchdb-core-tests.ts b/types/pouchdb-core/pouchdb-core-tests.ts
index fe79997461..f8accd1c3a 100644
--- a/types/pouchdb-core/pouchdb-core-tests.ts
+++ b/types/pouchdb-core/pouchdb-core-tests.ts
@@ -114,6 +114,8 @@ function testBasics() {
 
     const db = new PouchDB<MyModel>();
 
+    db.on("closed", () => {});
+
     db.post(model).then((result) => {
         isString(result.id);
     });
diff --git a/types/pouchdb-find/index.d.ts b/types/pouchdb-find/index.d.ts
index 7f5f925f8c..1ccd3d4c14 100644
--- a/types/pouchdb-find/index.d.ts
+++ b/types/pouchdb-find/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for pouchdb-find 6.3
 // Project: https://pouchdb.com/
 // Definitions by: Jakub Navratil <https://github.com/trubit>
+//                 Sebastian Ramirez <https://github.com/tiangolo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -100,7 +101,7 @@ declare namespace PouchDB {
         }
 
         interface FindResponse<Content extends {}> {
-            docs: Array<Core.Document<Content>>;
+            docs: Array<Core.ExistingDocument<Content>>;
         }
 
         interface CreateIndexOptions {
diff --git a/types/pouchdb-upsert/index.d.ts b/types/pouchdb-upsert/index.d.ts
index 003f310ad7..d044e9f2a4 100644
--- a/types/pouchdb-upsert/index.d.ts
+++ b/types/pouchdb-upsert/index.d.ts
@@ -1,6 +1,9 @@
 // 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>, Eddie Hsu <https://github.com/apolkingg8>
+// Definitions by: Keith D. Moore <https://github.com/keithdmoore>
+//                 Andrew Mitchell <https://github.com/hotforfeature>
+//                 Eddie Hsu <https://github.com/apolkingg8>
+//                 John McLaughlin <https://github.com/zamb3zi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -55,7 +58,8 @@ declare namespace PouchDB {
                           callback: Core.Callback<UpsertResponse>): void;
   }
 
-  type UpsertDiffCallback<Content extends {}> = (doc: Core.Document<Content> | {}) => Core.Document<Content> | boolean;
+  type CancelUpsert = '' | 0 | false | null | undefined; // falsey values
+  type UpsertDiffCallback<Content extends {}> = (doc: Core.Document<Content> | {}) => Content & Partial<Core.IdMeta> | CancelUpsert;
 
   interface UpsertResponse {
     id: Core.DocumentId;
diff --git a/types/pouchdb-upsert/pouchdb-upsert-tests.ts b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
index 55697e88d6..b86afedf29 100644
--- a/types/pouchdb-upsert/pouchdb-upsert-tests.ts
+++ b/types/pouchdb-upsert/pouchdb-upsert-tests.ts
@@ -2,9 +2,10 @@ import * as pouchdbUpsert from 'pouchdb-upsert';
 PouchDB.plugin(pouchdbUpsert);
 
 interface UpsertDocModel {
-   _id: 'test-doc1';
-   name: 'test';
+   name: string;
+   readonly?: boolean;
 }
+
 declare const docToUpsert: PouchDB.Core.Document<UpsertDocModel>;
 const db = new PouchDB<UpsertDocModel>();
 
@@ -16,10 +17,20 @@ function testUpsert_WithPromise_AndReturnDoc() {
   });
 }
 
-function testUpsert_WithPromise_AndReturnBoolean() {
+function testUpsert_WithPromise_AndReturnFalsey() {
   db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+    if (doc.readonly)
+      return false;
     // Make some updates....
-    return false;
+    return doc;
+  }).then((res: PouchDB.UpsertResponse) => {
+  });
+}
+
+function testUpsert_WithPromise_AndReturnNewObject() {
+  // callback return boolean
+  db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+    return {name: 'test', readonly: true};
   }).then((res: PouchDB.UpsertResponse) => {
   });
 }
@@ -31,11 +42,20 @@ function testUpsert_WithCallback_AndReturnDoc() {
   }, (res: PouchDB.UpsertResponse) => {});
 }
 
-function testUpsert_WithCallback_AndReturnBoolean() {
+function testUpsert_WithCallback_AndReturnFalsey() {
   // callback return boolean
   db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+    if (doc.readonly)
+      return false;
     // Make some updates....
-    return false;
+    return doc;
+  }, (res: PouchDB.UpsertResponse) => {});
+}
+
+function testUpsert_WithCallback_AndReturnNewObject() {
+  // callback return boolean
+  db.upsert<UpsertDocModel>(docToUpsert._id, (doc: PouchDB.Core.Document<UpsertDocModel>) => {
+    return {name: 'test', readonly: true};
   }, (res: PouchDB.UpsertResponse) => {});
 }
 
diff --git a/types/prettier/index.d.ts b/types/prettier/index.d.ts
index 881ca6b182..acb6b09af6 100644
--- a/types/prettier/index.d.ts
+++ b/types/prettier/index.d.ts
@@ -29,6 +29,8 @@ export type BuiltInParserName =
     | 'less'
     | 'scss'
     | 'json'
+    | 'json5'
+    | 'json-stringify'
     | 'graphql'
     | 'markdown'
     | 'vue';
diff --git a/types/pretty-bytes/index.d.ts b/types/pretty-bytes/index.d.ts
index 7cd856b4f5..5259fcb92a 100644
--- a/types/pretty-bytes/index.d.ts
+++ b/types/pretty-bytes/index.d.ts
@@ -1,8 +1,14 @@
-// Type definitions for pretty-bytes 4.0
+// Type definitions for pretty-bytes 5.1
 // Project: https://github.com/sindresorhus/pretty-bytes
 // Definitions by: York Yao <https://github.com/plantain-00>
+//                 Daniela Yassuda <https://github.com/danielasy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function prettyBytes(bytes: number): string;
-export = prettyBytes;
-declare namespace prettyBytes { }
+declare function PrettyBytes(number: number, options?: PrettyBytes.PrettyBytesOptions): string;
+export = PrettyBytes;
+declare namespace PrettyBytes {
+    interface PrettyBytesOptions {
+        signed?: boolean;
+        locale?: boolean | string;
+    }
+}
diff --git a/types/pretty-bytes/pretty-bytes-tests.ts b/types/pretty-bytes/pretty-bytes-tests.ts
index 71745d9a1b..7aa89483bc 100644
--- a/types/pretty-bytes/pretty-bytes-tests.ts
+++ b/types/pretty-bytes/pretty-bytes-tests.ts
@@ -1,7 +1,18 @@
-import prettyBytes = require('pretty-bytes');
+import * as prettyBytes from 'pretty-bytes';
 
 prettyBytes(1337);
 // => '1.34 kB'
 
 prettyBytes(100);
 // => '100 B'
+
+// Display file size differences
+prettyBytes(42, { signed: true });
+// => '+42 B'
+
+// Localized output using German locale
+prettyBytes(1337, { locale: 'de' });
+// => '1,34 kB'
+
+// Localized output using system/browser locale
+prettyBytes(1337, { locale: true });
diff --git a/types/pretty-bytes/tsconfig.json b/types/pretty-bytes/tsconfig.json
index fd11c640b4..44e6385192 100644
--- a/types/pretty-bytes/tsconfig.json
+++ b/types/pretty-bytes/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "pretty-bytes-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/pretty-bytes/tslint.json b/types/pretty-bytes/tslint.json
index e60c15844f..f93cf8562a 100644
--- a/types/pretty-bytes/tslint.json
+++ b/types/pretty-bytes/tslint.json
@@ -1,3 +1,3 @@
 {
     "extends": "dtslint/dt.json"
-}
\ No newline at end of file
+}
diff --git a/types/pretty-bytes/v4/index.d.ts b/types/pretty-bytes/v4/index.d.ts
new file mode 100644
index 0000000000..7cd856b4f5
--- /dev/null
+++ b/types/pretty-bytes/v4/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for pretty-bytes 4.0
+// Project: https://github.com/sindresorhus/pretty-bytes
+// Definitions by: York Yao <https://github.com/plantain-00>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function prettyBytes(bytes: number): string;
+export = prettyBytes;
+declare namespace prettyBytes { }
diff --git a/types/pretty-bytes/v4/pretty-bytes-tests.ts b/types/pretty-bytes/v4/pretty-bytes-tests.ts
new file mode 100644
index 0000000000..71745d9a1b
--- /dev/null
+++ b/types/pretty-bytes/v4/pretty-bytes-tests.ts
@@ -0,0 +1,7 @@
+import prettyBytes = require('pretty-bytes');
+
+prettyBytes(1337);
+// => '1.34 kB'
+
+prettyBytes(100);
+// => '100 B'
diff --git a/types/pretty-bytes/v4/tsconfig.json b/types/pretty-bytes/v4/tsconfig.json
new file mode 100644
index 0000000000..e23e4370ac
--- /dev/null
+++ b/types/pretty-bytes/v4/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "pretty-bytes": [ "pretty-bytes/v4" ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "pretty-bytes-tests.ts"
+    ]
+}
diff --git a/types/pretty-bytes/v4/tslint.json b/types/pretty-bytes/v4/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/pretty-bytes/v4/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/pretty-ms/index.d.ts b/types/pretty-ms/index.d.ts
index e23b26826b..b1e151cd65 100644
--- a/types/pretty-ms/index.d.ts
+++ b/types/pretty-ms/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for pretty-ms 3.0
+// Type definitions for pretty-ms 3.2
 // Project: https://github.com/sindresorhus/pretty-ms#readme
 // Definitions by: BendingBender <https://github.com/BendingBender>
+//                 ocboogie <https://github.com/ocboogie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = prettyMs;
@@ -11,6 +12,7 @@ declare namespace prettyMs {
     interface PrettyMsOptions {
         secDecimalDigits?: number;
         msDecimalDigits?: number;
+        keepDecimalsOnWholeSeconds?: boolean;
         compact?: boolean;
         verbose?: boolean;
     }
diff --git a/types/pretty-ms/pretty-ms-tests.ts b/types/pretty-ms/pretty-ms-tests.ts
index 14bff61304..ae5e8120b2 100644
--- a/types/pretty-ms/pretty-ms-tests.ts
+++ b/types/pretty-ms/pretty-ms-tests.ts
@@ -4,6 +4,7 @@ let str: string;
 str = prettyMs(133);
 str = prettyMs(1337, {compact: true});
 str = prettyMs(1335669000, {verbose: true});
+str = prettyMs(1335669000, {keepDecimalsOnWholeSeconds: true});
 str = prettyMs(1335669000, {secDecimalDigits: 1});
 str = prettyMs(1335669000, {msDecimalDigits: 2});
 str = prettyMs(new Date(2014, 0, 1, 10, 40).getTime() - new Date(2014, 0, 1, 10, 5).getTime());
diff --git a/types/prismic-dom/index.d.ts b/types/prismic-dom/index.d.ts
index ba101e1041..56536895f2 100644
--- a/types/prismic-dom/index.d.ts
+++ b/types/prismic-dom/index.d.ts
@@ -9,7 +9,12 @@ interface RichText {
     asText(richText: any,  joinString?: string): string;
 }
 
-export const RichText: RichText;
+interface Link {
+    url(link: any, linkResolver?: (doc: any) => string): string;
+}
 
-declare const _default: { RichText: RichText };
+export const RichText: RichText;
+export const Link: Link;
+
+declare const _default: { RichText: RichText, Link: Link };
 export default _default;
diff --git a/types/project-oxford/index.d.ts b/types/project-oxford/index.d.ts
index f84676c94c..83c73da3f7 100644
--- a/types/project-oxford/index.d.ts
+++ b/types/project-oxford/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/felixrieseberg/project-oxford
 // Definitions by: Scott Southwood <https://github.com/scsouthw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/prometheus-gc-stats/index.d.ts b/types/prometheus-gc-stats/index.d.ts
new file mode 100644
index 0000000000..007cf28bed
--- /dev/null
+++ b/types/prometheus-gc-stats/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for prometheus-gc-stats 0.6
+// Project: https://github.com/SimenB/node-prometheus-gc-stats
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// register is typeof require('prom-client').Registry which has its own .d.ts
+declare function gcStats(register: any): () => void;
+
+export = gcStats;
diff --git a/types/prometheus-gc-stats/prometheus-gc-stats-tests.ts b/types/prometheus-gc-stats/prometheus-gc-stats-tests.ts
new file mode 100644
index 0000000000..abc7542aa0
--- /dev/null
+++ b/types/prometheus-gc-stats/prometheus-gc-stats-tests.ts
@@ -0,0 +1,5 @@
+import gcStats = require('prometheus-gc-stats');
+
+const testFunc = gcStats('something');
+// $ExpectType void
+testFunc();
diff --git a/types/prometheus-gc-stats/tsconfig.json b/types/prometheus-gc-stats/tsconfig.json
new file mode 100644
index 0000000000..1fcdb90ce8
--- /dev/null
+++ b/types/prometheus-gc-stats/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"prometheus-gc-stats-tests.ts"
+	]
+}
diff --git a/types/prometheus-gc-stats/tslint.json b/types/prometheus-gc-stats/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/prometheus-gc-stats/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/promise-ftp-common/index.d.ts b/types/promise-ftp-common/index.d.ts
new file mode 100644
index 0000000000..4db7fd4405
--- /dev/null
+++ b/types/promise-ftp-common/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for promise-ftp-common 1.1
+// Project: https://github.com/realtymaps/promise-ftp-common
+// Definitions by: coolreader18 <https://github.com/coolreader18>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export enum STATUSES {
+    NOT_YET_CONNECTED = "not yet connected",
+    CONNECTING = "connecting",
+    CONNECTED = "connected",
+    LOGGING_OUT = "logging out",
+    DISCONNECTING = "disconnecting",
+    DISCONNECTED = "disconnected",
+    RECONNECTING = "reconnecting"
+}
+export class FtpConnectionError extends Error {}
+export class FtpReconnectError extends Error {
+    constructor(
+        disconnectError?: string | Error,
+        connectError?: string | Error,
+        onCwd?: boolean
+    );
+    connectError: string | Error;
+    disconnectError: string | Error;
+}
diff --git a/types/promise-ftp-common/promise-ftp-common-tests.ts b/types/promise-ftp-common/promise-ftp-common-tests.ts
new file mode 100644
index 0000000000..57424a8449
--- /dev/null
+++ b/types/promise-ftp-common/promise-ftp-common-tests.ts
@@ -0,0 +1,16 @@
+import * as PromiseFtpCommon from "promise-ftp-common";
+
+// $ExpectType typeof STATUSES
+PromiseFtpCommon.STATUSES;
+
+// $ExpectType typeof FtpReconnectError
+PromiseFtpCommon.FtpReconnectError;
+
+// $ExpectType typeof FtpConnectionError
+PromiseFtpCommon.FtpConnectionError;
+
+// $ExpectType FtpReconnectError
+new PromiseFtpCommon.FtpReconnectError();
+
+// $ExpectType FtpConnectionError
+new PromiseFtpCommon.FtpConnectionError();
diff --git a/types/promise-ftp-common/tsconfig.json b/types/promise-ftp-common/tsconfig.json
new file mode 100644
index 0000000000..d8f09b36b9
--- /dev/null
+++ b/types/promise-ftp-common/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "promise-ftp-common-tests.ts"]
+}
diff --git a/types/promise-ftp-common/tslint.json b/types/promise-ftp-common/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/promise-ftp-common/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/promise-ftp/index.d.ts b/types/promise-ftp/index.d.ts
new file mode 100644
index 0000000000..23aa5333e0
--- /dev/null
+++ b/types/promise-ftp/index.d.ts
@@ -0,0 +1,257 @@
+// Type definitions for promise-ftp 1.3
+// Project: https://github.com/realtymaps/promise-ftp
+// Definitions by: coolreader18 <https://github.com/coolreader18>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import * as FtpClient from "ftp";
+import * as PromiseFtpCommon from "promise-ftp-common";
+import * as Promise from "bluebird";
+
+declare namespace PromiseFtp {
+    interface ERROR_CODES {
+        421: "Service not available, closing control connection";
+        425: "Can't open data connection";
+        426: "Connection closed, transfer aborted";
+        450: "Requested file action not taken / File unavailable (e.g., file busy)";
+        451: "Requested action aborted: local error in processing";
+        452: "Requested action not taken / Insufficient storage space in system";
+        500: "Syntax error / Command unrecognized";
+        501: "Syntax error in parameters or arguments";
+        502: "Command not implemented";
+        503: "Bad sequence of commands";
+        504: "Command not implemented for that parameter";
+        530: "Not logged in";
+        532: "Need account for storing files";
+        550: "Requested action not taken / File unavailable (e.g., file not found, no access)";
+        551: "Requested action aborted: page type unknown";
+        552: "Requested file action aborted / Exceeded storage allocation (for current directory or dataset)";
+        553: "Requested action not taken / File name not allowed";
+    }
+    const ERROR_CODES: ERROR_CODES;
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import FtpConnectionError = PromiseFtpCommon.FtpConnectionError;
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import FtpReconnectError = PromiseFtpCommon.FtpReconnectError;
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import STATUSES = PromiseFtpCommon.STATUSES;
+
+    /**
+     * Options for FtpPromise#connect()
+     */
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import Options = FtpClient.Options;
+
+    /**
+     * Element returned by FtpPromise#list()
+     */
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import ListingElement = FtpClient.ListingElement;
+}
+
+declare class PromiseFtp {
+    /**
+     * The underlying FtpClient instance
+     */
+    rawClient: FtpClient;
+
+    getConnectionStatus(): PromiseFtpCommon.STATUSES;
+    /**
+     * Connect to an FTP server.
+     */
+    connect: (options: PromiseFtp.Options) => Promise<string>;
+
+    /**
+     * Reconnect with the same options as previously connected with `#connect()`.
+     */
+    reconnect: () => Promise<string>;
+
+    /**
+     * Close the connection to the server after any/all enqueued
+     * commands have been executed.
+     * @returns a promise that resolves with the last error recieved if there
+     * was an error, true if there was an error but the client didn't recieve it,
+     * or false if there was no error.
+     */
+    end(): Promise<Error | boolean>;
+
+    /**
+     * Close the connection to the server immediately.
+     */
+    destroy(): boolean;
+
+    /**
+     * Retrieve the directory listing of path.
+     * @param path - defaults to the current working directory.
+     * @param useCompression - defaults to false.
+     * @returns the contents of the specified directory
+     */
+    list(path?: string, useCompression?: boolean): FtpClient.ListingElement[];
+    list(useCompression: boolean): FtpClient.ListingElement[];
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieve the directory listing of path.
+     * Similar to `#list()`, except the directory is temporarily changed to path to
+     * retrieve the directory listing. This is useful for servers that do not
+     * handle characters like spaces and quotes in directory names well for the
+     * LIST command. This function is "optional" because it relies on `#pwd()`
+     * being available.
+     * @param path - defaults to the current working directory.
+     * @param useCompression - defaults to false.
+     * @returns the contents of the specified directory
+     */
+    listSafe(
+        path?: string,
+        useCompression?: boolean
+    ): FtpClient.ListingElement[];
+    listSafe(useCompression: boolean): FtpClient.ListingElement[];
+
+    /**
+     * Retrieve a file at path from the server.
+     * @param path - the path of the file to get.
+     * @param useCompression - defaults to false.
+     * @returns a stream which empties to the contents of the specified file.
+     */
+    get(path: string, useCompression?: boolean): Promise<NodeJS.ReadableStream>;
+
+    /**
+     * Send data to the server to be stored as a file.
+     * @param input - can be a ReadableStream, a Buffer, or a path to a local file.
+     * @param destPath - the path of the file to write to.
+     * @param useCompression - defaults to false.
+     */
+    put(
+        input: NodeJS.ReadableStream | Buffer | string,
+        destPath: string,
+        useCompression?: boolean
+    ): Promise<void>;
+
+    /**
+     * Create a new file on the server or append to one that already exists.
+     * @param input - can be a ReadableStream, a Buffer, or a pathto a local file.
+     * @param destPath - the path of the file to create or append to.
+     * @param useCompression - defaults to false.
+     */
+    append(
+        input: NodeJS.ReadableStream | Buffer | string,
+        destPath: string,
+        useCompression?: boolean
+    ): Promise<void>;
+
+    /**
+     * Rename a file on the server.
+     * @param oldPath - the old path of the file.
+     * @param newPath - the new path to move it to.
+     */
+    rename: (oldPath: string, newPath: string) => Promise<void>;
+
+    /**
+     * Logout the user from the server.
+     */
+    logout: () => Promise<void>;
+
+    /**
+     * Delete a file on the server.
+     */
+    delete: (path: string) => Promise<void>;
+
+    /**
+     * Change the current working directory.
+     * @param cwd - the path to change the CWD to.
+     * @returns the current directory if the server replies with the path in the
+     * response text, otherwise undefined.
+     */
+    cwd(path: string): Promise<string | undefined>;
+
+    /**
+     * Abort the current data transfer (e.g. from `#get()`, `#put()`, or `#list()`)
+     */
+    abort(): Promise<void>;
+
+    /**
+     * Send command using SITE.
+     * @param command - the command to send, e.g 'CHMOD 755 foo' or 'QUOTA'.
+     */
+    site(command: string): Promise<{ text: string; code: number }>;
+
+    /**
+     * Retrieve human-readable information about the server's status.
+     * @returns a string with the server's status.
+     */
+    status: () => Promise<string>;
+
+    /**
+     * Set the transfer data type to ASCII.
+     */
+    ascii(): Promise<void>;
+
+    /**
+     * Set the transfer data type to binary (default at time of connection).
+     */
+    binary(): Promise<void>;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Create a new directory on the server.
+     * @param path - the path of the new directory.
+     * @param recursive - enables a `mkdir -p` algorithm, defaults to false.
+     */
+    mkdir(path: string, recursive?: boolean): Promise<void>;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Remove a directory on the server.
+     * @param path - the path of the directory to remove.
+     * @param recursive - enables deleting the directory if not empty, defaults to false.
+     */
+    rmdir(path: string, recursive?: boolean): Promise<void>;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Change the working directory to the parent of the current directory.
+     * Like `cd ..`.
+     */
+    cdup(): Promise<void>;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieve the current working directory.
+     */
+    pwd(): Promise<string>;
+
+    /**
+     * Optional "standard" commands (RFC 959)
+     * Retrieve information about the system running the server.
+     * @returns the server's OS.
+     */
+    system(): Promise<string>;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Retrieve the size of a file on the server.
+     * @param path - the path of the file whose size is to be retrieved.
+     * @returns the size of the specified file.
+     */
+    size(path: string): Promise<number>;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Retrieve the last modified date and time for a file or directory.
+     * @param path - the path of the file/directory whose modified date is to
+     * be retrieved.
+     * @returns the last modified date at the specified path.
+     */
+    lastMod(path: string): Promise<Date>;
+
+    /**
+     * Extended commands (RFC 3659)
+     * Set the file byte offset for the next file transfer action (get/put).
+     * @param byteOffset - The file byte offset.
+     */
+    restart(byteOffset: number): Promise<void>;
+}
+
+export = PromiseFtp;
diff --git a/types/promise-ftp/promise-ftp-tests.ts b/types/promise-ftp/promise-ftp-tests.ts
new file mode 100644
index 0000000000..963d38a386
--- /dev/null
+++ b/types/promise-ftp/promise-ftp-tests.ts
@@ -0,0 +1,4 @@
+import PromiseFtp = require("promise-ftp");
+
+// $ExpectType FtpConnectionError
+new PromiseFtp.FtpConnectionError();
diff --git a/types/promise-ftp/tsconfig.json b/types/promise-ftp/tsconfig.json
new file mode 100644
index 0000000000..cf284b61bc
--- /dev/null
+++ b/types/promise-ftp/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "promise-ftp-tests.ts"]
+}
diff --git a/types/promise-ftp/tslint.json b/types/promise-ftp/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/promise-ftp/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/promise-sftp/index.d.ts b/types/promise-sftp/index.d.ts
new file mode 100644
index 0000000000..fc75bd9bee
--- /dev/null
+++ b/types/promise-sftp/index.d.ts
@@ -0,0 +1,605 @@
+// Type definitions for promise-sftp 1.3
+// Project: https://github.com/realtymaps/promise-sftp
+// Definitions by: coolreader18 <https://github.com/coolreader18>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import * as PromiseFtpCommon from "promise-ftp-common";
+import * as Promise from "bluebird";
+import * as ssh2 from "ssh2";
+import * as ssh2Streams from "ssh2-streams";
+import * as fs from "fs";
+
+declare namespace PromiseSftp {
+    enum ERROR_CODES {
+        OK,
+        EOF,
+        NO_SUCH_FILE,
+        PERMISSION_DENIED,
+        FAILURE,
+        BAD_MESSAGE,
+        NO_CONNECTION,
+        CONNECTION_LOST,
+        OP_UNSUPPORTED,
+        INVALID_HANDLE,
+        NO_SUCH_PATH,
+        FILE_ALREADY_EXISTS,
+        WRITE_PROTECT,
+        NO_MEDIA,
+        NO_SPACE_ON_FILESYSTEM,
+        QUOTA_EXCEEDED,
+        UNKNOWN_PRINCIPAL,
+        LOCK_CONFLICT,
+        DIR_NOT_EMPTY,
+        NOT_A_DIRECTORY,
+        INVALID_FILENAME,
+        LINK_LOOP,
+        CANNOT_DELETE,
+        INVALID_PARAMETER,
+        FILE_IS_A_DIRECTORY,
+        BYTE_RANGE_LOCK_CONFLICT,
+        BYTE_RANGE_LOCK_REFUSED,
+        DELETE_PENDING,
+        FILE_CORRUPT,
+        OWNER_INVALID,
+        GROUP_INVALID,
+        NO_MATCHING_BYTE_RANGE_LOCK
+    }
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import FtpConnectionError = PromiseFtpCommon.FtpConnectionError;
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import FtpReconnectError = PromiseFtpCommon.FtpReconnectError;
+    // tslint:disable-next-line strict-export-declare-modifiers
+    export import STATUSES = PromiseFtpCommon.STATUSES;
+
+    /**
+     * Options for SftpPromise#connect()
+     */
+    type Options = ssh2.ConnectConfig & {
+        /**
+         * When using password-based user authentication, set this option to
+         * handle password change requests. If this option isn't set, and the
+         * server requests a password change, I haven't tested what will happen.
+         */
+        changePassword?: (message: string, language: string) => Promise<string>;
+
+        /**
+         * Whether to attempt to automatically reconnect using the existing
+         * config if the connection is unexpectedly closed. Auto-reconnection is
+         * lazy, and so will wait until a command needs to be issued before
+         * attempting to reconnect.
+         */
+        autoReconnect?: boolean;
+
+        /**
+         * Path and name of a file containing a private key as would be passed
+         * to the privateKey option. If privateKey is also set, priority is
+         * given to the privateKey option.
+         */
+        privateKeyFile?: string;
+
+        /**
+         * Set this option to a function to try keyboard-interactive user
+         * authentication if primary user authentication method fails.
+         *
+         * NOTE: This function may be called more than once, with the same or different prompts.
+         * @param name - is generally what you'd use as a header or GUI window
+         * title to describe the purpose of the `prompts`
+         */
+        tryKeyboard?: (
+            name: string,
+            instructions: string,
+            instructionsLang: string,
+            prompts: Array<{
+                /** The query to pose to the user */
+                prompt: string;
+                /** Whether the user's input should be displayed on-screen */
+                echo: boolean;
+            }>
+        ) => Array<string | Promise<string>> | Promise<string[]>;
+
+        /** Alias for `username` */
+        user?: string;
+
+        /** Alias for `readyTimeout` */
+        connTimeout?: number;
+
+        /** Alias for `readyTimeout` */
+        pasvTimeout?: number;
+
+        /** Alias for `keepaliveInterval` */
+        keepalive?: number;
+    };
+
+    /** Output of `PromiseSftp#list()` */
+    interface DirectoryListing {
+        /** `d` for directory, `-` for file, and `l` for symlink only on *NIX. */
+        type: "d" | "-" | "l";
+
+        /** The name of the entry. */
+        name: string;
+
+        /** The last modified date of the entry. */
+        date: Date;
+
+        /** The various permissions for this entry. *NIX only */
+        rights?: {
+            user: string;
+            group: string;
+            other: string;
+        };
+
+        /** The user name or ID that this entry belongs to. *NIX only */
+        owner?: string;
+
+        /** The group name or ID that this entry belongs to. *NIX only */
+        group?: string;
+
+        /** For symlink entries, this is the symlink's target. *NIX only */
+        target?: string;
+
+        /** True if the sticky bit is set for this entry */
+        sticky?: boolean;
+    }
+
+    /** Options for `PromiseSftp#fast{Get,Put}` */
+    interface FastOptions {
+        /**
+         * Number of concurrent reads
+         * @default 25
+         */
+        concurrency?: number;
+
+        /**
+         * Size of each read in bytes
+         * @default 32768
+         */
+        chunkSize: number;
+
+        /** Called every time a part of a file is transferred */
+        step?: (totalTransferred: number, chunk: number, total: number) => void;
+    }
+
+    /** From the [statvfs struct](http://linux.die.net/man/2/statvfs). */
+    interface Statvfs {
+        /** file system block size */
+        f_bsize: number;
+        /** fragment size */
+        f_frsize: number;
+        /** size of fs in f_frsize units */
+        f_blocks: number;
+        /** free blocks */
+        f_bfree: number;
+        /** free blocks for unprivileged users */
+        f_bavail: number;
+        /** inodes */
+        f_files: number;
+        /** free inodes */
+        f_ffree: number;
+        /** free inodes for unprivileged users */
+        f_favail: number;
+        /** file system ID */
+        f_fsid: number;
+        /** mount flags */
+        f_flag: number;
+        /** maximum filename length */
+        f_namemax: number;
+    }
+}
+
+declare class PromiseSftp {
+    /**
+     * Connects to an SFTP server; returned promise resolves to the server's
+     * greeting message. If multiple authentication methods are available based
+     * on the passed config, they are attempted in the following order: Password
+     * > Private Key > Agent > keyboard-interactive (if tryKeyboard is set) >
+     * Host-based > None. NOTE: many of the config properties below are NOT
+     * relevant for promise-ftp. However, all promise-ftp connect options will
+     * work here, except for secure, secureOptions, and preserveCwd.
+     */
+    connect(options: PromiseSftp.Options): null | ssh2.SFTPWrapper;
+
+    /**
+     * Connects to an SFTP server using the config from the most recent call to
+     * #connect().
+     * @returns promise that resolves to the server's greeting message.
+     */
+    reconnect(): Promise<string>;
+
+    /**
+     * Closes the connection to the server after any/all enqueued commands have
+     * been executed.
+     * @returns a promise that resolves to whether or not there was an error
+     * associated with closing the connection.
+     */
+    end(): Promise<boolean>;
+
+    /** Alias to `#end()` */
+    logout(): Promise<boolean>;
+
+    /**
+     * Closes the connection to the server immediately.
+     * @returns whether the connection was connected prior to the call to **destroy()**.
+     */
+    destroy(): boolean;
+
+    /**
+     * @returns a string describing the current connection state.
+     */
+    getConnectionStatus(): PromiseSftp.STATUSES;
+
+    /**
+     * Retrieves a directory listing.
+     * @param path - The path of the directory to get the listing of.
+     */
+    list(path?: string): Promise<PromiseSftp.DirectoryListing>;
+
+    /** Alias to `#list()` */
+    listSafe(path: string): Promise<PromiseSftp.DirectoryListing>;
+
+    /**
+     * Retrieve a file from the server.
+     * @param path - The file to retrieve from the server.
+     */
+    get(path: string): Promise<NodeJS.ReadableStream>;
+
+    /**
+     * Sends data to the server.
+     * @param destPath - The file to store the data in. If string the path to a
+     * local file.
+     */
+    put(
+        input: NodeJS.ReadableStream | Buffer | string,
+        destPath: string
+    ): Promise<void>;
+
+    /**
+     * Same as `#append()`, but appends to `destPath` if it already exists.
+     */
+    append(
+        input: NodeJS.ReadableStream | Buffer | string,
+        destPath: string
+    ): Promise<void>;
+
+    /**
+     * Renames/moves one file/directory to another on the server.
+     * @param oldPath - The source file/directory.
+     * @param newPath - The destination file/directory.
+     */
+    rename(oldPath: string, newPath: string): Promise<void>;
+
+    /**
+     * Create a new directory.
+     * @param path - The path to create a new directory at.
+     * @param recursive - Enables a `mkdir -p` algorithm, defaults to false.
+     * @param attributes - The attributes to use when creating directories.
+     */
+    mkdir(
+        path: string,
+        recursive?: boolean,
+        attributes?: ssh2Streams.InputAttributes
+    ): Promise<void>;
+    mkdir(path: string, attributes: ssh2Streams.InputAttributes): Promise<void>;
+
+    /**
+     * Remove a directory on the server.
+     * @param path - The path of the directory to remove.
+     */
+    rmdir(path: string): Promise<void>;
+
+    /**
+     * Retrieve the size of a file on the server.
+     * @param path - The path to the file to retrieve the size of.
+     */
+    size(path: string): Promise<number>;
+
+    /**
+     * Retrieve the last modified date of a file on the server.
+     * @param path - The path to the file to get the last modified date of.
+     */
+    lastMod(path: string): Date;
+
+    /**
+     * Sets the file byte offset for the next file transfer action initiated via
+     * #get() or #put() to `byteOffset`.
+     */
+    restart(byteOffset: number): Promise<void>;
+
+    /**
+     * Download a file from the server using parallel reads for faster throughput.
+     * @param remotePath - The path to the remote file to read from.
+     * @param localPath - The path to the local file to write to.
+     */
+    fastGet(
+        remotePath: string,
+        localPath: string,
+        options?: PromiseSftp.FastOptions
+    ): Promise<void>;
+
+    /**
+     * Upload a file to the server using parallel reads for faster throughput.
+     * @param localPath - The path to the local file to read from.
+     * @param remotePath - The path to the remote file to write to.
+     */
+    fastPut(
+        localPath: string,
+        remotePath: string,
+        options?: PromiseSftp.FastOptions
+    ): Promise<void>;
+
+    /**
+     * Creates a read stream from a file on the server.
+     * @param path - The path of the file to create a read stream from.
+     * @returns a new `ReadableStream` for `path`.
+     */
+    createReadStream(
+        path: string,
+        options?:
+            | string
+            | {
+                  flags?: string;
+                  encoding?: string;
+                  fd?: number;
+                  mode?: number;
+                  autoClose?: boolean;
+                  start?: number;
+                  end?: number;
+                  highWaterMark?: number;
+              }
+    ): Promise<NodeJS.ReadableStream>;
+
+    /**
+     * Creates a write stream to a file on the server.
+     * @param path - The path of the file to create a write stream to.
+     * @returns a new `WriteableStream` for `path`.
+     */
+    createWriteStream(
+        path: string,
+        options?:
+            | string
+            | {
+                  flags?: string;
+                  encoding?: string;
+                  fd?: number;
+                  mode?: number;
+                  autoClose?: boolean;
+                  start?: number;
+                  end?: number;
+                  highWaterMark?: number;
+              }
+    ): Promise<NodeJS.WritableStream>;
+
+    /**
+     * Opens a file on the server.
+     * @param filename - The path of the file to open.
+     * @param mode - Any of the modes supported by `fs.open()`.
+     * @returns a promise that resolves to a `Buffer` containing a handle to the file.
+     */
+    open(
+        filename: string,
+        mode: string | number,
+        attributes?: ssh2Streams.InputAttributes
+    ): Promise<Buffer>;
+
+    /**
+     * Close a resource on the server.
+     * @param handle - A file handle returned from `#open()` or `#opendir()`.
+     */
+    close(handle: Buffer): Promise<void>;
+
+    /**
+     * Read binary data from a file on the server to a buffer.
+     * @param handle - A file handle returned from `#open()` or `#opendir()`.
+     * @param buffer - The buffer to write to.
+     * @param offset - The offset from the start of the buffer to begin writing to.
+     * @param length - The number of bytes to read from the resource.
+     * @param position - The position of the file to begin reading from.
+     */
+    read(
+        handle: Buffer,
+        buffer: Buffer,
+        offset: number,
+        length: number,
+        position: number
+    ): Promise<{
+        /** The number of bytes successfully read */
+        bytesRead: number;
+
+        /** The buffer passed to `#read()`, but offset-adjusted */
+        buffer: Buffer;
+
+        /** The position passed to `#read()` */
+        position: number;
+    }>;
+
+    /**
+     * Write binary data from a buffer to a file on the server.
+     * @param handle - A file handle returned from `#open()` or `#opendir()`.
+     * @param buffer - The buffer to read from.
+     * @param offset - The offset from the start of the buffer to begin reading from.
+     * @param length - The number of bytes to read from the buffer.
+     * @param position - The position of the file to begin writing to.
+     */
+    read(
+        handle: Buffer,
+        buffer: Buffer,
+        offset: number,
+        length: number,
+        position: number
+    ): Promise<void>;
+
+    /**
+     * Retrieves attributes from a resource on the server.
+     * @param handle - A file handle returned from `#open()` or `#opendir()`
+     */
+    fstat(handle: Buffer): Promise<ssh2Streams.Stats>;
+
+    /**
+     * Set the attributes for a resource on the server.
+     * @param handle - A resource handle returned from `#open()` or `#fopen()`.
+     */
+    fsetstat(handle: Buffer, attributes: ssh2Streams.Attributes): Promise<void>;
+
+    /**
+     * Set the access and modified times for a resource on the server.
+     * @param handle - A resource handle returned from `#open()` or `#fopen()`.
+     * @param atime - A Date or unix timestamp representing the new access time for the resource
+     * @param mtime - A Date or unix timestamp representing the new modify time for the resource
+     */
+    futimes(
+        handle: Buffer,
+        atime: Date | number,
+        mtime: Date | number
+    ): Promise<void>;
+
+    /**
+     * Set the ownership for a resource on the server.
+     * @param handle - A resource handle returned from `#open()` or `#fopen()`.
+     * @param uid - The id of the new owner user.
+     * @param gid - The id of the new owner group.
+     */
+    fchown(handle: Buffer, uid: number, gid: number): Promise<void>;
+
+    /**
+     * Set the mode for a resource on the server.
+     * @param handle - A resource handle returned from `#open()` or `#fopen()`.
+     * @param mode - The new mode, a number or a string with an octal number.
+     */
+    fchmod(handle: Buffer, mode: number | string): Promise<void>;
+
+    /**
+     * Open a directory on the server.
+     * @param path - The path of the directory to open.
+     * @returns a buffer with the handle of the opened directory.
+     */
+    opendir(path: string): Promise<Buffer>;
+
+    /**
+     * Read a directory on the server.
+     * @param location - The path of the directory to read or a handle returned from `#opendir()`.
+     */
+    readdir(
+        location: Buffer | string
+    ): Promise<{
+        filename: string;
+        longname: string;
+        attrs: ssh2Streams.Attributes;
+    }>;
+
+    /**
+     * Remove a file or symlink on the server.
+     * @param path - The path of the file/symlink to remove.
+     */
+    unlink(path: string): Promise<void>;
+
+    /** Alias for `#unlink()` */
+    remove(path: string): Promise<void>;
+
+    /**
+     * Retrieve attributes for a resource on the server.
+     * @param path - The path to the resource to retrieve the attributes of.
+     */
+    stat(path: string): Promise<ssh2Streams.Stats>;
+
+    /**
+     * Retrieve attributes for a resource on the server. If the resource is a
+     * symlink, it retrieves the stats for the link itself instead of the
+     * resource it refers to.
+     * @param path - The path to the resource to retrieve the attributes of.
+     */
+    lstat(path: string): Promise<ssh2Streams.Stats>;
+
+    /**
+     * Set the attributes of a resource on the server.
+     * @param path - The path to the resource to set the attributes of.
+     * @param attributes - The new attributes for the resource.
+     */
+    setstat(path: string, attributes: ssh2Streams.Attributes): Promise<void>;
+
+    /**
+     * Set the access and modified times for a resource on the server.
+     * @param path - The path of the resource to set times of.
+     * @param atime - A Date or unix timestamp representing the new access time for the resource
+     * @param mtime - A Date or unix timestamp representing the new modify time for the resource
+     */
+    utimes(
+        path: string,
+        atime: Date | number,
+        mtime: Date | number
+    ): Promise<void>;
+
+    /**
+     * Set the ownership for a resource on the server.
+     * @param path - The path to the resource to change ownership of.
+     * @param uid - The id of the new owner user.
+     * @param gid - The id of the new owner group.
+     */
+    chown(path: string, uid: number, gid: number): Promise<void>;
+
+    /**
+     * Set the mode for a resource on the server.
+     * @param path - The path of the resource to set the mode of.
+     * @param mode - The new mode, a number or a string with an octal number.
+     */
+    chmod(path: string, mode: number | string): Promise<void>;
+
+    /**
+     * Read the target of a symlink on the server.
+     * @param path - The path of the symlink to read the target of.
+     */
+    readlink(path: string): Promise<string>;
+
+    /**
+     * Create a symlink on the server.
+     * @param targetPath - The path to the target of the symlink.
+     * @param linkPath - The path of the new symlink.
+     */
+    symlink(targetPath: string, linkPath: string): Promise<void>;
+
+    /**
+     * Get the absolute path from a relative path on the server.
+     * @param path - The path to get the absolute path of.
+     */
+    realpath(path: string): Promise<string>;
+
+    /**
+     * **OpenSSH extension**
+     * Performs POSIX rename(3) on a resource on the server.
+     * @param srcPath - The original path of the resource.
+     * @param destPath - The new path to rename the resource to.
+     */
+    ext_openssh_rename(srcPath: string, destPath: string): Promise<void>;
+
+    /**
+     * **OpenSSH extension**
+     * Perform POSIX fstatvfs(2) on a resource on the server.
+     * @param path - The path to get the statvfs of.
+     */
+    ext_openssh_statvfs(path: string): Promise<PromiseSftp.Statvfs>;
+
+    /**
+     * **OpenSSH extension**
+     * Perform POSIX fstatvfs(2) on a resource on the server.
+     * @param handle - A resource handle returned from `#open()` or `#fopen()`.
+     */
+    ext_openssh_fstatvfs(handle: Buffer): Promise<PromiseSftp.Statvfs>;
+
+    /**
+     * **OpenSSH extension**
+     * Performs POSIX link(2) to create a hard link on the server.
+     * @param targetPath - The path of a file to hardlink from.
+     * @param linkPath - The path of the newly created hardlink.
+     */
+    ext_openssh_hardlink(targetPath: string, linkPath: string): Promise<void>;
+
+    /**
+     * **OpenSSH extension**
+     * Perform POSIX fsync(3) on a resource on the server.
+     * @param handle - A resource handle returned from `#open()` or `#fopen()`.
+     */
+    ext_openssh_fsync(handle: Buffer): Promise<void>;
+}
+
+export = PromiseSftp;
diff --git a/types/promise-sftp/promise-sftp-tests.ts b/types/promise-sftp/promise-sftp-tests.ts
new file mode 100644
index 0000000000..90a46ab490
--- /dev/null
+++ b/types/promise-sftp/promise-sftp-tests.ts
@@ -0,0 +1,9 @@
+import PromiseSftp = require("promise-sftp");
+
+const sftp = new PromiseSftp();
+
+// $ExpectType () => boolean
+sftp.destroy;
+
+// $ExpectType typeof STATUSES
+PromiseSftp.STATUSES;
diff --git a/types/promise-sftp/tsconfig.json b/types/promise-sftp/tsconfig.json
new file mode 100644
index 0000000000..0cdbf4fb36
--- /dev/null
+++ b/types/promise-sftp/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "promise-sftp-tests.ts"]
+}
diff --git a/types/promise-sftp/tslint.json b/types/promise-sftp/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/promise-sftp/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/prop-types/index.d.ts b/types/prop-types/index.d.ts
index 67146e6cc7..f6176dd59d 100644
--- a/types/prop-types/index.d.ts
+++ b/types/prop-types/index.d.ts
@@ -1,33 +1,53 @@
 // Type definitions for prop-types 15.5
 // Project: https://github.com/reactjs/prop-types
 // Definitions by: DovydasNavickas <https://github.com/DovydasNavickas>
+//                 Ferdy Budhidharma <https://github.com/ferdaber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.8
 
-export type Validator<T> = (object: T, key: string, componentName: string, ...rest: any[]) => Error | null;
+import { ReactNode, ReactElement } from 'react';
 
-export interface Requireable<T> extends Validator<T> {
-    isRequired: Validator<T>;
+export const nominalTypeHack: unique symbol;
+
+export type IsOptional<T> = undefined | null extends T ? true : undefined extends T ? true : null extends T ? true : false;
+
+export type RequiredKeys<V> = { [K in keyof V]: V[K] extends Validator<infer T> ? IsOptional<T> extends true ? never : K : never }[keyof V];
+export type OptionalKeys<V> = Exclude<keyof V, RequiredKeys<V>>;
+export type InferPropsInner<V> = { [K in keyof V]: InferType<V[K]>; };
+
+export interface Validator<T> {
+    (props: object, propName: string, componentName: string, location: string, propFullName: string): Error | null;
+    [nominalTypeHack]?: T;
 }
 
-export type ValidationMap<T> = {[K in keyof T]?: Validator<T> };
+export interface Requireable<T> extends Validator<T | undefined | null> {
+    isRequired: Validator<NonNullable<T>>;
+}
+
+export type ValidationMap<T> = { [K in keyof T]-?: Validator<T[K]> };
+
+export type InferType<V> = V extends Validator<infer T> ? T : any;
+export type InferProps<V> =
+    & InferPropsInner<Pick<V, RequiredKeys<V>>>
+    & Partial<InferPropsInner<Pick<V, OptionalKeys<V>>>>;
 
 export const any: Requireable<any>;
-export const array: Requireable<any>;
-export const bool: Requireable<any>;
-export const func: Requireable<any>;
-export const number: Requireable<any>;
-export const object: Requireable<any>;
-export const string: Requireable<any>;
-export const node: Requireable<any>;
-export const element: Requireable<any>;
-export const symbol: Requireable<any>;
-export function instanceOf(expectedClass: {}): Requireable<any>;
-export function oneOf(types: any[]): Requireable<any>;
-export function oneOfType(types: Array<Validator<any>>): Requireable<any>;
-export function arrayOf(type: Validator<any>): Requireable<any>;
-export function objectOf(type: Validator<any>): Requireable<any>;
-export function shape(type: ValidationMap<any>): Requireable<any>;
+export const array: Requireable<any[]>;
+export const bool: Requireable<boolean>;
+export const func: Requireable<(...args: any[]) => any>;
+export const number: Requireable<number>;
+export const object: Requireable<object>;
+export const string: Requireable<string>;
+export const node: Requireable<ReactNode>;
+export const element: Requireable<ReactElement<any>>;
+export const symbol: Requireable<symbol>;
+export function instanceOf<T>(expectedClass: new (...args: any[]) => T): Requireable<T>;
+export function oneOf<T>(types: T[]): Requireable<T>;
+export function oneOfType<T extends Validator<any>>(types: T[]): Requireable<NonNullable<InferType<T>>>;
+export function arrayOf<T>(type: Validator<T>): Requireable<T[]>;
+export function objectOf<T>(type: Validator<T>): Requireable<{ [K in keyof any]: T; }>;
+export function shape<P extends ValidationMap<any>>(type: P): Requireable<InferProps<P>>;
+export function exact<P extends ValidationMap<any>>(type: P): Requireable<Required<InferProps<P>>>;
 
 /**
  * Assert that the values match with the type specs.
diff --git a/types/prop-types/prop-types-tests.ts b/types/prop-types/prop-types-tests.ts
index 4d5a939b6e..a9bde3af00 100644
--- a/types/prop-types/prop-types-tests.ts
+++ b/types/prop-types/prop-types-tests.ts
@@ -1,29 +1,207 @@
+import { ReactElement, ReactNode } from "react";
 import * as PropTypes from "prop-types";
 
+declare const uniqueType: unique symbol;
+
+class TestClass { }
+
 interface Props {
-    any: any;
+    any?: any;
     array: string[];
     bool: boolean;
-    func: any;
-    string: string;
+    element: ReactElement<any>;
+    func(foo: string): void;
+    node?: ReactNode;
+    requiredNode: NonNullable<ReactNode>;
     number: number;
+    object: object;
+    string: string;
     symbol: symbol;
-    object: {};
-    node: any;
-    element: any;
+    instanceOf: TestClass;
+    oneOf: 'a' | 'b' | 'c';
+    oneOfType: string | boolean | {
+        foo?: string;
+        bar: number;
+    };
+    numberOrFalse: false | number;
+    nodeOrRenderFn?: ReactNode | (() => ReactNode);
+    arrayOf: boolean[];
+    objectOf: { [K: string]: number };
+    shape: {
+        foo: string;
+        bar?: boolean;
+        baz?: any
+    };
+    optionalNumber?: number | null;
+    customProp?: typeof uniqueType;
 }
 
-const propTypes: PropTypes.ValidationMap<Props> = {
-    any: PropTypes.any.isRequired,
+const innerProps = {
+    foo: PropTypes.string.isRequired,
+    bar: PropTypes.bool,
+    baz: PropTypes.any
+};
+
+const arrayOfTypes = [PropTypes.string, PropTypes.bool, PropTypes.shape({
+    foo: PropTypes.string,
+    bar: PropTypes.number.isRequired
+})];
+type PropTypesMap = PropTypes.ValidationMap<Props>;
+
+// TS checking
+const propTypes: PropTypesMap = {
+    any: PropTypes.any,
     array: PropTypes.array.isRequired,
     bool: PropTypes.bool.isRequired,
+    element: PropTypes.element.isRequired,
     func: PropTypes.func.isRequired,
+    node: PropTypes.node,
+    requiredNode: PropTypes.node.isRequired,
     number: PropTypes.number.isRequired,
     object: PropTypes.object.isRequired,
     string: PropTypes.string.isRequired,
     symbol: PropTypes.symbol.isRequired,
-    node: PropTypes.node.isRequired,
-    element: PropTypes.element.isRequired
+    instanceOf: PropTypes.instanceOf(TestClass).isRequired,
+    oneOf: PropTypes.oneOf<'a' | 'b' | 'c'>(['a', 'b', 'c']).isRequired,
+    oneOfType: PropTypes.oneOfType(arrayOfTypes).isRequired,
+    numberOrFalse: PropTypes.oneOfType([PropTypes.oneOf<false>([false]), PropTypes.number]).isRequired,
+    // The generic function type (() => any) is assignable to ReactNode because ReactNode extends the empty object type {}
+    // Which widens the array literal of validators to just Array<Requireable<() => any>>
+    // It's too risky to change ReactNode to exclude {} even though it's invalid, as it's required for children-as-function props to work
+    // So we assert the explicit tuple type
+    nodeOrRenderFn: PropTypes.oneOfType([PropTypes.node, PropTypes.func] as [PropTypes.Requireable<ReactNode>, PropTypes.Requireable<() => any>]),
+    arrayOf: PropTypes.arrayOf(PropTypes.bool.isRequired).isRequired,
+    objectOf: PropTypes.objectOf(PropTypes.number.isRequired).isRequired,
+    shape: PropTypes.shape(innerProps).isRequired,
+    optionalNumber: PropTypes.number,
+    customProp: (() => null) as PropTypes.Validator<typeof uniqueType | undefined>
 };
 
-PropTypes.checkPropTypes({xs: PropTypes.array}, {xs: []}, 'location', 'componentName');
+// JS checking
+const propTypesWithoutAnnotation = {
+    any: PropTypes.any,
+    array: PropTypes.array.isRequired,
+    bool: PropTypes.bool.isRequired,
+    element: PropTypes.element.isRequired,
+    func: PropTypes.func.isRequired,
+    node: PropTypes.node,
+    requiredNode: PropTypes.node.isRequired,
+    number: PropTypes.number.isRequired,
+    object: PropTypes.object.isRequired,
+    string: PropTypes.string.isRequired,
+    symbol: PropTypes.symbol.isRequired,
+    instanceOf: PropTypes.instanceOf(TestClass).isRequired,
+    // required generic specification because of array type widening
+    oneOf: PropTypes.oneOf<'a' | 'b' | 'c'>(['a', 'b', 'c']).isRequired,
+    oneOfType: PropTypes.oneOfType(arrayOfTypes).isRequired,
+    numberOrFalse: PropTypes.oneOfType([PropTypes.oneOf<false>([false]), PropTypes.number]).isRequired,
+    nodeOrRenderFn: PropTypes.oneOfType([PropTypes.node, PropTypes.func] as [PropTypes.Requireable<ReactNode>, PropTypes.Requireable<() => any>]),
+    arrayOf: PropTypes.arrayOf(PropTypes.bool.isRequired).isRequired,
+    objectOf: PropTypes.objectOf(PropTypes.number.isRequired).isRequired,
+    shape: PropTypes.shape(innerProps).isRequired,
+    optionalNumber: PropTypes.number,
+    customProp: (() => null) as PropTypes.Validator<typeof uniqueType | undefined>
+};
+
+const partialPropTypes = {
+    number: PropTypes.number.isRequired,
+    object: PropTypes.object.isRequired,
+    string: PropTypes.string.isRequired,
+    symbol: PropTypes.symbol.isRequired,
+};
+
+const outerPropTypes = {
+    props: PropTypes.shape(propTypes).isRequired
+};
+
+const outerPropTypesWithoutAnnotation = {
+    props: PropTypes.shape(propTypesWithoutAnnotation).isRequired
+};
+
+type ExtractedArrayProps = PropTypes.InferType<(typeof arrayOfTypes)[number]>;
+
+type ExtractedInnerProps = PropTypes.InferProps<typeof innerProps>;
+
+type ExtractedProps = PropTypes.InferProps<typeof propTypes>;
+type ExtractedPropsFromOuterProps = PropTypes.InferProps<typeof outerPropTypes>['props'];
+type ExtractedPartialProps = PropTypes.InferProps<typeof partialPropTypes>;
+
+type ExtractedPropsWithoutAnnotation = PropTypes.InferProps<typeof propTypesWithoutAnnotation>;
+type ExtractedPropsFromOuterPropsWithoutAnnotation = PropTypes.InferProps<typeof outerPropTypesWithoutAnnotation>['props'];
+
+// $ExpectType: true
+type ExtractPropsMatch = ExtractedProps extends ExtractedPropsWithoutAnnotation ? true : false;
+// $ExpectType: true
+type ExtractPropsMatch2 = ExtractedPropsWithoutAnnotation extends ExtractedProps ? true : false;
+// $ExpectType: true
+type ExtractPropsMatch3 = ExtractedProps extends Props ? true : false;
+// $ExpectType: true
+type ExtractPropsMatch4 = Props extends ExtractedPropsWithoutAnnotation ? true : false;
+// $ExpectType: true
+type ExtractFromOuterPropsMatch = ExtractedPropsFromOuterProps extends ExtractedPropsFromOuterPropsWithoutAnnotation ? true : false;
+// $ExpectType: true
+type ExtractFromOuterPropsMatch2 = ExtractedPropsFromOuterPropsWithoutAnnotation extends ExtractedPropsFromOuterProps ? true : false;
+// $ExpectType: true
+type ExtractFromOuterPropsMatch3 = ExtractedPropsFromOuterProps extends Props ? true : false;
+// $ExpectType: true
+type ExtractFromOuterPropsMatch4 = Props extends ExtractedPropsFromOuterPropsWithoutAnnotation ? true : false;
+
+// $ExpectType: false
+type ExtractPropsMismatch = ExtractedPartialProps extends Props ? true : false;
+
+// $ExpectType: {}
+type UnmatchedPropKeys = Pick<ExtractedPropsWithoutAnnotation, Extract<{
+    [K in keyof ExtractedPropsWithoutAnnotation]: ExtractedPropsWithoutAnnotation[K] extends ExtractedProps[K] ? never : K
+}[keyof ExtractedPropsWithoutAnnotation], keyof ExtractedPropsWithoutAnnotation>>;
+// $ExpectType: {}
+type UnmatchedPropKeys2 = Pick<ExtractedProps, Extract<{
+    [K in keyof ExtractedProps]: ExtractedProps[K] extends ExtractedPropsWithoutAnnotation[K] ? never : K
+}[keyof ExtractedProps], keyof ExtractedProps>>;
+
+PropTypes.checkPropTypes({ xs: PropTypes.array }, { xs: [] }, 'location', 'componentName');
+
+// This would be the type that JSX sees
+type Defaultize<T, D> =
+    & Pick<T, Exclude<keyof T, keyof D>>
+    & Partial<Pick<T, Extract<keyof T, keyof D>>>
+    & Partial<Pick<D, Exclude<keyof D, keyof T>>>;
+
+// This would be the type inside the component
+type Undefaultize<T, D> =
+    & Pick<T, Exclude<keyof T, keyof D>>
+    & { [K in Extract<keyof T, keyof D>]-?: Exclude<T[K], undefined>; }
+    & Required<Pick<D, Exclude<keyof D, keyof T>>>;
+
+const componentPropTypes = {
+    fi: PropTypes.func.isRequired,
+    foo: PropTypes.string,
+    bar: PropTypes.number.isRequired,
+    baz: PropTypes.bool,
+    bat: PropTypes.node
+};
+
+const componentDefaultProps = {
+    fi: () => null,
+    baz: false,
+    bat: ['This', 'is', 'a', 'string']
+};
+
+type DefaultizedProps = Defaultize<PropTypes.InferProps<typeof componentPropTypes>, typeof componentDefaultProps>;
+type UndefaultizedProps = Undefaultize<PropTypes.InferProps<typeof componentPropTypes>, typeof componentDefaultProps>;
+
+// $ExpectType: true
+type DefaultizedPropsTest = {
+    fi?: (...args: any[]) => any;
+    foo?: string | null;
+    bar: number;
+    baz?: boolean | null;
+    bat?: ReactNode;
+} extends DefaultizedProps ? true : false;
+// $ExpectType: true
+type UndefaultizedPropsTest = {
+    fi: (...args: any[]) => any;
+    foo?: string | null;
+    bar: number;
+    baz: boolean;
+    bat: Exclude<ReactNode, undefined>;
+} extends UndefaultizedProps ? true : false;
diff --git a/types/prosemirror-model/index.d.ts b/types/prosemirror-model/index.d.ts
index 095b88f3ba..aa02f9b770 100644
--- a/types/prosemirror-model/index.d.ts
+++ b/types/prosemirror-model/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for prosemirror-model 1.4
+// Type definitions for prosemirror-model 1.5
 // Project: https://github.com/ProseMirror/prosemirror-model
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
@@ -246,7 +246,7 @@ export interface ParseOptions<S extends Schema = any> {
  * A value that describes how to parse a given DOM node or inline
  * style as a ProseMirror node or mark.
  */
-export interface ParseRule<S extends Schema = any> {
+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.
@@ -341,7 +341,7 @@ export interface ParseRule<S extends Schema = any> {
    * present, instead of parsing the node's child nodes, the result of
    * this function is used.
    */
-  getContent?: ((p: Node) => Fragment<S>) | null;
+  getContent?: (<S extends Schema = any>(p: Node, schema: S) => Fragment<S>) | null;
   /**
    * Controls whether whitespace should be preserved when parsing the
    * content inside the matched element. `false` means whitespace may
@@ -361,7 +361,7 @@ export class DOMParser<S extends Schema = any> {
    * Create a parser that targets the given schema, using the given
    * parsing rules.
    */
-  constructor(schema: S, rules: Array<ParseRule<S>>);
+  constructor(schema: S, rules: ParseRule[]);
   /**
    * The schema into which the parser parses.
    */
@@ -370,7 +370,7 @@ export class DOMParser<S extends Schema = any> {
    * The set of [parse rules](#model.ParseRule) that the parser
    * uses, in order of precedence.
    */
-  rules: Array<ParseRule<S>>;
+  rules: ParseRule[];
   /**
    * Parse a document from the content of a DOM node.
    */
diff --git a/types/prosemirror-state/index.d.ts b/types/prosemirror-state/index.d.ts
index db5a16e9d3..7ecf0f3c13 100644
--- a/types/prosemirror-state/index.d.ts
+++ b/types/prosemirror-state/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for prosemirror-state 1.1
+// Type definitions for prosemirror-state 1.2
 // Project: https://github.com/ProseMirror/prosemirror-state
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
@@ -479,6 +479,7 @@ export class EditorState<S extends Schema = any> {
     schema?: S | null;
     doc?: ProsemirrorNode<S> | null;
     selection?: Selection<S> | null;
+    storedMarks?: Mark[] | null;
     plugins?: Array<Plugin<S>> | null;
   }): EditorState<S>;
   /**
diff --git a/types/prosemirror-transform/index.d.ts b/types/prosemirror-transform/index.d.ts
index 88f97ff9e4..974a6e8475 100644
--- a/types/prosemirror-transform/index.d.ts
+++ b/types/prosemirror-transform/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for prosemirror-transform 1.0
+// Type definitions for prosemirror-transform 1.1
 // Project: https://github.com/ProseMirror/prosemirror-transform
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
@@ -143,6 +143,12 @@ export class Mapping implements Mappable {
    * mirroring information).
    */
   appendMapping(mapping: Mapping): void;
+  /**
+   * Finds the offset of the step map that mirrors the map at the
+   * given offset, in this mapping (as per the second argument to
+   * appendMap).
+   */
+  getMirror(n: number): number | undefined | null;
   /**
    * Append the inverse of the given mapping to this one.
    */
@@ -550,3 +556,15 @@ export function insertPoint<S extends Schema = any>(
   pos: number,
   nodeType: NodeType<S>
 ): number | null | undefined;
+/**
+ * Finds a position at or around the given position where the given
+ * slice can be inserted. Will look at parent nodes' nearest boundary
+ * and try there, even if the original position wasn't directly at
+ * the start or end of that node. Returns null when no position was
+ * found.
+ */
+export function dropPoint<S extends Schema = any>(
+  doc: ProsemirrorNode<S>,
+  pos: number,
+  slice: Slice<S>
+): number | null | undefined;
diff --git a/types/prosemirror-view/index.d.ts b/types/prosemirror-view/index.d.ts
index dba4fb8aec..a539be4593 100644
--- a/types/prosemirror-view/index.d.ts
+++ b/types/prosemirror-view/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for prosemirror-view 1.2
+// Type definitions for prosemirror-view 1.3
 // Project: https://github.com/ProseMirror/prosemirror-view
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 //                 David Hahn <https://github.com/davidka>
@@ -41,14 +41,46 @@ export class Decoration {
   spec: { [key: string]: any };
   /**
    * Creates a widget decoration, which is a DOM node that's shown in
-   * the document at the given position.
+   * the document at the given position. It is recommended that you
+   * delay rendering the widget by passing a function that will be
+   * called when the widget is actually drawn in a view, but you can
+   * also directly pass a DOM node. getPos can be used to find the
+   * widget's current document position.
+   *
+   * @param spec These options are supported:
+   * @param spec.side Controls which side of the document position
+   * this widget is associated with. When negative, it is drawn before
+   * a cursor at its position, and content inserted at that position
+   * ends up after the widget. When zero (the default) or positive, the
+   * widget is drawn after the cursor and content inserted there ends
+   * up before the widget.
+   *
+   * When there are multiple widgets at a given position, their side
+   * values determine the order in which they appear. Those with lower
+   * values appear first. The ordering of widgets with the same side
+   * value is unspecified.
+   *
+   * When marks is null, side also determines the marks that the widget
+   * is wrapped in—those of the node before when negative, those of
+   * the node after when positive.
+   * @param spec.marks The precise set of marks to draw around the widget.
+   * @param spec.stopEvent Can be used to control which DOM events, when
+   * they bubble out of this widget, the editor view should ignore.
+   * @param spec.key When comparing decorations of this type (in order to
+   * decide whether it needs to be redrawn), ProseMirror will by default
+   * compare the widget DOM node by identity. If you pass a key, that key
+   * will be compared instead, which can be useful when you generate
+   * decorations on the fly and don't want to store and reuse DOM nodes.
+   * Make sure that any widgets with the same key are interchangeable—if
+   * widgets differ in, for example, the behavior of some event handler,
+   * they should get different keys.
    */
   static widget(
     pos: number,
-    dom: Node,
+    toDOM: ((view: EditorView, getPos: () => number) => Node) | Node,
     spec?: {
       side?: number | null;
-      marks?: Mark[];
+      marks?: Mark[] | null;
       stopEvent?: ((event: Event) => boolean) | null;
       key?: string | null;
     }
@@ -251,6 +283,27 @@ export class EditorView<S extends Schema = any> {
    * necessary).
    */
   domAtPos(pos: number): { node: Node; offset: number };
+  /**
+   * Find the DOM node that represents the document node after the
+   * given position. May return null when the position doesn't point
+   * in front of a node or if the node is inside an opaque node view.
+   *
+   * This is intended to be able to call things like getBoundingClientRect
+   * on that DOM node. Do not mutate the editor DOM directly, or add
+   * styling this way, since that will be immediately overriden by the
+   * editor as it redraws the node.
+   */
+  nodeDOM(pos: number): Node | null | undefined;
+  /**
+   * Find the document position that corresponds to a given DOM position.
+   * (Whenever possible, it is preferable to inspect the document structure
+   * directly, rather than poking around in the DOM, but sometimes—for
+   * example when interpreting an event target—you don't have a choice.)
+   *
+   * The bias (default: -1) parameter can be used to influence which side of
+   * a DOM node to use when the position is inside a leaf node.
+   */
+  posAtDOM(node: Node, offset: number, bias?: number | null): number;
   /**
    * Find out whether the selection is at the end of a textblock when
    * moving in a given direction. When, for example, given `"left"`,
diff --git a/types/proton-native/index.d.ts b/types/proton-native/index.d.ts
index 635f180b0e..e191c00698 100644
--- a/types/proton-native/index.d.ts
+++ b/types/proton-native/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kusti8/proton-native
 // Definitions by: Nguyen Xuan Khanh <https://github.com/khanhas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -169,62 +169,7 @@ export interface AreaPathProps extends AreaBaseProps {
 
 export class AreaPath extends React.Component<AreaPathProps> { }
 
-export interface AreaTextProps extends AreaBaseProps {
-    style?: {
-        /**
-         * The background color, specified as a CSS color string.
-         */
-        backgroundColor?: string;
-        /**
-         * The text color, specified as a CSS color string.
-         */
-        color?: string;
-        /**
-         * The font family (only if available on the system).
-         */
-        fontFamily?: string;
-        /**
-         * The font size (in pt).
-         */
-        fontSize?: number;
-        /**
-         * Whether an italic font should be used.
-         */
-        fontStyle?: 'normal' | 'oblique' | 'italic';
-        /**
-         * Whether a bold font should be used (and the amount).
-         */
-        fontWeight?: 'minimum' | 'thin' | 'ultraLight' | 'light' | 'book' | 'normal' | 'medium' | 'semiBold' | 'bold' | 'ultraBold' | 'heavy' | 'ultraHeavy' | 'maximum' | number;
-        /**
-         * Wheter the text should be aligned to the left, center or right.
-         *
-         * **Works only on a top level text component, not it's children!**
-         */
-        textAlign?: 'left' | 'center' | 'right';
-        /**
-         * How wide or narrow the characters should be.
-         */
-        textStretch?: 'ultraCondensed' | 'extraCondensed' | 'condensed' | 'semiCondensed' | 'normal' | 'semiExpanded' | 'expanded' | 'extraExpanded' | 'ultraExpanded';
-        /**
-         * The text underline style.
-         */
-        textUnderline?: 'none' | 'single' | 'double' | 'suggestion';
-        /**
-         * The text underline color.
-         *
-         * A color string | 'spelling' | 'grammar' | 'auxiliary'
-         */
-        textUnderlineColor?: 'spelling' | 'grammar' | 'auxiliary' | string;
-    };
-    /**
-     * The x coordinate of the text's top left corner. (Only in a top level text component.)
-     */
-    x?: number | string;
-    /**
-     * The y coordinate of the text's top left corner. (Only in a top level text component.)
-     */
-    y?: number | string;
-}
+export interface AreaTextProps extends StyledTextProps, AreaBaseProps { }
 
 export class AreaText extends React.Component<AreaTextProps> { }
 
@@ -601,25 +546,33 @@ export interface PickerProps extends GridChildrenProps, Label, Stretchy {
     /**
      * When a *non-editable* Picker is changed. The current selection is passed as an argument.
      */
-    onSelect?: (selection: string) => void;
+    onSelect?: (selection: number) => void;
     /**
      * What element is selected if the picker *is not* editable.
      */
-    selected?: boolean;
+    selected?: number;
     /**
      * What text is selected/typed if the picker *is* editable.
      */
-    text?: boolean;
+    text?: string;
     /**
      * Whether the Picker can be seen.
      */
     visible?: boolean;
 }
 
+export interface PickerItemProps {
+    children: string;
+}
+
+export class PickerItem extends React.Component<PickerItemProps> { }
+
 /**
  * A drop down menu where the user can pick different values.
  */
-export class Picker extends React.Component<PickerProps> { }
+export class Picker extends React.Component<PickerProps> {
+    static Item: typeof PickerItem;
+}
 
 export interface ProgressBarProps extends GridChildrenProps, Label, Stretchy {
     /**
@@ -764,6 +717,65 @@ export interface Stretchy {
     stretchy?: boolean;
 }
 
+export interface StyledTextProps {
+    style?: {
+        /**
+         * The background color, specified as a CSS color string.
+         */
+        backgroundColor?: string;
+        /**
+         * The text color, specified as a CSS color string.
+         */
+        color?: string;
+        /**
+         * The font family (only if available on the system).
+         */
+        fontFamily?: string;
+        /**
+         * The font size (in pt).
+         */
+        fontSize?: number;
+        /**
+         * Whether an italic font should be used.
+         */
+        fontStyle?: 'normal' | 'oblique' | 'italic';
+        /**
+         * Whether a bold font should be used (and the amount).
+         */
+        fontWeight?: 'minimum' | 'thin' | 'ultraLight' | 'light' | 'book' | 'normal' | 'medium' | 'semiBold' | 'bold' | 'ultraBold' | 'heavy' | 'ultraHeavy' | 'maximum' | number;
+        /**
+         * Wheter the text should be aligned to the left, center or right.
+         *
+         * **Works only on a top level text component, not it's children!**
+         */
+        textAlign?: 'left' | 'center' | 'right';
+        /**
+         * How wide or narrow the characters should be.
+         */
+        textStretch?: 'ultraCondensed' | 'extraCondensed' | 'condensed' | 'semiCondensed' | 'normal' | 'semiExpanded' | 'expanded' | 'extraExpanded' | 'ultraExpanded';
+        /**
+         * The text underline style.
+         */
+        textUnderline?: 'none' | 'single' | 'double' | 'suggestion';
+        /**
+         * The text underline color.
+         *
+         * A color string | 'spelling' | 'grammar' | 'auxiliary'
+         */
+        textUnderlineColor?: 'spelling' | 'grammar' | 'auxiliary' | string;
+    };
+    /**
+     * The x coordinate of the text's top left corner. (Only in a top level text component.)
+     */
+    x?: number | string;
+    /**
+     * The y coordinate of the text's top left corner. (Only in a top level text component.)
+     */
+    y?: number | string;
+}
+
+export class StyledText extends React.Component<StyledTextProps> { }
+
 export interface TabProps extends GridChildrenProps {
     /**
      * Whether the Tab is enabled.
@@ -896,17 +908,16 @@ export class Window extends React.Component<WindowProps> { }
 export function render(element: JSX.Element): void;
 
 /**
- * A method to display an alert, or a dialog to save or open a file.
+ * A method to display an alert.
  * @param type What type the dialog is. The current types are:
  * - Message - a simple message
  * - Error - an error message
  * - Open - open a file
  * - Save - save a file
- * @param options Options for the title and description if it is a Message or Error.
- * Required one of title and description (if it is Message or Error)
+ * @param options Options for the title and descript.
  */
 export function Dialog(
-    type: 'Message' | 'Error' | 'Open' | 'Save',
+    type: 'Message' | 'Error',
     options?: {
         title: string,
         description?: string
@@ -915,3 +926,11 @@ export function Dialog(
         description: string
     }
 ): void;
+
+/**
+ * A dialog to save or open a file. Returns chosen file path.
+ * @param type What type the dialog is. The current types are:
+ * - Open - open a file
+ * - Save - save a file
+ */
+export function Dialog(type: 'Open' | 'Save'): string;
diff --git a/types/ptomasroos__react-native-multi-slider/index.d.ts b/types/ptomasroos__react-native-multi-slider/index.d.ts
index 572307b219..67c9106670 100644
--- a/types/ptomasroos__react-native-multi-slider/index.d.ts
+++ b/types/ptomasroos__react-native-multi-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ptomasroos/react-native-multi-slider#readme
 // Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { ViewStyle } from "react-native";
diff --git a/types/puppeteer/index.d.ts b/types/puppeteer/index.d.ts
index 4dea13760f..5f62134c90 100644
--- a/types/puppeteer/index.d.ts
+++ b/types/puppeteer/index.d.ts
@@ -1,15 +1,203 @@
-// Type definitions for puppeteer 1.3
+// Type definitions for puppeteer 1.6
 // Project: https://github.com/GoogleChrome/puppeteer#readme
 // Definitions by: Marvin Hagemeister <https://github.com/marvinhagemeister>
 //                 Christopher Deutsch <https://github.com/cdeutsch>
+//                 Konstantin Simon Maria Möllers <https://github.com/ksm2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
 import { EventEmitter } from "events";
 import { ChildProcess } from "child_process";
 
+/** Wraps a DOM element into an ElementHandle instance */
+export type WrapElementHandle<X> = X extends Element ? ElementHandle<X> : X;
+
+/** Unwraps a DOM element out of an ElementHandle instance */
+export type UnwrapElementHandle<X> = X extends ElementHandle<infer E> ? E : X;
+
+/** Defines `$eval` and `$$eval` for Page, Frame and ElementHandle. */
+export interface Evalable {
+  /**
+   * This method runs `document.querySelector` within the context and passes it as the first argument to `pageFunction`.
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * If `pageFunction` returns a Promise, then `$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $eval<R>(
+    selector: string,
+    pageFunction: (element: Element) => R | Promise<R>,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `document.querySelector` within the context and passes it as the first argument to `pageFunction`.
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * If `pageFunction` returns a Promise, then `$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @param x1 First argument to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $eval<R, X1>(
+    selector: string,
+    pageFunction: (element: Element, x1: UnwrapElementHandle<X1>) => R | Promise<R>,
+    x1: X1,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `document.querySelector` within the context and passes it as the first argument to `pageFunction`.
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * If `pageFunction` returns a Promise, then `$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @param x1 First argument to pass to pageFunction
+   * @param x2 Second argument to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $eval<R, X1, X2>(
+    selector: string,
+    pageFunction: (element: Element, x1: UnwrapElementHandle<X1>, x2: UnwrapElementHandle<X2>) => R | Promise<R>,
+    x1: X1,
+    x2: X2,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `document.querySelector` within the context and passes it as the first argument to `pageFunction`.
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * If `pageFunction` returns a Promise, then `$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @param x1 First argument to pass to pageFunction
+   * @param x2 Second argument to pass to pageFunction
+   * @param x3 Third argument to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $eval<R, X1, X2, X3>(
+    selector: string,
+    pageFunction: (element: Element, x1: UnwrapElementHandle<X1>, x2: UnwrapElementHandle<X2>, x3: UnwrapElementHandle<X3>) => R | Promise<R>,
+    x1: X1,
+    x2: X2,
+    x3: X3,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `document.querySelector` within the context and passes it as the first argument to `pageFunction`.
+   * If there's no element matching `selector`, the method throws an error.
+   *
+   * If `pageFunction` returns a Promise, then `$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction 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<R>(
+    selector: string,
+    pageFunction: (element: Element, ...args: any[]) => R | Promise<R>,
+    ...args: any[],
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `Array.from(document.querySelectorAll(selector))` within the context and passes it as the
+   * first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `$$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $$eval<R>(
+    selector: string,
+    pageFunction: (elements: Element[]) => R | Promise<R>,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `Array.from(document.querySelectorAll(selector))` within the context and passes it as the
+   * first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `$$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @param x1 First argument to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $$eval<R, X1>(
+    selector: string,
+    pageFunction: (elements: Element[], x1: UnwrapElementHandle<X1>) => R | Promise<R>,
+    x1: X1,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `Array.from(document.querySelectorAll(selector))` within the context and passes it as the
+   * first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `$$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @param x1 First argument to pass to pageFunction
+   * @param x2 Second argument to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $$eval<R, X1, X2>(
+    selector: string,
+    pageFunction: (elements: Element[], x1: UnwrapElementHandle<X1>, x2: UnwrapElementHandle<X2>) => R | Promise<R>,
+    x1: X1,
+    x2: X2,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `Array.from(document.querySelectorAll(selector))` within the context and passes it as the
+   * first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `$$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction Function to be evaluated in browser context
+   * @param x1 First argument to pass to pageFunction
+   * @param x2 Second argument to pass to pageFunction
+   * @param x3 Third argument to pass to pageFunction
+   * @returns Promise which resolves to the return value of pageFunction
+   */
+  $$eval<R, X1, X2, X3>(
+    selector: string,
+    pageFunction: (elements: Element[], x1: UnwrapElementHandle<X1>, x2: UnwrapElementHandle<X2>, x3: UnwrapElementHandle<X3>) => R | Promise<R>,
+    x1: X1,
+    x2: X2,
+    x3: X3,
+  ): Promise<WrapElementHandle<R>>;
+
+  /**
+   * This method runs `Array.from(document.querySelectorAll(selector))` within the context and passes it as the
+   * first argument to `pageFunction`.
+   *
+   * If `pageFunction` returns a Promise, then `$$eval` would wait for the promise to resolve and return its value.
+   *
+   * @param selector A selector to query for
+   * @param pageFunction 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<R>(
+    selector: string,
+    pageFunction: (elements: Element[], ...args: any[]) => R | Promise<R>,
+    ...args: any[]
+  ): Promise<WrapElementHandle<R>>;
+}
+
 /** Keyboard provides an api for managing a virtual keyboard. */
 export interface Keyboard {
   /**
@@ -147,7 +335,9 @@ export type PageEvents =
   | "request"
   | "requestfailed"
   | "requestfinished"
-  | "response";
+  | "response"
+  | "workercreated"
+  | "workerdestroyed";
 
 export type BrowserEvents =
   | "disconnected"
@@ -452,22 +642,57 @@ export interface Box {
   y: number;
 }
 
+/**
+ * The Worker class represents a WebWorker.
+ * The events workercreated and workerdestroyed are emitted on the page object to signal the worker lifecycle.
+ */
+export interface Worker {
+  /**
+   * If the function passed to the `worker.evaluate` returns a Promise,
+   * then `worker.evaluate` would wait for the promise to resolve and return its value.
+   *
+   * If the function passed to the `worker.evaluate` returns a non-Serializable value,
+   * then `worker.evaluate` resolves to `undefined`.
+   */
+  evaluate<T>(
+    pageFunction: (...args: any[]) => T | Promise<T>,
+    ...args: any[],
+  ): Promise<T>;
+
+  /**
+   * The only difference between `worker.evaluate` and `worker.evaluateHandle` is
+   * that `worker.evaluateHandle` returns in-page object (JSHandle).
+   */
+  evaluateHandle<T>(
+    pageFunction: (...args: any[]) => T | Promise<T>,
+    ...args: any[],
+  ): Promise<T>;
+
+  executionContext(): Promise<ExecutionContext>;
+
+  url(): string;
+}
+
 /**
  * Represents an in-page DOM element. ElementHandles can be created with the page.$ method.
  */
-export interface ElementHandle extends JSHandle {
+export interface ElementHandle<E extends Element = Element> extends JSHandle, Evalable {
   /**
-   * The method runs element.querySelector within the page. If no element matches the selector, the return value resolve to null.
+   * 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 [].
+   * 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[]>;
+
   /**
    * @param selector XPath expression to evaluate.
    */
@@ -502,6 +727,10 @@ export interface ElementHandle extends JSHandle {
    * If the element is detached from DOM, the method throws an error.
    */
   hover(): Promise<void>;
+  /**
+   * Resolves to true if the element is visible in the current viewport.
+   */
+  isIntersectingViewport(): Promise<boolean>;
   /**
    * 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.
@@ -635,6 +864,8 @@ export type ErrorCode =
   | "aborted"
   | "accessdenied"
   | "addressunreachable"
+  | "blockedbyclient"
+  | "blockedbyresponse"
   | "connectionaborted"
   | "connectionclosed"
   | "connectionfailed"
@@ -683,6 +914,10 @@ export interface Request {
    * All header names are lower-case.
    */
   headers(): Headers;
+
+  /** Whether this request is driving frame's navigation. */
+   isNavigationRequest(): boolean;
+
   /** Returns the request's method (GET, POST, etc.) */
 
   method(): HttpMethod;
@@ -761,46 +996,25 @@ export interface Response {
   url(): string;
 }
 
-export interface FrameBase {
+export interface FrameBase extends Evalable {
   /**
-   * The method runs document.querySelector within the page.
-   * If no element matches the selector, the return value resolve to null.
+   * The method queries frame for the selector.
+   * If there's no such element within the frame, the method will 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 [].
+   * The method runs document.querySelectorAll within the frame.
+   * If no elements match the selector, the return value resolve to [].
    */
   $$(selector: string): Promise<ElementHandle[]>;
+
   /**
+   * The method evaluates the XPath expression.
    * @param expression XPath expression to evaluate.
    */
   $x(expression: 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,
-    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>;
 
@@ -963,6 +1177,15 @@ export interface PageEventObj {
   requestfinished: Request;
   /** Emitted when a response is received. */
   response: Response;
+  /** Emitted when a dedicated WebWorker is spawned by the page. */
+  workercreated: Worker;
+  /** Emitted when a dedicated WebWorker is terminated. */
+  workerdestroyed: Worker;
+}
+
+export interface PageCloseOptions {
+  /** Defaults to `false`. Whether to run the before unload page handlers. */
+  runBeforeUnload?: boolean;
 }
 
 /** Page provides methods to interact with a single tab in Chromium. One Browser instance might have multiple Page instances. */
@@ -999,8 +1222,11 @@ export interface Page extends EventEmitter, FrameBase {
   /** Brings page to front (activates tab). */
   bringToFront(): Promise<void>;
 
+  /** Get the browser the page belongs to. */
+  browser(): Browser;
+
   /** Closes the current page. */
-  close(): Promise<void>;
+  close(options?: PageCloseOptions): Promise<void>;
 
   /**
    * Gets the cookies.
@@ -1080,6 +1306,9 @@ export interface Page extends EventEmitter, FrameBase {
   /** Returns the virtual keyboard. */
   keyboard: Keyboard;
 
+  /** Indicates that the page has been closed. */
+  isClosed(): boolean;
+
   /** Page is guaranteed to have a main frame which persists during navigation's. */
   mainFrame(): Frame;
 
@@ -1213,6 +1442,19 @@ export interface Page extends EventEmitter, FrameBase {
    * @param options The navigation parameters.
    */
   waitForNavigation(options?: NavigationOptions): Promise<Response>;
+
+  waitForRequest(
+    urlOrPredicate: string | ((req: Request) => boolean),
+    options?: { timeout?: number }
+  ): Promise<Request>;
+
+  waitForResponse(
+    urlOrPredicate: string | ((res: Response) => boolean),
+    options?: { timeout?: number }
+  ): Promise<Response>;
+
+  /** This method returns all of the dedicated WebWorkers associated with the page. */
+  workers(): Worker[];
 }
 
 /** A Browser is created when Puppeteer connects to a Chromium instance, either through puppeteer.launch or puppeteer.connect. */
@@ -1240,12 +1482,24 @@ export interface Browser extends EventEmitter {
     handler: (e: BrowserEventObj[K], ...args: any[]) => void
   ): this;
 
+  /**
+   * Returns an array of all open browser contexts.
+   * In a newly created browser, this will return a single instance of BrowserContext.
+   */
+  browserContexts(): BrowserContext[];
+
   /**
    * 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>;
 
+  /**
+   * Creates a new incognito browser context.
+   * This won't share cookies/cache with other browser contexts.
+   */
+  createIncognitoBrowserContext(): Promise<BrowserContext>;
+
   /**
    * 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.
@@ -1291,15 +1545,83 @@ export interface BrowserEventObj {
   targetdestroyed: Target;
 }
 
+/**
+ * BrowserContexts provide a way to operate multiple independent browser sessions.
+ * When a browser is launched, it has a single BrowserContext used by default.
+ * The method `browser.newPage()` creates a page in the default browser context.
+ */
+export interface BrowserContext 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 BrowserContextEventObj>(
+    eventName: K,
+    handler: (e: BrowserContextEventObj[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 BrowserContextEventObj>(
+    eventName: K,
+    handler: (e: BrowserContextEventObj[K], ...args: any[]) => void
+  ): this;
+
+  /** The browser this browser context belongs to. */
+  browser(): Browser;
+
+  /** Closes the browser context. All the targets that belong to the browser context will be closed. */
+  close(): Promise<void>;
+
+  /**
+   * Returns whether BrowserContext is incognito.
+   * The default browser context is the only non-incognito browser context.
+   */
+  isIncognito(): boolean;
+
+  /** Creates a new page in the browser context. */
+  newPage(): Promise<Page>;
+
+  /** An array of all active targets inside the browser context. */
+  targets(): Target[];
+}
+
+export interface BrowserContextEventObj {
+  /** Emitted when the url of a target inside the browser context changes. */
+  targetchanged: Target;
+
+  /** Emitted when a target is created, for example when a new page is opened by `window.open` or `browserContext.newPage`. */
+  targetcreated: Target;
+
+  /** Emitted when a target is destroyed, for example when a page is closed. */
+  targetdestroyed: Target;
+}
+
 export interface Target {
+  /** Get the browser the target belongs to. */
+  browser(): Browser;
+
+  /** The browser context the target belongs to. */
+  browserContext(): BrowserContext;
+
   /** Creates a Chrome Devtools Protocol session attached to the target. */
   createCDPSession(): Promise<CDPSession>;
 
+  /** Get the target that opened this target. Top-level targets return `null`. */
+  opener(): Target | null;
+
   /** 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";
+  type(): "page" | "background_page" | "service_worker" | "browser" | "other";
 
   /** Returns the target URL. */
   url(): string;
@@ -1389,6 +1711,8 @@ export interface Coverage {
 export interface StartCoverageOptions {
   /** Whether to reset coverage on every navigation. Defaults to `true`. */
   resetOnNavigation?: boolean;
+  /** Whether anonymous scripts generated by the page should be reported. Defaults to `false`. */
+  reportAnonymousScripts?: boolean;
 }
 
 export interface CoverageEntry {
diff --git a/types/puppeteer/puppeteer-tests.ts b/types/puppeteer/puppeteer-tests.ts
index 05065e043a..e883157fec 100644
--- a/types/puppeteer/puppeteer-tests.ts
+++ b/types/puppeteer/puppeteer-tests.ts
@@ -27,8 +27,8 @@ import * as puppeteer from "puppeteer";
   // Get the "viewport" of the page, as reported by the page.
   const dimensions = await page.evaluate(() => {
     return {
-      width: document.documentElement.clientWidth,
-      height: document.documentElement.clientHeight,
+      width: document.documentElement!.clientWidth,
+      height: document.documentElement!.clientHeight,
       deviceScaleFactor: window.devicePixelRatio
     };
   });
@@ -275,15 +275,32 @@ puppeteer.launch().then(async browser => {
   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;
-  });
+  const elementText = await page.$eval(
+    '#someElement',
+    (
+      element,  // $ExpectType Element
+    ) => {
+      element.innerHTML; // $ExpectType string
+      return element.innerHTML;
+    }
+  );
+  elementText; // $ExpectType string
 
-  elementText = await page.$$eval('.someClassName', (elements) => {
-    console.log(elements.length);
-    console.log(elements.item(0).outerHTML);
-    return elements[3].innerHTML;
-  });
+  // If one returns a DOM reference, puppeteer will wrap an ElementHandle instead
+  const someElement = await page.$$eval(
+    '.someClassName',
+    (
+      elements, // $ExpectType Element[]
+    ) => {
+      console.log(elements.length);
+      console.log(elements[0].outerHTML);
+      return elements[3] as HTMLDivElement;
+    }
+  );
+  someElement; // $ExpectType ElementHandle<HTMLDivElement>
+
+  // If one passes an ElementHandle, puppeteer will unwrap its DOM reference instead
+  await page.$eval('.hello-world', (e, x1) => (x1 as any).noWrap, someElement);
 
   browser.close();
 })();
@@ -338,3 +355,44 @@ puppeteer.launch().then(async browser => {
 
   await page.tracing.start({ path: "trace.json", categories: ["one", "two"] });
 });
+
+// 1.5: From the BrowserContext example
+(async () => {
+  const browser = await puppeteer.launch();
+  // Create a new incognito browser context
+  const context = await browser.createIncognitoBrowserContext();
+  // Create a new page inside context.
+  const page = await context.newPage();
+  // ... do stuff with page ...
+  await page.goto('https://example.com');
+  // Dispose context once it's no longer needed.
+  await context.close();
+});
+
+// 1.5: From the Worker example
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  page.on('workercreated', worker => console.log('Worker created: ' + worker.url()));
+  page.on('workerdestroyed', worker => console.log('Worker destroyed: ' + worker.url()));
+
+  console.log('Current workers:');
+  for (const worker of page.workers())
+    console.log('  ' + worker.url());
+});
+
+// Test conditional types
+(async () => {
+  const browser = await puppeteer.launch();
+  const page = await browser.newPage();
+  const eh = await page.$('tr.something') as puppeteer.ElementHandle<HTMLTableRowElement>;
+  const index = await page.$eval(
+    '.demo',
+    (
+      e, // $ExpectType Element
+      x1, // $ExpectType HTMLTableRowElement
+    ) => x1.rowIndex,
+    eh,
+  );
+  index; // $ExpectType number
+});
diff --git a/types/puppeteer/v0/puppeteer-tests.ts b/types/puppeteer/v0/puppeteer-tests.ts
index 913d46a789..963fb1c8c1 100644
--- a/types/puppeteer/v0/puppeteer-tests.ts
+++ b/types/puppeteer/v0/puppeteer-tests.ts
@@ -27,8 +27,8 @@ import * as puppeteer from "puppeteer";
   // Get the "viewport" of the page, as reported by the page.
   const dimensions = await page.evaluate(() => {
     return {
-      width: document.documentElement.clientWidth,
-      height: document.documentElement.clientHeight,
+      width: document.documentElement!.clientWidth,
+      height: document.documentElement!.clientHeight,
       deviceScaleFactor: window.devicePixelRatio
     };
   });
diff --git a/types/qhistory/index.d.ts b/types/qhistory/index.d.ts
index 301f6b4391..84bd4e6d83 100644
--- a/types/qhistory/index.d.ts
+++ b/types/qhistory/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pshrmn/qhistory#readme
 // Definitions by: Diogo Franco <https://github.com/Kovensky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.3
 
 export as namespace qhistory;
 
diff --git a/types/qiniu-js/index.d.ts b/types/qiniu-js/index.d.ts
new file mode 100644
index 0000000000..b47bc0528e
--- /dev/null
+++ b/types/qiniu-js/index.d.ts
@@ -0,0 +1,371 @@
+// Type definitions for qiniu-js 2.4
+// Project: https://github.com/qiniu/js-sdk#readme
+// Definitions by: taoqf <https://github.com/taoqf>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export as namespace qiniu;
+
+export interface Next {
+	total: {
+		loaded: number;	// 已上传大小，单位为字节。
+		total: number;	// 本次上传的总量控制信息，单位为字节，注意这里的 total 跟文件大小并不一致。
+		percent: number;	// 当前上传进度，范围：0～100。
+	};
+}
+
+export interface Error {
+	code: number;	// 请求错误状态码，只有在 err.isRequestError 为 true 的时候才有效。可查阅码值对应说明。
+	message: string;	// 错误信息，包含错误码，当后端返回提示信息时也会有相应的错误信息。
+	isRequestError: true | undefined;	// 用于区分是否 xhr 请求错误；当 xhr 请求出现错误并且后端通过 HTTP 状态码返回了错误信息时，该参数为 true；否则为 undefined 。
+	reqId: string;	// xhr请求错误的 X-Reqid。
+}
+
+export interface AudioInfo {
+	bit_rate: string;
+	channels: number;
+	codec_name: string;
+	codec_type: string;
+	duration: string;
+	index: number;
+	nb_frames: string;
+	r_frame_rate: string;
+	sample_fmt: string;
+	sample_rate: string;
+	start_time: string;
+	tags: {
+		creation_time: string;
+		[key: string]: string;
+	};
+}
+
+export interface AvFormat {
+	bit_rate: string;
+	duration: string;
+	format_long_name: string;
+	format_name: string;
+	nb_streams: number;
+	size: string;
+	start_time: string;
+	tags: {
+		creation_time: string;
+		[key: string]: string;
+	};
+}
+
+export interface VideoInfo {
+	bit_rate: string;
+	codec_name: string;
+	codec_type: string;
+	display_aspect_ratio: string;
+	duration: string;
+	height: number;
+	index: number;
+	nb_frames: string;
+	pix_fmt: string;
+	r_frame_rate: string;
+	sample_aspect_ratio: string;
+	start_time: string;
+	tags: {
+		creation_time: string;
+		[key: string]: string;
+	};
+	width: number;
+}
+
+export interface AvAudioInfo {
+	audio: AudioInfo;
+	format: AvFormat;
+	video: VideoInfo;
+}
+
+export interface AvImageInfo {
+	format: string;
+	width: number;
+	height: number;
+	colorModel: string;
+}
+
+export interface CompletedResult {
+	avinfo?: AvAudioInfo;
+	imageInfo?: AvImageInfo;
+	key: string;
+	name: string;
+	size: number;
+	persistentid: string;
+	sec: string;
+	ext: string;
+	bucket: string;
+}
+
+export interface Observer {
+	next(res: Next): void;
+	error(err: Error | string): void;
+	complete(res: CompletedResult): void;
+}
+
+export interface Subscription {
+	unsubscribe(): void;
+}
+
+export interface Observable {
+	subscribe(options: Observer): Subscription;
+	/**
+	 * 订阅
+	 *
+	 * @param next 接收上传进度信息
+	 * @param error 上传错误后触发；自动重试本身并不会触发该错误，而当重试次数到达上限后则可以触发。当不是 xhr 请求错误时，会把当前错误产生原因直接抛出，诸如 JSON 解析异常等；当产生 xhr 请求错误时，参数 err 为一个包含 code、message、isRequestError 三个属性的 object
+	 * @param complete 接收上传完成后的后端返回信息，具体返回结构取决于后端sdk的配置，可参考[上传策略](https://developer.qiniu.com/kodo/manual/1206/put-policy)。
+	 * @returns
+	 */
+	subscribe(next: (obj: Next) => void, error?: (err: Error | string) => void, complete?: (obj: CompletedResult) => void): Subscription;
+}
+
+export interface Extra {
+	fname: string;	// 文件原文件名
+	params: any;	// 用来放置自定义变量
+	mimeType: string[] | null;	// 用来限制上传文件类型，为 null 时表示不对文件类型限制；限制类型放到数组里： ["image/png", "image/jpeg", "image/gif"]
+}
+
+export interface Config {
+	useCdnDomain: boolean;
+	region: Region | string;
+}
+
+/**
+ * 上传文件
+ * @param file Blob 对象，上传的文件
+ * @param key 文件资源名
+ * @param token 上传验证信息，前端通过接口请求后端获得
+ * @param putExtra
+ * @param config
+ */
+export function upload(file: Blob, key: string | null | undefined, token: string, putExtra: Partial<Extra>, config: Partial<Config>): Observable;
+
+/**
+ * 返回创建文件的 url；当分片上传时，我们需要把分片返回的 ctx 信息拼接后通过该 url 上传给七牛以创建文件。
+ *
+ * @param url 上传域名，可以通过qiniu.getUploadUrl()获得
+ * @param size 文件大小
+ * @param key 文件资源名
+ * @param putExtra
+ * @returns
+ */
+export function createMkFileUrl(url: string, size: number, key: string, putExtra: Partial<Extra>): string;
+
+export enum Region {
+	z0,	// 代表华东区域
+	z1,		// 代表华北区域
+	z2,		// 代表华南区域
+	na0,		// 代表北美区域
+	as0		// 代表新加坡区域
+}
+
+export namespace region {
+	const z0: Region;
+	const z1: Region;
+	const z2: Region;
+	const na0: Region;
+	const as0: Region;
+}
+
+/**
+ * 接收参数为 config 对象，返回根据 config 里所配置信息的上传域名
+ *
+ * @param config
+ * @param token
+ * @returns
+ */
+export function getUploadUrl(config: Partial<Config>, token: string): Promise<string>;
+
+export interface Headers {
+	[key: string]: string;
+}
+
+/**
+ * 返回 object，包含用来获得分片上传设置的头信息，参数为 token 字符串；当分片上传时，请求需要带该函数返回的头信息
+ *
+ * @param token
+ * @returns
+ */
+export function getHeadersForChunkUpload(token: string): Headers;
+
+/**
+ * 返回 object，包含用来获得文件创建的头信息，参数为 token 字符串；当分片上传完需要把 ctx 信息传给七牛用来创建文件时，请求需要带该函数返回的头信息
+ *
+ * @param token
+ * @returns
+ */
+export function getHeadersForMkFile(token: string): Headers;
+
+/**
+ * 返回[[k, v],...]格式的数组，k 为自定义变量 key 名，v 为自定义变量值，用来提取 putExtra.params 包含的自定义变量
+ *
+ * @param params
+ * @returns
+ */
+export function filterParams(params: any): Array<[string, any]>;
+
+export interface CompressOptions {
+	quality: number;	// 图片压缩质量，在图片格式为 image/jpeg 或 image/webp 的情况下生效，其他格式不会生效，可以从 0 到 1 的区间内选择图片的质量。默认值 0.92
+	maxWidh: number;	// 压缩图片的最大宽度值
+	maxHeight: number;	// 压缩图片的最大高度值 （注意：当 maxWidth 和 maxHeight 都不设置时，则采用原图尺寸大小）
+	noCompressIfLarger: boolean;	// 为 true 时如果发现压缩后图片大小比原来还大，则返回源图片（即输出的 dist 直接返回了输入的 file）；默认 false，即保证图片尺寸符合要求，但不保证压缩后的图片体积一定变小
+}
+
+/**
+ * 上传前图片压缩
+ *
+ * @param file 要压缩的源图片，为 blob 对象，支持 image/png、image/jpeg、image/bmp、image/webp 这几种图片类型
+ * @param options
+ * @returns
+ */
+export function compressImage(file: Blob, options: Partial<CompressOptions>): Promise<{
+	dist: Blob;	// 压缩后输出的 blob 对象，或原始的 file，具体看下面的 options 配置
+	width: number;	// 压缩后的图片宽度
+	height: number;	// 压缩后的图片高度
+}>;
+
+export interface WaterMarkOptions1 {
+	mode: 1; // 图片水印
+	image: string; // 图片水印的Url，mode = 1 时 **必需**
+	dissolve: number; // 透明度，取值范围1-100，非必需，下同
+	gravity: 'NorthWest' | 'North' | 'NorthEast' | 'West' | 'Center' | 'East' | 'SouthWest' | 'South' | 'SouthEast'; // 水印位置
+	dx: number;  // 横轴边距，单位:像素(px)
+	dy: number; // 纵轴边距，单位:像素(px)
+}
+
+export interface WaterMarkOptions2 {
+	mode: 2;  // 文字水印
+	text: string; // 水印文字，mode = 2 时 **必需**
+	dissolve: number;          // 透明度，取值范围1-100，非必需，下同
+	gravity: 'NorthWest' | 'North' | 'NorthEast' | 'West' | 'Center' | 'East' | 'SouthWest' | 'South' | 'SouthEast'; // 水印位置
+	fontsize: number;         // 字体大小，单位: 缇
+	font: string;           // 水印文字字体
+	dx: number;               // 横轴边距，单位:像素(px)
+	dy: number;               // 纵轴边距，单位:像素(px)
+	fill: string;        // 水印文字颜色，RGB格式，可以是颜色名称
+}
+
+/**
+ * 水印
+ *
+ * @param options 包含的具体水印参数解释见水印（[watermark](https://developer.qiniu.com/dora/manual/1316/image-watermarking-processing-watermark)）
+ * @param key 文件资源名
+ * @param domain 为七牛空间（bucket)对应的域名，选择某个空间后，可通过"空间设置->基本设置->域名设置"查看获取，前端可以通过接口请求后端得到
+ * @returns 返回添加水印后的图片地址,可以赋值给 html 的 img 元素的 src 属性, 若未指定key，可以通过以下方式获得完整的 imgLink
+ * `imgLink  =  '<domain>/<key>?' +  imgLink`
+ * <domain> 为七牛空间（bucket)对应的域名，选择某个空间后，可通过"空间设置->基本设置->域名设置"查看获取
+ */
+export function watermark(options: WaterMarkOptions1 | WaterMarkOptions2, key?: string, domain?: string): string;
+
+export interface ImageView2Options {
+	mode: 0 | 1 | 2 | 3 | 4 | 5;	// 缩略模式，共6种[0-5]
+	w: number;	// 具体含义由缩略模式决定
+	h: number;	// 具体含义由缩略模式决定
+	q: number;	// 新图的图像质量，取值范围：1-100
+	format: 'jpg' | 'gif' | 'png' | 'webp' | string;	// 新图的输出格式，取值范围：jpg，gif，png，webp等
+}
+
+/**
+ * 缩略
+ *
+ * @param options 具体缩略参数解释见[图片基本处理（imageView2）](https://developer.qiniu.com/dora/manual/1279/basic-processing-images-imageview2)
+ * @param key
+ * @param domain
+ * @returns 返回处理后的图片url
+ */
+export function imageView2(options: Partial<ImageView2Options>, key: string, domain: string): string;
+
+export interface ImageMogr2Options {
+	'auto-orient': boolean;		// 布尔值，是否根据原图EXIF信息自动旋正，便于后续处理，建议放在首位。
+	strip: boolean;				// 布尔值，是否去除图片中的元信息
+	thumbnail: string;			// 缩放操作参数
+	crop: string;				// 裁剪操作参数
+	gravity: string;			// 裁剪锚点参数
+	quality: number;			// 图片质量，取值范围1-100
+	rotate: number;			// 旋转角度，取值范围1-360，缺省为不旋转。
+	format: string;				// 新图的输出格式，取值范围：jpg，gif，png，webp等
+	blur: string;				// 高斯模糊参数
+}
+
+/**
+ * 返回处理后的图片url
+ *
+ * @param optoins 具体高级图像处理参数解释见[图像高级处理（imageMogr2）](https://developer.qiniu.com/dora/manual/1270/the-advanced-treatment-of-images-imagemogr2)
+ * @param key
+ * @param domain
+ * @returns 返回处理后的图片url
+ */
+export function imageMogr2(optoins: Partial<ImageMogr2Options>, key: string, domain: string): string;
+
+export interface ImageInfo {
+	size: number;							// 文件大小，单位：Bytes
+	format: 'png' | 'jpeg' | 'gif' | 'bmp';	// 图片类型，如png、jpeg、gif、bmp等。
+	width: number;							// 图片宽度，单位：像素(px) 。
+	height: number;							// 图片高度，单位：像素(px) 。
+	colorModel: string;						// 彩色空间，如palette16、ycbcr等。
+	frameNumber: number;					// 帧数，gif 图片会返回此项。
+}
+
+/**
+ *
+ * 图片基本信息
+ * 具体 imageInfo 解释见[图片基本信息（imageInfo）](https://developer.qiniu.com/dora/manual/1269/pictures-basic-information-imageinfo)
+ *
+ * @param key
+ * @param domain
+ * @returns
+ */
+export function imageInfo(key: string, domain: string): Promise<ImageInfo>;
+
+export interface ExtendedInfo {
+	code: number;
+	error: string;
+	[key: string]: {
+		type: number;
+		val: string;
+	} | number | string;
+}
+
+export interface ExtentInfoValue {
+	type: number;
+	val: string;
+}
+
+export interface ExtentInfo {
+	[key: string]: ExtentInfoValue;
+	DateTime: ExtentInfoValue;
+	ExposureBiasValue: ExtentInfoValue;
+	ExposureTime: ExtentInfoValue;
+	Model: ExtentInfoValue;
+	ISOSpeedRatings: ExtentInfoValue;
+	ResolutionUnit: ExtentInfoValue;
+}
+
+/**
+ * EXIF 信息
+ * 具体 exif 解释见[图片 EXIF 信息（exif）](https://developer.qiniu.com/dora/manual/1260/photo-exif-information-exif)
+ * @param key
+ * @param domain
+ * @returns
+ */
+export function exif(key: string, domain: string): Promise<ExtentInfo>;
+
+export interface WaterMarkFopOptions1 extends WaterMarkOptions1 {
+	fop: 'watermark';
+}
+
+export interface WaterMarkFopOptions2 extends WaterMarkOptions2 {
+	fop: 'watermark';
+}
+
+export interface ImageView2FopOptions extends ImageView2Options {
+	fop: 'imageView2';
+}
+
+export interface ImageMogr2FopOptions extends ImageMogr2Options {
+	fop: 'imageMogr2';
+}
+
+export function pipeline(fos: Array<(WaterMarkFopOptions1 | WaterMarkFopOptions2 | ImageView2FopOptions | ImageMogr2FopOptions)>, key: string, domain: string): string;
diff --git a/types/qiniu-js/qiniu-js-tests.ts b/types/qiniu-js/qiniu-js-tests.ts
new file mode 100644
index 0000000000..344f38b195
--- /dev/null
+++ b/types/qiniu-js/qiniu-js-tests.ts
@@ -0,0 +1,50 @@
+import { compressImage, region, upload } from 'qiniu-js';
+
+const file: Blob = null as any;
+
+const config = {
+	useCdnDomain: true,
+	region: region.z2
+};
+
+const key = 'key';
+const token = 'token';
+
+const putExtra = {
+	fname: "",
+	params: {},
+	mimeType: [] || null
+};
+
+(() => {
+	const observable = upload(file, key, token, putExtra, config);
+
+	const subscription = observable.subscribe({
+		next(res) { },
+		complete(res) { },
+		error(err) { }
+	}); // 上传开始
+	subscription.unsubscribe(); // 上传取消
+})();
+
+(() => {
+	const observable = upload(file, key, token, putExtra, config);
+	const subscription = observable.subscribe((res) => { }, (err) => { }, (res) => { }); // 这样传参形式也可以
+})();
+
+(async () => {
+	// 图片上传前压缩：
+	const options = {
+		quality: 0.92,
+		noCompressIfLarger: true
+		// maxWidth: 1000,
+		// maxHeight: 618
+	};
+	const data = await compressImage(file, options);
+	const observable = upload(data.dist, key, token, putExtra, config);
+	const subscription = observable.subscribe({
+		next(res) { },
+		complete(res) { },
+		error(err) { }
+	}); // 上传开始
+})();
diff --git a/types/qiniu-js/test/qiniu-js-global-tests.ts b/types/qiniu-js/test/qiniu-js-global-tests.ts
new file mode 100644
index 0000000000..e3820d1438
--- /dev/null
+++ b/types/qiniu-js/test/qiniu-js-global-tests.ts
@@ -0,0 +1,48 @@
+const file: Blob = null as any;
+
+const config = {
+	useCdnDomain: true,
+	region: qiniu.region.z2
+};
+
+const key = 'key';
+const token = 'token';
+
+const putExtra = {
+	fname: "",
+	params: {},
+	mimeType: [] || null
+};
+
+(() => {
+	const observable = qiniu.upload(file, key, token, putExtra, config);
+
+	const subscription = observable.subscribe({
+		next(res) { },
+		complete(res) { },
+		error(err) { }
+	}); // 上传开始
+	subscription.unsubscribe(); // 上传取消
+})();
+
+(() => {
+	const observable = qiniu.upload(file, key, token, putExtra, config);
+	const subscription = observable.subscribe((res) => { }, (err) => { }, (res) => { }); // 这样传参形式也可以
+})();
+
+(async () => {
+	// 图片上传前压缩：
+	const options = {
+		quality: 0.92,
+		noCompressIfLarger: true
+		// maxWidth: 1000,
+		// maxHeight: 618
+	};
+	const data = await qiniu.compressImage(file, options);
+	const observable = qiniu.upload(data.dist, key, token, putExtra, config);
+	const subscription = observable.subscribe({
+		next(res) { },
+		complete(res) { },
+		error(err) { }
+	}); // 上传开始
+})();
diff --git a/types/qiniu-js/tsconfig.json b/types/qiniu-js/tsconfig.json
new file mode 100644
index 0000000000..15efaa0a4c
--- /dev/null
+++ b/types/qiniu-js/tsconfig.json
@@ -0,0 +1,25 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"strictFunctionTypes": true,
+		"lib": [
+			"dom",
+			"es6"
+		],
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts",
+		"qiniu-js-tests.ts",
+		"test/qiniu-js-global-tests.ts"
+	]
+}
\ No newline at end of file
diff --git a/types/qiniu-js/tslint.json b/types/qiniu-js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/qiniu-js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/qlik-engineapi/index.d.ts b/types/qlik-engineapi/index.d.ts
index f0f95301c3..bf2355e88f 100644
--- a/types/qlik-engineapi/index.d.ts
+++ b/types/qlik-engineapi/index.d.ts
@@ -4412,12 +4412,7 @@ declare namespace EngineAPI {
     /**
      * NxCellRows...
      */
-    interface INxCellRows {
-        /**
-         * Array of data.
-         */
-        NxCellRows: INxCell[];
-    }
+    type INxCellRows = INxCell[];
 
     /**
      * INxDataPage...
@@ -8715,7 +8710,7 @@ declare namespace EngineAPI {
         /**
          * Information on the measure.
          */
-        qMeasureInfo: INxMeasureInfo;
+        qMeasureInfo: INxMeasureInfo[];
 
         /**
          * Sort order of the columns in the hypercube.
@@ -9270,6 +9265,7 @@ declare namespace EngineAPI {
      * DimensionItemLayout...
      */
     interface IDimensionItemLayout {
+        qInfo: INxInfo;
         qMeta: INxMetaTitleDescriptionTag;
         qData: null;
     }
@@ -9302,7 +9298,7 @@ declare namespace EngineAPI {
      * GenericDimensionsListProperties width extend GenericProperties
      */
     interface IGenericDimensionsListProperties extends IGenericProperties {
-        qInfo: IGenericMeassureListNxInfo;
+        qInfo: IGenericDimensionListNxInfo;
         qDimensionListDef: IDimensionListDef;
     }
 
diff --git a/types/qrcode.react/index.d.ts b/types/qrcode.react/index.d.ts
index f730ee7581..01e8ef18af 100644
--- a/types/qrcode.react/index.d.ts
+++ b/types/qrcode.react/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for qrcode.react 0.6
+// Type definitions for qrcode.react 0.8
 // Project: https://github.com/zpao/qrcode.react
 // Definitions by: Mleko <https://github.com/mleko>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
@@ -13,6 +13,7 @@ declare namespace qrcode {
 		bgColor?: string;
 		fgColor?: string;
 		level?: "L"|"M"|"Q"|"H";
+		renderAs?: "svg" | "canvas";
 	}
 
 	type QRCode = React.ComponentClass<QRCodeProps>;
diff --git a/types/qrcode.react/qrcode.react-tests.tsx b/types/qrcode.react/qrcode.react-tests.tsx
index 25136d1a97..b91c1e7944 100644
--- a/types/qrcode.react/qrcode.react-tests.tsx
+++ b/types/qrcode.react/qrcode.react-tests.tsx
@@ -9,4 +9,5 @@ const qrcodes = [
 	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" level="L"/>,
 	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" level="H"/>,
 	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" size={256} bgColor="pink" fgColor="red" level="Q"/>,
+	<QRCode value="https://github.com/DefinitelyTyped/DefinitelyTyped" renderAs="svg"/>,
 ];
diff --git a/types/query-string/index.d.ts b/types/query-string/index.d.ts
index db823e67d2..8a2f4a30ea 100644
--- a/types/query-string/index.d.ts
+++ b/types/query-string/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for query-string 5.1
+// Type definitions for query-string 6.1
 // Project: https://github.com/sindresorhus/query-string
 // Definitions by: Sam Verschueren <https://github.com/SamVerschueren>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 HuHuanming <https://github.com/huhuanming>
 //                 Madara Uchiha <https://github.com/MadaraUchiha>
+//                 Josh Holmer <https://github.com/shssoichiro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
 export interface ParseOptions {
     arrayFormat?: 'bracket' | 'index' | 'none';
+    decode?: boolean;
 }
 
 /**
diff --git a/types/query-string/query-string-tests.ts b/types/query-string/query-string-tests.ts
index 6e948cf6e5..69c70655ed 100644
--- a/types/query-string/query-string-tests.ts
+++ b/types/query-string/query-string-tests.ts
@@ -24,6 +24,7 @@ import * as queryString from 'query-string';
     let fooBar: { foo: 'bar' };
     fooBar = queryString.parse('?foo=bar');
     fooBar = queryString.parse('#foo=bar');
+    fooBar = queryString.parse('?foo=bar%20baz', { decode: true });
 
     let fooBarBaz: { foo: ['bar', 'baz'] };
     fooBarBaz = queryString.parse('&foo=bar&foo=baz');
diff --git a/types/querystringify/index.d.ts b/types/querystringify/index.d.ts
new file mode 100644
index 0000000000..e61ecbbeac
--- /dev/null
+++ b/types/querystringify/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for querystringify 2.0
+// Project: https://github.com/unshiftio/querystringify
+// Definitions by: Ilya Verbitskiy <https://github.com/ilich>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// TypeScript Version: 2.2
+export function parse(query: string): object;
+
+// TypeScript Version: 2.2
+export function stringify(obj: object, prefix?: string | boolean): string;
diff --git a/types/querystringify/querystringify-tests.ts b/types/querystringify/querystringify-tests.ts
new file mode 100644
index 0000000000..ab53b19667
--- /dev/null
+++ b/types/querystringify/querystringify-tests.ts
@@ -0,0 +1,11 @@
+import * as qs from "querystringify";
+
+qs.parse('?foo=bar');         // { foo: 'bar' }
+qs.parse('foo=bar');          // { foo: 'bar' }
+qs.parse('foo=bar&bar=foo');  // { foo: 'bar', bar: 'foo' }
+qs.parse('foo&bar=foo');      // { foo: '', bar: 'foo' }
+
+qs.stringify({ foo: 'bar' });       // foo=bar
+qs.stringify({ foo: 'bar' }, true); // ?foo=bar
+qs.stringify({ foo: 'bar' }, '&');  // &foo=bar
+qs.stringify({ foo: '' }, '&');     // &foo=
diff --git a/types/querystringify/tsconfig.json b/types/querystringify/tsconfig.json
new file mode 100644
index 0000000000..af37d0399e
--- /dev/null
+++ b/types/querystringify/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",
+        "querystringify-tests.ts"
+    ]
+}
diff --git a/types/querystringify/tslint.json b/types/querystringify/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/querystringify/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/quill/index.d.ts b/types/quill/index.d.ts
index 6cc5c824c5..0eda9a4eff 100644
--- a/types/quill/index.d.ts
+++ b/types/quill/index.d.ts
@@ -3,6 +3,8 @@
 // Definitions by: Sumit <https://github.com/sumitkm>
 //                 Guillaume <https://github.com/guillaume-ro-fr>
 //                 James Garbutt <https://github.com/43081j>
+//                 Aniello Falcone <https://github.com/AnielloFalcone>
+//                 Mohammad Hossein Amri <https://github.com/mhamri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { Blot } from 'parchment/dist/src/blot/abstract/blot';
@@ -41,6 +43,7 @@ export interface KeyboardStatic {
 }
 
 export interface ClipboardStatic {
+    convert(html?: string): DeltaStatic;
     addMatcher(selectorOrNodeType: string|number, callback: (node: any, delta: DeltaStatic) => DeltaStatic): void;
     dangerouslyPasteHTML(html: string, source?: Sources): void;
     dangerouslyPasteHTML(index: number, html: string, source?: Sources): void;
@@ -142,6 +145,7 @@ export class Quill implements EventEmitter {
     root: HTMLDivElement;
     clipboard: ClipboardStatic;
     scroll: Blot;
+    keyboard: KeyboardStatic;
     constructor(container: string | Element, options?: QuillOptionsStatic);
     deleteText(index: number, length: number, source?: Sources): DeltaStatic;
     disable(): void;
@@ -173,6 +177,8 @@ export class Quill implements EventEmitter {
     formatText(index: number, length: number, source?: Sources): DeltaStatic;
     formatText(index: number, length: number, format: string, value: any, source?: Sources): DeltaStatic;
     formatText(index: number, length: number, formats: StringMap, source?: Sources): DeltaStatic;
+    formatText(range: RangeStatic, format: string, value: any, source?: Sources): DeltaStatic;
+    formatText(range: RangeStatic, formats: StringMap, source?: Sources): DeltaStatic;
     getFormat(range?: RangeStatic): StringMap;
     getFormat(index: number, length?: number): StringMap;
     removeFormat(index: number, length: number, source?: Sources): DeltaStatic;
diff --git a/types/quill/quill-tests.ts b/types/quill/quill-tests.ts
index bda294251d..073e68f115 100644
--- a/types/quill/quill-tests.ts
+++ b/types/quill/quill-tests.ts
@@ -79,6 +79,21 @@ function test_formatText2() {
     });
 }
 
+function test_formatText3() {
+    const quillEditor = new Quill('#editor');
+    const range = {index: 0, length: 5};
+    quillEditor.formatText(range, 'bold', true);
+}
+
+function test_formatText4() {
+    const quillEditor = new Quill('#editor');
+    const range = {index: 0, length: 5};
+    quillEditor.formatText(range, {
+        bold: false,
+        color: 'rgb(0, 0, 255)'
+    });
+}
+
 function test_formatLine1() {
     const quillEditor = new Quill('#editor');
     quillEditor.formatLine(1, 3, 'api');
@@ -114,7 +129,7 @@ function test_updateContents() {
     }));
 }
 
-function test_setContents() {
+function test_setDeltaContents() {
     const quillEditor = new Quill('#editor');
     quillEditor.setContents(new Delta({ ops: [
         { insert: 'Hello ' },
@@ -123,11 +138,19 @@ function test_setContents() {
     ]}));
 }
 
-function test_setText() {
+function test_setTextContents() {
     const quillEditor = new Quill('#editor');
     quillEditor.setText('Hello\n');
 }
 
+function test_setHtmlContents() {
+    const quillEditor = new Quill('#editor');
+    const html = "<b>this is a bold text</b>";
+    const delta = quillEditor.clipboard.convert(html);
+    quillEditor.setContents(delta);
+    quillEditor.clipboard.convert();
+}
+
 function test_getSelection() {
     const quillEditor = new Quill('#editor');
     const range = quillEditor.getSelection();
diff --git a/types/qunit/index.d.ts b/types/qunit/index.d.ts
index 2b7eb586ff..c5e677d187 100644
--- a/types/qunit/index.d.ts
+++ b/types/qunit/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for QUnit v2.5.0
 // Project: http://qunitjs.com/
 // Definitions by: James Bracy <https://github.com/waratuman>
+//                 Mike North <https://github.com/mike-north>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 interface Assert {
@@ -234,6 +235,32 @@ interface Assert {
      */
     throws(block: () => void, expected?: any, message?: any): void;
     raises(block: () => void, expected?: any, message?: any): void;
+
+    /**
+     * A marker for progress in a given test.
+     * 
+     * The `step()` assertion registers a passing assertion with a provided message. This makes 
+     * it easy to check that specific portions of code are being executed, especially in 
+     * asynchronous test cases and when used with `verifySteps()`. 
+     * 
+     * Together with the `verifySteps()` method, `step()` assertions give you an easy way
+     * to verify both the count and order of code execution.
+     * 
+     * @param message Message to display for the step
+     */
+    step(message: string): void;
+
+    /**
+     * A helper assertion to verify the order and number of steps in a test.
+     * 
+     * The assert.verifySteps() assertion compares a given array of string values (representing steps)
+     * with the order and values of previous step() calls. This assertion is helpful for verifying
+     * the order and count of portions of code paths, especially asynchronous ones.
+     * 
+     * @param steps Array of strings representing steps to verify
+     * @param message A short description of the assertion
+     */
+    verifySteps(steps: string[], message?: string): void;
  
 }
 
@@ -313,6 +340,38 @@ interface NestedHooks {
     
 }
 
+declare namespace QUnit {
+    interface BeginDetails { totalTests: number }
+    interface DoneDetails { failed: number, passed: number, total: number, runtime: number }
+    interface LogDetails {
+        result: boolean,
+        actual: any;
+        expected: any;
+        message: string;
+        source: string;
+        module: string;
+        name: string;
+        runtime: number;
+    }
+    interface ModuleDoneDetails {
+        name: string;
+        failed: number;
+        passed: number;
+        total: number;
+        runtime: number;
+    }
+    interface ModuleStartDetails { name: string }
+    interface TestDoneDetails {
+        name: string;
+        module: string;
+        failed: number;
+        passed: number;
+        total: number;
+        runtime: number;
+    }
+    interface TestStartDetails { name: string; module: string; }
+}
+
 interface QUnit {
     
     /**
@@ -333,7 +392,7 @@ interface QUnit {
      * 
      * @callback callback Callback to execute.
      */
-    begin(callback: (details: { totalTests: number }) => void): void;
+    begin(callback: (details: QUnit.BeginDetails) => void): void;
 
     /**
      * Configuration for QUnit
@@ -348,7 +407,7 @@ interface QUnit {
      * 
      * @param callback Callback to execute
      */
-    done(callback: (details: { failed: number, passed: number, total: number, runtime: number }) => void): void;
+    done(callback: (details: QUnit.DoneDetails) => void): void;
 
     /**
      * Advanced and extensible data dumping for JavaScript.
@@ -392,16 +451,7 @@ interface QUnit {
      * 
      * @param callback Callback to execute 
      */
-    log(callback: (details: {
-        result: boolean,
-        actual: any;
-        expected: any;
-        message: string;
-        source: string;
-        module: string;
-        name: string;
-        runtime: number;
-    }) => void): void;
+    log(callback: (details: QUnit.LogDetails) => void): void;
 
     /**
      * Group related tests under a single label.
@@ -449,20 +499,14 @@ interface QUnit {
      * 
      * @param callback Callback to execute
      */
-    moduleDone(callback: (details: {
-        name: string;
-        failed: number;
-        passed: number;
-        total: number;
-        runtime: number;
-    }) => void): void;
+    moduleDone(callback: (details: QUnit.ModuleDoneDetails) => void): void;
 
     /**
      * Register a callback to fire whenever a module begins.
      * 
      * @param callback Callback to execute
      */
-    moduleStart(callback: (details: { name: string }) => void): void;
+    moduleStart(callback: (details: QUnit.ModuleStartDetails) => void): void;
 
     /**
      * Adds a test to exclusively run, preventing all other tests from running.
@@ -578,7 +622,7 @@ interface QUnit {
      * 
      * @param callback Callback to execute
      */
-    testStart(callback: (details: { name: string; module: string;}) => void): void;
+    testStart(callback: (details: QUnit.TestStartDetails) => void): void;
 
     /**
      * Adds a test which expects at least one failing assertion during its run.
diff --git a/types/qunit/qunit-tests.ts b/types/qunit/qunit-tests.ts
index e726113604..ae519cd0bc 100644
--- a/types/qunit/qunit-tests.ts
+++ b/types/qunit/qunit-tests.ts
@@ -214,13 +214,33 @@ QUnit.log(function( details ) {
   console.log( output );
 });
 
-QUnit.moduleDone(function( details ) {
-  console.log( "Finished running: ", details.name, "Failed/total: ", details.failed, details.total );
+QUnit.log(function( details: QUnit.LogDetails ) {
+  let x: { actual: number; expected: number; message: string; module: string; name: string; result: boolean; runtime: number; source: string } = details;
+  x = details;
 });
 
-QUnit.moduleStart(function( details ) {
+QUnit.begin(function( details: QUnit.BeginDetails ) {
+  console.log( "Total tests running: ", details.totalTests);
+});
+
+QUnit.done(function( details: QUnit.DoneDetails ) {
+  console.log( "Finished. Failed/total: ", details.failed, details.total, details.passed, details.runtime );
+});
+
+QUnit.moduleDone(function( details: QUnit.ModuleDoneDetails ) {
+  console.log( "Finished running: ", details.name, "Failed/total: ", details.failed, details.total, details.passed, details.runtime );
+});
+
+QUnit.moduleStart(function( details: QUnit.ModuleStartDetails ) {
   console.log( "Now running: ", details.name );
 });
+QUnit.testDone(function( details: QUnit.TestDoneDetails ) {
+  console.log( "Finished running: ", details.name, "Failed/total: ", details.failed, details.total, details.passed, details.runtime);
+});
+
+QUnit.testStart(function( details: QUnit.TestStartDetails ) {
+  console.log( "Now running: ", details.name, ' from module ', details.module );
+});
 
 let Robot: any = () => {};
 
@@ -562,3 +582,11 @@ equivResult = QUnit.equiv({}, {});
 equivResult = QUnit.equiv(1, 2);
 equivResult = QUnit.equiv('foo', 'bar');
 equivResult = QUnit.equiv(['foo'], ['bar']);
+
+
+QUnit.test('steps', assert => {
+  assert.step('one');
+  assert.step('two');
+  assert.step('three');
+  assert.verifySteps(['one', 'two', 'three'], 'Counting to three correctly');
+});
diff --git a/types/radium/index.d.ts b/types/radium/index.d.ts
index ce5ae3776a..d8d56caf26 100644
--- a/types/radium/index.d.ts
+++ b/types/radium/index.d.ts
@@ -1,8 +1,8 @@
 // Type definitions for radium 0.24.0
 // Project: https://github.com/formidablelabs/radium
-// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Philipp Holzer <https://github.com/nupplaphil>, Alexey Svetliakov <https://github.com/asvetliakov>, Mikael Hermansson <https://github.com/mihe>
+// Definitions by: Alex Gorbatchev <https://github.com/alexgorbatchev>, Philipp Holzer <https://github.com/nupplaphil>, Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/ramda/index.d.ts b/types/ramda/index.d.ts
index cc9616f131..a33fde5f5f 100644
--- a/types/ramda/index.d.ts
+++ b/types/ramda/index.d.ts
@@ -9,7 +9,6 @@
 //                 Vítor Castro <https://github.com/teves-castro>
 //                 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>
@@ -23,6 +22,7 @@
 //                 Maciek Blim <https://github.com/blimusiek>
 //                 Marcin Biernat <https://github.com/biern>
 //                 Rayhaneh Banyassady <https://github.com/rayhaneh>
+//                 Ryan McCuaig <https://github.com/rgm>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -31,7 +31,7 @@ declare let R: R.Static;
 declare namespace R {
     type Omit<T, K extends string> = Pick<T, Exclude<keyof T, K>>;
 
-    type Ord = number | string | boolean;
+    type Ord = number | string | boolean | Date;
 
     type Path = ReadonlyArray<(number | string)>;
 
@@ -971,6 +971,7 @@ declare namespace R {
          * Returns a list containing the names of all the enumerable own
          * properties of the supplied object.
          */
+        keys<T extends object>(x: T): Array<keyof T>;
         keys<T>(x: T): string[];
 
         /**
@@ -1074,6 +1075,16 @@ declare namespace R {
         /**
          * Like mapObj, but but passes additional arguments to the predicate function.
          */
+        mapObjIndexed<T, TResult>(
+            fn: (value: T, key: string, obj?: {
+                [key: string]: T
+            }) => TResult,
+            obj: {
+                [key: string]: T
+            }
+        ): {
+            [key: string]: TResult
+        };
         mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult, obj: any): { [index: string]: TResult };
         mapObjIndexed<T, TResult>(fn: (value: T, key: string, obj?: any) => TResult): (obj: any) => { [index: string]: TResult };
 
diff --git a/types/ramda/ramda-tests.ts b/types/ramda/ramda-tests.ts
index 32bae5fa0c..dcd2ea0a43 100644
--- a/types/ramda/ramda-tests.ts
+++ b/types/ramda/ramda-tests.ts
@@ -502,6 +502,20 @@ R.times(i, 5);
     R.mapObjIndexed(prependKeyAndDouble, values); // => { x: 'x2', y: 'y4', z: 'z6' }
 });
 
+(() => {
+    const testObject: {
+        [key: string]: Error
+    } = {
+        hello: new Error('hello'),
+    };
+    const errorMessages = R.mapObjIndexed(
+        function test(value, key) {
+            // value should be inferred.
+            return value.message + String(key);
+        }, testObject);
+    console.log(errorMessages);
+});
+
 (() => {
     const a: number[]   = R.ap([R.multiply(2), R.add(3)], [1, 2, 3]); // => [2, 4, 6, 4, 5, 6]
     const b: number[][] = R.of([1]); // => [[1]]
@@ -1560,7 +1574,10 @@ class Rectangle {
 };
 
 () => {
-    R.keys({a: 1, b: 2, c: 3}); // => ['a', 'b', 'c']
+    const objKeys = R.keys({a: 1, b: 2, c: 3}); // => ['a', 'b', 'c']
+    const numberKeys = R.keys(1);
+    const arrayKeys = R.keys([]);
+    const stringKeys = R.keys('foo');
 };
 
 () => {
@@ -2300,10 +2317,12 @@ class Rectangle {
     const c = {x: 3};
     const d = {x: "a"};
     const e = {x: "z"};
+    const f = {x: new Date(0)};
+    const g = {x: new Date(60 * 1000)};
     R.maxBy(cmp, a, c); // => {x: 3}
     R.maxBy(cmp)(a, c); // => {x: 3}
     R.maxBy(cmp)(a)(b);
-    R.maxBy(cmp)(d)(e);
+    R.maxBy(cmp)(f)(g);
 };
 
 () => {
@@ -2331,10 +2350,13 @@ class Rectangle {
     const c = {x: 3};
     const d = {x: "a"};
     const e = {x: "z"};
+    const f = {x: new Date(0)};
+    const g = {x: new Date(60 * 1000)};
     R.minBy(cmp, a, b); // => {x: 1}
     R.minBy(cmp)(a, b); // => {x: 1}
     R.minBy(cmp)(a)(c);
     R.minBy(cmp, d, e);
+    R.minBy(cmp)(f)(g);
 };
 
 () => {
diff --git a/types/random-js/index.d.ts b/types/random-js/index.d.ts
index ff1417b681..86926b9beb 100644
--- a/types/random-js/index.d.ts
+++ b/types/random-js/index.d.ts
@@ -27,7 +27,7 @@ interface Random {
     sample<T>(population: T[], sampleSize: number): T[];
     die(sideCount: number): number;
     dice(sideCount: number, dieCount: number): number[];
-    uuid4(engine: Random.Engine): string;
+    uuid4(engine?: Random.Engine): string;
     string(engine: Random.Engine, length: number): string;
     string(length?: number, pool?: string): string;
     hex(length?: number, upperCase?: boolean): string;
diff --git a/types/random-js/random-js-tests.ts b/types/random-js/random-js-tests.ts
index ef438e18c5..936a2a4693 100644
--- a/types/random-js/random-js-tests.ts
+++ b/types/random-js/random-js-tests.ts
@@ -86,7 +86,8 @@ sampled = random.sample(customTypeArray, 2);
 numeric = random.die(5);
 dieValues = random.dice(5, 2);
 
-uuid = Random.uuid4(engine);
+uuid = random.uuid4(engine);
+uuid = random.uuid4();
 
 str = random.string();
 str = random.string(10);
diff --git a/types/randomcolor/index.d.ts b/types/randomcolor/index.d.ts
index afa6bf4a69..8a95bf6d65 100644
--- a/types/randomcolor/index.d.ts
+++ b/types/randomcolor/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for randomColor 0.4.1
+// Type definitions for randomColor 0.5.0
 // Project: https://github.com/davidmerfield/randomColor
 // Definitions by: Mathias Feitzinger <https://github.com/feitzi>, Brady Liles <https://github.com/BradyLiles>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -11,6 +11,7 @@ interface RandomColorOptions {
 	count?: number;
 	seed?: number | string;
 	format?: "hsvArray" | "hslArray" | "hsl" | "hsla" | "rgbArray" | "rgb" | "rgba" | "hex";
+	alpha?: number;
 }
 
 declare module "randomcolor" {
diff --git a/types/rc-select/index.d.ts b/types/rc-select/index.d.ts
index 5fdae43949..30fc16507f 100644
--- a/types/rc-select/index.d.ts
+++ b/types/rc-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/select
 // Definitions by: Denis Tirilis <https://github.com/DenisTirilis>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
@@ -20,41 +20,55 @@ export {
 
 declare namespace RcSelect {
     interface SelectProps {
-        className?: string;
-        prefixCls?: string;
-        animation?: string;
-        transitionName?: string;
-        choiceTransitionName?: string;
-        dropdownMatchSelectWidth?: boolean;
-        dropdownClassName?: string;
-        dropdownStyle?: { [key: string]: string };
-        dropdownMenuStyle?: { [key: string]: string };
-        notFoundContent?: string;
-        showSearch?: boolean;
         allowClear?: boolean;
-        tags?: boolean;
-        maxTagTextLength?: number;
+        animation?: string;
+        choiceTransitionName?: string;
+        className?: string;
         combobox?: boolean;
-        multiple?: boolean;
+        defaultActiveFirstOption?: boolean;
+        defaultLabel?: string | Array<string>;
+        defaultValue?: string | Array<string>;
         disabled?: boolean;
+        dropdownClassName?: string;
+        dropdownMatchSelectWidth?: boolean;
+        dropdownMenuStyle?: { [key: string]: string };
+        dropdownStyle?: { [key: string]: string };
         filterOption?: boolean;
+        getPopupContainer?: (trigger: Node) => Node;
+        getInputElement?: () => Node;
+        id?: string;
+        labelInValue?: boolean;
+        maxTagCount?: number;
+        maxTagPlaceholder?: React.ReactNode | Function;
+        maxTagTextLength?: number;
+        multiple?: boolean;
+        notFoundContent?: string;
+        onBlur?: () => void;
+        onChange?: (value: string, label: string) => void;
+        onDeselect?: (value: string, option: Option) => void;
+        onFocus?: () => void;
+        onInputKeyDown?: (e: Event) => void;
+        onPopupScroll?: () => void;
+        onSearch?: () => void;
+        onSelect?: (value: string, ontion: Option) => void;
         optionFilterProp?: string;
         optionLabelProp?: string;
-        defaultValue?: string | Array<string>;
+        placeholder?: React.ReactNode;
+        prefixCls?: string;
+        showAction?: string[];
+        showArrow?: boolean;
+        showSearch?: boolean;
+        tags?: boolean;
+        tokenSeparators?: string[];
+        transitionName?: string;
         value?: string | Array<string>;
-        onChange?: (value: string, label: string) => void;
-        onSearch?: Function;
-        onSelect?: (value: string, ontion: Option) => void;
-        onDeselect?: Function;
-        defaultLabel?: string | Array<string>;
-        defaultActiveFirstOption?: boolean;
-        getPopupContainer?: (trigger: Node) => Node;
     }
     export class Select extends React.Component<SelectProps> { }
     interface OptionProps {
         className?: string;
         disabled?: boolean;
         key?: string;
+        title?: string;
         value?: string;
     }
     export class Option extends React.Component<OptionProps> { }
diff --git a/types/rc-slider/README.md b/types/rc-slider/README.md
index 6c56f6c2e1..10c7dec387 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: Fri, 15 Dec 2017
+ * Last updated: Sun, 04 Aug 2018
  * Dependencies: react
  * Global values: none
 
diff --git a/types/rc-slider/index.d.ts b/types/rc-slider/index.d.ts
index 139f4e2ef0..420d836034 100644
--- a/types/rc-slider/index.d.ts
+++ b/types/rc-slider/index.d.ts
@@ -1,13 +1,15 @@
-// Type definitions for rc-slider 8.2
+// Type definitions for rc-slider 8.6
 // Project: https://github.com/react-component/slider
 // 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>
+//                 Deanna Veale <https://github.com/Deanna2>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
+import { RCTooltip } from 'rc-tooltip';
 
 export interface Marks {
     [number: number]:
@@ -67,18 +69,6 @@ export interface CommonApiProps {
      *  @default false
      */
     dots?: boolean;
-    /**
-     * onBeforeChange will be triggered when ontouchstart or onmousedown is triggered.
-     */
-    onBeforeChange?(value: any): any | undefined;
-    /**
-     * onChange will be triggered while the value of Slider changing.
-     */
-    onChange?(value: any): any | undefined;
-    /**
-     * onAfterChange will be triggered when ontouchend or onmouseup is triggered.
-     */
-    onAfterChange?(value: any): any | undefined;
 
     /**
      * @deprecated in version ^6.0.0. Use rc-tooltip
@@ -124,6 +114,18 @@ export interface CommonApiProps {
 }
 
 export interface SliderProps extends CommonApiProps {
+    /**
+     * onBeforeChange will be triggered when ontouchstart or onmousedown is triggered.
+     */
+    onBeforeChange?(value: number): void;
+    /**
+     * onChange will be triggered while the value of Slider changing.
+     */
+    onChange?(value: number): void;
+    /**
+     * onAfterChange will be triggered when ontouchend or onmouseup is triggered.
+     */
+    onAfterChange?(value: number): void;
     /**
      * Set initial value of slider.
      *  @default 0
@@ -136,6 +138,21 @@ export interface SliderProps extends CommonApiProps {
 }
 
 export interface RangeProps extends CommonApiProps {
+    /**
+     * onBeforeChange will be triggered when ontouchstart or onmousedown is triggered.
+     * For prop (count = -1) type returned is [number, undefined]. Bug raised in rc-slider https://github.com/react-component/slider/issues/457
+     */
+    onBeforeChange?(value: number[]): void;
+    /**
+     * onChange will be triggered while the value of Slider changing.
+     * For prop (count = -1) type returned is [number, undefined]. Bug raised in rc-slider https://github.com/react-component/slider/issues/457
+     */
+    onChange?(value: number[]): void;
+    /**
+     * onAfterChange will be triggered when ontouchend or onmouseup is triggered.
+     * For prop (count = -1) type returned is [number, undefined]. Bug raised in rc-slider https://github.com/react-component/slider/issues/457
+     */
+    onAfterChange?(value: number[]): void;
     /**
      * Set initial positions of handles.
      *  @default [0,0]
@@ -178,9 +195,14 @@ export interface HandleProps extends CommonApiProps {
     offset: number;
 }
 
+export interface WithTooltipProps {
+    tipFormatter?: (value: number) => React.ReactNode;
+    tipProps?: Partial<RCTooltip.Props>;
+}
+
 export default class Slider extends React.Component<SliderProps> { }
 export class Range extends React.Component<RangeProps> { }
 export class Handle extends React.Component<HandleProps> { }
 
-export function createSliderWithTooltip(slider: typeof Slider): new() => Slider;
-export function createSliderWithTooltip(range: typeof Range): new() => Range;
+export function createSliderWithTooltip(slider: typeof Slider): new() => React.Component<WithTooltipProps & SliderProps>;
+export function createSliderWithTooltip(range: typeof Range): new() => React.Component<WithTooltipProps & RangeProps>;
diff --git a/types/rc-slider/rc-slider-tests.tsx b/types/rc-slider/rc-slider-tests.tsx
index e08a674dca..5b246dd7ab 100644
--- a/types/rc-slider/rc-slider-tests.tsx
+++ b/types/rc-slider/rc-slider-tests.tsx
@@ -18,6 +18,11 @@ ReactDOM.render(
     />,
     document.querySelector('.another-app')
 );
+
+const onChangeFunc1 = (string: number) => {};
+
+const onChangeFunc2 = (string: number[]) => {};
+
 ReactDOM.render(
     <Slider
         className="bottomRight"
@@ -30,9 +35,9 @@ ReactDOM.render(
         included={true}
         disabled={false}
         dots={true}
-        onBeforeChange={() => { }}
-        onChange={() => { }}
-        onAfterChange={() => { }}
+        onBeforeChange={onChangeFunc1}
+        onChange={onChangeFunc1}
+        onAfterChange={onChangeFunc1}
         defaultValue={0.1}
         value={0.1}
         style={{backgroundColor: 'plum'}}
@@ -49,6 +54,9 @@ ReactDOM.render(
         count={3}
         allowCross={false}
         pushable={true}
+        onChange={onChangeFunc2}
+        onAfterChange={onChangeFunc2}
+        onBeforeChange={onChangeFunc2}
     />,
     document.querySelector('.app')
 );
@@ -62,3 +70,8 @@ ReactDOM.render(
     <RangeWithTooltip defaultValue={[1]} max={2} step={0.01} min={0.01} />,
     document.querySelector('.app')
 );
+
+ReactDOM.render(
+    <SliderWithTooltip defaultValue={1} max={2} step={0.01} min={0.01} tipProps={{ placement: 'right' }}/>,
+    document.querySelector('.app')
+);
diff --git a/types/rc-tooltip/index.d.ts b/types/rc-tooltip/index.d.ts
index 9222d9f149..e752404f21 100644
--- a/types/rc-tooltip/index.d.ts
+++ b/types/rc-tooltip/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: rhysd <https://rhysd.github.io>
 //                 ahstro <http://ahst.ro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/rc-tree/index.d.ts b/types/rc-tree/index.d.ts
index 1ec7cc1e26..e2ac50d20d 100644
--- a/types/rc-tree/index.d.ts
+++ b/types/rc-tree/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-component/tree
 // Definitions by: John Reilly <https://github.com/johnnyreilly>, Methuselah96 <https://github.com/Methuselah96>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
+// TypeScript Version: 2.8
 
 import { Component } from "react";
 
@@ -110,6 +110,8 @@ export interface OnDropData {
     node: InternalTreeNode;
     dragNode: InternalTreeNode;
     dragNodesKeys: string[];
+    dropPosition: number;
+    dropToGap?: boolean;
 }
 
 export interface OnDragEndData {
diff --git a/types/rc-tree/rc-tree-tests.tsx b/types/rc-tree/rc-tree-tests.tsx
index 99f67beca2..dfe9b517c9 100644
--- a/types/rc-tree/rc-tree-tests.tsx
+++ b/types/rc-tree/rc-tree-tests.tsx
@@ -13,24 +13,18 @@ interface State {
 }
 
 export class Demo extends React.Component<Props, State> {
-    constructor(props: Props) {
-        super(props);
-
-        const keys = this.props.keys;
-        this.state = {
+    static initState({keys}: Props) {
+        return {
             defaultExpandedKeys: keys,
             defaultSelectedKeys: keys,
             defaultCheckedKeys: keys,
             switchIt: true,
         };
     }
-
     static defaultProps: Props = {
         keys: ['0-0-0-0'],
     };
-
-    getInitialState() {
-    }
+    state = Demo.initState(this.props);
 
     onExpand(expandedKeys: string[]) {
         console.log('onExpand', expandedKeys, arguments);
diff --git a/types/rdflib/index.d.ts b/types/rdflib/index.d.ts
new file mode 100644
index 0000000000..f6e1c82ba7
--- /dev/null
+++ b/types/rdflib/index.d.ts
@@ -0,0 +1,1169 @@
+// Type definitions for rdflib 0.17
+// Project: https://github.com/linkeddata/rdflib.js
+// Definitions by: Cénotélie <https://github.com/cenotelie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Acknowledgements: This work has been financed by Logilab SA, FRANCE, logilab.fr
+
+/**
+ * Class orders
+ */
+export const ClassOrder: {
+    [id: string]: number;
+};
+/**
+ * A type for values that serves as inputs
+ */
+export type ValueType = Node | Date | string | number | boolean | undefined;
+/**
+ * The superclass of all RDF Statement objects, that is NamedNode, Literal, BlankNode, etc.
+ */
+export class Node {
+    /**
+     * The type of node
+     */
+    termType: string;
+    /**
+     * Whether this node is a variable
+     */
+    isVar: boolean;
+    /**
+     * The class order for this node
+     */
+    classOrder: number;
+    /**
+     * The nod's value
+     */
+    value: string;
+    /**
+     * Gets the substituted node for this one, according to the specified bindings
+     * @param bindings Bindings of identifiers to nodes
+     */
+    substitute(bindings: { [id: string]: Node }): Node;
+    /**
+     * Compares this node with another
+     * @param term The other node
+     */
+    compareTerm(term: Node): number;
+    /**
+     * Gets whether the two nodes are equal
+     * @param other The other node
+     */
+    equals(other: Node): boolean;
+    /**
+     * Gets a hash for this node
+     */
+    hashString(): string;
+    /**
+     * Gets whether this node is the same as the other one
+     * @param other Another node
+     */
+    sameTerm(other: Node): boolean;
+    /**
+     * Gets the canonical string representation of this node
+     */
+    toCanonical(): string;
+    /**
+     * Gets the n-triples string representation of this node
+     */
+    toNT(): string;
+    /**
+     * Gets the string representation of this node
+     */
+    toString(): string;
+    /**
+     * Gets a node for the specifed input
+     * @param value An input value
+     */
+    static fromValue(value: ValueType): Node | ValueType;
+    /**
+     * Gets the javascript object equivalent to a node
+     * @param term The RDF node
+     */
+    static toJS(term: Node): any;
+}
+/**
+ * An empty node
+ */
+export class Empty extends Node {
+    constructor();
+    static termType: string;
+}
+/**
+ * A collection of other RDF nodes
+ */
+export class Collection extends Node {
+    /**
+     * The identifier for this collection
+     */
+    id: string;
+    /**
+     * The nodes in this collection
+     */
+    elements: Node[];
+    /**
+     * Whether this collection is closed
+     */
+    closed: boolean;
+    /**
+     * Initializes this collection
+     * @param initial The initial elements
+     */
+    constructor(initial: ReadonlyArray<ValueType>);
+    /**
+     * Appends an element to this collection
+     * @param element The new element
+     */
+    append(element: Node): number;
+    /**
+     * Closes this collection
+     */
+    close(): boolean;
+    /**
+     * Removes the first element from the collection (and return it)
+     */
+    shift(): Node;
+    /**
+     * Preprends the specified element to the colelction's front
+     * @param element The element to preprend
+     */
+    unshift(element: Node): number;
+    static termType: string;
+}
+/**
+ * An RDF blank node
+ */
+export class BlankNode extends Node {
+    /**
+     * The identifier for the blank node
+     */
+    id: string;
+    /**
+     * Whether this is a blank node
+     */
+    isBlank: boolean;
+    /**
+     * Initializes this node
+     * @param id The identifier for the blank node
+     */
+    constructor(id: string);
+    /**
+     * Gets a copy of this blank node in the specified formula
+     * @param formula The formula
+     */
+    copy(formula: Formula): BlankNode;
+    /**
+     * The next unique identifier for blank nodes
+     */
+    static nextId: number;
+    static termType: string;
+    static NTAnonymousNodePrefix: string;
+}
+/**
+ * A named (IRI) RDF node
+ */
+export class NamedNode extends Node {
+    /**
+     * The URI for this node
+     */
+    uri: string;
+    /**
+     * Initializes this node
+     * @param iri The IRI for this node
+     */
+    constructor(iri: NamedNode | string);
+    /**
+     * Returns an RDF node for the containing directory, ending in slash.
+     */
+    dir(): NamedNode;
+    /**
+     * Returns an named node for the whole web site, ending in slash.
+     * Contrast with the "origin" which does NOT have a trailing slash
+     */
+    site(): NamedNode;
+    /**
+     * Gets the named node for the document
+     */
+    doc(): NamedNode;
+    static termType: string;
+    /**
+     * Gets a named node from the specified input value
+     * @param value An input value
+     */
+    static fromValue(value: ValueType): NamedNode | ValueType;
+}
+/**
+ * A RDF literal node
+ */
+export class Literal extends Node {
+    /**
+     * The language for the literal
+     */
+    lang: string;
+    /**
+     * The language for the literal
+     */
+    language: string;
+    /**
+     * The literal's datatype as a named node
+     */
+    datatype: NamedNode;
+    /**
+     * Initializes this literal
+     * @param value The literal's lexical value
+     * @param language The language for the literal
+     * @param datatype The literal's datatype as a named node
+     */
+    constructor(value: string, language: string, datatype: NamedNode);
+    /**
+     * Gets a copy of this literal
+     */
+    copy(): Literal;
+    static termType: string;
+    /**
+     * Builds a literal node from a boolean value
+     * @param value The value
+     */
+    static fromBoolean(value: boolean): Literal;
+    /**
+     * Builds a literal node from a date value
+     * @param value The value
+     */
+    static fromDate(value: Date): Literal;
+    /**
+     * Builds a literal node from a number value
+     * @param value The value
+     */
+    static fromNumber(value: number): Literal;
+    /**
+     * Builds a literal node from an input value
+     * @param value The input value
+     */
+    static fromValue(value: ValueType): Literal | ValueType;
+}
+/**
+ * Variables are placeholders used in patterns to be matched.
+ * In cwm they are symbols which are the formula's list of quantified variables.
+ * In sparql they are not visibly URIs.  Here we compromise, by having
+ * a common special base URI for variables. Their names are uris,
+ * but the ? notation has an implicit base uri of 'varid:'
+ */
+export class Variable extends Node {
+    /**
+     * The base string for a variable's name
+     */
+    base: string;
+    /**
+     * The unique identifier of this variable
+     */
+    uri: string;
+    /**
+     * Initializes this variable
+     * @param name The variable's name
+     */
+    constructor(name: string);
+    static termType: string;
+}
+/**
+ * The RDF default graph
+ */
+export class DefaultGraph extends Node {
+    /**
+     * Initializes this graph
+     */
+    constructor();
+}
+export namespace uri {
+    /**
+     * Gets the document part of an URI
+     * @param uri The URI
+     */
+    function docpart(uri: string): string;
+    /**
+     * Gets the document part of an URI as a named node
+     * @param x The URI
+     */
+    function document(x: string): NamedNode;
+    /**
+     * Gets the hostname in an URI
+     * @param u The URI
+     */
+    function hostpart(u: string): string;
+    /**
+     * Joins an URI with a base
+     * @param given The relative part
+     * @param base The base URI
+     */
+    function join(given: string, base: string): string;
+    /**
+     * Gets the protocol part of an URI
+     * @param uri The URI
+     */
+    function protocol(uri: string): string;
+    /**
+     * Gets a relative uri
+     * @param base The base URI
+     * @param uri The absolute URI
+     */
+    function refTo(base: string, uri: string): string;
+}
+export namespace log {
+    /**
+     * Logs a debug event
+     * @param x The event
+     */
+    function debug(x: any): void;
+    /**
+     * Logs a warning event
+     * @param x The event
+     */
+    function warn(x: any): void;
+    /**
+     * Logs an information event
+     * @param x The event
+     */
+    function info(x: any): void;
+    /**
+     * Logs an error event
+     * @param x The event
+     */
+    function error(x: any): void;
+    /**
+     * Logs a success event
+     * @param x The event
+     */
+    function success(x: any): void;
+    /**
+     * Logs a message event
+     * @param x The event
+     */
+    function msg(x: any): void;
+}
+/**
+ * An RDF statement (subject, predicate, object)
+ */
+export class Statement {
+    /**
+     * The statement's subject
+     */
+    subject: Node;
+    /**
+     * The statement's predicate
+     */
+    predicate: Node;
+    /**
+     * The statement's object
+     */
+    object: Node;
+    /**
+     * The origin of this statement
+     */
+    why: ValueType;
+    /**
+     * The graph the contains this statement
+     */
+    graph: ValueType;
+    /**
+     * Initializes this statement
+     * @param subject The statement's subject
+     * @param predicate The statement's predicate
+     * @param object The statement's object
+     * @param graph The graph the contains this statement
+     */
+    constructor(
+        subject: ValueType,
+        predicate: ValueType,
+        object: ValueType,
+        graph: ValueType
+    );
+    /**
+     * Gets whether two statements are the same
+     * @param other The other statement
+     */
+    equals(other: Statement): boolean;
+    /**
+     * Gets this statement with the bindings substituted
+     * @param bindings The bindings
+     */
+    substitute(bindings: { [id: string]: Node }): Statement;
+    /**
+     * Gets the canonical string representation of this statement
+     */
+    toCanonical(): string;
+    /**
+     * Gets the n-triples string representation of this statement
+     */
+    toNT(): string;
+    /**
+     * Gets the string representation of this statement
+     */
+    toString(): string;
+}
+export namespace convert {
+    /**
+     * Converts an n3 string to JSON
+     * @param n3String The n3 string
+     * @param jsonCallback Callback when the operation terminated
+     */
+    function convertToJson(
+        n3String: string,
+        jsonCallback: (err: string, jsonString: string) => void
+    ): void;
+    /**
+     * Converts an n3 string to n-quads
+     * @param n3String The n3 string
+     * @param nquadCallback Callback when the operation terminated
+     */
+    function convertToNQuads(
+        n3String: string,
+        nquadCallback: (err: string, nquadString: string) => void
+    ): void;
+}
+/**
+ * A formula, or store of RDF statements
+ */
+export class Formula extends Node {
+    /**
+     * The stored statements
+     */
+    statements: Statement[];
+    /**
+     * Initializes this formula
+     * @param statements The initial statements in this formulat
+     * @param constraints The additional constraints
+     * @param initBindings The initial bindings
+     * @param optional
+     */
+    constructor(
+        statements: ReadonlyArray<Statement>,
+        constraints: ReadonlyArray<any>,
+        initBindings: {
+            [id: string]: Node;
+        },
+        optional: ReadonlyArray<any>
+    );
+    /**
+     * Adds a statement to this formula
+     * @param s The subject
+     * @param p The predicate
+     * @param o The object
+     * @param g The graph that contains the statement
+     */
+    add(s: ValueType, p: ValueType, o: ValueType, g: ValueType): number;
+    /**
+     * Adds a statement to this formula
+     * @param st The statement to add
+     */
+    addStatement(st: Statement): number;
+    /**
+     * Gets a node that matches the specified pattern
+     * @param s The subject
+     * @param p The predicate
+     * @param o The object
+     * @param g The graph that contains the statement
+     */
+    any(s: ValueType, p: ValueType, o: ValueType, g: ValueType): Node;
+    /**
+     * Gets a blank node
+     * @param id The node's identifier
+     */
+    bnode(id: string): BlankNode;
+    /**
+     * Finds the types in the list which have no *stored* subtypes
+     * These are a set of classes which provide by themselves complete
+     * information -- the other classes are redundant for those who
+     * know the class DAG.
+     * @param types A map of the types
+     */
+    bottomTypeURIs(types: {
+        [id: string]: string | NamedNode;
+    }): {
+        [id: string]: string | NamedNode;
+    };
+    /**
+     * Gets a new collection
+     */
+    collection(): Collection;
+    /**
+     * Gets each node that matches the specified pattern
+     * @param s The subject
+     * @param p The predicate
+     * @param o The object
+     * @param g The graph that contains the statement
+     */
+    each(s: ValueType, p: ValueType, o: ValueType, g: ValueType): Node[];
+    /**
+     * Gets whether this formula is equals to the other one
+     * @param other The other formula
+     */
+    equals(other: Formula): boolean;
+    /**
+     * For thisClass or any subclass, anything which has it is its type
+     * or is the object of something which has the type as its range, or subject
+     * of something which has the type as its domain
+     * We don't bother doing subproperty (yet?)as it doesn't seeem to be used
+     * much.
+     * Get all the Classes of which we can RDFS-infer the subject is a member
+     * @param thisClass A named node
+     */
+    findMembersNT(
+        thisClass: Node
+    ): {
+        [uri: string]: Statement;
+    };
+    /**
+     * For thisClass or any subclass, anything which has it is its type
+     * or is the object of something which has the type as its range, or subject
+     * of something which has the type as its domain
+     * We don't bother doing subproperty (yet?)as it doesn't seeem to be used
+     * much.
+     * Get all the Classes of which we can RDFS-infer the subject is a member
+     * @param subject A named node
+     */
+    findMemberURIs(
+        subject: Node
+    ): {
+        [uri: string]: Statement;
+    };
+    /**
+     * Get all the Classes of which we can RDFS-infer the subject is a superclass
+     * Returns a hash table where key is NT of type and value is statement why we
+     * think so.
+     * Does NOT return terms, returns URI strings.
+     * We use NT representations in this version because they handle blank nodes.
+     * @param subject A subject node
+     */
+    findSubClassesNT(
+        subject: Node
+    ): {
+        [uri: string]: boolean;
+    };
+    /**
+     * Get all the Classes of which we can RDFS-infer the subject is a subclass
+     * Returns a hash table where key is NT of type and value is statement why we
+     * think so.
+     * Does NOT return terms, returns URI strings.
+     * We use NT representations in this version because they handle blank nodes.
+     * @param subject A subject node
+     */
+    findSuperClassesNT(
+        subject: Node
+    ): {
+        [uri: string]: boolean;
+    };
+    /**
+     * Get all the Classes of which we can RDFS-infer the subject is a member
+     * todo: This will loop is there is a class subclass loop (Sublass loops are
+     * not illegal)
+     * Returns a hash table where key is NT of type and value is statement why we
+     * think so.
+     * Does NOT return terms, returns URI strings.
+     * We use NT representations in this version because they handle blank nodes.
+     * @param subject A subject node
+     */
+    findTypesNT(
+        subject: Node
+    ): {
+        [uri: string]: boolean;
+    };
+    /**
+     * Get all the Classes of which we can RDFS-infer the subject is a member
+     * todo: This will loop is there is a class subclass loop (Sublass loops are
+     * not illegal)
+     * Returns a hash table where key is NT of type and value is statement why we
+     * think so.
+     * Does NOT return terms, returns URI strings.
+     * We use NT representations in this version because they handle blank nodes.
+     * @param subject A subject node
+     */
+    findTypeURIs(
+        subject: Node
+    ): {
+        [uri: string]: boolean;
+    };
+    /**
+     * Trace the statements which connect directly, or through bnodes
+     * Returns an array of statements
+     * doc param may be null to search all documents in store
+     * @param subject A subject node
+     * @param doc A document (the graph that contains statements)
+     * @param excludePredicateURIs The predicate URIs to exclude
+     */
+    connectedStatements(
+        subject: Node,
+        doc: ValueType,
+        excludePredicateURIs: ReadonlyArray<string>
+    ): Statement[];
+    /**
+     * Creates a new empty formula
+     */
+    formula(): Formula;
+    /**
+     * Creates a new empty indexed formulat
+     * @param features The list of features
+     */
+    formula(features: ReadonlyArray<string>): IndexedFormula;
+    /**
+     * Transforms an NTriples string format into a Node.
+     * The bnode bit should not be used on program-external values; designed
+     * for internal work such as storing a bnode id in an HTML attribute.
+     * This will only parse the strings generated by the vaious toNT() methods.
+     * @param str A string representation
+     */
+    fromNT(str: string): Node;
+    /**
+     * Gets whether this formula holds the specified statement
+     * @param s A subject
+     * @param p A predicate
+     * @param o An object
+     * @param g A containing graph
+     */
+    holds(s: ValueType, p: ValueType, o: ValueType, g: ValueType): boolean;
+    /**
+     * Gets whether this formula holds the specified statement
+     * @param s A statement
+     */
+    holds(s: Statement | ReadonlyArray<Statement>): boolean;
+    /**
+     * Gets whether this formula holds the specified statement
+     * @param st A statement
+     */
+    holdsStatement(st: Statement): boolean;
+    /**
+     * Gets a collection from a list of values
+     * @param values The values
+     */
+    list(values: Iterable<ValueType>): Collection;
+    /**
+     * Gets a literal node
+     * @param val The literal's lexical value
+     * @param lang The language
+     * @param dt The datatype as a named node
+     */
+    literal(val: string, lang: string, dt: NamedNode): Literal;
+    /**
+     * Transform a collection of NTriple URIs into their URI strings
+     * @param t some iterable colletion of NTriple URI strings
+     * @return a collection of the URIs as strings
+     */
+    NTtoURI(t: {
+        [uri: string]: any;
+    }): {
+        [uri: string]: any;
+    };
+    /**
+     * Serializes this formula
+     * @param base The base string
+     * @param contentType The content type of the syntax to use
+     * @param provenance The provenance URI
+     */
+    serialize(base: string, contentType: string, provenance: string): string;
+    /**
+     * Gets a new formula with the substituting bindings applied
+     * @param bindings The bindings to substitute
+     */
+    substitute(bindings: { [id: string]: Node }): Formula;
+    /**
+     * Gets an named node for an URI
+     * @param uri The URI
+     */
+    sym(uri: string | NamedNode): NamedNode;
+    /**
+     * Gets the node matching the specified pattern
+     * @param s The subject
+     * @param p The predicate
+     * @param o The object
+     * @param g The graph that contains the statement
+     */
+    the(s: ValueType, p: ValueType, o: ValueType, g: ValueType): Node;
+    /**
+     * RDFS Inference
+     * These are hand-written implementations of a backward-chaining reasoner
+     * over the RDFS axioms.
+     * @param seeds A hash of NTs of classes to start with
+     * @param predicate The property to trace though
+     * @param inverse Trace inverse direction
+     */
+    transitiveClosure(
+        seeds: {
+            [uri: string]: boolean;
+        },
+        predicate: Node,
+        inverse: Node
+    ): {
+        [uri: string]: boolean;
+    };
+    /**
+     * Finds the types in the list which have no *stored* supertypes
+     * We exclude the universal class, owl:Things and rdf:Resource, as it is
+     * information-free.
+     * @param types The types
+     */
+    topTypeURIs(types: {
+        [id: string]: string | NamedNode;
+    }): {
+        [id: string]: string | NamedNode;
+    };
+    /**
+     * Gets the number of statements in this formulat that matches the specified pattern
+     * @param s The subject
+     * @param p The predicate
+     * @param o The object
+     * @param g The graph that contains the statement
+     */
+    whether(s: ValueType, p: ValueType, o: ValueType, g: ValueType): number;
+    /**
+     * Serializes this formulat to a string
+     */
+    toString(): string;
+    /**
+     * Gets a namespace for the specified namespace's URI
+     * @param nsuri The URI for the namespace
+     */
+    ns(nsuri: string): (ln: string) => NamedNode;
+    /**
+     * Gets a new variable
+     * @param name The variable's name
+     */
+    variable(name: string): Variable;
+    static termType: string;
+}
+/**
+ * A formula (set of triples) which indexes by predicate, subject and object.
+ * It "smushes"  (merges into a single node) things which are identical
+ * according to owl:sameAs or an owl:InverseFunctionalProperty
+ * or an owl:FunctionalProperty
+ */
+export class IndexedFormula extends Formula {
+    /**
+     * The number of statements in this formula
+     */
+    length: number;
+    /**
+     * Creates a new formula
+     * @param features The list of features to support
+     */
+    constructor(features: ReadonlyArray<string>);
+    /**
+     * Gets the URI of the default graph
+     */
+    static defaultGraphURI(): string;
+    /**
+     * Gets the statements matching the specified pattern
+     * @param subj The subject
+     * @param pred The predicate
+     * @param obj The object
+     * @param why The graph that contains the statement
+     * @param justOne Whether to only get one statement
+     */
+    statementsMatching(
+        subj: Node,
+        pred: Node,
+        obj: Node,
+        why: Node,
+        justOne: boolean
+    ): Statement[];
+    /**
+     * Adds all the statements to this formula
+     * @param statements A collection of statements
+     */
+    addAll(statements: Iterable<Statement>): void;
+    /**
+     * Gets the value of a node that matches the specified pattern
+     * @param s The subject
+     * @param p The predicate
+     * @param o The object
+     * @param g The graph that contains the statement
+     */
+    anyValue(s: ValueType, p: ValueType, o: ValueType, g: ValueType): string;
+    /**
+     * Returns the symbol with canonical URI as smushed
+     * @param term A RDF node
+     */
+    canon(term: Node): Node;
+    /**
+     * Checks this formula for consistency
+     */
+    check(): void;
+    /**
+     * Checks a list of statements for consistency
+     * @param sts The list of statements to check
+     * @param from An index with the array ['subject', 'predicate', 'object', 'why']
+     */
+    checkStatementList(sts: ReadonlyArray<Statement>, from: number): boolean;
+    /**
+     * Closes this formula (and return it)
+     */
+    close(): IndexedFormula;
+    /**
+     * Simplify graph in store when we realize two identifiers are equivalent
+     * We replace the bigger with the smaller.
+     * @param u1 The first node
+     * @param u2 The second node
+     */
+    equate(u1: Node, u2: Node): boolean;
+    /**
+     * eturns any quads matching the given arguments.
+     * Standard RDFJS Taskforce method for Source objects, implemented as an
+     * alias to `statementsMatching()`
+     * @param subject The subject
+     * @param predicate The predicate
+     * @param object The object
+     * @param graph The graph that contains the statement
+     */
+    match(
+        subject: ValueType,
+        predicate: ValueType,
+        object: ValueType,
+        graph: ValueType
+    ): Statement[];
+    /**
+     * Find out whether a given URI is used as symbol in the formula
+     * @param uri The URI to look for
+     */
+    mentionsURI(uri: string): boolean;
+    /**
+     * Existentials are BNodes - something exists without naming
+     * @param uri An URI
+     */
+    newExistential(uri: string): Node;
+    /**
+     * Creates a new universal node
+     * Universals are Variables
+     * @param uri An URI
+     */
+    newUniversal(uri: string): Node;
+    /**
+     * Find an unused id for a file being edited: return a symbol
+     * (Note: Slow iff a lot of them -- could be O(log(k)) )
+     * @param doc A document named node
+     */
+    nextSymbol(doc: NamedNode): NamedNode;
+    /**
+     * Removes a statement from this formula
+     * @param st A statement to remove
+     */
+    remove(st: Statement): IndexedFormula;
+    /**
+     * Removes all statemnts in a doc
+     * @param doc The document
+     */
+    removeDocument(doc: NamedNode): IndexedFormula;
+    /**
+     * Remove all statements matching args (within limit) *
+     * @param subj The subject
+     * @param pred The predicate
+     * @param obj The object
+     * @param why The graph that contains the statement
+     * @param limit The number of statements to remove
+     */
+    removeMany(
+        subj: Node,
+        pred: Node,
+        obj: Node,
+        why: Node,
+        limit: number
+    ): void;
+    /**
+     * Remove all matching statements
+     * @param subject The subject
+     * @param predicate The predicate
+     * @param object The object
+     * @param graph The graph that contains the statement
+     */
+    removeMatches(
+        subject: ValueType,
+        predicate: ValueType,
+        object: ValueType,
+        graph: ValueType
+    ): void;
+    /**
+     * Removes a statement
+     * @param st The statement to remove
+     */
+    removeStatement(st: Statement): Formula;
+    /**
+     * Removes statements
+     * @param sts The statements to remove
+     */
+    removeStatements(sts: ReadonlyArray<Statement>): Formula;
+    /**
+     * Return all equivalent URIs by which this is known
+     * @param x A named node
+     */
+    allAliases(x: NamedNode): NamedNode[];
+    /**
+     * Compare by canonical URI as smushed
+     * @param x A named node
+     * @param y Another named node
+     */
+    sameThings(x: NamedNode, y: NamedNode): boolean;
+    /**
+     * A list of all the URIs by which this thing is known
+     * @param term
+     */
+    uris(term: NamedNode): string[];
+}
+export namespace DataFactory {
+    /**
+     * Creates a new blank node
+     * @param value The blank node's identifier
+     */
+    function blankNode(value: string): BlankNode;
+    /**
+     * Creates a new collection
+     * @param elements The initial element
+     */
+    function collection(elements: ReadonlyArray<ValueType>): Collection;
+    /**
+     * Gets the default graph
+     */
+    function defaultGraph(): DefaultGraph;
+    /**
+     * Creates a new fetcher
+     * @param store The store to use
+     * @param options The options
+     */
+    function fetcher(store: Formula, options: any): Fetcher;
+    /**
+     * Creates a new graph (store)
+     */
+    function graph(): IndexedFormula;
+    /**
+     * Creates a new literal node
+     * @param val The lexical value
+     * @param lang The language
+     * @param dt The datatype
+     */
+    function lit(val: string, lang: string, dt: NamedNode): Literal;
+    /**
+     * Creates a new literal node
+     * @param value The lexical value
+     * @param languageOrDatatype Either the language or the datatype
+     */
+    function literal(
+        value: string,
+        languageOrDatatype: string | NamedNode
+    ): Literal;
+    /**
+     * Creates a new named node
+     * @param value The new named node
+     */
+    function namedNode(value: string): NamedNode;
+    /**
+     * Creates a new statement
+     * @param subject The subject
+     * @param predicate The predicate
+     * @param object The object
+     * @param graph The containing graph
+     */
+    function quad(
+        subject: Node,
+        predicate: Node,
+        object: Node,
+        graph: Node
+    ): Statement;
+    /**
+     * Creates a new statement
+     * @param subject The subject
+     * @param predicate The predicate
+     * @param object The object
+     * @param graph The containing graph
+     */
+    function st(
+        subject: Node,
+        predicate: Node,
+        object: Node,
+        graph: Node
+    ): Statement;
+    /**
+     * Creates a new statement
+     * @param subject The subject
+     * @param predicate The predicate
+     * @param object The object
+     */
+    function triple(subject: Node, predicate: Node, object: Node): Statement;
+    /**
+     * Creates a new variable
+     * @param name The name for the variable
+     */
+    function variable(name: string): Variable;
+}
+export namespace Util {
+    /**
+     * Gets a named node for a media type
+     * @param mediaType A media type
+     */
+    function mediaTypeClass(mediaType: string): NamedNode;
+    /**
+     * Gets a named node from the name of a relation
+     * @param relation The name of a relation
+     */
+    function linkRelationProperty(relation: string): NamedNode;
+    /**
+     * Loads ontologies of the data we load (this is the callback from the kb to
+     * the fetcher). Exports as `AJAR_handleNewTerm`
+     * @param kb The store
+     * @param p A property
+     * @param requestedBy
+     */
+    function AJAR_handleNewTerm(
+        kb: Formula,
+        p: NamedNode,
+        requestedBy: string
+    ): Promise<any>;
+}
+/**
+ * A datatype-specific handler for fetching data
+ */
+export interface Handler {
+    response: any;
+    dom: any;
+}
+/**
+ * Responsible for fetching RDF data
+ */
+export class Fetcher {
+    store: any;
+    timeout: number;
+    appNode: BlankNode;
+    requested: {
+        [uri: string]: any;
+    };
+    timeouts: any;
+    redirectedTo: any;
+    constructor(store: any, options: any);
+    static HANDLERS: {
+        RDFXMLHandler: Handler;
+        XHTMLHandler: Handler;
+        XMLHandler: Handler;
+        HTMLHandler: Handler;
+        TextHandler: Handler;
+        N3Handler: Handler;
+    };
+    static CONTENT_TYPE_BY_EXT: {
+        [ext: string]: string;
+    };
+}
+/**
+ * Gets a node for the specified input
+ * @param value An input value
+ */
+export function term(value: ValueType): Node | Collection | ValueType;
+/**
+ * Gets a namespace
+ * @param nsuri The URI for the namespace
+ */
+export function Namespace(nsuri: string): (ln: string) => NamedNode;
+/**
+ * Transforms an NTriples string format into a Node.
+ * The bnode bit should not be used on program-external values; designed
+ * for internal work such as storing a bnode id in an HTML attribute.
+ * This will only parse the strings generated by the vaious toNT() methods.
+ * @param str A string representation
+ */
+export function fromNT(str: string): Node;
+/**
+ * Creates a new fetcher
+ * @param store The store to use
+ * @param options The options
+ */
+export function fetcher(store: Formula, options: any): Fetcher;
+/**
+ * Creates a new graph (store)
+ */
+export function graph(): IndexedFormula;
+/**
+ * Creates a new literal node
+ * @param val The lexical value
+ * @param lang The language
+ * @param dt The datatype
+ */
+export function lit(val: string, lang: string, dt: NamedNode): Literal;
+/**
+ * Creates a new statement
+ * @param subject The subject
+ * @param predicate The predicate
+ * @param object The object
+ * @param graph The containing graph
+ */
+export function st(
+    subject: Node,
+    predicate: Node,
+    object: Node,
+    graph: Node
+): Statement;
+/**
+ * Creates a new named node
+ * @param value The new named node
+ */
+export function sym(value: string): NamedNode;
+/**
+ * Creates a new variable
+ * @param name The name for the variable
+ */
+export function variable(name: string): Variable;
+/**
+ * Creates a new blank node
+ * @param value The blank node's identifier
+ */
+export function blankNode(value: string): BlankNode;
+/**
+ * Gets the default graph
+ */
+export function defaultGraph(): DefaultGraph;
+/**
+ * Creates a new literal node
+ * @param value The lexical value
+ * @param languageOrDatatype Either the language or the datatype
+ */
+export function literal(
+    value: string,
+    languageOrDatatype: string | NamedNode
+): Literal;
+/**
+ * Creates a new named node
+ * @param value The new named node
+ */
+export function namedNode(value: string): NamedNode;
+/**
+ * Creates a new statement
+ * @param subject The subject
+ * @param predicate The predicate
+ * @param object The object
+ * @param graph The containing graph
+ */
+export function quad(
+    subject: Node,
+    predicate: Node,
+    object: Node,
+    graph: Node
+): Statement;
+/**
+ * Creates a new statement
+ * @param subject The subject
+ * @param predicate The predicate
+ * @param object The object
+ */
+export function triple(subject: Node, predicate: Node, object: Node): Statement;
+/**
+ * Parse a string and put the result into the graph kb.
+ * Normal method is sync.
+ * Unfortunately jsdonld is currently written to need to be called async.
+ * Hence the mess below with executeCallback.
+ * @param str The input string to parse
+ * @param kb The store to use
+ * @param base The base URI to use
+ * @param contentType The content type for the input
+ * @param callback The callback to call when the data has been loaded
+ */
+export function parse(
+    str: string,
+    kb: Formula,
+    base: string,
+    contentType: string,
+    callback: (error: any, kb: Formula) => void
+): void;
+/**
+ * Get the next available unique identifier
+ */
+export let NextId: number;
diff --git a/types/rdflib/rdflib-tests.ts b/types/rdflib/rdflib-tests.ts
new file mode 100644
index 0000000000..fecd177d47
--- /dev/null
+++ b/types/rdflib/rdflib-tests.ts
@@ -0,0 +1,17 @@
+import * as $rdf from "rdflib";
+
+const store = $rdf.graph();
+$rdf.parse(
+    "some inline rdf data",
+    store,
+    "http://example.com",
+    "text/n3",
+    (x, y) => {}
+);
+const node = store.any(
+    $rdf.sym("http://example.com/subject"),
+    $rdf.sym("http://example.com/property"),
+    undefined,
+    undefined
+);
+const value = node.value;
diff --git a/types/delay/tsconfig.json b/types/rdflib/tsconfig.json
similarity index 94%
rename from types/delay/tsconfig.json
rename to types/rdflib/tsconfig.json
index cb0da53652..6c84dd0e59 100644
--- a/types/delay/tsconfig.json
+++ b/types/rdflib/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "delay-tests.ts"
+        "rdflib-tests.ts"
     ]
 }
\ No newline at end of file
diff --git a/types/rdflib/tslint.json b/types/rdflib/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/rdflib/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/reach__router/index.d.ts b/types/reach__router/index.d.ts
index f52b3954e3..e61e9e15ad 100644
--- a/types/reach__router/index.d.ts
+++ b/types/reach__router/index.d.ts
@@ -5,8 +5,8 @@
 // TypeScript Version: 2.8
 
 import * as React from "react";
-
-export type WindowLocation = Window["location"];
+import { Location as HLocation } from "history";
+export type WindowLocation = Window["location"] & HLocation;
 
 export interface History {
     readonly location: string;
@@ -60,13 +60,15 @@ export interface LinkGetProps {
 
 export class Link<TState> extends React.Component<LinkProps<TState>> {}
 
-export interface RedirectProps {
+export interface RedirectProps<TState> {
     from?: string;
     to: string;
     noThrow?: boolean;
+    state?: TState;
+    replace?: boolean;
 }
 
-export class Redirect extends React.Component<RedirectProps> {}
+export class Redirect<TState> extends React.Component<RedirectProps<TState>> {}
 
 export interface MatchProps<TParams> {
     path: string;
@@ -74,7 +76,7 @@ export interface MatchProps<TParams> {
 }
 
 export type MatchRenderFn<TParams> = (
-    props: MatchRenderProps<TParams>,
+    props: MatchRenderProps<TParams>
 ) => React.ReactNode;
 
 export interface MatchRenderProps<TParams> {
@@ -104,7 +106,7 @@ export interface LocationProviderProps {
 }
 
 export type LocationProviderRenderFn = (
-    context: LocationContext,
+    context: LocationContext
 ) => React.ReactNode;
 
 export interface LocationContext {
diff --git a/types/reach__router/reach__router-tests.tsx b/types/reach__router/reach__router-tests.tsx
index 56e2305a2e..0cada3367d 100644
--- a/types/reach__router/reach__router-tests.tsx
+++ b/types/reach__router/reach__router-tests.tsx
@@ -1,4 +1,10 @@
-import { Link, Location, RouteComponentProps, Router } from "@reach/router";
+import {
+    Link,
+    Location,
+    RouteComponentProps,
+    Router,
+    Redirect
+} from "@reach/router";
 import * as React from "react";
 import { render } from "react-dom";
 
@@ -21,9 +27,10 @@ render(
         <NotFound default />
 
         <Link to="/somepath" rel="noopener noreferrer" target="_blank" />
+        <Redirect to="/somepath" replace={false} state={{ from: "/" }} />
 
         <Location>
-            {(context) => (
+            {context => (
                 <>
                     <div>hostname is {context.location.hostname}</div>
                     <button onClick={() => context.navigate("/")}>
@@ -33,5 +40,5 @@ render(
             )}
         </Location>
     </Router>,
-    document.getElementById("app-root"),
+    document.getElementById("app-root")
 );
diff --git a/types/react-adal/index.d.ts b/types/react-adal/index.d.ts
new file mode 100644
index 0000000000..40a8d5d3bc
--- /dev/null
+++ b/types/react-adal/index.d.ts
@@ -0,0 +1,411 @@
+// Type definitions for react-adal 0.4
+// Project: https://github.com/salvoravida/react-adal#readme
+// Definitions by: Dmitry Korolev <https://github.com/dkorolev1>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export type TokenCallback = (
+    errorDesc: string | null,
+    token: string | null,
+    error: any
+) => void;
+
+export type UserCallback = (
+    errorDesc: string | null,
+    user: UserInfo | null
+) => void;
+
+export interface AdalConfig {
+    /**
+     * 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 type LoggingLevel = 0 | 1 | 2 | 3;
+
+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 type RequestType = "LOGIN" | "RENEW_TOKEN" | "UNKNOWN";
+
+export type ResponseType = "id_token token" | "token";
+
+export interface UserInfo {
+    /**
+     * Username assigned from UPN or email.
+     */
+    userName: string;
+    /**
+     * Properties parsed from `id_token`.
+     */
+    profile: any;
+}
+
+export interface Constants {
+    ACCESS_TOKEN: 'access_token';
+    EXPIRES_IN: 'expires_in';
+    ID_TOKEN: 'id_token';
+    ERROR_DESCRIPTION: 'error_description';
+    SESSION_STATE: 'session_state';
+    STORAGE: {
+        TOKEN_KEYS: 'adal.token.keys';
+        ACCESS_TOKEN_KEY: 'adal.access.token.key';
+        EXPIRATION_KEY: 'adal.expiration.key';
+        STATE_LOGIN: 'adal.state.login';
+        STATE_RENEW: 'adal.state.renew';
+        NONCE_IDTOKEN: 'adal.nonce.idtoken';
+        SESSION_STATE: 'adal.session.state';
+        USERNAME: 'adal.username';
+        IDTOKEN: 'adal.idtoken';
+        ERROR: 'adal.error';
+        ERROR_DESCRIPTION: 'adal.error.description';
+        LOGIN_REQUEST: 'adal.login.request';
+        LOGIN_ERROR: 'adal.login.error';
+        RENEW_STATUS: 'adal.token.renew.status';
+    };
+    RESOURCE_DELIMETER: '|';
+    LOADFRAME_TIMEOUT: '6000';
+    TOKEN_RENEW_STATUS_CANCELED: 'Canceled';
+    TOKEN_RENEW_STATUS_COMPLETED: 'Completed';
+    TOKEN_RENEW_STATUS_IN_PROGRESS: 'In Progress';
+    LOGGING_LEVEL: {
+        ERROR: 0;
+        WARN: 1;
+        INFO: 2;
+        VERBOSE: 3;
+    };
+    LEVEL_STRING_MAP: {
+        0: 'ERROR:';
+        1: 'WARNING:';
+        2: 'INFO:';
+        3: 'VERBOSE:';
+    };
+    POPUP_WIDTH: 483;
+    POPUP_HEIGHT: 600;
+}
+
+export class AuthenticationContext {
+    instance: string;
+    config: AdalConfig;
+    callback: TokenCallback;
+    popUp: boolean;
+    isAngular: boolean;
+
+    /**
+     * Enum for request type
+     */
+    REQUEST_TYPE: RequestType;
+    RESPONSE_TYPE: ResponseType;
+    CONSTANTS: Constants;
+
+    constructor(options: AdalConfig);
+    /**
+     * 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;
+
+    /**
+     * Logs Pii messages when Logging Level is set to 0 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     * @param error Error to log.
+     */
+    errorPii(message: string, error: any): void;
+
+    /**
+     * Logs  Pii messages when Logging Level is set to 1 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     */
+    warnPii(message: string): void;
+
+    /**
+     * Logs messages when Logging Level is set to 2 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     */
+    infoPii(message: string): void;
+
+    /**
+     * Logs messages when Logging Level is set to 3 and window.piiLoggingEnabled is set to true.
+     * @param message Message to log.
+     */
+    verbosePii(message: string): void;
+}
+
+/**
+ * Return user token
+ * @param authContext Authentication context
+ * @param resource Resource GUID ot URI identifying the target resource.
+ */
+export function adalGetToken(
+    authContext: AuthenticationContext,
+    resourceUrl: string
+): Promise<string | null>;
+
+/**
+ * Allows to make requests with adal token
+ * @param authContext Authentication context
+ * @param resource Resource GUID ot URI identifying the target resource.
+ * @param fetch Fetch client
+ * @param url Request url
+ * @param options Fetch options
+ */
+export function adalFetch(
+    authContext: AuthenticationContext,
+    resource: string,
+    fetch: (input: string, init: any) => Promise<any>,
+    url: string,
+    options: any
+): Promise<any>;
+
+/**
+ * Wrap for the app
+ * @param authContext Authentication context
+ * @param app Render app callback
+ * @param doNotLogin Don`t need to login?
+ */
+export function runWithAdal(
+    authContext: AuthenticationContext,
+    app: () => void,
+    doNotLogin: boolean
+): void;
+
+/**
+ * Creates a HOC that can be used to manage authentication for the certain components
+ * @param authContext Authentication context
+ * @param resource Resource GUID ot URI identifying the target resource.
+ */
+export function withAdalLogin(
+    authContext: AuthenticationContext,
+    resource: string
+): (
+    wrappedComponent: React.ComponentClass | React.StatelessComponent,
+    renderLoading: () => JSX.Element | null,
+    renderError: (error: any) => JSX.Element | null
+) => React.ComponentClass;
diff --git a/types/react-adal/react-adal-tests.tsx b/types/react-adal/react-adal-tests.tsx
new file mode 100644
index 0000000000..961246560f
--- /dev/null
+++ b/types/react-adal/react-adal-tests.tsx
@@ -0,0 +1,75 @@
+import * as React from 'react';
+import { AuthenticationContext, adalFetch, adalGetToken, runWithAdal, withAdalLogin, AdalConfig } from 'react-adal';
+
+const resourceUrl = 'https://graph.microsoft.net';
+
+const adalConfig: AdalConfig = {
+    cacheLocation: "localStorage",
+    clientId: '9ha8cqc6-4668-459a-9272-f48c80a053y5',
+    endpoints: {
+        api: resourceUrl
+    },
+    postLogoutRedirectUri: 'https://localhost:3000',
+    tenant: 'tenantname.onmicrosoft.com'
+  };
+
+const authContext = new AuthenticationContext(adalConfig);
+
+const adalApiFetch = (fetch: any, url: string, options: any) => {
+    return adalFetch(authContext, resourceUrl, fetch, url, options);
+};
+
+const getToken = () => adalGetToken(authContext, resourceUrl);
+
+class App extends React.Component {
+    render() {
+        return null;
+    }
+}
+
+// user must login to use the app
+runWithAdal(authContext, () => {
+    //  ReactDOM.render(<App />, document.getElementById('react-app') as HTMLElement);
+}, false);
+
+const withAdalLoginApi = withAdalLogin(authContext, resourceUrl);
+
+const Loading: React.SFC = (props) => {
+    return null;
+};
+
+const ErrorPage: React.SFC = (props) => {
+    return null;
+};
+
+class SignInPage extends React.Component {
+    render() {
+        return null;
+    }
+}
+
+class ProtectedPage1 extends React.Component {
+    render() {
+        return null;
+    }
+}
+
+const ProtectedPage2: React.SFC = (props) => {
+    return null;
+};
+
+const AdalProtectedPage1 = withAdalLoginApi(ProtectedPage1, () => <Loading />, () => <ErrorPage/>);
+const AdalProtectedPage2 = withAdalLoginApi(ProtectedPage2, () => <h4>loading...</h4>, () => <h4>It seems something went wrong...</h4>);
+
+// user must login to use only specific pages
+runWithAdal(authContext, () => {
+     const routes = <div>
+          <Route exact={true} path='/' component={SignInPage} /> // $ExpectError
+          <Route path='/private1' component={AdalProtectedPage1} /> // $ExpectError
+          <Route path='/private2' component={AdalProtectedPage2} /> // $ExpectError
+        </div>;
+        // $ExpectError
+     const App = <ConnectedRouter history={({} as any)} children={routes} />;
+     // $ExpectError
+     ReactDOM.render(<App />, document.getElementById('react-app') as HTMLElement);
+}, true);
diff --git a/types/react-svg/tsconfig.json b/types/react-adal/tsconfig.json
similarity index 93%
rename from types/react-svg/tsconfig.json
rename to types/react-adal/tsconfig.json
index 43b8246d54..b77e4dffc1 100644
--- a/types/react-svg/tsconfig.json
+++ b/types/react-adal/tsconfig.json
@@ -4,21 +4,21 @@
         "lib": [
             "es6"
         ],
+        "jsx": "react",
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
-        "jsx": "react",
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
     },
     "files": [
         "index.d.ts",
-        "react-svg-tests.tsx"
+        "react-adal-tests.tsx"
     ]
 }
diff --git a/types/react-adal/tslint.json b/types/react-adal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-adal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-addons-create-fragment/index.d.ts b/types/react-addons-create-fragment/index.d.ts
index 1e46046ec4..25e4ba9b43 100644
--- a/types/react-addons-create-fragment/index.d.ts
+++ b/types/react-addons-create-fragment/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-addons-css-transition-group/index.d.ts b/types/react-addons-css-transition-group/index.d.ts
index 33d43b4cd1..03cdc48303 100644
--- a/types/react-addons-css-transition-group/index.d.ts
+++ b/types/react-addons-css-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import 'react-addons-transition-group';
 import { ComponentClass, CSSTransitionGroupProps } from 'react';
diff --git a/types/react-addons-linked-state-mixin/index.d.ts b/types/react-addons-linked-state-mixin/index.d.ts
index 6358dde535..1c590e333f 100644
--- a/types/react-addons-linked-state-mixin/index.d.ts
+++ b/types/react-addons-linked-state-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Mixin } from 'react';
 
diff --git a/types/react-addons-pure-render-mixin/index.d.ts b/types/react-addons-pure-render-mixin/index.d.ts
index 565a108721..a154dbe594 100644
--- a/types/react-addons-pure-render-mixin/index.d.ts
+++ b/types/react-addons-pure-render-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Mixin } from 'react';
 
diff --git a/types/react-addons-shallow-compare/index.d.ts b/types/react-addons-shallow-compare/index.d.ts
index ff4e5dbdc9..5d6942ed24 100644
--- a/types/react-addons-shallow-compare/index.d.ts
+++ b/types/react-addons-shallow-compare/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 
diff --git a/types/react-addons-test-utils/index.d.ts b/types/react-addons-test-utils/index.d.ts
index 9282f95f4e..0531c5e3f6 100644
--- a/types/react-addons-test-utils/index.d.ts
+++ b/types/react-addons-test-utils/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { AbstractView, Component, ComponentClass,
     ReactElement, ReactInstance, ClassType,
diff --git a/types/react-addons-transition-group/index.d.ts b/types/react-addons-transition-group/index.d.ts
index 933533df28..79f76bf84e 100644
--- a/types/react-addons-transition-group/index.d.ts
+++ b/types/react-addons-transition-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, TransitionGroupProps } from 'react';
 
diff --git a/types/react-addons-update/index.d.ts b/types/react-addons-update/index.d.ts
index 874549b7a1..5a1018d2c2 100644
--- a/types/react-addons-update/index.d.ts
+++ b/types/react-addons-update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>, AssureSign <http://www.assuresign.com>, Microsoft <https://microsoft.com>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-albus/index.d.ts b/types/react-albus/index.d.ts
new file mode 100644
index 0000000000..d9d6b5ff99
--- /dev/null
+++ b/types/react-albus/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for react-albus 2.0
+// Project: https://github.com/americanexpress/react-albus#readme
+// Definitions by: Sindre Seppola <https://github.com/sseppola>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+import { History } from "history";
+
+export interface WizardStepObject {
+    id: string;
+}
+
+export interface WizardContext {
+    step: WizardStepObject;
+    steps: WizardStepObject[];
+    history: History;
+    next: () => void;
+    previous: () => void;
+    go: (n: number) => void;
+    push: (id?: string) => void;
+    replace: (id?: string) => void;
+}
+
+export const Wizard: React.ComponentType<{
+    onNext?: (wizard: WizardContext) => void;
+    render?: (wizard: WizardContext) => React.ReactNode;
+    history?: History;
+}>;
+
+export const Steps: React.ComponentType<{
+    step?: WizardStepObject;
+}>;
+
+export const Step: React.ComponentType<{
+    id: string;
+    render: (wizard: WizardContext) => React.ReactNode;
+}>;
diff --git a/types/react-albus/react-albus-tests.tsx b/types/react-albus/react-albus-tests.tsx
new file mode 100644
index 0000000000..3654845923
--- /dev/null
+++ b/types/react-albus/react-albus-tests.tsx
@@ -0,0 +1,52 @@
+import * as React from "react";
+import { Wizard, Step, Steps } from "react-albus";
+
+const Example = () => (
+    <Wizard
+        onNext={wiz => {
+            wiz.go(0);
+            const location = wiz.history.location;
+            wiz.next();
+            wiz.previous();
+            wiz.push("merlin");
+            wiz.replace(wiz.step.id);
+            wiz.steps.map(step => {
+                wiz.push(step.id);
+            });
+        }}
+        render={wiz => (
+            <Steps>
+                <Step
+                    id="merlin"
+                    render={() => (
+                        <div>
+                            <h1>Merlin</h1>
+                            <button onClick={() => wiz.next()}>Next</button>
+                        </div>
+                    )}
+                />
+                <Step
+                    id="gandalf"
+                    render={stepWiz => (
+                        <div>
+                            <h1>Gandalf</h1>
+                            <button onClick={() => stepWiz.next()}>Next</button>
+                            <button onClick={() => stepWiz.previous()}>
+                                Previous
+                            </button>
+                        </div>
+                    )}
+                />
+                <Step
+                    id="dumbledore"
+                    render={({ previous }) => (
+                        <div>
+                            <h1>Dumbledore</h1>
+                            <button onClick={previous}>Previous</button>
+                        </div>
+                    )}
+                />
+            </Steps>
+        )}
+    />
+);
diff --git a/types/react-dnd/tsconfig.json b/types/react-albus/tsconfig.json
similarity index 87%
rename from types/react-dnd/tsconfig.json
rename to types/react-albus/tsconfig.json
index 0f441c38f4..23dcedc16b 100644
--- a/types/react-dnd/tsconfig.json
+++ b/types/react-albus/tsconfig.json
@@ -5,12 +5,12 @@
             "es6",
             "dom"
         ],
+        "jsx": "react",
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "jsx": "react",
         "typeRoots": [
             "../"
         ],
@@ -20,6 +20,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-dnd-tests.tsx"
+        "react-albus-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-albus/tslint.json b/types/react-albus/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-albus/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-alert/index.d.ts b/types/react-alert/index.d.ts
index 9150bf28b4..3814b7f29f 100644
--- a/types/react-alert/index.d.ts
+++ b/types/react-alert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/schiehll/react-alert
 // Definitions by: Steve Syrell <https://github.com/ssyrell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-alice-carousel/index.d.ts b/types/react-alice-carousel/index.d.ts
index 2d40293003..e3002f1193 100644
--- a/types/react-alice-carousel/index.d.ts
+++ b/types/react-alice-carousel/index.d.ts
@@ -2,7 +2,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.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-amplitude/index.d.ts b/types/react-amplitude/index.d.ts
new file mode 100644
index 0000000000..c6a9ff3d2d
--- /dev/null
+++ b/types/react-amplitude/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for react-amplitude 0.1
+// Project: https://github.com/rorygarand/react-amplitude
+// Definitions by: Raymond Ho <https://github.com/rayzor65>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface AmplitudeInstance {
+    init(apiKey: string, userId?: string, config?: any, cb?: () => void): void;
+    amplitude(): void;
+    clearUserProperties(): void;
+    getSessionId(): void;
+    identify(idObj: any, cb: () => void): void;
+    isNewSession(): void;
+    logEvent(eventType: string, eventProperties: {}, cb: () => void): void;
+    logEventWithTimestamp(eventType: string, eventProperties: {}, timestamp: number, cb: () => void): void;
+    resetUserId(): void;
+    setUserId(userId: string): void;
+    setUserProperties(userProps: any): void;
+}
+
+declare const Amplitude: AmplitudeInstance;
+
+export default Amplitude;
diff --git a/types/react-amplitude/react-amplitude-tests.ts b/types/react-amplitude/react-amplitude-tests.ts
new file mode 100644
index 0000000000..f311f8491f
--- /dev/null
+++ b/types/react-amplitude/react-amplitude-tests.ts
@@ -0,0 +1,2 @@
+import Amplitude from 'react-amplitude';
+Amplitude.init('YOUR_UNIQUE_TRACKING_CODE');
diff --git a/types/react-amplitude/tsconfig.json b/types/react-amplitude/tsconfig.json
new file mode 100644
index 0000000000..6f7a8a296e
--- /dev/null
+++ b/types/react-amplitude/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-amplitude-tests.ts"
+    ]
+}
diff --git a/types/react-amplitude/tslint.json b/types/react-amplitude/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-amplitude/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-animate-on-scroll/index.d.ts b/types/react-animate-on-scroll/index.d.ts
index 6584833cbe..6750cd8200 100644
--- a/types/react-animate-on-scroll/index.d.ts
+++ b/types/react-animate-on-scroll/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/dbramwell/react-animate-on-scroll
 // Definitions by: Ricardo Albuquerque <https://github.com/ralbuque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-app/index.d.ts b/types/react-app/index.d.ts
index 7c5e00f57a..5315874ddd 100644
--- a/types/react-app/index.d.ts
+++ b/types/react-app/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kriasoft/react-app#readme
 // Definitions by: Prakarsh Pandey <https://github.com/prakarshpandey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-aria-menubutton/index.d.ts b/types/react-aria-menubutton/index.d.ts
index f7a4ef7de0..3bfc68259e 100644
--- a/types/react-aria-menubutton/index.d.ts
+++ b/types/react-aria-menubutton/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Muhammad Fawwaz Orabi <https://github.com/forabi>
 //                 Chris Rohlfs <https://github.com/crohlfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-aria-menubutton/react-aria-menubutton-tests.tsx b/types/react-aria-menubutton/react-aria-menubutton-tests.tsx
index 9559b9e977..f284e932a4 100644
--- a/types/react-aria-menubutton/react-aria-menubutton-tests.tsx
+++ b/types/react-aria-menubutton/react-aria-menubutton-tests.tsx
@@ -56,10 +56,7 @@ interface DemoOneState {
 }
 
 class DemoOne extends React.Component<{}, DemoOneState> {
-	constructor(props: any) {
-		super(props);
-		this.state = { selected: "", noMenu: false };
-	}
+	state = { selected: "", noMenu: false };
 
 	handleSelection(value: string) {
 		if (value === "destroy") {
diff --git a/types/react-aria-modal/index.d.ts b/types/react-aria-modal/index.d.ts
new file mode 100644
index 0000000000..4083d08473
--- /dev/null
+++ b/types/react-aria-modal/index.d.ts
@@ -0,0 +1,170 @@
+// Type definitions for react-aria-modal 2.12
+// Project: https://github.com/davidtheclark/react-aria-modal#readme
+// Definitions by: forabi <https://github.com/forabi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import React = require('react');
+
+export interface AriaModalProps {
+    /**
+     * If true, the modal will receive a role of alertdialog,
+     * instead of its default dialog.
+     */
+    alert?: boolean;
+
+    /**
+     * By default, the modal is active when mounted, deactivated when unmounted.
+     * However, you can also control its active/inactive state by changing
+     * its mounted property instead.
+     */
+    mounted?: boolean;
+
+    /**
+     * Provide your main application node here (which the modal should
+     * render outside of), and when the modal is open this application
+     * node will receive the attribute `aria-hidden="true"`.
+     * This can help screen readers understand what's going on.
+     */
+    applicationNode?: Node | Element;
+
+    /**
+     * Same as `applicationNode`, but a function that returns the node
+     * instead of the node itself. This can be useful or necessary in
+     * a variety of situations, one of which is server-side React
+     * rendering. The function will not be called until after the
+     * component mounts, so it is safe to use browser globals
+     * and refer to DOM nodes within it (e.g. `document.getElementById(..)`),
+     * without ruining your server-side rendering.
+     */
+    getApplicationNode?(): Node | Element;
+
+    /**
+     * By default, styles are applied inline to the dialog and underlay
+     * portions of the component. However, you can disable all inline
+     * styles by setting `includeDefaultStyles` to false. If set, you
+     * must specify all styles externally, including positioning.
+     * This is helpful if your project uses external CSS assets.
+     *
+     * _Note_: underlayStyle and dialogStyle can still be set inline,
+     * but these will be the only styles applied.
+     */
+    includeDefaultStyles?: boolean;
+
+    /**
+     * Apply a class to the dialog in order to custom-style it.
+     *
+     * Be aware that, _by default_, this module does apply various
+     * inline styles to the dialog element in order position it.
+     * To disable _all inline styles_, see `includeDefaultStyles`.
+     */
+    dialogClass?: string;
+
+    /**
+     * Choose your own id attribute for the dialog element.
+     *
+     * Default: `react-aria-modal-dialog`.
+     */
+    dialogId?: string;
+
+    /**
+     * Customize properties of the style prop that is passed to the dialog.
+     */
+    dialogStyle?: React.CSSProperties;
+
+    /**
+     * By default, when the modal activates its first focusable child will
+     * receive focus. However, if `focusDialog` is true, the dialog itself
+     * will receive initial focus — and that focus will be hidden.
+     * (This is essentially what Bootstrap does with their modal.)
+     */
+    focusDialog?: boolean;
+
+    /**
+     * By default, when the modal activates its first focusable child will
+     * receive focus. If, instead, you want to identify a specific element
+     * that should receive initial focus, pass a selector string to this
+     * prop. (That selector is passed to `document.querySelector()` to find
+     * the DOM node.)
+     */
+    initialFocus?: string;
+
+    /**
+     * A string to use as the modal's accessible title. This value is passed
+     * to the modal's `aria-label` attribute. You must use either `titleId` or
+     * `titleText`, but not both.
+     */
+    titleText?: string;
+
+    /**
+     * The `id` of the element that should be used as the modal's accessible
+     * title. This value is passed to the modal's `aria-labelledby` attribute.
+     * You must use either `titleId` or `titleText`, but not both.
+     */
+    titleId?: string;
+
+    /**
+     * Customize properties of the `style` prop that is passed to the underlay.
+     * The best way to add some vertical displacement to the dialog is to add
+     * top & bottom padding to the underlay.
+     * This is illustrated in the demo examples.
+     */
+    underlayStyle?: React.CSSProperties;
+
+    /**
+     * Apply a class to the underlay in order to custom-style it.
+     * This module does apply various inline styles, though, so be aware that
+     * overriding some styles might be difficult. If, for example, you want
+     * to change the underlay's color, you should probably use the
+     * `underlayColor` prop instead of a class.
+     * If you would rather control all CSS, see `includeDefaultStyles`.
+     */
+    underlayClass?: string;
+
+    /**
+     * By default, a click on the underlay will exit the modal.
+     * Pass `false`, and clicking on the underlay will do nothing.
+     */
+    underlayClickExits?: boolean;
+
+    /**
+     * By default, the Escape key exits the modal. Pass `false`, and it won't.
+     */
+    escapeExits?: boolean;
+
+    /**
+     * If you want to change the underlay's color, you can
+     * do that with this prop. If `false`, no background color will be
+     * applied with inline styles. Presumably you will apply then
+     * yourself via an `underlayClass`.
+     *
+     * Default: rgba(0,0,0,0.5)
+     */
+    underlayColor?: string;
+
+    /**
+     * If `true`, the modal's contents will be vertically (as well as horizontally) centered.
+     */
+    verticallyCenter?: boolean;
+
+    /**
+     * This function is called in the modal's `componentDidMount()` lifecycle method.
+     * You can use it to do whatever diverse and sundry things you feel like
+     * doing after the modal activates.
+     */
+    onEnter?(): any;
+
+    /**
+     * This function needs to handles the state change of exiting (or deactivating) the modal.
+     * Maybe it's just a wrapper around `setState()`; or maybe you use some more involved
+     * Flux-inspired state management — whatever the case, this module leaves the state
+     * management up to you instead of making assumptions.
+     * That also makes it easier to create your own "close modal" buttons; because you
+     * have the function that closes the modal right there, written by you, at your disposal.
+     */
+    onExit(): any;
+}
+
+export default class AriaModal extends React.PureComponent<AriaModalProps> {
+    static renderTo(node: HTMLElement | string): void;
+}
diff --git a/types/react-aria-modal/react-aria-modal-tests.tsx b/types/react-aria-modal/react-aria-modal-tests.tsx
new file mode 100644
index 0000000000..c8c9de62d4
--- /dev/null
+++ b/types/react-aria-modal/react-aria-modal-tests.tsx
@@ -0,0 +1,14 @@
+import AriaModal from 'react-aria-modal';
+import * as React from 'react';
+import { render } from 'react-dom';
+
+declare const appContainer: HTMLElement;
+
+const onExit = () => {};
+
+render(
+    <AriaModal onExit={onExit} underlayClickExits>
+        Hello world
+    </AriaModal>,
+    appContainer
+);
diff --git a/types/react-aria-modal/tsconfig.json b/types/react-aria-modal/tsconfig.json
new file mode 100644
index 0000000000..2dad722b56
--- /dev/null
+++ b/types/react-aria-modal/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6", "dom"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true,
+        "jsx": "react"
+    },
+    "files": ["index.d.ts", "react-aria-modal-tests.tsx"]
+}
diff --git a/types/react-aria-modal/tslint.json b/types/react-aria-modal/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-aria-modal/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-autocomplete/index.d.ts b/types/react-autocomplete/index.d.ts
index 58339d3b31..fd0bdc8b8a 100644
--- a/types/react-autocomplete/index.d.ts
+++ b/types/react-autocomplete/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-autocomplete
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ChangeEvent, ReactNode, CSSProperties, HTMLProps } from 'react';
 
@@ -143,8 +143,27 @@ declare namespace Autocomplete {
         open?: boolean;
         debug?: boolean;
     }
+
+    interface State {
+      /**
+       * True when the menu is visible. Provided to `onMenuVisibilityChange`.
+       */
+      isOpen: boolean;
+
+      /**
+       * Index of the highlighted item, `null` if none currently is.
+       */
+      highlightedIndex: number | null;
+
+      /**
+       * These three `menu___` values are used in CSS to layout the menu.
+       */
+      menuLeft?: number;
+      menuTop?: number;
+      menuWidth?: number;
+    }
 }
-declare class Autocomplete extends Component<Autocomplete.Props> {
+declare class Autocomplete extends Component<Autocomplete.Props, Autocomplete.State> {
     /**
      * Autocomplete exposes a subset of `HTMLInputElement` properties to the parent component.
      * They can be accessed through Autocomplete's `ref` prop.
diff --git a/types/react-autosuggest/index.d.ts b/types/react-autosuggest/index.d.ts
index ab91481925..bd20cc3c0a 100644
--- a/types/react-autosuggest/index.d.ts
+++ b/types/react-autosuggest/index.d.ts
@@ -7,7 +7,7 @@
 //                 Christopher Deutsch <https://github.com/cdeutsch>
 //                 Kevin Ross <https://github.com/rosskevin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-autosuggest/react-autosuggest-tests.tsx b/types/react-autosuggest/react-autosuggest-tests.tsx
index 7fea579987..60d995071b 100644
--- a/types/react-autosuggest/react-autosuggest-tests.tsx
+++ b/types/react-autosuggest/react-autosuggest-tests.tsx
@@ -63,14 +63,10 @@ export class ReactAutosuggestBasicTest extends React.Component<any, any> {
         }
     ];
     // endregion region Constructor
-    constructor(props: any) {
-        super(props);
-
-        this.state = {
-            value: '',
-            suggestions: this.getSuggestions('')
-        };
-    }
+    state = {
+        value: '',
+        suggestions: this.getSuggestions('')
+    };
     // endregion region Rendering methods
     render(): JSX.Element {
         const {value, suggestions} = this.state;
@@ -189,14 +185,10 @@ export class ReactAutosuggestTypedTest extends React.Component<any, any> {
         }
     ];
     // endregion region Constructor
-    constructor(props: any) {
-        super(props);
-
-        this.state = {
-            value: '',
-            suggestions: this.getSuggestions('')
-        };
-    }
+    state = {
+        value: '',
+        suggestions: this.getSuggestions('')
+    };
     // endregion region Rendering methods
     render(): JSX.Element {
         const {value, suggestions} = this.state;
@@ -345,6 +337,8 @@ export class ReactAutosuggestMultipleTest extends React.Component<any, any> {
             ]
         }
     ];
+
+    state: any;
     // endregion region Constructor
     constructor(props: any) {
         super(props);
@@ -495,14 +489,10 @@ export class ReactAutosuggestCustomTest extends React.Component<any, any> {
         }
     ];
     // endregion region Constructor
-    constructor(props: any) {
-        super(props);
-
-        this.state = {
-            value: '',
-            suggestions: this.getSuggestions('')
-        };
-    }
+    state = {
+        value: '',
+        suggestions: this.getSuggestions('')
+    };
     // endregion region Rendering methods
     render(): JSX.Element {
         const {value, suggestions} = this.state;
diff --git a/types/react-avatar-editor/index.d.ts b/types/react-avatar-editor/index.d.ts
index 9f9ede1ea3..c2aebc5e63 100644
--- a/types/react-avatar-editor/index.d.ts
+++ b/types/react-avatar-editor/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Diogo Corrêa <https://github.com/diogocorrea>
 //                 Gabriel Prates <https://github.com/gabsprates>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-beautiful-dnd/index.d.ts b/types/react-beautiful-dnd/index.d.ts
index 8d25e79407..40a2fb9e73 100644
--- a/types/react-beautiful-dnd/index.d.ts
+++ b/types/react-beautiful-dnd/index.d.ts
@@ -1,10 +1,11 @@
-// Type definitions for react-beautiful-dnd 6.0
+// Type definitions for react-beautiful-dnd 7.1
 // Project: https://github.com/atlassian/react-beautiful-dnd
 // Definitions by: varHarrie <https://github.com/varHarrie>
 //                 Bradley Ayers <https://github.com/bradleyayers>
 //                 Austin Turner <https://github.com/paustint>
+//                 Mark Nelissen <https://github.com/marknelissen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -72,6 +73,7 @@ export interface DroppableStateSnapshot {
 export interface DroppableProps {
     droppableId: DroppableId;
     type?: TypeId;
+    ignoreContainerClipping?: boolean;
     isDropDisabled?: boolean;
     direction?: 'vertical' | 'horizontal';
     children(provided: DroppableProvided, snapshot: DroppableStateSnapshot): React.ReactElement<any>;
@@ -84,8 +86,8 @@ export class Droppable extends React.Component<DroppableProps> {}
  */
 
 export interface NotDraggingStyle {
-    transform: null | string;
-    transition: null | 'none';
+    transform?: string;
+    transition?: 'none';
 }
 
 export interface DraggingStyle {
@@ -97,14 +99,14 @@ export interface DraggingStyle {
     top: number;
     left: number;
     margin: 0;
-    transform: null | string;
+    transform?: string;
     transition: 'none';
     zIndex: ZIndex;
 }
 
 export interface DraggableProvidedDraggableProps {
     // inline style
-    style: null | DraggingStyle | NotDraggingStyle;
+    style?: DraggingStyle | NotDraggingStyle;
     // used for shared global styles
     'data-react-beautiful-dnd-draggable': string;
 }
diff --git a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
index 882b28a9ad..bfa5d8b8f5 100644
--- a/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
+++ b/types/react-beautiful-dnd/react-beautiful-dnd-tests.tsx
@@ -40,12 +40,11 @@ interface AppState {
 }
 
 class App extends React.Component<{}, AppState> {
+  state = {
+    items: getItems(10)
+  };
   constructor(props: any) {
     super(props);
-
-    this.state = {
-      items: getItems(10)
-    };
     this.onDragEnd = this.onDragEnd.bind(this);
   }
 
@@ -74,7 +73,7 @@ class App extends React.Component<{}, AppState> {
   render() {
     return (
       <DragDropContext onDragStart={this.onDragStart} onDragUpdate={this.onDragUpdate} onDragEnd={this.onDragEnd}>
-        <Droppable droppableId="droppable">
+        <Droppable droppableId="droppable" ignoreContainerClipping={false}>
           {(provided, snapshot) => (
             <div ref={provided.innerRef} style={getListStyle(snapshot.isDraggingOver)} {...provided.droppableProps}>
               {this.state.items.map((item, index) => (
diff --git a/types/react-big-calendar/index.d.ts b/types/react-big-calendar/index.d.ts
index bcaee40549..60db9a20f9 100644
--- a/types/react-big-calendar/index.d.ts
+++ b/types/react-big-calendar/index.d.ts
@@ -3,14 +3,17 @@
 // Definitions by: Piotr Witek <https://github.com/piotrwitek>
 //                 Austin Turner <https://github.com/paustint>
 //                 Krzysztof Bezrąk <https://github.com/pikpok>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
 export type stringOrDate = string | Date;
 export type View = 'month' | 'week' | 'work_week' | 'day' | 'agenda';
 export type Navigate = 'PREV' | 'NEXT' | 'TODAY' | 'DATE';
+
+export type Event = object;
 export interface Format {
     /**
      * Format for the day of the month heading in the Month view.
@@ -83,11 +86,23 @@ export interface Format {
     eventTimeRangeEndFormat?: string;
 }
 
+export interface HeaderProps {
+    culture: BigCalendarProps['culture'];
+    date: Date;
+    format: string;
+    label: string;
+    localizer: object;
+}
+
 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;
+    /**
+     * component used as a header for each column in the TimeGridHeader
+     */
+    header?: React.ComponentType<HeaderProps>;
     toolbar?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
     agenda?: {
         date?: React.SFC | React.Component | React.ComponentClass | JSX.Element;
@@ -127,17 +142,17 @@ export interface Messages {
     showMore?: (count: number) => string;
 }
 
-export interface BigCalendarProps extends React.Props<BigCalendar> {
+export interface BigCalendarProps<T extends Event = Event> extends React.Props<BigCalendar<T>> {
     date?: stringOrDate;
     now?: Date;
     view?: View;
-    events?: object[];
+    events?: T[];
     onNavigate?: (newDate: Date, action: Navigate) => 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;
+    onDoubleClickEvent?: (event: T, e: React.SyntheticEvent<HTMLElement>) => void;
+    onSelectEvent?: (event: T, e: React.SyntheticEvent<HTMLElement>) => void;
     onSelecting?: (range: { start: stringOrDate, end: stringOrDate }) => boolean | undefined | null;
     selected?: any;
     views?: View[] | {
@@ -156,7 +171,7 @@ export interface BigCalendarProps extends React.Props<BigCalendar> {
     step?: number;
     timeslots?: number;
     rtl?: boolean;
-    eventPropGetter?: (event: object, start: stringOrDate, end: stringOrDate, isSelected: boolean) => { className?: string, style?: React.CSSProperties };
+    eventPropGetter?: (event: T, 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;
@@ -167,21 +182,21 @@ export interface BigCalendarProps extends React.Props<BigCalendar> {
     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);
+    titleAccessor?: keyof T | ((event: T) => string);
+    allDayAccessor?: keyof T | ((event: T) => boolean);
+    startAccessor?: keyof T | ((event: T) => Date);
+    endAccessor?: keyof T | ((event: T) => Date);
+    resourceAccessor?: keyof T | ((event: T) => any);
     resources?: any[];
-    resourceIdAccessor?: string | ((event: any) => any);
-    resourceTitleAccessor?: string | ((event: any) => string);
+    resourceIdAccessor?: keyof T | ((event: T) => any);
+    resourceTitleAccessor?: keyof T | ((event: T) => string);
     defaultView?: View;
     defaultDate?: Date;
     className?: string;
     elementProps?: React.HTMLAttributes<HTMLElement>;
 }
 
-export default class BigCalendar extends React.Component<BigCalendarProps> {
+export default class BigCalendar<T extends Event = Event> extends React.Component<BigCalendarProps<T>> {
     /**
      * Setup the localizer by providing the moment Object
      */
diff --git a/types/react-big-calendar/react-big-calendar-tests.tsx b/types/react-big-calendar/react-big-calendar-tests.tsx
index dbb1753332..fe0ba7fe7c 100644
--- a/types/react-big-calendar/react-big-calendar-tests.tsx
+++ b/types/react-big-calendar/react-big-calendar-tests.tsx
@@ -45,7 +45,7 @@ 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
-class FullAPIExample extends React.Component<BigCalendarProps> {
+class FullAPIExample extends React.Component<BigCalendarProps<CalendarEvent>> {
     render() {
         return (
             <BigCalendar
diff --git a/types/react-body-classname/index.d.ts b/types/react-body-classname/index.d.ts
index 23aa8d6f78..11dd7febeb 100644
--- a/types/react-body-classname/index.d.ts
+++ b/types/react-body-classname/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/PactCoffee/react-body-classname
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-bootstrap-date-picker/index.d.ts b/types/react-bootstrap-date-picker/index.d.ts
index 96971cc0bb..9fdd94f2fb 100644
--- a/types/react-bootstrap-date-picker/index.d.ts
+++ b/types/react-bootstrap-date-picker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/pushtell/react-bootstrap-date-picker#readme
 // Definitions by: Karol Janyst <https://github.com/LKay>, Antal Bodnar <https://github.com/ssi-hu-antal-bodnar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, StatelessComponent, ReactNode, FocusEventHandler, HTMLAttributes } from "react";
 
diff --git a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
index 23b6c75d63..a5134c3cc2 100644
--- a/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
+++ b/types/react-bootstrap-date-picker/react-bootstrap-date-picker-tests.tsx
@@ -1,5 +1,4 @@
 import * as React from "react";
-import { DropdownMenu } from "react-bootstrap";
 import DatePicker = require("react-bootstrap-date-picker");
 
 const Custom: React.StatelessComponent = () => {
diff --git a/types/react-bootstrap-daterangepicker/index.d.ts b/types/react-bootstrap-daterangepicker/index.d.ts
index 26fb15f45a..b9ef9a955b 100644
--- a/types/react-bootstrap-daterangepicker/index.d.ts
+++ b/types/react-bootstrap-daterangepicker/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/skratchdot/react-bootstrap-daterangepicker
 // Definitions by: Ian Ker-Seymer <https://github.com/ianks>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 /// <reference types="daterangepicker" />
diff --git a/types/react-bootstrap-table/index.d.ts b/types/react-bootstrap-table/index.d.ts
index d98dac1c44..1284162778 100644
--- a/types/react-bootstrap-table/index.d.ts
+++ b/types/react-bootstrap-table/index.d.ts
@@ -6,7 +6,7 @@
 //                 Janeene Beeforth <https://github.com/dawnmist>
 //                 Oscar Andersson <https://github.com/Ogglas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 // documentation taken from http://allenfang.github.io/react-bootstrap-table/docs.html
 
diff --git a/types/react-bootstrap-table/v2/index.d.ts b/types/react-bootstrap-table/v2/index.d.ts
index 5ac31a4a77..07d7da53d9 100644
--- a/types/react-bootstrap-table/v2/index.d.ts
+++ b/types/react-bootstrap-table/v2/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/react-bootstrap-typeahead/index.d.ts b/types/react-bootstrap-typeahead/index.d.ts
index 005a7633ed..fa970bc5b3 100644
--- a/types/react-bootstrap-typeahead/index.d.ts
+++ b/types/react-bootstrap-typeahead/index.d.ts
@@ -1,10 +1,10 @@
-// Type definitions for react-bootstrap-typeahead 3.1
+// Type definitions for react-bootstrap-typeahead 3.2
 // Project: https://github.com/ericgio/react-bootstrap-typeahead
 // Definitions by: Guymestef <https://github.com/Guymestef>
 //                 Rajab Shakirov <https://github.com/radziksh>
 //                 Paito Anderson <https://github.com/PaitoAnderson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 // TODO: <Highlighter>, <Menu>, <MenuItem>, <Token> components
 
 import * as React from 'react';
@@ -70,9 +70,15 @@ export interface TypeaheadProps<T> {
     /* Props to be applied directly to the input. onBlur, onChange, onFocus, and onKeyDown are ignored. */
     inputProps?: object;
 
+    /* Bootstrap 4 only. Adds the `is-invalid` classname to the `form-control`. */
+    isInvalid?: boolean;
+
     /* Indicate whether an asynchronous data fetch is happening. */
     isLoading?: boolean;
 
+    /* Bootstrap 4 only. Adds the `is-valid` classname to the `form-control`. */
+    isValid?: boolean;
+
     /* Specify which option key to use for display or a render function. By default, the selector will use the label key. */
     labelKey?: string | ((option: T | string) => string);
 
diff --git a/types/react-bootstrap/index.d.ts b/types/react-bootstrap/index.d.ts
index 6a78dcbb1a..83f5f8db61 100644
--- a/types/react-bootstrap/index.d.ts
+++ b/types/react-bootstrap/index.d.ts
@@ -12,8 +12,10 @@
 //                 Karol Janyst <https://github.com/LKay>
 //                 Aaron Beall <https://github.com/aaronbeall>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
+//                 Andrew Makarov <https://github.com/r3nya>
+//                 Duong Tran <https://github.com/t49tran>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-bootstrap/lib/Carousel.d.ts b/types/react-bootstrap/lib/Carousel.d.ts
index 23ceeda466..17de20bac8 100644
--- a/types/react-bootstrap/lib/Carousel.d.ts
+++ b/types/react-bootstrap/lib/Carousel.d.ts
@@ -12,7 +12,7 @@ declare namespace Carousel {
         defaultActiveIndex?: number;
         direction?: string;
         indicators?: boolean;
-        interval?: number;
+        interval?: number | null;
         nextIcon?: React.ReactNode;
         onSelect?: SelectCallback;
         // TODO: Add more specific type
diff --git a/types/react-bootstrap/lib/NavDropdown.d.ts b/types/react-bootstrap/lib/NavDropdown.d.ts
index 909f5dd67a..f7b9460341 100644
--- a/types/react-bootstrap/lib/NavDropdown.d.ts
+++ b/types/react-bootstrap/lib/NavDropdown.d.ts
@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { Omit } from 'react-bootstrap';
 import { DropdownBaseProps } from './Dropdown';
 
 declare namespace NavDropdown {
@@ -6,9 +7,10 @@ declare namespace NavDropdown {
         active?: boolean;
         noCaret?: boolean;
         eventKey?: any;
+        title: React.ReactNode;
     }
 
-    export type NavDropdownProps = NavDropdownBaseProps & React.HTMLProps<NavDropdown>;
+    export type NavDropdownProps = NavDropdownBaseProps & Omit<React.HTMLProps<NavDropdown>, 'title'>;
 }
 declare class NavDropdown extends React.Component<NavDropdown.NavDropdownProps> { }
 export = NavDropdown;
diff --git a/types/react-bootstrap/lib/ToggleButton.d.ts b/types/react-bootstrap/lib/ToggleButton.d.ts
index ef231bf288..b199ea8119 100644
--- a/types/react-bootstrap/lib/ToggleButton.d.ts
+++ b/types/react-bootstrap/lib/ToggleButton.d.ts
@@ -1,11 +1,12 @@
 import * as React from 'react';
+import { Button } from 'react-bootstrap';
 
 declare namespace ToggleButton {
     export interface ToggleButtonProps extends React.HTMLProps<ToggleButton> {
         checked?: boolean;
         name?: string;
-        value: number|string;
+        value: number | string;
     }
 }
-declare class ToggleButton extends React.Component<ToggleButton.ToggleButtonProps> { }
+declare class ToggleButton extends React.Component<ToggleButton.ToggleButtonProps & Button.ButtonProps> { }
 export = ToggleButton;
diff --git a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
index 27be6b95a9..2c40c6553f 100644
--- a/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
+++ b/types/react-bootstrap/lib/ToggleButtonGroup.d.ts
@@ -1,38 +1,38 @@
 import * as React from 'react';
+import { ButtonGroup } from 'react-bootstrap';
 import { Omit } from "../index";
 
 declare namespace ToggleButtonGroup {
-    interface BaseProps {
-        /**
-         * You'll usually want to use string|number|string[]|number[] here,
-         * but you can technically use any|any[].
-         */
-        defaultValue?: any;
-        /**
-         * You'll usually want to use string|number|string[]|number[] here,
-         * but you can technically use any|any[].
-         */
-        value?: any;
-    }
+  interface BaseProps {
+    /**
+     * You'll usually want to use string|number|string[]|number[] here,
+     * but you can technically use any|any[].
+     */
+    defaultValue?: any;
+    /**
+     * You'll usually want to use string|number|string[]|number[] here,
+     * but you can technically use any|any[].
+     */
+    value?: any;
+  }
 
-    interface RadioProps {
-        /** Required if `type` is set to "radio" */
-        name: string;
-        type: "radio";
-        onChange?(value: any): void;
-    }
+  interface RadioProps {
+    /** Required if `type` is set to "radio" */
+    name: string;
+    type: "radio";
+    onChange?(value: any): void;
+  }
 
-    interface CheckboxProps {
-        name?: string;
-        type: "checkbox";
-        onChange?(values: any[]): void;
-    }
-
-    export type ToggleButtonGroupProps = BaseProps
-                                       & (RadioProps | CheckboxProps)
-                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value">
-                                       & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value" | "onChange">;
+  interface CheckboxProps {
+    name?: string;
+    type: "checkbox";
+    onChange?(values: any[]): void;
+  }
 
+  export type ToggleButtonGroupProps = BaseProps
+    & (RadioProps | CheckboxProps)
+    & Omit<ButtonGroup.ButtonGroupProps, "onChange">
+    & Omit<React.HTMLProps<ToggleButtonGroup>, "defaultValue" | "type" | "value" | "onChange">;
 }
 declare class ToggleButtonGroup extends React.Component<ToggleButtonGroup.ToggleButtonGroupProps> { }
 export = ToggleButtonGroup;
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 07d6a8a442..9457cea4a2 100644
--- a/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-individual-components-tests.tsx
@@ -166,7 +166,7 @@ export class ReactBootstrapIndividualComponentsTest extends React.Component {
         <ModalHeader />
         <ModalTitle />
         <Nav />
-        <NavDropdown id="foo" />
+        <NavDropdown id="foo" title={<h4>Test</h4>} />
         <NavItem />
         <Navbar />
         <NavbarBrand />
@@ -209,9 +209,21 @@ export class ReactBootstrapIndividualComponentsTest extends React.Component {
         <Table />
         <Tabs />
         <Thumbnail />
-        <ToggleButton value="foo" />
-        <ToggleButtonGroup type="checkbox" />
-        <ToggleButtonGroup type="radio" name="foo" />
+        <ToggleButton value="foo" bsSize="small" />
+        <ToggleButtonGroup
+          type="checkbox"
+          bsSize="small"
+          defaultValue={[1]}
+          value={[1, 2]}
+          onChange={(value: number[]) => { }}
+        />
+        <ToggleButtonGroup
+          type="radio"
+          name="foo"
+          defaultValue={1}
+          value={1}
+          onChange={(value: number) => { }}
+        />
         <Tooltip />
         <Well />
       </div>
diff --git a/types/react-bootstrap/test/react-bootstrap-tests.tsx b/types/react-bootstrap/test/react-bootstrap-tests.tsx
index ccebe35add..34692ce248 100644
--- a/types/react-bootstrap/test/react-bootstrap-tests.tsx
+++ b/types/react-bootstrap/test/react-bootstrap-tests.tsx
@@ -1,18 +1,56 @@
 import * as React from 'react';
 import { Component, CSSProperties } from 'react';
 import {
-    Button, ButtonToolbar, Modal, Well, ButtonGroup,
-    DropdownButton, MenuItem, Panel, PanelGroup, ListGroup,
-    ListGroupItem, Accordion, Tooltip,
-    OverlayTrigger, Popover, ProgressBar,
-    Nav, NavItem, Navbar, NavDropdown,
-    Tabs, Tab, Pager, PageItem,
-    Pagination, Alert, Carousel, SafeAnchor,
-    Grid, Row, Col, Thumbnail, Image, ResponsiveEmbed,
-    Label, Badge, Jumbotron, PageHeader,
-    Glyphicon, Table, Form, FormGroup,
-    ControlLabel, FormControl, HelpBlock,
-    Radio, Checkbox, Media, InputGroup, ToggleButtonGroup,
+    Button,
+    ButtonToolbar,
+    Modal,
+    Well,
+    ButtonGroup,
+    DropdownButton,
+    MenuItem,
+    Panel,
+    PanelGroup,
+    ListGroup,
+    ListGroupItem,
+    Accordion,
+    Tooltip,
+    OverlayTrigger,
+    Popover,
+    ProgressBar,
+    Nav,
+    NavItem,
+    Navbar,
+    NavDropdown,
+    Tabs,
+    Tab,
+    Pager,
+    PageItem,
+    Pagination,
+    Alert,
+    Carousel,
+    SafeAnchor,
+    Grid,
+    Row,
+    Col,
+    Thumbnail,
+    Image,
+    ResponsiveEmbed,
+    Label,
+    Badge,
+    Jumbotron,
+    PageHeader,
+    Glyphicon,
+    Table,
+    Form,
+    FormGroup,
+    ControlLabel,
+    FormControl,
+    HelpBlock,
+    Radio,
+    Checkbox,
+    Media,
+    InputGroup,
+    ToggleButtonGroup,
     ToggleButton
 } from 'react-bootstrap';
 
@@ -1418,20 +1456,47 @@ export class ReactBootstrapTest extends Component {
 
               <div>
                 <ButtonToolbar>
-                  <ToggleButtonGroup type="checkbox" defaultValue={[1, 3]}>
-                    <ToggleButton value={1}>Checkbox 1 (pre-checked)</ToggleButton>
-                    <ToggleButton value={2}>Checkbox 2</ToggleButton>
-                    <ToggleButton value={3}>Checkbox 3 (pre-checked)</ToggleButton>
+                  <ToggleButtonGroup
+                    type="checkbox"
+                    defaultValue={[1, 3]}
+                    bsSize="small"
+                  >
+                    <ToggleButton value={1} bsSize="small" active>
+                      Checkbox 1 (pre-checked)
+                    </ToggleButton>
+                    <ToggleButton value={2}>
+                      Checkbox 2
+                    </ToggleButton>
+                    <ToggleButton value={3}>
+                      Checkbox 3 (pre-checked)
+                    </ToggleButton>
                   </ToggleButtonGroup>
                 </ButtonToolbar>
 
                 <ButtonToolbar>
-                  <ToggleButtonGroup type="radio" name="options" defaultValue={1}>
-                    <ToggleButton value={1}>
+                  <ToggleButtonGroup
+                    type="radio"
+                    name="options"
+                    defaultValue={1}
+                  >
+                    <ToggleButton
+                      value={1}
+                      bsSize="large"
+                    >
                       Radio 1 (pre-checked)
                     </ToggleButton>
-                    <ToggleButton value={2}>Radio 2</ToggleButton>
-                    <ToggleButton value={3}>Radio 3</ToggleButton>
+                    <ToggleButton
+                      value={2}
+                      bsSize="small"
+                    >
+                      Radio 2
+                    </ToggleButton>
+                    <ToggleButton
+                      value={3}
+                      bsSize="xsmall"
+                    >
+                      Radio 3
+                    </ToggleButton>
                   </ToggleButtonGroup>
                 </ButtonToolbar>
               </div>
diff --git a/types/react-breadcrumbs-dynamic/index.d.ts b/types/react-breadcrumbs-dynamic/index.d.ts
index ed0521ec28..491157b655 100644
--- a/types/react-breadcrumbs-dynamic/index.d.ts
+++ b/types/react-breadcrumbs-dynamic/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oklas/react-breadcrumbs-dynamic
 // Definitions by: mitsuruog <https://github.com/mitsuruog>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-breadcrumbs/index.d.ts b/types/react-breadcrumbs/index.d.ts
index d43b5ba81c..3aa1cc3670 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.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as ReactRouter from "react-router";
diff --git a/types/react-broadcast/index.d.ts b/types/react-broadcast/index.d.ts
index 8a9a3bf47b..11b2312570 100644
--- a/types/react-broadcast/index.d.ts
+++ b/types/react-broadcast/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-burger-menu/index.d.ts b/types/react-burger-menu/index.d.ts
index 51aec4fcd1..85d49494c2 100644
--- a/types/react-burger-menu/index.d.ts
+++ b/types/react-burger-menu/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/negomi/react-burger-menu
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-bytesize-icons/index.d.ts b/types/react-bytesize-icons/index.d.ts
index d9dd1a50f7..de9d8e0f69 100644
--- a/types/react-bytesize-icons/index.d.ts
+++ b/types/react-bytesize-icons/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/abdelhai/react-bytesize-icons
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-calendar-heatmap/index.d.ts b/types/react-calendar-heatmap/index.d.ts
index 9f85b5bd2f..a4dbf402a5 100644
--- a/types/react-calendar-heatmap/index.d.ts
+++ b/types/react-calendar-heatmap/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-calendar-timeline/index.d.ts b/types/react-calendar-timeline/index.d.ts
index 2ff17f6a82..cf97e70f50 100644
--- a/types/react-calendar-timeline/index.d.ts
+++ b/types/react-calendar-timeline/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>
 //				         Alex Maclean <https://github.com/acemac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
diff --git a/types/react-cartographer/index.d.ts b/types/react-cartographer/index.d.ts
index 918fcbef81..646ca5de0e 100644
--- a/types/react-cartographer/index.d.ts
+++ b/types/react-cartographer/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 import Map from './lib/components/Map';
 
 export {
diff --git a/types/react-circular-progressbar/index.d.ts b/types/react-circular-progressbar/index.d.ts
index 2d3e7f228e..f93a64c8e9 100644
--- a/types/react-circular-progressbar/index.d.ts
+++ b/types/react-circular-progressbar/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-circular-progressbar 0.8
+// Type definitions for react-circular-progressbar 1.0
 // Project: https://github.com/iqnivek/react-circular-progressbar#readme
 // Definitions by: Lee Standen <https://github.com/lstanden>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, CSSProperties } from 'react';
 
@@ -18,16 +18,9 @@ export interface Props {
     backgroundPadding?: number;
     initialAnimation?: boolean;
     counterClockwise?: boolean;
-    classForPercentage?: FalseyCallback;
-    textForPercentage?: FalseyCallback;
+    text?: string;
 }
 
-export type FalseyCallback =
-    | ''
-    | false
-    | null
-    | ((percentage: number) => string);
-
 export interface GroupOverride<T> {
     root?: T;
     trail?: T;
diff --git a/types/react-circular-progressbar/react-circular-progressbar-tests.tsx b/types/react-circular-progressbar/react-circular-progressbar-tests.tsx
index a6fecb5fa4..25785d76cd 100644
--- a/types/react-circular-progressbar/react-circular-progressbar-tests.tsx
+++ b/types/react-circular-progressbar/react-circular-progressbar-tests.tsx
@@ -10,13 +10,13 @@ render(
         <CircularProgressbar
             className="testing"
             percentage={55}
-            textForPercentage={(val) => (val > 50 ? val.toString() : '')}
+            text={'55%'}
             strokeWidth={16}
         />
         <CircularProgressbar
             className="testing"
             percentage={55}
-            textForPercentage=""
+            text=""
             strokeWidth={16}
         />
     </div>,
diff --git a/types/react-click-outside/index.d.ts b/types/react-click-outside/index.d.ts
index 5a1ce6d220..c09dccb155 100644
--- a/types/react-click-outside/index.d.ts
+++ b/types/react-click-outside/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kentor/react-click-outside
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 import * as React from "react";
 
 declare function enhanceWithClickOutside<P = {}>(wrappedComponent: React.ComponentClass<P>): React.ComponentClass<P>;
diff --git a/types/react-click-outside/react-click-outside-tests.tsx b/types/react-click-outside/react-click-outside-tests.tsx
index 6aa375b153..d51516281e 100644
--- a/types/react-click-outside/react-click-outside-tests.tsx
+++ b/types/react-click-outside/react-click-outside-tests.tsx
@@ -11,10 +11,7 @@ interface State {
 }
 
 class StatefulComponent extends React.Component<Props, State> {
-    constructor(props: Props) {
-        super(props);
-        this.state = { isOpened: true };
-    }
+    state = { isOpened: true };
 
     handleClickOutside() {
         this.setState({ isOpened: false });
diff --git a/types/react-codemirror/index.d.ts b/types/react-codemirror/index.d.ts
index 607554b269..1afe6362c9 100644
--- a/types/react-codemirror/index.d.ts
+++ b/types/react-codemirror/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Vicky Lai <https://github.com/velveret>
 //                 Rudi Chen <https://github.com/rudi-c>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 /// <reference types="codemirror"/>
diff --git a/types/react-coinhive/index.d.ts b/types/react-coinhive/index.d.ts
new file mode 100644
index 0000000000..e266db590b
--- /dev/null
+++ b/types/react-coinhive/index.d.ts
@@ -0,0 +1,44 @@
+// Type definitions for react-coinhive 1.0
+// Project: https://github.com/dragma/react-coinhive
+// Definitions by: sktbcbbs <https://github.com/sktbcbbs>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export interface CoinHiveProps {
+    autoThreads?: boolean;
+
+    run?: boolean;
+
+    siteKey: string;
+
+    src?: string;
+
+    threads?: number;
+
+    throttle?: number;
+
+    userName?: string;
+
+    onInit?: (callback: any) => void;
+
+    onStart?: (callback: any) => void;
+
+    onStop?: (callback: any) => void;
+}
+
+export default class CoinHive extends React.Component<CoinHiveProps, any> {
+    static getMinerData(miner: any): any;
+
+    static src: {
+        authedmine: string;
+        coinhive: string;
+    };
+
+    onInit(miner: any): any;
+
+    onStart(miner: any): any;
+
+    onStop(miner: any): any;
+}
diff --git a/types/react-coinhive/react-coinhive-tests.tsx b/types/react-coinhive/react-coinhive-tests.tsx
new file mode 100644
index 0000000000..c108c7cddb
--- /dev/null
+++ b/types/react-coinhive/react-coinhive-tests.tsx
@@ -0,0 +1,23 @@
+import * as React from "react";
+import CoinHive, { CoinHiveProps } from "react-coinhive";
+
+export class CoinHiveTest extends React.Component {
+    render() {
+        const props: CoinHiveProps = {
+            userName: "Maya",
+            siteKey: "tbzWvRTBa3VAKefxUmDZx6P6wjCSHXz0",
+            autoThreads: false,
+            threads: 2,
+            src: CoinHive.src.authedmine,
+            onInit: () => {},
+            onStart: () => {},
+            onStop: () => {},
+        };
+
+        return (
+            <div>
+                <CoinHive {...props} />
+            </div>
+        );
+    }
+}
diff --git a/types/react-coinhive/tsconfig.json b/types/react-coinhive/tsconfig.json
new file mode 100644
index 0000000000..bd9fbfee80
--- /dev/null
+++ b/types/react-coinhive/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-coinhive-tests.tsx"
+    ]
+}
diff --git a/types/react-coinhive/tslint.json b/types/react-coinhive/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-coinhive/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-collapse/index.d.ts b/types/react-collapse/index.d.ts
index a4061860ba..c960fcd825 100644
--- a/types/react-collapse/index.d.ts
+++ b/types/react-collapse/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nkbt/react-collapse
 // Definitions by: Adam Binford <https://github.com/Kimahriman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 import * as React from 'react';
 
 export interface CollapseProps extends React.HTMLProps<Collapse> {
diff --git a/types/react-collapsible/index.d.ts b/types/react-collapsible/index.d.ts
index ad56aba34e..def932f6ba 100644
--- a/types/react-collapsible/index.d.ts
+++ b/types/react-collapsible/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/glennflanagan/react-collapsible#readme
 // Definitions by: knegusen <https://github.com/knegusen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 export interface CollapsibleProp {
diff --git a/types/react-color/index.d.ts b/types/react-color/index.d.ts
index a1fbbad698..a49d7b6035 100644
--- a/types/react-color/index.d.ts
+++ b/types/react-color/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/casesandberg/react-color/
 // Definitions by: Karol Janyst <https://github.com/LKay>, Marks Polakovs <https://github.com/markspolakovs>, Matthieu Montaudouin <https://github.com/mntdn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, ClassAttributes, StatelessComponent, ReactNode } from "react";
 
diff --git a/types/react-confirm/index.d.ts b/types/react-confirm/index.d.ts
index d07a367eab..532ac1768b 100644
--- a/types/react-confirm/index.d.ts
+++ b/types/react-confirm/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/haradakunihiko/react-confirm
 // Definitions by: santiagodoldan <https://github.com/santiagodoldan>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-content-loader/index.d.ts b/types/react-content-loader/index.d.ts
index 23b0ad02c3..c395fc8a34 100644
--- a/types/react-content-loader/index.d.ts
+++ b/types/react-content-loader/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Alaa Masoud <https://github.com/alaatm>
 //                 Sam Walsh <https://github.com/samwalshnz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-copy-to-clipboard/index.d.ts b/types/react-copy-to-clipboard/index.d.ts
index 33e9549d30..a09d7bc8be 100644
--- a/types/react-copy-to-clipboard/index.d.ts
+++ b/types/react-copy-to-clipboard/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Meno Abels <https://github.com/mabels>
 //                 Bernabe <https://github.com/BernabeFelix>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-copy-write/index.d.ts b/types/react-copy-write/index.d.ts
new file mode 100644
index 0000000000..30ce123c85
--- /dev/null
+++ b/types/react-copy-write/index.d.ts
@@ -0,0 +1,52 @@
+// Type definitions for react-copy-write 0.7
+// Project: https://github.com/aweary/react-copy-write
+// Definitions by: Sam A. Horvath-Hunt <https://github.com/samhh>
+//                 Dave Jeffery        <https://github.com/davej>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Component } from 'react';
+
+// It'd be nice if this could somehow be improved! Perhaps we need variadic
+// kinds plus infer keyword? Alternatively unions may solve our issue if we had
+// the ability to restrict type widening.
+type AnyDeepMemberOfState<T> = any;
+
+type MutateFn<T> = (draft: T, state: Readonly<T>) => void;
+type Mutator<T> = (mutator: MutateFn<T>) => void;
+
+type SelectorFn<T> = (state: T) => AnyDeepMemberOfState<T>;
+
+type RenderFn<T> = (...state: Array<Readonly<ReturnType<SelectorFn<T>>>>) => JSX.Element | JSX.Element[] | null;
+
+interface ConsumerPropsBase<T> {
+    select?: Array<SelectorFn<T>>;
+}
+
+interface ConsumerPropsExplicitRender<T> extends ConsumerPropsBase<T> {
+    render?: RenderFn<T>;
+}
+
+interface ConsumerPropsImplicitRender<T> extends ConsumerPropsBase<T> {
+    children?: RenderFn<T>;
+}
+
+type ConsumerProps<T> = ConsumerPropsExplicitRender<T> | ConsumerPropsImplicitRender<T>;
+
+declare class Consumer<T> extends Component<ConsumerProps<T>> {}
+
+interface ProviderProps<T> {
+    children: JSX.Element | JSX.Element[];
+    initialState?: Partial<T>;
+}
+
+declare class Provider<T> extends Component<ProviderProps<T>> {}
+
+declare function create<T extends object>(state: T): {
+    Provider: new() => Provider<T>,
+    Consumer: new() => Consumer<T>,
+    createSelector: SelectorFn<T>,
+    mutate: Mutator<T>,
+};
+
+export default create;
diff --git a/types/react-copy-write/react-copy-write-tests.tsx b/types/react-copy-write/react-copy-write-tests.tsx
new file mode 100644
index 0000000000..8effd45986
--- /dev/null
+++ b/types/react-copy-write/react-copy-write-tests.tsx
@@ -0,0 +1,30 @@
+import * as React from 'react';
+import { render } from 'react-dom';
+import createStore from 'react-copy-write';
+
+const { Provider, Consumer, mutate } = createStore({
+    letter: 'a',
+    number: 1,
+});
+
+const incrementNumber = () => mutate((draft) => {
+    draft.number++;
+});
+
+const App = () => (
+    <Provider>
+        <div>
+            <Consumer>
+                {state => (
+                    <div>Letter: {state.letter}</div>
+                )}
+            </Consumer>
+
+            <Consumer render={state => (
+                <div>Number (<span onClick={incrementNumber}>increment</span>): {state.number}</div>
+            )} />
+        </div>
+    </Provider>
+);
+
+render(<App />, document.body);
diff --git a/types/react-copy-write/tsconfig.json b/types/react-copy-write/tsconfig.json
new file mode 100644
index 0000000000..3c361b02f5
--- /dev/null
+++ b/types/react-copy-write/tsconfig.json
@@ -0,0 +1,25 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-copy-write-tests.tsx"
+    ]
+}
diff --git a/types/react-copy-write/tslint.json b/types/react-copy-write/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-copy-write/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-credit-cards/index.d.ts b/types/react-credit-cards/index.d.ts
index bc9a8fbf51..4cbf2f9830 100644
--- a/types/react-credit-cards/index.d.ts
+++ b/types/react-credit-cards/index.d.ts
@@ -1,31 +1,35 @@
 // Type definitions for react-credit-cards 0.7
 // Project: https://github.com/amarofashion/react-credit-cards
-// Definitions by: Vytautas Strimaitis <https://github.com/vstrimaitis>
+// Definitions by: Vytautas Strimaitis <https://github.com/vstrimaitis>, Ole Frank <https://github.com/olefrank>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.7
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
 export interface CallbackArgument {
     isValid: boolean;
-    type: { issuer: string; maxLength: number; };
+    type: { issuer: string; maxLength: number };
 }
 
+export type Focused = "name" | "number" | "expiry" | "cvc";
+
 export interface ReactCreditCardProps {
     acceptedCards?: ReadonlyArray<string>;
     callback?: (type: CallbackArgument, isValid: boolean) => void;
     cvc: string | number;
     expiry: string | number;
-    focused?: "name" | "number" | "expiry" | "cvc";
+    focused?: Focused;
     issuer?: string;
-    locale?: { valid: string; };
+    locale?: { valid: string };
     name: string;
     number: string | number;
-    placeholders?: { name: string; };
+    placeholders?: { name: string };
     preview?: boolean;
 }
 
-declare class ReactCreditCard extends React.Component<ReactCreditCardProps, never> {
-}
+declare class ReactCreditCard extends React.Component<
+    ReactCreditCardProps,
+    never
+> {}
 
 export default ReactCreditCard;
diff --git a/types/react-cropper/index.d.ts b/types/react-cropper/index.d.ts
index 3ab1106754..843cd50683 100644
--- a/types/react-cropper/index.d.ts
+++ b/types/react-cropper/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/roadmanfong/react-cropper
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as cropperjs from 'cropperjs';
 import * as React from 'react';
diff --git a/types/react-css-modules/index.d.ts b/types/react-css-modules/index.d.ts
index 955f76efa5..56b219728e 100644
--- a/types/react-css-modules/index.d.ts
+++ b/types/react-css-modules/index.d.ts
@@ -2,7 +2,7 @@
 // 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
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 interface TypeOptions {
     allowMultiple?: boolean;
diff --git a/types/react-css-transition-replace/index.d.ts b/types/react-css-transition-replace/index.d.ts
index f252707f42..b386019fc0 100644
--- a/types/react-css-transition-replace/index.d.ts
+++ b/types/react-css-transition-replace/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://marnusw.github.io/react-css-transition-replace/
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as CSSTransitionGroup from "react-addons-css-transition-group";
diff --git a/types/react-custom-scrollbars/index.d.ts b/types/react-custom-scrollbars/index.d.ts
index 7f60cc8a2a..db2ba3eb74 100644
--- a/types/react-custom-scrollbars/index.d.ts
+++ b/types/react-custom-scrollbars/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by:  David-LeBlanc-git <https://github.com/David-LeBlanc-git>
 //                  kittimiyo <https://github.com/kittimiyo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
@@ -44,8 +44,8 @@ declare module "react-custom-scrollbars" {
         universal?: boolean;
 
         autoHeight?: boolean;
-        autoHeightMin?: number;
-        autoHeightMax?: number;
+        autoHeightMin?: number | string;
+        autoHeightMax?: number | string;
     }
 
     export default class Scrollbars extends React.Component<ScrollbarProps> {
diff --git a/types/react-custom-scrollbars/v3/index.d.ts b/types/react-custom-scrollbars/v3/index.d.ts
index c0e7c1709e..f3ca0da419 100644
--- a/types/react-custom-scrollbars/v3/index.d.ts
+++ b/types/react-custom-scrollbars/v3/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/malte-wessel/react-custom-scrollbars
 // Definitions by: David-LeBlanc-git <https://github.com/David-LeBlanc-git>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-data-grid/index.d.ts b/types/react-data-grid/index.d.ts
index 82070c673c..bfa4ea979f 100644
--- a/types/react-data-grid/index.d.ts
+++ b/types/react-data-grid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adazzle/react-data-grid.git
 // Definitions by: Simon Gellis <https://github.com/SupernaviX>, Kieran Peat <https://github.com/KieranPeat>, Martin Novak <https://github.com/martinnov92>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
@@ -130,6 +130,17 @@ declare namespace AdazzleReactDataGrid {
          * @param sortDirection The direction to sort ('ASC'/'DESC'/'NONE')
          */
         onGridSort?: (sortColumn: string, sortDirection: 'ASC' | 'DESC' | 'NONE') => void
+
+        /**
+         * Initial sorting direction
+         */
+        sortDirection?: 'ASC' | 'DESC' | 'NONE'
+
+        /**
+         * key of the initial sorted column
+         */
+        sortColumn?: string
+
         /**
          * Called when the user filters a column by some value.
          * Should restrict the rows in rowGetter to only things that match the filter.
diff --git a/types/react-data-grid/react-data-grid-tests.tsx b/types/react-data-grid/react-data-grid-tests.tsx
index 8c0feb8f64..aa09041846 100644
--- a/types/react-data-grid/react-data-grid-tests.tsx
+++ b/types/react-data-grid/react-data-grid-tests.tsx
@@ -10,13 +10,9 @@ var DropDownEditor = Editors.DropDownEditor;
 var { Selectors } = ReactDataGridPlugins.Data;
 
 class CustomFilterHeaderCell extends React.Component<any, any> {
-   constructor(props: any, context: any) {
-       super(props, context);
-
-       this.state = {
-           filterTerm: ""
-       };
-   }
+   state = {
+       filterTerm: ""
+   };
    handleChange(e: any) {
        let val = e.target.value;
        this.setState({filterTerm: val});
diff --git a/types/react-data-grid/v1/index.d.ts b/types/react-data-grid/v1/index.d.ts
index 81d7386dca..4db1f4042a 100644
--- a/types/react-data-grid/v1/index.d.ts
+++ b/types/react-data-grid/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/adazzle/react-data-grid.git
 // Definitions by: Simon Gellis <https://github.com/SupernaviX>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-datagrid/index.d.ts b/types/react-datagrid/index.d.ts
index 8b8d6e4848..032a640daf 100644
--- a/types/react-datagrid/index.d.ts
+++ b/types/react-datagrid/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zippyui/react-datagrid.git
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
diff --git a/types/react-date-range/index.d.ts b/types/react-date-range/index.d.ts
index e5be9f751b..fbe74f11b5 100644
--- a/types/react-date-range/index.d.ts
+++ b/types/react-date-range/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as moment from "moment-timezone";
diff --git a/types/react-datepicker/index.d.ts b/types/react-datepicker/index.d.ts
index f8a78315b3..23e542d322 100644
--- a/types/react-datepicker/index.d.ts
+++ b/types/react-datepicker/index.d.ts
@@ -5,12 +5,14 @@
 //                 Greg Smith <https://github.com/smrq>,
 //                 Platon Pronko <https://github.com/Rogach>
 //                 Roy Xue <https://github.com/royxue>
-// 				   Koala Human <https://github.com/KoalaHuman>
+//                 Koala Human <https://github.com/KoalaHuman>
+//                 Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as moment from "moment";
+import * as Popper from "popper.js";
 
 export interface ReactDatePickerProps {
 	adjustDateOnChange?: boolean;
@@ -18,7 +20,7 @@ export interface ReactDatePickerProps {
 	autoComplete?: string;
 	autoFocus?: boolean;
 	calendarClassName?: string;
-	children?: any;
+	children?: React.ReactNode;
 	className?: string;
 	customInput?: React.ReactNode;
 	customInputRef?: string;
@@ -29,24 +31,27 @@ export interface ReactDatePickerProps {
 	disabledKeyboardNavigation?: boolean;
 	dropdownMode?: 'scroll' | 'select';
 	endDate?: moment.Moment;
-	excludeDates?: any[];
+	excludeDates?: moment.Moment[];
+	excludeTimes?: moment.Moment[];
 	filterDate?(date: moment.Moment): boolean;
 	fixedHeight?: boolean;
 	forceShowMonthNavigation?: boolean;
 	formatWeekNumber?(date: moment.Moment): string | number;
-	highlightDates?: any[];
+	highlightDates?: moment.Moment[];
 	id?: string;
-	includeDates?: any[];
-	includeTimes?: any[];
+	includeDates?: moment.Moment[];
+	includeTimes?: moment.Moment[];
 	inline?: boolean;
 	isClearable?: boolean;
 	locale?: string;
 	maxDate?: moment.Moment;
+	maxTime?: moment.Moment;
 	minDate?: moment.Moment;
+	minTime?: moment.Moment;
 	monthsShown?: number;
 	name?: string;
 	onBlur?(event: React.FocusEvent<HTMLInputElement>): void;
-	onChange(date: moment.Moment | null, event: React.SyntheticEvent<any> | undefined): any;
+	onChange(date: moment.Moment | null, event: React.SyntheticEvent<any> | undefined): void;
 	onChangeRaw?(event: React.FocusEvent<HTMLInputElement>): void;
 	onClickOutside?(event: React.MouseEvent<HTMLDivElement>): void;
 	onFocus?(event: React.FocusEvent<HTMLInputElement>): void;
@@ -60,40 +65,39 @@ export interface ReactDatePickerProps {
 	placeholderText?: string;
 	popperClassName?: string;
 	popperContainer?(props: { children: React.ReactNode[] }): React.ReactNode;
-	popperModifiers?: any;
+	popperModifiers?: Popper.Modifiers;
 	popperPlacement?: string;
 	preventOpenOnFocus?: boolean;
 	readOnly?: boolean;
 	required?: boolean;
-	scrollableYearDropdown?: boolean;
 	scrollableMonthYearDropdown?: boolean;
+	scrollableYearDropdown?: boolean;
 	selected?: moment.Moment | null;
 	selectsEnd?: boolean;
 	selectsStart?: boolean;
+	shouldCloseOnSelect?: boolean;
 	showDisabledMonthNavigation?: boolean;
 	showMonthDropdown?: boolean;
 	showMonthYearDropdown?: boolean;
+	showTimeSelect?: boolean;
+	showTimeSelectOnly?: boolean;
 	showWeekNumbers?: boolean;
 	showYearDropdown?: boolean;
 	startDate?: moment.Moment;
+	startOpen?: boolean;
 	tabIndex?: number;
+	timeCaption?: string;
+	timeFormat?: string;
+	timeIntervals?: number;
 	title?: string;
 	todayButton?: string;
-	useWeekdaysShort?: boolean;
 	useShortMonthInDropdown?: boolean;
+	useWeekdaysShort?: boolean;
 	utcOffset?: number;
 	value?: string;
 	weekLabel?: string;
 	withPortal?: boolean;
 	yearDropdownItemNumber?: number;
-	shouldCloseOnSelect?: boolean;
-	showTimeSelect?: boolean;
-	showTimeSelectOnly?: boolean;
-	timeFormat?: string;
-	timeIntervals?: number;
-	minTime?: moment.Moment;
-	maxTime?: moment.Moment;
-	excludeTimes?: any[];
 }
 declare const ReactDatePicker: React.ClassicComponentClass<ReactDatePickerProps>;
 export default ReactDatePicker;
diff --git a/types/react-datepicker/package.json b/types/react-datepicker/package.json
index 19e5fb0d14..fc763e4d4b 100644
--- a/types/react-datepicker/package.json
+++ b/types/react-datepicker/package.json
@@ -1,6 +1,7 @@
 {
     "private": true,
     "dependencies": {
-        "moment": ">=2.14.0"
+        "moment": ">=2.14.0",
+        "popper.js": "^1.14.1"
     }
 }
diff --git a/types/react-datepicker/react-datepicker-tests.tsx b/types/react-datepicker/react-datepicker-tests.tsx
index 92cf23e38b..1414672684 100644
--- a/types/react-datepicker/react-datepicker-tests.tsx
+++ b/types/react-datepicker/react-datepicker-tests.tsx
@@ -1,36 +1,18 @@
 import * as React from 'react';
-import moment = require('moment');
+import * as moment from 'moment';
 import DatePicker from 'react-datepicker';
 
-class ReactDatePicker extends React.Component<{}, { startDate: moment.Moment; displayName: string; }> {
-	constructor(props: {}) {
-		super(props);
-		this.state = {
-			startDate: moment(),
-			displayName: 'Example'
-		};
-		this.handleChange = this.handleChange.bind(this);
-	}
-
-	handleChange = function(date?: moment.Moment | null) {
-		this.setState({
-			startDate: date
-		});
-	};
-
-	handleYearChange = (date: moment.Moment) => {
-		this.setState({
-			startDate: date
-		});
-	}
-
-	render() {
-		return (
-			<DatePicker
-				selected={this.state.startDate}
-				onChange={this.handleChange}
-				onYearChange={this.handleYearChange}
-			/>
-		);
-	}
-}
+<DatePicker
+	selected={moment()}
+	onChange={(date: moment.Moment | null) => {}}
+	onYearChange={(date: moment.Moment) => {}}
+	popperModifiers={{
+		flip: {
+			enabled: false
+		}
+	}}
+	includeTimes={[moment()]}
+>
+	<div/>
+	<span/>
+</DatePicker>;
diff --git a/types/react-daterange-picker/index.d.ts b/types/react-daterange-picker/index.d.ts
index 9d1d3ec565..4b6f5eef45 100644
--- a/types/react-daterange-picker/index.d.ts
+++ b/types/react-daterange-picker/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for React Daterange Picker 1.1
+// Type definitions for React Daterange Picker 2.0
 // Project: https://github.com/onefinestay/react-daterange-picker
 // Definitions by: UNCOVER TRUTH Inc. <https://github.com/uncovertruth>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
+//                 Donald Ford <https://github.com/donaldtf>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as moment from "moment";
@@ -33,13 +34,13 @@ export interface Props<T = DateRangePicker> extends React.Props<T> {
     onHighlightRange?(date: Date): void;
     onSelect?(value: Props): void;
     onSelectStart?(value: momentRange.MomentRangeExtends): void;
-    paginationArrowComponent?: PaginationArrow;
+    paginationArrowComponent?: React.ComponentClass<PaginationArrowProps> | React.SFC<PaginationArrowProps>;
     selectedLabel?: string;
     selectionType?: 'single' | 'range';
     singleDateRange?: boolean;
     showLegend?: boolean;
     stateDefinitions?: StateDefinitions;
-    value?: momentRange.MomentRangeExtends | momentRange.DateRange;
+    value?: momentRange.MomentRangeExtends | momentRange.DateRange | moment.Moment;
 }
 
 export interface DateState {
@@ -57,10 +58,8 @@ export interface StateDefinition {
     selectable?: boolean;
 }
 
-export interface PaginationArrowProps<T = PaginationArrow> extends React.Props<T> {
+export interface PaginationArrowProps<T = {}> extends React.Props<T> {
     disabled?: boolean;
     onTrigger?(): void;
     direction?: 'next' | 'previous';
 }
-
-export class PaginationArrow extends React.Component<PaginationArrowProps> { }
diff --git a/types/react-daterange-picker/react-daterange-picker-tests.tsx b/types/react-daterange-picker/react-daterange-picker-tests.tsx
index 11bc2a3852..4e79aa1c7a 100644
--- a/types/react-daterange-picker/react-daterange-picker-tests.tsx
+++ b/types/react-daterange-picker/react-daterange-picker-tests.tsx
@@ -11,13 +11,25 @@ const moment = MomentRange.extendMoment(Moment);
 
 type AppProps = ReactDateRangePicker.Props;
 
-class App extends React.Component<AppProps, any> {
-    constructor(props: AppProps, context: any) {
-        super(props, context);
+const CustomSFCPaginationArrow: React.SFC<ReactDateRangePicker.PaginationArrowProps> = (props) => {
+    return (
+        <div onClick={ props.onTrigger }>
+        { (props.direction === 'next') ? '<' : '>' }
+        </div>
+    );
+};
 
-        this.state = {};
+class CustomComponentClassPaginationArrow extends React.Component<ReactDateRangePicker.PaginationArrowProps> {
+    render() {
+        return (
+            <div onClick={ this.props.onTrigger }>
+            { (this.props.direction === 'next') ? '<' : '>' }
+            </div>
+        );
     }
+}
 
+class App extends React.Component<AppProps, any> {
     handleSelect(value: AppProps, states: any): void {
         this.setState({ value, states });
     }
@@ -44,12 +56,6 @@ class App extends React.Component<AppProps, any> {
 }
 
 class DateSinglePicker extends React.Component<AppProps, any> {
-    constructor(props: AppProps, context: any) {
-        super(props, context);
-
-        this.state = {};
-    }
-
     handleSelect(value: AppProps) {
         this.setState({ value });
     }
@@ -163,6 +169,18 @@ export class Main extends React.Component {
                             minimumDate={new Date()}
                         />
                     </div>
+                    <div className="example">
+                        <h4>With custom SFC paginationArrowComponent</h4>
+                        <DateSinglePicker
+                            paginationArrowComponent={ CustomSFCPaginationArrow }
+                        />
+                    </div>
+                    <div className="example">
+                        <h4>With custom ComponentClass paginationArrowComponent</h4>
+                        <DateSinglePicker
+                            paginationArrowComponent={ CustomComponentClassPaginationArrow }
+                        />
+                    </div>
                 </div>
             </div>
         );
diff --git a/types/react-dates/index.d.ts b/types/react-dates/index.d.ts
index f69a3f0869..20739d5918 100644
--- a/types/react-dates/index.d.ts
+++ b/types/react-dates/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for react-dates v16.7.0
+// Type definitions for react-dates v17.1.0
 // Project: https://github.com/airbnb/react-dates
 // Definitions by: Artur Ampilogov <https://github.com/ArturAmpilogov> 
 //                 Nathan Holland <https://github.com/NathanNZ>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 // Required fields are made according to 'minimum REQUIRED setup' in https://github.com/airbnb/react-dates/blob/master/README.md
  
@@ -49,7 +49,7 @@ declare namespace ReactDates {
         // input related props
         startDatePlaceholderText?: string,
         endDatePlaceholderText?: string,
-        disabled?: boolean,
+        disabled?: DisabledShape,
         required?: boolean,
         readOnly?: boolean,
         screenReaderInputMessage?: string,
@@ -65,7 +65,14 @@ declare namespace ReactDates {
         keepFocusOnInput?: boolean,
 
         // calendar presentation and interaction related props
-        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderMonthText?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderMonthElement?: (
+            props: {
+              month: momentPropTypes.momentObj;
+              onMonthSelect: (currentMonth: momentPropTypes.momentObj, newMonthVal: string) => void;
+              onYearSelect: (currentMonth: momentPropTypes.momentObj, newYearVal: string) => void;
+            }
+          ) => string | JSX.Element,
         orientation?: OrientationShape,
         anchorDirection?: AnchorDirectionShape,
         openDirection?: OpenDirectionShape,
@@ -164,7 +171,14 @@ declare namespace ReactDates {
         keepFocusOnInput?: boolean,
 
         // calendar presentation and interaction related props
-        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderMonthText?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderMonthElement?: (
+            props: {
+              month: momentPropTypes.momentObj;
+              onMonthSelect: (currentMonth: momentPropTypes.momentObj, newMonthVal: string) => void;
+              onYearSelect: (currentMonth: momentPropTypes.momentObj, newYearVal: string) => void;
+            }
+          ) => string | JSX.Element,
         orientation?: OrientationShape,
         anchorDirection?: AnchorDirectionShape,
         horizontalMargin?: number,
@@ -386,7 +400,14 @@ declare namespace ReactDates {
 
     // components/DayPickerShape.jsx
     interface DayPickerShape {
-        renderMonth?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderMonthText?: (day: momentPropTypes.momentObj) => (string | JSX.Element),
+        renderMonthElement?: (
+            props: {
+              month: momentPropTypes.momentObj;
+              onMonthSelect: (currentMonth: momentPropTypes.momentObj, newMonthVal: string) => void;
+              onYearSelect: (currentMonth: momentPropTypes.momentObj, newYearVal: string) => void;
+            }
+          ) => string | JSX.Element,
         enableOutsideDays?: boolean,
         numberOfMonths?: number,
         orientation?: ScrollableOrientationShape,
diff --git a/types/react-dates/tslint.json b/types/react-dates/tslint.json
index a41bf5d19a..01adabd8ca 100644
--- a/types/react-dates/tslint.json
+++ b/types/react-dates/tslint.json
@@ -10,6 +10,7 @@
         "dt-header": false,
         "eofline": false,
         "export-just-namespace": false,
+        "file-name-casing": false,
         "import-spacing": false,
         "interface-name": false,
         "interface-over-type-literal": false,
@@ -35,14 +36,15 @@
         "no-namespace": false,
         "no-object-literal-type-assertion": false,
         "no-padding": false,
-        "no-redundant-jsdoc": false,
         "no-redundant-jsdoc-2": false,
+        "no-redundant-jsdoc": false,
         "no-redundant-undefined": false,
         "no-reference-import": false,
         "no-relative-import-in-test": false,
         "no-self-import": false,
         "no-single-declare-module": false,
         "no-string-throw": false,
+        "no-trailing-whitespace": false,
         "no-unnecessary-callback-wrapper": false,
         "no-unnecessary-class": false,
         "no-unnecessary-generics": false,
@@ -52,7 +54,6 @@
         "no-var-keyword": false,
         "no-var-requires": false,
         "no-void-expression": false,
-        "no-trailing-whitespace": false,
         "object-literal-key-quotes": false,
         "object-literal-shorthand": false,
         "one-line": false,
diff --git a/types/react-daum-postcode/index.d.ts b/types/react-daum-postcode/index.d.ts
index b6d093db2d..8aca77413e 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.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 
diff --git a/types/react-dnd-html5-backend/index.d.ts b/types/react-dnd-html5-backend/index.d.ts
deleted file mode 100644
index 1cf8f78335..0000000000
--- a/types/react-dnd-html5-backend/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// Type definitions for React DnD Html5 Backend 2.1
-// Project: https://github.com/gaearon/react-dnd
-// Definitions by: Pedro Pereira <https://github.com/oizie>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-import * as ReactDnd from "react-dnd";
-
-export namespace NativeTypes {
-    const FILE: string;
-    const URL: string;
-    const TEXT: string;
-}
-export function getEmptyImage(): any; // Image
-export default class HTML5Backend implements ReactDnd.Backend {}
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
deleted file mode 100644
index 71a0d06039..0000000000
--- a/types/react-dnd-html5-backend/react-dnd-html5-backend-tests.ts
+++ /dev/null
@@ -1,286 +0,0 @@
-// Test adapted from the ReactDnD chess game tutorial:
-// 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 = DOM;
-
-import DragSource = ReactDnd.DragSource;
-import DropTarget = ReactDnd.DropTarget;
-import DragLayer = ReactDnd.DragLayer;
-import DragDropContext = ReactDnd.DragDropContext;
-import HTML5Backend, { getEmptyImage } from 'react-dnd-html5-backend';
-// Game Component
-// ----------------------------------------------------------------------
-
-namespace Game {
-    let knightPosition = [0, 0];
-    let observer: any = null;
-
-    function emitChange() {
-        observer(knightPosition);
-    }
-
-    export function observe(o: any) {
-        if (observer) {
-            throw new Error("Multiple observers not implemented.");
-        }
-
-        observer = o;
-        emitChange();
-    }
-
-    export function moveKnight(toX: number, toY: number) {
-        knightPosition = [toX, toY];
-        emitChange();
-    }
-
-    export function canMoveKnight(toX: number, toY: number) {
-        const x = knightPosition[0];
-        const y = knightPosition[1];
-        const dx = toX - x;
-        const dy = toY - y;
-
-        return (Math.abs(dx) === 2 && Math.abs(dy) === 1) ||
-               (Math.abs(dx) === 1 && Math.abs(dy) === 2);
-    }
-}
-
-const ItemTypes = {
-    KNIGHT: "knight"
-};
-
-// Knight Component
-// ----------------------------------------------------------------------
-
-namespace Knight {
-    interface KnightP extends React.Props<Knight> {
-        connectDragSource: ReactDnd.ConnectDragSource;
-        connectDragPreview: ReactDnd.ConnectDragPreview;
-        isDragging: boolean;
-    }
-
-    const knightSource: ReactDnd.DragSourceSpec<KnightP> = {
-        beginDrag: (props) => {
-            return {};
-        }
-    };
-
-    function knightCollect(connect: ReactDnd.DragSourceConnector, monitor: ReactDnd.DragSourceMonitor) {
-        return {
-            connectDragSource: connect.dragSource(),
-            connectDragPreview: connect.dragPreview(),
-            isDragging: monitor.isDragging()
-        };
-    }
-
-    export class Knight extends React.Component<KnightP> {
-        static defaultProps: KnightP;
-
-        static create = React.createFactory(Knight);
-
-        componentDidMount() {
-            const img = getEmptyImage();
-            img.onload = () => this.props.connectDragPreview(img);
-        }
-
-        render() {
-            return this.props.connectDragSource(
-                    r.div({
-                        style: {
-                            opacity: this.props.isDragging ? 0.5 : 1,
-                            fontSize: 25,
-                            fontWeight: 'bold',
-                            cursor: 'move'
-                        }
-                    }, "♘")
-            );
-        }
-    }
-
-    export const DndKnight = DragSource(ItemTypes.KNIGHT, knightSource, knightCollect)(Knight);
-    export const create = React.createFactory(DndKnight);
-}
-
-// Square Component
-// ----------------------------------------------------------------------
-
-namespace Square {
-    interface SquareP extends React.Props<Square> {
-        black: boolean;
-    }
-
-    export class Square extends React.Component<SquareP> {
-        render() {
-            const fill = this.props.black ? 'black' : 'white';
-            return r.div({
-                style: {
-                    backgroundColor: fill
-                }
-            });
-        }
-    }
-
-    export const create = React.createFactory(Square);
-}
-
-// BoardSquare Component
-// ----------------------------------------------------------------------
-
-namespace BoardSquare {
-    interface BoardSquareP extends React.Props<BoardSquare> {
-        x: number;
-        y: number;
-        connectDropTarget?: ReactDnd.ConnectDropTarget;
-        isOver?: boolean;
-        canDrop?: boolean;
-    }
-
-    const boardSquareTarget: ReactDnd.DropTargetSpec<BoardSquareP> = {
-        canDrop: (props) => Game.canMoveKnight(props.x, props.y),
-        drop: (props) => Game.moveKnight(props.x, props.y)
-    };
-
-    function boardSquareCollect(connect: ReactDnd.DropTargetConnector, monitor: ReactDnd.DropTargetMonitor) {
-        return {
-            connectDropTarget: connect.dropTarget(),
-            isOver: monitor.isOver(),
-            canDrop: monitor.canDrop()
-        };
-    }
-
-    export class BoardSquare extends React.Component<BoardSquareP> {
-        static defaultProps: BoardSquareP;
-
-        private readonly _renderOverlay = (color: string) => {
-            return r.div({
-                style: {
-                    position: 'absolute',
-                    top: 0,
-                    left: 0,
-                    height: '100%',
-                    width: '100%',
-                    zIndex: 1,
-                    opacity: 0.5,
-                    backgroundColor: color
-                }
-            });
-        }
-
-        render() {
-            const black = (this.props.x + this.props.y) % 2 === 1;
-            const isOver = this.props.isOver;
-            const canDrop = this.props.canDrop;
-
-            return this.props.connectDropTarget(
-                    r.div({
-                        style: {
-                            position: 'relative',
-                            width: '100%',
-                            height: '100%'
-                        },
-                        children: [
-                            Square.create({ black }),
-                            isOver && !canDrop ? this._renderOverlay('red') : null,
-                            !isOver && canDrop ? this._renderOverlay('yellow') : null,
-                            isOver && canDrop ? this._renderOverlay('green') : null
-                        ]
-                    })
-            );
-        }
-    }
-
-    export const DndBoardSquare = DropTarget(ItemTypes.KNIGHT, boardSquareTarget, boardSquareCollect)(BoardSquare);
-    export const create = React.createFactory(DndBoardSquare);
-}
-
-// Custom Drag Layer Component
-// ----------------------------------------------------------------------
-namespace CustomDragLayer {
-    interface CustomDragLayerP extends React.Props<CustomDragLayer> {
-        isDragging?: boolean;
-        item?: {};
-    }
-
-    function dragLayerCollect(monitor: ReactDnd.DragLayerMonitor) {
-        return {
-            isDragging: monitor.isDragging(),
-            item: monitor.getItem(),
-        };
-    }
-
-    export class CustomDragLayer extends React.Component<CustomDragLayerP> {
-        render() {
-            return r.div(null, this.props.isDragging ? this.props.item : null);
-        }
-    }
-
-    export const dragLayer = DragLayer(dragLayerCollect)(CustomDragLayer);
-
-    export const create = React.createFactory(dragLayer);
-}
-
-// Board Component
-// ----------------------------------------------------------------------
-
-namespace Board {
-    interface BoardP extends React.Props<Board> {
-        knightPosition: number[];
-    }
-
-    export class Board extends React.Component<BoardP> {
-        private readonly _renderPiece = (x: number, y: number) => {
-            const knightX = this.props.knightPosition[0];
-            const knightY = this.props.knightPosition[1];
-            return x === knightX && y === knightY ?
-                    Knight.create() :
-                    null;
-        }
-
-        private readonly _renderSquare = (i: number) => {
-            const x = i % 8;
-            const y = Math.floor(i / 8);
-
-            return r.div({
-                key: i,
-                style: {
-                    width: '12.5%',
-                    height: '12.5%'
-                }
-            }, BoardSquare.create({ x, y }, this._renderPiece(x, y)));
-        }
-
-        render() {
-            const squares: Array<React.ReactHTMLElement<HTMLDivElement>> = [];
-            for (let i = 0; i < 64; i++) {
-                squares.push(this._renderSquare(i));
-            }
-
-            return r.div({
-                children: [
-                    CustomDragLayer.create(),
-                    r.div({
-                        style: {
-                            width: '100%',
-                            height: '100%',
-                            display: 'flex',
-                            flexWrap: 'wrap'
-                        },
-                        children: squares
-                    })
-                ]
-            });
-        }
-    }
-
-    export const createWithHTMLBackend = React.createFactory(DragDropContext(HTML5Backend)(Board));
-}
-
-// Render the Board Component
-// ----------------------------------------------------------------------
-
-Board.createWithHTMLBackend({
-    knightPosition: [0, 0]
-});
diff --git a/types/react-dnd-multi-backend/index.d.ts b/types/react-dnd-multi-backend/index.d.ts
index 7e8b3ff209..0fcfbf256e 100644
--- a/types/react-dnd-multi-backend/index.d.ts
+++ b/types/react-dnd-multi-backend/index.d.ts
@@ -1,11 +1,12 @@
 // 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>
+//                 Adam Haglund <https://github.com/beeequeue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { CSSProperties, PureComponent } from "react";
-import { Backend } from "react-dnd";
+import { BackendFactory } from "dnd-core";
 
 /**
  * Callback function type definition for checking whether an event represents a transition between
@@ -50,7 +51,7 @@ export interface BackendDeclaration {
     /**
      * Backend - e.g. the one provided by react-dnd-html5-backend.
      */
-    backend: Backend;
+    backend: BackendFactory;
     /**
      * 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
@@ -112,4 +113,4 @@ export const HTML5DragTransition: Transition;
  * @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;
+export default function(backends: Backends): BackendFactory;
diff --git a/types/react-dnd-multi-backend/package.json b/types/react-dnd-multi-backend/package.json
new file mode 100644
index 0000000000..7f98b8bee8
--- /dev/null
+++ b/types/react-dnd-multi-backend/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "dnd-core": "^4.0.5"
+    }
+}
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
index cbe6136585..d54e24ace2 100644
--- a/types/react-dnd-multi-backend/react-dnd-multi-backend-tests.tsx
+++ b/types/react-dnd-multi-backend/react-dnd-multi-backend-tests.tsx
@@ -1,26 +1,21 @@
-// 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 { createDragDropManager } from 'dnd-core';
+import MultiBackend, { createTransition, TouchTransition, Backends, Preview } from 'react-dnd-multi-backend';
+import HTML5ToTouch from 'react-dnd-multi-backend/lib/HTML5toTouch';
 import TouchBackend from 'react-dnd-touch-backend';
 
-const component = () => null;
+const context = {};
 
 /**
  * Most common use case - using the default HTML5 with Touch as a fallback.
  */
-const multiDndComponent = ReactDnd.DragDropContext(MultiBackend(HTML5toTouch))(component);
+const multiDndComponent = createDragDropManager(MultiBackend(HTML5ToTouch), context);
 
 /**
  * Creating a custom list of backends, including creating a touch transition.
  */
 const CustomBackends: Backends = {
-    backends: [{
-        backend: HTML5Backend
-    },
+    backends: [
     {
         backend: TouchBackend({ enableMouseEvents: false }),
         preview: true,
@@ -28,17 +23,12 @@ const CustomBackends: Backends = {
             return event.touches != null;
         })
     },
-    {
-        backend: HTML5Backend,
-        transition: HTML5DragTransition,
-        preview: true
-    },
     {
         backend: TouchBackend({}),
         transition: TouchTransition
     }]
 };
-const multiCustomBackendsComponent = ReactDnd.DragDropContext(MultiBackend(CustomBackends))(component);
+const multiCustomBackendsComponent = createDragDropManager(MultiBackend(CustomBackends), context);
 
 /**
  * Testing the Preview component.
diff --git a/types/react-dnd-test-backend/index.d.ts b/types/react-dnd-test-backend/index.d.ts
deleted file mode 100644
index 07f13607dd..0000000000
--- a/types/react-dnd-test-backend/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-// 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
deleted file mode 100644
index aed3117e06..0000000000
--- a/types/react-dnd-test-backend/react-dnd-test-backend-tests.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-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-touch-backend/index.d.ts b/types/react-dnd-touch-backend/index.d.ts
index 86ba0d1d10..e06a4106e7 100644
--- a/types/react-dnd-touch-backend/index.d.ts
+++ b/types/react-dnd-touch-backend/index.d.ts
@@ -1,12 +1,14 @@
 // Type definitions for react-dnd-touch-backend 0.4
 // 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 by: Daniel Król <https://github.com/mleko>,
+//                 Janeene Beeforth <https://github.com/dawnmist>
+//                 Adam Haglund <https://github.com/beeequeue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
-import * as ReactDnd from "react-dnd";
+import { BackendFactory } from 'dnd-core';
 
-export default function createTouchBackend(options: TouchBackendOptions): ReactDnd.Backend;
+export default function createTouchBackend(option?: TouchBackendOptions): BackendFactory;
 
 export interface TouchBackendOptions {
     /**
diff --git a/types/react-dnd-touch-backend/package.json b/types/react-dnd-touch-backend/package.json
new file mode 100644
index 0000000000..7f98b8bee8
--- /dev/null
+++ b/types/react-dnd-touch-backend/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "dnd-core": "^4.0.5"
+    }
+}
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
index dbf807a6a8..77da6f241f 100644
--- a/types/react-dnd-touch-backend/react-dnd-touch-backend-tests.ts
+++ b/types/react-dnd-touch-backend/react-dnd-touch-backend-tests.ts
@@ -1,17 +1,17 @@
-import * as ReactDnd from "react-dnd";
+import { createDragDropManager } from "dnd-core";
 import TouchBackend from "react-dnd-touch-backend";
 
-const component = () => null;
+const context = {};
 
-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}));
-const dndComponentWithScrollAngleRanges = ReactDnd.DragDropContext(TouchBackend(
-    { scrollAngleRanges: [{ start: 0, end: 0 }, { start: 0 }, { end: 0 }] }));
-const dndComponentWithTouchSlop = ReactDnd.DragDropContext(TouchBackend({ touchSlop: 0 }));
-const dndComponentWithIgnoreContextMenu = ReactDnd.DragDropContext(TouchBackend({ ignoreContextMenu: true }));
+const dndComponent = createDragDropManager(TouchBackend(), context);
+const dndComponentMouseEvents = createDragDropManager(TouchBackend({enableMouseEvents: true}), context);
+const dndComponentDelayTouchStart = createDragDropManager(TouchBackend({delayTouchStart: 200}), context);
+const dndComponentDelayMouseStart = createDragDropManager(TouchBackend({enableMouseEvents: true, delayMouseStart: 100}), context);
+const dndComponentKeyboardEvents = createDragDropManager(TouchBackend({enableKeyboardEvents: true}), context);
+const dndComponentOldDelay = createDragDropManager(TouchBackend({delay: 300}), context);
+const dndComponentAllCurrentEvents = createDragDropManager(TouchBackend(
+    {enableKeyboardEvents: true, enableMouseEvents: true, delayMouseStart: 100, delayTouchStart: 200}), context);
+const dndComponentWithScrollAngleRanges = createDragDropManager(TouchBackend(
+    { scrollAngleRanges: [{ start: 0, end: 0 }, { start: 0 }, { end: 0 }] }), context);
+const dndComponentWithTouchSlop = createDragDropManager(TouchBackend({ touchSlop: 0 }), context);
+const dndComponentWithIgnoreContextMenu = createDragDropManager(TouchBackend({ ignoreContextMenu: true }), context);
diff --git a/types/react-dnd/index.d.ts b/types/react-dnd/index.d.ts
deleted file mode 100644
index 6625903ad1..0000000000
--- a/types/react-dnd/index.d.ts
+++ /dev/null
@@ -1,189 +0,0 @@
-// Type definitions for React DnD v2.0.2
-// Project: https://github.com/gaearon/react-dnd
-// Definitions by: Asana <https://asana.com>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-///<reference types="react" />
-
-declare module __ReactDnd {
-    // Decorated React Components
-    // ----------------------------------------------------------------------
-
-    class ContextComponent<P, S> extends React.Component<P, S> {
-        getDecoratedComponentInstance(): React.Component<P, S>;
-        // Note: getManager is not yet documented on the React DnD docs.
-        getManager(): any;
-    }
-
-    class DndComponent<P, S> extends React.Component<P, S> {
-        getDecoratedComponentInstance(): React.Component<P, S>;
-        getHandlerId(): Identifier;
-    }
-
-    interface ContextComponentClass<P> extends React.ComponentClass<P> {
-        new(props?: P, context?: any): ContextComponent<P, any>;
-        DecoratedComponent: React.ComponentClass<P>;
-    }
-
-    interface DndComponentClass<P> extends React.ComponentClass<P> {
-        new(props?: P, context?: any): DndComponent<P, any>;
-        DecoratedComponent: React.ComponentClass<P>;
-    }
-
-    // Top-level API
-    // ----------------------------------------------------------------------
-
-    export function DragSource<P>(
-        type: Identifier | ((props: P) => Identifier),
-        spec: DragSourceSpec<P>,
-        collect: DragSourceCollector,
-        options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
-
-    export function DropTarget<P>(
-        types: Identifier | Identifier[] | ((props: P) => Identifier | Identifier[]),
-        spec: DropTargetSpec<P>,
-        collect: DropTargetCollector,
-        options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
-
-    export function DragDropContext<P>(
-        backend: Backend
-    ): <P>(componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => ContextComponentClass<P>;
-
-    interface DragDropContextProviderProps {
-        backend: Backend,
-        window?: Window,
-    }
-
-    export class DragDropContextProvider extends React.Component<DragDropContextProviderProps> {
-    }
-
-    export function DragLayer<P>(
-        collect: DragLayerCollector,
-        options?: DndOptions<P>
-    ): (componentClass: React.ComponentClass<P> | React.StatelessComponent<P>) => DndComponentClass<P>;
-
-    type DragSourceCollector = (connect: DragSourceConnector, monitor: DragSourceMonitor) => Object;
-    type DropTargetCollector = (connect: DropTargetConnector, monitor: DropTargetMonitor) => Object;
-    type DragLayerCollector = (monitor: DragLayerMonitor) => Object;
-
-    // Shared
-    // ----------------------------------------------------------------------
-
-    // The React DnD docs say that this can also be the ES6 Symbol.
-    type Identifier = string;
-
-    interface ClientOffset {
-        x: number;
-        y: number;
-    }
-
-    interface DndOptions<P> {
-        arePropsEqual?(props: P, otherProps: P): boolean;
-    }
-
-    // DragSource
-    // ----------------------------------------------------------------------
-
-    interface DragSourceSpec<P> {
-        beginDrag(props: P, monitor?: DragSourceMonitor, component?: React.Component<P>): Object;
-        endDrag?(props: P, monitor?: DragSourceMonitor, component?: React.Component<P>): void;
-        canDrag?(props: P, monitor?: DragSourceMonitor): boolean;
-        isDragging?(props: P, monitor?: DragSourceMonitor): boolean;
-    }
-
-    class DragSourceMonitor {
-        canDrag(): boolean;
-        isDragging(): boolean;
-        getItemType(): Identifier;
-        getItem(): Object;
-        getDropResult(): Object;
-        didDrop(): boolean;
-        getInitialClientOffset(): ClientOffset;
-        getInitialSourceClientOffset(): ClientOffset;
-        getClientOffset(): ClientOffset;
-        getDifferenceFromInitialOffset(): ClientOffset;
-        getSourceClientOffset(): ClientOffset;
-    }
-
-    class DragSourceConnector {
-        dragSource(): ConnectDragSource;
-        dragPreview(): ConnectDragPreview;
-    }
-
-    interface DragElementWrapper<O> {
-        <P>(elementOrNode: React.ReactElement<P>, options?: O): React.ReactElement<P>;
-    }
-
-    interface DragSourceOptions {
-        dropEffect?: string;
-    }
-
-    interface DragPreviewOptions {
-        captureDraggingState?: boolean;
-        anchorX?: number;
-        anchorY?: number;
-        offsetX?: number;
-        offsetY?: number;
-    }
-
-    type ConnectDragSource = DragElementWrapper<DragSourceOptions>;
-    type ConnectDragPreview = DragElementWrapper<DragPreviewOptions>;
-
-    /// DropTarget
-    // ----------------------------------------------------------------------
-
-    interface DropTargetSpec<P> {
-        drop?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P>): Object|void;
-        hover?(props: P, monitor?: DropTargetMonitor, component?: React.Component<P>): void;
-        canDrop?(props: P, monitor?: DropTargetMonitor): boolean;
-    }
-
-    class DropTargetMonitor {
-        canDrop(): boolean;
-        isOver(options?: { shallow: boolean }): boolean;
-        getItemType(): Identifier;
-        getItem(): Object;
-        getDropResult(): Object;
-        didDrop(): boolean;
-        getInitialClientOffset(): ClientOffset;
-        getInitialSourceClientOffset(): ClientOffset;
-        getClientOffset(): ClientOffset;
-        getDifferenceFromInitialOffset(): ClientOffset;
-        getSourceClientOffset(): ClientOffset;
-    }
-
-    class DropTargetConnector {
-        dropTarget(): ConnectDropTarget;
-    }
-
-    type ConnectDropTarget = <P>(elementOrNode: React.ReactElement<P>) => React.ReactElement<P>;
-
-    /// DragLayerMonitor
-    // ----------------------------------------------------------------------
-
-    class DragLayerMonitor {
-        isDragging(): boolean;
-        getItemType(): Identifier;
-        getItem(): Object;
-        getInitialClientOffset(): ClientOffset;
-        getInitialSourceClientOffset(): ClientOffset;
-        getClientOffset(): ClientOffset;
-        getDifferenceFromInitialOffset(): ClientOffset;
-        getSourceClientOffset(): ClientOffset;
-    }
-
-    /// Backend
-    /// ---------------------------------------------------------------------
-
-    // TODO: Fill in the Backend interface.
-    // The React DnD docs do not cover this, and this is only needed for
-    // creating custom backends (i.e. not using the built-in HTML5Backend).
-    interface Backend {}
-}
-
-declare module "react-dnd" {
-    export = __ReactDnd;
-}
diff --git a/types/react-dnd/react-dnd-tests.tsx b/types/react-dnd/react-dnd-tests.tsx
deleted file mode 100644
index 3016a3f523..0000000000
--- a/types/react-dnd/react-dnd-tests.tsx
+++ /dev/null
@@ -1,325 +0,0 @@
-// Test adapted from the ReactDnD chess game tutorial:
-// 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 = DOM;
-
-import DragSource = ReactDnd.DragSource;
-import DropTarget = ReactDnd.DropTarget;
-import DragLayer = ReactDnd.DragLayer;
-import DragDropContext = ReactDnd.DragDropContext;
-import DragDropContextProvider = ReactDnd.DragDropContextProvider;
-import HTML5Backend, { getEmptyImage, NativeTypes } from "react-dnd-html5-backend";
-declare class TestBackend {
-    setup(): void;
-    teardown(): void;
-    connectDragSource(): void;
-    connectDropTarget(): void;
-    simulateBeginDrag(sourceIds: __ReactDnd.Identifier[], options?: {}): void;
-    simulatePublishDragSource(): void;
-    simulateHover(targetIds: __ReactDnd.Identifier[], options?: {}): void;
-    simulateDrop(): void;
-    simulateEndDrag(): void;
-}
-
-// Game Component
-// ----------------------------------------------------------------------
-
-namespace Game {
-    var knightPosition = [0, 0];
-    var observer: any = null;
-
-    function emitChange() {
-        observer(knightPosition);
-    }
-
-    export function observe(o: any) {
-        if (observer) {
-            throw new Error("Multiple observers not implemented.");
-        }
-
-        observer = o;
-        emitChange();
-    }
-
-    export function moveKnight(toX: number, toY: number) {
-        knightPosition = [toX, toY];
-        emitChange();
-    }
-
-    export function canMoveKnight(toX: number, toY: number) {
-        const x = knightPosition[0];
-        const y = knightPosition[1];
-        const dx = toX - x;
-        const dy = toY - y;
-
-        return (Math.abs(dx) === 2 && Math.abs(dy) === 1) ||
-               (Math.abs(dx) === 1 && Math.abs(dy) === 2);
-    }
-}
-
-var ItemTypes = {
-    KNIGHT: "knight"
-};
-
-// Knight Component
-// ----------------------------------------------------------------------
-
-namespace Knight {
-    interface KnightP extends React.Props<Knight> {
-        connectDragSource: ReactDnd.ConnectDragSource;
-        connectDragPreview: ReactDnd.ConnectDragPreview;
-        isDragging: boolean;
-    }
-
-    var knightSource: ReactDnd.DragSourceSpec<KnightP> = {
-        beginDrag: (props) => {
-            return {};
-        }
-    };
-
-    function knightCollect(connect: ReactDnd.DragSourceConnector, monitor: ReactDnd.DragSourceMonitor) {
-        return {
-            connectDragSource: connect.dragSource(),
-            connectDragPreview: connect.dragPreview(),
-            isDragging: monitor.isDragging()
-        };
-    }
-
-    export class Knight extends React.Component<KnightP> {
-        static defaultProps: KnightP;
-
-        static create = React.createFactory(Knight);
-
-        componentDidMount() {
-            var img = getEmptyImage();
-            img.onload = () => this.props.connectDragPreview(img);
-        }
-
-        render() {
-            return this.props.connectDragSource(
-                    r.div({
-                        style: {
-                            opacity: this.props.isDragging ? 0.5 : 1,
-                            fontSize: 25,
-                            fontWeight: 'bold',
-                            cursor: 'move'
-                        }
-                    }, "♘")
-            );
-        }
-    }
-
-    export var DndKnight = DragSource(ItemTypes.KNIGHT, knightSource, knightCollect)(Knight);
-    export var create = React.createFactory(DndKnight);
-}
-
-// Square Component
-// ----------------------------------------------------------------------
-
-namespace Square {
-    interface SquareP extends React.Props<Square> {
-        black: boolean;
-    }
-
-    export class Square extends React.Component<SquareP> {
-        render() {
-            var fill = this.props.black ? 'black' : 'white';
-            return r.div({
-                style: {
-                    backgroundColor: fill
-                }
-            })
-        }
-    }
-
-    export var create = React.createFactory(Square);
-}
-
-// BoardSquare Component
-// ----------------------------------------------------------------------
-
-namespace BoardSquare {
-    interface BoardSquareP extends React.Props<BoardSquare> {
-        x: number;
-        y: number;
-        connectDropTarget?: ReactDnd.ConnectDropTarget;
-        isOver?: boolean;
-        canDrop?: boolean;
-    }
-
-    var boardSquareTarget: ReactDnd.DropTargetSpec<BoardSquareP> = {
-        canDrop: (props) => Game.canMoveKnight(props.x, props.y),
-        drop: (props) => Game.moveKnight(props.x, props.y)
-    };
-
-    function boardSquareCollect(connect: ReactDnd.DropTargetConnector, monitor: ReactDnd.DropTargetMonitor) {
-        return {
-            connectDropTarget: connect.dropTarget(),
-            isOver: monitor.isOver(),
-            canDrop: monitor.canDrop()
-        };
-    }
-
-    export class BoardSquare extends React.Component<BoardSquareP> {
-        static defaultProps: BoardSquareP;
-
-        private readonly _renderOverlay = (color: string) => {
-            return r.div({
-                style: {
-                    position: 'absolute',
-                    top: 0,
-                    left: 0,
-                    height: '100%',
-                    width: '100%',
-                    zIndex: 1,
-                    opacity: 0.5,
-                    backgroundColor: color
-                }
-            });
-        };
-
-        render() {
-            var black = (this.props.x + this.props.y) % 2 === 1;
-            var isOver = this.props.isOver;
-            var canDrop = this.props.canDrop;
-
-            return this.props.connectDropTarget(
-                    r.div({
-                        style: {
-                            position: 'relative',
-                            width: '100%',
-                            height: '100%'
-                        },
-                        children: [
-                            Square.create({
-                                black: black
-                            }),
-                            isOver && !canDrop ? this._renderOverlay('red') : null,
-                            !isOver && canDrop ? this._renderOverlay('yellow') : null,
-                            isOver && canDrop ? this._renderOverlay('green') : null
-                        ]
-                    })
-            );
-        }
-    }
-
-    export var DndBoardSquare = DropTarget(ItemTypes.KNIGHT, boardSquareTarget, boardSquareCollect)(BoardSquare);
-    export var fileDropTarget = DropTarget(NativeTypes.FILE, boardSquareTarget, boardSquareCollect)(BoardSquare);
-    export var create = React.createFactory(DndBoardSquare);
-}
-
-// Custom Drag Layer Component
-// ----------------------------------------------------------------------
-namespace CustomDragLayer {
-    interface CustomDragLayerP extends React.Props<CustomDragLayer> {
-        isDragging?: boolean;
-        item?: Object;
-    }
-
-    function dragLayerCollect(monitor: ReactDnd.DragLayerMonitor) {
-        return {
-            isDragging: monitor.isDragging(),
-            item: monitor.getItem(),
-        };
-    }
-
-    export class CustomDragLayer extends React.Component<CustomDragLayerP> {
-        render() {
-            return r.div(null, this.props.isDragging ? this.props.item : null);
-        }
-    }
-
-    export var dragLayer = DragLayer(dragLayerCollect)(CustomDragLayer);
-
-    export var create = React.createFactory(dragLayer);
-}
-
-// Board Component
-// ----------------------------------------------------------------------
-
-namespace Board {
-    interface BoardP extends React.Props<Board> {
-        knightPosition: number[];
-    }
-
-    export class Board extends React.Component<BoardP> {
-        private readonly _renderPiece = (x: number, y: number) => {
-            var knightX = this.props.knightPosition[0];
-            var knightY = this.props.knightPosition[1];
-            return x === knightX && y === knightY ?
-                    Knight.create() :
-                    null;
-        };
-
-        private readonly _renderSquare = (i: number) => {
-            var x = i % 8;
-            var y = Math.floor(i / 8);
-
-            return r.div({
-                key: i,
-                style: {
-                    width: '12.5%',
-                    height: '12.5%'
-                }
-            }, BoardSquare.create({
-                x: x,
-                y: y
-            }, this._renderPiece(x, y)));
-        };
-
-        render() {
-            var squares: React.ReactHTMLElement<HTMLDivElement>[] = [];
-            for (let i = 0; i < 64; i++) {
-                squares.push(this._renderSquare(i));
-            }
-
-            return r.div({
-                children: [
-                    CustomDragLayer.create(),
-                    r.div({
-                        style: {
-                            width: '100%',
-                            height: '100%',
-                            display: 'flex',
-                            flexWrap: 'wrap'
-                        },
-                        children: squares
-                    })
-                ]
-            });
-        }
-    }
-
-    export var createWithHTMLBackend = React.createFactory(DragDropContext(HTML5Backend)(Board));
-    export var createWithTestBackend = React.createFactory(DragDropContext(TestBackend)(Board));
-}
-
-// Render the Board Component
-// ----------------------------------------------------------------------
-
-Board.createWithHTMLBackend({
-    knightPosition: [0, 0]
-});
-
-
-Board.createWithTestBackend({
-    knightPosition: [0, 0]
-});
-
-
-// DragAndDropContextProvider
-// ----------------------------------------------------------------------
-
-export default class YourApp {
-  render() {
-    return (
-      <DragDropContextProvider backend={HTML5Backend}>
-      /* ... */
-      </DragDropContextProvider>
-    );
-  };
-}
diff --git a/types/react-document-title/index.d.ts b/types/react-document-title/index.d.ts
index 85e9f3eb48..efaef782d8 100644
--- a/types/react-document-title/index.d.ts
+++ b/types/react-document-title/index.d.ts
@@ -2,7 +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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-dom-factories/index.d.ts b/types/react-dom-factories/index.d.ts
index eaf04f766f..b0bcb5bfa6 100644
--- a/types/react-dom-factories/index.d.ts
+++ b/types/react-dom-factories/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export as namespace ReactDOMFactories;
 export = ReactDOMFactories;
diff --git a/types/react-dom/index.d.ts b/types/react-dom/index.d.ts
index e7a5afe59d..518c0c617c 100644
--- a/types/react-dom/index.d.ts
+++ b/types/react-dom/index.d.ts
@@ -6,7 +6,7 @@
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 //                 Josh Rutherford <https://github.com/theruther4d>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export as namespace ReactDOM;
 
diff --git a/types/react-dom/v15/index.d.ts b/types/react-dom/v15/index.d.ts
index bd39e0a5e1..8a22fd9bc2 100644
--- a/types/react-dom/v15/index.d.ts
+++ b/types/react-dom/v15/index.d.ts
@@ -5,7 +5,7 @@
 //                 Microsoft <https://microsoft.com>
 //                 MartynasZilinskas <https://github.com/MartynasZilinskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export as namespace ReactDOM;
 
diff --git a/types/react-dragtastic/index.d.ts b/types/react-dragtastic/index.d.ts
new file mode 100644
index 0000000000..fbfaf42cff
--- /dev/null
+++ b/types/react-dragtastic/index.d.ts
@@ -0,0 +1,167 @@
+// Type definitions for react-dragtastic 2.4
+// Project: https://github.com/chrisjpatty/react-dragtastic#readme
+// Definitions by: Nicolás Scarcella <https://github.com/nscarcella>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { ReactNode, Component, MouseEventHandler, TouchEventHandler } from 'react';
+
+export type Id = string | number;
+export type Type = string | number;
+export type Accepts = string | ReadonlyArray<string>;
+
+export interface State {
+    /** The user's current horizontal position on the page. */
+    x: number;
+    /** The user's current vertical position on the page. */
+    y: number;
+    /** The user's initial horizontal position on the page when they started dragging. */
+    startingX: number;
+    /** The user's initial vertical position on the page when they started dragging. */
+    startingY: number;
+    /** A boolean representing whether the user is currently dragging. */
+    isDragging: boolean;
+    /** The id of the currently dragging element. */
+    currentlyDraggingId?: Id;
+    /** The id of the <Droppable/> currently being hovered. */
+    currentlyHoveredDroppableId?: Id;
+    /** The accepts property of the <Droppable/> currently being hovered. */
+    currentlyHoveredDroppableAccepts?: Accepts;
+    /** Data from the data property of the <Draggable/> which is currently active. null if not dragging. */
+    data: any;
+    /** The type of the component being currently dragged. null if not dragging. */
+    type?: Type;
+}
+
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+// DRAGGABLE
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+export interface DraggableProps {
+    /** An id which will be used in the draggable zone's target <DragComponent/> */
+    id?: Id;
+    /** A string, or array of strings, used to limit which droppable zones will accept <DragComponent/>'s attached to this draggable. */
+    type?: Type;
+    /** Data of any type which will be passed to the onDrop function of any <Droppable/> which accepts this <Draggable/>'s type. */
+    data?: any;
+    /** A function which will be called when the <Draggable/> zone is activated (The user started dragging). */
+    onDragStart?: (data: any) => void;
+    /** A function which will be called when the <Draggable/> zone is deactivated (The user stopped dragging). */
+    onDragEnd?: (data: any) => void;
+    /** A function which will be called every time the user's cursor moves while dragging. */
+    onDrag?: () => void;
+    /**
+     * An optional array of strings. For performance reasons you can limit which keys in the dragState your component subscribes to.
+     * For example, you may pass ['type', 'data'] to only rerender if these keys change.
+     */
+    subscribeTo?: ReadonlyArray<string> | null;
+    /** An optional int representing the distance in pixels the user's pointer must travel to activate the draggable. Defaults to 8 */
+    delay?: number;
+
+    children: (arg: State & {
+        /** A boolean representing if the draggable is currently active. */
+        isActive: boolean;
+        events: {
+            onMouseDown: MouseEventHandler,
+            onTouchStart: TouchEventHandler
+        }
+    }) => ReactNode;
+}
+
+/**
+ * This defines a draggable zone. At a minimum, spread the events over the element that should be draggable (usually the root element).
+ */
+export class Draggable extends Component<DraggableProps, any> { }
+
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+// DROPPABLE
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+export interface DroppableProps {
+    /** An id which will be used in the draggable zone's target <DragComponent/> */
+    id?: Id;
+    /** A string type corresponding to the type property of the <Draggable/> zone for which this <Droppable/> should accept drop events. */
+    accepts?: Accepts;
+    /** A function which will be called when a user drops a <DragComponent/> on this <Droppable/> with an accepted type. */
+    onDrop?: (data: any) => void;
+    /**
+     * A function which will be called when the user's cursor enters the <Droppable/> while dragging.
+     * This function will be called regardless of whether the droppable accepts the draggable currently being dragged.
+     */
+    onDragEnter?: () => void;
+    /**
+     * A function which will be called when the user's cursor leaves the <Droppable/> while dragging.
+     * This function will be called regardless of whether the droppable accepts the draggable currently being dragged.
+     */
+    onDragLeave?: () => void;
+    /**
+     * An optional array of strings. For performance reasons you can limit which keys in the dragState your component subscribes to.
+     * For example, you may pass ['type', 'data'] to only rerender if these keys change.
+     */
+    subscribeTo?: ReadonlyArray<string> | null;
+
+    children: (arg: State & {
+        /** A boolean representing if the user is currently hovering the <Droppable/>. */
+        isOver: boolean,
+        /** A boolean representing if this droppable will accept the currently dragging <DragComponent/>. */
+        willAccept: boolean,
+        events: {
+            onMouseEnter: () => void,
+            onMouseLeave: () => void,
+            onMouseUp: () => void,
+        }
+    }) => ReactNode;
+}
+
+/**
+ * This defines a droppable zone. At a minimum, spread the events over the element that should be droppable (usually the root element).
+ */
+export class Droppable extends Component<DroppableProps, any> { }
+
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+// DRAG
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+export interface DragComponentProps {
+    /* A string corresponding to the id property of the <Draggable/> zone that should trigger this component to start rendering. */
+    for?: Id;
+    /** A function which will be called every time a user drags. */
+    onDrag?: () => void;
+    /** A boolean determining whether or not the DragComponent should always render. Defaults to false. */
+    alwaysRender?: boolean;
+    /**
+     * An optional array of strings. For performance reasons you can limit which keys in the dragState your component subscribes to.
+     * For example, you may pass ['type', 'data'] to only rerender if these keys change.
+     */
+    subscribeTo?: ReadonlyArray<string> | null;
+
+    children: (arg: State & {
+        /** A boolean representing whether the user is currently hovering a <Droppable/> that accepts the type of the currently active <Draggable/> */
+        isOverAccepted: boolean
+    }) => ReactNode;
+}
+
+/**
+ * By default, children passed to this component will only render if the user is currently dragging, but this can be overridden.
+ */
+export class DragComponent extends Component<DragComponentProps, any> { }
+
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+// DRAG STATE
+// ──────────────────────────────────────────────────────────────────────────────────────────────────────────────────
+
+export interface DragStateProps {
+    /**
+     * An optional array of strings. For performance reasons you can limit which keys in the dragState your component subscribes to.
+     * For example, you may pass ['type', 'data'] to only rerender if these keys change.
+     */
+    subscribeTo?: ReadonlyArray<string> | null;
+
+    children: (arg: State) => ReactNode;
+}
+
+/**
+ * This component is used just like a draggable or droppable, but does not accept or trigger any drag events.
+ * Use it if you need to notify a component about changes in the dragState without making that component a draggable or droppable zone.
+ */
+export class DragState extends Component<DragStateProps, any> { }
diff --git a/types/react-dragtastic/react-dragtastic-tests.tsx b/types/react-dragtastic/react-dragtastic-tests.tsx
new file mode 100644
index 0000000000..87a8e828e1
--- /dev/null
+++ b/types/react-dragtastic/react-dragtastic-tests.tsx
@@ -0,0 +1,57 @@
+import * as React from 'react';
+import { Draggable, Droppable, DragComponent, DragState } from 'react-dragtastic';
+
+class DraggableZone extends React.Component {
+  render() {
+    return (
+      <Draggable id="unique-id" type="apple">
+        {dragState => <div {...dragState.events}>I'm a draggable zone</div>}
+      </Draggable>
+    );
+  }
+}
+
+class DroppableZone extends React.Component {
+  render() {
+    return (
+      <Droppable accepts="apple">
+        {dragState => <div {...dragState.events}>I'm a droppable zone</div>}
+      </Droppable>
+    );
+  }
+}
+
+class DragComponentWrapper extends React.Component {
+  render() {
+    return (
+      <DragComponent for="unique-id">
+        {dragState => (
+          <div
+            style={{
+              position: "fixed",
+              left: dragState.x,
+              top: dragState.y,
+              pointerEvents: "none"
+            }}
+          >
+            I will render when my Draggable zone is activated
+          </div>
+        )}
+      </DragComponent>
+    );
+  }
+}
+
+class CompWithDragState extends React.Component {
+  render() {
+    return (
+      <DragState>
+        {dragState => (
+          <div style={{ background: dragState.isDragging ? "red" : "blue" }}>
+            I always render, and have access to the global dragState.
+          </div>
+        )}
+      </DragState>
+    );
+  }
+}
diff --git a/types/react-dnd-test-backend/tsconfig.json b/types/react-dragtastic/tsconfig.json
similarity index 92%
rename from types/react-dnd-test-backend/tsconfig.json
rename to types/react-dragtastic/tsconfig.json
index b83ff74de3..7c07bab561 100644
--- a/types/react-dnd-test-backend/tsconfig.json
+++ b/types/react-dragtastic/tsconfig.json
@@ -20,6 +20,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-dnd-test-backend-tests.tsx"
+        "react-dragtastic-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/types/react-dragtastic/tslint.json b/types/react-dragtastic/tslint.json
new file mode 100644
index 0000000000..30a1bdde2e
--- /dev/null
+++ b/types/react-dragtastic/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/react-dropzone/index.d.ts b/types/react-dropzone/index.d.ts
index 423ce38462..77ddd9faa8 100644
--- a/types/react-dropzone/index.d.ts
+++ b/types/react-dropzone/index.d.ts
@@ -6,9 +6,10 @@
 //                 Ben Bayard <https://github.com/benbayard>,
 //                 Karol Janyst <https://github.com/LKay>,
 //                 Andris Causs <https://github.com/codeaid>,
-//                 Juraj Husar <https://github.com/jurosh>
+//                 Juraj Husar <https://github.com/jurosh>,
+//                 Monroe Ekilah <https://github.com/ekilah>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { CSSProperties, Component, DragEvent, InputHTMLAttributes } from "react";
 
@@ -19,9 +20,10 @@ export interface ImageFile extends File {
 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";
+type PickedAttributes = "className" | "multiple" | "name" | "onClick" | "onDragStart" | "onDragEnter" | "onDragOver" | "onDragLeave" | "style";
 
 export interface DropzoneProps extends Pick<InputHTMLAttributes<HTMLDivElement>, PickedAttributes> {
+    accept?: string | ReadonlyArray<string>;
     disableClick?: boolean;
     disabled?: boolean;
     disablePreview?: boolean;
diff --git a/types/react-dropzone/react-dropzone-tests.tsx b/types/react-dropzone/react-dropzone-tests.tsx
index 67fa8eadb3..6b7179f2f5 100644
--- a/types/react-dropzone/react-dropzone-tests.tsx
+++ b/types/react-dropzone/react-dropzone-tests.tsx
@@ -14,9 +14,11 @@ class Test extends React.Component {
 
   handleDropFiles = (accepted: File[], rejected: File[], event: DragEvent<HTMLDivElement>) => {};
 
-  handleDefault = (e: SyntheticEvent<HTMLDivElement>) => {}
+  handleDefault = (e: SyntheticEvent<HTMLDivElement>) => {};
 
-  handleFileDialog = () => {}
+  handleFileDialog = () => {};
+
+  accept: string | ReadonlyArray<string> = ["*.png", "application/pdf"];
 
   render() {
     return (
@@ -47,7 +49,7 @@ class Test extends React.Component {
           disableClick
           disabled
           multiple={false}
-          accept="*.png"
+          accept={this.accept}
           name="dropzone"
           inputProps={{ id : "dropzone" }}
         />
diff --git a/types/react-dropzone/v2/index.d.ts b/types/react-dropzone/v2/index.d.ts
index 995e2cdb7d..bae20a74f6 100644
--- a/types/react-dropzone/v2/index.d.ts
+++ b/types/react-dropzone/v2/index.d.ts
@@ -2,7 +2,7 @@
 // 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>
 // Definitions: https://github.com/Vooban/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
diff --git a/types/react-dropzone/v3/index.d.ts b/types/react-dropzone/v3/index.d.ts
index 55f485203f..18955dff5f 100644
--- a/types/react-dropzone/v3/index.d.ts
+++ b/types/react-dropzone/v3/index.d.ts
@@ -6,7 +6,7 @@
 //                 Ben Bayard <https://github.com/benbayard>,
 //                 Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { CSSProperties, Component, DragEvent, InputHTMLAttributes } from "react";
 
diff --git a/types/react-dynamic-number/index.d.ts b/types/react-dynamic-number/index.d.ts
index 559d0c9d01..c885d8a54c 100644
--- a/types/react-dynamic-number/index.d.ts
+++ b/types/react-dynamic-number/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/uhlryk/react-dynamic-number
 // Definitions by: Eugene Rodin <https://github.com/eugrdn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-easy-chart/index.d.ts b/types/react-easy-chart/index.d.ts
index fa3eb07b2c..0697e0e11d 100644
--- a/types/react-easy-chart/index.d.ts
+++ b/types/react-easy-chart/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rma-consulting/react-easy-chart
 // Definitions by: Dave Leaver <https://github.com/danzel>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-event-listener/index.d.ts b/types/react-event-listener/index.d.ts
index 4b343c67e4..b37566af5c 100644
--- a/types/react-event-listener/index.d.ts
+++ b/types/react-event-listener/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/oliviertassinari/react-event-listener
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
@@ -125,8 +125,8 @@ export interface EventListenerProps {
     onMouseOverCapture?(ev: MouseEvent): any;
     onMouseUp?(ev: MouseEvent): any;
     onMouseUpCapture?(ev: MouseEvent): any;
-    onMouseWheel?(ev: MouseWheelEvent): any;
-    onMouseWheelCapture?(ev: MouseWheelEvent): any;
+    onMouseWheel?(ev: WheelEvent): any;
+    onMouseWheelCapture?(ev: WheelEvent): any;
     onMsGestureChange?(ev: MSGestureEvent): any;
     onMsGestureChangeCapture?(ev: MSGestureEvent): any;
     onMsGestureDoubleTap?(ev: MSGestureEvent): any;
diff --git a/types/react-fa/index.d.ts b/types/react-fa/index.d.ts
index 86480a197e..b5641439af 100644
--- a/types/react-fa/index.d.ts
+++ b/types/react-fa/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/andreypopp/react-fa
 // Definitions by: Frank Laub <https://github.com/flaub>, Pat Sissons <https://github.com/patsissons>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ComponentClass, HTMLProps, StatelessComponent, ReactElement } from "react";
 
diff --git a/types/react-facebook-login/index.d.ts b/types/react-facebook-login/index.d.ts
index 2cd75419b2..82672660a8 100644
--- a/types/react-facebook-login/index.d.ts
+++ b/types/react-facebook-login/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/keppelen/react-facebook-login
 // Definitions by: Alexandre Paré <https://github.com/apare>, Jan Karres <https://github.com/jankarres>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-file-input/index.d.ts b/types/react-file-input/index.d.ts
index d2aa7c70cf..0662941b44 100644
--- a/types/react-file-input/index.d.ts
+++ b/types/react-file-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-file-input
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react" />
 
diff --git a/types/react-file-reader-input/index.d.ts b/types/react-file-reader-input/index.d.ts
index c198d2c5f1..5dcb94ad66 100644
--- a/types/react-file-reader-input/index.d.ts
+++ b/types/react-file-reader-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-file-reader-input
 // Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>, Ali Taheri <https://github.com/alitaheri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-flag-icon-css/index.d.ts b/types/react-flag-icon-css/index.d.ts
new file mode 100644
index 0000000000..74c3e04efe
--- /dev/null
+++ b/types/react-flag-icon-css/index.d.ts
@@ -0,0 +1,63 @@
+// Type definitions for react-flag-icon-css 1.0
+// Project: https://github.com/matteocng/react-flag-icon-css#readme
+// Definitions by: Jon Freedman <https://github.com/jonfreedman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as CSS from 'csstype';
+import { PureComponent, ReactNode } from 'react';
+
+export type FlagIconSize = 'lg' | '2x' | '3x' | '4x' | '5x';
+export type FlagIconFlip = 'horizontal' | 'vertical';
+export type FlagIconRotate = 30 | 60 | 90 | 180 | 270;
+
+export interface FlagIconOptions {
+    /**
+     * Use CSS modules styles (your module bundler must be correctly setup).
+     */
+    useCssModules?: boolean;
+    /**
+     * An object literal whose keys are your custom codes.
+     */
+    customCodes?: {
+        [key: string]: string;
+    };
+    /**
+     * Set this if useCssModules is true and a) you want to apply styles to FlagIcon
+     * using .theme-base and/or b) you are using custom flags.
+     */
+    themeStyles?: {
+        [key: string]: CSS.Properties & CSS.PropertiesHyphen;
+    };
+}
+
+export interface FlagIconProps {
+    /**
+     * ISO 3166-1-alpha-2 code.
+     */
+    code: string;
+    size?: FlagIconSize;
+    flip?: FlagIconFlip;
+    rotate?: FlagIconRotate;
+    Component?: string;
+    /**
+     * 	Uses the 1x1 image if true.
+     */
+    squared?: boolean;
+    /**
+     * This is always appended as-is to class in the HTML.
+     */
+    className?: string;
+    /**
+     * This is mapped to a CSS module and appended to class in the HTML.
+     */
+    styleName?: string;
+    children?: ReactNode;
+}
+
+export class FlagIcon extends PureComponent<FlagIconProps> {
+}
+
+export default function FlagIconFactory(react: any, opts?: Readonly<FlagIconOptions>): (props: FlagIconProps) => FlagIcon;
+
+export function CustomFlagIconFactory(react: any, opts?: Readonly<FlagIconOptions>): (props: FlagIconProps) => FlagIcon;
diff --git a/types/react-flag-icon-css/package.json b/types/react-flag-icon-css/package.json
new file mode 100644
index 0000000000..e6696d08e7
--- /dev/null
+++ b/types/react-flag-icon-css/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "csstype": "^2.2.0"
+  }
+}
diff --git a/types/react-flag-icon-css/react-flag-icon-css-tests.tsx b/types/react-flag-icon-css/react-flag-icon-css-tests.tsx
new file mode 100644
index 0000000000..5b656cff7b
--- /dev/null
+++ b/types/react-flag-icon-css/react-flag-icon-css-tests.tsx
@@ -0,0 +1,88 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import FlagIconFactory, { CustomFlagIconFactory, FlagIconSize } from 'react-flag-icon-css';
+
+const FlagIcon = FlagIconFactory(React, {useCssModules: false});
+
+/**
+ * based on https://github.com/matteocng/react-flag-icon-css#basic-usage
+ */
+interface SimpleFlagComponentProps {
+    code: string;
+    size: FlagIconSize;
+}
+
+export class SimpleFlagComponent extends React.PureComponent<SimpleFlagComponentProps> {
+    render() {
+        return (
+            <FlagIcon code={this.props.code} size={this.props.size}/>
+        );
+    }
+}
+
+const rootEL = document.getElementById('react-app') as HTMLElement;
+
+const appProps: SimpleFlagComponentProps = {
+    code: 'it',
+    size: '3x'
+};
+ReactDOM.render(<SimpleFlagComponent {...appProps} />, rootEL);
+
+/**
+ * based on https://github.com/matteocng/react-flag-icon-css#exampleCustomFlagsIndex
+ */
+const styles = {
+    ['.flag-icon-ex1']: {
+        'background-image': '../images/4x3/ex1.svg'
+    },
+    ['.flag-icon-ex1.flag-icon-squared']: {
+        'background-image': '../images/1x1/ex1.svg'
+    }
+};
+
+const codes = {
+    ex1: 'Example 1 country'
+};
+
+const optionsCssModules = {customCodes: codes, themeStyles: styles};
+const FlagIconCssModules = CustomFlagIconFactory(React, optionsCssModules);
+
+export class CustomFlagComponent extends React.PureComponent<SimpleFlagComponentProps> {
+    render() {
+        return (
+            <FlagIconCssModules code={this.props.code} size={this.props.size}/>
+        );
+    }
+}
+
+const appCustomProps: SimpleFlagComponentProps = {
+    code: 'ex1',
+    size: 'lg'
+};
+ReactDOM.render(<CustomFlagComponent {...appCustomProps} />, rootEL);
+
+/**
+ * based on 'props:children' test
+ */
+interface ChildrenFlagComponentProps {
+    code: string;
+    size: FlagIconSize;
+    children: React.ReactNode;
+}
+
+export class ChildrenFlagComponent extends React.PureComponent<ChildrenFlagComponentProps> {
+    render() {
+        return (
+            <FlagIcon code={this.props.code} size={this.props.size} children={this.props.children}/>
+        );
+    }
+}
+
+const appChildrenProps: ChildrenFlagComponentProps = {
+    code: 'ex1',
+    size: 'lg',
+    children: FlagIcon({
+        code: 'it'
+    })
+};
+ReactDOM.render(<ChildrenFlagComponent {...appChildrenProps} />, rootEL);
diff --git a/types/react-flag-icon-css/tsconfig.json b/types/react-flag-icon-css/tsconfig.json
new file mode 100644
index 0000000000..ac4affcceb
--- /dev/null
+++ b/types/react-flag-icon-css/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-flag-icon-css-tests.tsx"
+    ]
+}
diff --git a/types/react-flag-icon-css/tslint.json b/types/react-flag-icon-css/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-flag-icon-css/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-flags-select/index.d.ts b/types/react-flags-select/index.d.ts
index df01a33ae4..e681e93877 100644
--- a/types/react-flags-select/index.d.ts
+++ b/types/react-flags-select/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 
diff --git a/types/react-flatpickr/index.d.ts b/types/react-flatpickr/index.d.ts
index 9683835e32..a0a9725ccd 100644
--- a/types/react-flatpickr/index.d.ts
+++ b/types/react-flatpickr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/coderhaoxin/react-flatpickr
 // Definitions by: begincalendar <https://github.com/begincalendar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 import flatpickr from 'flatpickr';
@@ -12,6 +12,7 @@ export interface DateTimePickerProps {
     options?: flatpickr.Options.Options;
     onChange?: flatpickr.Options.Hook;
     value?: string;
+    className?: string;
 }
 
 export default class DatePicker extends Component<DateTimePickerProps> {}
diff --git a/types/react-flatpickr/react-flatpickr-tests.tsx b/types/react-flatpickr/react-flatpickr-tests.tsx
index fbbb6f45a7..452d8529b4 100644
--- a/types/react-flatpickr/react-flatpickr-tests.tsx
+++ b/types/react-flatpickr/react-flatpickr-tests.tsx
@@ -18,3 +18,5 @@ const onChange = (
 const onChangeElement = <DatePicker onChange={ onChange }/>;
 
 const valueElement = <DatePicker value={ 'Value' }/>;
+
+const classNameElement = <DatePicker className={ 'Class name' }/>;
diff --git a/types/react-flex/index.d.ts b/types/react-flex/index.d.ts
index 50df2b6fb1..cb470bb89b 100644
--- a/types/react-flex/index.d.ts
+++ b/types/react-flex/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zippyui/react-flex
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-flexr/index.d.ts b/types/react-flexr/index.d.ts
index 31be71a93e..848dd24800 100644
--- a/types/react-flexr/index.d.ts
+++ b/types/react-flexr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/kodyl/react-flexr
 // Definitions by: Jeffery Grajkowski <https://github.com/pushplay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-fontawesome/index.d.ts b/types/react-fontawesome/index.d.ts
index 9fa93692b3..6c680ca907 100644
--- a/types/react-fontawesome/index.d.ts
+++ b/types/react-fontawesome/index.d.ts
@@ -5,7 +5,7 @@
 //                 Vincas Stonys <https://github.com/vincaslt>
 //                 Gavin Gregory <https://github.com/gavingregory>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-form/index.d.ts b/types/react-form/index.d.ts
index 4ae175d83b..b0f14afd2e 100644
--- a/types/react-form/index.d.ts
+++ b/types/react-form/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Cameron McAteer <https://github.com/cameron-mcateer>
 //                 Mathieu Masy <https://github.com/TiuSh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-form/react-form-tests.tsx b/types/react-form/react-form-tests.tsx
index 36aa86db94..7772eac3c0 100644
--- a/types/react-form/react-form-tests.tsx
+++ b/types/react-form/react-form-tests.tsx
@@ -23,10 +23,7 @@ import {
 
 // Form Api
 class FormApiMethods extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
+	state = {};
 
 	render() {
 		const FormContent = (props: { formApi?: FormApi }) => (
@@ -82,11 +79,6 @@ const statusOptions = [
 ];
 
 class BasicForm extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
-
 	render() {
 		return (
 			<div>
@@ -124,11 +116,6 @@ class BasicForm extends React.Component {
 
 // Form with Arrays
 class FormWithArrays extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
-
 	render() {
 		return (
 			<div>
@@ -169,11 +156,6 @@ const Friend = ({ i }: {i: number}) => (
 );
 
 class FormWithSpecialFieldSyntax extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
-
 	render() {
 		return (
 			<div>
@@ -215,11 +197,6 @@ const Questions = () => (
 );
 
 class NestedFormExample extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
-
 	render() {
 		return (
 			<div>
@@ -240,11 +217,6 @@ class NestedFormExample extends React.Component {
 
 // Dynamic Forms
 class DynamicForm extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
-
 	render() {
 		return (
 			<div>
@@ -297,11 +269,6 @@ const MyFriend = ({ i }: {i: number}) => (
 );
 
 class FormWithArrayOfNestedForms extends React.Component {
-	constructor(props: {}) {
-		super(props);
-		this.state = {};
-	}
-
 	render() {
 		return (
 			<div>
@@ -325,11 +292,6 @@ class FormWithArrayOfNestedForms extends React.Component {
 
 // 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;
diff --git a/types/react-form/v1/index.d.ts b/types/react-form/v1/index.d.ts
index 41ca659a2d..0d4bdc6300 100644
--- a/types/react-form/v1/index.d.ts
+++ b/types/react-form/v1/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-foundation/index.d.ts b/types/react-foundation/index.d.ts
index 9c88ff2f7e..51433b1fd9 100644
--- a/types/react-foundation/index.d.ts
+++ b/types/react-foundation/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/digiaonline/react-foundation
 // Definitions by: Daniel Earwicker <https://github.com/danielearwicker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export { Accordion, AccordionItem, AccordionTitle, AccordionContent } from './components/accordion';
 export { Badge } from './components/badge';
diff --git a/types/react-gateway/Gateway.d.ts b/types/react-gateway/Gateway.d.ts
new file mode 100644
index 0000000000..8fabcc95d5
--- /dev/null
+++ b/types/react-gateway/Gateway.d.ts
@@ -0,0 +1,9 @@
+import * as React from 'react';
+
+declare namespace Gateway {
+    interface GatewayProps {
+        into: string;
+    }
+}
+declare class Gateway extends React.Component<Gateway.GatewayProps> { }
+export = Gateway;
diff --git a/types/react-gateway/GatewayDest.d.ts b/types/react-gateway/GatewayDest.d.ts
new file mode 100644
index 0000000000..ad45947d4c
--- /dev/null
+++ b/types/react-gateway/GatewayDest.d.ts
@@ -0,0 +1,11 @@
+import * as React from 'react';
+
+declare namespace GatewayDest {
+    interface GatewayDestProps {
+        name: string;
+        tagName?: string;
+        component?: string | React.ComponentClass;
+    }
+}
+declare class GatewayDest extends React.Component<GatewayDest.GatewayDestProps> { }
+export = GatewayDest;
diff --git a/types/react-gateway/GatewayProvider.d.ts b/types/react-gateway/GatewayProvider.d.ts
new file mode 100644
index 0000000000..2d971539ea
--- /dev/null
+++ b/types/react-gateway/GatewayProvider.d.ts
@@ -0,0 +1,4 @@
+import * as React from 'react';
+
+declare class GatewayProvider extends React.Component { }
+export = GatewayProvider;
diff --git a/types/react-gateway/GatewayRegistry.d.ts b/types/react-gateway/GatewayRegistry.d.ts
new file mode 100644
index 0000000000..260a7e03be
--- /dev/null
+++ b/types/react-gateway/GatewayRegistry.d.ts
@@ -0,0 +1,20 @@
+declare class GatewayRegistry {
+    _containers: { [name: string]: React.Component | null | undefined };
+    _children: { [name: string]: { [gatewayId: string]: React.ReactNode } | undefined };
+    _currentId: number;
+
+    _renderContainer(name: string): void;
+
+    addContainer(name: string, container: React.Component): void;
+
+    removeContainer(name: string): void;
+
+    addChild(name: string, gatewayId: string, child: React.ReactNode): void;
+
+    clearChild(name: string, gatewayId: string): void;
+
+    register(name: string, child: React.ReactNode): string;
+
+    unregister(name: string, gatewayId: string): void;
+}
+export = GatewayRegistry;
diff --git a/types/react-gateway/index.d.ts b/types/react-gateway/index.d.ts
new file mode 100644
index 0000000000..d3e8f0b0e5
--- /dev/null
+++ b/types/react-gateway/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for react-gateway 2.8
+// Project: https://github.com/cloudflare/react-gateway
+// Definitions by: Jason Unger <https://github.com/jsonunger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import Gateway = require('./Gateway');
+import { GatewayProps } from './Gateway';
+import GatewayDest = require('./GatewayDest');
+import { GatewayDestProps } from './GatewayDest';
+import GatewayProvider = require('./GatewayProvider');
+import GatewayRegistry = require('./GatewayRegistry');
+
+export {
+    Gateway,
+    GatewayProps,
+    GatewayDest,
+    GatewayDestProps,
+    GatewayProvider,
+    GatewayRegistry
+};
diff --git a/types/react-gateway/react-gateway-tests.tsx b/types/react-gateway/react-gateway-tests.tsx
new file mode 100644
index 0000000000..6d0642f591
--- /dev/null
+++ b/types/react-gateway/react-gateway-tests.tsx
@@ -0,0 +1,48 @@
+import * as React from 'react';
+import { Gateway, GatewayProvider, GatewayDest } from 'react-gateway';
+
+class GatewayComponent extends React.Component {
+  render() {
+    return (
+      <div>{this.props.children}</div>
+    );
+  }
+}
+
+class ReactGateway extends React.Component<Gateway.GatewayProps> {
+    render() {
+        return (
+            <Gateway {...this.props}>
+                <div>
+                    Text goes here.
+                </div>
+            </Gateway>
+        );
+    }
+}
+
+class ReactGatewayProvider extends React.Component {
+    render() {
+        return (
+            <GatewayProvider>
+                <GatewayDest name="test" component={GatewayComponent} />
+                <GatewayDest name="test2" component="span" />
+                <GatewayDest name="test3" />
+                <div>
+                    All the way down...
+                    <div>
+                        Almost there...
+                        <div>
+                            Getting close...
+                            <div>
+                                <ReactGateway into="test" />
+                                <ReactGateway into="test2" />
+                                <ReactGateway into="test3" />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </GatewayProvider>
+        );
+    }
+}
diff --git a/types/react-gateway/tsconfig.json b/types/react-gateway/tsconfig.json
new file mode 100644
index 0000000000..58ecf35a63
--- /dev/null
+++ b/types/react-gateway/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,
+        "jsx": "react"
+    },
+    "files": [
+        "Gateway.d.ts",
+        "GatewayDest.d.ts",
+        "GatewayProvider.d.ts",
+        "GatewayRegistry.d.ts",
+        "index.d.ts",
+        "react-gateway-tests.tsx"
+    ]
+}
diff --git a/types/react-gateway/tslint.json b/types/react-gateway/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-gateway/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-geosuggest/index.d.ts b/types/react-geosuggest/index.d.ts
index 2d31ba4d6d..6d5fd584f5 100644
--- a/types/react-geosuggest/index.d.ts
+++ b/types/react-geosuggest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ubilabs/react-geosuggest
 // Definitions by: Brad Menchl <https://github.com/brmenchl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="googlemaps" />
 
diff --git a/types/react-google-maps-loader/index.d.ts b/types/react-google-maps-loader/index.d.ts
index 1bea9e2a9c..6bb5978bd2 100644
--- a/types/react-google-maps-loader/index.d.ts
+++ b/types/react-google-maps-loader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/xuopled/react-google-maps-loader
 // Definitions by: Vasily Nesterov <https://github.com/vasilysn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="googlemaps" />
 import { Component, ReactNode } from "react";
diff --git a/types/react-google-places-suggest/index.d.ts b/types/react-google-places-suggest/index.d.ts
index d11139a911..5e7276974f 100644
--- a/types/react-google-places-suggest/index.d.ts
+++ b/types/react-google-places-suggest/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://xuopled.github.io/react-google-places-suggest
 // Definitions by: Vasily Nesterov <https://github.com/vasilysn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="googlemaps" />
 import { Component, ReactNode } from "react";
diff --git a/types/react-google-recaptcha/index.d.ts b/types/react-google-recaptcha/index.d.ts
index 841b6440af..faeac20b4e 100644
--- a/types/react-google-recaptcha/index.d.ts
+++ b/types/react-google-recaptcha/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-gravatar/index.d.ts b/types/react-gravatar/index.d.ts
index e2418c2cf6..b2962edc8d 100644
--- a/types/react-gravatar/index.d.ts
+++ b/types/react-gravatar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://kyleamathews.github.io/react-gravatar/
 // Definitions by: invliD <https://github.com/invliD>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-grid-layout/index.d.ts b/types/react-grid-layout/index.d.ts
index ff25317a96..91c8ad1f9c 100644
--- a/types/react-grid-layout/index.d.ts
+++ b/types/react-grid-layout/index.d.ts
@@ -5,7 +5,7 @@
 //                 Zheyang Song <https://github.com/ZheyangSong>,
 //                 Andrew Hathaway <https://github.com/andrewhathaway>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-hamburger-menu/index.d.ts b/types/react-hamburger-menu/index.d.ts
index c187a7ace3..c8ff0a1659 100644
--- a/types/react-hamburger-menu/index.d.ts
+++ b/types/react-hamburger-menu/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/cameronbourke/react-hamburger-menu
 // Definitions by: Grzegorz Kielak <https://github.com/grzesie2k>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-hammerjs/index.d.ts b/types/react-hammerjs/index.d.ts
new file mode 100644
index 0000000000..e3bb4a826c
--- /dev/null
+++ b/types/react-hammerjs/index.d.ts
@@ -0,0 +1,45 @@
+// Type definitions for react-hammerjs 0.5
+// Project: https://github.com/JedWatson/react-hammerjs#readme
+// Definitions by: Jason Unger <https://github.com/jsonunger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as Hammer from 'hammerjs';
+import * as React from 'react';
+
+type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+type HammerOptionsWithRecognizers = Omit<HammerOptions, 'recognizers'> & {
+    recognizers?: { [gesture: string]: RecognizerOptions };
+};
+
+declare namespace ReactHammer {
+    interface ReactHammerProps {
+        direction?: number;
+        options?: HammerOptionsWithRecognizers;
+        recognizeWith?: { [gesture: string]: Recognizer | string };
+        vertical?: boolean;
+        action?: HammerListener;
+        onDoubleTap?: HammerListener;
+        onPan?: HammerListener;
+        onPanCancel?: HammerListener;
+        onPanEnd?: HammerListener;
+        onPanStart?: HammerListener;
+        onPinch?: HammerListener;
+        onPinchCancel?: HammerListener;
+        onPinchEnd?: HammerListener;
+        onPinchIn?: HammerListener;
+        onPinchStart?: HammerListener;
+        onPress?: HammerListener;
+        onPressUp?: HammerListener;
+        onRotate?: HammerListener;
+        onRotateCancel?: HammerListener;
+        onRotateEnd?: HammerListener;
+        onRotateMove?: HammerListener;
+        onRotateStart?: HammerListener;
+        onSwipe?: HammerListener;
+        onTap?: HammerListener;
+    }
+}
+declare const ReactHammer: React.ComponentClass<ReactHammer.ReactHammerProps>;
+export = ReactHammer;
diff --git a/types/react-hammerjs/react-hammerjs-tests.tsx b/types/react-hammerjs/react-hammerjs-tests.tsx
new file mode 100644
index 0000000000..7743cf3a4b
--- /dev/null
+++ b/types/react-hammerjs/react-hammerjs-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import Hammer from 'react-hammerjs';
+
+class ReactHammer extends React.Component<Hammer.ReactHammerProps> {
+    swipe: Hammer.ReactHammerProps['onSwipe'] = input => {
+        console.log(input.deltaX);
+    }
+
+    render() {
+        const { children, ...props } = this.props;
+        return (
+            <Hammer onSwipe={this.swipe} {...props}>
+                {children}
+            </Hammer>
+        );
+    }
+}
diff --git a/types/react-hammerjs/tsconfig.json b/types/react-hammerjs/tsconfig.json
new file mode 100644
index 0000000000..f981b934ea
--- /dev/null
+++ b/types/react-hammerjs/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",
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-hammerjs-tests.tsx"
+    ]
+}
diff --git a/types/react-hammerjs/tslint.json b/types/react-hammerjs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-hammerjs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-helmet-async/index.d.ts b/types/react-helmet-async/index.d.ts
index 1a240b075b..086ee1fcf0 100644
--- a/types/react-helmet-async/index.d.ts
+++ b/types/react-helmet-async/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/staylor/react-helmet-async#readme
 // Definitions by: forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-helmet/index.d.ts b/types/react-helmet/index.d.ts
index 93b83075fe..cecb86e12d 100644
--- a/types/react-helmet/index.d.ts
+++ b/types/react-helmet/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nfl/react-helmet
 // Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>, François Nguyen <https://github.com/lith-light-g>, Kok Sam <https://github.com/sammkj>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-helmet/v4/index.d.ts b/types/react-helmet/v4/index.d.ts
index b9a813b432..4d1b0c699e 100644
--- a/types/react-helmet/v4/index.d.ts
+++ b/types/react-helmet/v4/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nfl/react-helmet
 // Definitions by: Evan Bremer <https://github.com/evanbb>, Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-highlight-words/index.d.ts b/types/react-highlight-words/index.d.ts
index 669a600dc9..19d5cc0960 100644
--- a/types/react-highlight-words/index.d.ts
+++ b/types/react-highlight-words/index.d.ts
@@ -1,34 +1,55 @@
-// Type definitions for react-highlight-words 0.6
+// Type definitions for react-highlight-words 0.11
 // Project: https://github.com/bvaughn/react-highlight-words#readme
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
+//                 Diogo Corrêa <https://github.com/diogodca>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
-export = Highlighter;
-
 interface HighlighterProps {
-    /** Escape characters which are meaningful in regular expressions */
-    autoEscape?: boolean;
-    /** Escape characters which are meaningful in regular expressions */
+    /** The class name to be applied to an active match. Use along with activeIndex */
     activeClassName?: string;
     /** Specify the match index that should be actively highlighted. Use along with activeClassName */
     activeIndex?: string;
+    /** The inline style to be applied to an active match. Use along with activeIndex */
+    activeStyle?: React.CSSProperties;
+    /** Escape characters in searchWords which are meaningful in regular expressions */
+    autoEscape?: boolean;
+    /** CSS class name applied to the outer/wrapper <span> */
+    className?: string;
+    /** Search should be case sensitive; defaults to false */
+    caseSensitive?: boolean;
+    /**
+     * Use a custom function to search for matching chunks. This makes it possible to use arbitrary logic
+     * when looking for matches. See the default findChunks function in highlight-words-core for signature.
+     * Have a look at the custom findChunks example on how to use it.
+     */
+    findChunks?: () => void;
     /** CSS class name applied to highlighted text */
     highlightClassName?: string;
     /** Inline styles applied to highlighted text */
-    highlightStyle?: any;
-    /** Type of tag to wrap around highlighted matches; defaults to mark */
+    highlightStyle?: React.CSSProperties;
+    /**
+     * Type of tag to wrap around highlighted matches; defaults to mark but can also be a React element
+     * (class or functional)
+     */
     highlightTag?: string;
-    /** Process each search word and text to highlight before comparing (eg remove accents); signature (text: string): string */
-    sanitize?(text: string): string;
-    /** Array of search words */
+    /**
+     * Process each search word and text to highlight before comparing (eg remove accents); signature
+     * (text: string): string
+     */
+    sanitize?: (text: string) => string;
+    /** Array of search words. The search terms are treated as RegExps unless autoEscape is set. */
     searchWords: string[];
     /** Text to highlight matches in */
     textToHighlight: string;
+    /** CSS class name applied to unhighlighted text */
+    unhighlightClassName?: string;
+    /** Inline styles applied to unhighlighted text */
+    unhighlightStyle?: React.CSSProperties;
 }
 
-declare class Highlighter extends React.Component<HighlighterProps> {
-    static propTypes: any;
-}
+declare class Highlighter extends React.Component<HighlighterProps> {}
+
+export default Highlighter;
diff --git a/types/react-highlight-words/react-highlight-words-tests.tsx b/types/react-highlight-words/react-highlight-words-tests.tsx
index a63e9b877b..11b1e79137 100644
--- a/types/react-highlight-words/react-highlight-words-tests.tsx
+++ b/types/react-highlight-words/react-highlight-words-tests.tsx
@@ -1,8 +1,32 @@
 import * as React from "react";
-import Highlighter = require("react-highlight-words");
+import Highlighter from "react-highlight-words";
 
-<Highlighter
-  highlightClassName='YourHighlightClass'
-  searchWords={['and', 'or', 'the']}
-  textToHighlight="The dog is chasing the cat. Or perhaps they're just playing?"
-/>;
+class HighlighterTest extends React.Component {
+    render() {
+        return (
+            <div>
+                <Highlighter
+                    searchWords={["el", "or"]}
+                    textToHighlight="Hello World"
+                />
+                <Highlighter
+                    activeClassName="activeClassName"
+                    activeIndex="activeIndex"
+                    activeStyle={{ color: "red" }}
+                    autoEscape={true}
+                    className="className"
+                    caseSensitive={true}
+                    findChunks={() => {}}
+                    highlightClassName="highlightClassName"
+                    highlightStyle={{ color: "red" }}
+                    highlightTag="span"
+                    sanitize={(text: string) => text}
+                    searchWords={["el", "or"]}
+                    textToHighlight="Hello World"
+                    unhighlightClassName="unhighlightClassName"
+                    unhighlightStyle={{ color: "red" }}
+                />
+            </div>
+        );
+    }
+}
diff --git a/types/react-highlight-words/tsconfig.json b/types/react-highlight-words/tsconfig.json
index 1617289fa7..96ae2a73a9 100644
--- a/types/react-highlight-words/tsconfig.json
+++ b/types/react-highlight-words/tsconfig.json
@@ -1,5 +1,10 @@
 {
+    "files": [
+        "index.d.ts",
+        "react-highlight-words-tests.tsx"
+    ],
     "compilerOptions": {
+        "jsx": "react",
         "module": "commonjs",
         "lib": [
             "es6",
@@ -14,12 +19,7 @@
             "../"
         ],
         "types": [],
-        "jsx": "react",
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    },
-    "files": [
-        "index.d.ts",
-        "react-highlight-words-tests.tsx"
-    ]
-}
\ No newline at end of file
+    }
+}
diff --git a/types/react-highlight/index.d.ts b/types/react-highlight/index.d.ts
new file mode 100644
index 0000000000..715a25b23b
--- /dev/null
+++ b/types/react-highlight/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for react-highlight 0.12
+// Project: https://github.com/akiran/react-highlight
+// Definitions by: Josh Goldberg <https://github.com/joshuakgoldberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+/**
+ * Props for a Highlight component.
+ */
+export interface HighlightProps {
+    /**
+     * Language name to use as a class to signal type to highlight.js.
+     */
+    className: string;
+}
+
+/**
+ * Visually prettifies child code with highlight.js.
+ */
+declare const Highlight: React.ComponentClass<HighlightProps>;
+
+export default Highlight;
diff --git a/types/react-highlight/react-highlight-tests.tsx b/types/react-highlight/react-highlight-tests.tsx
new file mode 100644
index 0000000000..4f379b055e
--- /dev/null
+++ b/types/react-highlight/react-highlight-tests.tsx
@@ -0,0 +1,9 @@
+import * as React from "react";
+import Highlight from "react-highlight";
+
+export const _ = () => <>
+	<Highlight className="javascript" />
+	<Highlight className="typescript">
+		`console.log("Hello, world!");`
+	</Highlight>
+</>;
diff --git a/types/react-highlight/tsconfig.json b/types/react-highlight/tsconfig.json
new file mode 100644
index 0000000000..53aa334c1d
--- /dev/null
+++ b/types/react-highlight/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "jsx": "react",
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-highlight-tests.tsx"
+    ]
+}
diff --git a/types/react-highlight/tslint.json b/types/react-highlight/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-highlight/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-highlighter/index.d.ts b/types/react-highlighter/index.d.ts
index 022cdc911a..07a0d7b8ec 100644
--- a/types/react-highlighter/index.d.ts
+++ b/types/react-highlighter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/helior/react-highlighter
 // Definitions by: Pedro Pereira <https://github.com/oizie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-holder/index.d.ts b/types/react-holder/index.d.ts
index 3fa3541786..3ab9d46182 100644
--- a/types/react-holder/index.d.ts
+++ b/types/react-holder/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Moeriki/react-holder
 // Definitions by: Isman Usoh <https://github.com/isman-usoh>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react"/>
 
diff --git a/types/react-hyperscript/index.d.ts b/types/react-hyperscript/index.d.ts
index 09030de2a9..ee953d3892 100644
--- a/types/react-hyperscript/index.d.ts
+++ b/types/react-hyperscript/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mlmorg/react-hyperscript
 // Definitions by: tock203 <https://github.com/tock203>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, StatelessComponent, ReactElement } from 'react';
 
diff --git a/types/react-i18next/index.d.ts b/types/react-i18next/index.d.ts
index 5ea0e7cb91..979c648f50 100644
--- a/types/react-i18next/index.d.ts
+++ b/types/react-i18next/index.d.ts
@@ -1,9 +1,11 @@
-// Type definitions for react-i18next 7.6
+// Type definitions for react-i18next 7.8
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Simon Baumann <https://github.com/chnoch>
+//                 Benedict Etzel <https://github.com/beheh>
+//                 Wu Haotian <https://github.com/whtsky>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { TranslationFunction } from "i18next";
 
diff --git a/types/react-i18next/src/I18n.d.ts b/types/react-i18next/src/I18n.d.ts
index 6bc1cf8f0f..91de868caf 100644
--- a/types/react-i18next/src/I18n.d.ts
+++ b/types/react-i18next/src/I18n.d.ts
@@ -15,7 +15,7 @@ export interface i18nProps {
     i18n?: i18n;
     initialI18nStore?: any;
     initialLanguage?: string;
-    children: (t: TranslationFunction, options: Options) => JSX.Element;
+    children: (t: TranslationFunction, options: Options) => React.ReactNode;
 }
 
 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 2cd4e333e3..2db5d0361b 100644
--- a/types/react-i18next/src/I18nextProvider.d.ts
+++ b/types/react-i18next/src/I18nextProvider.d.ts
@@ -6,7 +6,7 @@ export interface I18nextProviderProps {
     i18n: i18n;
     initialI18nStore?: any;
     initialLanguage?: string;
-    children: JSX.Element;
+    children: React.ReactNode;
 }
 
 export default class I18nextProvider extends React.Component<I18nextProviderProps> { }
diff --git a/types/react-i18next/src/trans.d.ts b/types/react-i18next/src/trans.d.ts
index c5652315c7..2b0e8e7738 100644
--- a/types/react-i18next/src/trans.d.ts
+++ b/types/react-i18next/src/trans.d.ts
@@ -5,13 +5,21 @@ export interface TOptions {
     [key: string]: any;
 }
 
+export interface Values {
+	[key: string]: any;
+}
+
 export interface TransProps {
     i18nKey?: string;
     count?: number;
-    parent?: string;
+    parent?: React.ReactNode | (() => React.ReactNode);
     i18n?: i18n;
     t?: TranslationFunction;
     tOptions?: TOptions;
+    defaults?: string;
+    values?: Values;
+    components?: React.ReactNode[];
+    ns?: string;
 }
 
 export default class Trans extends React.Component<TransProps> { }
diff --git a/types/react-i18next/test/react-i18next-tests.tsx b/types/react-i18next/test/react-i18next-tests.tsx
index 7f49913c44..30b95ece24 100644
--- a/types/react-i18next/test/react-i18next-tests.tsx
+++ b/types/react-i18next/test/react-i18next-tests.tsx
@@ -107,6 +107,10 @@ class App extends React.Component {
     <App/>
 </I18nextProvider>;
 
+<I18nextProvider i18n={i18n} initialLanguage={'en'} initialI18nStore={{}}>
+    123
+</I18nextProvider>;
+
 loadNamespaces({components: [App], i18n}).then(() => {
 }).catch(error => {
 });
@@ -114,12 +118,23 @@ loadNamespaces({components: [App], i18n}).then(() => {
 <Trans count={5}/>;
 <Trans count={5} i18nKey="key"/>;
 <Trans parent={'span'}/>;
+<Trans parent={<div />}/>;
+<Trans parent={() => <div />}/>;
 <Trans i18n={i18n.init()}/>;
 <Trans t={i18n.getFixedT('en')}/>;
 <Trans count={5}>
     <App/>
 </Trans>;
 <Trans i18nKey="hello" tOptions={{hello: "world", count: 42}}/>;
+<Trans
+    defaults="Hello <0>{{universe}}</0>!"
+    components={[
+        <strong>placeholder</strong>
+    ]}
+    values={{
+        universe: "World"
+    }}
+/>;
 
 type Key = "view" | "nav";
 
@@ -171,6 +186,10 @@ interface CustomTranslateFunctionProps {
     }
 </I18n>;
 
+<I18n>
+    {t => '123'}
+</I18n>;
+
 const defaults: ReactI18NextOptions = {
     wait: true,
     withRef: true,
diff --git a/types/react-i18next/v1/index.d.ts b/types/react-i18next/v1/index.d.ts
index 451e18c34a..0296da861c 100644
--- a/types/react-i18next/v1/index.d.ts
+++ b/types/react-i18next/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as I18next from "i18next";
 import * as React from "react";
diff --git a/types/react-i18next/v4/index.d.ts b/types/react-i18next/v4/index.d.ts
index 6b87326975..758a00edef 100644
--- a/types/react-i18next/v4/index.d.ts
+++ b/types/react-i18next/v4/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for react-i18next 4.6
 // Project: https://github.com/i18next/react-i18next
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
+//                 Netanel Gilad <https://github.com/netanelgilad>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { TranslationFunction } from "i18next";
 
@@ -31,7 +32,7 @@ export {
  * interface MyComponentProps extends ReactI18next.InjectedTranslateProps {}
  */
 export interface InjectedTranslateProps {
-    t?: TranslationFunction;
+    t: TranslationFunction;
 }
 
 export as namespace reactI18Next;
diff --git a/types/react-i18next/v4/react-i18next-tests.tsx b/types/react-i18next/v4/react-i18next-tests.tsx
index 6105ccf921..3e57dd091b 100644
--- a/types/react-i18next/v4/react-i18next-tests.tsx
+++ b/types/react-i18next/v4/react-i18next-tests.tsx
@@ -17,17 +17,16 @@ const AnotherComponent = translate('view', { wait: true, translateFuncName: '_'
 
 class InnerYetAnotherComponent extends React.Component<InjectedTranslateProps> {
   render() {
-    const t = this.props.t!;
+    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 t = this.props.t;
     const interpolateComponent = <strong>"a interpolated component"</strong>;
 
     return (
@@ -55,12 +54,14 @@ class TranslatableView extends React.Component<InjectedTranslateProps> {
   }
 }
 
+const WrappedTranslatableView = translate(['view', 'nav'], { wait: true })(TranslatableView);
+
 class App extends React.Component {
   render() {
     return (
       <div className='main'>
         <main>
-          <TranslatableView />
+          <WrappedTranslatableView />
         </main>
       </div>
     );
@@ -81,12 +82,14 @@ loadNamespaces({ components: [App], i18n }).then(() => { }).catch(error => { });
 
 type Key = "view" | "nav";
 
-@translate<Key>(['view', 'nav'])
 class GenericsTest extends React.Component<InjectedTranslateProps> {
   render() { return null; }
 }
 
-@translate<Key>('view')
+translate<Key>(['view', 'nav'])(GenericsTest);
+
 class GenericsTest2 extends React.Component<InjectedTranslateProps> {
   render() { return null; }
 }
+
+translate<Key>('view')(GenericsTest2);
diff --git a/types/react-i18next/v4/translate.d.ts b/types/react-i18next/v4/translate.d.ts
index d41b4dc00a..9a4fb6ddc2 100644
--- a/types/react-i18next/v4/translate.d.ts
+++ b/types/react-i18next/v4/translate.d.ts
@@ -1,5 +1,6 @@
 import * as React from "react";
 import { i18n } from "i18next";
+import { InjectedTranslateProps } from "react-i18next";
 
 export interface TranslateOptions {
     withRef?: boolean;
@@ -11,5 +12,14 @@ export interface TranslateOptions {
     i18n?: i18n;
 }
 
+// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
+export type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
+
+// 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 { [key: string]: any }>(component: React.ComponentClass<P> | React.StatelessComponent<P>) =>
+        React.ComponentClass<Omit<P, keyof InjectedTranslateProps | TTranslateFunctionName>>;
+
 // 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 default function translate<TKey extends string = string>(namespaces?: TKey[] | TKey, options?: TranslateOptions): InferableComponentEnhancerWithProps<"t">;
diff --git a/types/react-icon-base/index.d.ts b/types/react-icon-base/index.d.ts
index 7459349b82..9264889f85 100644
--- a/types/react-icon-base/index.d.ts
+++ b/types/react-icon-base/index.d.ts
@@ -2,12 +2,14 @@
 // 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
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
 export interface IconBaseProps extends React.SVGProps<React.ReactSVGElement> {
     size?: string | number;
+    style?: any;
+    color?: string;
 }
 
 export default class IconBaseClass extends React.Component<IconBaseProps> {}
diff --git a/types/react-icons/index.d.ts b/types/react-icons/index.d.ts
index 93c531c3b4..e65de56b08 100644
--- a/types/react-icons/index.d.ts
+++ b/types/react-icons/index.d.ts
@@ -4,4 +4,4 @@
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
diff --git a/types/react-image-crop/index.d.ts b/types/react-image-crop/index.d.ts
index afadc9d8ac..7f3637d093 100644
--- a/types/react-image-crop/index.d.ts
+++ b/types/react-image-crop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/DominicTobias/react-image-crop
 // Definitions by: Daniela Yassuda <https://github.com/danielasy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, CSSProperties, ReactNode } from 'react';
 
diff --git a/types/react-image-crop/test/react-image-crop-global-tests.ts b/types/react-image-crop/test/react-image-crop-global-tests.ts
index 909610d0f7..1ba4759420 100644
--- a/types/react-image-crop/test/react-image-crop-global-tests.ts
+++ b/types/react-image-crop/test/react-image-crop-global-tests.ts
@@ -1,13 +1,16 @@
 interface TestState {
     crop?: ReactCrop.Crop;
 }
+const initialState = {
+    crop: {
+        x: 0,
+        y: 0
+    }
+};
 
 // Basic use case
 class SimpleTest extends React.Component<{}, TestState> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {};
-    }
+    state = initialState;
 
     onChange = (crop: ReactCrop.Crop) => {
         this.setState({ crop });
@@ -27,10 +30,7 @@ class SimpleTest extends React.Component<{}, TestState> {
 
 // Set an aspect ratio to crop
 class AspectRatioTest extends React.Component<{}, TestState> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {};
-    }
+    state = initialState;
 
     onChange = (crop: ReactCrop.Crop) => {
         this.setState({ crop });
@@ -65,10 +65,7 @@ class AspectRatioTest extends React.Component<{}, TestState> {
 
 // All available props
 class CompleteTest extends React.Component<{}, TestState> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {};
-    }
+    state = initialState;
 
     onChange = (crop: ReactCrop.Crop) => {
         this.setState({ crop });
diff --git a/types/react-image-crop/test/react-image-crop-module-tests.tsx b/types/react-image-crop/test/react-image-crop-module-tests.tsx
index b9c0f766d9..7bd696bf32 100644
--- a/types/react-image-crop/test/react-image-crop-module-tests.tsx
+++ b/types/react-image-crop/test/react-image-crop-module-tests.tsx
@@ -5,34 +5,29 @@ interface TestState {
     crop?: ReactCrop.Crop;
 }
 
+const initialState = {
+    crop: {
+        x: 100,
+        y: 200
+    }
+};
+
 // Basic use case
 class SimpleTest extends React.Component<{}, TestState> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {};
-    }
+    state = initialState;
 
     onChange = (crop: ReactCrop.Crop) => {
         this.setState({ crop });
     }
 
     render() {
-        return (
-            <ReactCrop
-                src="imageSrc"
-                onChange={this.onChange}
-                crop={this.state.crop}
-            />
-        );
+        return <ReactCrop src="imageSrc" onChange={this.onChange} crop={this.state.crop} />;
     }
 }
 
 // Set an aspect ratio to crop
 class AspectRatioTest extends React.Component<{}, TestState> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {};
-    }
+    state = initialState;
 
     onChange = (crop: ReactCrop.Crop) => {
         this.setState({ crop });
@@ -66,10 +61,7 @@ class AspectRatioTest extends React.Component<{}, TestState> {
 
 // All available props
 class CompleteTest extends React.Component<{}, TestState> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {};
-    }
+    state = initialState;
 
     onChange = (crop: ReactCrop.Crop) => {
         this.setState({ crop });
diff --git a/types/react-image-gallery/index.d.ts b/types/react-image-gallery/index.d.ts
index 45de6e4d0a..0082046763 100644
--- a/types/react-image-gallery/index.d.ts
+++ b/types/react-image-gallery/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-imageloader/index.d.ts b/types/react-imageloader/index.d.ts
index bab7a49a34..6e569b1410 100644
--- a/types/react-imageloader/index.d.ts
+++ b/types/react-imageloader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hzdg/react-imageloader
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-infinite-calendar/index.d.ts b/types/react-infinite-calendar/index.d.ts
index 0264c70d91..2110d4dbd0 100644
--- a/types/react-infinite-calendar/index.d.ts
+++ b/types/react-infinite-calendar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/clauderic/react-infinite-calendar
 // Definitions by: Christian Chown <https://github.com/christianchown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-infinite-scroll-component/index.d.ts b/types/react-infinite-scroll-component/index.d.ts
index 4e2ba078f5..f43fc50e24 100644
--- a/types/react-infinite-scroll-component/index.d.ts
+++ b/types/react-infinite-scroll-component/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for react-infinite-scroll-component 4.1
+// Type definitions for react-infinite-scroll-component 4.2
 // Project: https://github.com/ankeetmaini/react-infinite-scroll-component#readme
 // Definitions by: Stephanie Roy <https://github.com/sroy3>
+//                 Bartosz Dotryw <https://github.com/burtek>
+//                 David Kevork <https://github.com/davidkevork>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -33,7 +35,7 @@ declare namespace InfiniteScroll {
         /**
          * You can send a loader component to show while the component waits for the next load of data. e.g. <h3>Loading...</h3> or any fancy loader element
          */
-        loader?: React.ReactNode;
+        loader: React.ReactNode;
 
         /**
          * This function will be called, it should return the fresh data that you want to show the user
@@ -58,12 +60,13 @@ declare namespace InfiniteScroll {
         /**
          * Any JSX that you want to show the user, default={<h3>Release to refresh</h3>}
          */
-        releaseToRefreshContent?: boolean;
+        releaseToRefreshContent?: React.ReactNode;
 
         /**
-         * A threshold value after that the InfiniteScroll will call next. By default it's 0.8. It means the next will be called when the user comes below 80% of the total height.
+         * A threshold value defining when InfiniteScroll will call next. Default value is 0.8. It means the next will be called when user comes below 80% of the total height.
+         * If you pass threshold in pixels (scrollThreshold="200px"), next will be called once you scroll at least (100% - scrollThreshold) pixels down.
          */
-        scrollThreshold?: number;
+        scrollThreshold?: number | string;
 
         /**
          * A function that will listen to the scroll event on the scrolling container. Note that the scroll event is throttled, so you may not receive as many events as you would expect.
@@ -82,6 +85,11 @@ declare namespace InfiniteScroll {
          */
         hasChildren?: boolean;
 
+        /**
+         * Children component which will be rendered
+         */
+        children?: React.ReactNode;
+
         /**
          * Set a scroll y position for the component to render with.
          */
diff --git a/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx b/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
index 2b5a01d4cc..6eb67569a0 100644
--- a/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
+++ b/types/react-infinite-scroll-component/react-infinite-scroll-component-tests.tsx
@@ -10,6 +10,7 @@ const props: InfiniteScroll.InfiniteScrollProps = {
     dataLength: 4,
     hasMore: true,
     endMessage: 'The end.',
+    loader: <h3>Loading...</h3>,
     next: () => null,
 };
 
diff --git a/types/react-infinite-scroller/index.d.ts b/types/react-infinite-scroller/index.d.ts
index 066714344c..47c2166bc9 100644
--- a/types/react-infinite-scroller/index.d.ts
+++ b/types/react-infinite-scroller/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Lauri Lavanti <https://github.com/Lapanti>,
 //                 Piotr Srebniak <https://github.com/psrebniak>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-infinite/index.d.ts b/types/react-infinite/index.d.ts
index 80a2594464..e2149a8016 100644
--- a/types/react-infinite/index.d.ts
+++ b/types/react-infinite/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/seatgeek/react-infinite
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react" />
 
diff --git a/types/react-infinite/react-infinite-tests.tsx b/types/react-infinite/react-infinite-tests.tsx
index 478f436e66..6f51b95d1a 100644
--- a/types/react-infinite/react-infinite-tests.tsx
+++ b/types/react-infinite/react-infinite-tests.tsx
@@ -73,13 +73,10 @@ class ListItem extends React.Component<{ key: number; num: number }, {}> {
 }
 
 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
-        };
-    }
+    state = {
+        elements: this.buildElements(0, 20),
+        isInfiniteLoading: false
+    };
 
     buildElements(start: number, end: number) {
         var elements = [] as React.ReactElement<any>[];
diff --git a/types/react-input-autosize/index.d.ts b/types/react-input-autosize/index.d.ts
new file mode 100644
index 0000000000..41782e482a
--- /dev/null
+++ b/types/react-input-autosize/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for react-input-autosize 2.0
+// Project: https://github.com/JedWatson/react-input-autosize#readme
+// Definitions by: Jason Unger <https://github.com/jsonunger>
+//                 Frank Li <https://github.com/franklixuefei>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export interface AutosizeInputProps extends React.InputHTMLAttributes<HTMLInputElement>, React.ClassAttributes<HTMLInputElement> {
+    inputClassName?: string;
+    inputRef?: React.Ref<HTMLInputElement>;
+    inputStyle?: React.CSSProperties;
+    minWidth?: string | number;
+    onAutosize?: (inputWidth: string | number) => void;
+    placeholderIsMinWidth?: boolean;
+}
+
+declare class AutosizeInput extends React.Component<AutosizeInputProps> {
+    getInput(): HTMLInputElement;
+}
+
+export default AutosizeInput;
diff --git a/types/react-input-autosize/react-input-autosize-tests.tsx b/types/react-input-autosize/react-input-autosize-tests.tsx
new file mode 100644
index 0000000000..d67da978cf
--- /dev/null
+++ b/types/react-input-autosize/react-input-autosize-tests.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import AutosizeInput, { AutosizeInputProps } from 'react-input-autosize';
+
+class Test extends React.Component<AutosizeInputProps> {
+    input: HTMLInputElement;
+    auto: AutosizeInput;
+
+    inputRef = (ref: HTMLInputElement) => {
+        this.input = ref;
+    }
+
+    onChange: React.ChangeEventHandler<HTMLInputElement> = _event => {
+        const input = this.auto.getInput();
+        input.blur();
+    }
+
+    render() {
+        return (
+            <AutosizeInput
+                {...this.props}
+                defaultValue="hello"
+                value="goodbye"
+                minWidth="400"
+                ref="auto"
+                inputRef={this.inputRef}
+                id="testInput"
+                placeholder="Testing 1, 2, 3"
+                placeholderIsMinWidth
+                onChange={this.onChange}
+            />
+        );
+    }
+}
diff --git a/types/react-input-autosize/tsconfig.json b/types/react-input-autosize/tsconfig.json
new file mode 100644
index 0000000000..d5a3df4b12
--- /dev/null
+++ b/types/react-input-autosize/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",
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-input-autosize-tests.tsx"
+    ]
+}
diff --git a/types/react-input-autosize/tslint.json b/types/react-input-autosize/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-input-autosize/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-input-calendar/index.d.ts b/types/react-input-calendar/index.d.ts
index c0e33783b4..09a7fe59b0 100644
--- a/types/react-input-calendar/index.d.ts
+++ b/types/react-input-calendar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Rudeg/react-input-calendar
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
diff --git a/types/react-input-mask/index.d.ts b/types/react-input-mask/index.d.ts
index 13140b1cad..ff618e8749 100644
--- a/types/react-input-mask/index.d.ts
+++ b/types/react-input-mask/index.d.ts
@@ -1,49 +1,73 @@
-// Type definitions for react-input-mask 1.2
+// Type definitions for react-input-mask 2.0
 // Project: https://github.com/sanniassin/react-input-mask
 // Definitions by: Alexandre Paré <https://github.com/apare>
+//                 Dima Danylyuk <https://github.com/dima7a14>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.9
 
-import * as React from "react";
+import * as React from 'react';
 
-declare namespace ReactInputMask {
-    interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
-        /**
-         * Mask string. Format characters are:
-         * * `9`: `0-9`
-         * * `a`: `A-Z, a-z`
-         * * `\*`: `A-Z, a-z, 0-9`
-         *
-         * Any character can be escaped with backslash, which usually will appear as double backslash in JS strings.
-         * For example, German phone mask with unremoveable prefix +49 will look like `mask="+4\\9 99 999 99"` or `mask={"+4\\\\9 99 999 99"}`
-         */
-        mask: string;
-        /**
-         * Character to cover unfilled editable parts of mask. Default character is "_". If set to null, unfilled parts will be empty, like in ordinary input.
-         */
-        maskChar?: string | null;
-        /**
-         * Defines format characters with characters as keys and corresponding RegExp string as values. Default ones:
-         * ```
-         * {
-         *   "9": "[0-9]",
-         *   "a": "[A-Za-z]",
-         *   "*": "[A-Za-z0-9]"
-         * }```
-         */
-        formatChars?: { [key: string]: string };
-        /**
-         * Show mask even in empty input without focus.
-         */
-        alwaysShowMask?: boolean;
-        /**
-         * Use inputRef instead of ref if you need input node to manage focus, selection, etc.
-         */
-        inputRef?: React.Ref<HTMLInputElement>;
-    }
+export interface InputState {
+  value: string;
+  selection: Selection;
 }
 
-declare class ReactInputMask extends React.Component<ReactInputMask.Props> {
+export interface MaskOptions {
+  mask: string;
+  maskChar: string;
+  alwaysShowMask: boolean;
+  formatChars: Record<string, string>;
+  permanents: number[];
+}
+
+interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
+  /**
+   * Mask string. Format characters are:
+   * * `9`: `0-9`
+   * * `a`: `A-Z, a-z`
+   * * `\*`: `A-Z, a-z, 0-9`
+   *
+   * Any character can be escaped with backslash, which usually will appear as double backslash in JS strings.
+   * For example, German phone mask with unremoveable prefix +49 will look like `mask="+4\\9 99 999 99"` or `mask={"+4\\\\9 99 999 99"}`
+   */
+  mask: string;
+  /**
+   * Character to cover unfilled editable parts of mask. Default character is "_". If set to null, unfilled parts will be empty, like in ordinary input.
+   */
+  maskChar?: string | null;
+  /**
+   * Defines format characters with characters as keys and corresponding RegExp string as values. Default ones:
+   * ```
+   * {
+   *   "9": "[0-9]",
+   *   "a": "[A-Za-z]",
+   *   "*": "[A-Za-z0-9]"
+   * }```
+   */
+  formatChars?: { [key: string]: string };
+  /**
+   * Show mask even in empty input without focus.
+   */
+  alwaysShowMask?: boolean;
+  /**
+   * Use inputRef instead of ref if you need input node to manage focus, selection, etc.
+   */
+  inputRef?: React.Ref<HTMLInputElement>;
+
+  /**
+   * In case you need to implement more complex masking behavior, you can provide
+   * beforeMaskedValueChange function to change masked value and cursor position
+   * before it will be applied to the input.
+   */
+  beforeMaskedValueChange?(
+    newState: InputState,
+    oldState: InputState,
+    userInput: string,
+    maskOptions: MaskOptions,
+  ): InputState;
+}
+
+export class ReactInputMask extends React.Component<Props> {
 }
 
 export default ReactInputMask;
diff --git a/types/react-input-mask/react-input-mask-tests.tsx b/types/react-input-mask/react-input-mask-tests.tsx
index a34b15ac99..93c6b1f638 100644
--- a/types/react-input-mask/react-input-mask-tests.tsx
+++ b/types/react-input-mask/react-input-mask-tests.tsx
@@ -4,10 +4,10 @@ import * as React from 'react';
 let ref: HTMLInputElement | null = null;
 
 <div>
-    <ReactInputMask mask="+4\9 99 999 99" maskChar={null} />
-    <ReactInputMask mask="+7 (999) 999-99-99" />
-    <ReactInputMask mask="99-99-9999" defaultValue= "13-00-2017" />
-    <ReactInputMask mask="99/99/9999" placeholder= "Enter birthdate" />
-    <ReactInputMask mask="+7 (999) 999-99-99" />
-    <ReactInputMask mask="+7 (999) 999-99-99" inputRef={(node) => ref = node} />
+  <ReactInputMask mask="+4\9 99 999 99" maskChar={null} />
+  <ReactInputMask mask="+7 (999) 999-99-99" />
+  <ReactInputMask mask="99-99-9999" defaultValue="13-00-2017" />
+  <ReactInputMask mask="99/99/9999" placeholder="Enter birthdate" />
+  <ReactInputMask mask="+7 (999) 999-99-99" />
+  <ReactInputMask mask="+7 (999) 999-99-99" inputRef={(node) => ref = node} />
 </div>;
diff --git a/types/react-input-mask/tslint.json b/types/react-input-mask/tslint.json
index 3db14f85ea..f93cf8562a 100644
--- a/types/react-input-mask/tslint.json
+++ b/types/react-input-mask/tslint.json
@@ -1 +1,3 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-input-mask/v1/index.d.ts b/types/react-input-mask/v1/index.d.ts
new file mode 100644
index 0000000000..c09719f871
--- /dev/null
+++ b/types/react-input-mask/v1/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for react-input-mask 1.2
+// Project: https://github.com/sanniassin/react-input-mask
+// Definitions by: Alexandre Paré <https://github.com/apare>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+declare namespace ReactInputMask {
+    interface Props extends React.InputHTMLAttributes<HTMLInputElement> {
+        /**
+         * Mask string. Format characters are:
+         * * `9`: `0-9`
+         * * `a`: `A-Z, a-z`
+         * * `\*`: `A-Z, a-z, 0-9`
+         *
+         * Any character can be escaped with backslash, which usually will appear as double backslash in JS strings.
+         * For example, German phone mask with unremoveable prefix +49 will look like `mask="+4\\9 99 999 99"` or `mask={"+4\\\\9 99 999 99"}`
+         */
+        mask: string;
+        /**
+         * Character to cover unfilled editable parts of mask. Default character is "_". If set to null, unfilled parts will be empty, like in ordinary input.
+         */
+        maskChar?: string | null;
+        /**
+         * Defines format characters with characters as keys and corresponding RegExp string as values. Default ones:
+         * ```
+         * {
+         *   "9": "[0-9]",
+         *   "a": "[A-Za-z]",
+         *   "*": "[A-Za-z0-9]"
+         * }```
+         */
+        formatChars?: { [key: string]: string };
+        /**
+         * Show mask even in empty input without focus.
+         */
+        alwaysShowMask?: boolean;
+        /**
+         * Use inputRef instead of ref if you need input node to manage focus, selection, etc.
+         */
+        inputRef?: React.Ref<HTMLInputElement>;
+    }
+}
+
+declare class ReactInputMask extends React.Component<ReactInputMask.Props> {
+}
+
+export default ReactInputMask;
diff --git a/types/react-input-mask/v1/react-input-mask-tests.tsx b/types/react-input-mask/v1/react-input-mask-tests.tsx
new file mode 100644
index 0000000000..a34b15ac99
--- /dev/null
+++ b/types/react-input-mask/v1/react-input-mask-tests.tsx
@@ -0,0 +1,13 @@
+import ReactInputMask from 'react-input-mask';
+import * as React from 'react';
+
+let ref: HTMLInputElement | null = null;
+
+<div>
+    <ReactInputMask mask="+4\9 99 999 99" maskChar={null} />
+    <ReactInputMask mask="+7 (999) 999-99-99" />
+    <ReactInputMask mask="99-99-9999" defaultValue= "13-00-2017" />
+    <ReactInputMask mask="99/99/9999" placeholder= "Enter birthdate" />
+    <ReactInputMask mask="+7 (999) 999-99-99" />
+    <ReactInputMask mask="+7 (999) 999-99-99" inputRef={(node) => ref = node} />
+</div>;
diff --git a/types/react-input-mask/v1/tsconfig.json b/types/react-input-mask/v1/tsconfig.json
new file mode 100644
index 0000000000..fddba7dc87
--- /dev/null
+++ b/types/react-input-mask/v1/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "react-input-mask": ["react-input-mask/v1"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "react-input-mask-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-input-mask/v1/tslint.json b/types/react-input-mask/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-input-mask/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-intl-redux/index.d.ts b/types/react-intl-redux/index.d.ts
index daa5dd9926..9d9e805df9 100644
--- a/types/react-intl-redux/index.d.ts
+++ b/types/react-intl-redux/index.d.ts
@@ -4,7 +4,7 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
-import { Action } from "redux"
+import { Action, AnyAction } from "redux"
 import { Provider as ReduxProvider } from "react-redux"
 import { IntlProvider as ReactIntlProvider } from "react-intl"
 
@@ -20,4 +20,4 @@ interface IntlAction extends Action {
 export function intlReducer(state: IntlState, action: IntlAction): IntlState
 export function updateIntl (opts: IntlState): IntlAction
 export class IntlProvider extends ReactIntlProvider {}
-export class Provider extends ReduxProvider {}
+export class Provider<A extends Action = AnyAction> extends ReduxProvider<A> {}
diff --git a/types/react-intl-redux/react-intl-redux-tests.tsx b/types/react-intl-redux/react-intl-redux-tests.tsx
index 2c3e55fffa..5e74b515cc 100644
--- a/types/react-intl-redux/react-intl-redux-tests.tsx
+++ b/types/react-intl-redux/react-intl-redux-tests.tsx
@@ -1,6 +1,7 @@
 import * as React from "react"
 import { render } from "react-dom"
 import { Provider, IntlProvider, IntlState, IntlAction, intlReducer, updateIntl } from "react-intl-redux"
+import { createStore } from "redux"
 
 var action: IntlAction = updateIntl({ locale : "en", messages : {} })
 var state: IntlState = intlReducer({ locale : "en", messages : {} }, action)
@@ -13,7 +14,7 @@ render(
 )
 
 render(
-    <Provider>
+    <Provider store={createStore(intlReducer)}>
         <div>Test</div>
     </Provider>,
     document.getElementById("main")
diff --git a/types/react-intl/index.d.ts b/types/react-intl/index.d.ts
index d33b014e36..c1dff99d71 100644
--- a/types/react-intl/index.d.ts
+++ b/types/react-intl/index.d.ts
@@ -9,7 +9,7 @@
 //                 Krister Kari <https://github.com/kristerkari>
 //                 Martin Raedlinger <https://github.com/formatlos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare namespace ReactIntl {
     type DateSource = Date | string | number;
@@ -28,10 +28,8 @@ declare namespace ReactIntl {
         withRef?: boolean;
     }
 
-    type ComponentConstructor<P> = React.ComponentClass<P> | React.StatelessComponent<P>;
-
-    function injectIntl<P>(component: ComponentConstructor<P & InjectedIntlProps>, options?: InjectIntlConfig):
-        React.ComponentClass<P> & { WrappedComponent: ComponentConstructor<P & InjectedIntlProps> };
+    function injectIntl<P extends InjectedIntlProps>(component: React.ComponentType<P>, options?: InjectIntlConfig):
+        React.ComponentClass<Pick<P, Exclude<keyof P, keyof InjectedIntlProps>>> & { WrappedComponent: React.ComponentType<P> };
 
     function addLocaleData(data: Locale[] | Locale): void;
 
diff --git a/types/react-intl/react-intl-tests.tsx b/types/react-intl/react-intl-tests.tsx
index 2ed6eb0d98..b69c59bd74 100644
--- a/types/react-intl/react-intl-tests.tsx
+++ b/types/react-intl/react-intl-tests.tsx
@@ -4,6 +4,7 @@
  */
 
 import * as React from "react";
+import * as PropTypes from "prop-types";
 import * as reactMixin from "react-mixin";
 
 import {
@@ -31,7 +32,7 @@ interface SomeComponentProps {
     className: string;
 }
 
-const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps> = injectIntl<SomeComponentProps>(({
+const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps> = injectIntl<SomeComponentProps & InjectedIntlProps>(({
     intl: {
         formatDate,
         formatHTMLMessage,
@@ -63,8 +64,9 @@ const SomeFunctionalComponentWithIntl: React.ComponentClass<SomeComponentProps>
 });
 
 class SomeComponent extends React.Component<SomeComponentProps & InjectedIntlProps> {
-    static propTypes: React.ValidationMap<any> = {
-        intl: intlShape.isRequired
+    static propTypes: React.ValidationMap<SomeComponentProps & InjectedIntlProps> = {
+        intl: intlShape.isRequired,
+        className: PropTypes.string.isRequired
     };
     render(): React.ReactElement<{}> {
         const intl = this.props.intl;
diff --git a/types/react-intl/v1/index.d.ts b/types/react-intl/v1/index.d.ts
index a891167f91..a5322844f3 100644
--- a/types/react-intl/v1/index.d.ts
+++ b/types/react-intl/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://formatjs.io/react/
 // Definitions by: Bruno Grieder <https://github.com/bgrieder>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react" />
 
diff --git a/types/react-is-deprecated/index.d.ts b/types/react-is-deprecated/index.d.ts
index 791cb97862..d5d3927177 100644
--- a/types/react-is-deprecated/index.d.ts
+++ b/types/react-is-deprecated/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Aweary/react-is-deprecated
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare module 'react-is-deprecated' {
   import { Validator, Requireable, ValidationMap, ReactPropTypes } from 'react';
diff --git a/types/react-is/index.d.ts b/types/react-is/index.d.ts
index f088b1bcc9..b0a1fd1099 100644
--- a/types/react-is/index.d.ts
+++ b/types/react-is/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://reactjs.org/
 // Definitions by: Avi Vahl <https://github.com/AviVahl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export as namespace ReactIs;
 
diff --git a/types/react-joyride/index.d.ts b/types/react-joyride/index.d.ts
index 5f15d84d66..7cc118a2f0 100644
--- a/types/react-joyride/index.d.ts
+++ b/types/react-joyride/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gilbarbara/react-joyride
 // Definitions by: Daniel Rosenwasser <https://github.com/DanielRosenwasser>, Ben Dixon <https://github.com/bendxn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-js-pagination/index.d.ts b/types/react-js-pagination/index.d.ts
new file mode 100644
index 0000000000..00f1b26a64
--- /dev/null
+++ b/types/react-js-pagination/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for react-js-pagination 3.0
+// Project: https://github.com/vayser/react-js-pagination
+// Definitions by: Ernesto Cruz <https://github.com/netoisc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+export interface ReactJsPaginationProps {
+    totalItemsCount: number;
+    onChange: (pageNumber: number) => void;
+    activePage: number;
+    itemsCountPerPage?: number;
+    pageRangeDisplayed?: number;
+    prevPageText?: string| React.ReactElement<any>;
+    nextPageText?: string | React.ReactElement<any>;
+    lastPageText?: string | React.ReactElement<any>;
+    firstPageText?: string | React.ReactElement<any>;
+    disabledClass?: string;
+    hideDisabled?: boolean;
+    hideNavigation?: boolean;
+    innerClass?: string;
+    itemClass?: string;
+    itemClassFirst?: string;
+    itemClassPrev?: string;
+    itemClassNext?: string;
+    itemClassLast?: string;
+    linkClass?: string;
+    activeClass?: string;
+    activeLinkClass?: string;
+    linkClassFirst?: string;
+    linkClassPrev?: string;
+    linkClassNext?: string;
+    linkClassLast?: string;
+    hideFirstLastPages?: boolean;
+    getPageUrl?(): string;
+}
+declare const Pagination: React.ClassicComponentClass<ReactJsPaginationProps>;
+
+export default Pagination;
diff --git a/types/react-js-pagination/react-js-pagination-tests.tsx b/types/react-js-pagination/react-js-pagination-tests.tsx
new file mode 100644
index 0000000000..d9c0a917a5
--- /dev/null
+++ b/types/react-js-pagination/react-js-pagination-tests.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import Pagination from 'react-js-pagination';
+
+class ReactPagination extends React.Component<{}, {activePage: number}> {
+	constructor(props: {}) {
+		super(props);
+		this.state = {
+			activePage: 1
+		};
+		this.handleChange = this.handleChange.bind(this);
+	}
+	handleChange(pageNumber: number) {
+		this.setState({
+			activePage: pageNumber
+		});
+	}
+	render() {
+        return (
+            <Pagination activePage={this.state.activePage} onChange={this.handleChange}
+                totalItemsCount={100}
+            />
+        );
+    }
+}
diff --git a/types/react-js-pagination/tsconfig.json b/types/react-js-pagination/tsconfig.json
new file mode 100644
index 0000000000..38a9519496
--- /dev/null
+++ b/types/react-js-pagination/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,
+        "esModuleInterop": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-js-pagination-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-js-pagination/tslint.json b/types/react-js-pagination/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-js-pagination/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-json-pretty/index.d.ts b/types/react-json-pretty/index.d.ts
index 4229ff7c3b..a34cbca5df 100644
--- a/types/react-json-pretty/index.d.ts
+++ b/types/react-json-pretty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenckang/react-json-pretty
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, HTMLProps } from "react";
 
diff --git a/types/react-json-tree/index.d.ts b/types/react-json-tree/index.d.ts
index f275070a62..f32cc61521 100644
--- a/types/react-json-tree/index.d.ts
+++ b/types/react-json-tree/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alexkuz/react-json-tree/
 // Definitions by: Grant Nestor <https://github.com/gnestor>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import {
     Component,
diff --git a/types/react-json/index.d.ts b/types/react-json/index.d.ts
index fa7eadeccc..a9ff7d6f8a 100644
--- a/types/react-json/index.d.ts
+++ b/types/react-json/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/arqex/react-json
 // Definitions by: Christoph Spielmann <https://github.com/spielc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-jsonschema-form/index.d.ts b/types/react-jsonschema-form/index.d.ts
index ef1b359e5d..9a3b54fb4b 100644
--- a/types/react-jsonschema-form/index.d.ts
+++ b/types/react-jsonschema-form/index.d.ts
@@ -5,8 +5,9 @@
 //                 Ivan Jiang <https://github.com/iplus26>
 //                 Kurt Preston <https://github.com/KurtPreston>
 //                 Philippe Bourdages <https://github.com/phbou72>
+//                 Lucian Buzzo <https://github.com/LucianBuzzo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare module "react-jsonschema-form" {
     import * as React from "react";
@@ -35,6 +36,7 @@ declare module "react-jsonschema-form" {
         >;
         safeRenderCompletion?: boolean;
         transformErrors?: (errors: AjvError[]) => AjvError[];
+        idPrefix?: string;
 
         // HTML Attributes
         id?: string;
@@ -132,8 +134,8 @@ declare module "react-jsonschema-form" {
     };
 
     export type ArrayFieldTemplateProps = {
-        DescriptionField: object;
-        TitleField: object;
+        DescriptionField: React.StatelessComponent<{ id: string, description: string | React.ReactElement<any> }>;
+        TitleField: React.StatelessComponent<{ id: string, title: string, required: boolean }>;
         canAdd: boolean;
         className: string;
         disabled: boolean;
@@ -165,8 +167,8 @@ declare module "react-jsonschema-form" {
     };
 
     export type ObjectFieldTemplateProps = {
-        DescriptionField: object;
-        TitleField: object;
+        DescriptionField: React.StatelessComponent<{ id: string, description: string | React.ReactElement<any> }>;
+        TitleField: React.StatelessComponent<{ id: string, title: string, required: boolean }>;
         title: string;
         description: string;
         properties: {
diff --git a/types/react-lazyload/index.d.ts b/types/react-lazyload/index.d.ts
index a72fdd3581..3fd9b075e4 100644
--- a/types/react-lazyload/index.d.ts
+++ b/types/react-lazyload/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jasonslyvia/react-lazyload
 // Definitions by: m0a <https://github.com/m0a>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from "react";
 
diff --git a/types/react-lazyload/react-lazyload-tests.tsx b/types/react-lazyload/react-lazyload-tests.tsx
index 3e562300b5..c6e6dddd85 100644
--- a/types/react-lazyload/react-lazyload-tests.tsx
+++ b/types/react-lazyload/react-lazyload-tests.tsx
@@ -6,14 +6,16 @@ interface State {
 }
 
 class Normal extends React.Component<{}, State> {
-    constructor() {
-        super({});
+    static createArray = (items= 200) => {
         const arr: string[] = [];
-        for (let i = 0; i < 200; i++) {
+        for (let i = 0; i < items; i++) {
             arr.push(`${i}`);
         }
-        this.state = { arr };
+        return arr;
     }
+    state = {
+        arr: Normal.createArray()
+    };
 
     componentDidMount() {
         forceCheck();
diff --git a/types/react-lazylog/build/LazyLog.d.ts b/types/react-lazylog/build/LazyLog.d.ts
new file mode 100644
index 0000000000..21b42f8030
--- /dev/null
+++ b/types/react-lazylog/build/LazyLog.d.ts
@@ -0,0 +1,28 @@
+import { Component, ReactNode, CSSProperties } from "react";
+import { Range } from "immutable";
+
+export interface LazyLogProps {
+    url: string;
+    fetchOptions?: RequestInit;
+    stream?: boolean;
+    height?: string | number;
+    width?: string | number;
+    follow?: boolean;
+    scrollToLine?: number;
+    highlight?: number | number[];
+    selectableLines?: boolean;
+    formatPart?: (text: string) => ReactNode;
+    onLoad?: () => any;
+    onError?: (error: any) => any;
+    onHighlight?: (range: Range) => any;
+    rowHeight?: number;
+    overscanRowCount?: number;
+    containerStyle?: CSSProperties;
+    style?: CSSProperties;
+}
+
+export class LazyLog extends Component<LazyLogProps> {
+    static defaultProps: Partial<LazyLogProps>;
+}
+
+export default LazyLog;
diff --git a/types/react-lazylog/build/Line.d.ts b/types/react-lazylog/build/Line.d.ts
new file mode 100644
index 0000000000..85c3444289
--- /dev/null
+++ b/types/react-lazylog/build/Line.d.ts
@@ -0,0 +1,22 @@
+import { Component, ReactNode, CSSProperties, MouseEventHandler } from "react";
+
+export interface LineProps {
+    data: Array<{ text: string }>;
+    number: number;
+    rowHeight: number;
+    highlight?: boolean;
+    selectable?: boolean;
+    style?: CSSProperties;
+    formatPart?: (text: string) => ReactNode;
+    onLineNumberClick?: MouseEventHandler<HTMLAnchorElement>;
+
+    /**
+     * This is never called
+     * https://github.com/mozilla-frontend-infra/react-lazylog/issues/18
+     */
+    onRowClick?: () => any;
+}
+
+export default class Line extends Component<LineProps> {
+    static defaultProps: Partial<LineProps>;
+}
diff --git a/types/react-lazylog/build/LineContent.d.ts b/types/react-lazylog/build/LineContent.d.ts
new file mode 100644
index 0000000000..1bece45340
--- /dev/null
+++ b/types/react-lazylog/build/LineContent.d.ts
@@ -0,0 +1,12 @@
+import { Component, ReactNode, CSSProperties } from "react";
+
+export interface LineContentProps {
+    data: Array<{ text: string }>;
+    number: number;
+    formatPart?: (text: string) => ReactNode;
+    style?: CSSProperties;
+}
+
+export default class LineContent extends Component<LineContentProps> {
+    static defaultProps: Partial<LineContentProps>;
+}
diff --git a/types/react-lazylog/build/LineNumber.d.ts b/types/react-lazylog/build/LineNumber.d.ts
new file mode 100644
index 0000000000..4a7aa396d4
--- /dev/null
+++ b/types/react-lazylog/build/LineNumber.d.ts
@@ -0,0 +1,12 @@
+import { Component, ReactNode, CSSProperties, MouseEventHandler } from "react";
+
+export interface LineNumberProps {
+    number: number;
+    highlight?: boolean;
+    onClick?: MouseEventHandler<HTMLAnchorElement>;
+    style?: CSSProperties;
+}
+
+export default class LinePart extends Component<LineNumberProps> {
+    static defaultProps: Partial<LineNumberProps>;
+}
diff --git a/types/react-lazylog/build/LinePart.d.ts b/types/react-lazylog/build/LinePart.d.ts
new file mode 100644
index 0000000000..4b0ff946a2
--- /dev/null
+++ b/types/react-lazylog/build/LinePart.d.ts
@@ -0,0 +1,11 @@
+import { Component, ReactNode, CSSProperties } from "react";
+
+export interface LinePartProps {
+    part: { text: string };
+    format?: (text: string) => ReactNode;
+    style?: CSSProperties;
+}
+
+export default class LinePart extends Component<LinePartProps> {
+    static defaultProps: Partial<LinePartProps>;
+}
diff --git a/types/react-lazylog/build/Loading.d.ts b/types/react-lazylog/build/Loading.d.ts
new file mode 100644
index 0000000000..45d1f38f15
--- /dev/null
+++ b/types/react-lazylog/build/Loading.d.ts
@@ -0,0 +1,3 @@
+import { Component } from "react";
+
+export default class Loading extends Component {}
diff --git a/types/react-lazylog/build/ScrollFollow.d.ts b/types/react-lazylog/build/ScrollFollow.d.ts
new file mode 100644
index 0000000000..c2da7f0fb2
--- /dev/null
+++ b/types/react-lazylog/build/ScrollFollow.d.ts
@@ -0,0 +1,19 @@
+import { Component, ReactNode } from "react";
+
+export interface ScrollFollowRenderProps {
+    onScroll: (
+        args: { scrollTop: number; scrollHeight: number; clientHeight: number }
+    ) => void;
+    follow: boolean;
+    startFollowing: () => void;
+    stopFollowing: () => void;
+}
+
+export interface ScrollFollowProps {
+    render: (props: ScrollFollowRenderProps) => ReactNode;
+    startFollowing?: boolean;
+}
+
+export class ScrollFollow extends Component<ScrollFollowProps> {}
+
+export default ScrollFollow;
diff --git a/types/react-lazylog/index.d.ts b/types/react-lazylog/index.d.ts
new file mode 100644
index 0000000000..7f180b425a
--- /dev/null
+++ b/types/react-lazylog/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for react-lazylog 3.1
+// Project: https://github.com/mozilla-frontend-infra/react-lazylog
+// Definitions by: Benjamin Romano <https://github.com/benjaminRomano>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export * from "./build/LazyLog";
+export * from "./build/ScrollFollow";
diff --git a/types/react-lazylog/package.json b/types/react-lazylog/package.json
new file mode 100644
index 0000000000..c658c73862
--- /dev/null
+++ b/types/react-lazylog/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "immutable": ">=3.8.2"
+    }
+}
diff --git a/types/react-lazylog/react-lazylog-tests.tsx b/types/react-lazylog/react-lazylog-tests.tsx
new file mode 100644
index 0000000000..3c66c82b55
--- /dev/null
+++ b/types/react-lazylog/react-lazylog-tests.tsx
@@ -0,0 +1,38 @@
+import * as React from "react";
+import LinePart, { LinePartProps } from "react-lazylog/build/LinePart";
+import LineNumber, { LineNumberProps } from "react-lazylog/build/LineNumber";
+import LineContent, { LineContentProps } from "react-lazylog/build/LineContent";
+import Line, { LineProps } from "react-lazylog/build/Line";
+import Loading from "react-lazylog/build/Loading";
+import {
+    LazyLog,
+    LazyLogProps,
+    ScrollFollow,
+    ScrollFollowProps,
+    ScrollFollowRenderProps
+} from "react-lazylog";
+
+LinePart.defaultProps.style = { color: "green" };
+const linePart = <LinePart part={{ text: "log" }} />;
+
+LineNumber.defaultProps.style = { color: "green" };
+const lineNumber = <LineNumber number={5} />;
+
+LineContent.defaultProps.style = { color: "green" };
+const lineContent = <LineContent number={5} data={[{ text: "hello" }]} />;
+
+Line.defaultProps.style = { color: "green" };
+const line = <Line number={5} data={[{ text: "hello" }]} rowHeight={10} />;
+
+const loading = <Loading />;
+
+const scrollFollow = (
+    <ScrollFollow
+        render={({ follow, onScroll, startFollowing, stopFollowing }) => (
+            <div />
+        )}
+    />
+);
+
+LazyLog.defaultProps.style = { color: "green" };
+const lazyLog = <LazyLog url={"https://google.com/log.txt"} />;
diff --git a/types/react-lazylog/tsconfig.json b/types/react-lazylog/tsconfig.json
new file mode 100644
index 0000000000..856e2e40aa
--- /dev/null
+++ b/types/react-lazylog/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": [
+        "react-lazylog-tests.tsx",
+        "index.d.ts",
+        "build/Line.d.ts",
+        "build/LineContent.d.ts",
+        "build/LineNumber.d.ts",
+        "build/LinePart.d.ts",
+        "build/Loading.d.ts"
+    ]
+}
diff --git a/types/react-lazylog/tslint.json b/types/react-lazylog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-lazylog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-leaflet/index.d.ts b/types/react-leaflet/index.d.ts
index 48a98bfbca..c362a1f23c 100644
--- a/types/react-leaflet/index.d.ts
+++ b/types/react-leaflet/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/PaulLeCam/react-leaflet
 // Definitions by: Dave Leaver <https://github.com/danzel>, David Schneider <https://github.com/davschne>, Yui T. <https://github.com/yuit>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as Leaflet from 'leaflet';
 import * as React from 'react';
diff --git a/types/react-list/index.d.ts b/types/react-list/index.d.ts
index 77559988da..60beba5403 100644
--- a/types/react-list/index.d.ts
+++ b/types/react-list/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/orgsync/react-list
 // Definitions by: Yifei Yan <https://github.com/buptyyf>, Tom Shen <https://github.com/tomshen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import {
     Component,
diff --git a/types/react-loadable/index.d.ts b/types/react-loadable/index.d.ts
index b673d9b480..b27a4de764 100644
--- a/types/react-loadable/index.d.ts
+++ b/types/react-loadable/index.d.ts
@@ -6,7 +6,7 @@
 //                 Tomek Łaziuk <https://github.com/tlaziuk>
 //                 Ian Mobley <https://github.com/iMobs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-loader/index.d.ts b/types/react-loader/index.d.ts
index 2d8f7a99a0..70fc957e2a 100644
--- a/types/react-loader/index.d.ts
+++ b/types/react-loader/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/quickleft/react-loader
 // Definitions by: Sudarsan Balaji <https://github.com/artfuldev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 
diff --git a/types/react-mailchimp-subscribe/index.d.ts b/types/react-mailchimp-subscribe/index.d.ts
index 558c6a92cd..55b5c487ed 100644
--- a/types/react-mailchimp-subscribe/index.d.ts
+++ b/types/react-mailchimp-subscribe/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://revolunet.github.io/react-mailchimp-subscribe/
 // Definitions by: Omar Diab <https://github.com/osdiab>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactNode } from "react";
 
diff --git a/types/react-map-gl/index.d.ts b/types/react-map-gl/index.d.ts
index 9dd7584f5f..2260644d32 100644
--- a/types/react-map-gl/index.d.ts
+++ b/types/react-map-gl/index.d.ts
@@ -1,354 +1,85 @@
-// Type definitions for react-map-gl 3.2
+// Type definitions for react-map-gl 3.3
 // Project: https://github.com/uber/react-map-gl#readme
 // Definitions by: Robert Imig <https://github.com/rimig>
+//                 Fabio Berta <https://github.com/fnberta>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
-import * as React from "react";
-import * as MapboxGL from "mapbox-gl";
-import * as GeoJSON from "geojson";
-
-export type EasingFunction = (t: number) => number;
+import * as React from 'react';
+import * as MapboxGL from 'mapbox-gl';
+import * as GeoJSON from 'geojson';
 
 export interface Viewport {
-  latitude: number;
-  longitude: number;
-  zoom: number;
-  isDragging?: boolean;
-  bearing?: number;
-  pitch?: number;
-  startBearing?: number;
-  startDragLngLat?: number[];
-  startPitch?: number;
-  transitionDuration?: number;
-  transitionInterpolator?: TransitionInterpolator;
-  transitionInterruption?: number;
-  transitionEasing?: EasingFunction;
+    latitude: number;
+    longitude: number;
+    zoom: number;
+    bearing?: number;
+    pitch?: number;
 }
 
 export interface MapError {
-  message: string;
+    message: string;
 }
 
 export interface MapRequest {
-  url: string;
-  headers: {};
-  credentials: string;
+    url: string;
+    headers: {};
+    credentials: string;
 }
 
-export interface StaticMapProps extends Viewport {
-    /**
-     *  Mapbox API access token for MapboxGL.
-     *  Required when using Mapbox vector tiles/styles Mapbox WebGL context creation option.
-     *  Useful when you want to export the canvas as a PNG
-     */
+export interface MapboxProps extends Partial<Viewport> {
+    container?: {};
     mapboxApiAccessToken: string;
-
-    /** The Mapbox style. A string url or a MapboxGL style object (regular JS object or Immutable.Map). */
-    mapStyle?: string | {}; // TODO can also be immutable map
-
-    /** The width of the map. */
-    width: number;
-    /** The height of the map. */
-    height: number;
-    /** The latitude of the center of the map. */
-
-    /** Altitude of the viewport camera. Default 1.5 "screen heights" */
-    altitude?: number; // Note: Non-public API, see https://github.com/mapbox/mapbox-gl-js/issues/1137
-
-    /**
-     *  Whether the map is visible.
-     *  Unmounting and re-mounting a Mapbox instance is known to be costly.
-     *  This option offers a way to hide a map using CSS style.
-     */
-    visible?: boolean;
-
-    /**
-     * Equivalent to Mapbox's preserveDrawingBuffer option.
-     * If true, the map's canvas can be exported to a PNG using map.getCanvas().toDataURL().
-     */
-    preserveDrawingBuffer?: boolean;
-
-    /** Show attribution control or not. */
     attributionControl?: boolean;
-
-    /**
-     * If mapStyle is assigned an Immutable object, when the prop changes,
-     * StaticMap can diff between the two values and call the appropriate Mapbox API such as
-     * addLayer, removeLayer, setStyle, setData, etc.
-     *
-     * This allows apps to update data sources and layer styles efficiently.
-     * In use cases such as animation or dynamic showing/hiding layers, style diffing prevents the map
-     * from reloading and flickering when the map style changes.
-     *
-     * There are known issues with style diffing. As stopgap, use this option to prevent style diffing.
-     */
-    preventStyleDiffing?: boolean;
-
-    /**
-     * This prop is experimental.
-     * If true, when the map component is unmounted, instead of calling remove on the Mapbox map instance, save it for later reuse.
-     * This will avoid repeatedly creating new Mapbox map instances if possible.
-     * Applications that frequently mount and unmount maps may try this prop to help work around a mapbox-gl resource leak issue that can lead to a browser crash in certain situations.
-     */
-    resuseMaps?: boolean;
-
-    /**
-     * A callback run when the map emits a load event.
-     */
+    preserveDrawingBuffer?: boolean;
     onLoad?: () => void;
-
-    /**
-     * A callback run when the map emits an error event.
-     */
     onError?: (e: MapError) => void;
-
+    resuseMaps?: boolean;
+    resuseMap?: boolean;
     transformRequest?: () => MapRequest;
+
+    mapStyle?: string | {};
+
+    width: number;
+    height: number;
+
+    viewState?: Viewport;
+
+    altitude?: number; // Note: Non-public API, see https://github.com/mapbox/mapbox-gl-js/issues/1137
+}
+
+export interface StaticMapProps extends MapboxProps {
+    preventStyleDiffing?: boolean;
+    visible?: boolean;
+    className?: string;
 }
 
 export interface QueryRenderedFeaturesParams {
-  layers?: string[];
-  filter?: any[];
+    layers?: string[];
+    filter?: any[];
 }
 
 export class StaticMap extends React.Component<StaticMapProps> {
-    /**
-     * Returns the Mapbox instance if initialized. The Map instance will have full access to MapboxGL's API.
-     */
     getMap(): MapboxGL.Map;
-
-    /**
-     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box.
-     * If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
-     */
     queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: QueryRenderedFeaturesParams): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
 }
 
 export interface InteractiveMapState {
-  isDragging: boolean;
-  isHovering: boolean;
+    isDragging: boolean;
+    isHovering: boolean;
 }
 
 export interface MapEvent {
-  lngLat: [number, number];
-  features: Array<{}>;
+    lngLat: [number, number];
+    features: Array<{}>;
 }
 
-export interface InteractiveMapProps extends StaticMapProps {
-    /** Max zoom level */
-    maxZoom?: number;
-    /** Min zoom level */
-    minZoom?: number;
-    /** Max pitch in degrees */
-    maxPitch?: number;
-    /** Min pitch in degrees */
-    minPitch?: number;
-
-    /** Scroll to zoom */
-    scrollZoom?: boolean;
-    /** Drag to pan */
-    dragPan?: boolean;
-    /** Drag to rotate */
-    dragRotate?: boolean;
-    /** Double click to zoom */
-    doubleClickZoom?: boolean;
-    /** Enable multitouch zoom. */
-    touchZoom?: boolean;
-    /** Enable multitouch rotate. */
-    touchRotate?: boolean;
-    /** Radius to detect features around a clicked point */
-    clickRadius?: number;
-
-    mapControls?: {
-      events: string[];
-      handleEvent: (event: MapEvent, context: any) => void;
-    };
-
-    visibilityConstraints?: {
-      minZoom: number;
-      maxZoom: number;
-      minPitch: number;
-      maxPitch: number;
-    };
-
-    /**
-     * Callback that is fired when the user interacted with the map.
-     * The object passed to the callback contains viewport properties such as longitude, latitude, zoom etc.
-     *
-     * If the map is intended to be interactive, the app use this prop to listen to map updates and update the props accordingly.
-     */
-    onViewportChange?: (viewport: Viewport) => void;
-
-    /**
-     * Called when the map is hovered over.
-     * event - The mouse event.
-     * lngLat - The coordinates of the pointer
-     * features - The features under the pointer, using Mapbox's
-     * queryRenderedFeatures API:
-     * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
-     * To make a layer interactive, set the `interactive` property in the
-     * layer style to `true`. See Mapbox's style spec
-     * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
-     */
-    onHover?: (event: MapEvent, lngLat: number[], features: any) => void;
-
-    /**
-     * Called when the map is clicked.
-     * queryRenderedFeatures API:
-     * https://www.mapbox.com/mapbox-gl-js/api/#Map#queryRenderedFeatures
-     * To make a layer interactive, set the `interactive` property in the
-     * layer style to `true`. See Mapbox's style spec
-     * https://www.mapbox.com/mapbox-gl-style-spec/#layer-interactive
-     */
-    onClick?: (event: MapEvent, lngLat: number[], features: any) => void;
-
-    /** Accessor that returns a cursor style to show interactive state */
-    getCursor?: (state: InteractiveMapState) => void;
-
-    onTransitionStart?: () => void;
-    onTransitionInterrupt?: () => void;
-    onTransitionEnd?: () => void;
-}
-
-export class InteractiveMap extends React.Component<InteractiveMapProps> {
-    /** Returns the Mapbox Map Instance */
-    getMap(): MapboxGL.Map;
-
-    /**
-     * Use Mapbox's queryRenderedFeatures API to find features at point or in a bounding box.
-     * If the parameters argument is not specified, only queries the layers with the interactive property in the layer style.
-     */
-    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: QueryRenderedFeaturesParams): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
-}
-
-export default InteractiveMap;
-
-/**
- *
- * React Map Overlays
- *
- */
-
-export interface BaseControlProps {
-    /** Event handling */
-    captureScroll?: boolean;
-    /** Stop map pan & rotate */
-    captureDrag?: boolean;
-    /** Stop map click */
-    captureClick?: boolean;
-    /** Stop map double click */
-    captureDoubleClick?: boolean;
-}
-
-export class BaseControl<T extends BaseControlProps> extends React.Component<T> { }
-
-/**
- * Allows applications to overlay data on top of maps using a HTML container.
- */
-export class HTMLOverlay extends BaseControl<HTMLOverlayProps> { }
-
-export interface HTMLRedrawOptions {
-    /** width {Number} - width of the viewport */
-    width: number;
-    /** height {Number} - height of the viewport */
-    height: number;
-    /** project {Function} - get screen position [x, y] from geo coordinates [lng, lat] */
-    project: (lnglat: number[]) => number[];
-    /** unproject {Function} - get geo coordinates [lng, lat] from screen position [x, y] */
-    unproject: (xy: number[]) => number[];
-}
-
-export interface HTMLOverlayProps extends BaseControlProps {
-    /**
-     * Called every time the map updates.
-     */
-    redraw: (opts: HTMLRedrawOptions) => void;
-    /** Additional css styles of the div container. */
-    style?: React.CSSProperties;
-}
-
-/**
- * Allows applications to overlay data on top of maps using a canvas.
- */
-export class CanvasOverlay extends BaseControl<CanvasOverlayProps> { }
-
-export interface CanvasRedrawOptions extends HTMLRedrawOptions {
-    /** ctx {CanvasRenderingContext2D} - rendering context of the canvas */
-    ctx: CanvasRenderingContext2D;
-}
-
-export interface CanvasOverlayProps extends BaseControlProps {
-    /**
-     * Called every time the map updates.
-     */
-    redraw: (opts: CanvasRedrawOptions) => void;
-}
-
-/**
- * Allows applications to overlay data on top of maps using a SVG container.
- */
-export class SVGOverlay extends BaseControl<SVGOverlayProps> { }
-
-// tslint:disable-next-line:no-empty-interface
-export interface SVGRedrawOptions extends HTMLRedrawOptions { }
-
-export interface SVGOverlayProps extends BaseControlProps {
-    /**
-     * Called every time the map updates.
-     */
-    redraw: (opts: SVGRedrawOptions) => void;
-    /** Additional css styles of the svg container. */
-    style?: React.CSSProperties;
-}
-
-export interface MarkerProps extends BaseControlProps {
-    className?: string;
-    longitude: number;
-    latitude: number;
-    offsetLeft?: number;
-    offsetTop?: number;
-  }
-
-  export class Marker extends BaseControl<MarkerProps> {}
-
-  export interface PopupProps extends BaseControlProps {
-    className?: string;
-    longitude: number;
-    latitude: number;
-    offsetLeft?: number;
-    offsetTop?: number;
-    tipSize?: number;
-    closeButton?: boolean;
-    closeOnClick?: boolean;
-    anchor?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right' | 'left' | 'right';
-    dynamicPosition?: boolean;
-    onClose?: () => void;
-  }
-
-  export class Popup extends BaseControl<PopupProps> {}
-
-  export interface NavigationControlProps extends BaseControlProps {
-    onViewportChange: (viewport: Viewport) => void;
-    showZoom?: boolean;
-    showCompass?: boolean;
-  }
-
-  export class NavigationControl extends BaseControl<NavigationControlProps> {}
-
-  export class TransitionInterpolator {}
-
-  export class LinearInterpolator extends TransitionInterpolator {
-    constructor(transitionProps?: string[]);
-  }
-
-  export class FlyToInterpolator extends TransitionInterpolator {}
-
-  export interface Center {
+export interface Center {
     x: number;
     y: number;
-  }
+}
 
-  export interface MapControlEvent {
+export interface MapControlEvent {
     type: string;
     center: Center;
     offsetCenter: Center;
@@ -360,36 +91,50 @@ export interface MarkerProps extends BaseControlProps {
     rightButton?: boolean;
     pointerType?: string;
     delta?: number;
-  }
+}
 
-  export interface MapState {
-    width: number;
-    height: number;
-    latitude: number;
-    longitude: number;
-    zoom: number;
-    bearing?: number;
-    pitch?: number;
-    altitude?: number;
+export interface BaseMapControls {
+    events: string[];
+    handleEvent(event: MapControlEvent): void;
+}
+
+export type EasingFunction = (t: number) => number;
+
+export enum TRANSITION_EVENTS {
+    BREAK = 1,
+    SNAP_TO_END = 2,
+    IGNORE = 3
+}
+
+export class TransitionInterpolator {}
+
+export class LinearInterpolator extends TransitionInterpolator {
+    constructor(transitionProps?: string[]);
+}
+
+export class FlyToInterpolator extends TransitionInterpolator {}
+
+export interface ViewStateChangeInfo {
+  viewState: Viewport;
+}
+
+export interface InteractiveMapProps extends StaticMapProps {
     maxZoom?: number;
     minZoom?: number;
     maxPitch?: number;
     minPitch?: number;
-    startPanLngLat?: [number, number];
-    startZoomLngLat?: [number, number];
-    startBearing?: number;
-    startPitch?: number;
-    startZoom?: number;
-  }
 
-  export interface Options {
-    // TODO(deprecate): remove this when `onChangeViewport` gets deprecated
-    onChangeViewport?: (viewport: Viewport) => void;
-    // TODO(deprecate): remove this when `touchZoomRotate` gets deprecated
-    touchZoomRotate?: boolean;
     onViewportChange?: (viewport: Viewport) => void;
-    onStateChange?: (state: MapState) => void;
-    eventManager?: any;
+    onViewStateChange?: (info: ViewStateChangeInfo) => void;
+
+    transitionDuration?: number;
+    transitionInterpolator?: TransitionInterpolator;
+    transitionInterruption?: TRANSITION_EVENTS;
+    transitionEasing?: EasingFunction;
+    onTransitionStart?: () => void;
+    onTransitionInterrupt?: () => void;
+    onTransitionEnd?: () => void;
+
     scrollZoom?: boolean;
     dragPan?: boolean;
     dragRotate?: boolean;
@@ -397,22 +142,167 @@ export interface MarkerProps extends BaseControlProps {
     touchZoom?: boolean;
     touchRotate?: boolean;
     keyboard?: boolean;
-  }
 
-  export class MapControls {
-    events: string[];
-    handleEvent: (event: MapControlEvent) => void;
-    getMapState(overrides: Partial<MapState>): MapState;
-    setOptions(options: Options): void;
-    setState(newState: MapState): void;
-    updateViewport(newMapState: MapState, extraProps: any, extraState: InteractiveMapState): void;
-  }
+    onHover?: (event: MapEvent, lngLat: number[], features: any) => void;
+    onClick?: (event: MapEvent, lngLat: number[], features: any) => void;
 
-  export function autobind(obj: any): void;
+    onContextMenu?: (event: MapEvent) => void;
 
-  export interface Experimental {
-    MapControls: MapControls;
-    autobind: typeof autobind;
-  }
+    touchAction?: string;
 
-  export const experimental: Experimental;
+    clickRadius?: number;
+
+    getCursor?: (state: InteractiveMapState) => void;
+
+    visibilityConstraints?: {
+        minZoom?: number;
+        maxZoom?: number;
+        minPitch?: number;
+        maxPitch?: number;
+    };
+
+    mapControls?: BaseMapControls;
+}
+
+export class InteractiveMap extends React.Component<InteractiveMapProps> {
+    getMap(): MapboxGL.Map;
+    queryRenderedFeatures(geometry?: MapboxGL.PointLike | MapboxGL.PointLike[], parameters?: QueryRenderedFeaturesParams): Array<GeoJSON.Feature<GeoJSON.GeometryObject>>;
+}
+
+export default InteractiveMap;
+
+export interface BaseControlProps {
+    captureScroll?: boolean;
+    captureDrag?: boolean;
+    captureClick?: boolean;
+    captureDoubleClick?: boolean;
+}
+
+export class BaseControl<T extends BaseControlProps> extends React.Component<T> {}
+
+export interface MarkerProps extends BaseControlProps {
+    className?: string;
+    longitude: number;
+    latitude: number;
+    offsetLeft?: number;
+    offsetTop?: number;
+}
+
+export class Marker extends BaseControl<MarkerProps> {}
+
+export interface PopupProps extends BaseControlProps {
+    className?: string;
+    longitude: number;
+    latitude: number;
+    offsetLeft?: number;
+    offsetTop?: number;
+    tipSize?: number;
+    closeButton?: boolean;
+    closeOnClick?: boolean;
+    anchor?: 'top' | 'top-left' | 'top-right' | 'bottom' | 'bottom-left' | 'bottom-right' | 'left' | 'right';
+    dynamicPosition?: boolean;
+    onClose?: () => void;
+}
+
+export class Popup extends BaseControl<PopupProps> {}
+
+export interface NavigationControlProps extends BaseControlProps {
+    className?: string;
+    onViewStateChange: (info: ViewStateChangeInfo) => void;
+    onViewportChange: (viewport: Viewport) => void;
+    showCompass?: boolean;
+    showZoom?: boolean;
+}
+
+export class NavigationControl extends BaseControl<NavigationControlProps> {}
+
+export interface HTMLRedrawOptions {
+    width: number;
+    height: number;
+    project: (lnglat: number[]) => number[];
+    unproject: (xy: number[]) => number[];
+}
+
+export interface HTMLOverlayProps extends BaseControlProps {
+    redraw: (opts: HTMLRedrawOptions) => void;
+    style?: React.CSSProperties;
+}
+
+export class HTMLOverlay extends BaseControl<HTMLOverlayProps> {}
+
+export interface CanvasRedrawOptions extends HTMLRedrawOptions {
+    ctx: CanvasRenderingContext2D;
+}
+
+export interface CanvasOverlayProps extends BaseControlProps {
+    redraw: (opts: CanvasRedrawOptions) => void;
+}
+
+export class CanvasOverlay extends BaseControl<CanvasOverlayProps> {}
+
+export type SVGRedrawOptions = HTMLRedrawOptions;
+
+export interface SVGOverlayProps extends BaseControlProps {
+    redraw: (opts: SVGRedrawOptions) => void;
+    style?: React.CSSProperties;
+}
+
+export class SVGOverlay extends BaseControl<SVGOverlayProps> {}
+
+export namespace experimental {
+    interface Options {
+        // TODO(deprecate): remove this when `onChangeViewport` gets deprecated
+        onChangeViewport?: (viewport: Viewport) => void;
+        // TODO(deprecate): remove this when `touchZoomRotate` gets deprecated
+        touchZoomRotate?: boolean;
+
+        onViewStateChange?: (info: ViewStateChangeInfo) => void;
+        onViewportChange?: (viewport: Viewport) => void;
+        onStateChange?: (state: MapState) => void;
+        eventManager?: any;
+        scrollZoom?: boolean;
+        dragPan?: boolean;
+        dragRotate?: boolean;
+        doubleClickZoom?: boolean;
+        touchZoom?: boolean;
+        touchRotate?: boolean;
+        keyboard?: boolean;
+    }
+
+    class MapState implements Viewport {
+        width: number;
+        height: number;
+        latitude: number;
+        longitude: number;
+        zoom: number;
+        bearing?: number;
+        pitch?: number;
+        altitude?: number;
+
+        maxZoom?: number;
+        minZoom?: number;
+        maxPitch?: number;
+        minPitch?: number;
+
+        transitionDuration?: number;
+        transitionInterpolator?: TransitionInterpolator;
+        transitionInterruption?: TRANSITION_EVENTS;
+        transitionEasing?: EasingFunction;
+
+        startPanLngLat?: [number, number];
+        startZoomLngLat?: [number, number];
+        startBearing?: number;
+        startPitch?: number;
+        startZoom?: number;
+    }
+
+    class MapControls implements BaseMapControls {
+        events: string[];
+
+        handleEvent(event: MapControlEvent): void;
+        getMapState(overrides: Partial<MapState>): MapState;
+        setOptions(options: Options): void;
+        setState(newState: MapState): void;
+        updateViewport(newMapState: MapState, extraProps: any, extraState: InteractiveMapState): void;
+    }
+}
diff --git a/types/react-map-gl/react-map-gl-tests.tsx b/types/react-map-gl/react-map-gl-tests.tsx
index 2fcb0157a2..7eb5bfd590 100644
--- a/types/react-map-gl/react-map-gl-tests.tsx
+++ b/types/react-map-gl/react-map-gl-tests.tsx
@@ -1,36 +1,30 @@
 import * as React from "react";
 import {
     Viewport,
-    StaticMapProps,
-    InteractiveMapProps,
     InteractiveMap,
     CanvasOverlay,
     SVGOverlay,
     HTMLOverlay,
-    HTMLOverlayProps,
     CanvasRedrawOptions,
     HTMLRedrawOptions,
-    SVGOverlayProps,
     SVGRedrawOptions,
     StaticMap
 } from 'react-map-gl';
 import * as MapboxGL from "mapbox-gl";
 
-interface MyMapState {
+interface State {
     viewport: Viewport;
 }
 
-class MyMap extends React.Component<{}, MyMapState> {
-    state: MyMapState = {
+class MyMap extends React.Component<{}, State> {
+    readonly state: State = {
         viewport: {
             bearing: 0,
-            isDragging: false,
             latitude: 0,
             longitude: 0,
             zoom: 3,
         }
     };
-
     private map: MapboxGL.Map;
 
     render() {
diff --git a/types/react-maskedinput/index.d.ts b/types/react-maskedinput/index.d.ts
index 3a1b4687eb..dc38064cab 100644
--- a/types/react-maskedinput/index.d.ts
+++ b/types/react-maskedinput/index.d.ts
@@ -4,7 +4,7 @@
 //                 Adam Lavin <https://github.com/lavoaster>
 //                 Carlos Bonetti <https://github.com/CarlosBonetti>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-mce/index.d.ts b/types/react-mce/index.d.ts
index 6f1fb978db..1db5f00286 100644
--- a/types/react-mce/index.d.ts
+++ b/types/react-mce/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/janstuemmel/react-mce
 // Definitions by: Gavin Heise <https://github.com/morphologue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as ActualTinyMCE from 'tinymce';
diff --git a/types/react-mdl/index.d.ts b/types/react-mdl/index.d.ts
index caf910d421..1b83bf7def 100644
--- a/types/react-mdl/index.d.ts
+++ b/types/react-mdl/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tleunen/react-mdl
 // Definitions by: Brad Zacher <https://github.com/bradzacher>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-measure/index.d.ts b/types/react-measure/index.d.ts
index c61b22b187..9cd5853948 100644
--- a/types/react-measure/index.d.ts
+++ b/types/react-measure/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-measure
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, Marc Fallows <https://github.com/marcfallows>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
@@ -46,7 +46,7 @@ export interface MeasuredComponentProps {
 
 type MeasuredComponent<T> = React.ComponentType<T & MeasuredComponentProps>;
 
-export interface MeasureProps<T> {
+export interface MeasureProps {
     client?: boolean;
     offset?: boolean;
     scroll?: boolean;
@@ -60,5 +60,5 @@ export interface MeasureProps<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>> {}
+declare class Measure extends React.Component<MeasureProps> {}
 export default Measure;
diff --git a/types/react-mixin/index.d.ts b/types/react-mixin/index.d.ts
index 265794afe2..284d278ff8 100644
--- a/types/react-mixin/index.d.ts
+++ b/types/react-mixin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/brigand/react-mixin
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-modal/index.d.ts b/types/react-modal/index.d.ts
index 9a0d534af2..237c725332 100644
--- a/types/react-modal/index.d.ts
+++ b/types/react-modal/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-modal 3.1
+// Type definitions for react-modal 3.2
 // Project: https://github.com/reactjs/react-modal
 // Definitions by: Rajab Shakirov <https://github.com/radziksh>,
 //                 Drew Noakes <https://github.com/drewnoakes>,
@@ -7,7 +7,7 @@
 //                 Uwe Wiemer <https://github.com/hallowatcher>,
 //                 Peter Blazejewicz <https://github.com/peterblazejewicz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
@@ -92,6 +92,12 @@ declare namespace ReactModal {
 
         /* String indicating how the content container should be announced to screenreaders. */
         contentLabel?: string;
+
+        /* Function accepting the ref for the content */
+        contentRef?: (instance: HTMLDivElement) => void;
+
+        /* Function accepting the ref for the overlay */
+        overlayRef?: (instance: HTMLDivElement) => void;
     }
 }
 
diff --git a/types/react-modal/react-modal-tests.tsx b/types/react-modal/react-modal-tests.tsx
index 76958adbb3..463ac1c7be 100644
--- a/types/react-modal/react-modal-tests.tsx
+++ b/types/react-modal/react-modal-tests.tsx
@@ -8,6 +8,8 @@ ReactModal.setAppElement("#main");
 ReactModal.setAppElement(document.getElementById("#main"));
 
 class ExampleOfUsingReactModal extends React.Component {
+  contentRef: HTMLDivElement;
+  overlayRef: HTMLDivElement;
   render() {
     const onAfterOpenFn = () => { };
     const onRequestCloseFn = () => { };
@@ -61,6 +63,8 @@ class ExampleOfUsingReactModal extends React.Component {
         overlayClassName={customOverlayClasses}
         bodyOpenClassName={'bodyOpenClassName'}
         aria={customAriaVariables}
+        contentRef={instance => this.contentRef = instance}
+        overlayRef={instance => this.overlayRef = instance}
         >
         <h1>Modal Content</h1>
         <p>Etc.</p>
diff --git a/types/react-motion-slider/index.d.ts b/types/react-motion-slider/index.d.ts
index 2e7ea921ef..a53ec42259 100644
--- a/types/react-motion-slider/index.d.ts
+++ b/types/react-motion-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-motion-slider
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare module "react-motion-slider" {
     import * as React from "react";
diff --git a/types/react-motion-ui-pack/index.d.ts b/types/react-motion-ui-pack/index.d.ts
new file mode 100644
index 0000000000..477cf0e604
--- /dev/null
+++ b/types/react-motion-ui-pack/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for react-motion-ui-pack 0.10
+// Project: https://github.com/souporserious/react-motion-ui-pack
+// Definitions by: Jason Unger <https://github.com/jsonunger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+import * as motion from 'react-motion';
+
+declare namespace Transition {
+    interface TransitionProps {
+        component?: string | boolean | React.ReactElement<any>;
+        runOnMount?: boolean;
+        appear?: motion.Style;
+        enter?: motion.Style;
+        leave?: motion.Style;
+        onEnter?: (style: motion.PlainStyle) => void;
+        onLeave?: (style: motion.Style) => void;
+    }
+}
+
+declare const Transition: React.ComponentClass<Transition.TransitionProps>;
+export default Transition;
diff --git a/types/react-motion-ui-pack/react-motion-ui-pack-tests.tsx b/types/react-motion-ui-pack/react-motion-ui-pack-tests.tsx
new file mode 100644
index 0000000000..3bbeafc295
--- /dev/null
+++ b/types/react-motion-ui-pack/react-motion-ui-pack-tests.tsx
@@ -0,0 +1,16 @@
+import * as React from "react";
+import { spring } from "react-motion";
+import Transition from "react-motion-ui-pack";
+
+class ReactMotionUIPackTransition extends React.Component {
+    render() {
+        return (
+            <Transition
+                enter={{ opacity: 1 }}
+                leave={{ opacity: spring(0, { stiffness: 120, damping: 9 }) }}
+            >
+                <div>Hello world.</div>
+            </Transition>
+        );
+    }
+}
diff --git a/types/react-motion-ui-pack/tsconfig.json b/types/react-motion-ui-pack/tsconfig.json
new file mode 100644
index 0000000000..a30b04f804
--- /dev/null
+++ b/types/react-motion-ui-pack/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-motion-ui-pack-tests.tsx"
+    ]
+}
diff --git a/types/react-motion-ui-pack/tslint.json b/types/react-motion-ui-pack/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-motion-ui-pack/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-motion/index.d.ts b/types/react-motion/index.d.ts
index f4f94095a8..761c8e559f 100644
--- a/types/react-motion/index.d.ts
+++ b/types/react-motion/index.d.ts
@@ -4,7 +4,7 @@
 //                 Alexey Svetliakov <https://github.com/asvetliakov>
 //                 Dimitar Nestorov <https://github.com/dimitarnestorov>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactElement } from 'react';
 
diff --git a/types/react-native-android-taskdescription/index.d.ts b/types/react-native-android-taskdescription/index.d.ts
index 0f395e91f2..172f47fe00 100644
--- a/types/react-native-android-taskdescription/index.d.ts
+++ b/types/react-native-android-taskdescription/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jwarby/react-native-android-taskdescription
 // Definitions by: Christian Chown <https://github.com/christianchown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-native-auth0/index.d.ts b/types/react-native-auth0/index.d.ts
index b6a4e769e8..d6bd3e7cf1 100644
--- a/types/react-native-auth0/index.d.ts
+++ b/types/react-native-auth0/index.d.ts
@@ -138,6 +138,8 @@ export interface AuthorizeParams {
     audience?: string;
     scope?: string;
     connection?: string;
+    language?: string;
+    prompt?: string;
 }
 
 export interface ClearSessionParams {
diff --git a/types/react-native-auth0/react-native-auth0-tests.ts b/types/react-native-auth0/react-native-auth0-tests.ts
index 08f8b0bc59..068833e349 100644
--- a/types/react-native-auth0/react-native-auth0-tests.ts
+++ b/types/react-native-auth0/react-native-auth0-tests.ts
@@ -60,7 +60,9 @@ auth0.auth.userInfo({
 auth0.webAuth.authorize({
     state: "state",
     nonce: "nonce",
-    scope: "openid"
+    scope: "openid",
+    language: "en",
+    prompt: 'login'
 });
 
 auth0.webAuth.clearSession({ federated: false });
diff --git a/types/react-native-autocomplete-input/index.d.ts b/types/react-native-autocomplete-input/index.d.ts
index f6c5f06eb6..9e39a47241 100644
--- a/types/react-native-autocomplete-input/index.d.ts
+++ b/types/react-native-autocomplete-input/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/l-urence/react-native-autocomplete-input#readme
 // Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactNode } from 'react';
 import {
diff --git a/types/react-native-background-timer/index.d.ts b/types/react-native-background-timer/index.d.ts
new file mode 100644
index 0000000000..7a64700595
--- /dev/null
+++ b/types/react-native-background-timer/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-native-background-timer 2.0
+// Project: https://github.com/ocetnik/react-native-background-timer#readme
+// Definitions by: Tjark Smalla <https://github.com/chillkroeteTTS>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/*~ You can declare types that are available via importing the module */
+export type IntervalId = number;
+export type TimeoutId = number;
+
+/*~ You can declare properties of the module using const, let, or var */
+declare class BackgroundTimer {
+    constructor();
+
+    start(delay?: number): any;
+
+    stop(): void;
+
+    runBackgroundTimer(callback: () => void, delay: number): void;
+
+    backgroundClockMethod(callback: () => void, delay: number): void;
+
+    stopBackgroundTimer(): void;
+
+    setTimeout(callback: () => void, timeout: number): TimeoutId;
+
+    clearTimeout(timeoutId: TimeoutId): void;
+
+    setInterval(callback: () => void, timeout: number): IntervalId;
+
+    clearInterval(intervalId: IntervalId): void;
+}
+
+declare const _BackgroundTimer: BackgroundTimer;
+export default _BackgroundTimer;
diff --git a/types/react-native-background-timer/react-native-background-timer-tests.ts b/types/react-native-background-timer/react-native-background-timer-tests.ts
new file mode 100644
index 0000000000..6ee4334a8d
--- /dev/null
+++ b/types/react-native-background-timer/react-native-background-timer-tests.ts
@@ -0,0 +1,31 @@
+// Tests taken from Examples at https://github.com/ocetnik/react-native-background-timer
+import BackgroundTimer from 'react-native-background-timer';
+
+BackgroundTimer.runBackgroundTimer(() => {
+    // do stuff
+    },
+    3000);
+    // rest of code will be performing for iOS on background too
+    BackgroundTimer.stopBackgroundTimer();
+
+BackgroundTimer.start();
+// Do whatever you want incuding setTimeout;
+BackgroundTimer.stop();
+
+// Start a timer that runs continuous after X milliseconds
+const intervalId = BackgroundTimer.setInterval(() => {
+	// this will be executed every 200 ms
+	// even when app is the the background
+}, 200);
+
+// Cancel the timer when you are done with it
+BackgroundTimer.clearInterval(intervalId);
+
+// Start a timer that runs once after X milliseconds
+const timeoutId = BackgroundTimer.setTimeout(() => {
+	// this will be executed once after 10 seconds
+	// even when app is the the background
+}, 10000);
+
+// Cancel the timeout if necessary
+BackgroundTimer.clearTimeout(timeoutId);
diff --git a/types/react-native-background-timer/tsconfig.json b/types/react-native-background-timer/tsconfig.json
new file mode 100644
index 0000000000..e4c1076050
--- /dev/null
+++ b/types/react-native-background-timer/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-native-background-timer-tests.ts"
+    ]
+}
diff --git a/types/react-native-background-timer/tslint.json b/types/react-native-background-timer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-background-timer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-bluetooth-serial/index.d.ts b/types/react-native-bluetooth-serial/index.d.ts
index 8dc4d9c1a1..7dc49dcf83 100644
--- a/types/react-native-bluetooth-serial/index.d.ts
+++ b/types/react-native-bluetooth-serial/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rusel1989/react-native-bluetooth-serial
 // Definitions by: Rodrigo Weber <https://github.com/RodrigoAWeber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 import * as React from "react";
 import * as ReactNative from "react-native";
 
diff --git a/types/react-native-calendars/index.d.ts b/types/react-native-calendars/index.d.ts
new file mode 100644
index 0000000000..b7a1736d2a
--- /dev/null
+++ b/types/react-native-calendars/index.d.ts
@@ -0,0 +1,467 @@
+// Type definitions for react-native-calendars 1.20
+// Project: https://github.com/wix/react-native-calendars#readme
+// Definitions by: Tyler Zhang <https://github.com/Tyler-Zhang>
+//                 David Noreña <https://github.com/DavidNorena>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+import { StyleProp, TextStyle, ViewStyle } from 'react-native';
+export import LocaleConfig = require('xdate');
+
+export interface DateObject {
+    day: number;
+    dateString: string;
+    month: number;
+    timestamp: number;
+    year: number;
+}
+
+export interface CalendarDot {
+    key: string;
+    color: string;
+    selectedDotColor?: string;
+}
+
+export interface CalendarTheme {
+    arrowColor?: string;
+    backgroundColor?: string;
+    calendarBackground?: string;
+    dayTextColor?: string;
+    dotColor?: string;
+    monthTextColor?: string;
+    selectedDayBackgroundColor?: string;
+    selectedDayTextColor?: string;
+    selectedDotColor?: string;
+    textDayFontFamily?: string;
+    textDayFontSize?: number;
+    textDayHeaderFontFamily?: string;
+    textDayHeaderFontSize?: number;
+    textDisabledColor?: string;
+    textMonthFontFamily?: string;
+    textMonthFontWeight?: string;
+    textMonthFontSize?: number;
+    textSectionTitleColor?: string;
+    todayTextColor?: string;
+}
+
+export type DateCallbackHandler = (date: DateObject) => void;
+
+export type TCalendarDate = Date | DateObject | number | string | XDate;
+
+export interface MarkedDateCustomStyles {
+    container: StyleProp<ViewStyle>;
+    text: StyleProp<TextStyle>;
+}
+
+export interface CalendarDot {
+    key: string;
+    color: string;
+    selectedDotColor?: string;
+}
+
+export interface CustomMarking {
+    customStyles: MarkedDateCustomStyles;
+}
+
+export interface DotMarking {
+    activeOpacity?: number;
+    disabled?: boolean;
+    disableTouchEvent?: boolean;
+    dotColor?: string;
+    marked?: boolean;
+    selected?: boolean;
+    selectedColor?: string;
+}
+
+export interface MultiDotMarking {
+    disabled?: boolean;
+    dots: CalendarDot[];
+    selected?: boolean;
+    selectedColor?: string;
+}
+
+export interface MultiPeriodMarking {
+    periods: Array<{
+        startingDay?: boolean;
+        endingDay?: boolean;
+        color?: string;
+    }>;
+}
+
+export interface PeriodMarking {
+    textColor?: string;
+    startingDay?: boolean;
+    color?: string;
+    selected?: boolean;
+    endingDay?: boolean;
+    disabled?: boolean;
+}
+
+export type Marking =
+    CustomMarking | DotMarking |
+    MultiDotMarking | MultiPeriodMarking |
+    PeriodMarking;
+
+export interface CustomMarkingProps {
+    markingType: 'custom';
+    markedDates: {
+        [date: string]: CustomMarking;
+    };
+}
+
+export interface DotMarkingProps {
+    markingType?: 'simple';
+    markedDates: {
+        [date: string]: DotMarking;
+    };
+}
+
+export interface MultiDotMarkingProps {
+    markingType: 'multi-dot';
+    markedDates: {
+        [date: string]: MultiDotMarking;
+    };
+}
+
+/**
+ * This type of marking is only fully supported by <Calendar/> as it will expand the height
+ * of the component
+ */
+export interface MultiPeriodMarkingProps {
+    markingType: 'multi-period';
+    markedDates: {
+        [date: string]: MultiPeriodMarking
+    };
+}
+
+export interface PeriodMarkingProps {
+    markingType: 'period';
+    markedDates: {
+        [date: string]: PeriodMarking;
+    };
+}
+
+export type CalendarMarkingProps =
+    MultiDotMarkingProps |
+    DotMarkingProps |
+    PeriodMarkingProps |
+    MultiPeriodMarkingProps |
+    CustomMarkingProps |
+    {};
+
+export interface DayComponentProps {
+    date: DateObject;
+    marking: false | Marking[];
+    onPress: () => any;
+    onLongPress: () => any;
+    state: '' | 'selected' | 'disabled' | 'today';
+    theme: CalendarTheme;
+}
+
+export interface CalendarBaseProps {
+    /**
+     *  Initially visible month. Default = Date()
+     */
+    current?: TCalendarDate;
+
+    /**
+     *  Provide custom day rendering component.
+     */
+    dayComponent?: React.Component<DayComponentProps> | React.SFC<DayComponentProps>;
+
+    /**
+     *  Disable days by default. Default = false
+     */
+    disabledByDefault?: boolean;
+
+    /**
+     *  If hideArrows=false and hideExtraDays=false do not switch month when tapping on greyed out
+     *  day from another month that is visible in calendar page. Default = false
+     */
+    disableMonthChange?: boolean;
+
+    /**
+     *  Display loading indicator. Default = false
+     */
+    displayLoadingIndicator?: boolean;
+
+    /**
+     *  If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
+     */
+    firstDay?: number;
+
+    /**
+     *  Hide month navigation arrows. Default = false
+     */
+    hideArrows?: boolean;
+
+    /**
+     *  Hide day names. Default = false
+     */
+    hideDayNames?: boolean;
+
+    /**
+     *  Do not show days of other months in month page. Default = false
+     */
+    hideExtraDays?: boolean;
+
+    /**
+     *  Maximum date that can be selected, dates after maxDate will be grayed out. Default = undefined
+     */
+    maxDate?: TCalendarDate;
+
+    /**
+     *  Minimum date that can be selected, dates before minDate will be grayed out. Default = undefined
+     */
+    minDate?: TCalendarDate;
+
+    /**
+     *  Month format in calendar title. Formatting values: http://arshaw.com/xdate/#Formatting
+     */
+    monthFormat?: string;
+
+    /**
+     *  Handler which gets executed on day press. Default = undefined
+     */
+    onDayPress?: DateCallbackHandler;
+
+    /**
+     *  Handler which gets executed on day long press. Default = undefined
+     */
+    onDayLongPress?: DateCallbackHandler;
+
+    /**
+     *  Handler which gets executed when press arrow icon left. It receive a callback can go back month
+     */
+    onPressArrowLeft?: (substractMonth: () => void) => void;
+
+    /**
+     *  Handler which gets executed when press arrow icon left. It receive a callback can go next month
+     */
+    onPressArrowRight?: (addMonth: () => void) => void;
+
+    /**
+     *  Handler which gets executed when visible month changes in calendar. Default = undefined
+     */
+    onMonthChange?: DateCallbackHandler;
+
+    /**
+     *  Callback which gets executed when visible months change in scroll view. Default = undefined
+     */
+    onVisibleMonthsChange?: (months: DateObject[]) => void;
+
+    /**
+     *  Replace default arrows with custom ones (direction can be 'left' or 'right')
+     */
+    renderArrow?: (direction: 'left' | 'right') => React.ReactNode;
+
+    /**
+     *  Show week numbers to the left. Default = false
+     */
+    showWeekNumbers?: boolean;
+
+    /**
+     *  Calendar container style.
+     */
+    style?: StyleProp<ViewStyle>;
+
+    /**
+     *  Specify theme properties to override specific styles for calendar parts. Default = {}
+     */
+    theme?: CalendarTheme;
+}
+
+export class Calendar extends React.Component<CalendarMarkingProps & CalendarBaseProps> { }
+
+export interface CalendarListBaseProps extends CalendarBaseProps {
+    /**
+     *  Set custom calendar heigth.
+     */
+    calendarHeight?: number;
+
+    /**
+     *  Set custom calendar width.
+     */
+    calendarWidth?: number;
+
+    /**
+     *  Max amount of months allowed to scroll to the future. Default = 50
+     */
+    futureScrollRange?: number;
+
+    /**
+     *  Enable horizontal scrolling, default = false
+     */
+    horizontal?: boolean;
+
+    /**
+     *  Enable paging on horizontal, default = false
+     */
+    pagingEnabled?: boolean;
+
+    /**
+     *  Max amount of months allowed to scroll to the past. Default = 50
+     */
+    pastScrollRange?: number;
+
+    /**
+     *  Enable or disable scrolling of calendar list
+     */
+    scrollEnabled?: boolean;
+
+    /**
+     *  When true, the calendar list scrolls to top when the status bar is tapped. Default = true
+     */
+    scrollsToTop?: boolean;
+
+    /**
+     *  Enable or disable vertical scroll indicator. Default = false
+     */
+    showScrollIndicator?: boolean;
+}
+
+export class CalendarList extends React.Component<CalendarListBaseProps> { }
+
+export interface AgendaThemeStyle extends CalendarTheme {
+    agendaDayNumColor?: string;
+    agendaDayTextColor?: string;
+    agendaKnobColor?: string;
+    agendaTodayColor?: string;
+}
+
+export interface AgendaItemsMap<TItem> {
+    [date: string]: TItem[];
+}
+
+export interface AgendaProps<TItem> {
+    /**
+     *  Display loading indicator. Default = false
+     */
+    displayLoadingIndicator?: boolean;
+
+    /**
+     *  If firstDay = 1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
+     */
+    firstDay?: number;
+
+    /**
+     *  Max amount of months allowed to scroll to the future. Default = 50
+     */
+    futureScrollRange?: number;
+
+    /**
+     *  Hide knob button. Default = false
+     */
+    hideKnob?: boolean;
+
+    /**
+     *  The list of items that have to be displayed in agenda. If you want to render item as empty date
+     *  the value of date key kas to be an empty array []. If there exists no value for date key it is
+     *  considered that the date in question is not yet loaded
+     */
+    items?: AgendaItemsMap<TItem>;
+
+    /**
+     * callback that gets called when items for a certain month should be loaded (month became visible)
+     */
+    loadItemsForMonth?: (date: DateObject) => void;
+
+    /**
+     * Maximum date that can be selected, dates after maxDate will be grayed out. Default = undefined
+     */
+    maxDate?: TCalendarDate;
+
+    /**
+     * Minimum date that can be selected, dates before minDate will be grayed out. Default = undefined
+     */
+    minDate?: TCalendarDate;
+
+    /**
+     *  Month format in calendar title. Formatting values: http://arshaw.com/xdate/#Formatting
+     */
+    monthFormat?: string;
+
+    /**
+     *  Handler which gets executed on day press. Default = undefined
+     */
+    onDayPress?: DateCallbackHandler;
+
+    /**
+     *  Handler which gets executed when the calendar is opened or closed. Default = undefined
+     */
+    onCalendarToggled?: (calendarOpened: boolean) => void;
+
+    /**
+     *  Handler that gets called when day changes while scrolling agenda list. Default = undefined
+     */
+    onDayChange?: DateCallbackHandler;
+
+    /**
+     *  If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality.
+     *  Make sure to also set the refreshing prop correctly. Default = undefined
+     */
+    onRefresh?: () => void;
+
+    /**
+     *  Max amount of months allowed to scroll to the past. Default = 50
+     */
+    pastScrollRange?: number;
+
+    /**
+     *  A RefreshControl component, used to provide pull-to-refresh funtionality for the ScrollView.
+     */
+    refreshControl?: React.ReactNode;
+
+    /**
+     *  Set this true while waiting for new data from a refresh.
+     */
+    refreshing?: boolean;
+
+    /**
+     *  Specify how each day should be rendered.
+     *  Date can be undefined if the item has not property date.
+     */
+    renderDay?: (date: DateObject | undefined, item: TItem) => React.ReactNode;
+
+    /**
+     *  Specify what should be rendered instead of ActivityIndicator
+     */
+    renderEmptyData?: () => React.ReactNode;
+
+    /**
+     *  Specify how empty date content with no items should be rendered.
+     */
+    renderEmptyDate: () => React.ReactNode;
+
+    /**
+     *  Specify how each item should be rendered in agenda.
+     */
+    renderItem: (item: TItem, firstDayInDay: boolean) => React.ReactNode;
+
+    /**
+     *  Specify how agenda knob should look like.
+     */
+    renderKnob?: () => React.ReactNode;
+
+    /**
+     * specify your item comparison function for increased performance
+     */
+    rowHasChanged: (r1: TItem, r2: TItem) => boolean;
+
+    /**
+     *  Initially visible month. Default = Date()
+     */
+    selected?: TCalendarDate;
+
+    /**
+     *  Agenda container style.
+     */
+    style?: StyleProp<ViewStyle>;
+
+    /**
+     *  Specify theme properties to override specific styles for agenda parts. Default = {}
+     */
+    theme?: AgendaThemeStyle;
+}
+export class Agenda<TItem> extends React.Component<AgendaProps<TItem> & CalendarMarkingProps> { }
diff --git a/types/react-native-calendars/react-native-calendars-tests.tsx b/types/react-native-calendars/react-native-calendars-tests.tsx
new file mode 100644
index 0000000000..3a095a597e
--- /dev/null
+++ b/types/react-native-calendars/react-native-calendars-tests.tsx
@@ -0,0 +1,404 @@
+import * as React from "react";
+import { Text, View } from "react-native";
+import { Calendar, CalendarList, Agenda } from "react-native-calendars";
+
+<Calendar
+    // Initially visible month. Default = Date()
+    current={"2012-03-01"}
+    // Minimum date that can be selected, dates before minDate will be grayed out. Default = undefined
+    minDate={"2012-05-10"}
+    // Maximum date that can be selected, dates after maxDate will be grayed out. Default = undefined
+    maxDate={"2012-05-30"}
+    // Handler which gets executed on day press. Default = undefined
+    onDayPress={date => {
+        console.log("selected day", date.day);
+    }}
+    // Handler which gets executed on day long press. Default = undefined
+    onDayLongPress={date => {
+        console.log("selected day", date.day);
+    }}
+    // Month format in calendar title. Formatting values: http://arshaw.com/xdate/#Formatting
+    monthFormat={"yyyy MM"}
+    // Handler which gets executed when visible month changes in calendar. Default = undefined
+    onMonthChange={date => {
+        console.log("month changed", date.month);
+    }}
+    // Hide month navigation arrows. Default = false
+    hideArrows={true}
+    // Replace default arrows with custom ones (direction can be 'left' or 'right')
+    renderArrow={direction => <View />}
+    // Do not show days of other months in month page. Default = false
+    hideExtraDays={true}
+    // If hideArrows=false and hideExtraDays=false do not switch month when tapping on greyed out
+    // day from another month that is visible in calendar page. Default = false
+    disableMonthChange={true}
+    // If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
+    firstDay={1}
+    // Hide day names. Default = false
+    hideDayNames={true}
+    // Show week numbers to the left. Default = false
+    showWeekNumbers={true}
+    // Handler which gets executed when press arrow icon left. It receive a callback can go back month
+    onPressArrowLeft={substractMonth => console.log(substractMonth)}
+    // Handler which gets executed when press arrow icon left. It receive a callback can go next month
+    onPressArrowRight={addMonth => console.log(addMonth)}
+    disabledByDefault={true}
+/>;
+
+<Calendar
+    // Initially visible month. Default = Date()
+    current={"2012-03-01"}
+    // Minimum date that can be selected, dates before minDate will be grayed out. Default = undefined
+    minDate={"2012-05-10"}
+    // Maximum date that can be selected, dates after maxDate will be grayed out. Default = undefined
+    maxDate={"2012-05-30"}
+    // Handler which gets executed on day press. Default = undefined
+    onDayPress={date => {
+        console.log("selected day", date.day);
+    }}
+    // Handler which gets executed on day long press. Default = undefined
+    onDayLongPress={date => {
+        console.log("selected day", date.day);
+    }}
+    // Month format in calendar title. Formatting values: http://arshaw.com/xdate/#Formatting
+    monthFormat={"yyyy MM"}
+    // Handler which gets executed when visible month changes in calendar. Default = undefined
+    onMonthChange={date => {
+        console.log("month changed", date.month);
+    }}
+    // Hide month navigation arrows. Default = false
+    hideArrows={true}
+    // Replace default arrows with custom ones (direction can be 'left' or 'right')
+    renderArrow={direction => <View />}
+    // Do not show days of other months in month page. Default = false
+    hideExtraDays={true}
+    // If hideArrows=false and hideExtraDays=false do not switch month when tapping on greyed out
+    // day from another month that is visible in calendar page. Default = false
+    disableMonthChange={true}
+    // If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
+    firstDay={1}
+    // Hide day names. Default = false
+    hideDayNames={true}
+    // Show week numbers to the left. Default = false
+    showWeekNumbers={true}
+    // Handler which gets executed when press arrow icon left. It receive a callback can go back month
+    onPressArrowLeft={substractMonth => console.log(substractMonth)}
+    // Handler which gets executed when press arrow icon left. It receive a callback can go next month
+    onPressArrowRight={addMonth => console.log(addMonth)}
+    markedDates={{
+        "2012-05-16": { selected: true, marked: true, selectedColor: "blue" },
+        "2012-05-17": { marked: true },
+        "2012-05-18": { marked: true, dotColor: "red", activeOpacity: 0 },
+        "2012-05-19": { disabled: true, disableTouchEvent: true }
+    }}
+/>;
+
+const vacation = { key: "vacation", color: "red", selectedDotColor: "blue" };
+const massage = { key: "massage", color: "blue", selectedDotColor: "blue" };
+const workout = { key: "workout", color: "green" };
+
+<Calendar
+    markedDates={{
+        "2017-10-25": {
+            dots: [vacation, massage, workout],
+            selected: true,
+            selectedColor: "red"
+        },
+        "2017-10-26": { dots: [massage, workout], disabled: true }
+    }}
+    markingType={"multi-dot"}
+/>;
+
+<Calendar
+    // Collection of dates that have to be colored in a special way. Default = {}
+    markedDates={{
+        "2012-05-20": { textColor: "green" },
+        "2012-05-22": { startingDay: true, color: "green" },
+        "2012-05-23": {
+            selected: true,
+            endingDay: true,
+            color: "green",
+            textColor: "gray"
+        },
+        "2012-05-04": {
+            disabled: true,
+            startingDay: true,
+            color: "green",
+            endingDay: true
+        }
+    }}
+    // Date marking style [simple/period/multi-dot/custom]. Default = 'simple'
+    markingType={"period"}
+/>;
+
+<Calendar
+    markedDates={{
+        "2017-12-14": {
+            periods: [
+                { startingDay: false, endingDay: true, color: "#5f9ea0" },
+                { startingDay: false, endingDay: true, color: "#ffa500" },
+                { startingDay: true, endingDay: false, color: "#f0e68c" }
+            ]
+        },
+        "2017-12-15": {
+            periods: [
+                { startingDay: true, endingDay: false, color: "#ffa500" },
+                { color: "transparent" },
+                { startingDay: false, endingDay: false, color: "#f0e68c" }
+            ]
+        }
+    }}
+    // Date marking style [simple/period/multi-dot/custom]. Default = 'simple'
+    markingType="multi-period"
+/>;
+
+<Calendar
+    // Date marking style [simple/period/multi-dot/single]. Default = 'simple'
+    markingType="custom"
+    markedDates={{
+        "2018-03-28": {
+            customStyles: {
+                container: {
+                    backgroundColor: "green"
+                },
+                text: {
+                    color: "black",
+                    fontWeight: "bold"
+                }
+            }
+        },
+        "2018-03-29": {
+            customStyles: {
+                container: {
+                    backgroundColor: "white",
+                    elevation: 2
+                },
+                text: {
+                    color: "blue"
+                }
+            }
+        }
+    }}
+/>;
+
+<Calendar
+    // Specify style for calendar container element. Default = {}
+    style={{
+        borderWidth: 1,
+        borderColor: "gray",
+        height: 350
+    }}
+    // Specify theme properties to override specific styles for calendar parts. Default = {}
+    theme={{
+        backgroundColor: "#ffffff",
+        calendarBackground: "#ffffff",
+        textSectionTitleColor: "#b6c1cd",
+        selectedDayBackgroundColor: "#00adf5",
+        selectedDayTextColor: "#ffffff",
+        todayTextColor: "#00adf5",
+        dayTextColor: "#2d4150",
+        textDisabledColor: "#d9e1e8",
+        dotColor: "#00adf5",
+        selectedDotColor: "#ffffff",
+        arrowColor: "orange",
+        monthTextColor: "blue",
+        textDayFontFamily: "monospace",
+        textMonthFontFamily: "monospace",
+        textDayHeaderFontFamily: "monospace",
+        textMonthFontWeight: "bold",
+        textDayFontSize: 16,
+        textMonthFontSize: 16,
+        textDayHeaderFontSize: 16
+    }}
+/>;
+
+<Calendar
+    style={[{}, { height: 300 }]}
+    dayComponent={({ date, state }) => {
+        return (
+            <View style={{ flex: 1 }}>
+                <Text
+                    style={{
+                        textAlign: "center",
+                        color: state === "disabled" ? "gray" : "black"
+                    }}
+                >
+                    {date.day}
+                </Text>
+            </View>
+        );
+    }}
+/>;
+
+<CalendarList
+    // Callback which gets executed when visible months change in scroll view. Default = undefined
+    onVisibleMonthsChange={months => {
+        console.log("now these months are visible", months);
+    }}
+    // Max amount of months allowed to scroll to the past. Default = 50
+    pastScrollRange={50}
+    // Horizontal
+    horizontal={true}
+    // Max amount of months allowed to scroll to the future. Default = 50
+    futureScrollRange={50}
+    // Enable or disable scrolling of calendar list
+    scrollEnabled={true}
+    // Enable or disable vertical scroll indicator. Default = false
+    showScrollIndicator={true}
+    // Initially visible month. Default = Date()
+    current={"2012-03-01"}
+    // Minimum date that can be selected, dates before minDate will be grayed out. Default = undefined
+    minDate={"2012-05-10"}
+    // Maximum date that can be selected, dates after maxDate will be grayed out. Default = undefined
+    maxDate={"2012-05-30"}
+    // Handler which gets executed on day press. Default = undefined
+    onDayPress={day => {
+        console.log("selected day", day);
+    }}
+    // Handler which gets executed on day long press. Default = undefined
+    onDayLongPress={day => {
+        console.log("selected day", day);
+    }}
+    // Month format in calendar title. Formatting values: http://arshaw.com/xdate/#Formatting
+    monthFormat={"yyyy MM"}
+    // Handler which gets executed when visible month changes in calendar. Default = undefined
+    onMonthChange={month => {
+        console.log("month changed", month);
+    }}
+    // Hide month navigation arrows. Default = false
+    hideArrows={true}
+    // Replace default arrows with custom ones (direction can be 'left' or 'right')
+    renderArrow={direction => <View />}
+    // Do not show days of other months in month page. Default = false
+    hideExtraDays={true}
+    // If hideArrows=false and hideExtraDays=false do not switch month when tapping on greyed out
+    // day from another month that is visible in calendar page. Default = false
+    disableMonthChange={true}
+    // If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
+    firstDay={1}
+    // Hide day names. Default = false
+    hideDayNames={true}
+    // Show week numbers to the left. Default = false
+    showWeekNumbers={true}
+    // Handler which gets executed when press arrow icon left. It receive a callback can go back month
+    onPressArrowLeft={substractMonth => console.log(substractMonth)}
+    // Handler which gets executed when press arrow icon left. It receive a callback can go next month
+    onPressArrowRight={addMonth => console.log(addMonth)}
+    // Disable days by default. Default = false
+    disabledByDefault={true}
+    // Display loading indicator. Default = false
+    displayLoadingIndicator={true}
+    // When true, the calendar list scrolls to top when the status bar is tapped. Default = true
+    scrollsToTop={true}
+    // Enable paging on horizontal, default = false
+    pagingEnabled={true}
+    // Provide custom day rendering component.
+    dayComponent={({ date, state }) => {
+        return (
+            <View style={{ flex: 1 }}>
+                <Text
+                    style={{
+                        textAlign: "center",
+                        color: state === "disabled" ? "gray" : "black"
+                    }}
+                >
+                    {date.day}
+                </Text>
+            </View>
+        );
+    }}
+/>;
+
+<Agenda
+    // the list of items that have to be displayed in agenda. If you want to render item as empty date
+    // the value of date key kas to be an empty array []. If there exists no value for date key it is
+    // considered that the date in question is not yet loaded
+    items={{
+        "2012-05-22": [{ text: "item 1 - any js object" }],
+        "2012-05-23": [{ text: "item 2 - any js object" }],
+        "2012-05-24": [],
+        "2012-05-25": [
+            { text: "item 3 - any js object" },
+            { text: "any js object" }
+        ]
+    }}
+    // callback that gets called when items for a certain month should be loaded (month became visible)
+    loadItemsForMonth={month => {
+        console.log("trigger items loading");
+    }}
+    // callback that fires when the calendar is opened or closed
+    onCalendarToggled={calendarOpened => {
+        console.log(calendarOpened);
+    }}
+    // callback that gets called on day press
+    onDayPress={day => {
+        console.log("day pressed");
+    }}
+    // callback that gets called when day changes while scrolling agenda list
+    onDayChange={day => {
+        console.log("day changed");
+    }}
+    // initially selected day
+    selected={"2012-05-16"}
+    // Minimum date that can be selected, dates before minDate will be grayed out. Default = undefined
+    minDate={"2012-05-10"}
+    // Maximum date that can be selected, dates after maxDate will be grayed out. Default = undefined
+    maxDate={"2012-05-30"}
+    // Max amount of months allowed to scroll to the past. Default = 50
+    pastScrollRange={50}
+    // Max amount of months allowed to scroll to the future. Default = 50
+    futureScrollRange={50}
+    // specify how each item should be rendered in agenda
+    renderItem={(item, firstItemInDay) => {
+        return firstItemInDay ? <View /> : <View />;
+    }}
+    // specify how each date should be rendered. day can be undefined if the item is not first in that day.
+    renderDay={(day, item) => {
+        return <View />;
+    }}
+    // specify how empty date content with no items should be rendered
+    renderEmptyDate={() => {
+        return <View />;
+    }}
+    // specify how agenda knob should look like
+    renderKnob={() => {
+        return <View />;
+    }}
+    // specify what should be rendered instead of ActivityIndicator
+    renderEmptyData={() => {
+        return <View />;
+    }}
+    // specify your item comparison function for increased performance
+    rowHasChanged={(r1, r2) => {
+        return r1.text !== r2.text;
+    }}
+    // Hide knob button. Default = false
+    hideKnob={true}
+    // By default, agenda dates are marked if they have at least one item, but you can override this if needed
+    markedDates={{
+        "2012-05-16": { selected: true, marked: true },
+        "2012-05-17": { marked: true },
+        "2012-05-18": { disabled: true }
+    }}
+    // If provided, a standard RefreshControl will be added for "Pull to Refresh" functionality. Make sure to also set the refreshing prop correctly.
+    onRefresh={() => console.log("refreshing...")}
+    // Set this true while waiting for new data from a refresh
+    refreshing={false}
+    // Add a custom RefreshControl component, used to provide pull-to-refresh functionality for the ScrollView.
+    refreshControl={null}
+    // agenda theme
+    theme={{
+        agendaDayTextColor: "yellow",
+        agendaDayNumColor: "green",
+        agendaTodayColor: "red",
+        agendaKnobColor: "blue"
+    }}
+    // agenda container style
+    style={{}}
+    // Display loading indicator. Default = false
+    displayLoadingIndicator={true}
+    // If firstDay=1 week starts from Monday. Note that dayNames and dayNamesShort should still start from Sunday.
+    firstDay={1}
+    // Month format in calendar title. Formatting values: http://arshaw.com/xdate/#Formatting
+    monthFormat={"yyyy MM"}
+/>;
diff --git a/types/react-native-calendars/tsconfig.json b/types/react-native-calendars/tsconfig.json
new file mode 100644
index 0000000000..e13f60597a
--- /dev/null
+++ b/types/react-native-calendars/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-calendars-tests.tsx"
+    ]
+}
diff --git a/types/react-native-calendars/tslint.json b/types/react-native-calendars/tslint.json
new file mode 100644
index 0000000000..82403bc9ec
--- /dev/null
+++ b/types/react-native-calendars/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "file-name-casing": [true, "kebab-case"]
+    }
+}
diff --git a/types/react-native-datepicker/index.d.ts b/types/react-native-datepicker/index.d.ts
index dfc8bd5b13..dd69061311 100644
--- a/types/react-native-datepicker/index.d.ts
+++ b/types/react-native-datepicker/index.d.ts
@@ -2,15 +2,16 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ImageURISource } from 'react-native';
+import * as moment from 'moment';
 
 export interface DatePickerProps {
     mode?: 'date' | 'datetime' | 'time';
     androidMode?: 'default' | 'calendar' | 'spinner';
-    date?: string | Date;
+    date?: string | Date | moment.Moment;
     format?: string;
     iconSource?: ImageURISource;
     iconComponent?: JSX.Element;
@@ -35,6 +36,7 @@ export interface DatePickerProps {
     customStyles?: any;
     minuteInterval?: number;
     TouchableComponent?: React.Component;
+    locale?: string;
 }
 
 declare class DatePicker extends React.Component<DatePickerProps> {
diff --git a/types/react-native-datepicker/package.json b/types/react-native-datepicker/package.json
new file mode 100644
index 0000000000..19e5fb0d14
--- /dev/null
+++ b/types/react-native-datepicker/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "moment": ">=2.14.0"
+    }
+}
diff --git a/types/react-native-datepicker/react-native-datepicker-tests.tsx b/types/react-native-datepicker/react-native-datepicker-tests.tsx
index b208b5982c..2d13b2d7d4 100644
--- a/types/react-native-datepicker/react-native-datepicker-tests.tsx
+++ b/types/react-native-datepicker/react-native-datepicker-tests.tsx
@@ -8,10 +8,7 @@ interface MyDatePickerState {
 export default class MyDatePicker extends React.Component<{}, MyDatePickerState> {
     datepicker: DatePicker | null;
 
-    constructor(props: {}) {
-        super(props);
-        this.state = {date: "2016-05-15"};
-    }
+    state = {date: "2016-05-15"};
 
     componentDidMount() {
         if (this.datepicker) {
diff --git a/types/react-native-dialog/index.d.ts b/types/react-native-dialog/index.d.ts
new file mode 100644
index 0000000000..10e977f420
--- /dev/null
+++ b/types/react-native-dialog/index.d.ts
@@ -0,0 +1,72 @@
+// Type definitions for react-native-dialog 4.0
+// Project: https://github.com/mmazzarolo/react-native-dialog
+// Definitions by: MrLuje <https://github.com/MrLuje>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Ref, PureComponent, ReactNode } from "react";
+import {
+    ViewProps,
+    TextProps,
+    StyleProp,
+    TextInputProps,
+    ViewStyle
+} from "react-native";
+
+interface ButtonProps {
+    label: string;
+    /**
+     * default:
+     *      ios     #007ff9
+     *      android #169689
+     */
+    color?: string;
+    bold?: boolean;
+    /**
+     * default: false
+     */
+
+    disabled?: boolean;
+    onPress: () => void;
+}
+
+interface ContainerProps {
+    blurComponentIOS?: ReactNode;
+    children: JSX.Element[];
+    /**
+     * default: false
+     */
+    visible?: boolean;
+}
+
+interface TitleProps {
+    children: string;
+}
+
+interface InputProps<T> {
+    label?: string;
+    textInputRef?: Ref<T>;
+    wrapperStyle?: StyleProp<ViewStyle>;
+}
+
+interface DescriptionProps {
+    children: string;
+}
+
+export namespace Dialog {
+    class Button extends PureComponent<
+        ButtonProps & ViewProps & TextProps
+    > {}
+    class Container extends PureComponent<ContainerProps & ViewProps> {}
+    class Title extends PureComponent<
+        TitleProps & ViewProps & TextProps
+    > {}
+    class Input<T> extends PureComponent<
+        InputProps<T> & ViewProps & TextInputProps
+    > {}
+    class Description extends PureComponent<
+        DescriptionProps & ViewProps & TextProps
+    > {}
+}
+
+export default Dialog;
diff --git a/types/react-native-dialog/react-native-dialog-tests.tsx b/types/react-native-dialog/react-native-dialog-tests.tsx
new file mode 100644
index 0000000000..151ee14af5
--- /dev/null
+++ b/types/react-native-dialog/react-native-dialog-tests.tsx
@@ -0,0 +1,29 @@
+import Dialog from "react-native-dialog";
+import { createRef, Component } from "react";
+
+class Example extends Component {
+    render() {
+        const ref = createRef();
+
+        return (
+            <Dialog.Container
+                visible={true}
+                style={{ marginLeft: 20, marginRight: 20 }}
+            >
+                <Dialog.Title style={{ marginLeft: 20, marginRight: 20 }}>
+                    A nice title
+                </Dialog.Title>
+                <Dialog.Description>A good descr</Dialog.Description>
+                <Dialog.Input textInputRef={ref} label="Cancel" />
+                <Dialog.Button
+                    label="Cancel"
+                    onPress={() => console.log("test")}
+                />
+                <Dialog.Button
+                    label="Validate"
+                    onPress={() => console.log("test")}
+                />
+            </Dialog.Container>
+        );
+    }
+}
diff --git a/types/react-native-navigation/tsconfig.json b/types/react-native-dialog/tsconfig.json
similarity index 91%
rename from types/react-native-navigation/tsconfig.json
rename to types/react-native-dialog/tsconfig.json
index a8e66bb44a..5049e638d3 100644
--- a/types/react-native-navigation/tsconfig.json
+++ b/types/react-native-dialog/tsconfig.json
@@ -6,8 +6,8 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": true,
         "strictFunctionTypes": true,
+        "strictNullChecks": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-native-navigation-tests.tsx"
+        "react-native-dialog-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-native-dialog/tslint.json b/types/react-native-dialog/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-dialog/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-dialogflow/index.d.ts b/types/react-native-dialogflow/index.d.ts
new file mode 100644
index 0000000000..59ebff7cdf
--- /dev/null
+++ b/types/react-native-dialogflow/index.d.ts
@@ -0,0 +1,93 @@
+// Type definitions for react-native-dialogflow 3.2
+// Project: https://github.com/innFactory/react-native-dialogflow#readme
+// Definitions by: Jason Merino <https://github.com/jasonmerino>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export namespace Dialogflow {
+    const LANG_CHINESE_CHINA = 'zh-CN';
+    const LANG_CHINESE_HONGKONG: 'zh-HK';
+    const LANG_CHINESE_TAIWAN: 'zh-TW';
+    const LANG_DUTCH: 'nl';
+    const LANG_ENGLISH: 'en';
+    const LANG_ENGLISH_GB: 'en-GB';
+    const LANG_ENGLISH_US: 'en-US';
+    const LANG_FRENCH: 'fr';
+    const LANG_GERMAN: 'de';
+    const LANG_ITALIAN: 'it';
+    const LANG_JAPANESE: 'ja';
+    const LANG_KOREAN: 'ko';
+    const LANG_PORTUGUESE: 'pt';
+    const LANG_PORTUGUESE_BRAZIL: 'pt-BR';
+    const LANG_RUSSIAN: 'ru';
+    const LANG_SPANISH: 'es';
+    const LANG_UKRAINIAN: 'uk';
+
+    function setConfiguration(accessToken: string, languageTag: string): void;
+    function setEntities(entities: any[]): void;
+    function startListening(resultCallback: (result: object) => void, errorCallback: (error: Error) => void): void;
+    function finishListening(): void;
+    function requestEvent(
+        eventName: string,
+        eventData: object,
+        resultCallback: (result: object) => void,
+        errorCallback: (error: Error) => void
+    ): Promise<any>;
+    function requestQuery(
+        query: string,
+        resultCallback: (result: object) => void,
+        errorCallback: (error: Error) => void
+    ): Promise<any>;
+    function onListeningStarted(callback: () => void): void;
+    function onListeningFinished(callback: () => void): void;
+    function onAudioLevel(callback: (level: number) => void): void;
+    function setContexts(contexts: any[]): void;
+    function resetContexts(resultCallback: (result: object) => void, errorCallback: (error: Error) => void): void;
+    function setPermanentContexts(contexts: any[]): void;
+}
+
+export namespace Dialogflow_V2 {
+    const LANG_CHINESE_CHINA = 'zh-CN';
+    const LANG_CHINESE_HONGKONG: 'zh-HK';
+    const LANG_CHINESE_TAIWAN: 'zh-TW';
+    const LANG_DUTCH: 'nl';
+    const LANG_ENGLISH: 'en';
+    const LANG_ENGLISH_GB: 'en-GB';
+    const LANG_ENGLISH_US: 'en-US';
+    const LANG_FRENCH: 'fr';
+    const LANG_GERMAN: 'de';
+    const LANG_ITALIAN: 'it';
+    const LANG_JAPANESE: 'ja';
+    const LANG_KOREAN: 'ko';
+    const LANG_PORTUGUESE: 'pt';
+    const LANG_PORTUGUESE_BRAZIL: 'pt-BR';
+    const LANG_RUSSIAN: 'ru';
+    const LANG_SPANISH: 'es';
+    const LANG_UKRAINIAN: 'uk';
+
+    function setConfiguration(
+        serviceAccount: string,
+        privateKey: string,
+        language: string,
+        projectId: string
+    ): void;
+    function startListening(resultCallback: (result: object) => void, errorCallback: (error: Error) => void): void;
+    function finishListening(): void;
+    function requestEvent(
+        eventName: string,
+        eventData: object,
+        resultCallback: (result: object) => void,
+        errorCallback: (error: Error) => void
+    ): Promise<any>;
+    function requestQuery(
+        query: string,
+        resultCallback: (result: object) => void,
+        errorCallback: (error: Error) => void
+    ): Promise<any>;
+    function onListeningStarted(callback: () => void): void;
+    function onListeningFinished(callback: () => void): void;
+    function onAudioLevel(callback: (level: number) => void): void;
+    function setContexts(contexts: any[]): void;
+    function resetContexts(resultCallback: (result: object) => void, errorCallback: (error: Error) => void): void;
+    function setPermanentContexts(contexts: any[]): void;
+}
diff --git a/types/react-native-dialogflow/react-native-dialogflow-tests.tsx b/types/react-native-dialogflow/react-native-dialogflow-tests.tsx
new file mode 100644
index 0000000000..15b69ffa49
--- /dev/null
+++ b/types/react-native-dialogflow/react-native-dialogflow-tests.tsx
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import { View } from 'react-native';
+import {
+    Dialogflow,
+    Dialogflow_V2,
+} from 'react-native-dialogflow';
+
+const accessToken = 'accessToken';
+const eventName = 'event';
+const eventData = {};
+const query = '';
+const serviceAccount = '_@_.iam.gserviceaccount.com';
+const privateKey = '-----BEGIN PRIVATE KEY-----\n_\n-----END PRIVATE KEY-----';
+const projectId = 'projectId';
+
+class Screen1 extends React.Component<any> {
+    componentDidMount() {
+        Dialogflow.setConfiguration(accessToken, Dialogflow.LANG_ENGLISH);
+        Dialogflow.setEntities([]);
+        Dialogflow.startListening(() => {}, () => {});
+        Dialogflow.finishListening();
+        Dialogflow.requestEvent(eventName, eventData, () => {}, () => {});
+        Dialogflow.requestQuery(query, () => {}, () => {});
+        Dialogflow.onListeningStarted(() => {});
+        Dialogflow.onListeningFinished(() => {});
+        Dialogflow.onAudioLevel(() => {});
+        Dialogflow.setContexts([]);
+        Dialogflow.resetContexts(() => {}, () => {});
+        Dialogflow.setPermanentContexts([]);
+
+        Dialogflow_V2.setConfiguration(serviceAccount, privateKey, Dialogflow_V2.LANG_ENGLISH, projectId);
+        Dialogflow_V2.startListening(() => {}, () => {});
+        Dialogflow_V2.finishListening();
+        Dialogflow_V2.requestEvent(eventName, eventData, () => {}, () => {});
+        Dialogflow_V2.requestQuery(query, () => {}, () => {});
+        Dialogflow_V2.onListeningStarted(() => {});
+        Dialogflow_V2.onListeningFinished(() => {});
+        Dialogflow_V2.onAudioLevel(() => {});
+        Dialogflow_V2.setContexts([]);
+        Dialogflow_V2.resetContexts(() => {}, () => {});
+        Dialogflow_V2.setPermanentContexts([]);
+    }
+
+    render() {
+        return (
+            <View />
+        );
+    }
+}
diff --git a/types/react-native-dialogflow/tsconfig.json b/types/react-native-dialogflow/tsconfig.json
new file mode 100644
index 0000000000..6a7fdedb5d
--- /dev/null
+++ b/types/react-native-dialogflow/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,
+        "jsx": "react-native"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-dialogflow-tests.tsx"
+    ]}
diff --git a/types/react-native-dialogflow/tslint.json b/types/react-native-dialogflow/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-dialogflow/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-doc-viewer/index.d.ts b/types/react-native-doc-viewer/index.d.ts
index 6d09e3966a..f7e28147b7 100644
--- a/types/react-native-doc-viewer/index.d.ts
+++ b/types/react-native-doc-viewer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/philipphecht/react-native-doc-viewer/blob/master/README.md
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export function openDoc(
     files: Array<{ url: string; fileName?: string }>,
diff --git a/types/react-native-drawer-layout/index.d.ts b/types/react-native-drawer-layout/index.d.ts
index af3a05698e..3bf4ace1db 100644
--- a/types/react-native-drawer-layout/index.d.ts
+++ b/types/react-native-drawer-layout/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-native-community/react-native-drawer-layout
 // Definitions by: Justin Firth <https://github.com/jmfirth>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ViewProps } from 'react-native';
diff --git a/types/react-native-drawer/index.d.ts b/types/react-native-drawer/index.d.ts
index 3a82e3363a..da3420b9a7 100644
--- a/types/react-native-drawer/index.d.ts
+++ b/types/react-native-drawer/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: jnbt <https://github.com/jnbt>
 //                 suniahk <https://github.com/suniahk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ViewStyle, ScaledSize } from 'react-native';
diff --git a/types/react-native-drawer/react-native-drawer-tests.tsx b/types/react-native-drawer/react-native-drawer-tests.tsx
index 530fe25a1c..4ca3647e78 100644
--- a/types/react-native-drawer/react-native-drawer-tests.tsx
+++ b/types/react-native-drawer/react-native-drawer-tests.tsx
@@ -8,12 +8,9 @@ import {
 import Drawer from 'react-native-drawer';
 
 class DrawerTest extends React.Component<{}, {open: boolean}> {
-    constructor(props: {}) {
-      super(props);
-      this.state = {
+    state = {
         open: true
-      };
-    }
+    };
 
     render() {
         return (
diff --git a/types/react-native-elevated-view/index.d.ts b/types/react-native-elevated-view/index.d.ts
index e9ac2b1103..7c538a4742 100644
--- a/types/react-native-elevated-view/index.d.ts
+++ b/types/react-native-elevated-view/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alekhurst/react-native-elevated-view
 // Definitions by: fhelwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as ReactNative from 'react-native';
diff --git a/types/react-native-fbsdk/index.d.ts b/types/react-native-fbsdk/index.d.ts
index 8b948d6b0d..eacc05209e 100644
--- a/types/react-native-fbsdk/index.d.ts
+++ b/types/react-native-fbsdk/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/facebook/react-native-fbsdk
 // Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, Component } from 'react';
 import { ViewStyle } from 'react-native';
diff --git a/types/react-native-fs/index.d.ts b/types/react-native-fs/index.d.ts
index 17f26a5514..6c92933c44 100644
--- a/types/react-native-fs/index.d.ts
+++ b/types/react-native-fs/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Paulo Cesar <https://github.com/pocesar>
 //                 Joseph Roque <https://github.com/josephroque>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react-native" />
 
diff --git a/types/react-native-google-signin/index.d.ts b/types/react-native-google-signin/index.d.ts
index 862a40a35a..6cf83ed1e4 100644
--- a/types/react-native-google-signin/index.d.ts
+++ b/types/react-native-google-signin/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/devfd/react-native-google-signin
 // Definitions by: Jacob Froman <https://github.com/j-fro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ViewProps } from 'react-native';
diff --git a/types/react-native-htmlview/index.d.ts b/types/react-native-htmlview/index.d.ts
index b0eb2ae6a3..0f2b9d661d 100644
--- a/types/react-native-htmlview/index.d.ts
+++ b/types/react-native-htmlview/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jsdf/react-native-htmlview
 // Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ComponentType, ReactNode } from 'react';
 import {
diff --git a/types/react-native-indicators/index.d.ts b/types/react-native-indicators/index.d.ts
index ee4a13a4c2..1a732d8cee 100644
--- a/types/react-native-indicators/index.d.ts
+++ b/types/react-native-indicators/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/n4kz/react-native-indicators#readme
 // Definitions by: Ifiok Jr. <https://github.com/ifiokjr>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 import { Animated, EasingFunction } from 'react-native';
diff --git a/types/react-native-keep-awake/index.d.ts b/types/react-native-keep-awake/index.d.ts
index f22d1342c6..c717e83ba3 100644
--- a/types/react-native-keep-awake/index.d.ts
+++ b/types/react-native-keep-awake/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/corbt/react-native-keep-awake
 // Definitions by: huhuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 declare class KeepAwake extends React.Component<{ children?: JSX.Element }> {
diff --git a/types/react-native-keyboard-spacer/index.d.ts b/types/react-native-keyboard-spacer/index.d.ts
index 0c7ec24262..49ad68de41 100644
--- a/types/react-native-keyboard-spacer/index.d.ts
+++ b/types/react-native-keyboard-spacer/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Andr3wHur5t/react-native-keyboard-spacer#readme
 // Definitions by: Vincent Langlet <https://github.com/VincentLanglet>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as ReactNative from 'react-native';
diff --git a/types/react-native-loading-spinner-overlay/index.d.ts b/types/react-native-loading-spinner-overlay/index.d.ts
index 93d511d863..aa494b5fd4 100644
--- a/types/react-native-loading-spinner-overlay/index.d.ts
+++ b/types/react-native-loading-spinner-overlay/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/joinspontaneous/react-native-loading-spinner-overlay
 // Definitions by: fhelwanger <https://github.com/fhelwanger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as ReactNative from "react-native";
diff --git a/types/react-native-material-design-searchbar/index.d.ts b/types/react-native-material-design-searchbar/index.d.ts
index 23b3204c76..ed9534a38c 100644
--- a/types/react-native-material-design-searchbar/index.d.ts
+++ b/types/react-native-material-design-searchbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ananddayalan/react-native-material-design-searchbar
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-material-kit/index.d.ts b/types/react-native-material-kit/index.d.ts
index f820d8e4cd..48c044a629 100644
--- a/types/react-native-material-kit/index.d.ts
+++ b/types/react-native-material-kit/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-material-textfield/index.d.ts b/types/react-native-material-textfield/index.d.ts
index 5f3ffc437f..c21caa15b4 100644
--- a/types/react-native-material-textfield/index.d.ts
+++ b/types/react-native-material-textfield/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ville Venäläinen <https://github.com/mindhivefi>
 //                 Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import {
diff --git a/types/react-native-material-ui/index.d.ts b/types/react-native-material-ui/index.d.ts
index 3c4c549504..91ae62a3fb 100644
--- a/types/react-native-material-ui/index.d.ts
+++ b/types/react-native-material-ui/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-native-material-ui 1.19
+// Type definitions for react-native-material-ui 1.30
 // Project: https://github.com/xotahal/react-native-material-ui
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from 'react';
 import { ViewStyle, TextStyle, Image } from 'react-native';
@@ -490,16 +490,6 @@ export interface RippleFeedbackProps {
  */
 export class RippleFeedback extends Component<RippleFeedbackProps, any> {}
 
-export interface ThemeProviderProps {
-    uiTheme: {};
-    children: JSX.Element;
-}
-
-/**
- * @see https://github.com/xotahal/react-native-material-ui/blob/master/src/styles/ThemeProvider.react.js
- */
-export class ThemeProvider extends Component<ThemeProviderProps, any> {}
-
 export interface Color {
     red50: string;
     red100: string;
@@ -762,3 +752,23 @@ export interface Color {
 }
 
 export const COLOR: Color;
+
+export interface ThemeProps {
+    theme: {};
+}
+
+export interface ThemeProviderProps {
+    value: {};
+    children: React.ReactElement<any>;
+}
+
+export interface ThemeConsumerProps {
+    children(props: ThemeProps): React.ReactElement<any>;
+}
+
+export namespace ThemeContext {
+    class Provider extends Component<ThemeProviderProps> {}
+    class Consumer extends Component<ThemeConsumerProps> {}
+}
+
+export function getTheme(theme: {}): {};
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 5aed665ec4..2187efaa05 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
@@ -3,7 +3,7 @@ import { View, Text } from 'react-native';
 import {
     ActionButton,
     Avatar,
-    ThemeProvider,
+    ThemeContext,
     COLOR,
     Badge,
     Button,
@@ -12,7 +12,8 @@ import {
     Dialog,
     DialogDefaultActions,
     BottomNavigation,
-    Toolbar
+    Toolbar,
+    getTheme
 } from 'react-native-material-ui';
 
 const theme = {
@@ -24,7 +25,7 @@ const theme = {
 };
 
 const Example = () =>
-    <ThemeProvider uiTheme={theme}>
+    <ThemeContext.Provider value={getTheme(theme)}>
         <View>
             <ActionButton style={{ positionContainer: { marginBottom: 3 }}} />
             <ActionButton icon="done" />
@@ -40,12 +41,14 @@ const Example = () =>
             <Button text="I'm a button" />
 
             <Card>
-                <Text>Hello world!</Text>
+                <ThemeContext.Consumer>
+                    {theme => <Text>Hello world!</Text> }
+                </ThemeContext.Consumer>
             </Card>
 
             <Checkbox label="Select me" value="chicken" onCheck={a => console.log(a)}/>
         </View>
-    </ThemeProvider>;
+    </ThemeContext.Provider>;
 
 const DialogExample = () =>
     <Dialog>
@@ -68,13 +71,9 @@ const DialogExample = () =>
     </Dialog>;
 
 class BottomNavigationExample extends React.Component<null, {active: string}> {
-    constructor() {
-        super(null);
-
-        this.state = {
-            active: 'today'
-        };
-    }
+    state = {
+        active: 'today'
+    };
 
     render() {
         return (
diff --git a/types/react-native-modalbox/index.d.ts b/types/react-native-modalbox/index.d.ts
index 84461471f2..778f953f78 100644
--- a/types/react-native-modalbox/index.d.ts
+++ b/types/react-native-modalbox/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/maxs15/react-native-modalbox#readme
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { StyleProp, ViewStyle } from 'react-native';
diff --git a/types/react-native-modalbox/react-native-modalbox-tests.tsx b/types/react-native-modalbox/react-native-modalbox-tests.tsx
index 6a167791f4..a2e54a7653 100644
--- a/types/react-native-modalbox/react-native-modalbox-tests.tsx
+++ b/types/react-native-modalbox/react-native-modalbox-tests.tsx
@@ -23,16 +23,12 @@ class Example extends React.Component<{}, State> {
   modal4: Modal;
   modal6: Modal;
 
-  constructor() {
-    super({});
-
-    this.state = {
-      isOpen: false,
-      isDisabled: false,
-      swipeToClose: true,
-      sliderValue: 0.3
-    };
-  }
+  state = {
+    isOpen: false,
+    isDisabled: false,
+    swipeToClose: true,
+    sliderValue: 0.3
+  };
 
   onClose() {
     console.log('Modal just closed');
diff --git a/types/react-native-multi-slider/index.d.ts b/types/react-native-multi-slider/index.d.ts
index a3a5f39c63..42d4856938 100644
--- a/types/react-native-multi-slider/index.d.ts
+++ b/types/react-native-multi-slider/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/JackDanielsAndCode/react-native-multi-slider#readme
 // Definitions by: Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { ViewStyle } from "react-native";
diff --git a/types/react-native-navbar/index.d.ts b/types/react-native-navbar/index.d.ts
new file mode 100644
index 0000000000..afcd7df3ed
--- /dev/null
+++ b/types/react-native-navbar/index.d.ts
@@ -0,0 +1,41 @@
+// Type definitions for react-native-navbar 2.1
+// Project: https://github.com/react-native-community/react-native-navbar
+// Definitions by: Ryo Kikuchi <https://github.com/ryokik>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+import { ViewStyle, TextProps } from 'react-native';
+
+export interface NavigationBarButton {
+    title: string;
+    style?: ViewStyle;
+    handler?: () => void;
+    disable?: boolean;
+}
+
+export interface NavigationBarTitle {
+    title: string;
+    tintColor?: string;
+    ellipsizeMode?: TextProps["ellipsizeMode"];
+    numberOfLines?: number;
+}
+
+export interface StatusBar {
+    style?: 'light-content' | 'default';
+    hidden?: boolean;
+    tintColor?: string;
+    hideAnimation?: 'fade' | 'slide' | 'none';
+    showAnimation?: 'fade' | 'slide' | 'none';
+}
+
+export interface NavigationBarProps {
+    style?: ViewStyle;
+    tintColor?: string;
+    statusBar?: StatusBar;
+    leftButton?: NavigationBarButton | React.ReactElement<any> | null;
+    rightButton?: NavigationBarButton | React.ReactElement<any> | null;
+    title?: NavigationBarTitle | React.ReactElement<any> | null;
+}
+
+export default class NavigationBar extends React.Component<NavigationBarProps> {}
diff --git a/types/react-native-navbar/react-native-navbar-tests.tsx b/types/react-native-navbar/react-native-navbar-tests.tsx
new file mode 100644
index 0000000000..254f1862ed
--- /dev/null
+++ b/types/react-native-navbar/react-native-navbar-tests.tsx
@@ -0,0 +1,19 @@
+import * as React from "react";
+import { View, Text } from "react-native";
+import NavigationBar from "react-native-navbar";
+
+class NavigationBarTest extends React.Component {
+    render() {
+        return (
+            <View>
+                <NavigationBar tintColor={'red'} leftButton={{
+                    title: "Back",
+                    handler: () => { console.log("Back"); },
+                }}
+                    rightButton={<Text>Next</Text>}
+                    title={null}
+                />
+            </View>
+        );
+    }
+}
diff --git a/types/react-native-navbar/tsconfig.json b/types/react-native-navbar/tsconfig.json
new file mode 100644
index 0000000000..3648bb0377
--- /dev/null
+++ b/types/react-native-navbar/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-navbar-tests.tsx"
+    ]
+}
diff --git a/types/react-native-navbar/tslint.json b/types/react-native-navbar/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-navbar/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-navigation/index.d.ts b/types/react-native-navigation/index.d.ts
deleted file mode 100644
index 0b115935be..0000000000
--- a/types/react-native-navigation/index.d.ts
+++ /dev/null
@@ -1,315 +0,0 @@
-// Type definitions for react-native-navigation 1.1
-// Project: https://github.com/wix/react-native-navigation
-// Definitions by: Egor Shulga <https://github.com/egorshulga>
-//                 Jason Merino <https://github.com/jasonmerino>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-import * as React from 'react';
-
-export namespace Navigation {
-    function registerComponent(screenID: string, generator: () => React.ComponentType<any>, store?: any, provider?: any, options?: any): void;
-    function startTabBasedApp(params: TabBasedApp): void;
-    function startSingleScreenApp(params: SingleScreenApp): void;
-    function showModal(params: ModalScreen): void;
-    function dismissModal(params?: { animationType?: 'none' | 'slide-down' }): void;
-    function dismissAllModals(params?: { animationType?: 'none' | 'slide-down' }): void;
-    function showLightBox(params?: LightBox): void;
-    function dismissLightBox(): void;
-    function handleDeepLink(params?: { link: string; payload?: string; }): void;
-    function registerScreen(screenId: string, generator: () => React.ComponentType<any>): void;
-    function getCurrentlyVisibleScreenId(): Promise<string>;
-    function isAppLaunched(): Promise<boolean>;
-}
-
-export interface TabBasedApp {
-    tabs: TabScreen[];
-    tabsStyle?: {
-        tabBarButtonColor?: string;
-        tabBarSelectedButtonColor?: string;
-        tabBarBackgroundColor?: string;
-        initialTabIndex?: number;
-    };
-    appStyle?: {
-        orientation?: 'auto' | 'landscape' | 'portrait';
-        bottomTabBadgeTextColor?: string;
-        bottomTabBadgeBackgroundColor?: string;
-        backButtonImage?: any;
-        hideBackButtonTitle?: boolean;
-    };
-    drawer?: Drawer;
-    passProps?: object;
-    animationType?: 'none' | 'slide-down' | 'fade';
-}
-
-export interface IconInsets {
-  top?: number;
-  left?: number;
-  bottom?: number;
-  right?: number;
-}
-
-export interface TabScreen {
-    label?: string;
-    screen: string;
-    icon?: any;
-    iconInsets?: IconInsets;
-    selectedIcon?: any;
-    title?: string;
-    navigatorStyle?: NavigatorStyle;
-    navigatorButtons?: NavigatorButtons;
-    titleImage?: any;
-}
-
-export interface SingleScreenApp {
-    screen: Screen;
-    drawer?: Drawer;
-    passProps?: object;
-    animationType?: 'none' | 'slide-down' | 'fade';
-    appStyle?: {
-        orientation?: 'auto' | 'landscape' | 'portrait';
-        backButtonImage?: any;
-        hideBackButtonTitle?: boolean;
-    };
-}
-
-export interface Screen {
-    screen: string;
-    title?: string;
-    navigatorStyle?: NavigatorStyle;
-    navigatorButtons?: NavigatorButtons;
-    overrideBackPress?: boolean;
-}
-
-export interface ModalScreen extends Screen {
-    passProps?: object;
-    animationType?: 'slide-up' | 'none';
-}
-
-export interface ResetScreen<P> extends Screen {
-    passProps?: P;
-    animated?: boolean;
-    animationType?: 'fade' | 'slide-horizontal';
-}
-
-export interface PushedScreen<P> extends ResetScreen<P> {
-    titleImage?: any;
-    backButtonTitle?: string;
-    backButtonHidden?: boolean;
-    previewView?: React.Component<any, any> | number;
-    previewHeight?: number;
-    previewCommit?: boolean;
-    previewActions?: Action[];
-}
-
-export interface Action {
-    id: string;
-    title: string;
-    style?: 'selected' | 'destructive';
-    actions: Action[];
-}
-
-export interface LightBox {
-    screen: string;
-    passProps?: object;
-    style?: {
-        backgroundBlur?: 'dark' | 'light' | 'xlight' | 'none';
-        backgroundColor?: string;
-    };
-    adjustSoftInput?: 'nothing' | 'pan' | 'resize' | 'unspecified';
-}
-
-export interface NavigatorEvent {
-    id: 'willAppear' | 'didAppear' | 'willDisappear' | 'didDisappear' | 'willCommitPreview' | 'backPress' | 'bottomTabSelected' | 'bottomTabReselected' | string;
-    type: 'NavBarButtonPress' | 'DeepLink';
-}
-
-export class Navigator {
-    push<P>(params: PushedScreen<P>): void;
-    pop(params?: { animated?: boolean; animationType?: 'fade' | 'slide-horizontal'; }): void;
-    popToRoot(params?: { animated?: boolean; animationType?: 'fade' | 'slide-horizontal'; }): void;
-    resetTo<P>(params: PushedScreen<P>): void;
-    showModal(params: ModalScreen): void;
-    dismissModal(params?: { animationType?: 'none' | 'slide-down' }): void;
-    dismissAllModals(params?: { animationType?: 'none' | 'slide-down' }): void;
-    showLightBox(params: LightBox): void;
-    dismissLightBox(): void;
-    showInAppNotification(params?: { screen: string; passProps?: object; autoDismissTimerSec?: number }): void;
-    handleDeepLink(params: { link: string }): void;
-    setButtons(params: NavigatorButtons & { animated?: boolean }): void;
-    setTitle(params: { title: string }): void;
-    setSubTitle(params: { subtitle: string }): void;
-    toggleDrawer(params: { side: 'left' | 'right'; animated?: boolean; to?: 'open' | 'closed' }): void;
-    setDrawerEnabled(params: { side: 'left' | 'right'; enabled: boolean }): void;
-    toggleTabs(params: { to: 'hidden' | 'shown'; animated?: boolean }): void;
-    setTabBadge(params?: { tabIndex?: number; badge: number | null; badgeColor?: string; }): void;
-    setTabButton(params?: { tabIndex?: number; icon?: any; selectedIcon?: any; label?: string; }): void;
-    switchToTab(params?: { tabIndex?: number }): void;
-    toggleNavBar(params: { to: 'hidden' | 'shown'; animated?: boolean }): void;
-    setOnNavigatorEvent(callback: (event: NavigatorEvent) => void): void;
-    addOnNavigatorEvent(callback: (event: NavigatorEvent) => void): () => void;
-    screenIsCurrentlyVisible(): Promise<boolean>;
-    setStyle(params: NavigatorStyle): void;
-}
-
-export class ScreenVisibilityListener {
-    constructor(params: ScreenVisibilityListenerParams);
-    register(): void;
-    unregister(): void;
-}
-
-export class NativeEventsReceiver {
-    constructor();
-    appLaunched(callback: () => void): void;
-}
-
-export interface ScreenVisibilityListenerParams {
-    willAppear?: (params: ListenerParams) => void;
-    didAppear?: (params: ListenerParams) => void;
-    willDisappear?: (params: ListenerParams) => void;
-    didDisappear?: (params: ListenerParams) => void;
-}
-
-export interface ListenerParams {
-    screen: string;
-    startTime: number;
-    endTime: number;
-    commandType: string;
-}
-
-export interface NavigationComponentProps {
-    navigator: Navigator;
-}
-
-export interface NavigatorStyle {
-    navBarTextColor?: string;
-    navBarTextFontSize?: number;
-    navBarTextFontFamily?: string;
-    navBarBackgroundColor?: string;
-    navBarCustomView?: string;
-    navBarComponentAlignment?: 'center' | 'fill';
-    navBarCustomViewInitialProps?: object;
-    navBarButtonColor?: string;
-    topBarElevationShadowEnabled?: boolean;
-    navBarHidden?: boolean;
-    navBarHideOnScroll?: boolean;
-    navBarTranslucent?: boolean;
-    navBarTransparent?: boolean;
-    navBarNoBorder?: boolean;
-    drawUnderNavBar?: boolean;
-    drawUnderTabBar?: boolean;
-    navBarBlur?: boolean;
-    tabBarHidden?: boolean;
-    statusBarHidden?: boolean;
-    statusBarTextColorScheme?: string;
-    navBarSubtitleColor?: string;
-    navBarSubtitleFontFamily?: string;
-    navBarSubtitleFontSize?: number;
-    screenBackgroundColor?: string;
-    orientation?: 'auto' | 'landscape' | 'portrait';
-    disabledButtonColor?: string;
-    // iOS only
-    statusBarTextColorSchemeSingleScreen?: string;
-    statusBarHideWithNavBar?: boolean;
-    statusBarBlur?: boolean;
-    disabledBackGesture?: boolean;
-    disabledSimultaneousGesture?: boolean;
-    screenBackgroundImageName?: string;
-    rootBackgroundImageName?: string;
-    navBarButtonFontSize?: number;
-    navBarButtonFontWeight?: string | number;
-    navBarLeftButtonFontSize?: number;
-    navBarLeftButtonColor?: string;
-    navBarLeftButtonFontWeight?: string | number;
-    navBarRightButtonFontSize?: number;
-    navBarRightButtonColor?: string;
-    navBarRightButtonFontWeight?: string | number;
-    topBarShadowColor?: string;
-    topBarShadowOpacity?: number;
-    topBarShadowOffset?: number;
-    topBarShadowRadius?: number;
-    preferredContentSize?: { width: number, height: number };
-    modalPresentationStyle?: 'formSheet' | 'pageSheet' | 'overFullScreen' | 'overCurrentContext' | 'fullScreen';
-    largeTitle?: boolean;
-    // Android only
-    navigationBarColor?: string;
-    navBarTitleTextCentered?: boolean;
-    navBarButtonFontFamily?: string;
-    statusBarColor?: string;
-    drawUnderStatusBar?: boolean;
-    collapsingToolBarImage?: object;
-    collapsingToolBarCollapsedColor?: string;
-    navBarTextFontBold?: boolean;
-    navBarHeight?: number;
-    navBarTopPadding?: number;
-    topTabsHeight?: number;
-    topBarBorderColor?: string;
-    topBarBorderWidth?: number;
-}
-
-export interface NavigatorButtons {
-    leftButtons?: NavigatorButton[];
-    rightButtons?: NavigatorButton[];
-    fab?: FABAndroid;
-}
-
-export type IdAndroid = 'back' | 'cancel' | 'accept' | 'sideMenu';
-
-export type SystemItemIOS = 'done' | 'cancel' | 'edit' | 'save' | 'add' |
-    'flexibleSpace' | 'fixedSpace' | 'compose' | 'reply' | 'action' | 'organize' |
-    'bookmarks' | 'search' | 'refresh' | 'stop' | 'camera' | 'trash' | 'play' |
-    'pause' | 'rewind' | 'fastForward' | 'undo' | 'redo';
-
-export type ShowAsActionAndroid = 'ifRoom' | 'always' | 'withText' | 'never';
-
-export interface NavigatorButton {
-    id: string | IdAndroid;
-    title?: string;
-    icon?: any;
-    component?: string;
-    passProps?: object;
-    testID?: string;
-    disabled?: boolean;
-    disableIconTint?: boolean;
-    buttonColor?: string;
-    buttonFontSize?: number;
-    buttonFontWeight?: string | number;
-    systemItem?: SystemItemIOS;
-    showAsAction?: ShowAsActionAndroid;
-}
-
-export interface FABAndroid {
-    collapsedId?: string;
-    collapsedIcon?: any;
-    collapsedIconColor?: string;
-    expendedId?: string;
-    expendedIcon?: any;
-    expendedIconColor?: string;
-    backgroundColor?: string;
-    actions?: NavigatorButton[];
-}
-
-export interface Drawer {
-    left?: {
-        screen: string;
-        passProps?: any;
-        disableOpenGesture?: boolean;
-        fixedWidth?: number;
-    };
-    right?: {
-        screen: string;
-        passProps?: any;
-        disableOpenGesture?: boolean;
-        fixedWidth?: number;
-    };
-    style?: {
-        drawerShadow?: boolean;
-        contentOverlayColor?: string;
-        leftDrawerWidth?: number;
-        rightDrawerWidth?: number;
-        shouldStretchDrawer?: boolean;
-    };
-    type?: string;
-    animationType?: string;
-    disableOpenGesture?: boolean;
-}
diff --git a/types/react-native-navigation/react-native-navigation-tests.tsx b/types/react-native-navigation/react-native-navigation-tests.tsx
deleted file mode 100644
index 0a3d593a2b..0000000000
--- a/types/react-native-navigation/react-native-navigation-tests.tsx
+++ /dev/null
@@ -1,216 +0,0 @@
-import * as React from 'react';
-import { Text, View } from 'react-native';
-import {
-    Navigation,
-    NavigationComponentProps,
-    NavigatorStyle,
-    NavigatorButtons,
-    NavigatorEvent,
-    NativeEventsReceiver,
-} from 'react-native-navigation';
-
-type Props = NavigationComponentProps & { height: number };
-
-class Screen1 extends React.Component<Props> {
-    constructor(props: Props) {
-        super(props);
-        this.props.navigator.setOnNavigatorEvent(this.onNavigatorEvent);
-    }
-
-    onNavigatorEvent = (event: NavigatorEvent) => {
-        if (event.id === 'willAppear') {
-            console.log('will appear');
-        } else if (event.type === 'NavBarButtonPress' && event.id === 'sideMenu') {
-            console.log('side menu pressed');
-        }
-    }
-
-    static navigatorButtons: NavigatorButtons = {
-        leftButtons: [{
-            id: 'sideMenu'
-        }]
-    };
-
-    componentDidMount() {
-        this.props.navigator.push<Screen2OwnProps>({
-            screen: 'example.Screen2',
-            overrideBackPress: false,
-            passProps: { name: 'Henrik' },
-        });
-        this.props.navigator.setTabBadge({ badge: null });
-    }
-
-    render() {
-        return (
-            <View style={{ height: this.props.height }}>
-                <Text>Screen 1</Text>
-            </View>
-        );
-    }
-}
-
-interface Screen2OwnProps {
-    name: string;
-}
-
-type Screen2Props = Screen2OwnProps & NavigationComponentProps;
-
-class Screen2 extends React.Component<Screen2Props> {
-    static navigatorStyle: NavigatorStyle = {
-        drawUnderNavBar: true,
-        navBarTranslucent: true
-    };
-
-    componentDidMount() {
-        this.props.navigator.resetTo({ screen: 'example.Screen1' });
-    }
-
-    render() {
-        return (
-            <View>
-                <Text>Screen 2</Text>
-                <Text>Hello {this.props.name}</Text>
-            </View>
-        );
-    }
-}
-
-const Drawer = (props: NavigationComponentProps) => {
-    return (
-        <View>
-            <Text>Drawer</Text>
-        </View>
-    );
-};
-
-interface TestProviderProps {
-    test: string;
-}
-
-class TestProvider extends React.Component<TestProviderProps> {
-    getChildContext() {
-        return {
-            test: this.props.test
-        };
-    }
-
-    render() {
-        return this.props.children;
-    }
-}
-
-Navigation.registerComponent('example.Screen1', () => Screen1, {}, TestProvider, {test: "test"});
-Navigation.registerComponent('example.Screen2', () => Screen2);
-Navigation.registerComponent('example.Drawer', () => Drawer);
-
-Navigation.isAppLaunched().then(appLaunched => {
-    if (appLaunched) {
-      startApp(); // App is launched -> show UI
-    }
-    new NativeEventsReceiver().appLaunched(startApp); // App hasn't been launched yet -> show the UI only when needed.
-});
-
-function startApp() {
-    // do something here
-}
-
-Navigation.startTabBasedApp({
-    tabs: [
-        {
-            label: 'One',
-            screen: 'example.FirstTabScreen',
-            icon: require('../img/one.png'),
-            selectedIcon: require('../img/one_selected.png'),
-            iconInsets: {
-                top: 6,
-                left: 0,
-                bottom: -6,
-                right: 0
-            },
-            title: 'Screen One',
-            titleImage: {},
-            navigatorStyle: {},
-            navigatorButtons: {},
-        },
-        {
-            label: 'Two',
-            screen: 'example.SecondTabScreen',
-            icon: require('../img/two.png'),
-            selectedIcon: require('../img/two_selected.png'),
-            title: 'Screen Two'
-        }
-    ],
-    tabsStyle: {
-        tabBarButtonColor: '#ffff00',
-        tabBarSelectedButtonColor: '#ff9900',
-        tabBarBackgroundColor: '#551A8B',
-        initialTabIndex: 1,
-    },
-    appStyle: {
-        orientation: 'portrait',
-        bottomTabBadgeTextColor: 'red',
-        bottomTabBadgeBackgroundColor: 'green',
-        backButtonImage: {},
-        hideBackButtonTitle: true
-    },
-    drawer: {
-        left: {
-            screen: 'example.FirstSideMenu',
-            passProps: {},
-            fixedWidth: 500,
-        },
-        right: {
-            screen: 'example.SecondSideMenu',
-            passProps: {},
-            fixedWidth: 500,
-        },
-        style: {
-            drawerShadow: true,
-            contentOverlayColor: 'rgba(0,0,0,0.25)',
-            leftDrawerWidth: 50,
-            rightDrawerWidth: 50,
-            shouldStretchDrawer: true
-        },
-        type: 'MMDrawer',
-        animationType: 'door',
-
-        disableOpenGesture: false
-    },
-    passProps: {},
-    animationType: 'slide-down'
-});
-
-Navigation.startSingleScreenApp({
-    screen: {
-        screen: 'example.WelcomeScreen',
-        title: 'Welcome',
-        navigatorStyle: {},
-        navigatorButtons: {}
-    },
-    drawer: {
-        left: {
-            screen: 'example.FirstSideMenu',
-            passProps: {},
-            disableOpenGesture: false,
-            fixedWidth: 500
-        },
-        right: {
-            screen: 'example.SecondSideMenu',
-            passProps: {},
-            disableOpenGesture: false,
-            fixedWidth: 500
-        },
-        style: {
-            drawerShadow: true,
-            contentOverlayColor: 'rgba(0,0,0,0.25)',
-            leftDrawerWidth: 50,
-            rightDrawerWidth: 50
-        },
-        type: 'MMDrawer',
-        animationType: 'door',
-
-        disableOpenGesture: false
-    },
-    passProps: {},
-    animationType: 'slide-down'
-});
diff --git a/types/react-native-navigation/tslint.json b/types/react-native-navigation/tslint.json
deleted file mode 100644
index 486c3a94ef..0000000000
--- a/types/react-native-navigation/tslint.json
+++ /dev/null
@@ -1 +0,0 @@
-{ "extends": "dtslint/dt.json", "rules": {"no-unnecessary-generics": false} }
diff --git a/types/react-native-photo-view/index.d.ts b/types/react-native-photo-view/index.d.ts
index c3f27d78a6..c104b1c0e5 100644
--- a/types/react-native-photo-view/index.d.ts
+++ b/types/react-native-photo-view/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/alwx/react-native-photo-view
 // Definitions by: Christian Chown <https://github.com/christianchown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ImageSourcePropType, ViewProps } from 'react-native';
diff --git a/types/react-native-popup-dialog/index.d.ts b/types/react-native-popup-dialog/index.d.ts
index c295a21ca2..3ff12802f4 100644
--- a/types/react-native-popup-dialog/index.d.ts
+++ b/types/react-native-popup-dialog/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for react-native-popup-dialog 0.9
+// Type definitions for react-native-popup-dialog 1.0
 // 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>
+//                 Michele Bombardi <https://github.com/bm-software>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { GestureResponderEvent, StyleProp, ViewStyle, TextStyle } from 'react-native';
@@ -83,4 +84,7 @@ export class SlideAnimation {
 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> { }
+export default class PopupDialog extends React.Component<PopupDialogProps, any> {
+    show(onShown?: () => void): void;
+    dismiss(onDismissed?: () => void): void;
+}
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
index fdc53cfb88..379d4fd788 100644
--- a/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx
+++ b/types/react-native-popup-dialog/react-native-popup-dialog-tests.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, View, Button } from 'react-native';
 import PopupDialog, {
     DialogTitle,
     DialogButton,
@@ -13,26 +13,52 @@ const scaleAnimation = new ScaleAnimation();
 const fadeAnimation = new FadeAnimation({ animationDuration: 150 });
 
 class Test extends React.Component<any> {
+    fadingPopupDialog: PopupDialog | null;
+    scalingPopupDialog: PopupDialog | null;
+    slidingPopupDialog: PopupDialog | null;
+
+    showPopupDialog(popupDialog: PopupDialog | null) {
+        if (popupDialog !== null) {
+            popupDialog.show(() => console.log('show callback'));
+        }
+    }
+
+    dismissPopupDialog(popupDialog: PopupDialog | null) {
+        if (popupDialog !== null) {
+            popupDialog.dismiss(() => console.log('dismiss callback'));
+        }
+    }
+
     render() {
         return (
             <View>
-                <PopupDialog
+                <Button
+                    onPress={() => this.showPopupDialog(this.fadingPopupDialog)}
+                    title="Show Fading Dialog" />
+                <Button
+                    onPress={() => this.showPopupDialog(this.scalingPopupDialog)}
+                    title="Show Scaling Dialog" />
+                <Button
+                    onPress={() => this.showPopupDialog(this.slidingPopupDialog)}
+                    title="Show Sliding Dialog" />
+
+                <PopupDialog ref={(popupDialog) => this.fadingPopupDialog = popupDialog}
                     dialogTitle={<DialogTitle title="Popup Dialog - Fade Animation" />}
                     dialogAnimation={fadeAnimation}
                 />
-                <PopupDialog
+                <PopupDialog ref={(popupDialog) => this.scalingPopupDialog = popupDialog}
                     dialogTitle={<DialogTitle title="Popup Dialog - Scale Animation" />}
                     dialogAnimation={scaleAnimation}
                     actions={[
                         <DialogButton
                             text="CLOSE"
-                            onPress={(event) => { }}
+                            onPress={(event) => this.dismissPopupDialog(this.scalingPopupDialog)}
                             textStyle={{ color: "red" }}
                             key="button-1"
                         />,
                     ]}
                 />
-                <PopupDialog
+                <PopupDialog ref={(popupDialog) => this.slidingPopupDialog = popupDialog}
                     dialogTitle={<DialogTitle title="Popup Dialog - Slide Animation" />}
                     width={300}
                     height={300}
diff --git a/types/react-native-qrcode/index.d.ts b/types/react-native-qrcode/index.d.ts
index 7c745aa1b6..97709c5792 100644
--- a/types/react-native-qrcode/index.d.ts
+++ b/types/react-native-qrcode/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-native-safari-view/index.d.ts b/types/react-native-safari-view/index.d.ts
index 658a6664ce..77b8aa15e8 100644
--- a/types/react-native-safari-view/index.d.ts
+++ b/types/react-native-safari-view/index.d.ts
@@ -2,7 +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.6
+// TypeScript Version: 2.8
 
 import { EmitterSubscription } from 'react-native';
 
diff --git a/types/react-native-scrollable-tab-view/index.d.ts b/types/react-native-scrollable-tab-view/index.d.ts
index 962ba8a810..9be23aa66c 100644
--- a/types/react-native-scrollable-tab-view/index.d.ts
+++ b/types/react-native-scrollable-tab-view/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: CaiHuan <https://github.com/CaiHuan>
 //                 Egor Shulga <https://github.com/egorshulga>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { Animated, ScrollViewProps, ViewStyle, TextStyle } from 'react-native';
diff --git a/types/react-native-sensor-manager/index.d.ts b/types/react-native-sensor-manager/index.d.ts
index 0b0f0bf67a..9c25be10ba 100644
--- a/types/react-native-sensor-manager/index.d.ts
+++ b/types/react-native-sensor-manager/index.d.ts
@@ -2,7 +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.6
+// TypeScript Version: 2.8
 
 /// <reference types="react-native" />
 
diff --git a/types/react-native-settings-list/index.d.ts b/types/react-native-settings-list/index.d.ts
new file mode 100644
index 0000000000..e04b856296
--- /dev/null
+++ b/types/react-native-settings-list/index.d.ts
@@ -0,0 +1,149 @@
+// Type definitions for react-native-settings-list 1.8
+// Project: https://github.com/evetstech/react-native-settings-list
+// Definitions by: MrLuje <https://github.com/MrLuje>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Component, ReactNode } from "react";
+import { TextStyle, StyleProp, ImageStyle, ViewStyle } from "react-native";
+
+interface SettingsListProps {
+    /**
+     * default: white
+     */
+    backgroundColor?: string;
+    /**
+     * default: black
+     */
+    borderColor?: string;
+    /**
+     * default: 50
+     */
+    defaultItemSize?: number;
+    /**
+     * default: transparent
+     */
+    underlayColor?: string;
+    /**
+     * default: {fontSize: 16}
+     */
+    defaultTitleStyle?: StyleProp<TextStyle>;
+    defaultTitleInfoPosition?: string;
+    scrollViewProps?: object;
+}
+declare class SettingsList extends Component<SettingsListProps> {}
+
+interface HeaderProps {
+    headerText?: string;
+    headerStyle?: StyleProp<TextStyle>;
+    headerRef?: () => void;
+    /**
+     * default: 1
+     */
+    headerNumberOfLines?: number;
+}
+
+interface ItemProps {
+    /**
+     * Title being displayed
+     */
+    title?: string;
+    titleStyle?: StyleProp<TextStyle>;
+    /**
+     * Icon displayed on the left of the settings item
+     */
+    icon?: ReactNode;
+
+    /**
+     * Item Box Style
+     */
+    itemBoxStyle?: StyleProp<ViewStyle>;
+    /**
+     * Title Box Style
+     */
+    titleBoxStyle?: StyleProp<ViewStyle>;
+    /**
+     * Right Side Style
+     */
+    rightSideStyle?: StyleProp<ViewStyle>;
+    /**
+     * Editable Right Side Style
+     */
+    editableTextStyle?: StyleProp<TextStyle>;
+
+    /**
+     * Individual item width.  Can be globally set in the parent.  Will become deprecated
+     */
+    itemWidth?: number;
+    /**
+     * Allows for the item to become an auth item
+     */
+    isAuth?: boolean;
+    authPropsUser?: object;
+    authPropsPW?: object;
+    /**
+     * Individual background color. Can be globally set in the parent. Will become Deprecated
+     */
+    backgroundColor?: string;
+
+    /**
+     * Individual underlay click color.  Can be globally set in the parent.
+     */
+    underlayColor?: string;
+    /**
+     * Item on press callback.
+     */
+    onPress?: () => void;
+    /**
+     * Item on long press callback.
+     */
+    onLongPress?: () => void;
+    /**
+     * Enable or disable the > arrow at the end of the setting item.
+     * Default: true
+     */
+    hasNavArrow?: boolean;
+    arrowIcon?: ReactNode;
+
+    arrowStyle?: StyleProp<ImageStyle>;
+    /**
+     * Enable or disable a Switch component
+     */
+    hasSwitch?: boolean;
+    /**
+     * Switch state
+     */
+    switchState?: boolean;
+    /**
+     * Switch props
+     */
+    switchProps?: object;
+    /**
+     * On value change callback
+     */
+    switchOnValueChange?: () => void;
+    /**
+     * Right side information on the setting item
+     */
+    titleInfo?: string;
+    titleInfoStyle?: StyleProp<TextStyle>;
+    /**
+     * If 'Bottom'; info is placed beneath the title
+     */
+    titleInfoPosition?: string;
+    /**
+     * Right side content
+     */
+    rightSideContent?: ReactNode;
+    /* Gives opens to hide specific borders */
+    borderHide?: "Top" | "Bottom" | "Both";
+
+    itemRef?: () => void;
+}
+
+declare namespace SettingsList {
+    class Header extends Component<HeaderProps> {}
+    class Item extends Component<ItemProps> {}
+}
+
+export default SettingsList;
diff --git a/types/react-native-settings-list/react-native-settings-list-tests.tsx b/types/react-native-settings-list/react-native-settings-list-tests.tsx
new file mode 100644
index 0000000000..4cb31905e8
--- /dev/null
+++ b/types/react-native-settings-list/react-native-settings-list-tests.tsx
@@ -0,0 +1,219 @@
+"use strict";
+import { AppRegistry, StyleSheet, Text, Image, View } from "react-native";
+
+import SettingsList from "react-native-settings-list";
+import { Component } from "react";
+
+class SettingsListExample extends Component {
+    render() {
+        return (
+            <View style={{ backgroundColor: "#f6f6f6", flex: 1 }}>
+                <View
+                    style={{
+                        borderBottomWidth: 1,
+                        backgroundColor: "#263238",
+                        borderColor: "#c8c7cc"
+                    }}
+                >
+                    <Text
+                        style={{
+                            color: "white",
+                            marginTop: 15,
+                            marginBottom: 15,
+                            marginLeft: 15,
+                            fontWeight: "bold",
+                            fontSize: 20
+                        }}
+                    >
+                        Settings
+                    </Text>
+                </View>
+                <View style={{ backgroundColor: "#f6f6f6", flex: 1 }}>
+                    <SettingsList borderColor="#d6d5d9" defaultItemSize={50}>
+                        <SettingsList.Item
+                            hasNavArrow={false}
+                            title="Wireless & networks"
+                            titleStyle={{
+                                color: "#009688",
+                                marginBottom: 10,
+                                fontWeight: "500"
+                            }}
+                            itemWidth={50}
+                            borderHide={"Both"}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 22,
+                                            width: 22
+                                        }}
+                                        source={require("./images/data.png")}
+                                    />
+                                </View>
+                            }
+                            hasNavArrow={false}
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            title="Data usage"
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 4,
+                                            width: 18
+                                        }}
+                                        source={require("./images/more.png")}
+                                    />
+                                </View>
+                            }
+                            title="More"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Header headerStyle={{ marginTop: -5 }} />
+                        <SettingsList.Item
+                            hasNavArrow={false}
+                            title="Device"
+                            titleStyle={{
+                                color: "#009688",
+                                marginBottom: 10,
+                                fontWeight: "bold"
+                            }}
+                            itemWidth={70}
+                            borderHide={"Both"}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 22,
+                                            width: 22
+                                        }}
+                                        source={require("./images/display2.png")}
+                                    />
+                                </View>
+                            }
+                            title="Display"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 20,
+                                            width: 18
+                                        }}
+                                        source={require("./images/sound.png")}
+                                    />
+                                </View>
+                            }
+                            title="Sound & notification"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 22,
+                                            width: 14
+                                        }}
+                                        source={require("./images/apps.png")}
+                                    />
+                                </View>
+                            }
+                            title="Apps"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 14,
+                                            width: 20
+                                        }}
+                                        source={require("./images/storage.png")}
+                                    />
+                                </View>
+                            }
+                            title="Storage & USB"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 22,
+                                            width: 14
+                                        }}
+                                        source={require("./images/battery.png")}
+                                    />
+                                </View>
+                            }
+                            title="Battery"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Item
+                            icon={
+                                <View style={styles.imageStyle}>
+                                    <Image
+                                        style={{
+                                            alignSelf: "center",
+                                            height: 18,
+                                            width: 20
+                                        }}
+                                        source={require("./images/memory.png")}
+                                    />
+                                </View>
+                            }
+                            title="Memory"
+                            itemWidth={70}
+                            titleStyle={{ color: "black", fontSize: 16 }}
+                            hasNavArrow={false}
+                        />
+                        <SettingsList.Header headerStyle={{ marginTop: -5 }} />
+                    </SettingsList>
+                </View>
+            </View>
+        );
+    }
+}
+
+const styles = StyleSheet.create({
+    imageStyle: {
+        marginLeft: 15,
+        marginRight: 20,
+        alignSelf: "center",
+        width: 20,
+        height: 24,
+        justifyContent: "center"
+    }
+});
+
+AppRegistry.registerComponent("SettingsListExample", () => SettingsListExample);
diff --git a/types/react-native-settings-list/tsconfig.json b/types/react-native-settings-list/tsconfig.json
new file mode 100644
index 0000000000..aef7cfc242
--- /dev/null
+++ b/types/react-native-settings-list/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react-native"
+    },
+    "files": [
+        "index.d.ts",
+        "react-native-settings-list-tests.tsx"
+    ]
+}
diff --git a/types/react-native-settings-list/tslint.json b/types/react-native-settings-list/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-settings-list/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-share/index.d.ts b/types/react-native-share/index.d.ts
new file mode 100644
index 0000000000..d407d4df96
--- /dev/null
+++ b/types/react-native-share/index.d.ts
@@ -0,0 +1,32 @@
+// Type definitions for react-native-share 1.0
+// Project: https://github.com/react-native-community/react-native-share#readme
+// Definitions by: Mark Nelissen <https://github.com/marknelissen>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace Share {
+    function open(options: OpenOptions): Promise<any>;
+    function shareSingle(options: ShareSingleOptions): Promise<any>;
+}
+
+export default Share;
+
+interface OpenOptions {
+    url: string;
+    type?: string;
+    message: string;
+    title?: string;
+    subject?: string;
+    excludedActivityTypes?: string;
+    showAppsToview?: boolean;
+}
+
+interface ShareSingleOptions {
+    url: string;
+    type?: string;
+    message: string;
+    title?: string;
+    subject?: string;
+    social: SupportedSocialApps;
+}
+
+type SupportedSocialApps = 'twitter' | 'facebook' | 'whatsapp' | 'googleplus' | 'email';
diff --git a/types/react-native-share/react-native-share-tests.ts b/types/react-native-share/react-native-share-tests.ts
new file mode 100644
index 0000000000..375a4af4b6
--- /dev/null
+++ b/types/react-native-share/react-native-share-tests.ts
@@ -0,0 +1,35 @@
+import Share from 'react-native-share';
+
+// $ExpectType Promise<any>
+Share.open({
+    url: '',
+    message: '',
+});
+
+// $ExpectType Promise<any>
+Share.open({
+    url: '',
+    type: '',
+    message: '',
+    title: '',
+    subject: '',
+    excludedActivityTypes: '',
+    showAppsToview: true,
+});
+
+// $ExpectType Promise<any>
+Share.shareSingle({
+    url: '',
+    message: '',
+    social: 'facebook',
+});
+
+// $ExpectType Promise<any>
+Share.shareSingle({
+    url: '',
+    type: '',
+    message: '',
+    title: '',
+    subject: '',
+    social: 'facebook',
+});
diff --git a/types/react-native-share/tsconfig.json b/types/react-native-share/tsconfig.json
new file mode 100644
index 0000000000..856345956d
--- /dev/null
+++ b/types/react-native-share/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-native-share-tests.ts"
+    ]
+}
diff --git a/types/react-native-share/tslint.json b/types/react-native-share/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-share/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-snap-carousel/index.d.ts b/types/react-native-snap-carousel/index.d.ts
index 56b083638b..0679b4ac82 100644
--- a/types/react-native-snap-carousel/index.d.ts
+++ b/types/react-native-snap-carousel/index.d.ts
@@ -1,10 +1,12 @@
-// Type definitions for react-native-snap-carousel 3.6
+// Type definitions for react-native-snap-carousel 3.7
 // Project: https://github.com/archriss/react-native-snap-carousel
 // Definitions by: jnbt <https://github.com/jnbt>
 //                 Jacob Froman <https://github.com/j-fro>
 //                 Nikolay Polukhin <https://github.com/gazaret>
+//                 Guillaume Amat <https://github.com/GuillaumeAmat>
+//                 Vitor Luiz Cavalcanti <https://github.com/VitorLuizC>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import {
@@ -106,6 +108,10 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProps> {
      * if `enableMomentum` is `true`
      */
     lockScrollWhileSnapping?: boolean;
+    /**
+     * Changes default lock's timeout duration in ms.
+     */
+    lockScrollTimeoutDuration?: number;
     /**
      * When momentum is disabled, this prop defines the timeframe during which multiple
      * callback calls should be "grouped" into a single one. This debounce also helps
@@ -113,6 +119,10 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProps> {
      * Note that this will delay callback's execution.
      */
     scrollEndDragDebounceValue?: number;
+    /**
+     * Allow scroll independently of user interaction on carousel. `false` as default.
+     */
+    scrollEnabled?: boolean;
     /**
      * Whether to implement a shouldComponentUpdate strategy to minimize updates
      */
@@ -220,7 +230,7 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProps> {
     /**
      * Used to define custom interpolations
      */
-    slideInterpolatedStyle?(animatedValue: number, carouselProps: CarouselProps<any>): StyleProp<ViewStyle>;
+    slideInterpolatedStyle?(index: number, animatedValue: Animated.AnimatedValue, carouselProps: CarouselProps<any>): StyleProp<ViewStyle>;
     /**
      * Optional style for each item's container (the one whose scale and opacity are animated)
      */
@@ -241,6 +251,11 @@ export interface CarouselProps<T> extends React.Props<ScrollViewProps> {
      * Callback fired when navigating to an item
      */
     onSnapToItem?(slideIndex: number): void;
+
+    /**
+     * Callback fired before navigating to an item
+     */
+    onBeforeSnapToItem?(slideIndex: number): void;
 }
 
 export interface CarouselStatic<T> extends React.ComponentClass<CarouselProps<T>> {
@@ -264,15 +279,15 @@ export interface CarouselStatic<T> extends React.ComponentClass<CarouselProps<T>
     /**
      * Snap to an item manually
      */
-    snapToItem(index: number, animated?: boolean, fireCallback?: boolean, initial?: boolean): void;
+    snapToItem(index: number, animated?: boolean, fireCallback?: boolean): void;
     /**
      * Snap to next item manually
      */
-    snapToNext(animated?: boolean): void;
+    snapToNext(animated?: boolean, fireCallback?: boolean): void;
     /**
      * Snap to previous item manually
      */
-    snapToPrev(animated?: boolean): void;
+    snapToPrev(animated?: boolean, fireCallback?: boolean): void;
     /**
      * Call this when needed to work around a random FlatList bug that keeps content hidden until the carousel is scrolled
      * (see #238). Note that the offset parameter is not required and will default to either 1 or -1 depending
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 4af5890ea6..8e99cc95dc 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
@@ -35,6 +35,8 @@ class SnapCarouselTest extends React.Component {
                     enableMomentum={true}
                     keyboardDismissMode='interactive'
                     onSnapToItem={this.onSnapToItem}
+                    onBeforeSnapToItem={this.onBeforeSnapToItem}
+                    lockScrollTimeoutDuration={900}
                     onScroll={this.onScroll}
                     onLayout={this.onLayout}
                     scrollEndDragDebounceValue={100}
@@ -51,6 +53,10 @@ class SnapCarouselTest extends React.Component {
         );
     }
 
+    private readonly onBeforeSnapToItem = (index: number) => {
+        console.log("Before snap to: ", index);
+    }
+
     private readonly onSnapToItem = (index: number) => {
         console.log("Snapped to: ", index);
     }
@@ -65,10 +71,7 @@ class SnapCarouselTest extends React.Component {
 }
 
 class SnapCarouselWithPaginationTest extends React.Component<{}, {activeSlide: number}> {
-    constructor(props: {}) {
-        super(props);
-        this.state = { activeSlide: 0 };
-    }
+    state = { activeSlide: 0 };
 
     renderItem({ item }: { item: string }): React.ReactNode {
         return (
diff --git a/types/react-native-sortable-grid/index.d.ts b/types/react-native-sortable-grid/index.d.ts
index 392e9b1b01..0551d56efe 100644
--- a/types/react-native-sortable-grid/index.d.ts
+++ b/types/react-native-sortable-grid/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { StyleProp, ViewStyle, Animated } from 'react-native';
diff --git a/types/react-native-sortable-list/index.d.ts b/types/react-native-sortable-list/index.d.ts
index d5466c8f68..ac449da6d4 100755
--- a/types/react-native-sortable-list/index.d.ts
+++ b/types/react-native-sortable-list/index.d.ts
@@ -2,10 +2,10 @@
 // Project: https://github.com/gitim/react-native-sortable-list
 // Definitions by: Michael Sivolobov <https://github.com/sivolobov>, Vince Maiuri <https://github.com/RookY2K>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
-import { ViewStyle } from 'react-native';
+import { StyleProp, ViewStyle } from 'react-native';
 
 type DataKey = string | number;
 
@@ -44,17 +44,17 @@ interface SortableListProps {
     /**
      * style of HOC
      */
-    style?: ViewStyle
+    style?: StyleProp<ViewStyle>
 
     /**
      * these styles will be applied to the inner scroll view content container
      */
-    contentContainerStyle?: ViewStyle
+    contentContainerStyle?: StyleProp<ViewStyle>
 
     /**
      * these styles will be applied to the inner scroll view content container, excluding the header and footer
      */
-    innerContainerStyle?: ViewStyle
+    innerContainerStyle?: StyleProp<ViewStyle>
 
     /**
      * when true, the SortableList's children are arranged horizontally in a row instead of vertically in a column.
diff --git a/types/react-native-star-rating/index.d.ts b/types/react-native-star-rating/index.d.ts
index 2285134c8f..a26002bf88 100644
--- a/types/react-native-star-rating/index.d.ts
+++ b/types/react-native-star-rating/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/djchie/react-native-star-rating
 // Definitions by: iRoachie <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ImageURISource, StyleProp, ViewStyle } from 'react-native';
diff --git a/types/react-native-star-rating/react-native-star-rating-tests.tsx b/types/react-native-star-rating/react-native-star-rating-tests.tsx
index 377e802a1d..0ef11162b4 100644
--- a/types/react-native-star-rating/react-native-star-rating-tests.tsx
+++ b/types/react-native-star-rating/react-native-star-rating-tests.tsx
@@ -6,13 +6,9 @@ interface State {
 }
 
 class GeneralStarExample extends React.Component<{}, State> {
-    constructor(props: {}) {
-        super(props);
-
-        this.state = {
-            starCount: 3.5
-        };
-    }
+    state = {
+        starCount: 3.5
+    };
 
     onStarRatingPress = (rating: number) => {
         this.setState({
diff --git a/types/react-native-svg-charts/index.d.ts b/types/react-native-svg-charts/index.d.ts
index 88bde6c6d0..caf7b610b8 100644
--- a/types/react-native-svg-charts/index.d.ts
+++ b/types/react-native-svg-charts/index.d.ts
@@ -18,10 +18,10 @@ import {
 } from 'react-native-svg';
 
 export type ScaleType<Range, Output> =
-    | ScaleLinear<Range, Output>
-    | ScaleLogarithmic<Range, Output>
-    | ScalePower<Range, Output>
-    | ScaleTime<Range, Output>;
+| ScaleLinear<Range, Output>
+| ScaleLogarithmic<Range, Output>
+| ScalePower<Range, Output>
+| ScaleTime<Range, Output>;
 
 export type ScaleFunction = () => ScaleType<any, any> | ScaleBand<any>;
 export type AccessorFunction<T, U> = (props: { item: T, index: number }) => U;
@@ -128,7 +128,8 @@ export interface StackedBarChartProps<T> extends ChartProps<T> {
     offset?: OffsetFunction;
     order?: OrderFunction;
     strokeColor?: string;
-    renderGradient: (props: { id: string }) => React.Component<LinearGradientProps | RadialGradientProps>;
+    horizontal?: boolean;
+    renderGradient?: (props: { id: string }) => React.Component<LinearGradientProps | RadialGradientProps>;
     spacingInner?: number;
     spacingOuter?: number;
     showGrid?: boolean;
@@ -216,21 +217,15 @@ export interface HorizontalLineProps {
 }
 
 // Point
-
 export interface PointProps {
-    x: (index: number) => number;
-    y: (value: number) => number;
     value?: number;
     radius?: number;
     index?: number;
-    color: string;
+    color?: string;
 }
 
 // Tooltip
-
 export interface TooltipProps {
-    x: (index: number) => number;
-    y: (value: number) => number;
     value?: number;
     index?: number;
     height?: number;
@@ -240,9 +235,9 @@ export interface TooltipProps {
 }
 
 export namespace Decorators {
-    class HorizontalLine extends React.Component<HorizontalLineProps> {}
-    class Point extends React.Component<PointProps> {}
-    class Tooltip extends React.Component<TooltipProps> {}
+    export class HorizontalLine extends React.Component<HorizontalLineProps> {}
+    export class Point extends React.Component<PointProps> {}
+    export class Tooltip extends React.Component<TooltipProps> {}
 }
 
 export type GridDirection = 'VERTICAL' | 'HORIZONTAL' | 'BOTH';
diff --git a/types/react-native-svg-charts/react-native-svg-charts-tests.tsx b/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
index 5f12c801fc..83c2639b40 100644
--- a/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
+++ b/types/react-native-svg-charts/react-native-svg-charts-tests.tsx
@@ -1,6 +1,7 @@
 import * as React from 'react';
+import { View } from 'react-native';
 import { Defs, LinearGradient, Stop } from 'react-native-svg';
-import { StackedAreaChart, XAxis, Grid } from 'react-native-svg-charts';
+import { StackedAreaChart, StackedBarChart, XAxis, Grid, Decorators } from 'react-native-svg-charts';
 import { curveNatural } from 'd3-shape';
 import { scaleTime } from 'd3-scale';
 
@@ -17,58 +18,79 @@ interface Props {
 }
 
 class Example extends React.Component<Props> {
+    renderStackedAreaChart = ({data, width}: Props) => (
+        <StackedAreaChart
+            style={{ height: 200 }}
+            data={data}
+            keys={['totalMemoryConsumption', 'privateMemoryConsumption']}
+            colors={['url(#totalMemoryConsumption)', 'url(#privateMemoryConsumption)']}
+            contentInset={{ top: 20 }}
+            curve={curveNatural}
+            showGrid={true}
+            animate={true}
+            animationDuration={350}
+            numberOfTicks={10}
+        >
+            <Defs key="defs">
+                <LinearGradient id="totalMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
+                    <Stop offset="0%" stopColor="#4ccfef" stopOpacity={0.9} />
+                    <Stop offset="100%" stopColor="#182b41" stopOpacity={0.9} />
+                </LinearGradient>
+                <LinearGradient id="privateMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
+                    <Stop offset="0%" stopColor="#a1d343" stopOpacity={0.8} />
+                    <Stop offset="100%" stopColor="#a1d343" stopOpacity={0.3} />
+                </LinearGradient>
+            </Defs>
+            <XAxis
+                data={data}
+                formatLabel={(value) => new Date(value).toTimeString()}
+                numberOfTicks={8}
+                scale={scaleTime}
+                contentInset={{ left: 10, right: 10 }}
+                svg={{
+                    fillOpacity: .2,
+                    fill: '#fff',
+                    fontFamily: 'Regular',
+                    fontSize: 10,
+                }}
+                xAccessor={({ item }) => item.time}
+            />
+            <Grid
+                direction="BOTH"
+                ticks={[20, 40, 60, 80]}
+                x={x => x * width}
+                y={y => y * width}
+                svg={{
+                    stroke: '#fff',
+                    strokeOpacity: .2,
+                }}
+                belowChart={true}
+            />
+            <Decorators.Tooltip text="Test" />
+            <Decorators.Point />
+        </StackedAreaChart>
+    )
+
+    renderStackedBarChart = ({data, width}: Props) => (
+        <StackedBarChart
+          animate={true}
+          animationDuration={250}
+          style={{ height: 100 }}
+          keys={['totalMemoryConsumption', 'privateMemoryConsumption']}
+          colors={['green', 'red']}
+          data={data}
+          horizontal={true}
+          contentInset={{ top: 10, bottom: 20 }}
+        />
+    )
+
 	render() {
         const { data, width } = this.props;
 		return (
-            <StackedAreaChart
-                style={{ height: 200 }}
-                data={data}
-                keys={['totalMemoryConsumption', 'privateMemoryConsumption']}
-                colors={['url(#totalMemoryConsumption)', 'url(#privateMemoryConsumption)']}
-                contentInset={{ top: 20 }}
-                curve={curveNatural}
-                showGrid={true}
-                animate={true}
-                animationDuration={350}
-                numberOfTicks={10}
-
-            >
-                <Defs key="defs">
-                    <LinearGradient id="totalMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
-                        <Stop offset="0%" stopColor="#4ccfef" stopOpacity={0.9} />
-                        <Stop offset="100%" stopColor="#182b41" stopOpacity={0.9} />
-                    </LinearGradient>
-                    <LinearGradient id="privateMemoryConsumption" x1="0%" y1="0%" x2="0%" y2="100%">
-                        <Stop offset="0%" stopColor="#a1d343" stopOpacity={0.8} />
-                        <Stop offset="100%" stopColor="#a1d343" stopOpacity={0.3} />
-                    </LinearGradient>
-                </Defs>
-                <XAxis
-                    data={data}
-                    formatLabel={(value) => new Date(value).toTimeString()}
-                    numberOfTicks={8}
-                    scale={scaleTime}
-                    contentInset={{ left: 10, right: 10 }}
-                    svg={{
-                        fillOpacity: .2,
-                        fill: '#fff',
-                        fontFamily: 'Regular',
-                        fontSize: 10,
-                    }}
-                    xAccessor={({ item }) => item.time}
-                />
-                <Grid
-                    direction="BOTH"
-                    ticks={[20, 40, 60, 80]}
-                    x={x => x * width}
-                    y={y => y * width}
-                    svg={{
-                        stroke: '#fff',
-                        strokeOpacity: .2,
-                    }}
-                    belowChart={true}
-                />
-            </StackedAreaChart>
+            <View>
+                {this.renderStackedAreaChart(this.props)}
+                {this.renderStackedBarChart(this.props)}
+            </View>
 		);
 	}
 }
diff --git a/types/react-native-svg-charts/tslint.json b/types/react-native-svg-charts/tslint.json
index 3db14f85ea..c040aa7670 100644
--- a/types/react-native-svg-charts/tslint.json
+++ b/types/react-native-svg-charts/tslint.json
@@ -1 +1,6 @@
-{ "extends": "dtslint/dt.json" }
+{ 
+		"extends": "dtslint/dt.json",
+		"rules": {
+				"strict-export-declare-modifiers": false
+		}
+}
diff --git a/types/react-native-svg-uri/index.d.ts b/types/react-native-svg-uri/index.d.ts
index 4529c53d5e..a47550bced 100644
--- a/types/react-native-svg-uri/index.d.ts
+++ b/types/react-native-svg-uri/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/matiascba/react-native-svg-uri#readme
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ImageURISource } from 'react-native';
diff --git a/types/react-native-swiper/index.d.ts b/types/react-native-swiper/index.d.ts
index c6616aea0c..8a6555f787 100644
--- a/types/react-native-swiper/index.d.ts
+++ b/types/react-native-swiper/index.d.ts
@@ -4,11 +4,12 @@
 //                 HuHuanming <https://github.com/huhuanming>
 //                 mhcgrq <https://github.com/mhcgrq>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import {
   ViewStyle,
+  StyleProp,
   NativeSyntheticEvent,
   NativeScrollEvent,
 } from 'react-native';
@@ -31,7 +32,7 @@ export interface SwiperState {
 export interface SwiperProperties extends React.Props<Swiper> {
   horizontal?: boolean;
 
-  style?: ViewStyle;
+  style?: StyleProp<ViewStyle>;
 
   pagingEnabled?: boolean;
 
@@ -71,9 +72,9 @@ export interface SwiperProperties extends React.Props<Swiper> {
 
   renderPagination?(index: number, total: number, thisObject: Swiper): JSX.Element;
 
-  dotStyle?: ViewStyle;
+  dotStyle?: StyleProp<ViewStyle>;
 
-  activeDotStyle?: ViewStyle;
+  activeDotStyle?: StyleProp<ViewStyle>;
 
   activeDot?: JSX.Element;
 
@@ -87,9 +88,9 @@ export interface SwiperProperties extends React.Props<Swiper> {
 
   width?: number;
 
-  paginationStyle?: ViewStyle;
+  paginationStyle?: StyleProp<ViewStyle>;
 
-  buttonWrapperStyle?: ViewStyle;
+  buttonWrapperStyle?: StyleProp<ViewStyle>;
 
   nextButton?: JSX.Element;
 
diff --git a/types/react-native-tab-navigator/index.d.ts b/types/react-native-tab-navigator/index.d.ts
index 1f4e5e5437..1586b7279a 100644
--- a/types/react-native-tab-navigator/index.d.ts
+++ b/types/react-native-tab-navigator/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/exponentjs/react-native-tab-navigator#readme
 // Definitions by: My Self <https://github.com/iRoachie>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ViewStyle, TextStyle } from 'react-native';
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 18a6ae62ba..1b3bff9438 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
@@ -9,13 +9,9 @@ interface TabTestState {
 const tabBarImage = 'https://assets-cdn.github.com/images/modules/logos_page/GitHub-Mark.png';
 
 class TabTest extends React.Component<any, TabTestState> {
-    constructor() {
-        super({});
-
-        this.state = {
-            selectedTab: 'home'
-        };
-    }
+    state = {
+        selectedTab: 'home'
+    };
 
     render() {
         return (
diff --git a/types/react-native-tab-view/index.d.ts b/types/react-native-tab-view/index.d.ts
index c761d80d14..078247e97d 100644
--- a/types/react-native-tab-view/index.d.ts
+++ b/types/react-native-tab-view/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/react-native-community/react-native-tab-view
 // Definitions by: Kalle Ott <https://github.com/kaoDev>
 //                 Kyle Roach <https://github.com/iRoachie>
+//                 Tim Wang <https://github.com/timwangdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 import { PureComponent, ReactNode, ComponentType } from 'react'
 import {
   Animated,
@@ -91,10 +92,7 @@ export type TabViewProps<
   style?: StyleProp<ViewStyle>
 }
 
-export class TabView<T extends Route = Route> extends PureComponent<
-  TabViewProps<T>,
-  any
-> {}
+export class TabView<T extends Route = Route> extends PureComponent<TabViewProps<T>> {}
 
 export type GestureEvent = {
   nativeEvent: {
@@ -144,10 +142,7 @@ export type DefaultTransitionSpec = {
   friction: 35
 }
 
-export class PagerPan<T extends Route = Route> extends PureComponent<
-  PagerPanProps<T>,
-  void
-> {
+export class PagerPan<T extends Route = Route> extends PureComponent<PagerPanProps<T>> {
   static defaultProps: {
     configureTransition: () => DefaultTransitionSpec
     initialLayout: {
@@ -176,10 +171,7 @@ export type PagerScrollProps<
   children?: ReactNode
 }
 
-export class PagerScroll<T extends Route = Route> extends PureComponent<
-PagerScrollProps<T>,
-  any
-> {}
+export class PagerScroll<T extends Route = Route> extends PureComponent<PagerScrollProps<T>> {}
 
 export type PageScrollEvent = {
   nativeEvent: {
@@ -198,10 +190,7 @@ export type PagerAndroidProps<
   children?: ReactNode
 }
 
-export class PagerAndroid<T extends Route = Route> extends PureComponent<
-  PagerAndroidProps<T>,
-  void
-> {}
+export class PagerAndroid<T extends Route = Route> extends PureComponent<PagerAndroidProps<T>> {}
 
 export type IndicatorProps<
   T extends RouteBase = RouteBase
@@ -227,10 +216,7 @@ export type TabBarProps<T extends RouteBase = RouteBase> = SceneRendererProps<
   style?: StyleProp<ViewStyle>
 }
 
-export class TabBar<T extends Route = Route> extends PureComponent<
-  TabBarProps<T>,
-  any
-> {}
+export class TabBar<T extends Route = Route> extends PureComponent<TabBarProps<T>> {}
 
 export function SceneMap(scenes: {
   [key: string]: ComponentType<any>
diff --git a/types/react-native-text-input-mask/index.d.ts b/types/react-native-text-input-mask/index.d.ts
index e95e68d7f7..4cf4b392dc 100644
--- a/types/react-native-text-input-mask/index.d.ts
+++ b/types/react-native-text-input-mask/index.d.ts
@@ -2,19 +2,225 @@
 // Project: https://github.com/react-native-community/react-native-text-input-mask
 // Definitions by: Rodrigo Weber <https://github.com/RodrigoAWeber>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import * as ReactNative from "react-native";
 
 export type onChangeTextCallback = (formatted: string, extracted: string) => void;
 
-export interface TextInputMaskProps {
+export interface TextInputMaskProps extends ReactNative.ViewProps, ReactNative.TextInputIOSProps, ReactNative.TextInputAndroidProps, ReactNative.AccessibilityProps {
     maskDefaultValue?: boolean;
     mask: string;
-    value?: string;
     onChangeText: onChangeTextCallback;
-    keyboardType?: 'default' | 'numeric' | 'email-address' | 'phone-pad';
+
+    // Export standard TextInputProps from here on.
+    // Workaround for not being able to override onChangeText
+    // Copied from React-Native types version: 0.55
+
+    /**
+     * Specifies whether fonts should scale to respect Text Size accessibility settings.
+     * The default is `true`.
+     */
+    allowFontScaling?: boolean;
+
+    /**
+     * Can tell TextInput to automatically capitalize certain characters.
+     *      characters: all characters,
+     *      words: first letter of each word
+     *      sentences: first letter of each sentence (default)
+     *      none: don't auto capitalize anything
+     *
+     * https://facebook.github.io/react-native/docs/textinput.html#autocapitalize
+     */
+    autoCapitalize?: "none" | "sentences" | "words" | "characters";
+
+    /**
+     * If false, disables auto-correct.
+     * The default value is true.
+     */
+    autoCorrect?: boolean;
+
+    /**
+     * If true, focuses the input on componentDidMount.
+     * The default value is false.
+     */
+    autoFocus?: boolean;
+
+    /**
+     * If true, the text field will blur when submitted.
+     * The default value is true.
+     */
+    blurOnSubmit?: boolean;
+
+    /**
+     * If true, caret is hidden. The default value is false.
+     */
+    caretHidden?: boolean;
+
+    /**
+     * Provides an initial value that will change when the user starts typing.
+     * Useful for simple use-cases where you don't want to deal with listening to events
+     * and updating the value prop to keep the controlled state in sync.
+     */
+    defaultValue?: string;
+
+    /**
+     * If false, text is not editable. The default value is true.
+     */
+    editable?: boolean;
+
+    /**
+     * enum("default", 'numeric', 'email-address', "ascii-capable", 'numbers-and-punctuation', 'url', 'number-pad', 'phone-pad', 'name-phone-pad',
+     * 'decimal-pad', 'twitter', 'web-search', '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?: ReactNative.KeyboardTypeOptions;
+
+    /**
+     * Limits the maximum number of characters that can be entered.
+     * Use this instead of implementing the logic in JS to avoid flicker.
+     */
+    maxLength?: number;
+
+    /**
+     * If true, the text input can be multiple lines. The default value is false.
+     */
+    multiline?: boolean;
+
+    /**
+     * Callback that is called when the text input is blurred
+     */
+    onBlur?: (e: ReactNative.NativeSyntheticEvent<ReactNative.TextInputFocusEventData>) => 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;
+
+    /**
+     * Callback that is called when the text input's content size changes.
+     * This will be called with
+     * `{ nativeEvent: { contentSize: { width, height } } }`.
+     *
+     * Only called for multiline text inputs.
+     */
+    onContentSizeChange?: (event: { nativeEvent: { contentSize: { width: number; height: number } } }) => void;
+
+    /**
+     * Callback that is called when text input ends.
+     */
+    onEndEditing?: (event: { nativeEvent: { text: string } }) => void;
+
+    /**
+     * Callback that is called when the text input is focused
+     */
+    onFocus?: (e: ReactNative.NativeSyntheticEvent<ReactNative.TextInputFocusEventData>) => void;
+
+    /**
+     * Callback that is called when the text input selection is changed.
+     */
+    onSelectionChange?: (e: ReactNative.NativeSyntheticEvent<ReactNative.TextInputSelectionChangeEventData>) => void;
+
+    /**
+     * Callback that is called when the text input's submit button is pressed.
+     */
+    onSubmitEditing?: (event: { nativeEvent: { text: string } }) => void;
+
+    /**
+     * Invoked on content scroll with
+     *  `{ nativeEvent: { contentOffset: { x, y } } }`.
+     *
+     * May also contain other properties from ScrollEvent but on Android contentSize is not provided for performance reasons.
+     */
+    onScroll?: (e: ReactNative.NativeSyntheticEvent<ReactNative.TextInputScrollEventData>) => void;
+
+    /**
+     * Callback that is called when a key is pressed.
+     * This will be called with
+     *  `{ nativeEvent: { key: keyValue } }`
+     * where keyValue is 'Enter' or 'Backspace' for respective keys and the typed-in character otherwise including ' ' for space.
+     *
+     * Fires before onChange callbacks.
+     * Note: on Android only the inputs from soft keyboard are handled, not the hardware keyboard inputs.
+     */
+    onKeyPress?: (e: ReactNative.NativeSyntheticEvent<ReactNative.TextInputKeyPressEventData>) => void;
+
+    /**
+     * The string that will be rendered before text input has been entered
+     */
+    placeholder?: string;
+
+    /**
+     * The text color of the placeholder string
+     */
+    placeholderTextColor?: string;
+
+    /**
+     * enum('default', 'go', 'google', 'join', 'next', 'route', 'search', 'send', 'yahoo', 'done', 'emergency-call')
+     * Determines how the return key should look.
+     */
+    returnKeyType?: ReactNative.ReturnKeyTypeOptions;
+
+    /**
+     * If true, the text input obscures the text entered so that sensitive text like passwords stay secure.
+     * The default value is false.
+     */
+    secureTextEntry?: boolean;
+
+    /**
+     * If true, all text will automatically be selected on focus
+     */
+    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 };
+
+    /**
+     * The highlight (and cursor on ios) color of the text input
+     */
+    selectionColor?: string;
+
+    /**
+     * Styles
+     */
+    style?: ReactNative.StyleProp<ReactNative.TextStyle>;
+
+    /**
+     * Used to locate this view in end-to-end tests
+     */
+    testID?: string;
+
+    /**
+     * Used to connect to an InputAccessoryView. Not part of react-natives documentation, but present in examples and
+     * code.
+     * See https://facebook.github.io/react-native/docs/inputaccessoryview.html for more information.
+     */
+    inputAccessoryViewID?: string;
+
+    /**
+     * The value to show for the text input. TextInput is a controlled component,
+     * which means the native value will be forced to match this value prop if provided.
+     * For most uses this works great, but in some cases this may cause flickering - one common cause is preventing edits by keeping value the same.
+     * In addition to simply setting the same value, either set editable={false},
+     * or set/update maxLength to prevent unwanted edits without flicker.
+     */
+    value?: string;
 }
 
 export default class TextInputMask extends React.Component<TextInputMaskProps> { }
diff --git a/types/react-native-toast-native/index.d.ts b/types/react-native-toast-native/index.d.ts
new file mode 100644
index 0000000000..6240441781
--- /dev/null
+++ b/types/react-native-toast-native/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for react-native-toast-native 0.1
+// Project: https://github.com/onemolegames/react-native-toast-native/blob/master/README.md
+// Definitions by: Michele Bombardi <https://github.com/bm-software>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Platform } from 'react-native';
+
+export interface Style {
+    width?: number;
+    height?: number;
+    backgroundColor?: string;
+    color?: string;
+    borderWidth?: number;
+    borderRadius?: number;
+
+    // iOS-only
+    borderColor?: string;
+
+    // Android-only
+    paddingLeft?: number;
+    paddingRight?: number;
+    paddingBottom?: number;
+    paddingTop?: number;
+    fontSize?: number;
+    lines?: number;
+    lineHeight?: number;
+    xOffset?: number;
+    yOffset?: number;
+    letterSpacing?: number;
+    fontWeight?: string;
+}
+
+interface ToastNative {
+    // Toast duration constants
+    SHORT: any;
+    LONG: any;
+
+    // Toast gravity constants
+    TOP: any;
+    BOTTOM: any;
+    CENTER: any;
+
+    show(message?: string): void;
+    show(message: string, duration: any, position: any, styles: Style): void;
+}
+
+declare const ToastNative: ToastNative;
+export default ToastNative;
diff --git a/types/react-native-toast-native/react-native-toast-native-tests.tsx b/types/react-native-toast-native/react-native-toast-native-tests.tsx
new file mode 100644
index 0000000000..af9ed9db7b
--- /dev/null
+++ b/types/react-native-toast-native/react-native-toast-native-tests.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react';
+import { View, Button } from 'react-native';
+import Toast, { Style } from 'react-native-toast-native';
+
+class Test extends React.Component<any> {
+    showToast() {
+        const style: Style = {
+            color: 'white',
+            backgroundColor: '#5CB85C',
+            fontSize: 16,
+            height: 140,
+            borderRadius: 15,
+            fontWeight: 'bold',
+            yOffset: 40
+        };
+
+        Toast.show("I'm a toast!", Toast.SHORT, Toast.BOTTOM, style);
+    }
+
+    render() {
+        return (
+            <View>
+                <Button
+                    onPress={() => this.showToast()}
+                    title="Show Toast" />
+            </View>);
+    }
+}
diff --git a/types/react-native-toast-native/tsconfig.json b/types/react-native-toast-native/tsconfig.json
new file mode 100644
index 0000000000..656114c120
--- /dev/null
+++ b/types/react-native-toast-native/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-toast-native-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-native-toast-native/tslint.json b/types/react-native-toast-native/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-native-toast-native/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-native-touch-id/index.d.ts b/types/react-native-touch-id/index.d.ts
index e222b87b59..d4224bf28b 100644
--- a/types/react-native-touch-id/index.d.ts
+++ b/types/react-native-touch-id/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for react-native-touch-id 4.0.0
+// Type definitions for react-native-touch-id 4.0.2
 // Project: https://github.com/naoufal/react-native-touch-id
 // Definitions by: huhuanming <https://github.com/huhuanming>
 //                 Nikolay Polukhin <https://github.com/gazaret>
+//                 Jin Shin <https://github.com/jinshin1013>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare module 'react-native-touch-id' {
@@ -15,8 +16,9 @@ declare module 'react-native-touch-id' {
   }
 
   export interface AuthenticateConfig {
-    title: string;
-    color: string;
+    title?: string;
+    color?: string;
+    fallbackTitle: string;
   }
 
   export const isSupported: () => Promise<boolean | string | TouchIDError>;
diff --git a/types/react-native-touch-id/react-native-touch-id-tests.ts b/types/react-native-touch-id/react-native-touch-id-tests.ts
index 8ad30c1390..7774bded96 100644
--- a/types/react-native-touch-id/react-native-touch-id-tests.ts
+++ b/types/react-native-touch-id/react-native-touch-id-tests.ts
@@ -6,5 +6,6 @@ authenticate('reason').then((isOk: boolean) => {}).catch((error: TouchIDError) =
 
 authenticate('reason', {
     title: 'Authentication Required',
-    color: '#1306ff'
+    color: '#1306ff',
+    fallbackTitle: 'Fallback Authentication Method'
 }).then((isOk: boolean) => {}).catch((error: TouchIDError) => {});
diff --git a/types/react-native-vector-icons/FontAwesome5.d.ts b/types/react-native-vector-icons/FontAwesome5.d.ts
new file mode 100644
index 0000000000..79c77ff0e2
--- /dev/null
+++ b/types/react-native-vector-icons/FontAwesome5.d.ts
@@ -0,0 +1,43 @@
+import { Component } from "react";
+import { Icon, IconProps, ImageSource } from "./Icon";
+
+export const FA5Style: {
+    regular: 0;
+    light: 1;
+    solid: 2;
+    brand: 3;
+};
+
+export type ValueOf<T> = T[keyof T];
+
+// borrowed from
+// https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
+export type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
+
+export type FontAwesome5IconVariants = keyof Omit<typeof FA5Style, "regular">;
+
+// modified from https://stackoverflow.com/a/49725198/1105281
+export type AllowOnlyOne<T, Keys extends keyof T = keyof T> = Omit<T, Keys> &
+    {
+        [K in Keys]-?: Partial<Pick<T, K>> &
+            Partial<Record<Exclude<Keys, K>, undefined>>
+    }[Keys];
+
+export type FontAwesome5IconProps = AllowOnlyOne<
+    { [K in FontAwesome5IconVariants]?: boolean } & IconProps,
+    FontAwesome5IconVariants
+>;
+
+export default class FontAwesome5Icon extends Component<
+    FontAwesome5IconProps,
+    any
+> {
+    static getImageSource(
+        name: string,
+        size?: number,
+        color?: string,
+        fa5Style?: ValueOf<typeof FA5Style>
+    ): Promise<ImageSource>;
+    static loadFont(file?: string): Promise<void>;
+    static hasIcon(name: string): boolean;
+}
diff --git a/types/react-native-vector-icons/FontAwesome5Pro.d.ts b/types/react-native-vector-icons/FontAwesome5Pro.d.ts
new file mode 100644
index 0000000000..f8233abce5
--- /dev/null
+++ b/types/react-native-vector-icons/FontAwesome5Pro.d.ts
@@ -0,0 +1,6 @@
+import { Component } from "react";
+import FontAwesome5Icon, { FontAwesome5IconProps } from "./FontAwesome5";
+
+export type FontAwesome5ProIconProps = FontAwesome5IconProps;
+export { FA5Style } from "./FontAwesome5";
+export default FontAwesome5Icon;
diff --git a/types/react-native-vector-icons/index.d.ts b/types/react-native-vector-icons/index.d.ts
index 60e6408d18..6aabaadd70 100644
--- a/types/react-native-vector-icons/index.d.ts
+++ b/types/react-native-vector-icons/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Kyle Roach <https://github.com/iRoachie>
 //                 Tim Wang <https://github.com/timwangdev>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { Icon } from './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 4e1fe13e8a..18b03edcaa 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
@@ -3,6 +3,8 @@ import { View, Text, TabBarIOS } from 'react-native';
 import { createIconSet } from 'react-native-vector-icons';
 import MaterialIcon from 'react-native-vector-icons/MaterialIcons';
 import FontAwesomeIcon from 'react-native-vector-icons/FontAwesome';
+import FontAwesome5Icon from 'react-native-vector-icons/FontAwesome5';
+import FontAwesome5ProIcon from 'react-native-vector-icons/FontAwesome5Pro';
 import Ionicon from 'react-native-vector-icons/Ionicons';
 
 const glyphMap = {
@@ -27,6 +29,9 @@ class Example extends React.Component {
       <View>
         {/* Normal Icon */}
         <MaterialIcon size={30} color="red" name="exit" />
+        <FontAwesome5Icon size={10} name="handshake" />
+        <FontAwesome5Icon size={10} name="handshake" solid />
+        <FontAwesome5ProIcon size={10} name="parachute-box" light />
 
         {/* Icon button  */}
         <FontAwesomeIcon.Button
@@ -44,13 +49,9 @@ class Example extends React.Component {
 }
 
 class TabTest extends React.Component<{}, { selectedTab: string }> {
-  constructor() {
-    super({});
-
-    this.state = {
-      selectedTab: 'tab1'
-    };
-  }
+  state = {
+    selectedTab: 'tab1'
+  };
 
   render() {
     return (
diff --git a/types/react-native-vector-icons/tsconfig.json b/types/react-native-vector-icons/tsconfig.json
index f66f39ed95..993aae3195 100644
--- a/types/react-native-vector-icons/tsconfig.json
+++ b/types/react-native-vector-icons/tsconfig.json
@@ -25,6 +25,8 @@
         "EvilIcons.d.ts",
         "Feather.d.ts",
         "FontAwesome.d.ts",
+        "FontAwesome5.d.ts",
+        "FontAwesome5Pro.d.ts",
         "Foundation.d.ts",
         "Ionicons.d.ts",
         "MaterialCommunityIcons.d.ts",
diff --git a/types/react-native-video/index.d.ts b/types/react-native-video/index.d.ts
index 25a58a3e00..e84bcc7637 100644
--- a/types/react-native-video/index.d.ts
+++ b/types/react-native-video/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-native-community/react-native-video
 // Definitions by: HuHuanming <https://github.com/huhuanming>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import {
@@ -67,6 +67,7 @@ export interface VideoProperties extends ViewProps {
     controls?: boolean;
     currentTime?: number;
     progressUpdateInterval?: number;
+    useTextureView?: boolean;
     onLoadStart?(): void;
     onLoad?(data: OnLoadData): void;
     onBuffer?(): void;
diff --git a/types/react-native/BatchedBridge.d.ts b/types/react-native/BatchedBridge.d.ts
index dd63f73087..0f1b02a0f4 100644
--- a/types/react-native/BatchedBridge.d.ts
+++ b/types/react-native/BatchedBridge.d.ts
@@ -15,9 +15,9 @@ declare class MessageQueue {
 
 declare module "react-native/Libraries/BatchedBridge/BatchedBridge" {
     const BatchedBridge: MessageQueue;
-    export = BatchedBridge;
+    export default BatchedBridge;
 }
 
 declare module "react-native/Libraries/BatchedBridge/MessageQueue" {
-    export = MessageQueue;
+    export default MessageQueue;
 }
diff --git a/types/react-native/globals.d.ts b/types/react-native/globals.d.ts
index 2110ab7278..f5dcb25382 100644
--- a/types/react-native/globals.d.ts
+++ b/types/react-native/globals.d.ts
@@ -33,7 +33,7 @@ declare function fetch(input: RequestInfo, init?: RequestInit): Promise<Response
 
 interface Blob {}
 
-declare interface FormData {
+declare class FormData {
   append(name: string, value: any): void;
 }
 
diff --git a/types/react-native/index.d.ts b/types/react-native/index.d.ts
index b469a5bdf2..6a54805118 100644
--- a/types/react-native/index.d.ts
+++ b/types/react-native/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-native 0.55
+// Type definitions for react-native 0.56
 // Project: https://github.com/facebook/react-native
 // Definitions by: Eloy Durán <https://github.com/alloy>
 //                 HuHuanming <https://github.com/huhuanming>
@@ -11,8 +11,9 @@
 //                 Michele Bombardi <https://github.com/bm-software>
 //                 Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Alexander T. <https://github.com/a-tarasyuk>
+//                 Martin van Dam <https://github.com/mvdam>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -571,7 +572,7 @@ export interface FlexStyle {
     flexDirection?: "row" | "column" | "row-reverse" | "column-reverse";
     flexGrow?: number;
     flexShrink?: number;
-    flexWrap?: "wrap" | "nowrap";
+    flexWrap?: "wrap" | "nowrap" | "wrap-reverse";
     height?: number | string;
     justifyContent?: "flex-start" | "flex-end" | "center" | "space-between" | "space-around" | "space-evenly";
     left?: number | string;
@@ -766,6 +767,7 @@ export interface TextStyleIOS extends ViewStyle {
     letterSpacing?: number;
     textDecorationColor?: string;
     textDecorationStyle?: "solid" | "double" | "dotted" | "dashed";
+    textTransform?: "none" | "capitalize" | "uppercase" | "lowercase";
     writingDirection?: "auto" | "ltr" | "rtl";
 }
 
@@ -999,13 +1001,6 @@ export interface TextInputIOSProps {
      */
     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?: (event: {nativeEvent: {key: string}}) => void;
-
     /**
      * See DocumentSelectionState.js, some state that is responsible for maintaining selection information for a document
      */
@@ -1015,6 +1010,54 @@ export interface TextInputIOSProps {
      * If false, disables spell-check style (i.e. red underlines). The default value is inherited from autoCorrect
      */
     spellCheck?: boolean;
+
+
+    /**
+     * Give the keyboard and the system information about the expected
+     * semantic meaning for the content that users enter.
+     *
+     * For iOS 11+ you can set `textContentType` to `username` or `password` to
+     * enable autofill of login details from the device keychain.
+     *
+     * To disable autofill, set textContentType to `none`.
+     *
+     * Possible values for `textContentType` are:
+     *
+     *  - `'none'`
+     *  - `'URL'`
+     *  - `'addressCity'`
+     *  - `'addressCityAndState'`
+     *  - `'addressState'`
+     *  - `'countryName'`
+     *  - `'creditCardNumber'`
+     *  - `'emailAddress'`
+     *  - `'familyName'`
+     *  - `'fullStreetAddress'`
+     *  - `'givenName'`
+     *  - `'jobTitle'`
+     *  - `'location'`
+     *  - `'middleName'`
+     *  - `'name'`
+     *  - `'namePrefix'`
+     *  - `'nameSuffix'`
+     *  - `'nickname'`
+     *  - `'organizationName'`
+     *  - `'postalCode'`
+     *  - `'streetAddressLine1'`
+     *  - `'streetAddressLine2'`
+     *  - `'sublocality'`
+     *  - `'telephoneNumber'`
+     *  - `'username'`
+     *  - `'password'`
+     *
+     */
+    textContentType?: "none" | "URL" | "addressCity" | "addressCityAndState" |
+        "addressState" | "countryName" | "creditCardNumber" | "emailAddress" |
+        "familyName" | "fullStreetAddress" | "givenName" | "jobTitle" |
+        "location" | "middleName" | "name" | "namePrefix" | "nameSuffix" |
+        "nickname" | "organizationName" | "postalCode" | "streetAddressLine1" |
+        "streetAddressLine2" | "sublocality" | "telephoneNumber" | "username" |
+        "password";
 }
 
 /**
@@ -1082,16 +1125,68 @@ export type ReturnKeyTypeAndroid = "none" | "previous";
 export type ReturnKeyTypeIOS = "default" | "google" | "join" | "route" | "yahoo" | "emergency-call";
 export type ReturnKeyTypeOptions = ReturnKeyType | ReturnKeyTypeAndroid | ReturnKeyTypeIOS;
 
+/**
+ * @see TextInputProps.onFocus
+ */
 export interface TextInputFocusEventData {
     target: number;
     text: string;
     eventCount: number;
 }
 
-export interface TextInputScrollEvent {
-    nativeEvent: {
-        contentOffset: { x: number; y: number; }
-    }
+/**
+ * @see TextInputProps.onScroll
+ */
+export interface TextInputScrollEventData {
+    contentOffset: { x: number; y: number; }
+}
+
+/**
+ * @see TextInputProps.onSelectionChange
+ */
+export interface TextInputSelectionChangeEventData {
+    selection: {
+        start: number;
+        end: number;
+    };
+    target: number;
+}
+
+/**
+ * @see TextInputProps.onKeyPress
+ */
+export interface TextInputKeyPressEventData {
+    key: string;
+}
+
+/**
+ * @see TextInputProps.onChange
+ */
+export interface TextInputChangeEventData {
+    eventCount: number;
+    target: number;
+    text: string;
+}
+
+/**
+ * @see TextInputProps.onContentSizeChange
+ */
+export interface TextInputContentSizeChangeEventData {
+    contentSize: { width: number; height: number };
+}
+
+/**
+ * @see TextInputProps.onEndEditing
+ */
+export interface TextInputEndEditingEventData {
+    text: string;
+}
+
+/**
+ * @see TextInputProps.onSubmitEditing
+ */
+export interface TextInputSubmitEditingEventData {
+    text: string;
 }
 
 /**
@@ -1139,6 +1234,11 @@ export interface TextInputProps
      */
     caretHidden?: boolean
 
+    /**
+     * If true, context menu is hidden. The default value is false.
+     */
+    contextMenuHidden?: 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
@@ -1180,16 +1280,7 @@ export interface TextInputProps
     /**
      * 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?: (e: NativeSyntheticEvent<TextInputChangeEventData>) => void;
 
     /**
      * Callback that is called when the text input's text changes.
@@ -1204,12 +1295,12 @@ export interface TextInputProps
      *
      * Only called for multiline text inputs.
      */
-    onContentSizeChange?: (event: { nativeEvent: { contentSize: { width: number; height: number } } }) => void;
+    onContentSizeChange?: (e: NativeSyntheticEvent<TextInputContentSizeChangeEventData>) => void;
 
     /**
      * Callback that is called when text input ends.
      */
-    onEndEditing?: (event: { nativeEvent: { text: string } }) => void;
+    onEndEditing?: (e: NativeSyntheticEvent<TextInputEndEditingEventData>) => void;
 
     /**
      * Callback that is called when the text input is focused
@@ -1219,12 +1310,12 @@ export interface TextInputProps
     /**
      * Callback that is called when the text input selection is changed.
      */
-    onSelectionChange?: (event: { nativeEvent: { selection: { start: number; end: number }; target: number } }) => void;
+    onSelectionChange?: (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => void;
 
     /**
      * Callback that is called when the text input's submit button is pressed.
      */
-    onSubmitEditing?: (event: { nativeEvent: { text: string } }) => void;
+    onSubmitEditing?: (e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => void;
 
     /**
      * Invoked on content scroll with
@@ -1232,7 +1323,18 @@ export interface TextInputProps
      *
      * May also contain other properties from ScrollEvent but on Android contentSize is not provided for performance reasons.
      */
-    onScroll?: (event: TextInputScrollEvent) => void;
+    onScroll?: (e: NativeSyntheticEvent<TextInputScrollEventData>) => void;
+
+    /**
+     * Callback that is called when a key is pressed.
+     * This will be called with
+     *  `{ nativeEvent: { key: keyValue } }`
+     * where keyValue is 'Enter' or 'Backspace' for respective keys and the typed-in character otherwise including ' ' for space.
+     *
+     * Fires before onChange callbacks.
+     * Note: on Android only the inputs from soft keyboard are handled, not the hardware keyboard inputs.
+     */
+    onKeyPress?: (e: NativeSyntheticEvent<TextInputKeyPressEventData>) => void;
 
     /**
      * The string that will be rendered before text input has been entered
@@ -1312,6 +1414,7 @@ interface TextInputState {
     currentlyFocusedField(): number;
 
     /**
+     * @deprecated
      * @param TextInputID id of the text field to focus
      * Focuses the specified text field
      * noop if the text field was already focused
@@ -1319,6 +1422,7 @@ interface TextInputState {
     focusTextInput(textFieldID?: number): void;
 
     /**
+     * @deprecated
      * @param textFieldID id of the text field to focus
      * Unfocuses the specified text field
      * noop if it wasn't focused
@@ -1332,7 +1436,10 @@ interface TextInputState {
 declare class TextInputComponent extends React.Component<TextInputProps> {}
 declare const TextInputBase: Constructor<NativeMethodsMixin> & Constructor<TimerMixin> & typeof TextInputComponent;
 export class TextInput extends TextInputBase {
-    State: TextInputState;
+    /**
+     * Access the current focus state.
+     */
+    static State: TextInputState;
 
     /**
      * Returns if the input is currently focused.
@@ -1768,18 +1875,25 @@ export interface AccessibilityPropsAndroid {
 }
 
 export interface AccessibilityPropsIOS {
+    /**
+     * A Boolean value indicating whether the accessibility elements contained within this accessibility element
+     * are hidden to the screen reader.
+     * @platform ios
+     */
+    accessibilityElementsHidden?: boolean;
+
     /**
      * 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[];
+    accessibilityTraits?: AccessibilityTrait | AccessibilityTrait[];
 
     /**
      * When `accessible` is true, the system will try to invoke this function when the user performs accessibility tap gesture.
      * @platform ios
      */
-    onAcccessibilityTap?: () => void;
+    onAccessibilityTap?: () => void;
 
     /**
      * When accessible is true, the system will invoke this function when the user performs the magic tap gesture.
@@ -1788,7 +1902,7 @@ export interface AccessibilityPropsIOS {
     onMagicTap?: () => void;
 }
 
-type AccessibilityTraits =
+type AccessibilityTrait =
     | "none"
     | "button"
     | "link"
@@ -1811,7 +1925,7 @@ type AccessibilityTraits =
  * @see https://facebook.github.io/react-native/docs/view.html#props
  */
 export interface ViewProps
-    extends ViewPropsAndroid, ViewPropsIOS, GestureResponderHandlers, Touchable, AccessibilityProps, ViewStyle {
+    extends ViewPropsAndroid, ViewPropsIOS, GestureResponderHandlers, Touchable, AccessibilityProps {
     /**
      * This defines how far a touch event can start away from the view.
      * Typical interface guidelines recommend touch targets that are at least
@@ -1994,6 +2108,13 @@ export interface KeyboardAvoidingViewProps extends ViewProps {
      * may be non-zero in some use cases.
      */
     keyboardVerticalOffset?: number;
+
+    /**
+     * Enables or disables the KeyboardAvoidingView.
+     *
+     * Default is true
+     */
+    enabled?: boolean;
 }
 
 /**
@@ -2044,6 +2165,11 @@ Possible values for mixedContentMode are:
 'compatibility' - WebView will attempt to be compatible with the approach of a modern web browser with regard to mixed content.
     */
     mixedContentMode?: "never" | "always" | "compatibility";
+
+    /**
+     * Controls whether form autocomplete data should be saved
+     */
+    saveFormDataDisabled?: boolean;
 }
 
 export interface WebViewIOSLoadRequestEvent {
@@ -2118,43 +2244,62 @@ export interface WebViewPropsIOS {
 
 export interface WebViewUriSource {
     /*
-        * The URI to load in the WebView. Can be a local or remote file.
-        */
+     * The URI to load in the WebView. Can be a local or remote file.
+     */
     uri?: string;
 
     /*
-        * The HTTP Method to use. Defaults to GET if not specified.
-        * NOTE: On Android, only GET and POST are supported.
-        */
+     * The HTTP Method to use. Defaults to GET if not specified.
+     * NOTE: On Android, only GET and POST are supported.
+     */
     method?: string;
 
     /*
-        * Additional HTTP headers to send with the request.
-        * NOTE: On Android, this can only be used with GET requests.
-        */
+     * Additional HTTP headers to send with the request.
+     * NOTE: On Android, this can only be used with GET requests.
+     */
     headers?: any;
 
     /*
-        * 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.
-        * NOTE: On Android, this can only be used with POST requests.
-        */
+     * 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.
+     * NOTE: On Android, this can only be used with POST requests.
+     */
     body?: string;
 }
 
 export interface WebViewHtmlSource {
     /*
-        * A static HTML page to display in the WebView.
-        */
+     * A static HTML page to display in the WebView.
+     */
     html: string;
 
     /*
-        * The base URL to be used for any relative links in the HTML.
-        */
+     * The base URL to be used for any relative links in the HTML.
+     */
     baseUrl?: string;
 }
 
+export interface WebViewNativeConfig {
+    /*
+     * The native component used to render the WebView.
+     */
+    component?: any;
+
+    /*
+     * Set props directly on the native component WebView. Enables custom props which the
+     * original WebView doesn't pass through.
+     */
+    props?: object;
+
+    /*
+     * Set the ViewManager to use for communication with the native side.
+     * @platform ios
+     */
+    viewManager?: object;
+}
+
 /**
  * @see https://facebook.github.io/react-native/docs/webview.html#props
  */
@@ -2246,6 +2391,20 @@ export interface WebViewProps extends ViewProps, WebViewPropsAndroid, WebViewPro
      * sets whether the webpage scales to fit the view and the user can change the scale
      */
     scalesPageToFit?: boolean;
+
+    /**
+     * List of origin strings to allow being navigated to.
+     * The strings allow wildcards and get matched against just the origin (not the full URL).
+     * If the user taps to navigate to a new page but the new page is not in this whitelist, the URL will be handled by the OS.
+     * The default whitelisted origins are "http://" and "https://".
+     */
+    originWhitelist?: string[];
+
+    /**
+     * Override the native component used to render the WebView. Enables a custom native
+     * WebView which uses the same JavaScript as the original WebView.
+     */
+    nativeConfig?: WebViewNativeConfig;
 }
 
 export class WebView extends React.Component<WebViewProps> {
@@ -3223,7 +3382,7 @@ export interface SwitchIOSProps extends ViewProps {
  */
 export class SwitchIOS extends React.Component<SwitchIOSProps> {}
 
-export type ImageResizeMode = "contain" | "cover" | "stretch" | "center" | "repeat";
+export type ImageResizeMode = "cover" | "contain" | "stretch" | "repeat" | "center";
 
 /**
  * @see ImageResizeMode.js
@@ -3356,6 +3515,14 @@ export interface ImageURISource {
 
 export type ImageRequireSource = number;
 
+/**
+ * @see ImagePropsIOS.onProgress
+ */
+export interface ImageProgressEventDataIOS {
+    loaded: number;
+    total: number;
+}
+
 export interface ImagePropsIOS {
     /**
      * blurRadius: the blur radius of the blur filter added to the image
@@ -3371,15 +3538,10 @@ export interface ImagePropsIOS {
      */
     capInsets?: Insets;
 
-    /**
-     * A static image to display while downloading the final image off the network.
-     */
-    defaultSource?: ImageURISource | number;
-
     /**
      * Invoked on download progress with {nativeEvent: {loaded, total}}
      */
-    onProgress?: (event: { nativeEvent: { loaded: number; total: number } }) => void;
+    onProgress?: (event: NativeSyntheticEvent<ImageProgressEventDataIOS>) => void;
 
     /**
      * Invoked when a partial load of the image is complete. The definition of
@@ -3412,31 +3574,63 @@ interface ImagePropsAndroid {
     fadeDuration?: number;
 }
 
-// See https://facebook.github.io/react-native/docs/image.html#source
+/**
+ * @see https://facebook.github.io/react-native/docs/image.html#source
+ */
 export type ImageSourcePropType = ImageURISource | ImageURISource[] | ImageRequireSource;
 
+/**
+ * @see ImagePropsBase.onLoad
+ */
+export interface ImageLoadEventDataAndroid {
+    uri?: string;
+}
+
+export interface ImageLoadEventData extends ImageLoadEventDataAndroid {
+    source: {
+        height: number;
+        width: number;
+        url: string;
+    }
+}
+
+export interface ImageErrorEventData {
+    error: any;
+}
+
+/**
+ * @see https://facebook.github.io/react-native/docs/image.html#resolveassetsource
+ */
+export interface ImageResolvedAssetSource {
+    height: number;
+    width: number;
+    scale: number;
+    uri: string;
+}
+
 /**
  * @see https://facebook.github.io/react-native/docs/image.html
  */
-export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps, ImageStyle {
+export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, AccessibilityProps {
     /**
      * onLayout function
      *
      * Invoked on mount and layout changes with
      *
-     * {nativeEvent: { layout: {x, y, width, height}}}.
+     * {nativeEvent: { layout: {x, y, width, height} }}.
      */
     onLayout?: (event: LayoutChangeEvent) => void;
 
     /**
      * Invoked on load error with {nativeEvent: {error}}
      */
-    onError?: (error: { nativeEvent: any }) => void;
+    onError?: (error: NativeSyntheticEvent<ImageErrorEventData>) => void;
 
     /**
      * Invoked when load completes successfully
+     * { source: { url, height, width } }.
      */
-    onLoad?: () => void;
+    onLoad?: (event: NativeSyntheticEvent<ImageLoadEventData>) => void;
 
     /**
      * Invoked when load either succeeds or fails
@@ -3482,7 +3676,7 @@ export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, Access
      * if bigger than the area of the view.
      * The image will not be scaled up.
      */
-    resizeMode?: "cover" | "contain" | "stretch" | "repeat" | "center";
+    resizeMode?: ImageResizeMode;
 
     /**
      * The mechanism that should be used to resize the image when the image's dimensions
@@ -3529,12 +3723,9 @@ export interface ImagePropsBase extends ImagePropsIOS, ImagePropsAndroid, Access
     testID?: string;
 
     /**
-     * Currently broken
-     * @see https://github.com/facebook/react-native/pull/19281
+     * A static image to display while downloading the final image off the network.
      */
-    width?: never,
-    height?: never,
-    tintColor?: never,
+    defaultSource?: ImageURISource | number;
 }
 
 export interface ImageProps extends ImagePropsBase {
@@ -3548,16 +3739,21 @@ export interface ImageProps extends ImagePropsBase {
 declare class ImageComponent extends React.Component<ImageProps> {}
 declare const ImageBase: Constructor<NativeMethodsMixin> & typeof ImageComponent;
 export class Image extends ImageBase {
-    resizeMode: ImageResizeMode;
     static getSize(uri: string, success: (width: number, height: number) => void, failure: (error: any) => void): any;
     static prefetch(url: string): any;
     static abortPrefetch?(requestId: number): void;
     static queryCache?(urls: string[]): Promise<Map<string, "memory" | "disk">>;
+
+    /**
+     * @see https://facebook.github.io/react-native/docs/image.html#resolveassetsource
+     */
+    static resolveAssetSource(source: ImageSourcePropType): ImageResolvedAssetSource;
 }
 
 export interface ImageBackgroundProps extends ImagePropsBase {
-    style?: StyleProp<ViewStyle>;
     imageStyle?: StyleProp<ImageStyle>;
+    style?: StyleProp<ViewStyle>;
+    imageRef?(image: Image): void;
 }
 
 declare class ImageBackgroundComponent extends React.Component<ImageBackgroundProps> {}
@@ -3607,6 +3803,13 @@ export interface ViewabilityConfig {
     waitForInteraction?: boolean;
 }
 
+export interface ViewabilityConfigCallbackPair {
+    viewabilityConfig: ViewabilityConfig;
+    onViewableItemsChanged: ((info: { viewableItems: Array<ViewToken>; changed: Array<ViewToken> }) => void) | null;
+}
+
+export type ViewabilityConfigCallbackPairs = ViewabilityConfigCallbackPair[];
+
 /**
  * @see https://facebook.github.io/react-native/docs/flatlist.html#props
  */
@@ -3823,7 +4026,7 @@ export interface SectionBase<ItemT> {
 
     key?: string;
 
-    renderItem?: ListRenderItem<ItemT>;
+    renderItem?: SectionListRenderItem<ItemT>;
 
     ItemSeparatorComponent?: React.ComponentClass<any> | (() => React.ReactElement<any>) | null;
 
@@ -3834,7 +4037,17 @@ export interface SectionListData<ItemT> extends SectionBase<ItemT> {
     [key: string]: any;
 }
 
-export interface SectionListProps<ItemT> extends ScrollViewProps {
+/**
+ * @see https://facebook.github.io/react-native/docs/sectionlist.html#props
+ */
+
+export interface SectionListRenderItemInfo<ItemT> extends ListRenderItemInfo<ItemT> {
+  section: SectionListData<ItemT>;
+}
+
+export type SectionListRenderItem<ItemT> = (info: SectionListRenderItemInfo<ItemT>) => React.ReactElement<any> | null;
+
+export interface SectionListProps<ItemT> extends VirtualizedListWithoutRenderItemProps<ItemT> {
     /**
      * Rendered in between adjacent Items within each section.
      */
@@ -3887,6 +4100,18 @@ export interface SectionListProps<ItemT> extends ScrollViewProps {
      */
     initialNumToRender?: number;
 
+     /**
+     * Reverses the direction of scroll. Uses scale transforms of -1.
+     */
+    inverted?: boolean;
+
+    /**
+     * 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;
+
     /**
      * Called once when the scroll position gets within onEndReachedThreshold of the rendered content.
      */
@@ -3900,19 +4125,23 @@ export interface SectionListProps<ItemT> extends ScrollViewProps {
      */
     onEndReachedThreshold?: number | null;
 
-    /**
-     * 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;
-
     /**
      * 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;
 
+    /**
+     * Used to handle failures when scrolling to an index that has not been measured yet.
+     * Recommended action is to either compute your own offset and `scrollTo` it, or scroll as far
+     * as possible and then try again after more items have been rendered.
+     */
+    onScrollToIndexFailed?: (info: {
+        index: number,
+        highestMeasuredFrameIndex: number,
+        averageItemLength: number
+    }) => void;
+
     /**
      * Set this true while waiting for new data from a refresh.
      */
@@ -3921,7 +4150,7 @@ export interface SectionListProps<ItemT> extends ScrollViewProps {
     /**
      * Default renderer for every item in every section. Can be over-ridden on a per-section basis.
      */
-    renderItem?: ListRenderItem<ItemT>;
+    renderItem?: SectionListRenderItem<ItemT>;
 
     /**
      * Rendered at the top of each section. Sticky headers are not yet supported.
@@ -3977,7 +4206,11 @@ export interface SectionListStatic<SectionT> extends React.ComponentClass<Sectio
 /**
  * @see https://facebook.github.io/react-native/docs/virtualizedlist.html#props
  */
-export interface VirtualizedListProps<ItemT> extends ScrollViewProps {
+ export interface VirtualizedListProps<ItemT> extends VirtualizedListWithoutRenderItemProps<ItemT> {
+     renderItem: ListRenderItem<ItemT>;
+ }
+
+ export interface VirtualizedListWithoutRenderItemProps<ItemT> extends ScrollViewProps {
     /**
      * Rendered when the list is empty. Can be a React Component Class, a render function, or
      * a rendered element.
@@ -4121,8 +4354,6 @@ export interface VirtualizedListProps<ItemT> extends ScrollViewProps {
      */
     removeClippedSubviews?: boolean;
 
-    renderItem: ListRenderItem<ItemT>;
-
     /**
      * Render a custom scroll component, e.g. with a differently styled `RefreshControl`.
      */
@@ -4136,6 +4367,8 @@ export interface VirtualizedListProps<ItemT> extends ScrollViewProps {
 
     viewabilityConfig?: ViewabilityConfig;
 
+    viewabilityConfigCallbackPairs?: ViewabilityConfigCallbackPairs;
+
     /**
      * Determines the maximum number of items rendered outside of the visible area, in units of
      * visible lengths. So if your list fills the screen, then `windowSize={21}` (the default) will
@@ -4521,7 +4754,7 @@ declare class MaskedViewComponent extends React.Component<MaskedViewIOSProps> {}
 declare const MaskedViewBase: Constructor<NativeMethodsMixin> & typeof MaskedViewComponent;
 export class MaskedViewIOS extends MaskedViewBase {}
 
-export interface ModalProps {
+export interface ModalBaseProps {
     // Only `animated` is documented. The JS code says `animated` is
     // deprecated and `animationType` is preferred.
     animated?: boolean;
@@ -4551,35 +4784,42 @@ export interface ModalProps {
      * The `onShow` prop allows passing a function that will be called once the modal has been shown.
      */
     onShow?: (event: NativeSyntheticEvent<any>) => void;
+}
+
+export interface ModalPropsIOS {
+    /**
+     * The `presentationStyle` determines the style of modal to show
+     */
+    presentationStyle?: "fullScreen" | "pageSheet" | "formSheet" | "overFullScreen";
+
     /**
      * 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?: Array<"portrait" | "portrait-upside-down" | "landscape" | "landscape-left" | "landscape-right">;
+
+    /**
+     * The `onDismiss` prop allows passing a function that will be called once the modal has been dismissed.
+     */
+    onDismiss?: () => void;
+
     /**
      * 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?: (event?: NativeSyntheticEvent<any>) => void;
-     /**
-     * The `onDismiss` prop allows passing a function that will be called once the modal has been dismissed.
-     * @platform ios
-     */
-    onDismiss?: () => void;
-    /**
-     * The `presentationStyle` determines the style of modal to show
-     * @platform ios
-     */
-    presentationStyle?: "fullScreen" | "pageSheet" | "formSheet" | "overFullScreen";
 }
 
+export interface ModalPropsAndroid {
+    /**
+     *  Controls whether to force hardware acceleration for the underlying window.
+     */
+    hardwareAccelerated?: boolean;
+}
+
+
+export type ModalProps = ModalBaseProps & ModalPropsIOS & ModalPropsAndroid;
+
 export class Modal extends React.Component<ModalProps> {}
 
 /**
@@ -5978,6 +6218,11 @@ export interface ScrollViewPropsAndroid {
         *   - 'never' - Never allow a user to over-scroll this view.
         */
     overScrollMode?: "auto" | "always" | "never";
+
+    /**
+     * Enables nested scrolling for Android API level 21+. Nested scrolling is supported by default on iOS.
+     */
+    nestedScrollEnabled?: boolean;
 }
 
 export interface ScrollViewProps
@@ -6567,7 +6812,8 @@ export interface AlertIOSStatic {
         message?: string,
         callbackOrButtons?: ((value: string) => void) | Array<AlertIOSButton>,
         type?: AlertType,
-        defaultValue?: string
+        defaultValue?: string,
+        keyboardType?: KeyboardType | KeyboardTypeIOS,
     ) => void;
 }
 
@@ -6624,7 +6870,7 @@ 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 | null>;
 
     /**
      * Sets value for key and calls callback on completion, along with an Error if there is any
@@ -6707,7 +6953,7 @@ export interface BackHandlerStatic {
 
 export interface ButtonProps {
     title: string;
-    onPress: () => any;
+    onPress: (ev: NativeSyntheticEvent<NativeTouchEvent>) => void;
     color?: string;
     accessibilityLabel?: string;
     disabled?: boolean;
@@ -7626,6 +7872,7 @@ type TimePickerAndroidOpenOptions = {
     hour?: number;
     minute?: number;
     is24Hour?: boolean;
+    mode?: 'clock' | 'spinner' | 'default';
 };
 
 /**
@@ -7658,6 +7905,10 @@ export interface TimePickerAndroidStatic {
      *   * `is24Hour` (boolean) - If `true`, the picker uses the 24-hour format. If `false`,
      *     the picker shows an AM/PM chooser. If undefined, the default for the current locale
      *     is used.
+     *   * `mode` (enum('clock', 'spinner', 'default')) - set the time picker mode
+     *     * 'clock': Show a time picker in clock mode.
+     *     * 'spinner': Show a time picker in spinner mode.
+     *     * 'default': Show a default time picker based on Android versions.
      *
      * Returns a Promise which will be invoked an object containing `action`, `hour` (0-23),
      * `minute` (0-59) if the user picked a time. If the user dismissed the dialog, the Promise will
diff --git a/types/react-native/test/index.tsx b/types/react-native/test/index.tsx
index 2f753eee64..b5a0a5c4cb 100644
--- a/types/react-native/test/index.tsx
+++ b/types/react-native/test/index.tsx
@@ -16,6 +16,7 @@ import {
     Alert,
     AppState,
     AppStateIOS,
+    AlertIOS,
     BackAndroid,
     BackHandler,
     Button,
@@ -24,6 +25,11 @@ import {
     Dimensions,
     Image,
     ImageStyle,
+    ImageResizeMode,
+    ImageLoadEventData,
+    ImageErrorEventData,
+    ImageResolvedAssetSource,
+    ImageBackground,
     InteractionManager,
     ListView,
     ListViewDataSource,
@@ -44,6 +50,7 @@ import {
     findNodeHandle,
     ScrollView,
     ScrollViewProps,
+    SectionListRenderItemInfo,
     RefreshControl,
     TabBarIOS,
     NativeModules,
@@ -55,7 +62,17 @@ import {
     StatusBar,
     NativeSyntheticEvent,
     GestureResponderEvent,
-    TextInputScrollEvent,
+    TextInputScrollEventData,
+    TextInputSelectionChangeEventData,
+    TextInputKeyPressEventData,
+    TextInputChangeEventData,
+    TextInputContentSizeChangeEventData,
+    TextInputEndEditingEventData,
+    TextInputSubmitEditingEventData,
+    WebView,
+    KeyboardAvoidingView,
+    Modal,
+    TimePickerAndroid,
 } from "react-native";
 
 declare module "react-native" {
@@ -150,6 +167,25 @@ const viewProperty = StyleSheet.flatten(viewStyle).backgroundColor;
 const textProperty = StyleSheet.flatten(textStyle).fontSize;
 const imageProperty = StyleSheet.flatten(imageStyle).resizeMode;
 
+const testNativeSyntheticEvent = <T extends {}>(e: NativeSyntheticEvent<T>): void => {
+    e.isDefaultPrevented();
+    e.preventDefault();
+    e.isPropagationStopped();
+    e.stopPropagation();
+    e.persist();
+    e.cancelable;
+    e.bubbles;
+    e.currentTarget;
+    e.defaultPrevented;
+    e.eventPhase;
+    e.isTrusted;
+    e.nativeEvent;
+    e.target;
+    e.timeStamp;
+    e.type;
+    e.nativeEvent;
+}
+
 class CustomView extends React.Component {
     render() {
         return <Text style={[StyleSheet.absoluteFill, { ...StyleSheet.absoluteFillObject }]}>Custom View</Text>;
@@ -198,19 +234,14 @@ class Welcome extends React.Component {
 
 export default Welcome;
 
-// EventsTest
-export class EventsTest extends React.Component {
-    onPressButton(e: GestureResponderEvent) {
+// TouchableNativeFeedbackTest
+export class TouchableNativeFeedbackTest extends React.Component {
+    onPressButton = (e: GestureResponderEvent) => {
         e.persist();
         e.isPropagationStopped();
         e.isDefaultPrevented();
     }
 
-    onScroll(e: TextInputScrollEvent) {
-        console.log(`x: ${ e.nativeEvent.contentOffset.x }`);
-        console.log(`y: ${ e.nativeEvent.contentOffset.y }`);
-    }
-
     render() {
         return (
             <TouchableNativeFeedback
@@ -218,10 +249,6 @@ export class EventsTest extends React.Component {
             >
                 <View style={{width: 150, height: 100, backgroundColor: 'red'}}>
                     <Text style={{margin: 30}}>Button</Text>
-                    <TextInput
-                        multiline
-                        onScroll={this.onScroll}
-                    />
                 </View>
             </TouchableNativeFeedback>
         )
@@ -229,7 +256,6 @@ export class EventsTest extends React.Component {
 }
 
 // App State
-
 function appStateListener(state: string) {
     console.log("New state: " + state);
 }
@@ -245,7 +271,6 @@ function appStateIOSTest() {
 }
 
 // ViewPagerAndroid
-
 export class ViewPagerAndroidTest {
     render() {
         return (
@@ -330,11 +355,12 @@ export class SectionListTest extends React.Component<SectionListProps<string>, {
                             <Text>{section.title}</Text>
                         </View>
                     )}
-                    renderItem={(info: { item: string }) => (
+                    renderItem={(info: SectionListRenderItemInfo<string>) => (
                         <View>
-                            <Text>{info.item}</Text>
+                            <Text>{`${info.section.title} - ${info.item}`}</Text>
                         </View>
                     )}
+                    maxToRenderPerBatch={5}
                 />
             </React.Fragment>
         );
@@ -366,7 +392,7 @@ class ScrollerListComponentTest extends React.Component<{}, { dataSource: ListVi
                         throw new Error("Expected scroll to be enabled.");
                     }
 
-                    return <ScrollView horizontal={true} contentOffset={{x: 0, y: 0}} {...props} style={[scrollViewStyle1.scrollView, scrollViewStyle2]} />;
+                    return <ScrollView horizontal={true} nestedScrollEnabled={true} contentOffset={{x: 0, y: 0}} {...props} style={[scrollViewStyle1.scrollView, scrollViewStyle2]} />;
                 }}
                 renderRow={({ type, data }, _, row) => {
                     return <Text>Filler</Text>;
@@ -462,45 +488,123 @@ deviceEventEmitterStatic.addListener("keyboardWillShow", data => true);
 deviceEventEmitterStatic.addListener("keyboardWillShow", data => true, {});
 
 
-class TextInputRefTest extends React.Component<{}, {username: string}> {
+class TextInputTest extends React.Component<{}, {username: string}> {
     username: TextInput | null = null;
 
-    handleUsernameChange(text: string) {
+    handleUsernameChange = (text: string) => {
+        console.log(`text: ${ text }`);
+    }
+
+    onScroll = (e: NativeSyntheticEvent<TextInputScrollEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log(`x: ${ e.nativeEvent.contentOffset.x }`);
+        console.log(`y: ${ e.nativeEvent.contentOffset.y }`);
+    }
+
+    handleOnBlur = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
+        testNativeSyntheticEvent(e);
+    }
+
+    handleOnFocus = (e: NativeSyntheticEvent<TextInputFocusEventData>) => {
+        testNativeSyntheticEvent(e);
+    }
+
+    handleOnSelectionChange = (e: NativeSyntheticEvent<TextInputSelectionChangeEventData>) => {
+        testNativeSyntheticEvent(e);
+
+        console.log(`target: ${ e.nativeEvent.target }`);
+        console.log(`start: ${ e.nativeEvent.selection.start }`);
+        console.log(`end: ${ e.nativeEvent.selection.end }`);
+    }
+
+    handleOnKeyPress = (e: NativeSyntheticEvent<TextInputKeyPressEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log(`key: ${ e.nativeEvent.key }`);
+    }
+
+    handleOnChange = (e: NativeSyntheticEvent<TextInputChangeEventData>) => {
+        testNativeSyntheticEvent(e);
+
+        console.log(`eventCount: ${ e.nativeEvent.eventCount }`);
+        console.log(`target: ${ e.nativeEvent.target }`);
+        console.log(`text: ${ e.nativeEvent.text }`);
+    }
+
+    handleOnContentSizeChange = (e: NativeSyntheticEvent<TextInputContentSizeChangeEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log(`contentSize.width: ${ e.nativeEvent.contentSize.width }`);
+        console.log(`contentSize.height: ${ e.nativeEvent.contentSize.height }`);
+    }
+
+    handleOnEndEditing = (e: NativeSyntheticEvent<TextInputEndEditingEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log(`text: ${ e.nativeEvent.text }`);
+    }
+
+    handleOnSubmitEditing = (e: NativeSyntheticEvent<TextInputSubmitEditingEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log(`text: ${ e.nativeEvent.text }`);
     }
 
     render() {
         return (
             <View>
                 <Text onPress={() => this.username.focus()}>Username</Text>
+
                 <TextInput
                     ref={input => this.username = input}
+                    textContentType="username"
                     value={this.state.username}
-                    onChangeText={this.handleUsernameChange.bind(this)}
+                    onChangeText={this.handleUsernameChange}
+                />
+
+                <TextInput
+                    multiline
+                    onScroll={this.onScroll}
+                />
+
+                <TextInput
+                    onBlur={this.handleOnBlur}
+                    onFocus={this.handleOnFocus}
+                />
+
+                <TextInput
+                    onSelectionChange={this.handleOnSelectionChange}
+                />
+
+                <TextInput
+                    onKeyPress={this.handleOnKeyPress}
+                />
+
+                <TextInput
+                    onChange={this.handleOnChange}
+                />
+
+                <TextInput
+                    onChange={this.handleOnChange}
+                />
+
+                <TextInput
+                    onEndEditing={this.handleOnEndEditing}
+                />
+
+                <TextInput
+                    onSubmitEditing={this.handleOnSubmitEditing}
+                />
+
+                <TextInput
+                    multiline
+                    onContentSizeChange={this.handleOnContentSizeChange}
+                />
+
+                <TextInput
+                    contextMenuHidden={true}
                 />
             </View>
         );
     }
 }
 
-class TextInputFocusBlurEventTest extends React.Component {
-    handleOnBlur(e: NativeSyntheticEvent<TextInputFocusEventData>) {
-    }
-
-    handleOnFocus(e: NativeSyntheticEvent<TextInputFocusEventData>) {
-    }
-
-    render() {
-        return (
-            <View>
-                <TextInput
-                    onBlur={(e: NativeSyntheticEvent<TextInputFocusEventData>) => this.handleOnBlur(e)}
-                    onFocus={(e: NativeSyntheticEvent<TextInputFocusEventData>) => this.handleOnFocus(e)}
-                />
-            </View>
-        )
-    }
-}
-
 class StatusBarTest extends React.Component {
     render() {
         StatusBar.setBarStyle("dark-content", true);
@@ -517,21 +621,71 @@ class StatusBarTest extends React.Component {
     }
 }
 
-class StylePropsTest extends React.PureComponent {
+class WebViewTest extends React.Component {
     render() {
-        const uri = 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png'
+        return (
+            <WebView
+                originWhitelist={['https://origin.test']}
+                saveFormDataDisabled={false}
+                nativeConfig={{ component: 'test', props: {}, viewManager: {} }}
+            />
+        );
+    }
+}
+
+export class ImageTest extends React.Component {
+    componentDidMount(): void {
+        const image: ImageResolvedAssetSource = Image.resolveAssetSource({
+            uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png'
+        });
+        console.log(image.width, image.height, image.scale, image.uri);
+    }
+
+    handleOnLoad = (e: NativeSyntheticEvent<ImageLoadEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log('height:', e.nativeEvent.source.height);
+        console.log('width:', e.nativeEvent.source.width);
+        console.log('url:', e.nativeEvent.source.url);
+    }
+
+    handleOnError = (e: NativeSyntheticEvent<ImageErrorEventData>) => {
+        testNativeSyntheticEvent(e);
+        console.log('error:', e.nativeEvent.error);
+    }
+
+    render() {
+        const resizeMode: ImageResizeMode = 'contain';
 
         return (
-            <View backgroundColor="lightgray" flex={1} overflow="scroll">
+            <View>
                 <Image
-                    borderRadius={100}
-                    // height={200}
-                    margin={20}
-                    overflow="visible" // ps: must fail if "scroll"
-                    source={{ uri }}
-                    style={{ width: 200, height: 200, tintColor: 'green' }}
-                    // tintColor="green"
-                    // width={200}
+                    source={{ uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png' }}
+                    onLoad={this.handleOnLoad}
+                    onError={this.handleOnError}
+                />
+
+                <Image
+                    source={{ uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png' }}
+                    resizeMode={resizeMode}
+                />
+            </View>
+        );
+    }
+}
+
+export class ImageBackgroundProps extends React.Component {
+    private _imageRef: Image | null = null;
+
+    setImageRef = (image: Image) => {
+        this._imageRef = image;
+    }
+
+    render() {
+        return (
+            <View>
+                <ImageBackground
+                    source={{ uri: 'https://seeklogo.com/images/T/typescript-logo-B29A3F462D-seeklogo.com.png' }}
+                    imageRef={this.setImageRef}
                 />
             </View>
         );
@@ -539,3 +693,59 @@ class StylePropsTest extends React.PureComponent {
 }
 
 const listViewDataSourceTest = new ListView.DataSource({rowHasChanged: () => true})
+
+class AccessibilityTest extends React.Component {
+    render() {
+        return (
+            <View
+                accessibilityElementsHidden={true}
+                importantForAccessibility={"no-hide-descendants"}
+                accessibilityTraits={'none'}
+                onAccessibilityTap={() => {}}
+            >
+                <Text accessibilityTraits={['key', 'text']}>Text</Text>
+                <View />
+            </View>
+        );
+    }
+}
+
+
+const KeyboardAvoidingViewTest = () => (
+    <KeyboardAvoidingView enabled />
+);
+
+
+const AlertIOSTest = () => {
+    AlertIOS.prompt(
+        'My Prompt',
+        'Enter your email',
+        [
+            {
+                text: 'Cancel',
+                style: 'cancel'
+            },
+            {
+                text: 'Add',
+                onPress: (value: string) => {
+                  console.log(value);
+                },
+              },
+        ],
+        'default',
+        'email-address'
+    );
+}
+
+const ModalTest = () => (
+    <Modal hardwareAccelerated />
+)
+
+const TimePickerAndroidTest = () => (
+    TimePickerAndroid.open({
+        hour: 8,
+        minute: 15,
+        is24Hour: true,
+        mode: 'spinner'
+    })
+)
diff --git a/types/react-navigation-material-bottom-tabs/index.d.ts b/types/react-navigation-material-bottom-tabs/index.d.ts
new file mode 100644
index 0000000000..e9938c7bb4
--- /dev/null
+++ b/types/react-navigation-material-bottom-tabs/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for react-navigation-material-bottom-tabs 0.3
+// Project: https://github.com/react-navigation/react-navigation-material-bottom-tab-navigator#readme
+// Definitions by: Kyle Roach <https://github.com/iRoachie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { StyleProp, TextStyle, ViewStyle } from 'react-native';
+import {
+    NavigationContainer,
+    NavigationPathsConfig,
+    NavigationRouteConfigMap
+} from 'react-navigation';
+
+export interface TabConfig {
+    shifting?: boolean;
+    labeled?: boolean;
+    activeTintColor?: string;
+    inactiveTintColor?: string;
+    barStyle?: StyleProp<ViewStyle>;
+    initialRouteName?: string;
+    order?: string[];
+    paths?: NavigationPathsConfig;
+    backBehavior?: 'initialRoute' | 'none';
+}
+
+export function createMaterialBottomTabNavigator(
+    routeConfigMap: NavigationRouteConfigMap,
+    config?: TabConfig
+): NavigationContainer;
diff --git a/types/react-navigation-material-bottom-tabs/react-navigation-material-bottom-tabs-tests.tsx b/types/react-navigation-material-bottom-tabs/react-navigation-material-bottom-tabs-tests.tsx
new file mode 100644
index 0000000000..a0d84f12f1
--- /dev/null
+++ b/types/react-navigation-material-bottom-tabs/react-navigation-material-bottom-tabs-tests.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+import { View } from 'react-native';
+import { createMaterialBottomTabNavigator } from 'react-navigation-material-bottom-tabs';
+
+const Tab1 = () => <View />;
+const Tab2 = () => <View />;
+
+export default createMaterialBottomTabNavigator(
+    {
+        tab1: {
+            screen: Tab1
+        },
+        tab2: {
+            screen: Tab2
+        }
+    },
+    {
+        activeTintColor: 'blue',
+        inactiveTintColor: 'red',
+        labeled: false,
+        barStyle: {
+            backgroundColor: '#fff'
+        },
+        shifting: false,
+        initialRouteName: 'tab2',
+        order: ['tab2', 'tab1'],
+        backBehavior: 'none'
+    }
+);
diff --git a/types/react-navigation-material-bottom-tabs/tsconfig.json b/types/react-navigation-material-bottom-tabs/tsconfig.json
new file mode 100644
index 0000000000..3e6dd8c735
--- /dev/null
+++ b/types/react-navigation-material-bottom-tabs/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react-native",
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "react-navigation-material-bottom-tabs-tests.tsx"]
+}
diff --git a/types/react-navigation-material-bottom-tabs/tslint.json b/types/react-navigation-material-bottom-tabs/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-navigation-material-bottom-tabs/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-navigation/index.d.ts b/types/react-navigation/index.d.ts
index d13c342cf9..b52c4829f5 100644
--- a/types/react-navigation/index.d.ts
+++ b/types/react-navigation/index.d.ts
@@ -11,14 +11,20 @@
 //                 Qibang Sun <https://github.com/bang88>
 //                 Sergei Butko: <https://github.com/svbutko>
 //                 Veit Lehmann: <https://github.com/levito>
-//                 Roberto Huertas: <https://github.com/robertohuertasm>
 //                 Steven Miller <https://github.com/YourGamesBeOver>
 //                 Armando Assuncao <https://github.com/ArmandoAssuncao>
 //                 Ciaran Liedeman <https://github.com/cliedeman>
 //                 Edward Sammut Alessi <https://github.com/Slessi>
 //                 Jérémy Magrin <https://github.com/magrinj>
+//                 Luca Campana <https://github.com/TizioFittizio>
+//                 Ullrich Schaefer <https://github.com/stigi>
+//                 Linus Unnebäck <https://github.com/LinusU>
+//                 Yosuke Seki <https://github.com/jshosomichi>
+//                 Jake <https://github.com/jakebooyah>
+//                 Gustavo Brunoro <https://github.com/brunoro>
+//                 Denis Frezzato <https://github.com/DenisFrezzato>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /**
  * Reference: https://github.com/react-navigation/react-navigation/tree/a37473c5e4833f48796ee6c7c9cb4a8ac49d9c06
@@ -86,6 +92,11 @@ export interface NavigationState {
   routes: NavigationRoute[];
 }
 
+export interface DrawerNavigationState extends NavigationState {
+  isDrawerOpen: boolean;
+  isTransitioning: boolean;
+}
+
 export type NavigationRoute<Params = NavigationParams> =
   | NavigationLeafRoute<Params>
   | NavigationStateRoute<Params>;
@@ -265,7 +276,8 @@ export interface NavigationInitAction extends NavigationInitActionPayload {
 }
 
 export interface NavigationReplaceActionPayload {
-    key: string;
+    key?: string;
+    newKey?: string;
     routeName: string;
     params?: NavigationParams;
     action?: NavigationNavigateAction;
@@ -393,22 +405,24 @@ export interface NavigationSwitchRouterConfig {
 export interface NavigationStackScreenOptions {
   title?: string;
   header?:
-  | (
-    | React.ReactElement<any>
-    | ((headerProps: HeaderProps) => React.ReactElement<any>))
+  | React.ReactElement<any>
+  | ((headerProps: HeaderProps) => React.ReactElement<any>)
   | null;
   headerTransparent?: boolean;
   headerTitle?: string | React.ReactElement<any>;
   headerTitleStyle?: StyleProp<TextStyle>;
   headerTitleAllowFontScaling?: boolean;
   headerTintColor?: string;
-  headerLeft?: React.ReactElement<any>;
+  headerLeft?:
+  | React.ReactElement<any>
+  | ((backButtonProps: HeaderBackButtonProps) => React.ReactElement<any>)
+  | null;
   headerBackTitle?: string | null;
   headerBackImage?: React.ReactElement<any>;
   headerTruncatedBackTitle?: string;
   headerBackTitleStyle?: StyleProp<TextStyle>;
   headerPressColorAndroid?: string;
-  headerRight?: React.ReactElement<any>;
+  headerRight?: React.ReactElement<any> | null;
   headerStyle?: StyleProp<ViewStyle>;
   headerForceInset?: HeaderForceInset;
   headerBackground?: React.ReactNode | React.ReactType;
@@ -432,8 +446,11 @@ export type NavigationStackAction =
   | NavigationBackAction
   | NavigationSetParamsAction
   | NavigationResetAction
+  | NavigationReplaceAction
   | NavigationPopAction
-  | NavigationPopToTopAction;
+  | NavigationPushAction
+  | NavigationPopToTopAction
+  | NavigationCompleteTransitionAction;
 
 export type NavigationTabAction =
   | NavigationInitAction
@@ -465,23 +482,30 @@ export interface NavigationPathsConfig {
   [routeName: string]: string;
 }
 
-export interface NavigationTabRouterConfig {
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface NavigationTabRouterConfigBase {
   initialRouteName?: string;
   initialRouteParams?: NavigationParams;
   paths?: NavigationPathsConfig;
-  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
   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`
 }
+export interface NavigationTabRouterConfig extends NavigationTabRouterConfigBase {
+  navigationOptions?: NavigationScreenConfig<NavigationScreenOptions>;
+}
+export interface NavigationBottomTabRouterConfig extends NavigationTabRouterConfigBase {
+  navigationOptions?: NavigationScreenConfig<NavigationBottomTabScreenOptions>;
+}
 export interface TabScene {
   route: NavigationRoute;
   focused: boolean;
   index: number;
   tintColor?: string;
 }
-export interface NavigationTabScreenOptions {
+// tslint:disable-next-line:strict-export-declare-modifiers
+interface NavigationTabScreenOptionsBase {
   title?: string;
   tabBarIcon?:
   | React.ReactElement<any>
@@ -496,13 +520,27 @@ export interface NavigationTabScreenOptions {
   ) => React.ReactElement<any> | string | null);
   tabBarVisible?: boolean;
   tabBarTestIDProps?: { testID?: string; accessibilityLabel?: string };
+}
+export interface NavigationTabScreenOptions
+  extends NavigationTabScreenOptionsBase {
+  swipeEnabled?: boolean;
   tabBarOnPress?: (
     options: {
+      previousScene: TabScene;
       scene: TabScene;
       jumpToIndex: (index: number) => void;
     }
   ) => void;
 }
+export interface NavigationBottomTabScreenOptions
+  extends NavigationTabScreenOptionsBase {
+  tabBarOnPress?: (
+    options: {
+      navigation: NavigationScreenProp<NavigationRoute>;
+      defaultHandler: () => void;
+    }
+  ) => void;
+}
 
 export interface NavigationDrawerScreenOptions {
   title?: string;
@@ -551,6 +589,16 @@ export interface NavigationEventSubscription {
   remove: () => void;
 }
 
+export interface NavigationEventsProps extends ViewProps {
+  navigation?: NavigationNavigator;
+  onWillFocus?: NavigationEventCallback;
+  onDidFocus?: NavigationEventCallback;
+  onWillBlur?: NavigationEventCallback;
+  onDidBlur?: NavigationEventCallback;
+}
+
+export const NavigationEvents: React.ComponentType<NavigationEventsProps>;
+
 export interface NavigationScreenProp<S, P = NavigationParams> {
   state: S;
   dispatch: NavigationDispatch;
@@ -575,10 +623,11 @@ export interface NavigationScreenProp<S, P = NavigationParams> {
   openDrawer: () => any;
   closeDrawer: () => any;
   toggleDrawer: () => any;
-  getParam: <T extends keyof P>(param: T, fallback?: P[T]) => P[T];
-  setParams: (newParams: P) => boolean;
+  getParam<T extends keyof P>(param: T, fallback: NonNullable<P[T]>): NonNullable<P[T]>;
+  getParam<T extends keyof P>(param: T): P[T];
+  setParams: (newParams: Partial<P>) => boolean;
   addListener: (
-    eventName: string,
+    eventName: 'willBlur' | 'willFocus' | 'didFocus' | 'didBlur',
     callback: NavigationEventCallback
   ) => NavigationEventSubscription;
   push: (
@@ -688,6 +737,28 @@ export interface TransitionConfig {
   containerStyle?: StyleProp<ViewStyle>;
 }
 
+export type TransitionConfigurer = (
+  transitionProps: NavigationTransitionProps,
+  prevTransitionProps: NavigationTransitionProps,
+  isModal: boolean
+) => TransitionConfig;
+
+export interface StackViewTransitionConfigsType {
+  defaultTransitionConfig: TransitionConfigurer;
+  getTransitionConfig: (
+    transitionConfigurer: TransitionConfigurer,
+    transitionProps: NavigationTransitionProps,
+    prevTransitionProps: NavigationTransitionProps,
+    isModal: boolean
+  ) => TransitionConfig;
+  SlideFromRightIOS: TransitionConfig;
+  ModalSlideFromBottomIOS: TransitionConfig;
+  FadeInFromBottomAndroid: TransitionConfig;
+  FadeOutToBottomAndroid: TransitionConfig;
+}
+
+export const StackViewTransitionConfigs: StackViewTransitionConfigsType;
+
 export type NavigationAnimationSetter = (
   position: AnimatedValue,
   newState: NavigationState,
@@ -868,6 +939,13 @@ export interface TabNavigatorConfig
   removeClippedSubviews?: boolean;
   initialLayout?: { height: number; width: number };
 }
+export interface BottomTabNavigatorConfig
+  extends NavigationBottomTabRouterConfig,
+  TabViewConfig {
+  lazy?: boolean;
+  removeClippedSubviews?: boolean;
+  initialLayout?: { height: number; width: number };
+}
 
 // From navigators/TabNavigator.js
 export function TabNavigator(
@@ -882,7 +960,7 @@ export function createTabNavigator(
 
 export function createBottomTabNavigator(
   routeConfigMap: NavigationRouteConfigMap,
-  drawConfig?: TabNavigatorConfig
+  drawConfig?: BottomTabNavigatorConfig
 ): NavigationContainer;
 
 export function createMaterialTopTabNavigator(
@@ -959,25 +1037,16 @@ export namespace NavigationActions {
   const BACK: 'Navigation/BACK';
   const INIT: 'Navigation/INIT';
   const NAVIGATE: 'Navigation/NAVIGATE';
-  const RESET: 'Navigation/RESET';
   const SET_PARAMS: 'Navigation/SET_PARAMS';
-  const URI: 'Navigation/URI';
-  const POP: 'Navigation/POP';
-  const POP_TO_TOP: 'Navigation/POP_TO_TOP';
 
   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;
-  function pop(options: NavigationPopActionPayload): NavigationPopAction;
-  function popToTop(
-    options: NavigationPopToTopActionPayload
-  ): NavigationPopToTopAction;
 }
 
 /**
@@ -1154,19 +1223,24 @@ export const HeaderBackButton: React.ComponentClass<HeaderBackButtonProps>;
 /**
  * Header Component
  */
-export const Header: React.ComponentClass<HeaderProps>;
+export class Header extends React.Component<HeaderProps> {
+  static HEIGHT: number;
+}
 
-export interface NavigationInjectedProps {
-  navigation: NavigationScreenProp<NavigationState>;
+export interface NavigationInjectedProps<P = NavigationParams> {
+  navigation: NavigationScreenProp<NavigationState, P>;
 }
 
 export function withNavigation<T = {}>(
   Component: React.ComponentType<T & NavigationInjectedProps>
-): React.ComponentType<T>;
+): React.ComponentType<T & { onRef?: React.Ref<React.Component<T & NavigationInjectedProps>> }>;
 
+export interface NavigationFocusInjectedProps extends NavigationInjectedProps {
+  isFocused: boolean;
+}
 export function withNavigationFocus<T = {}>(
-  Component: React.ComponentType<T & NavigationInjectedProps>
-): React.ComponentType<T>;
+  Component: React.ComponentType<T & NavigationFocusInjectedProps>
+): React.ComponentType<T & { onRef?: React.Ref<typeof Component> }>;
 
 /**
  * SafeAreaView Component
diff --git a/types/react-navigation/react-navigation-tests.tsx b/types/react-navigation/react-navigation-tests.tsx
index 7563708163..6bf037eb4a 100644
--- a/types/react-navigation/react-navigation-tests.tsx
+++ b/types/react-navigation/react-navigation-tests.tsx
@@ -11,6 +11,7 @@ import {
     DrawerNavigatorConfig,
     NavigationAction,
     NavigationActions,
+    NavigationEvents,
     NavigationBackAction,
     NavigationInitAction,
     NavigationNavigateAction,
@@ -24,6 +25,7 @@ import {
     NavigationStackScreenOptions,
     NavigationTabScreenOptions,
     NavigationTransitionProps,
+    StackViewTransitionConfigs,
     createStackNavigator,
     StackNavigatorConfig,
     createSwitchNavigator,
@@ -40,6 +42,10 @@ import {
     NavigationPopToTopAction,
     NavigationScreenComponent,
     NavigationContainerComponent,
+    withNavigation,
+    NavigationInjectedProps,
+    withNavigationFocus,
+    NavigationFocusInjectedProps
 } from 'react-navigation';
 
 // Constants
@@ -172,6 +178,9 @@ const tabNavigatorConfig: TabNavigatorConfig = {
     lazy: true,
     tabBarComponent: TabBarTop,
     tabBarOptions: { activeBackgroundColor: "blue" },
+    navigationOptions: () => ({
+        tabBarOnPress: ({ scene, jumpToIndex }) => jumpToIndex(scene.index)
+    })
 };
 
 const tabNavigatorConfigWithInitialLayout: TabNavigatorConfig = {
@@ -369,6 +378,8 @@ class CustomTransitioner extends React.Component<CustomTransitionerProps, null>
 /**
  * Header
  */
+const height = Header.HEIGHT;
+
 function renderHeaderBackButton(schema: string): JSX.Element {
     switch (schema) {
         case 'compact':
@@ -405,14 +416,6 @@ const navigateAction: NavigationNavigateAction = NavigationActions.navigate({
     action: NavigationActions.navigate({ routeName: "BarScreen" })
 });
 
-const resetAction: NavigationResetAction = NavigationActions.reset({
-    index: 0,
-    key: "foo",
-    actions: [
-        NavigationActions.navigate({ routeName: "FooScreen" })
-    ]
-});
-
 const backAction: NavigationBackAction = NavigationActions.back({
     key: "foo"
 });
@@ -424,16 +427,6 @@ const setParamsAction: NavigationSetParamsAction = NavigationActions.setParams({
     }
 });
 
-const popAction: NavigationPopAction = NavigationActions.pop({
-    n: 1,
-    immediate: true
-});
-
-const popToTopAction: NavigationPopToTopAction = NavigationActions.popToTop({
-    key: "foo",
-    immediate: true
-});
-
 class Page1 extends React.Component { }
 
 const RootNavigator: NavigationContainer = createSwitchNavigator({
@@ -469,6 +462,10 @@ const BottomStack = createBottomTabNavigator({
             };
         }
     }
+}, {
+    navigationOptions: () => ({
+        tabBarOnPress: ({ defaultHandler }) => defaultHandler()
+    })
 });
 
 const CustomHeaderStack = createStackNavigator({
@@ -489,3 +486,109 @@ const CustomHeaderStack = createStackNavigator({
         }
     }
 });
+
+interface ScreenProps {
+    name: string;
+    optionalAge?: number;
+    onPlay(): void;
+}
+
+class SetParamsTest extends React.Component<NavigationScreenProps<ScreenProps>> {
+    componentDidMount() {
+        this.props.navigation.setParams({
+            onPlay: this.onPlay
+        });
+    }
+
+    onPlay = () => {
+        //
+    }
+
+    render() {
+        const name = this.props.navigation.getParam('name');
+        const age = this.props.navigation.getParam('optionalAge');
+
+        // $ExpectType number | undefined
+        this.props.navigation.getParam('optionalAge');
+
+        // $ExpectType number
+        this.props.navigation.getParam('optionalAge', 0);
+
+        return (
+            <Text>My name is {name} and I am {age} years old.</Text>
+        );
+    }
+}
+
+// Test withNavigation
+
+interface BackButtonProps { title: string; }
+class MyBackButton extends React.Component<BackButtonProps & NavigationInjectedProps> {
+    triggerBack() {
+        console.log("Not implemented, すみません");
+    }
+    render() {
+      return <button title={this.props.title} onClick={() => { this.props.navigation.goBack(); }} />;
+    }
+}
+
+// withNavigation returns a component that wraps MyBackButton and passes in the
+// navigation prop
+const BackButtonWithNavigation = withNavigation<BackButtonProps>(MyBackButton);
+const BackButtonInstance = <BackButtonWithNavigation
+    title="Back" onRef={ref => { const backButtonRef = ref; }}
+/>;
+
+// if you have class methods, you should have a way to use them
+const BackButtonWithNavigationSpecified = withNavigation<BackButtonProps>(MyBackButton);
+const BackButtonSpecifiedInstance = <BackButtonWithNavigationSpecified
+    title="Back" onRef={ref => {
+        if (!ref) return;
+        const backButtonRef = ref as MyBackButton;
+        backButtonRef.triggerBack();
+    }}
+/>;
+
+// Test withNavigationFocus
+
+interface MyFocusedComponentProps { expectsFocus: boolean; }
+class MyFocusedComponent extends React.Component<MyFocusedComponentProps & NavigationFocusInjectedProps> {
+    render() {
+      return <button title={`${this.props.expectsFocus} vs ${this.props.isFocused}`} onClick={() => { this.props.navigation.goBack(); }} />;
+    }
+}
+
+// withNavigationFocus returns a component that wraps MyFocusedComponent and passes in the
+// navigation and isFocused prop
+const MyFocusedComponentWithNavigationFocus = withNavigationFocus<MyFocusedComponentProps>(MyFocusedComponent);
+const MyFocusedComponentInstance = <MyFocusedComponentWithNavigationFocus
+    expectsFocus={true} onRef={ref => { const backButtonRef = ref; }}
+/>;
+
+// Test Screen with params
+
+interface MyScreenParams { title: string; }
+class MyScreen extends React.Component<NavigationInjectedProps<MyScreenParams>> {
+    render() {
+        const title = this.props.navigation.getParam('title');
+        return <button title={title} onClick={() => { this.props.navigation.goBack(); }} />;
+    }
+}
+
+// Test createStackNavigator
+
+createStackNavigator(
+    routeConfigMap,
+    {transitionConfig: () => ({screenInterpolator: StackViewTransitionConfigs.SlideFromRightIOS.screenInterpolator})}
+);
+
+// Test NavigationEvents component
+
+const ViewWithNavigationEvents = (
+  <NavigationEvents
+    onWillFocus={console.log}
+    onDidFocus={console.log}
+    onWillBlur={console.log}
+    onDidBlur={console.log}
+  />
+);
diff --git a/types/react-navigation/v1/index.d.ts b/types/react-navigation/v1/index.d.ts
index 1233ca39e3..8e7940c6ce 100644
--- a/types/react-navigation/v1/index.d.ts
+++ b/types/react-navigation/v1/index.d.ts
@@ -11,13 +11,12 @@
 //                 Qibang Sun <https://github.com/bang88>
 //                 Sergei Butko: <https://github.com/svbutko>
 //                 Veit Lehmann: <https://github.com/levito>
-//                 Roberto Huertas: <https://github.com/robertohuertasm>
 //                 Steven Miller <https://github.com/YourGamesBeOver>
 //                 Armando Assuncao <https://github.com/ArmandoAssuncao>
 //                 Ciaran Liedeman <https://github.com/cliedeman>
 //                 Edward Sammut Alessi <https://github.com/Slessi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /**
  * Reference: https://github.com/react-navigation/react-navigation/tree/3f3ef6485c8932f49fddc3dd2c508629110bf2b6
diff --git a/types/react-no-ssr/index.d.ts b/types/react-no-ssr/index.d.ts
new file mode 100644
index 0000000000..9ca00149d0
--- /dev/null
+++ b/types/react-no-ssr/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for react-no-ssr 1.1
+// Project: https://github.com/kadirahq/react-no-ssr
+// Definitions by: Rafał Filipek <https://github.com/rafalfilipek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export default class NoSSR extends React.Component<{
+    onSSR?: React.ReactChild;
+}> {}
diff --git a/types/react-no-ssr/react-no-ssr-tests.tsx b/types/react-no-ssr/react-no-ssr-tests.tsx
new file mode 100644
index 0000000000..62ad9b1989
--- /dev/null
+++ b/types/react-no-ssr/react-no-ssr-tests.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+import NoSSR from 'react-no-ssr';
+
+export class NoSSRTest extends React.Component {
+    render() {
+        return (
+            <div>
+                <NoSSR>
+                    <div />
+                </NoSSR>
+                <NoSSR onSSR={<span />}>
+                    <div />
+                </NoSSR>
+            </div>
+        );
+    }
+}
diff --git a/types/react-no-ssr/tsconfig.json b/types/react-no-ssr/tsconfig.json
new file mode 100644
index 0000000000..23e59891d8
--- /dev/null
+++ b/types/react-no-ssr/tsconfig.json
@@ -0,0 +1,18 @@
+{
+    "files": ["index.d.ts", "react-no-ssr-tests.tsx"],
+    "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
+    }
+}
diff --git a/types/react-no-ssr/tslint.json b/types/react-no-ssr/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-no-ssr/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-notification-system-redux/index.d.ts b/types/react-notification-system-redux/index.d.ts
index d74ea35871..701bde55cf 100644
--- a/types/react-notification-system-redux/index.d.ts
+++ b/types/react-notification-system-redux/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gor181/react-notification-system-redux
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from "react";
 import { Action } from "redux";
diff --git a/types/react-notification-system/index.d.ts b/types/react-notification-system/index.d.ts
index a993f6cc4d..d172cd6b2c 100644
--- a/types/react-notification-system/index.d.ts
+++ b/types/react-notification-system/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-notification-system
 // Definitions by: Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>, Deividas Bakanas <https://github.com/DeividasBakanas>, Karol Janyst <https://github.com/LKay>, Bartosz Szewczyk <https://github.com/sztobar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-notify-toast/index.d.ts b/types/react-notify-toast/index.d.ts
new file mode 100644
index 0000000000..1feb26ef61
--- /dev/null
+++ b/types/react-notify-toast/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for react-notify-toast 0.5
+// Project: https://github.com/jesusoterogomez/react-notify-toast
+// Definitions by: Klaas Cuvelier <https://github.com/klaascuvelier>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+interface reactNotifyToastColor {
+    background: string;
+    text: string;
+}
+
+declare class reactNotifyToast {
+    show(
+        text: string,
+        type?: 'success' | 'error' | 'warning' | 'custom',
+        timeout?: number,
+        color?: reactNotifyToastColor
+    ): void;
+
+    hide(): void;
+    createShowQueue(): reactNotifyToast;
+}
+
+interface NotificationProps {
+    options: any;
+}
+
+export class Notification extends React.Component<NotificationProps, any> {}
+
+export const notify: reactNotifyToast;
+export default Notification;
diff --git a/types/react-notify-toast/react-notify-toast-tests.tsx b/types/react-notify-toast/react-notify-toast-tests.tsx
new file mode 100644
index 0000000000..38adc837bd
--- /dev/null
+++ b/types/react-notify-toast/react-notify-toast-tests.tsx
@@ -0,0 +1,20 @@
+import * as React from 'react';
+import Notification, { notify } from 'react-notify-toast';
+
+export class NotificationTest extends React.Component {
+    render() {
+        return(<Notification options={{zIndex: 200, top: '15px'}} />);
+    }
+}
+
+function testNotify() {
+    notify.show('show something');
+    notify.show('show error', 'error');
+    notify.show('show warning', 'warning', 100);
+
+    const queue = notify.createShowQueue();
+    queue.show('hi');
+    queue.show('test');
+
+    notify.hide();
+}
diff --git a/types/react-notify-toast/tsconfig.json b/types/react-notify-toast/tsconfig.json
new file mode 100644
index 0000000000..c9c3ff748c
--- /dev/null
+++ b/types/react-notify-toast/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-notify-toast-tests.tsx"
+    ]
+}
diff --git a/types/react-notify-toast/tslint.json b/types/react-notify-toast/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-notify-toast/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-numeric-input/index.d.ts b/types/react-numeric-input/index.d.ts
index b10a54cfe3..8dc64f3ba3 100644
--- a/types/react-numeric-input/index.d.ts
+++ b/types/react-numeric-input/index.d.ts
@@ -1,46 +1,61 @@
 // 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>
+//                 Aarni Koskela <https://github.com/akx>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
 export = NumericInput;
 
 declare namespace NumericInput {
-    interface NumericInputProps extends React.Props<NumericInput> {
+    type BoundsFunctionProp = number | ((component: NumericInput) => number | undefined);
+    type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;  // via TS 2.8 manual
+    interface NumericInputProps extends Omit<
+        React.InputHTMLAttributes<HTMLInputElement>,
+        'min' | 'max' | 'step' | 'onChange' | 'defaultValue' | 'onInvalid' | 'style'
+    > {
         addLabelText?: string;
-        className?: string;
+        componentClass?: 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;
+        format?: ((value: number | null) => string);
+        max?: BoundsFunctionProp;
+        min?: BoundsFunctionProp;
+        mobile?: boolean | 'auto' | ((component: NumericInput) => boolean);
+        noStyle?: boolean;
+        noValidate?: boolean | string;
         onBlur?: React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
-        onChange?: ((v: number, s: string, i: JSX.Element) => void);
+        onChange?: ((value: number | null, stringValue: string, input: HTMLInputElement) => void);
         onFocus?: React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
-        onInput?: ((...args: any[]) => void);
-        onInvalid?: ((err: string, v: number, s: string) => void);
+        onInput?: React.FormEventHandler<HTMLInputElement>;
+        onInvalid?: ((error: string, value: number | null, stringValue: 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;
+        onSelect?: React.ReactEventHandler<HTMLInputElement>;
+        onValid?: ((value: number | null, stringValue: string) => void);
+        parse?: ((stringValue: string) => number | null);
+        precision?: number | ((component: NumericInput) => number | null | undefined);
         snap?: boolean;
-        step?: number | object; // TODO: should be `number | <some function>`
+        step?: number | ((component: NumericInput, direction: string) => number | undefined);
         strict?: boolean;
-        style?: { [key: string]: { [key: string]: string } } | boolean;
-        type?: string;
+        style?: {[key: string]: React.CSSProperties} | boolean;
         value?: number | string;
     }
+    // Exposed here for the function prop handlers that get the NumericInput instance as a parameter.
+    // Lifted directly from react-numeric-input@79874ccbe:/src/NumericInput.jsx#L63-L73
+    interface NumericInputState {
+        btnDownActive?: boolean;
+        btnDownHover?: boolean;
+        btnUpActive?: boolean;
+        btnUpHover?: boolean;
+        selectionEnd?: number | null;
+        selectionStart?: number | null;
+        stringValue?: string;
+        value?: number | null;
+    }
 }
 
-declare class NumericInput extends React.Component<NumericInput.NumericInputProps> {}
+declare class NumericInput extends React.Component<NumericInput.NumericInputProps, NumericInput.NumericInputState> {
+    static DIRECTION_UP: string;
+    static DIRECTION_DOWN: string;
+}
diff --git a/types/react-numeric-input/react-numeric-input-tests.tsx b/types/react-numeric-input/react-numeric-input-tests.tsx
index 811b77a4c7..fc55835330 100644
--- a/types/react-numeric-input/react-numeric-input-tests.tsx
+++ b/types/react-numeric-input/react-numeric-input-tests.tsx
@@ -3,6 +3,16 @@ import NumericInput = require('react-numeric-input');
 
 export class NumericInputTest extends Component {
   render() {
-    return(<NumericInput />);
+    return (
+      <NumericInput
+        min={-10}
+        max={(comp) => (comp.state.value || 1) + 1}
+        format={(x) => `EUR ${x}`}
+        parse={(s) => parseFloat(s.replace(/EUR /, ''))}
+        step={(comp, dir) => (dir === NumericInput.DIRECTION_UP ? 9 : 1)}
+        style={{wrap: {color: 'orange'}}}
+        className="hello"
+      />
+    );
   }
 }
diff --git a/types/react-onclickoutside/index.d.ts b/types/react-onclickoutside/index.d.ts
index d97970642f..2fb5659029 100644
--- a/types/react-onclickoutside/index.d.ts
+++ b/types/react-onclickoutside/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Pomax/react-onclickoutside
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-onclickoutside/v5/index.d.ts b/types/react-onclickoutside/v5/index.d.ts
index 4228697e22..82b4b21a25 100644
--- a/types/react-onclickoutside/v5/index.d.ts
+++ b/types/react-onclickoutside/v5/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/Pomax/react-onclickoutside
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-onsenui/index.d.ts b/types/react-onsenui/index.d.ts
index 91055d25b4..b65a6510e0 100644
--- a/types/react-onsenui/index.d.ts
+++ b/types/react-onsenui/index.d.ts
@@ -1,8 +1,10 @@
-// Type definitions for React Onsen UI (react-onsenui) 2.9
+// Type definitions for React Onsen UI (react-onsenui) 2.9.4
 // Project: https://onsen.io/v2/docs/guide/react/
-// Definitions by: Ozytis <https://ozytis.fr>, Salim <https://github.com/salim7>, Jemmyw <https://github.com/jemmyw>
+// Definitions by: Ozytis <https://ozytis.fr>,
+//                 Salim <https://github.com/salim7>,
+//                 Jemmyw <https://github.com/jemmyw>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import Component = React.Component;
@@ -281,6 +283,7 @@ export class Ripple extends Component<{
     color?: string,
     background?: string,
     disabled?: boolean,
+    modifier?: string,
 }, any> {}
 
 /*** Forms ***/
@@ -290,12 +293,15 @@ export class Fab extends Component<{
     position?: string,
     disabled?: boolean,
     onClick?(e?: React.MouseEvent<HTMLElement>): void,
+    name?: string,
+    className?: string
 }, any> {}
 
 export class Button extends Component<{
     modifier?: string,
     disabled?: boolean,
     ripple?: boolean,
+    name?: string,
     className?: string,
     onClick?(e?: React.MouseEvent<HTMLElement>): void
 }, any> {}
@@ -303,8 +309,10 @@ export class Button extends Component<{
 export class Input extends Component<{
     modifier?: string,
     disabled?: boolean,
+    readOnly?: boolean,
     onChange?: (e: React.ChangeEvent<any>) => void,
     value?: string,
+    defaultValue?: string,
     checked?: boolean,
     placeholder?: string,
     type?: string,
@@ -320,7 +328,10 @@ export class Radio extends Component<{
     onChange?(e: Event): void,
     value?: string,
     checked?: boolean,
-    inputId?: string
+    defaultChecked?: boolean,
+    inputId?: string,
+    name?: string,
+    className?: string
 }, any> {}
 
 export class Checkbox extends Component<{
@@ -329,7 +340,9 @@ export class Checkbox extends Component<{
     onChange?(e: Event): void,
     value?: string,
     checked?: boolean,
-    inputId?: string
+    inputId?: string,
+    name?: string,
+    className?: string
 }, any> {}
 
 export class Range extends Component<{
@@ -348,14 +361,18 @@ export class Select extends Component<{
     autofocus?: boolean,
     required?: boolean,
     form?: string,
-    size?: string
+    size?: string,
+    name?: string,
+    className?: string
 }, any> {}
 
 export class Switch extends Component<{
+    modifier?: string,
     onChange?(e: SwitchChangeEvent): void,
     checked?: boolean,
     disabled?: boolean,
     inputId?: string,
+    name?: string,
     className?: string
 }, any> {}
 
diff --git a/types/react-onsenui/react-onsenui-tests.tsx b/types/react-onsenui/react-onsenui-tests.tsx
index 9286469e2c..a7c3bca3fc 100644
--- a/types/react-onsenui/react-onsenui-tests.tsx
+++ b/types/react-onsenui/react-onsenui-tests.tsx
@@ -2,7 +2,7 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import {
     SplitterSide, Splitter, SplitterContent,
-    Page, Input, Button,
+    Page, Input, Button, Radio, Checkbox, Select, Switch,
 } from "react-onsenui";
 
 class AppState {
@@ -12,10 +12,7 @@ class AppState {
 interface AppProps {} // tslint:disable-line no-empty-interface
 
 export class App extends React.Component<AppProps, AppState> {
-    constructor(props: AppProps) {
-        super(props);
-        this.state = new AppState();
-    }
+    state = new AppState();
 
     hide() {
         this.setState({ isOpen: false });
@@ -23,6 +20,9 @@ export class App extends React.Component<AppProps, AppState> {
 
     onChange(event: React.ChangeEvent<HTMLInputElement>) {}
     onClick(event: React.MouseEvent<HTMLButtonElement>) {}
+    onRadioChange(event: Event) {}
+    onCheckboxChange(event: Event) {}
+    onSelectChange(event: React.ChangeEvent<HTMLSelectElement>) {}
 
     render() {
         return (
@@ -41,8 +41,16 @@ export class App extends React.Component<AppProps, AppState> {
                 <SplitterContent>
                     <Page>
                         Test page
-                        <Input name='test' type='text' value='test' onChange={this.onChange} />
-                        <Button onClick={this.onClick} />
+                        <Input name='test' type='text' value='test' readOnly={true} onChange={this.onChange} />
+                        <Radio name='radioTest' defaultChecked={true} className='left' checked={true} disabled={true} inputId='radioId' onChange={this.onRadioChange} />
+                        <Checkbox name='checkboxTest' checked={true} disabled={true} inputId='checkboxId' className='left' modifier='material' onChange={this.onCheckboxChange} />
+                        <Select modifier='material' name='selectTest' className='left' onChange={this.onSelectChange}>
+                            <option value="1">Option #1</option>
+                            <option value="2">Option #2</option>
+                            <option value="3">Option #3</option>
+                        </Select>
+                        <Switch className='left' modifier='material' checked={true} inputId='switchId' name='switchTest' />
+                        <Button name='someButton' onClick={this.onClick} />
 					</Page>
                 </SplitterContent>
             </Splitter>
diff --git a/types/react-overlays/index.d.ts b/types/react-overlays/index.d.ts
index 99df3b3cbd..a8df0341be 100644
--- a/types/react-overlays/index.d.ts
+++ b/types/react-overlays/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Aaron Beall <https://github.com/aaronbeall>
 //                 Vito Samson <https://github.com/vitosamson>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-owl-carousel/index.d.ts b/types/react-owl-carousel/index.d.ts
index bcd9af38b5..365ea39598 100644
--- a/types/react-owl-carousel/index.d.ts
+++ b/types/react-owl-carousel/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/seal789ie/react-owl-carousel
 // Definitions by: T Bounsiar <https://github.com/tbounsiar>, Ismael Gorissen <https://github.com/igorissen>, Kenneth Ceyer <https://github.com/KennethanCeyer>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-paginate/index.d.ts b/types/react-paginate/index.d.ts
index 0030028055..83a03ac838 100644
--- a/types/react-paginate/index.d.ts
+++ b/types/react-paginate/index.d.ts
@@ -1,11 +1,12 @@
-// Type definitions for react-paginate 4.3
+// Type definitions for react-paginate 5.2
 // Project: https://github.com/AdeleD/react-paginate
 // Definitions by: Simon Hartcher <https://github.com/deevus>
 //                 Wouter Hardeman <https://github.com/wouterhardeman>
 //                 pegel03 <https://github.com/pegel03>
 //                 Simon Archer <https://github.com/archy-bold>
+//                 Yasunori Ohoka <https://github.com/yasupeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -48,7 +49,7 @@ interface ReactPaginateProps {
     /**
      * The method to call when a page is clicked. Exposes the current page object as an argument.
      */
-    onPageChange?(selectedItem: {selected: number}): void;
+    onPageChange?(selectedItem: { selected: number }): void;
 
     /**
      * The initial page selected.
@@ -122,4 +123,4 @@ interface ReactPaginateProps {
 }
 
 declare const ReactPaginate: React.ComponentClass<ReactPaginateProps>;
-export = ReactPaginate;
+export default ReactPaginate;
diff --git a/types/react-paginate/react-paginate-tests.tsx b/types/react-paginate/react-paginate-tests.tsx
index 92d8659c0c..a98e8702a4 100644
--- a/types/react-paginate/react-paginate-tests.tsx
+++ b/types/react-paginate/react-paginate-tests.tsx
@@ -1,5 +1,5 @@
-import * as React from "react";
-import ReactPaginate = require("react-paginate");
+import * as React from 'react';
+import ReactPaginate from 'react-paginate';
 
 class Test extends React.Component {
     render() {
diff --git a/types/react-paginate/tsconfig.json b/types/react-paginate/tsconfig.json
index 5653cee275..5c49c56d9e 100644
--- a/types/react-paginate/tsconfig.json
+++ b/types/react-paginate/tsconfig.json
@@ -1,8 +1,4 @@
 {
-    "files": [
-        "index.d.ts",
-        "react-paginate-tests.tsx"
-    ],
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
@@ -21,5 +17,9 @@
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
         "jsx": "react"
-    }
-}
\ No newline at end of file
+    },
+    "files": [
+        "index.d.ts",
+        "react-paginate-tests.tsx"
+    ]
+ }
diff --git a/types/react-paginate/v4/index.d.ts b/types/react-paginate/v4/index.d.ts
new file mode 100644
index 0000000000..736455f60f
--- /dev/null
+++ b/types/react-paginate/v4/index.d.ts
@@ -0,0 +1,125 @@
+// Type definitions for react-paginate 4.3
+// Project: https://github.com/AdeleD/react-paginate
+// Definitions by: Simon Hartcher <https://github.com/deevus>
+//                 Wouter Hardeman <https://github.com/wouterhardeman>
+//                 pegel03 <https://github.com/pegel03>
+//                 Simon Archer <https://github.com/archy-bold>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+interface ReactPaginateProps {
+    /**
+     * The total number of pages.
+     */
+    pageCount: number;
+
+    /**
+     * The range of pages displayed.
+     */
+    pageRangeDisplayed: number;
+
+    /**
+     * The number of pages to display for margins.
+     */
+    marginPagesDisplayed: number;
+
+    /**
+     * Label for the `previous` button.
+     */
+    previousLabel?: string | JSX.Element;
+
+    /**
+     * Label for the `next` button.
+     */
+    nextLabel?: string | JSX.Element;
+
+    /**
+     * Label for ellipsis.
+     */
+    breakLabel?: string | JSX.Element;
+
+    /**
+     * The classname on tag `li` of the ellipsis element.
+     */
+    breakClassName?: string | JSX.Element;
+
+    /**
+     * The method to call when a page is clicked. Exposes the current page object as an argument.
+     */
+    onPageChange?(selectedItem: { selected: number }): void;
+
+    /**
+     * The initial page selected.
+     */
+    initialPage?: number;
+
+    /**
+     * To override selected page with parent prop.
+     */
+    forcePage?: number;
+
+    /**
+     * Disable onPageChange callback with initial page. Default: false
+     */
+    disableInitialCallback?: boolean;
+
+    /**
+     * The classname of the pagination container.
+     */
+    containerClassName?: string;
+
+    /**
+     * The classname on tag `li` of each page element.
+     */
+    pageClassName?: string;
+
+    /**
+     * The classname on tag `a` of each page element.
+     */
+    pageLinkClassName?: string;
+
+    /**
+     * The classname for the active page.
+     */
+    activeClassName?: string;
+
+    /**
+     * The classname on tag `li` of the `previous` button.
+     */
+    previousClassName?: string;
+
+    /**
+     * The classname on tag `li` of the `next` button.
+     */
+    nextClassName?: string;
+
+    /**
+     * The classname on tag `a` of the `previous` button.
+     */
+    previousLinkClassName?: string;
+
+    /**
+     * The classname on tag `a` of the `next` button.
+     */
+    nextLinkClassName?: string;
+
+    /**
+     * The classname for disabled `previous` and `next` buttons.
+     */
+    disabledClassName?: string;
+
+    /**
+     * The method is called to generate the href attribute value on tag a of each page element.
+     */
+    hrefBuilder?(pageIndex: number): void;
+
+    /**
+     * Extra context to add to the aria-label HTML attribute.
+     */
+    extraAriaContext?: string;
+}
+
+declare const ReactPaginate: React.ComponentClass<ReactPaginateProps>;
+export = ReactPaginate;
diff --git a/types/react-paginate/v4/react-paginate-tests.tsx b/types/react-paginate/v4/react-paginate-tests.tsx
new file mode 100644
index 0000000000..130db0248c
--- /dev/null
+++ b/types/react-paginate/v4/react-paginate-tests.tsx
@@ -0,0 +1,33 @@
+import * as React from 'react';
+import ReactPaginate = require('react-paginate');
+
+class Test extends React.Component {
+    render() {
+        return (
+            <ReactPaginate
+                pageCount={1}
+                pageRangeDisplayed={10}
+                marginPagesDisplayed={2}
+                previousLabel={'previous'}
+                nextLabel={'next'}
+                breakLabel={'break-me'}
+                breakClassName={'break-class'}
+                onPageChange={(selectedItem: {selected: number}) => null}
+                initialPage={2}
+                forcePage={3}
+                disableInitialCallback={false}
+                containerClassName={'container'}
+                pageClassName={'page-li'}
+                pageLinkClassName={'page-a'}
+                activeClassName={'active'}
+                previousClassName={'previous-li'}
+                nextClassName={'next-li'}
+                previousLinkClassName={'previous-a'}
+                nextLinkClassName={'next-a'}
+                disabledClassName={'disabled'}
+                hrefBuilder={(pageIndex: number) => null}
+                extraAriaContext={'aria'}
+            />
+        );
+    }
+}
diff --git a/types/react-paginate/v4/tsconfig.json b/types/react-paginate/v4/tsconfig.json
new file mode 100644
index 0000000000..d6ee7a0357
--- /dev/null
+++ b/types/react-paginate/v4/tsconfig.json
@@ -0,0 +1,30 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-paginate": [
+                "react-paginate/v4"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react"
+    },
+    "files": [
+        "index.d.ts",
+        "react-paginate-tests.tsx"
+    ]
+}
diff --git a/types/react-paginate/v4/tslint.json b/types/react-paginate/v4/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-paginate/v4/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-places-autocomplete/index.d.ts b/types/react-places-autocomplete/index.d.ts
index 667106d916..62e3d93a1d 100644
--- a/types/react-places-autocomplete/index.d.ts
+++ b/types/react-places-autocomplete/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for react-places-autocomplete 6.1
 // Project: https://github.com/kenny-hibino/react-places-autocomplete/
 // Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+//                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 //
 /// <reference types="googlemaps" />
 
@@ -56,6 +57,11 @@ export interface PropTypes {
 }
 
 export function geocodeByAddress(address: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+export function geocodeByAddress(address: string): Promise<google.maps.GeocoderResult[]>;
+
 export function geocodeByPlaceId(placeId: string, callback: (results: google.maps.GeocoderResult[], status: google.maps.GeocoderStatus) => void): void;
+export function geocodeByPlaceId(placeId: string): Promise<google.maps.GeocoderResult[]>;
+
+export function getLatLng(results: google.maps.GeocoderResult): Promise<google.maps.LatLngLiteral>;
 
 export default class PlacesAutocomplete extends React.Component<PropTypes> {}
diff --git a/types/react-places-autocomplete/react-places-autocomplete-tests.tsx b/types/react-places-autocomplete/react-places-autocomplete-tests.tsx
new file mode 100644
index 0000000000..41e6ff37b4
--- /dev/null
+++ b/types/react-places-autocomplete/react-places-autocomplete-tests.tsx
@@ -0,0 +1,52 @@
+import * as React from 'react';
+import PlacesAutocomplete, { geocodeByAddress, geocodeByPlaceId, getLatLng } from 'react-places-autocomplete';
+
+class Test extends React.Component {
+    state = {
+        address: 'San Francisco, CA',
+        placeId: '12345',
+    };
+
+    handleFormSubmit = (event: any) => {
+        event.preventDefault();
+
+        const { address, placeId } = this.state;
+
+        // Old API
+        geocodeByAddress(address, (results, status) => {
+            const latLng = getLatLng(results[0]);
+            console.info(latLng, status);
+        });
+
+        geocodeByPlaceId(placeId, (results, status) => {
+            const latLng = getLatLng(results[0]);
+            console.info(latLng, status);
+        });
+
+        // New API
+        geocodeByAddress(address)
+            .then((results) => getLatLng(results[0]))
+            .then((latLng) => console.log('Success', latLng))
+            .catch((error) => console.error('Error', error));
+
+        geocodeByPlaceId(placeId)
+            .then((results) => getLatLng(results[0]))
+            .then((latLng) => console.log('Success', latLng))
+            .catch((error) => console.error('Error', error));
+    }
+
+    onChange = (address: string) => this.setState({ address });
+
+    render() {
+        const inputProps = {
+            value: this.state.address,
+            onChange: this.onChange,
+        };
+
+        return (
+            <form onSubmit={this.handleFormSubmit}>
+                <PlacesAutocomplete inputProps={inputProps} />
+            </form>
+        );
+    }
+}
diff --git a/types/react-places-autocomplete/tsconfig.json b/types/react-places-autocomplete/tsconfig.json
index 02dbd0279c..6f45bffc51 100644
--- a/types/react-places-autocomplete/tsconfig.json
+++ b/types/react-places-autocomplete/tsconfig.json
@@ -1,12 +1,19 @@
 {
-  "files": ["index.d.ts"],
+  "files": [
+    "index.d.ts",
+    "react-places-autocomplete-tests.tsx"
+  ],
   "compilerOptions": {
     "module": "commonjs",
-    "lib": ["es6"],
+    "lib": [
+        "es6",
+        "dom"
+    ],
     "noImplicitAny": true,
     "noImplicitThis": true,
     "strictNullChecks": true,
     "strictFunctionTypes": true,
+    "jsx": "react",
     "baseUrl": "../",
     "typeRoots": ["../"],
     "types": [],
diff --git a/types/react-plotly.js/index.d.ts b/types/react-plotly.js/index.d.ts
new file mode 100644
index 0000000000..4dfc3b0ce3
--- /dev/null
+++ b/types/react-plotly.js/index.d.ts
@@ -0,0 +1,104 @@
+// Type definitions for react-plotly.js 2.2
+// Project: https://github.com/plotly/react-plotly.js#readme
+// Definitions by: Jon Freedman <https://github.com/jonfreedman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as Plotly from 'plotly.js';
+import * as React from 'react';
+
+export interface Frame {
+    name: string;
+    data: [{ x: Plotly.Datum, y: Plotly.Datum }];
+    group: 'lower' | 'upper';
+}
+
+export interface Figure {
+    data: Plotly.Data[];
+    layout: Partial<Plotly.Layout>;
+}
+
+export interface PlotParams {
+    data: Plotly.Data[];
+    layout: Partial<Plotly.Layout>;
+    frames?: Frame[];
+    config?: Partial<Plotly.Config>;
+    /**
+     * When provided, causes the plot to update only when the revision is incremented.
+     */
+    revision?: number;
+    /**
+     * Callback executed after plot is initialized.
+     * @param figure Object with three keys corresponding to input props: data, layout and frames.
+     * @param graphDiv Reference to the DOM node into which the figure was rendered.
+     */
+    onInitialized?: (figure: Readonly<Figure>, graphDiv: Readonly<HTMLElement>) => void;
+    /**
+     * Callback executed when when a plot is updated due to new data or layout, or when user interacts with a plot.
+     * @param figure Object with three keys corresponding to input props: data, layout and frames.
+     * @param graphDiv Reference to the DOM node into which the figure was rendered.
+     */
+    onUpdate?: (figure: Readonly<Figure>, graphDiv: Readonly<HTMLElement>) => void;
+    /**
+     * Callback executed when component unmounts, before Plotly.purge strips the graphDiv of all private attributes.
+     * @param figure Object with three keys corresponding to input props: data, layout and frames.
+     * @param graphDiv Reference to the DOM node into which the figure was rendered.
+     */
+    onPurge?: (figure: Readonly<Figure>, graphDiv: Readonly<HTMLElement>) => void;
+    /**
+     * Callback executed when a plotly.js API method rejects
+     * @param err Error
+     */
+    onError?: (err: Readonly<Error>) => void;
+    /**
+     * id assigned to the <div> into which the plot is rendered.
+     */
+    divId?: string;
+    /**
+     * applied to the <div> into which the plot is rendered
+     */
+    className?: string;
+    /**
+     * used to style the <div> into which the plot is rendered
+     */
+    style?: React.CSSProperties;
+    /**
+     * Assign the graph div to window.gd for debugging
+     */
+    debug?: boolean;
+    /**
+     * When true, adds a call to Plotly.Plot.resize() as a window.resize event handler
+     */
+    useResizeHandler?: boolean;
+
+    onAfterExport?: () => void;
+    onAfterPlot?: () => void;
+    onAnimated?: () => void;
+    onAnimatingFrame?: (event: Readonly<Plotly.FrameAnimationEvent>) => void;
+    onAnimationInterrupted?: () => void;
+    onAutoSize?: () => void;
+    onBeforeExport?: () => void;
+    onButtonClicked?: (event: Readonly<Plotly.ButtonClickEvent>) => void;
+    onClick?: (event: Readonly<Plotly.PlotMouseEvent>) => void;
+    onClickAnnotation?: (event: Readonly<Plotly.ClickAnnotationEvent>) => void;
+    onDeselect?: () => void;
+    onDoubleClick?: () => void;
+    onFramework?: () => void;
+    onHover?: (event: Readonly<Plotly.PlotMouseEvent>) => void;
+    onLegendClick?: (event: Readonly<Plotly.LegendClickEvent>) => boolean;
+    onLegendDoubleClick?: (event: Readonly<Plotly.LegendClickEvent>) => boolean;
+    onRelayout?: (event: Readonly<Plotly.PlotRelayoutEvent>) => void;
+    onRestyle?: (event: Readonly<Plotly.PlotRestyleEvent>) => void;
+    onRedraw?: () => void;
+    onSelected?: (event: Readonly<Plotly.PlotSelectionEvent>) => void;
+    onSelecting?: (event: Readonly<Plotly.PlotSelectionEvent>) => void;
+    onSliderChange?: (event: Readonly<Plotly.SliderChangeEvent>) => void;
+    onSliderEnd?: (event: Readonly<Plotly.SliderEndEvent>) => void;
+    onSliderStart?: (event: Readonly<Plotly.SliderStartEvent>) => void;
+    onTransitioning?: () => void;
+    onTransitionInterrupted?: () => void;
+    onUnhover?: (event: Readonly<Plotly.PlotMouseEvent>) => void;
+}
+
+export default class Plot extends React.PureComponent<PlotParams> {
+}
diff --git a/types/react-plotly.js/react-plotly.js-tests.tsx b/types/react-plotly.js/react-plotly.js-tests.tsx
new file mode 100644
index 0000000000..2ca0b7026d
--- /dev/null
+++ b/types/react-plotly.js/react-plotly.js-tests.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import Plot from 'react-plotly.js';
+
+/**
+ * based on https://plot.ly/javascript/react/#quick-start
+ */
+export class SimpleChartComponent extends React.PureComponent<any> {
+    render() {
+        return(
+            <Plot
+                data={[
+                    {
+                        x: [1, 2, 3],
+                        y: [2, 6, 3],
+                        type: 'scatter',
+                        marker: {color: 'red'},
+                    },
+                    {type: 'bar', x: [1, 2, 3], y: [2, 5, 3]},
+                ]}
+                layout={ {width: 320, height: 240, title: 'A Fancy Plot'} }
+            />
+        );
+    }
+}
diff --git a/types/react-plotly.js/tsconfig.json b/types/react-plotly.js/tsconfig.json
new file mode 100644
index 0000000000..e0ec629a4c
--- /dev/null
+++ b/types/react-plotly.js/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-plotly.js-tests.tsx"
+    ]
+}
diff --git a/types/react-plotly.js/tslint.json b/types/react-plotly.js/tslint.json
new file mode 100644
index 0000000000..6db713aff9
--- /dev/null
+++ b/types/react-plotly.js/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "indent": [true, "spaces", 4]
+    }
+}
diff --git a/types/react-pointable/index.d.ts b/types/react-pointable/index.d.ts
index c69d537d55..9c0828fc76 100644
--- a/types/react-pointable/index.d.ts
+++ b/types/react-pointable/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for react-pointable 1.1
+// Type definitions for react-pointable 1.2
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
@@ -13,14 +13,6 @@ export interface PointableProps extends React.HTMLAttributes<Element>, React.SVG
     tagName?: keyof ElementTagNameMap;
     touchAction?: TouchAction;
     elementRef?(el: HTMLElement|SVGElement): void;
-    onPointerMove?(evt: PointerEvent): void;
-    onPointerDown?(evt: PointerEvent): void;
-    onPointerUp?(evt: PointerEvent): void;
-    onPointerOver?(evt: PointerEvent): void;
-    onPointerOut?(evt: PointerEvent): void;
-    onPointerEnter?(evt: PointerEvent): void;
-    onPointerLeave?(evt: PointerEvent): void;
-    onPointerCancel?(evt: PointerEvent): void;
 }
 
 export default class Pointable extends React.Component<PointableProps> {
diff --git a/types/react-pointable/react-pointable-tests.tsx b/types/react-pointable/react-pointable-tests.tsx
index 6331b88386..f905b8faa8 100644
--- a/types/react-pointable/react-pointable-tests.tsx
+++ b/types/react-pointable/react-pointable-tests.tsx
@@ -3,7 +3,7 @@ import Pointable from 'react-pointable';
 
 class Test extends React.Component<object, object> {
     elementRef(el: HTMLElement) {}
-    somePointerEvent(evt: PointerEvent) {}
+    somePointerEvent(evt: React.PointerEvent) {}
 
     render() {
         return (
diff --git a/types/react-popover/index.d.ts b/types/react-popover/index.d.ts
index fed9c4c32d..a7bc435d2e 100644
--- a/types/react-popover/index.d.ts
+++ b/types/react-popover/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/littlebits/react-popover
 // Definitions by: Jakub Řičař <https://github.com/jacoporicare>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-portal/index.d.ts b/types/react-portal/index.d.ts
index 7595c5e8ad..5faff72d87 100644
--- a/types/react-portal/index.d.ts
+++ b/types/react-portal/index.d.ts
@@ -1,25 +1,35 @@
-// Type definitions for react-portal 3.0
+// Type definitions for react-portal 4.0
 // Project: https://github.com/tajo/react-portal#readme
 // Definitions by: Shun Takahashi <https://github.com/shuntksh>
+//                 Horus Lugo <https://github.com/HorusGoul>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
-interface CallBackProps extends React.Props<any> {
-    closePortal(): void;
+export interface PortalProps extends React.Props<any> {
+    children: React.ReactNode;
+    node?: Element | null;
 }
 
-interface ReactPortalProps {
-    isOpened?: boolean;
-    openByClickOn?: React.ReactElement<CallBackProps>;
+export const Portal: React.ComponentClass<PortalProps>;
+
+export interface PortalFunctionParams {
+    openPortal: (event?: any) => void;
+    closePortal: () => void;
+    portal: (children: React.ReactNode) => React.ReactElement<React.ComponentClass<PortalProps>>;
+    isOpen: boolean;
+}
+
+export interface PortalWithStateProps extends React.Props<any> {
+    children: (params: PortalFunctionParams) => React.ReactNode;
+    node?: Element | null;
+    defaultOpen?: boolean;
+    openByClickOn?: React.ReactElement<any>;
     closeOnEsc?: boolean;
     closeOnOutsideClick?: boolean;
-    onOpen?(node: HTMLDivElement): void;
-    beforeClose?(node: HTMLDivElement, resetPortalState: () => void): void;
+    onOpen?(): void;
     onClose?(): void;
-    onUpdate?(): void;
 }
 
-declare const ReactPortal: React.ComponentClass<ReactPortalProps>;
-export = ReactPortal;
+export const PortalWithState: React.ComponentClass<PortalWithStateProps>;
diff --git a/types/react-portal/react-portal-tests.tsx b/types/react-portal/react-portal-tests.tsx
index 5313b101bd..7ee7183e45 100644
--- a/types/react-portal/react-portal-tests.tsx
+++ b/types/react-portal/react-portal-tests.tsx
@@ -1,44 +1,79 @@
 // Example from https://github.com/tajo/react-portal
-import * as React from "react";
-import * as ReactDOM from "react-dom";
-import Portal = require("react-portal");
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import { Portal, PortalWithState } from 'react-portal';
 
-export default class App extends React.Component {
-  render() {
-    const button1 = <button>Open portal with pseudo modal</button>;
-
-    return (
-      <div>
-        <Portal
-          isOpened={false}
-          openByClickOn={button1}
-          closeOnEsc
-          closeOnOutsideClick
-          onOpen={(node: HTMLDivElement) => {}}
-          beforeClose={(node: HTMLDivElement, resetPortalState) => resetPortalState()}
-          onClose={() => {}}
-          onUpdate={() => {}}
-        >
-          <PseudoModal>
-            <h2>Pseudo Modal</h2>
-            <p>This react component is appended to the document body.</p>
-          </PseudoModal>
-        </Portal>
-        <Portal />
-      </div>
-    );
-  }
+interface AppState {
+    isPortalOneActive: boolean;
+    isPortalTwoActive: boolean;
 }
 
-export class PseudoModal extends React.Component<{ closePortal?(): void }> {
-  render() {
-    return (
-      <div>
-        {this.props.children}
-        <p><button onClick={this.props.closePortal}>Close this</button></p>
-      </div>
-    );
-  }
+export default class App extends React.Component<{}, AppState> {
+    constructor(props: any) {
+        super(props);
+
+        this.state = {
+            isPortalOneActive: false,
+            isPortalTwoActive: false
+        };
+    }
+
+    render() {
+        return (
+            <div>
+                <h1>React Portal Examples</h1>
+                <p>
+                    <a href="https://github.com/tajo/react-portal">
+                        https://github.com/tajo/react-portal
+                    </a>
+                </p>
+
+                <h2>Portal (stateless)</h2>
+                <button
+                    onClick={() =>
+                        this.setState(prevState => ({
+                            isPortalOneActive: !prevState.isPortalOneActive
+                        }))}>
+                    Toggle
+                </button>
+                {this.state.isPortalOneActive && (
+                    <Portal>
+                        <p>This thing was portaled!</p>
+                    </Portal>
+                )}
+
+                <h2>Portal (stateless, custom node)</h2>
+                <button
+                    onClick={() =>
+                        this.setState(prevState => ({
+                            isPortalTwoActive: !prevState.isPortalTwoActive
+                        }))}>
+                    Toggle
+                </button>
+                {this.state.isPortalTwoActive && (
+                    <Portal node={document && document.getElementById('user-node')}>
+                        <p>This thing was portaled!</p>
+                    </Portal>
+                )}
+
+                <h2>PortalWithState</h2>
+                <PortalWithState closeOnOutsideClick closeOnEsc>
+                    {({ openPortal, closePortal, isOpen, portal }) => [
+                        <button key="foo" onClick={openPortal}>
+                            Open Portal {isOpen && '(this counts as an outised click)'}
+                        </button>,
+                        portal(
+                            <p>
+                                This is more advanced Portal. It handles its own state.{' '}
+                                <button onClick={closePortal}>Close me!</button>, hit ESC or
+                                click outside of me.
+                            </p>
+                        )
+                    ]}
+                </PortalWithState>
+            </div>
+        );
+    }
 }
 
-ReactDOM.render(<App />, document.getElementById('react-body'));
+ReactDOM.render(<App />, document.getElementById('root'));
diff --git a/types/react-portal/v3/index.d.ts b/types/react-portal/v3/index.d.ts
new file mode 100644
index 0000000000..4d869009e6
--- /dev/null
+++ b/types/react-portal/v3/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for react-portal 3.0
+// Project: https://github.com/tajo/react-portal#readme
+// Definitions by: Shun Takahashi <https://github.com/shuntksh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+interface CallBackProps extends React.Props<any> {
+    closePortal(): void;
+}
+
+interface ReactPortalProps {
+    isOpened?: boolean;
+    openByClickOn?: React.ReactElement<CallBackProps>;
+    closeOnEsc?: boolean;
+    closeOnOutsideClick?: boolean;
+    onOpen?(node: HTMLDivElement): void;
+    beforeClose?(node: HTMLDivElement, resetPortalState: () => void): void;
+    onClose?(): void;
+    onUpdate?(): void;
+}
+
+declare const ReactPortal: React.ComponentClass<ReactPortalProps>;
+export = ReactPortal;
diff --git a/types/react-portal/v3/react-portal-tests.tsx b/types/react-portal/v3/react-portal-tests.tsx
new file mode 100644
index 0000000000..ca6c0289de
--- /dev/null
+++ b/types/react-portal/v3/react-portal-tests.tsx
@@ -0,0 +1,44 @@
+// Example from https://github.com/tajo/react-portal
+import * as React from "react";
+import * as ReactDOM from "react-dom";
+import * as Portal from "react-portal";
+
+export default class App extends React.Component {
+  render() {
+    const button1 = <button>Open portal with pseudo modal</button>;
+
+    return (
+      <div>
+        <Portal
+          isOpened={false}
+          openByClickOn={button1}
+          closeOnEsc
+          closeOnOutsideClick
+          onOpen={(node: HTMLDivElement) => {}}
+          beforeClose={(node: HTMLDivElement, resetPortalState) => resetPortalState()}
+          onClose={() => {}}
+          onUpdate={() => {}}
+        >
+          <PseudoModal>
+            <h2>Pseudo Modal</h2>
+            <p>This react component is appended to the document body.</p>
+          </PseudoModal>
+        </Portal>
+        <Portal />
+      </div>
+    );
+  }
+}
+
+export class PseudoModal extends React.Component<{ closePortal?(): void }> {
+  render() {
+    return (
+      <div>
+        {this.props.children}
+        <p><button onClick={this.props.closePortal}>Close this</button></p>
+      </div>
+    );
+  }
+}
+
+ReactDOM.render(<App />, document.getElementById('react-body'));
diff --git a/types/react-portal/v3/tsconfig.json b/types/react-portal/v3/tsconfig.json
new file mode 100644
index 0000000000..3b6f5c966a
--- /dev/null
+++ b/types/react-portal/v3/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "paths": {
+            "react-portal": [ "react-portal/v3" ]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "react-portal-tests.tsx"
+    ]
+}
diff --git a/types/react-portal/v3/tslint.json b/types/react-portal/v3/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-portal/v3/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-primitives/index.d.ts b/types/react-primitives/index.d.ts
new file mode 100644
index 0000000000..7d276c6a94
--- /dev/null
+++ b/types/react-primitives/index.d.ts
@@ -0,0 +1,33 @@
+// Type definitions for react-primitives 0.6
+// Project: https://github.com/lelandrichardson/react-primitives
+// Definitions by: Ahmed Ghoneim <https://github.com/aghoneim92>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { ComponentType } from 'react';
+import {
+    Animated,
+    Dimensions,
+    Easing,
+    Image,
+    PixelRatio,
+    Platform,
+    StyleSheet,
+    Text,
+    TouchableOpacityProps,
+    View
+} from 'react-native';
+
+export const Touchable: ComponentType<TouchableOpacityProps>;
+
+export {
+    Animated,
+    Dimensions,
+    Easing,
+    Image,
+    PixelRatio,
+    Platform,
+    StyleSheet,
+    Text,
+    View
+};
diff --git a/types/react-primitives/react-primitives-tests.tsx b/types/react-primitives/react-primitives-tests.tsx
new file mode 100644
index 0000000000..68512f61c9
--- /dev/null
+++ b/types/react-primitives/react-primitives-tests.tsx
@@ -0,0 +1,87 @@
+import * as React from 'react';
+import {
+    Animated,
+    Dimensions,
+    Easing,
+    Image,
+    PixelRatio,
+    Platform,
+    Text,
+    Touchable,
+    View,
+    StyleSheet
+} from 'react-primitives';
+
+const { Image: AnimatedImage } = Animated;
+
+const { width, height } = Dimensions.get('window');
+const { width: screenWidth, height: screenHeight } = Dimensions.get('screen');
+
+const styles = StyleSheet.create({
+    container: {
+        height: screenHeight
+    },
+    nav: {
+        width: screenWidth,
+        height: 20
+    },
+    image: {
+        width,
+        height: 100
+    },
+    text: {
+        fontSize: 14 * PixelRatio.get()
+    }
+});
+
+interface State {
+    opacity: Animated.Value;
+}
+
+export default class Component extends React.Component<{}, State> {
+    state: State = {
+        opacity: new Animated.Value(0)
+    };
+
+    componentDidMount() {
+        Animated.timing(this.state.opacity, {
+            toValue: 1,
+            duration: 10000,
+            easing: Easing.cubic
+        }).start();
+    }
+
+    render() {
+        const {
+            state: { opacity }
+        } = this;
+
+        return (
+            <View style={styles.container}>
+                <View style={styles.nav}>
+                    <Text>My Awesome App!</Text>
+                </View>
+                <AnimatedImage
+                    style={[styles.image, { opacity }]}
+                    source={{ uri: 'source' }}
+                />
+                <Image style={styles.image} source={{ uri: 'source' }} />
+                <Text style={styles.text}>Hii</Text>
+                {Platform.OS === 'ios' && (
+                    <View>
+                        <Text>IOS Specific Text!</Text>
+                    </View>
+                )}
+                <Touchable onPress={() => undefined}>
+                    <Text>Touch me!</Text>
+                </Touchable>
+                <View>
+                    <Text>Helloooooo</Text>
+                    <Touchable>
+                        <Text>Touch me too!</Text>
+                    </Touchable>
+                </View>
+            </View>
+        );
+    }
+}
diff --git a/types/react-primitives/tsconfig.json b/types/react-primitives/tsconfig.json
new file mode 100644
index 0000000000..9952fe3995
--- /dev/null
+++ b/types/react-primitives/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "files": [
+        "index.d.ts",
+        "react-primitives-tests.tsx"
+    ],
+    "compilerOptions": {
+        "forceConsistentCasingInFileNames": true,
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "noEmit": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": []
+    }
+}
diff --git a/types/react-primitives/tslint.json b/types/react-primitives/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/react-primitives/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-props-decorators/index.d.ts b/types/react-props-decorators/index.d.ts
index 8aa59e5194..5396fa81ca 100644
--- a/types/react-props-decorators/index.d.ts
+++ b/types/react-props-decorators/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/popkirby/react-props-decorators
 // Definitions by: Qubo <https://github.com/tkqubo>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-qr-reader/index.d.ts b/types/react-qr-reader/index.d.ts
new file mode 100644
index 0000000000..de426667c0
--- /dev/null
+++ b/types/react-qr-reader/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for react-qr-reader 2.1
+// Project: https://github.com/JodusNodus/react-qr-reader
+// Definitions by: David Kevork <https://github.com/davidkevork>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+export as namespace QrReader;
+
+export default QrReader;
+
+export namespace QrReader {
+  interface props {
+    onScan: (data: string | null) => void;
+    onError: (err: any) => void;
+    onLoad?: () => void;
+    onImageLoad?: (event: React.SyntheticEvent<HTMLImageElement>) => void;
+    delay?: number | false;
+    facingMode?: 'user' | 'environment';
+    legacyMode?: boolean;
+    resolution?: number;
+    showViewFinder?: boolean;
+    style?: any;
+    className?: string;
+  }
+}
+
+declare class QrReader extends React.Component<QrReader.props> {
+}
diff --git a/types/react-qr-reader/react-qr-reader-tests.tsx b/types/react-qr-reader/react-qr-reader-tests.tsx
new file mode 100644
index 0000000000..20632f8029
--- /dev/null
+++ b/types/react-qr-reader/react-qr-reader-tests.tsx
@@ -0,0 +1,14 @@
+import * as React from "react";
+import QrReader from "react-qr-reader";
+
+export class Test extends React.Component {
+    render() {
+        return (
+            <QrReader
+                onError={(err) => { console.log(err); }}
+                onScan={(data) => { console.log(data); }}
+                facingMode={'user'}
+            />
+        );
+    }
+}
diff --git a/types/react-qr-reader/tsconfig.json b/types/react-qr-reader/tsconfig.json
new file mode 100644
index 0000000000..89aebb0de5
--- /dev/null
+++ b/types/react-qr-reader/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-qr-reader-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-qr-reader/tslint.json b/types/react-qr-reader/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-qr-reader/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-radio-group/index.d.ts b/types/react-radio-group/index.d.ts
index 561599ed0a..809553e497 100644
--- a/types/react-radio-group/index.d.ts
+++ b/types/react-radio-group/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenglou/react-radio-group
 // Definitions by: Jason Unger <https://github.com/jsonunger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-recaptcha/index.d.ts b/types/react-recaptcha/index.d.ts
index 595cc1916e..614bc50f0f 100644
--- a/types/react-recaptcha/index.d.ts
+++ b/types/react-recaptcha/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Mohamed Hegazy <https://github.com/mhegazy>
 //                 Zach <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from "react";
 
diff --git a/types/react-redux-epic/index.d.ts b/types/react-redux-epic/index.d.ts
index f9bba811f8..a059786123 100644
--- a/types/react-redux-epic/index.d.ts
+++ b/types/react-redux-epic/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/BerkeleyTrue/react-redux-epic#readme
 // Definitions by: forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { Observable } from 'rxjs/Observable';
diff --git a/types/react-redux-i18n/index.d.ts b/types/react-redux-i18n/index.d.ts
index f578bee5aa..9d91ab025c 100644
--- a/types/react-redux-i18n/index.d.ts
+++ b/types/react-redux-i18n/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zoover/react-redux-i18n
 // Definitions by: Clément Devos <https://github.com/clementdevos>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare module 'react-redux-i18n' {
   import * as react from "react"
@@ -31,14 +31,22 @@ declare module 'react-redux-i18n' {
   }
 
   type TranslateProps = {
+    className?: string;
+    dangerousHTML?: boolean;
+    style?: React.CSSProperties;
+    tag?: React.ReactType;
     value: string;
-    [prop: string]: string;
-
+    [prop: string]: any;
   }
+
   type LocalizeProps = {
-    value: string | number;
+    className?: string;
+    dangerousHTML?: boolean;
     dateFormat?: string;
     options?: Object;
+    style?: React.CSSProperties;
+    tag?: React.ReactType;
+    value: string | number | object;
   }
 
   /**
diff --git a/types/react-redux-toastr/index.d.ts b/types/react-redux-toastr/index.d.ts
index 7c9f30b056..cf81d974dd 100644
--- a/types/react-redux-toastr/index.d.ts
+++ b/types/react-redux-toastr/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for react-redux-toastr 7.0.0
+// Type definitions for react-redux-toastr 7.1
 // Project: https://github.com/diegoddox/react-redux-toastr
 // Definitions by: Aleksandar Ivanov <https://github.com/Smiche>
 //                 Artyom Stukans <https://github.com/artyomsv>
@@ -7,7 +7,7 @@
 // TypeScript Version: 2.8
 
 import { Component } from 'react';
-import { Action, ActionCreator, Reducer } from 'redux';
+import { Action, Reducer } from 'redux';
 
 export type iconType = 'success' | 'info' | 'warning' | 'error';
 export type positionType = 'top-left' | 'top-center' | 'top-right' | 'bottom-left' | 'bottom-center' | 'bottom-right';
@@ -23,6 +23,7 @@ interface BasicToastrOptions {
     onCloseButtonClick?: () => void;
     onHideComplete?: () => void;
     onShowComplete?: () => void;
+    onToastrClick?: () => void;
     progressBar?: boolean;
     removeOnHover?: boolean;
     showCloseButton?: boolean;
diff --git a/types/react-redux-toastr/package.json b/types/react-redux-toastr/package.json
index 6d68bf2f9b..998f8e9b38 100644
--- a/types/react-redux-toastr/package.json
+++ b/types/react-redux-toastr/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^3.6.0 || ^4.0.0"
     }
 }
diff --git a/types/react-redux/index.d.ts b/types/react-redux/index.d.ts
index a3e19267de..8aa723c232 100644
--- a/types/react-redux/index.d.ts
+++ b/types/react-redux/index.d.ts
@@ -1,5 +1,5 @@
-// Type definitions for react-redux 6.0.1
-// Project: https://github.com/rackt/react-redux
+// Type definitions for react-redux 6.0.4
+// Project: https://github.com/reduxjs/react-redux
 // Definitions by: Qubo <https://github.com/tkqubo>,
 //                 Thomas Hasner <https://github.com/thasner>,
 //                 Kenzie Togami <https://github.com/kenzierocks>,
@@ -26,56 +26,56 @@
 // to update this type definitions for redux@4.x from redux@3.x.
 // https://github.com/DefinitelyTyped/DefinitelyTyped/issues/25321
 
-import * as React from 'react';
-import * as Redux from 'redux';
+import {
+    Component,
+    ComponentClass,
+    ComponentType,
+    StatelessComponent
+} from 'react';
 
-type ComponentClass<P> = React.ComponentClass<P>;
-type StatelessComponent<P> = React.StatelessComponent<P>;
-type Component<P> = React.ComponentType<P>;
-type ReactNode = React.ReactNode;
-type Store<S> = Redux.Store<S>;
-type Dispatch<A extends Redux.Action = Redux.AnyAction> = Redux.Dispatch<A>;
-type ActionCreator<A> = Redux.ActionCreator<A>;
+import {
+    Action,
+    ActionCreator,
+    AnyAction,
+    Dispatch,
+    Store
+} from 'redux';
 
-// Diff / Omit taken from https://github.com/Microsoft/TypeScript/issues/12215#issuecomment-311923766
-type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
+// Omit taken from https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
+type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-
-export interface DispatchProp<A extends Redux.Action = Redux.AnyAction> {
-  dispatch: Dispatch<A>;
+export interface DispatchProp<A extends Action = AnyAction> {
+    dispatch: Dispatch<A>;
 }
 
 interface AdvancedComponentDecorator<TProps, TOwnProps> {
-    (component: Component<TProps>): ComponentClass<TOwnProps>;
+    (component: ComponentType<TProps>): ComponentClass<TOwnProps>;
 }
 
 /**
  * a property P will be present if :
  * - it is present in both DecorationTargetProps and InjectedProps
- * - DecorationTargetProps[P] extends InjectedProps[P]
+ * - InjectedProps[P] can satisfy DecorationTargetProps[P]
  * ie: decorated component can accept more types than decorator is injecting
  *
- * For decoration, inject props or ownProps are all optionnaly
+ * For decoration, inject props or ownProps are all optionally
  * required by the decorated (right hand side) component.
- * But any property required by the decorated component must extend the injected property
+ * But any property required by the decorated component must be satisfied by the injected property.
  */
 type Shared<
     InjectedProps,
     DecorationTargetProps extends Shared<InjectedProps, DecorationTargetProps>
     > = {
-        [P in Extract<keyof InjectedProps, keyof DecorationTargetProps>]?: DecorationTargetProps[P] extends InjectedProps[P] ? InjectedProps[P] : never;
+        [P in Extract<keyof InjectedProps, keyof DecorationTargetProps>]?: InjectedProps[P] extends DecorationTargetProps[P] ? DecorationTargetProps[P] : never;
     };
 
 // Injects props and removes them from the prop requirements.
 // Will not pass through the injected props if they are passed in during
 // render. Also adds new prop requirements from TNeedsProps.
 export interface InferableComponentEnhancerWithProps<TInjectedProps, TNeedsProps> {
-	(
-		component: StatelessComponent<TInjectedProps>
-	): ComponentClass<TNeedsProps> & {WrappedComponent: StatelessComponent<TInjectedProps>}
 	<P extends Shared<TInjectedProps, P>>(
-		component: Component<P>
-	): ComponentClass<Omit<P, keyof Shared<TInjectedProps, P>> & TNeedsProps> & {WrappedComponent: Component<P>}
+		component: ComponentType<P>
+	): ComponentClass<Omit<P, keyof Shared<TInjectedProps, P>> & TNeedsProps> & {WrappedComponent: ComponentType<P>}
 }
 
 // Injects props and removes them from the prop requirements.
@@ -316,18 +316,17 @@ export interface ConnectOptions {
     withRef?: boolean
 }
 
-export interface ProviderProps {
+export interface ProviderProps<A extends Action = AnyAction> {
     /**
      * The single Redux store in your application.
      */
-    store?: Store<any>;
-    children?: ReactNode;
+    store: Store<any, A>;
 }
 
 /**
  * Makes the Redux store available to the connect() calls in the component hierarchy below.
  */
-export class Provider extends React.Component<ProviderProps, {}> { }
+export class Provider<A extends Action = AnyAction> extends Component<ProviderProps<A>> { }
 
 /**
  * Creates a new <Provider> which will set the Redux Store on the passed key of the context. You probably only need this
diff --git a/types/react-redux/react-redux-tests.tsx b/types/react-redux/react-redux-tests.tsx
index 16fb7f0306..5d2395d811 100644
--- a/types/react-redux/react-redux-tests.tsx
+++ b/types/react-redux/react-redux-tests.tsx
@@ -1,7 +1,7 @@
 import { Component, ReactElement } from 'react';
 import * as React from 'react';
 import * as ReactDOM from 'react-dom';
-import { Store, Dispatch, AnyAction, ActionCreator, createStore, bindActionCreators, ActionCreatorsMapObject } from 'redux';
+import { Store, Dispatch, AnyAction, ActionCreator, createStore, bindActionCreators, ActionCreatorsMapObject, Reducer } from 'redux';
 import { Connect, connect, createProvider, Provider, DispatchProp, MapStateToProps, Options } from 'react-redux';
 import objectAssign = require('object-assign');
 
@@ -832,7 +832,12 @@ namespace TestDispatchToPropsAsObject {
 	<Header />
 }
 
-namespace TestInferredFunctionalComponent {
+namespace TestInferredFunctionalComponentWithExplicitOwnProps {
+  type Props = {
+    title: string,
+    extraText: string,
+    onClick: () => void,
+  };
 
 	const Header = connect(
 		(
@@ -845,7 +850,30 @@ namespace TestInferredFunctionalComponent {
 		(dispatch) => ({
 			onClick: () => dispatch({ type: 'test' })
 		})
-	)(({ title, extraText, onClick }) => {
+	)(({ title, extraText, onClick }: Props) => {
+		return <h1 onClick={onClick}>{title} {extraText}</h1>;
+	});
+	<Header extraText='text'/>
+}
+
+namespace TestInferredFunctionalComponentWithImplicitOwnProps {
+
+  type Props = {
+    title: string,
+    extraText: string,
+    onClick: () => void,
+  };
+
+	const Header = connect(
+		(
+			{ app: { title }}: { app: { title: string }},
+		) => ({
+			title,
+		}),
+		(dispatch) => ({
+			onClick: () => dispatch({ type: 'test' })
+		})
+	)(({ title, extraText, onClick }: Props) => {
 		return <h1 onClick={onClick}>{title} {extraText}</h1>;
 	});
 	<Header extraText='text'/>
@@ -985,3 +1013,145 @@ namespace TestWithoutTOwnPropsDecoratedInference {
     const ConnectedWithPickedOwnProps = connect(mapStateToPropsForPicked)(AllPropsComponent);
     <ConnectedWithPickedOwnProps own="blah" />
 }
+
+// https://github.com/DefinitelyTyped/DefinitelyTyped/issues/25321#issuecomment-387659500
+namespace ProviderAcceptsStoreWithCustomAction {
+    const reducer: Reducer<
+        { foo: number } | undefined,
+        { type: "foo"; payload: number }
+    > = state => state;
+
+    const store = createStore(reducer);
+
+    const Whatever = () => (
+        <Provider store={store}>
+            <div>Whatever</div>
+        </Provider>
+    );
+}
+
+namespace TestOptionalPropsMergedCorrectly {
+  interface OptionalDecorationProps {
+    foo: string,
+    bar: number,
+    optionalProp?: boolean,
+    dependsOnDispatch?: () => void,
+  }
+
+  class Component extends React.Component<OptionalDecorationProps> {
+      render () {
+          return <div />;
+      }
+  }
+
+  type MapStateProps = {
+      foo: string,
+      bar: number,
+      optionalProp: boolean,
+  }
+
+  type MapDispatchProps = {
+    dependsOnDispatch: () => void
+  }
+
+  function mapStateToProps (state: any): MapStateProps {
+    return {
+        foo: 'foo',
+        bar: 42,
+        optionalProp: true,
+    };
+  }
+
+  function mapDispatchToProps (dispatch: any): MapDispatchProps {
+    return {
+      dependsOnDispatch: () => {}
+    };
+  }
+
+  connect(mapStateToProps, mapDispatchToProps)(Component)
+}
+
+namespace TestMoreGeneralDecorationProps {
+  // connect() should support decoration props that are more permissive
+  // than the injected props, as long as the injected props can satisfy
+  // the decoration props.
+  interface MoreGeneralDecorationProps {
+    foo: string | number,
+    bar: number | 'foo',
+    optionalProp?: boolean | Object,
+    dependsOnDispatch?: () => void,
+  }
+
+  class Component extends React.Component<MoreGeneralDecorationProps> {
+      render () {
+          return <div />;
+      }
+  }
+
+  type MapStateProps = {
+      foo: string,
+      bar: number,
+      optionalProp: boolean,
+  }
+
+  type MapDispatchProps = {
+    dependsOnDispatch: () => void
+  }
+
+  function mapStateToProps (state: any): MapStateProps {
+    return {
+        foo: 'foo',
+        bar: 42,
+        optionalProp: true,
+    };
+  }
+
+  function mapDispatchToProps (dispatch: any): MapDispatchProps {
+    return {
+      dependsOnDispatch: () => {}
+    };
+  }
+
+  connect(mapStateToProps, mapDispatchToProps)(Component)
+}
+
+namespace TestFailsMoreSpecificInjectedProps {
+  interface MoreSpecificDecorationProps {
+    foo: string,
+    bar: number,
+    dependsOnDispatch: () => void,
+  }
+
+  class Component extends React.Component<MoreSpecificDecorationProps> {
+      render () {
+          return <div />;
+      }
+  }
+
+  type MapStateProps = {
+    foo: string | number,
+    bar: number | 'foo',
+    dependsOnDispatch?: () => void,
+  }
+
+  type MapDispatchProps = {
+    dependsOnDispatch?: () => void
+  }
+
+  function mapStateToProps (state: any): MapStateProps {
+    return {
+        foo: 'foo',
+        bar: 42,
+    };
+  }
+
+  function mapDispatchToProps (dispatch: any): MapDispatchProps {
+    return {
+      dependsOnDispatch: () => {}
+    };
+  }
+
+  // Since it is possible the injected props could fail to satisfy the decoration props,
+  // the following line should fail to compile.
+  connect(mapStateToProps, mapDispatchToProps)(Component) // $ExpectError
+}
diff --git a/types/react-redux/v5/index.d.ts b/types/react-redux/v5/index.d.ts
index 0e3b6ffb88..6dc8844f1e 100644
--- a/types/react-redux/v5/index.d.ts
+++ b/types/react-redux/v5/index.d.ts
@@ -9,7 +9,7 @@
 //                 Dibyo Majumdar <https://github.com/mdibyo>
 //                 Prashant Deva <https://github.com/pdeva>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 // Known Issue:
 // There is a known issue in TypeScript, which doesn't allow decorators to change the signature of the classes
diff --git a/types/react-relay/index.d.ts b/types/react-relay/index.d.ts
index f87ce26356..acce5bf832 100644
--- a/types/react-relay/index.d.ts
+++ b/types/react-relay/index.d.ts
@@ -5,8 +5,13 @@
 //                 Eloy Durán <https://github.com/alloy>
 //                 Nicolas Pirotte <https://github.com/npirotte>
 //                 Cameron Knight <https://github.com/ckknight>
+//                 Kaare Hoff Skovgaard <https://github.com/kastermester>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.9
+
+// Prettified with:
+// $ prettier --parser typescript --tab-width 4 --semi --trailing-comma es5 --write --print-width 120 \
+//   types/{react-relay,relay-runtime}/{,*}/*.ts*
 
 export {
     commitLocalUpdate,
@@ -23,17 +28,26 @@ import * as RelayRuntimeTypes from "relay-runtime";
 // Utility types
 // ~~~~~~~~~~~~~~~~~~~~~
 
-// Taken from https://github.com/pelotom/type-zoo
-// tslint:disable-next-line:strict-export-declare-modifiers
-type Omit<T, K extends keyof T> = Pick<T, ({ [P in keyof T]: P } & { [P in K]: never } & { [x: string]: never, [x: number]: never })[keyof T]>;
+export interface _RefType<T> {
+    " $refType": T;
+}
+export interface _FragmentRefs<T> {
+    " $fragmentRefs": T;
+}
 
-export type RemoveRelayProp<P> = Omit<P & { relay: never }, "relay">;
+export type FragmentOrRegularProp<T> = T extends _RefType<infer U>
+    ? _FragmentRefs<U>
+    : T extends ReadonlyArray<_RefType<infer U>> ? ReadonlyArray<_FragmentRefs<U>> : T;
+
+export type MappedFragmentProps<T> = { [K in keyof T]: FragmentOrRegularProp<T[K]> };
+
+export type RemoveRelayProp<P> = Pick<P, Exclude<keyof P, "relay">>;
 
 export interface ComponentRef {
     componentRef?: (ref: any) => void;
 }
 
-export type RelayContainer<T> = React.ComponentType<RemoveRelayProp<T> & ComponentRef>;
+export type RelayContainer<P> = React.ComponentType<MappedFragmentProps<RemoveRelayProp<P>> & ComponentRef>;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // Maybe Fix
@@ -74,32 +88,36 @@ export const graphql: GraphqlInterface;
 // ~~~~~~~~~~~~~~~~~~~~~
 // ReactRelayQueryRenderer
 // ~~~~~~~~~~~~~~~~~~~~~
-export interface QueryRendererProps {
+
+export interface QueryRendererProps<T extends RelayRuntimeTypes.OperationBase = RelayRuntimeTypes.OperationDefaults> {
     cacheConfig?: RelayRuntimeTypes.CacheConfig;
     environment: RelayRuntimeTypes.Environment;
     query?: RelayRuntimeTypes.GraphQLTaggedNode | null;
-    render(readyState: ReadyState): React.ReactElement<any> | undefined | null;
-    variables: RelayRuntimeTypes.Variables;
+    render(readyState: ReadyState<T["response"]>): React.ReactElement<any> | undefined | null;
+    variables: T["variables"];
     rerunParamExperimental?: RelayRuntimeTypes.RerunParam;
 }
-export interface ReadyState {
+export interface ReadyState<T extends RelayRuntimeTypes.Variables = RelayRuntimeTypes.Variables> {
     error: Error | undefined | null;
-    props: { [propName: string]: any } | undefined | null;
+    props: T | undefined | null;
     retry?(): void;
 }
-export interface QueryRendererState {
-    readyState: ReadyState;
-}
-export class ReactRelayQueryRenderer extends React.Component<QueryRendererProps, QueryRendererState> {}
-export class QueryRenderer extends ReactRelayQueryRenderer {}
+
+export class ReactRelayQueryRenderer<T extends RelayRuntimeTypes.OperationBase> extends React.Component<
+    QueryRendererProps<T>
+> {}
+export class QueryRenderer<
+    T extends RelayRuntimeTypes.OperationBase = RelayRuntimeTypes.OperationDefaults
+> extends ReactRelayQueryRenderer<T> {}
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // createFragmentContainer
 // ~~~~~~~~~~~~~~~~~~~~~
-export function createFragmentContainer<T>(
-    Component: React.ComponentType<T>,
+
+export function createFragmentContainer<P>(
+    Component: React.ComponentType<P>,
     fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap
-): RelayContainer<T>;
+): RelayContainer<P>;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // createPaginationContainer
@@ -111,8 +129,8 @@ export interface PageInfo {
     startCursor: string | undefined | null;
 }
 export interface ConnectionData {
-    edges?: any[];
-    pageInfo?: PageInfo;
+    edges?: ReadonlyArray<any>;
+    pageInfo?: Partial<PageInfo>;
 }
 export type RelayPaginationProp = RelayProp & {
     hasMore(): boolean;
@@ -132,9 +150,9 @@ export function FragmentVariablesGetter(
     prevVars: RelayRuntimeTypes.Variables,
     totalCount: number
 ): RelayRuntimeTypes.Variables;
-export interface ConnectionConfig<T> {
+export interface ConnectionConfig<P> {
     direction?: "backward" | "forward";
-    getConnectionFromProps?(props: T): ConnectionData | undefined | null;
+    getConnectionFromProps?(props: P): ConnectionData | undefined | null;
     getFragmentVariables?: typeof FragmentVariablesGetter;
     getVariables(
         props: { [propName: string]: any },
@@ -143,11 +161,11 @@ export interface ConnectionConfig<T> {
     ): RelayRuntimeTypes.Variables;
     query: RelayRuntimeTypes.GraphQLTaggedNode;
 }
-export function createPaginationContainer<T>(
-    Component: React.ComponentType<T>,
+export function createPaginationContainer<P>(
+    Component: React.ComponentType<P>,
     fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
-    connectionConfig: ConnectionConfig<T>
-): RelayContainer<T>;
+    connectionConfig: ConnectionConfig<P>
+): RelayContainer<P>;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // createRefetchContainer
@@ -166,8 +184,8 @@ export type RelayRefetchProp = RelayProp & {
         options?: RefetchOptions
     ): RelayRuntimeTypes.Disposable;
 };
-export function createRefetchContainer<T>(
-    Component: React.ComponentType<T>,
+export function createRefetchContainer<P>(
+    Component: React.ComponentType<P>,
     fragmentSpec: RelayRuntimeTypes.GraphQLTaggedNode | GeneratedNodeMap,
     taggedNode: RelayRuntimeTypes.GraphQLTaggedNode
-): RelayContainer<T>;
+): RelayContainer<P>;
diff --git a/types/react-relay/test/react-relay-compat-tests.tsx b/types/react-relay/test/react-relay-compat-tests.tsx
index e0ee5d3be2..0b42151b6f 100644
--- a/types/react-relay/test/react-relay-compat-tests.tsx
+++ b/types/react-relay/test/react-relay-compat-tests.tsx
@@ -32,7 +32,7 @@ function markNotificationAsReadCompat(environment: CompatEnvironment, source: st
             if (field) {
                 field.setValue(data.story, "story");
             }
-        }
+        },
     });
 }
 
@@ -46,7 +46,7 @@ class CompatComponent extends React.Component<CompatProps> {
     }
 
     render() {
-        return (<div/>);
+        return <div />;
     }
 }
 
diff --git a/types/react-relay/test/react-relay-tests.tsx b/types/react-relay/test/react-relay-tests.tsx
index bf3e2d1475..f19d2a818c 100644
--- a/types/react-relay/test/react-relay-tests.tsx
+++ b/types/react-relay/test/react-relay-tests.tsx
@@ -1,3 +1,5 @@
+// tslint:disable:interface-over-type-literal
+
 import * as React from "react";
 import { Environment, Network, RecordSource, Store, ConnectionHandler, FragmentReference } from "relay-runtime";
 
@@ -11,7 +13,7 @@ import {
     QueryRenderer,
     RelayRefetchProp,
     RelayPaginationProp,
-    RelayProp
+    RelayProp,
 } from "react-relay";
 
 // ~~~~~~~~~~~~~~~~~~~~~
@@ -28,16 +30,33 @@ const modernEnvironment = new Environment({ network, store });
 // ~~~~~~~~~~~~~~~~~~~~~
 // Modern QueryRenderer
 // ~~~~~~~~~~~~~~~~~~~~~
-const MyQueryRenderer = (props: { name: string, show: boolean }) => (
-    <QueryRenderer
+
+// Artifact produced by relay-compiler-language-typescript
+type MyQueryRendererVariables = {
+    pageID: string;
+};
+type MyQueryRendererResponse = {
+    name: string;
+};
+type MyQueryRenderer = {
+    variables: MyQueryRendererVariables;
+    response: MyQueryRendererResponse;
+};
+
+const MyQueryRenderer = (props: { name: string; show: boolean }) => (
+    <QueryRenderer<MyQueryRenderer>
         environment={modernEnvironment}
-        query={props.show ? graphql`
-            query ExampleQuery($pageID: ID!) {
-                page(id: $pageID) {
-                    name
-                }
-            }
-        ` : null}
+        query={
+            props.show
+                ? graphql`
+                      query ExampleQuery($pageID: ID!) {
+                          page(id: $pageID) {
+                              name
+                          }
+                      }
+                  `
+                : null
+        }
         variables={{
             pageID: "110798995619330",
         }}
@@ -62,7 +81,7 @@ const MyEmptyQueryRenderer = () => (
             if (error) {
                 return <div>{error.message}</div>;
             } else if (props) {
-                throw new Error('This code path should never be hit');
+                throw new Error("This code path should never be hit");
             }
             return <div>Loading</div>;
         }}
@@ -76,10 +95,8 @@ const MyEmptyQueryRenderer = () => (
 type StoryLike = (storyID: string) => void;
 
 // Artifact produced by relay-compiler-language-typescript
-// tslint:disable-next-line:no-const-enum
-const enum _Story_story$ref {}
-type Story_story$ref = _Story_story$ref & FragmentReference;
-// tslint:disable-next-line:interface-over-type-literal
+declare const _Story_story$ref: unique symbol;
+type Story_story$ref = typeof _Story_story$ref;
 type Story_story = {
     readonly id: string;
     readonly text: string;
@@ -101,7 +118,7 @@ const Story = (() => {
 
     class Story extends React.Component<Props> {
         state = {
-            isLoading: false
+            isLoading: false,
         };
 
         componentDidMount() {
@@ -110,9 +127,14 @@ const Story = (() => {
 
         handleRefresh() {
             this.setState({ isLoading: true });
-            this.props.relay.refetch({ id: this.props.story.id }, {}, error => {
-                this.setState({ isLoading: false });
-            }, { force: true });
+            this.props.relay.refetch(
+                { id: this.props.story.id },
+                {},
+                error => {
+                    this.setState({ isLoading: false });
+                },
+                { force: true }
+            );
         }
 
         render() {
@@ -150,8 +172,7 @@ const Story = (() => {
     function doesNotRequireRelayPropToBeProvided() {
         const onLike = (id: string) => console.log(`Liked story #${id}`);
         const story: { " $fragmentRefs": Story_story$ref } = {} as any;
-        // TODO: Fix requirement to cast fragment reference as `any`.
-        <StoryRefetchContainer story={story as any} onLike={onLike} />;
+        <StoryRefetchContainer story={story} onLike={onLike} />;
     }
 
     return StoryRefetchContainer;
@@ -162,19 +183,24 @@ const Story = (() => {
 // ~~~~~~~~~~~~~~~~~~~~~
 
 // Artifact produced by relay-compiler-language-typescript
-// tslint:disable-next-line:no-const-enum
-const enum _FeedStories_feed$ref {}
-type FeedStories_feed$ref = _FeedStories_feed$ref & FragmentReference;
-// tslint:disable-next-line:interface-over-type-literal
+declare const _FeedStories_feed$ref: unique symbol;
+type FeedStories_feed$ref = typeof _FeedStories_feed$ref;
+declare const _FeedStory_edges$ref: unique symbol;
+type FeedStory_edges$ref = typeof _FeedStory_edges$ref;
 type FeedStories_feed = {
     readonly edges: ReadonlyArray<{
         readonly node: {
             readonly id: string;
-            readonly " $fragmentRefs": Story_story$ref;
+            readonly " $fragmentRefs": Story_story$ref & FeedStories_feed$ref;
         };
+        readonly " $fragmentRefs": FeedStory_edges$ref;
     }>;
     readonly " $refType": FeedStories_feed$ref;
 };
+type FeedStory_edges = ReadonlyArray<{
+    readonly publishedAt: string;
+    readonly " $refType": FeedStory_edges$ref;
+}>;
 
 const Feed = (() => {
     interface Props {
@@ -184,38 +210,51 @@ const Feed = (() => {
         ignoreMe?: {};
     }
 
+    const FeedStoryEdges: React.SFC<{ edges: FeedStory_edges }> = ({ edges }) => (
+        <div>{edges.map(({ publishedAt }) => publishedAt).join(", ")}</div>
+    );
+
+    const FeedStoryEdgesFragmentContainer = createFragmentContainer(FeedStoryEdges, {
+        edges: graphql`
+            fragment FeedStory_edges on FeedStoryEdge @relay(plural: true) {
+                publishedAt
+            }
+        `,
+    });
+
     const FeedStories: React.SFC<Props> = ({ feed, onStoryLike, relay }) => {
         // TODO: Getting env here for no good reason other than needing to test it works.
         //       If you have a good relavant example, please update!
         relay.environment;
         const stories = feed.edges.map(edge => {
-            // TODO: Fix requirement to cast fragment reference as `any`.
-            return <Story story={edge.node as any} key={edge.node.id} onLike={onStoryLike} />;
+            return <Story story={edge.node} key={edge.node.id} onLike={onStoryLike} />;
         });
-        return <div>{stories}</div>;
+        return (
+            <div>
+                {stories}
+                <span>{<FeedStoryEdgesFragmentContainer edges={feed.edges} />}</span>
+            </div>
+        );
     };
 
-    const FeedFragmentContainer = createFragmentContainer(
-        FeedStories,
-        {
-            feed: graphql`
-                fragment FeedStories_feed on Feed {
-                    edges {
-                        node {
-                            id
-                            ...Story_story
-                        }
+    const FeedFragmentContainer = createFragmentContainer(FeedStories, {
+        feed: graphql`
+            fragment FeedStories_feed on Feed {
+                edges {
+                    node {
+                        id
+                        ...Story_story
                     }
+                    ...FeedStoryEdges_feed
                 }
-            `,
-        }
-    );
+            }
+        `,
+    });
 
     function doesNotRequireRelayPropToBeProvided() {
         const onStoryLike = (id: string) => console.log(`Liked story #${id}`);
         const feed: { " $fragmentRefs": FeedStories_feed$ref } = {} as any;
-        // TODO: Fix requirement to cast fragment reference as `any`.
-        <FeedFragmentContainer feed={feed as any} onStoryLike={onStoryLike} />;
+        <FeedFragmentContainer feed={feed} onStoryLike={onStoryLike} />;
     }
 
     return FeedFragmentContainer;
@@ -226,10 +265,8 @@ const Feed = (() => {
 // ~~~~~~~~~~~~~~~~~~~~~
 
 // Artifact produced by relay-compiler-language-typescript
-// tslint:disable-next-line:no-const-enum
-const enum _UserFeed_user$ref {}
-type UserFeed_user$ref = _UserFeed_user$ref & FragmentReference;
-// tslint:disable-next-line:interface-over-type-literal
+declare const _UserFeed_user$ref: unique symbol;
+type UserFeed_user$ref = typeof _UserFeed_user$ref;
 type UserFeed_user = {
     readonly feed: {
         readonly pageInfo: {
@@ -252,11 +289,9 @@ type UserFeed_user = {
     class UserFeed extends React.Component<Props> {
         render() {
             const onStoryLike = (id: string) => console.log(`Liked story #${id}`);
-            // TODO: Fix requirement to cast fragment reference as `any`.
-            const feed = this.props.user.feed as any;
             return (
                 <div>
-                    <Feed feed={feed} onStoryLike={onStoryLike} />
+                    <Feed feed={this.props.user.feed} onStoryLike={onStoryLike} />
                     <button onClick={() => this._loadMore()} title={this.props.loadMoreTitle} />
                 </div>
             );
@@ -298,8 +333,7 @@ type UserFeed_user = {
         {
             direction: "forward",
             getConnectionFromProps(props) {
-                // TODO: Fix requirement to have `edges` and both `pageInfo` details for forward and backward pagination
-                return props.user && props.user.feed as any;
+                return props.user && props.user.feed;
             },
             getFragmentVariables(prevVars, totalCount) {
                 return {
@@ -329,8 +363,7 @@ type UserFeed_user = {
 
     function doesNotRequireRelayPropToBeProvided() {
         const user: { " $fragmentRefs": UserFeed_user$ref } = {} as any;
-        // TODO: Fix requirement to cast fragment reference as `any`.
-        <UserFeedPaginationContainer loadMoreTitle="Load More" user={user as any} />;
+        <UserFeedPaginationContainer loadMoreTitle="Load More" user={user} />;
     }
 };
 
@@ -350,7 +383,7 @@ export const mutation = graphql`
 export const optimisticResponse = {
     markReadNotification: {
         notification: {
-            seenState: "SEEN",
+            seenState: "SEEN" as "SEEN",
         },
     },
 };
@@ -386,28 +419,49 @@ export const configs = [
 ];
 
 function markNotificationAsRead(source: string, storyID: string) {
-    const variables = {
-        input: {
-            source,
-            storyID,
-        },
+    // Artifact produced by relay-compiler-language-typescript
+    type MyMutationVariables = {
+        readonly input: {
+            readonly source: string;
+            readonly storyID: string;
+        };
+    };
+    type MyMutationResponse = {
+        readonly markReadNotification: {
+            readonly notification: {
+                readonly seenState: "SEEN" | "UNSEEN";
+            };
+        };
+    };
+    type MyMutation = {
+        readonly variables: MyMutationVariables;
+        readonly response: MyMutationResponse;
     };
 
-    commitMutation(modernEnvironment, {
+    commitMutation<MyMutation>(modernEnvironment, {
         configs,
         mutation,
         optimisticResponse,
-        variables,
+        variables: {
+            input: {
+                source,
+                storyID,
+            },
+        },
         onCompleted: (response, errors) => {
-            console.log("Response received from server.");
+            if (errors) {
+                console.log(`Errors received from server: ${errors.map(error => error.message).join(", ")}`);
+            } else {
+                console.log(`Response received from server: ${response.markReadNotification.notification.seenState}`);
+            }
         },
         onError: err => console.error(err),
         updater: (store, data) => {
-            const field = store.get(storyID);
-            if (field) {
-                field.setValue(data.story, "story");
+            const story = store.get(storyID);
+            if (story) {
+                story.setValue(data.markReadNotification.notification.seenState, "seenState");
             }
-        }
+        },
     });
 }
 
diff --git a/types/react-request/index.d.ts b/types/react-request/index.d.ts
new file mode 100644
index 0000000000..0806dda260
--- /dev/null
+++ b/types/react-request/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for react-request 3.1
+// Project: https://github.com/jamesplease/react-request
+// Definitions by: Danny Cochran <https://github.com/dannycochran>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+import * as React from 'react';
+
+export interface RenderProps<T> {
+  requestName: string;
+  requestKey: string;
+  fetching: boolean;
+  failed: boolean;
+  error: Error | null;
+  response: Response | null;
+  url: string;
+  data: T | null;
+}
+
+export interface FetchRequestProps extends RequestInit {
+  lazy?: boolean;
+  url: string;
+}
+
+export interface FetchProps<T = any> extends FetchRequestProps {
+  children?: (renderProps: RenderProps<T>) => React.ReactNode;
+}
+
+// TODO(dannycochran) RequestKeyOptions, ProxyRequest, fetchDedupe, getRequestKey, isRequestInFlight, clearRequestCache
+// should all be defined in an adjacent typings directory for fetch-dedupe.
+export interface RequestKeyOptions {
+  url?: string;
+  method?: string;
+  responseType?: string;
+  body?: string;
+}
+
+export interface ProxyRequest {
+  requestKey: string;
+  res: Response;
+}
+
+// TODO(dannycochran) Fill out fetchDedupe options.
+export function fetchDedupe(input: any, init?: any, dedupeOptions?: any): Promise<ProxyRequest>;
+export function getRequestKey(keyOptions?: RequestKeyOptions): string;
+export function isRequestInFlight(): boolean;
+export function clearRequestCache(): void;
+export function clearResponseCache(): void;
+
+export class Fetch<T = any> extends React.Component<FetchProps<T>> { }
diff --git a/types/react-request/react-request-tests.tsx b/types/react-request/react-request-tests.tsx
new file mode 100644
index 0000000000..6a4ff71212
--- /dev/null
+++ b/types/react-request/react-request-tests.tsx
@@ -0,0 +1,22 @@
+import * as React from "react";
+import { Fetch } from "react-request";
+
+interface ServerResponse {
+  foo: string;
+}
+
+export default class BasicReactRequest extends React.Component {
+  render() {
+    return <Fetch<ServerResponse> url='/api/server'>
+      {({ fetching, failed, data, response }) => {
+        if (fetching || !response) {
+          return <p>Loading...</p>;
+        }
+        if (failed) {
+          return <h2>Failed to load</h2>;
+        }
+        return <p>{data ? data.foo : 'data was null'}</p>;
+      }}
+    </Fetch>;
+  }
+}
diff --git a/types/react-request/tsconfig.json b/types/react-request/tsconfig.json
new file mode 100644
index 0000000000..678d836842
--- /dev/null
+++ b/types/react-request/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-request-tests.tsx"
+  ]
+}
\ No newline at end of file
diff --git a/types/react-request/tslint.json b/types/react-request/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-request/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-resize-detector/index.d.ts b/types/react-resize-detector/index.d.ts
old mode 100644
new mode 100755
index 5277109c2e..68f0382dba
--- a/types/react-resize-detector/index.d.ts
+++ b/types/react-resize-detector/index.d.ts
@@ -1,14 +1,16 @@
-// Type definitions for react-resize-detector 2.2
+// Type definitions for react-resize-detector 3.1
 // Project: https://github.com/maslianok/react-resize-detector
-// Definitions by: Matthew James <https://github.com/matthew-matvei>, James Greenleaf <https://github.com/aMoniker>
+// Definitions by: Matthew James <https://github.com/matthew-matvei>
+//                 James Greenleaf <https://github.com/aMoniker>
+//                 Remin <https://github.com/rdrgn>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
 interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
     /** Function that will be invoked with width and height arguments */
-    onResize: (width: number, height: number) => void;
+    onResize?: (width: number, height: number) => void;
     /** Trigger onResize on height change. Default: false */
     handleHeight?: boolean;
     /** Trigger onResize on width change. Default: false */
@@ -18,11 +20,18 @@ interface ReactResizeDetectorProps extends React.Props<ReactResizeDetector> {
     /** Id of the element we want to observe. If none provided, parentElement of the component will be used. Default: "" */
     resizableElementId?: string;
     /** Possible values: throttle and debounce */
-    refreshMode?: 'throttle' | 'debounce';
+    refreshMode?: "throttle" | "debounce";
     /** Makes sense only when refreshMode is set. Default: 1000. */
     refreshRate?: number;
+
+    render?: (props: any) => React.ReactNode;
 }
 
 declare class ReactResizeDetector extends React.PureComponent<ReactResizeDetectorProps> { }
 
+export declare function withResizeDetector(
+    WrappedComponent: React.ReactNode,
+    props?: ReactResizeDetectorProps
+): React.Component;
+
 export default ReactResizeDetector;
diff --git a/types/react-resize-detector/react-resize-detector-tests.tsx b/types/react-resize-detector/react-resize-detector-tests.tsx
old mode 100644
new mode 100755
index 42a76d8a52..d6e471f340
--- a/types/react-resize-detector/react-resize-detector-tests.tsx
+++ b/types/react-resize-detector/react-resize-detector-tests.tsx
@@ -2,8 +2,11 @@
 
 import * as React from "react";
 import * as ReactDOM from "react-dom";
+import ReactResizeDetector, { withResizeDetector } from "react-resize-detector";
 
-import ReactResizeRouter from "react-resize-detector";
+const CustomComponent = ({ width, height }: any) => (
+    <div>{`${width}x${height}`}</div>
+);
 
 class App extends React.PureComponent {
     constructor(props: {}) {
@@ -13,17 +16,38 @@ class App extends React.PureComponent {
     }
 
     render(): JSX.Element {
-        return <div>
-            <div>Some child content</div>
-            <ReactResizeRouter
-                onResize={this.handleResize}
-                handleWidth
-                handleHeight
-                skipOnMount
-                resizableElementId="someElement"
-                refreshMode="throttle"
-                refreshRate={10} />
-        </div>;
+        return (
+            <div>
+                <div>Some child content</div>
+                <ReactResizeDetector
+                    onResize={this.handleResize}
+                    handleWidth
+                    handleHeight
+                    skipOnMount
+                    resizableElementId="someElement"
+                    refreshMode="throttle"
+                    refreshRate={10}
+                />
+                <ReactResizeDetector handleWidth handleHeight>
+                    {(width: number, height: number) => (
+                        <div>{`${width}x${height}`}</div>
+                    )}
+                </ReactResizeDetector>
+                <ReactResizeDetector handleWidth handleHeight>
+                    <CustomComponent />
+                </ReactResizeDetector>
+                {withResizeDetector(CustomComponent)}
+                <ReactResizeDetector
+                    handleWidth
+                    handleHeight
+                    render={({ width, height }) => (
+                        <div>
+                            Width:{width}, Height:{height}
+                        </div>
+                    )}
+                />
+            </div>
+        );
     }
 
     private handleResize(width: number, height: number) {
diff --git a/types/react-resolver/index.d.ts b/types/react-resolver/index.d.ts
index c871426401..f8e0807fab 100644
--- a/types/react-resolver/index.d.ts
+++ b/types/react-resolver/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/ericclemmons/react-resolver
 // Definitions by: forabi <https://github.com/forabi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ComponentType, StatelessComponent, Factory } from 'react';
 
diff --git a/types/react-responsive/index.d.ts b/types/react-responsive/index.d.ts
index ad042a34c5..0fa9978c8f 100644
--- a/types/react-responsive/index.d.ts
+++ b/types/react-responsive/index.d.ts
@@ -4,7 +4,7 @@
 //                 Alec Hill <https://github.com/alechill>
 //                 Javier Gonzalez <https://github.com/xaviergonz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-responsive/v1/index.d.ts b/types/react-responsive/v1/index.d.ts
index f9c3bfcf83..789278508a 100644
--- a/types/react-responsive/v1/index.d.ts
+++ b/types/react-responsive/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/contra/react-responsive
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-rnd/index.d.ts b/types/react-rnd/index.d.ts
index 31d477ca5e..ef7fb89674 100644
--- a/types/react-rnd/index.d.ts
+++ b/types/react-rnd/index.d.ts
@@ -3,118 +3,119 @@
 // Definitions by: Ragg <https://github.com/Ragg->
 //                 fsubal <https://github.com/fsubal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-import React = require('react');
+// TypeScript Version: 2.8
+import * as React from "react";
 
 type CSSProperties = React.CSSProperties;
 
-declare namespace Rnd {
-    type Direction =
-        | 'bottom'
-        | 'bottomLeft'
-        | 'bottomRight'
-        | 'left'
-        | 'right'
-        | 'top'
-        | 'topLeft'
-        | 'topRight';
+export type Direction =
+  | "bottom"
+  | "bottomLeft"
+  | "bottomRight"
+  | "left"
+  | "right"
+  | "top"
+  | "topLeft"
+  | "topRight";
 
-    interface Enable {
-        bottom?: boolean;
-        bottomLeft?: boolean;
-        bottomRight?: boolean;
-        left?: boolean;
-        right?: boolean;
-        top?: boolean;
-        topLeft?: boolean;
-        topRight?: boolean;
-    }
-
-    interface HandleClasses {
-        bottom?: string;
-        bottomLeft?: string;
-        bottomRight?: string;
-        left?: string;
-        right?: string;
-        top?: string;
-        topLeft?: string;
-        topRight?: string;
-    }
-
-    interface HandleStyles {
-        bottom?: CSSProperties;
-        bottomLeft?: CSSProperties;
-        bottomRight?: CSSProperties;
-        left?: CSSProperties;
-        right?: CSSProperties;
-        top?: CSSProperties;
-        topLeft?: CSSProperties;
-        topRight?: CSSProperties;
-    }
-
-    interface Position {
-        x: number;
-        y: number;
-    }
-
-    interface Size {
-        width: number;
-        height: number;
-    }
-
-    interface DraggableData {
-        node: HTMLElement;
-        x: number;
-        y: number;
-        deltaX: number;
-        deltaY: number;
-        lastX: number;
-        lastY: number;
-    }
-
-    type DraggableEventHandler = (e: MouseEvent | TouchEvent, data: DraggableData) => void|false;
-
-    type ResizeHandler = (
-        e: MouseEvent|TouchEvent,
-        direction: Direction,
-        ref: HTMLDivElement,
-        delta: Size,
-        position: Position
-    ) => void;
-
-    interface Options {
-        default: {
-            x?: number;
-            y?: number;
-            width?: number|string;
-            height?: number|string;
-        };
-        className: string;
-        style: any;
-        width: number|string;
-        height: number|string;
-        minWidth: number|string;
-        minHeight: number|string;
-        maxWidth: number|string;
-        maxHeight: number|string;
-        z: number;
-        resizeHandleClasses: HandleClasses;
-        resizeHandleStyles: HandleStyles;
-
-        lockAspectRatio: boolean;
-        enableResizing?: Enable;
-        disableDragging?: boolean;
-
-        onResizeStart: () => void;
-        onResize: () => void;
-        onResizeStop: ResizeHandler;
-
-        onDragStart: DraggableEventHandler;
-        onDrag: DraggableEventHandler;
-        onDragStop: DraggableEventHandler;
-    }
+export interface Enable {
+  bottom?: boolean;
+  bottomLeft?: boolean;
+  bottomRight?: boolean;
+  left?: boolean;
+  right?: boolean;
+  top?: boolean;
+  topLeft?: boolean;
+  topRight?: boolean;
 }
 
-declare class Rnd extends React.Component<Partial<Rnd.Options>> {}
+export interface HandleClasses {
+  bottom?: string;
+  bottomLeft?: string;
+  bottomRight?: string;
+  left?: string;
+  right?: string;
+  top?: string;
+  topLeft?: string;
+  topRight?: string;
+}
 
-export = Rnd;
+export interface HandleStyles {
+  bottom?: CSSProperties;
+  bottomLeft?: CSSProperties;
+  bottomRight?: CSSProperties;
+  left?: CSSProperties;
+  right?: CSSProperties;
+  top?: CSSProperties;
+  topLeft?: CSSProperties;
+  topRight?: CSSProperties;
+}
+
+export interface Position {
+  x: number;
+  y: number;
+}
+
+export interface Size {
+  width: number;
+  height: number;
+}
+
+export interface DraggableData {
+  node: HTMLElement;
+  x: number;
+  y: number;
+  deltaX: number;
+  deltaY: number;
+  lastX: number;
+  lastY: number;
+}
+
+export type DraggableEventHandler = (
+  e: MouseEvent | TouchEvent,
+  data: DraggableData
+) => void | false;
+
+export type ResizeHandler = (
+  e: MouseEvent | TouchEvent,
+  direction: Direction,
+  ref: HTMLDivElement,
+  delta: Size,
+  position: Position
+) => void;
+
+export interface Options {
+  default: {
+    x?: number;
+    y?: number;
+    width?: number | string;
+    height?: number | string;
+  };
+  className: string;
+  style: any;
+  width: number | string;
+  height: number | string;
+  minWidth: number | string;
+  minHeight: number | string;
+  maxWidth: number | string;
+  maxHeight: number | string;
+  z: number;
+  resizeHandleClasses: HandleClasses;
+  resizeHandleStyles: HandleStyles;
+
+  lockAspectRatio: boolean;
+  enableResizing?: Enable;
+  disableDragging?: boolean;
+
+  onResizeStart: () => void;
+  onResize: () => void;
+  onResizeStop: ResizeHandler;
+
+  onDragStart: DraggableEventHandler;
+  onDrag: DraggableEventHandler;
+  onDragStop: DraggableEventHandler;
+}
+
+declare class Rnd extends React.Component<Partial<Options>> {}
+
+export default Rnd;
diff --git a/types/react-rnd/react-rnd-tests.tsx b/types/react-rnd/react-rnd-tests.tsx
index 9f1cbc593c..461a0d03ba 100644
--- a/types/react-rnd/react-rnd-tests.tsx
+++ b/types/react-rnd/react-rnd-tests.tsx
@@ -1,7 +1,7 @@
-import React = require('react');
-import Rnd = require('react-rnd');
+import * as React from 'react';
+import { default as Rnd, ResizeHandler } from "react-rnd";
 
-const onResize: Rnd.ResizeHandler = (e, direction, ref, delta, position) => {
+const onResize: ResizeHandler = (e, direction, ref, delta, position) => {
     direction === 'right';
     delta.width;
     delta.height;
diff --git a/types/react-router-config/index.d.ts b/types/react-router-config/index.d.ts
index 132b5cc129..d69d42b062 100644
--- a/types/react-router-config/index.d.ts
+++ b/types/react-router-config/index.d.ts
@@ -5,7 +5,7 @@
 // TypeScript Version: 2.8
 
 import * as React from "react";
-import { RouteComponentProps, match } from "react-router";
+import { RouteComponentProps, SwitchProps, match } from "react-router";
 import { Location } from "history";
 
 export interface RouteConfigComponentProps<T> extends RouteComponentProps<T> {
@@ -28,4 +28,8 @@ export interface MatchedRoute<T> {
 
 export function matchRoutes<T>(routes: RouteConfig[], pathname: string): Array<MatchedRoute<T>>;
 
-export function renderRoutes(routes: RouteConfig[] | undefined, extraProps?: any): JSX.Element;
+export function renderRoutes(
+    routes: RouteConfig[] | undefined,
+    extraProps?: any,
+    switchProps?: SwitchProps,
+): JSX.Element;
diff --git a/types/react-router-config/react-router-config-tests.tsx b/types/react-router-config/react-router-config-tests.tsx
index d1d28f93c0..315de6d7f9 100644
--- a/types/react-router-config/react-router-config-tests.tsx
+++ b/types/react-router-config/react-router-config-tests.tsx
@@ -20,7 +20,7 @@ const Child = ({ route }: RouteConfigComponentProps<void>) => (
     <div>
         <h2>Child</h2>
         {/* child routes won't render without this */}
-        {renderRoutes(route && route.routes)}
+        {route && renderRoutes(route.routes, null, {})}
     </div>
 );
 
diff --git a/types/react-router-dom/index.d.ts b/types/react-router-dom/index.d.ts
index 9870a487b3..e71192e0b2 100644
--- a/types/react-router-dom/index.d.ts
+++ b/types/react-router-dom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React Router 4.2
+// Type definitions for React Router 4.3
 // Project: https://github.com/ReactTraining/react-router
 // Definitions by: Tanguy Krotoff <https://github.com/tkrotoff>
 //                 Huy Nguyen <https://github.com/huy-nguyen>
@@ -11,6 +11,7 @@ import * as React from 'react';
 import * as H from 'history';
 
 export {
+    generatePath,
     Prompt,
     MemoryRouter,
     RedirectProps,
diff --git a/types/react-router-hash-link/index.d.ts b/types/react-router-hash-link/index.d.ts
new file mode 100644
index 0000000000..9480f1aef0
--- /dev/null
+++ b/types/react-router-hash-link/index.d.ts
@@ -0,0 +1,19 @@
+// Type definitions for react-router-hash-link 1.2
+// Project: https://github.com/rafrex/react-router-hash-link (Does not have to be to GitHub, but prefer linking to a source code repository rather than to a project website.)
+// Definitions by: Sam Baeck <https://github.com/zoompie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+import { LinkProps, NavLinkProps } from 'react-router-dom';
+
+export interface HashLinkProps extends LinkProps {
+  smooth?: boolean;
+  scroll?: (element: HTMLElement) => void;
+}
+
+export class HashLink extends React.Component<HashLinkProps, any> {}
+
+export interface NavHashLinkProps extends NavLinkProps, HashLinkProps {}
+
+export class NavHashLink extends React.Component<NavHashLinkProps, any> {}
diff --git a/types/react-router-hash-link/react-router-hash-link-tests.tsx b/types/react-router-hash-link/react-router-hash-link-tests.tsx
new file mode 100644
index 0000000000..4c64a1b5c3
--- /dev/null
+++ b/types/react-router-hash-link/react-router-hash-link-tests.tsx
@@ -0,0 +1,24 @@
+import * as H from 'history';
+import * as React from 'react';
+import { match } from 'react-router';
+import { HashLink, NavHashLink, NavHashLinkProps } from 'react-router-hash-link';
+
+interface Props extends NavHashLinkProps {
+  extraProp: string;
+}
+
+const getIsActive = (extraProp: string) => (match: match<any>, location: H.Location) => !!extraProp;
+
+export default function(props: Props) {
+  const {extraProp, ...rest} = props;
+  const isActive = getIsActive(extraProp);
+  return (
+    <NavHashLink {...rest} isActive={isActive} />
+  );
+}
+
+<HashLink to="url" />;
+
+const acceptRef = (node: HTMLAnchorElement | null) => {
+};
+<HashLink to="/url" replace={true} innerRef={acceptRef} />;
diff --git a/types/react-router-hash-link/tsconfig.json b/types/react-router-hash-link/tsconfig.json
new file mode 100644
index 0000000000..fc830ac41d
--- /dev/null
+++ b/types/react-router-hash-link/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-router-hash-link-tests.tsx"
+    ]
+}
diff --git a/types/react-router-hash-link/tslint.json b/types/react-router-hash-link/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-router-hash-link/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-router/index.d.ts b/types/react-router/index.d.ts
index 5ae92ababc..6814ecf19f 100644
--- a/types/react-router/index.d.ts
+++ b/types/react-router/index.d.ts
@@ -17,6 +17,7 @@
 //                 Youen Toupin <https://github.com/neuoy>
 //                 Rahul Raina <https://github.com/rraina>
 //                 Maksim Sharipov <https://github.com/pret-a-porter>
+//                 Duong Tran <https://github.com/t49tran>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.8
 
@@ -63,11 +64,11 @@ export interface StaticContext {
   statusCode?: number;
 }
 
-export interface RouteComponentProps<P, C extends StaticContext = StaticContext> {
+export interface RouteComponentProps<P, C extends StaticContext = StaticContext, S = H.LocationState> {
   history: H.History;
-  location: H.Location;
+  location: H.Location<S>;
   match: match<P>;
-  staticContext: C | undefined;
+  staticContext?: C;
 }
 
 export interface RouteProps {
@@ -77,6 +78,7 @@ export interface RouteProps {
   children?: ((props: RouteComponentProps<any>) => React.ReactNode) | React.ReactNode;
   path?: string;
   exact?: boolean;
+  sensitive?: boolean;
   strict?: boolean;
 }
 export class Route<T extends RouteProps = RouteProps> extends React.Component<T, any> { }
@@ -86,10 +88,15 @@ export interface RouterProps {
 }
 export class Router extends React.Component<RouterProps, any> { }
 
+export interface StaticRouterContext {
+  url?: string;
+  action?: 'PUSH' | 'REPLACE';
+  location?: object;
+}
 export interface StaticRouterProps {
   basename?: string;
   location?: string | object;
-  context?: object;
+  context?: StaticRouterContext;
 }
 
 export class StaticRouter extends React.Component<StaticRouterProps, any> { }
@@ -109,7 +116,9 @@ export interface match<P> {
 // Omit taken from https://www.typescriptlang.org/docs/handbook/release-notes/typescript-2-8.html
 export type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
 
-export function matchPath<P>(pathname: string, props: RouteProps): match<P> | null;
+export function matchPath<P>(pathname: string, props: RouteProps, parent?: match<P> | null): match<P> | null;
+
+export function generatePath(pattern: string, params?: { [paramName: string]: string | number | boolean }): string;
 
 // 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,
diff --git a/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx b/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
index c9763bdda5..3dce9a5def 100644
--- a/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
+++ b/types/react-router/test/examples-from-react-router-website/StaticRouter.tsx
@@ -1,7 +1,8 @@
 import * as React from 'react';
 import { StaticRouter, Route } from 'react-router-dom';
+import { StaticRouterContext } from 'react-router';
 
-interface StaticContext {
+interface StaticContext extends StaticRouterContext {
     statusCode?: number;
 }
 
diff --git a/types/react-router/v2/index.d.ts b/types/react-router/v2/index.d.ts
index 68f9c3f38f..3f24c22c2c 100644
--- a/types/react-router/v2/index.d.ts
+++ b/types/react-router/v2/index.d.ts
@@ -7,7 +7,7 @@
 //                 Alex Wendland <https://github.com/awendland>
 //                 Kostya Esmukov <https://github.com/KostyaEsmukov>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export as namespace ReactRouter;
 
diff --git a/types/react-router/v3/index.d.ts b/types/react-router/v3/index.d.ts
index 9ca93b3a9b..ee4e01ba40 100644
--- a/types/react-router/v3/index.d.ts
+++ b/types/react-router/v3/index.d.ts
@@ -11,7 +11,7 @@
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Ross Allen <https://github.com/ssorallen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export {
     ChangeHook,
diff --git a/types/react-s-alert/index.d.ts b/types/react-s-alert/index.d.ts
index bd014abd0a..d55aae1105 100644
--- a/types/react-s-alert/index.d.ts
+++ b/types/react-s-alert/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/juliancwirko/react-s-alert
 // Definitions by: mitsuruog <https://github.com/mitsuruog>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-scroll/index.d.ts b/types/react-scroll/index.d.ts
index f04e6d86ff..bc22a9f445 100644
--- a/types/react-scroll/index.d.ts
+++ b/types/react-scroll/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ioannis Kokkinidis <https://github.com/sudoplz>
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as ReactScroll from "./modules/index";
 export = ReactScroll;
diff --git a/types/react-scrollbar/index.d.ts b/types/react-scrollbar/index.d.ts
index f551d83ebd..ef99d8ab94 100644
--- a/types/react-scrollbar/index.d.ts
+++ b/types/react-scrollbar/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souhe/reactScrollbar
 // Definitions by: Stephen Jelfs <https://github.com/stephenjelfs>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-select/index.d.ts b/types/react-select/index.d.ts
index 6d8bc6d8c7..9c4728254c 100644
--- a/types/react-select/index.d.ts
+++ b/types/react-select/index.d.ts
@@ -1,624 +1,21 @@
-// Type definitions for react-select 1.2
-// Project: https://github.com/JedWatson/react-select
-// Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet>
-//                 Gilad Gray <https://github.com/giladgray>
-//                 Izaak Baker <https://github.com/iebaker>
-//                 Tadas Dailyda <https://github.com/skirsdeda>
-//                 Mark Vujevits <https://github.com/vujevits>
-//                 Mike Deverell <https://github.com/devrelm>
-//                 MartynasZilinskas <https://github.com/MartynasZilinskas>
-//                 Onat Yigit Mercan <https://github.com/onatm>
-//                 Ian Johnson <https://github.com/ninjaferret>
-//                 Anton Novik <https://github.com/tehbi4>
-//                 David Schkalee <https://github.com/misantronic>
-//                 Arthur Udalov <https://github.com/darkartur>
+// Type definitions for react-select 2.0
+// Project: https://github.com/JedWatson/react-select#readme
+// Definitions by: Claas Ahlrichs <https://github.com/claasahl>
+//                 Jon Freedman <https://github.com/jonfreedman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.9
 
-import * as React from 'react';
+import SelectBase from './lib/Select';
+import { StateManager } from './lib/stateManager';
 
-export default class ReactSelectClass<TValue = OptionValues> extends React.Component<ReactSelectProps<TValue>> {
-    focus(): void;
-    setValue(value: Option<TValue>): void;
-}
-// Other components
-export class Creatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue>> { }
-export class Async<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>> { }
-export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncCreatableSelectProps<TValue>> { }
+export default SelectBase;
+// export default StateManager;
 
-export type OptionComponentType<TValue = OptionValues> = React.ComponentType<OptionComponentProps<TValue>>;
-
-export type HandlerRendererResult = JSX.Element | null | false;
-
-// Handlers
-export type FocusOptionHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
-export type SelectValueHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
-export type ArrowRendererHandler = (props: ArrowRendererProps) => HandlerRendererResult;
-export type ClearRendererHandler = () => HandlerRendererResult;
-export type FilterOptionHandler<TValue = OptionValues> = (option: Option<TValue>, filter: string) => boolean;
-export type FilterOptionsHandler<TValue = OptionValues> = (options: Options<TValue>, filter: string, currentValues: Options<TValue>) => Options<TValue>;
-export type InputRendererHandler = (props: { [key: string]: any }) => HandlerRendererResult;
-export type MenuRendererHandler<TValue = OptionValues> = (props: MenuRendererProps<TValue>) => HandlerRendererResult;
-export type OnCloseHandler = () => void;
-export type OnInputChangeHandler = (inputValue: string) => string;
-export type OnInputKeyDownHandler = React.KeyboardEventHandler<HTMLDivElement | HTMLInputElement>;
-export type OnMenuScrollToBottomHandler = () => void;
-export type OnOpenHandler = () => void;
-export type OnFocusHandler = React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
-export type OnBlurHandler = React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
-export type OptionRendererHandler<TValue = OptionValues> = (option: Option<TValue>) => HandlerRendererResult;
-export type ValueRendererHandler<TValue = OptionValues> = (option: Option<TValue>) => HandlerRendererResult;
-export type OnValueClickHandler<TValue = OptionValues> = (option: Option<TValue>, event: React.MouseEvent<HTMLAnchorElement>) => void;
-export type IsOptionUniqueHandler<TValue = OptionValues> = (arg: { option: Option<TValue>, options: Options<TValue>, labelKey: string, valueKey: string }) => boolean;
-export type IsValidNewOptionHandler = (arg: { label: string }) => boolean;
-export type NewOptionCreatorHandler<TValue = OptionValues> = (arg: { label: string, labelKey: string, valueKey: string }) => Option<TValue>;
-export type PromptTextCreatorHandler = (filterText: string) => string;
-export type ShouldKeyDownEventCreateNewOptionHandler = (arg: { keyCode: number }) => boolean;
-
-export type OnChangeSingleHandler<TValue = OptionValues> = OnChangeHandler<TValue, Option<TValue>>;
-export type OnChangeMultipleHandler<TValue = OptionValues> = OnChangeHandler<TValue, Options<TValue>>;
-export type OnChangeHandler<TValue = OptionValues, TOption = Option<TValue> | Options<TValue>> = (newValue: TOption | null) => void;
-export type OnNewOptionClickHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
-
-export type LoadOptionsHandler<TValue = OptionValues> = LoadOptionsAsyncHandler<TValue> | LoadOptionsLegacyHandler<TValue>;
-export type LoadOptionsAsyncHandler<TValue = OptionValues> = (input: string) => Promise<AutocompleteResult<TValue>>;
-export type LoadOptionsLegacyHandler<TValue = OptionValues> = (input: string, callback: (err: any, result: AutocompleteResult<TValue>) => void) => void;
-
-export interface AutocompleteResult<TValue = OptionValues> {
-    /** The search-results to be displayed  */
-    options: Options<TValue>;
-    /**
-     * Should be set to true, if and only if a longer query with the same prefix
-     * would return a subset of the results
-     * If set to true, more specific queries will not be sent to the server.
-     */
-    complete: boolean;
-}
-
-export type Options<TValue = OptionValues> = Array<Option<TValue>>;
-
-export interface Option<TValue = OptionValues> {
-    /** Text for rendering */
-    label?: string;
-    /** Value for searching */
-    value?: TValue;
-    /**
-     * Allow this option to be cleared
-     * @default true
-     */
-    clearableValue?: boolean;
-    /**
-     * Do not allow this option to be selected
-     * @default false
-     */
-    disabled?: boolean;
-    /**
-     * In the event that a custom menuRenderer is provided, Option should be able
-     * to accept arbitrary key-value pairs. See react-virtualized-select.
-     */
-    [property: string]: any;
-}
-
-export type OptionValues = string | number | boolean;
-
-export interface MenuRendererProps<TValue = OptionValues> {
-    /**
-     * The currently focused option; should be visible in the menu by default.
-     * default {}
-     */
-    focusedOption: Option<TValue>;
-
-    /**
-     * Callback to focus a new option; receives the option as a parameter.
-     */
-    focusOption: FocusOptionHandler<TValue>;
-
-    /**
-     * Option labels are accessible with this string key.
-     */
-    labelKey: string;
-
-    /**
-     * Ordered array of options to render.
-     */
-    options: Options<TValue>;
-
-    /**
-     * Callback to select a new option; receives the option as a parameter.
-     */
-    selectValue: SelectValueHandler<TValue>;
-
-    /**
-     * Array of currently selected options.
-     */
-    valueArray: Options<TValue>;
-
-    /**
-     * Callback to remove selection from option; receives the option as a parameter.
-     */
-    removeValue: SelectValueHandler<TValue>;
-
-    /**
-     * function which returns a custom way to render the options in the menu
-     */
-    optionRenderer: OptionRendererHandler<TValue>;
-}
-
-export interface OptionComponentProps<TValue = OptionValues> {
-    /**
-     * Classname(s) to apply to the option component.
-     */
-    className?: string;
-
-    /**
-     * Currently focused option.
-     */
-    focusOption?: Option<TValue>;
-
-    inputValue?: string;
-    instancePrefix?: string;
-
-    /**
-     * True if this option is disabled.
-     */
-    isDisabled?: boolean;
-
-    /**
-     * True if this option is focused.
-     */
-    isFocused?: boolean;
-
-    /**
-     * True if this option is selected.
-     */
-    isSelected?: boolean;
-
-    /**
-     * Callback to be invoked when this option is focused.
-     */
-    onFocus?: (option: Option<TValue>, event: any) => void;
-
-    /**
-     * Callback to be invoked when this option is selected.
-     */
-    onSelect?: (option: Option<TValue>, event: any) => void;
-
-    /**
-     * Option to be rendered by this component.
-     */
-    option: Option<TValue>;
-
-    /**
-     * Index of the option being rendered in the list
-     */
-    optionIndex?: number;
-
-    /**
-     * Callback to invoke when removing an option from a multi-selection. (Not necessarily the one
-     * being rendered)
-     */
-    removeValue?: (value: TValue | TValue[]) => void;
-
-    /**
-     * Callback to invoke to select an option. (Not necessarily the one being rendered)
-     */
-    selectValue?: (value: TValue | TValue[]) => void;
-}
-
-export interface ArrowRendererProps {
-    /**
-     * Arrow mouse down event handler.
-     */
-    onMouseDown: React.MouseEventHandler<any>;
-
-    /**
-     * whether the Select is open or not.
-     */
-    isOpen: boolean;
-}
-
-export interface ReactSelectProps<TValue = OptionValues> extends React.Props<ReactSelectClass<TValue>> {
-    /**
-     * text to display when `allowCreate` is true.
-     * @default 'Add "{label}"?'
-     */
-    addLabelText?: string;
-    /**
-     * renders a custom drop-down arrow to be shown in the right-hand side of the select.
-     * @default undefined
-     */
-    arrowRenderer?: ArrowRendererHandler;
-    /**
-     * blurs the input element after a selection has been made. Handy for lowering the keyboard on mobile devices.
-     * @default false
-     */
-    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
-     */
-    autosize?: boolean;
-    /**
-     * whether pressing backspace removes the last item when there is no input value
-     * @default true
-     */
-    backspaceRemoves?: boolean;
-    /**
-     * Message to use for screenreaders to press backspace to remove the current item
-     * {label} is replaced with the item label
-     * @default "Press backspace to remove..."
-     */
-    backspaceToRemoveMessage?: string;
-    /**
-     * CSS className for the outer element
-     */
-    className?: string;
-    /**
-     * title for the "clear" control when `multi` is true
-     * @default "Clear all"
-     */
-    clearAllText?: string;
-    /**
-     * Renders a custom clear to be shown in the right-hand side of the select when clearable true
-     * @default undefined
-     */
-    clearRenderer?: ClearRendererHandler;
-    /**
-     * title for the "clear" control
-     * @default "Clear value"
-     */
-    clearValueText?: string;
-    /**
-     * whether to close the menu when a value is selected
-     * @default true
-     */
-    closeOnSelect?: boolean;
-    /**
-     * whether it is possible to reset value. if enabled, an X button will appear at the right side.
-     * @default true
-     */
-    clearable?: boolean;
-    /**
-     * whether backspace removes an item if there is no text input
-     * @default true
-     */
-    deleteRemoves?: boolean;
-    /**
-     * delimiter to use to join multiple values
-     * @default ","
-     */
-    delimiter?: string;
-    /**
-     * whether the Select is disabled or not
-     * @default false
-     */
-    disabled?: boolean;
-    /**
-     * whether escape clears the value when the menu is closed
-     * @default true
-     */
-    escapeClearsValue?: boolean;
-    /**
-     * method to filter a single option
-     */
-    filterOption?: FilterOptionHandler<TValue>;
-    /**
-     * method to filter the options array
-     */
-    filterOptions?: FilterOptionsHandler<TValue>;
-    /**
-     * id for the underlying HTML input element
-     * @default undefined
-     */
-    id?: string;
-    /**
-     * whether to strip diacritics when filtering
-     * @default true
-     */
-    ignoreAccents?: boolean;
-    /**
-     * whether to perform case-insensitive filtering
-     * @default true
-     */
-    ignoreCase?: boolean;
-    /**
-     * custom attributes for the Input (in the Select-control) e.g: {'data-foo': 'bar'}
-     * @default {}
-     */
-    inputProps?: { [key: string]: any };
-    /**
-     * renders a custom input
-     */
-    inputRenderer?: InputRendererHandler;
-    /**
-     * allows for synchronization of component id's on server and client.
-     * @see https://github.com/JedWatson/react-select/pull/1105
-     */
-    instanceId?: string;
-    /**
-     * whether the Select is loading externally or not (such as options being loaded).
-     * if true, a loading spinner will be shown at the right side.
-     * @default false
-     */
-    isLoading?: boolean;
-    /**
-     * (legacy mode) joins multiple values into a single form field with the delimiter
-     * @default false
-     */
-    joinValues?: boolean;
-    /**
-     * the option property to use for the label
-     * @default "label"
-     */
-    labelKey?: string;
-    /**
-     * (any, start) match the start or entire string when filtering
-     * @default "any"
-     */
-    matchPos?: string;
-    /**
-     * (any, label, value) which option property to filter on
-     * @default "any"
-     */
-    matchProp?: string;
-    /**
-     * buffer of px between the base of the dropdown and the viewport to shift if menu doesnt fit in viewport
-     * @default 0
-     */
-    menuBuffer?: number;
-    /**
-     * optional style to apply to the menu container
-     */
-    menuContainerStyle?: React.CSSProperties;
-    /**
-     * renders a custom menu with options
-     */
-    menuRenderer?: MenuRendererHandler<TValue>;
-    /**
-     * optional style to apply to the menu
-     */
-    menuStyle?: React.CSSProperties;
-    /**
-     * multi-value input
-     * @default false
-     */
-    multi?: boolean;
-    /**
-     * field name, for hidden `<input>` tag
-     */
-    name?: string;
-    /**
-     * placeholder displayed when there are no matching search results or a falsy value to hide it
-     * @default "No results found"
-     */
-    noResultsText?: string | JSX.Element;
-    /**
-     * onBlur handler: function (event) {}
-     */
-    onBlur?: OnBlurHandler;
-    /**
-     * whether to clear input on blur or not
-     * @default true
-     */
-    onBlurResetsInput?: boolean;
-    /**
-     * whether the input value should be reset when options are selected.
-     * Also input value will be set to empty if 'onSelectResetsInput=true' and
-     * Select will get new value that not equal previous value.
-     * @default true
-     */
-    onSelectResetsInput?: boolean;
-    /**
-     * whether to clear input when closing the menu through the arrow
-     * @default true
-     */
-    onCloseResetsInput?: boolean;
-    /**
-     * onChange handler: function (newValue) {}
-     */
-    onChange?: OnChangeHandler<TValue>;
-    /**
-     * fires when the menu is closed
-     */
-    onClose?: OnCloseHandler;
-    /**
-     * onFocus handler: function (event) {}
-     */
-    onFocus?: OnFocusHandler;
-    /**
-     * onInputChange handler: function (inputValue) {}
-     */
-    onInputChange?: OnInputChangeHandler;
-    /**
-     * onInputKeyDown handler: function (keyboardEvent) {}
-     */
-    onInputKeyDown?: OnInputKeyDownHandler;
-    /**
-     * fires when the menu is scrolled to the bottom; can be used to paginate options
-     */
-    onMenuScrollToBottom?: OnMenuScrollToBottomHandler;
-    /**
-     * fires when the menu is opened
-     */
-    onOpen?: OnOpenHandler;
-    /**
-     * boolean to enable opening dropdown when focused
-     * @default false
-     */
-    openAfterFocus?: boolean;
-    /**
-     * open the options menu when the input gets focus (requires searchable = true)
-     * @default false
-     */
-    openOnFocus?: boolean;
-    /**
-     * className to add to each option component
-     */
-    optionClassName?: string;
-    /**
-     * option component to render in dropdown
-     */
-    optionComponent?: OptionComponentType<TValue>;
-    /**
-     * function which returns a custom way to render the options in the menu
-     */
-    optionRenderer?: OptionRendererHandler<TValue>;
-    /**
-     * array of Select options
-     * @default false
-     */
-    options?: Options<TValue>;
-    /**
-     * number of options to jump when using page up/down keys
-     * @default 5
-     */
-    pageSize?: number;
-    /**
-     * field placeholder, displayed when there's no value
-     * @default "Select..."
-     */
-    placeholder?: string | JSX.Element;
-    /**
-     * whether the selected option is removed from the dropdown on multi selects
-     * @default true
-     */
-    removeSelected?: boolean;
-    /**
-     * applies HTML5 required attribute when needed
-     * @default false
-     */
-    required?: boolean;
-    /**
-     * value to use when you clear the control
-     */
-    resetValue?: any;
-    /**
-     * use react-select in right-to-left direction
-     * @default false
-     */
-    rtl?: boolean;
-    /**
-     * whether the viewport will shift to display the entire menu when engaged
-     * @default true
-     */
-    scrollMenuIntoView?: boolean;
-    /**
-     * whether to enable searching feature or not
-     * @default true;
-     */
-    searchable?: boolean;
-    /**
-     * whether to select the currently focused value when the  [tab]  key is pressed
-     */
-    tabSelectsValue?: boolean;
-    /**
-     * initial field value
-     */
-    value?: Option<TValue> | Options<TValue> | string | string[] | number | number[] | boolean;
-    /**
-     * the option property to use for the value
-     * @default "value"
-     */
-    valueKey?: string;
-    /**
-     * function which returns a custom way to render the value selected
-     * @default false
-     */
-    valueRenderer?: ValueRendererHandler<TValue>;
-    /**
-     *  optional style to apply to the control
-     */
-    style?: React.CSSProperties;
-
-    /**
-     *  optional tab index of the control
-     */
-    tabIndex?: string | number;
-
-    /**
-     *  value component to render
-     */
-    valueComponent?: React.ComponentType<TValue>;
-
-    /**
-     *  optional style to apply to the component wrapper
-     */
-    wrapperStyle?: React.CSSProperties;
-
-    /**
-     * onClick handler for value labels: function (value, event) {}
-     */
-    onValueClick?: OnValueClickHandler<TValue>;
-
-    /**
-     *  pass the value to onChange as a simple value (legacy pre 1.0 mode), defaults to false
-     */
-    simpleValue?: boolean;
-}
-
-export interface ReactCreatableSelectProps<TValue = OptionValues> extends ReactSelectProps<TValue> {
-    /**
-     * Searches for any matching option within the set of options. This function prevents
-     * duplicate options from being created.
-     */
-    isOptionUnique?: IsOptionUniqueHandler<TValue>;
-
-    /**
-     * Determines if the current input text represents a valid option.
-     */
-    isValidNewOption?: IsValidNewOptionHandler;
-
-    /**
-     * factory to create new options
-     */
-    newOptionCreator?: NewOptionCreatorHandler<TValue>;
-
-    /**
-     * Creates prompt/placeholder for option text.
-     */
-    promptTextCreator?: PromptTextCreatorHandler;
-
-    /**
-     * Decides if a keyDown event (eg its 'keyCode') should result in the creation of a new option.
-     */
-    shouldKeyDownEventCreateNewOption?: ShouldKeyDownEventCreateNewOptionHandler;
-
-    /**
-     * new option click handler: function (option) {}
-     */
-    onNewOptionClick?: OnNewOptionClickHandler<TValue>;
-}
-
-export interface ReactAsyncSelectProps<TValue = OptionValues> extends ReactSelectProps<TValue> {
-    /**
-     * Whether to auto-load the default async options set.
-     */
-    autoload?: boolean;
-
-    /**
-     *  object to use to cache results; can be null to disable cache
-     */
-    cache?: { [key: string]: any } | boolean;
-
-    /**
-     *  function to call to load options asynchronously
-     */
-    loadOptions: LoadOptionsHandler<TValue>;
-
-    /**
-     *  replaces the placeholder while options are loading
-     */
-    loadingPlaceholder?: string | JSX.Element;
-}
-
-export type ReactAsyncCreatableSelectProps<TValue = OptionValues> = ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>;
+export { SelectBase };
+export { default as Async } from './lib/Async';
+export { default as AsyncCreatable } from './lib/AsyncCreatable';
+export { default as Creatable } from './lib/Creatable';
+export { createFilter } from './lib/filters';
+export { default as makeAnimated } from './lib/animated/index';
+export { components } from './lib/components/index';
+export { mergeStyles } from './lib/styles';
diff --git a/types/react-select/lib/Async.d.ts b/types/react-select/lib/Async.d.ts
new file mode 100644
index 0000000000..8acc5532b7
--- /dev/null
+++ b/types/react-select/lib/Async.d.ts
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import Select, { Props as SelectProps } from './Select';
+import { handleInputChange } from './utils';
+import manageState from './stateManager';
+import { OptionsType, InputActionMeta } from './types';
+
+export interface AsyncProps<OptionType> {
+  /* The default set of options to show before the user starts searching. When
+     set to `true`, the results for loadOptions('') will be autoloaded. */
+  defaultOptions: OptionsType<OptionType> | boolean;
+  /* Function that returns a promise, which is the set of options to be used
+     once the promise resolves. */
+  loadOptions: (inputValue: string, callback: ((options: OptionsType<OptionType>) => void)) => Promise<any> | void;
+  /* If cacheOptions is truthy, then the loaded data will be cached. The cache
+     will remain until `cacheOptions` changes value. */
+  cacheOptions: any;
+}
+
+export type Props<OptionType> = SelectProps<OptionType> & AsyncProps<OptionType>;
+
+export const defaultProps: Props<any>;
+
+export interface State<OptionType> {
+  defaultOptions?: OptionsType<OptionType>;
+  inputValue: string;
+  isLoading: boolean;
+  loadedInputValue?: string;
+  loadedOptions: OptionsType<OptionType>;
+  passEmptyOptions: boolean;
+}
+
+export class Async<OptionType> extends React.Component<Props<OptionType>, State<OptionType>> {
+  static defaultProps: Props<any>;
+  select: React.Ref<any>;
+  lastRequest: {};
+  mounted: boolean;
+  optionsCache: { [key: string]: OptionsType<OptionType> };
+
+  focus(): void;
+  blur(): void;
+  loadOptions(inputValue: string, callback: (options: OptionsType<OptionType>) => void): void;
+  handleInputChange: (newValue: string, actionMeta: InputActionMeta) => string;
+}
+
+export function makeAsyncSelect(SelectComponent: React.ComponentType<any>): Async<any>;
+
+export default Async;
diff --git a/types/react-select/lib/AsyncCreatable.d.ts b/types/react-select/lib/AsyncCreatable.d.ts
new file mode 100644
index 0000000000..5fbdd8e52c
--- /dev/null
+++ b/types/react-select/lib/AsyncCreatable.d.ts
@@ -0,0 +1,25 @@
+import { Component, Ref as ElementRef } from 'react';
+import { Props as AsyncProps, State as AsyncState } from './Async';
+import { Props as CreatableProps, State as CreatableState } from './Creatable';
+import { OptionsType, ValueType, ActionMeta, InputActionMeta } from './types';
+import { cleanValue } from './utils';
+
+type Props<OptionType> = AsyncProps<OptionType> & CreatableProps<OptionType>;
+
+type State<OptionType> = AsyncState<OptionType> & CreatableState<OptionType>;
+
+export class AsyncCreatable<OptionType> extends Component<Props<OptionType>, State<OptionType>> {
+    static defaultProps: Props<any>;
+    select: ElementRef<any>;
+    lastRequest: {};
+    mounted: boolean;
+    optionsCache: { [key: string]: OptionsType<OptionType> };
+
+    focus(): void;
+    blur(): void;
+    loadOptions(inputValue: string, callback: (options: OptionsType<OptionType>) => void): void;
+    handleInputChange: (newValue: string, actionMeta: InputActionMeta) => string;
+    onChange: (newValue: ValueType<OptionType>, actionMeta: ActionMeta) => void;
+}
+
+export default AsyncCreatable;
diff --git a/types/react-select/lib/Creatable.d.ts b/types/react-select/lib/Creatable.d.ts
new file mode 100644
index 0000000000..5cae63021c
--- /dev/null
+++ b/types/react-select/lib/Creatable.d.ts
@@ -0,0 +1,49 @@
+import * as React from 'react';
+import Select, { Props as SelectProps } from './Select';
+import { OptionsType, ValueType, ActionMeta } from './types';
+import { cleanValue } from './utils';
+import manageState from './stateManager';
+
+export interface CreatableProps<OptionType> {
+  /* Allow options to be created while the `isLoading` prop is true. Useful to
+     prevent the "create new ..." option being displayed while async results are
+     still being loaded. */
+  allowCreateWhileLoading?: boolean;
+  /* Gets the label for the "create new ..." option in the menu. Is given the
+     current input value. */
+  formatCreateLabel?: (inputValue: string) => React.ReactNode;
+  /* Determines whether the "create new ..." option should be displayed based on
+     the current input value, select value and options array. */
+  isValidNewOption?: (inputValue: string, value: ValueType<OptionType>, options: OptionsType<OptionType>) => boolean;
+  /* Returns the data for the new option when it is created. Used to display the
+     value, and is passed to `onChange`. */
+  getNewOptionData?: (inputValue: string, optionLabel: React.ReactNode) => OptionType;
+  /* If provided, this will be called with the input value when a new option is
+     created, and `onChange` will **not** be called. Use this when you need more
+     control over what happens when new options are created. */
+  onCreateOption?: (inputValue: string) => void;
+  /* Sets the position of the createOption element in your options list. Defaults to 'last' */
+  createOptionPosition?: 'first' | 'last';
+}
+
+export type Props<OptionType> = SelectProps<OptionType> & CreatableProps<OptionType>;
+
+export const defaultProps: Props<any>;
+
+export interface State<OptionType> {
+  newOption: OptionType | undefined;
+  options: OptionsType<OptionType>;
+}
+
+export class Creatable<OptionType> extends React.Component<Props<OptionType>, State<OptionType>> {
+  static defaultProps: Props<any>;
+  select: React.Ref<any>;
+
+  onChange: (newValue: ValueType<OptionType>, actionMeta: ActionMeta) => void;
+  focus(): void;
+  blur(): void;
+}
+
+export function makeCreatableSelect(SelectComponent: React.ComponentType<any>): Creatable<any>;
+
+export default Creatable;
diff --git a/types/react-select/lib/Select.d.ts b/types/react-select/lib/Select.d.ts
new file mode 100644
index 0000000000..aa8524103e
--- /dev/null
+++ b/types/react-select/lib/Select.d.ts
@@ -0,0 +1,419 @@
+import * as React from 'react';
+
+import { Option } from './filters';
+import {
+  InstructionsContext,
+  ValueEventContext,
+} from './accessibility/index';
+
+import {
+  classNames,
+  noop,
+  scrollIntoView,
+} from './utils';
+
+import {
+  formatGroupLabel,
+  getOptionLabel,
+  getOptionValue,
+  isOptionDisabled,
+} from './builtins';
+
+import {
+  PlaceholderOrValue,
+  SelectComponents,
+  SelectComponentsConfig,
+} from './components/index';
+import { StylesConfig } from './styles';
+
+import {
+  ActionMeta,
+  ActionTypes,
+  FocusDirection,
+  FocusEventHandler,
+  GroupType,
+  InputActionMeta,
+  KeyboardEventHandler,
+  MenuPlacement,
+  MenuPosition,
+  OptionsType,
+  ValueType,
+  GroupedOptionsType,
+} from './types';
+
+export type MouseOrTouchEvent =
+  | React.MouseEvent<HTMLElement>
+  | React.TouchEvent<HTMLElement>;
+export type FormatOptionLabelContext = 'menu' | 'value';
+export interface FormatOptionLabelMeta<OptionType> {
+  context: FormatOptionLabelContext;
+  inputValue: string;
+  selectValue: ValueType<OptionType>;
+}
+
+export interface Props<OptionType> {
+  /* Aria label (for assistive tech) */
+  'aria-label'?: string;
+  /* HTML ID of an element that should be used as the label (for assistive tech) */
+  'aria-labelledby'?: string;
+  /* Focus the control when it is mounted */
+  autoFocus?: boolean;
+  /* Remove the currently focused option when the user presses backspace */
+  backspaceRemovesValue?: boolean;
+  /* Remove focus from the input when the user selects an option (handy for dismissing the keyboard on touch devices) */
+  blurInputOnSelect?: boolean;
+  /* When the user reaches the top/bottom of the menu, prevent scroll on the scroll-parent  */
+  captureMenuScroll?: boolean;
+  /* className attribute applied to the outer component */
+  className?: string;
+  /* classNamePrefix attribute used as a base for inner component classNames */
+  classNamePrefix?: string | null;
+  /* Close the select menu when the user selects an option */
+  closeMenuOnSelect?: boolean;
+  /*
+     If `true`, close the select menu when the user scrolls the document/body.
+
+     If a function, takes a standard javascript `ScrollEvent` you return a boolean:
+
+     `true` => The menu closes
+
+     `false` => The menu stays open
+
+     This is useful when you have a scrollable modal and want to portal the menu out,
+     but want to avoid graphical issues.
+   */
+  closeMenuOnScroll?: boolean | EventListener;
+  /*
+    This complex object includes all the compositional components that are used
+    in `react-select`. If you wish to overwrite a component, pass in an object
+    with the appropriate namespace.
+
+    If you only wish to restyle a component, we recommend using the `styles` prop
+    instead. For a list of the components that can be passed in, and the shape
+    that will be passed to them, see [the components docs](/api#components)
+  */
+  components?: SelectComponentsConfig<OptionType>;
+  /* Whether the value of the select, e.g. SingleValue, should be displayed in the control. */
+  controlShouldRenderValue?: boolean;
+  /* Delimiter used to join multiple values into a single HTML Input value */
+  delimiter?: string;
+  /* Clear all values when the user presses escape AND the menu is closed */
+  escapeClearsValue?: boolean;
+  /* Custom method to filter whether an option should be displayed in the menu */
+  filterOption?: ((
+    option: Option,
+    rawInput: string
+  ) => boolean) | null;
+  /* Formats group labels in the menu as React components */
+  formatGroupLabel?: typeof formatGroupLabel;
+  /* Formats option labels in the menu and control as React components */
+  formatOptionLabel?: (option: OptionType, labelMeta: FormatOptionLabelMeta<OptionType>) => React.ReactNode;
+  /* Resolves option data to a string to be displayed as the label by components */
+  getOptionLabel?: typeof getOptionLabel;
+  /* Resolves option data to a string to compare options and specify value attributes */
+  getOptionValue?: typeof getOptionValue;
+  /* Hide the selected option from the menu */
+  hideSelectedOptions?: boolean;
+  /* The id to set on the SelectContainer component. */
+  id?: string;
+  /* The value of the search input */
+  inputValue?: string;
+  /* The id of the search input */
+  inputId?: string;
+  /* Define an id prefix for the select components e.g. {your-id}-value */
+  instanceId?: number | string;
+  /* Is the select value clearable */
+  isClearable?: boolean;
+  /* Is the select disabled */
+  isDisabled?: boolean;
+  /* Is the select in a state of loading (async) */
+  isLoading?: boolean;
+  /* Override the built-in logic to detect whether an option is disabled */
+  isOptionDisabled?: (option: OptionType, options: OptionsType<OptionType>) => boolean | false;
+  /* Override the built-in logic to detect whether an option is selected */
+  isOptionSelected?: (option: OptionType, options: OptionsType<OptionType>) => boolean;
+  /* Support multiple selected options */
+  isMulti?: boolean;
+  /* Is the select direction right-to-left */
+  isRtl?: boolean;
+  /* Whether to enable search functionality */
+  isSearchable?: boolean;
+  /* Async: Text to display when loading options */
+  loadingMessage?: (obj: { inputValue: string }) => string | null;
+  /* Minimum height of the menu before flipping */
+  minMenuHeight?: number;
+  /* Maximum height of the menu before scrolling */
+  maxMenuHeight?: number;
+  /* Whether the menu is open */
+  menuIsOpen?: boolean;
+  /* Default placement of the menu in relation to the control. 'auto' will flip
+     when there isn't enough space below the control. */
+  menuPlacement?: MenuPlacement;
+  /* The CSS position value of the menu, when "fixed" extra layout management is required */
+  menuPosition?: MenuPosition;
+  /* Whether the menu should use a portal, and where it should attach */
+  menuPortalTarget?: HTMLElement | null;
+  /* Whether to block scroll events when the menu is open */
+  menuShouldBlockScroll?: boolean;
+  /* Whether the menu should be scrolled into view when it opens */
+  menuShouldScrollIntoView?: boolean;
+  /* Name of the HTML Input (optional - without this, no input will be rendered) */
+  name?: string;
+  /* Text to display when there are no options */
+  noOptionsMessage?: (obj: { inputValue: string }) => string | null;
+  /* Handle blur events on the control */
+  onBlur?: FocusEventHandler;
+  /* Handle change events on the select */
+  onChange?: (value: ValueType<OptionType>, action: ActionMeta) => void;
+  /* Handle focus events on the control */
+  onFocus?: FocusEventHandler;
+  /* Handle change events on the input */
+  onInputChange?: (newValue: string, actionMeta: InputActionMeta) => void;
+  /* Handle key down events on the select */
+  onKeyDown?: KeyboardEventHandler;
+  /* Handle the menu opening */
+  onMenuOpen?: () => void;
+  /* Handle the menu closing */
+  onMenuClose?: () => void;
+  /* Fired when the user scrolls to the top of the menu */
+  onMenuScrollToTop?: (event: React.SyntheticEvent<HTMLElement>) => void;
+  /* Fired when the user scrolls to the bottom of the menu */
+  onMenuScrollToBottom?: (event: React.SyntheticEvent<HTMLElement>) => void;
+  /* Allows control of whether the menu is opened when the Select is focused */
+  openMenuOnFocus?: boolean;
+  /* Allows control of whether the menu is opened when the Select is clicked */
+  openMenuOnClick?: boolean;
+  /* Array of options that populate the select menu */
+  options?: GroupedOptionsType<OptionType> | OptionsType<OptionType>;
+  /* Number of options to jump in menu when page{up|down} keys are used */
+  pageSize?: number;
+  /* Placeholder text for the select value */
+  placeholder?: string;
+  /* Status to relay to screen readers */
+  screenReaderStatus?: (obj: { count: number }) => string;
+  /* Style modifier methods */
+  styles?: StylesConfig;
+  /* Sets the tabIndex attribute on the input */
+  tabIndex?: string;
+  /* Select the currently focused option when the user presses tab */
+  tabSelectsValue?: boolean;
+  /* The value of the select; reflected by the selected option */
+  value?: ValueType<OptionType>;
+
+  defaultInputValue?: string;
+  defaultMenuIsOpen?: boolean;
+  defaultValue?: ValueType<OptionType>;
+}
+
+export const defaultProps: Props<any>;
+
+export interface MenuOptions<OptionType> {
+  render: OptionType[];
+  focusable: OptionType[];
+}
+
+export interface State<OptionType> {
+  ariaLiveSelection: string;
+  ariaLiveContext: string;
+  inputIsHidden: boolean;
+  isFocused: boolean;
+  isComposing: boolean;
+  focusedOption: OptionType | null;
+  focusedValue: OptionType | null;
+  menuOptions: MenuOptions<OptionType>;
+  selectValue: OptionsType<OptionType>;
+}
+
+export type ElRef = React.Ref<any>;
+
+export default class Select<OptionType> extends React.Component<Props<OptionType>, State<OptionType>> {
+  static defaultProps: Props<any>;
+
+  // Misc. Instance Properties
+  // ------------------------------
+
+  blockOptionHover: boolean;
+  clearFocusValueOnUpdate: boolean;
+  commonProps: any; // TODO
+  components: SelectComponents<OptionType>;
+  hasGroups: boolean;
+  initialTouchX: number;
+  initialTouchY: number;
+  inputIsHiddenAfterUpdate: boolean | null;
+  instancePrefix: string;
+  openAfterFocus: boolean;
+  scrollToFocusedOptionOnUpdate: boolean;
+  userIsDragging: boolean | null;
+
+  // Refs
+  // ------------------------------
+
+  controlRef: ElRef;
+  getControlRef: (ref: HTMLElement) => void;
+  focusedOptionRef: ElRef;
+  getFocusedOptionRef: (ref: HTMLElement) => void;
+  menuListRef: ElRef;
+  getMenuListRef: (ref: HTMLElement) => void;
+  inputRef: ElRef;
+  getInputRef: (ref: HTMLElement) => void;
+
+  // Lifecycle
+  // ------------------------------
+
+  cacheComponents: (components: SelectComponents<OptionType>) => void;
+
+  // ==============================
+  // Consumer Handlers
+  // ==============================
+
+  onMenuOpen(): void;
+  onMenuClose(): void;
+  onInputChange(newValue: string, actionMeta: InputActionMeta): void;
+
+  // ==============================
+  // Methods
+  // ==============================
+
+  focusInput(): void;
+  blurInput(): void;
+
+  // aliased for consumers
+  focus(): void;
+  blur(): void;
+
+  openMenu(focusOption: 'first' | 'last'): void;
+  focusValue(direction: 'previous' | 'next'): void;
+
+  focusOption(direction: FocusDirection): void;
+  setValue: (
+    newValue: ValueType<OptionType>,
+    action: ActionTypes,
+    option?: OptionType
+  ) => void;
+  selectOption: (newValue: OptionType) => void;
+  removeValue: (removedValue: OptionType) => void;
+  clearValue: () => void;
+  popValue: () => void;
+
+  // ==============================
+  // Getters
+  // ==============================
+
+  getCommonProps(): {
+    cx: any;
+    clearValue: () => void;
+    getStyles: (key: string, props: {}) => {};
+    getValue: () => OptionType[];
+    hasValue: boolean;
+    isMulti: boolean;
+    isRtl: boolean;
+    options: OptionsType<any>;
+    selectOption: (newValue: OptionType) => void;
+    setValue: (newValue: ValueType<OptionType>, action: ActionTypes, option?: OptionType) => void;
+    selectProps: Readonly<{
+        children?: React.ReactNode;
+    }> & Readonly<Props<OptionType>>;
+};
+
+  getNextFocusedValue(nextSelectValue: OptionsType<OptionType>): OptionType;
+
+  getNextFocusedOption(options: OptionsType<OptionType>): OptionType;
+  getOptionLabel: (data: OptionType) => string;
+  getOptionValue: (data: OptionType) => string;
+  getStyles: (key: string, props: {}) => {};
+  getElementId: (element: 'group' | 'input' | 'listbox' | 'option') => string;
+  getActiveDescendentId: () => any;
+
+  // ==============================
+  // Helpers
+  // ==============================
+  announceAriaLiveSelection: (props: {
+    event: string,
+    context: ValueEventContext,
+  }) => void;
+  announceAriaLiveContext: (props: {
+    event: string,
+    context?: InstructionsContext,
+  }) => void;
+
+  hasValue(): boolean;
+  hasOptions(): boolean;
+  countOptions(): number;
+  isClearable(): boolean;
+  isOptionDisabled(option: OptionType, selectValue: OptionsType<OptionType>): boolean;
+  isOptionSelected(option: OptionType, selectValue: OptionsType<OptionType>): boolean;
+  filterOption(option: {}, inputValue: string): boolean;
+  formatOptionLabel(data: OptionType, context: FormatOptionLabelContext): React.ReactNode;
+  formatGroupLabel(data: GroupType<OptionType>): React.ReactNode;
+
+  // ==============================
+  // Mouse Handlers
+  // ==============================
+
+  onMenuMouseDown: (event: React.MouseEvent<HTMLElement>) => void;
+  onMenuMouseMove: (event: React.MouseEvent<HTMLElement>) => void;
+  onControlMouseDown: (event: MouseOrTouchEvent) => void;
+  onDropdownIndicatorMouseDown: (event: MouseOrTouchEvent) => void;
+  onClearIndicatorMouseDown: (event: MouseOrTouchEvent) => void;
+  onScroll: (event: Event) => void;
+
+  // ==============================
+  // Composition Handlers
+  // ==============================
+
+  startListeningComposition(): void;
+  stopListeningComposition(): void;
+  onCompositionStart: () => void;
+  onCompositionEnd: () => void;
+
+  // ==============================
+  // Touch Handlers
+  // ==============================
+
+  startListeningToTouch(): void;
+  stopListeningToTouch(): void;
+  onTouchStart: (event: TouchEvent) => void;
+  onTouchMove: (event: TouchEvent) => void;
+  onTouchEnd: (event: TouchEvent) => void;
+  onControlTouchEnd: (event: React.TouchEvent<HTMLElement>) => void;
+  onClearIndicatorTouchEnd: (event: React.TouchEvent<HTMLElement>) => void;
+  onDropdownIndicatorTouchEnd: (event: React.TouchEvent<HTMLElement>) => void;
+
+  // ==============================
+  // Focus Handlers
+  // ==============================
+
+  handleInputChange: (event: React.KeyboardEvent<HTMLInputElement>) => void;
+  onInputFocus: (event: React.FocusEvent<HTMLInputElement>) => void;
+  onInputBlur: (event: React.FocusEvent<HTMLInputElement>) => void;
+  onOptionHover: (focusedOption: OptionType) => void;
+  shouldHideSelectedOptions: () => boolean;
+
+  // ==============================
+  // Keyboard Handlers
+  // ==============================
+
+  onKeyDown: (event: React.KeyboardEvent<HTMLElement>) => void;
+
+  // ==============================
+  // Menu Options
+  // ==============================
+
+  buildMenuOptions(props: Props<OptionType>, selectValue: OptionsType<OptionType>): MenuOptions<OptionType>;
+
+  // ==============================
+  // Renderers
+  // ==============================
+  constructAriaLiveMessage(): string;
+
+  renderInput(): React.ReactNode;
+  renderPlaceholderOrValue(): PlaceholderOrValue<OptionType> | null;
+  renderClearIndicator(): React.ReactNode;
+  renderLoadingIndicator(): React.ReactNode;
+  renderIndicatorSeparator(): React.ReactNode;
+  renderDropdownIndicator(): React.ReactNode;
+  renderMenu(): React.ReactNode;
+  renderFormField(): React.ReactNode;
+
+  renderLiveRegion(): React.ReactNode;
+}
diff --git a/types/react-select/lib/accessibility/index.d.ts b/types/react-select/lib/accessibility/index.d.ts
new file mode 100644
index 0000000000..633aaeda72
--- /dev/null
+++ b/types/react-select/lib/accessibility/index.d.ts
@@ -0,0 +1,10 @@
+export interface InstructionsContext { isSearchable?: boolean; isMulti?: boolean; label?: string; }
+export interface ValueEventContext { value: string; }
+
+export function instructionsAriaMessage(event: any, context?: InstructionsContext): string;
+
+export function valueEventAriaMessage(event: any, context: ValueEventContext): string;
+
+export function valueFocusAriaMessage({ focusedValue, getOptionLabel, selectValue }: any): string;
+export function optionFocusAriaMessage({ focusedOption, getOptionLabel, options }: any): string;
+export function resultsAriaMessage({ inputValue, screenReaderMessage }: any): string;
diff --git a/types/react-select/lib/animated/Input.d.ts b/types/react-select/lib/animated/Input.d.ts
new file mode 100644
index 0000000000..ad752a96c5
--- /dev/null
+++ b/types/react-select/lib/animated/Input.d.ts
@@ -0,0 +1,10 @@
+import * as React from 'react';
+import { InputProps } from '../components/Input';
+import { BaseTransition } from './transitions';
+import { PropsWithInnerRef } from '../types';
+
+export type AnimatedInputProps = BaseTransition & PropsWithInnerRef & InputProps;
+
+export function AnimatedInput(WrappedComponent: React.ComponentType<InputProps>): React.ComponentType<AnimatedInputProps>;
+
+export default AnimatedInput;
diff --git a/types/react-select/lib/animated/MultiValue.d.ts b/types/react-select/lib/animated/MultiValue.d.ts
new file mode 100644
index 0000000000..8a8f37ad16
--- /dev/null
+++ b/types/react-select/lib/animated/MultiValue.d.ts
@@ -0,0 +1,12 @@
+import { ComponentType } from 'react';
+import { MultiValueProps } from '../components/MultiValue';
+import { Collapse, fn } from './transitions';
+
+export type AnimatedMultiValueProps<OptionType> = {
+  in: boolean,
+  onExited: fn,
+} & MultiValueProps<OptionType>;
+
+export function AnimatedMultiValue<OptionType>(WrappedComponent: ComponentType<MultiValueProps<OptionType>>): ComponentType<AnimatedMultiValueProps<OptionType>>;
+
+export default AnimatedMultiValue;
diff --git a/types/react-select/lib/animated/Placeholder.d.ts b/types/react-select/lib/animated/Placeholder.d.ts
new file mode 100644
index 0000000000..1dbd3ba203
--- /dev/null
+++ b/types/react-select/lib/animated/Placeholder.d.ts
@@ -0,0 +1,9 @@
+import { ComponentType } from 'react';
+import { PlaceholderProps } from '../components/Placeholder';
+import { Fade, collapseDuration } from './transitions';
+
+export type AnimatedPlaceholderProps<OptionType> = PlaceholderProps<OptionType>;
+
+export function AnimatedPlaceholder<OptionType>(WrappedComponent: ComponentType<PlaceholderProps<OptionType>>): ComponentType<AnimatedPlaceholderProps<OptionType>>;
+
+export default AnimatedPlaceholder;
diff --git a/types/react-select/lib/animated/SingleValue.d.ts b/types/react-select/lib/animated/SingleValue.d.ts
new file mode 100644
index 0000000000..6cd1bea908
--- /dev/null
+++ b/types/react-select/lib/animated/SingleValue.d.ts
@@ -0,0 +1,9 @@
+import { ComponentType } from 'react';
+import { SingleValueProps } from '../components/SingleValue';
+import { Fade } from './transitions';
+
+export type AnimatedSingleValueProps<OptionType> = SingleValueProps<OptionType>;
+
+export function AnimatedSingleValue<OptionType>(WrappedComponent: ComponentType<SingleValueProps<OptionType>>): ComponentType<AnimatedSingleValueProps<OptionType>>;
+
+export default AnimatedSingleValue;
diff --git a/types/react-select/lib/animated/ValueContainer.d.ts b/types/react-select/lib/animated/ValueContainer.d.ts
new file mode 100644
index 0000000000..6bd15c0c19
--- /dev/null
+++ b/types/react-select/lib/animated/ValueContainer.d.ts
@@ -0,0 +1,9 @@
+import { ComponentType } from 'react';
+import { TransitionGroup } from 'react-transition-group';
+import { ValueContainerProps } from '../components/containers';
+
+export type AnimatedValueContainerProps<OptionType> = ValueContainerProps<OptionType>;
+
+export function AnimatedValueContainer<OptionType>(WrappedComponent: ComponentType<ValueContainerProps<OptionType>>): ComponentType<AnimatedValueContainerProps<OptionType>>;
+
+export default AnimatedValueContainer;
diff --git a/types/react-select/lib/animated/index.d.ts b/types/react-select/lib/animated/index.d.ts
new file mode 100644
index 0000000000..c5180398b8
--- /dev/null
+++ b/types/react-select/lib/animated/index.d.ts
@@ -0,0 +1,17 @@
+import { ComponentType } from 'react';
+import { SelectComponents, SelectComponentsConfig } from '../components/index';
+import { default as AnimatedInput, AnimatedInputProps } from './Input';
+import { default as AnimatedMultiValue, AnimatedMultiValueProps } from './MultiValue';
+import { default as AnimatedPlaceholder, AnimatedPlaceholderProps } from './Placeholder';
+import { default as AnimatedSingleValue, AnimatedSingleValueProps } from './SingleValue';
+import { default as AnimatedValueContainer, AnimatedValueContainerProps } from './ValueContainer';
+
+export function makeAnimated<OptionType>(externalComponents?: SelectComponentsConfig<OptionType>): SelectComponents<OptionType>;
+
+export const Input: ComponentType<AnimatedInputProps>;
+export const MultiValue: ComponentType<AnimatedMultiValueProps<any>>;
+export const Placeholder: ComponentType<AnimatedPlaceholderProps<any>>;
+export const SingleValue: ComponentType<AnimatedSingleValueProps<any>>;
+export const ValueContainer: ComponentType<AnimatedValueContainerProps<any>>;
+
+export default makeAnimated;
diff --git a/types/react-select/lib/animated/transitions.d.ts b/types/react-select/lib/animated/transitions.d.ts
new file mode 100644
index 0000000000..ee2bd3c83b
--- /dev/null
+++ b/types/react-select/lib/animated/transitions.d.ts
@@ -0,0 +1,50 @@
+import * as React from 'react';
+import { Transition } from 'react-transition-group';
+
+export type fn = () => void;
+export interface BaseTransition {
+  /** Whether we are in a transition. */
+  in: boolean;
+  /** Function to be called once transition finishes. */
+  onExited: fn;
+}
+
+// ==============================
+// Fade Transition
+// ==============================
+
+export type FadeProps = BaseTransition & {
+  component: React.ComponentType<any>,
+  duration: number,
+};
+export const Fade: React.ComponentType<FadeProps>;
+
+// ==============================
+// Collapse Transition
+// ==============================
+
+export const collapseDuration: number;
+
+export type TransitionState = 'exiting' | 'exited';
+export type Width = number | 'auto';
+export interface CollapseProps { children: any; in: boolean; }
+export interface CollapseState { width: Width; }
+
+// wrap each MultiValue with a collapse transition; decreases width until
+// finally removing from DOM
+export class Collapse extends React.Component<CollapseProps, CollapseState> {
+  duration: number;
+  transition: {
+    exiting: any,
+    exited: any,
+  };
+
+  // width must be calculated; cannot transition from `undefined` to `number`
+  getWidth: (ref: React.Ref<any>) => void;
+
+  // get base styles
+  getStyle: (width: Width) => any;
+
+  // get transition styles
+  getTransition: (state: TransitionState) => any;
+}
diff --git a/types/react-select/lib/builtins.d.ts b/types/react-select/lib/builtins.d.ts
new file mode 100644
index 0000000000..5d404230cd
--- /dev/null
+++ b/types/react-select/lib/builtins.d.ts
@@ -0,0 +1,10 @@
+import { ReactNode } from 'react';
+import { GroupType } from './types';
+
+export function formatGroupLabel(group: GroupType<any>): ReactNode;
+
+export function getOptionLabel(option: any): string;
+
+export function getOptionValue(option: any): string;
+
+export function isOptionDisabled(option: any): boolean;
diff --git a/types/react-select/lib/components/Control.d.ts b/types/react-select/lib/components/Control.d.ts
new file mode 100644
index 0000000000..8a9513197b
--- /dev/null
+++ b/types/react-select/lib/components/Control.d.ts
@@ -0,0 +1,29 @@
+import { ComponentType, ReactNode, Ref as ElementRef } from 'react';
+
+import { borderRadius, colors, spacing } from '../theme';
+import { CommonProps, PropsWithStyles } from '../types';
+
+interface State {
+  /** Whether the select is disabled. */
+  isDisabled: boolean;
+  /** Whether the select is focused. */
+  isFocused: boolean;
+}
+
+export type ControlProps<OptionType> = CommonProps<OptionType> &
+  PropsWithStyles &
+  State & {
+    /** Children to render. */
+    children: ReactNode,
+    innerRef: ElementRef<any>,
+    /** The mouse down event and the innerRef to pass down to the controller element. */
+    innerProps: {
+      onMouseDown: (event: React.MouseEvent<HTMLElement>) => void,
+    },
+  };
+
+export function css(state: State): React.CSSProperties;
+
+declare const Control: ComponentType<ControlProps<any>>;
+
+export default Control;
diff --git a/types/react-select/lib/components/Group.d.ts b/types/react-select/lib/components/Group.d.ts
new file mode 100644
index 0000000000..39c3489bce
--- /dev/null
+++ b/types/react-select/lib/components/Group.d.ts
@@ -0,0 +1,24 @@
+import { ReactNode, ComponentType } from 'react';
+
+import { spacing } from '../theme';
+import { CommonProps } from '../types';
+
+interface ComponentProps {
+  /** The children to be rendered. */
+  children: ReactNode;
+  /** Component to wrap the label, recieves headingProps. */
+  Heading: ComponentType<any>;
+  /** Label to be displayed in the heading component. */
+  label: ReactNode;
+}
+export type GroupProps<OptionType> = CommonProps<OptionType> & ComponentProps;
+
+export function groupCSS(): React.CSSProperties;
+
+export const Group: ComponentType<GroupProps<any>>;
+
+export function groupHeadingCSS(): React.CSSProperties;
+
+export const GroupHeading: ComponentType<any>;
+
+export default Group;
diff --git a/types/react-select/lib/components/Input.d.ts b/types/react-select/lib/components/Input.d.ts
new file mode 100644
index 0000000000..9f79ffb1e0
--- /dev/null
+++ b/types/react-select/lib/components/Input.d.ts
@@ -0,0 +1,23 @@
+import { ComponentType, Ref as ElementRef } from 'react';
+
+import { colors, spacing } from '../theme';
+
+import { PropsWithStyles, ClassNamesState } from '../types';
+
+export type InputProps = PropsWithStyles & {
+  cx: (a: string | null, b: ClassNamesState, c: string) => string | void,
+  /** Reference to the internal element */
+  innerRef: (element: ElementRef<any>) => void,
+  /** Set whether the input should be visible. Does not affect input size. */
+  isHidden: boolean,
+  /** Whether the input is disabled */
+  isDisabled?: boolean,
+  className?: string,
+};
+
+export function inputCSS(props: InputProps): React.CSSProperties;
+export function inputStyle(isHidden: boolean): React.CSSProperties;
+
+export const Input: ComponentType<InputProps>;
+
+export default Input;
diff --git a/types/react-select/lib/components/Menu.d.ts b/types/react-select/lib/components/Menu.d.ts
new file mode 100644
index 0000000000..387b538882
--- /dev/null
+++ b/types/react-select/lib/components/Menu.d.ts
@@ -0,0 +1,158 @@
+import {
+  Component,
+  ReactElement,
+  Ref as ElementRef,
+  ReactNode,
+  ComponentType
+} from 'react';
+import { createPortal } from 'react-dom';
+
+import {
+  animatedScrollTo,
+  getBoundingClientObj,
+  RectType,
+  getScrollParent,
+  getScrollTop,
+  scrollTo,
+} from '../utils';
+import { borderRadius, colors, spacing } from '../theme';
+import {
+  InnerRef,
+  MenuPlacement,
+  MenuPosition,
+  CommonProps,
+} from '../types';
+
+// ==============================
+// Menu
+// ==============================
+
+// Get Menu Placement
+// ------------------------------
+
+export interface MenuState { placement: 'bottom' | 'top' | null; maxHeight: number; }
+export interface PlacementArgs {
+  maxHeight: number;
+  menuEl: ElementRef<any>;
+  minHeight: number;
+  placement: 'bottom' | 'top' | 'auto';
+  shouldScroll: boolean;
+  isFixedPosition: boolean;
+}
+
+export function getMenuPlacement(args: PlacementArgs): MenuState;
+
+// Menu Component
+// ------------------------------
+
+export type MenuProps<OptionType> = CommonProps<OptionType> & {
+  /** The children to be rendered. */
+  children: ReactElement<any>,
+  /** Callback to update the portal after possible flip. */
+  getPortalPlacement: (state: MenuState) => void,
+  /** Props to be passed to the menu wrapper. */
+  innerProps: object,
+  /** Set the maximum height of the menu. */
+  maxMenuHeight: number,
+  /** Set whether the menu should be at the top, at the bottom. The auto options sets it to bottom. */
+  menuPlacement: MenuPlacement,
+  /* The CSS position value of the menu, when "fixed" extra layout management is required */
+  menuPosition: MenuPosition,
+  /** Set the minimum height of the menu. */
+  minMenuHeight: number,
+  /** Set whether the page should scroll to show the menu. */
+  menuShouldScrollIntoView: boolean,
+};
+
+export function menuCSS(state: MenuState): React.CSSProperties;
+
+export class Menu<OptionType> extends Component<MenuProps<OptionType>, MenuState> {
+  static contextTypes: {
+    getPortalPlacement: (state: MenuState) => void,
+  };
+  getPlacement: (ref: ElementRef<any>) => void;
+  getState: () => MenuProps<OptionType> & MenuState;
+}
+
+export default Menu;
+
+// ==============================
+// Menu List
+// ==============================
+
+interface MenuListState {
+  /** Set classname for isMulti */
+  isMulti: boolean;
+  /* Set the max height of the Menu component  */
+  maxHeight: number;
+}
+
+export interface MenuListProps {
+  /** The children to be rendered. */
+  children: ReactNode;
+  /** Inner ref to DOM Node */
+  innerRef: InnerRef;
+}
+export type MenuListComponentProps<OptionType> = CommonProps<OptionType> &
+  MenuListProps &
+  MenuListState;
+export function menuListCSS(state: MenuState): React.CSSProperties;
+export const MenuList: ComponentType<MenuListComponentProps<any>>;
+
+// ==============================
+// Menu Notices
+// ==============================
+
+export function noOptionsMessageCSS(): React.CSSProperties;
+export function loadingMessageCSS(): React.CSSProperties;
+
+export type NoticeProps<OptionType> = CommonProps<OptionType> & {
+  /** The children to be rendered. */
+  children: ReactNode,
+  /** Props to be passed on to the wrapper. */
+  innerProps: { [key: string]: any },
+};
+
+export const NoOptionsMessage: ComponentType<NoticeProps<any>>;
+// NoOptionsMessage.defaultProps = {
+//   children: 'No options',
+// };
+
+export const LoadingMessage: ComponentType<NoticeProps<any>>;
+// LoadingMessage.defaultProps = {
+//   children: 'Loading...',
+// };
+
+// ==============================
+// Menu Portal
+// ==============================
+
+export type MenuPortalProps<OptionType> = CommonProps<OptionType> & {
+  appendTo: HTMLElement,
+  children: ReactNode, // ideally Menu<MenuProps>
+  controlElement: HTMLElement,
+  menuPlacement: MenuPlacement,
+  menuPosition: MenuPosition,
+};
+interface MenuPortalState {
+  placement: 'bottom' | 'top' | null;
+}
+interface PortalStyleArgs {
+  offset: number;
+  position: MenuPosition;
+  rect: RectType;
+}
+
+export function menuPortalCSS(args: PortalStyleArgs): React.CSSProperties;
+
+export class MenuPortal<OptionType> extends Component<MenuPortalProps<OptionType>, MenuPortalState> {
+  static childContextTypes: {
+    getPortalPlacement: (state: MenuState) => void,
+  };
+  getChildContext(): {
+    getPortalPlacement: (state: MenuState) => void;
+  };
+
+  // callback for occassions where the menu must "flip"
+  getPortalPlacement: (state: MenuState) => void;
+}
diff --git a/types/react-select/lib/components/MultiValue.d.ts b/types/react-select/lib/components/MultiValue.d.ts
new file mode 100644
index 0000000000..59974fbc46
--- /dev/null
+++ b/types/react-select/lib/components/MultiValue.d.ts
@@ -0,0 +1,57 @@
+import { ComponentType, Component, ReactNode } from 'react';
+
+import { borderRadius, colors, spacing } from '../theme';
+import { CommonProps } from '../types';
+
+export type MultiValueProps<OptionType> = CommonProps<OptionType> &{
+  children: ReactNode,
+  components: any,
+  cropWithEllipsis: boolean,
+  data: OptionType,
+  innerProps: any,
+  isFocused: boolean,
+  isDisabled: boolean,
+  removeProps: {
+    onTouchEnd: (event: any) => void,
+    onClick: (event: any) => void,
+    onMouseDown: (event: any) => void,
+  },
+};
+
+export function multiValueCSS(): React.CSSProperties;
+export function multiValueLabelCSS(props: MultiValueProps<any>): React.CSSProperties;
+export function multiValueRemoveCSS(props: MultiValueProps<any>): React.CSSProperties;
+
+export interface MultiValueGenericProps<OptionType> {
+  children: ReactNode;
+  data: OptionType;
+  innerProps: { className?: string };
+  selectProps: any;
+}
+export const MultiValueGeneric: ComponentType<MultiValueGenericProps<any>>;
+
+export const MultiValueContainer: typeof MultiValueGeneric;
+export const MultiValueLabel: typeof MultiValueGeneric;
+export type MultiValueRemoveProps<OptionType> = CommonProps<OptionType> & {
+  children: ReactNode,
+  innerProps: {
+    className: string,
+    onTouchEnd: (event: any) => void,
+    onClick: (event: any) => void,
+    onMouseDown: (event: any) => void,
+  },
+  selectProps: any,
+};
+export class MultiValueRemove<OptionType> extends Component<MultiValueRemoveProps<OptionType>> {
+  static defaultProps: {
+    children: ReactNode,
+  };
+}
+
+export class MultiValue<OptionType> extends Component<MultiValueProps<OptionType>> {
+  static defaultProps: {
+    cropWithEllipsis: boolean,
+  };
+}
+
+export default MultiValue;
diff --git a/types/react-select/lib/components/Option.d.ts b/types/react-select/lib/components/Option.d.ts
new file mode 100644
index 0000000000..defe37711a
--- /dev/null
+++ b/types/react-select/lib/components/Option.d.ts
@@ -0,0 +1,41 @@
+import { ComponentType, ReactNode, MouseEventHandler } from 'react';
+
+import { colors, spacing } from '../theme';
+import { CommonProps, PropsWithStyles, InnerRef } from '../types';
+
+interface State {
+  /** Wether the option is disabled. */
+  isDisabled: boolean;
+  /** Wether the option is focused. */
+  isFocused: boolean;
+  /** Whether the option is selected. */
+  isSelected: boolean;
+}
+interface InnerProps {
+  id: string;
+  key: string;
+  onClick: MouseEventHandler;
+  onMouseOver: MouseEventHandler;
+  tabIndex: number;
+}
+export type OptionProps<OptionType> = PropsWithStyles &
+  CommonProps<OptionType> &
+  State & {
+    /** The children to be rendered. */
+    children: ReactNode,
+    /** Inner ref to DOM Node */
+    innerRef: InnerRef,
+    /** props passed to the wrapping element for the group. */
+    innerProps: InnerProps,
+    /* Text to be displayed representing the option. */
+    label: string,
+    /* Type is used by the menu to determine whether this is an option or a group.
+    In the case of option this is always `option`. */
+    type: 'option',
+  };
+
+export function optionCSS(state: State): React.CSSProperties;
+
+export const Option: ComponentType<OptionProps<any>>;
+
+export default Option;
diff --git a/types/react-select/lib/components/Placeholder.d.ts b/types/react-select/lib/components/Placeholder.d.ts
new file mode 100644
index 0000000000..1a72bd69a7
--- /dev/null
+++ b/types/react-select/lib/components/Placeholder.d.ts
@@ -0,0 +1,17 @@
+import { ComponentType, ReactNode } from 'react';
+
+import { colors, spacing } from '../theme';
+import { CommonProps } from '../types';
+
+export type PlaceholderProps<OptionType> = CommonProps<OptionType> & {
+  /** The children to be rendered. */
+  children: ReactNode,
+  /** props passed to the wrapping element for the group. */
+  innerProps: { [key: string]: any },
+};
+
+export function placeholderCSS(): React.CSSProperties;
+
+export const Placeholder: ComponentType<PlaceholderProps<any>>;
+
+export default Placeholder;
diff --git a/types/react-select/lib/components/SingleValue.d.ts b/types/react-select/lib/components/SingleValue.d.ts
new file mode 100644
index 0000000000..c727b2242e
--- /dev/null
+++ b/types/react-select/lib/components/SingleValue.d.ts
@@ -0,0 +1,23 @@
+import { ComponentType } from 'react';
+import { colors, spacing } from '../theme';
+import { CommonProps } from '../types';
+
+interface State {
+  /** Whether this is disabled */
+  isDisabled: boolean;
+}
+interface ValueProps<OptionType> {
+  /** The children to be rendered. */
+  children: string;
+  /* The data of the selected option rendered in the Single Value componentn */
+  data: OptionType;
+  /** Props passed to the wrapping element for the group. */
+  innerProps: any;
+}
+export type SingleValueProps<OptionType> = CommonProps<OptionType> & ValueProps<OptionType> & State;
+
+export function css(props: SingleValueProps<any>): React.CSSProperties;
+
+export const SingleValue: ComponentType<SingleValueProps<any>>;
+
+export default SingleValue;
diff --git a/types/react-select/lib/components/containers.d.ts b/types/react-select/lib/components/containers.d.ts
new file mode 100644
index 0000000000..c72609bf31
--- /dev/null
+++ b/types/react-select/lib/components/containers.d.ts
@@ -0,0 +1,57 @@
+import { Component, ReactNode, ComponentType } from 'react';
+import { spacing } from '../theme';
+import { CommonProps, KeyboardEventHandler } from '../types';
+
+// ==============================
+// Root Container
+// ==============================
+
+export interface ContainerState {
+  /** Whether the select is disabled. */
+  isDisabled: boolean;
+  /** Whether the text in the select is indented from right to left. */
+  isRtl: boolean;
+}
+
+export type ContainerProps<OptionType> = CommonProps<OptionType> &
+  ContainerState & {
+    /** The children to be rendered. */
+    children: ReactNode,
+    /** Inner props to be passed down to the container. */
+    innerProps: { onKeyDown: KeyboardEventHandler },
+  };
+export function containerCSS(state: ContainerState): React.CSSProperties;
+export const SelectContainer: ComponentType<ContainerProps<any>>;
+
+// ==============================
+// Value Container
+// ==============================
+
+export type ValueContainerProps<OptionType> = CommonProps<OptionType> & {
+  /** Set when the value container should hold multiple values */
+  isMulti: boolean,
+  /** Whether the value container currently holds a value. */
+  hasValue: boolean,
+  /** The children to be rendered. */
+  children: ReactNode,
+};
+export function valueContainerCSS(): React.CSSProperties;
+export class ValueContainer extends Component<ValueContainerProps<any>> {}
+
+// ==============================
+// Indicator Container
+// ==============================
+
+export interface IndicatorsState {
+  /** Whether the text should be rendered right to left. */
+  isRtl: boolean;
+}
+
+export type IndicatorContainerProps<OptionType> = CommonProps<OptionType> &
+  IndicatorsState & {
+    /** The children to be rendered. */
+    children: ReactNode,
+  };
+
+export function indicatorsContainerCSS(): React.CSSProperties;
+export const IndicatorsContainer: ComponentType<IndicatorContainerProps<any>>;
diff --git a/types/react-select/lib/components/index.d.ts b/types/react-select/lib/components/index.d.ts
new file mode 100644
index 0000000000..1436336d26
--- /dev/null
+++ b/types/react-select/lib/components/index.d.ts
@@ -0,0 +1,90 @@
+import {
+  ComponentType,
+  ReactElement as Element,
+} from 'react';
+import {
+  IndicatorContainerProps,
+  ContainerProps,
+  ValueContainerProps,
+  IndicatorsContainer,
+  SelectContainer,
+  ValueContainer,
+} from './containers';
+import {
+  IndicatorProps,
+  LoadingIconProps,
+  ClearIndicator,
+  DropdownIndicator,
+  LoadingIndicator,
+  IndicatorSeparator,
+  DownChevron,
+  CrossIcon,
+} from './indicators';
+
+import Control, { ControlProps } from './Control';
+import Group, { GroupProps, GroupHeading } from './Group';
+import Input, { InputProps } from './Input';
+import Menu, {
+  MenuProps,
+  MenuList,
+  MenuListComponentProps,
+  MenuPortal,
+  MenuPortalProps,
+  NoticeProps,
+  NoOptionsMessage,
+  LoadingMessage,
+} from './Menu';
+import MultiValue, {
+  MultiValueProps,
+  MultiValueContainer,
+  MultiValueLabel,
+  MultiValueRemove,
+} from './MultiValue';
+import Option, { OptionProps } from './Option';
+import Placeholder, { PlaceholderProps } from './Placeholder';
+import SingleValue, { SingleValueProps } from './SingleValue';
+
+export type PlaceholderOrValue<OptionType> =
+  | Element<ComponentType<PlaceholderProps<OptionType>>>
+  | Element<ComponentType<SingleValueProps<OptionType>>>
+  | Array<Element<ComponentType<MultiValueProps<OptionType>>>>;
+
+export type IndicatorComponentType<OptionType> = ComponentType<IndicatorProps<OptionType>>;
+
+export interface SelectComponents<OptionType> {
+  ClearIndicator: IndicatorComponentType<OptionType> | null;
+  Control: ComponentType<ControlProps<OptionType>>;
+  DropdownIndicator: IndicatorComponentType<OptionType> | null;
+  DownChevron: ComponentType<any>;
+  CrossIcon: ComponentType<any>;
+  Group: ComponentType<GroupProps<OptionType>>;
+  GroupHeading: ComponentType<any>;
+  IndicatorsContainer: ComponentType<IndicatorContainerProps<OptionType>>;
+  IndicatorSeparator: IndicatorComponentType<OptionType> | null;
+  Input: ComponentType<InputProps>;
+  LoadingIndicator: ComponentType<LoadingIconProps<OptionType>> | null;
+  Menu: ComponentType<MenuProps<OptionType>>;
+  MenuList: ComponentType<MenuListComponentProps<OptionType>>;
+  MenuPortal: ComponentType<MenuPortalProps<OptionType>>;
+  LoadingMessage: ComponentType<NoticeProps<OptionType>>;
+  NoOptionsMessage: ComponentType<NoticeProps<OptionType>>;
+  MultiValue: ComponentType<MultiValueProps<OptionType>>;
+  MultiValueContainer: ComponentType<any>;
+  MultiValueLabel: ComponentType<any>;
+  MultiValueRemove: ComponentType<any>;
+  Option: ComponentType<OptionProps<OptionType>>;
+  Placeholder: ComponentType<PlaceholderProps<OptionType>>;
+  SelectContainer: ComponentType<ContainerProps<OptionType>>;
+  SingleValue: ComponentType<SingleValueProps<OptionType>>;
+  ValueContainer: ComponentType<ValueContainerProps<OptionType>>;
+}
+
+export type SelectComponentsConfig<OptionType> = Partial<SelectComponents<OptionType>>;
+
+export const components: Required<SelectComponents<any>>;
+
+export interface Props<OptionType> {
+  components: SelectComponentsConfig<OptionType>;
+}
+
+export function defaultComponents<OptionType>(props: Props<OptionType>): SelectComponents<OptionType>;
diff --git a/types/react-select/lib/components/indicators.d.ts b/types/react-select/lib/components/indicators.d.ts
new file mode 100644
index 0000000000..15df6d3748
--- /dev/null
+++ b/types/react-select/lib/components/indicators.d.ts
@@ -0,0 +1,67 @@
+import { ComponentType, ReactElement as ElementType } from 'react';
+
+import { colors, spacing } from '../theme';
+import { CommonProps } from '../types';
+
+// ==============================
+// Dropdown & Clear Icons
+// ==============================
+
+export function CrossIcon(props: any): any; // TODO svg type
+export function DownChevron(props: any): any; // TODO svg type
+
+// ==============================
+// Dropdown & Clear Buttons
+// ==============================
+
+export type IndicatorProps<OptionType> = CommonProps<OptionType> & {
+  /** The children to be rendered inside the indicator. */
+  children: ElementType<any>,
+  /** Props that will be passed on to the children. */
+  innerProps: any,
+  /** The focused state of the select. */
+  isFocused: boolean,
+  /** Whether the text is right to left */
+  isRtl: boolean,
+};
+
+export type baseCSS = (props: IndicatorProps<any>) => React.CSSProperties;
+
+export const dropdownIndicatorCSS: baseCSS;
+export const DropdownIndicator: ComponentType<IndicatorProps<any>>;
+
+export const clearIndicatorCSS: baseCSS;
+export const ClearIndicator: ComponentType<IndicatorProps<any>>;
+
+// ==============================
+// Separator
+// ==============================
+
+export interface SeparatorState { isDisabled: boolean; }
+
+export function indicatorSeparatorCSS(state: SeparatorState): React.CSSProperties;
+
+export const IndicatorSeparator: ComponentType<IndicatorProps<any>>;
+
+// ==============================
+// Loading
+// ==============================
+
+export function loadingIndicatorCSS(state: {
+  isFocused: boolean,
+  size: number,
+}): React.CSSProperties;
+
+export type LoadingIconProps<OptionType> = {
+  /** Props that will be passed on to the children. */
+  innerProps: any,
+  /** The focused state of the select. */
+  isFocused: boolean,
+  /** Whether the text is right to left */
+  isRtl: boolean,
+} & CommonProps<OptionType> & {
+  /** Set size of the container. */
+  size: number,
+};
+export const LoadingIndicator: ComponentType<LoadingIconProps<any>>;
+// TODO LoadingIndicator.defaultProps: { size: number };
diff --git a/types/react-select/lib/diacritics.d.ts b/types/react-select/lib/diacritics.d.ts
new file mode 100644
index 0000000000..855a0e152a
--- /dev/null
+++ b/types/react-select/lib/diacritics.d.ts
@@ -0,0 +1 @@
+export function stripDiacritics(str: string): string;
diff --git a/types/react-select/lib/filters.d.ts b/types/react-select/lib/filters.d.ts
new file mode 100644
index 0000000000..33d1a7fddf
--- /dev/null
+++ b/types/react-select/lib/filters.d.ts
@@ -0,0 +1,16 @@
+export interface Config {
+  ignoreCase?: boolean;
+  ignoreAccents?: boolean;
+  stringify?: (obj: any) => string;
+  trim?: boolean;
+  matchFrom?: 'any' | 'start';
+}
+
+import { stripDiacritics } from './diacritics';
+
+export interface Option { label: string; value: string; data: any; }
+
+export function createFilter(config: Config | null): (
+  option: Option,
+  rawInput: string
+) => boolean;
diff --git a/types/react-select/lib/stateManager.d.ts b/types/react-select/lib/stateManager.d.ts
new file mode 100644
index 0000000000..07a17f52f7
--- /dev/null
+++ b/types/react-select/lib/stateManager.d.ts
@@ -0,0 +1,36 @@
+import { Component, ComponentType, Ref as ElementRef } from 'react';
+
+import { ActionMeta, InputActionMeta, ValueType } from './types';
+
+export interface Props<OptionType> {
+  defaultInputValue?: string;
+  defaultMenuIsOpen?: boolean;
+  defaultValue?: ValueType<OptionType>;
+  inputValue?: string;
+  menuIsOpen?: boolean;
+  value?: ValueType<OptionType>;
+}
+interface State<OptionType> {
+  inputValue: string;
+  menuIsOpen: boolean;
+  value: ValueType<OptionType>;
+}
+
+export class StateManager<OptionType> extends Component<Props<OptionType>, State<OptionType>> {
+  static defaultProps: Props<any>;
+
+  select: ElementRef<any>;
+
+  focus(): void;
+  blur(): void;
+  getProp(key: string): any;
+  callProp(name: string, ...args: any[]): any;
+  onChange: (value: any, actionMeta: ActionMeta) => void;
+  onInputChange: (value: any, actionMeta: InputActionMeta) => void;
+  onMenuOpen: () => void;
+  onMenuClose: () => void;
+}
+
+export function manageState(SelectComponent: ComponentType<any>): StateManager<any>;
+
+export default manageState;
diff --git a/types/react-select/lib/styles.d.ts b/types/react-select/lib/styles.d.ts
new file mode 100644
index 0000000000..e9c63d07b8
--- /dev/null
+++ b/types/react-select/lib/styles.d.ts
@@ -0,0 +1,75 @@
+import {
+  containerCSS,
+  indicatorsContainerCSS,
+  valueContainerCSS,
+} from './components/containers';
+import { css as controlCSS } from './components/Control';
+import { groupCSS, groupHeadingCSS } from './components/Group';
+import {
+  clearIndicatorCSS,
+  dropdownIndicatorCSS,
+  loadingIndicatorCSS,
+  indicatorSeparatorCSS,
+} from './components/indicators';
+import { inputCSS } from './components/Input';
+import { placeholderCSS } from './components/Placeholder';
+import { optionCSS } from './components/Option';
+import {
+  menuCSS,
+  menuListCSS,
+  menuPortalCSS,
+  noOptionsMessageCSS,
+  loadingMessageCSS,
+} from './components/Menu';
+import { css as singleValueCSS } from './components/SingleValue';
+import {
+  multiValueCSS,
+  multiValueLabelCSS,
+  multiValueRemoveCSS,
+} from './components/MultiValue';
+import { CSSProperties } from 'react';
+
+export interface Props { [key: string]: any; }
+
+/**
+ * @param base -- the component's default style
+ * @param state -- the component's current state e.g. `isFocused`
+ * @returns
+ */
+export type styleFn = (base: CSSProperties, state: any) => CSSProperties;
+
+export interface Styles {
+  clearIndicator?: styleFn;
+  container?: styleFn;
+  control?: styleFn;
+  dropdownIndicator?: styleFn;
+  group?: styleFn;
+  groupHeading?: styleFn;
+  indicatorsContainer?: styleFn;
+  indicatorSeparator?: styleFn;
+  input?: styleFn;
+  loadingIndicator?: styleFn;
+  // TODO loadingMessageCSS?: styleFn;
+  loadingMessage?: styleFn;
+  menu?: styleFn;
+  menuList?: styleFn;
+  menuPortal?: styleFn;
+  multiValue?: styleFn;
+  multiValueLabel?: styleFn;
+  multiValueRemove?: styleFn;
+  // TODO noOptionsMessageCSS?: styleFn;
+  noOptionsMessage?: styleFn;
+  option?: styleFn;
+  placeholder?: styleFn;
+  singleValue?: styleFn;
+  valueContainer: styleFn;
+}
+export type StylesConfig = Partial<Styles>;
+export type GetStyles = (a: string, b: Props) => CSSProperties;
+
+export const defaultStyles: Styles;
+
+// Merge Utility
+// Allows consumers to extend a base Select with additional styles
+
+export function mergeStyles(source: any, target: any): CSSProperties;
diff --git a/types/react-select/lib/theme.d.ts b/types/react-select/lib/theme.d.ts
new file mode 100644
index 0000000000..7282dd20ad
--- /dev/null
+++ b/types/react-select/lib/theme.d.ts
@@ -0,0 +1,53 @@
+export const borderRadius: number;
+
+export const colors: {
+  text: string;
+  textLight: string;
+  primary: string;
+  primary75: string;
+  primary50: string;
+  primary25: string;
+  danger: string;
+  dangerLight: string;
+
+  neutral0: string;
+  neutral1: string;
+  neutral2: string;
+  neutral3: string;
+  neutral4: string;
+  neutral5: string;
+  neutral10: string;
+  neutral20: string;
+  neutral30: string;
+  neutral40: string;
+  neutral50: string;
+  neutral60: string;
+  neutral70: string;
+  neutral80: string;
+  neutral90: string;
+  neutral100: string;
+
+  neutral1a: string;
+  neutral2a: string;
+  neutral3a: string;
+  neutral4a: string;
+  neutral5a: string;
+  neutral10a: string;
+  neutral20a: string;
+  neutral30a: string;
+  neutral40a: string;
+  neutral50a: string;
+  neutral60a: string;
+  neutral70a: string;
+  neutral80a: string;
+  neutral90a: string;
+};
+
+export const spacing: {
+  /* Used to calculate consistent margin/padding on elements */
+  baseUnit: number,
+  /* The minimum height of the control */
+  controlHeight: number,
+  /* The amount of space between the control and menu */
+  menuGutter: number,
+};
diff --git a/types/react-select/lib/types.d.ts b/types/react-select/lib/types.d.ts
new file mode 100644
index 0000000000..08ebfae965
--- /dev/null
+++ b/types/react-select/lib/types.d.ts
@@ -0,0 +1,100 @@
+import * as React from 'react';
+
+export type OptionsType<OptionType> = OptionType[];
+
+export interface GroupType<OptionType> {
+  options: OptionsType<OptionType>;
+  [key: string]: any;
+}
+
+export type GroupedOptionsType<UnionOptionType> = Array<GroupType<UnionOptionType>>;
+
+export type ValueType<OptionType> = OptionType | OptionsType<OptionType> | null | undefined;
+
+export type FocusEventHandler = (event: React.FocusEvent<HTMLElement>) => void;
+export type MouseEventHandler = (event: React.MouseEvent<HTMLElement>) => void;
+export type KeyboardEventHandler = (event: React.KeyboardEvent<HTMLElement>) => void;
+
+export type InnerRef = React.Ref<any>;
+export interface PropsWithInnerRef {
+  /** The inner reference. */
+  innerRef: React.Ref<any>;
+}
+
+export interface PropsWithStyles {
+  /*
+    Get the styles of a particular part of the select. Pass in the name of the
+    property as the first argument, and the current props as the second argument.
+    See the `styles` object for the properties available.
+  */
+  getStyles: (name: string, props: any) => {};
+}
+
+export type ClassNameList = string[];
+export type ClassNamesState = { [key: string]: boolean } | undefined;
+
+export interface CommonProps<OptionType> {
+  clearValue: () => void;
+  className?: string;
+  cx: (a: string | null, b: ClassNamesState | undefined, c: string | undefined) => string | void;
+  /*
+    Get the styles of a particular part of the select. Pass in the name of the
+    property as the first argument, and the current props as the second argument.
+    See the `styles` object for the properties available.
+  */
+  getStyles: (name: string, props: any) => {};
+  getValue: () => ValueType<OptionType>;
+  hasValue: boolean;
+  isMulti: boolean;
+  options: OptionsType<OptionType>;
+  selectOption: (option: OptionType) => void;
+  selectProps: any;
+  setValue: (value: ValueType<OptionType>, action: ActionTypes) => void;
+}
+
+export type ActionTypes =
+  | 'select-option'
+  | 'deselect-option'
+  | 'remove-value'
+  | 'pop-value'
+  | 'set-value'
+  | 'clear'
+  | 'create-option';
+
+export interface ActionMeta {
+  action: ActionTypes;
+}
+
+export type InputActionTypes =
+  | 'set-value'
+  | 'input-change'
+  | 'input-blur'
+  | 'menu-close';
+
+export interface InputActionMeta {
+  action: InputActionTypes;
+}
+
+export type MenuPlacement = 'auto' | 'bottom' | 'top';
+export type MenuPosition = 'absolute' | 'fixed';
+
+export type FocusDirection =
+  | 'up'
+  | 'down'
+  | 'pageup'
+  | 'pagedown'
+  | 'first'
+  | 'last';
+
+export type OptionProps = PropsWithInnerRef & {
+  data: any,
+  id: number,
+  index: number,
+  isDisabled: boolean,
+  isFocused: boolean,
+  isSelected: boolean,
+  label: string,
+  onClick: MouseEventHandler,
+  onMouseOver: MouseEventHandler,
+  value: any,
+};
diff --git a/types/react-select/lib/utils.d.ts b/types/react-select/lib/utils.d.ts
new file mode 100644
index 0000000000..c907d59c2a
--- /dev/null
+++ b/types/react-select/lib/utils.d.ts
@@ -0,0 +1,121 @@
+import * as React from 'react';
+import {
+  ClassNamesState,
+  InputActionMeta,
+  OptionsType,
+  ValueType,
+} from './types';
+
+// ==============================
+// NO OP
+// ==============================
+
+export function noop(): void;
+export function emptyString(): string;
+
+// ==============================
+// Class Name Prefixer
+// ==============================
+
+export function classNames(
+  prefix?: string | null,
+  cssKey?: string | null,
+  state?: ClassNamesState,
+  className?: string,
+): string;
+
+// ==============================
+// Clean Value
+// ==============================
+
+export function cleanValue<OptionType>(value: ValueType<OptionType>): OptionsType<OptionType>;
+
+// ==============================
+// Handle Input Change
+// ==============================
+
+export function handleInputChange(
+  inputValue: string,
+  actionMeta: InputActionMeta,
+  onInputChange?: (inputValue: string, actionMeta: InputActionMeta) => string | void
+): string;
+
+// ==============================
+// Scroll Helpers
+// ==============================
+
+export function isDocumentElement(el: Element): boolean;
+
+// Normalized Scroll Top
+// ------------------------------
+
+export function normalizedHeight(el: Element): number;
+
+// Normalized scrollTo & scrollTop
+// ------------------------------
+
+export function getScrollTop(el: Element): number;
+
+export function scrollTo(el: Element, top: number): void;
+
+// Get Scroll Parent
+// ------------------------------
+
+export function getScrollParent(element: React.Ref<any>): Element;
+
+// Animated Scroll To
+// ------------------------------
+
+export function animatedScrollTo(
+  element: Element,
+  to: number,
+  duration: number,
+  callback: (element: Element) => void
+): void;
+
+// Scroll Into View
+// ------------------------------
+
+export function scrollIntoView(
+  menuEl: HTMLElement,
+  focusedEl: HTMLElement
+): void;
+
+// ==============================
+// Get bounding client object
+// ==============================
+
+// cannot get keys using array notation with DOMRect
+export function getBoundingClientObj(element: HTMLElement): {
+  bottom: number;
+  height: number;
+  left: number;
+  right: number;
+  top: number;
+  width: number;
+};
+export interface RectType {
+  left: number;
+  right: number;
+  bottom: number;
+  height: number;
+  width: number;
+}
+
+// ==============================
+// String to Key (kebabify)
+// ==============================
+
+export function toKey(str: string): string;
+
+// ==============================
+// Touch Capability Detector
+// ==============================
+
+export function isTouchCapable(): boolean;
+
+// ==============================
+// Mobile Device Detector
+// ==============================
+
+export function isMobileDevice(): boolean;
diff --git a/types/react-select/test/AtlaskitDummy.ts b/types/react-select/test/AtlaskitDummy.ts
new file mode 100644
index 0000000000..e6e75e9e32
--- /dev/null
+++ b/types/react-select/test/AtlaskitDummy.ts
@@ -0,0 +1,11 @@
+export const Tooltip = (props: any) => null;
+
+export const EmojiIcon = (props: any) => null;
+
+export const EditorPanelIcon = (props: any) => null;
+
+export const Spinner = (props: any) => null;
+
+export const Button = (props: any) => null;
+
+export const Modal = (props: any) => null;
diff --git a/types/react-select/test/ChronoNodeDummy.ts b/types/react-select/test/ChronoNodeDummy.ts
new file mode 100644
index 0000000000..1e4aed01b0
--- /dev/null
+++ b/types/react-select/test/ChronoNodeDummy.ts
@@ -0,0 +1 @@
+export function parseDate(a: any): any {}
diff --git a/types/react-select/test/data.ts b/types/react-select/test/data.ts
new file mode 100644
index 0000000000..a4bff0225d
--- /dev/null
+++ b/types/react-select/test/data.ts
@@ -0,0 +1,132 @@
+import { GroupedOptionsType, GroupType } from "react-select/lib/types";
+
+export interface ColourOption {
+    value: string;
+    label: string;
+    color: string;
+    disabled?: boolean;
+}
+
+export const colourOptions: ColourOption[] = [
+  { value: 'ocean', label: 'Ocean', color: '#00B8D9' },
+  { value: 'blue', label: 'Blue', color: '#0052CC', disabled: true },
+  { value: 'purple', label: 'Purple', color: '#5243AA' },
+  { value: 'red', label: 'Red', color: '#FF5630' },
+  { value: 'orange', label: 'Orange', color: '#FF8B00' },
+  { value: 'yellow', label: 'Yellow', color: '#FFC400' },
+  { value: 'green', label: 'Green', color: '#36B37E' },
+  { value: 'forest', label: 'Forest', color: '#00875A' },
+  { value: 'slate', label: 'Slate', color: '#253858' },
+  { value: 'silver', label: 'Silver', color: '#666666' },
+];
+
+export interface FlavourOption {
+    value: string;
+    label: string;
+    rating: 'safe' | 'good' | 'wild' | 'crazy';
+}
+
+export const flavourOptions: FlavourOption[] = [
+  { value: 'vanilla', label: 'Vanilla', rating: 'safe' },
+  { value: 'chocolate', label: 'Chocolate', rating: 'good' },
+  { value: 'strawberry', label: 'Strawberry', rating: 'wild' },
+  { value: 'salted-caramel', label: 'Salted Caramel', rating: 'crazy' },
+];
+
+export interface StateOption {
+    value: string;
+    label: string;
+}
+
+export const stateOptions: StateOption[] = [
+  { value: 'AL', label: 'Alabama' },
+  { value: 'AK', label: 'Alaska' },
+  { value: 'AS', label: 'American Samoa' },
+  { value: 'AZ', label: 'Arizona' },
+  { value: 'AR', label: 'Arkansas' },
+  { value: 'CA', label: 'California' },
+  { value: 'CO', label: 'Colorado' },
+  { value: 'CT', label: 'Connecticut' },
+  { value: 'DE', label: 'Delaware' },
+  { value: 'DC', label: 'District Of Columbia' },
+  { value: 'FM', label: 'Federated States Of Micronesia' },
+  { value: 'FL', label: 'Florida' },
+  { value: 'GA', label: 'Georgia' },
+  { value: 'GU', label: 'Guam' },
+  { value: 'HI', label: 'Hawaii' },
+  { value: 'ID', label: 'Idaho' },
+  { value: 'IL', label: 'Illinois' },
+  { value: 'IN', label: 'Indiana' },
+  { value: 'IA', label: 'Iowa' },
+  { value: 'KS', label: 'Kansas' },
+  { value: 'KY', label: 'Kentucky' },
+  { value: 'LA', label: 'Louisiana' },
+  { value: 'ME', label: 'Maine' },
+  { value: 'MH', label: 'Marshall Islands' },
+  { value: 'MD', label: 'Maryland' },
+  { value: 'MA', label: 'Massachusetts' },
+  { value: 'MI', label: 'Michigan' },
+  { value: 'MN', label: 'Minnesota' },
+  { value: 'MS', label: 'Mississippi' },
+  { value: 'MO', label: 'Missouri' },
+  { value: 'MT', label: 'Montana' },
+  { value: 'NE', label: 'Nebraska' },
+  { value: 'NV', label: 'Nevada' },
+  { value: 'NH', label: 'New Hampshire' },
+  { value: 'NJ', label: 'New Jersey' },
+  { value: 'NM', label: 'New Mexico' },
+  { value: 'NY', label: 'New York' },
+  { value: 'NC', label: 'North Carolina' },
+  { value: 'ND', label: 'North Dakota' },
+  { value: 'MP', label: 'Northern Mariana Islands' },
+  { value: 'OH', label: 'Ohio' },
+  { value: 'OK', label: 'Oklahoma' },
+  { value: 'OR', label: 'Oregon' },
+  { value: 'PW', label: 'Palau' },
+  { value: 'PA', label: 'Pennsylvania' },
+  { value: 'PR', label: 'Puerto Rico' },
+  { value: 'RI', label: 'Rhode Island' },
+  { value: 'SC', label: 'South Carolina' },
+  { value: 'SD', label: 'South Dakota' },
+  { value: 'TN', label: 'Tennessee' },
+  { value: 'TX', label: 'Texas' },
+  { value: 'UT', label: 'Utah' },
+  { value: 'VT', label: 'Vermont' },
+  { value: 'VI', label: 'Virgin Islands' },
+  { value: 'VA', label: 'Virginia' },
+  { value: 'WA', label: 'Washington' },
+  { value: 'WV', label: 'West Virginia' },
+  { value: 'WI', label: 'Wisconsin' },
+  { value: 'WY', label: 'Wyoming' },
+];
+
+export const optionLength = [
+  { value: 1, label: 'general' },
+  {
+    value: 2,
+    label:
+      'Evil is the moment when I lack the strength to be true to the Good that compels me.',
+  },
+  {
+    value: 3,
+    label:
+      // tslint:disable-next-line:max-line-length
+      "It is now an easy matter to spell out the ethic of a truth: 'Do all that you can to persevere in that which exceeds your perseverance. Persevere in the interruption. Seize in your being that which has seized and broken you.",
+  },
+];
+
+// let bigOptions = [];
+// for (let i = 0; i < 10000; i++) {
+// 	bigOptions = bigOptions.concat(colourOptions);
+// }
+
+const colourGroup: GroupType<ColourOption> = {
+    label: 'Colours',
+    options: colourOptions
+};
+const flavourGroup: GroupType<FlavourOption> = {
+    label: 'Flavours',
+    options: flavourOptions,
+};
+
+export const groupedOptions: GroupedOptionsType<ColourOption | FlavourOption> = [ colourGroup, flavourGroup ];
diff --git a/types/react-select/test/examples/AccessingInternals.tsx b/types/react-select/test/examples/AccessingInternals.tsx
new file mode 100644
index 0000000000..8948bc19e7
--- /dev/null
+++ b/types/react-select/test/examples/AccessingInternals.tsx
@@ -0,0 +1,114 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import AsyncSelect from 'react-select/lib/Async';
+import CreatableSelect from 'react-select/lib/Creatable';
+import { Note } from '../styled-components';
+import { ColourOption, colourOptions } from '../data';
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const promiseOptions = (inputValue: string) =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve(filterColors(inputValue));
+    }, 1000);
+  });
+
+export default class AccessingInterals extends React.Component {
+  selectRef: Select<ColourOption>;
+  asyncRef: AsyncSelect<ColourOption>;
+  creatableRef: CreatableSelect<ColourOption>;
+  focus = () => {
+    console.log(this.selectRef);
+    this.selectRef.focus();
+  }
+  focusCreatable = () => {
+    console.log(this.creatableRef);
+    this.creatableRef.focus();
+  }
+  focusAsync = () => {
+    console.log(this.asyncRef);
+    this.asyncRef.focus();
+  }
+  blurAsync = () => {
+    this.asyncRef.blur();
+  }
+  blurCreatable = () => {
+    this.creatableRef.blur();
+  }
+  blur = () => this.selectRef.blur();
+  onSelectRef = (ref: any) => {
+    console.log(ref);
+    this.selectRef = ref;
+  }
+  render() {
+    return (
+      <React.Fragment>
+        <h4>
+          Creatable Select
+        </h4>
+        <CreatableSelect
+          ref={ (ref: any) => { this.creatableRef = ref; }}
+          isClearable
+          options={colourOptions}
+        />
+        <Note Tag="label">
+          <button
+            onClick={this.focusCreatable}
+            id="cypress-single__clearable-checkbox"
+          >Focus</button>
+        </Note>
+        <Note Tag="label">
+          <button
+            onClick={this.blurCreatable}
+            id="cypress-single__clearable-checkbox"
+          >Blur</button>
+        </Note>
+        <h4>
+          Async Select
+        </h4>
+        <AsyncSelect
+          ref={ (ref: any) => { this.asyncRef = ref; }}
+          cacheOptions
+          defaultOptions
+          loadOptions={promiseOptions}
+        />
+        <Note Tag="label">
+          <button
+            onClick={this.focusAsync}
+            id="cypress-single__clearable-checkbox"
+          >Focus</button>
+        </Note>
+        <Note Tag="label">
+          <button
+            onClick={this.blurAsync}
+            id="cypress-single__clearable-checkbox"
+          >Blur</button>
+        </Note>
+        <h4>Select</h4>
+        <Select
+          ref={(ref: any) => { this.selectRef = ref; }}
+          defaultValue={colourOptions[2]}
+          name="colors"
+          options={colourOptions}
+        />
+        <Note Tag="label">
+          <button
+            onClick={this.focus}
+            id="cypress-single__clearable-checkbox"
+          >Focus</button>
+        </Note>
+        <Note Tag="label">
+          <button
+            onClick={this.blur}
+            id="cypress-single__clearable-checkbox"
+          >Blur</button>
+        </Note>
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/AnimatedMulti.tsx b/types/react-select/test/examples/AnimatedMulti.tsx
new file mode 100644
index 0000000000..de334b18ae
--- /dev/null
+++ b/types/react-select/test/examples/AnimatedMulti.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import makeAnimated from 'react-select/lib/animated';
+import { ColourOption, colourOptions } from '../data';
+
+export default function AnimatedMulti() {
+  return (
+    <Select<ColourOption>
+      closeMenuOnSelect={false}
+      components={makeAnimated()}
+      defaultValue={[colourOptions[4], colourOptions[5]]}
+      isMulti
+      options={colourOptions}
+    />
+  );
+}
diff --git a/types/react-select/test/examples/AsyncCallbacks.tsx b/types/react-select/test/examples/AsyncCallbacks.tsx
new file mode 100644
index 0000000000..97c50de7fc
--- /dev/null
+++ b/types/react-select/test/examples/AsyncCallbacks.tsx
@@ -0,0 +1,42 @@
+import * as React from 'react';
+
+import AsyncSelect from 'react-select/lib/Async';
+import { colourOptions } from '../data';
+import { OptionsType } from 'react-select/lib/types';
+
+interface State {
+  inputValue: string;
+}
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const loadOptions = (inputValue: string, callback: (c: OptionsType<any>) => void) => {
+  setTimeout(() => {
+    callback(filterColors(inputValue));
+  }, 1000);
+};
+
+export default class WithCallbacks extends React.Component<any, State> {
+  state = { inputValue: '' };
+  handleInputChange = (newValue: string) => {
+    const inputValue = newValue.replace(/\W/g, '');
+    this.setState({ inputValue });
+    return inputValue;
+  }
+  render() {
+    return (
+      <div>
+        <pre>inputValue: "{this.state.inputValue}"</pre>
+        <AsyncSelect
+          cacheOptions
+          loadOptions={loadOptions}
+          defaultOptions
+          onInputChange={this.handleInputChange}
+        />
+      </div>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/AsyncCreatable.tsx b/types/react-select/test/examples/AsyncCreatable.tsx
new file mode 100644
index 0000000000..e3c2b2b7db
--- /dev/null
+++ b/types/react-select/test/examples/AsyncCreatable.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react';
+
+import AsyncCreatableSelect from 'react-select/lib/AsyncCreatable';
+import { colourOptions } from '../data';
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const promiseOptions = (inputValue: string) =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve(filterColors(inputValue));
+    }, 1000);
+  });
+
+export default class WithPromises extends React.Component {
+  render() {
+    return (
+      <AsyncCreatableSelect
+        cacheOptions
+        defaultOptions
+        loadOptions={promiseOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/AsyncMulti.tsx b/types/react-select/test/examples/AsyncMulti.tsx
new file mode 100644
index 0000000000..813e9f9a29
--- /dev/null
+++ b/types/react-select/test/examples/AsyncMulti.tsx
@@ -0,0 +1,39 @@
+import * as React from 'react';
+
+import AsyncSelect from 'react-select/lib/Async';
+import { colourOptions } from '../data';
+
+interface State {
+  inputValue: string;
+}
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const promiseOptions = (inputValue: string) =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve(filterColors(inputValue));
+    }, 1000);
+  });
+
+export default class AsyncMulti extends React.Component<any, State> {
+  state = { inputValue: '' };
+  handleInputChange = (newValue: string) => {
+    const inputValue = newValue.replace(/\W/g, '');
+    this.setState({ inputValue });
+    return inputValue;
+  }
+  render() {
+    return (
+      <AsyncSelect
+        isMulti
+        cacheOptions
+        defaultOptions
+        loadOptions={promiseOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/AsyncPromises.tsx b/types/react-select/test/examples/AsyncPromises.tsx
new file mode 100644
index 0000000000..f599308bdf
--- /dev/null
+++ b/types/react-select/test/examples/AsyncPromises.tsx
@@ -0,0 +1,34 @@
+import * as React from 'react';
+
+import AsyncSelect from 'react-select/lib/Async';
+import { colourOptions } from '../data';
+
+interface State {
+  inputValue: string;
+}
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const promiseOptions = (inputValue: string) =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve(filterColors(inputValue));
+    }, 1000);
+  });
+
+export default class WithPromises extends React.Component<any, State> {
+  state = { inputValue: '' };
+  handleInputChange = (newValue: string) => {
+    const inputValue = newValue.replace(/\W/g, '');
+    this.setState({ inputValue });
+    return inputValue;
+  }
+  render() {
+    return (
+      <AsyncSelect cacheOptions defaultOptions loadOptions={promiseOptions} />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/BasicGrouped.tsx b/types/react-select/test/examples/BasicGrouped.tsx
new file mode 100644
index 0000000000..96b1245e93
--- /dev/null
+++ b/types/react-select/test/examples/BasicGrouped.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import { ColourOption, colourOptions, FlavourOption, groupedOptions } from '../data';
+
+const groupStyles = {
+  display: 'flex',
+  alignItems: 'center',
+  justifyContent: 'space-between',
+};
+const groupBadgeStyles = {
+  backgroundColor: '#EBECF0',
+  borderRadius: '2em',
+  color: '#172B4D',
+  display: 'inline-block',
+  fontSize: 12,
+  fontWeight: 'normal' as 'normal',
+  lineHeight: '1',
+  minWidth: 1,
+  padding: '0.16666666666667em 0.5em',
+  textAlign: 'center' as 'center',
+};
+
+const formatGroupLabel = (data: any) => (
+  <div style={groupStyles}>
+    <span>{data.label}</span>
+    <span style={groupBadgeStyles}>{data.options.length}</span>
+  </div>
+);
+
+export default () => (
+  <Select<ColourOption | FlavourOption>
+    defaultValue={colourOptions[1]}
+    options={groupedOptions}
+    formatGroupLabel={formatGroupLabel}
+  />
+);
diff --git a/types/react-select/test/examples/BasicMulti.tsx b/types/react-select/test/examples/BasicMulti.tsx
new file mode 100644
index 0000000000..2080b1a795
--- /dev/null
+++ b/types/react-select/test/examples/BasicMulti.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import { colourOptions } from '../data';
+
+export default () => (
+  <Select
+    defaultValue={[colourOptions[2], colourOptions[3]]}
+    isMulti
+    name="colors"
+    options={colourOptions}
+    className="basic-multi-select"
+    classNamePrefix="select"
+  />
+);
diff --git a/types/react-select/test/examples/BasicSingle.tsx b/types/react-select/test/examples/BasicSingle.tsx
new file mode 100644
index 0000000000..69697566c2
--- /dev/null
+++ b/types/react-select/test/examples/BasicSingle.tsx
@@ -0,0 +1,101 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import { colourOptions } from '../data';
+import { Note } from '../styled-components';
+
+const Checkbox = (props: any) => <input type="checkbox" {...props} />;
+
+interface State {
+  isClearable: boolean;
+  isDisabled: boolean;
+  isLoading: boolean;
+  isRtl: boolean;
+  isSearchable: boolean;
+}
+
+export default class SingleSelect extends React.Component<any, State> {
+  state = {
+    isClearable: true,
+    isDisabled: false,
+    isLoading: false,
+    isRtl: false,
+    isSearchable: true,
+  };
+
+  toggleClearable = () =>
+    this.setState(state => ({ isClearable: !state.isClearable }))
+  toggleDisabled = () =>
+    this.setState(state => ({ isDisabled: !state.isDisabled }))
+  toggleLoading = () =>
+    this.setState(state => ({ isLoading: !state.isLoading }))
+  toggleRtl = () => this.setState(state => ({ isRtl: !state.isRtl }));
+  toggleSearchable = () =>
+    this.setState(state => ({ isSearchable: !state.isSearchable }))
+  render() {
+    const {
+      isClearable,
+      isSearchable,
+      isDisabled,
+      isLoading,
+      isRtl,
+    } = this.state;
+    return (
+      <React.Fragment>
+        <Select
+          className="basic-single"
+          classNamePrefix="select"
+          defaultValue={colourOptions[0]}
+          isDisabled={isDisabled}
+          isLoading={isLoading}
+          isClearable={isClearable}
+          isRtl={isRtl}
+          isSearchable={isSearchable}
+          name="color"
+          options={colourOptions}
+        />
+        <Note Tag="label">
+          <Checkbox
+            checked={isClearable}
+            onChange={this.toggleClearable}
+            id="cypress-single__clearable-checkbox"
+          />
+          Clearable
+        </Note>
+        <Note Tag="label" style={{ marginLeft: '1em' }}>
+          <Checkbox
+            checked={isSearchable}
+            onChange={this.toggleSearchable}
+            id="cypress-single__searchable-checkbox"
+          />
+          Searchable
+        </Note>
+        <Note Tag="label" style={{ marginLeft: '1em' }}>
+          <Checkbox
+            checked={isDisabled}
+            onChange={this.toggleDisabled}
+            id="cypress-single__disabled-checkbox"
+          />
+          Disabled
+        </Note>
+        <Note Tag="label" style={{ marginLeft: '1em' }}>
+          <Checkbox
+            checked={isLoading}
+            onChange={this.toggleLoading}
+            id="cypress-single__loading-checkbox"
+          />
+          Loading
+        </Note>
+        <Note Tag="label" style={{ marginLeft: '1em' }}>
+          <Checkbox
+            type="checkbox"
+            checked={isRtl}
+            onChange={this.toggleRtl}
+            id="cypress-single__rtl-checkbox"
+          />
+          RTL
+        </Note>
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/ControlledMenu.tsx b/types/react-select/test/examples/ControlledMenu.tsx
new file mode 100644
index 0000000000..c18ec337bc
--- /dev/null
+++ b/types/react-select/test/examples/ControlledMenu.tsx
@@ -0,0 +1,42 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import { colourOptions } from '../data';
+import { Note } from '../styled-components';
+
+const Checkbox = (props: any) => <input type="checkbox" {...props} />;
+
+interface State {
+  menuIsOpen: boolean;
+}
+
+export default class controlledMenu extends React.Component<any, State> {
+  state = {
+    menuIsOpen: false,
+  };
+  toggleMenuIsOpen = () =>
+    this.setState(state => ({ menuIsOpen: !state.menuIsOpen }))
+  render() {
+    const { menuIsOpen } = this.state;
+    return (
+      <React.Fragment>
+        <Select
+          defaultValue={colourOptions[0]}
+          isClearable
+          menuIsOpen={menuIsOpen}
+          styles={{ menu: (base: any) => ({ ...base, position: 'relative' }) }}
+          name="color"
+          options={colourOptions}
+        />
+        <Note Tag="label">
+          <Checkbox
+            checked={menuIsOpen}
+            onChange={this.toggleMenuIsOpen}
+            id="cypress-single__clearable-checkbox"
+          />
+          menuIsOpen
+        </Note>
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CreatableAdvanced.tsx b/types/react-select/test/examples/CreatableAdvanced.tsx
new file mode 100644
index 0000000000..4d667de91b
--- /dev/null
+++ b/types/react-select/test/examples/CreatableAdvanced.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react';
+
+import CreatableSelect from 'react-select/lib/Creatable';
+
+interface Option {
+  label: string;
+  value: string;
+}
+
+interface State {
+  isLoading: boolean;
+  options: Option[];
+  value: string | undefined;
+}
+
+const createOption = (label: string): Option => ({
+  label,
+  value: label.toLowerCase().replace(/\W/g, ''),
+});
+
+const defaultOptions = [
+  createOption('One'),
+  createOption('Two'),
+  createOption('Three'),
+];
+
+export default class CreatableAdvanced extends React.Component<any, State> {
+  state = {
+    isLoading: false,
+    options: defaultOptions,
+    value: undefined,
+  };
+  handleChange = (newValue: any, actionMeta: any) => {
+    console.group('Value Changed');
+    console.log(newValue);
+    console.log(`action: ${actionMeta.action}`);
+    console.groupEnd();
+    this.setState({ value: newValue });
+  }
+  handleCreate = (inputValue: string) => {
+    this.setState({ isLoading: true });
+    console.group('Option created');
+    console.log('Wait a moment...');
+    setTimeout(() => {
+      const { options } = this.state;
+      const newOption = createOption(inputValue);
+      console.log(newOption);
+      console.groupEnd();
+      this.setState({
+        isLoading: false,
+        options: [...options, newOption],
+        value: inputValue,
+      });
+    }, 1000);
+  }
+  render() {
+    const { isLoading, options, value } = this.state;
+    return (
+      <CreatableSelect
+        isClearable
+        isDisabled={isLoading}
+        isLoading={isLoading}
+        onChange={this.handleChange}
+        onCreateOption={this.handleCreate}
+        options={options}
+        value={value}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CreatableInputOnly.tsx b/types/react-select/test/examples/CreatableInputOnly.tsx
new file mode 100644
index 0000000000..f54e176a0d
--- /dev/null
+++ b/types/react-select/test/examples/CreatableInputOnly.tsx
@@ -0,0 +1,72 @@
+import * as React from 'react';
+
+import CreatableSelect from 'react-select/lib/Creatable';
+
+const components = {
+  DropdownIndicator: null,
+};
+
+interface Option {
+  label: string;
+  value: string;
+}
+
+const createOption = (label: string): Option => ({
+  label,
+  value: label,
+});
+
+interface State {
+  inputValue: string;
+  value: Option[];
+}
+
+export default class CreatableInputOnly extends React.Component<any, State> {
+  state: State = {
+    inputValue: '',
+    value: [],
+  };
+  handleChange = (value: any, actionMeta: any) => {
+    console.group('Value Changed');
+    console.log(value);
+    console.log(`action: ${actionMeta.action}`);
+    console.groupEnd();
+    this.setState({ value });
+  }
+  handleInputChange = (inputValue: string) => {
+    this.setState({ inputValue });
+  }
+  handleKeyDown = (event: React.KeyboardEvent<HTMLElement>) => {
+    const { inputValue, value } = this.state;
+    if (!inputValue) return;
+    switch (event.key) {
+      case 'Enter':
+      case 'Tab':
+        console.group('Value Added');
+        console.log(value);
+        console.groupEnd();
+        this.setState({
+          inputValue: '',
+          value: [...value, createOption(inputValue)],
+        });
+        event.preventDefault();
+    }
+  }
+  render() {
+    const { inputValue, value } = this.state;
+    return (
+      <CreatableSelect
+        components={components}
+        inputValue={inputValue}
+        isClearable
+        isMulti
+        menuIsOpen={false}
+        onChange={this.handleChange}
+        onInputChange={this.handleInputChange}
+        onKeyDown={this.handleKeyDown}
+        placeholder="Type something and press enter..."
+        value={value}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CreatableMulti.tsx b/types/react-select/test/examples/CreatableMulti.tsx
new file mode 100644
index 0000000000..a7177e807a
--- /dev/null
+++ b/types/react-select/test/examples/CreatableMulti.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+
+import CreatableSelect from 'react-select/lib/Creatable';
+import { colourOptions } from '../data';
+
+export default class CreatableMulti extends React.Component {
+  handleChange = (newValue: any, actionMeta: any) => {
+    console.group('Value Changed');
+    console.log(newValue);
+    console.log(`action: ${actionMeta.action}`);
+    console.groupEnd();
+  }
+  render() {
+    return (
+      <CreatableSelect
+        isMulti
+        onChange={this.handleChange}
+        options={colourOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CreatableSingle.tsx b/types/react-select/test/examples/CreatableSingle.tsx
new file mode 100644
index 0000000000..d04ef48a7e
--- /dev/null
+++ b/types/react-select/test/examples/CreatableSingle.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+
+import CreatableSelect from 'react-select/lib/Creatable';
+import { colourOptions } from '../data';
+
+export default class CreatableSingle extends React.Component {
+  handleChange = (newValue: any, actionMeta: any) => {
+    console.group('Value Changed');
+    console.log(newValue);
+    console.log(`action: ${actionMeta.action}`);
+    console.groupEnd();
+  }
+  handleInputChange = (inputValue: any, actionMeta: any) => {
+    console.group('Input Changed');
+    console.log(inputValue);
+    console.log(`action: ${actionMeta.action}`);
+    console.groupEnd();
+  }
+  render() {
+    return (
+      <CreatableSelect
+        isClearable
+        onChange={this.handleChange}
+        onInputChange={this.handleInputChange}
+        options={colourOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CreateFilter.tsx b/types/react-select/test/examples/CreateFilter.tsx
new file mode 100644
index 0000000000..06c1736b94
--- /dev/null
+++ b/types/react-select/test/examples/CreateFilter.tsx
@@ -0,0 +1,85 @@
+import * as React from 'react';
+import Select, { createFilter } from 'react-select';
+import { colourOptions } from '../data';
+import { Note } from '../styled-components';
+
+const Checkbox = (props: any) => <input type="checkbox" {...props} />;
+
+interface State {
+  ignoreCase: boolean;
+  ignoreAccents: boolean;
+  trim: boolean;
+  matchFromStart: boolean;
+}
+
+export default class SelectCreateFilter extends React.Component<any, State> {
+  state: State = {
+    ignoreCase: false,
+    ignoreAccents: false,
+    trim: false,
+    matchFromStart: false,
+  };
+  toggleOption = (key: string) => () => {
+    this.setState((state: any) => ({ ...state, [key]: !state[key] }));
+  }
+  render() {
+    const {
+      ignoreCase,
+      ignoreAccents,
+      trim,
+      matchFromStart,
+    } = this.state;
+
+    const filterConfig = {
+      ignoreCase,
+      ignoreAccents,
+      trim,
+      matchFrom: this.state.matchFromStart ? ('start' as 'start') : ('any' as 'any'),
+    };
+
+    return (
+      <React.Fragment>
+        <Select
+          defaultValue={colourOptions[0]}
+          isClearable
+          isSearchable
+          name="color"
+          options={colourOptions}
+          filterOption={createFilter(filterConfig)}
+        />
+        <Note Tag="label">
+          <Checkbox
+            checked={ignoreCase}
+            onChange={this.toggleOption('ignoreCase')}
+            id="cypress-single__clearable-checkbox"
+          />
+          Ignore Case
+        </Note>
+        <Note Tag="label">
+          <Checkbox
+            checked={ignoreAccents}
+            onChange={this.toggleOption('ignoreAccents')}
+            id="cypress-single__clearable-checkbox"
+          />
+          Ignore Accents
+        </Note>
+        <Note Tag="label">
+          <Checkbox
+            checked={trim}
+            onChange={this.toggleOption('trim')}
+            id="cypress-single__clearable-checkbox"
+          />
+          Trim
+        </Note>
+        <Note Tag="label">
+          <Checkbox
+            checked={matchFromStart}
+            onChange={this.toggleOption('matchFromStart')}
+            id="cypress-single__clearable-checkbox"
+          />
+          Match from the start
+        </Note>
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomClearIndicator.tsx b/types/react-select/test/examples/CustomClearIndicator.tsx
new file mode 100644
index 0000000000..1528f8116c
--- /dev/null
+++ b/types/react-select/test/examples/CustomClearIndicator.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react';
+
+import Select from 'react-select';
+import { colourOptions } from '../data';
+
+const CustomClearText = () => <span>clear all</span>;
+const ClearIndicator = (props: any) => {
+  const { children = <CustomClearText/>, getStyles, innerProps: { ref, ...restInnerProps } } = props;
+  return (
+    <div {...restInnerProps} ref={ref} style={getStyles('clearIndicator', props)}>
+      <div style={{ padding: '0px 5px' }}>
+        {children}
+      </div>
+    </div>
+  );
+};
+
+const ClearIndicatorStyles = (base: any, state: any) => ({
+  ...base,
+  cursor: 'pointer',
+  color: state.isFocused ? 'blue' : 'black',
+});
+
+export default function CustomClearIndicator() {
+  return (
+    <Select
+      closeMenuOnSelect={false}
+      components={{ ClearIndicator }}
+      styles={{ clearIndicator: ClearIndicatorStyles }}
+      defaultValue={[colourOptions[4], colourOptions[5]]}
+      isMulti
+      options={colourOptions}
+    />
+  );
+}
diff --git a/types/react-select/test/examples/CustomControl.tsx b/types/react-select/test/examples/CustomControl.tsx
new file mode 100644
index 0000000000..3ed018e05e
--- /dev/null
+++ b/types/react-select/test/examples/CustomControl.tsx
@@ -0,0 +1,32 @@
+import * as React from 'react';
+
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+const controlStyles = {
+  borderRadius: '1px solid black',
+  padding: '5px',
+  background: colourOptions[2].color,
+  color: 'white'
+};
+
+const ControlComponent = (props: any) => (
+  <div style={controlStyles}>
+    {<p>Custom Control</p>}
+    <components.Control {...props} />
+  </div>
+);
+
+export default class CustomControl extends React.Component {
+  render() {
+    return (
+      <Select
+        defaultValue={colourOptions[0]}
+        isClearable
+        components={{ Control: ControlComponent }}
+        isSearchable
+        name="color"
+        options={colourOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomDropdownIndicator.tsx b/types/react-select/test/examples/CustomDropdownIndicator.tsx
new file mode 100644
index 0000000000..d65edfa504
--- /dev/null
+++ b/types/react-select/test/examples/CustomDropdownIndicator.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import { EmojiIcon } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const DropdownIndicator = (props: any) => {
+  return components.DropdownIndicator && (
+    <components.DropdownIndicator {...props}>
+      <EmojiIcon
+        primaryColor={colourOptions[2].color}
+      />
+    </components.DropdownIndicator>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ DropdownIndicator }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomFilterOptions.tsx b/types/react-select/test/examples/CustomFilterOptions.tsx
new file mode 100644
index 0000000000..62a13f2a89
--- /dev/null
+++ b/types/react-select/test/examples/CustomFilterOptions.tsx
@@ -0,0 +1,34 @@
+import * as React from 'react';
+import Select from 'react-select';
+import { colourOptions } from '../data';
+
+interface State {
+  ignoreCase: boolean;
+  ignoreAccents: boolean;
+  trim: boolean;
+  matchFrom: boolean;
+}
+
+const filterOptions = (candidate: any, input: string) => {
+  if (input) {
+    return candidate.value === customOptions[0].value;
+  }
+  return true;
+};
+
+const customOptions = [{ value: 'custom', label: 'Using a custom filter to always display this option on search' }, ...colourOptions];
+
+export default class SelectCreateFilter extends React.Component<any, State> {
+  render() {
+    return (
+      <Select
+        defaultValue={customOptions[0]}
+        isClearable
+        isSearchable
+        name="color"
+        options={customOptions}
+        filterOption={filterOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomGetOptionLabel.tsx b/types/react-select/test/examples/CustomGetOptionLabel.tsx
new file mode 100644
index 0000000000..fbe3665b6e
--- /dev/null
+++ b/types/react-select/test/examples/CustomGetOptionLabel.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import Select from 'react-select';
+import { FlavourOption, flavourOptions } from '../data';
+
+export default class CustomGetOptionLabel extends React.Component {
+  private readonly getFlavourOptionLabel = (option: FlavourOption): string => `${option.label}: ${option.rating}`;
+
+  render() {
+    return (
+      <React.Fragment>
+      <p>Composing a display label from the label property and rating property in the options object</p>
+      <Select
+        defaultValue={flavourOptions[0]}
+        isClearable
+        isSearchable
+        name="color"
+        options={flavourOptions}
+        getOptionLabel={this.getFlavourOptionLabel}
+      />
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomGroup.tsx b/types/react-select/test/examples/CustomGroup.tsx
new file mode 100644
index 0000000000..7085e2901c
--- /dev/null
+++ b/types/react-select/test/examples/CustomGroup.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+
+import Select, { components } from 'react-select';
+import { ColourOption, colourOptions, FlavourOption, groupedOptions } from '../data';
+
+const groupStyles = {
+  border: `2px dotted ${colourOptions[2].color}`,
+  borderRadius: '5px',
+  background: '#f2fcff'
+};
+
+const Group = (props: any) => (
+  <div style={groupStyles}>
+    <components.Group {...props}/>
+  </div>
+);
+
+export default () => (
+  <Select<ColourOption | FlavourOption>
+    defaultValue={colourOptions[1]}
+    options={groupedOptions}
+    components={{ Group }}
+  />
+);
diff --git a/types/react-select/test/examples/CustomGroupHeading.tsx b/types/react-select/test/examples/CustomGroupHeading.tsx
new file mode 100644
index 0000000000..abf09de9ef
--- /dev/null
+++ b/types/react-select/test/examples/CustomGroupHeading.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+
+import Select, { components } from 'react-select';
+import { ColourOption, colourOptions, FlavourOption, groupedOptions } from '../data';
+import { EditorPanelIcon, Tooltip } from '../AtlaskitDummy';
+
+const groupStyles = {
+  border: `2px dotted ${colourOptions[2].color}`,
+  color: 'white',
+  background: colourOptions[2].color,
+  padding: '5px 0px',
+  display: 'flex',
+};
+
+const GroupHeading = (props: any) => (
+  <div style={groupStyles}>
+    <components.GroupHeading {...props}/>
+    <Tooltip content="Custom GroupHeading Component">
+      <EditorPanelIcon/>
+    </Tooltip>
+  </div>
+);
+
+export default () => (
+  <Select<ColourOption | FlavourOption>
+    defaultValue={colourOptions[1]}
+    options={groupedOptions}
+    components={{ GroupHeading }}
+    styles={{ groupHeading: (base: any) => ({ ...base, flex: '1 1', color: 'white', margin: 0 }) }}
+  />
+);
diff --git a/types/react-select/test/examples/CustomIndicatorSeparator.tsx b/types/react-select/test/examples/CustomIndicatorSeparator.tsx
new file mode 100644
index 0000000000..c63d4a0f0e
--- /dev/null
+++ b/types/react-select/test/examples/CustomIndicatorSeparator.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import Select from 'react-select';
+import { colourOptions } from '../data';
+
+const indicatorSeparatorStyle = {
+  alignSelf: 'stretch',
+  backgroundColor: colourOptions[2].color,
+  marginBottom: 8,
+  marginTop: 8,
+  width: 1,
+};
+
+const IndicatorSeparator = ({ innerProps }: any) => {
+  return (
+    <span style={indicatorSeparatorStyle} {...innerProps}/>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ IndicatorSeparator }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomIndicatorsContainer.tsx b/types/react-select/test/examples/CustomIndicatorsContainer.tsx
new file mode 100644
index 0000000000..96397fc912
--- /dev/null
+++ b/types/react-select/test/examples/CustomIndicatorsContainer.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const IndicatorsContainer = (props: any) => {
+  return (
+    <div style={{ background: colourOptions[2].color }}>
+      <components.IndicatorsContainer {...props}/>
+    </div>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ IndicatorsContainer }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomInput.tsx b/types/react-select/test/examples/CustomInput.tsx
new file mode 100644
index 0000000000..e2bd0eb7d6
--- /dev/null
+++ b/types/react-select/test/examples/CustomInput.tsx
@@ -0,0 +1,27 @@
+import * as React from 'react';
+import { Tooltip } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const Input = (props: any) => {
+  if (props.isHidden) {
+    return <components.Input {...props}/>;
+  }
+  return (
+    <div style={{ border: `1px dotted ${colourOptions[2].color}` }}>
+      <Tooltip content={'Custom Input'}>
+        <components.Input {...props}/>
+      </Tooltip>
+    </div>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ Input }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomIsOptionDisabled.tsx b/types/react-select/test/examples/CustomIsOptionDisabled.tsx
new file mode 100644
index 0000000000..92e590009c
--- /dev/null
+++ b/types/react-select/test/examples/CustomIsOptionDisabled.tsx
@@ -0,0 +1,21 @@
+import * as React from 'react';
+import Select from 'react-select';
+import { flavourOptions } from '../data';
+
+export default class CustomIsOptionDisabled extends React.Component {
+  render() {
+    return (
+      <React.Fragment>
+        <p>Disable all options that do not have a 'safe' rating, via the isOptionsDisabled fn prop</p>
+        <Select
+          defaultValue={flavourOptions[0]}
+          isClearable
+          isSearchable
+          name="color"
+          options={flavourOptions}
+          isOptionDisabled={(option) => option.rating !== 'safe'}
+        />
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomLoadingIndicator.tsx b/types/react-select/test/examples/CustomLoadingIndicator.tsx
new file mode 100644
index 0000000000..627599d52a
--- /dev/null
+++ b/types/react-select/test/examples/CustomLoadingIndicator.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import { Spinner, Tooltip } from '../AtlaskitDummy';
+import AsyncSelect from 'react-select/lib/Async';
+import { colourOptions } from '../data';
+
+const LoadingIndicator = (props: any) => {
+  return (
+    <Tooltip content={'Custom Loader'}>
+      <Spinner {...props} delay={0}/>
+    </Tooltip>
+  );
+};
+
+interface State {
+  inputValue: string;
+}
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const promiseOptions = (inputValue: string) =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve(filterColors(inputValue));
+    }, 1000);
+  });
+
+export default class CustomLoadingIndicator extends React.Component<any, State> {
+  state = { inputValue: '' };
+  handleInputChange = (newValue: string) => {
+    const inputValue = newValue.replace(/\W/g, '');
+    this.setState({ inputValue });
+    return inputValue;
+  }
+  render() {
+    return (
+      <AsyncSelect
+        cacheOptions
+        defaultOptions
+        loadOptions={promiseOptions}
+        components={{ LoadingIndicator }}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomLoadingMessage.tsx b/types/react-select/test/examples/CustomLoadingMessage.tsx
new file mode 100644
index 0000000000..04776ebfd6
--- /dev/null
+++ b/types/react-select/test/examples/CustomLoadingMessage.tsx
@@ -0,0 +1,50 @@
+import * as React from 'react';
+import { Tooltip } from '../AtlaskitDummy';
+import AsyncSelect from 'react-select/lib/Async';
+import { colourOptions } from '../data';
+
+const LoadingMessage = (props: any) => {
+  return (
+    <Tooltip content={'Custom Loading Message'}>
+      <div {...props} style={props.getStyles('loadingMessage', props)}>
+          {props.children}
+      </div>
+    </Tooltip>
+  );
+};
+
+interface State {
+  inputValue: string;
+}
+
+const filterColors = (inputValue: string) =>
+  colourOptions.filter(i =>
+    i.label.toLowerCase().includes(inputValue.toLowerCase())
+  );
+
+const promiseOptions = (inputValue: string) =>
+  new Promise(resolve => {
+    setTimeout(() => {
+      resolve(filterColors(inputValue));
+    }, 1000);
+  });
+
+export default class CustomLoadingIndicator extends React.Component<any, State> {
+  state = { inputValue: '' };
+  handleInputChange = (newValue: string) => {
+    const inputValue = newValue.replace(/\W/g, '');
+    this.setState({ inputValue });
+    return inputValue;
+  }
+  render() {
+    return (
+      <AsyncSelect
+        cacheOptions
+        defaultOptions
+        loadOptions={promiseOptions}
+        styles={{ loadingMessage: (base: any) => ({ ...base, backgroundColor: colourOptions[2].color, color: 'white' }) }}
+        components={{ LoadingMessage }}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomMenu.tsx b/types/react-select/test/examples/CustomMenu.tsx
new file mode 100644
index 0000000000..b774a7fa1e
--- /dev/null
+++ b/types/react-select/test/examples/CustomMenu.tsx
@@ -0,0 +1,37 @@
+import * as React from 'react';
+
+import Select, { components } from 'react-select';
+import { ColourOption, colourOptions, FlavourOption, groupedOptions } from '../data';
+
+function getLength(options: any) {
+  return options.reduce((acc: any, curr: any) => {
+    if (curr.options) return acc + getLength(curr.options);
+    return acc + 1;
+  }, 0);
+}
+
+const menuHeaderStyle = {
+  padding: '8px 12px',
+};
+
+const Menu = (props: any) => {
+  const optionsLength = getLength(props.options);
+  return (
+    <React.Fragment>
+      <div style={menuHeaderStyle}>
+        Custom Menu with {optionsLength} options
+      </div>
+      <components.Menu {...props}>
+        {props.children}
+      </components.Menu>
+    </React.Fragment>
+  );
+};
+
+export default () => (
+  <Select<ColourOption | FlavourOption>
+    defaultValue={colourOptions[1]}
+    options={groupedOptions}
+    components={{ Menu }}
+  />
+);
diff --git a/types/react-select/test/examples/CustomMenuList.tsx b/types/react-select/test/examples/CustomMenuList.tsx
new file mode 100644
index 0000000000..48a3cf62f7
--- /dev/null
+++ b/types/react-select/test/examples/CustomMenuList.tsx
@@ -0,0 +1,29 @@
+import * as React from 'react';
+
+import Select, { components } from 'react-select';
+import { ColourOption, colourOptions, FlavourOption, groupedOptions } from '../data';
+
+const menuHeaderStyle = {
+  padding: '8px 12px',
+  background: colourOptions[2].color,
+  color: 'white',
+};
+
+const MenuList = (props: any) => {
+  return (
+    <components.MenuList {...props}>
+      <div style={menuHeaderStyle}>
+        Custom Menu List
+      </div>
+      {props.children}
+    </components.MenuList>
+  );
+};
+
+export default () => (
+  <Select<ColourOption | FlavourOption>
+    defaultValue={colourOptions[1]}
+    options={groupedOptions}
+    components={{ MenuList }}
+  />
+);
diff --git a/types/react-select/test/examples/CustomMultiValueContainer.tsx b/types/react-select/test/examples/CustomMultiValueContainer.tsx
new file mode 100644
index 0000000000..1b556751e1
--- /dev/null
+++ b/types/react-select/test/examples/CustomMultiValueContainer.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import { Tooltip } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const MultiValueContainer = (props: any) => {
+  return (
+    <Tooltip content={'Customise your multi-value container!'}>
+      <components.MultiValueContainer {...props}/>
+    </Tooltip>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ MultiValueContainer }}
+    styles={{ multiValue: (base: any) => ({ ...base, border: `2px dotted ${colourOptions[2].color}` }) }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomMultiValueLabel.tsx b/types/react-select/test/examples/CustomMultiValueLabel.tsx
new file mode 100644
index 0000000000..d1399d4d2e
--- /dev/null
+++ b/types/react-select/test/examples/CustomMultiValueLabel.tsx
@@ -0,0 +1,23 @@
+import * as React from 'react';
+import { Tooltip } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const MultiValueLabel = (props: any) => {
+  return (
+    <Tooltip content={'Customise your multi-value label component!'}>
+      <components.MultiValueLabel {...props}/>
+    </Tooltip>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ MultiValueLabel }}
+    styles={{ multiValueLabel: (base: any) => ({ ...base, backgroundColor: colourOptions[2].color, color: 'white' }) }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomMultiValueRemove.tsx b/types/react-select/test/examples/CustomMultiValueRemove.tsx
new file mode 100644
index 0000000000..81dfaf35e9
--- /dev/null
+++ b/types/react-select/test/examples/CustomMultiValueRemove.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import { EmojiIcon, Tooltip } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const MultiValueRemove = (props: any) => {
+  return (
+    <Tooltip content={'Customise your multi-value remove component!'} truncateText>
+      <components.MultiValueRemove {...props}>
+        <EmojiIcon primaryColor={colourOptions[2].color}/>
+      </components.MultiValueRemove>
+    </Tooltip>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ MultiValueRemove }}
+    styles={{ multiValueRemove: (base: any) => ({ ...base, border: `1px dotted ${colourOptions[2].color}`, height: '100%' }) }}
+    defaultValue={[colourOptions[4], colourOptions[5]]}
+    isMulti
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomNoOptionsMessage.tsx b/types/react-select/test/examples/CustomNoOptionsMessage.tsx
new file mode 100644
index 0000000000..6bea4cb47a
--- /dev/null
+++ b/types/react-select/test/examples/CustomNoOptionsMessage.tsx
@@ -0,0 +1,31 @@
+import * as React from 'react';
+import { Tooltip } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+const msgStyles = {
+  background: colourOptions[2].color,
+  color: 'white'
+};
+
+const NoOptionsMessage = (props: any) => {
+  return (
+    <Tooltip content="Custom NoOptionsMessage Component">
+      <components.NoOptionsMessage {...props} />
+    </Tooltip>
+  );
+};
+
+export default class CustomNoOptionsMessage extends React.Component {
+  render() {
+    return (
+      <Select
+        isClearable
+        components={{ NoOptionsMessage }}
+        styles={{ noOptionsMessage: (base: any) => ({ ...base, ...msgStyles }) }}
+        isSearchable
+        name="color"
+        options={[]}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomOption.tsx b/types/react-select/test/examples/CustomOption.tsx
new file mode 100644
index 0000000000..aa115e78bf
--- /dev/null
+++ b/types/react-select/test/examples/CustomOption.tsx
@@ -0,0 +1,22 @@
+import * as React from 'react';
+import { Tooltip } from '../AtlaskitDummy';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const Option = (props: any) => {
+  return (
+    <Tooltip content={'Customise your option component!'} truncateText>
+      <components.Option {...props}/>
+    </Tooltip>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ Option }}
+    styles={{ option: (base: any) => ({ ...base, border: `1px dotted ${colourOptions[2].color}`, height: '100%' }) }}
+    defaultValue={colourOptions[4]}
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomPlaceholder.tsx b/types/react-select/test/examples/CustomPlaceholder.tsx
new file mode 100644
index 0000000000..143fb7df54
--- /dev/null
+++ b/types/react-select/test/examples/CustomPlaceholder.tsx
@@ -0,0 +1,19 @@
+import * as React from 'react';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const Placeholder = (props: any) => {
+  return (
+    <components.Placeholder {...props}/>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ Placeholder }}
+    placeholder={'custom placeholder component'}
+    styles={{ placeholder: (base: any) => ({ ...base, fontSize: '1em', color: colourOptions[2].color, fontWeight: 400 }) }}
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomSelectContainer.tsx b/types/react-select/test/examples/CustomSelectContainer.tsx
new file mode 100644
index 0000000000..393b8d1dd8
--- /dev/null
+++ b/types/react-select/test/examples/CustomSelectContainer.tsx
@@ -0,0 +1,24 @@
+import * as React from 'react';
+import Select, { components } from 'react-select';
+import { Tooltip } from '../AtlaskitDummy';
+import { colourOptions } from '../data';
+
+const SelectContainer = ({ children, ...props }: any) => {
+  return (
+    <Tooltip content={'customise your select container'} delay={0}>
+      <components.SelectContainer {...props}>
+        {children}
+      </components.SelectContainer>
+    </Tooltip>
+  );
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    components={{ SelectContainer }}
+
+    styles={{ container: (base: any) => ({ ...base, backgroundColor: colourOptions[2].color, padding: 5 }) }}
+    options={colourOptions}
+  />
+);
diff --git a/types/react-select/test/examples/CustomSingleValue.tsx b/types/react-select/test/examples/CustomSingleValue.tsx
new file mode 100644
index 0000000000..237005d272
--- /dev/null
+++ b/types/react-select/test/examples/CustomSingleValue.tsx
@@ -0,0 +1,25 @@
+import * as React from 'react';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const SingleValue = ({ children, ...props }: any) => (
+    <components.SingleValue {...props}>
+      {children}
+    </components.SingleValue>
+);
+
+export default class CustomControl extends React.Component {
+    render() {
+    return (
+      <Select
+        defaultValue={colourOptions[0]}
+        isClearable
+        styles={{ singleValue: (base: any) => ({ ...base, padding: 5, borderRadius: 5, background: colourOptions[2].color, color: 'white', display: 'flex' }) }}
+        components={{ SingleValue }}
+        isSearchable
+        name="color"
+        options={colourOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/CustomValueContainer.tsx b/types/react-select/test/examples/CustomValueContainer.tsx
new file mode 100644
index 0000000000..31d18ef50b
--- /dev/null
+++ b/types/react-select/test/examples/CustomValueContainer.tsx
@@ -0,0 +1,28 @@
+import * as React from 'react';
+import Select, { components } from 'react-select';
+import { colourOptions } from '../data';
+
+const ValueContainer = ({ children, ...props }: any) => (
+  <components.ValueContainer {...props}>
+    {children}
+  </components.ValueContainer>
+);
+
+export default class CustomControl extends React.Component {
+  render() {
+    return (
+      <Select
+        defaultValue={colourOptions[0]}
+        isClearable
+        styles={{
+          singleValue: (base: any) => ({ ...base, color: 'white' }),
+          valueContainer: (base: any) => ({ ...base, background: colourOptions[2].color, color: 'white', width: '100%' }),
+        }}
+        components={{ ValueContainer }}
+        isSearchable
+        name="color"
+        options={colourOptions}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/Experimental.tsx b/types/react-select/test/examples/Experimental.tsx
new file mode 100644
index 0000000000..7491b37d35
--- /dev/null
+++ b/types/react-select/test/examples/Experimental.tsx
@@ -0,0 +1,200 @@
+import * as React from 'react';
+import * as chrono from '../ChronoNodeDummy';
+
+import Select, { components as SelectComponents } from 'react-select';
+
+const createOptionForDate = (date: Date) => {
+  return {
+    date,
+    value: date,
+    label: "some label",
+  };
+};
+
+const defaultOptions: any = ['today', 'tomorrow', 'yesterday'].map(i =>
+  createOptionForDate(chrono.parseDate(i))
+);
+
+const createCalendarOptions = (date = new Date()) => {
+  const daysInMonth = Array.apply(null, {
+    length: date.getUTCDate(),
+  }).map((x: any, i: number) => {
+    return { ...createOptionForDate(date), display: 'calendar' };
+  });
+  return {
+    label: date.toDateString(),
+    options: daysInMonth,
+  };
+};
+
+defaultOptions.push(createCalendarOptions());
+
+const suggestions = [
+  'sunday',
+  'saturday',
+  'friday',
+  'thursday',
+  'wednesday',
+  'tuesday',
+  'monday',
+  'december',
+  'november',
+  'october',
+  'september',
+  'august',
+  'july',
+  'june',
+  'may',
+  'april',
+  'march',
+  'february',
+  'january',
+  'yesterday',
+  'tomorrow',
+  'today',
+].reduce((acc: any, str: string) => {
+  for (let i = 1; i < str.length; i++) {
+    acc[str.substr(0, i)] = str;
+  }
+  return acc;
+}, {});
+
+const suggest = (str: string) =>
+  str
+    .split(/\b/)
+    .map(i => suggestions[i] || i)
+    .join('');
+
+const days = ['S', 'M', 'T', 'W', 'T', 'F', 'S'];
+
+const daysHeaderStyles = {
+  marginTop: '5px',
+  paddingTop: '5px',
+  paddingLeft: '2%',
+  borderTop: '1px solid #eee',
+};
+const daysHeaderItemStyles = {
+  color: '#999',
+  cursor: 'default',
+  // display: 'block',
+  fontSize: '75%',
+  fontWeight: 500 as 500,
+  display: 'inline-block',
+  width: '12%',
+  margin: '0 1%',
+  textAlign: 'center' as 'center',
+};
+const daysContainerStyles = {
+  paddingTop: '5px',
+  paddingLeft: '2%',
+};
+
+const Group = (props: any) => {
+  const { Heading, getStyles, children, label, innerProps, headingProps, cx } = props;
+  return (
+    <div aria-label={label} css={getStyles('group', props)} {...innerProps}>
+      <Heading
+        getStyles={getStyles}
+        cx={cx}
+        {...headingProps}
+      >
+        {label}
+      </Heading>
+      <div style={daysHeaderStyles}>
+        {days.map((day, i) => (
+          <span key={`${i}-${day}`} style={daysHeaderItemStyles}>
+            {day}
+          </span>
+        ))}
+      </div>
+      <div style={daysContainerStyles}>{children}</div>
+    </div>
+  );
+};
+
+const getOptionStyles = (defaultStyles: any) => ({
+  ...defaultStyles,
+  display: 'inline-block',
+  width: '12%',
+  margin: '0 1%',
+  textAlign: 'center',
+  borderRadius: '4px',
+});
+
+const Option = (props: any) => {
+  const { data, getStyles, innerRef, innerProps } = props;
+  if (data.display === 'calendar') {
+    const defaultStyles = getStyles('option', props);
+    const styles = getOptionStyles(defaultStyles);
+    if (data.date.date() === 1) {
+      const indentBy = data.date.day();
+      if (indentBy) {
+        styles.marginLeft = `${indentBy * 14 + 1}%`;
+      }
+    }
+    return (
+      <span {...innerProps} css={styles} ref={innerRef}>
+        {data.date.format('D')}
+      </span>
+    );
+  } else return <SelectComponents.Option {...props} />;
+};
+
+class DatePicker extends React.Component<any> {
+  state = {
+    options: defaultOptions,
+  };
+  handleInputChange = (value: string) => {
+    if (!value) {
+      this.setState({ options: defaultOptions });
+      return;
+    }
+    const date = chrono.parseDate(suggest(value.toLowerCase()));
+    if (date) {
+      this.setState({
+        options: [createOptionForDate(date), createCalendarOptions(date)],
+      });
+    } else {
+      this.setState({
+        options: [],
+      });
+    }
+  }
+  render() {
+    const { value } = this.props;
+    const { options } = this.state;
+    return (
+      <Select
+        {...this.props}
+        components={{ Group, Option }}
+        filterOption={null}
+        isMulti={false}
+        isOptionSelected={(o, v) => v.some(i => i.date.isSame(o.date, 'day'))}
+        maxMenuHeight={380}
+        onChange={this.props.onChange}
+        onInputChange={this.handleInputChange}
+        options={options}
+        value={value}
+      />
+    );
+  }
+}
+
+export default class Experimental extends React.Component {
+  state = {
+    value: defaultOptions[0],
+  };
+  handleChange = (value: any) => {
+    this.setState({ value });
+  }
+  render() {
+    const { value } = this.state;
+    const displayValue = value && value.value ? value.value.toString() : 'null';
+    return (
+      <div>
+        <pre>Value: {displayValue}</pre>
+        <DatePicker value={value} onChange={this.handleChange} />
+      </div>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/MenuPortal.tsx b/types/react-select/test/examples/MenuPortal.tsx
new file mode 100644
index 0000000000..b7360e6fff
--- /dev/null
+++ b/types/react-select/test/examples/MenuPortal.tsx
@@ -0,0 +1,90 @@
+import * as React from 'react';
+import { Modal, Button } from '../AtlaskitDummy';
+import Select from 'react-select';
+import { H1, Note } from '../styled-components';
+
+import { colourOptions } from '../data';
+
+interface State {
+  isOpen: boolean;
+  isFixed: boolean;
+  portalPlacement: 'auto' | 'bottom' | 'top';
+}
+
+export default class MenuPortal extends React.Component<any, State> {
+  state: State = {
+    isOpen: false,
+    isFixed: false,
+    portalPlacement: 'bottom',
+  };
+  open = () => {
+    console.log('menuPortal is Open');
+    this.setState({ isOpen: true });
+  }
+  close = () => { this.setState({ isOpen: false }); };
+  setPlacement = ({ currentTarget }: any) => {
+    const portalPlacement = currentTarget && currentTarget.value;
+    this.setState({ portalPlacement });
+  }
+  toggleMode = () => {
+    this.setState(state => ({ isFixed: !state.isFixed }));
+  }
+  render() {
+    const { close, open } = this;
+    const { isOpen, isFixed, portalPlacement } = this.state;
+    return (
+      <React.Fragment>
+        <Button onClick={open}>Open Modal</Button>
+        {
+          isOpen ?
+          <Modal onClose={close}>
+            <H1>Portaled Menu Element</H1>
+            <Select
+              defaultValue={colourOptions[0]}
+              isClearable
+              styles={{ menuPortal: (base: any) => ({ ...base, zIndex: 9999 }) }}
+              menuPortalTarget={document.body}
+              isSearchable
+              name="color"
+              menuPosition={isFixed ? 'fixed' : 'absolute'}
+              menuPlacement={portalPlacement}
+              options={colourOptions}
+            />
+            <Note Tag="label">
+              <select
+                onChange={this.setPlacement}
+                value={portalPlacement}
+                id="cypress-portalled__radio-bottom"
+              >
+                <option value="auto">auto</option>
+                <option value="bottom">bottom</option>
+                <option value="top">top</option>
+              </select>
+            </Note>
+            <Note Tag="label" style={{ marginLeft: '1em' }}>
+              <input
+                type="radio"
+                onChange={this.toggleMode}
+                value="fixed"
+                checked={isFixed}
+                id="cypress-portalled__fixed"
+              />
+              Fixed
+            </Note>
+            <Note Tag="label" style={{ marginLeft: '1em' }}>
+              <input
+                type="radio"
+                onChange={this.toggleMode}
+                value="portal"
+                checked={!isFixed}
+                id="cypress-portalled__portal"
+              />
+              Portal
+            </Note>
+          </Modal>
+          : null
+        }
+      </React.Fragment>
+    );
+  }
+}
diff --git a/types/react-select/test/examples/OnSelectResetsInput.tsx b/types/react-select/test/examples/OnSelectResetsInput.tsx
new file mode 100644
index 0000000000..af1327b1bb
--- /dev/null
+++ b/types/react-select/test/examples/OnSelectResetsInput.tsx
@@ -0,0 +1,47 @@
+import * as React from 'react';
+import Select from 'react-select';
+import { colourOptions } from '../data';
+import { InputActionMeta } from 'react-select/lib/types';
+
+export default class OnSelectResetsInput extends React.Component {
+  state = {
+    inputValue: '',
+    menuIsOpen: undefined
+  };
+  onInputChange = (inputValue: string, { action }: InputActionMeta) => {
+    console.log(inputValue, action);
+    switch (action) {
+      case 'input-change':
+        this.setState({ inputValue });
+        return;
+      case 'menu-close':
+        console.log(this.state.inputValue);
+        let menuIsOpen;
+        if (this.state.inputValue) {
+          menuIsOpen = true;
+        }
+        this.setState({
+          menuIsOpen
+        });
+        return;
+      default:
+        return;
+    }
+  }
+  render() {
+    const { inputValue, menuIsOpen } = this.state;
+    return (
+      <Select
+        isMulti
+        defaultValue={colourOptions[0]}
+        isClearable
+        isSearchable
+        inputValue={inputValue}
+        onInputChange={this.onInputChange}
+        name="color"
+        options={colourOptions}
+        menuIsOpen={menuIsOpen}
+      />
+    );
+  }
+}
diff --git a/types/react-select/test/examples/Popout.tsx b/types/react-select/test/examples/Popout.tsx
new file mode 100644
index 0000000000..d795d00f62
--- /dev/null
+++ b/types/react-select/test/examples/Popout.tsx
@@ -0,0 +1,128 @@
+import * as React from 'react';
+import { Button } from '../AtlaskitDummy';
+
+import Select from 'react-select';
+import { colors } from 'react-select/lib/theme';
+import { stateOptions } from '../data';
+
+const selectStyles = {
+  control: (provided: any) => ({ ...provided, minWidth: 240, margin: 8 }),
+  menu: () => ({ boxShadow: 'inset 0 1px 0 rgba(0, 0, 0, 0.1)' }),
+};
+
+interface State { isOpen: boolean; value: any; }
+
+export default class PopoutExample extends React.Component<any, State> {
+  state: State = { isOpen: false, value: undefined };
+  toggleOpen = () => {
+    this.setState(state => ({ isOpen: !state.isOpen }));
+  }
+  onSelectChange = (value: any) => {
+    this.toggleOpen();
+    this.setState({ value });
+  }
+  render() {
+    const { isOpen, value } = this.state;
+    return (
+      <Dropdown
+        isOpen={isOpen}
+        onClose={this.toggleOpen}
+        target={
+          <Button
+            iconAfter={<ChevronDown />}
+            onClick={this.toggleOpen}
+            isSelected={isOpen}
+          >
+            {value ? `State: ${value.label}` : 'Select a State'}
+          </Button>
+        }
+      >
+        <Select
+          autoFocus
+          backspaceRemovesValue={false}
+          components={{ DropdownIndicator, IndicatorSeparator: null }}
+          controlShouldRenderValue={false}
+          hideSelectedOptions={false}
+          isClearable={false}
+          menuIsOpen
+          onChange={this.onSelectChange}
+          options={stateOptions}
+          placeholder="Search..."
+          styles={selectStyles}
+          tabSelectsValue={false}
+          value={value}
+        />
+      </Dropdown>
+    );
+  }
+}
+
+// styled components
+
+const Menu = (props: any) => {
+  const shadow = colors.neutral10a;
+  return (
+    <div
+      css={{
+        backgroundColor: 'white',
+        borderRadius: 4,
+        boxShadow: `0 0 0 1px ${shadow}, 0 4px 11px ${shadow}`,
+        marginTop: 8,
+        position: 'absolute',
+        zIndex: 2,
+      }}
+      {...props}
+    />
+  );
+};
+const Blanket = (props: any) => (
+  <div
+    css={{
+      bottom: 0,
+      left: 0,
+      top: 0,
+      right: 0,
+      position: 'fixed',
+      zIndex: 1,
+    }}
+    {...props}
+  />
+);
+const Dropdown = ({ children, isOpen, target, onClose }: any) => (
+  <div style={{ position: 'relative' }}>
+    {target}
+    {isOpen ? <Menu>{children}</Menu> : null}
+    {isOpen ? <Blanket onClick={onClose} /> : null}
+  </div>
+);
+const Svg = (p: any) => (
+  <svg
+    width="24"
+    height="24"
+    viewBox="0 0 24 24"
+    focusable="false"
+    role="presentation"
+    {...p}
+  />
+);
+const DropdownIndicator = () => (
+  <div style={{ color: colors.neutral20, height: 24, width: 32 }}>
+    <Svg>
+      <path
+        d="M16.436 15.085l3.94 4.01a1 1 0 0 1-1.425 1.402l-3.938-4.006a7.5 7.5 0 1 1 1.423-1.406zM10.5 16a5.5 5.5 0 1 0 0-11 5.5 5.5 0 0 0 0 11z"
+        fill="currentColor"
+        fillRule="evenodd"
+      />
+    </Svg>
+  </div>
+);
+const ChevronDown = () => (
+  <Svg style={{ marginRight: -6 }}>
+    <path
+      // tslint:disable-next-line:max-line-length
+      d="M8.292 10.293a1.009 1.009 0 0 0 0 1.419l2.939 2.965c.218.215.5.322.779.322s.556-.107.769-.322l2.93-2.955a1.01 1.01 0 0 0 0-1.419.987.987 0 0 0-1.406 0l-2.298 2.317-2.307-2.327a.99.99 0 0 0-1.406 0z"
+      fill="currentColor"
+      fillRule="evenodd"
+    />
+  </Svg>
+);
diff --git a/types/react-select/test/examples/StyledMulti.tsx b/types/react-select/test/examples/StyledMulti.tsx
new file mode 100644
index 0000000000..a4dedb4156
--- /dev/null
+++ b/types/react-select/test/examples/StyledMulti.tsx
@@ -0,0 +1,53 @@
+import * as React from 'react';
+import * as chroma from 'chroma-js';
+
+import { colourOptions } from '../data';
+import Select from 'react-select';
+
+const colourStyles = {
+  control: (styles: any) => ({ ...styles, backgroundColor: 'white' }),
+  option: (styles: any, { data, isDisabled, isFocused, isSelected }: any) => {
+    const color = chroma(data.color);
+    return {
+      ...styles,
+      backgroundColor: isDisabled
+        ? null
+        : isSelected ? data.color : isFocused ? color.alpha(0.1).css() : null,
+      color: isDisabled
+        ? '#ccc'
+        : isSelected
+          ? chroma.contrast(color, 'white') > 2 ? 'white' : 'black'
+          : data.color,
+      cursor: isDisabled ? 'not-allowed' : 'default',
+    };
+  },
+  multiValue: (styles: any, { data }: any) => {
+    const color = chroma(data.color);
+    return {
+      ...styles,
+      backgroundColor: color.alpha(0.1).css(),
+    };
+  },
+  multiValueLabel: (styles: any, { data }: any) => ({
+    ...styles,
+    color: data.color,
+  }),
+  multiValueRemove: (styles: any, { data }: any) => ({
+    ...styles,
+    color: data.color,
+    ':hover': {
+      backgroundColor: data.color,
+      color: 'white',
+    },
+  }),
+};
+
+export default () => (
+  <Select
+    closeMenuOnSelect={false}
+    defaultValue={[colourOptions[0], colourOptions[1]]}
+    isMulti
+    options={colourOptions}
+    styles={colourStyles}
+  />
+);
diff --git a/types/react-select/test/examples/StyledSingle.tsx b/types/react-select/test/examples/StyledSingle.tsx
new file mode 100644
index 0000000000..28e1b4a0d1
--- /dev/null
+++ b/types/react-select/test/examples/StyledSingle.tsx
@@ -0,0 +1,51 @@
+import * as React from 'react';
+import * as chroma from 'chroma-js';
+
+import { colourOptions } from '../data';
+import Select from 'react-select';
+
+const dot = (color = '#ccc') => ({
+  alignItems: 'center',
+  display: 'flex',
+
+  ':before': {
+    backgroundColor: color,
+    borderRadius: 10,
+    content: ' ',
+    display: 'block',
+    marginRight: 8,
+    height: 10,
+    width: 10,
+  },
+});
+
+const colourStyles = {
+  control: (styles: any) => ({ ...styles, backgroundColor: 'white' }),
+  option: (styles: any, { data, isDisabled, isFocused, isSelected }: any) => {
+    const color = chroma(data.color);
+    return {
+      ...styles,
+      backgroundColor: isDisabled
+        ? null
+        : isSelected ? data.color : isFocused ? color.alpha(0.1).css() : null,
+      color: isDisabled
+        ? '#ccc'
+        : isSelected
+          ? chroma.contrast(color, 'white') > 2 ? 'white' : 'black'
+          : data.color,
+      cursor: isDisabled ? 'not-allowed' : 'default',
+    };
+  },
+  input: (styles: any) => ({ ...styles, ...dot() }),
+  placeholder: (styles: any) => ({ ...styles, ...dot() }),
+  singleValue: (styles: any, { data }: any) => ({ ...styles, ...dot(data.color) }),
+};
+
+export default () => (
+  <Select
+    defaultValue={colourOptions[2]}
+    // TODO label="Single select"
+    options={colourOptions}
+    styles={colourStyles}
+  />
+);
diff --git a/types/react-select/test/styled-components.tsx b/types/react-select/test/styled-components.tsx
new file mode 100644
index 0000000000..fa18465cd8
--- /dev/null
+++ b/types/react-select/test/styled-components.tsx
@@ -0,0 +1,17 @@
+import * as React from 'react';
+
+export const Note = ({ Tag = 'div', ...props }: any) => (
+  <Tag
+    css={{
+      color: 'hsl(0, 0%, 40%)',
+      display: 'inline-block',
+      fontSize: 12,
+      fontStyle: 'italic',
+      marginTop: '1em',
+    }}
+    {...props}
+  />
+);
+
+export const H1 = (props: any) => <h1 css={{ marginTop: 0 }} {...props} />;
+export const H2 = (props: any) => <h2 css={{ marginTop: '2em' }} {...props} />;
diff --git a/types/react-select/tsconfig.json b/types/react-select/tsconfig.json
index 7855eceaf1..8c7a1921bd 100644
--- a/types/react-select/tsconfig.json
+++ b/types/react-select/tsconfig.json
@@ -1,10 +1,4 @@
 {
-    "files": [
-        "index.d.ts",
-        "lib/Option/index.d.ts",
-        "lib/utils/defaultMenuRenderer/index.d.ts",
-        "react-select-tests.tsx"
-    ],
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
@@ -12,16 +6,99 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
-        "jsx": "react",
         "typeRoots": [
             "../"
         ],
+        "jsx": "react",
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
-    }
+    },
+    "files": [
+        "index.d.ts",
+        "lib/animated/Input.d.ts",
+        "lib/animated/MultiValue.d.ts",
+        "lib/animated/Placeholder.d.ts",
+        "lib/animated/SingleValue.d.ts",
+        "lib/animated/ValueContainer.d.ts",
+        "lib/animated/transitions.d.ts",
+        "lib/animated/index.d.ts",
+        "lib/components/containers.d.ts",
+        "lib/components/Control.d.ts",
+        "lib/components/Group.d.ts",
+        "lib/components/Input.d.ts",
+        "lib/components/Menu.d.ts",
+        "lib/components/MultiValue.d.ts",
+        "lib/components/Option.d.ts",
+        "lib/components/Placeholder.d.ts",
+        "lib/components/SingleValue.d.ts",
+        "lib/components/indicators.d.ts",
+        "lib/components/index.d.ts",
+        "lib/accessibility/index.d.ts",
+        "lib/theme.d.ts",
+        "lib/Creatable.d.ts",
+        "lib/Async.d.ts",
+        "lib/AsyncCreatable.d.ts",
+        "lib/filters.d.ts",
+        "lib/styles.d.ts",
+        "lib/stateManager.d.ts",
+        "lib/builtins.d.ts",
+        "lib/utils.d.ts",
+        "lib/diacritics.d.ts",
+        "lib/types.d.ts",
+        "lib/Select.d.ts",
+        "test/data.ts",
+        "test/styled-components.tsx",
+		"test/AtlaskitDummy.ts",
+		"test/ChronoNodeDummy.ts",
+        "test/examples/AccessingInternals.tsx",
+        "test/examples/AnimatedMulti.tsx",
+        "test/examples/AsyncCallbacks.tsx",
+        "test/examples/AsyncCreatable.tsx",
+        "test/examples/AsyncMulti.tsx",
+        "test/examples/AsyncPromises.tsx",
+        "test/examples/BasicGrouped.tsx",
+        "test/examples/BasicMulti.tsx",
+        "test/examples/BasicSingle.tsx",
+        "test/examples/ControlledMenu.tsx",
+        "test/examples/CreatableAdvanced.tsx",
+        "test/examples/CreatableInputOnly.tsx",
+        "test/examples/CreatableMulti.tsx",
+        "test/examples/CreatableSingle.tsx",
+        "test/examples/CreateFilter.tsx",
+        "test/examples/CustomClearIndicator.tsx",
+        "test/examples/CustomControl.tsx",
+        "test/examples/CustomDropdownIndicator.tsx",
+        "test/examples/CustomFilterOptions.tsx",
+        "test/examples/CustomGetOptionLabel.tsx",
+        "test/examples/CustomGroup.tsx",
+        "test/examples/CustomGroupHeading.tsx",
+        "test/examples/CustomIndicatorsContainer.tsx",
+        "test/examples/CustomIndicatorSeparator.tsx",
+        "test/examples/CustomInput.tsx",
+        "test/examples/CustomIsOptionDisabled.tsx",
+        "test/examples/CustomLoadingIndicator.tsx",
+        "test/examples/CustomLoadingMessage.tsx",
+        "test/examples/CustomMenu.tsx",
+        "test/examples/CustomMenuList.tsx",
+        "test/examples/CustomMultiValueContainer.tsx",
+        "test/examples/CustomMultiValueLabel.tsx",
+        "test/examples/CustomMultiValueRemove.tsx",
+        "test/examples/CustomNoOptionsMessage.tsx",
+        "test/examples/CustomOption.tsx",
+        "test/examples/CustomPlaceholder.tsx",
+        "test/examples/CustomSelectContainer.tsx",
+        "test/examples/CustomSingleValue.tsx",
+        "test/examples/CustomValueContainer.tsx",
+        "test/examples/Experimental.tsx",
+        "test/examples/MenuPortal.tsx",
+        "test/examples/OnSelectResetsInput.tsx",
+        "test/examples/Popout.tsx",
+        "test/examples/StyledMulti.tsx",
+        "test/examples/StyledSingle.tsx"
+    ]
 }
diff --git a/types/react-select/tslint.json b/types/react-select/tslint.json
index 3db14f85ea..f93cf8562a 100644
--- a/types/react-select/tslint.json
+++ b/types/react-select/tslint.json
@@ -1 +1,3 @@
-{ "extends": "dtslint/dt.json" }
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/react-select/v1/index.d.ts b/types/react-select/v1/index.d.ts
new file mode 100644
index 0000000000..59bea6d815
--- /dev/null
+++ b/types/react-select/v1/index.d.ts
@@ -0,0 +1,654 @@
+// Type definitions for react-select 1.3
+// Project: https://github.com/JedWatson/react-select
+// Definitions by: ESQUIBET Hugo <https://github.com/Hesquibet>
+//                 Gilad Gray <https://github.com/giladgray>
+//                 Izaak Baker <https://github.com/iebaker>
+//                 Tadas Dailyda <https://github.com/skirsdeda>
+//                 Mark Vujevits <https://github.com/vujevits>
+//                 Mike Deverell <https://github.com/devrelm>
+//                 MartynasZilinskas <https://github.com/MartynasZilinskas>
+//                 Onat Yigit Mercan <https://github.com/onatm>
+//                 Ian Johnson <https://github.com/ninjaferret>
+//                 Anton Novik <https://github.com/tehbi4>
+//                 David Schkalee <https://github.com/misantronic>
+//                 Arthur Udalov <https://github.com/darkartur>
+//                 Sebastian Silbermann <https://github.com/eps1lon>
+//                 Endurance Idehen <https://github.com/endurance>
+//                 Guillaume Chartier <https://github.com/RCGuillaume>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export default class ReactSelectClass<TValue = OptionValues> extends React.Component<ReactSelectProps<TValue>> {
+    focus(): void;
+    setValue(value: Option<TValue>): void;
+}
+// Other components
+export class Creatable<TValue = OptionValues> extends React.Component<ReactCreatableSelectProps<TValue>> { }
+export class Async<TValue = OptionValues> extends React.Component<ReactAsyncSelectProps<TValue>> { }
+export class AsyncCreatable<TValue = OptionValues> extends React.Component<ReactAsyncCreatableSelectProps<TValue>> { }
+
+export type OptionComponentType<TValue = OptionValues> = React.ComponentType<OptionComponentProps<TValue>>;
+export type ValueComponentType<TValue = OptionValues> =  React.ComponentType<ValueComponentProps<TValue>>;
+
+export type HandlerRendererResult = JSX.Element | null | false;
+
+// Handlers
+export type FocusOptionHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
+export type SelectValueHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
+export type ArrowRendererHandler = (props: ArrowRendererProps) => HandlerRendererResult;
+export type ClearRendererHandler = () => HandlerRendererResult;
+export type FilterOptionHandler<TValue = OptionValues> = (option: Option<TValue>, filter: string) => boolean;
+export type FilterOptionsHandler<TValue = OptionValues> = (options: Options<TValue>, filter: string, currentValues: Options<TValue>) => Options<TValue>;
+export type InputRendererHandler = (props: { [key: string]: any }) => HandlerRendererResult;
+export type MenuRendererHandler<TValue = OptionValues> = (props: MenuRendererProps<TValue>) => HandlerRendererResult;
+export type OnCloseHandler = () => void;
+export type OnInputChangeHandler = (inputValue: string) => string;
+export type OnInputKeyDownHandler = React.KeyboardEventHandler<HTMLDivElement | HTMLInputElement>;
+export type OnMenuScrollToBottomHandler = () => void;
+export type OnOpenHandler = () => void;
+export type OnFocusHandler = React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
+export type OnBlurHandler = React.FocusEventHandler<HTMLDivElement | HTMLInputElement>;
+export type OptionRendererHandler<TValue = OptionValues> = (option: Option<TValue>) => HandlerRendererResult;
+export type ValueRendererHandler<TValue = OptionValues> = (option: Option<TValue>, index?: number) => HandlerRendererResult;
+export type OnValueClickHandler<TValue = OptionValues> = (option: Option<TValue>, event: React.MouseEvent<HTMLAnchorElement>) => void;
+export type IsOptionUniqueHandler<TValue = OptionValues> = (arg: { option: Option<TValue>, options: Options<TValue>, labelKey: string, valueKey: string }) => boolean;
+export type IsValidNewOptionHandler = (arg: { label: string }) => boolean;
+export type NewOptionCreatorHandler<TValue = OptionValues> = (arg: { label: string, labelKey: string, valueKey: string }) => Option<TValue>;
+export type PromptTextCreatorHandler = (filterText: string) => string;
+export type ShouldKeyDownEventCreateNewOptionHandler = (arg: { keyCode: number }) => boolean;
+
+export type OnChangeSingleHandler<TValue = OptionValues> = OnChangeHandler<TValue, Option<TValue>>;
+export type OnChangeMultipleHandler<TValue = OptionValues> = OnChangeHandler<TValue, Options<TValue>>;
+export type OnChangeHandler<TValue = OptionValues, TOption = Option<TValue> | Options<TValue>> = (newValue: TOption | null) => void;
+export type OnNewOptionClickHandler<TValue = OptionValues> = (option: Option<TValue>) => void;
+
+export type LoadOptionsHandler<TValue = OptionValues> = LoadOptionsAsyncHandler<TValue> | LoadOptionsLegacyHandler<TValue>;
+export type LoadOptionsAsyncHandler<TValue = OptionValues> = (input: string) => Promise<AutocompleteResult<TValue>>;
+export type LoadOptionsLegacyHandler<TValue = OptionValues> = (input: string, callback: (err: any, result: AutocompleteResult<TValue>) => void) => void;
+
+export interface AutocompleteResult<TValue = OptionValues> {
+    /** The search-results to be displayed  */
+    options: Options<TValue>;
+    /**
+     * Should be set to true, if and only if a longer query with the same prefix
+     * would return a subset of the results
+     * If set to true, more specific queries will not be sent to the server.
+     */
+    complete: boolean;
+}
+
+export type Options<TValue = OptionValues> = Array<Option<TValue>>;
+
+export interface Option<TValue = OptionValues> {
+    /** Text for rendering */
+    label?: string;
+    /** Value for searching */
+    value?: TValue;
+    /**
+     * Allow this option to be cleared
+     * @default true
+     */
+    clearableValue?: boolean;
+    /**
+     * Do not allow this option to be selected
+     * @default false
+     */
+    disabled?: boolean;
+    /**
+     * In the event that a custom menuRenderer is provided, Option should be able
+     * to accept arbitrary key-value pairs. See react-virtualized-select.
+     */
+    [property: string]: any;
+}
+
+export type OptionValues = string | number | boolean;
+
+export interface MenuRendererProps<TValue = OptionValues> {
+    /**
+     * The currently focused option; should be visible in the menu by default.
+     * default {}
+     */
+    focusedOption: Option<TValue>;
+
+    /**
+     * Callback to focus a new option; receives the option as a parameter.
+     */
+    focusOption: FocusOptionHandler<TValue>;
+
+    /**
+     * Option labels are accessible with this string key.
+     */
+    labelKey: string;
+
+    /**
+     * Ordered array of options to render.
+     */
+    options: Options<TValue>;
+
+    /**
+     * Callback to select a new option; receives the option as a parameter.
+     */
+    selectValue: SelectValueHandler<TValue>;
+
+    /**
+     * Array of currently selected options.
+     */
+    valueArray: Options<TValue>;
+
+    /**
+     * Callback to remove selection from option; receives the option as a parameter.
+     */
+    removeValue: SelectValueHandler<TValue>;
+
+    /**
+     * function which returns a custom way to render the options in the menu
+     */
+    optionRenderer: OptionRendererHandler<TValue>;
+}
+
+export interface OptionComponentProps<TValue = OptionValues> {
+    /**
+     * Classname(s) to apply to the option component.
+     */
+    className?: string;
+
+    /**
+     * Currently focused option.
+     */
+    focusOption?: Option<TValue>;
+
+    inputValue?: string;
+    instancePrefix?: string;
+
+    /**
+     * True if this option is disabled.
+     */
+    isDisabled?: boolean;
+
+    /**
+     * True if this option is focused.
+     */
+    isFocused?: boolean;
+
+    /**
+     * True if this option is selected.
+     */
+    isSelected?: boolean;
+
+    /**
+     * Callback to be invoked when this option is focused.
+     */
+    onFocus?: (option: Option<TValue>, event: any) => void;
+
+    /**
+     * Callback to be invoked when this option is selected.
+     */
+    onSelect?: (option: Option<TValue>, event: any) => void;
+
+    /**
+     * Option to be rendered by this component.
+     */
+    option: Option<TValue>;
+
+    /**
+     * Index of the option being rendered in the list
+     */
+    optionIndex?: number;
+
+    /**
+     * Callback to invoke when removing an option from a multi-selection. (Not necessarily the one
+     * being rendered)
+     */
+    removeValue?: (value: TValue | TValue[]) => void;
+
+    /**
+     * Callback to invoke to select an option. (Not necessarily the one being rendered)
+     */
+    selectValue?: (value: TValue | TValue[]) => void;
+}
+
+export interface ArrowRendererProps {
+    /**
+     * Arrow mouse down event handler.
+     */
+    onMouseDown: React.MouseEventHandler<any>;
+
+    /**
+     * whether the Select is open or not.
+     */
+    isOpen: boolean;
+}
+
+export interface ValueComponentProps<TValue = OptionValues> {
+    disabled: ReactSelectProps<TValue>['disabled'];
+    id: string;
+    instancePrefix: string;
+    onClick: OnValueClickHandler<TValue> | null;
+    onRemove?: SelectValueHandler<TValue>;
+    placeholder: ReactSelectProps<TValue>['placeholder'];
+    value: Option<TValue>;
+    values?: Array<Option<TValue>>;
+}
+
+export interface ReactSelectProps<TValue = OptionValues> extends React.Props<ReactSelectClass<TValue>> {
+    /**
+     * text to display when `allowCreate` is true.
+     * @default 'Add "{label}"?'
+     */
+    addLabelText?: string;
+    /**
+     * renders a custom drop-down arrow to be shown in the right-hand side of the select.
+     * @default undefined
+     */
+    arrowRenderer?: ArrowRendererHandler | null;
+    /**
+     * blurs the input element after a selection has been made. Handy for lowering the keyboard on mobile devices.
+     * @default false
+     */
+    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
+     */
+    autosize?: boolean;
+    /**
+     * whether pressing backspace removes the last item when there is no input value
+     * @default true
+     */
+    backspaceRemoves?: boolean;
+    /**
+     * Message to use for screenreaders to press backspace to remove the current item
+     * {label} is replaced with the item label
+     * @default "Press backspace to remove..."
+     */
+    backspaceToRemoveMessage?: string;
+    /**
+     * CSS className for the outer element
+     */
+    className?: string;
+    /**
+     * Prefix prepended to element default className if no className is defined
+     */
+    classNamePrefix?: string;
+    /**
+     * title for the "clear" control when `multi` is true
+     * @default "Clear all"
+     */
+    clearAllText?: string;
+    /**
+     * Renders a custom clear to be shown in the right-hand side of the select when clearable true
+     * @default undefined
+     */
+    clearRenderer?: ClearRendererHandler;
+    /**
+     * title for the "clear" control
+     * @default "Clear value"
+     */
+    clearValueText?: string;
+    /**
+     * whether to close the menu when a value is selected
+     * @default true
+     */
+    closeOnSelect?: boolean;
+    /**
+     * whether it is possible to reset value. if enabled, an X button will appear at the right side.
+     * @default true
+     */
+    clearable?: boolean;
+    /**
+     * whether backspace removes an item if there is no text input
+     * @default true
+     */
+    deleteRemoves?: boolean;
+    /**
+     * delimiter to use to join multiple values
+     * @default ","
+     */
+    delimiter?: string;
+    /**
+     * whether the Select is disabled or not
+     * @default false
+     */
+    disabled?: boolean;
+    /**
+     * whether escape clears the value when the menu is closed
+     * @default true
+     */
+    escapeClearsValue?: boolean;
+    /**
+     * method to filter a single option
+     */
+    filterOption?: FilterOptionHandler<TValue>;
+    /**
+     * method to filter the options array
+     */
+    filterOptions?: FilterOptionsHandler<TValue>;
+    /**
+     * id for the underlying HTML input element
+     * @default undefined
+     */
+    id?: string;
+    /**
+     * whether to strip diacritics when filtering
+     * @default true
+     */
+    ignoreAccents?: boolean;
+    /**
+     * whether to perform case-insensitive filtering
+     * @default true
+     */
+    ignoreCase?: boolean;
+    /**
+     * custom attributes for the Input (in the Select-control) e.g: {'data-foo': 'bar'}
+     * @default {}
+     */
+    inputProps?: { [key: string]: any };
+    /**
+     * renders a custom input
+     */
+    inputRenderer?: InputRendererHandler;
+    /**
+     * allows for synchronization of component id's on server and client.
+     * @see https://github.com/JedWatson/react-select/pull/1105
+     */
+    instanceId?: string;
+    /**
+     * whether the Select is loading externally or not (such as options being loaded).
+     * if true, a loading spinner will be shown at the right side.
+     * @default false
+     */
+    isLoading?: boolean;
+    /**
+     * (legacy mode) joins multiple values into a single form field with the delimiter
+     * @default false
+     */
+    joinValues?: boolean;
+    /**
+     * the option property to use for the label
+     * @default "label"
+     */
+    labelKey?: string;
+    /**
+     * (any, start) match the start or entire string when filtering
+     * @default "any"
+     */
+    matchPos?: string;
+    /**
+     * (any, label, value) which option property to filter on
+     * @default "any"
+     */
+    matchProp?: string;
+    /**
+     * buffer of px between the base of the dropdown and the viewport to shift if menu doesnt fit in viewport
+     * @default 0
+     */
+    menuBuffer?: number;
+    /**
+     * optional style to apply to the menu container
+     */
+    menuContainerStyle?: React.CSSProperties;
+    /**
+     * renders a custom menu with options
+     */
+    menuRenderer?: MenuRendererHandler<TValue>;
+    /**
+     * optional style to apply to the menu
+     */
+    menuStyle?: React.CSSProperties;
+    /**
+     * multi-value input
+     * @default false
+     */
+    multi?: boolean;
+    /**
+     * field name, for hidden `<input>` tag
+     */
+    name?: string;
+    /**
+     * placeholder displayed when there are no matching search results or a falsy value to hide it
+     * @default "No results found"
+     */
+    noResultsText?: string | JSX.Element;
+    /**
+     * onBlur handler: function (event) {}
+     */
+    onBlur?: OnBlurHandler;
+    /**
+     * whether to clear input on blur or not
+     * @default true
+     */
+    onBlurResetsInput?: boolean;
+    /**
+     * whether the input value should be reset when options are selected.
+     * Also input value will be set to empty if 'onSelectResetsInput=true' and
+     * Select will get new value that not equal previous value.
+     * @default true
+     */
+    onSelectResetsInput?: boolean;
+    /**
+     * whether to clear input when closing the menu through the arrow
+     * @default true
+     */
+    onCloseResetsInput?: boolean;
+    /**
+     * onChange handler: function (newValue) {}
+     */
+    onChange?: OnChangeHandler<TValue>;
+    /**
+     * fires when the menu is closed
+     */
+    onClose?: OnCloseHandler;
+    /**
+     * onFocus handler: function (event) {}
+     */
+    onFocus?: OnFocusHandler;
+    /**
+     * onInputChange handler: function (inputValue) {}
+     */
+    onInputChange?: OnInputChangeHandler;
+    /**
+     * onInputKeyDown handler: function (keyboardEvent) {}
+     */
+    onInputKeyDown?: OnInputKeyDownHandler;
+    /**
+     * fires when the menu is scrolled to the bottom; can be used to paginate options
+     */
+    onMenuScrollToBottom?: OnMenuScrollToBottomHandler;
+    /**
+     * fires when the menu is opened
+     */
+    onOpen?: OnOpenHandler;
+    /**
+     * boolean to enable opening dropdown when focused
+     * @default false
+     */
+    openOnClick?: boolean;
+    /**
+     * open the options menu when the input gets focus (requires searchable = true)
+     * @default true
+     */
+    openOnFocus?: boolean;
+    /**
+     * className to add to each option component
+     */
+    optionClassName?: string;
+    /**
+     * option component to render in dropdown
+     */
+    optionComponent?: OptionComponentType<TValue>;
+    /**
+     * function which returns a custom way to render the options in the menu
+     */
+    optionRenderer?: OptionRendererHandler<TValue>;
+    /**
+     * array of Select options
+     * @default false
+     */
+    options?: Options<TValue>;
+    /**
+     * number of options to jump when using page up/down keys
+     * @default 5
+     */
+    pageSize?: number;
+    /**
+     * field placeholder, displayed when there's no value
+     * @default "Select..."
+     */
+    placeholder?: string | JSX.Element;
+    /**
+     * whether the selected option is removed from the dropdown on multi selects
+     * @default true
+     */
+    removeSelected?: boolean;
+    /**
+     * applies HTML5 required attribute when needed
+     * @default false
+     */
+    required?: boolean;
+    /**
+     * value to use when you clear the control
+     */
+    resetValue?: any;
+    /**
+     * use react-select in right-to-left direction
+     * @default false
+     */
+    rtl?: boolean;
+    /**
+     * whether the viewport will shift to display the entire menu when engaged
+     * @default true
+     */
+    scrollMenuIntoView?: boolean;
+    /**
+     * whether to enable searching feature or not
+     * @default true;
+     */
+    searchable?: boolean;
+    /**
+     * whether to select the currently focused value when the  [tab]  key is pressed
+     */
+    tabSelectsValue?: boolean;
+    /**
+     * initial field value
+     */
+    value?: Option<TValue> | Options<TValue> | string | string[] | number | number[] | boolean;
+    /**
+     * the option property to use for the value
+     * @default "value"
+     */
+    valueKey?: string;
+    /**
+     * function which returns a custom way to render the value selected
+     * @default false
+     */
+    valueRenderer?: ValueRendererHandler<TValue>;
+    /**
+     *  optional style to apply to the control
+     */
+    style?: React.CSSProperties;
+
+    /**
+     *  optional tab index of the control
+     */
+    tabIndex?: string | number;
+
+    /**
+     *  value component to render
+     */
+    valueComponent?: ValueComponentType<TValue>;
+
+    /**
+     *  optional style to apply to the component wrapper
+     */
+    wrapperStyle?: React.CSSProperties;
+
+    /**
+     * onClick handler for value labels: function (value, event) {}
+     */
+    onValueClick?: OnValueClickHandler<TValue>;
+
+    /**
+     *  pass the value to onChange as a simple value (legacy pre 1.0 mode), defaults to false
+     */
+    simpleValue?: boolean;
+}
+
+export interface ReactCreatableSelectProps<TValue = OptionValues> extends ReactSelectProps<TValue> {
+    /**
+     * Searches for any matching option within the set of options. This function prevents
+     * duplicate options from being created.
+     */
+    isOptionUnique?: IsOptionUniqueHandler<TValue>;
+
+    /**
+     * Determines if the current input text represents a valid option.
+     */
+    isValidNewOption?: IsValidNewOptionHandler;
+
+    /**
+     * factory to create new options
+     */
+    newOptionCreator?: NewOptionCreatorHandler<TValue>;
+
+    /**
+     * Creates prompt/placeholder for option text.
+     */
+    promptTextCreator?: PromptTextCreatorHandler;
+
+    /**
+     * Decides if a keyDown event (eg its 'keyCode') should result in the creation of a new option.
+     */
+    shouldKeyDownEventCreateNewOption?: ShouldKeyDownEventCreateNewOptionHandler;
+
+    /**
+     * new option click handler: function (option) {}
+     */
+    onNewOptionClick?: OnNewOptionClickHandler<TValue>;
+
+    /**
+     * true: Show new option at top of list
+     * false: Show new option at bottom of list
+     * @default true
+     */
+    showNewOptionAtTop?: boolean;
+}
+
+export interface ReactAsyncSelectProps<TValue = OptionValues> extends ReactSelectProps<TValue> {
+    /**
+     * Whether to auto-load the default async options set.
+     */
+    autoload?: boolean;
+
+    /**
+     *  object to use to cache results; can be null to disable cache
+     */
+    cache?: { [key: string]: any } | boolean;
+
+    /**
+     *  function to call to load options asynchronously
+     */
+    loadOptions: LoadOptionsHandler<TValue>;
+
+    /**
+     *  replaces the placeholder while options are loading
+     */
+    loadingPlaceholder?: string | JSX.Element;
+    /**
+     *  displayed in the drop down list when the user did not type anything yet
+     */
+    searchPromptText?: string;
+}
+
+export type ReactAsyncCreatableSelectProps<TValue = OptionValues> = ReactAsyncSelectProps<TValue> & ReactCreatableSelectProps<TValue>;
diff --git a/types/react-select/lib/Option/index.d.ts b/types/react-select/v1/lib/Option/index.d.ts
similarity index 100%
rename from types/react-select/lib/Option/index.d.ts
rename to types/react-select/v1/lib/Option/index.d.ts
diff --git a/types/react-select/lib/utils/defaultMenuRenderer/index.d.ts b/types/react-select/v1/lib/utils/defaultMenuRenderer/index.d.ts
similarity index 100%
rename from types/react-select/lib/utils/defaultMenuRenderer/index.d.ts
rename to types/react-select/v1/lib/utils/defaultMenuRenderer/index.d.ts
diff --git a/types/react-select/react-select-tests.tsx b/types/react-select/v1/react-select-tests.tsx
similarity index 97%
rename from types/react-select/react-select-tests.tsx
rename to types/react-select/v1/react-select-tests.tsx
index a6b450f513..7afe6d0023 100644
--- a/types/react-select/react-select-tests.tsx
+++ b/types/react-select/v1/react-select-tests.tsx
@@ -430,6 +430,15 @@ describe("Examples", () => {
         />;
     });
 
+    it("Value render with custom value option and index", () => {
+        const valueRenderer = (option: ReactSelectModule.Option<CustomValueType>, index: number): ReactSelectModule.HandlerRendererResult =>
+            null;
+
+        <CustomValueReactSelect
+            valueRenderer={valueRenderer}
+        />;
+    });
+
     it("No Results renderer with string", () => {
         <ReactSelect noResultsText="no results" />;
     });
diff --git a/types/react-select/v1/tsconfig.json b/types/react-select/v1/tsconfig.json
new file mode 100644
index 0000000000..e01d55ae8a
--- /dev/null
+++ b/types/react-select/v1/tsconfig.json
@@ -0,0 +1,35 @@
+{
+    "files": [
+        "index.d.ts",
+        "lib/Option/index.d.ts",
+        "lib/utils/defaultMenuRenderer/index.d.ts",
+        "react-select-tests.tsx"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "jsx": "react",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "react-select": [
+                "react-select/v1"
+            ],
+            "react-select/*": [
+                "react-select/v1/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/react-select/v1/tslint.json b/types/react-select/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-select/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-share/index.d.ts b/types/react-share/index.d.ts
index 756b917014..6fe45b124c 100644
--- a/types/react-share/index.d.ts
+++ b/types/react-share/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/nygardk/react-share#readme
 // Definitions by: icopp <https://github.com/icopp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-show-more/index.d.ts b/types/react-show-more/index.d.ts
new file mode 100644
index 0000000000..efa2459148
--- /dev/null
+++ b/types/react-show-more/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for react-show-more 2.0
+// Project: https://github.com/One-com/react-show-more
+// Definitions by: Naor Torgeman <https://github.com/naortor>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export interface ReactShowMoreProps {
+	lines?: number;
+	more?: string;
+	less?: string;
+	children?: string;
+	anchorClass?: string;
+}
+
+declare const ShowMore: React.ClassicComponentClass<ReactShowMoreProps>;
+export default ShowMore;
diff --git a/types/react-show-more/react-show-more-tests.tsx b/types/react-show-more/react-show-more-tests.tsx
new file mode 100644
index 0000000000..de08cbd0e6
--- /dev/null
+++ b/types/react-show-more/react-show-more-tests.tsx
@@ -0,0 +1,13 @@
+import ShowMore from 'react-show-more';
+import * as React from 'react';
+
+const longText = "scenester Banksy single-origin coffee squid flannel XOXO chillwave Helvetica plaid slow-carb drinking vinegar Wes Anderson gastropub";
+
+<ShowMore
+	lines={3}
+	more='Show more'
+	less='Show less'
+	anchorClass=''
+>
+	{longText}
+</ShowMore >;
diff --git a/types/react-show-more/tsconfig.json b/types/react-show-more/tsconfig.json
new file mode 100644
index 0000000000..4b47c444bd
--- /dev/null
+++ b/types/react-show-more/tsconfig.json
@@ -0,0 +1,25 @@
+{
+  "compilerOptions": {
+      "module": "commonjs",
+      "lib": [
+          "es6",
+          "dom"
+      ],
+      "jsx": "react",
+      "noImplicitAny": true,
+      "noImplicitThis": true,
+      "strictNullChecks": true,
+      "strictFunctionTypes": true,
+      "baseUrl": "../",
+      "typeRoots": [
+          "../"
+      ],
+      "types": [],
+      "noEmit": true,
+      "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+      "index.d.ts",
+      "react-show-more-tests.tsx"
+  ]
+}
diff --git a/types/react-show-more/tslint.json b/types/react-show-more/tslint.json
new file mode 100644
index 0000000000..30a1bdde2e
--- /dev/null
+++ b/types/react-show-more/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/react-side-effect/index.d.ts b/types/react-side-effect/index.d.ts
index 358acbbf05..977db41611 100644
--- a/types/react-side-effect/index.d.ts
+++ b/types/react-side-effect/index.d.ts
@@ -1,23 +1,34 @@
-// Type definitions for react-side-effect v1.0.2
+// Type definitions for react-side-effect 1.1
 // Project: https://github.com/gaearon/react-side-effect
 // Definitions by: Remo H. Jansen <https://github.com/remojansen>
+//                 Martin Charles <https://github.com/0xcaff>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
-declare function withSideEffect(
-    reducePropsToState: (propsList: any[]) => any,
-    handleStateChangeOnClient: (state: any) => any,
-    mapStateOnServer?: (state: any) => any
-): ClassDecorator;
+interface WithSideEffect {
+    <TProp, TState>(
+        reducePropsToState: (propsList: TProp[]) => TState,
+        handleStateChangeOnClient: (state: TState) => void
+    ): ClassDecorator<TProp, TState, TState>;
 
-declare class ElementClass extends React.Component<any> {}
-
-interface ClassDecorator {
-    <T extends (typeof ElementClass)>(component:T): T;
+    <TProp, TState, TServerState>(
+        reducePropsToState: (propsList: TProp[]) => TState,
+        handleStateChangeOnClient: (state: TState) => void,
+        mapStateOnServer: (state: TState) => TServerState
+    ): ClassDecorator<TProp, TState | TServerState, TServerState>;
 }
 
+declare const withSideEffect: WithSideEffect;
+
+type ClassDecorator<TProp, TPeek, TRewind> = (
+    component: React.ComponentType<TProp>
+) => React.ComponentType<TProp> & {
+    peek: () => TPeek;
+    rewind: () => TRewind;
+};
+
 declare namespace withSideEffect {} // https://github.com/Microsoft/TypeScript/issues/5073
 
 export = withSideEffect;
diff --git a/types/react-side-effect/react-side-effect-tests.ts b/types/react-side-effect/react-side-effect-tests.ts
deleted file mode 100644
index d568fed4cc..0000000000
--- a/types/react-side-effect/react-side-effect-tests.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-import * as React from "react";
-import withSideEffect = require("react-side-effect");
-
-interface DocumentTitleProps {
-    title: string
-}
-
-class DocumentTitle extends React.Component<DocumentTitleProps> {
-  public render() {
-    if (this.props.children) {
-      return React.Children.only(this.props.children);
-    } else {
-      return null;
-    }
-  }
-}
-
-function reducePropsToState(propsList: any[]) {
-  var innermostProps = propsList[propsList.length - 1];
-  if (innermostProps) {
-    return innermostProps.title;
-  }
-}
-
-function handleStateChangeOnClient(title: string) {
-  document.title = title || "";
-}
-
-let DocumentTitleWithSideEffects = withSideEffect(
-  reducePropsToState,
-  handleStateChangeOnClient
-)(DocumentTitle);
-
-export default DocumentTitleWithSideEffects;
diff --git a/types/react-side-effect/react-side-effect-tests.tsx b/types/react-side-effect/react-side-effect-tests.tsx
new file mode 100644
index 0000000000..7cbe8fc043
--- /dev/null
+++ b/types/react-side-effect/react-side-effect-tests.tsx
@@ -0,0 +1,59 @@
+import * as React from "react";
+import withSideEffect = require("react-side-effect");
+
+interface DocumentTitleProps {
+    title: string;
+}
+
+type State = string | undefined;
+
+interface ServerState {
+    innerState: State;
+}
+
+const DocumentTitle = () => null;
+
+function reducePropsToState(propsList: DocumentTitleProps[]): State {
+    const innermostProps = propsList[propsList.length - 1];
+    if (innermostProps) {
+        return innermostProps.title;
+    }
+}
+
+function handleStateChangeOnClient(title: State) {
+    document.title = title || "";
+}
+
+const mapStateOnServer = (state: State): ServerState => ({ innerState: state });
+
+const DocumentTitleWithServerMapState = withSideEffect(
+    reducePropsToState,
+    handleStateChangeOnClient,
+    mapStateOnServer
+)(DocumentTitle);
+
+const testWithServerMapState = () => {
+    const testComponent = () => (
+        <DocumentTitleWithServerMapState title="Title" />
+    );
+    const peekedState:
+        | ServerState
+        | State = DocumentTitleWithServerMapState.peek();
+    const rewindedState: ServerState = DocumentTitleWithServerMapState.rewind();
+};
+
+const DocumentTitleNotServer = withSideEffect(
+    reducePropsToState,
+    handleStateChangeOnClient
+)(DocumentTitle);
+
+const testWithoutMapState = () => {
+    const testComponent = () => <DocumentTitleNotServer title="asdf" />;
+    const peekedState: State = DocumentTitleNotServer.peek();
+    const rewindedState: State = DocumentTitleNotServer.rewind();
+};
+
+const testInvalidProp = () => (
+    // $ExpectError
+    <DocumentTitleServer notAValidProp="this should fail" />
+);
diff --git a/types/react-side-effect/tsconfig.json b/types/react-side-effect/tsconfig.json
index f64b0cedec..752e806984 100644
--- a/types/react-side-effect/tsconfig.json
+++ b/types/react-side-effect/tsconfig.json
@@ -5,6 +5,7 @@
             "es6",
             "dom"
         ],
+        "jsx": "react",
         "noImplicitAny": true,
         "noImplicitThis": true,
         "strictNullChecks": true,
@@ -19,6 +20,6 @@
     },
     "files": [
         "index.d.ts",
-        "react-side-effect-tests.ts"
+        "react-side-effect-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/types/react-side-effect/tslint.json b/types/react-side-effect/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/react-side-effect/tslint.json
+++ b/types/react-side-effect/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/react-sidebar/index.d.ts b/types/react-sidebar/index.d.ts
index da6d9e0f79..562398d4a5 100644
--- a/types/react-sidebar/index.d.ts
+++ b/types/react-sidebar/index.d.ts
@@ -1,8 +1,8 @@
-// Type definitions for react-sidebar 2.3
+// Type definitions for react-sidebar 3.0
 // Project: https://github.com/balloob/react-sidebar#readme
 // Definitions by: Jeroen Vervaeke <https://github.com/jeroenvervaeke>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from "react";
 
@@ -23,6 +23,10 @@ export interface SidebarProps {
     transitions?: boolean;
     touch?: boolean;
     touchHandleWidth?: number;
+    rootId?: string;
+    sidebarId?: string;
+    contentId?: string;
+    overlayId?: string;
 }
 
 export interface SidebarStyles {
diff --git a/types/react-sidebar/react-sidebar-tests.tsx b/types/react-sidebar/react-sidebar-tests.tsx
index caeaa3c37d..e1f4374284 100644
--- a/types/react-sidebar/react-sidebar-tests.tsx
+++ b/types/react-sidebar/react-sidebar-tests.tsx
@@ -8,6 +8,24 @@ const sidebarStyle: SidebarStyles = {
 };
 
 const sidebar1 = (
+    <Sidebar
+        defaultSidebarWidth={30}
+        docked={true}
+        open={true}
+        sidebar={sidebar}
+        styles={sidebarStyle}
+        onSetOpen={(open: boolean) => { }}
+        rootId="test-root-id"
+        sidebarId="test-sidebar-id"
+        contentId="test-content-id"
+        overlayId="test-overlay-id"
+    >
+        <h1>Content</h1>
+    </Sidebar>
+);
+
+// Test id properties are optional
+const sidebar2 = (
     <Sidebar
         defaultSidebarWidth={30}
         docked={true}
diff --git a/types/react-sketchapp/index.d.ts b/types/react-sketchapp/index.d.ts
index 67ade07673..6152bd7b07 100644
--- a/types/react-sketchapp/index.d.ts
+++ b/types/react-sketchapp/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Rico Kahler <https://github.com/ricokahler>
 //                 DomiR <https://github.com/DomiR>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-slick/index.d.ts b/types/react-slick/index.d.ts
index e9f03b80fa..d20aef9a02 100644
--- a/types/react-slick/index.d.ts
+++ b/types/react-slick/index.d.ts
@@ -4,7 +4,7 @@
 //                 Giedrius Grabauskas <https://github.com/GiedriusGrabauskas>
 //                 Andrew Makarov <https://github.com/r3nya>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-slider/index.d.ts b/types/react-slider/index.d.ts
new file mode 100644
index 0000000000..25cbb5c9b8
--- /dev/null
+++ b/types/react-slider/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for react-slider 0.8
+// Project: https://github.com/mpowaga/react-slider
+// Definitions by: Jason Unger <https://github.com/jsonunger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+import * as motion from 'react-motion';
+
+declare namespace ReactSlider {
+    interface ReactSliderProps {
+        min?: number;
+        max?: number;
+        step?: number;
+        minDistance?: number;
+        defaultValue?: number | number[];
+        value?: number | number[];
+        orientation?: 'horizontal' | 'vertical';
+        className?: string;
+        handleClassName?: string;
+        handleActiveClassName?: string;
+        withBars?: boolean;
+        barClassName?: string;
+        pearling?: boolean;
+        disabled?: boolean;
+        snapDragDisabled?: boolean;
+        invert?: boolean;
+        onBeforeChange?: (value: number | number[] | undefined | null) => void;
+        onChange?: (value: number | number[] | undefined | null) => void;
+        onAfterChange?: (value: number | number[] | undefined | null) => void;
+        onSliderClick?: (value: number) => void;
+    }
+}
+
+declare const ReactSlider: React.ComponentClass<ReactSlider.ReactSliderProps>;
+export = ReactSlider;
diff --git a/types/react-slider/react-slider-tests.tsx b/types/react-slider/react-slider-tests.tsx
new file mode 100644
index 0000000000..0078d19a62
--- /dev/null
+++ b/types/react-slider/react-slider-tests.tsx
@@ -0,0 +1,15 @@
+import * as React from 'react';
+import ReactSlider from 'react-slider';
+
+class Slider extends React.Component<ReactSlider.ReactSliderProps> {
+    render() {
+        return (
+            <ReactSlider
+                snapDragDisabled
+                barClassName="classnameForBar"
+                withBars={false}
+                {...this.props}
+            />
+        );
+    }
+}
diff --git a/types/react-slider/tsconfig.json b/types/react-slider/tsconfig.json
new file mode 100644
index 0000000000..d1eda95226
--- /dev/null
+++ b/types/react-slider/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",
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-slider-tests.tsx"
+    ]
+}
diff --git a/types/react-slider/tslint.json b/types/react-slider/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-slider/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-smooth-scrollbar/index.d.ts b/types/react-smooth-scrollbar/index.d.ts
index c0aa21a0ff..85b4a736c3 100644
--- a/types/react-smooth-scrollbar/index.d.ts
+++ b/types/react-smooth-scrollbar/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import SmoothScrollbar from "smooth-scrollbar";
diff --git a/types/react-sortable-hoc/index.d.ts b/types/react-sortable-hoc/index.d.ts
index 9963ebd69e..6a89c766e5 100644
--- a/types/react-sortable-hoc/index.d.ts
+++ b/types/react-sortable-hoc/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
index 236f39b77a..5cc82dfa60 100644
--- a/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
+++ b/types/react-sortable-hoc/react-sortable-hoc-tests.tsx
@@ -48,6 +48,7 @@ class SortableComponent extends React.Component<{}, SortableComponentState> {
         }
         return {width: 0, height: 0};
     }
+    state: SortableComponentState;
 
     constructor() {
         super({});
diff --git a/types/react-sortable-pane/index.d.ts b/types/react-sortable-pane/index.d.ts
index f8d3eba15f..16e14eaff2 100644
--- a/types/react-sortable-pane/index.d.ts
+++ b/types/react-sortable-pane/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bokuweb/react-sortable-pane
 // Definitions by: rhysd <https://github.com/rhysd>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-sortable-tree/index.d.ts b/types/react-sortable-tree/index.d.ts
index 498fd48800..00748ddb53 100644
--- a/types/react-sortable-tree/index.d.ts
+++ b/types/react-sortable-tree/index.d.ts
@@ -3,8 +3,9 @@
 // Definitions by: Wouter Hardeman <https://github.com/wouterhardeman>
 //                 Jovica Zoric <https://github.com/jzoric>
 //                 Kevin Perrine <https://github.com/kevinsperrine>
+//                 Alex Maclean <https://github.com/acemac>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { ListProps, Index } from 'react-virtualized';
@@ -70,6 +71,12 @@ export interface OnDragPreviousAndNextLocation extends PreviousAndNextLocation {
     nextParent: TreeItem | null;
 }
 
+export interface ShouldCopyData {
+    node: TreeNode;
+    prevPath: NumberArrayOrStringArray;
+    prevTreeIndex: number;
+}
+
 export interface OnMovePreviousAndNextLocation extends PreviousAndNextLocation {
     nextParentNode: TreeItem | null;
 }
@@ -186,6 +193,8 @@ export interface ReactSortableTreeProps {
     dndType?: string;
     placeholderRenderer?: PlaceholderRenderer;
     theme?: ThemeProps;
+    shouldCopyOnOutsideDrop?: boolean | ((data: ShouldCopyData) => boolean);
+    onlyExpandSearchedNodes?: boolean;
 }
 
 declare const SortableTree: React.ComponentClass<ReactSortableTreeProps>;
diff --git a/types/react-sortable-tree/package.json b/types/react-sortable-tree/package.json
new file mode 100644
index 0000000000..2e009d2f82
--- /dev/null
+++ b/types/react-sortable-tree/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "react-dnd": "^5.0.0"
+  }
+}
diff --git a/types/react-sortable-tree/react-sortable-tree-tests.tsx b/types/react-sortable-tree/react-sortable-tree-tests.tsx
index 6ed4b3e74b..695614caca 100644
--- a/types/react-sortable-tree/react-sortable-tree-tests.tsx
+++ b/types/react-sortable-tree/react-sortable-tree-tests.tsx
@@ -69,11 +69,13 @@ class Test extends React.Component {
                     dndType="testNodeType"
                     placeholderRenderer={PlaceholderRenderer}
                     theme={theme}
+					shouldCopyOnOutsideDrop={true}
                 />
                 <SortableTreeWithoutDndContext
                     treeData={[{title: "Title", subtitle: "Subtitle", children: []}]}
                     onChange={(treeData: TreeItem[]) => {}}
                     style={{width: "100px"}}
+					shouldCopyOnOutsideDrop={() => false}
                 />
             </div>
         );
diff --git a/types/react-sound/index.d.ts b/types/react-sound/index.d.ts
new file mode 100644
index 0000000000..4670feb5f9
--- /dev/null
+++ b/types/react-sound/index.d.ts
@@ -0,0 +1,34 @@
+// Type definitions for react-sound 1.2
+// Project: https://github.com/leoasis/react-sound
+// Definitions by: Konstantin Lebedev <https://github.com/koss-lebedev>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+declare namespace ReactSound {
+    type PlayStatus = 'PLAYING' | 'STOPPED' | 'PAUSED';
+
+    interface ReactSoundProps {
+        url: string;
+        playStatus: PlayStatus;
+        playFromPosition?: number;
+        position?: number;
+        volume?: number;
+        playbackRate?: number;
+        autoLoad?: boolean;
+        loop?: boolean;
+        onError?: () => void;
+        onLoading?: () => void;
+        onLoad?: () => void;
+        onPlaying?: () => void;
+        onPause?: () => void;
+        onResume?: () => void;
+        onStop?: () => void;
+        onFinishedPlaying?: () => void;
+        onBufferChange?: () => void;
+    }
+}
+
+declare const ReactSound: React.ComponentClass<ReactSound.ReactSoundProps>;
+export = ReactSound;
diff --git a/types/react-sound/react-sound-tests.tsx b/types/react-sound/react-sound-tests.tsx
new file mode 100644
index 0000000000..2775ac607a
--- /dev/null
+++ b/types/react-sound/react-sound-tests.tsx
@@ -0,0 +1,33 @@
+import ReactSound from "react-sound";
+import * as React from "react";
+
+const ReactSoundRequiredOptions: JSX.Element = (
+    <ReactSound
+        url="http://test.com"
+        playStatus="STOPPED"
+    />
+);
+
+const callbackFn = () => ({});
+
+const ReactSoundAllOptions: JSX.Element = (
+    <ReactSound
+        url="http://test.com/audio.mp3"
+        playStatus="STOPPED"
+        playFromPosition={0}
+        position={0}
+        volume={0}
+        playbackRate={0}
+        autoLoad
+        loop={false}
+        onError={callbackFn}
+        onLoading={callbackFn}
+        onLoad={callbackFn}
+        onPlaying={callbackFn}
+        onPause={callbackFn}
+        onResume={callbackFn}
+        onStop={callbackFn}
+        onFinishedPlaying={callbackFn}
+        onBufferChange={callbackFn}
+    />
+);
diff --git a/types/react-sound/tsconfig.json b/types/react-sound/tsconfig.json
new file mode 100644
index 0000000000..e755ca5056
--- /dev/null
+++ b/types/react-sound/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",
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-sound-tests.tsx"
+    ]
+}
diff --git a/types/react-sound/tslint.json b/types/react-sound/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/react-sound/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/react-spinkit/index.d.ts b/types/react-spinkit/index.d.ts
index 9e4a5f0cff..9d723ccc11 100644
--- a/types/react-spinkit/index.d.ts
+++ b/types/react-spinkit/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/KyleAMathews/react-spinkit
 // Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>, zzanol <https://github.com/zzanol>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-spinkit/v1/index.d.ts b/types/react-spinkit/v1/index.d.ts
index ec841afd4b..2e616371e8 100644
--- a/types/react-spinkit/v1/index.d.ts
+++ b/types/react-spinkit/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/KyleAMathews/react-spinkit
 // Definitions by: Qubo <https://github.com/tkqubo>, Mleko <https://github.com/mleko>, Tom Crockett <https://github.com/pelotom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/react-sticky-el/index.d.ts b/types/react-sticky-el/index.d.ts
index b41d48c454..da831c9d61 100644
--- a/types/react-sticky-el/index.d.ts
+++ b/types/react-sticky-el/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gm0t/react-sticky-el
 // Definitions by: Justin Braithwaite <https://github.com/jbraithwaite>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-sticky/index.d.ts b/types/react-sticky/index.d.ts
index 9dac505d85..0bc4e2c0f2 100644
--- a/types/react-sticky/index.d.ts
+++ b/types/react-sticky/index.d.ts
@@ -1,14 +1,28 @@
 // Type definitions for react-sticky 6.0
 // Project: https://github.com/captivationsoftware/react-sticky
-// Definitions by: Matej Lednicky <http://www.thinkcreatix.com/>, Curtis Warren <https://github.com/curtisw0>
+// Definitions by: Matej Lednicky <http://www.thinkcreatix.com/>,
+//                 Curtis Warren <https://github.com/curtisw0>,
+//                 Andrew Hyndman <https://github.com/ajhyndman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
-export const StickyContainer: React.ComponentClass<React.HTMLAttributes<HTMLDivElement>>;
+export const StickyContainer: React.ComponentClass<
+    React.HTMLAttributes<HTMLDivElement>
+>;
+
+export interface StickyChildArgs {
+    style: React.CSSProperties;
+    isSticky: boolean;
+    wasSticky: boolean;
+    distanceFromTop: number;
+    distanceFromBottom: number;
+    calculatedHeight: number;
+}
 
 export interface StickyProps {
+    children: (args: StickyChildArgs) => React.ReactElement<any>;
     relative?: boolean;
     isActive?: boolean;
     className?: string;
diff --git a/types/react-sticky/react-sticky-tests.tsx b/types/react-sticky/react-sticky-tests.tsx
index 8284add89a..085bfe786c 100644
--- a/types/react-sticky/react-sticky-tests.tsx
+++ b/types/react-sticky/react-sticky-tests.tsx
@@ -1,26 +1,27 @@
 import { Sticky, StickyContainer } from "react-sticky";
 import * as React from "react";
 
-const StickyAllOptions: JSX.Element =
+const StickyAllOptions: JSX.Element = (
     <StickyContainer className="sticky-container">
         <Sticky
-          relative
-          disableHardwareAcceleration
-          isActive={true}
-          className="sticky"
-          style={{}}
-          stickyClassName="sticky"
-          stickyStyle={{}}
-          topOffset={0}
-          bottomOffset={0}
-          onStickyStateChange={(isSticky: boolean): void => undefined}>
-            <div/>
+            relative
+            disableHardwareAcceleration
+            isActive={true}
+            className="sticky"
+            style={{}}
+            stickyClassName="sticky"
+            stickyStyle={{}}
+            topOffset={0}
+            bottomOffset={0}
+            onStickyStateChange={(isSticky: boolean): void => undefined}
+        >
+            {({ style }) => <div style={style} />}
         </Sticky>
-    </StickyContainer>;
+    </StickyContainer>
+);
 
-const StickyNoOptions: JSX.Element =
+const StickyNoOptions: JSX.Element = (
     <StickyContainer>
-        <Sticky>
-            <div/>
-        </Sticky>
-    </StickyContainer>;
+        <Sticky>{({ style }) => <div style={style} />}</Sticky>
+    </StickyContainer>
+);
diff --git a/types/react-stripe-elements/index.d.ts b/types/react-stripe-elements/index.d.ts
index e8e88757b2..32a94b0639 100644
--- a/types/react-stripe-elements/index.d.ts
+++ b/types/react-stripe-elements/index.d.ts
@@ -6,7 +6,7 @@
 //                 Andrew Goh Yisheng <https://github.com/9y5>
 //                 Thomas Chia <https://github.com/thchia>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="stripe-v3" />
 import * as React from 'react';
@@ -30,12 +30,12 @@ export namespace ReactStripeElements {
 	interface StripeProviderOptions {
 		stripeAccount?: string;
 	}
-	type StripeProviderProps = { apiKey: string; stripe?: never; } & StripeProviderOptions | { apiKey?: never; stripe: StripeProps | null; } & StripeProviderOptions;
+	type StripeProviderProps = { apiKey: string; stripe?: never; } & StripeProviderOptions | { apiKey?: never; stripe: stripe.Stripe | null; } & StripeProviderOptions;
 
 	interface StripeProps {
 		createSource(sourceData?: SourceOptions): Promise<SourceResponse>;
-
 		createToken(options?: TokenOptions): Promise<PatchedTokenResponse>;
+		paymentRequest: stripe.Stripe['paymentRequest'];
 	}
 
 	interface InjectOptions {
diff --git a/types/react-stripe-elements/react-stripe-elements-tests.tsx b/types/react-stripe-elements/react-stripe-elements-tests.tsx
index ef1af5fa86..324f76aa4d 100644
--- a/types/react-stripe-elements/react-stripe-elements-tests.tsx
+++ b/types/react-stripe-elements/react-stripe-elements-tests.tsx
@@ -16,7 +16,6 @@ import ElementChangeResponse = stripe.elements.ElementChangeResponse;
 import ElementsOptions = stripe.elements.ElementsOptions;
 import ElementsCreateOptions = stripe.elements.ElementsCreateOptions;
 import PatchedTokenResponse = ReactStripeElements.PatchedTokenResponse;
-import StripeProps = ReactStripeElements.StripeProps;
 
 const cardElementProps: ElementsOptions = {
     iconStyle: 'solid',
@@ -111,6 +110,22 @@ interface ComponentProps {
 class WrappedComponent extends React.Component<
     ComponentProps & InjectedStripeProps
 > {
+    constructor(props: ComponentProps & InjectedStripeProps) {
+        super(props);
+        // Test for paymentRequest
+        const paymentRequest = props.stripe && props.stripe.paymentRequest({
+            country: 'US',
+            currency: 'usd',
+            total: {
+                label: 'Demo total',
+                amount: 1
+            }
+        });
+        if (paymentRequest) {
+            paymentRequest.on('token', ({complete, token, ...data}) => undefined);
+            paymentRequest.canMakePayment().then(res => undefined);
+        }
+    }
     onSubmit = () => {
         this.props.stripe!
             .createToken({
@@ -185,7 +200,7 @@ const ElementsDefaultPropsTest: React.SFC = () => (
 const TestStripeProviderProps1: React.SFC = () => <StripeProvider apiKey="" />;
 
 const TestStripeProviderProps2: React.SFC<{
-    stripe: StripeProps;
+    stripe: stripe.Stripe;
 }> = props => <StripeProvider stripe={props.stripe} />;
 
 /**
@@ -193,9 +208,22 @@ const TestStripeProviderProps2: React.SFC<{
  * See: https://github.com/stripe/react-stripe-elements#props-shape
  */
 const TestStripeProviderProps3: React.SFC<{
-    stripe: StripeProps;
+    stripe: stripe.Stripe;
 }> = props => <StripeProvider stripe={null} />;
 
+/**
+ * End-to-end usage of loading stripe.js asynchronously.
+ * See: https://github.com/stripe/react-stripe-elements#loading-stripejs-asynchronously
+ */
+const TestStripeProviderProps4: React.SFC<{
+    stripe: null | stripe.Stripe
+}> = props =>
+    <StripeProvider stripe={props.stripe}>
+        <Elements>
+            <div />
+        </Elements>
+    </StripeProvider>;
+
 /**
  * StripeProvider should be able to accept options.
  * See: https://stripe.com/docs/stripe-js/reference#stripe-function for options.
diff --git a/types/react-svg-inline/index.d.ts b/types/react-svg-inline/index.d.ts
new file mode 100644
index 0000000000..849d5772b0
--- /dev/null
+++ b/types/react-svg-inline/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for react-svg-inline 2.1
+// Project: https://github.com/MoOx/react-svg-inline
+// Definitions by: kiyopikko <https://github.com/kiyopikko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="react" />
+
+declare namespace svgInline {
+    interface SVGInlineProps {
+        svg: string;
+        className?: string;
+        classSuffix?: string;
+        component?: React.ReactNode;
+        fill?: string;
+        cleanup?: boolean | Array<"title" | "desc" | "comment" | "defs" | "width" | "height" | "fill" | "sketchMSShapeGroup" | "sketchMSPage" | "sketchMSLayerGroup">;
+        cleanupExceptions?: Array<"title" | "desc" | "comment" | "defs" | "width" | "height" | "fill" | "sketchMSShapeGroup" | "sketchMSPage" | "sketchMSLayerGroup">;
+        width?: string;
+        height?: string;
+        accessibilityLabel?: string;
+        accessibilityDesc?: string;
+    }
+    type SVGInline = React.ComponentClass<SVGInlineProps>;
+}
+
+declare const svgInline: svgInline.SVGInline;
+export = svgInline;
diff --git a/types/react-svg-inline/react-svg-inline-tests.tsx b/types/react-svg-inline/react-svg-inline-tests.tsx
new file mode 100644
index 0000000000..dc3e65852c
--- /dev/null
+++ b/types/react-svg-inline/react-svg-inline-tests.tsx
@@ -0,0 +1,30 @@
+import SVGInline = require("react-svg-inline");
+import * as React from "react";
+
+const TestSFC = (props: SVGInline.SVGInlineProps) => <div />;
+
+class TestPure extends React.PureComponent {
+    constructor(props: SVGInline.SVGInlineProps) {
+        super(props);
+    }
+    render() {
+        return (<div />);
+    }
+}
+
+const svgInlines = [
+    <SVGInline svg={"<svg><g></g></svg>"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} className={"test-class-name"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} classSuffix={"my-"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} component={"div"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} component={TestSFC} />,
+    <SVGInline svg={"<svg><g></g></svg>"} component={TestPure} />,
+    <SVGInline svg={"<svg><g></g></svg>"} fill={"#663399"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} cleanup />,
+    <SVGInline svg={"<svg><g></g></svg>"} cleanup={["desc", "sketchMSPage", "sketchMSShapeGroup", "sketchMSLayerGroup"]} />,
+    <SVGInline svg={"<svg><g></g></svg>"} cleanupExceptions={["title"]} />,
+    <SVGInline svg={"<svg><g></g></svg>"} width={"16"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} height={"32px"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} accessibilityLabel={"User-friendly Label"} />,
+    <SVGInline svg={"<svg><g></g></svg>"} accessibilityDesc={"This description is easy to understand."} />,
+];
diff --git a/types/react-svg-inline/tsconfig.json b/types/react-svg-inline/tsconfig.json
new file mode 100644
index 0000000000..733f1d3eba
--- /dev/null
+++ b/types/react-svg-inline/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-svg-inline-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/react-svg-inline/tslint.json b/types/react-svg-inline/tslint.json
new file mode 100644
index 0000000000..2750cc0197
--- /dev/null
+++ b/types/react-svg-inline/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
\ No newline at end of file
diff --git a/types/react-svg-pan-zoom/index.d.ts b/types/react-svg-pan-zoom/index.d.ts
index f825694915..c2636a8d6d 100644
--- a/types/react-svg-pan-zoom/index.d.ts
+++ b/types/react-svg-pan-zoom/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chrvadala/react-svg-pan-zoom#readme
 // Definitions by: Huy Nguyen <https://github.com/huy-nguyen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-svg/index.d.ts b/types/react-svg/index.d.ts
deleted file mode 100644
index 5484191442..0000000000
--- a/types/react-svg/index.d.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// Type definitions for react-svg 3.0
-// Project: https://github.com/atomic-app/react-svg
-// Definitions by: Chen Junda <https://github.com/viccrubs>
-//                 Chris Garber <https://github.com/chrisgarber>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
-import * as React from "react";
-
-declare class ReactSVG extends React.Component<ReactSVG.ReactSVGProps & React.DetailedHTMLProps<React.HTMLAttributes<HTMLDivElement>, HTMLDivElement>> {}
-
-export = ReactSVG;
-
-declare namespace ReactSVG {
-  interface ReactSVGProps {
-    /**
-     * Path to the SVG.
-     */
-    path: string;
-    /**
-     * Run any script blocks found in the SVG (always, once, or never). Defaults to never.
-     */
-    evalScripts?: 'always' | 'once' | 'never';
-    /**
-     * Function to call after the SVG is injected. Receives the newly injected SVG DOM element as a parameter. Defaults to null.
-     */
-    onInjected?: (dom: SVGSVGElement) => void;
-    /**
-     * Class name to be added to the SVG. Defaults to ''.
-     */
-    svgClassName?: string;
-    /**
-     * Inline styles to be added to the SVG. Defaults to {}.
-     */
-    svgStyle?: any;
-  }
-}
diff --git a/types/react-svg/react-svg-tests.tsx b/types/react-svg/react-svg-tests.tsx
deleted file mode 100644
index 676e1e5663..0000000000
--- a/types/react-svg/react-svg-tests.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-import * as React from 'react';
-import * as ReactDOM from 'react-dom';
-import ReactSVG = require("react-svg");
-
-const complete = <ReactSVG
-    path={"atomic.svg"}
-    onInjected={svg => {}}
-    className="wrapper-class-name"
-    svgClassName="svg-class-name"
-    onClick={() => {}}
-    evalScripts="once"
-    svgStyle={{}}
-  />;
-
-const minimal = <ReactSVG path={"test.svg"}/>;
diff --git a/types/react-swf/index.d.ts b/types/react-swf/index.d.ts
index c37aff3d69..119b566ad8 100644
--- a/types/react-swf/index.d.ts
+++ b/types/react-swf/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/syranide/react-swf
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 export as namespace ReactSWF;
diff --git a/types/react-swipe/index.d.ts b/types/react-swipe/index.d.ts
index fb7d02055f..8b5c2d2a2d 100644
--- a/types/react-swipe/index.d.ts
+++ b/types/react-swipe/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/voronianski/react-swipe
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="swipe" />
 
diff --git a/types/react-swipeable-views/index.d.ts b/types/react-swipeable-views/index.d.ts
index dedc165871..68545673e6 100644
--- a/types/react-swipeable-views/index.d.ts
+++ b/types/react-swipeable-views/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Michael Ledin <https://github.com/mxl>
 //                 Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-swipeable/index.d.ts b/types/react-swipeable/index.d.ts
index b39a7b29ea..643d053b40 100644
--- a/types/react-swipeable/index.d.ts
+++ b/types/react-swipeable/index.d.ts
@@ -4,7 +4,7 @@
 //                 Konstantin Vasilev <https://github.com/mctep>
 //                 Hiroki Horiuchi <https://github.com/horiuchi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-syntax-highlighter/index.d.ts b/types/react-syntax-highlighter/index.d.ts
index b751e75bf1..c9590f15a4 100644
--- a/types/react-syntax-highlighter/index.d.ts
+++ b/types/react-syntax-highlighter/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/conorhastings/react-syntax-highlighter
 // Definitions by: Ivo Stratev <https://github.com/NoHomey>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare module 'react-syntax-highlighter' {
     import SyntaxHighlighter from 'react-syntax-highlighter/light';
diff --git a/types/react-table/index.d.ts b/types/react-table/index.d.ts
index ebe531ecfa..c58f54eefc 100644
--- a/types/react-table/index.d.ts
+++ b/types/react-table/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/react-tools/react-table
 // 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.6
+// TypeScript Version: 2.8
 import * as React from 'react';
 
 export type ReactTableFunction = (value?: any) => void;
diff --git a/types/react-tabs/index.d.ts b/types/react-tabs/index.d.ts
index 9c053d465e..9740d1366e 100644
--- a/types/react-tabs/index.d.ts
+++ b/types/react-tabs/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-tabs/
 // Definitions by: Yuu Igarashi <https://github.com/yu-i9/>, Daniel Tschinder <https://github.com/danez>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-tag-input/index.d.ts b/types/react-tag-input/index.d.ts
index 6dd269896e..c6f905788f 100644
--- a/types/react-tag-input/index.d.ts
+++ b/types/react-tag-input/index.d.ts
@@ -1,25 +1,26 @@
-// Type definitions for React-Tags (react-tag-input) 4.7
+// Type definitions for React-Tags (react-tag-input) 5.0
 // Project: https://github.com/prakhar1989/react-tags
 // Definitions by: Ogglas <https://github.com/Ogglas>
 //                  Jan Karres <https://github.com/jankarres>
+//                  Matthew Berryman <https://github.com/matthewberryman>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
 export interface ReactTagsProps {
-    tags?: Array<{ id: number, text: string }>;
-    suggestions?: string[];
+    tags?: Array<{ id: string, text: string }>;
+    suggestions?: Array<{ id: string, text: string }>;
     delimiters?: number[];
     placeholder?: string;
     labelField?: string;
 
-    handleAddition: ((tag: string) => void);
+    handleAddition: ((tag: {id: string, text: string}) => void);
     handleDelete: ((i: number) => void);
-    handleDrag?: ((tag: { id: number; text: string; }, currPos: number, newPos: number) => void);
+    handleDrag?: ((tag: { id: string; text: string; }, currPos: number, newPos: number) => void);
     handleInputChange?: ((value: string) => void);
-    handleFilterSuggestions?: ((textInputValue: string, possibleSuggestionsArray: string[]) => boolean);
-    handleInputBlur?: (() => void);
+    handleFilterSuggestions?: ((textInputValue: string, possibleSuggestionsArray: Array<{ id: string, text: string }>) => boolean);
+    handleInputBlur?: ((textInputValue: string) => void);
 
     autofocus?: boolean;
     allowDeleteFromEmptyInput?: boolean;
diff --git a/types/react-tag-input/react-tag-input-tests.tsx b/types/react-tag-input/react-tag-input-tests.tsx
index 1fde632a45..173f54f98c 100644
--- a/types/react-tag-input/react-tag-input-tests.tsx
+++ b/types/react-tag-input/react-tag-input-tests.tsx
@@ -2,9 +2,9 @@ import * as React from "react";
 import * as ReactDOM from "react-dom";
 import { WithContext as ReactTags } from "react-tag-input";
 
-const tags = Array({ id: 0, text: "test" }, { id: 1, text: "testing" });
+const tags = Array({ id: "0", text: "test" }, { id: "1", text: "testing" });
 
-const suggestions = Array("test1", "test2");
+const suggestions = Array({ id: "0", text: "test" }, { id: "1", text: "testing" });
 
 ReactDOM.render(
     <ReactTags
@@ -14,11 +14,11 @@ ReactDOM.render(
         placeholder="Some placeholder text"
         labelField="Some label"
 
-        handleAddition={(tag: string) => console.log("Add: " + tag)}
+        handleAddition={(tag: { id: string, text: string }) => console.log("Add: " + tag.text)}
         handleDelete={(i: number) => console.log("Delete: " + i)}
-        handleDrag={(tag: { id: number; text: string; }, currPos: number, newPos: number) => console.log("Drag: " + tag.text)}
+        handleDrag={(tag: { id: string; text: string; }, currPos: number, newPos: number) => console.log("Drag: " + tag.text)}
         handleInputChange={(value: string) => console.log("Changed to: ", value)}
-        handleFilterSuggestions={(textInputValue: string, possibleSuggestionsArray: string[]) => true}
+        handleFilterSuggestions={(textInputValue: string, possibleSuggestionsArray: Array<{ id: string, text: string }>) => true}
         handleInputBlur={() => console.log("Blured")}
 
         autofocus={false}
diff --git a/types/react-tagcloud/index.d.ts b/types/react-tagcloud/index.d.ts
index 4f6987cb5f..61725d0b2c 100644
--- a/types/react-tagcloud/index.d.ts
+++ b/types/react-tagcloud/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/madox2/react-tagcloud
 // Definitions by: wassname <https://github.com/wassname>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react"/>
 
diff --git a/types/react-tagsinput/index.d.ts b/types/react-tagsinput/index.d.ts
index 4de3a4b8ac..d234a19c12 100644
--- a/types/react-tagsinput/index.d.ts
+++ b/types/react-tagsinput/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/olahol/react-tagsinput
 // Definitions by: Michael Macnair <https://github.com/mykter>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-tagsinput/react-tagsinput-tests.tsx b/types/react-tagsinput/react-tagsinput-tests.tsx
index cdcd882817..c31a3f7d80 100644
--- a/types/react-tagsinput/react-tagsinput-tests.tsx
+++ b/types/react-tagsinput/react-tagsinput-tests.tsx
@@ -6,10 +6,7 @@ interface StateI {
 }
 
 class Example extends React.Component<{}, StateI> {
-    constructor(props: {}) {
-        super(props);
-        this.state = {tags: []};
-    }
+    state = {tags: []};
 
     handleChange(tags: string[]) {
         this.setState({tags});
diff --git a/types/react-test-renderer/index.d.ts b/types/react-test-renderer/index.d.ts
index d069686903..834664c11d 100644
--- a/types/react-test-renderer/index.d.ts
+++ b/types/react-test-renderer/index.d.ts
@@ -5,7 +5,7 @@
 //                 John Reilly <https://github.com/johnnyreilly>
 //                 John Gozde <https://github.com/jgoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ReactElement, ReactType } from "react";
 
diff --git a/types/react-test-renderer/v15/index.d.ts b/types/react-test-renderer/v15/index.d.ts
index 753f4ef19d..9c65a34140 100644
--- a/types/react-test-renderer/v15/index.d.ts
+++ b/types/react-test-renderer/v15/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://facebook.github.io/react/
 // Definitions by: Arvitaly <https://github.com/arvitaly>, Lochbrunner <https://github.com/lochbrunner>, Lochbrunner <https://github.com/lochbrunner>, John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ReactElement } from "react";
 
diff --git a/types/react-test-renderer/v15/tsconfig.json b/types/react-test-renderer/v15/tsconfig.json
index 4be2e2797f..0c98103ec8 100644
--- a/types/react-test-renderer/v15/tsconfig.json
+++ b/types/react-test-renderer/v15/tsconfig.json
@@ -9,6 +9,9 @@
             "react": [
                 "react/v15"
             ],
+            "react-dom": [
+                "react-dom/v15"
+            ],
             "react-test-renderer": [
                 "react-test-renderer/v15"
             ]
@@ -30,4 +33,4 @@
         "shallow/index.d.ts",
         "react-test-renderer-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-tether/index.d.ts b/types/react-tether/index.d.ts
index 1012c8254b..8268550eb5 100644
--- a/types/react-tether/index.d.ts
+++ b/types/react-tether/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/souporserious/react-tether
 // Definitions by: Ryan Price <https://github.com/ryprice>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export default TetherComponent;
 export as namespace ReactTether;
diff --git a/types/react-text-mask/index.d.ts b/types/react-text-mask/index.d.ts
index d598fcf711..9d7e758b57 100644
--- a/types/react-text-mask/index.d.ts
+++ b/types/react-text-mask/index.d.ts
@@ -1,14 +1,17 @@
 // Type definitions for react-text-mask 5.4
 // Project: https://github.com/text-mask/text-mask
-// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>, Deividi Cavarzan <https://github.com/cavarzan>
+// Definitions by: Guilherme Hübner <https://github.com/guilhermehubner>
+//                 Deividi Cavarzan <https://github.com/cavarzan>
+//                 Artem Lyubchuk <https://github.com/needpower>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
-import * as React from 'react';
+import * as React from "react";
 
 export type maskArray = Array<string | RegExp>;
 
-export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputElement> {
+export interface MaskedInputProps
+    extends React.InputHTMLAttributes<HTMLInputElement> {
     mask?: maskArray | ((value: string) => maskArray);
 
     guide?: boolean;
@@ -17,11 +20,14 @@ export interface MaskedInputProps extends React.InputHTMLAttributes<HTMLInputEle
 
     keepCharPositions?: boolean;
 
-    pipe?: (conformedValue: string, config: any) => false | string | { value: string; indexesOfPipedChars: number[] };
+    pipe?: (
+        conformedValue: string,
+        config: any
+    ) => false | string | { value: string; indexesOfPipedChars: number[] };
 
     showMask?: boolean;
 
-    render?: (ref: MaskedInput, props: any) => any;
+    render?: (ref: (inputElement: HTMLElement) => void, props: any) => any;
 }
 
 export interface conformToMaskResult {
@@ -31,6 +37,13 @@ export interface conformToMaskResult {
     };
 }
 
-export default class MaskedInput extends React.Component<MaskedInputProps, any> {}
+export default class MaskedInput extends React.Component<
+    MaskedInputProps,
+    any
+> {}
 
-export function conformToMask(text: string, mask: maskArray, config: any): conformToMaskResult;
+export function conformToMask(
+    text: string,
+    mask: maskArray,
+    config: any
+): conformToMaskResult;
diff --git a/types/react-textarea-autosize/index.d.ts b/types/react-textarea-autosize/index.d.ts
index de52335683..90fa858dfb 100644
--- a/types/react-textarea-autosize/index.d.ts
+++ b/types/react-textarea-autosize/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/andreypopp/react-textarea-autosize
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>, Jerry Zou <https://github.com/zry656565>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 declare module "react-textarea-autosize" {
     import * as React from "react";
diff --git a/types/react-timeout/index.d.ts b/types/react-timeout/index.d.ts
index b214318a23..a360b47c5a 100644
--- a/types/react-timeout/index.d.ts
+++ b/types/react-timeout/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/plougsgaard/react-timeout
 // Definitions by: Kerwyn Rojas <https://github.com/kerwynrg>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/react-toastify/index.d.ts b/types/react-toastify/index.d.ts
index e77ef01837..0bde299cd4 100644
--- a/types/react-toastify/index.d.ts
+++ b/types/react-toastify/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/fkhadra/react-toastify#readme
 // Definitions by: icopp <https://github.com/icopp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { Transition } from 'react-transition-group';
diff --git a/types/react-toastr/index.d.ts b/types/react-toastr/index.d.ts
index 8320244d7f..7b822ad601 100644
--- a/types/react-toastr/index.d.ts
+++ b/types/react-toastr/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tomchentw/react-toastr
 // Definitions by: Josh Holmer <https://github.com/shssoichiro>, Dan Regazzi <https://github.com/DanRegazzi>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, ReactHTML } from 'react';
 
diff --git a/types/react-toggle/index.d.ts b/types/react-toggle/index.d.ts
index 015daff31e..0d625cff55 100644
--- a/types/react-toggle/index.d.ts
+++ b/types/react-toggle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/aaronshaf/react-toggle
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, InputHTMLAttributes, ReactNode } from "react";
 
diff --git a/types/react-toggle/v2/index.d.ts b/types/react-toggle/v2/index.d.ts
index 2b0774de2d..388121e5a8 100644
--- a/types/react-toggle/v2/index.d.ts
+++ b/types/react-toggle/v2/index.d.ts
@@ -1,20 +1,24 @@
 // Type definitions for react-toggle 2.2
 // Project: https://github.com/aaronshaf/react-toggle
 // Definitions by: Karol Janyst <https://github.com/LKay>
+//                 Jason Unger <https://github.com/jsonunger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
-import { Component, HTMLAttributes, ReactNode } from "react";
+import { ComponentClass, InputHTMLAttributes, ReactNode } from "react";
 
-export interface ToggleIcons {
-    checked?: ReactNode;
-    unchecked?: ReactNode;
+declare namespace Toggle {
+    interface ToggleIcons {
+        checked?: ReactNode;
+        unchecked?: ReactNode;
+    }
+
+    interface ToggleProps extends InputHTMLAttributes<HTMLInputElement> {
+        icons?: boolean | ToggleIcons;
+        defaultChecked?: boolean;
+    }
 }
 
-export interface ToggleProps extends HTMLAttributes<any> {
-    "aria-labelledby"?: string;
-    "aria-label"?: string;
-    icons?: boolean | ToggleIcons;
-}
+declare const Toggle: ComponentClass<Toggle.ToggleProps>;
 
-export default class Toggle extends Component<ToggleProps> {}
+export = Toggle;
diff --git a/types/react-toggle/v2/react-toggle-tests.tsx b/types/react-toggle/v2/react-toggle-tests.tsx
index f02cf447e4..ac86a3ea7e 100644
--- a/types/react-toggle/v2/react-toggle-tests.tsx
+++ b/types/react-toggle/v2/react-toggle-tests.tsx
@@ -8,3 +8,15 @@ class Test extends React.Component {
         );
     }
 }
+
+class TestControlled extends React.Component<{}, {checked: boolean}> {
+    state = {
+        checked: false
+    };
+
+    render() {
+        return (
+            <Toggle name="toggle" checked={this.state.checked} onChange={(e) => this.setState({ checked: e.target.checked })} />
+        );
+    }
+}
diff --git a/types/react-toggle/v2/tsconfig.json b/types/react-toggle/v2/tsconfig.json
index 996290fe7b..122fd7a4b3 100644
--- a/types/react-toggle/v2/tsconfig.json
+++ b/types/react-toggle/v2/tsconfig.json
@@ -21,10 +21,11 @@
         },
         "noEmit": true,
         "forceConsistentCasingInFileNames": true,
-        "jsx": "react"
+        "jsx": "react",
+        "esModuleInterop": true
     },
     "files": [
         "index.d.ts",
         "react-toggle-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/react-tooltip/index.d.ts b/types/react-tooltip/index.d.ts
index 044e737402..868e49e4ca 100644
--- a/types/react-tooltip/index.d.ts
+++ b/types/react-tooltip/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/wwayne/react-tooltip
 // Definitions by: Deividas Bakanas <https://github.com/DeividasBakanas>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-touch/index.d.ts b/types/react-touch/index.d.ts
index 3e714b2b6c..16ba4f39ba 100644
--- a/types/react-touch/index.d.ts
+++ b/types/react-touch/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/leonaves/react-touch
 // Definitions by: Grzegorz Kielak <https://github.com/grzesie2k>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-tracking/index.d.ts b/types/react-tracking/index.d.ts
index 8117fb3336..c0e4571bd5 100644
--- a/types/react-tracking/index.d.ts
+++ b/types/react-tracking/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/NYTimes/react-tracking
 // Definitions by: Eloy Durán <https://github.com/alloy>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
@@ -50,7 +50,7 @@ interface Options<T> {
     process?(ownTrackingData: T): T | Falsy;
 }
 
-export type TrackingInfo<T, P, S> = T | ((props: P, state: S) => T);
+export type TrackingInfo<T, P, S> = T | ((props: P, state: S, args: any[any]) => T);
 
 // Duplicated from ES6 lib to remove the `void` typing, otherwise `track` can’t be used as a HOC function that passes
 // through a JSX component that be used without casting.
diff --git a/types/react-tracking/test/react-tracking-with-types-tests.tsx b/types/react-tracking/test/react-tracking-with-types-tests.tsx
index 76c9ccb5b5..a840216af0 100644
--- a/types/react-tracking/test/react-tracking-with-types-tests.tsx
+++ b/types/react-tracking/test/react-tracking-with-types-tests.tsx
@@ -30,10 +30,15 @@ class ClassPage extends React.Component<Props, State> {
     // ... other stuff
     }
 
+    @track((_props, _state, [e]: [React.MouseEvent]) => ({ event: `drag started at ${e.screenX}x${e.screenY}` }))
+    handleDrag(event: React.MouseEvent) {
+        // no-op
+    }
+
     @track((props, state) => ({ event: `got ${props.someProp} and clicked ${state.isClicked}` }))
     render() {
         return (
-            <button onClick={this.handleClick}>
+            <button onClick={this.handleClick} onDrag={this.handleDrag}>
                 Click Me!
             </button>
         );
diff --git a/types/react-tracking/test/react-tracking-without-types-tests.tsx b/types/react-tracking/test/react-tracking-without-types-tests.tsx
index 02a89d929c..a3cf2b4330 100644
--- a/types/react-tracking/test/react-tracking-without-types-tests.tsx
+++ b/types/react-tracking/test/react-tracking-without-types-tests.tsx
@@ -14,6 +14,11 @@ class ClassPage extends React.Component<any> {
     // ... other stuff
     }
 
+    @track((_props, _state, [e]) => ({ event: `drag started at ${e.screenX}x${e.screenY}` }))
+    handleDrag(event: any) {
+        // no-op
+    }
+
     // Only need to cast this to `any` because the settings for this project is to disallow implicit `any`.
     @track((props: any, state: any) => ({ event: `got ${props.someProp} and clicked ${state.isClicked}` }))
     render() {
diff --git a/types/react-transition-group/Transition.d.ts b/types/react-transition-group/Transition.d.ts
index 66ab782d1e..f8722a41d8 100644
--- a/types/react-transition-group/Transition.d.ts
+++ b/types/react-transition-group/Transition.d.ts
@@ -16,6 +16,13 @@ export interface TransitionActions {
     exit?: boolean;
 }
 
+type TransitionStatus =
+    typeof ENTERING |
+    typeof ENTERED |
+    typeof EXITING |
+    typeof EXITED |
+    typeof UNMOUNTED;
+export type TransitionChildren = React.ReactNode | ((status: TransitionStatus) => React.ReactNode);
 export interface TransitionProps extends TransitionActions {
     in?: boolean;
     mountOnEnter?: boolean;
@@ -29,6 +36,7 @@ export interface TransitionProps extends TransitionActions {
     onExiting?: ExitHandler;
     onExited?: ExitHandler;
     [prop: string]: any;
+    children?: TransitionChildren;
 }
 
 /**
diff --git a/types/react-transition-group/index.d.ts b/types/react-transition-group/index.d.ts
index dbe906f679..2d97f64ce6 100644
--- a/types/react-transition-group/index.d.ts
+++ b/types/react-transition-group/index.d.ts
@@ -2,8 +2,9 @@
 // Project: https://github.com/reactjs/react-transition-group
 // Definitions by: Karol Janyst <https://github.com/LKay>
 //                 Epskampie <https://github.com/Epskampie>
+//                 Masafumi Koba <https://github.com/ybiquitous>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import CSSTransition = require("./CSSTransition");
 import Transition from "./Transition";
diff --git a/types/react-transition-group/react-transition-group-tests.tsx b/types/react-transition-group/react-transition-group-tests.tsx
index 1441027481..172d91ce54 100644
--- a/types/react-transition-group/react-transition-group-tests.tsx
+++ b/types/react-transition-group/react-transition-group-tests.tsx
@@ -51,6 +51,18 @@ const Test: React.StatelessComponent = () => {
             >
                 <div>{ "test" }</div>
             </Components.Transition>
+            <Components.Transition in timeout={500}>
+                {(status) => {
+                     switch (status) {
+                         case ENTERING:
+                         case ENTERED:
+                         case EXITING:
+                         case EXITED:
+                         case UNMOUNTED:
+                             return <div>{status}</div>;
+                     }
+                }}
+            </Components.Transition>
 
             <Transition
                 timeout={ { enter : 500, exit : 500 } }
diff --git a/types/react-transition-group/v1/index.d.ts b/types/react-transition-group/v1/index.d.ts
index 42dea4ba15..016d1f3b48 100644
--- a/types/react-transition-group/v1/index.d.ts
+++ b/types/react-transition-group/v1/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/reactjs/react-transition-group
 // Definitions by: Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { HTMLAttributes, ReactElement, ReactType } from "react";
 
diff --git a/types/react-treeview/index.d.ts b/types/react-treeview/index.d.ts
index 2bfacc3eee..83f60eb5f2 100644
--- a/types/react-treeview/index.d.ts
+++ b/types/react-treeview/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/chenglou/react-treeview
 // Definitions by: Jay Anslow <https://github.com/janslow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, HTMLAttributes } from 'react';
 
diff --git a/types/react-truncate/index.d.ts b/types/react-truncate/index.d.ts
index 15c72616c0..13de471a93 100644
--- a/types/react-truncate/index.d.ts
+++ b/types/react-truncate/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/One-com/react-truncate
 // Definitions by: Matt Perry <https://github.com/mattvperry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-twitter-auth/index.d.ts b/types/react-twitter-auth/index.d.ts
index 46dc5e7aa7..962693997c 100644
--- a/types/react-twitter-auth/index.d.ts
+++ b/types/react-twitter-auth/index.d.ts
@@ -1,8 +1,9 @@
 // Type definitions for react-twitter-auth 0.0
 // Project: https://github.com/GenFirst/react-twitter-auth
 // Definitions by: Paul Fasola <https://github.com/paulfasola>
+//                 Dmytro Savchenko <https://github.com/loginwashere>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 interface TwitterLoginProps {
     tag?: React.ReactType;
@@ -17,6 +18,9 @@ interface TwitterLoginProps {
     dialogHeight?: number;
     showIcon?: boolean;
     credentials?: "omit" | "same-origin" | "include";
+    customHeaders?: HeadersInit;
+    children?: React.ReactNode;
+    forceLogin?: boolean;
 }
 
 declare var TwitterLogin: React.StatelessComponent<TwitterLoginProps>;
diff --git a/types/react-twitter-auth/react-twitter-auth-tests.tsx b/types/react-twitter-auth/react-twitter-auth-tests.tsx
index 3bb1e8812d..abed3577d8 100644
--- a/types/react-twitter-auth/react-twitter-auth-tests.tsx
+++ b/types/react-twitter-auth/react-twitter-auth-tests.tsx
@@ -6,17 +6,47 @@ const ReactTwitterAuth: React.StatelessComponent = () => {
     function handleFailure(msg: string) {}
 
     return (
-        <TwitterLogin loginUrl="http://server.url/api/v1/auth/twitter"
-                      onSuccess={ handleSucess }
-                      onFailure={ handleFailure }
-                      requestTokenUrl="http://server.url/api/v1/auth/twitter/reverse"
-                      dialogWidth={ 1200 }
-                      dialogHeight={ 800 }
-                      style={{display: "initial"}}
-                      disabled={ false }
-                      text={ "test" }
-                      tag="button"
-                      credentials="same-origin"
-                      showIcon={true}/>
+        <div>
+            <TwitterLogin
+                loginUrl="http://server.url/api/v1/auth/twitter"
+                onSuccess={ handleSucess }
+                onFailure={ handleFailure }
+                requestTokenUrl="http://server.url/api/v1/auth/twitter/reverse"
+            />
+            <TwitterLogin
+                loginUrl="http://server.url/api/v1/auth/twitter"
+                onSuccess={ handleSucess }
+                onFailure={ handleFailure }
+                requestTokenUrl="http://server.url/api/v1/auth/twitter/reverse"
+                dialogWidth={ 1200 }
+                dialogHeight={ 800 }
+                style={{display: "initial"}}
+                disabled={ false }
+                text={ "test" }
+                tag="button"
+                credentials="same-origin"
+                showIcon={true}
+            />
+            <TwitterLogin
+                loginUrl="http://server.url/api/v1/auth/twitter"
+                onSuccess={ handleSucess }
+                onFailure={ handleFailure }
+                requestTokenUrl="http://server.url/api/v1/auth/twitter/reverse"
+                dialogWidth={ 1200 }
+                dialogHeight={ 800 }
+                style={{display: "initial"}}
+                disabled={ false }
+                text={ "test" }
+                tag="button"
+                credentials="same-origin"
+                showIcon={true}
+                customHeaders={{
+                    authorization: 'Bearer sometoken',
+                }}
+                forceLogin={true}
+            >
+                Login with twitter
+            </TwitterLogin>
+        </div>
     );
 };
diff --git a/types/react-user-tour/index.d.ts b/types/react-user-tour/index.d.ts
index 6fdbc2da13..1e704d5306 100644
--- a/types/react-user-tour/index.d.ts
+++ b/types/react-user-tour/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/socialtables/react-user-tour
 // Definitions by: Carlo Cancellieri <https://github.com/ccancellieri>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types='react' />
 
diff --git a/types/react-vertical-timeline-component/index.d.ts b/types/react-vertical-timeline-component/index.d.ts
new file mode 100644
index 0000000000..44a9fb3116
--- /dev/null
+++ b/types/react-vertical-timeline-component/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for react-vertical-timeline-component 2.1
+// Project: https://github.com/stephane-monnot/react-vertical-timeline
+// Definitions by: Stéphane Monnot <https://github.com/stephane-monnot>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+
+export interface VerticalTimelineProps {
+    animate?: boolean;
+    className?: string;
+}
+
+export interface VerticalTimelineElementProps {
+    id?: string;
+    className?: string;
+    date?: string;
+    iconOnClick?: () => void;
+    iconStyle?: React.CSSProperties;
+    icon?: React.ReactNode;
+    position?: string;
+    style?: React.CSSProperties;
+}
+
+export class VerticalTimeline extends React.Component<VerticalTimelineProps> { }
+export class VerticalTimelineElement extends React.Component<VerticalTimelineElementProps> { }
diff --git a/types/react-vertical-timeline-component/react-vertical-timeline-component-tests.tsx b/types/react-vertical-timeline-component/react-vertical-timeline-component-tests.tsx
new file mode 100644
index 0000000000..d09416010f
--- /dev/null
+++ b/types/react-vertical-timeline-component/react-vertical-timeline-component-tests.tsx
@@ -0,0 +1,29 @@
+import * as React from "react";
+import { VerticalTimeline, VerticalTimelineElement } from "react-vertical-timeline-component";
+
+export default class ReactVerticalTimelineComponentTests extends React.Component {
+    render() {
+        return (
+            <VerticalTimeline animate={false} className="vertical-timeline--red">
+                <VerticalTimelineElement
+                    iconOnClick={() => console.info('icon has been clicked')}
+                    className="vertical-timeline-element--work"
+                    date="2012 - present"
+                >
+                    <h3 className="vertical-timeline-element-title">Creative Director</h3>
+                    <h4 className="vertical-timeline-element-subtitle">Miami, FL</h4>
+                    <p>
+                        Creative Direction, User Experience, Visual Design, Project Management, Team Leading
+                    </p>
+                </VerticalTimelineElement>
+                <VerticalTimelineElement className="vertical-timeline-element--work" date="2011 - present">
+                    <h3 className="vertical-timeline-element-title">Art Director</h3>
+                    <h4 className="vertical-timeline-element-subtitle">San Francisco, CA</h4>
+                    <p>
+                        Creative Direction, User Experience, Visual Design, SEO, Online Marketing
+                    </p>
+                </VerticalTimelineElement>
+            </VerticalTimeline>
+        );
+    }
+}
diff --git a/types/react-vertical-timeline-component/tsconfig.json b/types/react-vertical-timeline-component/tsconfig.json
new file mode 100644
index 0000000000..7c4c2106fb
--- /dev/null
+++ b/types/react-vertical-timeline-component/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "files": [
+        "index.d.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "jsx": "react",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "react-vertical-timeline-component-tests.tsx"
+    ]
+}
diff --git a/types/react-vertical-timeline-component/tslint.json b/types/react-vertical-timeline-component/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/react-vertical-timeline-component/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/react-virtual-keyboard/index.d.ts b/types/react-virtual-keyboard/index.d.ts
index 03597e82e6..705dfc5682 100644
--- a/types/react-virtual-keyboard/index.d.ts
+++ b/types/react-virtual-keyboard/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://www.npmjs.com/package/react-virtual-keyboard
 // Definitions by: Bogdan Surai <https://github.com/bsurai>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component } from "react";
 import { KeyboardOptions, NavigateOptions } from "virtual-keyboard";
diff --git a/types/react-virtual-keyboard/react-virtual-keyboard-tests.tsx b/types/react-virtual-keyboard/react-virtual-keyboard-tests.tsx
index 61dd2e7dea..c3ce0df11e 100644
--- a/types/react-virtual-keyboard/react-virtual-keyboard-tests.tsx
+++ b/types/react-virtual-keyboard/react-virtual-keyboard-tests.tsx
@@ -6,6 +6,9 @@ export interface KbState {
 }
 
 export default class MyKeyboard extends React.Component<{}, KbState> {
+    state = {
+        textarea: ''
+    };
     onTextareaChanged = (newState: string) => {
         this.setState({ textarea: newState });
     }
diff --git a/types/react-virtualized-select/index.d.ts b/types/react-virtualized-select/index.d.ts
index 83c062eab7..402b027785 100644
--- a/types/react-virtualized-select/index.d.ts
+++ b/types/react-virtualized-select/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/bvaughn/react-virtualized-select
 // Definitions by: Sean Kelley <https://github.com/seansfkelley>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { ReactSelectProps, ReactAsyncSelectProps, ReactCreatableSelectProps, LoadOptionsHandler, OptionValues } from "react-select";
diff --git a/types/react-virtualized-select/tsconfig.json b/types/react-virtualized-select/tsconfig.json
index b544360da3..42387bc3e0 100644
--- a/types/react-virtualized-select/tsconfig.json
+++ b/types/react-virtualized-select/tsconfig.json
@@ -10,11 +10,18 @@
         "noImplicitThis": true,
 		"strictFunctionTypes": true,
         "strictNullChecks": true,
-        "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
             "../"
         ],
+        "paths": {
+            "react-select": [
+                "react-select/v1"
+            ],
+            "react-select/*": [
+                "react-select/v1/*"
+            ]
+        },
         "types": [],
         "noEmit": true,
         "forceConsistentCasingInFileNames": true
diff --git a/types/react-virtualized/dist/es/Table.d.ts b/types/react-virtualized/dist/es/Table.d.ts
index 09e3c2b37e..b66fac389b 100644
--- a/types/react-virtualized/dist/es/Table.d.ts
+++ b/types/react-virtualized/dist/es/Table.d.ts
@@ -189,13 +189,13 @@ export type RowMouseEventHandlerParams = {
         index: number;
     };
     index: number;
-    event: React.SyntheticEvent<React.MouseEvent<any>>;
+    event: React.MouseEvent<any>;
 };
 
 export type HeaderMouseEventHandlerParams = {
     dataKey: string;
     columnData: any;
-    event: React.SyntheticEvent<React.MouseEvent<any>>;
+    event: React.MouseEvent<any>;
 };
 
 // ref: https://github.com/bvaughn/react-virtualized/blob/master/docs/Table.md
diff --git a/types/react-virtualized/dist/es/WindowScroller.d.ts b/types/react-virtualized/dist/es/WindowScroller.d.ts
index 628d58744d..c3074208d6 100644
--- a/types/react-virtualized/dist/es/WindowScroller.d.ts
+++ b/types/react-virtualized/dist/es/WindowScroller.d.ts
@@ -11,26 +11,16 @@ export type WindowScrollerChildProps = {
     width: number;
     isScrolling: boolean;
     scrollTop: number;
-    onChildScroll: () => void;
+    onChildScroll: (params: { scrollTop: number }) => void;
 };
 
 export type WindowScrollerProps = {
     /**
      * Function responsible for rendering children.
      * This function should implement the following signature:
-     * ({ height, isScrolling, scrollLeft, scrollTop, width }) => PropTypes.element
+     * ({ height, isScrolling, scrollLeft, scrollTop, width, onChildScroll }) => PropTypes.element
      */
-    children: (
-        params: {
-            onChildScroll: (params: { scrollTop: number }) => void;
-            registerChild: (params?: Element) => void;
-            height: number;
-            isScrolling: boolean;
-            scrollLeft: number;
-            scrollTop: number;
-            width: number;
-        }
-    ) => React.ReactNode;
+    children: (params: WindowScrollerChildProps) => React.ReactNode;
 
     /** Callback to be invoked on-resize: ({ height, width }) */
     onResize?: (params: { height: number; width: number }) => void;
diff --git a/types/react-virtualized/index.d.ts b/types/react-virtualized/index.d.ts
index c5a1a60aaa..4cbc644bc8 100644
--- a/types/react-virtualized/index.d.ts
+++ b/types/react-virtualized/index.d.ts
@@ -7,8 +7,9 @@
 //                 Kræn Hansen <https://github.com/kraenhansen>
 //                 Steve Zhang <https://github.com/Stevearzh>
 //                 Maciej Goszczycki <https://github.com/mgoszcz2>
+//                 Brandon Hall <https://github.com/brandonhall>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export {
     ArrowKeyStepper,
@@ -65,7 +66,8 @@ export {
     ScrollParams,
     SectionRenderedParams,
     SizeAndPositionData,
-    VisibleCellRange
+    VisibleCellRange,
+    ScrollbarPresenceParams
 } from "./dist/es/Grid";
 export {
     InfiniteLoader,
diff --git a/types/react-virtualized/react-virtualized-tests.tsx b/types/react-virtualized/react-virtualized-tests.tsx
index e4bfd5228a..09a511dc8a 100644
--- a/types/react-virtualized/react-virtualized-tests.tsx
+++ b/types/react-virtualized/react-virtualized-tests.tsx
@@ -13,6 +13,7 @@ import {
 } from "react-virtualized";
 
 export class ArrowKeyStepperExample extends PureComponent<any, any> {
+    state: any;
     render() {
         const { mode } = this.state;
 
@@ -88,6 +89,7 @@ export class ArrowKeyStepperExample extends PureComponent<any, any> {
 import { List } from "react-virtualized";
 
 export class AutoSizerExample extends PureComponent<any, any> {
+    state: any;
     render() {
         const { list } = this.context;
         const { hideDescription } = this.state;
@@ -198,6 +200,7 @@ const GUTTER_SIZE = 3;
 const CELL_WIDTH = 75;
 
 export class CollectionExample extends PureComponent<any, any> {
+    state: any;
     _columnYMap: any;
 
     constructor(props: any, context: any) {
@@ -303,6 +306,7 @@ export class CollectionExample extends PureComponent<any, any> {
 import { ColumnSizer } from "react-virtualized";
 
 export class ColumnSizerExample extends PureComponent<any, any> {
+    state: any;
     render() {
         const { columnMaxWidth, columnMinWidth, columnCount } = this.state;
 
@@ -507,6 +511,8 @@ const STATUS_LOADING = 1;
 const STATUS_LOADED = 2;
 
 export class InfiniteLoaderExample extends PureComponent<any, any> {
+
+    state: any;
     _timeoutIds = new Set<number>();
 
     componentWillUnmount() {
@@ -613,6 +619,7 @@ export class InfiniteLoaderExample extends PureComponent<any, any> {
 }
 
 export class ListExample extends PureComponent<any, any> {
+    state: any;
     constructor(props: any, context: any) {
         super(props, context);
 
@@ -751,6 +758,8 @@ export class GridExample2 extends PureComponent<any, any> {
     _cellPositioner: Positioner;
     _masonry: Masonry;
 
+    state: any;
+
     constructor(props: any, context: any) {
         super(props, context);
 
diff --git a/types/react-webcam/index.d.ts b/types/react-webcam/index.d.ts
index 5bb6337838..5986af5c75 100644
--- a/types/react-webcam/index.d.ts
+++ b/types/react-webcam/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mozmorris/react-webcam
 // Definitions by: Lucas Servén Marín <https://github.com/squat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-widgets/index.d.ts b/types/react-widgets/index.d.ts
index f02d9f016d..df804235e0 100644
--- a/types/react-widgets/index.d.ts
+++ b/types/react-widgets/index.d.ts
@@ -4,8 +4,9 @@
 //                 Balázs Sándor <https://github.com/sanyatuning>
 //                 Frode Hansen <https://github.com/frodehansen2>
 //                 Andrew Makarov <https://github.com/r3nya>
+//                 Maxime Billemaz <https://github.com/MBillemaz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/react-widgets/lib/DateTimePicker.d.ts b/types/react-widgets/lib/DateTimePicker.d.ts
index ee0428c67b..65a683b1fe 100644
--- a/types/react-widgets/lib/DateTimePicker.d.ts
+++ b/types/react-widgets/lib/DateTimePicker.d.ts
@@ -77,7 +77,7 @@ interface DateTimePickerProps extends ReactWidgetsCommonDropdownProps<DateTimePi
      * parsing yourself. When parse is unspecified and the format prop is a String parse will
      * automatically use that format as its default
      */
-    parse?: (str: string) => Date | string[];
+    parse?: ((str: string) => Date) | string[] | string;
     /**
      * The starting and lowest level view the calendar can navigate down to.
      * @enum "month" "year" "decade" "century"
diff --git a/types/react-widgets/lib/DropdownList.d.ts b/types/react-widgets/lib/DropdownList.d.ts
index eea9b3d534..644d0c4873 100644
--- a/types/react-widgets/lib/DropdownList.d.ts
+++ b/types/react-widgets/lib/DropdownList.d.ts
@@ -2,16 +2,25 @@ import * as React from 'react';
 import { ReactWidgetsCommonDropdownProps, AutoFocus } from './CommonProps';
 
 interface DropdownListProps extends ReactWidgetsCommonDropdownProps<DropdownListClass>, AutoFocus {
+
+    /**
+     * Allow to create a new option on the data list.
+     */
+    allowCreate?: boolean | 'onFilter'
     /**
      * The current value of the DropdownList. This can be an object (such as a member of the
      * data array) or a primitive value, hinted to by the valueField. The widget value does not
      * need to be in the data array; widgets can have values that are not in their list.
      */
     value?: any;
-      /**
-     * Default value.
-     */
+    /**
+   * Default value.
+   */
     defaultValue?: any;
+    /**
+     * Create event Handler that is called when a new option is added to the data list.
+     */
+    onCreate?: (value: any) => void;
     /**
      * Change event Handler that is called when the value is changed.
      */
@@ -40,6 +49,10 @@ interface DropdownListProps extends ReactWidgetsCommonDropdownProps<DropdownList
      * @default 250
      */
     delay?: number;
+    /**
+     * Change the opening direction of the popup
+     */
+    dropUp?: boolean;
     /**
      * A dataItem field name for uniquely identifying items in the data list. A valueField is
      * required when the value prop is not itself a dataItem. A valueField is useful when
@@ -177,9 +190,14 @@ interface DropdownListMessages {
      * @default: "The filter returned no results"
      */
     emptyFilter?: string | ((props: DropdownListProps) => string);
+    /**
+     * Text to display for the create option
+     * @default: "Create option {text}"
+     */
+    createOption?: string | ((props: DropdownListProps) => string);
 }
 
-interface DropdownList extends React.ReactElement<DropdownListProps> {}
-interface DropdownListClass extends React.ComponentClass<DropdownListProps> {}
+interface DropdownList extends React.ReactElement<DropdownListProps> { }
+interface DropdownListClass extends React.ComponentClass<DropdownListProps> { }
 declare var DropdownList: DropdownListClass;
 export = DropdownList;
diff --git a/types/react-youtube-embed/index.d.ts b/types/react-youtube-embed/index.d.ts
index 9fcb2f81cb..3327516ad9 100644
--- a/types/react-youtube-embed/index.d.ts
+++ b/types/react-youtube-embed/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/escaladesports/react-youtube-embed#readme
 // Definitions by: Charles Salmon <https://github.com/charles-salmon>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 
diff --git a/types/react-youtube/index.d.ts b/types/react-youtube/index.d.ts
index 65b5858ae6..fe9baf2e42 100644
--- a/types/react-youtube/index.d.ts
+++ b/types/react-youtube/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/troybetz/react-youtube
 // Definitions by: kgtkr <https://github.com/kgtkr>
 // Definitions: https://github.com/borisyankov/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 export default class YouTube extends React.Component<{
diff --git a/types/react/global.d.ts b/types/react/global.d.ts
index 8d6062b4bc..5afef3a17c 100644
--- a/types/react/global.d.ts
+++ b/types/react/global.d.ts
@@ -13,6 +13,7 @@ interface FocusEvent extends Event { }
 interface KeyboardEvent extends Event { }
 interface MouseEvent extends Event { }
 interface TouchEvent extends Event { }
+interface PointerEvent extends Event { }
 interface TransitionEvent extends Event { }
 interface UIEvent extends Event { }
 interface WheelEvent extends Event { }
diff --git a/types/react/index.d.ts b/types/react/index.d.ts
index b4fb9415d3..789061779d 100644
--- a/types/react/index.d.ts
+++ b/types/react/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for React 16.3
+// Type definitions for React 16.4
 // Project: http://facebook.github.io/react/
 // Definitions by: Asana <https://asana.com>
 //                 AssureSign <http://www.assuresign.com>
@@ -16,12 +16,16 @@
 //                 Guilherme Hübner <https://github.com/guilhermehubner>
 //                 Ferdy Budhidharma <https://github.com/ferdaber>
 //                 Johann Rakotoharisoa <https://github.com/jrakotoharisoa>
+//                 Olivier Pascal <https://github.com/pascaloliv>
+//                 Martin Hochel <https://github.com/hotell>
+//                 Frank Li <https://github.com/franklixuefei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference path="global.d.ts" />
 
 import * as CSS from 'csstype';
+import * as PropTypes from 'prop-types';
 
 type NativeAnimationEvent = AnimationEvent;
 type NativeClipboardEvent = ClipboardEvent;
@@ -31,6 +35,7 @@ type NativeFocusEvent = FocusEvent;
 type NativeKeyboardEvent = KeyboardEvent;
 type NativeMouseEvent = MouseEvent;
 type NativeTouchEvent = TouchEvent;
+type NativePointerEvent = PointerEvent;
 type NativeTransitionEvent = TransitionEvent;
 type NativeUIEvent = UIEvent;
 type NativeWheelEvent = WheelEvent;
@@ -55,8 +60,7 @@ declare namespace React {
 
     type Ref<T> = string | { bivarianceHack(instance: T | null): any }["bivarianceHack"] | RefObject<T>;
 
-    // tslint:disable-next-line:interface-over-type-literal
-    type ComponentState = {};
+    type ComponentState = any;
 
     interface Attributes {
         key?: Key;
@@ -102,7 +106,7 @@ declare namespace React {
         type: keyof ReactSVG;
     }
 
-    interface ReactPortal {
+    interface ReactPortal extends ReactElement<any> {
         key: Key | null;
         children: ReactNode;
     }
@@ -279,13 +283,18 @@ declare namespace React {
     // tslint:disable-next-line:no-empty-interface
     interface Component<P = {}, S = {}, SS = any> extends ComponentLifecycle<P, S, SS> { }
     class Component<P, S> {
+        constructor(props: Readonly<P>);
+        /**
+         * @deprecated
+         * https://reactjs.org/docs/legacy-context.html
+         */
         constructor(props: P, context?: any);
 
         // 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 | null)) | (Pick<S, K> | S | null),
+            state: ((prevState: Readonly<S>, props: Readonly<P>) => (Pick<S, K> | S | null)) | (Pick<S, K> | S | null),
             callback?: () => void
         ): void;
 
@@ -297,9 +306,17 @@ declare namespace React {
         // always pass children as variadic arguments to `createElement`.
         // In the future, if we can define its call signature conditionally
         // on the existence of `children` in `P`, then we should remove this.
-        props: Readonly<{ children?: ReactNode }> & Readonly<P>;
+        readonly props: Readonly<{ children?: ReactNode }> & Readonly<P>;
         state: Readonly<S>;
+        /**
+         * @deprecated
+         * https://reactjs.org/docs/legacy-context.html
+         */
         context: any;
+        /**
+         * @deprecated
+         * https://reactjs.org/docs/refs-and-the-dom.html#legacy-api-string-refs
+         */
         refs: {
             [key: string]: ReactInstance
         };
@@ -338,8 +355,8 @@ declare namespace React {
         displayName?: string;
     }
 
-    interface ComponentClass<P = {}> extends StaticLifecycle<P, any> {
-        new (props: P, context?: any): Component<P, ComponentState>;
+    interface ComponentClass<P = {}, S = ComponentState> extends StaticLifecycle<P, S> {
+        new (props: P, context?: any): Component<P, S>;
         propTypes?: ValidationMap<P>;
         contextTypes?: ValidationMap<any>;
         childContextTypes?: ValidationMap<any>;
@@ -371,7 +388,7 @@ declare namespace React {
     // methods are present.
     interface ComponentLifecycle<P, S, SS = any> extends NewLifecycle<P, S, SS>, DeprecatedLifecycle<P, S> {
         /**
-         * Called immediately after a compoment is mounted. Setting state here will trigger re-rendering.
+         * Called immediately after a component is mounted. Setting state here will trigger re-rendering.
          */
         componentDidMount?(): void;
         /**
@@ -590,6 +607,18 @@ declare namespace React {
         nativeEvent: NativeDragEvent;
     }
 
+    interface PointerEvent<T = Element> extends MouseEvent<T> {
+        pointerId: number;
+        pressure: number;
+        tiltX: number;
+        tiltY: number;
+        width: number;
+        height: number;
+        pointerType: 'mouse' | 'pen' | 'touch';
+        isPrimary: boolean;
+        nativeEvent: NativePointerEvent;
+    }
+
     interface FocusEvent<T = Element> extends SyntheticEvent<T> {
         nativeEvent: NativeFocusEvent;
         relatedTarget: EventTarget;
@@ -711,6 +740,7 @@ declare namespace React {
     type KeyboardEventHandler<T = Element> = EventHandler<KeyboardEvent<T>>;
     type MouseEventHandler<T = Element> = EventHandler<MouseEvent<T>>;
     type TouchEventHandler<T = Element> = EventHandler<TouchEvent<T>>;
+    type PointerEventHandler<T = Element> = EventHandler<PointerEvent<T>>;
     type UIEventHandler<T = Element> = EventHandler<UIEvent<T>>;
     type WheelEventHandler<T = Element> = EventHandler<WheelEvent<T>>;
     type AnimationEventHandler<T = Element> = EventHandler<AnimationEvent<T>>;
@@ -898,6 +928,28 @@ declare namespace React {
         onTouchStart?: TouchEventHandler<T>;
         onTouchStartCapture?: TouchEventHandler<T>;
 
+        // Pointer Events
+        onPointerDown?: PointerEventHandler<T>;
+        onPointerDownCapture?: PointerEventHandler<T>;
+        onPointerMove?: PointerEventHandler<T>;
+        onPointerMoveCapture?: PointerEventHandler<T>;
+        onPointerUp?: PointerEventHandler<T>;
+        onPointerUpCapture?: PointerEventHandler<T>;
+        onPointerCancel?: PointerEventHandler<T>;
+        onPointerCancelCapture?: PointerEventHandler<T>;
+        onPointerEnter?: PointerEventHandler<T>;
+        onPointerEnterCapture?: PointerEventHandler<T>;
+        onPointerLeave?: PointerEventHandler<T>;
+        onPointerLeaveCapture?: PointerEventHandler<T>;
+        onPointerOver?: PointerEventHandler<T>;
+        onPointerOverCapture?: PointerEventHandler<T>;
+        onPointerOut?: PointerEventHandler<T>;
+        onPointerOutCapture?: PointerEventHandler<T>;
+        onGotPointerCapture?: PointerEventHandler<T>;
+        onGotPointerCaptureCapture?: PointerEventHandler<T>;
+        onLostPointerCapture?: PointerEventHandler<T>;
+        onLostPointerCaptureCapture?: PointerEventHandler<T>;
+
         // UI Events
         onScroll?: UIEventHandler<T>;
         onScrollCapture?: UIEventHandler<T>;
@@ -1188,7 +1240,7 @@ declare namespace React {
         autoComplete?: string;
         autoFocus?: boolean;
         autoPlay?: boolean;
-        capture?: boolean;
+        capture?: boolean | string;
         cellPadding?: number | string;
         cellSpacing?: number | string;
         charSet?: string;
@@ -1389,6 +1441,7 @@ declare namespace React {
     }
 
     interface IframeHTMLAttributes<T> extends HTMLAttributes<T> {
+        allow?: string;
         allowFullScreen?: boolean;
         allowTransparency?: boolean;
         frameBorder?: number | string;
@@ -1407,6 +1460,7 @@ declare namespace React {
     interface ImgHTMLAttributes<T> extends HTMLAttributes<T> {
         alt?: string;
         crossOrigin?: "anonymous" | "use-credentials" | "";
+        decoding?: "async" | "auto" | "sync";
         height?: number | string;
         sizes?: string;
         src?: string;
@@ -1425,7 +1479,7 @@ declare namespace React {
         alt?: string;
         autoComplete?: string;
         autoFocus?: boolean;
-        capture?: boolean; // https://www.w3.org/TR/html-media-capture/#the-capture-attribute
+        capture?: boolean | string; // https://www.w3.org/TR/html-media-capture/#the-capture-attribute
         checked?: boolean;
         crossOrigin?: string;
         disabled?: boolean;
@@ -1589,6 +1643,7 @@ declare namespace React {
     }
 
     interface SelectHTMLAttributes<T> extends HTMLAttributes<T> {
+        autoComplete?: string;
         autoFocus?: boolean;
         disabled?: boolean;
         form?: string;
@@ -1789,6 +1844,7 @@ declare namespace React {
         hanging?: number | string;
         horizAdvX?: number | string;
         horizOriginX?: number | string;
+        href?: string;
         ideographic?: number | string;
         imageRendering?: number | string;
         in2?: number | string;
@@ -2152,30 +2208,29 @@ declare namespace React {
     // React.PropTypes
     // ----------------------------------------------------------------------
 
-    type Validator<T> = { bivarianceHack(object: T, key: string, componentName: string, ...rest: any[]): Error | null }["bivarianceHack"];
+    type Validator<T> = PropTypes.Validator<T>;
 
-    interface Requireable<T> extends Validator<T> {
-        isRequired: Validator<T>;
-    }
+    type Requireable<T> = PropTypes.Requireable<T>;
 
-    type ValidationMap<T> = {[K in keyof T]?: Validator<T> };
+    type ValidationMap<T> = PropTypes.ValidationMap<T>;
 
     interface ReactPropTypes {
-        any: Requireable<any>;
-        array: Requireable<any>;
-        bool: Requireable<any>;
-        func: Requireable<any>;
-        number: Requireable<any>;
-        object: Requireable<any>;
-        string: Requireable<any>;
-        node: Requireable<any>;
-        element: Requireable<any>;
-        instanceOf(expectedClass: {}): Requireable<any>;
-        oneOf(types: any[]): Requireable<any>;
-        oneOfType(types: Array<Validator<any>>): Requireable<any>;
-        arrayOf(type: Validator<any>): Requireable<any>;
-        objectOf(type: Validator<any>): Requireable<any>;
-        shape(type: ValidationMap<any>): Requireable<any>;
+        any: typeof PropTypes.any;
+        array: typeof PropTypes.array;
+        bool: typeof PropTypes.bool;
+        func: typeof PropTypes.func;
+        number: typeof PropTypes.number;
+        object: typeof PropTypes.object;
+        string: typeof PropTypes.string;
+        node: typeof PropTypes.node;
+        element: typeof PropTypes.element;
+        instanceOf: typeof PropTypes.instanceOf;
+        oneOf: typeof PropTypes.oneOf;
+        oneOfType: typeof PropTypes.oneOfType;
+        arrayOf: typeof PropTypes.arrayOf;
+        objectOf: typeof PropTypes.objectOf;
+        shape: typeof PropTypes.shape;
+        exact: typeof PropTypes.exact;
     }
 
     //
@@ -2229,6 +2284,21 @@ declare namespace React {
     }
 }
 
+// Declared props take priority over inferred props
+// If declared props have indexed properties, ignore inferred props entirely as keyof gets widened
+type MergePropTypes<P, T> = P & Pick<T, Exclude<keyof T, keyof P>>;
+
+// Any prop that has a default prop becomes optional, but its type is unchanged
+// Undeclared default props are augmented into the resulting allowable attributes
+// If declared props have indexed properties, ignore default props entirely as keyof gets widened
+// Wrap in an outer-level conditional type to allow distribution over props that are unions
+type Defaultize<P, D> = P extends any
+    ? string extends keyof P ? P :
+        & Pick<P, Exclude<keyof P, keyof D>>
+        & Partial<Pick<P, Extract<keyof P, keyof D>>>
+        & Partial<Pick<D, Exclude<keyof D, keyof P>>>
+    : never;
+
 declare global {
     namespace JSX {
         // tslint:disable-next-line:no-empty-interface
@@ -2239,6 +2309,14 @@ declare global {
         interface ElementAttributesProperty { props: {}; }
         interface ElementChildrenAttribute { children: {}; }
 
+        type LibraryManagedAttributes<C, P> = C extends { propTypes: infer T; defaultProps: infer D; }
+            ? Defaultize<MergePropTypes<P, PropTypes.InferProps<T>>, D>
+            : C extends { propTypes: infer T; }
+                ? MergePropTypes<P, PropTypes.InferProps<T>>
+                : C extends { defaultProps: infer D; }
+                    ? Defaultize<P, D>
+                    : P;
+
         // tslint:disable-next-line:no-empty-interface
         interface IntrinsicAttributes extends React.Attributes { }
         // tslint:disable-next-line:no-empty-interface
diff --git a/types/react/test/index.ts b/types/react/test/index.ts
index 64d1b20955..a78a480199 100644
--- a/types/react/test/index.ts
+++ b/types/react/test/index.ts
@@ -1,6 +1,7 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
 import * as ReactDOMServer from "react-dom/server";
+import * as PropTypes from "prop-types";
 import createFragment = require("react-addons-create-fragment");
 import CSSTransitionGroup = require("react-addons-css-transition-group");
 import * as LinkedStateMixin from "react-addons-linked-state-mixin";
@@ -11,17 +12,16 @@ import * as TestUtils from "react-addons-test-utils";
 import TransitionGroup = require("react-addons-transition-group");
 import update = require("react-addons-update");
 import createReactClass = require("create-react-class");
-import * as PropTypes from "prop-types";
 import * as DOM from "react-dom-factories";
 
 interface Props extends React.Attributes {
     hello: string;
-    world?: string;
+    world?: string | null;
     foo: number;
 }
 
 interface State {
-    inputValue?: string;
+    inputValue?: string | null;
     seconds?: number;
 }
 
@@ -30,7 +30,7 @@ interface Snapshot {
 }
 
 interface Context {
-    someValue?: string;
+    someValue?: string | null;
 }
 
 interface ChildContext {
@@ -54,11 +54,74 @@ declare const container: Element;
 //
 // Top-Level API
 // --------------------------------------------------------------------------
+{
+    interface State {
+        inputValue: string;
+        seconds: number;
+    }
+    class SettingStateFromCtorComponent extends React.Component<Props, State, Snapshot> {
+        constructor(props: Props) {
+            super(props);
+            // $ExpectError
+            this.state = {
+                inputValue: 'hello'
+            };
+        }
+        render() { return null; }
+    }
+
+    class BadlyInitializedState extends React.Component<Props, State, Snapshot> {
+        // $ExpectError -> this throws error on TS 2.6 uncomment once TS requirement is TS >= 2.7
+        // state = {
+        //     secondz: 0,
+        //     inputValuez: 'hello'
+        // };
+        render() { return null; }
+    }
+    class BetterPropsAndStateChecksComponent extends React.Component<Props, State, Snapshot> {
+        render() { return null; }
+        componentDidMount() {
+            // $ExpectError -> this will be true in next BC release where state is gonna be `null | Readonly<S>`
+            console.log(this.state.inputValue);
+        }
+        mutateState() {
+            // $ExpectError
+            this.state = {
+                inputValue: 'hello'
+            };
+
+            // Even if state is not set, this is allowed by React
+            this.setState({ inputValue: 'hello' });
+            this.setState((prevState, props) => {
+                // $ExpectError
+                props = { foo: 'nope' };
+                // $ExpectError
+                props.foo = 'nope';
+
+                return { inputValue: prevState.inputValue + ' foo' };
+            });
+        }
+        mutateProps() {
+            // $ExpectError
+            this.props = {};
+            // $ExpectError
+            this.props = {
+                key: 42,
+                ref: "myComponent42",
+                hello: "world",
+                foo: 42
+            };
+        }
+    }
+}
 
 class ModernComponent extends React.Component<Props, State, Snapshot>
     implements MyComponent, React.ChildContextProvider<ChildContext> {
     static propTypes: React.ValidationMap<Props> = {
-        foo: PropTypes.number
+        hello: PropTypes.string.isRequired,
+        world: PropTypes.string,
+        foo: PropTypes.number.isRequired,
+        key: <PropTypes.Validator<string | number | undefined>> PropTypes.oneOfType([PropTypes.number, PropTypes.string])
     };
 
     static contextTypes: React.ValidationMap<Context> = {
@@ -66,7 +129,7 @@ class ModernComponent extends React.Component<Props, State, Snapshot>
     };
 
     static childContextTypes: React.ValidationMap<ChildContext> = {
-        someOtherValue: PropTypes.string
+        someOtherValue: PropTypes.string.isRequired
     };
 
     context: Context;
@@ -97,7 +160,7 @@ class ModernComponent extends React.Component<Props, State, Snapshot>
         return DOM.div(null,
             DOM.input({
                 ref: input => this._input = input,
-                value: this.state.inputValue
+                value: this.state.inputValue ? this.state.inputValue : undefined
             }),
             DOM.input({
                 onChange: event => console.log(event.target)
@@ -120,7 +183,7 @@ class ModernComponent extends React.Component<Props, State, Snapshot>
 class ModernComponentArrayRender extends React.Component<Props> {
     render() {
         return [DOM.h1({ key: "1" }, "1"),
-                DOM.h1({ key: "2" }, "2")];
+        DOM.h1({ key: "2" }, "2")];
     }
 }
 
@@ -376,99 +439,6 @@ DOM.svg({
     })
 );
 
-//
-// PropTypes
-// --------------------------------------------------------------------------
-
-const PropTypesSpecification: React.ComponentSpec<any, any> = {
-    propTypes: {
-        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: PropTypes.arrayOf(PropTypes.number),
-        optionalObjectOf: PropTypes.objectOf(PropTypes.number),
-        optionalObjectWithShape: PropTypes.shape({
-            color: PropTypes.string,
-            fontSize: PropTypes.number
-        }),
-        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!");
-            }
-            return null;
-        },
-        // 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 = PropTypes.number(object, key, componentName, ...rest);
-            if (error) {
-                return error;
-            }
-            if (object[key] < 0 || object[key] > 100) {
-                return new Error(`prop ${key} must be between 0 and 100`);
-            }
-            return null;
-        }
-    },
-    render: (): React.ReactElement<any> | null => {
-        return null;
-    }
-};
-
-//
-// ContextTypes
-// --------------------------------------------------------------------------
-
-const ContextTypesSpecification: React.ComponentSpec<any, any> = {
-    contextTypes: {
-        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: PropTypes.arrayOf(PropTypes.number),
-        optionalObjectOf: PropTypes.objectOf(PropTypes.number),
-        optionalObjectWithShape: PropTypes.shape({
-            color: PropTypes.string,
-            fontSize: PropTypes.number
-        }),
-        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!");
-            }
-            return null;
-        }
-    },
-    render: (): null => {
-        return null;
-    }
-};
-
 //
 // React.Children
 // --------------------------------------------------------------------------
@@ -682,6 +652,7 @@ React.createFactory(TransitionGroup)({ component: "div" });
 // The SyntheticEvent.target.value should be accessible for onChange
 // --------------------------------------------------------------------------
 class SyntheticEventTargetValue extends React.Component<{}, { value: string }> {
+    state: { value: string };
     constructor(props: {}) {
         super(props);
         this.state = { value: 'a' };
diff --git a/types/react/test/managedAttributes.tsx b/types/react/test/managedAttributes.tsx
new file mode 100644
index 0000000000..56466e1cc8
--- /dev/null
+++ b/types/react/test/managedAttributes.tsx
@@ -0,0 +1,160 @@
+interface LeaveMeAloneDtslint { foo: string; }
+// // Re-enable when we move @types/react to TS 3.0
+
+// import * as React from 'react';
+// import * as PropTypes from 'prop-types';
+
+// interface Props {
+//     bool?: boolean
+//     fnc: () => any
+//     node?: React.ReactNode
+//     num?: number
+//     reqNode: NonNullable<React.ReactNode>
+//     str: string
+// }
+
+// const propTypes = {
+//     bool: PropTypes.bool,
+//     fnc: PropTypes.func.isRequired,
+//     node: PropTypes.node,
+//     num: PropTypes.number,
+//     str: PropTypes.string.isRequired,
+//     extraStr: PropTypes.string.isRequired,
+//     extraNum: PropTypes.number
+// };
+
+// const defaultProps = {
+//     fnc: function() { return 'abc' } as () => any,
+//     extraBool: false,
+//     reqNode: 'text_node' as React.ReactNode
+// };
+
+// class AnnotatedPropTypesAndDefaultProps extends React.Component<Props> {
+//     static propTypes = propTypes;
+//     static defaultProps = defaultProps;
+// }
+
+// const annotatedPropTypesAndDefaultPropsTests = [
+//     // $ExpectError
+//     <AnnotatedPropTypesAndDefaultProps />, // str and extraStr are required
+//     <AnnotatedPropTypesAndDefaultProps extraStr='abc' str='abc' />,
+//     // $ExpectError
+//     <AnnotatedPropTypesAndDefaultProps num='abc' />, // num type mismatch
+//     <AnnotatedPropTypesAndDefaultProps
+//         bool={true}
+//         extraBool={true}
+//         extraNum={0}
+//         extraStr='abc'
+//         fnc={console.log}
+//         node={<span />}
+//         num={0}
+//         reqNode={<span />}
+//         str='abc'
+//     />
+// ];
+
+// class UnannotatedPropTypesAndDefaultProps extends React.Component {
+//     static propTypes = propTypes;
+//     static defaultProps = defaultProps;
+// }
+
+// const unannotatedPropTypesAndDefaultPropsTests = [
+//     // $ExpectError
+//     <UnannotatedPropTypesAndDefaultProps />, // stra and extraStr are required
+//     <UnannotatedPropTypesAndDefaultProps extraStr='abc' str='abc' />,
+//     // $ExpectError
+//     <UnannotatedPropTypesAndDefaultProps extraBool={0} />, // extraBool type mismatch
+//     <UnannotatedPropTypesAndDefaultProps
+//         bool={true}
+//         extraBool={true}
+//         extraNum={0}
+//         extraStr='abc'
+//         fnc={console.log}
+//         node={<span />}
+//         num={0}
+//         reqNode={<span />}
+//         str='abc'
+//     />
+// ];
+
+// class AnnotatedPropTypes extends React.Component<Props> {
+//     static propTypes = propTypes;
+// }
+
+// const annotatedPropTypesTests = [
+//     // $ExpectError
+//     <AnnotatedPropTypes />, // str, extraStr, reqNode and fnc are required
+//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} />,
+//     // $ExpectError
+//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} extraBool={false} />, // extraBool doesn't exist
+//     // $ExpectError
+//     <AnnotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} num='abc' />, // num type mismatch
+//     <AnnotatedPropTypes
+//         bool={false}
+//         extraNum={0}
+//         extraStr='abc'
+//         fnc={console.log}
+//         node={<React.Fragment />}
+//         num={0}
+//         reqNode={<React.Fragment />}
+//         str='abc'
+//     />
+// ];
+
+// class UnannotatedPropTypes extends React.Component {
+//     static propTypes = propTypes;
+// }
+
+// const unannotatedPropTypesTests = [
+//     // $ExpectError
+//     <UnannotatedPropTypes />, // str, extraStr and fnc are required
+//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' />,
+//     // $ExpectError
+//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} />, // reqNode doesn't exist
+//     // $ExpectError
+//     <UnannotatedPropTypes fnc={console.log} extraStr='abc' str='abc' reqNode={<span />} num='abc' />, // num type mismatch
+//     <UnannotatedPropTypes
+//         bool={false}
+//         extraNum={0}
+//         extraStr='abc'
+//         fnc={console.log}
+//         node={<React.Fragment />}
+//         num={0}
+//         str='abc'
+//     />
+// ];
+
+// class AnnotatedDefaultProps extends React.Component<Props> {
+//     static defaultProps = defaultProps;
+// }
+
+// const annotatedDefaultPropsTests = [
+//     // $ExpectError
+//     <AnnotatedDefaultProps />, // str is required
+//     <AnnotatedDefaultProps str='abc' />,
+//     <AnnotatedDefaultProps str='abc' reqNode={<span />} />,
+//     // $ExpectError
+//     <AnnotatedDefaultProps str={() => { }} />, // str type mismatch
+//     <AnnotatedDefaultProps
+//         bool={true}
+//         extraBool={false}
+//         fnc={console.log}
+//         node={null}
+//         num={0}
+//         reqNode={undefined}
+//         str='abc'
+//     />
+// ];
+
+// class UnannotatedDefaultProps extends React.Component {
+//     static defaultProps = defaultProps;
+// }
+
+// const unannotatedDefaultPropsTests = [
+//     <UnannotatedDefaultProps />,
+//     <UnannotatedDefaultProps
+//         extraBool={true}
+//         fnc={console.log}
+//         reqNode={<span />}
+//     />
+// ];
diff --git a/types/react/test/tsx.tsx b/types/react/test/tsx.tsx
index 431cef2fa0..3105a3347b 100644
--- a/types/react/test/tsx.tsx
+++ b/types/react/test/tsx.tsx
@@ -141,6 +141,10 @@ class ComponentWithNewLifecycles extends React.Component<NewProps, NewState, { b
         return { bar: `${nextProps.foo}bar` };
     }
 
+    state = {
+        bar: 'foo'
+    };
+
     getSnapshotBeforeUpdate(prevProps: Readonly<NewProps>) {
         return { baz: `${prevProps.foo}baz` };
     }
@@ -160,6 +164,10 @@ class PureComponentWithNewLifecycles extends React.PureComponent<NewProps, NewSt
         return { bar: `${nextProps.foo}bar` };
     }
 
+    state = {
+        bar: 'foo'
+    };
+
     getSnapshotBeforeUpdate(prevProps: Readonly<NewProps>) {
         return { baz: `${prevProps.foo}baz` };
     }
diff --git a/types/react/tsconfig.json b/types/react/tsconfig.json
index 2bc92c4894..b666fac305 100644
--- a/types/react/tsconfig.json
+++ b/types/react/tsconfig.json
@@ -3,7 +3,8 @@
         "index.d.ts",
         "test/index.ts",
         "test/tsx.tsx",
-        "test/cssProperties.tsx"
+        "test/cssProperties.tsx",
+        "test/managedAttributes.tsx"
     ],
     "compilerOptions": {
         "module": "commonjs",
diff --git a/types/react/v15/index.d.ts b/types/react/v15/index.d.ts
index feaa8f7480..65f00c258f 100644
--- a/types/react/v15/index.d.ts
+++ b/types/react/v15/index.d.ts
@@ -13,7 +13,7 @@
 //                 Dovydas Navickas <https://github.com/DovydasNavickas>
 //                 Stéphane Goetz <https://github.com/onigoetz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /*
 Known Problems & Workarounds
@@ -3041,6 +3041,7 @@ declare namespace React {
     }
 
     interface SelectHTMLAttributes<T> extends HTMLAttributes<T> {
+        autoComplete?: string;
         autoFocus?: boolean;
         disabled?: boolean;
         form?: string;
@@ -3240,6 +3241,7 @@ declare namespace React {
         hanging?: number | string;
         horizAdvX?: number | string;
         horizOriginX?: number | string;
+        href?: string;
         ideographic?: number | string;
         imageRendering?: number | string;
         in2?: number | string;
diff --git a/types/react/v15/test/index.ts b/types/react/v15/test/index.ts
index 45894cb397..6735e64eeb 100644
--- a/types/react/v15/test/index.ts
+++ b/types/react/v15/test/index.ts
@@ -256,7 +256,7 @@ const markup: string = ReactDOMServer.renderToStaticMarkup(element);
 const notValid: boolean = React.isValidElement(props); // false
 const isValid = React.isValidElement(element); // true
 let domNode = ReactDOM.findDOMNode(component);
-domNode = ReactDOM.findDOMNode(domNode as Element);
+domNode = ReactDOM.findDOMNode(domNode);
 
 //
 // React Elements
diff --git a/types/react/v15/tsconfig.json b/types/react/v15/tsconfig.json
index f9c13ee9f2..d3eb40aae7 100644
--- a/types/react/v15/tsconfig.json
+++ b/types/react/v15/tsconfig.json
@@ -12,9 +12,8 @@
             "dom"
         ],
         "paths": {
-            "react": [
-                "react/v15"
-            ]
+            "react": ["react/v15"],
+            "react-dom": ["react-dom/v15"]
         },
         "noImplicitAny": true,
         "noImplicitThis": false,
@@ -29,4 +28,4 @@
         "forceConsistentCasingInFileNames": true,
         "jsx": "preserve"
     }
-}
\ No newline at end of file
+}
diff --git a/types/reactable/index.d.ts b/types/reactable/index.d.ts
index 8e3cb8873c..e4315030af 100644
--- a/types/reactable/index.d.ts
+++ b/types/reactable/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/glittershark/reactable
 // Definitions by: Christoph Spielmann <https://github.com/spielc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/reactcss/index.d.ts b/types/reactcss/index.d.ts
index c5fb14bd32..eba4063e2b 100644
--- a/types/reactcss/index.d.ts
+++ b/types/reactcss/index.d.ts
@@ -2,7 +2,7 @@
 // Project: http://reactcss.com/
 // Definitions by: Chris Gervang <https://github.com/chrisgervang>, Karol Janyst <https://github.com/LKay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react"
 
diff --git a/types/reactstrap/index.d.ts b/types/reactstrap/index.d.ts
index 45f885b172..a682ec6588 100644
--- a/types/reactstrap/index.d.ts
+++ b/types/reactstrap/index.d.ts
@@ -8,7 +8,7 @@
 //                 Tim Chen <https://github.com/timc13>
 //                 Pat Gaffney <https://github.com/patrickrgaffney>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.9
 
 export interface CSSModule {
   [className: string]: string;
diff --git a/types/reactstrap/lib/Alert.d.ts b/types/reactstrap/lib/Alert.d.ts
index edfd5303e0..5aa58f862a 100644
--- a/types/reactstrap/lib/Alert.d.ts
+++ b/types/reactstrap/lib/Alert.d.ts
@@ -1,14 +1,13 @@
 import * as React from 'react';
 import { CSSModule } from '../index';
+import { FadeProps } from './Fade';
 
 export type UncontrolledProps<T = {}> = React.HTMLAttributes<HTMLElement> & {
   className?: string;
   cssModule?: CSSModule;
   color?: string;
   tag?: React.ReactType;
-  transitionAppearTimeout?: number;
-  transitionEnterTimeout?: number;
-  transitionLeaveTimeout?: number;
+  transition?: FadeProps;
 } & T;
 export type UncontrolledAlertProps<T = {}> = UncontrolledProps<T>;
 
diff --git a/types/reactstrap/reactstrap-tests.tsx b/types/reactstrap/reactstrap-tests.tsx
index 4516db6329..65fb319704 100644
--- a/types/reactstrap/reactstrap-tests.tsx
+++ b/types/reactstrap/reactstrap-tests.tsx
@@ -101,6 +101,7 @@ const Examplea = (props: any) => {
 };
 
 class AlertExample extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -277,6 +278,7 @@ const Example13 = (
 );
 
 class Example14 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -325,6 +327,7 @@ class Example14 extends React.Component<any, any> {
 
 // ------------- Button Dropdown
 class Example15 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -866,6 +869,7 @@ const Example36 = (props: any) => {
 // ------------------ Collapse
 
 class Example37 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.toggle = this.toggle.bind(this);
@@ -896,6 +900,7 @@ class Example37 extends React.Component<any, any> {
 }
 
 class Example38 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.onOpened = this.onOpened.bind(this);
@@ -940,6 +945,7 @@ class Example38 extends React.Component<any, any> {
 // ------- Dropdown
 
 class Example39 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -1016,6 +1022,7 @@ const Example42 = (props: any) => (
 );
 
 class Example43 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -1950,6 +1957,7 @@ const Example71 = () => {
 
 // --------------- Modal
 class ModalExample72 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.state = {
@@ -1989,6 +1997,7 @@ class ModalExample72 extends React.Component<any, any> {
 }
 
 class ModalExample73 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.state = {
@@ -2049,6 +2058,7 @@ class ModalExample73 extends React.Component<any, any> {
 }
 
 class ModalExample74 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.state = {
@@ -2106,6 +2116,7 @@ class ModalExample74 extends React.Component<any, any> {
 }
 
 class Example75 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2159,6 +2170,7 @@ class Example75 extends React.Component<any, any> {
 }
 
 class Example76 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2254,6 +2266,7 @@ class Example78 extends React.Component<any, any> {
 }
 
 class Example79 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2304,6 +2317,7 @@ class Example79 extends React.Component<any, any> {
 }
 
 class Example80 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2496,6 +2510,7 @@ class Example84 extends React.Component {
 
 // ------------------------- Popover
 class Example85 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2527,6 +2542,7 @@ class Example85 extends React.Component<any, any> {
 }
 
 class PopoverItem extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2558,6 +2574,7 @@ class PopoverItem extends React.Component<any, any> {
 }
 
 class PopoverExampleMulti extends React.Component<any, {popovers: Array<{placement: string; text: string; }>}> {
+  state: {popovers: Array<{placement: string; text: string; }>};
   constructor(props: any) {
     super(props);
 
@@ -3060,6 +3077,7 @@ class Example100 extends React.Component {
 }
 
 class Example101 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3130,6 +3148,7 @@ class Example101 extends React.Component<any, any> {
 }
 
 class Example102 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3158,6 +3177,7 @@ class Example102 extends React.Component<any, any> {
 }
 
 class Example103 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3186,6 +3206,7 @@ class Example103 extends React.Component<any, any> {
 }
 
 class TooltipItem extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3216,6 +3237,7 @@ class TooltipItem extends React.Component<any, any> {
 }
 
 class TooltipExampleMulti extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3345,6 +3367,7 @@ class Example107 extends React.Component {
 }
 
 class Example108 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3381,6 +3404,7 @@ class Example108 extends React.Component<any, any> {
 }
 
 class Example109 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3417,7 +3441,8 @@ class Example109 extends React.Component<any, any> {
 }
 
 class Example110 extends React.Component<any, any> {
-  constructor(props: any) {
+   state: any;
+   constructor(props: any) {
     super(props);
 
     this.toggle = this.toggle.bind(this);
@@ -3453,6 +3478,7 @@ class Example110 extends React.Component<any, any> {
 }
 
 class Example111 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3489,6 +3515,7 @@ class Example111 extends React.Component<any, any> {
 }
 
 class Example112 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3540,24 +3567,25 @@ const Example113 = (props: any) => {
   };
 
 class Example114 extends React.Component<any, any> {
-private element: HTMLElement;
+    state: any;
+    private element: HTMLElement;
 
-refFn(r: HTMLElement | null) {
-    if (r) {
-        this.element = r;
+    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>
-    );
-}
+    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> {
@@ -3583,6 +3611,7 @@ class Example115 extends React.Component<any, any> {
 
     private animating: boolean;
 
+    state: any;
     constructor(props: any) {
       super(props);
       this.state = { activeIndex: 0 };
@@ -4202,6 +4231,7 @@ class Example121 extends React.Component<any, any> {
 }
 
 class Example122 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
diff --git a/types/reactstrap/v4/index.d.ts b/types/reactstrap/v4/index.d.ts
index 93eeed908f..0a807b1131 100644
--- a/types/reactstrap/v4/index.d.ts
+++ b/types/reactstrap/v4/index.d.ts
@@ -2,7 +2,7 @@
 // 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.6
+// TypeScript Version: 2.8
 
 export interface CSSModule {
   [className: string]: string;
diff --git a/types/reactstrap/v4/reactstrap-tests.tsx b/types/reactstrap/v4/reactstrap-tests.tsx
index b094d4d019..42a3076d8b 100644
--- a/types/reactstrap/v4/reactstrap-tests.tsx
+++ b/types/reactstrap/v4/reactstrap-tests.tsx
@@ -98,6 +98,9 @@ const Examplea = (props: any) => {
 };
 
 class AlertExample extends React.Component<any, any> {
+  state: {
+    visible: boolean
+  };
   constructor(props: any) {
     super(props);
 
@@ -274,6 +277,7 @@ const Example13 = (
 );
 
 class Example14 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -322,6 +326,7 @@ class Example14 extends React.Component<any, any> {
 
 // ------------- Button Dropdown
 class Example15 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -863,6 +868,7 @@ const Example36 = (props: any) => {
 // ------------------ Collapse
 
 class Example37 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.toggle = this.toggle.bind(this);
@@ -893,6 +899,7 @@ class Example37 extends React.Component<any, any> {
 }
 
 class Example38 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.onOpened = this.onOpened.bind(this);
@@ -937,6 +944,7 @@ class Example38 extends React.Component<any, any> {
 // ------- Dropdown
 
 class Example39 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -1013,6 +1021,7 @@ const Example42 = (props: any) => (
 );
 
 class Example43 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -1929,6 +1938,7 @@ const Example71 = () => {
 
 // --------------- Modal
 class ModalExample72 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.state = {
@@ -1968,6 +1978,7 @@ class ModalExample72 extends React.Component<any, any> {
 }
 
 class ModalExample73 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.state = {
@@ -2028,6 +2039,7 @@ class ModalExample73 extends React.Component<any, any> {
 }
 
 class ModalExample74 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
     this.state = {
@@ -2085,6 +2097,7 @@ class ModalExample74 extends React.Component<any, any> {
 }
 
 class Example75 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2121,6 +2134,7 @@ class Example75 extends React.Component<any, any> {
 }
 
 class Example76 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2216,6 +2230,7 @@ class Example78 extends React.Component<any, any> {
 }
 
 class Example79 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2266,6 +2281,7 @@ class Example79 extends React.Component<any, any> {
 }
 
 class Example80 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2458,6 +2474,7 @@ class Example84 extends React.Component {
 
 // ------------------------- Popover
 class Example85 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2489,6 +2506,7 @@ class Example85 extends React.Component<any, any> {
 }
 
 class PopoverItem extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -2520,6 +2538,7 @@ class PopoverItem extends React.Component<any, any> {
 }
 
 class PopoverExampleMulti extends React.Component<any, {popovers: Array<{placement: string; text: string; }>}> {
+  state: {popovers: Array<{placement: string; text: string; }>};
   constructor(props: any) {
     super(props);
 
@@ -3022,6 +3041,7 @@ class Example100 extends React.Component {
 }
 
 class Example101 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3092,6 +3112,7 @@ class Example101 extends React.Component<any, any> {
 }
 
 class Example102 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3120,6 +3141,7 @@ class Example102 extends React.Component<any, any> {
 }
 
 class Example103 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3148,6 +3170,7 @@ class Example103 extends React.Component<any, any> {
 }
 
 class TooltipItem extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3178,6 +3201,7 @@ class TooltipItem extends React.Component<any, any> {
 }
 
 class TooltipExampleMulti extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3307,6 +3331,7 @@ class Example107 extends React.Component {
 }
 
 class Example108 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3343,6 +3368,7 @@ class Example108 extends React.Component<any, any> {
 }
 
 class Example109 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3379,6 +3405,7 @@ class Example109 extends React.Component<any, any> {
 }
 
 class Example110 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3415,6 +3442,7 @@ class Example110 extends React.Component<any, any> {
 }
 
 class Example111 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
@@ -3451,6 +3479,7 @@ class Example111 extends React.Component<any, any> {
 }
 
 class Example112 extends React.Component<any, any> {
+  state: any;
   constructor(props: any) {
     super(props);
 
diff --git a/types/reapop/index.d.ts b/types/reapop/index.d.ts
index a0f446fa91..c8b1f022fc 100644
--- a/types/reapop/index.d.ts
+++ b/types/reapop/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/LouisBarranqueiro/reapop#readme
 // Definitions by: Barrokgl <https://github.com/Barrokgl>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { Dispatch } from 'redux';
diff --git a/types/rebass/index.d.ts b/types/rebass/index.d.ts
index 0c55b12240..f209bed8ac 100644
--- a/types/rebass/index.d.ts
+++ b/types/rebass/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jxnblk/rebass
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react" />
 
diff --git a/types/recharts/README.MD b/types/recharts/README.MD
index 970e15ec0b..3a30de606c 100644
--- a/types/recharts/README.MD
+++ b/types/recharts/README.MD
@@ -9,4 +9,4 @@ As of 1.6.2018.
 
 1) Install typescript globally: `npm i -g typescript`
 2) Install React's dependencies: `cd ../react && npm i`
-3) Run tests: `cd ../recharts && tsc`
\ No newline at end of file
+3) Run tests: `cd ../recharts && tsc`
diff --git a/types/recharts/index.d.ts b/types/recharts/index.d.ts
index 738c04bb02..7307da69d2 100644
--- a/types/recharts/index.d.ts
+++ b/types/recharts/index.d.ts
@@ -7,8 +7,12 @@
 //                 Rich Baird <https://github.com/richbai90>
 //                 Dan Torberg <https://github.com/caspeco-dan>
 //                 Peter Keuter <https://github.com/pkeuter>
+//                 Jamie Saunders <https://github.com/jrsaunde>
+//                 Paul Melnikow <https://github.com/paulmelnikow>
+//                 Harry Cruse <https://github.com/crusectrl>
+//                 Andrew Palugniok <https://github.com/apalugniok>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { CurveFactory } from 'd3-shape';
@@ -23,7 +27,7 @@ export type TooltipFormatter = (value: string | number | Array<string | number>,
                                 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 DataKey = string | number | ((dataObject: any) => number | [number, number] | null);
 
 export type IconType = 'plainline' | 'line' | 'square' | 'rect' | 'circle' | 'cross' | 'diamond' | 'star' | 'triangle' | 'wye' | 'plainline';
 export type LegendType = IconType | 'none';
@@ -404,6 +408,7 @@ export interface LineProps extends EventAttributes, Partial<PresentationAttribut
     left?: number;
     width?: number;
     height?: number;
+    data?: object[];
     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).
     label?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     points?: Point[];
@@ -516,7 +521,7 @@ export interface PolarRadiusAxisProps extends EventAttributes, Partial<Presentat
     tick?: boolean | object | React.ReactElement<any> | ContentRenderer<any>;
     stroke?: string;
     tickFormatter: TickFormatterFunction;
-    domain?: PolarRadiusAxisDomain[];
+    domain?: [PolarRadiusAxisDomain, PolarRadiusAxisDomain];
     scale?: ScaleType | RechartsFunction;
     allowDataOverflow?: boolean;
 }
@@ -673,6 +678,7 @@ export interface ReferenceLineProps extends Partial<PresentationAttributes<numbe
     alwaysShow?: boolean;
     x?: number | string;
     y?: number | string;
+    label?: string | number | ContentRenderer<any> | React.ReactElement<any>;
     xAxisId?: string | number;
     yAxisId?: string | number;
     shape?: ContentRenderer<
@@ -831,7 +837,8 @@ export class Treemap extends React.Component<TreemapProps> { }
 
 export class Label extends React.Component<LabelProps> { }
 
-export interface LabelProps {
+export interface LabelProps extends Partial<PresentationAttributes> {
+    angle?: number;
     viewBox?: ViewBox | PolarViewBox;
     formatter?: LabelFormatter;
     value?: number | string;
@@ -879,7 +886,7 @@ export interface XAxisProps extends EventAttributes {
     unit?: string | number;
     // The unique id of x-axis
     xAxisId?: string | number;
-    domain?: AxisDomain[];
+    domain?: [AxisDomain, AxisDomain];
     // The key of data displayed in the axis
     dataKey?: DataKey;
     // The width of axis which is usually calculated internally
@@ -911,6 +918,8 @@ export interface XAxisProps extends EventAttributes {
     reversed?: boolean;
     // see label section at http://recharts.org/#/en-US/api/XAxis
     label?: string | number | Label | LabelProps;
+    allowDuplicatedCategory?: boolean;
+    stroke?: string;
 }
 
 export class XAxis extends React.Component<XAxisProps> { }
@@ -930,7 +939,7 @@ export interface YAxisProps extends EventAttributes {
     unit?: string | number;
     // The unique id of y-axis
     yAxisId?: string | number;
-    domain?: AxisDomain[];
+    domain?: [AxisDomain, AxisDomain];
     // The key of data displayed in the axis
     dataKey?: DataKey;
     // Ticks can be any type when the axis is the type of category
@@ -962,6 +971,7 @@ export interface YAxisProps extends EventAttributes {
     reversed?: boolean;
     // see label section at http://recharts.org/#/en-US/api/YAxis
     label?: string | number | Label | LabelProps;
+    stroke?: string;
 }
 
 export class YAxis extends React.Component<YAxisProps> { }
diff --git a/types/recharts/recharts-tests.tsx b/types/recharts/recharts-tests.tsx
index 17d49bbd11..6388a94d65 100644
--- a/types/recharts/recharts-tests.tsx
+++ b/types/recharts/recharts-tests.tsx
@@ -13,12 +13,9 @@ interface ComponentState {
 }
 
 class Component extends React.Component<{}, ComponentState> {
-    constructor(props: any) {
-        super(props);
-        this.state = {
-            activeIndex: 0
-        };
-    }
+    state = {
+        activeIndex: 0
+    };
 
     private clickHandler(...args: any[]) {
         console.log(`Handling a click on a chart: ${JSON.stringify(args)}`);
@@ -91,9 +88,9 @@ class Component extends React.Component<{}, ComponentState> {
                 <ResponsiveContainer>
                     <LineChart width={500} height={300} data={data}>
                         <XAxis dataKey="name">
-                            <Label>X axis - name</Label>
+                            <Label fontSize="8px">X axis - name</Label>
                         </XAxis>
-                        <YAxis>
+                        <YAxis stroke="#8884d8">
                             <Label>Y axis</Label>
                         </YAxis>
                         <CartesianGrid vertical={true} horizontal={false} verticalFill={["#fafafa", "#c8c8c8"]}  />
@@ -101,7 +98,7 @@ class Component extends React.Component<{}, ComponentState> {
                         <Line type="monotone" dataKey="pv" stroke="#82ca9d" />
                         <Tooltip />
                         <Brush dataKey="name" />
-                        <ReferenceLine />
+                        <ReferenceLine label={"reference"} />
                         <ReferenceArea
                             stroke="red"
                             fill="red"
@@ -192,7 +189,9 @@ class Component extends React.Component<{}, ComponentState> {
                     <XAxis dataKey="name">
                         <Label value="Pages of my website" offset={0} position="insideBottom" />
                     </XAxis>
-                    <YAxis label='pv of page' />
+                    <YAxis>
+                        <Label value="pv of page" angle={90} />
+                    </YAxis>
                     <Bar dataKey="pv" fill="#8884d8">
                         <LabelList dataKey="name" position="insideTop" angle={45}  />
                     </Bar>
diff --git a/types/recharts/tsconfig.json b/types/recharts/tsconfig.json
index 9c1f91ee8c..1f3c599158 100644
--- a/types/recharts/tsconfig.json
+++ b/types/recharts/tsconfig.json
@@ -22,4 +22,4 @@
         "index.d.ts",
         "recharts-tests.tsx"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/recompose/index.d.ts b/types/recompose/index.d.ts
index 0c7b9089c6..f0ad8596ab 100644
--- a/types/recompose/index.d.ts
+++ b/types/recompose/index.d.ts
@@ -6,7 +6,7 @@
 //                 Rasmus Eneman <https://github.com/Pajn>
 //                 Lucas Terra <https://github.com/lucasterra>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 ///<reference types="react" />
 
@@ -661,39 +661,24 @@ declare module 'recompose/hoistStatics' {
 // https://github.com/acdlite/recompose/blob/master/docs/API.md#componentfromstream
 declare module 'recompose/componentFromStream' {
     import { componentFromStream } from 'recompose';
+    export { componentFromStreamWithConfig } from 'recompose';
     export default componentFromStream;
 }
 
-// https://github.com/acdlite/recompose/blob/master/docs/API.md#componentfromstreamwithconfig
-declare module 'recompose/componentFromStreamWithConfig' {
-    import { componentFromStreamWithConfig } from 'recompose';
-    export default componentFromStreamWithConfig;
-}
-
 // https://github.com/acdlite/recompose/blob/master/docs/API.md#mappropsstream
 declare module 'recompose/mapPropsStream' {
     import { mapPropsStream } from 'recompose';
+    export { mapPropsStreamWithConfig } from 'recompose';
     export default mapPropsStream;
 }
 
-// https://github.com/acdlite/recompose/blob/master/docs/API.md#mappropsstreamwithconfig
-declare module 'recompose/mapPropsStreamWithConfig' {
-    import { mapPropsStreamWithConfig } from 'recompose';
-    export default mapPropsStreamWithConfig;
-}
-
 // https://github.com/acdlite/recompose/blob/master/docs/API.md#createeventhandler
 declare module 'recompose/createEventHandler' {
     import { createEventHandler } from 'recompose';
+    export { createEventHandlerWithConfig } from 'recompose';
     export default createEventHandler;
 }
 
-// https://github.com/acdlite/recompose/blob/master/docs/API.md#createeventhandlerwithconfig
-declare module 'recompose/createEventHandlerWithConfig' {
-    import { createEventHandlerWithConfig } from 'recompose';
-    export default createEventHandlerWithConfig;
-}
-
 // https://github.com/acdlite/recompose/blob/master/docs/API.md#setobservableconfig
 declare module 'recompose/setObservableConfig' {
     import { setObservableConfig } from 'recompose';
diff --git a/types/recompose/recompose-tests.tsx b/types/recompose/recompose-tests.tsx
index 75d64b468d..9058a10f4d 100644
--- a/types/recompose/recompose-tests.tsx
+++ b/types/recompose/recompose-tests.tsx
@@ -62,12 +62,9 @@ import createSinkStandalone from "recompose/createSink";
 import componentFromPropStandalone from "recompose/componentFromProp";
 import nestStandalone from "recompose/nest";
 import hoistStaticsStandalone from "recompose/hoistStatics";
-import componentFromStreamStandalone from "recompose/componentFromStream";
-import componentFromStreamWithConfigStandalone from "recompose/componentFromStreamWithConfig";
-import mapPropsStreamStandalone from "recompose/mapPropsStream";
-import mapPropsStreamWithConfigStandalone from "recompose/mapPropsStreamWithConfig";
-import createEventHandlerStandalone from "recompose/createEventHandler";
-import createEventHandlerWithConfigStandalone from "recompose/createEventHandlerWithConfig";
+import componentFromStreamStandalone, { componentFromStreamWithConfig as componentFromStreamWithConfigStandalone } from "recompose/componentFromStream";
+import mapPropsStreamStandalone, { mapPropsStreamWithConfig as mapPropsStreamWithConfigStandalone } from "recompose/mapPropsStream";
+import createEventHandlerStandalone, { createEventHandlerWithConfig as createEventHandlerWithConfigStandalone } from "recompose/createEventHandler";
 import setObservableConfigStandalone from "recompose/setObservableConfig";
 
 function testMapProps() {
@@ -135,7 +132,7 @@ function testWithHandlers() {
         onSubmit: React.MouseEventHandler<HTMLDivElement>;
         onChange: Function;
     }
-    const InnerComponent: React.StatelessComponent<InnerProps & HandlerProps> = ({onChange, onSubmit, foo}) =>
+    const InnerComponent: React.StatelessComponent<InnerProps & HandlerProps & OutterProps> = ({onChange, onSubmit, foo}) =>
       <div onClick={onSubmit}>{foo}</div>;
 
     const enhancer = withHandlers<OutterProps & InnerProps, HandlerProps>({
@@ -256,6 +253,15 @@ function testWithState() {
     const rendered2 = (
         <Enhanced2 title="foo" />
     );
+
+    // We can also actually provide the generic necessary
+    const enhancer3 = withState<OutterProps, number, "count", "setCount">("count", "setCount", 1);
+    const Enhanced3 = enhancer3(props => {
+        return <div>{props.count}</div>;
+    });
+    const rendered3 = (
+        <Enhanced3 title="foo" />
+    );
 }
 
 function testWithStateHandlers() {
diff --git a/types/reconnect-core/index.d.ts b/types/reconnect-core/index.d.ts
new file mode 100644
index 0000000000..0a447e7571
--- /dev/null
+++ b/types/reconnect-core/index.d.ts
@@ -0,0 +1,47 @@
+// Type definitions for reconnect-core 1.3
+// Project: https://www.npmjs.com/package/reconnect-core
+// Definitions by: James Bromwell <https://github.com/thw0rted>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Backoff, ExponentialOptions  } from "backoff";
+import { EventEmitter } from "events";
+import { Stream } from "stream";
+
+declare namespace reconnect {
+    // TODO: Once DT supports TS 3.0, use new Generic Rest Parameter feature for
+    // ArgType.  Current definitions only support one parameter passed to
+    // connect() but the library actually allows any number of args.
+    type CustomModule<ArgType, ConnectionType> =
+        (opts?: ModuleOptions<ConnectionType>, cb?: (con: ConnectionType) => void) => Instance<ArgType, ConnectionType>;
+
+    interface ModuleOptions<ConnectionType> extends ExponentialOptions {
+        immediate?: boolean;
+        failAfter?: number;
+        onConnect?: (con: ConnectionType) => void;
+        strategy?: "fibonacci" | "exponential" | Backoff;
+    }
+
+    interface Instance<ArgType, ConnectionType> extends EventEmitter {
+        connect(opts: ArgType): this;
+        listen(opts: ArgType): this;
+        disconnect(): this;
+        reset(): void;
+
+        readonly connected: boolean;
+        reconnect: boolean;
+
+        on(event: "backoff", cb: (n: number, delay: number, err?: any) => void): this;
+        on(event: "connect" | "connection", cb: (con: ConnectionType) => void): this;
+        on(event: "disconnect", cb: (err?: any) => void): this;
+        on(event: "error" | "fail", cb: (err: any) => void): this;
+        on(event: "reconnect", cb: (n: number, delay: number) => void): this;
+    }
+}
+
+type ConnectFunction<ArgType, ConnectionType> =
+    (this: reconnect.Instance<ArgType, ConnectionType>, opts: ArgType) => ConnectionType;
+declare function reconnect<ArgType, ConnectionType>(
+    cf: ConnectFunction<ArgType, ConnectionType>): reconnect.CustomModule<ArgType, ConnectionType>;
+
+export = reconnect;
diff --git a/types/reconnect-core/reconnect-core-tests.ts b/types/reconnect-core/reconnect-core-tests.ts
new file mode 100644
index 0000000000..f809224d2f
--- /dev/null
+++ b/types/reconnect-core/reconnect-core-tests.ts
@@ -0,0 +1,44 @@
+import reconnect = require("reconnect-core");
+import { NetConnectOpts, Socket, connect } from "net";
+
+// Approximation of example from docs
+const module: reconnect.CustomModule<NetConnectOpts | string | number, Socket> = reconnect(arg => {
+    // TS can't resolve passing even the simplest union types to function overloads :-/
+    // (see TS issue #14107)
+    if (typeof arg === "string") {
+        return connect(arg);
+    } else if (typeof arg === "number") {
+        return connect(arg);
+    } else {
+        return connect(arg);
+    }
+});
+
+const opts: reconnect.ModuleOptions<Socket> = {
+    failAfter: Infinity,
+    immediate: false,
+    initialDelay: 1e3,
+    maxDelay: 30e3,
+    randomisationFactor: 0,
+    strategy: "fibonacci",
+    onConnect: sock => {
+        sock.on("data", console.log);
+    },
+};
+
+const conn = module(opts);
+
+conn.on("connect", con => con.address())
+    .on("reconnect", (n, delay) => {
+        n.toExponential();
+        delay.toFixed();
+    })
+    .on("disconnect", console.log)
+    .on("error", console.log)
+    .connect(12345);
+
+conn.disconnect();
+
+conn.reconnect = false;
+
+conn.reset();
diff --git a/types/reconnect-core/tsconfig.json b/types/reconnect-core/tsconfig.json
new file mode 100644
index 0000000000..fd7721cde3
--- /dev/null
+++ b/types/reconnect-core/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "baseUrl": "../",
+        "forceConsistentCasingInFileNames": true,
+        "lib": [
+            "es2016"
+        ],
+        "module": "commonjs",
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "target": "es6",
+        "types": [],
+        "typeRoots": [
+            "../"
+        ]
+    },
+    "files": [
+        "index.d.ts",
+        "reconnect-core-tests.ts"
+    ]
+}
diff --git a/types/reconnect-core/tslint.json b/types/reconnect-core/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/reconnect-core/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/redlock/index.d.ts b/types/redlock/index.d.ts
index 27e6784886..9b3af6d0b7 100644
--- a/types/redlock/index.d.ts
+++ b/types/redlock/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 //                 BendingBender <https://github.com/BendingBender>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as Promise from 'bluebird';
 import { EventEmitter } from 'events';
diff --git a/types/redlock/v2/index.d.ts b/types/redlock/v2/index.d.ts
index d683ec83a4..9ca431c449 100644
--- a/types/redlock/v2/index.d.ts
+++ b/types/redlock/v2/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mike-marcacci/node-redlock
 // Definitions by: Ilya Mochalov <https://github.com/chrootsu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as redis from 'redis';
 import * as Promise from 'bluebird';
diff --git a/types/redom/index.d.ts b/types/redom/index.d.ts
index 24e149258e..fde67bfb12 100644
--- a/types/redom/index.d.ts
+++ b/types/redom/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for redom 3.6
+// Type definitions for redom 3.12
 // Project: https://github.com/redom/redom/
 // Definitions by: Rauli Laine <https://github.com/RauliL>
+//                 Felix Nehrke <https://github.com/nemoinho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -12,18 +13,40 @@ export type RedomQueryArgument = RedomQueryArgumentValue | RedomQueryArgumentVal
 
 export interface RedomComponent {
     el: HTMLElement;
+
+    update?(item: any, index: number, data: any, context?: any): void;
+
+    onmount?(): void;
+
+    onremount?(): void;
+
+    onunmount?(): void;
 }
 
 export interface RedomComponentConstructor {
     new (): RedomComponent;
 }
 
+export class ListPool {
+    constructor(View: RedomComponentConstructor, key?: string, initData?: any);
+
+    update(data: any[], context?: any): void;
+}
+
 export class List implements RedomComponent {
     el: HTMLElement;
 
     constructor(parent: RedomQuery, View: RedomComponentConstructor, key?: string, initData?: any);
 
     update(data: any[], context?: any): void;
+
+    onmount?(): void;
+
+    onremount?(): void;
+
+    onunmount?(): void;
+
+    static extend(parent: RedomQuery, View: RedomComponentConstructor, key?: string, initData?: any): RedomComponentConstructor;
 }
 
 export class Place implements RedomComponent {
@@ -47,8 +70,10 @@ export interface RouterDictionary {
 }
 
 export function html(query: RedomQuery, ...args: RedomQueryArgument[]): HTMLElement;
+export function h(query: RedomQuery, ...args: RedomQueryArgument[]): HTMLElement;
 export function el(query: RedomQuery, ...args: RedomQueryArgument[]): HTMLElement;
 
+export function listPool(View: RedomComponentConstructor, key?: string, initData?: any): ListPool;
 export function list(parent: RedomQuery, View: RedomComponentConstructor, key?: string, initData?: any): List;
 
 export function mount(parent: RedomElement, child: RedomElement, before?: RedomElement): RedomElement;
@@ -65,5 +90,14 @@ export function setStyle(view: RedomElement, arg1: string | object, arg2?: strin
 export function setChildren(parent: RedomElement, children: RedomElement[]): void;
 
 export function svg(query: RedomQuery, ...args: RedomQueryArgument[]): SVGElement;
+export function s(query: RedomQuery, ...args: RedomQueryArgument[]): SVGElement;
 
 export function text(str: string): Text;
+
+export namespace list {
+    function extend(parent: RedomQuery, View: RedomComponentConstructor, key?: string, initData?: any): RedomComponentConstructor;
+}
+
+export namespace svg {
+    function extend(query: RedomQuery): RedomComponentConstructor;
+}
diff --git a/types/redom/redom-tests.ts b/types/redom/redom-tests.ts
index 0ec18f6a59..b1baff790e 100644
--- a/types/redom/redom-tests.ts
+++ b/types/redom/redom-tests.ts
@@ -14,3 +14,26 @@ redom.setStyle(el3, { color: 'blue' });
 redom.setChildren(el1, [el2, el3]);
 
 redom.mount(document.body, redom.text('Hello, World!'));
+
+class Td implements redom.RedomComponent {
+    el: HTMLElement;
+    constructor() {
+        this.el = redom.h('td');
+    }
+    update(value: any) {
+        this.el.textContent = value;
+    }
+    onmount() {
+        console.log('mounted td');
+    }
+}
+const Tr = redom.list.extend('tr', Td);
+const table = redom.list('table', Tr);
+table.onmount = () => console.log('mounted table');
+
+table.update([
+    [1, 2],
+    [3, 4],
+]);
+
+redom.mount(document.body, table);
diff --git a/types/redux-async-queue/index.d.ts b/types/redux-async-queue/index.d.ts
new file mode 100644
index 0000000000..9e1c4f6053
--- /dev/null
+++ b/types/redux-async-queue/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for redux-async-queue 1.0
+// Project: https://github.com/zackargyle/redux-async-queue
+// Definitions by: Andrei Horodinca <https://github.com/andreiho>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { AnyAction } from 'redux';
+
+declare function queueMiddleware(): (next: (action: AnyAction) => any) => any;
+
+export default queueMiddleware;
diff --git a/types/redux-async-queue/package.json b/types/redux-async-queue/package.json
new file mode 100644
index 0000000000..8d57143254
--- /dev/null
+++ b/types/redux-async-queue/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "redux": "^4.0.0"
+  }
+}
diff --git a/types/redux-async-queue/redux-async-queue-tests.ts b/types/redux-async-queue/redux-async-queue-tests.ts
new file mode 100644
index 0000000000..f088898820
--- /dev/null
+++ b/types/redux-async-queue/redux-async-queue-tests.ts
@@ -0,0 +1,9 @@
+import { createStore, applyMiddleware } from 'redux';
+import queueMiddleware from 'redux-async-queue';
+
+const reducer = (state: any, action: any) => ({ state, action });
+
+const store = createStore(
+    reducer,
+    applyMiddleware(queueMiddleware)
+);
diff --git a/types/redux-async-queue/tsconfig.json b/types/redux-async-queue/tsconfig.json
new file mode 100644
index 0000000000..138bbe6698
--- /dev/null
+++ b/types/redux-async-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",
+        "redux-async-queue-tests.ts"
+    ]
+}
diff --git a/types/redux-async-queue/tslint.json b/types/redux-async-queue/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-async-queue/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-auth-wrapper/v1/index.d.ts b/types/redux-auth-wrapper/v1/index.d.ts
index 366ee7bfdb..cca415812a 100644
--- a/types/redux-auth-wrapper/v1/index.d.ts
+++ b/types/redux-auth-wrapper/v1/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.6
+// TypeScript Version: 2.8
 
 import { ComponentClass, StatelessComponent, ReactType } from "react";
 import { Action } from "redux";
diff --git a/types/redux-auth-wrapper/v1/package.json b/types/redux-auth-wrapper/v1/package.json
new file mode 100644
index 0000000000..b5b3eb5dd8
--- /dev/null
+++ b/types/redux-auth-wrapper/v1/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.7.2"
+    }
+}
diff --git a/types/redux-devtools-dock-monitor/index.d.ts b/types/redux-devtools-dock-monitor/index.d.ts
index 025b24625d..b0cc4a55a8 100644
--- a/types/redux-devtools-dock-monitor/index.d.ts
+++ b/types/redux-devtools-dock-monitor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools-dock-monitor
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/redux-devtools-log-monitor/index.d.ts b/types/redux-devtools-log-monitor/index.d.ts
index 8bbaad7e1f..94d960f51a 100644
--- a/types/redux-devtools-log-monitor/index.d.ts
+++ b/types/redux-devtools-log-monitor/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/gaearon/redux-devtools-log-monitor
 // Definitions by: Petryshyn Sergii <https://github.com/mc-petry>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react'
 import { ColorScheme } from 'base16'
diff --git a/types/redux-first-router-link/index.d.ts b/types/redux-first-router-link/index.d.ts
index c99f5b6ac1..8625433b03 100644
--- a/types/redux-first-router-link/index.d.ts
+++ b/types/redux-first-router-link/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/faceyspacey/redux-first-router-link#readme
 // Definitions by: janb87 <https://github.com/janb87>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from "react";
 import { Location } from 'redux-first-router';
diff --git a/types/redux-first-router/index.d.ts b/types/redux-first-router/index.d.ts
index f15d27ceb7..928be92c6c 100644
--- a/types/redux-first-router/index.d.ts
+++ b/types/redux-first-router/index.d.ts
@@ -4,6 +4,7 @@
 //                 viggyfresh <https://github.com/viggyfresh>
 //                 janb87 <https://github.com/janb87>
 //                 corydeppen <https://github.com/corydeppen>
+//                 jscinoz <https://github.com/jscinoz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -12,7 +13,7 @@ import {
     Store,
     Reducer,
     Middleware,
-    GenericStoreEnhancer
+    StoreEnhancer
 } from 'redux';
 import { History } from 'history';
 
@@ -233,7 +234,7 @@ export function connectRoutes<TKeys = {}, TState = any>(
         reducer: Reducer<LocationState<TKeys, TState>>;
         middleware: Middleware;
         thunk(store: Store<TState>): Promise<Nullable<RouteThunk<TState>>>;
-        enhancer: GenericStoreEnhancer;
+        enhancer: StoreEnhancer;
         initialDispatch?(): void;
     };
 
diff --git a/types/redux-first-router/package.json b/types/redux-first-router/package.json
index cc21197405..7f5b19d45b 100644
--- a/types/redux-first-router/package.json
+++ b/types/redux-first-router/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.7.0"
+        "redux": "^4.0.0"
     }
 }
diff --git a/types/redux-first-router/redux-first-router-tests.ts b/types/redux-first-router/redux-first-router-tests.ts
index 7d14b755c3..cf3f772d9e 100644
--- a/types/redux-first-router/redux-first-router-tests.ts
+++ b/types/redux-first-router/redux-first-router-tests.ts
@@ -10,6 +10,7 @@ import {
     pathToAction
 } from 'redux-first-router';
 import {
+    AnyAction,
     createStore,
     applyMiddleware,
     Middleware,
@@ -18,7 +19,7 @@ import {
     Dispatch,
     compose,
     Action,
-    GenericStoreEnhancer,
+    StoreEnhancer,
     StoreEnhancerStoreCreator,
     combineReducers
 } from 'redux';
@@ -32,7 +33,6 @@ interface Keys {
 }
 interface State {
     location: LocationState<Keys, State>;
-    stale: boolean;
 }
 type StoreCreator = StoreEnhancerStoreCreator<State>;
 
@@ -78,7 +78,7 @@ const dumbMiddleware: Middleware = store => next => action => next(action);
 
 const composedMiddleware = applyMiddleware(middleware, dumbMiddleware);
 
-const storeEnhancer = compose<StoreCreator, StoreCreator, StoreCreator>(
+const storeEnhancer = compose(
     enhancer,
     composedMiddleware
 );
@@ -112,7 +112,7 @@ const action: ReduxFirstRouterAction = {
 };
 redirect(action); // $ExpectType Action
 
-// $ExpectType Store<State>
+// $ExpectType Store<State, AnyAction>
 store;
 
 store.getState().location.routesMap; // $ExpectType RoutesMap<Keys, State>
diff --git a/types/redux-first-routing/index.d.ts b/types/redux-first-routing/index.d.ts
new file mode 100644
index 0000000000..f70d0c3ba8
--- /dev/null
+++ b/types/redux-first-routing/index.d.ts
@@ -0,0 +1,64 @@
+// Type definitions for redux-first-routing 0.3
+// Project: https://github.com/mksarge/redux-first-routing
+// Definitions by: Tomek Łaziuk <https://github.com/tlaziuk>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import createBrowserHistory from 'history/createBrowserHistory';
+import { History, Pathname, Search, Hash, Path, LocationDescriptorObject } from 'history';
+import { Action, Store, Reducer, Middleware } from 'redux';
+
+export { createBrowserHistory };
+
+export function startListener(history: History, store: Store): void;
+
+// constants
+export const PUSH: 'ROUTER/PUSH';
+export const REPLACE: 'ROUTER/REPLACE';
+export const GO: 'ROUTER/GO';
+export const GO_BACK: 'ROUTER/GO_BACK';
+export const GO_FORWARD: 'ROUTER/GO_FORWARD';
+export const LOCATION_CHANGE: 'ROUTER/LOCATION_CHANGE';
+
+// actions
+export interface pushAction<T extends Path | LocationDescriptorObject> extends Action<typeof PUSH> {
+    payload: T;
+}
+export function push<T extends Path | LocationDescriptorObject>(href: T): pushAction<T>;
+
+export interface replaceAction<T extends Path | LocationDescriptorObject> extends Action<typeof REPLACE> {
+    payload: T;
+}
+export function replace<T extends Path | LocationDescriptorObject>(href: T): replaceAction<T>;
+
+export interface goAction<T extends number> extends Action<typeof GO> {
+    payload: T;
+}
+export function go<T extends number>(index: T): goAction<T>;
+
+export type goBackAction = Action<typeof GO_BACK>;
+export function goBack(): goBackAction;
+
+export type goForwardAction = Action<typeof GO_FORWARD>;
+export function goForward(): goForwardAction;
+
+export interface locationChangeAction<P extends Pathname, S extends Search, H extends Hash> extends Action<typeof LOCATION_CHANGE> {
+    payload: {
+        pathname: P;
+        search: S;
+        queries: any,
+        hash: H,
+    };
+}
+export function locationChange<P extends Pathname, S extends Search, H extends Hash>(_: { pathname: P, search: S, hash: H }): locationChangeAction<P, S, H>;
+
+export interface State {
+    pathname: Pathname;
+    search: Search;
+    queries: any;
+    hash: Hash;
+}
+
+export const routerReducer: Reducer<State>;
+
+export function routerMiddleware(history: History): Middleware<any, State>;
diff --git a/types/redux-first-routing/package.json b/types/redux-first-routing/package.json
new file mode 100644
index 0000000000..7f5b19d45b
--- /dev/null
+++ b/types/redux-first-routing/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^4.0.0"
+    }
+}
diff --git a/types/redux-first-routing/redux-first-routing-tests.ts b/types/redux-first-routing/redux-first-routing-tests.ts
new file mode 100644
index 0000000000..e81a2f51fa
--- /dev/null
+++ b/types/redux-first-routing/redux-first-routing-tests.ts
@@ -0,0 +1,39 @@
+import { combineReducers, applyMiddleware, createStore } from 'redux';
+import { createBrowserHistory, routerReducer, routerMiddleware, startListener, push } from 'redux-first-routing';
+
+// Create the history object
+const history = createBrowserHistory();
+
+// Add the reducer, which adds location state to the store
+const rootReducer = combineReducers({
+    router: routerReducer // Convention is to use the "router" property
+});
+
+// Build the middleware, which intercepts navigation actions and calls the corresponding history method
+const middleware = routerMiddleware(history);
+
+// Create the store
+const store = createStore(rootReducer, {}, applyMiddleware(middleware));
+
+// Start the history listener, which automatically dispatches actions to keep the store in sync with the history
+startListener(history, store);
+
+// Now you can read the location from the store!
+let currentLocation = store.getState().router.pathname;
+
+// You can also subscribe to changes in the location!
+const unsubscribe = store.subscribe(() => {
+    const previousLocation = currentLocation;
+    currentLocation = store.getState().router.pathname;
+
+    if (previousLocation !== currentLocation) {
+        console.log(`Location changed from ${previousLocation} to ${currentLocation}`);
+        // Render your application reactively here (optionally using a compatible router)
+    }
+});
+
+// And you can dispatch navigation actions from anywhere!
+store.dispatch(push('/about'));
+
+// Unsubscribe
+unsubscribe();
diff --git a/types/redux-first-routing/tsconfig.json b/types/redux-first-routing/tsconfig.json
new file mode 100644
index 0000000000..efbca68ed7
--- /dev/null
+++ b/types/redux-first-routing/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",
+        "redux-first-routing-tests.ts"
+    ]
+}
diff --git a/types/redux-first-routing/tslint.json b/types/redux-first-routing/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-first-routing/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-form/immutable/index.d.ts b/types/redux-form/immutable/index.d.ts
index 6e7d9f54e6..742027ccad 100644
--- a/types/redux-form/immutable/index.d.ts
+++ b/types/redux-form/immutable/index.d.ts
@@ -2,6 +2,9 @@ export {
     Field,
     FieldArray,
     Fields,
+    Form,
+    FormName,
+    FormSection,
     reduxForm,
     reducer,
     formValueSelector,
@@ -19,6 +22,7 @@ export {
     isInvalid,
     isPristine,
     isSubmitting,
+    isAsyncValidating,
     isValid,
     SubmissionError
 } from "../";
diff --git a/types/redux-form/index.d.ts b/types/redux-form/index.d.ts
index 8ee5fa9698..bbddfbd744 100644
--- a/types/redux-form/index.d.ts
+++ b/types/redux-form/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for redux-form 7.2
+// Type definitions for redux-form 7.4
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Carson Full <https://github.com/carsonf>
 //                 Daniel Lytkin <https://github.com/aikoven>
@@ -7,9 +7,11 @@
 //                 Alex Young <https://github.com/alsiola>
 //                 Anton Novik <https://github.com/tehbi4>
 //                 Huw Martin <https://github.com/huwmartin>
+//                 Ethan Resnick <https://github.com/ethanresnick>
+//                 Tim de Koning <https://github.com/reggino>
+//                 Maddi Joyce <https://github.com/maddijoyce>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
-
+// TypeScript Version: 2.8
 import {
   ComponentClass,
   StatelessComponent,
@@ -18,13 +20,13 @@ import {
 
 export type FieldType = "Field" | "FieldArray";
 
-export interface ErrorOther<T = void> {
+export interface ErrorOther<T = string> {
     _error?: T;
 }
 
-export type FormErrors<FormData = {}, T = void> = {
-    [P in keyof FormData]?: ReactElement<any> | string | ErrorOther<T>;
-};
+export type FormErrors<FormData = {}, T = string> = {
+    [P in keyof FormData]?: ReactElement<any> | T;
+} & ErrorOther<T>;
 
 export interface WarningOther<T = void> {
     _warning?: T;
@@ -46,6 +48,7 @@ export * from "./lib/Field";
 export * from "./lib/Fields";
 export * from "./lib/FieldArray";
 export * from "./lib/Form";
+export * from "./lib/FormName";
 export * from "./lib/FormSection";
 export * from "./lib/formValues";
 export * from "./lib/formValueSelector";
diff --git a/types/redux-form/lib/Field.d.ts b/types/redux-form/lib/Field.d.ts
index a6c2b2e5bb..c303f0d5c3 100644
--- a/types/redux-form/lib/Field.d.ts
+++ b/types/redux-form/lib/Field.d.ts
@@ -37,7 +37,6 @@ export interface CommonFieldProps extends CommonFieldInputProps {
 
 export interface BaseFieldProps<P = {}> extends Partial<CommonFieldProps> {
     name: string;
-    label?: string;
     component?: ComponentType<WrappedFieldProps & P> | "input" | "select" | "textarea";
     format?: Formatter | null;
     normalize?: Normalizer;
@@ -46,6 +45,7 @@ export interface BaseFieldProps<P = {}> extends Partial<CommonFieldProps> {
     validate?: Validator | Validator[];
     warn?: Validator | Validator[];
     withRef?: boolean;
+    immutableProps?: string[];
 }
 
 export interface GenericField<P> extends Component<BaseFieldProps<P> & P> {
@@ -72,7 +72,6 @@ export class Field<P = GenericFieldHTMLAttributes | BaseFieldProps> extends Comp
 export interface WrappedFieldProps {
     input: WrappedFieldInputProps;
     meta: WrappedFieldMetaProps;
-    label?: string;
 }
 
 export interface WrappedFieldInputProps extends CommonFieldInputProps {
diff --git a/types/redux-form/lib/FieldArray.d.ts b/types/redux-form/lib/FieldArray.d.ts
index a6bd442fab..f321164b84 100644
--- a/types/redux-form/lib/FieldArray.d.ts
+++ b/types/redux-form/lib/FieldArray.d.ts
@@ -11,13 +11,13 @@ interface BaseFieldArrayProps<P = {}> {
     rerenderOnEveryChange?: boolean;
 }
 
-export interface GenericFieldArray<Field, P = {}> extends Component<BaseFieldArrayProps<P> & P> {
+export interface GenericFieldArray<Field, P = {}> extends Component<BaseFieldArrayProps<P> & Partial<P>> {
     name: string;
     valid: boolean;
     getRenderedComponent(): Component<WrappedFieldArrayProps<Field> & P>;
 }
 
-export class FieldArray<P = {}> extends Component<BaseFieldArrayProps<P> & P> implements GenericFieldArray<any, P> {
+export class FieldArray<P = {}> extends Component<BaseFieldArrayProps<P> & Partial<P>> implements GenericFieldArray<any, P> {
     name: string;
     valid: boolean;
     getRenderedComponent(): Component<WrappedFieldArrayProps<any> & P>;
@@ -34,6 +34,7 @@ interface FieldsProps<FieldValue> {
     forEach(callback: FieldIterate<FieldValue>): void;
     get(index: number): FieldValue;
     getAll(): FieldValue[];
+    removeAll(): void;
     insert(index: number, value: FieldValue): void;
     length: number;
     map<R>(callback: FieldIterate<FieldValue, R>): R[];
@@ -42,6 +43,7 @@ interface FieldsProps<FieldValue> {
     remove(index: number): void;
     shift(): FieldValue;
     swap(indexA: number, indexB: number): void;
+    move(from: number, to: number): void;
     unshift(value: FieldValue): void;
 }
 
diff --git a/types/redux-form/lib/Form.d.ts b/types/redux-form/lib/Form.d.ts
index 11ba0e2734..0eee944be5 100644
--- a/types/redux-form/lib/Form.d.ts
+++ b/types/redux-form/lib/Form.d.ts
@@ -1,13 +1,12 @@
 import { Component, FormHTMLAttributes, FormEvent, FormEventHandler } from "react";
-import { Dispatch } from "redux";
 import { FormProps, FormErrors, FormSubmitHandler, Omit } from "../index";
 
-interface FormSubmitProp<FormData = {}, P = {}> {
-    onSubmit?: FormSubmitHandler<FormData, P>;
+interface FormSubmitProp<FormData = {}, P = {}, ErrorType = string> {
+    onSubmit?: FormSubmitHandler<FormData, P, ErrorType>;
 }
 
-export type FormProps<FormData, P> = Omit<FormHTMLAttributes<HTMLFormElement>, "onSubmit"> & FormSubmitProp<FormData, P>;
+export type FormProps<FormData, P, ErrorType = string> = Omit<FormHTMLAttributes<HTMLFormElement>, "onSubmit"> & FormSubmitProp<FormData, P, ErrorType>;
 
-export class GenericForm<FormData, P> extends Component<FormProps<FormData, P>> {}
+export class GenericForm<FormData, P, ErrorType> extends Component<FormProps<FormData, P, ErrorType>> {}
 
-export class Form<FormData = {}, P = {}> extends Component<FormProps<FormData, P>> implements GenericForm<FormData, P> {}
+export class Form<FormData = {}, P = {}, ErrorType = string> extends Component<FormProps<FormData, P, ErrorType>> implements GenericForm<FormData, P, ErrorType> {}
diff --git a/types/redux-form/lib/FormName.d.ts b/types/redux-form/lib/FormName.d.ts
new file mode 100644
index 0000000000..20fd50dae8
--- /dev/null
+++ b/types/redux-form/lib/FormName.d.ts
@@ -0,0 +1,9 @@
+import { ReactNode, StatelessComponent } from "react";
+
+export interface FormNameProps {
+    children: (props: { form: string }) => ReactNode,
+}
+
+export const FormName: StatelessComponent<FormNameProps>;
+
+export default FormName;
diff --git a/types/redux-form/lib/SubmissionError.d.ts b/types/redux-form/lib/SubmissionError.d.ts
index d2ec536a58..50695f34d0 100644
--- a/types/redux-form/lib/SubmissionError.d.ts
+++ b/types/redux-form/lib/SubmissionError.d.ts
@@ -1,9 +1,7 @@
 import { FormErrors } from "../index";
 
-export interface SubmissionErrorConstructor<T> {
-    new (errors?: FormErrors<T>): Error;
+export declare class SubmissionError<FormData = {}, ErrorType = string> extends Error {
+  constructor(errors?: FormErrors<FormData, ErrorType>);
 }
 
-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 adc6e9842b..dbe75106e4 100644
--- a/types/redux-form/lib/actions.d.ts
+++ b/types/redux-form/lib/actions.d.ts
@@ -30,16 +30,17 @@ export interface InitializeOptions {
     keepValues: boolean;
 }
 
-export declare function initialize(form: string, data: any, keepDirty?: boolean | InitializeOptions, options?: InitializeOptions): FormAction;
+export declare function initialize(form: string, data: any, keepDirty?: boolean, options?: Partial<InitializeOptions>): FormAction;
+export declare function initialize(form: string, data: any, options?: Partial<InitializeOptions>): FormAction;
 export declare function registerField(form: string, name: string, type: FieldType): FormAction;
 export declare function reset(form: string): FormAction;
 export declare function resetSection(form: string, ...sections: string[]): FormAction;
 export declare function startAsyncValidation(form: string): FormAction;
-export declare function stopAsyncValidation(form: string, errors?: any): FormAction;
+export declare function stopAsyncValidation(form: string, errors?: FormErrors<FormData, any>): FormAction;
 export declare function setSubmitFailed(form: string, ...fields: string[]): FormAction;
 export declare function setSubmitSucceeded(form: string, ...fields: string[]): FormAction;
 export declare function startSubmit(form: string): FormAction;
-export declare function stopSubmit(form: string, errors?: any): FormAction;
+export declare function stopSubmit(form: string, errors?: FormErrors<FormData, any>): FormAction;
 export declare function submit(form: string): FormAction;
 export declare function clearSubmit(form: string): FormAction;
 export declare function clearSubmitErrors(form: string): FormAction;
@@ -48,8 +49,8 @@ export declare function clearFields(form: string, keepTouched: boolean, persiste
 export declare function touch(form: string, ...fields: string[]): FormAction;
 export declare function unregisterField(form: string, name: string): FormAction;
 export declare function untouch(form: string, ...fields: string[]): FormAction;
-export declare function updateSyncErrors(from: string, syncErrors: FormErrors<FormData>, error: any): FormAction;
-export declare function updateSyncWarnings(form: string, syncWarnings: FormWarnings<FormData>, warning: any): FormAction;
+export declare function updateSyncErrors<T = any>(from: string, syncErrors: FormErrors<FormData, T>, error: T): FormAction;
+export declare function updateSyncWarnings<T = any>(form: string, syncWarnings: FormWarnings<FormData, T>, warning: T): FormAction;
 
 declare const actions: {
     arrayInsert: typeof arrayInsert,
diff --git a/types/redux-form/lib/reducer.d.ts b/types/redux-form/lib/reducer.d.ts
index 9e865fc6c1..f2ee374cf2 100644
--- a/types/redux-form/lib/reducer.d.ts
+++ b/types/redux-form/lib/reducer.d.ts
@@ -1,4 +1,4 @@
-import { Action, Reducer } from "redux";
+import { Reducer } from "redux";
 import { FieldType } from "../index";
 
 export interface FormReducer extends Reducer<FormStateMap> {
@@ -8,6 +8,8 @@ export interface FormReducer extends Reducer<FormStateMap> {
 export const reducer: FormReducer;
 
 export interface FormReducerMapObject {
+    // and `<any>` to make it compatible with redux@3
+    // tslint:disable-next-line use-default-type-parameter
     [formName: string]: Reducer<any>;
 }
 
@@ -18,7 +20,7 @@ export interface FormStateMap {
 export interface FormState {
     registeredFields: RegisteredFieldState[];
     fields?: {[name: string]: FieldState};
-    values?: { [fieldName: string]: string };
+    values?: { [fieldName: string]: any };
     active?: string;
     anyTouched?: boolean;
     submitting?: boolean;
diff --git a/types/redux-form/lib/reduxForm.d.ts b/types/redux-form/lib/reduxForm.d.ts
index 128845f08f..5d0d90d7b8 100644
--- a/types/redux-form/lib/reduxForm.d.ts
+++ b/types/redux-form/lib/reduxForm.d.ts
@@ -17,13 +17,14 @@ import {
     FormStateMap
 } from "../index";
 
-export type FormSubmitHandler<FormData = {}, P = {}> =
-    (values: FormData, dispatch: Dispatch<any>, props: P) => void | FormErrors<FormData> | Promise<any>;
+export type FormSubmitHandler<FormData = {}, P = {}, ErrorType = string> =
+    (values: FormData, dispatch: Dispatch<any>, props: P) => void | FormErrors<FormData, ErrorType> | Promise<any>;
 
-export interface SubmitHandler<FormData = {}, P = {}> {
+export type GetFormState = (state: any) => FormStateMap;
+export interface SubmitHandler<FormData = {}, P = {}, ErrorType = string> {
     (
-        submit: FormSubmitHandler<FormData, P>,
-        props?: InjectedFormProps<FormData, P>,
+        submit: FormSubmitHandler<FormData, P, ErrorType>,
+        props?: InjectedFormProps<FormData, P, ErrorType>,
         valid?: boolean,
         asyncValidate?: any,
         fields?: string[]
@@ -31,16 +32,16 @@ export interface SubmitHandler<FormData = {}, P = {}> {
     (event: SyntheticEvent<any>): void;
 }
 
-export interface ValidateCallback<FormData, P> {
+export interface ValidateCallback<FormData, P, ErrorType> {
     values: FormData;
-    nextProps: P & InjectedFormProps<FormData, P>;
-    props: P & InjectedFormProps<FormData, P>;
+    nextProps: P & InjectedFormProps<FormData, P, ErrorType>;
+    props: P & InjectedFormProps<FormData, P, ErrorType>;
     initialRender: boolean;
     structure: any;
 }
 
-export interface AsyncValidateCallback<FormData> {
-    asyncErrors?: FormErrors<FormData>;
+export interface AsyncValidateCallback<FormData, ErrorType> {
+    asyncErrors?: FormErrors<FormData, ErrorType>;
     initialized: boolean;
     trigger: "blur" | "submit";
     blurredField?: string;
@@ -67,7 +68,7 @@ export interface RegisteredField {
     type: "Field" | "FieldArray";
 }
 
-export interface InjectedFormProps<FormData = {}, P = {}> {
+export interface InjectedFormProps<FormData = {}, P = {}, ErrorType = string> {
     anyTouched: boolean;
     array: InjectedArrayProps;
     asyncValidate(): void;
@@ -78,9 +79,9 @@ export interface InjectedFormProps<FormData = {}, P = {}> {
     clearAsyncError(field: string): void;
     destroy(): void;
     dirty: boolean;
-    error: string;
+    error: ErrorType;
     form: string;
-    handleSubmit: SubmitHandler<FormData, P>;
+    handleSubmit: SubmitHandler<FormData, P, ErrorType>;
     initialize(data: Partial<FormData>): void;
     initialized: boolean;
     initialValues: Partial<FormData>;
@@ -97,37 +98,42 @@ export interface InjectedFormProps<FormData = {}, P = {}> {
     registeredFields: { [name: string]: RegisteredField };
 }
 
-export interface ConfigProps<FormData = {}, P = {}> {
+export interface ConfigProps<FormData = {}, P = {}, ErrorType = string> {
     form: string;
     asyncBlurFields?: string[];
     asyncChangeFields?: string[];
-    asyncValidate?(values: FormData, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P>, blurredField: string): Promise<any>;
+    asyncValidate?(values: FormData, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P, ErrorType>, blurredField: string): Promise<any>;
     destroyOnUnmount?: boolean;
     enableReinitialize?: boolean;
     forceUnregisterOnUnmount?: boolean;
-    getFormState?(state: any): FormStateMap;
+    getFormState?: GetFormState;
     immutableProps?: string[];
     initialValues?: Partial<FormData>;
     keepDirtyOnReinitialize?: boolean;
     updateUnregisteredFields?: boolean;
-    onChange?(values: Partial<FormData>, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P>): void;
-    onSubmit?: FormSubmitHandler<FormData, P & InjectedFormProps<FormData, P>> | SubmitHandler<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;
+    onChange?(values: Partial<FormData>, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P, ErrorType>): void;
+    onSubmit?: FormSubmitHandler<FormData, P & InjectedFormProps<FormData, P, ErrorType>, ErrorType> | SubmitHandler<FormData, P & InjectedFormProps<FormData, P, ErrorType>, ErrorType>;
+    onSubmitFail?(
+        errors: FormErrors<FormData, ErrorType> | undefined,
+        dispatch: Dispatch<any>,
+        submitError: any,
+        props: P & InjectedFormProps<FormData, P, ErrorType>
+    ): void;
+    onSubmitSuccess?(result: any, dispatch: Dispatch<any>, props: P & InjectedFormProps<FormData, P, ErrorType>): void;
     propNamespace?: string;
     pure?: boolean;
-    shouldValidate?(params: ValidateCallback<FormData, P>): boolean;
-    shouldError?(params: ValidateCallback<FormData, P>): boolean;
-    shouldWarn?(params: ValidateCallback<FormData, P>): boolean;
-    shouldAsyncValidate?(params: AsyncValidateCallback<FormData>): boolean;
+    shouldValidate?(params: ValidateCallback<FormData, P, ErrorType>): boolean;
+    shouldError?(params: ValidateCallback<FormData, P, ErrorType>): boolean;
+    shouldWarn?(params: ValidateCallback<FormData, P, ErrorType>): boolean;
+    shouldAsyncValidate?(params: AsyncValidateCallback<FormData, ErrorType>): boolean;
     touchOnBlur?: boolean;
     touchOnChange?: boolean;
     persistentSubmitErrors?: boolean;
-    validate?(values: FormData, props: P & InjectedFormProps<FormData, P>): FormErrors<FormData>;
-    warn?(values: FormData, props: P & InjectedFormProps<FormData, P>): FormWarnings<FormData>;
+    validate?(values: FormData, props: P & InjectedFormProps<FormData, P, ErrorType>): FormErrors<FormData, ErrorType>;
+    warn?(values: FormData, props: P & InjectedFormProps<FormData, P, ErrorType>): FormWarnings<FormData>;
 }
 
-export interface FormInstance<FormData, P> extends Component<P> {
+export interface FormInstance<FormData, P, ErrorType> extends Component<P> {
     dirty: boolean;
     invalid: boolean;
     pristine: boolean;
@@ -137,22 +143,22 @@ export interface FormInstance<FormData, P> extends Component<P> {
     submit(): Promise<any>;
     valid: boolean;
     values: Partial<FormData>;
-    wrappedInstance: ReactElement<P & InjectedFormProps<FormData, P>>;
+    wrappedInstance: ReactElement<P & InjectedFormProps<FormData, P, ErrorType>>;
 }
 
-export interface DecoratedComponentClass<FormData, P> {
-    new(props?: P, context?: any): FormInstance<FormData, P>;
+export interface DecoratedComponentClass<FormData, P, ErrorType> {
+    new(props?: P, context?: any): FormInstance<FormData, P, ErrorType>;
 }
 
-export type FormDecorator<FormData, P, Config> =
-    (component: ComponentType<P & InjectedFormProps<FormData, P>>) => DecoratedComponentClass<FormData, P & Config>;
+export type FormDecorator<FormData, P, Config, ErrorType = string> =
+    (component: ComponentType<P & InjectedFormProps<FormData, P, ErrorType>>) => DecoratedComponentClass<FormData, P & Config, ErrorType>;
 
-export declare function reduxForm<FormData = {}, P = {}>(
-    config: ConfigProps<FormData, P>
-): FormDecorator<FormData, P, Partial<ConfigProps<FormData, P>>>;
+export declare function reduxForm<FormData = {}, P = {}, ErrorType = string>(
+    config: ConfigProps<FormData, P, ErrorType>
+): FormDecorator<FormData, P, Partial<ConfigProps<FormData, P, ErrorType>>, ErrorType>;
 
-export declare function reduxForm<FormData = {}, P = {}>(
-    config: Partial<ConfigProps<FormData, P>>
-): FormDecorator<FormData, P, ConfigProps<FormData, P>>;
+export declare function reduxForm<FormData = {}, P = {}, ErrorType = string>(
+    config: Partial<ConfigProps<FormData, P, ErrorType>>
+): FormDecorator<FormData, P, ConfigProps<FormData, P, ErrorType>, ErrorType>;
 
 export default reduxForm;
diff --git a/types/redux-form/lib/selectors.d.ts b/types/redux-form/lib/selectors.d.ts
index 4d224b5b82..c97d99859b 100644
--- a/types/redux-form/lib/selectors.d.ts
+++ b/types/redux-form/lib/selectors.d.ts
@@ -1,8 +1,10 @@
-import { FormErrors } from "../index";
+import { FormErrors, GetFormState } 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;
+export type DataSelector<FormData = {}, State = {}> = (formName: string, getFormState?: GetFormState) => (state: State) => FormData;
+export type ErrorSelector<FormData = {}, State = {}, ErrorType = string> = (formName: string, getFormState?: GetFormState) => (state: State) => FormErrors<FormData, ErrorType>;
+export type BooleanSelector<State = {}> = (formName: string, getFormState?: GetFormState) => (state: State) => boolean;
+export type NamesSelector<State = {}> = (getFormState?: GetFormState) => (state: State) => string[];
+export type FormOrFieldsBooleanSelector<State = {}> = (formName: string, getFormState?: GetFormState) => (state: State, ...fields: string[]) => boolean;
 
 export const getFormValues: DataSelector;
 export const getFormInitialValues: DataSelector;
@@ -12,11 +14,12 @@ export const getFormAsyncErrors: ErrorSelector;
 export const getFormSyncWarnings: ErrorSelector;
 export const getFormSubmitErrors: ErrorSelector;
 export const getFormError: ErrorSelector;
-export function getFormNames(state: any): string[];
-export const isDirty: BooleanSelector;
-export const isPristine: BooleanSelector;
+export const getFormNames: NamesSelector;
+export const isDirty: FormOrFieldsBooleanSelector;
+export const isPristine: FormOrFieldsBooleanSelector;
 export const isValid: BooleanSelector;
 export const isInvalid: BooleanSelector;
 export const isSubmitting: BooleanSelector;
+export const isAsyncValidating: BooleanSelector;
 export const hasSubmitSucceeded: BooleanSelector;
 export const hasSubmitFailed: BooleanSelector;
diff --git a/types/redux-form/package.json b/types/redux-form/package.json
index 6d68bf2f9b..998f8e9b38 100644
--- a/types/redux-form/package.json
+++ b/types/redux-form/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^3.6.0 || ^4.0.0"
     }
 }
diff --git a/types/redux-form/redux-form-tests.tsx b/types/redux-form/redux-form-tests.tsx
index f4317ade87..3b6869474e 100644
--- a/types/redux-form/redux-form-tests.tsx
+++ b/types/redux-form/redux-form-tests.tsx
@@ -4,6 +4,7 @@ import {
     reduxForm,
     InjectedFormProps,
     Form,
+    FormName,
     GenericForm,
     FormSection,
     GenericFormSection,
@@ -60,8 +61,9 @@ type InjectedProps = InjectedFormProps<TestFormData, TestFormComponentProps>;
 
 class TestFormComponent extends React.Component<TestFormComponentProps & InjectedProps> {
     render() {
-        const { form, initialValues } = this.props;
+        const { form, initialValues, error } = this.props;
         const foo = initialValues.foo;
+        const errorIsString = error + 'test';
         return null;
     }
 }
@@ -109,7 +111,6 @@ interface MyFieldCustomProps {
 type MyFieldProps = MyFieldCustomProps & WrappedFieldProps;
 const MyField: React.StatelessComponent<MyFieldProps> = ({
     children,
-    label,
     input,
     meta,
     foo
@@ -238,7 +239,7 @@ const Test = reduxForm<TestFormData>({
 
         render() {
             const { handleSubmit } = this.props;
-            const FormCustom = Form as new () => GenericForm<TestFormData, {}>;
+            const FormCustom = Form as new () => GenericForm<TestFormData, {}, string>;
 
             return (
                 <div>
@@ -399,3 +400,48 @@ class HandleSubmitTest extends React.Component {
         return <HandleSubmitTestForm onSubmit={this.handleSubmit} />;
     }
 }
+
+class FormNameTest extends React.Component {
+    render() {
+        return (
+            <FormName>
+                {({ form }) => <span>Form Name is: {form}</span>}
+            </FormName>
+        );
+    }
+}
+
+// Test SubmissionError with custom error format
+// See https://github.com/DefinitelyTyped/DefinitelyTyped/pull/26494
+// Note: explicit parameters not needed in TS 2.7
+new LibSubmissionError<{ myField: any }, string[]>({
+    _error: ["First form-level error", "Second form-level error"],
+    myField: ["Field-level error"]
+});
+
+new SubmissionError({
+    _error: ["First form-level error", "Second form-level error"]
+});
+
+// Test forms with custom error format.
+const HandleSubmitTestForm2 = reduxForm<TestFormData, {}, string[]>({ form : "test" })(
+    (props: InjectedFormProps<TestFormData, {}, string[]>) => <form onSubmit={ props.handleSubmit } />
+);
+
+class HandleSubmitTest2 extends React.Component {
+    handleSubmit = (values: Partial<TestFormData>, dispatch: Dispatch<any>, props: {}) => {};
+    render() {
+        return <HandleSubmitTestForm2 onSubmit={this.handleSubmit} />;
+    }
+}
+
+type InjectedProps2 = InjectedFormProps<TestFormData, TestFormComponentProps, string[]>;
+class TestFormComponent2 extends React.Component<TestFormComponentProps & InjectedProps2> {
+    render() {
+        const { error, initialValues, handleSubmit } = this.props;
+        error.concat(['error is a string array']);
+
+        handleSubmit((values) => ({ foo: ['string'], _error: [] }));
+        return null;
+    }
+}
diff --git a/types/redux-form/v4/index.d.ts b/types/redux-form/v4/index.d.ts
index 3ecd2d87cc..d9ac180ccf 100644
--- a/types/redux-form/v4/index.d.ts
+++ b/types/redux-form/v4/index.d.ts
@@ -2,12 +2,12 @@
 // Project: https://github.com/erikras/redux-form
 // Definitions by: Daniel Lytkin <https://github.com/aikoven>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { Dispatch, ActionCreator, Reducer } from 'redux';
 
-export const actionTypes: {[actionName: string]: string};
+export const actionTypes: { [actionName: string]: string };
 
 export type FieldValue = any;
 
diff --git a/types/redux-form/v4/package.json b/types/redux-form/v4/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-form/v4/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-form/v6/lib/reducer.d.ts b/types/redux-form/v6/lib/reducer.d.ts
index 1800391863..9089a8802d 100644
--- a/types/redux-form/v6/lib/reducer.d.ts
+++ b/types/redux-form/v6/lib/reducer.d.ts
@@ -29,7 +29,7 @@ export interface FormStateMap {
 export interface FormState {
     registeredFields: RegisteredFieldState[];
     fields?: {[name: string]: FieldState};
-    values?: { [fieldName: string]: string };
+    values?: { [fieldName: string]: any };
     active?: string;
     anyTouched?: boolean;
     submitting?: boolean;
diff --git a/types/redux-infinite-scroll/index.d.ts b/types/redux-infinite-scroll/index.d.ts
index 30fa435e2d..70ce20faf4 100644
--- a/types/redux-infinite-scroll/index.d.ts
+++ b/types/redux-infinite-scroll/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/RealScout/redux-infinite-scroll
 // Definitions by: Tony Nikolov <https://github.com/silkyfray>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { Component, HTMLProps } from "react";
 
diff --git a/types/redux-mock-store/index.d.ts b/types/redux-mock-store/index.d.ts
index 4f8114731a..5966b125a8 100644
--- a/types/redux-mock-store/index.d.ts
+++ b/types/redux-mock-store/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Redux Mock Store 0.0.1
+// Type definitions for Redux Mock Store 1.0.0
 // 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
@@ -6,13 +6,23 @@
 
 import * as Redux from 'redux';
 
-export interface MockStore<T> extends Redux.Store<T> {
+export interface MockStore<S = any, A extends Redux.Action = Redux.AnyAction> extends Redux.Store<S, A> {
     getActions(): any[];
     clearActions(): void;
 }
 
-export type MockStoreCreator<T = {}> = (state?: T) => MockStore<T>;
+export type MockStoreEnhanced<S = {}, DispatchExts = {}> = MockStore<S> & {dispatch: DispatchExts};
 
-declare function createMockStore<T>(middlewares?: Redux.Middleware[]): MockStoreCreator<T>;
+export type MockStoreCreator<S = {}, DispatchExts = {}> = (state?: S) => MockStoreEnhanced<S, DispatchExts>;
+
+/**
+ * Create Mock Store returns a function that will create a mock store from a state
+ * with the same set of set of middleware applied.
+ *
+ * @param middlewares The list of middleware to be applied.
+ * @template S The type of state to be held by the store.
+ * @template DispatchExts The additional Dispatch signatures for the middlewares applied.
+ */
+declare function createMockStore<S, DispatchExts = {}>(middlewares?: Redux.Middleware[]): MockStoreCreator<S, DispatchExts>;
 
 export default createMockStore;
diff --git a/types/redux-mock-store/package.json b/types/redux-mock-store/package.json
index 6d68bf2f9b..7f5b19d45b 100644
--- a/types/redux-mock-store/package.json
+++ b/types/redux-mock-store/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^4.0.0"
     }
 }
diff --git a/types/redux-mock-store/redux-mock-store-tests.ts b/types/redux-mock-store/redux-mock-store-tests.ts
index daa801b960..14ce18ecda 100644
--- a/types/redux-mock-store/redux-mock-store-tests.ts
+++ b/types/redux-mock-store/redux-mock-store-tests.ts
@@ -18,7 +18,7 @@ function counter(state: any, action: any) {
 }
 
 function loggingMiddleware() {
-    return (next: Redux.Dispatch<any>) => (action: any) => {
+    return (next: Redux.Dispatch<Redux.AnyAction>) => (action: any) => {
         console.log(action.type);
         return next(action);
     };
diff --git a/types/redux-mock-store/v0/index.d.ts b/types/redux-mock-store/v0/index.d.ts
new file mode 100644
index 0000000000..4f8114731a
--- /dev/null
+++ b/types/redux-mock-store/v0/index.d.ts
@@ -0,0 +1,18 @@
+// 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';
+
+export interface MockStore<T> extends Redux.Store<T> {
+    getActions(): any[];
+    clearActions(): void;
+}
+
+export type MockStoreCreator<T = {}> = (state?: T) => MockStore<T>;
+
+declare function createMockStore<T>(middlewares?: Redux.Middleware[]): MockStoreCreator<T>;
+
+export default createMockStore;
diff --git a/types/redux-mock-store/v0/package.json b/types/redux-mock-store/v0/package.json
new file mode 100644
index 0000000000..6d68bf2f9b
--- /dev/null
+++ b/types/redux-mock-store/v0/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^3.6.0"
+    }
+}
diff --git a/types/redux-mock-store/v0/redux-mock-store-tests.ts b/types/redux-mock-store/v0/redux-mock-store-tests.ts
new file mode 100644
index 0000000000..daa801b960
--- /dev/null
+++ b/types/redux-mock-store/v0/redux-mock-store-tests.ts
@@ -0,0 +1,45 @@
+import * as Redux from 'redux';
+import configureStore, { MockStore, MockStoreCreator } from 'redux-mock-store';
+
+// Redux store API tests
+// The following test are taken from ../redux/redux-tests.ts
+function counter(state: any, action: any) {
+    if (!state) {
+        state = 0;
+    }
+    switch (action.type) {
+        case 'INCREMENT':
+            return state + 1;
+        case 'DECREMENT':
+            return state - 1;
+        default:
+            return state;
+    }
+}
+
+function loggingMiddleware() {
+    return (next: Redux.Dispatch<any>) => (action: any) => {
+        console.log(action.type);
+        return next(action);
+    };
+}
+
+const mockStoreCreator: MockStoreCreator<number> = configureStore<number>([loggingMiddleware]);
+const initialState = 0;
+
+const store: MockStore<number> = mockStoreCreator(initialState);
+
+store.subscribe(() => {
+    // ...
+});
+
+store.dispatch({ type: 'INCREMENT' });
+
+// Additional mock store API tests
+const actions: any[] = store.getActions();
+
+store.clearActions();
+
+// actions access without the need to cast
+const actions2 = store.getActions();
+actions2[10].payload.id;
diff --git a/types/redux-mock-store/v0/tsconfig.json b/types/redux-mock-store/v0/tsconfig.json
new file mode 100644
index 0000000000..c463852c20
--- /dev/null
+++ b/types/redux-mock-store/v0/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "redux-mock-store": [
+                "redux-mock-store/v0"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "redux-mock-store-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/redux-mock-store/v0/tslint.json b/types/redux-mock-store/v0/tslint.json
new file mode 100644
index 0000000000..3337f86cdc
--- /dev/null
+++ b/types/redux-mock-store/v0/tslint.json
@@ -0,0 +1,8 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODO
+		"dt-header": false,
+		"no-unnecessary-generics": false
+	}
+}
\ No newline at end of file
diff --git a/types/redux-orm/index.d.ts b/types/redux-orm/index.d.ts
new file mode 100644
index 0000000000..31fffa1273
--- /dev/null
+++ b/types/redux-orm/index.d.ts
@@ -0,0 +1,215 @@
+// Type definitions for redux-orm 0.9
+// Project: https://github.com/tommikaikkonen/redux-orm#readme
+// Definitions by: Andrey Goncharov <https://github.com/keenondrums>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export interface ORMId {
+  id: string;
+}
+
+export interface TableState<Item = any, Meta = any> {
+  items: string[];
+  itemsById: { [index: string]: Item };
+  meta: Meta;
+}
+
+export interface ORMCommonState {
+  [index: string]: TableState;
+}
+
+export type SessionWithModels<State extends ORMCommonState> = Session<State> & { [P in keyof State]: typeof Model };
+
+export type ModelWithFields<Fields, Additional = {}, VirtualFields = {}> = Model<Fields, Additional, VirtualFields> & Fields & VirtualFields & Additional & ORMId;
+
+// TODO: Refine me
+export type ModelProps = any;
+
+// TODO: Refine me
+export interface DB {
+  getEmptyState: any;
+  query: any;
+  update: any;
+  describe: any;
+}
+
+// TODO: Refine me
+export interface SchemaSpec {
+  tables: any;
+}
+
+// TODO: Refine me
+export interface ORMOpts {
+  createDatabase: (schemaSpec: SchemaSpec) => any;
+}
+
+export interface ModelFields {
+  [index: string]: Attribute | ForeignKey | ManyToMany | OneToOne;
+}
+
+export interface ModelVirtualFields {
+  [index: string]: any;
+}
+
+export class ORM<State extends ORMCommonState = ORMCommonState> {
+  constructor(opts?: ORMOpts)
+  register(...model: Array<typeof Model>): void;
+  register<M>(...model: Array<M[keyof M]>): void;
+  registerManyToManyModelsFor(model: typeof Model): void;
+  get(modelName: string): typeof Model;
+  getModelClasses(): Array<typeof Model>;
+  isFieldInstalled(modelName: string, fieldName: string): boolean;
+  setFieldInstalled(modelName: string, fieldName: string): void;
+  generateSchemaSpec(): SchemaSpec;
+  getDatabase(): DB;
+  getEmptyState(): State;
+  session(state: State): SessionWithModels<State>;
+  mutableSession(state: State): SessionWithModels<State>;
+
+  private _attachQuerySetMethods(model: typeof Model): void;
+  private _setupModelPrototypes(models: Array<typeof Model>): void;
+}
+
+export class Model<Fields, Additional = {}, VirtualFields = {}> {
+  static readonly idAttribute: string;
+  static readonly session: SessionWithModels<any>;
+  static readonly _sessionData: any; // TODO
+  static readonly query: QuerySet<any>;
+
+  static modelName: string;
+  static fields: ModelFields;
+  static virtualFields: ModelVirtualFields;
+  static querySetClass: typeof QuerySet;
+
+  static toString(): string;
+  static options(): object;
+  static _getTableOpts(): object;
+  static markAccessed(): void;
+  static connec(session: Session<ORMCommonState>): void;
+  static getQuerySet(): QuerySet<any>;
+  static invalidateClassCache(): void;
+  static all(): QuerySet<any, any, any>;
+  static create<Fields>(props: Fields): ModelWithFields<Fields, any, any>;
+  static upsert<Fields>(props: Partial<Fields>): ModelWithFields<Fields, any, any>;
+  static withId(id: string): ModelWithFields<any, any, any>;
+  static hasId(id: string): boolean;
+  static _findDatabaseRows(lookupObj: object): any; // TODO
+  static get(lookupObj: object): ModelWithFields<any, any, any>;
+  static reducer(session: SessionWithModels<ORMCommonState>, action: any): any;
+
+  readonly ref: Fields & Additional & ORMId;
+
+  constructor(props: ModelProps)
+
+  getClass(): string;
+  getId(): string;
+  toString(): string;
+  equals(otherModel: ModelWithFields<any, any, any>): boolean;
+  set(propertyName: string, value: any): void;
+  update(userMergeObj: Partial<Fields & Additional>): void;
+  refreshFromState(): void;
+  delete(): void;
+
+  private _onDelete(): void;
+  private _initFields(props: ModelProps): void;
+  private _refreshMany2Many(relations: any): void; // TODO
+}
+
+export type QuerySetClauses = any; // TODO
+export type QuerySetOpts = any; // TODO
+export class QuerySet<Fields, Additional = {}, VirtualFields = {}> {
+  static addSharedMethod(methodName: string): void;
+
+  constructor(modelClass: typeof Model, clauses: QuerySetClauses, opts: QuerySetOpts)
+
+  toString(): string;
+  toRefArray(): Array<Fields & Additional & ORMId>;
+  toModelArray(): Array<ModelWithFields<Fields, Additional, VirtualFields>>;
+  count(): number;
+  exists(): boolean;
+  at(index: string): ModelWithFields<Fields, Additional, VirtualFields> | undefined;
+  first(): ModelWithFields<Fields, Additional, VirtualFields> | undefined;
+  last(): ModelWithFields<Fields, Additional, VirtualFields> | undefined;
+  all(): QuerySet<Fields, Additional, VirtualFields>;
+  filter(lookupObj: object): QuerySet<Fields, Additional, VirtualFields>; // TODO
+  exclude(lookupObj: object): QuerySet<Fields, Additional, VirtualFields>; // TODO
+  orderBy(iteratees: any, orders: any): QuerySet<Fields, Additional, VirtualFields>; // TODO
+  update(mergeObj: Partial<Fields & Additional>): void;
+  delete(): void;
+
+  private _evaluate(): void;
+  private _new(clauses: QuerySetClauses, userOpts: QuerySetOpts): QuerySet<Fields, Additional, VirtualFields>;
+}
+
+export class Session<State extends ORMCommonState> {
+  readonly accessedModels: string[];
+  schema: ORM<State>;
+  db: DB;
+  initialState: State;
+  withMutations: boolean;
+  batchToken: any;
+  sessionBoundModels: Array<typeof Model>;
+  models: Array<typeof Model>;
+  state: State;
+
+  constructor(schema: ORM<State>, db: DB, state: State, withMutations: boolean, batchToken: any) // TODO
+
+  markAccessed(modelName: string): void;
+  getDataForModel(modelName: string): object;
+  applyUpdate(updateSpec: any): any; // TODO
+  query(querySpec: any): any; // TODO
+}
+
+export interface AttributeOpts {
+  getDefault?: () => any;
+}
+
+export class Attribute {
+  constructor(opts: AttributeOpts)
+  install(model: typeof Model, fieldName: string, orm: ORM): void;
+}
+
+export interface RelationalFieldOpts {
+  to: string;
+  relatedName?: string;
+  through?: string;
+  throughFields?: {
+    to: string;
+    from: string;
+  };
+}
+
+export class RelationalField {
+  constructor(toModelName: string, relatedName?: string)
+  constructor(opts: RelationalFieldOpts)
+  getClass: typeof RelationalField;
+}
+
+export class ForeignKey extends RelationalField {
+  install(model: typeof Model, fieldName: string, orm: ORM): void;
+}
+
+export class ManyToMany extends RelationalField {
+  install(model: typeof Model, fieldName: string, orm: ORM): void;
+}
+
+export class OneToOne extends RelationalField {
+  install(model: typeof Model, fieldName: string, orm: ORM): void;
+}
+
+export function attr(opts?: AttributeOpts): Attribute;
+
+export function fk(toModelName: string, relatedName?: string): ForeignKey;
+export function fk(opts: RelationalFieldOpts): ForeignKey;
+
+export function many(toModelName: string, relatedName?: string): ManyToMany;
+export function oneToOne(toModelName: string, relatedName?: string): OneToOne;
+export function oneToOne(opts: RelationalFieldOpts): OneToOne;
+
+export type Updater<State extends ORMCommonState> = (session: SessionWithModels<State>, action: any) => any;
+
+export function createReducer<State extends ORMCommonState = ORMCommonState>(orm: ORM<State>, updater?: Updater<State>): (state: State, action: any) => State;
+
+export type ORMSelector<State extends ORMCommonState, Result = any> = (session: SessionWithModels<State>, ...args: any[]) => Result;
+
+export function createSelector<State extends ORMCommonState = ORMCommonState>(orm: ORM<State>, ...args: Array<ORMSelector<State>>): (state: State) => any;
diff --git a/types/redux-orm/redux-orm-tests.ts b/types/redux-orm/redux-orm-tests.ts
new file mode 100644
index 0000000000..045f4a3554
--- /dev/null
+++ b/types/redux-orm/redux-orm-tests.ts
@@ -0,0 +1,78 @@
+import { attr, createSelector as createSelectorORM, ORMCommonState, ORMId, QuerySet, TableState, SessionWithModels, Model, ORM } from 'redux-orm';
+
+// Model
+export class Test extends Model<TestStateItem, FetchIndicatorState> {
+  static modelName = 'Test';
+
+  static fields = {
+    test: attr(),
+    isFetching: attr({ getDefault: () => false }),
+    id: attr()
+  };
+}
+
+// core data which we do not have defaults for
+export interface TestStateItem {
+  test: string;
+}
+
+// optional data we provide defaults for
+export interface FetchIndicatorState {
+  isFetching: boolean;
+}
+
+// id attr is added automatically by redux-orm therefore we have IORMId interface
+export type TestState = TableState<TestStateItem & ORMId & FetchIndicatorState>;
+
+export interface TestORMState extends ORMCommonState {
+  Test: TestState;
+}
+
+interface TestORMModels {
+  Test: typeof Test;
+}
+
+const orm = new ORM<TestORMState>();
+orm.register<TestORMModels>(Test);
+
+// Reducer
+interface TestDTO {
+  test: string;
+}
+
+interface Action<P> {
+  type: string;
+  payload: P;
+}
+
+const reducerAddItem = (state: TestORMState, action: Action<TestDTO>): TestORMState => {
+  const session = orm.session(state);
+  session.Test.upsert<TestStateItem>(action.payload);
+  return session.state;
+};
+
+// Selector
+interface TestDisplayItem {
+  test: string;
+}
+type TestDisplayItemList = TestDisplayItem[];
+
+// Just for the example below. Use real createSelector from reselect in your app
+const createSelector = <S, P1, R>(param1Creator: (state: S) => P1, combiner: (param1: P1) => R): (state: S) => R => (state) =>
+  combiner(param1Creator(state));
+
+interface RootState {
+  test: TestORMState;
+}
+
+export const makeGetTestDisplayList = () => {
+  const ormSelector = createSelectorORM<TestORMState>(orm, (session: SessionWithModels<TestORMState>) =>
+    (session.Test.all() as QuerySet<TestStateItem, FetchIndicatorState>)
+      .toRefArray()
+      .map((item) => ({ ...item }))
+  );
+  return createSelector<RootState, TestORMState, TestDisplayItemList>(
+    ({ test }) => test,
+    ormSelector
+  );
+};
diff --git a/types/redux-orm/tsconfig.json b/types/redux-orm/tsconfig.json
new file mode 100644
index 0000000000..f981bceb20
--- /dev/null
+++ b/types/redux-orm/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-orm-tests.ts"
+    ]
+}
diff --git a/types/redux-orm/tslint.json b/types/redux-orm/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/redux-orm/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/redux-router/index.d.ts b/types/redux-router/index.d.ts
index bb9764ed61..710aaca0a5 100644
--- a/types/redux-router/index.d.ts
+++ b/types/redux-router/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/rackt/redux-router
 // Definitions by: Stepan Mikhaylyuk <https://github.com/stepancar>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import * as ReactRouter from 'react-router';
diff --git a/types/redux-saga-tester/index.d.ts b/types/redux-saga-tester/index.d.ts
new file mode 100644
index 0000000000..fda97e494b
--- /dev/null
+++ b/types/redux-saga-tester/index.d.ts
@@ -0,0 +1,83 @@
+// Type definitions for redux-saga-tester 1.0
+// Project: https://github.com/wix/redux-saga-tester#readme
+// Definitions by: Ben Lorantfy <https://github.com/BenLorantfy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export interface AnyAction {
+    type: string;
+    [key: string]: any;
+}
+export type Reducer = (state: object, action: AnyAction) => object;
+export interface ReducerMap {
+    [key: string]: Reducer;
+}
+export type ReduxMiddleware = (options: { dispatch: (action: AnyAction) => void, getState: () => object })
+    => (next: (action: AnyAction) => any)
+    => any;
+export type SagaFunction = (...args: any[]) => any;
+
+export interface SagaTesterOptions<StateType extends object> {
+    initialState?: StateType;
+    reducers?: ReducerMap|Reducer;
+    middlewares?: ReduxMiddleware[];
+    combineReducers?: (map: ReducerMap) => Reducer;
+    ignoreReduxActions?: boolean;
+    options?: object;
+}
+
+export default class SagaTester<StateType extends object> {
+    constructor(options?: SagaTesterOptions<StateType>);
+
+    /**
+     * Starts execution of the provided saga.
+     */
+    start(saga: SagaFunction): void;
+
+    /**
+     * Dispatches an action to the redux store.
+     */
+    dispatch(action: AnyAction): void;
+
+    /**
+     * Assigns the newState into the current state. (Only works with the default reducer.)
+     */
+    updateState(state: StateType): void;
+
+    /**
+     * Returns the state of the redux store.
+     */
+    getState(): StateType;
+
+    /**
+     * Returns a promise that will resolve if the specified action is dispatched to the store.
+     * @param futureOnly Causes waitFor to only resolve if the action is called in the future.
+     */
+    waitFor(actionType: string, futureOnly?: boolean): PromiseLike<void>;
+
+    /**
+     * Returns whether the specified was dispatched in the past.
+     */
+    wasCalled(actionType: string): boolean;
+
+    /**
+     * Returns the number of times an action with the given type was dispatched.
+     */
+    numCalled(actionType: string): number;
+
+    /**
+     * Returns the last action dispatched to the store.
+     */
+    getLatestCalledAction(): AnyAction;
+
+    /**
+     * Returns an array of all actions dispatched.
+     */
+    getCalledActions(): AnyAction[];
+
+    /**
+     * Reset the store state back to initialState
+     * @param clearActionList Clears the history of past actions (defaults to false).
+     */
+    reset(clearActionList?: boolean): void;
+}
diff --git a/types/redux-saga-tester/redux-saga-tester-tests.ts b/types/redux-saga-tester/redux-saga-tester-tests.ts
new file mode 100644
index 0000000000..0dba716533
--- /dev/null
+++ b/types/redux-saga-tester/redux-saga-tester-tests.ts
@@ -0,0 +1,70 @@
+import SagaTester from 'redux-saga-tester';
+
+// constructor with all options
+new SagaTester({
+  initialState: {
+    orders: [],
+  },
+  reducers: {
+    orders: (state, action) => state,
+  },
+  middlewares: [
+    ({ dispatch, getState }) => (next) => (action: { type: string }) => {
+      dispatch({ type: 'BLA' });
+      getState();
+
+      return next(action);
+    },
+  ],
+  ignoreReduxActions: false,
+  options: {
+    a: 23,
+  },
+});
+
+// constructor with function as reducers
+new SagaTester({
+  reducers: (state, action) => state,
+});
+
+// constructor with no options
+interface MockStateType {
+  orders: Array<{ name: string }>;
+}
+const sagaTester = new SagaTester<MockStateType>({ initialState: { orders: [] }});
+
+// start
+function* fakeSaga() {
+  return 23;
+}
+
+sagaTester.start(fakeSaga);
+
+// dispatch
+sagaTester.dispatch({ type: 'LOAD_ORDERS', orders: [] });
+
+// updateState
+sagaTester.updateState({ orders: [] });
+
+// getState
+sagaTester.getState().orders;
+
+// waitFor
+sagaTester.waitFor('LOAD_ORDERS').then(() => {});
+sagaTester.waitFor('LOAD_ORDERS', true).then(() => {});
+
+// wasCalled
+sagaTester.wasCalled("LOAD_ORDERS");
+
+// numCalled
+sagaTester.numCalled("LOAD_ORDERS") === 1;
+
+// getLatestCalledAction
+sagaTester.getLatestCalledAction().type;
+
+// getCalledActions
+sagaTester.getCalledActions()[0].type;
+
+// getCalledActions
+sagaTester.reset();
+sagaTester.reset(true);
diff --git a/types/redux-saga-tester/tsconfig.json b/types/redux-saga-tester/tsconfig.json
new file mode 100644
index 0000000000..d9a198f21b
--- /dev/null
+++ b/types/redux-saga-tester/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",
+        "redux-saga-tester-tests.ts"
+    ]
+}
diff --git a/types/redux-saga-tester/tslint.json b/types/redux-saga-tester/tslint.json
new file mode 100644
index 0000000000..a0051c9352
--- /dev/null
+++ b/types/redux-saga-tester/tslint.json
@@ -0,0 +1,3 @@
+{ 
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/redux-testkit/index.d.ts b/types/redux-testkit/index.d.ts
index 47aa006cd2..9e574e7ebf 100644
--- a/types/redux-testkit/index.d.ts
+++ b/types/redux-testkit/index.d.ts
@@ -31,7 +31,7 @@ export function Selector(selector: (state: any, action: any) => any): {
 	execute(state: any, ...args: any[]): any;
 };
 
-export function Thunk(thunkFunc: ThunkAction<any, any, any>, extraArg?: any): ThunkTestkit & {
+export function Thunk(thunkFunc: ThunkAction<any, any, any, any>, extraArg?: any): ThunkTestkit & {
 	withState(state: any): ThunkTestkit;
 };
 
diff --git a/types/redux-testkit/package.json b/types/redux-testkit/package.json
index f682c6113f..7f874d66e7 100644
--- a/types/redux-testkit/package.json
+++ b/types/redux-testkit/package.json
@@ -2,6 +2,6 @@
 	"private": true,
 	"dependencies": {
 		"redux": "^3.6.0",
-		"redux-thunk": "^2.2.0"
+		"redux-thunk": "^2.3.0"
 	}
 }
diff --git a/types/redux-ui/index.d.ts b/types/redux-ui/index.d.ts
index 52cfb24b1d..55061e9a28 100644
--- a/types/redux-ui/index.d.ts
+++ b/types/redux-ui/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/tonyhb/redux-ui
 // Definitions by: Andy Shu Xin <https://github.com/andyshuxin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 import * as Redux from 'redux';
diff --git a/types/ref-array-di/index.d.ts b/types/ref-array-di/index.d.ts
new file mode 100644
index 0000000000..04a69fd1ef
--- /dev/null
+++ b/types/ref-array-di/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for ref-array-di 1.2
+// Project: https://github.com/node-ffi-napi/ref-array-di
+// Definitions by: Keerthi Niranjan <https://github.com/keerthi16>, Kiran Niranjan <https://github.com/KiranNiranjan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import ref = require('ref-napi');
+
+interface ArrayType<T> extends ref.Type {
+    BYTES_PER_ELEMENT: number;
+    fixedLength: number;
+    /** The reference to the base type. */
+    type: ref.Type;
+
+    /**
+     * Accepts a Buffer instance that should be an already-populated with data
+     * for the ArrayType. The "length" of the Array is determined by searching
+     * through the buffer's contents until an aligned NULL pointer is encountered.
+     */
+    untilZeros(buffer: Buffer): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+
+    new (length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    new (data: number[], length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    new (data: Buffer, length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (data: number[], length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+    (data: Buffer, length?: number): {
+        [i: number]: T; length: number; toArray(): T[];
+        toJSON(): T[]; inspect(): string; buffer: Buffer; ref(): Buffer;
+    };
+}
+
+/**
+ * The array type meta-constructor.
+ * The returned constructor's API is highly influenced by the WebGL
+ * TypedArray API.
+ */
+declare var ArrayType: {
+    new <T>(type: ref.Type, length?: number): ArrayType<T>;
+    new <T>(type: string, length?: number): ArrayType<T>;
+    <T>(type: ref.Type, length?: number): ArrayType<T>;
+    <T>(type: string, length?: number): ArrayType<T>;
+};
+
+export = ArrayType;
diff --git a/types/ref-array-di/tsconfig.json b/types/ref-array-di/tsconfig.json
new file mode 100644
index 0000000000..02963e3afd
--- /dev/null
+++ b/types/ref-array-di/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "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/storejs/tslint.json b/types/ref-array-di/tslint.json
similarity index 100%
rename from types/storejs/tslint.json
rename to types/ref-array-di/tslint.json
diff --git a/types/ref-napi/index.d.ts b/types/ref-napi/index.d.ts
new file mode 100644
index 0000000000..ab3b38d953
--- /dev/null
+++ b/types/ref-napi/index.d.ts
@@ -0,0 +1,188 @@
+// Type definitions for ref-napi 1.4
+// Project: https://github.com/node-ffi-napi/ref-napi
+// Definitions by: Keerthi Niranjan <https://github.com/keerthi16>, Kiran Niranjan <https://github.com/KiranNiranjan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Type {
+    /** The size in bytes required to hold this datatype. */
+    size: number;
+    /** The current level of indirection of the buffer. */
+    indirection: number;
+    /** To invoke when `ref.get` is invoked on a buffer of this type. */
+    get(buffer: Buffer, offset: number): any;
+    /** To invoke when `ref.set` is invoked on a buffer of this type. */
+    set(buffer: Buffer, offset: number, value: any): void;
+    /** The name to use during debugging for this datatype. */
+    name?: string;
+    /** The alignment of this datatype when placed inside a struct. */
+    alignment?: number;
+}
+
+/** A Buffer that references the C NULL pointer. */
+export declare var NULL: Buffer;
+/** A pointer-sized buffer pointing to NULL. */
+export declare var NULL_POINTER: Buffer;
+/** Get the memory address of buffer. */
+export declare function address(buffer: Buffer): number;
+/** Allocate the memory with the given value written to it. */
+export declare function alloc(type: Type, value?: any): Buffer;
+/** Allocate the memory with the given value written to it. */
+export declare function alloc(type: string, value?: any): Buffer;
+
+/**
+ * Allocate the memory with the given string written to it with the given
+ * encoding (defaults to utf8). The buffer is 1 byte longer than the
+ * string itself, and is NULL terminated.
+ */
+export declare function allocCString(string: string, encoding?: string): Buffer;
+
+/** Coerce a type.*/
+export declare function coerceType(type: Type): Type;
+/** Coerce a type. String are looked up from the ref.types object. */
+export declare function coerceType(type: string): Type;
+
+/**
+ * Get value after dereferencing buffer.
+ * That is, first it checks the indirection count of buffer's type, and
+ * if it's greater than 1 then it merely returns another Buffer, but with
+ * one level less indirection.
+ */
+export declare function deref(buffer: Buffer): any;
+
+/** Create clone of the type, with decremented indirection level by 1. */
+export declare function derefType(type: Type): Type;
+/** Create clone of the type, with decremented indirection level by 1. */
+export declare function derefType(type: string): Type;
+/** Represents the native endianness of the processor ("LE" or "BE"). */
+export declare var endianness: string;
+/** Check the indirection level and return a dereferenced when necessary. */
+export declare function get(buffer: Buffer, offset?: number, type?: Type): any;
+/** Check the indirection level and return a dereferenced when necessary. */
+export declare function get(buffer: Buffer, offset?: number, type?: string): any;
+/** Get type of the buffer. Create a default type when none exists. */
+export declare function getType(buffer: Buffer): Type;
+/** Check the NULL. */
+export declare function isNull(buffer: Buffer): boolean;
+/** Read C string until the first NULL. */
+export declare function readCString(buffer: Buffer, offset?: number): string;
+
+/**
+ * Read a big-endian signed 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readInt64BE(buffer: Buffer, offset?: number): any;
+
+/**
+ * Read a little-endian signed 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readInt64LE(buffer: Buffer, offset?: number): any;
+
+/** Read a JS Object that has previously been written. */
+export declare function readObject(buffer: Buffer, offset?: number): Object;
+/** Read data from the pointer. */
+export declare function readPointer(buffer: Buffer, offset?: number,
+    length?: number): Buffer;
+/**
+ * Read a big-endian unsigned 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readUInt64BE(buffer: Buffer, offset?: number): any;
+
+/**
+ * Read a little-endian unsigned 64-bit int.
+ * If there is losing precision, then return a string, otherwise a number.
+ * @return {number|string}
+ */
+export declare function readUInt64LE(buffer: Buffer, offset?: number): any;
+
+/** Create pointer to buffer. */
+export declare function ref(buffer: Buffer): Buffer;
+/** Create clone of the type, with incremented indirection level by 1. */
+export declare function refType(type: Type): Type;
+/** Create clone of the type, with incremented indirection level by 1. */
+export declare function refType(type: string): Type;
+
+/**
+ * Create buffer with the specified size, with the same address as source.
+ * This function "attaches" source to the returned buffer to prevent it from
+ * being garbage collected.
+ */
+export declare function reinterpret(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/**
+ * Scan past the boundary of the buffer's length until it finds size number
+ * of aligned NULL bytes.
+ */
+export declare function reinterpretUntilZeros(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+
+/** Write pointer if the indirection is 1, otherwise write value. */
+export declare function set(buffer: Buffer, offset: number, value: any, type?: Type): void;
+/** Write pointer if the indirection is 1, otherwise write value. */
+export declare function set(buffer: Buffer, offset: number, value: any, type?: string): void;
+/** Write the string as a NULL terminated. Default encoding is utf8. */
+export declare function writeCString(buffer: Buffer, offset: number,
+    string: string, encoding?: string): void;
+/** Write a big-endian signed 64-bit int. */
+export declare function writeInt64BE(buffer: Buffer, offset: number, input: number): void;
+/** Write a big-endian signed 64-bit int. */
+export declare function writeInt64BE(buffer: Buffer, offset: number, input: string): void;
+/** Write a little-endian signed 64-bit int. */
+export declare function writeInt64LE(buffer: Buffer, offset: number, input: number): void;
+/** Write a little-endian signed 64-bit int. */
+export declare function writeInt64LE(buffer: Buffer, offset: number, input: string): void;
+
+/**
+ * Write the JS Object. This function "attaches" object to buffer to prevent
+ * it from being garbage collected.
+ */
+export declare function writeObject(buffer: Buffer, offset: number, object: Object): void;
+
+/**
+ * Write the memory address of pointer to buffer at the specified offset. This
+ * function "attaches" object to buffer to prevent it from being garbage collected.
+ */
+export declare function writePointer(buffer: Buffer, offset: number,
+    pointer: Buffer): void;
+
+/** Write a little-endian unsigned 64-bit int. */
+export declare function writeUInt64BE(buffer: Buffer, offset: number, input: number): void;
+/** Write a little-endian unsigned 64-bit int. */
+export declare function writeUInt64BE(buffer: Buffer, offset: number, input: string): void;
+
+/**
+ * Attach object to buffer such.
+ * It prevents object from being garbage collected until buffer does.
+ */
+export declare function _attach(buffer: Buffer, object: Object): void;
+
+/** Same as ref.reinterpret, except that this version does not attach buffer. */
+export declare function _reinterpret(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/** Same as ref.reinterpretUntilZeros, except that this version does not attach buffer. */
+export declare function _reinterpretUntilZeros(buffer: Buffer, size: number,
+    offset?: number): Buffer;
+/** Same as ref.writePointer, except that this version does not attach pointer. */
+export declare function _writePointer(buffer: Buffer, offset: number,
+    pointer: Buffer): void;
+/** Same as ref.writeObject, except that this version does not attach object. */
+export declare function _writeObject(buffer: Buffer, offset: number, object: Object): void;
+
+/** Default types. */
+export declare var types: {
+    void: Type; int64: Type; ushort: Type;
+    int: Type; uint64: Type; float: Type;
+    uint: Type; long: Type; double: Type;
+    int8: Type; ulong: Type; Object: Type;
+    uint8: Type; longlong: Type; CString: Type;
+    int16: Type; ulonglong: Type; bool: Type;
+    uint16: Type; char: Type; byte: Type;
+    int32: Type; uchar: Type; size_t: Type;
+    uint32: Type; short: Type;
+};
diff --git a/types/ref-napi/tsconfig.json b/types/ref-napi/tsconfig.json
new file mode 100644
index 0000000000..02963e3afd
--- /dev/null
+++ b/types/ref-napi/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "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/storejs/v1/tslint.json b/types/ref-napi/tslint.json
similarity index 100%
rename from types/storejs/v1/tslint.json
rename to types/ref-napi/tslint.json
diff --git a/types/ref-struct-di/index.d.ts b/types/ref-struct-di/index.d.ts
new file mode 100644
index 0000000000..dd3d878fc1
--- /dev/null
+++ b/types/ref-struct-di/index.d.ts
@@ -0,0 +1,60 @@
+// Type definitions for ref-struct-di 1.1
+// Project: https://github.com/node-ffi-napi/ref-struct-di
+// Definitions by: Keerthi Niranjan <https://github.com/keerthi16>, Kiran Niranjan <https://github.com/KiranNiranjan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import ref = require('ref-napi');
+
+/**
+ * This is the `constructor` of the Struct type that gets returned.
+ *
+ * Invoke it with `new` to create a new Buffer instance backing the struct.
+ * Pass it an existing Buffer instance to use that as the backing buffer.
+ * Pass in an Object containing the struct fields to auto-populate the
+ * struct with the data.
+ *
+ * @constructor
+ */
+interface StructType extends ref.Type {
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    new (arg: Buffer, data?: {}): any;
+    new (data?: {}): any;
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    (arg: Buffer, data?: {}): any;
+    (data?: {}): any;
+
+    fields: { [key: string]: { type: ref.Type } };
+
+    /**
+     * Adds a new field to the struct instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the struct
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: ref.Type): void;
+
+    /**
+     * Adds a new field to the struct instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the struct
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: string): void;
+
+    /**
+     * Custom for struct type instances.
+     * @override
+     */
+    toString(): string;
+}
+
+/** The struct type meta-constructor. */
+declare var StructType: {
+    new (fields?: object, opt?: object): StructType;
+    new (fields?: any[]): StructType;
+    (fields?: object, opt?: object): StructType;
+    (fields?: any[]): StructType;
+}
+
+export = StructType;
diff --git a/types/ref-struct-di/ref-struct-di-tests.ts b/types/ref-struct-di/ref-struct-di-tests.ts
new file mode 100644
index 0000000000..60b03e0cd5
--- /dev/null
+++ b/types/ref-struct-di/ref-struct-di-tests.ts
@@ -0,0 +1,12 @@
+import ref = require("ref-napi");
+import StructType = require("ref-struct-di");
+
+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-di/tsconfig.json b/types/ref-struct-di/tsconfig.json
new file mode 100644
index 0000000000..fef426ba7a
--- /dev/null
+++ b/types/ref-struct-di/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",
+        "ref-struct-di-tests.ts"
+    ]
+}
diff --git a/types/ref-struct-di/tslint.json b/types/ref-struct-di/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ref-struct-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/ref-union-di/index.d.ts b/types/ref-union-di/index.d.ts
new file mode 100644
index 0000000000..29c7401df9
--- /dev/null
+++ b/types/ref-union-di/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for ref-union-di 1.0
+// Project: https://github.com/node-ffi-napi/ref-union-di
+// Definitions by: Keerthi Niranjan <https://github.com/keerthi16>, Kiran Niranjan <https://github.com/KiranNiranjan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import ref = require('ref-napi');
+
+/**
+ * This is the `constructor` of the Struct type that gets returned.
+ *
+ * Invoke it with `new` to create a new Buffer instance backing the union.
+ * Pass it an existing Buffer instance to use that as the backing buffer.
+ * Pass in an Object containing the union fields to auto-populate the
+ * union with the data.
+ *
+ * @constructor
+ */
+interface UnionType extends ref.Type {
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    new (arg: Buffer, data?: {}): any;
+    new (data?: {}): any;
+    /** Pass it an existing Buffer instance to use that as the backing buffer. */
+    (arg: Buffer, data?: {}): any;
+    (data?: {}): any;
+
+    fields: { [key: string]: { type: ref.Type } };
+
+    /**
+     * Adds a new field to the union instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the union
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: ref.Type): void;
+
+    /**
+     * Adds a new field to the union instance with the given name and type.
+     * Note that this function will throw an Error if any instances of the union
+     * type have already been created, therefore this function must be called at the
+     * beginning, before any instances are created.
+     */
+    defineProperty(name: string, type: string): void;
+
+    /**
+     * Custom for union type instances.
+     * @override
+     */
+    toString(): string;
+}
+
+/** The union type meta-constructor. */
+declare var UnionType: {
+    new (fields?: {}): UnionType;
+    new (fields?: any[]): UnionType;
+    (fields?: {}): UnionType;
+    (fields?: any[]): UnionType;
+}
+
+export = UnionType;
diff --git a/types/ref-union-di/tsconfig.json b/types/ref-union-di/tsconfig.json
new file mode 100644
index 0000000000..02963e3afd
--- /dev/null
+++ b/types/ref-union-di/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "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/ref-union-di/tslint.json b/types/ref-union-di/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/ref-union-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/reflux/index.d.ts b/types/reflux/index.d.ts
index 975e1b6e73..dcfa795e73 100644
--- a/types/reflux/index.d.ts
+++ b/types/reflux/index.d.ts
@@ -1,7 +1,11 @@
-// Type definitions for RefluxJS 0.4
+// Type definitions for RefluxJS 6.4
 // Project: https://github.com/reflux/refluxjs
 // Definitions by: Maurice de Beijer <https://github.com/mauricedb>
+//                 James Liang <https://github.com/LiangZugeng>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
 
 export as namespace Reflux;
 
@@ -17,6 +21,7 @@ export interface ListenFn {
     completed: Function;
     failed: Function;
 }
+
 export interface Listenable {
     listen: ListenFn;
 }
@@ -26,7 +31,8 @@ export interface Subscription {
     listenable: Listenable;
 }
 
-export interface Store {
+export class Store {
+    id: string;
     hasListener(listenable: Listenable): boolean;
     listenToMany(listenables: Listenable[]): void;
     validateListening(listenable: Listenable): string;
@@ -36,10 +42,41 @@ export interface Store {
     fetchInitialState(listenable: Listenable, defaultCallback: Function): void;
     trigger(state: any): void;
     listen(callback: Function, bindContext: any): Function;
+    listenables: any;
+    state: Readonly<any>;
+    setState(state: object): void;
 }
 
-export interface ActionsDefinition {
-    [index: string]: any;
+export class Component<TOfStore extends typeof Store = typeof Store, P = any, S = any> extends React.Component<P, S> {
+    store: TOfStore;
+    stores: TOfStore[];
+    storeKeys: string[];
+    state: S;
+    props: P;
+    mapStoreToState(storeType: TOfStore, mappingFunc: (newState: any) => any): void;
+}
+
+export class PureComponent<TOfStore extends typeof Store = typeof Store, P = any, S = any, SS = any> extends React.PureComponent<P, S, SS> {
+    store: TOfStore;
+    stores: TOfStore[];
+    storeKeys: string[];
+    mapStoreToState(storeType: TOfStore, mappingFunc: (newState: any) => any): void;
+}
+
+export interface ActionParameters {
+    children?: string[];
+    asyncResult?: boolean;
+    sync?: boolean;
+    preEmit?: (...args: any[]) => undefined | any[];
+    shouldEmit?: (...args: any[]) => boolean;
+}
+
+export interface ActionDefinition extends ActionParameters {
+    actionName?: string;
+}
+
+export interface ActionObjectDefinition {
+    [propertyName: string]: ActionParameters;
 }
 
 export interface Actions {
@@ -48,12 +85,16 @@ export interface Actions {
 
 export function createStore(definition: StoreDefinition): Store;
 
-export function createAction(definition?: ActionsDefinition): any;
+export function createAction(definition?: ActionDefinition | string | object): any;
 
-export function createActions(definitions: ActionsDefinition | string[]): any;
+export function createActions(definitions: string[] | ActionObjectDefinition | ActionDefinition[]): any;
 
 export function connect(store: Store, key?: string): void;
 export function listenTo(store: Store, handler: string): void;
 export function setState(state: any): void;
 
 export function ListenerMixin(): any;
+
+export function initStore(typeOfStore: typeof Store): Store;
+
+export const ActionMethods: any;
diff --git a/types/reflux/reflux-tests.tsx b/types/reflux/reflux-tests.tsx
new file mode 100644
index 0000000000..b4303c6901
--- /dev/null
+++ b/types/reflux/reflux-tests.tsx
@@ -0,0 +1,184 @@
+import * as React from 'react';
+import * as Reflux from "reflux";
+
+// Action Tests
+const syncActions = Reflux.createActions([
+    "statusUpdate",
+    "statusEdited",
+    "statusAdded"
+]);
+
+const asyncActions = Reflux.createActions({
+    fireBall: { asyncResult: true }
+});
+
+const completed = (isCompleted: boolean) => {
+    // do something
+};
+
+asyncActions.fireBall.listen(() => {
+    // Trigger async action
+    setTimeout(() => completed(true), 1000);
+});
+
+// Creates a DataStore
+const statusStore = Reflux.createStore({
+    // Initial setup
+    init() {
+        // Register statusUpdate action
+        this.listenTo(asyncActions.fireBall, this.onFireBall);
+    },
+    // Callback
+    onFireBall(flag: boolean) {
+        const status = flag ? 'ONLINE' : 'OFFLINE';
+
+        // Pass on to listeners
+        this.trigger(status);
+    }
+});
+
+const asyncActionsFromObject = Reflux.createActions({
+    loadData: { sync: false, asyncResult: true }
+});
+
+Reflux.createAction({
+    children: ["progressed", "completed", "failed"]
+});
+
+let action = Reflux.createAction();
+action = Reflux.createAction({ children: ['delayComplete'] });
+action = Reflux.createAction({ actionName: 'load' });
+action = Reflux.createAction({ preEmit: (id: number) => { console.log(id); }, shouldEmit: (id: number) => { console.log(id); return id > 0; } });
+
+let actions = Reflux.createActions([{ actionName: 'fireBall' }, { actionName: 'magicMissile', sync: false }]);
+actions = Reflux.createActions({ fireBall: { sync: false } });
+actions = Reflux.createActions({
+    load: { children: ['completed', 'failed'] }
+});
+actions = Reflux.createActions(['load']);
+actions = Reflux.createActions(["fireBall", "magicMissile"]);
+
+const someAsyncOperation = async () => Promise.resolve();
+
+actions.magicMissile.listen(async () => someAsyncOperation());
+
+// Store Tests
+
+const Store = Reflux.createStore({
+    init() {
+        this.listenToMany(actions);
+    },
+    onFireBall() {
+        // whoooosh!
+    },
+    onMagicMissile() {
+        // bzzzzapp!
+    }
+});
+
+const ReactComponent = {
+    mixins: [Reflux.ListenerMixin]
+};
+
+// Reflux ActionMethods Tests
+Reflux.ActionMethods.exampleMethod = () => console.log("test");
+
+// ES6 Component and Store and Tests
+const actionsForES6Test = Reflux.createActions(['loadData']);
+
+class ES6Store1 extends Reflux.Store {
+    constructor() {
+        super();
+        this.listenables = actionsForES6Test;
+        this.state = {
+            error: false,
+            store1Data: null
+        };
+    }
+
+    onLoadData(recordId: number) {
+        this.setState({ error: false, store1Data: "Test Data from Store1: " + recordId.toString() });
+    }
+}
+
+const es6Store1Singleton = Reflux.initStore(ES6Store1);
+
+class ES6Store2 extends Reflux.Store {
+    constructor() {
+        super();
+        this.listenables = actionsForES6Test;
+        this.state = {
+            error: false,
+            store2Data: null
+        };
+    }
+
+    onLoadData(recordId: number) {
+        this.setState({ error: false, store2Data: "Test Data from Store2: " + recordId.toString() });
+    }
+}
+
+interface State {
+    id: number;
+    data?: any;
+}
+
+class ES6ComponentWithSingleStore extends Reflux.Component<any, any, State> {
+    constructor(props: any) {
+        super(props);
+        this.state = {
+            id: 1
+        };
+        this.store = ES6Store1;
+    }
+
+    componentDidMount() {
+        actionsForES6Test.loadData(100);
+    }
+
+    render() {
+        return <div>{this.state.data}</div>;
+    }
+
+    redirect() {
+        this.props.history.push("/home");
+    }
+}
+
+class ES6ComponentWithMultipleStores extends Reflux.Component<any, any, State> {
+    constructor(props: any) {
+        super(props);
+        this.state = {
+            id: 1
+        };
+        this.stores = [ES6Store1, ES6Store2];
+        this.storeKeys = ['store1Data'];
+    }
+
+    componentDidMount() {
+        actionsForES6Test.loadData(this.state.id);
+    }
+
+    render() {
+        return <div>{this.state.data}</div>;
+    }
+}
+
+class MyComponentWithMapStoreToState extends Reflux.Component {
+    constructor(props: any) {
+        super(props);
+
+        this.mapStoreToState(ES6Store1, (fromStore) => {
+            const obj: any = {};
+            if (fromStore.color)
+                obj.color = fromStore.color;
+            if (fromStore.data && fromStore.data.classToUse)
+                obj.class = fromStore.data.classToUse;
+            return obj;
+        });
+    }
+
+    render() {
+        return <p className={this.state.class}>The color is: {this.state.color}</p>;
+    }
+}
diff --git a/types/reflux/tsconfig.json b/types/reflux/tsconfig.json
index 3ef22150e4..d51658ce93 100644
--- a/types/reflux/tsconfig.json
+++ b/types/reflux/tsconfig.json
@@ -6,10 +6,11 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
+        "noImplicitThis": true,
         "strictNullChecks": false,
         "strictFunctionTypes": true,
         "baseUrl": "../",
+        "jsx": "react",
         "typeRoots": [
             "../"
         ],
@@ -19,6 +20,6 @@
     },
     "files": [
         "index.d.ts",
-        "reflux-tests.ts"
+        "reflux-tests.tsx"
     ]
 }
\ No newline at end of file
diff --git a/types/reflux/v0/index.d.ts b/types/reflux/v0/index.d.ts
new file mode 100644
index 0000000000..975e1b6e73
--- /dev/null
+++ b/types/reflux/v0/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for RefluxJS 0.4
+// Project: https://github.com/reflux/refluxjs
+// Definitions by: Maurice de Beijer <https://github.com/mauricedb>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace Reflux;
+
+export interface StoreDefinition {
+    listenables?: any[];
+    init?: Function;
+    getInitialState?: Function;
+    [propertyName: string]: any;
+}
+
+export interface ListenFn {
+    (...params: any[]): any;
+    completed: Function;
+    failed: Function;
+}
+export interface Listenable {
+    listen: ListenFn;
+}
+
+export interface Subscription {
+    stop: Function;
+    listenable: Listenable;
+}
+
+export interface Store {
+    hasListener(listenable: Listenable): boolean;
+    listenToMany(listenables: Listenable[]): void;
+    validateListening(listenable: Listenable): string;
+    listenTo(listenable: Listenable, callback: Function, defaultCallback?: Function): Subscription;
+    stopListeningTo(listenable: Listenable): boolean;
+    stopListeningToAll(): void;
+    fetchInitialState(listenable: Listenable, defaultCallback: Function): void;
+    trigger(state: any): void;
+    listen(callback: Function, bindContext: any): Function;
+}
+
+export interface ActionsDefinition {
+    [index: string]: any;
+}
+
+export interface Actions {
+    [index: string]: Listenable;
+}
+
+export function createStore(definition: StoreDefinition): Store;
+
+export function createAction(definition?: ActionsDefinition): any;
+
+export function createActions(definitions: ActionsDefinition | string[]): any;
+
+export function connect(store: Store, key?: string): void;
+export function listenTo(store: Store, handler: string): void;
+export function setState(state: any): void;
+
+export function ListenerMixin(): any;
diff --git a/types/reflux/reflux-tests.ts b/types/reflux/v0/reflux-tests.ts
similarity index 100%
rename from types/reflux/reflux-tests.ts
rename to types/reflux/v0/reflux-tests.ts
diff --git a/types/reflux/v0/tsconfig.json b/types/reflux/v0/tsconfig.json
new file mode 100644
index 0000000000..2994c6e2ce
--- /dev/null
+++ b/types/reflux/v0/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "reflux": [
+                "reflux/v0"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "reflux-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/reflux/v0/tslint.json b/types/reflux/v0/tslint.json
new file mode 100644
index 0000000000..a62d0d4e68
--- /dev/null
+++ b/types/reflux/v0/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "ban-types": false
+    }
+}
diff --git a/types/registry-auth-token/index.d.ts b/types/registry-auth-token/index.d.ts
new file mode 100644
index 0000000000..e61b05d55f
--- /dev/null
+++ b/types/registry-auth-token/index.d.ts
@@ -0,0 +1,70 @@
+// Type definitions for Registry Auth Token 3.3
+// Project: https://github.com/rexxars/registry-auth-token
+// Definitions by: Maurice de Beijer <https://github.com/mauricedb>
+//                 James Liang <https://github.com/LiangZugeng>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/**
+ * Simple namespace describing the inputs and outputs for `registry-auth-token`
+ */
+declare namespace auth {
+    /**
+     * The options for passing into `registry-auth-token`
+     */
+    interface AuthOptions {
+        /**
+         * Wether or not url's path parts are recursively trimmed from the registry
+         * url when searching for tokens
+         */
+        recursive?: boolean;
+        /**
+         * An npmrc configuration object used when searching for tokens. If no object is provided,
+         * the `.npmrc` file at the base of the project is used.
+         */
+        npmrc?: {
+            /**
+             * A registry url used for matching
+             */
+            registry?: string;
+            /**
+             * Registry url's with token information
+             */
+            [registryUrls: string]: string | undefined;
+        };
+    }
+    /**
+     * The generated authentication information
+     */
+    interface NpmCredentials {
+        /**
+         * The token representing the users credentials
+         */
+        token: string;
+        /**
+         * The type of token
+         */
+        type: 'Basic'|'Bearer';
+        /**
+         * The username used in `Basic`
+         */
+        username?: string;
+        /**
+         * The password used in `Basic`
+         */
+        password?: string;
+    }
+}
+
+/**
+ *
+ * @param registryUrl - Either the registry url used
+ * for matching or a configuration object describing the contents of the .npmrc file
+ * @param [options] - a configuration object describing the
+ * contents of the .npmrc file.  If an `npmrc` config object was passed in as the
+ * first parameter, this parameter is ignored.
+ * @returns The `NpmCredentials` object or undefined if no match found.
+ */
+declare function auth(registryUrl: string | auth.AuthOptions, options?: auth.AuthOptions): auth.NpmCredentials;
+
+export = auth;
diff --git a/types/registry-auth-token/registry-auth-token-tests.ts b/types/registry-auth-token/registry-auth-token-tests.ts
new file mode 100644
index 0000000000..0c50ea20a4
--- /dev/null
+++ b/types/registry-auth-token/registry-auth-token-tests.ts
@@ -0,0 +1,15 @@
+import * as authToken from 'registry-auth-token';
+
+// $ExpectType NpmCredentials
+authToken('url');
+// $ExpectType NpmCredentials
+authToken({ recursive: true });
+// $ExpectType NpmCredentials
+authToken({ npmrc: { url: 'value' } });
+// $ExpectType NpmCredentials
+authToken({ npmrc: { registry: 'url' } });
+// $ExpectType NpmCredentials
+authToken('url', { npmrc: { url: 'value' } });
+
+// $ExpectError
+authToken();
diff --git a/types/registry-auth-token/tsconfig.json b/types/registry-auth-token/tsconfig.json
new file mode 100644
index 0000000000..68f274cdd6
--- /dev/null
+++ b/types/registry-auth-token/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",
+        "registry-auth-token-tests.ts"
+    ]
+}
diff --git a/types/registry-auth-token/tslint.json b/types/registry-auth-token/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/registry-auth-token/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/relay-runtime/index.d.ts b/types/relay-runtime/index.d.ts
index 85a6c9c3ea..dbafde4fe1 100644
--- a/types/relay-runtime/index.d.ts
+++ b/types/relay-runtime/index.d.ts
@@ -3,7 +3,11 @@
 // 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
+// TypeScript Version: 2.9
+
+// Prettified with:
+// $ prettier --parser typescript --tab-width 4 --semi --trailing-comma es5 --write --print-width 120 \
+//   types/{react-relay,relay-runtime}/{,*}/*.ts*
 
 /**
  * SOURCE:
@@ -47,6 +51,20 @@ export type RequestNode = ConcreteRequest | ConcreteBatchRequest;
 // tslint:disable-next-line:no-const-enum
 export const enum FragmentReference {}
 
+export interface OperationBase {
+    variables: object;
+    response: object;
+}
+export interface OperationDefaults {
+    variables: Variables;
+    response: Variables;
+}
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// Constants
+// ~~~~~~~~~~~~~~~~~~~~~
+export const ROOT_ID: string;
+
 // ~~~~~~~~~~~~~~~~~~~~~
 // RelayQL
 // ~~~~~~~~~~~~~~~~~~~~~
@@ -136,11 +154,11 @@ export type StoreUpdater = (store: RecordSourceProxy) => void;
  * 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 = (
+export type SelectorStoreUpdater<T = any> = (
     store: RecordSourceSelectorProxy,
     // Actually RelayCombinedEnvironmentTypes#SelectorData, but mixed is
     // inconvenient to access deeply in product code.
-    data: any // FLOW FIXME
+    data: T
 ) => void;
 
 /**
@@ -176,7 +194,7 @@ export interface RecordProxy {
 export interface RecordSourceProxy {
     create(dataID: DataID, typeName: string): RecordProxy;
     delete(dataID: DataID): void;
-    get(dataID: DataID): Array<RecordProxy | null> | null;
+    get(dataID: DataID): RecordProxy | null;
     getRoot(): RecordProxy;
 }
 
@@ -479,7 +497,9 @@ export interface CUnstableEnvironmentCore<TEnvironment, TFragment, TGraphQLTagge
         operationVariables: Variables,
         fragments: CFragmentMap<TFragment>,
         props: Props
-    ): { [key: string]: CSelector<TNode> | Array<CSelector<TNode>> | null | undefined };
+    ): {
+        [key: string]: CSelector<TNode> | Array<CSelector<TNode>> | null | undefined;
+    };
 
     /**
      * Given a mapping of keys -> results and a mapping of keys -> fragments,
@@ -995,24 +1015,28 @@ export type Observable<T> = RelayObservable<T>;
 // commitLocalUpdate
 // ~~~~~~~~~~~~~~~~~~~~~
 // exposed through RelayModern, not Runtime directly
-export type commitLocalUpdate = (environment: Environment, updater: StoreUpdater) => void;
+export function commitLocalUpdate(environment: Environment, updater: StoreUpdater): void;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // commitRelayModernMutation
 // ~~~~~~~~~~~~~~~~~~~~~
 // exposed through RelayModern, not Runtime directly
-export interface MutationConfig<T> {
+export interface MutationConfig<T extends OperationBase> {
     configs?: RelayMutationConfig[];
     mutation: GraphQLTaggedNode;
-    variables: Variables;
+    variables: T["variables"];
     uploadables?: UploadableMap;
-    onCompleted?(response: T, errors: PayloadError[] | null | undefined): void;
+    onCompleted?(response: T["response"], errors: PayloadError[] | null | undefined): void;
     onError?(error?: Error): void;
-    optimisticUpdater?: SelectorStoreUpdater;
-    optimisticResponse?: object;
-    updater?: SelectorStoreUpdater;
+    optimisticUpdater?: SelectorStoreUpdater<T["response"]>;
+    optimisticResponse?: T["response"];
+    updater?: SelectorStoreUpdater<T["response"]>;
 }
-export function commitRelayModernMutation(environment: Environment, config: MutationConfig<any>): Disposable;
+export function commitRelayModernMutation<T extends OperationBase = OperationDefaults>(
+    environment: Environment,
+    // tslint:disable-next-line:no-unnecessary-generics
+    config: MutationConfig<T>
+): Disposable;
 
 // ~~~~~~~~~~~~~~~~~~~~~
 // applyRelayModernOptimisticMutation
diff --git a/types/relay-runtime/relay-runtime-tests.tsx b/types/relay-runtime/relay-runtime-tests.tsx
index 4cbbacf680..72f262cbfa 100644
--- a/types/relay-runtime/relay-runtime-tests.tsx
+++ b/types/relay-runtime/relay-runtime-tests.tsx
@@ -6,6 +6,8 @@ import {
     ConnectionHandler,
     ViewerHandler,
     RecordSourceInspector,
+    commitLocalUpdate,
+    ROOT_ID,
 } from "relay-runtime";
 
 const source = new RecordSource();
@@ -60,3 +62,12 @@ function handlerProvider(handle: any) {
 // ~~~~~~~~~~~~~~~~~~~~~
 
 const inspector = new RecordSourceInspector(source);
+
+// ~~~~~~~~~~~~~~~~~~~~~
+// commitLocalUpdate
+// ~~~~~~~~~~~~~~~~~~~~~
+
+commitLocalUpdate(environment, store => {
+  const root = store.get(ROOT_ID)!;
+  root.setValue("foo", "localKey");
+});
diff --git a/types/remote-redux-devtools/index.d.ts b/types/remote-redux-devtools/index.d.ts
index 4725bc4c58..de6a5efce1 100644
--- a/types/remote-redux-devtools/index.d.ts
+++ b/types/remote-redux-devtools/index.d.ts
@@ -1,13 +1,17 @@
 // Type definitions for remote-redux-devtools 0.5
 // Project: https://github.com/zalmoxisus/remote-redux-devtools
-// Definitions by: Colin Eberhardt <https://github.com/ColinEberhardt>, Daniel Perez Alvarez <https://github.com/unindented>
+// Definitions by: Colin Eberhardt <https://github.com/ColinEberhardt>
+//                 Daniel Perez Alvarez <https://github.com/unindented>
+//                 Maximo Dominguez <https://github.com/mamodom>
+//                 Colin Dekker <https://github.com/colindekker>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import {
   Action,
   ActionCreator,
   ActionCreatorsMapObject,
-  GenericStoreEnhancer
+  StoreEnhancer
 } from "redux";
 
 export interface RemoteReduxDevToolsOptions {
@@ -108,5 +112,5 @@ export interface RemoteReduxDevToolsOptions {
   id?: string;
 }
 
-export function composeWithDevTools(options?: RemoteReduxDevToolsOptions): (...funcs: GenericStoreEnhancer[]) => GenericStoreEnhancer;
-export function composeWithDevTools(...funcs: GenericStoreEnhancer[]): GenericStoreEnhancer;
+export function composeWithDevTools(options?: RemoteReduxDevToolsOptions): (...funcs: StoreEnhancer[]) => StoreEnhancer;
+export function composeWithDevTools(...funcs: StoreEnhancer[]): StoreEnhancer;
diff --git a/types/remote-redux-devtools/package.json b/types/remote-redux-devtools/package.json
index 6d68bf2f9b..7f5b19d45b 100644
--- a/types/remote-redux-devtools/package.json
+++ b/types/remote-redux-devtools/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "redux": "^3.6.0"
+        "redux": "^4.0.0"
     }
 }
diff --git a/types/req-cwd/index.d.ts b/types/req-cwd/index.d.ts
new file mode 100644
index 0000000000..56ca4f0786
--- /dev/null
+++ b/types/req-cwd/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for req-cwd 2.0
+// Project: https://github.com/sindresorhus/req-cwd
+// Definitions by: Arturas Molcanovas <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/** Like require(), throws when the module can't be found. */
+declare function reqCwd(moduleId: string): any;
+
+declare namespace reqCwd {
+    /** Returns null instead of throwing when the module can't be found. */
+    function silent(moduleId: string): any;
+}
+
+export = reqCwd;
diff --git a/types/req-cwd/req-cwd-tests.ts b/types/req-cwd/req-cwd-tests.ts
new file mode 100644
index 0000000000..df95f8161f
--- /dev/null
+++ b/types/req-cwd/req-cwd-tests.ts
@@ -0,0 +1,9 @@
+import * as reqCwd from 'req-cwd';
+
+const r1: string = reqCwd('./foo');
+const r2: number = reqCwd('./foo');
+const r3: {foo: string} = reqCwd('./foo');
+
+const s1: string | null = reqCwd.silent('./foo');
+const s2: number | null = reqCwd.silent('./foo');
+const s3: {foo: string} | null = reqCwd.silent('./foo');
diff --git a/types/req-cwd/tsconfig.json b/types/req-cwd/tsconfig.json
new file mode 100644
index 0000000000..648ca4cf75
--- /dev/null
+++ b/types/req-cwd/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",
+        "req-cwd-tests.ts"
+    ]
+}
diff --git a/types/req-cwd/tslint.json b/types/req-cwd/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/req-cwd/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/request-promise/index.d.ts b/types/request-promise/index.d.ts
index 8b2382d049..895213e770 100644
--- a/types/request-promise/index.d.ts
+++ b/types/request-promise/index.d.ts
@@ -5,7 +5,7 @@
 //                 Aya Morisawa <https://github.com/AyaMorisawa>
 //                 Matt R. Wilson <https://github.com/mastermatt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import request = require('request');
 import http = require('http');
diff --git a/types/requestidlecallback/index.d.ts b/types/requestidlecallback/index.d.ts
new file mode 100644
index 0000000000..7f92f39103
--- /dev/null
+++ b/types/requestidlecallback/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for requestidlecallback 0.1
+// Project: https://w3c.github.io/requestidlecallback/
+// Definitions by: 贺师俊 <https://github.com/hax>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function requestIdleCallback(callback: IdleRequestCallback, options?: IdleRequestOptions): IdleCallbackHandle;
+export function cancelIdleCallback(handle: IdleCallbackHandle): void;
+
+export type DOMHighResTimeStamp = number;
+export type IdleCallbackHandle = number;
+
+export type IdleRequestCallback = (deadline: IdleDeadline) => void;
+
+export interface IdleDeadline {
+	timeRemaining(): DOMHighResTimeStamp;
+	readonly didTimeout: boolean;
+}
+
+export interface IdleRequestOptions {
+	timeout: number;
+}
diff --git a/types/requestidlecallback/tsconfig.json b/types/requestidlecallback/tsconfig.json
new file mode 100644
index 0000000000..1b1f8d763d
--- /dev/null
+++ b/types/requestidlecallback/tsconfig.json
@@ -0,0 +1,22 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": [
+			"es6"
+		],
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"strictFunctionTypes": true,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts"
+	]
+}
diff --git a/types/requestidlecallback/tslint.json b/types/requestidlecallback/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/requestidlecallback/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/restify/index.d.ts b/types/restify/index.d.ts
index 42b0a1573b..5d4b19285b 100644
--- a/types/restify/index.d.ts
+++ b/types/restify/index.d.ts
@@ -8,16 +8,13 @@
 // TypeScript Version: 2.2
 
 /// <reference types="node" />
-
 import http = require('http');
 import https = require('https');
-import http2 = require('http2');
 import Logger = require('bunyan');
 import url = require('url');
 import spdy = require('spdy');
 import stream = require('stream');
-import { Certificate } from 'crypto';
-import { ZlibOptions } from 'zlib';
+import zlib = require('zlib');
 
 export interface ServerOptions {
     ca?: string | Buffer | ReadonlyArray<string | Buffer>;
@@ -62,7 +59,7 @@ export interface ServerOptions {
 
     secureOptions?: number;
 
-    http2?: http2.SecureServerOptions;
+    http2?: any;
 
     dtrace?: boolean;
 
@@ -247,7 +244,7 @@ export interface Server extends http.Server {
     url: string;
 
     /** Node server instance */
-    server: http.Server | https.Server | spdy.Server | http2.Http2SecureServer;
+    server: http.Server | https.Server | spdy.Server;
 
     /** Router instance */
     router: Router;
@@ -854,7 +851,7 @@ export interface RedirectOptions {
     /**
      * redirect location's query string parameters
      */
-    query?: string;
+    query?: string|object;
 
     /**
      * if true, `options.query`
@@ -1233,6 +1230,8 @@ export namespace plugins {
         reviver?: any;
 
         maxFieldsSize?: number;
+
+        maxFileSize: number;
     }
 
     /**
@@ -1287,6 +1286,7 @@ export namespace plugins {
         multipartHandler?: any;
         mapParams?: boolean;
         mapFiles?: boolean;
+        maxFileSize?: number;
     }
 
     /**
@@ -1373,7 +1373,7 @@ export namespace plugins {
      * gzips the response if client send `accept-encoding: gzip`
      * @param options options to pass to gzlib
      */
-    function gzipResponse(options?: ZlibOptions): RequestHandler;
+    function gzipResponse(options?: zlib.ZlibOptions): RequestHandler;
 
     interface InflightRequestThrottleOptions {
         limit: number;
diff --git a/types/restify/tslint.json b/types/restify/tslint.json
index f0f7a6f17a..f93cf8562a 100644
--- a/types/restify/tslint.json
+++ b/types/restify/tslint.json
@@ -1,7 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODO
-        "no-unnecessary-class": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/restling/index.d.ts b/types/restling/index.d.ts
index 79bc2d8c2c..b4f03a6633 100644
--- a/types/restling/index.d.ts
+++ b/types/restling/index.d.ts
@@ -2,7 +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
+// TypeScript Version: 2.8
 
 import * as Promise from "bluebird";
 import * as Restler from "restler";
diff --git a/types/rethinkdb/index.d.ts b/types/rethinkdb/index.d.ts
index acaf7c6994..87293230a9 100644
--- a/types/rethinkdb/index.d.ts
+++ b/types/rethinkdb/index.d.ts
@@ -172,7 +172,7 @@ declare module "rethinkdb" {
         tableDrop(name: string): Operation<DropResult>;
         tableList(): Operation<string[]>;
         table(name: string, options?: GetTableOptions): Table;
-        wait(waitOptions?: WaitOptions): WaitResult;
+        wait(waitOptions?: WaitOptions): Operation<WaitResult>;
     }
 
     interface TableOptions {
@@ -268,15 +268,124 @@ declare module "rethinkdb" {
         insert(obj: any, options?: InsertOptions): Operation<WriteResult>;
 
         get<TObjectType extends object>(key: string): Operation<TObjectType | null> & Writeable;
-        getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
+
+        /**
+         * Get all documents matching one or more keys on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/)
+         */
         getAll(...keys: string[]): Sequence;
+        /**
+         * Get all documents matching a key on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/)
+         */
+        getAll(key: string, index?: Index): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more keys on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/)
+         */
+        getAll(key: string, key2: string, index?: Index): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more keys on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/)
+         */
+        getAll(key: string, key2: string, key3: string, index?: Index): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more keys on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/)
+         */
+        getAll(key: string, key2: string, key3: string, key4: string, index?: Index): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more keys on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/)
+         */
+        getAll(
+            key: string,
+            key2: string,
+            key3: string,
+            key4: string,
+            key5: string,
+            index?: Index
+        ): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching a compound index key.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(compoundKey: string[], index: Index): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more compound index keys.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(compoundKey: string[], compoundKey2: string[], index: Index): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more compound index keys.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(
+            compoundKey: string[],
+            compoundKey2: string[],
+            compoundKey3: string[],
+            index: Index
+        ): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more compound index keys.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(
+            compoundKey: string[],
+            compoundKey2: string[],
+            compoundKey3: string[],
+            compoundKey4: string[],
+            index: Index
+        ): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching 2 or more compound index keys.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(
+            compoundKey: string[],
+            compoundKey2: string[],
+            compoundKey3: string[],
+            compoundKey4: string[],
+            compoundKey5: string[],
+            index: Index
+        ): Sequence; // without index defaults to primary key
+        /**
+         * Get all documents matching a key on a simple index; defaults to primary key if no index provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(key: Expression<any>, index?: Index): Sequence;
+        /**
+         * Get all documents matching a key on a compound index; index must be provided.
+         * See [getAll](https://www.rethinkdb.com/api/javascript/get_all/) and
+         * [compound indexes](https://www.rethinkdb.com/docs/secondary-indexes/javascript/#compound-indexes)
+         */
+        getAll(keys: Expression<any[]>, index: Index): Sequence;
+
+
         getIntersecting(geometry: Geometry, index: Index): Sequence;
-        wait(WaitOptions?: WaitOptions): WaitResult;
+        wait(WaitOptions?: WaitOptions): Operation<WaitResult>;
     }
 
     interface Sequence extends Operation<Cursor>, Writeable {
         between(lower: any, upper: any, index?: Index): Sequence;
 
+        /**
+         * Turn a sequence into an array or object, necessary when merging a sequence.
+         * 
+         * See: https://www.rethinkdb.com/api/javascript/coerce_to/
+         */
+        coerceTo(key: 'array'): Expression<any[]>;
+        coerceTo(key: 'object'): Expression<Object>;
+
+        merge(object: Object): Sequence;
+        merge(cb: ExpressionFunction<Expression<any>>): Sequence;
+
         filter(rql: ExpressionFunction<boolean>): Sequence;
         filter(rql: Expression<boolean>): Sequence;
         filter(obj: { [key: string]: any }): Sequence;
diff --git a/types/rethinkdb/rethinkdb-tests.ts b/types/rethinkdb/rethinkdb-tests.ts
index fb129b94a5..b70de79297 100644
--- a/types/rethinkdb/rethinkdb-tests.ts
+++ b/types/rethinkdb/rethinkdb-tests.ts
@@ -22,6 +22,13 @@ r.connect({ host: "localhost", port: 28015 }, function(err: Error, conn: r.Conne
     )
     .run(conn, errorAndCursorCallback);
 
+    r.table("players").merge((player: r.Expression<Object>) => {
+      return {
+        teams: r.table("games").getAll(player('teamIds')).coerceTo('array'),
+      }
+    })
+    .run(conn, errorAndCursorCallback);
+  
     const center = r.point(123, 456);
     r.table("geo")
       .getIntersecting(r.circle(center, 1000, { unit: "m" }), { index: "location" })
diff --git a/types/retry-as-promised/index.d.ts b/types/retry-as-promised/index.d.ts
index 429e0bb6d1..6287827def 100644
--- a/types/retry-as-promised/index.d.ts
+++ b/types/retry-as-promised/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/mickhansen/retry-as-promised
 // Definitions by: Florian Oellerich <https://github.com/Raigen>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import Promise = require('bluebird');
 
diff --git a/types/rheostat/index.d.ts b/types/rheostat/index.d.ts
index be173bf31a..9e62865ce9 100644
--- a/types/rheostat/index.d.ts
+++ b/types/rheostat/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/airbnb/rheostat
 // Definitions by: Sasha Bayan <https://github.com/SashaBayan>, Wil Lee <https://github.com/kourge>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/rollup-plugin-json/index.d.ts b/types/rollup-plugin-json/index.d.ts
index 150da4f1d3..795f24a005 100644
--- a/types/rollup-plugin-json/index.d.ts
+++ b/types/rollup-plugin-json/index.d.ts
@@ -1,14 +1,27 @@
-// Type definitions for rollup-plugin-json 2.3
+// Type definitions for rollup-plugin-json 3.0
 // Project: https://github.com/rollup/rollup-plugin-json#readme
 // Definitions by: Andy Mockler <https://github.com/asmockler>
+//                 Martin Hochel <https://github.com/hotell>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
 
 import { Plugin } from 'rollup';
 
 export interface Options {
+    /**
+     *  All JSON files will be parsed by default, but you can also specifically include/exclude files
+     */
     include?: string | string[];
     exclude?: string | string[];
+    /**
+     *  for tree-shaking, properties will be declared as variables, using either `var` or `const`
+     *  @default false
+     */
     preferConst?: boolean;
+    /**
+     * specify indentation for the generated default export — defaults to '\t'
+     * @default '\t'
+     */
     indent?: string;
 }
 
diff --git a/types/rollup-plugin-json/package.json b/types/rollup-plugin-json/package.json
index 60161a270c..ee69ca3cd2 100644
--- a/types/rollup-plugin-json/package.json
+++ b/types/rollup-plugin-json/package.json
@@ -1,6 +1,6 @@
 {
     "private": true,
     "dependencies": {
-        "rollup": "^0.54.0"
+        "rollup": "^0.63.4"
     }
 }
diff --git a/types/rollup-plugin-json/rollup-plugin-json-tests.ts b/types/rollup-plugin-json/rollup-plugin-json-tests.ts
index 50baf7f03f..32e7b26b7a 100644
--- a/types/rollup-plugin-json/rollup-plugin-json-tests.ts
+++ b/types/rollup-plugin-json/rollup-plugin-json-tests.ts
@@ -1,3 +1,5 @@
 import json from 'rollup-plugin-json';
 
 json(); // $ExpectType Plugin
+
+json({preferConst: true, indent: '  '}); // $ExpectType Plugin
diff --git a/types/round-to/index.d.ts b/types/round-to/index.d.ts
new file mode 100644
index 0000000000..73622c5012
--- /dev/null
+++ b/types/round-to/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for round-to 3.0
+// Project: https://github.com/sindresorhus/round-to#readme
+// Definitions by: Sean Marvi Oliver Genabe <https://github.com/seangenabe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare namespace roundTo {
+    /**
+     * Round the decimals with `Math.ceil`.
+     * @param input Number to adjust.
+     * @param precision (Integer) number of decimal places.
+     */
+    function up(input: number, precision: number): number;
+    /**
+     * Round the decimals with `Math.floor`.
+     * @param input Number to adjust.
+     * @param precision (Integer) number of decimal places.
+     */
+    function down(input: number, precision: number): number;
+}
+
+/**
+ * Round the decimals with `Math.round`.
+ * @param input Number to adjust.
+ * @param precision (integer) Number of decimal places.
+ */
+declare function roundTo(input: number, precision: number): number;
+
+export = roundTo;
diff --git a/types/round-to/round-to-tests.ts b/types/round-to/round-to-tests.ts
new file mode 100644
index 0000000000..60d4c21538
--- /dev/null
+++ b/types/round-to/round-to-tests.ts
@@ -0,0 +1,10 @@
+import roundTo = require('round-to');
+
+// $ExpectType number
+roundTo(1.234, 2);
+
+// $ExpectType number
+roundTo.up(1.234, 2);
+
+// $ExpectType number
+roundTo.down(1.234, 2);
diff --git a/types/round-to/tsconfig.json b/types/round-to/tsconfig.json
new file mode 100644
index 0000000000..633ed48869
--- /dev/null
+++ b/types/round-to/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",
+        "round-to-tests.ts"
+    ]
+}
diff --git a/types/round-to/tslint.json b/types/round-to/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/round-to/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/rsvp/index.d.ts b/types/rsvp/index.d.ts
index e32ad96363..59d3d58adb 100755
--- a/types/rsvp/index.d.ts
+++ b/types/rsvp/index.d.ts
@@ -99,7 +99,8 @@ declare module 'rsvp' {
                 executor: (
                     resolve: (value?: RSVP.Arg<T>) => void,
                     reject: (reason?: any) => void
-                ) => void
+                ) => void,
+                label?: string
             );
 
             new<T>(
diff --git a/types/rsvp/rsvp-tests.ts b/types/rsvp/rsvp-tests.ts
index 1f14a3318b..b7f71b5afb 100755
--- a/types/rsvp/rsvp-tests.ts
+++ b/types/rsvp/rsvp-tests.ts
@@ -55,6 +55,10 @@ function testPromise() {
     assertType<RSVP.Promise<number>>(promiseOfString.then((s: string) => s.length));
 }
 
+function testPromiseWithLabel() {
+    new RSVP.Promise((resolve: any, reject: any) => resolve('foo'), 'my promise');
+}
+
 function testAll() {
     const imported = all([]);
     const empty = RSVP.Promise.all([]);
diff --git a/types/runes/index.d.ts b/types/runes/index.d.ts
new file mode 100644
index 0000000000..09e1330c35
--- /dev/null
+++ b/types/runes/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for runes 0.4
+// Project: https://github.com/dotcypress/runes
+// Definitions by: Jamie Davies <https://github.com/viralpickaxe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function runes(text: string): string[];
+declare namespace runes {
+    function substr(text: string, index: number): string;
+}
+
+export = runes;
diff --git a/types/runes/runes-tests.ts b/types/runes/runes-tests.ts
new file mode 100644
index 0000000000..767be2dccb
--- /dev/null
+++ b/types/runes/runes-tests.ts
@@ -0,0 +1,4 @@
+import runes = require('runes');
+
+runes('hello world 😁');
+runes.substr('hello world 😁', 1);
diff --git a/types/runes/tsconfig.json b/types/runes/tsconfig.json
new file mode 100644
index 0000000000..87ca6191c5
--- /dev/null
+++ b/types/runes/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",
+        "runes-tests.ts"
+    ]
+}
diff --git a/types/runes/tslint.json b/types/runes/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/runes/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sane-email-validation/index.d.ts b/types/sane-email-validation/index.d.ts
new file mode 100644
index 0000000000..92e285c1ca
--- /dev/null
+++ b/types/sane-email-validation/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for sane-email-validation 1.1
+// Project: https://github.com/scottgonzalez/sane-email-validation
+// Definitions by: Forbes Lindesay <https://github.com/ForbesLindesay>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function isEmail(email: string): boolean;
+
+declare namespace isEmail {
+    function isNotEmail(email: string): boolean;
+}
+
+export = isEmail;
diff --git a/types/sane-email-validation/sane-email-validation-tests.ts b/types/sane-email-validation/sane-email-validation-tests.ts
new file mode 100644
index 0000000000..7b8ad88603
--- /dev/null
+++ b/types/sane-email-validation/sane-email-validation-tests.ts
@@ -0,0 +1,9 @@
+import isEmail = require('sane-email-validation');
+
+const is: boolean = isEmail('foo@bar.com');
+const isNot: boolean = isEmail.isNotEmail('foo@bar.com');
+
+// $ExpectError
+isEmail(10);
+// $ExpectError
+isEmail.isNotEmail(10);
diff --git a/types/sane-email-validation/tsconfig.json b/types/sane-email-validation/tsconfig.json
new file mode 100644
index 0000000000..3b9b568d67
--- /dev/null
+++ b/types/sane-email-validation/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",
+        "sane-email-validation-tests.ts"
+    ]
+}
diff --git a/types/sane-email-validation/tslint.json b/types/sane-email-validation/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sane-email-validation/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sanitize-html/index.d.ts b/types/sanitize-html/index.d.ts
index bdd70f956a..2e7527e3fc 100644
--- a/types/sanitize-html/index.d.ts
+++ b/types/sanitize-html/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for sanitize-html 1.14.1
+// Type definitions for sanitize-html 1.18.2
 // Project: https://github.com/punkave/sanitize-html
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
 //                 Afshin Darian <https://github.com/afshin>
 //                 BehindTheMath <https://github.com/BehindTheMath>
+//                 Rinze de Laat <https://github.com/biermeester>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export = sanitize;
@@ -38,9 +39,12 @@ declare namespace sanitize {
 
   interface IOptions {
     allowedAttributes?: { [index: string]: string[] } | boolean;
+    allowedStyles?:  { [index: string]: { [index: string]: RegExp[] } };
     allowedClasses?: { [index: string]: string[] } | boolean;
+    allowedIframeHostnames?: string[];
     allowedSchemes?: string[] | boolean;
     allowedSchemesByTag?: { [index: string]: string[] } | boolean;
+    allowedSchemesAppliedToAttributes?: string[];
     allowProtocolRelative?: boolean;
     allowedTags?: string[] | boolean;
     exclusiveFilter?: (frame: IFrame) => boolean;
diff --git a/types/sanitize-html/sanitize-html-tests.ts b/types/sanitize-html/sanitize-html-tests.ts
index cc43d64fcb..b02a5a6653 100644
--- a/types/sanitize-html/sanitize-html-tests.ts
+++ b/types/sanitize-html/sanitize-html-tests.ts
@@ -4,8 +4,17 @@ let options: sanitize.IOptions = {
   allowedTags: sanitize.defaults.allowedTags.concat('h1', 'h2', 'img'),
   allowedAttributes: {
     'a': sanitize.defaults.allowedAttributes['a'].concat('rel'),
-    'img': ['src', 'height', 'width', 'alt']
+    'img': ['src', 'height', 'width', 'alt', 'style']
   },
+  allowedStyles: {
+    '*': {
+        color: [/^red$/],
+        background: [/^green$/],
+        'background-color': [/^#0000FF$/]
+      }
+  },
+  allowedIframeHostnames: ['www.youtube.com'],
+  allowedSchemesAppliedToAttributes: [ 'href', 'src', 'cite' ],
 	transformTags: {
     'a': sanitize.simpleTransform('a', { 'rel': 'nofollow' }),
     'img': (tagName: string, attribs: sanitize.Attributes) => {
diff --git a/types/sat/index.d.ts b/types/sat/index.d.ts
index 538228049c..901c0814f2 100644
--- a/types/sat/index.d.ts
+++ b/types/sat/index.d.ts
@@ -59,10 +59,10 @@ declare namespace SAT {
 		setPoints(points: Vector[]): Polygon;
 		setAngle(angle: number): Polygon;
 		setOffset(offset: Vector): Polygon;
-		recalc(): Polygon;
 		rotate(angle: number): Polygon;
 		translate(x: number, y: number): Polygon;
 		getAABB(): Polygon;
+        getCentroid(): Vector;
 
 	}
 	export class Box {
diff --git a/types/sax/index.d.ts b/types/sax/index.d.ts
index 4c556d8aab..40d17caa4d 100644
--- a/types/sax/index.d.ts
+++ b/types/sax/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for sax-js 1.x
 // Project: https://github.com/isaacs/sax-js
 // Definitions by: Asana <https://asana.com>
+//                 Evert Pot <https://evertpot.com/>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 /// <reference types="node" />
 
@@ -44,7 +45,7 @@ export interface Tag extends BaseTag {
 
 export declare function parser(strict: boolean, opt: SAXOptions): SAXParser;
 export declare class SAXParser {
-    constructor(strict: boolean, opt: SAXOptions);
+    constructor(strict: boolean, opt?: SAXOptions);
 
     // Methods
     end(): void;
diff --git a/types/schwifty/index.d.ts b/types/schwifty/index.d.ts
index e95de1af55..9ac2556c2b 100644
--- a/types/schwifty/index.d.ts
+++ b/types/schwifty/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/hapipal/schwifty
 // Definitions by: ozum <https://github.com/ozum>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.4
+// TypeScript Version: 2.8
 
 // HELP NEEDED: If possible, find a better way to define Server.models, Request.models and ResponseToolkit.models
 // They are dynamic types extended from SchwiftyModel.
diff --git a/types/screeps/index.d.ts b/types/screeps/index.d.ts
index d6153f8d64..341aca8363 100644
--- a/types/screeps/index.d.ts
+++ b/types/screeps/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Screeps 2.3
+// Type definitions for Screeps 2.4
 // Project: https://github.com/screeps/screeps
 // Definitions by: Marko Sulamägi <https://github.com/MarkoSulamagi>
 //                 Nhan Ho <https://github.com/NhanHo>
@@ -78,7 +78,7 @@ 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_CLAIM_LIFE_TIME: 600;
 declare const CREEP_CORPSE_RATE: 0.2;
 
 declare const OBSTACLE_OBJECT_TYPES: [
@@ -252,7 +252,7 @@ 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 SUBSCRIPTION_TOKEN: "token";
 
 declare const CONTROLLER_LEVELS: {[level: number]: number};
 declare const CONTROLLER_STRUCTURES: Record<BuildableStructureConstant, {[level: number]: number}>;
@@ -634,6 +634,8 @@ declare const LOOK_TOMBSTONES: 'tombstone';
 declare const ORDER_SELL: "sell";
 declare const ORDER_BUY: "buy";
 
+declare const INVADERS_ENERGY_GOAL: number;
+
 declare const SYSTEM_USERNAME: string;
 
 declare const TOMBSTONE_DECAY_PER_PART: 5;
@@ -795,7 +797,7 @@ interface Creep extends RoomObject {
      * @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;
+    claimController(target: StructureController): CreepActionReturnCode | ERR_FULL | ERR_GCL_NOT_ENOUGH;
     /**
      * Dismantles any (even hostile) structure returning 50% of the energy spent on its repair.
      *
@@ -1268,6 +1270,8 @@ type StoreDefinition = Partial<Record<_ResourceConstantSansEnergy, number>> & {
 //   energy: number;
 // }
 
+type ExitsInformation = Partial<Record<ExitKey, string>>;
+
 interface AllLookAtTypes {
     constructionSite: ConstructionSite;
     creep: Creep;
@@ -1288,22 +1292,24 @@ type LookAtTypes = Partial<AllLookAtTypes>;
 type LookAtResult<K extends LookConstant = LookConstant> = Pick<LookAtTypes, K> & { type: K };
 
 type LookAtResultWithPos<K extends LookConstant = LookConstant> = LookAtResult<K> & {
-  x: number,
-  y: number,
+    x: number,
+    y: number,
 };
 
 interface LookAtResultMatrix<K extends LookConstant = LookConstant> {
-    [coord: number]: LookAtResultMatrix<K> | Array<LookAtResult<K>>;
+    [y: number]: {
+        [x: number]: Array<LookAtResult<K>>;
+    };
 }
 
 interface LookForAtAreaResultMatrix<T, K extends keyof LookAtTypes = keyof LookAtTypes> {
-  [x: number]: {
-    [y: number]: Array<LookForAtAreaResult<T, K>>;
-  };
+    [y: number]: {
+        [x: number]: Array<LookForAtAreaResult<T, K>>;
+    };
 }
 
 type LookForAtAreaResult<T, K extends keyof LookAtTypes = keyof LookAtTypes> = {type: K} & {
-  [P in K]: T;
+    [P in K]: T;
 };
 
 type LookForAtAreaResultWithPos<T, K extends keyof LookAtTypes = keyof LookAtTypes> = LookForAtAreaResult<T, K> & {x: number, y: number};
@@ -1478,6 +1484,8 @@ interface _ConstructorById<T> extends _Constructor<T> {
 
 type Terrain = "plain" | "swamp" | "wall";
 
+type ExitKey = "1" | "3" | "5" | "7";
+
 // Return Codes
 
 type ScreepsReturnCode =
@@ -1836,6 +1844,10 @@ type MineralConstant =
   RESOURCE_HYDROGEN |
   RESOURCE_CATALYST;
 
+type MarketResourceConstant =
+  ResourceConstant |
+  SUBSCRIPTION_TOKEN;
+
 type RESOURCE_ENERGY = "energy";
 type RESOURCE_POWER = "power";
 
@@ -1884,6 +1896,8 @@ type RESOURCE_CATALYZED_ZYNTHIUM_ALKALIDE = "XZHO2";
 type RESOURCE_CATALYZED_GHODIUM_ACID = "XGH2O";
 type RESOURCE_CATALYZED_GHODIUM_ALKALIDE = "XGHO2";
 
+type SUBSCRIPTION_TOKEN = "token";
+
 type TOMBSTONE_DECAY_PER_PART = 5;
 /**
  * The options that can be accepted by `findRoute()` and friends.
@@ -1901,7 +1915,7 @@ interface GameMap {
      * @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};
+    describeExits(roomName: string): ExitsInformation;
     /**
      * Find the exit direction from the given room en route to another room.
      * @param fromRoom Start room name or room object.
@@ -1912,7 +1926,7 @@ interface GameMap {
      * Or one of the following Result codes:
      * ERR_NO_PATH, ERR_INVALID_ARGS
      */
-    findExit(fromRoom: string|Room, toRoom: string|Room, opts?: RouteOptions): ScreepsReturnCode;
+    findExit(fromRoom: string|Room, toRoom: string|Room, opts?: RouteOptions): ExitConstant | ERR_NO_PATH | ERR_INVALID_ARGS;
     /**
      * Find route from the given room to another room.
      * @param fromRoom Start room name or room object.
@@ -2013,7 +2027,7 @@ interface Market {
      * 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;
+    createOrder(type: string, resourceType: MarketResourceConstant, 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.
      *
@@ -2051,7 +2065,7 @@ interface Transaction {
     time: number;
     sender?: { username: string };
     recipient?: { username: string };
-    resourceType: ResourceConstant;
+    resourceType: MarketResourceConstant;
     amount: number;
     from: string;
     to: string;
@@ -2064,7 +2078,7 @@ interface Order {
     created: number;
     active?: boolean;
     type: string;
-    resourceType: ResourceConstant;
+    resourceType: MarketResourceConstant;
     roomName?: string;
     amount: number;
     remainingAmount: number;
@@ -2082,7 +2096,7 @@ interface OrderFilter {
     id?: string;
     created?: number;
     type?: string;
-    resourceType?: ResourceConstant;
+    resourceType?: MarketResourceConstant;
     roomName?: string;
     amount?: number;
     remainingAmount?: number;
@@ -2157,7 +2171,7 @@ interface Nuke extends RoomObject {
     timeToLand: number;
 }
 
-interface NukeConstructor {
+interface NukeConstructor extends _Constructor<Nuke>, _ConstructorById<Nuke> {
     new (id: string): Nuke;
 }
 
@@ -2400,7 +2414,7 @@ interface Resource<T extends ResourceConstant = ResourceConstant> extends RoomOb
     resourceType: T;
 }
 
-interface ResourceConstructor {
+interface ResourceConstructor extends _Constructor<Resource>, _ConstructorById<Resource> {
     new (id: string): Resource;
 }
 
@@ -2463,6 +2477,18 @@ interface RoomPosition {
      *  * STRUCTURE_LINK
      */
     createConstructionSite(structureType: BuildableStructureConstant): ScreepsReturnCode;
+    /**
+     * 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
+     * @param name The name of the structure, for structures that support it (currently only spawns).
+     */
+    createConstructionSite(structureType: STRUCTURE_SPAWN, name?: string): ScreepsReturnCode;
     /**
      * Create new Flag at the specified location.
      * @param name The name of a new flag.
@@ -2478,31 +2504,31 @@ interface RoomPosition {
      * @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<K extends FindConstant>(type: K, opts?: FindPathOpts & { filter?: FilterFunction<K>, algorithm?: string }): FindTypes[K] | null;
     findClosestByPath<T extends Structure>(
         type: FIND_STRUCTURES | FIND_MY_STRUCTURES | FIND_HOSTILE_STRUCTURES,
         opts?: FindPathOpts & { filter?: FilterFunction<FIND_STRUCTURES>, algorithm?: string}
-    ): T;
+    ): T | null;
     /**
      * 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;
+    findClosestByPath<T extends _HasRoomPosition | RoomPosition>(objects: T[], opts?: FindPathOpts & {filter?: any | string, algorithm?: string}): T | null;
     /**
      * 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;
+    findClosestByRange<K extends FindConstant>(type: K, opts?: {filter: FilterFunction<K>}): FindTypes[K] | null;
+    findClosestByRange<T extends Structure>(type: FIND_STRUCTURES | FIND_MY_STRUCTURES | FIND_HOSTILE_STRUCTURES, opts?: {filter: FilterFunction<FIND_STRUCTURES>}): T | null;
     /**
      * 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;
+    findClosestByRange<T extends _HasRoomPosition | RoomPosition>(objects: T[], opts?: {filter: any | string}): T | null;
     /**
      * Find all objects in the specified linear range.
      * @param type Any of the FIND_* constants.
@@ -2741,7 +2767,7 @@ interface LineStyle {
     /**
      * Either undefined (solid line), dashed, or dotted.Default is undefined.
      */
-    lineStyle?: "dashed" | "dotted";
+    lineStyle?: "dashed" | "dotted" | "solid";
 }
 
 interface PolyStyle {
@@ -2764,7 +2790,7 @@ interface PolyStyle {
     /**
      * Either undefined (solid line), dashed, or dotted.Default is undefined.
      */
-    lineStyle?: "dashed" | "dotted";
+    lineStyle?: "dashed" | "dotted" | "solid";
 }
 
 interface CircleStyle extends PolyStyle {
@@ -2871,6 +2897,23 @@ interface Room {
      * @returns Result Code: OK, ERR_INVALID_TARGET, ERR_INVALID_ARGS, ERR_RCL_NOT_ENOUGH
      */
     createConstructionSite(pos: RoomPosition | _HasRoomPosition, structureType: StructureConstant): ScreepsReturnCode;
+    /**
+     * 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
+     * @param name The name of the structure, for structures that support it (currently only spawns).
+     * @returns Result Code: OK, ERR_INVALID_TARGET, ERR_INVALID_ARGS, ERR_RCL_NOT_ENOUGH
+     */
+    createConstructionSite(x: number, y: number, structureType: STRUCTURE_SPAWN, name?: string): 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
+     * @param name The name of the structure, for structures that support it (currently only spawns).
+     * @returns Result Code: OK, ERR_INVALID_TARGET, ERR_INVALID_ARGS, ERR_RCL_NOT_ENOUGH
+     */
+    createConstructionSite(pos: RoomPosition | _HasRoomPosition, structureType: STRUCTURE_SPAWN, name?: string): ScreepsReturnCode;
     /**
      * Create new Flag at the specified location.
      * @param x The X position.
@@ -2880,10 +2923,13 @@ interface Room {
      * 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.
+     *
+     * The maximum length is 60 characters.
      * @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.
+     * @returns The name of a new flag, or one of the following error codes: ERR_NAME_EXISTS, ERR_INVALID_ARGS
      */
-    createFlag(x: number, y: number, name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ScreepsReturnCode;
+    createFlag(x: number, y: number, name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ERR_NAME_EXISTS | ERR_INVALID_ARGS | string;
     /**
      * Create new Flag at the specified location.
      * @param pos Can be a RoomPosition object or any object containing RoomPosition.
@@ -2892,10 +2938,13 @@ interface Room {
      * 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.
+     *
+     * The maximum length is 60 characters.
      * @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.
+     * @returns The name of a new flag, or one of the following error codes: ERR_NAME_EXISTS, ERR_INVALID_ARGS
      */
-    createFlag(pos: RoomPosition | { pos: RoomPosition }, name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ScreepsReturnCode;
+    createFlag(pos: RoomPosition | { pos: RoomPosition }, name?: string, color?: ColorConstant, secondaryColor?: ColorConstant): ERR_NAME_EXISTS | ERR_INVALID_ARGS | string;
     /**
      * Find all objects of the specified type in the room.
      * @param type One of the following constants:
@@ -2929,7 +2978,7 @@ interface Room {
      * @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;
+    findExitTo(room: string | Room): ExitConstant | ERR_NO_PATH | ERR_INVALID_ARGS;
     /**
      * Find an optimal path inside the room between fromPos and toPos using A* search algorithm.
      * @param fromPos The start position.
@@ -2967,7 +3016,17 @@ interface Room {
      * @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[];
+    lookAtArea(top: number, left: number, bottom: number, right: number, asArray?: false): LookAtResultMatrix;
+    /**
+     * 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: true): LookAtResultWithPos[];
     /**
      * Get the objects at the given position.
      * @param type One of the LOOK_* constants.
@@ -3033,7 +3092,7 @@ interface Room {
      */
 }
 
-interface RoomConstructor {
+interface RoomConstructor extends _Constructor<Room> {
     new (id: string): Room;
     /**
      * Serialize a path array into a short string representation, which is suitable to store in memory.
@@ -3167,7 +3226,7 @@ interface StructureSpawn extends OwnedStructure<STRUCTURE_SPAWN> {
      *  * 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.
+     * @param {SpawnOptions} 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.
@@ -3179,7 +3238,7 @@ interface StructureSpawn extends OwnedStructure<STRUCTURE_SPAWN> {
      * 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;
+    spawnCreep(body: BodyPartConstant[], name: string, opts?: SpawnOptions): ScreepsReturnCode;
 
     /**
      * Destroy this spawn immediately.
@@ -3263,6 +3322,30 @@ interface Spawning {
     setDirections(directions: DirectionConstant[]): ScreepsReturnCode & (OK | ERR_NOT_OWNER | ERR_INVALID_ARGS);
 }
 
+/**
+ * An object with additional options for the spawning process.
+ */
+interface SpawnOptions {
+    /**
+     * Memory of the new creep. If provided, it will be immediately stored into Memory.creeps[name].
+     */
+    memory?: CreepMemory;
+    /**
+     * Array of spawns/extensions from which to draw energy for the spawning process.
+     * Structures will be used according to the array order.
+     */
+    energyStructures?: Array<StructureSpawn | StructureExtension>;
+    /**
+     * If dryRun is <code>true</code>, the operation will only check if it is possible to create a creep.
+     */
+    dryRun?: boolean;
+    /**
+     * Set desired directions where the creep should move when spawned.
+     * An array with the direction constants.
+     */
+    directions?: DirectionConstant[];
+}
+
 interface SpawningConstructor extends _Constructor<Spawning>, _ConstructorById<Spawning> {
 }
 /**
@@ -3721,8 +3804,9 @@ interface StructureLab extends OwnedStructure<STRUCTURE_LAB> {
     mineralAmount: number;
     /**
      * The type of minerals containing in the lab. Labs can contain only one mineral type at the same time.
+     * Null in case there is no mineral resource in the lab.
      */
-    mineralType: _ResourceConstantSansEnergy | undefined;
+    mineralType: _ResourceConstantSansEnergy | null;
     /**
      * The total amount of minerals the lab can contain.
      */
@@ -3856,13 +3940,15 @@ declare const StructureNuker: StructureNukerConstructor;
 interface StructurePortal extends Structure<STRUCTURE_PORTAL> {
     readonly prototype: StructurePortal;
     /**
-     * The position object in the destination room.
+     * If this is an inter-room portal, then this property contains a RoomPosition object leading to the point in the destination room.
+     * If this is an inter-shard portal, then this property contains an object with shard and room string properties.
+     * Exact coordinates are undetermined, the creep will appear at any free spot in the destination room.
      */
-    destination: RoomPosition;
+    destination: RoomPosition | { shard: string, room: string };
     /**
      * The amount of game ticks when the portal disappears, or undefined when the portal is stable.
      */
-    ticksToDecay: number;
+    ticksToDecay: number | undefined;
 }
 
 interface StructurePortalConstructor extends _Constructor<StructurePortal>, _ConstructorById<StructurePortal> {
@@ -3899,15 +3985,37 @@ type AnyStructure =
     StructurePortal |
     StructureRoad |
     StructureWall;
+/**
+ * A remnant of dead creeps. This is a walkable structure.
+ * <ul>
+ *     <li>Decay: 5 ticks per body part of the deceased creep</li>
+ * </ul>
+ */
 interface Tombstone extends RoomObject {
-    /** The tombstones game objects id. */
+    /**
+     * A unique object identificator.
+     * You can use {@link Game.getObjectById} method to retrieve an object instance by its id.
+     */
     id: string;
-    /** The tick that the creep died. */
+    /**
+     * Time of death.
+     */
     deathTime: number;
+    /**
+     * An object with the tombstone contents.
+     * Each object key is one of the RESOURCE_* constants, values are resources amounts.
+     * RESOURCE_ENERGY is always defined and equals to 0 when empty,
+     * other resources are undefined when empty.
+     * You can use lodash.sum to get the total amount of contents.
+     */
     store: StoreDefinition;
-    /** How many ticks until this tombstone decays */
+    /**
+     * The amount of game ticks before this tombstone decays.
+     */
     ticksToDecay: number;
-    /** The creep that died to create this tombstone */
+    /**
+     * An object containing the deceased creep.
+     */
     creep: Creep;
 }
 
diff --git a/types/screeps/screeps-tests.ts b/types/screeps/screeps-tests.ts
index a8700a853b..d837a510e3 100644
--- a/types/screeps/screeps-tests.ts
+++ b/types/screeps/screeps-tests.ts
@@ -24,6 +24,15 @@ interface CreepMemory {
     lastHits: number;
 }
 
+// Typescript always uses 'string' as the type of a key inside 'for in' loops.
+// In case of objects with a restricted set of properties (e.g. ResourceConstant as key in StoreDefinition)
+// the type of the key should be narrowed down in order to prevent casting (key as ResourceConstant).
+// This helper function provides strongly typed keys for such objects.
+// See discussion (https://github.com/Microsoft/TypeScript/pull/12253) why Object.keys does not return typed keys.
+function keys<T>(o: T): Array<keyof T> {
+    return Object.keys(o) as Array<keyof T>;
+}
+
 // Game.creeps
 
 {
@@ -95,7 +104,7 @@ interface CreepMemory {
 // Game.getObjectById(id)
 
 {
-    creep.memory.sourceId = creep.pos.findClosestByRange(FIND_SOURCES).id;
+    creep.memory.sourceId = creep.pos.findClosestByRange(FIND_SOURCES)!.id;
     const source = Game.getObjectById<Source>(creep.memory.sourceId);
 }
 
@@ -121,6 +130,13 @@ interface CreepMemory {
 
 {
     const exits = Game.map.describeExits("W8N3");
+    keys(exits)
+        .map((exitKey) => {
+            const nextRoom = exits[exitKey];
+            const exitDir = +exitKey as ExitConstant;
+            const exitPos = creep.pos.findClosestByRange(exitDir);
+            return {nextRoom, exitPos};
+        });
 }
 
 // Game.map.findExit()
@@ -128,8 +144,12 @@ interface CreepMemory {
 {
     if (creep.room !== anotherRoomName) {
         const exitDir = Game.map.findExit(creep.room, anotherRoomName);
-        const exit = creep.pos.findClosestByRange(exitDir as FindConstant);
-        creep.moveTo(exit);
+        if (exitDir !== ERR_NO_PATH && exitDir !== ERR_INVALID_ARGS) {
+            const exit = creep.pos.findClosestByRange(exitDir);
+            if (exit !== null) {
+                creep.moveTo(exit);
+            }
+        }
     } else {
         // go to some place in another room
     }
@@ -146,7 +166,9 @@ interface CreepMemory {
 
     if (route !== ERR_NO_PATH && route.length > 0) {
         const exit = creep.pos.findClosestByRange(route[0].exit);
-        creep.moveTo(exit);
+        if (exit !== null) {
+            creep.moveTo(exit);
+        }
     }
 }
 
@@ -283,6 +305,10 @@ interface CreepMemory {
 
     // Game.market.getOrderById(id)
     const order = Game.market.getOrderById("55c34a6b5be41a0a6e80c123");
+
+    // Subscription tokens
+    Game.market.getAllOrders({ type: ORDER_SELL, resourceType: SUBSCRIPTION_TOKEN });
+    Game.market.createOrder(ORDER_BUY, SUBSCRIPTION_TOKEN, 10000000, 1);
 }
 
 // PathFinder
@@ -440,24 +466,27 @@ interface CreepMemory {
 {
     // Should have type Creep
     const hostileCreep = creep.pos.findClosestByRange(FIND_HOSTILE_CREEPS);
-
-    creep.say(hostileCreep.name);
+    if (hostileCreep !== null) {
+        creep.say(hostileCreep.name);
+    }
 
     const tower = creep.pos.findClosestByPath<StructureTower>(FIND_HOSTILE_STRUCTURES, {
         filter: (structure) => {
             return structure.structureType === STRUCTURE_TOWER;
         }
     });
-
-    tower.attack(creep);
+    if (tower !== null) {
+        tower.attack(creep);
+    }
 
     const rampart = creep.pos.findClosestByRange<StructureRampart>(FIND_HOSTILE_STRUCTURES, {
         filter: (structure) => {
             return structure.structureType === STRUCTURE_RAMPART;
         }
     });
-
-    rampart.isPublic;
+    if (rampart !== null) {
+        rampart.isPublic;
+    }
 
     // Should have type Creep[]
     const hostileCreeps = creep.pos.findInRange(FIND_HOSTILE_CREEPS, 10);
@@ -475,6 +504,18 @@ interface CreepMemory {
 // LookAt Finds
 
 {
+    const matrix = room.lookAtArea(10, 10, 20, 20, false);
+    for (const y in matrix) {
+        const row = matrix[y];
+        for (const x in row) {
+            const pos = new RoomPosition(+x, +y, room.name);
+            const objects = row[x];
+            if (objects.length > 0) {
+                objects.map((o) => o.type);
+            }
+        }
+    }
+
     const nukes = room.lookForAt(LOOK_NUKES, creep.pos);
 
     nukes[0].launchRoomName;
@@ -493,6 +534,15 @@ interface CreepMemory {
     creeps[0].creep.move(TOP);
 }
 
+// StoreDefinition
+
+{
+    for (const resourceType of keys(creep.carry)) {
+        const amount = creep.carry[resourceType];
+        creep.drop(resourceType, amount);
+    }
+}
+
 // Advanced Structure types
 {
     const owned = Game.getObjectById<AnyOwnedStructure>("blah");
@@ -554,3 +604,44 @@ interface CreepMemory {
         heap.total_heap_size;
     }
 }
+
+// StructurePortal
+
+{
+    const portals = room.find<StructurePortal>(FIND_STRUCTURES, {filter: (s) => s.structureType === STRUCTURE_PORTAL});
+    portals.forEach((p: StructurePortal) => {
+        const state = p.ticksToDecay === undefined ? 'stable' : 'unstable';
+        if (p.destination instanceof RoomPosition) {
+            Game.notify(`Found ${state} inter-room portal to ${p.destination}`);
+        } else {
+            Game.notify(`Found ${state} inter-shard portal to ${p.destination.shard} ${p.destination.room}`);
+        }
+    });
+}
+
+// ConstructionSite
+
+{
+    room.createConstructionSite(10, 10, STRUCTURE_EXTENSION);
+    room.createConstructionSite(10, 11, STRUCTURE_SPAWN, "mySpawn");
+
+    const pos = new RoomPosition(10, 10, room.name);
+    room.createConstructionSite(pos, STRUCTURE_EXTENSION);
+    room.createConstructionSite(pos, STRUCTURE_SPAWN, "mySpawn");
+    pos.createConstructionSite(STRUCTURE_EXTENSION);
+    pos.createConstructionSite(STRUCTURE_SPAWN, "mySpawn");
+}
+
+// StructureLab
+
+{
+    const lab0 = Game.getObjectById<StructureLab>("lab0");
+    const lab1 = Game.getObjectById<StructureLab>("lab1");
+    const lab2 = Game.getObjectById<StructureLab>("lab2");
+    if (lab0 !== null && lab1 !== null && lab2 !== null) {
+        if (lab1.mineralAmount >= LAB_REACTION_AMOUNT && lab2.mineralAmount >= LAB_REACTION_AMOUNT &&
+            lab0.mineralType === null) {
+            lab0.runReaction(lab1, lab2);
+        }
+    }
+}
diff --git a/types/screeps/tsconfig.json b/types/screeps/tsconfig.json
index 110537a00d..8dcc302c5c 100644
--- a/types/screeps/tsconfig.json
+++ b/types/screeps/tsconfig.json
@@ -20,4 +20,4 @@
         "index.d.ts",
         "screeps-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/scrollreveal/index.d.ts b/types/scrollreveal/index.d.ts
index 992f1c1498..2dee7833f6 100644
--- a/types/scrollreveal/index.d.ts
+++ b/types/scrollreveal/index.d.ts
@@ -5,7 +5,7 @@
 
 declare const ScrollReveal: scrollReveal.ScrollRevealObject;
 
-declare module 'ScrollReveal' {
+declare module 'scrollreveal' {
     export = ScrollReveal;
 }
 
diff --git a/types/scrypt-js/index.d.ts b/types/scrypt-js/index.d.ts
new file mode 100644
index 0000000000..fde3c0a444
--- /dev/null
+++ b/types/scrypt-js/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for scrypt-js 2.0
+// Project: https://github.com/ricmoo/scrypt-js
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types= "node" />
+
+declare function scrypt(
+    password: Buffer,
+    salt: Buffer,
+    N: number,
+    r: number,
+    p: number,
+    dklen: number,
+    callback: (
+        error: Error | undefined | null,
+        progress: number,
+        key?: ReadonlyArray<number>,
+    ) => void
+): void;
+
+export = scrypt;
diff --git a/types/scrypt-js/scrypt-js-tests.ts b/types/scrypt-js/scrypt-js-tests.ts
new file mode 100644
index 0000000000..21c77fb16c
--- /dev/null
+++ b/types/scrypt-js/scrypt-js-tests.ts
@@ -0,0 +1,7 @@
+import scrypt = require('scrypt-js');
+
+const testBuffer = Buffer.from('test');
+const testCB = (err: Error | undefined | null, progress: number) => {};
+
+// $ExpectType void
+scrypt(testBuffer, testBuffer, 1, 1, 1, 1, testCB);
diff --git a/types/scrypt-js/tsconfig.json b/types/scrypt-js/tsconfig.json
new file mode 100644
index 0000000000..8c6c60e736
--- /dev/null
+++ b/types/scrypt-js/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"scrypt-js-tests.ts"
+	]
+}
diff --git a/types/scrypt-js/tslint.json b/types/scrypt-js/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/scrypt-js/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/scrypt/index.d.ts b/types/scrypt/index.d.ts
new file mode 100644
index 0000000000..684306e033
--- /dev/null
+++ b/types/scrypt/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for scrypt 6.0
+// Project: https://github.com/barrysteyn/node-scrypt
+// Definitions by: WhiteAbeLincoln <https://github.com/WhiteAbeLincoln>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface Params {
+  N: number;
+  r: number;
+  p: number;
+}
+
+export function params(maxtime: number, maxmem?: number, maxmemfrac?: number): Promise<Params>;
+export function params(maxtime: number, cb: (err: Error | null, obj: Params) => void): void;
+export function params(maxtime: number, maxmem: number, cb: (err: Error | null, obj: Params) => void): void;
+export function params(maxtime: number, maxmem: number, maxmemfrac: number, cb: (err: Error | null, obj: Params) => void): void;
+export function paramsSync(maxtime: number, maxmem?: number, maxmemfrac?: number): Params;
+
+export function kdf(key: string | Buffer, paramsObject: Params): Promise<Buffer>;
+export function kdf(key: string | Buffer, paramsObject: Params, cb: (err: Error | null, obj: Buffer) => void): void;
+export function kdfSync(key: string | Buffer, paramsObject: Params): Buffer;
+
+export function verifyKdf(kdf: Buffer, key: string | Buffer): Promise<boolean>;
+export function verifyKdf(kdf: Buffer, key: string | Buffer, cb: (err: Error | null, obj: boolean) => void): void;
+export function verifyKdfSync(kdf: Buffer, key: string | Buffer): boolean;
+
+export function hash(key: string | Buffer, params: Params, outputLength: number, salt: string | Buffer): Promise<Buffer>;
+export function hash(key: string | Buffer, params: Params, outputLength: number, salt: string | Buffer, cb: (err: Error | null, obj: Buffer) => void): void;
+export function hashSync(key: string | Buffer, params: Params, outputLength: number, salt: string | Buffer): Buffer;
diff --git a/types/scrypt/scrypt-tests.ts b/types/scrypt/scrypt-tests.ts
new file mode 100644
index 0000000000..28f24781d5
--- /dev/null
+++ b/types/scrypt/scrypt-tests.ts
@@ -0,0 +1,104 @@
+import * as scrypt from 'scrypt';
+
+/***** params *****/
+try {
+    scrypt.paramsSync(0.1); // $ExpectType Params
+    scrypt.paramsSync(0.1, 5); // $ExpectType Params
+    scrypt.paramsSync(0.1, 5, 4); // $ExpectType Params
+} catch (err) {
+    // handle error
+}
+
+scrypt.params(0.1, (err, params) => {
+    err; // $ExpectType Error | null
+    params; // $ExpectType Params
+    console.log(params);
+});
+scrypt.params(0.1, 5, (err, params) => {
+    err; // $ExpectType Error | null
+    params; // $ExpectType Params
+    console.log(params);
+});
+scrypt.params(0.1, 5, 4, (err, params) => {
+    err; // $ExpectType Error | null
+    params; // $ExpectType Params
+    console.log(params);
+});
+
+scrypt.params(0.1); // $ExpectType Promise<Params>
+scrypt.params(0.1, 5); // $ExpectType Promise<Params>
+scrypt.params(0.1, 5, 4); // $ExpectType Promise<Params>
+
+/***** kdf *****/
+const params = scrypt.paramsSync(0.1);
+try {
+    scrypt.kdfSync('some string', params); // $ExpectType Buffer
+    scrypt.kdfSync(new Buffer('some string'), params); // $ExpectType Buffer
+} catch (err) {
+    // handle error
+}
+
+scrypt.kdf('some string', params, (err, buff) => {
+    err; // $ExpectType Error | null
+    buff; // $ExpectType Buffer
+});
+scrypt.kdf(new Buffer('some string'), params, (err, buff) => {
+    err; // $ExpectType Error | null
+    buff; // $ExpectType Buffer
+});
+
+scrypt.kdf('some string', params); // $ExpectType Promise<Buffer>
+scrypt.kdf(new Buffer('some string'), params); // $ExpectType Promise<Buffer>
+
+/***** verifyKdf *****/
+const kdf = scrypt.kdfSync('some string', params);
+try {
+    scrypt.verifyKdfSync(kdf, 'some string'); // $ExpectType boolean
+    scrypt.verifyKdfSync(kdf, new Buffer('some string')); // $ExpectType boolean
+} catch (err) {
+    // handle error
+}
+
+scrypt.verifyKdf(kdf, 'some string', (err, valid) => {
+    err; // $ExpectType Error | null
+    valid; // $ExpectType boolean
+});
+scrypt.verifyKdf(kdf, new Buffer('some string'), (err, valid) => {
+    err; // $ExpectType Error | null
+    valid; // $ExpectType boolean
+});
+
+scrypt.verifyKdf(kdf, 'some string'); // $ExpectType Promise<boolean>
+scrypt.verifyKdf(kdf, new Buffer('some string')); // $ExpectType Promise<boolean>
+
+/***** hash *****/
+try {
+    scrypt.hashSync('some string', params, 255, 'some salt'); // $ExpectType Buffer
+    scrypt.hashSync('some string', params, 255, new Buffer('some salt')); // $ExpectType Buffer
+    scrypt.hashSync(new Buffer('some string'), params, 255, 'some salt'); // $ExpectType Buffer
+    scrypt.hashSync(new Buffer('some string'), params, 255, new Buffer('some salt')); // $ExpectType Buffer
+} catch (err) {
+    // handle error
+}
+
+scrypt.hash('some string', params, 255, 'some salt', (err, buff) => {
+    err; // $ExpectType Error | null
+    buff; // $ExpectType Buffer
+});
+scrypt.hash('some string', params, 255, new Buffer('some salt'), (err, buff) => {
+    err; // $ExpectType Error | null
+    buff; // $ExpectType Buffer
+});
+scrypt.hash(new Buffer('some string'), params, 255, 'some salt', (err, buff) => {
+    err; // $ExpectType Error | null
+    buff; // $ExpectType Buffer
+});
+scrypt.hash(new Buffer('some string'), params, 255, new Buffer('some salt'), (err, buff) => {
+    err; // $ExpectType Error | null
+    buff; // $ExpectType Buffer
+});
+
+scrypt.hash('some string', params, 255, 'some salt'); // $ExpectType Promise<Buffer>
+scrypt.hash('some string', params, 255, new Buffer('some salt')); // $ExpectType Promise<Buffer>
+scrypt.hash(new Buffer('some string'), params, 255, 'some salt'); // $ExpectType Promise<Buffer>
+scrypt.hash(new Buffer('some string'), params, 255, new Buffer('some salt')); // $ExpectType Promise<Buffer>
diff --git a/types/scrypt/tsconfig.json b/types/scrypt/tsconfig.json
new file mode 100644
index 0000000000..4c35ba3d1b
--- /dev/null
+++ b/types/scrypt/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",
+        "scrypt-tests.ts"
+    ]
+}
diff --git a/types/scrypt/tslint.json b/types/scrypt/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/scrypt/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sdp-transform/index.d.ts b/types/sdp-transform/index.d.ts
new file mode 100644
index 0000000000..3219fe9957
--- /dev/null
+++ b/types/sdp-transform/index.d.ts
@@ -0,0 +1,265 @@
+// Type definitions for sdp-transform 2.4
+// Project: https://github.com/clux/sdp-transform#readme
+// Definitions by: @loc <https://github.com/loc>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+// https://tools.ietf.org/html/rfc4566
+// https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml
+
+export function write(description: SessionDescription): string;
+export function parse(description: string): SessionDescription;
+export function parsePayloads(payloads: string): number[];
+export function parseRemoteCandidates(candidates: string): Array<{
+    component: number;
+    ip: string;
+    port: number;
+}>;
+export function parseSimulcastStreamList(streams: string): Array<{
+    scid: number | string;
+    paused: boolean;
+}>;
+export interface ParamMap {
+    [paramName: string]: number | string;
+}
+export function parseParams(params: string): ParamMap;
+export function parseImageAttributes(params: string): ParamMap[];
+
+export interface MediaDescription extends SharedDescriptionFields, MediaAttributes {}
+
+/**
+ * Descriptor fields that exist only at the session level (before an m= block).
+ *
+ * See the SDP grammar for more details: https://tools.ietf.org/html/rfc4566#section-9
+ */
+export interface SessionDescription extends SharedDescriptionFields, SessionAttributes {
+    version?: number;
+    // o=
+    origin?: {
+        username: string;
+        sessionId: string | number;
+        sessionVersion: number;
+        netType: string;
+        address: string;
+    };
+    // s=
+    name?: string;
+    // u=
+    uri?: string;
+    // e=
+    email?: string;
+    // p=
+    phone?: string;
+    // t=0 0
+    timing?: {
+        start: number;
+        stop: number;
+    };
+    // z=
+    timezones?: string;
+    // r=
+    repeats?: string;
+    // m=
+    media: Array<{
+        type: string;
+        port: number;
+        protocol: string;
+        payloads?: string;
+    } & MediaDescription>;
+}
+
+/**
+ * These attributes can exist on both the session level and the media level.
+ *
+ * https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-8
+ */
+export interface SharedAttributes {
+    // a=sendrecv
+    // a=recvonly
+    // a=sendonly
+    // a=inactive
+    direction?: 'sendrecv' | 'recvonly' | 'sendonly' | 'inactive';
+    // a=control
+    control?: string;
+    // a=extmap
+    ext?: {
+        value: number;
+        direction?: string;
+        uri: string;
+        config?: string;
+    };
+    // a=setup
+    setup?: string;
+
+    iceUfrag?: string;
+    icePwd?: string;
+    fingerprint?: {
+        type: string;
+        hash: string;
+    };
+    // a=source-filter: incl IN IP4 239.5.2.31 10.1.15.5
+    sourceFilter?: {
+        filterMode: 'excl' | 'incl';
+        netType: string;
+        addressTypes: string;
+        destAddress: string;
+        srcList: string;
+    };
+    invalid?: Array<{ value: string }>;
+}
+
+/**
+ * Attributes that only exist at the session level (before an m= block).
+ *
+ * https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-7
+ */
+export interface SessionAttributes extends SharedAttributes {
+    icelite?: string;
+    // a=ice-options:google-ice
+    iceOptions?: string;
+    // a=msid-semantic: WMS Jvlam5X3SX1OP6pn20zWogvaKJz5Hjf9OnlV
+    msidSemantic?: {
+        semantic: string;
+        token: string;
+    };
+    // a=group:BUNDLE audio video
+    groups?: Array<{
+        type: string;
+        mids: string;
+    }>;
+}
+
+/**
+ * Attributes that only exist at the media level (within an m= block).
+ *
+ * https://www.iana.org/assignments/sdp-parameters/sdp-parameters.xhtml#sdp-parameters-9
+ */
+export interface MediaAttributes extends SharedAttributes {
+    rtp?: {
+        payload: number;
+        codec: string;
+        rate?: number;
+        encoding?: number;
+    };
+    rtcp?: {
+        port: number;
+        netType?: string;
+        ipVer?: number;
+        address?: string;
+    };
+    // a=rtcp-fb:98 nack rpsi
+    rtcpFb?: {
+        payload: number;
+        type: string;
+        subtype?: string;
+    };
+    // a=rtcp-fb:98 trr-int 100
+    rtcpFbTrrInt?: {
+        payload: number;
+        value: number;
+    };
+    // a=fmtp
+    fmtp?: {
+        payload: number;
+        config: string;
+    };
+    // a=mid
+    mid?: string;
+    // a=msid
+    msid?: string;
+    ptime?: number;
+    // a=maxptime
+    maxptime?: number;
+    // a=crypto
+    crypto?: {
+        id: number;
+        suite: string;
+        config: string;
+        sessionConfig?: string;
+    };
+    // a=candidate
+    candidates?: Array<{
+        foundation: string;
+        component: number;
+        transport: string;
+        priority: number | string;
+        ip: string;
+        port: number;
+        type: string;
+        raddr: string;
+        rport: number;
+        tcptype: string;
+        generation: number;
+        'network-id'?: number;
+        'network-cost'?: number;
+    }>;
+    // a=end-of-candidates
+    endOfCandidates?: string;
+    // a=remote-candidates
+    remoteCandidates?: string;
+    // a=ssrc:
+    ssrcs?: Array<{
+        id: number | string;
+        attribute: string;
+        value?: string;
+    }>;
+    // a=ssrc-group:
+    ssrcGroups?: Array<{
+        semantics: string;
+        ssrcs: string;
+    }>;
+    // a=rtcp-mux
+    rtcpMux?: string;
+    // a=rtcp-rsize
+    rtcpRsize?: string;
+    // a=sctpmap
+    sctpmap?: {
+        sctpmapNumber: number | string;
+        app: string;
+        maxMessageSize: number;
+    };
+    // a=x-google-flag
+    xGoogleFlag?: string;
+    // a=rid
+    rids?: Array<{
+        id: number | string;
+        direction: string;
+        params?: string;
+    }>;
+    // a=imageattr
+    imageattrs?: Array<{
+        pt: number | string;
+        dir1: string;
+        attrs1: string;
+        dir2?: string;
+        attrs2?: string;
+    }>;
+    simulcast?: {
+        dir1: string;
+        list1: string;
+        dir2?: string;
+        list2?: string;
+    };
+    simulcast_03?: { value: string };
+    // a=framerate
+    framerate?: number | string;
+}
+
+/**
+ * Descriptor fields that exist at both the session level and media level.
+ *
+ * See the SDP grammar for more details: https://tools.ietf.org/html/rfc4566#section-9
+ */
+export interface SharedDescriptionFields {
+    // i=
+    description?: string;
+    // c=IN IP4 10.47.197.26
+    connection?: {
+        version: number;
+        ip: string;
+    };
+    // b=AS:4000
+    bandwidth?: {
+        type: 'TIAS' | 'AS' | 'CT' | 'RR' | 'RS';
+        limit: number | string;
+    };
+}
diff --git a/types/sdp-transform/sdp-transform-tests.ts b/types/sdp-transform/sdp-transform-tests.ts
new file mode 100644
index 0000000000..4b60e84a5a
--- /dev/null
+++ b/types/sdp-transform/sdp-transform-tests.ts
@@ -0,0 +1,10 @@
+import {
+	SessionDescription,
+	parse,
+	write,
+} from 'sdp-transform';
+
+const session: SessionDescription = parse('');
+const mediaType: string = session.media[0].type;
+session.media[0].type = 'video';
+const sdp: string = write(session);
diff --git a/types/sdp-transform/tsconfig.json b/types/sdp-transform/tsconfig.json
new file mode 100644
index 0000000000..b4d6bb625b
--- /dev/null
+++ b/types/sdp-transform/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",
+        "sdp-transform-tests.ts"
+    ]
+}
diff --git a/types/sdp-transform/tslint.json b/types/sdp-transform/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/sdp-transform/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/seamless-immutable/index.d.ts b/types/seamless-immutable/index.d.ts
index d3d2ef5b6a..b781523ef2 100644
--- a/types/seamless-immutable/index.d.ts
+++ b/types/seamless-immutable/index.d.ts
@@ -18,6 +18,10 @@ declare namespace SeamlessImmutable {
         merger?(a: any, b: any, config: any): any;
     }
 
+    interface ReplaceConfig {
+        deep: boolean;
+    }
+
     interface Options {
         prototype?: any;
     }
@@ -75,6 +79,8 @@ declare namespace SeamlessImmutable {
         without<K extends keyof T>(property: K): ImmutableObject<T>;
         without<K extends keyof T>(...properties: K[]): ImmutableObject<T>;
         without<K extends keyof T>(filter: (value: T[K], key: K) => boolean): ImmutableObject<T>;
+
+        replace<S>(valueObj: S, options?: ReplaceConfig): ImmutableObject<S>;
     }
 
     interface ImmutableArrayMixin<T> {
@@ -92,6 +98,8 @@ declare namespace SeamlessImmutable {
 
     function isImmutable(target: any): boolean;
     function ImmutableError(message: string): Error;
+
+    function replace<T, S>(obj: ImmutableObject<T>, valueObj: S, options?: ReplaceConfig): ImmutableObject<S>;
 }
 
 declare function SeamlessImmutable<T>(obj: T[], options?: SeamlessImmutable.Options): SeamlessImmutable.ImmutableArray<T>;
diff --git a/types/seamless-immutable/seamless-immutable-tests.ts b/types/seamless-immutable/seamless-immutable-tests.ts
index ddec87e81d..cccb2d7f96 100644
--- a/types/seamless-immutable/seamless-immutable-tests.ts
+++ b/types/seamless-immutable/seamless-immutable-tests.ts
@@ -44,6 +44,12 @@ interface ExtendedUser extends User {
 
 {
     const isImmutable: boolean = Immutable.isImmutable(Immutable.from([0, 2]));
+    const user1: Immutable.ImmutableObject<User> = Immutable.from({
+        firstName: 'Angry',
+        lastName: 'Monkey'
+    });
+    const replacedUser01 = Immutable.replace(user1, { firstName: 'Super', lastName: 'Monkey' });
+    const replacedUser02 = Immutable.replace(user1, { firstName: 'Super', lastName: 'Monkey' }, { deep: true });
 }
 
 //
@@ -124,4 +130,8 @@ interface ExtendedUser extends User {
     const firstNameWithDynamicPathWithDefault = immutableUser.getIn(['first' + 'name'], '');
     const line1WithoutDefault = immutableUserEx.getIn(['address', 'line1']);
     const line1WithDefault = immutableUserEx.getIn(['address', 'line1'], '');
+
+    // replace
+    const replacedUser01 = immutableUser.replace({ firstName: 'Super', lastName: 'Monkey' });
+    const replacedUser02 = immutableUser.replace({ firstName: 'Super', lastName: 'Monkey' }, { deep: true });
 }
diff --git a/types/select2/index.d.ts b/types/select2/index.d.ts
index a0c1ce3b1d..240b4b7f25 100644
--- a/types/select2/index.d.ts
+++ b/types/select2/index.d.ts
@@ -26,7 +26,7 @@ export type JQueryAjaxSettingsBase =
 /**
  * Same as jQuery v3 `JQuery.EventHandlerBase`.
  */
-export type JQueryEventHandlerBase<TContext extends object, T> =
+export type JQueryEventHandlerBase<TContext, T> =
     (this: TContext, t: T, ...args: any[]) => void | false;
 
 /**
@@ -221,7 +221,7 @@ export interface Options<Result = DataFormat | GroupedDataFormat, RemoteResult =
 // jQuery And Select2 Plugin
 // --------------------------------------------------------------------------
 
-export interface Select2Plugin<TElement extends Node = HTMLElement>  {
+export interface Select2Plugin<TElement = HTMLElement>  {
     amd: { require: Require; };
 
     defaults: {
@@ -252,7 +252,7 @@ export interface Select2Plugin<TElement extends Node = HTMLElement>  {
 }
 
 declare global {
-    interface JQuery<TElement extends Node = HTMLElement> {
+    interface JQuery<TElement = HTMLElement> {
         select2: Select2Plugin<TElement>;
         data(key: "select2"): Select2;
 
diff --git a/types/select2/select2-tests.ts b/types/select2/select2-tests.ts
index b3ce0d5896..a351dcc178 100644
--- a/types/select2/select2-tests.ts
+++ b/types/select2/select2-tests.ts
@@ -774,7 +774,7 @@ const selectedData: Select2.OptionData[] = $("#mySelect2").select2("data");
 // jQuery Generic
 
 declare let select: HTMLSelectElement;
-const $select: JQuery<HTMLSelectElement> = $(select) as JQuery<HTMLSelectElement>;
+const $select: JQuery<HTMLSelectElement> = $(select);
 
 select = $select.select2().get(0);
 select = $select.select2({tags: true}).get(0);
diff --git a/types/select2/v3/index.d.ts b/types/select2/v3/index.d.ts
index 21bb2611c7..771d997384 100644
--- a/types/select2/v3/index.d.ts
+++ b/types/select2/v3/index.d.ts
@@ -75,6 +75,7 @@ interface Select2Options {
     dropdownCss?: any;
     dropdownCssClass?: any;
     escapeMarkup?: (markup: string) => string;
+    nextSearchTerm?: (selectedObject: object, currentSearchTerm: string) => string;
 }
 
 interface Select2JQueryEventObject extends JQueryEventObject {
diff --git a/types/select2/v3/select2-tests.ts b/types/select2/v3/select2-tests.ts
index 3b331cec3b..2d5a400352 100644
--- a/types/select2/v3/select2-tests.ts
+++ b/types/select2/v3/select2-tests.ts
@@ -210,6 +210,9 @@ $("#e17_2").select2({
 });
 $("#e18,#e18_2").select2();
 alert("Selected value is: " + $("#e8").select2("val")); $("#e8").select2("val", { id: "CA", text: "Califoria" });
+$("#e19").select2({nextSearchTerm: function(selectedObject: object, currentSearchTerm: string) {
+    return currentSearchTerm;
+}});
 
 $("#e8").select2("val");
 $("#e8").select2("val", "CA");
diff --git a/types/selenium-standalone/index.d.ts b/types/selenium-standalone/index.d.ts
new file mode 100644
index 0000000000..261a331922
--- /dev/null
+++ b/types/selenium-standalone/index.d.ts
@@ -0,0 +1,80 @@
+// Type definitions for selenium-standalone 6.15
+// Project: https://github.com/vvo/selenium-standalone
+// Definitions by: Sander de Waal <https://github.com/SanderDeWaal1992>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as http from "http";
+import { URL } from "url";
+import { ChildProcess, SpawnOptions } from "child_process";
+
+export function install(cb: (error: Error | undefined, fsPaths: FsPaths) => void): void;
+export function install(opts: InstallOpts, cb: (error: Error | undefined, fsPaths: FsPaths) => void): void;
+export function install(optsCb: InstallOpts | ((error: Error | undefined, fsPaths: FsPaths) => void), cb?: (error: Error | undefined, fsPaths: FsPaths) => void): void;
+
+export function start(cb: (error: Error | null, selenium: ChildProcess) => void): void;
+export function start(opts: StartOpts, cb: (error: Error | null, selenium: ChildProcess) => void): void;
+export function start(optsCb: StartOpts | ((error: Error | null, selenium: ChildProcess) => void), cb?: (error: Error | null, selenium: ChildProcess) => void): void;
+
+export interface InstallOpts {
+	baseURL?: string;
+	basePath?: string;
+	version?: string;
+	drivers?: {
+		[browser: string]: {
+			version?: string;
+			arch: string | "ia32" | "x64";
+			baseURL: string;
+		}
+	};
+	progressCb?: (totalLength: number, progressLength: number, chunkLength: number) => void;
+	logger?: (message: string) => void;
+	requestOpts?: http.RequestOptions | string | URL;
+	cb?: (error: Error) => void;
+}
+
+export interface StartOpts {
+	basePath?: string;
+	version?: string;
+	drivers?: {
+		[browser: string]: {
+			version?: string;
+			arch: string | "ia32" | "x64";
+			baseURL: string;
+		}
+	};
+	seleniumArgs?: string[];
+	javaArgs?: string[];
+	spawnOptions?: SpawnOptions;
+	spawnCb?: (selenium?: ChildProcess) => void;
+	javaPath?: string;
+	requestOpts?: http.RequestOptions | string | URL;
+	cb?: (error: Error, child: ChildProcess) => void;
+}
+
+export interface FsPaths {
+	[x: string]: any;
+	chrome?: {
+		[x: string]: any;
+		installPath: string;
+	};
+	ie?: {
+		[x: string]: any;
+		installPath: string;
+	};
+	edge?: {
+		[x: string]: any;
+		installPath: string;
+	};
+	firefox?: {
+		[x: string]: any;
+		installPath: string;
+	};
+	selenium?: {
+		[x: string]: any;
+		installPath: string;
+	};
+}
+
+export { ChildProcess, SpawnOptions } from "child_process";
diff --git a/types/selenium-standalone/selenium-standalone-tests.ts b/types/selenium-standalone/selenium-standalone-tests.ts
new file mode 100644
index 0000000000..543f3be983
--- /dev/null
+++ b/types/selenium-standalone/selenium-standalone-tests.ts
@@ -0,0 +1,95 @@
+"use strict";
+import { install, start, ChildProcess, FsPaths, InstallOpts, StartOpts } from "selenium-standalone";
+
+// InstallOpts interface
+let installOpts: InstallOpts = {
+	baseURL: "baseURL",
+	basePath: "basePath",
+	version: "version",
+	drivers: {
+		chrome: {
+			version: "chrome_version",
+			arch: "ia32",
+			baseURL: "baseURL a",
+		},
+		firefox: {
+			version: "version",
+			arch: "ia64",
+			baseURL: "baseURL b",
+		}
+	},
+	progressCb: (totalLength: number, progressLength: number, chunkLength: number) => {},
+	logger: (message: string) => {},
+	requestOpts: "requestOpts",
+	cb: (error: Error) => {},
+};
+
+installOpts = {};
+
+installOpts = {
+	requestOpts: {
+		agent: true,
+		host: "host",
+		family: 5
+	},
+};
+
+// StartOpts interface
+let startOpts: StartOpts = {
+	basePath: "basePath",
+	version: "version",
+	drivers: {
+		chrome: {
+			version: "chrome_version",
+			arch: "ia32",
+			baseURL: "baseURL a",
+		},
+		firefox: {
+			version: "version",
+			arch: "ia64",
+			baseURL: "baseURL b",
+		}
+	},
+	seleniumArgs: ["bla", "foo"],
+	javaArgs: ["bla", "foo"],
+	spawnOptions: {},
+	spawnCb: (selenium?: ChildProcess) => {},
+	javaPath: "javaPath",
+	requestOpts: "requestOpts",
+	cb: (error: Error, child: ChildProcess) => {},
+};
+startOpts = {};
+
+// FsPaths interface
+let fsPaths: FsPaths = {
+	bla: "foo",
+	chrome: {
+		installPath: "installPath",
+		bla: "foo",
+	},
+	ie: {
+		installPath: "installPath",
+		bla: "foo",
+	},
+	edge: {
+		installPath: "installPath",
+		bla: "foo",
+	},
+	firefox: {
+		installPath: "installPath",
+		bla: "foo",
+	},
+	selenium: {
+		installPath: "installPath",
+		bla: "foo",
+	},
+};
+fsPaths = {};
+
+// start method
+start(startOpts, (error: Error | null, selenium: ChildProcess) => {});
+start((error: Error | null, selenium: ChildProcess) => {});
+
+// install method
+install(installOpts, (error: Error | undefined, fsPaths: FsPaths) => {});
+install((error: Error | undefined, fsPaths: FsPaths) => {});
diff --git a/types/selenium-standalone/tsconfig.json b/types/selenium-standalone/tsconfig.json
new file mode 100644
index 0000000000..40a7f2cb34
--- /dev/null
+++ b/types/selenium-standalone/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",
+        "selenium-standalone-tests.ts"
+    ]
+}
diff --git a/types/selenium-standalone/tslint.json b/types/selenium-standalone/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/selenium-standalone/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sequelize-cursor-pagination/index.d.ts b/types/sequelize-cursor-pagination/index.d.ts
new file mode 100644
index 0000000000..6c5b82bc56
--- /dev/null
+++ b/types/sequelize-cursor-pagination/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for sequelize-cursor-pagination 1.1
+// Project: https://github.com/Kaltsoon/sequelize-cursor-pagination
+// Definitions by: pilagod <https://github.com/pilagod>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/
+// TypeScript Version: 2.9
+
+import Sequelize = require('sequelize');
+
+declare namespace SequelizeCursorPagination {
+    interface Cursors {
+        before: string | null;
+        after: string | null;
+        hasNext: boolean;
+        hasPrevious: boolean;
+    }
+
+    interface BasicPaginateOptions<T> {
+        where?: Sequelize.FindOptions<T>['where'];
+        attributes?: Sequelize.FindOptions<T>['attributes'];
+        include?: Sequelize.FindOptions<T>['include'];
+        limit?: number; // limit the number of records returned
+        desc?: boolean; // [default: false]
+        before?: string; // the before cursor
+        after?: string; // the after cursor
+        paginationField?: string; // [default: primaryKeyField]
+    }
+
+    interface PaginateRawOptions<T> extends BasicPaginateOptions<T> {
+        raw: true;
+    }
+
+    interface PaginateInstOptions<T> extends BasicPaginateOptions<T> {
+        raw?: boolean;
+    }
+
+    interface WithPaginationOptions<MethodName extends string> {
+        methodName?: MethodName; // [default: 'paginate']
+        primaryKeyField?: string; // [default: 'id']
+    }
+
+    type WithPaginationModel<MethodName extends string, Model, ModelInst, ModelAttrs> = Model & {
+        [key in MethodName]: {
+            (options?: PaginateRawOptions<ModelAttrs>): { results: ModelAttrs[], cursors: Cursors }
+            (options?: PaginateInstOptions<ModelAttrs>): { results: ModelInst[], cursors: Cursors }
+        }
+    };
+
+    function withPagination<MethodName extends string = 'paginate'>(options?: WithPaginationOptions<MethodName>): (
+        <Model extends Sequelize.Model<ModelInst, ModelAttrs>, ModelInst, ModelAttrs>(model: Model) => WithPaginationModel<MethodName, Model, ModelInst, ModelAttrs>
+    );
+}
+
+export = SequelizeCursorPagination.withPagination;
diff --git a/types/sequelize-cursor-pagination/sequelize-cursor-pagination-tests.ts b/types/sequelize-cursor-pagination/sequelize-cursor-pagination-tests.ts
new file mode 100644
index 0000000000..b8a4fd95c6
--- /dev/null
+++ b/types/sequelize-cursor-pagination/sequelize-cursor-pagination-tests.ts
@@ -0,0 +1,103 @@
+import Sequelize = require('sequelize');
+import withPagination = require('sequelize-cursor-pagination');
+
+interface Data {
+    id: number;
+    name: string;
+}
+interface DataInstance extends Sequelize.Instance<Data>, Data {}
+
+type DataModel = Sequelize.Model<DataInstance, Data>;
+
+const model: DataModel = {} as any ;
+
+/************************************/
+/*  use default pagination options  */
+/************************************/
+
+const WithPaginationModel = withPagination({
+    methodName: 'paginate',
+    primaryKeyField: 'id'
+})<DataModel, DataInstance, Data>(model);
+
+// @CAVEAT: function withPagination has no return value, in order to get the augmented type,
+// we need to temporarily store the return value (actually is undefined) to later cast
+// the original model to the augmented type to acquire additional paginate function.
+const withPaginationModel = (model as typeof WithPaginationModel);
+
+withPaginationModel.paginate();
+withPaginationModel.paginate({
+    where: {
+        id: 1,
+        name: 'hello'
+    },
+    attributes: ['id', 'name'],
+    include: [],
+    before: 'beforeCursor',
+    after: 'afterCursor',
+    limit: 10,
+    desc: true,
+    paginationField: 'id',
+    raw: false
+});
+
+// when 'raw' option is false or undefined
+
+const insts = withPaginationModel.paginate({
+    raw: false
+});
+
+insts.cursors; // cursors => { after, before, hasNext, hasPrevious }
+insts.cursors.after;
+insts.cursors.before;
+insts.cursors.hasNext;
+insts.cursors.hasPrevious;
+
+insts.results; // results => DataInstance[]
+insts.results.forEach((inst) => {
+    const data = inst.get({ plain: true });
+    const { id, name } = data;
+});
+
+// when 'raw' option is true
+
+const raws = withPaginationModel.paginate({
+    raw: true
+});
+
+raws.cursors; // cursors => { after, before, hasNext, hasPrevious }
+raws.cursors.after;
+raws.cursors.before;
+raws.cursors.hasNext;
+raws.cursors.hasPrevious;
+
+raws.results; // results => Data[]
+raws.results.forEach((data) => {
+    const { id, name } = data;
+});
+
+/***********************************/
+/*  use custom pagination options  */
+/***********************************/
+
+const WithPaginationCustomModel = withPagination({
+    methodName: 'customPaginate',
+})<DataModel, DataInstance, Data>(model);
+
+const withPaginationCustomModel = (model as typeof WithPaginationCustomModel);
+
+withPaginationCustomModel.customPaginate();
+withPaginationCustomModel.customPaginate({
+    where: {
+        id: 1,
+        name: 'hello'
+    },
+    attributes: ['id', 'name'],
+    include: [],
+    before: 'beforeCursor',
+    after: 'afterCursor',
+    limit: 10,
+    desc: true,
+    paginationField: 'id',
+    raw: false
+});
diff --git a/types/sequelize-cursor-pagination/tsconfig.json b/types/sequelize-cursor-pagination/tsconfig.json
new file mode 100644
index 0000000000..73dbf33a68
--- /dev/null
+++ b/types/sequelize-cursor-pagination/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",
+        "sequelize-cursor-pagination-tests.ts"
+    ]
+}
diff --git a/types/delay/tslint.json b/types/sequelize-cursor-pagination/tslint.json
similarity index 67%
rename from types/delay/tslint.json
rename to types/sequelize-cursor-pagination/tslint.json
index bf610ae17f..71ee04c4e1 100644
--- a/types/delay/tslint.json
+++ b/types/sequelize-cursor-pagination/tslint.json
@@ -1,8 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        // TODO
-        "await-promise": false,
         "no-unnecessary-generics": false
     }
 }
diff --git a/types/sequelize-fixtures/index.d.ts b/types/sequelize-fixtures/index.d.ts
index 06e7aaf157..773bb43982 100644
--- a/types/sequelize-fixtures/index.d.ts
+++ b/types/sequelize-fixtures/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/domasx2/sequelize-fixtures
 // Definitions by: Christian Schwarz <https://github.com/cschwarz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import * as Sequelize from "sequelize";
 
diff --git a/types/sequelize/index.d.ts b/types/sequelize/index.d.ts
index 2772eaa905..9c3ca8474e 100644
--- a/types/sequelize/index.d.ts
+++ b/types/sequelize/index.d.ts
@@ -15,7 +15,7 @@
 //                 Nick Schultz <https://github.com/nrschultz>
 //                 Thomas Breleur <https://github.com/thomas-b>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 // Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
 
@@ -3233,9 +3233,10 @@ declare namespace sequelize {
         as?: string;
 
         /**
-         * The association you want to eagerly load. (This can be used instead of providing a model/as pair)
+         * The association you want to eagerly load. (This can be used instead of providing a model/as pair).
+         * You can also use the association alias.
          */
-        association?: IncludeAssociation;
+        association?: IncludeAssociation | string;
 
         /**
          * Where clauses to apply to the child models. Note that this converts the eager load to an inner join,
@@ -4671,6 +4672,20 @@ declare namespace sequelize {
 
     }
 
+    /**
+     * Interface for Attributes provided for a column
+     *
+     * @see Sequelize.define
+     */
+    type DefineModelAttributes<T> = {
+
+        /**
+         * The description of a database column for model
+         */
+        [P in keyof T]: string | DataTypeAbstract | DefineAttributeColumnOptions;
+
+    }
+
     /**
      * Interface for query options
      *
@@ -5262,6 +5277,11 @@ declare namespace sequelize {
          * Set to true or a string with the attribute name you want to use to enable.
          */
         version?: boolean | string;
+
+        /**
+         * Throws an error when no records found
+         */
+        rejectOnError?: boolean | Error;
     }
 
     /**
@@ -5970,7 +5990,7 @@ declare namespace sequelize {
          * @param options    These options are merged with the default define options provided to the Sequelize
          *                   constructor
          */
-        define<TInstance, TAttributes>(modelName: string, attributes: DefineAttributes,
+        define<TInstance, TAttributes>(modelName: string, attributes: DefineModelAttributes<TAttributes>,
             options?: DefineOptions<TInstance>): Model<TInstance, TAttributes>;
 
         /**
diff --git a/types/sequelize/sequelize-tests.ts b/types/sequelize/sequelize-tests.ts
index c3bd9e63af..702821ae25 100644
--- a/types/sequelize/sequelize-tests.ts
+++ b/types/sequelize/sequelize-tests.ts
@@ -34,11 +34,16 @@ s.transaction().then( ( a ) => t = a );
 interface GUserAttributes {
     id? : number;
     username? : string;
+    email: string;
 }
 
 interface GUserInstance extends Sequelize.Instance<GUserAttributes> {}
-var GUser = s.define<GUserInstance, GUserAttributes>( 'user', { id: Sequelize.INTEGER, username : Sequelize.STRING });
-GUser.create({ id : 1, username : 'one' }).then( ( guser ) => guser.save() );
+const GUser = s.define<GUserInstance, GUserAttributes>('user', {
+    id: Sequelize.INTEGER,
+    username: Sequelize.STRING,
+    email: Sequelize.STRING
+});
+GUser.create({ id : 1, username : 'one', email: 'one@lol.com' }).then((guser) => guser.save());
 
 var schema : Sequelize.DefineAttributes = {
     key : { type : Sequelize.STRING, primaryKey : true },
@@ -1294,7 +1299,7 @@ var testModel = s.define( 'User', {
     theDate : Sequelize.DATE,
     aBool : Sequelize.BOOLEAN
 } );
-var testModel = s.define( 'FrozenUser', {}, { freezeTableName : true } );
+const testFrozenModel = s.define( 'FrozenUser', {}, { freezeTableName : true } );
 s.define( 'UserWithClassAndInstanceMethods', {}, {
     classMethods : { doSmth : function() { return 1; } },
     instanceMethods : { makeItSo : function() { return 2; } }
@@ -1539,7 +1544,11 @@ interface ChairAttributes {
 }
 interface ChairInstance extends Sequelize.Instance<ChairAttributes> {}
 
-const Chair = s.define<ChairInstance, ChairAttributes>('chair', {});
+const Chair = s.define<ChairInstance, ChairAttributes>('chair', {
+    id: Sequelize.NUMBER,
+    color: Sequelize.STRING,
+    legs: Sequelize.NUMBER
+});
 
 Chair.findAll({
     where: {
@@ -1728,7 +1737,7 @@ s.define('DefineOptionsIndexesTest', {
     email: {
         allowNull: false,
         type: Sequelize.STRING(255),
-        set: function (val) {
+        set: function (val: any) {
             if (typeof val === "string") {
                 val = val.toLowerCase();
             } else {
diff --git a/types/sequelize/v3/index.d.ts b/types/sequelize/v3/index.d.ts
index eafa70b641..484edd089d 100644
--- a/types/sequelize/v3/index.d.ts
+++ b/types/sequelize/v3/index.d.ts
@@ -6,7 +6,7 @@
 //                 Nick Mueller <https://github.com/morpheusxaut>
 //                 James D. Callahan III <https://github.com/torhal>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 // Based on original work by: samuelneff <https://github.com/samuelneff/sequelize-auto-ts/blob/master/lib/sequelize.d.ts>
 
@@ -3140,7 +3140,7 @@ declare namespace sequelize {
     /**
     * Shortcut for types used in FindOptions.attributes
     */
-    type FindOptionsAttributesArray = Array<string | literal | [string, string] | fn | [fn, string] | cast | [cast, string] | [literal, string]>;    
+    type FindOptionsAttributesArray = Array<string | literal | [string, string] | fn | [fn, string] | cast | [cast, string] | [literal, string]>;
 
     /**
 * Options that are passed to any model creating a SELECT query
@@ -4339,7 +4339,7 @@ declare namespace sequelize {
          *
          * PostgreSQL only
          */
-        deferrable?: Deferrable;
+        deferrable?: DeferrableInitiallyDeferred | DeferrableInitiallyImmediate | DeferrableNot | DeferrableSetDeferred | DeferrableSetImmediate;
 
     }
 
@@ -6183,7 +6183,7 @@ declare namespace sequelize {
 
         camelizeIf(str: string, condition: boolean): string;
         underscoredIf(str: string, condition: boolean): string;
-                     
+
         _: SequelizeLoDash;
 
         /**
diff --git a/types/serialport/index.d.ts b/types/serialport/index.d.ts
index b0a374efeb..2f5f8fc55d 100644
--- a/types/serialport/index.d.ts
+++ b/types/serialport/index.d.ts
@@ -36,7 +36,7 @@ declare class SerialPort extends Stream.Duplex {
 	pause(): this;
 	resume(): this;
 
-	on(event: string, callback?: (data?: any) => void): this;
+	on(event: string, callback: (data?: any) => void): this;
 
 	static Binding: SerialPort.BaseBinding;
 
@@ -87,7 +87,7 @@ declare namespace SerialPort {
 			constructor();
 		}
 		class Delimiter extends Stream.Transform {
-			constructor(options: {delimiter: string | Buffer | number[]});
+			constructor(options: {delimiter: string | Buffer | number[], includeDelimiter?: boolean});
 		}
 		class Readline extends Delimiter {
 			constructor(options: {delimiter: string | Buffer | number[], encoding?: 'ascii'|'utf8'|'utf16le'|'ucs2'|'base64'|'binary'|'hex'});
diff --git a/types/server/index.d.ts b/types/server/index.d.ts
new file mode 100644
index 0000000000..a9936fd4ba
--- /dev/null
+++ b/types/server/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for server 1.0
+// Project: https://github.com/franciscop/server#readme
+// Definitions by: Santiago Aguilar <https://github.com/sant123>
+//                 Iddan Aaronsohn <https://github.com/iddan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { Middlewares, Context } from "./typings/common";
+import { Options } from "./typings/options";
+
+import { Router } from "./router";
+import { Reply } from "./reply";
+
+export = server;
+
+declare namespace server {
+    const router: Router;
+    const reply: Reply;
+}
+
+declare function server(
+    options: Options,
+    ...middlewares: Middlewares
+): Promise<Context>;
+declare function server(...middlewares: Middlewares): Promise<Context>;
diff --git a/types/server/reply.d.ts b/types/server/reply.d.ts
new file mode 100644
index 0000000000..63d8870c31
--- /dev/null
+++ b/types/server/reply.d.ts
@@ -0,0 +1,45 @@
+import express = require("express");
+
+export type cookieType = (
+    name: string,
+    value: string,
+    opts?: express.CookieOptions
+) => Reply;
+
+export type downloadType = (path: string, filename?: string) => any;
+export type headerType = (field: string, value?: string) => Reply;
+export type jsonType = (data?: any) => any;
+export type jsonpType = (data?: any) => any;
+export type renderType = (view: string, locals?: object) => any;
+export type sendType = (body?: any) => any;
+export type statusType = (code: number) => Reply;
+export type typeType = (type: string) => Reply;
+
+export const cookie: cookieType;
+export const download: downloadType;
+export const header: headerType;
+export const json: jsonType;
+export const jsonp: jsonpType;
+export const redirect: Redirect;
+export const render: renderType;
+export const send: sendType;
+export const status: statusType;
+export const type: typeType;
+
+export interface Redirect {
+    (path: string): Reply;
+    (status: number, path: string): Reply;
+}
+
+export interface Reply {
+    cookie: cookieType;
+    download: downloadType;
+    header: headerType;
+    json: jsonpType;
+    jsonp: jsonpType;
+    redirect: Redirect;
+    render: renderType;
+    send: sendType;
+    status: statusType;
+    type: typeType;
+}
diff --git a/types/server/router.d.ts b/types/server/router.d.ts
new file mode 100644
index 0000000000..ee7245fa30
--- /dev/null
+++ b/types/server/router.d.ts
@@ -0,0 +1,61 @@
+import { Middleware, Middlewares, Context } from "./typings/common";
+
+export type getType = (
+    path: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export type postType = (
+    path: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export type putType = (
+    path: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export type delType = (
+    path: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export type errorType = (
+    name: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export type subType = (
+    subdomain: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export type socketType = (
+    name: string,
+    middlewares: Middleware | Middlewares,
+    ...all: Middlewares
+) => Middleware;
+
+export const get: getType;
+export const post: postType;
+export const put: putType;
+export const del: delType;
+export const error: errorType;
+export const sub: subType;
+export const socket: socketType;
+
+export interface Router {
+    get: getType;
+    post: postType;
+    put: putType;
+    del: delType;
+    error: errorType;
+    sub: subType;
+    socket: socketType;
+}
diff --git a/types/server/server-tests.ts b/types/server/server-tests.ts
new file mode 100644
index 0000000000..ddccc7db0e
--- /dev/null
+++ b/types/server/server-tests.ts
@@ -0,0 +1,54 @@
+import server = require("server");
+import { get, post, del, error, sub, socket } from "server/router";
+
+import {
+    cookie,
+    download,
+    header,
+    json,
+    jsonp,
+    redirect,
+    render,
+    send,
+    status,
+    type
+} from "server/reply";
+
+server([
+    get("/", ctx => "Hello, World!"),
+    post("/", ctx => console.log(ctx.data)),
+    del("/", ctx => ({ ok: true })),
+    error("special", ctx => {
+        console.log(ctx.error);
+    }),
+    sub("/name", ctx => "Hello, World!"),
+    socket("message", ctx => "Hello, " + ctx.data.name),
+    ctx => cookie("cool", "yes"),
+    ctx =>
+        cookie("name", "tobi", {
+            domain: ".example.com",
+            path: "/admin",
+            secure: true
+        }),
+    ctx =>
+        cookie("rememberme", "1", {
+            expires: new Date(Date.now() + 900000),
+            httpOnly: true
+        }),
+    ctx => download("/report-12345.pdf"),
+    ctx => download("/report-12345.pdf", "report.pdf"),
+    ctx => header("cool"),
+    ctx => header("cool", "yes"),
+    ctx => json(),
+    ctx => json({ cool: true }),
+    ctx => jsonp(),
+    ctx => jsonp({ cool: true }),
+    ctx => redirect("/cool"),
+    ctx => redirect(304, "/cool"),
+    ctx => render("index.pug"),
+    ctx => send(),
+    ctx => send({}),
+    ctx => send("Hello, World!"),
+    ctx => status(200),
+    ctx => type("application/json")
+]);
diff --git a/types/server/tsconfig.json b/types/server/tsconfig.json
new file mode 100644
index 0000000000..c47dd19fe0
--- /dev/null
+++ b/types/server/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "noUnusedLocals": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "server-tests.ts",
+        "reply.d.ts",
+        "router.d.ts",
+        "typings/common.d.ts",
+        "typings/options.d.ts"
+    ]
+}
diff --git a/types/server/tslint.json b/types/server/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/server/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/server/typings/common.d.ts b/types/server/typings/common.d.ts
new file mode 100644
index 0000000000..bba10913ac
--- /dev/null
+++ b/types/server/typings/common.d.ts
@@ -0,0 +1,41 @@
+import express = require("express");
+import formidable = require("formidable");
+
+import { Options } from "./options";
+import { Reply } from "../reply";
+
+export type BasicType = string | any[] | object | number;
+
+export type LogLevel =
+    | "emergency"
+    | "alert"
+    | "critical"
+    | "error"
+    | "warning"
+    | "notice"
+    | "info"
+    | "debug";
+
+export interface Context {
+    options: Options;
+    data: any;
+    params: { [key: string]: string };
+    query: { [key: string]: string | string[] };
+    session: object;
+    headers: { [key: string]: string };
+    cookie: { [key: string]: string };
+    files: formidable.Files;
+    ip: string;
+    ips?: string[];
+    url: string;
+    method: string;
+    path: string;
+    secure: boolean;
+    xhr: boolean;
+    error: Error;
+    req: express.Request;
+    res: express.Response;
+}
+
+export type Middleware = (ctx: Context) => Reply | BasicType | void;
+export type Middlewares = Array<Middleware | Middleware[]>;
diff --git a/types/server/typings/options.d.ts b/types/server/typings/options.d.ts
new file mode 100644
index 0000000000..94b499e5c4
--- /dev/null
+++ b/types/server/typings/options.d.ts
@@ -0,0 +1,72 @@
+import bodyParser = require("body-parser");
+import csurf = require("csurf");
+import express = require("express");
+import formidable = require("formidable");
+import helmet = require("helmet");
+import http = require("http");
+import session = require("express-session");
+
+import { LogLevel } from "./common";
+
+// Extracted from formidable
+export interface DataParserOptions {
+    encoding: string;
+    uploadDir: string;
+    keepExtensions: boolean;
+    maxFieldsSize: number;
+    maxFields: number;
+    hash: string | boolean;
+    multiples: boolean;
+    type: string;
+    bytesReceived: number;
+    bytesExpected: number;
+
+    onPart: (part: formidable.Part) => void;
+
+    handlePart(part: formidable.Part): void;
+    parse(
+        req: http.IncomingMessage,
+        callback?: (
+            err: any,
+            fields: formidable.Fields,
+            files: formidable.Files
+        ) => any
+    ): void;
+}
+
+// extracted from csurf
+export interface CsurfOptions {
+    value?: (req: express.Request) => string;
+    cookie?: csurf.CookieOptions | boolean;
+    ignoreMethods?: string[];
+    sessionKey?: string;
+}
+
+export interface Options {
+    port?: number;
+    secret?: string;
+    public?: string;
+    views?: string;
+    engine?: string;
+    env?: string;
+    favicon?: string;
+    parser?: {
+        json?: bodyParser.OptionsJson;
+        body?: bodyParser.OptionsUrlencoded;
+        text?: bodyParser.OptionsText;
+        data?: DataParserOptions;
+        cookie?: express.CookieOptions;
+    };
+    session?: session.SessionOptions;
+    security?:
+        | false
+        | helmet.IHelmetConfiguration & {
+              csurf?: false | CsurfOptions;
+          };
+    log?:
+        | LogLevel
+        | {
+              level: LogLevel;
+              report: (content: string, type: LogLevel) => void;
+          };
+}
diff --git a/types/set-cookie-parser/index.d.ts b/types/set-cookie-parser/index.d.ts
index 9d78a76ce1..ea00ab4399 100644
--- a/types/set-cookie-parser/index.d.ts
+++ b/types/set-cookie-parser/index.d.ts
@@ -8,10 +8,12 @@
 declare module "set-cookie-parser" {
     import http = require("http");
 
-    function SetCookieParser(input: string | string[] | http.IncomingMessage): SetCookieParser.Cookie[];
+    function SetCookieParser(input: string | ReadonlyArray<string> | http.IncomingMessage): SetCookieParser.Cookie[];
 
     namespace SetCookieParser {
-        function parse(input: string | string[] | http.IncomingMessage): Cookie[];
+        function parse(input: string | ReadonlyArray<string> | http.IncomingMessage): Cookie[];
+
+        function splitCookiesString(input: string | ReadonlyArray<string> | void): string[];
 
         interface Cookie {
             name: string;
diff --git a/types/set-cookie-parser/set-cookie-parser-tests.ts b/types/set-cookie-parser/set-cookie-parser-tests.ts
index 020d40f59c..0faff0148c 100644
--- a/types/set-cookie-parser/set-cookie-parser-tests.ts
+++ b/types/set-cookie-parser/set-cookie-parser-tests.ts
@@ -65,3 +65,26 @@ var optionalIncludedCookie: setCookie.Cookie = {
     httpOnly: true,
     secure: true
 };
+
+var cookiesString = setCookie.splitCookiesString(null)
+assert.deepStrictEqual(cookiesString, [])
+
+cookiesString = setCookie.splitCookiesString([])
+assert.deepStrictEqual(cookiesString, [])
+
+cookiesString = setCookie.splitCookiesString([
+    'foo=bar; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+    'baz=buz; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+])
+assert.deepStrictEqual(cookiesString, [
+    'foo=bar; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+    'baz=buz; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+])
+
+cookiesString = setCookie.splitCookiesString(
+    'foo=bar; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure, baz=buz; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+)
+assert.deepStrictEqual(cookiesString, [
+    'foo=bar; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+    'baz=buz; Max-Age=1000; Domain=.example.com; Path=/; Expires=Tue, 01 Jul 2025 10:01:11 GMT; HttpOnly; Secure',
+])
diff --git a/types/shallow-equals/index.d.ts b/types/shallow-equals/index.d.ts
new file mode 100644
index 0000000000..7d91b03923
--- /dev/null
+++ b/types/shallow-equals/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for shallow-equals 1.0
+// Project: https://github.com/hughsk/shallow-equals
+// Definitions by: Ross Solomon <https://github.com/rsolomon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = shallow_equals;
+
+declare function shallow_equals<A, B>(
+  a?: A,
+  b?: B,
+  compare?: (objA: A, objB: B) => boolean,
+): boolean;
diff --git a/types/shallow-equals/shallow-equals-tests.ts b/types/shallow-equals/shallow-equals-tests.ts
new file mode 100644
index 0000000000..87512c9f43
--- /dev/null
+++ b/types/shallow-equals/shallow-equals-tests.ts
@@ -0,0 +1,19 @@
+import shallowEquals = require('shallow-equals');
+
+interface A {
+  foo: string;
+}
+
+interface B {
+  foo: string;
+  bar?: string;
+}
+
+const a: A = { foo: 'bar' };
+const b: B = { foo: 'baz' };
+function compare(a: A, b: B) {
+  return false;
+}
+
+shallowEquals(a, b);
+shallowEquals(a, b, compare);
diff --git a/types/shallow-equals/tsconfig.json b/types/shallow-equals/tsconfig.json
new file mode 100644
index 0000000000..83137182f4
--- /dev/null
+++ b/types/shallow-equals/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", "shallow-equals-tests.ts"]
+}
diff --git a/types/shallow-equals/tslint.json b/types/shallow-equals/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/shallow-equals/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/shapefile/index.d.ts b/types/shapefile/index.d.ts
index 54a18a2503..6cbee9e837 100644
--- a/types/shapefile/index.d.ts
+++ b/types/shapefile/index.d.ts
@@ -1,32 +1,28 @@
-// Type definitions for shapefile 0.5.6
+// Type definitions for shapefile 0.6
 // Project: https://github.com/mbostock/shapefile
-// Definitions by: Denis Carriere <https://github.com/DenisCarriere>
+// Definitions by:  Denis Carriere <https://github.com/DenisCarriere>
+//                  James Bromwell <https://github.com/Thw0rted>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
-/// <reference types="geojson"/>
+/// <reference types="node" />
 
-declare const shapefile: shapefile.ShapefileStatic;
+import { Feature, FeatureCollection, GeometryObject, GeoJsonProperties } from "geojson";
+import { Readable } from "stream";
 
-declare namespace shapefile {
-    interface Options {
-        encoding: string
-        highWaterMark: number
-    }
-    interface Feature {
-        done: boolean
-        value: GeoJSON.Feature<any>
-    }
-    interface Shapefile {
-        bbox: Array<number>
-        read(): Promise<Feature>;
-    }
-    interface ShapefileStatic {
-        open(shp: any, dbf?: any, options?: Options): Promise<Shapefile>;
-        read(shp: any, dbf?: any, options?: Options): Promise<GeoJSON.FeatureCollection<any>>;
-    }
+export interface Options {
+    encoding?: string;
+    highWaterMark?: number;
+}
+export interface Source<RecordType> {
+    bbox: number[];
+    read(): Promise<{done: boolean, value: RecordType}>;
+    cancel(): Promise<void>;
 }
 
-declare module "shapefile" {
-    export = shapefile
-}
+export type Openable = string | ArrayBuffer | Uint8Array | Readable | ReadableStream;
+
+export function open(shp: Openable, dbf?: Openable, options?: Options): Promise<Source<Feature>>;
+export function openShp(source: Openable, options?: Options): Promise<Source<GeometryObject>>;
+export function openDbf(source: Openable, options?: Options): Promise<Source<GeoJsonProperties>>;
+export function read(shp: Openable, dbf?: Openable, options?: Options): Promise<FeatureCollection>;
diff --git a/types/shapefile/shapefile-tests.ts b/types/shapefile/shapefile-tests.ts
index 71b7f6f7ae..cf5dd34e65 100644
--- a/types/shapefile/shapefile-tests.ts
+++ b/types/shapefile/shapefile-tests.ts
@@ -1,18 +1,38 @@
-import * as shapefile from 'shapefile'
+import { open, openDbf, openShp, read } from 'shapefile';
 
-shapefile.open('./example.shp')
+open('./example.shp', new ArrayBuffer(123))
     .then(source => {
-        source.bbox
+        source.bbox;
         source.read()
             .then(result => {
-                result.value
-                result.done
-        })
-    })
+                result.value.geometry;
+                result.done;
+        });
+    });
 
-shapefile.read("example.shp")
+openDbf('./example.dbf', {encoding: "utf8"})
+    .then(source => {
+        source.bbox;
+        source.read()
+            .then(result => {
+                result.value;
+                result.done;
+        });
+    });
+
+openShp('./example.shp', {highWaterMark: 0xabad1dea})
+    .then(source => {
+        source.bbox;
+        source.read()
+            .then(result => {
+                result.value;
+                result.done;
+        });
+    });
+
+read("example.shp")
     .then(result => {
-        result.bbox
-        result.features
-        result.type
-    })
+        result.bbox;
+        result.features;
+        result.type;
+    });
diff --git a/types/shapefile/tsconfig.json b/types/shapefile/tsconfig.json
index 86a07711b7..7f63c5b58c 100644
--- a/types/shapefile/tsconfig.json
+++ b/types/shapefile/tsconfig.json
@@ -2,7 +2,8 @@
     "compilerOptions": {
         "module": "commonjs",
         "lib": [
-            "es6"
+            "es6",
+            "dom"
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
@@ -20,4 +21,4 @@
         "index.d.ts",
         "shapefile-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/shapefile/tslint.json b/types/shapefile/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/shapefile/tslint.json
+++ b/types/shapefile/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/sharedb/index.d.ts b/types/sharedb/index.d.ts
new file mode 100644
index 0000000000..1620808f99
--- /dev/null
+++ b/types/sharedb/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for sharedb 1.0
+// Project: https://github.com/share/sharedb
+// Definitions by: Steve Oney <https://github.com/soney>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference path="lib/sharedb.d.ts" />
+
+import * as ShareDB from './lib/sharedb';
+
+interface PubSubOptions {
+    prefix?: string;
+}
+interface Stream {
+    id: string;
+}
+
+export = sharedb;
+
+declare class sharedb {
+    constructor(options?: {db?: any, pubsub?: sharedb.PubSub, disableDocAction?: boolean, disableSpaceDelimitedActions?: boolean});
+    connect: () => sharedb.Connection;
+    addProjection(name: string, collection: string, fields: {}): any;
+    listen(stream: any): void;
+    close(callback?: (err: Error) => any): void;
+    use(action: sharedb.UseAction, fn: sharedb.UseCallback);
+    static types: {
+        register: (type: { name?: string, uri?: string, [key: string]: any}) => void;
+    };
+}
+
+declare namespace sharedb {
+    type UseAction = 'connect' | 'op' | 'doc' | 'query' | 'submit' | 'apply' | 'commit' | 'after submit' | 'receive';
+    type UseCallback = ((request: {action: UseAction, agent: any, req: any, collection: string, id: string, query: any, op: ShareDB.RawOp}, callback: () => void) => void);
+
+    abstract class DB {
+        projectsSnapshots: boolean;
+        disableSubscribe: boolean;
+        close(callback?: () => void): void;
+        commit(collection: string, id: string, op: Op, snapshot, options, callback: (...args: any[]) => any): void;
+        getSnapshot(collection: string, id: string, fields, options, callback: (...args: any[]) => any): void;
+        getSnapshotBulk(collection: string, ids: string, fields, options, callback: (...args: any[]) => any): void;
+        getOps(collection: string, id: string, from: number, to: number, options, callback: (...args: any[]) => any): void;
+        getOpsToSnapshot(collection: string, id: string, from: number, snapshot: number, options, callback: (...args: any[]) => any): void;
+        getOpsBulk(collection: string, fromMap, toMap, options, callback: (...args: any[]) => any): void;
+        getCommittedOpVersion(collection: string, id: string, snapshot, op, options, callback: (...args: any[]) => any): void;
+        query(collection: string, query: Query, fields, options, callback: (...args: any[]) => any): void;
+        queryPoll(collection: string, query: Query, options, callback: (...args: any[]) => any): void;
+        queryPollDoc(collection: string, id: string, query: Query, options, callback: (...args: any[]) => any): void;
+        canPollDoc(): boolean;
+        skipPoll(): boolean;
+    }
+
+    class MemoryDB extends DB { }
+
+    abstract class PubSub {
+        private static shallowCopy(obj: any);
+        protected prefix?: string;
+        protected nextStreamId: number;
+        protected streamsCount: number;
+        protected streams: {
+            [channel: string]: Stream;
+        };
+        protected subscribed: {
+            [channel: string]: boolean;
+        };
+        protected constructor(options?: PubSubOptions);
+        close(callback?: (err: Error|null) => void): void;
+        publish(channels: string[], data: {[k: string]: any}, callback: (err: Error | null) => void): void;
+        subscribe(channel: string, callback: (err: Error | null, stream?: Stream) => void): void;
+        protected abstract _subscribe(channel: string, callback: (err: Error | null) => void): void;
+        protected abstract _unsubscribe(channel: string, callback: (err: Error | null) => void): void;
+        protected abstract _publish(channels: string[], data: any, callback: (err: Error | null) => void): void;
+        protected _emit(channel: string, data: {[k: string]: any}): void;
+        private _createStream(channel);
+        private _removeStream(channel, stream);
+    }
+
+    class Connection {
+        constructor(ws: WebSocket);
+        get(collectionName: string, documentID: string): ShareDB.Doc;
+        createFetchQuery(collectionName: string, query: string, options: {results?: ShareDB.Query[]}, callback: (err: Error, results: any) => any): ShareDB.Query;
+        createSubscribeQuery(collectionName: string, query: string, options: {results?: ShareDB.Query[]}, callback: (err: Error, results: any) => any): ShareDB.Query;
+    }
+    type Doc = ShareDB.Doc;
+    type Query = ShareDB.Query;
+    type Error = ShareDB.Error;
+    type Op = ShareDB.Op;
+    type AddNumOp = ShareDB.AddNumOp;
+    type ListMoveOp = ShareDB.ListMoveOp;
+    type ListInsertOp = ShareDB.ListInsertOp;
+    type ListDeleteOp = ShareDB.ListDeleteOp;
+    type ListReplaceOp = ShareDB.ListReplaceOp;
+    type StringInsertOp = ShareDB.StringInsertOp;
+    type StringDeleteOp = ShareDB.StringDeleteOp;
+    type ObjectInsertOp = ShareDB.ObjectInsertOp;
+    type ObjectDeleteOp = ShareDB.ObjectDeleteOp;
+    type ObjectReplaceOp = ShareDB.ObjectReplaceOp;
+    type SubtypeOp = ShareDB.SubtypeOp;
+
+    type Path = ShareDB.Path;
+    type ShareDBSourceOptions = ShareDB.ShareDBSourceOptions;
+}
diff --git a/types/sharedb/lib/client.d.ts b/types/sharedb/lib/client.d.ts
new file mode 100644
index 0000000000..08999f2449
--- /dev/null
+++ b/types/sharedb/lib/client.d.ts
@@ -0,0 +1,28 @@
+/// <reference path="sharedb.d.ts" />
+import * as WS from 'ws';
+import * as ShareDB from './sharedb';
+
+export class Connection {
+    constructor(ws: WebSocket | WS);
+    get(collectionName: string, documentID: string): Doc;
+    createFetchQuery(collectionName: string, query: string, options: {results?: Query[]}, callback: (err: Error, results: any) => any): Query;
+    createSubscribeQuery(collectionName: string, query: string, options: {results?: Query[]}, callback: (err: Error, results: any) => any): Query;
+}
+export type Doc = ShareDB.Doc;
+export type Query = ShareDB.Query;
+export type Error = ShareDB.Error;
+export type Op = ShareDB.Op;
+export type AddNumOp = ShareDB.AddNumOp;
+export type ListMoveOp = ShareDB.ListMoveOp;
+export type ListInsertOp = ShareDB.ListInsertOp;
+export type ListDeleteOp = ShareDB.ListDeleteOp;
+export type ListReplaceOp = ShareDB.ListReplaceOp;
+export type StringInsertOp = ShareDB.StringInsertOp;
+export type StringDeleteOp = ShareDB.StringDeleteOp;
+export type ObjectInsertOp = ShareDB.ObjectInsertOp;
+export type ObjectDeleteOp = ShareDB.ObjectDeleteOp;
+export type ObjectReplaceOp = ShareDB.ObjectReplaceOp;
+export type SubtypeOp = ShareDB.SubtypeOp;
+
+export type Path = ShareDB.Path;
+export type ShareDBSourceOptions = ShareDB.ShareDBSourceOptions;
diff --git a/types/sharedb/lib/sharedb.d.ts b/types/sharedb/lib/sharedb.d.ts
new file mode 100644
index 0000000000..426eac5a0e
--- /dev/null
+++ b/types/sharedb/lib/sharedb.d.ts
@@ -0,0 +1,85 @@
+import { EventEmitter } from 'events';
+
+export type Path = ReadonlyArray<string|number>;
+export type Snapshot = number;
+
+export interface AddNumOp { p: Path; na: number; }
+
+export interface ListInsertOp  { p: Path; li: any; }
+export interface ListDeleteOp  { p: Path; ld: any; }
+export interface ListReplaceOp { p: Path; li: any; ld: any; }
+export interface ListMoveOp    { p: Path; lm: any; }
+
+export interface ObjectInsertOp  { p: Path; oi: any; }
+export interface ObjectDeleteOp  { p: Path; od: any; }
+export interface ObjectReplaceOp { p: Path; oi: any; od: any; }
+
+export interface StringInsertOp { p: Path; si: string; }
+export interface StringDeleteOp { p: Path; sd: string; }
+
+export interface SubtypeOp { p: Path; t: string; o: any; }
+
+export type Op = AddNumOp | ListInsertOp | ListDeleteOp | ListReplaceOp | ListMoveOp | ObjectInsertOp | ObjectDeleteOp | ObjectReplaceOp | StringInsertOp | StringDeleteOp | SubtypeOp;
+
+export interface RawOp {
+    src: string;
+    seq: number;
+    v: number;
+    op: Op[];
+    m: any;
+    c: string;
+    d: string;
+}
+export type OTType = 'ot-text' | 'ot-json0' | 'ot-text-tp2' | 'rich-text';
+export interface Error {
+    code: number;
+    message: string;
+}
+export interface ShareDBSourceOptions { source?: boolean; }
+// interface ShareDBCreateOptions extends ShareDBSourceOptions {}
+// interface ShareDBDelOptions extends ShareDBSourceOptions {}
+// interface ShareDBSubmitOpOptions extends ShareDBSourceOptions {}
+
+export type Callback = (err: Error) => any;
+
+export type DocEvent = 'load' | 'create' | 'before op' | 'op' | 'del' | 'error' | 'no write pending' | 'nothing pending';
+
+export class Doc extends EventEmitter {
+    type: string;
+    id: string;
+    data: any;
+    fetch: (callback: (err: Error) => void) => void;
+    subscribe: (callback: (err: Error) => void) => void;
+
+    on(event: 'load' | 'no write pending' | 'nothing pending', callback: () => void): this;
+    on(event: 'create', callback: (source: boolean) => void): this;
+    on(event: 'op' | 'before op', callback: (ops: Op[], source: boolean) => void): this;
+    on(event: 'del', callback: (data: any, source: boolean) => void): this;
+    on(event: 'error', callback: (err: Error) => void): this;
+
+    addListener(event: 'load' | 'no write pending' | 'nothing pending', callback: () => void): this;
+    addListener(event: 'create', callback: (source: boolean) => void): this;
+    addListener(event: 'op' | 'before op', callback: (ops: Op[], source: boolean) => void): this;
+    addListener(event: 'del', callback: (data: any, source: boolean) => void): this;
+    addListener(event: 'error', callback: (err: Error) => void): this;
+
+    ingestSnapshot(snapshot: Snapshot, callback: Callback): void;
+    destroy(): void;
+    create(data: any, callback?: Callback): void;
+    create(data: any, type?: OTType, callback?: Callback): void;
+    create(data: any, type?: OTType, options?: ShareDBSourceOptions, callback?: Callback): void;
+    submitOp(data: ReadonlyArray<Op>, options?: ShareDBSourceOptions, callback?: Callback): void;
+    del(options: ShareDBSourceOptions, callback: (err: Error) => void): void;
+    whenNothingPending(callback: (err: Error) => void): void;
+}
+
+export type QueryEvent = 'ready' | 'error' | 'changed' | 'insert' | 'move' | 'remove' | 'extra';
+export class Query extends EventEmitter {
+    ready: boolean;
+    results: Doc[];
+    extra: any;
+    on(event: QueryEvent, callback: (...args: any[]) => any): this;
+    addListener(event: QueryEvent, callback: (...args: any[]) => any): this;
+    removeListener(event: QueryEvent, listener: (...args: any[]) => any): this;
+    destroy(): void;
+}
diff --git a/types/sharedb/sharedb-tests.ts b/types/sharedb/sharedb-tests.ts
new file mode 100644
index 0000000000..55c3dc797d
--- /dev/null
+++ b/types/sharedb/sharedb-tests.ts
@@ -0,0 +1,71 @@
+/// <reference types="qunit/v1" />
+import * as ShareDB from 'sharedb';
+import * as http from 'http';
+import * as WebSocket from 'ws';
+import { Duplex } from 'stream';
+import * as ShareDBClient from 'sharedb/lib/client';
+
+// Adapted from https://github.com/avital/websocket-json-stream
+class WebSocketJSONStream extends Duplex {
+    constructor(private readonly ws: WebSocket) {
+        super({ objectMode: true });
+        this.ws.on('message', (msg: string) => {
+            this.push(JSON.parse(msg));
+        });
+        this.ws.on('close', () => {
+            this.push(null); // end readable stream
+            this.end(); // end writable stream
+
+            this.emit('close');
+            this.emit('end');
+        });
+	this.on('error', () => { ws.close(); });
+	this.on('end',   () => { ws.close(); });
+    }
+    _read(): void {}
+    _write(msg: any, encoding: string, next: () => void): void {
+        this.ws.send(JSON.stringify(msg));
+        next();
+    }
+}
+
+const backend = new ShareDB();
+const connection = backend.connect();
+const doc = connection.get('examples', 'counter');
+
+doc.fetch((err) => {
+    if (err) { throw err; }
+    if (doc.type === null) {
+        doc.create({ numClicks: 0 }, startServer);
+    } else {
+        startServer();
+    }
+});
+
+function startServer() {
+    const server = http.createServer();
+
+    // Connect any incoming WebSocket connection to ShareDB
+    const wss = new WebSocket.Server({ server });
+    wss.on('connection', (ws, req) => {
+      const stream = new WebSocketJSONStream(ws);
+      backend.listen(stream);
+    });
+
+    server.listen(8080);
+    // console.log('Listening on http://localhost:8080');
+    startClient(() => {
+        server.close();
+        wss.close();
+    });
+}
+
+function startClient(callback) {
+    const socket = new WebSocket('ws://localhost:8080');
+    const connection = new ShareDBClient.Connection(socket);
+    const doc = connection.get('examples', 'counter');
+    doc.subscribe(() => {
+        doc.submitOp([{p: ['numClicks'], na: 1}]);
+        callback();
+    });
+}
diff --git a/types/sharedb/tsconfig.json b/types/sharedb/tsconfig.json
new file mode 100644
index 0000000000..8d2c0915c0
--- /dev/null
+++ b/types/sharedb/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": false,
+        "noImplicitThis": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "lib/sharedb.d.ts",
+        "index.d.ts",
+        "lib/client.d.ts",
+        "sharedb-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/sharedb/tslint.json b/types/sharedb/tslint.json
new file mode 100644
index 0000000000..2914fa23e8
--- /dev/null
+++ b/types/sharedb/tslint.json
@@ -0,0 +1,4 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": { }
+} 
diff --git a/types/sharp/index.d.ts b/types/sharp/index.d.ts
index e1108575ab..97b9ea6f86 100644
--- a/types/sharp/index.d.ts
+++ b/types/sharp/index.d.ts
@@ -15,6 +15,7 @@ import { Duplex } from "stream";
  * @throws {Error} Invalid parameters
  * @returns A sharp instance that can be used to chain operations
  */
+declare function sharp(options?: sharp.SharpOptions): sharp.SharpInstance;
 declare function sharp(input?: string | Buffer, options?: sharp.SharpOptions): sharp.SharpInstance;
 declare namespace sharp {
     const gravity: GravityEnum;
@@ -332,6 +333,14 @@ declare namespace sharp {
          * @throws {Error} Invalid parameters
          * @returns A sharp instance that can be used to chain operations
          */
+        linear(multiplier?: number, offset?: number): 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 multiplier value between 0.0 and 1.0. (optional, default 1.0)
+         * @param offset value between 0.0 and 1.0. (optional, default 0.0)
+         * @throws {Error} Invalid parameters
+         * @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.
diff --git a/types/sharp/sharp-tests.ts b/types/sharp/sharp-tests.ts
index 2cef4e42a4..f3c2c8a7ce 100644
--- a/types/sharp/sharp-tests.ts
+++ b/types/sharp/sharp-tests.ts
@@ -47,6 +47,17 @@ sharp('input.jpg')
         // containing a scaled and cropped version of input.jpg
     });
 
+sharp({
+    create: {
+        width: 300,
+        height: 200,
+        channels: 4,
+        background: { r: 255, g: 0, b: 0, alpha: 128 }
+    }
+})
+.png()
+.toBuffer();
+
 let transformer = sharp()
     .resize(300)
     .on('info', (info: sharp.OutputInfo) => {
diff --git a/types/shopify-buy/index.d.ts b/types/shopify-buy/index.d.ts
index 413b9614f8..11f15d9dfd 100644
--- a/types/shopify-buy/index.d.ts
+++ b/types/shopify-buy/index.d.ts
@@ -2,6 +2,7 @@
 // Project: http://shopify.github.io/js-buy-sdk/api/
 // Definitions by: Martin Köhn <https://github.com/openminder>
 //                 Stephen Traiforos <https://github.com/straiforos>
+//                 Rosana Ruiz <https://github.com/totemika>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.7
 
@@ -50,7 +51,6 @@ declare namespace ShopifyBuy {
         fetchWithProducts(id: string): Promise<any[]>; // TODO fix to be a type: Docs: Fetches a single collection by ID on the shop, not including products.
         fetchAll(pageSizeopt?: number): Promise<any[]>; // TODO fix to be a type: Docs: Fetches all collections on the shop, not including products.
         fetchAllWithProducts(): Promise<any[]>; // TODO fix to be a type: DOC: Fetches all collections on the shop, including products.
-        fetchWithProducts(id: string): Promise<any[]>; // TODO fix to be a type: DOC: Fetches all collections on the shop, including products.
         fetchByHandle(handle: string): Promise<any[]>; // TODO fix to be a type: DOC: Fetches a collection by handle on the shop. Assuming it does not give products
         fetchQuery(query: Query): Promise<any[]>; // TODO fix to be a type: DOC: Fetches a collection by handle on the shop. Assuming it does not give products
     }
@@ -106,7 +106,7 @@ declare namespace ShopifyBuy {
     export interface Query {
      /**
       * query: title, collection_type, updated_at
-      * TODO probably will remove before Defintely Typed PR, 
+      * TODO probably will remove before Defintely Typed PR,
       * as their  community guidelines
       */
         query: string;
@@ -168,6 +168,11 @@ declare namespace ShopifyBuy {
          * The product title
          */
         title: string;
+
+        /**
+         * The product’s vendor name
+         */
+        vendor: string;
     }
 
     export interface ProductVariant extends GraphModel {
@@ -305,10 +310,10 @@ declare namespace ShopifyBuy {
         lineItems: LineItem[];
 
         /**
-         * Get current subtotal price for all line items.
+         * Get current subtotal price for all line items, before shipping, taxes, and discounts.
          * Example: two items have been added to the cart that cost $1.25 then the subtotal will be 2.50
          */
-        subtotal: string;
+        subtotalPrice: string;
     }
 
     export interface LineItem extends GraphModel {
diff --git a/types/shopify-buy/shopify-buy-tests.ts b/types/shopify-buy/shopify-buy-tests.ts
index 0e65990121..2813dc4d5d 100644
--- a/types/shopify-buy/shopify-buy-tests.ts
+++ b/types/shopify-buy/shopify-buy-tests.ts
@@ -371,7 +371,7 @@ function renderCartItems() {
 /* Update Total Cart Pricing
 ============================================================ */
 function updateTotalCartPricing() {
-    $('.cart .pricing').text(formatAsMoney(cart.subtotal));
+    $('.cart .pricing').text(formatAsMoney(cart.subtotalPrice));
 }
 
 /* Format amount as currency
diff --git a/types/showdown/index.d.ts b/types/showdown/index.d.ts
index 53744f6d75..6e2b86cccc 100644
--- a/types/showdown/index.d.ts
+++ b/types/showdown/index.d.ts
@@ -380,8 +380,11 @@ declare namespace Showdown {
 
     /**
      * Setting a "global" option affects all instances of showdown
+     * 
+     * @param optionKey
+     * @param value
      */
-    function setOption(optionKey: string, value: string): void;
+    function setOption(optionKey: string, value: any): void;
 
     /**
      * Retrieve previous set global option.
diff --git a/types/signale/index.d.ts b/types/signale/index.d.ts
new file mode 100644
index 0000000000..83a8cbaafb
--- /dev/null
+++ b/types/signale/index.d.ts
@@ -0,0 +1,140 @@
+// Type definitions for signale 1.2
+// Project: https://github.com/klauscfhq/signale
+// Definitions by: Resi Respati <https://github.com/resir014>
+//                 Kingdaro <https://github.com/kingdaro>
+//                 Joydip Roy <https://github.com/rjoydip>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+/// <reference types="node" />
+
+declare namespace signale {
+    type DefaultMethods =
+        | "await"
+        | "complete"
+        | "error"
+        | "debug"
+        | "fatal"
+        | "fav"
+        | "info"
+        | "note"
+        | "pause"
+        | "pending"
+        | "star"
+        | "start"
+        | "success"
+        | "warn"
+        | "watch"
+        | "log";
+
+    interface CommandType {
+        /** The icon corresponding to the logger. */
+        badge: string;
+        /**
+         * The color of the label, can be any of the foreground colors supported by
+         * [chalk](https://github.com/chalk/chalk#colors).
+         */
+        color: string;
+        /** The label used to identify the type of the logger. */
+        label: string;
+    }
+
+    interface SignaleConfig {
+        /** Display the scope name of the logger. */
+        displayScope?: boolean;
+        /** Display the badge of the logger. */
+        displayBadge?: boolean;
+        /** Display the current local date in `YYYY-MM-DD` format. */
+        displayDate?: boolean;
+        /** Display the name of the file that the logger is reporting from. */
+        displayFilename?: boolean;
+        /** Display the label of the logger. */
+        displayLabel?: boolean;
+        /** Display the current local time in `HH:MM:SS` format. */
+        displayTimestamp?: boolean;
+        /** Underline the logger label. */
+        underlineLabel?: boolean;
+        /** Underline the logger message. */
+        underlineMessage?: boolean;
+        underlinePrefix?: boolean;
+        underlineSuffix?: boolean;
+        uppercaseLabel?: boolean;
+    }
+
+    interface SignaleOptions<TTypes extends string = DefaultMethods> {
+        /** Sets the configuration of an instance overriding any existing global or local configuration. */
+        config?: SignaleConfig;
+        disabled?: boolean;
+        /**
+         * Name of the scope.
+         */
+        scope?: string;
+        /**
+         * Holds the configuration of the custom and default loggers.
+         */
+        types?: Partial<Record<TTypes, CommandType>>;
+        interactive?: boolean;
+        timers?: Map<string, Date>;
+        /**
+         * Destination to which the data is written, can be any valid
+         * [Writable stream](https://nodejs.org/api/stream.html#stream_writable_streams).
+         */
+        stream?: NodeJS.WriteStream;
+    }
+
+    interface SignaleConstructor {
+        new <TTypes extends string = DefaultMethods>(
+            options?: SignaleOptions<TTypes>
+        ): Signale<TTypes>;
+    }
+
+    interface SignaleBase<TTypes extends string = DefaultMethods> {
+        /**
+         * Sets the configuration of an instance overriding any existing global or local configuration.
+         *
+         * @param configObj Can hold any of the documented options.
+         */
+        config(configObj: SignaleConfig): Signale<TTypes>;
+        /**
+         * Defines the scope name of the logger.
+         *
+         * @param name Can be one or more comma delimited strings.
+         */
+        scope(...name: string[]): Signale<TTypes>;
+        /** Clears the scope name of the logger. */
+        unscope(): void;
+        /**
+         * Sets a timers and accepts an optional label. If none provided the timer will receive a unique label automatically.
+         *
+         * @param label Label corresponding to the timer. Each timer must have its own unique label.
+         * @returns a string corresponding to the timer label.
+         */
+        time(label?: string): string;
+        /**
+         * Deactivates the timer to which the given label corresponds. If no label
+         * is provided the most recent timer, that was created without providing a
+         * label, will be deactivated.
+         *
+         * @param label Label corresponding to the timer, each timer has its own unique label.
+         * @param span Total running time.
+         */
+        timeEnd(
+            label?: string,
+            span?: number
+        ): { label: string; span?: number };
+    }
+
+    type LoggerFunc = (message?: any, ...optionalArgs: any[]) => void;
+    type Signale<TTypes extends string = DefaultMethods> = SignaleBase<TTypes> &
+        Record<TTypes, LoggerFunc> &
+        Record<DefaultMethods, LoggerFunc>;
+}
+
+declare const signale: signale.Signale<signale.DefaultMethods> & {
+    Signale: signale.SignaleConstructor;
+    SignaleConfig: signale.SignaleConfig;
+    SignaleOptions: signale.SignaleOptions;
+    DefaultMethods: signale.DefaultMethods;
+};
+
+export = signale;
diff --git a/types/signale/signale-tests.ts b/types/signale/signale-tests.ts
new file mode 100644
index 0000000000..7fd96638a8
--- /dev/null
+++ b/types/signale/signale-tests.ts
@@ -0,0 +1,129 @@
+import { Signale, SignaleOptions } from "signale";
+
+// --- Test 1: Basic Usage --- //
+
+const signale = new Signale();
+
+signale.success("Operation successful");
+signale.debug("Hello", "from", "L59");
+signale.pending("Write release notes for 1.2.0");
+signale.fatal(new Error("Unable to acquire lock"));
+signale.watch("Recursively watching build directory...");
+signale.complete({
+    prefix: "[task]",
+    message: "Fix issue #59",
+    suffix: "(@klauscfhq)"
+});
+
+// --- Test 2: Custom Loggers --- //
+
+type CustomLogger = "remind" | "santa";
+
+const optionsCustom: SignaleOptions<CustomLogger> = {
+    stream: process.stdout,
+    scope: "custom",
+    types: {
+        remind: {
+            badge: "**",
+            color: "yellow",
+            label: "reminder"
+        },
+        santa: {
+            badge: "🎅",
+            color: "red",
+            label: "santa"
+        }
+    }
+};
+
+const custom = new Signale(optionsCustom);
+custom.remind("Improve documentation.");
+custom.santa("Hoho! You have an unused variable on L45.");
+custom.debug("This should still work");
+
+// --- Test 3: Overriding Default Loggers --- //
+
+const optionsOverride: SignaleOptions = {
+    types: {
+        error: {
+            badge: "!!",
+            color: "red",
+            label: "fatal error"
+        },
+        success: {
+            badge: "++",
+            color: "green",
+            label: "huge success"
+        }
+    }
+};
+
+signale.error("Default Error Log");
+signale.success("Default Success Log");
+
+const customOverride = new Signale(optionsOverride);
+customOverride.error("Custom Error Log");
+customOverride.success("Custom Success Log");
+
+// --- Test 4: Scoped Loggers --- //
+
+const optionsScope: SignaleOptions = {
+    scope: "global scope"
+};
+
+const global = new Signale(optionsScope);
+global.success("Successful Operation");
+
+const global2 = signale.scope("global scope");
+global2.success("Hello from the global scope");
+
+function scopedTest() {
+    const outer = global2.scope("outer", "scope");
+    outer.success("Hello from the outer scope");
+
+    setTimeout(() => {
+        const inner = outer.scope("inner", "scope");
+        inner.success("Hello from the inner scope");
+    }, 500);
+}
+
+scopedTest();
+
+// --- Test 5: Timers --- //
+
+signale.time("test");
+signale.time();
+signale.time();
+
+setTimeout(() => {
+    signale.timeEnd();
+    signale.timeEnd();
+    signale.timeEnd("test");
+}, 500);
+
+// --- Test 6: Configuration --- //
+
+// Overrides any existing `package.json` config
+signale.config({
+    displayFilename: true,
+    displayTimestamp: true,
+    displayDate: false
+});
+
+signale.success("Hello from the Global scope");
+
+function scopedConfigTest() {
+    // `fooLogger` inherits the config of `signale`
+    const fooLogger = signale.scope("foo scope");
+
+    // Overrides both `signale` and `package.json` configs
+    fooLogger.config({
+        displayFilename: true,
+        displayTimestamp: false,
+        displayDate: true
+    });
+
+    fooLogger.success("Hello from the Local scope");
+}
+
+scopedConfigTest();
diff --git a/types/signale/tsconfig.json b/types/signale/tsconfig.json
new file mode 100644
index 0000000000..ef5b67d941
--- /dev/null
+++ b/types/signale/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,
+        "esModuleInterop": true
+    },
+    "files": [
+        "index.d.ts",
+        "signale-tests.ts"
+    ]
+}
diff --git a/types/signale/tslint.json b/types/signale/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/signale/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/signature_pad/index.d.ts b/types/signature_pad/index.d.ts
index d1df3191b8..cd0a96b7ec 100644
--- a/types/signature_pad/index.d.ts
+++ b/types/signature_pad/index.d.ts
@@ -1,137 +1,192 @@
-// Type definitions for signature_pad
+// Type definitions for signature_pad 2.3
 // Project: https://github.com/szimek/signature_pad
 // Definitions by: Abubaker Bashir <https://github.com/AbubakerB>
 //                 Jason Mihalick <https://github.com/jrmihalick>
+//                 Jaeyeon Lee <https://github.com/leejaedus>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // Project by: Szymon Nowak <https://github.com/szimek>
+// TypeScript Version: 2.8
 
 declare namespace SignaturePad {
-	class Point {
-	    x: number;
-	    y: number;
-		time: number;
-		color?: string;
-	    constructor(x: number, y: number, time: number);
-	    velocityFrom(start: Point): number;
-	    distanceTo(start: Point): number;
-	}
+  class Point {
+    x: number;
+    y: number;
+    time: number;
+    color?: string;
 
-	class CurveControl {
-	    c1: Point;
-	    c2: Point;
-	    constructor(c1: Point, c2: Point);
-	}
+    constructor(x: number, y: number, time: number);
 
- 	class Bezier {
-	    startPoint: Point;
-	    control1: CurveControl;
-	    control2: CurveControl;
-	    endPoint: Point;
-	    constructor(startPoint: Point, control1: Point, control2: Point, endPoint: Point);
-	    length(): number;
-	    _point(t: number, start: number, c1: number, c2: number, end: number): number;
-	}
+    velocityFrom(start: Point): number;
 
- 	interface SignaturePadOptions {
-	    /**
-	    *   (float) Weight used to modify new velocity based on the previous velocity. Defaults to 0.7.
-	    */
-	    velocityFilterWeight?: number;
-	    /**
-	    *   (float) Minimum width of a line. Defaults to 0.5.
-	    */
-	    minWidth?: number;
-	    /**
-	    *   (float) Maximum width of a line. Defaults to 2.5.
-	    */
-	    maxWidth?: number;
-	    /**
-	    *   (float or function) Radius of a single dot.
-	    */
-	    dotSize?: number | Function;
-	    /**
-	    *   (string) Color used to draw the lines. Can be any color format accepted by context.fillStyle.
-	    *   Defaults to "black".
-	    */
-	    penColor?: string;
-	    /**
-	    *   (string) Color used to clear the background. Can be any color format accepted by context.fillStyle.
-	    *   Defaults to "rgba(0,0,0,0)" (transparent black). Use a non-transparent color e.g. "rgb(255,255,255)"
-	    *   (opaque white) if you'd like to save signatures as JPEG images.
-	    */
-	    backgroundColor?: string;
-	    /**
-	    *   (function) Callback when stroke begin.
-	    */
-	    onEnd?: Function;
-	    /**
-	    *   (function) Callback when stroke end.
-	    */
-	    onBegin?: Function;
-	}
+    distanceTo(start: Point): number;
+  }
+
+  class CurveControl {
+    c1: Point;
+    c2: Point;
+
+    constructor(c1: Point, c2: Point);
+  }
+
+  class Bezier {
+    startPoint: Point;
+    control1: CurveControl;
+    control2: CurveControl;
+    endPoint: Point;
+    startWidth: number;
+    endWidth: number;
+
+    constructor(startPoint: Point, control1: Point, control2: Point, endPoint: Point);
+
+    length(): number;
+
+    _point(t: number, start: number, c1: number, c2: number, end: number): number;
+  }
+
+  interface SignaturePadOptions {
+    /*
+     * (float or function) Radius of a single dot.
+     */
+    dotSize?: number | (() => number)
+
+    /*
+     * (float) Minimum width of a line. Defaults to 0.5.
+     */
+    minWidth?: number
+
+    /*
+     * (float) Maximum width of a line. Defaults to 2.5.
+     */
+    maxWidth?: number
+
+    /*
+     * (integer) Draw the next point at most once per every x milliseconds. Set it to 0 to turn off throttling. Defaults to 16.
+     */
+    throttle?: number
+
+    /*
+     * (integer) Add the next point only if the previous one is farther than x pixels. Defaults to 5.
+     */
+    minDistance?: number
+
+    /*
+     * (string) Color used to clear the background. Can be any color format accepted by context.fillStyle. Defaults to "rgba(0,0,0,0)" (transparent black). Use a non-transparent color e.g. "rgb(255,255,255)" (opaque white) if you'd like to save signatures as JPEG images.
+     */
+    backgroundColor?: string
+
+    /*
+     * (string) Color used to draw the lines. Can be any color format accepted by context.fillStyle. Defaults to "black".
+     */
+    penColor?: string
+
+    /*
+     * (float) Weight used to modify new velocity based on the previous velocity. Defaults to 0.7.
+     */
+    velocityFilterWeight?: number
+
+    /*
+     * (function) Callback when stroke begin.
+     */
+    onBegin?: (event: MouseEvent) => void
+
+    /*
+     * (function) Callback when stroke end.
+     */
+    onEnd?: (event: MouseEvent) => void
+  }
 }
 
 declare class SignaturePad {
-    points: Array<SignaturePad.Point>;
-    _lastVelocity: number;
-    _lastWidth: number;
-    _isEmpty: boolean;
-    _mouseButtonDown: boolean;
-    _ctx: CanvasRenderingContext2D;
-    _canvas: HTMLCanvasElement;
-    velocityFilterWeight: number;
-    minWidth: number;
-    maxWidth: number;
-    dotSize: Function;
-    penColor: string;
-    backgroundColor: string;
-    onEnd: Function;
-    onBegin: Function;
+  backgroundColor: string;
+  canvas: HTMLCanvasElement;
+  dotSize: number | (() => number);
+  maxWidth: number;
+  minDistance: number;
+  minWidth: number;
+  options: SignaturePad.SignaturePadOptions;
+  penColor: string;
+  throttle: number;
+  velocityFilterWeight: number;
+  _ctx: CanvasRenderingContext2D;
+  _data: Array<{
+    color: string,
+    points: Array<SignaturePad.Point>
+  }>;
+  _isEmpty: boolean;
+  _lastVelocity: number;
+  _lastWidth: number;
+  _mouseButtonDown: boolean;
+  _points: Array<SignaturePad.Point>;
+  /**
+   * Callback when stroke begin
+   */
+  onBegin: (event: MouseEvent) => void;
+  /**
+   * Callback when stroke end.
+   */
+  onEnd: (event: MouseEvent) => void;
+  /**
+   *   Clears the canvas
+   */
+  clear: () => void;
+  /**
+   *   Draws signature image from data URL
+   */
+  fromDataURL: (dataUrl: string, options?: { ratio?: number, width?: number, height?: number, callback?: (error?: ErrorEvent) => void }) => void;
+  /**
+   *   Returns signature image as data URL.
+   *   If 'type' parameter is ommitted, PNG dataUrl is returned.
+   */
+  toDataURL: (type?: string, encoderOptions?: any) => string;
+  /**
+   *   Rebinds all event handlers
+   */
+  on: () => void;
+  /**
+   *   Unbinds all event handlers
+   */
+  off: () => void;
+  /**
+   *   Returns true if canvas is empty, otherwise returns false
+   */
+  isEmpty: () => boolean;
+  /**
+   *   Draws signature image from array of signature point groups
+   */
+  fromData: (pointGroups: Array<Array<SignaturePad.Point>>) => void;
+  /**
+   *   Returns array of signature point groups
+   */
+  toData: () => Array<Array<SignaturePad.Point>>;
+  /**
+   * Privates
+   */
+  _handleMouseDown: (event: MouseEvent) => void;
+  _handleMouseMove: (event: MouseEvent) => void;
+  _handleMouseUp: (event: MouseEvent) => void;
+  _handleTouchStart: (event: MouseEvent) => void;
+  _handleTouchMove: (event: MouseEvent) => void;
+  _handleTouchEnd: (event: MouseEvent) => void;
+  _strokeMoveUpdate: () => void;
+  _strokeBegin: (event: MouseEvent) => void;
+  _strokeUpdate: (event: MouseEvent) => void;
+  _strokeEnd: (event: MouseEvent) => void;
+  _handleMouseEvents: (event: MouseEvent) => void;
+  _handleTouchEvents: (event: TouchEvent) => void;
+  _reset: () => void;
+  _createPoint: (x: number, y: number) => SignaturePad.Point;
+  _addPoint: (point: SignaturePad.Point) => SignaturePad.Bezier | null;
+  _calculateCurveWidths: (startPoint: SignaturePad.Point, endPoint: SignaturePad.Point) => { end: number, start: number };
+  _strokeWidth: (velocity: number) => number;
+  _drawCurveSegment: (x: number, y: number, width: number) => void;
+  _drawCurve: (_a: { color: string, curve: SignaturePad.Bezier }) => void;
+  _drawDot: (_a: { color: string, point: SignaturePad.Point }) => void;
+  _fromData: (pointGroups: Array<Array<SignaturePad.Point>>, drawCurve: (_a: { color: string, curve: SignaturePad.Bezier }) => void, drawDot: (_a: { color: string, point: SignaturePad.Point }) => void) => void;
+  _toSVG: () => string;
 
-    constructor(canvas: Element, options?: SignaturePad.SignaturePadOptions);
-    /**
-    *   Clears the canvas
-    */
-    clear(): void;
-    /**
-    *   Returns true if canvas is empty, otherwise returns false
-    */
-    isEmpty(): boolean;
-    /**
-    *   Draws signature image from data URL
-    */
-    fromDataURL(dataUrl: string): void;
-    /**
-    *   Returns array of signature point groups
-    */
-    toData(): Array<Array<SignaturePad.Point>>;
-    /**
-	*   Returns signature image as data URL.
-	*   If 'type' parameter is ommitted, PNG dataUrl is returned.
-    */
-    toDataURL(type?: string): string;
-    /**
-    *   Unbinds all event handlers
-    */
-    off(): void;
-    /**
-    *   Rebinds all event handlers
-    */
-    on(): void;
-
-    _strokeBegin(event: Event): void;
-    _strokeUpdate(event: Event): void;
-    _strokeDraw(point: SignaturePad.Point): void;
-    _strokeEnd(event: Event): void;
-    _handleMouseEvents(): void;
-    _handleTouchEvents(): void;
-    _reset(): void;
-    _createPoint(event: Event): SignaturePad.Point;
-    _addPoint(point: SignaturePad.Point): void;
-    _calculateCurveControlPoints(point1: SignaturePad.Point, point2: SignaturePad.Point, point3: SignaturePad.Point): void;
-
-    _addCurve(curve: SignaturePad.Bezier): void;
-    _drawPoint(x: number, y: number, size: number): void;
-    _drawCurve(curve: SignaturePad.Bezier, startWidth: number, endWidth: number): void;
-    _strokeWidth(velocity: number): void;
+  constructor(canvas: HTMLCanvasElement, options?: SignaturePad.SignaturePadOptions);
 }
+
+export default SignaturePad;
+
+export as namespace SignaturePad;
diff --git a/types/signature_pad/signature_pad-tests.ts b/types/signature_pad/signature_pad-tests.ts
index b83b0ec682..b7bff8f126 100644
--- a/types/signature_pad/signature_pad-tests.ts
+++ b/types/signature_pad/signature_pad-tests.ts
@@ -1,8 +1,10 @@
+import SignaturePad from 'signature_pad';
+
 /* TEST 1 - Basic structure and usage */
 function BasicTest() {
-    var canvas = document.querySelector("canvas");
+    const canvas = document.querySelector('canvas');
 
-    var signaturePad = new SignaturePad(canvas);
+    const signaturePad = new SignaturePad(canvas);
 
     // Returns signature image as data URL
     signaturePad.toDataURL();
@@ -14,7 +16,7 @@ function BasicTest() {
     signaturePad.toData();
 
     // Draws signature image from data URL
-    signaturePad.fromDataURL("data:image/png;base64,iVBORw0K...");
+    signaturePad.fromDataURL('data:image/png;base64,iVBORw0K...');
 
     // Clears the canvas
     signaturePad.clear();
@@ -25,19 +27,19 @@ function BasicTest() {
 
 /* TEST 2 - You can set options during initialization: */
 function SetDuringInit() {
-    var canvas = document.querySelector("canvas");
-    var signaturePad = new SignaturePad(canvas, {
+    const canvas = document.querySelector('canvas');
+    const signaturePad = new SignaturePad(canvas, {
         minWidth: 5,
         maxWidth: 10,
-        penColor: "rgb(66, 133, 244)"
+        penColor: 'rgb(66, 133, 244)'
     });
 }
 
 /* TEST 3 - or during runtime: */
 function RuntimeChange() {
-    var canvas = document.querySelector("canvas");
-    var signaturePad = new SignaturePad(canvas);
+    const canvas = document.querySelector('canvas');
+    const signaturePad = new SignaturePad(canvas);
     signaturePad.minWidth = 5;
     signaturePad.maxWidth = 10;
-    signaturePad.penColor = "rgb(66, 133, 244)";
+    signaturePad.penColor = 'rgb(66, 133, 244)';
 }
diff --git a/types/simple-mock/index.d.ts b/types/simple-mock/index.d.ts
index dd95b6159f..fa934dd00f 100644
--- a/types/simple-mock/index.d.ts
+++ b/types/simple-mock/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for simple-mock
+// Type definitions for simple-mock v0.8.0
 // Project: https://github.com/jupiter/simple-mock
 // Definitions by: Leon Yu <https://github.com/leonyu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -14,6 +14,11 @@ declare namespace Simple {
      */
     restore(): void;
 
+    /**
+     * Use this if you need to restore only a single mock value or function on an object.
+     */
+    restore(obj: any, key: string): void;
+
     /**
      * Wraps fn in a spy and sets this on the obj, restorable with all mocks.
      */
@@ -101,7 +106,7 @@ declare namespace Simple {
     reset(): void;
   }
 
-  interface Action<T> {
+  export interface Action<T> {
     /**
      * arguments to call back with
      */
@@ -176,7 +181,23 @@ declare namespace Simple {
     rejectWith<V>(val: V): Stub<PromiseLike<V>>;
 
     /**
-     * An array of behaviours, each having one of these properties:
+     * Configures this stub to use the specified array of actions.
+     */
+    withActions(actions?: Action<T>[]): Stub<T>;
+
+    /**
+     * Configures the stub to enable looping.
+     */
+    withLoop(): Stub<T>;
+
+    /**
+     * Configures the stub to disable looping.
+     */
+    noLoop(): Stub<T>;
+
+    /**
+     * An array of behaviours.
+     * Note: modifying this array directly is not supported, rather use stub.withActions(actions) if you need to add actions.
      */
     actions: Action<T>[];
 
diff --git a/types/simple-mock/simple-mock-tests.ts b/types/simple-mock/simple-mock-tests.ts
index 05c900ee99..a441dbdc43 100644
--- a/types/simple-mock/simple-mock-tests.ts
+++ b/types/simple-mock/simple-mock-tests.ts
@@ -1,8 +1,9 @@
 import Simple = require('simple-mock');
 declare function describe(desc: string, action: () => void): void;
 declare function beforeEach(action: () => void): void;
+declare function afterEach(action: () => void): void;
 declare function it(desc: string, action: (done: () => void) => void): void;
-declare var assert: {
+declare const assert: {
   (cond: any, message?: string): void;
   equal<T>(a: T, b: T): void;
   deepEqual<T>(a: T, b: T): void;
@@ -556,13 +557,151 @@ describe('Simple', function() {
       })
     })
 
+    describe('for withActions configurations', function() {
+      let stubFn: Simple.Stub<string>;
+
+      it('performs all types of actions', function(done) {
+        const firstAction: Simple.Action<string> = { cbArgs: [], returnValue: 'a', throwError: undefined }
+        const secondAction: Simple.Action<string> = { cbArgs: [1, 2, 3], returnValue: undefined, throwError: undefined }
+        const thirdAction: Simple.Action<string> = { cbArgs: [], returnValue: undefined, throwError: new Error('my message') }
+        stubFn = Simple.stub().withActions([firstAction, secondAction, thirdAction])
+        let returned: string = stubFn()   // Call 1
+        stubFn('a', function() { // Call 2
+          let call2Args = arguments
+          try {
+            stubFn()              // Call 3
+          } catch(e) {
+
+            assert.equal(stubFn.callCount, 3)
+
+            // Verify Call 1: return 'a'
+            assert(returned)
+            assert.equal(returned, 'a')
+
+            // Verify Call 2: callback with 1,2,3
+            assert(stubFn.called)
+            assert.equal(stubFn.calls[1].args[0], 'a')
+            assert.equal(call2Args.length, 3)
+            assert.equal(call2Args[0], 1)
+            assert.equal(call2Args[1], 2)
+            assert.equal(call2Args[2], 3)
+
+            // Verify Call 3: error thrown
+            assert(e instanceof Error)
+            assert.equal(e.message, 'my message')
+            done()
+          }
+        })
+      })
+
+      it('can return over multiple calls, looping per default', function() {
+        const firstAction: Simple.Action<string> = { cbArgs: [], returnValue: 'a', throwError: undefined }
+        const secondAction: Simple.Action<string> = { cbArgs: [], returnValue: 'b', throwError: undefined }
+        stubFn = Simple.stub().withActions([firstAction, secondAction])
+
+        let returned: string[] = []
+        returned.push(stubFn())
+        returned.push(stubFn())
+        returned.push(stubFn())
+
+        assert.equal(returned.length, 3)
+        assert(stubFn.called)
+        assert.equal(stubFn.callCount, 3)
+        assert.equal(returned[0], 'a')
+        assert.equal(returned[1], 'b')
+        assert.equal(returned[2], 'a')
+      })
+
+      it('can return over multiple calls, looping turned off', function() {
+        const firstAction: Simple.Action<string> = { cbArgs: [], returnValue: 'a', throwError: undefined }
+        const secondAction: Simple.Action<string> = { cbArgs: [], returnValue: 'b', throwError: undefined }
+        stubFn = Simple.stub().withActions([firstAction, secondAction])
+        stubFn.loop = false
+
+        let returned: string[] = []
+        returned.push(stubFn())
+        returned.push(stubFn())
+        returned.push(stubFn())
+
+        assert.equal(returned.length, 3)
+        assert(stubFn.called)
+        assert.equal(stubFn.callCount, 3)
+        assert.equal(returned[0], 'a')
+        assert.equal(returned[1], 'b')
+        assert.equal(returned[2], undefined)
+      })
+
+      it('preserves previously added configurations', function() {
+        const secondAction: Simple.Action<string> = { cbArgs: [], returnValue: 'b', throwError: undefined }
+        const thirdAction: Simple.Action<string> = { cbArgs: [], returnValue: 'c', throwError: undefined }
+        stubFn = Simple.stub().returnWith('a').withActions([secondAction, thirdAction])
+        let returned: string[] = []
+        returned.push(stubFn())
+        returned.push(stubFn())
+        returned.push(stubFn())
+
+        assert.equal(returned.length, 3)
+        assert(stubFn.called)
+        assert.equal(stubFn.callCount, 3)
+        assert.equal(returned[0], 'a')
+        assert.equal(returned[1], 'b')
+        assert.equal(returned[2], 'c')
+      })
+
+      it('is chainable and more configurations may be added after', function() {
+        const firstAction: Simple.Action<string> = { cbArgs: [], returnValue: 'a', throwError: undefined }
+        const secondAction: Simple.Action<string> = { cbArgs: [], returnValue: 'b', throwError: undefined }
+        stubFn = Simple.stub().withActions([firstAction, secondAction]).returnWith('c')
+        let returned: string[] = []
+        returned.push(stubFn())
+        returned.push(stubFn())
+        returned.push(stubFn())
+
+        assert.equal(returned.length, 3)
+        assert(stubFn.called)
+        assert.equal(stubFn.callCount, 3)
+        assert.equal(returned[0], 'a')
+        assert.equal(returned[1], 'b')
+        assert.equal(returned[2], 'c')
+      })
+
+      it('allows setting actions array and then calling withActions', function() {
+        stubFn = Simple.stub()
+        const firstAction: Simple.Action<string> = { cbArgs: [], returnValue: 'a', throwError: undefined }
+        stubFn.actions = [firstAction]
+        stubFn.withActions()
+
+        let returned: string = stubFn()
+
+        assert.equal(returned.length, 1)
+        assert(stubFn.called)
+        assert.equal(stubFn.callCount, 1)
+        assert.equal(returned, 'a')
+      })
+
+      it('allows calling withActions and then setting actions array', function() {
+        stubFn = Simple.stub()
+        stubFn.withActions()
+        const firstAction: Simple.Action<string> = { cbArgs: [], returnValue: 'a', throwError: undefined }
+        stubFn.actions = [firstAction]
+
+        let returned: string = stubFn()
+
+        assert.equal(returned.length, 1)
+        assert(stubFn.called)
+        assert.equal(stubFn.callCount, 1)
+        assert.equal(returned, 'a')
+      })
+
+    })
+
     describe('for a specified function to call', function() {
       it('should be called with arguments and return', function() {
         let stubFn = Simple.stub().callFn(function() {
           return arguments
         })
 
-        let returned = stubFn('z', 'x')
+        let returned: any = stubFn('z', 'x')
 
         assert.equal(stubFn.callCount, 1)
         assert.equal(returned[0], 'z')
@@ -576,7 +715,7 @@ describe('Simple', function() {
 
         try {
           stubFn()
-        } catch (e) {
+        } catch(e) {
           assert(e instanceof Error)
           assert.equal(e.message, 'my message')
         }
@@ -649,6 +788,10 @@ describe('Simple', function() {
         })
       })
 
+      afterEach(function() {
+        Simple.restore()
+      })
+
       describe('with a single resolving configuration', function() {
         let stubFn: Simple.Stub<PromiseLike<string>>;
         beforeEach(function() {
@@ -768,6 +911,8 @@ describe('Simple', function() {
       })
     })
 
+    if (typeof Promise === 'undefined') return // Skip on unsupported platforms
+
     describe('for native/conforming promises', function() {
       let fulfilledStub: Simple.Stub<boolean>
       let rejectedStub: Simple.Stub<boolean>
@@ -895,6 +1040,82 @@ describe('Simple', function() {
         })
       })
     })
+
+    describe('#noLoop', function() {
+
+      it('should disable looping', function() {
+
+        let stub = Simple.stub().noLoop().returnWith('foo')
+
+        assert.equal(stub(), 'foo')
+        assert.equal(stub(), undefined)
+
+      })
+
+    })
+
+    describe('#withLoop', function() {
+
+      it('should enable looping', function() {
+
+        let stub = Simple.stub().withLoop().returnWith('foo')
+
+        assert.equal(stub(), 'foo')
+        assert.equal(stub(), 'foo')
+
+      })
+
+    })
+
+  })
+
+  describe('restore()', function() {
+    let objA: any
+    let objB: any
+    let originalValue: string
+    let mockedValue: string
+
+    beforeEach(function() {
+      originalValue = 'a'
+      mockedValue = 'b'
+
+      objA = {
+        name: 'objA',
+        valueMock: originalValue
+      }
+
+      objB = {
+        name: 'objB',
+        valueMock: originalValue
+      }
+
+      Simple.mock(objA, 'valueMock', mockedValue)
+      Simple.mock(objB, 'valueMock', mockedValue)
+    })
+
+    afterEach(function() {
+      Simple.restore()
+    })
+
+    it('can restore all mocks', function() {
+      Simple.restore()
+      assert.equal(objA.valueMock, originalValue)
+      assert.equal(objB.valueMock, originalValue)
+    })
+
+    it('can restore double-mocked values', function() {
+      Simple.mock(objA, 'valueMock', 'ac')
+      Simple.mock(objB, 'valueMock', 'bc')
+      Simple.restore()
+      assert.equal(objA.valueMock, originalValue)
+      assert.equal(objB.valueMock, originalValue)
+    })
+
+    it('can restore a single mock', function() {
+      Simple.restore(objA, 'valueMock')
+      assert.equal(objA.valueMock, originalValue)
+      assert.equal(objB.valueMock, mockedValue)
+    })
   })
 
   describe('mock()', function() {
diff --git a/types/simple-oauth2/index.d.ts b/types/simple-oauth2/index.d.ts
index f5f7659b99..19a1ff2698 100644
--- a/types/simple-oauth2/index.d.ts
+++ b/types/simple-oauth2/index.d.ts
@@ -1,11 +1,10 @@
-// Type definitions for simple-oauth2 1.1
+// Type definitions for simple-oauth2 2.2
 // Project: https://github.com/lelylan/simple-oauth2
 // Definitions by: Michael Müller <https://github.com/mad-mike>,
 //                 Troy Lamerton <https://github.com/troy-lamerton>
+//                 Martín Rodriguez <https://github.com/netux>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
-
-import Bluebird = require("bluebird");
+// TypeScript Version: 2.9
 
 /** Creates a new simple-oauth2 client with the passed configuration */
 export function create(options: ModuleOptions): OAuthClient;
@@ -33,13 +32,21 @@ export interface ModuleOptions {
         /** String path to request an authorization code. Default to /oauth/authorize. */
         authorizePath?: string
     };
-    /** optional object used to set global options to the internal http library (request-js). */
+    /**
+     * Used to set global options to the internal http library (wreck).
+     * All options except baseUrl are allowed
+     * Defaults to header.Accept = "application/json"
+     */
     http?: {};
     options?: {
-        /** Whether or not the client.id/client.secret params are sent in the request body. Defaults to true. */
-        useBodyAuth?: boolean,
-        /** Whether or not the Basic Authorization header should be sent at the token request. */
-        useBasicAuthorizationHeader?: boolean
+        /** Format of data sent in the request body. Defaults to form. */
+        bodyFormat?: "json" | "form",
+        /**
+         * Indicates the method used to send the client.id/client.secret authorization params at the token request.
+         * If set to body, the bodyFormat option will be used to format the credentials.
+         * Defaults to header
+         */
+        authorizationMethod?: "header" | "body"
     };
 }
 
@@ -55,17 +62,19 @@ export interface AccessToken {
     /** Check if the access token is expired or not */
     expired(): boolean;
     /** Refresh the access token */
-    refresh(params: {}, callback: (error: any, result: AccessToken) => void): Bluebird<AccessToken>;
-    refresh(callback?: (error: any, result: AccessToken) => void): Bluebird<AccessToken>;
+    refresh(params?: {}): Promise<AccessToken>;
     /** Revoke access or refresh token */
-    revoke(tokenType: TokenType, callback?: (error: any) => void): Bluebird<void>;
+    revoke(tokenType: TokenType): Promise<void>;
+    /** Revoke both the existing access and refresh tokens */
+    revokeAll(): Promise<void>;
 }
 
 export type AuthorizationCode = string;
 export interface AuthorizationTokenConfig {
+    /** Authorization code (from previous step) */
     code: AuthorizationCode;
+    /** A string that represents the callback uri */
     redirect_uri: string;
-    scope?: string | string[];
 }
 
 export interface PasswordTokenConfig {
@@ -88,27 +97,32 @@ export interface OAuthClient {
          * Redirect the user to the autorization page
          * @return the absolute authorization url
          */
-        authorizeURL(params?: {
-            /** A string that represents the registered application URI where the user is redirected after authentication */
-            redirect_uri?: string,
-            /** A string or array of strings that represents the application privileges */
-            scope?: string | string[],
-            /** A string that represents an option opaque value used by the client to main the state between the request and the callback */
-            state?: string
-        }): string,
+        authorizeURL(
+            params?: {
+                /** A key-value pair where key is ModuleOptions#client.idParamName and the value represents the Client-ID */
+                [ idParamName: string ]: string | undefined
+            } & {
+                /** A string that represents the registered application URI where the user is redirected after authentication */
+                redirect_uri?: string,
+                /** A string or array of strings that represents the application privileges */
+                scope?: string | string[],
+                /** A string that represents an option opaque value used by the client to main the state between the request and the callback */
+                state?: string
+            }
+        ): string,
 
         /** Returns the Access Token object */
-        getToken(params: AuthorizationTokenConfig, callback?: (error: any, result: Token) => void): Bluebird<Token>;
+        getToken(params: AuthorizationTokenConfig): Promise<Token>;
     };
 
     ownerPassword: {
         /** Returns the Access Token Object */
-        getToken(params: PasswordTokenConfig, callback?: (error: any, result: Token) => void): Bluebird<Token>;
+        getToken(params: PasswordTokenConfig): Promise<Token>;
     };
 
     clientCredentials: {
         /** Returns the Access Token Object */
-        getToken(params: ClientCredentialTokenConfig, callback?: (error: any, result: Token) => void): Bluebird<Token>;
+        getToken(params: ClientCredentialTokenConfig): Promise<Token>;
     };
 
     accessToken: {
diff --git a/types/simple-oauth2/simple-oauth2-tests.ts b/types/simple-oauth2/simple-oauth2-tests.ts
index f83a616681..e066ad41c0 100644
--- a/types/simple-oauth2/simple-oauth2-tests.ts
+++ b/types/simple-oauth2/simple-oauth2-tests.ts
@@ -1,8 +1,11 @@
 // off https://github.com/lelylan/simple-oauth2/blob/master/README.md
 // slightly changed to remove external dependencies
 
+// Initialize the OAuth2 Library
+import * as oauth2lib from "simple-oauth2";
+
 // Set the configuration settings
-const credentials = {
+const credentials: oauth2lib.ModuleOptions = {
     client: {
         id: '<client-id>',
         secret: '<client-secret>'
@@ -12,13 +15,10 @@ const credentials = {
     }
 };
 
-// Initialize the OAuth2 Library
-// const oauth2 = require('simple-oauth2').create(credentials);
-import oauth2lib = require("simple-oauth2");
 const oauth2 = oauth2lib.create(credentials);
 
 // #Authorization Code flow
-(() => {
+(async () => {
     // Authorization oauth2 URI
     const authorizationUri = oauth2.authorizationCode.authorizeURL({
         redirect_uri: 'http://localhost:3000/callback',
@@ -36,57 +36,47 @@ const oauth2 = oauth2lib.create(credentials);
         scope: ['<scope1>', '<scope2>']
     };
 
-    // Callbacks
     // Save the access token
-    oauth2.authorizationCode.getToken(tokenConfig, (error, result) => {
-        if (error) {
-            console.log('Access Token Error', error.message);
-            return;
-        }
+    try {
+        const result = await oauth2.authorizationCode.getToken(tokenConfig);
+        const accessToken = oauth2.accessToken.create(result);
+    } catch (error) {
+        console.log('Access Token Error', error.message);
+    }
+})();
 
-        const token = oauth2.accessToken.create(result);
-    });
+// #Password Credentials Flow
+(async () => {
+    const tokenConfig = {
+        username: 'username',
+        password: 'password',
+        scope: [ '<scope1>', '<scope2>' ],
+    };
 
-    // Promises
     // Save the access token
-    oauth2.authorizationCode.getToken(tokenConfig)
-        .then((result) => {
-            const token = oauth2.accessToken.create(result);
-        })
-        .catch((error) => {
-            console.log('Access Token Error', error.message);
-        });
+    try {
+        const result = await oauth2.ownerPassword.getToken(tokenConfig);
+        const accessToken = oauth2.accessToken.create(result);
+    } catch (error) {
+        console.log('Access Token Error', error.message);
+    }
 })();
 
 // #Client Credentials Flow
-(() => {
+(async () => {
     const tokenConfig = {};
 
-    // Callbacks
     // Get the access token object for the client
-    oauth2.clientCredentials.getToken(tokenConfig, (error, result) => {
-        if (error) {
-            console.log('Access Token Error', error.message);
-            return;
-        }
-
-        const token = oauth2.accessToken.create(result);
-    });
-
-    // Promises
-    // Get the access token object for the client
-    oauth2.clientCredentials
-        .getToken(tokenConfig)
-        .then((result) => {
-            const token = oauth2.accessToken.create(result);
-        })
-        .catch((error) => {
-            console.log('Access Token error', error.message);
-        });
+    try {
+        const result = await oauth2.clientCredentials.getToken(tokenConfig);
+        const accessToken = oauth2.accessToken.create(result);
+    } catch (error) {
+        console.log('Access Token error', error.message);
+    }
 })();
 
 // #Access Token object
-(() => {
+(async () => {
     // Sample of a JSON access token (you got it through previous steps)
     const tokenObject = {
         access_token: '<access-token>',
@@ -95,62 +85,46 @@ const oauth2 = oauth2lib.create(credentials);
     };
 
     // Create the access token wrapper
-    let token = oauth2.accessToken.create(tokenObject);
+    let accessToken = oauth2.accessToken.create(tokenObject);
 
     // Check if the token is expired. If expired it is refreshed.
-    if (token.expired()) {
-        // Callbacks
-        token.refresh((error, result) => {
-            token = result;
-        });
-
-        // Promises
-        token.refresh()
-            .then((result) => {
-                token = result;
-            });
+    if (accessToken.expired()) {
+        try {
+            accessToken = await accessToken.refresh();
+        } catch (error) {
+            console.log('Error refreshing access token: ', error.message);
+        }
     }
 
-    // Callbacks
-    // Revoke only the access token
-    token.revoke('access_token', (error) => {
+    // Revoke both access and refresh tokens
+    try {
+        // Revoke only the access token
+        await accessToken.revoke('access_token');
+
         // Session ended. But the refresh_token is still valid.
+        // Revoke the refresh token
+        await accessToken.revoke('refresh_token');
 
-        // Revoke the refresh_token
-        token.revoke('refresh_token', (error) => {
-            console.log('token revoked.');
-        });
-    });
+        console.log('Token revoked');
+    } catch (error) {
+        console.log('Error revoking token: ', error.message);
+    }
 
-    // Promises
-    // Revoke only the access token
-    token.revoke('access_token')
-        .then(() => {
-            // Revoke the refresh token
-            return token.revoke('refresh_token');
-        })
-        .then(() => {
-            console.log('Token revoked');
-        })
-        .catch((error) => {
-            console.log('Error revoking token.', error.message);
-        });
+    // or...
+
+    try {
+        // Revokes both tokens, refresh token is only revoked if the access_token is properly revoked
+        await accessToken.revokeAll();
+    } catch (error) {
+        console.log('Error revoking token: ', error.message);
+    }
 })();
 
 // #Errors
 // not applicable, as those errors about missing authentication codes are already found by the typescript compiler
 
 // (function () {
-//     // Callbacks
-//     oauth2.authorizationCode.getToken({}, (error, token) => {
-//         if (error) {
-//             return console.log(error.message);
-//         }
-//     });
-
-//     // Promises
-//     oauth2.authorizationCode
-//         .getToken({})
+//     oauth2.authorizationCode.getToken({})
 //         .catch((error) => {
 //             console.log(error.message);
 //         });
diff --git a/types/simple-oauth2/v1/index.d.ts b/types/simple-oauth2/v1/index.d.ts
new file mode 100644
index 0000000000..30b1a72d98
--- /dev/null
+++ b/types/simple-oauth2/v1/index.d.ts
@@ -0,0 +1,133 @@
+// Type definitions for simple-oauth2 1.6
+// Project: https://github.com/lelylan/simple-oauth2
+// Definitions by: Michael Müller <https://github.com/mad-mike>,
+//                 Troy Lamerton <https://github.com/troy-lamerton>
+//                 Martín Rodriguez <https://github.com/netux>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+import Bluebird = require("bluebird");
+
+/** Creates a new simple-oauth2 client with the passed configuration */
+export function create(options: ModuleOptions): OAuthClient;
+
+export interface ModuleOptions {
+    client: {
+        /** Service registered client id. Required. */
+        id: string,
+        /** Service registered client secret. Required. */
+        secret: string,
+        /** Parameter name used to send the client secret. Default to client_secret. */
+        secretParamName?: string,
+        /** Parameter name used to send the client id. Default to client_id. */
+        idParamName?: string
+    };
+    auth: {
+        /** String used to set the host to request the tokens to. Required. */
+        tokenHost: string,
+        /** String path to request an access token. Default to /oauth/token. */
+        tokenPath?: string,
+        /** String path to revoke an access token. Default to /oauth/revoke. */
+        revokePath?: string,
+        /** String used to set the host to request an "authorization code". Default to the value set on auth.tokenHost. */
+        authorizeHost?: string,
+        /** String path to request an authorization code. Default to /oauth/authorize. */
+        authorizePath?: string
+    };
+    /**
+     * Used to set global options to the internal http library (wreck).
+     * All options except baseUrl are allowed
+     * Defaults to header.Accept = "application/json"
+     */
+    http?: {};
+    options?: {
+        /** Format of data sent in the request body. Defaults to form. */
+        bodyFormat?: "json" | "form",
+        /**
+         * Indicates the method used to send the client.id/client.secret authorization params at the token request.
+         * If set to body, the bodyFormat option will be used to format the credentials.
+         * Defaults to header.
+         */
+        authorizationMethod?: "header" | "body"
+    };
+}
+
+export type TokenType = "access_token" | "refresh_token";
+
+export interface Token {
+    [x: string]: any;
+}
+
+export interface AccessToken {
+    token: Token;
+
+    /** Check if the access token is expired or not */
+    expired(): boolean;
+    /** Refresh the access token */
+    refresh(params: {}, callback: (error: any, result: AccessToken) => void): Bluebird<AccessToken>;
+    refresh(callback?: (error: any, result: AccessToken) => void): Bluebird<AccessToken>;
+    /** Revoke access or refresh token */
+    revoke(tokenType: TokenType, callback?: (error: any) => void): Bluebird<void>;
+}
+
+export type AuthorizationCode = string;
+export interface AuthorizationTokenConfig {
+    /** Authorization code (from previous step) */
+    code: AuthorizationCode;
+    /** A string that represents the callback uri */
+    redirect_uri: string;
+}
+
+export interface PasswordTokenConfig {
+    /** A string that represents the registered username */
+    username: string;
+    /** A string that represents the registered password. */
+    password: string;
+    /** A string or array of strings that represents the application privileges */
+    scope: string | string[];
+}
+
+export interface ClientCredentialTokenConfig {
+    /** A string that represents the application privileges */
+    scope?: string | string[];
+}
+
+export interface OAuthClient {
+    authorizationCode: {
+        /**
+         * Redirect the user to the autorization page
+         * @return the absolute authorization url
+         */
+        authorizeURL(
+            params?: {
+                /** A key-value pair where key is ModuleOptions#client.idParamName and the value represents the Client-ID */
+                [ idParamName: string ]: string | undefined
+            } & {
+                /** A string that represents the registered application URI where the user is redirected after authentication */
+                redirect_uri?: string,
+                /** A string or array of strings that represents the application privileges */
+                scope?: string | string[],
+                /** A string that represents an option opaque value used by the client to main the state between the request and the callback */
+                state?: string
+            }
+        ): string,
+
+        /** Returns the Access Token object */
+        getToken(params: AuthorizationTokenConfig, callback?: (error: any, result: Token) => void): Bluebird<Token>;
+    };
+
+    ownerPassword: {
+        /** Returns the Access Token Object */
+        getToken(params: PasswordTokenConfig, callback?: (error: any, result: Token) => void): Bluebird<Token>;
+    };
+
+    clientCredentials: {
+        /** Returns the Access Token Object */
+        getToken(params: ClientCredentialTokenConfig, callback?: (error: any, result: Token) => void): Bluebird<Token>;
+    };
+
+    accessToken: {
+        /** Creates an OAuth2.AccessToken instance */
+        create(tokenToUse: Token): AccessToken;
+    };
+}
diff --git a/types/simple-oauth2/v1/simple-oauth2-tests.ts b/types/simple-oauth2/v1/simple-oauth2-tests.ts
new file mode 100644
index 0000000000..b3a8b2f952
--- /dev/null
+++ b/types/simple-oauth2/v1/simple-oauth2-tests.ts
@@ -0,0 +1,188 @@
+// off https://github.com/lelylan/simple-oauth2/blob/master/README.md
+// slightly changed to remove external dependencies
+
+// Initialize the OAuth2 Library
+import * as oauth2lib from "simple-oauth2";
+
+// Set the configuration settings
+const credentials: oauth2lib.ModuleOptions = {
+    client: {
+        id: '<client-id>',
+        secret: '<client-secret>'
+    },
+    auth: {
+        tokenHost: 'https://api.oauth.com'
+    }
+};
+
+const oauth2 = oauth2lib.create(credentials);
+
+// #Authorization Code flow
+(() => {
+    // Authorization oauth2 URI
+    const authorizationUri = oauth2.authorizationCode.authorizeURL({
+        redirect_uri: 'http://localhost:3000/callback',
+        scope: '<scope>',
+        state: '<state>'
+    });
+
+    // Redirect example using Express (see http://expressjs.com/api.html#res.redirect)
+    // res.redirect(authorizationUri);
+
+    // Get the access token object (the authorization code is given from the previous step).
+    const tokenConfig = {
+        code: '<code>',
+        redirect_uri: 'http://localhost:3000/callback',
+        scope: ['<scope1>', '<scope2>']
+    };
+
+    // Callbacks
+    // Save the access token
+    oauth2.authorizationCode.getToken(tokenConfig, (error, result) => {
+        if (error) {
+            console.log('Access Token Error', error.message);
+            return;
+        }
+
+        const token = oauth2.accessToken.create(result);
+    });
+
+    // Promises
+    // Save the access token
+    oauth2.authorizationCode.getToken(tokenConfig)
+        .then((result) => {
+            const token = oauth2.accessToken.create(result);
+        })
+        .catch((error) => {
+            console.log('Access Token Error', error.message);
+        });
+})();
+
+// #Password Credentials Flow
+(() => {
+    const tokenConfig = {
+        username: 'username',
+        password: 'password',
+        scope: [ '<scope1>', '<scope2>' ],
+    };
+
+    // Callbacks
+    // Save the access token
+    oauth2.ownerPassword.getToken(tokenConfig, (error, result) => {
+        if (error) {
+            console.log('Access Token Error', error.message);
+            return;
+        }
+
+        const token = oauth2.accessToken.create(result);
+    });
+
+    // Promises
+    // Save the access token
+    oauth2.ownerPassword.getToken(tokenConfig)
+        .then((result) => {
+            const token = oauth2.accessToken.create(result);
+        })
+        .catch((error) => {
+            console.log('Access Token Error', error.message);
+        });
+})();
+
+// #Client Credentials Flow
+(() => {
+    const tokenConfig = {};
+
+    // Callbacks
+    // Get the access token object for the client
+    oauth2.clientCredentials.getToken(tokenConfig, (error, result) => {
+        if (error) {
+            console.log('Access Token Error', error.message);
+            return;
+        }
+
+        const token = oauth2.accessToken.create(result);
+    });
+
+    // Promises
+    // Get the access token object for the client
+    oauth2.clientCredentials.getToken(tokenConfig)
+        .then((result) => {
+            const token = oauth2.accessToken.create(result);
+        })
+        .catch((error) => {
+            console.log('Access Token error', error.message);
+        });
+})();
+
+// #Access Token object
+(() => {
+    // Sample of a JSON access token (you got it through previous steps)
+    const tokenObject = {
+        access_token: '<access-token>',
+        refresh_token: '<refresh-token>',
+        expires_in: '7200'
+    };
+
+    // Create the access token wrapper
+    let accessToken = oauth2.accessToken.create(tokenObject);
+
+    // Check if the token is expired. If expired it is refreshed.
+    if (accessToken.expired()) {
+        // Callbacks
+        accessToken.refresh((error, result) => {
+            accessToken = result;
+        });
+
+        // Promises
+        accessToken.refresh()
+            .then((result) => {
+                accessToken = result;
+            });
+    }
+
+    // Callbacks
+    // Revoke only the access token
+    accessToken.revoke('access_token', (error) => {
+        // Session ended. But the refresh_token is still valid.
+
+        // Revoke the refresh_token
+        accessToken.revoke('refresh_token', (error) => {
+            console.log('token revoked.');
+        });
+    });
+
+    // Promises
+    // Revoke only the access token
+    accessToken.revoke('access_token')
+        .then(() => {
+            // Revoke the refresh token
+            return accessToken.revoke('refresh_token');
+        })
+        .then(() => {
+            console.log('Token revoked');
+        })
+        .catch((error) => {
+            console.log('Error revoking token.', error.message);
+        });
+})();
+
+// #Errors
+// not applicable, as those errors about missing authentication codes are already found by the typescript compiler
+
+// (function () {
+//     // Callbacks
+//     oauth2.authorizationCode.getToken({}, (error, token) => {
+//         if (error) {
+//             return console.log(error.message);
+//         }
+//     });
+
+//     // Promises
+//     oauth2.authorizationCode
+//         .getToken({})
+//         .catch((error) => {
+//             console.log(error.message);
+//         });
+
+//     // => { "status": "401", "message": "Unauthorized" }
+// })();
diff --git a/types/simple-oauth2/v1/tsconfig.json b/types/simple-oauth2/v1/tsconfig.json
new file mode 100644
index 0000000000..f19c003707
--- /dev/null
+++ b/types/simple-oauth2/v1/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "paths": {
+            "simple-oauth2": [
+                "simple-oauth2/v1"
+            ],
+            "simple-oauth2/*": [
+                "simple-oauth2/v1/*"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "simple-oauth2-tests.ts"
+    ]
+}
diff --git a/types/simple-oauth2/v1/tslint.json b/types/simple-oauth2/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/simple-oauth2/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/simple-peer/index.d.ts b/types/simple-peer/index.d.ts
index 6e41100b41..d8ee612827 100644
--- a/types/simple-peer/index.d.ts
+++ b/types/simple-peer/index.d.ts
@@ -61,6 +61,9 @@ declare namespace SimplePeer {
         // methods which are not documented
         readonly bufferSize: number;
         address(): { port: string, family: string, address: string, };
+
+        // used for debug logging
+        _debug(message?: any, ...optionalParams: any[]): void;
     }
 }
 
diff --git a/types/single-spa-react/index.d.ts b/types/single-spa-react/index.d.ts
new file mode 100644
index 0000000000..82656bfaf5
--- /dev/null
+++ b/types/single-spa-react/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for single-spa-react 2.8
+// Project: https://github.com/CanopyTax/single-spa-react
+// Definitions by: Garrett Smith <https://github.com/Garrett-Smith-iq>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+
+export = SingleSpaReact;
+declare function SingleSpaReact(opts: SingleSpaReact.Options): SingleSpaReact.Lifecycles;
+
+declare namespace SingleSpaReact {
+	interface Options {
+		React: typeof React;
+		ReactDOM: typeof ReactDOM;
+		rootComponent?: React.ComponentClass;
+		loadRootComponent?: () => Promise<React.ComponentClass>;
+		domElementGetter?: () => Element;
+		suppressComponentDidCatchWarning?: boolean;
+		parcelCanUpdate?: boolean;
+	}
+
+	interface Lifecycles {
+		bootstrap: (opts: Options, props: any) => Promise<void>;
+		mount: (opts: Options, props: any) => Promise<void>;
+		unmount: (opts: Options, props: any) => Promise<void>;
+	}
+}
diff --git a/types/single-spa-react/single-spa-react-tests.ts b/types/single-spa-react/single-spa-react-tests.ts
new file mode 100644
index 0000000000..7efed91489
--- /dev/null
+++ b/types/single-spa-react/single-spa-react-tests.ts
@@ -0,0 +1,10 @@
+import singleSpaReact = require('single-spa-react');
+import { Lifecycles } from 'single-spa-react';
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+
+// $ExpectType Lifecycles
+singleSpaReact({
+	React,
+	ReactDOM,
+});
diff --git a/types/single-spa-react/tsconfig.json b/types/single-spa-react/tsconfig.json
new file mode 100644
index 0000000000..3ccb45cf0c
--- /dev/null
+++ b/types/single-spa-react/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",
+        "single-spa-react-tests.ts"
+    ]
+}
diff --git a/types/single-spa-react/tslint.json b/types/single-spa-react/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/single-spa-react/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/sinon/index.d.ts b/types/sinon/index.d.ts
index 2922b5a2c7..c882b0a9f8 100644
--- a/types/sinon/index.d.ts
+++ b/types/sinon/index.d.ts
@@ -18,170 +18,685 @@ interface Document { } // tslint:disable-line no-empty-interface
 declare namespace Sinon {
     interface SinonSpyCallApi {
         // Properties
+        /**
+         * Array of received arguments.
+         */
         args: any[];
 
         // Methods
+        /**
+         * Returns true if the spy was called at least once with @param obj as this.
+         * calledOn also accepts a matcher spyCall.calledOn(sinon.match(fn)) (see matchers).
+         * @param obj
+         */
         calledOn(obj: any): boolean;
+        /**
+         * Returns true if spy was called at least once with the provided arguments.
+         * Can be used for partial matching, Sinon only checks the provided arguments against actual arguments,
+         * so a call that received the provided arguments (in the same spots) and possibly others as well will return true.
+         * @param args
+         */
         calledWith(...args: any[]): boolean;
+        /**
+         * Returns true if spy was called at least once with the provided arguments and no others.
+         */
         calledWithExactly(...args: any[]): boolean;
+        /**
+         * Returns true if spy/stub was called the new operator.
+         * Beware that this is inferred based on the value of the this object and the spy function’s prototype,
+         * so it may give false positives if you actively return the right kind of object.
+         */
         calledWithNew(): boolean;
+        /**
+         * Returns true if spy was called at exactly once with the provided arguments.
+         * @param args
+         */
         calledOnceWith(...args: any[]): boolean;
         calledOnceWithExactly(...args: any[]): boolean;
+        /**
+         * Returns true if spy was called with matching arguments (and possibly others).
+         * This behaves the same as spy.calledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
         calledWithMatch(...args: any[]): boolean;
+        /**
+         * Returns true if call did not receive provided arguments.
+         * @param args
+         */
         notCalledWith(...args: any[]): boolean;
+        /**
+         * Returns true if call did not receive matching arguments.
+         * This behaves the same as spyCall.notCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
         notCalledWithMatch(...args: any[]): boolean;
+        /**
+         * Returns true if spy returned the provided value at least once.
+         * Uses deep comparison for objects and arrays. Use spy.returned(sinon.match.same(obj)) for strict comparison (see matchers).
+         * @param value
+         */
         returned(value: any): boolean;
+        /**
+         * Returns true if spy threw an exception at least once.
+         */
         threw(): boolean;
+        /**
+         * Returns true if spy threw an exception of the provided type at least once.
+         */
         threw(type: string): boolean;
+        /**
+         * Returns true if spy threw the provided exception object at least once.
+         */
         threw(obj: any): boolean;
+        /**
+         * Like yield, but with an explicit argument number specifying which callback to call.
+         * Useful if a function is called with more than one callback, and simply calling the first callback is not desired.
+         * @param pos
+         */
         callArg(pos: number): void;
         callArgOn(pos: number, obj: any, ...args: any[]): void;
+        /**
+         * Like callArg, but with arguments.
+         */
         callArgWith(pos: number, ...args: any[]): void;
         callArgOnWith(pos: number, obj: any, ...args: any[]): void;
+        /**
+         * Invoke callbacks passed to the stub with the given arguments.
+         * If the stub was never called with a function argument, yield throws an error.
+         * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
+         * Also aliased as invokeCallback.
+         */
         yield(...args: any[]): void;
         yieldOn(obj: any, ...args: any[]): void;
+        /**
+         * Invokes callbacks passed as a property of an object to the stub.
+         * Like yield, yieldTo grabs the first matching argument, finds the callback and calls it with the (optional) arguments.
+         */
         yieldTo(property: string, ...args: any[]): void;
         yieldToOn(property: string, obj: any, ...args: any[]): void;
     }
 
     interface SinonSpyCall extends SinonSpyCallApi {
+        /**
+         * The call’s this value.
+         */
         thisValue: any;
+        /**
+         * Exception thrown, if any.
+         */
         exception: any;
+        /**
+         * Return value.
+         */
         returnValue: any;
+        /**
+         * This property is a convenience for a call’s callback.
+         * When the last argument in a call is a Function, then callback will reference that. Otherwise it will be undefined.
+         */
         callback: Function | undefined;
+        /**
+         * This property is a convenience for the last argument of the call.
+         */
         lastArg: any;
 
+        /**
+         * Returns true if the spy call occurred before another spy call.
+         * @param call
+         */
         calledBefore(call: SinonSpyCall): boolean;
+        /**
+         * Returns true if the spy call occurred after another spy call.
+         * @param call
+         */
         calledAfter(call: SinonSpyCall): boolean;
     }
 
     interface SinonSpy extends SinonSpyCallApi {
         // Properties
+        /**
+         * The number of recorded calls.
+         */
         callCount: number;
+        /**
+         * true if the spy was called at least once
+         */
         called: boolean;
+        /**
+         * true if the spy was not called
+         */
         notCalled: boolean;
+        /**
+         * true if spy was called exactly once
+         */
         calledOnce: boolean;
+        /**
+         * true if the spy was called exactly twice
+         */
         calledTwice: boolean;
+        /**
+         * true if the spy was called exactly thrice
+         */
         calledThrice: boolean;
+        /**
+         * The first call
+         */
         firstCall: SinonSpyCall;
+        /**
+         * The second call
+         */
         secondCall: SinonSpyCall;
+        /**
+         * The third call
+         */
         thirdCall: SinonSpyCall;
+        /**
+         * The last call
+         */
         lastCall: SinonSpyCall;
+        /**
+         * Array of this objects, spy.thisValues[0] is the this object for the first call.
+         */
         thisValues: any[];
+        /**
+         * Array of arguments received, spy.args[0] is an array of arguments received in the first call.
+         */
         args: any[][];
+        /**
+         * Array of exception objects thrown, spy.exceptions[0] is the exception thrown by the first call.
+         * If the call did not throw an error, the value at the call’s location in .exceptions will be undefined.
+         */
         exceptions: any[];
+        /**
+         * Array of return values, spy.returnValues[0] is the return value of the first call.
+         * If the call did not explicitly return a value, the value at the call’s location in .returnValues will be undefined.
+         */
         returnValues: any[];
 
         // Methods
         (...args: any[]): any;
+        /**
+         * Returns true if the spy was called before @param anotherSpy
+         * @param anotherSpy
+         */
         calledBefore(anotherSpy: SinonSpy): boolean;
+        /**
+         * Returns true if the spy was called after @param anotherSpy
+         * @param anotherSpy
+         */
         calledAfter(anotherSpy: SinonSpy): boolean;
+        /**
+         * Returns true if spy was called before @param anotherSpy, and no spy calls occurred between spy and @param anotherSpy.
+         * @param anotherSpy
+         */
         calledImmediatelyBefore(anotherSpy: SinonSpy): boolean;
+        /**
+         * Returns true if spy was called after @param anotherSpy, and no spy calls occurred between @param anotherSpy and spy.
+         * @param anotherSpy
+         */
         calledImmediatelyAfter(anotherSpy: SinonSpy): boolean;
+        /**
+         * Creates a spy that only records calls when the received arguments match those passed to withArgs.
+         * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
+         * @param args Expected args
+         */
         withArgs(...args: any[]): SinonSpy;
+        /**
+         * Returns true if the spy was always called with @param obj as this.
+         * @param obj
+         */
         alwaysCalledOn(obj: any): boolean;
+        /**
+         * Returns true if spy was always called with the provided arguments (and possibly others).
+         */
         alwaysCalledWith(...args: any[]): boolean;
+        /**
+         * Returns true if spy was always called with the exact provided arguments.
+         * @param args
+         */
         alwaysCalledWithExactly(...args: any[]): boolean;
+        /**
+         * Returns true if spy was always called with matching arguments (and possibly others).
+         * This behaves the same as spy.alwaysCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
         alwaysCalledWithMatch(...args: any[]): boolean;
+        /**
+         * Returns true if the spy/stub was never called with the provided arguments.
+         * @param args
+         */
         neverCalledWith(...args: any[]): boolean;
+        /**
+         * Returns true if the spy/stub was never called with matching arguments.
+         * This behaves the same as spy.neverCalledWith(sinon.match(arg1), sinon.match(arg2), ...).
+         * @param args
+         */
         neverCalledWithMatch(...args: any[]): boolean;
+        /**
+         * Returns true if spy always threw an exception.
+         */
         alwaysThrew(): boolean;
+        /**
+         * Returns true if spy always threw an exception of the provided type.
+         */
         alwaysThrew(type: string): boolean;
+        /**
+         * Returns true if spy always threw the provided exception object.
+         */
         alwaysThrew(obj: any): boolean;
+        /**
+         * Returns true if spy always returned the provided value.
+         * @param obj
+         */
         alwaysReturned(obj: any): boolean;
+        /**
+         * Invoke callbacks passed to the stub with the given arguments.
+         * If the stub was never called with a function argument, yield throws an error.
+         * Returns an Array with all callbacks return values in the order they were called, if no error is thrown.
+         */
         invokeCallback(...args: any[]): void;
+        /**
+         * Returns the nth call.
+         * Accessing individual calls helps with more detailed behavior verification when the spy is called more than once.
+         * @param n
+         */
         getCall(n: number): SinonSpyCall;
+        /**
+         * Returns an Array of all calls recorded by the spy.
+         */
         getCalls(): SinonSpyCall[];
+        /**
+         * Resets the state of a spy.
+         */
         resetHistory(): void;
+        /**
+         * Returns the passed format string with the following replacements performed:
+         * * %n - the name of the spy "spy" by default)
+         * * %c - the number of times the spy was called, in words ("once", "twice", etc.)
+         * * %C - a list of string representations of the calls to the spy, with each call prefixed by a newline and four spaces
+         * * %t - a comma-delimited list of this values the spy was called on
+         * * %n - the formatted value of the nth argument passed to printf
+         * * %* - a comma-delimited list of the (non-format string) arguments passed to printf
+         * * %D - a multi-line list of the arguments received by all calls to the spy
+         * @param format
+         * @param args
+         */
         printf(format: string, ...args: any[]): string;
+        /**
+         * Replaces the spy with the original method. Only available if the spy replaced an existing method.
+         */
         restore(): void;
     }
 
     interface SinonSpyStatic {
+        /**
+         * Creates an anonymous function that records arguments, this value, exceptions and return values for all calls.
+         */
         (): SinonSpy;
+        /**
+         * Spies on the provided function
+         */
         (func: Function): SinonSpy;
+        /**
+         * Creates a spy for object.method and replaces the original method with the spy.
+         * An exception is thrown if the property is not already a function.
+         * The spy acts exactly like the original method in all cases.
+         * The original method can be restored by calling object.method.restore().
+         * The returned spy is the function object which replaced the original method. spy === object.method.
+         */
         <T>(obj: T, method: keyof T): SinonSpy;
     }
 
     interface SinonStub extends SinonSpy {
+        /**
+         * Resets the stub’s behaviour to the default behaviour
+         * You can reset behaviour of all stubs using sinon.resetBehavior()
+         */
         resetBehavior(): void;
+        /**
+         * Resets both behaviour and history of the stub.
+         * This is equivalent to calling both stub.resetBehavior() and stub.resetHistory()
+         * Updated in sinon@2.0.0
+         * Since sinon@5.0.0
+         * As a convenience, you can apply stub.reset() to all stubs using sinon.reset()
+         */
         reset(): void;
+        /**
+         * Causes the stub to return promises using a specific Promise library instead of the global one when using stub.rejects or stub.resolves.
+         * Returns the stub to allow chaining.
+         */
         usingPromise(promiseLibrary: any): SinonStub;
 
+        /**
+         * Makes the stub return the provided @param obj value.
+         * @param obj
+         */
         returns(obj: any): SinonStub;
+        /**
+         * Causes the stub to return the argument at the provided @param index.
+         * stub.returnsArg(0); causes the stub to return the first argument.
+         * If the argument at the provided index is not available, prior to sinon@6.1.2, an undefined value will be returned;
+         * starting from sinon@6.1.2, a TypeError will be thrown.
+         * @param index
+         */
         returnsArg(index: number): SinonStub;
+        /**
+         * Causes the stub to return its this value.
+         * Useful for stubbing jQuery-style fluent APIs.
+         */
         returnsThis(): SinonStub;
+        /**
+         * Causes the stub to return a Promise which resolves to the provided value.
+         * When constructing the Promise, sinon uses the Promise.resolve method.
+         * You are responsible for providing a polyfill in environments which do not provide Promise.
+         * The Promise library can be overwritten using the usingPromise method.
+         * Since sinon@2.0.0
+         */
         resolves(value?: any): SinonStub;
+        /**
+         * Causes the stub to throw an exception (Error).
+         * @param type
+         */
         throws(type?: string): SinonStub;
+        /**
+         * Causes the stub to throw the provided exception object.
+         */
         throws(obj: any): SinonStub;
+        /**
+         * Causes the stub to throw the argument at the provided index.
+         * stub.throwsArg(0); causes the stub to throw the first argument as the exception.
+         * If the argument at the provided index is not available, a TypeError will be thrown.
+         * Since sinon@2.3.0
+         * @param index
+         */
         throwsArg(index: number): SinonStub;
         throwsException(type?: string): SinonStub;
         throwsException(obj: any): SinonStub;
+        /**
+         * Causes the stub to return a Promise which rejects with an exception (Error).
+         * When constructing the Promise, sinon uses the Promise.reject method.
+         * You are responsible for providing a polyfill in environments which do not provide Promise.
+         * The Promise library can be overwritten using the usingPromise method.
+         * Since sinon@2.0.0
+         */
         rejects(): SinonStub;
+        /**
+         * Causes the stub to return a Promise which rejects with an exception of the provided type.
+         * Since sinon@2.0.0
+         */
         rejects(errorType: string): SinonStub;
+        /**
+         * Causes the stub to return a Promise which rejects with the provided exception object.
+         * Since sinon@2.0.0
+         */
         rejects(value: any): SinonStub;
+        /**
+         * Causes the stub to call the argument at the provided index as a callback function.
+         * stub.callsArg(0); causes the stub to call the first argument as a callback.
+         * If the argument at the provided index is not available or is not a function, a TypeError will be thrown.
+         */
         callsArg(index: number): SinonStub;
+        /**
+         * Causes the original method wrapped into the stub to be called when none of the conditional stubs are matched.
+         */
         callThrough(): SinonStub;
+        /**
+         * Like stub.callsArg(index); but with an additional parameter to pass the this context.
+         * @param index
+         * @param context
+         */
         callsArgOn(index: number, context: any): SinonStub;
+        /**
+         * Like callsArg, but with arguments to pass to the callback.
+         * @param index
+         * @param args
+         */
         callsArgWith(index: number, ...args: any[]): SinonStub;
+        /**
+         * Like above but with an additional parameter to pass the this context.
+         * @param index
+         * @param context
+         * @param args
+         */
         callsArgOnWith(index: number, context: any, ...args: any[]): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param index
+         */
         callsArgAsync(index: number): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param index
+         * @param context
+         */
         callsArgOnAsync(index: number, context: any): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         */
         callsArgWithAsync(index: number, ...args: any[]): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         */
         callsArgOnWithAsync(index: number, context: any, ...args: any[]): SinonStub;
+        /**
+         * Makes the stub call the provided @param func when invoked.
+         * @param func
+         */
         callsFake(func: (...args: any[]) => any): SinonStub;
+        /**
+         * Replaces a new getter for this stub.
+         */
         get(func: () => any): SinonStub;
+        /**
+         * Defines a new setter for this stub.
+         * @param func
+         */
         set(func: (v: any) => void): SinonStub;
+        /**
+         * Defines the behavior of the stub on the @param n call. Useful for testing sequential interactions.
+         * There are methods onFirstCall, onSecondCall,onThirdCall to make stub definitions read more naturally.
+         * onCall can be combined with all of the behavior defining methods in this section. In particular, it can be used together with withArgs.
+         * @param n
+         */
         onCall(n: number): SinonStub;
+        /**
+         * Alias for stub.onCall(0);
+         */
         onFirstCall(): SinonStub;
+        /**
+         * Alias for stub.onCall(1);
+         */
         onSecondCall(): SinonStub;
+        /**
+         * Alias for stub.onCall(2);
+         */
         onThirdCall(): SinonStub;
+        /**
+         * Defines a new value for this stub.
+         * @param val
+         */
         value(val: any): SinonStub;
+        /**
+         * Similar to callsArg.
+         * Causes the stub to call the first callback it receives with the provided arguments (if any).
+         * If a method accepts more than one callback, you need to use callsArg to have the stub invoke other callbacks than the first one.
+         */
         yields(...args: any[]): SinonStub;
+        /**
+         * Like above but with an additional parameter to pass the this context.
+         */
         yieldsOn(context: any, ...args: any[]): SinonStub;
         yieldsRight(...args: any[]): SinonStub;
+        /**
+         * Causes the spy to invoke a callback passed as a property of an object to the spy.
+         * Like yields, yieldsTo grabs the first matching argument, finds the callback and calls it with the (optional) arguments.
+         * @param property
+         * @param args
+         */
         yieldsTo(property: string, ...args: any[]): SinonStub;
+        /**
+         * Like above but with an additional parameter to pass the this context.
+         */
         yieldsToOn(property: string, context: any, ...args: any[]): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param args
+         */
         yieldsAsync(...args: any[]): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param context
+         * @param args
+         */
         yieldsOnAsync(context: any, ...args: any[]): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param property
+         * @param args
+         */
         yieldsToAsync(property: string, ...args: any[]): SinonStub;
+        /**
+         * Same as their corresponding non-Async counterparts, but with callback being deferred at called after all instructions in the current call stack are processed.
+         * In Node environment the callback is deferred with process.nextTick.
+         * In a browser the callback is deferred with setTimeout(callback, 0).
+         * @param property
+         * @param context
+         * @param args
+         */
         yieldsToOnAsync(property: string, context: any, ...args: any[]): SinonStub;
+        /**
+         * Stubs the method only for the provided arguments.
+         * This is useful to be more expressive in your assertions, where you can access the spy with the same call.
+         * It is also useful to create a stub that can act differently in response to different arguments.
+         * @param args
+         */
         withArgs(...args: any[]): SinonStub;
     }
 
     interface SinonStubStatic {
+        /**
+         * Creates an anonymous stub function
+         */
         (): SinonStub;
+        /**
+         * Stubs all the object’s methods.
+         * Note that it’s usually better practice to stub individual methods, particularly on objects that you don’t understand or control all the methods for (e.g. library dependencies).
+         * Stubbing individual methods tests intent more precisely and is less susceptible to unexpected behavior as the object’s code evolves.
+         * If you want to create a stub object of MyConstructor, but don’t want the constructor to be invoked, use this utility function.
+         */
         <T>(obj: T): SinonStubbedInstance<T>;
+        /**
+         * Replaces obj.method with a stub function.
+         * An exception is thrown if the property is not already a function.
+         * The original function can be restored by calling object.method.restore(); (or stub.restore();).
+         */
         <T>(obj: T, method: keyof T): SinonStub;
     }
 
     interface SinonExpectation extends SinonStub {
+        /**
+         * Specify the minimum amount of calls expected.
+         */
         atLeast(n: number): SinonExpectation;
+        /**
+         * Specify the maximum amount of calls expected.
+         * @param n
+         */
         atMost(n: number): SinonExpectation;
+        /**
+         * Expect the method to never be called.
+         */
         never(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly once.
+         */
         once(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly twice.
+         */
         twice(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly thrice.
+         */
         thrice(): SinonExpectation;
+        /**
+         * Expect the method to be called exactly @param n times.
+         */
         exactly(n: number): SinonExpectation;
+        /**
+         * Expect the method to be called with the provided arguments and possibly others.
+         * An expectation instance only holds onto a single set of arguments specified with withArgs.
+         * Subsequent calls will overwrite the previously-specified set of arguments (even if they are different),
+         * so it is generally not intended that this method be invoked more than once per test case.
+         * @param args
+         */
         withArgs(...args: any[]): SinonExpectation;
+        /**
+         * Expect the method to be called with the provided arguments and no others.
+         * An expectation instance only holds onto a single set of arguments specified with withExactArgs.
+         * Subsequent calls will overwrite the previously-specified set of arguments (even if they are different),
+         * so it is generally not intended that this method be invoked more than once per test case.
+         * @param args
+         */
         withExactArgs(...args: any[]): SinonExpectation;
         on(obj: any): SinonExpectation;
+        /**
+         * Verifies all expectations on the mock.
+         * If any expectation is not satisfied, an exception is thrown.
+         * Also restores the mocked methods.
+         */
         verify(): SinonExpectation;
+        /**
+         * Restores all mocked methods.
+         */
         restore(): void;
     }
 
     interface SinonExpectationStatic {
+        /**
+         * Creates an expectation without a mock object, basically an anonymous mock function.
+         * Method name is optional and is used in exception messages to make them more readable.
+         * @param methodName
+         */
         create(methodName?: string): SinonExpectation;
     }
 
     interface SinonMock {
+        /**
+         * Overrides obj.method with a mock function and returns it.
+         */
         expects(method: string): SinonExpectation;
+        /**
+         * Restores all mocked methods.
+         */
         restore(): void;
+        /**
+         * Verifies all expectations on the mock.
+         * If any expectation is not satisfied, an exception is thrown.
+         * Also restores the mocked methods.
+         */
         verify(): void;
     }
 
     interface SinonMockStatic {
         (): SinonExpectation;
+        /**
+         * Creates a mock for the provided object.
+         * Does not change the object, but returns a mock object to set expectations on the object’s methods.
+         */
         (obj: any): SinonMock;
     }
 
@@ -200,8 +715,23 @@ declare namespace Sinon {
         cancelAnimationFrame(id: number): void;
         nextTick(callback: () => void): void;
 
+        /**
+         * Tick the clock ahead time milliseconds.
+         * Causes all timers scheduled within the affected time range to be called.
+         * time may be the number of milliseconds to advance the clock by or a human-readable string.
+         * Valid string formats are “08” for eight seconds, “01:00” for one minute and “02:34:10” for two hours, 34 minutes and ten seconds.
+         * time may be negative, which causes the clock to change but won’t fire any callbacks.
+         * @param ms
+         */
         tick(ms: number | string): void;
+        /**
+         * Advances the clock to the the moment of the first scheduled timer, firing it.
+         */
         next(): void;
+        /**
+         * This runs all pending timers until there are none remaining. If new timers are added while it is executing they will be run as well.
+         * This makes it easier to run asynchronous tests to completion without worrying about the number of timers they use, or the delays in those timers.
+         */
         runAll(): void;
         runToLast(): void;
         reset(): void;
@@ -217,6 +747,10 @@ declare namespace Sinon {
         Date(year: number, month: number, day: number, hour: number, minute: number, second: number): Date;
         Date(year: number, month: number, day: number, hour: number, minute: number, second: number, ms: number): Date;
 
+        /**
+         * Restore the faked methods.
+         * Call in e.g. tearDown.
+         */
         restore(): void;
         uninstall(): void;
 
@@ -255,67 +789,236 @@ declare namespace Sinon {
 
     interface SinonFakeXMLHttpRequest {
         // Properties
+        /**
+         * The URL set on the request object.
+         */
         url: string;
+        /**
+         * The request method as a string.
+         */
         method: string;
+        /**
+         * An object of all request headers, i.e.:
+         */
         requestHeaders: any;
+        /**
+         * The request body
+         */
         requestBody: string;
+        /**
+         * The request’s status code.
+         * undefined if the request has not been handled (see respond below)
+         */
         status: number;
+        /**
+         * Only populated if the respond method is called (see below).
+         */
         statusText: string;
+        /**
+         * Whether or not the request is asynchronous.
+         */
         async: boolean;
+        /**
+         * Username, if any.
+         */
         username: string;
+        /**
+         * Password, if any.
+         */
         password: string;
         withCredentials: boolean;
         upload: SinonFakeUploadProgress;
+        /**
+         * When using respond, this property is populated with a parsed document if response headers indicate as much (see the spec)
+         */
         responseXML: Document;
+        /**
+         * The value of the given response header, if the request has been responded to (see respond).
+         * @param header
+         */
         getResponseHeader(header: string): string;
+        /**
+         * All response headers as an object.
+         */
         getAllResponseHeaders(): any;
 
         // Methods
+        /**
+         * Sets response headers (e.g. { "Content-Type": "text/html", ... }, updates the readyState property and fires onreadystatechange.
+         * @param headers
+         */
         setResponseHeaders(headers: any): void;
+        /**
+         * Sets the respond body, updates the readyState property and fires onreadystatechange.
+         * Additionally, populates responseXML with a parsed document if response headers indicate as much.
+         */
         setResponseBody(body: string): void;
+        /**
+         * Calls the above three methods.
+         */
         respond(status: number, headers: any, body: string): void;
         autoRespond(ms: number): void;
+        /**
+         * Simulates a network error on the request. The onerror handler will be called and the status will be 0.
+         */
         error(): void;
         onerror(): void;
     }
 
     interface SinonFakeXMLHttpRequestStatic {
         new(): SinonFakeXMLHttpRequest;
+        /**
+         * Default false.
+         * When set to true, Sinon will check added filters if certain requests should be “unfaked”
+         */
         useFilters: boolean;
+        /**
+         * Add a filter that will decide whether or not to fake a request.
+         * The filter will be called when xhr.open is called, with the exact same arguments (method, url, async, username, password).
+         * If the filter returns true, the request will not be faked.
+         * @param filter
+         */
         addFilter(filter: (method: string, url: string, async: boolean, username: string, password: string) => boolean): void;
+        /**
+         * By assigning a function to the onCreate property of the returned object from useFakeXMLHttpRequest()
+         * you can subscribe to newly created FakeXMLHttpRequest objects. See below for the fake xhr object API.
+         * Using this observer means you can still reach objects created by e.g. jQuery.ajax (or other abstractions/frameworks).
+         * @param xhr
+         */
         onCreate(xhr: SinonFakeXMLHttpRequest): void;
+        /**
+         * Restore original function(s).
+         */
         restore(): void;
     }
 
     interface SinonFakeServer extends SinonFakeServerOptions {
         // Properties
+        /**
+         * Used internally to determine the HTTP method used with the provided request.
+         * By default this method simply returns request.method.
+         * When server.fakeHTTPMethods is true, the method will return the value of the _method parameter if the method is “POST”.
+         * This method can be overridden to provide custom behavior.
+         * @param request
+         */
         getHTTPMethod(request: SinonFakeXMLHttpRequest): string;
+        /**
+         * You can inspect the server.requests to verify request ordering, find unmatched requests or check that no requests has been done.
+         * server.requests is an array of all the FakeXMLHttpRequest objects that have been created.
+         */
         requests: SinonFakeXMLHttpRequest[];
 
         // Methods
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * A String representing the response body
+         * An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+         * A Function.
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param body A String representing the response body
+         */
         respondWith(body: string): void;
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param response An Array with status, headers and response body, e.g. [200, { "Content-Type": "text/html", "Content-Length": 2 }, "OK"]
+         */
         respondWith(response: any[]): void;
+        /**
+         * Causes the server to respond to any request not matched by another response with the provided data. The default catch-all response is [404, {}, ""].
+         * Default status is 200 and default headers are none.
+         * When the response is a Function, it will be passed the request object. You must manually call respond on it to complete the request.
+         * @param fn A Function.
+         */
         respondWith(fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
         respondWith(url: string, body: string): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
         respondWith(url: string, response: any[]): void;
+        /**
+         * Responds to all requests to given URL, e.g. /posts/1.
+         */
         respondWith(url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
         respondWith(method: string, url: string, body: string): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
         respondWith(method: string, url: string, response: any[]): void;
+        /**
+         * Responds to all method requests to the given URL with the given response.
+         * method is an HTTP verb.
+         */
         respondWith(method: string, url: string, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
         respondWith(url: RegExp, body: string): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
         respondWith(url: RegExp, response: any[]): void;
+        /**
+         * URL may be a regular expression, e.g. /\\/post\\//\\d+
+         * If the response is a Function, it will be passed any capture groups from the regular expression along with the XMLHttpRequest object:
+         */
         respondWith(url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
         respondWith(method: string, url: RegExp, body: string): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
         respondWith(method: string, url: RegExp, response: any[]): void;
+        /**
+         * Responds to all method requests to URLs matching the regular expression.
+         */
         respondWith(method: string, url: RegExp, fn: (xhr: SinonFakeXMLHttpRequest) => void): void;
+        /**
+         * Causes all queued asynchronous requests to receive a response.
+         * If none of the responses added through respondWith match, the default response is [404, {}, ""].
+         * Synchronous requests are responded to immediately, so make sure to call respondWith upfront.
+         * If called with arguments, respondWith will be called with those arguments before responding to requests.
+         */
         respond(): void;
         restore(): void;
     }
 
     interface SinonFakeServerOptions {
+        /**
+         * When set to true, causes the server to automatically respond to incoming requests after a timeout.
+         * The default timeout is 10ms but you can control it through the autoRespondAfter property.
+         * Note that this feature is intended to help during mockup development, and is not suitable for use in tests.
+         */
         autoRespond: boolean;
+        /**
+         * When autoRespond is true, respond to requests after this number of milliseconds. Default is 10.
+         */
         autoRespondAfter: number;
+        /**
+         * If set to true, server will find _method parameter in POST body and recognize that as the actual method.
+         * Supports a pattern common to Ruby on Rails applications. For custom HTTP method faking, override server.getHTTPMethod(request).
+         */
         fakeHTTPMethods: boolean;
+        /**
+         * If set, the server will respond to every request immediately and synchronously.
+         * This is ideal for faking the server from within a test without having to call server.respond() after each request made in that test.
+         * As this is synchronous and immediate, this is not suitable for simulating actual network latency in tests or mockups.
+         * To simulate network latency with automatic responses, see server.autoRespond and server.autoRespondAfter.
+         */
         respondImmediately: boolean;
     }
 
@@ -330,41 +1033,173 @@ declare namespace Sinon {
 
     interface SinonAssert {
         // Properties
+        /**
+         * Defaults to AssertError.
+         */
         failException: string;
+        /**
+         * Every assertion fails by calling this method.
+         * By default it throws an error of type sinon.assert.failException.
+         * If the test framework looks for assertion errors by checking for a specific exception, you can simply override the kind of exception thrown.
+         * If that does not fit with your testing framework of choice, override the fail method to do the right thing.
+         */
         fail(message?: string): void; // Overridable
+        /**
+         * Called every time assertion passes.
+         * Default implementation does nothing.
+         */
         pass(assertion: any): void; // Overridable
 
         // Methods
+        /**
+         * Passes if spy was never called
+         * @param spy
+         */
         notCalled(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called at least once.
+         */
         called(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called once and only once.
+         */
         calledOnce(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called exactly twice.
+         */
         calledTwice(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called exactly three times.
+         */
         calledThrice(spy: SinonSpy): void;
+        /**
+         * Passes if spy was called exactly num times.
+         */
         callCount(spy: SinonSpy, count: number): void;
+        /**
+         * Passes if provided spies were called in the specified order.
+         * @param spies
+         */
         callOrder(...spies: SinonSpy[]): void;
+        /**
+         * Passes if spy was ever called with obj as its this value.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledOn(spy.firstCall, arg1, arg2, ...);.
+         */
         calledOn(spyOrSpyCall: SinonSpy | SinonSpyCall, obj: any): void;
+        /**
+         * Passes if spy was always called with obj as its this value.
+         */
         alwaysCalledOn(spy: SinonSpy, obj: any): void;
+        /**
+         * Passes if spy was called with the provided arguments.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWith(spy.firstCall, arg1, arg2, ...);.
+         * @param spyOrSpyCall
+         * @param args
+         */
         calledWith(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        /**
+         * Passes if spy was always called with the provided arguments.
+         * @param spy
+         * @param args
+         */
         alwaysCalledWith(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was never called with the provided arguments.
+         * @param spy
+         * @param args
+         */
         neverCalledWith(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was called with the provided arguments and no others.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithExactly(spy.getCall(1), arg1, arg2, ...);.
+         * @param spyOrSpyCall
+         * @param args
+         */
         calledWithExactly(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        /**
+         * Passes if spy was always called with the provided arguments and no others.
+         */
         alwaysCalledWithExactly(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was called with matching arguments.
+         * This behaves the same way as sinon.assert.calledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithMatch(spy.secondCall, arg1, arg2, ...);.
+         */
         calledWithMatch(spyOrSpyCall: SinonSpy | SinonSpyCall, ...args: any[]): void;
+        /**
+         * Passes if spy was always called with matching arguments.
+         * This behaves the same way as sinon.assert.alwaysCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
+         */
         alwaysCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was never called with matching arguments.
+         * This behaves the same way as sinon.assert.neverCalledWith(spy, sinon.match(arg1), sinon.match(arg2), ...).
+         * @param spy
+         * @param args
+         */
         neverCalledWithMatch(spy: SinonSpy, ...args: any[]): void;
+        /**
+         * Passes if spy was called with the new operator.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.calledWithNew(spy.secondCall, arg1, arg2, ...);.
+         * @param spyOrSpyCall
+         */
         calledWithNew(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        /**
+         * Passes if spy threw any exception.
+         */
         threw(spyOrSpyCall: SinonSpy | SinonSpyCall): void;
+        /**
+         * Passes if spy threw the given exception.
+         * The exception is an actual object.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
+         */
         threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: string): void;
+        /**
+         * Passes if spy threw the given exception.
+         * The exception is a String denoting its type.
+         * It’s possible to assert on a dedicated spy call: sinon.assert.threw(spy.thirdCall, exception);.
+         */
         threw(spyOrSpyCall: SinonSpy | SinonSpyCall, exception: any): void;
+        /**
+         * Like threw, only required for all calls to the spy.
+         */
         alwaysThrew(spy: SinonSpy): void;
+        /**
+         * Like threw, only required for all calls to the spy.
+         */
         alwaysThrew(spy: SinonSpy, exception: string): void;
+        /**
+         * Like threw, only required for all calls to the spy.
+         */
         alwaysThrew(spy: SinonSpy, exception: any): void;
+        /**
+         * Uses sinon.match to test if the arguments can be considered a match.
+         */
         match(actual: any, expected: any): void;
+        /**
+         * Exposes assertions into another object, to better integrate with the test framework.
+         * For instance, JsTestDriver uses global assertions, and to make Sinon.JS assertions appear alongside them, you can do.
+         * @example sinon.assert.expose(this);
+         * This will give you assertCalled(spy),assertCallOrder(spy1, spy2, ...) and so on.
+         * The method accepts an optional options object with two options.
+         */
         expose(obj: any, options?: Partial<SinonExposeOptions>): void;
     }
 
     interface SinonMatcher {
+        /**
+         * All matchers implement and and or. This allows to logically combine mutliple matchers.
+         * The result is a new matchers that requires both (and) or one of the matchers (or) to return true.
+         * @example var stringOrNumber = sinon.match.string.or(sinon.match.number);
+         * var bookWithPages = sinon.match.instanceOf(Book).and(sinon.match.has("pages"));
+         */
         and(expr: SinonMatcher): SinonMatcher;
+        /**
+         * All matchers implement and and or. This allows to logically combine mutliple matchers.
+         * The result is a new matchers that requires both (and) or one of the matchers (or) to return true.
+         * @example var stringOrNumber = sinon.match.string.or(sinon.match.number);
+         * var bookWithPages = sinon.match.instanceOf(Book).and(sinon.match.has("pages"));
+         */
         or(expr: SinonMatcher): SinonMatcher;
         test(val: any): boolean;
     }
@@ -419,19 +1254,62 @@ declare namespace Sinon {
     }
 
     interface SinonMatch {
+        /**
+         * Requires the value to be == to the given number.
+         */
         (value: number): SinonMatcher;
+        /**
+         * Requires the value to be a string and have the expectation as a substring.
+         */
         (value: string): SinonMatcher;
+        /**
+         * Requires the value to be a string and match the given regular expression.
+         */
         (expr: RegExp): SinonMatcher;
+        /**
+         * See custom matchers.
+         */
         (callback: (value: any) => boolean, message?: string): SinonMatcher;
+        /**
+         * Requires the value to be not null or undefined and have at least the same properties as expectation.
+         * This supports nested matchers.
+         */
         (obj: object): SinonMatcher;
+        /**
+         * Matches anything.
+         */
         any: SinonMatcher;
+        /**
+         * Requires the value to be defined.
+         */
         defined: SinonMatcher;
+        /**
+         * Requires the value to be truthy.
+         */
         truthy: SinonMatcher;
+        /**
+         * Requires the value to be falsy.
+         */
         falsy: SinonMatcher;
+        /**
+         * Requires the value to be a Boolean
+         */
         bool: SinonMatcher;
+        /**
+         * Requires the value to be a Number.
+         */
         number: SinonMatcher;
+        /**
+         * Requires the value to be a String.
+         */
         string: SinonMatcher;
+        /**
+         * Requires the value to be an Object.
+         */
         object: SinonMatcher;
+        /**
+         * Requires the value to be a Function.
+         */
         func: SinonMatcher;
         /**
          * Requires the value to be a Map.
@@ -445,23 +1323,84 @@ declare namespace Sinon {
          * Requires the value to be an Array.
          */
         array: SinonArrayMatcher;
+        /**
+         * Requires the value to be a regular expression.
+         */
         regexp: SinonMatcher;
+        /**
+         * Requires the value to be a Date object.
+         */
         date: SinonMatcher;
+        /**
+         * Requires the value to be a Symbol.
+         */
         symbol: SinonMatcher;
+        /**
+         * Requires the value to strictly equal ref.
+         */
         same(obj: any): SinonMatcher;
+        /**
+         * Requires the value to be of the given type, where type can be one of "undefined", "null", "boolean", "number", "string", "object", "function", "array", "regexp", "date" or "symbol".
+         */
         typeOf(type: string): SinonMatcher;
+        /**
+         * Requires the value to be an instance of the given type.
+         */
         instanceOf(type: any): SinonMatcher;
+        /**
+         * Requires the value to define the given property.
+         * The property might be inherited via the prototype chain.
+         * If the optional expectation is given, the value of the property is deeply compared with the expectation.
+         * The expectation can be another matcher.
+         * @param property
+         * @param expect
+         */
         has(property: string, expect?: any): SinonMatcher;
+        /**
+         * Same as sinon.match.has but the property must be defined by the value itself. Inherited properties are ignored.
+         * @param property
+         * @param expect
+         */
         hasOwn(property: string, expect?: any): SinonMatcher;
+        /**
+         * Requires the value to define the given propertyPath. Dot (prop.prop) and bracket (prop[0]) notations are supported as in Lodash.get.
+         * The propertyPath might be inherited via the prototype chain.
+         * If the optional expectation is given, the value at the propertyPath is deeply compared with the expectation.
+         * The expectation can be another matcher.
+         */
         hasNested(path: string, expect?: any): SinonMatcher;
+        /**
+         * Requires every element of an Array, Set or Map, or alternatively every value of an Object to match the given matcher.
+         */
         every(matcher: SinonMatcher): SinonMatcher;
+        /**
+         * Requires any element of an Array, Set or Map, or alternatively any value of an Object to match the given matcher.
+         */
         some(matcher: SinonMatcher): SinonMatcher;
     }
 
     interface SinonSandboxConfig {
+        /**
+         * The sandbox’s methods can be injected into another object for convenience.
+         * The injectInto configuration option can name an object to add properties to.
+         */
         injectInto: object | null;
+        /**
+         * What properties to inject.
+         * Note that simply naming “server” here is not sufficient to have a server property show up in the target object,
+         * you also have to set useFakeServer to true.
+         */
         properties: string[];
+        /**
+         * If set to true, the sandbox will have a clock property.
+         * You can optionally pass in a configuration object that follows the specification for fake timers, such as { toFake: ["setTimeout", "setInterval"] }.
+         */
         useFakeTimers: boolean | Partial<SinonFakeTimersConfig>;
+        /**
+         * If true, server and requests properties are added to the sandbox. Can also be an object to use for fake server.
+         * The default one is sinon.fakeServer, but if you’re using jQuery 1.3.x or some other library that does not set the XHR’s onreadystatechange handler,
+         * you might want to do:
+         */
         useFakeServer: boolean | SinonFakeServer;
     }
 
@@ -470,9 +1409,7 @@ declare namespace Sinon {
      *
      * @template TType Type being stubbed.
      */
-    interface StubbableType<TType> {
-        new(...args: any[]): TType;
-    }
+    type StubbableType<TType> = Function & { prototype: TType };
 
     /**
      * An instance of a stubbed object type with functions replaced by stubs.
@@ -489,44 +1426,160 @@ declare namespace Sinon {
     type SinonStubbedMember<T> = T extends Function ? SinonStub : T;
 
     interface SinonFake {
+        /**
+         * Creates a basic fake, with no behavior
+         */
         (): SinonSpy;
+        /**
+         * Wraps an existing Function to record all interactions, while leaving it up to the func to provide the behavior.
+         * This is useful when complex behavior not covered by the sinon.fake.* methods is required or when wrapping an existing function or method.
+         */
         (fn: Function): SinonSpy;
+        /**
+         * Creates a fake that returns the val argument
+         * @param val Returned value
+         */
         returns(val: any): SinonSpy;
+        /**
+         * Creates a fake that throws an Error with the provided value as the message property.
+         * If an Error is passed as the val argument, then that will be the thrown value. If any other value is passed, then that will be used for the message property of the thrown Error.
+         * @param val Returned value or throw value if an Error
+         */
         throws(val: Error | string): SinonSpy;
+        /**
+         * Creates a fake that returns a resolved Promise for the passed value.
+         * @param val Resolved promise
+         */
         resolves(val: any): SinonSpy;
+        /**
+         * Creates a fake that returns a rejected Promise for the passed value.
+         * If an Error is passed as the value argument, then that will be the value of the promise.
+         * If any other value is passed, then that will be used for the message property of the Error returned by the promise.
+         * @param val Rejected promise
+         */
         rejects(val: any): SinonSpy;
+        /**
+         * fake expects the last argument to be a callback and will invoke it with the given arguments.
+         */
         yields(...args: any[]): SinonSpy;
+        /**
+         * fake expects the last argument to be a callback and will invoke it asynchronously with the given arguments.
+         */
         yieldsAsync(...args: any[]): SinonSpy;
     }
 
     interface SinonSandbox {
+        /**
+         * A convenience reference for sinon.assert
+         * Since sinon@2.0.0
+         */
         assert: SinonAssert;
         clock: SinonFakeTimers;
         requests: SinonFakeXMLHttpRequest[];
         server: SinonFakeServer;
+        /**
+         * Works exactly like sinon.spy
+         */
         spy: SinonSpyStatic;
+        /**
+         * Works exactly like sinon.stub.
+         */
         stub: SinonStubStatic;
+        /**
+         * Works exactly like sinon.mock
+         */
         mock: SinonMockStatic;
 
+        /**
+         * * No param : Causes Sinon to replace the global setTimeout, clearTimeout, setInterval, clearInterval, setImmediate, clearImmediate, process.hrtime, performance.now(when available)
+         * and Date with a custom implementation which is bound to the returned clock object.
+         * Starts the clock at the UNIX epoch (timestamp of 0).
+         * * Now : As above, but rather than starting the clock with a timestamp of 0, start at the provided timestamp now.
+         * Since sinon@2.0.0
+         * You can also pass in a Date object, and its getTime() will be used for the starting timestamp.
+         * * Config : As above, but allows further configuration options, some of which are:
+         * * config.now - Number/Date - installs lolex with the specified unix epoch (default: 0)
+         * * config.toFake - String[ ] - an array with explicit function names to fake.
+         * By default lolex will automatically fake all methods except process.nextTick. You could, however, still fake nextTick by providing it explicitly
+         * * config.shouldAdvanceTime - Boolean - tells lolex to increment mocked time automatically based on the real system time shift (default: false)
+         * * Please visit the lolex.install documentation for the full feature set.
+         * * Important note: when faking nextTick, normal calls to process.nextTick() would not execute automatically as they would during normal event-loop phases.
+         * You would have to call either clock.next(), clock.tick(), clock.runAll() or clock.runToLast() (see example below). Please refer to the lolex documentation for more information.
+         * @param config
+         */
         useFakeTimers(config?: number | Date | Partial<SinonFakeTimersConfig>): SinonFakeTimers;
+        /**
+         * Causes Sinon to replace the native XMLHttpRequest object in browsers that support it with a custom implementation which does not send actual requests.
+         * In browsers that support ActiveXObject, this constructor is replaced, and fake objects are returned for XMLHTTP progIds.
+         * Other progIds, such as XMLDOM are left untouched.
+         * The native XMLHttpRequest object will be available at sinon.xhr.XMLHttpRequest
+         */
         useFakeXMLHttpRequest(): SinonFakeXMLHttpRequestStatic;
+        /**
+         * Fakes XHR and binds a server object to the sandbox such that it too is restored when calling sandbox.restore().
+         * Access requests through sandbox.requests and server through sandbox.server
+         */
         useFakeServer(): SinonFakeServer;
+        /**
+         * Restores all fakes created through sandbox.
+         */
         restore(): void;
+        /**
+         * Resets the internal state of all fakes created through sandbox.
+         */
         reset(): void;
+        /**
+         * Resets the history of all stubs created through the sandbox.
+         * Since sinon@2.0.0
+         */
         resetHistory(): void;
+        /**
+         * Resets the behaviour of all stubs created through the sandbox.
+         * Since sinon@2.0.0
+         */
         resetBehavior(): void;
+        /**
+         * Causes all stubs created from the sandbox to return promises using a specific Promise library instead of the global one when using stub.rejects or stub.resolves.
+         * Returns the stub to allow chaining.
+         * Since sinon@2.0.0
+         */
         usingPromise(promiseLibrary: any): SinonSandbox;
+        /**
+         * Verifies all mocks created through the sandbox.
+         */
         verify(): void;
+        /**
+         * Verifies all mocks and restores all fakes created through the sandbox.
+         */
         verifyAndRestore(): void;
 
+        /**
+         * Replaces property on object with replacement argument. Attempts to replace an already replaced value cause an exception.
+         * replacement can be any value, including spies, stubs and fakes.
+         * This method only works on non-accessor properties, for replacing accessors, use sandbox.replaceGetter() and sandbox.replaceSetter().
+         */
         replace<T, TKey extends keyof T>(
             obj: T,
             prop: TKey,
             replacement: T[TKey]): T[TKey];
+        /**
+         * Replaces getter for property on object with replacement argument. Attempts to replace an already replaced getter cause an exception.
+         * replacement must be a Function, and can be instances of spies, stubs and fakes.
+         * @param obj
+         * @param prop
+         * @param replacement
+         */
         replaceGetter<T, TKey extends keyof T>(
             obj: T,
             prop: TKey,
             replacement: () => T[TKey]): () => T[TKey];
+        /**
+         * Replaces setter for property on object with replacement argument. Attempts to replace an already replaced setter cause an exception.
+         * replacement must be a Function, and can be instances of spies, stubs and fakes.
+         * @param obj
+         * @param prop
+         * @param replacement
+         */
         replaceSetter<T, TKey extends keyof T>(
             obj: T,
             prop: TKey,
@@ -558,6 +1611,10 @@ declare namespace Sinon {
         fakeServer: SinonFakeServerStatic;
         fakeServerWithClock: SinonFakeServerStatic;
 
+        /**
+         * Creates a new sandbox object with spies, stubs, and mocks.
+         * @param config
+         */
         createSandbox(config?: Partial<SinonSandboxConfig>): SinonSandbox;
         defaultConfig: Partial<SinonSandboxConfig>;
     }
diff --git a/types/sinon/sinon-tests.ts b/types/sinon/sinon-tests.ts
index 55e6a7a0bc..e7eb3aca76 100644
--- a/types/sinon/sinon-tests.ts
+++ b/types/sinon/sinon-tests.ts
@@ -67,14 +67,26 @@ function testSandbox() {
     sb.replaceSetter(replaceMe, 'setter', (v) => { });
 
     const cls = class {
-        foo() {}
+        foo() { }
         bar: number;
     };
+    const PrivateFoo = class {
+        private constructor() { }
+        foo() { }
+        bar: number;
+        static create() {
+            return new PrivateFoo();
+        }
+    };
 
     const stubInstance = sb.createStubInstance(cls);
+    const privateFooStubbedInstance = sb.createStubInstance(PrivateFoo);
     stubInstance.foo.calledWith('foo');
+    privateFooStubbedInstance.foo.calledWith('foo');
     const clsFoo: sinon.SinonStub = stubInstance.foo;
+    const privateFooFoo: sinon.SinonStub = privateFooStubbedInstance.foo;
     const clsBar: number = stubInstance.bar;
+    const privateFooBar: number = privateFooStubbedInstance.bar;
 }
 
 function testFakeServer() {
@@ -106,7 +118,7 @@ function testXHR() {
 
     sinon.FakeXMLHttpRequest.useFilters = true;
     sinon.FakeXMLHttpRequest.addFilter((method, url, async, user, pass) => true);
-    sinon.FakeXMLHttpRequest.onCreate = (xhr) => {};
+    sinon.FakeXMLHttpRequest.onCreate = (xhr) => { };
     sinon.FakeXMLHttpRequest.restore();
 }
 
@@ -117,7 +129,7 @@ function testClock() {
     let now = 0;
     now = clock.now;
 
-    const fn = () => {};
+    const fn = () => { };
 
     clock.setTimeout(fn, 0);
     clock.setTimeout(fn, 0, 'a', 'b');
@@ -173,7 +185,7 @@ function testExpectation() {
 
 function testMatch() {
     const obj = {};
-    const fn = () => {};
+    const fn = () => { };
 
     sinon.match(5).test(5);
     sinon.match('str').test('foo');
@@ -216,7 +228,7 @@ function testMatch() {
 }
 
 function testFake() {
-    const fn = () => {};
+    const fn = () => { };
     let fake = sinon.fake();
 
     fake = sinon.fake(() => true);
@@ -277,9 +289,9 @@ function testAssert() {
 }
 
 function testSpy() {
-    const fn = () => {};
+    const fn = () => { };
     const obj = class {
-        foo() {}
+        foo() { }
     };
     const instance = new obj();
 
@@ -369,14 +381,14 @@ function testSpy() {
 
 function testStub() {
     const obj = class {
-        foo() {}
+        foo() { }
     };
     const instance = new obj();
 
     let stub = sinon.stub();
     stub = sinon.stub(instance, 'foo');
 
-	const spy: sinon.SinonSpy = stub;
+    const spy: sinon.SinonSpy = stub;
 
     sinon.stub(instance);
 
@@ -408,9 +420,9 @@ function testStub() {
     stub.callsArgOnAsync(1, instance);
     stub.callsArgWithAsync(1, 'a', 2);
     stub.callsArgOnWithAsync(1, instance, 'a', 2);
-    stub.callsFake(() => {});
+    stub.callsFake(() => { });
     stub.get(() => true);
-    stub.set((v) => {});
+    stub.set((v) => { });
     stub.onCall(1).returns(true);
     stub.onFirstCall().resolves('foo');
     stub.onSecondCall().resolves('foo');
diff --git a/types/six-runtime/index.d.ts b/types/six-runtime/index.d.ts
new file mode 100644
index 0000000000..e31a526666
--- /dev/null
+++ b/types/six-runtime/index.d.ts
@@ -0,0 +1,219 @@
+// Type definitions for six-runtime 0.1
+// Project: https://github.com/493636333/six
+// Definitions by: liyong <https://github.com/493636333>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+declare const six: Six;
+
+interface Six {
+    /**
+     * process.env.NODE_ENV
+     */
+    readonly NODE_ENV: string;
+
+    /**
+     * NODE_ENV的缩短版
+     *
+     * production、prod => prod
+     *
+     * dev、develop、development => dev
+     */
+    readonly ENV: string;
+
+    /**
+     * Six的rootPath
+     */
+    readonly ROOT_PATH: string;
+
+    /**
+     * Six的plugin的map
+     */
+    readonly plugins: Six.PluginsMap;
+
+    /**
+     * 针对这次请求生效的数据缓存 set
+     */
+    set(key: string, value: any): void;
+
+    /**
+     * 针对这次请求生效的数据缓存 get
+     */
+    get(key: string): any;
+
+    /**
+     * DataProvider类，所有的data-provider必须继承这个类
+     */
+    DataProvider: Six.plugins.dataProvider.DataProvider;
+
+    /**
+     * 执行某个data-provider，并返回执行之后的值
+     */
+    dp(name: string): any;
+
+    /**
+     * 发送请求的工具方法，会将用户的cookie和traceId透传过去
+     */
+    http: Six.plugins.http;
+
+    /**
+     * 打日志方法
+     */
+    log: Six.plugins.log;
+
+    /**
+     * rpc调用工具方法，返回ThriftPool实例
+     */
+    rpc: Six.plugins.rpc;
+
+    /**
+     * 时间统计工具
+     */
+    time: Six.plugins.time.timmer;
+
+    /**
+     * 渲染函数
+     */
+    render: Six.plugins.view.render;
+}
+
+declare namespace Six {
+    interface PluginsMap {
+        sso: plugins.sso.ssoFactory;
+        upm: plugins.upm.upmFactory;
+        uac: plugins.uac.uacFactory;
+        static: plugins.static.staticFactory;
+    }
+
+    type next = () => any;
+
+    type middleware = (ctx: object, next: next) => any;
+
+    namespace plugins {
+        type whiteList = (ctx: object) => boolean;
+
+        namespace sso {
+            type ssoFactory = (conf: ssoConf) => any;
+
+            interface ssoConf {
+                whiteList: string|RegExp|string[]|whiteList;
+                ssoConf: ssoClientConf;
+                enableCache: boolean;
+                hasLoginCacheMaxAge: number;
+                adapter(user: object): object;
+            }
+            interface ssoClientConf {
+                clientId: string;
+                secret: string;
+                env: string;
+                token: token;
+                protocol: string;
+                errorHook(error: Error): void;
+                callbackUrl: string;
+            }
+
+            interface token {
+                name: string;
+                path: string;
+                httpOnly: boolean;
+                expiredTime: number;
+            }
+        }
+
+        namespace upm {
+            type upmFactory = (conf: upmConf) => any;
+
+            interface upmConf {
+                whiteList: string|RegExp|string[]|whiteList;
+                enableMock: boolean;
+                domain: string;
+                path: string;
+                clientId: string;
+                clientSecret: string;
+                skipOffline: boolean;
+                failHook(err: Error, ctx: object, next: next): any;
+                getPath(ctx: object): string;
+            }
+        }
+
+        namespace uac {
+            type uacFactory = (conf: uacConf) => any;
+            interface uacConf {
+                whiteList: string|RegExp|string[]|whiteList;
+                enableMock: boolean;
+                client_id: string;
+                client_secret: string;
+                skipOffline: boolean;
+                failHook(err: Error, ctx: object, next: next): any;
+                getPath(ctx: object): string;
+            }
+        }
+
+        namespace dataProvider {
+            abstract class DataProvider {
+                static deps: string[];
+                static timeout: number;
+                static retry: number;
+                prepare(ctx: object, depsRes: object): any;
+                abstract execute(ctx: object, args: any): any;
+            }
+        }
+
+        interface http {
+            proxy(options: object): middleware;
+            get(url: any, options?: object): Promise<any>;
+            post(url: any, options?: object): Promise<any>;
+            put(url: any, options?: object): Promise<any>;
+            patch(url: any, options?: object): Promise<any>;
+            del(url: any, options?: object): Promise<any>;
+            head(url: any, options?: object): Promise<any>;
+        }
+
+        interface log {
+            debug(msg: string, ...restOfVar: any[]): void;
+            info(msg: string, ...restOfVar: any[]): void;
+            warn(msg: string, ...restOfVar: any[]): void;
+            error(msg: string|Error, ...restOfVar: any[]): void;
+        }
+
+        type rpc = (config: object) => object;
+
+        namespace static {
+            type staticFactory = (conf: staticConf) => middleware;
+            interface staticConf {
+                rootPath: string;
+                cacheConf: cacheConf;
+            }
+
+            interface cacheConf {
+                defer: boolean;
+                cache: boolean;
+                maxAge: number;
+                index: string;
+                gzip: boolean;
+                extensions: boolean|string[];
+            }
+        }
+
+        namespace time {
+            interface timmer {
+                now(): any;
+                start(key: string): void;
+                end(key: string): number;
+                serialize(between?: string, end?: string, filter?: filter): string;
+            }
+
+            type filter = (key: string) => boolean;
+        }
+
+        namespace view {
+            type render = (name: string, runtimeConf?: runtimeConf|null, data?: object) => Promise<any>;
+
+            interface runtimeConf {
+                codeKey: string;
+                msgKey: string;
+                dataKey: string;
+            }
+        }
+    }
+}
diff --git a/types/six-runtime/six-runtime-tests.ts b/types/six-runtime/six-runtime-tests.ts
new file mode 100644
index 0000000000..906ddbd233
--- /dev/null
+++ b/types/six-runtime/six-runtime-tests.ts
@@ -0,0 +1 @@
+six.log.warn('xxx');
diff --git a/types/six-runtime/tsconfig.json b/types/six-runtime/tsconfig.json
new file mode 100644
index 0000000000..60a8cb89af
--- /dev/null
+++ b/types/six-runtime/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",
+        "six-runtime-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/six-runtime/tslint.json b/types/six-runtime/tslint.json
new file mode 100644
index 0000000000..30a1bdde2e
--- /dev/null
+++ b/types/six-runtime/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/slack-mock/index.d.ts b/types/slack-mock/index.d.ts
new file mode 100644
index 0000000000..2289e554b4
--- /dev/null
+++ b/types/slack-mock/index.d.ts
@@ -0,0 +1,200 @@
+// Type definitions for slack-mock 1.1
+// Project: https://github.com/Skellington-Closet/slack-mock
+// Definitions by: Kris Kalavantavanich <https://github.com/kkalavantavanich>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import { IncomingHttpHeaders } from "http";
+import * as nock from "nock";
+import { Url } from "url";
+import * as WebSocket from "ws";
+
+export = SlackMock;
+
+declare function SlackMock(config?: SlackMock.ConfigOptions): SlackMock.Instance;
+
+declare namespace SlackMock {
+    let instance: Instance;
+
+    interface Instance {
+        events: Events<any>;
+        incomingWebhooks: IncomingWebhooks<any>;
+        interactiveButtons: InteractiveButtons<any>;
+        outgoingWebhooks: OutgoingWebhooks<any>;
+        rtm: Rtm<any>;
+        slashCommands: SlashCommands<any>;
+        web: Web<any>;
+
+        reset: () => void;
+    }
+
+    interface ConfigOptions {
+        rtmPort?: number;
+        logLevel?: string;
+    }
+
+    // Events
+
+    type EventUrl = string | Url;
+    type EventHttpHeaders = IncomingHttpHeaders;
+
+    interface Events<T> {
+        send: (targetUrl: EventUrl, body: T) => Promise<void>;
+        reset: () => void;
+        calls: Array<EventCall<T>>;
+    }
+
+    interface EventCall<T> {
+        url: EventUrl;
+        params: T;
+        headers: EventHttpHeaders;
+        statusCode: number;
+    }
+
+    // Incoming Webhooks
+
+    type IncomingWebhookUrl = string;
+    type IncomingWebhookHttpHeaders = nock.HttpHeaders;
+
+    interface IncomingWebhooks<T> {
+        addResponse: (opts: IncomingWebhookOptions<T>) => void;
+        reset: () => void;
+        calls: Array<IncomingWebhookCall<T>>;
+    }
+
+    interface IncomingWebhookOptions<T> {
+        url?: IncomingWebhookUrl;
+        statusCode ?: number;
+        body ?: T;
+        headers ?: IncomingWebhookHttpHeaders;
+    }
+
+    interface IncomingWebhookCall<T> {
+        url: IncomingWebhookUrl;
+        params: T;
+        headers: IncomingWebhookHttpHeaders;
+    }
+
+    // Interactive Buttons
+
+    type InteractiveButtonUrl = string | Url;
+    type InteractiveButtonHttpHeaders = nock.HttpHeaders;
+
+    interface InteractiveButtons<T> {
+        send: (targetUrl: InteractiveButtonUrl, body: T) => Promise<void>;
+        addResponse: (opts: InteractiveButtonOptions<T>) => void;
+        reset: () => void;
+        calls: Array<InteractiveButtonCall<T>>;
+    }
+
+    interface InteractiveButtonOptions<T> {
+        url?: InteractiveButtonUrl;
+        statusCode ?: number;
+        body ?: T;
+        headers ?: InteractiveButtonHttpHeaders;
+    }
+
+    interface InteractiveButtonCall<T> {
+        url: InteractiveButtonUrl;
+        params: T;
+        headers: InteractiveButtonHttpHeaders;
+        statusCode: number;
+        type: InteractiveButtonCallType;
+    }
+
+    enum InteractiveButtonCallType {
+        response = 'response',
+        response_url = 'response_url'
+    }
+
+    // Outgoing Webhooks
+
+    type OutgoingWebhookUrl = string | Url;
+    type OutgoingWebhookHttpHeaders = IncomingHttpHeaders;
+
+    interface OutgoingWebhooks<T> {
+        send: (targetUrl: OutgoingWebhookUrl, body: T) => Promise<void>;
+        reset: () => void;
+        calls: Array<OutgoingWebhookCall<T>>;
+    }
+
+    interface OutgoingWebhookCall<T> {
+        url: OutgoingWebhookUrl;
+        params: T;
+        headers: OutgoingWebhookHttpHeaders;
+        statusCode: number;
+    }
+
+    // RTM
+
+    interface Rtm<T> {
+        clients: WebSocket[];
+        send: (token: string, message: T) => Promise<void>;
+        reset: () => void;
+        calls: Array<RtmCall<T>>;
+        startServer: (token: string) => void;
+        stopServer: (token: string) => void;
+    }
+
+    interface RtmCall<T> {
+        message: T;
+        token: string;
+        rawMessage: WebSocket.Data;
+    }
+
+    // Slash Commands
+
+    type SlashCommandUrl = string | Url;
+    type SlashCommandHttpHeaders = IncomingHttpHeaders;
+
+    interface SlashCommands<T> {
+        send: (targetUrl: SlashCommandUrl, body: T) => Promise<void>;
+        addResponse: (opts: SlashCommandOptions<T>) => void;
+        reset: () => void;
+        calls: Array<SlashCommandCall<T>>;
+    }
+
+    interface SlashCommandOptions<T> {
+        url?: SlashCommandUrl;
+        statusCode ?: number;
+        body ?: T;
+        headers ?: SlashCommandHttpHeaders;
+    }
+
+    interface SlashCommandCall<T> {
+        url: SlashCommandUrl;
+        params: T;
+        headers: SlashCommandHttpHeaders;
+        statusCode: number;
+        type: SlashCommandCallType;
+    }
+
+    enum SlashCommandCallType {
+        response = 'response',
+        response_url = 'response_url'
+    }
+
+    // Web
+
+    type WebUrl = string;
+    type WebHttpHeaders = nock.HttpHeaders;
+
+    interface Web<T> {
+        addResponse: (opts: WebOptions<T>) => void;
+        reset: () => void;
+        calls: Array<WebCall<T>>;
+    }
+
+    interface WebOptions<T> {
+        url?: WebUrl;
+        statusCode ?: number;
+        body ?: T;
+        headers ?: WebHttpHeaders;
+    }
+
+    interface WebCall<T> {
+        url: WebUrl;
+        params: T;
+        headers: WebHttpHeaders;
+    }
+}
diff --git a/types/slack-mock/slack-mock-tests.ts b/types/slack-mock/slack-mock-tests.ts
new file mode 100644
index 0000000000..5b5dabb9c1
--- /dev/null
+++ b/types/slack-mock/slack-mock-tests.ts
@@ -0,0 +1,103 @@
+import SlackMock = require("slack-mock");
+
+// Initialization
+
+const slackMock = SlackMock.instance;
+SlackMock({
+    logLevel: "error",
+    rtmPort: 9090
+});
+SlackMock();
+
+// Events
+const eventPayload = { };
+slackMock.events.send('http://localhost:9000/event', eventPayload)
+    .then(() => {
+        slackMock.events.calls.length;
+        slackMock.events.calls[0].statusCode;
+        slackMock.events.calls[0].headers;
+        slackMock.events.calls[0].params;
+        slackMock.events.calls[0].url;
+    });
+
+slackMock.events.reset();
+
+// Incoming Webhooks
+slackMock.incomingWebhooks.calls.length;
+slackMock.incomingWebhooks.calls[0].params.text;
+
+// Interactive Buttons
+slackMock.interactiveButtons.addResponse({
+    statusCode: 201
+});
+
+const interactiveButtonPayload = {text: 'abc'};
+slackMock.interactiveButtons.send('http://localhost:9000/button', interactiveButtonPayload)
+    .then(() => {
+        slackMock.interactiveButtons.calls.length;
+        slackMock.interactiveButtons.calls[0].params.text;
+    });
+
+// Outgoing Webhooks
+const outgoingWebhookPayload = {text: 'abc'};
+slackMock.outgoingWebhooks.send('http://localhost:9000/outgoing', outgoingWebhookPayload)
+    .then(() => {
+        slackMock.outgoingWebhooks.calls.length;
+        slackMock.outgoingWebhooks.calls[0].params.text;
+    });
+
+// RTM
+slackMock.rtm.send('1234', {
+    type: 'message',
+    channel: 'mockChannel',
+    user: 'usr',
+    text: 'hello'})
+    .then(() => {
+        slackMock.rtm.calls.length;
+        slackMock.rtm.calls[0].message.text;
+    });
+slackMock.rtm.startServer('1234');
+slackMock.rtm.stopServer('1234');
+
+// Slash Commands
+const slashCommandPayload = { };
+slackMock.slashCommands.send('http://localhost:9000/slash', slashCommandPayload)
+    .then(() => {
+        slackMock.slashCommands.calls.length;
+        slackMock.slashCommands.calls[0].params.text;
+        slackMock.slashCommands.calls[0].params.response_type;
+    });
+
+// Web (OAuth Example)
+
+const botToken = 'xoxb-XXXXXXXXXXXX-TTTTTTTTTTTTTT';
+slackMock.web.addResponse({
+  url: 'https://slack.com/api/oauth.access',
+  statusCode: 200,
+  body: {
+    access_token: 'xoxp-XXXXXXXX-XXXXXXXX-XXXXX',
+    scope: 'incoming-webhook,commands,bot',
+    team_name: 'mockTeam',
+    team_id: 'Tmock',
+    bot: {
+      bot_user_id: 'Bmock',
+      bot_access_token: botToken
+    }
+  }
+});
+
+slackMock.web.addResponse({
+  url: 'https://slack.com/api/rtm.start',
+  statusCode: 200,
+  body: {
+    ok: true,
+    self: {
+      name: 'mockSelf',
+      id: 'Bmock'
+    },
+    team: {
+      name: 'mockTeam',
+      id: 'Tmock'
+    }
+  }
+});
diff --git a/types/slack-mock/tsconfig.json b/types/slack-mock/tsconfig.json
new file mode 100644
index 0000000000..e012cc79b1
--- /dev/null
+++ b/types/slack-mock/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",
+        "slack-mock-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/slack-mock/tslint.json b/types/slack-mock/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/slack-mock/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/slack-winston/package.json b/types/slack-winston/package.json
new file mode 100644
index 0000000000..33e1a4f018
--- /dev/null
+++ b/types/slack-winston/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/winston": "^2.3.9"
+    }
+}
diff --git a/types/slate-base64-serializer/index.d.ts b/types/slate-base64-serializer/index.d.ts
new file mode 100644
index 0000000000..6d356aa1c3
--- /dev/null
+++ b/types/slate-base64-serializer/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for slate-base64-serializer 0.2
+// Project: https://github.com/ianstormtaylor/slate
+// Definitions by: Brandon Shelton <https://github.com/YangusKhan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import { Value, Node } from "slate";
+
+export function deserialize(string: string, options?: object): Value;
+export function deserializeNode(string: string, options?: object): Node;
+export function serialize(value: Value, options?: object): string;
+export function serializeNode(node: Node, options?: object): string;
diff --git a/types/slate-base64-serializer/slate-base64-serializer-tests.ts b/types/slate-base64-serializer/slate-base64-serializer-tests.ts
new file mode 100644
index 0000000000..680bcf62bd
--- /dev/null
+++ b/types/slate-base64-serializer/slate-base64-serializer-tests.ts
@@ -0,0 +1,6 @@
+import * as Base64 from "slate-base64-serializer";
+import { Value } from "slate";
+
+const val = Value.create();
+const serialized = Base64.serialize(val);
+const deserialized = Base64.deserialize(serialized);
diff --git a/types/slate-base64-serializer/tsconfig.json b/types/slate-base64-serializer/tsconfig.json
new file mode 100644
index 0000000000..1e496b8735
--- /dev/null
+++ b/types/slate-base64-serializer/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",
+        "slate-base64-serializer-tests.ts"
+    ]
+}
diff --git a/types/slate-base64-serializer/tslint.json b/types/slate-base64-serializer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/slate-base64-serializer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/slate-html-serializer/index.d.ts b/types/slate-html-serializer/index.d.ts
new file mode 100644
index 0000000000..a0bd15f186
--- /dev/null
+++ b/types/slate-html-serializer/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for slate-html-serializer 0.6
+// Project: https://github.com/ianstormtaylor/slate
+// Definitions by: Brandon Shelton <https://github.com/YangusKhan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+import * as React from 'react';
+import { BlockProperties, ValueJSON, Value, Node, Mark, Leaf } from 'slate';
+
+export interface Rule {
+    deserialize?: (el: Element, next: (elements: Element[] | NodeList | Array<Node & ChildNode>) => any) => any;
+    serialize?: (obj: any, children: string) => React.ReactNode;
+}
+
+export interface HtmlOptions {
+    rules?: Rule[];
+    defaultBlock?: BlockProperties;
+    parseHtml?: (html: string) => HTMLElement;
+}
+
+export default class Html {
+    constructor(options?: HtmlOptions);
+
+    deserialize(html: string, options: { toJSON: true }): ValueJSON;
+    deserialize(html: string, options?: { toJSON?: false }): Value;
+
+    serialize(value: Value, options?: { render?: true }): string;
+    serialize(value: Value, options: { render: false }): Element[];
+
+    protected rules: Rule[];
+    protected defaultBlock: BlockProperties;
+    protected parseHtml: (html: string) => HTMLElement;
+
+    protected deserializeElements: (elements: HTMLElement[]) => Node[];
+    protected deserializeElement: (element: HTMLElement) => any;
+    protected deserializeMark: (mark: Mark) => Node[];
+
+    protected serializeNode: (node: Node) => string;
+    protected serializeLeaf: (leaf: Leaf) => string;
+    protected serializeString: (string: string) => string;
+}
diff --git a/types/slate-html-serializer/slate-html-serializer-tests.ts b/types/slate-html-serializer/slate-html-serializer-tests.ts
new file mode 100644
index 0000000000..f7a2a26149
--- /dev/null
+++ b/types/slate-html-serializer/slate-html-serializer-tests.ts
@@ -0,0 +1,10 @@
+import Html, { Rule } from "slate-html-serializer";
+
+const myRule: Rule = {
+    deserialize: (el, next) => {},
+    serialize: () => null
+};
+
+const serializer = new Html({
+    rules: [myRule]
+});
diff --git a/types/slate-html-serializer/tsconfig.json b/types/slate-html-serializer/tsconfig.json
new file mode 100644
index 0000000000..5222c4dbc4
--- /dev/null
+++ b/types/slate-html-serializer/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",
+        "slate-html-serializer-tests.ts"
+    ]
+}
diff --git a/types/slate-html-serializer/tslint.json b/types/slate-html-serializer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/slate-html-serializer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/slate-plain-serializer/index.d.ts b/types/slate-plain-serializer/index.d.ts
new file mode 100644
index 0000000000..b781b4f9e7
--- /dev/null
+++ b/types/slate-plain-serializer/index.d.ts
@@ -0,0 +1,15 @@
+// Type definitions for slate-plain-serializer 0.5
+// Project: https://github.com/ianstormtaylor/slate
+// Definitions by: Brandon Shelton <https://github.com/YangusKhan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+import { BlockProperties, MarkProperties, Value } from 'slate';
+
+export interface DeserializeOptions {
+    toJson?: boolean;
+    defaultBlock?: BlockProperties;
+    defaultMarks?: MarkProperties[] | Set<MarkProperties>;
+}
+
+export function deserialize(string: string, options?: DeserializeOptions): Value;
+export function serialize(value: Value): string;
diff --git a/types/slate-plain-serializer/slate-plain-serializer-tests.ts b/types/slate-plain-serializer/slate-plain-serializer-tests.ts
new file mode 100644
index 0000000000..c7b7f97e07
--- /dev/null
+++ b/types/slate-plain-serializer/slate-plain-serializer-tests.ts
@@ -0,0 +1,6 @@
+import * as Plain from "slate-plain-serializer";
+import { Value } from "slate";
+
+const val = Value.create();
+const serialized = Plain.serialize(val);
+const deserialized = Plain.deserialize(serialized);
diff --git a/types/slate-plain-serializer/tsconfig.json b/types/slate-plain-serializer/tsconfig.json
new file mode 100644
index 0000000000..d6d789b9a5
--- /dev/null
+++ b/types/slate-plain-serializer/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",
+        "slate-plain-serializer-tests.ts"
+    ]
+}
diff --git a/types/slate-plain-serializer/tslint.json b/types/slate-plain-serializer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/slate-plain-serializer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/slate-react/index.d.ts b/types/slate-react/index.d.ts
new file mode 100644
index 0000000000..c79b945a5b
--- /dev/null
+++ b/types/slate-react/index.d.ts
@@ -0,0 +1,108 @@
+// Type definitions for slate-react 0.12
+// Project: https://github.com/ianstormtaylor/slate
+// Definitions by: Andy Kent <https://github.com/andykent>
+//                 Jamie Talbot <https://github.com/majelbstoat>
+//                 Jan Löbel <https://github.com/JanLoebel>
+//                 Patrick Sachs <https://github.com/PatrickSachs>
+//                 Brandon Shelton <https://github.com/YangusKhan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+import { Mark, Node, Block, Change, Schema, Value, Stack } from 'slate';
+import * as Immutable from 'immutable';
+import * as React from 'react';
+
+// Values prefixed with "data-..." (Used for spellchecking according to docs)
+export interface RenderAttributes {
+  [key: string]: any;
+}
+
+export interface RenderMarkProps {
+  attributes: RenderAttributes;
+  children: React.ReactNode;
+  editor: Editor;
+  mark: Mark;
+  marks: Immutable.Set<Mark>;
+  node: Node;
+  offset: number;
+  text: string;
+}
+
+export interface RenderNodeProps {
+  attributes: RenderAttributes;
+  children: React.ReactNode;
+  editor: Editor;
+  isSelected: boolean;
+  key: string;
+  node: Node;
+  parent: Node;
+}
+
+export interface Plugin {
+  onBeforeInput?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onBlur?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onFocus?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onClick?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onCopy?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onCut?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onDrop?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onKeyDown?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onKeyUp?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onPaste?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onSelect?: (event: Event, change: Change, editor: Editor) => Change | void;
+  onChange?: (change: Change) => any;
+  renderEditor?: (props: RenderAttributes, editor: Editor) => object | void;
+  schema?: Schema;
+  decorateNode?: (node: Node) => Range[] | void;
+  renderMark?: (props: RenderMarkProps) => any;
+  renderNode?: (props: RenderNodeProps) => any;
+  renderPlaceholder?: (props: RenderAttributes) => any;
+  renderPortal?: (props: RenderAttributes) => any;
+  validateNode?: (node: Node) => any;
+}
+
+export interface BasicEditorProps {
+  value: Value;
+  autoCorrect?: boolean;
+  autoFocus?: boolean;
+  className?: string;
+  onChange?: (change: Change) => any;
+  placeholder?: any;
+  plugins?: Plugin[];
+  readOnly?: boolean;
+  role?: string;
+  schema?: Schema;
+  spellCheck?: boolean;
+  style?: { [key: string]: string };
+  tabIndex?: number;
+}
+
+// tsling:disable interface-over-type-literal
+export type EditorProps = BasicEditorProps & Plugin;
+
+export interface EditorState {
+  schema: Schema;
+  value: Value;
+  stack: Stack; // [TODO] define stack
+}
+
+export class Editor extends React.Component<EditorProps, EditorState> {
+  schema: Schema;
+  value: Value;
+  stack: Stack;
+
+  // Instance Methods
+  blur(): void;
+  change(fn: (change: Change) => any): void;
+  change(...args: any[]): void;
+  focus(): void;
+}
+
+export type SlateType = 'fragment' | 'html' | 'node' | 'rich' | 'text' | 'files';
+
+export function findDOMNode(node: Node): Element;
+export function findDOMRange(range: Range): Range;
+export function findNode(element: Element, value: Value): Node;
+export function findRange(selection: Selection, value: Value): Range;
+export function getEventRange(event: Event, value: Value): Range;
+export function getEventTransfer(event: Event): { type: SlateType; node: Node };
+export function setEventTransfer(event: Event, type: SlateType, data: any): void;
diff --git a/types/slate-react/package.json b/types/slate-react/package.json
new file mode 100644
index 0000000000..58698c580a
--- /dev/null
+++ b/types/slate-react/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "immutable": "^3.8.2"
+  }
+}
diff --git a/types/slate-react/slate-react-tests.tsx b/types/slate-react/slate-react-tests.tsx
new file mode 100644
index 0000000000..d8c8ea0073
--- /dev/null
+++ b/types/slate-react/slate-react-tests.tsx
@@ -0,0 +1,47 @@
+import { Editor, Plugin, EditorProps, RenderNodeProps } from "slate-react";
+import { Change, Value } from "slate";
+import * as React from "react";
+
+class MyPlugin implements Plugin {
+    renderNode(props: RenderNodeProps) {
+        const { node } = props;
+        if (node) {
+            switch (node.object) {
+                case "block":
+                    return <div id="slate-block-test"/>;
+                case "inline":
+                    return <span id="slate-inline-test">Hello world</span>;
+                case "text":
+                    return <p id="slate-text-test">Hello world</p>;
+                default:
+                    return undefined;
+            }
+        }
+    }
+
+    onChange(change: Change): void {
+        change.blur();
+    }
+}
+
+const myPlugin = new MyPlugin();
+
+interface MyEditorState {
+    value: Value;
+}
+
+class MyEditor extends React.Component<EditorProps, MyEditorState> {
+    constructor(props: EditorProps) {
+        super(props);
+        this.state = {
+            value: Value.create()
+        };
+    }
+
+    render() {
+        return <Editor
+            value={this.state.value}
+            onChange={myPlugin.onChange}
+            renderNode={myPlugin.renderNode} />;
+    }
+}
diff --git a/types/slate-react/tsconfig.json b/types/slate-react/tsconfig.json
new file mode 100644
index 0000000000..902d90178c
--- /dev/null
+++ b/types/slate-react/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "jsx": "preserve",
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "slate-react-tests.tsx"
+    ]
+}
diff --git a/types/slate-react/tslint.json b/types/slate-react/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/slate-react/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/slate/index.d.ts b/types/slate/index.d.ts
new file mode 100644
index 0000000000..30c0b5a376
--- /dev/null
+++ b/types/slate/index.d.ts
@@ -0,0 +1,763 @@
+// Type definitions for slate 0.33
+// Project: https://github.com/ianstormtaylor/slate
+// Definitions by: Andy Kent <https://github.com/andykent>
+//                 Jamie Talbot <https://github.com/majelbstoat>
+//                 Jan Löbel <https://github.com/JanLoebel>
+//                 Brandon Shelton <https://github.com/YangusKhan>
+//                 Kalley Powell <https://github.com/kalley>
+//                 Francesco Agnoletto <https://github.com/Kornil>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+import * as Immutable from 'immutable';
+
+export class Data {
+  [key: string]: any;
+  static create(options: Data): Data;
+  static fromJSON(object: Record<string, any>): Data;
+  static fromJS(object: Record<string, any>): Data;
+}
+
+export interface RulesByNodeType {
+  [key: string]: Rules;
+}
+
+export interface ObjectsAndTypes {
+  objects?: string[];
+  types?: string[];
+}
+
+export type InvalidReason =
+  | 'child_object_invalid'
+  | 'child_required'
+  | 'child_type_invalid'
+  | 'child_unknown'
+  | 'first_child_object_invalid'
+  | 'first_child_type_invalid'
+  | 'last_child_object_invalid'
+  | 'last_child_type_invalid'
+  | 'node_data_invalid'
+  | 'node_is_void_invalid'
+  | 'node_mark_invalid'
+  | 'node_text_invalid'
+  | 'parent_object_invalid'
+  | 'parent_type_invalid';
+
+export interface Rules {
+  data?: {
+    [key: string]: (v: any) => boolean;
+  };
+  first?: ObjectsAndTypes;
+  isVoid?: boolean;
+  last?: ObjectsAndTypes;
+  nodes?: Array<{
+    objects?: string[];
+    types?: string[];
+    min?: number;
+    max?: number;
+  }>;
+  normalize?: (
+    change: Change,
+    reason: InvalidReason,
+    context: Record<string, any>
+  ) => void;
+  parent?: ObjectsAndTypes;
+  text?: RegExp;
+}
+
+export interface SchemaProperties {
+  document?: Rules;
+  blocks?: RulesByNodeType;
+  inlines?: RulesByNodeType;
+}
+
+export class Schema extends Immutable.Record({}) {
+  document: Rules;
+  blocks: RulesByNodeType;
+  inlines: RulesByNodeType;
+
+  static create(properties: SchemaProperties | Schema): Schema;
+  static fromJSON(object: SchemaProperties): Schema;
+  static fromJS(object: SchemaProperties): Schema;
+  static isSchema(maybeSchema: any): maybeSchema is Schema;
+
+  toJSON(): SchemaProperties;
+}
+
+export interface HistoryJSON {
+  object?: 'history';
+  redos?: Immutable.Stack<Operation>;
+  undos?: Immutable.Stack<Operation>;
+}
+
+export class History extends Immutable.Record({ redos: Immutable.Stack(), undos: Immutable.Stack() }) {
+  object: 'history';
+
+  static create(properties: HistoryJSON | History): History;
+  static createOperationsList(operations: Operation[] | Immutable.List<Operation>): Immutable.List<Operation>;
+  static fromJSON(object: HistoryJSON): History;
+  static fromJS(object: HistoryJSON): History;
+  static isHistory(maybeHistory: any): maybeHistory is History;
+
+  save(operation: Operation, options: { merge?: boolean, skip?: boolean }): History;
+  toJSON(): HistoryJSON;
+}
+
+export interface ValueProperties {
+  document?: Document;
+  selection?: Range;
+  history?: History;
+  schema?: Schema;
+  data?: Record<string, any>;
+  decorations?: Immutable.List<Range> | null;
+}
+
+export interface ValueJSON {
+  document?: DocumentJSON;
+  selection?: Range;
+  history?: History;
+  schema?: Schema;
+  data?: Record<string, any>;
+  decorations?: Immutable.List<Range> | null;
+  object?: 'value';
+}
+
+export class Value extends Immutable.Record({}) {
+  document: Document;
+  selection: Range;
+  history: History;
+  schema: Schema;
+  data: Record<string, any>;
+  object: 'value';
+  decorations: Immutable.List<Range> | null;
+
+  readonly anchorText: Text;
+  readonly focusText: Text;
+  readonly startText: Text;
+  readonly endText: Text;
+
+  readonly anchorBlock: Block;
+  readonly focusBlock: Block;
+  readonly startBlock: Block;
+  readonly endBlock: Block;
+
+  readonly anchorInline: Inline;
+  readonly focusInline: Inline;
+  readonly startInline: Inline;
+  readonly endInline: Inline;
+
+  readonly marks: Immutable.Set<Mark>;
+  readonly activeMarks: Immutable.Set<Mark>;
+  readonly blocks: Immutable.List<Block>;
+  readonly fragment: Document;
+  readonly inlines: Immutable.List<Inline>;
+  readonly text: Immutable.List<Text>;
+  readonly characters: Immutable.List<Character>;
+  readonly hasUndos: boolean;
+  readonly hasRedos: boolean;
+
+  readonly anchorKey: string;
+  readonly focusKey: string;
+  readonly startKey: string;
+  readonly endKey: string;
+  readonly anchorOffset: number;
+  readonly focusOffset: number;
+  readonly startOffset: number;
+  readonly endOffset: number;
+  readonly isBackward: boolean;
+  readonly isBlurred: boolean;
+  readonly isCollapsed: boolean;
+  readonly isExpanded: boolean;
+  readonly isFocused: boolean;
+  readonly isForward: boolean;
+
+  static create(properties?: ValueProperties | Value): Value;
+  static fromJSON(properties: ValueJSON): Value;
+  static fromJS(properties: ValueJSON): Value;
+  static isValue(maybeValue: any): maybeValue is Value;
+
+  change(): Change;
+  toJSON(): ValueJSON;
+}
+
+export interface DocumentProperties {
+  nodes?: Immutable.List<Node> | Node[];
+  key?: string;
+  data?: Immutable.Map<string, any> | Record<string, any>;
+}
+
+export interface DocumentJSON {
+  nodes?: NodeJSON[];
+  key?: string;
+  data?: Record<string, any>;
+  object?: 'document';
+}
+
+export class Document<DataMap = Record<string, any>> extends BaseNode<
+  DataMap
+> {
+  object: 'document';
+  nodes: Immutable.List<Block>;
+
+  static create(
+    properties: DocumentProperties | Document | Immutable.List<Node> | Node[]
+  ): Document;
+
+  static fromJSON(properties: DocumentJSON | Document): Document;
+  static fromJS(properties: DocumentJSON | Document): Document;
+  static isDocument(maybeDocument: any): maybeDocument is Document;
+
+  toJSON(): DocumentJSON;
+}
+
+export interface BlockProperties {
+  type: string;
+  key?: string;
+  nodes?: Immutable.List<Node>;
+  isVoid?: boolean;
+  data?: Immutable.Map<string, any> | Record<string, any>;
+}
+
+export interface BlockJSON {
+  type: string;
+  key?: string;
+  nodes?: NodeJSON[];
+  isVoid?: boolean;
+  data?: Record<string, any>;
+  object: 'block';
+}
+
+export class Block extends BaseNode {
+  isVoid: boolean;
+  object: 'block';
+  nodes: Immutable.List<Block | Text | Inline>;
+
+  static create(properties: BlockProperties | Block | string): Block;
+  static createList(
+    array: (BlockProperties[] | Block[] | string[])
+  ): Immutable.List<Block>;
+  static fromJSON(properties: BlockJSON | Block): Block;
+  static fromJS(properties: BlockJSON | Block): Block;
+  static isBlock(maybeBlock: any): maybeBlock is Block;
+
+  toJSON(): BlockJSON;
+}
+
+export interface InlineProperties {
+  type: string;
+  key?: string;
+  nodes?: Immutable.List<Node>;
+  isVoid?: boolean;
+  data?: Immutable.Map<string, any> | Record<string, any>;
+}
+
+export interface InlineJSON {
+  type: string;
+  key?: string;
+  nodes?: NodeJSON[];
+  isVoid?: boolean;
+  data?: Record<string, any>;
+  object: 'inline';
+}
+
+export class Inline extends BaseNode {
+  isVoid: boolean;
+  object: 'inline';
+  nodes: Immutable.List<Inline | Text>;
+
+  static create(properties: InlineProperties | Inline | string): Inline;
+  static createList(
+    array: (InlineProperties[] | Inline[] | string[])
+  ): Immutable.List<Inline>;
+  static fromJSON(properties: InlineJSON | Inline): Inline;
+  static fromJS(properties: InlineJSON | Inline): Inline;
+  static isInline(maybeInline: any): maybeInline is Inline;
+
+  toJSON(): InlineJSON;
+}
+
+export interface Leaf {
+  object: 'leaf';
+  marks?: Mark[];
+  text: string;
+}
+
+export interface TextProperties {
+  key?: string;
+  characters: Immutable.List<Character>;
+}
+
+export interface TextJSON {
+  key?: string;
+  characters?: Character[];
+  leaves: Leaf[];
+  object: 'text';
+}
+
+export class Text extends Immutable.Record({}) {
+  object: 'text';
+  characters: Immutable.List<Character>;
+  key: string;
+  text: string;
+
+  static create(properties: TextProperties | Text | string): Text;
+  static fromJSON(properties: TextJSON | Text): Text;
+  static fromJS(properties: TextJSON | Text): Text;
+  static isText(maybeText: any): maybeText is Text;
+
+  toJSON(): TextJSON;
+}
+
+export type Node = Document | Block | Inline | Text;
+export type NodeJSON = DocumentJSON | BlockJSON | InlineJSON | TextJSON;
+
+// tslint:disable-next-line strict-export-declare-modifiers
+declare class BaseNode<DataMap = Record<string, any>> extends Immutable.Record(
+  {}
+) {
+  data: Immutable.Map<keyof DataMap, DataMap[keyof DataMap]>;
+  type: string;
+  key: string;
+  object: 'document' | 'block' | 'inline' | 'text';
+  nodes: Immutable.List<Node>;
+  readonly text: string;
+
+  filterDescendants(iterator: (node: Node) => boolean): Immutable.List<Node>;
+  findDescendants(iterator: (node: Node) => boolean): Node | null;
+  getBlocksAtRange(range: Range): Immutable.List<Block>;
+  getBlocks(): Immutable.List<Block>;
+  getCharactersAtRange(range: Range): Immutable.List<Character>;
+  getChild(key: string | Node): Node | null;
+  getClosestBlock(key: string | Node): Block | null;
+  getClosestInline(key: string | Node): Inline | null;
+  getClosest(key: string | Node, match: (node: Node) => boolean): Node | null;
+  getDepth(key: string | Node): number;
+  getDescendant(key: string | Node): Node | null;
+  getFirstText(): Text | null;
+  getFragmentAtRange(range: Range): Document;
+  getFurthest(key: string, iterator: (node: Node) => boolean): Node | null;
+  getFurthestAncestor(key: string): Node | null;
+  getFurthestBlock(key: string): Block | null;
+  getFurthestInline(key: string): Inline | null;
+  getFurthestOnlyChildAncestor(key: string): Node | null;
+  getInlinesAtRange(range: Range): Immutable.List<Inline>;
+  getLastText(): Text | null;
+  getMarksAtRange(range: Range): Immutable.Set<Mark>;
+  getNextBlock(key: string | Node): Block | null;
+  getNextSibling(key: string | Node): Node | null;
+  getNextText(key: string | Node): Text | null;
+  getParent(key: string | Node): Node | null;
+  getPreviousBlock(key: string | Node): Block | null;
+  getPreviousSibling(key: string | Node): Node | null;
+  getPreviousText(key: string | Node): Text | null;
+  getTexts(): Immutable.List<Text>;
+  getTextsAsArray(): Text[];
+  getTextAtOffset(offset: number): Text | null;
+  getTextsAtRange(range: Range): Immutable.List<Text>;
+  getTextsAtRangeAsArray(range: Range): Text[];
+  hasChild(key: string | Node): boolean;
+}
+
+export interface CharacterProperties {
+  marks?: Immutable.Set<Mark> | Mark[];
+  text: string;
+}
+
+export class Character extends Immutable.Record({}) {
+  object: 'character';
+  marks: Immutable.Set<Mark>;
+  text: string;
+
+  static create(
+    properties: CharacterProperties | Character | string
+  ): Character;
+  static createList(
+    array: (CharacterProperties[] | Character[] | string[])
+  ): Immutable.List<Character>;
+  static fromJSON(properties: CharacterProperties | Character): Character;
+  static fromJS(properties: CharacterProperties | Character): Character;
+  static isCharacter(maybeCharacter: any): maybeCharacter is Character;
+
+  toJSON(): CharacterProperties;
+}
+
+export interface MarkProperties {
+  type: string;
+  data?: Immutable.Map<string, any> | Record<string, any>;
+}
+
+export interface MarkJSON {
+  type: string;
+  data?: Record<string, any>;
+}
+
+export class Mark extends Immutable.Record({}) {
+  object: 'mark';
+  type: string;
+  data: Immutable.Map<string, any>;
+
+  static create(properties: MarkProperties | Mark | string): Mark;
+  static createSet(
+    array: (MarkProperties[] | Mark[] | string[])
+  ): Immutable.Set<Mark>;
+  static fromJSON(properties: MarkJSON | Mark): Mark;
+  static fromJS(properties: MarkJSON | Mark): Mark;
+  static isMark(maybeMark: any): maybeMark is Mark;
+
+  toJSON(): MarkProperties;
+}
+
+export class Change extends Immutable.Record({}) {
+  object: 'change';
+  value: Value;
+  operations: Immutable.List<Operation>;
+
+  call(customChange: (change: Change, ...args: any[]) => Change): Change;
+  withoutNormalization(customChange: (change: Change) => void): Change;
+
+  applyOperations(operations: Operation[]): Change;
+  applyOperation(operation: Operation): Change;
+
+  // Full Value Change
+  setValue(properties: Value | ValueProperties): Change;
+
+  // Current Value Changes
+  deleteBackward(n: number): Change;
+  deleteForward(n: number): Change;
+  delete(): Change;
+  insertBlock(block: Block | BlockProperties | string): Change;
+  insertFragment(fragment: Document): Change;
+  insertInline(inline: Inline | InlineProperties): Change;
+  insertText(text: string): Change;
+  addMark(mark: Mark | MarkProperties | string): Change;
+  setBlocks(properties: BlockProperties | string): Change;
+  setInlines(properties: InlineProperties | string): Change;
+  splitBlock(depth: number): Change;
+  splitInline(depth: number): Change;
+  removeMark(mark: Mark | MarkProperties | string): Change;
+  toggleMark(mark: Mark | MarkProperties | string): Change;
+  unwrapBlock(properties: BlockProperties | string): Change;
+  unwrapInline(properties: InlineProperties | string): Change;
+  wrapBlock(properties: BlockProperties | string): Change;
+  wrapInline(properties: InlineProperties | string): Change;
+  wrapText(prefix: string, suffix?: string): Change;
+
+  // Selection Changes
+  blur(): Change;
+  collapseToAnchor(): Change;
+  collapseToFocus(): Change;
+  collapseToStart(): Change;
+  collapseToEnd(): Change;
+  collapseToStartOf(node: Node): Change;
+  collapseToEndOf(node: Node): Change;
+  collapseToStartOfNextBlock(): Change;
+  collapseToEndOfNextBlock(): Change;
+  collapseToStartOfPreviousBlock(): Change;
+  collapseToEndOfPreviousBlock(): Change;
+  collapseToStartOfNextText(): Change;
+  collapseToEndOfNextText(): Change;
+  collapseToStartOfPreviousText(): Change;
+  collapseToEndOfPreviousText(): Change;
+  extend(n: number): Change;
+  extendToStartOf(node: Node): Change;
+  extendToEndOf(node: Node): Change;
+  flip(): Change;
+  focus(): Change;
+  move(n: number): Change;
+  moveStart(n: number): Change;
+  moveEnd(n: number): Change;
+  moveOffsetsTo(anchorOffset: number, focusOffset: number): Change;
+  moveToRangeOf(node: Node): Change;
+  select(properties: Range | RangeProperties): Change;
+  selectAll(): Change;
+  deselect(): Change;
+
+  // Document Changes
+  deleteBackwardAtRange(range: Range, n: number): Change;
+  deleteForwardAtRange(range: Range, n: number): Change;
+  deleteAtRange(range: Range): Change;
+  insertBlockAtRange(
+    range: Range,
+    block: Block | BlockProperties | string
+  ): Change;
+  insertFragmentAtRange(range: Range, fragment: Document): Change;
+  insertInlineAtRange(
+    range: Range,
+    inline: Inline | InlineProperties
+  ): Change;
+  insertTextAtRange(range: Range, text: string): Change;
+  addMarkAtRange(range: Range, mark: Mark | MarkProperties | string): Change;
+  setBlocksAtRange(range: Range, properties: BlockProperties | string): Change;
+  setInlinesAtRange(
+    range: Range,
+    properties: InlineProperties | string
+  ): Change;
+  splitBlockAtRange(range: Range, depth: number): Change;
+  splitInlineAtRange(range: Range, depth: number): Change;
+  removeMarkAtRange(
+    range: Range,
+    mark: Mark | MarkProperties | string
+  ): Change;
+  toggleMarkAtRange(
+    range: Range,
+    mark: Mark | MarkProperties | string
+  ): Change;
+  unwrapBlockAtRange(
+    range: Range,
+    properties: BlockProperties | string
+  ): Change;
+  unwrapInlineAtRange(
+    range: Range,
+    properties: InlineProperties | string
+  ): Change;
+  wrapBlockAtRange(
+    range: Range,
+    properties: BlockProperties | string
+  ): Change;
+  wrapInlineAtRange(
+    range: Range,
+    properties: InlineProperties | string
+  ): Change;
+  wrapTextAtRange(range: Range, prefix: string, suffix?: string): Change;
+
+  // Node Changes
+  addMarkByKey(
+    key: string,
+    offset: number,
+    length: number,
+    mark: Mark
+  ): Change;
+  insertNodeByKey(key: string, index: number, node: Node): Change;
+  insertFragmentByKey(key: string, index: number, fragment: Document): Change;
+  insertTextByKey(
+    key: string,
+    offset: number,
+    text: string,
+    marks?: Immutable.Set<Mark> | Mark[]
+  ): Change;
+  moveNodeByKey(key: string, newKey: string, newIndex: number): Change;
+  removeMarkByKey(
+    key: string,
+    offset: number,
+    length: number,
+    mark: Mark
+  ): Change;
+  removeNodeByKey(key: string): Change;
+  replaceNodeByKey(key: string, node: Node): Change;
+  removeTextByKey(key: string, offset: number, length: number): Change;
+  setMarkByKey(
+    key: string,
+    offset: number,
+    length: number,
+    mark: Mark,
+    properties: MarkProperties
+  ): Change;
+  setNodeByKey(
+    key: string,
+    properties: BlockProperties | InlineProperties | string
+  ): Change;
+  splitNodeByKey(key: string, offset: number): Change;
+  unwrapInlineByKey(
+    key: string,
+    properties: InlineProperties | string
+  ): Change;
+  unwrapBlockByKey(key: string, properties: BlockProperties | string): Change;
+  unwrapNodeByKey(key: string): Change;
+  wrapInlineByKey(key: string, properties: InlineProperties | string): Change;
+  wrapBlockByKey(key: string, properties: BlockProperties | string): Change;
+
+  // History Changes
+  redo(): Change;
+  undo(): Change;
+}
+
+export interface RangeProperties {
+  anchorKey?: string | null;
+  anchorOffset?: number;
+  focusKey?: string | null;
+  focusOffset?: number;
+  isFocused?: boolean;
+  isBackward?: boolean | null;
+  marks?: Immutable.Set<Mark> | null;
+}
+
+export interface RangeJSON {
+  anchorKey?: string | null;
+  anchorOffset?: number;
+  focusKey?: string | null;
+  focusOffset?: number;
+  isFocused?: boolean;
+  isBackward?: boolean | null;
+  marks?: MarkJSON[] | null;
+}
+
+export class Range extends Immutable.Record({}) {
+  object: 'range';
+  anchorKey: string | null;
+  anchorOffset: number;
+  focusKey: string | null;
+  focusOffset: number;
+  isFocused: boolean;
+  isBackward: boolean | null;
+  marks: Immutable.Set<Mark> | null;
+
+  readonly isBlurred: boolean;
+  readonly isCollapsed: boolean;
+  readonly isExpanded: boolean;
+  readonly isForward: boolean;
+  readonly startKey: string;
+  readonly startOffset: number;
+  readonly endKey: string;
+  readonly endOffset: number;
+
+  static create(properties: RangeProperties | Range): Range;
+  static fromJSON(properties: RangeJSON): Range;
+  static fromJS(properties: RangeJSON): Range;
+  static isRange(maybeRange: any): maybeRange is Range;
+
+  toJSON(): RangeProperties;
+
+  hasAnchorAtStartOf(node: Node): boolean;
+  hasFocusAtStartOf(node: Node): boolean;
+  hasStartAtStartOf(node: Node): boolean;
+  hasEndAtStartOf(node: Node): boolean;
+  hasEdgeAtStartOf(node: Node): boolean;
+
+  hasAnchorAtEndOf(node: Node): boolean;
+  hasFocusAtEndOf(node: Node): boolean;
+  hasStartAtEndOf(node: Node): boolean;
+  hasEndAtEndOf(node: Node): boolean;
+  hasEdgeAtEndOf(node: Node): boolean;
+
+  hasAnchorBetween(node: Node, start: number, end: number): boolean;
+  hasFocusBetween(node: Node, start: number, end: number): boolean;
+  hasStartBetween(node: Node, start: number, end: number): boolean;
+  hasEndBetween(node: Node, start: number, end: number): boolean;
+  hasEdgeBetween(node: Node, start: number, end: number): boolean;
+
+  hasAnchorIn(node: Node): boolean;
+  hasFocusIn(node: Node): boolean;
+  hasStartIn(node: Node): boolean;
+  hasEndIn(node: Node): boolean;
+  hasEdgeIn(node: Node): boolean;
+
+  isAtStartOf(node: Node): boolean;
+  isAtEndOf(node: Node): boolean;
+}
+
+export type Operation =
+  | InsertTextOperation
+  | RemoveTextOperation
+  | AddMarkOperation
+  | RemoveMarkOperation
+  | SetMarkOperation
+  | InsertNodeOperation
+  | MergeNodeOperation
+  | MoveNodeOperation
+  | RemoveNodeOperation
+  | SetNodeOperation
+  | SplitNodeOperation
+  | SetSelectionOperation
+  | SetValueOperation;
+
+export interface InsertTextOperation {
+  type: 'insert_text';
+  path: number[];
+  offset: number;
+  text: string;
+  marks: Mark[];
+}
+
+export interface RemoveTextOperation {
+  type: 'remove_text';
+  path: number[];
+  offset: number;
+  text: string;
+}
+
+export interface AddMarkOperation {
+  type: 'add_mark';
+  path: number[];
+  offset: number;
+  length: number;
+  mark: Mark;
+}
+
+export interface RemoveMarkOperation {
+  type: 'remove_mark';
+  path: number[];
+  offset: number;
+  length: number;
+  mark: Mark;
+}
+
+export interface SetMarkOperation {
+  type: 'set_mark';
+  path: number[];
+  offset: number;
+  length: number;
+  mark: Mark;
+  properties: MarkProperties;
+}
+
+export interface InsertNodeOperation {
+  type: 'insert_node';
+  path: number[];
+  node: Node;
+}
+
+export interface MergeNodeOperation {
+  type: 'merge_node';
+  path: number[];
+  position: number;
+}
+
+export interface MoveNodeOperation {
+  type: 'move_node';
+  path: number[];
+  newPath: number[];
+}
+
+export interface RemoveNodeOperation {
+  type: 'remove_node';
+  path: number[];
+  node: Node;
+}
+
+export interface SetNodeOperation {
+  type: 'set_node';
+  path: number[];
+  properties: BlockProperties | InlineProperties | TextProperties;
+}
+
+export interface SplitNodeOperation {
+  type: 'split_node';
+  path: number[];
+  position: number;
+  target: number;
+}
+
+export interface SetSelectionOperation {
+  type: 'set_selection';
+  properties: RangeProperties;
+  selection: Range;
+}
+
+export interface SetValueOperation {
+  type: 'set_value';
+  properties: ValueProperties;
+  value: Value;
+}
+
+export const Operations: {
+  apply: (value: Value, operation: Operation) => Value;
+  invert: (operation: Operation) => Operation;
+};
+
+export class Stack extends Immutable.Record({}) {
+  plugins: any[];
+}
+
+export function setKeyGenerator(func: () => string): null;
+export function resetKeyGenerator(): null;
+
+export {};
diff --git a/types/slate/package.json b/types/slate/package.json
new file mode 100644
index 0000000000..67c9c004ef
--- /dev/null
+++ b/types/slate/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "immutable": "^3.8.2"
+    }
+}
\ No newline at end of file
diff --git a/types/slate/slate-tests.ts b/types/slate/slate-tests.ts
new file mode 100644
index 0000000000..25f222b4e1
--- /dev/null
+++ b/types/slate/slate-tests.ts
@@ -0,0 +1,49 @@
+import { Value, Data, NodeJSON, Document } from "slate";
+
+const data = Data.create({ foo: "bar "});
+const value = Value.create({ data });
+const change = value.change()
+.focus()
+.selectAll()
+.delete()
+.insertText('A bit of rich text, followed by...')
+.moveOffsetsTo(10, 14)
+.addMark('bold')
+.collapseToEndOfNextBlock()
+.insertBlock({
+	type: 'image',
+	isVoid: true,
+	data: {
+		src: 'http://placekitten.com/200/300',
+		alt: 'Kittens',
+		className: 'img-responsive',
+	},
+})
+.insertBlock('paragraph');
+
+const node: NodeJSON = {
+	object: "block",
+	type: "paragraph",
+	isVoid: false,
+	data: {},
+	nodes: [
+		{
+			object: "text",
+			leaves: [
+				{
+					object: 'leaf',
+					text: "example",
+					marks: [],
+				}
+			]
+		}
+	]
+};
+
+const doc = Document.fromJSON({
+	object: "document",
+	data: {},
+	nodes: [
+		node
+	],
+});
diff --git a/types/slate/tsconfig.json b/types/slate/tsconfig.json
new file mode 100644
index 0000000000..1649280316
--- /dev/null
+++ b/types/slate/tsconfig.json
@@ -0,0 +1,22 @@
+{
+    "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",
+        "slate-tests.ts"
+    ]
+}
diff --git a/types/slate/tslint.json b/types/slate/tslint.json
new file mode 100644
index 0000000000..e60c15844f
--- /dev/null
+++ b/types/slate/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
\ No newline at end of file
diff --git a/types/snappy/index.d.ts b/types/snappy/index.d.ts
new file mode 100644
index 0000000000..c8d4606157
--- /dev/null
+++ b/types/snappy/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for snappy 6.0
+// Project: https://github.com/kesla/node-snappy
+// Definitions by: Francis Gulotta <https://github.com/reconbot>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node"/>
+
+export interface SnappyDecompressOpts {
+    asBuffer: boolean;
+}
+
+export type bufferCallback = (err: Error | null, data: Buffer) => void;
+export type bufferOrStringCallback = (err: Error | null, data: Buffer|string) => void;
+export type booleanCallback = (err: Error | null, data: boolean) => void;
+
+export function compress(buffer: Buffer|string, callback: bufferCallback): void;
+export function compressSync(buffer: Buffer|string): Buffer;
+
+export function uncompress(buffer: Buffer, callback: bufferCallback): void;
+export function uncompress(buffer: Buffer, options: SnappyDecompressOpts, callback: bufferOrStringCallback): void;
+export function uncompressSync(buffer: Buffer): Buffer;
+export function uncompressSync(buffer: Buffer, options: SnappyDecompressOpts): Buffer|string;
+
+export function isValidCompressed(buffer: Buffer, callback: booleanCallback): void;
+export function isValidCompressedSync(buffer: Buffer): boolean;
diff --git a/types/snappy/snappy-tests.ts b/types/snappy/snappy-tests.ts
new file mode 100644
index 0000000000..d44d9aee13
--- /dev/null
+++ b/types/snappy/snappy-tests.ts
@@ -0,0 +1,35 @@
+import * as snappy from 'snappy';
+
+snappy.compress('beep boop', (err, compressed) => {
+  if (err) {
+    throw err;
+  }
+  console.log(compressed.slice(0, 1));
+});
+
+const data = snappy.compressSync('beep boop');
+const otherData = snappy.compressSync(Buffer.from('beep boop'));
+snappy.uncompress(data, (err, data) => {
+  if (err) {
+    throw err;
+  }
+  console.log(data.toString('UTF8'));
+});
+snappy.uncompress(otherData, { asBuffer: false }, (err, original) => {
+  if (err) {
+    throw err;
+  }
+  console.log('the original String', original);
+});
+
+snappy.uncompressSync(data);
+snappy.uncompressSync(data, { asBuffer: false });
+snappy.isValidCompressed(data, (err, valid) => {
+  if (err) {
+    throw err;
+  }
+  console.log(valid);
+});
+if (snappy.isValidCompressedSync(data)) {
+  console.log('valid!');
+}
diff --git a/types/snappy/tsconfig.json b/types/snappy/tsconfig.json
new file mode 100644
index 0000000000..d9d466288e
--- /dev/null
+++ b/types/snappy/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",
+        "snappy-tests.ts"
+    ]
+}
diff --git a/types/snappy/tslint.json b/types/snappy/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/snappy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/snapsvg/index.d.ts b/types/snapsvg/index.d.ts
index 900d5416e6..c012cc238c 100644
--- a/types/snapsvg/index.d.ts
+++ b/types/snapsvg/index.d.ts
@@ -31,7 +31,7 @@ declare namespace Snap {
     export function plugin(f:Function):void;
     export function select(query:string):Snap.Element;
     export function selectAll(query:string):any;
-    export function snapTo(values:Array<number>,value:number,tolerance?:number):number;
+    export function snapTo(values:Array<number>|number,value:number,tolerance?:number):number;
 
     export function animate(from:number|number[],to:number|number[],updater:(n:number)=>void,duration:number,easing?:(num:number)=>number,callback?:()=>void):mina.MinaAnimation;
     export function animation(attr:Object,duration:number,easing?:(num:number)=>number,callback?:()=>void):Snap.Animation;
@@ -203,16 +203,16 @@ declare namespace Snap {
         touchcancel(handler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
 
         unclick(handler?: (event: MouseEvent) => void): Snap.Element;
-        undblclick(handler: (event: MouseEvent) => void): Snap.Element;
-        unmousedown(handler: (event: MouseEvent) => void): Snap.Element;
-        unmousemove(handler: (event: MouseEvent) => void): Snap.Element;
-        unmouseout(handler: (event: MouseEvent) => void): Snap.Element;
-        unmouseover(handler: (event: MouseEvent) => void): Snap.Element;
-        unmouseup(handler: (event: MouseEvent) => void): Snap.Element;
-        untouchstart(handler: (event: MouseEvent) => void): Snap.Element;
-        untouchmove(handler: (event: MouseEvent) => void): Snap.Element;
-        untouchend(handler: (event: MouseEvent) => void): Snap.Element;
-        untouchcancel(handler: (event: MouseEvent) => void): Snap.Element;
+        undblclick(handler?: (event: MouseEvent) => void): Snap.Element;
+        unmousedown(handler?: (event: MouseEvent) => void): Snap.Element;
+        unmousemove(handler?: (event: MouseEvent) => void): Snap.Element;
+        unmouseout(handler?: (event: MouseEvent) => void): Snap.Element;
+        unmouseover(handler?: (event: MouseEvent) => void): Snap.Element;
+        unmouseup(handler?: (event: MouseEvent) => void): Snap.Element;
+        untouchstart(handler?: (event: MouseEvent) => void): Snap.Element;
+        untouchmove(handler?: (event: MouseEvent) => void): Snap.Element;
+        untouchend(handler?: (event: MouseEvent) => void): Snap.Element;
+        untouchcancel(handler?: (event: MouseEvent) => void): Snap.Element;
 
         hover(hoverInHandler: (event: MouseEvent) => void, hoverOutHandler: (event: MouseEvent) => void, thisArg?: any): Snap.Element;
         hover(hoverInHandler: (event: MouseEvent) => void, hoverOutHandler: (event: MouseEvent) => void, inThisArg?: any, outThisArg?: any): Snap.Element;
diff --git a/types/snapsvg/test/2.ts b/types/snapsvg/test/2.ts
index 5afcf36460..708dc6f2bf 100644
--- a/types/snapsvg/test/2.ts
+++ b/types/snapsvg/test/2.ts
@@ -102,12 +102,12 @@ function tester5() {
     }
 
     Snap.animate(sideLength, sideLength + 100, updater, 1500 /*ms*/);
-    setTimeout(500, () => { Snap.animate(sideLength + 100,
+    setTimeout(() => { Snap.animate(sideLength + 100,
                                          0,
                                          updater,
                                          100 /*ms*/,
                                          easer,
-                                         square.remove); });
+                                         square.remove); }, 500);
 }
 
 function tester6() {
diff --git a/types/socket.io/index.d.ts b/types/socket.io/index.d.ts
index 4d6adc529c..95a9ff1b4f 100644
--- a/types/socket.io/index.d.ts
+++ b/types/socket.io/index.d.ts
@@ -1,6 +1,11 @@
-// Type definitions for socket.io 1.4.4
+// Type definitions for socket.io 1.4.5
 // Project: http://socket.io/
-// Definitions by: PROGRE <https://github.com/progre>, Damian Connolly <https://github.com/divillysausages>, Florent Poujol <https://github.com/florentpoujol>, KentarouTakeda <https://github.com/KentarouTakeda>, Alexey Snigirev <https://github.com/gigi>
+// Definitions by: PROGRE <https://github.com/progre>
+//                 Damian Connolly <https://github.com/divillysausages>
+//                 Florent Poujol <https://github.com/florentpoujol>
+//                 KentarouTakeda <https://github.com/KentarouTakeda>
+//                 Alexey Snigirev <https://github.com/gigi>
+//                 Ezinwa Okpoechi <https://github.com/BrainMaestro>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference types="node" />
@@ -127,7 +132,7 @@ declare namespace SocketIO {
 		 * Gets the allowed origins for requests
 		 * @default "*:*"
 		 */
-		origins(): string;
+		origins(): string|string[];
 
 		/**
 		 * Sets the allowed origins for requests
@@ -135,7 +140,7 @@ declare namespace SocketIO {
 		 * @default "*:*"
 		 * return This Server
 		 */
-		origins( v: string ): Server;
+		origins( v: string|string[] ): Server;
 
 		/**
 		 * Attaches socket.io to a server
@@ -299,7 +304,7 @@ declare namespace SocketIO {
 		 * Accepted origins
 		 * @default '*:*'
 		 */
-		origins?: string;
+		origins?: string|string[];
 
 		/**
 		 * How many milliseconds without a pong packed to consider the connection closed (engine.io)
@@ -611,7 +616,7 @@ declare namespace SocketIO {
 		 * take an optional parameter, err, of a possible error
 		 * @return This Socket
 		 */
-		join( name: string, fn?: ( err?: any ) => void ): Socket;
+		join( name: string|string[], fn?: ( err?: any ) => void ): Socket;
 
 		/**
 		 * Leaves a room
@@ -691,6 +696,23 @@ declare namespace SocketIO {
 		query: any;
 	}
 
+	/**
+	 * The interface describing a room
+	 */
+	interface Room {
+		sockets: {[id: string]: boolean };
+		length: number;
+	}
+
+	/**
+	 * The interface describing a dictionary of rooms
+	 * Where room is the name of the room
+	 */
+
+	 interface Rooms {
+		[room: string]: Room;
+	 }
+
 	/**
 	 * The interface used when dealing with rooms etc
 	 */
@@ -703,9 +725,8 @@ declare namespace SocketIO {
 
 		/**
 		 * A dictionary of all the rooms that we have in this namespace
-		 * The rooms are made of a `sockets` key which is the dictionary of sockets per ID
 		 */
-		rooms: {[room: string]: {sockets: {[id: string]: boolean }, length: number }};
+		rooms: Rooms;
 
 		/**
 		 * A dictionary of all the socket ids that we're dealing with, and all
diff --git a/types/socketio-jwt/index.d.ts b/types/socketio-jwt/index.d.ts
new file mode 100644
index 0000000000..9435ec68f4
--- /dev/null
+++ b/types/socketio-jwt/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for socketio-jwt 0.0
+// Project: https://github.com/auth0/socketio-jwt
+// Definitions by: Eric Hallander <https://github.com/ehallander9591>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+import SocketIO = require("socket.io");
+
+/**
+ * This function returns a middleware function for use with Socket.IO that authenticates a new connection.
+ *
+ * @param options is an object literal that contains options.
+ * @param callback function - not implemented
+ */
+export function authorize(options: JwtAuthOptions, callback?: JwtAuthorizeCallback): (socket: SocketIO.Socket) => void;
+
+/**
+ * This is an object literal that contains options.
+ */
+export interface JwtAuthOptions {
+	secret: string | JwtSecretFunc;
+	timeout?: number; // In milliseconds to handle the second round trip.
+	callback?: boolean; // To disconnect socket server-side without a client-side callback if no valid token.
+	decodedPropertyName: string; // Property to store the docoded token to.
+	handshake?: boolean; // Used to trigger a single round trip authentication.
+}
+
+export interface JwtData {
+	message: string;
+	code: string;
+	type: string;
+}
+
+/**
+ * An Error Object used by the package.
+ */
+export class UnauthorizedError extends Error {
+	constructor(code: string, error: Error);
+
+	message: string;
+	inner: Error;
+	data: JwtData;
+}
+
+/**
+ * This is a function with two args payload, and done.
+ *
+ * `request` is the original request
+ * `payload` is the decoded JWT payload
+ * `callback` is an error-first callback defined below
+ */
+export type JwtSecretFunc = (request: any, payload: any, callback: JwtSecretFuncCallback) => void;
+
+/**
+ * If JwtAuthOptions.secret is a function, then this is the signature of the callback function provided to that function
+ */
+export type JwtSecretFuncCallback = (err: Error | null, secret: string) => void;
+
+/**
+ * socketio-jwt contains an optional second argument, that contains no implementation usage.
+ */
+export type JwtAuthorizeCallback = () => void;
diff --git a/types/socketio-jwt/socketio-jwt-tests.ts b/types/socketio-jwt/socketio-jwt-tests.ts
new file mode 100644
index 0000000000..2341de7747
--- /dev/null
+++ b/types/socketio-jwt/socketio-jwt-tests.ts
@@ -0,0 +1,47 @@
+import * as fs from 'fs';
+import * as http from 'http';
+import * as SocketIo from 'socket.io';
+import { authorize, JwtSecretFuncCallback } from 'socketio-jwt';
+
+const app = http.createServer((req: any, rsp: any) => {
+	fs.readFile(__dirname + '/index.html',
+		(err: Error, data: any) => {
+			if (err) {
+				rsp.writeHead(500);
+				return rsp.end('Error loading index.html');
+			}
+
+			rsp.writeHead(200);
+			rsp.end(data);
+		});
+});
+
+const io = SocketIo(app);
+
+// This example test code is using the Node Http Server
+
+io.on('connection', authorize({
+	secret: 'Your Secret Here',
+	decodedPropertyName: 'anyNameYouWant'
+}));
+
+io.on('authenticated', (socket: SocketIo.Socket) => {
+	console.log('authenticated!!');
+	console.log(JSON.stringify((<any> socket).anyNameYouWant));
+});
+
+const secrets: any = {
+	user1: 'secret 1',
+	user2: 'secret 2'
+};
+
+// Assume a claim name of userId
+function secretFunc(request: any, payload: any, callback: JwtSecretFuncCallback): void {
+	callback(null, secrets[payload.userId]);
+}
+
+// This example test code provides a callback function to get the secret
+io.on('connection', authorize({
+	secret: secretFunc,
+	decodedPropertyName: 'anyNameYouWant'
+}));
diff --git a/types/socketio-jwt/tsconfig.json b/types/socketio-jwt/tsconfig.json
new file mode 100644
index 0000000000..4ea9eb5ac7
--- /dev/null
+++ b/types/socketio-jwt/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "target": "es6",
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "socketio-jwt-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/socketio-jwt/tslint.json b/types/socketio-jwt/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/socketio-jwt/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/solidity-parser-antlr/index.d.ts b/types/solidity-parser-antlr/index.d.ts
index 8e5a5d369a..062a4ed918 100644
--- a/types/solidity-parser-antlr/index.d.ts
+++ b/types/solidity-parser-antlr/index.d.ts
@@ -1,11 +1,22 @@
 // Type definitions for solidity-parser-antlr 0.2
 // Project: https://github.com/federicobond/solidity-parser-antlr
 // Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+//                 Alex Browne <https://github.com/albrow>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.1
 
+export interface LineColumn {
+    line: number;
+    column: number;
+}
+export interface Location {
+    start: LineColumn;
+    end: LineColumn;
+}
 export interface BaseASTNode {
-    range: [number, number];
+    type: string;
+    range?: [number, number];
+    loc?: Location;
 }
 export interface SourceUnit extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface PragmaDirective extends BaseASTNode {} // tslint:disable-line:no-empty-interface
@@ -16,7 +27,9 @@ export interface VersionOperator extends BaseASTNode {} // tslint:disable-line:n
 export interface VersionConstraint extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface ImportDeclaration extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface ImportDirective extends BaseASTNode {} // tslint:disable-line:no-empty-interface
-export interface ContractDefinition extends BaseASTNode {} // tslint:disable-line:no-empty-interface
+export interface ContractDefinition extends BaseASTNode {
+    name: string;
+}
 export interface InheritanceSpecifier extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface ContractPart extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface StateVariableDeclaration extends BaseASTNode {
@@ -45,7 +58,7 @@ export interface EventParameter extends BaseASTNode {} // tslint:disable-line:no
 export interface FunctionTypeParameterList extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface FunctionTypeParameter extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface VariableDeclaration extends BaseASTNode {
-    visibility: 'public' | 'private';
+    visibility: "public" | "private";
     isStateVar: boolean;
 }
 export interface TypeName extends BaseASTNode {} // tslint:disable-line:no-empty-interface
@@ -104,36 +117,36 @@ export interface ElementaryTypeNameExpression extends BaseASTNode {} // tslint:d
 export interface NumberLiteral extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export interface Identifier extends BaseASTNode {} // tslint:disable-line:no-empty-interface
 export type BinOp =
-    | '+'
-    | '-'
-    | '*'
-    | '/'
-    | '**'
-    | '%'
-    | '<<'
-    | '>>'
-    | '&&'
-    | '||'
-    | '&'
-    | '|'
-    | '^'
-    | '<'
-    | '>'
-    | '<='
-    | '>='
-    | '=='
-    | '!='
-    | '='
-    | '|='
-    | '^='
-    | '&='
-    | '<<='
-    | '>>='
-    | '+='
-    | '-='
-    | '*='
-    | '/='
-    | '%=';
+    | "+"
+    | "-"
+    | "*"
+    | "/"
+    | "**"
+    | "%"
+    | "<<"
+    | ">>"
+    | "&&"
+    | "||"
+    | "&"
+    | "|"
+    | "^"
+    | "<"
+    | ">"
+    | "<="
+    | ">="
+    | "=="
+    | "!="
+    | "="
+    | "|="
+    | "^="
+    | "&="
+    | "<<="
+    | ">>="
+    | "+="
+    | "-="
+    | "*="
+    | "/="
+    | "%=";
 export interface BinaryOperation extends BaseASTNode {
     left: ASTNode;
     right: ASTNode;
@@ -312,7 +325,9 @@ export interface Visitor {
     Conditional?: (node: Conditional) => void;
 }
 export interface ParserOpts {
+    tolerant?: boolean;
     range?: boolean;
+    loc?: boolean;
 }
 export function parse(sourceCode: string, parserOpts: ParserOpts): ASTNode;
 export function visit(ast: ASTNode, visitor: Visitor): void;
diff --git a/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts b/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts
index 28a7d847b8..234664baf7 100644
--- a/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts
+++ b/types/solidity-parser-antlr/solidity-parser-antlr-tests.ts
@@ -1,4 +1,4 @@
-import { parse } from 'solidity-parser-antlr';
+import { parse } from "solidity-parser-antlr";
 
-const parserOpts = { range: true };
-parse('contract A {}', parserOpts);
+const parserOpts = { range: true, loc: true, tolerant: false };
+parse("contract A {}", parserOpts);
diff --git a/types/spark-md5/index.d.ts b/types/spark-md5/index.d.ts
index f856d41e1c..9d5c76f7e2 100644
--- a/types/spark-md5/index.d.ts
+++ b/types/spark-md5/index.d.ts
@@ -29,7 +29,7 @@ declare class SparkMD5 {
 declare namespace SparkMD5 {
 	class ArrayBuffer {
 		constructor();
-		append(str: string): ArrayBuffer;
+		append(str: ArrayBufferCopy): ArrayBuffer;
 		end(raw?: boolean): string;
 		reset(): ArrayBuffer;
 		getState(): State;
diff --git a/types/spark-md5/spark-md5-tests.ts b/types/spark-md5/spark-md5-tests.ts
index 0a6c929a29..6986ee2e89 100644
--- a/types/spark-md5/spark-md5-tests.ts
+++ b/types/spark-md5/spark-md5-tests.ts
@@ -11,8 +11,7 @@ let hexHash = spark.end();
 let rawHash = spark.end(true);
 
 const sparkArr = new SparkMD5.ArrayBuffer();
-sparkArr.append('Hi');
-sparkArr.append(' there');
+sparkArr.append(new ArrayBuffer(8));
 hexHash = sparkArr.end();
 rawHash = sparkArr.end(true);
 
diff --git a/types/sparqljs/index.d.ts b/types/sparqljs/index.d.ts
index 4b63cf8a59..dfc04ccfcd 100644
--- a/types/sparqljs/index.d.ts
+++ b/types/sparqljs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for sparqljs 1.5
+// Type definitions for sparqljs 2.1
 // Project: https://github.com/RubenVerborgh/SPARQL.js
 // Definitions by: Alexey Morozov <https://github.com/AlexeyMz>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -8,7 +8,6 @@ export const Parser: {
     new (
         prefixes?: { [prefix: string]: string },
         baseIRI?: string,
-        options?: ParserOptions,
     ): SparqlParser;
 };
 
@@ -16,11 +15,6 @@ export const Generator: {
     new (options?: GeneratorOptions): SparqlGenerator;
 };
 
-export interface ParserOptions {
-    /** @default true */
-    collapseGroups?: boolean;
-}
-
 export interface GeneratorOptions {
     allPrefixes?: boolean;
 }
@@ -94,6 +88,7 @@ export type UpdateOperation = InsertDeleteOperation | ManagementOperation;
 
 export interface InsertDeleteOperation {
     updateType: 'insert' | 'delete' | 'deletewhere' | 'insertdelete';
+    graph?: string;
     insert?: Quads[];
     delete?: Quads[];
     where?: Pattern[];
@@ -101,17 +96,47 @@ export interface InsertDeleteOperation {
 
 export type Quads = BgpPattern | GraphQuads;
 
-export interface ManagementOperation {
-    type: 'load' | 'copy' | 'move' | 'add';
+export type ManagementOperation =
+    | CopyMoveAddOperation
+    | LoadOperation
+    | CreateOperation
+    | ClearDropOperation;
+
+export interface CopyMoveAddOperation {
+    type: 'copy' | 'move' | 'add';
     silent: boolean;
-    source: string | {
-        type: 'graph';
-        default: boolean;
-    };
-    destination?: string | {
-        type: 'graph';
-        name: string;
-    };
+    source: GraphOrDefault;
+    destination: GraphOrDefault;
+}
+
+export interface LoadOperation {
+    type: 'load';
+    silent: boolean;
+    source: string;
+    destination: string | false;
+}
+
+export interface CreateOperation {
+    type: 'create';
+    silent: boolean;
+    graph: string;
+}
+
+export interface ClearDropOperation {
+    type: 'clear' | 'drop';
+    silent: boolean;
+    graph: GraphReference;
+}
+
+export interface GraphOrDefault {
+    type: 'graph';
+    name?: string;
+    default?: boolean;
+}
+
+export interface GraphReference extends GraphOrDefault {
+    named?: boolean;
+    all?: boolean;
 }
 
 /**
diff --git a/types/sparqljs/sparqljs-tests.ts b/types/sparqljs/sparqljs-tests.ts
index b8c0e36109..2fe29b40c8 100644
--- a/types/sparqljs/sparqljs-tests.ts
+++ b/types/sparqljs/sparqljs-tests.ts
@@ -26,8 +26,7 @@ function officialExamples() {
 function advancedOptions() {
     const parser = new SparqlJs.Parser(
         {rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#'},
-        'http://example.com',
-        {collapseGroups: true}
+        'http://example.com'
     );
     const generator = new SparqlJs.Generator({allPrefixes: false});
 }
@@ -122,3 +121,49 @@ function basicQueries() {
         ],
     };
 }
+
+/**
+ * Update query structure
+ */
+function updateQueries() {
+    const bgp: SparqlJs.BgpPattern = {
+        type: 'bgp',
+        triples: [],
+    };
+
+    const update: SparqlJs.Update = {
+        type: 'update',
+        prefixes: {
+            rdf: 'http://www.w3.org/1999/02/22-rdf-syntax-ns#',
+        },
+        updates: [
+            {
+                updateType: 'insertdelete',
+                graph: 'http://example.com/foo',
+                insert: [bgp],
+                delete: [bgp],
+                where: [],
+            },
+            {
+                type: 'copy',
+                silent: true,
+                source: {
+                    type: 'graph',
+                    name: 'http://example.com/foo',
+                },
+                destination: {
+                    type: 'graph',
+                    default: true,
+                },
+            },
+            {
+                type: 'clear',
+                silent: false,
+                graph: {
+                    type: 'graph',
+                    all: true,
+                },
+            },
+        ],
+    };
+}
diff --git a/types/spectacle/index.d.ts b/types/spectacle/index.d.ts
index cabd6cf5a1..e00b5dd3c0 100644
--- a/types/spectacle/index.d.ts
+++ b/types/spectacle/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/FormidableLabs/victory
 // Definitions by: Zachary Maybury <https://github.com/zmaybury>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
diff --git a/types/spectrum/index.d.ts b/types/spectrum/index.d.ts
index bc94644a92..86b3077c04 100644
--- a/types/spectrum/index.d.ts
+++ b/types/spectrum/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for spectrum 1.5.1
 // Project: https://github.com/bgrins/spectrum/
 // Definitions by: Mordechai Zuber <https://github.com/M-Zuber>
+//                 Junyoung Clare Jang <https://github.com/Ailrun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -30,7 +31,7 @@ interface JQuery {
     /**
      * Gets the current value from the colorpicker.
      */
-    spectrum(methodName: "get"): tinycolorInstance;
+    spectrum(methodName: "get"): tinycolor.Instance;
 
     /**
      * Sets the colorpickers value to update the original input.
@@ -101,12 +102,12 @@ interface JQuery {
     /**
      * Called at the beginning of a drag event on either hue slider, alpha slider, or main color picker areas.
      */
-    on(events: "dragstart.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolorInstance) => any): JQuery;
+    on(events: "dragstart.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolor.Instance) => any): JQuery;
 
     /**
      * Called at the end of a drag event on either hue slider, alpha slider, or main color picker areas.
      */
-    on(events: "dragstop.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolorInstance) => any): JQuery;
+    on(events: "dragstop.spectrum", handler: (eventObject: JQueryEventObject, color: tinycolor.Instance) => any): JQuery;
 }
 
 declare namespace Spectrum {
@@ -263,18 +264,18 @@ declare namespace Spectrum {
         /**
          * Called as the original input changes. Only happens when the input is closed or the 'Choose' button is clicked.
          */
-        change?: (color: tinycolorInstance) => void;
+        change?: (color: tinycolor.Instance) => void;
 
         /**
          * Called as the user moves around within the colorpicker.
          */
-        move?: (color: tinycolorInstance) => void;
+        move?: (color: tinycolor.Instance) => void;
 
         /**
          * Called after the colorpicker is opened. This is ignored on a flat colorpicker.
          * Note, when any colorpicker on the page is shown it will hide any that are already open.
          */
-        show?: (color: tinycolorInstance) => void;
+        show?: (color: tinycolor.Instance) => void;
 
         /**
          * Called after the colorpicker is hidden.
@@ -282,12 +283,12 @@ declare namespace Spectrum {
          * Note, when any colorpicker on the page is shown it will hide any that are already open.
          * This event is ignored on a flat colorpicker.
          */
-        hide?: (color: tinycolorInstance) => void;
+        hide?: (color: tinycolor.Instance) => void;
 
         /**
          * You can prevent the colorpicker from showing up if you return false in the beforeShow event.
          * This event is ignored on a flat colorpicker.
          */
-        beforeShow?: (color: tinycolorInstance) => void;
+        beforeShow?: (color: tinycolor.Instance) => void;
     }
 }
diff --git a/types/split/index.d.ts b/types/split/index.d.ts
index f4cd33dd5e..abe4d616ba 100644
--- a/types/split/index.d.ts
+++ b/types/split/index.d.ts
@@ -1,16 +1,17 @@
-// Type definitions for split v0.3.3
+// Type definitions for split v1.0.1
 // Project: https://github.com/dominictarr/split
 // Definitions by: Marcin Porębski <https://github.com/marcinporebski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /// <reference types="node" />
+/// <reference types="through" />
 
-
+import { ThroughStream } from 'through';
 
 interface SplitOptions {
     maxLength: number
 }
 
-declare function split(matcher?: any, mapper?: any, options?: SplitOptions): any;
+declare function split(matcher?: any, mapper?: any, options?: SplitOptions): ThroughStream;
 
 export = split;
diff --git a/types/splunk-bunyan-logger/index.d.ts b/types/splunk-bunyan-logger/index.d.ts
new file mode 100644
index 0000000000..5a1c8bf7d5
--- /dev/null
+++ b/types/splunk-bunyan-logger/index.d.ts
@@ -0,0 +1,28 @@
+// Type definitions for splunk-bunyan-logger 0.9
+// Project: http://dev.splunk.com
+// Definitions by: Alex Brick <https://github.com/bricka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import { Stream as BunyanStream } from 'bunyan';
+import {
+    Config,
+    EventFormatter,
+    Logger as SplunkLogger,
+    SendContext
+} from 'splunk-logging';
+
+export interface SplunkStream extends NodeJS.WritableStream {
+    logger: SplunkLogger;
+}
+
+export interface SplunkBunyanStream extends BunyanStream {
+    flush(callback?: (error: Error, req: any, res: any) => void): void;
+    on(event: string, callback: (err: Error, context: SendContext) => void): void;
+    setEventFormatter(eventFormatter: EventFormatter): void;
+    stream: SplunkStream;
+}
+
+export function createStream(config: Config): SplunkBunyanStream;
diff --git a/types/splunk-bunyan-logger/splunk-bunyan-logger-tests.ts b/types/splunk-bunyan-logger/splunk-bunyan-logger-tests.ts
new file mode 100644
index 0000000000..78c9ed44eb
--- /dev/null
+++ b/types/splunk-bunyan-logger/splunk-bunyan-logger-tests.ts
@@ -0,0 +1,62 @@
+import { createStream } from 'splunk-bunyan-logger';
+import { Config } from 'splunk-logging';
+import { createLogger } from 'bunyan';
+
+const config = {
+    token: "your-token-here",
+    url: "https://splunk.local:8088"
+};
+
+const splunkStream = createStream(config);
+// Enable SSL certificate validation
+splunkStream.stream.logger.requestOptions.strictSSL = true;
+
+splunkStream.on("error", (err, context) => {
+    // Handle errors here
+    console.log("Error", err, "Context", context);
+});
+
+splunkStream.flush((err, resp, body) => {
+    // If successful, body will be { text: 'Success', code: 0 }
+    console.log("Response from Splunk", body);
+});
+
+splunkStream.setEventFormatter((message, severity) => {
+    let event = `[${severity}]`;
+
+    if (typeof message === "object") {
+        for (const key in message) {
+            event += `${key}=${message[key]} `;
+        }
+    } else {
+        event += "message=" + message;
+    }
+
+    return event;
+});
+
+// Note: splunkStream must be set to an element in the streams array
+const Logger = createLogger({
+    name: "my logger",
+    streams: [
+        splunkStream
+    ]
+});
+
+// Fully-specified config
+
+const fullConfig: Config = {
+    token: 'token',
+    name: 'loggerName',
+    host: 'splunkHost',
+    maxRetries: 2,
+    path: 'splunkPath',
+    protocol: 'https',
+    port: 234,
+    level: 'info',
+    batchInterval: 200,
+    maxBatchSize: 300,
+    maxBatchCount: 400,
+};
+
+createStream(fullConfig);
diff --git a/types/splunk-bunyan-logger/tsconfig.json b/types/splunk-bunyan-logger/tsconfig.json
new file mode 100644
index 0000000000..6197901424
--- /dev/null
+++ b/types/splunk-bunyan-logger/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",
+        "splunk-bunyan-logger-tests.ts"
+    ]
+}
diff --git a/types/splunk-bunyan-logger/tslint.json b/types/splunk-bunyan-logger/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/splunk-bunyan-logger/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/splunk-logging/index.d.ts b/types/splunk-logging/index.d.ts
new file mode 100644
index 0000000000..ecbc38f32c
--- /dev/null
+++ b/types/splunk-logging/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for splunk-logging 0.9
+// Project: http://dev.splunk.com
+// Definitions by: Alex Brick <https://github.com/bricka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { CoreOptions as RequestOptions } from 'request';
+
+export interface Config {
+    token: string;
+    name?: string;
+    host?: string;
+    maxRetries?: number;
+    path?: string;
+    protocol?: 'http' | 'https';
+    port?: number;
+    url?: string;
+    level?: string;
+    batchInterval?: number;
+    maxBatchSize?: number;
+    maxBatchCount?: number;
+}
+
+export interface SendContextMetadata {
+    host?: string;
+    index?: string;
+    source?: string;
+    sourcetype?: string;
+}
+
+export interface SendContext {
+    message: any;
+    severity?: string;
+    metadata?: SendContextMetadata;
+}
+
+export type Callback = (error: Error | undefined, req: any, res: any) => void;
+export type EventFormatter = (message: any, severity: string) => any;
+
+export class Logger {
+    error: (error: Error, context: SendContext) => void;
+    eventFormatter: EventFormatter;
+    requestOptions: RequestOptions;
+    readonly serializedEventQueue: any[];
+
+    constructor(config: Config);
+
+    flush(callback?: Callback): void;
+    send(context: SendContext, callback?: Callback): void;
+}
diff --git a/types/splunk-logging/splunk-logging-tests.ts b/types/splunk-logging/splunk-logging-tests.ts
new file mode 100644
index 0000000000..4a60057ace
--- /dev/null
+++ b/types/splunk-logging/splunk-logging-tests.ts
@@ -0,0 +1,54 @@
+import { Logger } from 'splunk-logging';
+
+const config = {
+    token: "your-token-here",
+    url: "https://splunk.local:8088"
+};
+
+const logger = new Logger(config);
+logger.requestOptions.strictSSL = true;
+logger.eventFormatter = (msg, sev) => ({});
+logger.error = (err, context) => { context.message; };
+logger.serializedEventQueue[0] = { foo: 'bar' };
+
+const payload = {
+    message: {
+        temperature: "70F",
+        chickenCount: 500
+    }
+};
+
+logger.send(payload, (err, resp, body) => {
+    // If successful, body will be { text: 'Success', code: 0 }
+    body.text = 'foo';
+    body.code = 0;
+});
+
+const fullPayload = {
+    message: [ 1, 2, 3 ],
+    severity: 'error',
+    metadata: {
+        host: 'myHost',
+        index: 'splunkIndex',
+        source: 'source',
+        sourcetype: 'sourcetype',
+    },
+};
+
+logger.send(fullPayload);
+
+const fullConfig = {
+    token: 'token',
+    name: 'loggerName',
+    host: 'splunkHost',
+    maxRetries: 1,
+    path: 'splunkPath',
+    procotol: 'https',
+    port: 2,
+    level: 'info',
+    batchInterval: 3,
+    maxBatchSize: 4,
+    maxBatchCount: 5,
+};
+
+new Logger(fullConfig);
diff --git a/types/splunk-logging/tsconfig.json b/types/splunk-logging/tsconfig.json
new file mode 100644
index 0000000000..a4ca1dc9c5
--- /dev/null
+++ b/types/splunk-logging/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",
+        "splunk-logging-tests.ts"
+    ]
+}
diff --git a/types/splunk-logging/tslint.json b/types/splunk-logging/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/splunk-logging/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/spotify-web-playback-sdk/index.d.ts b/types/spotify-web-playback-sdk/index.d.ts
index 93ad7af689..f8b6ef99d9 100644
--- a/types/spotify-web-playback-sdk/index.d.ts
+++ b/types/spotify-web-playback-sdk/index.d.ts
@@ -4,6 +4,7 @@
 //                 Marcus Weiner <https://github.com/mraerino>
 //                 Moritz Gunz <https://github.com/NeoLegends>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 interface Window {
     onSpotifyWebPlaybackSDKReady(): void;
@@ -91,6 +92,11 @@ declare namespace Spotify {
     type PlaybackInstanceListener = (inst: WebPlaybackInstance) => void;
     type PlaybackStateListener = (s: PlaybackState) => void;
 
+    type AddListenerFn =
+        & ((event: 'ready' | 'not_ready', cb: PlaybackInstanceListener) => void)
+        & ((event: 'player_state_changed', cb: PlaybackStateListener) => void)
+        & ((event: ErrorTypes, cb: ErrorListener) => void);
+
     class SpotifyPlayer {
         constructor(options: PlayerInit);
 
@@ -100,15 +106,11 @@ declare namespace Spotify {
         getVolume(): Promise<number>;
         nextTrack(): Promise<void>;
 
-        addListener(event: 'ready', cb: PlaybackInstanceListener): void;
-        addListener(event: 'player_state_changed', cb: PlaybackStateListener): void;
-        addListener(event: ErrorTypes, cb: ErrorListener): void;
-        on(event: 'ready', cb: PlaybackInstanceListener): void;
-        on(event: 'player_state_changed', cb: PlaybackStateListener): void;
-        on(event: ErrorTypes, cb: ErrorListener): void;
+        addListener: AddListenerFn;
+        on: AddListenerFn;
 
         removeListener(
-            event: 'ready' | 'player_state_changed' | ErrorTypes,
+            event: 'ready' | 'not_ready' | 'player_state_changed' | ErrorTypes,
             cb?: ErrorListener | PlaybackInstanceListener | PlaybackStateListener,
         ): void;
 
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
index 1fc6f8fc4c..93956f3138 100644
--- a/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
+++ b/types/spotify-web-playback-sdk/spotify-web-playback-sdk-tests.ts
@@ -24,6 +24,10 @@ player.addListener("ready", (data) => {
     console.log("The Web Playback SDK is ready to play music!");
 });
 
+player.addListener("not_ready", ({ device_id }) => {
+    console.log("The Web Playback SDK is not ready to play music!");
+});
+
 player.getCurrentState().then((playbackState: Spotify.PlaybackState | null) => {
     if (playbackState) {
         const { current_track, next_tracks } = playbackState.track_window;
@@ -74,6 +78,11 @@ player.on("ready", (data: Spotify.WebPlaybackInstance) => {
     console.log("Connected with Device ID", device_id);
 });
 
+player.on("not_ready", (data: Spotify.WebPlaybackInstance) => {
+    const { device_id } = data;
+    console.log("Connected with Device ID", device_id);
+});
+
 player.on("player_state_changed", (playbackState: Spotify.PlaybackState) => {
     const { position, duration } = playbackState;
     const { current_track } = playbackState.track_window;
diff --git a/types/sql-bricks/index.d.ts b/types/sql-bricks/index.d.ts
index ccc7e523a7..41cc6b9146 100644
--- a/types/sql-bricks/index.d.ts
+++ b/types/sql-bricks/index.d.ts
@@ -230,10 +230,10 @@ declare namespace SqlBricks {
   interface UpdateStatement extends Statement {
     values(...values: any[]): UpdateStatement
     set(...values: any[]): UpdateStatement
-    where(column?: string | null, value?: any): SelectStatement
-    where(...whereExpr: WhereExpression[]): SelectStatement
-    and(column?: string | null, value?: any): SelectStatement
-    and(...whereExpr: WhereExpression[]): SelectStatement
+    where(column?: string | null, value?: any): UpdateStatement
+    where(...whereExpr: WhereExpression[]): UpdateStatement
+    and(column?: string | null, value?: any): UpdateStatement
+    and(...whereExpr: WhereExpression[]): UpdateStatement
   }
 
   /**
diff --git a/types/sqlanywhere/index.d.ts b/types/sqlanywhere/index.d.ts
new file mode 100644
index 0000000000..d56bfb7993
--- /dev/null
+++ b/types/sqlanywhere/index.d.ts
@@ -0,0 +1,48 @@
+// Type definitions for sqlanywhere 1.0
+// Project: https://github.com/sqlanywhere/node-sqlanywhere
+// Definitions by: Peter Keuter <https://github.com/pkeuter>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+export function createConnection(): SybaseConnection;
+
+export interface SybaseConnection {
+    connect(
+        params: ConnectionParameters,
+        cb: (err: Error | undefined) => void
+    ): void;
+    close(cb: (err?: Error) => void): void;
+    disconnect(cb: (err?: Error) => void): void;
+    connected(): boolean;
+    exec(query: string, cb: (err: Error | undefined, result: any) => void);
+    exec(
+        query: string,
+        placeholders: any[],
+        cb: (err: Error | undefined, result: any) => void
+    );
+    prepare(
+        query: string,
+        cb: (err: Error | undefined, stmt: Statement) => void
+    );
+    prepare(query: string): Statement;
+    commit(cb: (err: Error | undefined) => void): void;
+    rollback(cb: (err: Error | undefined) => void): void;
+}
+
+export interface ConnectionParameters {
+    Server: string;
+    UserId: string;
+    DatabaseFile?: string;
+    AutoStart?: string;
+    Password: string;
+    Host?: string;
+}
+
+export interface Statement {
+    exec(args: any[], cb: (err: Error | undefined, rows: any[]) => void);
+    exec(args: any[]): any[];
+    getMoreResults(): any[];
+    drop(cb: (err: Error | undefined) => void): void;
+}
+declare const _default: {
+    createConnection: typeof createConnection;
+};
+export default _default;
diff --git a/types/sqlanywhere/sqlanywhere-tests.ts b/types/sqlanywhere/sqlanywhere-tests.ts
new file mode 100644
index 0000000000..b6151e77aa
--- /dev/null
+++ b/types/sqlanywhere/sqlanywhere-tests.ts
@@ -0,0 +1,13 @@
+import sqlanywhere = require("sqlanywhere");
+
+const connection: sqlanywhere.SybaseConnection = sqlanywhere.createConnection();
+connection.connect(
+    {
+        Host: "test",
+        UserId: "Test",
+        Password: "Test",
+        Server: "Test"
+    },
+    err => err
+);
+connection.exec("SELECT * FROM TEST", (err, res) => res);
diff --git a/types/sqlanywhere/tsconfig.json b/types/sqlanywhere/tsconfig.json
new file mode 100644
index 0000000000..4270f0546c
--- /dev/null
+++ b/types/sqlanywhere/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitThis": true,
+        "noImplicitAny": false,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "sqlanywhere-tests.ts"
+    ]
+}
diff --git a/types/sqlanywhere/tslint.json b/types/sqlanywhere/tslint.json
new file mode 100644
index 0000000000..10d875b8db
--- /dev/null
+++ b/types/sqlanywhere/tslint.json
@@ -0,0 +1,4 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {}
+}
diff --git a/types/ssh2-sftp-client/index.d.ts b/types/ssh2-sftp-client/index.d.ts
index a0133961d8..0e1555abaf 100644
--- a/types/ssh2-sftp-client/index.d.ts
+++ b/types/ssh2-sftp-client/index.d.ts
@@ -1,17 +1,19 @@
-// Type definitions for ssh2-sftp-client 2.0
+// Type definitions for ssh2-sftp-client 2.3
 // Project: https://www.npmjs.com/package/ssh2-sftp-client
-// Definitions by: igrayson <https://github.com/igrayson>, Ascari Andrea <https://github.com/ascariandrea>
+// Definitions by: igrayson <https://github.com/igrayson>, Ascari Andrea <https://github.com/ascariandrea>, Kartik Malik <https://github.com/kartik2406>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import * as ssh2 from 'ssh2';
-
+import * as ssh2Stream from 'ssh2-streams';
 export = sftp;
 
 declare class sftp {
   connect(options: ssh2.ConnectConfig): Promise<void>;
   list(remoteFilePath: string): Promise<sftp.FileInfo[]>;
   get(remoteFilePath: string, useCompression?: boolean, encoding?: string | null): Promise<NodeJS.ReadableStream>;
+  fastGet(remoteFilePath: string, localPath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
   put(input: string | Buffer | NodeJS.ReadableStream, remoteFilePath: string, useCompression?: boolean, encoding?: string): Promise<void>;
+  fastPut(localPath: string, emoteFilePath: string, options?: ssh2Stream.TransferOptions): Promise<string>;
   mkdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
   rmdir(remoteFilePath: string, recursive?: boolean): Promise<void>;
   delete(remoteFilePath: string): 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 67d2d35826..0b9c1a940c 100644
--- a/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
+++ b/types/ssh2-sftp-client/ssh2-sftp-client-tests.ts
@@ -15,10 +15,14 @@ client.get('/remote/path').then(stream => stream.read(0));
 client.get('/remote/path', true, 'utf8').then(stream => stream.read(0));
 client.get('/remote/path', true, null).then(stream => stream.read(0));
 
+client.fastGet('/remote/path', 'local/path').then(() => null);
+
 client.put('/local/path', '/remote/path').then(() => null);
 client.put(new Buffer('content'), '/remote/path').then(() => null);
 client.put(fs.createReadStream('Hello World'), '/remote/path').then(() => null);
 
+client.fastPut('/remote/path', 'local/path').then(() => null);
+
 client.mkdir('/remote/path/dir', true).then(() => null);
 client.rmdir('/remote/path/dir', true).then(() => null);
 
diff --git a/types/stampit/index.d.ts b/types/stampit/index.d.ts
index def08b887d..08fcfb061b 100644
--- a/types/stampit/index.d.ts
+++ b/types/stampit/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for stampit 3.0
 // Project: https://github.com/stampit-org/stampit
 // Definitions by: Vasyl Boroviak <https://github.com/koresar>
+//                 Harris Lummis <https://github.com/lummish>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
@@ -11,12 +12,12 @@ type Init = (factoryArg: any, ctx?: Context) => any;
 /**
  * Composer function
  */
-type Composer = ({ stamp, composables }: { stamp: Stamp; composables: Composable[] }) => any;
+type Composer = ({ stamp, composables }: { stamp: stampit.Stamp; composables: Composable[] }) => any;
 
 /** The stamp Descriptor */
 interface Descriptor {
     /** Create a new stamp based on this descriptor */
-    (...composables: Composable[]): Stamp;
+    (...composables: Composable[]): stampit.Stamp;
     /**
      * A hash containing methods (functions) of any future created instance.
      */
@@ -49,7 +50,7 @@ interface Descriptor {
 }
 
 /** Any composable object (stamp or descriptor) */
-type Composable = Stamp | Descriptor;
+type Composable = stampit.Stamp | Descriptor;
 
 /**
  * The .init() function argument.
@@ -63,7 +64,7 @@ interface Context {
     /**
      * The stamp the object has been instantiated with.
      */
-    stamp: Stamp;
+    stamp: stampit.Stamp;
 
     /**
      * The arguments list passed to the stamp.
@@ -132,221 +133,8 @@ interface Options {
     composers?: Composer[];
 }
 
-/**
- * A factory function that will produce new objects using the
- * prototypes that are passed in or composed.
- */
-interface Stamp {
-    /**
-     * Invokes the stamp and returns a new object instance.
-     * @param state Properties you wish to set on the new objects.
-     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
-     * WARNING Avoid using two different .enclose() functions that expect different arguments.
-     * .enclose() functions that take arguments should not be considered safe to compose
-     * with other .enclose() functions that also take arguments. Taking arguments with
-     * an .enclose() function is an anti-pattern that should be avoided, when possible.
-     * @return A new object composed of the Stamps and prototypes provided.
-     */
-    (state?: {}, ...encloseArgs: any[]): any;
-
-    /**
-     * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
-     * @param state Properties you wish to set on the new objects.
-     * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
-     * WARNING Avoid using two different .enclose() functions that expect different arguments.
-     * .enclose() functions that take arguments should not be considered safe to compose
-     * with other .enclose() functions that also take arguments. Taking arguments with
-     * an .enclose() function is an anti-pattern that should be avoided, when possible.
-     * @return A new object composed of the Stamps and prototypes provided.
-     */
-    create(state?: {}, ...encloseArgs: any[]): any;
-
-    /**
-     * Stamp metadata/composer function
-     */
-    compose: Descriptor;
-
-    /**
-     * Add methods to the methods prototype.  Creates and returns new Stamp. Chainable.
-     * @param methods Object(s) containing map of method names and bodies for delegation.
-     * @return A new Stamp.
-     */
-    methods(...methods: Array<{}>): Stamp;
-
-    /**
-     * Take n objects and add them to the state prototype. Creates and returns new Stamp. Chainable.
-     * @param states Object(s) containing map of property names and values to clone for each new object.
-     * @return A new Stamp.
-     */
-    refs(...states: Array<{}>): Stamp;
-
-    /**
-     * Take a variable number of objects and shallow assign them to any future
-     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
-     * @param objects Object(s) to shallow assign for each new object.
-     * @return A new Stamp.
-     */
-    props(...objects: Array<{}>): Stamp;
-
-    /**
-     * Take a variable number of objects and shallow assign them to any future
-     * created instance of the Stamp. Creates and returns new Stamp. Chainable.
-     * @param objects Object(s) to shallow assign for each new object.
-     * @return A new Stamp.
-     */
-    properties(...objects: Array<{}>): Stamp;
-
-    /**
-     * Take a variable number of objects and deeply merge them to any future
-     * created instance of the Stamp. Creates and returns a new Stamp.
-     * Chainable.
-     * @param deepObjects The object(s) to deeply merge for each new object
-     * @returns A new Stamp
-     */
-    deepProps(...deepObjects: Array<{}>): Stamp;
-
-    /**
-     * Take a variable number of objects and deeply merge them to any future
-     * created instance of the Stamp. Creates and returns a new Stamp.
-     * Chainable.
-     * @param deepObjects The object(s) to deeply merge for each new object
-     * @returns A new Stamp
-     */
-    deepProperties(...deepObjects: Array<{}>): Stamp;
-
-    /**
-     * @deprecated Use .init() instead.
-     */
-    enclose(...functions: Init[]): Stamp;
-
-    /**
-     * @deprecated Use .init() instead.
-     */
-    enclose(...functions: Array<{}>): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers.
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    init(...functions: Init[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers.
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    init(functions: Init[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers.
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    initializers(...functions: Init[]): Stamp;
-
-    /**
-     * Take in a variable number of functions and add them to the enclose
-     * prototype as initializers.
-     * @param functions Initializer functions used to create private data and
-     * privileged methods
-     * @returns A new stamp
-     */
-    initializers(functions: Init[]): Stamp;
-
-    /**
-     * Take n objects and add them to a new stamp and any future stamp it composes with.
-     * Creates and returns new Stamp. Chainable.
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
-     * @return A new Stamp.
-     */
-    statics(...statics: Array<{}>): Stamp;
-
-    /**
-     * Take n objects and add them to a new stamp and any future stamp it composes with.
-     * Creates and returns new Stamp. Chainable.
-     * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
-     * @return A new Stamp.
-     */
-    staticProperties(...statics: Array<{}>): Stamp;
-
-    /**
-     * Deeply merge a variable number of objects and add them to a new stamp and
-     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
-     * @param deepStatics The object(s) containing static properties to be
-     * merged
-     * @returns A new stamp
-     */
-    deepStatics(...deepStatics: Array<{}>): Stamp;
-
-    /**
-     * Deeply merge a variable number of objects and add them to a new stamp and
-     * any future stamp it composes. Creates and returns a new Stamp. Chainable.
-     * @param deepStatics The object(s) containing static properties to be
-     * merged
-     * @returns A new stamp
-     */
-    staticDeepProperties(...deepStatics: Array<{}>): Stamp;
-
-    /**
-     * Shallowly assign properties of Stamp arbitrary metadata and add them to
-     * a new stamp and any future Stamp it composes. Creates and returns a new
-     * Stamp. Chainable.
-     * @param confs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    conf(...confs: Array<{}>): Stamp;
-
-    /**
-     * Shallowly assign properties of Stamp arbitrary metadata and add them to
-     * a new stamp and any future Stamp it composes. Creates and returns a new
-     * Stamp. Chainable.
-     * @param confs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    configuration(...confs: Array<{}>): Stamp;
-
-    /**
-     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
-     * Stamp and any future Stamp it composes. Creates and returns a new Stamp.
-     * Chainable.
-     * @param deepConfs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    deepConf(...deepConfs: Array<{}>): Stamp;
-
-    /**
-     * Deeply merge properties of Stamp arbitrary metadata and add them to a new
-     * Stamp and any future Stamp it composes. Creates and returns a new Stamp.
-     * Chainable.
-     * @param deepConfs The object(s) containing metadata properties
-     * @returns A new Stamp
-     */
-    deepConfiguration(...deepConfs: Array<{}>): Stamp;
-
-    /**
-     * Apply ES5 property descriptors to object instances created by the new
-     * Stamp returned by the function and any future Stamp it composes. Creates
-     * and returns a new stamp. Chainable.
-     * @param descriptors
-     * @returns A new Stamp
-     */
-    propertyDescriptors(...descriptors: Array<{}>): Stamp;
-
-    /**
-     * Apply ES5 property descriptors to a Stamp and any future Stamp it
-     * composes. Creates and returns a new stamp. Chainable.
-     * @param descriptors
-     * @returns A new Stamp
-     */
-    staticPropertyDescriptors(...descriptors: Array<{}>): Stamp;
-}
+/** Stampit Composable for main stampit() function */
+type StampitComposable = stampit.Stamp | Descriptor | Options;
 
 /**
  * Return a factory (aka Stamp) function that will produce new objects using the
@@ -354,9 +142,224 @@ interface Stamp {
  * @param options Stampit options object containing refs, methods,
  * init, props, statics, configurations, and property descriptors.
  */
-declare function stampit(options?: Options): Stamp;
+declare function stampit(...composables: StampitComposable[]): stampit.Stamp;
 
 declare namespace stampit {
+    /**
+     * A factory function that will produce new objects using the
+     * prototypes that are passed in or composed.
+     */
+    interface Stamp {
+        /**
+         * Invokes the stamp and returns a new object instance.
+         * @param state Properties you wish to set on the new objects.
+         * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
+         * WARNING Avoid using two different .enclose() functions that expect different arguments.
+         * .enclose() functions that take arguments should not be considered safe to compose
+         * with other .enclose() functions that also take arguments. Taking arguments with
+         * an .enclose() function is an anti-pattern that should be avoided, when possible.
+         * @return A new object composed of the Stamps and prototypes provided.
+         */
+        (state?: {}, ...encloseArgs: any[]): any;
+
+        /**
+         * Just like calling stamp(), stamp.create() invokes the stamp and returns a new instance.
+         * @param state Properties you wish to set on the new objects.
+         * @param encloseArgs The remaining arguments are passed to all .enclose() functions.
+         * WARNING Avoid using two different .enclose() functions that expect different arguments.
+         * .enclose() functions that take arguments should not be considered safe to compose
+         * with other .enclose() functions that also take arguments. Taking arguments with
+         * an .enclose() function is an anti-pattern that should be avoided, when possible.
+         * @return A new object composed of the Stamps and prototypes provided.
+         */
+        create(state?: {}, ...encloseArgs: any[]): any;
+
+        /**
+         * Stamp metadata/composer function
+         */
+        compose: Descriptor;
+
+        /**
+         * Add methods to the methods prototype.  Creates and returns new Stamp. Chainable.
+         * @param methods Object(s) containing map of method names and bodies for delegation.
+         * @return A new Stamp.
+         */
+        methods(...methods: Array<{}>): Stamp;
+
+        /**
+         * Take n objects and add them to the state prototype. Creates and returns new Stamp. Chainable.
+         * @param states Object(s) containing map of property names and values to clone for each new object.
+         * @return A new Stamp.
+         */
+        refs(...states: Array<{}>): Stamp;
+
+        /**
+         * Take a variable number of objects and shallow assign them to any future
+         * created instance of the Stamp. Creates and returns new Stamp. Chainable.
+         * @param objects Object(s) to shallow assign for each new object.
+         * @return A new Stamp.
+         */
+        props(...objects: Array<{}>): Stamp;
+
+        /**
+         * Take a variable number of objects and shallow assign them to any future
+         * created instance of the Stamp. Creates and returns new Stamp. Chainable.
+         * @param objects Object(s) to shallow assign for each new object.
+         * @return A new Stamp.
+         */
+        properties(...objects: Array<{}>): Stamp;
+
+        /**
+         * Take a variable number of objects and deeply merge them to any future
+         * created instance of the Stamp. Creates and returns a new Stamp.
+         * Chainable.
+         * @param deepObjects The object(s) to deeply merge for each new object
+         * @returns A new Stamp
+         */
+        deepProps(...deepObjects: Array<{}>): Stamp;
+
+        /**
+         * Take a variable number of objects and deeply merge them to any future
+         * created instance of the Stamp. Creates and returns a new Stamp.
+         * Chainable.
+         * @param deepObjects The object(s) to deeply merge for each new object
+         * @returns A new Stamp
+         */
+        deepProperties(...deepObjects: Array<{}>): Stamp;
+
+        /**
+         * @deprecated Use .init() instead.
+         */
+        enclose(...functions: Init[]): Stamp;
+
+        /**
+         * @deprecated Use .init() instead.
+         */
+        enclose(...functions: Array<{}>): Stamp;
+
+        /**
+         * Take in a variable number of functions and add them to the enclose
+         * prototype as initializers.
+         * @param functions Initializer functions used to create private data and
+         * privileged methods
+         * @returns A new stamp
+         */
+        init(...functions: Init[]): Stamp;
+
+        /**
+         * Take in a variable number of functions and add them to the enclose
+         * prototype as initializers.
+         * @param functions Initializer functions used to create private data and
+         * privileged methods
+         * @returns A new stamp
+         */
+        init(functions: Init[]): Stamp;
+
+        /**
+         * Take in a variable number of functions and add them to the enclose
+         * prototype as initializers.
+         * @param functions Initializer functions used to create private data and
+         * privileged methods
+         * @returns A new stamp
+         */
+        initializers(...functions: Init[]): Stamp;
+
+        /**
+         * Take in a variable number of functions and add them to the enclose
+         * prototype as initializers.
+         * @param functions Initializer functions used to create private data and
+         * privileged methods
+         * @returns A new stamp
+         */
+        initializers(functions: Init[]): Stamp;
+
+        /**
+         * Take n objects and add them to a new stamp and any future stamp it composes with.
+         * Creates and returns new Stamp. Chainable.
+         * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+         * @return A new Stamp.
+         */
+        statics(...statics: Array<{}>): Stamp;
+
+        /**
+         * Take n objects and add them to a new stamp and any future stamp it composes with.
+         * Creates and returns new Stamp. Chainable.
+         * @param statics Object(s) containing map of property names and values to mixin into each new stamp.
+         * @return A new Stamp.
+         */
+        staticProperties(...statics: Array<{}>): Stamp;
+
+        /**
+         * Deeply merge a variable number of objects and add them to a new stamp and
+         * any future stamp it composes. Creates and returns a new Stamp. Chainable.
+         * @param deepStatics The object(s) containing static properties to be
+         * merged
+         * @returns A new stamp
+         */
+        deepStatics(...deepStatics: Array<{}>): Stamp;
+
+        /**
+         * Deeply merge a variable number of objects and add them to a new stamp and
+         * any future stamp it composes. Creates and returns a new Stamp. Chainable.
+         * @param deepStatics The object(s) containing static properties to be
+         * merged
+         * @returns A new stamp
+         */
+        staticDeepProperties(...deepStatics: Array<{}>): Stamp;
+
+        /**
+         * Shallowly assign properties of Stamp arbitrary metadata and add them to
+         * a new stamp and any future Stamp it composes. Creates and returns a new
+         * Stamp. Chainable.
+         * @param confs The object(s) containing metadata properties
+         * @returns A new Stamp
+         */
+        conf(...confs: Array<{}>): Stamp;
+
+        /**
+         * Shallowly assign properties of Stamp arbitrary metadata and add them to
+         * a new stamp and any future Stamp it composes. Creates and returns a new
+         * Stamp. Chainable.
+         * @param confs The object(s) containing metadata properties
+         * @returns A new Stamp
+         */
+        configuration(...confs: Array<{}>): Stamp;
+
+        /**
+         * Deeply merge properties of Stamp arbitrary metadata and add them to a new
+         * Stamp and any future Stamp it composes. Creates and returns a new Stamp.
+         * Chainable.
+         * @param deepConfs The object(s) containing metadata properties
+         * @returns A new Stamp
+         */
+        deepConf(...deepConfs: Array<{}>): Stamp;
+
+        /**
+         * Deeply merge properties of Stamp arbitrary metadata and add them to a new
+         * Stamp and any future Stamp it composes. Creates and returns a new Stamp.
+         * Chainable.
+         * @param deepConfs The object(s) containing metadata properties
+         * @returns A new Stamp
+         */
+        deepConfiguration(...deepConfs: Array<{}>): Stamp;
+
+        /**
+         * Apply ES5 property descriptors to object instances created by the new
+         * Stamp returned by the function and any future Stamp it composes. Creates
+         * and returns a new stamp. Chainable.
+         * @param descriptors
+         * @returns A new Stamp
+         */
+        propertyDescriptors(...descriptors: Array<{}>): Stamp;
+
+        /**
+         * Apply ES5 property descriptors to a Stamp and any future Stamp it
+         * composes. Creates and returns a new stamp. Chainable.
+         * @param descriptors
+         * @returns A new Stamp
+         */
+        staticPropertyDescriptors(...descriptors: Array<{}>): Stamp;
+    }
     /**
      * A shortcut methods for stampit().methods()
      * @param methods Object(s) containing map of method names and bodies for delegation.
diff --git a/types/stampit/stampit-tests.ts b/types/stampit/stampit-tests.ts
index 410e2d2218..5b7c41109a 100644
--- a/types/stampit/stampit-tests.ts
+++ b/types/stampit/stampit-tests.ts
@@ -142,3 +142,22 @@ t.thing; // 'initialized',
 t.foo(); // 'foo',
 
 t.bar(); // 'bar'
+
+interface SomeStampInstance {
+    a: string;
+    b: string;
+}
+
+// Test import of stamp type
+interface SomeStamp extends stampit.Stamp {
+    (params: { a: number; b: boolean}): SomeStampInstance;
+}
+
+const SomeStamp = stampit()
+    .init((params: { a: number; b: boolean}) => {
+        this.a = '' + a;
+        this.b = '' + b;
+    }) as SomeStamp;
+
+SomeStamp({ a: 1, b: false }); // $ExpectType SomeStampInstance
+SomeStamp({ a: 1, b: false }).a; // $ExpectType string
diff --git a/types/starwars-names/index.d.ts b/types/starwars-names/index.d.ts
new file mode 100644
index 0000000000..54f4e17c3b
--- /dev/null
+++ b/types/starwars-names/index.d.ts
@@ -0,0 +1,9 @@
+// Type definitions for starwars-names 1.6
+// Project: https://github.com/kentcdodds/starwars-names#readme
+// Definitions by: Claas Ahlrichs <https://github.com/claasahl>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace starwarsNames;
+export const all: string[];
+export function random(): string;
+export function random(number: number): string[];
diff --git a/types/starwars-names/starwars-names-tests.ts b/types/starwars-names/starwars-names-tests.ts
new file mode 100644
index 0000000000..bb2f4dc232
--- /dev/null
+++ b/types/starwars-names/starwars-names-tests.ts
@@ -0,0 +1,5 @@
+import * as names from "starwars-names";
+
+const allNames = names.all;
+const randomName = names.random();
+const threeRandomNames = names.random(3);
diff --git a/types/starwars-names/tsconfig.json b/types/starwars-names/tsconfig.json
new file mode 100644
index 0000000000..009a9d6ef3
--- /dev/null
+++ b/types/starwars-names/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",
+        "starwars-names-tests.ts"
+    ]
+}
diff --git a/types/starwars-names/tslint.json b/types/starwars-names/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/starwars-names/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/steam-login/index.d.ts b/types/steam-login/index.d.ts
new file mode 100644
index 0000000000..849a45b920
--- /dev/null
+++ b/types/steam-login/index.d.ts
@@ -0,0 +1,61 @@
+// Type definitions for steam-login 0.1
+// Project: http://github.com/cpancake/steam-login
+// Definitions by: Nick Winans <https://github.com/Nicell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { Request, RequestHandler } from 'express';
+
+export interface MiddlewareOptions {
+    verify: string;
+    realm: string;
+    apiKey: string;
+    useSession?: boolean;
+}
+
+export interface SteamUser {
+    _json: {
+        steamid: string;
+        personaname: string;
+        profileurl: string;
+        avatar: string;
+        avatarmedium: string;
+        avatarfull: string;
+        personastate: number;
+        communityvisibilitystate: number;
+        profilestate?: number;
+        lastlogoff: number;
+        commentpermission?: number;
+        realname?: string;
+        primaryclanid?: string;
+        timecreated?: number;
+        gameid?: string;
+        gameserverip?: string;
+        gameextrainfo?: string;
+        loccountrycode?: string;
+        locstatecode?: string;
+        loccityid?: number;
+    };
+    steamid: string;
+    username: string;
+    name: string;
+    profile: string;
+    avatar: {
+        small: string;
+        medium: string;
+        large: string;
+    };
+}
+
+export interface SteamRequest extends Request {
+    logout?(): (req: Request) => () => void;
+    user?: SteamUser;
+}
+
+export function middleware(opts: MiddlewareOptions): RequestHandler;
+
+export function enforceLogin(redirect: string): RequestHandler;
+
+export function verify(): RequestHandler;
+
+export function authenticate(): RequestHandler;
diff --git a/types/steam-login/steam-login-tests.ts b/types/steam-login/steam-login-tests.ts
new file mode 100644
index 0000000000..84eae31a01
--- /dev/null
+++ b/types/steam-login/steam-login-tests.ts
@@ -0,0 +1,35 @@
+// Port of https://github.com/cpancake/steam-login/blob/master/example.js
+
+import * as express from 'express';
+import * as steam from 'steam-login';
+import * as session from 'express-session';
+
+const app = express();
+
+app.use(session({ resave: false, saveUninitialized: false, secret: 'a secret' }));
+app.use(steam.middleware({
+    realm: 'http://localhost:3000/',
+    verify: 'http://localhost:3000/verify',
+    apiKey: process.argv[2]
+}
+));
+
+app.get('/', (req: steam.SteamRequest, res) => {
+    res.send(req.user == null ? 'not logged in' : 'hello ' + req.user.username).end();
+});
+
+app.get('/authenticate', steam.authenticate(), (req, res) => {
+    res.redirect('/');
+});
+
+app.get('/verify', steam.verify(), (req: steam.SteamRequest, res) => {
+    res.send(req.user).end();
+});
+
+app.get('/logout', steam.enforceLogin('/'), (req: steam.SteamRequest, res) => {
+    req.logout ? req.logout() : null;
+    res.redirect('/');
+});
+
+app.listen(3000);
+console.log('listening');
diff --git a/types/steam-login/tsconfig.json b/types/steam-login/tsconfig.json
new file mode 100644
index 0000000000..8548e16277
--- /dev/null
+++ b/types/steam-login/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",
+        "steam-login-tests.ts"
+    ]
+}
diff --git a/types/steam-login/tslint.json b/types/steam-login/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/steam-login/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stellar-sdk/index.d.ts b/types/stellar-sdk/index.d.ts
index f7eb20af73..3f963ab18d 100644
--- a/types/stellar-sdk/index.d.ts
+++ b/types/stellar-sdk/index.d.ts
@@ -2,6 +2,8 @@
 // Project: https://github.com/stellar/js-stellar-sdk
 // Definitions by: Carl Foster <https://github.com/carl-foster>
 //                 Triston Jones <https://github.com/tristonj>
+//                 Paul Selden <https://github.com/pselden>
+//                 Max Bause <https://github.com/maxbause>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 
@@ -20,7 +22,7 @@ export class CallBuilder<T extends Record> {
     cursor(cursor: string): this;
     limit(limit: number): this;
     order(direction: 'asc' | 'desc'): this;
-    stream(options?: { onmessage?: () => void, onerror?: () => void }): () => void;
+    stream(options?: { onmessage?: (record: T) => void, onerror?: (error: Error) => void }): () => void;
 }
 
 export interface CollectionPage<T extends Record> {
@@ -505,16 +507,22 @@ export class Memo {
     static return(hash: string): Memo;
     static text(text: string): Memo;
 
-    constructor(type: 'MemoNone')
-    constructor(type: 'MemoID' | 'MemoText', value: string)
-    constructor(type: 'MemoHash' | 'MemoReturn', value: Buffer)
+    constructor(type: 'none');
+    constructor(type: 'id' | 'text' | 'hash' | 'return', value: string)
+    constructor(type: 'hash' | 'return', value: Buffer)
 
-    type: 'MemoNone' | 'MemoID' | 'MemoText' | 'MemoHash' | 'MemoReturn';
+    type: string;
     value: null | string | Buffer;
 
     toXDRObject(): xdr.Memo;
 }
 
+export const MemoNone = 'none';
+export const MemoID = 'id';
+export const MemoText = 'text';
+export const MemoHash = 'hash';
+export const MemoReturn = 'return';
+
 export enum Networks {
     PUBLIC = 'Public Global Stellar Network ; September 2015',
     TESTNET = 'Test SDF Network ; September 2015',
@@ -817,6 +825,7 @@ export class Transaction {
     fee: number;
     source: string;
     memo: Memo;
+    signatures: xdr.DecoratedSignature[];
 }
 
 export class TransactionBuilder {
@@ -854,9 +863,11 @@ export class Keypair {
 
     publicKey(): string;
     secret(): string;
+    rawPublicKey(): Buffer;
     rawSecretKey(): Buffer;
     canSign(): boolean;
     sign(data: Buffer): Buffer;
+    signatureHint(): xdr.SignatureHint;
     verify(data: Buffer, signature: Buffer): boolean;
 }
 
@@ -868,4 +879,9 @@ export namespace xdr {
     class Asset extends XDRStruct { }
     class Memo extends XDRStruct { }
     class TransactionEnvelope extends XDRStruct { }
+    class DecoratedSignature extends XDRStruct {
+      constructor(keys: { hint: SignatureHint, signature: Signature })
+    }
+    class SignatureHint { }
+    class Signature { }
 }
diff --git a/types/stellar-sdk/stellar-sdk-tests.ts b/types/stellar-sdk/stellar-sdk-tests.ts
index 4bd84ccc33..dabf4f2b45 100644
--- a/types/stellar-sdk/stellar-sdk-tests.ts
+++ b/types/stellar-sdk/stellar-sdk-tests.ts
@@ -5,5 +5,6 @@ const destKey = StellarSdk.Keypair.random();
 const account = new StellarSdk.Account(sourceKey.publicKey(), 1);
 const transaction = new StellarSdk.TransactionBuilder(account)
     .addOperation(StellarSdk.Operation.accountMerge({destination: destKey.publicKey()}))
+    .addMemo(new StellarSdk.Memo(StellarSdk.MemoText, "memo"))
     .build(); // $ExpectType () => Transaction
 transaction; // $ExpectType Transaction
diff --git a/types/stompjs/index.d.ts b/types/stompjs/index.d.ts
index 4c591367dc..ced22109d3 100644
--- a/types/stompjs/index.d.ts
+++ b/types/stompjs/index.d.ts
@@ -26,9 +26,9 @@ export class Client {
 
     debug(...args: string[]): any;
 
-    connect(headers: { login: string, passcode: string, host?: string }, connectCallback: (frame?: Frame) => any, errorCallback?: (error: string) => any): any;
-    connect(headers: { }, connectCallback: (frame?: Frame) => any, errorCallback?: (error: string) => any): any;
-    connect(login: string, passcode: string, connectCallback: (frame?: Frame) => any, errorCallback?: (error: string) => any, host?: string): any;
+    connect(headers: { login: string, passcode: string, host?: string }, connectCallback: (frame?: Frame) => any, errorCallback?: (error: Frame | string) => any): any;
+    connect(headers: { }, connectCallback: (frame?: Frame) => any, errorCallback?: (error: Frame | string) => any): any;
+    connect(login: string, passcode: string, connectCallback: (frame?: Frame) => any, errorCallback?: (error: Frame | string) => any, host?: string): any;
     disconnect(disconnectCallback: () => any, headers?: {}): any;
 
     send(destination: string, headers?: {}, body?: string): any;
diff --git a/types/storejs/index.d.ts b/types/store/index.d.ts
similarity index 79%
rename from types/storejs/index.d.ts
rename to types/store/index.d.ts
index f720d33617..8f46bb9f59 100644
--- a/types/storejs/index.d.ts
+++ b/types/store/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for store.js 2.0
-// Project: https://github.com/marcuswestin/store.js/
+// Type definitions for store 2.0
+// Project: https://github.com/marcuswestin/store.js#readme
 // Definitions by: Vincent Bortone <https://github.com/vbortone>
 //                 harry0000 <https://github.com/harry0000>
+//                 Roman Nuritdinov (Ky6uk) <https://github.com/Ky6uk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 // Cross-browser storage for all use cases, used across the web.
@@ -28,6 +29,18 @@ declare const store: StoreJsAPI;
 declare module 'store' {
     export = store;
 }
+declare module 'store/dist/store.legacy' {
+    export = store;
+}
+declare module 'store/dist/store.legacy.min' {
+    export = store;
+}
+declare module 'store/dist/store.modern' {
+    export = store;
+}
+declare module 'store/dist/store.modern.min' {
+    export = store;
+}
 
 declare const engine: StoreJsEngine;
 declare module 'store/src/store-engine' {
diff --git a/types/storejs/storejs-tests.ts b/types/store/store-tests.ts
similarity index 98%
rename from types/storejs/storejs-tests.ts
rename to types/store/store-tests.ts
index 9e631385f5..a992327908 100644
--- a/types/storejs/storejs-tests.ts
+++ b/types/store/store-tests.ts
@@ -1,4 +1,3 @@
-// Tests for storagejs.d.ts
 import * as store from 'store';
 import * as engine from 'store/src/store-engine';
 import * as allPlugin from 'store/plugins/all';
diff --git a/types/store/tsconfig.json b/types/store/tsconfig.json
new file mode 100644
index 0000000000..0a81987271
--- /dev/null
+++ b/types/store/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",
+        "store-tests.ts"
+    ]
+}
diff --git a/types/store/tslint.json b/types/store/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/store/tslint.json
@@ -0,0 +1,79 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "adjacent-overload-signatures": false,
+        "array-type": false,
+        "arrow-return-shorthand": false,
+        "ban-types": false,
+        "callable-types": false,
+        "comment-format": false,
+        "dt-header": false,
+        "eofline": false,
+        "export-just-namespace": false,
+        "import-spacing": false,
+        "interface-name": false,
+        "interface-over-type-literal": false,
+        "jsdoc-format": false,
+        "max-line-length": false,
+        "member-access": false,
+        "new-parens": false,
+        "no-any-union": false,
+        "no-boolean-literal-compare": false,
+        "no-conditional-assignment": false,
+        "no-consecutive-blank-lines": false,
+        "no-construct": false,
+        "no-declare-current-package": false,
+        "no-duplicate-imports": false,
+        "no-duplicate-variable": false,
+        "no-empty-interface": false,
+        "no-for-in-array": false,
+        "no-inferrable-types": false,
+        "no-internal-module": false,
+        "no-irregular-whitespace": false,
+        "no-mergeable-namespace": false,
+        "no-misused-new": false,
+        "no-namespace": false,
+        "no-object-literal-type-assertion": false,
+        "no-padding": false,
+        "no-redundant-jsdoc": false,
+        "no-redundant-jsdoc-2": false,
+        "no-redundant-undefined": false,
+        "no-reference-import": false,
+        "no-relative-import-in-test": false,
+        "no-self-import": false,
+        "no-single-declare-module": false,
+        "no-string-throw": false,
+        "no-unnecessary-callback-wrapper": false,
+        "no-unnecessary-class": false,
+        "no-unnecessary-generics": false,
+        "no-unnecessary-qualifier": false,
+        "no-unnecessary-type-assertion": false,
+        "no-useless-files": false,
+        "no-var-keyword": false,
+        "no-var-requires": false,
+        "no-void-expression": false,
+        "no-trailing-whitespace": false,
+        "object-literal-key-quotes": false,
+        "object-literal-shorthand": false,
+        "one-line": false,
+        "one-variable-per-declaration": false,
+        "only-arrow-functions": false,
+        "prefer-conditional-expression": false,
+        "prefer-const": false,
+        "prefer-declare-function": false,
+        "prefer-for-of": false,
+        "prefer-method-signature": false,
+        "prefer-template": false,
+        "radix": false,
+        "semicolon": false,
+        "space-before-function-paren": false,
+        "space-within-parens": false,
+        "strict-export-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/index.d.ts b/types/store/v1/index.d.ts
similarity index 100%
rename from types/storejs/v1/index.d.ts
rename to types/store/v1/index.d.ts
diff --git a/types/storejs/v1/storejs-tests.ts b/types/store/v1/store-tests.ts
similarity index 95%
rename from types/storejs/v1/storejs-tests.ts
rename to types/store/v1/store-tests.ts
index fd0e0f25c3..8446cb011d 100644
--- a/types/storejs/v1/storejs-tests.ts
+++ b/types/store/v1/store-tests.ts
@@ -1,4 +1,3 @@
-// Tests for storagejs.d.ts
 import * as store from 'store';
 
 // Store 'marcus' at 'username'
diff --git a/types/storejs/v1/tsconfig.json b/types/store/v1/tsconfig.json
similarity index 86%
rename from types/storejs/v1/tsconfig.json
rename to types/store/v1/tsconfig.json
index 2d062255ed..6a2ff37411 100644
--- a/types/storejs/v1/tsconfig.json
+++ b/types/store/v1/tsconfig.json
@@ -15,8 +15,8 @@
         ],
         "types": [],
         "paths": {
-            "storejs": [
-                "storejs/v1"
+            "store": [
+                "store/v1"
             ]
         },
         "noEmit": true,
@@ -24,6 +24,6 @@
     },
     "files": [
         "index.d.ts",
-        "storejs-tests.ts"
+        "store-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/store/v1/tslint.json b/types/store/v1/tslint.json
new file mode 100644
index 0000000000..a41bf5d19a
--- /dev/null
+++ b/types/store/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-jsx/index.d.ts b/types/storybook-addon-jsx/index.d.ts
new file mode 100644
index 0000000000..80ec756d3a
--- /dev/null
+++ b/types/storybook-addon-jsx/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for storybook-addon-jsx 5.3
+// Project: https://github.com/storybooks/storybook
+// Definitions by: James Newell <https://github.com/jameslnewell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import '@storybook/react';
+import { ReactNode } from 'react';
+
+declare module '@storybook/react' {
+    interface Story {
+        addWithJSX(kind: string, fn: () => ReactNode): Story;
+    }
+}
diff --git a/types/storybook-addon-jsx/storybook-addon-jsx-tests.tsx b/types/storybook-addon-jsx/storybook-addon-jsx-tests.tsx
new file mode 100644
index 0000000000..b0edecc897
--- /dev/null
+++ b/types/storybook-addon-jsx/storybook-addon-jsx-tests.tsx
@@ -0,0 +1,10 @@
+/// <reference types="storybook__react" />
+
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+
+const { Component } = React;
+
+storiesOf('Component', module)
+  .addWithJSX('simple info', () =>
+  <Component>Click the "?" mark at top-right to view the info.</Component>);
diff --git a/types/storybook-addon-jsx/tsconfig.json b/types/storybook-addon-jsx/tsconfig.json
new file mode 100644
index 0000000000..796cf9d391
--- /dev/null
+++ b/types/storybook-addon-jsx/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@storybook/react": [
+                "storybook__react"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook-addon-jsx-tests.tsx"
+    ]
+}
diff --git a/types/storybook-addon-jsx/tslint.json b/types/storybook-addon-jsx/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook-addon-jsx/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__addon-a11y/index.d.ts b/types/storybook__addon-a11y/index.d.ts
index c29f546b6f..7e7ac3b89e 100644
--- a/types/storybook__addon-a11y/index.d.ts
+++ b/types/storybook__addon-a11y/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/storybooks/storybook
 // Definitions by: HyunSeob <https://github.com/hyunseob>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { StoryDecorator } from '@storybook/react';
 
diff --git a/types/storybook__addon-actions/index.d.ts b/types/storybook__addon-actions/index.d.ts
index 2d5cc73ef8..680777948c 100644
--- a/types/storybook__addon-actions/index.d.ts
+++ b/types/storybook__addon-actions/index.d.ts
@@ -1,11 +1,17 @@
-// Type definitions for @storybook/addon-actions 3.0
+// Type definitions for @storybook/addon-actions 3.4
 // Project: https://github.com/storybooks/storybook
-// Definitions by: Joscha Feth <https://github.com/joscha>
+// Definitions by: Joscha Feth <https://github.com/joscha>, June <https://github.com/jicjjang>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 export type HandlerFunction = (...args: any[]) => undefined;
 export type DecoratorFunction = (args: any[]) => any[];
+export interface Options {
+    depth?: number;
+    clearOnStoryChange?: boolean;
+    limit?: number;
+}
 
-export function decorateAction(decorators: DecoratorFunction[]): (name: string) => HandlerFunction;
+export function decorateAction(decorators: DecoratorFunction[]): (name: string, options?: Options) => HandlerFunction;
+export function configureActions(options: Options): undefined;
 export function action(name: string): HandlerFunction;
diff --git a/types/storybook__addon-actions/storybook__addon-actions-tests.tsx b/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
index b9c9bbba7f..2011694cb7 100644
--- a/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
+++ b/types/storybook__addon-actions/storybook__addon-actions-tests.tsx
@@ -2,7 +2,11 @@
 
 import * as React from 'react';
 import { storiesOf } from '@storybook/react';
-import { action, decorateAction } from '@storybook/addon-actions';
+import { action, decorateAction, configureActions } from '@storybook/addon-actions';
+
+configureActions({
+    depth: 100
+});
 
 const firstArgAction = decorateAction([
     args => args.slice(0, 1)
diff --git a/types/storybook__addon-backgrounds/index.d.ts b/types/storybook__addon-backgrounds/index.d.ts
index c76a6d160e..68b4a3d18b 100644
--- a/types/storybook__addon-backgrounds/index.d.ts
+++ b/types/storybook__addon-backgrounds/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/storybooks/storybook
 // Definitions by: HyunSeob <https://github.com/hyunseob>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { StoryDecorator } from '@storybook/react';
 
diff --git a/types/storybook__addon-centered/angular.d.ts b/types/storybook__addon-centered/angular.d.ts
new file mode 100644
index 0000000000..a8edb18a28
--- /dev/null
+++ b/types/storybook__addon-centered/angular.d.ts
@@ -0,0 +1,2 @@
+import centered from "./index";
+export default centered;
diff --git a/types/storybook__addon-centered/index.d.ts b/types/storybook__addon-centered/index.d.ts
new file mode 100644
index 0000000000..23c7a06d97
--- /dev/null
+++ b/types/storybook__addon-centered/index.d.ts
@@ -0,0 +1,11 @@
+// Type definitions for @storybook/addon-centered 3.3
+// Project: https://github.com/storybooks/storybook
+// Definitions by: kiyopikko <https://github.com/kiyopikko>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from "react";
+import { StoryDecorator } from "@storybook/react";
+
+declare const centered: StoryDecorator;
+export default centered;
diff --git a/types/storybook__addon-centered/mithril.d.ts b/types/storybook__addon-centered/mithril.d.ts
new file mode 100644
index 0000000000..a8edb18a28
--- /dev/null
+++ b/types/storybook__addon-centered/mithril.d.ts
@@ -0,0 +1,2 @@
+import centered from "./index";
+export default centered;
diff --git a/types/storybook__addon-centered/storybook__addon-centered-tests.tsx b/types/storybook__addon-centered/storybook__addon-centered-tests.tsx
new file mode 100644
index 0000000000..c21574476c
--- /dev/null
+++ b/types/storybook__addon-centered/storybook__addon-centered-tests.tsx
@@ -0,0 +1,7 @@
+import * as React from "react";
+import { storiesOf } from "@storybook/react";
+import centered from "@storybook/addon-centered";
+
+storiesOf("Centered", module)
+    .addDecorator(centered)
+    .add("Hello", () => <div>Hello</div>);
diff --git a/types/storybook__addon-centered/tsconfig.json b/types/storybook__addon-centered/tsconfig.json
new file mode 100644
index 0000000000..12603bd6e5
--- /dev/null
+++ b/types/storybook__addon-centered/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": ["../"],
+        "paths": {
+            "@storybook/addon-centered": ["storybook__addon-centered"],
+            "@storybook/react": ["storybook__react"]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "angular.d.ts",
+        "index.d.ts",
+        "mithril.d.ts",
+        "storybook__addon-centered-tests.tsx"
+    ]
+}
diff --git a/types/storybook__addon-centered/tslint.json b/types/storybook__addon-centered/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/storybook__addon-centered/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/storybook__addon-info/index.d.ts b/types/storybook__addon-info/index.d.ts
index c616933b8f..b460823f50 100644
--- a/types/storybook__addon-info/index.d.ts
+++ b/types/storybook__addon-info/index.d.ts
@@ -1,9 +1,9 @@
-// Type definitions for @storybook/addon-info 3.2
+// Type definitions for @storybook/addon-info 3.4
 // 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.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { RenderFunction } from '@storybook/react';
@@ -29,6 +29,6 @@ export interface Options {
   maxPropStringLength?: number;
 }
 
-export function withInfo(textOrOptions: string | Options): (storyFn: RenderFunction) => (context?: object) => React.ReactElement<WrapStoryProps>;
+export function withInfo(textOrOptions?: string | Options): (storyFn: RenderFunction) => (context?: object) => 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 b51a48c4cc..46fd799314 100644
--- a/types/storybook__addon-info/storybook__addon-info-tests.tsx
+++ b/types/storybook__addon-info/storybook__addon-info-tests.tsx
@@ -12,6 +12,11 @@ setDefaults({
 });
 
 storiesOf('Component', module)
+  .add('no info',
+       withInfo()(() =>
+         <Component>Click the "?" mark at top-right to view the info.</Component>
+       )
+  )
   .add('simple info',
        withInfo('doc string about my component')(() =>
          <Component>Click the "?" mark at top-right to view the info.</Component>
diff --git a/types/storybook__addon-jest/index.d.ts b/types/storybook__addon-jest/index.d.ts
new file mode 100644
index 0000000000..a84b2588cd
--- /dev/null
+++ b/types/storybook__addon-jest/index.d.ts
@@ -0,0 +1,16 @@
+// Type definitions for @storybook/addon-jest 3.4
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Matt Oliver <https://github.com/halfmatthalfcat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { StoryDecorator } from '@storybook/react';
+
+export type SpecsFunction = (...specs: string[]) => StoryDecorator;
+
+export interface Options {
+    results: object;
+    filesExt?: string;
+}
+
+export function withTests(options: Options): SpecsFunction;
diff --git a/types/storybook__addon-jest/storybook__addon-jest-tests.tsx b/types/storybook__addon-jest/storybook__addon-jest-tests.tsx
new file mode 100644
index 0000000000..50fe58a12c
--- /dev/null
+++ b/types/storybook__addon-jest/storybook__addon-jest-tests.tsx
@@ -0,0 +1,53 @@
+/// <reference types="storybook__react" />
+
+import * as React from 'react';
+import { storiesOf } from '@storybook/react';
+import { withTests } from '@storybook/addon-jest';
+
+const testDecorator = withTests({
+    results: {
+        numFailedTestSuites: 0,
+        numFailedTests: 0,
+        numPassedTestSuites: 1,
+        numPassedTests: 1,
+        numPendingTestSuites: 0,
+        numPendingTests: 0,
+        numRuntimeErrorTestSuites: 0,
+        numTotalTestSuites: 1,
+        numTotalTests: 1,
+        startTime: 1533301378256,
+        success: true,
+        testResults: [
+            {
+                assertionResults: [
+                    {
+                        ancestorTitles: [
+                            'TestComponent',
+                            'Basic'
+                        ],
+                        failureMessages: [],
+                        fullName: 'TestComponent Basic should render without error',
+                        location: null,
+                        status: 'passed',
+                        title: 'should render without error',
+                    }
+                ],
+                endTime: 1533301381197,
+                message: '',
+                name: '/path/to/tests',
+                startTime: 1533301379074,
+                status: 'passed',
+                summary: ''
+            }
+        ],
+        wasInterrupted: false,
+    },
+});
+
+storiesOf('Test', module)
+    .addDecorator(testDecorator('test'))
+    .add('test', () => (
+        <button>
+          Hello World!
+        </button>
+    ));
diff --git a/types/storybook__addon-jest/tsconfig.json b/types/storybook__addon-jest/tsconfig.json
new file mode 100644
index 0000000000..637b2b6bc8
--- /dev/null
+++ b/types/storybook__addon-jest/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-jest": [
+                "storybook__addon-jest"
+            ],
+            "@storybook/react": [
+                "storybook__react"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__addon-jest-tests.tsx"
+    ]
+}
diff --git a/types/storybook__addon-jest/tslint.json b/types/storybook__addon-jest/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/storybook__addon-jest/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/storybook__addon-knobs/index.d.ts b/types/storybook__addon-knobs/index.d.ts
index 3c9bbe0fc4..8c3ddc35f8 100644
--- a/types/storybook__addon-knobs/index.d.ts
+++ b/types/storybook__addon-knobs/index.d.ts
@@ -1,9 +1,10 @@
-// Type definitions for @storybook/addon-knobs 3.3
+// Type definitions for @storybook/addon-knobs 3.4
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Martynas Kadisa <https://github.com/martynaskadisa>
+//                 A.MacLeay <https://github.com/amacleay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { RenderFunction } from '@storybook/react';
@@ -49,11 +50,14 @@ export function object<T>(name: string, value: T, groupId?: string): T;
 export type SelectValue = string | number;
 export function select<T extends string>(name: string, options: { [s: string]: string }, value: T, groupId?: string): T;
 export function select<T extends number>(name: string, options: { [s: number]: string }, value: T, groupId?: string): T;
-export function select<T extends SelectValue>(name: string, options: T[], value: T, groupId?: string): T;
+export function select<T extends SelectValue>(name: string, options: ReadonlyArray<T>, value: T, groupId?: string): T;
+
+export function selectV2<T extends string | number>(name: string, options: { [s: string]: T | T[] }, value: T | T[], groupId?: string): T;
+export function selectV2<T extends SelectValue>(name: string, options: T[], value: T, groupId?: string): T;
 
 export function date(name: string, value?: Date, groupId?: string): Date;
 
-export function array<T>(name: string, value: T[], separator?: string, groupId?: string): T[];
+export function array<T>(name: string, value: ReadonlyArray<T>, separator?: string, groupId?: string): T[];
 
 export function button(name: string, handler: () => any, groupId?: string): void;
 
diff --git a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
index c35268ac6b..85155fc5c7 100644
--- a/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
+++ b/types/storybook__addon-knobs/storybook__addon-knobs-tests.tsx
@@ -14,6 +14,7 @@ import {
   array,
   button,
   knob,
+  selectV2,
 } from '@storybook/addon-knobs';
 
 enum SomeEnum {
@@ -49,13 +50,16 @@ stories.add('with all knobs', () => {
 
   type X = 'a' | 'b';
 
-  const genericSelect: X = select<X>('Some generic select', { a: 'type a', b: 'type 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 genericSelectV2: X = selectV2<X>('Some generic select', { 'type a': 'a', 'type b': 'b' }, 'b');
+  const genericSelectV2Enum: SomeEnum = selectV2<SomeEnum>('Some generic select v2', { 'type a': SomeEnum.Type1, 'type b': SomeEnum.Type2 }, SomeEnum.Type2);
+
   const genericArray: string[] = array<string>('Some generic array', ['red', 'green', 'blue']);
 
   const genericKnob: X = knob<X>('Some generic knob', { value: 'a', type: 'text' });
@@ -90,6 +94,14 @@ stories.add('dynamic knobs', () => {
   );
 });
 
+const readonlyOptionsArray: ReadonlyArray<string> = ['hi'];
+select('With readonly array', readonlyOptionsArray, readonlyOptionsArray[0]);
+
+const genericArray = array('With regular array', ['hi', 'there']);
+
+const userInputArray = array('With readonly array', readonlyOptionsArray);
+userInputArray.push('Make sure that the output is still mutable although the input need not be!');
+
 // groups
 const groupId = 'GROUP-ID1';
 
diff --git a/types/storybook__addon-links/index.d.ts b/types/storybook__addon-links/index.d.ts
index 99a9edc492..4d25a7150e 100644
--- a/types/storybook__addon-links/index.d.ts
+++ b/types/storybook__addon-links/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Joscha Feth <https://github.com/joscha>,
 //                 Jesse Pinho <https://github.com/jessepinho>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 
diff --git a/types/storybook__addon-notes/index.d.ts b/types/storybook__addon-notes/index.d.ts
index e8b6f5934a..f212cbce63 100644
--- a/types/storybook__addon-notes/index.d.ts
+++ b/types/storybook__addon-notes/index.d.ts
@@ -1,13 +1,15 @@
 // Type definitions for @storybook/addon-notes 3.3
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
+//                 A.MacLeay <https://github.com/amacleay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { RenderFunction } from '@storybook/react';
 
 export function withNotes(textOrOptions: string | object): (getStory: RenderFunction) => RenderFunction;
+export function withMarkdownNotes(text: string): (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 2ad783cc5d..cf3108fc6d 100644
--- a/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
+++ b/types/storybook__addon-notes/storybook__addon-notes-tests.tsx
@@ -1,7 +1,13 @@
 import * as React from 'react';
 
 import { storiesOf } from '@storybook/react';
-import { withNotes, WithNotes } from '@storybook/addon-notes';
+import { withNotes, withMarkdownNotes, WithNotes } from '@storybook/addon-notes';
+
+const SIMPLE_MARKDOWN = `
+## Markdown for component
+
+A very simple component with markdown notes
+`;
 
 storiesOf('Component', module)
   .add('with some emoji', () => (
@@ -13,4 +19,9 @@ storiesOf('Component', module)
     withNotes('A very simple component')(
       () => (<div>my component</div>)
     )
+  )
+  .add('with withMarkdownNotes',
+    withMarkdownNotes(SIMPLE_MARKDOWN)(
+      () => (<div>my component</div>)
+    )
   );
diff --git a/types/storybook__addon-options/index.d.ts b/types/storybook__addon-options/index.d.ts
index 9e5876101d..61f9f11def 100644
--- a/types/storybook__addon-options/index.d.ts
+++ b/types/storybook__addon-options/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/storybooks/storybook
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Simon Helle Nielsen <https://github.com/simonhn>
+//                 A.MacLeay <https://github.com/amacleay>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -9,13 +10,17 @@ export interface Options {
     name?: string;
     url?: string;
     goFullScreen?: boolean;
-    showLeftPanel?: boolean;
-    showDownPanel?: boolean;
+    showLeftPanel?: boolean; // deprecated, use showStoriesPanel
+    showStoriesPanel?: boolean;
+    showDownPanel?: boolean; // deprecated; use showAddonPanel
+    showAddonPanel?: boolean;
     showSearchBox?: boolean;
-    downPanelInRight?: boolean;
+    downPanelInRight?: boolean; // deprecated; use addonPanelInRight
+    addonPanelInRight?: boolean;
     sortStoriesByKind?: boolean;
     hierarchySeparator?: RegExp | string;
     hierarchyRootSeparator?: RegExp | string;
+    selectedAddonPanel?: string;
 }
 
 export function setOptions(options: Options): void;
diff --git a/types/storybook__addon-options/storybook__addon-options-tests.ts b/types/storybook__addon-options/storybook__addon-options-tests.ts
index c19307564c..a3003c913f 100644
--- a/types/storybook__addon-options/storybook__addon-options-tests.ts
+++ b/types/storybook__addon-options/storybook__addon-options-tests.ts
@@ -4,6 +4,20 @@ setOptions({
   name: 'My Storybook',
   url: 'https://example.com',
   goFullScreen: false,
+  showStoriesPanel: false,
+  showAddonPanel: false,
+  showSearchBox: false,
+  addonPanelInRight: false,
+  sortStoriesByKind: false,
+  hierarchySeparator: /\//,
+  hierarchyRootSeparator: /\|/,
+  selectedAddonPanel: 'storybook/actions/action-panel',
+});
+
+setOptions({
+  name: 'My Storybook - deprecated options',
+  url: 'https://example.com',
+  goFullScreen: false,
   showLeftPanel: false,
   showDownPanel: false,
   showSearchBox: false,
diff --git a/types/storybook__addon-storyshots/index.d.ts b/types/storybook__addon-storyshots/index.d.ts
index e703f374da..dc1a2c5953 100644
--- a/types/storybook__addon-storyshots/index.d.ts
+++ b/types/storybook__addon-storyshots/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/storybooks/storybook/tree/master/addons/storyshots
 // Definitions by: Bradley Ayers <https://github.com/bradleyayers>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import * as React from 'react';
 import { StoryObject } from '@storybook/react';
diff --git a/types/storybook__react-native/index.d.ts b/types/storybook__react-native/index.d.ts
new file mode 100644
index 0000000000..3f46866129
--- /dev/null
+++ b/types/storybook__react-native/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for @storybook/react-native 3.0
+// Project: https://github.com/storybooks/storybook
+// Definitions by: Joscha Feth <https://github.com/joscha>
+//                 Anton Izmailov <https://github.com/wapgear>
+//                 Alec Hill <https://github.com/alechill>
+//                 Kyle Roach <https://github.com/iRoachie>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as React from 'react';
+
+export interface StorybookUIOptions {
+    onDeviceUI?: boolean;
+    disableWebsockets?: boolean;
+    secured?: boolean;
+    host?: string;
+    port?: number;
+    query?: string;
+}
+
+export function getStorybookUI(
+    options: StorybookUIOptions
+): React.ComponentClass;
+
+export * from '@storybook/react';
diff --git a/types/storybook__react-native/storybook__react-native-tests.tsx b/types/storybook__react-native/storybook__react-native-tests.tsx
new file mode 100644
index 0000000000..0afa37c1d6
--- /dev/null
+++ b/types/storybook__react-native/storybook__react-native-tests.tsx
@@ -0,0 +1,64 @@
+import * as React from 'react';
+import {
+    storiesOf,
+    setAddon,
+    addDecorator,
+    configure,
+    getStorybook,
+    RenderFunction,
+    getStorybookUI,
+    Story
+} from '@storybook/react-native';
+
+const Decorator = (story: RenderFunction) => <div>{story()}</div>;
+
+storiesOf('Welcome', module)
+    // local addDecorator
+    .addDecorator(Decorator)
+    .add('to Storybook', () => <div />)
+    .add('to Storybook as Array', () => [<div />, <div />]);
+
+// global addDecorator
+addDecorator(Decorator);
+
+// setAddon
+interface AnyAddon {
+    addWithSideEffect<T>(
+        this: Story & T,
+        storyName: string,
+        storyFn: RenderFunction
+    ): Story & T;
+}
+const AnyAddon: AnyAddon = {
+    addWithSideEffect<T>(
+        this: Story & T,
+        storyName: string,
+        storyFn: RenderFunction
+    ): Story & T {
+        console.log(this.kind === 'withAnyAddon');
+        return this.add(storyName, storyFn);
+    }
+};
+setAddon(AnyAddon);
+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
+configure(() => undefined, module);
+
+// getStorybook
+getStorybook().forEach(({ kind, stories }) =>
+    stories.forEach(({ name, render }) => render())
+);
+
+const StorybookUI = getStorybookUI({
+    port: 9001,
+    host: 'localhost',
+    onDeviceUI: true
+});
+
+const TestRender = () => <StorybookUI />;
diff --git a/types/storybook__react-native/tsconfig.json b/types/storybook__react-native/tsconfig.json
new file mode 100644
index 0000000000..bba1a459fa
--- /dev/null
+++ b/types/storybook__react-native/tsconfig.json
@@ -0,0 +1,33 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "dom",
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "jsx": "react",
+        "typeRoots": [
+            "../"
+        ],
+        "paths": {
+            "@storybook/react-native": [
+                "storybook__react-native"
+            ],
+            "@storybook/react": [
+                "storybook__react"
+            ]
+        },
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "storybook__react-native-tests.tsx"
+    ]
+}
diff --git a/types/storybook__react-native/tslint.json b/types/storybook__react-native/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/storybook__react-native/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/storybook__react/index.d.ts b/types/storybook__react/index.d.ts
index d31ea08af2..3aa3445f61 100644
--- a/types/storybook__react/index.d.ts
+++ b/types/storybook__react/index.d.ts
@@ -3,7 +3,7 @@
 // Definitions by: Joscha Feth <https://github.com/joscha>
 //                 Anton Izmailov <https://github.com/wapgear>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="webpack-env" />
 
@@ -25,6 +25,7 @@ export function configure(fn: () => void, module: NodeModule): void;
 export function setAddon(addon: object): void;
 export function storiesOf(name: string, module: NodeModule): Story;
 export function storiesOf<T>(name: string, module: NodeModule): Story & T;
+export function forceReRender(): void;
 
 export interface StoryObject {
     name: string;
diff --git a/types/storybook__react/storybook__react-tests.tsx b/types/storybook__react/storybook__react-tests.tsx
index 9e7b8f5723..12edecb219 100644
--- a/types/storybook__react/storybook__react-tests.tsx
+++ b/types/storybook__react/storybook__react-tests.tsx
@@ -1,8 +1,10 @@
 import * as React from 'react';
-import { storiesOf, setAddon, addDecorator, configure, getStorybook, RenderFunction, Story } from '@storybook/react';
+import { storiesOf, setAddon, addDecorator, configure, getStorybook, RenderFunction, Story, forceReRender } from '@storybook/react';
 
 const Decorator = (story: RenderFunction) => <div>{story()}</div>;
 
+forceReRender();
+
 storiesOf('Welcome', module)
     // local addDecorator
     .addDecorator(Decorator)
diff --git a/types/stream-chain/index.d.ts b/types/stream-chain/index.d.ts
new file mode 100644
index 0000000000..e893538c77
--- /dev/null
+++ b/types/stream-chain/index.d.ts
@@ -0,0 +1,30 @@
+// Type definitions for stream-chain 2.0
+// Project: https://github.com/uhop/stream-chain#readme
+// Definitions by: Eugene Lazutkin <https://github.com/uhop>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+import { Readable, Writable, Duplex, Transform, DuplexOptions } from 'stream';
+
+export = Chain;
+
+type TransformFunction = (chunk: any, encoding?: string) => any;
+
+type Stream = Readable | Writable | Duplex | Transform;
+type StreamItem = Stream | TransformFunction;
+
+declare class Chain extends Duplex {
+    constructor(fns: StreamItem[], options?: Chain.ChainOptions);
+
+    input: Stream;
+    output: Stream;
+    streams: Stream[];
+}
+
+declare namespace Chain {
+    interface ChainOptions extends DuplexOptions {
+        skipEvents?: boolean;
+    }
+
+    function chain(fns: StreamItem[], options?: ChainOptions): Chain;
+}
diff --git a/types/stream-chain/stream-chain-tests.ts b/types/stream-chain/stream-chain-tests.ts
new file mode 100644
index 0000000000..43d4f3d68b
--- /dev/null
+++ b/types/stream-chain/stream-chain-tests.ts
@@ -0,0 +1,160 @@
+import * as Chain from 'stream-chain';
+import { Readable, Writable, Transform } from 'stream';
+
+const streamFromArray = (array: number[]): Readable => {
+    let index = 0;
+    return new Readable({
+        objectMode: true,
+        read(): void {
+            this.push(index < array.length ? array[index++] : null);
+        }
+    });
+};
+
+const streamToArray = (array: number[]): Writable =>
+    new Writable({
+        objectMode: true,
+        write(chunk, encoding, callback) {
+            array.push(chunk);
+            callback(null);
+        }
+    });
+
+{
+    // generic function
+
+    const chain = new Chain([(x: number) => 2 * x]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // generator
+
+    const chain = new Chain([
+        // function*(x: number): IterableIterator<number> {
+        //     const n = +x;
+        //     yield 2 * n - 1;
+        //     return 2 * n;
+        // }
+    ]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // async function
+
+    const chain = new Chain([
+        // async (x: number) => Promise.resolve(x)
+    ]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // function that returns an array of values
+
+    const chain = new Chain([(x: number) => [x, x + 1]]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // chain of functions
+
+    const chain = new Chain([(x: number) => x * x, (x: number) => 2 * x + 1]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // Transform + a function
+
+    const chain = new Chain([
+        new Transform({
+            objectMode: true,
+            transform(x: number, _: string | undefined, callback: (error: Error | undefined, chunk: any) => void) {
+                callback(undefined, x * x);
+            }
+        }),
+        (x: number) => 2 * x + 1
+    ]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // factory
+
+    const chain = Chain.chain([(x: number) => 2 * x]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3])
+        .pipe(chain)
+        .pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // include Readable
+
+    const chain = new Chain([streamFromArray([1, 2, 3]), (x: number) => 2 * x]);
+    const out1: number[] = [];
+    const out2: number[] = [];
+
+    chain.pipe(streamToArray(out1));
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // include Writable
+
+    const out1: number[] = [];
+    const chain = new Chain([(x: number) => 2 * x, streamToArray(out1)]);
+    const out2: number[] = [];
+
+    streamFromArray([1, 2, 3]).pipe(chain);
+    chain.on('data', value => out2.push(+value));
+}
+
+{
+    // include Readable and Writable
+
+    const out1: number[] = [];
+    const chain = new Chain([streamFromArray([1, 2, 3]), (x: number) => 2 * x, streamToArray(out1)]);
+    const out2: number[] = [];
+
+    chain.on('data', value => out2.push(+value));
+}
diff --git a/types/stream-chain/tsconfig.json b/types/stream-chain/tsconfig.json
new file mode 100644
index 0000000000..65c7438077
--- /dev/null
+++ b/types/stream-chain/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "stream-chain-tests.ts"]
+}
diff --git a/types/stream-chain/tslint.json b/types/stream-chain/tslint.json
new file mode 100644
index 0000000000..4e88071852
--- /dev/null
+++ b/types/stream-chain/tslint.json
@@ -0,0 +1 @@
+{"extends": "dtslint/dt.json"}
diff --git a/types/stream-csv-as-json/AsObjects.d.ts b/types/stream-csv-as-json/AsObjects.d.ts
new file mode 100644
index 0000000000..8c0ab31ab6
--- /dev/null
+++ b/types/stream-csv-as-json/AsObjects.d.ts
@@ -0,0 +1,38 @@
+/// <reference types="node" />
+
+import { TransformOptions, Transform } from 'stream';
+import * as Chain from 'stream-chain';
+
+export = AsObjects;
+
+declare class AsObjects extends Transform {
+    constructor(options?: AsObjects.AsObjectOptions);
+}
+
+declare namespace AsObjects {
+    interface AsObjectOptions extends TransformOptions {
+        packValues?: boolean;
+        packStrings?: boolean;
+        streamValues?: boolean;
+        streamStrings?: boolean;
+        useValues?: boolean;
+        useStringValues?: boolean;
+        fieldPrefix?: string;
+    }
+
+    function make(options?: AsObjectOptions): AsObjects;
+
+    namespace make {
+        type Constructor = AsObjects;
+        const Constructor: typeof AsObjects;
+    }
+
+    function asObjects(options?: AsObjectOptions): AsObjects;
+
+    namespace asObjects {
+        type Constructor = AsObjects;
+        const Constructor: typeof AsObjects;
+    }
+
+    function withParser(options?: AsObjectOptions): Chain;
+}
diff --git a/types/stream-csv-as-json/Parser.d.ts b/types/stream-csv-as-json/Parser.d.ts
new file mode 100644
index 0000000000..1274765edd
--- /dev/null
+++ b/types/stream-csv-as-json/Parser.d.ts
@@ -0,0 +1,33 @@
+/// <reference types="node" />
+
+import { Transform, TransformOptions } from 'stream';
+
+export = Parser;
+
+declare class Parser extends Transform {
+    constructor(options?: Parser.ParserOptions);
+}
+
+declare namespace Parser {
+    interface ParserOptions extends TransformOptions {
+        packValues?: boolean;
+        packStrings?: boolean;
+        streamValues?: boolean;
+        streamStrings?: boolean;
+        separator?: string;
+    }
+
+    function make(options?: ParserOptions): Parser;
+
+    namespace make {
+        type Constructor = Parser;
+        const Constructor: typeof Parser;
+    }
+
+    function parser(options?: ParserOptions): Parser;
+
+    namespace parser {
+        type Constructor = Parser;
+        const Constructor: typeof Parser;
+    }
+}
diff --git a/types/stream-csv-as-json/Stringer.d.ts b/types/stream-csv-as-json/Stringer.d.ts
new file mode 100644
index 0000000000..52629f96b9
--- /dev/null
+++ b/types/stream-csv-as-json/Stringer.d.ts
@@ -0,0 +1,31 @@
+/// <reference types="node" />
+
+import { Transform, TransformOptions } from 'stream';
+
+export = Stringer;
+
+declare class Stringer extends Transform {
+    constructor(options?: Stringer.StringerOptions);
+}
+
+declare namespace Stringer {
+    interface StringerOptions extends TransformOptions {
+        useValues?: boolean;
+        useStringValues?: boolean;
+        separator?: string;
+    }
+
+    function make(options?: StringerOptions): Stringer;
+
+    namespace make {
+        type Constructor = Stringer;
+        const Constructor: typeof Stringer;
+    }
+
+    function stringer(options?: StringerOptions): Stringer;
+
+    namespace stringer {
+        type Constructor = Stringer;
+        const Constructor: typeof Stringer;
+    }
+}
diff --git a/types/stream-csv-as-json/index.d.ts b/types/stream-csv-as-json/index.d.ts
new file mode 100644
index 0000000000..1dca341577
--- /dev/null
+++ b/types/stream-csv-as-json/index.d.ts
@@ -0,0 +1,21 @@
+// Type definitions for stream-csv-as-json 1.0
+// Project: https://github.com/uhop/stream-csv-as-json#readme
+// Definitions by: Eugene Lazutkin <https://github.com/uhop>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as AsObjects from './AsObjects';
+import * as Parser from './Parser';
+import * as Stringer from './Stringer';
+
+export = make;
+
+declare function make(options?: Parser.ParserOptions): Parser;
+
+type ParserClass = Parser;
+type ParserType = typeof Parser;
+
+declare namespace make {
+    type Parser = ParserClass;
+    const Parser: ParserType;
+    function parser(options?: Parser.ParserOptions): Parser;
+}
diff --git a/types/stream-csv-as-json/stream-csv-as-json-tests.ts b/types/stream-csv-as-json/stream-csv-as-json-tests.ts
new file mode 100644
index 0000000000..6007d19205
--- /dev/null
+++ b/types/stream-csv-as-json/stream-csv-as-json-tests.ts
@@ -0,0 +1,68 @@
+import * as make from 'stream-csv-as-json';
+import * as Parser from 'stream-csv-as-json/Parser';
+import * as Stringer from 'stream-csv-as-json/Stringer';
+import * as AsObjects from 'stream-csv-as-json/AsObjects';
+
+const used = (array: any[]) => array.forEach(value => console.log(!!value));
+
+{
+    // creating parser with the main module
+
+    const p1 = make();
+    const p2 = new make.Parser();
+    const p3 = make.parser();
+
+    const p4 = make({});
+    const p5 = new make.Parser({});
+    const p6 = make.parser({});
+
+    const p7: make.Parser = make();
+    const p8: make.Parser = new make.Parser();
+    const p9: make.Parser = make.parser();
+
+    used([p1, p2, p3, p4, p5, p6, p7, p8, p9]);
+}
+
+{
+    // Parser tests
+
+    const p1: Parser = new Parser({ packValues: false });
+    const p2: Parser = Parser.make({ separator: '/' });
+    const p3: Parser = Parser.parser({ streamValues: false });
+    const p4: Parser.make.Constructor = Parser.make({ packValues: false, packStrings: true });
+    const p5: Parser.parser.Constructor = Parser.parser({ packValues: false, packStrings: true, streamStrings: false });
+
+    used([p1, p2, p3, p4, p5]);
+}
+
+{
+    // Stringer tests
+
+    const s1: Stringer = new Stringer();
+    const s2: Stringer = Stringer.make({ useValues: true });
+    const s3: Stringer = Stringer.stringer({ useStringValues: true });
+    const s4: Stringer.make.Constructor = Stringer.make();
+    const s5: Stringer.stringer.Constructor = Stringer.stringer();
+
+    used([s1, s2, s3, s4, s5]);
+}
+
+{
+    // StreamValues tests
+
+    const parser: Parser = new Parser();
+
+    const s1: AsObjects = new AsObjects();
+    const s2: AsObjects = AsObjects.make();
+    const s3: AsObjects = AsObjects.asObjects();
+    const s4: AsObjects.make.Constructor = AsObjects.make();
+    const s5: AsObjects.asObjects.Constructor = AsObjects.asObjects();
+
+    used([s1, s2, s3, s4, s5]);
+
+    parser.pipe(new AsObjects({ fieldPrefix: 'x' }));
+    parser.pipe(AsObjects.make({ useStringValues: true }));
+    parser.pipe(AsObjects.asObjects());
+
+    AsObjects.withParser();
+}
diff --git a/types/stream-csv-as-json/tsconfig.json b/types/stream-csv-as-json/tsconfig.json
new file mode 100644
index 0000000000..931caaa728
--- /dev/null
+++ b/types/stream-csv-as-json/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "stream-csv-as-json-tests.ts"]
+}
diff --git a/types/stream-csv-as-json/tslint.json b/types/stream-csv-as-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-csv-as-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stream-each/index.d.ts b/types/stream-each/index.d.ts
new file mode 100644
index 0000000000..52f00e6345
--- /dev/null
+++ b/types/stream-each/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for stream-each 1.2
+// Project: https://github.com/mafintosh/stream-each
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+declare function each(stream: NodeJS.ReadableStream,
+    iterator: (data: Buffer | string, next: (error?: Error) => void) => void,
+    cb: (error?: Error) => void): void;
+
+export = each;
diff --git a/types/stream-each/stream-each-tests.ts b/types/stream-each/stream-each-tests.ts
new file mode 100644
index 0000000000..47684c1dc9
--- /dev/null
+++ b/types/stream-each/stream-each-tests.ts
@@ -0,0 +1,16 @@
+import each = require("stream-each");
+import { createReadStream } from "fs";
+
+const stream = createReadStream(__filename);
+
+each(stream,
+    (data, next) => {
+        if (typeof data === "string") {
+            console.log(data);
+            next();
+        } else {
+            const buffer: Buffer = data;
+            next(new Error("Buffer"));
+        }
+    },
+    error => console.error(error));
diff --git a/types/stream-each/tsconfig.json b/types/stream-each/tsconfig.json
new file mode 100644
index 0000000000..5a58f5031f
--- /dev/null
+++ b/types/stream-each/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",
+        "stream-each-tests.ts"
+    ]
+}
diff --git a/types/stream-each/tslint.json b/types/stream-each/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-each/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stream-json/Assembler.d.ts b/types/stream-json/Assembler.d.ts
new file mode 100644
index 0000000000..52282d7beb
--- /dev/null
+++ b/types/stream-json/Assembler.d.ts
@@ -0,0 +1,37 @@
+import { EventEmitter } from 'events';
+import { Readable } from 'stream';
+
+export = Assembler;
+
+interface Token {
+    name: string;
+    value?: string;
+}
+
+declare class Assembler extends EventEmitter {
+    constructor();
+
+    connectTo(stream: Readable): this;
+    consume(chunk: Token): this;
+    dropToLevel(level: number): this;
+
+    current: any;
+    key: string | null;
+    stack: Array<number | string | null>;
+    readonly done: boolean;
+
+    readonly depth: number;
+    readonly path: string;
+
+    // events
+    addListener(event: 'done', listener: (asm: Assembler) => void): this;
+    on(event: 'done', listener: (asm: Assembler) => void): this;
+    once(event: 'done', listener: (asm: Assembler) => void): this;
+    prependListener(event: 'done', listener: (asm: Assembler) => void): this;
+    prependOnceListener(event: 'done', listener: (asm: Assembler) => void): this;
+    removeListener(event: 'done', listener: (asm: Assembler) => void): this;
+}
+
+declare namespace Assembler {
+    function connectTo(stream: Readable): Assembler;
+}
diff --git a/types/stream-json/Emitter.d.ts b/types/stream-json/Emitter.d.ts
new file mode 100644
index 0000000000..7d0a3138c2
--- /dev/null
+++ b/types/stream-json/Emitter.d.ts
@@ -0,0 +1,23 @@
+import { Writable, WritableOptions } from 'stream';
+
+export = Emitter;
+
+declare class Emitter extends Writable {
+    constructor(options?: WritableOptions);
+}
+
+declare namespace Emitter {
+    function make(options?: WritableOptions): Emitter;
+
+    namespace make {
+        type Constructor = Emitter;
+        const Constructor: typeof Emitter;
+    }
+
+    function emitter(options?: WritableOptions): Emitter;
+
+    namespace emitter {
+        type Constructor = Emitter;
+        const Constructor: typeof Emitter;
+    }
+}
diff --git a/types/stream-json/Parser.d.ts b/types/stream-json/Parser.d.ts
new file mode 100644
index 0000000000..5fc689936e
--- /dev/null
+++ b/types/stream-json/Parser.d.ts
@@ -0,0 +1,35 @@
+import { Transform, TransformOptions } from 'stream';
+
+export = Parser;
+
+declare class Parser extends Transform {
+    constructor(options?: Parser.ParserOptions);
+}
+
+declare namespace Parser {
+    interface ParserOptions extends TransformOptions {
+        packValues?: boolean;
+        packKeys?: boolean;
+        packStrings?: boolean;
+        packNumbers?: boolean;
+        streamValues?: boolean;
+        streamKeys?: boolean;
+        streamStrings?: boolean;
+        streamNumbers?: boolean;
+        jsonStreaming?: boolean;
+    }
+
+    function make(options?: ParserOptions): Parser;
+
+    namespace make {
+        type Constructor = Parser;
+        const Constructor: typeof Parser;
+    }
+
+    function parser(options?: ParserOptions): Parser;
+
+    namespace parser {
+        type Constructor = Parser;
+        const Constructor: typeof Parser;
+    }
+}
diff --git a/types/stream-json/Stringer.d.ts b/types/stream-json/Stringer.d.ts
new file mode 100644
index 0000000000..6ada77a37a
--- /dev/null
+++ b/types/stream-json/Stringer.d.ts
@@ -0,0 +1,30 @@
+import { Transform, TransformOptions } from 'stream';
+
+export = Stringer;
+
+declare class Stringer extends Transform {
+    constructor(options?: Stringer.StringerOptions);
+}
+
+declare namespace Stringer {
+    interface StringerOptions extends TransformOptions {
+        useValues?: boolean;
+        useKeyValues?: boolean;
+        useStringValues?: boolean;
+        useNumberValues?: boolean;
+    }
+
+    function make(options?: StringerOptions): Stringer;
+
+    namespace make {
+        type Constructor = Stringer;
+        const Constructor: typeof Stringer;
+    }
+
+    function stringer(options?: StringerOptions): Stringer;
+
+    namespace stringer {
+        type Constructor = Stringer;
+        const Constructor: typeof Stringer;
+    }
+}
diff --git a/types/stream-json/filters/Filter.d.ts b/types/stream-json/filters/Filter.d.ts
new file mode 100644
index 0000000000..2a770925ca
--- /dev/null
+++ b/types/stream-json/filters/Filter.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as FilterBase from './FilterBase';
+
+export = Filter;
+
+declare class Filter extends FilterBase {
+    constructor(options: FilterBase.FilterOptions);
+}
+
+declare namespace Filter {
+    function make(options: FilterBase.FilterOptions): Filter;
+
+    namespace make {
+        type Constructor = Filter;
+        const Constructor: typeof Filter;
+    }
+
+    function filter(options: FilterBase.FilterOptions): Filter;
+
+    namespace filter {
+        type Constructor = Filter;
+        const Constructor: typeof Filter;
+    }
+
+    function withParser(options: FilterBase.FilterOptions): Chain;
+}
diff --git a/types/stream-json/filters/FilterBase.d.ts b/types/stream-json/filters/FilterBase.d.ts
new file mode 100644
index 0000000000..43296561d4
--- /dev/null
+++ b/types/stream-json/filters/FilterBase.d.ts
@@ -0,0 +1,29 @@
+import { Transform, TransformOptions } from 'stream';
+
+export = FilterBase;
+
+declare class FilterBase extends Transform {
+    constructor(options: FilterBase.FilterOptions);
+}
+
+declare namespace FilterBase {
+    type Stack = ReadonlyArray<number | string | null>;
+
+    interface Token {
+        readonly name: string;
+        readonly value?: ReadonlyArray<string | null | true | false>;
+    }
+
+    type FilterFunction = (stack: Stack, token: Token) => boolean;
+    type ReplacementFunction = (stack: Stack, token: Token) => Token[];
+
+    interface FilterOptions extends TransformOptions {
+        filter: string | RegExp | FilterFunction;
+        once?: boolean;
+        pathSeparator?: string;
+        streamValues?: boolean;
+        streamKeys?: boolean;
+        replacement?: ReadonlyArray<Token> | ReplacementFunction;
+        allowEmptyReplacement?: boolean;
+    }
+}
diff --git a/types/stream-json/filters/Ignore.d.ts b/types/stream-json/filters/Ignore.d.ts
new file mode 100644
index 0000000000..db805549d2
--- /dev/null
+++ b/types/stream-json/filters/Ignore.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as FilterBase from './FilterBase';
+
+export = Ignore;
+
+declare class Ignore extends FilterBase {
+    constructor(options: FilterBase.FilterOptions);
+}
+
+declare namespace Ignore {
+    function make(options: FilterBase.FilterOptions): Ignore;
+
+    namespace make {
+        type Constructor = Ignore;
+        const Constructor: typeof Ignore;
+    }
+
+    function ignore(options: FilterBase.FilterOptions): Ignore;
+
+    namespace ignore {
+        type Constructor = Ignore;
+        const Constructor: typeof Ignore;
+    }
+
+    function withParser(options: FilterBase.FilterOptions): Chain;
+}
diff --git a/types/stream-json/filters/Pick.d.ts b/types/stream-json/filters/Pick.d.ts
new file mode 100644
index 0000000000..f4504f20f5
--- /dev/null
+++ b/types/stream-json/filters/Pick.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as FilterBase from './FilterBase';
+
+export = Pick;
+
+declare class Pick extends FilterBase {
+    constructor(options: FilterBase.FilterOptions);
+}
+
+declare namespace Pick {
+    function make(options: FilterBase.FilterOptions): Pick;
+
+    namespace make {
+        type Constructor = Pick;
+        const Constructor: typeof Pick;
+    }
+
+    function pick(options: FilterBase.FilterOptions): Pick;
+
+    namespace pick {
+        type Constructor = Pick;
+        const Constructor: typeof Pick;
+    }
+
+    function withParser(options: FilterBase.FilterOptions): Chain;
+}
diff --git a/types/stream-json/filters/Replace.d.ts b/types/stream-json/filters/Replace.d.ts
new file mode 100644
index 0000000000..9f85b847f5
--- /dev/null
+++ b/types/stream-json/filters/Replace.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as FilterBase from './FilterBase';
+
+export = Replace;
+
+declare class Replace extends FilterBase {
+    constructor(options: FilterBase.FilterOptions);
+}
+
+declare namespace Replace {
+    function make(options: FilterBase.FilterOptions): Replace;
+
+    namespace make {
+        type Constructor = Replace;
+        const Constructor: typeof Replace;
+    }
+
+    function replace(options: FilterBase.FilterOptions): Replace;
+
+    namespace replace {
+        type Constructor = Replace;
+        const Constructor: typeof Replace;
+    }
+
+    function withParser(options: FilterBase.FilterOptions): Chain;
+}
diff --git a/types/stream-json/index.d.ts b/types/stream-json/index.d.ts
new file mode 100644
index 0000000000..9230408603
--- /dev/null
+++ b/types/stream-json/index.d.ts
@@ -0,0 +1,37 @@
+// Type definitions for stream-json 1.0
+// Project: http://github.com/uhop/stream-json
+// Definitions by: Eugene Lazutkin <https://github.com/uhop>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+import * as Assembler from './Assembler';
+import * as Emitter from './Emitter';
+import * as Parser from './Parser';
+import * as Stringer from './Stringer';
+
+import * as FilterBase from './filters/FilterBase';
+import * as Pick from './filters/Pick';
+import * as Replace from './filters/Replace';
+import * as Ignore from './filters/Ignore';
+import * as Filter from './filters/Filter';
+
+import * as StreamArray from './streamers/StreamArray';
+import * as StreamObject from './streamers/StreamObject';
+import * as StreamValues from './streamers/StreamValues';
+
+import * as emit from './utils/emit';
+import * as withParser from './utils/withParser';
+
+export = make;
+
+declare function make(options?: Parser.ParserOptions): Parser;
+
+type ParserClass = Parser;
+type ParserType = typeof Parser;
+
+declare namespace make {
+    type Parser = ParserClass;
+    const Parser: ParserType;
+    function parser(options?: Parser.ParserOptions): Parser;
+}
diff --git a/types/stream-json/stream-json-tests.ts b/types/stream-json/stream-json-tests.ts
new file mode 100644
index 0000000000..76e21071f1
--- /dev/null
+++ b/types/stream-json/stream-json-tests.ts
@@ -0,0 +1,329 @@
+import { Transform, TransformOptions } from 'stream';
+
+import * as make from 'stream-json';
+
+import * as Assembler from 'stream-json/Assembler';
+import * as Emitter from 'stream-json/Emitter';
+import * as Parser from 'stream-json/Parser';
+import * as Stringer from 'stream-json/Stringer';
+
+import * as FilterBase from 'stream-json/filters/FilterBase';
+import * as Pick from 'stream-json/filters/Pick';
+import * as Replace from 'stream-json/filters/Replace';
+import * as Ignore from 'stream-json/filters/Ignore';
+import * as Filter from 'stream-json/filters/Filter';
+
+import * as StreamArray from 'stream-json/streamers/StreamArray';
+import * as StreamObject from 'stream-json/streamers/StreamObject';
+import * as StreamValues from 'stream-json/streamers/StreamValues';
+
+import * as emit from 'stream-json/utils/emit';
+import * as withParser from 'stream-json/utils/withParser';
+
+const used = (array: any[]) => array.forEach(value => console.log(!!value));
+
+{
+    // creating parser with the main module
+
+    const p1 = make();
+    const p2 = new make.Parser();
+    const p3 = make.parser();
+
+    const p4 = make({});
+    const p5 = new make.Parser({});
+    const p6 = make.parser({});
+
+    const p7: make.Parser = make();
+    const p8: make.Parser = new make.Parser();
+    const p9: make.Parser = make.parser();
+
+    used([p1, p2, p3, p4, p5, p6, p7, p8, p9]);
+}
+
+{
+    // Assembler tests
+
+    const parser: Parser = new Parser({ streamValues: false });
+    const asm: Assembler = Assembler.connectTo(parser);
+
+    asm.consume({ name: 'startObject' });
+    asm.dropToLevel(0);
+
+    parser.on('keyValue', (value: string) =>
+        console.log(value, asm.key, asm.stack.length, asm.done, asm.depth, asm.path)
+    );
+    asm.on('done', (asm: Assembler) => console.log(JSON.stringify(asm.current)));
+}
+
+{
+    // Emitter tests
+
+    const parser: Parser = new Parser();
+    const e1: Emitter = new Emitter();
+    const e2: Emitter = Emitter.make({});
+    const e3: Emitter = Emitter.emitter();
+    const e4: Emitter.make.Constructor = Emitter.make({});
+    const e5: Emitter.emitter.Constructor = Emitter.emitter({});
+
+    parser.pipe(e1);
+    parser.pipe(e2);
+    parser.pipe(e3);
+    parser.pipe(e4);
+    parser.pipe(e5);
+
+    e1.on('startArray', () => console.log('array'));
+}
+
+{
+    // Parser tests
+
+    const p1: Parser = new Parser({ packValues: false });
+    const p2: Parser = Parser.make({ jsonStreaming: true });
+    const p3: Parser = Parser.parser({ streamValues: false });
+    const p4: Parser.make.Constructor = Parser.make({ packValues: false, packKeys: true });
+    const p5: Parser.parser.Constructor = Parser.parser({ packValues: false, packKeys: true, streamKeys: false });
+
+    used([p1, p2, p3, p4, p5]);
+}
+
+{
+    // Stringer tests
+
+    const s1: Stringer = new Stringer();
+    const s2: Stringer = Stringer.make({ useValues: true });
+    const s3: Stringer = Stringer.stringer({ useKeyValues: true });
+    const s4: Stringer.make.Constructor = Stringer.make();
+    const s5: Stringer.stringer.Constructor = Stringer.stringer();
+
+    used([s1, s2, s3, s4, s5]);
+}
+
+{
+    // Pick tests
+
+    const parser: Parser = new Parser();
+
+    const f1: Pick = new Pick({ filter: 'data' });
+    const f2: Pick = Pick.make({ filter: 'data' });
+    const f3: Pick = Pick.pick({ filter: 'data' });
+    const f4: Pick.make.Constructor = Pick.make({ filter: 'data' });
+    const f5: Pick.pick.Constructor = Pick.pick({ filter: 'data' });
+
+    used([f1, f2, f3, f4, f5]);
+
+    parser
+        .pipe(new Pick({ filter: 'data' }))
+        .pipe(Pick.make({ filter: /\bvalues\b/i }))
+        .pipe(Pick.pick({ filter: (stack: FilterBase.Stack, token: FilterBase.Token) => token.name === 'startArray' }));
+
+    Pick.withParser({ filter: 'data' });
+}
+
+{
+    // Replace tests
+
+    const parser: Parser = new Parser();
+
+    const f1: Replace = new Replace({ filter: 'data' });
+    const f2: Replace = Replace.make({ filter: 'data' });
+    const f3: Replace = Replace.replace({ filter: 'data' });
+    const f4: Replace.make.Constructor = Replace.make({ filter: 'data' });
+    const f5: Replace.replace.Constructor = Replace.replace({ filter: 'data' });
+
+    used([f1, f2, f3, f4, f5]);
+
+    parser
+        .pipe(new Replace({ filter: 'total', replacement: [{ name: 'trueValue' }] }))
+        .pipe(Replace.make({ filter: /\b_\w*\b/i, allowEmptyReplacement: true }))
+        .pipe(
+            Replace.replace({
+                filter: (stack: FilterBase.Stack, token: FilterBase.Token) => stack.length > 2,
+                replacement: (stack: FilterBase.Stack, token: FilterBase.Token) => [
+                    { name: token.name === 'startArray' ? 'trueValue' : 'falseValue' }
+                ]
+            })
+        );
+
+    Replace.withParser({ filter: '_meta' });
+}
+
+{
+    // Ignore tests
+
+    const parser: Parser = new Parser({ streamValues: false });
+
+    const f1: Ignore = new Ignore({ filter: 'data' });
+    const f2: Ignore = Ignore.make({ filter: 'data' });
+    const f3: Ignore = Ignore.ignore({ filter: 'data' });
+    const f4: Ignore.make.Constructor = Ignore.make({ filter: 'data' });
+    const f5: Ignore.ignore.Constructor = Ignore.ignore({ filter: 'data' });
+
+    used([f1, f2, f3, f4, f5]);
+
+    parser
+        .pipe(new Ignore({ filter: 'total' }))
+        .pipe(Ignore.make({ filter: /\b_\w*\b/i }))
+        .pipe(Ignore.ignore({ filter: (stack: FilterBase.Stack, token: FilterBase.Token) => stack.length > 2 }));
+
+    Ignore.withParser({ filter: '_meta' });
+}
+
+{
+    // Filter tests
+
+    const parser: Parser = new Parser({ streamValues: false });
+
+    const f1: Filter = new Filter({ filter: 'data' });
+    const f2: Filter = Filter.make({ filter: 'data' });
+    const f3: Filter = Filter.filter({ filter: 'data' });
+    const f4: Filter.make.Constructor = Filter.make({ filter: 'data' });
+    const f5: Filter.filter.Constructor = Filter.filter({ filter: 'data' });
+
+    used([f1, f2, f3, f4, f5]);
+
+    parser
+        .pipe(new Filter({ filter: 'total' }))
+        .pipe(Filter.make({ filter: /\b_\w*\b/i }))
+        .pipe(Filter.filter({ filter: (stack: FilterBase.Stack, token: FilterBase.Token) => stack.length > 2 }));
+
+    Filter.withParser({ filter: '_meta' });
+}
+
+{
+    // StreamArray tests
+
+    const parser: Parser = new Parser();
+
+    const s1: StreamArray = new StreamArray();
+    const s2: StreamArray = StreamArray.make();
+    const s3: StreamArray = StreamArray.streamArray();
+    const s4: StreamArray.make.Constructor = StreamArray.make();
+    const s5: StreamArray.streamArray.Constructor = StreamArray.streamArray();
+
+    used([s1, s2, s3, s4, s5]);
+
+    parser.pipe(
+        new StreamArray({
+            includeUndecided: true,
+            objectFilter: (asm: Assembler) => {
+                if (asm.current) {
+                    if (asm.current.action === 'accept') return true;
+                    if (asm.current.action === 'reject') return false;
+                }
+            }
+        })
+    );
+    parser.pipe(
+        StreamArray.make({
+            includeUndecided: false,
+            objectFilter: (asm: Assembler) => {
+                if (asm.current) {
+                    if (asm.current.action === 'accept') return true;
+                    if (asm.current.action === 'reject') return false;
+                }
+            }
+        })
+    );
+    parser.pipe(StreamArray.streamArray());
+
+    StreamArray.withParser();
+}
+
+{
+    // StreamObject tests
+
+    const parser: Parser = new Parser();
+
+    const s1: StreamObject = new StreamObject();
+    const s2: StreamObject = StreamObject.make();
+    const s3: StreamObject = StreamObject.streamObject();
+    const s4: StreamObject.make.Constructor = StreamObject.make();
+    const s5: StreamObject.streamObject.Constructor = StreamObject.streamObject();
+
+    used([s1, s2, s3, s4, s5]);
+
+    parser.pipe(
+        new StreamObject({
+            includeUndecided: true,
+            objectFilter: (asm: Assembler) => {
+                if (asm.current) {
+                    if (asm.current.action === 'accept') return true;
+                    if (asm.current.action === 'reject') return false;
+                }
+            }
+        })
+    );
+    parser.pipe(
+        StreamObject.make({
+            includeUndecided: false,
+            objectFilter: (asm: Assembler) => {
+                if (asm.current) {
+                    if (asm.current.action === 'accept') return true;
+                    if (asm.current.action === 'reject') return false;
+                }
+            }
+        })
+    );
+    parser.pipe(StreamObject.streamObject());
+
+    StreamObject.withParser();
+}
+
+{
+    // StreamValues tests
+
+    const parser: Parser = new Parser();
+
+    const s1: StreamValues = new StreamValues();
+    const s2: StreamValues = StreamValues.make();
+    const s3: StreamValues = StreamValues.streamValues();
+    const s4: StreamValues.make.Constructor = StreamValues.make();
+    const s5: StreamValues.streamValues.Constructor = StreamValues.streamValues();
+
+    used([s1, s2, s3, s4, s5]);
+
+    parser.pipe(
+        new StreamValues({
+            includeUndecided: true,
+            objectFilter: (asm: Assembler) => {
+                if (asm.current) {
+                    if (asm.current.action === 'accept') return true;
+                    if (asm.current.action === 'reject') return false;
+                }
+            }
+        })
+    );
+    parser.pipe(
+        StreamValues.make({
+            includeUndecided: false,
+            objectFilter: (asm: Assembler) => {
+                if (asm.current) {
+                    if (asm.current.action === 'accept') return true;
+                    if (asm.current.action === 'reject') return false;
+                }
+            }
+        })
+    );
+    parser.pipe(StreamValues.streamValues());
+
+    StreamValues.withParser();
+}
+
+{
+    // emit() tests
+
+    const parser: Parser = emit(new Parser());
+    parser.on('keyValue', () => console.log('key'));
+}
+
+{
+    // withParser() tests
+
+    withParser(Pick.make, { filter: 'data' });
+    withParser(Pick.pick, { filter: 'data', packValues: false });
+
+    withParser(StreamArray.streamArray, { objectFilter: (asm: Assembler) => asm.current });
+    withParser(StreamArray.make, { objectFilter: (asm: Assembler) => asm.current, packValues: false });
+
+    withParser((options?: TransformOptions) => new Transform(options), { streamValues: false });
+}
diff --git a/types/stream-json/streamers/StreamArray.d.ts b/types/stream-json/streamers/StreamArray.d.ts
new file mode 100644
index 0000000000..4961e95bf8
--- /dev/null
+++ b/types/stream-json/streamers/StreamArray.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as StreamBase from './StreamBase';
+
+export = StreamArray;
+
+declare class StreamArray extends StreamBase {
+    constructor(options?: StreamBase.StreamOptions);
+}
+
+declare namespace StreamArray {
+    function make(options?: StreamBase.StreamOptions): StreamArray;
+
+    namespace make {
+        type Constructor = StreamArray;
+        const Constructor: typeof StreamArray;
+    }
+
+    function streamArray(options?: StreamBase.StreamOptions): StreamArray;
+
+    namespace streamArray {
+        type Constructor = StreamArray;
+        const Constructor: typeof StreamArray;
+    }
+
+    function withParser(options?: StreamBase.StreamOptions): Chain;
+}
diff --git a/types/stream-json/streamers/StreamBase.d.ts b/types/stream-json/streamers/StreamBase.d.ts
new file mode 100644
index 0000000000..641694efc4
--- /dev/null
+++ b/types/stream-json/streamers/StreamBase.d.ts
@@ -0,0 +1,17 @@
+import { Transform, TransformOptions } from 'stream';
+import * as Assembler from '../Assembler';
+
+export = StreamBase;
+
+declare class StreamBase extends Transform {
+    constructor(options?: StreamBase.StreamOptions);
+}
+
+declare namespace StreamBase {
+    type ObjectFilterFunction = (asm: Assembler) => boolean | undefined;
+
+    interface StreamOptions extends TransformOptions {
+        objectFilter?: ObjectFilterFunction;
+        includeUndecided?: boolean;
+    }
+}
diff --git a/types/stream-json/streamers/StreamObject.d.ts b/types/stream-json/streamers/StreamObject.d.ts
new file mode 100644
index 0000000000..efaeed75ad
--- /dev/null
+++ b/types/stream-json/streamers/StreamObject.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as StreamBase from './StreamBase';
+
+export = StreamObject;
+
+declare class StreamObject extends StreamBase {
+    constructor(options?: StreamBase.StreamOptions);
+}
+
+declare namespace StreamObject {
+    function make(options?: StreamBase.StreamOptions): StreamObject;
+
+    namespace make {
+        type Constructor = StreamObject;
+        const Constructor: typeof StreamObject;
+    }
+
+    function streamObject(options?: StreamBase.StreamOptions): StreamObject;
+
+    namespace streamObject {
+        type Constructor = StreamObject;
+        const Constructor: typeof StreamObject;
+    }
+
+    function withParser(options?: StreamBase.StreamOptions): Chain;
+}
diff --git a/types/stream-json/streamers/StreamValues.d.ts b/types/stream-json/streamers/StreamValues.d.ts
new file mode 100644
index 0000000000..2ffe1a0719
--- /dev/null
+++ b/types/stream-json/streamers/StreamValues.d.ts
@@ -0,0 +1,26 @@
+import * as Chain from 'stream-chain';
+import * as StreamBase from './StreamBase';
+
+export = StreamValues;
+
+declare class StreamValues extends StreamBase {
+    constructor(options?: StreamBase.StreamOptions);
+}
+
+declare namespace StreamValues {
+    function make(options?: StreamBase.StreamOptions): StreamValues;
+
+    namespace make {
+        type Constructor = StreamValues;
+        const Constructor: typeof StreamValues;
+    }
+
+    function streamValues(options?: StreamBase.StreamOptions): StreamValues;
+
+    namespace streamValues {
+        type Constructor = StreamValues;
+        const Constructor: typeof StreamValues;
+    }
+
+    function withParser(options?: StreamBase.StreamOptions): Chain;
+}
diff --git a/types/stream-json/tsconfig.json b/types/stream-json/tsconfig.json
new file mode 100644
index 0000000000..7bc52c45ec
--- /dev/null
+++ b/types/stream-json/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": ["index.d.ts", "stream-json-tests.ts"]
+}
diff --git a/types/stream-json/tslint.json b/types/stream-json/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-json/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stream-json/utils/emit.d.ts b/types/stream-json/utils/emit.d.ts
new file mode 100644
index 0000000000..82b32f153c
--- /dev/null
+++ b/types/stream-json/utils/emit.d.ts
@@ -0,0 +1,7 @@
+import { Writable, Duplex, Transform } from 'stream';
+
+export = emit;
+
+declare function emit<Stream extends Writable | Duplex | Transform>(stream: Stream): Stream;
+
+declare namespace emit {}
diff --git a/types/stream-json/utils/withParser.d.ts b/types/stream-json/utils/withParser.d.ts
new file mode 100644
index 0000000000..ef509366df
--- /dev/null
+++ b/types/stream-json/utils/withParser.d.ts
@@ -0,0 +1,47 @@
+import { Writable, WritableOptions, Duplex, DuplexOptions, Transform, TransformOptions } from 'stream';
+import * as Chain from 'stream-chain';
+import * as Parser from '../Parser';
+import * as FilterBase from '../filters/FilterBase';
+import * as StreamBase from '../streamers/StreamBase';
+
+export = withParser;
+
+declare function withParser(
+    fn: (options: FilterBase.FilterOptions) => FilterBase,
+    options?: withParser.FilterOptions
+): Chain;
+
+declare function withParser(
+    fn: (options?: StreamBase.StreamOptions) => StreamBase,
+    options?: withParser.StreamOptions
+): Chain;
+
+declare function withParser(fn: (options?: TransformOptions) => Transform, options?: Parser.ParserOptions): Chain;
+
+declare namespace withParser {
+    interface FilterOptions extends FilterBase.FilterOptions {
+        // copied from ParserOptions
+        packValues?: boolean;
+        packKeys?: boolean;
+        packStrings?: boolean;
+        packNumbers?: boolean;
+        streamValues?: boolean;
+        streamKeys?: boolean;
+        streamStrings?: boolean;
+        streamNumbers?: boolean;
+        jsonStreaming?: boolean;
+    }
+
+    interface StreamOptions extends StreamBase.StreamOptions {
+        // copied from ParserOptions
+        packValues?: boolean;
+        packKeys?: boolean;
+        packStrings?: boolean;
+        packNumbers?: boolean;
+        streamValues?: boolean;
+        streamKeys?: boolean;
+        streamStrings?: boolean;
+        streamNumbers?: boolean;
+        jsonStreaming?: boolean;
+    }
+}
diff --git a/types/stream-shift/index.d.ts b/types/stream-shift/index.d.ts
new file mode 100644
index 0000000000..5b26fd3217
--- /dev/null
+++ b/types/stream-shift/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for stream-shift 1.0
+// Project: https://github.com/mafintosh/stream-shift
+// Definitions by: Daniel Cassidy <https://github.com/djcsdy>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+declare function shift(stream: NodeJS.ReadableStream): Buffer | string | null;
+
+export = shift;
diff --git a/types/stream-shift/stream-shift-tests.ts b/types/stream-shift/stream-shift-tests.ts
new file mode 100644
index 0000000000..391419df96
--- /dev/null
+++ b/types/stream-shift/stream-shift-tests.ts
@@ -0,0 +1,6 @@
+import shift = require("stream-shift");
+import { createReadStream, createWriteStream } from "fs";
+
+const stream = createReadStream(__filename);
+
+const x: Buffer | string | null = shift(stream);
diff --git a/types/stream-shift/tsconfig.json b/types/stream-shift/tsconfig.json
new file mode 100644
index 0000000000..59db2bfad5
--- /dev/null
+++ b/types/stream-shift/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",
+        "stream-shift-tests.ts"
+    ]
+}
diff --git a/types/stream-shift/tslint.json b/types/stream-shift/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/stream-shift/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stream-throttle/index.d.ts b/types/stream-throttle/index.d.ts
new file mode 100644
index 0000000000..30ba038907
--- /dev/null
+++ b/types/stream-throttle/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for stream-throttle 0.1
+// Project: https://github.com/tjgq/node-stream-throttle
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types = "node" />
+
+import { Transform } from 'stream';
+
+export interface ThrottleOptions {
+  readonly rate: number;
+  readonly chunksize?: number;
+}
+
+export class Throttle extends Transform {
+  constructor(options: ThrottleOptions);
+}
+
+export class ThrottleGroup {
+  constructor(options: ThrottleOptions);
+  throttle(options: ThrottleOptions): Throttle;
+}
diff --git a/types/stream-throttle/stream-throttle-tests.ts b/types/stream-throttle/stream-throttle-tests.ts
new file mode 100644
index 0000000000..bbd8f8ce86
--- /dev/null
+++ b/types/stream-throttle/stream-throttle-tests.ts
@@ -0,0 +1,7 @@
+import { Throttle, ThrottleGroup } from 'stream-throttle';
+
+const throttle = new Throttle({rate: 1});
+const throttleGroup = new ThrottleGroup({rate: 1});
+
+// $ExpectType Throttle
+throttleGroup.throttle({rate: 1});
diff --git a/types/stream-throttle/tsconfig.json b/types/stream-throttle/tsconfig.json
new file mode 100644
index 0000000000..b9e4185c58
--- /dev/null
+++ b/types/stream-throttle/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"stream-throttle-tests.ts"
+	]
+}
diff --git a/types/stream-throttle/tslint.json b/types/stream-throttle/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/stream-throttle/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/streamtest/index.d.ts b/types/streamtest/index.d.ts
new file mode 100644
index 0000000000..2efbd89708
--- /dev/null
+++ b/types/streamtest/index.d.ts
@@ -0,0 +1,126 @@
+// Type definitions for streamtest 1.2
+// Project: https://github.com/nfroidure/streamtest
+// Definitions by: Harris Lummis <https://github.com/lummish>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+/// <reference types="node" />
+import { PassThrough, Readable, ReadableOptions, Writable, WritableOptions } from "stream";
+
+export type Chunk = string | Buffer | Uint8Array;
+
+export type NonNull = {} | undefined;
+
+/** Allowed version names for streamtest */
+export type VersionName = "v1" | "v2";
+
+/**
+ * List of supported versions (currently v1 and v2). v1 should be used for
+ * Node < 0.10 streams.
+ */
+export const versions: VersionName[];
+
+/** v1 methods (Node version < 0.10) */
+export const v1: typeof v2;
+
+/** v2 methods (Node version >= 0.10) */
+export namespace v2 {
+    /**
+     * Create a readable stream streaming 'chunks' each after 'timeout'
+     * milliseconds and then end. Useful for testing buffer based streams.
+     * @param chunks The input chunks for the readable stream
+     * @param timeout The timeout (in milliseconds) used to space chunks.
+     * Defaults to 0.
+     * @returns A new readable stream
+     */
+    function fromChunks(chunks: Chunk[], timeout?: number): Readable;
+    /**
+     * Create a readable stream streaming 'objects' each after 'timeout'
+     * milliseconds and then end. Useful for testing objectMode based streams.
+     * @param chunks The input objects for the readable stream
+     * @param timeout The timeout (in milliseconds) used to space chunks.
+     * Defaults to 0.
+     * @returns A new readable stream
+     */
+    function fromObjects(objects: NonNull[], timeout?: number): Readable;
+    /**
+     * Create a readable stream streaming 'chunks' each after 'timeout'
+     * milliseconds, emit 'err,' and then end. Useful for testing buffer based
+     * streams.
+     * @param err The error to emit
+     * @param chunks The input objects for the readable stream
+     * @param timeout The timeout (in milliseconds) used to space chunks.
+     * Defaults to 0.
+     * @returns A new readable stream
+     */
+    function fromErroredChunks(err: Error, chunks: Chunk[], timeout?: number): Readable;
+    /**
+     * Create a readable stream streaming 'objects' each after 'timeout'
+     * milliseconds, emit 'err,' and then end. Useful for testing objectMode
+     * based streams.
+     * @param err The error to emit
+     * @param chunks The input objects for the readable stream
+     * @param timeout The timeout (in milliseconds) used to space chunks.
+     * Defaults to 0.
+     * @returns A new readable stream
+     */
+    function fromErroredObjects(err: Error, objects: NonNull[], timeout?: number): Readable;
+    /**
+     * Create a writable stream collecting written chunks and call the passed
+     * callback function when it finishes.
+     * @param cb The callback function. Takes an error as its first argument and
+     * an array of chunks as its second
+     * @returns A new writable stream
+     */
+    function toChunks(cb: (err: Error, chunks: Chunk[]) => any): Writable;
+    /**
+     * Create a writable stream collecting written chunks and call the passed
+     * callback function when it finishes.
+     * @param cb The callback function. Takes an error as its first argument and
+     * an array of objects as its second
+     * @returns A new writable stream
+     */
+    function toObjects(cb: (err: Error, objects: NonNull[]) => any): Writable;
+    /**
+     * Create a writable stream collecting written chunks and call the passed
+     * callback function when it finishes.
+     * @param cb The callback function. Takes an error as its first argument and
+     * an string as its second
+     * @returns A new writable stream
+     */
+    function toText(cb: (err: Error, text: string) => any): Writable;
+    /**
+     * Create a new readable stream
+     * @param options The options used to create the stream
+     * @returns A new readable stream
+     */
+    function readable(options?: ReadableOptions): Readable;
+    /**
+     * Create a new writable stream
+     * @param options The options used to create the stream
+     * @returns A new writable stream
+     */
+    function writable(options?: WritableOptions): Writable;
+    /**
+     * Create a synchronous PassThrough stream
+     * @returns A PassThrough stream
+     */
+    function syncReadableChunks(): PassThrough;
+    /**
+     * Create a synchronous PassThrough stream in object mode
+     * @returns A PassThrough stream
+     */
+    function syncReadableObjects(): PassThrough;
+    /**
+     * Write chunks to a stream synchronously
+     * @param stream The stream to write to
+     * @param chunks The chunks to write
+     */
+    function syncWrite(stream: Writable, chunks: Chunk[]): void;
+    /**
+     * Write chunks to a stream synchronously and emit an error when done
+     * @param stream The stream to write to
+     * @param err The error to emit
+     * @param chunks The chunks to write
+     */
+    function syncError(stream: Writable, err: Error, chunks: Chunk[]): void;
+}
diff --git a/types/streamtest/streamtest-tests.ts b/types/streamtest/streamtest-tests.ts
new file mode 100644
index 0000000000..b4d153eb7f
--- /dev/null
+++ b/types/streamtest/streamtest-tests.ts
@@ -0,0 +1,99 @@
+import { PassThrough, Readable, Writable, Stream } from "stream";
+import * as StreamTest from "streamtest";
+
+StreamTest.versions; // $ExpectType VersionName[]
+
+const fromObjectsTestArray = ['hello', { a: 1, b: false }, 1];
+
+function runTest() {
+  StreamTest.versions.forEach((version) => {
+    StreamTest[version].fromChunks(['hello']); // $ExpectType Readable
+    StreamTest[version].fromChunks(['hello'], 10); // $ExpectType Readable
+
+    StreamTest[version].fromObjects(fromObjectsTestArray); // $ExpectType Readable
+    StreamTest[version].fromObjects(fromObjectsTestArray, 10); // $ExpectType Readable
+
+    const errorChunkStream1 = StreamTest[version].fromErroredChunks(
+      new Error('bad thing'),
+      [Buffer.from('some data')],
+    );
+    errorChunkStream1; // $ExpectType Readable
+    errorChunkStream1.on('error', (err) => {
+      return; // keep on working
+    });
+
+    const errorChunkStream2 = StreamTest[version].fromErroredChunks(
+      new Error('bad thing'),
+      [Buffer.from('some data')],
+      10
+    );
+    errorChunkStream2; // $ExpectType Readable
+    errorChunkStream2.on('error', (err) => {
+      return; // keep on working
+    });
+
+    const errorObjectStream1 = StreamTest[version].fromErroredObjects(
+      new Error('bad thing'),
+      fromObjectsTestArray,
+    );
+    errorObjectStream1; // $ExpectType Readable
+    errorObjectStream1.on('error', (err) => {
+      return; // keep on working
+    });
+
+    const errorObjectStream2 = StreamTest[version].fromErroredObjects(
+      new Error('bad thing'),
+      fromObjectsTestArray,
+      10,
+    );
+    errorObjectStream2; // $ExpectType Readable
+    errorObjectStream2.on('error', (err) => {
+      return; // keep on working
+    });
+
+    const toChunks = StreamTest[version].toChunks((err, chunks) => {
+      if (err) {
+        throw err;
+      }
+      return;
+    });
+    toChunks; // $ExpectType Writable
+
+    const toObjects = StreamTest[version].toObjects((err, objects) => {
+      if (err) {
+        throw err;
+      }
+      return;
+    });
+    toObjects; // $ExpectType Writable
+
+    const toText = StreamTest[version].toText((err, text) => {
+      if (err) {
+        throw err;
+      }
+      return;
+    });
+    toText; // $ExpectType Writable
+
+    StreamTest[version].syncReadableChunks(); // $ExpectType PassThrough
+
+    StreamTest[version].syncReadableObjects(); // $ExpectType PassThrough
+
+    StreamTest[version].syncWrite(StreamTest[version].writable(), ['a chunk']);
+
+    try {
+      StreamTest[version].syncError(
+        StreamTest[version].writable(),
+        new Error('bad thing'),
+        ['a chunk']
+      );
+    } catch (err) {
+      // If error not anticipated, throw again
+      if (err.message !== 'bad thing') {
+        throw err;
+      }
+    }
+  });
+}
+
+runTest();
diff --git a/types/streamtest/tsconfig.json b/types/streamtest/tsconfig.json
new file mode 100644
index 0000000000..978e91ca36
--- /dev/null
+++ b/types/streamtest/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",
+        "streamtest-tests.ts"
+    ]
+}
diff --git a/types/streamtest/tslint.json b/types/streamtest/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/streamtest/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/string-format/index.d.ts b/types/string-format/index.d.ts
new file mode 100644
index 0000000000..43e8b7d127
--- /dev/null
+++ b/types/string-format/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for string-format 2.0
+// Project: https://github.com/davidchambers/string-format
+// Definitions by: Luca Lindhorst <https://github.com/lal12>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function Format(template: string, ...args: Array<({ [k: string]: any } | string)>): string;
+
+interface Transformers {
+    [k: string]: (s: any) => string;
+}
+
+declare namespace Format {
+    /**
+     * create a format function with given transformers
+     * @param transformers functions which convert a string, indexed by a name
+     */
+    function create(transformers: Transformers): (typeof Format);
+
+    /**
+     * @param prototype prototype which should be extended by format (usually String.prototype)
+     * @param transformers functions which convert a string, indexed by a name
+     */
+    function extend(prototype: any, transformers: Transformers): void;
+}
+
+export = Format;
diff --git a/types/string-format/string-format-tests.ts b/types/string-format/string-format-tests.ts
new file mode 100644
index 0000000000..73d638fe98
--- /dev/null
+++ b/types/string-format/string-format-tests.ts
@@ -0,0 +1,11 @@
+import Format = require("string-format");
+
+Format.extend(String.prototype, {});
+
+const fmt = Format.create({
+	upper: (s: string) => s.toUpperCase()
+});
+
+fmt("Hallo {name!upper}, you are {age} years old!", { name: "Somebody", age: 10 });
+
+Format("Hallo {name}, you are {age} years old!", { name: "Somebody", age: 10 });
diff --git a/types/string-format/tsconfig.json b/types/string-format/tsconfig.json
new file mode 100644
index 0000000000..ec3951f6f9
--- /dev/null
+++ b/types/string-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",
+        "string-format-tests.ts"
+    ]
+}
diff --git a/types/string-format/tslint.json b/types/string-format/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/string-format/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stripe-v3/index.d.ts b/types/stripe-v3/index.d.ts
index 0c99525290..78ca2c0f8b 100644
--- a/types/stripe-v3/index.d.ts
+++ b/types/stripe-v3/index.d.ts
@@ -308,6 +308,7 @@ declare namespace stripe {
         }
 
         interface ElementChangeResponse {
+            elementType: string;
             brand: string;
             complete: boolean;
             empty: boolean;
diff --git a/types/stripe-v3/stripe-v3-tests.ts b/types/stripe-v3/stripe-v3-tests.ts
index f461006cf3..abd15d5afd 100644
--- a/types/stripe-v3/stripe-v3-tests.ts
+++ b/types/stripe-v3/stripe-v3-tests.ts
@@ -28,6 +28,9 @@ describe("Stripe", () => {
         card.on('ready', () => {
             console.log('ready');
         });
+        card.on('change', (resp: stripe.elements.ElementChangeResponse) => {
+            console.log(resp.elementType);
+        });
         card.on('change', (resp: stripe.elements.ElementChangeResponse) => {
             console.log(resp.brand);
         });
diff --git a/types/stripe/index.d.ts b/types/stripe/index.d.ts
index 9cf60439c8..06b7fbbb70 100644
--- a/types/stripe/index.d.ts
+++ b/types/stripe/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for stripe 5.0
+// Type definitions for stripe 5.0.19
 // Project: https://github.com/stripe/stripe-node/
 // Definitions by: William Johnston <https://github.com/wjohnsto>
 //                 Peter Harris <https://github.com/codeanimal>
@@ -9,6 +9,9 @@
 //                 Kensuke Hoshikawa <https://github.com/starhoshi>
 //                 Thomas Bruun <https://github.com/bruun>
 //                 Gal Talmor <https://github.com/galtalmor>
+//                 Hunter Tunnicliff <https://github.com/htunnicliff>
+//                 Tyler Jones <https://github.com/squirly>
+//                 Troy Zarger <https://github.com/tzarger>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -186,7 +189,7 @@ declare namespace Stripe {
              * 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';
+            type: "custom" | "standard";
         }
 
         interface IAccountShared {
@@ -738,7 +741,7 @@ declare namespace Stripe {
              * charge if a partial refund was issued), positive integer or zero.
              */
             amount_refunded: number;
-            
+
             /**
              * ID of the Connect application that created the charge. [Expandable]
              */
@@ -1319,7 +1322,7 @@ declare namespace Stripe {
             /**
              * ID of the default source attached to this customer. [Expandable]
              */
-            default_source: string | cards.ICard | bitcoinReceivers.IBitcoinReceiver;
+            default_source: string | cards.ICard | bitcoinReceivers.IBitcoinReceiver | null;
 
             /**
              * Whether or not the latest charge for the customer's latest invoice has failed
@@ -1467,6 +1470,13 @@ declare namespace Stripe {
             source?: sources.ISourceCreationOptionsExtended;
         }
 
+        interface ICustomerListOptions extends IListOptionsCreated {
+            /**
+             * A filter on the list based on the customer’s email field. The value must be a string.
+             */
+            email?: string;
+        }
+
         interface ICustomerSourceCreationOptions extends IDataOptionsWithMetadata {
             /**
              * When adding a card to a customer, the parameter name is source. When
@@ -1894,6 +1904,16 @@ declare namespace Stripe {
              */
             amount_due: number;
 
+            /**
+             * The amount, in cents, that was paid.
+             */
+            amount_paid: number;
+
+            /**
+             * The amount remaining, in cents, that is due.
+             */
+            amount_remaining: 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.
@@ -1914,6 +1934,16 @@ declare namespace Stripe {
              */
             attempted: boolean;
 
+            /**
+             * Either charge_automatically, or send_invoice. When charging automatically, Stripe will attempt to pay this invoice using the default source attached to the customer. When sending an invoice, Stripe will email this invoice to the customer with payment instructions.
+             */
+            billing: "charge_automatically" | "send_invoice";
+
+            /**
+             * Indicates the reason why the invoice was created. subscription_cycle indicates an invoice created by a subscription advancing into a new period. subscription_update indicates an invoice created due to creating or updating a subscription. subscription is set for all old invoices to indicate either a change to a subscription or a period advancement. manual is set for all invoices unrelated to a subscription (for example: created via the invoice editor). The upcoming value is reserved for simulated invoices per the upcoming invoice endpoint.
+             */
+            billing_reason: "subscription_cycle" | "subscription_update" | "subscription" | "manual" | "upcoming";
+
             /**
              * ID of the latest charge generated for this invoice, if any. [Expandable]
              */
@@ -1925,17 +1955,35 @@ declare namespace Stripe {
              */
             closed: boolean;
 
+            /**
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
+             */
             currency: string;
+
             customer: string;
+
+            /**
+             * Time at which the object was created. Measured in seconds since the Unix epoch.
+             */
             date: number;
+
+            /**
+             * An arbitrary string attached to the object. Often useful for displaying to users.
+             */
             description: string;
+
             discount: coupons.IDiscount;
 
+            /**
+             * The date on which payment for this invoice is due. This value will be null for invoices where billing=charge_automatically.
+             */
+            due_date: number | null;
+
             /**
              * Ending customer balance after attempting to pay invoice. If the invoice has not been attempted yet,
              * this will be null.
              */
-            ending_balance: number;
+            ending_balance: number | null;
 
             /**
              * Whether or not the invoice has been forgiven. Forgiving an invoice instructs us to update the subscription
@@ -1944,6 +1992,16 @@ declare namespace Stripe {
              */
             forgiven: boolean;
 
+            /**
+             * The URL for the hosted invoice page, which allows customers to view and pay an invoice. If the invoice has not been frozen yet, this will be null.
+             */
+            hosted_invoice_url: string | null;
+
+            /**
+             * The link to download the PDF for the invoice. If the invoice has not been frozen yet, this will be null.
+             */
+            invoice_pdf: string | null;
+
             /**
              * The individual line items that make up the invoice.
              *
@@ -1951,7 +2009,14 @@ declare namespace Stripe {
              */
             lines: IList<IInvoiceLineItem>;
 
+            /**
+             * Has the value true if the object exists in live mode or the value false if the object exists in test mode.
+             */
             livemode: boolean;
+
+            /**
+             * Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+             */
             metadata: IMetadata;
 
             /**
@@ -1959,6 +2024,11 @@ declare namespace Stripe {
              */
             next_payment_attempt: number;
 
+            /**
+             * A unique, identifying string that appears on emails sent to the customer for this invoice. This starts with the customer’s unique invoice_prefix if it is specified.
+             */
+            number: string;
+
             /**
              * 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.
@@ -1987,14 +2057,14 @@ declare namespace Stripe {
             starting_balance: number;
 
             /**
-             * Extra information about an invoice for the customer�s credit card statement.
+             * 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;
+            subscription: string | subscriptions.ISubscription;
 
             /**
              * Only set for upcoming invoices that preview prorations. The time used to calculate prorations.
@@ -2010,14 +2080,14 @@ declare namespace Stripe {
              * 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;
+            tax: number | null;
 
             /**
              * 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;
+            tax_percent: number | null;
 
             /**
              * Total after discount
@@ -2302,7 +2372,7 @@ declare namespace Stripe {
             /**
              * The subscription that this invoice item has been created for, if any.
              */
-            subscription: string;
+            subscription: string | subscriptions.ISubscription;
         }
 
         interface InvoiceItemCreationOptions extends IDataOptionsWithMetadata {
@@ -2389,7 +2459,7 @@ declare namespace Stripe {
              * currency) representing the total amount for the order.
              */
             amount: number;
-            
+
             /**
              * 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 returned for the order thus far.
@@ -2879,6 +2949,30 @@ declare namespace Stripe {
     }
 
     namespace plans {
+        interface ITier {
+            /**
+             * Per unit price for units relevant to the tier.
+             */
+            amount: number;
+
+            /**
+             * Up to and including to this quantity will be contained in the tier.
+             */
+            up_to: number;
+        }
+
+        interface ITransformUsage {
+            /**
+             * Divide usage by this number.
+             */
+            divide_by: number;
+
+            /**
+             * After division, either round the result `up` or `down`.
+             */
+            round: "up" | "down";
+        }
+
         /**
          * 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.
@@ -2889,41 +2983,90 @@ declare namespace Stripe {
              */
             object: "plan";
 
+            /**
+             * Whether the plan is currently available for new subscriptions.
+             */
+            active: boolean;
+
+            /**
+             * Specifies a usage aggregation strategy for plans of `usage_type=metered`. Allowed values are `sum` for summing up all usage during a period, `last_during_period` for picking the last usage record reported within a period, `last_ever` for picking the last usage record ever (across period bounds) or `max` which picks the usage record with the maximum reported usage during a period. Defaults to `sum`.
+             */
+            aggregate_usage: "sum" | "last_during_period" | "last_ever" | "max" | null;
+
             /**
              * The amount in cents to be charged on the interval specified
              */
             amount: number;
 
+            /**
+             * Describes how to compute the price per period. Either `per_unit` or `tiered`. `per_unit` indicates that the fixed amount (specified in `amount`) will be charged per unit in `quantity` (for plans with `usage_type=licensed`), or per unit of total usage (for plans with `usage_type=metered`). `tiered` indicates that the unit pricing will be computed using a tiering strategy as defined using the `tiers` and `tiers_mode` attributes.
+             */
+            billing_scheme: "per_unit" | "tiered";
+
+            /**
+             * Time at which the object was created. Measured in seconds since the Unix epoch.
+             */
             created: number;
 
             /**
-             * Currency in which subscription will be charged
+             * Three-letter ISO currency code, in lowercase. Must be a supported currency.
              */
             currency: string;
 
             /**
-             * One of "day", "week", "month" or "year". The frequency with which a subscription should be billed.
+             * 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.
+             * The number of intervals (specified in the `interval` property) between subscription billings. For example, `interval=month` and `interval_count=3` bills every 3 months.
              */
             interval_count: number;
 
+            /**
+             * Has the value `true` if the object exists in live mode or the value `false` if the object exists in test mode.
+             */
             livemode: boolean;
+
+            /**
+             * Set of key-value pairs that you can attach to an object. This can be useful for storing additional information about the object in a structured format.
+             */
             metadata: IMetadata;
 
             /**
              * A brief description of the plan, hidden from customers.
              */
-            nickname?: string;
+            nickname: string | null;
 
             /**
              * The product whose pricing this plan determines. [Expandable]
              */
             product?: string | products.IProduct;
+
+            /**
+             * Each element represents a pricing tier. This parameter requires `billing_scheme` to be set to `tiered`. See also the documentation for `billing_scheme`.
+             */
+            tiers: plans.ITier[] | null;
+
+            /**
+             * Defines if the tiering price should be `graduated` or `volume` based. In `volume`-based tiering, the maximum quantity within a period determines the per unit price, in `graduated` tiering pricing can successively change as the quantity grows.
+             */
+            tiers_mode: "graduated" | "volume" | null;
+
+            /**
+             * Apply a transformation to the reported usage or set quantity before computing the billed price. Cannot be combined with `tiers`.
+             */
+            transform_usage: plans.ITransformUsage | null;
+
+            /**
+             * Default number of trial days when subscribing a customer to this plan using `trial_from_plan=true`.
+             */
+            trial_period_days: number;
+
+            /**
+             * Configures how the quantity per period should be determined, can be either `metered` or `licensed`. `licensed` will automatically bill the `quantity` set for a plan when adding it to a subscription, `metered` will aggregate the total usage based on usage records. Defaults to `licensed`.
+             */
+            usage_type: "metered" | "licensed";
         }
 
         interface IPlanCreationOptions extends IDataOptionsWithMetadata {
@@ -4204,7 +4347,7 @@ declare namespace Stripe {
             /**
              * Value is 'card'
              */
-            object: string;
+            object: "card";
 
             /**
              * The card number
@@ -4263,7 +4406,7 @@ declare namespace Stripe {
             /**
              * Cardholder name
              */
-            name: string;
+            name: string | null;
 
             /**
              * Uniquely identifies this particular card number. You can use this attribute to check
@@ -4536,6 +4679,12 @@ declare namespace Stripe {
              */
             trial_period_days?: number;
 
+            /**
+             * Indicates if a plan’s trial_period_days should be applied to the subscription. Setting trial_end per subscription is preferred,
+             * and this defaults to false. Setting this flag to true together with trial_end is not allowed.
+             */
+            trial_from_plan?: boolean;
+
             /**
              * List of subscription items, each with an attached plan.
              */
@@ -4890,6 +5039,11 @@ declare namespace Stripe {
              * For other types of refunds, it can be pending, succeeded, failed, or canceled.
              */
             status: "pending" | "succeeded" | "failed" | "canceled";
+
+            /**
+             * If the refund failed, the reason for refund failure if known.
+             */
+            failure_reason?: "lost_or_stolen_card" | "expired_or_canceled_card" | "unknown";
         }
 
         interface IRefundCreationOptions extends IDataOptionsWithMetadata {
@@ -5033,7 +5187,7 @@ declare namespace Stripe {
              * String representing the object’s type. Objects of the same type share the same value.
              */
             object: "review";
-            
+
             /**
              * The charge associated with this review. [Expandable]
              */
@@ -5073,7 +5227,7 @@ declare namespace Stripe {
              */
             name: string;
         }
-    } 
+    }
 
     class StripeResource {
         constructor(stripe: Stripe, urlData: any);
@@ -5720,8 +5874,8 @@ declare namespace Stripe {
              *
              * @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(data: customers.ICustomerListOptions, options: HeaderOptions, response?: IResponseFn<IList<customers.ICustomer>>): Promise<IList<customers.ICustomer>>;
+            list(data: customers.ICustomerListOptions, 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>>;
 
@@ -6592,12 +6746,24 @@ declare namespace Stripe {
              * 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(data: IPlanListOptions, options: HeaderOptions, response?: IResponseFn<IList<plans.IPlan>>): Promise<IList<plans.IPlan>>;
+            list(data: IPlanListOptions, 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>>;
         }
 
+        interface IPlanListOptions extends IListOptionsCreated {
+            /**
+             * Only return plans that are active or inactive (e.g., pass false to list all inactive products).
+             */
+            active?: boolean;
+
+            /**
+             * Only return plans for the given product.
+             */
+            product?: string
+        }
+
         /**
          * @deprecated
          */
@@ -7026,7 +7192,7 @@ declare namespace Stripe {
         }
 
         class WebHooks {
-            constructEvent<T>(requestBody: any, signature: string | string[], endpointSecret: string): webhooks.StripeWebhookEvent<T>;
+            constructEvent<T>(requestBody: any, signature: string | string[], endpointSecret: string, tolerance?: number): webhooks.StripeWebhookEvent<T>;
         }
 
         class EphemeralKeys {
diff --git a/types/stripe/stripe-tests.ts b/types/stripe/stripe-tests.ts
index 306ab0442a..4e538abddb 100644
--- a/types/stripe/stripe-tests.ts
+++ b/types/stripe/stripe-tests.ts
@@ -59,6 +59,7 @@ stripe.charges.create({
     // asynchronously called
 
     charge.refunds.create().then(function (refund) {
+        const reason = refund.failure_reason;
         // asynchronously called
     });
     charge.refunds.create({ amount: 100 }).then(function (refund) {
@@ -364,6 +365,10 @@ stripe.customers.list({ limit: 3 }).then(function (customers) {
     // asynchronously called
 });
 
+stripe.customers.list({ email: "test@example.com" }).then(function (customers) {
+	// asynchronously called
+});
+
 stripe.customers.createCard(
     "cus_5rfJKDJkuxzh5Q",
     { card: "tok_15V2YhEe31JkLCeQy9iUgsJX" },
@@ -1018,6 +1023,10 @@ stripe.invoices.list({ customer: "cus_5rfJKDJkuxzh5Q", limit: 3 }).then(function
     // asynchronously called
 });
 
+stripe.invoices.retrieve("in_15fvyXEe31JkLCeQH7QbgZZb", { expand: ["subscription"] }).then(function (invoice) {
+  invoice.subscription
+})
+
 //#endregion
 
 //#region Invoice Items tests
@@ -1216,6 +1225,13 @@ stripe.plans.del("gold-plan").then(function (confirmation) {
     // asynchronously called
 });
 
+stripe.plans.list({ active: true, product: 'prod_someproduct' }, function(err, plans) {
+    // asynchronously called
+});
+stripe.plans.list({ active: true, product: 'prod_someproduct' }).then(function (plans) {
+    // asynchronously called
+});
+
 stripe.plans.list(null, function (err, plans) {
     // asynchronously called
 });
diff --git a/types/styled-components/index.d.ts b/types/styled-components/index.d.ts
new file mode 100644
index 0000000000..9654334af2
--- /dev/null
+++ b/types/styled-components/index.d.ts
@@ -0,0 +1,212 @@
+// Type definitions for styled-components 3.0
+// Project: https://github.com/styled-components/styled-components
+// Definitions by: Igor Oleinikov <https://github.com/Igorbek>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+/// <reference types="node" />
+
+import * as React from 'react';
+
+export interface ThemeProps<T> {
+    theme: T;
+}
+
+export type ThemedStyledProps<P, T> = P & ThemeProps<T>;
+export type StyledProps<P> = ThemedStyledProps<P, any>;
+
+export type ThemedOuterStyledProps<P, T> = P & {
+    theme?: T;
+    innerRef?:
+        | ((instance: any) => void)
+        | React.RefObject<HTMLElement | SVGElement | React.Component>;
+};
+export type OuterStyledProps<P> = ThemedOuterStyledProps<P, any>;
+
+export type FalseyValue = undefined | null | false;
+export type Interpolation<P> =
+    | FlattenInterpolation<P>
+    | ReadonlyArray<
+          FlattenInterpolation<P> | ReadonlyArray<FlattenInterpolation<P>>
+      >;
+export type FlattenInterpolation<P> =
+    | InterpolationValue
+    | InterpolationFunction<P>;
+export type InterpolationValue =
+    | string
+    | number
+    | Styles
+    | FalseyValue
+    | StyledComponentClass<any, any>;
+export type SimpleInterpolation =
+    | InterpolationValue
+    | ReadonlyArray<InterpolationValue | ReadonlyArray<InterpolationValue>>;
+export interface Styles {
+    [ruleOrSelector: string]: string | number | Styles;
+}
+
+export type InterpolationFunction<P> = (props: P) => Interpolation<P>;
+
+type Attrs<P, A extends Partial<P>, T> = {
+    [K in keyof A]: ((props: ThemedStyledProps<P, T>) => A[K]) | A[K]
+};
+
+export interface StyledComponentClass<P, T, O = P>
+    extends React.ComponentClass<ThemedOuterStyledProps<O, T>> {
+    extend: ThemedStyledFunction<P, T, O>;
+
+    withComponent<K extends keyof JSX.IntrinsicElements>(
+        tag: K,
+    ): StyledComponentClass<
+        JSX.IntrinsicElements[K],
+        T,
+        JSX.IntrinsicElements[K] & O
+    >;
+    withComponent<U = {}>(
+        element: React.ComponentType<U>,
+    ): StyledComponentClass<U, T, U & O>;
+}
+
+export interface ThemedStyledFunction<P, T, O = P> {
+    (
+        strings: TemplateStringsArray,
+        ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
+    ): StyledComponentClass<P, T, O>;
+    <U>(
+        strings: TemplateStringsArray,
+        ...interpolations: Array<Interpolation<ThemedStyledProps<P & U, T>>>
+    ): StyledComponentClass<P & U, T, O & U>;
+    attrs<U, A extends Partial<P & U> = {}>(
+        attrs: Attrs<P & U, A, T>,
+    ): ThemedStyledFunction<DiffBetween<A, P & U>, T, DiffBetween<A, O & U>>;
+}
+
+export type StyledFunction<P> = ThemedStyledFunction<P, any>;
+
+type ThemedStyledComponentFactories<T> = {
+    [TTag in keyof JSX.IntrinsicElements]: ThemedStyledFunction<
+        JSX.IntrinsicElements[TTag],
+        T
+    >
+};
+
+export interface ThemedBaseStyledInterface<T>
+    extends ThemedStyledComponentFactories<T> {
+    <P, TTag extends keyof JSX.IntrinsicElements>(
+        tag: TTag,
+    ): ThemedStyledFunction<P, T, P & JSX.IntrinsicElements[TTag]>;
+    <P, O>(component: StyledComponentClass<P, T, O>): ThemedStyledFunction<
+        P,
+        T,
+        O
+    >;
+    <P extends { [prop: string]: any; theme?: T }>(
+        component: React.ComponentType<P>,
+    ): ThemedStyledFunction<P, T, WithOptionalTheme<P, T>>;
+}
+export type BaseStyledInterface = ThemedBaseStyledInterface<any>;
+
+export type ThemedStyledInterface<T> = ThemedBaseStyledInterface<T>;
+export type StyledInterface = ThemedStyledInterface<any>;
+
+export interface ThemeProviderProps<T> {
+    theme?: T | ((theme: T) => T);
+}
+export type ThemeProviderComponent<T> = React.ComponentClass<
+    ThemeProviderProps<T>
+>;
+
+export interface ThemedCssFunction<T> {
+    (
+        strings: TemplateStringsArray,
+        ...interpolations: SimpleInterpolation[]
+    ): InterpolationValue[];
+    <P>(
+        strings: TemplateStringsArray,
+        ...interpolations: Array<Interpolation<ThemedStyledProps<P, T>>>
+    ): Array<FlattenInterpolation<ThemedStyledProps<P, T>>>;
+}
+
+// Helper type operators
+type KeyofBase = keyof any;
+type Diff<T extends KeyofBase, U extends KeyofBase> = ({ [P in T]: P } &
+    { [P in U]: never })[T];
+type Omit<T, K extends keyof T> = Pick<T, Diff<keyof T, K>>;
+type DiffBetween<T, U> = Pick<T, Diff<keyof T, keyof U>> &
+    Pick<U, Diff<keyof U, keyof T>>;
+type WithOptionalTheme<P extends { theme?: T }, T> = Omit<P, 'theme'> & {
+    theme?: T;
+};
+
+export interface ThemedStyledComponentsModule<T> {
+    default: ThemedStyledInterface<T>;
+
+    css: ThemedCssFunction<T>;
+    keyframes(
+        strings: TemplateStringsArray,
+        ...interpolations: SimpleInterpolation[]
+    ): string;
+    injectGlobal(
+        strings: TemplateStringsArray,
+        ...interpolations: SimpleInterpolation[]
+    ): void;
+    withTheme<P extends { theme?: T }>(
+        component: React.ComponentType<P>,
+    ): React.ComponentClass<WithOptionalTheme<P, T>>;
+
+    ThemeProvider: ThemeProviderComponent<T>;
+}
+
+declare const styled: StyledInterface;
+
+export const css: ThemedCssFunction<any>;
+
+export function withTheme<P extends { theme?: T }, T>(
+    component: React.ComponentType<P>,
+): React.ComponentClass<WithOptionalTheme<P, T>>;
+
+export function keyframes(
+    strings: TemplateStringsArray,
+    ...interpolations: SimpleInterpolation[]
+): string;
+
+export function injectGlobal(
+    strings: TemplateStringsArray,
+    ...interpolations: SimpleInterpolation[]
+): void;
+
+export function consolidateStreamedStyles(): void;
+
+export function isStyledComponent(
+    target: any,
+): target is StyledComponentClass<{}, {}>;
+
+export const ThemeProvider: ThemeProviderComponent<object>;
+
+interface StylesheetComponentProps {
+    sheet: ServerStyleSheet;
+}
+
+interface StyleSheetManagerProps {
+    sheet?: StyleSheet;
+    target?: Node;
+}
+
+export class StyleSheetManager extends React.Component<
+    StyleSheetManagerProps
+> {}
+
+export class ServerStyleSheet {
+    collectStyles(
+        tree: React.ReactNode,
+    ): React.ReactElement<StylesheetComponentProps>;
+
+    getStyleTags(): string;
+    getStyleElement(): Array<React.ReactElement<{}>>;
+    interleaveWithNodeStream(
+        readableStream: NodeJS.ReadableStream,
+    ): NodeJS.ReadableStream;
+    instance: StyleSheet;
+}
+
+export default styled;
diff --git a/types/styled-components/styled-components-tests.tsx b/types/styled-components/styled-components-tests.tsx
new file mode 100644
index 0000000000..d2e6cc04cd
--- /dev/null
+++ b/types/styled-components/styled-components-tests.tsx
@@ -0,0 +1,548 @@
+import * as React from 'react';
+import * as ReactDOM from 'react-dom';
+import * as ReactDOMServer from 'react-dom/server';
+
+import styled, {
+    css,
+    injectGlobal,
+    isStyledComponent,
+    keyframes,
+    ServerStyleSheet,
+    StyleSheetManager,
+    ThemeProps,
+    ThemeProvider,
+    withTheme,
+} from 'styled-components';
+
+/**
+ * general usage
+ */
+
+// Create a <Title> react component that renders an <h1> which is
+// centered, palevioletred and sized at 1.5em
+const Title = styled.h1`
+    font-size: 1.5em;
+    text-align: center;
+    color: palevioletred;
+`;
+
+// Create a <Wrapper> react component that renders a <section> with
+// some padding and a papayawhip background
+const Wrapper = styled.section`
+    padding: 4em;
+    background: papayawhip;
+`;
+
+const Input = styled.input`
+    font-size: 1.25em;
+    padding: 0.5em;
+    margin: 0.5em;
+    color: palevioletred;
+    background: papayawhip;
+    border: none;
+    border-radius: 3px;
+
+    &:hover {
+        box-shadow: inset 1px 1px 2px rgba(0, 0, 0, 0.1);
+    }
+`;
+
+interface MyTheme {
+    primary: string;
+}
+
+interface ButtonProps {
+    name: string;
+    primary?: boolean;
+    theme: MyTheme;
+}
+
+class MyButton extends React.Component<ButtonProps> {
+    render() {
+        return <button>Custom button</button>;
+    }
+}
+
+const TomatoButton = styled(MyButton)`
+    color: tomato;
+    border-color: tomato;
+`;
+
+const CustomizableButton = styled(MyButton)`
+    /* Adapt the colors based on primary prop */
+    background: ${props => (props.primary ? 'palevioletred' : 'white')};
+    color: ${props => (props.primary ? 'white' : 'palevioletred')};
+
+    font-size: 1em;
+    margin: 1em;
+    padding: 0.25em 1em;
+    border: 2px solid ${props => props.theme.primary};
+    border-radius: 3px;
+`;
+
+const example = css`
+    font-size: 1.5em;
+    text-align: center;
+    color: ${props => props.theme.primary};
+    border-color: ${'red'};
+`;
+
+const fadeIn = keyframes`
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+`;
+
+const theme = {
+    main: 'mediumseagreen',
+};
+
+injectGlobal`
+  @font-face {
+      font-family: 'Operator Mono';
+      src: url('../fonts/Operator-Mono.ttf');
+    }
+
+    body {
+        margin: 0;
+    }
+`;
+
+class Example extends React.Component {
+    render() {
+        return (
+            <ThemeProvider theme={theme}>
+                <Wrapper>
+                    <Title>
+                        Hello World, this is my first styled component!
+                    </Title>
+
+                    <Input placeholder="@mxstbr" type="text" />
+                    <TomatoButton name="demo" />
+                </Wrapper>
+                ;
+            </ThemeProvider>
+        );
+    }
+}
+
+// css which only uses simple interpolations without functions
+const cssWithValues1 = css`
+    font-size: ${14} ${'pt'};
+`;
+// css which uses other simple interpolations without functions
+const cssWithValues2 = css`
+  ${cssWithValues1}
+  ${[cssWithValues1, cssWithValues1]}
+  font-weight: ${'bold'};
+`;
+// injectGlobal accepts simple interpolations if they're not using functions
+injectGlobal`
+  ${'font-size'}: ${10}pt;
+  ${cssWithValues1}
+  ${[cssWithValues1, cssWithValues2]}
+`;
+
+// css which uses function interpolations with common props
+const cssWithFunc1 = css`
+    font-size: ${props => props.theme.fontSizePt}pt;
+`;
+const cssWithFunc2 = css`
+  ${cssWithFunc1}
+  ${props => cssWithFunc1}
+  ${[cssWithFunc1, cssWithValues1]}
+`;
+// such css can be used in styled components
+const styledButton = styled.button`
+  ${cssWithValues1} ${[cssWithValues1, cssWithValues2]}
+  ${cssWithFunc1} ${[cssWithFunc1, cssWithFunc2]}
+  ${() => [cssWithFunc1, cssWithFunc2]}
+`;
+// css with function interpolations cannot be used in injectGlobal
+/*
+injectGlobal`
+  ${cssWithFunc1}
+`;
+*/
+
+const name = 'hey';
+
+const ThemedMyButton = withTheme(MyButton);
+
+<ThemedMyButton name={name} />;
+
+/**
+ * nested styles
+ */
+
+const Link = styled.a`
+    color: red;
+`;
+
+const AlternativeLink = styled.a`
+    color: blue;
+`;
+
+const freeStyles = css`
+    background-color: black;
+    color: white;
+    ${Link} {
+        color: blue;
+    }
+`;
+
+const Article = styled.section`
+    color: red;
+    ${freeStyles}
+    & > ${Link} {
+        color: green;
+    }
+    ${p => (p.theme.useAlternativeLink ? AlternativeLink : Link)} {
+        color: black
+    }
+`;
+
+// A Link instance should be backed by an HTMLAnchorElement
+const ComposedLink = () => (
+    <Link onClick={(e: React.MouseEvent<HTMLAnchorElement>) => undefined} />
+);
+
+/**
+ * construction via string tag
+ */
+
+// Create a <LinkFromString> react component that renders an <a> which is
+// centered, palevioletred and sized at 1.5em
+const LinkFromString = styled('a')`
+    font-size: 1.5em;
+    text-align: center;
+    color: palevioletred;
+`;
+
+// A LinkFromString instance should be backed by an HTMLAnchorElement
+const MyOtherComponent = () => (
+    <LinkFromString
+        onClick={(e: React.MouseEvent<HTMLAnchorElement>) => undefined}
+    />
+);
+
+// Create a <LinkFromStringWithProps> react component that renders an <a>
+// which takes extra props
+interface LinkProps {
+    canClick: boolean;
+}
+
+const LinkFromStringWithProps = styled('a')`
+    font-size: 1.5em;
+    text-align: center;
+    color: ${(a: LinkProps) => (a.canClick ? 'palevioletred' : 'gray')};
+`;
+
+// A LinkFromStringWithProps instance should be backed by an HTMLAnchorElement
+const MyOtherComponentWithProps = () => (
+    <LinkFromStringWithProps
+        canClick={false}
+        onClick={(e: React.MouseEvent<HTMLAnchorElement>) => undefined}
+    />
+);
+
+// Create a <LinkFromStringWithPropsAndGenerics> react component that renders an <a>
+// which takes extra props passed as a generic type argument
+const LinkFromStringWithPropsAndGenerics = styled<LinkProps, 'a'>('a')`
+    font-size: 1.5em;
+    text-align: center;
+    color: ${a => (a.canClick ? 'palevioletred' : 'gray')};
+`;
+
+// A LinkFromStringWithPropsAndGenerics instance should be backed by an HTMLAnchorElement
+const MyOtherComponentWithPropsAndGenerics = () => (
+    <LinkFromStringWithPropsAndGenerics
+        canClick={false}
+        onClick={(e: React.MouseEvent<HTMLAnchorElement>) => undefined}
+    />
+);
+
+/**
+ * object styles
+ */
+
+interface ObjectStyleProps {
+    size: string;
+}
+
+const functionReturningStyleObject = (props: ObjectStyleProps) => ({
+    padding: props.size === 'big' ? '10px' : 2,
+});
+
+const ObjectStylesBox = styled.div`
+    ${functionReturningStyleObject} ${{
+        backgroundColor: 'red',
+
+        // Supports nested objects (pseudo selectors, media queries, etc)
+        '@media screen and (min-width: 800px)': {
+            backgroundColor: 'blue',
+        },
+
+        fontSize: 2,
+    }};
+`;
+
+<ObjectStylesBox size="big" />;
+
+/**
+ * attrs
+ */
+
+const AttrsInput = styled.input.attrs({
+    // we can define static props
+    type: 'password',
+
+    // or we can define dynamic ones
+    margin: (props: any) => (props.size as string) || '1em',
+    padding: (props: any) => (props.size as string) || '1em',
+})`
+    color: palevioletred;
+    font-size: 1em;
+    border: 2px solid palevioletred;
+    border-radius: 3px;
+
+    /* here we use the dynamically computed props */
+    margin: ${props => props.margin};
+    padding: ${props => props.padding};
+`;
+
+/**
+ * component type
+ */
+
+declare const A: React.ComponentClass;
+declare const B: React.StatelessComponent;
+declare const C: React.ComponentType;
+
+styled(A); // succeeds
+styled(B); // succeeds
+styled(C); // used to fail; see issue trail linked below
+
+// https://github.com/mui-org/material-ui/pull/8781#issuecomment-349460247
+// https://github.com/mui-org/material-ui/issues/9838
+// https://github.com/styled-components/styled-components/pull/1420
+// https://github.com/Microsoft/TypeScript/issues/21175
+// https://github.com/styled-components/styled-components/pull/1427
+
+/**
+ * extend
+ */
+
+const ExtendButton = styled.button`
+    color: palevioletred;
+    font-size: 1em;
+    margin: 1em;
+    padding: 0.25em 1em;
+    border: 2px solid palevioletred;
+    border-radius: 3px;
+`;
+
+// We're extending Button with some extra styles
+const TomatoExtendButton = ExtendButton.extend`
+    color: tomato;
+    border-color: tomato;
+`;
+
+/**
+ * function themes
+ */
+
+// Define our button, but with the use of props.theme this time
+const ThemedButton = styled.button`
+    color: ${props => props.theme.fg};
+    border: 2px solid ${props => props.theme.fg};
+    background: ${props => props.theme.bg};
+
+    font-size: 1em;
+    margin: 1em;
+    padding: 0.25em 1em;
+    border-radius: 3px;
+`;
+
+// Define our `fg` and `bg` on the theme
+const theme2 = {
+    fg: 'palevioletred',
+    bg: 'white',
+};
+
+// This theme swaps `fg` and `bg`
+const invertTheme = ({ fg, bg }: { fg: string; bg: string }) => ({
+    fg: bg,
+    bg: fg,
+});
+
+const MyApp = (
+    <ThemeProvider theme={theme2}>
+        <div>
+            <ThemedButton>Default Theme</ThemedButton>
+
+            <ThemeProvider theme={invertTheme}>
+                <ThemedButton>Inverted Theme</ThemedButton>
+            </ThemeProvider>
+        </div>
+    </ThemeProvider>
+);
+
+/**
+ * withTheme HOC
+ */
+
+class MyComponent extends React.Component<ThemeProps<{}>> {
+    render() {
+        const { theme } = this.props;
+
+        console.log('Current theme: ', theme);
+
+        return <h1>Hello</h1>;
+    }
+}
+
+const ThemedMyComponent = withTheme(MyComponent);
+
+interface WithThemeProps {
+    theme: {
+        color: string;
+    };
+    text: string;
+}
+
+const Component = (props: WithThemeProps) => (
+    <div style={{ color: props.theme.color }}>{props.text}</div>
+);
+
+const ComponentWithTheme = withTheme(Component);
+
+<ComponentWithTheme text={'hi'} />; // ok
+<ComponentWithTheme text={'hi'} theme={{ color: 'red' }} />; // ok
+
+/**
+ * isStyledComponent utility
+ */
+
+const StyledComponent = styled.h1``;
+
+const StatelessComponent = () => <div />;
+
+class ClassComponent extends React.Component {
+    render() {
+        return <div />;
+    }
+}
+
+isStyledComponent(StyledComponent);
+isStyledComponent(StatelessComponent);
+isStyledComponent(ClassComponent);
+isStyledComponent('div');
+
+/**
+ * server side rendering
+ */
+
+const SSRTitle = styled.h1`
+    font-size: 1.5em;
+    text-align: center;
+    color: palevioletred;
+`;
+
+const sheet = new ServerStyleSheet();
+const html = sheet.collectStyles(<SSRTitle>Hello world</SSRTitle>);
+const styleHtml = sheet.getStyleTags();
+const styleElement = sheet.getStyleElement();
+
+const sheet2 = new ServerStyleSheet();
+const element = (
+    <StyleSheetManager sheet={sheet2.instance}>
+        <SSRTitle>Hello world</SSRTitle>
+    </StyleSheetManager>
+);
+
+const css2 = sheet2.getStyleElement();
+
+// Wrapping a node stream returned from renderToNodeStream with interleaveWithNodeStream
+
+const sheet3 = new ServerStyleSheet();
+const appStream = ReactDOMServer.renderToNodeStream(<Title>Hello world</Title>);
+const wrappedCssStream: NodeJS.ReadableStream = sheet3.interleaveWithNodeStream(
+    appStream,
+);
+
+/**
+ * StyledComponent.withComponent
+ */
+
+const WithComponentH1 = styled.h1`
+    color: palevioletred;
+    font-size: 1em;
+`;
+
+function getRandomInt(min: number, max: number) {
+    min = Math.ceil(min);
+    max = Math.floor(max);
+    return Math.floor(Math.random() * (max - min)) + min;
+}
+
+class Random extends React.Component<any, any> {
+    render() {
+        const i = getRandomInt(1, 6);
+
+        switch (i) {
+            case 1:
+                return <h1>Hello World</h1>;
+            case 2:
+                return <h2>Hello World</h2>;
+            case 3:
+                return <h3>Hello World</h3>;
+            case 4:
+                return <h4>Hello World</h4>;
+            case 5:
+                return <h5>Hello World</h5>;
+            case 6:
+                return <h6>Hello World</h6>;
+            default:
+                return null;
+        }
+    }
+}
+
+const WithComponentH2 = WithComponentH1.withComponent('h2');
+const WithComponentAbbr = WithComponentH1.withComponent('abbr');
+
+const WithComponentAnchor = WithComponentH1.withComponent('a');
+const AnchorContainer = () => (
+    <WithComponentAnchor href="https://example.com">
+        withComponent Anchor
+    </WithComponentAnchor>
+);
+
+const WithComponentRandomHeading = WithComponentH1.withComponent(Random);
+
+const WithComponentCompA: React.SFC<{ a: number; className?: string }> = ({
+    className,
+}) => <div className={className} />;
+const WithComponentCompB: React.SFC<{ b: number; className?: string }> = ({
+    className,
+}) => <div className={className} />;
+const WithComponentStyledA = styled(WithComponentCompA)`
+    color: ${(props: { color: string }) => props.color};
+`;
+
+const WithComponentFirstStyledA = styled(WithComponentStyledA).attrs({
+    a: 1,
+})``;
+
+const WithComponentFirstStyledB = WithComponentFirstStyledA.withComponent(
+    WithComponentCompB,
+);
+
+const test = () => [
+    <WithComponentFirstStyledA color={'black'} />,
+    <WithComponentFirstStyledB b={2} color={'black'} />,
+];
diff --git a/types/styled-components/tsconfig.json b/types/styled-components/tsconfig.json
new file mode 100644
index 0000000000..26cb1835d5
--- /dev/null
+++ b/types/styled-components/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "baseUrl": "../",
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "lib": ["es6", "dom"],
+        "module": "commonjs",
+        "noEmit": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "typeRoots": ["../"],
+        "types": []
+    },
+    "files": ["index.d.ts", "styled-components-tests.tsx"]
+}
diff --git a/types/styled-components/tslint.json b/types/styled-components/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/styled-components/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/styled-jsx/css.d.ts b/types/styled-jsx/css.d.ts
index 588956c57e..bb50756afc 100644
--- a/types/styled-jsx/css.d.ts
+++ b/types/styled-jsx/css.d.ts
@@ -1,4 +1,8 @@
-type Tag = (chunks: TemplateStringsArray, ...args: any[]) => string;
+type Tag = {
+    (chunks: TemplateStringsArray, ...args: any[]): string;
+    global: (chunks: TemplateStringsArray, ...args: any[]) => string;
+    resolve: (chunks: TemplateStringsArray, ...args: any[]) => { className: string; styles: string };
+};
 
 declare let css: Tag;
 export = css;
diff --git a/types/styled-jsx/index.d.ts b/types/styled-jsx/index.d.ts
index 5e15388837..35f0112b6f 100644
--- a/types/styled-jsx/index.d.ts
+++ b/types/styled-jsx/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zeit/styled-jsx
 // Definitions by: R1ZZU <https://github.com/R1ZZU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import "react";
 
diff --git a/types/styled-jsx/styled-jsx-tests.tsx b/types/styled-jsx/styled-jsx-tests.tsx
index 09883d8df6..d1b9033966 100644
--- a/types/styled-jsx/styled-jsx-tests.tsx
+++ b/types/styled-jsx/styled-jsx-tests.tsx
@@ -26,6 +26,29 @@ const withSeparatedCSS = (
     </div>
 );
 
+const globalCSS = css.global`body { margin: 0; }`;
+const withGlobalCSS = (
+    <div>
+        <style jsx global>{globalCSS}</style>
+    </div>
+);
+
+const resolvedCSS = css.resolve`a { color: green; }`;
+const withResolvedCSS = (
+    <div>
+        <button className={resolvedCSS.className}>About</button>
+        {resolvedCSS.styles}
+    </div>
+);
+
+const dynamicResolvedCSS = css.resolve`a { color: ${buttonColor}; }`;
+const withDynamicResolvedCSS = (
+    <div>
+        <button className={dynamicResolvedCSS.className}>About</button>
+        {dynamicResolvedCSS.styles}
+    </div>
+);
+
 const stylesChildren = flushToReact();
 const jsxToRender = (
     <head>{ stylesChildren }</head>
diff --git a/types/styled-system/dist/mixed.d.ts b/types/styled-system/dist/mixed.d.ts
new file mode 100644
index 0000000000..25f115aa55
--- /dev/null
+++ b/types/styled-system/dist/mixed.d.ts
@@ -0,0 +1,7 @@
+export interface MixedProps {
+    key?: any;
+    // Defaults to "variant"
+    prop?: string;
+}
+
+export function mixed(...args: any[]): any;
diff --git a/types/styled-system/dist/space.d.ts b/types/styled-system/dist/space.d.ts
new file mode 100644
index 0000000000..b3996a559c
--- /dev/null
+++ b/types/styled-system/dist/space.d.ts
@@ -0,0 +1,23 @@
+export type ResponsiveValue<T> = T | Array<T | null>;
+
+export type SpaceValue = number | string;
+export type ResponsiveSpaceValue = ResponsiveValue<SpaceValue>;
+
+export interface SpaceProps {
+    m?: ResponsiveSpaceValue;
+    mt?: ResponsiveSpaceValue;
+    mr?: ResponsiveSpaceValue;
+    mb?: ResponsiveSpaceValue;
+    ml?: ResponsiveSpaceValue;
+    mx?: ResponsiveSpaceValue;
+    my?: ResponsiveSpaceValue;
+    p?: ResponsiveSpaceValue;
+    pt?: ResponsiveSpaceValue;
+    pr?: ResponsiveSpaceValue;
+    pb?: ResponsiveSpaceValue;
+    pl?: ResponsiveSpaceValue;
+    px?: ResponsiveSpaceValue;
+    py?: ResponsiveSpaceValue;
+}
+
+export function space(...args: any[]): any;
diff --git a/types/styled-system/dist/styles.d.ts b/types/styled-system/dist/styles.d.ts
new file mode 100644
index 0000000000..7c666f9a9d
--- /dev/null
+++ b/types/styled-system/dist/styles.d.ts
@@ -0,0 +1,688 @@
+import { ResponsiveValue, ResponsiveSpaceValue, SpaceValue } from './space';
+
+export * from './space';
+
+export type GlobalStyleValues = "inherit" | "initial" | "unset";
+
+export interface BaseTheme {
+    breakpoints?: number[];
+    space?: number[];
+    fontSizes?: number[];
+    colors?: {
+        [name: string]: string;
+    };
+}
+
+/**
+ * Font Size
+ */
+
+export type FontSizeValue = number | string;
+export type ResponsiveFontSizeValue = ResponsiveValue<FontSizeValue>;
+
+export interface FontSizeProps {
+    fontSize?: ResponsiveFontSizeValue;
+}
+
+export function fontSize(...args: any[]): any;
+
+/**
+ * Color
+ */
+export type ColorValue = string;
+export type ResponsiveColorValue = ResponsiveValue<ColorValue>;
+
+export interface TextColorProps {
+    color?: ResponsiveColorValue;
+}
+
+export function textColor(...args: any[]): any;
+
+export interface BgColorProps {
+    bg?: ResponsiveColorValue;
+}
+
+export function bgColor(...args: any[]): any;
+
+export interface ColorProps extends TextColorProps, BgColorProps {}
+
+export function color(...args: any[]): any;
+
+/**
+ * Typography
+ */
+export type TypographyValue = string;
+export type ResponsiveTypographyValue = ResponsiveValue<TypographyValue>;
+
+export interface FontFamilyProps {
+    fontFamily?: ResponsiveTypographyValue;
+}
+export function fontFamily(...args: any[]): any;
+
+export type TextAlignValue =
+    | "left"
+    | "right"
+    | "center"
+    | "justify"
+    | "justify-all"
+    | "start"
+    | "end"
+    | "match-parent";
+export type ResponsiveTextAlignValue = ResponsiveValue<TextAlignValue>;
+
+export interface TextAlignProps {
+    textAlign?: ResponsiveTextAlignValue;
+}
+
+export function textAlign(...args: any[]): any;
+
+export type LineHeightValue = number | string;
+export type ResponsiveLineHeightValue = ResponsiveValue<LineHeightValue>;
+export interface LineHeightProps {
+    lineHeight?: ResponsiveLineHeightValue;
+}
+export function lineHeight(...args: any[]): any;
+
+export type FontWeightValue =
+    | GlobalStyleValues
+    | "normal"
+    | "bold"
+    | "lighter"
+    | "bolder"
+    | number;
+export type ResponsiveFontWeightValue = ResponsiveValue<FontWeightValue>;
+
+export interface FontWeightProps {
+    fontWeight?: ResponsiveFontWeightValue;
+}
+
+export function fontWeight(...args: any[]): any;
+
+export type LetterSpacingValue = number | string;
+export type ResponsiveLetterSpacingValue = ResponsiveValue<LetterSpacingValue>;
+export interface LetterSpacingProps {
+    letterSpacing?: ResponsiveLetterSpacingValue;
+}
+export function letterSpacing(...args: any[]): any;
+
+/**
+ * Layout
+ */
+
+export type DisplayValue =
+    | "none"
+    | "inline"
+    | "block"
+    | "contents"
+    | "flex"
+    | "grid"
+    | "inline-block";
+export type ResponsiveDisplayValue = ResponsiveValue<DisplayValue>;
+export interface DisplayProps {
+    display?: ResponsiveDisplayValue;
+}
+
+export function display(...args: any[]): any;
+
+export interface MaxWidthProps {
+    maxWidth?: ResponsiveSpaceValue;
+}
+
+export function maxWidth(...args: any[]): any;
+
+export interface MinWidthProps {
+    minWidth?: ResponsiveSpaceValue;
+}
+
+export function minWidth(...args: any[]): any;
+
+export interface WidthProps {
+    width?: ResponsiveSpaceValue;
+}
+
+export function width(...args: any[]): any;
+
+export interface MaxHeightProps {
+    maxHeight?: ResponsiveSpaceValue;
+}
+
+export function maxHeight(...args: any[]): any;
+
+export interface MinHeightProps {
+    minHeight?: ResponsiveSpaceValue;
+}
+
+export function minHeight(...args: any[]): any;
+
+export interface HeightProps {
+    height?: ResponsiveSpaceValue;
+}
+
+export function height(...args: any[]): any;
+
+export interface SizeWidthProps {
+    size?: ResponsiveSpaceValue;
+}
+
+export function sizeWidth(...args: any[]): any;
+
+export interface SizeHeightProps {
+    size?: ResponsiveSpaceValue;
+}
+
+export function sizeHeight(...args: any[]): any;
+
+export interface SizeProps extends SizeHeightProps, SizeWidthProps {}
+
+export function size(...args: any[]): any;
+
+export type RatioValue = SpaceValue;
+export type ResponsiveRatioValue = ResponsiveValue<RatioValue>;
+
+export interface RatioProps {
+    ratio?: ResponsiveRatioValue;
+}
+
+export function ratio(...args: any[]): any;
+
+export type VerticleAlignValue =
+    | "baseline"
+    | "sub"
+    | "super"
+    | "text-top"
+    | "text-bottom"
+    | "middle"
+    | "top"
+    | "bottom"
+    | string
+    | number;
+export type ResponsiveVerticleAlignValue = ResponsiveValue<VerticleAlignValue>;
+
+export interface VerticleAlignProps {
+    verticalAlign?: ResponsiveVerticleAlignValue;
+}
+
+export function verticleAlign(...args: any[]): any;
+
+/**
+ * Flexbox
+ */
+
+export type AlignItemsValue =
+    | "normal"
+    | "stretch"
+    | "center"
+    | "start"
+    | "end"
+    | "flex-start"
+    | "flex-end"
+    | "self-start"
+    | "self-end"
+    | "left"
+    | "right"
+    | "baseline"
+    | "first baseline"
+    | "last baseline"
+    | "safe center"
+    | "unsafe center";
+export type ResponsiveAlignItemsValue = ResponsiveValue<AlignItemsValue>;
+
+export interface AlignItemsProps {
+    alignItems?: ResponsiveAlignItemsValue;
+}
+
+export function alignItems(...args: any[]): any;
+
+export type AlignContentValue =
+    | GlobalStyleValues
+    | "center"
+    | "start"
+    | "end"
+    | "flex-start"
+    | "flex-end"
+    | "normal"
+    | "baseline"
+    | "first baseline"
+    | "last baseline"
+    | "space-between"
+    | "space-around"
+    | "space-evenly"
+    | "stretch"
+    | "safe center"
+    | "unsafe center";
+export type ResponsiveAlignContentValue = ResponsiveValue<AlignContentValue>;
+
+export interface AlignContentProps {
+    alignContent?: ResponsiveAlignContentValue;
+}
+
+export function alignContent(...args: any[]): any;
+
+export type JustifyContentValue =
+    | "center"
+    | "start"
+    | "end"
+    | "flex-start"
+    | "flex-end"
+    | "left"
+    | "right"
+    | "baseline"
+    | "first baseline"
+    | "last baseline"
+    | "space-between"
+    | "space-around"
+    | "space-evenly"
+    | "stretch"
+    | "safe center"
+    | "unsafe center";
+export type ResponsiveJustifyContentValue = ResponsiveValue<
+    JustifyContentValue
+>;
+
+export interface JustifyContentProps {
+    justifyContent?: ResponsiveJustifyContentValue;
+}
+
+export function justifyContent(...args: any[]): any;
+
+export type FlexWrapValue = true | "nowrap" | "wrap" | "wrap-reverse";
+export type ResponsiveFlexWrapValue = ResponsiveValue<FlexWrapValue>;
+
+export interface FlexWrapProps {
+    flexWrap?: ResponsiveFlexWrapValue;
+}
+
+export function flexWrap(...args: any[]): any;
+
+export type FlexBasisValue =
+    | GlobalStyleValues
+    | "auto"
+    | "fill"
+    | "max-content"
+    | "min-content"
+    | "fit-content"
+    | "content";
+export type ResponsiveFlexBasisValue = ResponsiveValue<FlexBasisValue>;
+
+export interface FlexBasisProps {
+    // TODO: The FlexBasisValue currently really only exists for documentation
+    //       purposes, because flex-basis also accepts `Nem` and `Npx` strings.
+    //       Not sure there’s a way to still have the union values show up as
+    //       auto-completion results.
+    flexBasis?: ResponsiveFlexBasisValue | string;
+}
+
+export function flexBasis(...args: any[]): any;
+
+export type FlexDirectionValue =
+    | GlobalStyleValues
+    | "row"
+    | "row-reverse"
+    | "column"
+    | "column-reverse";
+
+export type ResponsiveFlexDirectionValue = ResponsiveValue<FlexDirectionValue>;
+
+export interface FlexDirectionProps {
+    flexDirection?: ResponsiveFlexDirectionValue;
+}
+
+export function flexDirection(...args: any[]): any;
+
+export type FlexValue = number | string;
+export type ResponsiveFlexValue = ResponsiveValue<FlexValue>;
+
+export interface FlexProps {
+    flex?: ResponsiveFlexValue;
+}
+
+export function flex(...args: any[]): any;
+
+export type JustifySelfValue =
+    | GlobalStyleValues
+    | "auto"
+    | "normal"
+    | "stretch"
+    | "center"
+    | "start"
+    | "end"
+    | "flex-start"
+    | "flex-end"
+    | "self-start"
+    | "self-end"
+    | "left"
+    | "right"
+    | "baseline"
+    | "first baseline"
+    | "last baseline"
+    | "safe center"
+    | "unsafe center";
+
+export type ResponsiveJustifySelfValue = ResponsiveValue<JustifySelfValue>;
+
+export interface JustifySelfProps {
+    justifySelf?: ResponsiveJustifySelfValue;
+}
+
+export function justifySelf(...args: any[]): any;
+
+export type AlignSelfValue =
+    | "auto"
+    | "normal"
+    | "center"
+    | "start"
+    | "end"
+    | "self-start"
+    | "self-end"
+    | "flex-start"
+    | "flex-end"
+    | "left"
+    | "right"
+    | "baseline"
+    | "first baseline"
+    | "last baseline"
+    | "stretch"
+    | "safe center"
+    | "unsafe center";
+export type ResponsiveAlignSelfValue = ResponsiveValue<AlignSelfValue>;
+
+export interface AlignSelfProps {
+    alignSelf?: ResponsiveAlignSelfValue;
+}
+
+export function alignSelf(...args: any[]): any;
+
+export type OrderValue = GlobalStyleValues | number;
+export type ResponsiveOrderValue = ResponsiveValue<OrderValue>;
+
+export interface OrderProps {
+    order?: ResponsiveOrderValue;
+}
+
+export function order(...args: any[]): any;
+
+/**
+ * Grid Layout
+ */
+
+export type GridGapValue = number | string;
+export type ResponsiveGridGapValue = ResponsiveValue<GridGapValue>;
+
+export interface GridGapProps {
+    gridGap?: ResponsiveGridGapValue;
+}
+
+export function gridGap(...args: any[]): any;
+
+export interface GridColumnGapProps {
+    gridColumnGap?: ResponsiveGridGapValue;
+}
+
+export function gridColumnGap(...args: any[]): any;
+
+export interface GridRowGapProps {
+    gridRowGap?: ResponsiveGridGapValue;
+}
+
+export function gridRowGap(...args: any[]): any;
+
+export type GridCellValue = string;
+export type ResponsiveGridCellValue = ResponsiveValue<GridCellValue>;
+
+export interface GridColumnProps {
+    gridColumn?: ResponsiveGridCellValue;
+}
+
+export function gridColumn(...args: any[]): any;
+
+export interface GridRowProps {
+    gridRow?: ResponsiveGridCellValue;
+}
+
+export function gridRow(...args: any[]): any;
+
+export type GridAutoValue = string;
+export type ResponsiveGridAutoValue = ResponsiveValue<GridAutoValue>;
+
+export interface GridAutoFlowProps {
+    gridAutoFlow?: ResponsiveGridAutoValue;
+}
+
+export function gridAutoFlow(...args: any[]): any;
+
+export interface GridAutoColumnsProps {
+    gridAutoColumns?: ResponsiveGridAutoValue;
+}
+
+export function gridAutoColumns(...args: any[]): any;
+
+export interface GridAutoRowsProps {
+    gridAutoRows?: ResponsiveGridAutoValue;
+}
+
+export function gridAutoRows(...args: any[]): any;
+
+export type GridTemplateValue = string;
+export type ResponsiveGridTemplateValue = ResponsiveValue<GridTemplateValue>;
+
+export interface GridTemplatesColumnsProps {
+    gridTemplateColumns?: ResponsiveGridTemplateValue;
+}
+
+export function gridTemplateColumns(...args: any[]): any;
+
+export interface GridTemplatesRowsProps {
+    gridTemplateRows?: ResponsiveGridTemplateValue;
+}
+
+export function gridTemplateRows(...args: any[]): any;
+
+/**
+ * Borders
+ */
+
+export type BorderValue = string | number;
+export type ResponsiveBorderValue = ResponsiveValue<BorderValue>;
+
+export interface BorderProps {
+    border?: ResponsiveBorderValue;
+}
+
+export function border(...args: any[]): any;
+
+export interface BorderTopProps {
+    borderTop?: ResponsiveBorderValue;
+}
+
+export function borderTop(...args: any[]): any;
+
+export interface BorderRightProps {
+    borderRight?: ResponsiveBorderValue;
+}
+
+export function borderRight(...args: any[]): any;
+
+export interface BorderBottomProps {
+    borderBottom?: ResponsiveBorderValue;
+}
+
+export function borderBottom(...args: any[]): any;
+
+export interface BorderLeftProps {
+    borderLeft?: ResponsiveBorderValue;
+}
+
+export function borderLeft(...args: any[]): any;
+
+export interface BordersProps extends BorderTopProps, BorderRightProps, BorderBottomProps, BorderLeftProps {}
+
+export function borders(...args: any[]): any;
+
+export type BorderColorValue = string;
+export type ResponsiveBorderColorValue = ResponsiveValue<BorderColorValue>;
+
+export interface BorderColorProps {
+    borderColor?: ResponsiveBorderColorValue;
+}
+
+export function borderColor(...args: any[]): any;
+
+export type BorderRadiusValue = string | number;
+export type ResponsiveBorderRadiusValue = ResponsiveValue<BorderRadiusValue>;
+
+export interface BorderRadiusProps {
+    borderRadius?: ResponsiveBorderRadiusValue;
+}
+
+export function borderRadius(...args: any[]): any;
+
+export type BoxShadowValue = string | number;
+export type ResponsiveBoxShadowValue = ResponsiveValue<BoxShadowValue>;
+
+export interface BoxShadowProps {
+    boxShadow?: ResponsiveBoxShadowValue;
+}
+
+export function boxShadow(...arg: any[]): any;
+
+export type OpacityValue = string | number;
+export type ResponsiveOpacityValue = ResponsiveValue<OpacityValue>;
+
+export interface OpacityProps {
+    opacity?: ResponsiveOpacityValue;
+}
+
+export function opacity(...arg: any[]): any;
+
+/**
+ * Background
+ */
+
+export type BackgroundValue = string;
+export type ResponsiveBackgroundValue = ResponsiveValue<BackgroundValue>;
+
+export interface BackgroundProps {
+    background?: ResponsiveBackgroundValue;
+}
+
+export function background(...args: any[]): any;
+
+export type BackgroundImageValue = string;
+export type ResponsiveBackgroundImageValue = ResponsiveValue<BackgroundImageValue>;
+
+export interface BackgroundImageProps {
+    backgroundImage?: ResponsiveBackgroundImageValue;
+}
+
+export function backgroundImage(...args: any[]): any;
+
+export type BackgroundSizeValue = string;
+export type ResponsiveBackgroundSizeValue = ResponsiveValue<BackgroundSizeValue>;
+
+export interface BackgroundSizeProps {
+    backgroundSize?: ResponsiveBackgroundSizeValue;
+}
+
+export function backgroundSize(...args: any[]): any;
+
+export type BackgroundPositionValue = string;
+export type ResponsiveBackgroundPositionValue = ResponsiveValue<BackgroundPositionValue>;
+
+export interface BackgroundPositionProps {
+    backgroundPosition?: ResponsiveBackgroundPositionValue;
+}
+
+export function backgroundPosition(...args: any[]): any;
+
+export type BackgroundRepeatValue = string;
+export type ResponsiveBackgroundRepeatValue = ResponsiveValue<BackgroundRepeatValue>;
+
+export interface BackgroundRepeatProps {
+    backgroundRepeat?: ResponsiveBackgroundRepeatValue;
+}
+
+export function backgroundRepeat(...args: any[]): any;
+
+/**
+ * Position
+ */
+
+export type PositionValue =
+    | "static"
+    | "relative"
+    | "absolute"
+    | "sticky"
+    | "fixed";
+export type ResponsivePositionValue = ResponsiveValue<PositionValue>;
+
+export interface PositionProps {
+    position?: ResponsivePositionValue;
+}
+
+export function position(...args: any[]): any;
+
+export type ZIndexValue = GlobalStyleValues | "auto" | number;
+export type ResponsiveZIndexValue = ResponsiveValue<ZIndexValue>;
+
+export interface ZIndexProps {
+    zIndex?: ZIndexValue;
+}
+
+export function zIndex(...args: any[]): any;
+
+export type TopValue = string | number;
+export type ResponsiveTopValue = ResponsiveValue<TopValue>;
+
+export interface TopProps {
+    top?: ResponsiveTopValue;
+}
+
+export function top(...args: any[]): any;
+
+export type RightValue = string | number;
+export type ResponsiveRightValue = ResponsiveValue<RightValue>;
+
+export interface RightProps {
+    right?: ResponsiveRightValue;
+}
+
+export function right(...args: any[]): any;
+
+export type BottomValue = string | number;
+export type ResponsiveBottomValue = ResponsiveValue<BottomValue>;
+
+export interface BottomProps {
+    bottom?: ResponsiveBottomValue;
+}
+
+export function bottom(...args: any[]): any;
+
+export type LeftValue = string | number;
+export type ResponsiveLeftValue = ResponsiveValue<LeftValue>;
+
+export interface LeftProps {
+    left?: ResponsiveLeftValue;
+}
+
+export function left(...args: any[]): any;
+
+export type Variant = string;
+export type ResponsiveVariant = ResponsiveValue<Variant>;
+
+export interface TextStyleProps {
+    textStyle?: ResponsiveVariant;
+}
+
+export function textStyle(...args: any[]): any;
+
+export interface ColorStyleProps {
+    colors?: ResponsiveVariant;
+}
+
+export function colorStyle(...args: any[]): any;
+
+export interface ButtonStyleProps {
+    variant?: ResponsiveVariant;
+}
+
+export function buttonStyle(...args: any[]): any;
diff --git a/types/styled-system/dist/util.d.ts b/types/styled-system/dist/util.d.ts
new file mode 100644
index 0000000000..ae90de60f8
--- /dev/null
+++ b/types/styled-system/dist/util.d.ts
@@ -0,0 +1,26 @@
+export const defaultBreakpoints: string[];
+export function is(n: any): boolean;
+export function num(n: any): boolean;
+export function px(n: any): string;
+
+export function get(obj: any, ...paths: Array<string|number>): any;
+
+export function themeGet(keys: string, fallback?: string): any;
+export function cloneFunc(fn: (...args: any[]) => any): (...args: any[]) => any;
+
+export function merge(a: any, b: any): any;
+
+export function compose(...funcs: ((...args: any[]) => any)[]): (...args: any[]) => any;
+
+export function createMediaQuery(n: string): string;
+
+export interface LowLevelStylefunctionArguments {
+    prop: string;
+    cssProperty?: string;
+    key?: string;
+    getter?: () => any;
+    transformValue?: (n: string|number) => any;
+    scale?: Array<string|number>;
+}
+
+export function style(args: LowLevelStylefunctionArguments): any;
diff --git a/types/styled-system/dist/variant.d.ts b/types/styled-system/dist/variant.d.ts
new file mode 100644
index 0000000000..8a3f8b15ec
--- /dev/null
+++ b/types/styled-system/dist/variant.d.ts
@@ -0,0 +1,7 @@
+export interface VariantArgs {
+    key?: string;
+    // Defaults to "variant"
+    prop?: string;
+}
+
+export function variant(props: VariantArgs): (...args: any[]) => any;
diff --git a/types/styled-system/index.d.ts b/types/styled-system/index.d.ts
new file mode 100644
index 0000000000..d9c386242c
--- /dev/null
+++ b/types/styled-system/index.d.ts
@@ -0,0 +1,25 @@
+// Type definitions for styled-system 3.0
+// Project: https://github.com/jxnblk/styled-system#readme
+// Definitions by: Marshall Bowers <https://github.com/maxdeviant>
+//                 Ben McCormick <https://github.com/phobon>
+//                 Justin Bennett <https://github.com/zephraph>
+//                 Christopher Pappas <https://github.com/damassi>
+//                 Eloy Durán <https://github.com/alloy>
+//                 Matthieu Vachon <https://github.com/maoueh>
+//                 Adam Lavin <https://github.com/lavoaster>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as util from './dist/util';
+
+export { util };
+export {
+    style,
+    themeGet,
+    merge,
+    compose,
+} from './dist/util';
+
+export * from './dist/styles';
+export * from './dist/variant';
+export * from './dist/mixed';
diff --git a/types/styled-system/styled-system-tests.tsx b/types/styled-system/styled-system-tests.tsx
new file mode 100644
index 0000000000..c0f9ba9ded
--- /dev/null
+++ b/types/styled-system/styled-system-tests.tsx
@@ -0,0 +1,455 @@
+import * as React from "react";
+import {
+    themeGet,
+    space,
+    width,
+    fontSize,
+    color,
+    fontFamily,
+    display,
+    SpaceProps,
+    WidthProps,
+    ColorProps,
+    DisplayProps,
+    FontSizeProps,
+    FontFamilyProps,
+    textAlign,
+    TextAlignProps,
+    background,
+    BackgroundProps,
+    maxWidth,
+    MaxWidthProps,
+    lineHeight,
+    LineHeightProps,
+    FontWeightProps,
+    fontWeight,
+    letterSpacing,
+    LetterSpacingProps,
+    minWidth,
+    MinWidthProps,
+    HeightProps,
+    height,
+    MaxHeightProps,
+    maxHeight,
+    minHeight,
+    MinHeightProps,
+    size,
+    SizeProps,
+    RatioProps,
+    ratio,
+    alignItems,
+    AlignItemsProps,
+    AlignContentProps,
+    alignContent,
+    justifyContent,
+    JustifyContentProps,
+    FlexWrapProps,
+    flexWrap,
+    flexBasis,
+    FlexBasisProps,
+    borderColor,
+    BorderColorProps,
+    flexDirection,
+    FlexDirectionProps,
+    flex,
+    FlexProps,
+    justifySelf,
+    JustifySelfProps,
+    alignSelf,
+    AlignSelfProps,
+    borders,
+    BordersProps,
+    borderRadius,
+    BorderRadiusProps,
+    position,
+    PositionProps,
+    zIndex,
+    ZIndexProps,
+    top,
+    bottom,
+    left,
+    right,
+    TopProps,
+    BottomProps,
+    LeftProps,
+    RightProps,
+    boxShadow,
+    BoxShadowProps,
+    backgroundImage,
+    backgroundPosition,
+    backgroundRepeat,
+    backgroundSize,
+    BackgroundImageProps,
+    BackgroundPositionProps,
+    BackgroundRepeatProps,
+    BackgroundSizeProps,
+    GridGapProps,
+    GridRowGapProps,
+    GridColumnGapProps,
+    GridRowProps,
+    GridColumnProps,
+    gridGap,
+    gridRowGap,
+    gridColumnGap,
+    gridRow,
+    gridColumn,
+    GridAutoFlowProps,
+    GridAutoColumnsProps,
+    GridAutoRowsProps,
+    GridTemplatesRowsProps,
+    GridTemplatesColumnsProps,
+    gridAutoFlow,
+    gridAutoRows,
+    gridAutoColumns,
+    gridTemplateColumns,
+    gridTemplateRows,
+    bgColor,
+    BgColorProps,
+    border,
+    borderBottom,
+    borderLeft,
+    borderRight,
+    borderTop,
+    BorderProps,
+    textStyle,
+    colorStyle,
+    buttonStyle,
+    variant,
+    mixed,
+    ColorStyleProps,
+    TextStyleProps,
+    VariantArgs,
+    ButtonStyleProps,
+    MixedProps,
+} from "styled-system";
+
+// tslint:disable-next-line:strict-export-declare-modifiers
+declare const styled: (...props: any[]) => React.ComponentType;
+
+const boxStyle = variant({
+    prop: 'boxStyle',
+    key: 'box',
+});
+
+interface BoxProps
+    extends SpaceProps,
+        WidthProps,
+        FontSizeProps,
+        ColorProps,
+        DisplayProps,
+        BackgroundProps,
+        BgColorProps,
+        MaxWidthProps,
+        MinWidthProps,
+        HeightProps,
+        MaxHeightProps,
+        MinHeightProps,
+        SizeProps,
+        RatioProps,
+        BorderColorProps,
+        FlexProps,
+        JustifySelfProps,
+        AlignSelfProps,
+        BorderProps,
+        BordersProps,
+        BorderRadiusProps,
+        PositionProps,
+        ZIndexProps,
+        TopProps,
+        BottomProps,
+        LeftProps,
+        RightProps,
+        BoxShadowProps,
+        BackgroundImageProps,
+        BackgroundPositionProps,
+        BackgroundRepeatProps,
+        BackgroundSizeProps,
+        ColorStyleProps,
+        TextStyleProps,
+        MixedProps {
+            boxStyle?: string;
+        }
+const Box: React.ComponentType<BoxProps> = styled`
+  border-radius: ${themeGet("radii.small", "4px")};
+  ${space}
+  ${width}
+  ${fontSize}
+  ${color}
+  ${display}
+  ${background}
+  ${maxWidth}
+  ${minWidth}
+  ${height}
+  ${maxHeight}
+  ${minHeight}
+  ${size}
+  ${ratio}
+  ${borderColor}
+  ${flex}
+  ${justifySelf}
+  ${alignSelf}
+  ${border}
+  ${borders}
+  ${borderTop}
+  ${borderRight}
+  ${borderBottom}
+  ${borderLeft}
+  ${borderRadius}
+  ${position}
+  ${zIndex}
+  ${top}
+  ${bottom}
+  ${left}
+  ${right}
+  ${boxShadow}
+  ${backgroundImage}
+  ${backgroundPosition}
+  ${backgroundRepeat}
+  ${backgroundSize}
+  ${alignContent}
+  ${alignItems}
+  ${bgColor}
+  ${backgroundImage}
+  ${textStyle}
+  ${colorStyle}
+  ${mixed}
+`;
+
+Box.defaultProps = {
+    boxStyle: 'normal',
+};
+
+interface TextProps
+    extends FontSizeProps,
+        FontFamilyProps,
+        TextAlignProps,
+        LineHeightProps,
+        FontWeightProps,
+        LetterSpacingProps {}
+const Text: React.ComponentType<TextProps> = styled`
+    ${fontSize};
+    ${fontFamily};
+    ${textAlign};
+    ${lineHeight};
+    ${fontWeight};
+    ${letterSpacing};
+`;
+
+interface FlexComponentProps
+    extends AlignItemsProps,
+        AlignContentProps,
+        JustifyContentProps,
+        FlexWrapProps,
+        FlexBasisProps,
+        FlexDirectionProps {}
+const Flex: React.ComponentType<FlexComponentProps> = styled`
+    ${alignItems};
+    ${alignContent};
+    ${justifyContent};
+    ${flexWrap};
+    ${flexBasis};
+    ${flexDirection};
+`;
+
+interface GridComponentProps
+    extends GridGapProps,
+        GridRowGapProps,
+        GridColumnGapProps,
+        GridRowProps,
+        GridColumnProps,
+        GridAutoFlowProps,
+        GridAutoColumnsProps,
+        GridAutoRowsProps,
+        GridTemplatesRowsProps,
+        GridTemplatesColumnsProps {}
+const Grid: React.ComponentType<GridComponentProps> = styled`
+    ${gridGap};
+    ${gridRowGap};
+    ${gridColumnGap};
+    ${gridRow};
+    ${gridColumn};
+    ${gridAutoFlow};
+    ${gridAutoRows};
+    ${gridAutoColumns};
+    ${gridTemplateRows};
+    ${gridTemplateColumns};
+`;
+
+interface ButtonProps
+    extends SpaceProps,
+        ButtonStyleProps {}
+
+const TestButton: React.ComponentType<ButtonProps> = styled`
+    ${buttonStyle}
+    ${space}
+`;
+
+const test = () => (
+    <div>
+        // width: 50%
+        <Box width={1 / 2} />
+        // font-size: 20px (theme.fontSizes[4])
+        <Box fontSize={4} />
+        // margin: 16px (theme.space[2])
+        <Box m={2} />
+        // padding: 32px (theme.space[3])
+        <Box p={3} />
+        // color
+        <Box color="tomato" />
+        // color: #333 (theme.colors.gray[0])
+        <Box color="grays.0" />
+        // background color
+        <Box bg="tomato" />
+        // responsive width
+        <Box width={[1, 1 / 2, 1 / 4]} />
+        // responsive font-size
+        <Box fontSize={[2, 3, 4]} />
+        // responsive margin
+        <Box m={[1, 2, 3]} />
+        // responsive padding
+        <Box p={[1, 2, 3]} />
+        // examples (margin prop) // sets margin value of `theme.space[2]`
+        <Box m={2} />
+        // sets margin value of `-1 * theme.space[2]`
+        <Box m={-2} />
+        // sets a margin value of `16px` since it's greater than
+        `theme.space.length`
+        <Box m={16} />
+        // sets margin `'auto'`
+        <Box m="auto" />
+        // sets margin `8px` on all viewports and `16px` from the smallest
+        breakpoint and up
+        <Box m={[1, 2]} />
+        // examples // width `50%`
+        <Box width={1 / 2} />
+        // width `256px`
+        <Box width={256} />
+        // width `'2em'`
+        <Box width="2em" />
+        // width `100%` on all viewports and `50%` from the smallest breakpoint
+        and up
+        <Box width={[1, 1 / 2]} />
+        // examples // font-size of `theme.fontSizes[3]`
+        <Text fontSize={3} />
+        // font-size `32px`
+        <Text fontSize={32} />
+        // font-size `'2em'`
+        <Text fontSize="2em" />
+        // font-size `10px` on all viewports and `12px` from the smallest
+        breakpoint and up
+        <Text fontSize={[10, 12]} />
+        // examples // picks the value defined in `theme.colors['blue']`
+        <Box color="blue" />
+        // picks up a nested color value using dot notation //
+        `theme.colors['gray'][0]`
+        <Box color="gray.0" />
+        // raw CSS color value
+        <Box color="#f00" />
+        // fontFamily
+        <Text fontFamily="mono" />
+        // textAlign (responsive)
+        <Text textAlign="center" />
+        <Text textAlign={["center", "left"]} />
+        // lineHeight
+        <Text lineHeight="1.25" />
+        // fontWeight
+        <Text fontWeight="bold" />
+        // letterSpacing
+        <Text letterSpacing="0.1em" />
+        // display (responsive)
+        <Box display="inline-block" />
+        <Box display={["block", "inline-block"]} />
+        // maxWidth (responsive)
+        <Box maxWidth={1024} />
+        <Box maxWidth={[768, null, null, 1024]} />
+        // minWidth (responsive)
+        <Box minWidth={128} />
+        <Box minWidth={[96, 128]} />
+        // height (responsive)
+        <Box height={64} />
+        <Box height={[48, 64]} />
+        // maxHeight (responsive)
+        <Box maxHeight={512} />
+        <Box maxHeight={[384, 512]} />
+        // minHeight (responsive)
+        <Box minHeight={512} />
+        <Box minHeight={[384, 512]} />
+        // size (responsive, width & height)
+        <Box size={32} />
+        <Box size={[32, 48]} />
+        // ratio (height: 0 & paddingBottom)
+        <Box ratio={3 / 4} />
+        // alignItems (responsive)
+        <Flex alignItems="center" />
+        // alignContent (responsive)
+        <Flex alignContent="center" />
+        // justifyContent (responsive)
+        <Flex justifyContent="center" />
+        // flexWrap (responsive)
+        <Flex flexWrap="wrap" />
+        // flexBasis (responsive)
+        <Flex flexBasis="auto" />
+        // flexDirection (responsive)
+        <Flex flexDirection="column" />
+        // gridGap
+        <Grid gridGap="1px" />
+        <Grid gridGap={["1", "2"]} />
+        // gridRowGap
+        <Grid gridRowGap="1px" />
+        <Grid gridRowGap={["1", "2"]} />
+        // gridColumnGap
+        <Grid gridColumnGap="1px" />
+        <Grid gridColumnGap={["1", "2"]} />
+        // gridRow
+        <Grid gridRow="auto" />
+        // gridColumn
+        <Grid gridColumn="auto" />
+        // gridAutoFlow
+        <Grid gridAutoFlow="auto" />
+        <Grid gridAutoFlow={["auto", "1fr"]} />
+        // gridAutoRows
+        <Grid gridAutoRows="auto" />
+        <Grid gridAutoRows={["auto", "1fr"]} />
+        // gridAutoColumns
+        <Grid gridAutoColumns="auto" />
+        <Grid gridAutoColumns={["auto", "1fr"]} />
+        // gridTemplateRows
+        <Grid gridTemplateRows="auto" />
+        <Grid gridTemplateRows={["auto", "1fr"]} />
+        // gridTemplateColumns
+        <Grid gridTemplateColumns="auto" />
+        <Grid gridTemplateColumns={["auto", "1fr"]} />
+        // flex (responsive)
+        <Box flex="1 1 auto" />
+        // justifySelf (responsive)
+        <Box justifySelf="center" />
+        // alignSelf (responsive)
+        <Box alignSelf="center" />
+        <Box border="1px solid" />
+        <Box borderTop="1px solid" />
+        <Box borderRight="1px solid" />
+        <Box borderBottom="1px solid" />
+        <Box borderLeft="1px solid" />
+        // borderColor
+        <Box borderColor="blue" />
+        // borderRadius
+        <Box borderRadius={4} />
+        // position (responsive)
+        <Box position="absolute" />
+        // zIndex
+        <Box zIndex={2} />
+        // top, right, bottom, left (responsive)
+        <Box top="0" right="0" bottom="0" left="0" />
+        // boxShadow
+        <Box boxShadow={1} />
+        // backgroundImage, backgroundSize, backgroundPosition, backgroundRepeat
+        <Box
+            backgroundImage="kitten.png"
+            backgroundSize="cover"
+            backgroundPosition="center"
+            backgroundRepeat="repeat-x"
+        />
+
+        <TestButton variant="primary" m={2} />
+    </div>
+);
diff --git a/types/styled-system/tsconfig.json b/types/styled-system/tsconfig.json
new file mode 100644
index 0000000000..2cc754217f
--- /dev/null
+++ b/types/styled-system/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "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", "styled-system-tests.tsx"]
+}
diff --git a/types/styled-system/tslint.json b/types/styled-system/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/styled-system/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/stylelint/index.d.ts b/types/stylelint/index.d.ts
index 1606d1805c..2068aff709 100644
--- a/types/stylelint/index.d.ts
+++ b/types/stylelint/index.d.ts
@@ -1,11 +1,11 @@
-// Type definitions for stylelint 7.11
+// Type definitions for stylelint 9.4
 // Project: https://github.com/stylelint/stylelint
 // Definitions by: Alan Agius <https://github.com/alan-agius4>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export type FormatterType = "json" | "string" | "verbose";
+export type FormatterType = "json" | "string" | "verbose" | "compact";
 
-export type SyntaxType = "scss" | "less" | "sugarss";
+export type SyntaxType = "scss" | "sass" | "less" | "sugarss";
 
 export interface LinterOptions {
     code?: string;
@@ -45,6 +45,7 @@ export interface LintResult {
 export namespace formatters {
     function json(results: LintResult[]): string;
     function string(results: LintResult[]): string;
+    function compact(results: LintResult[]): string;
     function verbose(results: LintResult[]): string;
 }
 
diff --git a/types/stylelint/tslint.json b/types/stylelint/tslint.json
index a41bf5d19a..f93cf8562a 100644
--- a/types/stylelint/tslint.json
+++ b/types/stylelint/tslint.json
@@ -1,79 +1,3 @@
 {
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
-    }
+    "extends": "dtslint/dt.json"
 }
diff --git a/types/stylelint/v7/index.d.ts b/types/stylelint/v7/index.d.ts
new file mode 100644
index 0000000000..67316843a9
--- /dev/null
+++ b/types/stylelint/v7/index.d.ts
@@ -0,0 +1,51 @@
+// 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
+
+export type FormatterType = "json" | "string" | "verbose";
+
+export type SyntaxType = "scss" | "sass" | "less" | "sugarss";
+
+export interface LinterOptions {
+    code?: string;
+    codeFilename?: string;
+    config?: JSON;
+    configBasedir?: string;
+    configFile?: string;
+    configOverrides?: JSON;
+    cache?: boolean;
+    cacheLocation?: string;
+    files?: string | string[];
+    fix?: boolean;
+    formatter?: FormatterType;
+    ignoreDisables?: boolean;
+    reportNeedlessDisables?: boolean;
+    ignorePath?: boolean;
+    syntax?: SyntaxType;
+    customSyntax?: string;
+}
+
+export interface LinterResult {
+    errored: boolean;
+    output: string;
+    postcssResults: any[];
+    results: LintResult[];
+}
+
+export interface LintResult {
+    source: string;
+    errored: boolean | undefined;
+    ignored: boolean | undefined;
+    warnings: string[];
+    deprecations: string[];
+    invalidOptionWarnings: any[];
+}
+
+export namespace formatters {
+    function json(results: LintResult[]): string;
+    function string(results: LintResult[]): string;
+    function verbose(results: LintResult[]): string;
+}
+
+export function lint(options?: LinterOptions): Promise<LinterResult>;
diff --git a/types/stylelint/v7/stylelint-tests.ts b/types/stylelint/v7/stylelint-tests.ts
new file mode 100644
index 0000000000..785eb2e425
--- /dev/null
+++ b/types/stylelint/v7/stylelint-tests.ts
@@ -0,0 +1,24 @@
+import { LinterOptions, FormatterType, SyntaxType, lint, LintResult, LinterResult } from "stylelint";
+
+const options: LinterOptions = {
+    code: "div { color: red }",
+    files: ["**/**.scss"],
+    formatter: "json",
+    cache: true,
+    cacheLocation: "./stylelint.cache.json",
+    ignoreDisables: true,
+    reportNeedlessDisables: true,
+    ignorePath: true,
+    syntax: "scss"
+};
+
+lint(options).then((x: LinterResult) => {
+    const err: boolean = x.errored;
+    const output: string = x.output;
+    const postcssResults: any[] = x.postcssResults;
+    const results: LintResult[] = x.results;
+});
+
+const formatter: FormatterType = "json";
+
+const syntax: SyntaxType = "scss";
diff --git a/types/stylelint/v7/tsconfig.json b/types/stylelint/v7/tsconfig.json
new file mode 100644
index 0000000000..b6f6796252
--- /dev/null
+++ b/types/stylelint/v7/tsconfig.json
@@ -0,0 +1,29 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "stylelint": [
+                "stylelint/v7"
+            ]
+        },
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "stylelint-tests.ts"
+    ]
+}
diff --git a/types/stylelint/v7/tslint.json b/types/stylelint/v7/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/stylelint/v7/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/summernote/index.d.ts b/types/summernote/index.d.ts
new file mode 100644
index 0000000000..4d2307da70
--- /dev/null
+++ b/types/summernote/index.d.ts
@@ -0,0 +1,240 @@
+// Type definitions for Summernote 0.8
+// Project: https://github.com/summernote/summernote#readme
+// Definitions by: Wouter Staelens <https://github.com/wstaelens>
+//                 Denny Harijanto <https://github.com/nusantara-cloud>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+/// <reference types="jquery"/>
+
+declare global {
+	namespace Summernote {
+		interface Options {
+			airMode?: boolean;
+			callbacks?: any; // todo
+			codemirror?: CodemirrorOptions;
+			colors?: colorsDef;
+			dialogsInBody?: boolean;
+			dialogsFade?: boolean;
+			direction?: string;
+			disableDragAndDrop?: boolean;
+			focus?: boolean;
+			fontNames?: string[];
+			fontNamesIgnoreCheck?: string[];
+			height?: number;
+			hint?: HintOptions;
+			icons?: IconsOptions;
+			insertTableMaxSize?: InsertTableMaxSizeOptions;
+			keyMap?: KeyMapOptions;
+			lang?: string;
+			lineHeights?: string[];
+			minHeight?: number;
+			maxHeight?: number;
+			maximumImageFileSize?: any;
+			modules?: ModuleOptions;
+			popover?: PopoverOptions;
+			placeholder?: string;
+			shortcuts?: boolean;
+			styleTags?: styleTagsOptions[];
+			styleWithSpan?: boolean;
+			tabsize?: number;
+			tableClassName?: string;
+			textareaAutoSync?: boolean;
+			toolbar?: toolbarDef;
+			width?: number;
+		}
+
+		type toolbarStyleGroupOptions = 'style' | 'bold' | 'italic' | 'underline' | 'clear';
+		type toolbarFontGroupOptions = 'strikethrough' | 'superscript' | 'subscript';
+		type toolbarFontsizeGroupOptions = 'fontsize';
+		type toolbarColorGroupOptions = 'color';
+		type toolbarParaGroupOptions = 'ul' | 'ol' | 'paragraph';
+		type toolbarHeightGroupOptions = 'height';
+		type toolbarTableGroupOptions = 'table';
+		type toolbarInsertGroupOptions = 'link' | 'picture' | 'hr';
+		type toolbarViewGroupOptions = 'fullscreen' | 'codeview';
+		type toolbarHelpGroupOptions = 'help';
+		// type toolbarDef = [string, string[]][]
+		type toolbarDef = [
+			['style', toolbarStyleGroupOptions[]]
+			| ['font', toolbarFontGroupOptions[]]
+			| ['fontsize', toolbarFontsizeGroupOptions[]]
+			| ['color', toolbarColorGroupOptions[]]
+			| ['para', toolbarParaGroupOptions[]]
+			| ['height', toolbarHeightGroupOptions[]]
+			| ['table', toolbarTableGroupOptions[]]
+			| ['insert', toolbarInsertGroupOptions[]]
+			| ['view', toolbarViewGroupOptions[]]
+			| ['help', toolbarHelpGroupOptions[]]
+		];
+
+		type colorsDef = Array<[string[]]>;
+		type styleTagsOptions = 'p' | 'blockquote' | 'pre' | 'h1' | 'h2' | 'h3' | 'h4' | 'h5' | 'h6';
+
+		interface InsertTableMaxSizeOptions {
+			col: number;
+			row: number;
+		}
+
+		interface IconsOptions {
+			options?: any; // todo
+		}
+
+		interface KeyMapOptions {
+			pc?: KeyMapPcOptions;
+			mac?: KeyMapMacOptions;
+		}
+
+		interface KeyMapPcOptions {
+			options?: any; // todo
+		}
+
+		interface KeyMapMacOptions {
+			options?: any; // todo
+		}
+
+		type htmlElement = string;
+
+		interface HintOptions {
+			words?: string[];
+			mentions?: string[];
+			match: RegExp;
+			search: (keyword: string, callback: (plausibleItems: string[]) => void) => void;
+			template?: (item: string) => htmlElement;
+			content?: (item: string) => htmlElement | JQuery.Node;
+		}
+
+		interface CodemirrorOptions {
+			mode?: string;
+			htmlNode?: boolean;
+			lineNumbers?: boolean;
+			theme?: string;
+		}
+
+		type popoverImageOptionsImagesize = 'imageSize100' | 'imageSize50' | 'imageSize25';
+		type popoverImageOptionsFloat = 'floatLeft' | 'floatRight' | 'floatNone';
+		type popoverImageOptionsRemove = 'removeMedia';
+		type popoverImageDef = [
+			['imagesize', popoverImageOptionsImagesize[]],
+			['float', popoverImageOptionsFloat[]],
+			['remove', popoverImageOptionsRemove[]]
+		];
+
+		type popoverLinkLinkOptions = 'linkDialogShow' | 'unlink';
+		type popoverLinkDef = [
+			['link', popoverLinkLinkOptions[]]
+		];
+
+		type popoverAirOptionsColor = 'color';
+		type popoverAirOptionsFont = 'bold' | 'underline' | 'clear';
+		type popoverAirOptionsPara = 'ul' | 'paragraph';
+		type popoverAirOptionsTable = 'table';
+		type popoverAirOptionsInsert = 'link' | 'picture';
+		type popoverAirDef = [
+			['color', popoverAirOptionsColor],
+			['font', popoverAirOptionsFont],
+			['para', popoverAirOptionsPara],
+			['table', popoverAirOptionsTable],
+			['insert', popoverAirOptionsInsert]
+		];
+
+		interface PopoverOptions {
+			image?: popoverImageDef;
+			link?: popoverLinkDef;
+			air?: popoverAirDef;
+		}
+
+		interface ModuleOptions {
+			options?: any; // todo
+		}
+
+		interface CreateLinkOptions {
+			text: string;
+			url: string;
+			newWindow: boolean;
+		}
+
+		type EditImageCallback = ($image: JQuery.Node) => void;
+	}
+
+	interface JQuery {
+		summernote(): JQuery;
+		summernote(command: string): JQuery;
+		summernote(options?: Summernote.Options): JQuery;
+		summernote(command: string, markupString: string): JQuery;
+		summernote(command: string, value: number): JQuery;
+		summernote(command: string, node: JQuery.Node): JQuery;
+		summernote(command: string, url: string, filename?: (string | Summernote.EditImageCallback)): JQuery;
+
+		summernote(command: 'destroy'): JQuery;
+		summernote(command: 'code', markupStr?: string): JQuery;
+		summernote(command: 'editor.pasteHTML' | 'pasteHTML', markup: string): JQuery;
+
+		// Basic API
+		summernote(command: 'editor.createRange' | 'createRange'): JQuery;
+		summernote(command: 'editor.saveRange' | 'saveRange'): JQuery;
+		summernote(command: 'editor.restoreRange' | 'restoreRange'): JQuery;
+		summernote(command: 'editor.undo' | 'undo'): JQuery;
+		summernote(command: 'editor.redo' | 'redo'): JQuery;
+		summernote(command: 'editor.focus' | 'focus'): JQuery;
+		summernote(command: 'editor.isEmpty' | 'isEmpty'): boolean;
+		summernote(command: 'reset'): JQuery;
+		summernote(command: 'disable'): JQuery;
+		summernote(command: 'enable'): JQuery;
+		// Font style API
+		summernote(fontStyle: 'editor.bold' | 'bold'): JQuery;
+		summernote(fontStyle: 'editor.italic' | 'italic'): JQuery;
+		summernote(fontStyle: 'editor.underline' | 'underline'): JQuery;
+		summernote(fontStyle: 'editor.strikethrough' | 'strikethrough'): JQuery;
+		summernote(command: 'editor.superscript' | 'superscript'): JQuery;
+		summernote(command: 'editor.subscript' | 'subscript'): JQuery;
+		summernote(command: 'editor.removeFormat' | 'removeFormat'): JQuery;
+		summernote(command: 'backColor', color: string): JQuery;
+		summernote(command: 'foreColor', color: string): JQuery;
+		summernote(command: 'fontName', fontName: string): JQuery;
+		summernote(command: 'editor.fontSize' | 'fontSize', fontSize: number): JQuery;
+		// Paragraph API
+		summernote(command: 'editor.justifyLeft' | 'justifyLeft'): JQuery;
+		summernote(command: 'editor.justifyRight' | 'justifyRight'): JQuery;
+		summernote(command: 'editor.justifyCenter' | 'justifyCenter'): JQuery;
+		summernote(command: 'editor.justifyFull' | 'justifyFull'): JQuery;
+		summernote(command: 'insertParagraph'): JQuery;
+		summernote(command: 'editor.insertOrderedList' | 'insertOrderedList'): JQuery;
+		summernote(command: 'editor.insertUnorderedList' | 'insertUnorderedList'): JQuery;
+		summernote(command: 'editor.indent' | 'indent'): JQuery;
+		summernote(command: 'editor.outdent' | 'outdent'): JQuery;
+		summernote(command: 'formatPara'): JQuery;
+		summernote(command: 'formatH1'): JQuery;
+		summernote(command: 'formatH2'): JQuery;
+		summernote(command: 'formatH3'): JQuery;
+			summernote(command: 'formatH4'): JQuery;
+		summernote(command: 'formatH5'): JQuery;
+		summernote(command: 'formatH6'): JQuery;
+		// Insertion API
+		summernote(command: 'editor.insertImage' | 'insertImage', url: string, filename?: (string | Summernote.EditImageCallback)): JQuery;
+		summernote(command: 'editor.insertNode' | 'insertNode', node: JQuery.Node): JQuery;
+		summernote(command: 'editor.insertText' | 'insertText', text: string): JQuery;
+		summernote(command: 'createLink', options: Summernote.CreateLinkOptions): JQuery;
+		// TODO: Callbacks
+
+		// TODO: Editor
+		// editor.insertImagesOrCallback ??
+		// editor.afterCommand ??
+		// editor.resizeTo ??
+		// editor.resize ??
+		// editor.saveTarget ??
+		// editor.isActivated ??
+		// editor.formatBlock ??
+		// editor.color ??
+		// editor.lineHeight ??
+		// editor.insertTable ??
+		// editor.insertHorizontalRule ??
+		// editor.floatMe ??
+		// editor.removeMedia ??
+		// editor.currentStyle ??
+		// editor.getLinkInfo ??
+		// editor.getSelectedText ??
+	}
+}
+
+export {};
diff --git a/types/summernote/summernote-tests.ts b/types/summernote/summernote-tests.ts
new file mode 100644
index 0000000000..d984e4b6c0
--- /dev/null
+++ b/types/summernote/summernote-tests.ts
@@ -0,0 +1,8 @@
+import 'summernote';
+
+$('#testElement').summernote({
+  airMode: true
+});
+
+$('#testElement').summernote('code', '<p> hello </p>');
+$('#testElement').summernote('code');
diff --git a/types/summernote/tsconfig.json b/types/summernote/tsconfig.json
new file mode 100644
index 0000000000..127f97e02f
--- /dev/null
+++ b/types/summernote/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",
+        "summernote-tests.ts"
+    ]
+}
diff --git a/types/summernote/tslint.json b/types/summernote/tslint.json
new file mode 100644
index 0000000000..08016de61a
--- /dev/null
+++ b/types/summernote/tslint.json
@@ -0,0 +1,6 @@
+{
+  "extends": "dtslint/dt.json",
+  "rules": {
+    "unified-signatures": false
+  }
+}
diff --git a/types/suncalc/index.d.ts b/types/suncalc/index.d.ts
new file mode 100644
index 0000000000..5c9b0bf67e
--- /dev/null
+++ b/types/suncalc/index.d.ts
@@ -0,0 +1,49 @@
+// Type definitions for suncalc 1.8
+// Project: https://github.com/mourner/suncalc
+// Definitions by: horiuchi <https://github.com/horiuchi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export interface GetTimesResult {
+    dawn: Date;
+    dusk: Date;
+    goldenHour: Date;
+    goldenHourEnd: Date;
+    nadir: Date;
+    nauticalDawn: Date;
+    nauticalDusk: Date;
+    night: Date;
+    nightEnd: Date;
+    solarNoon: Date;
+    sunrise: Date;
+    sunriseEnd: Date;
+    sunset: Date;
+    sunsetStart: Date;
+}
+export interface GetSunPositionResult {
+    altitude: number;
+    azimuth: number;
+}
+export interface GetMoonPositionResult {
+    altitude: number;
+    azimuth: number;
+    distance: number;
+    parallacticAngle: number;
+}
+export interface GetMoonIlluminationResult {
+    fraction: number;
+    phase: number;
+    angle: number;
+}
+export interface GetMoonTimes {
+    rise: Date;
+    set: Date;
+    alwaysUp: boolean;
+    alwaysDown: boolean;
+}
+
+export function getTimes(date: Date, latitude: number, longitude: number): GetTimesResult;
+export function addTime(angleInDegrees: number, morningName: string, eveningName: string): void;
+export function getPosition(timeAndDate: Date, latitude: number, longitude: number): GetSunPositionResult;
+export function getMoonPosition(timeAndDate: Date, latitude: number, longitude: number): GetMoonPositionResult;
+export function getMoonIllumination(timeAndDate: Date): GetMoonIlluminationResult;
+export function getMoonTimes(date: Date, latitude: number, longitude: number, inUTC?: boolean): GetMoonTimes;
diff --git a/types/suncalc/suncalc-tests.ts b/types/suncalc/suncalc-tests.ts
new file mode 100644
index 0000000000..0bc8772d04
--- /dev/null
+++ b/types/suncalc/suncalc-tests.ts
@@ -0,0 +1,48 @@
+import * as SunCalc from 'suncalc';
+
+let d: Date;
+let x: number;
+let b: boolean;
+
+const date = new Date();
+const latitude = 0.0;
+const longitude = 0.0;
+
+const times = SunCalc.getTimes(date, latitude, longitude);
+d = times.dawn;
+d = times.dusk;
+d = times.goldenHour;
+d = times.goldenHourEnd;
+d = times.nadir;
+d = times.nauticalDawn;
+d = times.nauticalDusk;
+d = times.night;
+d = times.nightEnd;
+d = times.solarNoon;
+d = times.sunrise;
+d = times.sunriseEnd;
+d = times.sunset;
+d = times.sunsetStart;
+
+SunCalc.addTime(0.0, 'customTime', 'customTimeEnd');
+
+const pos = SunCalc.getPosition(date, latitude, longitude);
+x = pos.altitude;
+x = pos.azimuth;
+
+const mp = SunCalc.getMoonPosition(date, latitude, longitude);
+x = mp.altitude;
+x = mp.azimuth;
+x = mp.distance;
+x = mp.parallacticAngle;
+
+const mi = SunCalc.getMoonIllumination(date);
+x = mi.fraction;
+x = mi.phase;
+x = mi.angle;
+
+const mt = SunCalc.getMoonTimes(date, latitude, longitude, true);
+d = mt.rise;
+d = mt.set;
+b = mt.alwaysUp;
+b = mt.alwaysDown;
diff --git a/types/suncalc/tsconfig.json b/types/suncalc/tsconfig.json
new file mode 100644
index 0000000000..0c4fe2498e
--- /dev/null
+++ b/types/suncalc/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",
+        "suncalc-tests.ts"
+    ]
+}
diff --git a/types/suncalc/tslint.json b/types/suncalc/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/suncalc/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/superagent-bunyan/index.d.ts b/types/superagent-bunyan/index.d.ts
new file mode 100644
index 0000000000..1dfec979e4
--- /dev/null
+++ b/types/superagent-bunyan/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for superagent-bunyan 5.2
+// Project: https://github.com/joaquimserafim/superagent-bunyan#readme
+// Definitions by: Alex Brick <https://github.com/bricka>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import * as Logger from 'bunyan';
+import { Plugin } from 'superagent';
+
+declare function superagentLogger(logger: Logger, requestId?: string, extra?: object): Plugin;
+
+export = superagentLogger;
diff --git a/types/superagent-bunyan/superagent-bunyan-tests.ts b/types/superagent-bunyan/superagent-bunyan-tests.ts
new file mode 100644
index 0000000000..3a6f973e91
--- /dev/null
+++ b/types/superagent-bunyan/superagent-bunyan-tests.ts
@@ -0,0 +1,16 @@
+import * as request from 'superagent';
+import * as bunyan from 'bunyan';
+
+import superagentLogger = require('superagent-bunyan');
+
+const logger = bunyan.createLogger({name: 'my_log'});
+
+logger.info('Hey!');
+
+request
+    .get('http://localhost:3000')
+    .use(superagentLogger(logger))
+    .use(superagentLogger(logger, 'requestId'))
+    .use(superagentLogger(logger, 'requestId', { foo: 'bar' }))
+    .use(superagentLogger(logger, undefined, { foo: 'bar' }))
+    .end((err, res) => {});
diff --git a/types/superagent-bunyan/tsconfig.json b/types/superagent-bunyan/tsconfig.json
new file mode 100644
index 0000000000..0118838dcd
--- /dev/null
+++ b/types/superagent-bunyan/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",
+        "superagent-bunyan-tests.ts"
+    ]
+}
diff --git a/types/superagent-bunyan/tslint.json b/types/superagent-bunyan/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/superagent-bunyan/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/superagent/index.d.ts b/types/superagent/index.d.ts
index 7daf5f47dc..971cc3c4c2 100644
--- a/types/superagent/index.d.ts
+++ b/types/superagent/index.d.ts
@@ -5,6 +5,7 @@
 //                 Pap Lőrinc <https://github.com/paplorinc>
 //                 Shrey Jain <https://github.com/shreyjain1994>
 //                 Alec Zopf <https://github.com/zopf>
+//                 Adam Haglund <https://github.com/beeequeue>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
@@ -13,6 +14,7 @@
 import * as fs from 'fs';
 import * as https from 'https';
 import * as stream from 'stream';
+import * as cookiejar from 'cookiejar';
 
 type CallbackHandler = (err: any, res: request.Response) => void;
 
@@ -49,6 +51,7 @@ declare namespace request {
     }
 
     interface SuperAgent<Req extends SuperAgentRequest> extends stream.Stream {
+        jar: cookiejar.CookieJar;
         attachCookies(req: Req): void;
         checkout(url: string, callback?: CallbackHandler): Req;
         connect(url: string, callback?: CallbackHandler): Req;
@@ -98,6 +101,7 @@ declare namespace request {
         get(header: string): string;
         header: any;
         info: boolean;
+        links: object;
         noContent: boolean;
         notAcceptable: boolean;
         notFound: boolean;
@@ -116,7 +120,8 @@ declare namespace request {
         abort(): void;
         accept(type: string): this;
         attach(field: string, file: MultipartValueSingle, options?: string | { filename?: string; contentType?: string }): this;
-        auth(user: string, name: string): this;
+        auth(user: string, pass: string, options?: { type: 'basic' | 'auto' }): this;
+        auth(token: string, options: { type: 'bearer' }): this;
         buffer(val?: boolean): this;
         ca(cert: Buffer): this;
         cert(cert: Buffer | string): this;
@@ -150,7 +155,7 @@ declare namespace request {
         write(data: string | Buffer, encoding?: string): this;
     }
 
-    type Plugin = (req: Request) => void;
+    type Plugin = (req: SuperAgentRequest) => void;
 
     interface ProgressEvent {
         direction: 'download' | 'upload';
diff --git a/types/superagent/superagent-tests.ts b/types/superagent/superagent-tests.ts
index 66046759f1..c063c819be 100644
--- a/types/superagent/superagent-tests.ts
+++ b/types/superagent/superagent-tests.ts
@@ -230,13 +230,29 @@ const reqCookies: string = req.cookies;
 
 console.log(`${reqMethod} request to ${reqUrl} cookies ${reqCookies}`);
 
-// Basic authentication
+// Authentication
 request.get('http://tobi:learnboost@local').end(callback);
+
 request
     .get('http://local')
     .auth('tobo', 'learnboost')
     .end(callback);
 
+request
+    .get('http://local')
+    .auth('user', 'pass', { type: 'basic' })
+    .end(callback);
+
+request
+    .get('http://local')
+    .auth('user', 'pass', {type: 'auto'})
+    .end(callback);
+
+request
+    .get('http://local')
+    .auth('abearertoken', { type: 'bearer' })
+    .end(callback);
+
 // Following redirects
 request
     .get('/some.png')
@@ -390,3 +406,18 @@ request
     .then(response => {
         // reads 404 page as a successful response
     });
+
+// Test that the "Plugin" type from "use" provides a SuperAgentRequest rather than a Request,
+// which has additional properties.
+const echoPlugin = (request: request.SuperAgentRequest) => {
+  req.url = '' + req.url;
+  req.cookies = '' + req.cookies;
+  if (req.method) {
+    req.url = '/echo';
+  }
+};
+
+request
+    .get('/echo')
+    .use(echoPlugin)
+    .end();
diff --git a/types/superstruct/index.d.ts b/types/superstruct/index.d.ts
new file mode 100644
index 0000000000..de8b89c22a
--- /dev/null
+++ b/types/superstruct/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for superstruct 0.5
+// Project: https://github.com/ianstormtaylor/superstruct#readme
+// Definitions by: Edward Snare <https://github.com/edwardsnare>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.5
+
+export as namespace superstruct;
+
+export interface Config {
+	types?: {[type: string]: CustomType};
+}
+
+export type CustomType = (value: any) => boolean|string;
+
+export function isStruct(value: any): boolean;
+
+export class Kind {
+	constructor(name: string, type: string, validate: (value?: any, data?: any) => any[]);
+	name: string;
+	type: string;
+	validate: (value?: any, data?: any) => any[];
+}
+
+export const struct: struct;
+
+export interface struct {
+	(schema: Types, defaults?: object, options?: {}): Struct;
+	/** `any` structs are the equivalent of using the `struct()` function directly, providing the shorthands for commonly used notations. */
+	any(data: any): Kind;
+	/** `dict` structs validate an object's keys and values. But, unlike `object` structs, they do not enforce a specific set of keys. */
+	dict(data: [Type, Type]): Kind;
+	/** `enum` structs validate that a value is one of a specific set of literals. */
+	enum(literals: any[]): Kind;
+	/**
+	 * `function` structs will validate using the validation function provided.
+	 * They're helpful as an escape hatch in cases when you really need to write a one-off validation, and don't want to add it to your set of known data types.
+	 */
+	function(type: (value: any, data?: any) => boolean|string|object): Kind;
+	/** `instance` structs validate that an object is an instance of a particular class, using the built-in instanceof operator. */
+	instance(object: any): Kind;
+	/**
+	 * `interface` structs validate that a value has a set of properties on it, but it does not assert anything about unspecified properties.
+	 * This allows you to assert that a particular set of functionality exists without a strict equality check for properties.
+	 */
+	interface(properties: Types): Kind;
+	/** `intersection` structs validate that a value matches all of many structs. Their arguments are any other validate struct schema. */
+	intersection(structs: Type[]): Kind;
+	/** `lazy` structs accepts a function that will return a struct. They are useful to create recursive structs. */
+	lazy(structs: () => Kind): Kind;
+	/** `list` structs will validate that all of the elements in an array match a specific type. The elements's schema can be any valid value for a struct—string, array, object or function. */
+	list(elements: Type[]): Kind;
+	/** `literal` structs enforces that a value matches an exact, pre-defined value, using the `===` operator. */
+	literal(value: any): Kind;
+	/**
+	 * `object` structs will validate that each of the properties in an object match a specific type.
+	 * The properties's schemas can be any valid value for a struct—string, array, object or function.
+	 */
+	object(properties: Types): Kind;
+	/** `optional` structs validate that a value matches a specific kind of struct, or that it is `undefined`. */
+	optional(type: Type): Kind;
+	/**
+	 * `partial` structs are similar to `object` structs, but they only require that the specified properties exist, and they don't care about other properties on the object.
+	 * They differ from `interface` structs in that they only return the specified properties.
+	 */
+	partial(properties: Types): Kind;
+	/** `scalar` structs are the lowest-level type of struct. They validate that a single scalar value matches a type, denoted by a type string. */
+	scalar(value: string): Kind;
+	/** `tuple` structs validate that a value is a specific array tuple of values. */
+	tuple(values: Type[]): Kind;
+	/** `union` structs validate that a value matches at least one of many structs. Their arguments are any other validate struct schema. */
+	union(schemas: Type[]): Kind;
+}
+
+export interface Struct {
+	(data: object): any;
+	/** @throws {StructError} */
+	assert(value: object): any;
+	test(value: object): boolean;
+	validate(value: object): [StructError]|[undefined, any];
+}
+
+export interface StructError extends TypeError {
+	data: any;
+	path: string[];
+	value: any;
+	reason: any;
+	type: string;
+	errors: StructError[];
+}
+
+export function superstruct(config?: Config): struct;
+
+export type Type = any;
+
+export interface Types {
+	[type: string]: Type;
+}
diff --git a/types/superstruct/superstruct-tests.ts b/types/superstruct/superstruct-tests.ts
new file mode 100644
index 0000000000..ce8ab8a636
--- /dev/null
+++ b/types/superstruct/superstruct-tests.ts
@@ -0,0 +1,87 @@
+import { superstruct, isStruct, struct, StructError } from "superstruct";
+
+// $ExpectType struct
+let myStruct = superstruct();
+
+// $ExpectType struct
+myStruct = superstruct({
+	types: {
+		id: (value: any) => typeof value === "string" && /^[a-z0-9]+$/.test(value)
+	}
+});
+
+// $ExpectError
+isStruct();
+
+// $ExpectType boolean
+isStruct(myStruct);
+
+// $ExpectError
+let MyOtherStruct = myStruct();
+
+// $ExpectType Struct
+MyOtherStruct = myStruct({
+	id: 'id',
+	password: struct.function(value => typeof value === "string" && value.length > 5),
+	passwordRepeat: struct.function((value, data) => data.password && value === data.password)
+});
+
+const value: object = { id: "5n4r3", password: "****", passwordRepeat: "****" };
+
+// $ExpectType any
+MyOtherStruct(value);
+
+// $ExpectType any
+MyOtherStruct.assert(value);
+
+// $ExpectType boolean
+MyOtherStruct.test(value);
+
+// $ExpectType [StructError] | [undefined, any]
+MyOtherStruct.validate(value);
+
+// $ExpectType Kind
+struct.any("any");
+// $ExpectType Kind
+struct.dict(['string', Date]);
+// $ExpectType Kind
+struct.enum(['one', 'two']);
+// $ExpectType Kind
+struct.function(value => typeof value === 'string');
+// $ExpectType Kind
+struct.instance(Date);
+// $ExpectType Kind
+struct.interface({
+	property: 'number',
+	method: 'function',
+});
+// $ExpectType Kind
+struct.intersection(['string', 'email']);
+// $ExpectType Struct
+const BinaryTree: any = struct({
+	value: 'any',
+	left: struct.lazy(() => struct.optional(BinaryTree)),
+	right: struct.lazy(() => struct.optional(BinaryTree)),
+});
+// $ExpectType Kind
+struct.list(['string']);
+// $ExpectType Kind
+struct.literal(42);
+// $ExpectType Kind
+struct.object({
+	id: 'number',
+	name: 'string',
+});
+// $ExpectType Kind
+struct.optional('string');
+// $ExpectType Kind
+struct.partial({
+	a: 'number',
+	b: 'number',
+});
+// $ExpectType Kind
+struct.scalar('string');
+// $ExpectType Kind
+struct.tuple(['string', 'number', 'boolean']);
+// $ExpectType Kind
+struct.union(['string', 'number']);
diff --git a/types/superstruct/tsconfig.json b/types/superstruct/tsconfig.json
new file mode 100644
index 0000000000..1a972f210e
--- /dev/null
+++ b/types/superstruct/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",
+        "superstruct-tests.ts"
+    ]
+}
diff --git a/types/superstruct/tslint.json b/types/superstruct/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/superstruct/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/supertest-as-promised/index.d.ts b/types/supertest-as-promised/index.d.ts
index f88c80eaba..1b12d57b0f 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.3
+// TypeScript Version: 2.8
 
 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 0716f9e1b5..092ab89bb4 100644
--- a/types/supertest/index.d.ts
+++ b/types/supertest/index.d.ts
@@ -27,7 +27,7 @@ declare namespace supertest {
       expect(body: RegExp, callback?: CallbackHandler): this;
       expect(body: Object, callback?: CallbackHandler): this;
       expect(field: string, val: string, callback?: CallbackHandler): this;
-      expect(fzield: string, val: RegExp, callback?: CallbackHandler): this;
+      expect(field: string, val: RegExp, callback?: CallbackHandler): this;
       expect(checker: (res: Response) => any): this;
       end(callback?: CallbackHandler): this;
     }
diff --git a/types/svg-path-parser/index.d.ts b/types/svg-path-parser/index.d.ts
new file mode 100644
index 0000000000..d90ad4f66f
--- /dev/null
+++ b/types/svg-path-parser/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for svg-path-parser 1.1
+// Project: https://github.com/hughsk/svg-path-parser#readme
+// Definitions by: tyru <https://github.com/tyru>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function parseSVG(input: string): Command[];
+export function makeAbsolute(commands: Command[]): Command[];
+
+export interface Command {
+    code: 'm' | 'M' | 'l' | 'L' | 'h' | 'H' | 'v' | 'V' | 'c' | 'C' | 's' | 'S' | 'q' | 'Q' | 't' | 'T' | 'a' | 'A' | 'z' | 'Z';
+    command: 'moveto' | 'lineto' | 'horizontal lineto' | 'vertical lineto' | 'curveto' | 'smooth curveto' | 'quadratic curveto' | 'smooth quadratic curveto' | 'elliptical arc' | 'closepath';
+    relative?: boolean;
+}
+
+export interface MoveToCommand {
+    code: 'm' | 'M';
+    command: 'moveto';
+    relative?: boolean;
+    x: number;
+    y: number;
+}
+
+export interface LineToCommand {
+    code: 'l' | 'L';
+    command: 'lineto';
+    relative?: boolean;
+    x: number;
+    y: number;
+}
+
+export interface HorizontalLineToCommand {
+    code: 'h' | 'H';
+    command: 'horizontal lineto';
+    relative?: boolean;
+    x: number;
+}
+
+export interface VerticalLineToCommand {
+    code: 'v' | 'V';
+    command: 'vertical lineto';
+    relative?: boolean;
+    y: number;
+}
+
+export interface ClosePathCommand {
+    code: 'z' | 'Z';
+    command: 'closepath';
+    relative?: boolean;
+}
+
+export interface CurveToCommand {
+    code: 'c' | 'C';
+    command: 'curveto';
+    relative?: boolean;
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+    x: number;
+    y: number;
+}
+
+export interface SmoothCurveToCommand {
+    code: 's' | 'S';
+    command: 'smooth curveto';
+    relative?: boolean;
+    x2: number;
+    y2: number;
+    x: number;
+    y: number;
+}
+
+export interface QuadraticCurveToCommand {
+    code: 'q' | 'Q';
+    command: 'quadratic curveto';
+    relative?: boolean;
+    x1: number;
+    y1: number;
+    x: number;
+    y: number;
+}
+
+export interface SmoothQuadraticCurveToCommand {
+    code: 't' | 'T';
+    command: 'smooth quadratic curveto';
+    relative?: boolean;
+    x: number;
+    y: number;
+}
+
+export interface EllipticalArcCommand {
+    code: 'a' | 'A';
+    command: 'elliptical arc';
+    relative?: boolean;
+    rx: number;
+    ry: number;
+    xAxisRotation: number;
+    largeArc: boolean;
+    sweep: boolean;
+    x: number;
+    y: number;
+}
diff --git a/types/svg-path-parser/svg-path-parser-tests.ts b/types/svg-path-parser/svg-path-parser-tests.ts
new file mode 100644
index 0000000000..4966054a79
--- /dev/null
+++ b/types/svg-path-parser/svg-path-parser-tests.ts
@@ -0,0 +1,79 @@
+/// <reference types="node" />
+
+import * as svgParser from 'svg-path-parser';
+
+function isMoveToCommand(cmd: svgParser.Command): cmd is svgParser.MoveToCommand {
+  return cmd.command === 'moveto';
+}
+
+function isLineToCommand(cmd: svgParser.Command): cmd is svgParser.LineToCommand {
+  return cmd.command === 'lineto';
+}
+
+function isHorizontalLineToCommand(cmd: svgParser.Command): cmd is svgParser.HorizontalLineToCommand {
+  return cmd.command === 'horizontal lineto';
+}
+
+function isVerticalLineToCommand(cmd: svgParser.Command): cmd is svgParser.VerticalLineToCommand {
+  return cmd.command === 'vertical lineto';
+}
+
+function isClosePathCommand(cmd: svgParser.Command): cmd is svgParser.ClosePathCommand {
+  return cmd.command === 'closepath';
+}
+
+function isCurveToCommand(cmd: svgParser.Command): cmd is svgParser.CurveToCommand {
+  return cmd.command === 'curveto';
+}
+
+function isSmoothCurveToCommand(cmd: svgParser.Command): cmd is svgParser.SmoothCurveToCommand {
+  return cmd.command === 'smooth curveto';
+}
+
+function isQuadraticCurveToCommand(cmd: svgParser.Command): cmd is svgParser.QuadraticCurveToCommand {
+  return cmd.command === 'quadratic curveto';
+}
+
+function isSmoothQuadraticCurveToCommand(cmd: svgParser.Command): cmd is svgParser.SmoothQuadraticCurveToCommand {
+  return cmd.command === 'smooth quadratic curveto';
+}
+
+function isEllipticalArcCommand(cmd: svgParser.Command): cmd is svgParser.EllipticalArcCommand {
+  return cmd.command === 'elliptical arc';
+}
+
+function stringify(cmd: svgParser.Command) {
+  if (isMoveToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x} ${cmd.y}`;
+  } else if (isLineToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x} ${cmd.y}`;
+  } else if (isLineToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x} ${cmd.y}`;
+  } else if (isHorizontalLineToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x}`;
+  } else if (isVerticalLineToCommand(cmd)) {
+    return `${cmd.code} ${cmd.y}`;
+  } else if (isClosePathCommand(cmd)) {
+    return `${cmd.code}`;
+  } else if (isCurveToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x1} ${cmd.y1} ${cmd.x2} ${cmd.y2} ${cmd.x} ${cmd.y}`;
+  } else if (isSmoothCurveToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x2} ${cmd.y2} ${cmd.x} ${cmd.y}`;
+  } else if (isQuadraticCurveToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x1} ${cmd.y1} ${cmd.x} ${cmd.y}`;
+  } else if (isSmoothQuadraticCurveToCommand(cmd)) {
+    return `${cmd.code} ${cmd.x} ${cmd.y}`;
+  } else if (isEllipticalArcCommand(cmd)) {
+    return `${cmd.code} ${cmd.rx} ${cmd.ry} ${cmd.xAxisRotation} ${cmd.largeArc} ${cmd.sweep} ${cmd.x} ${cmd.y}`;
+  } else {
+    throw new Error(`${cmd.code} command is unknown command: cmd = ${JSON.stringify(cmd)}`);
+  }
+}
+
+let cmds = svgParser.parseSVG('M 0 0 L 50 50');
+// makeAbsolute() changes cmds inplacely
+cmds = svgParser.makeAbsolute(cmds);
+
+cmds.filter((cmd: svgParser.Command) => !cmd.relative)    // relative commands must not exist
+    .map(stringify)
+    .forEach(console.log);
diff --git a/types/svg-path-parser/tsconfig.json b/types/svg-path-parser/tsconfig.json
new file mode 100644
index 0000000000..024c3cc91f
--- /dev/null
+++ b/types/svg-path-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-path-parser-tests.ts"
+    ]
+}
diff --git a/types/svg-path-parser/tslint.json b/types/svg-path-parser/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/svg-path-parser/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/svg-sprite/index.d.ts b/types/svg-sprite/index.d.ts
index fd63d3f37b..82a1607d21 100644
--- a/types/svg-sprite/index.d.ts
+++ b/types/svg-sprite/index.d.ts
@@ -7,7 +7,7 @@
 /// <reference types="vinyl" />
 
 import File = require('vinyl');
-import winston = require('winston');
+import { Logger } from 'winston';
 
 declare namespace sprite {
     interface SVGSpriterConstructor extends NodeJS.EventEmitter {
@@ -59,7 +59,7 @@ declare namespace sprite {
         /**
          * Logging verbosity or custom logger
          */
-        log?: string | winston.LoggerInstance;
+        log?: string | Logger;
         /**
          * SVG shape configuration
          */
diff --git a/types/svg-sprite/package.json b/types/svg-sprite/package.json
new file mode 100644
index 0000000000..0aa4cf368f
--- /dev/null
+++ b/types/svg-sprite/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "winston": "^3.0.0"
+    }
+}
diff --git a/types/swagger-ui-dist/index.d.ts b/types/swagger-ui-dist/index.d.ts
new file mode 100644
index 0000000000..a4eb654e61
--- /dev/null
+++ b/types/swagger-ui-dist/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for swagger-ui-dist 3.x
+// Project: https://github.com/swagger-api/swagger-ui#readme
+// Definitions by: Haowen <https://github.com/haowen737>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+
+    import * as SwaggerUIDist from "swagger-ui-dist"
+    const swaggerUiAssetPath = SwaggerUIDist.getAbsoluteFSPath()
+
+ =============================================== */
+
+export as namespace SwaggerUIDist;
+
+/**
+ * get an absolute path to swagger ui for static file serving
+ */
+export function getAbsoluteFSPath(): string;
+export function absolutePath(): string;
+
+export const SwaggerUIBundle: any;
+export const SwaggerUIStandalonePreset: any;
diff --git a/types/swagger-ui-dist/swagger-ui-dist-tests.ts b/types/swagger-ui-dist/swagger-ui-dist-tests.ts
new file mode 100644
index 0000000000..7597d81041
--- /dev/null
+++ b/types/swagger-ui-dist/swagger-ui-dist-tests.ts
@@ -0,0 +1,4 @@
+import * as SwaggerUIDist from "swagger-ui-dist";
+
+SwaggerUIDist.getAbsoluteFSPath(); // $ExpectType string
+SwaggerUIDist.absolutePath(); // $ExpectType string
diff --git a/types/swagger-ui-dist/tsconfig.json b/types/swagger-ui-dist/tsconfig.json
new file mode 100644
index 0000000000..cd74f32ec0
--- /dev/null
+++ b/types/swagger-ui-dist/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",
+        "swagger-ui-dist-tests.ts"
+    ]
+}
diff --git a/types/swagger-ui-dist/tslint.json b/types/swagger-ui-dist/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/swagger-ui-dist/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/swagger-ui-express/index.d.ts b/types/swagger-ui-express/index.d.ts
new file mode 100644
index 0000000000..f4165355fe
--- /dev/null
+++ b/types/swagger-ui-express/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for swagger-ui-express 3.0
+// Project: https://github.com/scottie1984/swagger-ui-express
+// Definitions by: Dmitry Rogozhny <https://github.com/dmitryrogozhny>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import { RequestHandler } from "express";
+import { ServeStaticOptions } from "serve-static";
+
+interface JsonObject { [key: string]: any; }
+interface SwaggerUiOptions { [key: string]: any; }
+interface SwaggerOptions { [key: string]: any; }
+
+interface SwaggerUiExpress {
+    /**
+     * Creates a middleware function that returns the pre-generated html file for the Swagger UI page.
+     *
+     * @param swaggerDoc json object with the API schema.
+     * @param opts swagger-ui-express options.
+     * @param options custom swagger options.
+     * @param customCss string with a custom css to embed into the page.
+     * @param customfavIcon link to a custom favicon.
+     * @param swaggerUrl Url of the swagger API schema, can be specified instead of the swaggerDoc.
+     * @param customeSiteTitle custom title for a page
+     * @returns an express middleware function that returns the generated html page.
+     */
+    setup(swaggerDoc?: JsonObject | null,
+        opts?: SwaggerUiOptions | false | null,
+        options?: SwaggerOptions,
+        customCss?: string | false | null,
+        customfavIcon?: string | false | null,
+        swaggerUrl?: string | false | null,
+        customeSiteTitle?: string | false | null): RequestHandler;
+
+    /**
+     * Returns handlers for serving Swagger UI files.
+     * This includes custom initialization js file and static files of Swagger UI.
+     *
+     * @returns Express handlers that process requests and return files for Swagger UI.
+     */
+    serve(): RequestHandler[];
+
+    /**
+     * Returns handlers for serving Swagger UI files.
+     * This includes custom initialization js file and static files of Swagger UI.
+     * Additional options are passed to the express.static middleware.
+     *
+     * @param options options object that is passed to the express.static middleware.
+     * @returns Express handlers that process requests and return files for Swagger UI.
+     */
+    serveWithOptions(options: ServeStaticOptions): RequestHandler[];
+
+    /**
+     * Generates the custom html page for the UI API.
+     *
+     * @param swaggerDoc json object with the API schema.
+     * @param opts swagger-ui-express options.
+     * @param options custom swagger options.
+     * @param customCss string with a custom css to embed into the page.
+     * @param customfavIcon link to a custom favicon.
+     * @param swaggerUrl Url of the swagger API schema, can be specified instead of the swaggerDoc.
+     * @param customeSiteTitle custom title for a page
+     * @returns the generated html page.
+     */
+    generateHTML(swaggerDoc?: JsonObject | null,
+        opts?: SwaggerUiOptions | false | null,
+        options?: SwaggerOptions,
+        customCss?: string | false | null,
+        customfavIcon?: string | false | null,
+        swaggerUrl?: string | false | null,
+        customeSiteTitle?: string | false | null): string;
+
+    /**
+     * Returns handlers for serving Swagger UI files.
+     * This includes custom initialization js file and static files of Swagger UI.
+     * Additional options object is passed to Swagger UI.
+     *
+     * @param swaggerDoc json object with the Swagger API schema.
+     * @param opts options to pass to Swagger UI.
+     * @returns Express handlers that process requests and return files for Swagger UI.
+     */
+    serveFiles(swaggerDoc?: JsonObject, opts?: SwaggerUiOptions): RequestHandler[];
+}
+
+declare const swaggerUiExpress: SwaggerUiExpress;
+
+export = swaggerUiExpress;
diff --git a/types/swagger-ui-express/swagger-ui-express-tests.ts b/types/swagger-ui-express/swagger-ui-express-tests.ts
new file mode 100644
index 0000000000..f91128205c
--- /dev/null
+++ b/types/swagger-ui-express/swagger-ui-express-tests.ts
@@ -0,0 +1,67 @@
+/**
+ * Tests are taken from the module's repository at https://github.com/scottie1984/swagger-ui-express/blob/master/test/testapp/app.js
+ */
+
+import swaggerUi = require('swagger-ui-express');
+import express = require('express');
+
+const app = express();
+const swaggerDocument = {
+	swagger: '2.0',
+	info: { version: '1.0.0', title: 'Example API' },
+	paths: { '/user': { get: { responses: { 200: { description: 'all users' } } } } }
+};
+const swaggerDocumentSplit = swaggerDocument;
+
+const options = {
+	validatorUrl: null,
+	oauth: {
+		clientId: 'your-client-id1',
+		clientSecret: 'your-client-secret-if-required1',
+		realm: 'your-realms1',
+		appName: 'your-app-name1',
+		scopeSeparator: ',',
+		additionalQueryStringParams: {}
+	},
+	docExpansion: 'full',
+};
+
+app.use('/api-docs', swaggerUi.serve);
+app.get('/api-docs', swaggerUi.setup(swaggerDocument, false, options, '.swagger-ui .topbar { background-color: red }'));
+
+app.use('/api-docs-from-url', swaggerUi.serve);
+app.get('/api-docs-from-url', swaggerUi.setup(null, false, options, '.swagger-ui .topbar { background-color: red }', null, '/swagger.json'));
+
+const swaggerUiOpts = {
+	explorer: false,
+	swaggerOptions: options,
+	customCss: '.swagger-ui .topbar { background-color: blue }'
+};
+
+app.use('/api-docs-using-object', swaggerUi.serve);
+app.get('/api-docs-using-object', swaggerUi.setup(swaggerDocument, swaggerUiOpts));
+
+const swaggerUiOpts2 = {
+	explorer: false,
+	swaggerOptions: options,
+	customCss: '.swagger-ui .topbar { background-color: pink }',
+	swaggerUrl: '/swagger.json',
+	customJs: '/my-custom.js',
+	operationsSorter: 'alpha'
+};
+
+app.use('/api-docs-from-url-using-object', swaggerUi.serve);
+app.get('/api-docs-from-url-using-object', swaggerUi.setup(null, swaggerUiOpts2));
+
+app.use('/api-docs-with-null', swaggerUi.serve);
+app.get('/api-docs-with-null', swaggerUi.setup(swaggerDocument, null, options, '.swagger-ui .topbar { background-color: orange }'));
+
+app.use('/api-docs-split', swaggerUi.serve);
+app.get('/api-docs-split', swaggerUi.setup(swaggerDocumentSplit, null, options, '.swagger-ui .topbar { background-color: orange }'));
+
+app.use('/api-docs-with-opts/', swaggerUi.serveWithOptions({ redirect: false }));
+app.get('/api-docs-with-opts/', swaggerUi.setup(swaggerDocumentSplit, null, options, '.swagger-ui .topbar { background-color: orange }'));
+
+const swaggerHtml = swaggerUi.generateHTML(swaggerDocument, swaggerUiOpts);
+
+app.use('/api-docs-html1', swaggerUi.serveFiles(swaggerDocument, swaggerUiOpts));
diff --git a/types/swagger-ui-express/tsconfig.json b/types/swagger-ui-express/tsconfig.json
new file mode 100644
index 0000000000..dfb989be63
--- /dev/null
+++ b/types/swagger-ui-express/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",
+        "swagger-ui-express-tests.ts"
+    ]
+}
diff --git a/types/swagger-ui-express/tslint.json b/types/swagger-ui-express/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/swagger-ui-express/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/tapable/index.d.ts b/types/tapable/index.d.ts
index 7fd0e6f08d..d2cae7e6dc 100644
--- a/types/tapable/index.d.ts
+++ b/types/tapable/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for tapable v1.0.0
 // Project: https://github.com/webpack/tapable.git
 // Definitions by: e-cloud <https://github.com/e-cloud>
+//                 John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -244,39 +245,39 @@ export interface Tap {
     context: boolean;
 }
 
-export class Hook<T1 = any, T2 = any, T3 = any> {
-    constructor(...args: any[]);
+export class Hook<TArg1 = any, TArg2 = any, TArg3 = any, TTabResult = any, THookResult = any> {
+    constructor(tapArgumentNames?: string[]);
     taps: any[];
-    interceptors: any[];
-    call: (arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => any;
-    promise:(arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => Promise<any>;
-    callAsync: (arg1?: T1, arg2?: T2, arg3?: T3, ...args: any[]) => any;
+    interceptors: HookInterceptor[];
+
+    call: (arg1?: TArg1, arg2?: TArg2, arg3?: TArg3, ...args: any[]) => THookResult;
+    promise:(arg1?: TArg1, arg2?: TArg2, arg3?: TArg3, ...args: any[]) => Promise<THookResult>;
+    callAsync: (arg1?: TArg1, arg2?: TArg2, arg3?: TArg3, ...args: any[]) => THookResult;
 
     compile(options: HookCompileOptions) : Function;
-    tap: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => any) => void;
-    tapAsync: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => void) => void;
-    tapPromise: (name: string | Tap, fn: (arg1: T1, arg2: T2, arg3: T3, ...args: any[]) => Promise<any>) => void;
+    tap: (name: string | Tap, fn: (arg1: TArg1, arg2: TArg2, arg3: TArg3, ...args: any[]) => TTabResult) => void;
+    tapAsync: (name: string | Tap, fn: (arg1: TArg1, arg2: TArg2, arg3: TArg3, ...args: any[]) => void) => void;
+    tapPromise: (name: string | Tap, fn: (arg1: TArg1, arg2: TArg2, arg3: TArg3, ...args: any[]) => Promise<TTabResult>) => void;
     intercept: (interceptor: HookInterceptor) => void;
 }
 
-export class SyncHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
-export class SyncBailHook <T1 = any, T2 = any, T3 = any>extends Hook<T1, T2, T3> {}
-export class SyncLoopHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
-export class SyncWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class SyncHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3, any, undefined> {}
+export class SyncBailHook <T1 = any, T2 = any, T3 = any, THookResult = any>extends Hook<T1, T2, T3, undefined | THookResult, undefined | THookResult> {}
+export class SyncLoopHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3, any, undefined> {}
+export class SyncWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3, T1, T1> {}
 
-export class AsyncParallelHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
-export class AsyncParallelBailHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
-export class AsyncSeriesHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
-export class AsyncSeriesBailHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
-export class AsyncSeriesWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3> {}
+export class AsyncParallelHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3, any, undefined> {}
+export class AsyncParallelBailHook<T1 = any, T2 = any, T3 = any, THookResult = any> extends Hook<T1, T2, T3, undefined | THookResult, undefined | THookResult> {}
+export class AsyncSeriesHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3, any, undefined> {}
+export class AsyncSeriesBailHook<T1 = any, T2 = any, T3 = any, THookResult = any> extends Hook<T1, T2, T3, undefined | THookResult, undefined | THookResult> {}
+export class AsyncSeriesWaterfallHook<T1 = any, T2 = any, T3 = any> extends Hook<T1, T2, T3, T1, T1> {}
 
 export class HookInterceptor {
-    call: (...args: any[]) => void;
-    loop: (...args: any[]) => void;
-    tap: (tap: Tap) => void;
-    register: (tap: Tap) => Tap | undefined;
-    context: boolean;
-    name: string;
+    call?: (...args: any[]) => void;
+    loop?: (...args: any[]) => void;
+    tap?: (tap: Tap) => void;
+    register?: (tap: Tap) => Tap | undefined;
+    context?: boolean;
 }
 
 /** A HookMap is a helper class for a Map with Hooks */
diff --git a/types/tapable/tapable-tests.ts b/types/tapable/tapable-tests.ts
index c78196c194..b1cbcf1e21 100644
--- a/types/tapable/tapable-tests.ts
+++ b/types/tapable/tapable-tests.ts
@@ -1,4 +1,16 @@
-import {Tapable, MultiHook, SyncHook} from "tapable";
+import {
+    Tapable,
+    MultiHook,
+    SyncHook,
+    SyncBailHook,
+    SyncWaterfallHook,
+    SyncLoopHook,
+    AsyncParallelHook,
+    AsyncParallelBailHook,
+    AsyncSeriesHook,
+    AsyncSeriesBailHook,
+    AsyncSeriesWaterfallHook
+} from "tapable";
 
 class DllPlugin {
     apply(compiler: Compiler) {
@@ -45,3 +57,121 @@ compiler.applyPluginsParallelBailResult('doSomething', 'a', 'b');
 compiler.applyPluginsParallelBailResult1('doSomething', 'a', callback);
 
 const multi = new MultiHook([new SyncHook(['hi'])]);
+
+const isNumber = (val: number) => val;
+const isAny = (val: {a: { n: {y: '!'}}}) => val;
+const isUndefined = (val: undefined) => val;
+
+// Without generics
+(() => {
+    const hooks = {
+        syncHook: new SyncHook(['arg1']),
+        syncBailHook: new SyncBailHook(['arg1']),
+        syncWaterfallHook: new SyncWaterfallHook(['arg1']),
+        syncLoopHook: new SyncLoopHook(['arg1']),
+        asyncParallelHook: new AsyncParallelHook(['arg1']),
+        asyncParallelBailHook: new AsyncParallelBailHook(['arg1']),
+        asyncSeriesHook: new AsyncSeriesHook(['arg1']),
+        asyncSeriesBailHook: new AsyncSeriesBailHook(['arg1']),
+        asyncSeriesWaterfallHook: new AsyncSeriesWaterfallHook(['arg1']),
+    }
+
+    // Without generics we won't get any information
+    // for the tap interface:
+    hooks.syncHook.tap('AHook', () => ('ReturnValue'));
+    hooks.syncBailHook.tap('AHook', () => ('ReturnValue'));
+    hooks.syncWaterfallHook.tap('AHook', () => ('ReturnValue'));
+    hooks.asyncParallelHook.tapPromise('AHook', async () => ('ReturnValue'));
+    hooks.asyncParallelBailHook.tapPromise('AHook', async () => ('ReturnValue'));
+    hooks.asyncSeriesHook.tapPromise('AHook', async () => ('ReturnValue'));
+    hooks.asyncSeriesBailHook.tapPromise('AHook', async () => ('ReturnValue'));
+    hooks.asyncSeriesWaterfallHook.tapPromise('AHook', async () => ('ReturnValue'));
+
+    async function getHookResults() {
+        return {
+            syncHook: hooks.syncHook.call({ name: 'sue', age: 34 }),
+            syncBailHook: hooks.syncBailHook.call({ name: 'sue', age: 34 }),
+            syncWaterfallHook: hooks.syncWaterfallHook.call({ name: 'sue', age: 34 }),
+            syncLoopHook: hooks.syncLoopHook.call({ name: 'sue', age: 34 }),
+            asyncParallelHook: await hooks.asyncParallelHook.promise({ name: 'sue', age: 34 }),
+            asyncParallelBailHook: await hooks.asyncParallelBailHook.promise({ name: 'sue', age: 34 }),
+            asyncSeriesHook: await hooks.asyncSeriesHook.promise({ name: 'sue', age: 34 }),
+            asyncSeriesBailHook: await hooks.asyncSeriesBailHook.promise({ name: 'sue', age: 34 }),
+            asyncSeriesWaterfallHook: await hooks.asyncSeriesWaterfallHook.promise({ name: 'sue', age: 34 }),
+        }
+    }
+
+    getHookResults().then((result) => {
+        // Allways undefined:
+        console.log(isUndefined(result.syncHook));
+        console.log(isUndefined(result.asyncSeriesHook));
+        console.log(isUndefined(result.asyncParallelHook));
+        // Possible undefined:
+        console.log(isAny(result.syncBailHook!));
+        console.log(isAny(result.asyncParallelHook!));
+        console.log(isAny(result.syncBailHook!));
+        console.log(isAny(result.asyncParallelHook!));
+        console.log(isAny(result.asyncSeriesHook!));
+        console.log(isAny(result.asyncSeriesBailHook!));
+        // Allways defined:
+        console.log(isNumber(result.syncWaterfallHook.age));
+        console.log(isNumber(result.asyncSeriesWaterfallHook.age));
+    });
+})();
+
+// With generics
+(() => {
+    type Person = {name: string, age: number};
+    const hooks = {
+        syncHook: new SyncHook<Person, undefined, undefined>(['arg1']),
+        syncBailHook: new SyncBailHook<Person, undefined, undefined, number>(['arg1']),
+        syncWaterfallHook: new SyncWaterfallHook<Person, undefined, undefined>(['arg1']),
+        syncLoopHook: new SyncLoopHook<Person, undefined, undefined>(['arg1']),
+        asyncParallelHook: new AsyncParallelHook<Person, undefined, undefined>(['arg1']),
+        asyncParallelBailHook: new AsyncParallelBailHook<Person, undefined, undefined, number>(['arg1']),
+        asyncSeriesHook: new AsyncSeriesHook<Person, undefined, undefined>(['arg1']),
+        asyncSeriesBailHook: new AsyncSeriesBailHook<Person, undefined, undefined, number>(['arg1']),
+        asyncSeriesWaterfallHook: new AsyncSeriesWaterfallHook<Person, undefined, undefined>(['arg1']),
+    }
+
+    // Without generics we will get information
+    hooks.syncHook.tap('AHook', () => ('Any Return Value'));
+    hooks.syncBailHook.tap('AHook', (person) => person.age);
+    hooks.syncWaterfallHook.tap('AHook', (person) => ({ name: 'sue', age: person.age + 1 }));
+    hooks.asyncParallelHook.tapPromise('AHook', async () => ('ReturnValue'));
+    hooks.asyncParallelBailHook.tapPromise('AHook', async (person) => person.age);
+    hooks.asyncSeriesHook.tapPromise('AHook', async () => ('ReturnValue'));
+    hooks.asyncSeriesBailHook.tapPromise('AHook', async (person) => person.age);
+    hooks.asyncSeriesWaterfallHook.tapPromise('AHook', async (person) => ({ name: 'sue', age: person.age + 1 }));
+
+    async function getHookResults() {
+        return {
+            syncHook: hooks.syncHook.call({ name: 'sue', age: 34 }),
+            syncBailHook: hooks.syncBailHook.call({ name: 'sue', age: 34 }),
+            syncWaterfallHook: hooks.syncWaterfallHook.call({ name: 'sue', age: 34 }),
+            syncLoopHook: hooks.syncLoopHook.call({ name: 'sue', age: 34 }),
+            asyncParallelHook: await hooks.asyncParallelHook.promise({ name: 'sue', age: 34 }),
+            asyncParallelBailHook: await hooks.asyncParallelBailHook.promise({ name: 'sue', age: 34 }),
+            asyncSeriesHook: await hooks.asyncSeriesHook.promise({ name: 'sue', age: 34 }),
+            asyncSeriesBailHook: await hooks.asyncSeriesBailHook.promise({ name: 'sue', age: 34 }),
+            asyncSeriesWaterfallHook: await hooks.asyncSeriesWaterfallHook.promise({ name: 'sue', age: 34 }),
+        }
+    }
+
+    getHookResults().then((result) => {
+        // Allways undefined:
+        console.log(isUndefined(result.syncHook));
+        console.log(isUndefined(result.asyncSeriesHook));
+        console.log(isUndefined(result.asyncParallelHook));
+        // Possible undefined:
+        console.log(isNumber(result.syncBailHook!));
+        console.log(isNumber(result.asyncParallelHook!));
+        console.log(isNumber(result.syncBailHook!));
+        console.log(isNumber(result.asyncParallelHook!));
+        console.log(isNumber(result.asyncSeriesHook!));
+        console.log(isNumber(result.asyncSeriesBailHook!));
+        // Allways defined:
+        console.log(isNumber(result.syncWaterfallHook.age));
+        console.log(isNumber(result.asyncSeriesWaterfallHook.age));
+    });
+})();
diff --git a/types/task-graph-runner/index.d.ts b/types/task-graph-runner/index.d.ts
new file mode 100644
index 0000000000..608a928dda
--- /dev/null
+++ b/types/task-graph-runner/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for task-graph-runner 1.0
+// Project: https://github.com/thejameskyle/task-graph-runner#readme
+// Definitions by: Melvin Groenhoff <https://github.com/mgroenhoff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export = taskGraphRunner;
+
+declare function taskGraphRunner<Item, Result>(opts: taskGraphRunner.Opts<Item, Result>): Promise<taskGraphRunner.Results<Item, Result>>;
+
+declare namespace taskGraphRunner {
+    interface Opts<Item, Result> {
+        graph: Map<Item, Item[]>;
+        task: (item: Item) => Result;
+        force?: boolean;
+    }
+
+    interface Results<Item, Result> {
+        values: Map<Item, Result>;
+        safe: boolean;
+    }
+}
diff --git a/types/task-graph-runner/task-graph-runner-tests.ts b/types/task-graph-runner/task-graph-runner-tests.ts
new file mode 100644
index 0000000000..5ed724859b
--- /dev/null
+++ b/types/task-graph-runner/task-graph-runner-tests.ts
@@ -0,0 +1,17 @@
+import taskGraphRunner, { Opts, Results } from 'task-graph-runner';
+
+const graph = new Map([
+    ["task-a", ["task-d"]],
+    ["task-b", ["task-d", "task-a"]],
+    ["task-c", ["task-d"]],
+    ["task-d", []],
+]);
+
+async function task(name: string) {
+    const result = await Promise.resolve(name);
+    return result;
+}
+
+let results = taskGraphRunner({ graph, task });
+
+results = taskGraphRunner({ graph, task, force: true });
diff --git a/types/task-graph-runner/tsconfig.json b/types/task-graph-runner/tsconfig.json
new file mode 100644
index 0000000000..65ad543d5e
--- /dev/null
+++ b/types/task-graph-runner/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "allowSyntheticDefaultImports": true,
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictFunctionTypes": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "task-graph-runner-tests.ts"
+    ]
+}
diff --git a/types/task-graph-runner/tslint.json b/types/task-graph-runner/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/task-graph-runner/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/teddy/index.d.ts b/types/teddy/index.d.ts
new file mode 100644
index 0000000000..5699a25e49
--- /dev/null
+++ b/types/teddy/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for teddy 0.4
+// Project: https://github.com/rooseveltframework/teddy
+// Definitions by: Benjamin Lannon <https://github.com/lannonbr>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+// compiles a template
+export function compile(template: string): string;
+
+// parses a template
+export function render(template: string, model: object): string;
+
+// mutator method to set template root param; must be a string
+export function setTemplateRoot(path: string): void;
+
+// mutator method to set verbosity param. takes human-readable string argument and converts it to an integer for more efficient checks against the setting
+export function setVerbosity(n: number | string): void;
+
+// turn on or off the setting to cache template renders
+export function cacheRenders(b: boolean): void;
+
+// mutator method to set default caches param: the number of cached versions of each templates to store by default if cacheRenders is enabled
+export function setDefaultCaches(n: number): void;
+
+// mutator method to set max caches for a given registered template
+export function setMaxCaches(template: string, n: number): void;
+
+// mutator method to set a whitelist of templates to cache, e.g. { "myTemplate.html": maxCaches} where maxCaches is an integer
+export function setCacheWhitelist(o: object): void;
+
+// mutator method to set a blacklist of templates not to cache as an array
+export function setCacheBlacklist(templateArray: ReadonlyArray<string>): void;
+
+// sets all params to their default values
+export function setDefaultParams(): void;
+
+// invalidates cache of a given template and model combination
+// if no model is supplied, deletes all caches of the given template
+export function flushCache(template: string, model?: object): void;
+
+// mutator method to set max passes param: the number of times the parser can iterate over the template
+export function setMaxPasses(n: number): void;
+
+// turn on or off the setting to compile templates at every render
+export function compileAtEveryRender(b: boolean): void;
+
+// turn on or off the setting to minify templates using teddy's internal minifier
+export function minify(b: boolean): void;
+
+// default values for parameters sent to teddy
+export let params: object;
+
+// compiled templates are stored as object collections, e.g. { "myTemplate.html": "<p>some markup</p>"}
+export let templates: object;
+
+// cache of fully rendered temmplates, e.g. { "myTemplate.html": "<p>some markup</p>"}
+export let renderedTemplates: object;
diff --git a/types/teddy/teddy-tests.ts b/types/teddy/teddy-tests.ts
new file mode 100644
index 0000000000..899b7d94f9
--- /dev/null
+++ b/types/teddy/teddy-tests.ts
@@ -0,0 +1,30 @@
+import * as teddy from "teddy";
+
+teddy.compile("template.html");
+
+const markup = teddy.render("template.html", {});
+
+teddy.setTemplateRoot("~/");
+
+teddy.setVerbosity(3);
+
+teddy.cacheRenders(true);
+
+teddy.setDefaultCaches(2);
+
+teddy.setMaxCaches("template.html", 2);
+
+teddy.setCacheWhitelist({ "template.html": 5 });
+
+teddy.setCacheBlacklist(["template1.html", "template2.html"]);
+
+teddy.setDefaultParams();
+
+teddy.flushCache("template.html");
+teddy.flushCache("template.html", {});
+
+teddy.setMaxPasses(500);
+
+teddy.compileAtEveryRender(true);
+
+teddy.minify(false);
diff --git a/types/teddy/tsconfig.json b/types/teddy/tsconfig.json
new file mode 100644
index 0000000000..3e60a19082
--- /dev/null
+++ b/types/teddy/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", "teddy-tests.ts"]
+}
diff --git a/types/teddy/tslint.json b/types/teddy/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/teddy/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/tedious/index.d.ts b/types/tedious/index.d.ts
index 287e62d187..df6b726d40 100644
--- a/types/tedious/index.d.ts
+++ b/types/tedious/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for tedious 1.8.0
-// Project: https://pekim.github.io/tedious
+// Type definitions for tedious 2.6.2
+// Project: http://tediousjs.github.io/tedious/
 // Definitions by: Rogier Schouten <https://github.com/rogierschouten>
-//                  Chris Thompson <https://github.com/cjthompson>
+//                 Chris Thompson <https://github.com/cjthompson>
+//                 Suraiya Hameed <https://github.com/v-suhame>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 ///<reference types="node" />
@@ -95,31 +96,21 @@ export interface TediousTypes {
     BigInt: TediousType;
     Binary: TediousType;
     Bit: TediousType;
-    BitN: TediousType;
     Char: TediousType;
     Date: TediousType;
-    DateN: TediousType;
     DateTime2: TediousType;
-    DateTime2N: TediousType;
     DateTime: TediousType;
-    DateTimeN: TediousType;
     DateTimeOffset: TediousType;
-    DateTimeOffsetN: TediousType;
     Decimal: TediousType;
-    DecimalN: TediousType;
     Float: TediousType;
-    FloatN: TediousType;
     Image: TediousType;
     Int: TediousType;
-    IntN: TediousType;
     Money: TediousType;
-    MoneyN: TediousType;
     NChar: TediousType;
     NText: TediousType;
     NVarChar: TediousType;
     Null: TediousType;
     Numeric: TediousType;
-    NumericN: TediousType;
     Real: TediousType;
     SmallDateTime: TediousType;
     SmallInt		: TediousType;
@@ -127,11 +118,9 @@ export interface TediousTypes {
     TVP: TediousType;
     Text: TediousType;
     Time: TediousType;
-    TimeN: TediousType;
     TinyInt: TediousType;
     UDT: TediousType;
     UniqueIdentifier: TediousType;
-    UniqueIdentifierN: TediousType;
     VarBinary: TediousType;
     VarChar: TediousType;
     Xml: TediousType;
@@ -158,7 +147,7 @@ export interface ConnectionOptions {
     database?: string;
 
     /**
-     * By default, if the database requestion by options.database cannot be accessed,
+     * By default, if the database requested by options.database cannot be accessed,
      * the connection will fail with an error. However, if options.fallbackToDefaultDb is set to true,
      * then the user's default database will be  * used instead (Default: false).
      */
@@ -197,7 +186,7 @@ export interface ConnectionOptions {
     abortTransactionOnError?: boolean;
 
     /**
-     * A string indicating which network interface (ip addres) to use when connecting to SQL Server.
+     * A string indicating which network interface (ip address) to use when connecting to SQL Server.
      */
     localAddress?: string;
 
@@ -226,7 +215,7 @@ export interface ConnectionOptions {
     debug?: DebugOptions;
 
     /**
-     * The default isolation level that transactions will be run with. (default: READ_COMMITED).
+     * The default isolation level that transactions will be run with. (default: READ_COMMITTED).
      */
     isolationLevel?: ISOLATION_LEVEL;
 
@@ -267,6 +256,96 @@ export interface ConnectionOptions {
      * Take this from tedious.TDS_VERSION.7_4 .
      */
     tdsVersion?: number;
+
+    /**
+     * Application name used for identifying a specific application in profiling, logging or tracing tools of SQL Server. (default: Tedious) 
+     */
+    appName?: string;
+
+    /**
+     * Number of milliseconds before retrying to establish connection, in case of transient failure. (default: 500) 
+     */
+    connectionRetryInterval?: number;
+
+    /**
+     * Number that sets to the first day of the week, it can be a number from 1 through 7.(default: 7, i.e, first day of the week is Sunday)
+     */
+    datefirst?: number;
+
+    /**
+     * A string representing position of month, day and year in temporal datatypes. (default: mdy) 
+     */
+    dateFormat?: string;
+
+    /**
+     * A boolean, controls the way null values should be used during comparison operation. (default: true)  
+     */
+    enableAnsiNull?: boolean;
+
+    /**
+     * If true, SET ANSI_NULL_DFLT_ON ON will be set in the initial sql. This means new columns will be nullable by default. See the T-SQL documentation for more details. (Default: true). 
+     */
+    enableAnsiNullDefault?: boolean;
+
+    /**
+     * A boolean, controls if padding should be applied for values shorter than the size of defined column. (default: true) 
+     */
+    enableAnsiPadding?: boolean;
+
+    /**
+     * If true, SQL Server will follow ISO standard behavior during various error conditions. For details, see documentation. (default: true) 
+     */
+    enableAnsiWarnings?: boolean;
+
+    /**
+     * A boolean, determines if query execution should be terminated during overflow or divide-by-zero error. (default: false)  
+     */
+    enableArithAbort?: boolean;
+
+    /**
+     * A boolean, determines if concatenation with NULL should result in NULL or empty string value, more details in documentation. (default: true) 
+     */
+    enableConcatNullYieldsNull?: boolean;
+
+    /**
+     * A boolean, controls whether cursor should be closed, if the transaction opening it gets committed or rolled back. (default: false) 
+     */
+    enableCursorCloseOnCommit?: boolean;
+
+    /**
+     * A boolean, sets the connection to either implicit or autocommit transaction mode. (default: false) 
+     */
+    enableImplicitTransactions?: boolean;
+
+    /**
+     * If false, error is not generated during loss of precession. (default: false) 
+     */
+    enableNumericRoundabort?: boolean;
+
+    /**
+     * If true, characters enclosed in single quotes are treated as literals and those enclosed double quotes are treated as identifiers. (default: true) 
+     */
+    enableQuotedIdentifier?: boolean;
+
+    /**
+     * A string, sets the language of the session (default: us_english)
+     */
+    language?: string;
+
+    /**
+     * Number of retries on transient error (default: 3)
+     */
+    maxRetriesOnTransientErrors?: number;
+
+    /**
+     * Size of data to be returned by SELECT statement for varchar(max), nvarchar(max), varbinary(max), text, ntext, and image type. (default: 2147483647)
+     */
+    textsize?: number;
+
+    /**
+     * A boolean, that verifies whether server's identity matches it's certificate's names (default: true)
+     */
+    trustServerCertificate?: boolean;
 }
 
 export interface ConnectionConfig {
@@ -313,16 +392,66 @@ export interface ColumnValue {
     value: any;
 }
 
+export interface Request {
+    /**
+     * This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
+     */
+    on(event: 'columnMetadata', listener: (columns: ColumnMetaData[]) => void ):this;
+
+    /**
+     * The request has been prepared and can be used in subsequent calls to execute and unprepare. 
+     */
+    on(event: 'prepared', listener: () => void):this;
+
+    /**
+     * The request encountered an error and has not been prepared. 
+     */
+    on(event: 'error', listener: (err: Error) => void):this;
+    
+    /**
+     * This is the final event emitted by a request. This is emitted after the callback passed in a request is called. 
+     */
+    on(event: 'requestCompleted', listener: () => void):this;
+
+    /**
+     * A row resulting from execution of the SQL statement
+     */
+    on(event: 'row', listener: (columns: ColumnValue[]) => void):this;
+
+    /**
+     * All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
+     */
+    on(event: 'done', listener: (error: Error, more: boolean, rows: any[]) => void):this;
+
+    /**
+     * Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
+     */
+    on(event: 'doneInProc', listener: (error: Error, more: boolean, returnStatus: any, rows: any[]) => void):this;
+
+    /**
+     * Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
+     */
+    on(event: 'doneProc', listener: (error: Error, more: boolean, rows: any[]) => void):this;
+
+    /**
+     * A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
+     */
+    on(event: 'returnValue', listener: (parameterName: string, value: any, metadata: ColumnMetaData ) => void):this;
+}
+
 /**
  * A Request instance represents a request that can be executed on a connection
  * @event  'columnMetadata' This event, describing result set columns, will be emitted before row events are emitted. This event may be emited multiple times when more than one recordset is produced by the statement.
+ * @event  'prepared' The request has been prepared and can be used in subsequent calls to execute and unprepare. 
+ * @event  'error' The request encountered an error and has not been prepared. 
+ * @event  'requestCompleted' This is the final event emitted by a request. This is emitted after the callback passed in a request is called. 
  * @event  'row' A row resulting from execution of the SQL statement
  * @event  'done' All rows from a result set have been provided (through row events). This token is used to indicate the completion of a SQL statement. As multiple SQL statements can be sent to the server in a single SQL batch, multiple done events can be generated. An done event is emited for each SQL statement in the SQL batch except variable declarations. For execution of SQL statements within stored procedures, doneProc and doneInProc events are used in place of done events.
  * @event  'doneInProc' Indicates the completion status of a SQL statement within a stored procedure. All rows from a statement in a stored procedure have been provided (through row events).
  * @event  'doneProc' Indicates the completion status of a stored procedure. This is also generated for stored procedures executed through SQL statements.
  * @event  'returnValue' A value for an output parameter (that was added to the request with addOutputParameter(...)). See also Using Parameters.
  */
-export declare class Request extends events.EventEmitter {
+export class Request extends events.EventEmitter {
 
     /**
      * Constructor
@@ -351,10 +480,20 @@ export declare class Request extends events.EventEmitter {
      * @param options Additional type options. Optional.
      */
     addOutputParameter(name: string, type: TediousType, value?: any, options?: ParameterOptions): void;
+
+    /**
+     * Temporarily suspends the flow of data from the database. No more 'row' events will be emitted until request.resume() is called. 
+     */
+    pause():void;
+
+    /**
+     * Resumes the flow of data from the database. 
+     */
+    resume():void;
 }
 
 export interface BulkLoadColumnOpts extends ParameterOptions {
-    //  indicates whether the column accepts NULL values.
+    //  Indicates whether the column accepts NULL values.
     nullable: boolean;
     //  If the name of the column is different from the name of the property found on rowObj arguments passed to , then you can use this option to specify the property name.
     objName?: string;
@@ -422,6 +561,53 @@ export interface InfoObject {
     lineNumber: number;
 }
 
+export interface Connection {
+    /**
+     * The attempt to connect and validate has completed.
+     */
+    on(event: 'connect', listener: (err: Error) => void ):this;
+
+    /**
+     * The connection has ended. This may be as a result of the client calling close(), the server closing the connection, or a network error.
+     */
+    on(event: 'end', listener: () => void ):this;
+
+    /**
+     * Internal error occurs.
+     */
+    on(event: 'error', listener: (err: Error) => void ):this;
+    
+    /**
+     * A debug message is available. It may be logged or ignored.
+     */
+    on(event: 'debug', listener: (messageText: string) => void ):this;
+    
+    /**
+     * The server has issued an information message.
+     */
+    on(event: 'infoMessage', listener: (info: InfoObject) => void ):this;
+    
+    /**
+     * The server has issued an error message.
+     */
+    on(event: 'errorMessage', listener: (err: Error) => void ):this;
+    
+    /**
+     * The server has reported that the active database has changed. This may be as a result of a successful login, or a use statement.
+     */
+    on(event: 'databaseChange', listener: (databaseName: string) => void ):this;
+    
+    /**
+     * The server has reported that the language has changed.
+     */
+    on(event: 'languageChange', listener: (languageName: string) => void ):this;
+    
+    /**
+     * The server has reported that the charset has changed.
+     */
+    on(event: 'charsetChange', listener: (charset: string) => void ):this;
+}
+
 /**
  * Connection
  * @event  'connect' The attempt to connect and validate has completed.
@@ -435,7 +621,7 @@ export interface InfoObject {
  * @event  'charsetChange' The server has reported that the charset has changed.
  * @event  'secure' A secure connection has been established.
  */
-export declare class Connection extends events.EventEmitter {
+export class Connection extends events.EventEmitter {
 
     constructor(config: ConnectionConfig);
 
diff --git a/types/test-listen/index.d.ts b/types/test-listen/index.d.ts
new file mode 100644
index 0000000000..741ffa0695
--- /dev/null
+++ b/types/test-listen/index.d.ts
@@ -0,0 +1,13 @@
+// Type definitions for test-listen 1.1
+// Project: https://github.com/zeit/test-listen
+// Definitions by: Stephen Mathieson <https://github.com/stephenmathieson>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+/// <reference types="node" />
+
+import { Server } from "net";
+
+declare function testListen(srv: Server, hostname?: string): Promise<string>;
+
+export = testListen;
diff --git a/types/test-listen/test-listen-tests.ts b/types/test-listen/test-listen-tests.ts
new file mode 100644
index 0000000000..c5bc189ee8
--- /dev/null
+++ b/types/test-listen/test-listen-tests.ts
@@ -0,0 +1,25 @@
+import * as http from 'http';
+import testListen = require('test-listen');
+
+const test = async (): Promise<void> => {
+    const server = http.createServer((req: http.IncomingMessage, res: http.ServerResponse): void => {
+        res.write('hello');
+        res.end();
+    });
+
+    const addr = await testListen(server);
+    console.log(addr);
+};
+
+const testWithHostname = async (): Promise<void> => {
+    const server = http.createServer((req: http.IncomingMessage, res: http.ServerResponse): void => {
+        res.write('hello');
+        res.end();
+    });
+
+    const addr = await testListen(server, '127.0.0.1');
+    console.log(addr);
+};
+
+test();
+testWithHostname();
diff --git a/types/test-listen/tsconfig.json b/types/test-listen/tsconfig.json
new file mode 100644
index 0000000000..2a2d45987e
--- /dev/null
+++ b/types/test-listen/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",
+        "test-listen-tests.ts"
+    ]
+}
diff --git a/types/test-listen/tslint.json b/types/test-listen/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/test-listen/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/tether/index.d.ts b/types/tether/index.d.ts
index 20de5d7bf0..69cc2b0ef9 100644
--- a/types/tether/index.d.ts
+++ b/types/tether/index.d.ts
@@ -24,7 +24,7 @@ declare namespace Tether {
     interface ITetherOptions {
         attachment: string;
         bodyElement?: HTMLElement;
-        classes?: {[className: string]: boolean};
+        classes?: {[className: string]: boolean | string};
         classPrefix?: string;
         constraints?: ITetherConstraint[];
         element?: HTMLElement | string | any /* JQuery */;
diff --git a/types/tether/tether-tests.ts b/types/tether/tether-tests.ts
index 5f78bb3b99..0675ed9594 100644
--- a/types/tether/tether-tests.ts
+++ b/types/tether/tether-tests.ts
@@ -9,7 +9,11 @@ new Tether({
     targetAttachment: "top middle",
     targetModifier: "visible",
     offset: "-15px 0",
-    targetOffset: "0 0"
+    targetOffset: "0 0",
+    classes: {
+      'element': false,
+      'target': 'someClassName'
+    }
 });
 
 new Tether({
@@ -50,4 +54,3 @@ new Tether({
         }
     ]
 });
-
diff --git a/types/textract/index.d.ts b/types/textract/index.d.ts
new file mode 100644
index 0000000000..f63a6c762c
--- /dev/null
+++ b/types/textract/index.d.ts
@@ -0,0 +1,189 @@
+// Type definitions for textract 2.4
+// Project: https://github.com/dbashford/textract/
+// Definitions by: Luca Lindhorst <https://github.com/lal12>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+import * as ChildProc from "child_process";
+import { URL } from "url";
+
+export interface extractorExecOpts {
+    exec: { [index: string]: string };
+}
+
+export interface Config {
+    /**
+     * Pass this in as true and textract will not strip any line breaks.
+     * @default false
+     */
+    preserveLineBreaks?: boolean;
+    /**
+     * Some extractors, like PDF, insert line breaks at the end of every line, even if the middle of a sentence.
+     * If this option is set to true, then any instances of a single line break are removed but multiple line breaks are preserved.
+     * Check your output with this option, though, this doesn't preserve paragraphs unless there are multiple breaks.
+     * @default false
+     */
+    preserveOnlyMultipleLineBreaks?: boolean;
+    /**
+     * Some extractors (dxf) use node's exec functionality.
+     * This setting allows for providing config to exec execution.
+     * One reason you might want to provide this config is if you are dealing with very large files.
+     * You might want to increase the exec maxBuffer setting.
+     */
+    exec?: ChildProc.ExecException;
+    /**
+     * Doc extractor options for non OS X.
+     * See `drawingtotext` manual for available options
+     */
+    doc?: extractorExecOpts;
+    /**
+     * DXF extractor options.
+     * See `antiword` manual for available options
+     */
+    dxf?: extractorExecOpts;
+    /**
+     * Images (png, jpg, gif) extractor options.
+     * See `tesseract` manual for available options
+     */
+    images?: extractorExecOpts;
+    /**
+     * RTF extractor options.
+     * See `unrtf` manual for available options
+     */
+    rtf?: extractorExecOpts;
+    tesseract?: {
+        /**
+         *  A pass-through to tesseract allowing for setting of language for extraction.
+         */
+        lang: string,
+    } | {
+        /**
+         * `tesseract.lang` allows a quick means to provide the most popular tesseract option,
+         * but if you need to configure more options, you can simply pass `cmd`.
+         * `cmd` is the string that matches the command-line options you want to pass to tesseract.
+         * For instance, to provide language and psm,
+         * you would pass `{ tesseract: { cmd:"-l chi_sim -psm 10" } }`
+         */
+        cmd: string
+    };
+    /**
+     * This is a proxy options object to the library textract uses for pdf extraction: pdf-text-extract.
+     * Options include ownerPassword, userPassword if you are extracting text from password protected PDFs.
+     * IMPORTANT: textract modifies the pdf-text-extract layout default so that, instead of layout: layout, it uses layout:raw.
+     * It is not suggested you modify this without understanding what trouble that might get you in.
+     * See [this GH issue](https://github.com/dbashford/textract/issues/75) for why textract overrides that library's default.
+     */
+    pdftotextOptions?: {
+        firstPage?: number,
+        lastPage?: number,
+        resolution?: number,
+        crop?: {
+            x: number, y: number, w: number, h: number
+        },
+        /**
+         * Do not change unless you know what you are doing!
+         * @default "raw"
+         */
+        layout?: "layout" | "raw" | "htmlmeta",
+        /**
+         * @default "UTF-8"
+         */
+        encoding?: "UCS-2" | "ASCII7" | "Latin1" | "UTF-8" | "ZapfDingbats" | "Symbol";
+        eol?: "unix" | "dos" | "mac",
+        ownerPassword?: string,
+        userPassword?: string,
+        /**
+         * @default true
+         */
+        splitPages?: boolean
+    };
+    /**
+     * When extracting HTML, whether or not to include `alt` text with the extracted text.
+     * @default false
+     */
+    includeAltText?: boolean;
+}
+
+export interface URLConfig extends Config {
+    /**
+     * Used with fromUrl, if set, rather than using the content-type from the URL request, will use the provided typeOverride.
+     */
+    typeOverride?: string;
+}
+
+/**
+ * Get text from file by path
+ * @param filePath path to file
+ * @param callback callback
+ */
+export function fromFileWithPath(filePath: string, callback: (error: Error, text: string) => void): void;
+/**
+ * Get text from file by path
+ * @param filePath path to file
+ * @param config configuration object
+ * @param callback callback
+ */
+export function fromFileWithPath(filePath: string, config: Config, callback: (error: Error, text: string) => void): void;
+
+/**
+ * Get text from file by path
+ * @param mimeType mime type of file
+ * @param filePath path to file
+ * @param callback callback
+ */
+export function fromFileWithMimeAndPath(mimeType: string, filePath: string, callback: (error: Error, text: string) => void): void;
+/**
+ * Get text from file by path
+ * @param mimeType mime type of file
+ * @param filePath path to file
+ * @param config configuration object
+ * @param callback callback
+ */
+export function fromFileWithMimeAndPath(mimeType: string, filePath: string, config: Config, callback: (error: Error, text: string) => void): void;
+
+/**
+ * Get text from file buffer
+ * @param mimeType mime type of file
+ * @param buffer path to file
+ * @param callback callback
+ */
+export function fromBufferWithMime(mimeType: string, buffer: Buffer, callback: (error: Error, text: string) => void): void;
+/**
+ * Get text from file buffer
+ * @param mimeType mime type of file
+ * @param buffer path to file
+ * @param config configuration object
+ * @param callback callback
+ */
+export function fromBufferWithMime(mimeType: string, buffer: Buffer, config: Config, callback: (error: Error, text: string) => void): void;
+
+/**
+ * Get text from file buffer
+ * @param name file name or path
+ * @param buffer buffer with file content
+ * @param callback callback
+ */
+export function fromBufferWithName(name: string, buffer: Buffer, callback: (error: Error, text: string) => void): void;
+/**
+ * Get text from file buffer
+ * @param name file name or path
+ * @param buffer buffer with file content
+ * @param config configuration object
+ * @param callback callback
+ */
+export function fromBufferWithName(name: string, buffer: Buffer, config: Config, callback: (error: Error, text: string) => void): void;
+
+/**
+ * Get text from url
+ * @param url url as string or object
+ * @param callback callback
+ */
+export function fromUrl(url: string | URL, callback: (error: Error, text: string) => void): void;
+/**
+ * Get text from url
+ * @param url url as string or object
+ * @param config configuration object
+ * @param callback callback
+ */
+export function fromUrl(url: string | URL, config: URLConfig, callback: (error: Error, text: string) => void): void;
diff --git a/types/textract/textract-tests.ts b/types/textract/textract-tests.ts
new file mode 100644
index 0000000000..4e342d0ec2
--- /dev/null
+++ b/types/textract/textract-tests.ts
@@ -0,0 +1,43 @@
+import * as Textract from "textract";
+
+Textract.fromBufferWithMime("", Buffer.alloc(0), (err, text) => { });
+Textract.fromBufferWithMime("", Buffer.alloc(0), {}, (err, text) => { });
+
+Textract.fromBufferWithName("", Buffer.alloc(0), (err, text) => { });
+Textract.fromBufferWithName("", Buffer.alloc(0), {}, (err, text) => { });
+
+Textract.fromFileWithMimeAndPath("", "", (err, text) => { });
+Textract.fromFileWithMimeAndPath("", "", {}, (err, text) => { });
+
+Textract.fromFileWithPath("", (err, text) => { });
+Textract.fromFileWithPath("", {}, (err, text) => { });
+
+Textract.fromUrl("", (err, text) => { });
+Textract.fromUrl("", {}, (err, text) => { });
+
+const testConf: Textract.Config = {
+    doc: { exec: {} },
+    dxf: { exec: {} },
+    rtf: { exec: {} },
+    images: { exec: {} },
+    exec: {} as any,
+    includeAltText: true,
+    pdftotextOptions: {
+        crop: { x: 0, y: 0, h: 0, w: 0 },
+        encoding: "ASCII7",
+        eol: "dos",
+        firstPage: 1,
+        lastPage: 3,
+        ownerPassword: "",
+        resolution: 300,
+        splitPages: true,
+        userPassword: "",
+    },
+    preserveLineBreaks: true,
+    preserveOnlyMultipleLineBreaks: true,
+    tesseract: { cmd: "-lang de" },
+};
+
+const testConf2: Textract.Config = {
+    tesseract: { lang: "de" }
+};
diff --git a/types/textract/tsconfig.json b/types/textract/tsconfig.json
new file mode 100644
index 0000000000..63912ad00b
--- /dev/null
+++ b/types/textract/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",
+        "textract-tests.ts"
+    ]
+}
diff --git a/types/textract/tslint.json b/types/textract/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/textract/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/textversionjs/index.d.ts b/types/textversionjs/index.d.ts
new file mode 100644
index 0000000000..4ce8ab29dc
--- /dev/null
+++ b/types/textversionjs/index.d.ts
@@ -0,0 +1,29 @@
+// Type definitions for textversionjs 1.1
+// Project: https://github.com/EDMdesigner/textversionjs
+// Definitions by: Aaron Osher <https://github.com/aaronosher>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/* =================== USAGE ===================
+    import * as textVersion from "textversionjs";
+ =============================================== */
+
+declare function textversionjs(html: string, styleConfig?: textversionjs.styleConfig): string;
+
+declare namespace textversionjs {
+    type linkProcess = (href: string, linkText: string) => string;
+
+    type imgProcess = (src: string, alt: string) => string;
+
+    interface styleConfig {
+        linkProcess?: linkProcess;
+        imgProcess?: imgProcess;
+        headingStyle?: 'underline' | 'linebreak' |  'hashify';
+        listStyle?: 'indentation' | 'linebreak';
+        uIndentionChar?: string;
+        oIndentionChar?: string;
+        listIndentionTabs?: number;
+        keepNbsps?: boolean;
+    }
+}
+
+export = textversionjs;
diff --git a/types/textversionjs/textversionjs-tests.ts b/types/textversionjs/textversionjs-tests.ts
new file mode 100644
index 0000000000..942a180cf0
--- /dev/null
+++ b/types/textversionjs/textversionjs-tests.ts
@@ -0,0 +1,13 @@
+import textVersion = require('textversionjs');
+
+// $ExpectType string
+textVersion("<h1>Hello World</h1><p>Hello World</p>");
+/*
+=>
+    Hello World
+    ===========
+    Hello World
+*/
+
+// $ExpectError
+textVersion(1);
diff --git a/types/textversionjs/tsconfig.json b/types/textversionjs/tsconfig.json
new file mode 100644
index 0000000000..b87121d3ed
--- /dev/null
+++ b/types/textversionjs/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",
+        "textversionjs-tests.ts"
+    ]
+}
diff --git a/types/textversionjs/tslint.json b/types/textversionjs/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/textversionjs/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/tgfancy/index.d.ts b/types/tgfancy/index.d.ts
index a12936e0da..8ff315ee32 100644
--- a/types/tgfancy/index.d.ts
+++ b/types/tgfancy/index.d.ts
@@ -62,15 +62,15 @@ declare namespace Tgfancy {
 declare class Tgfancy extends TelegramBot {
     constructor(token: string, options?: Tgfancy.ConstructorOptions);
 
-    resolveChatId(chatId: string): Promise<Tgfancy.ResolvedChat | Error>;
+    resolveChatId(chatId: string): Promise<Tgfancy.ResolvedChat>;
 
-    openWebSocket(): Promise<undefined | Error>;
+    openWebSocket(): Promise<undefined>;
 
-    closeWebSocket(): Promise<undefined | Error>;
+    closeWebSocket(): Promise<undefined>;
 
     hasOpenWebSocket(): boolean;
 
-    kickChatMember(chatId: number | string, userId: number | string, ban?: boolean): Promise<boolean | Error>;
+    kickChatMember(chatId: number | string, userId: number | string, ban?: boolean): Promise<boolean>;
 }
 
 export = Tgfancy;
diff --git a/types/theming/index.d.ts b/types/theming/index.d.ts
new file mode 100644
index 0000000000..e2525b3ce6
--- /dev/null
+++ b/types/theming/index.d.ts
@@ -0,0 +1,59 @@
+// Type definitions for theming 1.3
+// Project: https://github.com/iamstarkov/theming#readme
+// Definitions by: Sebastian Silbermann <https://github.com/eps1lon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+import * as React from "react";
+
+export type Channel = string;
+export type Theme = object | ((outerTheme: object) => object);
+
+export const channel: "__THEMING__";
+
+/**
+ * Returns a component with an already passed Theme listening on the default channel
+ */
+export function withTheme<P>(
+  component: React.ComponentType<P & { theme: Theme }>
+): React.ComponentType<Pick<P, Exclude<keyof P, "theme">>>;
+
+export interface ThemeProviderProps {
+  theme: Theme;
+  children?: React.ReactElement<any>;
+}
+/**
+ * Provide a theme to an entire react component listening on the default channel
+ */
+export class ThemeProvider extends React.Component<ThemeProviderProps> {}
+
+export type SubscriptionId = number;
+export interface Broadcast<T extends Theme> {
+  getState(): T;
+  subscribe(callback: () => void): SubscriptionId;
+  unsubscribe(id: SubscriptionId): void;
+}
+export type ContextWithTheme<C extends string> = Record<C, Broadcast<Theme>>;
+export interface ThemeListener<C extends string> {
+  initial(context: ContextWithTheme<C>): Theme;
+  subscribe(
+    context: ContextWithTheme<C>,
+    callback: (theme: Theme) => void
+  ): SubscriptionId;
+  unsubscribe(context: ContextWithTheme<C>, id: SubscriptionId): void;
+  contextTypes: React.ValidationMap<C>;
+}
+/**
+ * ThemeListener for the default channel
+ */
+export const themeListener: ThemeListener<typeof channel>;
+
+export interface Theming<C extends string> {
+  channel: C;
+  withTheme: typeof withTheme;
+  ThemeProvider: ThemeProvider;
+  themeListener: ThemeListener<C>;
+}
+/**
+ * creates a new Theming on the given channel
+ */
+export function createTheming<C extends string>(customChannel?: C): Theming<C>;
diff --git a/types/theming/theming-tests.tsx b/types/theming/theming-tests.tsx
new file mode 100644
index 0000000000..18d24923bf
--- /dev/null
+++ b/types/theming/theming-tests.tsx
@@ -0,0 +1,79 @@
+import * as React from "react";
+import {
+  channel,
+  ContextWithTheme,
+  Theme,
+  themeListener,
+  ThemeProvider,
+  withTheme
+} from "theming";
+
+// Typings currently accept non-plain-objects while they get rejected at runtime.
+// There exists currently no typing for plain objects.
+const runtimeErrorTheme: Theme = [];
+
+const customTheme = {
+  color: {
+    primary: "red",
+    secondary: "blue"
+  }
+};
+type CustomTheme = typeof customTheme;
+
+interface DemoBoxProps {
+  text: string;
+  theme: CustomTheme;
+}
+const DemoBox = ({ text, theme }: DemoBoxProps) => {
+  return <div style={{ color: theme.color.primary }}>{text}</div>;
+};
+const ThemedDemoBox = withTheme(DemoBox);
+const renderDemoBox = () => <ThemedDemoBox text="Hello, World!" />;
+
+const App = () => {
+  return (
+    <ThemeProvider theme={customTheme}>
+      <ThemedDemoBox text="Theme provided" />
+    </ThemeProvider>
+  );
+};
+
+const AugmentedApp = () => {
+  return (
+    <ThemeProvider theme={customTheme}>
+      <ThemeProvider theme={outerTheme => ({ ...outerTheme, augmented: true })}>
+        <ThemedDemoBox text="Theme provided" />
+      </ThemeProvider>
+    </ThemeProvider>
+  );
+};
+
+function customWithTheme<P>(
+  // tslint:disable-next-line: no-unnecessary-generics
+  Component: React.ComponentType<P & { theme: object }>
+) {
+  return class CustomWithTheme extends React.Component<P, { theme: object }> {
+    static contextTypes = themeListener.contextTypes;
+
+    setTheme = (theme: object) => this.setState({ theme });
+    subscription: number | undefined;
+
+    constructor(props: P, context: ContextWithTheme<typeof channel>) {
+      super(props, context);
+      this.state = { theme: themeListener.initial(context) };
+    }
+    componentDidMount() {
+      this.subscription = themeListener.subscribe(this.context, this.setTheme);
+    }
+    componentWillUnmount() {
+      const { subscription } = this;
+      if (subscription != null) {
+        themeListener.unsubscribe(this.context, subscription);
+      }
+    }
+    render() {
+      const { theme } = this.state;
+      return <Component theme={theme} {...this.props} />;
+    }
+  };
+}
diff --git a/types/theming/tsconfig.json b/types/theming/tsconfig.json
new file mode 100644
index 0000000000..35fe4e7ffd
--- /dev/null
+++ b/types/theming/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "jsx": "react",
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "theming-tests.tsx"
+    ]
+}
diff --git a/types/theming/tslint.json b/types/theming/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/theming/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/thepiratebay/index.d.ts b/types/thepiratebay/index.d.ts
new file mode 100644
index 0000000000..20a1cc8945
--- /dev/null
+++ b/types/thepiratebay/index.d.ts
@@ -0,0 +1,69 @@
+// Type definitions for thepiratebay 1.4
+// Project: http://github.com/t3chnoboy/thepiratebay
+// Definitions by: Jack Sorrell <https://github.com/jsorrell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function search(query?: string, options?: SearchOptions): Promise<TorrentSearchResult[]>;
+export function getTorrent(id: string | number | { link: string; [propName: string]: any; }): Promise<TorrentDetails>;
+export function getComments(id: string | number): Promise<Comment[]>;
+export function topTorrents(category?: number): Promise<TorrentSearchResult[]>;
+export function recentTorrents(): Promise<TorrentSearchResult[]>;
+export function userTorrents(user: string, options?: SearchOptions): Promise<TorrentSearchResult[]>;
+export function getTvShow(id: string | number): Promise<TVSeason[]>;
+export function getCategories(): Promise<CategoryGroup[]>;
+
+export interface SearchOptions {
+	category?: string | number;
+	filter?: { verified?: boolean };
+	page?: number;
+	orderBy?: string;
+	sortBy?: string;
+}
+
+export interface Category {
+	id: string;
+	name: string;
+}
+
+export interface CategoryGroup extends Category {
+	subcategories: Category[];
+}
+
+export interface Torrent {
+	id: string;
+	name: string;
+	size: string;
+	link: string;
+	seeders: string;
+	leechers: string;
+	uploadDate: string;
+	magnetLink: string;
+	uploader: string;
+	uploaderLink: string;
+}
+
+export interface TorrentDetails extends Torrent {
+	description: string;
+}
+
+export interface TorrentSearchResult extends Torrent {
+	category: Category;
+	subcategory: Category;
+	verified: boolean;
+}
+
+export interface Comment {
+	user: string;
+	comment: string;
+}
+
+export interface TVTorrent {
+	id: string;
+	title: string;
+	link: string;
+}
+
+export interface TVSeason {
+	title: string;
+	torrents: TVTorrent[];
+}
diff --git a/types/thepiratebay/thepiratebay-tests.ts b/types/thepiratebay/thepiratebay-tests.ts
new file mode 100644
index 0000000000..76c56eb269
--- /dev/null
+++ b/types/thepiratebay/thepiratebay-tests.ts
@@ -0,0 +1,104 @@
+import * as PirateBay from 'thepiratebay';
+
+// $ExpectType Promise<TorrentSearchResult[]>
+const searchResultPromise = PirateBay.search('Game of Thrones', {
+	category: 'all',
+	filter: {
+		verified: false
+	},
+	page: 0,
+	orderBy: 'leeches',
+	sortBy: 'desc'
+});
+searchResultPromise.then((res: PirateBay.TorrentSearchResult[]) => {
+	res[0].id; // $ExpectType string
+	res[0].name; // $ExpectType string
+	res[0].size; // $ExpectType string
+	res[0].link; // $ExpectType string
+	res[0].seeders; // $ExpectType string
+	res[0].leechers; // $ExpectType string
+	res[0].uploadDate; // $ExpectType string
+	res[0].magnetLink; // $ExpectType string
+	res[0].uploader; // $ExpectType string
+	res[0].uploaderLink; // $ExpectType string
+
+	const category = res[0].category; // $ExpectType Category
+	category.id; // $ExpectType string
+	category.name; // $ExpectType string
+
+	res[0].subcategory; // $ExpectType Category
+	res[0].verified; // $ExpectType boolean
+});
+// $ExpectError
+PirateBay.search(15);
+
+// $ExpectType Promise<TorrentDetails>
+const torrentPromise = PirateBay.getTorrent('15496322');
+torrentPromise.then((torrent: PirateBay.TorrentDetails) => {
+	torrent.id; // $ExpectType string
+	torrent.name; // $ExpectType string
+	torrent.size; // $ExpectType string
+	torrent.link; // $ExpectType string
+	torrent.seeders; // $ExpectType string
+	torrent.leechers; // $ExpectType string
+	torrent.uploadDate; // $ExpectType string
+	torrent.magnetLink; // $ExpectType string
+	torrent.uploader; // $ExpectType string
+	torrent.uploaderLink; // $ExpectType string
+	torrent.description; // $ExpectType string
+});
+// $ExpectType Promise<TorrentDetails>
+PirateBay.getTorrent(15496322);
+// $ExpectError
+PirateBay.getTorrent(false);
+// $ExpectType Promise<TorrentDetails>
+PirateBay.getTorrent('https://thepiratebay.org/torrent/15496322/Ubuntu_16.04.1_LTS_Desktop_64-bit');
+// $ExpectType Promise<TorrentDetails>
+PirateBay.getTorrent({ name: "ubuntu", link: 'https://thepiratebay.org/torrent/15496322/Ubuntu_16.04.1_LTS_Desktop_64-bit' });
+
+// $ExpectType Promise<TorrentSearchResult[]>
+PirateBay.topTorrents();
+// $ExpectError
+PirateBay.topTorrents(true);
+// $ExpectType Promise<TorrentSearchResult[]>
+PirateBay.topTorrents(400);
+
+// $ExpectType Promise<TorrentSearchResult[]>
+PirateBay.recentTorrents();
+// $ExpectError
+PirateBay.recentTorrents(10);
+
+// $ExpectError
+PirateBay.userTorrents();
+// $ExpectType Promise<TorrentSearchResult[]>
+PirateBay.userTorrents('alice', {
+	page: 3,
+	orderBy: 'name',
+	sortBy: 'asc'
+});
+// $ExpectType Promise<TorrentSearchResult[]>
+PirateBay.userTorrents('bob');
+
+// $ExpectType Promise<CategoryGroup[]>
+const categoryGroup = PirateBay.getCategories();
+categoryGroup.then((groups: PirateBay.CategoryGroup[]) => {
+	groups[0].id; // $ExpectType string
+	groups[0].name; // $ExpectType string
+	groups[0].subcategories; // $ExpectType Category[]
+});
+// $ExpectError
+PirateBay.getCategories(154);
+
+// $ExpectError
+PirateBay.getTvShow();
+// $ExpectType Promise<TVSeason[]>
+const tvShow = PirateBay.getTvShow(15);
+tvShow.then((seasons: PirateBay.TVSeason[]) => {
+	seasons[0].title; // $ExpectType string
+	const torrents = seasons[0].torrents; // $ExpectType TVTorrent[]
+	torrents[0].id; // $ExpectType string
+	torrents[0].title; // $ExpectType string
+	torrents[0].link; // $ExpectType string
+});
+// $ExpectType Promise<TVSeason[]>
+PirateBay.getTvShow('15');
diff --git a/types/thepiratebay/tsconfig.json b/types/thepiratebay/tsconfig.json
new file mode 100644
index 0000000000..1d491e4d75
--- /dev/null
+++ b/types/thepiratebay/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",
+		"thepiratebay-tests.ts"
+	]
+}
diff --git a/types/thepiratebay/tslint.json b/types/thepiratebay/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/thepiratebay/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/three/index.d.ts b/types/three/index.d.ts
index cc26a82225..5b4a156e4b 100644
--- a/types/three/index.d.ts
+++ b/types/three/index.d.ts
@@ -17,7 +17,9 @@
 //                 Daniel Hritzkiv <https://github.com/dhritzkiv>,
 //                 Apurva Ojas <https://github.com/apurvaojas>,
 //                 Tiger Oakes <https://github.com/NotWoods>,
-//                 Seth Kingsley <https://github.com/sethk>
+//                 Seth Kingsley <https://github.com/sethk>,
+//                 Ethan Kay <https://github.com/elk941>,
+//                 Methuselah96 <https://github.com/Methuselah96>
 // Definitions: https://github.com//DefinitelyTyped
 
 export * from "./three-core";
@@ -28,11 +30,14 @@ export * from "./three-copyshader";
 export * from "./three-css3drenderer";
 export * from "./three-ctmloader";
 export * from "./three-ddsloader";
+export * from './three-dragcontrols';
 export * from "./three-editorcontrols";
 export * from "./three-effectcomposer";
 export * from "./three-examples";
 export * from "./three-fbxloader";
 export * from "./three-FirstPersonControls";
+export * from "./three-gltfexporter";
+export * from "./three-lensflare";
 export * from "./three-maskpass";
 export * from "./three-mtlloader";
 export * from "./three-objloader";
@@ -44,10 +49,12 @@ export * from "./three-projector";
 export * from "./three-renderpass";
 export * from "./three-shaderpass";
 export * from "./three-smaapass";
+export * from "./three-ssaapass";
 export * from "./three-filmpass";
 export * from "./three-tgaloader";
 export * from "./three-trackballcontrols";
 export * from "./three-transformcontrols";
+export * from "./three-unrealbloompass";
 export * from "./three-vrcontrols";
 export * from "./three-vreffect";
 
diff --git a/types/three/test/canvas/canvas_materials.ts b/types/three/test/canvas/canvas_materials.ts
index 9af83aff5d..dd0ebbf601 100644
--- a/types/three/test/canvas/canvas_materials.ts
+++ b/types/three/test/canvas/canvas_materials.ts
@@ -45,7 +45,9 @@
 
         var geometry2 = new THREE.SphereGeometry(100, 14, 7);
 
-        var materials: THREE.Material[] = [
+        type MeshMaterial = THREE.MeshBasicMaterial | THREE.MeshFaceMaterial | THREE.MeshLambertMaterial | THREE.MeshDepthMaterial | THREE.MeshNormalMaterial;
+
+        var materials: MeshMaterial[] = [
 
             new THREE.MeshBasicMaterial({ color: 0x00ffff, wireframe: true, side: THREE.DoubleSide }),
             new THREE.MeshBasicMaterial({ color: 0xff0000, blending: THREE.AdditiveBlending }),
@@ -199,4 +201,4 @@
 
     }
 
-}
\ No newline at end of file
+}
diff --git a/types/three/test/webgl/webgl_lensflares.ts b/types/three/test/webgl/webgl_lensflares.ts
index 1d42762571..e07329e539 100644
--- a/types/three/test/webgl/webgl_lensflares.ts
+++ b/types/three/test/webgl/webgl_lensflares.ts
@@ -99,18 +99,11 @@
             var flareColor = new THREE.Color(0xffffff);
             flareColor.setHSL(h, s, l + 0.5);
 
-            var lensFlare = new THREE.LensFlare(textureFlare0, 700, 0.0, THREE.AdditiveBlending, flareColor);
+            var lensFlare = new THREE.LensFlare();
 
-            lensFlare.add(textureFlare2, 512, 0.0, THREE.AdditiveBlending);
-            lensFlare.add(textureFlare2, 512, 0.0, THREE.AdditiveBlending);
-            lensFlare.add(textureFlare2, 512, 0.0, THREE.AdditiveBlending);
+            lensFlare.addElement(new THREE.LensFlareElement(textureFlare2, 512, 0.0));
+            lensFlare.addElement(new THREE.LensFlareElement(textureFlare3, 512, 0.0));
 
-            lensFlare.add(textureFlare3, 60, 0.6, THREE.AdditiveBlending);
-            lensFlare.add(textureFlare3, 70, 0.7, THREE.AdditiveBlending);
-            lensFlare.add(textureFlare3, 120, 0.9, THREE.AdditiveBlending);
-            lensFlare.add(textureFlare3, 70, 1.0, THREE.AdditiveBlending);
-
-            lensFlare.customUpdateCallback = lensFlareUpdateCallback;
             lensFlare.position.copy(light.position);
 
             scene.add(lensFlare);
@@ -143,32 +136,6 @@
 
     //
 
-    function lensFlareUpdateCallback(object: THREE.LensFlare) {
-
-        var f: number, fl = object.lensFlares.length;
-        var flare: THREE.LensFlareProperty;
-        var vecX = -object.positionScreen.x * 2;
-        var vecY = -object.positionScreen.y * 2;
-
-
-        for (f = 0; f < fl; f++) {
-
-            flare = object.lensFlares[f];
-
-            flare.x = object.positionScreen.x + vecX * flare.distance;
-            flare.y = object.positionScreen.y + vecY * flare.distance;
-
-            flare.rotation = 0;
-
-        }
-
-        object.lensFlares[2].y += 0.025;
-        object.lensFlares[3].rotation = object.positionScreen.x * 0.5 + THREE.Math.degToRad(45);
-
-    }
-
-    //
-
     function onWindowResize(event: Event) {
 
         renderer.setSize(window.innerWidth, window.innerHeight);
diff --git a/types/three/test/webvr/webvr.ts b/types/three/test/webvr/webvr.ts
index e831e493ee..dfc8576f59 100644
--- a/types/three/test/webvr/webvr.ts
+++ b/types/three/test/webvr/webvr.ts
@@ -10,4 +10,10 @@
     const obj = new THREE.Object3D();
     renderer.vr.setPoseTarget(obj);
     renderer.vr.dispose();
+    
+    const scene = new THREE.Scene();
+    const render = function() {
+        renderer.render(scene, camera);
+    }
+    renderer.animate(render);
 }
diff --git a/types/three/three-core.d.ts b/types/three/three-core.d.ts
old mode 100644
new mode 100755
index 4a07a2318c..e62638c151
--- a/types/three/three-core.d.ts
+++ b/types/three/three-core.d.ts
@@ -451,13 +451,21 @@ export class Camera extends Object3D {
      */
     projectionMatrix: Matrix4;
 
+    isCamera: true;
+
+    copy(source: this, recursive?: boolean): this;
+
     getWorldDirection(target: Vector3): Vector3;
 
+    updateMatrixWorld(force: boolean): void;
+
 }
 
 export class CubeCamera extends Object3D {
     constructor(near?: number, far?: number, cubeResolution?: number);
 
+    type: "CubeCamera";
+
     renderTarget: WebGLRenderTargetCube;
 
     /**
@@ -465,7 +473,7 @@ export class CubeCamera extends Object3D {
      */
     updateCubeMap(renderer: Renderer, scene: Scene): void;
 
-    update(renderer: Renderer, scene: Scene): void;
+    update(renderer: WebGLRenderer, scene: Scene): void;
 }
 
 /**
@@ -488,8 +496,13 @@ export class OrthographicCamera extends Camera {
      */
     constructor(left: number, right: number, top: number, bottom: number, near?: number, far?: number);
 
+    type: "OrthographicCamera";
+
+    isOrthographicCamera: true;
+
     zoom: number;
-    view: {
+    view: null | {
+        enabled: boolean,
         fullWidth: number,
         fullHeight: number,
         offsetX: number,
@@ -555,6 +568,10 @@ export class PerspectiveCamera extends Camera {
      */
     constructor(fov?: number, aspect?: number, near?: number, far?: number);
 
+    type: "PerspectiveCamera";
+
+    isPerspectiveCamera: true;
+
     zoom: number;
 
     /**
@@ -578,7 +595,8 @@ export class PerspectiveCamera extends Camera {
     far: number;
 
     focus: number;
-    view: {
+    view: null | {
+        enabled: boolean,
         fullWidth: number,
         fullHeight: number,
         offsetX: number,
@@ -594,6 +612,7 @@ export class PerspectiveCamera extends Camera {
     getEffectiveFOV(): number;
     getFilmWidth(): number;
     getFilmHeight(): number;
+
     /**
      * Sets an offset in a larger frustum. This is useful for multi-window or multi-monitor/multi-machine setups.
      * For example, if you have 3x2 monitors and each monitor is 1920x1080 and the monitors are in grid like this:
@@ -649,6 +668,8 @@ export class PerspectiveCamera extends Camera {
 export class StereoCamera extends Camera {
     constructor();
 
+    type: "StereoCamera";
+
     aspect: number;
     eyeSep: number;
     cameraL: PerspectiveCamera;
@@ -838,7 +859,9 @@ export class BufferGeometry extends EventDispatcher {
     name: string;
     type: string;
     index: BufferAttribute;
-    attributes: BufferAttribute|InterleavedBufferAttribute[];
+    attributes: {
+      [name: string]: BufferAttribute|InterleavedBufferAttribute;
+    };
     morphAttributes: any;
     groups: {start: number, count: number, materialIndex?: number}[];
     boundingBox: Box3;
@@ -1068,6 +1091,7 @@ export class DirectGeometry extends EventDispatcher {
  * @source src/core/EventDispatcher.js
  */
 export class EventDispatcher {
+
     /**
      * Creates eventDispatcher object. It needs to be call with '.call' to add the functionality to an object.
      */
@@ -1423,6 +1447,15 @@ export class Geometry extends EventDispatcher {
     dispatchEvent(event: { type: string; [attachment: string]: any; }): void;
 }
 
+/**
+ * @see <a href="https://github.com/mrdoob/three.js/blob/master/examples/js/BufferGeometryUtils.js">examples/js/BufferGeometryUtils.js</a>
+ */
+export namespace BufferGeometryUtils {
+    export function mergeBufferGeometries(geometries: BufferGeometry[]): BufferGeometry;
+    export function computeTangents(geometry: BufferGeometry): null;
+    export function mergeBufferAttributes(attributes: BufferAttribute[]): BufferAttribute;
+}
+
 /**
  * @deprecated
  */
@@ -1550,7 +1583,7 @@ export class Object3D extends EventDispatcher {
     /**
      * Object's parent in the scene graph.
      */
-    parent: Object3D;
+    parent: Object3D | null;
 
     /**
      * Array with object's children.
@@ -1632,13 +1665,13 @@ export class Object3D extends EventDispatcher {
     /**
      * An object that can be used to store custom data about the Object3d. It should not hold references to functions as these will not be cloned.
      */
-    userData: any;
+    userData: {[key: string]: any};
 
     /**
      * Used to check whether this or derived classes are Object3Ds. Default is true.
      * You should not change this, as it is used internally for optimisation.
      */
-    isObject3D: boolean;
+    isObject3D: true;
 
     /**
      * Calls before rendering object
@@ -1652,9 +1685,7 @@ export class Object3D extends EventDispatcher {
     onAfterRender: (renderer: WebGLRenderer, scene: Scene, camera: Camera, geometry: Geometry | BufferGeometry,
                     material: Material, group: Group) => void;
 
-    /**
-     *
-     */
+
     static DefaultUp: Vector3;
     static DefaultMatrixAutoUpdate: boolean;
 
@@ -1663,6 +1694,8 @@ export class Object3D extends EventDispatcher {
      */
     applyMatrix(matrix: Matrix4): void;
 
+    applyQuaternion(quaternion: Quaternion): this;
+
     /**
      *
      */
@@ -1688,56 +1721,56 @@ export class Object3D extends EventDispatcher {
      * @param axis  A normalized vector in object space.
      * @param angle  The angle in radians.
      */
-    rotateOnAxis(axis: Vector3, angle: number): Object3D;
+    rotateOnAxis(axis: Vector3, angle: number): this;
 
     /**
      * Rotate an object along an axis in world space. The axis is assumed to be normalized. Method Assumes no rotated parent.
      * @param axis  A normalized vector in object space.
      * @param angle  The angle in radians.
      */
-    rotateOnWorldAxis(axis: Vector3, angle: number): Object3D;
+    rotateOnWorldAxis(axis: Vector3, angle: number): this;
 
     /**
      *
      * @param angle
      */
-    rotateX(angle: number): Object3D;
+    rotateX(angle: number): this;
 
     /**
      *
      * @param angle
      */
-    rotateY(angle: number): Object3D;
+    rotateY(angle: number): this;
 
     /**
      *
      * @param angle
      */
-    rotateZ(angle: number): Object3D;
+    rotateZ(angle: number): this;
 
     /**
      * @param axis  A normalized vector in object space.
      * @param distance  The distance to translate.
      */
-    translateOnAxis(axis: Vector3, distance: number): Object3D;
+    translateOnAxis(axis: Vector3, distance: number): this;
 
     /**
      * Translates object along x axis by distance.
      * @param distance Distance.
      */
-    translateX(distance: number): Object3D;
+    translateX(distance: number): this;
 
     /**
      * Translates object along y axis by distance.
      * @param distance Distance.
      */
-    translateY(distance: number): Object3D;
+    translateY(distance: number): this;
 
     /**
      * Translates object along z axis by distance.
      * @param distance Distance.
      */
-    translateZ(distance: number): Object3D;
+    translateZ(distance: number): this;
 
     /**
      * Updates the vector from local space to world space.
@@ -1755,39 +1788,38 @@ export class Object3D extends EventDispatcher {
      * Rotates object to face point in space.
      * @param vector A world vector to look at.
      */
-    lookAt(vector: Vector3): void;
-    lookAt(x: number, y: number, z: number): void;
+    lookAt(vector: Vector3 | number, y?: number, z?: number): void;
 
     /**
      * Adds object as child of this object.
      */
-    add(...object: Object3D[]): void;
+    add(...object: Object3D[]): this;
 
     /**
      * Removes object as child of this object.
      */
-    remove(...object: Object3D[]): void;
+    remove(...object: Object3D[]): this;
 
     /**
-     * Searches through the object's children and returns the first with a matching id, optionally recursive.
+     * Searches through the object's children and returns the first with a matching id.
      * @param id  Unique number of the object instance
      */
-    getObjectById(id: number): Object3D;
+    getObjectById(id: number): Object3D | undefined;
 
     /**
-     * Searches through the object's children and returns the first with a matching name, optionally recursive.
+     * Searches through the object's children and returns the first with a matching name.
      * @param name  String to match to the children's Object3d.name property.
      */
-    getObjectByName(name: string): Object3D;
+    getObjectByName(name: string): Object3D | undefined;
 
-    getObjectByProperty( name: string, value: string ): Object3D;
+    getObjectByProperty( name: string, value: string ): Object3D | undefined;
 
     getWorldPosition(target: Vector3): Vector3;
     getWorldQuaternion(target: Quaternion): Quaternion;
     getWorldScale(target: Vector3): Vector3;
     getWorldDirection(target: Vector3): Vector3;
 
-    raycast(raycaster: Raycaster, intersects: any): void;
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
 
     traverse(callback: (object: Object3D) => any): void;
 
@@ -1819,11 +1851,11 @@ export class Object3D extends EventDispatcher {
 
 export interface Intersection {
     distance: number;
-    distanceToRay: number;
+    distanceToRay?: number;
     point: Vector3;
-    index: number;
-    face: Face3;
-    faceIndex: number;
+    index?: number;
+    face?: Face3 | null;
+    faceIndex?: number;
     object: Object3D;
 }
 
@@ -1841,43 +1873,43 @@ export class Raycaster {
      * @param origin The origin vector where the ray casts from.
      * @param direction The direction vector that gives direction to the ray. Should be normalized.
      * @param near All results returned are further away than near. Near can't be negative. Default value is 0.
-     * @param far All results returned are closer then far. Far can't be lower then near . Default value is Infinity. 
+     * @param far All results returned are closer then far. Far can't be lower then near . Default value is Infinity.
      */
     constructor(origin?: Vector3, direction?: Vector3, near?: number, far?: number);
 
     /** The Ray used for the raycasting. */
     ray: Ray;
-    
+
     /**
-     * The near factor of the raycaster. This value indicates which objects can be discarded based on the 
-     * distance. This value shouldn't be negative and should be smaller than the far property. 
+     * The near factor of the raycaster. This value indicates which objects can be discarded based on the
+     * distance. This value shouldn't be negative and should be smaller than the far property.
      */
     near: number;
-    
+
     /**
-     * The far factor of the raycaster. This value indicates which objects can be discarded based on the 
-     * distance. This value shouldn't be negative and should be larger than the near property. 
+     * The far factor of the raycaster. This value indicates which objects can be discarded based on the
+     * distance. This value shouldn't be negative and should be larger than the near property.
      */
     far: number;
-    
+
     params: RaycasterParameters;
 
     /**
-     * The precision factor of the raycaster when intersecting Line objects. 
+     * The precision factor of the raycaster when intersecting Line objects.
      */
     linePrecision: number;
 
     /**
-     * Updates the ray with a new origin and direction. 
+     * Updates the ray with a new origin and direction.
      * @param origin The origin vector where the ray casts from.
-     * @param direction The normalized direction vector that gives direction to the ray. 
+     * @param direction The normalized direction vector that gives direction to the ray.
      */
     set(origin: Vector3, direction: Vector3): void;
 
     /**
-     * Updates the ray with a new origin and direction. 
+     * Updates the ray with a new origin and direction.
      * @param coords 2D coordinates of the mouse, in normalized device coordinates (NDC)---X and Y components should be between -1 and 1.
-     * @param camera camera from which the ray should originate 
+     * @param camera camera from which the ray should originate
      */
     setFromCamera(coords: { x: number; y: number; }, camera: Camera ): void;
 
@@ -1885,15 +1917,15 @@ export class Raycaster {
      * Checks all intersection between the ray and the object with or without the descendants. Intersections are returned sorted by distance, closest first.
      * @param object The object to check for intersection with the ray.
      * @param recursive If true, it also checks all descendants. Otherwise it only checks intersecton with the object. Default is false.
-     * @param optionalTarget (optional) target to set the result. Otherwise a new Array is instantiated. If set, you must clear this array prior to each call (i.e., array.length = 0;). 
+     * @param optionalTarget (optional) target to set the result. Otherwise a new Array is instantiated. If set, you must clear this array prior to each call (i.e., array.length = 0;).
      */
     intersectObject(object: Object3D, recursive?: boolean, optionalTarget?: Intersection[]): Intersection[];
 
     /**
-     * Checks all intersection between the ray and the objects with or without the descendants. Intersections are returned sorted by distance, closest first. Intersections are of the same form as those returned by .intersectObject. 
+     * Checks all intersection between the ray and the objects with or without the descendants. Intersections are returned sorted by distance, closest first. Intersections are of the same form as those returned by .intersectObject.
      * @param objects The objects to check for intersection with the ray.
      * @param recursive If true, it also checks all descendants of the objects. Otherwise it only checks intersecton with the objects. Default is false.
-     * @param optionalTarget (optional) target to set the result. Otherwise a new Array is instantiated. If set, you must clear this array prior to each call (i.e., array.length = 0;). 
+     * @param optionalTarget (optional) target to set the result. Otherwise a new Array is instantiated. If set, you must clear this array prior to each call (i.e., array.length = 0;).
      */
     intersectObjects(objects: Object3D[], recursive?: boolean, optionalTarget?: Intersection[]): Intersection[];
 }
@@ -2279,8 +2311,21 @@ export class LoadingManager {
      */
     onError: (url: string) => void;
 
+    /**
+     * If provided, the callback will be passed each resource URL before a request is sent.
+     * The callback may return the original URL, or a new URL to override loading behavior.
+     * This behavior can be used to load assets from .ZIP files, drag-and-drop APIs, and Data URIs.
+     * @param callback URL modifier callback. Called with url argument, and must return resolvedURL.
+     */
     setURLModifier(callback?: (url: string) => string): void;
 
+    /**
+     * Given a URL, uses the URL modifier callback (if any) and returns a resolved URL.
+     * If no URL modifier is set, returns the original URL.
+     * @param url the url to load
+     */
+    resolveURL(url: string): string;
+
     itemStart(url: string): void;
     itemEnd(url: string): void;
     itemError(url: string): void;
@@ -2770,6 +2815,7 @@ export class MeshDepthMaterial extends Material {
 
     wireframe: boolean;
     wireframeLinewidth: number;
+    depthPacking: DepthPackingStrategies;
 
     setValues(parameters: MeshDepthMaterialParameters): void;
 }
@@ -3627,6 +3673,17 @@ export namespace Math {
 
     export function isPowerOfTwo(value: number): boolean;
 
+	/**
+     * Returns a value linearly interpolated from two known points based
+     * on the given interval - t = 0 will return x and t = 1 will return y.
+     *
+     * @param x Start point.
+     * @param y End point.
+     * @param t interpolation factor in the closed interval [0, 1]
+     * @return {number}
+     */
+    export function lerp (x: number, y: number, t: number): number;
+
     /**
      * @deprecated Use {@link Math#floorPowerOfTwo .floorPowerOfTwo()}
      */
@@ -4259,49 +4316,62 @@ export class Triangle {
  * v.addVectors(new THREE.Vector2(0, 1), new THREE.Vector2(2, 3));    // invalid but compiled successfully
  */
 export interface Vector {
-    setComponent(index: number, value: number): void;
+    setComponent(index: number, value: number): this;
 
     getComponent(index: number): number;
 
+    set(...args: number[]): this;
+
+    setScalar(scalar: number): this;
+
     /**
      * copy(v:T):T;
      */
-    copy(v: this): this;
+    copy(v: Vector): this;
 
     /**
+     * NOTE: The second argument is deprecated.
+     *
      * add(v:T):T;
      */
-    add(v: Vector): Vector;
+    add(v: Vector, w?: Vector): this;
 
     /**
      * addVectors(a:T, b:T):T;
      */
-    addVectors(a: Vector, b: Vector): Vector;
+    addVectors(a: Vector, b: Vector): this;
+
+    addScaledVector(vector: Vector, scale: number): this;
+
+    /**
+     * Adds the scalar value s to this vector's values.
+     */
+    addScalar(scalar: number): this;
 
     /**
      * sub(v:T):T;
      */
-    sub(v: Vector): Vector;
+    sub(v: Vector): this;
 
     /**
      * subVectors(a:T, b:T):T;
      */
-    subVectors(a: Vector, b: Vector): Vector;
+    subVectors(a: Vector, b: Vector): this;
 
     /**
      * multiplyScalar(s:number):T;
      */
-    multiplyScalar(s: number): Vector;
+    multiplyScalar(s: number): this;
 
     /**
      * divideScalar(s:number):T;
      */
-    divideScalar(s: number): Vector;
+    divideScalar(s: number): this;
 
     /**
      * negate():T;
      */
-    negate(): Vector;
+    negate(): this;
 
     /**
      * dot(v:T):T;
@@ -4321,7 +4391,7 @@ export interface Vector {
     /**
      * normalize():T;
      */
-    normalize(): Vector;
+    normalize(): this;
 
     /**
      * NOTE: Vector4 doesn't have the property.
@@ -4340,12 +4410,12 @@ export interface Vector {
     /**
      * setLength(l:number):T;
      */
-    setLength(l: number): Vector;
+    setLength(l: number): this;
 
     /**
      * lerp(v:T, alpha:number):T;
      */
-    lerp(v: Vector, alpha: number): Vector;
+    lerp(v: Vector, alpha: number): this;
 
     /**
      * equals(v:T):boolean;
@@ -4355,7 +4425,7 @@ export interface Vector {
     /**
      * clone():T;
      */
-    clone(): this;
+    clone(): Vector;
 }
 
 /**
@@ -4370,40 +4440,43 @@ export class Vector2 implements Vector {
     y: number;
     width: number;
     height: number;
+    isVector2: true;
 
     /**
      * Sets value of this vector.
      */
-    set(x: number, y: number): Vector2;
+    set(x: number, y: number): this;
 
     /**
      * Sets the x and y values of this vector both equal to scalar.
      */
-    setScalar(scalar: number): Vector2;
+    setScalar(scalar: number): this;
 
     /**
      * Sets X component of this vector.
      */
-    setX(x: number): Vector2;
+    setX(x: number): this;
 
     /**
      * Sets Y component of this vector.
      */
-    setY(y: number): Vector2;
+    setY(y: number): this;
 
     /**
      * Sets a component of this vector.
      */
-    setComponent(index: number, value: number): void;
+    setComponent(index: number, value: number): this;
+
     /**
      * Gets a component of this vector.
      */
     getComponent(index: number): number;
 
     /**
-     * Clones this vector.
+     * Returns a new Vector2 instance with the same `x` and `y` values.
      */
-    clone(): this;
+    clone(): Vector2;
+
     /**
      * Copies value of v to this vector.
      */
@@ -4412,65 +4485,73 @@ export class Vector2 implements Vector {
     /**
      * Adds v to this vector.
      */
-    add(v: Vector2): Vector2;
+    add(v: Vector2, w?: Vector2): this;
+
     /**
      * Adds the scalar value s to this vector's x and y values.
      */
-    addScalar(s: number): Vector2;
+    addScalar(s: number): this;
+
     /**
      * Sets this vector to a + b.
      */
-    addVectors(a: Vector2, b: Vector2): Vector2;
+    addVectors(a: Vector2, b: Vector2): this;
+
     /**
      * Adds the multiple of v and s to this vector.
      */
-    addScaledVector(v: Vector2, s: number): Vector2;
+    addScaledVector(v: Vector2, s: number): this;
 
     /**
      * Subtracts v from this vector.
     */
-    sub(v: Vector2): Vector2;
+    sub(v: Vector2): this;
+
     /**
      * Subtracts s from this vector's x and y components.
      */
-    subScalar(s: number): Vector2;
+    subScalar(s: number): this;
+
     /**
      * Sets this vector to a - b.
      */
-    subVectors(a: Vector2, b: Vector2): Vector2;
+    subVectors(a: Vector2, b: Vector2): this;
 
     /**
      * Multiplies this vector by v.
      */
-    multiply(v: Vector2): Vector2;
+    multiply(v: Vector2): this;
+
     /**
      * Multiplies this vector by scalar s.
      */
-    multiplyScalar(scalar: number): Vector2;
+    multiplyScalar(scalar: number): this;
 
     /**
      * Divides this vector by v.
      */
-    divide(v: Vector2): Vector2;
+    divide(v: Vector2): this;
+
     /**
      * Divides this vector by scalar s.
      * Set vector to ( 0, 0 ) if s == 0.
      */
-    divideScalar(s: number): Vector2;
+    divideScalar(s: number): this;
 
     /**
      * Multiplies this vector (with an implicit 1 as the 3rd component) by m.
      */
-    applyMatrix3(m: Matrix3): Vector2;
+    applyMatrix3(m: Matrix3): this;
 
     /**
      * If this vector's x or y value is greater than v's x or y value, replace that value with the corresponding min value.
      */
-    min(v: Vector2): Vector2;
+    min(v: Vector2): this;
+
     /**
      * If this vector's x or y value is less than v's x or y value, replace that value with the corresponding max value.
      */
-    max(v: Vector2): Vector2;
+    max(v: Vector2): this;
 
     /**
      * If this vector's x or y value is greater than the max vector's x or y value, it is replaced by the corresponding value.
@@ -4478,43 +4559,48 @@ export class Vector2 implements Vector {
      * @param min the minimum x and y values.
      * @param max the maximum x and y values in the desired range.
      */
-    clamp(min: Vector2, max: Vector2): Vector2;
+    clamp(min: Vector2, max: Vector2): this;
+
     /**
      * If this vector's x or y values are greater than the max value, they are replaced by the max value.
      * If this vector's x or y values are less than the min value, they are replaced by the min value.
      * @param min the minimum value the components will be clamped to.
      * @param max the maximum value the components will be clamped to.
      */
-    clampScalar(min: number, max: number): Vector2;
+    clampScalar(min: number, max: number): this;
+
     /**
      * If this vector's length is greater than the max value, it is replaced by the max value.
      * If this vector's length is less than the min value, it is replaced by the min value.
      * @param min the minimum value the length will be clamped to.
      * @param max the maximum value the length will be clamped to.
      */
-    clampLength(min: number, max: number): Vector2;
+    clampLength(min: number, max: number): this;
 
     /**
      * The components of the vector are rounded down to the nearest integer value.
      */
-    floor(): Vector2;
+    floor(): this;
+
     /**
      * The x and y components of the vector are rounded up to the nearest integer value.
      */
-    ceil(): Vector2;
+    ceil(): this;
+
     /**
      * The components of the vector are rounded to the nearest integer value.
      */
-    round(): Vector2;
+    round(): this;
+
     /**
      * The components of the vector are rounded towards zero (up if negative, down if positive) to an integer value.
      */
-    roundToZero(): Vector2;
+    roundToZero(): this;
 
     /**
      * Inverts this vector.
      */
-    negate(): Vector2;
+    negate(): this;
 
     /**
      * Computes dot product of this vector and v.
@@ -4536,10 +4622,19 @@ export class Vector2 implements Vector {
      */
     lengthManhattan(): number;
 
+    /**
+     * Computes the Manhattan length of this vector.
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanLength(): number;
+
     /**
      * Normalizes this vector.
      */
-    normalize(): Vector2;
+    normalize(): this;
 
     /**
      * computes the angle in radians with respect to the positive x-axis
@@ -4550,33 +4645,47 @@ export class Vector2 implements Vector {
      * Computes distance of this vector to v.
      */
     distanceTo(v: Vector2): number;
+
     /**
      * Computes squared distance of this vector to v.
      */
     distanceToSquared(v: Vector2): number;
+
     /**
      * @deprecated Use {@link Vector2#manhattanDistanceTo .manhattanDistanceTo()} instead.
      */
     distanceToManhattan(v: Vector2): number;
 
+    /**
+     * Computes the Manhattan length (distance) from this vector to the given vector v
+     *
+     * @param {Vector2} v
+     *
+     * @return {number}
+     *
+     * @see {@link http://en.wikipedia.org/wiki/Taxicab_geometry|Wikipedia: Taxicab Geometry}
+     */
+    manhattanDistanceTo(v: Vector2): number;
+
     /**
      * Normalizes this vector and multiplies it by l.
      */
-    setLength(length: number): Vector2;
+    setLength(length: number): this;
 
     /**
      * Linearly interpolates between this vector and v, where alpha is the distance along the line - alpha = 0 will be this vector, and alpha = 1 will be v.
      * @param v vector to interpolate towards.
      * @param alpha interpolation factor in the closed interval [0, 1].
      */
-    lerp(v: Vector2, alpha: number): Vector2;
+    lerp(v: Vector2, alpha: number): this;
+
     /**
      * Sets this vector to be the vector linearly interpolated between v1 and v2 where alpha is the distance along the line connecting the two vectors - alpha = 0 will be v1, and alpha = 1 will be v2.
      * @param v1 the starting vector.
      * @param v2 vector to interpolate towards.
      * @param alpha interpolation factor in the closed interval [0, 1].
      */
-    lerpVectors(v1: Vector2, v2: Vector2, alpha: number): Vector2;
+    lerpVectors(v1: Vector2, v2: Vector2, alpha: number): this;
 
     /**
      * Checks for strict equality of this vector and v.
@@ -4588,7 +4697,8 @@ export class Vector2 implements Vector {
      * @param array the source array.
      * @param offset (optional) offset into the array. Default is 0.
      */
-    fromArray(array: number[], offset?: number): Vector2;
+    fromArray(array: number[], offset?: number): this;
+
     /**
      * Returns an array [x, y], or copies x and y into the provided array.
      * @param array (optional) array to store the vector to. If this is not provided, a new array will be created.
@@ -4601,14 +4711,14 @@ export class Vector2 implements Vector {
      * @param attribute the source attribute.
      * @param index index in the attribute.
      */
-    fromBufferAttribute(attribute: BufferAttribute, index: number): Vector2;
+    fromBufferAttribute(attribute: BufferAttribute, index: number): this;
 
     /**
      * Rotates the vector around center by angle radians.
      * @param center the point around which to rotate.
      * @param angle the angle to rotate, in radians.
      */
-    rotateAround(center: Vector2, angle: number): Vector2;
+    rotateAround(center: Vector2, angle: number): this;
 
     /**
      * Computes the Manhattan length of this vector.
@@ -4650,16 +4760,17 @@ export class Vector3 implements Vector {
     x: number;
     y: number;
     z: number;
+    isVector3: true;
 
     /**
      * Sets value of this vector.
      */
-    set(x: number, y: number, z: number): Vector3;
+    set(x: number, y: number, z: number): this;
 
     /**
      * Sets all values of this vector.
      */
-    setScalar(scalar: number): Vector3;
+    setScalar(scalar: number): this;
 
     /**
      * Sets x value of this vector.
@@ -4676,76 +4787,102 @@ export class Vector3 implements Vector {
      */
     setZ(z: number): Vector3;
 
-    setComponent(index: number, value: number): void;
+    setComponent(index: number, value: number): this;
+
     getComponent(index: number): number;
+
     /**
      * Clones this vector.
      */
-    clone(): this;
+    clone(): Vector3;
+
     /**
      * Copies value of v to this vector.
      */
-    copy(v: this): this;
+    copy(v: Vector3): this;
 
     /**
      * Adds v to this vector.
      */
-    add(a: Vector3): Vector3;
-    addScalar(s: number): Vector3;
-    addScaledVector(v: Vector3, s: number): Vector3;
+    add(a: Vector3, b?: Vector3): this;
+
+    addScalar(s: number): this;
+
+    addScaledVector(v: Vector3, s: number): this;
 
     /**
      * Sets this vector to a + b.
      */
-    addVectors(a: Vector3, b: Vector3): Vector3;
+    addVectors(a: Vector3, b: Vector3): this;
 
     /**
      * Subtracts v from this vector.
      */
-    sub(a: Vector3): Vector3;
+    sub(a: Vector3): this;
 
-    subScalar( s: number ): Vector3;
+    subScalar( s: number ): this;
 
     /**
      * Sets this vector to a - b.
      */
-    subVectors(a: Vector3, b: Vector3): Vector3;
+    subVectors(a: Vector3, b: Vector3): this;
+
+    multiply(v: Vector3): this;
 
-    multiply(v: Vector3): Vector3;
     /**
      * Multiplies this vector by scalar s.
      */
-    multiplyScalar(s: number): Vector3;
-    multiplyVectors(a: Vector3, b: Vector3): Vector3;
-    applyEuler(euler: Euler): Vector3;
-    applyAxisAngle(axis: Vector3, angle: number): Vector3;
-    applyMatrix3(m: Matrix3): Vector3;
-    applyMatrix4(m: Matrix4): Vector3;
-    applyQuaternion(q: Quaternion): Vector3;
-    project(camrea: Camera): Vector3;
-    unproject(camera: Camera): Vector3;
-    transformDirection(m: Matrix4): Vector3;
-    divide(v: Vector3): Vector3;
+    multiplyScalar(s: number): this;
+
+    multiplyVectors(a: Vector3, b: Vector3): this;
+
+    applyEuler(euler: Euler): this;
+
+    applyAxisAngle(axis: Vector3, angle: number): this;
+
+    applyMatrix3(m: Matrix3): this;
+
+    applyMatrix4(m: Matrix4): this;
+
+    applyQuaternion(q: Quaternion): this;
+
+    project(camrea: Camera): this;
+
+    unproject(camera: Camera): this;
+
+    transformDirection(m: Matrix4): this;
+
+    divide(v: Vector3): this;
+
 
     /**
      * Divides this vector by scalar s.
      * Set vector to ( 0, 0, 0 ) if s == 0.
      */
-    divideScalar(s: number): Vector3;
-    min(v: Vector3): Vector3;
-    max(v: Vector3): Vector3;
-    clamp(min: Vector3, max: Vector3): Vector3;
-    clampScalar(min: number, max: number): Vector3;
-    clampLength(min: number, max: number): Vector3;
-    floor(): Vector3;
-    ceil(): Vector3;
-    round(): Vector3;
-    roundToZero(): Vector3;
+    divideScalar(s: number): this;
+
+    min(v: Vector3): this;
+
+    max(v: Vector3): this;
+
+    clamp(min: Vector3, max: Vector3): this;
+
+    clampScalar(min: number, max: number): this;
+
+    clampLength(min: number, max: number): this;
+
+    floor(): this;
+
+    ceil(): this;
+
+    round(): this;
+
+    roundToZero(): this;
 
     /**
      * Inverts this vector.
      */
-    negate(): Vector3;
+    negate(): this;
 
     /**
      * Computes dot product of this vector and v.
@@ -4793,28 +4930,28 @@ export class Vector3 implements Vector {
     /**
      * Normalizes this vector.
      */
-    normalize(): Vector3;
+    normalize(): this;
 
     /**
      * Normalizes this vector and multiplies it by l.
      */
-    setLength(l: number): Vector3;
-    lerp(v: Vector3, alpha: number): Vector3;
+    setLength(l: number): this;
+    lerp(v: Vector3, alpha: number): this;
 
-    lerpVectors(v1: Vector3, v2: Vector3, alpha: number): Vector3;
+    lerpVectors(v1: Vector3, v2: Vector3, alpha: number): this;
 
     /**
      * Sets this vector to cross product of itself and v.
      */
-    cross(a: Vector3): Vector3;
+    cross(a: Vector3, w?: Vector3): this;
 
     /**
      * Sets this vector to cross product of a and b.
      */
-    crossVectors(a: Vector3, b: Vector3): Vector3;
-    projectOnVector(v: Vector3): Vector3;
-    projectOnPlane(planeNormal: Vector3): Vector3;
-    reflect(vector: Vector3): Vector3;
+    crossVectors(a: Vector3, b: Vector3): this;
+    projectOnVector(v: Vector3): this;
+    projectOnPlane(planeNormal: Vector3): this;
+    reflect(vector: Vector3): this;
     angleTo(v: Vector3): number;
 
     /**
@@ -4832,10 +4969,11 @@ export class Vector3 implements Vector {
      */
     distanceToManhattan(v: Vector3): number;
 
-    setFromSpherical(s: Spherical): Vector3;
-    setFromMatrixPosition(m: Matrix4): Vector3;
-    setFromMatrixScale(m: Matrix4): Vector3;
-    setFromMatrixColumn(matrix: Matrix4, index: number): Vector3;
+    setFromSpherical(s: Spherical): this;
+    setFromCylindrical(s: Cylindrical): this;
+    setFromMatrixPosition(m: Matrix4): this;
+    setFromMatrixScale(m: Matrix4): this;
+    setFromMatrixColumn(matrix: Matrix4, index: number): this;
 
     /**
      * Checks for strict equality of this vector and v.
@@ -4844,22 +4982,7 @@ export class Vector3 implements Vector {
 
     fromArray(xyz: number[], offset?: number): Vector3;
     toArray(xyz?: number[], offset?: number): number[];
-    fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector3;
-
-    /**
-     * @deprecated Use {@link Vector3#setFromMatrixPosition .setFromMatrixPosition()} instead.
-     */
-    getPositionFromMatrix(m: Matrix4): Vector3;
-
-    /**
-     * @deprecated Use {@link Vector3#setFromMatrixScale .setFromMatrixScale()} instead.
-     */
-    getScaleFromMatrix(m: Matrix4): Vector3;
-
-    /**
-     * @deprecated Use {@link Vector3#setFromMatrixColumn .setFromMatrixColumn()} instead.
-     */
-    getColumnFromMatrix(index: number, matrix: Matrix4): Vector3;
+    fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): this;
 }
 
 /**
@@ -4879,43 +5002,47 @@ export class Vector4 implements Vector {
     y: number;
     z: number;
     w: number;
+    isVector4: true;
 
     /**
      * Sets value of this vector.
      */
-    set(x: number, y: number, z: number, w: number): Vector4;
+    set(x: number, y: number, z: number, w: number): this;
 
     /**
      * Sets all values of this vector.
      */
-    setScalar(scalar: number): Vector4;
+    setScalar(scalar: number): this;
 
     /**
      * Sets X component of this vector.
      */
-    setX(x: number): Vector4;
+    setX(x: number): this;
 
     /**
      * Sets Y component of this vector.
      */
-    setY(y: number): Vector4;
+    setY(y: number): this;
 
     /**
      * Sets Z component of this vector.
      */
-    setZ(z: number): Vector4;
+    setZ(z: number): this;
 
     /**
      * Sets w component of this vector.
      */
-    setW(w: number): Vector4;
+    setW(w: number): this;
+
+    setComponent(index: number, value: number): this;
 
-    setComponent(index: number, value: number): void;
     getComponent(index: number): number;
+
     /**
      * Clones this vector.
      */
-    clone(): this;
+    clone(): Vector4;
+
     /**
      * Copies value of v to this vector.
      */
@@ -4924,63 +5051,66 @@ export class Vector4 implements Vector {
     /**
      * Adds v to this vector.
      */
-    add(v: Vector4): Vector4;
-    addScalar(s: number): Vector4;
+    add(v: Vector4, w?: Vector4): this;
+
+    addScalar(scalar: number): this;
 
     /**
      * Sets this vector to a + b.
      */
-    addVectors(a: Vector4, b: Vector4): Vector4;
-    addScaledVector( v: Vector4, s: number ): Vector4;
+    addVectors(a: Vector4, b: Vector4): this;
+
+    addScaledVector( v: Vector4, s: number ): this;
     /**
      * Subtracts v from this vector.
      */
-    sub(v: Vector4): Vector4;
+    sub(v: Vector4): this;
 
-    subScalar(s: number): Vector4;
+    subScalar(s: number): this;
 
     /**
      * Sets this vector to a - b.
      */
-    subVectors(a: Vector4, b: Vector4): Vector4;
+    subVectors(a: Vector4, b: Vector4): this;
 
     /**
      * Multiplies this vector by scalar s.
      */
-    multiplyScalar(s: number): Vector4;
-    applyMatrix4(m: Matrix4): Vector4;
+    multiplyScalar(s: number): this;
+
+    applyMatrix4(m: Matrix4): this;
 
     /**
      * Divides this vector by scalar s.
      * Set vector to ( 0, 0, 0 ) if s == 0.
      */
-    divideScalar(s: number): Vector4;
+    divideScalar(s: number): this;
 
     /**
      * http://www.euclideanspace.com/maths/geometry/rotations/conversions/quaternionToAngle/index.htm
      * @param q is assumed to be normalized
      */
-    setAxisAngleFromQuaternion(q: Quaternion): Vector4;
+    setAxisAngleFromQuaternion(q: Quaternion): this;
 
     /**
      * http://www.euclideanspace.com/maths/geometry/rotations/conversions/matrixToAngle/index.htm
      * @param m assumes the upper 3x3 of m is a pure rotation matrix (i.e, unscaled)
      */
-    setAxisAngleFromRotationMatrix(m: Matrix3): Vector4;
+    setAxisAngleFromRotationMatrix(m: Matrix3): this;
 
-    min(v: Vector4): Vector4;
-    max(v: Vector4): Vector4;
-    clamp(min: Vector4, max: Vector4): Vector4;
-    clampScalar(min: number, max: number): Vector4;
-    floor(): Vector4;
-    ceil(): Vector4;
-    round(): Vector4;
-    roundToZero(): Vector4;
+    min(v: Vector4): this;
+    max(v: Vector4): this;
+    clamp(min: Vector4, max: Vector4): this;
+    clampScalar(min: number, max: number): this;
+    floor(): this;
+    ceil(): this;
+    round(): this;
+    roundToZero(): this;
 
     /**
      * Inverts this vector.
      */
-    negate(): Vector4;
+    negate(): this;
 
     /**
      * Computes dot product of this vector and v.
@@ -4997,11 +5127,6 @@ export class Vector4 implements Vector {
      */
     length(): number;
 
-    /**
-     * @deprecated Use {@link Vector4#manhattanLength .manhattanLength()} instead.
-     */
-    lengthManhattan(): number;
-
     /**
      * Computes the Manhattan length of this vector.
      *
@@ -5014,29 +5139,29 @@ export class Vector4 implements Vector {
     /**
      * Normalizes this vector.
      */
-    normalize(): Vector4;
+    normalize(): this;
     /**
      * Normalizes this vector and multiplies it by l.
      */
-    setLength(length: number): Vector4;
+    setLength(length: number): this;
 
     /**
      * Linearly interpolate between this vector and v with alpha factor.
      */
-    lerp(v: Vector4, alpha: number): Vector4;
+    lerp(v: Vector4, alpha: number): this;
 
-    lerpVectors(v1: Vector4, v2: Vector4, alpha: number): Vector4;
+    lerpVectors(v1: Vector4, v2: Vector4, alpha: number): this;
 
     /**
      * Checks for strict equality of this vector and v.
      */
     equals(v: Vector4): boolean;
 
-    fromArray(xyzw: number[], offset?: number): Vector4;
+    fromArray(xyzw: number[], offset?: number): this;
 
     toArray(xyzw?: number[], offset?: number): number[];
 
-    fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): Vector4;
+    fromBufferAttribute( attribute: BufferAttribute, index: number, offset?: number): this;
 }
 
 export abstract class Interpolant {
@@ -5078,20 +5203,26 @@ export class QuaternionLinearInterpolant extends Interpolant {
 
 export class Bone extends Object3D {
     constructor();
+    isBone: true;
+    type: "Bone";
 }
 
 export class Group extends Object3D {
     constructor();
+    type: "Group";
+    isGroup: true;
 }
 
 export class LOD extends Object3D {
     constructor();
 
-    levels: any[];
+    type: "LOD";
+
+    levels: {distance: number, object: Object3D}[];
 
     addLevel(object: Object3D, distance?: number): void;
     getObjectForDistance(distance: number): Object3D;
-    raycast(raycaster: Raycaster, intersects: any): void;
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
     update(camera: Camera): void;
     toJSON(meta: any): any;
 
@@ -5101,44 +5232,32 @@ export class LOD extends Object3D {
     objects: any[];
 }
 
-export interface LensFlareProperty {
-    texture: Texture;             // Texture
-    size: number;             // size in pixels (-1 = use texture.width)
-    distance: number;             // distance (0-1) from light source (0=at light source)
-    x: number;
-    y: number;
-    z: number;            // screen position (-1 =>  1) z = 0 is ontop z = 1 is back
-    scale: number;             // scale
-    rotation: number;             // rotation
-    opacity: number;            // opacity
-    color: Color;                // color
-    blending: Blending;
-}
 
-export class LensFlare extends Object3D {
-    constructor(texture?: Texture, size?: number, distance?: number, blending?: Blending, color?: Color);
-
-    lensFlares: LensFlareProperty[];
-    positionScreen: Vector3;
-    customUpdateCallback: (object: LensFlare) => void;
-
-    add(object: Object3D): void;
-    add(texture: Texture, size?: number, distance?: number, blending?: Blending, color?: Color): void;
-    updateLensFlares(): void;
-}
+/**
+ * An intermediate material type that casts more precisely the possible materials assignable to a [[Line]] object.
+ *
+ * [[LineDashedMaterial]] is omitted as it extends [[LineBasicMaterial]].
+ *
+ * // Todo:
+ * // - can [[Line]] take in an array of materials ?
+ */
+export type LineMaterialType = LineBasicMaterial | ShaderMaterial | MeshDepthMaterial;
 
 export class Line extends Object3D {
     constructor(
         geometry?: Geometry | BufferGeometry,
-        material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial,
+        material?: LineMaterialType | LineMaterialType[],
         mode?: number
     );
 
     geometry: Geometry|BufferGeometry;
-    material: Material; // LineDashedMaterial or LineBasicMaterial or ShaderMaterial
+    material: LineBasicMaterial | LineDashedMaterial | ShaderMaterial;
+
+    type: "Line";
+    isLine: true;
 
     computeLineDistances(): this;
-    raycast(raycaster: Raycaster, intersects: any): void;
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
 }
 
 /**
@@ -5153,27 +5272,43 @@ export const LinePieces: number;
 export class LineSegments extends Line {
     constructor(
         geometry?: Geometry | BufferGeometry,
-        material?: LineDashedMaterial | LineBasicMaterial | ShaderMaterial | (LineDashedMaterial | LineBasicMaterial | ShaderMaterial)[],
+        material?: LineMaterialType | LineMaterialType[],
         mode?: number
     );
 }
 
+/**
+ * An intermediate material type that casts more precisely the possible materials assignable to a [[Mesh]] object.
+ *
+ * `MeshToonMaterial` and [[MeshPhysicalMaterial]] are omitted as they extend [[MeshPhongMaterial]] and [[MeshStandardMaterial]] respectively.
+ */
+export type MeshMaterialType = MeshBasicMaterial | MeshDepthMaterial | MeshFaceMaterial | MeshLambertMaterial | MeshNormalMaterial | MeshPhongMaterial | MeshStandardMaterial | ShaderMaterial | ShadowMaterial;
+
 export class Mesh extends Object3D {
-    constructor(geometry?: Geometry | BufferGeometry, material?: Material | Material[]);
+    constructor(geometry?: Geometry | BufferGeometry, material?: MeshMaterialType | MeshMaterialType[]);
 
     geometry: Geometry|BufferGeometry;
-    material: Material | Material[];
+    material: MeshMaterialType | MeshMaterialType[];
     drawMode: TrianglesDrawModes;
     morphTargetInfluences?: number[];
     morphTargetDictionary?: { [key: string]: number; };
-	isMesh: boolean;
+    isMesh: true;
+    type: string;
 
     setDrawMode(drawMode: TrianglesDrawModes): void;
     updateMorphTargets(): void;
-    getMorphTargetIndexByName(name: string): number;
-    raycast(raycaster: Raycaster, intersects: any): void;
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
+    copy(source: this, recursive?: boolean): this;
 }
 
+/**
+ * An intermediate material type that casts more precisely the possible materials assignable to a [[Points]] object.
+ *
+ * // Todo:
+ * // - can [[Points]] take in an array of materials ?
+ */
+export type PointsMaterialType = PointsMaterial | ShaderMaterial | MeshDepthMaterial;
+
 /**
  * A class for displaying particles in the form of variable size points. For example, if using the WebGLRenderer, the particles are displayed using GL_POINTS.
  *
@@ -5187,9 +5322,12 @@ export class Points extends Object3D {
      */
     constructor(
         geometry?: Geometry | BufferGeometry,
-        material?: Material
+        material?: PointsMaterialType | PointsMaterialType[]
     );
 
+    type: "Points";
+    isPoints: true;
+
     /**
      * An instance of Geometry or BufferGeometry, where each vertex designates the position of a particle in the system.
      */
@@ -5198,9 +5336,9 @@ export class Points extends Object3D {
     /**
      * An instance of Material, defining the object's appearance. Default is a PointsMaterial with randomised colour.
      */
-    material: Material;
+    material: PointsMaterial | ShaderMaterial;
 
-    raycast(raycaster: Raycaster, intersects: any): void;
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
 }
 
 /**
@@ -5256,10 +5394,14 @@ export class SkinnedMesh extends Mesh {
 export class Sprite extends Object3D {
     constructor(material?: Material);
 
-    geometry: BufferGeometry;
-    material: SpriteMaterial;
+    type: "Sprite";
+    isSprite: true;
 
-    raycast(raycaster: Raycaster, intersects: any): void;
+    material: SpriteMaterial;
+    center: Vector2;
+
+    raycast(raycaster: Raycaster, intersects: Intersection[]): void;
+    copy(source: this, recursive?: boolean): this;
 }
 
 /**
@@ -5449,6 +5591,9 @@ export class WebGLRenderer implements Renderer {
     getPixelRatio(): number;
     setPixelRatio(value: number): void;
 
+    getDrawingBufferSize(): { width: number; height: number; };
+    setDrawingBufferSize(width: number, height: number, pixelRatio: number): void;
+
     getSize(): { width: number; height: number; };
 
     /**
@@ -5456,6 +5601,7 @@ export class WebGLRenderer implements Renderer {
      */
     setSize(width: number, height: number, updateStyle?: boolean): void;
 
+    getCurrentViewport(): Vector4;
     /**
      * Sets the viewport to render from (x, y) to (x + width, y + height).
      */
@@ -5517,6 +5663,17 @@ export class WebGLRenderer implements Renderer {
 
     renderBufferDirect(camera: Camera, fog: Fog, material: Material, geometryGroup: any, object: Object3D): void;
 
+    /**
+     * A build in function that can be used instead of requestAnimationFrame. For WebVR projects this function must be used.
+     * @param callback The function will be called every available frame. If `null` is passed it will stop any already ongoing animation.
+     */
+    setAnimationLoop(callback: Function): void;
+
+    /**
+     * @deprecated Use {@link WebGLRenderer#setAnimationLoop .setAnimationLoop()} instead.
+     */
+    animate(callback: Function): void;
+
     /**
      * Render a scene using a camera.
      * The render is done to the renderTarget (if specified) or to the canvas as usual.
@@ -5648,6 +5805,7 @@ export interface WebGLRenderTargetOptions {
     anisotropy?: number; // 1;
     depthBuffer?: boolean; // true;
     stencilBuffer?: boolean; // true;
+    generateMipmaps?: boolean; // true;
 }
 
 export class WebGLRenderTarget extends EventDispatcher {
@@ -5865,13 +6023,18 @@ export let UniformsLib: {
         diffuse: IUniform;
         opacity: IUniform;
         map: IUniform;
-        offsetRepeat: IUniform;
-        specularMap: IUniform;
+        uvTransform: IUniform;
         alphaMap: IUniform;
+    };
+    specularmap: {
+        specularMap: IUniform;
+    };
+    envmap: {
         envMap: IUniform;
         flipEnvMap: IUniform;
         reflectivity: IUniform;
-        refractionRation: IUniform;
+        refractionRatio: IUniform;
+        maxMipLevel: IUniform;
     };
     aomap: {
         aoMap: IUniform;
@@ -5881,7 +6044,9 @@ export let UniformsLib: {
         lightMap: IUniform;
         lightMapIntensity: IUniform;
     };
-    emissivemap: { emissiveMap: IUniform };
+    emissivemap: {
+        emissiveMap: IUniform
+    };
     bumpmap: {
         bumpMap: IUniform;
         bumpScale: IUniform;
@@ -5895,8 +6060,15 @@ export let UniformsLib: {
         displacementScale: IUniform;
         displacementBias: IUniform;
     };
-    roughnessmap: { roughnessMap: IUniform };
-    metalnessmap: { metalnessMap: IUniform };
+    roughnessmap: {
+        roughnessMap: IUniform
+    };
+    metalnessmap: {
+        metalnessMap: IUniform
+    };
+    gradientmap: {
+        gradientMap: IUniform
+    };
     fog: {
         fogDensity: IUniform;
         fogNear: IUniform;
@@ -5951,7 +6123,7 @@ export let UniformsLib: {
         };
         pointShadowMap: IUniform;
         pointShadowMatrix: IUniform;
-        hemisphereLigtts: {
+        hemisphereLights: {
             value: any[];
             properties: {
                 direction: {};
@@ -5959,6 +6131,15 @@ export let UniformsLib: {
                 groundColor: {};
             };
         };
+        rectAreaLights: {
+            value: any[];
+            properties: {
+                color: {};
+                position: {};
+                width: {};
+                height: {};
+            }
+        }
     };
     points: {
         diffuse: IUniform;
@@ -5966,7 +6147,7 @@ export let UniformsLib: {
         size: IUniform;
         scale: IUniform;
         map: IUniform;
-        offsetRepeat: IUniform;
+        uvTransform: IUniform;
     };
 };
 
@@ -6061,12 +6242,12 @@ export class WebGLLights {
     get(light: any): any;
 }
 
-/** 
- * An object with a series of statistical information about the graphics board memory and the rendering process. 
- */ 
+/**
+ * An object with a series of statistical information about the graphics board memory and the rendering process.
+ */
 export class WebGLInfo {
     autoReset: boolean;
-    memory: { 
+    memory: {
         geometries: number;
         textures: number;
     };
@@ -6263,13 +6444,6 @@ export class WebGLStencilBuffer {
     reset(): void;
 }
 
-// Renderers / WebGL / Plugins /////////////////////////////////////////////////////////////////////
-export class LensFlarePlugin {
-    constructor(renderer: WebGLRenderer, flares: any[]);
-
-    render(scene: Scene, camera: Camera, viewportWidth: number, viewportHeight: number): void;
-}
-
 export class SpritePlugin {
     constructor(renderer: WebGLRenderer, sprites: any[]);
 
@@ -6284,6 +6458,8 @@ export class SpritePlugin {
 export class Scene extends Object3D {
     constructor();
 
+    type: "Scene";
+
     /**
      * A fog instance defining the type of fog that affects everything rendered in the scene. Default is null.
      */
@@ -6294,8 +6470,9 @@ export class Scene extends Object3D {
      */
     overrideMaterial: Material | null;
     autoUpdate: boolean;
-    background: any;
+    background: null | Color | Texture;
 
+    copy(source: this, recursive?: boolean): this;
     toJSON(meta?: any): any;
 }
 
@@ -6544,38 +6721,42 @@ export namespace ShapeUtils {
 
 export class Audio extends Object3D {
     constructor(listener: AudioListener);
+    type: "Audio";
 
-    type: string;
     context: AudioContext;
-    source: AudioBufferSourceNode;
     gain: GainNode;
     autoplay: boolean;
+    buffer: null | Audio;
+    loop: boolean;
     startTime: number;
+    offset: number;
     playbackRate: number;
-    hasPlaybackControl: boolean;
     isPlaying: boolean;
+    hasPlaybackControl: boolean;
     sourceType: string;
+    source: AudioBufferSourceNode;
     filters: any[];
 
     getOutput(): GainNode;
-    setNodeSource(audioNode: AudioBufferSourceNode): Audio;
-    setBuffer(audioBuffer: AudioBuffer): Audio;
-    play(): Audio;
-    pause(): Audio;
-    stop(): Audio;
-    connect(): Audio;
-    disconnect(): Audio;
-    getFilters(): any[];
-    setFilter(value: any[]): Audio;
-    getFilter(): any;
-    setFilter(filter: any): Audio;
-    setPlaybackRate(value: number): Audio;
-    getPlaybackRate(): number;
+    setNodeSource(audioNode: AudioBufferSourceNode): this;
+    setMediaElementSource(mediaElement: MediaElementAudioSourceNode): this;
+    setBuffer(audioBuffer: AudioBuffer): this;
+    play(): this;
     onEnded(): void;
+    pause(): this;
+    stop(): this;
+    connect(): this;
+    disconnect(): this;
+    getFilters(): any[];
+    setFilter(value: any[]): this;
+    getFilter(): any;
+    setFilter(filter: any): this;
+    setPlaybackRate(value: number): this;
+    getPlaybackRate(): number;
     getLoop(): boolean;
     setLoop(value: boolean): void;
     getVolume(): number;
-    setVolume(value: number): Audio;
+    setVolume(value: number): this;
     /**
      * @deprecated Use {@link AudioLoader} instead.
      */
@@ -6628,9 +6809,10 @@ export class PositionalAudio extends Audio {
 export class AudioListener extends Object3D {
     constructor();
 
-    type: string;
+    type: "AudioListener";
     context: AudioContext;
     gain: GainNode;
+    filter: null | any;
 
     getInput(): GainNode;
     removeFilter(): void;
@@ -6638,6 +6820,7 @@ export class AudioListener extends Object3D {
     getFilter(): any;
     setMasterVolume(value: number): void;
     getMasterVolume(): number;
+    updateMatrixWorld(force?: boolean): void;
 }
 
 // Extras / Core /////////////////////////////////////////////////////////////////////
@@ -6647,14 +6830,14 @@ export class AudioListener extends Object3D {
  * class Curve&lt;T extends Vector&gt;
  */
 export class Curve<T extends Vector> {
-	
+
     /**
-     * This value determines the amount of divisions when calculating the cumulative segment lengths of a curve via .getLengths. 
-     * To ensure precision when using methods like .getSpacedPoints, it is recommended to increase .arcLengthDivisions if the curve is very large. 
+     * This value determines the amount of divisions when calculating the cumulative segment lengths of a curve via .getLengths.
+     * To ensure precision when using methods like .getSpacedPoints, it is recommended to increase .arcLengthDivisions if the curve is very large.
      * Default is 200.
      */
     arcLengthDivisions:number;
-	
+
     /**
      * Returns a vector for point t of the curve where t is between 0 and 1
      * getPoint(t: number): T;
@@ -6924,7 +7107,7 @@ export class SplineCurve extends Curve<Vector2> {
 
 // Extras / Geometries /////////////////////////////////////////////////////////////////////
 export class BoxBufferGeometry extends BufferGeometry {
-    constructor(width: number, height: number, depth: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
+    constructor(width?: number, height?: number, depth?: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
 
     parameters: {
         width: number;
@@ -6948,7 +7131,7 @@ export class BoxGeometry extends Geometry {
      * @param heightSegments — Number of segmented faces along the height of the sides.
      * @param depthSegments — Number of segmented faces along the depth of the sides.
      */
-    constructor(width: number, height: number, depth: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
+    constructor(width?: number, height?: number, depth?: number, widthSegments?: number, heightSegments?: number, depthSegments?: number);
 
     parameters: {
         width: number;
@@ -7047,29 +7230,39 @@ export class DodecahedronGeometry extends Geometry {
 }
 
 export class EdgesGeometry extends BufferGeometry {
-    constructor(geometry: BufferGeometry | Geometry, thresholdAngle: number);
+    constructor(geometry: BufferGeometry | Geometry, thresholdAngle?: number);
+}
+
+export interface ExtrueGeometryOptions {
+    curveSegments?: number;
+    steps?: number;
+    depth?: number;
+    bevelEnabled?: boolean;
+    bevelThickness?: number;
+    bevelSize?: number;
+    bevelSegments?: number;
+    extrudePath?: CurvePath<Vector3>;
+    UVGenerator?: UVGenerator;
+}
+
+export interface UVGenerator {
+  generateTopUV(geometry: ExtrudeBufferGeometry, vertices: number[], indexA: number, indexB: number, indexC: number): Vector2[];
+  generateSideWallUV(geometry: ExtrudeBufferGeometry, vertices: number[], indexA: number, indexB: number, indexC: number, indexD: number): Vector2[];
 }
 
 export class ExtrudeGeometry extends Geometry {
-    constructor(shape?: Shape, options?: any);
-    constructor(shapes?: Shape[], options?: any);
+    constructor(shape: Shape | Shape[], options?: ExtrueGeometryOptions);
 
-    static WorldUVGenerator: {
-        generateTopUV(geometry: Geometry, vertex: number[], indexA: number, indexB: number, indexC: number): Vector2[];
-        generateSideWallUV(geometry: Geometry, vertex: number[], indexA: number, indexB: number, indexC: number, indexD: number): Vector2[];
-    };
+    static WorldUVGenerator: UVGenerator;
 
     addShapeList(shapes: Shape[], options?: any): void;
     addShape(shape: Shape, options?: any): void;
 }
 
 export class ExtrudeBufferGeometry extends BufferGeometry {
-    constructor(shapes?: Shape[], options?: any);
+    constructor(shapes?: Shape[], options?: ExtrueGeometryOptions);
 
-    static WorldUVGenerator: {
-        generateTopUV(geometry: Geometry, vertices: number[], indexA: number, indexB: number, indexC: number): Vector2[];
-        generateSideWallUV(geometry: Geometry, vertices: number[], indexA: number, indexB: number, indexC: number, indexD: number): Vector2[];
-    };
+    static WorldUVGenerator: UVGenerator;
 
     addShapeList(shapes: Shape[], options?: any): void;
     addShape(shape: Shape, options?: any): void;
@@ -7113,8 +7306,18 @@ export class OctahedronGeometry extends PolyhedronGeometry {
     constructor(radius?: number, detail?: number);
 }
 
+export class ParametricBufferGeometry extends BufferGeometry {
+  constructor(func: (u: number, v: number, dest: Vector3) => void, slices: number, stacks: number);
+
+  parameters: {
+    func: (u: number, v: number, dest:Vector3) => void;
+    slices: number;
+    stacks: number;
+  };
+}
+
 export class ParametricGeometry extends Geometry {
-    constructor(func: (u: number, v: number, dest:Vector3) => void, slices: number, stacks: number);
+    constructor(func: (u: number, v: number, dest: Vector3) => void, slices: number, stacks: number);
 
     parameters: {
         func: (u: number, v: number, dest:Vector3) => void;
@@ -7124,7 +7327,7 @@ export class ParametricGeometry extends Geometry {
 }
 
 export class PlaneBufferGeometry extends BufferGeometry {
-    constructor(width: number, height: number, widthSegments?: number, heightSegments?: number);
+    constructor(width?: number, height?: number, widthSegments?: number, heightSegments?: number);
 
     parameters: {
         width: number;
@@ -7135,7 +7338,7 @@ export class PlaneBufferGeometry extends BufferGeometry {
 }
 
 export class PlaneGeometry extends Geometry {
-    constructor(width: number, height: number, widthSegments?: number, heightSegments?: number);
+    constructor(width?: number, height?: number, widthSegments?: number, heightSegments?: number);
 
     parameters: {
         width: number;
@@ -7146,7 +7349,7 @@ export class PlaneGeometry extends Geometry {
 }
 
 export class PolyhedronBufferGeometry extends BufferGeometry {
-	constructor(vertices: number[], indices: number[], radius: number, detail: number);
+	constructor(vertices: number[], indices: number[], radius?: number, detail?: number);
 
 	parameters: {
 		vertices: number[];
@@ -7195,8 +7398,7 @@ export class RingGeometry extends Geometry {
 }
 
 export class ShapeGeometry extends Geometry {
-    constructor(shape: Shape, options?: any);
-    constructor(shapes: Shape[], options?: any);
+    constructor(shapes: Shape | Shape[], curveSegments?: number);
 
     addShapeList(shapes: Shape[], options: any): ShapeGeometry;
     addShape(shape: Shape, options?: any): void;
@@ -7208,7 +7410,7 @@ export class ShapeBufferGeometry extends BufferGeometry
 }
 
 export class SphereBufferGeometry extends BufferGeometry {
-    constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
+    constructor(radius?: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
 
     parameters: {
         radius: number;
@@ -7236,7 +7438,7 @@ export class SphereGeometry extends Geometry {
      * @param thetaStart — specify vertical starting angle. Default is 0.
      * @param thetaLength — specify vertical sweep angle size. Default is Math.PI.
      */
-    constructor(radius: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
+    constructor(radius?: number, widthSegments?: number, heightSegments?: number, phiStart?: number, phiLength?: number, thetaStart?: number, thetaLength?: number);
 
     parameters: {
         radius: number;
@@ -7323,13 +7525,13 @@ export class TorusGeometry extends Geometry {
 }
 
 export class TorusKnotBufferGeometry extends BufferGeometry {
-    constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, p?: number, q?: number, heightScale?: number);
+    constructor(radius?: number, tube?: number, tubularSegments?: number, radialSegments?: number, p?: number, q?: number);
 
     parameters: {
         radius: number;
         tube: number;
-        radialSegments: number;
         tubularSegments: number;
+        radialSegments: number;
         p: number;
         q: number;
         heightScale: number;
@@ -7337,13 +7539,13 @@ export class TorusKnotBufferGeometry extends BufferGeometry {
 }
 
 export class TorusKnotGeometry extends Geometry {
-    constructor(radius?: number, tube?: number, radialSegments?: number, tubularSegments?: number, p?: number, q?: number, heightScale?: number);
+    constructor(radius?: number, tube?: number, tubularSegments?: number, radialSegments?: number, p?: number, q?: number);
 
     parameters: {
         radius: number;
         tube: number;
-        radialSegments: number;
         tubularSegments: number;
+        radialSegments: number;
         p: number;
         q: number;
         heightScale: number;
@@ -7351,31 +7553,26 @@ export class TorusKnotGeometry extends Geometry {
 }
 
 export class TubeGeometry extends Geometry {
-    constructor(path: Curve<Vector3>, segments?: number, radius?: number, radiusSegments?: number, closed?: boolean, taper?: (u: number) => number);
+    constructor(path: Curve<Vector3>, tubularSegments?: number, radius?: number, radiusSegments?: number, closed?: boolean);
 
     parameters: {
         path: Curve<Vector3>;
-        segments: number;
+        tubularSegments: number;
         radius: number;
         radialSegments: number;
         closed: boolean;
-        taper: (u: number) => number; // NoTaper or SinusoidalTaper;
     };
     tangents: Vector3[];
     normals: Vector3[];
     binormals: Vector3[];
-
-    static NoTaper(u?: number): number;
-    static SinusoidalTaper(u: number): number;
-    static FrenetFrames(path: Path, segments: number, closed: boolean): void;
 }
 
 export class TubeBufferGeometry extends BufferGeometry {
-    constructor(path: Curve<Vector3>, segments?: number, radius?: number, radiusSegments?: number, closed?: boolean);
+    constructor(path: Curve<Vector3>, tubularSegments?: number, radius?: number, radiusSegments?: number, closed?: boolean);
 
     parameters: {
         path: Curve<Vector3>;
-        segments: number;
+        tubularSegments: number;
         radius: number;
         radialSegments: number;
         closed: boolean;
@@ -7399,7 +7596,7 @@ export class ArrowHelper extends Object3D {
 
     setDirection(dir: Vector3): void;
     setLength(length: number,  headLength?: number, headWidth?: number): void;
-    setColor(hex: number): void;
+    setColor(color: Color): void;
 }
 
 export class AxesHelper extends LineSegments {
@@ -7434,11 +7631,14 @@ export class CameraHelper extends LineSegments {
 }
 
 export class DirectionalLightHelper extends Object3D {
-    constructor(light: Light, size?: number, color?: Color | string | number);
+    constructor(light: DirectionalLight, size?: number, color?: Color | string | number);
 
-    light: Light;
+    light: DirectionalLight;
     lightPlane: Line;
-    color: Color | string | number;
+    targetPlane: Line;
+    color: Color | string | number | undefined;
+    matrix: Matrix4;
+    matrixAutoUpdate: boolean;
 
     dispose(): void;
     update(): void;
@@ -7469,22 +7669,26 @@ export class GridHelper extends LineSegments {
 }
 
 export class HemisphereLightHelper extends Object3D {
-    constructor(light: Light, sphereSize: number);
+    constructor(light: HemisphereLight, size: number, color?: Color | number | string);
 
-    light: Light;
-    colors: Color[];
-    lightSphere: Mesh;
+    light: HemisphereLight;
+    matrix: Matrix4;
+    matrixAutoUpdate: boolean;
+    material: MeshBasicMaterial;
+
+    color: Color | string | number | undefined;
 
     dispose(): void;
     update(): void;
 }
 
 export class PointLightHelper extends Object3D {
-    constructor(light: Light, sphereSize?: number, color?: Color | string | number);
+    constructor(light: PointLight, sphereSize?: number, color?: Color | string | number);
 
-    light: Light;
-    sphereSize: number;
-    color: Color | string | number;
+    light: PointLight;
+    color: Color | string | number | undefined;
+    matrix: Matrix4;
+    matrixAutoUpdate: boolean;
 
     dispose(): void;
     update(): void;
@@ -7504,7 +7708,9 @@ export class SpotLightHelper extends Object3D {
     constructor(light: Light, color?: Color | string | number);
 
     light: Light;
-    color: Color | string | number;
+    matrix: Matrix4;
+    matrixAutoUpdate: boolean;
+    color: Color | string | number | undefined;
 
     dispose(): void;
     update(): void;
diff --git a/types/three/three-dragcontrols.d.ts b/types/three/three-dragcontrols.d.ts
new file mode 100644
index 0000000000..5f4afbb0b4
--- /dev/null
+++ b/types/three/three-dragcontrols.d.ts
@@ -0,0 +1,5 @@
+import {Camera, Object3D} from './three-core';
+
+export class DragControls {
+    constructor(objects: Object3D[], camera: Camera, domElement?: HTMLElement);
+}
diff --git a/types/three/three-effectcomposer.d.ts b/types/three/three-effectcomposer.d.ts
index 0f30d45d04..c399fda24c 100644
--- a/types/three/three-effectcomposer.d.ts
+++ b/types/three/three-effectcomposer.d.ts
@@ -8,7 +8,7 @@ export class EffectComposer {
     renderTarget2: WebGLRenderTarget;
     writeBuffer: WebGLRenderTarget;
     readBuffer: WebGLRenderTarget;
-    passes: any[];
+    passes: Pass[];
     copyPass: ShaderPass;
 
     swapBuffers(): void;
@@ -41,5 +41,4 @@ export class Pass{
     setSize(width: number, height:number ): void;
 
     render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number, maskActive?: boolean): void;
-
 }
\ No newline at end of file
diff --git a/types/three/three-filmpass.d.ts b/types/three/three-filmpass.d.ts
index 0890ac8507..468670c9b0 100644
--- a/types/three/three-filmpass.d.ts
+++ b/types/three/three-filmpass.d.ts
@@ -1,13 +1,13 @@
-import { Camera, Scene, WebGLRenderTarget, WebGLRenderer, Material, Mesh, IUniform } from "./three-core";
+import { OrthographicCamera, Scene, WebGLRenderTarget, WebGLRenderer, ShaderMaterial, Mesh, IUniform } from "./three-core";
 import {Pass} from "./three-effectcomposer";
 
 export class FilmPass extends Pass {
-    constructor(noiseIntensity: number, scanlinesIntensity: number, scanlinesCount: number, grayscale: boolean);
+    constructor(noiseIntensity?: number, scanlinesIntensity?: number, scanlinesCount?: number, grayscale?: boolean);
     
     scene: Scene;
-    camera: Camera;
-    uniforms: IUniform;
-    material: Material;
+    camera: OrthographicCamera;
+    uniforms: { [uniform: string]: IUniform };
+    material: ShaderMaterial;
     quad: Mesh;
 
 }
diff --git a/types/three/three-gltfexporter.d.ts b/types/three/three-gltfexporter.d.ts
new file mode 100644
index 0000000000..2bdba480a7
--- /dev/null
+++ b/types/three/three-gltfexporter.d.ts
@@ -0,0 +1,9 @@
+import { Object3D } from "three";
+
+export class GLTFExporter {
+    constructor();
+
+    parse(input: Object3D, onCompleted: (gltf: object) => void, options: object): null;
+
+}
+
diff --git a/types/three/three-lensflare.d.ts b/types/three/three-lensflare.d.ts
new file mode 100644
index 0000000000..f9a0967099
--- /dev/null
+++ b/types/three/three-lensflare.d.ts
@@ -0,0 +1,27 @@
+import {Mesh, Camera, Scene, WebGLRenderer, Blending, Vector3, Color, Shader, Texture, BufferGeometry} from "./three-core";
+
+export class LensFlare extends Mesh {
+
+    constructor();
+
+    type: 'LensFlare';
+    frustumCulled: false;
+    renderOrder: number;
+
+    addElement(element: LensFlareElement): this;
+    onBeforeRender: (renderer: WebGLRenderer, scene: Scene, camera: Camera) => void;
+    dispose(): void;
+
+    isLensflare: true;
+
+}
+
+export class LensFlareElement {
+    constructor(texture: Texture, size?: number, distance?: number, color?: Color);
+    texture: Texture;
+    size: number;
+    distance: number;
+    color: Color;
+    static Shader: Shader;
+    static Geometry: BufferGeometry
+}
diff --git a/types/three/three-maskpass.d.ts b/types/three/three-maskpass.d.ts
index 0eb6250b6d..9899efb121 100644
--- a/types/three/three-maskpass.d.ts
+++ b/types/three/three-maskpass.d.ts
@@ -1,22 +1,15 @@
 import { Camera, Scene, WebGLRenderTarget, WebGLRenderer } from "./three-core";
+import { Pass } from "./three-effectcomposer";
 
-export class MaskPass {
+export class MaskPass extends Pass {
     constructor(scene: Scene, camera: Camera);
-
     scene: Scene;
     camera: Camera;
-    enabled: boolean;
-    clear: boolean;
-    needsSwap: boolean;
+    clear: true;
+    needsSwap: false;
     inverse: boolean;
-
-    render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
 }
 
-export class ClearMaskPass {
-    constructor();
-
-    enabled: boolean;
-
-    render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
+export class ClearMaskPass extends Pass {
+    needsSwap: false;
 }
diff --git a/types/three/three-outlinepass.d.ts b/types/three/three-outlinepass.d.ts
index 4cc7ad92d6..5dd7799e9e 100644
--- a/types/three/three-outlinepass.d.ts
+++ b/types/three/three-outlinepass.d.ts
@@ -1,9 +1,11 @@
-import { Camera, Color, Object3D, Scene, Vector2 } from './three-core';
+import { Camera, Color, Object3D, Scene, Vector2, MeshBasicMaterial, ShaderMaterial, WebGLRenderTarget, IUniform, Matrix4 } from './three-core';
+import {Pass} from "./three-effectcomposer";
 
-export class OutlinePass {
-    constructor(size: Vector2, scene: Scene, camer: Camera, selectedObjects?: Array<Object3D>);
-    selectedObjects: Array<Object3D>;
+export class OutlinePass extends Pass {
+    constructor(resolution: Vector2, scene: Scene, camera: Camera, selectedObjects?: Object3D[]);
+    selectedObjects: Object3D[];
     renderCamera: Camera;
+    renderScene: Scene;
     visibleEdgeColor: Color;
     hiddenEdgeColor: Color;
     edgeGlow: number;
@@ -13,5 +15,26 @@ export class OutlinePass {
     downSampleRatio: number;
     pulsePeriod: number;
     resolution: Vector2;
+    maskBufferMaterial: MeshBasicMaterial;
+    prepareMaskMaterial: ShaderMaterial;
+    renderTargetDepthBuffer: WebGLRenderTarget;
+    renderTargetMaskDownSampleBuffer: WebGLRenderTarget;
+    renderTargetBlurBuffer1: WebGLRenderTarget;
+    renderTargetBlurBuffer2: WebGLRenderTarget;
+    edgeDetectionMaterial: ShaderMaterial;
+    separableBlurMaterial: ShaderMaterial;
+    overlayMaterial: ShaderMaterial;
+    copyUniforms: { [uniform: string]: IUniform };
+    materialCopy: ShaderMaterial;
+    oldClearColor: Color;
+    tempPulseColor1: Color;
+    tempPulseColor2: Color;
+    textureMatrix: Matrix4;
+    static BlurDirectionX: Vector2;
+    static BlurDirectionY: Vector2;
+    dispose(): void;
+    changeVisibilityOfSelectedObjects(bVisible: boolean): void;
+    changeVisibilityOfNonSelectedObjects(bVisible: boolean): void;
+    updateTextureMatrix(): void;
 }
 
diff --git a/types/three/three-renderpass.d.ts b/types/three/three-renderpass.d.ts
index b35e9d21e1..65c13efcfb 100644
--- a/types/three/three-renderpass.d.ts
+++ b/types/three/three-renderpass.d.ts
@@ -6,20 +6,17 @@ import {
     WebGLRenderTarget,
     WebGLRenderer
 } from "./three-core";
+import { Pass } from "./three-effectcomposer";
 
-export class RenderPass {
-    constructor(scene: Scene, camera: Camera, overrideMaterial?: Material, clearColor?: Color | string | number, clearAlpha?: number);
+export class RenderPass extends Pass{
+    constructor(scene: Scene, camera: Camera, overrideMaterial?: Material | null, clearColor?: Color | string | number, clearAlpha?: number);
 
     scene: Scene;
     camera: Camera;
-    overrideMaterial: Material;
-    clearColor: Color | string | number;
-    clearAlpha: number;
-    oldClearColor: Color;
-    oldClearAlpha: number;
-    enabled: boolean;
+    overrideMaterial: Material | null | undefined;
+    clearColor: Color | string | number | undefined;
+    clearAlpha: number | undefined;
     clear: boolean;
-    needsSwap: boolean;
-
-    render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
+    needsSwap: false;
+    clearDepth: false;
 }
diff --git a/types/three/three-shaderpass.d.ts b/types/three/three-shaderpass.d.ts
index dd315bbd79..ad1c45e540 100644
--- a/types/three/three-shaderpass.d.ts
+++ b/types/three/three-shaderpass.d.ts
@@ -1,5 +1,6 @@
 import {
-    Camera,
+    OrthographicCamera,
+    IUniform,
     Mesh,
     Scene,
     Shader,
@@ -7,20 +8,15 @@ import {
     WebGLRenderTarget,
     WebGLRenderer
 } from "./three-core";
+import { Pass } from "./three-effectcomposer";
 
-export class ShaderPass {
+export class ShaderPass extends Pass {
     constructor(shader: Shader, textureID?: string);
 
     textureID: string;
-    uniforms: any;
+    uniforms: { [uniform: string]: IUniform };
     material: ShaderMaterial;
-    renderToScreen: boolean;
-    enabled: boolean;
-    needsSwap: boolean;
-    clear: boolean;
-    camera: Camera;
+    camera: OrthographicCamera;
     scene: Scene;
     quad: Mesh;
-
-    render(renderer: WebGLRenderer, writeBuffer: WebGLRenderTarget, readBuffer: WebGLRenderTarget, delta: number): void;
 }
\ No newline at end of file
diff --git a/types/three/three-smaapass.d.ts b/types/three/three-smaapass.d.ts
index 2b48811697..1deca03ab8 100644
--- a/types/three/three-smaapass.d.ts
+++ b/types/three/three-smaapass.d.ts
@@ -1,5 +1,24 @@
-export class SMAAPass {
+import { WebGLRenderTarget, Texture, IUniform, ShaderMaterial, OrthographicCamera, Scene, Mesh } from "./three-core";
+import { Pass } from "./three-effectcomposer";
+
+export class SMAAPass extends Pass {
     constructor(width: number, height: number);
-    renderToScreen: boolean;
+    edgesRT: WebGLRenderTarget;
+    weightsRT: WebGLRenderTarget;
+    areaTexture: Texture;
+    searchTexture: Texture;
+    uniformsEdges: { [uniform: string]: IUniform };
+    materialEdges: ShaderMaterial;
+    uniformsWeights: { [uniform: string]: IUniform };
+    materialWeights: ShaderMaterial;
+    uniformsBlend: { [uniform: string]: IUniform };
+    materialBlend: ShaderMaterial;
+    needsSwap: false;
+    camera: OrthographicCamera;
+    scene: Scene;
+    quad: Mesh;
+
+    getAreaTexture(): string;
+    getSearchTexture(): string;
 }
 
diff --git a/types/three/three-ssaapass.d.ts b/types/three/three-ssaapass.d.ts
new file mode 100644
index 0000000000..f335c72677
--- /dev/null
+++ b/types/three/three-ssaapass.d.ts
@@ -0,0 +1,19 @@
+import { Pass } from "./three-effectcomposer";
+import { Scene, Camera, Color, IUniform, ShaderMaterial, OrthographicCamera, Mesh } from "./three-core";
+
+export class SSAARenderPass extends Pass {
+	constructor(scene: Scene, camera: Camera, clearColor?: Color | string | number, clearAlpha?: number);
+	scene: Scene;
+	camera: Camera;
+	sampleLevel: number;
+	unbiased: boolean;
+	clearColor: Color | string | number;
+	clearAlpha: number;
+	copyUniforms: { [uniform: string]: IUniform };
+	copyMaterial: ShaderMaterial;
+	camera2: OrthographicCamera;
+	scene2: Scene;
+	quad2: Mesh;
+	dispose(): void;
+	static readonly JitterVectors: number[][][];
+}
\ No newline at end of file
diff --git a/types/three/three-unrealbloompass.d.ts b/types/three/three-unrealbloompass.d.ts
new file mode 100644
index 0000000000..dec35b3da7
--- /dev/null
+++ b/types/three/three-unrealbloompass.d.ts
@@ -0,0 +1,30 @@
+import { Pass } from "./three-effectcomposer";
+import { Vector2, ShaderMaterial, WebGLRenderTarget, IUniform, Color, Scene, Mesh, OrthographicCamera } from "./three-core";
+
+export class UnrealBloomPass extends Pass {
+	constructor(resolution?: Vector2, strength?: number, radius?: number, threshold?: number);
+	strength: number;
+	resolution: Vector2;
+	nMips: number;
+	renderTargetBright: WebGLRenderTarget;
+	highPassUniforms: { [uniform: string]: IUniform };
+	renderTargetsHorizontal: WebGLRenderTarget[];
+	renderTargetsVertical: WebGLRenderTarget[];
+	materialHighPassFilter: ShaderMaterial;
+	separableBlurMaterials: ShaderMaterial[];
+	compositeMaterial: ShaderMaterial;
+	bloomTintColors: Color[];
+	copyUniforms: { [uniform: string]: IUniform };
+	materialCopy: ShaderMaterial;
+	needsSwap: false;
+	oldClearAlpha: number;
+	oldClearColor: Color;
+	camera: OrthographicCamera;
+	scene: Scene;
+	quad: Mesh;
+	dispose(): void;
+	getSeparableBlurMaterial(): ShaderMaterial;
+	getCompositeMaterial(): ShaderMaterial;
+	static BlurDirectionX: Vector2;
+	static BlurDirectionY: Vector2;
+}
\ No newline at end of file
diff --git a/types/throttle-debounce/index.d.ts b/types/throttle-debounce/index.d.ts
index ded0507caf..34bfbbdb5b 100644
--- a/types/throttle-debounce/index.d.ts
+++ b/types/throttle-debounce/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for throttle-debounce 1.0
+// Type definitions for throttle-debounce 1.1
 // Project: https://github.com/niksy/throttle-debounce
-// Definitions by: Marek Buchar <https://github.com/czbuchi>
+// Definitions by: Marek Buchar <https://github.com/czbuchi>, Frank Li <https://github.com/franklixuefei>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
@@ -30,7 +30,7 @@
  * @return
  * A new, throttled, function.
  */
-export function throttle<T>(
+export function throttle<T extends (...args: any[]) => any>(
     delay: number,
     noTrailing: boolean,
     callback: T,
@@ -57,7 +57,7 @@ export function throttle<T>(
  * @return
  * A new, throttled, function.
  */
-export function throttle<T>(
+export function throttle<T extends (...args: any[]) => any>(
     delay: number,
     callback: T,
     debounceMode?: boolean,
@@ -87,7 +87,7 @@ export function throttle<T>(
  * @return
  * A new, debounced function.
  */
-export function debounce<T>(delay: number, atBegin: boolean, callback: T): T;
+export function debounce<T extends (...args: any[]) => any>(delay: number, atBegin: boolean, callback: T): T;
 
 /**
  * Debounce execution of a function. Debouncing, unlike throttling,
@@ -106,4 +106,4 @@ export function debounce<T>(delay: number, atBegin: boolean, callback: T): T;
  * @return
  * A new, debounced function.
  */
-export function debounce<T>(delay: number, callback: T): T;
+export function debounce<T extends (...args: any[]) => any>(delay: number, callback: T): T;
diff --git a/types/timezone-js/index.d.ts b/types/timezone-js/index.d.ts
index 5a648ab41e..ee39a7ee7b 100644
--- a/types/timezone-js/index.d.ts
+++ b/types/timezone-js/index.d.ts
@@ -19,7 +19,7 @@ export declare class Date {
     setTimezone: (timezone: string) => void;
 
     // regular Date members
-    toString(): string;
+    toString(format?:string): string;
     toDateString(): string;
     toTimeString(): string;
     toLocaleString(): string;
diff --git a/types/tinajs__tina-redux/index.d.ts b/types/tinajs__tina-redux/index.d.ts
new file mode 100644
index 0000000000..e48665e696
--- /dev/null
+++ b/types/tinajs__tina-redux/index.d.ts
@@ -0,0 +1,23 @@
+// Type definitions for @tinajs/tina-redux 1.4
+// Project: https://github.com/tinajs/tina-redux
+// Definitions by: Jiayu Liu <https://github.com/Jimexist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tinajs__tina-redux
+// TypeScript Version: 2.3
+
+import { Store, Dispatch } from "redux";
+
+type MapStateToProps = (state: any) => any;
+type mapDispatchToProps = (dispatch: Dispatch) => any;
+
+interface HOC {
+    onLoad: () => void;
+    onUnload: () => void;
+    methods: object;
+}
+
+declare class TinaRedux {
+    constructor(reduxStore: Store);
+    connect(mapState?: MapStateToProps, mapDispatch?: mapDispatchToProps): HOC;
+}
+
+export = TinaRedux;
diff --git a/types/tinajs__tina-redux/package.json b/types/tinajs__tina-redux/package.json
new file mode 100644
index 0000000000..7f5b19d45b
--- /dev/null
+++ b/types/tinajs__tina-redux/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^4.0.0"
+    }
+}
diff --git a/types/tinajs__tina-redux/tinajs__tina-redux-tests.ts b/types/tinajs__tina-redux/tinajs__tina-redux-tests.ts
new file mode 100644
index 0000000000..d4a7c2225f
--- /dev/null
+++ b/types/tinajs__tina-redux/tinajs__tina-redux-tests.ts
@@ -0,0 +1,51 @@
+import { createStore, combineReducers, Action } from "redux";
+import TinaRedux from "@tinajs/tina-redux";
+
+interface Todo {
+    id: number;
+    text: string;
+    completed: boolean;
+}
+
+interface TodoAction extends Action, Todo {}
+
+const intialState: Todo[] = [
+    { id: 1, text: "Star Tina.js", completed: false },
+    { id: 2, text: "Star Tina-Redux", completed: true },
+    { id: 3, text: "Build a mini-program with Tina.js", completed: false },
+    { id: 4, text: "Add to Showcase of Tina.js", completed: false }
+];
+
+const todos = (state = intialState, action: TodoAction) => {
+    switch (action.type) {
+        case "ADD_TODO":
+            return [
+                ...state,
+                {
+                    id: action.id,
+                    text: action.text,
+                    completed: false
+                }
+            ];
+        case "TOGGLE_TODO":
+            return state.map(
+                todo =>
+                    todo.id === action.id
+                        ? { ...todo, completed: !todo.completed }
+                        : todo
+            );
+        case "CLEAR_COMPLETED_TODOS":
+            return state.filter(todo => !todo.completed);
+        default:
+            return state;
+    }
+};
+
+const todoApp = combineReducers({
+    todos
+});
+
+const reduxStore = createStore(todoApp);
+const store = new TinaRedux(reduxStore);
+
+export default store;
diff --git a/types/tinajs__tina-redux/tsconfig.json b/types/tinajs__tina-redux/tsconfig.json
new file mode 100644
index 0000000000..c3b4905b15
--- /dev/null
+++ b/types/tinajs__tina-redux/tsconfig.json
@@ -0,0 +1,21 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "allowSyntheticDefaultImports": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@tinajs/tina": ["tinajs__tina"],
+            "@tinajs/tina-redux": ["tinajs__tina-redux"]
+        }
+    },
+    "files": ["index.d.ts", "tinajs__tina-redux-tests.ts"]
+}
diff --git a/types/tinajs__tina-redux/tslint.json b/types/tinajs__tina-redux/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/tinajs__tina-redux/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/tinajs__tina/index.d.ts b/types/tinajs__tina/index.d.ts
new file mode 100644
index 0000000000..b29ad6bff9
--- /dev/null
+++ b/types/tinajs__tina/index.d.ts
@@ -0,0 +1,62 @@
+// Type definitions for @tinajs/tina 1.4
+// Project: https://github.com/tinajs/tina
+// Definitions by: Jiayu Liu <https://github.com/Jimexist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped/tinajs__tina
+// TypeScript Version: 2.2
+
+export function use(plugin: any): void;
+
+export interface ComponentProperties {
+    [key: string]: any;
+}
+
+export interface ComponentLifecycles {
+    created: () => void;
+    attached: () => void;
+    ready: () => void;
+    moved: () => void;
+    detached: () => void;
+}
+
+export interface ComponentDefinitions extends ComponentLifecycles {
+    properties: ComponentProperties;
+    data: { [key: string]: any };
+    compute: (data: { [key: string]: any }) => { [key: string]: any };
+    methods: { [name: string]: (this: Component) => any };
+    mixins: Array<Partial<ComponentDefinitions>>;
+}
+
+export class Component {
+    static define(definitions: Partial<ComponentDefinitions>): void;
+    static mixin(definitions: Partial<ComponentDefinitions>): void;
+    setData(data: { [key: string]: any }): void;
+    data: { [key: string]: any };
+}
+
+export interface PageHooks {
+    beforeLoad: (this: Page) => void;
+    onLoad: (this: Page) => void;
+    onReady: (this: Page) => void;
+    onShow: (this: Page) => void;
+    onHide: (this: Page) => void;
+    onUnload: (this: Page) => void;
+}
+
+export interface PageEvents {
+    onPullDownRefresh: (event: Page) => void;
+    onReachBottom: (event: Page) => void;
+    onShareAppMessage: (event: Page) => void;
+    onPageScroll: (event: Page) => void;
+}
+
+export interface PageDefinitions
+    extends ComponentDefinitions,
+        PageEvents,
+        PageHooks {
+    mixins: Array<Partial<PageDefinitions>>;
+}
+
+export class Page extends Component {
+    static define(definitions: Partial<PageDefinitions>): void;
+    static mixin(definitions: Partial<PageDefinitions>): void;
+}
diff --git a/types/tinajs__tina/tinajs__tina-tests.ts b/types/tinajs__tina/tinajs__tina-tests.ts
new file mode 100644
index 0000000000..3f3fad874f
--- /dev/null
+++ b/types/tinajs__tina/tinajs__tina-tests.ts
@@ -0,0 +1,57 @@
+import { Page, Component } from "@tinajs/tina";
+
+function sayHi() {
+    return "hi";
+}
+
+Page.mixin({
+    onLoad: sayHi,
+    created: sayHi
+});
+
+Component.mixin({
+    created: sayHi
+});
+
+Page.define({
+    properties: {
+        content: String
+    }
+});
+
+Page.define({
+    mixins: [
+        {
+            methods: {
+                lol() {
+                    return;
+                }
+            }
+        },
+        {
+            methods: {
+                tiktok() {
+                    return;
+                }
+            }
+        }
+    ],
+    data: {
+        count: 0
+    },
+    compute({ count }) {
+        return { countPlus1: count + 1 };
+    },
+    onLoad() {
+        this.data.count;
+    },
+    methods: {
+        handleTapButton() {
+            this.data.count;
+        }
+    }
+});
+
+Component.define({
+    data: {}
+});
diff --git a/types/tinajs__tina/tsconfig.json b/types/tinajs__tina/tsconfig.json
new file mode 100644
index 0000000000..8c2f008caa
--- /dev/null
+++ b/types/tinajs__tina/tsconfig.json
@@ -0,0 +1,19 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@tinajs/tina": ["tinajs__tina"]
+        }
+    },
+    "files": ["index.d.ts", "tinajs__tina-tests.ts"]
+}
diff --git a/types/tinajs__tina/tslint.json b/types/tinajs__tina/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/tinajs__tina/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/tingle.js/index.d.ts b/types/tingle.js/index.d.ts
new file mode 100644
index 0000000000..30c04b9342
--- /dev/null
+++ b/types/tingle.js/index.d.ts
@@ -0,0 +1,36 @@
+// Type definitions for tingle.js 0.13
+// Project: https://github.com/robinparisi/tingle#readme
+// Definitions by: Klaus Meinhardt <https://github.com/ajafff>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export interface Options {
+    onOpen?: (this: modal) => void;
+    onClose?: (this: modal) => void;
+    beforeOpen?: () => void;
+    beforeClose?: (this: modal) => boolean | undefined;
+    stickyFooter?: boolean;
+    footer?: boolean;
+    cssClass?: string[];
+    closeLabel?: string;
+    closeMethods?: string[];
+}
+export class modal {
+    constructor(options?: Options);
+    setContent(content: string | Element): void;
+    getContent(): HTMLDivElement;
+    destroy(): void;
+    open(): void;
+    isOpen(): boolean;
+    close(): void;
+    setFooterContent(content: string): void;
+    getFooterContent(): HTMLDivElement | undefined;
+    setStickyFooter(sticky: boolean): void;
+    addFooterBtn(
+        label: string,
+        cssClass: string | undefined,
+        listener: HTMLElement['onclick'],
+    ): HTMLButtonElement;
+    isOverflow(): boolean;
+    checkOverflow(): void;
+}
diff --git a/types/tingle.js/tingle.js-tests.ts b/types/tingle.js/tingle.js-tests.ts
new file mode 100644
index 0000000000..28c7a08c7e
--- /dev/null
+++ b/types/tingle.js/tingle.js-tests.ts
@@ -0,0 +1,23 @@
+import { modal } from 'tingle.js';
+
+let instance = new modal();
+instance.open();
+instance.checkOverflow();
+instance.close();
+instance.close();
+
+instance = new modal({
+    onOpen() {
+        this.checkOverflow();
+    },
+    beforeClose() {
+        return this.isOverflow();
+    },
+});
+
+instance.addFooterBtn('text', undefined, function(e) {
+    e.x;
+    this.innerText;
+});
+
+instance.setStickyFooter(false);
diff --git a/types/tingle.js/tsconfig.json b/types/tingle.js/tsconfig.json
new file mode 100644
index 0000000000..8bca97462f
--- /dev/null
+++ b/types/tingle.js/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "tingle.js-tests.ts"
+    ]
+}
diff --git a/types/tingle.js/tslint.json b/types/tingle.js/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tingle.js/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/tiny-secp256k1/index.d.ts b/types/tiny-secp256k1/index.d.ts
new file mode 100644
index 0000000000..7c71cab5cc
--- /dev/null
+++ b/types/tiny-secp256k1/index.d.ts
@@ -0,0 +1,94 @@
+// Type definitions for tiny-secp256k1 1.0
+// Project: https://github.com/bitcoinjs/tiny-secp256k1
+// Definitions by: Eduardo Henke <https://github.com/eduhenke>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+/// <reference types="node" />
+
+/**
+ * Checks if A is a point in the curve
+ * @param A should be:
+ *   encoded with a sequence tag of 0x02, 0x03 or 0x04
+ *   A.x is within [1...p - 1]
+ *   A.y is within [1...p - 1]
+ */
+export function isPoint(A: Buffer): boolean;
+
+/**
+ * Returns false if the point is not compressed.
+ */
+export function isPointCompressed(A: Buffer): boolean;
+
+/**
+ * Checks if point is private key
+ * @param d should be:
+ *   256-bit
+ *   within [1...order - 1]
+ */
+export function isPrivate(d: Buffer): boolean;
+
+/**
+ * Returns null if result is at infinity.
+ * @param A isPoint(A) should be true
+ * @param B isPoint(B) should be true
+ * @param compressed optional, if true compresses the resulting point
+ */
+export function pointAdd(A: Buffer, B: Buffer, compressed?: boolean): Buffer | null;
+
+/**
+ * Returns null if result is at infinity.
+ * @param A isPoint(A) should be true
+ * @param tweak should be within [1...order - 1]
+ * @param compressed optional, if true compresses the resulting point
+ */
+export function pointAddScalar(A: Buffer, tweak: Buffer, compressed?: boolean): Buffer | null;
+
+/**
+ * Compresses point A.
+ * @param A isPoint(A) should be true
+ * @param compressed if true compresses A
+ */
+export function pointCompress(A: Buffer, compressed: boolean): Buffer;
+
+/**
+ * Returns null if result is at infinity.
+ * @param d isPrivate(d) should be true
+ * @param compressed optional, if true compresses the resulting point
+ */
+export function pointFromScalar(d: Buffer, compressed?: boolean): Buffer | null;
+
+/**
+ * Returns null if result is at infinity.
+ * @param A isPoint(A) should be true
+ * @param tweak should be within [1...order - 1]
+ * @param compressed optional, if true compresses the resulting point
+ */
+export function pointMultiply(A: Buffer, tweak: Buffer, compressed?: boolean): Buffer | null;
+
+/**
+ * Returns null if result is equal to 0.
+ * @param d isPrivate(d) should be true
+ * @param tweak should be within [1...order - 1]
+ */
+export function privateAdd(d: Buffer, tweak: Buffer): Buffer | null;
+
+/**
+ * Returns null if result is equal to 0.
+ * @param d isPrivate(d) should be true
+ * @param tweak should be within [1...order - 1]
+ */
+export function privateSub(d: Buffer, tweak: Buffer): Buffer | null;
+
+/**
+ * Returns normalized signatures, each of (r, s) values are guaranteed to less than order / 2. Uses RFC6979.
+ * @param message should be 256-bit
+ * @param privateKey isPrivate(privateKey) should be true
+ */
+export function sign(message: Buffer, privateKey: Buffer): Buffer;
+
+/**
+ * Returns false if any of (r, s) values are equal to 0, or if the signature is rejected.
+ * @param message should be 256-bit
+ * @param publicKey isPoint(publicKey) should be true
+ * @param signature signature should have all (r, s) values within range [0...order - 1]
+ */
+export function verify(message: Buffer, publicKey: Buffer, signature: Buffer): boolean;
diff --git a/types/tiny-secp256k1/tiny-secp256k1-tests.ts b/types/tiny-secp256k1/tiny-secp256k1-tests.ts
new file mode 100644
index 0000000000..1203f3fed1
--- /dev/null
+++ b/types/tiny-secp256k1/tiny-secp256k1-tests.ts
@@ -0,0 +1,11 @@
+import { pointFromScalar, sign, verify } from 'tiny-secp256k1';
+
+const d = Buffer.from('5272e811987e04833abf88c2cdbb43eddfefd7b4afa50e87bfcd3a2b297f0a93');
+const Q = pointFromScalar(d);
+
+const message = new Buffer(new Uint8Array([0x68, 0x65, 0x6c, 0x6c, 0x6f, 0x77, 0x6f, 0x72, 0x6c, 0x64]));
+const signature = sign(message, d);
+
+if (Q !== null) {
+    verify(message, Q, signature);
+}
diff --git a/types/tiny-secp256k1/tsconfig.json b/types/tiny-secp256k1/tsconfig.json
new file mode 100644
index 0000000000..377e6d639c
--- /dev/null
+++ b/types/tiny-secp256k1/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "tiny-secp256k1-tests.ts"
+    ]
+}
diff --git a/types/tiny-secp256k1/tslint.json b/types/tiny-secp256k1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/tiny-secp256k1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/tiny-slider-react/index.d.ts b/types/tiny-slider-react/index.d.ts
index 9cf22beab7..81c8a38377 100644
--- a/types/tiny-slider-react/index.d.ts
+++ b/types/tiny-slider-react/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/jechav/tiny-slider-react#readme
 // Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 import * as React from "react";
 
 export interface CommonOptions {
diff --git a/types/tinycolor2/index.d.ts b/types/tinycolor2/index.d.ts
index 921d8a4f08..4d28d623ac 100644
--- a/types/tinycolor2/index.d.ts
+++ b/types/tinycolor2/index.d.ts
@@ -1,393 +1,673 @@
-// Type definitions for tinycolor v1.4.1
+// Type definitions for tinycolor 1.4
 // Project: https://github.com/bgrins/TinyColor
-// Definitions by: Mordechai Zuber <https://github.com/M-Zuber>, Geert Jansen <https://github.com/geertjansen>, Niels van Hoorn <https://github.com/nvh>
+// Definitions by: Mordechai Zuber <https://github.com/M-Zuber>,
+//                 Geert Jansen <https://github.com/geertjansen>,
+//                 Niels van Hoorn <https://github.com/nvh>,
+//                 Junyoung Clare Jang <https://github.com/Ailrun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
-declare var tinycolor: tinycolor;
+declare namespace tinycolor {
+    type ColorInputWithoutInstance =
+        | string
+        | ColorFormats.PRGB
+        | ColorFormats.PRGBA
+        | ColorFormats.RGB
+        | ColorFormats.RGBA
+        | ColorFormats.HSL
+        | ColorFormats.HSLA
+        | ColorFormats.HSV
+        | ColorFormats.HSVA
+        ;
+    type ColorInput = ColorInputWithoutInstance | Instance;
 
-interface tinycolor {
+    namespace ColorFormats {
+        interface Alpha {
+            a: number;
+        }
 
-    /**
-     * Create a tinycolor instance of the color named.
-     *
-     * @param color - the color as a string to create an instance for.
-     */
-    (color: string): tinycolorInstance;
+        interface PRGB {
+            r: string;
+            g: string;
+            b: string;
+        }
 
-    /**
-     * Create a tinycolor instance with the given RGB values.
-     *
-     * @param color - the rgb values to apply to the new instance.
-     */
-    (color: ColorFormats.RGB): tinycolorInstance;
+        interface PRGBA extends PRGB, Alpha {}
 
-    /**
-     * Create a tinycolor instance with the given RGBA values.
-     *
-     * @param color - the rgba values to apply to the new instance.
-     */
-    (color: ColorFormats.RGBA): tinycolorInstance;
+        interface RGB {
+            r: number;
+            g: number;
+            b: number;
+        }
 
-    /**
-     * Create a tinycolor instance with the given HSL values.
-     *
-     * @param color - the hsl values to apply to the new instance.
-     */
-    (color: ColorFormats.HSL): tinycolorInstance;
+        interface RGBA extends RGB, Alpha {}
 
-    /**
-     * Create a tinycolor instance with the given HSLA values.
-     *
-     * @param color - the hsla values to apply to the new instance.
-     */
-    (color: ColorFormats.HSLA): tinycolorInstance;
+        interface HSL {
+            h: number;
+            s: number;
+            l: number;
+        }
 
-    /**
-     * Create a tinycolor instance with the given HSV values.
-     *
-     * @param color - the hsv values to apply to the new instance.
-     */
-    (color: ColorFormats.HSV): tinycolorInstance;
+        interface HSLA extends HSL, Alpha {}
 
-    /**
-     * Create a tinycolor instance with the given HSVA values.
-     *
-     * @param color - the hsva values to apply to the new instance.
-     */
-    (color: ColorFormats.HSVA): tinycolorInstance;
+        interface HSV {
+            h: number;
+            s: number;
+            v: number;
+        }
 
-    /**
-     * Create a tinycolor instance based off the relative values.
-     * Works with any color formats
-     *
-     * @param ratio - the relative color/hue values to apply to the new instance.
-     */
-    fromRatio(ratio: any): tinycolorInstance; // any of the interfaces defined in the ColorFormats module.
+        interface HSVA extends HSV {
+            a: number;
+        }
+    }
 
-    /**
-     * Compares the two colors and returns the difference between their brightness and color/hue
-     *
-     * @param firstColor - the first color to be used in the comparison.
-     * @param secondColor - the second color to be used in the comparison.
-     */
-    readability(firstColor: ColorInput, secondColor: ColorInput): Readable.Readable;
+    interface ConstructorOptions {
+        format?: string;
+        gradientType?: boolean;
+    }
 
-    /**
-     * Ensure that foreground and background color combinations meet WCAG2 guidelines.
-     *
-     * @param foreColor - the fore color wanted.
-     * @param backColor - the back color wanted.
-	 * @param wcag2 - The 'level' property states 'AA' or 'AAA' - if missing or invalid, it defaults to 'AA'; the 'size' property states 'large' or 'small' - if missing or invalid, it defaults to 'small'. If the entire object is absent, isReadable defaults to {level:"AA",size:"small"}.
-     */
-    isReadable(foreColor: ColorInput, backColor: ColorInput, wcag2?: {level?: string, size?: string}): boolean;
+    interface WCAG2Options {
+        level?: "AA" | "AAA";
+        size?: "large" | "small";
+    }
 
-    /**
-     * Given a base color and a list of possible foreground or background colors for that base,
-     *  returns the most readable color. Optionally returns Black or White if the most readable color is unreadable.
-     *
-     * @param color - the base color.
-     * @param colorsToCompare - array of colors to pick the most readable one from.
-	 * @param args - and object with extra arguments
-     */
-    mostReadable(color: ColorInput, colorsToCompare: ColorInput[], args?: {includeFallbackColors?: boolean, level?: string, size?: string}): tinycolorInstance;
+    interface MostReadableArgs extends WCAG2Options {
+        includeFallbackColors?: boolean;
+    }
 
-    /**/
-    mix(color1: ColorInput, color2: ColorInput, amount?: number): tinycolorInstance;
+    interface Constructor {
+        /**
+         * Create a tinycolor instance of the color named.
+         *
+         * @param color - the color as one of the valid color input format.
+         */
+        new (color?: ColorInput, opts?: ConstructorOptions): Instance;
+        (color?: ColorInput, opts?: ConstructorOptions): Instance;
 
-    /**
-     * Can be called with any tinycolor input
-     */
-    equals(color1: ColorInput, color2: ColorInput): boolean;
+        /**
+         * Create a tinycolor instance based off the relative values.
+         * Works with any color formats
+         *
+         * @param ratio - the relative color/hue values to apply to the new instance.
+         */
+        fromRatio(ratio?: ColorInputWithoutInstance): Instance;
 
-    /**
-     * Returns a random color
-     */
-    random(): tinycolorInstance;
+        /**
+         * Compares two colors. Each colors can be any color inputs.
+         */
+        equals(color1?: ColorInput, color2?: ColorInput): boolean;
 
-    /**
-     * key: hex value
-     * value: string name ex. hexnames["f00"] --> "red"
-     */
-    hexNames: { [key: string]: string };
+        /**
+         * Returns a random color
+         */
+        random(): Instance;
 
-    /**
-     * key: 'real' color name
-     * value: hex value ex. names["red"] --> "f00"
-     */
-    names: { [key: string]: string };
-}
+        mix(color1: ColorInput, color2: ColorInput, amount?: number): Instance;
 
-interface tinycolorInstance {
+        /**
+         * Compares the two colors and returns the constrast between two colors as a number.
+         *
+         * @param color1 - the first color to be used in the comparison.
+         * @param color2 - the second color to be used in the comparison.
+         */
+        readability(color1: ColorInput, color2: ColorInput): number;
 
-    /**
-     * Return an indication whether the color was successfully parsed.
-     */
-    isValid(): boolean;
+        /**
+         * Ensure that foreground and background color combinations meet WCAG2 guidelines.
+         *
+         * @param color1 - the fore color wanted.
+         * @param color2 - the back color wanted.
+         * @param wcag2 - WCAG option. If the entire object is absent, function use the default of {level:"AA",size:"small"}.
+         * @param wcag2.level - The 'level' property states 'AA' or 'AAA'
+         *     if missing or invalid, it defaults to 'AA'
+         * @param wcag2.size - The 'size' property states 'large' or 'small'
+         *     if missing or invalid, it defaults to 'small'.
+         */
+        isReadable(color1: ColorInput, color2: ColorInput, wcag2?: WCAG2Options): boolean;
 
-    /**
-     * Return an indication whether the color's perceived brightness is light.
-     */
-    isLight(): boolean;
+        /**
+         * Given a base color and a list of possible foreground or background colors for that base,
+         *  returns the most readable color. Optionally returns Black or White if the most readable color is unreadable.
+         *
+         * @param color - the base color.
+         * @param colorsToCompare - array of colors to pick the most readable one from.
+         * @param args - and object with extra arguments
+         */
+        mostReadable(baseColor: ColorInput, colorList: ColorInput[], args?: MostReadableArgs): Instance;
 
-    /**
-     * Return an indication whether the color's perceived brightness is dark.
-     */
-    isDark(): boolean;
+        /**
+         * key: 'real' color name
+         * value: hex value ex. names["red"] --> "f00"
+         */
+        names: {
+            aliceblue: "f0f8ff";
+            antiquewhite: "faebd7";
+            aqua: "0ff";
+            aquamarine: "7fffd4";
+            azure: "f0ffff";
+            beige: "f5f5dc";
+            bisque: "ffe4c4";
+            black: "000";
+            blanchedalmond: "ffebcd";
+            blue: "00f";
+            blueviolet: "8a2be2";
+            brown: "a52a2a";
+            burlywood: "deb887";
+            burntsienna: "ea7e5d";
+            cadetblue: "5f9ea0";
+            chartreuse: "7fff00";
+            chocolate: "d2691e";
+            coral: "ff7f50";
+            cornflowerblue: "6495ed";
+            cornsilk: "fff8dc";
+            crimson: "dc143c";
+            cyan: "0ff";
+            darkblue: "00008b";
+            darkcyan: "008b8b";
+            darkgoldenrod: "b8860b";
+            darkgray: "a9a9a9";
+            darkgreen: "006400";
+            darkgrey: "a9a9a9";
+            darkkhaki: "bdb76b";
+            darkmagenta: "8b008b";
+            darkolivegreen: "556b2f";
+            darkorange: "ff8c00";
+            darkorchid: "9932cc";
+            darkred: "8b0000";
+            darksalmon: "e9967a";
+            darkseagreen: "8fbc8f";
+            darkslateblue: "483d8b";
+            darkslategray: "2f4f4f";
+            darkslategrey: "2f4f4f";
+            darkturquoise: "00ced1";
+            darkviolet: "9400d3";
+            deeppink: "ff1493";
+            deepskyblue: "00bfff";
+            dimgray: "696969";
+            dimgrey: "696969";
+            dodgerblue: "1e90ff";
+            firebrick: "b22222";
+            floralwhite: "fffaf0";
+            forestgreen: "228b22";
+            fuchsia: "f0f";
+            gainsboro: "dcdcdc";
+            ghostwhite: "f8f8ff";
+            gold: "ffd700";
+            goldenrod: "daa520";
+            gray: "808080";
+            green: "008000";
+            greenyellow: "adff2f";
+            grey: "808080";
+            honeydew: "f0fff0";
+            hotpink: "ff69b4";
+            indianred: "cd5c5c";
+            indigo: "4b0082";
+            ivory: "fffff0";
+            khaki: "f0e68c";
+            lavender: "e6e6fa";
+            lavenderblush: "fff0f5";
+            lawngreen: "7cfc00";
+            lemonchiffon: "fffacd";
+            lightblue: "add8e6";
+            lightcoral: "f08080";
+            lightcyan: "e0ffff";
+            lightgoldenrodyellow: "fafad2";
+            lightgray: "d3d3d3";
+            lightgreen: "90ee90";
+            lightgrey: "d3d3d3";
+            lightpink: "ffb6c1";
+            lightsalmon: "ffa07a";
+            lightseagreen: "20b2aa";
+            lightskyblue: "87cefa";
+            lightslategray: "789";
+            lightslategrey: "789";
+            lightsteelblue: "b0c4de";
+            lightyellow: "ffffe0";
+            lime: "0f0";
+            limegreen: "32cd32";
+            linen: "faf0e6";
+            magenta: "f0f";
+            maroon: "800000";
+            mediumaquamarine: "66cdaa";
+            mediumblue: "0000cd";
+            mediumorchid: "ba55d3";
+            mediumpurple: "9370db";
+            mediumseagreen: "3cb371";
+            mediumslateblue: "7b68ee";
+            mediumspringgreen: "00fa9a";
+            mediumturquoise: "48d1cc";
+            mediumvioletred: "c71585";
+            midnightblue: "191970";
+            mintcream: "f5fffa";
+            mistyrose: "ffe4e1";
+            moccasin: "ffe4b5";
+            navajowhite: "ffdead";
+            navy: "000080";
+            oldlace: "fdf5e6";
+            olive: "808000";
+            olivedrab: "6b8e23";
+            orange: "ffa500";
+            orangered: "ff4500";
+            orchid: "da70d6";
+            palegoldenrod: "eee8aa";
+            palegreen: "98fb98";
+            paleturquoise: "afeeee";
+            palevioletred: "db7093";
+            papayawhip: "ffefd5";
+            peachpuff: "ffdab9";
+            peru: "cd853f";
+            pink: "ffc0cb";
+            plum: "dda0dd";
+            powderblue: "b0e0e6";
+            purple: "800080";
+            rebeccapurple: "663399";
+            red: "f00";
+            rosybrown: "bc8f8f";
+            royalblue: "4169e1";
+            saddlebrown: "8b4513";
+            salmon: "fa8072";
+            sandybrown: "f4a460";
+            seagreen: "2e8b57";
+            seashell: "fff5ee";
+            sienna: "a0522d";
+            silver: "c0c0c0";
+            skyblue: "87ceeb";
+            slateblue: "6a5acd";
+            slategray: "708090";
+            slategrey: "708090";
+            snow: "fffafa";
+            springgreen: "00ff7f";
+            steelblue: "4682b4";
+            tan: "d2b48c";
+            teal: "008080";
+            thistle: "d8bfd8";
+            tomato: "ff6347";
+            turquoise: "40e0d0";
+            violet: "ee82ee";
+            wheat: "f5deb3";
+            white: "fff";
+            whitesmoke: "f5f5f5";
+            yellow: "ff0";
+            yellowgreen: "9acd32";
+        };
 
-    /**
-     * Returns the format used to create the tinycolor instance.
-     */
-    getFormat(): string;
+        /**
+         * key: hex value
+         * value: string name ex. hexnames["f00"] --> "red"
+         */
+        hexNames: {
+            "f0f8ff": "aliceblue";
+            "faebd7": "antiquewhite";
+            "0ff": "aqua" | "cyan";
+            "7fffd4": "aquamarine";
+            "f0ffff": "azure";
+            "f5f5dc": "beige";
+            "ffe4c4": "bisque";
+            "000": "black";
+            "ffebcd": "blanchedalmond";
+            "00f": "blue";
+            "8a2be2": "blueviolet";
+            "a52a2a": "brown";
+            "deb887": "burlywood";
+            "ea7e5d": "burntsienna";
+            "5f9ea0": "cadetblue";
+            "7fff00": "chartreuse";
+            "d2691e": "chocolate";
+            "ff7f50": "coral";
+            "6495ed": "cornflowerblue";
+            "fff8dc": "cornsilk";
+            "dc143c": "crimson";
+            "00008b": "darkblue";
+            "008b8b": "darkcyan";
+            "b8860b": "darkgoldenrod";
+            "a9a9a9": "darkgray" | "darkgrey";
+            "006400": "darkgreen";
+            "bdb76b": "darkkhaki";
+            "8b008b": "darkmagenta";
+            "556b2f": "darkolivegreen";
+            "ff8c00": "darkorange";
+            "9932cc": "darkorchid";
+            "8b0000": "darkred";
+            "e9967a": "darksalmon";
+            "8fbc8f": "darkseagreen";
+            "483d8b": "darkslateblue";
+            "2f4f4f": "darkslategray" | "darkslategrey";
+            "00ced1": "darkturquoise";
+            "9400d3": "darkviolet";
+            "ff1493": "deeppink";
+            "00bfff": "deepskyblue";
+            "696969": "dimgray" | "dimgrey";
+            "1e90ff": "dodgerblue";
+            "b22222": "firebrick";
+            "fffaf0": "floralwhite";
+            "228b22": "forestgreen";
+            "f0f": "fuchsia" | "magenta";
+            "dcdcdc": "gainsboro";
+            "f8f8ff": "ghostwhite";
+            "ffd700": "gold";
+            "daa520": "goldenrod";
+            "808080": "gray" | "grey";
+            "008000": "green";
+            "adff2f": "greenyellow";
+            "f0fff0": "honeydew";
+            "ff69b4": "hotpink";
+            "cd5c5c": "indianred";
+            "4b0082": "indigo";
+            "fffff0": "ivory";
+            "f0e68c": "khaki";
+            "e6e6fa": "lavender";
+            "fff0f5": "lavenderblush";
+            "7cfc00": "lawngreen";
+            "fffacd": "lemonchiffon";
+            "add8e6": "lightblue";
+            "f08080": "lightcoral";
+            "e0ffff": "lightcyan";
+            "fafad2": "lightgoldenrodyellow";
+            "d3d3d3": "lightgray" | "lightgrey";
+            "90ee90": "lightgreen";
+            "ffb6c1": "lightpink";
+            "ffa07a": "lightsalmon";
+            "20b2aa": "lightseagreen";
+            "87cefa": "lightskyblue";
+            "789": "lightslategray" | "lightslategrey";
+            "b0c4de": "lightsteelblue";
+            "ffffe0": "lightyellow";
+            "0f0": "lime";
+            "32cd32": "limegreen";
+            "faf0e6": "linen";
+            "800000": "maroon";
+            "66cdaa": "mediumaquamarine";
+            "0000cd": "mediumblue";
+            "ba55d3": "mediumorchid";
+            "9370db": "mediumpurple";
+            "3cb371": "mediumseagreen";
+            "7b68ee": "mediumslateblue";
+            "00fa9a": "mediumspringgreen";
+            "48d1cc": "mediumturquoise";
+            "c71585": "mediumvioletred";
+            "191970": "midnightblue";
+            "f5fffa": "mintcream";
+            "ffe4e1": "mistyrose";
+            "ffe4b5": "moccasin";
+            "ffdead": "navajowhite";
+            "000080": "navy";
+            "fdf5e6": "oldlace";
+            "808000": "olive";
+            "6b8e23": "olivedrab";
+            "ffa500": "orange";
+            "ff4500": "orangered";
+            "da70d6": "orchid";
+            "eee8aa": "palegoldenrod";
+            "98fb98": "palegreen";
+            "afeeee": "paleturquoise";
+            "db7093": "palevioletred";
+            "ffefd5": "papayawhip";
+            "ffdab9": "peachpuff";
+            "cd853f": "peru";
+            "ffc0cb": "pink";
+            "dda0dd": "plum";
+            "b0e0e6": "powderblue";
+            "800080": "purple";
+            "663399": "rebeccapurple";
+            "f00": "red";
+            "bc8f8f": "rosybrown";
+            "4169e1": "royalblue";
+            "8b4513": "saddlebrown";
+            "fa8072": "salmon";
+            "f4a460": "sandybrown";
+            "2e8b57": "seagreen";
+            "fff5ee": "seashell";
+            "a0522d": "sienna";
+            "c0c0c0": "silver";
+            "87ceeb": "skyblue";
+            "6a5acd": "slateblue";
+            "708090": "slategray" | "slategrey";
+            "fffafa": "snow";
+            "00ff7f": "springgreen";
+            "4682b4": "steelblue";
+            "d2b48c": "tan";
+            "008080": "teal";
+            "d8bfd8": "thistle";
+            "ff6347": "tomato";
+            "40e0d0": "turquoise";
+            "ee82ee": "violet";
+            "f5deb3": "wheat";
+            "fff": "white";
+            "f5f5f5": "whitesmoke";
+            "ff0": "yellow";
+            "9acd32": "yellowgreen";
+        };
+    }
 
-    /**
-     * Returns the input passed into the constructer used to create the tinycolor instance.
-     */
-    getOriginalInput(): any; // any of the interfaces in ColorFormats or a string
+    interface Instance {
+        /**
+         * Return an indication whether the color's perceived brightness is dark.
+         */
+        isDark(): boolean;
 
-    /**
-     * Returns the alpha value of the color
-     */
-    getAlpha(): number;
+        /**
+         * Return an indication whether the color's perceived brightness is light.
+         */
+        isLight(): boolean;
 
-    /**
-     * Returns the perceived brightness of the color, from 0-255.
-     */
-    getBrightness(): number;
+        /**
+         * Return an indication whether the color was successfully parsed.
+         */
+        isValid(): boolean;
 
-    /**
-     * Returns the perceived luminance of a color, from 0-1.
-     */
-    getLuminance(): number;
+        /**
+         * Returns the input passed into the constructer used to create the tinycolor instance.
+         */
+        getOriginalInput(): ColorInput;
 
-    /**
-     * Sets the alpha value on the current color.
-     *
-     * @param alpha - The new alpha value. The accepted range is 0-1.
-     */
-    setAlpha(alpha: number): tinycolorInstance;
+        /**
+         * Returns the format used to create the tinycolor instance.
+         */
+        getFormat(): string;
 
-    /**
-     * Returns the object as a HSVA object.
-     */
-    toHsv(): ColorFormats.HSVA;
+        /**
+         * Returns the alpha value of the color
+         */
+        getAlpha(): number;
 
-    /**
-     * Returns the hsva values interpolated into a string with the following format:
-     * "hsva(xxx, xxx, xxx, xx)".
-     */
-    toHsvString(): string;
+        /**
+         * Returns the perceived brightness of the color, from 0-255.
+         */
+        getBrightness(): number;
 
-    /**
-     * Returns the object as a HSLA object.
-     */
-    toHsl(): ColorFormats.HSLA;
+        /**
+         * Returns the perceived luminance of a color, from 0-1.
+         */
+        getLuminance(): number;
 
-    /**
-     * Returns the hsla values interpolated into a string with the following format:
-     * "hsla(xxx, xxx, xxx, xx)".
-     */
-    toHslString(): string;
+        /**
+         * Sets the alpha value on the current color.
+         *
+         * @param alpha - The new alpha value. The accepted range is 0-1.
+         */
+        setAlpha(alpha: number): Instance;
 
-    /**
-     * Returns the hex value of the color.
-     */
-    toHex(): string;
+        /**
+         * Returns the object as a HSVA object.
+         */
+        toHsv(): ColorFormats.HSVA;
 
-    /**
-     * Returns the hex value of the color -with a # appened.
-     */
-    toHexString(): string;
+        /**
+         * Returns the hsva values interpolated into a string with the following format:
+         * "hsva(xxx, xxx, xxx, xx)".
+         */
+        toHsvString(): string;
 
-    /**
-     * Returns the hex 8 value of the color.
-     */
-    toHex8(): string;
+        /**
+         * Returns the object as a HSLA object.
+         */
+        toHsl(): ColorFormats.HSLA;
 
-    /**
-     * Returns the hex 8  value of the color -with a # appened.
-     */
-    toHex8String(): string;
+        /**
+         * Returns the hsla values interpolated into a string with the following format:
+         * "hsla(xxx, xxx, xxx, xx)".
+         */
+        toHslString(): string;
 
-    /**
-     * Returns the object as a RGBA object.
-     */
-    toRgb(): ColorFormats.RGBA;
+        /**
+         * Returns the hex value of the color.
+         */
+        toHex(): string;
 
-     /**
-     * Returns the RGBA values interpolated into a string with the following format:
-     * "RGBA(xxx, xxx, xxx, xx)".
-     */
-    toRgbString(): string;
+        /**
+         * Returns the hex value of the color -with a # appened.
+         */
+        toHexString(): string;
 
-    /**
-     * Returns the object as a RGBA object.
-     */
-    toPercentageRgb(): ColorFormats.RGBA;
+        /**
+         * Returns the hex 8 value of the color.
+         */
+        toHex8(): string;
 
-    /**
-     * Returns the RGBA relative values interpolated into a string with the following format:
-     * "RGBA(xxx, xxx, xxx, xx)".
-     */
-    toPercentageRgbString(): string;
+        /**
+         * Returns the hex 8  value of the color -with a # appened.
+         */
+        toHex8String(): string;
 
-    /**
-     * The 'real' name of the color -if there is one.
-     */
-    toName(): string;
+        /**
+         * Returns the object as a RGBA object.
+         */
+        toRgb(): ColorFormats.RGBA;
 
-    /**
-     * Returns the color represented as a Microsoft filter for use in old versions of IE.
-     */
-    toFilter(): string;
+        /**
+         * Returns the RGBA values interpolated into a string with the following format:
+         * "RGBA(xxx, xxx, xxx, xx)".
+         */
+        toRgbString(): string;
 
-    /**
-     * String representation of the color.
-     *
-     * @param format - The format to be used when displaying the string representation.
-     *  The accepted values are: "rgb", "prgb", "hex6", "hex3", "hex8", "name", "hsl", "hsv".
-     */
-    toString(format?: string): string;
+        /**
+         * Returns the object as a RGBA object.
+         */
+        toPercentageRgb(): ColorFormats.PRGBA;
 
-    /**
-     * Lighten the color a given amount. Providing 100 will always return white.
-     *
-     * @param amount - The amount to lighten by. The valid range is 0 to 100.
-     *  Default value: 10.
-     */
-    lighten(amount?: number): tinycolorInstance;
+        /**
+         * Returns the RGBA relative values interpolated into a string with the following format:
+         * "RGBA(xxx, xxx, xxx, xx)".
+         */
+        toPercentageRgbString(): string;
 
-    /**
-     * Brighten the color a given amount.
-     *
-     * @param amount - The amount to brighten by. The valid range is 0 to 100.
-     *  Default value: 10.
-     */
-    brighten(amount?: number): tinycolorInstance;
+        /**
+         * The 'real' name of the color -if there is one.
+         */
+        toName(): string | false;
 
-    /**
-     * Darken the color a given amount.
-     *  Providing 100 will always return black.
-     *
-     * @param amount - The amount to darken by. The valid range is 0 to 100.
-     *  Default value: 10.
-     */
-    darken(amount?: number): tinycolorInstance;
-    /**
-     * Desaturate the color a given amount.
-     *  Providing 100 will is the same as calling greyscale.
-     *
-     * @param amount - The amount to desaturate by. The valid range is 0 to 100.
-     *  Default value: 10.
-     */
-    desaturate(amount?: number): tinycolorInstance;
+        /**
+         * Returns the color represented as a Microsoft filter for use in old versions of IE.
+         */
+        toFilter(): string;
 
-    /**
-     * Saturate the color a given amount.
-     *
-     * @param amount - The amount to saturate by. The valid range is 0  to 100.
-     *  Default value: 10.
-     */
-    saturate(amount?: number): tinycolorInstance;
+        /**
+         * String representation of the color.
+         *
+         * @param format - The format to be used when displaying the string representation.
+         *  The accepted values are: "rgb", "prgb", "hex6", "hex3", "hex8", "name", "hsl", "hsv".
+         */
+        toString(format?: "rgb" | "prgb" | "hex" | "hex6" | "hex3" | "hex4" | "hex8" | "name" | "hsl" | "hsv"): string;
 
-    /**
-     * Completely desaturates a color into greyscale.
-     * Same as calling desaturate(100).
-     */
-    greyscale(): tinycolorInstance;
+        /**
+         * Gets a new instance with the current color
+         */
+        clone(): Instance;
 
-    /**
-     * Spin the hue a given amount. Calling with 0, 360, or -360 will do nothing.
-     *
-     * @param amount - The amount to spin by. The valid range is -360 to 360.
-     *  Default value: 0.
-     */
-    spin(amount?: number): tinycolorInstance;
+        /**
+         * Lighten the color a given amount. Providing 100 will always return white.
+         *
+         * @param amount - The amount to lighten by. The valid range is 0 to 100.
+         *  Default value: 10.
+         */
+        lighten(amount?: number): Instance;
 
-    /**
-     * Gets an analogous color scheme based off of the current color.
-     *
-     * @param results - The amount of results to return.
-     *  Default value: 6.
-     * @param slices - The amount to slice the input color by.
-     *  Default value: 30.
-     */
-    analogous(results?: number, slices?: number): tinycolorInstance[];
+        /**
+         * Brighten the color a given amount.
+         *
+         * @param amount - The amount to brighten by. The valid range is 0 to 100.
+         *  Default value: 10.
+         */
+        brighten(amount?: number): Instance;
 
-    /**
-     * Gets a monochromatic color scheme based off of the current color.
-     *
-     * @param results - The amount of results to return.
-     *  Default value: 6.
-     */
-    monochromatic(results?: number): tinycolorInstance[];
+        /**
+         * Darken the color a given amount.
+         *  Providing 100 will always return black.
+         *
+         * @param amount - The amount to darken by. The valid range is 0 to 100.
+         *  Default value: 10.
+         */
+        darken(amount?: number): Instance;
+        /**
+         * Desaturate the color a given amount.
+         *  Providing 100 will is the same as calling greyscale.
+         *
+         * @param amount - The amount to desaturate by. The valid range is 0 to 100.
+         *  Default value: 10.
+         */
+        desaturate(amount?: number): Instance;
 
-    /**
-     * Gets a split complement color scheme based off of the current color.
-     */
-    splitcomplement(): tinycolorInstance[];
+        /**
+         * Saturate the color a given amount.
+         *
+         * @param amount - The amount to saturate by. The valid range is 0  to 100.
+         *  Default value: 10.
+         */
+        saturate(amount?: number): Instance;
 
-    /**
-     * Gets a triad based off of the current color.
-     */
-    triad(): tinycolorInstance[];
+        /**
+         * Completely desaturates a color into greyscale.
+         * Same as calling desaturate(100).
+         */
+        greyscale(): Instance;
 
-    /**
-     * Gets a tetrad based off of the current color.
-     */
-    tetrad(): tinycolorInstance[];
+        /**
+         * Spin the hue a given amount. Calling with 0, 360, or -360 will do nothing.
+         *
+         * @param amount - The amount to spin by. The valid range is -360 to 360.
+         */
+        spin(amount: number): Instance;
 
-    /**
-     * Gets the complement of the current color
-     */
-    complement(): tinycolorInstance;
+        /**
+         * Gets an analogous color scheme based off of the current color.
+         *
+         * @param results - The amount of results to return.
+         *  Default value: 6.
+         * @param slices - The amount to slice the input color by.
+         *  Default value: 30.
+         */
+        analogous(results?: number, slices?: number): Instance[];
 
-    /**
-     * Gets a new instance with the current color
-     */
-    clone(): tinycolorInstance;
-}
+        /**
+         * Gets the complement of the current color
+         */
+        complement(): Instance;
 
-declare namespace Readable {
-    interface Readable {
-        brightness: number;
-        color: number;
+        /**
+         * Gets a monochromatic color scheme based off of the current color.
+         *
+         * @param results - The amount of results to return.
+         *  Default value: 6.
+         */
+        monochromatic(results?: number): Instance[];
+
+        /**
+         * Gets a split complement color scheme based off of the current color.
+         */
+        splitcomplement(): [Instance, Instance, Instance];
+
+        /**
+         * Gets a triad based off of the current color.
+         */
+        triad(): [Instance, Instance, Instance];
+
+        /**
+         * Gets a tetrad based off of the current color.
+         */
+        tetrad(): [Instance, Instance, Instance, Instance];
     }
 }
 
-declare namespace ColorFormats {
-    interface RGB {
-        r: number;
-        g: number;
-        b: number;
-    }
-
-    interface RGBA extends RGB {
-        a: number
-    }
-
-    interface HSL {
-        h: number;
-        s: number;
-        l: number;
-    }
-
-    interface HSLA extends HSL {
-        a: number;
-    }
-
-    interface HSV {
-        h: number;
-        s: number;
-        v: number;
-    }
-
-    interface HSVA extends HSV {
-        a: number;
-    }
-}
-
-type ColorInput = string | ColorFormats.RGB | ColorFormats.RGBA | ColorFormats.HSL | ColorFormats.HSLA | ColorFormats.HSV | ColorFormats.HSVA | tinycolorInstance
-
-declare module 'tinycolor2' {
-    export = tinycolor;
-}
\ No newline at end of file
+declare const tinycolor: tinycolor.Constructor;
+export = tinycolor;
+export as namespace tinycolor;
diff --git a/types/tinycolor2/tinycolor2-tests.ts b/types/tinycolor2/tinycolor2-tests.ts
index f6a6634f5f..96eb31ed23 100644
--- a/types/tinycolor2/tinycolor2-tests.ts
+++ b/types/tinycolor2/tinycolor2-tests.ts
@@ -1,126 +1,200 @@
-
-
 /*
  * Not all possible formats for construction are displayed.
  * To see a complete list please view: https://github.com/bgrins/TinyColor
  */
-var tester: tinycolorInstance = tinycolor("red");
+const testColor: tinycolor.Instance = tinycolor("red");
 
 /* Constructor Tests*/
 
 // string
-tester = tinycolor("#ffffff");
+// $ExpectType Instance
+tinycolor("#ffffff");
 
-//rgb && rgba
-tester = tinycolor({ r: 40, g: 30, b: 20 });
-tester = tinycolor({ r: 255, g: 20, b: 10, a: 0 });
-tester = tinycolor.fromRatio({ r: 0.5, g: 0.2, b: 1, a: 0 });
-tester = tinycolor.fromRatio({ r: 1, g: 0, b: 0.7, a: 0 });
+// rgb && rgba
+// $ExpectType Instance
+tinycolor({ r: 40, g: 30, b: 20 });
+// $ExpectType Instance
+tinycolor({ r: 255, g: 20, b: 10, a: 0 });
+// $ExpectType Instance
+tinycolor.fromRatio({ r: 0.5, g: 0.2, b: 1, a: 0 });
+// $ExpectType Instance
+tinycolor.fromRatio({ r: 1, g: 0, b: 0.7, a: 0 });
 
-//hsl && hsla
-tester = tinycolor({ h: 0, s: 0, l: 0 });
-tester = tinycolor({ h: 0, s: 0, l: 0, a: 0 });
-tester = tinycolor.fromRatio({ h: 0.5, s: 0.2, l: 1, a: 0 });
+// hsl && hsla
+// $ExpectType Instance
+tinycolor({ h: 0, s: 0, l: 0 });
+// $ExpectType Instance
+tinycolor({ h: 0, s: 0, l: 0, a: 0 });
+// $ExpectType Instance
+tinycolor.fromRatio({ h: 0.5, s: 0.2, l: 1, a: 0 });
 
-//hsv && hsva
-tester = tinycolor({ h: 0, s: 0, v: 0 });
-tester = tinycolor({ h: 0, s: 0, v: 0, a: 0 });
+// hsv && hsva
+// $ExpectType Instance
+tinycolor({ h: 0, s: 0, v: 0 });
+// $ExpectType Instance
+tinycolor({ h: 0, s: 0, v: 0, a: 0 });
 
-//tinycolor static methods
-tester = tinycolor.mix(tester, tester);
-tester = tinycolor.mix("#ff0000", "#00ff00");
-tester = tinycolor.mix(tester, tester, 50);
-tester = tinycolor.random();
-var isEqual = tinycolor.equals(tester, tester);
+// tinycolor static methods
+// $ExpectType Instance
+tinycolor.mix(testColor, testColor);
+// $ExpectType Instance
+tinycolor.mix("#ff0000", "#00ff00");
+// $ExpectType Instance
+tinycolor.mix(testColor, testColor, 50);
+// $ExpectType Instance
+tinycolor.random();
 
-/*Tinycolor object properties*/
+// $ExpectType boolean
+tinycolor.equals(testColor, testColor);
 
-var readable: Readable.Readable = tinycolor.readability(tester, tester);
-var isReadable: boolean = tinycolor.isReadable(tester, tester);
-var isReadable: boolean = tinycolor.isReadable(tester, tester, {size: "small"});
-tester = tinycolor.mostReadable(tester, [tester, tester, tester]);
-tester = tinycolor.mostReadable(tester, [tester, tester, tester], {size: "large", level:"AA"});
+// $ExpectType number
+tinycolor.readability(testColor, testColor);
+// $ExpectType boolean
+tinycolor.isReadable(testColor, testColor);
+// $ExpectType boolean
+tinycolor.isReadable(testColor, testColor, {size: "small"});
+// $ExpectType Instance
+tinycolor.mostReadable(testColor, [testColor, testColor, testColor]);
+// $ExpectType Instance
+tinycolor.mostReadable(testColor, [testColor, testColor, testColor], {size: "large", level: "AA"});
 
-var hexNames: { [key: string]: string } = tinycolor.hexNames;
-var names: { [key: string]: string } = tinycolor.names;
+const hexNames: { [key: string]: string } = tinycolor.hexNames;
+const names: { [key: string]: string } = tinycolor.names;
+// $ExpectType "linen"
+tinycolor.hexNames["faf0e6"];
+// $ExpectType "yellow"
+tinycolor.hexNames["ff0"];
+// $ExpectType "f0f8ff"
+tinycolor.names["aliceblue"];
+// $ExpectType "808080"
+tinycolor.names["gray"];
 
-/*Instance Methods*/
+/* Instance Methods */
 
-//check properties
-var isValid: boolean = tester.isValid();
-var isLight: boolean = tester.isLight();
-var isDark: boolean = tester.isDark();
+// check properties
+// $ExpectType boolean
+testColor.isValid();
+// $ExpectType boolean
+testColor.isLight();
+// $ExpectType boolean
+testColor.isDark();
 
-//get properties
-var alpha: number = tester.getAlpha();
-var brightness: number = tester.getBrightness();
-var format: string = tester.getFormat();
-var originalInput: any = tester.getOriginalInput();
+// get properties
+const alpha: number = testColor.getAlpha();
+// $ExpectType number
+testColor.getBrightness();
+// $ExpectType string
+testColor.getFormat();
+// $ExpectType ColorInput
+testColor.getOriginalInput();
 
-//set properties
-tester = tester.setAlpha(alpha);
+// set properties
+// $ExpectType Instance
+testColor.setAlpha(alpha);
 
-//representations
-var hsva: ColorFormats.HSVA = tester.toHsv();
-var hsvString: string = tester.toHsvString();
+// representations
+// $ExpectType HSVA
+testColor.toHsv();
+// $ExpectType string
+testColor.toHsvString();
 
-var hsl: ColorFormats.HSLA = tester.toHsl();
-var hslString: string = tester.toHslString();
+// $ExpectType HSLA
+testColor.toHsl();
+// $ExpectType string
+testColor.toHslString();
 
-var hex: string = tester.toHex();
-var hexString: string = tester.toHexString();
+// $ExpectType string
+testColor.toHex();
+// $ExpectType string
+testColor.toHexString();
 
-var hex8: string = tester.toHex8();
-var hex8String: string = tester.toHex8String();
+// $ExpectType string
+testColor.toHex8();
+// $ExpectType string
+testColor.toHex8String();
 
-var rgba: ColorFormats.RGBA = tester.toRgb();
-var rgbString: string = tester.toString();
+// $ExpectType RGBA
+testColor.toRgb();
+// $ExpectType string
+testColor.toString();
 
-var percentageRGBA: ColorFormats.RGBA = tester.toPercentageRgb();
-var percentageRGBString: string = tester.toPercentageRgbString();
+// $ExpectType PRGBA
+testColor.toPercentageRgb();
+// $ExpectType string
+testColor.toPercentageRgbString();
 
-var name_: string = tester.toName();
-var filter: string = tester.toFilter();
-var sString: string = tester.toString();
-sString = tester.toString("rgb");
-sString = tester.toString("prgb");
-sString = tester.toString("hex6");
-sString = tester.toString("hex3");
-sString = tester.toString("hex8");
-sString = tester.toString("name");
-sString = tester.toString("hsl");
-sString = tester.toString("hsv");
+// $ExpectType string | false
+testColor.toName();
+// $ExpectType string
+testColor.toFilter();
+// $ExpectType string
+testColor.toString();
+// $ExpectType string
+testColor.toString("rgb");
+// $ExpectType string
+testColor.toString("prgb");
+// $ExpectType string
+testColor.toString("hex6");
+// $ExpectType string
+testColor.toString("hex3");
+// $ExpectType string
+testColor.toString("hex8");
+// $ExpectType string
+testColor.toString("name");
+// $ExpectType string
+testColor.toString("hsl");
+// $ExpectType string
+testColor.toString("hsv");
 
-//color modifications
-tester = tester.lighten();
-tester = tester.lighten(20);
+// color modifications
+// $ExpectType Instance
+testColor.lighten();
+// $ExpectType Instance
+testColor.lighten(20);
 
-tester = tester.brighten();
-tester = tester.brighten(20);
+// $ExpectType Instance
+testColor.brighten();
+// $ExpectType Instance
+testColor.brighten(20);
 
-tester = tester.darken();
-tester = tester.darken(20);
+// $ExpectType Instance
+testColor.darken();
+// $ExpectType Instance
+testColor.darken(20);
 
-tester = tester.desaturate();
-tester = tester.desaturate(20);
+// $ExpectType Instance
+testColor.desaturate();
+// $ExpectType Instance
+testColor.desaturate(20);
 
-tester = tester.saturate();
-tester = tester.saturate(20);
+// $ExpectType Instance
+testColor.saturate();
+// $ExpectType Instance
+testColor.saturate(20);
 
-tester = tester.spin();
-tester = tester.spin(20);
+// $ExpectType Instance
+testColor.spin(20);
 
-tester = tester.greyscale();
+// $ExpectType Instance
+testColor.greyscale();
 
-//color combinations
-var colors: tinycolorInstance[] = tester.analogous();
-colors = tester.analogous(6, 30);
+// color combinations
+// $ExpectType Instance[]
+testColor.analogous();
+// $ExpectType Instance[]
+testColor.analogous(6, 30);
 
-colors = tester.monochromatic();
-colors = tester.monochromatic(10);
+// $ExpectType Instance[]
+testColor.monochromatic();
+// $ExpectType Instance[]
+testColor.monochromatic(10);
 
-colors = tester.splitcomplement();
-colors = tester.triad();
-colors = tester.tetrad();
+// $ExpectType [Instance, Instance, Instance]
+testColor.splitcomplement();
+// $ExpectType [Instance, Instance, Instance]
+testColor.triad();
+// $ExpectType [Instance, Instance, Instance, Instance]
+testColor.tetrad();
 
-tester = tester.complement();
\ No newline at end of file
+// $ExpectType Instance
+testColor.complement();
diff --git a/types/tinycolor2/tslint.json b/types/tinycolor2/tslint.json
index a41bf5d19a..64aace11d6 100644
--- a/types/tinycolor2/tslint.json
+++ b/types/tinycolor2/tslint.json
@@ -1,79 +1,6 @@
 {
     "extends": "dtslint/dt.json",
     "rules": {
-        "adjacent-overload-signatures": false,
-        "array-type": false,
-        "arrow-return-shorthand": false,
-        "ban-types": false,
-        "callable-types": false,
-        "comment-format": false,
-        "dt-header": false,
-        "eofline": false,
-        "export-just-namespace": false,
-        "import-spacing": false,
-        "interface-name": false,
-        "interface-over-type-literal": false,
-        "jsdoc-format": false,
-        "max-line-length": false,
-        "member-access": false,
-        "new-parens": false,
-        "no-any-union": false,
-        "no-boolean-literal-compare": false,
-        "no-conditional-assignment": false,
-        "no-consecutive-blank-lines": false,
-        "no-construct": false,
-        "no-declare-current-package": false,
-        "no-duplicate-imports": false,
-        "no-duplicate-variable": false,
-        "no-empty-interface": false,
-        "no-for-in-array": false,
-        "no-inferrable-types": false,
-        "no-internal-module": false,
-        "no-irregular-whitespace": false,
-        "no-mergeable-namespace": false,
-        "no-misused-new": false,
-        "no-namespace": false,
-        "no-object-literal-type-assertion": false,
-        "no-padding": false,
-        "no-redundant-jsdoc": false,
-        "no-redundant-jsdoc-2": false,
-        "no-redundant-undefined": false,
-        "no-reference-import": false,
-        "no-relative-import-in-test": false,
-        "no-self-import": false,
-        "no-single-declare-module": false,
-        "no-string-throw": false,
-        "no-unnecessary-callback-wrapper": false,
-        "no-unnecessary-class": false,
-        "no-unnecessary-generics": false,
-        "no-unnecessary-qualifier": false,
-        "no-unnecessary-type-assertion": false,
-        "no-useless-files": false,
-        "no-var-keyword": false,
-        "no-var-requires": false,
-        "no-void-expression": false,
-        "no-trailing-whitespace": false,
-        "object-literal-key-quotes": false,
-        "object-literal-shorthand": false,
-        "one-line": false,
-        "one-variable-per-declaration": false,
-        "only-arrow-functions": false,
-        "prefer-conditional-expression": false,
-        "prefer-const": false,
-        "prefer-declare-function": false,
-        "prefer-for-of": false,
-        "prefer-method-signature": false,
-        "prefer-template": false,
-        "radix": false,
-        "semicolon": false,
-        "space-before-function-paren": false,
-        "space-within-parens": false,
-        "strict-export-declare-modifiers": false,
-        "trim-file": false,
-        "triple-equals": false,
-        "typedef-whitespace": false,
-        "unified-signatures": false,
-        "void-return": false,
-        "whitespace": false
+        "max-line-length": false
     }
 }
diff --git a/types/tinycon/index.d.ts b/types/tinycon/index.d.ts
new file mode 100644
index 0000000000..3f385603cc
--- /dev/null
+++ b/types/tinycon/index.d.ts
@@ -0,0 +1,18 @@
+// Type definitions for tinycon 0.6
+// Project: https://github.com/tommoor/tinycon
+// Definitions by: Daniel Waxweiler <https://github.com/dwaxweiler>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export function setBubble(count: number): void;
+
+export function setOptions(options: TinyconOptions): void;
+
+export interface TinyconOptions {
+    abbreviate?: boolean;
+    background?: string;
+    color?: string;
+    fallback?: boolean;
+    font?: string;
+    height?: number;
+    width?: number;
+}
diff --git a/types/tinycon/tinycon-tests.ts b/types/tinycon/tinycon-tests.ts
new file mode 100644
index 0000000000..b4bcc304ac
--- /dev/null
+++ b/types/tinycon/tinycon-tests.ts
@@ -0,0 +1,13 @@
+import * as Tinycon from 'tinycon';
+
+Tinycon.setOptions({
+    abbreviate: false,
+    background: '#549A2F',
+    color: '#ffffff',
+    fallback: true,
+    font: '10px arial',
+    height: 9,
+    width: 7
+});
+
+Tinycon.setBubble(7);
diff --git a/types/tinycon/tsconfig.json b/types/tinycon/tsconfig.json
new file mode 100644
index 0000000000..2410f4bd8a
--- /dev/null
+++ b/types/tinycon/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",
+        "tinycon-tests.ts"
+    ]
+}
diff --git a/types/tinycon/tslint.json b/types/tinycon/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/tinycon/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/titanium/index.d.ts b/types/titanium/index.d.ts
index b191fd2766..e26d4aecb4 100644
--- a/types/titanium/index.d.ts
+++ b/types/titanium/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Titanium 7.1
+// Type definitions for Titanium 7.3
 // Project: https://github.com/appcelerator/titanium_mobile
 // Definitions by: Axway Appcelerator <https://github.com/appcelerator>
 //                 Jan Vennemann <https://github.com/janvennemann>
@@ -998,20 +998,30 @@ declare namespace Titanium {
 		const AUTOFILL_TYPE_CARD_EXPIRATION_DATE: string;
 
 		/**
-		 * Specifies the expectation of a card expectation day.
+		 * Specifies the expectation of a card expiration day.
 		 */
 		const AUTOFILL_TYPE_CARD_EXPIRATION_DAY: string;
 
 		/**
-		 * Specifies the expectation of a card expectation month.
+		 * Specifies the expectation of a card expiration month.
 		 */
 		const AUTOFILL_TYPE_CARD_EXPIRATION_MONTH: string;
 
 		/**
-		 * Specifies the expectation of a card expectation year.
+		 * Specifies the expectation of a card expiration year.
 		 */
 		const AUTOFILL_TYPE_CARD_EXPIRATION_YEAR: string;
 
+		/**
+		 * Specifies the expectation of a new password.
+		 */
+		const AUTOFILL_TYPE_NEW_PASSWORD: string;
+
+		/**
+		 * Specifies the expectation of a single-factor SMS login code.
+		 */
+		const AUTOFILL_TYPE_ONE_TIME_CODE: string;
+
 		/**
 		 * Converts strings formatted as addresses into clickable links.
 		 */
@@ -2332,6 +2342,11 @@ declare namespace Titanium {
 			 */
 			hiddenBehavior: number;
 
+			/**
+			 * Adds a horizontal parallax effect to the view
+			 */
+			horizontalMotionEffect: any;
+
 			/**
 			 * View's left position, in platform-specific units.
 			 */
@@ -2409,7 +2424,7 @@ declare namespace Titanium {
 			softKeyboardOnFocus: number;
 
 			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 * The view's tintColor
 			 */
 			tintColor: string;
 
@@ -2458,6 +2473,11 @@ declare namespace Titanium {
 			 */
 			transitionName: string;
 
+			/**
+			 * Adds a vertical parallax effect to the view
+			 */
+			verticalMotionEffect: any;
+
 			/**
 			 * Determines the blur radius used to create the shadow.
 			 */
@@ -2865,6 +2885,16 @@ declare namespace Titanium {
 			 */
 			setHiddenBehavior(hiddenBehavior: number): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.View.horizontalMotionEffect> property.
+			 */
+			getHorizontalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.horizontalMotionEffect> property.
+			 */
+			setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.View.left> property.
 			 */
@@ -3125,6 +3155,16 @@ declare namespace Titanium {
 			 */
 			setTransitionName(transitionName: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.View.verticalMotionEffect> property.
+			 */
+			getVerticalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.verticalMotionEffect> property.
+			 */
+			setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.View.viewShadowRadius> property.
 			 */
@@ -3361,6 +3401,11 @@ declare namespace Titanium {
 			 */
 			hiddenBehavior: number;
 
+			/**
+			 * Adds a horizontal parallax effect to the view
+			 */
+			horizontalMotionEffect: any;
+
 			/**
 			 * View's left position, in platform-specific units.
 			 */
@@ -3438,7 +3483,7 @@ declare namespace Titanium {
 			softKeyboardOnFocus: number;
 
 			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 * The view's tintColor
 			 */
 			tintColor: string;
 
@@ -3487,6 +3532,11 @@ declare namespace Titanium {
 			 */
 			transitionName: string;
 
+			/**
+			 * Adds a vertical parallax effect to the view
+			 */
+			verticalMotionEffect: any;
+
 			/**
 			 * Determines the blur radius used to create the shadow.
 			 */
@@ -3894,6 +3944,16 @@ declare namespace Titanium {
 			 */
 			setHiddenBehavior(hiddenBehavior: number): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.View.horizontalMotionEffect> property.
+			 */
+			getHorizontalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.horizontalMotionEffect> property.
+			 */
+			setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.View.left> property.
 			 */
@@ -4154,6 +4214,16 @@ declare namespace Titanium {
 			 */
 			setTransitionName(transitionName: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.View.verticalMotionEffect> property.
+			 */
+			getVerticalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.View.verticalMotionEffect> property.
+			 */
+			setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.View.viewShadowRadius> property.
 			 */
@@ -4749,6 +4819,11 @@ declare namespace Titanium {
 			 */
 			cancel: number;
 
+			/**
+			 * Setting this to true requires the end-user to click a dialog button to close the dialog.
+			 */
+			buttonClickRequired: boolean;
+
 			/**
 			 * When this is set to `true`, the dialog is canceled when touched outside the window's bounds.
 			 */
@@ -4922,6 +4997,16 @@ declare namespace Titanium {
 			 */
 			setCancel(cancel: number): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.AlertDialog.buttonClickRequired> property.
+			 */
+			getButtonClickRequired(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.AlertDialog.buttonClickRequired> property.
+			 */
+			setButtonClickRequired(buttonClickRequired: boolean): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.AlertDialog.canceledOnTouchOutside> property.
 			 */
@@ -5612,6 +5697,11 @@ declare namespace Titanium {
 		 * A button widget that has four states: normal, disabled, focused and selected.
 		 */
 		interface Button extends Titanium.UI.View {
+			/**
+			 * Specify an attributed string for the label.
+			 */
+			attributedString: Titanium.UI.AttributedString;
+
 			/**
 			 * Default button text color, as a color name or hex triplet.
 			 */
@@ -5688,6 +5778,16 @@ declare namespace Titanium {
 			 */
 			verticalAlign: number | string;
 
+			/**
+			 * Gets the value of the <Titanium.UI.Button.attributedString> property.
+			 */
+			getAttributedString(): Titanium.UI.AttributedString;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Button.attributedString> property.
+			 */
+			setAttributedString(attributedString: Titanium.UI.AttributedString): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.Button.color> property.
 			 */
@@ -5944,11 +6044,6 @@ declare namespace Titanium {
 			 */
 			center: Point;
 
-			/**
-			 * Array of this view's child views.
-			 */
-			readonly children: Titanium.UI.View[];
-
 			/**
 			 * View's clipping behavior.
 			 */
@@ -5959,6 +6054,11 @@ declare namespace Titanium {
 			 */
 			height: number | string;
 
+			/**
+			 * Adds a horizontal parallax effect to the view
+			 */
+			horizontalMotionEffect: any;
+
 			/**
 			 * View's left position, in platform-specific units.
 			 */
@@ -6001,7 +6101,7 @@ declare namespace Titanium {
 			readonly size: Dimension;
 
 			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 * The view's tintColor
 			 */
 			tintColor: string;
 
@@ -6020,6 +6120,11 @@ declare namespace Titanium {
 			 */
 			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+			/**
+			 * Adds a vertical parallax effect to the view
+			 */
+			verticalMotionEffect: any;
+
 			/**
 			 * Determines the blur radius used to create the shadow.
 			 */
@@ -6065,21 +6170,6 @@ declare namespace Titanium {
 			 */
 			labels: string[] | BarItemType[];
 
-			/**
-			 * Style of the button bar.
-			 */
-			style: number;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any): void;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any[]): void;
-
 			/**
 			 * Animates this view.
 			 */
@@ -6101,21 +6191,6 @@ declare namespace Titanium {
 			 */
 			insertAt(params: any): void;
 
-			/**
-			 * Removes a child view from this view's hierarchy.
-			 */
-			remove(view: any): void;
-
-			/**
-			 * Removes all child views from this view's hierarchy.
-			 */
-			removeAllChildren(): void;
-
-			/**
-			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			replaceAt(params: any): void;
-
 			/**
 			 * Makes this view visible.
 			 */
@@ -6317,11 +6392,6 @@ declare namespace Titanium {
 			 */
 			setCenter(center: Point): void;
 
-			/**
-			 * Gets the value of the <Titanium.UI.ButtonBar.children> property.
-			 */
-			getChildren(): Titanium.UI.View[];
-
 			/**
 			 * Gets the value of the <Titanium.UI.ButtonBar.clipMode> property.
 			 */
@@ -6347,6 +6417,16 @@ declare namespace Titanium {
 			 */
 			setHeight(height: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.horizontalMotionEffect> property.
+			 */
+			getHorizontalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.horizontalMotionEffect> property.
+			 */
+			setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.ButtonBar.left> property.
 			 */
@@ -6477,6 +6557,16 @@ declare namespace Titanium {
 			 */
 			setTransform(transform: Titanium.UI.Matrix3D): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.ButtonBar.verticalMotionEffect> property.
+			 */
+			getVerticalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.ButtonBar.verticalMotionEffect> property.
+			 */
+			setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.ButtonBar.viewShadowRadius> property.
 			 */
@@ -6577,16 +6667,6 @@ declare namespace Titanium {
 			 */
 			setLabels(labels: ReadonlyArray<BarItemType>): void;
 
-			/**
-			 * Gets the value of the <Titanium.UI.ButtonBar.style> property.
-			 */
-			getStyle(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.ButtonBar.style> property.
-			 */
-			setStyle(style: number): void;
-
 		}
 
 		/**
@@ -6679,11 +6759,6 @@ declare namespace Titanium {
 			 */
 			center: Point;
 
-			/**
-			 * Array of this view's child views.
-			 */
-			readonly children: Titanium.UI.View[];
-
 			/**
 			 * View's clipping behavior.
 			 */
@@ -6694,6 +6769,11 @@ declare namespace Titanium {
 			 */
 			height: number | string;
 
+			/**
+			 * Adds a horizontal parallax effect to the view
+			 */
+			horizontalMotionEffect: any;
+
 			/**
 			 * View's left position, in platform-specific units.
 			 */
@@ -6736,7 +6816,7 @@ declare namespace Titanium {
 			readonly size: Dimension;
 
 			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 * The view's tintColor
 			 */
 			tintColor: string;
 
@@ -6755,6 +6835,11 @@ declare namespace Titanium {
 			 */
 			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+			/**
+			 * Adds a vertical parallax effect to the view
+			 */
+			verticalMotionEffect: any;
+
 			/**
 			 * Determines the blur radius used to create the shadow.
 			 */
@@ -6800,16 +6885,6 @@ declare namespace Titanium {
 			 */
 			selected: number;
 
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any): void;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any[]): void;
-
 			/**
 			 * Animates this view.
 			 */
@@ -6831,21 +6906,6 @@ declare namespace Titanium {
 			 */
 			insertAt(params: any): void;
 
-			/**
-			 * Removes a child view from this view's hierarchy.
-			 */
-			remove(view: any): void;
-
-			/**
-			 * Removes all child views from this view's hierarchy.
-			 */
-			removeAllChildren(): void;
-
-			/**
-			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			replaceAt(params: any): void;
-
 			/**
 			 * Makes this view visible.
 			 */
@@ -7067,11 +7127,6 @@ declare namespace Titanium {
 			 */
 			setCenter(center: Point): void;
 
-			/**
-			 * Gets the value of the <Titanium.UI.CoverFlowView.children> property.
-			 */
-			getChildren(): Titanium.UI.View[];
-
 			/**
 			 * Gets the value of the <Titanium.UI.CoverFlowView.clipMode> property.
 			 */
@@ -7097,6 +7152,16 @@ declare namespace Titanium {
 			 */
 			setHeight(height: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.horizontalMotionEffect> property.
+			 */
+			getHorizontalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.horizontalMotionEffect> property.
+			 */
+			setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.CoverFlowView.left> property.
 			 */
@@ -7227,6 +7292,16 @@ declare namespace Titanium {
 			 */
 			setTransform(transform: Titanium.UI.Matrix3D): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.CoverFlowView.verticalMotionEffect> property.
+			 */
+			getVerticalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.CoverFlowView.verticalMotionEffect> property.
+			 */
+			setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.CoverFlowView.viewShadowRadius> property.
 			 */
@@ -7520,6 +7595,11 @@ declare namespace Titanium {
 			 */
 			height: number | string;
 
+			/**
+			 * Adds a horizontal parallax effect to the view
+			 */
+			horizontalMotionEffect: any;
+
 			/**
 			 * View's left position, in platform-specific units.
 			 */
@@ -7562,7 +7642,7 @@ declare namespace Titanium {
 			readonly size: Dimension;
 
 			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 * The view's tintColor
 			 */
 			tintColor: string;
 
@@ -7581,6 +7661,11 @@ declare namespace Titanium {
 			 */
 			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+			/**
+			 * Adds a vertical parallax effect to the view
+			 */
+			verticalMotionEffect: any;
+
 			/**
 			 * Determines the blur radius used to create the shadow.
 			 */
@@ -7641,16 +7726,6 @@ declare namespace Titanium {
 			 */
 			wobble: boolean;
 
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any): void;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any[]): void;
-
 			/**
 			 * Animates this view.
 			 */
@@ -7672,21 +7747,6 @@ declare namespace Titanium {
 			 */
 			insertAt(params: any): void;
 
-			/**
-			 * Removes a child view from this view's hierarchy.
-			 */
-			remove(view: any): void;
-
-			/**
-			 * Removes all child views from this view's hierarchy.
-			 */
-			removeAllChildren(): void;
-
-			/**
-			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			replaceAt(params: any): void;
-
 			/**
 			 * Makes this view visible.
 			 */
@@ -7928,6 +7988,16 @@ declare namespace Titanium {
 			 */
 			setHeight(height: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.horizontalMotionEffect> property.
+			 */
+			getHorizontalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.horizontalMotionEffect> property.
+			 */
+			setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.DashboardView.left> property.
 			 */
@@ -8058,6 +8128,16 @@ declare namespace Titanium {
 			 */
 			setTransform(transform: Titanium.UI.Matrix3D): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.DashboardView.verticalMotionEffect> property.
+			 */
+			getVerticalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.DashboardView.verticalMotionEffect> property.
+			 */
+			setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.DashboardView.viewShadowRadius> property.
 			 */
@@ -8374,7 +8454,7 @@ declare namespace Titanium {
 			enableZoomControls: boolean;
 
 			/**
-			 * Set to `true` to prevent scaling of 2x-resolution remote images for Retina
+			 * Set to `true` to prevent scaling of 2x/3x-resolution remote images for retina
 			 * displays.
 			 */
 			hires: boolean;
@@ -8596,7 +8676,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * A text label, with optional background image.
+		 * A text label, with an optional background image.
 		 */
 		interface Label extends Titanium.UI.View {
 			/**
@@ -9396,7 +9476,7 @@ declare namespace Titanium {
 			separatorColor: string;
 
 			/**
-			 * The insets for list view separators (applies to all cells). This property is applicable on iOS 7 and greater.
+			 * The insets for list view separators (applies to all cells).
 			 */
 			separatorInsets: any;
 
@@ -9411,17 +9491,17 @@ declare namespace Titanium {
 			style: number;
 
 			/**
-			 * The insets for the table view header and footer. This property is applicable on iOS 7 and greater.
+			 * The insets for the table view header and footer.
 			 */
 			tableSeparatorInsets: any;
 
 			/**
-			 * The insets for the list view header and footer. This property is applicable on iOS 7 and greater.
+			 * The insets for the list view header and footer.
 			 */
 			listSeparatorInsets: any;
 
 			/**
-			 * The insets for list view cells (applies to all cells). This property is applicable on iOS 7 and greater.
+			 * The insets for list view cells (applies to all cells).
 			 */
 			rowSeparatorInsets: any;
 
@@ -9966,203 +10046,7 @@ declare namespace Titanium {
 		/**
 		 * A control that displays an image composited with a background image or color.
 		 */
-		interface MaskedImage extends Titanium.Proxy {
-			/**
-			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
-			 */
-			accessibilityHidden: boolean;
-
-			/**
-			 * Briefly describes what performing an action (such as a click) on the view will do.
-			 */
-			accessibilityHint: string;
-
-			/**
-			 * A succint label identifying the view for the device's accessibility service.
-			 */
-			accessibilityLabel: string;
-
-			/**
-			 * A string describing the value (if any) of the view for the device's accessibility service.
-			 */
-			accessibilityValue: string;
-
-			/**
-			 * Coordinate of the view about which to pivot an animation.
-			 */
-			anchorPoint: Point;
-
-			/**
-			 * Current position of the view during an animation.
-			 */
-			readonly animatedCenter: Point;
-
-			/**
-			 * Background color of the view, as a color name or hex triplet.
-			 */
-			backgroundColor: string;
-
-			/**
-			 * A background gradient for the view.
-			 */
-			backgroundGradient: Gradient;
-
-			/**
-			 * Background image for the view, specified as a local file path or URL.
-			 */
-			backgroundImage: string;
-
-			/**
-			 * Determines whether to tile a background across a view.
-			 */
-			backgroundRepeat: boolean;
-
-			/**
-			 * Size of the left end cap.
-			 */
-			backgroundLeftCap: number;
-
-			/**
-			 * Size of the top end cap.
-			 */
-			backgroundTopCap: number;
-
-			/**
-			 * Border color of the view, as a color name or hex triplet.
-			 */
-			borderColor: string;
-
-			/**
-			 * Radius for the rounded corners of the view's border.
-			 */
-			borderRadius: number;
-
-			/**
-			 * Border width of the view.
-			 */
-			borderWidth: number;
-
-			/**
-			 * View's bottom position, in platform-specific units.
-			 */
-			bottom: number | string;
-
-			/**
-			 * View's center position, in the parent view's coordinates.
-			 */
-			center: Point;
-
-			/**
-			 * Array of this view's child views.
-			 */
-			readonly children: Titanium.UI.View[];
-
-			/**
-			 * View's clipping behavior.
-			 */
-			clipMode: number;
-
-			/**
-			 * View height, in platform-specific units.
-			 */
-			height: number | string;
-
-			/**
-			 * View's left position, in platform-specific units.
-			 */
-			left: number | string;
-
-			/**
-			 * Specifies how the view positions its children.
-			 * One of: 'composite', 'vertical', or 'horizontal'.
-			 */
-			layout: string;
-
-			/**
-			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
-			 */
-			opacity: number;
-
-			/**
-			 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
-			 */
-			pullBackgroundColor: string;
-
-			/**
-			 * The preview context used in the 3D-Touch feature "Peek and Pop".
-			 */
-			previewContext: Titanium.UI.iOS.PreviewContext;
-
-			/**
-			 * View's right position, in platform-specific units.
-			 */
-			right: number | string;
-
-			/**
-			 * The bounding box of the view relative to its parent, in system units.
-			 */
-			readonly rect: Dimension;
-
-			/**
-			 * The size of the view in system units.
-			 */
-			readonly size: Dimension;
-
-			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
-			 */
-			tintColor: string;
-
-			/**
-			 * The view's top position.
-			 */
-			top: number | string;
-
-			/**
-			 * Determines whether view should receive touch events.
-			 */
-			touchEnabled: boolean;
-
-			/**
-			 * Transformation matrix to apply to the view.
-			 */
-			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-			/**
-			 * Determines the blur radius used to create the shadow.
-			 */
-			viewShadowRadius: number;
-
-			/**
-			 * Determines the color of the shadow.
-			 */
-			viewShadowColor: string;
-
-			/**
-			 * Determines the offset for the shadow of the view.
-			 */
-			viewShadowOffset: Point;
-
-			/**
-			 * Determines whether the view is visible.
-			 */
-			visible: boolean;
-
-			/**
-			 * View's width, in platform-specific units.
-			 */
-			width: number | string;
-
-			/**
-			 * Determines whether the layout has wrapping behavior.
-			 */
-			horizontalWrap: boolean;
-
-			/**
-			 * Z-index stack order position, relative to other sibling views.
-			 */
-			zIndex: number;
-
+		interface MaskedImage extends Titanium.UI.View {
 			/**
 			 * Image drawn as the background image.
 			 */
@@ -10183,488 +10067,6 @@ declare namespace Titanium {
 			 */
 			tint: string;
 
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any): void;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any[]): void;
-
-			/**
-			 * Animates this view.
-			 */
-			animate(animation: any, callback?: (param0: any) => any): void;
-
-			/**
-			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
-			 * view tree.
-			 */
-			finishLayout(): void;
-
-			/**
-			 * Hides this view.
-			 */
-			hide(options?: AnimationOption): void;
-
-			/**
-			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			insertAt(params: any): void;
-
-			/**
-			 * Removes a child view from this view's hierarchy.
-			 */
-			remove(view: any): void;
-
-			/**
-			 * Removes all child views from this view's hierarchy.
-			 */
-			removeAllChildren(): void;
-
-			/**
-			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			replaceAt(params: any): void;
-
-			/**
-			 * Makes this view visible.
-			 */
-			show(options?: AnimationOption): void;
-
-			/**
-			 * Starts a batch update of this view's layout properties.
-			 */
-			startLayout(): void;
-
-			/**
-			 * Returns an image of the rendered view, as a Blob.
-			 */
-			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
-
-			/**
-			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
-			 * they have been updated.
-			 */
-			updateLayout(params: any): void;
-
-			/**
-			 * Translates a point from this view's coordinate system to another view's coordinate system.
-			 */
-			convertPointToView(point: Point, destinationView: any): Point;
-
-			/**
-			 * Returns the matching view of a given view ID.
-			 */
-			getViewById(id: string): Titanium.UI.View;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityHidden> property.
-			 */
-			getAccessibilityHidden(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityHidden> property.
-			 */
-			setAccessibilityHidden(accessibilityHidden: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityHint> property.
-			 */
-			getAccessibilityHint(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityHint> property.
-			 */
-			setAccessibilityHint(accessibilityHint: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityLabel> property.
-			 */
-			getAccessibilityLabel(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityLabel> property.
-			 */
-			setAccessibilityLabel(accessibilityLabel: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.accessibilityValue> property.
-			 */
-			getAccessibilityValue(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.accessibilityValue> property.
-			 */
-			setAccessibilityValue(accessibilityValue: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.anchorPoint> property.
-			 */
-			getAnchorPoint(): Point;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.anchorPoint> property.
-			 */
-			setAnchorPoint(anchorPoint: Point): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.animatedCenter> property.
-			 */
-			getAnimatedCenter(): Point;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundColor> property.
-			 */
-			getBackgroundColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundColor> property.
-			 */
-			setBackgroundColor(backgroundColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundGradient> property.
-			 */
-			getBackgroundGradient(): Gradient;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundGradient> property.
-			 */
-			setBackgroundGradient(backgroundGradient: Gradient): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundImage> property.
-			 */
-			getBackgroundImage(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundImage> property.
-			 */
-			setBackgroundImage(backgroundImage: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundRepeat> property.
-			 */
-			getBackgroundRepeat(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundRepeat> property.
-			 */
-			setBackgroundRepeat(backgroundRepeat: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundLeftCap> property.
-			 */
-			getBackgroundLeftCap(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundLeftCap> property.
-			 */
-			setBackgroundLeftCap(backgroundLeftCap: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.backgroundTopCap> property.
-			 */
-			getBackgroundTopCap(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.backgroundTopCap> property.
-			 */
-			setBackgroundTopCap(backgroundTopCap: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.borderColor> property.
-			 */
-			getBorderColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.borderColor> property.
-			 */
-			setBorderColor(borderColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.borderRadius> property.
-			 */
-			getBorderRadius(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.borderRadius> property.
-			 */
-			setBorderRadius(borderRadius: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.borderWidth> property.
-			 */
-			getBorderWidth(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.borderWidth> property.
-			 */
-			setBorderWidth(borderWidth: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.bottom> property.
-			 */
-			getBottom(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.bottom> property.
-			 */
-			setBottom(bottom: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.bottom> property.
-			 */
-			setBottom(bottom: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.center> property.
-			 */
-			getCenter(): Point;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.center> property.
-			 */
-			setCenter(center: Point): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.children> property.
-			 */
-			getChildren(): Titanium.UI.View[];
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.clipMode> property.
-			 */
-			getClipMode(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.clipMode> property.
-			 */
-			setClipMode(clipMode: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.height> property.
-			 */
-			getHeight(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.height> property.
-			 */
-			setHeight(height: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.height> property.
-			 */
-			setHeight(height: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.left> property.
-			 */
-			getLeft(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.left> property.
-			 */
-			setLeft(left: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.left> property.
-			 */
-			setLeft(left: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.layout> property.
-			 */
-			getLayout(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.layout> property.
-			 */
-			setLayout(layout: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.opacity> property.
-			 */
-			getOpacity(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.opacity> property.
-			 */
-			setOpacity(opacity: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.pullBackgroundColor> property.
-			 */
-			getPullBackgroundColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.pullBackgroundColor> property.
-			 */
-			setPullBackgroundColor(pullBackgroundColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.previewContext> property.
-			 */
-			getPreviewContext(): Titanium.UI.iOS.PreviewContext;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.previewContext> property.
-			 */
-			setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.right> property.
-			 */
-			getRight(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.right> property.
-			 */
-			setRight(right: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.right> property.
-			 */
-			setRight(right: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.rect> property.
-			 */
-			getRect(): Dimension;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.size> property.
-			 */
-			getSize(): Dimension;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.tintColor> property.
-			 */
-			getTintColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.tintColor> property.
-			 */
-			setTintColor(tintColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.top> property.
-			 */
-			getTop(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.top> property.
-			 */
-			setTop(top: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.top> property.
-			 */
-			setTop(top: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.touchEnabled> property.
-			 */
-			getTouchEnabled(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.touchEnabled> property.
-			 */
-			setTouchEnabled(touchEnabled: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.transform> property.
-			 */
-			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.transform> property.
-			 */
-			setTransform(transform: Titanium.UI.Matrix2D): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.transform> property.
-			 */
-			setTransform(transform: Titanium.UI.Matrix3D): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.viewShadowRadius> property.
-			 */
-			getViewShadowRadius(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.viewShadowRadius> property.
-			 */
-			setViewShadowRadius(viewShadowRadius: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.viewShadowColor> property.
-			 */
-			getViewShadowColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.viewShadowColor> property.
-			 */
-			setViewShadowColor(viewShadowColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.viewShadowOffset> property.
-			 */
-			getViewShadowOffset(): Point;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.viewShadowOffset> property.
-			 */
-			setViewShadowOffset(viewShadowOffset: Point): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.visible> property.
-			 */
-			getVisible(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.visible> property.
-			 */
-			setVisible(visible: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.width> property.
-			 */
-			getWidth(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.width> property.
-			 */
-			setWidth(width: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.width> property.
-			 */
-			setWidth(width: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.horizontalWrap> property.
-			 */
-			getHorizontalWrap(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.horizontalWrap> property.
-			 */
-			setHorizontalWrap(horizontalWrap: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.MaskedImage.zIndex> property.
-			 */
-			getZIndex(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.MaskedImage.zIndex> property.
-			 */
-			setZIndex(zIndex: number): void;
-
 			/**
 			 * Gets the value of the <Titanium.UI.MaskedImage.mask> property.
 			 */
@@ -10711,262 +10113,6 @@ declare namespace Titanium {
 		 * A toast notification.
 		 */
 		interface Notification extends Titanium.Proxy {
-			/**
-			 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
-			 */
-			accessibilityHidden: boolean;
-
-			/**
-			 * Briefly describes what performing an action (such as a click) on the view will do.
-			 */
-			accessibilityHint: string;
-
-			/**
-			 * A succint label identifying the view for the device's accessibility service.
-			 */
-			accessibilityLabel: string;
-
-			/**
-			 * A string describing the value (if any) of the view for the device's accessibility service.
-			 */
-			accessibilityValue: string;
-
-			/**
-			 * Background color of the view, as a color name or hex triplet.
-			 */
-			backgroundColor: string;
-
-			/**
-			 * Disabled background color of the view, as a color name or hex triplet.
-			 */
-			backgroundDisabledColor: string;
-
-			/**
-			 * Disabled background image for the view, specified as a local file path or URL.
-			 */
-			backgroundDisabledImage: string;
-
-			/**
-			 * Focused background color of the view, as a color name or hex triplet.
-			 */
-			backgroundFocusedColor: string;
-
-			/**
-			 * Focused background image for the view, specified as a local file path or URL.
-			 */
-			backgroundFocusedImage: string;
-
-			/**
-			 * A background gradient for the view.
-			 */
-			backgroundGradient: Gradient;
-
-			/**
-			 * Background image for the view, specified as a local file path or URL.
-			 */
-			backgroundImage: string;
-
-			/**
-			 * Determines whether to tile a background across a view.
-			 */
-			backgroundRepeat: boolean;
-
-			/**
-			 * Selected background color of the view, as a color name or hex triplet.
-			 */
-			backgroundSelectedColor: string;
-
-			/**
-			 * Selected background image url for the view, specified as a local file path or URL.
-			 */
-			backgroundSelectedImage: string;
-
-			/**
-			 * Border color of the view, as a color name or hex triplet.
-			 */
-			borderColor: string;
-
-			/**
-			 * Radius for the rounded corners of the view's border.
-			 */
-			borderRadius: number;
-
-			/**
-			 * Border width of the view.
-			 */
-			borderWidth: number;
-
-			/**
-			 * View's bottom position, in platform-specific units.
-			 */
-			bottom: number | string;
-
-			/**
-			 * View's center position, in the parent view's coordinates.
-			 */
-			center: Point;
-
-			/**
-			 * Array of this view's child views.
-			 */
-			readonly children: Titanium.UI.View[];
-
-			/**
-			 * Base elevation of the view relative to its parent in pixels.
-			 */
-			elevation: number;
-
-			/**
-			 * Whether view should be focusable while navigating with the trackball.
-			 */
-			focusable: boolean;
-
-			/**
-			 * View height, in platform-specific units.
-			 */
-			height: number | string;
-
-			/**
-			 * Sets the behavior when hiding an object to release or keep the free space
-			 */
-			hiddenBehavior: number;
-
-			/**
-			 * View's left position, in platform-specific units.
-			 */
-			left: number | string;
-
-			/**
-			 * Specifies how the view positions its children.
-			 * One of: 'composite', 'vertical', or 'horizontal'.
-			 */
-			layout: string;
-
-			/**
-			 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
-			 */
-			opacity: number;
-
-			/**
-			 * When on, animate call overrides current animation if applicable.
-			 */
-			overrideCurrentAnimation: boolean;
-
-			/**
-			 * View's right position, in platform-specific units.
-			 */
-			right: number | string;
-
-			/**
-			 * The bounding box of the view relative to its parent, in system units.
-			 */
-			readonly rect: Dimension;
-
-			/**
-			 * Clockwise 2D rotation of the view in degrees.
-			 */
-			rotation: number;
-
-			/**
-			 * Clockwise rotation of the view in degrees (x-axis).
-			 */
-			rotationX: number;
-
-			/**
-			 * Clockwise rotation of the view in degrees (y-axis).
-			 */
-			rotationY: number;
-
-			/**
-			 * Scaling of the view in x-axis in pixels.
-			 */
-			scaleX: number;
-
-			/**
-			 * Scaling of the view in y-axis in pixels.
-			 */
-			scaleY: number;
-
-			/**
-			 * The size of the view in system units.
-			 */
-			readonly size: Dimension;
-
-			/**
-			 * Determines keyboard behavior when this view is focused.
-			 */
-			softKeyboardOnFocus: number;
-
-			/**
-			 * The view's top position.
-			 */
-			top: number | string;
-
-			/**
-			 * Determines whether view should receive touch events.
-			 */
-			touchEnabled: boolean;
-
-			/**
-			 * A material design visual construct that provides an instantaneous visual confirmation of touch point.
-			 */
-			touchFeedback: boolean;
-
-			/**
-			 * Optional touch feedback ripple color. This has no effect unless `touchFeedback` is true.
-			 */
-			touchFeedbackColor: string;
-
-			/**
-			 * Transformation matrix to apply to the view.
-			 */
-			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-			/**
-			 * Horizontal location of the view relative to its left position in pixels.
-			 */
-			translationX: number;
-
-			/**
-			 * Vertical location of the view relative to its top position in pixels.
-			 */
-			translationY: number;
-
-			/**
-			 * Depth of the view relative to its elevation in pixels.
-			 */
-			translationZ: number;
-
-			/**
-			 * A name to identify this view in activity transition.
-			 */
-			transitionName: string;
-
-			/**
-			 * Determines whether the view is visible.
-			 */
-			visible: boolean;
-
-			/**
-			 * View's width, in platform-specific units.
-			 */
-			width: number | string;
-
-			/**
-			 * Determines whether the layout has wrapping behavior.
-			 */
-			horizontalWrap: boolean;
-
-			/**
-			 * Z-index stack order position, relative to other sibling views.
-			 */
-			zIndex: number;
-
-			/**
-			 * Determines whether to keep the device screen on.
-			 */
-			keepScreenOn: boolean;
-
 			/**
 			 * Notification text to display.
 			 */
@@ -11002,612 +10148,10 @@ declare namespace Titanium {
 			 */
 			verticalMargin: number;
 
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any): void;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any[]): void;
-
-			/**
-			 * Animates this view.
-			 */
-			animate(animation: any, callback?: (param0: any) => any): void;
-
-			/**
-			 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
-			 * view tree.
-			 */
-			finishLayout(): void;
-
-			/**
-			 * Hides this view.
-			 */
-			hide(options?: AnimationOption): void;
-
-			/**
-			 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			insertAt(params: any): void;
-
-			/**
-			 * Removes a child view from this view's hierarchy.
-			 */
-			remove(view: any): void;
-
-			/**
-			 * Removes all child views from this view's hierarchy.
-			 */
-			removeAllChildren(): void;
-
-			/**
-			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			replaceAt(params: any): void;
-
 			/**
 			 * Show the notification.
 			 */
-			show(options?: AnimationOption): void;
-
-			/**
-			 * Starts a batch update of this view's layout properties.
-			 */
-			startLayout(): void;
-
-			/**
-			 * Returns an image of the rendered view, as a Blob.
-			 */
-			toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
-
-			/**
-			 * Performs a batch update of all supplied layout properties and schedules a layout pass after
-			 * they have been updated.
-			 */
-			updateLayout(params: any): void;
-
-			/**
-			 * Translates a point from this view's coordinate system to another view's coordinate system.
-			 */
-			convertPointToView(point: Point, destinationView: any): Point;
-
-			/**
-			 * Returns the matching view of a given view ID.
-			 */
-			getViewById(id: string): Titanium.UI.View;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.accessibilityHidden> property.
-			 */
-			getAccessibilityHidden(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.accessibilityHidden> property.
-			 */
-			setAccessibilityHidden(accessibilityHidden: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.accessibilityHint> property.
-			 */
-			getAccessibilityHint(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.accessibilityHint> property.
-			 */
-			setAccessibilityHint(accessibilityHint: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.accessibilityLabel> property.
-			 */
-			getAccessibilityLabel(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.accessibilityLabel> property.
-			 */
-			setAccessibilityLabel(accessibilityLabel: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.accessibilityValue> property.
-			 */
-			getAccessibilityValue(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.accessibilityValue> property.
-			 */
-			setAccessibilityValue(accessibilityValue: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundColor> property.
-			 */
-			getBackgroundColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundColor> property.
-			 */
-			setBackgroundColor(backgroundColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundDisabledColor> property.
-			 */
-			getBackgroundDisabledColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundDisabledColor> property.
-			 */
-			setBackgroundDisabledColor(backgroundDisabledColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundDisabledImage> property.
-			 */
-			getBackgroundDisabledImage(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundDisabledImage> property.
-			 */
-			setBackgroundDisabledImage(backgroundDisabledImage: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundFocusedColor> property.
-			 */
-			getBackgroundFocusedColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundFocusedColor> property.
-			 */
-			setBackgroundFocusedColor(backgroundFocusedColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundFocusedImage> property.
-			 */
-			getBackgroundFocusedImage(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundFocusedImage> property.
-			 */
-			setBackgroundFocusedImage(backgroundFocusedImage: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundGradient> property.
-			 */
-			getBackgroundGradient(): Gradient;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundGradient> property.
-			 */
-			setBackgroundGradient(backgroundGradient: Gradient): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundImage> property.
-			 */
-			getBackgroundImage(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundImage> property.
-			 */
-			setBackgroundImage(backgroundImage: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundRepeat> property.
-			 */
-			getBackgroundRepeat(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundRepeat> property.
-			 */
-			setBackgroundRepeat(backgroundRepeat: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundSelectedColor> property.
-			 */
-			getBackgroundSelectedColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundSelectedColor> property.
-			 */
-			setBackgroundSelectedColor(backgroundSelectedColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.backgroundSelectedImage> property.
-			 */
-			getBackgroundSelectedImage(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.backgroundSelectedImage> property.
-			 */
-			setBackgroundSelectedImage(backgroundSelectedImage: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.borderColor> property.
-			 */
-			getBorderColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.borderColor> property.
-			 */
-			setBorderColor(borderColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.borderRadius> property.
-			 */
-			getBorderRadius(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.borderRadius> property.
-			 */
-			setBorderRadius(borderRadius: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.borderWidth> property.
-			 */
-			getBorderWidth(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.borderWidth> property.
-			 */
-			setBorderWidth(borderWidth: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.bottom> property.
-			 */
-			getBottom(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.bottom> property.
-			 */
-			setBottom(bottom: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.bottom> property.
-			 */
-			setBottom(bottom: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.center> property.
-			 */
-			getCenter(): Point;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.center> property.
-			 */
-			setCenter(center: Point): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.children> property.
-			 */
-			getChildren(): Titanium.UI.View[];
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.elevation> property.
-			 */
-			getElevation(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.elevation> property.
-			 */
-			setElevation(elevation: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.focusable> property.
-			 */
-			getFocusable(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.focusable> property.
-			 */
-			setFocusable(focusable: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.height> property.
-			 */
-			getHeight(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.height> property.
-			 */
-			setHeight(height: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.height> property.
-			 */
-			setHeight(height: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.hiddenBehavior> property.
-			 */
-			getHiddenBehavior(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.hiddenBehavior> property.
-			 */
-			setHiddenBehavior(hiddenBehavior: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.left> property.
-			 */
-			getLeft(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.left> property.
-			 */
-			setLeft(left: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.left> property.
-			 */
-			setLeft(left: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.layout> property.
-			 */
-			getLayout(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.layout> property.
-			 */
-			setLayout(layout: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.opacity> property.
-			 */
-			getOpacity(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.opacity> property.
-			 */
-			setOpacity(opacity: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.overrideCurrentAnimation> property.
-			 */
-			getOverrideCurrentAnimation(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.overrideCurrentAnimation> property.
-			 */
-			setOverrideCurrentAnimation(overrideCurrentAnimation: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.right> property.
-			 */
-			getRight(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.right> property.
-			 */
-			setRight(right: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.right> property.
-			 */
-			setRight(right: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.rect> property.
-			 */
-			getRect(): Dimension;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.rotation> property.
-			 */
-			getRotation(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.rotation> property.
-			 */
-			setRotation(rotation: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.rotationX> property.
-			 */
-			getRotationX(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.rotationX> property.
-			 */
-			setRotationX(rotationX: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.rotationY> property.
-			 */
-			getRotationY(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.rotationY> property.
-			 */
-			setRotationY(rotationY: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.scaleX> property.
-			 */
-			getScaleX(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.scaleX> property.
-			 */
-			setScaleX(scaleX: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.scaleY> property.
-			 */
-			getScaleY(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.scaleY> property.
-			 */
-			setScaleY(scaleY: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.size> property.
-			 */
-			getSize(): Dimension;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.softKeyboardOnFocus> property.
-			 */
-			getSoftKeyboardOnFocus(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.softKeyboardOnFocus> property.
-			 */
-			setSoftKeyboardOnFocus(softKeyboardOnFocus: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.top> property.
-			 */
-			getTop(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.top> property.
-			 */
-			setTop(top: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.top> property.
-			 */
-			setTop(top: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.touchEnabled> property.
-			 */
-			getTouchEnabled(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.touchEnabled> property.
-			 */
-			setTouchEnabled(touchEnabled: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.touchFeedback> property.
-			 */
-			getTouchFeedback(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.touchFeedback> property.
-			 */
-			setTouchFeedback(touchFeedback: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.touchFeedbackColor> property.
-			 */
-			getTouchFeedbackColor(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.touchFeedbackColor> property.
-			 */
-			setTouchFeedbackColor(touchFeedbackColor: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.transform> property.
-			 */
-			getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.transform> property.
-			 */
-			setTransform(transform: Titanium.UI.Matrix2D): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.transform> property.
-			 */
-			setTransform(transform: Titanium.UI.Matrix3D): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.translationX> property.
-			 */
-			getTranslationX(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.translationX> property.
-			 */
-			setTranslationX(translationX: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.translationY> property.
-			 */
-			getTranslationY(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.translationY> property.
-			 */
-			setTranslationY(translationY: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.translationZ> property.
-			 */
-			getTranslationZ(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.translationZ> property.
-			 */
-			setTranslationZ(translationZ: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.transitionName> property.
-			 */
-			getTransitionName(): string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.transitionName> property.
-			 */
-			setTransitionName(transitionName: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.visible> property.
-			 */
-			getVisible(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.visible> property.
-			 */
-			setVisible(visible: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.width> property.
-			 */
-			getWidth(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.width> property.
-			 */
-			setWidth(width: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.width> property.
-			 */
-			setWidth(width: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.horizontalWrap> property.
-			 */
-			getHorizontalWrap(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.horizontalWrap> property.
-			 */
-			setHorizontalWrap(horizontalWrap: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.zIndex> property.
-			 */
-			getZIndex(): number;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.zIndex> property.
-			 */
-			setZIndex(zIndex: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.UI.Notification.keepScreenOn> property.
-			 */
-			getKeepScreenOn(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.UI.Notification.keepScreenOn> property.
-			 */
-			setKeepScreenOn(keepScreenOn: boolean): void;
+			show(): void;
 
 			/**
 			 * Gets the value of the <Titanium.UI.Notification.message> property.
@@ -12136,7 +10680,7 @@ declare namespace Titanium {
 		/**
 		 * A picker column, representing a selectable group of items in a <Titanium.UI.Picker>.
 		 */
-		interface PickerColumn extends Titanium.UI.View {
+		interface PickerColumn extends Titanium.Proxy {
 			/**
 			 * Number of rows in this column.
 			 */
@@ -12363,7 +10907,7 @@ declare namespace Titanium {
 
 		/**
 		 * The RefreshControl is a representation of the native iOS
-		 * [UIRefreshControl](https://developer.apple.com/library/ios/documentation/uikit/reference/UIRefreshControl_class/Reference/Reference.html)
+		 * [UIRefreshControl](https://developer.apple.com/documentation/uikit/uirefreshcontrol)
 		 * and Android [SwipeRefreshLayout](https://developer.android.com/reference/android/support/v4/widget/SwipeRefreshLayout.html).
 		 */
 		interface RefreshControl extends Titanium.Proxy {
@@ -13078,6 +11622,16 @@ declare namespace Titanium {
 			 */
 			color: string;
 
+			/**
+			 * Background image of the text field, specified as a local file path or URL.
+			 */
+			fieldBackgroundImage: string;
+
+			/**
+			 * Background image of the text field in disabled state, specified as a local file path or URL.
+			 */
+			fieldBackgroundDisabledImage: string;
+
 			/**
 			 * Text to show when the search bar field is not focused.
 			 */
@@ -13200,6 +11754,26 @@ declare namespace Titanium {
 			 */
 			setColor(color: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.fieldBackgroundImage> property.
+			 */
+			getFieldBackgroundImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.fieldBackgroundImage> property.
+			 */
+			setFieldBackgroundImage(fieldBackgroundImage: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.SearchBar.fieldBackgroundDisabledImage> property.
+			 */
+			getFieldBackgroundDisabledImage(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.SearchBar.fieldBackgroundDisabledImage> property.
+			 */
+			setFieldBackgroundDisabledImage(fieldBackgroundDisabledImage: string): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.SearchBar.hintText> property.
 			 */
@@ -13916,12 +12490,12 @@ declare namespace Titanium {
 			iconInsets: TabIconInsets;
 
 			/**
-			 * Defines if the icon property of the tab must be used as a mask. This property is applicable on iOS 7 and greater.
+			 * Defines if the icon property of the tab must be used as a mask.
 			 */
 			iconIsMask: boolean;
 
 			/**
-			 * Defines if the active icon property of the tab must be used as a mask. This property is applicable on iOS 7 and greater.
+			 * Defines if the active icon property of the tab must be used as a mask.
 			 */
 			activeIconIsMask: boolean;
 
@@ -14582,11 +13156,6 @@ declare namespace Titanium {
 			 */
 			center: Point;
 
-			/**
-			 * Array of this view's child views.
-			 */
-			readonly children: Titanium.UI.View[];
-
 			/**
 			 * View's clipping behavior.
 			 */
@@ -14597,6 +13166,11 @@ declare namespace Titanium {
 			 */
 			height: number | string;
 
+			/**
+			 * Adds a horizontal parallax effect to the view
+			 */
+			horizontalMotionEffect: any;
+
 			/**
 			 * View's left position, in platform-specific units.
 			 */
@@ -14639,7 +13213,7 @@ declare namespace Titanium {
 			readonly size: Dimension;
 
 			/**
-			 * The view's tintColor. This property is applicable on iOS 7 and greater.
+			 * The view's tintColor
 			 */
 			tintColor: string;
 
@@ -14658,6 +13232,11 @@ declare namespace Titanium {
 			 */
 			transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+			/**
+			 * Adds a vertical parallax effect to the view
+			 */
+			verticalMotionEffect: any;
+
 			/**
 			 * Determines the blur radius used to create the shadow.
 			 */
@@ -14708,16 +13287,6 @@ declare namespace Titanium {
 			 */
 			style: number;
 
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any): void;
-
-			/**
-			 * Adds a child to this view's hierarchy.
-			 */
-			add(view: any[]): void;
-
 			/**
 			 * Animates this view.
 			 */
@@ -14739,21 +13308,6 @@ declare namespace Titanium {
 			 */
 			insertAt(params: any): void;
 
-			/**
-			 * Removes a child view from this view's hierarchy.
-			 */
-			remove(view: any): void;
-
-			/**
-			 * Removes all child views from this view's hierarchy.
-			 */
-			removeAllChildren(): void;
-
-			/**
-			 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-			 */
-			replaceAt(params: any): void;
-
 			/**
 			 * Makes this view visible.
 			 */
@@ -14955,11 +13509,6 @@ declare namespace Titanium {
 			 */
 			setCenter(center: Point): void;
 
-			/**
-			 * Gets the value of the <Titanium.UI.TabbedBar.children> property.
-			 */
-			getChildren(): Titanium.UI.View[];
-
 			/**
 			 * Gets the value of the <Titanium.UI.TabbedBar.clipMode> property.
 			 */
@@ -14985,6 +13534,16 @@ declare namespace Titanium {
 			 */
 			setHeight(height: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.horizontalMotionEffect> property.
+			 */
+			getHorizontalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.horizontalMotionEffect> property.
+			 */
+			setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.TabbedBar.left> property.
 			 */
@@ -15115,6 +13674,16 @@ declare namespace Titanium {
 			 */
 			setTransform(transform: Titanium.UI.Matrix3D): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.TabbedBar.verticalMotionEffect> property.
+			 */
+			getVerticalMotionEffect(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TabbedBar.verticalMotionEffect> property.
+			 */
+			setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.TabbedBar.viewShadowRadius> property.
 			 */
@@ -15411,17 +13980,17 @@ declare namespace Titanium {
 			separatorColor: string;
 
 			/**
-			 * The insets for table view separators (applies to all cells). This property is applicable on iOS 7 and greater.
+			 * The insets for table view separators (applies to all cells).
 			 */
 			separatorInsets: any;
 
 			/**
-			 * The insets for the table view header and footer. This property is applicable on iOS 7 and greater.
+			 * The insets for the table view header and footer.
 			 */
 			tableSeparatorInsets: any;
 
 			/**
-			 * The insets for table view cells (applies to all cells). This property is applicable on iOS 7 and greater.
+			 * The insets for table view cells (applies to all cells).
 			 */
 			rowSeparatorInsets: any;
 
@@ -15441,6 +14010,27 @@ declare namespace Titanium {
 			 */
 			style: number;
 
+			/**
+			 * The background color of the search results (iOS-only).
+			 */
+			resultsBackgroundColor: string;
+
+			/**
+			 * Separator line color between rows inside search results,
+			 * as a color name or hex triplet (iOS-only).
+			 */
+			resultsSeparatorColor: string;
+
+			/**
+			 * The separator style of the search results (iOS-only).
+			 */
+			resultsSeparatorStyle: number;
+
+			/**
+			 * The insets for search results separators (applies to all cells & iOS-only).
+			 */
+			resultsSeparatorInsets: any;
+
 			/**
 			 * Appends a single row or an array of rows to the end of the table.
 			 */
@@ -15954,6 +14544,46 @@ declare namespace Titanium {
 			 */
 			setStyle(style: number): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.resultsBackgroundColor> property.
+			 */
+			getResultsBackgroundColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.resultsBackgroundColor> property.
+			 */
+			setResultsBackgroundColor(resultsBackgroundColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.resultsSeparatorColor> property.
+			 */
+			getResultsSeparatorColor(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.resultsSeparatorColor> property.
+			 */
+			setResultsSeparatorColor(resultsSeparatorColor: string): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.resultsSeparatorStyle> property.
+			 */
+			getResultsSeparatorStyle(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.resultsSeparatorStyle> property.
+			 */
+			setResultsSeparatorStyle(resultsSeparatorStyle: number): void;
+
+			/**
+			 * Gets the value of the <Titanium.UI.TableView.resultsSeparatorInsets> property.
+			 */
+			getResultsSeparatorInsets(): any;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TableView.resultsSeparatorInsets> property.
+			 */
+			setResultsSeparatorInsets(resultsSeparatorInsets: any): void;
+
 		}
 
 		/**
@@ -16473,11 +15103,21 @@ declare namespace Titanium {
 			 */
 			keyboardType: number;
 
+			/**
+			 * Number of lines tall the text area height will be, if set.
+			 */
+			lines: number;
+
 			/**
 			 * Maximum length of text field input.
 			 */
 			maxLength: number;
 
+			/**
+			 * Maximum line count of text field input.
+			 */
+			maxLines: number;
+
 			/**
 			 * Sets the left and right padding of this TextArea. The text will always be vertically centered.
 			 */
@@ -16784,6 +15424,16 @@ declare namespace Titanium {
 			 */
 			setKeyboardType(keyboardType: number): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.lines> property.
+			 */
+			getLines(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.lines> property.
+			 */
+			setLines(lines: number): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.TextArea.maxLength> property.
 			 */
@@ -16794,6 +15444,16 @@ declare namespace Titanium {
 			 */
 			setMaxLength(maxLength: number): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.TextArea.maxLines> property.
+			 */
+			getMaxLines(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextArea.maxLines> property.
+			 */
+			setMaxLines(maxLines: number): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.TextArea.padding> property.
 			 */
@@ -17079,6 +15739,11 @@ declare namespace Titanium {
 			 */
 			passwordMask: boolean;
 
+			/**
+			 * Set password rules that should be used for this text field.
+			 */
+			passwordRules: string;
+
 			/**
 			 * Specifies the text to display on the keyboard `Return` key when this field is focused.
 			 */
@@ -17500,6 +16165,16 @@ declare namespace Titanium {
 			 */
 			setPasswordMask(passwordMask: boolean): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.TextField.passwordRules> property.
+			 */
+			getPasswordRules(): string;
+
+			/**
+			 * Sets the value of the <Titanium.UI.TextField.passwordRules> property.
+			 */
+			setPasswordRules(passwordRules: string): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.TextField.returnKeyType> property.
 			 */
@@ -18044,6 +16719,11 @@ declare namespace Titanium {
 			 */
 			requestHeaders: any;
 
+			/**
+			 * Manage the zoom-level of the current page.
+			 */
+			zoomLevel: number;
+
 			/**
 			 * Sets the value of [html](Titanium.UI.WebView.html) property.
 			 */
@@ -18355,6 +17035,16 @@ declare namespace Titanium {
 			 */
 			setRequestHeaders(requestHeaders: any): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.WebView.zoomLevel> property.
+			 */
+			getZoomLevel(): number;
+
+			/**
+			 * Sets the value of the <Titanium.UI.WebView.zoomLevel> property.
+			 */
+			setZoomLevel(zoomLevel: number): void;
+
 		}
 
 		/**
@@ -18396,7 +17086,7 @@ declare namespace Titanium {
 			exitOnClose: boolean;
 
 			/**
-			 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+			 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>.
 			 */
 			extendEdges: number[];
 
@@ -18406,12 +17096,12 @@ declare namespace Titanium {
 			flagSecure: boolean;
 
 			/**
-			 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+			 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar).
 			 */
 			includeOpaqueBars: boolean;
 
 			/**
-			 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+			 * Specifies whether or not the view controller should automatically adjust its scroll view insets.
 			 */
 			autoAdjustScrollViewInsets: boolean;
 
@@ -18426,6 +17116,11 @@ declare namespace Titanium {
 			 */
 			fullscreen: boolean;
 
+			/**
+			 * Boolean value indicating whether the system is allowed to hide the visual indicator for returning to the Home screen.
+			 */
+			homeIndicatorAutoHidden: boolean;
+
 			/**
 			 * Set this to true to hide the shadow image of the navigation bar.
 			 */
@@ -18446,6 +17141,11 @@ declare namespace Titanium {
 			 */
 			hidesBarsWhenKeyboardAppears: boolean;
 
+			/**
+			 * Set this to true to hide the back button of navigation bar.
+			 */
+			hidesBackButton: boolean;
+
 			/**
 			 * A Boolean value indicating whether the title should be displayed in a large format.
 			 */
@@ -18477,10 +17177,15 @@ declare namespace Titanium {
 			navBarHidden: boolean;
 
 			/**
-			 * The tintColor to apply to the navigation bar. This property is applicable on iOS 7 and greater.
+			 * The tintColor to apply to the navigation bar.
 			 */
 			navTintColor: string;
 
+			/**
+			 * The <Titanium.UI.iOS.NavigationWindow> instance hosting this window.
+			 */
+			readonly navigationWindow: Titanium.UI.iOS.NavigationWindow;
+
 			/**
 			 * Callback function that overrides the default behavior when the user presses the **Back**
 			 * button.
@@ -18826,6 +17531,16 @@ declare namespace Titanium {
 			 */
 			setFullscreen(fullscreen: boolean): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.Window.homeIndicatorAutoHidden> property.
+			 */
+			getHomeIndicatorAutoHidden(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.homeIndicatorAutoHidden> property.
+			 */
+			setHomeIndicatorAutoHidden(homeIndicatorAutoHidden: boolean): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.Window.hideShadow> property.
 			 */
@@ -18866,6 +17581,16 @@ declare namespace Titanium {
 			 */
 			setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.Window.hidesBackButton> property.
+			 */
+			getHidesBackButton(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.UI.Window.hidesBackButton> property.
+			 */
+			setHidesBackButton(hidesBackButton: boolean): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.Window.largeTitleEnabled> property.
 			 */
@@ -18936,6 +17661,11 @@ declare namespace Titanium {
 			 */
 			setNavTintColor(navTintColor: string): void;
 
+			/**
+			 * Gets the value of the <Titanium.UI.Window.navigationWindow> property.
+			 */
+			getNavigationWindow(): Titanium.UI.iOS.NavigationWindow;
+
 			/**
 			 * Gets the value of the <Titanium.UI.Window.onBack> property.
 			 */
@@ -19925,7 +18655,7 @@ declare namespace Titanium {
 			function createSearchView(parameters?: any): Titanium.UI.Android.SearchView;
 
 			/**
-			 * An elevated view with rounded corners.
+			 * CardView provides a layout container with rounded corners and a shadow indicating the view is elevated.
 			 */
 			interface CardView extends Titanium.Proxy {
 				/**
@@ -19973,21 +18703,6 @@ declare namespace Titanium {
 				 */
 				backgroundFocusedImage: string;
 
-				/**
-				 * A background gradient for the view.
-				 */
-				backgroundGradient: Gradient;
-
-				/**
-				 * Background image for the view, specified as a local file path or URL.
-				 */
-				backgroundImage: string;
-
-				/**
-				 * Determines whether to tile a background across a view.
-				 */
-				backgroundRepeat: boolean;
-
 				/**
 				 * Selected background color of the view, as a color name or hex triplet.
 				 */
@@ -19998,11 +18713,6 @@ declare namespace Titanium {
 				 */
 				backgroundSelectedImage: string;
 
-				/**
-				 * Border color of the view, as a color name or hex triplet.
-				 */
-				borderColor: string;
-
 				/**
 				 * Corner radius for CardView.
 				 */
@@ -20448,36 +19158,6 @@ declare namespace Titanium {
 				 */
 				setBackgroundFocusedImage(backgroundFocusedImage: string): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundGradient> property.
-				 */
-				getBackgroundGradient(): Gradient;
-
-				/**
-				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundGradient> property.
-				 */
-				setBackgroundGradient(backgroundGradient: Gradient): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundImage> property.
-				 */
-				getBackgroundImage(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundImage> property.
-				 */
-				setBackgroundImage(backgroundImage: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundRepeat> property.
-				 */
-				getBackgroundRepeat(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.Android.CardView.backgroundRepeat> property.
-				 */
-				setBackgroundRepeat(backgroundRepeat: boolean): void;
-
 				/**
 				 * Gets the value of the <Titanium.UI.Android.CardView.backgroundSelectedColor> property.
 				 */
@@ -20498,16 +19178,6 @@ declare namespace Titanium {
 				 */
 				setBackgroundSelectedImage(backgroundSelectedImage: string): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.Android.CardView.borderColor> property.
-				 */
-				getBorderColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.Android.CardView.borderColor> property.
-				 */
-				setBorderColor(borderColor: string): void;
-
 				/**
 				 * Gets the value of the <Titanium.UI.Android.CardView.borderRadius> property.
 				 */
@@ -22832,6 +21502,11 @@ declare namespace Titanium {
 				 */
 				hintText: string;
 
+				/**
+				 * Color of hint text that displays when field is empty.
+				 */
+				hintTextColor: string;
+
 				/**
 				 * Value of the search view.
 				 */
@@ -23479,6 +22154,16 @@ declare namespace Titanium {
 				 */
 				setHintText(hintText: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.Android.SearchView.hintTextColor> property.
+				 */
+				getHintTextColor(): string;
+
+				/**
+				 * Sets the value of the <Titanium.UI.Android.SearchView.hintTextColor> property.
+				 */
+				setHintTextColor(hintTextColor: string): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.Android.SearchView.value> property.
 				 */
@@ -24188,26 +22873,6 @@ declare namespace Titanium {
 			 */
 			const COLLISION_MODE_ITEM: number;
 
-			/**
-			 * Returns the iOS system texture used to render the background on a group table view.
-			 */
-			const COLOR_GROUP_TABLEVIEW_BACKGROUND: string;
-
-			/**
-			 * Returns the iOS system texture used to render the area behind scrollable content.
-			 */
-			const COLOR_SCROLLVIEW_BACKGROUND: string;
-
-			/**
-			 * Returns the iOS system texture used for the back side of a view while it is being flipped.
-			 */
-			const COLOR_VIEW_FLIPSIDE_BACKGROUND: string;
-
-			/**
-			 * Returns the iOS system texture used to render the background of a page.
-			 */
-			const COLOR_UNDER_PAGE_BACKGROUND: string;
-
 			/**
 			 * Determines if the 3D-Touch capability "Force Touch" is supported (`true`) or not (`false`) by the device.
 			 */
@@ -24302,6 +22967,16 @@ declare namespace Titanium {
 			 */
 			let MODAL_PRESENTATION_CURRENT_CONTEXT: number;
 
+			/**
+			 * View presented over its parent window.
+			 */
+			let MODAL_PRESENTATION_OVER_CURRENT_CONTEXT: number;
+
+			/**
+			 * Presented view covers the screen.
+			 */
+			let MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN: number;
+
 			/**
 			 * Window width and height are smaller than those of the screen and the view is centered on
 			 * the screen.
@@ -24412,12 +23087,12 @@ declare namespace Titanium {
 			const KEYBOARD_DISMISS_MODE_INTERACTIVE: number;
 
 			/**
-			 * Use with <Titanium.UI.Searchbar.style> to change the search bar style.
+			 * Use with <Titanium.UI.SearchBar.style> to change the search bar style.
 			 */
 			const SEARCH_BAR_STYLE_PROMINENT: number;
 
 			/**
-			 * Use with <Titanium.UI.Searchbar.style> to change the search bar style.
+			 * Use with <Titanium.UI.SearchBar.style> to change the search bar style.
 			 */
 			const SEARCH_BAR_STYLE_MINIMAL: number;
 
@@ -24808,6 +23483,16 @@ declare namespace Titanium {
 			 */
 			function setMODAL_PRESENTATION_CURRENT_CONTEXT(MODAL_PRESENTATION_CURRENT_CONTEXT: number): void;
 
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_CONTEXT> property.
+			 */
+			function setMODAL_PRESENTATION_OVER_CURRENT_CONTEXT(MODAL_PRESENTATION_OVER_CURRENT_CONTEXT: number): void;
+
+			/**
+			 * Sets the value of the <Titanium.UI.iOS.MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN> property.
+			 */
+			function setMODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN(MODAL_PRESENTATION_OVER_CURRENT_FULL_SCREEN: number): void;
+
 			/**
 			 * Gets the value of the <Titanium.UI.iOS.appBadge> property.
 			 */
@@ -25213,6 +23898,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -25255,7 +23945,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -25274,6 +23964,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -25596,6 +24291,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.AdView.left> property.
 				 */
@@ -25726,6 +24431,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.AdView.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.AdView.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.AdView.viewShadowRadius> property.
 				 */
@@ -26124,7 +24839,7 @@ declare namespace Titanium {
 			 * A <Titanium.UI.iOS.BlurView> object gives you an easy way implement some complex visual effects.
 			 * The blur effect is applied to every view the blur view is added to by default. You can also place the
 			 * blur view above other views and all visible views layered under the blur view are blurred as well.
-			 * For more information on BlurView, please refer to the official [Apple documentation](https://developer.apple.com/library/ios/documentation/UIKit/Reference/UIVisualEffectView/).
+			 * For more information on BlurView, please refer to the official [Apple documentation](https://developer.apple.com/documentation/uikit/uivisualeffectview).
 			 * Note: Apple introduced two new constants <Titanium.UI.iOS.BLUR_EFFECT_STYLE_REGULAR> and <Titanium.UI.iOS.BLUR_EFFECT_STYLE_PROMINENT> in
 			 * iOS 10. These are internally mapped to <Titanium.UI.iOS.BLUR_EFFECT_STYLE_LIGHT> and <Titanium.UI.iOS.BLUR_EFFECT_STYLE_EXTRA_LIGHT>.
 			 */
@@ -26229,6 +24944,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -26271,7 +24991,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -26290,6 +25010,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -26607,6 +25332,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.BlurView.left> property.
 				 */
@@ -26737,6 +25472,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.BlurView.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.BlurView.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.BlurView.viewShadowRadius> property.
 				 */
@@ -27010,11 +25755,6 @@ declare namespace Titanium {
 				 */
 				center: Point;
 
-				/**
-				 * Array of this view's child views.
-				 */
-				readonly children: Titanium.UI.View[];
-
 				/**
 				 * View's clipping behavior.
 				 */
@@ -27025,6 +25765,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -27067,7 +25812,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -27086,6 +25831,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -27131,16 +25881,6 @@ declare namespace Titanium {
 				 */
 				selected: number;
 
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any[]): void;
-
 				/**
 				 * Animates this view.
 				 */
@@ -27162,21 +25902,6 @@ declare namespace Titanium {
 				 */
 				insertAt(params: any): void;
 
-				/**
-				 * Removes a child view from this view's hierarchy.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Removes all child views from this view's hierarchy.
-				 */
-				removeAllChildren(): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Makes this view visible.
 				 */
@@ -27398,11 +26123,6 @@ declare namespace Titanium {
 				 */
 				setCenter(center: Point): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.children> property.
-				 */
-				getChildren(): Titanium.UI.View[];
-
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.clipMode> property.
 				 */
@@ -27428,6 +26148,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.left> property.
 				 */
@@ -27558,6 +26288,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.CoverFlowView.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.CoverFlowView.viewShadowRadius> property.
 				 */
@@ -27675,202 +26415,6 @@ declare namespace Titanium {
 			 * local system.
 			 */
 			interface DocumentViewer extends Titanium.Proxy {
-				/**
-				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
-				 */
-				accessibilityHidden: boolean;
-
-				/**
-				 * Briefly describes what performing an action (such as a click) on the view will do.
-				 */
-				accessibilityHint: string;
-
-				/**
-				 * A succint label identifying the view for the device's accessibility service.
-				 */
-				accessibilityLabel: string;
-
-				/**
-				 * A string describing the value (if any) of the view for the device's accessibility service.
-				 */
-				accessibilityValue: string;
-
-				/**
-				 * Coordinate of the view about which to pivot an animation.
-				 */
-				anchorPoint: Point;
-
-				/**
-				 * Current position of the view during an animation.
-				 */
-				readonly animatedCenter: Point;
-
-				/**
-				 * Background color of the view, as a color name or hex triplet.
-				 */
-				backgroundColor: string;
-
-				/**
-				 * A background gradient for the view.
-				 */
-				backgroundGradient: Gradient;
-
-				/**
-				 * Background image for the view, specified as a local file path or URL.
-				 */
-				backgroundImage: string;
-
-				/**
-				 * Determines whether to tile a background across a view.
-				 */
-				backgroundRepeat: boolean;
-
-				/**
-				 * Size of the left end cap.
-				 */
-				backgroundLeftCap: number;
-
-				/**
-				 * Size of the top end cap.
-				 */
-				backgroundTopCap: number;
-
-				/**
-				 * Border color of the view, as a color name or hex triplet.
-				 */
-				borderColor: string;
-
-				/**
-				 * Radius for the rounded corners of the view's border.
-				 */
-				borderRadius: number;
-
-				/**
-				 * Border width of the view.
-				 */
-				borderWidth: number;
-
-				/**
-				 * View's bottom position, in platform-specific units.
-				 */
-				bottom: number | string;
-
-				/**
-				 * View's center position, in the parent view's coordinates.
-				 */
-				center: Point;
-
-				/**
-				 * Array of this view's child views.
-				 */
-				readonly children: Titanium.UI.View[];
-
-				/**
-				 * View's clipping behavior.
-				 */
-				clipMode: number;
-
-				/**
-				 * View height, in platform-specific units.
-				 */
-				height: number | string;
-
-				/**
-				 * View's left position, in platform-specific units.
-				 */
-				left: number | string;
-
-				/**
-				 * Specifies how the view positions its children.
-				 * One of: 'composite', 'vertical', or 'horizontal'.
-				 */
-				layout: string;
-
-				/**
-				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
-				 */
-				opacity: number;
-
-				/**
-				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
-				 */
-				pullBackgroundColor: string;
-
-				/**
-				 * The preview context used in the 3D-Touch feature "Peek and Pop".
-				 */
-				previewContext: Titanium.UI.iOS.PreviewContext;
-
-				/**
-				 * View's right position, in platform-specific units.
-				 */
-				right: number | string;
-
-				/**
-				 * The bounding box of the view relative to its parent, in system units.
-				 */
-				readonly rect: Dimension;
-
-				/**
-				 * The size of the view in system units.
-				 */
-				readonly size: Dimension;
-
-				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
-				 */
-				tintColor: string;
-
-				/**
-				 * The view's top position.
-				 */
-				top: number | string;
-
-				/**
-				 * Determines whether view should receive touch events.
-				 */
-				touchEnabled: boolean;
-
-				/**
-				 * Transformation matrix to apply to the view.
-				 */
-				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-				/**
-				 * Determines the blur radius used to create the shadow.
-				 */
-				viewShadowRadius: number;
-
-				/**
-				 * Determines the color of the shadow.
-				 */
-				viewShadowColor: string;
-
-				/**
-				 * Determines the offset for the shadow of the view.
-				 */
-				viewShadowOffset: Point;
-
-				/**
-				 * Determines whether the view is visible.
-				 */
-				visible: boolean;
-
-				/**
-				 * View's width, in platform-specific units.
-				 */
-				width: number | string;
-
-				/**
-				 * Determines whether the layout has wrapping behavior.
-				 */
-				horizontalWrap: boolean;
-
-				/**
-				 * Z-index stack order position, relative to other sibling views.
-				 */
-				zIndex: number;
-
 				/**
 				 * Name of the file (without the path).
 				 */
@@ -27881,488 +26425,16 @@ declare namespace Titanium {
 				 */
 				url: string;
 
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any[]): void;
-
-				/**
-				 * Animates this view.
-				 */
-				animate(animation: any, callback?: (param0: any) => any): void;
-
-				/**
-				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
-				 * view tree.
-				 */
-				finishLayout(): void;
-
 				/**
 				 * Dismisses the document viewer.
 				 */
 				hide(options?: DocumentViewerOptions): void;
 
-				/**
-				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				insertAt(params: any): void;
-
-				/**
-				 * Removes a child view from this view's hierarchy.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Removes all child views from this view's hierarchy.
-				 */
-				removeAllChildren(): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Displays the document viewer over the current view.
 				 */
 				show(options?: DocumentViewerOptions): void;
 
-				/**
-				 * Starts a batch update of this view's layout properties.
-				 */
-				startLayout(): void;
-
-				/**
-				 * Returns an image of the rendered view, as a Blob.
-				 */
-				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
-
-				/**
-				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
-				 * they have been updated.
-				 */
-				updateLayout(params: any): void;
-
-				/**
-				 * Translates a point from this view's coordinate system to another view's coordinate system.
-				 */
-				convertPointToView(point: Point, destinationView: any): Point;
-
-				/**
-				 * Returns the matching view of a given view ID.
-				 */
-				getViewById(id: string): Titanium.UI.View;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHidden> property.
-				 */
-				getAccessibilityHidden(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHidden> property.
-				 */
-				setAccessibilityHidden(accessibilityHidden: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHint> property.
-				 */
-				getAccessibilityHint(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityHint> property.
-				 */
-				setAccessibilityHint(accessibilityHint: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityLabel> property.
-				 */
-				getAccessibilityLabel(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityLabel> property.
-				 */
-				setAccessibilityLabel(accessibilityLabel: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityValue> property.
-				 */
-				getAccessibilityValue(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.accessibilityValue> property.
-				 */
-				setAccessibilityValue(accessibilityValue: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.anchorPoint> property.
-				 */
-				getAnchorPoint(): Point;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.anchorPoint> property.
-				 */
-				setAnchorPoint(anchorPoint: Point): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.animatedCenter> property.
-				 */
-				getAnimatedCenter(): Point;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundColor> property.
-				 */
-				getBackgroundColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundColor> property.
-				 */
-				setBackgroundColor(backgroundColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundGradient> property.
-				 */
-				getBackgroundGradient(): Gradient;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundGradient> property.
-				 */
-				setBackgroundGradient(backgroundGradient: Gradient): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundImage> property.
-				 */
-				getBackgroundImage(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundImage> property.
-				 */
-				setBackgroundImage(backgroundImage: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundRepeat> property.
-				 */
-				getBackgroundRepeat(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundRepeat> property.
-				 */
-				setBackgroundRepeat(backgroundRepeat: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundLeftCap> property.
-				 */
-				getBackgroundLeftCap(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundLeftCap> property.
-				 */
-				setBackgroundLeftCap(backgroundLeftCap: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundTopCap> property.
-				 */
-				getBackgroundTopCap(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.backgroundTopCap> property.
-				 */
-				setBackgroundTopCap(backgroundTopCap: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.borderColor> property.
-				 */
-				getBorderColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.borderColor> property.
-				 */
-				setBorderColor(borderColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.borderRadius> property.
-				 */
-				getBorderRadius(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.borderRadius> property.
-				 */
-				setBorderRadius(borderRadius: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.borderWidth> property.
-				 */
-				getBorderWidth(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.borderWidth> property.
-				 */
-				setBorderWidth(borderWidth: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.bottom> property.
-				 */
-				getBottom(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.bottom> property.
-				 */
-				setBottom(bottom: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.bottom> property.
-				 */
-				setBottom(bottom: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.center> property.
-				 */
-				getCenter(): Point;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.center> property.
-				 */
-				setCenter(center: Point): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.children> property.
-				 */
-				getChildren(): Titanium.UI.View[];
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.clipMode> property.
-				 */
-				getClipMode(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.clipMode> property.
-				 */
-				setClipMode(clipMode: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.height> property.
-				 */
-				getHeight(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.height> property.
-				 */
-				setHeight(height: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.height> property.
-				 */
-				setHeight(height: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.left> property.
-				 */
-				getLeft(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.left> property.
-				 */
-				setLeft(left: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.left> property.
-				 */
-				setLeft(left: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.layout> property.
-				 */
-				getLayout(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.layout> property.
-				 */
-				setLayout(layout: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.opacity> property.
-				 */
-				getOpacity(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.opacity> property.
-				 */
-				setOpacity(opacity: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.pullBackgroundColor> property.
-				 */
-				getPullBackgroundColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.pullBackgroundColor> property.
-				 */
-				setPullBackgroundColor(pullBackgroundColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.previewContext> property.
-				 */
-				getPreviewContext(): Titanium.UI.iOS.PreviewContext;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.previewContext> property.
-				 */
-				setPreviewContext(previewContext: Titanium.UI.iOS.PreviewContext): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.right> property.
-				 */
-				getRight(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.right> property.
-				 */
-				setRight(right: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.right> property.
-				 */
-				setRight(right: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.rect> property.
-				 */
-				getRect(): Dimension;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.size> property.
-				 */
-				getSize(): Dimension;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.tintColor> property.
-				 */
-				getTintColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.tintColor> property.
-				 */
-				setTintColor(tintColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.top> property.
-				 */
-				getTop(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.top> property.
-				 */
-				setTop(top: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.top> property.
-				 */
-				setTop(top: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.touchEnabled> property.
-				 */
-				getTouchEnabled(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.touchEnabled> property.
-				 */
-				setTouchEnabled(touchEnabled: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.transform> property.
-				 */
-				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.transform> property.
-				 */
-				setTransform(transform: Titanium.UI.Matrix2D): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.transform> property.
-				 */
-				setTransform(transform: Titanium.UI.Matrix3D): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowRadius> property.
-				 */
-				getViewShadowRadius(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowRadius> property.
-				 */
-				setViewShadowRadius(viewShadowRadius: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowColor> property.
-				 */
-				getViewShadowColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowColor> property.
-				 */
-				setViewShadowColor(viewShadowColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowOffset> property.
-				 */
-				getViewShadowOffset(): Point;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.viewShadowOffset> property.
-				 */
-				setViewShadowOffset(viewShadowOffset: Point): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.visible> property.
-				 */
-				getVisible(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.visible> property.
-				 */
-				setVisible(visible: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.width> property.
-				 */
-				getWidth(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.width> property.
-				 */
-				setWidth(width: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.width> property.
-				 */
-				setWidth(width: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.horizontalWrap> property.
-				 */
-				getHorizontalWrap(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.horizontalWrap> property.
-				 */
-				setHorizontalWrap(horizontalWrap: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.zIndex> property.
-				 */
-				getZIndex(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iOS.DocumentViewer.zIndex> property.
-				 */
-				setZIndex(zIndex: number): void;
-
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.DocumentViewer.name> property.
 				 */
@@ -28811,6 +26883,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -28853,7 +26930,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -28872,6 +26949,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -29204,6 +27286,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.left> property.
 				 */
@@ -29334,6 +27426,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.LivePhotoView.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.LivePhotoView.viewShadowRadius> property.
 				 */
@@ -29435,7 +27537,7 @@ declare namespace Titanium {
 			 * A menu popup provides the ability to create custom tooltip options using the `items` property
 			 * covering the native `UIMenuController` class.
 			 * See also:
-			 * * [iOS Developer Library: UIMenuController](https://developer.apple.com/library/prerelease/ios/documentation/iPhone/Reference/UIMenuController_Class/index.html)
+			 * * [iOS Developer Library: UIMenuController](https://developer.apple.com/documentation/uikit/uimenucontroller)
 			 */
 			interface MenuPopup extends Titanium.Proxy {
 				/**
@@ -29575,6 +27677,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * Window's left position, in platform-specific units.
 				 */
@@ -29617,7 +27724,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -29636,6 +27743,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -29672,17 +27784,17 @@ declare namespace Titanium {
 				zIndex: number;
 
 				/**
-				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>.
 				 */
 				extendEdges: number[];
 
 				/**
-				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar).
 				 */
 				includeOpaqueBars: boolean;
 
 				/**
-				 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+				 * Specifies whether or not the view controller should automatically adjust its scroll view insets.
 				 */
 				autoAdjustScrollViewInsets: boolean;
 
@@ -29697,6 +27809,11 @@ declare namespace Titanium {
 				 */
 				fullscreen: boolean;
 
+				/**
+				 * Boolean value indicating whether the system is allowed to hide the visual indicator for returning to the Home screen.
+				 */
+				homeIndicatorAutoHidden: boolean;
+
 				/**
 				 * Set this to true to hide the navigation bar on swipe.
 				 */
@@ -29712,6 +27829,11 @@ declare namespace Titanium {
 				 */
 				hidesBarsWhenKeyboardAppears: boolean;
 
+				/**
+				 * Set this to true to hide the back button of navigation bar.
+				 */
+				hidesBackButton: boolean;
+
 				/**
 				 * A Boolean value indicating whether the title should be displayed in a large format.
 				 */
@@ -29732,6 +27854,11 @@ declare namespace Titanium {
 				 */
 				modal: boolean;
 
+				/**
+				 * The <Titanium.UI.iOS.NavigationWindow> instance hosting this window.
+				 */
+				readonly navigationWindow: Titanium.UI.iOS.NavigationWindow;
+
 				/**
 				 * Array of supported orientation modes, specified using the orientation
 				 * constants defined in <Titanium.UI>.
@@ -30080,6 +28207,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.left> property.
 				 */
@@ -30210,6 +28347,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.viewShadowRadius> property.
 				 */
@@ -30335,6 +28482,16 @@ declare namespace Titanium {
 				 */
 				setFullscreen(fullscreen: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.homeIndicatorAutoHidden> property.
+				 */
+				getHomeIndicatorAutoHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.homeIndicatorAutoHidden> property.
+				 */
+				setHomeIndicatorAutoHidden(homeIndicatorAutoHidden: boolean): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBarsOnSwipe> property.
 				 */
@@ -30365,6 +28522,16 @@ declare namespace Titanium {
 				 */
 				setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBackButton> property.
+				 */
+				getHidesBackButton(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.NavigationWindow.hidesBackButton> property.
+				 */
+				setHidesBackButton(hidesBackButton: boolean): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.largeTitleEnabled> property.
 				 */
@@ -30405,6 +28572,11 @@ declare namespace Titanium {
 				 */
 				setModal(modal: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.navigationWindow> property.
+				 */
+				getNavigationWindow(): Titanium.UI.iOS.NavigationWindow;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.NavigationWindow.orientationModes> property.
 				 */
@@ -30859,6 +29031,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * Window's left position, in platform-specific units.
 				 */
@@ -30901,7 +29078,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -30920,6 +29097,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -30976,17 +29158,17 @@ declare namespace Titanium {
 				barImage: string;
 
 				/**
-				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>.
 				 */
 				extendEdges: number[];
 
 				/**
-				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar).
 				 */
 				includeOpaqueBars: boolean;
 
 				/**
-				 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+				 * Specifies whether or not the view controller should automatically adjust its scroll view insets.
 				 */
 				autoAdjustScrollViewInsets: boolean;
 
@@ -31001,6 +29183,11 @@ declare namespace Titanium {
 				 */
 				fullscreen: boolean;
 
+				/**
+				 * Boolean value indicating whether the system is allowed to hide the visual indicator for returning to the Home screen.
+				 */
+				homeIndicatorAutoHidden: boolean;
+
 				/**
 				 * Set this to true to hide the shadow image of the navigation bar.
 				 */
@@ -31021,6 +29208,11 @@ declare namespace Titanium {
 				 */
 				hidesBarsWhenKeyboardAppears: boolean;
 
+				/**
+				 * Set this to true to hide the back button of navigation bar.
+				 */
+				hidesBackButton: boolean;
+
 				/**
 				 * A Boolean value indicating whether the title should be displayed in a large format.
 				 */
@@ -31052,10 +29244,15 @@ declare namespace Titanium {
 				navBarHidden: boolean;
 
 				/**
-				 * The tintColor to apply to the navigation bar. This property is applicable on iOS 7 and greater.
+				 * The tintColor to apply to the navigation bar.
 				 */
 				navTintColor: string;
 
+				/**
+				 * The <Titanium.UI.iOS.NavigationWindow> instance hosting this window.
+				 */
+				readonly navigationWindow: Titanium.UI.iOS.NavigationWindow;
+
 				/**
 				 * Array of supported orientation modes, specified using the orientation
 				 * constants defined in <Titanium.UI>.
@@ -31143,14 +29340,14 @@ declare namespace Titanium {
 				url: string;
 
 				/**
-				 * View for the detail view section of the SplitWindow.
+				 * Window for the detail view section of the SplitWindow.
 				 */
-				detailView: Titanium.UI.View;
+				detailView: Titanium.UI.Window;
 
 				/**
-				 * View for the master view section of the SplitWindow.
+				 * Window for the master view section of the SplitWindow.
 				 */
-				masterView: Titanium.UI.View;
+				masterView: Titanium.UI.Window;
 
 				/**
 				 * Determines whether to show the master view in portrait orientation.
@@ -31494,6 +29691,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.left> property.
 				 */
@@ -31624,6 +29831,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.viewShadowRadius> property.
 				 */
@@ -31794,6 +30011,16 @@ declare namespace Titanium {
 				 */
 				setFullscreen(fullscreen: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.homeIndicatorAutoHidden> property.
+				 */
+				getHomeIndicatorAutoHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.homeIndicatorAutoHidden> property.
+				 */
+				setHomeIndicatorAutoHidden(homeIndicatorAutoHidden: boolean): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.hideShadow> property.
 				 */
@@ -31834,6 +30061,16 @@ declare namespace Titanium {
 				 */
 				setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.hidesBackButton> property.
+				 */
+				getHidesBackButton(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.hidesBackButton> property.
+				 */
+				setHidesBackButton(hidesBackButton: boolean): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.largeTitleEnabled> property.
 				 */
@@ -31904,6 +30141,11 @@ declare namespace Titanium {
 				 */
 				setNavTintColor(navTintColor: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.navigationWindow> property.
+				 */
+				getNavigationWindow(): Titanium.UI.iOS.NavigationWindow;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.orientationModes> property.
 				 */
@@ -32072,22 +30314,22 @@ declare namespace Titanium {
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.detailView> property.
 				 */
-				getDetailView(): Titanium.UI.View;
+				getDetailView(): Titanium.UI.Window;
 
 				/**
 				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.detailView> property.
 				 */
-				setDetailView(detailView: any): void;
+				setDetailView(detailView: Titanium.UI.Window): void;
 
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.masterView> property.
 				 */
-				getMasterView(): Titanium.UI.View;
+				getMasterView(): Titanium.UI.Window;
 
 				/**
 				 * Sets the value of the <Titanium.UI.iOS.SplitWindow.masterView> property.
 				 */
-				setMasterView(masterView: any): void;
+				setMasterView(masterView: Titanium.UI.Window): void;
 
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.SplitWindow.showMasterInPortrait> property.
@@ -32220,11 +30462,6 @@ declare namespace Titanium {
 				 */
 				center: Point;
 
-				/**
-				 * Array of this view's child views.
-				 */
-				readonly children: Titanium.UI.View[];
-
 				/**
 				 * View's clipping behavior.
 				 */
@@ -32235,6 +30472,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -32296,6 +30538,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -32355,9 +30602,9 @@ declare namespace Titanium {
 				autorepeat: boolean;
 
 				/**
-				 * If YES, incrementing beyond <Ti.UI.iOS.Stepper.maximum> sets value to <Ti.UI.iOS.Stepper.minimum>. likewise, decrementing below
-				 * <Ti.UI.iOS.Stepper.minimum> sets value to <Ti.UI.iOS.Stepper.maximum>. If NO, the stepper does not increment beyond <Ti.UI.iOS.Stepper.maximum> nor
-				 * does it decrement below <Ti.UI.iOS.Stepper.minimum> but rather holds at those values.
+				 * If YES, incrementing beyond <Titanium.UI.iOS.Stepper.maximum> sets value to <Titanium.UI.iOS.Stepper.minimum>. likewise, decrementing below
+				 * <Titanium.UI.iOS.Stepper.minimum> sets value to <Titanium.UI.iOS.Stepper.maximum>. If NO, the stepper does not increment beyond <Titanium.UI.iOS.Stepper.maximum> nor
+				 * does it decrement below <Titanium.UI.iOS.Stepper.minimum> but rather holds at those values.
 				 * The default value is NO.
 				 */
 				wraps: boolean;
@@ -32408,16 +30655,6 @@ declare namespace Titanium {
 				 */
 				incrementDisabledImage: string;
 
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any[]): void;
-
 				/**
 				 * Animates this view.
 				 */
@@ -32439,21 +30676,6 @@ declare namespace Titanium {
 				 */
 				insertAt(params: any): void;
 
-				/**
-				 * Removes a child view from this view's hierarchy.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Removes all child views from this view's hierarchy.
-				 */
-				removeAllChildren(): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Makes this view visible.
 				 */
@@ -32655,11 +30877,6 @@ declare namespace Titanium {
 				 */
 				setCenter(center: Point): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.Stepper.children> property.
-				 */
-				getChildren(): Titanium.UI.View[];
-
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.Stepper.clipMode> property.
 				 */
@@ -32685,6 +30902,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.Stepper.left> property.
 				 */
@@ -32815,6 +31042,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Stepper.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Stepper.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.Stepper.viewShadowRadius> property.
 				 */
@@ -33101,11 +31338,6 @@ declare namespace Titanium {
 				 */
 				center: Point;
 
-				/**
-				 * Array of this view's child views.
-				 */
-				readonly children: Titanium.UI.View[];
-
 				/**
 				 * View's clipping behavior.
 				 */
@@ -33116,6 +31348,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -33158,7 +31395,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -33177,6 +31414,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -33227,16 +31469,6 @@ declare namespace Titanium {
 				 */
 				style: number;
 
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any[]): void;
-
 				/**
 				 * Animates this view.
 				 */
@@ -33258,21 +31490,6 @@ declare namespace Titanium {
 				 */
 				insertAt(params: any): void;
 
-				/**
-				 * Removes a child view from this view's hierarchy.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Removes all child views from this view's hierarchy.
-				 */
-				removeAllChildren(): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Makes this view visible.
 				 */
@@ -33474,11 +31691,6 @@ declare namespace Titanium {
 				 */
 				setCenter(center: Point): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.children> property.
-				 */
-				getChildren(): Titanium.UI.View[];
-
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.clipMode> property.
 				 */
@@ -33504,6 +31716,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.left> property.
 				 */
@@ -33634,6 +31856,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.TabbedBar.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.TabbedBar.viewShadowRadius> property.
 				 */
@@ -33815,11 +32047,6 @@ declare namespace Titanium {
 				 */
 				center: Point;
 
-				/**
-				 * Array of this view's child views.
-				 */
-				readonly children: Titanium.UI.View[];
-
 				/**
 				 * View's clipping behavior.
 				 */
@@ -33830,6 +32057,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * View's left position, in platform-specific units.
 				 */
@@ -33866,7 +32098,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -33885,6 +32117,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -33940,16 +32177,6 @@ declare namespace Titanium {
 				 */
 				translucent: boolean;
 
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any[]): void;
-
 				/**
 				 * Animates this view.
 				 */
@@ -33971,21 +32198,6 @@ declare namespace Titanium {
 				 */
 				insertAt(params: any): void;
 
-				/**
-				 * Removes a child view from this view's hierarchy.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Removes all child views from this view's hierarchy.
-				 */
-				removeAllChildren(): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Makes this view visible.
 				 */
@@ -34147,11 +32359,6 @@ declare namespace Titanium {
 				 */
 				setCenter(center: Point): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.iOS.Toolbar.children> property.
-				 */
-				getChildren(): Titanium.UI.View[];
-
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.Toolbar.clipMode> property.
 				 */
@@ -34177,6 +32384,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.Toolbar.left> property.
 				 */
@@ -34297,6 +32514,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iOS.Toolbar.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iOS.Toolbar.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iOS.Toolbar.viewShadowRadius> property.
 				 */
@@ -34963,7 +33190,7 @@ declare namespace Titanium {
 				const GREY: number;
 
 				/**
-				 * Status bar style to use with dark backgrounds. Valid on iOS 7 and above.
+				 * Status bar style to use with dark backgrounds.
 				 */
 				const LIGHT_CONTENT: number;
 
@@ -35669,674 +33896,16 @@ declare namespace Titanium {
 			 * local system.
 			 */
 			interface DocumentViewer extends Titanium.Proxy {
-				/**
-				 * Whether the view should be "hidden" from (i.e., ignored by) the accessibility service.
-				 */
-				accessibilityHidden: boolean;
-
-				/**
-				 * Briefly describes what performing an action (such as a click) on the view will do.
-				 */
-				accessibilityHint: string;
-
-				/**
-				 * A succint label identifying the view for the device's accessibility service.
-				 */
-				accessibilityLabel: string;
-
-				/**
-				 * A string describing the value (if any) of the view for the device's accessibility service.
-				 */
-				accessibilityValue: string;
-
-				/**
-				 * Coordinate of the view about which to pivot an animation.
-				 */
-				anchorPoint: Point;
-
-				/**
-				 * Current position of the view during an animation.
-				 */
-				readonly animatedCenter: Point;
-
-				/**
-				 * Background color of the view, as a color name or hex triplet.
-				 */
-				backgroundColor: string;
-
-				/**
-				 * A background gradient for the view.
-				 */
-				backgroundGradient: Gradient;
-
-				/**
-				 * Background image for the view, specified as a local file path or URL.
-				 */
-				backgroundImage: string;
-
-				/**
-				 * Determines whether to tile a background across a view.
-				 */
-				backgroundRepeat: boolean;
-
-				/**
-				 * Size of the left end cap.
-				 */
-				backgroundLeftCap: number;
-
-				/**
-				 * Size of the top end cap.
-				 */
-				backgroundTopCap: number;
-
-				/**
-				 * Border color of the view, as a color name or hex triplet.
-				 */
-				borderColor: string;
-
-				/**
-				 * Radius for the rounded corners of the view's border.
-				 */
-				borderRadius: number;
-
-				/**
-				 * Border width of the view.
-				 */
-				borderWidth: number;
-
-				/**
-				 * View's bottom position, in platform-specific units.
-				 */
-				bottom: number | string;
-
-				/**
-				 * View's center position, in the parent view's coordinates.
-				 */
-				center: Point;
-
-				/**
-				 * Array of this view's child views.
-				 */
-				readonly children: Titanium.UI.View[];
-
-				/**
-				 * View's clipping behavior.
-				 */
-				clipMode: number;
-
-				/**
-				 * View height, in platform-specific units.
-				 */
-				height: number | string;
-
-				/**
-				 * View's left position, in platform-specific units.
-				 */
-				left: number | string;
-
-				/**
-				 * Specifies how the view positions its children.
-				 * One of: 'composite', 'vertical', or 'horizontal'.
-				 */
-				layout: string;
-
-				/**
-				 * Opacity of this view, from 0.0 (transparent) to 1.0 (opaque).
-				 */
-				opacity: number;
-
-				/**
-				 * Background color of the wrapper view when this view is used as either <Titanium.UI.ListView.pullView> or <Titanium.UI.TableView.headerPullView>.
-				 */
-				pullBackgroundColor: string;
-
-				/**
-				 * View's right position, in platform-specific units.
-				 */
-				right: number | string;
-
-				/**
-				 * The bounding box of the view relative to its parent, in system units.
-				 */
-				readonly rect: Dimension;
-
-				/**
-				 * The size of the view in system units.
-				 */
-				readonly size: Dimension;
-
-				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
-				 */
-				tintColor: string;
-
-				/**
-				 * The view's top position.
-				 */
-				top: number | string;
-
-				/**
-				 * Determines whether view should receive touch events.
-				 */
-				touchEnabled: boolean;
-
-				/**
-				 * Transformation matrix to apply to the view.
-				 */
-				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-				/**
-				 * Determines the blur radius used to create the shadow.
-				 */
-				viewShadowRadius: number;
-
-				/**
-				 * Determines the color of the shadow.
-				 */
-				viewShadowColor: string;
-
-				/**
-				 * Determines the offset for the shadow of the view.
-				 */
-				viewShadowOffset: Point;
-
-				/**
-				 * Determines whether the view is visible.
-				 */
-				visible: boolean;
-
-				/**
-				 * View's width, in platform-specific units.
-				 */
-				width: number | string;
-
-				/**
-				 * Determines whether the layout has wrapping behavior.
-				 */
-				horizontalWrap: boolean;
-
-				/**
-				 * Z-index stack order position, relative to other sibling views.
-				 */
-				zIndex: number;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to this view's hierarchy.
-				 */
-				add(view: any[]): void;
-
-				/**
-				 * Animates this view.
-				 */
-				animate(animation: any, callback?: (param0: any) => any): void;
-
-				/**
-				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
-				 * view tree.
-				 */
-				finishLayout(): void;
-
-				/**
-				 * Hides this view.
-				 */
-				hide(options?: AnimationOption): void;
-
-				/**
-				 * Inserts a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				insertAt(params: any): void;
-
-				/**
-				 * Removes a child view from this view's hierarchy.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Removes all child views from this view's hierarchy.
-				 */
-				removeAllChildren(): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Displays the document viewer over the current view.
 				 */
 				show(animated: boolean, view: any): void;
 
-				/**
-				 * Starts a batch update of this view's layout properties.
-				 */
-				startLayout(): void;
-
-				/**
-				 * Returns an image of the rendered view, as a Blob.
-				 */
-				toImage(callback?: (param0: Titanium.Blob) => any, honorScaleFactor?: boolean): Titanium.Blob;
-
-				/**
-				 * Performs a batch update of all supplied layout properties and schedules a layout pass after
-				 * they have been updated.
-				 */
-				updateLayout(params: any): void;
-
-				/**
-				 * Translates a point from this view's coordinate system to another view's coordinate system.
-				 */
-				convertPointToView(point: Point, destinationView: any): Point;
-
-				/**
-				 * Returns the matching view of a given view ID.
-				 */
-				getViewById(id: string): Titanium.UI.View;
-
 				/**
 				 * Sets the url of the document viewer.
 				 */
 				setUrl(url: string): void;
 
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHidden> property.
-				 */
-				getAccessibilityHidden(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHidden> property.
-				 */
-				setAccessibilityHidden(accessibilityHidden: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHint> property.
-				 */
-				getAccessibilityHint(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityHint> property.
-				 */
-				setAccessibilityHint(accessibilityHint: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityLabel> property.
-				 */
-				getAccessibilityLabel(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityLabel> property.
-				 */
-				setAccessibilityLabel(accessibilityLabel: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityValue> property.
-				 */
-				getAccessibilityValue(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.accessibilityValue> property.
-				 */
-				setAccessibilityValue(accessibilityValue: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.anchorPoint> property.
-				 */
-				getAnchorPoint(): Point;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.anchorPoint> property.
-				 */
-				setAnchorPoint(anchorPoint: Point): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.animatedCenter> property.
-				 */
-				getAnimatedCenter(): Point;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundColor> property.
-				 */
-				getBackgroundColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundColor> property.
-				 */
-				setBackgroundColor(backgroundColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundGradient> property.
-				 */
-				getBackgroundGradient(): Gradient;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundGradient> property.
-				 */
-				setBackgroundGradient(backgroundGradient: Gradient): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundImage> property.
-				 */
-				getBackgroundImage(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundImage> property.
-				 */
-				setBackgroundImage(backgroundImage: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundRepeat> property.
-				 */
-				getBackgroundRepeat(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundRepeat> property.
-				 */
-				setBackgroundRepeat(backgroundRepeat: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundLeftCap> property.
-				 */
-				getBackgroundLeftCap(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundLeftCap> property.
-				 */
-				setBackgroundLeftCap(backgroundLeftCap: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundTopCap> property.
-				 */
-				getBackgroundTopCap(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.backgroundTopCap> property.
-				 */
-				setBackgroundTopCap(backgroundTopCap: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.borderColor> property.
-				 */
-				getBorderColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.borderColor> property.
-				 */
-				setBorderColor(borderColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.borderRadius> property.
-				 */
-				getBorderRadius(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.borderRadius> property.
-				 */
-				setBorderRadius(borderRadius: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.borderWidth> property.
-				 */
-				getBorderWidth(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.borderWidth> property.
-				 */
-				setBorderWidth(borderWidth: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.bottom> property.
-				 */
-				getBottom(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.bottom> property.
-				 */
-				setBottom(bottom: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.bottom> property.
-				 */
-				setBottom(bottom: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.center> property.
-				 */
-				getCenter(): Point;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.center> property.
-				 */
-				setCenter(center: Point): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.children> property.
-				 */
-				getChildren(): Titanium.UI.View[];
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.clipMode> property.
-				 */
-				getClipMode(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.clipMode> property.
-				 */
-				setClipMode(clipMode: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.height> property.
-				 */
-				getHeight(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.height> property.
-				 */
-				setHeight(height: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.height> property.
-				 */
-				setHeight(height: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.left> property.
-				 */
-				getLeft(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.left> property.
-				 */
-				setLeft(left: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.left> property.
-				 */
-				setLeft(left: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.layout> property.
-				 */
-				getLayout(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.layout> property.
-				 */
-				setLayout(layout: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.opacity> property.
-				 */
-				getOpacity(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.opacity> property.
-				 */
-				setOpacity(opacity: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.pullBackgroundColor> property.
-				 */
-				getPullBackgroundColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.pullBackgroundColor> property.
-				 */
-				setPullBackgroundColor(pullBackgroundColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.right> property.
-				 */
-				getRight(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.right> property.
-				 */
-				setRight(right: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.right> property.
-				 */
-				setRight(right: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.rect> property.
-				 */
-				getRect(): Dimension;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.size> property.
-				 */
-				getSize(): Dimension;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.tintColor> property.
-				 */
-				getTintColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.tintColor> property.
-				 */
-				setTintColor(tintColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.top> property.
-				 */
-				getTop(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.top> property.
-				 */
-				setTop(top: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.top> property.
-				 */
-				setTop(top: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.touchEnabled> property.
-				 */
-				getTouchEnabled(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.touchEnabled> property.
-				 */
-				setTouchEnabled(touchEnabled: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.transform> property.
-				 */
-				getTransform(): Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.transform> property.
-				 */
-				setTransform(transform: Titanium.UI.Matrix2D): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.transform> property.
-				 */
-				setTransform(transform: Titanium.UI.Matrix3D): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowRadius> property.
-				 */
-				getViewShadowRadius(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowRadius> property.
-				 */
-				setViewShadowRadius(viewShadowRadius: number): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowColor> property.
-				 */
-				getViewShadowColor(): string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowColor> property.
-				 */
-				setViewShadowColor(viewShadowColor: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowOffset> property.
-				 */
-				getViewShadowOffset(): Point;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.viewShadowOffset> property.
-				 */
-				setViewShadowOffset(viewShadowOffset: Point): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.visible> property.
-				 */
-				getVisible(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.visible> property.
-				 */
-				setVisible(visible: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.width> property.
-				 */
-				getWidth(): number | string;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.width> property.
-				 */
-				setWidth(width: number): void;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.width> property.
-				 */
-				setWidth(width: string): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.horizontalWrap> property.
-				 */
-				getHorizontalWrap(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.horizontalWrap> property.
-				 */
-				setHorizontalWrap(horizontalWrap: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPad.DocumentViewer.zIndex> property.
-				 */
-				getZIndex(): number;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPad.DocumentViewer.zIndex> property.
-				 */
-				setZIndex(zIndex: number): void;
-
 			}
 
 			/**
@@ -36353,6 +33922,16 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Width of the popover.
 				 */
@@ -36388,16 +33967,6 @@ declare namespace Titanium {
 				 */
 				title: string;
 
-				/**
-				 * Adds a child to the popover.
-				 */
-				add(view: any): void;
-
-				/**
-				 * Adds a child to the popover.
-				 */
-				add(view: any[]): void;
-
 				/**
 				 * Finishes a batch update of the View's layout properties and schedules a layout pass of the
 				 * view tree.
@@ -36414,16 +33983,6 @@ declare namespace Titanium {
 				 */
 				insertAt(params: any): void;
 
-				/**
-				 * Removes a child from the popover.
-				 */
-				remove(view: any): void;
-
-				/**
-				 * Replaces a view at the specified position in the [children](Titanium.UI.View.children) array.
-				 */
-				replaceAt(params: any): void;
-
 				/**
 				 * Displays the popover.
 				 */
@@ -36470,6 +34029,26 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.Popover.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.Popover.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iPad.Popover.width> property.
 				 */
@@ -36652,6 +34231,11 @@ declare namespace Titanium {
 				 */
 				height: number | string;
 
+				/**
+				 * Adds a horizontal parallax effect to the view
+				 */
+				horizontalMotionEffect: any;
+
 				/**
 				 * Window's left position, in platform-specific units.
 				 */
@@ -36689,7 +34273,7 @@ declare namespace Titanium {
 				readonly size: Dimension;
 
 				/**
-				 * The view's tintColor. This property is applicable on iOS 7 and greater.
+				 * The view's tintColor
 				 */
 				tintColor: string;
 
@@ -36708,6 +34292,11 @@ declare namespace Titanium {
 				 */
 				transform: Titanium.UI.Matrix2D | Titanium.UI.Matrix3D;
 
+				/**
+				 * Adds a vertical parallax effect to the view
+				 */
+				verticalMotionEffect: any;
+
 				/**
 				 * Determines the blur radius used to create the shadow.
 				 */
@@ -36764,17 +34353,17 @@ declare namespace Titanium {
 				barImage: string;
 
 				/**
-				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>. Valid on iOS 7 and greater.
+				 * An array of supported values specified using the EXTEND_EDGE constants in <Titanium.UI>.
 				 */
 				extendEdges: number[];
 
 				/**
-				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar). Valid on iOS 7 and greater.
+				 * Specifies if the edges should extend beyond opaque bars (navigation bar, tab bar, toolbar).
 				 */
 				includeOpaqueBars: boolean;
 
 				/**
-				 * Specifies whether or not the view controller should automatically adjust its scroll view insets. Valid on iOS 7 and greater.
+				 * Specifies whether or not the view controller should automatically adjust its scroll view insets.
 				 */
 				autoAdjustScrollViewInsets: boolean;
 
@@ -36789,6 +34378,11 @@ declare namespace Titanium {
 				 */
 				fullscreen: boolean;
 
+				/**
+				 * Boolean value indicating whether the system is allowed to hide the visual indicator for returning to the Home screen.
+				 */
+				homeIndicatorAutoHidden: boolean;
+
 				/**
 				 * Set this to true to hide the shadow image of the navigation bar.
 				 */
@@ -36809,6 +34403,11 @@ declare namespace Titanium {
 				 */
 				hidesBarsWhenKeyboardAppears: boolean;
 
+				/**
+				 * Set this to true to hide the back button of navigation bar.
+				 */
+				hidesBackButton: boolean;
+
 				/**
 				 * A Boolean value indicating whether the title should be displayed in a large format.
 				 */
@@ -36840,10 +34439,15 @@ declare namespace Titanium {
 				navBarHidden: boolean;
 
 				/**
-				 * The tintColor to apply to the navigation bar. This property is applicable on iOS 7 and greater.
+				 * The tintColor to apply to the navigation bar.
 				 */
 				navTintColor: string;
 
+				/**
+				 * The <Titanium.UI.iOS.NavigationWindow> instance hosting this window.
+				 */
+				readonly navigationWindow: Titanium.UI.iOS.NavigationWindow;
+
 				/**
 				 * Array of supported orientation modes, specified using the orientation
 				 * constants defined in <Titanium.UI>.
@@ -37257,6 +34861,16 @@ declare namespace Titanium {
 				 */
 				setHeight(height: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.horizontalMotionEffect> property.
+				 */
+				getHorizontalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.horizontalMotionEffect> property.
+				 */
+				setHorizontalMotionEffect(horizontalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.left> property.
 				 */
@@ -37377,6 +34991,16 @@ declare namespace Titanium {
 				 */
 				setTransform(transform: Titanium.UI.Matrix3D): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.verticalMotionEffect> property.
+				 */
+				getVerticalMotionEffect(): any;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.verticalMotionEffect> property.
+				 */
+				setVerticalMotionEffect(verticalMotionEffect: any): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.viewShadowRadius> property.
 				 */
@@ -37547,6 +35171,16 @@ declare namespace Titanium {
 				 */
 				setFullscreen(fullscreen: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.homeIndicatorAutoHidden> property.
+				 */
+				getHomeIndicatorAutoHidden(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.homeIndicatorAutoHidden> property.
+				 */
+				setHomeIndicatorAutoHidden(homeIndicatorAutoHidden: boolean): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.hideShadow> property.
 				 */
@@ -37587,6 +35221,16 @@ declare namespace Titanium {
 				 */
 				setHidesBarsWhenKeyboardAppears(hidesBarsWhenKeyboardAppears: boolean): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.hidesBackButton> property.
+				 */
+				getHidesBackButton(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.UI.iPad.SplitWindow.hidesBackButton> property.
+				 */
+				setHidesBackButton(hidesBackButton: boolean): void;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.largeTitleEnabled> property.
 				 */
@@ -37657,6 +35301,11 @@ declare namespace Titanium {
 				 */
 				setNavTintColor(navTintColor: string): void;
 
+				/**
+				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.navigationWindow> property.
+				 */
+				getNavigationWindow(): Titanium.UI.iOS.NavigationWindow;
+
 				/**
 				 * Gets the value of the <Titanium.UI.iPad.SplitWindow.orientationModes> property.
 				 */
@@ -37930,16 +35579,6 @@ declare namespace Titanium {
 			 */
 			let appSupportsShakeToEdit: boolean;
 
-			/**
-			 * Determines whether the status bar is hidden.
-			 */
-			const statusBarHidden: boolean;
-
-			/**
-			 * Determines the status bar color style.
-			 */
-			const statusBarStyle: number;
-
 			/**
 			 * Adds the specified callback as an event listener for the named event.
 			 */
@@ -37960,16 +35599,6 @@ declare namespace Titanium {
 			 */
 			function applyProperties(props: any): void;
 
-			/**
-			 * Hides the status bar.
-			 */
-			function hideStatusBar(params?: hideStatusBarParams): void;
-
-			/**
-			 * Shows the status bar.
-			 */
-			function showStatusBar(params?: showStatusBarParams): void;
-
 			/**
 			 * Gets the value of the <Titanium.UI.iPhone.bubbleParent> property.
 			 */
@@ -38005,16 +35634,6 @@ declare namespace Titanium {
 			 */
 			function setAppSupportsShakeToEdit(appSupportsShakeToEdit: boolean): void;
 
-			/**
-			 * Gets the value of the <Titanium.UI.iPhone.statusBarHidden> property.
-			 */
-			function getStatusBarHidden(): boolean;
-
-			/**
-			 * Gets the value of the <Titanium.UI.iPhone.statusBarStyle> property.
-			 */
-			function getStatusBarStyle(): number;
-
 			/**
 			 * A set of constants for the style that can be used for the `selectionStyle` property of a
 			 * ListItem, which is set in the `properties` dictionary of either the <ListDataItem> or
@@ -38584,103 +36203,6 @@ declare namespace Titanium {
 
 			}
 
-			/**
-			 * A set of constants for the status bar style.
-			 */
-			namespace StatusBar {
-				/**
-				 * Indicates if the proxy will bubble an event to its parent.
-				 */
-				let bubbleParent: boolean;
-
-				/**
-				 * The name of the API that this proxy corresponds to.
-				 */
-				const apiName: string;
-
-				/**
-				 * No animation style, when the status bar is hidden or shown.
-				 */
-				const ANIMATION_STYLE_NONE: number;
-
-				/**
-				 * Slide animation style, when the status bar is hidden or shown.
-				 */
-				const ANIMATION_STYLE_SLIDE: number;
-
-				/**
-				 * Fade animation style, when the status bar is hidden or shown.
-				 */
-				const ANIMATION_STYLE_FADE: number;
-
-				/**
-				 * Default status bar style.
-				 */
-				const DEFAULT: number;
-
-				/**
-				 * Gray-colored status bar style.
-				 */
-				const GRAY: number;
-
-				/**
-				 * Gray-colored status bar style.
-				 */
-				const GREY: number;
-
-				/**
-				 * Status bar style to use with dark backgrounds. Valid on iOS 7 and above.
-				 */
-				const LIGHT_CONTENT: number;
-
-				/**
-				 * Opaque black-colored status bar style.
-				 */
-				const OPAQUE_BLACK: number;
-
-				/**
-				 * Translucent black-colored status bar style, which provides some degree of transparency to
-				 * the device background.
-				 */
-				const TRANSLUCENT_BLACK: number;
-
-				/**
-				 * Adds the specified callback as an event listener for the named event.
-				 */
-				function addEventListener(name: string, callback: (param0: any) => any): void;
-
-				/**
-				 * Removes the specified callback as an event listener for the named event.
-				 */
-				function removeEventListener(name: string, callback: (param0: any) => any): void;
-
-				/**
-				 * Fires a synthesized event to any registered listeners.
-				 */
-				function fireEvent(name: string, event: any): void;
-
-				/**
-				 * Applies the properties to the proxy.
-				 */
-				function applyProperties(props: any): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPhone.StatusBar.bubbleParent> property.
-				 */
-				function getBubbleParent(): boolean;
-
-				/**
-				 * Sets the value of the <Titanium.UI.iPhone.StatusBar.bubbleParent> property.
-				 */
-				function setBubbleParent(bubbleParent: boolean): void;
-
-				/**
-				 * Gets the value of the <Titanium.UI.iPhone.StatusBar.apiName> property.
-				 */
-				function getApiName(): string;
-
-			}
-
 			/**
 			 * A set of constants for creating standard iOS system buttons.
 			 */
@@ -39621,10 +37143,15 @@ declare namespace Titanium {
 		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
 
 		/**
-		 * JSON representation of the last analytics event generated.
+		 * JSON representation of the last Analytics event generated.
 		 */
 		const lastEvent: string;
 
+		/**
+		 * Allows the user to opt out from Analytics during runtime to comply to GPDR.
+		 */
+		let optedOut: boolean;
+
 		/**
 		 * Sends a generic event for this application session.
 		 * **Not displayed in Analytics UI**.
@@ -39637,7 +37164,7 @@ declare namespace Titanium {
 		function featureEvent(name: string, data?: any): number;
 
 		/**
-		 * Sets a list of events that will not be sent to the analytics server.
+		 * Sets a list of events that will not be sent to the Analytics server.
 		 */
 		function filterEvents(events: ReadonlyArray<string>): void;
 
@@ -39699,6 +37226,16 @@ declare namespace Titanium {
 		 */
 		function getLastEvent(): string;
 
+		/**
+		 * Gets the value of the <Titanium.Analytics.optedOut> property.
+		 */
+		function getOptedOut(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Analytics.optedOut> property.
+		 */
+		function setOptedOut(optedOut: boolean): void;
+
 	}
 
 	/**
@@ -39960,11 +37497,6 @@ declare namespace Titanium {
 		 */
 		const ACTION_PACKAGE_DATA_CLEARED: string;
 
-		/**
-		 * Trigger the download and eventual installation of a package.
-		 */
-		const ACTION_PACKAGE_INSTALL: string;
-
 		/**
 		 * An existing application package has been removed from the device.
 		 */
@@ -40090,16 +37622,6 @@ declare namespace Titanium {
 		 */
 		const ACTION_UID_REMOVED: string;
 
-		/**
-		 * The device has entered USB Mass Storage mode.
-		 */
-		const ACTION_UMS_CONNECTED: string;
-
-		/**
-		 * The device has exited USB Mass Storage mode.
-		 */
-		const ACTION_UMS_DISCONNECTED: string;
-
 		/**
 		 * Sent when the user is present after device wakes up.
 		 */
@@ -40387,7 +37909,7 @@ declare namespace Titanium {
 		const FLAG_ACTIVITY_NO_HISTORY: number;
 
 		/**
-		 * Disables the [onUserLeaveHint()](http://developer.android.com/reference/android/app/Activity.html#onUserLeaveHint()) callback.
+		 * Disables the [onUserLeaveHint()](https://developer.android.com/reference/android/app/Activity.html#onUserLeaveHint()) callback.
 		 */
 		const FLAG_ACTIVITY_NO_USER_ACTION: number;
 
@@ -41685,7 +39207,7 @@ declare namespace Titanium {
 			/**
 			 * Get a boolean property from this Intent.
 			 */
-			getBooleanExtra(name: string): boolean;
+			getBooleanExtra(name: string, defaultValue: boolean): boolean;
 
 			/**
 			 * Get the Data URI from this `Intent`.
@@ -41695,17 +39217,17 @@ declare namespace Titanium {
 			/**
 			 * Get a double property from this `Intent`.
 			 */
-			getDoubleExtra(name: string): number;
+			getDoubleExtra(name: string, defaultValue: number): number;
 
 			/**
 			 * Get an integer property from this `Intent`.
 			 */
-			getIntExtra(name: string): number;
+			getIntExtra(name: string, defaultValue: number): number;
 
 			/**
 			 * Get a long property from this `Intent`.
 			 */
-			getLongExtra(name: string): number;
+			getLongExtra(name: string, defaultValue: number): number;
 
 			/**
 			 * Get a string property from this `Intent`.
@@ -42718,6 +40240,16 @@ declare namespace Titanium {
 			 */
 			readonly serviceInstanceId: number;
 
+			/**
+			 * Puts the service into the "background" state and removes its foreground notification.
+			 */
+			foregroundCancel(): void;
+
+			/**
+			 * Puts the service into the "foreground" state and displays a notification.
+			 */
+			foregroundNotify(id: number, notification: Titanium.Android.Notification): void;
+
 			/**
 			 * Starts the Service.
 			 */
@@ -42768,6 +40300,16 @@ declare namespace Titanium {
 			 */
 			getState(): number;
 
+			/**
+			 * Returns the Tile's current label.
+			 */
+			getLabel(): string;
+
+			/**
+			 * Returns 'true' if the device is currently locked, 'false' otherwise.
+			 */
+			isLocked(): boolean;
+
 			/**
 			 * Returns 'true' if the device is in secure state, 'false' otherwise.
 			 */
@@ -42801,7 +40343,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * The Titanium binding of [Android RemoteViews](http://developer.android.com/reference/android/widget/RemoteViews.html).
+		 * The Titanium binding of [Android RemoteViews](https://developer.android.com/reference/android/widget/RemoteViews.html).
 		 */
 		interface RemoteViews extends Titanium.Proxy {
 			/**
@@ -42817,7 +40359,7 @@ declare namespace Titanium {
 			/**
 			 * Calls a method taking a single `boolean` argument on a view in the remote view
 			 * hierarchy.  See Android's documentation for
-			 * [setBoolean](http://developer.android.com/reference/android/widget/RemoteViews.html#setBoolean(int, java.lang.String, boolean)).
+			 * [setBoolean](https://developer.android.com/reference/android/widget/RemoteViews.html#setBoolean(int, java.lang.String, boolean)).
 			 */
 			setBoolean(viewId: number, methodName: string, value: boolean): void;
 
@@ -42922,6 +40464,16 @@ declare namespace Titanium {
 			 */
 			readonly serviceInstanceId: number;
 
+			/**
+			 * Puts the service into the "background" state and removes its foreground notification.
+			 */
+			foregroundCancel(): void;
+
+			/**
+			 * Puts the service into the "foreground" state and displays a notification.
+			 */
+			foregroundNotify(id: number, notification: Titanium.Android.Notification): void;
+
 			/**
 			 * Starts the Service.
 			 */
@@ -43651,89 +41203,157 @@ declare namespace Titanium {
 
 			/**
 			 * Animation resources. See
-			 * [R.anim](http://developer.android.com/reference/android/R.anim.html)
+			 * [R.anim](https://developer.android.com/reference/android/R.anim.html)
 			 * in the Android Developer Reference.
 			 */
 			const anim: any;
 
 			/**
-			 * Array resources. See [R.array](http://developer.android.com/reference/android/R.array.html)
+			 * Animator resources. See
+			 * [R.animator](https://developer.android.com/reference/android/R.animator.html)
+			 * in the Android Developer Reference.
+			 */
+			const animator: any;
+
+			/**
+			 * Array resources. See [R.array](https://developer.android.com/reference/android/R.array.html)
 			 * in the Android Developer Reference.
 			 */
 			const array: any;
 
 			/**
 			 * Attribute resources. See
-			 * [R.attr](http://developer.android.com/reference/android/R.attr.html)
+			 * [R.attr](https://developer.android.com/reference/android/R.attr.html)
 			 * in the Android Developer Reference.
 			 */
 			const attr: any;
 
+			/**
+			 * Boolean resources. See
+			 * [R.bool](https://developer.android.com/reference/android/R.bool.html)
+			 * in the Android Developer Reference.
+			 */
+			const bool: any;
+
 			/**
 			 * Color resources. See
-			 * [R.color](http://developer.android.com/reference/android/R.color.html)
+			 * [R.color](https://developer.android.com/reference/android/R.color.html)
 			 * in the Android Developer Reference.
 			 */
 			const color: any;
 
 			/**
 			 * Dimension resources.  See
-			 * [http://developer.android.com/reference/android/R.dimen.html](http://developer.android.com/reference/android/R.dimen.html)
+			 * [https://developer.android.com/reference/android/R.dimen.html](https://developer.android.com/reference/android/R.dimen.html)
 			 * in the Android Developer Reference.
 			 */
 			const dimen: any;
 
 			/**
 			 * Drawable resources. See
-			 * [R.drawable](http://developer.android.com/reference/android/R.drawable.html)
+			 * [R.drawable](https://developer.android.com/reference/android/R.drawable.html)
 			 * in the Android Developer Reference.
-			 * Accessing drawables using Ti.Android.R.drawable is deprecated and not a recommended practice since the system provided
-			 * drawables can be removed across Android versions. Prefer to copy the images to application res folder.
 			 */
 			const drawable: any;
 
+			/**
+			 * Fraction resources. See
+			 * [R.fraction](https://developer.android.com/reference/android/R.fraction.html)
+			 * in the Android Developer Reference.
+			 */
+			const fraction: any;
+
 			/**
 			 * ID resources.  See
-			 * [R.id](http://developer.android.com/reference/android/R.id.html)
+			 * [R.id](https://developer.android.com/reference/android/R.id.html)
 			 * in the Android Developer Reference.
 			 */
 			const id: any;
 
 			/**
 			 * Integer resources. See
-			 * [R.integer](http://developer.android.com/reference/android/R.integer.html)
+			 * [R.integer](https://developer.android.com/reference/android/R.integer.html)
 			 * in the Android Developer Reference.
 			 */
 			const integer: any;
 
+			/**
+			 * Interpolator resources. See
+			 * [R.fraction](https://developer.android.com/reference/android/R.interpolator.html)
+			 * in the Android Developer Reference.
+			 */
+			const interpolator: any;
+
 			/**
 			 * Layout resources. See
-			 * [R.layout](http://developer.android.com/reference/android/R.layout.html)
+			 * [R.layout](https://developer.android.com/reference/android/R.layout.html)
 			 * in the Android Developer Reference.
 			 */
 			const layout: any;
 
+			/**
+			 * Menu resources. See
+			 * [R.menu](https://developer.android.com/reference/android/R.menu.html)
+			 * in the Android Developer Reference.
+			 */
+			const menu: any;
+
+			/**
+			 * Mipmap resources. See
+			 * [R.mipmap](https://developer.android.com/reference/android/R.mipmap.html)
+			 * in the Android Developer Reference.
+			 */
+			const mipmap: any;
+
+			/**
+			 * Plurals resources. See
+			 * [R.plurals](https://developer.android.com/reference/android/R.plurals.html)
+			 * in the Android Developer Reference.
+			 */
+			const plurals: any;
+
+			/**
+			 * Raw resources. See
+			 * [R.raw](https://developer.android.com/reference/android/R.raw.html)
+			 * in the Android Developer Reference.
+			 */
+			const raw: any;
+
 			/**
 			 * String resources. See
-			 * [R.string](http://developer.android.com/reference/android/R.string.html)
+			 * [R.string](https://developer.android.com/reference/android/R.string.html)
 			 * in the Android Developer Reference.
 			 */
 			const string: any;
 
 			/**
 			 * Style resources. See
-			 * [R.style](http://developer.android.com/reference/android/R.style.html)
+			 * [R.style](https://developer.android.com/reference/android/R.style.html)
 			 * in the Android Developer Reference.
 			 */
 			const style: any;
 
 			/**
 			 * Styleable reosurces. See
-			 * [R.styleable](http://developer.android.com/reference/android/R.styleable.html)
+			 * [R.styleable](https://developer.android.com/reference/android/R.styleable.html)
 			 * in the Android Developer Reference.
 			 */
 			const styleable: any;
 
+			/**
+			 * Transition resources. See
+			 * [R.transition](https://developer.android.com/reference/android/R.transition.html)
+			 * in the Android Developer Reference.
+			 */
+			const transition: any;
+
+			/**
+			 * XML resources. See
+			 * [R.xml](https://developer.android.com/reference/android/R.xml.html)
+			 * in the Android Developer Reference.
+			 */
+			const xml: any;
+
 			/**
 			 * Adds the specified callback as an event listener for the named event.
 			 */
@@ -44425,7 +42045,25 @@ declare namespace Titanium {
 			const USER_NOTIFICATION_TYPE_ALERT: number;
 
 			/**
-			 * The action will execute in background.  Use with the
+			 * The ability to play sounds for critical alerts.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_CRITICAL_ALERT: number;
+
+			/**
+			 * The ability to post non-interrupting notifications provisionally to the Notification Center.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_PROVISIONAL: number;
+
+			/**
+			 * An option indicating the system should display a button for in-app notification settings.
+			 * Use with the [types](UserNotificationSettings.types) property.
+			 */
+			const USER_NOTIFICATION_TYPE_PROVIDES_APP_NOTIFICATION_SETTINGS: number;
+
+			/**
+			 * The action will execute in background. Use with the
 			 * [activationMode](Titanium.App.iOS.UserNotificationAction.activationMode) property.
 			 */
 			const USER_NOTIFICATION_ACTIVATION_MODE_BACKGROUND: number;
@@ -44446,6 +42084,82 @@ declare namespace Titanium {
 			 */
 			const USER_NOTIFICATION_BEHAVIOR_TEXTINPUT: number;
 
+			/**
+			 * The user has not yet made a choice regarding whether the application may post
+			 * user notifications.
+			 */
+			const USER_NOTIFICATION_AUTHORIZATION_STATUS_NOT_DETERMINED: number;
+
+			/**
+			 * The application is authorized to post user notifications.
+			 */
+			const USER_NOTIFICATION_AUTHORIZATION_STATUS_AUTHORIZED: number;
+
+			/**
+			 * The application is not authorized to post user notifications.
+			 */
+			const USER_NOTIFICATION_AUTHORIZATION_STATUS_DENIED: number;
+
+			/**
+			 * The application is provisionally authorized to post non-interruptive user notifications.
+			 */
+			const USER_NOTIFICATION_AUTHORIZATION_STATUS_PROVISIONAL: number;
+
+			/**
+			 * The application does not support this notification type.
+			 */
+			const USER_NOTIFICATION_SETTING_NOT_SUPPORTED: number;
+
+			/**
+			 * The notification setting is turned on.
+			 */
+			const USER_NOTIFICATION_SETTING_ENABLED: number;
+
+			/**
+			 * The notification setting is turned off.
+			 */
+			const USER_NOTIFICATION_SETTING_DISABLED: number;
+
+			/**
+			 * No banner or alert dialog is presented when the notification is received.
+			 */
+			const USER_NOTIFICATION_ALERT_STYLE_NONE: number;
+
+			/**
+			 * A alert dialog is presented when the notification is received.
+			 */
+			const USER_NOTIFICATION_ALERT_STYLE_ALERT: number;
+
+			/**
+			 * A banner is presented when the notification is received.
+			 */
+			const USER_NOTIFICATION_ALERT_STYLE_BANNER: number;
+
+			/**
+			 * No options.
+			 */
+			const USER_NOTIFICATION_CATEGORY_OPTION_NONE: number;
+
+			/**
+			 * Send dismiss actions to the UNUserNotificationCenter object's delegate for handling.
+			 */
+			const USER_NOTIFICATION_CATEGORY_OPTION_CUSTOM_DISMISS_ACTION: number;
+
+			/**
+			 * Allow CarPlay to display notifications of this type.
+			 */
+			const USER_NOTIFICATION_CATEGORY_OPTION_ALLOW_IN_CARPLAY: number;
+
+			/**
+			 * Show the notification's title, even if the user has disabled notification previews for the app.
+			 */
+			const USER_NOTIFICATION_CATEGORY_OPTION_HIDEEN_PREVIEWS_SHOW_TITLE: number;
+
+			/**
+			 * Show the notification's subtitle, even if the user has disabled notification previews for the app.
+			 */
+			const USER_NOTIFICATION_CATEGORY_OPTION_HIDEEN_PREVIEWS_SHOW_SUBTITLE: number;
+
 			/**
 			 * Uniform type identifier for all text types.
 			 */
@@ -44613,14 +42327,12 @@ declare namespace Titanium {
 			const UTTYPE_APPLE_PROTECTED_MPEG4_AUDIO: string;
 
 			/**
-			 * Notification types and user notification categories the application is registered to use
-			 * (available on iOS 8 and later).
+			 * Notification types and user notification categories the application is registered to use.
 			 */
 			const currentUserNotificationSettings: UserNotificationSettings;
 
 			/**
 			 * Provides an Array of the NSUserActivityTypes keys defined within your Titanium project.
-			 * (available on iOS 8 and later).
 			 */
 			const supportedUserActivityTypes: string[];
 
@@ -44675,8 +42387,7 @@ declare namespace Titanium {
 			function registerBackgroundService(params: any): Titanium.App.iOS.BackgroundService;
 
 			/**
-			 * Registers the application to use the requested notification types and categories
-			 * (for devices running iOS 8 or later).
+			 * Registers the application to use the requested notification types and categories.
 			 */
 			function registerUserNotificationSettings(params: UserNotificationSettings): void;
 
@@ -46729,13 +44440,112 @@ declare namespace Titanium {
 				 */
 				actionsForMinimalContext: Titanium.App.iOS.UserNotificationAction[];
 
+				/**
+				 * A format string for the summary description used when the system groups the category's notifications.
+				 */
+				categorySummaryFormat: string;
+
 				/**
 				 * Identifier for this category.
 				 */
 				identifier: string;
 
+				/**
+				 * The intents related to notifications of this category.
+				 */
+				intentIdentifiers: string[];
+
+				/**
+				 * The placeholder text to display when notification previews are disabled for the app.
+				 */
+				hiddenPreviewsBodyPlaceholder: string;
+
+				/**
+				 * Options for how to handle notifications of this type.
+				 */
+				options: number[];
+
 			}
 
+
+			/**
+			 * The top-level App iOS Notification Center module. It is used to control scheduled notifications
+			 * and receive details about the system-wide notification settings.
+			 */
+			namespace UserNotificationCenter {
+				/**
+				 * Indicates if the proxy will bubble an event to its parent.
+				 */
+				let bubbleParent: boolean;
+
+				/**
+				 * The name of the API that this proxy corresponds to.
+				 */
+				const apiName: string;
+
+				/**
+				 * Adds the specified callback as an event listener for the named event.
+				 */
+				function addEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Removes the specified callback as an event listener for the named event.
+				 */
+				function removeEventListener(name: string, callback: (param0: any) => any): void;
+
+				/**
+				 * Fires a synthesized event to any registered listeners.
+				 */
+				function fireEvent(name: string, event: any): void;
+
+				/**
+				 * Applies the properties to the proxy.
+				 */
+				function applyProperties(props: any): void;
+
+				/**
+				 * Fetches the pending notifications asynchronously.
+				 */
+				function getPendingNotifications(callback: (param0: UserNotificationCallbackResponse) => any): void;
+
+				/**
+				 * Fetches the delivered notifications asynchronously.
+				 */
+				function getDeliveredNotifications(callback: (param0: UserNotificationCallbackResponse) => any): void;
+
+				/**
+				 * Removes the specified pending notifications to prevent them from being triggered.
+				 * If no notifications are specified, all pending notifications will be removed.
+				 */
+				function removePendingNotifications(notifications: ReadonlyArray<Titanium.App.iOS.LocalNotification>): void;
+
+				/**
+				 * Removes the specified delivered notifications from the notification-center.
+				 * If no notifications are specified, all delivered notifications will be removed.
+				 */
+				function removeDeliveredNotifications(): void;
+
+				/**
+				 * Notification types and user notification categories the application is registered to use.
+				 */
+				function requestUserNotificationSettings(callback: (param0: GetUserNotificationSettings) => any): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserNotificationCenter.bubbleParent> property.
+				 */
+				function getBubbleParent(): boolean;
+
+				/**
+				 * Sets the value of the <Titanium.App.iOS.UserNotificationCenter.bubbleParent> property.
+				 */
+				function setBubbleParent(bubbleParent: boolean): void;
+
+				/**
+				 * Gets the value of the <Titanium.App.iOS.UserNotificationCenter.apiName> property.
+				 */
+				function getApiName(): string;
+
+			}
 		}
 	}
 
@@ -47439,7 +45249,7 @@ declare namespace Titanium {
 			readonly hidden: boolean;
 
 			/**
-			 * Identifier of this calendar. Available only in iOS 5.0 and above.
+			 * Identifier of this calendar.
 			 */
 			readonly id: string;
 
@@ -47631,12 +45441,7 @@ declare namespace Titanium {
 			title: string;
 
 			/**
-			 * Recurrence rule associated with the event. (Available in iOS 4.0 through iOS 5.1.)
-			 */
-			recurrenceRule: Titanium.Calendar.RecurrenceRule;
-
-			/**
-			 * The recurrence rules for the calendar item. (Available in iOS 5.1 and above.)
+			 * The recurrence rules for the calendar item.
 			 */
 			recurrenceRules: Titanium.Calendar.RecurrenceRule[];
 
@@ -47812,16 +45617,6 @@ declare namespace Titanium {
 			 */
 			setTitle(title: string): void;
 
-			/**
-			 * Gets the value of the <Titanium.Calendar.Event.recurrenceRule> property.
-			 */
-			getRecurrenceRule(): Titanium.Calendar.RecurrenceRule;
-
-			/**
-			 * Sets the value of the <Titanium.Calendar.Event.recurrenceRule> property.
-			 */
-			setRecurrenceRule(recurrenceRule: Titanium.Calendar.RecurrenceRule): void;
-
 			/**
 			 * Gets the value of the <Titanium.Calendar.Event.recurrenceRules> property.
 			 */
@@ -48391,7 +46186,7 @@ declare namespace Titanium {
 			name: string;
 
 			/**
-			 * Record identifier of the group. Single value. Deprecated for >= iOS9.
+			 * Record identifier of the group. Single value. Deprecated for iOS 9 and later.
 			 */
 			recordId: number;
 
@@ -49299,6 +47094,11 @@ declare namespace Titanium {
 		 */
 		function getFile(...paths: string[]): Titanium.Filesystem.File;
 
+		/**
+		 * Returns a `File` object representing the file identified by the path arguments.
+		 */
+		function getFile(...paths: string[]): Titanium.Filesystem.File;
+
 		/**
 		 * Returns a `Blob` object representing the asset catalog image identified by the path arguments.
 		 */
@@ -49491,7 +47291,7 @@ declare namespace Titanium {
 			/**
 			 * Creates a directory at the path identified by this file object.
 			 */
-			createDirectory(): boolean;
+			createDirectory(recursive?: boolean): boolean;
 
 			/**
 			 * Creates a file at the path identified by this file object.
@@ -49503,6 +47303,11 @@ declare namespace Titanium {
 			 */
 			createTimestamp(): number;
 
+			/**
+			 * Returns the creation Date for the file identified by this file object.
+			 */
+			createdAt(): Date;
+
 			/**
 			 * Deletes the directory identified by this file object.
 			 */
@@ -49556,6 +47361,11 @@ declare namespace Titanium {
 			 */
 			modificationTimestamp(): number;
 
+			/**
+			 * Returns the last modification Date for the file identified by this file object.
+			 */
+			modifiedAt(): Date;
+
 			/**
 			 * Moves the file identified by this file object to another path.
 			 */
@@ -49923,17 +47733,17 @@ declare namespace Titanium {
 		 */
 		let preferredProvider: string;
 
-		/**
-		 * Text to display in the permission dialog when requesting location
-		 * services.
-		 */
-		let purpose: string;
-
 		/**
 		 * Determines whether the compass calibration UI is shown if needed.
 		 */
 		let showCalibration: boolean;
 
+		/**
+		 * Specifies that an indicator be shown when the app makes use of continuous
+		 * background location updates.
+		 */
+		let showBackgroundLocationIndicator: boolean;
+
 		/**
 		 * Indicates if the location changes should be updated only when a significant change
 		 * in location occurs.
@@ -49946,12 +47756,12 @@ declare namespace Titanium {
 		let allowsBackgroundLocationUpdates: boolean;
 
 		/**
-		 * The type of user activity to be associated with the location updates. Available in iOS 6.0 and later.
+		 * The type of user activity to be associated with the location updates.
 		 */
 		let activityType: number;
 
 		/**
-		 * Indicates whether the location updates may be paused. Available in iOS 6.0 and later.
+		 * Indicates whether the location updates may be paused.
 		 */
 		let pauseLocationUpdateAutomatically: boolean;
 
@@ -50110,16 +47920,6 @@ declare namespace Titanium {
 		 */
 		function setPreferredProvider(preferredProvider: string): void;
 
-		/**
-		 * Gets the value of the <Titanium.Geolocation.purpose> property.
-		 */
-		function getPurpose(): string;
-
-		/**
-		 * Sets the value of the <Titanium.Geolocation.purpose> property.
-		 */
-		function setPurpose(purpose: string): void;
-
 		/**
 		 * Gets the value of the <Titanium.Geolocation.showCalibration> property.
 		 */
@@ -50130,6 +47930,16 @@ declare namespace Titanium {
 		 */
 		function setShowCalibration(showCalibration: boolean): void;
 
+		/**
+		 * Gets the value of the <Titanium.Geolocation.showBackgroundLocationIndicator> property.
+		 */
+		function getShowBackgroundLocationIndicator(): boolean;
+
+		/**
+		 * Sets the value of the <Titanium.Geolocation.showBackgroundLocationIndicator> property.
+		 */
+		function setShowBackgroundLocationIndicator(showBackgroundLocationIndicator: boolean): void;
+
 		/**
 		 * Gets the value of the <Titanium.Geolocation.trackSignificantLocationChange> property.
 		 */
@@ -50649,657 +48459,6 @@ declare namespace Titanium {
 
 	}
 
-	/**
-	 * The top level Map module.  The Map module is used for creating in-application native maps.
-	 */
-	namespace Map {
-		/**
-		 * Indicates if the proxy will bubble an event to its parent.
-		 */
-		let bubbleParent: boolean;
-
-		/**
-		 * The name of the API that this proxy corresponds to.
-		 */
-		const apiName: string;
-
-		/**
-		 * The Window or TabGroup whose Activity lifecycle should be triggered on the proxy.
-		 */
-		let lifecycleContainer: Titanium.UI.Window | Titanium.UI.TabGroup;
-
-		/**
-		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
-		 * to indicate that the annotation is not being dragged.
-		 */
-		const ANNOTATION_DRAG_STATE_NONE: number;
-
-		/**
-		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
-		 * to indicate that the user started dragging the annotation.
-		 */
-		const ANNOTATION_DRAG_STATE_START: number;
-
-		/**
-		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
-		 * to indicate that the user moved the annotation.
-		 */
-		const ANNOTATION_DRAG_STATE_DRAG: number;
-
-		/**
-		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
-		 * to indicate that the user canceled the drag action.
-		 */
-		const ANNOTATION_DRAG_STATE_CANCEL: number;
-
-		/**
-		 * Used in the [pinchangedragstate](Titanium.Map.View.pinchangedragstate) event
-		 * to indicate that the user finished moving the annotation.
-		 */
-		const ANNOTATION_DRAG_STATE_END: number;
-
-		/**
-		 * Color constant used to set a map annotation to green via the
-		 * <Titanium.Map.Annotation.pincolor> property.
-		 */
-		const ANNOTATION_GREEN: number;
-
-		/**
-		 * Color constant used to set a map annotation to purple via the
-		 * <Titanium.Map.Annotation.pincolor> property.
-		 */
-		const ANNOTATION_PURPLE: number;
-
-		/**
-		 * Color constant used to set a map annotation to red via the
-		 * <Titanium.Map.Annotation.pincolor> property.
-		 */
-		const ANNOTATION_RED: number;
-
-		/**
-		 * Used with [mapType](Titanium.Map.View.mapType) to display a satellite image of the area with road and road name information layered on top.
-		 */
-		const HYBRID_TYPE: number;
-
-		/**
-		 * Used with [mapType](Titanium.Map.View.mapType) to display satellite imagery of the area.
-		 */
-		const SATELLITE_TYPE: number;
-
-		/**
-		 * Used with [mapType](Titanium.Map.View.mapType) to display a street map that shows the position of all roads and some road names.
-		 */
-		const STANDARD_TYPE: number;
-
-		/**
-		 * Adds the specified callback as an event listener for the named event.
-		 */
-		function addEventListener(name: string, callback: (param0: any) => any): void;
-
-		/**
-		 * Removes the specified callback as an event listener for the named event.
-		 */
-		function removeEventListener(name: string, callback: (param0: any) => any): void;
-
-		/**
-		 * Fires a synthesized event to any registered listeners.
-		 */
-		function fireEvent(name: string, event: any): void;
-
-		/**
-		 * Applies the properties to the proxy.
-		 */
-		function applyProperties(props: any): void;
-
-		/**
-		 * Creates and returns an instance of <Titanium.Map.Annotation>.
-		 */
-		function createAnnotation(parameters?: any): Titanium.Map.Annotation;
-
-		/**
-		 * Gets the value of the <Titanium.Map.bubbleParent> property.
-		 */
-		function getBubbleParent(): boolean;
-
-		/**
-		 * Sets the value of the <Titanium.Map.bubbleParent> property.
-		 */
-		function setBubbleParent(bubbleParent: boolean): void;
-
-		/**
-		 * Gets the value of the <Titanium.Map.apiName> property.
-		 */
-		function getApiName(): string;
-
-		/**
-		 * Gets the value of the <Titanium.Map.lifecycleContainer> property.
-		 */
-		function getLifecycleContainer(): Titanium.UI.Window | Titanium.UI.TabGroup;
-
-		/**
-		 * Sets the value of the <Titanium.Map.lifecycleContainer> property.
-		 */
-		function setLifecycleContainer(lifecycleContainer: Titanium.UI.Window): void;
-
-		/**
-		 * Sets the value of the <Titanium.Map.lifecycleContainer> property.
-		 */
-		function setLifecycleContainer(lifecycleContainer: Titanium.UI.TabGroup): void;
-
-		/**
-		 * Creates and returns an instance of <Titanium.Map.View>.
-		 */
-		function createView(parameters?: any): Titanium.Map.View;
-
-		/**
-		 * Represents a labeled point of interest on the map that the user can click on.
-		 */
-		interface Annotation extends Titanium.Proxy {
-			/**
-			 * Boolean to indicate whether the pin should animate when dropped.
-			 */
-			animate: boolean;
-
-			/**
-			 * Defines whether the annotation view is able to display extra information in a callout bubble.
-			 */
-			canShowCallout: boolean;
-
-			/**
-			 * Defines a center offset point for the annotation.
-			 */
-			centerOffset: Point;
-
-			/**
-			 * Defines a custom view to be used by the annotation.
-			 */
-			customView: Titanium.UI.View;
-
-			/**
-			 * Determines whether the pin can be dragged by the user.
-			 */
-			draggable: boolean;
-
-			/**
-			 * Image to use for the the pin.
-			 */
-			image: string | Titanium.Blob;
-
-			/**
-			 * Latitude of the annotation, in decimal degrees.
-			 */
-			latitude: number;
-
-			/**
-			 * Longitude of the annotation, in decimal degrees.
-			 */
-			longitude: number;
-
-			/**
-			 * Left button image on the annotation, specified as an image URL or an iOS
-			 * button constant.
-			 */
-			leftButton: number | string;
-
-			/**
-			 * Left view that is displayed on the annotation.
-			 */
-			leftView: Titanium.UI.View;
-
-			/**
-			 * Image for the pin instead of the default image.
-			 */
-			pinImage: string;
-
-			/**
-			 * Pin color. Specify one of: <Titanium.Map.ANNOTATION_GREEN>, <Titanium.Map.ANNOTATION_PURPLE>
-			 * or <Titanium.Map.ANNOTATION_RED>.
-			 */
-			pincolor: number;
-
-			/**
-			 * Right button image on the annotation, specified as an image URL or an iOS
-			 * button constant.
-			 */
-			rightButton: number | string;
-
-			/**
-			 * Right view that is displayed on the annotation.
-			 */
-			rightView: Titanium.UI.View;
-
-			/**
-			 * Secondary title of the annotation view.
-			 */
-			subtitle: string;
-
-			/**
-			 * Key in the locale file to use for the subtitle property.
-			 */
-			subtitleid: string;
-
-			/**
-			 * Primary title of the annotation view.
-			 */
-			title: string;
-
-			/**
-			 * Key in the locale file to use for the title property.
-			 */
-			titleid: string;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.animate> property.
-			 */
-			getAnimate(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.animate> property.
-			 */
-			setAnimate(animate: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.canShowCallout> property.
-			 */
-			getCanShowCallout(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.canShowCallout> property.
-			 */
-			setCanShowCallout(canShowCallout: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.centerOffset> property.
-			 */
-			getCenterOffset(): Point;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.centerOffset> property.
-			 */
-			setCenterOffset(centerOffset: Point): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.customView> property.
-			 */
-			getCustomView(): Titanium.UI.View;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.customView> property.
-			 */
-			setCustomView(customView: any): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.draggable> property.
-			 */
-			getDraggable(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.draggable> property.
-			 */
-			setDraggable(draggable: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.image> property.
-			 */
-			getImage(): string | Titanium.Blob;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.image> property.
-			 */
-			setImage(image: string): void;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.image> property.
-			 */
-			setImage(image: Titanium.Blob): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.latitude> property.
-			 */
-			getLatitude(): number;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.latitude> property.
-			 */
-			setLatitude(latitude: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.longitude> property.
-			 */
-			getLongitude(): number;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.longitude> property.
-			 */
-			setLongitude(longitude: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.leftButton> property.
-			 */
-			getLeftButton(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.leftButton> property.
-			 */
-			setLeftButton(leftButton: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.leftButton> property.
-			 */
-			setLeftButton(leftButton: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.leftView> property.
-			 */
-			getLeftView(): Titanium.UI.View;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.leftView> property.
-			 */
-			setLeftView(leftView: any): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.pinImage> property.
-			 */
-			getPinImage(): string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.pinImage> property.
-			 */
-			setPinImage(pinImage: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.pincolor> property.
-			 */
-			getPincolor(): number;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.pincolor> property.
-			 */
-			setPincolor(pincolor: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.rightButton> property.
-			 */
-			getRightButton(): number | string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.rightButton> property.
-			 */
-			setRightButton(rightButton: number): void;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.rightButton> property.
-			 */
-			setRightButton(rightButton: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.rightView> property.
-			 */
-			getRightView(): Titanium.UI.View;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.rightView> property.
-			 */
-			setRightView(rightView: any): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.subtitle> property.
-			 */
-			getSubtitle(): string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.subtitle> property.
-			 */
-			setSubtitle(subtitle: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.subtitleid> property.
-			 */
-			getSubtitleid(): string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.subtitleid> property.
-			 */
-			setSubtitleid(subtitleid: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.title> property.
-			 */
-			getTitle(): string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.title> property.
-			 */
-			setTitle(title: string): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.Annotation.titleid> property.
-			 */
-			getTitleid(): string;
-
-			/**
-			 * Sets the value of the <Titanium.Map.Annotation.titleid> property.
-			 */
-			setTitleid(titleid: string): void;
-
-		}
-
-		/**
-		 * Map view is used for embedding native mapping capabilities as a view in your application.
-		 */
-		interface View extends Titanium.UI.View {
-			/**
-			 * An array of annotations to add to the map.
-			 */
-			annotations: Titanium.Map.Annotation[];
-
-			/**
-			 * Hide the annotation when clicking in the map view outside of the annotation.
-			 */
-			hideAnnotationWhenTouchMap: boolean;
-
-			/**
-			 * Map type, either: <Titanium.Map.STANDARD_TYPE>, <Titanium.Map.SATELLITE_TYPE> or <Titanium.Map.HYBRID_TYPE>.
-			 */
-			mapType: number;
-
-			/**
-			 * A dictionary specifying the location and zoom level of the map.
-			 * On the iOS platform, this property can only be set after the map view is loaded.
-			 * To ensure this property is set when the application starts, wait for the
-			 * [complete][Titanium.UI.Map-event-complete] event.
-			 */
-			region: MapRegionType;
-
-			/**
-			 * Boolean indicating if the map region should be modified
-			 * to fit the map view's aspect ratio.
-			 */
-			regionFit: boolean;
-
-			/**
-			 * Boolean indicating if the user's current device location should be shown on the
-			 * map.
-			 */
-			userLocation: boolean;
-
-			/**
-			 * The amount of north-to-south distance displayed on the map, measured in decimal degrees.
-			 */
-			readonly latitudeDelta: number;
-
-			/**
-			 * The amount of east-to-west distance displayed on the map, measured in decimal degrees.
-			 */
-			readonly longitudeDelta: number;
-
-			/**
-			 * Adds a new annotation to the map.
-			 */
-			addAnnotation(annotation: any): void;
-
-			/**
-			 * Adds one or more new annotations to the map.
-			 */
-			addAnnotations(annotations: any): void;
-
-			/**
-			 * Adds a route to the map.
-			 */
-			addRoute(route: MapRouteType): void;
-
-			/**
-			 * Deselects the specified annotation, so the main annotation is hidden and only
-			 * a pin image is shown.
-			 */
-			deselectAnnotation(annotation: string): void;
-
-			/**
-			 * Deselects the specified annotation, so the main annotation is hidden and only
-			 * a pin image is shown.
-			 */
-			deselectAnnotation(annotation: Titanium.Map.Annotation): void;
-
-			/**
-			 * Removes all annotations from the map.
-			 */
-			removeAllAnnotations(): void;
-
-			/**
-			 * Removes an existing annotation from the map.
-			 */
-			removeAnnotation(annotation: string): void;
-
-			/**
-			 * Removes an existing annotation from the map.
-			 */
-			removeAnnotation(annotation: Titanium.Map.Annotation): void;
-
-			/**
-			 * Removes one or more existing annotations from the map.
-			 */
-			removeAnnotations(annotations: ReadonlyArray<string>): void;
-
-			/**
-			 * Removes one or more existing annotations from the map.
-			 */
-			removeAnnotations(annotations: ReadonlyArray<Titanium.Map.Annotation>): void;
-
-			/**
-			 * Remove a previously added route.
-			 */
-			removeRoute(route: MapRouteType): void;
-
-			/**
-			 * Selects the annoation, showing the full annotation.
-			 */
-			selectAnnotation(annotation: string): void;
-
-			/**
-			 * Selects the annoation, showing the full annotation.
-			 */
-			selectAnnotation(annotation: Titanium.Map.Annotation): void;
-
-			/**
-			 * Sets the map location and zoom level.
-			 */
-			setLocation(location: MapLocationType): void;
-
-			/**
-			 * Sets the type of map (satellite, hybrid, or standard).
-			 */
-			setMapType(mapType: number): void;
-
-			/**
-			 * Zooms in or out of the map.
-			 */
-			zoom(level: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.animate> property.
-			 */
-			getAnimate(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.animate> property.
-			 */
-			setAnimate(animate: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.annotations> property.
-			 */
-			getAnnotations(): Titanium.Map.Annotation[];
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.annotations> property.
-			 */
-			setAnnotations(annotations: ReadonlyArray<Titanium.Map.Annotation>): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.hideAnnotationWhenTouchMap> property.
-			 */
-			getHideAnnotationWhenTouchMap(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.hideAnnotationWhenTouchMap> property.
-			 */
-			setHideAnnotationWhenTouchMap(hideAnnotationWhenTouchMap: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.mapType> property.
-			 */
-			getMapType(): number;
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.mapType> property.
-			 */
-			setMapType(mapType: number): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.region> property.
-			 */
-			getRegion(): MapRegionType;
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.region> property.
-			 */
-			setRegion(region: MapRegionType): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.regionFit> property.
-			 */
-			getRegionFit(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.regionFit> property.
-			 */
-			setRegionFit(regionFit: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.userLocation> property.
-			 */
-			getUserLocation(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Map.View.userLocation> property.
-			 */
-			setUserLocation(userLocation: boolean): void;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.latitudeDelta> property.
-			 */
-			getLatitudeDelta(): number;
-
-			/**
-			 * Gets the value of the <Titanium.Map.View.longitudeDelta> property.
-			 */
-			getLongitudeDelta(): number;
-
-		}
-
-	}
-
 	/**
 	 * The top-level Media module.
 	 */
@@ -51370,7 +48529,7 @@ declare namespace Titanium {
 		const AUDIO_FORMAT_AAC: number;
 
 		/**
-		 * Audio format 8-bit aLaw encoding.
+		 * Audio format 8-bit [aLaw encoding](https://en.wikipedia.org/wiki/A-law_algorithm).
 		 */
 		const AUDIO_FORMAT_ALAW: number;
 
@@ -51380,7 +48539,7 @@ declare namespace Titanium {
 		const AUDIO_FORMAT_APPLE_LOSSLESS: number;
 
 		/**
-		 * Audio format iLBC encoding.
+		 * Audio format [iLBC encoding](https://en.wikipedia.org/wiki/Internet_Low_Bitrate_Codec).
 		 */
 		const AUDIO_FORMAT_ILBC: number;
 
@@ -51390,12 +48549,12 @@ declare namespace Titanium {
 		const AUDIO_FORMAT_IMA4: number;
 
 		/**
-		 * Audio format 16-bit, linear PCM encoding.
+		 * Audio format 16-bit, [linear PCM encoding](https://en.wikipedia.org/wiki/Pulse-code_modulation).
 		 */
 		const AUDIO_FORMAT_LINEAR_PCM: number;
 
 		/**
-		 * Audio format 8-bit muLaw encoding.
+		 * Audio format 8-bit [muLaw encoding](https://en.wikipedia.org/wiki/M-law_algorithm).
 		 */
 		const AUDIO_FORMAT_ULAW: number;
 
@@ -51579,6 +48738,51 @@ declare namespace Titanium {
 		 */
 		const AUDIO_UNKNOWN: number;
 
+		/**
+		 * Audio data is being buffered from the network.
+		 */
+		const AUDIO_STATE_BUFFERING: number;
+
+		/**
+		 * Audio playback is being initialized.
+		 */
+		const AUDIO_STATE_INITIALIZED: number;
+
+		/**
+		 * Playback is paused.
+		 */
+		const AUDIO_STATE_PAUSED: number;
+
+		/**
+		 * Audio playback is active.
+		 */
+		const AUDIO_STATE_PLAYING: number;
+
+		/**
+		 * Audio playback is starting.
+		 */
+		const AUDIO_STATE_STARTING: number;
+
+		/**
+		 * Audio playback is stopped.
+		 */
+		const AUDIO_STATE_STOPPED: number;
+
+		/**
+		 * Audio playback is stopping.
+		 */
+		const AUDIO_STATE_STOPPING: number;
+
+		/**
+		 * Player is waiting for audio data from the network.
+		 */
+		const AUDIO_STATE_WAITING_FOR_DATA: number;
+
+		/**
+		 * Player is waiting for audio data to fill the queue.
+		 */
+		const AUDIO_STATE_WAITING_FOR_QUEUE: number;
+
 		/**
 		 * Constant specifying to have the device determine to use the flash or not.
 		 */
@@ -52200,7 +49404,7 @@ declare namespace Titanium {
 		function showCamera(options: CameraOptionsType): void;
 
 		/**
-		 * Returns `true` if the app has camera access.
+		 * Returns `true` if the app has music library access.
 		 */
 		function hasMusicLibraryPermissions(): boolean;
 
@@ -52615,6 +49819,28 @@ declare namespace Titanium {
 			 */
 			readonly idle: boolean;
 
+			/**
+			 * Indicates whether or not audio output of the player is muted.
+			 */
+			muted: boolean;
+
+			/**
+			 * Indicates whether the player is currently playing video in "external playback" mode.
+			 */
+			readonly externalPlaybackActive: boolean;
+
+			/**
+			 * Indicates whether the player allows switching to "external playback" mode.
+			 */
+			allowsExternalPlayback: boolean;
+
+			/**
+			 * Indicates the desired rate of playback; 0.0 means "paused", 1.0 indicates a
+			 * desire to play at the natural rate of the current item. In addition, 2.0
+			 * would mean that the audio plays twice as fast.
+			 */
+			rate: number;
+
 			/**
 			 * Boolean indicating if audio playback is paused.
 			 */
@@ -52651,7 +49877,7 @@ declare namespace Titanium {
 			readonly waiting: boolean;
 
 			/**
-			 * Size of the buffer used for streaming, in bytes.
+			 * Size of the buffer used for streaming, in milliseconds.
 			 */
 			bufferSize: number;
 
@@ -52695,6 +49921,12 @@ declare namespace Titanium {
 			 */
 			setPaused(paused: boolean): void;
 
+			/**
+			 * Moves the playback cursor and invokes the specified block when the seek
+			 * operation has either been completed or been interrupted.
+			 */
+			seekToTime(time: number): void;
+
 			/**
 			 * Stops buffering audio data and releases audio resources.
 			 */
@@ -52710,6 +49942,11 @@ declare namespace Titanium {
 			 */
 			start(): void;
 
+			/**
+			 * Restarts (stops and stars) audio playback.
+			 */
+			restart(): void;
+
 			/**
 			 * Converts a [state](Titanium.Media.AudioPlayer.state) value into a text description
 			 * suitable for display.
@@ -52771,6 +50008,41 @@ declare namespace Titanium {
 			 */
 			getIdle(): boolean;
 
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.muted> property.
+			 */
+			getMuted(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.muted> property.
+			 */
+			setMuted(muted: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.externalPlaybackActive> property.
+			 */
+			getExternalPlaybackActive(): boolean;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.allowsExternalPlayback> property.
+			 */
+			getAllowsExternalPlayback(): boolean;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.allowsExternalPlayback> property.
+			 */
+			setAllowsExternalPlayback(allowsExternalPlayback: boolean): void;
+
+			/**
+			 * Gets the value of the <Titanium.Media.AudioPlayer.rate> property.
+			 */
+			getRate(): number;
+
+			/**
+			 * Sets the value of the <Titanium.Media.AudioPlayer.rate> property.
+			 */
+			setRate(rate: number): void;
+
 			/**
 			 * Gets the value of the <Titanium.Media.AudioPlayer.paused> property.
 			 */
@@ -53328,11 +50600,6 @@ declare namespace Titanium {
 			 */
 			shuffleMode: number;
 
-			/**
-			 * Volume level for the music player from 0.0 (muted) to 1.0 (loudest).
-			 */
-			volume: number;
-
 			/**
 			 * Pauses playback of the current media item.
 			 */
@@ -53435,16 +50702,6 @@ declare namespace Titanium {
 			 */
 			setShuffleMode(shuffleMode: number): void;
 
-			/**
-			 * Gets the value of the <Titanium.Media.MusicPlayer.volume> property.
-			 */
-			getVolume(): number;
-
-			/**
-			 * Sets the value of the <Titanium.Media.MusicPlayer.volume> property.
-			 */
-			setVolume(volume: number): void;
-
 		}
 
 		/**
@@ -53763,11 +51020,6 @@ declare namespace Titanium {
 			 */
 			mediaTypes: number;
 
-			/**
-			 * Style of the media playback controls.
-			 */
-			movieControlMode: number;
-
 			/**
 			 * Returns the status of the movie player.
 			 */
@@ -53815,7 +51067,7 @@ declare namespace Titanium {
 			scalingMode: number;
 
 			/**
-			 * Whether or not the receiver shows playback controls. Default is YES.
+			 * Whether or not the receiver shows playback controls. Default is true.
 			 */
 			showsControls: boolean;
 
@@ -53829,12 +51081,6 @@ declare namespace Titanium {
 			 */
 			url: string | string[];
 
-			/**
-			 * Indicates if the movie player should inherit the application's audio session
-			 * instead of creating a new session.
-			 */
-			useApplicationAudioSession: boolean;
-
 			/**
 			 * Volume of the audio portion of the video.
 			 */
@@ -54005,16 +51251,6 @@ declare namespace Titanium {
 			 */
 			setMediaTypes(mediaTypes: number): void;
 
-			/**
-			 * Gets the value of the <Titanium.Media.VideoPlayer.movieControlMode> property.
-			 */
-			getMovieControlMode(): number;
-
-			/**
-			 * Sets the value of the <Titanium.Media.VideoPlayer.movieControlMode> property.
-			 */
-			setMovieControlMode(movieControlMode: number): void;
-
 			/**
 			 * Gets the value of the <Titanium.Media.VideoPlayer.moviePlayerStatus> property.
 			 */
@@ -54120,16 +51356,6 @@ declare namespace Titanium {
 			 */
 			setUrl(url: ReadonlyArray<string>): void;
 
-			/**
-			 * Gets the value of the <Titanium.Media.VideoPlayer.useApplicationAudioSession> property.
-			 */
-			getUseApplicationAudioSession(): boolean;
-
-			/**
-			 * Sets the value of the <Titanium.Media.VideoPlayer.useApplicationAudioSession> property.
-			 */
-			setUseApplicationAudioSession(useApplicationAudioSession: boolean): void;
-
 			/**
 			 * Gets the value of the <Titanium.Media.VideoPlayer.volume> property.
 			 */
@@ -54377,7 +51603,7 @@ declare namespace Titanium {
 		const networkTypeName: string;
 
 		/**
-		 * Boolean value indicating if the device can reach the Internet.
+		 * Boolean value indicating if the device is connected to the network.
 		 */
 		const online: boolean;
 
@@ -54503,11 +51729,6 @@ declare namespace Titanium {
 		 */
 		function registerForPushNotifications(config: PushNotificationConfig): void;
 
-		/**
-		 * Legacy method to remove a connectivity listener.
-		 */
-		function removeConnectivityListener(callback: (param0: any) => any): void;
-
 		/**
 		 * Unregisters the application for push notifications.
 		 */
@@ -55943,7 +53164,7 @@ declare namespace Titanium {
 		/**
 		 * Opens this URL using the system's default application for its protocol.
 		 */
-		function openURL(url: string): boolean;
+		function openURL(url: string, options: any, callback: () => any): boolean;
 
 		/**
 		 * Returns whether the system settings are configured to show times in 24-hour format.
@@ -57362,7 +54583,7 @@ declare namespace Titanium {
 
 		/**
 		 * An interface extending <Titanium.XML.Node> with a set of attributes and methods for accessing character data in the DOM.
-		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-FF21A306) on Android and iOS. For reasons of compatibility with the javascript engine, text is represented by UTF-8 instead of UTF-16 on Android and iOS.
+		 * Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-FF21A306) on Android and iOS. For reasons of compatibility with the javascript engine, text is represented by UTF-8 instead of UTF-16 on Android and iOS.
 		 */
 		interface CharacterData extends Titanium.Proxy {
 			/**
@@ -57882,7 +55103,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * The <Titanium.XML.DOMImplementation> interface provides a number of methods for performing operations that are independent of any particular instance of the document object model.Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-102161490) on Android and iOS.
+		 * The <Titanium.XML.DOMImplementation> interface provides a number of methods for performing operations that are independent of any particular instance of the document object model.Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-102161490) on Android and iOS.
 		 */
 		interface DOMImplementation extends Titanium.Proxy {
 			/**
@@ -58696,7 +55917,7 @@ declare namespace Titanium {
 
 		/**
 		 * Represents an element in a DOM document, a <Titanium.XML.Node> defined by a start-tag and end-tag (or an empty tag). Elements may have [attributes](Titanium.XML.Attr) associated with them.
-		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-745549614) on Android and iOS with some non-standard extensions.
+		 * Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-745549614) on Android and iOS with some non-standard extensions.
 		 */
 		interface Element extends Titanium.Proxy {
 			/**
@@ -58992,7 +56213,7 @@ declare namespace Titanium {
 
 		/**
 		 * This interface represents an entity, either parsed or unparsed, in an XML document. Note that this models the entity itself not the entity declaration. The nodeName attribute that is inherited from Node contains the name of the entity. An Entity node does not have any parent.
-		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-527DCFF2) on Android and iOS.
+		 * Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-527DCFF2) on Android and iOS.
 		 */
 		interface Entity extends Titanium.Proxy {
 			/**
@@ -59443,7 +56664,7 @@ declare namespace Titanium {
 
 		/**
 		 * A key-value paired map that maps String objects to <Titanium.XML.Node> objects.
-		 * Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1780488922) on Android and iOS.
+		 * Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1780488922) on Android and iOS.
 		 */
 		interface NamedNodeMap extends Titanium.Proxy {
 			/**
@@ -59704,7 +56925,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * A list of <Titanium.XML.Node> objects. Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-536297177) on Android and iOS.
+		 * A list of <Titanium.XML.Node> objects. Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-536297177) on Android and iOS.
 		 */
 		interface NodeList extends Titanium.Proxy {
 			/**
@@ -59725,7 +56946,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * Represents a notation declared in the DTD.  Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-5431D1B9) on Android and iOS.
+		 * Represents a notation declared in the DTD.  Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-5431D1B9) on Android and iOS.
 		 */
 		interface Notation extends Titanium.Proxy {
 			/**
@@ -59751,7 +56972,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * A way to keep processor-specific information in the text of the document. Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1004215813) on Android and iOS.
+		 * A way to keep processor-specific information in the text of the document. Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1004215813) on Android and iOS.
 		 */
 		interface ProcessingInstruction extends Titanium.Proxy {
 			/**
@@ -59782,7 +57003,7 @@ declare namespace Titanium {
 		}
 
 		/**
-		 * Represents the textual content of an <Titanium.XML.Element> or <Titanium.XML.Attr> Implements the [DOM Level 2 API](http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1312295772) on Android and iOS.
+		 * Represents the textual content of an <Titanium.XML.Element> or <Titanium.XML.Attr> Implements the [DOM Level 2 API](https://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-1312295772) on Android and iOS.
 		 */
 		interface Text extends Titanium.Proxy {
 			/**
@@ -61132,7 +58353,7 @@ interface CloudPushSchedulesResponse {
 	message?: string;
 
 	/**
-	 * Array of [schedules push notifications](http://docs.appcelerator.com/arrowdb/latest/#!/api/PushSchedules), if any exist.
+	 * Array of [schedules push notifications](https://docs.appcelerator.com/arrowdb/latest/#!/api/PushSchedules), if any exist.
 	 */
 	push_schedules?: any[];
 
@@ -61542,13 +58763,175 @@ interface launchOptions {
 
 }
 
+/**
+ * Response when receiving pending or local notifications
+ * in <Titanium.App.iOS.UserNotificationCenter.getPendingNotifications> and
+ * <Titanium.App.iOS.UserNotificationCenter.getDeliveredNotifications>.
+ */
+interface UserNotificationCallbackResponse {
+	/**
+	 * An array of identifiers used to create notifications.
+	 */
+	notifications?: UserNotificationDictionary[];
+
+}
+
+/**
+ * Dictionary of notification data used in the array of `notifications`
+ * when receiving pending or local notifications in
+ * <Titanium.App.iOS.UserNotificationCenter.getPendingNotifications> and
+ * <Titanium.App.iOS.UserNotificationCenter.getDeliveredNotifications>.
+ */
+interface UserNotificationDictionary {
+	/**
+	 * Title of the notification.
+	 */
+	alertTitle?: string;
+
+	/**
+	 * Subtitle of the notification.
+	 */
+	alertSubtitle?: string;
+
+	/**
+	 * Alert button text ('Open', by default) or home text ('Press Home to unlock', by default)
+	 * type: String
+	 */
+	alertAction?: string;
+
+	/**
+	 * Alert message.
+	 */
+	alertBody?: string;
+
+	/**
+	 * Image displayed instead of `Default.png` when launching the application.
+	 */
+	alertLaunchImage?: string;
+
+	/**
+	 * Application badge value.
+	 */
+	badge?: number;
+
+	/**
+	 * Date and time when the notification was configured to fire.
+	 */
+	date?: Date;
+
+	/**
+	 * Path to the sound file configured to play when the notification was fired.
+	 */
+	sound?: string;
+
+	/**
+	 * Timezone of the date when the notification was configured to fire.
+	 */
+	timezone?: string;
+
+	/**
+	 * Custom data object.
+	 */
+	userInfo?: any;
+
+	/**
+	 * Category identifier of the notification.
+	 */
+	category?: string;
+
+	/**
+	 * The notification identifier.
+	 */
+	identifier: string;
+
+	/**
+	 * Region of the notification.
+	 */
+	region?: any;
+
+}
+
+/**
+ * Dictionary object of parameters used to register the application with local notifications using
+ * the <Titanium.App.iOS.registerUserNotificationSettings> method.
+ */
+interface GetUserNotificationSettings {
+	/**
+	 * Notification types to use.
+	 */
+	types?: number[];
+
+	/**
+	 * Set of categories of user notification actions required by the applicaiton to use.
+	 */
+	categories?: Titanium.App.iOS.UserNotificationCategory[];
+
+	/**
+	 * The current authorization status for using notifications.
+	 */
+	authorizationStatus?: number;
+
+	/**
+	 * The current sound settings.
+	 */
+	soundSetting?: number;
+
+	/**
+	 * The current badge settings.
+	 */
+	badgeSetting?: number;
+
+	/**
+	 * The current alert settings.
+	 */
+	alertSetting?: number;
+
+	/**
+	 * The current notication-center settings.
+	 */
+	notificationCenterSetting?: number;
+
+	/**
+	 * The current lock-screen settings.
+	 */
+	lockScreenSetting?: number;
+
+	/**
+	 * The current CarPlay settings.
+	 */
+	carPlaySetting?: number;
+
+	/**
+	 * The authorization status to play sounds for critical alerts.
+	 * Available in Titanium SDK 7.4.0 and later.
+	 */
+	criticalAlertSetting?: number;
+
+	/**
+	 * A Boolean value indicating the system displays a button for in-app notification settings.
+	 * Available in Titanium SDK 7.4.0 and later.
+	 */
+	providesAppNotificationSettings?: number;
+
+	/**
+	 * The current alert style used to display notifications.
+	 */
+	alertStyle?: number;
+
+}
+
 /**
  * Dictionary object of parameters used to create a notification using
  * <Titanium.App.iOS.scheduleLocalNotification>.
  */
 interface NotificationParams {
 	/**
-	 * Alert button text ('Open', by default) or slider text ('slide to unlock...', by default)
+	 * The notification identifier.
+	 */
+	identifier: string;
+
+	/**
+	 * Alert button text ('Open', by default) or home text ('Press Home to unlock', by default)
 	 * to display.
 	 */
 	alertAction?: string;
@@ -61559,23 +58942,32 @@ interface NotificationParams {
 	alertBody?: string;
 
 	/**
-	 * Alert title to display. Available since Titanium SDK 5.4.0.
+	 * Alert title to display.
 	 */
 	alertTitle?: string;
 
+	/**
+	 * Alert subtitle to display.
+	 */
+	alertSubtitle?: string;
+
 	/**
 	 * Image to display instead of `Default.png` when launching the application.
 	 */
 	alertLaunchImage?: string;
 
+	/**
+	 * Notification attachments to display.
+	 */
+	attachments?: UserNotificationAttachment[];
+
 	/**
 	 * Application badge value.
 	 */
 	badge?: number;
 
 	/**
-	 * String identifier of category of actions to be displayed for an interactive
-	 * notification (only for iOS 8 and above).
+	 * String identifier of category of actions to be displayed for an interactive notification.
 	 */
 	category?: string;
 
@@ -61609,10 +59001,43 @@ interface NotificationParams {
 	 * - `latitude`: Latitude of the location center, in decimal degrees (required).
 	 * - `longitude`: Longitude of the location center, in decimal degrees (required).
 	 * - `triggersOnce`: Whether or not the notification will only fire once (optional, default: true).
-	 * - `identifier`: Identifier of the region (optional).
 	 */
 	region?: any;
 
+	/**
+	 * The string the notification adds to the category's summary format string.
+	 */
+	summaryArgument?: string;
+
+	/**
+	 * The number of items the notification adds to the category's summary format string.
+	 */
+	summaryArgumentCount?: string;
+
+}
+
+/**
+ * Provide at least the property `identifier` and `url` property to identify a local
+ * image, sound or video. If your media is invalid, the API will throw an error log and
+ * skip the invalid attachment.
+ */
+interface UserNotificationAttachment {
+	/**
+	 * The identifier of this attachment.
+	 */
+	identifier: string;
+
+	/**
+	 * The URL to the attachment's data. If you have obtained this attachment from
+	 * the notification-center then the URL will be security-scoped.
+	 */
+	url: string;
+
+	/**
+	 * An additional dictionary of options to provide.
+	 */
+	options?: any;
+
 }
 
 /**
@@ -61636,7 +59061,7 @@ interface LaunchOptionsType {
  * Dictionary object of parameters used to register the application with local notifications using
  * the <Titanium.App.iOS.registerUserNotificationSettings> method.
  * To retrieve the current notification settings, use the
- * <Titanium.App.iOS.currentUserNotificationSettings> property.
+ * <Titanium.App.iOS.UserNotificationCenter.requestUserNotificationSettings> method.
  */
 interface UserNotificationSettings {
 	/**
@@ -62076,7 +59501,7 @@ interface LocationCoordinates {
 	timestamp?: number;
 
 	/**
-	 * The floor of the building on which the user is located. Available in iOS 8.0 and later.
+	 * The floor of the building on which the user is located.
 	 */
 	floor?: LocationCoordinatesFloor;
 
@@ -62084,7 +59509,6 @@ interface LocationCoordinates {
 
 /**
  * Simple object holding floor of the building on which the user is located.
- * In places where floor information can be determined.
  */
 interface LocationCoordinatesFloor {
 	/**
@@ -62400,111 +59824,6 @@ interface LocationAuthorizationResponse {
 
 }
 
-/**
- * Simple object representing a map location and zoom level.
- */
-interface MapRegionType {
-	/**
-	 * Longitude value for the center point of the map, in decimal degrees.
-	 */
-	longitude?: number;
-
-	/**
-	 * Latitude value for the center point of the map, in decimal degrees.
-	 */
-	latitude?: number;
-
-	/**
-	 * The amount of east-to-west distance displayed on the map, measured in decimal degrees.
-	 */
-	longitudeDelta?: number;
-
-	/**
-	 * The amount of north-to-south distance displayed on the map, measured in decimal degrees.
-	 */
-	latitudeDelta?: number;
-
-}
-
-/**
- * Simple object used as an argument to [setLocation](Titanium.Map.View.setLocation).
- */
-interface MapLocationType {
-	/**
-	 * Longitude value for the center point of the map, in decimal degrees.
-	 */
-	longitude?: number;
-
-	/**
-	 * Latitude value for the center point of the map, in decimal degrees.
-	 */
-	latitude?: number;
-
-	/**
-	 * The amount of east-to-west distance displayed on the map, measured in decimal degrees.
-	 */
-	longitudeDelta?: number;
-
-	/**
-	 * The amount of north-to-south distance displayed on the map, measured in decimal degrees.
-	 */
-	latitudeDelta?: number;
-
-	/**
-	 * Set to `true` to animate the move to the new location.
-	 */
-	animate?: boolean;
-
-	/**
-	 * If `true`, the specified region is modified to fit the aspect ratio of the
-	 * map view, while remaining centered on `latitude`,`longitude`.
-	 */
-	regionFit?: boolean;
-
-}
-
-/**
- * Simple object defining a map route.
- */
-interface MapRouteType {
-	/**
-	 * Route name.
-	 */
-	name: string;
-
-	/**
-	 * Array of map points making up the route.
-	 */
-	points: MapPointType[];
-
-	/**
-	 * Color to use when drawing the route, as a color name or hex triplet.
-	 */
-	color?: string;
-
-	/**
-	 * Line width to use when drawing the route.
-	 */
-	width?: number;
-
-}
-
-/**
- * Simple object representing a point on the map.
- */
-interface MapPointType {
-	/**
-	 * Longitude value of the map point, in decimal degrees.
-	 */
-	longitude?: number;
-
-	/**
-	 * Latitude value of the map point, in decimal degrees.
-	 */
-	latitude?: number;
-
-}
-
 /**
  * Simple object passed to the [scanMediaFiles](Titanium.Media.Android.scanMediaFiles) callback.
  */
@@ -62522,6 +59841,32 @@ interface MediaScannerResponse {
 
 }
 
+/**
+ * An abstract type to represent a metadata item inside the `metadata` event (iOS only).
+ */
+interface TiMetadataItemType {
+	/**
+	 * The key of the metadata item, e.g. "title".
+	 */
+	key?: string;
+
+	/**
+	 * The key-path of the metadata item.
+	 */
+	keySpace?: string;
+
+	/**
+	 * The value of the metadata item. Can be represented as various types.
+	 */
+	value?: string | number | boolean;
+
+	/**
+	 * A dictionary of the additional attributes.
+	 */
+	extraAttributes?: any;
+
+}
+
 /**
  * Simple object for specifying options to [openMusicLibrary](Titanium.Media.openMusicLibrary).
  */
@@ -62841,10 +60186,11 @@ interface PhotoGalleryOptionsType {
 	allowEditing?: boolean;
 
 	/**
-	 * Array of media type constants to allow. If you want to allow live photos with
-	 * <Titanium.Media.MEDIA_TYPE_LIVEPHOTO> on iOS 9.1 and later, you also need to specify
+	 * Array of media type constants to allow.
+	 * Live photos is only supported on the iOS platform, starting with iOS 9.1. If you want
+	 * to allow live photos with <Titanium.Media.MEDIA_TYPE_LIVEPHOTO>, you also need to specify
 	 * at least <Titanium.Media.MEDIA_TYPE_PHOTO> as a fallback. If you do not allow live
-	 * photos, they still can be selected, but will be represented as a normal photo (static).
+	 * photos, they still can be selected, but will be represented as a normal static photo.
 	 */
 	mediaTypes?: string[];
 
@@ -63176,12 +60522,12 @@ interface SecurityManagerProtocol {
 	connectionDelegateForUrl(url: any): APSConnectionDelegate;
 
 	/**
-	 * Returns an array of objects implementing the [X509TrustManager](http://developer.android.com/reference/javax/net/ssl/X509TrustManager.html) protocol for the SSL Context.
+	 * Returns an array of objects implementing the [X509TrustManager](https://developer.android.com/reference/javax/net/ssl/X509TrustManager.html) protocol for the SSL Context.
 	 */
 	getTrustManagers(proxy: any): any[];
 
 	/**
-	 * Returns an array of objects implementing the [X509KeyManager](http://developer.android.com/reference/javax/net/ssl/X509KeyManager.html) protocol for the SSL Context.
+	 * Returns an array of objects implementing the [X509KeyManager](https://developer.android.com/reference/javax/net/ssl/X509KeyManager.html) protocol for the SSL Context.
 	 */
 	getKeyManagers(proxy: any): any[];
 
@@ -64371,7 +61717,7 @@ interface windowToolbarParam {
 	barColor?: string;
 
 	/**
-	 * The tintColor to apply to the tool bar. Applicable on iOS 7 and above.
+	 * The tintColor to apply to the tool bar.
 	 */
 	tintColor?: string;
 
@@ -64635,7 +61981,6 @@ interface BarItemType {
 
 /**
  * Dictionary specifying the transition animation used with the <Titanium.UI.iOS.createTransitionAnimation> method.
- * Only supported on iOS 7 and later.
  */
 interface transitionAnimationParam {
 	/**
@@ -64677,38 +62022,6 @@ interface PopoverParams {
 
 }
 
-/**
- * Dictionary of options for the <Titanium.UI.iPhone.hideStatusBar> method.
- */
-interface hideStatusBarParams {
-	/**
-	 * Determines whether to animate the dialog as it is hidden.
-	 */
-	animated?: boolean;
-
-	/**
-	 * Style of the animation.
-	 */
-	animationStyle?: number;
-
-}
-
-/**
- * Dictionary of options for the <Titanium.UI.iPhone.showStatusBar> method.
- */
-interface showStatusBarParams {
-	/**
-	 * Determines whether to animate the dialog as it is shown.
-	 */
-	animated?: boolean;
-
-	/**
-	 * Style of the animation.
-	 */
-	animationStyle?: number;
-
-}
-
 /**
  * Reply message received from watch app.
  */
diff --git a/types/titanium/titanium-tests.ts b/types/titanium/titanium-tests.ts
index bc5f4794c2..4d546f1848 100644
--- a/types/titanium/titanium-tests.ts
+++ b/types/titanium/titanium-tests.ts
@@ -5,7 +5,7 @@ function test_window() {
 		borderRadius: 10
 	});
 
-	window.setBackgroundColor('blue');
+	window.backgroundColor = 'blue';
 	window.opacity = 0.92;
 
 	const matrix = Ti.UI.create2DMatrix().scale(1.1, 1);
@@ -17,8 +17,8 @@ function test_window() {
 		text: 'Simple label'
 	});
 	label.textAlign = Ti.UI.TEXT_ALIGNMENT_LEFT;
-	label.setWidth(Ti.UI.SIZE);
-	label.setHeight(Ti.UI.SIZE);
+	label.width = Ti.UI.SIZE;
+	label.height = Ti.UI.SIZE;
 	window.add(label);
 	window.open();
 }
@@ -68,7 +68,7 @@ function test_fs() {
 }
 
 function test_network() {
-	const url = "http://www.appcelerator.com";
+	const url = 'https://www.appcelerator.com';
 	const client = Ti.Network.createHTTPClient({
 		// function called when the response data is available
 		onload: (e: SuccessResponse) => {
@@ -85,36 +85,3 @@ function test_network() {
 	// Send the request.
 	client.send();
 }
-
-function test_map() {
-	const win = Ti.UI.createWindow();
-	const mountainView = Ti.Map.createAnnotation({
-		animate: true,
-		leftButton: '../images/appcelerator_small.png',
-		myid: 1
-	});
-	mountainView.setLatitude(37.390749);
-	mountainView.setLongitude(-122.081651);
-	mountainView.setTitle('Appcelerator');
-	mountainView.setSubtitle('Mountain View, CA');
-	mountainView.setPincolor(Ti.Map.ANNOTATION_RED);
-
-	const mapview = Ti.Map.createView({
-		mapType: Ti.Map.STANDARD_TYPE,
-		region: {
-			latitude: 37.390749, longitude: -122.081651,
-			latitudeDelta: 0.01, longitudeDelta: 0.01
-		},
-		animate: true,
-	});
-	mapview.regionFit = true;
-	mapview.userLocation = true;
-	mapview.annotations = [mountainView];
-	mapview.addEventListener('click', event => {
-		if (event.clicksource === 'leftButton' || event.clicksource === 'leftPane') {
-			alert(event.title + ' left button clicked');
-		}
-	});
-	win.add(mapview);
-	win.open();
-}
diff --git a/types/tlds/index.d.ts b/types/tlds/index.d.ts
new file mode 100644
index 0000000000..473fb16139
--- /dev/null
+++ b/types/tlds/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for tlds 1.199
+// Project: https://github.com/stephenmathieson/node-tlds
+// Definitions by: Ajay Gopal Shrestha <https://github.com/ajshres>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+/*
+Declaring const tlds and exporting it
+*/
+declare const tlds: string[];
+export = tlds;
diff --git a/types/tlds/tlds-tests.ts b/types/tlds/tlds-tests.ts
new file mode 100644
index 0000000000..5a0c452792
--- /dev/null
+++ b/types/tlds/tlds-tests.ts
@@ -0,0 +1,4 @@
+import * as tlds from 'tlds';
+
+tlds; // all list of tlds
+'[object Array]' === {}.toString.call(tlds); // tlds is an array
diff --git a/types/tlds/tsconfig.json b/types/tlds/tsconfig.json
new file mode 100644
index 0000000000..4d7b86ad00
--- /dev/null
+++ b/types/tlds/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",
+        "tlds-tests.ts"
+    ]
+}
diff --git a/types/tlds/tslint.json b/types/tlds/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/tlds/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/topojson-specification/topojson-specification-tests.ts b/types/topojson-specification/topojson-specification-tests.ts
index c86ed57b3f..666b1d95b7 100644
--- a/types/topojson-specification/topojson-specification-tests.ts
+++ b/types/topojson-specification/topojson-specification-tests.ts
@@ -154,41 +154,14 @@ topology = {
 
 // Fails
 
+// must fail on "type"
 // $ExpectError
-topology = {
-    type: "Topology",
-    objects: {
-        foo: {
-            type: "hello", // must fail
-            arcs: [[0]],
-        },
-    },
-    arcs: [],
-};
+topology = { type: "Topology", objects: { foo: { type: "hello", arcs: [[0]] } }, arcs: [] };
 
+// must fail:  Property 'coordinates' is missing in type '{ type: "Point"; }'.
 // $ExpectError
-topology = {
-    type: "Topology",
-    objects: {
-        foo: {
-            type: "Point",
-            // must fail:  Property 'coordinates' is missing in type '{ type: "Point"; }'.
-        },
-    },
-    arcs: [],
-};
+topology = { type: "Topology", objects: { foo: { type: "Point" } }, arcs: [] };
 
+// must fail: Property 'arcs' is missing in type '{ type: "Polygon"; }'
 // $ExpectError
-topology = {
-    type: "Topology",
-    objects: {
-        foo: {
-            type: "GeometryCollection",
-            geometries: [
-                {type: "Polygon"}
-                // must fail: Property 'arcs' is missing in type '{ type: "Polygon"; }'
-            ],
-        },
-    },
-    arcs: [],
-};
+topology = { type: "Topology", objects: { foo: { type: "GeometryCollection", geometries: [{type: "Polygon"}] } }, arcs: [] };
diff --git a/types/toposort/index.d.ts b/types/toposort/index.d.ts
new file mode 100644
index 0000000000..c2c9940c3a
--- /dev/null
+++ b/types/toposort/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for toposort 2.0
+// Project: https://github.com/marcelklehr/toposort
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function toposort(graph: ReadonlyArray<[string, string]>): ReadonlyArray<string>;
+export = toposort;
diff --git a/types/toposort/toposort-tests.ts b/types/toposort/toposort-tests.ts
new file mode 100644
index 0000000000..84f554033b
--- /dev/null
+++ b/types/toposort/toposort-tests.ts
@@ -0,0 +1,10 @@
+import toposort = require('toposort');
+
+const testGraph: ReadonlyArray<[string, string]> = [
+    ["string1", "string2"],
+    ["string2", "string3"],
+    ["string3", "string1"]
+];
+
+// $ExpectType ReadonlyArray<string>
+toposort(testGraph);
diff --git a/types/winston/tsconfig.json b/types/toposort/tsconfig.json
similarity index 93%
rename from types/winston/tsconfig.json
rename to types/toposort/tsconfig.json
index 390e22a274..3524da0d19 100644
--- a/types/winston/tsconfig.json
+++ b/types/toposort/tsconfig.json
@@ -18,6 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "winston-tests.ts"
+        "toposort-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/toposort/tslint.json b/types/toposort/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/toposort/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/traverse/index.d.ts b/types/traverse/index.d.ts
index b06abe35dc..c81094be98 100644
--- a/types/traverse/index.d.ts
+++ b/types/traverse/index.d.ts
@@ -42,7 +42,7 @@ declare namespace traverse {
    * Return an `Array` of every possible non-cyclic path in the object. 
    * Paths are `Array`s of string keys.
    */
-  function paths(obj: any): string[];
+  function paths(obj: any): string[][];
 
   /**
    * Return an `Array` of every node in the object.
@@ -91,7 +91,7 @@ declare namespace traverse {
      * Return an `Array` of every possible non-cyclic path in the object. 
      * Paths are `Array`s of string keys.
      */
-    paths(): string[];
+    paths(): string[][];
 
     /**
      * Return an `Array` of every node in the object.
@@ -121,6 +121,11 @@ declare namespace traverse {
      */
     parent: TraverseContext | undefined;
 
+    /**
+     * The contexts of the node's parents.
+     */
+    parents: TraverseContext[];
+
     /**
      * The name of the key of the present node in its parent.
      * This is `undefined` for the root node.
@@ -172,6 +177,11 @@ declare namespace traverse {
      */
     delete(stopHere?: boolean): void;
 
+    /**
+     * Object keys of the node.
+     */
+    keys: string[] | null;
+
     /**
      * Call this function before all of the children are traversed.
      * You can assign into `this.keys` here to traverse in a custom order.
@@ -192,6 +202,16 @@ declare namespace traverse {
      * Call this function after each of the children are traversed.
      */
     post(callback: (this: TraverseContext, child: any) => void): void;
+
+    /**
+     * Stops traversal entirely.
+     */
+    stop(): void;
+
+    /**
+     * Prevents traversing descendents of the current node.
+     */
+    block(): void;
   }
 }
 
diff --git a/types/traverse/traverse-tests.ts b/types/traverse/traverse-tests.ts
index 62d2c53f31..c96cdf813d 100644
--- a/types/traverse/traverse-tests.ts
+++ b/types/traverse/traverse-tests.ts
@@ -37,3 +37,42 @@ function testMap(){
     });
     console.dir(scrubbed);
 }
+
+function testPaths(){
+    let obj = {a: {b: {c: 42}}, d: {e: 44}};
+    let paths : string[][] = traverse(obj).paths();
+
+    const expected = [
+        [],
+        ['a'],
+        ['a', 'b'],
+        ['a', 'b', 'c'],
+        ['d'],
+        ['d', 'e']
+    ];
+
+    expected.forEach((path, ix) => {
+        const actual = paths[ix];
+
+        path.forEach((expectedItem, jx) => {
+            const actualItem = actual[jx];
+            if(expectedItem !== actualItem){
+                throw new Error(`The path ${path} and ${actual} do not macth`);
+            }
+        })
+    })
+}
+
+function testPropsAndFuncs(){
+    var obj = [ 5, 6, -3, [ 7, 8, -2, 1 ], { f : 10, g : -13 } ];
+
+    traverse(obj).forEach(function (x) {
+		console.log(this.keys);
+		console.log(this.parents);
+
+        if (this.level == 2) this.block();
+		if (this.level > 10) this.stop();
+    });
+
+    console.dir(obj);
+}
diff --git a/types/triple-beam/index.d.ts b/types/triple-beam/index.d.ts
new file mode 100644
index 0000000000..3f6cdda734
--- /dev/null
+++ b/types/triple-beam/index.d.ts
@@ -0,0 +1,22 @@
+// Type definitions for triple-beam 1.3
+// Project: https://github.com/winstonjs/triple-beam
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export as namespace TripleBeam;
+
+export const LEVEL: string;
+export const MESSAGE: string;
+export const SPLAT: string;
+export const configs: Configs;
+
+export interface Config {
+	readonly levels: {[k: string]: number};
+	readonly colors: {[k: string]: string};
+	}
+
+export interface Configs {
+	readonly cli: Config;
+	readonly npm: Config;
+	readonly syslog: Config;
+}
diff --git a/types/triple-beam/triple-beam-tests.ts b/types/triple-beam/triple-beam-tests.ts
new file mode 100644
index 0000000000..de583abdde
--- /dev/null
+++ b/types/triple-beam/triple-beam-tests.ts
@@ -0,0 +1,13 @@
+import tripleBeam = require('triple-beam');
+
+const level: string = tripleBeam.LEVEL;
+const message: string = tripleBeam.MESSAGE;
+const splat: string = tripleBeam.SPLAT;
+const configsObj: tripleBeam.Configs = tripleBeam.configs;
+
+const cli: tripleBeam.Config = configsObj.cli;
+const npm: tripleBeam.Config = configsObj.npm;
+const syslog: tripleBeam.Config = configsObj.syslog;
+
+const levels = cli.levels;
+const colors = cli.colors;
diff --git a/types/triple-beam/tsconfig.json b/types/triple-beam/tsconfig.json
new file mode 100644
index 0000000000..9b58bd5007
--- /dev/null
+++ b/types/triple-beam/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",
+    "triple-beam-tests.ts"
+  ]
+}
diff --git a/types/triple-beam/tslint.json b/types/triple-beam/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/triple-beam/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/triplesec/index.d.ts b/types/triplesec/index.d.ts
new file mode 100644
index 0000000000..00208a8d0a
--- /dev/null
+++ b/types/triplesec/index.d.ts
@@ -0,0 +1,31 @@
+// Type definitions for triplesec 3.0
+// Project: https://github.com/keybase/triplesec
+// Definitions by: Ben Speakman <https://github.com/threesquared>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export interface WordArray {
+    sigBytes: number;
+    words: number[];
+    to_hex: () => string;
+}
+
+export interface Arguments {
+    data: Buffer;
+    key: Buffer;
+    progress_hook?: (progress: Progress) => void;
+}
+
+export interface Progress {
+    what: string;
+    i: number;
+    total: number;
+}
+
+export function encrypt(arg: Arguments, cb: (err: Error | null, buff: Buffer | null) => void): void;
+export function decrypt(arg: Arguments, cb: (err: Error | null, buff: Buffer | null) => void): void;
+
+export namespace prng {
+    function generate(n: number, cb: (words: WordArray) => void): void;
+}
diff --git a/types/triplesec/triplesec-tests.ts b/types/triplesec/triplesec-tests.ts
new file mode 100644
index 0000000000..adba7a131d
--- /dev/null
+++ b/types/triplesec/triplesec-tests.ts
@@ -0,0 +1,37 @@
+import * as triplesec from 'triplesec';
+
+const progressHook = (progress: triplesec.Progress) => {
+    progress.what; // $ExpectType string
+    progress.i; // $ExpectType number
+    progress.total; // $ExpectType number
+};
+
+triplesec.encrypt({
+    data: new Buffer('data'),
+    key: new Buffer('key'),
+    progress_hook: progressHook,
+}, (err, buff) => {
+    if (err === null) {
+        buff; // $ExpectType Buffer | null
+    } else {
+        err; // $ExpectType Error
+    }
+});
+
+triplesec.decrypt({
+    data: new Buffer('data'),
+    key: new Buffer('key'),
+    progress_hook: progressHook,
+}, (err, buff) => {
+    if (err === null) {
+        buff; // $ExpectType Buffer | null
+    } else {
+        err; // $ExpectType Error
+    }
+});
+
+triplesec.prng.generate(24, words => {
+    words.sigBytes; // $ExpectType number
+    words.words; // $ExpectType number[]
+    words.to_hex(); // $ExpectType string
+});
diff --git a/types/triplesec/tsconfig.json b/types/triplesec/tsconfig.json
new file mode 100644
index 0000000000..cf233cc7e0
--- /dev/null
+++ b/types/triplesec/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",
+        "triplesec-tests.ts"
+    ]
+}
diff --git a/types/triplesec/tslint.json b/types/triplesec/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/triplesec/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ttf2woff2/index.d.ts b/types/ttf2woff2/index.d.ts
new file mode 100644
index 0000000000..180c64f93e
--- /dev/null
+++ b/types/ttf2woff2/index.d.ts
@@ -0,0 +1,10 @@
+// Type definitions for ttf2woff2 2.0
+// Project: https://github.com/nfroidure/ttf2woff2
+// Definitions by: Thomas den Hollander <https://github.com/ThomasdenH>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+declare function ttf2woff2(inputContent: Buffer): Buffer;
+
+export = ttf2woff2;
diff --git a/types/ttf2woff2/tsconfig.json b/types/ttf2woff2/tsconfig.json
new file mode 100644
index 0000000000..0b6fc9778b
--- /dev/null
+++ b/types/ttf2woff2/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",
+        "ttf2woff2-tests.ts"
+    ]
+}
diff --git a/types/ttf2woff2/tslint.json b/types/ttf2woff2/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/ttf2woff2/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/ttf2woff2/ttf2woff2-tests.ts b/types/ttf2woff2/ttf2woff2-tests.ts
new file mode 100644
index 0000000000..71b5a16d65
--- /dev/null
+++ b/types/ttf2woff2/ttf2woff2-tests.ts
@@ -0,0 +1,4 @@
+import ttf2woff2 = require('ttf2woff2');
+
+const input = Buffer.alloc(10);
+const result: Buffer = ttf2woff2(input);
diff --git a/types/twig/index.d.ts b/types/twig/index.d.ts
index 742958535d..d09e713e44 100644
--- a/types/twig/index.d.ts
+++ b/types/twig/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for twig 1.10
+// Type definitions for twig 1.12
 // Project: https://github.com/twigjs/twig.js
 // Definitions by: Carlos Ballesteros Velasco <https://github.com/soywiz>
 //                 Tim Schumacher <https://github.com/enko>
@@ -12,11 +12,12 @@ export interface Parameters {
     macros?: any;
     base?: any;
     path?: any;
-    url?: any;
+    href?: any;
     name?: any;
     method?: any;
     options?: any;
     data?: any;
+    async?: any;
 }
 
 export interface Template {
diff --git a/types/twig/twig-tests.ts b/types/twig/twig-tests.ts
index 3f787cf77c..39fbdc804d 100644
--- a/types/twig/twig-tests.ts
+++ b/types/twig/twig-tests.ts
@@ -14,7 +14,8 @@ const params: twig.Parameters = {
 	method: value,
 	name: value,
 	options: value,
-	url: value
+	href: value,
+	async: value
 };
 
 const temp: twig.Template = twig.twig(params);
diff --git a/types/twit/index.d.ts b/types/twit/index.d.ts
index 89d28766b3..ce8484bbe1 100644
--- a/types/twit/index.d.ts
+++ b/types/twit/index.d.ts
@@ -1,8 +1,10 @@
 // Type definitions for twit 2.2
 // Project: https://github.com/ttezel/twit
 // Definitions by: Volox <https://github.com/Volox>
-//                 lostfictions <https://github.com/lostfictions>
 //                 sapphiredev <https://github.com/sapphiredev>
+//                 abraham <https://github.com/abraham>
+//                 siwalik <https://github.com/siwalikm>
+//                 plhery <https://github.com/plhery>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -24,7 +26,7 @@ declare module 'twit' {
        */
       export interface Contributors {
         id: number,
-        id_str: number,
+        id_str: string,
         screen_name: string,
       }
 
@@ -169,7 +171,7 @@ declare module 'twit' {
         created_at: string,
         current_user_retweet?: {
           id: number,
-          id_str: number,
+          id_str: string,
         },
         entities: Entities,
         favorite_count?: number,
@@ -256,14 +258,22 @@ declare module 'twit' {
       screen_name?: string,
       id?: string,
       slug?: string,
+      owner_screen_name?: string,
       status?: string,
-      user_id?: number,
+      user_id?: number | string,
       lat?: number,
       long?: number,
-      follow?: boolean,
+      follow?: boolean | string,
       include_email?: boolean,
-      cursor?: number,
-      tweet_mode? :string,
+      cursor?: number | string,
+      tweet_mode?: string,
+      trim_user?: boolean,
+      exclude_replies?: boolean,
+      include_rts?: boolean,
+      skip_status?: boolean,
+      url?: string,
+      include_user_entities?: boolean,
+      stringify_ids?: boolean,
     }
     export interface PromiseResponse {
       data: Response,
diff --git a/types/twitch-ext/index.d.ts b/types/twitch-ext/index.d.ts
new file mode 100644
index 0000000000..279d17cd14
--- /dev/null
+++ b/types/twitch-ext/index.d.ts
@@ -0,0 +1,330 @@
+// Type definitions for twitch-ext 1.14
+// Project: https://dev.twitch.tv/docs/extensions/reference/#javascript-helper
+// Definitions by: Benedict Etzel <https://github.com/beheh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+interface Window {
+	Twitch: { ext: TwitchExt };
+}
+
+/**
+ * The Twitch extensions JavaScript Helper.
+ *
+ * @see https://dev.twitch.tv/docs/extensions/reference/#javascript-helper
+ */
+interface TwitchExt {
+	/**
+	 * This encodes the Helper version in 1.1.1 (semantic versioning) format.
+	 */
+	version: string;
+
+	/**
+	 * This encodes the environment. For external users, this is always production.
+	 */
+	environment: "production";
+
+	/**
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#twitch-extension-actions
+	 */
+	actions: TwitchExtActions;
+
+	/**
+	 * Helper methods for the Twitch Extension rig.
+	 * @see https://github.com/twitchdev/developer-rig
+	 */
+	rig: TwitchExtRig;
+
+	/**
+	 * This function binds the callback to the initial values and changes to the authorization data.
+	 *
+	 * @param authCallback This callback is fired each time the JWT is refreshed.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#onauthorized
+	 */
+	onAuthorized(authCallback: (auth: TwitchExtAuthorized) => void): void;
+
+	/**
+	 * This function binds the callback to the initial values and changes to the context.
+	 *
+	 * @param contextCallback This callback is fired when the context of an extension is fired.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#oncontext
+	 */
+	onContext(
+		contextCallback: <T extends Partial<TwitchExtContext>>(
+			context: T,
+			changed: ReadonlyArray<keyof T>
+		) => void
+	): void;
+
+	/**
+	 * This function binds the callback to any internal error.
+	 *
+	 * @param errorCallback This callback is fired if any errors are generated by the extension helper.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#onerror
+	 */
+	onError(errorCallback: (errorValue: any) => void): void;
+
+	/**
+	 * This function registers a callback that gets called whenever an extension changes position in the player. This
+	 * occurs only for video-component extensions. This also is triggered as the extension loads.
+	 *
+	 * @param callback This callback is called whenever an extension changes position in the player.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#onpositionchanged
+	 */
+	onPositionChanged(
+		callback: (position: { x: number; y: number }) => void
+	): void;
+
+	/**
+	 * This function registers a callback that gets called whenever an extension is hidden/re-shown. (This occurs only
+	 * for mobile or component extensions.) When an extension is not visible in the mobile app, it does not receive
+	 * onContext updates and must perform only minimal work in the background.
+	 *
+	 * @param callback This callback is called whenever an extension is hidden/re-shown.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#onvisibilitychanged
+	 */
+	onVisibilityChanged(
+		callback:
+			| ((isVisible: false) => void)
+			| ((isVisible: true, context: Partial<TwitchExtContext>) => void)
+	): void;
+
+	/**
+	 * This function can be called by the front end to send directly to PubSub.
+	 *
+	 * @param target Target topic. Often this is "broadcast" but it might be "whisper-<userId>".
+	 * @param contentType type of the serialized message; for example, "application/json".
+	 * @param message Either an object that will be automatically serialized as JSON or a string.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#send
+	 */
+	send(target: string, contentType: string, message: object | string): void;
+
+	/**
+	 * This function binds the callback to listen to the target topic.
+	 *
+	 * @param target Target topic. Often this is "broadcast" but it might be "whisper-<userId>".
+	 * @param callback These fields correspond to the values in the send() message, except the message is always a string.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#listen
+	 */
+	listen(
+		target: string,
+		callback: (target: string, contentType: string, message: string) => void
+	): void;
+
+	/**
+	 * This function unbinds the listen callback from the target.
+	 *
+	 * @param target Target topic. Often this is "broadcast" but it might be "whisper-<userId>".
+	 * @param callback These fields correspond to the values in the send() message, except the message is always a string.
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#unlisten
+	 */
+	unlisten(
+		target: string,
+		callback: (target: string, contentType: string, message: string) => void
+	): void;
+}
+
+/**
+ * Twitch actions add first-party Twitch functionality to extensions.
+ *
+ * @see TwitchExt.actions
+ */
+interface TwitchExtActions {
+	/**
+	 * This function prompts users to follow the specified channel, with a dialog controlled by Twitch.
+	 *
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#followchannel
+	 */
+	followChannel(channelName: string): void;
+
+	/**
+	 * This function registers a callback that is invoked whenever a user completes an interaction prompted by the followChannel action.
+	 *
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#onfollow
+	 */
+	onFollow(callback: (didFollow: boolean, channelName: string) => void): void;
+
+	/**
+	 * This function opens a prompt for users to share their identity.
+	 * After a successful identity link, the Twitch.ext.onAuthorized callback is invoked with the user’s ID.
+	 *
+	 * @see https://dev.twitch.tv/docs/extensions/reference/#requestidshare
+	 */
+	requestIdShare(): void;
+}
+
+/**
+ * The developer rig object as available under window.Twitch.ext.rig.
+ *
+ * @see TwitchExt.rig
+ */
+interface TwitchExtRig {
+	/**
+	 * Print a message to the developer rig console.
+	 *
+	 * @param message The message to print.
+	 * @see https://github.com/twitchdev/developer-rig#rig-console
+	 */
+	log(message: string): void;
+}
+
+/**
+ * The result object as passed to the onAuthorized callback.
+ *
+ * @see TwitchExt.onAuthorized
+ */
+interface TwitchExtAuthorized {
+	/**
+	 * Channel ID of the page where the extension is iframe embedded.
+	 */
+	channelId: string;
+
+	/**
+	 * Client ID of the extension.
+	 */
+	clientId: string;
+
+	/**
+	 * JWT that should be passed to any EBS call for authentication.
+	 */
+	token: string;
+
+	/**
+	 * Opaque user ID.
+	 */
+	userId: string;
+}
+
+/**
+ * The result object as passed to the onContext callback.
+ *
+ * @see TwitchExt.onContext
+ */
+interface TwitchExtContext {
+	/**
+	 * If true, player controls are visible (e.g., due to mouseover).
+	 * Do not use this for mobile extensions; it is not sent for mobile.
+	 */
+	arePlayerControlsVisible: boolean;
+
+	/**
+	 * Bitrate of the broadcast.
+	 */
+	bitrate: number;
+
+	/**
+	 * Buffer size of the broadcast.
+	 */
+	bufferSize: number;
+
+	/**
+	 * Display size of the player.
+	 */
+	displayResolution: string;
+
+	/**
+	 * Game being broadcast.
+	 */
+	game: string;
+
+	/**
+	 * Number of seconds of latency between the broadcaster and viewer.
+	 */
+	hlsLatencyBroadcaster: number;
+
+	/**
+	 * If true, the viewer is watching in fullscreen mode.
+	 * Do not use this for mobile extensions; it is not sent for mobile.
+	 */
+	isFullScreen: boolean;
+
+	/**
+	 * If true, the viewer has muted the stream.
+	 */
+	isMuted: boolean;
+
+	/**
+	 * If true, the viewer has paused the stream.
+	 */
+	isPaused: boolean;
+
+	/**
+	 * If true, the viewer is watching in theater mode.
+	 * Do not use this for mobile extensions; it is not sent for mobile.
+	 */
+	isTheatreMode: boolean;
+
+	/**
+	 * Language of the broadcast (e.g., "en").
+	 */
+	language: string;
+
+	/**
+	 * The mode the extension is currently run in.
+	 */
+	mode: "viewer" | "dashboard" | "config";
+
+	/**
+	 * Indicates how the stream is being played.
+	 */
+	playbackMode: "video" | "audio" | "remote" | "chat-only";
+
+	/**
+	 * The user’s theme setting on the Twitch website.
+	 */
+	theme: "light" | "dark";
+
+	/**
+	 * Resolution of the broadcast.
+	 */
+	videoResolution: string;
+
+	/**
+	 * Currently selected player volume. Valid values: between 0 and 1.
+	 */
+	volume: number;
+}
+
+/**
+ * The extension window receives the following query parameters, which indicate
+ * information about the extension environment that isn’t subject to change over
+ * the frame’s life cycle.
+ *
+ * @see https://dev.twitch.tv/docs/extensions/reference/#client-query-parameters
+ */
+interface TwitchExtClientQueryParams {
+	/**
+	 * The type of the anchor in which the extension is activated.
+	 */
+	anchor: "component" | "panel" | "video_overlay";
+
+	/**
+	 * The user’s language setting.
+	 *
+	 * @example en
+	 */
+	language: string;
+
+	/**
+	 * The extension’s mode.
+	 */
+	mode: "config" | "dashboard" | "viewer";
+
+	/**
+	 * The platform on which the Twitch client is running.
+	 */
+	platform: "mobile" | "web";
+
+	/**
+	 * The release state of the extension.
+	 */
+	state:
+		| "testing"
+		| "hosted_test"
+		| "approved"
+		| "released"
+		| "ready_for_review"
+		| "in_review"
+		| "pending_action"
+		| "uploading";
+}
diff --git a/types/twitch-ext/tsconfig.json b/types/twitch-ext/tsconfig.json
new file mode 100644
index 0000000000..5b68367453
--- /dev/null
+++ b/types/twitch-ext/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",
+        "twitch-ext-tests.ts"
+    ]
+}
diff --git a/types/twitch-ext/tslint.json b/types/twitch-ext/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/twitch-ext/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/twitch-ext/twitch-ext-tests.ts b/types/twitch-ext/twitch-ext-tests.ts
new file mode 100644
index 0000000000..d981367fd5
--- /dev/null
+++ b/types/twitch-ext/twitch-ext-tests.ts
@@ -0,0 +1,39 @@
+console.log(
+	`Running ${window.Twitch.ext.version} on ${window.Twitch.ext.environment}`
+);
+
+window.Twitch.ext.onAuthorized(auth => {
+	console.log("The JWT that will be passed to the EBS is", auth.token);
+	console.log("The channel ID is", auth.channelId);
+});
+
+window.Twitch.ext.onContext((context, changed) => {
+	for (const key of changed) {
+		console.log(`Context changed ${context[key]}`);
+	}
+});
+
+window.Twitch.ext.onVisibilityChanged((isVisible, context) => {
+	if (isVisible) {
+		console.log("Extension became visible");
+		if (context.game) {
+			console.log(`Current game is ${context.game}`);
+		}
+	} else {
+		console.log("Extension became invisible");
+	}
+});
+
+window.Twitch.ext.onError(e => console.error(e));
+
+// Twitch Extension Actions
+window.Twitch.ext.actions.onFollow((didFollow, channelName) => {
+	if (didFollow) {
+		console.log(`You followed ${channelName}`);
+	}
+});
+window.Twitch.ext.actions.followChannel("hearthsim");
+window.Twitch.ext.actions.requestIdShare();
+
+// Developer Rig
+window.Twitch.ext.rig.log("Hello, world!");
diff --git a/types/typed.js/index.d.ts b/types/typed.js/index.d.ts
deleted file mode 100644
index 45064e9c03..0000000000
--- a/types/typed.js/index.d.ts
+++ /dev/null
@@ -1,185 +0,0 @@
-// Type definitions for typed.js 2.0
-// Project: https://github.com/mattboldt/typed.js
-// Definitions by: Davide Donadello <https://github.com/Dona278>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-export default Typed;
-
-export class Typed {
-    constructor(elementId: string, options: TypedJsOptions);
-
-    /**
-     * Toggle start() and stop() of the Typed instance
-     */
-    toggle(): void;
-
-    /**
-     * Stop typing / backspacing and enable cursor blinking
-     */
-    stop(): void;
-
-    /**
-     * Start typing / backspacing after being stopped
-     */
-    start(): void;
-
-    /**
-     * Destroy this instance of Typed
-     */
-    destroy(): void;
-
-    /**
-     * Reset Typed and optionally restarts
-     */
-    reset(restart: boolean): void;
-}
-
-export type TypedJsContentType = "html" | "null";
-
-export interface TypedJsOptions {
-    /**
-     * Strings to be typed
-     */
-    strings?: string[];
-
-    /**
-     * ID of element containing string children
-     */
-    stringsElement?: string;
-
-    /**
-     * Type speed in milliseconds
-     */
-    typeSpeed?: number;
-
-    /**
-     * Time before typing starts in milliseconds
-     */
-    startDelay?: number;
-
-    /**
-     * Backspacing speed in milliseconds
-     */
-    backSpeed?: number;
-
-    /**
-     * Only backspace what doesn't match the previous string
-     */
-    smartBackspace?: boolean;
-
-    /**
-     * Shuffle the strings
-     */
-    shuffle?: boolean;
-
-    /**
-     * Time before backspacing in milliseconds
-     */
-    backDelay?: number;
-
-    /**
-     * Fade out instead of backspace
-     */
-    fadeOut?: boolean;
-
-    /**
-     * Css class for fade animation
-     */
-    fadeOutClass?: string;
-
-    /**
-     * Fade out delay in milliseconds
-     */
-    fadeOutDelay?: number;
-
-    /**
-     * Loop strings
-     */
-    loop?: boolean;
-
-    /**
-     * Amount of loops
-     */
-    loopCount?: number;
-
-    /**
-     * Show cursor
-     */
-    showCursor?: boolean;
-
-    /**
-     * Character for cursor
-     */
-    cursorChar?: string;
-
-    /**
-     * Insert CSS for cursor and fadeOut into HTML <head>
-     */
-    autoInsertCss?: boolean;
-
-    /**
-     * Attribute for typing
-     * Ex: input placeholder, value, or just HTML text
-     */
-    attr?: string;
-
-    /**
-     * Bind to focus and blur if el is text input
-     */
-    bindInputFocusEvents?: boolean;
-
-    /**
-     * 'html' or 'null' for plaintext
-     */
-    contentType?: TypedJsContentType;
-
-    /**
-     * All typing is complete
-     */
-    onComplete?: (self: Typed) => void;
-
-    /**
-     * Before each string is typed
-     */
-    preStringTyped?: (arrayPos: number, self: Typed) => void;
-
-    /**
-     * After each string is typed
-     */
-    onStringTyped?: (arrayPos: number, self: Typed) => void;
-
-    /**
-     * During looping, after last string is typed
-     */
-    onLastStringBackspaced?: (self: Typed) => void;
-
-    /**
-     * Typing has been stopped
-     */
-    onTypingPaused?: (arrayPos: number, self: Typed) => void;
-
-    /**
-     * Typing has been started after being stopped
-     */
-    onTypingResumed?: (arrayPos: number, self: Typed) => void;
-
-    /**
-     * After reset
-     */
-    onReset?: (self: Typed) => void;
-
-    /**
-     * After stop
-     */
-    onStop?: (arrayPos: number, self: Typed) => void;
-
-    /**
-     * After start
-     */
-    onStart?: (arrayPos: number, self: Typed) => void;
-
-    /**
-     * After destroy
-     */
-    onDestroy?: (self: Typed) => void;
-}
diff --git a/types/typed.js/typed.js-tests.ts b/types/typed.js/typed.js-tests.ts
deleted file mode 100644
index 3e4bd0a137..0000000000
--- a/types/typed.js/typed.js-tests.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { Typed, TypedJsOptions } from 'typed.js';
-
-// Create instance
-const typed = new Typed(".element", {
-    strings: ["<i>First</i> sentence.", "&amp; a second sentence."],
-    typeSpeed: 100,
-    startDelay: 0,
-    backSpeed: 50,
-    smartBackspace: true,
-    shuffle: true,
-    backDelay: 150,
-    loop: true,
-    showCursor: true,
-    autoInsertCss: true,
-    contentType: "html",
-    onComplete: (self: Typed) => {
-        // Complete!!
-    },
-    onDestroy: (self: Typed) => {
-        // End!!
-    },
-});
-
-// Methods
-typed.reset(false);
-typed.destroy();
-typed.start();
-typed.stop();
-typed.toggle();
diff --git a/types/uglify-es/index.d.ts b/types/uglify-es/index.d.ts
new file mode 100644
index 0000000000..6151d861be
--- /dev/null
+++ b/types/uglify-es/index.d.ts
@@ -0,0 +1,7 @@
+// Type definitions for UglifyES 3.0
+// Project: https://github.com/mishoo/UglifyJS2/tree/harmony
+// Definitions by: Alan Agius <https://github.com/alan-agius4>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export * from 'uglify-js';
diff --git a/types/uglify-es/tsconfig.json b/types/uglify-es/tsconfig.json
new file mode 100644
index 0000000000..a1982aa338
--- /dev/null
+++ b/types/uglify-es/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",
+        "uglify-es-tests.ts"
+    ]
+}
diff --git a/types/uglify-es/tslint.json b/types/uglify-es/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/uglify-es/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/uglify-es/uglify-es-tests.ts b/types/uglify-es/uglify-es-tests.ts
new file mode 100644
index 0000000000..ce3dde5165
--- /dev/null
+++ b/types/uglify-es/uglify-es-tests.ts
@@ -0,0 +1,40 @@
+/// <reference types="node" />
+
+import { OutputQuoteStyle, minify } from 'uglify-es';
+
+let code: any;
+
+code = {
+    "file1.js": "function add(first, second) { return first + second; }",
+    "file2.js": "console.log(add(1 + 2, 3 + 4));"
+};
+
+minify(code);
+
+code = "function add(first, second) { return first + second; }";
+minify(code);
+
+minify(code, {
+    output: {
+        quote_style: OutputQuoteStyle.AlwaysDouble
+    }
+});
+
+const output = minify(code, {
+    warnings: 'verbose',
+    mangle: {
+        properties: {
+            regex: /reg/
+        }
+    },
+    sourceMap: {
+        filename: 'foo.map'
+    },
+    compress: {
+        arguments: true
+    }
+});
+
+if (output.warnings) {
+    output.warnings.filter(x => x === 'Dropping unused variable');
+}
diff --git a/types/uglify-js/index.d.ts b/types/uglify-js/index.d.ts
index 8778975020..7589ba8e86 100644
--- a/types/uglify-js/index.d.ts
+++ b/types/uglify-js/index.d.ts
@@ -1,6 +1,8 @@
 // Type definitions for UglifyJS 3.0
 // Project: https://github.com/mishoo/UglifyJS2
-// Definitions by: Alan Agius <https://github.com/alan-agius4>, Tanguy Krotoff <https://github.com/tkrotoff>
+// Definitions by: Alan Agius <https://github.com/alan-agius4>
+//                 Tanguy Krotoff <https://github.com/tkrotoff>
+//                 John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
diff --git a/types/uglify-js/tsconfig.json b/types/uglify-js/tsconfig.json
index 07451065ee..13c6a8a7ff 100644
--- a/types/uglify-js/tsconfig.json
+++ b/types/uglify-js/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/ui-router-extras/index.d.ts b/types/ui-router-extras/index.d.ts
index b36f030689..42f4926e87 100644
--- a/types/ui-router-extras/index.d.ts
+++ b/types/ui-router-extras/index.d.ts
@@ -131,6 +131,12 @@ declare module 'angular' {
          */
         interface IStickyStateService {
             getInactiveStates(): IStickyState[];
+             /*
+             * If there is an inactive state named inactiveStateName, this method exits that state.
+             * If stateParams is provided, then the state is only exited if the params match the inactive params.
+             * If inactiveStateName === '*', then all inactive states are exited
+             */
+            reset(inactiveStateName: string, stateParams?: { [key: string]: string | string[] }): void;
         }
 
         /**
diff --git a/types/ui-router-extras/ui-router-extras-tests.ts b/types/ui-router-extras/ui-router-extras-tests.ts
index 5cc3ed122a..ef3f52ad79 100644
--- a/types/ui-router-extras/ui-router-extras-tests.ts
+++ b/types/ui-router-extras/ui-router-extras-tests.ts
@@ -16,7 +16,7 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
         onReactivate: ($state: angular.ui.IState) => {
             const iAmInjectedByInjector = $state;
         },
-        controller: ($previousState: angular.ui.IPreviousStateService, $deepstateRedirect: angular.ui.IDeepStateRedirectService) => {
+        controller: ($previousState: angular.ui.IPreviousStateService, $deepstateRedirect: angular.ui.IDeepStateRedirectService, $stickyState: angular.ui.IStickyStateService) => {
             $previousState.memo('test-memo1');
             $previousState.memo('test-memo2', 'test-state-name2');
             $previousState.memo('test-memo3', 'test-state-name3', {});
@@ -32,6 +32,13 @@ myApp.config(($stateProvider: angular.ui.IStateProvider, $stickyStateProvider: a
                 stateParam1: ['value1', 'value2'],
                 stateParam2: 'value'
             });
+
+            $stickyState.getInactiveStates();
+            $stickyState.reset('state1');
+            $stickyState.reset('state2', {
+                stateParam1: ['value1', 'value2'],
+                stateParam2: 'value'
+            });
         },
         views: {
             // named views are mandatory
diff --git a/types/uid-safe/index.d.ts b/types/uid-safe/index.d.ts
index ee7b13491f..20a85ae899 100644
--- a/types/uid-safe/index.d.ts
+++ b/types/uid-safe/index.d.ts
@@ -8,7 +8,7 @@ declare namespace UID {
     export interface Generate {
 
         (byteLength: number, callback: (err: any, str: string) => any): void;
-        (byteLength: number): Promise<any>;
+        (byteLength: number): Promise<string>;
 
         sync(byteLength: number): string;
     }
diff --git a/types/umzug/index.d.ts b/types/umzug/index.d.ts
index b60028c566..a163ea01d9 100644
--- a/types/umzug/index.d.ts
+++ b/types/umzug/index.d.ts
@@ -1,13 +1,15 @@
-// Type definitions for Umzug v2.1.0
+// Type definitions for Umzug v2.2.0
 // Project: https://github.com/sequelize/umzug
 // Definitions by: Ivan Drinchev <https://github.com/drinchev>
 //                 Margus Lamp <https://github.com/mlamp>
 //                 Troy McKinnon <https://github.com/trodi>
+//                 Emmanuel Gautier <https://github.com/emmanuelgautier>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 import { EventEmitter } from 'events';
 import Sequelize = require("sequelize");
+import MongoDB = require("mongodb");
 
 declare namespace umzug {
 
@@ -116,6 +118,27 @@ declare namespace umzug {
 
     }
 
+    interface MongoDBStorageOptions extends Storage {
+
+        /**
+         * The MongoDB database connection instance.
+         */
+        connection?: MongoDB.Db;
+
+        /**
+         * The to be used Mongo collection cursor.
+         * Defaults to collection created from collectionName attribute.
+         */
+        collection?: MongoDB.Collection;
+
+        /**
+         * The name of the collection used by the connection.
+         * Defaults to 'migrations'
+         */
+        collectionName?: string;
+
+    }
+
     interface ExecuteOptions {
         migrations?: Array<string>;
         method?: string;
@@ -125,12 +148,12 @@ declare namespace umzug {
         /**
          * The storage.
          */
-        storage?: "json" | "sequelize" | Storage;
+        storage?: "json" | "sequelize" | "mongodb" | Storage;
 
         /**
          * The options for the storage.
          */
-        storageOptions?: JSONStorageOptions | SequelizeStorageOptions | Object;
+        storageOptions?: JSONStorageOptions | SequelizeStorageOptions | MongoDBStorageOptions | Object;
 
         /**
          * The logging function.
diff --git a/types/umzug/umzug-tests.ts b/types/umzug/umzug-tests.ts
index 95ccf15665..730f350315 100644
--- a/types/umzug/umzug-tests.ts
+++ b/types/umzug/umzug-tests.ts
@@ -1,5 +1,6 @@
 import Umzug = require('umzug');
 import Sequelize = require('sequelize');
+import MongoDB = require('mongodb');
 
 let someVar: Umzug.Umzug;
 const umzug = new Umzug({});
@@ -44,7 +45,7 @@ umzug.on('reverted', (name: string, migration: Umzug.Migration) => null);
 
 new Umzug({
     // The storage.
-    // Possible values: 'json', 'sequelize', an object
+    // Possible values: 'json', 'sequelize', 'mongodb' an object
     storage: 'json',
 
     // The options for the storage.
@@ -80,7 +81,7 @@ new Umzug({
 
 new Umzug({
     // The storage.
-    // Possible values: 'json', 'sequelize', an object
+    // Possible values: 'json', 'sequelize', 'mongodb' an object
     storage: 'json',
     storageOptions: {
         path: '/db/sequelize-meta.json',
@@ -121,3 +122,30 @@ new Umzug({
     },
 
 });
+
+const mongodb = new MongoDB.Db('database', new MongoDB.Server('host', 21017));
+
+new Umzug({
+    // The storage.
+    // Possible values: 'json', 'sequelize', 'mongodb' an object
+    storage: 'mongodb',
+    storageOptions: {
+        /**
+         * The MongoDB database connection instance.
+         */
+        connection: mongodb,
+
+        /**
+         * The to be used Mongo collection cursor.
+         * Defaults to collection created from collectionName attribute.
+         */
+        collection: mongodb.collection,
+
+        /**
+         * The name of the collection used by the connection.
+         * Defaults to 'migrations'
+         */
+        collectionName: 'migrations'
+    },
+
+});
diff --git a/types/underscore/index.d.ts b/types/underscore/index.d.ts
index 8822deca98..72498e3591 100644
--- a/types/underscore/index.d.ts
+++ b/types/underscore/index.d.ts
@@ -1,13 +1,13 @@
 // 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>, Cassey Lottman <https://github.com/clottman>
+// 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>, Ard Timmerman <https://github.com/confususs>
 // 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 
+// 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 { }
@@ -3631,7 +3631,7 @@ declare module _ {
         * @param object Convert this object to a list of [key, value] pairs.
         * @return List of [key, value] pairs on `object`.
         **/
-        pairs(object: any): any[][];
+        pairs(object: any): [string, any][];
 
         /**
         * Returns a copy of the object where the keys have become the values and the values the keys.
@@ -4738,7 +4738,7 @@ declare module _ {
         * Wrapped type `object`.
         * @see _.pairs
         **/
-        pairs(): any[][];
+        pairs(): [string, any][];
 
         /**
         * Wrapped type `object`.
@@ -5692,7 +5692,7 @@ declare module _ {
         * Wrapped type `object`.
         * @see _.values
         **/
-        values(): _Chain<T>;
+        values(): _Chain<any>;
 
         /**
         * Wrapped type `object`.
@@ -5704,7 +5704,7 @@ declare module _ {
         * Wrapped type `object`.
         * @see _.pairs
         **/
-        pairs(): _Chain<T[]>;
+        pairs(): _Chain<[string, any]>;
 
         /**
         * Wrapped type `object`.
diff --git a/types/underscore/underscore-tests.ts b/types/underscore/underscore-tests.ts
index 419479f689..6175c1874b 100644
--- a/types/underscore/underscore-tests.ts
+++ b/types/underscore/underscore-tests.ts
@@ -527,6 +527,16 @@ function chain_tests() {
   	.keys()    // return ['foo', 'bar'] : string[]
   	.pairs()   // return [['foo', '0'], ['bar', '1']] : string[][]
   	.value();
+
+    interface IYears {
+        2016: number;
+        2017: number;
+    }
+
+    let yearObject: IYears = {2016: 1, 2017: 2};
+    let valuePerYear: number[] = _.chain(yearObject)
+        .values()
+        .value()
 }
 
 var obj: { [k: string] : number } = {
diff --git a/types/unidecode/index.d.ts b/types/unidecode/index.d.ts
new file mode 100644
index 0000000000..1e4be8f43b
--- /dev/null
+++ b/types/unidecode/index.d.ts
@@ -0,0 +1,8 @@
+// Type definitions for unidecode 0.1
+// Project: https://github.com/FGRibreau/node-unidecode
+// Definitions by: Vitor Fernandes <https://github.com/vfernandestoptal>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = unidecode;
+
+declare function unidecode(str: string): string;
diff --git a/types/unidecode/tsconfig.json b/types/unidecode/tsconfig.json
new file mode 100644
index 0000000000..89ff830180
--- /dev/null
+++ b/types/unidecode/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",
+        "unidecode-tests.ts"
+    ]
+}
diff --git a/types/unidecode/tslint.json b/types/unidecode/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/unidecode/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/unidecode/unidecode-tests.ts b/types/unidecode/unidecode-tests.ts
new file mode 100644
index 0000000000..94dc3cb201
--- /dev/null
+++ b/types/unidecode/unidecode-tests.ts
@@ -0,0 +1,3 @@
+import unidecode = require("unidecode");
+
+const text: string = unidecode("Hello, World");
diff --git a/types/universal-cookie/index.d.ts b/types/universal-cookie/index.d.ts
new file mode 100644
index 0000000000..4bba4adee6
--- /dev/null
+++ b/types/universal-cookie/index.d.ts
@@ -0,0 +1,102 @@
+// Type definitions for universal-cookie 2.2
+// Project: https://github.com/reactivestack/cookies/tree/master/packages/universal-cookie#readme
+// Definitions by: Tomi Turtiainen <https://github.com/tomi>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+export interface CookiesByName {
+    [cookieName: string]: string;
+}
+
+export interface GetOpts {
+    /**
+     * do not convert the cookie into an object no matter what
+     */
+    doNotParse: boolean;
+}
+
+export interface CookieOpts {
+    /**
+     * cookie path, use / as the path if you want your cookie to be accessible on all pages
+     */
+    path?: string;
+
+    /**
+     * absolute expiration date for the cookie
+     */
+    expires?: Date;
+
+    /**
+     * relative max age of the cookie from when the client receives it in second
+     */
+    maxAge?: number;
+
+    /**
+     * domain for the cookie (sub.domain.com or .allsubdomains.com)
+     */
+    domain?: string;
+
+    /**
+     * Is only accessible through HTTPS?
+     */
+    secure?: boolean;
+
+    /**
+     * Is only the server can access the cookie?
+     */
+    httpOnly?: boolean;
+}
+
+export type ChangeListenerCallback = (
+    name: string,
+    value: string | object,
+    options: CookieOpts
+) => void;
+
+export default class Cookies {
+    constructor(cookieHeader?: string | CookiesByName);
+
+    /**
+     * Get a cookie value
+     *
+     * @param name cookie name
+     * @param options.doNotParse do not convert the cookie into an object no matter what
+     */
+    get(name: string, options?: GetOpts): string;
+
+    /**
+     * Get all cookies
+     *
+     * @param options.doNotParse do not convert the cookie into an object no matter what
+     */
+    getAll(options?: GetOpts): CookiesByName;
+
+    /**
+     * Set a cookie value
+     *
+     * @param name cookie name
+     * @param value save the value and stringify the object if needed
+     * @param options Support all the cookie options from RFC 6265
+     */
+    set(name: string, value: string | object, options?: CookieOpts): void;
+
+    /**
+     * Set a cookie value
+     *
+     * @param name cookie name
+     * @param options Support all the cookie options from RFC 6265
+     */
+    remove(name: string, options?: CookieOpts): void;
+
+    /**
+     * Add a listener to when a cookie is set or removed.
+     *
+     * @param callback Call that will be called with the first argument containing name, value and options of the changed cookie.
+     */
+    addChangeListener(callback: ChangeListenerCallback): void;
+
+    /**
+     * Remove a listener from the change callback.
+     */
+    removeChangeListener(callback: ChangeListenerCallback): void;
+}
diff --git a/types/universal-cookie/tsconfig.json b/types/universal-cookie/tsconfig.json
new file mode 100644
index 0000000000..1c324ed8c6
--- /dev/null
+++ b/types/universal-cookie/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", "universal-cookie-tests.ts"]
+}
diff --git a/types/universal-cookie/tslint.json b/types/universal-cookie/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/universal-cookie/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/universal-cookie/universal-cookie-tests.ts b/types/universal-cookie/universal-cookie-tests.ts
new file mode 100644
index 0000000000..9591fa3c5b
--- /dev/null
+++ b/types/universal-cookie/universal-cookie-tests.ts
@@ -0,0 +1,20 @@
+import Cookies from "universal-cookie";
+
+const cookies = new Cookies();
+new Cookies("My=Cookie");
+new Cookies({});
+
+cookies.set("my", "cookie");
+cookies.set("object", { some: "value" });
+cookies.set("with", "options", {
+    path: "/"
+});
+
+cookies.get("my");
+cookies.getAll();
+
+cookies.remove("object");
+cookies.remove("object", { path: "/" });
+
+cookies.addChangeListener((name, value) => {});
+cookies.removeChangeListener((name, value) => {});
diff --git a/types/unzipper/index.d.ts b/types/unzipper/index.d.ts
index 034fb5b099..43c50e1818 100644
--- a/types/unzipper/index.d.ts
+++ b/types/unzipper/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for unzipper 0.8
+// Type definitions for unzipper 0.9
 // Project: https://github.com/ZJONSSON/node-unzipper#readme
 // Definitions by: s73obrien <https://github.com/s73obrien>
 //                 Nate <https://github.com/natemara>
@@ -57,6 +57,7 @@ export function unzip(
 ): Entry;
 
 export namespace Open {
+    function buffer(data: Buffer): Promise<CentralDirectory>;
     function file(filename: string): Promise<CentralDirectory>;
     function url(
         request: ClientRequest,
diff --git a/types/unzipper/unzipper-tests.ts b/types/unzipper/unzipper-tests.ts
index 7a8fbf9f4a..26cebebdef 100644
--- a/types/unzipper/unzipper-tests.ts
+++ b/types/unzipper/unzipper-tests.ts
@@ -41,3 +41,4 @@ createReadStream("http://example.org/path/to/archive.zip")
 const dir1: Promise<CentralDirectory> = Open.file("Z:\\path\\to\\archive.zip");
 const dir2: Promise<CentralDirectory> = Open.url(get("url/to/archive.zip"), {});
 const dir3: Promise<CentralDirectory> = Open.s3("any", "any");
+const dir4: Promise<CentralDirectory> = Open.buffer(Buffer.from('ZIPDATA'));
diff --git a/types/uri-templates/index.d.ts b/types/uri-templates/index.d.ts
index ad8cead946..d378de8a4f 100644
--- a/types/uri-templates/index.d.ts
+++ b/types/uri-templates/index.d.ts
@@ -1,16 +1,19 @@
-// Type definitions for uri-templates 0.1.2
+// Type definitions for uri-templates 0.1.9
 // Project: https://github.com/geraintluff/uri-templates
 // Definitions by: Bart van der Schoor <https://github.com/Bartvds>
+//                 Bartek Szczepański <https://github.com/barnski>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 declare function utpl(template: string): utpl.URITemplate;
 
 declare namespace utpl {
     export interface URITemplate {
-        fillFromObject(vars: Object): string;
+        fillFromObject(vars: { [key: string]: string }): string;
         fill(callback: (varName: string) => string): string;
-        fromUri(uri: string): Object;
+        fill(vars: { [key: string]: string }): string;
+        fromUri(uri: string): { [key: string]: string };
+        varNames: string[];
+        template: string;
     }
 }
 
diff --git a/types/uri-templates/uri-templates-tests.ts b/types/uri-templates/uri-templates-tests.ts
index 0aeb5e0bfe..d29b801de1 100644
--- a/types/uri-templates/uri-templates-tests.ts
+++ b/types/uri-templates/uri-templates-tests.ts
@@ -1,15 +1,23 @@
-
 import utmpl = require('uri-templates');
 import URITemplate = utmpl.URITemplate;
 
-var str: string;
-var u: URITemplate;
-var obj: Object;
+let str: string;
+let u: URITemplate;
+const obj = { test: 'test1' };
 
 u = utmpl(str);
 
 str = u.fillFromObject(obj);
-str = u.fill((key) => {
-	return str;
+str = u.fill(key => {
+    return str;
 });
-obj = u.fromUri(str);
+str = u.fill(obj);
+const newObj = u.fromUri(str);
+
+let varNames: string[];
+
+varNames = u.varNames;
+
+let template: string;
+
+template = u.template;
diff --git a/types/url-parse/index.d.ts b/types/url-parse/index.d.ts
index ce8f3647c2..58a14f3f4d 100644
--- a/types/url-parse/index.d.ts
+++ b/types/url-parse/index.d.ts
@@ -1,14 +1,28 @@
-// Type definitions for url-parse 1.1
+// Type definitions for url-parse 1.4
 // Project: https://github.com/unshiftio/url-parse
-// Definitions by: Pavlo Chernenko <https://github.com/ChernenkoPaul>
+// Definitions by: Pavlo Chernenko <https://github.com/ChernenkoPaul>, Hari Sivaramakrishnan <https://github.com/harisiva>, Dmitry Dushkin <https://github.com/DimitryDushkin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.2
 
-import URLSearchParams = require("url-search-params");
+declare namespace URLParse {
+    type URLPart = 'auth'
+        | 'hash'
+        | 'host'
+        | 'hostname'
+        | 'href'
+        | 'origin'
+        | 'password'
+        | 'pathname'
+        | 'port'
+        | 'protocol'
+        | 'query'
+        | 'slashes'
+        | 'username';
 
-type UrlQueryParamsParser = (url: string) => string;
+    type QueryParser = (query: string) => object;
+}
 
-declare class URL {
+interface URLParse {
     readonly auth: string;
     readonly hash: string;
     readonly host: string;
@@ -19,34 +33,27 @@ declare class URL {
     readonly pathname: string;
     readonly port: string;
     readonly protocol: string;
-    query: { [key: string]: string | undefined };
-    readonly search: string;
-    set(property: string, value: string | object | number | undefined): URL;
+    readonly query: { [key: string]: string | undefined };
     readonly slashes: boolean;
     readonly username: string;
-    readonly searchParams: URLSearchParams;
+    set(part: URLParse.URLPart, value: string | object | number | undefined, fn?: boolean | URLParse.QueryParser): URLParse;
     toString(): string;
 }
 
-type ParseFunctionNodeType = (url: string, parseQueryString?: boolean, slashesDenoteHost?: boolean) => URL;
-type ParseFunctionType = (url: string, baseURL?: object | string, parser?: boolean | UrlQueryParamsParser) => URL;
+declare const URLParse: {
+    new(address: string, location?: string | object, parser?: boolean | URLParse.QueryParser): URLParse;
+    (address: string, location?: string | object, parser?: boolean | URLParse.QueryParser): URLParse;
 
-interface Protocol {
-    slashes: boolean;
-    protocol: string;
-    rest: string;
-}
+    extractProtocol(url: string): {
+        slashes: boolean;
+        protocol: string;
+        rest: string;
+    };
+    location(url: string): object;
+    qs: {
+        parse: URLParse.QueryParser;
+        stringify(query: object): string;
+    };
+};
 
-type ExtractProtocolFunctionType = (url: string) => Protocol;
-
-type LocationFunctionType = (url: string) => string;
-
-interface ExtendedParseFunctionType extends ParseFunctionNodeType, ParseFunctionType {
-    extractProtocol: ExtractProtocolFunctionType;
-    location: LocationFunctionType;
-    qs: any;
-}
-
-declare const parse: ExtendedParseFunctionType;
-
-export = parse;
+export = URLParse;
diff --git a/types/url-parse/url-parse-tests.ts b/types/url-parse/url-parse-tests.ts
index 48b2fa016d..87904b7f13 100644
--- a/types/url-parse/url-parse-tests.ts
+++ b/types/url-parse/url-parse-tests.ts
@@ -1,18 +1,19 @@
-import parse = require("url-parse");
+import URL = require('url-parse');
+const parse = URL;
 
-const url1 = new URL("foo/bar", "https://github.com/");
-const url2 = parse("https://github.com/foo/bar?baz=true");
-const url3 = parse("https://github.com/foo/bar", true, true);
-const url4 = parse("foo/bar", "https://github.com/");
-const url5 = parse("foo/bar", "https://github.com/", () => "queryParserOverride");
+new URL('foo/bar', 'https://github.com/');
+new URL('foo/bar', 'https://github.com/', (query: string) => ({ query }));
+parse('foo/bar', 'https://github.com/');
+parse('foo/bar', 'https://github.com/', (query: string) => ({ query }));
 
-url2.hash;
-url2.hostname;
-url2.query.baz;
+const url1: URL = new URL('https://github.com/foo/bar?baz=true');
+url1.hash;
+url1.hostname;
+url1.query.baz;
 
-url3.slashes;
-url3.set("protocol", "http://");
+const url2 = new URL('foo/bar', 'https://github.com/');
+url2.set('protocol', 'http://');
 
-parse.extractProtocol("https://github.com/foo/bar");
-parse.location("https://github.com/foo/bar");
-parse.qs;
+URL.extractProtocol('https://github.com/foo/bar');
+URL.location('https://github.com/foo/bar');
+URL.qs.parse('a=b');
diff --git a/types/url-regex/index.d.ts b/types/url-regex/index.d.ts
index ed51c6e34d..58f3793baa 100644
--- a/types/url-regex/index.d.ts
+++ b/types/url-regex/index.d.ts
@@ -1,12 +1,15 @@
-// Type definitions for url-regex 4.0
+// Type definitions for url-regex 4.1
 // Project: https://github.com/kevva/url-regex
 // Definitions by: Daniel Perez Alvarez <https://github.com/unindented>
+//                 sosukesuzuki <https://github.com/sosukesuzuki>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /** Regular expression for matching URLs. */
 declare function urlRegex(options?: {
     /** Only match an exact string. Useful with RegExp#test to check if a string is a URL. */
     exact?: boolean;
+    /** Force URLs to start with a valid protocol or www. If set to false it'll match the TLD against a list of valid TLDs(https://github.com/stephenmathieson/node-tlds). */
+    strict?: boolean;
 }): RegExp;
 
 export = urlRegex;
diff --git a/types/url-regex/url-regex-tests.ts b/types/url-regex/url-regex-tests.ts
index 2a2db45a28..de62d9a796 100644
--- a/types/url-regex/url-regex-tests.ts
+++ b/types/url-regex/url-regex-tests.ts
@@ -8,4 +8,6 @@ urlRegex({exact: true}).test('https://github.com foo bar');
 
 urlRegex({exact: true}).test('https://github.com');
 
+urlRegex({exact: true, strict: false}).test('github.com');
+
 'foo https://github.com bar //google.com'.match(urlRegex());
diff --git a/types/url-search-params/index.d.ts b/types/url-search-params/index.d.ts
index 42cca9ca21..c58357a909 100644
--- a/types/url-search-params/index.d.ts
+++ b/types/url-search-params/index.d.ts
@@ -9,7 +9,7 @@ declare class URLSearchParams {
     append(name: string, value: any): void;
     delete(name: string): void;
     entries(): Iterator<string>;
-    get(name: string): string;
+    get(name: string): string | null;
     getAll(name: string): string[];
     has(name: string): boolean;
     keys(): Iterator<string>;
diff --git a/types/url-search-params/url-search-params-tests.ts b/types/url-search-params/url-search-params-tests.ts
index 94664f5a5c..c468c692d0 100644
--- a/types/url-search-params/url-search-params-tests.ts
+++ b/types/url-search-params/url-search-params-tests.ts
@@ -11,6 +11,8 @@ params.entries();
 
 params.get("b");
 
+params.get("d");
+
 params.getAll("b");
 
 params.has("b");
diff --git a/types/usb/index.d.ts b/types/usb/index.d.ts
index 7d3a5d8c89..6a4ea4d329 100644
--- a/types/usb/index.d.ts
+++ b/types/usb/index.d.ts
@@ -62,7 +62,7 @@ export class ConfigDescriptor {
 }
 
 export class Interface {
-  interface: number;
+  interfaceNumber: number;
   altSetting: number;
   descriptor: InterfaceDescriptor;
   endpoints: Endpoint[];
diff --git a/types/usb/usb-tests.ts b/types/usb/usb-tests.ts
index 44701c655b..1fa6bf7cca 100644
--- a/types/usb/usb-tests.ts
+++ b/types/usb/usb-tests.ts
@@ -57,7 +57,7 @@ device.allConfigDescriptors = [configDesc];
 
 const iface = new usb.Interface(device, 1);
 
-iface.interface = 1;
+iface.interfaceNumber = 1;
 iface.altSetting = 0;
 iface.claim();
 iface.release((error: string) => null);
diff --git a/types/uuid/index.d.ts b/types/uuid/index.d.ts
index cc4c1a1ef7..75bc7e6661 100644
--- a/types/uuid/index.d.ts
+++ b/types/uuid/index.d.ts
@@ -10,12 +10,11 @@
 // 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, v5 } from './interfaces';
+import { v1, v4 } from './interfaces';
 
 interface UuidStatic {
     v1: v1;
     v4: v4;
-    v5: v5;
 }
 
 declare const uuid: UuidStatic & v4;
diff --git a/types/valerie/valerie-tests.ts b/types/valerie/valerie-tests.ts
index b4f6efcdc9..2121b20c64 100644
--- a/types/valerie/valerie-tests.ts
+++ b/types/valerie/valerie-tests.ts
@@ -9,7 +9,7 @@ enum enumTest { male, female }
  */
 function ObservableValidationTypes() {
     // any
-    var t0 = ko.observable<any>()
+    var t0 = ko.observable()
         .validate()
         .end();
 
diff --git a/types/valiant/index.d.ts b/types/valiant/index.d.ts
new file mode 100644
index 0000000000..d63aff72c5
--- /dev/null
+++ b/types/valiant/index.d.ts
@@ -0,0 +1,51 @@
+// Type definitions for valiant 2.0
+// Project: https://github.com/tweetdeck/valiant#readme
+// Definitions by: whatasoda <https://github.com/whatasoda>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+export as namespace Valiant;
+
+export function createInterval<T = number>(compareValues?: IntervalConstructor<T>['compareValues']): IntervalConstructor<T>;
+
+export interface IntervalConstructor<T = number> {
+    new (from: Endpoint<T>, to: Endpoint<T>): Interval<T>;
+    prototype: Interval<T>;
+    empty: Interval<T>;
+    whole: Interval<T>;
+    negInf: Endpoint<T>;
+    posInf: Endpoint<T>;
+    negativeInfinity: Endpoint<T>;
+    positiveInfinity: Endpoint<T>;
+    adjacentEndpoint(endpoint: Endpoint<T>): Endpoint<T>;
+    compareEndpoints(a: Endpoint<T>, b: Endpoint<T>): number;
+    compareValues(a: T, b: T): number;
+    excEnd(value: T): Endpoint<T>;
+    exclusiveEndpoint(value: T): Endpoint<T>;
+    incEnd(value: T): Endpoint<T>;
+    inclusiveEndpoint(value: T): Endpoint<T>;
+    singleton(value: T): Interval<T>;
+}
+
+export interface Interval<T = number> {
+    constructor: IntervalConstructor;
+    empty: boolean;
+    from: Endpoint<T>;
+    to: Endpoint<T>;
+    hull(interval: Interval<T>): Interval<T>;
+    unify(interval: Interval<T>): Interval<T>;
+    isEmpty(): boolean;
+    equalTo(interval: Interval<T>): boolean;
+    contains(value: T): boolean;
+    isSubsetOf(interval: Interval<T>): boolean;
+    intersection(interval: Interval<T>): boolean;
+    contiguousWith(interval: Interval<T>): boolean;
+    fromComparator(a: Endpoint<T>, b: Endpoint<T>): number;
+    toComparator(a: Endpoint<T>, b: Endpoint<T>): number;
+}
+
+export interface Endpoint<T = number> {
+    finite: boolean;
+    inclusive: boolean;
+    value: T;
+}
diff --git a/types/valiant/tsconfig.json b/types/valiant/tsconfig.json
new file mode 100644
index 0000000000..8cac2a107b
--- /dev/null
+++ b/types/valiant/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",
+        "valiant-tests.ts"
+    ]
+}
diff --git a/types/valiant/tslint.json b/types/valiant/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/valiant/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/valiant/valiant-tests.ts b/types/valiant/valiant-tests.ts
new file mode 100644
index 0000000000..ff0383cb09
--- /dev/null
+++ b/types/valiant/valiant-tests.ts
@@ -0,0 +1,53 @@
+import { createInterval } from "valiant";
+
+// To make an Interval, you need to create a constructor:
+const Interval = createInterval();
+
+// By default it will manage integers:
+// (0,100] — the numbers 0 to 100, excluding 0
+new Interval(
+    Interval.exclusiveEndpoint(0),
+    Interval.inclusiveEndpoint(100)
+);
+
+// You can provide a custom sort function to support a different data type:
+const DateInterval = createInterval<Date>(function sortDates(a, b) {
+    return a.getTime() - b.getTime();
+});
+
+// [12 hours ago,now] — 12 hours ago until now
+new DateInterval(
+    DateInterval.incEnd(
+        new Date(Date.now() - (1000 * 60 * 60 * 12))
+    ),
+    DateInterval.incEnd(
+        new Date(Date.now())
+    )
+);
+
+// You can do calculations with two intervals:
+const i = new Interval(Interval.incEnd(1), Interval.incEnd(3));
+const j = new Interval(Interval.incEnd(2), Interval.incEnd(4));
+const k = new Interval(Interval.incEnd(5), Interval.incEnd(6));
+
+i.intersection(j);         // 2, 3
+i.hull(j);                 // 1, 4
+i.contiguousWith(j);       // true
+i.unify(j);                // 1, 4
+
+i.intersection(k);         // Interval.empty
+i.hull(k);                 // 1, 6
+i.contiguousWith(k);       // false
+i.unify(k);                // Interval.empty
+
+i.equalTo(j);              // false
+i.contains(2);             // true
+i.isSubsetOf(j);           // false
+
+// If there is no possible unification, the empty set (Interval.empty) results.
+// There are two special intervals:
+Interval.empty; // {}
+Interval.whole; // -Infinity, Infinity
+
+// You can also create an interval of value:
+Interval.singleton(5); // [5,5]
diff --git a/types/vanilla-tilt/index.d.ts b/types/vanilla-tilt/index.d.ts
index 5f4c80a783..a3e11c8ebe 100644
--- a/types/vanilla-tilt/index.d.ts
+++ b/types/vanilla-tilt/index.d.ts
@@ -4,104 +4,99 @@
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 /**
- * A smooth 3D tilt javascript library forked from Tilt.js (jQuery version).
+ * Options which configures the tilting
  */
-export namespace VanillaTilt {
+export interface TiltOptions {
     /**
-     * Options which configures the tilting
+     * Reverse the tilt direction
      */
-    interface TiltOptions {
-        /**
-         * Reverse the tilt direction
-         */
-        reverse?: boolean;
-        /**
-         * Max tilt rotation (degrees)
-         */
-        max?: number;
-        /**
-         * Transform perspective, the lower the more extreme the tilt gets.
-         */
-        perspective?: number;
-        /**
-         * 2 = 200%, 1.5 = 150%, etc..
-         */
-        scale?: number;
-        /**
-         * Speed of the enter/exit transition
-         */
-        speed?: number;
-        /**
-         * Set a transition on enter/exit.
-         */
-        transition?: boolean;
-        /**
-         * What axis should be disabled. Can be X or Y.
-         */
-        axis?: null | "x" | "y";
-        /**
-         * If the tilt effect has to be reset on exit.
-         */
-        reset?: boolean;
-        /**
-         * Easing on enter/exit.
-         */
-        easing?: string;
-        /**
-         * if it should have a "glare" effect
-         */
-        glare?: boolean;
-        /**
-         * the maximum "glare" opacity
-         */
-        "max-glare"?: number;
-        /**
-         * false = VanillaTilt creates the glare elements for you, otherwise
-         * you need to add .js-tilt-glare>.js-tilt-glare-inner by yourself
-         */
-        "glare-prerender"?: boolean;
-    }
+    reverse?: boolean;
+    /**
+     * Max tilt rotation (degrees)
+     */
+    max?: number;
+    /**
+     * Transform perspective, the lower the more extreme the tilt gets.
+     */
+    perspective?: number;
+    /**
+     * 2 = 200%, 1.5 = 150%, etc..
+     */
+    scale?: number;
+    /**
+     * Speed of the enter/exit transition
+     */
+    speed?: number;
+    /**
+     * Set a transition on enter/exit.
+     */
+    transition?: boolean;
+    /**
+     * What axis should be disabled. Can be X or Y.
+     */
+    axis?: null | "x" | "y";
+    /**
+     * If the tilt effect has to be reset on exit.
+     */
+    reset?: boolean;
+    /**
+     * Easing on enter/exit.
+     */
+    easing?: string;
+    /**
+     * if it should have a "glare" effect
+     */
+    glare?: boolean;
+    /**
+     * the maximum "glare" opacity
+     */
+    "max-glare"?: number;
+    /**
+     * false = VanillaTilt creates the glare elements for you, otherwise
+     * you need to add .js-tilt-glare>.js-tilt-glare-inner by yourself
+     */
+    "glare-prerender"?: boolean;
+}
 
-    interface TiltValues {
-        /**
-         * The current tilt on the X axis
-         */
-        tiltX: number;
-        /**
-         * The current tilt on the Y axis
-         */
-        tiltY: number;
-        /**
-         * The current percentage on the X axis
-         */
-        percentageX: number;
-        /**
-         * The current percentage on the Y axis
-         */
-        percentageY: number;
-    }
+export interface TiltValues {
+    /**
+     * The current tilt on the X axis
+     */
+    tiltX: number;
+    /**
+     * The current tilt on the Y axis
+     */
+    tiltY: number;
+    /**
+     * The current percentage on the X axis
+     */
+    percentageX: number;
+    /**
+     * The current percentage on the Y axis
+     */
+    percentageY: number;
+}
 
-    interface HTMLVanillaTiltElement extends HTMLElement {
-        vanillaTilt: VanillaTilt;
-    }
+export interface HTMLVanillaTiltElement extends HTMLElement {
+    vanillaTilt: VanillaTilt;
 }
 
 /**
  * A smooth 3D tilt javascript library forked from Tilt.js (jQuery version).
  */
-export class VanillaTilt {
+export default class VanillaTilt {
     /**
      * Creates a new instance of a VanillaTilt element.
      * @param element The element, which should be a VanillaTilt element
      * @param settings Settings which configures the element
      */
-    constructor(element: HTMLElement, settings?: VanillaTilt.TiltOptions);
+    constructor(element: HTMLElement, settings?: TiltOptions);
     /**
      * Initializes one or multiple elements
      * @param elements The element, which should tilt
      * @param settings Settings, which configures the elements
      */
-    static init(elements: HTMLElement | HTMLElement[], settings?: VanillaTilt.TiltOptions): void;
+    static init(elements: HTMLElement | HTMLElement[], settings?: TiltOptions): void;
     /**
      * Resets the styling
      */
@@ -109,7 +104,7 @@ export class VanillaTilt {
     /**
      * Get values of instance
      */
-    getValues(): VanillaTilt.TiltValues;
+    getValues(): TiltValues;
     /**
      * Destroys the instance and removes the listeners.
      */
diff --git a/types/vanilla-tilt/vanilla-tilt-tests.ts b/types/vanilla-tilt/vanilla-tilt-tests.ts
index 52520dcfcc..4ed9cd9b7c 100644
--- a/types/vanilla-tilt/vanilla-tilt-tests.ts
+++ b/types/vanilla-tilt/vanilla-tilt-tests.ts
@@ -1,4 +1,4 @@
-import { VanillaTilt } from 'vanilla-tilt';
+import VanillaTilt, { TiltValues } from 'vanilla-tilt';
 
 const element: VanillaTilt = new VanillaTilt(document.createElement('a'), {
     axis: 'y',
@@ -24,7 +24,7 @@ VanillaTilt.init([document.createElement('a')], {
     axis: null
 });
 
-const values: VanillaTilt.TiltValues = element.getValues();
+const values: TiltValues = element.getValues();
 values.percentageX;
 values.percentageY;
 values.tiltX;
diff --git a/types/varint/index.d.ts b/types/varint/index.d.ts
new file mode 100644
index 0000000000..ec490a2e70
--- /dev/null
+++ b/types/varint/index.d.ts
@@ -0,0 +1,46 @@
+// Type definitions for varint 5.0
+// Project: https://github.com/chrisdickinson/varint#readme
+// Definitions by: David Brockman Smoliansky <https://github.com/dbrockman>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+export const encode: {
+    /**
+     * Encodes `num` into `buffer` starting at `offset`. returns `buffer`, with the encoded varint written into it.
+     * `varint.encode.bytes` will now be set to the number of bytes modified.
+     */
+    (num: number, buffer: Buffer, offset?: number): Buffer;
+
+    /**
+     * Encodes `num` into `array` starting at `offset`. returns `array`, with the encoded varint written into it.
+     * If `array` is not provided, it will default to a new array.
+     * `varint.encode.bytes` will now be set to the number of bytes modified.
+     */
+    (num: number, array?: number[], offset?: number): number[];
+
+    /**
+     * Similar to `decode.bytes` when encoding a number it can be useful to know how many bytes where written (especially if you pass an output array).
+     * You can access this via `varint.encode.bytes` which holds the number of bytes written in the last encode.
+     */
+    bytes: number;
+};
+
+export const decode: {
+    /**
+     * Decodes `data`, which can be either a buffer or array of integers, from position `offset` or default 0 and returns the decoded original integer.
+     * Throws a `RangeError` when `data` does not represent a valid encoding.
+     */
+    (buf: Buffer | number[], offset?: number): number;
+
+    /**
+     * If you also require the length (number of bytes) that were required to decode the integer you can access it via `varint.decode.bytes`.
+     * This is an integer property that will tell you the number of bytes that the last .decode() call had to use to decode.
+     */
+    bytes: number;
+};
+
+/**
+ * returns the number of bytes this number will be encoded as, up to a maximum of 8.
+ */
+export function encodingLength(num: number): number;
diff --git a/types/varint/tsconfig.json b/types/varint/tsconfig.json
new file mode 100644
index 0000000000..269a7016fe
--- /dev/null
+++ b/types/varint/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", "varint-tests.ts"]
+}
diff --git a/types/varint/tslint.json b/types/varint/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/varint/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/varint/varint-tests.ts b/types/varint/varint-tests.ts
new file mode 100644
index 0000000000..4ef8c91753
--- /dev/null
+++ b/types/varint/varint-tests.ts
@@ -0,0 +1,17 @@
+import { decode, encode, encodingLength } from 'varint';
+
+encode(0); // $ExpectType number[]
+encode(0, []); // $ExpectType number[]
+encode(0, [], 0); // $ExpectType number[]
+
+encode(0, Buffer.alloc(1)); // $ExpectType Buffer
+encode(0, Buffer.alloc(1), 0); // $ExpectType Buffer
+
+encode.bytes; // $ExpectType number
+
+decode(Buffer.alloc(1)); // $ExpectType number
+decode(Buffer.alloc(1), 0); // $ExpectType number
+
+decode.bytes; // $ExpectType number
+
+encodingLength(0); // $ExpectType number
diff --git a/types/velocity-animate/index.d.ts b/types/velocity-animate/index.d.ts
index f6b696870f..24dc53b4be 100644
--- a/types/velocity-animate/index.d.ts
+++ b/types/velocity-animate/index.d.ts
@@ -87,8 +87,8 @@ declare namespace jquery.velocity {
 	interface VelocityStatic {
 		Sequences: any;
 		mock: any;
-		animate(options: {elements: NodeListOf<HTMLElement>; properties: Properties; options: Options}): any;
-		animate(elements: HTMLElement|NodeListOf<HTMLElement>, properties: Properties, options: Options): any;
+		animate(options: {elements: HTMLCollection | NodeListOf<HTMLElement>; properties: Properties; options: Options}): any;
+		animate(elements: HTMLElement | HTMLCollection | NodeListOf<HTMLElement>, properties: Properties, options: Options): any;
 		RegisterEffect(name: string, options: RegisterEffectOptions): VelocityStatic;
 		RunSequence(sequence: SequenceCall[]): VelocityStatic;
 
diff --git a/types/vertx3-eventbus-client/index.d.ts b/types/vertx3-eventbus-client/index.d.ts
index 96c74a66e6..0196f94441 100644
--- a/types/vertx3-eventbus-client/index.d.ts
+++ b/types/vertx3-eventbus-client/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for vertx3-eventbus-client 3.4
+// Type definitions for vertx3-eventbus-client 3.5
 // Project: http://vertx.io
 // Definitions by: Odd Eirik Nes <https://github.com/oddeirik>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -18,6 +18,8 @@ declare namespace EventBus {
     unregisterHandler(address: string, headers: any, callback: (error: Error, message: any) => any): any;
     send(address: string, message: any, headers: any, callback?: (error: Error, message: any) => any): any;
     publish(address: string, message: any, headers?: any): any;
+    enableReconnect(enable: boolean): void;
+    enablePing(enable: boolean): void;
     close(): any;
   }
 }
diff --git a/types/vexdb/index.d.ts b/types/vexdb/index.d.ts
new file mode 100644
index 0000000000..974b203fd8
--- /dev/null
+++ b/types/vexdb/index.d.ts
@@ -0,0 +1,595 @@
+// Type definitions for vexdb 1.7
+// Project: https://github.com/MayorMonty/vexdb#readme
+// Definitions by: Brendan McGuire <https://github.com/MayorMonty>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import { EventEmitter } from "events";
+
+export type Endpoint =
+  | "events"
+  | "teams"
+  | "matches"
+  | "rankings"
+  | "season_rankings"
+  | "awards"
+  | "skills";
+
+/**
+ * Parameter Objects
+ */
+export type StringRequest =
+  | string
+  | string[]
+  | RegExp
+  | StringRequestValidatorFunction;
+export type StringRequestValidatorFunction = (
+  itemValue: string,
+  item: ResponseObject
+) => Promise<boolean> | boolean;
+
+export type NumberRequest = number | number[] | NumberRequestValidatorFunction;
+export type NumberRequestValidatorFunction = (
+  itemValue: number,
+  item: ResponseObject
+) => Promise<boolean> | boolean;
+
+/**
+ * Request Objects
+ */
+
+export type RequestObject =
+  | TeamsRequestObject
+  | EventsRequestObject
+  | MatchesRequestObject
+  | RankingsRequestObject
+  | SeasonRankingsRequestObject
+  | AwardsRequestObject
+  | SkillsRequestObject;
+
+export interface TeamsRequestObject {
+  team?: StringRequest;
+  number?: StringRequest;
+  team_name?: StringRequest;
+  robot_name?: StringRequest;
+  program?: StringRequest;
+  organisation?: StringRequest;
+  city?: StringRequest;
+  region?: StringRequest;
+  country?: StringRequest;
+  grade?: StringRequest;
+  is_registered?: NumberRequest;
+  sku?: StringRequest;
+  limit_number?: number;
+  limit_start?: number;
+}
+
+export interface EventsRequestObject {
+  sku?: StringRequest;
+  program?: StringRequest;
+  date?: StringRequest;
+  season?: StringRequest;
+  city?: StringRequest;
+  region?: StringRequest;
+  country?: StringRequest;
+  status?: StringRequest;
+  limit_number?: number;
+  limit_start?: number;
+
+  key?: StringRequest;
+  name?: StringRequest;
+  loc_venue?: StringRequest;
+  loc_address1?: StringRequest;
+  loc_address2?: StringRequest;
+  loc_city?: StringRequest;
+  loc_region?: StringRequest;
+  loc_postcode?: StringRequest;
+  loc_country?: StringRequest;
+  start?: StringRequest;
+  end?: StringRequest;
+}
+
+export interface MatchesRequestObject {
+  sku?: StringRequest;
+  division?: StringRequest;
+  team?: StringRequest;
+  round?: NumberRequest;
+  instance?: NumberRequest;
+  matchnum?: NumberRequest;
+  scheduled?: NumberRequest;
+  field?: StringRequest;
+  scored?: NumberRequest;
+  season?: StringRequest;
+  limit_number?: number;
+  limit_start?: number;
+
+  red1?: StringRequest;
+  red2?: StringRequest;
+  red3?: StringRequest;
+  redsit?: StringRequest;
+  blue1?: StringRequest;
+  blue2?: StringRequest;
+  blue3?: StringRequest;
+  bluesit?: StringRequest;
+  redscore?: NumberRequest;
+  bluescore?: NumberRequest;
+}
+
+export interface RankingsRequestObject {
+  sku?: StringRequest;
+  division?: StringRequest;
+  team?: StringRequest;
+  rank?: StringRequest;
+  season?: StringRequest;
+  limit_number?: number;
+  limit_start?: number;
+
+  wins?: NumberRequest;
+  losses?: NumberRequest;
+  ties?: NumberRequest;
+  wp?: NumberRequest;
+  ap?: NumberRequest;
+  sp?: NumberRequest;
+  trsp?: NumberRequest;
+  max_score?: NumberRequest;
+  opr?: NumberRequest;
+  dpr?: NumberRequest;
+  ccwm?: NumberRequest;
+}
+
+export interface SeasonRankingsRequestObject {
+  program?: StringRequest;
+  season?: StringRequest;
+  team?: StringRequest;
+  vrating_rank?: NumberRequest;
+  limit_number?: number;
+  limit_start?: number;
+
+  vrating?: NumberRequest;
+}
+
+export interface AwardsRequestObject {
+  sku?: StringRequest;
+  name?: StringRequest;
+  team?: StringRequest;
+  season?: StringRequest;
+  limit_number?: number;
+  limit_start?: number;
+
+  order?: NumberRequest;
+}
+
+export interface SkillsRequestObject {
+  sku?: StringRequest;
+  program?: StringRequest;
+  type?: NumberRequest;
+  team?: StringRequest;
+  season?: StringRequest;
+  rank?: NumberRequest;
+  season_rank?: NumberRequest;
+  limit_number?: number;
+  limit_start?: number;
+
+  attempts?: NumberRequest;
+  score?: NumberRequest;
+}
+
+/**
+ * Response Objects
+ */
+
+export type ResponseObject =
+  | TeamsResponseObject
+  | EventsResponseObject
+  | MatchesResponseObject
+  | RankingsResponseObject
+  | SeasonRankingsResponseObject
+  | AwardsResponseObject
+  | SkillsResponseObject;
+
+export interface TeamsResponseObject {
+  number: string;
+  program: string;
+  team_name: string;
+  robot_name: string;
+  organisation: string;
+  city: string;
+  region: string;
+  country: string;
+  grade: string;
+  is_registered: 0 | 1;
+}
+
+export interface EventsResponseObject {
+  sku: string;
+  key: string;
+  program: string;
+  name: string;
+  loc_venue: string;
+  loc_address1: string;
+  loc_address2: string;
+  loc_city: string;
+  loc_region: string;
+  loc_postcode: string;
+  loc_country: string;
+  season: string;
+  start: string;
+  end: string;
+  divisions: string[];
+}
+
+export interface MatchesResponseObject {
+  sku: string;
+  division: string;
+  round: 1 | 2 | 3 | 4 | 5 | 6 | 16;
+  instance: number;
+  matchnum: number;
+  field: string;
+  red1: string;
+  red2: string;
+  red3: string;
+  redsit: string;
+  blue1: string;
+  blue2: string;
+  blue3: string;
+  bluesit: string;
+  redscore: number;
+  bluescore: number;
+  scored: 0 | 1;
+  scheduled: string;
+}
+
+export interface RankingsResponseObject {
+  sku: string;
+  division: string;
+  rank: number;
+  team: string;
+  wins: number;
+  losses: number;
+  ties: number;
+  wp: number;
+  ap: number;
+  sp: number;
+  trsp: number;
+  max_score: number;
+  opr: number;
+  dpr: number;
+  ccwm: number;
+}
+
+export interface SeasonRankingsResponseObject {
+  team: string;
+  season: string;
+  program: string;
+  vrating_rank: number;
+  vrating: number;
+}
+
+export interface AwardsResponseObject {
+  sku: string;
+  name: string;
+  team: string;
+  qualifies: string[];
+  order: number;
+}
+
+export interface SkillsResponseObject {
+  sku: string;
+  type: number;
+  rank: number;
+  team: string;
+  program: string;
+  attempts: number;
+  score: number;
+}
+
+/**
+ * GET
+ */
+export function get(
+  endpoint: "teams",
+  params: TeamsRequestObject
+): Promise<TeamsResponseObject[]>;
+
+export function get(
+  endpoint: "events",
+  params: EventsRequestObject
+): Promise<EventsResponseObject[]>;
+
+export function get(
+  endpoint: "matches",
+  params: MatchesRequestObject
+): Promise<MatchesResponseObject[]>;
+
+export function get(
+  endpoint: "rankings",
+  params: RankingsRequestObject
+): Promise<RankingsResponseObject[]>;
+
+export function get(
+  endpoint: "season_rankings",
+  params: SeasonRankingsRequestObject
+): Promise<SeasonRankingsResponseObject[]>;
+
+export function get(
+  endpoint: "awards",
+  params: AwardsRequestObject
+): Promise<AwardsResponseObject[]>;
+
+export function get(
+  endpoint: "skills",
+  params: SkillsRequestObject
+): Promise<SkillsResponseObject[]>;
+
+/**
+ * SIZE
+ */
+export function size(
+  endpoint: "teams",
+  params: TeamsRequestObject
+): Promise<number>;
+
+export function size(
+  endpoint: "events",
+  params: EventsRequestObject
+): Promise<number>;
+
+export function size(
+  endpoint: "matches",
+  params: MatchesRequestObject
+): Promise<number>;
+
+export function size(
+  endpoint: "rankings",
+  params: RankingsRequestObject
+): Promise<number>;
+
+export function size(
+  endpoint: "season_rankings",
+  params: SeasonRankingsRequestObject
+): Promise<number>;
+
+export function size(
+  endpoint: "awards",
+  params: AwardsRequestObject
+): Promise<number>;
+
+export function size(
+  endpoint: "skills",
+  params: SkillsRequestObject
+): Promise<number>;
+
+/**
+ * LIVE
+ */
+export interface LiveEventEmitter<Q, R> extends EventEmitter {
+  close(): void;
+  params(updateParameters: Q): Q;
+  current(): R[];
+
+  // Update Events
+  on(event: "item", callback: (item: R) => void): this;
+  on(event: "fetch", callback: (newItems: R[]) => void): this;
+  on(event: "prefetch", callback: (results: R[]) => void): this;
+}
+
+export type LiveRequestObject<T> = T & { prefetch?: boolean };
+
+export function live(
+  endpoint: "teams",
+  params: LiveRequestObject<TeamsRequestObject>
+): LiveEventEmitter<TeamsRequestObject, TeamsResponseObject>;
+
+export function live(
+  endpoint: "events",
+  params: LiveRequestObject<EventsRequestObject>
+): LiveEventEmitter<EventsRequestObject, EventsResponseObject>;
+
+export function live(
+  endpoint: "matches",
+  params: LiveRequestObject<MatchesRequestObject>
+): LiveEventEmitter<MatchesRequestObject, MatchesResponseObject>;
+
+export function live(
+  endpoint: "rankings",
+  params: LiveRequestObject<RankingsRequestObject>
+): LiveEventEmitter<RankingsRequestObject, RankingsResponseObject>;
+
+export function live(
+  endpoint: "season_rankings",
+  params: LiveRequestObject<SeasonRankingsRequestObject>
+): LiveEventEmitter<SeasonRankingsRequestObject, SeasonRankingsResponseObject>;
+
+export function live(
+  endpoint: "awards",
+  params: LiveRequestObject<AwardsRequestObject>
+): LiveEventEmitter<AwardsRequestObject, AwardsResponseObject>;
+
+export function live(
+  endpoint: "skills",
+  params: LiveRequestObject<SkillsRequestObject>
+): LiveEventEmitter<SkillsRequestObject, SkillsResponseObject>;
+
+export function live(
+  endpoint: Endpoint,
+  params: LiveRequestObject<RequestObject>
+): LiveEventEmitter<RequestObject, ResponseObject>;
+
+/**
+ * CACHE
+ */
+export interface CacheEntry<T> {
+  expiry: number;
+  value: {
+    status: 0 | 1;
+    size: number;
+    result: T[];
+  };
+}
+
+export function cache(
+  endpoint: "teams",
+  params: TeamsRequestObject,
+  value: TeamsResponseObject[]
+): Promise<CacheEntry<TeamsResponseObject>>;
+
+export function cache(
+  endpoint: "events",
+  params: EventsRequestObject,
+  value: EventsResponseObject[]
+): Promise<CacheEntry<EventsResponseObject>>;
+
+export function cache(
+  endpoint: "matches",
+  params: MatchesRequestObject,
+  value: MatchesResponseObject[]
+): Promise<CacheEntry<MatchesResponseObject>>;
+
+export function cache(
+  endpoint: "rankings",
+  params: RankingsRequestObject,
+  value: RankingsResponseObject[]
+): Promise<CacheEntry<RankingsResponseObject>>;
+
+export function cache(
+  endpoint: "season_rankings",
+  params: SeasonRankingsRequestObject,
+  value: SeasonRankingsResponseObject[]
+): Promise<CacheEntry<SeasonRankingsResponseObject>>;
+
+export function cache(
+  endpoint: "awards",
+  params: AwardsRequestObject,
+  value: AwardsResponseObject[]
+): Promise<CacheEntry<AwardsResponseObject>>;
+
+export function cache(
+  endpoint: "skills",
+  params: SkillsRequestObject,
+  value: SkillsResponseObject[]
+): Promise<CacheEntry<SkillsResponseObject>>;
+
+export function cache(
+  endpoint: Endpoint,
+  params: RequestObject,
+  value: ResponseObject[]
+): Promise<CacheEntry<ResponseObject>>;
+
+export namespace cache {
+  const ttl: number;
+
+  function clear(): void;
+
+  function has(endpoint: "teams", params: TeamsRequestObject): Promise<boolean>;
+
+  function has(
+    endpoint: "events",
+    params: EventsRequestObject
+  ): Promise<boolean>;
+
+  function has(
+    endpoint: "matches",
+    params: MatchesRequestObject
+  ): Promise<boolean>;
+
+  function has(
+    endpoint: "rankings",
+    params: RankingsRequestObject
+  ): Promise<boolean>;
+
+  function has(
+    endpoint: "season_rankings",
+    params: SeasonRankingsRequestObject
+  ): Promise<boolean>;
+
+  function has(
+    endpoint: "awards",
+    params: AwardsRequestObject
+  ): Promise<boolean>;
+
+  function has(
+    endpoint: "skills",
+    params: SkillsRequestObject
+  ): Promise<boolean>;
+
+  function resolve(
+    endpoint: "teams",
+    params: TeamsRequestObject
+  ): Promise<CacheEntry<TeamsResponseObject>>;
+
+  function resolve(
+    endpoint: "events",
+    params: EventsRequestObject
+  ): Promise<CacheEntry<EventsResponseObject>>;
+
+  function resolve(
+    endpoint: "matches",
+    params: MatchesRequestObject
+  ): Promise<CacheEntry<MatchesResponseObject>>;
+
+  function resolve(
+    endpoint: "rankings",
+    params: RankingsRequestObject
+  ): Promise<CacheEntry<RankingsResponseObject>>;
+
+  function resolve(
+    endpoint: "season_rankings",
+    params: SeasonRankingsRequestObject
+  ): Promise<CacheEntry<SeasonRankingsResponseObject>>;
+
+  function resolve(
+    endpoint: "awards",
+    params: AwardsRequestObject
+  ): Promise<CacheEntry<AwardsResponseObject>>;
+
+  function resolve(
+    endpoint: "skills",
+    params: SkillsRequestObject
+  ): Promise<CacheEntry<SkillsResponseObject>>;
+
+  function sanitize(endpoint: Endpoint, params: object): object;
+
+  function serialize(url: any, params: object): object;
+
+  function setTTL(ttl: number): object;
+}
+
+/**
+ * CONSTANT
+ */
+export namespace constant {
+  const endpoints: string[];
+
+  const settings: {
+    baseURL: string;
+    cache: {
+      ttl: number;
+    };
+    headers: {};
+    live: {
+      pollTime: number;
+    };
+    params: {};
+  };
+
+  const uniques: {
+    events: string;
+    teams: string;
+  };
+
+  const validParams: {
+    awards: string[];
+    events: string[];
+    matches: string[];
+    rankings: string[];
+    season_rankings: string[];
+    skills: string[];
+    teams: string[];
+  };
+
+  function header(headers: object): void;
+
+  function isBrowser(): boolean;
+
+  function param(params: RequestObject): void;
+}
diff --git a/types/vexdb/tsconfig.json b/types/vexdb/tsconfig.json
new file mode 100644
index 0000000000..b71d12c433
--- /dev/null
+++ b/types/vexdb/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", "vexdb-tests.ts"]
+}
diff --git a/types/vexdb/tslint.json b/types/vexdb/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vexdb/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vexdb/vexdb-tests.ts b/types/vexdb/vexdb-tests.ts
new file mode 100644
index 0000000000..28e2dceb8e
--- /dev/null
+++ b/types/vexdb/vexdb-tests.ts
@@ -0,0 +1,99 @@
+/**
+ * Requests
+ */
+import {
+  get,
+  live,
+  TeamsRequestObject,
+  AwardsRequestObject,
+  EventsRequestObject,
+  RankingsRequestObject,
+  SeasonRankingsRequestObject,
+  SkillsRequestObject,
+  MatchesRequestObject,
+  TeamsResponseObject,
+  AwardsResponseObject,
+  EventsResponseObject,
+  RankingsResponseObject,
+  SeasonRankingsResponseObject,
+  SkillsResponseObject,
+  MatchesResponseObject,
+  size
+} from "vexdb";
+
+get("teams", { number: "3796B" });
+get("awards", { order: 1 });
+get("events", { loc_venue: "J.L. Mann High School" });
+get("matches", { redscore: 23 });
+get("rankings", { wp: 23 });
+get("season_rankings", { vrating: 1 });
+get("skills", { attempts: 1 });
+
+size("teams", { number: "3796B" });
+size("awards", { order: 1 });
+size("events", { loc_venue: "J.L. Mann High School" });
+size("matches", { redscore: 23 });
+size("rankings", { wp: 23 });
+size("season_rankings", { vrating: 1 });
+size("skills", { attempts: 1 });
+
+const teams = live("teams", { number: "3796B" });
+const teams_params: TeamsRequestObject = {};
+const teams_current: TeamsResponseObject[] = teams.current();
+teams.params(teams_params);
+teams.on("fetch", (item: TeamsResponseObject[]) => {});
+teams.on("prefetch", (results: TeamsResponseObject[]) => {});
+teams.on("item", (item: TeamsResponseObject) => {});
+teams.close();
+
+const awards = live("awards", { order: 1 });
+const awards_params: AwardsRequestObject = {};
+const awards_current: AwardsResponseObject[] = awards.current();
+awards.params(awards_params);
+awards.on("fetch", (item: AwardsResponseObject[]) => {});
+awards.on("prefetch", (results: AwardsResponseObject[]) => {});
+awards.on("item", (item: AwardsResponseObject) => {});
+awards.close();
+
+const events = live("events", { loc_venue: "J.L. Mann High School" });
+const events_params: EventsRequestObject = {};
+const events_current: EventsResponseObject[] = events.current();
+events.params(events_params);
+events.on("fetch", (item: EventsResponseObject[]) => {});
+events.close();
+
+const matches = live("matches", { team: "3796B" });
+const matches_params: MatchesRequestObject = {};
+const matches_current: MatchesResponseObject[] = matches.current();
+matches.params(matches_params);
+matches.on("fetch", (item: MatchesResponseObject[]) => {});
+matches.on("prefetch", (results: MatchesResponseObject[]) => {});
+matches.on("item", (item: MatchesResponseObject) => {});
+matches.close();
+
+const skills = live("skills", { rank: 23 });
+const skills_params: SkillsRequestObject = {};
+const skills_current: SkillsResponseObject[] = skills.current();
+skills.params(skills_params);
+skills.on("fetch", (item: SkillsResponseObject[]) => {});
+skills.on("prefetch", (results: SkillsResponseObject[]) => {});
+skills.on("item", (item: SkillsResponseObject) => {});
+skills.close();
+
+const rankings = live("rankings", { team: "3796N" });
+const rankings_params: RankingsRequestObject = {};
+const rankings_current: RankingsResponseObject[] = rankings.current();
+rankings.params(rankings_params);
+rankings.on("fetch", (item: RankingsResponseObject[]) => {});
+rankings.on("prefetch", (results: RankingsResponseObject[]) => {});
+rankings.on("item", (item: RankingsResponseObject) => {});
+rankings.close();
+
+const season_rankings = live("season_rankings", { team: "3796N" });
+const season_rankings_params: SeasonRankingsRequestObject = {};
+const season_rankings_current: SeasonRankingsResponseObject[] = season_rankings.current();
+season_rankings.params(season_rankings_params);
+season_rankings.on("fetch", (item: SeasonRankingsResponseObject[]) => {});
+season_rankings.on("prefetch", (results: SeasonRankingsResponseObject[]) => {});
+season_rankings.on("item", (item: SeasonRankingsResponseObject) => {});
+season_rankings.close();
diff --git a/types/vexflow/index.d.ts b/types/vexflow/index.d.ts
index 714cfe5c0a..c25ac00958 100644
--- a/types/vexflow/index.d.ts
+++ b/types/vexflow/index.d.ts
@@ -1,8 +1,9 @@
-// Type definitions for VexFlow v1.2.84
+// Type definitions for VexFlow v1.2.85
 // Project: http://vexflow.com
 // Definitions by: Roman Quiring <https://github.com/rquiring>
 //                 Sebastian Haas <https://github.com/sebastianhaas>
 //                 Basti Hoffmann <https://github.com/bohoffi>
+//                 Simon Schmid <https://github.com/sschmidTU>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 //inconsistent namespace: this is a helper funtion from tables.js and should not pollute the global namespace!
@@ -553,6 +554,7 @@ declare namespace Vex {
             setYShift(y : number) : Modifier;
             setXShift(x : number) : void; //inconsistent type: void -> Modifier
             draw() : void;
+            alignSubNotesWithNote(subNotes : Note[], note : Note) : void;
         }
 
         namespace Modifier {
@@ -690,6 +692,11 @@ declare namespace Vex {
             draw() : void;
         }
 
+        class NoteSubGroup extends Modifier {
+			constructor(subnotes : Note[]);
+			preFormat() : void;
+        }
+
         class Ornament extends Modifier {
             constructor(type : string);
             static DEBUG : boolean;
@@ -1295,6 +1302,10 @@ declare namespace Vex {
             getWidth() : number;
             getX() : number;
             setX(x : number) : TickContext;
+            getXBase() : number;
+            setXBase(xBase : number) : void;
+            getXOffset() : number;
+            setXOffset(xOffset : number) : void;
             getPixelsUsed() : number;
             setPixelsUsed(pixelsUsed : number) : TickContext;
             setPadding(padding : number) : TickContext;
diff --git a/types/victory/index.d.ts b/types/victory/index.d.ts
index 1ce04d2436..5b245440bd 100644
--- a/types/victory/index.d.ts
+++ b/types/victory/index.d.ts
@@ -1,1683 +1,2082 @@
-// Type definitions for Victory 0.9.2
+// Type definitions for Victory 0.9.3
 // Project: https://github.com/FormidableLabs/victory
 // Definitions by: Alexey Svetliakov <https://github.com/asvetliakov>
 //                 snerks <https://github.com/snerks>
 //                 Krzysztof Cebula <https://github.com/Havret>
+//                 Vitaliy Polyanskiy <https://github.com/alredyExist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react"/>
 
 declare module "victory" {
-    import * as React from "react";
+  import * as React from "react";
+
+  /**
+   * Single animation object to interpolate
+   */
+  export type AnimationStyle = { [key: string ]: string | number };
+
+  /**
+   * Animation styles to interpolate
+   */
+
+  export type AnimationData = AnimationStyle | AnimationStyle[];
+
+  export type AnimationEasing =
+    "back" | "backIn" | "backOut" | "backInOut" | "bounce" | "bounceIn" | "bounceOut" |
+    "bounceInOut" | "circle" | "circleIn" | "circleOut" | "circleInOut" | "linear" |
+    "linearIn" | "linearOut" | "linearInOut" | "cubic" | "cubicIn" | "cubicOut" |
+    "cubicInOut" | "elastic" | "elasticIn" | "elasticOut" | "elasticInOut" | "exp" |
+    "expIn" | "expOut" | "expInOut" | "poly" | "polyIn" | "polyOut" | "polyInOut" |
+    "quad" | "quadIn" | "quadOut" | "quadInOut" | "sin" | "sinIn" | "sinOut" | "sinInOut";
+
+  // Many victory components accept string or number or callback which returns string or number
+  type StringOrNumberOrCallback = string | number | { (): string | number };
+  type NumberOrCallback = { (): number } | number;
+
+  /**
+   * Style interface used in components/themeing
+   */
+  export interface VictoryStyleInterface {
+    parent?: React.CSSProperties;
+    data?: React.CSSProperties;
+    labels?: React.CSSProperties;
+    tickLabels?: React.CSSProperties;
+  }
+
+  export interface VictoryAnimationProps {
     /**
-     * Single animation object to interpolate
+     * The child of should be a function that takes an object of tweened values and returns a component to render.
+     * @param style
      */
-    export type AnimationStyle = { [key: string ]: string | number };
+    children?: (style: AnimationStyle) => React.ReactElement<any>;
     /**
-     * Animation styles to interpolate
+     * The number of milliseconds the animation should take to complete.
+     * @default 1000
      */
-    export type AnimationData = AnimationStyle | AnimationStyle[];
-    export type AnimationEasing =
-        "back" | "backIn" | "backOut" | "backInOut" | "bounce" | "bounceIn" | "bounceOut" |
-            "bounceInOut" | "circle" | "circleIn" | "circleOut" | "circleInOut" | "linear" |
-            "linearIn" | "linearOut" | "linearInOut" | "cubic" | "cubicIn" | "cubicOut" |
-            "cubicInOut" | "elastic" | "elasticIn" | "elasticOut" | "elasticInOut" | "exp" |
-            "expIn" | "expOut" | "expInOut" | "poly" | "polyIn" | "polyOut" | "polyInOut" |
-            "quad" | "quadIn" | "quadOut" | "quadInOut" | "sin" | "sinIn" | "sinOut" | "sinInOut";
-
-    // Many victory components accept string or number or callback which returns string or number
-    type StringOrNumberOrCallback = string | number | { (): string | number };
-
+    duration?: number;
     /**
-     * Style interface used in components/themeing
+     * The easing prop specifies an easing function name to use for tweening.
+     * @default "quadInOut"
      */
-    export interface VictoryStyleInterface {
-        parent?: React.CSSProperties;
-        data?: React.CSSProperties;
-        labels?: React.CSSProperties;
-        tickLabels?: React.CSSProperties;
-    }
-
-    export interface VictoryAnimationProps {
-        /**
-         * The child of should be a function that takes an object of tweened values and returns a component to render.
-         * @param style
-         */
-        children?: (style: AnimationStyle) => React.ReactElement<any>;
-        /**
-         * The number of milliseconds the animation should take to complete.
-         * @default 1000
-         */
-        duration?: number;
-        /**
-         * The easing prop specifies an easing function name to use for tweening.
-         * @default "quadInOut"
-         */
-        easing?: AnimationEasing;
-        /**
-         * The delay prop specifies a delay in milliseconds before the animation begins.
-         * If multiple values are in the animation queue, it is the delay between each animation.
-         * @default 0
-         */
-        delay?: number;
-        /**
-         * The onEnd prop specifies a function to run when the animation ends. If multiple animations are in the queue, it is called after the last animation.
-         */
-        onEnd?: () => void;
-        /**
-         * The data prop specifies the latest set of values to tween to.
-         * When this prop changes, VictoryAnimation will begin animating from the current value to the new value.
-         * When given an array of values, VictoryAnimation will use it as an animation queue.
-         * @default {}
-         */
-        data?: AnimationData;
-    }
-
+    easing?: AnimationEasing;
     /**
-     * VictoryAnimation animates prop changes for any React component.
-     * Just use a child function inside VictoryAnimation that accepts an object of tweened values and returns a component to render.
+     * The delay prop specifies a delay in milliseconds before the animation begins.
+     * If multiple values are in the animation queue, it is the delay between each animation.
+     * @default 0
      */
-    export class VictoryAnimation extends React.Component<VictoryAnimationProps, any> {}
-
+    delay?: number;
     /**
-     * Text anchor type
+     * The onEnd prop specifies a function to run when the animation ends. If multiple animations are in the queue, it is called after the last animation.
      */
-    type TextAnchorType = "start" | "middle" | "end" | "inherit";
+    onEnd?: () => void;
     /**
-     * Vertical anchor type
+     * The data prop specifies the latest set of values to tween to.
+     * When this prop changes, VictoryAnimation will begin animating from the current value to the new value.
+     * When given an array of values, VictoryAnimation will use it as an animation queue.
+     * @default {}
      */
-    type VerticalAnchorType = "start" | "middle" | "end";
+    data?: AnimationData;
+  }
 
-    export interface VictoryLabelProps {
-        /**
-         * Specifies the angle to rotate the text by.
-         */
-        angle?: string | number;
-        /**
-         * The capHeight prop defines a text metric for the font being used: the expected height of capital letters.
-         * This is necessary because of SVG, which (a) positions the *bottom* of the text at `y`, and (b) has no notion of line height.
-         * The value should ideally use the same units as `lineHeight` and `dy`, preferably ems. If given a unitless number, it is assumed to be ems.
-         * @default "0.71em"
-         */
-        capHeight?: StringOrNumberOrCallback;
-        /**
-         * Victory components can pass a datum prop to their label component. This can be used to calculate functional styles, and determine child text
-         */
-        datum?: {};
-        /**
-         * Labels that apply to an entire data series will recieve the entire series as `data` instead of an individual datum prop.
-         */
-        data?: any[];
-        /**
-         * The events prop attaches arbitrary event handlers to the label component.
-         * Event handlers are currently only called with their corresponding events.
-         */
-        events?: React.DOMAttributes<any>;
-        /**
-         * All Victory components will pass a text prop to their label component.
-         * This defines the content of the label when child nodes are absent. It will be ignored if children are provided.
-         */
-        text?: StringOrNumberOrCallback;
-        /**
-         * The children of this component define the content of the label.
-         * This makes using the component similar to normal HTML spans or labels. strings, numbers, and functions of data / value are supported.
-         */
-        children?: StringOrNumberOrCallback;
-        /**
-         * The lineHeight prop defines how much space a single line of text should take up.
-         * Note that SVG has no notion of line-height, so the positioning may differ slightly from what you would expect with CSS,
-         * but the result is similar: a roughly equal amount of extra space is distributed above and below the line of text.
-         * The value should ideally use the same units as `capHeight` and `dy`, preferably ems.
-         * If given a unitless number, it is assumed to be ems.
-         * @default 1
-         */
-        lineHeight?: StringOrNumberOrCallback;
-        /**
-         * The style prop applies CSS properties to the rendered `<text>` element.
-         */
-        style?: React.CSSProperties;
-        /**
-         * The textAnchor prop defines how the text is horizontally positioned relative to the given `x` and `y` coordinates.
-         */
-        textAnchor?: TextAnchorType | { (): TextAnchorType };
-        /**
-         * The verticalAnchor prop defines how the text is vertically positioned relative to the given `x` and `y` coordinates.
-         */
-        verticalAnchor?: VerticalAnchorType | { (): VerticalAnchorType };
-        /**
-         * The transform prop applies a transform to the rendered `<text>` element.
-         * In addition to being a string, it can be an object containing transform definitions for easier authoring.
-         */
-        transform?: string | {} | { (): string | {} };
-        /**
-         * The x prop defines the x coordinate to use as a basis for horizontal positioning.
-         */
-        x?: number;
-        /**
-         * The y prop defines the y coordinate to use as a basis for vertical positioning.
-         */
-        y?: number;
-        /**
-         * The dx prop defines a horizontal shift from the `x` coordinate.
-         */
-        dx?: StringOrNumberOrCallback;
-        /**
-         * The dy prop defines a vertical shift from the `y` coordinate.
-         * Since this component already accounts for `capHeight`, `lineHeight`, and `verticalAnchor`, this will usually not be necessary.
-         */
-        dy?: StringOrNumberOrCallback;
-    }
+  /**
+   * VictoryAnimation animates prop changes for any React component.
+   * Just use a child function inside VictoryAnimation that accepts an object of tweened values and returns a component to render.
+   */
+  export class VictoryAnimation extends React.Component<VictoryAnimationProps, any> {}
 
+  /**
+   * Text anchor type
+   */
+  type TextAnchorType = "start" | "middle" | "end" | "inherit";
+
+  /**
+   * Vertical anchor type
+   */
+  type VerticalAnchorType = "start" | "middle" | "end";
+
+  export interface VictoryLabelProps {
     /**
-     * VictoryLabel is a text component that provides several enhancements over SVG’s <text> element.
+     * Specifies the angle to rotate the text by.
      */
-    export class VictoryLabel extends React.Component<VictoryLabelProps, any> {}
-
-    export interface VictoryContainerProps {
-        /**
-         * The style prop specifies styles for your VictoryContainer. Any valid inline style properties
-         * will be applied. Height and width should be specified via the height
-         * and width props, as they are used to calculate the alignment of
-         * components within the container. Styles from the child component will
-         * also be passed, if any exist.
-         * @examples {border: 1px solid red}
-         */
-        style?: React.CSSProperties;
-        /**
-         * The height props specifies the height the svg viewBox of the container.
-         * This value should be given as a number of pixels. If no height prop
-         * is given, the height prop from the child component passed will be used.
-         */
-        height?: number;
-        /**
-         * The width props specifies the width of the svg viewBox of the container
-         * This value should be given as a number of pixels. If no width prop
-         * is given, the width prop from the child component passed will be used.
-         */
-        width?: number;
-        /**
-         * The events prop attaches arbitrary event handlers to the container component.
-         * Event handlers passed from other Victory components are called with their
-         * corresponding events as well as scale, style, width, height, and data when
-         * applicable. Use the invert method to convert event coordinate information to
-         * data. `scale.x.invert(evt.offsetX)`.
-         * @examples {{ onClick: (evt) => alert(`x: ${evt.clientX}, y: ${evt.clientY}`)}}
-         */
-        events?: React.DOMAttributes<any>;
-        /**
-         * The title prop specifies the title to be applied to the SVG to assist
-         * accessibility for screen readers. The more descriptive this title is, the more
-         * useful it will be. If no title prop is passed, it will default to Victory Chart.
-         * @example "Popularity of Dog Breeds by Percentage"
-         * @default "Victory Chart"
-         */
-        title?: string;
-        /**
-         * The desc prop specifies the description of the chart/SVG to assist with
-         * accessibility for screen readers. The more info about the chart provided in
-         * the description, the more usable it will be for people using screen readers.
-         * This prop defaults to an empty string.
-         * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
-         * not represented above 5% each."
-         * @default ""
-         */
-        desc?: string;
-    }
-    export class VictoryContainer extends React.Component<VictoryContainerProps, any> {}
-
-    // Note: Many SVG attributes are missed in CSSProperties interface
-    export interface VictoryThemeDefinition {
-        area?: VictoryStyleInterface;
-        axis?: {
-            axis: React.CSSProperties;
-            axisLabel: React.CSSProperties;
-            grid: React.CSSProperties;
-            ticks: React.CSSProperties;
-            tickLabels: React.CSSProperties;
-        };
-        bar?: VictoryStyleInterface;
-        candlestick?: VictoryStyleInterface & {
-            props: {
-                width: number;
-                height: number;
-                candleColors: {
-                    positive: string;
-                    negative: string;
-                };
-            };
-        };
-        line?: VictoryStyleInterface;
-        pie?: {
-            props: {
-                width: number;
-                height: number;
-                colorScale: string[];
-            };
-            style: VictoryStyleInterface;
-        };
-        scatter?: VictoryStyleInterface;
-        props?: {
-            width: number;
-            height: number;
-            colorScale: string[];
-        };
-    }
-
-    interface VictoryThemeInterface {
-        /**
-         * Default theme
-         */
-        material: VictoryThemeDefinition;
-    }
+    angle?: string | number;
     /**
-     * Available themes
+     * The capHeight prop defines a text metric for the font being used: the expected height of capital letters.
+     * This is necessary because of SVG, which (a) positions the *bottom* of the text at `y`, and (b) has no notion of line height.
+     * The value should ideally use the same units as `lineHeight` and `dy`, preferably ems. If given a unitless number, it is assumed to be ems.
+     * @default "0.71em"
      */
-    export const VictoryTheme: VictoryThemeInterface;
-
+    capHeight?: StringOrNumberOrCallback;
     /**
-     * Animate object used in components
+     * Victory components can pass a datum prop to their label component. This can be used to calculate functional styles, and determine child text
      */
-    export interface AnimatePropTypeInterface {
-        /**
-         * Animation duration
-         */
-        duration: number;
-        /**
-         * Animation end callback
-         */
-        onEnd?: () => void;
-        /**
-         * Animation exit transition configuration
-         */
-        onExit?: {
-            duration?: number;
-            before?: (datum: any) => AnimationStyle;
-        };
-        /**
-         * Animation enter transition configuration
-         */
-        onEnter?: {
-            duration?: number;
-            before?: (datum: any) => AnimationStyle;
-            after?: (datum: any) => AnimationStyle;
-        };
-        /**
-         * Animation load transition configuration
-         */
-        onLoad?: {
-            duration?: number;
-            before?: (datum: any) => AnimationStyle;
-            after?: (datum: any) => AnimationStyle;
-        };
-        /**
-         * The easing prop specifies an easing function name to use for tweening.
-         * @default "quadInOut"
-         */
-        easing?: AnimationEasing;
-    }
-
+    datum?: {};
     /**
-     * Return value for eventHandlers values
+     * Labels that apply to an entire data series will recieve the entire series as `data` instead of an individual datum prop.
      */
-    interface EventCallbackInterface<TTarget, TEventKey> {
-        /**
-         * Use only in:
-         * - VictoryChart
-         * - VictoryStack
-         */
-        childName?: string;
-        target?: TTarget;
-        eventKey?: TEventKey;
-        /**
-         * Will be called with the calculated props for the individual selected element and result will override
-         * props of selected element via object assignment
-         * @param props
-         */
-        mutation: (props: any) => any;
-    }
-
-    export interface EventPropTypeInterface<TTarget, TEventKey> {
-        /**
-         * Use only in:
-         * - VictoryChart
-         * - VictoryStack
-         */
-        childName?: string;
-        /**
-         * Targets may be any valid style namespace for a given component
-         */
-        target: TTarget;
-        /**
-         *
-         */
-        eventKey?: TEventKey;
-        /**
-         * Event handlers map. Keys are standard event names (such as onClick) and values are event callbacks
-         */
-        eventHandlers: {
-            [key: string]: {
-                (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey> } |
-                { (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey>[]
-            }
-        };
-    }
-
+    data?: any[];
     /**
-     * Data domain type
+     * The events prop attaches arbitrary event handlers to the label component.
+     * Event handlers are currently only called with their corresponding events.
      */
-    type DomainTuple = [number, number] | [Date, Date];
-    type DomainPropType = DomainTuple | { x?: DomainTuple; y: DomainTuple; } | { x: DomainTuple; y?: DomainTuple; };
+    events?: React.DOMAttributes<any>;
     /**
-     * Domain padding
+     * All Victory components will pass a text prop to their label component.
+     * This defines the content of the label when child nodes are absent. It will be ignored if children are provided.
      */
-    type DomainPaddingPropType = number | {
-        x?: number;
-        y?: number;
+    text?: StringOrNumberOrCallback;
+    /**
+     * The children of this component define the content of the label.
+     * This makes using the component similar to normal HTML spans or labels. strings, numbers, and functions of data / value are supported.
+     */
+    children?: StringOrNumberOrCallback;
+    /**
+     * The lineHeight prop defines how much space a single line of text should take up.
+     * Note that SVG has no notion of line-height, so the positioning may differ slightly from what you would expect with CSS,
+     * but the result is similar: a roughly equal amount of extra space is distributed above and below the line of text.
+     * The value should ideally use the same units as `capHeight` and `dy`, preferably ems.
+     * If given a unitless number, it is assumed to be ems.
+     * @default 1
+     */
+    lineHeight?: StringOrNumberOrCallback;
+    /**
+     * The style prop applies CSS properties to the rendered `<text>` element.
+     */
+    style?: React.CSSProperties;
+    /**
+     * The textAnchor prop defines how the text is horizontally positioned relative to the given `x` and `y` coordinates.
+     */
+    textAnchor?: TextAnchorType | { (): TextAnchorType };
+    /**
+     * The verticalAnchor prop defines how the text is vertically positioned relative to the given `x` and `y` coordinates.
+     */
+    verticalAnchor?: VerticalAnchorType | { (): VerticalAnchorType };
+    /**
+     * The transform prop applies a transform to the rendered `<text>` element.
+     * In addition to being a string, it can be an object containing transform definitions for easier authoring.
+     */
+    transform?: string | {} | { (): string | {} };
+    /**
+     * The x prop defines the x coordinate to use as a basis for horizontal positioning.
+     */
+    x?: number;
+    /**
+     * The y prop defines the y coordinate to use as a basis for vertical positioning.
+     */
+    y?: number;
+    /**
+     * The dx prop defines a horizontal shift from the `x` coordinate.
+     */
+    dx?: StringOrNumberOrCallback;
+    /**
+     * The dy prop defines a vertical shift from the `y` coordinate.
+     * Since this component already accounts for `capHeight`, `lineHeight`, and `verticalAnchor`, this will usually not be necessary.
+     */
+    dy?: StringOrNumberOrCallback;
+  }
+
+  /**
+   * VictoryLabel is a text component that provides several enhancements over SVG’s <text> element.
+   */
+  export class VictoryLabel extends React.Component<VictoryLabelProps, any> {}
+
+  export interface VictoryContainerProps {
+    /**
+     * The responsive prop specifies whether the rendered container should be a responsive container
+     * with a viewBox attribute, or a static container with absolute width and height.
+     * @default true
+     */
+    responsive?: boolean
+    /**
+     * The style prop specifies styles for your VictoryContainer. Any valid inline style properties
+     * will be applied. Height and width should be specified via the height
+     * and width props, as they are used to calculate the alignment of
+     * components within the container. Styles from the child component will
+     * also be passed, if any exist.
+     * @examples {border: 1px solid red}
+     */
+    style?: React.CSSProperties;
+    /**
+     * The height props specifies the height the svg viewBox of the container.
+     * This value should be given as a number of pixels. If no height prop
+     * is given, the height prop from the child component passed will be used.
+     */
+    height?: number;
+    /**
+     * The width props specifies the width of the svg viewBox of the container
+     * This value should be given as a number of pixels. If no width prop
+     * is given, the width prop from the child component passed will be used.
+     */
+    width?: number;
+    /**
+     * The events prop attaches arbitrary event handlers to the container component.
+     * Event handlers passed from other Victory components are called with their
+     * corresponding events as well as scale, style, width, height, and data when
+     * applicable. Use the invert method to convert event coordinate information to
+     * data. `scale.x.invert(evt.offsetX)`.
+     * @examples {{ onClick: (evt) => alert(`x: ${evt.clientX}, y: ${evt.clientY}`)}}
+     */
+    events?: React.DOMAttributes<any>;
+    /**
+     * The title prop specifies the title to be applied to the SVG to assist
+     * accessibility for screen readers. The more descriptive this title is, the more
+     * useful it will be. If no title prop is passed, it will default to Victory Chart.
+     * @example "Popularity of Dog Breeds by Percentage"
+     * @default "Victory Chart"
+     */
+    title?: string;
+    /**
+     * The desc prop specifies the description of the chart/SVG to assist with
+     * accessibility for screen readers. The more info about the chart provided in
+     * the description, the more usable it will be for people using screen readers.
+     * This prop defaults to an empty string.
+     * @example "Golden retreivers make up 30%, Labs make up 25%, and other dog breeds are
+     * not represented above 5% each."
+     * @default ""
+     */
+    desc?: string;
+  }
+
+  export class VictoryContainer extends React.Component<VictoryContainerProps, any> {}
+
+  type CursorData = {
+    x: number;
+    y: number;
+  }
+
+  export interface VictoryCursorContainerProps extends VictoryContainerProps {
+    /**
+     * The cursorComponent prop takes a component instance which will be used to render a cursor element.
+     * The new element created will be supplied with x1, y1, x2 and y2 positioning props.
+     * If a cursorComponent is not supplied, a new Line component will be rendered.
+     * @default cursorComponent={<Line/>}
+     */
+    cursorComponent?: React.ReactElement<any>;
+    /**
+     * When the cursorDimension prop is set, the cursor will be a line to inspect the given dimension (either "x" or "y").
+     * When this prop is not specified, the cursor will be a 2-dimensional crosshair.
+     * For example, if you would like to inspect the time of time-series data, set dimension={"x"};
+     * the cursor will then be a vertical line that will inspect the time value of the current mouse position.
+     * @example cursorDimension="x"
+     */
+    cursorDimension?: 'x' | 'y';
+    /**
+     * The cursorLabel prop defines the label that will appear next to the cursor.
+     * A label will only appear if cursorLabel is set. This prop should be given as a
+     * function of a point (an Object with x and y properties).
+     * @example cursorLabel={(point) => point.x}
+     */
+    cursorLabel?: (point: CursorData) => void;
+    /**
+     * The cursorLabelComponent prop takes a component instance which will be 
+     * used to render a label for the cursor. The new element created from the passed 
+     * cursorLabelComponent will be supplied with the following props: x, y,
+     * active, text. If cursorLabelComponent is omitted, a new VictoryLabel will be created with the props described above.
+     * @default cursorLabelComponent={<VictoryLabel/>}
+     */
+    cursorLabelComponent?: React.ReactElement<any>;
+    /**
+     * The cursorLabelOffset prop determines the pixel offset of the cursor label 
+     * from the cursor point. This prop should be an Object with x and y properties, or a 
+     * number to be used for both dimensions.
+     * @default "{ x: 5, y: -10 }"
+     */
+    cursorLabelOffset?: number | CursorData;
+    /**
+     * Whenever the mouse is not over the chart, the cursor will not be displayed.
+     * If instead you would like to keep it displayed, use the defaultCursorValue prop to set the default value.
+     * The prop should be a point (an Object with x and y properties) for 2-dimensional cursors, or a number for 1-dimensional cursors.
+     * @example defaultCursorValue={{x: 1, y: 1}}, defaultCursorValue={0}}
+     */
+    defaultCursorValue?: number | CursorData;
+    /**
+     * When the disable prop is set to true, VictoryCursorContainer events will not fire.
+     */
+    disable?: boolean
+    /**
+     * When the cursorDimension prop is set, the cursor will be a line to inspect the given dimension (either "x" or "y").
+     * When this prop is not specified, the cursor will be a 2-dimensional crosshair.
+     * For example, if you would like to inspect the time of time-series data, set dimension={"x"};
+     * the cursor will then be a vertical line that will inspect the time value of the current mouse position.
+     * @example onChange={(value, props) => this.setState({cursorValue: value})}
+     */
+    onCursorChange?: (value: CursorData, props: VictoryCursorContainerProps) => void
+  }
+
+  export class VictoryCursorContainer extends React.Component<VictoryCursorContainerProps, any> {}
+
+  export interface VictoryBrushContainerProps extends VictoryContainerProps {
+    /**
+     * The optional allowDrag prop accepts a boolean that enables dragging behavior
+     * for the highlighted brush area. Resizing will still be enabled when the allowDrag
+     * prop is set to false.
+     * @default true
+     */
+    allowDrag?: boolean;
+    /**
+     * The optional allowResize prop accepts a boolean that enables resizing the 
+     * highlighted brush area. Dragging will still be enabled when the allowResize
+     * prop is set to false, but the dimensions of the brush area will be fixed.
+     * @default true
+     */
+    allowResize?: boolean;
+    /**
+     * The brushComponent prop specifies the component to be rendered for the 
+     * highlighted area. This component will be supplied with the following props: x, y, 
+     * width, height, and style. When this prop is not specified, a <rect/> will be rendered.
+     * @default brushComponent={<rect/>}
+     */
+    brushComponent?: React.ReactElement<any>;
+    /**
+     * When the brushDimension prop is set, brushing will only be specific to the to 
+     * the given dimension (either "x" or "y"), and the entire domain of the other 
+     * dimension will be highlighted. When this prop is not specified, highlighting will
+     * occur along both dimensions.
+     * @example brushDimension="x"
+     */
+    brushDimension?: 'x' | 'y';
+    /**
+     * The optional brushDomain prop describes the highlighted state. This prop is an 
+     * object that specifies separate arrays for x and y. Each array is a tuple that 
+     * describes the minimum and maximum values to render. If this prop is not provided 
+     * initially, the chart will render with the entire domain highlighted. When this prop 
+     * changes, the chart will render with a new highlighted domain.
+     * @example brushDomain={{ x: [50, 100], y: [0, 100] }}
+     */
+    brushDomain?: DomainPropType;
+    /**
+     * The brushStyle adds custom styles to the brushComponent. This prop 
+     * should be given as an object of SVG style attributes.
+     * @default "brushStyle={{ stroke: "transparent", fill: "black", fillOpacity: 0.1 }}"
+     */
+    brushStyle?: React.CSSProperties;
+    /**
+     * The defaultBrushArea prop specifies how the container will behave when a 
+     * region outside the active brush is clicked without selecting a new area. When the 
+     * prop is set to "all", the entire domain will be selected. When the prop is set to "none",
+     * no new region will be selected, and any existing active brush will be cleared. When
+     * the prop is set to "disable" the new selected region will default to the current active brush.
+     */
+    defaultBrushArea?: 'all' | 'none' | 'disable';
+    /**
+     * When the disable prop is set to true, VictoryBrushContainer events will not fire.
+     */
+    disable?: boolean;
+    /**
+     * The handleComponent prop specifies the component to be rendered for each 
+     * handle for the highlighted area. This component will be supplied with the following 
+     * props: x, y, width, height, cursor, and style. When this prop is not
+     * specified, a <rect/> will be rendered.
+     * @default handleComponent={<rect/>}
+     */
+    handleComponent?: React.ReactElement<any>;
+    /**
+     * The handleStyle adds custom styles to the handleComponents. This prop should be given as an object of SVG style attributes.
+     * 
+     * Handles refer to the region on each highlighted area where the area may be
+     * expanded. Only handles relevant to the given dimension will be rendered. For
+     * example, when brushDimension="x" only "left" and "right" handles will be
+     * rendered. Handles are automatically styled with cursors appropriate to their orientation.
+     * @default "handleStyle={{ stroke: 'transparent', fill: 'transparent' }}"
+     */
+    handleStyle?: React.CSSProperties;
+    /**
+     * The optional onBrushDomainChange prop accepts an function to be called on 
+     * each update to the highlighted domain. The function accepts the parameters of 
+     * domain (the updated domain), and props (the props used by VictoryBrushContainer).
+     * @example onBrushDomainChange={(domain, props) => handleDomainChange(domain, props)}
+     */
+    onBrushDomainChange?: (domain: DomainPropType, props: VictoryBrushContainerProps) => void;
+  }
+
+  export class VictoryBrushContainer extends React.Component<VictoryBrushContainerProps, any> {}
+
+  export interface VictoryZoomContainerProps extends VictoryContainerProps {
+    /**
+     * The optional allowPan prop accepts a boolean that enables the panning 
+     * functionality. Zooming will still be enabled when the allowPan prop is set to false.
+     * @default true
+     */
+    allowPan?: boolean;
+    /**
+     * The optional allowZoom prop accepts a boolean that enables the zoom
+     * functionality. Panning will still be enabled when the allowZoom prop is set to false.
+     * @default true
+     */
+    allowZoom?: boolean;
+    /**
+     * VictoryZoomContainer works by clipping data outside of a given domain. 
+     * VictoryZoomContainer uses VictoryClipContainer by default.
+     * This prop should not be replaced with a custom component, but you may want to set
+     * props on VictoryClipContainer, such as clipPadding.
+     * @example clipContainerComponent={<VictoryClipContainer clipPadding={{top: 10, right: 10}}}/>}
+     */
+    clipContainerComponent?: React.ReactElement<any>;
+    /**
+     * When the zoomDimension prop is set, panning and zooming will be restricted to 
+     * the given dimension (either x or y), and the domain of the other dimension will 
+     * remain static. When this prop is not specified, both x and y dimensions will pan and zoom.
+     * @example zoomDimension="x"
+     */
+    zoomDimension?: 'x' | 'y';
+    /**
+     * The zoomDomain prop describes the zoomed state. This prop is an object that 
+     * specifies separate arrays for x and y. Each array is a tuple that describes the 
+     * minimum and maximum values to render. If this prop is not provided initially, the 
+     * chart will render without an initial zoom, displaying the entire dataset. Updates to 
+     * zoomDomain will trigger a re-render of the chart with the new domain.
+     * @example zoomDomain={{x: [0, 100]}}
+     */
+    zoomDomain?: DomainPropType;
+    /**
+     * The brushStyle adds custom styles to the brushComponent. This prop 
+     * should be given as an object of SVG style attributes.
+     * @default "brushStyle={{ stroke: 'transparent', fill: 'black', fillOpacity: 0.1 }}"
+     */
+    brushStyle?: React.CSSProperties;
+    /**
+     * The defaultBrushArea prop specifies how the container will behave when a 
+     * region outside the active brush is clicked without selecting a new area. When the 
+     * prop is set to "all", the entire domain will be selected. When the prop is set to "none",
+     * no new region will be selected, and any existing active brush will be cleared. When
+     * the prop is set to "disable" the new selected region will default to the current active brush.
+     */
+    defaultBrushArea?: 'all' | 'none' | 'disable';
+    /**
+     * When the disable prop is set to true, VictoryBrushContainer events will not fire.
+     */
+    disable?: boolean;
+    /**
+     * When the disable prop is set to true, VictoryZoomContainer events will not fire.
+     */
+    downsample?: number | boolean;
+    /**
+     * The minimumZoom prop sets a minimum domain extent for the zoomed chart. 
+     * When the difference between the maximum and minimum of a zoomed domain is equal to the minimumZoom
+     * in either dimension, the component will stop responding to events that would normally trigger zooming in.
+     * Zooming out and panning will still be enabled. When this prop is not specified, the default minimum 
+     * zoom will cover 1 / 1000th of the original domain. This prop should be given as an object
+     * with numeric values for x and y.
+     * @example minimumZoom={{x: 1, y: 0.01}}
+     */
+    minimumZoom?: CursorData;
+    /**
+     * The optional onZoomDomainChange prop accepts an function to be called on each update to the visible domain.
+     * The function accepts the parameters domain (the updated domain) and props (the props used by VictoryZoomContainer).
+     * @example onZoomDomainChange={(domain, props) => handleDomainChange(domain, props)}
+     */
+    onZoomDomainChange?: (domain: DomainPropType, props: VictoryZoomContainerProps) => void;
+  }
+
+  export class VictoryZoomContainer extends React.Component<VictoryZoomContainerProps, any> {}
+
+  // Note: Many SVG attributes are missed in CSSProperties interface
+  export interface VictoryThemeDefinition {
+    area?: VictoryStyleInterface;
+    axis?: {
+      axis: React.CSSProperties;
+      axisLabel: React.CSSProperties;
+      grid: React.CSSProperties;
+      ticks: React.CSSProperties;
+      tickLabels: React.CSSProperties;
     };
-
-    /**
-     * D3 scale function shape. Don't want to introduce typing dependency to d3
-     */
-    interface D3Scale {
-        domain: () => any;
-        range: () => any;
-        copy: () => any;
-    }
-    /**
-     * Acceptable scale types
-     */
-    type ScalePropType = "linear" | "time" | "log" | "sqrt";
-
-    /**
-     * Category prop type
-     */
-    type CategoryPropType = string[] | {
-        x: string[]
-        y: string[]
+    bar?: VictoryStyleInterface;
+    candlestick?: VictoryStyleInterface & {
+      props: {
+        width: number;
+        height: number;
+        candleColors: {
+          positive: string;
+          negative: string;
+        };
+      };
     };
+    line?: VictoryStyleInterface;
+    pie?: {
+      props: {
+        width: number;
+        height: number;
+        colorScale: string[];
+      };
+      style: VictoryStyleInterface;
+    };
+    scatter?: VictoryStyleInterface;
+    props?: {
+      width: number;
+      height: number;
+      colorScale: string[];
+    };
+  }
 
+  interface VictoryThemeInterface {
     /**
-     * Data getter property type
+     * Default theme
      */
-    type DataGetterPropType = number | string | string[] | { (data: any): number | string | string[] };
+    material: VictoryThemeDefinition;
+  }
 
-    type InterpolationPropType = "basis" | "basisClosed" | "basisOpen" | "bundle" |
-        "cardinal" | "cardinalClosed" | "cardinalOpen" |
-        "catmullRom" | "catmullRomClosed" | "catmullRomOpen" |
-        "linear" | "linearClosed" | "monotoneX" | "monotoneY" |
-        "natural" | "radial" | "step" | "stepAfter" | "stepBefore";
+  /**
+   * Available themes
+   */
+  export const VictoryTheme: VictoryThemeInterface;
 
-    type ColorScalePropType = "greyscale" | "qualitative" | "heatmap" | "warm" | "cool" | "red" | "green" | "blue" | string[];
+  type OrientationTypes = "top" | "bottom" | "left" | "right";
+
+  export interface VictoryTooltipProps {
     /**
-     * Common properties
+     * The active prop specifies whether the tooltip component should be displayed.
      */
-    interface VictoryCommonProps {
-        /**
-         * The animate prop specifies props for VictoryAnimation to use.
-         * The animate prop should also be used to specify enter and exit
-         * transition configurations with the `onExit` and `onEnter` namespaces respectively.
-         * @example
-         * {duration: 500, onExit: () => {}, onEnter: {duration: 500, before: () => ({y: 0})})}
-         */
-        animate?: AnimatePropTypeInterface;
-        /**
-         * The name prop is used to reference a component instance when defining shared events.
-         */
-        name?: string;
-        /**
-         * The height props specifies the height the svg viewBox of the chart container.
-         * This value should be given as a number of pixels
-         */
-        height?: number;
-        /**
-         * The padding props specifies the amount of padding in number of pixels between
-         * the edge of the chart and any rendered child components. This prop can be given
-         * as a number or as an object with padding specified for top, bottom, left
-         * and right.
-         * @default 50
-         */
-        padding?: number | {
-            top?: number;
-            bottom?: number;
-            left?: number;
-            right?: number;
-        };
-        /**
-         * The scale prop determines which scales your chart should use. This prop can be
-         * given as a string specifying a supported scale ("linear", "time", "log", "sqrt"),
-         * as a d3 scale function, or as an object with scales specified for x and y
-         * @example d3Scale.time(), {x: "linear", y: "log"}
-         * @default "linear"
-         */
-        scale?: ScalePropType | D3Scale | {
-            x?: ScalePropType | D3Scale;
-            y?: ScalePropType | D3Scale;
-        };
-        /**
-         * The standalone prop determines whether the component will render a standalone svg
-         * or a <g> tag that will be included in an external svg. Set standalone to false to
-         * compose VictoryAxis with other components within an enclosing <svg> tag.
-         * @default true
-         */
-        standalone?: boolean;
-        /**
-         * The width props specifies the width of the svg viewBox of the chart container
-         * This value should be given as a number of pixels
-         */
-        width?: number;
-        /**
-         * The containerComponent prop takes an entire component which will be used to
-         * create a container element for standalone charts.
-         * The new element created from the passed containerComponent wil be provided with
-         * these props from VictoryArea: height, width, children
-         * (the chart itself) and style. Props that are not provided by the
-         * child chart component include title and desc, both of which
-         * are intended to add accessibility to Victory components. The more descriptive these props
-         * are, the more accessible your data will be for people using screen readers.
-         * Any of these props may be overridden by passing in props to the supplied component,
-         * or modified or ignored within the custom component itself. If a dataComponent is
-         * not provided, VictoryArea will use the default VictoryContainer component.
-         * @example <VictoryContainer title="Chart of Dog Breeds" desc="This chart shows how popular each dog breed is by percentage in Seattle." />
-         * @default <VictoryContainer/>
-         */
-        containerComponent?: React.ReactElement<any>;
-        /**
-         * The theme prop takes a style object with nested data, labels, and parent objects.
-         * You can create this object yourself, or you can use a theme provided by Victory.
-         * When using VictoryArea as a solo component, implement the theme directly on
-         * VictoryArea. If you are wrapping VictoryArea in VictoryChart, VictoryStack, or
-         * VictoryGroup, please call the theme on the outermost wrapper component instead.
-         * @example theme={VictoryTheme.material}
-         * http://www.github.com/FormidableLabs/victory-core/tree/master/src/victory-theme/material.js
-         */
-        theme?: VictoryThemeDefinition;
-        /**
-         * The groupComponent prop takes an entire component which will be used to
-         * create group elements for use within container elements. This prop defaults
-         * to a <g> tag on web, and a react-native-svg <G> tag on mobile
-         * @default <g/>
-         */
-        groupComponent?: React.ReactElement<any>;
-    }
-
+    active?: boolean;
     /**
-     * Common properties for all data components
+     * When true, tooltip events will set the active prop on both data and label elements.
+     * @default false
      */
-    interface VictoryDatableProps {
-        /**
-         * The categories prop specifies how categorical data for a chart should be ordered.
-         * This prop should be given as an array of string values, or an object with
-         * these arrays of values specified for x and y. If this prop is not set,
-         * categorical data will be plotted in the order it was given in the data array
-         * @example ["dogs", "cats", "mice"]
-         */
-        categories?: CategoryPropType;
-        /**
-         * The data prop specifies the data to be plotted. Data should be in the form of an array
-         * of data points, or an array of arrays of data points for multiple datasets.
-         * Each data point may be any format you wish (depending on the `x` and `y` accessor props),
-         * but by default, an object with x and y properties is expected.
-         * @example [{x: 1, y: 2}, {x: 2, y: 3}], [[1, 2], [2, 3]],
-         * [[{x: "a", y: 1}, {x: "b", y: 2}], [{x: "a", y: 2}, {x: "b", y: 3}]]
-         */
-        data?: any[];
-        /**
-         * The dataComponent prop takes an entire component which will be used to create an area.
-         * The new element created from the passed dataComponent will be provided with the
-         * following properties calculated by VictoryArea: a scale, style, events, interpolation,
-         * and an array of modified data objects (including x, y, and calculated y0 and y1).
-         * Any of these props may be overridden by passing in props to the supplied component,
-         * or modified or ignored within the custom component itself. If a dataComponent is
-         * not provided, VictoryArea will use its default Area component.
-         * @default <Area/>
-         */
-        dataComponent?: React.ReactElement<any>;
-        /**
-         * The domain prop describes the range of values your chart will cover. This prop can be
-         * given as a array of the minimum and maximum expected values for your bar chart,
-         * or as an object that specifies separate arrays for x and y.
-         * If this prop is not provided, a domain will be calculated from data, or other
-         * available information.
-         * @example [-1, 1], {x: [0, 100], y: [0, 1]}
-         */
-        domain?: DomainPropType;
-        /**
-         * The x prop specifies how to access the X value of each data point.
-         * If given as a function, it will be run on each data point, and returned value will be used.
-         * If given as an integer, it will be used as an array index for array-type data points.
-         * If given as a string, it will be used as a property key for object-type data points.
-         * If given as an array of strings, or a string containing dots or brackets,
-         * it will be used as a nested object property path (for details see Lodash docs for _.get).
-         * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
-         * @example 0, 'x', 'x.value.nested.1.thing', 'x[2].also.nested', null, d => Math.sin(d)
-         * @default "x"
-         */
-        x?: DataGetterPropType;
-        /**
-         * The y prop specifies how to access the Y value of each data point.
-         * If given as a function, it will be run on each data point, and returned value will be used.
-         * If given as an integer, it will be used as an array index for array-type data points.
-         * If given as a string, it will be used as a property key for object-type data points.
-         * If given as an array of strings, or a string containing dots or brackets,
-         * it will be used as a nested object property path (for details see Lodash docs for _.get).
-         * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
-         * @example 0, 'y', 'y.value.nested.1.thing', 'y[2].also.nested', null, d => Math.sin(d)
-         * @default "y"
-         */
-        y?: DataGetterPropType;
-    }
-
-    // Common labable interface
-    interface VictoryLabableProps {
-        /**
-         * The labelComponent prop takes in an entire label component which will be used
-         * to create a label for the area. The new element created from the passed labelComponent
-         * will be supplied with the following properties: x, y, index, data, verticalAnchor,
-         * textAnchor, angle, style, text, and events. any of these props may be overridden
-         * by passing in props to the supplied component, or modified or ignored within
-         * the custom component itself. If labelComponent is omitted, a new VictoryLabel
-         * will be created with props described above. This labelComponent prop should be used to
-         * provide a series label for VictoryArea. If individual labels are required for each
-         * data point, they should be created by composing VictoryArea with VictoryScatter
-         * @default <VictoryLabel/>
-         */
-        labelComponent?: React.ReactElement<any>;
-    }
-
-    interface VictoryMultiLabeableProps extends VictoryLabableProps {
-        /**
-         * The labels prop defines labels that will appear above each bar in your chart.
-         * This prop should be given as an array of values or as a function of data.
-         * If given as an array, the number of elements in the array should be equal to
-         * the length of the data array. Labels may also be added directly to the data object
-         * like data={[{x: 1, y: 1, label: "first"}]}.
-         * @example ["spring", "summer", "fall", "winter"], (datum) => datum.title
-         */
-        labels?: string[] | { (data: any): string };
-    }
-
-    interface VictorySingleLabableProps extends VictoryLabableProps {
-        /**
-         * The label prop defines the label that will appear at the edge of the area.
-         * This prop should be given a string or as a function of data. If individual
-         * labels are required for each data point, they should be created by composing
-         * VictoryArea with VictoryScatter
-         * @example: "Series 1", (data) => `${data.length} points`
-         */
-        label?: string | { (data: any): string };
-    }
-
-    export interface VictoryAreaProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, so "data" and "labels" are all valid targets for VictoryArea events.
-         * Since VictoryArea only renders a single element, the eventKey property is not used.
-         * The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey keys,
-         * and a mutation key whose value is a function. The target and eventKey keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. an area), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @example
-         * events={[
-         *   {
-         *     target: "data",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", "all">[];
-        /**
-         * The interpolation prop determines how data points should be connected when plotting a line
-         * @default "linear"
-         */
-        interpolation?: InterpolationPropType;
-        /**
-         * The samples prop specifies how many individual points to plot when plotting
-         * y as a function of x. Samples is ignored if x props are provided instead.
-         * @default 50
-         */
-        samples?: number;
-        /**
-         * The style prop specifies styles for your VictoryArea. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart.
-         * @example {data: {fill: "red"}, labels: {fontSize: 12}}
-         */
-        style?: VictoryStyleInterface;
-    }
+    activateData?: boolean;
     /**
-     * Draw area charts with React. VictoryArea is a composable component, so it doesn't include axes.
-     * Add VictoryArea as a child of VictoryChart for a complete chart.
+     * The angle prop specifies the angle to rotate the tooltip around its origin point.
      */
-    export class VictoryArea extends React.Component<VictoryAreaProps, any> {}
-
-    export interface VictoryAxisProps extends VictoryCommonProps {
-        /**
-         * The axisComponent prop takes in an entire component which will be used
-         * to create the axis line. The new element created from the passed axisComponent
-         * will be supplied with the following properties: x1, y1, x2, y2, style and events.
-         * Any of these props may be overridden by passing in props to the supplied component,
-         * or modified or ignored within the custom component itself. If an axisComponent
-         * is not supplied, VictoryAxis will render its default AxisLine component.
-         * @default <AxisLine/>
-         */
-        axisComponent?: React.ReactElement<any>;
-        /**
-         * The axisLabelComponent prop takes in an entire component which will be used
-         * to create the axis label. The new element created from the passed axisLabelComponent
-         * will be supplied with the following properties: x, y, verticalAnchor, textAnchor,
-         * angle, transform, style and events. Any of these props may be overridden by
-         * passing in props to the supplied component, or modified or ignored within
-         * the custom component itself. If an axisLabelComponent is not supplied, a new
-         * VictoryLabel will be created with props described above
-         * @default <VictoryLabel/>
-         */
-        axisLabelComponent?: React.ReactElement<any>;
-        /**
-         * This prop specifies whether a given axis is intended to cross another axis.
-         */
-        crossAxis?: boolean;
-        /**
-         * The dependentAxis prop specifies whether the axis corresponds to the
-         * dependent variable (usually y). This prop is useful when composing axis
-         * with other components to form a chart.
-         */
-        dependentAxis?: boolean;
-        /**
-         * The domain prop describes the range of values your axis will include. This prop should be
-         * given as a array of the minimum and maximum expected values for your axis.
-         * If this value is not given it will be calculated based on the scale or tickValues.
-         * @examples [-1, 1]
-         */
-        domain?: DomainPropType;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, so "axis", "axisLabel", "ticks", "tickLabels", and "grid" are
-         * all valid targets for VictoryAxis events. The eventKey may optionally be used to select a
-         * single element by index rather than an entire set. The eventHandlers object
-         * should be given as an object whose keys are standard event names (i.e. onClick)
-         * and whose values are event callbacks. The return value of an event handler
-         * be used to modify other elemnts. The return value should be given as an object or
-         * an array of objects with optional target and eventKey keys, and a mutation
-         * key whose value is a function. The target and eventKey keys will default to those
-         * corresponding to the element the event handler was attached to. The mutation
-         * function will be called with the calculated props for the individual selected
-         * element (i.e. a single tick), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "grid",
-         *     eventKey: 2,
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *           {
-         *             mutation: (props) => {
-         *               return {style: merge({}, props.style, {stroke: "orange"})};
-         *             }
-         *           }, {
-         *             target: "tickLabels",
-         *             mutation: () => {
-         *               return {text: "hey"};
-         *             }
-         *           }
-         *         ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"axis" | "axisLabel" | "grid" | "ticks" | "tickLabels" | "parent", number | string>[];
-        /**
-         * The gridComponent prop takes in an entire component which will be used
-         * to create grid lines. The new element created from the passed gridComponent
-         * will be supplied with the following properties: x1, y1, x2, y2, tick, style and events.
-         * Any of these props may be overridden by passing in props to the supplied component,
-         * or modified or ignored within the custom component itself. If a gridComponent
-         * is not supplied, VictoryAxis will render its default GridLine component.
-         * @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
-         * component. If a label component is given, it will be cloned. The new
-         * element's properties x, y, textAnchor, verticalAnchor, and transform
-         * will have defaults provided by the axis; styles filled out with
-         * defaults provided by the axis, and overrides from the label component.
-         * If a value is given, a new VictoryLabel will be created with props and
-         * styles from the axis.
-         */
-        label?: any;
-        /**
-         * This value describes how far from the "edge" of its permitted area each axis
-         * will be set back in the x-direction.  If this prop is not given,
-         * the offset is calculated based on font size, axis orientation, and label padding.
-         */
-        offsetX?: number;
-        /**
-         * This value describes how far from the "edge" of its permitted area each axis
-         * will be set back in the y-direction.  If this prop is not given,
-         * the offset is calculated based on font size, axis orientation, and label padding.
-         */
-        offsetY?: number;
-        /**
-         * The orientation prop specifies the position and orientation of your axis.
-         */
-        orientation?: "top" | "bottom" | "left" | "right";
-        /**
-         * The style prop specifies styles for your VictoryAxis. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart.
-         * @example {axis: {stroke: "#756f6a"}, grid: {stroke: "grey"}, ticks: {stroke: "grey"},
-         * tickLabels: {fontSize: 10, padding: 5}, axisLabel: {fontSize: 16, padding: 20}}
-         */
-        style?: {
-            parent?: React.CSSProperties;
-            axis?: React.CSSProperties;
-            axisLabel?: React.CSSProperties;
-            grid?: React.CSSProperties;
-            ticks?: React.CSSProperties;
-            tickLabels?: React.CSSProperties;
-        };
-        /**
-         * The tickComponent prop takes in an entire component which will be used
-         * to create tick lines. The new element created from the passed tickComponent
-         * will be supplied with the following properties: x1, y1, x2, y2, tick, style and events.
-         * Any of these props may be overridden by passing in props to the supplied component,
-         * or modified or ignored within the custom component itself. If a tickComponent
-         * is not supplied, VictoryAxis will render its default Tick component.
-         * @default <Tick/>
-         */
-        tickComponent?: React.ReactElement<any>;
-        /**
-         * The tickCount prop specifies approximately how many ticks should be drawn on the axis if
-         * tickValues are not explicitly provided. This value is calculated by d3 scale and
-         * prioritizes returning "nice" values and evenly spaced ticks over an exact number of ticks.
-         * If you need an exact number of ticks, please specify them via the tickValues prop.
-         * This prop must have a value greater than zero.
-         * @default 5
-         */
-        tickCount?: number;
-        /**
-         * The tickLabelComponent prop takes in an entire component which will be used
-         * to create the tick labels. The new element created from the passed tickLabelComponent
-         * will be supplied with the following properties: x, y, verticalAnchor, textAnchor,
-         * angle, tick, style and events. Any of these props may be overridden by
-         * passing in props to the supplied component, or modified or ignored within
-         * the custom component itself. If an tickLabelComponent is not supplied, a new
-         * VictoryLabel will be created with props described above
-         * @default <VictoryLabel/>
-         */
-        tickLabelComponent?: React.ReactElement<any>;
-        /**
-         * The tickFormat prop specifies how tick values should be expressed visually.
-         * tickFormat can be given as a function to be applied to every tickValue, or as
-         * an array of display values for each tickValue.
-         * @example d3.time.format("%Y"), (x) => x.toPrecision(2), ["first", "second", "third"]
-         */
-        tickFormat?: any[] | { (data: any): string | number };
-        /**
-         * The tickValues prop explicitly specifies which tick values to draw on the axis.
-         * @example ["apples", "bananas", "oranges"], [2, 4, 6, 8]
-         */
-        tickValues?: any[]
-    }
-
+    angle?: string | number;
     /**
-     * VictoryAxis draws an SVG chart axis with React.
-     * Styles and data can be customized by passing in your own values as properties to the component.
-     * Data changes are animated with VictoryAnimation.
+     * The cornerRadius prop determines corner radius of the flyout container. This prop may be given as a positive number or a function of datum.
      */
-    export class VictoryAxis extends React.Component<VictoryAxisProps, any> {}
-
-    export interface VictoryBarProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, so "data" and "labels" are all valid targets for VictoryBar events.
-         * The eventKey may optionally be used to select a single element by index rather than an entire
-         * set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey keys,
-         * and a mutation key whose value is a function. The target and eventKey keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @example
-         * events={[
-         *   {
-         *     target: "data",
-         *     eventKey: "thisOne",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              eventKey: "theOtherOne",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              eventKey: "theOtherOne",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The horizontal prop determines whether the bars will be laid vertically or
-         * horizontally. The bars will be vertical if this prop is false or unspecified,
-         * or horizontal if the prop is set to true.
-         */
-        horizontal?: boolean;
-        /**
-         * The style prop specifies styles for your VictoryBar. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart. In addition to normal style properties, angle and verticalAnchor
-         * may also be specified via the labels object, and they will be passed as props to
-         * VictoryLabel, or any custom labelComponent.
-         * @example {data: {fill: "red", width: 8}, labels: {fontSize: 12}}
-         */
-        style?: VictoryStyleInterface;
-    }
+    cornerRadius?: NumberOrCallback;
     /**
-     * Draw SVG bar charts with React. VictoryBar is a composable component, so it doesn't include axes
-     * Check out VictoryChart for complete bar charts and more.
+     * Victory components can pass a datum prop to their label component. This can be used to calculate functional styles, and determine text.
      */
-    export class VictoryBar extends React.Component<VictoryBarProps, any> {}
-
-    export interface VictoryChartProps extends VictoryCommonProps {
-        /**
-         * The domain prop describes the range of values your chart will include. This prop can be
-         * given as a array of the minimum and maximum expected values for your chart,
-         * or as an object that specifies separate arrays for x and y.
-         * If this prop is not provided, a domain will be calculated from data, or other
-         * available information.
-         * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
-         */
-        domain?: DomainPropType;
-        /**
-         * The domainPadding prop specifies a number of pixels of padding to add to the
-         * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-         * from the origin to prevent crowding. This prop should be given as an object with
-         * numbers specified for x and y.
-         */
-        domainPadding?: DomainPaddingPropType;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-         * individual child of VictoryChart, either by its name prop, or by index. The eventKey
-         * may optionally be used to select a single element by index or eventKey rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey and childName keys,
-         * and a mutation key whose value is a function. The target and eventKey and childName keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     childName: "firstBar",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              childName: "secondBar",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              childName: "secondBar",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The style prop specifies styles for your chart. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart.
-         * @example {border: "1px solid #ccc", margin: "2%", maxWidth: "40%"}
-         */
-        style?: React.CSSProperties;
-    }
+    datum?: {};
     /**
-     * A flexible charting component for React.
-     * VictoryChart composes other Victory components into reusable charts.
-     * Acting as a coordinator rather than a stand-alone component, VictoryChart reconciles props such as domain and scale for child components,
-     * and provides a set of sensible defaults. This component works with:
-     * - VictoryAxis
-     * - VictoryLine
-     * - VictoryScatter
-     * - VictoryBar
+     * Victory components can pass a data prop to their label component. This can be useful in custom components that need to make use of the entire dataset.
      */
-    export class VictoryChart extends React.Component<VictoryChartProps, any> {}
-
-    export interface VictoryGroupProps extends VictoryCommonProps, VictoryMultiLabeableProps {
-        /**
-         * The categories prop specifies how categorical data for a chart should be ordered.
-         * This prop should be given as an array of string values, or an object with
-         * these values for x and y. When categories are not given as an object
-         * When this prop is set on a wrapper component, it will dictate the categories of
-         * its the children. If this prop is not set, any categories on child component
-         * or categorical data, will be merged to create a shared set of categories.
-         * @example ["dogs", "cats", "mice"]
-         */
-        categories?: CategoryPropType;
-        /**
-         * The colorScale prop is an optional prop that defines the color scale the chart's bars
-         * will be created on. This prop should be given as an array of CSS colors, or as a string
-         * corresponding to one of the built in color scales. VictoryBar will automatically assign
-         * values from this color scale to the bars unless colors are explicitly provided in the
-         * `dataAttributes` prop.
-         */
-        colorScale?: ColorScalePropType;
-        /**
-         * The domain prop describes the range of values your chart will include. This prop can be
-         * given as a array of the minimum and maximum expected values for your chart,
-         * or as an object that specifies separate arrays for x and y.
-         * If this prop is not provided, a domain will be calculated from data, or other
-         * available information.
-         * @examples: [-1, 1], {x: [0, 100], y: [0, 1]}
-         */
-        domain?: DomainPropType;
-        /**
-         * The domainPadding prop specifies a number of pixels of padding to add to the
-         * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-         * from the origin to prevent crowding. This prop should be given as an object with
-         * numbers specified for x and y.
-         */
-        domainPadding?: DomainPaddingPropType;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-         * individual child of VictoryGroup, either by its name prop, or by index. The eventKey
-         * may optionally be used to select a single element by index or eventKey rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey and childName keys,
-         * and a mutation key whose value is a function. The target and eventKey and childName keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     childName: "firstBar",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              childName: "secondBar",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              childName: "secondBar",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The horizontal prop determines whether the bars will be laid vertically or
-         * horizontally. The bars will be vertical if this prop is false or unspecified,
-         * or horizontal if the prop is set to true.
-         */
-        horizontal?: boolean;
-        /**
-         * The style prop specifies styles for your grouped chart. These styles will be
-         * applied to all grouped children
-         */
-        style?: VictoryStyleInterface;
-    }
-    export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}
-
-    export interface VictoryLineProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, so "data" and "labels" are all valid targets for VictoryLine events.
-         * Since VictoryLine only renders a single element, the eventKey property is not used.
-         * The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey keys,
-         * and a mutation key whose value is a function. The target and eventKey keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a line), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {stroke: "orange"})};
-         *              }
-         *            }, {
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
-        /**
-         * The interpolation prop determines how data points should be connected
-         * when plotting a line
-         */
-        interpolation?: InterpolationPropType;
-        /**
-         * The samples prop specifies how many individual points to plot when plotting
-         * y as a function of x. Samples is ignored if x props are provided instead.
-         */
-        samples?: number;
-        /**
-         * The labels prop defines the labels that will appear above each point.
-         * This prop should be given as an array or as a function of data.
-         */
-        labels?: string[]|number[]|Function;
-        /**
-         * Use the sortKey prop to indicate how data should be sorted. This prop
-         * is given directly to the lodash sortBy function to be executed on the
-         * final dataset.
-         */
-        sortKey?: string|string[]|Function;
-        /**
-         * The style prop specifies styles for your VictoryLine. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart. in addition to normal style properties, angle and verticalAnchor
-         * may also be specified via the labels object, and they will be passed as props to
-         * VictoryLabel, or any custom labelComponent.
-         * @examples{data: {stroke: "red"}, labels: {fontSize: 12}}
-         */
-        style?: VictoryStyleInterface;
-    }
+    data?: any[];
     /**
-     * VictoryLine creates a line based on data. VictoryLine is a composable component, so it does not include an axis.
-     * Check out VictoryChart for easy to use line charts and more.
+     * The dx prop defines a horizontal shift from the x coordinate.
      */
-    export class VictoryLine extends React.Component<VictoryLineProps, any> {}
-
-    export interface VictoryLegendProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
-        /**
-         * The colorScale prop defines a color scale to be applied to each data
-         * symbol in VictoryLegend. This prop should be given as an array of CSS
-         * colors, or as a string corresponding to one of the built in color
-         * scales: "grayscale", "qualitative", "heatmap", "warm", "cool", "red",
-         * "green", "blue". VictoryLegend will assign a color to each symbol by
-         * index, unless they are explicitly specified in the data object.
-         * Colors will repeat when there are more symbols than colors in the
-         * provided colorScale.
-         */
-        colorScale?: ColorScalePropType;
-        /**
-         * The style prop defines the style of the VictoryLegend component.
-         * The style prop should be given as an object with styles defined for data, labels and
-         * parent. Any valid svg styles are supported, but width, height, and
-         * padding should be specified via props as they determine relative
-         * layout for components in VictoryLegend.
-         */
-        style?: VictoryStyleInterface;
-        /**
-         * The containerComponent prop takes a component instance which will be
-         * used to create a container element for standalone legends. The new
-         * element created from the passed containerComponent will be provided
-         * with the following props: height, width, children (the legend itself)
-         * and style. If a containerComponent is not provided, the default
-         * VictoryContainer component will be used. VictoryContainer supports
-         * title and desc props, which are intended to add accessibility to
-         * Victory components. The more descriptive these props are, the more
-         * accessible your data will be for people using screen readers. These
-         * props may be set by passing them directly to the supplied component.
-         * By default, VictoryContainer renders a responsive svg using the
-         * viewBox attribute. To render a static container, set
-         * responsive={false} directly on the instance of VictoryContainer
-         * supplied via the containerComponent prop. VictoryContainer also
-         * renders a Portal element that may be used in conjunction with
-         * VictoryPortal to force components to render above other children.
-         * @default <VictoryContainer/>
-         */
-        containerComponent?: React.ReactElement<any>;
-        /**
-         * Specify data via the data prop. VictoryLegend expects data as an
-         * array of objects with name (required), symbol, and labels properties.
-         * The data prop must be given as an array.
-         */
-        data?: Array<{
-            name?: string;
-            symbol?: {
-                fill?: string;
-                type?: string;
-            };
-        }>;
-        /**
-         * The itemsPerRow prop determines how many items to render in each row
-         * of a horizontal legend, or in each column of a vertical legend. This
-         * prop should be given as an integer. When this prop is not given,
-         * legend items will be rendered in a single row or column.
-         */
-        itemsPerRow?: number;
-        /**
-         * The dataComponent prop takes a component instance which will be
-         * responsible for rendering a data element used to associate a symbol
-         * or color with each data series. The new element created from the
-         * passed dataComponent will be provided with the following properties
-         * calculated by VictoryLegend: x, y, size, style, and symbol. Any of
-         * these props may be overridden by passing in props to the supplied
-         * component, or modified or ignored within the custom component itself.
-         * If a dataComponent is not provided, VictoryLegend will use its
-         * default Point component.
-         */
-        dataComponent?: React.ReactElement<any>;
-        /**
-         * The groupComponent prop takes an entire component which will be used to
-         * create group elements for use within container elements. This prop defaults
-         * to a <g> tag on web, and a react-native-svg <G> tag on mobile
-         * @default <g/>
-         */
-        groupComponent?: React.ReactElement<any>;
-        /**
-         * The gutter prop defines the number of pixels between legend rows or
-         * columns, depending on orientation. When orientation is horizontal,
-         * gutters are between columns. When orientation is vertical, gutters
-         * are the space between rows.
-         */
-        gutter?: number;
-        /**
-         * The labelComponent prop takes a component instance which will be used
-         * to render each legend label. The new element created from the passed
-         * labelComponent will be supplied with the following properties: x, y,
-         * style, and text. Any of these props may be overridden by passing in
-         * props to the supplied component, or modified or ignored within the
-         * custom component itself. If labelComponent is omitted, a new
-         * VictoryLabel will be created with the props described above.
-         */
-        labelComponent?: React.ReactElement<any>;
-        /**
-         * The orientation prop takes a string that defines whether legend data
-         * are displayed in a row or column. When orientation is "horizontal",
-         * legend items will be displayed in a single row. When orientation is
-         * "vertical", legend items will be displayed in a single column. Line
-         * and text-wrapping is not currently supported, so "vertical"
-         * orientation is both the default setting and recommended for
-         * displaying many series of data.
-         * @default 'vertical'
-         */
-        orientation?: 'horizontal'|'vertical';
-        /**
-         * The padding prop specifies the amount of padding in pixels between
-         * the edge of the legend and any rendered child components. This prop
-         * can be given as a number or as an object with padding specified for
-         * top, bottom, left and right. As with width and height, the absolute
-         * padding will depend on whether the component is rendered in a
-         * responsive container. When a component is nested within
-         * VictoryLegend, setting padding on the child component will have no
-         * effect.
-         */
-        padding?: number | {
-            top?: number;
-            bottom?: number;
-            left?: number;
-            right?: number;
-        };
-        /**
-         * The standalone props specifies whether the component should be
-         * rendered in an independent <svg> element or in a <g> tag. This prop
-         * defaults to true, and renders an svg.
-         */
-        standalone?: boolean;
-        /**
-         * The symbolSpacer prop defines the number of pixels between data
-         * components and label components.
-         */
-        symbolSpacer?: number;
-        /**
-         * The width and height props define the width and height of the legend.
-         * These props may be given as positive numbers or functions of data. If
-         * these props are not set, width and height will be determined based on
-         * an approximate text size calculated from the text and style props
-         * provided to VictoryLegend.
-         */
-        width?: number;
-        height?: number;
-        /**
-         * The x and y props define the base position of the legend element.
-         */
-        x?: number;
-        y?: number;
-    }
+    dx?: StringOrNumberOrCallback;
     /**
-     * VictoryLegend renders a chart legend component.
+     * The dy prop defines a vertical shift from the y coordinate.
      */
-    export class VictoryLegend extends React.Component<VictoryLegendProps, any> {}
-
-    type ScatterSymbolType = "circle" | "diamond" | "plus" | "square" | "star" | "triangleDown" | "triangleUp";
-    export interface VictoryScatterProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
-        /**
-         * The bubbleProperty prop indicates which property of the data object should be used
-         * to scale data points in a bubble chart
-         */
-        bubbleProperty?: string;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, so "data" and "labels" are all valid targets for VictoryScatter
-         * events. The eventKey may optionally be used to select a single element by index rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey keys,
-         * and a mutation key whose value is a function. The target and eventKey keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     eventKey: "thisOne",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              eventKey: "theOtherOne",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              eventKey: "theOtherOne",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The maxBubbleSize prop sets an upper limit for scaling data points in a bubble chart
-         */
-        maxBubbleSize?: number;
-        /**
-         * The samples prop specifies how many individual points to plot when plotting
-         * y as a function of x. Samples is ignored if x props are provided instead.
-         */
-        samples?: number;
-        /**
-         * The size prop determines how to scale each data point
-         */
-        size?: number | { (data: any): number };
-        /**
-         * The style prop specifies styles for your VictoryScatter. Any valid inline style properties
-         * will be applied. Height, width, and padding should be specified via the height,
-         * width, and padding props, as they are used to calculate the alignment of
-         * components within chart. In addition to normal style properties, angle and verticalAnchor
-         * may also be specified via the labels object, and they will be passed as props to
-         * VictoryLabel, or any custom labelComponent.
-         * @example {data: {fill: "red"}, labels: {fontSize: 12}}
-         */
-        style?: VictoryStyleInterface;
-        /**
-         * The symbol prop determines which symbol should be drawn to represent data points.
-         */
-        symbol?: ScatterSymbolType | { (data: any): ScatterSymbolType };
-    }
+    dy?: StringOrNumberOrCallback;
     /**
-     * VictoryScatter creates a scatter of points from data. VictoryScatter is a composable component, so it does not include an axis.
-     * Check out VictoryChart for easy to use scatter plots and more.
+     * The events prop attaches arbitrary event handlers to the label component. This prop should be given as an object of event names and corresponding event handlers.
+     * When events are provided via Victory’s event system, event handlers will be called with the event, the props of the component is attached to, and an eventKey.
+     * Examples: events={{onClick: (evt) => alert("x: " + evt.clientX)}}
      */
-    export class VictoryScatter extends React.Component<VictoryScatterProps, any> {}
-
-    export interface VictoryStackProps extends VictoryCommonProps, VictoryMultiLabeableProps {
-        /**
-         * The categories prop specifies how categorical data for a chart should be ordered.
-         * This prop should be given as an array of string values, or an object with
-         * these values for x and y. When categories are not given as an object
-         * When this prop is set on a wrapper component, it will dictate the categories of
-         * its the children. If this prop is not set, any categories on child component
-         * or catigorical data, will be merged to create a shared set of categories.
-         * @example ["dogs", "cats", "mice"]
-         */
-        categories?: CategoryPropType;
-        /**
-         * The colorScale prop is an optional prop that defines the color scale the chart's bars
-         * will be created on. This prop should be given as an array of CSS colors, or as a string
-         * corresponding to one of the built in color scales. VictoryBar will automatically assign
-         * values from this color scale to the bars unless colors are explicitly provided in the
-         * `dataAttributes` prop.
-         */
-        colorScale?: ColorScalePropType;
-        /**
-         * The domain prop describes the range of values your chart will include. This prop can be
-         * given as a array of the minimum and maximum expected values for your chart,
-         * or as an object that specifies separate arrays for x and y.
-         * If this prop is not provided, a domain will be calculated from data, or other
-         * available information.
-         * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
-         */
-        domain?: DomainPropType;
-        /**
-         * The domainPadding prop specifies a number of pixels of padding to add to the
-         * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
-         * from the origin to prevent crowding. This prop should be given as an object with
-         * numbers specified for x and y.
-         */
-        domainPadding?: DomainPaddingPropType;
-        /**
-         * The event prop take an array of event objects. Event objects are composed of
-         * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, (i.e. "data" and "labels"). The childName will refer to an
-         * individual child of VictoryStack, either by its name prop, or by index. The eventKey
-         * may optionally be used to select a single element by index or eventKey rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey and childName keys,
-         * and a mutation key whose value is a function. The target and eventKey and childName keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     childName: "firstBar",
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              childName: "secondBar",
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              childName: "secondBar",
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * The horizontal prop determines whether the bars will be laid vertically or
-         * horizontally. The bars will be vertical if this prop is false or unspecified,
-         * or horizontal if the prop is set to true.
-         */
-        horizontal?: boolean;
-        /**
-         * The style prop specifies styles for your grouped chart. These styles will be
-         * applied to all grouped children
-         */
-        style?: VictoryStyleInterface;
-        /**
-         * The xOffset prop is used for grouping stacks of bars. This prop will be set
-         * by the VictoryGroup component wrapper, or can be set manually.
-         */
-        xOffset?: number;
-    }
-    export class VictoryStack extends React.Component<VictoryStackProps, any> {}
-
-    export interface VictoryPieProps extends VictoryCommonProps, VictoryMultiLabeableProps {
-        /**
-         * The colorScale prop is an optional prop that defines the color scale the pie
-         * will be created on. This prop should be given as an array of CSS colors, or as a string
-         * corresponding to one of the built in color scales. VictoryPie will automatically assign
-         * values from this color scale to the pie slices unless colors are explicitly provided in the
-         * data object
-         */
-        colorScale?: ColorScalePropType;
-        /**
-         * The data prop specifies the data to be plotted,
-         * where data X-value is the slice label (string or number),
-         * and Y-value is the corresponding number value represented by the slice
-         * Data should be in the form of an array of data points.
-         * Each data point may be any format you wish (depending on the `x` and `y` accessor props),
-         * but by default, an object with x and y properties is expected.
-         * @example [{x: 1, y: 2}, {x: 2, y: 3}], [[1, 2], [2, 3]],
-         * [[{x: "a", y: 1}, {x: "b", y: 2}], [{x: "a", y: 2}, {x: "b", y: 3}]]
-         */
-        data?: any[];
-        /**
-         * The dataComponent prop takes an entire, HTML-complete data component which will be used to
-         * create slices for each datum in the pie chart. The new element created from the passed
-         * dataComponent will have the property datum set by the pie chart for the point it renders;
-         * properties style and pathFunction calculated by VictoryPie; an index property set
-         * corresponding to the location of the datum in the data provided to the pie; events bound to
-         * the VictoryPie; and the d3 compatible slice object.
-         * If a dataComponent is not provided, VictoryPie's Slice component will be used.
-         */
-        dataComponent?: React.ReactElement<any>;
-        /**
-         * The labelRadius prop defines the radius of the arc that will be used for positioning each slice label.
-         * If this prop is not set, the label radius will default to the radius of the pie + label padding.
-         */
-        labelRadius?: number;
-        /**
-         * The overall end angle of the pie in degrees. This prop is used in conjunction with
-         * startAngle to create a pie that spans only a segment of a circle.
-         */
-        endAngle?: number;
-        /**
-         * The event prop takes an array of event objects. Event objects are composed of
-         * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
-         * for a given component, so "data" and "labels" are all valid targets for VictoryPie
-         * events. The eventKey may optionally be used to select a single element by index rather than
-         * an entire set. The eventHandlers object should be given as an object whose keys are standard
-         * event names (i.e. onClick) and whose values are event callbacks. The return value
-         * of an event handler is used to modify elemnts. The return value should be given
-         * as an object or an array of objects with optional target and eventKey keys,
-         * and a mutation key whose value is a function. The target and eventKey keys
-         * will default to those corresponding to the element the event handler was attached to.
-         * The mutation function will be called with the calculated props for the individual selected
-         * element (i.e. a single bar), and the object returned from the mutation function
-         * will override the props of the selected element via object assignment.
-         * @examples
-         * events={[
-         *   {
-         *     target: "data",
-         *     eventKey: 1,
-         *     eventHandlers: {
-         *       onClick: () => {
-         *         return [
-         *            {
-         *              eventKey: 2,
-         *              mutation: (props) => {
-         *                return {style: merge({}, props.style, {fill: "orange"})};
-         *              }
-         *            }, {
-         *              eventKey: 2,
-         *              target: "labels",
-         *              mutation: () => {
-         *                return {text: "hey"};
-         *              }
-         *            }
-         *          ];
-         *       }
-         *     }
-         *   }
-         * ]}
-         *}}
-         */
-        events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback | string[] | number[]>[];
-        /**
-         * Similar to data accessor props `x` and `y`, this prop may be used to functionally
-         * assign eventKeys to data
-         */
-        eventKey?: StringOrNumberOrCallback;
-        /**
-         * When creating a donut chart, this prop determines the number of pixels between
-         * the center of the chart and the inner edge of a donut. When this prop is set to zero
-         * a regular pie chart is rendered.
-         */
-        innerRadius?: number;
-        /**
-         * Set the cornerRadius for every dataComponent (Slice by default) within VictoryPie
-         */
-        cornerRadius?: number;
-        /**
-         * The padAngle prop determines the amount of separation between adjacent data slices
-         * in number of degrees
-         */
-        padAngle?: number;
-        /**
-         * The overall start angle of the pie in degrees. This prop is used in conjunction with
-         * endAngle to create a pie that spans only a segment of a circle.
-         */
-        startAngle?: number;
-        /**
-         * The style prop specifies styles for your pie. VictoryPie relies on Radium,
-         * so valid Radium style objects should work for this prop. Height, width, and
-         * padding should be specified via the height, width, and padding props.
-         * @example {data: {stroke: "black"}, label: {fontSize: 10}}
-         */
-        style?: VictoryStyleInterface;
-        /**
-         * The x prop specifies how to access the X value of each data point.
-         * If given as a function, it will be run on each data point, and returned value will be used.
-         * If given as an integer, it will be used as an array index for array-type data points.
-         * If given as a string, it will be used as a property key for object-type data points.
-         * If given as an array of strings, or a string containing dots or brackets,
-         * it will be used as a nested object property path (for details see Lodash docs for _.get).
-         * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
-         * @example 0, 'x', 'x.value.nested.1.thing', 'x[2].also.nested', null, d => Math.sin(d)
-         */
-        x?: DataGetterPropType;
-        /**
-         * The y prop specifies how to access the Y value of each data point.
-         * If given as a function, it will be run on each data point, and returned value will be used.
-         * If given as an integer, it will be used as an array index for array-type data points.
-         * If given as a string, it will be used as a property key for object-type data points.
-         * If given as an array of strings, or a string containing dots or brackets,
-         * it will be used as a nested object property path (for details see Lodash docs for _.get).
-         * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
-         * @example 0, 'y', 'y.value.nested.1.thing', 'y[2].also.nested', null, d => Math.sin(d)
-         */
-        y?: DataGetterPropType;
-    }
+    events?: {};
     /**
-     * victory-pie draws an SVG pie or donut chart with React.
-     * Styles and data can be customized by passing in your own values as properties to the component.
-     * Data changes are animated with VictoryAnimation.
+     * The style prop applies SVG style properties to the rendered flyout container. These props will be passed to the flyoutComponent.
      */
-    export class VictoryPie extends React.Component<VictoryPieProps, any> {}
+    flyoutStyle?: React.CSSProperties;
+    /**
+     * The flyoutComponent prop takes a component instance which will be used to create the flyout path for each tooltip.
+     * The new element created from the passed flyoutComponent will be supplied with the following properties: x, y, dx, dy, index, datum, cornerRadius, pointerLength, pointerWidth, width, height, orientation, style, and events.
+     * Any of these props may be overridden by passing in props to the supplied component, or modified or ignored within the custom component itself.
+     * If flyoutComponent is omitted, a default Flyout component will be created with props described above.
+     * Examples: flyoutComponent={<Flyout x={50} y={50}/>}, flyoutComponent={<MyCustomFlyout/>}
+     * @default <Flyout/>
+     */
+    flyoutComponent?: React.ReactElement<any>;
+    /**
+     * The groupComponent prop takes a component instance which will be used to create group elements for use within container elements. This prop defaults to a <g> tag.
+     * @default groupComponent={<g/>}
+     */
+    groupComponent?: React.ReactElement<any>;
+    /**
+     * The height prop defines the height of the tooltip flyout. This prop may be given as a positive number or a function of datum.
+     * If this prop is not set, height will be determined based on an approximate text size calculated from the text and style props provided to VictoryTooltip.
+     */
+    height?: NumberOrCallback;
+    /**
+     * The horizontal prop determines whether to plot the flyouts to the left / right of the (x, y) coordinate rather than top / bottom.
+     * This is useful when an orientation prop is not provided, and data will determine the default orientation. i.e. negative values result in a left orientation and positive values will result in a right orientation by default.
+     */
+    horizontal?: boolean;
+    /**
+     * The index prop represents the index of the datum in the data array.
+     */
+    index?: number | string;
+    /**
+     * The labelComponent prop takes a component instance which will be used to render each tooltip label.
+     * The new element created from the passed labelComponent will be supplied with the following properties: x, y, index, datum, verticalAnchor, textAnchor, style, text, and events.
+     * Any of these props may be overridden by passing in props to the supplied component, or modified or ignored within the custom component itself.
+     * If labelComponent is omitted, a new VictoryLabel will be created with the props described above.
+     * Examples: labelComponent={<VictoryLabel dy={20}/>}, labelComponent={<MyCustomLabel/>}
+     * @default <VictoryLabel/>
+     */
+    labelComponent?: React.ReactElement<any>;
+    /**
+     * The orientation prop determines which side of the (x, y) coordinate the tooltip should be rendered on.
+     * This prop can be given as “top”, “bottom”, “left”, “right”, or as a function of datum that returns one of these values.
+     * If this prop is not provided it will be determined from the sign of the datum, and the value of the horizontal prop.
+     */
+    orientation?: OrientationTypes;
+    /**
+     * The pointerLength prop determines the length of the triangular pointer extending from the flyout. This prop may be given as a positive number or a function of datum.
+     */
+    pointerLength?: NumberOrCallback;
+    /**
+     * The pointerWidth prop determines the width of the base of the triangular pointer extending from the flyout. This prop may be given as a positive number or a function of datum.
+     */
+    pointerWidth?: NumberOrCallback;
+    /**
+     * When renderInPortal is true, rendered tooltips will be wrapped in VictoryPortal and rendered within the Portal element within VictoryContainer. Note: This prop should not be set to true when using a custom container element.
+     */
+    renderInPortal?: boolean;
+    /**
+     * The style prop applies CSS properties to the rendered `<text>` element.
+     */
+    style?: React.CSSProperties;
+    /**
+     * The text prop defines the text VictoryTooltip will render. The text prop may be given as a string, number, or function of datum.
+     * When VictoryLabel is used as the labelComponent, strings may include newline characters, which VictoryLabel will split in to separate <tspan/> elements.
+     */
+    text?: StringOrNumberOrCallback | string[] | number[];
+    /**
+     * VictoryAxis uses the standard theme prop. Read about it here
+     * @default VictoryTheme.grayscale
+    */
+    theme?: VictoryThemeDefinition;
+    /**
+     * The width prop defines the width of the tooltip flyout. This prop may be given as a positive number or a function of datum. If this prop is not set, width will be determined based on an approximate text size calculated from the text and style props provided to VictoryTooltip.
+     */
+    width?: NumberOrCallback;
+    /**
+     * The x prop defines the x coordinate to use as a basis for horizontal positioning.
+     */
+    x?: number;
+    /**
+     * The y prop defines the y coordinate to use as a basis for vertical positioning.
+     */
+    y?: number;
+  }
+  
+ 
+  /**
+   * VictoryTooltip renders a tooltip component with a set of default events. When VictoryTooltip is used as a label component for any Victory component that renders data, it will attach events to rendered data components that will activate the tooltip when hovered. 
+   * VictoryTooltip renders text as well as a configurable Flyout container.
+   */
+  export class VictoryTooltip extends React.Component<
+    VictoryTooltipProps,
+    any
+  > {}
+
+  /**
+   * Animate object used in components
+   */
+  export interface AnimatePropTypeInterface {
+    /**
+     * Animation duration
+     */
+    duration: number;
+    /**
+     * Animation end callback
+     */
+    onEnd?: () => void;
+    /**
+     * Animation exit transition configuration
+     */
+    onExit?: {
+      duration?: number;
+      before?: (datum: any) => AnimationStyle;
+    };
+    /**
+     * Animation enter transition configuration
+     */
+    onEnter?: {
+      duration?: number;
+      before?: (datum: any) => AnimationStyle;
+      after?: (datum: any) => AnimationStyle;
+    };
+    /**
+     * Animation load transition configuration
+     */
+    onLoad?: {
+      duration?: number;
+      before?: (datum: any) => AnimationStyle;
+      after?: (datum: any) => AnimationStyle;
+    };
+    /**
+     * The easing prop specifies an easing function name to use for tweening.
+     * @default "quadInOut"
+     */
+    easing?: AnimationEasing;
+  }
+
+  /**
+   * Return value for eventHandlers values
+   */
+  interface EventCallbackInterface<TTarget, TEventKey> {
+    /**
+     * Use only in:
+     * - VictoryChart
+     * - VictoryStack
+     */
+    childName?: string;
+    target?: TTarget;
+    eventKey?: TEventKey;
+    /**
+     * Will be called with the calculated props for the individual selected element and result will override
+     * props of selected element via object assignment
+     * @param props
+     */
+    mutation: (props: any) => any;
+  }
+
+  export interface EventPropTypeInterface<TTarget, TEventKey> {
+    /**
+     * Use only in:
+     * - VictoryChart
+     * - VictoryStack
+     */
+    childName?: string;
+    /**
+     * Targets may be any valid style namespace for a given component
+     */
+    target: TTarget;
+    /**
+     *
+     */
+    eventKey?: TEventKey;
+    /**
+     * Event handlers map. Keys are standard event names (such as onClick) and values are event callbacks
+     */
+    eventHandlers: {
+      [key: string]: {
+        (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey> } |
+        { (event: React.SyntheticEvent<any>): EventCallbackInterface<TTarget, TEventKey>[]
+      }
+    };
+  }
+
+  /**
+   * Data domain type
+   */
+  type DomainTuple = [number, number] | [Date, Date];
+
+  type DomainPropType = DomainTuple | { x?: DomainTuple; y: DomainTuple; } | { x: DomainTuple; y?: DomainTuple; };
+
+  /**
+   * Domain padding
+   */
+  type DomainPaddingPropType = number | {
+    x?: number | [ number, number];
+    y?: number | [ number, number];
+  };
+
+  /**
+   * D3 scale function shape. Don't want to introduce typing dependency to d3
+   */
+  interface D3Scale {
+    domain: () => any;
+    range: () => any;
+    copy: () => any;
+  }
+
+  /**
+   * Acceptable scale types
+   */
+  type ScalePropType = "linear" | "time" | "log" | "sqrt";
+
+  /**
+   * Category prop type
+   */
+  type CategoryPropType = string[] | {
+    x: string[]
+    y: string[]
+  };
+
+  /**
+   * Data getter property type
+   */
+  type DataGetterPropType = number | string | string[] | { (data: any): number | string | string[] };
+
+  type InterpolationPropType = "basis" | "basisClosed" | "basisOpen" | "bundle" |
+    "cardinal" | "cardinalClosed" | "cardinalOpen" |
+    "catmullRom" | "catmullRomClosed" | "catmullRomOpen" |
+    "linear" | "linearClosed" | "monotoneX" | "monotoneY" |
+    "natural" | "radial" | "step" | "stepAfter" | "stepBefore";
+
+  type ColorScalePropType = "greyscale" | "qualitative" | "heatmap" | "warm" | "cool" | "red" | "green" | "blue" | string[];
+
+  /**
+   * Common properties
+   */
+  interface VictoryCommonProps {
+    /**
+     * The animate prop specifies props for VictoryAnimation to use.
+     * The animate prop should also be used to specify enter and exit
+     * transition configurations with the `onExit` and `onEnter` namespaces respectively.
+     * @example
+     * {duration: 500, onExit: () => {}, onEnter: {duration: 500, before: () => ({y: 0})})}
+     */
+    animate?: AnimatePropTypeInterface;
+    /**
+     * The name prop is used to reference a component instance when defining shared events.
+     */
+    name?: string;
+    /**
+     * The height props specifies the height the svg viewBox of the chart container.
+     * This value should be given as a number of pixels
+     */
+    height?: number;
+    /**
+     * The padding props specifies the amount of padding in number of pixels between
+     * the edge of the chart and any rendered child components. This prop can be given
+     * as a number or as an object with padding specified for top, bottom, left
+     * and right.
+     * @default 50
+     */
+    padding?: number | {
+      top?: number;
+      bottom?: number;
+      left?: number;
+      right?: number;
+    };
+    /**
+     * The scale prop determines which scales your chart should use. This prop can be
+     * given as a string specifying a supported scale ("linear", "time", "log", "sqrt"),
+     * as a d3 scale function, or as an object with scales specified for x and y
+     * @example d3Scale.time(), {x: "linear", y: "log"}
+     * @default "linear"
+     */
+    scale?: ScalePropType | D3Scale | {
+      x?: ScalePropType | D3Scale;
+      y?: ScalePropType | D3Scale;
+    };
+    /**
+     * The standalone prop determines whether the component will render a standalone svg
+     * or a <g> tag that will be included in an external svg. Set standalone to false to
+     * compose VictoryAxis with other components within an enclosing <svg> tag.
+     * @default true
+     */
+    standalone?: boolean;
+    /**
+     * The width props specifies the width of the svg viewBox of the chart container
+     * This value should be given as a number of pixels
+     */
+    width?: number;
+    /**
+     * The containerComponent prop takes an entire component which will be used to
+     * create a container element for standalone charts.
+     * The new element created from the passed containerComponent wil be provided with
+     * these props from VictoryArea: height, width, children
+     * (the chart itself) and style. Props that are not provided by the
+     * child chart component include title and desc, both of which
+     * are intended to add accessibility to Victory components. The more descriptive these props
+     * are, the more accessible your data will be for people using screen readers.
+     * Any of these props may be overridden by passing in props to the supplied component,
+     * or modified or ignored within the custom component itself. If a dataComponent is
+     * not provided, VictoryArea will use the default VictoryContainer component.
+     * @example <VictoryContainer title="Chart of Dog Breeds" desc="This chart shows how popular each dog breed is by percentage in Seattle." />
+     * @default <VictoryContainer/>
+     */
+    containerComponent?: React.ReactElement<any>;
+    /**
+     * The theme prop takes a style object with nested data, labels, and parent objects.
+     * You can create this object yourself, or you can use a theme provided by Victory.
+     * When using VictoryArea as a solo component, implement the theme directly on
+     * VictoryArea. If you are wrapping VictoryArea in VictoryChart, VictoryStack, or
+     * VictoryGroup, please call the theme on the outermost wrapper component instead.
+     * @example theme={VictoryTheme.material}
+     * http://www.github.com/FormidableLabs/victory-core/tree/master/src/victory-theme/material.js
+     */
+    theme?: VictoryThemeDefinition;
+    /**
+     * The groupComponent prop takes an entire component which will be used to
+     * create group elements for use within container elements. This prop defaults
+     * to a <g> tag on web, and a react-native-svg <G> tag on mobile
+     * @default <g/>
+     */
+    groupComponent?: React.ReactElement<any>;
+  }
+
+  /**
+   * Common properties for all data components
+   */
+  interface VictoryDatableProps {
+    /**
+     * The categories prop specifies how categorical data for a chart should be ordered.
+     * This prop should be given as an array of string values, or an object with
+     * these arrays of values specified for x and y. If this prop is not set,
+     * categorical data will be plotted in the order it was given in the data array
+     * @example ["dogs", "cats", "mice"]
+     */
+    categories?: CategoryPropType;
+    /**
+     * The data prop specifies the data to be plotted. Data should be in the form of an array
+     * of data points, or an array of arrays of data points for multiple datasets.
+     * Each data point may be any format you wish (depending on the `x` and `y` accessor props),
+     * but by default, an object with x and y properties is expected.
+     * @example [{x: 1, y: 2}, {x: 2, y: 3}], [[1, 2], [2, 3]],
+     * [[{x: "a", y: 1}, {x: "b", y: 2}], [{x: "a", y: 2}, {x: "b", y: 3}]]
+     */
+    data?: any[];
+    /**
+     * The dataComponent prop takes an entire component which will be used to create an area.
+     * The new element created from the passed dataComponent will be provided with the
+     * following properties calculated by VictoryArea: a scale, style, events, interpolation,
+     * and an array of modified data objects (including x, y, and calculated y0 and y1).
+     * Any of these props may be overridden by passing in props to the supplied component,
+     * or modified or ignored within the custom component itself. If a dataComponent is
+     * not provided, VictoryArea will use its default Area component.
+     * @default <Area/>
+     */
+    dataComponent?: React.ReactElement<any>;
+    /**
+     * The domain prop describes the range of values your chart will cover. This prop can be
+     * given as a array of the minimum and maximum expected values for your bar chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @example [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The x prop specifies how to access the X value of each data point.
+     * If given as a function, it will be run on each data point, and returned value will be used.
+     * If given as an integer, it will be used as an array index for array-type data points.
+     * If given as a string, it will be used as a property key for object-type data points.
+     * If given as an array of strings, or a string containing dots or brackets,
+     * it will be used as a nested object property path (for details see Lodash docs for _.get).
+     * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
+     * @example 0, 'x', 'x.value.nested.1.thing', 'x[2].also.nested', null, d => Math.sin(d)
+     * @default "x"
+     */
+    x?: DataGetterPropType;
+    /**
+     * The y prop specifies how to access the Y value of each data point.
+     * If given as a function, it will be run on each data point, and returned value will be used.
+     * If given as an integer, it will be used as an array index for array-type data points.
+     * If given as a string, it will be used as a property key for object-type data points.
+     * If given as an array of strings, or a string containing dots or brackets,
+     * it will be used as a nested object property path (for details see Lodash docs for _.get).
+     * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
+     * @example 0, 'y', 'y.value.nested.1.thing', 'y[2].also.nested', null, d => Math.sin(d)
+     * @default "y"
+     */
+    y?: DataGetterPropType;
+  }
+
+  // Common labable interface
+  interface VictoryLabableProps {
+    /**
+     * The labelComponent prop takes in an entire label component which will be used
+     * to create a label for the area. The new element created from the passed labelComponent
+     * will be supplied with the following properties: x, y, index, data, verticalAnchor,
+     * textAnchor, angle, style, text, and events. any of these props may be overridden
+     * by passing in props to the supplied component, or modified or ignored within
+     * the custom component itself. If labelComponent is omitted, a new VictoryLabel
+     * will be created with props described above. This labelComponent prop should be used to
+     * provide a series label for VictoryArea. If individual labels are required for each
+     * data point, they should be created by composing VictoryArea with VictoryScatter
+     * @default <VictoryLabel/>
+     */
+    labelComponent?: React.ReactElement<any>;
+  }
+
+  interface VictoryMultiLabeableProps extends VictoryLabableProps {
+    /**
+     * The labels prop defines labels that will appear above each bar in your chart.
+     * This prop should be given as an array of values or as a function of data.
+     * If given as an array, the number of elements in the array should be equal to
+     * the length of the data array. Labels may also be added directly to the data object
+     * like data={[{x: 1, y: 1, label: "first"}]}.
+     * @example ["spring", "summer", "fall", "winter"], (datum) => datum.title
+     */
+    labels?: string[] | { (data: any): string };
+  }
+
+  interface VictorySingleLabableProps extends VictoryLabableProps {
+    /**
+     * The label prop defines the label that will appear at the edge of the area.
+     * This prop should be given a string or as a function of data. If individual
+     * labels are required for each data point, they should be created by composing
+     * VictoryArea with VictoryScatter
+     * @example: "Series 1", (data) => `${data.length} points`
+     */
+    label?: string | { (data: any): string };
+  }
+
+  export interface VictoryAreaProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryArea events.
+     * Since VictoryArea only renders a single element, the eventKey property is not used.
+     * The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. an area), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @example
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", "all">[];
+    /**
+     * The interpolation prop determines how data points should be connected when plotting a line
+     * @default "linear"
+     */
+    interpolation?: InterpolationPropType;
+    /**
+     * The samples prop specifies how many individual points to plot when plotting
+     * y as a function of x. Samples is ignored if x props are provided instead.
+     * @default 50
+     */
+    samples?: number;
+    /**
+     * The style prop specifies styles for your VictoryArea. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart.
+     * @example {data: {fill: "red"}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
+  }
+
+  /**
+   * Draw area charts with React. VictoryArea is a composable component, so it doesn't include axes.
+   * Add VictoryArea as a child of VictoryChart for a complete chart.
+   */
+  export class VictoryArea extends React.Component<VictoryAreaProps, any> {}
+
+  export interface VictoryAxisProps extends VictoryCommonProps {
+    /**
+     * The axisComponent prop takes in an entire component which will be used
+     * to create the axis line. The new element created from the passed axisComponent
+     * will be supplied with the following properties: x1, y1, x2, y2, style and events.
+     * Any of these props may be overridden by passing in props to the supplied component,
+     * or modified or ignored within the custom component itself. If an axisComponent
+     * is not supplied, VictoryAxis will render its default AxisLine component.
+     * @default <AxisLine/>
+     */
+    axisComponent?: React.ReactElement<any>;
+    /**
+     * The axisLabelComponent prop takes in an entire component which will be used
+     * to create the axis label. The new element created from the passed axisLabelComponent
+     * will be supplied with the following properties: x, y, verticalAnchor, textAnchor,
+     * angle, transform, style and events. Any of these props may be overridden by
+     * passing in props to the supplied component, or modified or ignored within
+     * the custom component itself. If an axisLabelComponent is not supplied, a new
+     * VictoryLabel will be created with props described above
+     * @default <VictoryLabel/>
+     */
+    axisLabelComponent?: React.ReactElement<any>;
+    /**
+     * This prop specifies whether a given axis is intended to cross another axis.
+     */
+    crossAxis?: boolean;
+    /**
+     * The dependentAxis prop specifies whether the axis corresponds to the
+     * dependent variable (usually y). This prop is useful when composing axis
+     * with other components to form a chart.
+     */
+    dependentAxis?: boolean;
+    /**
+     * The domain prop describes the range of values your axis will include. This prop should be
+     * given as a array of the minimum and maximum expected values for your axis.
+     * If this value is not given it will be calculated based on the scale or tickValues.
+     * @examples [-1, 1]
+     */
+    domain?: DomainPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "axis", "axisLabel", "ticks", "tickLabels", and "grid" are
+     * all valid targets for VictoryAxis events. The eventKey may optionally be used to select a
+     * single element by index rather than an entire set. The eventHandlers object
+     * should be given as an object whose keys are standard event names (i.e. onClick)
+     * and whose values are event callbacks. The return value of an event handler
+     * be used to modify other elemnts. The return value should be given as an object or
+     * an array of objects with optional target and eventKey keys, and a mutation
+     * key whose value is a function. The target and eventKey keys will default to those
+     * corresponding to the element the event handler was attached to. The mutation
+     * function will be called with the calculated props for the individual selected
+     * element (i.e. a single tick), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "grid",
+     *     eventKey: 2,
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *           {
+     *             mutation: (props) => {
+     *               return {style: merge({}, props.style, {stroke: "orange"})};
+     *             }
+     *           }, {
+     *             target: "tickLabels",
+     *             mutation: () => {
+     *               return {text: "hey"};
+     *             }
+     *           }
+     *         ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"axis" | "axisLabel" | "grid" | "ticks" | "tickLabels" | "parent", number | string>[];
+    /**
+     * The gridComponent prop takes in an entire component which will be used
+     * to create grid lines. The new element created from the passed gridComponent
+     * will be supplied with the following properties: x1, y1, x2, y2, tick, style and events.
+     * Any of these props may be overridden by passing in props to the supplied component,
+     * or modified or ignored within the custom component itself. If a gridComponent
+     * is not supplied, VictoryAxis will render its default GridLine component.
+     * @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
+     * component. If a label component is given, it will be cloned. The new
+     * element's properties x, y, textAnchor, verticalAnchor, and transform
+     * will have defaults provided by the axis; styles filled out with
+     * defaults provided by the axis, and overrides from the label component.
+     * If a value is given, a new VictoryLabel will be created with props and
+     * styles from the axis.
+     */
+    label?: any;
+    /**
+     * This value describes how far from the "edge" of its permitted area each axis
+     * will be set back in the x-direction.  If this prop is not given,
+     * the offset is calculated based on font size, axis orientation, and label padding.
+     */
+    offsetX?: number;
+    /**
+     * This value describes how far from the "edge" of its permitted area each axis
+     * will be set back in the y-direction.  If this prop is not given,
+     * the offset is calculated based on font size, axis orientation, and label padding.
+     */
+    offsetY?: number;
+    /**
+     * The orientation prop specifies the position and orientation of your axis.
+     */
+    orientation?: "top" | "bottom" | "left" | "right";
+    /**
+     * The style prop specifies styles for your VictoryAxis. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart.
+     * @example {axis: {stroke: "#756f6a"}, grid: {stroke: "grey"}, ticks: {stroke: "grey"},
+     * tickLabels: {fontSize: 10, padding: 5}, axisLabel: {fontSize: 16, padding: 20}}
+     */
+    style?: {
+      parent?: React.CSSProperties;
+      axis?: React.CSSProperties;
+      axisLabel?: React.CSSProperties;
+      grid?: React.CSSProperties;
+      ticks?: React.CSSProperties;
+      tickLabels?: React.CSSProperties;
+    };
+    /**
+     * The tickComponent prop takes in an entire component which will be used
+     * to create tick lines. The new element created from the passed tickComponent
+     * will be supplied with the following properties: x1, y1, x2, y2, tick, style and events.
+     * Any of these props may be overridden by passing in props to the supplied component,
+     * or modified or ignored within the custom component itself. If a tickComponent
+     * is not supplied, VictoryAxis will render its default Tick component.
+     * @default <Tick/>
+     */
+    tickComponent?: React.ReactElement<any>;
+    /**
+     * The tickCount prop specifies approximately how many ticks should be drawn on the axis if
+     * tickValues are not explicitly provided. This value is calculated by d3 scale and
+     * prioritizes returning "nice" values and evenly spaced ticks over an exact number of ticks.
+     * If you need an exact number of ticks, please specify them via the tickValues prop.
+     * This prop must have a value greater than zero.
+     * @default 5
+     */
+    tickCount?: number;
+    /**
+     * The tickLabelComponent prop takes in an entire component which will be used
+     * to create the tick labels. The new element created from the passed tickLabelComponent
+     * will be supplied with the following properties: x, y, verticalAnchor, textAnchor,
+     * angle, tick, style and events. Any of these props may be overridden by
+     * passing in props to the supplied component, or modified or ignored within
+     * the custom component itself. If an tickLabelComponent is not supplied, a new
+     * VictoryLabel will be created with props described above
+     * @default <VictoryLabel/>
+     */
+    tickLabelComponent?: React.ReactElement<any>;
+    /**
+     * The tickFormat prop specifies how tick values should be expressed visually.
+     * tickFormat can be given as a function to be applied to every tickValue, or as
+     * an array of display values for each tickValue.
+     * @example d3.time.format("%Y"), (x) => x.toPrecision(2), ["first", "second", "third"]
+     */
+    tickFormat?: any[] | { (tick: any, index: number, ticks: any[]): string | number };
+    /**
+     * The tickValues prop explicitly specifies which tick values to draw on the axis.
+     * @example ["apples", "bananas", "oranges"], [2, 4, 6, 8]
+     */
+    tickValues?: any[]
+  }
+
+  /**
+   * VictoryAxis draws an SVG chart axis with React.
+   * Styles and data can be customized by passing in your own values as properties to the component.
+   * Data changes are animated with VictoryAnimation.
+   */
+  export class VictoryAxis extends React.Component<VictoryAxisProps, any> {}
+
+  export interface VictoryBarProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryBar events.
+     * The eventKey may optionally be used to select a single element by index rather than an entire
+     * set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @example
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventKey: "thisOne",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              eventKey: "theOtherOne",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              eventKey: "theOtherOne",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The horizontal prop determines whether the bars will be laid vertically or
+     * horizontally. The bars will be vertical if this prop is false or unspecified,
+     * or horizontal if the prop is set to true.
+     */
+    horizontal?: boolean;
+    /**
+     * The style prop specifies styles for your VictoryBar. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart. In addition to normal style properties, angle and verticalAnchor
+     * may also be specified via the labels object, and they will be passed as props to
+     * VictoryLabel, or any custom labelComponent.
+     * @example {data: {fill: "red", width: 8}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
+  }
+
+  /**
+   * Draw SVG bar charts with React. VictoryBar is a composable component, so it doesn't include axes
+   * Check out VictoryChart for complete bar charts and more.
+   */
+  export class VictoryBar extends React.Component<VictoryBarProps, any> {}
+
+  export interface VictoryChartProps extends VictoryCommonProps {
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryChart, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<string, StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The style prop specifies styles for your chart. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart.
+     * @example {border: "1px solid #ccc", margin: "2%", maxWidth: "40%"}
+     */
+    style?: React.CSSProperties;
+  }
+
+  /**
+   * A flexible charting component for React.
+   * VictoryChart composes other Victory components into reusable charts.
+   * Acting as a coordinator rather than a stand-alone component, VictoryChart reconciles props such as domain and scale for child components,
+   * and provides a set of sensible defaults. This component works with:
+   * - VictoryAxis
+   * - VictoryLine
+   * - VictoryScatter
+   * - VictoryBar
+   */
+  export class VictoryChart extends React.Component<VictoryChartProps, any> {}
+
+  export interface VictoryGroupProps extends VictoryCommonProps, VictoryMultiLabeableProps {
+    /**
+     * The categories prop specifies how categorical data for a chart should be ordered.
+     * This prop should be given as an array of string values, or an object with
+     * these values for x and y. When categories are not given as an object
+     * When this prop is set on a wrapper component, it will dictate the categories of
+     * its the children. If this prop is not set, any categories on child component
+     * or categorical data, will be merged to create a shared set of categories.
+     * @example ["dogs", "cats", "mice"]
+     */
+    categories?: CategoryPropType;
+    /**
+     * The colorScale prop is an optional prop that defines the color scale the chart's bars
+     * will be created on. This prop should be given as an array of CSS colors, or as a string
+     * corresponding to one of the built in color scales. VictoryBar will automatically assign
+     * values from this color scale to the bars unless colors are explicitly provided in the
+     * `dataAttributes` prop.
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @examples: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryGroup, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The horizontal prop determines whether the bars will be laid vertically or
+     * horizontally. The bars will be vertical if this prop is false or unspecified,
+     * or horizontal if the prop is set to true.
+     */
+    horizontal?: boolean;
+    /**
+     * The style prop specifies styles for your grouped chart. These styles will be
+     * applied to all grouped children
+     */
+    style?: VictoryStyleInterface;
+  }
+
+  export class VictoryGroup extends React.Component<VictoryGroupProps, any> {}
+
+  export interface VictoryLineProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryLine events.
+     * Since VictoryLine only renders a single element, the eventKey property is not used.
+     * The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a line), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {stroke: "orange"})};
+     *              }
+     *            }, {
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", number | string>[];
+    /**
+     * The interpolation prop determines how data points should be connected
+     * when plotting a line
+     */
+    interpolation?: InterpolationPropType;
+    /**
+     * The samples prop specifies how many individual points to plot when plotting
+     * y as a function of x. Samples is ignored if x props are provided instead.
+     */
+    samples?: number;
+    /**
+     * The labels prop defines the labels that will appear above each point.
+     * This prop should be given as an array or as a function of data.
+     */
+    labels?: string[]|number[]|Function;
+    /**
+     * Use the sortKey prop to indicate how data should be sorted. This prop
+     * is given directly to the lodash sortBy function to be executed on the
+     * final dataset.
+     */
+    sortKey?: string|string[]|Function;
+    /**
+     * The style prop specifies styles for your VictoryLine. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart. in addition to normal style properties, angle and verticalAnchor
+     * may also be specified via the labels object, and they will be passed as props to
+     * VictoryLabel, or any custom labelComponent.
+     * @examples{data: {stroke: "red"}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
+  }
+
+  /**
+   * VictoryLine creates a line based on data. VictoryLine is a composable component, so it does not include an axis.
+   * Check out VictoryChart for easy to use line charts and more.
+   */
+  export class VictoryLine extends React.Component<VictoryLineProps, any> {}
+
+  export interface VictoryLegendProps extends VictoryCommonProps, VictoryDatableProps, VictorySingleLabableProps {
+    /**
+     * The colorScale prop defines a color scale to be applied to each data
+     * symbol in VictoryLegend. This prop should be given as an array of CSS
+     * colors, or as a string corresponding to one of the built in color
+     * scales: "grayscale", "qualitative", "heatmap", "warm", "cool", "red",
+     * "green", "blue". VictoryLegend will assign a color to each symbol by
+     * index, unless they are explicitly specified in the data object.
+     * Colors will repeat when there are more symbols than colors in the
+     * provided colorScale.
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The style prop defines the style of the VictoryLegend component.
+     * The style prop should be given as an object with styles defined for data, labels and
+     * parent. Any valid svg styles are supported, but width, height, and
+     * padding should be specified via props as they determine relative
+     * layout for components in VictoryLegend.
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The containerComponent prop takes a component instance which will be
+     * used to create a container element for standalone legends. The new
+     * element created from the passed containerComponent will be provided
+     * with the following props: height, width, children (the legend itself)
+     * and style. If a containerComponent is not provided, the default
+     * VictoryContainer component will be used. VictoryContainer supports
+     * title and desc props, which are intended to add accessibility to
+     * Victory components. The more descriptive these props are, the more
+     * accessible your data will be for people using screen readers. These
+     * props may be set by passing them directly to the supplied component.
+     * By default, VictoryContainer renders a responsive svg using the
+     * viewBox attribute. To render a static container, set
+     * responsive={false} directly on the instance of VictoryContainer
+     * supplied via the containerComponent prop. VictoryContainer also
+     * renders a Portal element that may be used in conjunction with
+     * VictoryPortal to force components to render above other children.
+     * @default <VictoryContainer/>
+     */
+    containerComponent?: React.ReactElement<any>;
+    /**
+     * Specify data via the data prop. VictoryLegend expects data as an
+     * array of objects with name (required), symbol, and labels properties.
+     * The data prop must be given as an array.
+     */
+    data?: Array<{
+      name?: string;
+      symbol?: {
+        fill?: string;
+        type?: string;
+      };
+    }>;
+    /**
+     * The itemsPerRow prop determines how many items to render in each row
+     * of a horizontal legend, or in each column of a vertical legend. This
+     * prop should be given as an integer. When this prop is not given,
+     * legend items will be rendered in a single row or column.
+     */
+    itemsPerRow?: number;
+    /**
+     * The dataComponent prop takes a component instance which will be
+     * responsible for rendering a data element used to associate a symbol
+     * or color with each data series. The new element created from the
+     * passed dataComponent will be provided with the following properties
+     * calculated by VictoryLegend: x, y, size, style, and symbol. Any of
+     * these props may be overridden by passing in props to the supplied
+     * component, or modified or ignored within the custom component itself.
+     * If a dataComponent is not provided, VictoryLegend will use its
+     * default Point component.
+     */
+    dataComponent?: React.ReactElement<any>;
+    /**
+     * The groupComponent prop takes an entire component which will be used to
+     * create group elements for use within container elements. This prop defaults
+     * to a <g> tag on web, and a react-native-svg <G> tag on mobile
+     * @default <g/>
+     */
+    groupComponent?: React.ReactElement<any>;
+    /**
+     * The gutter prop defines the number of pixels between legend rows or
+     * columns, depending on orientation. When orientation is horizontal,
+     * gutters are between columns. When orientation is vertical, gutters
+     * are the space between rows.
+     */
+    gutter?: number;
+    /**
+     * The labelComponent prop takes a component instance which will be used
+     * to render each legend label. The new element created from the passed
+     * labelComponent will be supplied with the following properties: x, y,
+     * style, and text. Any of these props may be overridden by passing in
+     * props to the supplied component, or modified or ignored within the
+     * custom component itself. If labelComponent is omitted, a new
+     * VictoryLabel will be created with the props described above.
+     */
+    labelComponent?: React.ReactElement<any>;
+    /**
+     * The orientation prop takes a string that defines whether legend data
+     * are displayed in a row or column. When orientation is "horizontal",
+     * legend items will be displayed in a single row. When orientation is
+     * "vertical", legend items will be displayed in a single column. Line
+     * and text-wrapping is not currently supported, so "vertical"
+     * orientation is both the default setting and recommended for
+     * displaying many series of data.
+     * @default 'vertical'
+     */
+    orientation?: 'horizontal'|'vertical';
+    /**
+     * The padding prop specifies the amount of padding in pixels between
+     * the edge of the legend and any rendered child components. This prop
+     * can be given as a number or as an object with padding specified for
+     * top, bottom, left and right. As with width and height, the absolute
+     * padding will depend on whether the component is rendered in a
+     * responsive container. When a component is nested within
+     * VictoryLegend, setting padding on the child component will have no
+     * effect.
+     */
+    padding?: number | {
+      top?: number;
+      bottom?: number;
+      left?: number;
+      right?: number;
+    };
+    /**
+     * The standalone props specifies whether the component should be
+     * rendered in an independent <svg> element or in a <g> tag. This prop
+     * defaults to true, and renders an svg.
+     */
+    standalone?: boolean;
+    /**
+     * The symbolSpacer prop defines the number of pixels between data
+     * components and label components.
+     */
+    symbolSpacer?: number;
+    /**
+     * The width and height props define the width and height of the legend.
+     * These props may be given as positive numbers or functions of data. If
+     * these props are not set, width and height will be determined based on
+     * an approximate text size calculated from the text and style props
+     * provided to VictoryLegend.
+     */
+    width?: number;
+    height?: number;
+    /**
+     * The x and y props define the base position of the legend element.
+     */
+    x?: number;
+    y?: number;
+  }
+
+  /**
+   * VictoryLegend renders a chart legend component.
+   */
+  export class VictoryLegend extends React.Component<VictoryLegendProps, any> {}
+
+  type ScatterSymbolType = "circle" | "diamond" | "plus" | "square" | "star" | "triangleDown" | "triangleUp";
+
+  export interface VictoryScatterProps extends VictoryCommonProps, VictoryDatableProps, VictoryMultiLabeableProps {
+    /**
+     * The bubbleProperty prop indicates which property of the data object should be used
+     * to scale data points in a bubble chart
+     */
+    bubbleProperty?: string;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryScatter
+     * events. The eventKey may optionally be used to select a single element by index rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventKey: "thisOne",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              eventKey: "theOtherOne",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              eventKey: "theOtherOne",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The maxBubbleSize prop sets an upper limit for scaling data points in a bubble chart
+     */
+    maxBubbleSize?: number;
+    /**
+     * The samples prop specifies how many individual points to plot when plotting
+     * y as a function of x. Samples is ignored if x props are provided instead.
+     */
+    samples?: number;
+    /**
+     * The size prop determines how to scale each data point
+     */
+    size?: number | { (data: any): number };
+    /**
+     * The style prop specifies styles for your VictoryScatter. Any valid inline style properties
+     * will be applied. Height, width, and padding should be specified via the height,
+     * width, and padding props, as they are used to calculate the alignment of
+     * components within chart. In addition to normal style properties, angle and verticalAnchor
+     * may also be specified via the labels object, and they will be passed as props to
+     * VictoryLabel, or any custom labelComponent.
+     * @example {data: {fill: "red"}, labels: {fontSize: 12}}
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The symbol prop determines which symbol should be drawn to represent data points.
+     */
+    symbol?: ScatterSymbolType | { (data: any): ScatterSymbolType };
+  }
+
+  /**
+   * VictoryScatter creates a scatter of points from data. VictoryScatter is a composable component, so it does not include an axis.
+   * Check out VictoryChart for easy to use scatter plots and more.
+   */
+  export class VictoryScatter extends React.Component<VictoryScatterProps, any> {}
+
+  export interface VictoryStackProps extends VictoryCommonProps, VictoryMultiLabeableProps {
+    /**
+     * The categories prop specifies how categorical data for a chart should be ordered.
+     * This prop should be given as an array of string values, or an object with
+     * these values for x and y. When categories are not given as an object
+     * When this prop is set on a wrapper component, it will dictate the categories of
+     * its the children. If this prop is not set, any categories on child component
+     * or catigorical data, will be merged to create a shared set of categories.
+     * @example ["dogs", "cats", "mice"]
+     */
+    categories?: CategoryPropType;
+    /**
+     * The colorScale prop is an optional prop that defines the color scale the chart's bars
+     * will be created on. This prop should be given as an array of CSS colors, or as a string
+     * corresponding to one of the built in color scales. VictoryBar will automatically assign
+     * values from this color scale to the bars unless colors are explicitly provided in the
+     * `dataAttributes` prop.
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The domain prop describes the range of values your chart will include. This prop can be
+     * given as a array of the minimum and maximum expected values for your chart,
+     * or as an object that specifies separate arrays for x and y.
+     * If this prop is not provided, a domain will be calculated from data, or other
+     * available information.
+     * @example: [-1, 1], {x: [0, 100], y: [0, 1]}
+     */
+    domain?: DomainPropType;
+    /**
+     * The domainPadding prop specifies a number of pixels of padding to add to the
+     * beginning and end of a domain. This prop is useful for explicitly spacing ticks farther
+     * from the origin to prevent crowding. This prop should be given as an object with
+     * numbers specified for x and y.
+     */
+    domainPadding?: DomainPaddingPropType;
+    /**
+     * The event prop take an array of event objects. Event objects are composed of
+     * a childName, target, eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, (i.e. "data" and "labels"). The childName will refer to an
+     * individual child of VictoryStack, either by its name prop, or by index. The eventKey
+     * may optionally be used to select a single element by index or eventKey rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey and childName keys,
+     * and a mutation key whose value is a function. The target and eventKey and childName keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     childName: "firstBar",
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              childName: "secondBar",
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              childName: "secondBar",
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * The horizontal prop determines whether the bars will be laid vertically or
+     * horizontally. The bars will be vertical if this prop is false or unspecified,
+     * or horizontal if the prop is set to true.
+     */
+    horizontal?: boolean;
+    /**
+     * The style prop specifies styles for your grouped chart. These styles will be
+     * applied to all grouped children
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The xOffset prop is used for grouping stacks of bars. This prop will be set
+     * by the VictoryGroup component wrapper, or can be set manually.
+     */
+    xOffset?: number;
+  }
+
+  export class VictoryStack extends React.Component<VictoryStackProps, any> {}
+
+  export interface VictoryPieProps extends VictoryCommonProps, VictoryMultiLabeableProps {
+    /**
+     * The colorScale prop is an optional prop that defines the color scale the pie
+     * will be created on. This prop should be given as an array of CSS colors, or as a string
+     * corresponding to one of the built in color scales. VictoryPie will automatically assign
+     * values from this color scale to the pie slices unless colors are explicitly provided in the
+     * data object
+     */
+    colorScale?: ColorScalePropType;
+    /**
+     * The data prop specifies the data to be plotted,
+     * where data X-value is the slice label (string or number),
+     * and Y-value is the corresponding number value represented by the slice
+     * Data should be in the form of an array of data points.
+     * Each data point may be any format you wish (depending on the `x` and `y` accessor props),
+     * but by default, an object with x and y properties is expected.
+     * @example [{x: 1, y: 2}, {x: 2, y: 3}], [[1, 2], [2, 3]],
+     * [[{x: "a", y: 1}, {x: "b", y: 2}], [{x: "a", y: 2}, {x: "b", y: 3}]]
+     */
+    data?: any[];
+    /**
+     * The dataComponent prop takes an entire, HTML-complete data component which will be used to
+     * create slices for each datum in the pie chart. The new element created from the passed
+     * dataComponent will have the property datum set by the pie chart for the point it renders;
+     * properties style and pathFunction calculated by VictoryPie; an index property set
+     * corresponding to the location of the datum in the data provided to the pie; events bound to
+     * the VictoryPie; and the d3 compatible slice object.
+     * If a dataComponent is not provided, VictoryPie's Slice component will be used.
+     */
+    dataComponent?: React.ReactElement<any>;
+    /**
+     * The labelRadius prop defines the radius of the arc that will be used for positioning each slice label.
+     * If this prop is not set, the label radius will default to the radius of the pie + label padding.
+     */
+    labelRadius?: number;
+    /**
+     * The overall end angle of the pie in degrees. This prop is used in conjunction with
+     * startAngle to create a pie that spans only a segment of a circle.
+     */
+    endAngle?: number;
+    /**
+     * The event prop takes an array of event objects. Event objects are composed of
+     * a target, an eventKey, and eventHandlers. Targets may be any valid style namespace
+     * for a given component, so "data" and "labels" are all valid targets for VictoryPie
+     * events. The eventKey may optionally be used to select a single element by index rather than
+     * an entire set. The eventHandlers object should be given as an object whose keys are standard
+     * event names (i.e. onClick) and whose values are event callbacks. The return value
+     * of an event handler is used to modify elemnts. The return value should be given
+     * as an object or an array of objects with optional target and eventKey keys,
+     * and a mutation key whose value is a function. The target and eventKey keys
+     * will default to those corresponding to the element the event handler was attached to.
+     * The mutation function will be called with the calculated props for the individual selected
+     * element (i.e. a single bar), and the object returned from the mutation function
+     * will override the props of the selected element via object assignment.
+     * @examples
+     * events={[
+     *   {
+     *     target: "data",
+     *     eventKey: 1,
+     *     eventHandlers: {
+     *       onClick: () => {
+     *         return [
+     *            {
+     *              eventKey: 2,
+     *              mutation: (props) => {
+     *                return {style: merge({}, props.style, {fill: "orange"})};
+     *              }
+     *            }, {
+     *              eventKey: 2,
+     *              target: "labels",
+     *              mutation: () => {
+     *                return {text: "hey"};
+     *              }
+     *            }
+     *          ];
+     *       }
+     *     }
+     *   }
+     * ]}
+     *}}
+      */
+    events?: EventPropTypeInterface<"data" | "labels" | "parent", StringOrNumberOrCallback | string[] | number[]>[];
+    /**
+     * Similar to data accessor props `x` and `y`, this prop may be used to functionally
+     * assign eventKeys to data
+     */
+    eventKey?: StringOrNumberOrCallback;
+    /**
+     * When creating a donut chart, this prop determines the number of pixels between
+     * the center of the chart and the inner edge of a donut. When this prop is set to zero
+     * a regular pie chart is rendered.
+     */
+    innerRadius?: number;
+    /**
+     * Set the cornerRadius for every dataComponent (Slice by default) within VictoryPie
+     */
+    cornerRadius?: number;
+    /**
+     * The padAngle prop determines the amount of separation between adjacent data slices
+     * in number of degrees
+     */
+    padAngle?: number;
+    /**
+     * The overall start angle of the pie in degrees. This prop is used in conjunction with
+     * endAngle to create a pie that spans only a segment of a circle.
+     */
+    startAngle?: number;
+    /**
+     * The style prop specifies styles for your pie. VictoryPie relies on Radium,
+     * so valid Radium style objects should work for this prop. Height, width, and
+     * padding should be specified via the height, width, and padding props.
+     * @example {data: {stroke: "black"}, label: {fontSize: 10}}
+     */
+    style?: VictoryStyleInterface;
+    /**
+     * The x prop specifies how to access the X value of each data point.
+     * If given as a function, it will be run on each data point, and returned value will be used.
+     * If given as an integer, it will be used as an array index for array-type data points.
+     * If given as a string, it will be used as a property key for object-type data points.
+     * If given as an array of strings, or a string containing dots or brackets,
+     * it will be used as a nested object property path (for details see Lodash docs for _.get).
+     * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
+     * @example 0, 'x', 'x.value.nested.1.thing', 'x[2].also.nested', null, d => Math.sin(d)
+     */
+    x?: DataGetterPropType;
+    /**
+     * The y prop specifies how to access the Y value of each data point.
+     * If given as a function, it will be run on each data point, and returned value will be used.
+     * If given as an integer, it will be used as an array index for array-type data points.
+     * If given as a string, it will be used as a property key for object-type data points.
+     * If given as an array of strings, or a string containing dots or brackets,
+     * it will be used as a nested object property path (for details see Lodash docs for _.get).
+     * If `null` or `undefined`, the data value will be used as is (identity function/pass-through).
+     * @example 0, 'y', 'y.value.nested.1.thing', 'y[2].also.nested', null, d => Math.sin(d)
+     */
+    y?: DataGetterPropType;
+  }
+
+  /**
+   * victory-pie draws an SVG pie or donut chart with React.
+   * Styles and data can be customized by passing in your own values as properties to the component.
+   * Data changes are animated with VictoryAnimation.
+   */
+  export class VictoryPie extends React.Component<VictoryPieProps, any> {}
 }
diff --git a/types/video.js/index.d.ts b/types/video.js/index.d.ts
index 5ba14c022d..db3697b65a 100644
--- a/types/video.js/index.d.ts
+++ b/types/video.js/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for Video.js 6.2
+// Type definitions for Video.js 7.2
 // Project: https://github.com/videojs/video.js
 // Definitions by: Vincent Bortone <https://github.com/vbortone>
 //                 Simon Clériot <https://github.com/scleriot>
@@ -6,145 +6,6665 @@
 //                 Christoph Wagner <https://github.com/IgelCampus>
 //                 Gio Freitas <https://github.com/giofreitas>
 //                 Grzegorz Błaszczyk <https://github.com/gjanblaszczyk>
+//                 Stéphane Roucheray <https://github.com/sroucheray>
+//                 Adam Eisenreich <https://github.com/AkxeOne>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
 
 // The Video.js API allows you to interact with the video through
 // Javascript, whether the browser is playing the video through HTML5
 // video, Flash, or any other supported playback technologies.
 
+/**
+ * Doubles as the main function for users to create a inplayer instance and also
+ * the main library object.
+ * The `videojs` function can be used to initialize or retrieve a player.
+ *
+ * @param id
+ *        Video element or video element ID
+ *
+ * @param [options]
+ *        Optional options object for config/settings
+ *
+ * @param [ready]
+ *        Optional ready callback
+ *
+ * @return A player instance
+ */
 declare function videojs(id: any, options?: videojs.PlayerOptions, ready?: () => void): videojs.Player;
 export = videojs;
 export as namespace videojs;
 
 declare namespace videojs {
+	/**
+	 * Adding languages so that they're available to all players.
+	 * Example: `addLanguage('es', { 'Hello': 'Hola' });`
+	 *
+	 * @param code
+	 *        The language code or dictionary property
+	 *
+	 * @param data
+	 *        The data values to be translated
+	 *
+	 * @return The resulting language dictionary object
+	 */
+	function addLanguage(code: string, data: LanguageTranslations): LanguageTranslations;
+
+	/**
+	 * Bind (a.k.a proxy or Context). A simple method for changing the context of a function
+	 * It also stores a unique id on the function so it can be easily removed from events.
+	 *
+	 * @param context
+	 *        The object to bind as scope.
+	 *
+	 * @param fn
+	 *        The function to be bound to a scope.
+	 *
+	 * @param [uid]
+	 *        An optional unique ID for the function to be set
+	 *
+	 * @return The new function that will be bound into the context given
+	 */
+	function bind<F extends (() => any)>(context: any, fn: F, uid?: number): F;
+
+	/**
+	 * Should create a fake `TimeRange` object which mimics an HTML5 time range instance.
+	 *
+	 * @param start
+	 *        The start of a single range or an array of ranges
+	 *
+	 * @param end
+	 *        The end of a single range.
+	 */
+	function createTimeRanges(start?: number | TimeRange[], end?: number): TimeRange;
+
+	/**
+	 * A suite of browser and device tests from {@link browser}.
+	 *
+	 */
+	const browser: Browser;
+
+	const dom: Dom;
+
+	/**
+	 * Format seconds as a time string, H:MM:SS or M:SS. Supplying a guide (in seconds)
+	 * will force a number of leading zeros to cover the length of the guide.
+	 *
+	 * @param seconds
+	 *        Number of seconds to be turned into a string
+	 *
+	 * @param guide
+	 *        Number (in seconds) to model the string after
+	 *
+	 * @return Time formatted as H:MM:SS or M:SS
+	 */
+	function formatTime(seconds: number, guide: number): string;
+
+	/**
+	 * Returns an array of all current players.
+	 *
+	 * @return An array of all players. The array will be in the order that
+	 *         `Object.keys` provides, which could potentially vary between
+	 *         JavaScript engines.
+	 *
+	 */
+	function getAllPlayers(): Player[];
+
+	/**
+	 * Get a component class object by name
+	 *
+	 * @borrows Component.getComponent as getComponent
+	 */
 	const getComponent: typeof Component.getComponent;
+
+	/**
+	 * Get a single player based on an ID or DOM element.
+	 *
+	 * This is useful if you want to check if an element or ID has an associated
+	 * Video.js player, but not create one if it doesn't.
+	 *
+	 * @param id
+	 *          An HTML element - `<video>`, `<audio>`, or `<video-js>` -
+	 *          or a string matching the `id` of such an element.
+	 *
+	 * @return	A player instance or `undefined` if there is no player instance
+	 *          matching the argument.
+	 */
+	function getPlayer(id: string): Player;
+
+	/**
+	 * Get an object with the currently created players, keyed by player ID
+	 *
+	 * @return	The created players
+	 */
+	function getPlayers(): {[key: string]: Player};
+
+	/**
+	 * Gets a plugin by name if it exists.
+	 *
+	 * @param name
+	 *         The name of a plugin.
+	 *
+	 * @return	The plugin (or `undefined`).
+	 */
+	const getPlugin: typeof Plugin.getPlugin;
+
+	/**
+	 * Gets an object containing multiple Video.js plugins.
+	 *
+	 * @param [names]
+	 *         If provided, should be an array of plugin names. Defaults to _all_
+	 *         plugin names.
+	 *
+	 * @return	An object containing plugin(s) associated with their name(s) or
+	 *         `undefined` if no matching plugins exist).
+	 */
+	const getPlugins: typeof Plugin.getPlugins;
+
+	/**
+	 * Gets a plugin's version, if available
+	 *
+	 * @param name
+	 *         The name of a plugin.
+	 *
+	 * @return	The plugin's version or an empty string.
+	 */
+	const getPluginVersion: typeof Plugin.getPluginVersion;
+
+	/**
+	 * Get a Tech class object by name
+	 *
+	 * @borrows Tech.getTech as getTech
+	 */
+	const getTech: typeof Tech.getTech;
+
+	/**
+	 * Add a function hook to a specific videojs lifecycle.
+	 *
+	 * @param type
+	 *        the lifecycle to hook the function to.
+	 *
+	 * @param fn
+	 *        The function or array of functions to attach.
+	 */
+	function hook(type: 'setup', fn: Hook.Setup | Hook.Setup[]): void;
+
+	function hook(type: 'beforesetup', fn: Hook.BeforeSetup | Hook.BeforeSetup[]): void;
+
+	/**
+	 * Add a function hook that will only run once to a specific videojs lifecycle.
+	 *
+	 * @param type
+	 *        the lifecycle to hook the function to.
+	 *
+	 * @param fn
+	 *        The function or array of functions to attach.
+	 */
+	function hookOnce(type: string, fn?: (() => any) | Array<() => any>): void;
+
+	/**
+	 * Get a list of hooks for a specific lifecycle
+	 *
+	 * @param type
+	 *        the lifecycle to get hooks from
+	 *
+	 * @param [fn]
+	 *        Optionally add a hook (or hooks) to the lifecycle that your are getting.
+	 *
+	 * @return	an array of hooks, or an empty array if there are none.
+	 */
+	function hooks(type: string, fn?: (() => any) | Array<() => any>): void;
+
+	/**
+	 * Returns whether the url passed is a cross domain request or not.
+	 *
+	 * @param url
+	 *        The url to check.
+	 *
+	 * @return	Whether it is a cross domain request or not.
+	 */
+	function isCrossOrigin(url: string): boolean;
+
+	/**
+	 * An Object that contains lifecycle hooks as keys which point to an array
+	 * of functions that are run when a lifecycle is triggered
+	 */
+	const hooks_: { [type: string]: (() => any) };
+
+	/**
+	 * Log messages
+	 *
+	 * @borrows log:log as log
+	 */
+	const log: Log;
+
+	/**
+	 * Deep-merge one or more options objects, recursively merging **only** plain
+	 * object properties.
+	 *
+	 * @param sources
+	 *          One or more objects to merge into a new object.
+	 *
+	 * @return	A new object that is the merged result of all sources.
+	 */
+	function mergeOptions<A, B, C, D, E, F>(option: A, option2?: B, option3?: C, option4?: D, option5?: E, option6?: F): A & B & C & D & E & F;
+
+	/**
+	 * Resolve and parse the elements of a URL.
+	 *
+	 * @param url
+	 *         The url to parse
+	 *
+	 * @return	An object of url details
+	 */
+	function parseUrl(url: string): url.URLObject;
+
+	/**
+	 * An object that can be returned by a middleware to signify
+	 * that the middleware is being terminated.
+	 */
+	const middleware: { TERMINATOR: {} };
+
+	/**
+	 * Removes event listeners from an element
+	 *
+	 * @param elem
+	 *        Object to remove listeners from.
+	 *
+	 * @param [type]
+	 *        Type of listener to remove. Don't include to remove all events from element.
+	 *
+	 * @param [fn]
+	 *        Specific listener to remove. Don't include to remove listeners for an event
+	 *        type.
+	 */
+	function off(elem: Element, type: string | string, fn: EventTarget.EventListener): void;
+
+	/**
+	 * Add an event listener to element
+	 * It stores the handler function in a separate cache object
+	 * and adds a generic handler to the element's event,
+	 * along with a unique id (guid) to the element.
+	 *
+	 * @param elem
+	 *        Element or object to bind listeners to
+	 *
+	 * @param type
+	 *        Type of event to bind to.
+	 *
+	 * @param fn
+	 *        Event listener.
+	 */
+	function on(elem: Element, type: string | string[], fn: EventTarget.EventListener): void;
+
+	/**
+	 * Trigger a listener only once for an event
+	 *
+	 * @param elem
+	 *        Element or object to bind to.
+	 *
+	 * @param type
+	 *        Name/type of event
+	 *
+	 * @param fn
+	 *        Event Listener function
+	 */
+	function one(elem: Element, type: string | string[], fn: EventTarget.EventListener): void;
+
+	/**
+	 * The global options object. These are the settings that take effect
+	 * if no overrides are specified when the player is created.
+	 *
+	 */
+	const options: PlayerOptions;
+
+	/**
+	 * Deprecated method to register a plugin with Video.js
+	 *
+	 * @deprecated
+	 *        plugin() is deprecated; use registerPlugin() instead
+	 *
+	 * @param name
+	 *        The plugin name
+	 *
+	 * @param plugin
+	 *         The plugin sub-class or function
+	 */
+	const plugin: typeof Plugin.registerPlugin;
+
+	/**
+	 * Register a component so it can referred to by name. Used when adding to other
+	 * components, either through addChild `component.addChild('myComponent')` or through
+	 * @default children options  `{ children: ['myComponent'] }`.
+	 *
+	 * > NOTE: You could also just initialize the component before adding.
+	 * `component.addChild(new MyComponent());`
+	 *
+	 * @param name
+	 *        The class name of the component
+	 *
+	 * @param comp
+	 *        The component class
+	 *
+	 * @return	The newly registered component
+	 */
 	const registerComponent: typeof Component.registerComponent;
 
-	interface PlayerOptions {
-		techOrder?: string[];
-		sourceOrder?: boolean;
-		html5?: any;
-		width?: number;
-		height?: number;
+	/**
+	 * Register a Video.js plugin.
+	 *
+	 * @borrows plugin:registerPlugin as registerPlugin
+	 *
+	 * @param name
+	 *         The name of the plugin to be registered. Must be a string and
+	 *         must not match an existing plugin or a method on the `Player`
+	 *         prototype.
+	 *
+	 * @param plugin
+	 *         A sub-class of `Plugin` or a function for basic plugins.
+	 *
+	 * @return	For advanced plugins, a factory function for that plugin. For
+	 *         basic plugins, a wrapper function that initializes the plugin.
+	 */
+	const registerPlugin: typeof Plugin.registerPlugin;
+
+	/**
+	 * Register a Tech so it can referred to by name.
+	 * This is used in the tech order for the player.
+	 *
+	 * @borrows Tech.registerTech as registerTech
+	 */
+	const registerTech: typeof Tech.registerTech;
+
+	/**
+	 * Resets formatTime to the default implementation.
+	 */
+	function resetFormatTime(): void;
+
+	/**
+	 * Replaces the default formatTime implementation with a custom implementation.
+	 *
+	 * @param customImplementation
+	 *        A function which will be used in place of the default formatTime implementation.
+	 *        Will receive the current time in seconds and the guide (in seconds) as arguments.
+	 */
+	function setFormatTime(customImplementation: (seconds: number, guide: number) => string): void;
+
+	/**
+	 * Remove a hook from a specific videojs lifecycle.
+	 *
+	 * @param type
+	 *        the lifecycle that the function hooked to
+	 *
+	 * @param fn
+	 *        The hooked function to remove
+	 *
+	 * @return	The function that was removed or undef
+	 */
+	function removeHook(type: string, fn: (() => any)): boolean;
+
+	/**
+	 * Trigger an event for an element
+	 *
+	 * @param elem
+	 *        Element to trigger an event on
+	 *
+	 * @param event
+	 *        A string (the type) or an event object with a type attribute
+	 *
+	 * @param [hash]
+	 *        data hash to pass along with the event
+	 *
+	 * @return	- Returns the opposite of `defaultPrevented` if default was prevented
+	 *         - Otherwise returns undefined
+	 */
+	function trigger(elem: Element, event: EventTarget.Event | string, hash?: any): boolean | undefined;
+
+	/**
+	 * Whether or not the browser supports touch events. Included for backward
+	 * compatibility with 4.x, but deprecated. Use `browser.TOUCH_ENABLED`
+	 * instead going forward.
+	 *
+	 * @deprecated since version 5.0
+	 */
+	const TOUCH_ENABLED: boolean;
+
+	/**
+	 * Register a middleware to a source type.
+	 *
+	 * @param type A string representing a MIME type.
+	 * @param middleware A middleware factory that takes a player.
+	 */
+	function use(type: string, middleware: (player: Player) => Middleware): void;
+
+	/**
+	 * Current software version. Follows semver.
+	 *
+	 */
+	const VERSION: string;
+
+	/**
+	 * A cross-browser XMLHttpRequest wrapper. Here's a simple example:
+	 *
+	 * @param options
+	 *        settings for the request.
+	 *
+	 * @return The request object.
+	 *
+	 * @see https://github.com/Raynos/xhr
+	 */
+	const xhr: XhrObject;
+
+	namespace Hook {
+		type BeforeSetup = (element: HTMLVideoElement, options: any) => any;
+
+		type Setup = (player: Player) => void;
+	}
+
+	/**
+	 * A representation of a single `AudioTrack`. If it is part of an {@link AudioTrackList}
+	 * only one `AudioTrack` in the list will be enabled at a time.
+	 *
+	 * @see [Spec]{@link https://html.spec.whatwg.org/multipage/embedded-content.html#audiotrack}
+	 */
+	const AudioTrack: {
+		prototype: Track;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param [options={}]
+		 *        Object of option names and values
+		 *
+		 * @param [options.kind='']
+		 *        A valid audio track kind
+		 *
+		 * @param [options.id='vjs_track_' + Guid.newGUID()]
+		 *        A unique id for this AudioTrack.
+		 *
+		 * @param [options.label='']
+		 *        The menu label for this track.
+		 *
+		 * @param [options.language='']
+		 *        A valid two character language code.
+		 *
+		 * @param [options.enabled]
+		 *        If this track is the one that is currently playing. If this track is part of
+		 *        an {@link AudioTrackList}, only one {@link AudioTrack} will be enabled.
+		 */
+		new (options?: AudioTrackOptions): Track;
+	};
+
+	/**
+	 * Object of option names and values
+	 *
+	 * @param [options.kind='']
+	 *        A valid audio track kind
+	 *
+	 * @param [options.id='vjs_track_' + Guid.newGUID()]
+	 *        A unique id for this AudioTrack.
+	 *
+	 * @param [options.label='']
+	 *        The menu label for this track.
+	 *
+	 * @param [options.language='']
+	 *        A valid two character language code.
+	 *
+	 * @param [options.enabled]
+	 *        If this track is the one that is currently playing. If this track is part of
+	 *        an {@link AudioTrackList}, only one {@link AudioTrack} will be enabled.
+	 */
+	interface AudioTrackOptions {
+		kind?: AudioTrack.Kind;
+		id?: string;
+		label?: string;
+		language?: string;
+		enabled?: boolean;
+	}
+
+	namespace AudioTrack {
+		/**
+		 * All possible `AudioTrackKind`s
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/embedded-content.html#dom-audiotrack-kind
+		 */
+		type Kind = 'alternative' | 'descriptions' | 'main' | 'main-desc' | 'translation' | 'commentary';
+	}
+
+	/**
+	 * The base class for buttons that toggle specific {@link AudioTrack} types.
+	 */
+	interface AudioTrackButton extends MenuButton {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Allow sub components to stack CSS class names for the wrapper element
+		 *
+		 * @return The constructed wrapper DOM `className`
+		 */
+		buildWrapperCSSClass(): string;
+
+		/**
+		 * Create a menu item for each audio track
+		 *
+		 * @param [items=[]]
+		 *        An array of existing menu items to use.
+		 *
+		 * @return An array of menu items
+		 */
+		createItems(items?: AudioTrackMenuItem[]): AudioTrackMenuItem[];
+	}
+
+	const AudioTrackButton: {
+		prototype: AudioTrackButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options?: TrackButtonOptions): AudioTrackButton;
+	};
+
+	/**
+	 * An {@link AudioTrack} {@link MenuItem}
+	 */
+	interface AudioTrackMenuItem extends MenuItem {
+		/**
+		 * Handle any {@link AudioTrack} change.
+		 *
+		 * @param [event]
+		 *        The {@link AudioTrackList#change} event that caused this to run.
+		 *
+		 * @listens AudioTrackList#change
+		 */
+		handleTracksChange(event: EventTarget.Event): void;
+	}
+
+	const AudioTrackMenuItem: {
+		prototype: AudioTrackMenuItem;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options?: AudioTrackMenuItemOptions): AudioTrackMenuItem;
+	};
+
+	interface AudioTrackMenuItemOptions extends MenuItemOptions {
+		track?: AudioTrack;
+	}
+
+	/**
+	 * The initial play button that shows before the video has played. The hiding of the
+	 * `BigPlayButton` get done via CSS and `Player` states.
+	 */
+	interface BigPlayButton extends Button {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object. Always returns 'vjs-big-play-button'.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * This gets called when a `BigPlayButton` "clicked". See {@link ClickableComponent}
+		 * for more detailed information on what a click can be.
+		 *
+		 * @param event
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * Called when this BigPlayButton has focus and a key gets pressed down. By
+		 * default it will call `this.handleClick` when the key is space or enter.
+		 *
+		 * @param event
+		 *        The `keydown` event that caused this function to be called.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(event: EventTarget.Event): void;
+
+		/**
+		 * Called when this BigPlayButton gets mouse pressed down
+		 *
+		 * @param event
+		 *        The `keydown` event that caused this function to be called.
+		 *
+		 * @listens mousedown
+		 */
+		handleMouseDown(event: EventTarget.Event): void;
+	}
+
+	const BigPlayButton: {
+		prototype: BigPlayButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): BigPlayButton;
+	};
+
+	interface Browser {
+		ANDROID_VERSION: number | null;
+		CHROME_VERSION: number;
+		IS_ANDROID: boolean;
+		IS_ANY_SAFARI: boolean;
+		IS_CHROME: boolean;
+		IS_EDGE: boolean;
+		IS_NATIVE_ANDROID: boolean;
+		IS_IPAD: boolean;
+		IS_IPHONE: boolean;
+		IS_IPOD: boolean;
+		IS_IOS: boolean;
+		IS_SAFARI: boolean;
+		IE_VERSION: number;
+		IOS_VERSION: number | null;
+		TOUCH_ENABLED: boolean;
+	}
+
+	/**
+	 * Base class for all buttons.
+	 */
+	interface Button extends ClickableComponent {
+		options_: ComponentOptions;
+
+		/**
+		 * Create the `Button`s DOM element.
+		 *
+		 * @param [tag="button"]
+		 *        The element's node type. This argument is IGNORED: no matter what
+		 *        is passed, it will always create a `button` element.
+		 *
+		 * @param [props={}]
+		 *        An object of properties that should be set on the element.
+		 *
+		 * @param [attributes={}]
+		 *        An object of attributes that should be set on the element.
+		 *
+		 * @return The element that gets created.
+		 */
+		createEl(tag: string, props?: any, attributes?: any): HTMLButtonElement;
+
+		/**
+		 * Add a child `Component` inside of this `Button`.
+		 *
+		 * @param child
+		 *        The name or instance of a child to add.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of options that will get passed to children of
+		 *        the child.
+		 *
+		 * @return The `Component` that gets added as a child. When using a string the
+		 *         `Component` will get created by this process.
+		 *
+		 * @deprecated since version 5
+		 */
+		addChild(component: string, optionsopt?: any, indexopt?: number): Component;
+
+		addChild(component: Element, optionsopt?: any, indexopt?: number): Element;
+
+		addChild<T extends Component>(child: string | T, options?: any): T;
+
+		/**
+		 * Enable the `Button` element so that it can be activated or clicked. Use this with
+		 * {@link Button#disable}.
+		 */
+		enable(): void;
+
+		/**
+		 * Disable the `Button` element so that it cannot be activated or clicked. Use this with
+		 * {@link Button#enable}.
+		 */
+		disable(): void;
+
+		/**
+		 * This gets called when a `Button` has focus and `keydown` is triggered via a key
+		 * press.
+		 *
+		 * @param event
+		 *        The event that caused this function to get called.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(event: EventTarget.Event): void;
+	}
+
+	const Button: {
+		prototype: Button;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): Button;
+	};
+
+	/**
+	 * The button component for toggling and selecting captions
+	 */
+	interface CaptionsButton extends TextTrackButton {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Allow sub components to stack CSS class names for the wrapper element
+		 *
+		 * @return The constructed wrapper DOM `className`
+		 */
+		buildWrapperCSSClass(): string;
+
+		/**
+		 * Create caption menu items
+		 *
+		 * @return The array of current menu items.
+		 */
+		createItems(): CaptionSettingsMenuItem[];
+	}
+
+	const CaptionsButton: {
+		prototype: CaptionsButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [ready]
+		 *        The function to call when this function is ready.
+		 */
+		new (player: Player, options?: TrackButtonOptions, ready?: Component.ReadyCallback): CaptionsButton;
+	};
+
+	/**
+	 * The menu item for caption track settings menu
+	 */
+	interface CaptionSettingsMenuItem extends TextTrackMenuItem {
+		/**
+		 * This gets called when an `CaptionSettingsMenuItem` is "clicked". See
+		 * {@link ClickableComponent} for more detailed information on what a click can be.
+		 *
+		 * @param [event]
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+	}
+
+	const CaptionsSettingsMenuItem: {
+		prototype: CaptionSettingsMenuItem;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options?: CaptionSettingsMenuItemOptions): CaptionSettingsMenuItem;
+	};
+
+	interface CaptionSettingsMenuItemOptions extends TextTrackMenuItemOptions {
+		kind: TextTrack.Kind;
+	}
+
+	/**
+	 * The button component for toggling and selecting chapters
+	 * Chapters act much differently than other text tracks
+	 * Cues are navigation vs. other tracks of alternative languages
+	 */
+	interface ChaptersButton extends TextTrackButton {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Allow sub components to stack CSS class names for the wrapper element
+		 *
+		 * @return The constructed wrapper DOM `className`
+		 */
+		buildWrapperCSSClass(): string;
+
+		/**
+		 * Create a menu item for each text track
+		 *
+		 * @return Array of menu items
+		 */
+		createItems(): TextTrackMenuItem[];
+
+		/**
+		 * Create menu from chapter track
+		 *
+		 * @return New menu for the chapter buttons
+		 */
+		createMenu(): Menu;
+
+		/**
+		 * Find the track object that is currently in use by this ChaptersButton
+		 *
+		 * @return The current track or undefined if none was found.
+		 */
+		findChaptersTrack(): TextTrack | undefined;
+
+		/**
+		 * Get the caption for the ChaptersButton based on the track label. This will also
+		 * use the current tracks localized kind as a fallback if a label does not exist.
+		 *
+		 * @return The tracks current label or the localized track kind.
+		 */
+		getMenuCaption(): string;
+
+		/**
+		 * Set the currently selected track for the chapters button.
+		 *
+		 * @param track
+		 *        The new track to select. Nothing will change if this is the currently selected
+		 *        track.
+		 */
+		setTrack(track: TextTrack): void;
+
+		/**
+		 * Update the menu based on the current state of its items.
+		 *
+		 * @param [event]
+		 *        An event that triggered this function to run.
+		 *
+		 * @listens TextTrackList#addtrack
+		 * @listens TextTrackList#removetrack
+		 * @listens TextTrackList#change
+		 */
+		update(event?: EventTarget.Event): void;
+	}
+
+	const ChaptersButton: {
+		prototype: ChaptersButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [ready]
+		 *        The function to call when this function is ready.
+		 */
+		new (player: Player, options?: TrackButtonOptions, ready?: Component.ReadyCallback): ChaptersButton;
+	};
+
+	/**
+	 * The chapter track menu item
+	 */
+	interface ChaptersTrackMenuItem extends MenuItem {
+		track: TextTrack;
+
+		cue: TextTrackCueList.TextTrackCue;
+
+		/**
+		 * This gets called when an `ChaptersTrackMenuItem` is "clicked". See
+		 * {@link ClickableComponent} for more detailed information on what a click can be.
+		 *
+		 * @param [event]
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * Update chapter menu item
+		 *
+		 * @param [event]
+		 *        The `cuechange` event that caused this function to run.
+		 *
+		 * @listens TextTrack#cuechange
+		 */
+		update(event: EventTarget.Event): void;
+	}
+
+	const ChaptersTrackMenuItem: {
+		prototype: ChaptersTrackMenuItem;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ChaptersTrackMenuItemOptions): ChaptersTrackMenuItem;
+	};
+
+	interface ChaptersTrackMenuItemOptions extends MenuItemOptions {
+		track: TextTrack;
+		cue: TextTrackCueList.TextTrackCue;
+	}
+
+	type Child = string | {
+		name: string,
+		children?: Child[]
+	};
+
+	/**
+	 * Clickable Component which is clickable or keyboard actionable,
+	 * but is not a native HTML button.
+	 */
+	interface ClickableComponent extends Component {
+		options_: ComponentOptions;
+
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Create the `Component`s DOM element.
+		 *
+		 * @param [tag=div]
+		 *        The element's node type.
+		 *
+		 * @param [props={}]
+		 *        An object of properties that should be set on the element.
+		 *
+		 * @param [attributes={}]
+		 *        An object of attributes that should be set on the element.
+		 *
+		 * @return The element that gets created.
+		 */
+		createEl(tag: string, props?: any, attributes?: any): Element;
+
+		/**
+		 * Get the localize text to use for the controls on the `Component`.
+		 *
+		 * @return - The control text when getting
+		 */
+		controlText(): string;
+
+		/**
+		 * Set the localize text to use for the controls on the `Component`.
+		 *
+		 * @param [text]
+		 *        Control text for element.
+		 *
+		 * @param [el=this.el()]
+		 *        Element to set the title on.
+		 */
+		controlText(text: string, el?: Element): void;
+
+		/**
+		 * Create a control text element on this `Component`
+		 *
+		 * @param [el]
+		 *        Parent element for the control text.
+		 *
+		 * @return The control text element that gets created.
+		 */
+		createControlTextEl(el?: Element): Element;
+
+		/**
+		 * Disable this `Component`s element.
+		 */
+		disable(): void;
+
+		/**
+		 * Enable this `Component`s element.
+		 */
+		enable(): void;
+
+		/**
+		 * This gets called when a `ClickableComponent` gets:
+		 * - Clicked (via the `click` event, listening starts in the constructor)
+		 * - Tapped (via the `tap` event, listening starts in the constructor)
+		 * - The following things happen in order:
+		 *   1. {@link ClickableComponent#handleFocus} is called via a `focus` event on the
+		 *      `ClickableComponent`.
+		 *   2. {@link ClickableComponent#handleFocus} adds a listener for `keydown` on using
+		 *      {@link ClickableComponent#handleKeyPress}.
+		 *   3. `ClickableComponent` has not had a `blur` event (`blur` means that focus was lost). The user presses
+		 *      the space or enter key.
+		 *   4. {@link ClickableComponent#handleKeyPress} calls this function with the `keydown`
+		 *      event as a parameter.
+		 *
+		 * @param event
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * This gets called when a `ClickableComponent` gains focus via a `focus` event.
+		 * Turns on listening for `keydown` events. When they happen it
+		 * calls `this.handleKeyPress`.
+		 *
+		 * @param event
+		 *        The `focus` event that caused this function to be called.
+		 *
+		 * @listens focus
+		 */
+		handleFocus(event: EventTarget.Event): void;
+
+		/**
+		 * Called when this ClickableComponent has focus and a key gets pressed down. By
+		 * default it will call `this.handleClick` when the key is space or enter.
+		 *
+		 * @param event
+		 *        The `keydown` event that caused this function to be called.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(event: EventTarget.Event): void;
+
+		/**
+		 * Called when a `ClickableComponent` loses focus. Turns off the listener for
+		 * `keydown` events. Which Stops `this.handleKeyPress` from getting called.
+		 *
+		 * @param event
+		 *        The `blur` event that caused this function to be called.
+		 *
+		 * @listens blur
+		 */
+		handleBlur(event: EventTarget.Event): void;
+	}
+
+	const ClickableComponent: {
+		prototype: ClickableComponent;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): ClickableComponent;
+	};
+
+	/**
+	 * The `CloseButton` is a `{@link Button}` that fires a `close` event when
+	 * it gets clicked.
+	 */
+	interface CloseButton extends Button {
+		options_: CloseButtonOptions;
+
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * This gets called when a `CloseButton` gets clicked. See
+		 * {@link ClickableComponent#handleClick} for more information on when this will be
+		 * triggered
+		 *
+		 * @param event
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 * @fires CloseButton#close
+		 */
+		handleClick(event: EventTarget.Event): void;
+	}
+
+	const CloseButton: {
+		prototype: CloseButton;
+
+		/**
+		 * Creates an instance of the this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: CloseButtonOptions): CloseButton;
+	};
+
+	interface CloseButtonOptions extends ComponentOptions {
+		controlText?: string;
+	}
+
+	/**
+	 * Base class for all UI Components.
+	 * Components are UI objects which represent both a javascript object and an element
+	 * in the DOM. They can be children of other components, and can have
+	 * children themselves.
+	 *
+	 * Components can also use methods from {@link EventTarget}
+	 */
+	interface Component extends EventedMixin {
+		options_: ComponentOptions;
+
+		player_: Player;
+
+		children_: Component[];
+
+		/**
+		 * Find a single DOM element matching a `selector`. This can be within the `Component`s
+		 * `contentEl()` or another custom context.
+		 *
+		 * @param selector
+		 *        A valid CSS selector, which will be passed to `querySelector`.
+		 *
+		 * @param [context=this.contentEl()]
+		 *        A DOM element within which to query. Can also be a selector string in
+		 *        which case the first matching element will get used as context. If
+		 *        missing `this.contentEl()` gets used. If  `this.contentEl()` returns
+		 *        nothing it falls back to `document`.
+		 *
+		 * @return the dom element that was found, or null
+		 *
+		 * @see [Information on CSS Selectors](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors)
+		 */
+		$(selector: string, context?: string | Element): Element;
+
+		/**
+		 * Finds all DOM element matching a `selector`. This can be within the `Component`s
+		 * `contentEl()` or another custom context.
+		 *
+		 * @param selector
+		 *        A valid CSS selector, which will be passed to `querySelectorAll`.
+		 *
+		 * @param [context=this.contentEl()]
+		 *        A DOM element within which to query. Can also be a selector string in
+		 *        which case the first matching element will get used as context. If
+		 *        missing `this.contentEl()` gets used. If  `this.contentEl()` returns
+		 *        nothing it falls back to `document`.
+		 *
+		 * @return a list of dom elements that were found
+		 *
+		 * @see [Information on CSS Selectors](https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Getting_Started/Selectors)
+		 */
+		$$(selector: string, context?: string | Element): NodeList;
+
+		/**
+		 * Add a child `Component` inside the current `Component`.
+		 *
+		 *
+		 * @param child
+		 *        The name or instance of a child to add.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of options that will get passed to children of
+		 *        the child.
+		 *
+		 * @param [index=this.children_.length]
+		 *        The index to attempt to add a child into.
+		 *
+		 * @return The `Component` that gets added as a child. When using a string the
+		 *         `Component` will get created by this process.
+		 */
+		addChild(component: string, optionsopt?: any, indexopt?: number): Component;
+
+		addChild(component: Element, optionsopt?: any, indexopt?: number): Element;
+
+		addChild<T extends Component>(child: string | T, options?: any, index?: number): T;
+
+		/**
+		 * Add a CSS class name to the `Component`s element.
+		 *
+		 * @param classToAdd
+		 *        CSS class name to add
+		 */
+		addClass(classToAdd: string): void;
+
+		/**
+		 * Remove the focus from this component
+		 */
+		blur(): void;
+
+		/**
+		 * Builds the default DOM class name. Should be overriden by sub-components.
+		 *
+		 * @return The DOM class name for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Cancels a queued callback passed to {@link Component#requestAnimationFrame}
+		 * (rAF).
+		 *
+		 * If you queue an rAF callback via {@link Component#requestAnimationFrame},
+		 * use this function instead of `window.cancelAnimationFrame`. If you don't,
+		 * your dispose listener will not get cleaned up until {@link Component#dispose}!
+		 *
+		 * @param id
+		 *        The rAF ID to clear. The return value of {@link Component#requestAnimationFrame}.
+		 *
+		 * @return Returns the rAF ID that was cleared.
+		 *
+		 * @see [Similar to]{@link https://developer.mozilla.org/en-US/docs/Web/API/window/cancelAnimationFrame}
+		 */
+		cancelAnimationFrame(id: number): number;
+
+		/**
+		 * Get an array of all child components
+		 *
+		 * @return The children
+		 */
+		children(): Component[];
+
+		/**
+		 * Clears an interval that gets created via `window.setInterval` or
+		 * {@link Component#setInterval}. If you set an inteval via {@link Component#setInterval}
+		 * use this function instead of `window.clearInterval`. If you don't your dispose
+		 * listener will not get cleaned up until {@link Component#dispose}!
+		 *
+		 * @param intervalId
+		 *        The id of the interval to clear. The return value of
+		 *        {@link Component#setInterval} or `window.setInterval`.
+		 *
+		 * @return Returns the interval id that was cleared.
+		 *
+		 * @see [Similar to]{@link https://developer.mozilla.org/en-US/docs/Web/API/WindowTimers/clearInterval}
+		 */
+		clearInterval(intervalId: number): number;
+
+		/**
+		 * Clears a timeout that gets created via `window.setTimeout` or
+		 * {@link Component#setTimeout}. If you set a timeout via {@link Component#setTimeout}
+		 * use this function instead of `window.clearTimout`. If you don't your dispose
+		 * listener will not get cleaned up until {@link Component#dispose}!
+		 *
+		 * @param timeoutId
+		 *        The id of the timeout to clear. The return value of
+		 *        {@link Component#setTimeout} or `window.setTimeout`.
+		 *
+		 * @return Returns the timeout id that was cleared.
+		 *
+		 * @see [Similar to]{@link https://developer.mozilla.org/en-US/docs/Web/API/WindowTimers/clearTimeout}
+		 */
+		clearTimeout(timeoutId: number): number;
+
+		/**
+		 * Return the `Component`s DOM element. This is where children get inserted.
+		 * This will usually be the the same as the element returned in {@link Component#el}.
+		 *
+		 * @return The content element for this `Component`.
+		 */
+		contentEl(): Element;
+
+		controlText(key: string): string;
+
+		/**
+		 * Create the `Component`s DOM element.
+		 *
+		 * @param [tagName]
+		 *        Element's DOM node type. e.g. 'div'
+		 *
+		 * @param [properties]
+		 *        An object of properties that should be set.
+		 *
+		 * @param [attributes]
+		 *        An object of attributes that should be set.
+		 *
+		 * @return The element that gets created.
+		 */
+		createEl(tagName?: string, properties?: any, attributes?: any): Element;
+
+		/**
+		 * Get the width or the height of the `Component` elements computed style. Uses
+		 * `window.getComputedStyle`.
+		 *
+		 * @param widthOrHeight
+		 *        A string containing 'width' or 'height'. Whichever one you want to get.
+		 *
+		 * @return The dimension that gets asked for or 0 if nothing was set
+		 *         for that dimension.
+		 */
+		currentDimension(widthOrHeight: 'width' | 'height'): number;
+
+		/**
+		 * Get an object that contains width and height values of the `Component`s
+		 * computed style.
+		 *
+		 * @return The dimensions of the components element
+		 */
+		currentDimensions(): Component.DimensionObject;
+
+		/**
+		 * Get the height of the `Component`s computed style. Uses `window.getComputedStyle`.
+		 *
+		 * @return height
+		 *           The height of the `Component`s computed style.
+		 */
+		currentHeight(): number;
+
+		/**
+		 * Get the width of the `Component`s computed style. Uses `window.getComputedStyle`.
+		 *
+		 * @return width
+		 *           The width of the `Component`s computed style.
+		 */
+		currentWidth(): number;
+
+		/**
+		 * Get or set width or height of the `Component` element. This is the shared code
+		 * for the {@link Component#width} and {@link Component#height}.
+		 *
+		 * Things to know:
+		 * - If the width or height in an number this will return the number postfixed with 'px'.
+		 * - If the width/height is a percent this will return the percent postfixed with '%'
+		 * - Hidden elements have a width of 0 with `window.getComputedStyle`. This function
+		 *   defaults to the `Component`s `style.width` and falls back to `window.getComputedStyle`.
+		 *   See [this]{@link http://www.foliotek.com/devblog/getting-the-width-of-a-hidden-element-with-jquery-using-width/}
+		 *   for more information
+		 * - If you want the computed style of the component, use {@link Component#currentWidth}
+		 *   and {@link {Component#currentHeight}
+		 *
+		 * @fires Component#componentresize
+		 *
+		 * @param widthOrHeight
+		 *        'width' or 'height'
+		 *
+		 * @param [num]
+		 *         New dimension
+		 *
+		 * @param [skipListeners]
+		 *         Skip componentresize event trigger
+		 *
+		 * @return The dimension when getting or 0 if unset
+		 */
+		dimension(widthOrHeight: 'width' | 'height', num: string | number, skipListeners?: boolean): void;
+
+		dimension(widthOrHeight: 'width' | 'height'): number;
+
+		/**
+		 * Set both the width and height of the `Component` element at the same time.
+		 *
+		 * @param width
+		 *         Width to set the `Component`s element to.
+		 *
+		 * @param height
+		 *         Height to set the `Component`s element to.
+		 */
+		dimensions(width: string | number, height: string | number): void;
+
+		/**
+		 * Dispose of the `Component` and all child components.
+		 *
+		 * @fires Component#dispose
+		 */
+		dispose(): void;
+
+		/**
+		 * Get the `Component`s DOM element
+		 *
+		 * @return The DOM element for this `Component`.
+		 */
+		el(): Element;
+
+		/**
+		 * Emit a 'tap' events when touch event support gets detected. This gets used to
+		 * support toggling the controls through a tap on the video. They get enabled
+		 * because every sub-component would have extra overhead otherwise.
+		 *
+		 * @fires Component#tap
+		 * @listens Component#touchstart
+		 * @listens Component#touchmove
+		 * @listens Component#touchleave
+		 * @listens Component#touchcancel
+		 * @listens Component#touchend
+		 */
+		emitTapEvents(): void;
+
+		/**
+		 * This function reports user activity whenever touch events happen. This can get
+		 * turned off by any sub-components that wants touch events to act another way.
+		 *
+		 * Report user touch activity when touch events occur. User activity gets used to
+		 * determine when controls should show/hide. It is simple when it comes to mouse
+		 * events, because any mouse event should show the controls. So we capture mouse
+		 * events that bubble up to the player and report activity when that happens.
+		 * With touch events it isn't as easy as `touchstart` and `touchend` toggle player
+		 * controls. So touch events can't help us at the player level either.
+		 *
+		 * User activity gets checked asynchronously. So what could happen is a tap event
+		 * on the video turns the controls off. Then the `touchend` event bubbles up to
+		 * the player. Which, if it reported user activity, would turn the controls right
+		 * back on. We also don't want to completely block touch events from bubbling up.
+		 * Furthermore a `touchmove` event and anything other than a tap, should not turn
+		 * controls back on.
+		 *
+		 * @listens Component#touchstart
+		 * @listens Component#touchmove
+		 * @listens Component#touchend
+		 * @listens Component#touchcancel
+		 */
+		enableTouchActivity(): void;
+
+		/**
+		 * Set the focus to this component
+		 */
+		focus(): void;
+
+		/**
+		 * Get the value of an attribute on the `Component`s element.
+		 *
+		 * @param attribute
+		 *        Name of the attribute to get the value from.
+		 *
+		 * @return - The value of the attribute that was asked for.
+		 *         - Can be an empty string on some browsers if the attribute does not exist
+		 *           or has no value
+		 *         - Most browsers will return null if the attibute does not exist or has
+		 *           no value.
+		 *
+		 * @see [DOM API]{@link https://developer.mozilla.org/en-US/docs/Web/API/Element/getAttribute}
+		 */
+		getAttribute(attribute: string): string | null;
+
+		/**
+		 * Returns the child `Component` with the given `name`.
+		 *
+		 * @param name
+		 *        The name of the child `Component` to get.
+		 *
+		 * @return The child `Component` with the given `name` or undefined.
+		 */
+		getChild(name: string): Component | undefined;
+
+		/**
+		 * Returns the child `Component` with the given `id`.
+		 *
+		 * @param id
+		 *        The id of the child `Component` to get.
+		 *
+		 * @return The child `Component` with the given `id` or undefined.
+		 */
+		getChildById(id: string): Component | undefined;
+
+		/**
+		 * Check if a component's element has a CSS class name.
+		 *
+		 * @param classToCheck
+		 *        CSS class name to check.
+		 *
+		 * @return - True if the `Component` has the class.
+		 *         - False if the `Component` does not have the class`
+		 */
+		hasClass(classToCheck: string): boolean;
+
+		/**
+		 * Get or set the height of the component based upon the CSS styles.
+		 * See {@link Component#dimension} for more detailed information.
+		 *
+		 * @param [num]
+		 *        The height that you want to set postfixed with '%', 'px' or nothing.
+		 *
+		 * @param [skipListeners]
+		 *        Skip the componentresize event trigger
+		 *
+		 * @return The width when getting, zero if there is no width. Can be a string
+		 *         postpixed with '%' or 'px'.
+		 */
+		height(num: number | string, skipListeners?: boolean): void;
+
+		height(): number | string;
+
+		/**
+		 * Hide the `Component`s element if it is currently showing by adding the
+		 * 'vjs-hidden` class name to it.
+		 */
+		hide(): void;
+
+		/**
+		 * Get this `Component`s ID
+		 *
+		 * @return The id of this `Component`
+		 */
+		id(): string;
+
+		/**
+		 * Add and initialize default child `Component`s based upon options.
+		 */
+		initChildren(): void;
+
+		/**
+		 * Localize a string given the string in english.
+		 *
+		 * If tokens are provided, it'll try and run a simple token replacement on the provided string.
+		 * The tokens it looks for look like `{1}` with the index being 1-indexed into the tokens array.
+		 *
+		 * If a `defaultValue` is provided, it'll use that over `string`,
+		 * if a value isn't found in provided language files.
+		 * This is useful if you want to have a descriptive key for token replacement
+		 * but have a succinct localized string and not require `en.json` to be included.
+		 *
+		 * Currently, it is used for the progress bar timing.
+		 * ```js
+		 * {
+		 *   "progress bar timing: currentTime={1} duration={2}": "{1} of {2}"
+		 * }
+		 * ```
+		 * It is then used like so:
+		 * ```js
+		 * this.localize('progress bar timing: currentTime={1} duration{2}',
+		 *               [this.player_.currentTime(), this.player_.duration()],
+		 *               '{1} of {2}');
+		 * ```
+		 *
+		 * Which outputs something like: `01:23 of 24:56`.
+		 *
+		 *
+		 * @param string
+		 *        The string to localize and the key to lookup in the language files.
+		 * @param [tokens]
+		 *        If the current item has token replacements, provide the tokens here.
+		 * @param [defaultValue]
+		 *        Defaults to `string`. Can be a default value to use for token replacement
+		 *        if the lookup key is needed to be separate.
+		 *
+		 * @return The localized string or if no localization exists the english string.
+		 */
+		localize(string: string, tokens?: string[], defaultValue?: string): string;
+
+		/**
+		 * Lock a `Component`s element in its visible state by adding the 'vjs-lock-showing'
+		 * class name to it. Used during fadeIn/fadeOut.
+		 *
+		 */
+		lockShowing(): void;
+
+		/**
+		 * Get the `Component`s name. The name gets used to reference the `Component`
+		 * and is set during registration.
+		 *
+		 * @return The name of this `Component`.
+		 */
+		name(): string;
+
+		/**
+		 * Deep merge of options objects with new options.
+		 * > Note: When both `obj` and `options` contain properties whose values are objects.
+		 *         The two properties get merged using {@link module:mergeOptions}
+		 *
+		 * @param obj
+		 *        The object that contains new options.
+		 *
+		 * @return A new object of `this.options_` and `obj` merged together.
+		 *
+		 * @deprecated since version 5
+		 */
+		options(obj: any): any;
+
+		played(): TimeRanges;
+
+		/**
+		 * Return the {@link Player} that the `Component` has attached to.
+		 *
+		 * @return The player that this `Component` has attached to.
+		 */
+		player(): Player;
+
+		/**
+		 * Bind a listener to the component's ready state.
+		 * Different from event listeners in that if the ready event has already happened
+		 * it will trigger the function immediately.
+		 *
+		 * @return Returns itself; method can be chained.
+		 */
+		ready(callback: (this: Player) => void): this;
+
+		/**
+		 * Remove an attribute from the `Component`s element.
+		 *
+		 * @param attribute
+		 *        Name of the attribute to remove.
+		 *
+		 * @see [DOM API]{@link https://developer.mozilla.org/en-US/docs/Web/API/Element/removeAttribute}
+		 */
+		removeAttribute(attribute: string): void;
+
+		/**
+		 * Remove a child `Component` from this `Component`s list of children. Also removes
+		 * the child `Component`s element from this `Component`s element.
+		 *
+		 * @param component
+		 *        The child `Component` to remove.
+		 */
+		removeChild(component: Component): void;
+
+		/**
+		 * Remove a CSS class name from the `Component`s element.
+		 *
+		 * @param classToRemove
+		 *        CSS class name to remove
+		 */
+		removeClass(classToRemove: string): void;
+
+		/**
+		 * Queues up a callback to be passed to requestAnimationFrame (rAF), but
+		 * with a few extra bonuses:
+		 *
+		 * - Supports browsers that do not support rAF by falling back to
+		 *   {@link Component#setTimeout}.
+		 *
+		 * - The callback is turned into a {@link Component~GenericCallback} (i.e.
+		 *   bound to the component).
+		 *
+		 * - Automatic cancellation of the rAF callback is handled if the component
+		 *   is disposed before it is called.
+		 *
+		 * @param fn
+		 *         A function that will be bound to this component and executed just
+		 *         before the browser's next repaint.
+		 *
+		 * @return Returns an rAF ID that gets used to identify the timeout. It can
+		 *         also be used in {@link Component#cancelAnimationFrame} to cancel
+		 *         the animation frame callback.
+		 *
+		 * @listens Component#dispose
+		 * @see [Similar to]{@link https://developer.mozilla.org/en-US/docs/Web/API/window/requestAnimationFrame}
+		 */
+		requestAnimationFrame(fn: Component.GenericCallback): number;
+
+		/**
+		 * Set the value of an attribute on the `Component`'s element
+		 *
+		 * @param attribute
+		 *        Name of the attribute to set.
+		 *
+		 * @param value
+		 *        Value to set the attribute to.
+		 *
+		 * @see [DOM API]{@link https://developer.mozilla.org/en-US/docs/Web/API/Element/setAttribute}
+		 */
+		setAttribute(attribute: string, value: string): void;
+
+		/**
+		 * Creates a function that gets run every `x` milliseconds. This function is a wrapper
+		 * around `window.setInterval`. There are a few reasons to use this one instead though.
+		 * 1. It gets cleared via  {@link Component#clearInterval} when
+		 *    {@link Component#dispose} gets called.
+		 * 2. The function callback will be a {@link Component~GenericCallback}
+		 *
+		 * @param fn
+		 *        The function to run every `x` seconds.
+		 *
+		 * @param interval
+		 *        Execute the specified function every `x` milliseconds.
+		 *
+		 * @return Returns an id that can be used to identify the interval. It can also be be used in
+		 *         {@link Component#clearInterval} to clear the interval.
+		 *
+		 * @listens Component#dispose
+		 * @see [Similar to]{@link https://developer.mozilla.org/en-US/docs/Web/API/WindowTimers/setInterval}
+		 */
+		setInterval(fn: Component.GenericCallback, interval: number): number;
+
+		/**
+		 * Creates a function that runs after an `x` millisecond timeout. This function is a
+		 * wrapper around `window.setTimeout`. There are a few reasons to use this one
+		 * instead though:
+		 * 1. It gets cleared via  {@link Component#clearTimeout} when
+		 *    {@link Component#dispose} gets called.
+		 * 2. The function callback will gets turned into a {@link Component~GenericCallback}
+		 *
+		 * > Note: You can't use `window.clearTimeout` on the id returned by this function. This
+		 *         will cause its dispose listener not to get cleaned up! Please use
+		 *         {@link Component#clearTimeout} or {@link Component#dispose} instead.
+		 *
+		 * @param fn
+		 *        The function that will be run after `timeout`.
+		 *
+		 * @param timeout
+		 *        Timeout in milliseconds to delay before executing the specified function.
+		 *
+		 * @return Returns a timeout ID that gets used to identify the timeout. It can also
+		 *         get used in {@link Component#clearTimeout} to clear the timeout that
+		 *         was set.
+		 *
+		 * @listens Component#dispose
+		 * @see [Similar to]{@link https://developer.mozilla.org/en-US/docs/Web/API/WindowTimers/setTimeout}
+		 */
+		setTimeout(fn: Component.GenericCallback, timeout: number): number;
+
+		/**
+		 * Show the `Component`s element if it is hidden by removing the
+		 * 'vjs-hidden' class name from it.
+		 */
+		show(): void;
+
+		/**
+		 * Add or remove a CSS class name from the component's element.
+		 * - `classToToggle` gets added when {@link Component#hasClass} would return false.
+		 * - `classToToggle` gets removed when {@link Component#hasClass} would return true.
+		 *
+		 * @param classToToggle
+		 *         The class to add or remove based on (@link Component#hasClass}
+		 *
+		 * @param [predicate]
+		 *         An {@link Dom~predicate} function or a boolean
+		 */
+		toggleClass(classToToggle: string, predicate?: boolean | Dom.Predicate): void;
+
+		/**
+		 * Trigger all the ready listeners for this `Component`.
+		 *
+		 * @fires Component#ready
+		 */
+		triggerReady(): void;
+
+		/**
+		 * Unlock a `Component`s element from its visible state by removing the 'vjs-lock-showing'
+		 * class name from it. Used during fadeIn/fadeOut.
+		 *
+		 */
+		unlockShowing(): void;
+
+		/**
+		 * Get or set the width of the component based upon the CSS styles.
+		 * See {@link Component#dimension} for more detailed information.
+		 *
+		 * @param [num]
+		 *        The width that you want to set postfixed with '%', 'px' or nothing.
+		 *
+		 * @param [skipListeners]
+		 *        Skip the componentresize event trigger
+		 *
+		 * @return The width when getting, zero if there is no width. Can be a string
+		 *           postpixed with '%' or 'px'.
+		 */
+		width(num: number, skipListeners?: number): void;
+
+		width(): string | number;
+	}
+
+	const Component: {
+		prototype: Component;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [options.children]
+		 *        An array of children objects to intialize this component with. Children objects have
+		 *        a name property that will be used if more than one component of the same type needs to be
+		 *        added.
+		 *
+		 * @param [ready]
+		 *        Function that gets called when the `Component` is ready.
+		 */
+		new (player: Player, options?: ComponentOptions, ready?: Component.ReadyCallback): Component;
+
+		/**
+		 * Get a `Component` based on the name it was registered with.
+		 *
+		 * @param name
+		 *        The Name of the component to get.
+		 *
+		 * @return The `Component` that got registered under the given name.
+		 *
+		 * @deprecated In `videojs` 6 this will not return `Component`s that were not
+		 *             registered using {@link Component.registerComponent}. Currently we
+		 *             check the global `videojs` object for a `Component` name and
+		 *             return that if it exists.
+		 */
+		getComponent(name: 'Button' | 'button'): typeof Button;
+		getComponent(name: 'ClickableComponent' | 'clickablecomponent'): typeof ClickableComponent;
+		getComponent(name: 'ModalDialog' | 'modaldialog'): typeof ModalDialog;
+		getComponent(name: 'Menu' | 'menu'): typeof Menu;
+		getComponent(name: 'MenuButton' | 'menubutton'): typeof MenuButton;
+		getComponent(name: 'MenuItem' | 'menuitem'): typeof MenuItem;
+		getComponent(name: 'MouseTimeDisplay' | 'mouseTimeDisplay'): typeof MouseTimeDisplay;
+		getComponent(name: 'Spacer' | 'spacer'): typeof Spacer;
+		getComponent(name: 'Player' | 'player'): typeof Player;
+		getComponent(name: 'timeTooltip' | 'TimeTooltip'): typeof TimeToolTip;
+		getComponent(name: 'Component' | 'component' | string): typeof Component;
+
+		/**
+		 * Register a `Component` with `videojs` given the name and the component.
+		 *
+		 * > NOTE: {@link Tech}s should not be registered as a `Component`. {@link Tech}s
+		 *         should be registered using {@link Tech.registerTech} or
+		 *         {@link videojs:videojs.registerTech}.
+		 *
+		 * > NOTE: This function can also be seen on videojs as
+		 *         {@link videojs:videojs.registerComponent}.
+		 *
+		 * @param name
+		 *        The name of the `Component` to register.
+		 *
+		 * @param ComponentToRegister
+		 *        The `Component` class to register.
+		 *
+		 * @return The `Component` that was registered.
+		 */
+		registerComponent(name: string, ComponentToRegister: any): any;
+	};
+
+	interface ComponentOptions {
+		children?: Child[];
+	}
+
+	namespace Component {
+		/**
+		 * A callback that is called when a component is ready. Does not have any
+		 * parameters and any callback value will be ignored.
+		 */
+		type ReadyCallback = (this: Component) => void;
+
+		/**
+		 * A callback that has no parameters and is bound into `Component`s context.
+		 */
+		type GenericCallback = (this: Component) => void;
+
+		/**
+		 * An object that contains width and height values of the `Component`s
+		 * computed style. Uses `window.getComputedStyle`.
+		 */
+		interface DimensionObject {
+			width: number;
+			height: number;
+		}
+	}
+
+	type Content = string | Element | Node | (() => (string | Element | Node));
+
+	/**
+	 * Container of main controls.
+	 */
+	interface ControlBar extends Component {
+		options_: ControlBarOptions;
+
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+	}
+
+	const ControlBar: {
+		prototype: ControlBar;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ControlBarOptions): ControlBar;
+	};
+
+	interface ControlBarOptions extends ComponentOptions {
+		volumePanel?: VolumePanelOptions;
+	}
+
+	/**
+	 * Displays the current time
+	 */
+	interface CurrentTimeDisplay extends TimeDisplay {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Update current time display
+		 *
+		 * @param [event]
+		 *        The `timeupdate` event that caused this function to run.
+		 *
+		 * @listens Player#timeupdate
+		 */
+		updateContent(event: EventTarget.Event): void;
+
+		/**
+		 * When the player fires ended there should be no time left. Sadly
+		 * this is not always the case, lets make it seem like that is the case
+		 * for users.
+		 *
+		 * @param [event]
+		 *        The `ended` event that caused this to run.
+		 *
+		 * @listens Player#ended
+		 */
+		handleEnded(event: EventTarget.Event): void;
+	}
+
+	const CurrentTimeDisplay: {
+		prototype: CurrentTimeDisplay;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options: ComponentOptions): CurrentTimeDisplay;
+	};
+
+	/**
+	 * Spacer specifically meant to be used as an insertion point for new plugins, etc.
+	 */
+	interface CustomControlSpacer extends Spacer {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+	}
+
+	const CustomControlSpacer: {
+		prototype: CustomControlSpacer;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [ready]
+		 *        Function that gets called when the `Component` is ready.
+		 */
+		new (player: Player, options?: ComponentOptions, ready?: Component.ReadyCallback): CustomControlSpacer;
+	};
+
+	/**
+	 * The button component for toggling and selecting descriptions
+	 */
+	interface DescriptionsButton extends TextTrackButton {
+		/**
+		 * Handle text track change
+		 *
+		 * @param event
+		 *        The event that caused this function to run
+		 *
+		 * @listens TextTrackList#change
+		 */
+		handleTracksChange(event: EventTarget.Event): void;
+
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Allow sub components to stack CSS class names for the wrapper element
+		 *
+		 * @return The constructed wrapper DOM `className`
+		 */
+		buildWrapperCSSClass(): string;
+	}
+
+	const DescriptionsButton: {
+		prototype: DescriptionsButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [ready]
+		 *        The function to call when this component is ready.
+		 */
+		new(player: Player, options?: TrackButtonOptions, ready?: Component.ReadyCallback): DescriptionsButton;
+	};
+
+	/**
+	 * Displays the duration
+	 */
+	interface DurationDisplay extends TimeDisplay {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Update duration time display.
+		 *
+		 * @param [event]
+		 *        The `durationchange`, `timeupdate`, or `loadedmetadata` event that caused
+		 *        this function to be called.
+		 *
+		 * @listens Player#durationchange
+		 * @listens Player#timeupdate
+		 * @listens Player#loadedmetadata
+		 */
+		updateContent(event: EventTarget.Event): void;
+	}
+
+	const DurationDisplay: {
+		prototype: DurationDisplay;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options: ComponentOptions): DurationDisplay;
+	};
+
+	/**
+	 * A display that indicates an error has occurred. This means that the video
+	 * is unplayable.
+	 */
+	interface ErrorDisplay extends ModalDialog {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 *
+		 * @deprecated Since version 5.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Gets the localized error message based on the `Player`s error.
+		 *
+		 * @return The `Player`s error message localized or an empty string.
+		 */
+		content(): string;
+	}
+
+	const ErrorDisplay: {
+		prototype: ErrorDisplay;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: ModalDialogOptions): ErrorDisplay;
+	};
+
+	interface Dom {
+		/**
+		 * Finds a single DOM element matching `selector` within the optional
+		 * `context` of another DOM element (defaulting to `document`).
+		 *
+		 * @param selector
+		 *        A valid CSS selector, which will be passed to `querySelector`.
+		 *
+		 * @param [context=document]
+		 *        A DOM element within which to query. Can also be a selector
+		 *        string in which case the first matching element will be used
+		 *        as context. If missing (or no element matches selector), falls
+		 *        back to `document`.
+		 *
+		 * @return The element that was found or null.
+		 */
+		$(selector: string, context?: string | Element): Element;
+
+		/**
+		 * Finds a all DOM elements matching `selector` within the optional
+		 * `context` of another DOM element (defaulting to `document`).
+		 *
+		 * @param selector
+		 *           A valid CSS selector, which will be passed to `querySelectorAll`.
+		 *
+		 * @param [context=document]
+		 *           A DOM element within which to query. Can also be a selector
+		 *           string in which case the first matching element will be used
+		 *           as context. If missing (or no element matches selector), falls
+		 *           back to `document`.
+		 *
+		 * @return A element list of elements that were found. Will be empty if none were found.
+		 *
+		 */
+		$$(selector: string, context?: string | Element): NodeList;
+
+		/**
+		 * Add a CSS class name to an element
+		 *
+		 * @param element
+		 *        Element to add class name to.
+		 *
+		 * @param classToAdd
+		 *        Class name to add.
+		 *
+		 * @return The dom element with the added class name.
+		 */
+		addClass(element: Element, classToAdd: string): Element;
+
+		/**
+		 * Normalizes and appends content to an element.
+		 *
+		 * @param el
+		 *        Element to append normalized content to.
+		 *
+		 *
+		 * @param content
+		 *        See the `content` argument of {@link dom:normalizeContent}
+		 *
+		 * @return The element with appended normalized content.
+		 */
+		appendContent(el: Element, content: Content | Content[]): Element;
+
+		/**
+		 * Attempt to block the ability to select text while dragging controls
+		 */
+		blockTextSelection(): void;
+
+		/**
+		 * Creates an element and applies properties.
+		 *
+		 * @param [tagName='div']
+		 *         Name of tag to be created.
+		 *
+		 * @param [properties={}]
+		 *         Element properties to be applied.
+		 *
+		 * @param [attributes={}]
+		 *         Element attributes to be applied.
+		 *
+		 * @param [content]
+		 *         Contents for the element (see: {@link dom:normalizeContent})
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(tagName: 'canvas', properties?: any, attributes?: any, content?: any): HTMLCanvasElement;
+
+		createEl(tagName: 'form', properties?: any, attributes?: any, content?: any): HTMLFormElement;
+
+		createEl(tagName: 'img', properties?: any, attributes?: any, content?: any): HTMLImageElement;
+
+		createEl(tagName: 'input', properties?: any, attributes?: any, content?: any): HTMLInputElement;
+
+		createEl(tagName: 'option', properties?: any, attributes?: any, content?: any): HTMLOptionElement;
+
+		createEl(tagName: 'select', properties?: any, attributes?: any, content?: any): HTMLSelectElement;
+
+		createEl(tagName: 'textarea', properties?: any, attributes?: any, content?: any): HTMLTextAreaElement;
+
+		createEl(tagName?: string, properties?: any, attributes?: any, content?: any): Element;
+
+		/**
+		 * Empties the contents of an element.
+		 *
+		 * @param el
+		 *        The element to empty children from
+		 *
+		 * @return The element with no children
+		 */
+		emptyEl(el: Element): Element;
+
+		/**
+		 * Offset Left.
+		 * getBoundingClientRect technique from
+		 * John Resig
+		 *
+		 * @see http://ejohn.org/blog/getboundingclientrect-is-awesome/
+		 *
+		 * @param el
+		 *        Element from which to get offset
+		 *
+		 * @return The position of the element that was passed in.
+		 */
+		findPosition(el: Element): Position;
+
+		/**
+		 * Get the value of an element's attribute
+		 *
+		 * @param el
+		 *        A DOM element
+		 *
+		 * @param attribute
+		 *        Attribute to get the value of
+		 *
+		 * @return value of the attribute
+		 */
+		getAttribute(el: Element, attribute: string): string;
+
+		/**
+		 * Get an element's attribute values, as defined on the HTML tag
+		 * Attributes are not the same as properties. They're defined on the tag
+		 * or with setAttribute (which shouldn't be used with HTML)
+		 * This will return true or false for boolean attributes.
+		 *
+		 * @param tag
+		 *        Element from which to get tag attributes.
+		 *
+		 * @return All attributes of the element.
+		 */
+		getAttributes(tag: Element): any;
+
+		/**
+		 * Identical to the native `getBoundingClientRect` function, but ensures that
+		 * the method is supported at all (it is in all browsers we claim to support)
+		 * and that the element is in the DOM before continuing.
+		 *
+		 * This wrapper function also shims properties which are not provided by some
+		 * older browsers (namely, IE8).
+		 *
+		 * Additionally, some browsers do not support adding properties to a
+		 * `ClientRect`/`DOMRect` object; so, we shallow-copy it with the standard
+		 * properties (except `x` and `y` which are not widely supported). This helps
+		 * avoid implementations where keys are non-enumerable.
+		 *
+		 * @param el
+		 *         Element whose `ClientRect` we want to calculate.
+		 *
+		 * @return Always returns a plain
+		 */
+		getBoundingClientRect(el: Element): ClientRect;
+
+		/**
+		 * Get pointer position in element
+		 * Returns an object with x and y coordinates.
+		 * The base on the coordinates are the bottom left of the element.
+		 *
+		 * @param el
+		 *        Element on which to get the pointer position on
+		 *
+		 * @param event
+		 *        Event object
+		 *
+		 * @return A Coordinates object corresponding to the mouse position.
+		 *
+		 */
+		getPointerPosition(el: Element, event: Event): Dom.Coordinates;
+
+		/**
+		 * Check if an element has a CSS class
+		 *
+		 * @param element
+		 *        Element to check
+		 *
+		 * @param classToCheck
+		 *        Class name to check for
+		 *
+		 * @return - True if the element had the class
+		 *         - False otherwise.
+		 *
+		 * @throws {Error}
+		 *         Throws an error if `classToCheck` has white space.
+		 */
+		hasClass(element: Element, classToCheck: string): boolean;
+
+		/**
+		 * Normalizes and inserts content into an element; this is identical to
+		 * `appendContent()`, except it empties the element first.
+		 *
+		 * @param el
+		 *        Element to insert normalized content into.
+		 *
+		 * @param content
+		 *        See the `content` argument of {@link dom:normalizeContent}
+		 *
+		 * @return The element with inserted normalized content.
+		 *
+		 */
+		insertContent(el: Element, content: string | Element | (() => any)): Element;
+
+		/**
+		 * Determines, via duck typing, whether or not a value is a DOM element.
+		 *
+		 * @param value
+		 *        The thing to check
+		 *
+		 * @return - True if it is a DOM element
+		 *         - False otherwise
+		 */
+		isEl(value: any): boolean;
+
+		/**
+		 * Determines if the current DOM is embedded in an iframe.
+		 *
+		 * @return
+		 */
+		isInFrame(): boolean;
+
+		/**
+		 * Whether the current DOM interface appears to be real.
+		 *
+		 * @return
+		 */
+		isReal(): boolean;
+
+		/**
+		 * Check if event was a single left click
+		 *
+		 * @param event
+		 *        Event object
+		 *
+		 * @return - True if a left click
+		 *         - False if not a left click
+		 */
+		isSingleLeftClick(event: EventTarget.Event): boolean;
+
+		/**
+		 * Determines, via duck typing, whether or not a value is a text node.
+		 *
+		 * @param value
+		 *        Check if this value is a text node.
+		 *
+		 * @return - True if it is a text node
+		 *         - False otherwise
+		 */
+		isTextNode(value: any): boolean;
+
+		/**
+		 * Normalizes content for eventual insertion into the DOM.
+		 *
+		 * This allows a wide range of content definition methods, but protects
+		 * from falling into the trap of simply writing to `innerHTML`, which is
+		 * an XSS concern.
+		 *
+		 * The content for an element can be passed in multiple types and
+		 * combinations, whose behavior is as follows:
+		 *
+		 * @param content
+		 *        - String: Normalized into a text node.
+		 *        - Element/TextNode: Passed through.
+		 *        - Array: A one-dimensional array of strings, elements, nodes, or functions
+		 *          (which return single strings, elements, or nodes).
+		 *        - Function: If the sole argument, is expected to produce a string, element,
+		 *          node, or array as defined above.
+		 *
+		 * @return All of the content that was passed in normalized.
+		 */
+		normalizeContent(content: Content | Content[]): Content[];
+
+		/**
+		 * Insert an element as the first child node of another
+		 *
+		 * @param child
+		 *        Element to insert
+		 *
+		 * @param parent
+		 *        Element to insert child into
+		 */
+		prependTo(child: Element, parent: Element): void;
+
+		/**
+		 * Remove an element's attribute
+		 *
+		 * @param el
+		 *        A DOM element
+		 *
+		 * @param attribute
+		 *        Attribute to remove
+		 */
+		removeAttribute(el: Element, attribute: string): void;
+
+		/**
+		 * Remove a CSS class name from an element
+		 *
+		 * @param element
+		 *        Element to remove a class name from.
+		 *
+		 * @param classToRemove
+		 *        Class name to remove
+		 *
+		 * @return The dom element with class name removed.
+		 */
+		removeClass(element: Element, classToRemove: string): Element;
+
+		/**
+		 * Set the value of an element's attribute
+		 *
+		 * @param el
+		 *        A DOM element
+		 *
+		 * @param attribute
+		 *        Attribute to set
+		 *
+		 * @param value
+		 *        Value to set the attribute to
+		 */
+		setAttribute(el: Element, attribute: string, value: string): void;
+
+		/**
+		 * Apply attributes to an HTML element.
+		 *
+		 * @param el
+		 *        Element to add attributes to.
+		 *
+		 * @param [attributes]
+		 *        Attributes to be applied.
+		 */
+		setAttributes(el: Element, attributes: any): void;
+
+		/**
+		 * Injects text into an element, replacing any existing contents entirely.
+		 *
+		 * @param el
+		 *        The element to add text content into
+		 *
+		 * @param text
+		 *        The text content to add.
+		 *
+		 * @return The element with added text content.
+		 */
+		textContent(el: Element, text: string): Element;
+
+		/**
+		 * Adds or removes a CSS class name on an element depending on an optional
+		 * condition or the presence/absence of the class name.
+		 *
+		 * @param element
+		 *        The element to toggle a class name on.
+		 *
+		 * @param classToToggle
+		 *        The class that should be toggled
+		 *
+		 * @param [predicate]
+		 *        See the return value for {@link Dom~PredicateCallback}
+		 *
+		 * @return The element with a class that has been toggled.
+		 */
+		toggleClass(element: Element, classToToggle: string, predicate: Dom.Predicate): Element;
+
+		/**
+		 * Turn off text selection blocking
+		 */
+		unblockTextSelection(): void;
+	}
+
+	namespace Dom {
+		/**
+		 * x and y coordinates for a dom element or mouse pointer
+		 */
+		interface Coordinates {
+			/**
+			 * x coordinate in pixels
+			 */
+			x: number;
+			/**
+			 * y coordinate in pixels
+			 */
+			y: number;
+		}
+
+		/**
+		 * The callback definition for toggleElClass.
+		 *
+		 * @param element
+		 *        The DOM element of the Component.
+		 *
+		 * @param classToToggle
+		 *        The `className` that wants to be toggled
+		 *
+		 * @return - If true the `classToToggle` will get added to `element`.
+		 *         - If false the `classToToggle` will get removed from `element`.
+		 *         - If undefined this callback will be ignored
+		 */
+		type Predicate = (element: Element, classToToggle: string) => boolean;
+
+		/**
+		 * The postion of a DOM element on the page.
+		 */
+		interface Position {
+			/**
+			 * Pixels on top
+			 */
+			top: number;
+			/**
+			 * Pixels to the left
+			 */
+			left: number;
+		}
+	}
+
+	/**
+	 * Contains methods that provide event capabilities to an object which is passed
+	 * to {@link module:evented|evented}.
+	 */
+	interface EventedMixin {
+		/**
+		 * Removes listener(s) from event(s) on an evented object.
+		 *
+		 * @param [targetOrType]
+		 *         If this is a string or array, it represents the event type(s).
+		 *
+		 *         Another evented object can be passed here instead, in which case
+		 *         ALL 3 arguments are _required_.
+		 *
+		 * @param [typeOrListener]
+		 *         If the first argument was a string or array, this may be the
+		 *         listener function. Otherwise, this is a string or array of event
+		 *         type(s).
+		 *
+		 * @param [listener]
+		 *         If the first argument was another evented object, this will be
+		 *         the listener function; otherwise, _all_ listeners bound to the
+		 *         event type(s) will be removed.
+		 */
+		off(target?: Component | Element, type?: string | string[], listener?: (...args: any[]) => void): void;
+		off(type?: string | string[], listener?: (...args: any[]) => void): void;
+
+		/**
+		 * Add a listener to an event (or events) on this object or another evented
+		 * object.
+		 *
+		 * @param targetOrType
+		 *         If this is a string or array, it represents the event type(s)
+		 *         that will trigger the listener.
+		 *
+		 *         Another evented object can be passed here instead, which will
+		 *         cause the listener to listen for events on _that_ object.
+		 *
+		 *         In either case, the listener's `this` value will be bound to
+		 *         this object.
+		 *
+		 * @param typeOrListener
+		 *         If the first argument was a string or array, this should be the
+		 *         listener function. Otherwise, this is a string or array of event
+		 *         type(s).
+		 *
+		 * @param [listener]
+		 *         If the first argument was another evented object, this will be
+		 *         the listener function.
+		 */
+		on(target?: Component | Element, type?: string | string[], listener?: (...args: any[]) => void): void;
+		on(type?: string | string[], listener?: (...args: any[]) => void): void;
+
+		/**
+		 * Add a listener to an event (or events) on this object or another evented
+		 * object. The listener will only be called once and then removed.
+		 *
+		 * @param targetOrType
+		 *         If this is a string or array, it represents the event type(s)
+		 *         that will trigger the listener.
+		 *
+		 *         Another evented object can be passed here instead, which will
+		 *         cause the listener to listen for events on _that_ object.
+		 *
+		 *         In either case, the listener's `this` value will be bound to
+		 *         this object.
+		 *
+		 * @param typeOrListener
+		 *         If the first argument was a string or array, this should be the
+		 *         listener function. Otherwise, this is a string or array of event
+		 *         type(s).
+		 *
+		 * @param [listener]
+		 *         If the first argument was another evented object, this will be
+		 *         the listener function.
+		 */
+		one(target?: Component | Element, type?: string | string[], listener?: (...args: any[]) => void): void;
+		one(type?: string | string[], listener?: (...args: any[]) => void): void;
+
+		/**
+		 * Fire an event on this evented object, causing its listeners to be called.
+		 *
+		 * @param event
+		 *          An event type or an object with a type property.
+		 *
+		 * @param [hash]
+		 *          An additional object to pass along to listeners.
+		 *
+		 * @return Whether or not the default behavior was prevented.
+		 */
+		trigger(event: any, hash?: any): boolean;
+	}
+
+	/**
+	 * `EventTarget` is a class that can have the same API as the DOM `EventTarget`. It
+	 * adds shorthand functions that wrap around lengthy functions. For example:
+	 * the `on` function is a wrapper around `addEventListener`.
+	 *
+	 * @see [EventTarget Spec]{@link https://www.w3.org/TR/DOM-Level-2-Events/events.html#Events-EventTarget}
+	 */
+	interface EventTarget {
+		/**
+		 * An alias of {@link EventTarget#on}. Allows `EventTarget` to mimic
+		 * the standard DOM API.
+		 *
+		 * @param type
+		 *        An event name or an array of event names.
+		 *
+		 * @param fn
+		 *        The function to call with `EventTarget`s
+		 *
+		 * @see {@link EventTarget#on}
+		 */
+		addEventListener(type: string | string[], fn: EventTarget.EventListener): void;
+
+		/**
+		 * An alias of {@link EventTarget#trigger}. Allows `EventTarget` to mimic
+		 * the standard DOM API.
+		 *
+		 * @param event
+		 *        The name of the event, an `Event`, or an object with a key of type set to
+		 *        an event name.
+		 *
+		 * @see {@link EventTarget#trigger}
+		 */
+		dispatchEvent(event: string | Event): void;
+
+		/**
+		 * Removes an `event listener` for a specific event from an instance of `EventTarget`.
+		 * This makes it so that the `event listener` will no longer get called when the
+		 * named event happens.
+		 *
+		 * @param type
+		 *        An event name or an array of event names.
+		 *
+		 * @param fn
+		 *        The function to remove.
+		 */
+		off(type: string | string[], fn: EventTarget.EventListener): void;
+
+		/**
+		 * Adds an `event listener` to an instance of an `EventTarget`. An `event listener` is a
+		 * function that will get called when an event with a certain name gets triggered.
+		 *
+		 * @param type
+		 *        An event name or an array of event names.
+		 *
+		 * @param fn
+		 *        The function to call with `EventTarget`s
+		 */
+		on(type: string | string[], fn: EventTarget.EventListener): void;
+
+		/**
+		 * This function will add an `event listener` that gets triggered only once. After the
+		 * first trigger it will get removed. This is like adding an `event listener`
+		 * with {@link EventTarget#on} that calls {@link EventTarget#off} on itself.
+		 *
+		 * @param type
+		 *        An event name or an array of event names.
+		 *
+		 * @param fn
+		 *        The function to be called once for each event name.
+		 */
+		one(type: string | string[], fn: EventTarget.EventListener): void;
+
+		/**
+		 * An alias of {@link EventTarget#off}. Allows `EventTarget` to mimic
+		 * the standard DOM API.
+		 *
+		 * @param type
+		 *        An event name or an array of event names.
+		 *
+		 * @param fn
+		 *        The function to remove.
+		 *
+		 * @see {@link EventTarget#off}
+		 */
+		removeEventListener(type: string | string[], fn: EventTarget.EventListener): void;
+
+		/**
+		 * This function causes an event to happen. This will then cause any `event listeners`
+		 * that are waiting for that event, to get called. If there are no `event listeners`
+		 * for an event then nothing will happen.
+		 *
+		 * If the name of the `Event` that is being triggered is in `EventTarget.allowedEvents_`.
+		 * Trigger will also call the `on` + `uppercaseEventName` function.
+		 *
+		 * Example:
+		 * 'click' is in `EventTarget.allowedEvents_`, so, trigger will attempt to call
+		 * `onClick` if it exists.
+		 *
+		 * @param event
+		 *        The name of the event, an `Event`, or an object with a key of type set to
+		 *        an event name.
+		 */
+		trigger(event: string | EventTarget.Event): void;
+	}
+
+	const EventTarget: {
+		prototype: EventTarget;
+
+		new (): EventTarget;
+	};
+
+	namespace EventTarget {
+		/**
+		 * A Custom DOM event.
+		 * @see [Properties]{@link https://developer.mozilla.org/en-US/docs/Web/API/CustomEvent}
+		 */
+		interface Event extends CustomEvent {
+			[key: string]: any;
+		}
+
+		/**
+		 * All event listeners should follow the following format.
+		 *
+		 * @param event
+		 *        the event that triggered this function
+		 *
+		 * @param [hash]
+		 *        hash of data sent during the event
+		 */
+		type EventListener = ((e: Event, data?: any) => void);
+	}
+
+	/**
+	 * Toggle fullscreen video
+	 */
+	interface FullscreenToggle extends Button {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Handles fullscreenchange on the player and change control text accordingly.
+		 *
+		 * @param [event]
+		 *        The {@link Player#fullscreenchange} event that caused this function to be
+		 *        called.
+		 *
+		 * @listens Player#fullscreenchange
+		 */
+		handleFullscreenChange(event: EventTarget.Event): void;
+
+		/**
+		 * This gets called when an `FullscreenToggle` is "clicked". See
+		 * {@link ClickableComponent} for more detailed information on what a click can be.
+		 *
+		 * @param [event]
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+	}
+
+	const FullscreenToggle: {
+		prototype: FullscreenToggle
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): FullscreenToggle;
+	};
+
+	/**
+	 * The current list of {@link HtmlTrackElement}s.
+	 */
+	interface HTMLTrackElementList {
+		[index: number]: HTMLTrackElement;
+
+		/**
+		 * The current number of `Track`s in the this Trackist.
+		 */
+		length: number;
+	}
+
+	const HTMLTrackElementList: {
+		prototype: HTMLTrackElementList;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param [tracks=[]]
+		 *        A list of `HtmlTrackElement` to instantiate the list with.
+		 */
+		new (tracks?: HTMLTrackElement[]): HTMLTrackElementList;
+	};
+
+	interface LanguageTranslations {
+		[language: string]: string;
+	}
+
+	/**
+	 * @file log.js
+	 */
+	interface Log {
+		/**
+		 * Logs plain debug messages. Similar to `console.log`.
+		 * @param args
+		 *           One or more messages or objects that should be logged.
+		 */
+		(...args: any[]): void;
+
+		/**
+		 * Logs debug messages. Similar to `console.debug`, but may also act as a comparable
+		 * log if `console.debug` is not available
+		 *
+		 * @param args
+		 *        One or more messages or objects that should be logged as debug.
+		 */
+		debug(...args: any[]): void;
+
+		/**
+		 * Logs error messages. Similar to `console.error`.
+		 *
+		 * @param args
+		 *        One or more messages or objects that should be logged as an error
+		 */
+		error(...args: any[]): void;
+
+		history: {
+			/**
+			 * Returns an array containing everything that has been logged to the history.
+			 *
+			 * This array is a shallow clone of the internal history record. However, its
+			 * contents are _not_ cloned; so, mutating objects inside this array will
+			 * mutate them in history.
+			 *
+			 * @return
+			 */
+			(): any[];
+
+			/**
+			 * Clears the internal history tracking, but does not prevent further history
+			 * tracking.
+			 */
+			clear(): void;
+
+			/**
+			 * Disable history tracking if it is currently enabled.
+			 */
+			disable(): void;
+
+			/**
+			 * Enable history tracking if it is currently disabled.
+			 */
+			enable(): void;
+		};
+
+		/**
+		 * Get or set the current logging level. If a string matching a key from
+		 * {@link log.levels} is provided, acts as a setter. Regardless of argument,
+		 * returns the current logging level.
+		 *
+		 * @param [lvl]
+		 *         Pass to set a new logging level.
+		 *
+		 * @return The current logging level.
+		 */
+		level(lvl: string): string;
+
+		/**
+		 * Enumeration of available logging levels, where the keys are the level names
+		 * and the values are `|`-separated strings containing logging methods allowed
+		 * in that logging level. These strings are used to create a regular expression
+		 * matching the function name being called.
+		 *
+		 * Levels provided by video.js are:
+		 *
+		 * - `off`: Matches no calls. Any value that can be cast to `false` will have
+		 *   this effect. The most restrictive.
+		 * - `all`: Matches only Video.js-provided functions (`debug`, `log`,
+		 *   `log.warn`, and `log.error`).
+		 * - `debug`: Matches `log.debug`, `log`, `log.warn`, and `log.error` calls.
+		 * - `info` (default): Matches `log`, `log.warn`, and `log.error` calls.
+		 * - `warn`: Matches `log.warn` and `log.error` calls.
+		 * - `error`: Matches only `log.error` calls.
+		 *
+		 */
+		levels: {
+			all: string,
+			off: string,
+			debug: string,
+			info: string,
+			warn: string,
+			error: string,
+			DEFAULT: string
+		};
+
+		/**
+		 * Logs warning messages. Similar to `console.warn`.
+		 *
+		 * @param args
+		 *        One or more messages or objects that should be logged as a warning.
+		 */
+		warn(...args: any[]): void;
+	}
+
+	/**
+	 * A Custom `MediaError` class which mimics the standard HTML5 `MediaError` class.
+	 *
+	 * @see [MediaError Spec]{@link https://dev.w3.org/html5/spec-author-view/video.html#mediaerror}
+	 * @see [Encrypted MediaError Spec]{@link https://www.w3.org/TR/2013/WD-encrypted-media-20130510/#error-codes}
+	 *
+	 */
+	interface MediaError {
+		/**
+		 * The error code that refers two one of the defined `MediaError` types
+		 *
+		 */
+		code: number;
+
+		/**
+		 * W3C error code for any custom error.
+		 * @default 0
+		 */
+		MEDIA_ERR_CUSTOM: 0;
+
+		/**
+		 * W3C error code for media error aborted.
+		 * @default 1
+		 */
+		MEDIA_ERR_ABORTED: 1;
+
+		/**
+		 * W3C error code for any network error.
+		 * @default 2
+		 */
+		MEDIA_ERR_NETWORK: 2;
+
+		/**
+		 * W3C error code for any decoding error.
+		 * @default 3
+		 */
+		MEDIA_ERR_DECODE: 3;
+
+		/**
+		 * W3C error code for any time that a source is not supported.
+		 * @default 4
+		 */
+		MEDIA_ERR_SRC_NOT_SUPPORTED: 4;
+
+		/**
+		 * W3C error code for any time that a source is encrypted.
+		 * @default 5
+		 */
+		MEDIA_ERR_ENCRYPTED: 5;
+
+		/**
+		 * An optional message that to show with the error. Message is not part of the HTML5
+		 * video spec but allows for more informative custom errors.
+		 *
+		 */
+		message: string;
+
+		/**
+		 * An optional status code that can be set by plugins to allow even more detail about
+		 * the error. For example a plugin might provide a specific HTTP status code and an
+		 * error message for that code. Then when the plugin gets that error this class will
+		 * know how to display an error message for it. This allows a custom message to show
+		 * up on the `Player` error overlay.
+		 *
+		 */
+		status: any[];
+	}
+
+	const MediaError: {
+		prototype: MediaError;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param value
+		 *        This can be of multiple types:
+		 *        - number: should be a standard error code
+		 *        - string: an error message (the code will be 0)
+		 *        - Object: arbitrary properties
+		 *        - `MediaError` (native): used to populate a video.js `MediaError` object
+		 *        - `MediaError` (video.js): will return itself if it's already a
+		 *          video.js `MediaError` object.
+		 */
+		new (value: number | string | { [key: string]: any } | MediaError): MediaError;
+
+		/**
+		 * The default `MediaError` messages based on the {@link MediaError.errorTypes}.
+		 */
+		defaultMessages: string[];
+
+		/**
+		 * Errors indexed by the W3C standard. The order **CANNOT CHANGE**! See the
+		 * specification listed under {@link MediaError} for more information.
+		 *
+		 * 0 - MEDIA_ERR_CUSTOM
+		 * 1 - MEDIA_ERR_CUSTOM
+		 * 2 - MEDIA_ERR_ABORTED
+		 * 3 - MEDIA_ERR_NETWORK
+		 * 4 - MEDIA_ERR_SRC_NOT_SUPPORTED
+		 * 5 - MEDIA_ERR_ENCRYPTED
+		 */
+		readonly errorTypes: string[];
+
+		/**
+		 * W3C error code for any custom error.
+		 * @default 0
+		 */
+		MEDIA_ERR_CUSTOM: 0;
+
+		/**
+		 * W3C error code for media error aborted.
+		 * @default 1
+		 */
+		MEDIA_ERR_ABORTED: 1;
+
+		/**
+		 * W3C error code for any network error.
+		 * @default 2
+		 */
+		MEDIA_ERR_NETWORK: 2;
+
+		/**
+		 * W3C error code for any decoding error.
+		 * @default 3
+		 */
+		MEDIA_ERR_DECODE: 3;
+
+		/**
+		 * W3C error code for any time that a source is not supported.
+		 * @default 4
+		 */
+		MEDIA_ERR_SRC_NOT_SUPPORTED: 4;
+
+		/**
+		 * W3C error code for any time that a source is encrypted.
+		 * @default 5
+		 */
+		MEDIA_ERR_ENCRYPTED: 5;
+	};
+
+	/**
+	 * The Menu component is used to build popup menus, including subtitle and
+	 * captions selection menus.
+	 */
+	interface Menu extends Component {
+		options_: MenuOptions;
+
+		menuButton_: MenuButton;
+
+		/**
+		 * Add a {@link MenuItem} to the menu.
+		 *
+		 * @param component
+		 *        The name or instance of the `MenuItem` to add.
+		 *
+		 */
+		addItem(component: string | MenuItem): void;
+
+		/**
+		 * Create the `Menu`s DOM element.
+		 *
+		 * @return the element that was created
+		 */
+		createEl(): HTMLDivElement;
+
+		dispose(): void;
+
+		/**
+		 * Set focus on a {@link MenuItem} in the `Menu`.
+		 *
+		 * @param [item=0]
+		 *        Index of child item set focus on.
+		 */
+		focus(item?: any): void;
+
+		/**
+		 * Handle a `keydown` event on this menu. This listener is added in the constructor.
+		 *
+		 * @param event
+		 *        A `keydown` event that happened on the menu.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(event: EventTarget.Event): void;
+
+		/**
+		 * Move to previous (higher) menu item for keyboard users.
+		 */
+		stepBack(): void;
+
+		/**
+		 * Move to next (lower) menu item for keyboard users.
+		 */
+		stepForward(): void;
+	}
+
+	const Menu: {
+		prototype: Menu;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param player
+		 *        the player that this component should attach to
+		 *
+		 * @param [options]
+		 *        Object of option names and values
+		 *
+		 */
+		new (player: Player, options?: MenuOptions): Menu;
+	};
+
+	interface MenuOptions extends ComponentOptions {
+		menuButton: MenuButton;
+	}
+
+	/**
+	 * A `MenuButton` class for any popup {@link Menu}.
+	 */
+	interface MenuButton extends Component {
+		options_: MenuButtonOptions;
+
+		menu: Menu;
+
+		menuButton_: Button;
+
+		/**
+		 * Remove the focus from the actual button, not this element
+		 */
+		blur(): void;
+
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Allow sub components to stack CSS class names for the wrapper element
+		 *
+		 * @return The constructed wrapper DOM `className`
+		 */
+		buildWrapperCSSClass(): string;
+
+		/**
+		 * Get or set the localized control text that will be used for accessibility.
+		 *
+		 * > NOTE: This will come from the internal `menuButton_` element.
+		 *
+		 * @param [text]
+		 *        Control text for element.
+		 *
+		 * @param [el=this.menuButton_.el()]
+		 *        Element to set the title on.
+		 *
+		 * @return - The control text when getting
+		 */
+		controlText(text?: string, el?: Element): string;
+
+		/**
+		 * Create the `MenuButtons`s DOM element.
+		 *
+		 * @return The element that gets created.
+		 */
+		createEl(): Element;
+
+		/**
+		 * Create the list of menu items. Specific to each subclass.
+		 */
+		createItems(): MenuItem[];
+
+		/**
+		 * Create the menu and add all items to it.
+		 *
+		 * @return The constructed menu
+		 */
+		createMenu(): Menu;
+
+		/**
+		 * Disable the `MenuButton`. Don't allow it to be clicked.
+		 */
+		disable(): void;
+
+		/**
+		 * Enable the `MenuButton`. Allow it to be clicked.
+		 */
+		enable(): void;
+
+		/**
+		 * Set the focus to the actual button, not to this element
+		 */
+		focus(): void;
+
+		/**
+		 * Called when a `MenuButton` loses focus. Turns off the listener for
+		 * `keydown` events. Which Stops `this.handleKeyPress` from getting called.
+		 *
+		 * @param event
+		 *        The `blur` event that caused this function to be called.
+		 *
+		 * @listens blur
+		 */
+		handleBlur(event: EventTarget.Event): void;
+
+		/**
+		 * Handle a click on a `MenuButton`.
+		 * See {@link ClickableComponent#handleClick} for instances where this is called.
+		 *
+		 * @param event
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * This gets called when a `MenuButton` gains focus via a `focus` event.
+		 * Turns on listening for `keydown` events. When they happen it
+		 * calls `this.handleKeyPress`.
+		 *
+		 * @param event
+		 *        The `focus` event that caused this function to be called.
+		 *
+		 * @listens focus
+		 */
+		handleFocus(event: EventTarget.Event): void;
+
+		/**
+		 * Handle tab, escape, down arrow, and up arrow keys for `MenuButton`. See
+		 * {@link ClickableComponent#handleKeyPress} for instances where this is called.
+		 *
+		 * @param event
+		 *        The `keydown` event that caused this function to be called.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(event: EventTarget.Event): void;
+
+		/**
+		 * Handle a `keydown` event on a sub-menu. The listener for this is added in
+		 * the constructor.
+		 *
+		 * @param event
+		 *        Key press event
+		 *
+		 * @listens keydown
+		 */
+		handleSubmenuKeyPress(event: EventTarget.Event): void;
+
+		/**
+		 * Put the current `MenuButton` into a pressed state.
+		 */
+		pressButton(): void;
+
+		/**
+		 * Take the current `MenuButton` out of a pressed state.
+		 */
+		unpressButton(): void;
+
+		/**
+		 * Update the menu based on the current state of its items.
+		 */
+		update(): void;
+	}
+
+	const MenuButton: {
+		prototype: MenuButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: MenuButtonOptions): MenuButton;
+	};
+
+	interface MenuButtonOptions extends ComponentOptions {
+		title?: string;
+		iniChildren?: boolean;
+	}
+
+	/**
+	 * The component for a menu item. `<li>`
+	 */
+	interface MenuItem extends ClickableComponent {
+		options_: MenuItemOptions;
+
+		/**
+		 * Create the `MenuItem's DOM element
+		 *
+		 * @param [type=li]
+		 *        Element's node type, not actually used, always set to `li`.
+		 *
+		 * @param [props={}]
+		 *        An object of properties that should be set on the element
+		 *
+		 * @param [attrs={}]
+		 *        An object of attributes that should be set on the element
+		 *
+		 * @return The element that gets created.
+		 */
+		createEl(type: string, props?: any, attrs?: any): HTMLLIElement;
+
+		/**
+		 * Any click on a `MenuItem` puts it into the selected state.
+		 * See {@link ClickableComponent#handleClick} for instances where this is called.
+		 *
+		 * @param event
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * Set the state for this menu item as selected or not.
+		 *
+		 * @param selected
+		 *        if the menu item is selected or not
+		 */
+		selected(selected: boolean): void;
+	}
+
+	const MenuItem: {
+		prototype: MenuItem;
+
+		/**
+		 * Creates an instance of the this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of player options.
+		 *
+		 */
+		new (player: Player, options?: MenuItemOptions): MenuItem;
+	};
+
+	interface MenuItemOptions extends ComponentOptions {
+		label?: string;
+		multiSelectable?: boolean;
+		selectable?: boolean;
+		selected?: boolean;
+	}
+
+	interface Middleware {
+		/**
+		 *
+		 * @param src
+		 * @param next
+		 */
+		setSource: (src: Tech.SourceObject, next: (err: any, next: (src: Tech.SourceObject) => void) => void) => void;
+	}
+
+	/**
+	 * The `ModalDialog` displays over the video and its controls, which blocks
+	 * interaction with the player until it is closed.
+	 *
+	 * Modal dialogs include a "Close" button and will close when that button
+	 * is activated - or when ESC is pressed anywhere.
+	 */
+	interface ModalDialog extends Component {
+		options_: ModalDialogOptions;
+
+		closeable_: boolean;
+
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Closes the modal, does nothing if the `ModalDialog` is
+		 * not open.
+		 *
+		 * @fires ModalDialog#beforemodalclose
+		 * @fires ModalDialog#modalclose
+		 */
+		close(): void;
+
+		/**
+		 * Check to see if the `ModalDialog` is closeable via the UI.
+		 *
+		 * @param [value]
+		 *         If given as a boolean, it will set the `closeable` option.
+		 *
+		 * @return Returns the final value of the closable option.
+		 */
+		closeable(value: boolean): boolean;
+
+		/**
+		 * Gets or sets the modal content, which gets normalized before being
+		 * rendered into the DOM.
+		 *
+		 * This does not update the DOM or fill the modal, but it is called during
+		 * that process.
+		 *
+		 * @param [value]
+		 *         If defined, sets the internal content value to be used on the
+		 *         next call(s) to `fill`. This value is normalized before being
+		 *         inserted. To "clear" the internal content value, pass `null`.
+		 *
+		 * @return The current content of the modal dialog
+		 */
+		content(value?: Content): any;
+
+		/**
+		 * Create the `ModalDialog`'s DOM element
+		 *
+		 * @return The DOM element that gets created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Returns the description string for this modal. Primarily used for
+		 * accessibility.
+		 *
+		 * @return The localized or raw description of this modal.
+		 */
+		description(): string;
+
+		dispose(): void;
+
+		/**
+		 * Empties the content element. This happens anytime the modal is filled.
+		 *
+		 * @fires ModalDialog#beforemodalempty
+		 * @fires ModalDialog#modalempty
+		 */
+		empty(): void;
+
+		/**
+		 * Fill the modal's content element with the modal's "content" option.
+		 * The content element will be emptied before this change takes place.
+		 */
+		fill(): void;
+
+		/**
+		 * Fill the modal's content element with arbitrary content.
+		 * The content element will be emptied before this change takes place.
+		 *
+		 * @fires ModalDialog#beforemodalfill
+		 * @fires ModalDialog#modalfill
+		 *
+		 * @param [content]
+		 *        The same rules apply to this as apply to the `content` option.
+		 */
+		fillWith(content?: Content): void;
+
+		/**
+		 * Keydown handler. Attached when modal is focused.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyDown(): void;
+
+		/**
+		 * Handles `keydown` events on the document, looking for ESC, which closes
+		 * the modal.
+		 *
+		 * @param e
+		 *        The keypress that triggered this event.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(e: EventTarget.Event): void;
+
+		/**
+		 * Returns the label string for this modal. Primarily used for accessibility.
+		 *
+		 * @return the localized or raw label of this modal.
+		 */
+		label(): string;
+
+		/**
+		 * Opens the modal.
+		 *
+		 * @fires ModalDialog#beforemodalopen
+		 * @fires ModalDialog#modalopen
+		 */
+		open(): void;
+
+		/**
+		 * If the `ModalDialog` is currently open or closed.
+		 *
+		 * @param [value]
+		 *         If given, it will open (`true`) or close (`false`) the modal.
+		 *
+		 * @return the current open state of the modaldialog
+		 */
+		opened(value?: boolean): boolean;
+	}
+
+	const ModalDialog: {
+		prototype: ModalDialog;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ModalDialogOptions): ModalDialog;
+	};
+
+	/**
+	 * Options for this class
+	 *
+	 * @param [content=undefined]
+	 *        Provide customized content for this modal.
+	 *
+	 * @param [description]
+	 *        A text description for the modal, primarily for accessibility.
+	 *
+	 * @param [fillAlways=false]
+	 *        Normally, modals are automatically filled only the first time
+	 *        they open. This tells the modal to refresh its content
+	 *        every time it opens.
+	 *
+	 * @param [label]
+	 *        A text label for the modal, primarily for accessibility.
+	 *
+	 * @param [temporary=true]
+	 *        If `true`, the modal can only be opened once; it will be
+	 *        disposed as soon as it's closed.
+	 *
+	 * @param [uncloseable=false]
+	 *        If `true`, the user will not be able to close the modal
+	 *        through the UI in the normal ways. Programmatic closing is
+	 *        still possible.
+	 */
+	interface ModalDialogOptions extends ComponentOptions {
+		content?: any;
+		description?: string;
+		fillAlways?: boolean;
+		label?: string;
+		temporary?: boolean;
+		uncloseable?: boolean;
+	}
+
+	/**
+	 * The {@link MouseTimeDisplay} component tracks mouse movement over the
+	 * {@link ProgressControl}. It displays an indicator and a {@link TimeTooltip}
+	 * indicating the time which is represented by a given point in the
+	 * {@link ProgressControl}.
+	 */
+	interface MouseTimeDisplay extends Component {
+		/**
+		 * Create the DOM element for this class.
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Enqueues updates to its own DOM as well as the DOM of its
+		 * {@link TimeTooltip} child.
+		 *
+		 * @param seekBarRect
+		 *        The `ClientRect` for the {@link SeekBar} element.
+		 *
+		 * @param seekBarPoint
+		 *        A number from 0 to 1, representing a horizontal reference point
+		 *        from the left edge of the {@link SeekBar}
+		 */
+		update(seekBarRect: ClientRect, seekBarPoint: number): void;
+	}
+
+	const MouseTimeDisplay: {
+		prototype: MouseTimeDisplay;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The {@link Player} that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): MouseTimeDisplay
+	};
+
+	/**
+	 * An instance of the `Player` class is created when any of the Video.js setup methods
+	 * are used to initialize a video.
+	 *
+	 * After an instance has been created it can be accessed globally in two ways:
+	 * 1. By calling `videojs('example_video_1');`
+	 * 2. By using it directly via  `videojs.players.example_video_1;`
+	 */
+	interface Player extends Component {
+		bigPlayButton: Button;
+
+		controlBar: ControlBar;
+
+		errorDisplay: ModalDialog;
+
+		loadingSpinner: Component;
+
+		options_: PlayerOptions;
+
+		userActivity_: boolean;
+
+		userActive_: boolean;
+
+		/**
+		 * A getter/setter for the `Player`'s aspect ratio.
+		 *
+		 * @param [ratio]
+		 *        The value to set the `Player's aspect ratio to.
+		 *
+		 * @return - The current aspect ratio of the `Player` when getting.
+		 *         - undefined when setting
+		 */
+		aspectRatio(ratio: string): void;
+
+		aspectRatio(): string;
+
+		/**
+		 * Get or set the autoplay option. When this is a boolean it will
+		 * modify the attribute on the tech. When this is a string the attribute on
+		 * the tech will be removed and `Player` will handle autoplay on loadstarts.
+		 *
+		 * @param [value]
+		 *        - true: autoplay using the browser behavior
+		 *        - false: do not autoplay
+		 *        - 'play': call play() on every loadstart
+		 *        - 'muted': call muted() then play() on every loadstart
+		 *        - 'any': call play() on every loadstart. if that fails call muted() then play().
+		 *        - *: values other than those listed here will be set `autoplay` to true
+		 *
+		 * @return The current value of autoplay when getting
+		 */
+		autoplay(value?: boolean | string): void;
+
+		autoplay(): boolean | string;
+
+		/**
+		 * Get the remote {@link TextTrackList}
+		 * @return The current remote text track list
+		 */
+		textTracks(): TextTrackList;
+
+		/**
+		 * Get the remote {@link TextTrackList}
+		 * @return The current remote text track list
+		 */
+		remoteTextTracks(): TextTrackList;
+
+		/**
+		 * Create a remote {@link TextTrack} and an {@link HTMLTrackElement}. It will
+		 * automatically removed from the video element whenever the source changes, unless
+		 * manualCleanup is set to false.
+		 *
+		 * @param options
+		 *        Options to pass to {@link HTMLTrackElement} during creation. See
+		 *        {@link HTMLTrackElement} for object properties that you should use.
+		 *
+		 * @param [manualCleanup=true] if set to false, the TextTrack will be
+		 *
+		 * @return the HTMLTrackElement that was created and added
+		 *         to the HtmlTrackElementList and the remote
+		 *         TextTrackList
+		 */
+		addRemoteTextTrack(options: TextTrackOptions, manualCleanup: boolean): HTMLTrackElement;
+
+		/**
+		 * A helper method for adding a {@link TextTrack} to our
+		 * {@link TextTrackList}.
+		 *
+		 * In addition to the W3C settings we allow adding additional info through options.
+		 *
+		 * @see http://www.w3.org/html/wg/drafts/html/master/embedded-content-0.html#dom-media-addtexttrack
+		 *
+		 * @param [kind]
+		 *        the kind of TextTrack you are adding
+		 *
+		 * @param [label]
+		 *        the label to give the TextTrack label
+		 *
+		 * @param [language]
+		 *        the language to set on the TextTrack
+		 *
+		 * @return the TextTrack that was added or undefined
+		 *         if there is no tech
+		 */
+		addTextTrack(kind?: string, label?: string, language?: string): void;
+
+		/**
+		 * Get a TimeRange object with an array of the times of the video
+		 * that have been downloaded. If you just want the percent of the
+		 * video that's been downloaded, use bufferedPercent.
+		 *
+		 * @see [Buffered Spec]{@link http://dev.w3.org/html5/spec/video.html#dom-media-buffered}
+		 *
+		 * @return A mock TimeRange object (following HTML spec)
+		 */
+		buffered(): TimeRange;
+
+		/**
+		 * Get the ending time of the last buffered time range
+		 * This is used in the progress bar to encapsulate all time ranges.
+		 *
+		 * @return The end of the last buffered time range
+		 */
+		bufferedEnd(): number;
+
+		/**
+		 * Get the percent (as a decimal) of the video that's been downloaded.
+		 * This method is not a part of the native HTML video API.
+		 *
+		 * @return A decimal between 0 and 1 representing the percent
+		 *         that is buffered 0 being 0% and 1 being 100%
+		 */
+		bufferedPercent(): number;
+
+		/**
+		 * Check whether the player can play a given mimetype
+		 *
+		 * @see https://www.w3.org/TR/2011/WD-html5-20110113/video.html#dom-navigator-canplaytype
+		 *
+		 * @param type
+		 *        The mimetype to check
+		 *
+		 * @return 'probably', 'maybe', or '' (empty string)
+		 */
+		canPlayType(type: string): 'probably' | 'maybe' | '';
+
+		cancelFullScreen(): Player;
+
+		/**
+		 * Get or set whether or not the controls are showing.
+		 *
+		 * @fires Player#controlsenabled
+		 *
+		 * @param [bool]
+		 *        - true to turn controls on
+		 *        - false to turn controls off
+		 *
+		 * @return The current value of controls when getting
+		 */
+		controls(bool?: boolean): void;
+
+		controls(): boolean;
+
+		/**
+		 * Create the `Player`'s DOM element.
+		 *
+		 * @return The DOM element that gets created.
+		 */
+		createEl(): Element;
+
+		/**
+		 * Creates a simple modal dialog (an instance of the {@link ModalDialog}
+		 * component) that immediately overlays the player with arbitrary
+		 * content and removes itself when closed.
+		 *
+		 * @param content
+		 *        Same as {@link ModalDialog#content}'s param of the same name.
+		 *        The most straight-forward usage is to provide a string or DOM
+		 *        element.
+		 *
+		 * @param [options]
+		 *        Extra options which will be passed on to the {@link ModalDialog}.
+		 * @check
+		 * @return the {@link ModalDialog} that was created
+		 */
+		createModal(content: string | (() => any) | Element | any[], options: any): ModalDialog;
+
+		/**
+		 * Returns the current source object.
+		 *
+		 * @return The current source object
+		 */
+		currentSource(): Tech.SourceObject;
+
+		/**
+		 * Returns all of the current source objects.
+		 *
+		 * @return The current source objects
+		 */
+		currentSources(): Tech.SourceObject[];
+
+		/**
+		 * Returns the fully qualified URL of the current source value e.g. http://mysite.com/video.mp4
+		 * Can be used in conjunction with `currentType` to assist in rebuilding the current source object.
+		 *
+		 * @return The current source
+		 */
+		currentSrc(): string;
+
+		/**
+		 * Get or set the current time (in seconds)
+		 *
+		 * @param [seconds]
+		 *        The time to seek to in seconds
+		 *
+		 * @return - the current time in seconds when getting
+		 */
+		currentTime(seconds: number): void;
+
+		currentTime(): number;
+
+		/**
+		 * Get the current source type e.g. video/mp4
+		 * This can allow you rebuild the current source object so that you could load the same
+		 * source and tech later
+		 *
+		 * @return The source MIME type
+		 */
+		currentType(): string;
+
+		/**
+		 * Get the current defaultMuted state, or turn defaultMuted on or off. defaultMuted
+		 * indicates the state of muted on initial playback.
+		 *
+		 * ```js
+		 *   var myPlayer = videojs('some-player-id');
+		 *
+		 *   myPlayer.src("http://www.example.com/path/to/video.mp4");
+		 *
+		 *   // get, should be false
+		 *   console.log(myPlayer.defaultMuted());
+		 *   // set to true
+		 *   myPlayer.defaultMuted(true);
+		 *   // get should be true
+		 *   console.log(myPlayer.defaultMuted());
+		 * ```
+		 *
+		 * @param [defaultMuted]
+		 *        - true to mute
+		 *        - false to unmute
+		 *
+		 * @return - true if defaultMuted is on and getting
+		 *         - false if defaultMuted is off and getting
+		 *         - A reference to the current player when setting
+		 */
+		defaultMuted(defaultMuted: boolean): void;
+
+		defaultMuted(): boolean;
+
+		/**
+		 * Gets or sets the current default playback rate. A default playback rate of
+		 * 1.0 represents normal speed and 0.5 would indicate half-speed playback, for instance.
+		 * defaultPlaybackRate will only represent what the initial playbackRate of a video was, not
+		 * not the current playbackRate.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/embedded-content.html#dom-media-defaultplaybackrate
+		 *
+		 * @param [rate]
+		 *       New default playback rate to set.
+		 *
+		 * @return - The default playback rate when getting or 1.0
+		 *         - the player when setting
+		 */
+		defaultPlaybackRate(rate: number): Player;
+
+		defaultPlaybackRate(): boolean;
+
+		/**
+		 * A getter/setter for the `Player`'s width & height.
+		 *
+		 * @param dimension
+		 *        This string can be:
+		 *        - 'width'
+		 *        - 'height'
+		 *
+		 * @param [value]
+		 *        Value for dimension specified in the first argument.
+		 *
+		 * @return The dimension arguments value when getting (width/height).
+		 */
+		dimension(dimension: 'width' | 'height', value: number): void;
+
+		dimension(dimension: 'width' | 'height'): number;
+
+		/**
+		 * An instance of the `Player` class is created when any of the Video.js setup methods
+		 * are used to initialize a video.
+		 *
+		 * After an instance has been created it can be accessed globally in two ways:
+		 * 1. By calling `videojs('example_video_1');`
+		 * 2. By using it directly via  `videojs.players.example_video_1;`
+		 */
+		dispose(): void;
+
+		/**
+		 * Normally gets the length in time of the video in seconds;
+		 * in all but the rarest use cases an argument will NOT be passed to the method
+		 *
+		 * > **NOTE**: The video must have started loading before the duration can be
+		 * known, and in the case of Flash, may not be known until the video starts
+		 * playing.
+		 *
+		 *
+		 * @fires Player#durationchange
+		 *
+		 * @param [seconds]
+		 *        The duration of the video to set in seconds
+		 *
+		 * @return - The duration of the video in seconds when getting
+		 */
+		duration(seconds: number): void;
+
+		duration(): number;
+
+		/**
+		 * A getter/setter/toggler for the vjs-fluid `className` on the `Player`.
+		 *
+		 * @param [bool]
+		 *        - A value of true adds the class.
+		 *        - A value of false removes the class.
+		 *        - No value will toggle the fluid class.
+		 *
+		 * @return - The value of fluid when getting.
+		 *         - `undefined` when setting.
+		 */
+		fluid(bool: boolean): void;
+
+		fluid(): boolean;
+
+		/**
+		 * Get object for cached values.
+		 *
+		 * @return get the current object cache
+		 */
+		getCache(): any;
+
+		/**
+		 * Gets available media playback quality metrics as specified by the W3C's Media
+		 * Playback Quality API.
+		 *
+		 * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
+		 *
+		 * @return An object with supported media playback quality metrics or undefined if there
+		 *         is no tech or the tech does not support it.
+		 */
+		getVideoPlaybackQuality(): any;
+
+		/**
+		 * Get the value of `ended` from the media element. `ended` indicates whether
+		 * the media has reached the end or not.
+		 *
+		 * @return - The value of `ended` from the media element.
+		 *         - True indicates that the media has ended.
+		 *         - False indicates that the media has not ended.
+		 *
+		 * @see [Spec]{@link https://www.w3.org/TR/html5/embedded-content-0.html#dom-media-ended}
+		 */
+		ended(): boolean;
+
+		/**
+		 * When fullscreen isn't supported we can stretch the
+		 * video container to as wide as the browser will let us.
+		 *
+		 * @fires Player#enterFullWindow
+		 */
+		enterFullWindow(): void;
+
+		/**
+		 * Set or get the current MediaError
+		 *
+		 * @fires Player#error
+		 *
+		 * @param [err]
+		 *         A MediaError or a string/number to be turned
+		 *         into a MediaError
+		 *
+		 * @return The current MediaError when getting (or null)
+		 */
+		error(err: MediaError | string | number | null): void;
+
+		error(): MediaError | null;
+
+		/**
+		 * Return the video to its normal size after having been in full screen mode
+		 *
+		 * @fires Player#fullscreenchange //noinspection JSUnresolvedVariable
+		 */
+		exitFullscreen(): Player;
+
+		/**
+		 * Exit full window
+		 *
+		 * @fires Player#exitFullWindow
+		 */
+		exitFullWindow(): void;
+
+		/**
+		 * Reports whether or not a player has a plugin available.
+		 *
+		 * This does not report whether or not the plugin has ever been initialized
+		 * on this player. For that, [usingPlugin]{@link Player#usingPlugin}.
+		 *
+		 * @param name
+		 *         The name of a plugin.
+		 *
+		 * @return Whether or not this player has the requested plugin available.
+		 */
+		hasPlugin(name: string): boolean;
+
+		/**
+		 * Add/remove the vjs-has-started class
+		 *
+		 * @fires Player#firstplay
+		 *
+		 * @param request
+		 *        - true: adds the class
+		 *        - false: remove the class
+		 *
+		 * @return the boolean value of hasStarted_
+		 */
+		hasStarted(request: boolean): void;
+
+		hasStarted(): boolean;
+
+		/**
+		 * A getter/setter for the `Player`'s height. Returns the player's configured value.
+		 * To get the current height use `currentheight()`.
+		 *
+		 * @param [value]
+		 *        The value to set the `Player`'s heigth to.
+		 *
+		 * @return The current height of the `Player` when getting.
+		 */
+		height(value: number): void;
+
+		height(): number;
+
+		/**
+		 * Gets or sets the audio flag
+		 *
+		 * @param bool
+		 *        - true signals that this is an audio player
+		 *        - false signals that this is not an audio player
+		 *
+		 * @return The current value of isAudio when getting
+		 */
+		isAudio(bool: boolean): void;
+
+		isAudio(): boolean;
+
+		/**
+		 * Check if the player is in fullscreen mode or tell the player that it
+		 * is or is not in fullscreen mode.
+		 *
+		 * > NOTE: As of the latest HTML5 spec, isFullscreen is no longer an official
+		 * property and instead document.fullscreenElement is used. But isFullscreen is
+		 * still a valuable property for internal player workings.
+		 *
+		 * @param [isFS]
+		 *         Set the players current fullscreen state
+		 *
+		 * @return - true if fullscreen is on and getting
+		 *         - false if fullscreen is off and getting
+		 */
+		isFullscreen(isFS: boolean): void;
+
+		isFullscreen(): boolean;
+
+		/**
+		 * The player's language code
+		 * NOTE: The language should be set in the player options if you want the
+		 * the controls to be built with a specific language. Changing the language
+		 * later will not update controls text.
+		 *
+		 * @param [code]
+		 *        the language code to set the player to
+		 *
+		 * @return The current language code when getting
+		 */
+		language(code: string): void;
+
+		language(): string;
+
+		/**
+		 * Get the player's language dictionary
+		 * Merge every time, because a newly added plugin might call videojs.addLanguage() at any time
+		 * Languages specified directly in the player options have precedence
+		 *
+		 * @return An array of of supported languages
+		 */
+		languages(): string[];
+
+		languageSwitch(options: any): void;
+
+		/**
+		 * Begin loading the src data.
+		 */
+		load(): void;
+
+		/**
+		 * Get or set the loop attribute on the video element.
+		 *
+		 * @param [value]
+		 *        - true means that we should loop the video
+		 *        - false means that we should not loop the video
+		 *
+		 * @return The current value of loop when getting
+		 */
+		loop(value?: boolean): void;
+
+		loop(): string;
+
+		/**
+		 * Get the current muted state, or turn mute on or off
+		 *
+		 * @param [muted]
+		 *        - true to mute
+		 *        - false to unmute
+		 *
+		 * @return - true if mute is on and getting
+		 *         - false if mute is off and getting
+		 */
+		muted(muted: boolean): void;
+
+		muted(): boolean;
+
+		/**
+		 * Pause the video playback
+		 * @check
+		 * @return A reference to the player object this function was called on
+		 */
+		pause(): Player;
+
+		/**
+		 * Check if the player is paused or has yet to play
+		 *
+		 * @return - false: if the media is currently playing
+		 *         - true: if media is not currently playing
+		 */
+		paused(): boolean;
+
+		/**
+		 * Attempt to begin playback at the first opportunity.
+		 * @check
+		 * @return Returns a `Promise` only if the browser returns one and the player
+		 *         is ready to begin playback. For some browsers and all non-ready
+		 *         situations, this will return `undefined`.
+		 */
+		play(): Promise<void> | undefined;
+
+		/**
+		 * Gets or sets the current playback rate. A playback rate of
+		 * 1.0 represents normal speed and 0.5 would indicate half-speed
+		 * playback, for instance.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/embedded-content.html#dom-media-playbackrate
+		 *
+		 * @param [rate]
+		 *       New playback rate to set.
+		 *
+		 * @return The current playback rate when getting or 1.0
+		 */
+		playbackRate(rate?: number): void;
+
+		playbackRate(): number;
+
+		/**
+		 * Get a TimeRange object representing the current ranges of time that the user
+		 * has played.
+		 * @check
+		 * @return A time range object that represents all the increments of time that have
+		 *         been played.
+		 */
+		played(): any;
+
+		/**
+		 * Set or unset the playsinline attribute.
+		 * Playsinline tells the browser that non-fullscreen playback is preferred.
+		 *
+		 * @param [value]
+		 *        - true means that we should try to play inline by default
+		 *        - false means that we should use the browser's default playback mode,
+		 *          which in most cases is inline. iOS Safari is a notable exception
+		 *          and plays fullscreen by default.
+		 *
+		 * @return - the current value of playsinline
+		 *         - the player when setting
+		 *
+		 * @see [Spec]{@link https://html.spec.whatwg.org/#attr-video-playsinline}
+		 */
+		playsinline(value: boolean): Player;
+
+		playsinline(): string;
+
+		/**
+		 * Get or set the poster image source url
+		 *
+		 * @fires Player#posterchange
+		 *
+		 * @param [src]
+		 *        Poster image source URL
+		 *
+		 * @return The current value of poster when getting
+		 */
+		poster(src: string): void;
+
+		poster(): string;
+
+		/**
+		 * Get or set the preload attribute
+		 *
+		 * @param [value]
+		 *        - true means that we should preload
+		 *        - false means that we should not preload
+		 *
+		 * @return The preload attribute value when getting
+		 */
+		preload(value?: boolean): string;
+
+		/**
+		 * Calculates how much time is left in the video. Not part
+		 * of the native video API.
+		 *
+		 * @return The time remaining in seconds
+		 */
+		remainingTime(): number;
+
+		/**
+		 * A remaining time function that is intented to be used when
+		 * the time is to be displayed directly to the user.
+		 *
+		 * @return The rounded time remaining in seconds
+		 */
+		remainingTimeDisplay(): number;
+
+		/**
+		 * Remove a remote {@link TextTrack} from the respective
+		 * {@link TextTrackList} and {@link HtmlTrackElementList}.
+		 *
+		 * @param track
+		 *        Remote {@link TextTrack} to remove
+		 *
+		 * @return does not return anything
+		 */
+		removeRemoteTextTrack(track: HTMLTrackElement): void;
+
+		/**
+		 * Increase the size of the video to full screen
+		 * In some browsers, full screen is not supported natively, so it enters
+		 * "full window mode", where the video fills the browser window.
+		 * In browsers and devices that support native full screen, sometimes the
+		 * browser's default controls will be shown, and not the Video.js custom skin.
+		 * This includes most mobile devices (iOS, Android) and older versions of
+		 * Safari.
+		 *
+		 * @fires Player#fullscreenchange
+		 */
+		requestFullScreen(): Player;
+
+		/**
+		 * Report user activity
+		 *
+		 * @param event
+		 *        Event object
+		 */
+		reportUserActivity(event: any): void;
+
+		/**
+		 * Reset the player. Loads the first tech in the techOrder,
+		 * and calls `reset` on the tech`.
+		 */
+		reset(): void;
+
+		/**
+		 * Select source based on tech-order or source-order
+		 * Uses source-order selection if `options.sourceOrder` is truthy. Otherwise,
+		 * defaults to tech-order selection
+		 *
+		 * @param sources
+		 *        The sources for a media asset
+		 *
+		 * @return Object of source and tech order or false
+		 */
+		selectSource(sources: any[]): any;
+
+		/**
+		 * Returns whether or not the user is "scrubbing". Scrubbing is
+		 * when the user has clicked the progress bar handle and is
+		 * dragging it along the progress bar.
+		 *
+		 * @param [isScrubbing]
+		 *        whether the user is or is not scrubbing
+		 *
+		 * @return The value of scrubbing when getting
+		 */
+		scrubbing(isScrubbing: boolean): void;
+
+		scrubbing(): boolean;
+
+		/**
+		 * Get or set the video source.
+		 *
+		 * @param [source]
+		 *        A SourceObject, an array of SourceObjects, or a string referencing
+		 *        a URL to a media source. It is _highly recommended_ that an object
+		 *        or array of objects is used here, so that source selection
+		 *        algorithms can take the `type` into account.
+		 *
+		 *        If not provided, this method acts as a getter.
+		 *
+		 * @return If the `source` argument is missing, returns the current source
+		 *         URL. Otherwise, returns nothing/undefined.
+		 */
+		src(source: string | Tech.SourceObject | Tech.SourceObject[]): void;
+
+		src(): string;
+
+		/**
+		 * Check if current tech can support native fullscreen
+		 * (e.g. with built in controls like iOS, so not our flash swf)
+		 *
+		 * @return if native fullscreen is supported
+		 */
+		supportsFullScreen(): boolean;
+
+		/**
+		 * Return a reference to the current {@link Tech}.
+		 * It will print a warning by default about the danger of using the tech directly
+		 * but any argument that is passed in will silence the warning.
+		 *
+		 * @param [safety]
+		 *        Anything passed in to silence the warning
+		 *
+		 * @return The Tech
+		 */
+		tech(safety?: any): Tech;
+
+		/**
+		 * returns a JavaScript object reperesenting the current track
+		 * information. **DOES not return it as JSON**
+		 *
+		 * @return Object representing the current of track info
+		 */
+		toJSON(): any;
+
+		/**
+		 * Get/set if user is active
+		 *
+		 * @fires Player#useractive
+		 * @fires Player#userinactive
+		 *
+		 * @param [bool]
+		 *        - true if the user is active
+		 *        - false if the user is inactive
+		 *
+		 * @return The current value of userActive when getting
+		 */
+		userActive(bool: boolean): void;
+
+		userActive(): boolean;
+
+		/**
+		 * Toggle native controls on/off. Native controls are the controls built into
+		 * devices (e.g. default iPhone controls), Flash, or other techs
+		 * (e.g. Vimeo Controls)
+		 * **This should only be set by the current tech, because only the tech knows
+		 * if it can support native controls**
+		 *
+		 * @fires Player#usingnativecontrols
+		 * @fires Player#usingcustomcontrols
+		 *
+		 * @param [bool]
+		 *        - true to turn native controls on
+		 *        - false to turn native controls off
+		 *
+		 * @return The current value of native controls when getting
+		 */
+		usingNativeControls(bool: boolean): void;
+
+		usingNativeControls(): boolean;
+
+		/**
+		 * Reports whether or not a player is using a plugin by name.
+		 *
+		 * For basic plugins, this only reports whether the plugin has _ever_ been
+		 * initialized on this player.
+		 *
+		 * @param name
+		 *         The name of a plugin.
+		 *
+		 * @return Whether or not this player is using the requested plugin.
+		 */
+		usingPlugin(name: string): boolean;
+
+		/**
+		 * Get video height
+		 *
+		 * @return current video height
+		 */
+		videoHeight(): number;
+
+		/**
+		 * Get video width
+		 *
+		 * @return current video width
+		 */
+		videoWidth(): number;
+
+		/**
+		 * Get or set the current volume of the media
+		 *
+		 * @param [percentAsDecimal]
+		 *         The new volume as a decimal percent:
+		 *         - 0 is muted/0%/off
+		 *         - 1.0 is 100%/full
+		 *         - 0.5 is half volume or 50%
+		 *
+		 * @return The current volume as a percent when getting
+		 */
+		volume(percentAsDecimal: number): TimeRange;
+
+		volume(): number;
+
+		/**
+		 * A getter/setter for the `Player`'s width. Returns the player's configured value.
+		 * To get the current width use `currentWidth()`.
+		 *
+		 * @param [value]
+		 *        The value to set the `Player`'s width to.
+		 *
+		 * @return The current width of the `Player` when getting.
+		 */
+		width(value: number): void;
+
+		width(): number;
+	}
+
+	const Player: {
+		prototype: Player;
+
+		/**
+		 * An instance of the `Player` class is created when any of the Video.js setup methods
+		 * are used to initialize a video.
+		 *
+		 * After an instance has been created it can be accessed globally in two ways:
+		 * 1. By calling `videojs('example_video_1');`
+		 * 2. By using it directly via  `videojs.players.example_video_1;`
+		 */
+		new(player: Player, options?: PlayerOptions): Player;
+
+		/**
+		 * Gets tag settings
+		 *
+		 * @param tag
+		 *        The player tag
+		 * @check
+		 * @return An object containing all of the settings
+		 *         for a player tag
+		 */
+		getTagSettings(tag: Element): any;
+	};
+
+	interface PlayerOptions extends ComponentOptions {
+		aspectRatio?: string;
+		autoplay?: boolean | string;
+		controlBar?: ControlBarOptions | false;
+		textTrackSettings?: TextTrackSettingsOptions;
+		controls?: boolean;
 		defaultVolume?: number;
-		children?: string[];
+		fluid?: boolean;
+		height?: number;
+		html5?: any;
+		language?: string;
+		languages?: { [code: string]: LanguageTranslations };
 		loop?: boolean;
 		muted?: boolean;
-		controls?: boolean;
-		src?: string;
-		autoplay?: boolean;
-		preload?: string;
-		sources?: Source[];
-		aspectRatio?: string;
-		fluid?: boolean;
-		language?: string;
 		notSupportedMessage?: string;
+		playbackRates?: number[];
 		plugins?: any;
 		poster?: string;
+		preload?: string;
+		sourceOrder?: boolean;
+		sources?: Tech.SourceObject[];
+		src?: string;
+		techOrder?: string[];
+		tracks?: TextTrackOptions[];
+		width?: number;
 	}
 
-	interface Source {
-		type: string;
-		src: string;
+	/**
+	 * Parent class for all advanced plugins.
+	 *
+	 * @fires   Player#beforepluginsetup
+	 * @fires   Player#beforepluginsetup:$name
+	 * @fires   Player#pluginsetup
+	 * @fires   Player#pluginsetup:$name
+	 * @listens Player#dispose
+	 * @throws  {Error}
+	 *          If attempting to instantiate the base {@link Plugin} class
+	 *          directly instead of via a sub-class.
+	 */
+	interface Plugin extends EventedMixin {
+		player: Player;
+
+		/**
+		 * Disposes a plugin.
+		 *
+		 * Subclasses can override this if they want, but for the sake of safety,
+		 * it's probably best to subscribe the "dispose" event.
+		 *
+		 * @fires Plugin#dispose
+		 */
+		dispose(): void;
+
+		/**
+		 * Each event triggered by plugins includes a hash of additional data with
+		 * conventional properties.
+		 *
+		 * This returns that object or mutates an existing hash.
+		 *
+		 * @param [hash={}]
+		 *          An object to be used as event an event hash.
+		 *
+		 * @return An event hash object with provided properties mixed-in.
+		 */
+		getEventHash(hash?: any): Plugin.PluginEventHash;
+
+		/**
+		 * Handles "statechanged" events on the plugin. No-op by default, override by
+		 * subclassing.
+		 *
+		 * @param e
+		 *           An event object provided by a "statechanged" event.
+		 *
+		 * @param e.changes
+		 *           An object describing changes that occurred with the "statechanged"
+		 *           event.
+		 */
+		handleStateChanged(e: Event): void;
+
+		/**
+		 * Get the version of the plugin that was set on <pluginName>.VERSION
+		 */
+		version(): string;
+
+		/**
+		 * Triggers an event on the plugin object and overrides
+		 * {@link module:evented~EventedMixin.trigger|EventedMixin.trigger}.
+		 *
+		 * @param event
+		 *          An event type or an object with a type property.
+		 *
+		 * @param [hash={}]
+		 *          Additional data hash to merge with a
+		 *          {@link Plugin~PluginEventHash|PluginEventHash}.
+		 *
+		 * @return Whether or not default was prevented.
+		 */
+		trigger(event: any, hash?: any): boolean;
 	}
 
-	interface Dimensions {
+	const Plugin: {
+		prototype: Plugin;
+
+		/**
+		 * The name of the base plugin class as it is registered.
+		 *
+		 */
+		BASE_PLUGIN_NAME: string;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * Sub-classes should call `super` to ensure plugins are properly initialized.
+		 *
+		 * @param player
+		 *        A Video.js player instance.
+		 */
+		new (player: Player): Plugin;
+
+		/**
+		 * De-register a Video.js plugin.
+		 *
+		 * @param name
+		 *        The name of the plugin to be deregistered.
+		 */
+		deregisterPlugin(name: string): void;
+
+		/**
+		 * Gets a plugin by name if it exists.
+		 *
+		 * @param name
+		 *           The name of a plugin.
+		 *
+		 * @return The plugin (or `undefined`).
+		 */
+		getPlugin(name: string): typeof Plugin;
+
+		/**
+		 * Gets a plugin's version, if available
+		 *
+		 * @param name
+		 *          The name of a plugin.
+		 *
+		 * @return The plugin's version or an empty string.
+		 */
+		getPluginVersion(name: string): string;
+
+		/**
+		 * Gets an object containing multiple Video.js plugins.
+		 *
+		 * @param [names]
+		 *          If provided, should be an array of plugin names. Defaults to _all_
+		 *          plugin names.
+		 *
+		 * @return An object containing plugin(s) associated with their name(s) or
+		 *          `undefined` if no matching plugins exist).
+		 *
+		 * @check returning type
+		 */
+		getPlugins(names?: string[]): { [name: string]: Plugin }
+
+		/**
+		 * Determines if a plugin is a basic plugin (i.e. not a sub-class of `Plugin`).
+		 *
+		 * @param plugin
+		 *          If a string, matches the name of a plugin. If a function, will be
+		 *          tested directly.
+		 *
+		 * @return Whether or not a plugin is a basic plugin.
+		 */
+		isBasic(plugin: string | (() => any)): boolean
+		/**
+		 * Register a Video.js plugin.
+		 *
+		 * @param name
+		 *          The name of the plugin to be registered. Must be a string and
+		 *          must not match an existing plugin or a method on the `Player`
+		 *          prototype.
+		 *
+		 * @param plugin
+		 *          A sub-class of `Plugin` or a function for basic plugins.
+		 *
+		 * @return For advanced plugins, a factory function for that plugin. For
+		 *          basic plugins, a wrapper function that initializes the plugin.
+		 */
+		registerPlugin<T, K>(name: string, plugin: (this: Player, ...options: K[]) => T): (...options: K[]) => T;
+		registerPlugin<T extends typeof Plugin>(name: string, plugin: T): () => T;
+	};
+
+	namespace Plugin {
+		interface PluginEventHash {
+			/**
+			 * For basic plugins, the return value of the plugin function. For
+			 * advanced plugins, the plugin instance on which the event is fired.
+			 */
+			instance: Plugin;
+			/**
+			 * The name of the plugin.
+			 */
+			name: string;
+			/**
+			 * For basic plugins, the plugin function. For advanced plugins, the
+			 * plugin class/constructor.
+			 */
+			plugin: string;
+		}
+	}
+
+	interface ProgressControl extends Component {
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Disable all controls on the progress control and its children
+		 */
+		disable(): void;
+
+		/**
+		 * Enable all controls on the progress control and its children
+		 */
+		enable(): void;
+
+		/**
+		 * Are controls are currently enabled for this progress control.
+		 *
+		 * @return true if controls are enabled, false otherwise
+		 */
+		enabled(): boolean;
+
+		/**
+		 * Handle `mousedown` or `touchstart` events on the `ProgressControl`.
+		 *
+		 * @param event
+		 *        `mousedown` or `touchstart` event that triggered this function
+		 *
+		 * @listens mousedown
+		 * @listens touchstart
+		 */
+		handleMouseDown(event: EventTarget.Event): void;
+
+		/**
+		 * When the mouse moves over the `ProgressControl`, the pointer position
+		 * gets passed down to the `MouseTimeDisplay` component.
+		 *
+		 * @param event
+		 *        The `mousemove` event that caused this function to run.
+		 *
+		 * @listen mousemove
+		 */
+		handleMouseMove(event: EventTarget.Event): void;
+
+		/**
+		 * Handle `mousemove` or `touchmove` events on the `ProgressControl`.
+		 *
+		 * @param event
+		 *        `mousedown` or `touchstart` event that triggered this function
+		 *
+		 * @listens mousemove
+		 * @listens touchmove
+		 */
+		handleMouseSeek(event: EventTarget.Event): void;
+
+		/**
+		 * Handle `mouseup` or `touchend` events on the `ProgressControl`.
+		 *
+		 * @param event
+		 *        `mouseup` or `touchend` event that triggered this function.
+		 *
+		 * @listens touchend
+		 * @listens mouseup
+		 */
+		handleMouseUp(event: EventTarget.Event): void;
+	}
+
+	const ProgressControl: {
+		prototype: ProgressControl;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): ProgressControl;
+	};
+
+	interface Representation {
+		id: string;
 		width: number;
 		height: number;
+		bitrate: number;
+
+		enabled(): boolean;
+
+		enabled(enabled: boolean): void;
 	}
 
-	class Component {
-		constructor(player: Player, options: any);
+	/**
+	 * Seek bar and container for the progress bars. Uses {@link PlayProgressBar}
+	 * as its `bar`.
+	 */
+	interface SeekBar extends Slider {
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
 
-		static getComponent(name: 'Player'|'player'): typeof Player;
-		static getComponent(name: 'Component'|'component' | string): typeof Component;
-		static registerComponent(name: string, ComponentToRegister: typeof Component): typeof Component;
+		/**
+		 * Disable controls for this slider if they are enabled
+		 */
+		disable(): void;
 
-		$(selector: string, context?: string|Element): Element;
-		$$(selector: string, context?: string|Element): NodeList;
-		addClass(classToAdd: string): void;
-		blur(): void;
-		cancelAnimationFrame(id: number): number;
-		children(): Component[];
-		clearInterval(intervalId: number): number;
-		clearTimeout(timeoutId: number): number;
-		contentEl(): Element;
-		createEl(tagNameopt?: string, properties?: any, attributes?: any): Element;
-		currentDimension(widthOrHeight: 'width'|'height'): number;
-		currentDimensions(): Dimensions;
-		currentHeight(): number;
-		currentWidth(): number;
-		dimension(widthOrHeight: 'width'|'height'): number;
-		dimension(widthOrHeight: 'width'|'height', num: string|number, skipListenersopt?: boolean): void;
-		dimensions(width: string|number, height: string|number): void;
-		dispose(): void;
-		el(): Element;
-		enableTouchActivity(): void;
-		focus(): void;
-		getAttribute(attribute: string): string|null;
-		getChild(name: string): Component|undefined;
-		getChildById(id: string): Component|undefined;
-		hasClass(classToCheck: string): boolean;
-		height(): number|string;
-		height(num: number|string, skipListeners?: boolean): void;
-		hide(): void;
-		id(): string;
-		initChildren(): void;
-		localize(key: string, tokens?: string[], defaultValue?: string): string;
-		name(): string;
-		off(eventName?: string, callback?: (eventObject: Event) => void): void;
-		on(eventName: string, callback: (eventObject: Event) => void): void;
-		one(eventName: string, callback: (eventObject: Event) => void): void;
-		options(obj: any): any;
-		player(): Player;
-		ready(callback: (this: this) => void): this;
-		removeAttribute(attribute: string): void;
-		removeChild(component: Component): void;
-		removeClass(classToRemove: string): void;
-		requestAnimationFrame(fn: () => void): number;
-		setAttribute(attribute: string, value: string): void;
-		setInterval(fn: () => void, interval: number): number;
-		setTimeout(fn: () => void, timeout: number): number;
-		show(): void;
-		toggleClass(classToToggle: string, predicate?: string): void;
-		triggerReady(): void;
-		width(): string | number;
-		width(num: number, skipListeners?: number): void;
+		/**
+		 * Enable controls for this slider if they are disabled
+		 */
+		enable(): void;
+
+		/**
+		 * Toggles the playback state of the player
+		 * This gets called when enter or space is used on the seekbar
+		 *
+		 * @param event
+		 *        The `keydown` event that caused this function to be called
+		 *
+		 */
+		handleAction(event: EventTarget.Event): void;
+
+		/**
+		 * We want the seek bar to be full on ended
+		 * no matter what the actual internal values are. so we force it.
+		 *
+		 * @param [event]
+		 *        The `timeupdate` or `ended` event that caused this to run.
+		 *
+		 * @listens Player#ended
+		 */
+		handleEnded(event: EventTarget.Event): void;
+
+		/**
+		 * Called when this SeekBar has focus and a key gets pressed down. By
+		 * default it will call `this.handleAction` when the key is space or enter.
+		 *
+		 * @param event
+		 *        The `keydown` event that caused this function to be called.
+		 *
+		 * @listens keydown
+		 */
+		handleKeyPress(event: EventTarget.Event): void;
+
+		/**
+		 * Handle mouse down on seek bar
+		 *
+		 * @param event
+		 *        The `mousedown` event that caused this to run.
+		 *
+		 * @listens mousedown
+		 */
+		handleMouseDown(event: EventTarget.Event): void;
+
+		/**
+		 * Handle mouse move on seek bar
+		 *
+		 * @param event
+		 *        The `mousemove` event that caused this to run.
+		 *
+		 * @listens mousemove
+		 */
+		handleMouseMove(event: EventTarget.Event): void;
+
+		/**
+		 * Handle mouse up on seek bar
+		 *
+		 * @param event
+		 *        The `mouseup` event that caused this to run.
+		 *
+		 * @listens mouseup
+		 */
+		handleMouseUp(event: EventTarget.Event): void;
+
+		/**
+		 * Get the percentage of media played so far.
+		 *
+		 * @return The percentage of media played so far (0 to 1).
+		 */
+		getPercent(): number;
+
+		/**
+		 * Move more quickly fast forward for keyboard-only users
+		 */
+		stepForward(): void;
+
+		/**
+		 * Move more quickly rewind for keyboard-only users
+		 */
+		stepBack(): void;
+
+		/**
+		 * Update the seek bar's UI.
+		 *
+		 * @listens Player#timeupdate
+		 *
+		 * @return The current percent at a number from 0-1
+		 */
+		update(): number;
 	}
 
-	class Player extends Component {
-		autoplay(value?: boolean): string;
-		addRemoteTextTrack(options: {}, manualCleanup?: boolean): HTMLTrackElement;
-		buffered(): TimeRanges;
+	const SeekBar: {
+		prototype: SeekBar;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: SliderOptions): SeekBar;
+	};
+
+	/**
+	 * The base functionality for a slider. Can be vertical or horizontal.
+	 * For instance the volume bar or the seek bar on a video is a slider.
+	 */
+	interface Slider extends Component {
+		options_: SliderOptions;
+
+		/**
+		 * Enable controls for this slider if they are disabled
+		 */
+		enable(): void;
+
+		/**
+		 * Are controls are currently enabled for this slider or not.
+		 *
+		 * @return true if controls are enabled, false otherwise
+		 */
+		enabled(): boolean;
+
+		/**
+		 * Disable controls for this slider if they are enabled
+		 */
+		disable(): void;
+
+		/**
+		 * Create the `Slider`s DOM element.
+		 *
+		 * @param type
+		 *        Type of element to create.
+		 *
+		 * @param [props={}]
+		 *        List of properties in Object form.
+		 *
+		 * @param [attributes={}]
+		 *        list of attributes in Object form.
+		 *
+		 * @return The element that gets created.
+		 */
+		createEl(type: string, props?: any, attributes?: any): Element;
+
+		/**
+		 * Handle `mousedown` or `touchstart` events on the `Slider`.
+		 *
+		 * @param event
+		 *        `mousedown` or `touchstart` event that triggered this function
+		 *
+		 * @listens mousedown
+		 * @listens touchstart
+		 * @fires Slider#slideractive
+		 */
+		handleMouseDown(event: EventTarget.Event): void;
+
+		/**
+		 * Handle the `mousemove`, `touchmove`, and `mousedown` events on this `Slider`.
+		 * The `mousemove` and `touchmove` events will only only trigger this function during
+		 * `mousedown` and `touchstart`. This is due to {@link Slider#handleMouseDown} and
+		 * {@link Slider#handleMouseUp}.
+		 *
+		 * @param event
+		 *        `mousedown`, `mousemove`, `touchstart`, or `touchmove` event that triggered
+		 *        this function
+		 *
+		 * @listens mousemove
+		 * @listens touchmove
+		 */
+		handleMouseMove(event: EventTarget.Event): void;
+
+		/**
+		 * Handle `mouseup` or `touchend` events on the `Slider`.
+		 *
+		 * @param event
+		 *        The `mouseup` event that caused this to run.
+		 *
+		 * @listens touchend
+		 * @listens mouseup
+		 * @fires Slider#sliderinactive
+		 */
+		handleMouseUp(event: EventTarget.Event): void;
+
+		/**
+		 * Update the progress bar of the `Slider`.
+		 *
+		 * @return The percentage of progress the progress bar represents as a
+		 *          number from 0 to 1.
+		 */
+		update(): number;
+
+		/**
+		 * Calculate distance for slider
+		 *
+		 * @param event
+		 *        The event that caused this function to run.
+		 *
+		 * @return The current position of the Slider.
+		 *         - position.x for vertical `Slider`s
+		 *         - position.y for horizontal `Slider`s
+		 */
+		calculateDistance(event: EventTarget.Event): number;
+
+		/**
+		 * Handle a `focus` event on this `Slider`.
+		 *
+		 * @listens focus
+		 */
+		handleFocus(): void;
+
+		/**
+		 * Handle a `focus` event on this `Slider`.
+		 *
+		 * @listens focus
+		 */
+		handleFocus(): void;
+
+		/**
+		 * Handle a `blur` event on this `Slider`.
+		 *
+		 * @listens blur
+		 */
+		handleBlur(): void;
+
+		/**
+		 * Listener for click events on slider, used to prevent clicks
+		 *   from bubbling up to parent elements like button menus.
+		 *
+		 * @param event
+		 *        Event that caused this object to run
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * Get/set if slider is horizontal for vertical
+		 *
+		 * @param [bool]
+		 *        - true if slider is vertical,
+		 *        - false is horizontal
+		 *
+		 * @return - true if slider is vertical, and getting
+		 *         - false if the slider is horizontal, and getting
+		 */
+		vertical(bool: boolean): void;
+
+		vertical(): boolean;
+	}
+
+	const Slider: {
+		prototype: Slider;
+
+		/**
+		 * Create an instance of this class
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: SliderOptions): Slider;
+	};
+
+	interface SliderOptions extends ComponentOptions {
+		/**
+		 * Set property names to bar to match with the child Slider class is looking for
+		 */
+		barName?: string;
+
+		/**
+		 * Set a horizontal or vertical class on the slider depending on the slider type
+		 */
+		vertical?: boolean;
+	}
+
+	/**
+	 * Just an empty spacer element that can be used as an append point for plugins, etc.
+	 * Also can be used to create space between elements when necessary.
+	 */
+	interface Spacer extends Component {
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+	}
+
+	const Spacer: {
+		prototype: Spacer;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [ready]
+		 *        Function that gets called when the `Component` is ready.
+		 */
+		new (player: Player, options?: ComponentOptions, ready?: Component.ReadyCallback): Spacer;
+	};
+
+	interface Tech extends Component {
+		/**
+		 * Boolean indicating whether the `Tech` supports fullscreen resize control.
+		 * Resizing plugins using request fullscreen reloads the plugin
+		 *
+		 * @default
+		 */
+		featuresFullscreenResize: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports muting volume.
+		 *
+		 * @default
+		 */
+		featuresMuteControl: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports the native `TextTrack`s.
+		 * This will help us integrate with native `TextTrack`s if the browser supports them.
+		 *
+		 * @default
+		 */
+		featuresNativeTextTracks: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports changing the speed at which the video
+		 * plays. Examples:
+		 *   - Set player to play 2x (twice) as fast
+		 *   - Set player to play 0.5x (half) as fast
+		 *
+		 * @default
+		 */
+		featuresPlaybackRate: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports the `progress` event. This is currently
+		 * not triggered by video-js-swf. This will be used to determine if
+		 * {@link Tech#manualProgressOn} should be called.
+		 *
+		 * @default
+		 */
+		featuresProgressEvents: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports the `sourceset` event.
+		 *
+		 * A tech should set this to `true` and then use {@link Tech#triggerSourceset}
+		 * to trigger a {@link Tech#event:sourceset} at the earliest time after getting
+		 * a new source.
+		 *
+		 * @default
+		 */
+		featuresSourceset: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports the `timeupdate` event. This is currently
+		 * not triggered by video-js-swf. This will be used to determine if
+		 * {@link Tech#manualTimeUpdates} should be called.
+		 *
+		 * @default
+		 */
+		featuresTimeupdateEvents: boolean;
+
+		/**
+		 * Boolean indicating whether the `Tech` supports volume control.
+		 *
+		 * @default
+		 */
+		featuresVolumeControl: boolean;
+
+		/**
+		 * Creates a remote text track object and returns an html track element.
+		 *
+		 * > Note: This can be an emulated {@link HTMLTrackElement} or a native one.
+		 *
+		 * @param options
+		 *        See {@link Tech#createRemoteTextTrack} for more detailed properties.
+		 *
+		 * @param [manualCleanup=true]
+		 *        - When false: the TextTrack will be automatically removed from the video
+		 *          element whenever the source changes
+		 *        - When True: The TextTrack will have to be cleaned up manually
+		 *
+		 * @return An Html Track Element.
+		 *
+		 * @deprecated The default functionality for this function will be equivalent
+		 *             to "manualCleanup=false" in the future. The manualCleanup parameter will
+		 *             also be removed.
+		 */
+		addRemoteTextTrack(options: TextTrackOptions, manualCleanup: true): HTMLTrackElement;
+
+		/**
+		 * Create and returns a remote {@link TextTrack} object.
+		 *
+		 * @param kind
+		 *        `TextTrack` kind (subtitles, captions, descriptions, chapters, or metadata)
+		 *
+		 * @param [label]
+		 *        Label to identify the text track
+		 *
+		 * @param [language]
+		 *        Two letter language abbreviation
+		 *
+		 * @return The TextTrack that gets created.
+		 */
+		addTextTrack(kind: string, label: string, language: string): TextTrack;
+
+		/**
+		 * Emulate TextTracks using vtt.js if necessary
+		 *
+		 * @fires Tech#vttjsloaded
+		 * @fires Tech#vttjserror
+		 */
+		addWebVttScript_(): void;
+
+		/**
+		 * Get the {@link AudioTrackList}
+		 *
+		 * @return Tech.prototype.audioTracks
+		 */
+		audioTracks(): TrackList;
+
+		/**
+		 * Get and create a `TimeRange` object for buffering.
+		 *
+		 * @return The time range object that was created.
+		 */
+		buffered(): any;
+
+		/**
+		 * Get the percentage of the current video that is currently buffered.
+		 *
+		 * @return A number from 0 to 1 that represents the decimal percentage of the
+		 *         video that is buffered.
+		 *
+		 */
 		bufferedPercent(): number;
-		cancelFullScreen(): Player;
-		controls(bool?: boolean): boolean;
-		currentTime(): number;
-		currentTime(seconds: number): Player;
-		duration(): number;
-		exitFullscreen(): Player;
-		height(): number;
-		height(num: number): void;
-		languageSwitch(options: any): void;
-		loop(value?: boolean): string;
-		muted(muted?: boolean): boolean;
-		pause(): Player;
-		paused(): boolean;
-		play(): Player;
-		playbackRate(rate?: number): number;
-		poster(val?: string): string | Player;
-		preload(value?: boolean): string;
-		removeRemoteTextTrack(track: HTMLTrackElement): void;
-		requestFullScreen(): Player;
-		size(width: number, height: number): Player;
-		src(newSource: string | Source | Source[]): Player;
-		volume(): number;
-		volume(percentAsDecimal: number): TimeRanges;
-		width(): number;
-		width(num: number): void;
+
+		/**
+		 * Check if the tech can support the given mime-type.
+		 *
+		 * The base tech does not support any type, but source handlers might
+		 * overwrite this.
+		 *
+		 * @param type
+		 *         The mimetype to check for support
+		 *
+		 * @return 'probably', 'maybe', or empty string
+		 *
+		 * @see [Spec]{@link https://developer.mozilla.org/en-US/docs/Web/API/HTMLMediaElement/canPlayType}
+		 */
+		canPlayType(type: string): string;
+
+		/**
+		 * Remove any TextTracks added via addRemoteTextTrack that are
+		 * flagged for automatic garbage collection
+		 */
+		cleanupAutoTextTracks(): void;
+
+		/**
+		 * Clear out a single `TrackList` or an array of `TrackLists` given their names.
+		 *
+		 * > Note: Techs without source handlers should call this between sources for `video`
+		 *         & `audio` tracks. You don't want to use them between tracks!
+		 *
+		 * @param types
+		 *        TrackList names to clear, valid names are `video`, `audio`, and
+		 *        `text`.
+		 */
+		clearTracks(types: string | string[]): void;
+
+		/**
+		 * Create an emulated TextTrack for use by addRemoteTextTrack
+		 *
+		 * This is intended to be overridden by classes that inherit from
+		 * Tech in order to create native or custom TextTracks.
+		 *
+		 * @param options
+		 *        The object should contain the options to initialize the TextTrack with.
+		 *
+		 * @param [options.kind]
+		 *        `TextTrack` kind (subtitles, captions, descriptions, chapters, or metadata).
+		 *
+		 * @param [options.label].
+		 *        Label to identify the text track
+		 *
+		 * @param [options.language]
+		 *        Two letter language abbreviation.
+		 *
+		 * @return The track element that gets created.
+		 */
+		createRemoteTextTrack(options: TextTrackOptions): HTMLTextAreaElement;
+
+		/**
+		 * Turn off all event polyfills, clear the `Tech`s {@link AudioTrackList},
+		 * {@link VideoTrackList}, and {@link TextTrackList}, and dispose of this Tech.
+		 *
+		 * @fires Component#dispose
+		 */
+		dispose(): void;
+
+		/**
+		 * Emulate texttracks
+		 *
+		 */
+		emulateTextTracks(): void;
+
+		/**
+		 * Get or set an error on the Tech.
+		 *
+		 * @param [err]
+		 *        Error to set on the Tech
+		 *
+		 * @return The current error object on the tech, or null if there isn't one.
+		 */
+		error(err: MediaError): MediaError | null;
+
+		/**
+		 * Gets available media playback quality metrics as specified by the W3C's Media
+		 * Playback Quality API.
+		 *
+		 * @see [Spec]{@link https://wicg.github.io/media-playback-quality}
+		 *
+		 * @return An object with supported media playback quality metrics
+		 */
+		getVideoPlaybackQuality(): any;
+
+		/**
+		 * Turn on listeners for {@link VideoTrackList}, {@link {AudioTrackList}, and
+		 * {@link TextTrackList} events.
+		 *
+		 * This adds {@link EventTarget~EventListeners} for `addtrack`, and  `removetrack`.
+		 *
+		 * @fires Tech#audiotrackchange
+		 * @fires Tech#videotrackchange
+		 * @fires Tech#texttrackchange
+		 */
+		initTrackListeners(): void;
+
+		manualProgressOff(): void;
+
+		/**
+		 * Polyfill the `progress` event for browsers that don't support it natively.
+		 *
+		 * @see {@link Tech#trackProgress}
+		 */
+		manualProgressOn(): void;
+
+		/**
+		 * Turn off the polyfill for `progress` events that was created in
+		 * {@link Tech#manualProgressOn}
+		 */
+		manualTimeUpdatesOff(): void;
+
+		/**
+		 * Polyfill the `timeupdate` event for browsers that don't support it.
+		 *
+		 * @see {@link Tech#trackCurrentTime}
+		 */
+		manualTimeUpdatesOn(): void;
+
+		/**
+		 * Update our internal duration on a `durationchange` event by calling
+		 * {@link Tech#duration}.
+		 *
+		 * @param event
+		 *        The `durationchange` event that caused this to run.
+		 *
+		 * @listens Tech#durationchange
+		 */
+		onDurationChange(event: Event): void;
+
+		/**
+		 * Attempt to force override of native audio tracks.
+		 *
+		 * @param override - If set to true native audio will be overridden,
+		 * otherwise native audio will potentially be used.
+		 */
+		overrideNativeAudioTracks(override: boolean): void;
+
+		/**
+		 * Attempt to force override of native video tracks.
+		 *
+		 * @param override - If set to true native video will be overridden,
+		 * otherwise native video will potentially be used.
+		 */
+		overrideNativeVideoTracks(override: boolean): void;
+
+		/**
+		 * Returns the `TimeRange`s that have been played through for the current source.
+		 *
+		 * > NOTE: This implementation is incomplete. It does not track the played `TimeRange`.
+		 *         It only checks whether the source has played at all or not.
+		 *
+		 * @return - A single time range if this video has played
+		 *         - An empty set of ranges if not.
+		 */
+		played(): any;
+
+		/**
+		 * A method to check for the presence of the 'playsinline' <video> attribute.
+		 */
+		playsinline(): any;
+
+		/**
+		 * Get the remote element {@link HTMLTrackElementList}
+		 */
+		remoteTextTrackEls(): HTMLTrackElementList;
+
+		/**
+		 * Get the remote element {@link TextTrackList}
+		 */
+		remoteTextTracks(): TextTrackList;
+
+		/**
+		 * Remove a remote text track from the remote `TextTrackList`.
+		 *
+		 * @param track
+		 *        `TextTrack` to remove from the `TextTrackList`
+		 */
+		removeRemoteTextTrack(track: TextTrack): void;
+
+		/**
+		 * Reset the tech, which will removes all sources and reset the internal readyState.
+		 */
+		reset(): void;
+
+		/**
+		 * Causes a manual time update to occur if {@link Tech#manualTimeUpdatesOn} was
+		 * previously called.
+		 *
+		 * @fires Tech#timeupdate
+		 */
+		setCurrentTime(): void;
+
+		/**
+		 * A method to set or unset the 'playsinline' <video> attribute.
+		 */
+		setPlaysinline(): void;
+
+		/**
+		 * A method to set a poster from a `Tech`.
+		 */
+		setPoster(): void;
+
+		/**
+		 * Stop the interval function created in {@link Tech#trackCurrentTime} so that the
+		 * `timeupdate` event is no longer triggered.
+		 *
+		 * @listens {Tech#pause}
+		 */
+		stopTrackingCurrentTime(): void;
+
+		/**
+		 * Turn off the polyfill for `progress` events that was created in
+		 * {@link Tech#manualProgressOn}
+		 * Stop manually tracking progress events by clearing the interval that was set in
+		 * {@link Tech#trackProgress}.
+		 */
+		stopTrackingProgress(): void;
+
+		/**
+		 * Get the {@link TextTrackList}
+		 */
+		textTracks(): TextTrackList;
+
+		/**
+		 * Sets up an interval function to track current time and trigger `timeupdate` every
+		 * 250 milliseconds.
+		 *
+		 * @listens Tech#play
+		 * @triggers Tech#timeupdate
+		 */
+		trackCurrentTime(): void;
+
+		/**
+		 * This is used to trigger a `progress` event when the buffered percent changes. It
+		 * sets an interval function that will be called every 500 milliseconds to check if the
+		 * buffer end percent has changed.
+		 *
+		 * > This function is called by {@link Tech#manualProgressOn}
+		 *
+		 * @param event
+		 *        The `ready` event that caused this to run.
+		 *
+		 * @listens Tech#ready
+		 * @fires Tech#progress
+		 */
+		trackProgress(event: EventTarget.Event): void;
+
+		/**
+		 * A special function to trigger source set in a way that will allow player
+		 * to re-trigger if the player or tech are not ready yet.
+		 *
+		 * @fires Tech#sourceset
+		 * @param src The source string at the time of the source changing.
+		 */
+		triggerSourceset(src: string): void;
+
+		/**
+		 * Get the {@link VideoTrackList}
+		 */
+		videoTracks(): TrackList;
 	}
 
-	namespace dom {
-		function appendContent(element: Element, content: any): Element;
+	const Tech: {
+		prototype: Tech;
+
+		/**
+		 * Create an instance of this Tech.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param ready
+		 *        Callback function to call when the `HTML5` Tech is ready.
+		 */
+		new (options?: any, ready?: Component.ReadyCallback): Tech;
+
+		/**
+		 * Check if the tech can support the given source
+		 * @param srcObj
+		 *        The source object
+		 * @param options
+		 *        The options passed to the tech
+		 * @return 'probably', 'maybe', or '' (empty string)
+		 */
+		canPlaySource(srcObj: any, options: any): 'problably' | 'maybe' | '';
+
+		/**
+		 * Check if the type is supported by this tech.
+		 *
+		 * The base tech does not support any type, but source handlers might
+		 * overwrite this.
+		 *
+		 * @param type
+		 *        The media type to check
+		 * @return Returns the native video element's response
+		 */
+		canPlayType(type: string): string;
+
+		/**
+		 * Get a `Tech` from the shared list by name.
+		 *
+		 * @param name
+		 *        `camelCase` or `TitleCase` name of the Tech to get
+		 *
+		 * @return The `Tech` or undefined if there was no tech with the name requested.
+		 */
+		getTech(name: string): Tech | undefined;
+
+		/**
+		 * Return whether the argument is a Tech or not.
+		 * Can be passed either a Class like `Html5` or a instance like `player.tech_`
+		 *
+		 * @param component
+		 *        The item to check
+		 *
+		 * @return Whether it is a tech or not
+		 *         - True if it is a tech
+		 *         - False if it is not
+		 */
+		isTech(component: any): boolean
+
+		/**
+		 * Registers a `Tech` into a shared list for videojs.
+		 *
+		 * @param name
+		 *        Name of the `Tech` to register.
+		 *
+		 * @param tech
+		 *        The `Tech` class to register.
+		 */
+		registerTech(name: string, tech: any): void;
+
+		/**
+		 * A functional mixin for techs that want to use the Source Handler pattern.
+		 * Source handlers are scripts for handling specific formats.
+		 * The source handler pattern is used for adaptive formats (HLS, DASH) that
+		 * manually load video data and feed it into a Source Buffer (Media Source Extensions)
+		 * Example: `Tech.withSourceHandlers.call(MyTech);`
+		 *
+		 * @param tech
+		 *        The tech to add source handler functions to.
+		 *
+		 */
+		withSourceHandlers(tech: typeof Tech): void;
+	};
+
+	namespace Tech {
+		/**
+		 * An Object containing a structure like: `{src: 'url', type: 'mimetype'}` or string
+		 * that just contains the src url alone.
+		 * `var SourceObject = {src: 'http://ex.com/video.mp4', type: 'video/mp4'};`
+		 * `var SourceString = 'http://example.com/some-video.mp4';`
+		 */
+		interface SourceObject {
+			/**
+			 * The url to the source
+			 */
+			src: string;
+
+			/**
+			 * The mime type of the source
+			 */
+			type?: string;
+		}
+	}
+
+	/**
+	 * The base class for buttons that toggle specific text track types (e.g. subtitles)
+	 */
+	interface TextTrackButton extends MenuButton {
+		/**
+		 * Create a menu item for each text track
+		 *
+		 * @param [items=[]]
+		 *        Existing array of items to use during creation
+		 *
+		 * @param [TrackMenuItem=TextTrackMenuItem]
+		 *        Existing array of items to use during creation
+		 *
+		 * @return Array of menu items that were created
+		 */
+		createItems(items?: TextTrackMenuItem[], TrackMenuItem?: typeof TextTrackMenuItem): TextTrackMenuItem[];
+	}
+
+	const TextTrackButton: {
+		prototype: TextTrackButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: TrackButtonOptions): TextTrackButton;
+	};
+
+	/**
+	 * A List of TextTrackCues.
+	 *
+	 * @see [Spec]{@link https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackcuelist}
+	 */
+	interface TextTrackCueList {
+		/**
+		 * Index getters for the cues.
+		 *
+		 * @param index
+		 */
+		[index: number]: TextTrackCueList.TextTrackCue;
+
+		/**
+		 * The current number of `TextTrackCue`s in the TextTrackCueList.
+		 */
+		length: number;
+
+		/**
+		 * Get a `TextTrackCue` that is currently in the `TextTrackCueList` by id.
+		 *
+		 * @param id
+		 *        The id of the cue that should be searched for.
+		 *
+		 * @return A single cue or null if none was found.
+		 */
+		getCueById(id: string): TextTrackCueList.TextTrackCue;
+	}
+
+	const TextTrackCueList: {
+		prototype: TextTrackCueList;
+
+		/**
+		 * Create an instance of this class..
+		 *
+		 * @param cues
+		 *        A list of cues to be initialized with
+		 */
+		new (cues: TextTrackCueList.TextTrackCue[]): TextTrackCueList;
+	};
+
+	namespace TextTrackCueList {
+		/**
+		 * @see [Spec]{@link https://html.spec.whatwg.org/multipage/embedded-content.html#texttrackcue}
+		 */
+		interface TextTrackCue {
+			/**
+			 * The unique id for this text track cue
+			 */
+			id: string;
+
+			/**
+			 * The start time for this text track cue
+			 */
+			startTime: number;
+
+			/**
+			 * The end time for this text track cue
+			 */
+			endTime: number;
+
+			/**
+			 * The text this cue is holding
+			 */
+			text: string;
+
+			/**
+			 * Pause when the end time is reached if true.
+			 */
+			pauseOnExit: boolean;
+		}
+	}
+
+	/**
+	 * The specific menu item type for selecting a language within a text track kind
+	 */
+	interface TextTrackMenuItem extends MenuItem {
+		/**
+		 * This gets called when an `TextTrackMenuItem` is "clicked". See
+		 * {@link ClickableComponent} for more detailed information on what a click can be.
+		 *
+		 * @param event
+		 *        The `keydown`, `tap`, or `click` event that caused this function to be
+		 *        called.
+		 *
+		 * @listens tap
+		 * @listens click
+		 */
+		handleClick(event: EventTarget.Event): void;
+
+		/**
+		 * Handle text track list change
+		 *
+		 * @param event
+		 *        The `change` event that caused this function to be called.
+		 *
+		 * @listens TextTrackList#change
+		 */
+		handleTracksChange(event: EventTarget.Event): void;
+
+		/**
+		 * Handle selected language change
+		 *
+		 * @param event
+		 *        The `change` event that caused this function to be called.
+		 */
+		handleSelectedLanguageChange(event: EventTarget.Event): void;
+	}
+
+	const TextTrackMenuItem: {
+		prototype: TextTrackMenuItem;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: TextTrackMenuItemOptions): TextTrackMenuItem;
+	};
+
+	interface TextTrackMenuItemOptions extends MenuItemOptions {
+		track: TextTrack;
+	}
+
+	/**
+	 * Manipulate Text Tracks settings.
+	 */
+	interface TextTrackSettings extends ModalDialog {
+		/**
+		 * Gets or sets the modal content, which gets normalized before being
+		 * rendered into the DOM.
+		 *
+		 * This does not update the DOM or fill the modal, but it is called during
+		 * that process.
+		 *
+		 * @return The current content of the modal dialog
+		 */
+		content(): Element[];
+
+		/**
+		 * Returns the label string for this modal. Primarily used for accessibility.
+		 *
+		 * @return the localized or raw label of this modal.
+		 */
+		label(): string;
+
+		/**
+		 * Returns the description string for this modal. Primarily used for
+		 * accessibility.
+		 *
+		 * @return The localized or raw description of this modal.
+		 */
+		description(): string;
+
+		/**
+		 * Builds the default DOM `className`.
+		 *
+		 * @return The DOM `className` for this object.
+		 */
+		buildCSSClass(): string;
+
+		/**
+		 * Gets an object of text track settings (or null).
+		 *
+		 * @return An object with config values parsed from the DOM or localStorage.
+		 */
+		getValues(): any;
+
+		/**
+		 * Sets text track settings from an object of values.
+		 *
+		 * @param values
+		 *        An object with config values parsed from the DOM or localStorage.
+		 */
+		setValues(values: any): void;
+
+		/**
+		 * Sets all `<select>` elements to their default values.
+		 */
+		setDefaults(): void;
+
+		/**
+		 * Restore texttrack settings from localStorage
+		 */
+		restoreSettings(): void;
+
+		/**
+		 * Save text track settings to localStorage
+		 */
+		saveSettings(): void;
+
+		/**
+		 * Update display of text track settings
+		 */
+		updateDisplay(): void;
+	}
+
+	const TextTrackSettings: {
+		prototype: TextTrackSettings;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options: TextTrackSettingsOptions): TextTrackSettings
+	};
+
+	interface TextTrackSettingsOptions extends ModalDialogOptions {
+		persistTextTrackSettings?: boolean;
+	}
+
+	/**
+	 * Create an instance of this class.
+	 *
+	 * @param options={}
+	 *        Object of option names and values
+	 *
+	 * @param options.tech
+	 *        A reference to the tech that owns this TextTrack.
+	 *
+	 * @param [options.kind='subtitles']
+	 *        A valid text track kind.
+	 *
+	 * @param [options.mode='disabled']
+	 *        A valid text track mode.
+	 *
+	 * @param [options.id='vjs_track_' + Guid.newGUID()]
+	 *        A unique id for this TextTrack.
+	 *
+	 * @param [options.label='']
+	 *        The menu label for this track.
+	 *
+	 * @param [options.language='']
+	 *        A valid two character language code.
+	 *
+	 * @param [options.srclang='']
+	 *        A valid two character language code. An alternative, but deprioritized
+	 *        version of `options.language`
+	 *
+	 * @param [options.src]
+	 *        A url to TextTrack cues.
+	 *
+	 * @param [options.default]
+	 *        If this track should default to on or off.
+	 */
+	interface TextTrack extends Track {
+		/**
+		 * The list text track cues that are currently active for this TextTrack.
+		 */
+		activeCues: TextTrackCueList;
+
+		/**
+		 * @The text track cue list for this TextTrack.
+		 */
+		cues: TextTrackCueList;
+
+		/**
+		 * If this track was set to be on or off by default. Cannot be changed after creation.
+		 */
+		readonly default: boolean;
+
+		/**
+		 * Set the mode of this TextTrack to a valid {@link TextTrack~Mode}. Will
+		 * not be set if setting to an invalid mode.
+		 * @fires TextTrack#modechange
+		 */
+		mode: TextTrack.Mode;
+
+		/**
+		 * Add a cue to the internal list of cues.
+		 *
+		 * @param cue
+		 *        The cue to add to our internal list
+		 */
+		addCue(cue: TextTrackCueList.TextTrackCue): void;
+
+		/**
+		 * Remove a cue from our internal list
+		 *
+		 * @param cue
+		 *        The cue to remove from our internal list
+		 */
+		removeCue(cue: TextTrackCueList.TextTrackCue): void;
+	}
+
+	const TextTrack: {
+		prototype: TextTrack;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param options={}
+		 *        Object of option names and values
+		 *
+		 * @param options.tech
+		 *        A reference to the tech that owns this TextTrack.
+		 *
+		 * @param [options.kind='subtitles']
+		 *        A valid text track kind.
+		 *
+		 * @param [options.mode='disabled']
+		 *        A valid text track mode.
+		 *
+		 * @param [options.id='vjs_track_' + Guid.newGUID()]
+		 *        A unique id for this TextTrack.
+		 *
+		 * @param [options.label='']
+		 *        The menu label for this track.
+		 *
+		 * @param [options.language='']
+		 *        A valid two character language code.
+		 *
+		 * @param [options.srclang='']
+		 *        A valid two character language code. An alternative, but deprioritized
+		 *        version of `options.language`
+		 *
+		 * @param [options.src]
+		 *        A url to TextTrack cues.
+		 *
+		 * @param [options.default]
+		 *        If this track should default to on or off.
+		 */
+		new (options: TextTrackOptions): TextTrack;
+	};
+
+	interface TextTrackOptions extends TrackOptions {
+		tech?: Tech;
+		kind?: TextTrack.Kind;
+		mode?: TextTrack.Mode;
+		srclang?: string;
+		src?: string;
+		default?: boolean;
+	}
+
+	namespace TextTrack {
+		type Kind = 'subtitles' | 'captions' | 'descriptions' | 'chapters' | 'metadata';
+
+		type Mode = 'disabled' | 'hidden' | 'showing';
+	}
+
+	/**
+	 * The current list of {@link TextTrack} for a media file.
+	 *
+	 * @see [Spec]{@link https://html.spec.whatwg.org/multipage/embedded-content.html#texttracklist}
+	 */
+	interface TextTrackList extends TrackList {
+		[index: number]: TextTrack;
+
+		/**
+		 * Add a {@link TextTrack} to the `TextTrackList`
+		 *
+		 * @param track
+		 *        The text track to add to the list.
+		 *
+		 * @fires TrackList#addtrack
+		 */
+		addTrack(track: TextTrack): void;
+	}
+
+	const TextTrackList: {
+		prototype: TextTrackList;
+
+		/**
+		 * Create an instance of this class
+		 *
+		 * @param tracks
+		 *        A list of tracks to initialize the list with.
+		 */
+		new (tracks?: TextTrack[]): TextTrackList;
+	};
+
+	/**
+	 * An object that contains ranges of time for various reasons.
+	 * @see https://developer.mozilla.org/en-US/docs/Web/API/TimeRanges
+	 */
+	interface TimeRange {
+		/**
+		 *           The number of time ranges represented by this Object
+		 */
+		readonly length: number;
+
+		/**
+		 * Returns the time offset at which a specified time range ends.
+		 *
+		 * @param [index=0]
+		 *        The range number to return the time for.
+		 *
+		 * @return The time that offset at the specified index.
+		 */
+		end(index: number): number;
+
+		/**
+		 * Returns the time offset at which a specified time range begins.
+		 *
+		 * @param [index=0]
+		 *        The range number to return the time for.
+		 *
+		 * @return The time that offset at the specified index.
+		 */
+		start(index: number): number;
+	}
+
+	/**
+	 * Displays the time left in the video
+	 */
+	interface TimeDisplay extends Component {
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Dispose of the `TimeDisplay` and all child components.
+		 *
+		 * @fires Component#dispose
+		 */
+		dispose(): void;
+
+		/**
+		 * To be filled out in the child class, should update the displayed time
+		 * in accordance with the fact that the current time has changed.
+		 *
+		 * @param [event]
+		 *        The `timeupdate`  event that caused this to run.
+		 *
+		 * @listens Player#timeupdate
+		 */
+		updateContent(event?: EventTarget.Event): void;
+	}
+
+	const TimeDisplay: {
+		prototype: TimeDisplay;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): TimeDisplay;
+	};
+
+	/**
+	 * Time tooltips display a time above the progress bar.
+	 */
+	interface TimeToolTip extends Component {
+		/**
+		 * Create the time tooltip DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Updates the position of the time tooltip relative to the `SeekBar`.
+		 *
+		 * @param seekBarRect
+		 *        The `ClientRect` for the {@link SeekBar} element.
+		 *
+		 * @param seekBarPoint
+		 *        A number from 0 to 1, representing a horizontal reference point
+		 *        from the left edge of the {@link SeekBar}
+		 *
+		 * @param content
+		 */
+		update(seekBarRect: ClientRect, seekBarPoint: number, content: string): void;
+	}
+
+	const TimeToolTip: {
+		prototype: TimeToolTip;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: ComponentOptions): TimeToolTip;
+	};
+
+	/**
+	 * A Track class that contains all of the common functionality for {@link AudioTrack},
+	 * {@link VideoTrack}, and {@link TextTrack}.
+	 *
+	 * > Note: This class should not be used directly
+	 *
+	 * @see {@link https://html.spec.whatwg.org/multipage/embedded-content.html}
+	 */
+	interface Track extends EventTarget {
+		/**
+		 * The id of this track. Cannot be changed after creation.
+		 */
+		readonly id: string;
+
+		/**
+		 * The kind of track that this is. Cannot be changed after creation.
+		 */
+		readonly kind: string;
+
+		/**
+		 * The label of this track. Cannot be changed after creation.
+		 */
+		readonly label: string;
+
+		/**
+		 * The two letter language code for this track. Cannot be changed after creation.
+		 */
+		readonly language: string;
+	}
+
+	const Track: {
+		prototype: Track;
+
+		/**
+		 * Create an instance of this class.
+		 *
+		 * @param [options={}]
+		 *        Object of option names and values
+		 *
+		 * @param [options.kind='']
+		 *        A valid kind for the track type you are creating.
+		 *
+		 * @param [options.id='vjs_track_' + Guid.newGUID()]
+		 *        A unique id for this AudioTrack.
+		 *
+		 * @param [options.label='']
+		 *        The menu label for this track.
+		 *
+		 * @param [options.language='']
+		 *        A valid two character language code.
+		 */
+		new (options?: TrackOptions): Track;
+	};
+
+	interface TrackOptions {
+		id?: string;
+		kind?: string;
+		label?: string;
+		language?: string;
+	}
+
+	/**
+	 * The base class for buttons that toggle specific  track types (e.g. subtitles).
+	 */
+	const TrackButton: {
+		prototype: MenuButton;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *         The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *         The key/value store of player options.
+		 */
+		new (player: Player, options?: TrackButtonOptions): MenuButton;
+	};
+
+	interface TrackButtonOptions extends MenuButtonOptions {
+		track: Track[];
+	}
+
+	/**
+	 * Common functionaliy between {@link TextTrackList}, {@link AudioTrackList}, and
+	 * {@link VideoTrackList}
+	 */
+	interface TrackList extends EventTarget {
+		[index: number]: Track;
+
+		/**
+		 * The current number of `Track`s in the this Trackist.
+		 */
+		length: number;
+
+		/**
+		 * Add a {@link Track} to the `TrackList`
+		 *
+		 * @param track
+		 *        The audio, video, or text track to add to the list.
+		 *
+		 * @fires TrackList#addtrack
+		 */
+		addTrack(track: Track): void;
+
+		/**
+		 * Remove a {@link Track} from the `TrackList`
+		 *
+		 * @param track
+		 *        The audio, video, or text track to remove from the list.
+		 *
+		 * @fires TrackList#removetrack
+		 */
+		removeTrack(track: Track): void;
+	}
+
+	const TrackList: {
+		prototype: TrackList;
+
+		/**
+		 * Create an instance of this class
+		 *
+		 * @param tracks
+		 *        A list of tracks to initialize the list with.
+		 */
+		new (tracks?: Track[]): TrackList;
+	};
+
+	/**
+	 * The bar that contains the volume level and can be clicked on to adjust the level
+	 */
+	interface VolumeBar extends Slider {
+		/**
+		 * If the player is muted unmute it.
+		 */
+		checkMuted(): void;
+
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Handle mouse down on volume bar
+		 *
+		 * @param event
+		 *        The `mousedown` event that caused this to run.
+		 *
+		 * @listens mousedown
+		 */
+		handleMouseDown(event: EventTarget.Event): void;
+
+		/**
+		 * Get percent of volume level
+		 *
+		 * @return Volume level percent as a decimal number.
+		 */
+		getPercent(): number;
+
+		/**
+		 * Decrease volume level for keyboard users
+		 */
+		stepBack(): void;
+
+		/**
+		 * Increase volume level for keyboard users
+		 */
+		stepForward(): void;
+
+		/**
+		 * Update ARIA accessibility attributes
+		 *
+		 * @param [event]
+		 *        The `volumechange` event that caused this function to run.
+		 *
+		 * @listens Player#volumechange
+		 */
+		updateARIAAttributes(event: EventTarget.Event): void;
+	}
+
+	const VolumeBar: {
+		prototype: VolumeBar;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options?: SliderOptions): VolumeBar;
+	};
+
+	/**
+	 * The component for controlling the volume level
+	 */
+	interface VolumeControl extends Component {
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+
+		/**
+		 * Handle `mousedown` or `touchstart` events on the `VolumeControl`.
+		 *
+		 * @param event
+		 *        `mousedown` or `touchstart` event that triggered this function
+		 *
+		 * @listens mousedown
+		 * @listens touchstart
+		 */
+		handleMouseDown(event: EventTarget.Event): void;
+
+		/**
+		 * Handle `mouseup` or `touchend` events on the `VolumeControl`.
+		 *
+		 * @param event
+		 *        `mouseup` or `touchend` event that triggered this function.
+		 *
+		 * @listens touchend
+		 * @listens mouseup
+		 */
+		handleMouseUp(event: EventTarget.Event): void;
+
+		/**
+		 * Handle `mousedown` or `touchstart` events on the `VolumeControl`.
+		 *
+		 * @param event
+		 *        `mousedown` or `touchstart` event that triggered this function
+		 *
+		 * @listens mousedown
+		 * @listens touchstart
+		 */
+		handleMouseMove(event: EventTarget.Event): void;
+	}
+
+	const VolumeControl: {
+		prototype: VolumeControl;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of player options.
+		 */
+		new(player: Player, options?: VolumeControlOptions): VolumeControl;
+	};
+
+	interface VolumeControlOptions extends ComponentOptions {
+		volumeBar?: VolumeBar;
+		vertical?: boolean;
+	}
+
+	/**
+	 * Shows volume level
+	 */
+	interface VolumeLevel extends Component {
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+	}
+
+	const VolumeLevel: {
+		prototype: VolumeLevel;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options]
+		 *        The key/value store of player options.
+		 *
+		 * @param [options.children]
+		 *        An array of children objects to intialize this component with. Children objects have
+		 *        a name property that will be used if more than one component of the same type needs to be
+		 *        added.
+		 *
+		 * @param [ready]
+		 *        Function that gets called when the `Component` is ready.
+		 */
+		new (player: Player, options?: ComponentOptions, ready?: Component.ReadyCallback): VolumeLevel;
+	};
+
+	/**
+	 * A Component to contain the MuteToggle and VolumeControl so that
+	 * they can work together.
+	 */
+	interface VolumePanel extends Component {
+		/**
+		 * Create the `Component`'s DOM element
+		 *
+		 * @return The element that was created.
+		 */
+		createEl(): HTMLDivElement;
+	}
+
+	const VolumePanel: {
+		prototype: VolumePanel;
+
+		/**
+		 * Creates an instance of this class.
+		 *
+		 * @param player
+		 *        The `Player` that this class should be attached to.
+		 *
+		 * @param [options={}]
+		 *        The key/value store of player options.
+		 */
+		new (player: Player, options?: VolumePanel): VolumePanel;
+	};
+
+	interface VolumePanelOptions extends ComponentOptions {
+		inline?: boolean;
+		volumeControl?: VolumeControlOptions;
+	}
+
+	namespace url {
+		interface URLObject {
+			/**
+			 * The protocol of the url that was parsed.
+			 */
+			protocol: string;
+			/**
+			 * The hostname of the url that was parsed.
+			 */
+			hostname: string;
+			/**
+			 * The port of the url that was parsed.
+			 */
+			port: string;
+			/**
+			 * The pathname of the url that was parsed.
+			 */
+			pathname: string;
+			/**
+			 * The search query of the url that was parsed.
+			 */
+			search: string;
+			/**
+			 * The hash of the url that was parsed.
+			 */
+			hash: string;
+			/**
+			 * The host of the url that was parsed.
+			 */
+			host: string;
+		}
+	}
+
+	interface XhrObject extends Xhr {
+		del: Xhr;
+		get: Xhr;
+		head: Xhr;
+		patch: Xhr;
+		post: Xhr;
+		put: Xhr;
+	}
+
+	type XhrCallback = (error?: Error, response?: XhrResponse, body?: any) => void;
+
+	interface Xhr {
+		(url: string | XhrOptions, callback: XhrCallback): any;
+
+		(url: string, options: XhrOptions, callback: XhrCallback): any;
+	}
+
+	interface XhrOptions {
+		beforeSend?: (xhrObject: XMLHttpRequest) => void;
+		body?: any;
+		headers?: any;
+		json?: boolean;
+		method?: 'DELETE' | 'GET' | 'HEAD' | 'OPTIONS' | 'POST' | 'PUT';
+		password?: string;
+		responseType?: '' | 'arraybuffer' | 'blob' | 'document' | 'json' | 'text';
+		sync?: boolean;
+		timeout?: number;
+		uri?: string;
+		url?: string;
+		username?: string;
+		useXDR?: boolean;
+		xhr?: XMLHttpRequest;
+		withCredentials?: boolean;
+	}
+
+	interface XhrResponse {
+		body: any;
+		statusCode: number;
+		method: string;
+		headers: any;
+		url: string;
+		rawRequest: XMLHttpRequest;
 	}
 }
diff --git a/types/video.js/video.js-tests.ts b/types/video.js/video.js-tests.ts
index 287b804e14..814aec9edd 100644
--- a/types/video.js/video.js-tests.ts
+++ b/types/video.js/video.js-tests.ts
@@ -1,8 +1,12 @@
-import videojs = require('video.js');
+import * as videojs from 'video.js';
 
 videojs("example_video_1").ready(function() {
 	// EXAMPLE: Start playing the video.
-	this.play();
+	const playPromise = this.play();
+
+	if (playPromise) {
+		playPromise.then(() => {});
+	}
 
 	this.pause();
 
@@ -14,9 +18,9 @@ videojs("example_video_1").ready(function() {
 	this.src({ type: "video/mp4", src: "http://www.example.com/path/to/video.mp4" });
 
 	this.src([
-	  { type: "video/mp4", src: "http://www.example.com/path/to/video.mp4" },
-	  { type: "video/webm", src: "http://www.example.com/path/to/video.webm" },
-	  { type: "video/ogg", src: "http://www.example.com/path/to/video.ogv" }
+		{ type: "video/mp4", src: "http://www.example.com/path/to/video.mp4" },
+		{ type: "video/webm", src: "http://www.example.com/path/to/video.webm" },
+		{ type: "video/ogg", src: "http://www.example.com/path/to/video.ogv" }
 	]);
 
 	const whereYouAt: number = this.currentTime();
@@ -53,29 +57,57 @@ videojs("example_video_1").ready(function() {
 
 	this.height(480);
 
-	this.size(640, 480);
-
 	this.requestFullScreen();
 
 	testEvents(this);
+
+	testComponents(this);
+
+	testPlugin(this, {});
 });
 
-function testEvents(myPlayer: videojs.Player) {
+function testEvents(player: videojs.Player) {
 	const myFunc = function(this: videojs.Player) {
 		// Do something when the event is fired
 	};
-	myPlayer.on("error", myFunc);
+	player.on("error", myFunc);
 	// Removes the specified listener only.
-	myPlayer.off("error", myFunc);
+	player.off("error", myFunc);
 
 	const myFuncWithArg = function(this: videojs.Player, e: Event) {
 		// Do something when the event is fired
 	};
-	myPlayer.on("volumechange", myFuncWithArg);
+	player.on("volumechange", myFuncWithArg);
 	// Removes all listeners for the given event type.
-	myPlayer.off("volumechange");
+	player.off("volumechange");
 
-	myPlayer.on("loadeddata", () => { /* Some handler. */ });
+	player.on("loadeddata", () => { /* Some handler. */ });
 	// Removes all listeners.
-	myPlayer.off();
+	player.off();
+}
+
+function testComponents(player: videojs.Player) {
+	class MyWindow extends videojs.getComponent('ModalDialog') {
+		myFunction() {
+			this.player().play();
+		}
+	}
+
+	const myWindow = new MyWindow(player, {});
+	myWindow.controlText('My text');
+	myWindow.open();
+	myWindow.close();
+	myWindow.myFunction();
+}
+
+function testPlugin(player: videojs.Player, options: {}) {
+	if (player.usingPlugin('uloztoExample')) { return; }
+
+	videojs.registerPlugin('uloztoExample', function({}: typeof options) {
+		this.play();
+		this.one('ended', () => {
+			// do something
+		});
+	});
+	(player as any).uloztoExample(options);
 }
diff --git a/types/viewport-mercator-project/index.d.ts b/types/viewport-mercator-project/index.d.ts
new file mode 100644
index 0000000000..15b9fc373a
--- /dev/null
+++ b/types/viewport-mercator-project/index.d.ts
@@ -0,0 +1,175 @@
+// Type definitions for viewport-mercator-project 5.2
+// Project: https://github.com/uber-common/viewport-mercator-project#readme
+// Definitions by: Fabio Berta <https://github.com/fnberta>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+export interface ProjectOptions {
+    topLeft?: boolean;
+}
+
+export interface UnprojectOptions extends ProjectOptions {
+    targetZ?: number;
+}
+
+export type Coordinates = [number, number];
+
+export type CoordinatesZ = [number, number, number];
+
+export type ViewMatrix = number[];
+
+export type ProjectionMatrix = number[];
+
+export interface ViewportOptions {
+    width?: number;
+    height?: number;
+    viewMatrix?: ViewMatrix;
+    projectionMatrix?: ProjectionMatrix;
+}
+
+export class Viewport {
+    width: number;
+    height: number;
+    scale: number;
+    viewMatrix: ViewMatrix;
+    projectionMatrix: ProjectionMatrix;
+
+    constructor(opts?: ViewportOptions);
+
+    equals(viewport: Viewport): boolean;
+    project(lngLat: Coordinates, opts?: ProjectOptions): Coordinates;
+    project(lngLatZ: CoordinatesZ, opts?: ProjectOptions): CoordinatesZ;
+    unproject(xy: Coordinates, opts?: UnprojectOptions): Coordinates;
+    unproject(xyz: CoordinatesZ, opts?: UnprojectOptions): CoordinatesZ;
+}
+
+export type Padding = number | { top: number; right: number; bottom: number; left: number };
+
+export type Bounds = [Coordinates, Coordinates];
+
+export interface WebMercatorViewportOptions {
+    width?: number;
+    height?: number;
+    longitude?: number;
+    latitude?: number;
+    zoom?: number;
+    pitch?: number;
+    bearing?: number;
+    altitude?: number;
+    farZMultiplier?: number;
+}
+
+// Type comes from https://github.com/uber-web/math.gl
+export class Vector3 extends Array {}
+
+export class WebMercatorViewport extends Viewport {
+    latitude: number;
+    longitude: number;
+    zoom: number;
+    pitch: number;
+    bearing: number;
+    altitude: number;
+    center: Vector3;
+
+    constructor(opts?: WebMercatorViewportOptions);
+
+    projectFlat(lngLat: Coordinates, scale?: number): Coordinates;
+    unprojectFlat(xy: Coordinates, scale?: number): Coordinates;
+    getMapCenterByLngLatPosition(opts: { lngLat: Coordinates; pos: Coordinates }): Coordinates;
+    fitBounds(bounds: Bounds, opts?: { padding?: Padding; offset?: Coordinates }): WebMercatorViewport;
+}
+
+export default WebMercatorViewport;
+
+export interface FittedBounds {
+    latitude: number;
+    longitude: number;
+    zoom: number;
+}
+
+export function fitBounds(options: { width: number; height: number; bounds: Bounds; padding?: Padding; offset?: Coordinates }): FittedBounds;
+
+export interface BaseViewportProps {
+    width: number;
+    height: number;
+    longitude: number;
+    latitude: number;
+    zoom: number;
+}
+
+export interface ViewportProps extends BaseViewportProps {
+    pitch?: number;
+    bearing?: number;
+}
+
+export interface NormalizedViewportProps extends BaseViewportProps {
+    pitch: number;
+    bearing: number;
+}
+
+export function normalizeViewportProps(props: ViewportProps): NormalizedViewportProps;
+
+export function flyToViewport(startProps: BaseViewportProps, endProps: BaseViewportProps, t: number): BaseViewportProps;
+
+export function lngLatToWorld(lngLat: Coordinates, scale: number): Coordinates;
+
+export function worldToLngLat(point: Coordinates, scale: number): Coordinates;
+
+export function worldToPixels(coordinates: Coordinates | CoordinatesZ, pixelProjectionMatrix: ProjectionMatrix): CoordinatesZ;
+
+export function pixelsToWorld(pixels: Coordinates | CoordinatesZ, pixelUnprojectionMatrix: ProjectionMatrix, targetZ?: number): CoordinatesZ;
+
+export function getMeterZoom(input: { latitude: number }): number;
+
+export interface DistanceScales {
+    pixelsPerMeter: [number, number, number];
+    metersPerPixel: [number, number, number];
+    pixelsPerDegree: [number, number, number];
+    degreesPerPixel: [number, number, number];
+}
+
+export interface HighPrecisionDistanceScales extends DistanceScales {
+    pixelsPerDegree2: [number, number, number];
+    pixelsPerMeter2: [number, number, number];
+}
+
+export interface BaseDistanceScalesInput {
+    longitude: number;
+    latitude: number;
+}
+
+export type DistanceScalesInput = BaseDistanceScalesInput & { zoom: number } | BaseDistanceScalesInput & { scale: number };
+
+export interface BaseHighPrecisionDistanceScalesInput extends BaseDistanceScalesInput {
+    highPrecision: true;
+}
+
+export type HighPrecisionDistanceScalesInput = BaseHighPrecisionDistanceScalesInput & { zoom: number } | BaseHighPrecisionDistanceScalesInput & { scale: number };
+
+export function getDistanceScales(input: DistanceScalesInput): DistanceScales;
+
+export function getDistanceScales(input: HighPrecisionDistanceScalesInput): HighPrecisionDistanceScales;
+
+export function getWorldPosition(input: { longitude: number; latitude: number; zoom: number; scale: number; meterOffset?: number; distanceScales?: DistanceScales }): Vector3;
+
+export function getViewMatrix(input: { height: number; pitch: number; bearing: number; altitude: number; center?: CoordinatesZ; flipY?: boolean }): ViewMatrix;
+
+export interface ProjectionParametersInput {
+    width: number;
+    height: number;
+    pitch?: number;
+    altitude?: number;
+    farZMultiplier?: number;
+}
+
+export interface ProjectionParameters {
+    fov: number;
+    aspect: number;
+    focalDistance: number;
+    near: number;
+    far: number;
+}
+
+export function getProjectionParameters(input: ProjectionParametersInput): ProjectionParameters;
+
+export function getProjectionMatrix(input: ProjectionParametersInput): ProjectionMatrix;
diff --git a/types/viewport-mercator-project/tsconfig.json b/types/viewport-mercator-project/tsconfig.json
new file mode 100644
index 0000000000..d4fe542a62
--- /dev/null
+++ b/types/viewport-mercator-project/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",
+        "viewport-mercator-project-tests.ts"
+    ]
+}
diff --git a/types/viewport-mercator-project/tslint.json b/types/viewport-mercator-project/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/viewport-mercator-project/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/viewport-mercator-project/viewport-mercator-project-tests.ts b/types/viewport-mercator-project/viewport-mercator-project-tests.ts
new file mode 100644
index 0000000000..26fc54d466
--- /dev/null
+++ b/types/viewport-mercator-project/viewport-mercator-project-tests.ts
@@ -0,0 +1,74 @@
+import WebMercatorViewport, {
+    DistanceScalesInput,
+    getDistanceScales,
+    getWorldPosition,
+} from 'viewport-mercator-project';
+
+const mercator = new WebMercatorViewport();
+
+const { width, height, scale, latitude, longitude, altitude, zoom, pitch, bearing, center, viewMatrix, projectionMatrix } = mercator;
+
+const xy = mercator.project([0, 1]);
+const xyz = mercator.project([0, 1, 2]);
+
+const lngLat = mercator.unproject([0, 1]);
+const lngLatZ = mercator.unproject([0, 1, 2]);
+
+const mercatorWithOptions = new WebMercatorViewport({
+    width: 10,
+    height: 10,
+    longitude: 100,
+    latitude: 400,
+});
+
+const xy2 = mercatorWithOptions.projectFlat([10, 100], 20);
+const lngLat2 = mercatorWithOptions.unprojectFlat([10, 100], 20);
+
+const equal = mercator.equals(mercatorWithOptions);
+
+const mapCenter = mercatorWithOptions.getMapCenterByLngLatPosition({
+    lngLat: [10, 100],
+    pos: [100, 200],
+});
+
+const fittedMercator = mercatorWithOptions.fitBounds([[10, 20], [30, 40]], {
+    padding: 10,
+    offset: [10, 20],
+});
+
+const equal2 = fittedMercator.equals(mercatorWithOptions);
+
+const distanceScalesInputZoom = {
+    longitude: 1,
+    latitude: 2,
+    zoom: 1,
+};
+
+const { pixelsPerDegree } = getDistanceScales(distanceScalesInputZoom);
+
+const { pixelsPerDegree2 } = getDistanceScales({
+    ...distanceScalesInputZoom,
+    highPrecision: true,
+});
+
+const distanceScalesInputScale = {
+    longitude: 1,
+    latitude: 2,
+    scale: 1,
+};
+
+const { metersPerPixel } = getDistanceScales(distanceScalesInputScale);
+
+const { pixelsPerMeter2 } = getDistanceScales({
+    ...distanceScalesInputScale,
+    highPrecision: true,
+});
+
+const worldPos = getWorldPosition({
+    longitude: 1,
+    latitude: 2,
+    zoom: 10,
+    scale: 1,
+});
+
+const length = worldPos.length;
diff --git a/types/viewporter/viewporter-tests.ts b/types/viewporter/viewporter-tests.ts
index 94df0749fa..59fa5cd20f 100644
--- a/types/viewporter/viewporter-tests.ts
+++ b/types/viewporter/viewporter-tests.ts
@@ -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 = new Map<string, any>();
+        var pointers = new Map();
         // handle resizing / rotating of the viewport
         var width, height;
         $(window).bind(viewporter.ACTIVE ? 'viewportchange' : 'resize', function () {
diff --git a/types/vimeo__player/index.d.ts b/types/vimeo__player/index.d.ts
index d5f224975e..cf7475f246 100755
--- a/types/vimeo__player/index.d.ts
+++ b/types/vimeo__player/index.d.ts
@@ -1,13 +1,11 @@
-// Type definitions for @vimeo/player 2.0
+// Type definitions for @vimeo/player 2.6.3
 // Project: https://github.com/vimeo/player.js
 // Definitions by: Denis Yılmaz <https://github.com/denisyilmaz>
 //                 Felix Albert <f.albert.work@icloud.com>
 //                 Tim Chen <https://github.com/timc13>
+//                 Terry Mun <https://github.com/terrymun>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-export function myMethod(a: string): string;
-export function myOtherMethod(a: number): number;
-
 export type CallbackFunction = (...args: any[]) => any;
 
 export interface Error {name: string; message: string; method: string; }
@@ -22,11 +20,12 @@ export interface InvalidCuePoint extends Error {name: "InvalidCuePoint"; message
 export interface RangeError extends Error {name: "RangeError"; message: string; method: string; }
 export interface TypeError extends Error {name: "TypeError"; message: string; method: string; }
 
-export type EventName = "play" | "pause" | "ended" | "timeupdate" | "progress" | "seeked" | "texttrackchange" | "cuechange" | "cuepoint" | "volumechange" | "error" | "loaded" |  string;
+export type EventName = "play" | "pause" | "ended" | "timeupdate" | "progress" | "seeked" | "texttrackchange" |
+                        "cuechange" | "cuepoint" | "volumechange" | "playbackratechange" | "bufferstart" | "bufferend" | "error" | "loaded" |  string;
 export type EventCallback = (data: any) => any;
 
 export class Player {
-    constructor(element: HTMLIFrameElement|HTMLElement|string, options: Options);
+    constructor(element: HTMLIFrameElement|HTMLElement|string, options?: Options);
 
     on(event: EventName, callback: EventCallback): void;
     off(event: EventName, callback?: EventCallback): void;
@@ -51,6 +50,8 @@ export class Player {
     getLoop(): VimeoPromise<boolean, Error>;
     setLoop(loop: boolean): VimeoPromise<boolean, Error>;
     getPaused(): VimeoPromise<boolean, Error>;
+    getPlaybackRate(): VimeoPromise<number, Error>;
+    setPlaybackRate(playbackRate: number): VimeoPromise<number, RangeError | Error>;
     getTextTracks(): VimeoPromise<VimeoTextTrack[], Error>;
     getVideoEmbedCode(): VimeoPromise<string, Error>;
     getVideoId(): VimeoPromise<number, Error>;
@@ -85,14 +86,20 @@ export interface Options {
     url?: string;
     autopause?: boolean;
     autoplay?: boolean;
+    background?: boolean;
     byline?: boolean;
     color?: string;
     height?: number;
     loop?: boolean;
     maxheight?: number;
     maxwidth?: number;
+    muted?: boolean;
+    playsinline?: boolean;
     portrait?: boolean;
+    responsive?: boolean;
+    speed?: boolean;
     title?: boolean;
+    transparent?: boolean;
     width?: number;
 }
 
@@ -104,6 +111,4 @@ export interface VimeoPromise<Result, Reason> extends Promise<Result> {
 }
 
 /*~ You can declare properties of the module using const, let, or var */
-export const playerMap: WeakMap<any, any>;
-export const readyMap: WeakMap<any, any>;
 export default Player;
diff --git a/types/vimeo__player/vimeo__player-tests.ts b/types/vimeo__player/vimeo__player-tests.ts
index bf5a637762..0dbba1a3a8 100644
--- a/types/vimeo__player/vimeo__player-tests.ts
+++ b/types/vimeo__player/vimeo__player-tests.ts
@@ -6,7 +6,21 @@ let player: Player ;
 
 player = new Player('handstick', {
     id: 19231868,
-    width: 640
+    width: 640,
+
+    // Use default values for settings, to test typings
+    autopause: true,
+    autoplay: false,
+    background: false,
+    byline: true,
+    color: '#00adef',
+    loop: false,
+    muted: false,
+    playsinline: true,
+    portrait: true,
+    speed: false,
+    title: true,
+    transparent: true
 });
 
 const onPlay = (data: any) => {
@@ -281,12 +295,33 @@ player.getPaused().then((paused) => {
     // an error occurred
 });
 
+player.getPlaybackRate().then((playbackRate) => {
+   // playbackRate = a numeric value of the current playback rate
+}).catch((error) => {
+    // an error occurred
+});
+
+player.setPlaybackRate(0.5).then((playbackRate) => {
+    // playback rate was set
+}).catch((error) => {
+    switch (error.name) {
+        case 'RangeError':
+            // the playback rate was less than 0.5 or greater than 2
+            break;
+
+        default:
+            // some other error occurred
+            break;
+    }
+});
+
 player.getTextTracks().then((tracks) => {
     // tracks = an array of track objects
     tracks.forEach((track) => {
         console.log(track.label);
         console.log(track.kind);
         console.log(track.language);
+        console.log(track.mode);
     });
 }).catch((error) => {
     // an error occurred
@@ -436,6 +471,19 @@ player.on('volumechange', (data) => {
     console.log(data.volume);
 });
 
+player.on('playbackratechange', (data) => {
+   // data is an object containing properties specific to that event
+   console.log(data.playbackRate);
+});
+
+player.on('bufferstart', (data) => {
+   // no associated data with this event
+});
+
+player.on('bufferend', (data) => {
+   // no associated data with this event
+});
+
 player.on('error', (data) => {
     // data is an object containing properties specific to that event
     console.log(data.message);
diff --git a/types/vinyl-fs/index.d.ts b/types/vinyl-fs/index.d.ts
index d3b13baeaa..d35dd6bcef 100644
--- a/types/vinyl-fs/index.d.ts
+++ b/types/vinyl-fs/index.d.ts
@@ -9,7 +9,7 @@
 declare global {
    namespace NodeJS {
       interface WritableStream {
-         write(buffer: any/* Vinyl.File */, cb?: (err?: Error) => void): boolean;
+         write(buffer: any/* Vinyl.File */, cb?: (err?: Error | null) => void): boolean;
       }
    }
 }
diff --git a/types/virtual-dom/index.d.ts b/types/virtual-dom/index.d.ts
index 813928efeb..2f0d9c6fdc 100644
--- a/types/virtual-dom/index.d.ts
+++ b/types/virtual-dom/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for virtual-dom 2.0.1
+// Type definitions for virtual-dom 2.1.1
 // Project: https://github.com/Matt-Esch/virtual-dom
 // Definitions by: Christopher Brown <https://github.com/chbrown>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
@@ -42,13 +42,20 @@ declare namespace VirtualDOM {
     type: string; // 'VirtualNode'
   }
 
+  interface VNodeConstructor {
+    new (tagName: string, properties: VProperties, children: VTree[], key?: string, namespace?: string): VNode;
+  }
+
   interface VText {
     text: string;
-    new(text: any): VText;
     version: string;
     type: string; // 'VirtualText'
   }
 
+  interface VTextConstructor {
+    new (text: string): VText;
+  }
+
   interface Widget {
     type: string; // 'Widget'
     init(): Element;
@@ -78,7 +85,6 @@ declare namespace VirtualDOM {
   interface VPatch {
     vNode: VNode;
     patch: any;
-    new(type: number, vNode: VNode, patch: any): VPatch;
     version: string;
     /**
     type is set to 'VirtualPatch' on the prototype, but overridden in the
@@ -87,6 +93,12 @@ declare namespace VirtualDOM {
     type: number;
   }
 
+  type PatchFn<T extends Element> = (rootNode: T, patches: VPatch[], renderOptions: VPatchOptions<T>) => T;
+
+  interface VPatchOptions<T extends Element> {
+    patch?: PatchFn<T>;
+  }
+
   interface createProperties extends VProperties {
     key?: string;
     namespace?: string;
@@ -107,7 +119,12 @@ declare namespace VirtualDOM {
   patch() usually just returns rootNode after doing stuff to it, so we want
   to preserve that type (though it will usually be just Element).
   */
-  function patch<T extends Element>(rootNode: T, patches: VPatch[], renderOptions?: any): T;
+  function patch<T extends Element>(rootNode: T, patches: VPatch[], renderOptions?: VPatchOptions<T>): T;
+
+  function isVNode(vTree: VTree): vTree is VNode;
+  function isVText(vTree: VTree): vTree is VText;
+  function isWidget(vTree: VTree): vTree is Widget;
+  function isThunk(vTree: VTree): vTree is Thunk;
 }
 
 declare module "virtual-dom/h" {
@@ -130,3 +147,29 @@ declare module "virtual-dom/patch" {
 declare module "virtual-dom" {
   export = VirtualDOM;
 }
+declare module "virtual-dom/vnode/vnode" {
+  import VNodeConstructor = VirtualDOM.VNodeConstructor;
+  const VNode: VNodeConstructor;
+  export = VNode;
+}
+declare module "virtual-dom/vnode/vtext" {
+  import VTextConstructor = VirtualDOM.VTextConstructor;
+  const VText: VTextConstructor;
+  export = VText;
+}
+declare module "virtual-dom/vnode/is-vnode" {
+  import isVNode = VirtualDOM.isVNode;
+  export = isVNode;
+}
+declare module "virtual-dom/vnode/is-vtext" {
+  import isVText = VirtualDOM.isVText;
+  export = isVText;
+}
+declare module "virtual-dom/vnode/is-widget" {
+  import isWidget = VirtualDOM.isWidget;
+  export = isWidget;
+}
+declare module "virtual-dom/vnode/is-thunk" {
+  import isThunk = VirtualDOM.isThunk;
+  export = isThunk;
+}
diff --git a/types/virtual-dom/virtual-dom-tests.ts b/types/virtual-dom/virtual-dom-tests.ts
index f11c7f343f..37fd28fa8f 100644
--- a/types/virtual-dom/virtual-dom-tests.ts
+++ b/types/virtual-dom/virtual-dom-tests.ts
@@ -1,9 +1,13 @@
-
 import virtual_dom = require("virtual-dom");
-import VNode = virtual_dom.VNode;
+import VNode = require("virtual-dom/vnode/vnode");
+import VText = require("virtual-dom/vnode/vtext");
 import h = virtual_dom.h;
+import isVNode = virtual_dom.isVNode;
+import isVText = virtual_dom.isVText;
+import isWidget = virtual_dom.isWidget;
+import isThunk = virtual_dom.isThunk;
 
-function renderAny(object: any): VNode {
+function renderAny(object: any): virtual_dom.VNode {
   if (object === undefined) {
     return h('i.undefined', 'undefined');
   }
@@ -31,3 +35,25 @@ function renderAny(object: any): VNode {
   }
   return h('span.string', object.toString());
 }
+
+const newNode = new VNode("tag", {}, []);
+const newText = new VText("text");
+newText.text = "new-text";
+const tree: any = newNode;
+
+if (isVNode(tree)) {
+  tree.children = [];
+} else if (isVText(tree)) {
+  tree.text = "hello";
+} else if (isWidget(tree)) {
+  tree.init();
+} else if (isThunk(tree)) {
+  tree.vnode = newNode;
+}
+
+virtual_dom.patch(document.createElement("div"), []);
+virtual_dom.patch(document.createElement("div"), [], {
+  patch: (rootNode: HTMLDivElement, patches: virtual_dom.VPatch[]) => {
+    return rootNode;
+  }
+});
diff --git a/types/vis/index.d.ts b/types/vis/index.d.ts
index caa0ab945a..ef5409daa3 100644
--- a/types/vis/index.d.ts
+++ b/types/vis/index.d.ts
@@ -9,6 +9,8 @@
 //                 Adam Lewis <https://github.com/supercargo>
 //                 Alex Soh <https://github.com/takato1314>
 //                 Oleksii Kachura <https://github.com/alex-kachura>
+//                 dcop <https://github.com/dcop>
+//                 Avraham Essoudry <https://github.com/avrahamcool>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 import { MomentInput, MomentFormatSpecification, Moment } from 'moment';
@@ -975,6 +977,7 @@ export interface TimelineGroup {
   content: string | HTMLElement;
   id: IdType;
   style?: string;
+  order?: number;
   subgroupOrder?: TimelineOptionsGroupOrderType;
   title?: string;
   visible?: boolean;
@@ -1685,19 +1688,11 @@ export interface Data {
   edges?: Edge[] | DataSet<Edge>;
 }
 
-export interface Node {
-  group?: string;
+export interface Node extends NodeOptions {
   id?: IdType;
-  label?: string;
-  x?: number;
-  y?: number;
-  fixed?: boolean;
-  image?: string | Image;
-  shape?: string;
-  color?: string | Color;
 }
 
-export interface Edge {
+export interface Edge extends EdgeOptions {
   from?: IdType;
   to?: IdType;
   id?: IdType;
@@ -1823,8 +1818,6 @@ export interface NodeOptions {
     color?: string,
   };
 
-  id?: string;
-
   image?: string | Image;
 
   label?: string;
@@ -1906,14 +1899,10 @@ export interface EdgeOptions {
     mono?: string | FontOptions,
   };
 
-  from?: number | string;
-
   hidden?: boolean;
 
   hoverWidth?: number; // please note, hoverWidth could be also a function. This case is not represented here
 
-  id?: string;
-
   label?: string;
 
   labelHighlightBold?: boolean;
@@ -1939,8 +1928,6 @@ export interface EdgeOptions {
 
   title?: string;
 
-  to?: number | string;
-
   value?: number;
 
   width?: number;
diff --git a/types/vue-select/index.d.ts b/types/vue-select/index.d.ts
new file mode 100644
index 0000000000..ff8767e189
--- /dev/null
+++ b/types/vue-select/index.d.ts
@@ -0,0 +1,98 @@
+// Type definitions for vue-select 2.4
+// Project: https://github.com/sagalbot/vue-select#readme
+// Definitions by: Ilia Beliaev <https://github.com/silh>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { VueConstructor } from 'vue';
+
+export default VueSelect;
+export const VueSelect: VueSelectConstructor;
+export type OptionConsumer = (option: any) => void;
+
+export interface VueSelectProps {
+    value: any;
+    options: any[];
+    disabled: boolean;
+    maxHeight: string;
+    searchable: boolean;
+    multiple: boolean;
+    placeholder: string;
+    transition: string;
+    clearSearchOnSelect: boolean;
+    closeOnSelect: boolean;
+    label: string;
+    getOptionLabel: (option: any) => string;
+    onChange: OptionConsumer;
+    taggable: boolean;
+    tabindex: number | null;
+    pushTags: boolean;
+    filterable: boolean;
+    createOption: (option: any) => any;
+    resetOnOptionsChange: boolean;
+    noDrop: boolean;
+    inputId: string | null;
+    dir: string;
+}
+
+export interface VueSelectData {
+    search: string;
+    open: boolean;
+    mutableValue: any;
+    mutableOptions: any[];
+}
+
+export interface VueSelectWatch {
+    value: (val: any) => void;
+    mutableValue: (val: any, old: any) => void;
+    options: (val: any) => void;
+    mutableOptions: () => void;
+    multiple: (reset: boolean) => void;
+    created: () => void;
+}
+
+export interface VueSelectMethods {
+    select: OptionConsumer;
+    deselect: OptionConsumer;
+    clearSelection: () => void;
+    onAfterSelect: OptionConsumer;
+    toggleDropdown: (e: Event) => void;
+    isOptionSelected: (option: any) => boolean;
+    onEscape: () => void;
+    onSearchBlur: () => void;
+    onSearchFocus: () => void;
+    maybeDeleteValue: () => void;
+    optionExists: (option: any) => boolean;
+    maybePushTag: OptionConsumer;
+}
+
+export interface VueSelectComputed {
+    dropdownClasses: () => DropdownClasses;
+    clearSearchOnBlur: () => boolean;
+    searching: () => boolean;
+    dropdownOpen: () => boolean;
+    searchPlaceholder: () => boolean;
+    filteredOptions: () => any[];
+    isValueEmpty: () => boolean;
+    valueAsArray: () => any[];
+    showClearButton: () => boolean;
+}
+
+export interface DropdownClasses {
+    open: boolean;
+    single: boolean;
+    searching: boolean;
+    searchable: boolean;
+    unsearchable: boolean;
+    loading: boolean;
+    rtl: boolean;
+    disabled: boolean;
+}
+
+export interface VueSelectConstructor extends VueConstructor {
+    props: VueSelectProps;
+    data: () => VueSelectData;
+    watch: VueSelectWatch;
+    methods: VueSelectMethods;
+    computed: VueSelectComputed;
+}
diff --git a/types/vue-select/package.json b/types/vue-select/package.json
new file mode 100644
index 0000000000..faefc1b2f7
--- /dev/null
+++ b/types/vue-select/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "vue": ">=2.0.0"
+  }
+}
diff --git a/types/vue-select/tsconfig.json b/types/vue-select/tsconfig.json
new file mode 100644
index 0000000000..656897ba29
--- /dev/null
+++ b/types/vue-select/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",
+        "vue-select-tests.ts"
+    ]
+}
diff --git a/types/vue-select/tslint.json b/types/vue-select/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vue-select/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vue-select/vue-select-tests.ts b/types/vue-select/vue-select-tests.ts
new file mode 100644
index 0000000000..8fea33b2dc
--- /dev/null
+++ b/types/vue-select/vue-select-tests.ts
@@ -0,0 +1,65 @@
+import Vue from 'vue';
+import VueSelect from 'vue-select';
+
+const options = [
+    {
+        name: 'SomeName'
+    },
+    {
+        name: 'SomeName2'
+    }
+];
+
+new Vue({
+    el: '#app',
+    data: {
+        options,
+        value: null,
+    },
+    components: {
+        'vue-select': VueSelect
+    },
+    methods: {
+        getOptionLabel(option: any) {
+            if (option && option.name) {
+                return option.name;
+            }
+            return '';
+        },
+        optionConsumer(option: any) {
+        },
+        optionToOption(option: any) {
+            return option;
+        },
+        onSearch(search: string, loading: (b: boolean) => void) {
+            loading(true);
+        }
+    },
+    template: `
+    <vue-select :filterable="false"
+                :value="value"
+                :options="options"
+                disable="false"
+                maxHeight="200"
+                searchable="true"
+                multiple="false"
+                placeholder="Placeholder"
+                transition="SomeTransition"
+                clearSearchOnSelect="false"
+                :closeOnSelect="false"
+                label="name"
+                :getOptionLabel="getOptionLabel"
+                :onChange="optionConsumer"
+                :taggable="true"
+                :tabindex="null"
+                pushTags="false"
+                :createOption="optionToOption"
+                resetOnOptionsChange="false"
+                noDrop="true"
+                :inputId="null"
+                dir="someDir"
+                @search="onSearch"
+                @input="optionConsumer">
+    </vue-select>
+`
+});
diff --git a/types/vue2-datepicker/index.d.ts b/types/vue2-datepicker/index.d.ts
new file mode 100644
index 0000000000..6dd67352fa
--- /dev/null
+++ b/types/vue2-datepicker/index.d.ts
@@ -0,0 +1,57 @@
+// Type definitions for vue2-datepicker 2.0
+// Project: https://github.com/mengxiong10/vue2-datepicker
+// Definitions by: ChristianStornowski <https://github.com/ChristianStornowski>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import { Component } from "vue/types/options";
+
+declare namespace Datepicker {
+    interface Shortcuts {
+        text: string;
+        start: Date;
+        end: Date;
+    }
+
+    interface TimePickerOptions {
+        start: string;
+        step: string;
+        end: string;
+    }
+
+    interface Lang {
+        days: string[];
+        months: string[];
+        pickers: string[];
+        placeholder: {
+            date: string;
+            dateRange: string;
+        };
+    }
+}
+
+declare const Datepicker: Component<any, any, any, {
+    type?: string;
+    range?: boolean;
+    format?: string;
+    lang?: string | Datepicker.Lang;
+    clearable?: boolean;
+    confirm?: boolean;
+    editable?: boolean;
+    disabled?: boolean;
+    placeholder?: string;
+    width?: number | string;
+    notBefore?: string | Date;
+    notAfter?: string | Date;
+    disabledDays?: number[] | string[] | ((date: Date) => Date[]);
+    shortcuts?: boolean | Datepicker.Shortcuts[]
+    timePickerOptions?: Datepicker.TimePickerOptions[] | (() => Datepicker.TimePickerOptions[]);
+    minuteStep?: number;
+    firstDayOfWeek?: number;
+    inputClass?: string;
+    inputName?: string;
+    confirmText?: string;
+    rangeSeparator?: string;
+}>;
+
+export default Datepicker;
diff --git a/types/vue2-datepicker/package.json b/types/vue2-datepicker/package.json
new file mode 100644
index 0000000000..faefc1b2f7
--- /dev/null
+++ b/types/vue2-datepicker/package.json
@@ -0,0 +1,6 @@
+{
+  "private": true,
+  "dependencies": {
+    "vue": ">=2.0.0"
+  }
+}
diff --git a/types/vue2-datepicker/tsconfig.json b/types/vue2-datepicker/tsconfig.json
new file mode 100644
index 0000000000..56e16426be
--- /dev/null
+++ b/types/vue2-datepicker/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",
+        "vue2-datepicker-tests.ts"
+    ]
+}
diff --git a/types/vue2-datepicker/tslint.json b/types/vue2-datepicker/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/vue2-datepicker/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/vue2-datepicker/vue2-datepicker-tests.ts b/types/vue2-datepicker/vue2-datepicker-tests.ts
new file mode 100644
index 0000000000..5b1546f8a2
--- /dev/null
+++ b/types/vue2-datepicker/vue2-datepicker-tests.ts
@@ -0,0 +1,23 @@
+import Vue from 'vue';
+import DatePicker from "vue2-datepicker";
+
+new Vue({
+    el: '#app',
+    components: {
+        DatePicker
+    },
+    template: `
+        <date-picker
+            :placeholder="placeholder"
+            v-model="dateOfBirth"
+            format="YYYY-MM-DD"
+            lang="en">
+            <template slot="calendar-icon">
+                <span class="input-datepicker__icon"></span>
+            </template>
+        </date-picker>
+    `,
+    data() {
+        return { dateOfBirth: new Date() };
+    }
+});
diff --git a/types/vuex-i18n/index.d.ts b/types/vuex-i18n/index.d.ts
index 2332ef4436..e1f607ef39 100644
--- a/types/vuex-i18n/index.d.ts
+++ b/types/vuex-i18n/index.d.ts
@@ -1,6 +1,7 @@
 // Type definitions for vuex-i18n 1.7
 // Project: https://github.com/dkfbasel/vuex-i18n
 // Definitions by: Cedric Kemp <https://github.com/jaeggerr>
+//                 Noam Kfir <https://github.com/noamkfir>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -17,13 +18,16 @@ declare module "vue/types/vue" {
 }
 
 export interface Translations {
-  [key: string]: string;
+  [key: string]: string | Translations;
 }
 
 export interface Ii18n {
   /** get the current locale */
   locale(): string;
 
+  /** get all the registered locales */
+  locales(): string[];
+
   /** set the current locale (i.e. 'de', 'en') */
   set(locale: string): void;
 
@@ -64,12 +68,12 @@ export interface Ii18n {
   /**
    * get localized string from store in a given language if available.
    */
-  translateIn(locale: string, key: string, options: any, pluralization?: number): string | undefined;
+  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;
+  translateIn(locale: string, key: string, defaultValue: string, options?: any, pluralization?: number): string | undefined;
 
   /**
    * check if the given locale translations are present in the store
diff --git a/types/vuex-i18n/vuex-i18n-tests.ts b/types/vuex-i18n/vuex-i18n-tests.ts
index 218bd12ccf..82d9d864d9 100644
--- a/types/vuex-i18n/vuex-i18n-tests.ts
+++ b/types/vuex-i18n/vuex-i18n-tests.ts
@@ -23,7 +23,10 @@ Vue.use(vuexI18n.plugin, store);
 // structured as object trees and will automatically be flattened by the the
 // plugin
 const translationsEn = {
-  content: "This is some {type} content"
+  content: "This is some {type} content",
+  tree: {
+    nested: "This is nested content"
+  }
 };
 
 // translations can be kept in separate files for each language
@@ -39,3 +42,5 @@ Vue.i18n.add("de", translationsDe);
 
 // set the start locale to use
 Vue.i18n.set("en");
+
+Vue.i18n.translateIn("en", "tree.nested");
diff --git a/types/w3c-web-usb/index.d.ts b/types/w3c-web-usb/index.d.ts
index d481245e14..d596351a5b 100644
--- a/types/w3c-web-usb/index.d.ts
+++ b/types/w3c-web-usb/index.d.ts
@@ -62,7 +62,7 @@ declare class USBAlternateInterface {
     readonly interfaceClass: number;
     readonly interfaceSubclass: number;
     readonly interfaceProtocol: number;
-    readonly alternatinterfaceName?: string;
+    readonly interfaceName?: string;
     readonly endpoints: USBEndpoint[];
 }
 
@@ -146,6 +146,7 @@ declare class USBDevice {
     transferOut(endpointNumber: number, data: BufferSource): Promise<USBOutTransferResult>;
     isochronousTransferIn(endpointNumber: number, packetLengths: number[]): Promise<USBIsochronousInTransferResult>;
     isochronousTransferOut(endpointNumber: number, data: BufferSource, packetLengths: number[]): Promise<USBIsochronousOutTransferResult>;
+    reset(): Promise<void>;
 }
 
 interface Navigator {
diff --git a/types/w3c-web-usb/w3c-web-usb-tests.ts b/types/w3c-web-usb/w3c-web-usb-tests.ts
index fe29480479..49efebcdbc 100644
--- a/types/w3c-web-usb/w3c-web-usb-tests.ts
+++ b/types/w3c-web-usb/w3c-web-usb-tests.ts
@@ -43,6 +43,7 @@ navigator.usb.addEventListener('disconnect', evt => {
 });
 
 async function handleConnectedDevice(device: USBDevice) {
+    await device.reset();
     connectedDevices.push(device);
 
     await device.open();
diff --git a/types/waterline/index.d.ts b/types/waterline/index.d.ts
index a3aa7c04ee..b0a23d8e5a 100644
--- a/types/waterline/index.d.ts
+++ b/types/waterline/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/balderdashy/waterline
 // Definitions by: Alexandro Libertino <https://github.com/arvitaly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/web3-provider-engine/index.d.ts b/types/web3-provider-engine/index.d.ts
new file mode 100644
index 0000000000..d5ba233b18
--- /dev/null
+++ b/types/web3-provider-engine/index.d.ts
@@ -0,0 +1,38 @@
+// Type definitions for web3-provider-engine 14.0
+// Project: https://github.com/MetaMask/provider-engine#readme
+// Definitions by: Leonid Logvinov <https://github.com/LogvinovLeon>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.4
+
+import {
+    Provider,
+    JSONRPCRequestPayload,
+    JSONRPCResponsePayload
+} from "ethereum-protocol";
+interface Web3ProviderEngineOptions {
+    pollingInterval?: number;
+    blockTracker?: any;
+    blockTrackerProvider?: any;
+}
+declare class Web3ProviderEngine implements Provider {
+    constructor(options?: Web3ProviderEngineOptions);
+    on(event: string, handler: () => void): void;
+    send(payload: JSONRPCRequestPayload): void;
+    sendAsync(
+        payload: JSONRPCRequestPayload,
+        callback: (
+            error: null | Error,
+            response: JSONRPCResponsePayload
+        ) => void
+    ): void;
+    addProvider(provider: any): void;
+    // start block polling
+    start(callback?: () => void): void;
+    // stop block polling
+    stop(): void;
+}
+export = Web3ProviderEngine;
+
+// declare module "web3-provider-engine/subproviders/nonce-tracker";
+// declare module "web3-provider-engine/subproviders/hooked-wallet";
+// declare module "web3-provider-engine/subproviders/filters";
diff --git a/types/web3-provider-engine/tsconfig.json b/types/web3-provider-engine/tsconfig.json
new file mode 100644
index 0000000000..2caa7bbf7b
--- /dev/null
+++ b/types/web3-provider-engine/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", "web3-provider-engine-tests.ts"]
+}
diff --git a/types/web3-provider-engine/tslint.json b/types/web3-provider-engine/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/web3-provider-engine/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/web3-provider-engine/web3-provider-engine-tests.ts b/types/web3-provider-engine/web3-provider-engine-tests.ts
new file mode 100644
index 0000000000..d783728a1b
--- /dev/null
+++ b/types/web3-provider-engine/web3-provider-engine-tests.ts
@@ -0,0 +1,3 @@
+import ProviderEngine = require("web3-provider-engine");
+
+new ProviderEngine();
diff --git a/types/web3/eth/index.d.ts b/types/web3/eth/index.d.ts
index 14e8c2d26a..d69b561a63 100644
--- a/types/web3/eth/index.d.ts
+++ b/types/web3/eth/index.d.ts
@@ -117,7 +117,7 @@ export default interface Eth {
         options: {
             fromBlock?: BlockType;
             toBlock?: BlockType;
-            address: string;
+            address?: string;
             topics?: Array<string | string[]>;
         },
         cb?: Callback<Log[]>
diff --git a/types/web3/index.d.ts b/types/web3/index.d.ts
index 7d3797873e..9ddbc7a00b 100644
--- a/types/web3/index.d.ts
+++ b/types/web3/index.d.ts
@@ -13,6 +13,8 @@
 //                 Baris Gumustas <https://github.com/matrushka>
 //                 André Vitor de Lima Matos <https://github.com/andrevmatos>
 //                 Levin Keller <https://github.com/levino>
+//                 Dmitry Radkovskiy <https://github.com/zlumer>
+//                 Konstantin Melnikov <https://github.com/archangel-irk>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.4
 import BigNumber = require("bn.js");
@@ -33,6 +35,7 @@ declare class Web3 {
         Shh: new (provider: Provider) => Shh;
         Bzz: new (provider: Provider) => Bzz;
     };
+    static utils: Utils;
     constructor(provider?: Provider | string);
     version: string;
     BatchRequest: new () => BatchRequest;
diff --git a/types/web3/utils.d.ts b/types/web3/utils.d.ts
index 61869e327a..659110faa6 100644
--- a/types/web3/utils.d.ts
+++ b/types/web3/utils.d.ts
@@ -2,21 +2,26 @@ import BigNumber = require("bn.js");
 import * as us from "underscore";
 
 type Unit =
+    | "noether"
+    | "wei"
     | "kwei"
-    | "femtoether"
+    | "Kwei"
     | "babbage"
+    | "femtoether"
     | "mwei"
-    | "picoether"
+    | "Mwei"
     | "lovelace"
-    | "qwei"
-    | "nanoether"
+    | "picoether"
+    | "gwei"
+    | "Gwei"
     | "shannon"
-    | "microether"
-    | "szabo"
+    | "nanoether"
     | "nano"
+    | "szabo"
+    | "microether"
     | "micro"
-    | "milliether"
     | "finney"
+    | "milliether"
     | "milli"
     | "ether"
     | "kether"
@@ -66,6 +71,7 @@ export default interface Utils {
     toDecimal(val: any): number;
     toHex(val: any): string;
     toUtf8(val: any): string;
-    toWei(val: string | number | BigNumber, unit: Unit): string | BigNumber;
+    toWei(val: string | number, unit?: Unit): string;
+    toWei(val: BigNumber, unit?: Unit): BigNumber;
     unitMap: any;
 }
diff --git a/types/web3/web3-tests.ts b/types/web3/web3-tests.ts
index 88e05028dd..fc4be8534a 100644
--- a/types/web3/web3-tests.ts
+++ b/types/web3/web3-tests.ts
@@ -1,4 +1,5 @@
 import Web3 = require("web3");
+import BigNumber = require("bn.js");
 const web3 = new Web3();
 const myProvider = new web3.providers.HttpProvider("http://localhost:5454");
 web3.setProvider(myProvider);
@@ -16,3 +17,7 @@ const myContract = new web3.eth.Contract(
 myContract.options.from = "0x1234567890123456789012345678901234567891";
 myContract.options.gasPrice = "20000000000000";
 myContract.options.gas = 5000000;
+
+const weiStr: string = web3.utils.toWei("100", "gwei");
+const weiBn: BigNumber = web3.utils.toWei(web3.utils.toBN("1"));
+const rndHex: string = Web3.utils.randomHex(10);
diff --git a/types/webappsec-credential-management/index.d.ts b/types/webappsec-credential-management/index.d.ts
index 2859e02d8a..a0498f34af 100644
--- a/types/webappsec-credential-management/index.d.ts
+++ b/types/webappsec-credential-management/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/w3c/webappsec-credential-management
 // Definitions by: Iain McGinniss <https://github.com/iainmcgin>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
+// TypeScript Version: 2.7
 
 // Spec: https://www.w3.org/TR/2017/WD-credential-management-1-20170804
 
@@ -25,6 +25,9 @@ interface GlobalFetch {
     // variant for navigator.credentials monkey patching
     fetch(url: Request|string, init?: CMRequestInit): Promise<Response>;
 }
+interface WindowOrWorkerGlobalScope {
+    fetch(url: Request|string, init?: CMRequestInit): Promise<Response>;
+}
 
 /**
  * Variant of TS 2.2 {@link RequestInit} that permits a
@@ -314,6 +317,11 @@ interface CredentialRequestOptions {
      * This property specifies options for requesting a public-key signature.
      */
     publicKey?: PublicKeyCredentialRequestOptions;
+
+    /**
+     * This property lets the developer abort an ongoing get() operation.
+     */
+    signal?: AbortSignal;
 }
 
 /**
@@ -341,7 +349,11 @@ interface CredentialCreationOptions {
     /**
      * @see {@link https://w3c.github.io/webauthn/#dictionary-makecredentialoptions}
      */
-    publicKey?: MakePublicKeyCredentialOptions;
+    publicKey?: PublicKeyCredentialCreationOptions;
+    /**
+     * @see {@link https://w3c.github.io/webappsec-credential-management/#dom-credentialrequestoptions-signal}
+     */
+    signal?: AbortSignal;
 }
 
 /**
@@ -364,6 +376,16 @@ interface FederatedCredentialRequestOptions {
 // Type definitions for webauthn
 // Spec: https://w3c.github.io/webauthn/
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#enumdef-publickeycredentialtype}
+ */
+type PublicKeyCredentialType = "public-key";
+
+/**
+ * @see {@link https://w3c.github.io/webauthn/#enumdef-userverificationrequirement}
+ */
+type UserVerificationRequirement = "required" | "preferred" | "discouraged";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialrequestoptions}
  */
@@ -372,7 +394,7 @@ interface PublicKeyCredentialRequestOptions {
     timeout: number;
     rpId: string;
     allowCredentials: PublicKeyCredentialDescriptor[];
-    userVerification?: 'required' | 'preferred' | 'discouraged';
+    userVerification?: UserVerificationRequirement;
     extensions?: any;
 }
 
@@ -397,32 +419,47 @@ interface PublicKeyCredentialUserEntity {
  * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialparameters}
  */
 interface PublicKeyCredentialParameters {
-    type: 'public-key';
+    type: PublicKeyCredentialType;
     alg: number;
 }
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#transport}
+ */
+type AuthenticatorTransport = "usb" | "nfc" | "ble" | "internal";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-publickeycredentialdescriptor}
  */
 interface PublicKeyCredentialDescriptor {
-    type: 'public-key';
+    type: PublicKeyCredentialType;
     id: BufferSource;
-    transports?: string[];
+    transports?: AuthenticatorTransport[];
 }
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#attachment}
+ */
+type AuthenticatorAttachment = "platform" | "cross-platform";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-authenticatorselectioncriteria}
  */
 interface AuthenticatorSelectionCriteria {
-    authenticatorAttachment?: string;
+    authenticatorAttachment?: AuthenticatorAttachment;
     requireResidentKey?: boolean;
-    requireUserVerification?: string;
+    requireUserVerification?: UserVerificationRequirement;
 }
 
+/**
+ * @see {@link https://w3c.github.io/webauthn/#attestation-convey}
+ */
+type AttestationConveyancePreference = "none" | "indirect" | "direct";
+
 /**
  * @see {@link https://w3c.github.io/webauthn/#dictdef-makepublickeycredentialoptions}
  */
-interface MakePublicKeyCredentialOptions {
+interface PublicKeyCredentialCreationOptions {
     rp: PublicKeyCredentialRpEntity;
     user: PublicKeyCredentialUserEntity;
 
@@ -432,7 +469,7 @@ interface MakePublicKeyCredentialOptions {
     timeout?: number;
     excludeCredentials?: PublicKeyCredentialDescriptor[];
     authenticatorSelection?: AuthenticatorSelectionCriteria;
-    attestation?: 'none' | 'indirect' | 'direct';
+    attestation?: AttestationConveyancePreference;
     extensions?: any;
 }
 
@@ -463,7 +500,7 @@ interface AuthenticatorAssertionResponse extends AuthenticatorResponse {
  * @see {@link https://w3c.github.io/webauthn/#publickeycredential}
  */
 interface PublicKeyCredential extends CredentialData {
-    readonly type: 'public-key';
+    readonly type: PublicKeyCredentialType;
     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 58503208b3..9d20ed37dc 100644
--- a/types/webappsec-credential-management/webappsec-credential-management-tests.ts
+++ b/types/webappsec-credential-management/webappsec-credential-management-tests.ts
@@ -214,7 +214,7 @@ function signOutDeprecated() {
     }
 
     navigator.credentials.requireUserMediation().then(() => {
-        document.location.assign('/');
+        document.location!.assign('/');
     });
 }
 
@@ -224,7 +224,7 @@ function signOut() {
     }
 
     navigator.credentials.preventSilentAccess().then(() => {
-        document.location.assign('/');
+        document.location!.assign('/');
     });
 }
 
@@ -295,8 +295,20 @@ function webauthnRegister() {
             pubKeyCredParams: [
                 {type: 'public-key', alg: -7},
             ],
+            excludeCredentials: [
+                {
+                    id: (new Uint8Array(1)).buffer,
+                    type: 'public-key',
+                    transports: ['ble', 'internal']
+                }
+            ],
             timeout: 5000,
-            authenticatorSelection: {},
+            attestation: "direct",
+            authenticatorSelection: {
+                requireUserVerification: "preferred",
+                requireResidentKey: false,
+                authenticatorAttachment: "platform"
+            },
         }
     });
 
@@ -324,6 +336,7 @@ function webauthnAuthenticate() {
         allowCredentials: [{
             type: "public-key",
             id: credentialID,
+            transports: ['internal', 'ble', 'nfc', 'usb']
         }],
     }});
 
diff --git a/types/webassembly-web-api/index.d.ts b/types/webassembly-web-api/index.d.ts
new file mode 100644
index 0000000000..fd53e094b2
--- /dev/null
+++ b/types/webassembly-web-api/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for the WebAssembly Web API v1
+// Project: https://webassembly.org/
+// Definitions by: Johannes Henninger <https://github.com/jhenninger>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+/// <reference types="webassembly-js-api" />
+
+/**
+ *  The WebAssembly Web API defines extensions to the JavaScript API made
+ *  available specifically in web browsers. See [WebAssembly Web
+ *  API](https://www.w3.org/TR/wasm-web-api-1/) for more information.
+ */
+declare namespace WebAssembly {
+    function compileStreaming(source: Response | Promise<Response>): Promise<Module>;
+    function instantiateStreaming(source: Response | Promise<Response>, importObject?: any): Promise<ResultObject>;
+}
diff --git a/types/webassembly-web-api/tsconfig.json b/types/webassembly-web-api/tsconfig.json
new file mode 100644
index 0000000000..eb9891f0e0
--- /dev/null
+++ b/types/webassembly-web-api/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",
+        "webassembly-web-api-tests.ts"
+    ]
+}
diff --git a/types/webassembly-web-api/tslint.json b/types/webassembly-web-api/tslint.json
new file mode 100644
index 0000000000..65c83fb1e3
--- /dev/null
+++ b/types/webassembly-web-api/tslint.json
@@ -0,0 +1,6 @@
+{
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "dt-header": false
+    }
+}
diff --git a/types/webassembly-web-api/webassembly-web-api-tests.ts b/types/webassembly-web-api/webassembly-web-api-tests.ts
new file mode 100644
index 0000000000..5c35d1362b
--- /dev/null
+++ b/types/webassembly-web-api/webassembly-web-api-tests.ts
@@ -0,0 +1,18 @@
+const response: Response = new Response();
+const promise: Promise<Response> = Promise.resolve(response);
+
+// CompileStreaming - taking Response
+// $ExpectType Promise<Module>
+WebAssembly.compileStreaming(response);
+
+// CompileStreaming - taking Promise<Response>
+// $ExpectType Promise<Module>
+WebAssembly.compileStreaming(promise);
+
+// InstantiateStreaming - taking Response
+// $ExpectType Promise<ResultObject>
+WebAssembly.instantiateStreaming(response);
+
+// InstantiateStreaming - taking Promise<Response>
+// $ExpectType Promise<ResultObject>
+WebAssembly.instantiateStreaming(promise);
diff --git a/types/webcomponents.js/index.d.ts b/types/webcomponents.js/index.d.ts
index b7dcff5248..36a42dd00e 100644
--- a/types/webcomponents.js/index.d.ts
+++ b/types/webcomponents.js/index.d.ts
@@ -36,7 +36,7 @@ export interface Polyfill {
 declare global {
     // This contains duplicates of some types in lib.dom.d.ts in order to support typescript 2.0
     interface ElementDefinitionOptions {
-        extends: string;
+        extends?: string;
     }
 
     interface ShadowRoot extends DocumentFragment {
diff --git a/types/webcomponents.js/tsconfig.json b/types/webcomponents.js/tsconfig.json
index 7905e2ea0d..612875df12 100644
--- a/types/webcomponents.js/tsconfig.json
+++ b/types/webcomponents.js/tsconfig.json
@@ -6,8 +6,8 @@
             "dom"
         ],
         "noImplicitAny": true,
-        "noImplicitThis": false,
-        "strictNullChecks": false,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
diff --git a/types/webdriverio/index.d.ts b/types/webdriverio/index.d.ts
index 556e034227..d3521cd41e 100644
--- a/types/webdriverio/index.d.ts
+++ b/types/webdriverio/index.d.ts
@@ -178,6 +178,9 @@ declare namespace WebdriverIO {
         setWindowRect?: boolean;
         timeouts?: Timeouts;
         unhandledPromptBehavior?: string;
+
+        // wdio-sauce-service specific
+        build?: string;
     }
 
     interface DesiredCapabilities extends Capabilities {
@@ -434,6 +437,15 @@ declare namespace WebdriverIO {
         waitforInterval?: number;
         user?: string;
         key?: string;
+
+        // wdio-sauce-service specific
+        sauceConnect?: boolean;
+        sauceConnectOpts?: { [name: string]: any; };
+
+        // wdio-docker-service specific
+        dockerOptions?: { [name: string]: any; };
+        onDockerReady?: ((...args: any[]) => void);
+        dockerLogs?: string;
     }
 
     interface UnknownOptions {
diff --git a/types/webpack-assets-manifest/index.d.ts b/types/webpack-assets-manifest/index.d.ts
new file mode 100644
index 0000000000..ad6d00fab3
--- /dev/null
+++ b/types/webpack-assets-manifest/index.d.ts
@@ -0,0 +1,147 @@
+// Type definitions for webpack-assets-manifest 3.0
+// Project: https://github.com/webdeveric/webpack-assets-manifest
+// Definitions by: Franklin Tse <https://github.com/FranklinWhale>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.7
+
+import { Plugin } from "webpack";
+import { SyncHook, SyncWaterfallHook } from "tapable";
+
+declare class WebpackAssetsManifest extends Plugin {
+	constructor(options?: WebpackAssetsManifest.Options);
+
+	/** https://github.com/webdeveric/webpack-assets-manifest#hooks */
+	hooks: {
+		apply: SyncHook<WebpackAssetsManifest>;
+
+		/**
+		 * The `SyncWaterfallHook` class supports 3 type parameters only but this hook actually has 4 parameters. The type of 4th parameter is `AnyObject`.
+		 *
+		 * Refer to https://github.com/webdeveric/webpack-assets-manifest#hooks for details
+		 */
+		customize: SyncWaterfallHook<WebpackAssetsManifest.Entry, WebpackAssetsManifest.AnyObject, WebpackAssetsManifest>;
+
+		transform: SyncWaterfallHook<WebpackAssetsManifest.AnyObject, WebpackAssetsManifest>;
+
+		done: SyncHook<WebpackAssetsManifest, WebpackAssetsManifest.AnyObject>;
+
+		options: SyncWaterfallHook<WebpackAssetsManifest.Options>;
+
+		afterOptions: SyncHook<WebpackAssetsManifest.Options>;
+	};
+
+	/** https://github.com/webdeveric/webpack-assets-manifest#options-read-the-schema */
+	options: WebpackAssetsManifest.Options;
+
+	/** https://github.com/webdeveric/webpack-assets-manifest#options-read-the-schema */
+	defaultOptions: WebpackAssetsManifest.Options;
+
+	/** Determine if the manifest data is currently being merged */
+	isMerging: boolean;
+
+	/** Get the file extension */
+	getExtension(filename: string): string;
+
+	/** Replace backslash with forward slash */
+	fixKey(key: string): string;
+
+	/** Determine if the filename matches the HMR filename pattern */
+	isHMR(filename: string): boolean;
+
+	/** Add item to assets without modifying the key or value */
+	setRaw(key: string, value: string): this;
+
+	/** Add an item to the manifest */
+	set(key: string, value: string): this;
+
+	/** Determine if an item exist in the manifest */
+	has(key: string): boolean;
+
+	/** Get an item from the manifest */
+	get(key: string, defaultValue?: string): any;
+
+	/** Delete an item from the manifest */
+	delete(key: string): boolean;
+
+	/** Get the file system path to the manifest */
+	getOutputPath(): string;
+
+	/** Get the public path for the filename */
+	getPublicPath(filename: string): string;
+
+	/**
+	 * Get a [Proxy](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Proxy/handler) for the manifest
+	 *
+	 * @param raw - Use `setRaw` instead of `set`
+	 */
+	getProxy(raw?: boolean): ProxyHandler<WebpackAssetsManifest>;
+}
+
+declare namespace WebpackAssetsManifest {
+	interface Options {
+		/** https://github.com/webdeveric/webpack-assets-manifest#assets */
+		assets?: object;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#output */
+		output?: string;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#replacer */
+		replacer?: null | ReadonlyArray<string> | ((key: string, value: string) => number | string | boolean | null | object | undefined);
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#space */
+		space?: number;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#writetodisk */
+		writeToDisk?: boolean;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#fileextregex */
+		fileExtRegex?: RegExp | null | false;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#sortmanifest */
+		sortManifest?: boolean | ((this: WebpackAssetsManifest, a: string, b: string) => number);
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#merge */
+		merge?: boolean | "customize";
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#publicpath */
+		publicPath?: string | boolean | null | (((filename: string, manifest: WebpackAssetsManifest) => string));
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#apply */
+		apply?: ((manifest: WebpackAssetsManifest) => void) | null;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#customize */
+		customize?: ((entry: Entry, original: AnyObject, manifest: WebpackAssetsManifest, asset: AnyObject) => Entry | false) | null;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#transform */
+		transform?: ((assets: AnyObject, manifest: WebpackAssetsManifest) => any) | null;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#done */
+		done?: ((manifest: WebpackAssetsManifest, stats: AnyObject) => void) | null;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#entrypoints */
+		entrypoints?: boolean;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#entrypointskey */
+		entrypointsKey?: string | false;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#integrity */
+		integrity?: boolean;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#integrityhashes */
+		integrityHashes?: ReadonlyArray<string>;
+
+		/** https://github.com/webdeveric/webpack-assets-manifest#integritypropertyname */
+		integrityPropertyName?: string;
+	}
+
+	interface Entry {
+		key: string;
+		value: string;
+	}
+
+	interface AnyObject extends Object {
+		[index: string]: any;
+	}
+}
+
+export = WebpackAssetsManifest;
diff --git a/types/webpack-assets-manifest/tsconfig.json b/types/webpack-assets-manifest/tsconfig.json
new file mode 100644
index 0000000000..624eb9f943
--- /dev/null
+++ b/types/webpack-assets-manifest/tsconfig.json
@@ -0,0 +1,24 @@
+{
+	"compilerOptions": {
+		"module": "commonjs",
+		"lib": [
+			"es6"
+		],
+		"noImplicitAny": true,
+		"noImplicitThis": true,
+		"strictNullChecks": true,
+		"strictFunctionTypes": true,
+		"esModuleInterop": true,
+		"baseUrl": "../",
+		"typeRoots": [
+			"../"
+		],
+		"types": [],
+		"noEmit": true,
+		"forceConsistentCasingInFileNames": true
+	},
+	"files": [
+		"index.d.ts",
+		"webpack-assets-manifest-tests.ts"
+	]
+}
diff --git a/types/webpack-assets-manifest/tslint.json b/types/webpack-assets-manifest/tslint.json
new file mode 100644
index 0000000000..369725d5a4
--- /dev/null
+++ b/types/webpack-assets-manifest/tslint.json
@@ -0,0 +1,10 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		"indent": [
+			true,
+			"tabs",
+			4
+		]
+	}
+}
diff --git a/types/webpack-assets-manifest/webpack-assets-manifest-tests.ts b/types/webpack-assets-manifest/webpack-assets-manifest-tests.ts
new file mode 100644
index 0000000000..551451a989
--- /dev/null
+++ b/types/webpack-assets-manifest/webpack-assets-manifest-tests.ts
@@ -0,0 +1,106 @@
+import WebpackAssetsManifest from "webpack-assets-manifest";
+
+/** https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/asset-integrity.js */
+new WebpackAssetsManifest({
+	output: 'asset-integrity-manifest.json',
+	integrity: true,
+	publicPath: true,
+	customize(entry, original, manifest, asset) {
+		return {
+			key: entry.value,
+			value: asset && asset.integrity,
+		};
+	},
+});
+
+/** https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/aws-s3-data-integrity.js */
+new WebpackAssetsManifest({
+	output: 'aws-s3-data-integrity-manifest.json',
+	integrity: true,
+	integrityHashes: ['md5'],
+	integrityPropertyName: 'md5',
+	publicPath: 's3://some-bucket/some-folder/',
+	customize(entry, original, manifest, asset) {
+		return {
+			key: entry.value,
+			value: asset && asset.md5.substr(4),
+		};
+	},
+});
+
+/** https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/custom-cdn.js */
+new WebpackAssetsManifest({
+	output: 'custom-cdn-manifest.json',
+	publicPath(filename, manifest) {
+		switch (manifest.getExtension(filename).substr(1).toLowerCase()) {
+			case 'jpg': case 'jpeg': case 'gif': case 'png': case 'svg':
+				return `https://img.cdn.example.com/${filename}`;
+			case 'css':
+				return `https://css.cdn.example.com/${filename}`;
+			case 'js':
+				return `https://js.cdn.example.com/${filename}`;
+			default:
+				return `https://cdn.example.com/${filename}`;
+		}
+	},
+});
+
+/**
+ * https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/customized.js
+ * https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/merged.js
+ */
+new WebpackAssetsManifest({
+	output: 'customized-manifest.json',
+	merge: true,
+	customize(entry, original, manifest, asset) {
+		if (manifest.isMerging) {}
+
+		if (entry.key.toLowerCase().endsWith('.map')) {
+			return false;
+		}
+
+		return {
+			key: `src/${entry.key}`,
+			value: `dist/${entry.value}`,
+		};
+	},
+});
+
+/** https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/sorted.js */
+new WebpackAssetsManifest({
+	output: 'sorted-manifest.json',
+	sortManifest(a, b) {
+		const extA = this.getExtension(a);
+		const extB = this.getExtension(b);
+
+		if (extA > extB) {
+			return 1;
+		}
+
+		if (extA < extB) {
+			return -1;
+		}
+
+		return a.localeCompare(b);
+	},
+});
+
+/** https://github.com/webdeveric/webpack-assets-manifest/blob/master/examples/transformed.js */
+new WebpackAssetsManifest({
+	output: 'transformed-manifest.json',
+	transform(assets, manifest) {
+		const { name, version } = require('./package.json');
+
+		assets.package = {
+			name,
+			version,
+		};
+
+		const { key, value } = manifest.hooks.customize.call({
+			key: 'YourKey',
+			value: 'YourValue',
+		});
+
+		assets[key] = value;
+	},
+});
diff --git a/types/webpack-chain/index.d.ts b/types/webpack-chain/index.d.ts
index 691e4be9b9..033ef9951f 100644
--- a/types/webpack-chain/index.d.ts
+++ b/types/webpack-chain/index.d.ts
@@ -85,10 +85,14 @@ declare namespace Config {
 
 	class Plugins<Parent> extends TypedChainedMap<Parent, Plugin<Parent>> {}
 
-	class Plugin<Parent> extends ChainedMap<Parent> {
+	class Plugin<Parent> extends ChainedMap<Parent> implements Orderable {
 		init(value: (plugin: PluginClass, args: any[]) => webpack.Plugin): this;
 		use(plugin: PluginClass, args?: any[]): this;
 		tap(f: (args: any[]) => any[]): this;
+
+		// Orderable
+		before(name: string): this;
+		after(name: string): this;
 	}
 
 	class Module extends ChainedMap<Config> {
@@ -231,11 +235,15 @@ declare namespace Config {
 
 	interface LoaderOptions { [name: string]: any; }
 
-	class Use extends ChainedMap<Rule> {
+	class Use extends ChainedMap<Rule> implements Orderable {
 		loader(value: string): this;
 		options(value: LoaderOptions): this;
 
 		tap(f: (options: LoaderOptions) => LoaderOptions): this;
+
+		// Orderable
+		before(name: string): this;
+		after(name: string): this;
 	}
 
 	type DevTool = 'eval' | 'inline-source-map' | 'cheap-eval-source-map' | 'cheap-source-map' |
@@ -255,4 +263,9 @@ declare namespace Config {
 	interface PluginClass {
 		new (...opts: any[]): webpack.Plugin;
 	}
+
+	interface Orderable {
+		before(name: string): this;
+		after(name: string): this;
+	}
 }
diff --git a/types/webpack-chain/webpack-chain-tests.ts b/types/webpack-chain/webpack-chain-tests.ts
index 8775fec7f9..f1d0daa5e2 100644
--- a/types/webpack-chain/webpack-chain-tests.ts
+++ b/types/webpack-chain/webpack-chain-tests.ts
@@ -46,8 +46,20 @@ config
 		.use(webpack.DefinePlugin, [])
 		.end()
 
+	.plugin('bar')
+		.use(webpack.DefinePlugin, [])
+		.before('foo')
+		.end()
+
+	.plugin('baz')
+		.use(webpack.DefinePlugin, [])
+		.after('bar')
+		.end()
+
 	.plugins
 		.delete('foo')
+		.delete('bar')
+		.delete('baz')
 		.end()
 
 	.devServer
@@ -107,8 +119,14 @@ config
 				.loader('babel-loader')
 				.options({})
 				.end()
+			.use('eslint')
+				.loader('eslint-loader')
+				.options({})
+				.after('babel')
+				.end()
 			.uses
 				.delete('babel')
+				.delete('eslint')
 				.end()
 			.pre()
 			.post()
diff --git a/types/webpack-config-utils/index.d.ts b/types/webpack-config-utils/index.d.ts
new file mode 100644
index 0000000000..97c1fdf397
--- /dev/null
+++ b/types/webpack-config-utils/index.d.ts
@@ -0,0 +1,40 @@
+// Type definitions for webpack-config-utils 2.3
+// Project: https://github.com/kentcdodds/webpack-config-utils#readme
+// Definitions by: Martin Hochel <https://github.com/hotell>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+export function getIfUtils<E extends EnvVars | string>(
+    env: { [P in E]: boolean | string } | E,
+    vars?: Array<EnvVars | string>
+): IfUtils;
+export function removeEmpty<T>(input: Array<T | undefined>): T[];
+export function removeEmpty<T>(input: { [P in keyof T]: T[P] }): NonEmptyObject<T>;
+export function propIf<E>(a: Falsy, value: any, alternate: E): E;
+export function propIf<I>(a: any, value: I, alternate: any): I;
+export function propIfNot<I>(a: Falsy, value: I, alternate: any): I;
+export function propIfNot<E>(a: any, value: any, alternate: E): E;
+
+export type Falsy = false | '' | 'false' | undefined | null | 0;
+export type DefinedObjKeys<T> = ({ [P in keyof T]: T[P] extends undefined ? never : P })[keyof T];
+export type NonEmptyObject<T, P extends DefinedObjKeys<T> = DefinedObjKeys<T>> = { [PP in P]: T[PP] };
+
+export type EnvVars = 'production' | 'prod' | 'test' | 'development' | 'dev';
+
+export interface IfUtilsFn {
+    <Y, N>(value: Y, alternate?: N): Y | N;
+    (): boolean;
+}
+export interface IfUtils {
+    ifDevelopment: IfUtilsFn;
+    ifNotDevelopment: IfUtilsFn;
+    ifDev: IfUtilsFn;
+    ifNotDev: IfUtilsFn;
+    ifProduction: IfUtilsFn;
+    ifNotProduction: IfUtilsFn;
+    ifProd: IfUtilsFn;
+    ifNotProd: IfUtilsFn;
+    ifTest: IfUtilsFn;
+    ifNotTest: IfUtilsFn;
+    [key: string]: IfUtilsFn;
+}
diff --git a/types/webpack-config-utils/tsconfig.json b/types/webpack-config-utils/tsconfig.json
new file mode 100644
index 0000000000..0376cbd868
--- /dev/null
+++ b/types/webpack-config-utils/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-config-utils-tests.ts"
+    ]
+}
diff --git a/types/webpack-config-utils/tslint.json b/types/webpack-config-utils/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-config-utils/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-config-utils/webpack-config-utils-tests.ts b/types/webpack-config-utils/webpack-config-utils-tests.ts
new file mode 100644
index 0000000000..4f83245b57
--- /dev/null
+++ b/types/webpack-config-utils/webpack-config-utils-tests.ts
@@ -0,0 +1,100 @@
+import webpackConfigUtils = require('webpack-config-utils');
+import { getIfUtils, removeEmpty, propIf, propIfNot } from 'webpack-config-utils';
+
+{
+    // propIf/propIfNot
+
+    // $ExpectType "value"
+    propIf(true, 'value', 'alternate');
+
+    // $ExpectType "alternate"
+    propIf(false, 'value', 'alternate');
+
+    // $ExpectType "alternate"
+    propIf('false', 'value', 'alternate');
+
+    // $ExpectType "alternate"
+    propIfNot(true, 'value', 'alternate');
+
+    // $ExpectType "value"
+    propIfNot(false, 'value', 'alternate');
+
+    // $ExpectType "value"
+    propIfNot('false', 'value', 'alternate');
+}
+{
+    // getIfUtils
+    {
+        // $ExpectType IfUtils
+        const utils = getIfUtils({});
+    }
+    {
+        const utils = getIfUtils({}, ['foo', 'bar']); // 'ifFoo', 'ifNotFoo', 'ifBar', 'ifNotBar'
+        const {
+            ifFoo, // $ExpectType IfUtilsFn
+            ifBar, // $ExpectType IfUtilsFn
+            ifNotFoo, // $ExpectType IfUtilsFn
+            ifNotBar // $ExpectType IfUtilsFn
+        } = utils;
+    }
+
+    {
+        const {
+            ifProduction // $ExpectType IfUtilsFn
+        } = getIfUtils('production');
+
+        // $ExpectType "value" | "alternate"
+        ifProduction('value', 'alternate'); // 'value'
+    }
+    {
+        const { ifNotDev } = getIfUtils({ dev: false });
+
+        // $ExpectType "value" | "alternate"
+        ifNotDev('value', 'alternate'); // 'value'
+    }
+    {
+        // $ExpectError
+        getIfUtils(false); // webpack-config-utils:getIfUtils.*?string\/Object/);
+    }
+    {
+        const { ifTest, ifProd, ifNotDev } = getIfUtils('test');
+        // $ExpectType boolean
+        ifTest(); // true;
+        // $ExpectType boolean
+        ifProd(); // false;
+        // $ExpectType boolean
+        ifNotDev(); // true;
+    }
+    {
+        const { ifWatch, ifProd, ifNotDev, ifTest } = getIfUtils('watch', ['prod', 'dev', 'watch']);
+        // $ExpectType boolean
+        ifWatch(); // true
+        // $ExpectType boolean
+        ifProd(); // false
+        // $ExpectType boolean
+        ifNotDev(); // true
+        // $ExpectType IfUtilsFn
+        ifTest; // function
+    }
+}
+{
+    // removeEmpty
+    // $ExpectType (number | null)[]
+    const emptiedArray = removeEmpty([undefined, 0, 1, 2, undefined, 3, undefined, null]); // [0, 1, 2, 3, null]
+
+    // $ExpectType NonEmptyObject<{ a: number; b: string; c: undefined; d: null; }, "b" | "a" | "d">
+    const emptiedObject = removeEmpty({ a: 1, b: 'b', c: undefined, d: null }); // {a: 1, b: 'b', d: null}
+    const {
+        a, // $ExpectType number
+        b, // $ExpectType string
+        d // $ExpectType null
+    } = emptiedObject;
+
+    {
+        // $ExpectError
+        const {a, b, c, d} = emptiedObject;
+    }
+
+    // $ExpectType number | null
+    const firstItem = emptiedArray[0];
+}
diff --git a/types/webpack-dev-middleware/index.d.ts b/types/webpack-dev-middleware/index.d.ts
index 6a7d1bc4b3..73175d2eab 100644
--- a/types/webpack-dev-middleware/index.d.ts
+++ b/types/webpack-dev-middleware/index.d.ts
@@ -2,6 +2,7 @@
 // Project: https://github.com/webpack/webpack-dev-middleware
 // Definitions by: Benjamin Lim <https://github.com/bumbleblym>
 //                 reduckted <https://github.com/reduckted>
+//                 Chris Abrams <https://github.com/chrisabrams>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -23,7 +24,7 @@ declare namespace WebpackDevMiddleware {
 		lazy?: boolean;
 		watchOptions?: webpack.Options.WatchOptions;
 		publicPath: string;
-		index?: string;
+		index?: string | boolean;
 		headers?: {
 			[name: string]: string;
 		};
@@ -32,6 +33,7 @@ declare namespace WebpackDevMiddleware {
 		serverSideRender?: boolean;
 		logger?: Logger;
 		filename?: string;
+		writeToDisk?: boolean | ((filename: string) => boolean);
 	}
 
 	interface ReporterOptions {
diff --git a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
index beb3c1abe6..9881ab3b9c 100644
--- a/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
+++ b/types/webpack-dev-middleware/webpack-dev-middleware-tests.ts
@@ -23,6 +23,7 @@ webpackDevMiddlewareInstance = webpackDevMiddleware(compiler, {
 	},
 	reporter: null,
 	serverSideRender: false,
+	writeToDisk: false,
 });
 
 const app = express();
diff --git a/types/webpack-dev-server/index.d.ts b/types/webpack-dev-server/index.d.ts
index 4dc419bd3a..647d2407ed 100644
--- a/types/webpack-dev-server/index.d.ts
+++ b/types/webpack-dev-server/index.d.ts
@@ -1,79 +1,180 @@
-// Type definitions for webpack-dev-server 2.9
+// Type definitions for webpack-dev-server 3.1
 // Project: https://github.com/webpack/webpack-dev-server
 // 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>
+//                 Artur Androsovych <https://github.com/arturovt>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
 import * as webpack from 'webpack';
-import * as core from 'express-serve-static-core';
-import * as serveStatic from 'serve-static';
-import * as http from 'http';
-import * as spdy from 'spdy';
 import * as httpProxyMiddleware from 'http-proxy-middleware';
+import * as express from 'express';
+import * as serveStatic from 'serve-static';
+import * as https from 'https';
+import * as http from 'http';
+import { Url } from "url";
 
 declare namespace WebpackDevServer {
     interface ListeningApp {
         address(): { port?: number };
     }
 
-    interface proxyConfigMap {
+    interface ProxyConfigMap {
         [url: string]: string | httpProxyMiddleware.Config;
     }
 
-    type proxyConfigArrayItem = {
+    type ProxyConfigArrayItem = {
         path?: string | string[];
         context?: string | string[]
     } & httpProxyMiddleware.Config;
 
-    type proxyConfigArray = proxyConfigArrayItem[];
+    type ProxyConfigArray = ProxyConfigArrayItem[];
 
-    type expressAppHook = (app: core.Express) => void;
+    interface Context {
+        match: RegExpMatchArray;
+        parsedUrl: Url;
+    }
+
+    type RewriteTo = (context: Context) => string;
+
+    interface Rewrite {
+        from: RegExp;
+        to: string | RegExp | RewriteTo;
+    }
+
+    interface HistoryApiFallbackConfig {
+        disableDotRule?: boolean;
+        rewrites?: Rewrite[];
+    }
 
     interface Configuration {
-        after?: expressAppHook;
+        /** Provides the ability to execute custom middleware after all other middleware internally within the server. */
+        after?: (app: express.Application) => void;
+        /** This option allows you to whitelist services that are allowed to access the dev server. */
         allowedHosts?: string[];
-        before?: expressAppHook;
+        /** Provides the ability to execute custom middleware prior to all other middleware internally within the server. */
+        before?: (app: express.Application) => void;
+        /** This option broadcasts the server via ZeroConf networking on start. */
         bonjour?: boolean;
-        clientLogLevel?: string;
+        /**
+         * When using inline mode, the console in your DevTools will show you messages e.g. before reloading,
+         * before an error or when Hot Module Replacement is enabled. This may be too verbose.
+         */
+        clientLogLevel?: 'none' | 'error' | 'warning' | 'info';
+        /** Enable gzip compression for everything served. */
         compress?: boolean;
-        contentBase?: string;
+        /**
+         * Tell the server where to serve content from. This is only necessary if you want to serve static files.
+         * devServer.publicPath will be used to determine where the bundles should be served from, and takes precedence.
+         */
+        contentBase?: boolean | string | string[];
+        /**
+         * When set to true this option bypasses host checking.
+         * THIS IS NOT RECOMMENDED as apps that do not check the host are vulnerable to DNS rebinding attacks.
+         */
         disableHostCheck?: boolean;
+        /**
+         * This option lets you reduce the compilations in lazy mode.
+         * By default in lazy mode, every request results in a new compilation.
+         * With filename, it's possible to only compile when a certain file is requested.
+         */
         filename?: string;
-        headers?: {};
-        historyApiFallback?: boolean | {};
-        host?: string;
-        hot?: boolean;
-        hotOnly?: boolean;
-        https?: boolean | spdy.ServerOptions;
-        inline?: boolean;
-        lazy?: boolean;
-        noInfo?: boolean;
-        open?: boolean;
-        openPage?: string;
-        overlay?: boolean | {
-            warnings: boolean;
-            errors: boolean;
+        /** Adds headers to all responses. */
+        headers?: {
+            [key: string]: string;
         };
+        /** When using the HTML5 History API, the index.html page will likely have to be served in place of any 404 responses. */
+        historyApiFallback?: boolean | HistoryApiFallbackConfig;
+        /** Specify a host to use. By default this is localhost. */
+        host?: string;
+        /** Enable webpack's Hot Module Replacement feature. */
+        hot?: boolean;
+        /** Enables Hot Module Replacement (see devServer.hot) without page refresh as fallback in case of build failures. */
+        hotOnly?: boolean;
+        /** By default dev-server will be served over HTTP. It can optionally be served over HTTP/2 with HTTPS. */
+        https?: boolean | https.ServerOptions;
+        /** The filename that is considered the index file. */
+        index?: string;
+        /**
+         * Toggle between the dev-server's two different modes.
+         * By default the application will be served with inline mode enabled.
+         * This means that a script will be inserted in your bundle to take care of live reloading,
+         * and build messages will appear in the browser console.
+         */
+        inline?: boolean;
+        /**
+         * When lazy is enabled, the dev-server will only compile the bundle when it gets requested.
+         * This means that webpack will not watch any file changes.
+         */
+        lazy?: boolean;
+        /**
+         * With noInfo enabled, messages like the webpack bundle information that is shown
+         * when starting up and after each save,will be hidden.
+         * Errors and warnings will still be shown.
+         */
+        noInfo?: boolean;
+        /** When open is enabled, the dev server will open the browser. */
+        open?: boolean;
+        /** Specify a page to navigate to when opening the browser. */
+        openPage?: string;
+        /** Shows a full-screen overlay in the browser when there are compiler errors or warnings. Disabled by default. */
+        overlay?: boolean | {
+            warnings?: boolean;
+            errors?: boolean;
+        };
+        /** When used via the CLI, a path to an SSL .pfx file. If used in options, it should be the bytestream of the .pfx file. */
         pfx?: string;
+        /** The passphrase to a SSL PFX file. */
         pfxPassphrase?: string;
+        /** Specify a port number to listen for requests on. */
         port?: number;
-        proxy?: proxyConfigMap | proxyConfigArray;
+        /**
+         * Proxying some URLs can be useful when you have a separate API backend development server
+         * and you want to send API requests on the same domain.
+         */
+        proxy?: ProxyConfigMap | ProxyConfigArray;
+        /**
+         * When using inline mode and you're proxying dev-server,
+         * the inline client script does not always know where to connect to.
+         * It will try to guess the URL of the server based on window.location, but if that fails you'll need to use this.
+         */
         public?: string;
+        /** The bundled files will be available in the browser under this path. */
         publicPath?: string;
+        /**
+         * With quiet enabled, nothing except the initial startup information will be written to the console.
+         * This also means that errors or warnings from webpack are not visible.
+         */
         quiet?: boolean;
-        setup?: expressAppHook; // will be depreacted in v3.0.0 and replaced by before
+        /** @deprecated Here you can access the Express app object and add your own custom middleware to it. */
+        setup?: (app: express.Application) => void;
+        /** The Unix socket to listen to (instead of a host). */
         socket?: string;
+        /** It is possible to configure advanced options for serving static files from contentBase. */
         staticOptions?: serveStatic.ServeStaticOptions;
-        stats?: webpack.compiler.StatsOptions | webpack.compiler.StatsToStringOptions;
+        /**
+         * This option lets you precisely control what bundle information gets displayed.
+         * This can be a nice middle ground if you want some bundle information, but not all of it.
+         */
+        stats?: string | webpack.Options.Stats;
+        /** This option lets the browser open with your local IP. */
         useLocalIp?: boolean;
+        /** Tell the server to watch the files served by the devServer.contentBase option. File changes will trigger a full page reload. */
         watchContentBase?: boolean;
+        /** Control options related to watching the files. */
         watchOptions?: webpack.WatchOptions;
     }
 }
 
+declare module 'webpack' {
+    interface Configuration {
+        /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
+        devServer?: WebpackDevServer.Configuration;
+    }
+}
+
 declare class WebpackDevServer {
     constructor(
         webpack: webpack.Compiler | webpack.MultiCompiler,
diff --git a/types/webpack-dev-server/webpack-dev-server-tests.ts b/types/webpack-dev-server/webpack-dev-server-tests.ts
index 5a23a60ad7..a73037e74c 100644
--- a/types/webpack-dev-server/webpack-dev-server-tests.ts
+++ b/types/webpack-dev-server/webpack-dev-server-tests.ts
@@ -1,6 +1,6 @@
 import webpack = require('webpack');
 import WebpackDevServer = require('webpack-dev-server');
-import * as core from 'express-serve-static-core';
+import { Application } from 'express';
 const compiler = webpack({});
 const multipleCompiler = webpack([]);
 
@@ -46,7 +46,7 @@ const config: WebpackDevServer.Configuration = {
         "**": "http://localhost:9090"
     },
 
-    setup: (app: core.Express) => {
+    setup: (app: Application) => {
         // Here you can access the Express app object and add your own custom middleware to it.
         // For example, to define custom handlers for some paths:
         app.get('/some/path', (req, res) => {
@@ -69,8 +69,7 @@ const config: WebpackDevServer.Configuration = {
     },
     // It's a required option.
     publicPath: "/assets/",
-    headers: { "X-Custom-Header": "yes" },
-    stats: { colors: true }
+    headers: { "X-Custom-Header": "yes" }
 };
 
 // API example
@@ -87,13 +86,23 @@ server.listen(8080, "localhost", () => { });
 
 server.close();
 
-WebpackDevServer.addDevServerEntrypoints(config, {
+const webpackConfig: webpack.Configuration = {
+    context: __dirname,
+
+    mode: 'development',
+
+    target: 'node',
+
+    devServer: config
+};
+
+WebpackDevServer.addDevServerEntrypoints(webpackConfig, {
     publicPath: "/assets/",
     https: true
 });
 
 WebpackDevServer.addDevServerEntrypoints(
-    [config],
+    [webpackConfig],
     {
         publicPath: "/assets/",
         https: true
diff --git a/types/webpack-hot-client/index.d.ts b/types/webpack-hot-client/index.d.ts
index 295e6819be..c8e6500394 100644
--- a/types/webpack-hot-client/index.d.ts
+++ b/types/webpack-hot-client/index.d.ts
@@ -1,6 +1,7 @@
-// Type definitions for webpack-hot-client 3.0
+// Type definitions for webpack-hot-client 4.0
 // Project: https://github.com/webpack-contrib/webpack-hot-client
 // Definitions by: Ryan Clark <https://github.com/rynclark>
+//                 ZSkycat <https://github.com/ZSkycat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -36,7 +37,7 @@ declare namespace WebpackHotClient {
     /** Enable HTTPS */
     https?: boolean;
     /** Level of information for webpack-hot-client to output */
-    logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error';
+    logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent';
     /** Prepend timestamp to each log line */
     logTime?: boolean;
     /** Port that the WebSocket listens on */
@@ -47,5 +48,7 @@ declare namespace WebpackHotClient {
     server?: net.Server;
     /** Webpack stats configuration */
     stats?: webpack.Options.Stats;
+    /** Webpack compile target */
+    validTargets?: string[];
   }
 }
diff --git a/types/webpack-hot-client/webpack-hot-client-tests.ts b/types/webpack-hot-client/webpack-hot-client-tests.ts
index 29ab2341a7..433c704030 100644
--- a/types/webpack-hot-client/webpack-hot-client-tests.ts
+++ b/types/webpack-hot-client/webpack-hot-client-tests.ts
@@ -4,3 +4,5 @@ import hot = require('webpack-hot-client');
 const compiler = webpack();
 
 hot(compiler, { logLevel: 'info', reload: false });
+
+hot(compiler, { logLevel: 'info', reload: false, validTargets: ['web', 'node'] });
diff --git a/types/webpack-hot-middleware/index.d.ts b/types/webpack-hot-middleware/index.d.ts
index ca0abd7d69..d9cfe9cb60 100644
--- a/types/webpack-hot-middleware/index.d.ts
+++ b/types/webpack-hot-middleware/index.d.ts
@@ -1,6 +1,8 @@
 // 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>, Ron Martinez <https://github.com/icylace>
+// Definitions by: Benjamin Lim <https://github.com/bumbleblym>
+//                 Ron Martinez <https://github.com/icylace>
+//                 Chris Abrams <https://github.com/chrisabrams>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -19,6 +21,7 @@ declare namespace WebpackHotMiddleware {
 		log?: false | Logger;
 		path?: string;
 		heartbeat?: number;
+		reload?: boolean;
 	}
 
 	type Logger = (message?: any, ...optionalParams: any[]) => void;
diff --git a/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts b/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts
index b87b379379..b28f86362f 100644
--- a/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts
+++ b/types/webpack-hot-middleware/webpack-hot-middleware-tests.ts
@@ -10,6 +10,7 @@ webpackHotMiddlewareInstance = webpackHotMiddleware(compiler, {
 	log: console.log.bind(console),
 	path: '/__what',
 	heartbeat: 2000,
+	reload: false,
 });
 
 const app = express();
diff --git a/types/webpack-merge/webpack-merge-tests.ts b/types/webpack-merge/webpack-merge-tests.ts
index d7180a6950..16d8c102c3 100644
--- a/types/webpack-merge/webpack-merge-tests.ts
+++ b/types/webpack-merge/webpack-merge-tests.ts
@@ -1,4 +1,3 @@
-import _ = require('lodash');
 import { Configuration, HotModuleReplacementPlugin, Plugin } from 'webpack';
 import webpackMerge = require('webpack-merge');
 
@@ -16,7 +15,7 @@ const f: Configuration = webpackMerge(
     {
         customizeArray(x: any[], y: any[], key: string): any[] | undefined {
             if (key === 'extensions') {
-                return _.uniq([...x, ...y]);
+                return Array.from(new Set([...x, ...y]));
             }
             // Fall back to default merging
             return undefined;
@@ -24,7 +23,7 @@ const f: Configuration = webpackMerge(
         customizeObject(x: {}, y: {}, key: string): {} | undefined {
             if (key === 'module') {
                 // Custom merging
-                return _.merge({}, x, y);
+                return { ...x, ...y };
             }
 
             // Fall back to default merging
diff --git a/types/webpack-serve/index.d.ts b/types/webpack-serve/index.d.ts
index 5a1a302af0..48fdfcbf38 100644
--- a/types/webpack-serve/index.d.ts
+++ b/types/webpack-serve/index.d.ts
@@ -1,6 +1,8 @@
-// Type definitions for webpack-serve 1.0
+// Type definitions for webpack-serve 2.0
 // Project: https://github.com/webpack-contrib/webpack-serve
 // Definitions by: Ryan Clark <https://github.com/rynclark>
+//                 Jokcy <https://github.com/Jokcy>
+//                 ZSkycat <https://github.com/ZSkycat>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -11,83 +13,107 @@ import * as webpack from 'webpack';
 import * as webpackDevMiddleware from 'webpack-dev-middleware';
 import * as webpackHotClient from 'webpack-hot-client';
 import * as https from 'https';
-
-export = WebpackServe;
+import * as net from 'net';
 
 declare module 'webpack' {
-  interface Configuration {
-    serve?: WebpackServe.Options;
-  }
+    interface Configuration {
+        serve?: WebpackServe.Options;
+    }
 }
 
-declare function WebpackServe(
-  { config }: { config: webpack.Configuration }
-): Promise<WebpackServe.Instance>;
+declare function WebpackServe(argv: object, options: WebpackServe.Options): Promise<WebpackServe.Result>;
 
 declare namespace WebpackServe {
-  interface WebpackServeOpen {
-    /** Name of the browser to open */
-    app: string;
-    /** Path on the server to open */
-    path: string;
-  }
+    interface Result {
+        /** An instance of a Koa application, extended with a server property, and stop method, which is used to programatically stop the server */
+        app: InitializedKoa;
 
-  interface WebpackServeMiddleware {
-    /** Function to call to add koa-static */
-    content: () => koa.Middleware;
-    /** Function to call to add the webpack-dev-middleware */
-    webpack: () => webpackDevMiddleware.WebpackDevMiddleware;
-  }
+        /** A function which binds a serve event-name to a function */
+        on<K extends keyof EventMap>(type: K, callback: (args: EventMap[K]) => void): void;
 
-  interface Instance {
-    /** Subscriber function for events */
-    on(event: 'build-started', listener: (args: { compiler: webpack.Compiler }) => void): this;
-    on(event: 'build-finished', listener: (args: { compiler: webpack.Compiler, stats: webpack.Stats }) => void): this;
-    on(event: 'compiler-error' | 'compiler-warning', listener: (args: { compiler: webpack.Compiler, stats: any }) => void): this;
-    on(event: 'listening', listener: (args: { server: koa, options: Options }) => void): this;
+        /** Access to a frozen copy of the internal options object used by the module. */
+        options: InitializedOptions;
+    }
 
-    /** Close webpack-serve */
-    close: () => void;
-  }
+    interface Options {
+        /** Addon to webpack-serve that allows access to the Koa server instance */
+        add?: (app: InitializedKoa, middleware: Middleware, options: Options) => void;
 
-  interface ListenersObject {
-    'build-started': (args: { compiler: webpack.Compiler }) => void;
-    'build-finished': (args: { compiler: webpack.Compiler, stats: webpack.Stats }) => void;
-    'compiler-error': (args: { compiler: webpack.Compiler, stats: any }) => void;
-    'compiler-warning': (args: { compiler: webpack.Compiler, stats: any }) => void;
-    'listening': (args: { server: koa, options: Options }) => void;
-  }
+        /** Custom instance of a webpack compiler */
+        compiler?: webpack.Compiler;
 
-  interface Options {
-    /** Addon to webpack-serve that allows access to the Koa server instance */
-    add?: (app: koa, middleware: WebpackServeMiddleware, options: Options) => void;
-    /** Copy the server URL to the clipboard when the server is started */
-    clipboard?: boolean;
-    /** Custom instance of a webpack compiler */
-    compiler?: webpack.Compiler;
-    /** Webpack configuration for creating a new webpack compiler instance */
-    config?: webpack.Configuration;
-    /** A path or array of paths where content will be served from */
-    content?: string | string[];
-    /** Options for webpack-dev-middleware */
-    dev?: webpackDevMiddleware.Options;
-    /** The host the server will listen on */
-    host?: string;
-    /** Options for webpack-hot-client */
-    hot?: webpackHotClient.Options | boolean;
-    /** Enable HTTP2 support */
-    http2?: boolean;
-    /** Configuration object for the server to use HTTPS */
-    https?: https.ServerOptions;
-    /** Level of information for webpack-serve to output */
-    logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error';
-    /** Prepend timestamp to each log line */
-    logTime?: boolean;
-    /** Object of subscribers to webpack-serve bus events */
-    on?: ListenersObject;
-    /** Open the browser when started */
-    open?: WebpackServeOpen | boolean;
-    /** Port that the server listens on */
-    port?: number;
-  }
+        /** Webpack configuration for creating a new webpack compiler instance */
+        config?: webpack.Configuration;
+
+        /** A path or array of paths where content will be served from */
+        content?: string | string[];
+
+        /** Copy the server URL to the clipboard when the server is started */
+        clipboard?: boolean;
+
+        /** Options for webpack-dev-middleware */
+        devMiddleware?: webpackDevMiddleware.Options;
+
+        /** The host the server will listen on */
+        host?: string;
+
+        /** Options for webpack-hot-client */
+        hotClient?: webpackHotClient.Options | boolean;
+
+        /** Enable HTTP2 support */
+        http2?: boolean;
+
+        /** Configuration object for the server to use HTTPS */
+        https?: https.ServerOptions;
+
+        /** Level of information for webpack-serve to output */
+        logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent';
+
+        /** Prepend timestamp to each log line */
+        logTime?: boolean;
+
+        /** Object of subscribers to webpack-serve bus events */
+        on?: OnOptions;
+
+        /** Open the browser when started */
+        open?: OpenOptions | boolean;
+
+        /** Port that the server listens on */
+        port?: number;
+    }
+
+    interface OpenOptions {
+        /** Name of the browser to open */
+        app?: string;
+        /** Path on the server to open */
+        path?: string;
+    }
+
+    type OnOptions = { [K in keyof EventMap]?: (args: EventMap[K]) => void };
+
+    interface InitializedKoa extends koa {
+        server: net.Server;
+        stop: () => void;
+    }
+
+    interface InitializedOptions extends Options {
+        protocol: 'http' | 'https';
+    }
+
+    interface Middleware {
+        /** Function to call to add koa-static */
+        content: () => void;
+        /** Function to call to add the webpack-dev-middleware */
+        webpack: () => void;
+    }
+
+    interface EventMap {
+        'build-started': { compiler: webpack.Compiler };
+        'build-finished': { compiler: webpack.Compiler; stats: webpack.Stats };
+        'compiler-error': { compiler: webpack.Compiler; stats: any };
+        'compiler-warning': { compiler: webpack.Compiler; stats: any };
+        listening: { server: net.Server; options: InitializedOptions };
+    }
 }
+
+export = WebpackServe;
diff --git a/types/webpack-serve/tsconfig.json b/types/webpack-serve/tsconfig.json
index 11c218b9c9..696f2d44f5 100644
--- a/types/webpack-serve/tsconfig.json
+++ b/types/webpack-serve/tsconfig.json
@@ -1,23 +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-serve-tests.ts"
-  ]
+    "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-serve-tests.ts"
+    ]
 }
diff --git a/types/webpack-serve/v1/index.d.ts b/types/webpack-serve/v1/index.d.ts
new file mode 100644
index 0000000000..19983e6303
--- /dev/null
+++ b/types/webpack-serve/v1/index.d.ts
@@ -0,0 +1,97 @@
+// Type definitions for webpack-serve 1.0
+// Project: https://github.com/webpack-contrib/webpack-serve
+// Definitions by: Ryan Clark <https://github.com/rynclark>
+//                 Jokcy <https://github.com/Jokcy>
+//                 ZSkycat <https://github.com/ZSkycat>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import * as koa from 'koa';
+import * as webpack from 'webpack';
+import * as webpackDevMiddleware from 'webpack-dev-middleware';
+import * as webpackHotClient from 'webpack-hot-client';
+import * as https from 'https';
+
+export = WebpackServe;
+
+declare module 'webpack' {
+  interface Configuration {
+    serve?: WebpackServe.Options;
+  }
+}
+
+declare function WebpackServe(options: WebpackServe.Options): Promise<WebpackServe.Instance>;
+
+declare namespace WebpackServe {
+  interface WebpackServeOpen {
+    /** Name of the browser to open */
+    app?: string;
+    /** Path on the server to open */
+    path?: string;
+  }
+
+  interface WebpackServeMiddleware {
+    /** Function to call to add koa-static */
+    content: () => koa.Middleware;
+    /** Function to call to add the webpack-dev-middleware */
+    webpack: () => webpackDevMiddleware.WebpackDevMiddleware;
+  }
+
+  interface Instance {
+    /** Subscriber function for events */
+    on(event: 'build-started', listener: (args: { compiler: webpack.Compiler }) => void): this;
+    on(event: 'build-finished', listener: (args: { compiler: webpack.Compiler, stats: webpack.Stats }) => void): this;
+    on(event: 'compiler-error' | 'compiler-warning', listener: (args: { compiler: webpack.Compiler, stats: any }) => void): this;
+    on(event: 'listening', listener: (args: { server: koa, options: NormalisedOptions }) => void): this;
+
+    /** Close webpack-serve */
+    close: () => void;
+  }
+
+  interface ListenersObject {
+    'build-started': (args: { compiler: webpack.Compiler }) => void;
+    'build-finished': (args: { compiler: webpack.Compiler, stats: webpack.Stats }) => void;
+    'compiler-error': (args: { compiler: webpack.Compiler, stats: any }) => void;
+    'compiler-warning': (args: { compiler: webpack.Compiler, stats: any }) => void;
+    'listening': (args: { server: koa, options: NormalisedOptions }) => void;
+  }
+
+  interface Options {
+    /** Addon to webpack-serve that allows access to the Koa server instance */
+    add?: (app: koa, middleware: WebpackServeMiddleware, options: Options) => void;
+    /** Copy the server URL to the clipboard when the server is started */
+    clipboard?: boolean;
+    /** Custom instance of a webpack compiler */
+    compiler?: webpack.Compiler;
+    /** Webpack configuration for creating a new webpack compiler instance */
+    config?: webpack.Configuration;
+    /** A path or array of paths where content will be served from */
+    content?: string | string[];
+    /** Options for webpack-dev-middleware */
+    dev?: webpackDevMiddleware.Options;
+    /** The host the server will listen on */
+    host?: string;
+    /** Options for webpack-hot-client */
+    hot?: webpackHotClient.Options | boolean;
+    /** Enable HTTP2 support */
+    http2?: boolean;
+    /** Configuration object for the server to use HTTPS */
+    https?: https.ServerOptions;
+    /** Level of information for webpack-serve to output */
+    logLevel?: 'trace' | 'debug' | 'info' | 'warn' | 'error' | 'silent';
+    /** Prepend timestamp to each log line */
+    logTime?: boolean;
+    /** Object of subscribers to webpack-serve bus events */
+    on?: ListenersObject;
+    /** Open the browser when started */
+    open?: WebpackServeOpen | boolean;
+    /** Port that the server listens on */
+    port?: number;
+  }
+
+  interface NormalisedOptions extends Options {
+    protocol: 'http' | 'https';
+  }
+}
diff --git a/types/webpack-serve/v1/tsconfig.json b/types/webpack-serve/v1/tsconfig.json
new file mode 100644
index 0000000000..1a76820546
--- /dev/null
+++ b/types/webpack-serve/v1/tsconfig.json
@@ -0,0 +1,26 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": [
+      "es6"
+    ],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../../",
+    "typeRoots": [
+      "../../"
+    ],
+    "paths": {
+        "webpack-serve": ["webpack-serve/v1"]
+    },
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+    "index.d.ts",
+    "webpack-serve-tests.ts"
+  ]
+}
diff --git a/types/webpack-serve/v1/tslint.json b/types/webpack-serve/v1/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpack-serve/v1/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpack-serve/v1/webpack-serve-tests.ts b/types/webpack-serve/v1/webpack-serve-tests.ts
new file mode 100644
index 0000000000..c2e2cf04af
--- /dev/null
+++ b/types/webpack-serve/v1/webpack-serve-tests.ts
@@ -0,0 +1,64 @@
+import webpack = require('webpack');
+import serve = require('webpack-serve');
+
+const config: webpack.Configuration = {
+  mode: 'development',
+  entry: ['index.js'], // when use compiler entry must be array or object
+};
+
+const serveConfig = {
+  http2: true,
+  dev: {
+    publicPath: '/',
+    logLevel: 'info'
+  },
+  host: 'localhost'
+};
+
+const compiler = webpack(config);
+
+const server = serve({
+  compiler,
+  ...serveConfig
+});
+
+server
+  .then((server) => {
+    server.on('listening', () => {
+      server.close();
+    });
+  });
+
+const config2: webpack.Configuration = {
+  ...config,
+  serve: {
+    ...serveConfig,
+    port: 8888,
+    hot: {
+      port: 8889
+    }
+  },
+};
+
+const server2 = serve({
+  config: config2
+});
+
+server2
+  .then((server) => {
+    server.on('listening', () => {
+      server.close();
+    });
+  });
+
+const server3 = serve({
+  logLevel: 'silent',
+  config: config2
+});
+
+server3
+  .then((server) => {
+    server.on('listening', () => {
+      server.close();
+    });
+  });
diff --git a/types/webpack-serve/webpack-serve-tests.ts b/types/webpack-serve/webpack-serve-tests.ts
index 2a29cec317..796d977450 100644
--- a/types/webpack-serve/webpack-serve-tests.ts
+++ b/types/webpack-serve/webpack-serve-tests.ts
@@ -1,24 +1,49 @@
 import webpack = require('webpack');
 import serve = require('webpack-serve');
 
-const compiler = webpack();
+const webpackConfig: webpack.Configuration = {
+    entry: { index: './index.js' },
+};
 
-const server = serve({
-  config: {
-    serve: {
-      http2: true,
-      dev: {
-        publicPath: '/',
-        logLevel: 'info'
-      },
-      host: 'localhost'
+const webpackCompiler = webpack(webpackConfig);
+
+const serveConfig: serve.Options = {
+    add: (app, middleware, options) => {
+        middleware.content();
+        middleware.webpack();
     },
-  },
-});
+    compiler: webpackCompiler,
+    config: webpackConfig,
+    content: './webroot',
+    clipboard: true,
+    devMiddleware: {
+        logLevel: 'warn',
+        publicPath: '/',
+    },
+    host: 'localhost',
+    hotClient: {
+        logLevel: 'warn',
+        allEntries: true,
+    },
+    http2: true,
+    https: {},
+    logLevel: 'info',
+    logTime: false,
+    on: {
+        'build-finished': args => {
+            console.log(args.stats.toString());
+        },
+    },
+    open: {
+        path: '/index.html',
+    },
+    port: 65080,
+};
 
-server
-  .then((server) => {
-    server.on('listening', () => {
-      server.close();
+const promise = serve({}, serveConfig);
+
+promise.then(result => {
+    result.on('compiler-error', args => {
+        console.log(args.stats);
     });
-  });
+});
diff --git a/types/webpack-sources/index.d.ts b/types/webpack-sources/index.d.ts
index 7eecb45c60..49ee96f8c7 100644
--- a/types/webpack-sources/index.d.ts
+++ b/types/webpack-sources/index.d.ts
@@ -154,7 +154,7 @@ export class ReplaceSource extends Source implements SourceAndMapMixin {
     _name: string;
     replacements: any[][];
 
-    constructor(source: Source, name: string);
+    constructor(source: Source, name?: string);
 
     replace(start: number, end: number, newValue: string): void;
 
diff --git a/types/webpack/index.d.ts b/types/webpack/index.d.ts
index 0339a4ebb5..aaae82db1b 100644
--- a/types/webpack/index.d.ts
+++ b/types/webpack/index.d.ts
@@ -6,12 +6,13 @@
 //                 Tommy Troy Lin <https://github.com/tommytroylin>
 //                 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>
 //                 Spencer Elliott <https://github.com/elliottsj>
 //                 Jason Cheatham <https://github.com/jason0x43>
 //                 Dennis George <https://github.com/dennispg>
 //                 Christophe Hurpeau <https://github.com/christophehurpeau>
+//                 ZSkycat <https://github.com/ZSkycat>
+//                 John Reilly <https://github.com/johnnyreilly>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
@@ -60,24 +61,22 @@ declare namespace webpack {
         /** Like resolve but for loaders. */
         resolveLoader?: ResolveLoader;
         /**
-         *  Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
-         *  The kind of the dependency depends on output.libraryTarget.
+         * Specify dependencies that shouldn’t be resolved by webpack, but should become dependencies of the resulting bundle.
+         * The kind of the dependency depends on output.libraryTarget.
          */
         externals?: ExternalsElement | ExternalsElement[];
         /**
-         * <ul>
-         *   <li>"web" Compile for usage in a browser-like environment (default)</li>
-         *   <li>"webworker" Compile as WebWorker</li>
-         *   <li>"node" Compile for usage in a node.js-like environment (use require to load chunks)</li>
-         *   <li>"async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async)</li>
-         *   <li>"node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui”) (experimental)</li>
-         *   <li>"atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.</li>
-         *   <li>"electron-renderer" Compile for Electron for renderer process, providing a target using JsonpTemplatePlugin, FunctionModulePlugin
-         *        for browser environments and NodeTargetPlugin and ExternalsPlugin for CommonJS and Electron built-in modules.<li>
-         *   <li>"electron-main" Compile for Electron for main process.</li>
-         *   <li>"atom" Alias for electron-main</li>
-         *   <li>"electron" Alias for electron-main</li>
-         * <ul>
+         * - "web" Compile for usage in a browser-like environment (default).
+         * - "webworker" Compile as WebWorker.
+         * - "node" Compile for usage in a node.js-like environment (use require to load chunks).
+         * - "async-node" Compile for usage in a node.js-like environment (use fs and vm to load chunks async).
+         * - "node-webkit" Compile for usage in webkit, uses jsonp chunk loading but also supports builtin node.js modules plus require(“nw.gui”) (experimental)
+         * - "atom" Compile for usage in electron (formerly known as atom-shell), supports require for modules necessary to run Electron.
+         * - "electron-renderer" Compile for Electron for renderer process, providing a target using JsonpTemplatePlugin, FunctionModulePlugin for browser
+         *   environments and NodeTargetPlugin and ExternalsPlugin for CommonJS and Electron built-in modules.
+         * - "electron-main" Compile for Electron for main process.
+         * - "atom" Alias for electron-main.
+         * - "electron" Alias for electron-main.
          */
         target?: 'web' | 'webworker' | 'node' | 'async-node' | 'node-webkit' | 'atom' | 'electron' | 'electron-renderer' | 'electron-main' | ((compiler?: any) => void);
         /** Report the first error as a hard error instead of tolerating it. */
@@ -91,10 +90,8 @@ declare namespace webpack {
         watchOptions?: Options.WatchOptions;
         /** Switch loaders to debug mode. */
         debug?: boolean;
-        /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
-        devServer?: any; // TODO: Type this
         /** Include polyfills or mocks for various node stuff */
-        node?: Node;
+        node?: Node | false;
         /** Set the value of require.amd and define.amd. */
         amd?: { [moduleName: string]: boolean };
         /** Used for recordsInputPath and recordsOutputPath */
@@ -120,7 +117,7 @@ declare namespace webpack {
         [name: string]: string | string[];
     }
 
-    type EntryFunc = () => (string | string[] | Promise<string | string[]>);
+    type EntryFunc = () => (string | string[] | Entry | Promise<string | string[] | Entry>);
 
     interface DevtoolModuleFilenameTemplateInfo {
         identifier: string;
@@ -135,14 +132,20 @@ declare namespace webpack {
     }
 
     interface Output {
-        /** The output directory as absolute path. */
-        path?: string;
+        /** When used in tandem with output.library and output.libraryTarget, this option allows users to insert comments within the export wrapper. */
+        auxiliaryComment?: string | AuxiliaryCommentObject;
         /** The filename of the entry chunk as relative path inside the output.path directory. */
         filename?: string;
         /** The filename of non-entry chunks as relative path inside the output.path directory. */
         chunkFilename?: string;
-        /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
-        sourceMapFilename?: string;
+        /** Number of milliseconds before chunk request expires, defaults to 120,000. */
+        chunkLoadTimeout?: number;
+        /** This option enables cross-origin loading of chunks. */
+        crossOriginLoading?: string | boolean;
+        /** The JSONP function used by webpack for asnyc loading of chunks. */
+        jsonpFunction?: string;
+        /** Allows customization of the script type webpack injects script tags into the DOM to download async chunks. */
+        jsonpScriptType?: 'text/javascript' | 'module';
         /** Filename template string of function for the sources array in a generated SourceMap. */
         devtoolModuleFilenameTemplate?: string | ((info: DevtoolModuleFilenameTemplateInfo) => string);
         /** Similar to output.devtoolModuleFilenameTemplate, but used in the case of duplicate module identifiers. */
@@ -154,43 +157,43 @@ declare namespace webpack {
          * true enables it for all modules (not recommended)
          */
         devtoolLineToLine?: boolean;
+        /** This option determines the modules namespace used with the output.devtoolModuleFilenameTemplate. */
+        devtoolNamespace?: string;
         /** The filename of the Hot Update Chunks. They are inside the output.path directory. */
         hotUpdateChunkFilename?: string;
-        /** The filename of the Hot Update Main File. It is inside the output.path directory. */
-        hotUpdateMainFilename?: string;
-        /** The output.path from the view of the Javascript / HTML page. */
-        publicPath?: string;
-        /** The JSONP function used by webpack for asnyc loading of chunks. */
-        jsonpFunction?: string;
         /** The JSONP function used by webpack for async loading of hot update chunks. */
         hotUpdateFunction?: string;
-        /** Include comments with information about the modules. */
-        pathinfo?: boolean;
+        /** The filename of the Hot Update Main File. It is inside the output.path directory. */
+        hotUpdateMainFilename?: string;
         /** If set, export the bundle as library. output.library is the name. */
         library?: string | string[];
         /**
          * Which format to export the library:
-         * <ul>
-         *   <li>"var" - Export by setting a variable: var Library = xxx (default)</li>
-         *   <li>"this" - Export by setting a property of this: this["Library"] = xxx</li>
-         *   <li>"commonjs" - Export by setting a property of exports: exports["Library"] = xxx</li>
-         *   <li>"commonjs2" - Export by setting module.exports: module.exports = xxx</li>
-         *   <li>"amd" - Export to AMD (optionally named)</li>
-         *   <li>"umd" - Export to AMD, CommonJS2 or as property in root</li>
-         *   <li>"window" - Assign to window</li>
-         *   <li>"assign" - Assign to a global variable</li>
-         *   <li>"jsonp" - Generate Webpack JSONP module<li>
-         * </ul>
+         * - "var" - Export by setting a variable: var Library = xxx (default)
+         * - "this" - Export by setting a property of this: this["Library"] = xxx
+         * - "commonjs" - Export by setting a property of exports: exports["Library"] = xxx
+         * - "commonjs2" - Export by setting module.exports: module.exports = xxx
+         * - "amd" - Export to AMD (optionally named)
+         * - "umd" - Export to AMD, CommonJS2 or as property in root
+         * - "window" - Assign to window
+         * - "assign" - Assign to a global variable
+         * - "jsonp" - Generate Webpack JSONP module
          */
-        libraryTarget?: 'var' | 'this' | 'commonjs' | 'commonjs2' | 'amd' | 'umd' | 'window' | 'assign' | 'jsonp';
+        libraryTarget?: LibraryTarget;
         /** 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;
+        /** The output directory as absolute path. */
+        path?: string;
+        /** Include comments with information about the modules. */
+        pathinfo?: boolean;
+        /** The output.path from the view of the Javascript / HTML page. */
+        publicPath?: string;
+        /** The filename of the SourceMaps for the JavaScript files. They are inside the output.path directory. */
+        sourceMapFilename?: string;
         /** Prefixes every line of the source in the bundle with this string. */
         sourcePrefix?: string;
-        /** This option enables cross-origin loading of chunks. */
-        crossOriginLoading?: string | boolean;
         /** The encoding to use when generating the hash, defaults to 'hex' */
         hashDigest?: 'hex' | 'latin1' | 'base64';
         /** The prefix length of the hash digest to use, defaults to 20. */
@@ -203,6 +206,10 @@ declare namespace webpack {
         globalObject?: string;
     }
 
+    type LibraryTarget = 'var' | 'assign' | 'this' | 'window' | 'global' | 'commonjs' | 'commonjs2' | 'amd' | 'umd' | 'jsonp';
+
+    type AuxiliaryCommentObject = { [P in LibraryTarget]: string };
+
     interface Module {
         /** A array of applied pre loaders. */
         preLoaders?: RuleSetRule[];
@@ -349,14 +356,16 @@ declare namespace webpack {
     type ExternalsFunctionElement = (context: any, request: any, callback: (error: any, result: any) => void) => any;
 
     interface Node {
-        console?: boolean;
+        console?: boolean | 'mock';
+        process?: boolean | 'mock';
         global?: boolean;
-        process?: boolean;
-        Buffer?: boolean;
-        __filename?: boolean | string;
-        __dirname?: boolean | string;
-        [nodeBuiltin: string]: boolean | string | undefined;
+        __filename?: boolean | 'mock';
+        __dirname?: boolean | 'mock';
+        Buffer?: boolean | 'mock';
+        setImmediate?: boolean | 'mock' | 'empty';
+        [nodeBuiltin: string]: boolean | 'mock' | 'empty' | undefined;
     }
+
     interface NewLoader {
         loader: string;
         options?: { [name: string]: any };
@@ -950,44 +959,17 @@ declare namespace webpack {
             childrenCounters: any;
             usedChunkIds: any;
             usedModuleIds: any;
+            fileTimestamps: Map<string, number>;
+            contextTimestamps: Map<string, number>;
+            fileDependencies: SortableSet<string>;
+            contextDependencies: SortableSet<string>;
+            missingDependencies: SortableSet<string>;
+            hash?: string;
             getStats(): Stats;
             addModule(module: CompilationModule, cacheGroup: any): any;
-            // getModule(module)
-            // findModule(identifier)
-            // waitForBuildingFinished(module, callback)
-            // buildModule(module, optional, origin, dependencies, thisCallback)
-            // processModuleDependencies(module, callback)
-            // addModuleDependencies(module, dependencies, bail, cacheGroup, recursive, callback)
             // tslint:disable-next-line:ban-types
             addEntry(context: any, entry: any, name: any, callback: Function): void;
-            // prefetch(context, dependency, callback)
-            // rebuildModule(module, thisCallback)
-            // finish()
-            // unseal()
-            // seal(callback)
-            // sortModules(modules)
-            // reportDependencyErrorsAndWarnings(module, blocks)
-            // addChunkInGroup(name, module, loc, request)
-            // addChunk(name)
-            // assignIndex(module)
-            // assignDepth(module)
-            // processDependenciesBlocksForChunkGroups(inputChunkGroups)
-            // removeReasonsOfDependencyBlock(module, block)
-            // patchChunksAfterReasonRemoval(module, chunk)
-            // removeChunkFromDependencies(block, chunk)
-            // applyModuleIds()
-            // applyChunkIds()
-            // sortItemsWithModuleIds()
-            // sortItemsWithChunkIds()
-            // summarizeDependencies()
-            // createHash()
-            // modifyHash(update)
-            // createModuleAssets()
-            // createChunkAssets()
             getPath(filename: string, data: {hash?: any, chunk?: any, filename?: string, basename?: string, query?: any}): string;
-            // createChildCompiler(name, outputOptions, plugins)
-            // checkConstraints()
-
             /**
              * @deprecated Compilation.applyPlugins is deprecated. Use new API on `.hooks` instead
              */
@@ -1053,6 +1035,33 @@ declare namespace webpack {
         invalidate(): void;
     }
 
+    interface InputFileSystem {
+        purge(): void;
+        readFile(path: string, callback: (err: Error, contents: Buffer) => void): void;
+        readFileSync(path: string): Buffer;
+        readlink(path: string, callback: (err: Error, linkString: string) => void): void;
+        readlinkSync(path: string): string;
+        stat(path: string, callback: (err: Error, stats: any) => void): void;
+        statSync(path: string): any;
+    }
+
+    interface OutputFileSystem {
+        join(...paths: string[]): string;
+        mkdir(path: string, callback: (err: Error) => void): void;
+        mkdirp(path: string, callback: (err: Error) => void): void;
+        purge(): void;
+        rmdir(path: string, callback: (err: Error) => void): void;
+        unlink(path: string, callback: (err: Error) => void): void;
+        writeFile(path: string, data: any, callback: (err: Error) => void): void;
+    }
+
+    interface SortableSet<T> extends Set<T> {
+        sortWith(sortFn: (a: T, b: T) => number): void;
+        sort(): void;
+        getFromCache(fn: (set: SortableSet<T>) => T[]): T[];
+        getFromUnorderedCache(fn: (set: SortableSet<T>) => string|number|T[]): any;
+    }
+
     class Compiler extends Tapable implements ICompiler {
         constructor();
 
@@ -1061,7 +1070,10 @@ declare namespace webpack {
 
         name: string;
         options: Configuration;
-        outputFileSystem: any;
+        inputFileSystem: InputFileSystem;
+        outputFileSystem: OutputFileSystem;
+        fileTimestamps: Map<string, number>;
+        contextTimestamps: Map<string, number>;
         run(handler: Compiler.Handler): void;
         watch(watchOptions: Compiler.WatchOptions, handler: Compiler.Handler): Compiler.Watching;
     }
@@ -1084,7 +1096,7 @@ declare namespace webpack {
     }
 
     abstract class MultiCompiler extends Tapable implements ICompiler {
-        compilers: ICompiler[];
+        compilers: Compiler[];
         run(handler: MultiCompiler.Handler): void;
         watch(watchOptions: MultiCompiler.WatchOptions, handler: MultiCompiler.Handler): MultiWatching;
     }
@@ -1108,6 +1120,10 @@ declare namespace webpack {
     }
 
     abstract class Stats {
+        compilation: compilation.Compilation;
+        hash?: string;
+        startTime?: Date;
+        endTime?: Date;
         /** Returns true if there were errors while compiling. */
         hasErrors(): boolean;
         /** Returns true if there were warnings while compiling. */
@@ -1128,10 +1144,14 @@ declare namespace webpack {
             | 'verbose';
 
         interface ToJsonOptionsObject {
+            /** fallback value for stats options when an option is not defined (has precedence over local webpack defaults) */
+            all?: boolean;
             /** Add asset Information */
             assets?: boolean;
             /** Sort assets by a field */
             assetsSort?: string;
+            /** Add built at time information */
+            builtAt?: boolean;
             /** Add information about cached (not built) modules */
             cached?: boolean;
             /** Show cached assets (setting this to `false` only shows emitted files) */
@@ -1454,6 +1474,33 @@ declare namespace webpack {
             }
         }
 
+        class AggressiveSplittingPlugin extends Plugin {
+            constructor(options?: AggressiveSplittingPlugin.Options);
+        }
+
+        namespace AggressiveSplittingPlugin {
+            interface Options {
+                /**
+                 * Size in byte.
+                 * Only chunks bigger than the specified minSize are stored in records.
+                 * This ensures the chunks fill up as your application grows,
+                 * instead of creating too many chunks for every change.
+                 *
+                 * Default: 30720
+                 */
+                minSize: 30000;
+                /**
+                 * Size in byte.
+                 * maximum size prefered for each chunk.
+                 *
+                 * Default: 51200
+                 */
+                maxSize: 50000;
+                chunkOverhead: 0;
+                entryChunkMultiplicator: 1;
+            }
+        }
+
         /** @deprecated */
         class DedupePlugin extends Plugin {
             constructor();
@@ -1624,6 +1671,14 @@ declare namespace webpack {
              */
             exec(code: string, filename: string): any;
 
+            /**
+             * Resolves the given request to a module, applies all configured loaders and calls
+             * back with the generated source, the sourceMap and the module instance (usually an
+             * instance of NormalModule). Use this function if you need to know the source code
+             * of another module to generate the result.
+             */
+            loadModule(request: string, callback: (err: Error | null, source: string, sourceMap: RawSourceMap, module: Module) => void): any;
+
             /**
              * Resolve a request like a require expression.
              */
diff --git a/types/webpack/v3/index.d.ts b/types/webpack/v3/index.d.ts
index 262b52a286..a149e285f6 100644
--- a/types/webpack/v3/index.d.ts
+++ b/types/webpack/v3/index.d.ts
@@ -6,7 +6,6 @@
 //                 Tommy Troy Lin <https://github.com/tommytroylin>
 //                 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>
 //                 Spencer Elliott <https://github.com/elliottsj>
 //                 Jason Cheatham <https://github.com/jason0x43>
@@ -86,10 +85,8 @@ declare namespace webpack {
         watchOptions?: Options.WatchOptions;
         /** Switch loaders to debug mode. */
         debug?: boolean;
-        /** Can be used to configure the behaviour of webpack-dev-server when the webpack config is passed to webpack-dev-server CLI. */
-        devServer?: any; // TODO: Type this
         /** Include polyfills or mocks for various node stuff */
-        node?: Node;
+        node?: Node | false;
         /** Set the value of require.amd and define.amd. */
         amd?: { [moduleName: string]: boolean };
         /** Used for recordsInputPath and recordsOutputPath */
diff --git a/types/webpack/webpack-tests.ts b/types/webpack/webpack-tests.ts
index b7b9ca8913..16234d422a 100644
--- a/types/webpack/webpack-tests.ts
+++ b/types/webpack/webpack-tests.ts
@@ -55,6 +55,14 @@ configuration = {
     entry: () => ['./demo', './demo2']
 };
 
+configuration = {
+    entry: () => ({
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3"
+    })
+};
+
 configuration = {
     entry: () => new Promise((resolve) => resolve('./demo'))
 };
@@ -63,6 +71,14 @@ configuration = {
     entry: () => new Promise((resolve) => resolve(['./demo', './demo2']))
 };
 
+configuration = {
+    entry: () => new Promise((resolve) => resolve({
+        p1: "./page1",
+        p2: "./page2",
+        p3: "./page3"
+    }))
+};
+
 //
 // https://webpack.github.io/docs/optimization.html
 //
@@ -158,11 +174,30 @@ declare const require: any;
 declare const path: any;
 configuration = {
     plugins: [
-        function(this: webpack.Compiler) {
-            this.plugin("done", stats => {
-                require("fs").writeFileSync(
+        function apply(this: webpack.Compiler) {
+            const prevTimestamps = new Map<string, number>();
+            const startTime = Date.now();
+
+            this.hooks.emit.tap("SomePlugin", (compilation: webpack.compilation.Compilation) => {
+                for (const filepath in compilation.fileTimestamps.keys()) {
+                    const prevTimestamp = prevTimestamps.get(filepath) || startTime;
+                    const newTimestamp = compilation.fileTimestamps.get(filepath) || Infinity;
+                    if (prevTimestamp < newTimestamp) {
+                        this.inputFileSystem.readFileSync(filepath).toString('utf-8');
+                    }
+                }
+            });
+
+            compiler.hooks.afterCompile.tap("SomePlugin", (compilation: webpack.compilation.Compilation) => {
+                ['path/to/extra/dep', 'another/extra/dep'].forEach(path => compilation.fileDependencies.add(path));
+              });
+
+            this.hooks.afterEmit.tapAsync("afterEmit", (stats, callback) => {
+                this.outputFileSystem.writeFile(
                     path.join(__dirname, "...", "stats.json"),
-                    JSON.stringify(stats.toJson()));
+                    JSON.stringify(stats.getStats().toJson()),
+                    callback
+                );
             });
         }
     ]
@@ -383,6 +418,7 @@ webpack({
     const jsonStatsWithAllOptions = stats.toJson({
         assets: true,
         assetsSort: "field",
+        builtAt: true,
         cached: true,
         children: true,
         chunks: true,
@@ -515,6 +551,7 @@ function loader(this: webpack.loader.LoaderContext, source: string | Buffer, sou
 
     this.addDependency('');
 
+    this.loadModule('path', (err: Error | null, result: string, sourceMap: RawSourceMap, module: webpack.Module) => { });
     this.resolve('context', 'request', (err: Error, result: string) => { });
 
     this.emitWarning('warning message');
diff --git a/types/webpagetest/index.d.ts b/types/webpagetest/index.d.ts
new file mode 100644
index 0000000000..7ad99b24a8
--- /dev/null
+++ b/types/webpagetest/index.d.ts
@@ -0,0 +1,407 @@
+// Type definitions for webpagetest 0.3
+// Project: https://github.com/marcelduran/webpagetest-api
+// Definitions by: Konstantin Simon Maria Möllers <https://github.com/ksm2>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+interface Response<R> {
+  data: R;
+  statusCode: number;
+  statusText: string;
+}
+
+type Callback<R> = (err: Error | undefined, data: R | undefined, info: any) => void;
+
+type TestScript = TestScriptCommand[];
+type TestScriptCommand = string | { [command: string]: string | number | string[] | number[] };
+
+interface Options {
+  /** if true, method does not make an actual request to the API Server but rather returns an object with url which contains the actual URL to make the GET request to WebPageTest API Server */
+  dryRun?: boolean;
+  /** if specified, overrides the WebPageTest server informed in the constructor only for that method call */
+  server?: string;
+}
+
+interface KeyOptions {
+  /** API key (if assigned). Contact the WebPageTest server administrator for a key if required */
+  key?: string;
+}
+
+interface RequestOptions {
+  /** echo request ID, useful to track asynchronous requests */
+  requestId?: string;
+}
+
+interface TestOptions {
+  /** location to test from */
+  location?: string;
+  /** connectivity profile -- requires location to be specified -- (Cable|DSL|FIOS|Dial|3G|3GFast|Native|custom) [Cable] */
+  connectivity?: string;
+  /** number of test runs [1] */
+  runs?: number;
+  /** skip the Repeat View test */
+  firstViewOnly?: boolean;
+  /** capture video */
+  video?: boolean;
+  /** keep the test hidden from the test log */
+  private?: boolean;
+  /** label for the test */
+  label?: string;
+  /** stop test at document complete. typically, tests run until all activity stops */
+  stopAtDocumentComplete?: boolean;
+  /** disable JavaScript (IE, Chrome, Firefox) */
+  disableJavaScript?: boolean;
+  /** clear SSL certificate caches */
+  clearCerts?: boolean;
+  /** ignore SSL certificate errors, e.g. name mismatch, self-signed certificates, etc */
+  ignoreSSL?: boolean;
+  /** forces all pages to load in standards mode (IE only) */
+  disableCompatibilityView?: boolean;
+  /** capture network packet trace (tcpdump) */
+  tcpDump?: boolean;
+  /** save response bodies for text resources */
+  saveResponseBodies?: boolean;
+  /** do not add PTST to the original browser User Agent string */
+  keepOriginalUserAgent?: boolean;
+  /** DOM element to record for sub-measurement */
+  domElement?: string;
+  /** minimum test duration in seconds */
+  minimumDuration?: number;
+  /** run the test on a specific PC (name must match exactly or the test will not run) */
+  tester?: string;
+  /** (experimental) emulate mobile browser: Chrome mobile user agent, 640x960 screen, 2x scaling and fixed viewport (Chrome only) */
+  emulateMobile?: boolean;
+  /** capture Developer Tools Timeline (Chrome only) */
+  timeline?: boolean;
+  /** set between 1-5 to include the JS call stack. must be used in conjunction with timeline (increases overhead) (Chrome only) */
+  timelineCallStack?: boolean;
+  /** capture chrome trace (about://tracing) (Chrome only) */
+  chromeTrace?: boolean;
+  /** capture Network Log (Chrome only) */
+  netLog?: boolean;
+  /** enable data reduction on Chrome 34+ Android (Chrome only) */
+  dataReduction?: boolean;
+  /** custom user agent string (Chrome only) */
+  userAgent?: string;
+  /** use a list of custom command line switches (Chrome only) */
+  commandLine?: string;
+  /** username for authenticating tests (http authentication) */
+  login?: string;
+  /** password for authenticating tests (http authentication) */
+  password?: string;
+  /** discard script and http headers in the result */
+  sensitive?: boolean;
+  /** disable saving of the http headers (as well as browser status messages and CPU utilization) */
+  disableHTTPHeaders?: boolean;
+  /** space-delimited list of urls to block (substring match) */
+  block?: string;
+  /** space-delimited list of domains to simulate failure by re-routing to blackhole.webpagetest.org to silently drop all requests */
+  spof?: string;
+  /** execute arbitrary JavaScript at the end of a test to collect custom metrics */
+  customMetrics?: string;
+  /** type of authentication: 0 = Basic, 1 = SNS [0] */
+  authenticationType?: number;
+  /** e-mail address to notify with the test results */
+  notifyEmail?: string;
+  /** URL to ping when the test is complete (the test ID will be passed as an "id" parameter) */
+  pingback?: string;
+  /** download bandwidth in Kbps (used when specifying a custom connectivity profile) */
+  bandwidthDown?: string;
+  /** upload bandwidth in Kbps (used when specifying a custom connectivity profile) */
+  bandwidthUp?: string;
+  /** first-hop Round Trip Time in ms (used when specifying a custom connectivity profile) */
+  latency?: string;
+  /** packet loss rate - percent of packets to drop (used when specifying a custom connectivity profile) */
+  packetLossRate?: number;
+  /** disable optimization checks (for faster testing) */
+  disableOptimization?: boolean;
+  /** disable screen shot capturing */
+  disableScreenshot?: boolean;
+  /** save a full-resolution version of the fully loaded screen shot as a PNG */
+  fullResolutionScreenshot?: boolean;
+  /** jpeg compression level (30-100) for the screen shots and video capture */
+  jpegQuality?: number;
+  /** store the video from the median run when capturing video is enabled */
+  medianVideo?: boolean;
+  /** save the content of only the base HTML response */
+  htmlBody?: boolean;
+  /** test name to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb) */
+  tsView?: string;
+  /** configs to use when submitting results to tsviewdb (for private instances that have integrated with tsviewdb) */
+  tsViewConfigs?: string;
+  /** string to hash test to a specific test agent. tester will be picked by index among available testers */
+  affinity?: string;
+  /** change test priority (0-9) [enforced by API key, otherwise 5] */
+  priority?: number;
+  /** block ads defined by http://adblockplus.org */
+  blockAds?: boolean;
+  /** capture video continuously (unstable/experimental, may cause tests to fail) */
+  continuousVideoCapture?: boolean;
+  /** force SPDY version 3 (Chrome only) */
+  forceSpdy3?: boolean;
+  /** force software rendering, disable GPU acceleration (Chrome only) */
+  forceSoftwareRendering?: boolean;
+  /** poll for results after test is scheduled at every seconds [5] */
+  pollResults?: number;
+  /** wait for test results informed by agent once complete listening on : [hostname:first port available above 8000] */
+  waitResults?: string;
+  /** timeout for polling and waiting results [no timeout] */
+  timeout?: number;
+  /** perform lighthouse test (Chrome only, Linux agent only) */
+  lighthouse?: boolean;
+}
+
+interface ResultsOptions {
+  /** include the breakdown of requests and bytes by mime type */
+  breakDown?: boolean;
+  /** include the breakdown of requests and bytes by domain */
+  domains?: boolean;
+  /** include the PageSpeed score in the response (may be slower) */
+  pageSpeed?: boolean;
+  /** include the request data in the response (slower and results in much larger responses) */
+  requests?: boolean;
+  /** set the metric used to calculate median for multiple runs tests (default: loadTime) */
+  medianMetric?: string;
+  /** set the specs for performance test suite */
+  specs?: string;
+  /** set performance test suite reporter output: [dot]|spec|tap|xunit|list|progress|min|nyan|landing|json|doc|markdown|teamcity */
+  reporter?: string;
+}
+
+interface RunOptions {
+  /** the test run number for multiple runs tests (default: 1, first test) */
+  run?: number;
+  /** if true returns the repeat view (cached) data */
+  repeatView?: boolean;
+}
+
+interface ImageOptions {
+  /** returns the thumbnail of actual image */
+  thumbnail?: boolean;
+  /** returns the base64 string representation (inline) of actual image */
+  dataURI?: boolean;
+}
+
+interface ScreenshotOptions {
+  /** returns the full resolution screenshot in PNG format if available */
+  fullResolution?: boolean;
+  /** returns the page screenshot at the Start Render point (i.e.: when something was first displayed on screen) */
+  startRender?: boolean;
+  /** returns the page screenshot at the Document Complete point (i.e.: when window.onload was fired) */
+  documentComplete?: boolean;
+}
+
+interface WaterfallOptions {
+  /** set the chart type: waterfall or connection [waterfall] */
+  chartType?: string;
+  /** set chart coloring by MIME type [false] */
+  colorByMime?: boolean;
+  /** chart image width in px (300-2000) [930] */
+  chartWidth?: number;
+  /** set maximum time in seconds [automatic] */
+  maxTime?: number;
+  /** filter requests (e.g.:1,2,3,4-9,8) [all] */
+  requests?: string;
+  /** hide CPU utilization [false] */
+  noCPU?: boolean;
+  /** hide bandwidth utilization [false] */
+  noBandwidth?: boolean;
+  /** hide ellipsis (...) for missing items [false] */
+  noEllipsis?: boolean;
+  /** hide labels for requests (URL) [false] */
+  noLabels?: boolean;
+}
+
+interface VideoOptions {
+  /** frame comparison end point: [visual]=visually complete | all=last change | doc=document complete | full=fully loaded */
+  comparisonEndPoint?: string;
+}
+
+interface ResponseOptions {
+  /** the request number [1] */
+  request?: number;
+}
+
+interface ListenOptions {
+  /** private key file path to use for SSL */
+  key?: string;
+  /** public x509 certificate file path to use for SSL */
+  cert?: string;
+}
+
+declare namespace WebPageTest {
+  interface Location {
+    id: string;
+    Label: string;
+    location: string;
+    Browsers: string;
+    labelShort: string;
+    PendingTests: { [id: string]: number };
+  }
+
+  interface TestStatus {
+    statusCode: number;
+    statusText: string;
+    id: string;
+    testInfo: TestInfo;
+    testId: string;
+    runs: number;
+    fvonly: number;
+    remote: false;
+    testsExpected: number;
+    location: string;
+    startTime: string;
+    elapsed: number;
+    completeTime: string;
+    testsCompleted: number;
+    fvRunsCompleted: number;
+    rvRunsCompleted: number;
+  }
+
+  interface TestInfo {
+    url: string;
+    runs: number;
+    fvonly: number;
+    web10: number;
+    ignoreSSL: number;
+    video: string;
+    label: string;
+    priority: number;
+    block: string;
+    location: string;
+    browser: string;
+    connectivity: string;
+    bwIn: number;
+    bwOut: number;
+    latency: number;
+    plr: string;
+    tcpdump: number;
+    timeline: number;
+    trace: number;
+    bodies: number;
+    netlog: number;
+    standards: number;
+    noscript: number;
+    pngss: number;
+    iq: number;
+    keepua: number;
+    mobile: number;
+    scripted: number;
+  }
+
+  interface TestResult {
+    id: string;
+    url: string;
+    summary: string;
+    testUrl: string;
+    location: string;
+    from: string;
+    connectivity: string;
+    bwDown: number;
+    bwUp: number;
+    latency: number;
+    plr: string;
+    mobile: number;
+    completed: number;
+    tester: string;
+    testerDNS: string;
+    runs: { [key: string]: TestRun };
+    fvonly: boolean;
+    successfulFVRuns: number;
+    average: TestRun;
+    standardDeviation: TestRun;
+    median: TestRun;
+  }
+
+  interface TestRun {
+    firstView: any;
+  }
+}
+
+declare class WebPageTest {
+  static defaultListenPort: number;
+  static defaultServer: string;
+  static defaultWaitResultsPort: number;
+  static version: string;
+
+  /**
+   * @param server The host of the WebPagetest server. Defaults to 'www.webpagetest.org'.
+   * @param key The API Key used for the instance. Can be left empty for public API.
+   */
+  constructor(server?: string, key?: string);
+
+  static scriptToString(script: TestScript): string;
+
+  getTestStatus(id: string, options: Options & RequestOptions, callback: Callback<Response<WebPageTest.TestStatus>>): void;
+  getTestStatus(id: string, callback: Callback<Response<WebPageTest.TestStatus>>): void;
+
+  getTestResults(id: string, options: Options & RequestOptions & ResultsOptions, callback: Callback<Response<WebPageTest.TestResult>>): void;
+  getTestResults(id: string, callback: Callback<Response<WebPageTest.TestResult>>): void;
+
+  getLocations(options: Options & RequestOptions, callback: Callback<{ response: Response<{ location: WebPageTest.Location[] }> }>): void;
+  getLocations(callback: Callback<{ response: Response<{ location: WebPageTest.Location[] }> }>): void;
+
+  getTesters(options: Options & RequestOptions, callback: Callback<any>): void;
+  getTesters(callback: Callback<any>): void;
+
+  runTest(url_or_script: string, options: Options & TestOptions & KeyOptions & ResultsOptions, callback: Callback<any>): void;
+  runTest(url_or_script: string, callback: Callback<any>): void;
+
+  cancelTest(id: string, options: Options & KeyOptions, callback: Callback<any>): void;
+  cancelTest(id: string, callback: Callback<any>): void;
+
+  getHARData(id: string, options: Options, callback: Callback<any>): void;
+  getHARData(id: string, callback: Callback<any>): void;
+
+  getPageSpeedData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getPageSpeedData(id: string, callback: Callback<any>): void;
+
+  getUtilizationData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getUtilizationData(id: string, callback: Callback<any>): void;
+
+  getRequestData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getRequestData(id: string, callback: Callback<any>): void;
+
+  getTimelineData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getTimelineData(id: string, callback: Callback<any>): void;
+
+  getNetLogData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getNetLogData(id: string, callback: Callback<any>): void;
+
+  getChromeTraceData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getChromeTraceData(id: string, callback: Callback<any>): void;
+
+  getConsoleLogData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getConsoleLogData(id: string, callback: Callback<any>): void;
+
+  getTestInfo(id: string, options: Options, callback: Callback<any>): void;
+  getTestInfo(id: string, callback: Callback<any>): void;
+
+  getHistory(days: number, options: Options, callback: Callback<any>): void;
+  getHistory(days: number, callback: Callback<any>): void;
+
+  getGoogleCsiData(id: string, options: Options & RunOptions, callback: Callback<any>): void;
+  getGoogleCsiData(id: string, callback: Callback<any>): void;
+
+  getResponseBody(id: string, options: Options & RunOptions & ResponseOptions, callback: Callback<any>): void;
+  getResponseBody(id: string, callback: Callback<any>): void;
+
+  getWaterfallImage(id: string, options: Options & RunOptions & ImageOptions & WaterfallOptions, callback: Callback<any>): void;
+  getWaterfallImage(id: string, callback: Callback<any>): void;
+
+  getScreenshotImage(id: string, options: Options & RunOptions & ImageOptions & ScreenshotOptions, callback: Callback<any>): void;
+  getScreenshotImage(id: string, callback: Callback<any>): void;
+
+  createVideo(tests: string, options: Options & VideoOptions, callback: Callback<any>): void;
+  createVideo(tests: string, callback: Callback<any>): void;
+
+  getEmbedVideoPlayer(id: string, options: Options, callback: Callback<any>): void;
+  getEmbedVideoPlayer(id: string, callback: Callback<any>): void;
+
+  listen(port: number, options: Options & ListenOptions, callback: Callback<any>): void;
+  listen(port: number, callback: Callback<any>): void;
+
+  scriptToString(script: TestScript): string;
+}
+
+export = WebPageTest;
diff --git a/types/webspeechapi/tsconfig.json b/types/webpagetest/tsconfig.json
similarity index 86%
rename from types/webspeechapi/tsconfig.json
rename to types/webpagetest/tsconfig.json
index f1a86255f3..304004900a 100644
--- a/types/webspeechapi/tsconfig.json
+++ b/types/webpagetest/tsconfig.json
@@ -7,7 +7,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -19,6 +19,6 @@
     },
     "files": [
         "index.d.ts",
-        "webspeechapi-tests.ts"
+        "webpagetest-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/webpagetest/tslint.json b/types/webpagetest/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webpagetest/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webpagetest/webpagetest-tests.ts b/types/webpagetest/webpagetest-tests.ts
new file mode 100644
index 0000000000..09eb31df3c
--- /dev/null
+++ b/types/webpagetest/webpagetest-tests.ts
@@ -0,0 +1,97 @@
+import WebPageTest = require('webpagetest');
+
+/* Examples from NPM */
+
+// 1. Instantiating
+const wpt = new WebPageTest('my-wpt.foo.com'); // default: www.webpagetest.org
+const wptPublic = new WebPageTest('www.webpagetest.org', 'MY_API_KEY');
+
+// 2. Get available locations
+wpt.getLocations((err, data) => {
+  console.log(err || data);
+});
+
+// 3. Run test on https://twitter.com/marcelduran from San Jose on IE9
+wpt.runTest('https://twitter.com/marcelduran', {location: 'SanJose_IE9'}, (err, data) => {
+  console.log(err || data);
+});
+
+// 4. Check current test status
+wpt.getTestStatus('121025_PT_N8K', (err, data) => {
+  console.log(err || data);
+});
+
+// 5. Get test results
+wpt.getTestResults('121025_PT_N8K', (err, data) => {
+  console.log(err || data);
+});
+
+// 6. Get test waterfall thumbnail from repeat view as data URI
+wpt.getWaterfallImage('121025_PT_N8K', {
+  thumbnail: true,
+  repeatView: true,
+  dataURI: true
+}, (err, data, info) => {
+  console.log(err || data, info);
+});
+
+// Run test on https://twitter.com/marcelduran and poll results every 5 seconds timing out in 60 seconds
+wpt.runTest('https://twitter.com/marcelduran', {pollResults: 5, timeout: 60}, (err, data) => {
+  console.log(err || data);
+});
+
+// Or run test on https://twitter.com/marcelduran and wait results listening on localhost* port 8000**
+wpt.runTest('https://twitter.com/marcelduran', {waitResults: 'localhost:8000'}, (err, data) => {
+  console.log(err || data);
+});
+
+/* Working examples */
+
+wpt.getLocations((err, data) => {
+  if (err) {
+    data; // $ExpectType { response: Response<{ location: Location[]; }>; } | undefined
+    return;
+  }
+
+  if (data) {
+    const {response} = data; // $ExpectType { response: Response<{ location: Location[]; }>; }
+    const {data: locationData} = response; // $ExpectedType Response<{ location: Location[]; }>
+    const {location: locations} = locationData; // $ExpectedType { location: Location[]; }
+    locations; // $ExpectType Location[]
+  }
+});
+
+wpt.getTestStatus('180208_PA_28V', (err, data) => {
+  if (data) {
+    const {data: testStatus} = data; // $ExpectType Response<TestStatus>
+    const {testInfo} = testStatus; // $ExpectType TestStatus
+    testStatus.testId; // $ExpectType string
+    testInfo.url; // $ExpectType string
+  }
+});
+
+wpt.getTestResults('180208_PA_28V', (err, data) => {
+  if (data) {
+    const {data: testResult} = data; // $ExpectType Response<TestResult>
+    const {runs, id, url, median} = testResult; // $ExpectType TestResult
+    id; // $ExpectType string
+    url; // $ExpectType string
+    runs['1']; // $ExpectType TestRun
+    median; // $ExpectType TestRun
+  }
+});
+
+console.log(WebPageTest.scriptToString([
+  'helloWorld',
+  { test: 12 },
+  { foo: 'bar' },
+  { array: [21, 42, 1337] },
+  { strings: ['hello', 'world'] }
+]));
+console.log(wpt.scriptToString([
+  'helloWorld',
+  { test: 12 },
+  { foo: 'bar' },
+  { array: [21, 42, 1337] },
+  { strings: ['hello', 'world'] }
+]));
diff --git a/types/webscopeio__react-textarea-autocomplete/index.d.ts b/types/webscopeio__react-textarea-autocomplete/index.d.ts
new file mode 100644
index 0000000000..10b582c366
--- /dev/null
+++ b/types/webscopeio__react-textarea-autocomplete/index.d.ts
@@ -0,0 +1,191 @@
+// Type definitions for webscopeio__react-textarea-autocomplete 2.3
+// Project: https://github.com/webscopeio/react-textarea-autocomplete
+// Definitions by: Michal Zochowski <https://github.com/michauzo>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+export default ReactTextareaAutocomplete;
+export as namespace ReactTextareaAutocomplete;
+
+import * as React from "react";
+
+export type CaretPositionType = 'start' | 'end' | 'next' | number;
+
+export interface TextToReplaceType {
+    text: string;
+    caretPosition: CaretPositionType;
+    key?: string;
+}
+
+export type DataProviderType<TItem> = (token: string) =>
+    | Promise<TItem[]>
+    | TItem[];
+
+export interface ItemComponentProps<TItem> {
+    selected: boolean;
+    entity: TItem;
+}
+
+/**
+ * Textarea Types
+ */
+export interface SettingType<TItem> {
+    /**
+     * The component for rendering the item in suggestion list. It has selected and entity props provided by React Textarea Autocomplete.
+     */
+    component: React.SFC<ItemComponentProps<TItem>>;
+    /**
+     * Called after each keystroke to get data what the suggestion list should display (array or promise resolving array).
+     */
+    dataProvider: DataProviderType<TItem>;
+    /**
+     * Set this to true if you want to provide autocomplete for words (tokens) containing whitespace.
+     * @default false
+     */
+    allowWhitespace?: boolean;
+    /**
+     * Show autocomplete only if it's preceded by whitespace. Cannot be combined with allowWhitespace.
+     * @default false
+     */
+    afterWhitespace?: boolean;
+    /**
+     * (Optional for string based item. If the item is an object this method is required) This function defines text
+     * which will be placed into textarea after the user makes a selection.
+     *
+     * You can also specify the behavior of caret if you return object {text: "item", caretPosition: "start"} the caret
+     * will be before the word once the user confirms his selection. Other possible value are "next", "end" and number,
+     * which is absolute number in contex of textarea (0 is equal position before the first char). Defaults to "next"
+     * which is space after the injected word.
+     *
+     * The default behavior for string based item is a string: <TRIGGER><ITEM><TRIGGER>). This method should always
+     * return a unique string, otherwise, you have to use object notation and specify your own key or return object
+     * from dataProvider with key property.
+     */
+    output?: (item: TItem, trigger?: string) => TextToReplaceType | string;
+}
+
+export interface TriggerType<TItem> {
+    [key: string]: SettingType<TItem>;
+}
+
+type PickedAttributes = "onChange" | "onSelect" | "onBlur" | "value";
+
+export interface TextareaProps<TItem> extends Pick<React.InputHTMLAttributes<HTMLTextAreaElement>, PickedAttributes> {
+    /**
+     * Define triggers and their corresponding behavior.
+     */
+    trigger: TriggerType<TItem>;
+    /**
+     * Gets data props which is already fetched (and displayed) suggestion.
+     */
+    loadingComponent: React.SFC;
+    /**
+     * Listener called every time the textarea's caret position is changed. The listener is called with one attribute - caret position denoted by an integer number.
+     */
+    onCaretPositionChange?: (pos: number) => void;
+    /**
+     * Allows you to get React ref of the underlying textarea.
+     */
+    innerRef?: (ref: HTMLTextAreaElement) => void;
+    /**
+     * With default implementation it will scroll the dropdown every time when the item gets out of the view.
+     * @default true
+     */
+    scrollToItem?: boolean | ((container: HTMLDivElement, item: HTMLDivElement) => void);
+    /**
+     * 	When it's true autocomplete will close when use click outside.
+     * @default false
+     */
+    closeOnClickOutside?: boolean;
+    /**
+     * When it's true the textarea will move along with a caret as a user continues to type.
+     * @default false
+     */
+    movePopupAsYouType?: boolean;
+    /**
+     * Number of characters that user should type for trigger a suggestion.
+     * @default 1
+     */
+    minChar?: number;
+    /**
+     * Styles of textarea
+     */
+    style?: React.CSSProperties;
+    /**
+     * Styles of list's wrapper.
+     */
+    listStyle?: React.CSSProperties;
+    /**
+     * Styles of item's wrapper.
+     */
+    itemStyle?: React.CSSProperties;
+    /**
+     * Styles of textarea's container.
+     */
+    containerStyle?: React.CSSProperties;
+    /**
+     * Styles of loader's wrapper.
+     */
+    loaderStyle?: React.CSSProperties;
+    /**
+     * Styles of dropdown's wrapper.
+     */
+    dropdownStyle?: React.CSSProperties;
+    /**
+     * ClassNames of the textarea.
+     */
+    className?: string;
+    /**
+     * ClassNames of the textarea's container.
+     */
+    containerClassName?: string;
+    /**
+     * 	ClassNames of list's wrapper.
+     */
+    listClassName?: string;
+    /**
+     * ClassNames of item's wrapper.
+     */
+    itemClassName?: string;
+    /**
+     * ClassNames of loader's wrapper.
+     */
+    loaderClassName?: string;
+    /**
+     * 	ClassNames of dropdown's wrapper.
+     */
+    dropdownClassName?: string;
+}
+
+export interface TextareaState<TItem> {
+    currentTrigger?: string;
+    top?: number;
+    left?: number;
+    actualToken: string;
+    data?: TItem[];
+    value: string;
+    dataLoading: boolean;
+    selectionEnd: number;
+    selectionStart: number;
+    component?: React.SFC<ItemComponentProps<TItem>>;
+}
+
+declare class ReactTextareaAutocomplete<TItem extends string | object> extends React.Component<TextareaProps<TItem>, TextareaState<TItem>> {
+    /**
+     * Gets the current caret position in the textarea.
+     */
+    getCaretPosition(): number;
+    /**
+     * Sets the caret position to the integer value passed as the argument.
+     * @param position caret position to set.
+     */
+    setCaretPosition(position: number): void;
+    /**
+     * Returns selectionStart and selectionEnd of the textarea.
+     */
+    getSelectionPosition(): { selectionStart: number, selectionEnd: number };
+    /**
+     * 	Returns currently selected word.
+     */
+    getSelectedText(): string | undefined;
+}
diff --git a/types/webscopeio__react-textarea-autocomplete/tsconfig.json b/types/webscopeio__react-textarea-autocomplete/tsconfig.json
new file mode 100644
index 0000000000..e6049c58c6
--- /dev/null
+++ b/types/webscopeio__react-textarea-autocomplete/tsconfig.json
@@ -0,0 +1,28 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "jsx": "react",
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "paths": {
+            "@webscopeio/react-textarea-autocomplete": ["webscopeio__react-textarea-autocomplete"]
+        }
+    },
+    "files": [
+        "index.d.ts",
+        "webscopeio__react-textarea-autocomplete-tests.tsx"
+    ]
+}
\ No newline at end of file
diff --git a/types/webscopeio__react-textarea-autocomplete/tslint.json b/types/webscopeio__react-textarea-autocomplete/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/webscopeio__react-textarea-autocomplete/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/webscopeio__react-textarea-autocomplete/webscopeio__react-textarea-autocomplete-tests.tsx b/types/webscopeio__react-textarea-autocomplete/webscopeio__react-textarea-autocomplete-tests.tsx
new file mode 100644
index 0000000000..ada7fee098
--- /dev/null
+++ b/types/webscopeio__react-textarea-autocomplete/webscopeio__react-textarea-autocomplete-tests.tsx
@@ -0,0 +1,72 @@
+import ReactTextareaAutocomplete from "webscopeio__react-textarea-autocomplete";
+import * as React from "react";
+
+const Loading: React.SFC = () => {
+    return <div>Loading</div>;
+};
+
+interface ItemProps {
+    selected: boolean;
+    entity: string;
+}
+
+const Item: React.SFC<ItemProps> = (props: ItemProps) => {
+    return <div className={`item${props.selected ? " selected" : ""}`}>props</div>;
+};
+
+class Autocomplete extends React.Component {
+    private rta: ReactTextareaAutocomplete<string> | null;
+    private textarea: HTMLTextAreaElement;
+
+    private readonly names = [ "abc", "def", "ghi" ];
+
+    render() {
+        return <ReactTextareaAutocomplete<string>
+            className="my-textarea"
+            loadingComponent={Loading}
+            style={{
+                fontSize: "18px",
+                lineHeight: "20px",
+                padding: 5
+            }}
+            ref={(rta) => { this.rta = rta; }}
+            innerRef={(textarea) => { this.textarea = textarea; }}
+            containerStyle={{
+                marginTop: 20,
+                width: 400,
+                height: 100,
+                margin: "20px auto"
+            }}
+            minChar={0}
+            trigger={{
+                ":": {
+                    dataProvider: token => {
+                        return this.names
+                            .filter((name) => name.startsWith(token));
+                    },
+                    component: Item,
+                    output: (item, token) => item,
+                    allowWhitespace: true,
+                    afterWhitespace: false
+                }
+            }}
+            value="aaa"
+            closeOnClickOutside={false}
+            movePopupAsYouType={false}
+            onBlur={(evt: React.FocusEvent<HTMLTextAreaElement>) => { console.log(evt); }}
+            onSelect={(evt: React.SyntheticEvent<HTMLTextAreaElement>) => { console.log(evt); }}
+            onChange={(evt: React.ChangeEvent<HTMLTextAreaElement>) => { console.log(evt); }}
+            scrollToItem={false}
+            onCaretPositionChange={(pos: number) => { console.log(pos); }}
+            containerClassName="container"
+            dropdownClassName="dropdown"
+            itemClassName="item"
+            listClassName="list"
+            loaderClassName="loader"
+            dropdownStyle={{ width: "100%", margin: "14px"}}
+            itemStyle={{ width: "100%", margin: "14px"}}
+            listStyle={{ width: "100%", margin: "14px"}}
+            loaderStyle={{ width: "100%", margin: "14px"}}
+        />;
+    }
+}
diff --git a/types/websequencediagrams/index.d.ts b/types/websequencediagrams/index.d.ts
new file mode 100644
index 0000000000..59dc8cebb6
--- /dev/null
+++ b/types/websequencediagrams/index.d.ts
@@ -0,0 +1,17 @@
+// Type definitions for websequencediagrams 0.1
+// Project: https://github.com/hildjj/node-websequencediagrams
+// Definitions by: Florian Keller <https://github.com/ffflorian>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node" />
+
+export type OutputType = 'png' | 'svg' | 'pdf';
+export type Style = 'default' | 'earth' | 'modern-blue' | 'mscgen' | 'omegapple' | 'qsd' | 'rose' | 'roundgreen' | 'napkin' | 'magazine' | 'vs2010' | 'patent';
+export type diagramCallback = (error: Error | null, buffer?: Buffer, mimeType?: string) => void;
+export type diagramUrlCallback = (error: Error | null, url?: string) => void;
+
+export const root: string;
+export const styles: Style[];
+
+export function diagram(description: string | Buffer, style: Style | null, format: OutputType | null, callback: diagramCallback): void;
+export function diagram_url(description: string | Buffer, style: Style | null, format: OutputType | null, callback: diagramUrlCallback): void;
diff --git a/types/websequencediagrams/tsconfig.json b/types/websequencediagrams/tsconfig.json
new file mode 100644
index 0000000000..d5a406dfe7
--- /dev/null
+++ b/types/websequencediagrams/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",
+        "websequencediagrams-tests.ts"
+    ]
+}
diff --git a/types/websequencediagrams/tslint.json b/types/websequencediagrams/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/websequencediagrams/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/websequencediagrams/websequencediagrams-tests.ts b/types/websequencediagrams/websequencediagrams-tests.ts
new file mode 100644
index 0000000000..34caa4dc19
--- /dev/null
+++ b/types/websequencediagrams/websequencediagrams-tests.ts
@@ -0,0 +1,18 @@
+import * as wsd from 'websequencediagrams';
+
+wsd.diagram('Alice->Bob: message', 'modern-blue', 'png', (error, buffer, mimeType) => {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('Received MIME type:', mimeType);
+    console.log('Received Buffer:', buffer);
+  }
+});
+
+wsd.diagram_url('Alice->Bob: message', 'modern-blue', 'png', (error, url) => {
+  if (error) {
+    console.error(error);
+  } else {
+    console.log('Received URL:', url);
+  }
+});
diff --git a/types/website-scraper/index.d.ts b/types/website-scraper/index.d.ts
index 1e16c80191..07185a1102 100644
--- a/types/website-scraper/index.d.ts
+++ b/types/website-scraper/index.d.ts
@@ -1,9 +1,11 @@
 // Type definitions for website-scraper v1.2.x
 // Project: https://github.com/s0ph1e/node-website-scraper
-// Definitions by: Christian Rackerseder <https://www.echooff.de>
+// Definitions by: Christian Rackerseder <https://github.com/screendriver>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 // TypeScript Version: 2.3
 
+/// <reference types="request" />
+
 import * as request from 'request';
 
 declare namespace websiteScraper {
diff --git a/types/websocket-async/index.d.ts b/types/websocket-async/index.d.ts
new file mode 100644
index 0000000000..36bb12e08e
--- /dev/null
+++ b/types/websocket-async/index.d.ts
@@ -0,0 +1,87 @@
+// Type definitions for websocket-async 1.3
+// Project: https://github.com/jcao219/websocket-async
+// Definitions by: Ben O'Sullivan <https://github.com/bigbeno37>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// Typescript Version: 2.7
+
+/**
+ * An asynchronous WebSocket client.
+ * @example
+ * // Set up connection.
+ * const webSocketClient = new WebSocketClient;
+ * // Connect.
+ * await webSocketClient.connect('ws://www.example.com/');
+ * // Send is synchronous.
+ * webSocketClient.send('Hello!');
+ * // Receive is asynchronous.
+ * console.log(await webSocketClient.receive());
+ * // See if there are any more messages received.
+ * if (webSocketClient.dataAvailable !== 0) {
+ *     console.log(await webSocketClient.receive());
+ * }
+ * // Close the connection.
+ * await webSocketClient.disconnect();
+ */
+declare class WebSocketClient {
+    _socket: WebSocket;
+
+    _closeEvent: CloseEvent | null;
+
+    _receiveCallbacksQueue: Array<{ resolve: (data: any) => void, reject: (reason: any) => void }>;
+
+    _receiveDataQueue: any[];
+
+    constructor();
+
+    /**
+     * Whether a connection is currently open.
+     * @returns true if the connection is open.
+     */
+    connected(): boolean;
+
+    /**
+     * The number of messages available to receive.
+     * @returns The number of queued messages that can be retrieved with {@link #receive}
+     */
+    dataAvailable(): number;
+
+    /**
+     * Sets up a WebSocket connection to specified url. Resolves when the
+     * connection is established. Can be called again to reconnect to any url.
+     */
+    connect(url: string, protocols?: string): Promise<void>;
+
+    /**
+     * Send data through the websocket.
+     * Must be connected. See {@link #connected}.
+     */
+    send(data: any): void;
+
+    /**
+     * Asynchronously receive data from the websocket.
+     * Resolves immediately if there is buffered, unreceived data.
+     * Otherwise, resolves with the next rececived message,
+     * or rejects if disconnected.
+     * @returns A promise that resolves with the data received.
+     */
+    receive(): Promise<any>;
+
+    /**
+     * Initiates the close handshake if there is an active connection.
+     * Returns a promise that will never reject.
+     * The promise resolves once the WebSocket connection is closed.
+     */
+    disconnect(code?: number, reason?: string): Promise<CloseEvent | null>;
+
+    /**
+     * Sets up the event listeners, which do the bulk of the work.
+     */
+    private _setupListenersOnConnect(): Promise<void>;
+
+    /**
+     * Resets the receive arrays and close events, called in the constructor
+     */
+    private _reset(): void;
+}
+
+export default WebSocketClient;
diff --git a/types/websocket-async/tsconfig.json b/types/websocket-async/tsconfig.json
new file mode 100644
index 0000000000..78b5de7ea6
--- /dev/null
+++ b/types/websocket-async/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es5",
+            "es2015.promise",
+            "webworker"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true,
+        "esModuleInterop": true,
+        "strictFunctionTypes": true
+    },
+    "files": [
+        "index.d.ts",
+        "websocket-async-tests.ts"
+    ]
+}
diff --git a/types/websocket-async/tslint.json b/types/websocket-async/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/websocket-async/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/websocket-async/websocket-async-tests.ts b/types/websocket-async/websocket-async-tests.ts
new file mode 100644
index 0000000000..f32192be95
--- /dev/null
+++ b/types/websocket-async/websocket-async-tests.ts
@@ -0,0 +1,4 @@
+import WebSocketClient from 'websocket-async';
+
+const connection = new WebSocketClient();
+connection.connect('');
diff --git a/types/websocket/index.d.ts b/types/websocket/index.d.ts
index cd17039b1c..0a15be7d69 100644
--- a/types/websocket/index.d.ts
+++ b/types/websocket/index.d.ts
@@ -679,9 +679,11 @@ declare class w3cwebsocket {
     url: string;
     readyState: number;
     protocol?: string;
-    extenstions: IExtension[];
+    extensions: IExtension[];
     bufferedAmount: number;
 
+    binaryType: "arraybuffer";
+
     CONNECTING: number;
     OPEN: number;
     CLOSING: number;
@@ -692,7 +694,7 @@ declare class w3cwebsocket {
     onclose: () => void;
     onmessage: (message: any) => void;
 
-    constructor(url: string, protocols?: string[], origin?: string, headers?: any[], requestOptions?: object, clientConfig?: IClientConfig);
+    constructor(url: string, protocols?: string | string[], origin?: string, headers?: any[], requestOptions?: object, clientConfig?: IClientConfig);
 
     send(data: Buffer): void;
     send(data: IStringified): void;
diff --git a/types/webspeechapi/index.d.ts b/types/webspeechapi/index.d.ts
deleted file mode 100644
index a7aae15987..0000000000
--- a/types/webspeechapi/index.d.ts
+++ /dev/null
@@ -1,96 +0,0 @@
-// Type definitions for Web Speech API
-// Project: https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html
-// Definitions by: SaschaNaz <https://github.com/saschanaz>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.2
-
-// Spec version: 19 October 2012
-// Errata version: 6 June 2014
-// Corrected unofficial spec version: 6 June 2014
-
-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;
-    onaudioend: (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;
-    /* Errata 02 */
-    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;
diff --git a/types/webspeechapi/tslint.json b/types/webspeechapi/tslint.json
deleted file mode 100644
index 448daa2365..0000000000
--- a/types/webspeechapi/tslint.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        // TODOs
-        "dt-header": false,
-        "prefer-method-signature": false
-    }
-}
diff --git a/types/webspeechapi/webspeechapi-tests.ts b/types/webspeechapi/webspeechapi-tests.ts
deleted file mode 100644
index 27c03abd6e..0000000000
--- a/types/webspeechapi/webspeechapi-tests.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
-Examples from the spec:
-https://dvcs.w3.org/hg/speech-api/raw-file/tip/speechapi.html#examples-recognition
-*/
-
-// 6.1 Speech Recognition Examples
-
-// Example 1
-declare var q: HTMLInputElement;
-{
-    const recognition = new SpeechRecognition();
-    recognition.onresult = event => {
-        if (event.results.length > 0) {
-            q.value = event.results[0][0].transcript;
-            q.form.submit();
-        }
-    };
-}
-
-// Example 2
-declare const select: HTMLSelectElement;
-{
-    const recognition = new SpeechRecognition();
-    recognition.maxAlternatives = 10;
-    recognition.onresult = event => {
-        if (event.results.length > 0) {
-            const result = event.results[0];
-            for (let i = 0; i < result.length; ++i) {
-                const text = result[i].transcript;
-                select.options[i] = new Option(text, text);
-            }
-        }
-    };
-
-    function start() {
-        const x: number = select.options.length;
-        recognition.start();
-    }
-}
-
-// Example 3
-/*
-This example has some changes from the one in spec.
-`const i = resultIndex` -> `const i = event.resultIndex` (Recorded as Errata 16)
-`event.results.final` -> `event.results[i].isFinal` (Recorded as Errata 02)
-*/
-declare const textarea: HTMLTextAreaElement;
-declare const button: HTMLButtonElement;
-{
-    let recognizing: boolean;
-    const recognition = new SpeechRecognition();
-    recognition.continuous = true;
-    reset();
-    recognition.onend = reset;
-
-    recognition.onresult = event => {
-        for (let i = event.resultIndex; i < event.results.length; ++i) {
-            if (event.results[i].isFinal) {
-                textarea.value += event.results[i][0].transcript;
-            }
-        }
-    };
-
-    function reset() {
-        recognizing = false;
-        button.innerHTML = "Click to Speak";
-    }
-
-    function toggleStartStop() {
-        if (recognizing) {
-            recognition.stop();
-            reset();
-        } else {
-            recognition.start();
-            recognizing = true;
-            button.innerHTML = "Click to Stop";
-        }
-    }
-}
-
-// Example 4
-/*
-This example has a change from the one in spec.
-`recognition.interim = true;` -> `recognition.interimResults = true;` (Recorded as Errata 01)
-`event.results[i].final` -> `event.results[i].isFinal` (Recorded as Errata 02)
-*/
-declare const final_span: HTMLSpanElement;
-declare const interim_span: HTMLSpanElement;
-() => {
-    let recognizing: boolean;
-    const recognition = new SpeechRecognition();
-    recognition.continuous = true;
-    recognition.interimResults = true;
-    reset();
-    recognition.onend = reset;
-
-    recognition.onresult = event => {
-        let final = "";
-        let interim = "";
-        // tslint:disable-next-line prefer-for-of (not an Iterable?)
-        for (let i = 0; i < event.results.length; ++i) {
-            if (event.results[i].isFinal) {
-                final += event.results[i][0].transcript;
-            } else {
-                interim += event.results[i][0].transcript;
-            }
-        }
-        final_span.innerHTML = final;
-        interim_span.innerHTML = interim;
-    };
-
-    function reset() {
-        recognizing = false;
-        button.innerHTML = "Click to Speak";
-    }
-
-    function toggleStartStop() {
-        if (recognizing) {
-            recognition.stop();
-            reset();
-        } else {
-            recognition.start();
-            recognizing = true;
-            button.innerHTML = "Click to Stop";
-            final_span.innerHTML = "";
-            interim_span.innerHTML = "";
-        }
-    }
-};
-
-// 6.2 Speech Synthesis Examples
-
-// Example 1
-/*
-This example has a change from the one in spec.
-`SpeechSynthesisUtterance('Hello World')` -> `new SpeechSynthesisUtterance('Hello World')` (Recorded as Errata 09)
-*/
-{
-    speechSynthesis.speak(new SpeechSynthesisUtterance('Hello World'));
-}
-
-// Example 2
-{
-    const u = new SpeechSynthesisUtterance();
-    u.text = 'Hello World';
-    u.lang = 'en-US';
-    u.rate = 1.2;
-    // TODO: https://github.com/Microsoft/TSJS-lib-generator/issues/232
-    u.onend = event => { alert(`Finished in ${(event as any).elapsedTime} seconds.`); };
-    speechSynthesis.speak(u);
-}
diff --git a/types/wegame-api/index.d.ts b/types/wegame-api/index.d.ts
new file mode 100644
index 0000000000..18480ed2ea
--- /dev/null
+++ b/types/wegame-api/index.d.ts
@@ -0,0 +1,2820 @@
+// Type definitions for wegame 2.2
+// Project: https://developers.weixin.qq.com/minigame/dev/index.html
+// Definitions by: J.C <https://github.com/jcyuan>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * IOS及安卓不支持：
+ *     globalCompositeOperation不支持以下值：source-in source-out destination-atop lighter copy
+ *     isPointInPath 不支持
+ */
+declare class WxRenderingContext extends CanvasRenderingContext2D {
+}
+
+/**
+ * IOS及安卓不支持：
+ *     pixelStorei 当第一个参数是 gl.UNPACK_COLORSPACE_CONVERSION_WEBGL 时不支持
+ *     compressedTexImage2D不支持
+ *     compressedTexSubImage2D不支持
+ * 安卓不支持：
+ *     getExtension
+ *     getSupportedExtensions
+ */
+declare class WxWebGLRenderingContext extends WebGLRenderingContext {
+    /**
+     * 将一个Canvas对应的Texture绑定到WebGL上下文。(目前该方法仅支持 iOS 6.6.6 以上版本，Android/开发者工具暂不支持。)
+     *   示例：gl.wxBindCanvasTexture(gl.TEXTURE_2D, canvas)
+     * @param texture WebGL的纹理类型枚举值
+     * @param canvas 需要绑定为Texture的Canvas
+     */
+    wxBindCanvasTexture(texture: number, canvas: Canvas): void;
+}
+
+declare class WxPerformance {
+    /**
+     * 时间戳
+     */
+    now(): number;
+}
+
+declare class Canvas {
+    /**
+     * 画布的宽度
+     */
+    width: number;
+    /**
+     * 画布的高度
+     */
+    height: number;
+    /**
+     * 将当前 Canvas 保存为一个临时文件，并生成相应的临时文件路径。
+     */
+    toTempFilePath(p: wx.types.ToTempFileParams): void;
+    /**
+     * toTempFilePath 的同步版本
+     */
+    toTempFilePathSync(p: wx.types.ToTempFileSyncParams): string;
+    /**
+     * 获取画布对象的绘图上下文
+     * @param contextType 上下文类型
+     * @param contextAttributes webgl 上下文属性，仅当 contextType 为 webgl 时有效
+     */
+    getContext(contextType: "2d" | "webgl", contextAttributes?: wx.types.RenderingContextConfig): WxRenderingContext | WxWebGLRenderingContext;
+    /**
+     * 把画布上的绘制内容以一个 data URI 的格式返回
+     */
+    toDataURL(): string;
+}
+
+declare class Stats {
+    /**
+     * 文件的类型和存取的权限，对应 POSIX stat.st_mode
+     */
+    mode: string;
+    /**
+     * 文件大小，单位：B，对应 POSIX stat.st_size
+     */
+    size: number;
+    /**
+     * 文件最近一次被存取或被执行的时间，UNIX 时间戳，对应 POSIX stat.st_atime
+     */
+    lastAccessedTime: number;
+    /**
+     * 文件最后一次被修改的时间，UNIX 时间戳，对应 POSIX stat.st_mtime
+     */
+    lastModifiedTime: number;
+
+    /**
+     * 判断当前文件是否一个目录
+     */
+    isDirectory(): boolean;
+    /**
+     * 判断当前文件是否一个普通文件
+     */
+    isFile(): boolean;
+}
+
+declare class FileSystemManager {
+    /**
+     * 重命名文件，可以把文件从 oldPath 移动到 newPath
+     */
+    rename(param: wx.types.RenameParams): void;
+    /**
+     * FileSystemManager.rename 的同步版本
+     * @param oldPath 源文件路径，可以是普通文件或目录
+     * @param newPath 新文件路径
+     * @throws 指定源文件或目标文件没有写权限
+     * @throws 源文件不存在，或目标文件路径的上层目录不存在
+     */
+    renameSync(oldPath: string, newPath: string): void;
+
+    /**
+     * 删除目录
+     */
+    rmdir(param: wx.types.RmdirParams): void;
+    /**
+     * rmdir 的同步版本
+     * @param dirPath 要删除的目录路径
+     * @param recursive 是否递归删除目录。如果为 true，则删除该目录和该目录下的所有子目录以及文件。
+     * @throws 目录不存在, 目录不为空, 指定的 dirPath 路径没有写权限
+     */
+    rmdirSync(dirPath: string, recursive?: boolean): void;
+
+    /**
+     * 读取目录内文件列表
+     */
+    readdir(param: wx.types.ReaddirParams): void;
+    /**
+     * readdir的同步版本
+     * @param dirPath 要读取的目录路径
+     * @throws 目录不存在
+     * @throws dirPath 不是目录
+     * @throws 指定的 filePath 路径没有读权限
+     */
+    readdirSync(dirPath: string): string[];
+
+    /**
+     * 创建目录
+     */
+    mkdir(param: wx.types.MkdirParams): void;
+    /**
+     * mkdir 的同步版本
+     * @param dirPath 创建的目录路径
+     * @param recursive 是否在递归创建该目录的上级目录后再创建该目录。如果对应的上级目录已经存在，则不创建该上级目录。如 dirPath 为 a/b/c/d 且 recursive 为 true，将创建 a 目录，再在 a 目录下创建 b 目录，以此类推直至创建 a/b/c 目录下的 d 目录。
+     * @throws 上级目录不存在
+     * @throws 指定的 filePath 路径没有写权限
+     * @throws 有同名文件或目录
+     */
+    mkdirSync(dirPath: string, recursive?: boolean): void;
+
+    /**
+     * 解链文件
+     */
+    unlink(param: wx.types.UnlinkParams): void;
+    /**
+     * unlink 的同步版本
+     * @param filePath 要解链的文件路径
+     * @throws 指定的 path 路径没有读权限
+     * @throws 文件不存在
+     * @throws 传入的 filePath 是一个目录
+     */
+    unlinkSync(filePath: string): void;
+
+    /**
+     * 解压文件
+     */
+    unzip(param: wx.types.UnzipParams): void;
+
+    /**
+     * 读取本地文件内容
+     */
+    readFile(param: wx.types.ReadfileParams): void;
+    /**
+     * readFile 的同步版本
+     * @param filePath 要读取的文件的路径
+     * @param encoding 指定读取文件的字符编码，如果不传 encoding，则以 ArrayBuffer 格式读取文件的二进制内容
+     * @throws 指定的 filePath 所在目录不存在
+     * @throws 指定的 filePath 路径没有读权限
+     */
+    readFileSync(filePath: string, encoding?: wx.types.FileContentEncoding): string | ArrayBuffer;
+
+    /**
+     * 获取文件 Stats 对象
+     */
+    stat(param: wx.types.StatParams): void;
+    /**
+     * stat 的同步版本
+     * @param path 文件/目录路径
+     * @throws 指定的 path 路径没有读权限
+     * @throws 文件不存在
+     */
+    statSync(path: string): Stats;
+
+    /**
+     * 写文件
+     */
+    writeFile(param: wx.types.WritefileParams): void;
+    /**
+     * writeFile 的同步版本
+     * @param filePath 要写入的文件路径
+     * @param data 要写入的文本或二进制数据
+     * @param encoding 指定写入文件的字符编码
+     * @throws 指定的 filePath 所在目录不存在
+     * @throws 指定的 filePath 路径没有写权限
+     */
+    writeFileSync(filePath: string, data: string | ArrayBuffer, encoding?: wx.types.FileContentEncoding): void;
+
+    /**
+     * 判断文件/目录是否存在
+     */
+    access(param: wx.types.AccessfileParams): void;
+    /**
+     * access的同步版本
+     * @param path 要判断是否存在的文件/目录路径
+     * @throws 文件/目录不存在
+     */
+    accessSync(path: string): void;
+
+    /**
+     * 复制文件
+     */
+    copyFile(param: wx.types.CopyfileParams): void;
+    /**
+     * copyFile 的同步版本
+     * @param srcPath 源文件路径，只可以是普通文件
+     * @param destPath 目标文件路径
+     * @throws 指定目标文件路径没有写权限
+     * @throws 源文件不存在，或目标文件路径的上层目录不存在
+     */
+    copyFileSync(srcPath: string, destPath: string): void;
+
+    /**
+     * 获取该小程序下已保存的本地缓存文件列表
+     * @param res.fileList.filePath 本地路径
+     * @param res.fileList.size 本地文件大小，以字节为单位
+     * @param res.fileList.createTime 文件创建时间
+     */
+    getSavedFileList(param: wx.types.CallbacksWithType<wx.types.SavedfileList>): void;
+
+    /**
+     * 获取该小程序下的 本地临时文件 或 本地缓存文件 信息
+     */
+    getFileInfo(param: wx.types.FileinfoParams): void;
+
+    /**
+     * 删除该小程序下已保存的本地缓存文件
+     */
+    removeSavedFile(param: wx.types.RemovefileParams): void;
+
+    /**
+     * 保存临时文件到本地。此接口会移动临时文件，因此调用成功后，tempFilePath 将不可用。
+     */
+    saveFile(param: wx.types.SavefileParams): void;
+    /**
+     * saveFile的同步版本
+     * @param tempFilePath 临时存储文件路径
+     * @param filePath 要存储的文件路径
+     * @throws 指定的 tempFilePath 找不到文件
+     * @throws 指定的 filePath 路径没有写权限
+     * @throws 上级目录不存在
+     */
+    saveFileSync(tempFilePath: string, filePath?: string): string;
+
+    /**
+     * 在文件结尾追加内容
+     */
+    appendFile(param: wx.types.AppendfileParams): void;
+    /**
+     * appendFile的同步版本
+     * @param filePath 要追加内容的文件路径
+     * @param data 要追加的文本或二进制数据
+     * @param encoding 指定写入文件的字符编码
+     * @throws 指定的 filePath 文件不存在
+     * @throws 指定的 filePath 是一个已经存在的目录
+     * @throws 指定的 filePath 路径没有写权限
+     * @throws 指定的 filePath 是一个已经存在的目录
+     */
+    appendFileSync(filePath: string, data: string | ArrayBuffer, encoding: wx.types.FileContentEncoding): void;
+}
+
+declare class DownloadTask {
+    /**
+     * 中断下载任务
+     */
+    abort(): void;
+    /**
+     * 监听下载进度变化事件
+     * @param res.progress 下载进度百分比
+     * @param res.totalBytesWritten 已经下载的数据长度，单位 Bytes
+     * @param res.totalBytesExpectedToWrite 预期需要下载的数据总长度，单位 Bytes
+     */
+    onProgressUpdate(callback: { res: { progress: number, totalBytesWritten: number, totalBytesExpectedToWrite: number } }): void;
+}
+
+declare class RequestTask {
+    /**
+     * 中断请求任务
+     */
+    abort(): void;
+}
+
+declare class SocketTask {
+    /**
+     * 通过WebSocket发送数据
+     */
+    send(param: wx.types.SocketSendParams): void;
+    /**
+     * 关闭WebSocket连接
+     */
+    close(param: wx.types.SocketCloseParams): void;
+    /**
+     * 监听WebSocket 连接打开事件
+     */
+    onOpen(callback: wx.types.SocketOpenCallback): void;
+    /**
+     * 监听WebSocket 连接关闭事件
+     */
+    onClose(callback: () => void): void;
+    /**
+     * 监听WebSocket 错误事件
+     */
+    onError(callback: wx.types.SocketErrorCallback): void;
+    /**
+     * 监听WebSocket 接受到服务器的消息事件
+     */
+    onMessage(callback: wx.types.SocketMessageCallback): void;
+}
+
+declare class UploadTask {
+    /**
+     * 中断上传任务
+     */
+    abort(): void;
+    /**
+     * 监听上传进度变化事件
+     * @param callback.res.progress 上传进度百分比
+     * @param callback.res.totalBytesSent 已经上传的数据长度，单位 Bytes
+     * @param callback.res.totalBytesExpectedToSend 预期需要上传的数据总长度，单位 Bytes
+     */
+    onProgressUpdate(callback: (res: { progress: number, totalBytesSent: number, totalBytesExpectedToSend: number }) => void): void;
+}
+
+declare class KVData {
+    key: string;
+    value: string;
+}
+
+declare class UserGameData {
+    /**
+     * 用户的微信头像 url
+     */
+    avatarUrl: string;
+    /**
+     * 用户的微信昵称
+     */
+    nickname: string;
+    /**
+     * 用户的openid
+     */
+    openid: string;
+    /**
+     * 用户的托管 KV 数据列表
+     */
+    KVDataList: KVData[];
+}
+
+declare class CreatedButton {
+    type: wx.types.ButtonType;
+    text: string;
+    image: string;
+    style: wx.types.ButtonStyle;
+}
+declare class UserInfoButton extends CreatedButton {
+    onTap(callback: (res: {
+        /**
+         * 用户信息对象，不包含 openid 等敏感信息
+         */
+        userInfo: wx.types.UserInfo,
+        /**
+         * 不包括敏感信息的原始数据字符串，用于计算签名
+         */
+        rawData: string,
+        /**
+         * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，参考文档signature(https://mp.weixin.qq.com/debug/wxagame/dev/tutorial/open-ability/http-signature.html?t=201822)
+         */
+        signature: string,
+        /**
+         * 包括敏感数据在内的完整用户信息的加密数据，详见加密数据解密算法(https://mp.weixin.qq.com/debug/wxagame/dev/tutorial/open-ability/signature.html?t=201822)
+         */
+        encryptedData: string,
+        /**
+         * 加密算法的初始向量，详见加密数据解密算法(https://mp.weixin.qq.com/debug/wxagame/dev/tutorial/open-ability/signature.html?t=201822)
+         */
+        iv: string,
+        errMsg: string
+    }) => void): void;
+}
+declare class OpenSettingButton extends CreatedButton {
+}
+declare class GameClubButton extends CreatedButton {
+    icon: wx.types.GameClubButtonIcon;
+}
+declare class FeedbackButton extends CreatedButton {
+}
+
+declare class OpenDataContext {
+    /**
+     * 开放数据域和主域共享的 sharedCanvas，注意在开放数据域内时getContext只能使用2d模式
+     */
+    canvas: Canvas;
+    /**
+     * 向开放数据域发送消息
+     * @param message 要发送的消息，message 中及嵌套对象中 key 的 value 只能是 primitive value。即 number、string、boolean、null、undefined。
+     */
+    postMessage(message: any): void;
+}
+
+declare class LoadSubpackageTask {
+    /**
+     * 监听分包加载进度变化事件
+     * @param callback.res.progress 分包下载进度百分比
+     * @param callback.res.totalBytesWritten 已经下载的数据长度，单位 Bytes
+     * @param callback.res.totalBytesExpectedToWrite 预期需要下载的数据总长度，单位 Bytes
+     */
+    onProgressUpdate(callback: (res: { progress: number, totalBytesWritten: number, totalBytesExpectedToWrite: number }) => void): void;
+}
+
+declare class UpdateManager {
+    /**
+     * 应用更新包并重启
+     */
+    applyUpdate(): void;
+    /**
+     * 监听检查更新结果回调
+     */
+    onCheckForUpdate(callback: () => void): void;
+    /**
+     * 监听更新包下载成功回调
+     */
+    onUpdateReady(callback: () => void): void;
+    /**
+     * 监听更新包下载失败回调
+     */
+    onUpdateFailed(callback: () => void): void;
+}
+
+declare class WxWorker {
+    /**
+     * 向主线程或Worker线程发送的消息。
+     * @param message 需要发送的消息，必须是一个可序列化的 JavaScript 对象。
+     */
+    postMessage(message: any): void;
+    /**
+     * 结束当前 worker 线程，仅限在主线程 worker 对象上调用。
+     */
+    terminate(): void;
+    /**
+     * 监听接收主线程/Worker 线程向当前线程发送的消息
+     * @param callback.res.message 接收主线程/Worker 线程向当前线程发送的消息
+     */
+    onMessage(callback: (res: { message: any }) => void): void;
+}
+
+/**
+ * InnerAudioContext 实例，可通过 wx.createInnerAudioContext 接口获取实例。
+ */
+declare class InnerAudioContext {
+    /**
+     * 音频资源的地址
+     */
+    src: string;
+    /**
+     * 是否自动播放
+     */
+    autoplay: boolean;
+    /**
+     * 是否循环播放
+     */
+    loop: boolean;
+    /**
+     * 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音
+     */
+    obeyMuteSwitch: boolean;
+    /**
+     * 当前音频的长度，单位 s。只有在当前有合法的 src 时返回
+     */
+    readonly duration: number;
+    /**
+     * 当前音频的播放位置，单位 s。只有在当前有合法的 src 时返回，时间不取整，保留小数点后 6 位
+     */
+    readonly currentTime: number;
+    /**
+     * 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放
+     */
+    paused: boolean;
+    /**
+     * 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲
+     */
+    readonly buffered: number;
+    /**
+     * 音量。范围 0~1。
+     */
+    volume: number;
+
+    /**
+     * 播放
+     */
+    play(): void;
+    /**
+     * 暂停。暂停后的音频再播放会从暂停处开始播放
+     */
+    pause(): void;
+    /**
+     * 停止。停止后的音频再播放会从头开始播放。
+     */
+    stop(): void;
+    /**
+     * 跳转到指定位置，单位 s
+     * @param position 跳转的时间
+     */
+    seek(position: number): void;
+    /**
+     * 销毁当前实例
+     */
+    destroy(): void;
+    /**
+     * 监听音频进入可以播放状态的事件
+     */
+    onCanplay(callback: () => void): void;
+    /**
+     * 取消监听音频进入可以播放状态的事件
+     */
+    offCanplay(callback: () => void): void;
+    /**
+     * 监听音频播放事件
+     */
+    onPlay(callback: () => void): void;
+    /**
+     * 取消监听音频播放事件
+     */
+    offPlay(callback: () => void): void;
+    /**
+     * 监听音频暂停事件
+     */
+    onPause(callback: () => void): void;
+    /**
+     * 取消监听音频暂停事件
+     */
+    offPause(callback: () => void): void;
+    /**
+     * 监听音频停止事件
+     */
+    onStop(callback: () => void): void;
+    /**
+     * 取消监听音频停止事件
+     */
+    offStop(callback: () => void): void;
+    /**
+     * 监听音频自然播放至结束的事件
+     */
+    onEnded(callback: () => void): void;
+    /**
+     * 取消监听音频自然播放至结束的事件
+     */
+    offEnded(callback: () => void): void;
+    /**
+     * 监听音频播放进度更新事件
+     */
+    onTimeUpdate(callback: () => void): void;
+    /**
+     * 取消监听音频播放进度更新事件
+     */
+    offTimeUpdate(callback: () => void): void;
+    /**
+     * 监听音频播放错误事件
+     */
+    onError(callback: () => void): void;
+    /**
+     * 取消监听音频播放错误事件
+     */
+    offError(callback: () => void): void;
+    /**
+     * 监听音频加载中事件，当音频因为数据不足，需要停下来加载时会触发
+     */
+    onWaiting(callback: () => void): void;
+    /**
+     * 取消监听音频加载中事件，当音频因为数据不足，需要停下来加载时会触发
+     */
+    offWaiting(callback: () => void): void;
+    /**
+     * 监听音频进行跳转操作的事件
+     */
+    onSeeking(callback: () => void): void;
+    /**
+     * 取消监听音频进行跳转操作的事件
+     */
+    offSeeking(callback: () => void): void;
+    /**
+     * 监听音频完成跳转操作的事件
+     */
+    onSeeked(callback: () => void): void;
+    /**
+     * 取消监听音频完成跳转操作的事件
+     */
+    offSeeked(callback: () => void): void;
+}
+
+declare class RecorderManager {
+    /**
+     * 开始录音
+     */
+    start(param: {
+        /**
+         * 录音的时长，单位 ms，最大值 600000（10 分钟），默认值60000（1 分钟）
+         */
+        duration?: number,
+        /**
+         * 采样率
+         */
+        sampleRate: 8000 | 11025 | 12000 | 16000 | 22050 | 24000 | 32000 | 44100 | 48000,
+        /**
+         * 录音通道数
+         */
+        numberOfChannels: 1 | 2,
+        /**
+         * 编码码率
+         */
+        encodeBitRate: number,
+        /**
+         * 音频格式
+         */
+        format: "mp3" | "aac",
+        /**
+         * 指定帧大小，单位 KB。传入 frameSize 后，每录制指定帧大小的内容后，会回调录制的文件内容，不指定则不会回调
+         */
+        frameSize: number,
+        /**
+         * 指定录音的音频源，可通过 wx.getAvailableAudioSources() 获取当前可用的音频源，默认值auto
+         */
+        audioSource?: wx.types.AudioSourceType
+    }): void;
+    /**
+     * 暂停录音
+     */
+    pause(): void;
+    /**
+     * 继续录音
+     */
+    resume(): void;
+    /**
+     * 停止录音
+     */
+    stop(): void;
+    /**
+     * 监听录音开始事件
+     */
+    onStart(callback: () => void): void;
+    /**
+     * 监听录音继续事件
+     */
+    onResume(callback: () => void): void;
+    /**
+     * 监听录音暂停事件
+     */
+    onPause(callback: () => void): void;
+    /**
+     * 监听录音结束事件
+     * @param callback.res.tempFilePath 录音文件的临时路径
+     */
+    onStop(callback: (res: { tempFilePath: string }) => void): void;
+    /**
+     * 监听已录制完指定帧大小的文件事件。如果设置了 frameSize，则会回调此事件。
+     * @param callback.res.frameBuffer 录音分片数据
+     * @param callback.res.isLastFrame 当前帧是否正常录音结束前的最后一帧
+     */
+    onFrameRecorded(callback: (res: { frameBuffer: ArrayBuffer, isLastFrame: boolean }) => void): void;
+    /**
+     * 监听录音错误事件
+     */
+    onError(callback: (res: { errMsg: string }) => void): void;
+}
+
+declare class ImageFile {
+    /**
+     * 本地文件路径
+     */
+    path: string;
+    /**
+     * 本地文件大小，单位 B
+     */
+    size: number;
+}
+
+declare class Video {
+    /**
+     * 视频的左上角横坐标
+     */
+    x: number;
+    /**
+     * 视频的左上角纵坐标
+     */
+    y: number;
+    /**
+     * 视频的宽度，默认值300
+     */
+    width: number;
+    /**
+     * 默认值150
+     */
+    height: number;
+    /**
+     * 视频的资源地址
+     */
+    src: string;
+    /**
+     * 视频的封面
+     */
+    poster: string;
+    /**
+     * 视频的初始播放位置，单位为 s 秒，默认值0
+     */
+    initialTime: number;
+    /**
+     * 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5默认值1.0
+     */
+    playbackRate: number;
+    /**
+     * 视频是否为直播，默认值0
+     */
+    live?: number;
+    /**
+     * 视频的缩放模式
+     * fill - 填充，视频拉伸填满整个容器，不保证保持原有长宽比例
+     * contain - 包含，保持原有长宽比例。保证视频尺寸一定可以在容器里面放得下。因此，可能会有部分空白
+     * cover - 覆盖，保持原有长宽比例。保证视频尺寸一定大于容器尺寸，宽度和高度至少有一个和容器一致。因此，视频有部分会看不见
+     */
+    objectFit: "contain" | "cover" | "fill";
+    /**
+     * 视频是否显示控件，默认true
+     */
+    controls: boolean;
+    /**
+     * 视频是否自动播放，默认false
+     */
+    autoplay: boolean;
+    /**
+     * 视频是否是否循环播放，默认值false
+     */
+    loop: boolean;
+    /**
+     * 视频是否禁音播放，默认值false
+     */
+    muted: boolean;
+
+    /**
+     * 视频开始缓冲时触发的回调函数
+     */
+    onwaiting: () => void;
+    /**
+     * 视频开始播放时触发的回调函数
+     */
+    onplay: () => void;
+    /**
+     * 视频暂停时触发的回调函数
+     */
+    onpause: () => void;
+    /**
+     * 视频播放到末尾时触发的回调函数
+     */
+    onended: () => void;
+    /**
+     * 每当视频播放进度更新时触发的回调函数
+     */
+    ontimeupdate: () => void;
+    /**
+     * 视频发生错误时触发的回调函数
+     */
+    onerror: () => void;
+
+    /**
+     * 销毁视频
+     */
+    destroy(): void;
+    /**
+     * 监听视频缓冲事件
+     */
+    onWaiting(callback: () => void): void;
+    /**
+     * 取消监听视频缓冲事件
+     */
+    offWaiting(callback: () => void): void;
+
+    /**
+     * 监听视频播放事件
+     */
+    onPlay(callback: () => void): void;
+    /**
+     * 取消监听视频播放事件
+     */
+    offPlay(callback: () => void): void;
+    /**
+     * 监听视频暂停事件
+     */
+    onPause(callback: () => void): void;
+    /**
+     * 取消监听视频暂停事件
+     */
+    offPause(callback: () => void): void;
+    /**
+     * 监听视频播放到末尾事件
+     */
+    onEnded(callback: () => void): void;
+    /**
+     * 取消监听视频播放到末尾事件
+     */
+    offEnded(callback: () => void): void;
+    /**
+     * 监听视频播放进度更新事件
+     * @param callback.res.position 当前的播放位置，单位为秒
+     * @param callback.res.duration 视频的总时长，单位为秒
+     */
+    onTimeUpdate(callback: (res: { position: number, duration: number }) => void): void;
+    /**
+     * 取消监听视频播放进度更新事件
+     */
+    offTimeUpdate(callback: (res: { position: number, duration: number }) => void): void;
+    /**
+     * 监听视频错误事件
+     * @param callback.res.errMsg 错误信息，有如下值
+     *                            MEDIA_ERR_NETWORK - 当下载时发生错误
+     *                            MEDIA_ERR_DECODE  - 当解码时发生错误
+     *                            MEDIA_ERR_SRC_NOT_SUPPORTED - video 的 src 属性是不支持的资源类型
+     */
+    onError(callback: (res: { errMsg: string }) => void): void;
+    /**
+     * 取消监听视频错误事件
+     */
+    offError(callback: (res: { errMsg: string }) => void): void;
+
+    /**
+     * 播放视频
+     */
+    play(): Promise<void>;
+    /**
+     * 暂停视频
+     */
+    pause(): Promise<void>;
+    /**
+     * 停止视频
+     */
+    stop(): Promise<void>;
+    /**
+     * 视频跳转
+     * @param time 视频跳转到指定位置，单位为 s 秒
+     */
+    seek(time: number): Promise<void>;
+
+    /**
+     * 视频全屏
+     */
+    requestFullScreen(): Promise<void>;
+
+    /**
+     * 视频退出全屏
+     */
+    exitFullScreen(): Promise<void>;
+}
+
+/**
+ * banner 广告组件。banner 广告组件是一个原生组件，层级比上屏 Canvas 高，会覆盖在上屏 Canvas 上。banner 广告组件默认是隐藏的，需要调用 BannerAd.show() 将其显示。banner 广告会根据开发者设置的宽度进行等比缩放，缩放后的尺寸将通过 BannerAd.onResize() 事件中提供。
+ */
+declare class BannerAd {
+    /**
+     * 广告单元 id
+     */
+    adUnitId: string;
+    /**
+     * banner 广告组件的样式。style 上的属性的值仅为开发者设置的值，banner 广告会根据开发者设置的宽度进行等比缩放，缩放后的真实尺寸需要通过 BannerAd.onResize() 事件获得。
+     */
+    style: wx.types.AdStyle;
+
+    /**
+     * 显示 banner 广告。
+     */
+    show(): Promise<void>;
+    /**
+     * 隐藏 banner 广告
+     */
+    hide(): void;
+    /**
+     * 销毁 banner 广告
+     */
+    destroy(): void;
+    /**
+     * 监听 banner 广告缩放
+     */
+    onResize(callback: (res: { width: number, height: number }) => void): void;
+    /**
+     * 取消监听隐藏 banner 广告缩放
+     */
+    offResize(callback: (res: { width: number, height: number }) => void): void;
+    /**
+     * 监听banner 广告加载事件
+     */
+    onLoad(callback: () => void): void;
+    /**
+     * 取消监听banner 广告加载事件
+     */
+    offLoad(callback: () => void): void;
+    /**
+     * 监听banner 广告错误事件
+     */
+    onError(callback: (res: { errMsg: string }) => void): void;
+    /**
+     * 取消监听banner 广告错误事件
+     */
+    offError(callback: (res: { errMsg: string }) => void): void;
+}
+
+declare class RewardedVideoAd extends BannerAd {
+    /**
+     * 加载视频广告
+     */
+    load(): Promise<void>;
+    /**
+     * 监听用户点击 关闭广告 按钮的事件
+     */
+    onClose(callback: (res: { isEnded: boolean }) => void): void;
+    /**
+     * 监听用户点击 关闭广告 按钮的事件
+     */
+    offClose(callback: (res: { isEnded: boolean }) => void): void;
+}
+
+// --定时器
+declare function clearTimeout(timeoutID: number): void;
+declare function clearInterval(intervalID: number): void;
+declare function setTimeout(fn: () => void, delay: number, ...rest: any[]): number;
+declare function setInterval(fn: () => void, delay: number, ...rest: any[]): number;
+
+// --渲染
+declare function cancelAnimationFrame(requestID: number): void;
+declare function requestAnimationFrame(callback: () => void): number;
+
+declare namespace wx {
+    namespace types {
+        interface Callbacks {
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface CallbacksWithType<T> {
+            success?: (res: T) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface RenderingContextConfig {
+            /**
+             * 表示是否抗锯齿
+             */
+            antialias?: boolean;
+            /**
+             * 表示是否绘图完成后是否保留绘图缓冲区
+             */
+            preserveDrawingBuffer?: boolean;
+            /**
+             * 抗锯齿样本数。最小值为 2，最大不超过系统限制数量，仅 iOS 支持
+             */
+            antialiasSamples?: number;
+        }
+
+        interface ToTempFileSyncParams {
+            /**
+             * 截取 canvas 的左上角横坐标
+             */
+            x?: number;
+            /**
+             * 截取 canvas 的左上角纵坐标
+             */
+            y?: number;
+            /**
+             * 截取 canvas 的宽度
+             */
+            width?: number;
+            /**
+             * 截取 canvas 的高度
+             */
+            height?: number;
+            /**
+             * 目标文件的宽度，会将截取的部分拉伸或压缩至该数值
+             */
+            destWidth?: number;
+            /**
+             * 目标文件的高度，会将截取的部分拉伸或压缩至该数值
+             */
+            destHeight?: number;
+            /**
+             * 目标文件的类型
+             */
+            fileType?: "jpg" | "png";
+            /**
+             * jpg图片的质量，仅当 fileType 为 jpg 时有效。取值范围为 0.0（最低）- 1.0（最高），不含 0。不在范围内时当作 1.0
+             */
+            quality?: number;
+        }
+
+        interface ToTempFileParams extends ToTempFileSyncParams {
+            success?: (res: { tempFilePath: string }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface RenameParams {
+            oldPath: string;
+            newPath: string;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface RmdirParams {
+            dirPath: string;
+            recursive?: boolean;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface ReaddirParams {
+            dirPath: string;
+            success?: (res: { files: string[] }) => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface MkdirParams {
+            dirPath: string;
+            recursive?: boolean;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        type FileContentEncoding = "ascii" | "base64" | "binary" | "hex" | "ucs2" | "ucs-2" | "utf16le" | "utf-16le" | "utf-8" | "utf8" | "latin1";
+
+        interface ReadfileParams {
+            filePath: string;
+            encoding?: FileContentEncoding;
+            success?: (res: { data: string | ArrayBuffer }) => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface StatParams {
+            path: string;
+            success?: (res: { stat: Stats }) => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface WritefileParams {
+            filePath: string;
+            data: string | ArrayBuffer;
+            encoding?: FileContentEncoding;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface UnlinkParams {
+            filePath: string;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface UnzipParams {
+            zipFilePath: string;
+            targetPath: string;
+            success?: () => void;
+            fail?: (e?: any) => void;
+            complete?: () => void;
+        }
+
+        interface AccessfileParams {
+            filePath: string;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface SavedfileList {
+            fileList: {
+                filePath: string;
+                size: number;
+                createTime: number;
+            };
+        }
+
+        interface CopyfileParams {
+            srcPath: string;
+            destPath: string;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface FileinfoParams {
+            filePath: string;
+            success?: (res: { size: number }) => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface RemovefileParams {
+            filePath: string;
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface SavefileParams {
+            tempFilePath: string;
+            filePath?: string;
+            success?: (res: { savedFilePath: string }) => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface AppendfileParams {
+            filePath: string;
+            data: string | ArrayBuffer;
+            encoding?: FileContentEncoding;
+            success?: () => void;
+            fail?: (res: { errMsg: string }) => void;
+            complete?: () => void;
+        }
+
+        interface LineHeightParams {
+            fontStyle?: "normal" | "italic";
+            fontWeight?: "normal" | "bold";
+            fontSize?: number;
+            fontFamily: string;
+            text: string;
+            success?: (res: { lineHeight: number }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface Image {
+            src: string;
+            width: number;
+            height: number;
+            onload: () => void;
+            onerror: (e?: any) => void;
+        }
+
+        // --启动参数
+        interface LaunchOption {
+            /**
+             * 场景值
+             */
+            scene: number;
+            /**
+             * 启动参数
+             */
+            query: any;
+            /**
+             * 当前小游戏是否被显示在聊天顶部
+             */
+            isSticky: boolean;
+            /**
+             * 票据
+             */
+            shareTicket: string;
+        }
+
+        // --系统信息
+        interface SystemInfo {
+            /**
+             * 手机品牌
+             */
+            brand: string;
+            /**
+             * 手机型号
+             */
+            model: string;
+            /**
+             * 设备像素比
+             */
+            pixelRatio: number;
+            /**
+             * 屏幕宽度
+             */
+            screenWidth: number;
+            /**
+             * 屏幕高度
+             */
+            screenHeight: number;
+            /**
+             * 可使用窗口宽度
+             */
+            windowWidth: number;
+            /**
+             * 可使用窗口高度
+             */
+            windowHeight: number;
+            /**
+             * 微信设置的语言
+             */
+            language: string;
+            /**
+             * 微信版本号
+             */
+            version: string;
+            /**
+             * 操作系统版本
+             */
+            system: string;
+            /**
+             * 客户端平台
+             */
+            platform: string;
+            /**
+             * 用户字体大小设置。以“我-设置-通用-字体大小”中的设置为准，单位 px。
+             */
+            fontSizeSetting: string;
+            /**
+             * 客户端基础库版本
+             */
+            SDKVersion: string;
+            /**
+             * 性能等级
+             */
+            benchmarkLevel: number;
+            /**
+             * 电量，范围 1 - 100
+             */
+            battery: number;
+            /**
+             * wifi 信号强度，范围 0 - 4
+             */
+            wifiSignal: number;
+        }
+
+        // --触摸对象
+        interface Touch {
+            /**
+             * Touch 对象的唯一标识符，只读属性。一次触摸动作(我们值的是手指的触摸)在平面上移动的整个过程中, 该标识符不变。可以根据它来判断跟踪的是否是同一次触摸过程。
+             */
+            identifier: number;
+            /**
+             * 触点相对于屏幕左边沿的 X 坐标。
+             */
+            screenX: number;
+            /**
+             * 触点相对于屏幕左边沿的 Y 坐标。
+             */
+            screenY: number;
+        }
+
+        interface TouchData {
+            /**
+             * 当前所有触摸点的列表
+             */
+            touches: Touch[];
+            /**
+             * 触发此次事件的触摸点列表
+             */
+            changedTouches: Touch[];
+            /**
+             * 事件触发时的时间戳
+             */
+            timeStamp: number;
+        }
+
+        // --电量
+        interface BatteryInfo {
+            /**
+             * 设备电量，范围 1 - 100
+             */
+            level: string;
+            /**
+             * 是否正在充电
+             */
+            isCharging: boolean;
+        }
+
+        // --剪切板
+        interface ClipboardData {
+            data: string;
+        }
+
+        interface SetClipboardDataParams {
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+            data: string;
+        }
+
+        interface SetKeepScreenOnParams {
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+            keepScreenOn: boolean;
+        }
+
+        interface SetScreenBrightnessParams {
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+            /**
+             * 屏幕亮度值，范围 0 ~ 1，0 最暗，1 最亮
+             */
+            value: number;
+        }
+
+        interface DownfileParams {
+            url: string;
+            filePath: string;
+            /**
+             * 	HTTP 请求的 Header，Header 中不能设置 Referer
+             */
+            header?: { [key: string]: string };
+            success?: (res: { tempFilePath: string, statusCode: number }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        type NetworkType = "wifi" | "2g" | "3g" | "4g" | "unknown" | "none";
+
+        type RequestMethod = "GET" | "HEAD" | "POST" | "PUT" | "DELETE" | "TRACE" | "CONNECT";
+
+        interface RequestParams {
+            /**
+             * 开发者服务器接口地址
+             */
+            url: string;
+            /**
+             * 请求的参数
+             */
+            data?: string | { [key: string]: any };
+            /**
+             * 设置请求的 header，header 中不能设置 Referer
+             */
+            header?: { [name: string]: string };
+            /**
+             * HTTP 请求方法
+             */
+            method?: RequestMethod;
+            /**
+             * 返回的数据格式
+             */
+            dataType?: "json" | "arraybuffer";
+            /**
+             * res.data usually can be string or ArrayBuffer
+             */
+            success?: (res: { data: any, statusCode: number, header?: { [key: string]: string } }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface SocketSendParams {
+            data: string | ArrayBuffer;
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+        interface SocketConnectParams {
+            url: string;
+            protocols?: string[];
+            header?: { [key: string]: string };
+            method?: RequestMethod;
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+        interface SocketCloseParams {
+            /**
+             * 一个数字值表示关闭连接的状态号，表示连接被关闭的原因。如果这个参数没有被指定，默认的取值是1000 （表示正常连接关闭）
+             */
+            code?: number;
+            /**
+             * 一个可读的字符串，表示连接被关闭的原因。这个字符串必须是不长于123字节的UTF-8 文本（不是字符）
+             */
+            reason?: string;
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        type SocketOpenCallback = (res: { header?: { [key: string]: string } }) => void;
+        type SocketMessageCallback = (res: { data: string | ArrayBuffer }) => void;
+        type SocketErrorCallback = (res: { errMsg: string }) => void;
+
+        /**
+         * wx.getUserInfo的旧版本API参数，随时会被删除，不推荐使用
+         */
+        interface OldUserInfoParam {
+            /**
+             * 是否带上登录态信息。当 withCredentials 为 true 时，要求此前有调用过 wx.login 且登录态尚未过期，此时返回的数据会包含 encryptedData, iv 等敏感信息；当 withCredentials 为 false 时，不要求有登录态，返回的数据不包含 encryptedData, iv 等敏感信息。
+             */
+            withCredentials?: boolean;
+            /**
+             * 显示用户信息的语言
+             */
+            lang?: "en" | "zh_CN" | "zh_TW";
+            success?: (res: {
+                /**
+                 * 用户信息对象，不包含 openid 等敏感信息
+                 */
+                userInfo: UserInfo,
+                /**
+                 * 不包括敏感信息的原始数据字符串，用于计算签名
+                 */
+                rawData: string,
+                /**
+                 * 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息，参考文档signature(https://mp.weixin.qq.com/debug/wxagame/dev/tutorial/open-ability/http-signature.html?t=201822)
+                 */
+                signature: string,
+                /**
+                 * 包括敏感数据在内的完整用户信息的加密数据，详见加密数据解密算法(https://mp.weixin.qq.com/debug/wxagame/dev/tutorial/open-ability/signature.html?t=201822)
+                 */
+                encryptedData: string,
+                /**
+                 * 加密算法的初始向量，详见加密数据解密算法(https://mp.weixin.qq.com/debug/wxagame/dev/tutorial/open-ability/signature.html?t=201822)
+                 */
+                iv: string,
+                errMsg: string
+            }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        /**
+         * 新版本wx.getUserInfo的参数，需要在开放数据域内调用
+         */
+        interface NewUserInfoParam {
+            /**
+             * 要获取信息的用户的 openId 数组，如果要获取当前用户信息，则将数组中的一个元素设为 'selfOpenId'
+             */
+            openIdList?: string[];
+            /**
+             * 显示用户信息的语言
+             */
+            lang?: "en" | "zh_CN" | "zh_TW";
+            success?: (res: { data: UserInfo[] }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface UserInfo {
+            language: string;
+            nickName: string;
+            avatarUrl: string;
+            /**
+             * 0：未知、1：男、2：女
+             */
+            gender: 0 | 1 | 2;
+            country: string;
+            province: string;
+            city: string;
+        }
+
+        type ButtonType = "text" | "image";
+        interface ButtonStyle {
+            left: number;
+            top: number;
+            width: number;
+            height: number;
+            /**
+             * 格式#ff0000
+             */
+            backgroundColor: string;
+            /**
+             * 格式#ff0000
+             */
+            borderColor: string;
+            borderWidth: number;
+            borderRadius: number;
+            textAlign: "left" | "center" | "right";
+            fontSize: number;
+            lineHeight: number;
+        }
+
+        type GameClubButtonIcon = "green" | "white" | "dark" | "light";
+
+        // --设置
+        interface AuthSetting {
+            /**
+             * 用户信息，对应接口 wx.getUserInfo
+             */
+            "scope.userInfo"?: boolean;
+            /**
+             * 地理位置，对应接口 wx.getLocation wx.chooseLocation
+             */
+            "scope.userLocation"?: boolean;
+            /**
+             * 通讯地址，对应接口 wx.chooseAddress
+             */
+            "scope.address"?: boolean;
+            /**
+             * 发票抬头，对应接口 wx.chooseInvoiceTitle
+             */
+            "scope.invoiceTitle"?: boolean;
+            /**
+             * 微信运动步数，对应接口 wx.getWeRunData
+             */
+            "scope.werun"?: boolean;
+            /**
+             * 录音功能，对应接口 wx.startRecord
+             */
+            "scope.record"?: boolean;
+            /**
+             * 保存到相册 wx.saveImageToPhotosAlbum, wx.saveVideoToPhotosAlbum
+             */
+            "scope.writePhotosAlbum"?: boolean;
+            /**
+             * 摄像头 wx.camera
+             */
+            "scope.camera"?: boolean;
+        }
+
+        interface SetStorageParams {
+            key: string;
+            data: any;
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+        interface RemoveStorageParams {
+            key: string;
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+        interface GetStorageParams {
+            key: string;
+            success?: (res: { data: any }) => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        interface StorageInfo {
+            /**
+             * 当前 storage 中所有的 key
+             */
+            keys: string[];
+            /**
+             * 当前占用的空间大小, 单位 KB
+             */
+            currentSize: number;
+            /**
+             * 限制的空间大小，单位 KB
+             */
+            limitSize: number;
+        }
+
+        interface ShareOption {
+            /**
+             * 转发标题，不传则默认使用当前小游戏的昵称。
+             */
+            title?: string;
+            /**
+             * 转发显示图片的链接，可以是网络图片路径或本地图片文件路径或相对代码包根目录的图片文件路径。显示图片长宽比是 5:4
+             */
+            imageUrl?: string;
+            /**
+             * 查询字符串，必须是 key1=val1&key2=val2 的格式。从这条转发消息进入后，可通过 wx.getLaunchOptionsSync() 或 wx.onShow 获取启动参数中的 query。
+             */
+            query?: string;
+        }
+
+        interface AccelerometerParams {
+            interval: "game" | "ui" | "normal";
+            success?: () => void;
+            fail?: () => void;
+            complete?: () => void;
+        }
+
+        type AudioSourceType = "auto" | "buildInMic" | "headsetMic" | "mic" | "camcorder";
+
+        interface AdStyle {
+            /**
+             * 广告组件的左上角横坐标
+             */
+            left: number;
+            /**
+             * banner 广告组件的左上角纵坐标
+             */
+            top: number;
+            /**
+             * banner 广告组件的宽度。最小 300，最大至 屏幕宽度（屏幕宽度可以通过 wx.getSystemInfoSync() 获取）。
+             */
+            width: number;
+            /**
+             * banner 广告组件的高度
+             */
+            height: number;
+            /**
+             * banner 广告组件经过缩放后真实的宽度
+             */
+            realWidth: number;
+            /**
+             * banner 广告组件经过缩放后真实的高度
+             */
+            realHeight: number;
+        }
+    }
+
+    /**
+     * 创建一个画布对象。首次调用创建的是显示在屏幕上的画布，之后调用创建的都是离屏画布。
+     */
+    function createCanvas(): Canvas;
+
+    /**
+     * 只有开放数据域能调用，获取主域和开放数据域共享的 sharedCanvas
+     */
+    function getSharedCanvas(): Canvas;
+
+    /**
+     * 创建一个图片对象
+     */
+    function createImage(): types.Image;
+
+    /**
+     * 获取一行文本的行高
+     * @param p 字体参数
+     */
+    function getTextLineHeight(p: types.LineHeightParams): number;
+
+    /**
+     * 加载自定义字体文件
+     * @param path 字体文件路径。可以是代码包文件路径，也可以是 wxfile:// 协议的本地文件路径。
+     */
+    function loadFont(path: string): string;
+
+    /**
+     * 可以修改渲染帧率。默认渲染帧率为 60 帧每秒。修改后，requestAnimationFrame 的回调频率会发生改变。
+     * @param fps 帧率，有效范围 1 - 60。
+     */
+    function setPreferredFramesPerSecond(fps: number): void;
+
+    // --生命周期
+    function exitMiniProgram(cb?: types.Callbacks): void;
+    function getLaunchOptionsSync(): types.LaunchOption;
+    function onHide(cb: () => void): void;
+    function offHide(cb: () => void): void;
+    function onShow(cb: (res: { scene: string, query: any, shareTicket: string }) => void): void;
+    function offShow(cb: (res: { scene: string, query: any, shareTicket: string }) => void): void;
+
+    // --系统信息
+    function getSystemInfo(cb: types.CallbacksWithType<types.SystemInfo>): void;
+    function getSystemInfoSync(): types.SystemInfo;
+
+    /**
+     * 监听音频中断结束，在收到 onAudioInterruptionBegin 事件之后，小程序内所有音频会暂停，收到此事件之后才可再次播放成功
+     */
+    function onAudioInterruptionEnd(cb: () => void): void;
+    /**
+     * 取消监听音频中断结束，在收到 onAudioInterruptionBegin 事件之后，小程序内所有音频会暂停，收到此事件之后才可再次播放成功
+     */
+    function offAudioInterruptionEnd(cb: () => void): void;
+    /**
+     * 监听音频因为受到系统占用而被中断开始，以下场景会触发此事件：闹钟、电话、FaceTime 通话、微信语音聊天、微信视频聊天。此事件触发后，小程序内所有音频会暂停。
+     */
+    function onAudioInterruptionBegin(cb: () => void): void;
+    /**
+     * 取消监听音频因为受到系统占用而被中断开始，以下场景会触发此事件：闹钟、电话、FaceTime 通话、微信语音聊天、微信视频聊天。此事件触发后，小程序内所有音频会暂停。
+     */
+    function offAudioInterruptionBegin(cb: () => void): void;
+    /**
+     * 监听全局错误事件
+     */
+    function onError(cb: (res: { message: string, stack: string }) => void): void;
+    function offError(cb: (res: { message: string, stack: string }) => void): void;
+
+    // --触摸事件
+    /**
+     * 监听开始始触摸事件
+     */
+    function onTouchStart(cb: (res: types.TouchData) => void): void;
+    function offTouchStart(cb: (res: types.TouchData) => void): void;
+    /**
+     * 监听触点移动事件
+     */
+    function onTouchMove(cb: (res: types.TouchData) => void): void;
+    function offTouchMove(cb: (res: types.TouchData) => void): void;
+    /**
+     * 监听触摸结束事件
+     */
+    function onTouchEnd(cb: (res: types.TouchData) => void): void;
+    function offTouchEnd(cb: (res: types.TouchData) => void): void;
+    /**
+     * 监听触点失效事件
+     */
+    function onTouchCancel(cb: (res: types.TouchData) => void): void;
+    function offTouchCancel(cb: (res: types.TouchData) => void): void;
+
+    // --加速计
+    /**
+     * 监听加速度数据，频率：5次/秒，接口调用后会自动开始监听，可使用 wx.stopAccelerometer 停止监听。
+     */
+    function onAccelerometerChange(cb: (res: { x: number, y: number, z: number }) => void): void;
+    /**
+     * 开始监听加速度数据。
+     */
+    function startAccelerometer(cb: types.AccelerometerParams): void;
+    /**
+     * 停止监听加速度数据。
+     */
+    function stopAccelerometer(cb?: types.Callbacks): void;
+
+    // --电量
+    /**
+     * 获取设备电量。同步 API wx.getBatteryInfoSync 在 iOS 上不可用。
+     */
+    function getBatteryInfo(cb: types.CallbacksWithType<types.BatteryInfo>): void;
+    /**
+     * IOS上这个同步API无法使用
+     */
+    function getBatteryInfoSync(): types.BatteryInfo;
+
+    // --剪贴板
+    /**
+     * 取得系统剪贴板的内容
+     */
+    function getClipboardData(cb: types.CallbacksWithType<types.ClipboardData>): void;
+    /**
+     * 设置系统剪贴板的内容
+     */
+    function setClipboardData(p: types.SetClipboardDataParams): void;
+
+    // --罗盘
+    /**
+     * 监听罗盘数据，频率：5 次/秒，接口调用后会自动开始监听，可使用 wx.stopCompass 停止监听。
+     * @param cb.res.direction 面对的方向度数
+     */
+    function onCompassChange(cb: (res: { direction: number }) => void): void;
+    /**
+     * 开始监听罗盘数据
+     */
+    function startCompass(cb?: types.Callbacks): void;
+    /**
+     * 停止监听罗盘数据
+     */
+    function stopCompass(cb?: types.Callbacks): void;
+
+    // --网络
+    /**
+     * 获取网络类型
+     */
+    function getNetworkType(cb: types.CallbacksWithType<{ isConnected: boolean, networkType: types.NetworkType }>): void;
+    /**
+     * 监听网络状态变化事件
+     */
+    function onNetworkStatusChange(cb: (res: {
+        /**
+         * 当前是否有网络链接
+         */
+        isConnected: boolean,
+        /**
+         * none - 无网络, unknown - Android 下不常见的网络类型
+         */
+        networkType: types.NetworkType
+    }) => void): void;
+
+    // --屏幕
+    /**
+     * 获取屏幕亮度
+     */
+    function getScreenBrightness(cb: types.CallbacksWithType<{ value: number }>): void;
+    /**
+     * 设置是否保持常亮状态。仅在当前小程序生效，离开小程序后设置失效。
+     */
+    function setKeepScreenOn(p: types.SetKeepScreenOnParams): void;
+    /**
+     * 设置屏幕亮度
+     */
+    function setScreenBrightness(p: types.SetScreenBrightnessParams): void;
+
+    // --转屏
+    /**
+     * 监听横竖屏切换事件
+     */
+    function onDeviceOrientationChange(callback: (res: { value: string }) => void): void;
+    /**
+     * 取消监听横竖屏切换事件
+     */
+    function offDeviceOrientationChange(callback: (res: { value: string }) => void): void;
+
+    // --振动
+    /**
+     * 使手机发生较短时间的振动（15 ms）
+     */
+    function vibrateShort(cb?: types.Callbacks): void;
+    /**
+     * 使手机发生较长时间的振动（400 ms)
+     */
+    function vibrateLong(cb?: types.Callbacks): void;
+
+    // --文件系统
+    function getFileSystemManager(): FileSystemManager;
+
+    /**
+     * 系统环境变量
+     */
+    const env: {
+        /**
+         * 用户下载数据根目录
+         */
+        USER_DATA_PATH: string
+    };
+
+    // --位置
+    /**
+     * 获取当前的地理位置、速度。当用户离开小程序后，此接口无法调用；当用户点击“显示在聊天顶部”时，此接口可继续调用。
+     */
+    function getLocation(param: {
+        /**
+         * wgs84 返回 gps 坐标，gcj02 返回可用于 wx.openLocation 的坐标
+         */
+        type?: "wgs84" | "gcj02",
+        /**
+         * 传入 true 会返回高度信息，由于获取高度需要较高精确度，会减慢接口返回速度	>= 1.6.0
+         */
+        altitude?: boolean,
+        success?: (res: {
+            /**
+             * 纬度，范围为 -90~90，负数表示南纬
+             */
+            latitude: number,
+            /**
+             * 经度，范围为 -180~180，负数表示西经
+             */
+            longitude: number,
+            /**
+             * 速度，单位 m/s
+             */
+            speed: number,
+            /**
+             * 位置的精确度
+             */
+            accuracy: number,
+            /**
+             * 高度，单位 m
+             */
+            altitude: number,
+            /**
+             * 垂直精度，单位 m（Android 无法获取，返回 0）
+             */
+            verticalAccuracy: number,
+            /**
+             * 水平精度，单位 m
+             */
+            horizontalAccuracy: number
+        }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --网络
+    /**
+     * 下载文件
+     */
+    function downloadFile(param: types.DownfileParams): DownloadTask;
+
+    // --发起请求
+    function request(param: types.RequestParams): RequestTask;
+
+    // --websocket
+    /**
+     * 创建一个 WebSocket 连接。最多同时存在 5 个 WebSocket 连接。
+     */
+    function connectSocket(param: types.SocketConnectParams): SocketTask;
+    /**
+     * 关闭WebSocket
+     */
+    function closeSocket(param: types.SocketCloseParams): void;
+    /**
+     * 监听WebSocket 连接打开事件
+     */
+    function onSocketOpen(callback: types.SocketOpenCallback): void;
+    /**
+     * 监听WebSocket 连接关闭事件
+     */
+    function onSocketClose(callback: () => void): void;
+    /**
+     * 监听WebSocket 接受到服务器的消息事件
+     */
+    function onSocketMessage(callback: types.SocketMessageCallback): void;
+    /**
+     * 监听WebSocket 错误事件
+     */
+    function onSocketError(callback: types.SocketErrorCallback): void;
+    /**
+     * 通过 WebSocket 连接发送数据，需要先 wx.connectSocket，并在 wx.onSocketOpen 回调之后才能发送。
+     */
+    function sendSocketMessage(param: types.SocketSendParams): void;
+
+    // --上传
+    function uploadFile(param: {
+        /**
+         * 开发者服务器地址
+         */
+        url: string,
+        /**
+         * 要上传文件资源的路径
+         */
+        filePath: string,
+        /**
+         * 文件对应的 key，开发者在服务端可以通过这个 key 获取文件的二进制内容
+         */
+        name: string,
+        /**
+         * HTTP 请求 Header，Header 中不能设置 Referer
+         */
+        header?: { [key: string]: string },
+        /**
+         * HTTP 请求中其他额外的 form data
+         */
+        formData?: { [key: string]: any },
+        success?: (res: { data: string, statusCode: number }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): UploadTask;
+
+    // --开放数据
+    /**
+     * 拉取当前用户所有同玩好友的托管数据。该接口只可在开放数据域下使用
+     */
+    function getFriendCloudStorage(param: {
+        /**
+         * 要拉取的 key 列表
+         */
+        keyList: string[],
+        success?: (res: { data: UserGameData[] }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 获取当前用户托管数据当中对应 key 的数据。该接口只可在开放数据域下使用
+     */
+    function getUserCloudStorage(param: {
+        /**
+         * 要拉取的 key 列表
+         */
+        keyList: string[],
+        success?: (res: { KVDataList: KVData[] }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    /**
+     * 在无须用户授权的情况下，批量获取用户信息。该接口只在开放数据域下可用
+     * 请注意！！旧版本的该接口已过期，微信不允许主动弹出授权框，旧版本API会被逐渐作废，请使用wx.createUserInfoButton或在隔离数据区取得用户信息
+     * 如使用旧接口取得用户信息，withCredentials 为 true 时需要先调用 wx.login 接口。需要用户授权 scope.userInfo
+     */
+    function getUserInfo(param: types.NewUserInfoParam | types.OldUserInfoParam): void;
+    /**
+     * 在小游戏是通过群分享卡片打开的情况下，可以通过调用该接口获取群同玩成员的游戏数据。该接口只可在开放数据域下使用。
+     */
+    function getGroupCloudStorage(param: {
+        /**
+         * 群分享对应的 shareTicket
+         */
+        shareTicket: string,
+        /**
+         * 要拉取的 key 列表
+         */
+        keyList: string[],
+        success?: (res: { data: UserGameData[] }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 删除用户托管数据当中对应 key 的数据。
+     */
+    function removeUserCloudStorage(param: {
+        /**
+         * 要删除掉 key 列表
+         */
+        keyList: string[],
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 对用户托管数据进行写数据操作，允许同时写多组 KV 数据。
+     * 托管数据的限制
+     *      > 每个openid所标识的微信用户在每个游戏上托管的数据不能超过128个key-value对。
+     *      > 上报的key-value列表当中每一项的key+value长度都不能超过1K(1024)字节。
+     *      > 上报的key-value列表当中每一个key长度都不能超过128字节。
+     */
+    function setUserCloudStorage(param: {
+        /**
+         * 要修改的 KV 数据列表
+         */
+        KVDataList: KVData[],
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --登录
+    /**
+     * 通过 wx.login 接口获得的用户登录态拥有一定的时效性。用户越久未使用小程序，用户登录态越有可能失效。反之如果用户一直在使用小程序，则用户登录态一直保持有效。具体时效逻辑由微信维护，对开发者透明。开发者只需要调用 wx.checkSession 接口检测当前用户登录态是否有效。登录态过期后开发者可以再调用 wx.login 获取新的用户登录态。
+     */
+    function checkSession(cb: types.Callbacks): void;
+    /**
+     * 调用接口获取登录凭证（code）进而换取用户登录态信息，包括用户的唯一标识（openid） 及本次登录的 会话密钥（session_key）等。用户数据的加解密通讯需要依赖会话密钥完成。
+     */
+    function login(cb: types.CallbacksWithType<{
+        /**
+         * 用户登录凭证（有效期五分钟）。开发者需要在开发者服务器后台调用 code2accessToken，使用 code 换取 openid 和 session_key 等信息
+         */
+        code: string
+    }>): void;
+
+    // --防沉迷
+    /**
+     * 根据用户当天游戏时间判断用户是否需要休息
+     */
+    function checkIsUserAdvisedToRest(param: {
+        /**
+         * 今天已经玩游戏的时间，单位：秒
+         */
+        todayPlayedTime: number,
+        success?: (res: {
+            /**
+             * 是否建议用户休息
+             */
+            result: boolean
+        }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --用户信息
+    function createUserInfoButton(param: {
+        /**
+         * 按钮类型
+         */
+        type: types.ButtonType,
+        /**
+         * 按钮上的文本，仅当 type 为 text 时有效
+         */
+        text?: string,
+        /**
+         * 按钮的背景图片，仅当 type 为 image 时有效
+         */
+        image?: string,
+        /**
+         * 按钮的样式
+         */
+        style: types.ButtonStyle,
+        /**
+         * 是否带上登录态信息。当 withCredentials 为 true 时，要求此前有调用过 wx.login 且登录态尚未过期，此时返回的数据会包含 encryptedData, iv 等敏感信息；当 withCredentials 为 false 时，不要求有登录态，返回的数据不包含 encryptedData, iv 等敏感信息。
+         */
+        withCredentials?: boolean,
+        lang?: "en" | "zh_CN" | "zh_TW"
+    }): UserInfoButton;
+
+    // --设置
+    /**
+     * 创建打开设置页面的按钮
+     */
+    function createOpenSettingButton(param: {
+        /**
+         * 按钮类型
+         */
+        type: types.ButtonType,
+        /**
+         * 按钮上的文本，仅当 type 为 text 时有效
+         */
+        text?: string,
+        /**
+         * 按钮的背景图片，仅当 type 为 image 时有效
+         */
+        image?: string,
+        /**
+         * 按钮的样式
+         */
+        style: types.ButtonStyle
+    }): OpenSettingButton;
+    /**
+     * 获取用户的当前设置。返回值中只会出现小程序已经向用户请求过的权限。
+     */
+    function getSetting(p: types.CallbacksWithType<{ authSetting: types.AuthSetting }>): void;
+    /**
+     * 调起客户端小程序设置界面，返回用户设置的操作结果。设置界面只会出现小程序已经向用户请求过的权限。
+     * @deprecated
+     */
+    function openSetting(p: types.CallbacksWithType<{ authSetting: types.AuthSetting }>): void;
+
+    // --微信运动
+    /**
+     * 获取用户过去三十天微信运动步数，需要先调用 wx.login 接口。需要用户授权 scope.werun。
+     */
+    function getWeRunData(p: types.CallbacksWithType<{
+        /**
+         * 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法
+         */
+        encryptedData: string,
+        /**
+         * 加密算法的初始向量
+         */
+        iv: string
+    }>): void;
+
+    // --授权
+    /**
+     * 提前向用户发起授权请求。调用后会立刻弹窗询问用户是否同意授权小程序使用某项功能或获取用户的某些数据，但不会实际调用对应接口。如果用户之前已经同意授权，则不会出现弹窗，直接返回成功。
+     */
+    function authorize(param: {
+        /**
+         * 需要获取权限的 scope
+         */
+        scope: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --游戏圈
+    /**
+     * 创建游戏圈按钮。游戏圈按钮被点击后会跳转到小游戏的游戏圈。更多关于游戏圈的信息见 游戏圈使用指南
+     */
+    function createGameClubButton(param: {
+        type: types.ButtonType,
+        text?: string,
+        image?: string,
+        style: types.ButtonStyle,
+        /**
+         * 游戏圈按钮的图标，仅当 object.type 参数为 image 时有效
+         */
+        icon?: types.GameClubButtonIcon
+    }): GameClubButton;
+
+    // --意见反馈
+    /**
+     * 用户点击后打开意见反馈页面的按钮
+     */
+    function createFeedbackButton(param: {
+        type: types.ButtonType,
+        text?: string,
+        image?: string,
+        style: types.ButtonStyle
+    }): FeedbackButton;
+
+    // --客服消息
+    /**
+     * 进入客服会话，要求在用户发生过至少一次 touch 事件后才能调用。后台接入方式与小程序一致，详见 客服消息接入
+     */
+    function openCustomerServiceConversation(param: {
+        /**
+         * 会话来源
+         */
+        sessionFrom?: string,
+        /**
+         * 是否显示会话内消息卡片，设置此参数为 true，用户进入客服会话之后会收到一个消息卡片，通过以下三个参数设置卡片的内容
+         */
+        showMessageCard?: boolean,
+        /**
+         * 会话内消息卡片标题
+         */
+        sendMessageTitle?: string,
+        /**
+         * 会话内消息卡片路径
+         */
+        sendMessagePath?: string,
+        /**
+         * 会话内消息卡片图片路径
+         */
+        sendMessageImg?: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --开放数据域
+    /**
+     * 获取开放数据域
+     */
+    function getOpenDataContext(): OpenDataContext;
+    /**
+     * 监听主域发送的消息
+     */
+    function onMessage(callback: (data: any) => void): void;
+
+    // --转发
+    /**
+     * 获取转发详细信息
+     */
+    function getShareInfo(param: {
+        shareTicket: string,
+        success?: (res: {
+            /**
+             * 错误信息
+             */
+            errMsg: string,
+            /**
+             * 包括敏感数据在内的完整转发信息的加密数据
+             */
+            encryptedData: string,
+            /**
+             * 加密算法的初始向量
+             */
+            iv: string
+        }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 隐藏转发按钮
+     */
+    function hideShareMenu(cb?: types.Callbacks): void;
+    /**
+     * 监听用户点击右上角菜单的“转发”按钮时触发的事件
+     */
+    function onShareAppMessage(cb: () => types.ShareOption): void;
+    /**
+     * 取消监听用户点击右上角菜单的“转发”按钮时触发的事件
+     */
+    function offShareAppMessage(cb: () => types.ShareOption): void;
+    /**
+     * 显示当前页面的转发按钮
+     */
+    function showShareMenu(param?: {
+        /**
+         * 是否使用带 shareTicket 的转发
+         */
+        withShareTicket: boolean,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 主动拉起转发，进入选择通讯录界面。
+     */
+    function shareAppMessage(param: types.ShareOption): void;
+    /**
+     * 更新转发属性
+     */
+    function updateShareMenu(param: {
+        /**
+         * 是否使用带 shareTicket 的转发详情
+         */
+        withShareTicket: boolean,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --性能
+    /**
+     * 获取性能管理器
+     */
+    function getPerformance(): WxPerformance;
+    /**
+     * 加快触发 JavaScriptCore Garbage Collection（垃圾回收），GC 时机是由 JavaScriptCore 来控制的，并不能保证调用后马上触发 GC。
+     */
+    function triggerGC(): void;
+    /**
+     * 监听内存不足告警
+     * @param callback.res.level 内存告警等级，只有 Android 才有，对应系统宏定义:
+     *                           10 TRIM_MEMORY_RUNNING_LOW
+     *                           15 TRIM_MEMORY_RUNNING_CRITICAL
+     */
+    function onMemoryWarning(callback: (res: { level: number }) => void): void;
+
+    // --调试
+    function setEnableDebug(p: {
+        enableDebug: boolean,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --数据缓存
+    /**
+     * 清理本地数据缓存
+     */
+    function clearStorage(param: types.Callbacks): void;
+    /**
+     * clearStorage的同步版本
+     */
+    function clearStorageSync(): void;
+    /**
+     * 从本地缓存中异步获取指定 key 的内容
+     */
+    function getStorage(param: types.GetStorageParams): void;
+    /**
+     * getStorage 的同步版本
+     */
+    function getStorageSync(key: string): any;
+    /**
+     * 异步获取当前storage的相关信息
+     */
+    function getStorageInfo(param: types.CallbacksWithType<types.StorageInfo>): void;
+    /**
+     * getStorageInfo 的同步版本
+     */
+    function getStorageInfoSync(): types.StorageInfo;
+    /**
+     * 从本地缓存中移除指定 key
+     */
+    function removeStorage(param: types.RemoveStorageParams): void;
+    /**
+     * removeStorage 的同步版本
+     * @param key 本地缓存中指定的 key
+     */
+    function removeStorageSync(key: string): void;
+    /**
+     * 将数据存储在本地缓存中指定的 key 中，会覆盖掉原来该 key 对应的内容。
+     */
+    function setStorage(param: types.SetStorageParams): void;
+    /**
+     * setStorage 的同步版本
+     * @param key 本地缓存中指定的 key
+     * @param data 需要存储的内容
+     */
+    function setStorageSync(key: string, data: any): void;
+
+    // --分包加载
+    /**
+     * 触发分包加载，详见 分包加载
+     */
+    function loadSubpackage(param: {
+        /**
+         * 分包的名字，可以填 name 或者 root
+         */
+        name: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): LoadSubpackageTask;
+
+    // --菜单
+    /**
+     * 获取菜单按钮的布局置信息
+     */
+    function getMenuButtonBoundingClientRect(): {
+        /**
+         * 宽度
+         */
+        width: number,
+        /**
+         * 高度
+         */
+        height: number,
+        /**
+         * 上边界坐标
+         */
+        top: number,
+        /**
+         * 右边界坐标
+         */
+        right: number,
+        /**
+         * 下边界坐标
+         */
+        bottom: number,
+        /**
+         * 左边界坐标
+         */
+        left: number
+    };
+    function setMenuStyle(param: {
+        /**
+         * 样式风格
+         */
+        style: "light" | "dark",
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --交互
+    /**
+     * 显示消息提示框
+     */
+    function showToast(param: {
+        /**
+         * 提示的内容
+         */
+        title?: string,
+        /**
+         * 图标
+         */
+        icon?: "success" | "loading",
+        /**
+         * 自定义图标的本地路径，image 的优先级高于 icon
+         */
+        image?: string,
+        /**
+         * 提示的延迟时间
+         */
+        duration?: number,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 隐藏消息提示框
+     */
+    function hideToast(cb?: types.Callbacks): void;
+    /**
+     * 显示模态对话框
+     */
+    function showModal(param: {
+        /**
+         * 提示的标题
+         */
+        title?: string,
+        /**
+         * 提示的内容
+         */
+        content?: string,
+        /**
+         * 是否显示取消按钮，默认true
+         */
+        showCancel?: boolean,
+        /**
+         * 取消按钮的文字，最多 4 个字符串
+         */
+        cancelText?: string,
+        /**
+         * 取消按钮的文字颜色，必须是 16 进制格式的颜色字符串，默认值#000000
+         */
+        cancelColor?: string,
+        /**
+         * 确认按钮的文字，最多 4 个字符串
+         */
+        confirmText?: string,
+        /**
+         * 确认按钮的文字颜色，必须是 16 进制格式的颜色字符串，默认值#3cc51f
+         */
+        confirmColor?: string,
+        success?: (res: { confirm?: boolean, cancel?: boolean }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 显示 loading 提示框, 需主动调用 wx.hideLoading 才能关闭提示框
+     */
+    function showLoading(prms?: {
+        /**
+         * 提示的内容
+         */
+        title?: string,
+        /**
+         * 是否显示透明蒙层
+         */
+        mask?: boolean,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 隐藏 loading 提示框
+     */
+    function hideLoading(cb?: types.Callbacks): void;
+    /**
+     * 显示选择器
+     */
+    function showActionSheet(params: {
+        /**
+         * 按钮的文字数组，数组长度最大为 6
+         */
+        itemList: string[],
+        /**
+         * 按钮的文字颜色，默认值#000000
+         */
+        itemColor?: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --键盘
+    function hideKeyboard(): void;
+    /**
+     * 监听键盘输入事件
+     * @param callback.res.value 键盘输入的当前值
+     */
+    function onKeyboardInput(callback: (res: { value: string }) => void): void;
+    /**
+     * 取消监听键盘输入事件
+     */
+    function offKeyboardInput(callback: (res: { value: string }) => void): void;
+    /**
+     * 监听用户点击键盘 Confirm 按钮时的事件
+     * @param callback.res.value 键盘输入的当前值
+     */
+    function onKeyboardConfirm(callback: (res: { value: string }) => void): void;
+    /**
+     * 取消监听用户点击键盘 Confirm 按钮时的事件
+     */
+    function offKeyboardConfirm(callback: (res: { value: string }) => void): void;
+    /**
+     * 监听监听键盘收起的事件
+     * @param callback.res.value 键盘输入的当前值
+     */
+    function onKeyboardComplete(callback: (res: { value: string }) => void): void;
+    /**
+     * 取消监听监听键盘收起的事件
+     */
+    function offKeyboardComplete(callback: (res: { value: string }) => void): void;
+    /**
+     * 显示键盘
+     */
+    function showKeyboard(param: {
+        /**
+         * 键盘输入框显示的默认值
+         */
+        defaultValue: string,
+        /**
+         * 键盘中文本的最大长度
+         */
+        maxLength?: number,
+        /**
+         * 是否为多行输入
+         */
+        multiple?: boolean,
+        /**
+         * 当点击完成时键盘是否收起
+         */
+        confirmHold?: boolean,
+        /**
+         * 键盘右下角 confirm 按钮的类型，只影响按钮的文本内容
+         */
+        confirmType?: "done" | "next" | "search" | "go" | "send"
+    }): void;
+    /**
+     * 更新键盘，只有当键盘处于拉起状态时才会产生效果
+     */
+    function updateKeyboard(param: {
+        /**
+         * 键盘输入框的当前值
+         */
+        value: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --状态栏
+    /**
+     * 当在配置中设置 showStatusBarStyle 时，屏幕顶部会显示状态栏。此接口可以修改状态栏的样式。
+     */
+    function setStatusBarStyle(param: {
+        style: "white" | "black",
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --窗口
+    /**
+     * 监听窗口尺寸变化事件
+     */
+    function onWindowResize(cb: (res: { windowWidth: number, windowHeight: number }) => void): void;
+    /**
+     * 取消监听窗口尺寸变化事件
+     */
+    function offWindowResize(cb: (res: { windowWidth: number, windowHeight: number }) => void): void;
+
+    // --更新
+    function getUpdateManager(): UpdateManager;
+
+    // --Worker
+    /**
+     * 创建一个 Worker 线程，目前限制最多只能创建一个 Worker，创建下一个 Worker 前请调用 Worker.terminate
+     */
+    function createWorker(): WxWorker;
+
+    // --音频
+    /**
+     * 创建一个 InnerAudioContext 实例
+     */
+    function createInnerAudioContext(): InnerAudioContext;
+    /**
+     * 获取当前支持的音频输入源
+     */
+    function getAvailableAudioSources(param: types.CallbacksWithType<{
+        /**
+         * 音频输入源，每一项对应一种音频输入源
+         */
+        audioSources: types.AudioSourceType[]
+    }>): void;
+
+    // --录音
+    function getRecorderManager(): RecorderManager;
+
+    // --图片
+    /**
+     * 从本地相册选择图片或使用相机拍照。
+     */
+    function chooseImage(param: {
+        count: number,
+        /**
+         * 所选的图片的尺寸
+         */
+        sizeType: ['original'] | ['compressed'] | ['original', 'compressed'],
+        /**
+         * 选择图片的来源
+         */
+        sourceType: ['album'] | ['camera'] | ['album', 'camera'],
+        success?: (res: { tempFilePaths: string[], tempFiles: ImageFile[] }) => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 预览图片，调用之后会在新打开的页面中全屏预览传入的图片，预览的过程中用户可以进行保存图片、发送给朋友等操作
+     */
+    function previewImage(param: {
+        /**
+         * 需要预览的图片链接列表
+         */
+        urls: string[],
+        /**
+         * 当前显示图片的链接，默认为urls的第一张
+         */
+        current?: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+    /**
+     * 保存图片到系统相册。需要用户授权 scope.writePhotosAlbum
+     */
+    function saveImageToPhotosAlbum(param: {
+        /**
+         * 图片文件路径，可以是临时文件路径也可以是永久文件路径，不支持网络图片路径
+         */
+        filePath: string,
+        success?: () => void,
+        fail?: () => void,
+        complete?: () => void
+    }): void;
+
+    // --视频
+    function createVideo(param: {
+        /**
+         * 视频的左上角横坐标
+         */
+        x?: number,
+        /**
+         * 视频的左上角纵坐标
+         */
+        y?: number,
+        /**
+         * 视频的宽度，默认值300
+         */
+        width?: number,
+        /**
+         * 默认值150
+         */
+        height?: number,
+        /**
+         * 视频的资源地址
+         */
+        src: string,
+        /**
+         * 视频的封面
+         */
+        poster?: string,
+        /**
+         * 视频的初始播放位置，单位为 s 秒，默认值0
+         */
+        initialTime?: number,
+        /**
+         * 视频的播放速率，有效值有 0.5、0.8、1.0、1.25、1.5默认值1.0
+         */
+        playbackRate?: number,
+        /**
+         * 视频是否为直播，默认值0
+         */
+        live?: number,
+        /**
+         * 视频的缩放模式
+         * fill - 填充，视频拉伸填满整个容器，不保证保持原有长宽比例
+         * contain - 包含，保持原有长宽比例。保证视频尺寸一定可以在容器里面放得下。因此，可能会有部分空白
+         * cover - 覆盖，保持原有长宽比例。保证视频尺寸一定大于容器尺寸，宽度和高度至少有一个和容器一致。因此，视频有部分会看不见
+         */
+        objectFit?: "contain" | "cover" | "fill",
+        /**
+         * 视频是否显示控件，默认true
+         */
+        controls?: boolean,
+        /**
+         * 视频是否自动播放，默认false
+         */
+        autoplay?: boolean,
+        /**
+         * 视频是否是否循环播放，默认值false
+         */
+        loop?: boolean,
+        /**
+         * 视频是否禁音播放，默认值false
+         */
+        muted?: boolean
+    }): Video;
+
+    // --广告
+    /**
+     * 创建 banner 广告组件。请通过 wx.getSystemInfoSync() 返回对象的 SDKVersion 判断基础库版本号 >= 2.0.4 后再使用该 API。同时，开发者工具上暂不支持调试该 API，请直接在真机上进行调试。
+     */
+    function createBannerAd(param: {
+        /**
+         * 广告单元 id
+         */
+        adUnitId: string,
+        /**
+         * banner 广告组件的样式
+         */
+        style: types.AdStyle
+    }): BannerAd;
+    /**
+     * 创建激励视频广告组件。请通过 wx.getSystemInfoSync() 返回对象的 SDKVersion 判断基础库版本号 >= 2.0.4 后再使用该 API。同时，开发者工具上暂不支持调试该 API，请直接在真机上进行调试。
+     */
+    function createRewardedVideoAd(param: {
+        /**
+         * 广告单元 id
+         */
+        adUnitId: string
+    }): RewardedVideoAd;
+
+    // --虚拟支付
+    /**
+     * 发起米大师支付
+     */
+    function requestMidasPayment(param: {
+        /**
+         * 支付的类型，不同的支付类型有各自额外要传的附加参数。
+         *   game - 购买游戏币
+         */
+        mode: "game",
+        /**
+         * 环境配置，默认值0
+         *   0 - 米大师正式环境
+         *   1 - 米大师沙箱环境
+         */
+        env?: 0 | 1,
+        /**
+         * 在米大师侧申请的应用 id
+         */
+        offerId: string,
+        /**
+         * 币种
+         */
+        currencyType: "CNY",
+        /**
+         * 申请接入时的平台，platform 与应用id有关。
+         */
+        platform?: "android",
+        /**
+         * 购买数量。mode=game 时必填。购买数量。详见 buyQuantity 限制说明。
+         * mode为game（购买游戏币）时，buyQuantity不可任意填写。需满足 buyQuantity * 游戏币单价 = 限定的价格等级。如：游戏币单价为 0.1 元，一次购买最少数量是 10。
+         * 有效价格等级如下：
+         *       价格等级（单位：人民币）
+         *       1
+         *       3
+         *       6
+         *       8
+         *       12
+         *       18
+         *       25
+         *       30
+         *       40
+         *       45
+         *       50
+         *       60
+         *       68
+         *       73
+         *       78
+         *       88
+         *       98
+         *       108
+         *       118
+         *       128
+         *       148
+         *       168
+         *       188
+         *       198
+         *       328
+         *       648
+         */
+        buyQuantity?: number,
+        /**
+         * 分区 ID
+         */
+        zoneId?: string,
+        success?: () => void,
+        /**
+         * @param res.errCode 有如下值：
+         *      -1	系统失败
+         *      -2	支付取消
+         *      -15001	虚拟支付接口错误码，缺少参数
+         *      -15002	虚拟支付接口错误码，参数不合法
+         *      -15003	虚拟支付接口错误码，订单重复
+         *      -15004	虚拟支付接口错误码，后台错误
+         *      -15006	虚拟支付接口错误码，appId 权限被封禁
+         *      -15006	虚拟支付接口错误码，货币类型不支持
+         *      -15007	虚拟支付接口错误码，订单已支付
+         *       1	虚拟支付接口错误码，用户取消支付
+         *       2	虚拟支付接口错误码，客户端错误, 判断到小程序在用户处于支付中时,又发起了一笔支付请求
+         *       3	虚拟支付接口错误码，Android 独有错误：用户使用 Google Play 支付，而手机未安装 Google Play
+         *       4	虚拟支付接口错误码，用户操作系统支付状态异常
+         *       5	虚拟支付接口错误码，操作系统错误
+         *       6	虚拟支付接口错误码，其他错误
+         *       1000	参数错误
+         *       1003	米大师 Portal 错误
+         */
+        fail?: (res: { errMsg: string, errCode: number }) => void,
+        complete?: () => void
+    }): void;
+}
diff --git a/types/wegame-api/tsconfig.json b/types/wegame-api/tsconfig.json
new file mode 100644
index 0000000000..c5f795cd4d
--- /dev/null
+++ b/types/wegame-api/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "compilerOptions": {
+    	"baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "module": "commonjs",
+        "lib": [
+            "es6",
+            "dom"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "forceConsistentCasingInFileNames": true,
+        "noEmit": true
+    },
+    "files": [
+        "index.d.ts",
+        "wegame-api-tests.ts"
+    ]
+}
\ No newline at end of file
diff --git a/types/wegame-api/tslint.json b/types/wegame-api/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/wegame-api/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/wegame-api/wegame-api-tests.ts b/types/wegame-api/wegame-api-tests.ts
new file mode 100644
index 0000000000..a52f78ec9b
--- /dev/null
+++ b/types/wegame-api/wegame-api-tests.ts
@@ -0,0 +1,565 @@
+// 画布
+let canvas = wx.createCanvas();
+console.assert(canvas != null);
+// 图片
+let images = wx.createImage();
+console.assert(images != null);
+// 字体
+let texts = wx.getTextLineHeight({
+    text: "",
+    fontFamily: 'Arial',
+    fontSize: 28,
+    fontWeight: 'bold',
+    fontStyle: 'normal',
+    success: res => {
+        console.assert(res.lineHeight === 0);
+    }
+});
+let textload = wx.loadFont('Arial');
+console.assert(textload != null); // 当前版本不支持此加载自定义字体
+// 帧率
+wx.setPreferredFramesPerSecond(30);
+// 系统信息
+wx.getBatteryInfo({
+    success: info => {
+        console.info(info.isCharging);
+        console.info(info.level);
+    }
+});
+
+let sysinfo = wx.getSystemInfoSync();
+console.dir(sysinfo);
+console.assert(sysinfo.brand != null);
+console.assert(sysinfo.model != null);
+console.assert(sysinfo.pixelRatio != null);
+console.assert(sysinfo.screenWidth != null);
+console.assert(sysinfo.screenHeight != null);
+console.assert(sysinfo.windowWidth != null);
+console.assert(sysinfo.windowHeight != null);
+console.assert(sysinfo.language != null);
+console.assert(sysinfo.system != null);
+console.assert(sysinfo.platform != null);
+console.assert(sysinfo.fontSizeSetting != null);
+console.assert(sysinfo.SDKVersion != null);
+console.assert(sysinfo.benchmarkLevel != null);
+console.assert(sysinfo.battery != null); // 手机电量 报错
+console.assert(sysinfo.wifiSignal != null); // 手机WIFI信号强度 报错
+
+// 系统事件
+const audioEnd = () => {
+    console.log("audio interrupted end");
+};
+wx.onAudioInterruptionEnd(audioEnd);
+wx.offAudioInterruptionEnd(audioEnd);
+const audioBegin = () => {
+    console.log("audio interrupted begin");
+};
+wx.onAudioInterruptionBegin(audioBegin);
+wx.offAudioInterruptionBegin(audioBegin);
+
+const onWXError = (res: { message: string, stack: string }) => { console.error(`sys error: ${res.message}....${res.stack}`); };
+wx.onError(onWXError);
+wx.offError(onWXError);
+
+// 触摸事件
+wx.onTouchStart(d => { console.assert(d != null); });
+wx.onTouchMove(d => { console.assert(d != null); });
+wx.onTouchEnd(d => { console.assert(d != null); });
+wx.onTouchCancel(d => { console.assert(d != null); });
+// 加速计
+wx.onAccelerometerChange(res => {
+    console.assert(res.x != null);
+    console.assert(res.y != null);
+    console.assert(res.z != null);
+});
+wx.startAccelerometer({
+    interval: "game",
+    success: () => {
+        console.log("wx.startAccelerometer success");
+    }
+});
+wx.stopAccelerometer({
+    success: () => {
+        console.log("wx.stopAccelerometer success");
+    }
+});
+// 电量
+let getBat = wx.getBatteryInfoSync();
+console.dir(getBat);
+console.info(getBat.isCharging);
+console.info(getBat.level);
+// 剪切板
+wx.getClipboardData({
+    success: () => {
+        console.log("wx.getClipboardData success");
+    }
+});
+wx.setClipboardData({
+    data: "test",
+    success: () => {
+        console.log("wx.setClipboardData success");
+    }
+});
+// 罗盘
+wx.onCompassChange(res => {
+    console.assert(res.direction != null);
+});
+wx.startCompass({
+    success: () => {
+        console.log("wx.startCompass success");
+    }
+});
+wx.stopCompass({
+    success: () => {
+        console.log("wx.stopCompass success");
+    }
+});
+// 网络
+wx.getNetworkType({
+    success: () => {
+        console.log("wx.getNetworkType success");
+    }
+});
+wx.onNetworkStatusChange(res => {
+    console.assert(res.isConnected != null);
+});
+// 屏幕
+wx.getScreenBrightness({
+    success: () => {
+        console.log("wx.getScreenBrightness success");
+    }
+});
+wx.setKeepScreenOn({
+    keepScreenOn: true,
+    success: () => {
+        console.log("wx.setKeepScreenOn success");
+    }
+});
+wx.setScreenBrightness({
+    value: 1,
+    success: () => {
+        console.log("wx.setScreenBrightness success");
+    }
+});
+// 震动
+wx.vibrateShort({
+    success: () => {
+        console.log("wx.vibrateShort success");
+    }
+});
+wx.vibrateLong({
+    success: () => {
+        console.log("wx.vibrateLong success");
+    }
+});
+// 转屏
+wx.onDeviceOrientationChange(res => {
+    console.assert(res.value != null);
+});
+// 文件
+let getFile = wx.getFileSystemManager();
+console.assert(getFile != null);
+// 位置
+wx.getLocation({
+    success: res => {
+        res.altitude != null;
+        console.log("wx.getLocation success");
+    }
+});
+// 下载
+let downLoad = wx.downloadFile({
+    url: "",
+    header: {},
+    filePath: "",
+    success: () => {
+        console.log("wx.downloadFile success");
+    },
+    fail: () => {
+        console.log("wx.downloadFile fail");
+    },
+    complete: () => {
+        console.log("wx.downloadFile comp");
+    }
+});
+console.assert(downLoad != null);
+downLoad.abort();
+// 发起请求
+let requ = wx.request({
+    url: 'https://www.baidu.com/',
+    success: () => {
+        console.log("wx.request success");
+    }
+});
+console.assert(requ != null);
+requ.abort();
+// WebSocket
+let conne = wx.connectSocket({
+    url: 'wss://www.baidu.com/',
+    header: {},
+    protocols: [],
+    success: () => {
+        console.log("wx.connectSocket success");
+    }
+});
+console.assert(conne != null);
+wx.closeSocket({
+    reason: 'normal close',
+    success: () => {
+        console.log("wx.closeSocket success");
+    }
+});
+wx.onSocketOpen(res => {
+    console.assert(res.header != null);
+});
+wx.onSocketClose;
+wx.sendSocketMessage({
+    data: "testdata",
+    success: () => {
+        console.log("wx.sendSocketMessage success");
+    }
+});
+// 上传
+let upLoad = wx.uploadFile({
+    url: "https://www.baidu.com/",
+    filePath: "./",
+    name: "111",
+    success: () => {
+        console.log("wx.uploadFile success");
+    },
+    fail: () => {
+        console.log("wx.uploadFile fail");
+    }
+});
+console.assert(upLoad != null);
+upLoad.onProgressUpdate(res => {
+    console.log(`upload progress: ${res.progress}, ${res.totalBytesSent / res.totalBytesExpectedToSend}`);
+});
+upLoad.abort();
+
+// 开放数据
+let context = wx.getOpenDataContext();
+context.postMessage({
+    item: "friend"
+});
+context.postMessage({
+    item: "group"
+});
+context.postMessage({
+    item: "user"
+});
+
+wx.removeUserCloudStorage({
+    keyList: []
+});
+wx.setUserCloudStorage({
+    KVDataList: []
+});
+
+// 登录
+wx.checkSession({
+    success: () => {
+        console.log("session valid");
+    }
+});
+wx.login({
+    success: (res) => {
+        console.log(`login code: ${res.code}`);
+    }
+});
+// 防沉迷
+wx.checkIsUserAdvisedToRest({
+    todayPlayedTime: 10,
+    success: res => {
+        console.assert(res.result != null);
+    }
+});
+// 用户信息
+let ubtn = wx.createUserInfoButton({
+    type: 'text',
+    text: 'test btn',
+    style: {
+        left: 1,
+        top: 1,
+        width: 100,
+        height: 40,
+        /**
+         * 格式#ff0000
+         */
+        backgroundColor: '#fefefe',
+        /**
+         * 格式#ff0000
+         */
+        borderColor: '#cccccc',
+        borderWidth: 1,
+        borderRadius: 3,
+        textAlign: "center",
+        fontSize: 24,
+        lineHeight: 24
+    }
+});
+console.assert(ubtn != null);
+ubtn.onTap(res => {
+    console.assert(res.errMsg != null && res.userInfo != null);
+});
+const newUserInfoParam: wx.types.NewUserInfoParam = {
+    success: res => {
+        console.assert(res.data != null);
+    }
+};
+wx.getUserInfo(newUserInfoParam);
+// 设置
+let createOpenSet = wx.createOpenSettingButton({
+    type: "text",
+    text: "testbtn",
+    style: {
+        left: 10,
+        top: 76,
+        width: 200,
+        height: 40,
+        lineHeight: 40,
+        backgroundColor: '#ff12ff',
+        borderColor: '#000',
+        borderWidth: 1,
+        borderRadius: 3,
+        textAlign: 'center',
+        fontSize: 16
+    }
+});
+console.assert(createOpenSet != null);
+wx.getSetting({
+    success: res => {
+        res.authSetting != null;
+    }
+});
+wx.openSetting({
+    success: res => {
+        res.authSetting != null;
+    }
+});
+// 微信运动
+wx.getWeRunData({
+    success: res => {
+        res.encryptedData != null;
+        res.iv != null;
+    }
+});
+// 授权
+wx.authorize({
+    scope: "userInfo"
+});
+// 游戏圈
+let yxq = wx.createGameClubButton({
+    type: "text",
+    text: "dssss",
+    style: {
+        left: 10,
+        top: 76,
+        width: 200,
+        height: 40,
+        lineHeight: 40,
+        backgroundColor: '#f00ff0',
+        borderColor: '#fff222',
+        borderWidth: 1,
+        borderRadius: 3,
+        textAlign: 'center',
+        fontSize: 16
+    },
+    icon: "green"
+});
+console.assert(yxq != null);
+// 意见反馈
+wx.createFeedbackButton({
+    type: "text",
+    text: "dssss",
+    style: {
+        left: 10,
+        top: 76,
+        width: 200,
+        height: 40,
+        lineHeight: 40,
+        backgroundColor: '#00f0f0',
+        borderColor: '#000',
+        borderWidth: 1,
+        borderRadius: 3,
+        textAlign: 'center',
+        fontSize: 16
+    }
+});
+// 客服消息
+wx.openCustomerServiceConversation({
+    success: () => {
+        console.log("opened conversation window");
+    }
+});
+// 开放数据域
+let getOpenD = wx.getOpenDataContext();
+console.assert(getOpenD != null);
+// 转发
+wx.getShareInfo({
+    shareTicket: "",
+    success: res => {
+        res.encryptedData != null;
+        res.errMsg != null;
+        res.iv != null;
+    }
+});
+wx.hideShareMenu();
+wx.onShareAppMessage((): wx.types.ShareOption => {
+    return {
+    	imageUrl: "test.png",
+    	title: "test title",
+    	query: "__shareQueryStr"
+    };
+});
+wx.showShareMenu({
+    withShareTicket: true
+});
+wx.shareAppMessage({
+    title: ''
+});
+wx.updateShareMenu({
+    withShareTicket: true
+});
+// 性能
+let getPer = wx.getPerformance();
+console.assert(getPer != null);
+// 调试
+wx.setEnableDebug({
+    enableDebug: true
+});
+// 数据缓存
+wx.clearStorage({
+    success: () => {
+        console.log("wx.clearStorage success");
+    }
+});
+wx.getStorage({
+    key: 'test key',
+    success: res => {
+        console.assert(res.data != null);
+    }
+});
+wx.getStorageInfo({
+    success: res => {
+        console.assert(res.keys != null);
+        console.assert(res.currentSize != null);
+        console.assert(res.limitSize != null);
+        console.log('wx.getStorageInfo success');
+    }
+});
+wx.removeStorage({
+    key: "test key",
+    success: () => {
+        console.log('wx.removeStorage success');
+    }
+});
+wx.setStorage({
+    key: "",
+    data: "",
+    success: () => {
+        console.log('wx.removeStorage success');
+    }
+});
+// 分包加载
+let loadSu = wx.loadSubpackage({
+    name: 'package name',
+    success: () => {
+        console.log('wx.loadSubpackage success');
+    }
+});
+// 菜单
+let getMenu = wx.getMenuButtonBoundingClientRect();
+console.dir(getMenu);
+console.assert(getMenu.width != null);
+console.assert(getMenu.height != null);
+console.assert(getMenu.top != null);
+console.assert(getMenu.right != null);
+console.assert(getMenu.bottom != null);
+console.assert(getMenu.left != null);
+wx.setMenuStyle({
+    style: 'dark'
+});
+// 交互
+wx.showModal({
+    title: "modal window"
+});
+wx.showToast({
+    duration: 1,
+    title: "show toast"
+});
+wx.showLoading({
+    title: "loaidng..."
+});
+wx.showActionSheet({
+    itemList: []
+});
+wx.hideToast();
+wx.hideLoading();
+// 键盘
+wx.hideKeyboard();
+wx.onKeyboardInput(res => {
+    console.assert(res.value != null);
+});
+wx.showKeyboard({
+    defaultValue: "ABCDE",
+    maxLength: 22,
+    multiple: true,
+    confirmHold: false,
+    confirmType: "done"
+});
+wx.updateKeyboard({
+    value: 'DEFGHI'
+});
+// 状态栏
+wx.setStatusBarStyle({
+    style: "black"
+});
+// 窗口
+wx.onWindowResize(res => {
+    console.assert(res.windowHeight !== 0);
+    console.assert(res.windowWidth !== 0);
+});
+// 更新
+let getUpda = wx.getUpdateManager();
+console.assert(getUpda != null);
+// worker
+let createWor = wx.createWorker();
+console.assert(createWor != null);
+// 音频
+let creatInn = wx.createInnerAudioContext();
+console.assert(creatInn != null);
+
+wx.getAvailableAudioSources({
+    success: res => {
+        console.assert(res.audioSources.length > 0);
+    }
+});
+// 录音
+let getRecord = wx.getRecorderManager();
+console.assert(getRecord != null);
+// 图片
+wx.chooseImage({
+    count: 1,
+    sizeType: ['original'],
+    sourceType: ['album'],
+    success: res => {
+        console.assert(res.tempFilePaths.length > 0);
+    }
+});
+wx.previewImage({
+    urls: []
+});
+wx.saveImageToPhotosAlbum({
+    filePath: "./temp"
+});
+// 视频
+wx.createVideo({
+    src: "../res/testv.mp4",
+    objectFit: 'fill'
+});
+// 虚拟支付
+wx.requestMidasPayment({
+    mode: "game",
+    offerId: "",
+    currencyType: "CNY"
+});
diff --git a/types/weixin-app/index.d.ts b/types/weixin-app/index.d.ts
index 88d8c4bfc5..9f6fee5a55 100644
--- a/types/weixin-app/index.d.ts
+++ b/types/weixin-app/index.d.ts
@@ -1,3035 +1,3265 @@
-// Type definitions for wx-app 1.9
+// Type definitions for wx-app 2.2
 // Project: https://mp.weixin.qq.com/debug/wxadoc/dev/api/
 // Definitions by: taoqf <https://github.com/taoqf>
 //                 AlexStacker <https://github.com/AlexStacker>
+//                 Jimexist <https://github.com/Jimexist>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.3
+// TypeScript Version: 2.8
 
 declare namespace wx {
-  // #region 基本参数
-  interface DataResponse {
-    /** 回调函数返回的内容 */
-    data: any;
-  }
-  interface ErrMsgResponse {
-    /** 成功：ok，错误：详细信息 */
-    errMsg: 'ok' | string;
-  }
-  interface TempFileResponse {
-    /** 文件的临时路径 */
-    tempFilePath: string;
-  }
-  interface BaseOptions {
-    /** 接口调用成功的回调函数 */
-    success?(res: any): void;
-    /** 接口调用失败的回调函数 */
-    fail?(res: any): void;
-    /** 接口调用结束的回调函数（调用成功、失败都会执行） */
-    complete?(res: any): void;
-  }
-  // #endregion
-  // #region 网络API列表
-  // 发起请求
-  interface RequestHeader {
-    [key: string]: string;
-  }
-  interface RequestOptions extends BaseOptions {
-    /** 开发者服务器接口地址 */
-    url: string;
-    /** 请求的参数 */
-    data?: string | any;
-    /** 设置请求的 header , header 中不能设置 Referer */
-    header?: RequestHeader;
-    /** 默认为 GET，有效值：OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
-    method?: string;
-    /** 如果设为json，会尝试对返回的数据做一次 JSON.parse */
-    dataType?: string;
-    /**
-     * 设置响应的数据类型。合法值：text、arraybuffer
-     * @version 1.7.0
-     */
-    responseType?: string;
-    /** 收到开发者服务成功返回的回调函数，res = {data: '开发者服务器返回的内容'} */
-    success?(res: DataResponse): void;
-  }
-  /**
-   * wx.request发起的是https请求。一个微信小程序，同时只能有5个网络请求连接。
-   */
-  function request(options: RequestOptions): void;
-  interface UploadTask {
-    /**
-     * 监听上传进度变化
-     * @version 1.4.0
-     */
-    onProgressUpdate(callback?: (res: {
-      /** 上传进度百分比 */
-      progress: number;
-      /** 已经上传的数据长度，单位 Bytes */
-      totalBytesSent: number;
-      /** 预期需要上传的数据总长度，单位 Bytes */
-      totalBytesExpectedToSend: number;
-    }) => void): void;
-    /**
-     * 中断下载任务
-     * @version 1.4.0
-     */
-    abort(): void;
-  }
-  // 上传下载
-  interface UploadFileOptions extends BaseOptions {
-    /** 开发者服务器 url */
-    url: string;
-    /** 要上传文件资源的路径 */
-    filePath: string;
-    /** 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容 */
-    name: string;
-    /** HTTP 请求 Header , header 中不能设置 Referer */
-    header?: RequestHeader;
-    /** HTTP 请求中其他额外的 form data */
-    formData?: any;
-  }
-  /**
-   * 将本地资源上传到开发者服务器。
-   * 如页面通过 wx.chooseImage 等接口获取到一个本地资源的临时文件路径后，
-   * 可通过此接口将本地资源上传到指定服务器。
-   * 客户端发起一个 HTTPS POST 请求，
-   * 其中 Content-Type 为 multipart/form-data 。
-   */
-  function uploadFile(options: UploadFileOptions): UploadTask;
-  interface DownloadTask {
-    /**
-     * 监听下载进度变化
-     * @version 1.4.0
-     */
-    onProgressUpdate(callback?: (res: {
-      /** 下载进度百分比 */
-      progress: number;
-      /** 已经下载的数据长度，单位 Bytes */
-      totalBytesWritten: number;
-      /** 预期需要下载的数据总长度，单位 Bytes */
-      totalBytesExpectedToWrite: number;
-    }) => void): void;
-    /**
-     * 中断下载任务
-     * @version 1.4.0
-     */
-    abort(): void;
-  }
-  interface DownloadFileOptions extends BaseOptions {
-    /** 下载资源的 url */
-    url: string;
-    /** 下载资源的类型，用于客户端识别处理，有效值：image/audio/video */
-    type?: string;
-    /** HTTP 请求 Header */
-    header?: RequestHeader;
-    /** 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'} */
-    success?(res: TempFileResponse): void;
-  }
-  /**
-   * 下载文件资源到本地。客户端直接发起一个 HTTP GET 请求，
-   * 把下载到的资源根据 type 进行处理，并返回文件的本地临时路径。
-   */
-  function downloadFile(options: DownloadFileOptions): DownloadTask;
-  // WebSocket
-  interface ConnectSocketOptions extends BaseOptions {
-    /** 开发者服务器接口地址，必须是 HTTPS 协议，且域名必须是后台配置的合法域名 */
-    url: string;
-    /** 请求的数据 */
-    data?: any;
-    /** HTTP Header , header 中不能设置 Referer */
-    header?: RequestHeader;
-    /** 默认是GET，有效值为： OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
-    method?: string;
-    /**
-     * 子协议数组
-     * @version 1.4.0
-     */
-    protocols?: string[];
-  }
-  /**
-   * 创建一个 WebSocket 连接；
-   * 一个微信小程序同时只能有一个 WebSocket 连接，
-   * 如果当前已存在一个 WebSocket 连接，
-   * 会自动关闭该连接，并重新创建一个 WebSocket 连接。
-   */
-  function connectSocket(options: ConnectSocketOptions): void;
-  /** 监听WebSocket连接打开事件。 */
-  function onSocketOpen(callback: () => void): void;
-  /** 监听WebSocket错误。 */
-  function onSocketError(callback: (error: any) => void): void;
-  interface SendSocketMessageOptions extends BaseOptions {
-    /** 需要发送的内容 */
-    data: string;
-  }
-  /**
-   * 通过 WebSocket 连接发送数据，需要先 wx.connectSocket，
-   * 并在 wx.onSocketOpen 回调之后才能发送。
-   */
-  function sendSocketMessage(options: SendSocketMessageOptions): void;
-  /**
-   * 监听WebSocket接受到服务器的消息事件。
-   */
-  function onSocketMessage(callback: (res: DataResponse) => void): void;
-  /**
-   * 关闭WebSocket连接。
-   */
-  function closeSocket(): void;
-  /** 监听WebSocket关闭。 */
-  function onSocketClose(callback: () => void): void;
-  // #endregion
-  // #region 媒体API列表
-  // 媒体-----图片
-  type ImageSizeType = 'original' | 'compressed';
-  type ImageSourceType = 'album' | 'camera';
-  type VideoSourceType = 'album' | 'camera';
-  type CameraDevice = 'front' | 'back';
-  interface TempFile {
-    /** 本地文件路径 */
-    path: string;
-    /** 本地文件大小，单位：B */
-    size: number;
-  }
-  interface TempFilesData {
-    /** 文件的临时路径 */
-    tempFilePaths: string;
-    /**
-     * 图片的本地文件列表，每一项是一个 File 对象
-     * @version 1.2.0
-     */
-    tempFiles: TempFile[];
-  }
-  interface ChooseImageOptions extends BaseOptions {
-    /** 最多可以选择的图片张数，默认9 */
-    count?: number;
-    /** original 原图，compressed 压缩图，默认二者都有 */
-    sizeType?: ImageSizeType[];
-    /** album 从相册选图，camera 使用相机，默认二者都有 */
-    sourceType?: ImageSourceType[];
-    /** 成功则返回图片的本地文件路径列表 tempFilePaths */
-    success(res: TempFilesData): void;
-  }
-  /**
-   * 从本地相册选择图片或使用相机拍照。
-   */
-  function chooseImage(options: ChooseImageOptions): void;
-  interface PreviewImageOptions extends BaseOptions {
-    /** 当前显示图片的链接，不填则默认为 urls 的第一张 */
-    current?: string;
-    /** 需要预览的图片链接列表 */
-    urls: string[];
-  }
-  /**
-   * 预览图片。
-   */
-  function previewImage(options: PreviewImageOptions): void;
-  interface GetImageInfoOptions extends BaseOptions {
-    /**
-     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
-     */
-    src: string;
-  }
-  /**
-   * 获取图片信息
-   */
-  function getImageInfo(options: GetImageInfoOptions): void;
-  interface SaveImageToPhotosAlbumOptions extends BaseOptions {
-    /**
-     * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
-     */
-    filePath: string;
-    success(res: {
-      errMsg: string
-    }): void;
-  }
-  /**
-   * 保存图片到系统相册。
-   * 需要用户授权 scope.writePhotosAlbum
-   * @version 1.2.0
-   */
-  function saveImageToPhotosAlbum(options: SaveImageToPhotosAlbumOptions): void;
-  // 媒体-----录音
-  interface StartRecordOptions extends BaseOptions {
-    /** 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'} */
-    success?(res: TempFileResponse): void;
-  }
-  /**
-   * 开始录音。当主动调用wx.stopRecord，
-   * 或者录音超过1分钟时自动结束录音，返回录音文件的临时文件路径。
-   * 注：文件的临时路径，在小程序本次启动期间可以正常使用，
-   * 如需持久保存，需在主动调用wx.saveFile，在小程序下次启动时才能访问得到。
-   * @deprecated 1.6.0
-   */
-  function startRecord(options: StartRecordOptions): void;
-  interface StopRecordOptions extends BaseOptions {
-    success?(): void;
-  }
-  /**
-   * 主动调用停止录音。
-   */
-  function stopRecord(options?: StopRecordOptions): void;
-  type EncodeBitRate = 8000 | 11025 | 12000 | 16000 | 22050 | 24000 | 32000 | 44100 | 48000;
-  interface RecorderManagerStartOptions {
-    /**
-     * 指定录音的时长，单位 ms
-     * 如果传入了合法的 duration
-     * 在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
-     */
-    duration?: number;
-    /**
-     * 采样率，有效值 8000/16000/44100
-     */
-    sampleRate?: number;
-    /**
-     * 否 录音通道数，有效值 1/2
-     */
-    numberOfChannels?: number;
-    /**
-     * 编码码率
-     * 采样率和码率有一定要求，具体有效值如下：
-     * 采样率 编码码率
-     * + 8000 16000 ~ 48000
-     * + 11025 16000 ~ 48000
-     * + 12000 24000 ~ 64000
-     * + 16000 24000 ~ 96000
-     * + 22050 32000 ~ 128000
-     * + 24000 32000 ~ 128000
-     * + 32000 48000 ~ 192000
-     * + 44100 64000 ~ 320000
-     * + 48000 64000 ~ 320000
-     */
-    encodeBitRate: number;
-    /** 音频格式，有效值 aac/mp3 */
-    format: string;
-    /**
-     * 指定帧大小，单位 KB
-     * 传入 frameSize 后，每录制指定帧大小的内容后
-     * 会回调录制的文件内容，不指定则不会回调。暂仅支持 mp3 格式。
-     */
-    frameSize: number;
-  }
-  interface OnRecorderManagerStopOptions {
-    tempFilePath: string;
-  }
-  interface OnFrameRecordedOptions {
-    /**  录音分片结果数据 */
-    frameBuffer: ArrayBuffer;
-    /** 当前帧是否正常录音结束前的最后一帧 */
-    isLastFrame: boolean;
-  }
-  interface RecorderManager {
-    /** 开始录音 */
-    start(options?: RecorderManagerStartOptions): void;
-    /** 暂停录音 */
-    pause(): void;
-    /** 继续录音 */
-    resume(): void;
-    /** 停止录音 */
-    stop(): void;
-    /** 录音开始事件 */
-    onStart(callback?: () => void): void;
-    /** 录音暂停事件 */
-    onPause(callback?: () => void): void;
-    /** 录音恢复事件 */
-    onResume(callback?: () => void): void;
-    /** 录音停止事件，会回调文件地址 */
-    onStop(callback?: (options: OnRecorderManagerStopOptions) => void): void;
-    /** 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件 */
-    onFrameRecorded(callback?: (options: OnFrameRecordedOptions) => void): void;
-    /** 录音错误事件, 会回调错误信息 */
-    onError(callback?: (err: ErrMsgResponse) => void): void;
-  }
-  /**
-   * 获取全局唯一的录音管理器 recorderManager
-   * @version 1.6.0
-   */
-  function getRecorderManager(): RecorderManager;
-  // 媒体-----音频播放控制
-  interface PlayVoiceOptions extends BaseOptions {
-    /** 需要播放的语音文件的文件路径 */
-    filePath: string;
-  }
-  /**
-   * 开始播放语音，同时只允许一个语音文件正在播放，
-   * 如果前一个语音文件还没播放完，将中断前一个语音播放。
-   * @deprecated 1.6.0
-   */
-  function playVoice(options: PlayVoiceOptions): void;
-  /**
-   * 暂停正在播放的语音。
-   * 再次调用wx.playVoice播放同一个文件时，会从暂停处开始播放。
-   * 如果想从头开始播放，需要先调用 wx.stopVoice。
-   * @deprecated 1.6.0
-   */
-  function pauseVoice(): void;
-  /**
-   * 结束播放语音。
-   * @deprecated 1.6.0
-   */
-  function stopVoice(): void;
-  // 媒体-----音乐播放控制
-  interface BackgroundAudioPlayerState {
-    /** 选定音频的长度（单位：s），只有在当前有音乐播放时返回 */
-    duration: number;
-    /** 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回 */
-    currentPosition: number;
-    /** 播放状态（2：没有音乐在播放，1：播放中，0：暂停中） */
-    status: number;
-    /** 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回 */
-    downloadPercent: number;
-    /** 歌曲数据链接，只有在当前有音乐播放时返回 */
-    dataUrl: string;
-  }
-  interface GetBackgroundAudioPlayerStateOptions extends BaseOptions {
-    /** 接口调用成功的回调函数 */
-    success?(state: BackgroundAudioPlayerState): void;
-    /** 接口调用失败的回调函数 */
-    fail?(): void;
-    /** 接口调用结束的回调函数（调用成功、失败都会执行） */
-    complete?(): void;
-  }
-  /**
-   * 获取音乐播放状态。
-   * @deprecated 1.2.0
-   */
-  function getBackgroundAudioPlayerState(options: GetBackgroundAudioPlayerStateOptions): void;
-  interface PlayBackgroundAudioOptions extends BaseOptions {
-    /** 音乐链接 */
-    dataUrl: string;
-    /** 音乐标题 */
-    title?: string;
-    /** 封面URL */
-    coverImgUrl?: string;
-  }
-  /**
-   * 播放音乐，同时只能有一首音乐正在播放。
-   * @deprecated 1.2.0
-   */
-  function playBackgroundAudio(options: PlayBackgroundAudioOptions): void;
-  /**
-   * 暂停播放音乐。
-   * @deprecated 1.2.0
-   */
-  function pauseBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
-  interface SeekBackgroundAudioOptions extends BaseOptions {
-    /** 音乐位置，单位：秒 */
-    position: number;
-  }
-  /**
-   * 控制音乐播放进度。
-   * @deprecated 1.2.0
-   */
-  function seekBackgroundAudio(options: SeekBackgroundAudioOptions): void;
-  /**
-   * 停止播放音乐。
-   * @deprecated 1.2.0
-   */
-  function stopBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
-  /**
-   * 监听音乐播放。
-   * @deprecated 1.2.0
-   */
-  function onBackgroundAudioPlay(callback: () => void): void;
-  /**
-   * 监听音乐暂停。
-   * @deprecated 1.2.0
-   */
-  function onBackgroundAudioPause(callback: () => void): void;
-  /**
-   * 监听音乐停止。
-   * @deprecated 1.2.0
-   */
-  function onBackgroundAudioStop(callback: () => void): void;
-  interface BackgroundAudioManager {
-    /** 当前音频的长度（单位：s），只有在当前有合法的 src 时返回 */
-    readonly duration: number;
-    /** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回 */
-    readonly currentTime: number;
-    /** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放 */
-    readonly paused: boolean;
-    /** 音频的数据源，默认为空字符串，当设置了新的 src 时，会自动开始播放 ，目前支持的格式有 m4a, aac, mp3, wav */
-    src: string;
-    /** 音频开始播放的位置（单位：s） */
-    startTime: number;
-    /** 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲。 是 */
-    buffered: number;
-    /** 音频标题，用于做原生音频播放器音频标题。原生音频播放器中的分享功能，分享出去的卡片标题，也将使用该值。 */
-    title: string;
-    /** 专辑名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
-    epname: string;
-    /** 歌手名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
-    singer: string;
-    /** 封面图url，用于做原生音频播放器背景图。原生音频播放器中的分享功能，分享出去的卡片配图及背景也将使用该图。 */
-    coverImgUrl: string;
-    /** 页面链接，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
-    webUrl: string;
-    /** 播放 */
-    play(): void;
-    /** 暂停 */
-    pause(): void;
-    /** 停止 */
-    stop(): void;
-    /** 跳转到指定位置，单位 s */
-    seek(position: number): void;
-    /** 背景音频进入可以播放状态，但不保证后面可以流畅播放 */
-    onCanplay(callback?: () => void): void;
-    /** 背景音频播放事件 */
-    onPlay(callback?: () => void): void;
-    /** 背景音频暂停事件 */
-    onPause(callback?: () => void): void;
-    /** 背景音频停止事件 */
-    onStop(callback?: () => void): void;
-    /** 背景音频自然播放结束事件 */
-    onEnded(callback?: () => void): void;
-    /** 背景音频播放进度更新事件 */
-    onTimeUpdate(callback?: () => void): void;
-    /** 用户在系统音乐播放面板点击上一曲事件（iOS only） */
-    onPrev(callback?: () => void): void;
-    /** 用户在系统音乐播放面板点击下一曲事件（iOS only） */
-    onNext(callback?: () => void): void;
-    /** 背景音频播放错误事件 */
-    onError(callback?: () => void): void;
-    /** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
-    onWaiting(callback?: () => void): void;
-  }
-  /**
-   * 获取全局唯一的背景音频管理器 backgroundAudioManager。
-   * @version 1.2.0
-   */
-  function getBackgroundAudioManager(): BackgroundAudioManager;
-  // 媒体-----音频组件控制
-  /**
-   * audioContext 通过 audioId 跟一个 <audio/> 组件绑定，通过它可以操作对应的 <audio/> 组件。
-   */
-  interface AudioContext {
-    /**
-     * 音频的地址
-     */
-    setSrc(src: string): void;
-    /**
-     * 播放
-     */
-    play(): void;
-    /**
-     * 暂停
-     */
-    pause(): void;
-    /**
-     * 跳转到指定位置，单位 s
-     */
-    seek(position: number): void;
-  }
-  /**
-   * 创建并返回 audio 上下文 audioContext 对象
-   * @param audioId audio标签id <audio  src="{{src}}" id="myAudio" ></audio>
-   * @example
-   * <!-- audio.wxml -->
-   * <audio  src="{{src}}" id="myAudio" ></audio>
-   * <button type="primary" bindtap="audioPlay">播放</button>
-   * <button type="primary" bindtap="audioPause">暂停</button>
-   * <button type="primary" bindtap="audio14">设置当前播放时间为14秒</button>
-   * <button type="primary" bindtap="audioStart">回到开头</button>
-   * // audio.js
-   * Page({
-   * onReady: function (e) {
-   *   // 使用 wx.createAudioContext 获取 audio 上下文 context
-   *   this.audioCtx = wx.createAudioContext('myAudio')
-   *   this.audioCtx.setSrc('http://ws.stream.qqmusic.qq.com/
-   * M500001VfvsJ21xFqb.mp3?guid=ffffffff82def4af4b12b3cd9337d5e7&
-   * uin=346897220&vkey=6292F51E1E384E06DCBDC9AB7C49FD713D632D313AC4858BACB8DDD29067D3C601481D36E62053BF8DFEAF74C0A5CCFADD6471160CAF3E6A&
-   * fromtag=46')
-   *   this.audioCtx.play()
-   * },
-   * data: {
-   *   src: ''
-   * },
-   * audioPlay: function () {
-   *   this.audioCtx.play()
-   * },
-   * audioPause: function () {
-   *   this.audioCtx.pause()
-   * },
-   * audio14: function () {
-   *   this.audioCtx.seek(14)
-   * },
-   * audioStart: function () {
-   *   this.audioCtx.seek(0)
-   * }
-   * })
-   * @deprecated 1.6.0
-   */
-  function createAudioContext(audioId: string, instance: any): AudioContext;
-  interface InnerAudioContext {
-    /** 当前音频的长度（单位：s），只有在当前有合法的 src 时返 */
-    readonly duration: number;
-    /** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回，时间不取整，保留小数点后 6  */
-    readonly currentTime: number;
-    /** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播 */
-    readonly paused: boolean;
-    /**  音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲 */
-    readonly buffered: number;
-    /** 音频的数据链接，用于直接播放。 */
-    src: string;
-    /** 开始播放的位置（单位：s），默认 0 */
-    startTime: number;
-    /** 是否自动开始播放，默认 false */
-    autoplay: boolean;
-    /** 是否循环播放，默认 false */
-    loop: boolean;
-    /** 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true */
-    obeyMuteSwitch: boolean;
-    /** 播放 */
-    play(): void;
-    /** 暂停 */
-    pause(): void;
-    /** 停止 */
-    stop(): void;
-    /** 跳转到指定位置，单位 s */
-    seek(position: number): void;
-    /** 销毁当前实例 */
-    destroy(): void;
-    /** 音频进入可以播放状态，但不保证后面可以流畅播放 */
-    onCanplay(callback?: () => void): void;
-    /** 音频播放事件 */
-    onPlay(callback?: () => void): void;
-    /** 音频暂停事件 */
-    onPause(callback?: () => void): void;
-    /** 音频停止事件 */
-    onStop(callback?: () => void): void;
-    /** 音频自然播放结束事件 */
-    onEnded(callback?: () => void): void;
-    /** 音频播放进度更新事件 */
-    onTimeUpdate(callback?: () => void): void;
-    /** 音频播放错误事件 */
-    onError(callback?: () => void): void;
-    /** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
-    onWaiting(callback?: () => void): void;
-    /** 音频进行 seek 操作事件 */
-    onSeeking(callback?: () => void): void;
-    /** 音频完成 seek 操作事件 */
-    onSeeked(callback?: () => void): void;
-  }
-  /**
-   * 创建并返回内部 audio 上下文 innerAudioContext 对象。
-   * 本接口是 wx.createAudioContext 升级版。
-   * @version 1.6.0
-   */
-  function createInnerAudioContext(): InnerAudioContext;
-  // 媒体-----视频
-  interface ChooseVideoOptions extends BaseOptions {
-    /** album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera'] */
-    sourceType?: VideoSourceType[];
-    /** 拍摄视频最长拍摄时间，单位秒。最长支持60秒 */
-    maxDuration?: number;
-    /** 前置或者后置摄像头，默认为前后都有，即：['front', 'back'] */
-    camera?: CameraDevice[];
-    /** 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明 */
-    success?(res: VideoData): void;
-  }
-  /**
-   * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
-   */
-  function chooseVideo(options: ChooseVideoOptions): void;
-  // 媒体-----视频组件控制
-  interface VideoContext {
-    /**
-     * 播放
-     */
-    play(): void;
-    /**
-     * 暂停
-     */
-    pause(): void;
-    /**
-     * 跳转到指定位置，单位 s
-     */
-    seek(position: number): void;
-    /**
-     * 发送弹幕，danmu 包含两个属性 text, color。
-     */
-    sendDanmu(danmu: {
-      text: string;
-      color: number | string;
-    }): void;
-  }
-  interface VideoData {
-    /** 选定视频的临时文件路径 */
-    tempFilePath: string;
-    /** 选定视频的时间长度 */
-    duration: number;
-    /** 选定视频的数据量大小 */
-    size: number;
-    /** 返回选定视频的长 */
-    height: number;
-    /** 返回选定视频的宽 */
-    width: number;
-  }
-  /**
-   * 创建并返回 video 上下文 videoContext 对象
-   * @param videoId video标签id <video  src="{{src}}" id="myVideo" ></video>
-   */
-  function createVideoContext(videoId: string): VideoContext;
-  interface TakePhotoOptions extends BaseOptions {
-    /** 成像质量，值为high, normal, low，默认normal */
-    quality?: string;
-    success?(res: { tempImagePath: string }): void;
-  }
-  interface StartRecordOptions extends BaseOptions {
-    /** 超过30s或页面onHide时会结束录像 */
-    timeoutCallback?(res: { tempThumbPath: string, tempVideoPath: string }): void;
-  }
-  interface StopRecordOptions extends BaseOptions {
-    success?(res: { tempThumbPath: string, tempVideoPath: string }): void;
-  }
-  interface CameraContext {
-    /** 拍照，可指定质量，成功则返回图片 */
-    takePhoto(options: TakePhotoOptions): void;
-    /** 开始录像 */
-    startRecord(options: StartRecordOptions): void;
-    /** 结束录像，成功则返回封面与视频 */
-    stopRecord(options: StopRecordOptions): void;
-  }
-  /**
-   * 创建并返回 camera 上下文 cameraContext 对象
-   * cameraContext 与页面的 camera 组件绑定
-   * 一个页面只能有一个camera，通过它可以操作对应的 <camera/> 组件。
-   * 在自定义组件下，第一个参数传入组件实例this，以操作组件内 <camera/> 组件
-   * @version 1.6.0
-   */
-  function createCameraContext(instance: any): CameraContext;
-  interface RequestFullScreenOptions extends BaseOptions {
-    /** 有效值为 0（正常竖向）, 90（屏幕逆时针90度）, -90（屏幕顺时针90度） */
-    direction: number;
-  }
-  interface LivePlayerContext {
-    /** 播放 */
-    play(options: BaseOptions): void;
-    /** 停止 */
-    stop(options: BaseOptions): void;
-    /** 静音 */
-    mute(options: BaseOptions): void;
-    /** 进入全屏 */
-    requestFullScreen(options: RequestFullScreenOptions): void;
-    /** 退出全屏 */
-    exitFullScreen(options: BaseOptions): void;
-  }
-  /**
-   * 操作对应的 <live-player/> 组件。
-   * 创建并返回 live-player 上下文 LivePlayerContext 对象。
-   * 在自定义组件下，第二个参数传入组件实例this，以操作组件内 <live-player/> 组件
-   * @version 1.7.0
-   */
-  function createLivePlayerContext(id: string, instance: any): LivePlayerContext;
-  // 文件
-  interface SavedFileData {
-    /** 文件的保存路径 */
-    savedFilePath: string;
-  }
-  interface SaveFileOptions extends BaseOptions {
-    /** 需要保存的文件的临时路径 */
-    tempFilePath: string;
-    /** 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'} */
-    success?(res: SavedFileData): void;
-  }
-  /**
-   * 保存文件到本地。
-   * 本地文件存储的大小限制为 10M
-   */
-  function saveFile(options: SaveFileOptions): void;
-  interface File {
-    /**
-     * 文件的本地路径
-     */
-    filePath: string;
-    /**
-     * 文件的保存时的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
-     */
-    createTime: number;
-    /**
-     * 文件大小，单位B
-     */
-    size: number;
-  }
-  interface GetFileInfoOptions extends BaseOptions {
-    /** 本地文件路径 */
-    filePath: string;
-    /** 计算文件摘要的算法，默认值 md5，有效值：md5，sha1 */
-    digestAlgorithm?: string;
-    success?(options: GetFileInfoSuccess): void;
-  }
-  interface GetFileInfoSuccess {
-    /** 文件大小，单位：B */
-    size: number;
-    /** 按照传入的 digestAlgorithm 计算得出的的文件摘要 */
-    digest: string;
-    /** 调用结果 */
-    errMsg: string;
-  }
-  /**
-   *  获取文件信息
-   * @version 1.4.0
-   */
-  function getFileInfo(options: GetFileInfoOptions): void;
-  interface GetSavedFileListData {
-    /**
-     * 接口调用结果
-     */
-    errMsg: string;
-    /**
-     * 文件列表
-     */
-    fileList: File[];
-  }
-  interface GetSavedFileListOptions extends BaseOptions {
-    /** 接口调用成功的回调函数 */
-    success?(res: GetSavedFileListData): void;
-  }
-  /**
-   * 获取本地已保存的文件列表
-   */
-  function getSavedFileList(options: GetSavedFileListOptions): void;
-  interface SavedFileInfoData {
-    /**
-     * 接口调用结果
-     */
-    errMsg: string;
-    /**
-     * 文件大小，单位B
-     */
-    size: number;
-    /**
-     * 文件的保存是的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
-     */
-    createTime: number;
-  }
-  interface GetSavedFileInfoOptions extends BaseOptions {
-    filePath: string;
-    /** 接口调用成功的回调函数 */
-    success?(res: SavedFileInfoData): void;
-  }
-  /**
-   * 获取本地文件的文件信息
-   */
-  function getSavedFileInfo(options: GetSavedFileInfoOptions): void;
-  type RemoveSavedFileOptions = BaseOptions;
-  /**
-   * 删除本地存储的文件
-   */
-  function removeSavedFile(options: RemoveSavedFileOptions): void;
-  interface OpenDocumentOptions extends BaseOptions {
-    /**
-     * 文件路径，可通过 downFile 获得
-     */
-    filePath: string;
-  }
-  /**
-   * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
-   */
-  function openDocument(options: OpenDocumentOptions): void;
-  // 数据缓存
-  interface SetStorageOptions extends BaseOptions {
-    /** 本地缓存中的指定的 key */
-    key: string;
-    /** 需要存储的内容 */
-    data: any | string;
-  }
-  /**
-   * 将数据存储在本地缓存中指定的 key 中，
-   * 会覆盖掉原来该 key 对应的内容，这是一个异步接口。
-   */
-  function setStorage(options: SetStorageOptions): void;
-  /**
-   * 将 data 存储在本地缓存中指定的 key 中，
-   * 会覆盖掉原来该 key 对应的内容，这是一个同步接口。
-   *
-   * @param key 本地缓存中的指定的 key
-   * @param data 需要存储的内容
-   */
-  function setStorageSync(key: string, data: any | string): void;
-  interface GetStorageOptions extends BaseOptions {
-    /** 本地缓存中的指定的 key */
-    key: string;
-    /** 接口调用的回调函数,res = {data: key对应的内容} */
-    success(res: DataResponse): void;
-  }
-  /**
-   * 从本地缓存中异步获取指定 key 对应的内容。
-   */
-  function getStorage(options: GetStorageOptions): void;
-  /**
-   * 从本地缓存中同步获取指定 key 对应的内容。
-   *
-   */
-  function getStorageSync(key: string): any | string;
-  interface StorageInfo {
-    /**
-     * 当前storage中所有的key
-     */
-    keys: string[];
-    /**
-     * 当前占用的空间大小, 单位kb
-     */
-    currentSize: number;
-    /**
-     * 限制的空间大小，单位kb
-     */
-    limitSize: number;
-  }
-  interface GetStorageInfoOptions extends BaseOptions {
-    success(res: StorageInfo): void;
-  }
-  /**
-   * 异步获取当前storage的相关信息
-   */
-  function getStorageInfo(options: GetStorageInfoOptions): void;
-  function getStorageInfoSync(): GetStorageInfoOptions;
-  interface RemoveStorageOptions extends BaseOptions {
-    key: string;
-    success?(res: DataResponse): void;
-  }
-  function removeStorage(options: RemoveStorageOptions): void;
-  function removeStorageSync(key: string): DataResponse;
-  /**
-   * 清理本地数据缓存。
-   */
-  function clearStorage(): void;
-  /**
-   * 同步清理本地数据缓存
-   */
-  function clearStorageSync(): void;
-  // #endregion
-  // #region 位置API列表
-  // 位置-----获取位置
-  interface LocationData {
-    /** 纬度，浮点数，范围为-90~90，负数表示南纬 */
-    latitude: number;
-    /** 经度，浮点数，范围为-180~180，负数表示西经 */
-    longitude: number;
-    /** 速度，浮点数，单位m/s */
-    speed: number;
-    /** 位置的精确度 */
-    accuracy: number;
-  }
-  interface GetLocationOptions extends BaseOptions {
-    /** 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于wx.openLocation的坐标 */
-    type?: 'wgs84' | 'gcj02';
-    /** 接口调用成功的回调函数，返回内容详见返回参数说明。 */
-    success(res: LocationData): void;
-  }
-  /**
-   * 获取当前的地理位置、速度。
-   */
-  function getLocation(options: GetLocationOptions): void;
-  interface ChooseLocationData {
-    /**
-     * 位置名称
-     */
-    name: string;
-    /**
-     * 详细地址
-     */
-    address: string;
-    /**
-     * 纬度，浮点数，范围为-90~90，负数表示南纬
-     */
-    latitude: number;
-    /**
-     * 经度，浮点数，范围为-180~180，负数表示西经
-     */
-    longitude: number;
-  }
-  interface ChooseLocationOptions extends BaseOptions {
-    success(res: ChooseLocationData): void;
-  }
-  /**
-   * 打开地图选择位置
-   */
-  function chooseLocation(options: ChooseLocationOptions): void;
-  // 位置-----查看位置
-  interface OpenLocationOptions extends BaseOptions {
-    /** 纬度，范围为-90~90，负数表示南纬 */
-    latitude: number;
-    /** 经度，范围为-180~180，负数表示西经 */
-    longitude: number;
-    /** 缩放比例，范围1~28，默认为28 */
-    scale?: number;
-    /** 位置名 */
-    name?: string;
-    /** 地址的详细说明 */
-    address?: string;
-  }
-  /**
-   * 使用微信内置地图查看位置
-   */
-  function openLocation(options: OpenLocationOptions): void;
-  // 位置-----地图组件控制
-  interface GetCenterLocationOptions extends BaseOptions {
-    success(res: {
-      longitude: number;
-      latitude: number;
-    }): void;
-  }
-  /**
-   * mapContext 通过 mapId 跟一个 <map/> 组件绑定，通过它可以操作对应的 <map/> 组件。
-   */
-  interface MapContext {
-    /**
-     * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 wx.openLocation
-     */
-    getCenterLocation(options: GetCenterLocationOptions): OpenLocationOptions;
-    /**
-     * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
-     */
-    moveToLocation(): void;
-  }
-  /**
-   * 创建并返回 map 上下文 mapContext 对象
-   */
-  function createMapContext(mapId: string): MapContext;
-  // #endregion
-  // #region 设备API列表
-  // 设备-----系统信息
-  interface SystemInfo {
-    /** 手机型号 */
-    model: string;
-    /** 设备像素比 */
-    pixelRatio: number;
-    /** 窗口宽度 */
-    windowWidth: number;
-    /** 窗口高度 */
-    windowHeight: number;
-    /** 微信设置的语言 */
-    language: string;
-    /** 微信版本号 */
-    version: string;
-  }
-  interface GetSystemInfoOptions extends BaseOptions {
-    /** 成功获取系统信息的回调 */
-    success(res: SystemInfo): void;
-  }
-  /**
-   * 获取系统信息。
-   */
-  function getSystemInfo(options: GetSystemInfoOptions): void;
-  function getSystemInfoSync(): SystemInfo;
-  /**
-   * 判断小程序的API，回调，参数，组件等是否在当前版本可用。
-   * String参数说明：
-   * 使用 ${API}.${method}.${param}.${options}
-   * 或者 ${component}.${attribute}.${option}方式来调用
-   * 例如：
-   * ${API} 代表 API 名字
-   * ${method} 代表调用方式，有效值为return, success, object, callback
-   * ${param} 代表参数或者返回值
-   * ${options} 代表参数的可选值
-   * ${component} 代表组件名字
-   * ${attribute} 代表组件属性
-   * ${option} 代表组件属性的可选值
-   */
-  function canIUse(api: string): boolean;
-  // 设备-----网络状态
-  type networkType = '2g' | '3g' | '4g' | 'wifi' | 'unknown' | 'none';
-  interface NetworkTypeData {
-    /** 返回网络类型2g，3g，4g，wifi */
-    networkType: networkType;
-  }
-  interface GetNetworkTypeOptions extends BaseOptions {
-    /** 接口调用成功，返回网络类型 networkType */
-    success(res: NetworkTypeData): void;
-  }
-  /**
-   * 获取网络类型。
-   */
-  function getNetworkType(options: GetNetworkTypeOptions): void;
-  /**
-   * 监听网络状态变化。
-   * 微信客户端 6.5.6 版本开始支持
-   * @version 1.1.0
-   */
-  function onNetworkStatusChange(callback: (res: {
-    isConnected: boolean;
-    networkType: networkType;
-  }) => void): void;
-  // 设备-----加速度计
-  interface AccelerometerData {
-    /** X 轴 */
-    x: number;
-    /** Y 轴 */
-    y: number;
-    /** Z 轴 */
-    z: number;
-  }
-  type AccelerometerChangeCallback = (res: AccelerometerData) => void;
-  /**
-   * 监听重力感应数据，频率：5次/秒
-   */
-  function onAccelerometerChange(callback: AccelerometerChangeCallback): void;
-  type AccelerometerOptions = BaseOptions;
-  /**
-   * 开始监听加速度数据。
-   * 微信客户端 6.5.6 版本开始支持
-   * @version 1.1.0
-   */
-  function startAccelerometer(options: AccelerometerOptions): void;
-  /**
-   * 停止监听加速度数据。
-   * 微信客户端 6.5.6 版本开始支持
-   * @version 1.1.0
-   */
-  function stopAccelerometer(options: AccelerometerOptions): void;
-  // 设备-----罗盘
-  interface CompassData {
-    /** 面对的方向度数 */
-    direction: number;
-  }
-  type CompassChangeCallback = (res: CompassData) => void;
-  /**
-   * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用wx.stopCompass停止监听。
-   */
-  function onCompassChange(callback: CompassChangeCallback): void;
-  type CompassOptions = BaseOptions;
-  /**
-   * 开始监听罗盘数据。
-   * 微信客户端 6.5.6 版本开始支持
-   * @version 1.1.0
-   */
-  function startCompass(options: CompassOptions): void;
-  function stopCompass(options: CompassOptions): void;
-  // 设备-----拨打电话
-  interface MakePhoneCallOptions extends BaseOptions {
-    /**
-     * 需要拨打的电话号码
-     */
-    phoneNumber: string;
-  }
-  /**
-   * 拨打电话
-   */
-  function makePhoneCall(options: MakePhoneCallOptions): void;
-  // 设备-----扫码
-  type scanType = "qrCode" | "barCode";
-  interface ScanCodeData {
-    /**
-     * 所扫码的内容
-     */
-    result: string;
-    /**
-     * 所扫码的类型
-     */
-    scanType: scanType;
-    /**
-     * 所扫码的字符集
-     */
-    charSet: string;
-    /**
-     * 当所扫的码为当前小程序的合法二维码时，会返回此字段，内容为二维码携带的 path
-     */
-    path: string;
-  }
-  interface ScanCodeOptions extends BaseOptions {
-    /**
-     * 是否只能从相机扫码，不允许从相册选择图片
-     * @version 1.2.0
-     */
-    onlyFromCamera?: boolean;
-    /**
-     * 扫码类型，参数类型是数组
-     * 二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
-     * @version 1.7.0
-     */
-    scanType?: string[];
-    success(res: ScanCodeData): void;
-  }
-  /**
-   * 调起客户端扫码界面，扫码成功后返回对应的结果
-   */
-  function scanCode(options: ScanCodeOptions): void;
-  // 设备-----剪贴板
-  interface ClipboardDataOptions extends BaseOptions {
-    data: string;
-    success?(res: DataResponse): void;
-  }
-  /**
-   * 设置系统剪贴板的内容
-   * 微信客户端 6.5.6 版本开始支持
-   * @version 1.1.0
-   */
-  function setClipboardData(options: ClipboardDataOptions): void;
-  /**
-   * 获取系统剪贴板内容
-   * 微信客户端 6.5.6 版本开始支持
-   * @version 1.1.0
-   */
-  function getClipboardData(options: ClipboardDataOptions): void;
-  // 设备-----蓝牙
-  interface OpenBluetoothAdapterOptions extends BaseOptions {
-    success(res: any): void;
-  }
-  /**
-   * 初始化蓝牙适配器
-   * @version 1.1.0
-   */
-  function openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
-  interface CloseBluetoothAdapterOptions extends BaseOptions {
-    success(res: any): void;
-  }
-  /**
-   * 关闭蓝牙模块。调用该方法将断开所有已建立的链接并释放系统资源
-   * @version 1.1.0
-   */
-  function closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
-  interface BluetoothAdapterState {
-    /**
-     * 蓝牙适配器是否可用
-     */
-    available: boolean;
-    /**
-     * 蓝牙适配器是否处于搜索状态
-     */
-    discovering: boolean;
-  }
-  interface BluetoothAdapterStateData extends ErrMsgResponse {
-    /**
-     * 蓝牙适配器信息
-     */
-    adapterState: BluetoothAdapterState;
-  }
-  interface GetBluetoothAdapterStateOptions extends BaseOptions {
-    success(res: BluetoothAdapterStateData): void;
-  }
-  /**
-   * 获取本机蓝牙适配器状态
-   * @version 1.1.0
-   */
-  function getBluetoothAdapterState(options: GetBluetoothAdapterStateOptions): void;
-  /**
-   * 监听蓝牙适配器状态变化事件
-   * @version 1.1.0
-   */
-  function onBluetoothAdapterStateChange(callback: (res: BluetoothAdapterState) => void): void;
-  interface StartBluetoothDevicesDiscoveryOptions extends BaseOptions {
-    success(res: ErrMsgResponse): void;
-    /**
-     * 蓝牙设备主 service 的 uuid 列表
-     * 某些蓝牙设备会广播自己的主 service 的 uuid。如果这里传入该数组，那么根据该 uuid 列表，只搜索有这个主服务的设备。
-     */
-    services?: string[];
-  }
-  /**
-   * 开始搜寻附近的蓝牙外围设备。
-   * 注意，该操作比较耗费系统资源，请在搜索并连接到设备后调用 stop 方法停止搜索。
-   * @example
-   * // 以微信硬件平台的蓝牙智能灯为例，主服务的 UUID 是 FEE7。传入这个参数，只搜索主服务 UUID 为 FEE7 的设备
-   * wx.startBluetoothDevicesDiscovery({
-   *   services: ['FEE7'],
-   *   success: function (res) {
-   *     console.log(res)
-   *   }
-   * });
-   */
-  function startBluetoothDevicesDiscovery(options: StartBluetoothDevicesDiscoveryOptions): void;
-  interface StopBluetoothDevicesDiscoveryOptions extends BaseOptions {
-    success(res: ErrMsgResponse): void;
-  }
-  /**
-   * 停止搜寻附近的蓝牙外围设备。请在确保找到需要连接的设备后调用该方法停止搜索。
-   * @version 1.1.0
-   */
-  function stopBluetoothDevicesDiscovery(options: StopBluetoothDevicesDiscoveryOptions): void;
-  /**
-   * 蓝牙设备信息
-   */
-  interface BluetoothDevice {
-    /**
-     * 蓝牙设备名称，某些设备可能没有
-     */
-    name: string;
-    /**
-     * 用于区分设备的 id
-     */
-    deviceId: string;
-    /**
-     * int 当前蓝牙设备的信号强度
-     */
-    RSSI: number;
-    /**
-     * 当前蓝牙设备的广播内容
-     */
-    advertisData: ArrayBuffer;
-  }
-  interface GetBluetoothDevicesOptions extends BaseOptions {
-    success(res: {
-      devices: BluetoothDevice[];
-    } & ErrMsgResponse): void;
-  }
-  /**
-   * 获取所有已发现的蓝牙设备，包括已经和本机处于连接状态的设备
-   */
-  function getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
-  /**
-   * 监听寻找到新设备的事件
-   * @version 1.1.0
-   */
-  function onBluetoothDeviceFound(callback: (res: {
-    devices: BluetoothDevice[]
-  }) => void): void;
-  interface GetConnectedBluetoothDevicesOptions extends BaseOptions {
-    services: string[];
-    success(res: {
-      devices: BluetoothDevice[]
-    } & ErrMsgResponse): void;
-  }
-  /**
-   * 根据 uuid 获取处于已连接状态的设备
-   * @version 1.1.0
-   */
-  function getConnectedBluetoothDevices(options: GetConnectedBluetoothDevicesOptions): void;
-  interface CreateBLEConnectionOptions extends BaseOptions {
-    success(res: ErrMsgResponse): void;
-  }
-  /**
-   * 低功耗蓝牙接口
-   * @version 1.1.0
-   */
-  function createBLEConnection(options: CreateBLEConnectionOptions): void;
-  interface CloseBLEConnectionOptions extends BaseOptions {
-    /**
-     * 蓝牙设备 id，参考 getDevices 接口
-     */
-    deviceId: string;
-    success(res: ErrMsgResponse): void;
-  }
-  /**
-   * 断开与低功耗蓝牙设备的连接
-   * @version 1.1.0
-   */
-  function closeBLEConnection(options: CloseBLEConnectionOptions): void;
-  interface GetBLEDeviceServicesOptions extends BaseOptions {
-    /**
-     * 蓝牙设备 id，参考 getDevices 接口
-     */
-    deviceId: string;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success(res: {
-      services: Array<{
-        uuid: string;
-        isPrimary: boolean;
-      }>;
-    } & ErrMsgResponse): void;
-  }
-  /**
-   * 获取蓝牙设备所有 service（服务）
-   */
-  function getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
-  interface GetBLEDeviceCharacteristicsOptions extends BaseOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId: string;
-    /**
-     * 蓝牙服务 uuid
-     */
-    serviceId: string;
-    /**
-     * 成功则返回本机蓝牙适配器状态
-     */
-    success(res: {
-      characteristics: Array<{
-        uuid: string;
-        properties: Array<{
-          /**
-           * 该特征值是否支持 read 操作
-           */
-          read: boolean;
-          /**
-           * 该特征值是否支持 write 操作
-           */
-          write: boolean;
-          /**
-           * 该特征值是否支持 notify 操作
-           */
-          notify: boolean;
-          /**
-           * 该特征值是否支持 indicate 操作
-           */
-          indicate: boolean;
-        }>;
-      }>;
-    } & ErrMsgResponse): void;
-  }
-  /**
-   * 获取蓝牙设备所有 characteristic（特征值）
-   */
-  function getBLEDeviceCharacteristics(options: GetBLEDeviceCharacteristicsOptions): void;
-  interface BLECharacteristicValueOptions extends BaseOptions {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId: string;
-    /**
-     * 蓝牙特征值对应服务的 uuid
-     */
-    serviceId: string;
-    /**
-     * 蓝牙特征值的 uuid
-     */
-    characteristicId: string;
-    success(res: {
-      characteristic: {
+    // #region 基本参数
+    interface DataResponse {
+        /** 回调函数返回的内容 */
+        data: object | string | ArrayBuffer;
+        /** 开发者服务器返回的 HTTP 状态码 */
+        statusCode: number;
+        /** 开发者服务器返回的 HTTP Response Header */
+        header: object;
+    }
+    interface ErrMsgResponse {
+        /** 成功：ok，错误：详细信息 */
+        errMsg: "ok" | string;
+    }
+    interface TempFileResponse {
+        /** 文件的临时路径 */
+        tempFilePath: string;
+    }
+    interface BaseOptions {
+        /** 接口调用成功的回调函数 */
+        success?(res: any): void;
+        /** 接口调用失败的回调函数 */
+        fail?(res: any): void;
+        /** 接口调用结束的回调函数（调用成功、失败都会执行） */
+        complete?(res: any): void;
+    }
+    // #endregion
+    // #region 网络API列表
+    // 发起请求
+    interface RequestHeader {
+        [key: string]: string;
+    }
+    interface RequestOptions extends BaseOptions {
+        /** 开发者服务器接口地址 */
+        url: string;
+        /** 请求的参数 */
+        data?: string | object | ArrayBuffer;
+        /** 设置请求的 header , header 中不能设置 Referer */
+        header?: RequestHeader;
+        /** 默认为 GET，有效值：OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
+        method?:
+            | "GET"
+            | "OPTIONS"
+            | "GET"
+            | "HEAD"
+            | "POST"
+            | "PUT"
+            | "DELETE"
+            | "TRACE"
+            | "CONNECT";
+        /** 如果设为json，会尝试对返回的数据做一次 JSON.parse */
+        dataType?: string;
         /**
-         * 蓝牙设备特征值的 uuid
+         * 设置响应的数据类型。合法值：text、arraybuffer
+         * @version 1.7.0
          */
-        characteristicId: string;
+        responseType?: string;
+        /** 收到开发者服务成功返回的回调函数，res = {data: '开发者服务器返回的内容'} */
+        success?(res: DataResponse): void;
+    }
+    /**
+     * wx.request发起的是https请求。一个微信小程序，同时只能有5个网络请求连接。
+     */
+    function request(options: RequestOptions): RequestTask;
+
+    /**
+     * 返回一个 requestTask 对象，通过 requestTask，可中断请求任务。
+     */
+    interface RequestTask {
+        abort(): void;
+    }
+
+    interface UploadTask {
         /**
-         * 蓝牙设备特征值对应服务的 uuid
+         * 监听上传进度变化
+         * @version 1.4.0
+         */
+        onProgressUpdate(
+            callback?: (
+                res: {
+                    /** 上传进度百分比 */
+                    progress: number;
+                    /** 已经上传的数据长度，单位 Bytes */
+                    totalBytesSent: number;
+                    /** 预期需要上传的数据总长度，单位 Bytes */
+                    totalBytesExpectedToSend: number;
+                }
+            ) => void
+        ): void;
+        /**
+         * 中断下载任务
+         * @version 1.4.0
+         */
+        abort(): void;
+    }
+    // 上传下载
+    interface UploadFileOptions extends BaseOptions {
+        /** 开发者服务器 url */
+        url: string;
+        /** 要上传文件资源的路径 */
+        filePath: string;
+        /** 文件对应的 key , 开发者在服务器端通过这个 key 可以获取到文件二进制内容 */
+        name: string;
+        /** HTTP 请求 Header , header 中不能设置 Referer */
+        header?: RequestHeader;
+        /** HTTP 请求中其他额外的 form data */
+        formData?: any;
+    }
+    /**
+     * 将本地资源上传到开发者服务器。
+     * 如页面通过 wx.chooseImage 等接口获取到一个本地资源的临时文件路径后，
+     * 可通过此接口将本地资源上传到指定服务器。
+     * 客户端发起一个 HTTPS POST 请求，
+     * 其中 Content-Type 为 multipart/form-data 。
+     */
+    function uploadFile(options: UploadFileOptions): UploadTask;
+    interface DownloadTask {
+        /**
+         * 监听下载进度变化
+         * @version 1.4.0
+         */
+        onProgressUpdate(
+            callback?: (
+                res: {
+                    /** 下载进度百分比 */
+                    progress: number;
+                    /** 已经下载的数据长度，单位 Bytes */
+                    totalBytesWritten: number;
+                    /** 预期需要下载的数据总长度，单位 Bytes */
+                    totalBytesExpectedToWrite: number;
+                }
+            ) => void
+        ): void;
+        /**
+         * 中断下载任务
+         * @version 1.4.0
+         */
+        abort(): void;
+    }
+    interface DownloadFileOptions extends BaseOptions {
+        /** 下载资源的 url */
+        url: string;
+        /** 下载资源的类型，用于客户端识别处理，有效值：image/audio/video */
+        type?: string;
+        /** HTTP 请求 Header */
+        header?: RequestHeader;
+        /** 下载成功后以 tempFilePath 的形式传给页面，res = {tempFilePath: '文件的临时路径'} */
+        success?(res: TempFileResponse): void;
+    }
+    /**
+     * 下载文件资源到本地。客户端直接发起一个 HTTP GET 请求，
+     * 把下载到的资源根据 type 进行处理，并返回文件的本地临时路径。
+     */
+    function downloadFile(options: DownloadFileOptions): DownloadTask;
+    // WebSocket
+    interface ConnectSocketOptions extends BaseOptions {
+        /** 开发者服务器接口地址，必须是 HTTPS 协议，且域名必须是后台配置的合法域名 */
+        url: string;
+        /** 请求的数据 */
+        data?: any;
+        /** HTTP Header , header 中不能设置 Referer */
+        header?: RequestHeader;
+        /** 默认是GET，有效值为： OPTIONS, GET, HEAD, POST, PUT, DELETE, TRACE, CONNECT */
+        method?: string;
+        /**
+         * 子协议数组
+         * @version 1.4.0
+         */
+        protocols?: string[];
+    }
+    /**
+     * 创建一个 WebSocket 连接；
+     * 一个微信小程序同时只能有一个 WebSocket 连接，
+     * 如果当前已存在一个 WebSocket 连接，
+     * 会自动关闭该连接，并重新创建一个 WebSocket 连接。
+     */
+    function connectSocket(options: ConnectSocketOptions): void;
+    /** 监听WebSocket连接打开事件。 */
+    function onSocketOpen(callback: () => void): void;
+    /** 监听WebSocket错误。 */
+    function onSocketError(callback: (error: any) => void): void;
+    interface SendSocketMessageOptions extends BaseOptions {
+        /** 需要发送的内容 */
+        data: string;
+    }
+    /**
+     * 通过 WebSocket 连接发送数据，需要先 wx.connectSocket，
+     * 并在 wx.onSocketOpen 回调之后才能发送。
+     */
+    function sendSocketMessage(options: SendSocketMessageOptions): void;
+    /**
+     * 监听WebSocket接受到服务器的消息事件。
+     */
+    function onSocketMessage(callback: (res: DataResponse) => void): void;
+    /**
+     * 关闭WebSocket连接。
+     */
+    function closeSocket(): void;
+    /** 监听WebSocket关闭。 */
+    function onSocketClose(callback: () => void): void;
+    // #endregion
+    // #region 媒体API列表
+    // 媒体-----图片
+    type ImageSizeType = "original" | "compressed";
+    type ImageSourceType = "album" | "camera";
+    type VideoSourceType = "album" | "camera";
+    type CameraDevice = "front" | "back";
+    interface TempFile {
+        /** 本地文件路径 */
+        path: string;
+        /** 本地文件大小，单位：B */
+        size: number;
+    }
+    interface TempFilesData {
+        /** 文件的临时路径 */
+        tempFilePaths: string;
+        /**
+         * 图片的本地文件列表，每一项是一个 File 对象
+         * @version 1.2.0
+         */
+        tempFiles: TempFile[];
+    }
+    interface ChooseImageOptions extends BaseOptions {
+        /** 最多可以选择的图片张数，默认9 */
+        count?: number;
+        /** original 原图，compressed 压缩图，默认二者都有 */
+        sizeType?: ImageSizeType[];
+        /** album 从相册选图，camera 使用相机，默认二者都有 */
+        sourceType?: ImageSourceType[];
+        /** 成功则返回图片的本地文件路径列表 tempFilePaths */
+        success(res: TempFilesData): void;
+    }
+    /**
+     * 从本地相册选择图片或使用相机拍照。
+     */
+    function chooseImage(options: ChooseImageOptions): void;
+    interface PreviewImageOptions extends BaseOptions {
+        /** 当前显示图片的链接，不填则默认为 urls 的第一张 */
+        current?: string;
+        /** 需要预览的图片链接列表 */
+        urls: string[];
+    }
+    /**
+     * 预览图片。
+     */
+    function previewImage(options: PreviewImageOptions): void;
+    interface GetImageInfoOptions extends BaseOptions {
+        /**
+         * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+         */
+        src: string;
+    }
+    /**
+     * 获取图片信息
+     */
+    function getImageInfo(options: GetImageInfoOptions): void;
+    interface SaveImageToPhotosAlbumOptions extends BaseOptions {
+        /**
+         * 图片的路径，可以是相对路径，临时文件路径，存储文件路径，网络图片路径
+         */
+        filePath: string;
+        success(res: { errMsg: string }): void;
+    }
+    /**
+     * 保存图片到系统相册。
+     * 需要用户授权 scope.writePhotosAlbum
+     * @version 1.2.0
+     */
+    function saveImageToPhotosAlbum(
+        options: SaveImageToPhotosAlbumOptions
+    ): void;
+    // 媒体-----录音
+    interface StartRecordOptions extends BaseOptions {
+        /** 录音成功后调用，返回录音文件的临时文件路径，res = {tempFilePath: '录音文件的临时路径'} */
+        success?(res: TempFileResponse): void;
+    }
+    /**
+     * 开始录音。当主动调用wx.stopRecord，
+     * 或者录音超过1分钟时自动结束录音，返回录音文件的临时文件路径。
+     * 注：文件的临时路径，在小程序本次启动期间可以正常使用，
+     * 如需持久保存，需在主动调用wx.saveFile，在小程序下次启动时才能访问得到。
+     * @deprecated 1.6.0
+     */
+    function startRecord(options: StartRecordOptions): void;
+    interface StopRecordOptions extends BaseOptions {
+        success?(): void;
+    }
+    /**
+     * 主动调用停止录音。
+     */
+    function stopRecord(options?: StopRecordOptions): void;
+    type EncodeBitRate =
+        | 8000
+        | 11025
+        | 12000
+        | 16000
+        | 22050
+        | 24000
+        | 32000
+        | 44100
+        | 48000;
+    interface RecorderManagerStartOptions {
+        /**
+         * 指定录音的时长，单位 ms
+         * 如果传入了合法的 duration
+         * 在到达指定的 duration 后会自动停止录音，最大值 600000（10 分钟）,默认值 60000（1 分钟）
+         */
+        duration?: number;
+        /**
+         * 采样率，有效值 8000/16000/44100
+         */
+        sampleRate?: number;
+        /**
+         * 否 录音通道数，有效值 1/2
+         */
+        numberOfChannels?: number;
+        /**
+         * 编码码率
+         * 采样率和码率有一定要求，具体有效值如下：
+         * 采样率 编码码率
+         * + 8000 16000 ~ 48000
+         * + 11025 16000 ~ 48000
+         * + 12000 24000 ~ 64000
+         * + 16000 24000 ~ 96000
+         * + 22050 32000 ~ 128000
+         * + 24000 32000 ~ 128000
+         * + 32000 48000 ~ 192000
+         * + 44100 64000 ~ 320000
+         * + 48000 64000 ~ 320000
+         */
+        encodeBitRate: number;
+        /** 音频格式，有效值 aac/mp3 */
+        format: string;
+        /**
+         * 指定帧大小，单位 KB
+         * 传入 frameSize 后，每录制指定帧大小的内容后
+         * 会回调录制的文件内容，不指定则不会回调。暂仅支持 mp3 格式。
+         */
+        frameSize: number;
+    }
+    interface OnRecorderManagerStopOptions {
+        tempFilePath: string;
+    }
+    interface OnFrameRecordedOptions {
+        /**  录音分片结果数据 */
+        frameBuffer: ArrayBuffer;
+        /** 当前帧是否正常录音结束前的最后一帧 */
+        isLastFrame: boolean;
+    }
+    interface RecorderManager {
+        /** 开始录音 */
+        start(options?: RecorderManagerStartOptions): void;
+        /** 暂停录音 */
+        pause(): void;
+        /** 继续录音 */
+        resume(): void;
+        /** 停止录音 */
+        stop(): void;
+        /** 录音开始事件 */
+        onStart(callback?: () => void): void;
+        /** 录音暂停事件 */
+        onPause(callback?: () => void): void;
+        /** 录音恢复事件 */
+        onResume(callback?: () => void): void;
+        /** 录音停止事件，会回调文件地址 */
+        onStop(
+            callback?: (options: OnRecorderManagerStopOptions) => void
+        ): void;
+        /** 已录制完指定帧大小的文件，会回调录音分片结果数据。如果设置了 frameSize ，则会回调此事件 */
+        onFrameRecorded(
+            callback?: (options: OnFrameRecordedOptions) => void
+        ): void;
+        /** 录音错误事件, 会回调错误信息 */
+        onError(callback?: (err: ErrMsgResponse) => void): void;
+    }
+    /**
+     * 获取全局唯一的录音管理器 recorderManager
+     * @version 1.6.0
+     */
+    function getRecorderManager(): RecorderManager;
+    // 媒体-----音频播放控制
+    interface PlayVoiceOptions extends BaseOptions {
+        /** 需要播放的语音文件的文件路径 */
+        filePath: string;
+    }
+    /**
+     * 开始播放语音，同时只允许一个语音文件正在播放，
+     * 如果前一个语音文件还没播放完，将中断前一个语音播放。
+     * @deprecated 1.6.0
+     */
+    function playVoice(options: PlayVoiceOptions): void;
+    /**
+     * 暂停正在播放的语音。
+     * 再次调用wx.playVoice播放同一个文件时，会从暂停处开始播放。
+     * 如果想从头开始播放，需要先调用 wx.stopVoice。
+     * @deprecated 1.6.0
+     */
+    function pauseVoice(): void;
+    /**
+     * 结束播放语音。
+     * @deprecated 1.6.0
+     */
+    function stopVoice(): void;
+    // 媒体-----音乐播放控制
+    interface BackgroundAudioPlayerState {
+        /** 选定音频的长度（单位：s），只有在当前有音乐播放时返回 */
+        duration: number;
+        /** 选定音频的播放位置（单位：s），只有在当前有音乐播放时返回 */
+        currentPosition: number;
+        /** 播放状态（2：没有音乐在播放，1：播放中，0：暂停中） */
+        status: number;
+        /** 音频的下载进度（整数，80 代表 80%），只有在当前有音乐播放时返回 */
+        downloadPercent: number;
+        /** 歌曲数据链接，只有在当前有音乐播放时返回 */
+        dataUrl: string;
+    }
+    interface GetBackgroundAudioPlayerStateOptions extends BaseOptions {
+        /** 接口调用成功的回调函数 */
+        success?(state: BackgroundAudioPlayerState): void;
+        /** 接口调用失败的回调函数 */
+        fail?(): void;
+        /** 接口调用结束的回调函数（调用成功、失败都会执行） */
+        complete?(): void;
+    }
+    /**
+     * 获取音乐播放状态。
+     * @deprecated 1.2.0
+     */
+    function getBackgroundAudioPlayerState(
+        options: GetBackgroundAudioPlayerStateOptions
+    ): void;
+    interface PlayBackgroundAudioOptions extends BaseOptions {
+        /** 音乐链接 */
+        dataUrl: string;
+        /** 音乐标题 */
+        title?: string;
+        /** 封面URL */
+        coverImgUrl?: string;
+    }
+    /**
+     * 播放音乐，同时只能有一首音乐正在播放。
+     * @deprecated 1.2.0
+     */
+    function playBackgroundAudio(options: PlayBackgroundAudioOptions): void;
+    /**
+     * 暂停播放音乐。
+     * @deprecated 1.2.0
+     */
+    function pauseBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
+    interface SeekBackgroundAudioOptions extends BaseOptions {
+        /** 音乐位置，单位：秒 */
+        position: number;
+    }
+    /**
+     * 控制音乐播放进度。
+     * @deprecated 1.2.0
+     */
+    function seekBackgroundAudio(options: SeekBackgroundAudioOptions): void;
+    /**
+     * 停止播放音乐。
+     * @deprecated 1.2.0
+     */
+    function stopBackgroundAudio(options?: PlayBackgroundAudioOptions): void;
+    /**
+     * 监听音乐播放。
+     * @deprecated 1.2.0
+     */
+    function onBackgroundAudioPlay(callback: () => void): void;
+    /**
+     * 监听音乐暂停。
+     * @deprecated 1.2.0
+     */
+    function onBackgroundAudioPause(callback: () => void): void;
+    /**
+     * 监听音乐停止。
+     * @deprecated 1.2.0
+     */
+    function onBackgroundAudioStop(callback: () => void): void;
+    interface BackgroundAudioManager {
+        /** 当前音频的长度（单位：s），只有在当前有合法的 src 时返回 */
+        readonly duration: number;
+        /** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回 */
+        readonly currentTime: number;
+        /** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播放 */
+        readonly paused: boolean;
+        /** 音频的数据源，默认为空字符串，当设置了新的 src 时，会自动开始播放 ，目前支持的格式有 m4a, aac, mp3, wav */
+        src: string;
+        /** 音频开始播放的位置（单位：s） */
+        startTime: number;
+        /** 音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲。 是 */
+        buffered: number;
+        /** 音频标题，用于做原生音频播放器音频标题。原生音频播放器中的分享功能，分享出去的卡片标题，也将使用该值。 */
+        title: string;
+        /** 专辑名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+        epname: string;
+        /** 歌手名，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+        singer: string;
+        /** 封面图url，用于做原生音频播放器背景图。原生音频播放器中的分享功能，分享出去的卡片配图及背景也将使用该图。 */
+        coverImgUrl: string;
+        /** 页面链接，原生音频播放器中的分享功能，分享出去的卡片简介，也将使用该值 */
+        webUrl: string;
+        /** 播放 */
+        play(): void;
+        /** 暂停 */
+        pause(): void;
+        /** 停止 */
+        stop(): void;
+        /** 跳转到指定位置，单位 s */
+        seek(position: number): void;
+        /** 背景音频进入可以播放状态，但不保证后面可以流畅播放 */
+        onCanplay(callback?: () => void): void;
+        /** 背景音频播放事件 */
+        onPlay(callback?: () => void): void;
+        /** 背景音频暂停事件 */
+        onPause(callback?: () => void): void;
+        /** 背景音频停止事件 */
+        onStop(callback?: () => void): void;
+        /** 背景音频自然播放结束事件 */
+        onEnded(callback?: () => void): void;
+        /** 背景音频播放进度更新事件 */
+        onTimeUpdate(callback?: () => void): void;
+        /** 用户在系统音乐播放面板点击上一曲事件（iOS only） */
+        onPrev(callback?: () => void): void;
+        /** 用户在系统音乐播放面板点击下一曲事件（iOS only） */
+        onNext(callback?: () => void): void;
+        /** 背景音频播放错误事件 */
+        onError(callback?: () => void): void;
+        /** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
+        onWaiting(callback?: () => void): void;
+    }
+    /**
+     * 获取全局唯一的背景音频管理器 backgroundAudioManager。
+     * @version 1.2.0
+     */
+    function getBackgroundAudioManager(): BackgroundAudioManager;
+    // 媒体-----音频组件控制
+    /**
+     * audioContext 通过 audioId 跟一个 <audio/> 组件绑定，通过它可以操作对应的 <audio/> 组件。
+     */
+    interface AudioContext {
+        /**
+         * 音频的地址
+         */
+        setSrc(src: string): void;
+        /**
+         * 播放
+         */
+        play(): void;
+        /**
+         * 暂停
+         */
+        pause(): void;
+        /**
+         * 跳转到指定位置，单位 s
+         */
+        seek(position: number): void;
+    }
+    /**
+     * 创建并返回 audio 上下文 audioContext 对象
+     * @param audioId audio标签id <audio  src="{{src}}" id="myAudio" ></audio>
+     * @example
+     * <!-- audio.wxml -->
+     * <audio  src="{{src}}" id="myAudio" ></audio>
+     * <button type="primary" bindtap="audioPlay">播放</button>
+     * <button type="primary" bindtap="audioPause">暂停</button>
+     * <button type="primary" bindtap="audio14">设置当前播放时间为14秒</button>
+     * <button type="primary" bindtap="audioStart">回到开头</button>
+     * // audio.js
+     * Page({
+     * onReady: function (e) {
+     *   // 使用 wx.createAudioContext 获取 audio 上下文 context
+     *   this.audioCtx = wx.createAudioContext('myAudio')
+     *   this.audioCtx.setSrc('http://ws.stream.qqmusic.qq.com/
+     * M500001VfvsJ21xFqb.mp3?guid=ffffffff82def4af4b12b3cd9337d5e7&
+     * uin=346897220&vkey=6292F51E1E384E06DCBDC9AB7C49FD713D632D313AC4858BACB8DDD29067D3C601481D36E62053BF8DFEAF74C0A5CCFADD6471160CAF3E6A&
+     * fromtag=46')
+     *   this.audioCtx.play()
+     * },
+     * data: {
+     *   src: ''
+     * },
+     * audioPlay: function () {
+     *   this.audioCtx.play()
+     * },
+     * audioPause: function () {
+     *   this.audioCtx.pause()
+     * },
+     * audio14: function () {
+     *   this.audioCtx.seek(14)
+     * },
+     * audioStart: function () {
+     *   this.audioCtx.seek(0)
+     * }
+     * })
+     * @deprecated 1.6.0
+     */
+    function createAudioContext(audioId: string, instance: any): AudioContext;
+    interface InnerAudioContext {
+        /** 当前音频的长度（单位：s），只有在当前有合法的 src 时返 */
+        readonly duration: number;
+        /** 当前音频的播放位置（单位：s），只有在当前有合法的 src 时返回，时间不取整，保留小数点后 6  */
+        readonly currentTime: number;
+        /** 当前是是否暂停或停止状态，true 表示暂停或停止，false 表示正在播 */
+        readonly paused: boolean;
+        /**  音频缓冲的时间点，仅保证当前播放时间点到此时间点内容已缓冲 */
+        readonly buffered: number;
+        /** 音频的数据链接，用于直接播放。 */
+        src: string;
+        /** 开始播放的位置（单位：s），默认 0 */
+        startTime: number;
+        /** 是否自动开始播放，默认 false */
+        autoplay: boolean;
+        /** 是否循环播放，默认 false */
+        loop: boolean;
+        /** 是否遵循系统静音开关，当此参数为 false 时，即使用户打开了静音开关，也能继续发出声音，默认值 true */
+        obeyMuteSwitch: boolean;
+        /** 播放 */
+        play(): void;
+        /** 暂停 */
+        pause(): void;
+        /** 停止 */
+        stop(): void;
+        /** 跳转到指定位置，单位 s */
+        seek(position: number): void;
+        /** 销毁当前实例 */
+        destroy(): void;
+        /** 音频进入可以播放状态，但不保证后面可以流畅播放 */
+        onCanplay(callback?: () => void): void;
+        /** 音频播放事件 */
+        onPlay(callback?: () => void): void;
+        /** 音频暂停事件 */
+        onPause(callback?: () => void): void;
+        /** 音频停止事件 */
+        onStop(callback?: () => void): void;
+        /** 音频自然播放结束事件 */
+        onEnded(callback?: () => void): void;
+        /** 音频播放进度更新事件 */
+        onTimeUpdate(callback?: () => void): void;
+        /** 音频播放错误事件 */
+        onError(callback?: () => void): void;
+        /** 音频加载中事件，当音频因为数据不足，需要停下来加载时会触发 */
+        onWaiting(callback?: () => void): void;
+        /** 音频进行 seek 操作事件 */
+        onSeeking(callback?: () => void): void;
+        /** 音频完成 seek 操作事件 */
+        onSeeked(callback?: () => void): void;
+    }
+    /**
+     * 创建并返回内部 audio 上下文 innerAudioContext 对象。
+     * 本接口是 wx.createAudioContext 升级版。
+     * @version 1.6.0
+     */
+    function createInnerAudioContext(): InnerAudioContext;
+    // 媒体-----视频
+    interface ChooseVideoOptions extends BaseOptions {
+        /** album 从相册选视频，camera 使用相机拍摄，默认为：['album', 'camera'] */
+        sourceType?: VideoSourceType[];
+        /** 拍摄视频最长拍摄时间，单位秒。最长支持60秒 */
+        maxDuration?: number;
+        /** 前置或者后置摄像头，默认为前后都有，即：['front', 'back'] */
+        camera?: CameraDevice[];
+        /** 接口调用成功，返回视频文件的临时文件路径，详见返回参数说明 */
+        success?(res: VideoData): void;
+    }
+    /**
+     * 拍摄视频或从手机相册中选视频，返回视频的临时文件路径。
+     */
+    function chooseVideo(options: ChooseVideoOptions): void;
+    // 媒体-----视频组件控制
+    interface VideoContext {
+        /**
+         * 播放
+         */
+        play(): void;
+        /**
+         * 暂停
+         */
+        pause(): void;
+        /**
+         * 跳转到指定位置，单位 s
+         */
+        seek(position: number): void;
+        /**
+         * 发送弹幕，danmu 包含两个属性 text, color。
+         */
+        sendDanmu(danmu: { text: string; color: number | string }): void;
+    }
+    interface VideoData {
+        /** 选定视频的临时文件路径 */
+        tempFilePath: string;
+        /** 选定视频的时间长度 */
+        duration: number;
+        /** 选定视频的数据量大小 */
+        size: number;
+        /** 返回选定视频的长 */
+        height: number;
+        /** 返回选定视频的宽 */
+        width: number;
+    }
+    /**
+     * 创建并返回 video 上下文 videoContext 对象
+     * @param videoId video标签id <video  src="{{src}}" id="myVideo" ></video>
+     */
+    function createVideoContext(videoId: string): VideoContext;
+    interface TakePhotoOptions extends BaseOptions {
+        /** 成像质量，值为high, normal, low，默认normal */
+        quality?: string;
+        success?(res: { tempImagePath: string }): void;
+    }
+    interface StartRecordOptions extends BaseOptions {
+        /** 超过30s或页面onHide时会结束录像 */
+        timeoutCallback?(res: {
+            tempThumbPath: string;
+            tempVideoPath: string;
+        }): void;
+    }
+    interface StopRecordOptions extends BaseOptions {
+        success?(res: { tempThumbPath: string; tempVideoPath: string }): void;
+    }
+    interface CameraContext {
+        /** 拍照，可指定质量，成功则返回图片 */
+        takePhoto(options: TakePhotoOptions): void;
+        /** 开始录像 */
+        startRecord(options: StartRecordOptions): void;
+        /** 结束录像，成功则返回封面与视频 */
+        stopRecord(options: StopRecordOptions): void;
+    }
+    /**
+     * 创建并返回 camera 上下文 cameraContext 对象
+     * cameraContext 与页面的 camera 组件绑定
+     * 一个页面只能有一个camera，通过它可以操作对应的 <camera/> 组件。
+     * 在自定义组件下，第一个参数传入组件实例this，以操作组件内 <camera/> 组件
+     * @version 1.6.0
+     */
+    function createCameraContext(instance: any): CameraContext;
+    interface RequestFullScreenOptions extends BaseOptions {
+        /** 有效值为 0（正常竖向）, 90（屏幕逆时针90度）, -90（屏幕顺时针90度） */
+        direction: number;
+    }
+    interface LivePlayerContext {
+        /** 播放 */
+        play(options: BaseOptions): void;
+        /** 停止 */
+        stop(options: BaseOptions): void;
+        /** 静音 */
+        mute(options: BaseOptions): void;
+        /** 进入全屏 */
+        requestFullScreen(options: RequestFullScreenOptions): void;
+        /** 退出全屏 */
+        exitFullScreen(options: BaseOptions): void;
+    }
+    /**
+     * 操作对应的 <live-player/> 组件。
+     * 创建并返回 live-player 上下文 LivePlayerContext 对象。
+     * 在自定义组件下，第二个参数传入组件实例this，以操作组件内 <live-player/> 组件
+     * @version 1.7.0
+     */
+    function createLivePlayerContext(
+        id: string,
+        instance: any
+    ): LivePlayerContext;
+    // 文件
+    interface SavedFileData {
+        /** 文件的保存路径 */
+        savedFilePath: string;
+    }
+    interface SaveFileOptions extends BaseOptions {
+        /** 需要保存的文件的临时路径 */
+        tempFilePath: string;
+        /** 返回文件的保存路径，res = {savedFilePath: '文件的保存路径'} */
+        success?(res: SavedFileData): void;
+    }
+    /**
+     * 保存文件到本地。
+     * 本地文件存储的大小限制为 10M
+     */
+    function saveFile(options: SaveFileOptions): void;
+    interface File {
+        /**
+         * 文件的本地路径
+         */
+        filePath: string;
+        /**
+         * 文件的保存时的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
+         */
+        createTime: number;
+        /**
+         * 文件大小，单位B
+         */
+        size: number;
+    }
+    interface GetFileInfoOptions extends BaseOptions {
+        /** 本地文件路径 */
+        filePath: string;
+        /** 计算文件摘要的算法，默认值 md5，有效值：md5，sha1 */
+        digestAlgorithm?: string;
+        success?(options: GetFileInfoSuccess): void;
+    }
+    interface GetFileInfoSuccess {
+        /** 文件大小，单位：B */
+        size: number;
+        /** 按照传入的 digestAlgorithm 计算得出的的文件摘要 */
+        digest: string;
+        /** 调用结果 */
+        errMsg: string;
+    }
+    /**
+     *  获取文件信息
+     * @version 1.4.0
+     */
+    function getFileInfo(options: GetFileInfoOptions): void;
+    interface GetSavedFileListData {
+        /**
+         * 接口调用结果
+         */
+        errMsg: string;
+        /**
+         * 文件列表
+         */
+        fileList: File[];
+    }
+    interface GetSavedFileListOptions extends BaseOptions {
+        /** 接口调用成功的回调函数 */
+        success?(res: GetSavedFileListData): void;
+    }
+    /**
+     * 获取本地已保存的文件列表
+     */
+    function getSavedFileList(options: GetSavedFileListOptions): void;
+    interface SavedFileInfoData {
+        /**
+         * 接口调用结果
+         */
+        errMsg: string;
+        /**
+         * 文件大小，单位B
+         */
+        size: number;
+        /**
+         * 文件的保存是的时间戳，从1970/01/01 08:00:00 到当前时间的秒数
+         */
+        createTime: number;
+    }
+    interface GetSavedFileInfoOptions extends BaseOptions {
+        filePath: string;
+        /** 接口调用成功的回调函数 */
+        success?(res: SavedFileInfoData): void;
+    }
+    /**
+     * 获取本地文件的文件信息
+     */
+    function getSavedFileInfo(options: GetSavedFileInfoOptions): void;
+    type RemoveSavedFileOptions = BaseOptions;
+    /**
+     * 删除本地存储的文件
+     */
+    function removeSavedFile(options: RemoveSavedFileOptions): void;
+    interface OpenDocumentOptions extends BaseOptions {
+        /**
+         * 文件路径，可通过 downFile 获得
+         */
+        filePath: string;
+    }
+    /**
+     * 新开页面打开文档，支持格式：doc, xls, ppt, pdf, docx, xlsx, pptx
+     */
+    function openDocument(options: OpenDocumentOptions): void;
+    // 数据缓存
+    interface SetStorageOptions extends BaseOptions {
+        /** 本地缓存中的指定的 key */
+        key: string;
+        /** 需要存储的内容 */
+        data: any | string;
+    }
+    /**
+     * 将数据存储在本地缓存中指定的 key 中，
+     * 会覆盖掉原来该 key 对应的内容，这是一个异步接口。
+     */
+    function setStorage(options: SetStorageOptions): void;
+    /**
+     * 将 data 存储在本地缓存中指定的 key 中，
+     * 会覆盖掉原来该 key 对应的内容，这是一个同步接口。
+     *
+     * @param key 本地缓存中的指定的 key
+     * @param data 需要存储的内容
+     */
+    function setStorageSync(key: string, data: any | string): void;
+    interface GetStorageOptions extends BaseOptions {
+        /** 本地缓存中的指定的 key */
+        key: string;
+        /** 接口调用的回调函数,res = {data: key对应的内容} */
+        success(res: DataResponse): void;
+    }
+    /**
+     * 从本地缓存中异步获取指定 key 对应的内容。
+     */
+    function getStorage(options: GetStorageOptions): void;
+    /**
+     * 从本地缓存中同步获取指定 key 对应的内容。
+     *
+     */
+    function getStorageSync(key: string): any | string;
+    interface StorageInfo {
+        /**
+         * 当前storage中所有的key
+         */
+        keys: string[];
+        /**
+         * 当前占用的空间大小, 单位kb
+         */
+        currentSize: number;
+        /**
+         * 限制的空间大小，单位kb
+         */
+        limitSize: number;
+    }
+    interface GetStorageInfoOptions extends BaseOptions {
+        success(res: StorageInfo): void;
+    }
+    /**
+     * 异步获取当前storage的相关信息
+     */
+    function getStorageInfo(options: GetStorageInfoOptions): void;
+    function getStorageInfoSync(): GetStorageInfoOptions;
+    interface RemoveStorageOptions extends BaseOptions {
+        key: string;
+        success?(res: DataResponse): void;
+    }
+    function removeStorage(options: RemoveStorageOptions): void;
+    function removeStorageSync(key: string): DataResponse;
+    /**
+     * 清理本地数据缓存。
+     */
+    function clearStorage(): void;
+    /**
+     * 同步清理本地数据缓存
+     */
+    function clearStorageSync(): void;
+    // #endregion
+    // #region 位置API列表
+    // 位置-----获取位置
+    interface LocationData {
+        /** 纬度，浮点数，范围为-90~90，负数表示南纬 */
+        latitude: number;
+        /** 经度，浮点数，范围为-180~180，负数表示西经 */
+        longitude: number;
+        /** 速度，浮点数，单位m/s */
+        speed: number;
+        /** 位置的精确度 */
+        accuracy: number;
+    }
+    interface GetLocationOptions extends BaseOptions {
+        /** 默认为 wgs84 返回 gps 坐标，gcj02 返回可用于wx.openLocation的坐标 */
+        type?: "wgs84" | "gcj02";
+        /** 接口调用成功的回调函数，返回内容详见返回参数说明。 */
+        success(res: LocationData): void;
+    }
+    /**
+     * 获取当前的地理位置、速度。
+     */
+    function getLocation(options: GetLocationOptions): void;
+    interface ChooseLocationData {
+        /**
+         * 位置名称
+         */
+        name: string;
+        /**
+         * 详细地址
+         */
+        address: string;
+        /**
+         * 纬度，浮点数，范围为-90~90，负数表示南纬
+         */
+        latitude: number;
+        /**
+         * 经度，浮点数，范围为-180~180，负数表示西经
+         */
+        longitude: number;
+    }
+    interface ChooseLocationOptions extends BaseOptions {
+        success(res: ChooseLocationData): void;
+    }
+    /**
+     * 打开地图选择位置
+     */
+    function chooseLocation(options: ChooseLocationOptions): void;
+    // 位置-----查看位置
+    interface OpenLocationOptions extends BaseOptions {
+        /** 纬度，范围为-90~90，负数表示南纬 */
+        latitude: number;
+        /** 经度，范围为-180~180，负数表示西经 */
+        longitude: number;
+        /** 缩放比例，范围1~28，默认为28 */
+        scale?: number;
+        /** 位置名 */
+        name?: string;
+        /** 地址的详细说明 */
+        address?: string;
+    }
+    /**
+     * 使用微信内置地图查看位置
+     */
+    function openLocation(options: OpenLocationOptions): void;
+    // 位置-----地图组件控制
+    interface GetCenterLocationOptions extends BaseOptions {
+        success(res: { longitude: number; latitude: number }): void;
+    }
+    /**
+     * mapContext 通过 mapId 跟一个 <map/> 组件绑定，通过它可以操作对应的 <map/> 组件。
+     */
+    interface MapContext {
+        /**
+         * 获取当前地图中心的经纬度，返回的是 gcj02 坐标系，可以用于 wx.openLocation
+         */
+        getCenterLocation(
+            options: GetCenterLocationOptions
+        ): OpenLocationOptions;
+        /**
+         * 将地图中心移动到当前定位点，需要配合map组件的show-location使用
+         */
+        moveToLocation(): void;
+    }
+    /**
+     * 创建并返回 map 上下文 mapContext 对象
+     */
+    function createMapContext(mapId: string): MapContext;
+    // #endregion
+    // #region 设备API列表
+    // 设备-----系统信息
+    interface SystemInfo {
+        /** 手机型号 */
+        model: string;
+        /** 设备像素比 */
+        pixelRatio: number;
+        /** 窗口宽度 */
+        windowWidth: number;
+        /** 窗口高度 */
+        windowHeight: number;
+        /** 微信设置的语言 */
+        language: string;
+        /** 微信版本号 */
+        version: string;
+    }
+    interface GetSystemInfoOptions extends BaseOptions {
+        /** 成功获取系统信息的回调 */
+        success(res: SystemInfo): void;
+    }
+    /**
+     * 获取系统信息。
+     */
+    function getSystemInfo(options: GetSystemInfoOptions): void;
+    function getSystemInfoSync(): SystemInfo;
+    /**
+     * 判断小程序的API，回调，参数，组件等是否在当前版本可用。
+     * String参数说明：
+     * 使用 ${API}.${method}.${param}.${options}
+     * 或者 ${component}.${attribute}.${option}方式来调用
+     * 例如：
+     * ${API} 代表 API 名字
+     * ${method} 代表调用方式，有效值为return, success, object, callback
+     * ${param} 代表参数或者返回值
+     * ${options} 代表参数的可选值
+     * ${component} 代表组件名字
+     * ${attribute} 代表组件属性
+     * ${option} 代表组件属性的可选值
+     */
+    function canIUse(api: string): boolean;
+    // 设备-----网络状态
+    type networkType = "2g" | "3g" | "4g" | "wifi" | "unknown" | "none";
+    interface NetworkTypeData {
+        /** 返回网络类型2g，3g，4g，wifi */
+        networkType: networkType;
+    }
+    interface GetNetworkTypeOptions extends BaseOptions {
+        /** 接口调用成功，返回网络类型 networkType */
+        success(res: NetworkTypeData): void;
+    }
+    /**
+     * 获取网络类型。
+     */
+    function getNetworkType(options: GetNetworkTypeOptions): void;
+    /**
+     * 监听网络状态变化。
+     * 微信客户端 6.5.6 版本开始支持
+     * @version 1.1.0
+     */
+    function onNetworkStatusChange(
+        callback: (
+            res: {
+                isConnected: boolean;
+                networkType: networkType;
+            }
+        ) => void
+    ): void;
+    // 设备-----加速度计
+    interface AccelerometerData {
+        /** X 轴 */
+        x: number;
+        /** Y 轴 */
+        y: number;
+        /** Z 轴 */
+        z: number;
+    }
+    type AccelerometerChangeCallback = (res: AccelerometerData) => void;
+    /**
+     * 监听重力感应数据，频率：5次/秒
+     */
+    function onAccelerometerChange(callback: AccelerometerChangeCallback): void;
+    type AccelerometerOptions = BaseOptions;
+    /**
+     * 开始监听加速度数据。
+     * 微信客户端 6.5.6 版本开始支持
+     * @version 1.1.0
+     */
+    function startAccelerometer(options: AccelerometerOptions): void;
+    /**
+     * 停止监听加速度数据。
+     * 微信客户端 6.5.6 版本开始支持
+     * @version 1.1.0
+     */
+    function stopAccelerometer(options: AccelerometerOptions): void;
+    // 设备-----罗盘
+    interface CompassData {
+        /** 面对的方向度数 */
+        direction: number;
+    }
+    type CompassChangeCallback = (res: CompassData) => void;
+    /**
+     * 监听罗盘数据，频率：5次/秒，接口调用后会自动开始监听，可使用wx.stopCompass停止监听。
+     */
+    function onCompassChange(callback: CompassChangeCallback): void;
+    type CompassOptions = BaseOptions;
+    /**
+     * 开始监听罗盘数据。
+     * 微信客户端 6.5.6 版本开始支持
+     * @version 1.1.0
+     */
+    function startCompass(options: CompassOptions): void;
+    function stopCompass(options: CompassOptions): void;
+    // 设备-----拨打电话
+    interface MakePhoneCallOptions extends BaseOptions {
+        /**
+         * 需要拨打的电话号码
+         */
+        phoneNumber: string;
+    }
+    /**
+     * 拨打电话
+     */
+    function makePhoneCall(options: MakePhoneCallOptions): void;
+    // 设备-----扫码
+    type scanType = "qrCode" | "barCode";
+    interface ScanCodeData {
+        /**
+         * 所扫码的内容
+         */
+        result: string;
+        /**
+         * 所扫码的类型
+         */
+        scanType: scanType;
+        /**
+         * 所扫码的字符集
+         */
+        charSet: string;
+        /**
+         * 当所扫的码为当前小程序的合法二维码时，会返回此字段，内容为二维码携带的 path
+         */
+        path: string;
+    }
+    interface ScanCodeOptions extends BaseOptions {
+        /**
+         * 是否只能从相机扫码，不允许从相册选择图片
+         * @version 1.2.0
+         */
+        onlyFromCamera?: boolean;
+        /**
+         * 扫码类型，参数类型是数组
+         * 二维码是'qrCode'，一维码是'barCode'，DataMatrix是‘datamatrix’，pdf417是‘pdf417’。
+         * @version 1.7.0
+         */
+        scanType?: string[];
+        success(res: ScanCodeData): void;
+    }
+    /**
+     * 调起客户端扫码界面，扫码成功后返回对应的结果
+     */
+    function scanCode(options: ScanCodeOptions): void;
+    // 设备-----剪贴板
+    interface ClipboardDataOptions extends BaseOptions {
+        data: string;
+        success?(res: DataResponse): void;
+    }
+    /**
+     * 设置系统剪贴板的内容
+     * 微信客户端 6.5.6 版本开始支持
+     * @version 1.1.0
+     */
+    function setClipboardData(options: ClipboardDataOptions): void;
+    /**
+     * 获取系统剪贴板内容
+     * 微信客户端 6.5.6 版本开始支持
+     * @version 1.1.0
+     */
+    function getClipboardData(options: ClipboardDataOptions): void;
+    // 设备-----蓝牙
+    interface OpenBluetoothAdapterOptions extends BaseOptions {
+        success(res: any): void;
+    }
+    /**
+     * 初始化蓝牙适配器
+     * @version 1.1.0
+     */
+    function openBluetoothAdapter(options: OpenBluetoothAdapterOptions): void;
+    interface CloseBluetoothAdapterOptions extends BaseOptions {
+        success(res: any): void;
+    }
+    /**
+     * 关闭蓝牙模块。调用该方法将断开所有已建立的链接并释放系统资源
+     * @version 1.1.0
+     */
+    function closeBluetoothAdapter(options: CloseBluetoothAdapterOptions): void;
+    interface BluetoothAdapterState {
+        /**
+         * 蓝牙适配器是否可用
+         */
+        available: boolean;
+        /**
+         * 蓝牙适配器是否处于搜索状态
+         */
+        discovering: boolean;
+    }
+    interface BluetoothAdapterStateData extends ErrMsgResponse {
+        /**
+         * 蓝牙适配器信息
+         */
+        adapterState: BluetoothAdapterState;
+    }
+    interface GetBluetoothAdapterStateOptions extends BaseOptions {
+        success(res: BluetoothAdapterStateData): void;
+    }
+    /**
+     * 获取本机蓝牙适配器状态
+     * @version 1.1.0
+     */
+    function getBluetoothAdapterState(
+        options: GetBluetoothAdapterStateOptions
+    ): void;
+    /**
+     * 监听蓝牙适配器状态变化事件
+     * @version 1.1.0
+     */
+    function onBluetoothAdapterStateChange(
+        callback: (res: BluetoothAdapterState) => void
+    ): void;
+    interface StartBluetoothDevicesDiscoveryOptions extends BaseOptions {
+        success(res: ErrMsgResponse): void;
+        /**
+         * 蓝牙设备主 service 的 uuid 列表
+         * 某些蓝牙设备会广播自己的主 service 的 uuid。如果这里传入该数组，那么根据该 uuid 列表，只搜索有这个主服务的设备。
+         */
+        services?: string[];
+    }
+    /**
+     * 开始搜寻附近的蓝牙外围设备。
+     * 注意，该操作比较耗费系统资源，请在搜索并连接到设备后调用 stop 方法停止搜索。
+     * @example
+     * // 以微信硬件平台的蓝牙智能灯为例，主服务的 UUID 是 FEE7。传入这个参数，只搜索主服务 UUID 为 FEE7 的设备
+     * wx.startBluetoothDevicesDiscovery({
+     *   services: ['FEE7'],
+     *   success: function (res) {
+     *     console.log(res)
+     *   }
+     * });
+     */
+    function startBluetoothDevicesDiscovery(
+        options: StartBluetoothDevicesDiscoveryOptions
+    ): void;
+    interface StopBluetoothDevicesDiscoveryOptions extends BaseOptions {
+        success(res: ErrMsgResponse): void;
+    }
+    /**
+     * 停止搜寻附近的蓝牙外围设备。请在确保找到需要连接的设备后调用该方法停止搜索。
+     * @version 1.1.0
+     */
+    function stopBluetoothDevicesDiscovery(
+        options: StopBluetoothDevicesDiscoveryOptions
+    ): void;
+    /**
+     * 蓝牙设备信息
+     */
+    interface BluetoothDevice {
+        /**
+         * 蓝牙设备名称，某些设备可能没有
+         */
+        name: string;
+        /**
+         * 用于区分设备的 id
+         */
+        deviceId: string;
+        /**
+         * int 当前蓝牙设备的信号强度
+         */
+        RSSI: number;
+        /**
+         * 当前蓝牙设备的广播内容
+         */
+        advertisData: ArrayBuffer;
+    }
+    interface GetBluetoothDevicesOptions extends BaseOptions {
+        success(
+            res: {
+                devices: BluetoothDevice[];
+            } & ErrMsgResponse
+        ): void;
+    }
+    /**
+     * 获取所有已发现的蓝牙设备，包括已经和本机处于连接状态的设备
+     */
+    function getBluetoothDevices(options: GetBluetoothDevicesOptions): void;
+    /**
+     * 监听寻找到新设备的事件
+     * @version 1.1.0
+     */
+    function onBluetoothDeviceFound(
+        callback: (
+            res: {
+                devices: BluetoothDevice[];
+            }
+        ) => void
+    ): void;
+    interface GetConnectedBluetoothDevicesOptions extends BaseOptions {
+        services: string[];
+        success(
+            res: {
+                devices: BluetoothDevice[];
+            } & ErrMsgResponse
+        ): void;
+    }
+    /**
+     * 根据 uuid 获取处于已连接状态的设备
+     * @version 1.1.0
+     */
+    function getConnectedBluetoothDevices(
+        options: GetConnectedBluetoothDevicesOptions
+    ): void;
+    interface CreateBLEConnectionOptions extends BaseOptions {
+        success(res: ErrMsgResponse): void;
+    }
+    /**
+     * 低功耗蓝牙接口
+     * @version 1.1.0
+     */
+    function createBLEConnection(options: CreateBLEConnectionOptions): void;
+    interface CloseBLEConnectionOptions extends BaseOptions {
+        /**
+         * 蓝牙设备 id，参考 getDevices 接口
+         */
+        deviceId: string;
+        success(res: ErrMsgResponse): void;
+    }
+    /**
+     * 断开与低功耗蓝牙设备的连接
+     * @version 1.1.0
+     */
+    function closeBLEConnection(options: CloseBLEConnectionOptions): void;
+    interface GetBLEDeviceServicesOptions extends BaseOptions {
+        /**
+         * 蓝牙设备 id，参考 getDevices 接口
+         */
+        deviceId: string;
+        /**
+         * 成功则返回本机蓝牙适配器状态
+         */
+        success(
+            res: {
+                services: Array<{
+                    uuid: string;
+                    isPrimary: boolean;
+                }>;
+            } & ErrMsgResponse
+        ): void;
+    }
+    /**
+     * 获取蓝牙设备所有 service（服务）
+     */
+    function getBLEDeviceServices(options: GetBLEDeviceServicesOptions): void;
+    interface GetBLEDeviceCharacteristicsOptions extends BaseOptions {
+        /**
+         * 蓝牙设备 id，参考 device 对象
+         */
+        deviceId: string;
+        /**
+         * 蓝牙服务 uuid
          */
         serviceId: string;
         /**
-         * 蓝牙设备特征值对应的二进制值
+         * 成功则返回本机蓝牙适配器状态
          */
-        value: ArrayBuffer;
-      };
-    } & ErrMsgResponse): void;
-  }
-  /**
-   * 读取低功耗蓝牙设备的特征值的二进制数据值。
-   * 注意：必须设备的特征值支持read才可以成功调用，具体参照 characteristic 的 properties 属性
-   */
-  function readBLECharacteristicValue(options: BLECharacteristicValueOptions): void;
-  /**
-   * 向低功耗蓝牙设备特征值中写入二进制数据。
-   * 注意：必须设备的特征值支持write才可以成功调用，具体参照 characteristic 的 properties 属性
-   * tips: 并行调用多次读写接口存在读写失败的可能性
-   */
-  function writeBLECharacteristicValue(options: BLECharacteristicValueOptions): void;
-  /**
-   * 启用低功耗蓝牙设备特征值变化时的 notify 功能。
-   * 注意：必须设备的特征值支持notify才可以成功调用，具体参照 characteristic 的 properties 属性
-   * 另外，必须先启用notify才能监听到设备 characteristicValueChange 事件
-   */
-  function notifyBLECharacteristicValueChanged(options: BLECharacteristicValueOptions): void;
-  /**
-   * 监听低功耗蓝牙连接的错误事件，包括设备丢失，连接异常断开等等。
-   */
-  function onBLEConnectionStateChanged(callback: (res: {
-    /**
-     * 蓝牙设备 id，参考 device 对象
-     */
-    deviceId: string;
-    /**
-     * 连接目前的状态
-     */
-    connected: boolean;
-  }) => void): void;
-  /**
-   * 监听低功耗蓝牙设备的特征值变化。必须先启用notify接口才能接收到设备推送的notification。
-   */
-  function onBLECharacteristicValueChange(callback: (
-    res: {
-      /**
-       * 蓝牙设备 id，参考 device 对象
-       */
-      deviceId: string;
-      /**
-       * 特征值所属服务 uuid
-       */
-      serviceId: string;
-      /**
-       * 特征值 uuid
-       */
-      characteristicId: string;
-      /**
-       * 特征值最新的值
-       */
-      value: ArrayBuffer;
+        success(
+            res: {
+                characteristics: Array<{
+                    uuid: string;
+                    properties: Array<{
+                        /**
+                         * 该特征值是否支持 read 操作
+                         */
+                        read: boolean;
+                        /**
+                         * 该特征值是否支持 write 操作
+                         */
+                        write: boolean;
+                        /**
+                         * 该特征值是否支持 notify 操作
+                         */
+                        notify: boolean;
+                        /**
+                         * 该特征值是否支持 indicate 操作
+                         */
+                        indicate: boolean;
+                    }>;
+                }>;
+            } & ErrMsgResponse
+        ): void;
     }
-  ) => void): void;
-  // #region iBeacon
-  interface BeaconDiscoveryOptions extends BaseOptions {
     /**
-     * iBeacon设备广播的 uuids
+     * 获取蓝牙设备所有 characteristic（特征值）
      */
-    uuids: string | string[];
-    success?(errMsg: string): void;
-  }
-  /**
-   * 开始搜索附近的iBeacon设备
-   * @version 1.2.0
-   */
-  function startBeaconDiscovery(options: BeaconDiscoveryOptions): void;
-  /**
-   * 停止搜索附近的iBeacon设备
-   * @version 1.2.0
-   */
-  function stopBeaconDiscovery(options: BeaconDiscoveryOptions): void;
-  interface Beacon {
-    /** iBeacon 设备广播的 uuid */
-    uuid: string;
-    /** iBeacon 设备的主 id */
-    major: string;
-    /** iBeacon 设备的次 id */
-    minor: string;
-    /** 表示设备距离的枚举值 */
-    proximity: number;
-    /** iBeacon 设备的距离 */
-    accuracy: number;
-    /** 表示设备的信号强度 */
-    rssi: number;
-  }
-  interface GetBeaconsSuccess {
-    beacons: Beacon[];
-    errMsg: string;
-  }
-  interface GetBeaconsOptions extends BaseOptions {
-    success?(options: GetBeaconsSuccess): void;
-  }
-  /**
-   * 获取所有已搜索到的iBeacon设备
-   * @version 1.2.0
-   */
-  function getBeacons(options: GetBeaconsOptions): void;
-  /**
-   * 监听 iBeacon 设备的更新事件
-   * @version 1.2.0
-   */
-  function onBeaconUpdate(callback?: (beacons: Beacon[]) => void): void;
-  /**
-   * 监听 iBeacon 服务的状态变化
-   * @version 1.2.0
-   */
-  function onBeaconServiceChange(callback?: (available?: boolean, discovering?: boolean) => void): void;
-  // #endregion
-  // 设备-----屏幕亮度
-  interface SetScreenBrightnessOptions {
-    /** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
-    value: number;
-  }
-  /**
-   * 设置屏幕亮度
-   * @version 1.2.0
-   */
-  function setScreenBrightness(options: SetScreenBrightnessOptions): void;
-  interface GetScreenBrightnessOptions extends BaseOptions {
-    /** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
-    success(value: number): void;
-  }
-  /**
-   * 获取屏幕亮度
-   * @version 1.2.0
-   */
-  function getScreenBrightness(options?: GetScreenBrightnessOptions): void;
-  interface SetKeepScreenOnOptions extends BaseOptions {
-    /** 是否保持屏幕常亮 */
-    keepScreenOn: boolean;
-    success?(errMsg: string): void;
-  }
-  /**
-   * 设置是否保持常亮状态。
-   * 仅在当前小程序生效，离开小程序后设置失效。
-   * @version 1.4.0
-   */
-  function setKeepScreenOn(options?: SetKeepScreenOnOptions): void;
-  // 设备-----震动
-  /**
-   * 使手机发生较长时间的振动（400ms）
-   * @version 1.2.0
-   */
-  function vibrateLong(options?: BaseOptions): void;
-  /**
-   * 使手机发生较短时间的振动（15ms）
-   * @version 1.2.0
-   */
-  function vibrateShort(options?: BaseOptions): void;
-  /**
-   * 监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件
-   * @version 1.4.0
-   */
-  function onUserCaptureScreen(callback?: (res: any) => void): void;
-  // 设备-----手机联系人
-  interface PhoneContact extends BaseOptions {
-    /** 头像本地文件路径 */
-    photoFilePath?: string;
-    /** 昵称 */
-    nickName?: string;
-    /** 姓氏 */
-    lastName?: string;
-    /** 中间名 */
-    middleName?: string;
-    /** 名字 */
-    firstName: string;
-    /** 备注 */
-    remark?: string;
-    /** 手机号 */
-    mobilePhoneNumber?: string;
-    /** 微信号 */
-    weChatNumber?: string;
-    /** 联系地址国家 */
-    addressCountry?: string;
-    /** 联系地址省份 */
-    addressState?: string;
-    /** 联系地址城市 */
-    addressCity?: string;
-    /** 联系地址街道 */
-    addressStreet?: string;
-    /** 联系地址邮政编码 */
-    addressPostalCode?: string;
-    /** 公司 */
-    organization?: string;
-    /** 职位 */
-    title?: string;
-    /** 工作传真 */
-    workFaxNumber?: string;
-    /** 工作电话 */
-    workPhoneNumber?: string;
-    /** 公司电话 */
-    hostNumber?: string;
-    /** 电子邮件 */
-    email?: string;
-    /** 网站 */
-    url?: string;
-    /** 工作地址国家 */
-    workAddressCountry?: string;
-    /** 工作地址省份 */
-    workAddressState?: string;
-    /** 工作地址城市 */
-    workAddressCity?: string;
-    /** 工作地址街道 */
-    workAddressStreet?: string;
-    /** 工作地址邮政编码 */
-    workAddressPostalCode?: string;
-    /** 住宅传真 */
-    homeFaxNumber?: string;
-    /** 住宅电话 */
-    homePhoneNumber?: string;
-    /** 住宅地址国家 */
-    homeAddressCountry?: string;
-    /** 住宅地址省份 */
-    homeAddressState?: string;
-    /** 住宅地址城市 */
-    homeAddressCity?: string;
-    /** 住宅地址街道 */
-    homeAddressStreet?: string;
-    /** 住宅地址邮政编码 */
-    homeAddressPostalCode?: string;
-  }
-  /**
-   * 增加 手机联系人
-   * 调用后，用户可以选择将该表单以“新增联系人”或“添加到已有联系人”的方式
-   * 写入手机系统通讯录
-   * 完成手机通讯录联系人和联系方式的增加。
-   * @version 1.2.0
-   */
-  function addPhoneContact(options: PhoneContact): void;
-  // 设备-----Wi-Fi
-  /**
-   * 初始化 Wi-Fi 模块。
-   * @version 1.6.0
-   */
-  function startWifi(options?: BaseOptions): void;
-  /**
-   * 关闭 Wi-Fi 模块。
-   * @version 1.6.0
-   */
-  function stopWifi(options?: BaseOptions): void;
-  interface ConnectWiFiOptions extends BaseOptions {
-    /** Wi-Fi 设备ssid */
-    SSID: string;
-    /** Wi-Fi 设备bssid */
-    BSSID: string;
-    /** Wi-Fi 设备密码 */
-    password?: string;
-  }
-  /**
-   * 连接 Wi-Fi。
-   * 若已知 Wi-Fi 信息，可以直接利用该接口连接。
-   * 仅 Android 与 iOS 11 以上版本支持。
-   * @version 1.6.0
-   */
-  function connectWifi(options?: ConnectWiFiOptions): void;
-  /**
-   * 请求获取 Wi-Fi 列表
-   * 在 onGetWifiList 注册的回调中返回 wifiList 数据。
-   * iOS 将跳转到系统的 Wi-Fi 界面，Android 不会跳转。
-   * iOS 11.0 及 iOS 11.1 两个版本因系统问题，该方法失效。但在 iOS 11.2 中已修复。
-   * @version 1.6.0
-   */
-  function getWifiList(options?: BaseOptions): void;
-  interface WiFi {
-    /** Wi-Fi 的SSID */
-    SSID: string;
-    /** Wi-Fi 的BSSID */
-    BSSID: string;
-    /** Wi-Fi 是否安全 */
-    secure: boolean;
-    /** Wi-Fi 信号强度 */
-    signalStrength: number;
-  }
-  interface GetWifiListOptions {
-    /** Wi-Fi 列表数据 */
-    wifiList: WiFi[];
-  }
-  /**
-   * 监听在获取到 Wi-Fi 列表数据时的事件，在回调中将返回 wifiList。
-   * @version 1.6.0
-   */
-  function onGetWifiList(callback?: (res: GetWifiListOptions) => void): void;
-  interface SetWifiList {
-    /** Wi-Fi 设备ssid */
-    SSID: string;
-    /** Wi-Fi 设备bssid */
-    BSSID: string;
-    /** Wi-Fi 设备密码 */
-    password: string;
-  }
-  interface SetWifiListOptions extends BaseOptions {
-    /** 提供预设的 Wi-Fi 信息列表 */
-    wifiList: SetWifiList[];
-  }
-  /**
-   * iOS特有接口 在 onGetWifiList 回调后，利用接口设置 wifiList 中 AP 的相关信息。
-   * 注意：
-   * + 该接口只能在 onGetWifiList 回调之后才能调用。
-   * + 此时客户端会挂起，等待小程序设置 Wi-Fi 信息，请务必尽快调用该接口，若无数据请传入一个空数组。
-   * + 有可能随着周边 Wi-Fi 列表的刷新，单个流程内收到多次带有存在重复的 Wi-Fi 列表的回调。
-   * @version 1.6.0
-   */
-  function setWifiList(options: SetWifiListOptions): void;
-  /**
-   * 监听连接上 Wi-Fi 的事件。
-   * @version 1.6.0
-   */
-  function onWifiConnected(callback?: (wifi: WiFi) => void): void;
-  interface GetConnectedWifiOptions extends BaseOptions {
-    success(wifi: WiFi): void;
-  }
-  /**
-   * 获取已连接中的 Wi-Fi 信息
-   * @version 1.6.0
-   */
-  function getConnectedWifi(options?: GetConnectedWifiOptions): void;
-  // #endregion
-  // #region 界面API列表
-  interface ToastOptions extends BaseOptions {
+    function getBLEDeviceCharacteristics(
+        options: GetBLEDeviceCharacteristicsOptions
+    ): void;
+    interface BLECharacteristicValueOptions extends BaseOptions {
+        /**
+         * 蓝牙设备 id，参考 device 对象
+         */
+        deviceId: string;
+        /**
+         * 蓝牙特征值对应服务的 uuid
+         */
+        serviceId: string;
+        /**
+         * 蓝牙特征值的 uuid
+         */
+        characteristicId: string;
+        success(
+            res: {
+                characteristic: {
+                    /**
+                     * 蓝牙设备特征值的 uuid
+                     */
+                    characteristicId: string;
+                    /**
+                     * 蓝牙设备特征值对应服务的 uuid
+                     */
+                    serviceId: string;
+                    /**
+                     * 蓝牙设备特征值对应的二进制值
+                     */
+                    value: ArrayBuffer;
+                };
+            } & ErrMsgResponse
+        ): void;
+    }
     /**
-     * 提示的内容
+     * 读取低功耗蓝牙设备的特征值的二进制数据值。
+     * 注意：必须设备的特征值支持read才可以成功调用，具体参照 characteristic 的 properties 属性
      */
-    title: string;
+    function readBLECharacteristicValue(
+        options: BLECharacteristicValueOptions
+    ): void;
     /**
-     * 图标，只支持"success"、"loading"
+     * 向低功耗蓝牙设备特征值中写入二进制数据。
+     * 注意：必须设备的特征值支持write才可以成功调用，具体参照 characteristic 的 properties 属性
+     * tips: 并行调用多次读写接口存在读写失败的可能性
      */
-    icon?: 'success' | 'loading';
+    function writeBLECharacteristicValue(
+        options: BLECharacteristicValueOptions
+    ): void;
     /**
-     * 自定义图标的本地路径，image 的优先级高于 icon
+     * 启用低功耗蓝牙设备特征值变化时的 notify 功能。
+     * 注意：必须设备的特征值支持notify才可以成功调用，具体参照 characteristic 的 properties 属性
+     * 另外，必须先启用notify才能监听到设备 characteristicValueChange 事件
      */
-    image?: string;
+    function notifyBLECharacteristicValueChanged(
+        options: BLECharacteristicValueOptions
+    ): void;
     /**
-     * 提示的延迟时间，单位毫秒，默认：1500
+     * 监听低功耗蓝牙连接的错误事件，包括设备丢失，连接异常断开等等。
      */
-    duration?: number;
+    function onBLEConnectionStateChanged(
+        callback: (
+            res: {
+                /**
+                 * 蓝牙设备 id，参考 device 对象
+                 */
+                deviceId: string;
+                /**
+                 * 连接目前的状态
+                 */
+                connected: boolean;
+            }
+        ) => void
+    ): void;
     /**
-     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     * 监听低功耗蓝牙设备的特征值变化。必须先启用notify接口才能接收到设备推送的notification。
      */
-    mask?: boolean;
-  }
-  /**
-   * 显示消息提示框
-   */
-  function showToast(options: ToastOptions): void;
-  function hideToast(): void;
-  interface LoadingOptions extends BaseOptions {
+    function onBLECharacteristicValueChange(
+        callback: (
+            res: {
+                /**
+                 * 蓝牙设备 id，参考 device 对象
+                 */
+                deviceId: string;
+                /**
+                 * 特征值所属服务 uuid
+                 */
+                serviceId: string;
+                /**
+                 * 特征值 uuid
+                 */
+                characteristicId: string;
+                /**
+                 * 特征值最新的值
+                 */
+                value: ArrayBuffer;
+            }
+        ) => void
+    ): void;
+    // #region iBeacon
+    interface BeaconDiscoveryOptions extends BaseOptions {
+        /**
+         * iBeacon设备广播的 uuids
+         */
+        uuids: string | string[];
+        success?(errMsg: string): void;
+    }
     /**
-     * 提示的内容
+     * 开始搜索附近的iBeacon设备
+     * @version 1.2.0
      */
-    title: string;
+    function startBeaconDiscovery(options: BeaconDiscoveryOptions): void;
     /**
-     * 是否显示透明蒙层，防止触摸穿透，默认：false
+     * 停止搜索附近的iBeacon设备
+     * @version 1.2.0
      */
-    mask?: boolean;
-  }
-  /**
-   * 显示 loading 提示框, 需主动调用 wx.hideLoading 才能关闭提示框
-   */
-  function showLoading(options: LoadingOptions): void;
-  /**
-   * 隐藏消息提示框
-   */
-  function hideLoading(): void;
-  interface ModalOptions extends BaseOptions {
+    function stopBeaconDiscovery(options: BeaconDiscoveryOptions): void;
+    interface Beacon {
+        /** iBeacon 设备广播的 uuid */
+        uuid: string;
+        /** iBeacon 设备的主 id */
+        major: string;
+        /** iBeacon 设备的次 id */
+        minor: string;
+        /** 表示设备距离的枚举值 */
+        proximity: number;
+        /** iBeacon 设备的距离 */
+        accuracy: number;
+        /** 表示设备的信号强度 */
+        rssi: number;
+    }
+    interface GetBeaconsSuccess {
+        beacons: Beacon[];
+        errMsg: string;
+    }
+    interface GetBeaconsOptions extends BaseOptions {
+        success?(options: GetBeaconsSuccess): void;
+    }
     /**
-     * 提示的标题
+     * 获取所有已搜索到的iBeacon设备
+     * @version 1.2.0
      */
-    title: string;
+    function getBeacons(options: GetBeaconsOptions): void;
     /**
-     * 提示的内容
+     * 监听 iBeacon 设备的更新事件
+     * @version 1.2.0
      */
-    content: string;
+    function onBeaconUpdate(callback?: (beacons: Beacon[]) => void): void;
     /**
-     * 是否显示取消按钮，默认为 true
+     * 监听 iBeacon 服务的状态变化
+     * @version 1.2.0
      */
-    showCancel?: boolean;
+    function onBeaconServiceChange(
+        callback?: (available?: boolean, discovering?: boolean) => void
+    ): void;
+    // #endregion
+    // 设备-----屏幕亮度
+    interface SetScreenBrightnessOptions {
+        /** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
+        value: number;
+    }
     /**
-     * 取消按钮的文字，默认为"取消"，最多 4 个字符
+     * 设置屏幕亮度
+     * @version 1.2.0
      */
-    cancelText?: string;
+    function setScreenBrightness(options: SetScreenBrightnessOptions): void;
+    interface GetScreenBrightnessOptions extends BaseOptions {
+        /** 屏幕亮度值，范围 0~1，0 最暗，1 最亮 */
+        success(value: number): void;
+    }
     /**
-     * 取消按钮的文字颜色，默认为"#000000"
+     * 获取屏幕亮度
+     * @version 1.2.0
      */
-    cancelColor?: string;
+    function getScreenBrightness(options?: GetScreenBrightnessOptions): void;
+    interface SetKeepScreenOnOptions extends BaseOptions {
+        /** 是否保持屏幕常亮 */
+        keepScreenOn: boolean;
+        success?(errMsg: string): void;
+    }
     /**
-     * 确定按钮的文字，默认为"确定"，最多 4 个字符
+     * 设置是否保持常亮状态。
+     * 仅在当前小程序生效，离开小程序后设置失效。
+     * @version 1.4.0
      */
-    confirmText?: string;
+    function setKeepScreenOn(options?: SetKeepScreenOnOptions): void;
+    // 设备-----震动
     /**
-     * 确定按钮的文字颜色，默认为"#3CC51F"
+     * 使手机发生较长时间的振动（400ms）
+     * @version 1.2.0
      */
-    confirmColor?: string;
-    success?(res: {
-      /**
-       * 为 true 时，表示用户点击了确定按钮
-       */
-      confirm: boolean;
-      /**
-       * 为 true 时，表示用户点击了取消（用于 Android 系统区分点击蒙层关闭还是点击取消按钮关闭）
-       */
-      cancel: boolean;
-    }): void;
-  }
-  /**
-   * 显示模态弹窗
-   */
-  function showModal(options: ModalOptions): void;
-  interface ActionSheetOptions extends BaseOptions {
+    function vibrateLong(options?: BaseOptions): void;
     /**
-     * 按钮的文字数组，数组长度最大为6个
+     * 使手机发生较短时间的振动（15ms）
+     * @version 1.2.0
      */
-    itemList: string[];
+    function vibrateShort(options?: BaseOptions): void;
     /**
-     * 按钮的文字颜色，默认为"#000000"
+     * 监听用户主动截屏事件，用户使用系统截屏按键截屏时触发此事件
+     * @version 1.4.0
      */
-    itemColor?: string;
+    function onUserCaptureScreen(callback?: (res: any) => void): void;
+    // 设备-----手机联系人
+    interface PhoneContact extends BaseOptions {
+        /** 头像本地文件路径 */
+        photoFilePath?: string;
+        /** 昵称 */
+        nickName?: string;
+        /** 姓氏 */
+        lastName?: string;
+        /** 中间名 */
+        middleName?: string;
+        /** 名字 */
+        firstName: string;
+        /** 备注 */
+        remark?: string;
+        /** 手机号 */
+        mobilePhoneNumber?: string;
+        /** 微信号 */
+        weChatNumber?: string;
+        /** 联系地址国家 */
+        addressCountry?: string;
+        /** 联系地址省份 */
+        addressState?: string;
+        /** 联系地址城市 */
+        addressCity?: string;
+        /** 联系地址街道 */
+        addressStreet?: string;
+        /** 联系地址邮政编码 */
+        addressPostalCode?: string;
+        /** 公司 */
+        organization?: string;
+        /** 职位 */
+        title?: string;
+        /** 工作传真 */
+        workFaxNumber?: string;
+        /** 工作电话 */
+        workPhoneNumber?: string;
+        /** 公司电话 */
+        hostNumber?: string;
+        /** 电子邮件 */
+        email?: string;
+        /** 网站 */
+        url?: string;
+        /** 工作地址国家 */
+        workAddressCountry?: string;
+        /** 工作地址省份 */
+        workAddressState?: string;
+        /** 工作地址城市 */
+        workAddressCity?: string;
+        /** 工作地址街道 */
+        workAddressStreet?: string;
+        /** 工作地址邮政编码 */
+        workAddressPostalCode?: string;
+        /** 住宅传真 */
+        homeFaxNumber?: string;
+        /** 住宅电话 */
+        homePhoneNumber?: string;
+        /** 住宅地址国家 */
+        homeAddressCountry?: string;
+        /** 住宅地址省份 */
+        homeAddressState?: string;
+        /** 住宅地址城市 */
+        homeAddressCity?: string;
+        /** 住宅地址街道 */
+        homeAddressStreet?: string;
+        /** 住宅地址邮政编码 */
+        homeAddressPostalCode?: string;
+    }
     /**
-     * 接口调用成功的回调函数
+     * 增加 手机联系人
+     * 调用后，用户可以选择将该表单以“新增联系人”或“添加到已有联系人”的方式
+     * 写入手机系统通讯录
+     * 完成手机通讯录联系人和联系方式的增加。
+     * @version 1.2.0
      */
-    success?(res: {
-      /**
-       * 用户点击的按钮，从上到下的顺序，从0开始
-       */
-      tapIndex: number;
-    }): void;
-  }
-  /**
-   * 显示操作菜单
-   */
-  function showActionSheet(options: ActionSheetOptions): void;
-  // 界面-----设置置顶信息
-  interface SetTopBarTextOptions extends BaseOptions {
+    function addPhoneContact(options: PhoneContact): void;
+    // 设备-----Wi-Fi
     /**
-     * 置顶栏文字内容
+     * 初始化 Wi-Fi 模块。
+     * @version 1.6.0
      */
-    text: string;
-  }
-  /**
-   * 动态设置置顶栏文字内容
-   * 只有当前小程序被置顶时能生效，如果当前小程序没有被置顶，也能调用成功，但是不会立即生效
-   * 只有在用户将这个小程序置顶后才换上设置的文字内容。
-   * 注意：调用成功后，需间隔 5s 才能再次调用此接口，如果在 5s 内再次调用此接口，会回调
-   * fail，errMsg："setTopBarText: fail invoke too frequently"
-   * @version 1.4.3
-   */
-  function setTopBarText(options?: SetTopBarTextOptions): void;
-  // 界面-----设置导航条
-  interface SetNavigationBarTitleOptions extends BaseOptions {
-    /** 页面标题 */
-    title: string;
-  }
-  /**
-   * 动态设置当前页面的标题。
-   * @version 1.4.3
-   */
-  function setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
-  /**
-   * 在当前页面显示导航条加载动画。
-   * @version 1.4.3
-   */
-  function showNavigationBarLoading(): void;
-  /**
-   * 隐藏导航条加载动画。
-   * @version 1.4.3
-   */
-  function hideNavigationBarLoading(): void;
-  interface SetTabBarBadgeOptions extends BaseOptions {
+    function startWifi(options?: BaseOptions): void;
     /**
-     * tabBar的哪一项，从左边算起
+     * 关闭 Wi-Fi 模块。
+     * @version 1.6.0
      */
-    index: number;
+    function stopWifi(options?: BaseOptions): void;
+    interface ConnectWiFiOptions extends BaseOptions {
+        /** Wi-Fi 设备ssid */
+        SSID: string;
+        /** Wi-Fi 设备bssid */
+        BSSID: string;
+        /** Wi-Fi 设备密码 */
+        password?: string;
+    }
     /**
-     * 显示的文本，超过 3 个字符则显示成“…”
+     * 连接 Wi-Fi。
+     * 若已知 Wi-Fi 信息，可以直接利用该接口连接。
+     * 仅 Android 与 iOS 11 以上版本支持。
+     * @version 1.6.0
      */
-    text: string;
-  }
-  // 界面-----设置tabBar
-  /**
-   * 为 tabBar 某一项的右上角添加文本
-   * @version 1.9.0
-   */
-  function setTabBarBadge(options: SetTabBarBadgeOptions): void;
-  interface TabBarBadgeOptions extends BaseOptions {
+    function connectWifi(options?: ConnectWiFiOptions): void;
     /**
-     * tabBar的哪一项，从左边算起
+     * 请求获取 Wi-Fi 列表
+     * 在 onGetWifiList 注册的回调中返回 wifiList 数据。
+     * iOS 将跳转到系统的 Wi-Fi 界面，Android 不会跳转。
+     * iOS 11.0 及 iOS 11.1 两个版本因系统问题，该方法失效。但在 iOS 11.2 中已修复。
+     * @version 1.6.0
      */
-    index: number;
-  }
-  /**
-   * 移除 tabBar 某一项右上角的文本
-   * @version 1.9.0
-   */
-  function removeTabBarBadge(options: TabBarBadgeOptions): void;
-  /**
-   * 显示 tabBar 某一项的右上角的红点
-   * @version 1.9.0
-   */
-  function showTabBarRedDot(option: TabBarBadgeOptions): void;
-  /**
-   * 隐藏 tabBar 某一项的右上角的红点
-   * @version 1.9.0
-   */
-  function hideTabBarRedDot(option: TabBarBadgeOptions): void;
-  interface SetTabBarStyleOptions extends BaseOptions {
-    /** tab 上的文字默认颜色 */
-    color: string;
-    /** tab 上的文字选中时的颜色 */
-    selectedColor: string;
-    /** tab 的背景色 */
-    backgroundColor: string;
-    /** tabbar上边框的颜色， 仅支持 black/white */
-    borderStyle: string;
-  }
-  /**
-   * 动态设置 tabBar 的整体样式
-   * @version 1.9.0
-   */
-  function setTabBarStyle(options: SetTabBarStyleOptions): void;
-  interface SetTabBarItemOptions extends BaseOptions {
-    /** tabBar 的哪一项，从左边算起 */
-    index: number;
-    /** tab 上按钮文字 */
-    text?: string;
+    function getWifiList(options?: BaseOptions): void;
+    interface WiFi {
+        /** Wi-Fi 的SSID */
+        SSID: string;
+        /** Wi-Fi 的BSSID */
+        BSSID: string;
+        /** Wi-Fi 是否安全 */
+        secure: boolean;
+        /** Wi-Fi 信号强度 */
+        signalStrength: number;
+    }
+    interface GetWifiListOptions {
+        /** Wi-Fi 列表数据 */
+        wifiList: WiFi[];
+    }
     /**
-     * 图片路径, icon 大小限制为40kb
-     * 建议尺寸为 81px * 81px
-     * 当 postion 为 top 时，此参数无效，不支持网络图片
+     * 监听在获取到 Wi-Fi 列表数据时的事件，在回调中将返回 wifiList。
+     * @version 1.6.0
      */
-    iconPath?: string;
+    function onGetWifiList(callback?: (res: GetWifiListOptions) => void): void;
+    interface SetWifiList {
+        /** Wi-Fi 设备ssid */
+        SSID: string;
+        /** Wi-Fi 设备bssid */
+        BSSID: string;
+        /** Wi-Fi 设备密码 */
+        password: string;
+    }
+    interface SetWifiListOptions extends BaseOptions {
+        /** 提供预设的 Wi-Fi 信息列表 */
+        wifiList: SetWifiList[];
+    }
     /**
-     * 选中时的图片路径
-     * icon 大小限制为40kb，建议尺寸为 81px * 81px
-     * 当 postion 为 top
+     * iOS特有接口 在 onGetWifiList 回调后，利用接口设置 wifiList 中 AP 的相关信息。
+     * 注意：
+     * + 该接口只能在 onGetWifiList 回调之后才能调用。
+     * + 此时客户端会挂起，等待小程序设置 Wi-Fi 信息，请务必尽快调用该接口，若无数据请传入一个空数组。
+     * + 有可能随着周边 Wi-Fi 列表的刷新，单个流程内收到多次带有存在重复的 Wi-Fi 列表的回调。
+     * @version 1.6.0
      */
-    selectedIconPath?: string;
-  }
-  /**
-   * 动态设置 tabBar 某一项的内容
-   * @version 1.9.0
-   */
-  function setTabBarItem(options: SetTabBarItemOptions): void;
-  interface ShowTabBarOptions extends BaseOptions {
-    /** 是否需要动画效果，默认无 */
-    aniamtion?: boolean;
-  }
-  /**
-   * 显示 tabBar
-   * @version 1.9.0
-   */
-  function showTabBar(options: ShowTabBarOptions): void;
-  /**
-   * 隐藏 tabBar
-   * @version 1.9.0
-   */
-  function hideTabBar(options: ShowTabBarOptions): void;
-  // 界面-----导航
-  interface NavigateToOptions extends BaseOptions {
-    /** 需要跳转的应用内页面的路径 */
-    url: string;
-  }
-  /**
-   * 保留当前页面，跳转到应用内的某个页面，使用wx.navigateBack可以返回到原页面。
-   *
-   * 注意：为了不让用户在使用小程序时造成困扰，
-   * 我们规定页面路径只能是五层，请尽量避免多层级的交互方式。
-   */
-  function navigateTo(options: NavigateToOptions): void;
-  interface SwitchTabOptions extends BaseOptions {
+    function setWifiList(options: SetWifiListOptions): void;
     /**
-     * 需要跳转的 tabBar 页面的路径
-     * （需在 app.json 的 tabBar 字段定义的页面），路径后不能带参数
+     * 监听连接上 Wi-Fi 的事件。
+     * @version 1.6.0
      */
-    url: string;
-  }
-  /**
-   * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
-   */
-  function switchTab(options: SwitchTabOptions): void;
-  interface RedirectToOptions extends BaseOptions {
-    /** 需要跳转的应用内页面的路径 */
-    url: string;
-  }
-  /**
-   * 关闭当前页面，跳转到应用内的某个页面。
-   */
-  function redirectTo(options: RedirectToOptions): void;
-  interface NavigateBackOptions {
-    /** 返回的页面数，如果 delta 大于现有页面数，则返回到首页。 */
-    delta: number;
-  }
-  /**
-   * 关闭当前页面，回退前一页面。
-   */
-  function navigateBack(options?: NavigateBackOptions): void;
-  interface ReLaunchOptions extends BaseOptions {
+    function onWifiConnected(callback?: (wifi: WiFi) => void): void;
+    interface GetConnectedWifiOptions extends BaseOptions {
+        success(wifi: WiFi): void;
+    }
     /**
-     * 需要跳转的应用内页面路径 , 路径后可以带参数。
-     * 参数与路径之间使用?分隔，参数键与参数值用=相连，不同参数用&分隔
-     * 如 'path?key=value&key2=value2'，如果跳转的页面路径是 tabBar 页面则不能带参数
+     * 获取已连接中的 Wi-Fi 信息
+     * @version 1.6.0
      */
-    url: string;
-  }
-  /**
-   * 关闭所有页面，打开到应用内的某个页面。
-   * @version 1.1.0
-   */
-  function reLaunch(options?: ReLaunchOptions): void;
-  // 界面-----动画
-  type TimingFunction = 'linear' | 'ease' | 'ease-in' | 'ease-in-out' | 'ease-out' | 'step-start' | 'step-end';
-  interface CreateAnimationOptions {
-    /** 动画持续时间，单位ms，默认值 400 */
-    duration?: number;
-    /** 定义动画的效果，默认值"linear"，有效值："linear","ease","ease-in","ease-in-out","ease-out","step-start","step-end" */
-    timingFunction?: TimingFunction;
-    /** 动画持续时间，单位 ms，默认值 0 */
-    delay?: number;
-    /** 设置transform-origin，默认为"50% 50% 0" */
-    transformOrigin?: string;
-  }
-  interface Animator {
-    actions: AnimationAction[];
-  }
-  interface AnimationAction {
-    animates: Animate[];
-    option: AnimationActionOption;
-  }
-  interface AnimationActionOption {
-    transformOrigin: string;
-    transition: AnimationTransition;
-  }
-  interface AnimationTransition {
-    delay: number;
-    duration: number;
-    timingFunction: TimingFunction;
-  }
-  interface Animate {
-    type: string;
-    args: any[];
-  }
-  /**
-   * 创建一个动画实例animation。调用实例的方法来描述动画。
-   * 最后通过动画实例的export方法导出动画数据传递给组件的animation属性。
-   *
-   * 注意: export 方法每次调用后会清掉之前的动画操作
-   */
-  function createAnimation(options?: CreateAnimationOptions): Animation;
-  /** 动画实例可以调用以下方法来描述动画，调用结束后会返回自身，支持链式调用的写法。 */
-  interface Animation {
+    function getConnectedWifi(options?: GetConnectedWifiOptions): void;
+    // #endregion
+    // #region 界面API列表
+    interface ToastOptions extends BaseOptions {
+        /**
+         * 提示的内容
+         */
+        title: string;
+        /**
+         * 图标，只支持"success"、"loading"
+         */
+        icon?: "success" | "loading";
+        /**
+         * 自定义图标的本地路径，image 的优先级高于 icon
+         */
+        image?: string;
+        /**
+         * 提示的延迟时间，单位毫秒，默认：1500
+         */
+        duration?: number;
+        /**
+         * 是否显示透明蒙层，防止触摸穿透，默认：false
+         */
+        mask?: boolean;
+    }
     /**
-     * 调用动画操作方法后要调用 step() 来表示一组动画完成，
-     * 可以在一组动画中调用任意多个动画方法，
-     * 一组动画中的所有动画会同时开始，
-     * 一组动画完成后才会进行下一组动画。
-     * @param options 指定当前组动画的配置
+     * 显示消息提示框
      */
-    step(options?: CreateAnimationOptions): void;
+    function showToast(options: ToastOptions): void;
+    function hideToast(): void;
+    interface LoadingOptions extends BaseOptions {
+        /**
+         * 提示的内容
+         */
+        title: string;
+        /**
+         * 是否显示透明蒙层，防止触摸穿透，默认：false
+         */
+        mask?: boolean;
+    }
     /**
-     * 导出动画操作
+     * 显示 loading 提示框, 需主动调用 wx.hideLoading 才能关闭提示框
+     */
+    function showLoading(options: LoadingOptions): void;
+    /**
+     * 隐藏消息提示框
+     */
+    function hideLoading(): void;
+    interface ModalOptions extends BaseOptions {
+        /**
+         * 提示的标题
+         */
+        title: string;
+        /**
+         * 提示的内容
+         */
+        content: string;
+        /**
+         * 是否显示取消按钮，默认为 true
+         */
+        showCancel?: boolean;
+        /**
+         * 取消按钮的文字，默认为"取消"，最多 4 个字符
+         */
+        cancelText?: string;
+        /**
+         * 取消按钮的文字颜色，默认为"#000000"
+         */
+        cancelColor?: string;
+        /**
+         * 确定按钮的文字，默认为"确定"，最多 4 个字符
+         */
+        confirmText?: string;
+        /**
+         * 确定按钮的文字颜色，默认为"#3CC51F"
+         */
+        confirmColor?: string;
+        success?(res: {
+            /**
+             * 为 true 时，表示用户点击了确定按钮
+             */
+            confirm: boolean;
+            /**
+             * 为 true 时，表示用户点击了取消（用于 Android 系统区分点击蒙层关闭还是点击取消按钮关闭）
+             */
+            cancel: boolean;
+        }): void;
+    }
+    /**
+     * 显示模态弹窗
+     */
+    function showModal(options: ModalOptions): void;
+    interface ActionSheetOptions extends BaseOptions {
+        /**
+         * 按钮的文字数组，数组长度最大为6个
+         */
+        itemList: string[];
+        /**
+         * 按钮的文字颜色，默认为"#000000"
+         */
+        itemColor?: string;
+        /**
+         * 接口调用成功的回调函数
+         */
+        success?(res: {
+            /**
+             * 用户点击的按钮，从上到下的顺序，从0开始
+             */
+            tapIndex: number;
+        }): void;
+    }
+    /**
+     * 显示操作菜单
+     */
+    function showActionSheet(options: ActionSheetOptions): void;
+    // 界面-----设置置顶信息
+    interface SetTopBarTextOptions extends BaseOptions {
+        /**
+         * 置顶栏文字内容
+         */
+        text: string;
+    }
+    /**
+     * 动态设置置顶栏文字内容
+     * 只有当前小程序被置顶时能生效，如果当前小程序没有被置顶，也能调用成功，但是不会立即生效
+     * 只有在用户将这个小程序置顶后才换上设置的文字内容。
+     * 注意：调用成功后，需间隔 5s 才能再次调用此接口，如果在 5s 内再次调用此接口，会回调
+     * fail，errMsg："setTopBarText: fail invoke too frequently"
+     * @version 1.4.3
+     */
+    function setTopBarText(options?: SetTopBarTextOptions): void;
+    // 界面-----设置导航条
+    interface SetNavigationBarTitleOptions extends BaseOptions {
+        /** 页面标题 */
+        title: string;
+    }
+    /**
+     * 动态设置当前页面的标题。
+     * @version 1.4.3
+     */
+    function setNavigationBarTitle(options: SetNavigationBarTitleOptions): void;
+    /**
+     * 在当前页面显示导航条加载动画。
+     * @version 1.4.3
+     */
+    function showNavigationBarLoading(): void;
+    /**
+     * 隐藏导航条加载动画。
+     * @version 1.4.3
+     */
+    function hideNavigationBarLoading(): void;
+    interface SetTabBarBadgeOptions extends BaseOptions {
+        /**
+         * tabBar的哪一项，从左边算起
+         */
+        index: number;
+        /**
+         * 显示的文本，超过 3 个字符则显示成“…”
+         */
+        text: string;
+    }
+    // 界面-----设置tabBar
+    /**
+     * 为 tabBar 某一项的右上角添加文本
+     * @version 1.9.0
+     */
+    function setTabBarBadge(options: SetTabBarBadgeOptions): void;
+    interface TabBarBadgeOptions extends BaseOptions {
+        /**
+         * tabBar的哪一项，从左边算起
+         */
+        index: number;
+    }
+    /**
+     * 移除 tabBar 某一项右上角的文本
+     * @version 1.9.0
+     */
+    function removeTabBarBadge(options: TabBarBadgeOptions): void;
+    /**
+     * 显示 tabBar 某一项的右上角的红点
+     * @version 1.9.0
+     */
+    function showTabBarRedDot(option: TabBarBadgeOptions): void;
+    /**
+     * 隐藏 tabBar 某一项的右上角的红点
+     * @version 1.9.0
+     */
+    function hideTabBarRedDot(option: TabBarBadgeOptions): void;
+    interface SetTabBarStyleOptions extends BaseOptions {
+        /** tab 上的文字默认颜色 */
+        color: string;
+        /** tab 上的文字选中时的颜色 */
+        selectedColor: string;
+        /** tab 的背景色 */
+        backgroundColor: string;
+        /** tabbar上边框的颜色， 仅支持 black/white */
+        borderStyle: string;
+    }
+    /**
+     * 动态设置 tabBar 的整体样式
+     * @version 1.9.0
+     */
+    function setTabBarStyle(options: SetTabBarStyleOptions): void;
+    interface SetTabBarItemOptions extends BaseOptions {
+        /** tabBar 的哪一项，从左边算起 */
+        index: number;
+        /** tab 上按钮文字 */
+        text?: string;
+        /**
+         * 图片路径, icon 大小限制为40kb
+         * 建议尺寸为 81px * 81px
+         * 当 postion 为 top 时，此参数无效，不支持网络图片
+         */
+        iconPath?: string;
+        /**
+         * 选中时的图片路径
+         * icon 大小限制为40kb，建议尺寸为 81px * 81px
+         * 当 postion 为 top
+         */
+        selectedIconPath?: string;
+    }
+    /**
+     * 动态设置 tabBar 某一项的内容
+     * @version 1.9.0
+     */
+    function setTabBarItem(options: SetTabBarItemOptions): void;
+    interface ShowTabBarOptions extends BaseOptions {
+        /** 是否需要动画效果，默认无 */
+        aniamtion?: boolean;
+    }
+    /**
+     * 显示 tabBar
+     * @version 1.9.0
+     */
+    function showTabBar(options: ShowTabBarOptions): void;
+    /**
+     * 隐藏 tabBar
+     * @version 1.9.0
+     */
+    function hideTabBar(options: ShowTabBarOptions): void;
+    // 界面-----导航
+    interface NavigateToOptions extends BaseOptions {
+        /** 需要跳转的应用内页面的路径 */
+        url: string;
+    }
+    /**
+     * 保留当前页面，跳转到应用内的某个页面，使用wx.navigateBack可以返回到原页面。
+     *
+     * 注意：为了不让用户在使用小程序时造成困扰，
+     * 我们规定页面路径只能是五层，请尽量避免多层级的交互方式。
+     */
+    function navigateTo(options: NavigateToOptions): void;
+    interface SwitchTabOptions extends BaseOptions {
+        /**
+         * 需要跳转的 tabBar 页面的路径
+         * （需在 app.json 的 tabBar 字段定义的页面），路径后不能带参数
+         */
+        url: string;
+    }
+    /**
+     * 跳转到 tabBar 页面，并关闭其他所有非 tabBar 页面
+     */
+    function switchTab(options: SwitchTabOptions): void;
+    interface RedirectToOptions extends BaseOptions {
+        /** 需要跳转的应用内页面的路径 */
+        url: string;
+    }
+    /**
+     * 关闭当前页面，跳转到应用内的某个页面。
+     */
+    function redirectTo(options: RedirectToOptions): void;
+    interface NavigateBackOptions {
+        /** 返回的页面数，如果 delta 大于现有页面数，则返回到首页。 */
+        delta: number;
+    }
+    /**
+     * 关闭当前页面，回退前一页面。
+     */
+    function navigateBack(options?: NavigateBackOptions): void;
+    interface ReLaunchOptions extends BaseOptions {
+        /**
+         * 需要跳转的应用内页面路径 , 路径后可以带参数。
+         * 参数与路径之间使用?分隔，参数键与参数值用=相连，不同参数用&分隔
+         * 如 'path?key=value&key2=value2'，如果跳转的页面路径是 tabBar 页面则不能带参数
+         */
+        url: string;
+    }
+    /**
+     * 关闭所有页面，打开到应用内的某个页面。
+     * @version 1.1.0
+     */
+    function reLaunch(options?: ReLaunchOptions): void;
+    // 界面-----动画
+    type TimingFunction =
+        | "linear"
+        | "ease"
+        | "ease-in"
+        | "ease-in-out"
+        | "ease-out"
+        | "step-start"
+        | "step-end";
+    interface CreateAnimationOptions {
+        /** 动画持续时间，单位ms，默认值 400 */
+        duration?: number;
+        /** 定义动画的效果，默认值"linear"，有效值："linear","ease","ease-in","ease-in-out","ease-out","step-start","step-end" */
+        timingFunction?: TimingFunction;
+        /** 动画持续时间，单位 ms，默认值 0 */
+        delay?: number;
+        /** 设置transform-origin，默认为"50% 50% 0" */
+        transformOrigin?: string;
+    }
+    interface Animator {
+        actions: AnimationAction[];
+    }
+    interface AnimationAction {
+        animates: Animate[];
+        option: AnimationActionOption;
+    }
+    interface AnimationActionOption {
+        transformOrigin: string;
+        transition: AnimationTransition;
+    }
+    interface AnimationTransition {
+        delay: number;
+        duration: number;
+        timingFunction: TimingFunction;
+    }
+    interface Animate {
+        type: string;
+        args: any[];
+    }
+    /**
+     * 创建一个动画实例animation。调用实例的方法来描述动画。
+     * 最后通过动画实例的export方法导出动画数据传递给组件的animation属性。
      *
      * 注意: export 方法每次调用后会清掉之前的动画操作
      */
-    export(): Animator;
-    /** 透明度，参数范围 0~1 */
-    opacity(value: number): Animation;
-    /** 颜色值 */
-    backgroundColor(color: string): Animation;
-    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-    width(length: number): Animation;
-    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-    height(length: number): Animation;
-    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-    top(length: number): Animation;
-    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-    left(length: number): Animation;
-    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-    bottom(length: number): Animation;
-    /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
-    right(length: number): Animation;
-    /** deg的范围-180~180，从原点顺时针旋转一个deg角度 */
-    rotate(deg: number): Animation;
-    /** deg的范围-180~180，在X轴旋转一个deg角度 */
-    rotateX(deg: number): Animation;
-    /** deg的范围-180~180，在Y轴旋转一个deg角度 */
-    rotateY(deg: number): Animation;
-    /** deg的范围-180~180，在Z轴旋转一个deg角度 */
-    rotateZ(deg: number): Animation;
-    /** 同transform-function rotate3d */
-    rotate3d(x: number, y: number, z: number, deg: number): Animation;
+    function createAnimation(options?: CreateAnimationOptions): Animation;
+    /** 动画实例可以调用以下方法来描述动画，调用结束后会返回自身，支持链式调用的写法。 */
+    interface Animation {
+        /**
+         * 调用动画操作方法后要调用 step() 来表示一组动画完成，
+         * 可以在一组动画中调用任意多个动画方法，
+         * 一组动画中的所有动画会同时开始，
+         * 一组动画完成后才会进行下一组动画。
+         * @param options 指定当前组动画的配置
+         */
+        step(options?: CreateAnimationOptions): void;
+        /**
+         * 导出动画操作
+         *
+         * 注意: export 方法每次调用后会清掉之前的动画操作
+         */
+        export(): Animator;
+        /** 透明度，参数范围 0~1 */
+        opacity(value: number): Animation;
+        /** 颜色值 */
+        backgroundColor(color: string): Animation;
+        /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+        width(length: number): Animation;
+        /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+        height(length: number): Animation;
+        /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+        top(length: number): Animation;
+        /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+        left(length: number): Animation;
+        /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+        bottom(length: number): Animation;
+        /** 长度值，如果传入 Number 则默认使用 px，可传入其他自定义单位的长度值 */
+        right(length: number): Animation;
+        /** deg的范围-180~180，从原点顺时针旋转一个deg角度 */
+        rotate(deg: number): Animation;
+        /** deg的范围-180~180，在X轴旋转一个deg角度 */
+        rotateX(deg: number): Animation;
+        /** deg的范围-180~180，在Y轴旋转一个deg角度 */
+        rotateY(deg: number): Animation;
+        /** deg的范围-180~180，在Z轴旋转一个deg角度 */
+        rotateZ(deg: number): Animation;
+        /** 同transform-function rotate3d */
+        rotate3d(x: number, y: number, z: number, deg: number): Animation;
+        /**
+         * 一个参数时，表示在X轴、Y轴同时缩放sx倍数；
+         * 两个参数时表示在X轴缩放sx倍数，在Y轴缩放sy倍数
+         */
+        scale(sx: number, sy?: number): Animation;
+        /** 在X轴缩放sx倍数 */
+        scaleX(sx: number): Animation;
+        /** 在Y轴缩放sy倍数 */
+        scaleY(sy: number): Animation;
+        /** 在Z轴缩放sy倍数 */
+        scaleZ(sz: number): Animation;
+        /** 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数 */
+        scale3d(sx: number, sy: number, sz: number): Animation;
+        /**
+         * 一个参数时，表示在X轴偏移tx，单位px；
+         * 两个参数时，表示在X轴偏移tx，在Y轴偏移ty，单位px。
+         */
+        translate(tx: number, ty?: number): Animation;
+        /**
+         * 在X轴偏移tx，单位px
+         */
+        translateX(tx: number): Animation;
+        /**
+         * 在Y轴偏移tx，单位px
+         */
+        translateY(ty: number): Animation;
+        /**
+         * 在Z轴偏移tx，单位px
+         */
+        translateZ(tz: number): Animation;
+        /**
+         * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz，单位px
+         */
+        translate3d(tx: number, ty: number, tz: number): Animation;
+        /**
+         * 参数范围-180~180；
+         * 一个参数时，Y轴坐标不变，X轴坐标延顺时针倾斜ax度；
+         * 两个参数时，分别在X轴倾斜ax度，在Y轴倾斜ay度
+         */
+        skew(ax: number, ay?: number): Animation;
+        /** 参数范围-180~180；Y轴坐标不变，X轴坐标延顺时针倾斜ax度 */
+        skewX(ax: number): Animation;
+        /** 参数范围-180~180；X轴坐标不变，Y轴坐标延顺时针倾斜ay度 */
+        skewY(ay: number): Animation;
+        /**
+         * 同transform-function matrix
+         */
+        matrix(
+            a: number,
+            b: number,
+            c: number,
+            d: number,
+            tx: number,
+            ty: number
+        ): Animation;
+        /** 同transform-function matrix3d */
+        matrix3d(
+            a1: number,
+            b1: number,
+            c1: number,
+            d1: number,
+            a2: number,
+            b2: number,
+            c2: number,
+            d2: number,
+            a3: number,
+            b3: number,
+            c3: number,
+            d3: number,
+            a4: number,
+            b4: number,
+            c4: number,
+            d4: number
+        ): Animation;
+    }
+    // #region 位置API
+    interface PageScrollToOptions {
+        /** 滚动到页面的目标位置（单位px */
+        scrollTop: number;
+        /** 滚动动画的时长，默认300ms，单位 ms */
+        duration?: number;
+    }
+    function pageScrollTo(options: PageScrollToOptions): void;
     /**
-     * 一个参数时，表示在X轴、Y轴同时缩放sx倍数；
-     * 两个参数时表示在X轴缩放sx倍数，在Y轴缩放sy倍数
+     * 返回一个SelectorQuery对象实例。
+     * 可以在这个实例上使用select等方法选择节点，并使用boundingClientRect等方法选择需要查询的信息。
+     * @version 1.4.0
      */
-    scale(sx: number, sy?: number): Animation;
-    /** 在X轴缩放sx倍数 */
-    scaleX(sx: number): Animation;
-    /** 在Y轴缩放sy倍数 */
-    scaleY(sy: number): Animation;
-    /** 在Z轴缩放sy倍数 */
-    scaleZ(sz: number): Animation;
-    /** 在X轴缩放sx倍数，在Y轴缩放sy倍数，在Z轴缩放sz倍数 */
-    scale3d(sx: number, sy: number, sz: number): Animation;
+    function createSelectorQuery(): SelectorQuery;
+    interface NodesRefRect {
+        /** 节点的ID */
+        id: string;
+        /** 节点的dataset */
+        dataset: any;
+        /** 节点的左边界坐标 */
+        left: number;
+        /** 节点的右边界坐标 */
+        right: number;
+        /** 节点的上边界坐标 */
+        top: number;
+        /** 节点的下边界坐标 */
+        bottom: number;
+        /** 节点的宽度 */
+        width: number;
+        /** 节点的高度 */
+        height: number;
+    }
+    interface NodeRefOffset {
+        /** 节点的ID */
+        id: string;
+        /** 节点的dataset */
+        dataset: any;
+        /** 节点的水平滚动位置 */
+        scrollLeft: number;
+        /** 节点的竖直滚动位置 */
+        scrollTop: number;
+    }
+    interface NodeRefFieldsOptions {
+        /** 是否返回节点id */
+        id?: true;
+        /** 是否返回节点dataset */
+        dataset?: true;
+        /** 是否返回节点布局位置（left right top bottom */
+        rect?: true;
+        /** 是否返回节点尺寸（width height） */
+        size?: true;
+        /** 是否返回节点的 scrollLeft scrollTop ，节点必须是scroll-view或者viewport */
+        scrollOffset?: true;
+        /**
+         * 指定属性名列表
+         * 返回节点对应属性名的当前属性值（只能获得组件文档中标注的常规属性值， id class style 和事件绑定的属性值不可获取
+         */
+        properties?: string[];
+    }
+    interface NodeRefFieldsValue {
+        id: {
+            id: boolean;
+        };
+        dataset: {
+            dataset: string;
+        };
+        rect: {
+            left: number;
+            right: number;
+            top: number;
+            bottom: number;
+        };
+        size: {
+            width: number;
+            height: number;
+        };
+        scrollOffset: {
+            scrollLeft: number;
+            scrollTop: number;
+        };
+        properties: {
+            properties: any;
+        };
+    }
+    interface NodesRef {
+        /**
+         * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位。
+         * 其功能类似于DOM的getBoundingClientRect。
+         * 返回值是nodesRef对应的selectorQuery。
+         * 返回的节点信息中，每个节点的位置用
+         * left、right、top、bottom、width、height字段描述。
+         * 如果提供了callback回调函数，在执行selectQuery的exec方法后
+         * 节点信息会在callback中返回。
+         */
+        boundingClientRect<T extends NodesRefRect | NodesRefRect[]>(
+            callback?: (rect: T) => void
+        ): SelectorQuery;
+        /**
+         * 添加节点的滚动位置查询请求，以像素为单位。
+         * 节点必须是scroll-view或者viewport。
+         * 返回值是nodesRef对应的selectorQuery。
+         * 返回的节点信息中，每个节点的滚动位置用scrollLeft、scrollHeight字段描述。
+         * 如果提供了callback回调函数，在执行selectQuery的exec方法后，节点信息会在callback中返回。
+         */
+        scrollOffset(callback?: (rect: NodeRefOffset) => void): SelectorQuery;
+        /**
+         * 获取节点的相关信息，需要获取的字段在fields中指定。
+         * 返回值是nodesRef对应的selectorQuery。
+         */
+        fields(
+            fields: NodeRefFieldsOptions,
+            callback?: (result: any) => void
+        ): SelectorQuery;
+    }
     /**
-     * 一个参数时，表示在X轴偏移tx，单位px；
-     * 两个参数时，表示在X轴偏移tx，在Y轴偏移ty，单位px。
+     * SelectorQuery对象实例
      */
-    translate(tx: number, ty?: number): Animation;
+    interface SelectorQuery {
+        /**
+         * 将选择器的选取范围更改为自定义组件component内
+         * （初始时，选择器仅选取页面范围的节点，不会选取任何自定义组件中的节点
+         * @version 1.6.0
+         */
+        in(component: Component<object, object>): SelectorQuery;
+        /**
+         * 在当前页面下选择第一个匹配选择器selector的节点，返回一个NodesRef对象实例，可以用于获取节点信息。
+         * selector类似于CSS的选择器，但仅支持下列语法。
+         * + ID选择器：#the-id
+         * + class选择器（可以连续指定多个）：.a-class.another-class
+         * + 子元素选择器：.the-parent > .the-child
+         * + 后代选择器：.the-ancestor .the-descendant
+         * + 跨自定义组件的后代选择器：.the-ancestor >>> .the-descendant
+         * + 多选择器的并集：#a-node, .some-other-nodes
+         */
+        select(selector: string): NodesRef;
+        /**
+         * 在当前页面下选择匹配选择器selector的节点，返回一个NodesRef对象实例。
+         * 与selectorQuery.selectNode(selector)不同的是，它选择所有匹配选择器的节点。
+         */
+        selectAll(selector: string): NodesRef;
+        /**
+         * 选择显示区域，可用于获取显示区域的尺寸、滚动位置等信息
+         * 返回一个NodesRef对象实例。
+         */
+        selectViewport(): NodesRef;
+        /**
+         * 执行所有的请求
+         * 请求结果按请求次序构成数组，在callback的第一个参数中返回。
+         */
+        exec(callback?: (result: any[]) => void): void;
+    }
+    // #endregion
+    // 界面-----绘图
+    interface CanvasAction {
+        method: string;
+        data: CanvasAction[] | Array<number | string>;
+    }
+    type LineCapType = "butt" | "round" | "square";
+    type LineJoinType = "bevel" | "round" | "miter";
     /**
-     * 在X轴偏移tx，单位px
+     * context只是一个记录方法调用的容器，用于生成记录绘制行为的actions数组。context跟<canvas/>不存在对应关系，一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
      */
-    translateX(tx: number): Animation;
+    interface CanvasContext {
+        /** 获取当前context上存储的绘图动作(不推荐使用) */
+        getActions(): CanvasAction[];
+        /** 清空当前的存储绘图动作(不推荐使用) */
+        clearActions(): void;
+        /**
+         * 对横纵坐标进行缩放
+         * 在调用scale方法后，之后创建的路径其横纵坐标会被缩放。
+         * 多次调用scale，倍数会相乘。
+         *
+         * @param scaleWidth 横坐标缩放的倍数
+         * @param scaleHeight 纵坐标轴缩放的倍数
+         */
+        scale(scaleWidth: number, scaleHeight?: number): void;
+        /**
+         * 对坐标轴进行顺时针旋转
+         * 以原点为中心，原点可以用 translate方法修改。
+         * 顺时针旋转当前坐标轴。多次调用rotate，旋转的角度会叠加。
+         *
+         * @param rotate 旋转角度，以弧度计。
+         */
+        rotate(rotate: number): void;
+        /**
+         * 对坐标原点进行缩放
+         * 对当前坐标系的原点(0, 0)进行变换，默认的坐标系原点为页面左上角。
+         *
+         * @param x 水平坐标平移量
+         * @param y 竖直坐标平移量
+         */
+        translate(x: number, y: number): void;
+        /**
+         * 保存当前的绘图上下文。
+         */
+        save(): void;
+        /**
+         * 恢复之前保存的绘图上下文。
+         */
+        restore(): void;
+        /**
+         * 在给定的矩形区域内，清除画布上的像素
+         * 清除画布上在该矩形区域内的内容。
+         *
+         * @param x 矩形区域左上角的x坐标
+         * @param y 矩形区域左上角的y坐标
+         * @param width 矩形区域的宽度
+         * @param height 矩形区域的高度
+         */
+        clearRect(x: number, y: number, width: number, height: number): void;
+        /**
+         * 在画布上绘制被填充的文本
+         *
+         * @param text 在画布上输出的文本
+         * @param x 绘制文本的左上角x坐标位置
+         * @param y 绘制文本的左上角y坐标位置
+         */
+        fillText(text: string, x: number, y: number): void;
+        /**
+         * 用于设置文字的对齐
+         */
+        setTextAlign(align: "left" | "center" | "right"): void;
+        /**
+         * 绘制图像，图像保持原始尺寸。
+         * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+         * @param dx            源图像的矩形选择框的左上角 X 坐标
+         * @param dy            源图像的矩形选择框的左上角 Y 坐标
+         */
+        drawImage(imageResource: string, dx: number, dy: number): void;
+        /**
+         * 绘制图像，图像保持原始尺寸。
+         * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+         * @param dx            源图像的矩形选择框的左上角 X 坐标
+         * @param dy            源图像的矩形选择框的左上角 Y 坐标
+         * @param dWidth        源图像的矩形选择框的高度
+         * @param dHeight       源图像的矩形选择框的高度
+         */
+        drawImage(
+            imageResource: string,
+            dx: number,
+            dy: number,
+            dWidth: number,
+            dHeight: number
+        ): void;
+        /**
+         * 绘制图像，图像保持原始尺寸。
+         * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
+         * @param sx            图像的左上角在目标canvas上 X 轴的位置
+         * @param sy            图像的左上角在目标canvas上 Y 轴的位置
+         * @param sWidth        在目标画布上绘制图像的宽度，允许对绘制的图像进行缩放
+         * @param sHeight       在目标画布上绘制图像的高度，允许对绘制的图像进行缩放
+         * @param dx            源图像的矩形选择框的左上角 X 坐标
+         * @param dy            源图像的矩形选择框的左上角 Y 坐标
+         * @param dWidth        源图像的矩形选择框的高度
+         * @param dHeight       源图像的矩形选择框的高度
+         * @version 1.9.0
+         */
+        drawImage(
+            imageResource: string,
+            sx: number,
+            sy: number,
+            sWidth: number,
+            sHeight: number,
+            dx: number,
+            dy: number,
+            dWidth: number,
+            dHeight: number
+        ): void;
+        /**
+         * 设置全局画笔透明度。
+         * @param alpha 0~1  透明度，0 表示完全透明，1 表示完全不透明
+         */
+        setGlobalAlpha(alpha: number): void;
+        /**
+         * 对当前路径进行填充
+         */
+        fill(): void;
+        /**
+         * 对当前路径进行描边
+         */
+        stroke(): void;
+        /**
+         * 开始创建一个路径，需要调用fill或者stroke才会使用路径进行填充或描边。
+         * Tip: 在最开始的时候相当于调用了一次 beginPath()。
+         * Tip: 同一个路径内的多次setFillStyle、setStrokeStyle、setLineWidth等设置，
+         * 以最后一次设置为准。
+         */
+        beginPath(): void;
+        /**
+         * 关闭一个路径
+         * Tip: 关闭路径会连接起点和终点。
+         * Tip: 如果关闭路径后没有调用 fill() 或者 stroke() 并开启了新的路径，那之前的路径将不会被渲染。
+         */
+        closePath(): void;
+        /**
+         * 把路径移动到画布中的指定点，但不创建线条。
+         *
+         * @param x 目标位置的x坐标
+         * @param y 目标位置的y坐标
+         */
+        moveTo(x: number, y: number): void;
+        /**
+         * 在当前位置添加一个新点，然后在画布中创建从该点到最后指定点的路径。
+         *
+         * @param x 目标位置的x坐标
+         * @param y 目标位置的y坐标
+         */
+        lineTo(x: number, y: number): void;
+        /**
+         * 添加一个矩形路径到当前路径。
+         *
+         * @param x 矩形路径左上角的x坐标
+         * @param y 矩形路径左上角的y坐标
+         * @param width 矩形路径的宽度
+         * @param height 矩形路径的高度
+         */
+        rect(x: number, y: number, width: number, height: number): void;
+        /**
+         * 填充一个矩形。
+         * Tip: 用 setFillStyle() 设置矩形的填充色，如果没设置默认是黑色。
+         * @param x 矩形路径左上角的x坐标
+         * @param y 矩形路径左上角的y坐标
+         * @param width 矩形路径的宽度
+         * @param height 矩形路径的高度
+         *
+         */
+        fillRect(x: number, y: number, width: number, height: number): void;
+        /**
+         * 画一个矩形(非填充)。
+         * Tip: 用 setFillStroke() 设置矩形线条的颜色，如果没设置默认是黑色。
+         * @param x 矩形路径左上角的x坐标
+         * @param y 矩形路径左上角的y坐标
+         * @param width 矩形路径的宽度
+         * @param height 矩形路径的高度
+         *
+         */
+        strokeRect(x: number, y: number, width: number, height: number): void;
+        /**
+         * 添加一个弧形路径到当前路径，顺时针绘制。
+         *
+         * @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 cpx 贝塞尔控制点的x坐标
+         * @param cpy 贝塞尔控制点的y坐标
+         * @param x 结束点的x坐标
+         * @param y 结束点的y坐标
+         */
+        quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
+        /**
+         * 创建三次方贝塞尔曲线
+         *
+         * @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 color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+         */
+        setFillStyle(color: string): void;
+        /**
+         * 设置线条样式
+         *
+         * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
+         */
+        setStrokeStyle(color: string): void;
+        /**
+         * 设置阴影
+         *
+         * @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 x0 起点的x坐标
+         * @param y0 起点的y坐标
+         * @param x1 终点的x坐标
+         * @param y1 终点的y坐标
+         */
+        createLinearGradient(
+            x0: number,
+            y0: number,
+            x1: number,
+            y1: number
+        ): void;
+        /**
+         * 创建一个颜色的渐变点。
+         * Tip: 小于最小 stop 的部分会按最小 stop 的 color 来渲染，大于最大 stop 的部分会按最大 stop 的 color 来渲染。
+         * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
+         * @param stop (0-1)  表示渐变点在起点和终点中的位置
+         * @param color 渐变点的颜色
+         *
+         */
+        addColorStop(stop: number, color: string): void;
+        /**
+         * 创建一个圆形的渐变颜色。
+         *
+         * @param x 圆心的x坐标
+         * @param y 圆心的y坐标
+         * @param r 圆的半径
+         *
+         */
+        createCircularGradient(x: number, y: number, r: number): void;
+        /**
+         * 设置字体大小
+         *
+         * @param fontSize 字体的字号
+         */
+        setFontSize(fontSize: number): void;
+        /**
+         * 设置线条端点的样式
+         *
+         * @param lineCap 线条的结束端点样式。 'butt'、'round'、'square'
+         */
+        setLineCap(lineCap: LineCapType): void;
+        /**
+         * 设置两线相交处的样式
+         *  @param lineJoin 两条线相交时，所创建的拐角类型
+         */
+        setLineJoin(lineJoin: LineJoinType): void;
+        /**
+         * 设置线条宽度
+         *
+         * @param lineWidth 线条的宽度
+         */
+        setLineWidth(lineWidth: number): void;
+        /**
+         * 设置最大斜接长度，斜接长度指的是在两条线交汇处内角和外角之间的距离。
+         * 当 setLineJoin为 miter 时才有效。
+         * 超过最大倾斜长度的，连接处将以 lineJoin 为 bevel 来显示
+         *
+         * @param miterLimit 最大斜接长度
+         */
+        setMiterLimit(miterLimit: number): void;
+        /**
+         * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中。
+         * Tip: 绘图上下文需要由 wx.createCanvasContext(canvasId) 来创建。
+         * @param [reserve] 非必填。本次绘制是否接着上一次绘制，即reserve参数为false，则在本次调用drawCanvas绘制之前native层应先清空画布再继续绘制；若reserver参数为true，则保留当前画布上的内容，本次调用drawCanvas绘制的内容覆盖在上面，默认 false
+         *
+         */
+        draw(reserve?: boolean): void;
+    }
     /**
-     * 在Y轴偏移tx，单位px
+     * 创建并返回绘图上下文context对象。
+     * context只是一个记录方法调用的容器，
+     * 用于生成记录绘制行为的actions数组。c
+     * ontext跟<canvas/>不存在对应关系，
+     * 一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
      */
-    translateY(ty: number): Animation;
+    function createContext(): CanvasContext;
+    interface DrawCanvasOptions {
+        /** 画布标识，传入 <canvas/> 的 cavas-id */
+        canvasId: number | string;
+        /**
+         * 绘图动作数组，由 wx.createContext 创建的 context，
+         * 调用 getActions 方法导出绘图动作数组。
+         */
+        actions: CanvasAction[];
+    }
     /**
-     * 在Z轴偏移tx，单位px
+     * 绘制画布
      */
-    translateZ(tz: number): Animation;
+    function drawCanvas(options: DrawCanvasOptions): void;
+    interface CanvasToTempFilePathOptions extends BaseOptions {
+        /**
+         * 画布标识，传入 <canvas/> 的 cavas-id
+         */
+        canvasId: string;
+    }
     /**
-     * 在X轴偏移tx，在Y轴偏移ty，在Z轴偏移tz，单位px
+     * 把当前画布的内容导出生成图片，并返回文件路径
      */
-    translate3d(tx: number, ty: number, tz: number): Animation;
+    function canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
+    interface CanvasImageDataOptions extends BaseOptions {
+        /** 画布标识，传入 <canvas /> 的 canvas-id  */
+        canvasId: string;
+        /** 将要被提取的图像数据矩形区域的左上角 x 坐标 */
+        x: number;
+        /** 将要被提取的图像数据矩形区域的左上角 y 坐标 */
+        y: number;
+        /** 将要被提取的图像数据矩形区域的宽度 */
+        width: number;
+        /** 将要被提取的图像数据矩形区域的高度 */
+        height: number;
+    }
     /**
-     * 参数范围-180~180；
-     * 一个参数时，Y轴坐标不变，X轴坐标延顺时针倾斜ax度；
-     * 两个参数时，分别在X轴倾斜ax度，在Y轴倾斜ay度
-     */
-    skew(ax: number, ay?: number): Animation;
-    /** 参数范围-180~180；Y轴坐标不变，X轴坐标延顺时针倾斜ax度 */
-    skewX(ax: number): Animation;
-    /** 参数范围-180~180；X轴坐标不变，Y轴坐标延顺时针倾斜ay度 */
-    skewY(ay: number): Animation;
-    /**
-     * 同transform-function matrix
-     */
-    matrix(a: number, b: number, c: number, d: number, tx: number, ty: number): Animation;
-    /** 同transform-function matrix3d */
-    matrix3d(
-      a1: number, b1: number, c1: number, d1: number, a2: number,
-      b2: number, c2: number, d2: number, a3: number, b3: number,
-      c3: number, d3: number, a4: number, b4: number, c4: number,
-      d4: number
-    ): Animation;
-  }
-  // #region 位置API
-  interface PageScrollToOptions {
-    /** 滚动到页面的目标位置（单位px */
-    scrollTop: number;
-    /** 滚动动画的时长，默认300ms，单位 ms */
-    duration?: number;
-  }
-  function pageScrollTo(options: PageScrollToOptions): void;
-  /**
-   * 返回一个SelectorQuery对象实例。
-   * 可以在这个实例上使用select等方法选择节点，并使用boundingClientRect等方法选择需要查询的信息。
-   * @version 1.4.0
-   */
-  function createSelectorQuery(): SelectorQuery;
-  interface NodesRefRect {
-    /** 节点的ID */
-    id: string;
-    /** 节点的dataset */
-    dataset: any;
-    /** 节点的左边界坐标 */
-    left: number;
-    /** 节点的右边界坐标 */
-    right: number;
-    /** 节点的上边界坐标 */
-    top: number;
-    /** 节点的下边界坐标 */
-    bottom: number;
-    /** 节点的宽度 */
-    width: number;
-    /** 节点的高度 */
-    height: number;
-  }
-  interface NodeRefOffset {
-    /** 节点的ID */
-    id: string;
-    /** 节点的dataset */
-    dataset: any;
-    /** 节点的水平滚动位置 */
-    scrollLeft: number;
-    /** 节点的竖直滚动位置 */
-    scrollTop: number;
-  }
-  interface NodeRefFieldsOptions {
-    /** 是否返回节点id */
-    id?: true;
-    /** 是否返回节点dataset */
-    dataset?: true;
-    /** 是否返回节点布局位置（left right top bottom */
-    rect?: true;
-    /** 是否返回节点尺寸（width height） */
-    size?: true;
-    /** 是否返回节点的 scrollLeft scrollTop ，节点必须是scroll-view或者viewport */
-    scrollOffset?: true;
-    /**
-     * 指定属性名列表
-     * 返回节点对应属性名的当前属性值（只能获得组件文档中标注的常规属性值， id class style 和事件绑定的属性值不可获取
-     */
-    properties?: string[];
-  }
-  interface NodeRefFieldsValue {
-    id: {
-      id: boolean;
-    };
-    dataset: {
-      dataset: string;
-    };
-    rect: {
-      left: number;
-      right: number;
-      top: number;
-      bottom: number;
-    };
-    size: {
-      width: number;
-      height: number;
-    };
-    scrollOffset: {
-      scrollLeft: number;
-      scrollTop: number;
-    };
-    properties: {
-      properties: any;
-    };
-  }
-  interface NodesRef {
-    /**
-     * 添加节点的布局位置的查询请求，相对于显示区域，以像素为单位。
-     * 其功能类似于DOM的getBoundingClientRect。
-     * 返回值是nodesRef对应的selectorQuery。
-     * 返回的节点信息中，每个节点的位置用
-     * left、right、top、bottom、width、height字段描述。
-     * 如果提供了callback回调函数，在执行selectQuery的exec方法后
-     * 节点信息会在callback中返回。
-     */
-    boundingClientRect<T extends NodesRefRect | NodesRefRect[]>(callback?: (rect: T) => void): SelectorQuery;
-    /**
-     * 添加节点的滚动位置查询请求，以像素为单位。
-     * 节点必须是scroll-view或者viewport。
-     * 返回值是nodesRef对应的selectorQuery。
-     * 返回的节点信息中，每个节点的滚动位置用scrollLeft、scrollHeight字段描述。
-     * 如果提供了callback回调函数，在执行selectQuery的exec方法后，节点信息会在callback中返回。
-     */
-    scrollOffset(callback?: (rect: NodeRefOffset) => void): SelectorQuery;
-    /**
-     * 获取节点的相关信息，需要获取的字段在fields中指定。
-     * 返回值是nodesRef对应的selectorQuery。
-     */
-    fields(fields: NodeRefFieldsOptions, callback?: (result: any) => void): SelectorQuery;
-  }
-  /**
-   * SelectorQuery对象实例
-   */
-  interface SelectorQuery {
-    /**
-     * 将选择器的选取范围更改为自定义组件component内
-     * （初始时，选择器仅选取页面范围的节点，不会选取任何自定义组件中的节点
-     * @version 1.6.0
-     */
-    in(component: Component<object>): SelectorQuery;
-    /**
-     * 在当前页面下选择第一个匹配选择器selector的节点，返回一个NodesRef对象实例，可以用于获取节点信息。
-     * selector类似于CSS的选择器，但仅支持下列语法。
-     * + ID选择器：#the-id
-     * + class选择器（可以连续指定多个）：.a-class.another-class
-     * + 子元素选择器：.the-parent > .the-child
-     * + 后代选择器：.the-ancestor .the-descendant
-     * + 跨自定义组件的后代选择器：.the-ancestor >>> .the-descendant
-     * + 多选择器的并集：#a-node, .some-other-nodes
-     */
-    select(selector: string): NodesRef;
-    /**
-     * 在当前页面下选择匹配选择器selector的节点，返回一个NodesRef对象实例。
-     * 与selectorQuery.selectNode(selector)不同的是，它选择所有匹配选择器的节点。
-     */
-    selectAll(selector: string): NodesRef;
-    /**
-     * 选择显示区域，可用于获取显示区域的尺寸、滚动位置等信息
-     * 返回一个NodesRef对象实例。
-     */
-    selectViewport(): NodesRef;
-    /**
-     * 执行所有的请求
-     * 请求结果按请求次序构成数组，在callback的第一个参数中返回。
-     */
-    exec(callback?: (result: any[]) => void): void;
-  }
-  // #endregion
-  // 界面-----绘图
-  interface CanvasAction {
-    method: string;
-    data: CanvasAction[] | Array<number | string>;
-  }
-  type LineCapType = 'butt' | 'round' | 'square';
-  type LineJoinType = 'bevel' | 'round' | 'miter';
-  /**
-   * context只是一个记录方法调用的容器，用于生成记录绘制行为的actions数组。context跟<canvas/>不存在对应关系，一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
-   */
-  interface CanvasContext {
-    /** 获取当前context上存储的绘图动作(不推荐使用) */
-    getActions(): CanvasAction[];
-    /** 清空当前的存储绘图动作(不推荐使用) */
-    clearActions(): void;
-    /**
-     * 对横纵坐标进行缩放
-     * 在调用scale方法后，之后创建的路径其横纵坐标会被缩放。
-     * 多次调用scale，倍数会相乘。
-     *
-     * @param scaleWidth 横坐标缩放的倍数
-     * @param scaleHeight 纵坐标轴缩放的倍数
-     */
-    scale(scaleWidth: number, scaleHeight?: number): void;
-    /**
-     * 对坐标轴进行顺时针旋转
-     * 以原点为中心，原点可以用 translate方法修改。
-     * 顺时针旋转当前坐标轴。多次调用rotate，旋转的角度会叠加。
-     *
-     * @param rotate 旋转角度，以弧度计。
-     */
-    rotate(rotate: number): void;
-    /**
-     * 对坐标原点进行缩放
-     * 对当前坐标系的原点(0, 0)进行变换，默认的坐标系原点为页面左上角。
-     *
-     * @param x 水平坐标平移量
-     * @param y 竖直坐标平移量
-     */
-    translate(x: number, y: number): void;
-    /**
-     * 保存当前的绘图上下文。
-     */
-    save(): void;
-    /**
-     * 恢复之前保存的绘图上下文。
-     */
-    restore(): void;
-    /**
-     * 在给定的矩形区域内，清除画布上的像素
-     * 清除画布上在该矩形区域内的内容。
-     *
-     * @param x 矩形区域左上角的x坐标
-     * @param y 矩形区域左上角的y坐标
-     * @param width 矩形区域的宽度
-     * @param height 矩形区域的高度
-     */
-    clearRect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 在画布上绘制被填充的文本
-     *
-     * @param text 在画布上输出的文本
-     * @param x 绘制文本的左上角x坐标位置
-     * @param y 绘制文本的左上角y坐标位置
-     */
-    fillText(text: string, x: number, y: number): void;
-    /**
-     * 用于设置文字的对齐
-     */
-    setTextAlign(align: 'left' | 'center' | 'right'): void;
-    /**
-     * 绘制图像，图像保持原始尺寸。
-     * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
-     * @param dx            源图像的矩形选择框的左上角 X 坐标
-     * @param dy            源图像的矩形选择框的左上角 Y 坐标
-     */
-    drawImage(imageResource: string, dx: number, dy: number): void;
-    /**
-     * 绘制图像，图像保持原始尺寸。
-     * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
-     * @param dx            源图像的矩形选择框的左上角 X 坐标
-     * @param dy            源图像的矩形选择框的左上角 Y 坐标
-     * @param dWidth        源图像的矩形选择框的高度
-     * @param dHeight       源图像的矩形选择框的高度
-     */
-    drawImage(imageResource: string, dx: number, dy: number, dWidth: number, dHeight: number): void;
-    /**
-     * 绘制图像，图像保持原始尺寸。
-     * @param imageResource 所要绘制的图片资源, 通过chooseImage得到一个文件路径或者一个项目目录内的图片
-     * @param sx            图像的左上角在目标canvas上 X 轴的位置
-     * @param sy            图像的左上角在目标canvas上 Y 轴的位置
-     * @param sWidth        在目标画布上绘制图像的宽度，允许对绘制的图像进行缩放
-     * @param sHeight       在目标画布上绘制图像的高度，允许对绘制的图像进行缩放
-     * @param dx            源图像的矩形选择框的左上角 X 坐标
-     * @param dy            源图像的矩形选择框的左上角 Y 坐标
-     * @param dWidth        源图像的矩形选择框的高度
-     * @param dHeight       源图像的矩形选择框的高度
+     * 返回一个数组，用来描述 canvas 区域隐含的像素数据
      * @version 1.9.0
      */
-    drawImage(imageResource: string, sx: number, sy: number, sWidth: number, sHeight: number, dx: number, dy: number, dWidth: number, dHeight: number): void;
+    function canvasGetImageData(options: CanvasImageDataOptions): void;
     /**
-     * 设置全局画笔透明度。
-     * @param alpha 0~1  透明度，0 表示完全透明，1 表示完全不透明
+     * 将像素数据绘制到画布的方法
+     * @version 1.9.0
      */
-    setGlobalAlpha(alpha: number): void;
+    function canvasPutImageData(options: CanvasImageDataOptions): void;
+    // 页面-----下拉刷新
     /**
-     * 对当前路径进行填充
-     */
-    fill(): void;
-    /**
-     * 对当前路径进行描边
-     */
-    stroke(): void;
-    /**
-     * 开始创建一个路径，需要调用fill或者stroke才会使用路径进行填充或描边。
-     * Tip: 在最开始的时候相当于调用了一次 beginPath()。
-     * Tip: 同一个路径内的多次setFillStyle、setStrokeStyle、setLineWidth等设置，
-     * 以最后一次设置为准。
-     */
-    beginPath(): void;
-    /**
-     * 关闭一个路径
-     * Tip: 关闭路径会连接起点和终点。
-     * Tip: 如果关闭路径后没有调用 fill() 或者 stroke() 并开启了新的路径，那之前的路径将不会被渲染。
-     */
-    closePath(): void;
-    /**
-     * 把路径移动到画布中的指定点，但不创建线条。
-     *
-     * @param x 目标位置的x坐标
-     * @param y 目标位置的y坐标
-     */
-    moveTo(x: number, y: number): void;
-    /**
-     * 在当前位置添加一个新点，然后在画布中创建从该点到最后指定点的路径。
-     *
-     * @param x 目标位置的x坐标
-     * @param y 目标位置的y坐标
-     */
-    lineTo(x: number, y: number): void;
-    /**
-     * 添加一个矩形路径到当前路径。
-     *
-     * @param x 矩形路径左上角的x坐标
-     * @param y 矩形路径左上角的y坐标
-     * @param width 矩形路径的宽度
-     * @param height 矩形路径的高度
-     */
-    rect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 填充一个矩形。
-     * Tip: 用 setFillStyle() 设置矩形的填充色，如果没设置默认是黑色。
-     * @param x 矩形路径左上角的x坐标
-     * @param y 矩形路径左上角的y坐标
-     * @param width 矩形路径的宽度
-     * @param height 矩形路径的高度
-     *
-     */
-    fillRect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 画一个矩形(非填充)。
-     * Tip: 用 setFillStroke() 设置矩形线条的颜色，如果没设置默认是黑色。
-     * @param x 矩形路径左上角的x坐标
-     * @param y 矩形路径左上角的y坐标
-     * @param width 矩形路径的宽度
-     * @param height 矩形路径的高度
-     *
-     */
-    strokeRect(x: number, y: number, width: number, height: number): void;
-    /**
-     * 添加一个弧形路径到当前路径，顺时针绘制。
-     *
-     * @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 cpx 贝塞尔控制点的x坐标
-     * @param cpy 贝塞尔控制点的y坐标
-     * @param x 结束点的x坐标
-     * @param y 结束点的y坐标
-     */
-    quadraticCurveTo(cpx: number, cpy: number, x: number, y: number): void;
-    /**
-     * 创建三次方贝塞尔曲线
-     *
-     * @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 color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
-     */
-    setFillStyle(color: string): void;
-    /**
-     * 设置线条样式
-     *
-     * @param color 设置为填充样式的颜色。'rgb(255, 0, 0)'或'rgba(255, 0, 0, 0.6)'或'#ff0000'格式的颜色字符串
-     */
-    setStrokeStyle(color: string): void;
-    /**
-     * 设置阴影
-     *
-     * @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 x0 起点的x坐标
-     * @param y0 起点的y坐标
-     * @param x1 终点的x坐标
-     * @param y1 终点的y坐标
-     */
-    createLinearGradient(x0: number, y0: number, x1: number, y1: number): void;
-    /**
-     * 创建一个颜色的渐变点。
-     * Tip: 小于最小 stop 的部分会按最小 stop 的 color 来渲染，大于最大 stop 的部分会按最大 stop 的 color 来渲染。
-     * Tip: 需要使用 addColorStop() 来指定渐变点，至少要两个。
-     * @param stop (0-1)  表示渐变点在起点和终点中的位置
-     * @param color 渐变点的颜色
-     *
-     */
-    addColorStop(stop: number, color: string): void;
-    /**
-     * 创建一个圆形的渐变颜色。
-     *
-     * @param x 圆心的x坐标
-     * @param y 圆心的y坐标
-     * @param r 圆的半径
-     *
-     */
-    createCircularGradient(x: number, y: number, r: number): void;
-    /**
-     * 设置字体大小
-     *
-     * @param fontSize 字体的字号
-     */
-    setFontSize(fontSize: number): void;
-    /**
-     * 设置线条端点的样式
-     *
-     * @param lineCap 线条的结束端点样式。 'butt'、'round'、'square'
-     */
-    setLineCap(lineCap: LineCapType): void;
-    /**
-     * 设置两线相交处的样式
-     *  @param lineJoin 两条线相交时，所创建的拐角类型
-     */
-    setLineJoin(lineJoin: LineJoinType): void;
-    /**
-     * 设置线条宽度
-     *
-     * @param lineWidth 线条的宽度
-     */
-    setLineWidth(lineWidth: number): void;
-    /**
-     * 设置最大斜接长度，斜接长度指的是在两条线交汇处内角和外角之间的距离。
-     * 当 setLineJoin为 miter 时才有效。
-     * 超过最大倾斜长度的，连接处将以 lineJoin 为 bevel 来显示
-     *
-     * @param miterLimit 最大斜接长度
-     */
-    setMiterLimit(miterLimit: number): void;
-    /**
-     * 将之前在绘图上下文中的描述（路径、变形、样式）画到 canvas 中。
-     * Tip: 绘图上下文需要由 wx.createCanvasContext(canvasId) 来创建。
-     * @param [reserve] 非必填。本次绘制是否接着上一次绘制，即reserve参数为false，则在本次调用drawCanvas绘制之前native层应先清空画布再继续绘制；若reserver参数为true，则保留当前画布上的内容，本次调用drawCanvas绘制的内容覆盖在上面，默认 false
-     *
-     */
-    draw(reserve?: boolean): void;
-  }
-  /**
-   * 创建并返回绘图上下文context对象。
-   * context只是一个记录方法调用的容器，
-   * 用于生成记录绘制行为的actions数组。c
-   * ontext跟<canvas/>不存在对应关系，
-   * 一个context生成画布的绘制动作数组可以应用于多个<canvas/>。
-   */
-  function createContext(): CanvasContext;
-  interface DrawCanvasOptions {
-    /** 画布标识，传入 <canvas/> 的 cavas-id */
-    canvasId: number | string;
-    /**
-     * 绘图动作数组，由 wx.createContext 创建的 context，
-     * 调用 getActions 方法导出绘图动作数组。
-     */
-    actions: CanvasAction[];
-  }
-  /**
-   * 绘制画布
-   */
-  function drawCanvas(options: DrawCanvasOptions): void;
-  interface CanvasToTempFilePathOptions extends BaseOptions {
-    /**
-     * 画布标识，传入 <canvas/> 的 cavas-id
-     */
-    canvasId: string;
-  }
-  /**
-   * 把当前画布的内容导出生成图片，并返回文件路径
-   */
-  function canvasToTempFilePath(options: CanvasToTempFilePathOptions): void;
-  interface CanvasImageDataOptions extends BaseOptions {
-    /** 画布标识，传入 <canvas /> 的 canvas-id  */
-    canvasId: string;
-    /** 将要被提取的图像数据矩形区域的左上角 x 坐标 */
-    x: number;
-    /** 将要被提取的图像数据矩形区域的左上角 y 坐标 */
-    y: number;
-    /** 将要被提取的图像数据矩形区域的宽度 */
-    width: number;
-    /** 将要被提取的图像数据矩形区域的高度 */
-    height: number;
-  }
-  /**
-   * 返回一个数组，用来描述 canvas 区域隐含的像素数据
-   * @version 1.9.0
-   */
-  function canvasGetImageData(options: CanvasImageDataOptions): void;
-  /**
-   * 将像素数据绘制到画布的方法
-   * @version 1.9.0
-   */
-  function canvasPutImageData(options: CanvasImageDataOptions): void;
-  // 页面-----下拉刷新
-  /**
-   * 开始下拉刷新，调用后触发下拉刷新动画，效果与用户手动下拉刷新一致
-   * @version 1.5.0
-   */
-  function startPullDownRefresh(options?: BaseOptions): void;
-  /**
-   * 停止当前页面下拉刷新
-   * @version 1.5.0
-   */
-  function stopPullDownRefresh(options?: BaseOptions): void;
-  // #endregion
-  // #region 第三方平台
-  interface ExtConfig {
-    /** 第三方平台自定义的数据 */
-    extConfig: any;
-  }
-  interface GetExtConfigOptions extends BaseOptions {
-    success(res: {
-      /* 调用结果 */
-      errMsg: string;
-    } & ExtConfig): void;
-  }
-  /**
-   * 获取第三方平台自定义的数据字段。
-   * @version 1.1.0
-   */
-  function getExtConfig(options?: GetExtConfigOptions): void;
-  /**
-   * 获取第三方平台自定义的数据字段的同步接口。
-   * @version 1.1.0
-   */
-  function getExtConfigSync(): ExtConfig;
-  // #endregion
-  // #region 开放接口
-  // 开放接口-----签名加密
-  // [签名加密](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html)
-  /**
-   * 登录态维护
-   * 通过 wx.login() 获取到用户登录态之后，需要维护登录态。
-   * 开发者要注意不应该直接把 session_key、openid 等字段作为用户的标识
-   * 或者 session 的标识，而应该自己派发一个 session 登录态（请参考登录时序图）。
-   * 对于开发者自己生成的 session，应该保证其安全性且不应该设置较长的过期时间。
-   * session 派发到小程序客户端之后，可将其存储在 storage ，用于后续通信使用。
-   * 通过wx.checkSession() 检测用户登录态是否失效。并决定是否调用wx.login()
-   * 重新获取登录态
-   */
-  interface LoginResponse {
-    /** 调用结果 */
-    errMsg: string;
-    /**
-     * 用户允许登录后，回调内容会带上 code（有效期五分钟），
-     * 开发者需要将 code 发送到开发者服务器后台，
-     * 使用code 换取 session_key api，
-     * 将 code 换成 openid 和 session_key
-     */
-    code: string;
-  }
-  interface LoginOptions extends BaseOptions {
-    /** 接口调用成功的回调函数 */
-    success?(res: LoginResponse): void;
-  }
-  /**
-   * 调用接口获取登录凭证（code）进而换取用户登录态信息，
-   * 包括用户的唯一标识（openid） 及本次登录的 会话密钥（session_key）。
-   * 用户数据的加解密通讯需要依赖会话密钥完成。
-   */
-  function login(option: LoginOptions): void;
-  type CheckSessionOption = BaseOptions;
-  /**
-   * 检测当前用户登录态是否有效。
-   * 通过wx.login获得的用户登录态拥有一定的时效性。用户越久未使用小程序，用户登录态越有可能失效。反之如果用户一直在使用小程序，则用户登录态一直保持有效。具体时效逻辑由微信维护，对开发者透明。开发者只需要调用wx.checkSession接口检测当前用户登录态是否有效。登录态过期后开发者可以再调用wx.login获取新的用户登录态。
-   *
-   */
-  function checkSession(options: CheckSessionOption): void;
-  /**
-   * 提前向用户发起授权请求。
-   * 调用后会立刻弹窗询问用户是否同意授权小程序使用某项功能或获取用户的某些数据，
-   * 但不会实际调用对应接口。如果用户之前已经同意授权，则不会出现弹窗，直接返回成功。
-   */
-  function authorize(options: AuthSetting): void;
-  // 开放接口-----用户信息
-  interface UserInfo {
-    nickName: string;
-    avatarUrl: string;
-    gender: number;
-    province: string;
-    city: string;
-    country: string;
-  }
-  interface UserInfoResponse {
-    /** 用户信息对象，不包含 openid 等敏感信息 */
-    userInfo: UserInfo;
-    /** 不包括敏感信息的原始数据字符串，用于计算签名。 */
-    rawData: string;
-    /** 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息。 */
-    signature: string;
-    /** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
-    encryptData: string;
-  }
-  interface GetUserInfoOptions extends BaseOptions {
-    /** 接口调用成功的回调函数 */
-    success?(res: UserInfoResponse): void;
-  }
-  /**
-   * 获取用户信息，需要先调用 wx.login 接口。
-   */
-  function getUserInfo(options: GetUserInfoOptions): void;
-  // 开放接口-----微信支付
-  type PaymentSignType = 'MD5';
-  interface RequestPaymentOptions extends BaseOptions {
-    /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
-    timeStamp: string | number;
-    /** 随机字符串，长度为32个字符以下。 */
-    nonceStr: string;
-    /** 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=* */
-    package: string;
-    /** 签名算法，暂支持 MD5 */
-    signType: PaymentSignType;
-    /** 签名,具体签名方案参见微信公众号支付帮助文档; */
-    paySign: string;
-  }
-  /**
-   * 发起微信支付。
-   */
-  function requestPayment(options: RequestPaymentOptions): void;
-  // 开放接口-----分享
-  interface ShareAppMessage extends BaseOptions {
-    /**
-     * 分享标题  默认为当前小程序名称
-     *
-     */
-    title?: string;
-    /**
-     * 分享描述, 默认为当前小程序名称
-     */
-    desc?: string;
-    /**
-     * 自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG
-     * 不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+     * 开始下拉刷新，调用后触发下拉刷新动画，效果与用户手动下拉刷新一致
      * @version 1.5.0
      */
-    imageUrl?: string;
+    function startPullDownRefresh(options?: BaseOptions): void;
     /**
-     * 分享路径  当默认为前页面 path ，
-     * 必须是以 / 开头的完整路径
+     * 停止当前页面下拉刷新
+     * @version 1.5.0
+     */
+    function stopPullDownRefresh(options?: BaseOptions): void;
+    // #endregion
+    // #region 第三方平台
+    interface ExtConfig {
+        /** 第三方平台自定义的数据 */
+        extConfig: any;
+    }
+    interface GetExtConfigOptions extends BaseOptions {
+        success(
+            res: {
+                /* 调用结果 */
+                errMsg: string;
+            } & ExtConfig
+        ): void;
+    }
+    /**
+     * 获取第三方平台自定义的数据字段。
+     * @version 1.1.0
+     */
+    function getExtConfig(options?: GetExtConfigOptions): void;
+    /**
+     * 获取第三方平台自定义的数据字段的同步接口。
+     * @version 1.1.0
+     */
+    function getExtConfigSync(): ExtConfig;
+    // #endregion
+    // #region 开放接口
+    // 开放接口-----签名加密
+    // [签名加密](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html)
+    /**
+     * 登录态维护
+     * 通过 wx.login() 获取到用户登录态之后，需要维护登录态。
+     * 开发者要注意不应该直接把 session_key、openid 等字段作为用户的标识
+     * 或者 session 的标识，而应该自己派发一个 session 登录态（请参考登录时序图）。
+     * 对于开发者自己生成的 session，应该保证其安全性且不应该设置较长的过期时间。
+     * session 派发到小程序客户端之后，可将其存储在 storage ，用于后续通信使用。
+     * 通过wx.checkSession() 检测用户登录态是否失效。并决定是否调用wx.login()
+     * 重新获取登录态
+     */
+    interface LoginResponse {
+        /** 调用结果 */
+        errMsg: string;
+        /**
+         * 用户允许登录后，回调内容会带上 code（有效期五分钟），
+         * 开发者需要将 code 发送到开发者服务器后台，
+         * 使用code 换取 session_key api，
+         * 将 code 换成 openid 和 session_key
+         */
+        code: string;
+    }
+    interface LoginOptions extends BaseOptions {
+        /** 接口调用成功的回调函数 */
+        success?(res: LoginResponse): void;
+    }
+    /**
+     * 调用接口获取登录凭证（code）进而换取用户登录态信息，
+     * 包括用户的唯一标识（openid） 及本次登录的 会话密钥（session_key）。
+     * 用户数据的加解密通讯需要依赖会话密钥完成。
+     */
+    function login(option: LoginOptions): void;
+    type CheckSessionOption = BaseOptions;
+    /**
+     * 检测当前用户登录态是否有效。
+     * 通过wx.login获得的用户登录态拥有一定的时效性。用户越久未使用小程序，用户登录态越有可能失效。反之如果用户一直在使用小程序，则用户登录态一直保持有效。具体时效逻辑由微信维护，对开发者透明。开发者只需要调用wx.checkSession接口检测当前用户登录态是否有效。登录态过期后开发者可以再调用wx.login获取新的用户登录态。
      *
      */
-    path?: string;
-    success?(res: {
-      /** 每一项是一个 shareTicket ，对应一个转发对象 */
-      shareTickets: string[];
-    }): void;
-  }
-  type ShareMenuOptions = BaseOptions;
-  /**
-   * 显示分享按钮
-   * @version 1.1.0
-   */
-  function showShareMenu(options?: ShareMenuOptions): void;
-  /**
-   * 隐藏分享按钮
-   * @version 1.1.0
-   */
-  function hideShareMenu(options?: ShareMenuOptions): void;
-  interface UpdateShareMenuOptions extends BaseOptions {
-    /** 是否使用带 shareTicket 的转发详情 */
-    withShareTicket?: boolean;
-  }
-  /**
-   * 更新转发属性
-   * @version 1.2.0
-   */
-  function updateShareMenu(options?: UpdateShareMenuOptions): void;
-  interface GetShareInfoOptions extends BaseOptions {
-    /** shareTicket */
-    shareTicket: string;
-    success(res: {
-      /** 错误信息 */
-      errMsg: string;
-      /** 包括敏感数据在内的完整转发信息的加密数据，详细见[加密数据解密算法](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html#%E5%8A%A0%E5%AF%86%E6%95%B0%E6%8D%AE%E8%A7%A3%E5%AF%86%E7%AE%97%E6%B3%95) */
-      encryptedData: string;
-      /** 加密算法的初始向量，详细见[加密数据解密算法](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html#%E5%8A%A0%E5%AF%86%E6%95%B0%E6%8D%AE%E8%A7%A3%E5%AF%86%E7%AE%97%E6%B3%95) */
-      iv: string;
-    }): void;
-  }
-  /**
-   * 获取转发详细信息
-   * @version 1.1.0
-   */
-  function getShareInfo(options?: GetShareInfoOptions): void;
-  // 开放接口-----收货地址
-  interface ChooseAddressOptions extends BaseOptions {
-    success?(res: {
-      /**
-       * 调用结果
-       *
-       */
-      errMsg: string;
-      /**
-       * 收货人姓名
-       *
-       */
-      userName: string;
-      /**
-       * 邮编
-       *
-       */
-      postalCode: string;
-      /**
-       * 国标收货地址第一级地址
-       *
-       */
-      provinceName: string;
-      /**
-       * 国标收货地址第二级地址
-       *
-       */
-      cityName: string;
-      /**
-       * 国标收货地址第三级地址
-       *
-       */
-      countyName: string;
-      /**
-       * 详细收货地址信息
-       *
-       */
-      detailInfo: string;
-      /**
-       * 收货地址国家码
-       *
-       */
-      nationalCode: string;
-      /**
-       * 收货人手机号码
-       *
-       */
-      telNumber: string;
-    }): void;
-  }
-  function chooseAddress(options: ChooseAddressOptions): void;
-  // 开放接口-----卡券
-  interface Card {
-    cardId: string;
-    cardExt: string;
-    code: string;
-  }
-  interface CardOptions extends BaseOptions {
-    cardList: Card[];
-  }
-  /**
-   * 批量添加卡券。
-   *
-   */
-  function addCard(options: ChooseAddressOptions): void;
-  interface OpenCardOptions extends BaseOptions {
-    cardList: Card[];
-  }
-  /**
-   * 查看微信卡包中的卡券。
-   *
-   */
-  function openCard(options: OpenCardOptions): void;
-  // 开放接口-----设置
-  interface AuthSetting {
-    'scope.userInfo': boolean;
-    'scope.userLocation': boolean;
-    'scope.address': boolean;
-    'scope.record': boolean;
-  }
-  interface OpenSettingOptions extends BaseOptions {
-    success?(res: {
-      authSetting: AuthSetting
-    }): void;
-  }
-  /**
-   * 调起客户端小程序设置界面，返回用户设置的操作结果。
-   * 注：设置界面只会出现小程序已经向用户请求过的权限。
-   * @version 1.1.0
-   */
-  function openSetting(options: OpenSettingOptions): void;
-  /**
-   * 获取用户的当前设置。
-   * 注：返回值中只会出现小程序已经向用户请求过的权限。
-   * @version 1.2.0
-   */
-  function getSetting(options: OpenSettingOptions): void;
-  // #endregion
-  // #region 微信运动
-  interface StepInfo {
-    /** 时间戳，表示数据对应的时间 */
-    timestamp: number;
-    /** 微信运动步数 */
-    step: number;
-  }
-  /** 用户过去三十天的微信运动步数 */
-  interface StepInfoList {
-    stepInfoList: StepInfo[];
-  }
-  interface WeRunDataOptions extends BaseOptions {
-    success(res: {
-      /** 调用结果 */
-      errMsg: string;
-      /** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
-      encryptedData: string | StepInfoList;
-      /** 加密算法的初始向量，详细见加密数据解密算法 */
-      iv: string;
-    }): void;
-  }
-  /**
-   * 获取用户过去三十天微信运动步数
-   * 需要先调用 wx.login 接口。
-   * 需要用户授权 scope.werun
-   */
-  function getWeRunData(options?: WeRunDataOptions): void;
-  // #endregion
-  // #region 拓展接口
-  /**
-   * 将 ArrayBuffer 数据转成 Base64 字符串
-   *
-   */
-  function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
-  /**
-   * 将 Base64 字符串转成 ArrayBuffer 数据
-   *
-   */
-  function base64ToArrayBuffer(base64: string): ArrayBuffer;
-  /**
-   * 收起键盘。
-   */
-  function hideKeyboard(): void;
-  interface EventTarget {
-    id: string;
-    tagName: string;
-    dataset: { [name: string]: string; };
-  }
-  interface BaseEvent {
-    type: 'tap' | 'touchstart' | 'touchmove' | 'touchcancel' | 'touchend' | 'tap' | 'longtap';
-    timeStamp: number;
-    currentTarget: EventTarget;
-    target: EventTarget;
-  }
-  interface InputEvent extends BaseEvent {
-    detail: {
-      target: EventTarget;
-      value: string;
-      /**
-       * 指定focus时的光标位置
-       * @version 1.5.0
-       */
-      cursor: number;
-    };
-  }
-  interface FormEvent extends BaseEvent {
-    detail: {
-      target: EventTarget;
-      value: { [name: string]: string | boolean | number; };
-    };
-  }
-  interface Touch {
-    identifier: number;
-    pageX: number;
-    pageY: number;
-    clientX: number;
-    clientY: number;
-  }
-  interface TouchEvent extends BaseEvent {
-    detail: {
-      x: number;
-      y: number;
-    };
-    touches: Touch[];
-    changedTouches: Touch[];
-  }
-  // #endregion
+    function checkSession(options: CheckSessionOption): void;
+    /**
+     * 提前向用户发起授权请求。
+     * 调用后会立刻弹窗询问用户是否同意授权小程序使用某项功能或获取用户的某些数据，
+     * 但不会实际调用对应接口。如果用户之前已经同意授权，则不会出现弹窗，直接返回成功。
+     */
+    function authorize(options: AuthSetting): void;
+    // 开放接口-----用户信息
+    interface UserInfo {
+        nickName: string;
+        avatarUrl: string;
+        gender: number;
+        province: string;
+        city: string;
+        country: string;
+    }
+    interface UserInfoResponse {
+        /** 用户信息对象，不包含 openid 等敏感信息 */
+        userInfo: UserInfo;
+        /** 不包括敏感信息的原始数据字符串，用于计算签名。 */
+        rawData: string;
+        /** 使用 sha1( rawData + sessionkey ) 得到字符串，用于校验用户信息。 */
+        signature: string;
+        /** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
+        encryptData: string;
+    }
+    interface GetUserInfoOptions extends BaseOptions {
+        /** 接口调用成功的回调函数 */
+        success?(res: UserInfoResponse): void;
+    }
+    /**
+     * 获取用户信息，需要先调用 wx.login 接口。
+     */
+    function getUserInfo(options: GetUserInfoOptions): void;
+    // 开放接口-----微信支付
+    type PaymentSignType = "MD5";
+    interface RequestPaymentOptions extends BaseOptions {
+        /** 时间戳从1970年1月1日00:00:00至今的秒数,即当前的时间 */
+        timeStamp: string | number;
+        /** 随机字符串，长度为32个字符以下。 */
+        nonceStr: string;
+        /** 统一下单接口返回的 prepay_id 参数值，提交格式如：prepay_id=* */
+        package: string;
+        /** 签名算法，暂支持 MD5 */
+        signType: PaymentSignType;
+        /** 签名,具体签名方案参见微信公众号支付帮助文档; */
+        paySign: string;
+    }
+    /**
+     * 发起微信支付。
+     */
+    function requestPayment(options: RequestPaymentOptions): void;
+    // 开放接口-----分享
+    interface ShareAppMessage extends BaseOptions {
+        /**
+         * 分享标题  默认为当前小程序名称
+         *
+         */
+        title?: string;
+        /**
+         * 分享描述, 默认为当前小程序名称
+         */
+        desc?: string;
+        /**
+         * 自定义图片路径，可以是本地文件路径、代码包文件路径或者网络图片路径，支持PNG及JPG
+         * 不传入 imageUrl 则使用默认截图。显示图片长宽比是 5:4
+         * @version 1.5.0
+         */
+        imageUrl?: string;
+        /**
+         * 分享路径  当默认为前页面 path ，
+         * 必须是以 / 开头的完整路径
+         *
+         */
+        path?: string;
+        success?(res: {
+            /** 每一项是一个 shareTicket ，对应一个转发对象 */
+            shareTickets: string[];
+        }): void;
+    }
+    type ShareMenuOptions = BaseOptions;
+    /**
+     * 显示分享按钮
+     * @version 1.1.0
+     */
+    function showShareMenu(options?: ShareMenuOptions): void;
+    /**
+     * 隐藏分享按钮
+     * @version 1.1.0
+     */
+    function hideShareMenu(options?: ShareMenuOptions): void;
+    interface UpdateShareMenuOptions extends BaseOptions {
+        /** 是否使用带 shareTicket 的转发详情 */
+        withShareTicket?: boolean;
+    }
+    /**
+     * 更新转发属性
+     * @version 1.2.0
+     */
+    function updateShareMenu(options?: UpdateShareMenuOptions): void;
+    interface GetShareInfoOptions extends BaseOptions {
+        /** shareTicket */
+        shareTicket: string;
+        success(res: {
+            /** 错误信息 */
+            errMsg: string;
+            /** 包括敏感数据在内的完整转发信息的加密数据，详细见[加密数据解密算法](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html#%E5%8A%A0%E5%AF%86%E6%95%B0%E6%8D%AE%E8%A7%A3%E5%AF%86%E7%AE%97%E6%B3%95) */
+            encryptedData: string;
+            /** 加密算法的初始向量，详细见[加密数据解密算法](https://mp.weixin.qq.com/debug/wxadoc/dev/api/signature.html#%E5%8A%A0%E5%AF%86%E6%95%B0%E6%8D%AE%E8%A7%A3%E5%AF%86%E7%AE%97%E6%B3%95) */
+            iv: string;
+        }): void;
+    }
+    /**
+     * 获取转发详细信息
+     * @version 1.1.0
+     */
+    function getShareInfo(options?: GetShareInfoOptions): void;
+    // 开放接口-----收货地址
+    interface ChooseAddressOptions extends BaseOptions {
+        success?(res: {
+            /**
+             * 调用结果
+             *
+             */
+            errMsg: string;
+            /**
+             * 收货人姓名
+             *
+             */
+            userName: string;
+            /**
+             * 邮编
+             *
+             */
+            postalCode: string;
+            /**
+             * 国标收货地址第一级地址
+             *
+             */
+            provinceName: string;
+            /**
+             * 国标收货地址第二级地址
+             *
+             */
+            cityName: string;
+            /**
+             * 国标收货地址第三级地址
+             *
+             */
+            countyName: string;
+            /**
+             * 详细收货地址信息
+             *
+             */
+            detailInfo: string;
+            /**
+             * 收货地址国家码
+             *
+             */
+            nationalCode: string;
+            /**
+             * 收货人手机号码
+             *
+             */
+            telNumber: string;
+        }): void;
+    }
+    function chooseAddress(options: ChooseAddressOptions): void;
+    // 开放接口-----卡券
+    interface Card {
+        cardId: string;
+        cardExt: string;
+        code: string;
+    }
+    interface CardOptions extends BaseOptions {
+        cardList: Card[];
+    }
+    /**
+     * 批量添加卡券。
+     *
+     */
+    function addCard(options: ChooseAddressOptions): void;
+    interface OpenCardOptions extends BaseOptions {
+        cardList: Card[];
+    }
+    /**
+     * 查看微信卡包中的卡券。
+     *
+     */
+    function openCard(options: OpenCardOptions): void;
+    // 开放接口-----设置
+    interface AuthSetting {
+        "scope.userInfo": boolean;
+        "scope.userLocation": boolean;
+        "scope.address": boolean;
+        "scope.record": boolean;
+    }
+    interface OpenSettingOptions extends BaseOptions {
+        success?(res: { authSetting: AuthSetting }): void;
+    }
+    /**
+     * 调起客户端小程序设置界面，返回用户设置的操作结果。
+     * 注：设置界面只会出现小程序已经向用户请求过的权限。
+     * @version 1.1.0
+     */
+    function openSetting(options: OpenSettingOptions): void;
+    /**
+     * 获取用户的当前设置。
+     * 注：返回值中只会出现小程序已经向用户请求过的权限。
+     * @version 1.2.0
+     */
+    function getSetting(options: OpenSettingOptions): void;
+    // #endregion
+    // #region 微信运动
+    interface StepInfo {
+        /** 时间戳，表示数据对应的时间 */
+        timestamp: number;
+        /** 微信运动步数 */
+        step: number;
+    }
+    /** 用户过去三十天的微信运动步数 */
+    interface StepInfoList {
+        stepInfoList: StepInfo[];
+    }
+    interface WeRunDataOptions extends BaseOptions {
+        success(res: {
+            /** 调用结果 */
+            errMsg: string;
+            /** 包括敏感数据在内的完整用户信息的加密数据，详细见加密数据解密算法 */
+            encryptedData: string | StepInfoList;
+            /** 加密算法的初始向量，详细见加密数据解密算法 */
+            iv: string;
+        }): void;
+    }
+    /**
+     * 获取用户过去三十天微信运动步数
+     * 需要先调用 wx.login 接口。
+     * 需要用户授权 scope.werun
+     */
+    function getWeRunData(options?: WeRunDataOptions): void;
+    // #endregion
+    // #region 拓展接口
+    /**
+     * 将 ArrayBuffer 数据转成 Base64 字符串
+     *
+     */
+    function arrayBufferToBase64(arrayBuffer: ArrayBuffer): string;
+    /**
+     * 将 Base64 字符串转成 ArrayBuffer 数据
+     *
+     */
+    function base64ToArrayBuffer(base64: string): ArrayBuffer;
+    /**
+     * 收起键盘。
+     */
+    function hideKeyboard(): void;
+
+    interface EventTarget {
+        id: string;
+        tagName: string;
+        dataset: { [name: string]: string };
+    }
+
+    type TouchEventType =
+        | "tap"
+        | "touchstart"
+        | "touchmove"
+        | "touchcancel"
+        | "touchend"
+        | "touchforcechange";
+
+    type TransitionEventType =
+        | "transitionend"
+        | "animationstart"
+        | "animationiteration"
+        | "animationend";
+
+    type EventType =
+        | "input"
+        | "form"
+        | "submit"
+        | "scroll"
+        | TouchEventType
+        | TransitionEventType
+        | "tap"
+        | "longpress";
+
+    interface BaseEvent<T extends string, Detail> {
+        type: T;
+        timeStamp: number;
+        currentTarget: EventTarget;
+        target: EventTarget;
+        detail: Detail;
+    }
+
+    interface BuiltInEvent<T extends EventType, Detail>
+        extends BaseEvent<T, Detail> {}
+
+    interface CustomEvent<T extends string, Detail>
+        extends BaseEvent<T, Detail> {}
+
+    /**
+     * 指定focus时的光标位置
+     * @version 1.5.0
+     */
+    interface InputEvent
+        extends BuiltInEvent<
+                "input",
+                {
+                    value: string;
+                    cursor: number;
+                }
+            > {}
+
+    interface FormEvent
+        extends BuiltInEvent<
+                "form",
+                {
+                    value: { [name: string]: string | boolean | number };
+                }
+            > {}
+
+    interface ScrollEvent extends BuiltInEvent<"scroll", {}> {}
+
+    interface Touch {
+        identifier: number;
+        pageX: number;
+        pageY: number;
+        clientX: number;
+        clientY: number;
+    }
+
+    interface TouchEvent<T extends TouchEventType>
+        extends BuiltInEvent<
+                T,
+                {
+                    x: number;
+                    y: number;
+                }
+            > {
+        touches: Touch[];
+        changedTouches: Touch[];
+    }
+
+    interface TapEvent extends TouchEvent<"tap"> {
+        // 手指触摸后马上离开
+    }
+
+    interface TouchStartEvent extends TouchEvent<"touchstart"> {
+        // 手指触摸动作开始
+    }
+
+    interface TouchEndEvent extends TouchEvent<"touchend"> {
+        // 手指触摸动作结束
+    }
+
+    interface TouchMoveEvent extends TouchEvent<"touchmove"> {
+        // 手指触摸后移动
+    }
+
+    interface TouchCancelEvent extends TouchEvent<"touchcancel"> {
+        // 手指触摸动作被打断，如来电提醒，弹窗
+    }
+
+    interface TouchForceChangeEvent extends TouchEvent<"touchforcechange"> {
+        // 在支持 3D Touch 的 iPhone 设备，重按时会触发
+    }
+    // #endregion
 }
 // #region App里的onLaunch、onShow回调参数
 interface LaunchOptions {
-  /**
-   * 打开小程序的路径
-   */
-  path: string;
-  /**
-   * 打开小程序的query
-   */
-  query: object;
-  /**
-   * 打开小程序的[场景值](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/app-service/scene.html)
-   */
-  scene: number;
-  /**
-   * shareTicket，详见 获取更多[转发信息](https://mp.weixin.qq.com/debug/wxadoc/dev/api/share.html#获取更多转发信息)
-   */
-  shareTicket: string;
-  /**
-   * 当场景为由从另一个小程序或公众号或App打开时，返回此字段
-   */
-  referrerInfo: object;
-  /**
-   * 来源小程序或公众号或App的 appId，详见下方说明
-   */
-  "referrerInfo.appId": string;
-  /**
-   * 来源小程序传过来的数据，scene=1037或1038时支持
-   */
-  "referrerInfo.extraData": object;
+    /**
+     * 打开小程序的路径
+     */
+    path: string;
+    /**
+     * 打开小程序的query
+     */
+    query: object;
+    /**
+     * 打开小程序的[场景值](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/app-service/scene.html)
+     */
+    scene: number;
+    /**
+     * shareTicket，详见 获取更多[转发信息](https://mp.weixin.qq.com/debug/wxadoc/dev/api/share.html#获取更多转发信息)
+     */
+    shareTicket: string;
+    /**
+     * 当场景为由从另一个小程序或公众号或App打开时，返回此字段
+     */
+    referrerInfo: object;
+    /**
+     * 来源小程序或公众号或App的 appId，详见下方说明
+     */
+    "referrerInfo.appId": string;
+    /**
+     * 来源小程序传过来的数据，scene=1037或1038时支持
+     */
+    "referrerInfo.extraData": object;
 }
 // #endregion
 // #region App 函数及参数
@@ -3038,44 +3268,44 @@ interface LaunchOptions {
  * 开发者可以添加任意的函数或数据到 Object 参数中，用 this 可以访问
  */
 interface AppOptions {
-  /**
-   * 监听小程序初始化。
-   * 当小程序初始化完成时，会触发 onLaunch（全局只触发一次）
-   * 生命周期函数
-   */
-  onLaunch?: (option: LaunchOptions) => void;
-  /**
-   * 监听小程序显示。
-   * 当小程序启动，或从后台进入前台显示，会触发 onShow
-   * 生命周期函数
-   */
-  onShow?: (option: LaunchOptions) => void;
-  /**
-   * 监听小程序隐藏。
-   * 当小程序从前台进入后台，会触发 onHide
-   * 生命周期函数
-   */
-  onHide?: () => void;
-  /**
-   * 错误监听函数
-   * 当小程序发生脚本错误或者 api 调用失败时
-   * 会触发 onError 并带上错误信息
-   */
-  onError?: (msg: string) => void;
-  /**
-   * 小程序退出时触发
-   */
-  onUnlaunch?: () => void;
-  /**
-   * 全局Data
-   */
-  globalData?: object;
+    /**
+     * 监听小程序初始化。
+     * 当小程序初始化完成时，会触发 onLaunch（全局只触发一次）
+     * 生命周期函数
+     */
+    onLaunch?: (option: LaunchOptions) => void;
+    /**
+     * 监听小程序显示。
+     * 当小程序启动，或从后台进入前台显示，会触发 onShow
+     * 生命周期函数
+     */
+    onShow?: (option: LaunchOptions) => void;
+    /**
+     * 监听小程序隐藏。
+     * 当小程序从前台进入后台，会触发 onHide
+     * 生命周期函数
+     */
+    onHide?: () => void;
+    /**
+     * 错误监听函数
+     * 当小程序发生脚本错误或者 api 调用失败时
+     * 会触发 onError 并带上错误信息
+     */
+    onError?: (msg: string) => void;
+    /**
+     * 小程序退出时触发
+     */
+    onUnlaunch?: () => void;
+    /**
+     * 全局Data
+     */
+    globalData?: object;
 }
 interface App {
-  /**
-   * 获取当前页面
-   */
-  getCurrentPage(): Page;
+    /**
+     * 获取当前页面
+     */
+    getCurrentPage(): Page;
 }
 /**
  * App() 函数用来注册一个小程序。
@@ -3088,156 +3318,291 @@ declare function App<T extends AppOptions>(app: T & ThisType<T & App>): void;
 declare function getApp(): App;
 // #endregion
 // #region Compontent组件
-type DefaultData<V> = object | ((this: V) => object);
-type DefaultProps = Record<string, any>;
-type ExtendedComponent<Instance extends Component<Data>, Data, Methods, Options, Props> = CombinedInstance<Instance, Data, Methods, Options, Props> & Component<Data>;
-type CombinedInstance<Instance extends Component<Data>, Data, Methods, Options, Props> = Data & Methods & Options & Props & Instance;
-type Prop<T> = (() => T) | { new(...args: any[]): T & object };
-type PropValidator<T> = PropOptions<T> | Prop<T> | Array<Prop<T>>;
-interface DefaultMethods<V> {
-  [key: string]: (this: V, ...args: any[]) => any;
-}
-interface PropOptions<T = any> {
-  type?: Prop<T> | Array<Prop<T>>;
-  value?: T | null | (() => object);
-  observer?(value: T, old: T): void;
-}
-type RecordPropsDefinition<T> = {
-  [K in keyof T]: PropValidator<T[K]>
-};
-type ArrayPropsDefinition<T> = Array<keyof T>;
-type PropsDefinition<T> = ArrayPropsDefinition<T> | RecordPropsDefinition<T>;
-type ThisTypedComponentOptionsWithRecordProps<V extends Component<Data>, Data, Methods, Options, Props> =
-  object &
-  ComponentOptions<V, Data | ((this: Readonly<Props> & V) => Data), Methods, Options, PropsDefinition<Props>> &
-  ThisType<CombinedInstance<V, Data, Methods, Options, Readonly<Props>>>;
 
-interface ComponentRelation {
-  /** 目标组件的相对关系，可选的值为 parent 、 child 、 ancestor 、 descendant */
-  type: string;
-  /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
-  target?: string;
-  /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
-  linked?: (...args: any[]) => void;
-  /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
-  linkChanged?: (...args: any[]) => void;
-  /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
-  unlinked?: (...args: any[]) => void;
+type DefaultData<V> = object | ((this: V) => object);
+
+type DefaultProps = object | Record<string, any>;
+
+type ExtendedComponent<
+    Instance extends Component<Data, Props>,
+    Data,
+    Methods,
+    Props
+> = CombinedInstance<Instance, Data, Methods, Props> & Component<Data, Props>;
+
+// CombinedInstance models the `this`, i.e. instance type for (user defined) component
+type CombinedInstance<
+    Instance extends Component<Data, Props>,
+    Data,
+    Methods,
+    Props
+> = Methods & Instance;
+
+type Prop<T> = (() => T) | { new (...args: any[]): T & object };
+
+type PropValidator<T> = PropOptions<T> | Prop<T> | Array<Prop<T>>;
+
+interface DefaultMethods<V> {
+    [key: string]: (this: V, ...args: any[]) => any;
 }
+
+interface PropOptions<T = any> {
+    type?: Prop<T> | Array<Prop<T>>;
+    value?: T | null | (() => object);
+    // bug : 对于 type 为 Object 或 Array 的属性，如果通过该组件自身的 this.setData
+    // 来改变属性值的一个子字段，则依旧会触发属性 observer ，且 observer 接收到的 newVal 是变化的那个子字段的值，
+    // oldVal 为空， changedPath 包含子字段的字段名相关信息。
+    observer?(value: T, old: T, changedPath: string): void;
+}
+
+type RecordPropsDefinition<T> = { [K in keyof T]: PropValidator<T[K]> };
+
+type ArrayPropsDefinition<T> = Array<keyof T>;
+
+type PropsDefinition<T> = ArrayPropsDefinition<T> | RecordPropsDefinition<T>;
+
+type ThisTypedComponentOptionsWithRecordProps<
+    V extends Component<Data, Props>,
+    Data,
+    Methods,
+    Props
+> = object &
+    ComponentOptions<V, Data | ((this: V) => Data), Methods, Props> &
+    ThisType<CombinedInstance<V, Data, Methods, Readonly<Props>>>;
+
+interface ComponentRelation<D = any, P = any> {
+    /** 目标组件的相对关系，可选的值为 parent 、 child 、 ancestor 、 descendant */
+    type: "parent" | "child" | "ancestor" | "descendant";
+    /** 如果这一项被设置，则它表示关联的目标节点所应具有的behavior，所有拥有这一behavior的组件节点都会被关联 */
+    target?: string;
+    /** 关系生命周期函数，当关系被建立在页面节点树中时触发，触发时机在组件attached生命周期之后 */
+    linked?: (target: Component<D, P>) => void;
+    /** 关系生命周期函数，当关系在页面节点树中发生改变时触发，触发时机在组件moved生命周期之后 */
+    linkChanged?: (target: Component<D, P>) => void;
+    /** 关系生命周期函数，当关系脱离页面节点树时触发，触发时机在组件detached生命周期之后 */
+    unlinked?: (target: Component<D, P>) => void;
+}
+
+/**
+ * 组件所在页面的生命周期声明对象，目前仅支持页面的show和hide两个生命周期
+ */
+interface PageLifetimes {
+    show(): void;
+
+    hide(): void;
+}
+
+/**
+ * 组件生命周期声明对象，组件的生命周期：created、attached、ready、moved、detached将收归到lifetimes字段内进行声明，
+ * 原有声明方式仍旧有效，如同时存在两种声明方式，则lifetimes字段内声明方式优先级最高
+ */
+interface Lifetimes {
+    /**
+     * 组件生命周期函数，在组件实例进入页面节点树时执行
+     * 注意此时不能调用 setData
+     */
+    created(): void;
+    /**
+     * 组件生命周期函数，在组件实例进入页面节点树时执行
+     */
+    attached(): void;
+    /**
+     * 组件生命周期函数，在组件布局完成后执行，此时可以获取节点信息
+     * 使用 [SelectorQuery](https://mp.weixin.qq.com/debug/wxadoc/dev/api/wxml-nodes-info.html)
+     */
+    ready(): void;
+    /**
+     * 组件生命周期函数，在组件实例被移动到节点树另一个位置时执行
+     */
+    moved(): void;
+    /**
+     * 组件生命周期函数，在组件实例被从页面节点树移除时执行
+     */
+    detached(): void;
+}
+
 /**
  * Component组件参数
  */
 interface ComponentOptions<
-  Instance extends Component<Data>,
-  Data = DefaultData<Instance>,
-  Methods = DefaultMethods<Instance>,
-  Options = object,
-  Props = PropsDefinition<DefaultProps>> {
-  /**
-   * 组件的对外属性，是属性名到属性设置的映射表
-   * 属性设置中可包含三个字段:
-   * type 表示属性类型、 value 表示属性初始值、 observer 表示属性值被更改时的响应函数
-   */
-  properties?: Props;
-  /**
-   * 组件的内部数据，和 properties 一同用于组件的模版渲染
-   */
-  data?: Data;
-  /**
-   * 组件的方法，包括事件响应函数和任意的自定义方法
-   * 关于事件响应函数的使用
-   * 参见[组件事件](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/events.html)
-   */
-  methods?: Methods;
-  /**
-   * 一些组件选项，请参见文档其他部分的说明
-   */
-  options?: Options;
-  /**
-   * 类似于mixins和traits的组件间代码复用机制
-   * 参见 [behaviors](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/behaviors.html)
-   */
-  behaviors?: Array<(ComponentOptions<Component<object>>) | string>;
-  /**
-   * 组件生命周期函数，在组件实例进入页面节点树时执行
-   * 注意此时不能调用 setData
-   */
-  created?(this: ThisType<ComponentOptions<Instance, Data, Methods, Options, Readonly<Props>>>): void;
-  /**
-   * 组件生命周期函数，在组件实例进入页面节点树时执行
-   */
-  attached?(): void;
-  /**
-   * 组件生命周期函数，在组件布局完成后执行，此时可以获取节点信息
-   * 使用 [SelectorQuery](https://mp.weixin.qq.com/debug/wxadoc/dev/api/wxml-nodes-info.html)
-   */
-  ready?(): void;
-  /**
-   * 组件生命周期函数，在组件实例被移动到节点树另一个位置时执行
-   */
-  moved?(): void;
-  /**
-   * 组件生命周期函数，在组件实例被从页面节点树移除时执行
-   */
-  detached?(): void;
-  /**
-   * 组件间关系定义，参见 [组件间关系](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/relations.html)
-   */
-  relations?: { [key: string]: ComponentRelation };
+    Instance extends Component<Data, Props>,
+    Data = DefaultData<Instance>,
+    Methods = DefaultMethods<Instance>,
+    Props = PropsDefinition<DefaultProps>
+> extends Partial<Lifetimes> {
+    /**
+     * 组件的对外属性，是属性名到属性设置的映射表
+     * 属性设置中可包含三个字段:
+     * type 表示属性类型、 value 表示属性初始值、 observer 表示属性值被更改时的响应函数
+     */
+    properties?: Props;
+
+    /**
+     * 组件的内部数据，和 properties 一同用于组件的模版渲染
+     */
+    data?: Data;
+
+    /**
+     * 组件的方法，包括事件响应函数和任意的自定义方法
+     * 关于事件响应函数的使用
+     * 参见[组件事件](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/events.html)
+     */
+    methods?: Methods;
+
+    /**
+     * 一些组件选项，请参见文档其他部分的说明
+     */
+    options?: Partial<{
+        /**
+         * 使用外部样式类可以让组件使用指定的组件外样式类，如果希望组件外样式类能够完全影响组件内部，
+         * 可以将组件构造器中的options.addGlobalClass字段置为true。这个特性从小程序基础库版本 2.2.3 开始支持。
+         *
+         * @version 2.2.3
+         */
+        addGlobalClass: boolean;
+        /**
+         * 在组件的wxml中可以包含 slot 节点，用于承载组件使用者提供的wxml结构。
+         * 默认情况下，一个组件的wxml中只能有一个slot。需要使用多slot时，可以在组件js中声明启用。
+         */
+        multipleSlots: boolean;
+    }>;
+
+    /**
+     * 组件接受的外部样式类，参见 外部样式类
+     *
+     * 有时，组件希望接受外部传入的样式类（类似于 view 组件的 hover-class 属性）。
+     * 此时可以在 Component 中用 externalClasses 定义段定义若干个外部样式类。这个特性从小程序基础库版本 1.9.90 开始支持。
+     *
+     * @version 1.9.90
+     */
+    externalClasses?: string[];
+
+    /**
+     * 类似于mixins和traits的组件间代码复用机制
+     * 参见 [behaviors](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/behaviors.html)
+     */
+    behaviors?: Array<(ComponentOptions<Component<object, object>>) | string>;
+
+    /**
+     * 组件生命周期声明对象，组件的生命周期：created、attached、ready、moved、detached将收归到lifetimes字段内进行声明，
+     * 原有声明方式仍旧有效，如同时存在两种声明方式，则lifetimes字段内声明方式优先级最高
+     */
+    lifetimes?: Partial<Lifetimes>;
+
+    /**
+     * 组件所在页面的生命周期声明对象，目前仅支持页面的show和hide两个生命周期
+     */
+    pageLifetimes?: Partial<PageLifetimes>;
+
+    /**
+     * 组件间关系定义，参见 [组件间关系](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/relations.html)
+     */
+    relations?: { [key: string]: ComponentRelation };
 }
+
+/**
+ * There are two valid ways to define the type of data / properties:
+ *
+ * 1. { name: valueType }
+ * 2. { name: { type: valueType, value?: value } }
+ *
+ * and this conditional type will extract that out so the call-site will typecheck.
+ *
+ * Note this is different from PropOptions as it is the definitions you passed to Component function
+ * whereas this type is for call-site.
+ */
+type DataValueType<Def> = Def extends {
+    type: (...args: any[]) => infer T;
+    value?: infer T;
+}
+    ? T
+    : Def extends (...args: any[]) => infer T ? T : never;
+
 /**
  * Component实例方法
  */
-interface Component<T> {
-  /**
-   * 组件的文件路径
-   */
-  is: string;
-  /**
-   * 节点id
-   */
-  id: string;
-  /**
-   * 节点dataset
-   */
-  dataset: string;
-  /**
-   * 组件数据，包括内部数据和属性值
-   */
-  data: T;
-  /**
-   * 设置data并执行视图层渲染
-   */
-  setData(data: object): void;
-  /**
-   * 检查组件是否具有 behavior
-   * 检查时会递归检查被直接或间接引入的所有behavior
-   */
-  hasBehavior(behavior: any): void;
-  /**
-   * 触发事件，参见 [组件事件](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/events.html)
-   */
-  triggerEvent(name: string): void;
-  /**
-   * 创建一个 SelectorQuery 对象
-   * 选择器选取范围为这个[组件实例](https://mp.weixin.qq.com/debug/wxadoc/dev/api/wxml-nodes-info.html)内
-   */
-  createSelectorQuery(query: string): void;
-  /**
-   * 使用选择器选择组件实例节点
-   * 返回匹配到的第一个组件实例对象
-   */
-  selectComponent(selector: string): void;
-  /**
-   * selector  使用选择器选择组件实例节点，返回匹配到的全部组件实例对象组成的数组
-   */
-  selectAllComponents(selector: string): void;
-  /**
-   * 获取所有这个关系对应的所有关联节点，参见 [组件间关系](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/relations.html)
-   */
-  getRelationNodes(relationKey: string): void;
+interface Component<D, P> {
+    /**
+     * 组件的文件路径
+     */
+    is: string;
+    /**
+     * 节点id
+     */
+    id: string;
+    /**
+     * 节点dataset
+     */
+    dataset: string;
+    /**
+     * 组件数据，包括内部数据和属性值
+     */
+    data: { [key in keyof (D & P)]: DataValueType<(D & P)[key]> };
+
+    /**
+     * 组件数据，包括内部数据和属性值（与 data 一致）
+     */
+    properties: { [key in keyof (D & P)]: DataValueType<(D & P)[key]> };
+    /**
+     * 将数据从逻辑层发送到视图层，同时改变对应的 this.data 的值
+     * 1. 直接修改 this.data 而不调用 this.setData 是无法改变页面的状态的，还会造成数据不一致。
+     * 2. 单次设置的数据不能超过1024kB，请尽量避免一次设置过多的数据。
+     * 3. 请不要把 data 中任何一项的 value 设为 undefined ，否则这一项将不被设置并可能遗留一些潜在问题
+     * @param data object 以 key，value 的形式表示将 this.data 中的 key 对应的值改变成 value
+     * @param [callback] callback 是一个回调函数，在这次setData对界面渲染完毕后调用
+     */
+    setData(
+        data: {
+            [key in keyof D]?:
+                | string
+                | number
+                | boolean
+                | symbol
+                | object
+                | null
+                | any[]
+        },
+        callback?: () => void
+    ): void;
+    /**
+     * 检查组件是否具有 behavior
+     * 检查时会递归检查被直接或间接引入的所有behavior
+     */
+    hasBehavior(behavior: any): boolean;
+    /**
+     * 触发事件，参见 [组件事件](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/events.html)
+     */
+    triggerEvent(
+        name: string,
+        details?: any,
+        options?: Partial<{
+            bubbles: boolean;
+            composed: boolean;
+            capturePhase: boolean;
+        }>
+    ): void;
+    /**
+     * 创建一个 SelectorQuery 对象
+     * 选择器选取范围为这个[组件实例](https://mp.weixin.qq.com/debug/wxadoc/dev/api/wxml-nodes-info.html)内
+     */
+    createSelectorQuery(): wx.SelectorQuery;
+    /**
+     * 使用选择器选择组件实例节点
+     * 返回匹配到的第一个组件实例对象
+     */
+    selectComponent(selector: string): Component<any, any>;
+    /**
+     * selector  使用选择器选择组件实例节点，返回匹配到的全部组件实例对象组成的数组
+     */
+    selectAllComponents(selector: string): Array<Component<any, any>>;
+    /**
+     * 获取所有这个关系对应的所有关联节点，参见 [组件间关系](https://mp.weixin.qq.com/debug/wxadoc/dev/framework/custom-component/relations.html)
+     */
+    getRelationNodes(relationKey: string): ComponentRelation[];
 }
-declare function Component<D, M, O, P>(options?: ThisTypedComponentOptionsWithRecordProps<Component<D>, D, M, O, P>): ExtendedComponent<Component<D>, D, M, O, P>;
+declare function Component<D, M, P>(
+    options?: ThisTypedComponentOptionsWithRecordProps<Component<D, P>, D, M, P>
+): ExtendedComponent<Component<D, P>, D, M, P>;
 /**
  * behaviors 是用于组件间代码共享的特性
  * 类似于一些编程语言中的“mixins”或“traits”
@@ -3246,112 +3611,131 @@ declare function Component<D, M, O, P>(options?: ThisTypedComponentOptionsWithRe
  * 每个组件可以引用多个 behavior
  * behavior 也可以引用其他 behavior
  */
-declare function Behavior<D, M, O, P>(options?: ThisTypedComponentOptionsWithRecordProps<Component<D>, D, M, O, P>): ExtendedComponent<Component<D>, D, M, O, P>;
+declare function Behavior<D, M, P>(
+    options?: ThisTypedComponentOptionsWithRecordProps<Component<D, P>, D, M, P>
+): ExtendedComponent<Component<D, P>, D, M, P>;
 // #endregion
 // #region Page
 interface PageShareAppMessageOptions {
-  /** 转发事件来源。button：页面内转发按钮；menu：右上角转发菜单 */
-  from: 'button' | 'menu';
-  /** 如果 from 值是 button，则 target 是触发这次转发事件的 button，否则为 undefined */
-  target: object | undefined;
+    /** 转发事件来源。button：页面内转发按钮；menu：右上角转发菜单 */
+    from: "button" | "menu";
+    /** 如果 from 值是 button，则 target 是触发这次转发事件的 button，否则为 undefined */
+    target: object | undefined;
 }
 /**
  * Page 实现的接口对象
  */
 interface PageOptions {
-  /**
-   * 页面的初始数据
-   */
-  data?: any;
-  /**
-   * 生命周期函数--监听页面加载
-   * @param options 接收页面参数可以获取wx.navigateTo和wx.redirectTo及<navigator/>中的 query
-   */
-  onLoad?: (options: object) => void;
-  /**
-   * 生命周期函数--监听页面初次渲染完成
-   */
-  onReady?: () => void;
-  /**
-   * 生命周期函数--监听页面显示
-   */
-  onShow?: () => void;
-  /**
-   * 生命周期函数--监听页面隐藏
-   */
-  onHide?: () => void;
-  /**
-   * 生命周期函数--监听页面卸载
-   */
-  onUnload?: () => void;
-  /**
-   * 下拉刷新
-   * 在 Page 中定义 onPullDownRefresh 处理函数，监听该页面用户下拉刷新事件。
-   * 需要在 config 的window选项中开启 enablePullDownRefresh。
-   * 当处理完数据刷新后，wx.stopPullDownRefresh可以停止当前页面的下拉刷新。
-   */
-  onPullDownRefresh?: () => void;
-  /**
-   * 页面上拉触底事件的处理函数
-   * 监听用户上拉触底事件。
-   * 可以在app.json的window选项中或页面配置中设置触发距离onReachBottomDistance。
-   * 在触发距离内滑动期间，本事件只会被触发一次。
-   */
-  onReachBottom?: () => void;
-  /**
-   * 在 Page 中定义 onShareAppMessage 函数，设置该页面的转发信息。
-   * + 只有定义了此事件处理函数，右上角菜单才会显示 “转发” 按
-   * + 用户点击转发按钮的时候会调
-   * + 此事件需要 return 一个 Object，用于自定义转发内容
-   */
-  onShareAppMessage?: (options?: PageShareAppMessageOptions) => wx.ShareAppMessage;
-  /**
-   * 页面滚动触发事件的处理函数
-   * 监听用户滑动页面事件。
-   * 参数为 Object，包含以下字段：
-   */
-  onPageScroll?: (option: { scrollTop: number }) => void;
-  /**
-   * 当前是 tab 页时，点击 tab 时触发
-   */
-  onTabItemTap?: (item: any) => void;
+    /**
+     * 页面的初始数据
+     */
+    data?: any;
+    /**
+     * 生命周期函数--监听页面加载
+     * @param options 接收页面参数可以获取wx.navigateTo和wx.redirectTo及<navigator/>中的 query
+     */
+    onLoad?: (options: object) => void;
+    /**
+     * 生命周期函数--监听页面初次渲染完成
+     */
+    onReady?: () => void;
+    /**
+     * 生命周期函数--监听页面显示
+     */
+    onShow?: () => void;
+    /**
+     * 生命周期函数--监听页面隐藏
+     */
+    onHide?: () => void;
+    /**
+     * 生命周期函数--监听页面卸载
+     */
+    onUnload?: () => void;
+    /**
+     * 下拉刷新
+     * 在 Page 中定义 onPullDownRefresh 处理函数，监听该页面用户下拉刷新事件。
+     * 需要在 config 的window选项中开启 enablePullDownRefresh。
+     * 当处理完数据刷新后，wx.stopPullDownRefresh可以停止当前页面的下拉刷新。
+     */
+    onPullDownRefresh?: () => void;
+    /**
+     * 页面上拉触底事件的处理函数
+     * 监听用户上拉触底事件。
+     * 可以在app.json的window选项中或页面配置中设置触发距离onReachBottomDistance。
+     * 在触发距离内滑动期间，本事件只会被触发一次。
+     */
+    onReachBottom?: () => void;
+    /**
+     * 在 Page 中定义 onShareAppMessage 函数，设置该页面的转发信息。
+     * + 只有定义了此事件处理函数，右上角菜单才会显示 “转发” 按
+     * + 用户点击转发按钮的时候会调
+     * + 此事件需要 return 一个 Object，用于自定义转发内容
+     */
+    onShareAppMessage?: (
+        options?: PageShareAppMessageOptions
+    ) => wx.ShareAppMessage;
+    /**
+     * 页面滚动触发事件的处理函数
+     * 监听用户滑动页面事件。
+     * 参数为 Object，包含以下字段：
+     */
+    onPageScroll?: (option: { scrollTop: number }) => void;
+    /**
+     * 当前是 tab 页时，点击 tab 时触发
+     */
+    onTabItemTap?: (item: any) => void;
 }
+
 interface Page {
-  /**
-   * 强制更新
-   */
-  forceUpdate(): void;
-  /**
-   * 字段可以获取到当前页面的路径。
-   */
-  route(): void;
-  /**
-   * 将数据从逻辑层发送到视图层，同时改变对应的 this.data 的值
-   * 1. 直接修改 this.data 而不调用 this.setData 是无法改变页面的状态的，还会造成数据不一致。
-   * 2. 单次设置的数据不能超过1024kB，请尽量避免一次设置过多的数据。
-   * 3. 请不要把 data 中任何一项的 value 设为 undefined ，否则这一项将不被设置并可能遗留一些潜在问题
-   * @param data object 以 key，value 的形式表示将 this.data 中的 key 对应的值改变成 value
-   * @param [callback] callback 是一个回调函数，在这次setData对界面渲染完毕后调用
-   */
-  setData(data: { [key: string]: string | number | boolean | symbol | object | null | any[] }, callback?: () => any): void;
-  /**
-   * 更新
-   */
-  update(): void;
-  /**
-   * 将页面滚动到目标位置。
-   *
-   * scrollTop 滚动到页面的目标位置（单位px）
-   * [duration] 滚动动画的时长，默认300ms，单位 ms
-   * @version 1.4.0
-   */
-  pageScrollTo(option?: wx.PageScrollToOptions): void;
+    /**
+     * 强制更新
+     */
+    forceUpdate(): void;
+    /**
+     * 字段可以获取到当前页面的路径。
+     */
+    route(): void;
+    /**
+     * 将数据从逻辑层发送到视图层，同时改变对应的 this.data 的值
+     * 1. 直接修改 this.data 而不调用 this.setData 是无法改变页面的状态的，还会造成数据不一致。
+     * 2. 单次设置的数据不能超过1024kB，请尽量避免一次设置过多的数据。
+     * 3. 请不要把 data 中任何一项的 value 设为 undefined ，否则这一项将不被设置并可能遗留一些潜在问题
+     * @param data object 以 key，value 的形式表示将 this.data 中的 key 对应的值改变成 value
+     * @param [callback] callback 是一个回调函数，在这次setData对界面渲染完毕后调用
+     */
+    setData(
+        data: {
+            [key: string]:
+                | string
+                | number
+                | boolean
+                | symbol
+                | object
+                | null
+                | any[];
+        },
+        callback?: () => any
+    ): void;
+    /**
+     * 更新
+     */
+    update(): void;
+    /**
+     * 将页面滚动到目标位置。
+     *
+     * scrollTop 滚动到页面的目标位置（单位px）
+     * [duration] 滚动动画的时长，默认300ms，单位 ms
+     * @version 1.4.0
+     */
+    pageScrollTo(option?: wx.PageScrollToOptions): void;
 }
 /**
  * Page() 函数用来注册一个页面。
  * 接受一个 object 参数，其指定页面的初始数据、生命周期函数、事件处理函数等。
  */
-declare function Page<T extends PageOptions & object>(page: T & ThisType<T & Page>): void;
+declare function Page<T extends PageOptions & object>(
+    page: T & ThisType<T & Page>
+): void;
 /**
  * getCurrentPages() 函数用于获取当前页面栈的实例，
  * 以数组形式按栈的顺序给出，第一个元素为首页，最后一个元素为当前页面。
diff --git a/types/weixin-app/weixin-app-tests.ts b/types/weixin-app/weixin-app-tests.ts
index 0430dd9115..dea53308d0 100644
--- a/types/weixin-app/weixin-app-tests.ts
+++ b/types/weixin-app/weixin-app-tests.ts
@@ -1,293 +1,424 @@
 getCurrentPages();
 
+interface MyOwnEvent
+    extends wx.CustomEvent<
+            "my-own",
+            {
+                hello: string;
+            }
+        > {}
+
 let behavior = Behavior({
-  behaviors: [],
-  properties: {
-    myBehaviorProperty: {
-      type: String
+    behaviors: [],
+    properties: {
+        myBehaviorProperty: {
+            type: String
+        }
+    },
+    data: {
+        myBehaviorData: ""
+    },
+    attached() {},
+    methods: {
+        myBehaviorMethod() {
+            const s: string = this.data.myBehaviorData;
+        }
     }
-  },
-  data: {
-    myBehaviorData: {}
-  },
-  attached() { },
-  methods: {
-    myBehaviorMethod() {
-      this.myBehaviorData;
-    }
-  }
 });
 
 Component({
-  behaviors: [behavior, 'wx://form-field'],
+    behaviors: [behavior, "wx://form-field"],
 
-  properties: {
-    myProperty: { // 属性名
-      type: String, // 类型（必填），目前接受的类型包括：String, Number, Boolean, Object, Array, null（表示任意类型）
-      value: '', // 属性初始值（可选），如果未指定则会根据类型选择一个
-      observer(newVal: string, oldVal: string) { } // 属性被改变时执行的函数（可选），也可以写成在methods段中定义的方法名字符串, 如：'_propertyChange'
+    options: {
+        multipleSlots: false,
+        addGlobalClass: false
     },
-    myProperty2: String // 简化的定义方式
-  },
-  data: {}, // 私有数据，可用于模版渲染
 
-  // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
-  attached() { },
-  moved() { },
-  detached() { },
-  methods: {
-    onMyButtonTap() {
-      this.setData({
-        // 更新属性和数据的方法与更新页面数据的方法类似
-      });
+    properties: {
+        myProperty: {
+            // 属性名
+            type: String, // 类型（必填），目前接受的类型包括：String, Number, Boolean, Object, Array, null（表示任意类型）
+            value: "", // 属性初始值（可选），如果未指定则会根据类型选择一个
+            observer(newVal: string, oldVal: string, changedPath: string) {
+                const anotherKey = newVal + changedPath;
+                this.setData({
+                    anotherKey
+                });
+            } // 属性被改变时执行的函数（可选），也可以写成在methods段中定义的方法名字符串, 如：'_propertyChange'
+        },
+        myProperty2: String // 简化的定义方式
     },
-    _myPrivateMethod() {
-      // 内部方法建议以下划线开头
-      // this.replaceDataOnPath(['A', 0, 'B'], 'myPrivateData'); // 这里将 data.A[0].B 设为 'myPrivateData'
-      // this.applyDataUpdates();
+    data: {
+        key: "value",
+        anotherKey: "value"
+    }, // 私有数据，可用于模版渲染
+
+    lifetimes: {
+        attached() {},
+
+        detached() {
+            this.setData(
+                {
+                    key: null
+                },
+                () => {}
+            );
+        }
     },
-    _propertyChange(newVal: string, oldVal: string) {
-      //
+
+    pageLifetimes: {
+        show() {},
+        hide() {}
+    },
+
+    // 生命周期函数，可以为函数，或一个在methods段中定义的方法名
+    attached() {
+        this.setData(
+            {
+                key: "123"
+            },
+            () => {}
+        );
+    },
+
+    moved() {},
+
+    detached() {},
+
+    methods: {
+        readMyDataAndMyProps() {
+            const stringValue1: string = this.data.myProperty;
+            const stringValue2: string = this.data.myProperty2;
+            const stringValue3: string = this.data.key;
+            this.data.anotherKey;
+            this.properties.myProperty;
+            this.properties.myProperty2;
+            this.properties.key;
+            this.properties.anotherKey;
+            this.setData({
+                key: stringValue1 + stringValue2 + stringValue3
+            });
+        },
+        onMyButtonTap() {
+            // 更新属性和数据的方法与更新页面数据的方法类似
+            this.setData({
+                key: 123 // note this is edge case where it cannot detect wrong types...
+            });
+        },
+        _myPrivateMethod() {
+            // 内部方法建议以下划线开头
+            // this.replaceDataOnPath(['A', 0, 'B'], 'myPrivateData'); // 这里将 data.A[0].B 设为 'myPrivateData'
+            // this.applyDataUpdates();
+            this.setData({
+                anotherKey: 123
+            });
+        },
+        _propertyChange(newVal: string, oldVal: string) {
+            //
+        }
+    },
+    relations: {
+        "./custom-ul": {
+            type: "parent", // 关联的目标节点应为父节点
+            linked(target: Component<{ key: string }, {}>) {
+                // 每次被插入到custom-ul时执行，target是custom-ul节点实例对象，触发在attached生命周期之后
+                target.data.key;
+            },
+            linkChanged(target: Component<{ key: string }, {}>) {
+                // 每次被移动后执行，target是custom-ul节点实例对象，触发在moved生命周期之后
+                target.data.key;
+            },
+            unlinked(target: Component<{ key: string }, {}>) {
+                // 每次被移除时执行，target是custom-ul节点实例对象，触发在detached生命周期之后
+                target.data.key;
+            }
+        }
     }
-  },
-  relations: {
-    './custom-ul': {
-      type: 'parent', // 关联的目标节点应为父节点
-      linked(target) {
-        // 每次被插入到custom-ul时执行，target是custom-ul节点实例对象，触发在attached生命周期之后
-      },
-      linkChanged(target) {
-        // 每次被移动后执行，target是custom-ul节点实例对象，触发在moved生命周期之后
-      },
-      unlinked(target) {
-        // 每次被移除时执行，target是custom-ul节点实例对象，触发在detached生命周期之后
-      }
-    }
-  }
 });
 
 // index.js
 Page({
-  data: {
-    text: "This is page data."
-  },
-  onLoad: () => {
-    // Do some initialize when page load.
-  },
-  onReady: () => {
-    // Do something when page ready.
-  },
-  onShow: () => {
-    // Do something when page show.
-  },
-  onHide: () => {
-    // Do something when page hide.
-  },
-  onUnload: () => {
-    // Do something when page close.
-  },
-  onPullDownRefresh: () => {
-    // Do something when pull down.
-  },
-  onReachBottom: () => {
-    // Do something when page reach bottom.
-  },
-  onShareAppMessage: (res) => {
-    if (res && res.from === 'menu') {
-      //
+    data: {
+        text: "This is page data."
+    },
+    onLoad() {
+        // Do some initialize when page load.
+        this.setData({}, () => {
+            // callback
+        });
+    },
+    onReady: () => {
+        // Do something when page ready.
+    },
+    onShow: () => {
+        // Do something when page show.
+    },
+    onHide: () => {
+        // Do something when page hide.
+    },
+    onUnload: () => {
+        // Do something when page close.
+    },
+    onPullDownRefresh: () => {
+        // Do something when pull down.
+    },
+    onReachBottom: () => {
+        // Do something when page reach bottom.
+    },
+    onShareAppMessage: res => {
+        if (res && res.from === "menu") {
+            //
+        }
+        // return custom share data when user share.
+        return {
+            success(res) {
+                console.log(res.shareTickets.length);
+            }
+        };
+    },
+    onPageScroll: () => {
+        // this.
+        // Do something when page scroll
+    },
+    onTabItemTap(item: any) {
+        this.setData({
+            1: null,
+            _2: "undefined"
+        });
+        console.log(item.index);
+        console.log(item.pagePath);
+        console.log(item.text);
+    },
+    // Event handler.
+    viewTap() {
+        this.setData(
+            {
+                text: "Set some data for updating view."
+            },
+            () => {
+                // this is setData callback
+            }
+        );
+    },
+    customData: {
+        hi: "MINA"
+    },
+    onMyOwnEvent(e: MyOwnEvent) {
+        e.detail.hello;
+    },
+    onTouchStart(e: wx.TouchStartEvent) {
+        e.touches;
+        e.detail.x;
+        e.detail.y;
+    },
+    onTouchEnd(e: wx.TouchEndEvent) {
+        e.touches;
+        e.detail.x;
+        e.detail.y;
+    },
+    onTouchCancel(e: wx.TouchCancelEvent) {
+        e.touches;
+        e.detail.x;
+        e.detail.y;
+    },
+    onTouchMove(e: wx.TouchMoveEvent) {
+        e.touches;
+        e.detail.x;
+        e.detail.y;
     }
-    // return custom share data when user share.
-    return {
-      success(res) {
-        console.log(res.shareTickets.length);
-      }
-    };
-  },
-  onPageScroll: () => {
-    // this.
-    // Do something when page scroll
-  },
-  onTabItemTap(item: any) {
-    this.setData({
-      1: null,
-      _2: "undefined"
-    });
-    console.log(item.index);
-    console.log(item.pagePath);
-    console.log(item.text);
-  },
-  // Event handler.
-  viewTap() {
-    this.setData({
-      text: 'Set some data for updating view.'
-    }, () => {
-      // this is setData callback
-    });
-  },
-  customData: {
-    hi: 'MINA'
-  }
 });
 
 Page({
-  getScrollOffset: () => {
-    wx.createSelectorQuery().selectViewport().scrollOffset((res) => {
-      res.id;      // 节点的ID
-      res.dataset; // 节点的dataset
-      res.scrollLeft; // 节点的水平滚动位置
-      res.scrollTop;  // 节点的竖直滚动位置
-    }).exec();
-  }
+    getScrollOffset: () => {
+        wx.createSelectorQuery()
+            .selectViewport()
+            .scrollOffset(res => {
+                res.id; // 节点的ID
+                res.dataset; // 节点的dataset
+                res.scrollLeft; // 节点的水平滚动位置
+                res.scrollTop; // 节点的竖直滚动位置
+            })
+            .exec();
+    }
 });
 
 Page({
-  getFields: () => {
-    wx.createSelectorQuery().select('#the-id').fields({
-      id: true,
-      dataset: true,
-      size: true,
-      scrollOffset: true,
-      properties: ['scrollX', 'scrollY']
-    }, (res) => {
-      // res.
-      res.dataset;    // 节点的dataset
-      res.width;      // 节点的宽度
-      res.height;     // 节点的高度
-      res.scrollLeft; // 节点的水平滚动位置
-      res.scrollTop;  // 节点的竖直滚动位置
-      res.scrollX;    // 节点 scroll-x 属性的当前值
-      res.scrollY;    // 节点 scroll-x 属性的当前值
-    }).exec();
-  }
+    getFields: () => {
+        wx.createSelectorQuery()
+            .select("#the-id")
+            .fields(
+                {
+                    id: true,
+                    dataset: true,
+                    size: true,
+                    scrollOffset: true,
+                    properties: ["scrollX", "scrollY"]
+                },
+                res => {
+                    // res.
+                    res.dataset; // 节点的dataset
+                    res.width; // 节点的宽度
+                    res.height; // 节点的高度
+                    res.scrollLeft; // 节点的水平滚动位置
+                    res.scrollTop; // 节点的竖直滚动位置
+                    res.scrollX; // 节点 scroll-x 属性的当前值
+                    res.scrollY; // 节点 scroll-x 属性的当前值
+                }
+            )
+            .exec();
+    }
 });
 
 Page({
-  getRect: () => {
-    wx.createSelectorQuery().select('#the-id').boundingClientRect((rect: wx.NodesRefRect) => {
-      rect.id;      // 节点的ID
-      rect.dataset; // 节点的dataset
-      rect.left;    // 节点的左边界坐标
-      rect.right;   // 节点的右边界坐标
-      rect.top;     // 节点的上边界坐标
-      rect.bottom;  // 节点的下边界坐标
-      rect.width;   // 节点的宽度
-      rect.height;  // 节点的高度
-    }).exec();
-  },
-  getAllRects: () => {
-    wx.createSelectorQuery().selectAll('.a-class').boundingClientRect((rects: wx.NodesRefRect[]) => {
-      rects.forEach((rect) => {
-        rect.id;      // 节点的ID
-        rect.dataset; // 节点的dataset
-        rect.left;    // 节点的左边界坐标
-        rect.right;   // 节点的右边界坐标
-        rect.top;     // 节点的上边界坐标
-        rect.bottom;  // 节点的下边界坐标
-        rect.width;   // 节点的宽度
-        rect.height;  // 节点的高度
-      });
-    }).exec();
-  }
+    getRect: () => {
+        wx.createSelectorQuery()
+            .select("#the-id")
+            .boundingClientRect((rect: wx.NodesRefRect) => {
+                rect.id; // 节点的ID
+                rect.dataset; // 节点的dataset
+                rect.left; // 节点的左边界坐标
+                rect.right; // 节点的右边界坐标
+                rect.top; // 节点的上边界坐标
+                rect.bottom; // 节点的下边界坐标
+                rect.width; // 节点的宽度
+                rect.height; // 节点的高度
+            })
+            .exec();
+    },
+    getAllRects: () => {
+        wx.createSelectorQuery()
+            .selectAll(".a-class")
+            .boundingClientRect((rects: wx.NodesRefRect[]) => {
+                rects.forEach(rect => {
+                    rect.id; // 节点的ID
+                    rect.dataset; // 节点的dataset
+                    rect.left; // 节点的左边界坐标
+                    rect.right; // 节点的右边界坐标
+                    rect.top; // 节点的上边界坐标
+                    rect.bottom; // 节点的下边界坐标
+                    rect.width; // 节点的宽度
+                    rect.height; // 节点的高度
+                });
+            })
+            .exec();
+    }
 });
 
 const recorderManager = wx.getRecorderManager();
 
 recorderManager.onStart(() => {
-  console.log('recorder start');
+    console.log("recorder start");
 });
 recorderManager.onResume(() => {
-  console.log('recorder resume');
+    console.log("recorder resume");
 });
 recorderManager.onPause(() => {
-  console.log('recorder pause');
+    console.log("recorder pause");
 });
-recorderManager.onStop((res) => {
-  console.log('recorder stop', res);
-  const { tempFilePath } = res;
+recorderManager.onStop(res => {
+    console.log("recorder stop", res);
+    const { tempFilePath } = res;
 });
-recorderManager.onFrameRecorded((res) => {
-  const { frameBuffer } = res;
-  console.log('frameBuffer.byteLength', frameBuffer.byteLength);
+recorderManager.onFrameRecorded(res => {
+    const { frameBuffer } = res;
+    console.log("frameBuffer.byteLength", frameBuffer.byteLength);
 });
 
 const options = {
-  duration: 10000,
-  sampleRate: 44100,
-  numberOfChannels: 1,
-  encodeBitRate: 192000,
-  format: 'aac',
-  frameSize: 50
+    duration: 10000,
+    sampleRate: 44100,
+    numberOfChannels: 1,
+    encodeBitRate: 192000,
+    format: "aac",
+    frameSize: 50
 };
 
 recorderManager.start(options);
 
-wx.onGetWifiList((res) => {
-  if (res.wifiList.length) {
-    wx.setWifiList({
-      wifiList: [{
-        SSID: res.wifiList[0].SSID,
-        BSSID: res.wifiList[0].BSSID,
-        password: '123456'
-      }]
-    });
-  } else {
-    wx.setWifiList({
-      wifiList: []
-    });
-  }
+wx.onGetWifiList(res => {
+    if (res.wifiList.length) {
+        wx.setWifiList({
+            wifiList: [
+                {
+                    SSID: res.wifiList[0].SSID,
+                    BSSID: res.wifiList[0].BSSID,
+                    password: "123456"
+                }
+            ]
+        });
+    } else {
+        wx.setWifiList({
+            wifiList: []
+        });
+    }
 });
 wx.getWifiList();
 
-wx.onWifiConnected((wifi) => {
-  // wifi.BSSID
+wx.onWifiConnected(wifi => {
+    // wifi.BSSID
 });
 
 wx.getConnectedWifi({
-  success(result) {
-    result.signalStrength;
-  }
+    success(result) {
+        result.signalStrength;
+    }
 });
 
 wx.getWeRunData({
-  success(res) {
-    const encryptedData = res.encryptedData;
-  }
+    success(res) {
+        const encryptedData = res.encryptedData;
+    }
 });
 
 const uploadTask = wx.uploadFile({
-  url: 'http://example.weixin.qq.com/upload', // 仅为示例，非真实的接口地址
-  filePath: '/local/folder/file.ext',
-  name: 'file',
-  formData: {
-    user: 'test'
-  },
-  success: (res) => {
-    const data = res.data;
-    // do something
-  }
+    url: "http://example.weixin.qq.com/upload", // 仅为示例，非真实的接口地址
+    filePath: "/local/folder/file.ext",
+    name: "file",
+    formData: {
+        user: "test"
+    },
+    success: res => {
+        const data = res.data;
+        // do something
+    }
 });
 
-uploadTask.onProgressUpdate((res) => {
-  console.log('上传进度', res.progress);
-  console.log('已经上传的数据长度', res.totalBytesSent);
-  console.log('预期需要上传的数据总长度', res.totalBytesExpectedToSend);
+uploadTask.onProgressUpdate(res => {
+    console.log("上传进度", res.progress);
+    console.log("已经上传的数据长度", res.totalBytesSent);
+    console.log("预期需要上传的数据总长度", res.totalBytesExpectedToSend);
 });
 
 uploadTask.abort(); // 取消上传任务
 
 const downloadTask = wx.downloadFile({
-  url: 'http://example.com/audio/123', // 仅为示例，并非真实的资源
-  success: (res) => {
-    wx.playVoice({
-      filePath: res.tempFilePath
-    });
-  }
+    url: "http://example.com/audio/123", // 仅为示例，并非真实的资源
+    success: res => {
+        wx.playVoice({
+            filePath: res.tempFilePath
+        });
+    }
 });
 
-downloadTask.onProgressUpdate((res) => {
-  console.log('下载进度', res.progress);
-  console.log('已经下载的数据长度', res.totalBytesWritten);
-  console.log('预期需要下载的数据总长度', res.totalBytesExpectedToWrite);
+downloadTask.onProgressUpdate(res => {
+    console.log("下载进度", res.progress);
+    console.log("已经下载的数据长度", res.totalBytesWritten);
+    console.log("预期需要下载的数据总长度", res.totalBytesExpectedToWrite);
 });
 
 downloadTask.abort(); // 取消下载任务
+
+wx.request({
+    url: "https://www.baidu.com",
+    method: "GET",
+    success(res) {
+        if (res.statusCode < 300) {
+            console.log(res.data);
+        } else {
+            console.warn(res.statusCode, res.header);
+        }
+    },
+    fail(e) {
+        console.error(e);
+    }
+}).abort();
diff --git a/types/wepy-redux/index.d.ts b/types/wepy-redux/index.d.ts
new file mode 100644
index 0000000000..be516d18eb
--- /dev/null
+++ b/types/wepy-redux/index.d.ts
@@ -0,0 +1,24 @@
+// Type definitions for wepy-redux 1.7
+// Project: https://github.com/Tencent/wepy/tree/1.7.x/packages/wepy-redux
+// Definitions by: Jiayu Liu <https://github.com/Jimexist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+import wepy from "wepy";
+import { Store } from "redux";
+
+export interface MapStateToProps {
+    [propName: string]: ((state: any) => any) | string;
+}
+export interface MapDispatchToProps {
+    [propName: string]: ((store: any, ...args: any[]) => void) | string;
+}
+
+export function connect(
+    mapStateToProps: MapStateToProps,
+    mapDispatchToProps: MapDispatchToProps
+): (<T extends wepy.Component>(original: T) => T);
+
+export function setStore(store: Store): void;
+
+export function getStore(): Store;
diff --git a/types/wepy-redux/package.json b/types/wepy-redux/package.json
new file mode 100644
index 0000000000..7f5b19d45b
--- /dev/null
+++ b/types/wepy-redux/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "redux": "^4.0.0"
+    }
+}
diff --git a/types/wepy-redux/tsconfig.json b/types/wepy-redux/tsconfig.json
new file mode 100644
index 0000000000..c7cc00bebf
--- /dev/null
+++ b/types/wepy-redux/tsconfig.json
@@ -0,0 +1,17 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "experimentalDecorators": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "wepy-redux-tests.ts"]
+}
diff --git a/types/wepy-redux/tslint.json b/types/wepy-redux/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/wepy-redux/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/wepy-redux/wepy-redux-tests.ts b/types/wepy-redux/wepy-redux-tests.ts
new file mode 100644
index 0000000000..8444c7cc2e
--- /dev/null
+++ b/types/wepy-redux/wepy-redux-tests.ts
@@ -0,0 +1,41 @@
+import wepy from "wepy";
+import { createStore } from "redux";
+import { connect, getStore, setStore } from "wepy-redux";
+
+const store = createStore(
+    (counter: number | undefined, action: { type: string; payload: number }) =>
+        counter || 0 + action.payload,
+    0
+);
+
+setStore(store);
+
+const s = getStore();
+s.dispatch({ type: "a" });
+
+interface State {
+    counter: {
+        num: number;
+    };
+}
+
+@connect(
+    {
+        num(state: State) {
+            return state.counter.num;
+        },
+        inc: "inc"
+    },
+    {
+        addNum: "INCREMENT",
+        asyncInc: () => {}
+    }
+)
+export default class Index extends wepy.page {
+    // methods
+    methods = {
+        // method values
+    };
+    // on load
+    onLoad() {}
+}
diff --git a/types/wepy/app.d.ts b/types/wepy/app.d.ts
new file mode 100644
index 0000000000..17274c83b1
--- /dev/null
+++ b/types/wepy/app.d.ts
@@ -0,0 +1,27 @@
+import { PageConfig } from "./page";
+
+export interface AppConfig {
+    appEvents?: string[];
+    pageEvents?: string[];
+    noPromiseAPI?: string[] | { [name: string]: boolean };
+}
+
+export interface AppConstructor {
+    new (): app;
+}
+
+/* the supported add-ons */
+export type AddOn = "requestfix" | "promisify";
+
+export default class app {
+    config: {
+        window: PageConfig;
+        pages: string[];
+    };
+    $init(wepy: any, config: AppConfig): void;
+    use(addonName: AddOn, ...args: any[]): void;
+    $initAPI(
+        wepy: any,
+        noPromiseAPI: string[] | { [name: string]: boolean }
+    ): void;
+}
diff --git a/types/wepy/base.d.ts b/types/wepy/base.d.ts
new file mode 100644
index 0000000000..91c934b8b1
--- /dev/null
+++ b/types/wepy/base.d.ts
@@ -0,0 +1,12 @@
+import page, { PageConstructor } from "./page";
+import app, { AppConstructor, AppConfig } from "./app";
+
+declare const defaultExport: {
+    $createApp?: (appClass: AppConstructor, appConfig: AppConfig) => app;
+    $createPage?: (
+        pageClass: PageConstructor,
+        pagePath: string | boolean
+    ) => page;
+};
+
+export default defaultExport;
diff --git a/types/wepy/component.d.ts b/types/wepy/component.d.ts
new file mode 100644
index 0000000000..ddcea63ed6
--- /dev/null
+++ b/types/wepy/component.d.ts
@@ -0,0 +1,20 @@
+import event from "./event";
+
+export default class component {
+    $isComponent: boolean;
+    $prefix: string;
+    data: { [name: string]: any };
+
+    computed?: { [name: string]: (self?: component) => any };
+    methods?: { [name: string]: (evt?: event) => any };
+
+    $init($wxpage: any, $root: any, $parent: any): void;
+    $initMixins(): void;
+    onLoad(): void;
+    setData(k: string | string[], v: any): void;
+    getWxPage(): any;
+    $setIndex(index: number): void;
+    $getComponent(com: any): any;
+    $apply(fn: () => void): void;
+    $nextTick(fn: () => void): void;
+}
diff --git a/types/wepy/event.d.ts b/types/wepy/event.d.ts
new file mode 100644
index 0000000000..f3a0d6c5a8
--- /dev/null
+++ b/types/wepy/event.d.ts
@@ -0,0 +1,6 @@
+export default class event {
+    active: boolean;
+    constructor(name: string, source: any, type: any);
+    $destroy(): void;
+    $transfor(wxevent: any[]): void;
+}
diff --git a/types/wepy/index.d.ts b/types/wepy/index.d.ts
new file mode 100644
index 0000000000..08a22f2596
--- /dev/null
+++ b/types/wepy/index.d.ts
@@ -0,0 +1,43 @@
+// Type definitions for wepy 1.7
+// Project: https://github.com/Tencent/wepy#readme
+// Definitions by: Jiayu Liu <https://github.com/Jimexist>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+import component from "./component";
+import mixin from "./mixin";
+import event from "./event";
+import page from "./page";
+import app from "./app";
+import util from "./util";
+import base from "./base";
+import { WxEnhances } from "./wx_enhanced";
+
+export as namespace wepy;
+
+export type Event = typeof event;
+export type Component = typeof component;
+export type App = typeof app;
+export type Page = typeof page;
+export type Mixin = typeof mixin;
+
+interface DefaultExport extends WxEnhances {
+    event: wepy.Event;
+    app: wepy.App;
+    component: wepy.Component;
+    page: wepy.Page;
+    mixin: wepy.Mixin;
+    $createApp: typeof base.$createApp;
+    $createPage: typeof base.$createPage;
+    $isEmpty: typeof util.$isEmpty;
+    $isEqual: typeof util.$isEqual;
+    $isDeepEqual: typeof util.$isDeepEqual;
+    $has: typeof util.$has;
+    $extend: typeof util.$extend;
+    $isPlainObject: typeof util.$isPlainObject;
+    $copy: typeof util.$copy;
+}
+
+declare const defaultExport: DefaultExport;
+
+export default defaultExport;
diff --git a/types/wepy/mixin.d.ts b/types/wepy/mixin.d.ts
new file mode 100644
index 0000000000..c70aedd7b1
--- /dev/null
+++ b/types/wepy/mixin.d.ts
@@ -0,0 +1 @@
+export default class mixin {}
diff --git a/types/wepy/page.d.ts b/types/wepy/page.d.ts
new file mode 100644
index 0000000000..d369802715
--- /dev/null
+++ b/types/wepy/page.d.ts
@@ -0,0 +1,35 @@
+import component from "./component";
+
+export interface UrlParam {
+    url: string;
+}
+
+export interface PageConstructor {
+    new (): page;
+}
+
+export interface PageConfig {
+    navigationBarBackgroundColor?: string;
+    navigationBarTextStyle?: string;
+    navigationBarTitleText?: string;
+    backgroundColor?: string;
+    backgroundTextStyle?: string;
+    enablePullDownRefresh?: boolean;
+    disableScroll?: boolean;
+    onReachBottomDistance?: number;
+}
+
+export default class page extends component {
+    config?: PageConfig;
+    $preloadData?: { [key: string]: any };
+    $init(wxpage: any, $parent: any): any;
+    $route(
+        type: "redirectTo" | "navigateTo",
+        url: string | UrlParam,
+        params?: { [name: string]: any }
+    ): any;
+    $preload(key: string | { [key: string]: any }, data: any): any;
+    $switch(url: string | UrlParam): any;
+    $redirect(url: string, params?: object): any;
+    $back(delta: number | { delta: number }): any;
+}
diff --git a/types/wepy/tsconfig.json b/types/wepy/tsconfig.json
new file mode 100644
index 0000000000..f363a749a1
--- /dev/null
+++ b/types/wepy/tsconfig.json
@@ -0,0 +1,27 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "app.d.ts",
+        "base.d.ts",
+        "component.d.ts",
+        "event.d.ts",
+        "index.d.ts",
+        "mixin.d.ts",
+        "page.d.ts",
+        "util.d.ts",
+        "wx_enhanced.d.ts",
+        "wepy-tests.ts"
+    ]
+}
diff --git a/types/wepy/tslint.json b/types/wepy/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/wepy/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/wepy/util.d.ts b/types/wepy/util.d.ts
new file mode 100644
index 0000000000..cff1be1ce5
--- /dev/null
+++ b/types/wepy/util.d.ts
@@ -0,0 +1,15 @@
+declare const defaultExport: {
+    $isEmpty: (obj: object) => boolean;
+    $isEqual: (a: any, b: any, aStack?: any[], bStack?: any[]) => boolean;
+    $isDeepEqual: (a: any, b: any, aStack?: any[], bStack?: any[]) => boolean;
+    $has: (obj: object, path: string) => boolean;
+    $extend: () => any;
+    $copy: <T>(obj: T, deep?: boolean) => T;
+    $isPlainObject: (obj: any) => boolean;
+    $resolvePath: (route: string, url: string) => string;
+    $getParams: (url: string) => object;
+    hyphenate: (str: string) => string;
+    camelize: (str: string) => string;
+};
+
+export default defaultExport;
diff --git a/types/wepy/wepy-tests.ts b/types/wepy/wepy-tests.ts
new file mode 100644
index 0000000000..c0fb4b3d89
--- /dev/null
+++ b/types/wepy/wepy-tests.ts
@@ -0,0 +1,58 @@
+import wepy from "wepy";
+
+export class MyApp extends wepy.app {
+    async onLoad() {
+        this.use("requestfix");
+    }
+}
+
+export class MyComponent extends wepy.component {
+    data = {
+        reveal: false,
+        img: "",
+        animationData: "",
+        imgClassName: "",
+        imgMode: "scaleToFill",
+        title: "loading",
+        titleClassName: ""
+    };
+
+    config = {};
+
+    methods = {};
+
+    async onLoad() {
+        super.onLoad();
+        await wepy.request("http://www.weixin.com");
+        const a = await wepy.request({
+            url: "www.weixin.com",
+            data: { a: 1, b: 2 },
+            header: {
+                "content-type": "application/json"
+            },
+            method: "POST"
+        });
+    }
+}
+
+export class BindJwc extends wepy.page {
+    config = {
+        navigationBarTitleText: "校历",
+        enablePullDownRefresh: true
+    };
+    mixins = [];
+    data = {};
+    computed = {
+        termName(): number {
+            return 1;
+        }
+    };
+    methods = {
+        returnToday(): number {
+            return 123;
+        }
+    };
+
+    init() {}
+    async onLoad() {}
+}
diff --git a/types/wepy/wx_enhanced.d.ts b/types/wepy/wx_enhanced.d.ts
new file mode 100644
index 0000000000..5769c4f718
--- /dev/null
+++ b/types/wepy/wx_enhanced.d.ts
@@ -0,0 +1,407 @@
+export interface WechatProfileDetails {
+    photoFilePath?: string;
+    nickName?: string;
+    lastName?: string;
+    middleName?: string;
+    firstName?: string;
+    remark?: string;
+    mobilePhoneNumber?: string;
+    email?: string;
+    url?: string;
+    workAddressCountry?: string;
+    workAddressState?: string;
+    workAddressCity?: string;
+    workAddressStreet?: string;
+    workAddressPostalCode?: string;
+    homeFaxNumber?: string;
+    homePhoneNumber?: string;
+    homeAddressCountry?: string;
+    homeAddressState?: string;
+    homeAddressCity?: string;
+    homeAddressStreet?: string;
+    homeAddressPostalCode?: string;
+}
+
+export interface RotateAnimation {
+    rotate(deg: number): Animation;
+    rotateX(deg: number): Animation;
+    rotateY(deg: number): Animation;
+    rotateZ(deg: number): Animation;
+    rotate3d(): Animation;
+}
+
+export interface ScaleAnimation {
+    scale(sx: number): Animation;
+    scaleX(sx: number): Animation;
+    scaleY(sy: number): Animation;
+    scaleZ(sz: number): Animation;
+    scale3d(): Animation;
+}
+
+export interface TranslateAnimation {
+    translate(tx: number): Animation;
+    translateX(tx: number): Animation;
+    translateY(ty: number): Animation;
+    translateZ(tz: number): Animation;
+    translate3d(): Animation;
+}
+
+export interface SkewAnimation {
+    skew(ax: number): Animation;
+    skewX(ax: number): Animation;
+    skewY(ay: number): Animation;
+}
+
+export interface Animation
+    extends RotateAnimation,
+        ScaleAnimation,
+        SkewAnimation,
+        TranslateAnimation {
+    opacity(x: number): Animation;
+    backgroundColor(x: string): Animation;
+    width(x: number): Animation;
+    height(x: number): Animation;
+    top(x: number): Animation;
+    left(x: number): Animation;
+    bottom(x: number): Animation;
+    right(x: number): Animation;
+}
+
+export interface LagLng {
+    latitude: number;
+    longitude: number;
+}
+
+export type CallbackFunction<T> = (
+    callbacks: {
+        success: (res: T) => void;
+        fail: () => void;
+        complete: () => void;
+    }
+) => void;
+
+export interface MapContext {
+    getCenterLocation: CallbackFunction<LagLng>;
+
+    moveToLocation(): void;
+
+    translateMarker(params: {
+        markerId: number;
+        autoRotate: boolean;
+        duration: number;
+        destination: LagLng;
+        animationEnd: () => void;
+    }): void;
+
+    includePoints(params: { padding: number[]; points: LagLng[] }): void;
+
+    getRegion: CallbackFunction<{ southwest: LagLng; northeast: LagLng }>;
+
+    getScale: CallbackFunction<{ scale: number }>;
+}
+
+export interface UserInfo {
+    nickName: string;
+    avatarUrl: string;
+    gender: string;
+    city: string;
+    province: string;
+    country: string;
+    language: string;
+}
+
+export interface UrlParam {
+    url: string;
+}
+
+export interface RequestParam extends UrlParam {
+    data?: object | string | ArrayBuffer;
+    header?: object;
+    method?:
+        | "GET"
+        | "OPTIONS"
+        | "HEAD"
+        | "POST"
+        | "PUT"
+        | "DELETE"
+        | "TRACE"
+        | "CONNECT";
+    dataType?: "json" | "text";
+    responseType?: "text" | "arraybuffer";
+}
+
+export interface FilePathParam {
+    filePath: string;
+}
+
+// WePY enhanced Wx interfaces and methods below are all accessible
+export interface WxEnhances {
+    addPhoneContact(param: WechatProfileDetails): Promise<void>;
+
+    authorize(param: { scope: string }): Promise<any>;
+
+    canIUse(name: string): Promise<boolean>;
+
+    canvasGetImageData(
+        params: {
+            canvasId: string;
+            x: number;
+            y: number;
+            width: number;
+            height: number;
+        },
+        context: any
+    ): Promise<{
+        width: number;
+        height: number;
+        data: Uint8ClampedArray;
+    }>;
+
+    canvasPutImageData(
+        params: {
+            canvasId: string;
+            data: Uint8ClampedArray;
+            x: number;
+            y: number;
+            height?: number;
+            wdith: number;
+        },
+        context: any
+    ): Promise<void>;
+
+    canvasToTempFilePath(
+        params: {
+            x: number;
+            y: number;
+            width: number;
+            height: number;
+            destWidth: number;
+            destHeight: number;
+            canvasId: string;
+        },
+        context: any
+    ): Promise<{ tempFilePath: string }>;
+
+    checkIsSoterEnrolledInDevice(params: {
+        checkAuthMode: "fingerPrint" | "facial" | "speech";
+    }): Promise<{
+        isEnrolled: boolean;
+        errMsg: string;
+    }>;
+
+    checkIsSupportSoterAuthentication(): Promise<{
+        supportMode: string[];
+    }>;
+
+    checkSession(): Promise<void>;
+
+    chooseInvoiceTitle(): Promise<{
+        type: "0" | "1";
+        title: string;
+        taxNumber: string;
+        companyAddress: string;
+        telephone: string;
+        bankName: string;
+        bankAccount: string;
+        errMsg: string;
+    }>;
+
+    chooseLocation(): Promise<{
+        name: string;
+        address: string;
+        latitude: number;
+        longitude: number;
+    }>;
+
+    chooseVideo(params: {
+        sourceType: string[];
+        compressed: boolean;
+        maxDuration: number;
+    }): Promise<{
+        tempFilePath: string;
+        duration: number;
+        size: number;
+        height: number;
+        width: number;
+    }>;
+
+    clearStorage(): Promise<void>;
+
+    createAnimation(params: {
+        duration: number;
+        timingFunction: string;
+        delay: number;
+        transformOrigin: string;
+    }): Promise<Animation>;
+
+    createCanvasContext(canvasId: string, context: any): Promise<void>;
+
+    createMapContext(mapId: string, context: any): MapContext;
+
+    createSelectorQuery(): Promise<{}>;
+
+    getLocation(params: {
+        type: string;
+        altitude: boolean;
+    }): Promise<{
+        latitude: number;
+        longitude: number;
+        speed: number;
+        accuracy: number;
+        altitude: number;
+        verticalAccuracy: number;
+        horizontalAccuracy: number;
+    }>;
+
+    getNetworkType(): Promise<{ networkType: string }>;
+
+    getSavedFileInfo(
+        params: FilePathParam
+    ): Promise<{
+        errMsg: string;
+        size: number;
+        createTime: number;
+    }>;
+
+    getSavedFileList(): Promise<{
+        errMsg: string;
+        fileList: object[];
+    }>;
+
+    getSetting(): Promise<{
+        authSetting: {
+            "scope.userInfo": boolean;
+            "scope.userLocation": boolean;
+            "scope.address": boolean;
+            "scope.invoiceTitle": boolean;
+            "scope.werun": boolean;
+            "scope.record": boolean;
+            "scope.writePhotosAlbum": boolean;
+            "scope.camera": boolean;
+        };
+    }>;
+
+    getShareInfo(params: {
+        shareTicket: string;
+        timeout: number;
+    }): Promise<{
+        errMsg: string;
+        encryptedData: string;
+        iv: string;
+    }>;
+
+    getSystemInfo(): Promise<{
+        brand: string;
+        model: string;
+        pixelRatio: number;
+        screenWidth: number;
+        screenHeight: number;
+        windowWidth: number;
+        windowHeight: number;
+        statusBarHeight: number;
+        language: string;
+        version: string;
+        system: string;
+        platform: string;
+        fontSizeSetting: string;
+        SDKVersion: string;
+    }>;
+
+    getUserInfo(params: {
+        withCredentials: boolean;
+        lang: string;
+        timeout: number;
+    }): Promise<{
+        userInfo: object;
+        rawData: string;
+        signature: string;
+        encryptedData: string;
+        iv: string;
+    }>;
+
+    hideLoading(): Promise<void>;
+
+    hideNavigationBarLoading(): Promise<void>;
+
+    makePhoneCall(params: { phoneNumber: string }): Promise<void>;
+
+    navigateTo(params: UrlParam): Promise<void>;
+
+    onUserCaptureScreen(): Promise<void>;
+
+    openLocation(params: {
+        latitude: number;
+        longitude: number;
+        scale?: number;
+        name?: string;
+        address?: string;
+    }): Promise<void>;
+
+    pageScrollTo(params: {
+        scrollTop: number;
+        duration: number;
+    }): Promise<void>;
+
+    redirectTo(params: UrlParam): Promise<void>;
+
+    removeSavedFile(params: FilePathParam): Promise<void>;
+
+    removeStorage(params: { key: string }): Promise<void>;
+
+    request(params: RequestParam | string): Promise<any>;
+
+    requestPayment(params: {
+        timeStamp: string;
+        nonceStr: string;
+        package: string;
+        signType: string;
+        paySign: string;
+    }): Promise<void>;
+
+    scanCode(params: {
+        onlyFromCamera?: boolean;
+        scanType?: string[];
+    }): Promise<{
+        result: string;
+        scanType: string;
+        charSet: string;
+        path: string;
+    }>;
+
+    setNavigationBarAlpha(params: { alpha: number }): Promise<void>;
+
+    setNavigationBarColor(params: { color: number }): Promise<void>;
+
+    setNavigationBarTitle(params: { title: string }): Promise<void>;
+
+    setStorage(params: { key: string; data: string | object }): Promise<void>;
+
+    showActionSheet(params: {
+        itemList: string[];
+        itemColor: string;
+    }): Promise<void>;
+
+    showLoading(params: { title: string }): Promise<void>;
+
+    showModal(params: {
+        title: string;
+        content: string;
+        showCancel?: boolean;
+        cancelText?: string;
+        cancelColor?: string;
+        confirmText?: string;
+        confirmColor?: string;
+    }): Promise<{ confirm: boolean; cancel: boolean }>;
+
+    showNavigationBarLoading(): Promise<void>;
+
+    showToast(params: {
+        title: string;
+        icon?: "success" | "loading" | "none";
+        image?: string;
+        duration?: number;
+        mask?: boolean;
+    }): Promise<void>;
+
+    switchTab(params: UrlParam): Promise<void>;
+}
diff --git a/types/whatwg-streams/index.d.ts b/types/whatwg-streams/index.d.ts
index 8b61b9d657..008029b2d9 100644
--- a/types/whatwg-streams/index.d.ts
+++ b/types/whatwg-streams/index.d.ts
@@ -12,9 +12,9 @@ export interface ReadableStreamSource<R = ArrayBufferView> {
     cancel?(reason: any): void | Promise<any>;
 }
 
-export interface ReadableByteStreamSource<R = ArrayBufferView> {
-    start?(controller: ReadableByteStreamController<R>): void | Promise<any>;
-    pull?(controller: ReadableByteStreamController<R>): void | Promise<any>;
+export interface ReadableByteStreamSource {
+    start?(controller: ReadableByteStreamController): void | Promise<any>;
+    pull?(controller: ReadableByteStreamController): void | Promise<any>;
     cancel?(reason: any): void | Promise<any>;
 
     type: "bytes";
@@ -37,9 +37,14 @@ export interface WritableReadablePair<T extends WritableStream<any>, U extends R
     readable: U;
 }
 
+export interface ReadResult<T> {
+    done: boolean;
+    value: T;
+}
+
 declare class ReadableStream<R = ArrayBufferView> {
     constructor(underlyingSource?: ReadableStreamSource<R>, strategy?: QueuingStrategy<R>);
-    constructor(underlyingSource?: ReadableByteStreamSource<R>, strategy?: QueuingStrategy<R>);
+    constructor(underlyingSource?: ReadableByteStreamSource, strategy?: QueuingStrategy<R>);
 
     readonly locked: boolean;
 
@@ -57,7 +62,7 @@ declare class ReadableStreamDefaultReader<R = ArrayBufferView> {
     readonly closed: Promise<void>;
 
     cancel(reason: any): Promise<void>;
-    read(): Promise<IteratorResult<R>>;
+    read(): Promise<ReadResult<R>>;
     releaseLock(): void;
 }
 
@@ -67,7 +72,7 @@ declare class ReadableStreamBYOBReader<R = ArrayBufferView> {
     readonly closed: Promise<void>;
 
     cancel(reason: any): Promise<void>;
-    read<T extends ArrayBufferView>(view: T): Promise<IteratorResult<T>>;
+    read<T extends ArrayBufferView>(view: T): Promise<ReadResult<T>>;
     releaseLock(): void;
 }
 
@@ -79,17 +84,17 @@ declare class ReadableStreamDefaultController<R = ArrayBufferView> {
     error(e: any): void;
 }
 
-declare class ReadableByteStreamController<R = ArrayBufferView> {
-    readonly byobRequest: ReadableStreamBYOBRequest<R>;
+declare class ReadableByteStreamController {
+    readonly byobRequest: ReadableStreamBYOBRequest | undefined;
     readonly desiredSize: number | null;
 
     close(): void;
-    enqueue(chunk: R): void;
+    enqueue(chunk: ArrayBufferView): void;
     error(e: any): void;
 }
 
-declare class ReadableStreamBYOBRequest<R = ArrayBufferView> {
-    readonly view: R;
+declare class ReadableStreamBYOBRequest {
+    readonly view: Uint8Array;
 
     respond(bytesWritten: number): void;
     respondWithNewView(view: ArrayBufferView): void;
diff --git a/types/whatwg-streams/whatwg-streams-tests.ts b/types/whatwg-streams/whatwg-streams-tests.ts
index c6e83a89d3..be749686cc 100644
--- a/types/whatwg-streams/whatwg-streams-tests.ts
+++ b/types/whatwg-streams/whatwg-streams-tests.ts
@@ -187,14 +187,14 @@ function makeReadableByteFileStream(filename: string) {
         pull(controller: ReadableByteStreamController) {
             // Even when the consumer is using the default reader, the auto-allocation
             // feature allocates a buffer and passes it to us via byobRequest.
-            const v = controller.byobRequest.view;
+            const v = controller.byobRequest!.view;
 
             return fs.read(fd, <any>v.buffer, v.byteOffset, v.byteLength, position).then(bytesRead => {
                 if (bytesRead === 0) {
                     return fs.close(fd).then(() => controller.close());
                 } else {
                     position += bytesRead;
-                    controller.byobRequest.respond(bytesRead);
+                    controller.byobRequest!.respond(bytesRead);
                 }
             });
         },
diff --git a/types/when/index.d.ts b/types/when/index.d.ts
index 0b016a9ea0..117c929cbe 100644
--- a/types/when/index.d.ts
+++ b/types/when/index.d.ts
@@ -3,13 +3,8 @@
 // Definitions by: Derek Cicerone <https://github.com/derekcicerone>, Wim Looman <https://github.com/Nemo157>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-declare function When<T>(value: When.Promise<T>): When.Promise<T>;
-declare function When<T>(value: When.Thenable<T>): When.Promise<T>;
-declare function When<T>(value: T): When.Promise<T>;
-
-declare function When<T, U>(value: When.Promise<T>, transform: (val: T) => U): When.Promise<U>;
-declare function When<T, U>(value: When.Thenable<T>, transform: (val: T) => U): When.Promise<U>;
-declare function When<T, U>(value: T, transform: (val: T) => U): When.Promise<U>;
+declare function When<T>(promiseOrValue: T | When.Promise<T> | When.Thenable<T>): When.Promise<T>;
+declare function When<T, U>(promiseOrValue: T | When.Promise<T> | When.Thenable<T>, transform: (val: T) => U): When.Promise<U>;
 
 declare namespace When {
     // Helper interfaces
@@ -236,9 +231,7 @@ declare namespace When {
      *    - fulfilled with promiseOrValue's value after it is fulfilled
      *    - rejected with promiseOrValue's reason after it is rejected
      */
-    function resolve<T>(promise: Promise<T>): Promise<T>;
-    function resolve<T>(foreign: Thenable<T>): Promise<T>;
-    function resolve<T>(value?: T): Promise<T>;
+    function resolve<T>(promiseOrValue: T | Promise<T> | Thenable<T>): Promise<T>;
 
     interface Deferred<T> {
         notify(update: any): void;
diff --git a/types/when/when-tests.ts b/types/when/when-tests.ts
index e1e3f0fd7c..416758aadb 100644
--- a/types/when/when-tests.ts
+++ b/types/when/when-tests.ts
@@ -33,6 +33,7 @@ class Data implements IData {
 var promise: when.Promise<number>;
 var promise2: when.Promise<Data>;
 var foreign = new ForeignPromise<number>(1);
+var promiseOrValue = 1 as number | when.Promise<number>;
 var error = new Error("boom!");
 var example: () => void;
 var native: Promise<number>;
@@ -46,12 +47,14 @@ var native: Promise<number>;
 promise = when(1);
 promise = when(when(1));
 promise = when(foreign);
+promise = when(promiseOrValue);
 
 /* when(x, f) */
 
 promise = when(1, val => val + val);
 promise = when(when(1), val => val + val);
 promise = when(foreign, val => val + val);
+promise = when(promiseOrValue, val => val + val);
 
 /* when.try(f, ...args) */
 
@@ -204,6 +207,7 @@ promise = when.promise<number>((resolve, reject) => reject(error));
 promise = when.resolve(1);
 promise = when.resolve(promise);
 promise = when.resolve(foreign);
+promise = when.resolve(promiseOrValue);
 
 /* when.reject(error) */
 
diff --git a/types/which-pm/index.d.ts b/types/which-pm/index.d.ts
new file mode 100644
index 0000000000..c1eaea5dd0
--- /dev/null
+++ b/types/which-pm/index.d.ts
@@ -0,0 +1,14 @@
+// Type definitions for which-pm 1.0
+// Project: https://github.com/zkochan/which-pm#readme
+// Definitions by: Jorge Gonzalez <https://github.com/jorgegonzalez>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+interface PMInfo {
+    name: string;
+    version?: string;
+}
+
+declare function whichpm(pkgPath: string): Promise<PMInfo | null>;
+
+export = whichpm;
diff --git a/types/which-pm/tsconfig.json b/types/which-pm/tsconfig.json
new file mode 100644
index 0000000000..553003f652
--- /dev/null
+++ b/types/which-pm/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",
+        "which-pm-tests.ts"
+    ]
+}
diff --git a/types/which-pm/tslint.json b/types/which-pm/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/which-pm/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/which-pm/which-pm-tests.ts b/types/which-pm/which-pm-tests.ts
new file mode 100644
index 0000000000..7f91b09e64
--- /dev/null
+++ b/types/which-pm/which-pm-tests.ts
@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import whichpm = require("which-pm");
+
+whichpm(process.cwd())
+    .then(pm => {
+        pm; // $ExpectType PMInfo | null
+        if (pm !== null && pm !== undefined) {
+            pm.name; // $ExpectType string
+            pm.version; // $ExpectType string | undefined
+        }
+    })
+    .catch(err => console.error(err));
+
+const _wpm = whichpm(process.cwd()); // $ExpectType Promise<PMInfo | null>
diff --git a/types/why-did-you-update/index.d.ts b/types/why-did-you-update/index.d.ts
index f7f4fb820a..f9d1a60939 100644
--- a/types/why-did-you-update/index.d.ts
+++ b/types/why-did-you-update/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/garbles/why-did-you-update
 // Definitions by: rhysd <https://rhysd.github.io>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 /// <reference types="react" />
 
diff --git a/types/wif/index.d.ts b/types/wif/index.d.ts
new file mode 100644
index 0000000000..21b4175905
--- /dev/null
+++ b/types/wif/index.d.ts
@@ -0,0 +1,27 @@
+// Type definitions for wif 2.0
+// Project: https://github.com/bitcoinjs/wif
+// Definitions by: Daniel Byrne <https://github.com/danwbyrne>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/// <reference types="node"/>
+
+export interface WIFReturn {
+    readonly version: number;
+    readonly privateKey: Buffer;
+    readonly compressed: boolean;
+}
+
+export function decodeRaw(buffer: Buffer, version?: number): WIFReturn;
+export function decode(string: string, version: number): WIFReturn;
+
+export function encodeRaw(
+    version: number,
+    privateKey: Buffer,
+    compressed: boolean
+): Buffer;
+
+export function encode(
+    version: number | WIFReturn,
+    privateKey: Buffer,
+    compressed: boolean
+): Buffer;
diff --git a/types/wif/tsconfig.json b/types/wif/tsconfig.json
new file mode 100644
index 0000000000..f412a0b7cc
--- /dev/null
+++ b/types/wif/tsconfig.json
@@ -0,0 +1,19 @@
+{
+  "compilerOptions": {
+    "module": "commonjs",
+    "lib": ["es6"],
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "strictNullChecks": true,
+    "strictFunctionTypes": true,
+    "baseUrl": "../",
+    "typeRoots": ["../"],
+    "types": [],
+    "noEmit": true,
+    "forceConsistentCasingInFileNames": true
+  },
+  "files": [
+		"index.d.ts",
+		"wif-tests.ts"
+	]
+}
diff --git a/types/wif/tslint.json b/types/wif/tslint.json
new file mode 100644
index 0000000000..d88586e5bd
--- /dev/null
+++ b/types/wif/tslint.json
@@ -0,0 +1,3 @@
+{
+  "extends": "dtslint/dt.json"
+}
diff --git a/types/wif/wif-tests.ts b/types/wif/wif-tests.ts
new file mode 100644
index 0000000000..b833d7b1f5
--- /dev/null
+++ b/types/wif/wif-tests.ts
@@ -0,0 +1,16 @@
+import wif = require('wif');
+
+const testString = 'test';
+const testBuffer = Buffer.from(testString);
+
+// $ExpectType WIFReturn
+wif.decodeRaw(testBuffer);
+// $ExpectType WIFReturn
+wif.decodeRaw(testBuffer, 0);
+// $ExpectType WIFReturn
+wif.decode(testString, 0);
+
+// $ExpectType Buffer
+wif.encodeRaw(1, testBuffer, true);
+// $ExpectType Buffer
+wif.encode(1, testBuffer, true);
diff --git a/types/wink-tokenizer/index.d.ts b/types/wink-tokenizer/index.d.ts
new file mode 100644
index 0000000000..11b9236cdc
--- /dev/null
+++ b/types/wink-tokenizer/index.d.ts
@@ -0,0 +1,135 @@
+// Type definitions for wink-tokenizer 4.0
+// Project: http://winkjs.org/
+// Definitions by: Luca Lindhorst <https://github.com/lal12>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare class Tokenizer {
+	/**
+	 * create a tokenizer instance
+	 */
+	constructor();
+
+	/**
+	 * Tokenize a string
+	 * @param sentence to be tokenized
+	 * @returns tokens
+	 */
+	tokenize(sentence: string): Tokenizer.Token[];
+
+	/**
+	 * Defines the configuration in terms of the types of token that will be extracted by tokenize() method.
+	 * Note by default, all types of tokens will be detected and tagged automatically.
+	 * @param config configuration object
+	 * @returns number of true parameters
+	 */
+	defineConfig(config: Tokenizer.Config): number;
+
+	/**
+	 * Returns the finger print of the tokens generated by the last call to tokenize().
+	 * A finger print is a string created by sequentially joining the unique code of each token's type.
+	 *
+	 * currency: 'r', email: 'e', emoji: 'j', emoticon: 'c',
+	 * hashtag: 'h', number: 'n', ordinal: 'o',
+	 * punctuation: token becomes fingerprint,
+	 * quoted_phrase: 'q', symbol: token becomes fingerprint,
+	 * time: 't', mention: 'm', url: 'u', word: 'w',
+	 * @return string of token types
+	 */
+	getTokensFP(): string;
+}
+
+declare namespace Tokenizer {
+	type Tag = "word" | "email" | "emoji" | "punctuation"
+		| "number" | "time" | "hashtag" | "mention" | "emoticon" | "ordinal"
+		| "quoted_phrase" | "url" | "symbol" | "currency" | "alien";
+
+	interface Token {
+		value: string;
+		tag: Tag;
+	}
+
+	/**
+	 * It defines 0 or more properties from the list of 14 properties.
+	 * A true value for a property ensures tokenization for that type of text;
+	 * whereas false value will mean that the tokenization of that type of text will not be attempted.
+	 *
+	 * An empty config object is equivalent to splitting on spaces.
+	 * Whatever tokens are created like this are tagged as alien
+	 * and z is the finger print code of this token type.
+	 */
+	interface Config {
+		/**
+		 * such as $ or £ symbols
+		 * @default true
+		 */
+		currency?: boolean;
+
+		/**
+		 * @default true
+		 */
+		email?: boolean;
+
+		/**
+		 * @default true
+		 */
+		emoji?: boolean;
+
+		/**
+		 * @default true
+		 */
+		emoticon?: boolean;
+
+		/**
+		 * @default true
+		 */
+		hashtag?: boolean;
+
+		/**
+		 * @default true
+		 */
+		number?: boolean;
+
+		/**
+		 * ordinals like 1st , 2nd , 3rd , 4th or 12th or 91st
+		 * @default true
+		 */
+		ordinal?: boolean;
+
+		/**
+		 * @default true
+		 */
+		punctuation?: boolean;
+
+		/**
+		 * @default true
+		 */
+		quoted_phrase?: boolean;
+
+		/**
+		 * @default true
+		 */
+		symbol?: boolean;
+
+		/**
+		 * @default true
+		 */
+		time?: boolean;
+
+		/**
+		 * @default true
+		 */
+		mention?: boolean;
+
+		/**
+		 * @default true
+		 */
+		url?: boolean;
+
+		/**
+		 * @default true
+		 */
+		word?: boolean;
+	}
+}
+
+export = Tokenizer;
diff --git a/types/wink-tokenizer/tsconfig.json b/types/wink-tokenizer/tsconfig.json
new file mode 100644
index 0000000000..5ec43876c0
--- /dev/null
+++ b/types/wink-tokenizer/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",
+        "wink-tokenizer-tests.ts"
+    ]
+}
diff --git a/types/wink-tokenizer/tslint.json b/types/wink-tokenizer/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/wink-tokenizer/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/wink-tokenizer/wink-tokenizer-tests.ts b/types/wink-tokenizer/wink-tokenizer-tests.ts
new file mode 100644
index 0000000000..755127370e
--- /dev/null
+++ b/types/wink-tokenizer/wink-tokenizer-tests.ts
@@ -0,0 +1,11 @@
+import * as Tokenizer from "wink-tokenizer";
+
+const tokenizer = new Tokenizer();
+
+tokenizer.defineConfig({
+	currency: false
+});
+
+tokenizer.tokenize("asd asd asd ads");
+
+tokenizer.getTokensFP();
diff --git a/types/winston-dynamodb/package.json b/types/winston-dynamodb/package.json
new file mode 100644
index 0000000000..33e1a4f018
--- /dev/null
+++ b/types/winston-dynamodb/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/winston": "^2.3.9"
+    }
+}
diff --git a/types/winston-mail/index.d.ts b/types/winston-mail/index.d.ts
new file mode 100644
index 0000000000..3faaffee29
--- /dev/null
+++ b/types/winston-mail/index.d.ts
@@ -0,0 +1,53 @@
+// Type definitions for winston-mail 1.5
+// Project: https://github.com/wavded/winston-mail#readme
+// Definitions by: Sorin Sandru <https://github.com/idono87>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+import * as winston from "winston";
+
+export as namespace winstonMail;
+
+export class Mail extends winston.Transport
+    implements winston.TransportInstance {
+    constructor(options: MailTransportOptions);
+    name: string;
+    to: string;
+    from: string;
+    level: string;
+    unique: boolean;
+    silent: boolean;
+    filter: ((obj: { level: string; message: string; meta: any }) => boolean);
+    subject: string;
+    html: boolean;
+    log(level: any, msg: any, meta: any, callback: any): any;
+}
+
+export interface MailTransportOptions {
+    name?: string;
+    to: string;
+    from?: string;
+    level?: string;
+    silent?: boolean;
+    handleExceptions?: boolean;
+    host?: string;
+    port?: number;
+    username?: string;
+    password?: string;
+    subject?: string;
+    ssl?: boolean | { key: string; ca: string; cert: string };
+    tls?: boolean | { ciphers: string };
+    unique?: boolean;
+    filter?: ((obj: { level: string; message: string; meta: any }) => boolean);
+    html?: boolean;
+    timeout?: number;
+    authentication?: string[];
+    formatter?: ((
+        obj: { level: string; message: string; meta: any }
+    ) => string);
+}
+
+declare module "winston" {
+    interface Transports {
+        Mail: winstonMail.Mail;
+    }
+}
diff --git a/types/winston-mail/package.json b/types/winston-mail/package.json
new file mode 100644
index 0000000000..33e1a4f018
--- /dev/null
+++ b/types/winston-mail/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/winston": "^2.3.9"
+    }
+}
diff --git a/types/winston-mail/tsconfig.json b/types/winston-mail/tsconfig.json
new file mode 100644
index 0000000000..89b4c0a16e
--- /dev/null
+++ b/types/winston-mail/tsconfig.json
@@ -0,0 +1,16 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": ["es6"],
+        "strictFunctionTypes": true,
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": ["../"],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": ["index.d.ts", "winston-mail-tests.ts"]
+}
diff --git a/types/winston-mail/tslint.json b/types/winston-mail/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/winston-mail/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/winston-mail/winston-mail-tests.ts b/types/winston-mail/winston-mail-tests.ts
new file mode 100644
index 0000000000..0a647378df
--- /dev/null
+++ b/types/winston-mail/winston-mail-tests.ts
@@ -0,0 +1,53 @@
+import winstonMail = require("winston-mail");
+import winston = require("winston");
+import { Transform } from "stream";
+
+let mail: winstonMail.Mail = new winstonMail.Mail({ to: "test" });
+
+winston.add(mail);
+
+// $ExpectError
+mail = new winstonMail.Mail({});
+
+let mailOptions: winstonMail.MailTransportOptions = {
+    name: "test",
+    to: "test",
+    from: "test",
+    level: "test",
+    silent: true,
+    handleExceptions: true,
+    host: "test",
+    port: 10202,
+    username: "test",
+    password: "test",
+    subject: "test",
+    ssl: false,
+    tls: false,
+    unique: false,
+    filter: (obj: { level: string; message: string; meta: any }): boolean => {
+        return false;
+    },
+    html: true,
+    timeout: 5000,
+    authentication: ["test"],
+    formatter: (obj: { level: string; message: string; meta: any }): string => {
+        return "test";
+    }
+};
+
+mailOptions = {
+    to: "test",
+    ssl: { key: "test", ca: "test", cert: "test" },
+    tls: { ciphers: "test" }
+};
+
+mail = new winstonMail.Mail(mailOptions);
+
+mailOptions = {
+    test: "test" // $ExpectError
+};
+
+let transport: winston.TransportInstance = new winstonMail.Mail({ to: "test" });
+transport = winston.transports.Console;
+
+mail.log("test", "test", "test", "test");
diff --git a/types/winston-syslog/index.d.ts b/types/winston-syslog/index.d.ts
index 816274ded8..b0409ad4c4 100644
--- a/types/winston-syslog/index.d.ts
+++ b/types/winston-syslog/index.d.ts
@@ -1,25 +1,32 @@
-// Type definitions for winston-syslog 1.0
-// Project: https://github.com/indexzero/winston-syslog#readme
-// Definitions by: Chris Barth <https://github.com/cjbarth>
+// Type definitions for winston-syslog 2.0
+// Project: https://github.com/winstonjs/winston-syslog
+// Definitions by: Chris Barth <https://github.com/cjbarth>, Felix Hochgruber <https://github.com/felix-hoc>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-import * as winston from "winston";
-export interface SyslogTransportOptions extends winston.GenericTextTransportOptions {
-	host?: string;
-	port?: number;
-	path?: string;
-	protocol?: string;
-	pid?: number;
-	facility?: string;
-	localhost?: string;
-	type?: string;
-	app_name?: string;
-	eol?: string;
+import * as Transport from 'winston-transport';
+import * as dgram from 'dgram';
+import * as net from 'net';
+
+export interface SyslogTransportOptions extends Transport.TransportStreamOptions {
+    host?: string;
+    port?: number;
+    path?: string;
+    protocol?: string;
+    pid?: number;
+    facility?: string;
+    localhost?: string;
+    type?: string;
+    app_name?: string;
+    eol?: string;
 }
-export class Syslog extends winston.Transport implements winston.TransportInstance {
-}
-declare module "winston" {
-	interface Transports {
-		Syslog: Syslog;
-	}
+
+export interface SyslogTransportInstance extends Transport {
+    producer: any;
+    socket: dgram.Socket | net.Socket;
+
+    connect(callback: (err: (true | null)) => any): void;
+
+    new(options?: SyslogTransportOptions): SyslogTransportInstance;
 }
+
+export const Syslog: SyslogTransportInstance;
diff --git a/types/winston-syslog/package.json b/types/winston-syslog/package.json
new file mode 100644
index 0000000000..0aa4cf368f
--- /dev/null
+++ b/types/winston-syslog/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "winston": "^3.0.0"
+    }
+}
diff --git a/types/winston-syslog/tsconfig.json b/types/winston-syslog/tsconfig.json
index e11a89c680..2c0a6050a4 100644
--- a/types/winston-syslog/tsconfig.json
+++ b/types/winston-syslog/tsconfig.json
@@ -6,7 +6,7 @@
         ],
         "noImplicitAny": true,
         "noImplicitThis": true,
-        "strictNullChecks": false,
+        "strictNullChecks": true,
         "strictFunctionTypes": true,
         "baseUrl": "../",
         "typeRoots": [
@@ -21,4 +21,4 @@
         "index.d.ts",
         "winston-syslog-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/winston-syslog/tslint.json b/types/winston-syslog/tslint.json
index f93cf8562a..bf5a9b916f 100644
--- a/types/winston-syslog/tslint.json
+++ b/types/winston-syslog/tslint.json
@@ -1,3 +1,8 @@
 {
-    "extends": "dtslint/dt.json"
+    "extends": "dtslint/dt.json",
+    "rules": {
+        // This allows to be in line with winston transport types.
+        // See https://github.com/winstonjs/winston-mongodb/blob/master/lib/winston-mongodb.d.ts and https://github.com/winstonjs/winston-daily-rotate-file/blob/master/index.d.ts
+        "no-misused-new": false
+    }
 }
diff --git a/types/winston-syslog/v1/index.d.ts b/types/winston-syslog/v1/index.d.ts
new file mode 100644
index 0000000000..b2d5ecfb90
--- /dev/null
+++ b/types/winston-syslog/v1/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for winston-syslog 1.0
+// Project: https://github.com/indexzero/winston-syslog#readme
+// Definitions by: Chris Barth <https://github.com/cjbarth>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.9
+
+import * as winston from "winston";
+export interface SyslogTransportOptions extends winston.GenericTextTransportOptions {
+	host?: string;
+	port?: number;
+	path?: string;
+	protocol?: string;
+	pid?: number;
+	facility?: string;
+	localhost?: string;
+	type?: string;
+	app_name?: string;
+	eol?: string;
+}
+export class Syslog extends winston.Transport implements winston.TransportInstance {
+}
+declare module "winston" {
+	interface Transports {
+		Syslog: Syslog;
+	}
+}
diff --git a/types/winston-syslog/v1/package.json b/types/winston-syslog/v1/package.json
new file mode 100644
index 0000000000..a39b614c7e
--- /dev/null
+++ b/types/winston-syslog/v1/package.json
@@ -0,0 +1,6 @@
+{
+    "private": true,
+    "dependencies": {
+        "@types/winston": "2.3.9"
+    }
+}
diff --git a/types/winston-syslog/v1/tsconfig.json b/types/winston-syslog/v1/tsconfig.json
new file mode 100644
index 0000000000..610ded1b9b
--- /dev/null
+++ b/types/winston-syslog/v1/tsconfig.json
@@ -0,0 +1,32 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": false,
+        "strictFunctionTypes": true,
+        "baseUrl": "../../",
+        "typeRoots": [
+            "../../"
+        ],
+        "types": [],
+        "paths": {
+            "winston-syslog": [
+                "winston-syslog/v1"
+            ],
+            "winston-syslog/*": [
+                "winston-syslog/v1/*"
+            ]
+        },
+        "noEmit": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "winston-syslog-tests.ts"
+    ]
+}
diff --git a/types/winston-syslog/v1/tslint.json b/types/winston-syslog/v1/tslint.json
new file mode 100644
index 0000000000..f93cf8562a
--- /dev/null
+++ b/types/winston-syslog/v1/tslint.json
@@ -0,0 +1,3 @@
+{
+    "extends": "dtslint/dt.json"
+}
diff --git a/types/winston-syslog/v1/winston-syslog-tests.ts b/types/winston-syslog/v1/winston-syslog-tests.ts
new file mode 100644
index 0000000000..a08b80b045
--- /dev/null
+++ b/types/winston-syslog/v1/winston-syslog-tests.ts
@@ -0,0 +1,35 @@
+import winston = require('winston');
+import { SyslogTransportOptions } from 'winston-syslog';
+
+const str = "";
+const bool  = true;
+const num = 1;
+const obj: any = {};
+
+const syslogOptions: SyslogTransportOptions = {
+    host: str,
+    port: num,
+    path: str,
+    protocol: str,
+    pid: num,
+    facility: str,
+    localhost: str,
+    type: str,
+    app_name: str,
+    eol: str,
+    json: bool,
+    colorize: bool,
+    colors: str,
+    prettyPrint: bool,
+    showLevel: bool,
+    label: str,
+    depth: num,
+};
+
+winston.add(winston.transports.Syslog, syslogOptions);
+
+const logger: winston.LoggerInstance = new (winston.Logger)({
+  transports: [
+    new (winston.transports.Syslog)(syslogOptions),
+  ]
+});
diff --git a/types/winston-syslog/winston-syslog-tests.ts b/types/winston-syslog/winston-syslog-tests.ts
index a08b80b045..66a4a71e17 100644
--- a/types/winston-syslog/winston-syslog-tests.ts
+++ b/types/winston-syslog/winston-syslog-tests.ts
@@ -1,5 +1,5 @@
 import winston = require('winston');
-import { SyslogTransportOptions } from 'winston-syslog';
+import { Syslog, SyslogTransportOptions } from 'winston-syslog';
 
 const str = "";
 const bool  = true;
@@ -16,20 +16,15 @@ const syslogOptions: SyslogTransportOptions = {
     localhost: str,
     type: str,
     app_name: str,
-    eol: str,
-    json: bool,
-    colorize: bool,
-    colors: str,
-    prettyPrint: bool,
-    showLevel: bool,
-    label: str,
-    depth: num,
+    eol: str
 };
 
-winston.add(winston.transports.Syslog, syslogOptions);
+const syslogTransport = new Syslog(syslogOptions);
 
-const logger: winston.LoggerInstance = new (winston.Logger)({
+winston.add(syslogTransport);
+
+const logger: winston.Logger = winston.createLogger({
   transports: [
-    new (winston.transports.Syslog)(syslogOptions),
+    syslogTransport
   ]
 });
diff --git a/types/winston/index.d.ts b/types/winston/index.d.ts
deleted file mode 100644
index dd6ab0e1aa..0000000000
--- a/types/winston/index.d.ts
+++ /dev/null
@@ -1,506 +0,0 @@
-// Type definitions for winston 2.3
-// Project: https://github.com/flatiron/winston
-// Definitions by: bonnici <https://github.com/bonnici>, Peter Harris <https://github.com/codeanimal>, DABH <https://github.com/DABH>
-// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-
-// Imported from: https://github.com/soywiz/typescript-node-definitions/winston.d.ts
-
-/// <reference types="node" />
-
-import { Agent } from 'http';
-
-declare namespace winston {
-    interface AbstractConfigSetLevels {
-        [key: string]: number;
-    }
-
-    interface AbstractConfigSetColors {
-        [key: string]: string | string[];
-    }
-
-    interface AbstractConfigSet {
-        levels: AbstractConfigSetLevels;
-        colors: AbstractConfigSetColors;
-    }
-
-    interface CliConfigSetLevels extends AbstractConfigSetLevels {
-        error: number;
-        warn: number;
-        help: number;
-        data: number;
-        info: number;
-        debug: number;
-        prompt: number;
-        verbose: number;
-        input: number;
-        silly: number;
-    }
-
-    interface CliConfigSetColors extends AbstractConfigSetColors {
-        error: string | string[];
-        warn: string | string[];
-        help: string | string[];
-        data: string | string[];
-        info: string | string[];
-        debug: string | string[];
-        prompt: string | string[];
-        verbose: string | string[];
-        input: string | string[];
-        silly: string | string[];
-    }
-    interface NpmConfigSetLevels extends AbstractConfigSetLevels {
-        error: number;
-        warn: number;
-        info: number;
-        verbose: number;
-        debug: number;
-        silly: number;
-    }
-    interface NpmConfigSetColors extends AbstractConfigSetColors {
-        error: string | string[];
-        warn: string | string[];
-        info: string | string[];
-        verbose: string | string[];
-        debug: string | string[];
-        silly: string | string[];
-    }
-    interface SyslogConfigSetLevels extends AbstractConfigSetLevels {
-        emerg: number;
-        alert: number;
-        crit: number;
-        error: number;
-        warning: number;
-        notice: number;
-        info: number;
-        debug: number;
-    }
-    interface SyslogConfigSetColors extends AbstractConfigSetColors {
-        emerg: string | string[];
-        alert: string | string[];
-        crit: string | string[];
-        error: string | string[];
-        warning: string | string[];
-        notice: string | string[];
-        info: string | string[];
-        debug: string | string[];
-    }
-
-    interface Winston {
-        config: Config;
-        transports: Transports;
-        Transport: TransportStatic;
-        Logger: LoggerStatic;
-        Container: ContainerStatic;
-        loggers: ContainerInstance;
-        default: LoggerInstance;
-
-        exception: Exception;
-
-        exitOnError: boolean;
-        level: string;
-
-        log: LogMethod;
-
-        silly: LeveledLogMethod;
-        debug: LeveledLogMethod;
-        verbose: LeveledLogMethod;
-        info: LeveledLogMethod;
-        warn: LeveledLogMethod;
-        error: LeveledLogMethod;
-
-        query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
-        query(callback: (err: Error, results: any) => void): any;
-        stream(options?: any): NodeJS.ReadableStream;
-        handleExceptions(...transports: TransportInstance[]): void;
-        unhandleExceptions(...transports: TransportInstance[]): void;
-        add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
-        clear(): void;
-        remove(transport: string | TransportInstance): LoggerInstance;
-        startTimer(): ProfileHandler;
-        profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
-        addColors(target: AbstractConfigSetColors): any;
-        setLevels(target: AbstractConfigSetLevels): any;
-        cli(): LoggerInstance;
-        close(): void;
-        configure(options: LoggerOptions): void;
-    }
-
-    type CLILoggingLevel = 'error' | 'warn' | 'help' | 'data' | 'info' | 'debug' | 'prompt' | 'verbose' | 'input' | 'silly';
-    type NPMLoggingLevel = 'error' | 'warn' | 'info' | 'verbose' | 'debug' | 'silly';
-    type SyslogLoggingLevel = 'emerg' | 'alert' | 'crit' | 'error' | 'warning' | 'notice' | 'info' | 'debug';
-
-    interface Config {
-        allColors: AbstractConfigSetColors;
-        cli: {levels: CliConfigSetLevels, colors: CliConfigSetColors};
-        npm: {levels: NpmConfigSetLevels, colors: NpmConfigSetColors};
-        syslog: {levels: SyslogConfigSetLevels, colors: SyslogConfigSetColors};
-
-        addColors(colors: AbstractConfigSetColors): void;
-        colorize(level: number, message?: string): string;
-    }
-
-    interface ExceptionProcessInfo {
-        pid: number;
-        uid?: number;
-        gid?: number;
-        cwd: string;
-        execPath: string;
-        version: string;
-        argv: string;
-        memoryUsage: NodeJS.MemoryUsage;
-    }
-
-    interface ExceptionOsInfo {
-        loadavg: [number, number, number];
-        uptime: number;
-    }
-
-    interface ExceptionTrace {
-        column: number;
-        file: string;
-        "function": string;
-        line: number;
-        method: string;
-        native: boolean;
-    }
-
-    interface ExceptionAllInfo {
-        date: Date;
-        process: ExceptionProcessInfo;
-        os: ExceptionOsInfo;
-        trace: ExceptionTrace[];
-        stack: string[];
-    }
-
-    interface Exception {
-        getAllInfo(err: Error): ExceptionAllInfo;
-        getProcessInfo(): ExceptionProcessInfo;
-        getOsInfo(): ExceptionOsInfo;
-        getTrace(err: Error): ExceptionTrace[];
-    }
-
-    type MetadataRewriter = (level: string, msg: string, meta: any) => any;
-
-    type MetadataFilter = (level: string, msg: string, meta: any) => string | { msg: any; meta: any; };
-
-    interface LoggerStatic {
-        new (options?: LoggerOptions): LoggerInstance;
-    }
-
-    interface LoggerInstance extends NodeJS.EventEmitter {
-        rewriters: MetadataRewriter[];
-        filters: MetadataFilter[];
-        transports: {[key: string]: TransportInstance};
-
-        extend(target: any): LoggerInstance;
-
-        log: LogMethod;
-
-        // for cli levels
-        error: LeveledLogMethod;
-        warn: LeveledLogMethod;
-        help: LeveledLogMethod;
-        data: LeveledLogMethod;
-        info: LeveledLogMethod;
-        debug: LeveledLogMethod;
-        prompt: LeveledLogMethod;
-        verbose: LeveledLogMethod;
-        input: LeveledLogMethod;
-        silly: LeveledLogMethod;
-
-        // for syslog levels only
-        emerg: LeveledLogMethod;
-        alert: LeveledLogMethod;
-        crit: LeveledLogMethod;
-        warning: LeveledLogMethod;
-        notice: LeveledLogMethod;
-
-        query(options: QueryOptions, callback?: (err: Error, results: any) => void): any;
-        query(callback: (err: Error, results: any) => void): any;
-        stream(options?: any): NodeJS.ReadableStream;
-        close(): void;
-        handleExceptions(...transports: TransportInstance[]): void;
-        unhandleExceptions(...transports: TransportInstance[]): void;
-        add(transport: TransportInstance, options?: TransportOptions, created?: boolean): LoggerInstance;
-        clear(): void;
-        remove(transport: string | TransportInstance): LoggerInstance;
-        startTimer(): ProfileHandler;
-        profile(id: string, msg?: string, meta?: any, callback?: (err: Error, level: string, msg: string, meta: any) => void): LoggerInstance;
-        configure(options: LoggerOptions): void;
-        setLevels(target: AbstractConfigSetLevels): any;
-        cli(): LoggerInstance;
-
-        level: string;
-    }
-
-    interface LoggerOptions {
-        transports?: TransportInstance[];
-        rewriters?: MetadataRewriter[];
-        filters?: MetadataFilter[];
-        exceptionHandlers?: TransportInstance[];
-        handleExceptions?: boolean;
-        level?: string;
-        levels?: AbstractConfigSetLevels;
-
-        exitOnError?: boolean | ((err: Error) => void);
-
-        // TODO: Need to make instances specific,
-        //       and need to get options for each instance.
-        //       Unfortunately, the documentation is unhelpful.
-        [optionName: string]: any;
-    }
-
-    interface TransportStatic {
-        new(options?: TransportOptions): TransportInstance;
-    }
-
-    interface TransportInstance extends TransportStatic, NodeJS.EventEmitter {
-        silent: boolean;
-        raw: boolean;
-        name: string;
-        level?: string;
-        handleExceptions: boolean;
-        exceptionsLevel: string;
-        humanReadableUnhandledException: boolean;
-
-        formatQuery(query: (string | Object)): (string | Object);
-        formatter?(options?: any): string;
-        normalizeQuery(options: QueryOptions): QueryOptions;
-        formatResults(results: (Object | any[]), options?: Object): (Object | any[]);
-        logException(msg: string, meta: Object, callback: () => void): void;
-    }
-
-    interface ConsoleTransportInstance extends TransportInstance {
-        json: boolean;
-        colorize: boolean | 'all' | 'level' | 'message';
-        prettyPrint: boolean;
-        timestamp: boolean | (() => string | boolean);
-        showLevel: boolean;
-        label: string|null;
-        logstash: boolean;
-        depth: string|null;
-        align: boolean;
-        stderrLevels: { [key: string]: LeveledLogMethod; };
-        eol: string;
-
-        new(options?: ConsoleTransportOptions): ConsoleTransportInstance;
-        stringify?(obj: Object): string;
-    }
-
-    interface DailyRotateFileTransportInstance extends TransportInstance {
-        new(options?: DailyRotateFileTransportOptions): DailyRotateFileTransportInstance;
-    }
-
-    interface FileTransportInstance extends TransportInstance {
-        json: boolean;
-        logstash: boolean;
-        colorize: boolean | 'all' | 'level' | 'message';
-        maxsize: number|null;
-        rotationFormat: boolean;
-        zippedArchive: boolean;
-        maxFiles: number|null;
-        prettyPrint: boolean;
-        label: string|null;
-        timestamp: boolean | (() => string | boolean);
-        eol: string;
-        tailable: boolean;
-        depth: string|null;
-        showLevel: boolean;
-        maxRetries: number;
-
-        close(): void;
-        new(options?: FileTransportOptions): FileTransportInstance;
-        stringify?(obj: Object): string;
-    }
-
-    interface HttpTransportInstance extends TransportInstance {
-        name: string;
-        ssl: boolean;
-        host: string;
-        port: number;
-        auth?: {username: string, password: string};
-        path: string;
-        agent?: Agent|null;
-
-        new(options?: HttpTransportOptions): HttpTransportInstance;
-    }
-
-    interface MemoryTransportInstance extends TransportInstance {
-        errorOutput: GenericTextTransportOptions[];
-        writeOutput: GenericTextTransportOptions[];
-
-        json: boolean;
-        colorize: boolean | 'all' | 'level' | 'message';
-        prettyPrint: boolean;
-        timestamp: boolean | (() => string | boolean);
-        showLevel: boolean;
-        label: string|null;
-        depth: string|null;
-
-        new(options?: MemoryTransportOptions): MemoryTransportInstance;
-        stringify?(obj: Object): string;
-    }
-
-    interface WebhookTransportInstance extends TransportInstance {
-        new(options?: WebhookTransportOptions): WebhookTransportInstance;
-    }
-
-    interface WinstonModuleTrasportInstance extends TransportInstance {
-        new(options?: WinstonModuleTransportOptions): WinstonModuleTrasportInstance;
-    }
-
-    interface ContainerStatic {
-        new(options: LoggerOptions): ContainerInstance;
-    }
-
-    interface ContainerInstance extends ContainerStatic {
-        get(id: string, options?: LoggerOptions): LoggerInstance;
-        add(id: string, options: LoggerOptions): LoggerInstance;
-        has(id: string): boolean;
-        close(id: string): void;
-        options: LoggerOptions;
-        loggers: {[key: string]: LoggerInstance};
-        default: LoggerOptions;
-    }
-
-    interface Transports {
-        File: FileTransportInstance;
-        Console: ConsoleTransportInstance;
-        Loggly: WinstonModuleTrasportInstance;
-        DailyRotateFile: DailyRotateFileTransportInstance;
-        Http: HttpTransportInstance;
-        Memory: MemoryTransportInstance;
-        Webhook: WebhookTransportInstance;
-    }
-
-    type TransportOptions = ConsoleTransportOptions | DailyRotateFileTransportOptions | FileTransportOptions
-        | HttpTransportOptions | MemoryTransportOptions | WebhookTransportOptions | WinstonModuleTransportOptions;
-
-    interface GenericTransportOptions {
-        level?: string;
-        silent?: boolean;
-        raw?: boolean;
-        name?: string;
-        handleExceptions?: boolean;
-        exceptionsLevel?: string;
-        humanReadableUnhandledException?: boolean;
-
-        formatter?(options?: any): string;
-    }
-
-    interface GenericTextTransportOptions {
-        json?: boolean;
-        colorize?: boolean | 'all' | 'level' | 'message';
-        colors?: any;
-        prettyPrint?: boolean;
-        showLevel?: boolean;
-        label?: string;
-        depth?: number;
-
-        timestamp?: boolean | (() => string | boolean);
-        stringify?(obj: any): string;
-    }
-
-    interface GenericNetworkTransportOptions {
-        host?: string;
-        port?: number;
-        auth?: {
-            username: string;
-            password: string;
-        };
-        path?: string;
-    }
-
-    interface ConsoleTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-        logstash?: boolean;
-        debugStdout?: boolean;
-    }
-
-    interface DailyRotateFileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-        logstash?: boolean;
-        maxsize?: number;
-        maxFiles?: number;
-        eol?: string;
-        maxRetries?: number;
-        datePattern?: string;
-        filename?: string;
-        dirname?: string;
-        options?: {
-            flags?: string;
-            highWaterMark?: number;
-        };
-        stream?: NodeJS.WritableStream;
-    }
-
-    interface FileTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-        logstash?: boolean;
-        maxsize?: number;
-        rotationFormat?: boolean;
-        zippedArchive?: boolean;
-        maxFiles?: number;
-        eol?: string;
-        tailable?: boolean;
-        maxRetries?: number;
-        filename?: string;
-        dirname?: string;
-        options?: {
-            flags?: string;
-            highWaterMark?: number;
-        };
-        stream?: NodeJS.WritableStream;
-    }
-
-    interface HttpTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
-        ssl?: boolean;
-    }
-
-    interface MemoryTransportOptions extends GenericTransportOptions, GenericTextTransportOptions {
-    }
-
-    interface WebhookTransportOptions extends GenericTransportOptions, GenericNetworkTransportOptions {
-        method?: string;
-        ssl?: {
-            key?: any;
-            cert?: any;
-            ca: any;
-        };
-    }
-
-    interface WinstonModuleTransportOptions extends GenericTransportOptions {
-        [optionName: string]: any;
-    }
-
-    interface QueryOptions {
-        rows?: number;
-        limit?: number;
-        start?: number;
-        from?: Date;
-        until?: Date;
-        order?: "asc" | "desc";
-        fields: any;
-    }
-
-    interface ProfileHandler {
-        logger: LoggerInstance;
-        start: Date;
-
-        done(msg: string): LoggerInstance;
-    }
-
-    interface LogMethod {
-        (level: string, msg: string, callback: LogCallback): LoggerInstance;
-        (level: string, msg: string, meta: any, callback: LogCallback): LoggerInstance;
-        (level: string, msg: string, ...meta: any[]): LoggerInstance;
-    }
-
-    interface LeveledLogMethod {
-        (msg: string, callback: LogCallback): LoggerInstance;
-        (msg: string, meta: any, callback: LogCallback): LoggerInstance;
-        (msg: string, ...meta: any[]): LoggerInstance;
-    }
-
-    type LogCallback = (error?: any, level?: string, msg?: string, meta?: any) => void;
-}
-
-declare const winston: winston.Winston;
-export = winston;
diff --git a/types/winston/tslint.json b/types/winston/tslint.json
deleted file mode 100644
index 38c1ea8606..0000000000
--- a/types/winston/tslint.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "extends": "dtslint/dt.json",
-    "rules": {
-        "ban-types": false,
-        "no-misused-new": false
-    }
-}
diff --git a/types/winston/winston-tests.ts b/types/winston/winston-tests.ts
deleted file mode 100644
index c9c8fcd0da..0000000000
--- a/types/winston/winston-tests.ts
+++ /dev/null
@@ -1,292 +0,0 @@
-import winston = require('winston');
-
-declare const str: string;
-let bool: boolean;
-declare const num: number;
-declare const metadata: any;
-const obj: any = {};
-declare const stamp: boolean | (() => string | boolean);
-
-winston.level = 'debug';
-
-let queryOptions: winston.QueryOptions;
-declare const transportOptions: winston.TransportOptions;
-const loggerOptions: winston.LoggerOptions = {
-  transports: [new (winston.Transport)()],
-  rewriters: [
-    (level: string, msg: string, meta: any): any => {
-      return meta;
-    }
-  ],
-  exceptionHandlers: [new (winston.Transport)()],
-  handleExceptions: false
-};
-
-declare const options: any;
-let value: any;
-let transport: winston.TransportInstance;
-let logger: winston.LoggerInstance;
-let profiler: winston.ProfileHandler;
-
-declare const writeableStream: NodeJS.WritableStream;
-let readableStream: NodeJS.ReadableStream;
-
-const transportStatic: winston.TransportStatic = winston.Transport;
-
-let transportInstance: winston.TransportInstance = new (winston.Transport)(transportOptions);
-transportInstance = new (winston.Transport)();
-
-const containerInstance: winston.ContainerInstance = new (winston.Container)(loggerOptions);
-winston.loggers.options.transports = [
-  new (winston.Transport)()
-];
-winston.loggers.add('category1', {
-  console: {
-    level: 'silly',
-    colorize: 'true',
-    label: 'category one'
-  },
-  file: {
-    filename: '/path/to/some/file'
-  },
-  transports: [
-    new (winston.Transport)()
-  ]
-});
-logger = winston.loggers.get('category1');
-
-bool = containerInstance.has(str);
-logger = containerInstance.get(str, loggerOptions);
-containerInstance.close(str);
-
-transport = winston.transports.Console;
-transport = winston.transports.DailyRotateFile;
-transport = winston.transports.File;
-transport = winston.transports.Http;
-transport = winston.transports.Loggly;
-transport = winston.transports.Memory;
-transport = winston.transports.Webhook;
-
-value = transport.formatQuery({});
-queryOptions = transport.normalizeQuery(queryOptions);
-value = transport.formatResults([], {});
-transport.logException(str, metadata, () => { });
-
-winston.exitOnError = bool;
-
-winston.log(str, str);
-winston.log(str, str, metadata);
-winston.log(str, str, metadata, metadata, metadata);
-winston.silly(str, str);
-winston.silly(str, str, metadata);
-winston.silly(str, str, metadata, metadata, metadata);
-winston.debug(str);
-winston.debug(str, metadata);
-winston.debug(str, metadata, metadata, metadata);
-winston.verbose(str, str);
-winston.verbose(str, str, metadata);
-winston.verbose(str, str, metadata, metadata, metadata);
-winston.info(str);
-winston.info(str, metadata);
-winston.info(str, metadata, metadata, metadata);
-winston.warn(str);
-winston.warn(str, metadata);
-winston.warn(str, metadata, metadata, metadata);
-winston.error(str);
-winston.error(str, metadata);
-winston.error(str, metadata, metadata, metadata);
-
-winston.query(queryOptions, (err: Error, results: any): void => {
-});
-winston.query((err: Error, results: any): void => {
-});
-
-logger = winston.add(transport, transportOptions);
-logger = winston.remove(transport);
-logger = winston.add(transport, {filename: 'path/to/file.log'});
-
-winston.clear();
-logger = winston.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any): void => {
-});
-logger = winston.profile(str);
-profiler = winston.startTimer();
-winston.setLevels({});
-logger = winston.cli();
-
-winston.handleExceptions(transport);
-winston.unhandleExceptions(transport);
-
-readableStream = winston.stream(options);
-
-readableStream.on('log', (log: any): void => {
-  console.log(log);
-});
-
-logger = logger.extend(obj);
-logger.log(str, str);
-logger.log(str, str, metadata);
-logger.log(str, str, metadata, metadata, metadata);
-logger.debug(str);
-logger.debug(str, metadata);
-logger.debug(str, metadata, metadata, metadata);
-logger.info(str);
-logger.info(str, metadata);
-logger.info(str, metadata, metadata, metadata);
-logger.warn(str);
-logger.warn(str, metadata);
-logger.warn(str, metadata, metadata, metadata);
-logger.error(str);
-logger.error(str, metadata);
-logger.error(str, metadata, metadata, metadata);
-
-logger.query(queryOptions, (err: Error, results: any): void => {
-});
-logger.query((err: Error, results: any): void => {
-});
-
-readableStream = winston.stream(options);
-logger.close();
-logger.handleExceptions(transport);
-logger.unhandleExceptions(transport);
-logger = logger.add(transport, transportOptions, bool);
-logger = logger.add(transport);
-logger = logger.add(transport, {filename: 'path/to/file.log'});
-
-logger.clear();
-logger = logger.remove(transport);
-profiler = logger.startTimer();
-logger = logger.profile(str, str, metadata, (err: Error, level: string, msg: string, meta: any): void => {
-});
-value = logger.setLevels(value);
-logger = logger.cli();
-
-logger = profiler.done(str);
-logger = profiler.logger;
-profiler.start = new Date();
-
-const testRewriter: winston.MetadataRewriter = (level: string, msg: string, meta: any): any => {
-    return meta;
-};
-
-logger.rewriters.push(testRewriter);
-/**
- * New Logger instances with transports tests:
- */
-
-logger = new (winston.Logger)({
-  transports: [
-    new (winston.transports.Console)({
-      level: str,
-      silent: bool,
-      json: bool,
-      colorize: bool,
-      timestamp: stamp,
-      showLevel: bool,
-      label: str,
-      logstash: bool,
-      debugStdout: bool,
-      depth: num,
-    }),
-    new (winston.transports.DailyRotateFile)({
-      level: str,
-      silent: bool,
-      json: bool,
-      colorize: bool,
-      maxsize: num,
-      maxFiles: num,
-      maxRetries: num,
-      prettyPrint: bool,
-      timestamp: stamp,
-      filename: str,
-      dirname: str,
-      datePattern: str,
-      eol: str,
-      stream: writeableStream,
-    }),
-    new (winston.transports.File)({
-      level: str,
-      silent: bool,
-      json: bool,
-      colorize: bool,
-      prettyPrint: bool,
-      timestamp: stamp,
-      showLevel: bool,
-      logstash: bool,
-      rotationFormat: bool,
-      depth: num,
-      zippedArchive: bool,
-      eol: str,
-      tailable: bool,
-      maxRetries: num,
-      filename: str,
-      maxsize: num,
-      maxFiles: num,
-      stream: writeableStream,
-    }),
-    new (winston.transports.Http)({
-      level: str,
-      host: str,
-      port: num,
-      path: str,
-      auth: { username: str, password: str },
-      ssl: bool,
-    }),
-    new (winston.transports.Loggly)({
-      level: str,
-      subdomain: str,
-      auth: {},
-      inputName: str,
-      json: bool,
-    }),
-    new (winston.transports.Memory)({
-      level: str,
-      json: bool,
-      colorize: bool,
-      showLevel: bool,
-      depth: num,
-      timestamp: stamp,
-      label: str,
-    }),
-    new (winston.transports.Webhook)({
-      level: str,
-      name: str,
-      host: str,
-      port: num,
-      method: str,
-      path: str,
-      auth: { username: str, password: str },
-      ssl: {ca: {}},
-    }),
-  ]
-});
-
-/* Remove transport by name */
-logger = logger.remove('nooo');
-
-/* Reconfigure logger */
-logger.configure({ level: 'silly' });
-
-winston.default.warn("Don't export reserved words in JavaScript!");
-
-winston.default.setLevels(winston.config.syslog.levels);
-winston.addColors(winston.config.syslog.colors);
-winston.default.emerg('syslog!');
-
-winston.config.addColors(winston.config.syslog.colors);
-winston.config.colorize(winston.config.syslog.levels['info'], "Hello world!");
-
-// module augment for custom level log
-// https://github.com/winstonjs/winston#using-custom-logging-levels
-// https://github.com/Microsoft/TypeScript/issues/7545
-declare module 'winston' {
-  interface LoggerInstance {
-    yay: LeveledLogMethod;
-  }
-}
-const customLevelLogger = new winston.Logger({
-  levels: {yay: 0, haha: 1, hoho: 2},
-  transports: [
-    new (winston.transports.Console)()
-  ]
-});
-customLevelLogger.yay('yay!');
diff --git a/types/workbox-sw/index.d.ts b/types/workbox-sw/index.d.ts
new file mode 100644
index 0000000000..a169714094
--- /dev/null
+++ b/types/workbox-sw/index.d.ts
@@ -0,0 +1,1424 @@
+// Type definitions for workbox-sw 3.2
+// Project: https://github.com/GoogleChrome/workbox
+// Definitions by: Frederik Wessberg <https://github.com/wessberg>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.6
+
+/**
+ * ===== BroadcastCacheUpdate =====
+ */
+
+interface IBroadcastCacheUpdateOptions {
+	/**
+	 * A list of headers that will be used to determine whether the responses differ.
+	 */
+	headersToCheck: string[];
+
+	/**
+	 * An attribution value that indicates where the update originated.
+	 */
+	source: string;
+}
+
+/**
+ * Uses the Broadcast Channel API to notify interested parties when a cached response has been updated.
+ * For efficiency's sake, the underlying response bodies are not compared; only specific response headers are checked
+ */
+declare class BroadcastCacheUpdate {
+	/**
+	 * Compare two Responses and send a message via the Broadcast Channel API if they differ.
+	 * Neither of the Responses can be opaque.
+	 * @param {Response} firstResponse - First response to compare.
+	 * @param {Response} secondResponse - Second response to compare.
+	 * @param {string} url - The URL of the updated request.
+	 * @param {string} cacheName - Name of the cache the responses belong to. This is included in the message posted on the broadcast channel.
+	 */
+	notifyIfUpdated (firstResponse: Response, secondResponse: Response, url: string, cacheName: string): void;
+}
+
+/**
+ * Construct a BroadcastCacheUpdate instance with a specific channelName to broadcast messages on
+ */
+interface IBroadcastCacheUpdateConstructor {
+	new (channelName: string, options: Partial<IBroadcastCacheUpdateOptions>): BroadcastCacheUpdate;
+}
+
+/**
+ * ===== CacheableResponse =====
+ */
+
+interface ICacheableResponseOptions {
+	statuses: number[];
+	headers: { [key: string]: string };
+}
+
+/**
+ * This class allows you to set up rules determining what status codes and/or headers need to be present in order for a Response to be considered cacheable.
+ */
+declare class CacheableResponse {
+	/**
+	 * Checks a response to see whether it's cacheable or not, based on this object's configuration.
+	 * @param {Response} response - The response whose cacheability is being checked.
+	 * @returns {boolean}
+	 */
+	isResponseCacheable (response: Response): boolean;
+}
+
+/**
+ * To construct a new CacheableResponse instance you must provide at least one of the config properties.
+ * If both statuses and headers are specified, then both conditions must be met for the Response to be considered cacheable.
+ */
+interface ICacheableResponseConstructor {
+	new (options: Partial<ICacheableResponseOptions>): CacheableResponse;
+}
+
+/**
+ * ===== CacheExpiration =====
+ */
+
+interface ICacheExpirationOptions {
+	/**
+	 * The maximum number of entries to store in a cache.
+	 */
+	maxEntries: number;
+
+	/**
+	 * The maximum lifetime of a request to stay in the cache before it's removed.
+	 */
+	maxAgeSeconds: number;
+}
+
+/**
+ * The CacheExpiration class allows you define an expiration and / or limit on the number of responses stored in a Cache.
+ */
+declare class CacheExpiration {
+	/**
+	 * Expires entries for the given cache and given criteria.
+	 * @returns {Promise<void>}
+	 */
+	expireEntries (): Promise<void>;
+
+	/**
+	 * Can be used to check if a URL has expired or not before it's used.
+	 * This requires a look up from IndexedDB, so can be slow.
+	 * Note: This method will not remove the cached entry, call expireEntries() to remove indexedDB and Cache entries.
+	 * @param {string} url
+	 * @returns {Promise<boolean>}
+	 */
+	isURLExpired (url: string): Promise<boolean>;
+
+	/**
+	 * Update the timestamp for the given URL.
+	 * This ensures the when removing entries based on maximum entries, most recently used is accurate or when expiring, the timestamp is up-to-date.
+	 * @param {string} url
+	 * @returns {Promise<void>}
+	 */
+	updateTimestamp (url: string): Promise<void>;
+}
+
+/**
+ * To construct a new CacheExpiration instance you must provide at least one of the config properties.
+ */
+interface ICacheExpirationConstructor {
+	new (cacheName: string, config: Partial<ICacheExpirationOptions>): CacheExpiration;
+}
+
+/**
+ * ===== Strategies =====
+ */
+
+interface ICacheStrategyHandleOptions {
+	event: FetchEvent;
+}
+
+interface ICacheStrategyMakeRequestOptions {
+	request: Request|string;
+	event?: FetchEvent;
+}
+
+declare class CacheStrategy {
+	/**
+	 * This method will perform a request strategy and follows an API that will work with the Workbox Router.
+	 * @param {ICacheStrategyHandleOptions} input
+	 * @returns {Promise<Response>}
+	 */
+	handle (input: ICacheStrategyHandleOptions): Promise<Response>;
+
+	/**
+	 * This method can be used to perform a make a standalone request outside the context of the Workbox Router.
+	 * @param {ICacheStrategyMakeRequestOptions} input
+	 * @returns {Promise<Response>}
+	 */
+	makeRequest (input: ICacheStrategyMakeRequestOptions): Promise<Response>;
+}
+
+/**
+ * ===== CacheOnly strategy =====
+ */
+
+interface ICacheOnlyOptions {
+	/**
+	 * Cache name to store and retrieve requests. Defaults to cache names provided by workbox-core.
+	 */
+	cacheName: string;
+	/**
+	 * Plugins to use in conjunction with this caching strategy.
+	 */
+	plugins: Plugin[];
+}
+
+/**
+ * An implementation of a cache-only request strategy.
+ * This class is useful if you want to take advantage of any Workbox plugins.
+ */
+declare class CacheOnly extends CacheStrategy {
+}
+
+/**
+ * Instantiates a new CacheOnly strategy
+ */
+interface ICacheOnlyConstructor {
+	new (options?: Partial<ICacheOnlyOptions>): CacheOnly;
+}
+
+/**
+ * ===== CacheFirst strategy =====
+ */
+
+interface ICacheFirstOptions extends ICacheOnlyOptions {
+	/**
+	 * Values passed along to the init of all fetch() requests made by this strategy.
+	 */
+	fetchOptions: RequestInit;
+}
+
+/**
+ * An implementation of a cache-first request strategy.
+ * A cache first strategy is useful for assets that have been revisioned, such as URLs like /styles/example.a8f5f1.css, since they can be cached for long periods of time.
+ */
+declare class CacheFirst extends CacheStrategy {
+}
+
+/**
+ * Instantiates a new CacheFirst strategy
+ */
+interface ICacheFirstConstructor {
+	new (options?: Partial<ICacheFirstOptions>): CacheFirst;
+}
+
+/**
+ * ===== NetworkOnly strategy =====
+ */
+
+interface INetworkOnlyOptions extends ICacheFirstOptions {
+}
+
+/**
+ * An implementation of a network-only request strategy.
+ * This class is useful if you want to take advantage of any Workbox plugins.
+ */
+declare class NetworkOnly extends CacheStrategy {
+}
+
+/**
+ * Instantiates a new NetworkOnly strategy
+ */
+interface INetworkOnlyConstructor {
+	new (options?: Partial<INetworkOnlyOptions>): NetworkOnly;
+}
+
+/**
+ * ===== NetworkFirst strategy =====
+ */
+
+interface INetworkFirstOptions extends ICacheFirstOptions {
+	networkTimeoutSeconds: number;
+}
+
+/**
+ * An implementation of a network first request strategy.
+ * By default, this strategy will cache responses with a 200 status code as well as opaque responses.
+ * Opaque responses are are cross-origin requests where the response doesn't support CORS.
+ */
+declare class NetworkFirst extends CacheStrategy {
+}
+
+/**
+ * Instantiates a new NetworkFirst strategy
+ */
+interface INetworkFirstConstructor {
+	new (options?: Partial<INetworkFirstOptions>): NetworkFirst;
+}
+
+/**
+ * ===== StaleWhileRevalidate strategy =====
+ */
+
+interface IStaleWhileRevalidateOptions extends ICacheFirstOptions {
+}
+
+/**
+ * An implementation of a stale-while-revalidate request strategy.
+ * Resources are requested from both the cache and the network in parallel.
+ * The strategy will respond with the cached version if available, otherwise wait for the network response.
+ * The cache is updated with the network response with each successful request.
+ * By default, this strategy will cache responses with a 200 status code as well as opaque responses.
+ * Opaque responses are are cross-origin requests where the response doesn't support CORS.
+ */
+declare class StaleWhileRevalidate extends CacheStrategy {
+}
+
+/**
+ * Instantiates a new StaleWhileRevalidate strategy
+ */
+interface IStaleWhileRevalidateConstructor {
+	new (options?: Partial<IStaleWhileRevalidateOptions>): StaleWhileRevalidate;
+}
+
+/**
+ * ===== MatchCallback =====
+ */
+
+interface IMatchContext extends IURLContext {
+	/**
+	 * The service workers' fetch event.
+	 */
+	event: FetchEvent;
+}
+
+/**
+ * To signify a match, return anything other than null. Return null if the route shouldn't match.
+ */
+type MatchCallback = (context: IMatchContext) => {}|null;
+
+/**
+ * ===== HandlerCallback =====
+ */
+
+interface IHandlerContext extends IMatchContext {
+	/**
+	 * Parameters returned by the Route's match callback function. This will be undefined if nothing was returned.
+	 */
+	params?: {};
+}
+
+/**
+ * The "handler" callback is called when a service worker's fetch event has been matched by a Route. This callback should return a Promise that resolves with a Response.
+ * If a value is returned by the match callback it will be passed in as the context.params argument.
+ */
+type HandlerCallback = (context: IHandlerContext) => Promise<Response>;
+
+/**
+ * ===== NavigationRoute =====
+ */
+
+interface IHandlerOptions {
+	url: string;
+	event: FetchEvent;
+	params: URLSearchParams;
+}
+
+interface INavigationRouteOptions {
+	/**
+	 * If any of these patterns match, the route will not handle the request (even if a whitelist RegExp matches).
+	 */
+	blacklist: RegExp[];
+
+	/**
+	 * If any of these patterns match the URL's pathname and search parameter,
+	 * the route will handle the request (assuming the blacklist doesn't match).
+	 */
+	whitelist: RegExp[];
+}
+
+/**
+ * NavigationRoute makes it easy to create a Route that matches for browser navigation requests.
+ * It will only match incoming Requests whose mode is set to navigate.
+ * You can optionally only apply this route to a subset of navigation requests by using one or both of the blacklist and whitelist parameters.
+ */
+declare class NavigationRoute {
+}
+
+/**
+ * If both blacklist and whitelist are provided, the blacklist will take precedence and the request will not match this route.
+ * The regular expressions in whitelist and blacklist are matched against the concatenated pathname and search portions of the requested URL.
+ */
+interface INavigationRouteConstructor {
+	new (handler: HandlerCallback, options: Partial<INavigationRouteOptions>): NavigationRoute;
+}
+
+/**
+ * ===== BroadcastUpdatePlugin =====
+ */
+
+/**
+ * This plugin will automatically broadcast a message whenever a cached response is updated.
+ */
+declare class BroadcastUpdatePlugin {
+}
+
+/**
+ * Construct a new instance with a specific channelName to broadcast messages on
+ */
+interface IBroadcastUpdatePluginConstructor {
+	new (channelName: string, options?: Partial<IBroadcastCacheUpdateOptions>): BroadcastUpdatePlugin;
+}
+
+/**
+ * ===== BroadcastUpdatePlugin =====
+ */
+
+/**
+ * The range request plugin makes it easy for a request with a 'Range' header to be fulfilled by a cached response.
+ * It does this by intercepting the cachedResponseWillBeUsed plugin callback and returning the appropriate subset of the cached response body.
+ */
+declare class RangeRequestsPlugin {
+}
+
+/**
+ * Instantiates a new RangeRequestsPlugin
+ */
+interface IRangeRequestsPluginConstructor {
+	new (): RangeRequestsPlugin;
+}
+
+/**
+ * ===== CacheableResponsePlugin =====
+ */
+
+/**
+ * A class implementing the cacheWillUpdate lifecycle callback.
+ * This makes it easier to add in cacheability checks to requests made via Workbox's built-in strategies.
+ */
+declare class CacheableResponsePlugin {
+}
+
+/**
+ * To construct a new cacheable response Plugin instance you must provide at least one of the config properties.
+ * If both statuses and headers are specified, then both conditions must be met for the Response to be considered cacheable.
+ */
+interface ICacheableResponsePluginConstructor {
+	new (config: Partial<ICacheableResponseOptions>): CacheableResponsePlugin;
+}
+
+/**
+ * ===== BackgroundSyncPlugin =====
+ */
+
+/**
+ * A class implementing the fetchDidFail lifecycle callback.
+ * This makes it easier to add failed requests to a background sync Queue.
+ */
+declare class BackgroundSyncPlugin {
+}
+
+/**
+ * Instantiates a new BackgroundSyncPlugin
+ */
+interface IBackgroundSyncPluginConstructor {
+	new (...queueArgs: any[]): BackgroundSyncPlugin;
+}
+
+/**
+ * ===== ExpirationPlugin =====
+ */
+
+/**
+ * This plugin can be used in the Workbox API's to regularly enforce a limit on the age and / or the number of cached requests.
+ * Whenever a cached request is used or updated, this plugin will look at the used Cache and remove any old or extra requests.
+ * When using maxAgeSeconds, requests may be used once after expiring because the expiration clean up will not have occurred
+ * until after the cached request has been used. If the request has a "Date" header, then a light weight expiration check is
+ * performed and the request will not be used immediately.
+ * When using maxEntries, the last request to be used will be the request that is removed from the Cache.
+ */
+declare class ExpirationPlugin {
+}
+
+/**
+ * Instantiates a new ExpirationPlugin
+ */
+interface IExpirationPluginConstructor {
+	new (config: Partial<ICacheExpirationOptions>): ExpirationPlugin;
+}
+
+/**
+ * ===== ExpirationPlugin =====
+ */
+
+type Plugin = BroadcastUpdatePlugin|RangeRequestsPlugin|CacheableResponsePlugin|BackgroundSyncPlugin|ExpirationPlugin|WorkboxPlugin;
+
+/**
+ * ===== BackgroundSync =====
+ */
+
+interface IStorableRequestOptions {
+	url: string;
+
+	/**
+	 * See: https://fetch.spec.whatwg.org/#requestinit
+	 */
+	requestInit: RequestInit;
+
+	/**
+	 * The time the request was created, defaulting to the current time if not specified.
+	 */
+	timestamp: number;
+}
+
+/**
+ *  A class to make it easier to serialize and de-serialize requests so they can be stored in IndexedDB.
+ */
+declare class StorableRequest {
+	readonly timestamp: number;
+
+	toObject (): IStorableRequestOptions;
+
+	toRequest (): Request;
+
+	clone (): StorableRequest;
+}
+
+/**
+ * Accepts a URL and RequestInit dictionary that can be used to create a
+ * new Request object. A timestamp is also generated so consumers can
+ * reference when the object was created.
+ */
+interface IStorableRequestConstructor {
+	new (options: IStorableRequestOptions): StorableRequest;
+	fromRequest (request: Request): StorableRequest;
+}
+
+/**
+ * ===== PrecacheController =====
+ */
+
+interface ICleanupResult {
+	/**
+	 * List of URLs that were deleted from the precache cache.
+	 */
+	deletedCacheRequests: string[];
+	/**
+	 * List of URLs that were deleted from the precache cache.
+	 */
+	deletedRevisionDetails: string[];
+}
+
+interface IActivateOptions {
+	/**
+	 * Plugins to be used for fetching and caching during install.
+	 */
+	plugins: Plugin[];
+}
+
+interface IInstallOptions {
+	/**
+	 * Suppress warning messages.
+	 */
+	suppressWarnings: boolean;
+
+	/**
+	 * Plugins to be used for fetching and caching during install.
+	 */
+	plugins: Plugin[];
+}
+
+interface IPrecacheEntry {
+	url: string;
+	revision: string;
+}
+
+interface IInstallResult {
+	/**
+	 * List of entries supplied for precaching that were precached.
+	 */
+	updatedEntries: (string|IPrecacheEntry)[];
+
+	/**
+	 * List of entries supplied for precaching that were already precached.
+	 */
+	notUpdatedEntries: (string|IPrecacheEntry)[];
+}
+
+/**
+ * Performs efficient precaching of assets.
+ */
+declare class PrecacheController {
+	/**
+	 * Takes the current set of temporary files and moves them to the final cache, deleting the temporary cache once copying is complete.
+	 * @param {IActivateOptions} options
+	 * @returns {Promise<ICleanupResult>} Resolves with an object containing details of the deleted cache requests and precache revision details.
+	 */
+	activate (options: Partial<IActivateOptions>): Promise<ICleanupResult>;
+
+	/**
+	 * This method will add items to the precache list, removing duplicates and ensuring the information is valid.
+	 * @param {(string | IPrecacheEntry)[]} entries - Array of entries to precache.
+	 */
+	addToCacheList (entries: (string|IPrecacheEntry)[]): void;
+
+	/**
+	 * Returns an array of fully qualified URL's that will be precached.
+	 * @returns {string[]} An array of URLs.
+	 */
+	getCachedUrls (): string[];
+
+	/**
+	 * Call this method from a service work install event to start precaching assets.
+	 * @param {Partial<IInstallOptions>} options
+	 * @returns {Promise<IInstallResult>}
+	 */
+	install (options?: Partial<IInstallOptions>): Promise<IInstallResult>;
+}
+
+/**
+ * Create a new PrecacheController.
+ */
+interface IPrecacheControllerConstructor {
+	new (cacheName?: string): PrecacheController;
+}
+
+/**
+ * ===== Queue =====
+ */
+
+interface IQueueCallback {
+	/**
+	 * Invoked immediately before the request is stored to IndexedDB. Use this callback to modify request data at store time.
+	 * @param {StorableRequest} request
+	 */
+	requestWillEnqueue (request: StorableRequest): void;
+	/**
+	 * Invoked immediately before the request is re-fetched. Use this callback to modify request data at fetch time.
+	 * @param {StorableRequest} request
+	 */
+	requestWillReplay (request: StorableRequest): void;
+
+	/**
+	 * Invoked after all requests in the queue have successfully replayed.
+	 * @param {StorableRequest[]} requests
+	 */
+	queueDidReplay (requests: StorableRequest[]): void;
+}
+
+interface IQueueOptions {
+	/**
+	 * The amount of time (in minutes) a request may be retried. After this amount of time has passed, the request will be deleted from the queue.
+	 */
+	maxRetentionTime: number;
+	/**
+	 * Callbacks to observe the lifecycle of queued requests. Use these to respond to or modify the requests during the replay process.
+	 */
+	callbacks: Partial<IQueueCallback>;
+}
+
+/**
+ * A class to manage storing failed requests in IndexedDB and retrying them later.
+ * All parts of the storing and replaying process are observable via callbacks.
+ */
+declare class Queue {
+	readonly name: string;
+
+	/**
+	 * Stores the passed request into IndexedDB. The database used is workbox-background-sync and the object store name is the same as the name this instance was created with (to guarantee it's unique).
+	 * @param {Request} request - The request object to store.
+	 * @returns {Promise<void>}
+	 */
+	addRequest (request: Request): Promise<void>;
+
+	/**
+	 * Retrieves all stored requests in IndexedDB and retries them. If the queue contained requests that
+	 * were successfully replayed, the queueDidReplay callback is invoked (which implies the queue is now empty).
+	 * If any of the requests fail, a new sync registration is created to retry again later.
+	 * @returns {Promise<void>}
+	 */
+	replayRequests (): Promise<void>;
+}
+
+/**
+ * Creates an instance of Queue with the given options
+ */
+interface IQueueConstructor {
+	/**
+	 * @param {string} name - The unique name for this queue. This name must be unique as it's used to register
+	 * sync events and store requests in IndexedDB specific to this instance. An error will be thrown if a
+	 * duplicate name is detected.
+	 * @param {Partial<IQueueOptions>} options
+	 * @returns {Queue}
+	 */
+	new (name: string, options?: Partial<IQueueOptions>): Queue;
+}
+
+/**
+ * ===== Route =====
+ */
+
+/**
+ * A Route consists of a pair of callback functions, "match" and "handler".
+ * The "match" callback determine if a route should be used to "handle" a request by
+ * returning a non-falsy value if it can. The "handler" callback is called when there is a match
+ * and should return a Promise that resolves to a Response.
+ */
+declare class Route {
+}
+
+/**
+ * Constructor for Route class.
+ */
+interface IRouteConstructor {
+	/**
+	 *
+	 * @param {MatchCallback} match - A callback function that determines whether the route matches a given fetch event by returning a non-falsy value.
+	 * @param {HandlerCallback} handler - A callback function that returns a Promise resolving to a Response.
+	 * @param {string} [method] - The HTTP method to match the Route against.
+	 * @returns {Route}
+	 */
+	new (match: MatchCallback, handler: HandlerCallback, method?: string): Route;
+}
+
+/**
+ * ===== RegExpRoute =====
+ */
+
+/**
+ * RegExpRoute makes it easy to create a regular expression based Route.
+ * For same-origin requests the RegExp only needs to match part of the URL. For requests against third-party servers, you must define a RegExp that matches the start of the URL.
+ */
+declare class RegExpRoute extends Route {
+}
+
+/**
+ * If the regular expression contains capture groups, the captured values will be passed to the handler's params argument.
+ */
+interface IRegExpRouteConstructor {
+	/**
+	 *
+	 * @param {RegExp} regExp - The regular expression to match against URLs.
+	 * @param {HandlerCallback} handler - A callback function that returns a Promise resulting in a Response.
+	 * @param {string} [method] - The HTTP method to match the Route against.
+	 * @returns {RegExpRoute}
+	 */
+	new (regExp: RegExp, handler: HandlerCallback, method?: string): RegExpRoute;
+}
+
+/**
+ * ===== Router =====
+ */
+
+/**
+ * The Router can be used to process a FetchEvent through one or more Routes responding with a Request if a matching route exists.
+ * If no route matches a given a request, the Router will use a "default" handler if one is defined.
+ * Should the matching Route throw an error, the Router will use a "catch" handler if one is defined to gracefully deal with issues and respond with a Request.
+ * If a request matches multiple routes, the earliest registered route will be used to respond to the request.
+ */
+declare class Router {
+	/**
+	 * Apply the routing rules to a FetchEvent object to get a Response from an appropriate Route's handler.
+	 * @param {FetchEvent} event - The event from a service worker's 'fetch' event listener.
+	 * @returns {Promise<Response>?} A promise is returned if a registered route can handle the FetchEvent's request. If there is no matching route and there's no defaultHandler, undefined is returned.
+	 */
+	handleRequest (event: FetchEvent): Promise<Response>|undefined;
+
+	/**
+	 * Registers a route with the router.
+	 * @param {Route} route
+	 */
+	registerRoute (route: Route): void;
+
+	/**
+	 * If a Route throws an error while handling a request, this handler will be called and given a chance to provide a response.
+	 * @param {HandlerCallback} handler - A callback function that returns a Promise resulting in a Response.
+	 */
+	setCatchHandler (handler: HandlerCallback): void;
+
+	/**
+	 * Define a default handler that's called when no routes explicitly match the incoming request.
+	 * Without a default handler, unmatched requests will go against the network as if there were no service worker present.
+	 * @param {HandlerCallback} handler - A callback function that returns a Promise resulting in a Response.
+	 */
+	setDefaultHandler (handler: HandlerCallback): void;
+
+	/**
+	 * Unregisters a route with the router.
+	 * @param {Route} route - The route to unregister.
+	 */
+	unregisterRoute (route: Route): void;
+}
+
+/**
+ * Initializes a new Router.
+ */
+interface IRouterConstructor {
+	new (): Router;
+}
+
+/**
+ * ===== CoreNamespace =====
+ */
+
+interface ICacheNames {
+	precache: string;
+	runtime: string;
+	googleAnalytics: string;
+}
+
+interface ILogLevel {
+	/**
+	 * Prints all logs from Workbox. Useful for debugging.
+	 */
+	debug: 0;
+
+	/**
+	 * Prints console log, warn, error and groups. Default for debug builds.
+	 */
+	log: 1;
+
+	/**
+	 * Prints console warn, error and groups. Default for non-debug builds.
+	 */
+	warn: 2;
+
+	/**
+	 * Print console error and groups.
+	 */
+	error: 3;
+
+	/**
+	 * Force no logging from Workbox.
+	 */
+	silent: 4;
+}
+
+interface ICacheNameDetails {
+	prefix: string;
+	suffix: string;
+	precache: string;
+	runtime: string;
+	googleAnalytics: string;
+}
+
+/**
+ * All of the Workbox service worker libraries use workbox-core for shared code as well as setting default values that need to be shared (like cache names).
+ */
+declare class CoreNamespace {
+	/**
+	 * cacheNames.precache is used for precached assets, cacheNames.googleAnalytics is used by workbox-google-analytics to store analytics.js, and cacheNames.runtime is used for everything else.
+	 */
+	static readonly cacheNames: ICacheNames;
+
+	/**
+	 * The available log levels in Workbox: debug, log, warn, error and silent.
+	 */
+	static readonly LOG_LEVELS: ILogLevel;
+
+	/**
+	 * Get the current log level.
+	 */
+	static readonly logLevel: ILogLevel[keyof ILogLevel];
+
+	/**
+	 * You can alter the default cache names used by the Workbox modules by changing the cache name details.
+	 * Cache names are generated as <prefix>-<Cache Name>-<suffix>.
+	 * @param {Partial<ICacheNameDetails>} details
+	 */
+	static setCacheNameDetails (details: Partial<ICacheNameDetails>): void;
+
+	/**
+	 * Set the current log level passing in one of the values from LOG_LEVELS.
+	 * @param {number} logLevel - The new log level to use.
+	 */
+	static setLogLevel (logLevel: ILogLevel[keyof ILogLevel]): void;
+}
+
+/**
+ * ===== PrecachingNamespace =====
+ */
+
+interface IURLContext {
+	/**
+	 * The request's URL.
+	 */
+	url: URL;
+}
+
+/**
+ * The "urlManipulation" callback can be used to determine if there are any additional permutations of a URL that should be used to check against the available precached files.
+ * For example, Workbox supports checking for '/index.html' when the URL '/' is provided. This callback allows additional, custom checks.
+ * @param {IURLContext} context
+ * @returns {URL[]} To add additional urls to test, return an Array of URL's. Please note that these should not be Strings, but URL objects.
+ */
+type UrlManipulation = (context: IURLContext) => URL[];
+
+interface IRouteOptions {
+	/**
+	 * The directoryIndex will check cache entries for a URLs ending with '/' to see if there is a hit when appending the directoryIndex value.
+	 */
+	directoryIndex: string|null;
+
+	/**
+	 * An array of regex's to remove search params when looking for a cache match.
+	 */
+	ignoreUrlParametersMatching: RegExp[];
+
+	/**
+	 * The cleanUrls option will check the cache for the URL with a .html added to the end of the end.
+	 */
+	cleanUrls: boolean;
+
+	/**
+	 * This is a function that should take a URL and return an array of alternative URL's that should be checked for precache matches.
+	 */
+	urlManipulation: UrlManipulation;
+}
+
+/**
+ * Most consumers of this module will want to use the precacheAndRoute() method to add assets to the Cache and respond to network requests with these cached assets.
+ * If you require finer grained control, you can use the PrecacheController to determine when performed.
+ */
+declare class PrecachingNamespace {
+	/**
+	 * Performs efficient precaching of assets.
+	 */
+	static readonly PrecacheController: IPrecacheControllerConstructor;
+
+	/**
+	 * Add plugins to precaching.
+	 * @param {Plugin[]} newPlugins
+	 */
+	static addPlugins (newPlugins: Plugin[]): void;
+
+	/**
+	 * Add a fetch listener to the service worker that will respond to network requests with precached assets.
+	 * Requests for assets that aren't precached, the FetchEvent will not be responded to, allowing the event to fall through to other fetch event listeners.
+	 * @param {Partial<IRouteOptions>} route
+	 */
+	static addRoute (route: Partial<IRouteOptions>): void;
+
+	/**
+	 * Add items to the precache list, removing any duplicates and store the files in the "precache cache" when the service worker installs.
+	 * This method can be called multiple times.
+	 * Please note: This method will not serve any of the cached files for you, it only precaches files. To respond to a network request you call addRoute().
+	 * If you have a single array of files to precache, you can just call precacheAndRoute().
+	 * @param {(string | IPrecacheEntry)[]} entries
+	 */
+	static precache (entries: (string|IPrecacheEntry)[]): void;
+
+	/**
+	 * This method will add entries to the precache list and add a route to respond to fetch events.
+	 * This is a convenience method that will call precache() and addRoute() in a single call.
+	 * @param {(string | IPrecacheEntry)[]} entries - Array of entries to precache.
+	 * @param {Partial<IRouteOptions>} [route] - see addRoute() options
+	 */
+	static precacheAndRoute (entries: (string|IPrecacheEntry)[], route?: Partial<IRouteOptions>): void;
+
+	/**
+	 * Warnings will be logged if any of the precached assets are entered without a revision property.
+	 * This is extremely dangerous if the URL's aren't revisioned.
+	 * However, the warnings can be supressed with this method.
+	 * @param {boolean} suppress
+	 */
+	static suppressWarnings (suppress: boolean): void;
+}
+
+/**
+ * ===== RoutingNamespace =====
+ */
+
+interface IRegisterNavigationRouteOptions extends INavigationRouteOptions {
+	cacheName: string;
+}
+
+declare class RoutingNamespace {
+	/**
+	 * NavigationRoute makes it easy to create a Route that matches for browser navigation requests.
+	 * It will only match incoming Requests whose mode is set to navigate.
+	 * You can optionally only apply this route to a subset of navigation requests by using one or
+	 * both of the blacklist and whitelist parameters.
+	 */
+	static readonly NavigationRoute: INavigationRouteConstructor;
+
+	/**
+	 * RegExpRoute makes it easy to create a regular expression based Route.
+	 * For same-origin requests the RegExp only needs to match part of the URL. For requests against third-party servers, you must define a RegExp that matches the start of the URL.
+	 */
+	static readonly RegExpRoute: IRegExpRouteConstructor;
+
+	/**
+	 * A Route consists of a pair of callback functions, "match" and "handler". The "match" callback determine if a
+	 * route should be used to "handle" a request by returning a non-falsy value if it can.
+	 * The "handler" callback is called when there is a match and should return a Promise that resolves to a Response.
+	 */
+	static readonly Route: IRouteConstructor;
+
+	/**
+	 * The Router can be used to process a FetchEvent through one or more Routes responding with a Request if a matching route exists.
+	 * If no route matches a given a request, the Router will use a "default" handler if one is defined.
+	 * Should the matching Route throw an error, the Router will use a "catch" handler if one is defined to gracefully deal with issues and respond with a Request.
+	 * If a request matches multiple routes, the earliest registered route will be used to respond to the request.
+	 */
+	static readonly Router: IRouterConstructor;
+
+	/**
+	 * Register a route that will return a precached file for a navigation request. This is useful for the application shell pattern.
+	 * This method will generate a NavigationRoute and call Router.registerRoute().
+	 * @param {string} cachedAssetUrl
+	 * @param {Partial<IRegisterNavigationRouteOptions>} [options]
+	 * @returns {NavigationRoute} Returns the generated Route.
+	 */
+	static registerNavigationRoute (cachedAssetUrl: string, options?: Partial<IRegisterNavigationRouteOptions>): NavigationRoute;
+
+	/**
+	 * Easily register a RegExp, string, or function with a caching strategy to the Router.
+	 * This method will generate a Route for you if needed and call Router.registerRoute().
+	 * @param {string | RegExp | MatchCallback | Route} capture - If the capture param is a Route, all other arguments will be ignored.
+	 * @param {HandlerCallback} handler - A callback function that returns a Promise resulting in a Response.
+	 * @param {string} method - The HTTP method to match the Route against.
+	 * @returns {Route} The generated Route(Useful for unregistering).
+	 */
+	static registerRoute (capture: string|RegExp|MatchCallback|Route, handler: HandlerCallback, method?: string): Route;
+
+	/**
+	 * If a Route throws an error while handling a request, this handler will be called and given a chance to provide a response.
+	 * @param {IHandlerOptions} handler - A callback function that returns a Promise resulting in a Response.
+	 * @returns {Promise<Response>}
+	 */
+	static setCatchHandler (handler: IHandlerOptions): Promise<Response>;
+
+	/**
+	 * Define a default handler that's called when no routes explicitly match the incoming request.
+	 * Without a default handler, unmatched requests will go against the network as if there were no service worker present.
+	 * @param {IHandlerOptions} handler - A callback function that returns a Promise resulting in a Response.
+	 * @returns {Promise<Response>}
+	 */
+	static setDefaultHandler (handler: IHandlerOptions): Promise<Response>;
+
+	/**
+	 * Unregisters a route with the router.
+	 * @param {Route} route - The route to unregister
+	 */
+	static unregisterRoute (route: Route): void;
+}
+
+/**
+ * ===== StrategiesNamespace =====
+ */
+
+interface IStrategyOptions {
+	/**
+	 * Name of cache to use for caching (both lookup and updating).
+	 */
+	cacheName: string;
+
+	/**
+	 * Defining this object will add a cache expiration plugins to this strategy.
+	 */
+	cacheExpiration: Partial<ICacheExpirationOptions>;
+
+	/**
+	 * The Plugins to use along with the Strategy
+	 */
+	plugins: Plugin[];
+}
+
+/**
+ * There are common caching strategies that most service workers will need and use. This module provides simple implementations of these strategies.
+ */
+declare class StrategiesNamespace {
+	/**
+	 * An implementation of a cache-first request strategy.
+	 * A cache first strategy is useful for assets that have been revisioned, such as URLs like /styles/example.a8f5f1.css, since they can be cached for long periods of time.
+	 */
+	static readonly CacheFirst: ICacheFirstConstructor;
+
+	/**
+	 * An implementation of a cache-only request strategy.
+	 * This class is useful if you want to take advantage of any Workbox plugins.
+	 */
+	static readonly CacheOnly: ICacheOnlyConstructor;
+
+	/**
+	 * An implementation of a network first request strategy.
+	 * By default, this strategy will cache responses with a 200 status code as well as opaque responses. Opaque responses are are cross-origin requests where the response doesn't support CORS.
+	 */
+	static readonly NetworkFirst: INetworkFirstConstructor;
+
+	/**
+	 * An implementation of a network-only request strategy.
+	 * This class is useful if you want to take advantage of any Workbox plugins.
+	 */
+	static readonly NetworkOnly: INetworkOnlyConstructor;
+
+	/**
+	 * An implementation of a stale-while-revalidate request strategy.
+	 * Resources are requested from both the cache and the network in parallel.
+	 * The strategy will respond with the cached version if available, otherwise wait for the network response.
+	 * The cache is updated with the network response with each successful request.
+	 * By default, this strategy will cache responses with a 200 status code as well as opaque responses.
+	 * Opaque responses are are cross-origin requests where the response doesn't support CORS.
+	 */
+	static readonly StaleWhileRevalidate: IStaleWhileRevalidateConstructor;
+
+	/**
+	 * Instantiates a new CacheFirst strategy
+	 * @param {Partial<IStrategyOptions>} [options]
+	 * @returns {HandlerCallback}
+	 */
+	static cacheFirst (options?: Partial<IStrategyOptions>): HandlerCallback;
+
+	/**
+	 * Instantiates a new CacheOnly strategy
+	 * @param {Partial<IStrategyOptions>} [options]
+	 * @returns {HandlerCallback}
+	 */
+	static cacheOnly (options?: Partial<IStrategyOptions>): HandlerCallback;
+
+	/**
+	 * Instantiates a new NetworkFirst strategy
+	 * @param {Partial<IStrategyOptions>} [options]
+	 * @returns {HandlerCallback}
+	 */
+	static networkFirst (options?: Partial<IStrategyOptions>): HandlerCallback;
+
+	/**
+	 * Instantiates a new NetworkOnly strategy
+	 * @param {Partial<IStrategyOptions>} [options]
+	 * @returns {HandlerCallback}
+	 */
+	static networkOnly (options?: Partial<IStrategyOptions>): HandlerCallback;
+
+	/**
+	 * Instantiates a new StaleWhileRevalidate strategy
+	 * @param {Partial<IStrategyOptions>} [options]
+	 * @returns {StaleWhileRevalidate}
+	 */
+	static staleWhileRevalidate (options?: Partial<IStrategyOptions>): HandlerCallback;
+}
+
+/**
+ * ===== StreamsNamespace =====
+ */
+
+type StreamSource = Response|ReadableStream|BodyInit;
+
+interface IConcatenateResult {
+	done: Promise<StreamSource>;
+	stream: ReadableStream;
+}
+
+interface IConcatenateToResponseResult {
+	done: Promise<StreamSource>;
+	response: Response;
+}
+
+declare class StreamsNamespace {
+	/**
+	 * Takes multiple source Promises, each of which could resolve to a Response, a ReadableStream, or a BodyInit.
+	 * Returns an object exposing a ReadableStream with each individual stream's data returned in sequence,
+	 * along with a Promise which signals when the stream is finished (useful for passing to a FetchEvent's waitUntil()).
+	 * @param {Promise<StreamSource>[]} sourcePromises - Array of Promise containing StreamSource
+	 * @returns {IConcatenateResult}
+	 */
+	static concatenate (sourcePromises: Promise<StreamSource>[]): IConcatenateResult;
+
+	/**
+	 * Takes multiple source Promises, each of which could resolve to a Response, a ReadableStream, or a BodyInit,along with a HeadersInit.
+	 * Returns an object exposing a Response whose body consists of each individual stream's data returned in sequence,
+	 * along with a Promise which signals when the stream is finished (useful for passing to a FetchEvent's waitUntil()).
+	 * @param {Promise<StreamSource>[]} sourcePromises - Array of Promise containing StreamSource
+	 * @param {HeadersInit} [headersInit] - If there's no Content-Type specified, 'text/html' will be used by default.
+	 * @returns {IConcatenateToResponseResult}
+	 */
+	static concatenateToResponse (sourcePromises: Promise<StreamSource>[], headersInit?: HeadersInit): IConcatenateToResponseResult;
+
+	/**
+	 * This is a utility method that determines whether the current browser supports the features required to create streamed responses. Currently, it checks if ReadableStream is available.
+	 * @param {HeadersInit} [headersInit] - If there's no Content-Type specified, 'text/html' will be used by default.
+	 * @returns {boolean} - true, if the current browser meets the requirements for streaming responses, and false otherwise.
+	 */
+	static createHeaders (headersInit?: HeadersInit): boolean;
+
+	/**
+	 * This is a utility method that determines whether the current browser supports the features required to create streamed responses. Currently, it checks if ReadableStream is available.
+	 * @returns {boolean} - true, if the current browser meets the requirements for streaming responses, and false otherwise.
+	 */
+	static isSupported (): boolean;
+
+	/**
+	 * A shortcut to create a strategy that could be dropped-in to Workbox's router.
+	 * On browsers that do not support constructing new ReadableStreams, this strategy will automatically wait for
+	 * all the sourceFunctions to complete, and create a final response that concatenates their values together.
+	 * @param {HandlerCallback[]} sourceFunctions - Each function should return a workbox.streams.StreamSource (or a Promise which resolves to one).
+	 * @param {HeadersInit} headersInit . If there's no Content-Type specified, 'text/html' will be used by default.
+	 * @returns {HandlerCallback}
+	 */
+	static strategy (sourceFunctions: HandlerCallback[], headersInit?: HeadersInit): HandlerCallback;
+}
+
+/**
+ * ===== ExpirationNamespace =====
+ */
+
+declare class ExpirationNamespace {
+	/**
+	 * The CacheExpiration class allows you define an expiration and / or limit on the number of responses stored in a Cache.
+	 */
+	static readonly CacheExpiration: ICacheExpirationConstructor;
+
+	/**
+	 * This plugin can be used in the Workbox API's to regularly enforce a limit on the age and / or the number of cached requests.
+	 * Whenever a cached request is used or updated, this plugin will look at the used Cache and remove any old or extra requests.
+	 * When using maxAgeSeconds, requests may be used once after expiring because the expiration clean up will not
+	 * have occurred until after the cached request has been used. If the request has a "Date" header, then a light weight
+	 * expiration check is performed and the request will not be used immediately.
+	 * When using maxEntries, the last request to be used will be the request that is removed from the Cache.
+	 */
+	static readonly Plugin: IExpirationPluginConstructor;
+}
+
+/**
+ * ===== BackgroundSyncNamespace =====
+ */
+
+declare class BackgroundSyncNamespace {
+	/**
+	 * A class implementing the fetchDidFail lifecycle callback. This makes it easier to add failed requests to a background sync Queue.
+	 */
+	static readonly Plugin: IBackgroundSyncPluginConstructor;
+
+	/**
+	 * A class to manage storing failed requests in IndexedDB and retrying them later. All parts of the storing and replaying process are observable via callbacks.
+	 */
+	static readonly Queue: IQueueConstructor;
+}
+
+/**
+ * ===== GoogleAnalyticsNamespace =====
+ */
+
+interface IGoogleAnalyticsInitializeOptions {
+	/**
+	 * The cache name to store and retrieve analytics.js. Defaults to the cache names provided by workbox-core.
+	 */
+	cacheName: string;
+
+	/**
+	 * Measurement Protocol parameters, expressed as key/value pairs, to be added to replayed Google Analytics requests.
+	 * This can be used to, e.g., set a custom dimension indicating that the request was replayed.
+	 */
+	parameterOverrides: { [key: string]: string };
+
+	/**
+	 * A function that allows you to modify the hit parameters prior to replaying the hit. The function is invoked with the original hit's URLSearchParams object as its only argument.
+	 * @param {URLSearchParams} params
+	 */
+	hitFilter (params: URLSearchParams): void;
+}
+
+declare class GoogleAnalyticsNamespace {
+	static initialize (options: Partial<IGoogleAnalyticsInitializeOptions>): void;
+}
+
+/**
+ * ===== CacheableResponseNamespace =====
+ */
+
+declare class CacheableResponseNamespace {
+	/**
+	 * This class allows you to set up rules determining what status codes and/or headers need to be present in order for a Response to be considered cacheable.
+	 */
+	static readonly CacheableResponse: ICacheableResponseConstructor;
+
+	/**
+	 * A class implementing the cacheWillUpdate lifecycle callback. This makes it easier to add in cacheability checks to requests made via Workbox's built-in strategies.
+	 */
+	static readonly Plugin: ICacheableResponsePluginConstructor;
+}
+
+/**
+ * ===== BroadcastUpdateNamespace =====
+ */
+
+declare class BroadcastUpdateNamespace {
+	/**
+	 * Uses the Broadcast Channel API to notify interested parties when a cached response has been updated.
+	 * For efficiency's sake, the underlying response bodies are not compared; only specific response headers are checked.
+	 */
+	static readonly BroadcastCacheUpdate: IBroadcastCacheUpdateConstructor;
+
+	/**
+	 * This plugin will automatically broadcast a message whenever a cached response is updated.
+	 */
+	static readonly Plugin: IBroadcastUpdatePluginConstructor;
+
+	/**
+	 * You would not normally call this method directly;
+	 * it's called automatically by an instance of the BroadcastCacheUpdate class.
+	 * It's exposed here for the benefit of developers who would rather not use the full BroadcastCacheUpdate implementation.
+	 * Calling this will dispatch a message on the provided Broadcast Channel to notify interested subscribers about a
+	 * change to a cached resource.
+	 * The message that's posted has a formation inspired by the Flux standard action format like so:
+	 * @param {BroadcastChannel} channel - The BroadcastChannel to use.
+	 * @param {string} cacheName - The name of the cache in which the updated Response was stored.
+	 * @param {string} url - The URL associated with the updated Response.
+	 * @param {string} source - A string identifying this library as the source of the update message.
+	 */
+	static broadCastUpdate (channel: BroadcastChannel, cacheName: string, url: string, source: string): void;
+}
+
+/**
+ * ===== RangeRequestsNamespace =====
+ */
+
+declare class RangeRequestsNamespace {
+	/**
+	 * The range request plugin makes it easy for a request with a 'Range' header to be fulfilled by a cached response.
+	 * It does this by intercepting the cachedResponseWillBeUsed plugin callback and returning the appropriate subset of the cached response body.
+	 */
+	static readonly Plugin: IRangeRequestsPluginConstructor;
+
+	/**
+	 * Given a Request and Response objects as input, this will return a promise for a new Response.
+	 * @param {Request} request - A request, which should contain a Range: header.
+	 * @param {Response} originalResponse - An original response containing the full content.
+	 * @returns {Promise<Response>} Either a 206 Partial Content response, with the response body set to the slice of
+	 * content specified by the request's Range: header, or a 416 Range Not Satisfiable response if the conditions of
+	 * the Range: header can't be met.
+	 */
+	static createPartialResponse (request: Request, originalResponse: Response): Promise<Response>;
+}
+
+/**
+ * ===== Workbox Plugin =====
+ */
+interface WorkboxPlugin {
+	/**
+	 * Called before a Response is used to update a cache. You can alter the Response before it’s added to the cache or return null to avoid updating the cache at all.
+	 * @param {CacheWillUpdatePluginContext} context
+	 * @returns {Promise<Response>|Response|null}
+	 */
+	readonly cacheWillUpdate?: (context: CacheWillUpdatePluginContext) => Promise<Response>|Response|null;
+
+	/**
+	 * Called when a new entry is added to a cache or it’s updated. Useful if you wish to perform an action after a cache update.
+	 * @param {CacheDidUpdatePluginContext} context
+	 * @returns {void}
+	 */
+	readonly cacheDidUpdate?: (context: CacheDidUpdatePluginContext) => void;
+
+	/**
+	 * Before a cached Response is used to respond to a fetch event, this callback can be used to allow or block the Response from being used.
+	 * @param {CacheResponseWillBeUsedPluginContext} context
+	 * @returns {Promise<Response>|Response|null}
+	 */
+	readonly cachedResponseWillBeUsed?: (context: CacheResponseWillBeUsedPluginContext) => Promise<Response>|Response|null;
+
+	/**
+	 * This is called whenever a fetch event is about to be made. You can alter the Request in this callback.
+	 * @param {RequestWillFetchPluginContext} context
+	 * @returns {Request}
+	 */
+	readonly requestWillFetch?: (context: RequestWillFetchPluginContext) => Request;
+
+	/**
+	 * Called when a fetch event fails (note this is when the network request can’t be made at all and not when a request is a non-200 request).
+	 * @param {FetchDidFailPluginContext}
+	 * @returns {void}
+	 */
+	readonly fetchDidFail?: (context: FetchDidFailPluginContext) => void;
+}
+
+interface CacheWillUpdatePluginContext {
+	readonly request: Request;
+	readonly response: Response;
+}
+
+interface CacheDidUpdatePluginContext {
+	readonly cacheName: string;
+	readonly request: Request;
+	readonly oldResponse: Response;
+	readonly newResponse: Response;
+}
+
+interface CacheResponseWillBeUsedPluginContext {
+	readonly cacheName: string;
+	readonly request: Request;
+	readonly matchOptions: any;
+	readonly cachedResponse: Response;
+}
+
+interface RequestWillFetchPluginContext {
+	readonly request: Request;
+}
+
+interface FetchDidFailPluginContext {
+	readonly originalRequest: Request;
+	readonly request: Request;
+	readonly error: Error;
+}
+
+/**
+ * ===== WorkboxNamespace =====
+ */
+
+/**
+ * A ModulePathCallback function can be used to modify the modify the where Workbox modules are loaded.
+ * @param {string} moduleName - The name of the module to load (i.e. 'workbox-core', 'workbox-precaching' etc.).
+ * @param {boolean} debug - When true, dev builds should be loaded, otherwise load prod builds.
+ * @returns {string} This callback should return a path of module. This will be passed to importScripts().
+ */
+type ModulePathCallback = (moduleName: string, debug: boolean) => string;
+
+interface IConfigOptions {
+	/**
+	 * If true, dev builds are using, otherwise prod builds are used. By default, prod is used unless on localhost.
+	 */
+	debug: boolean;
+
+	/**
+	 * To avoid using the CDN with workbox-sw set the path prefix of where modules should be loaded from. For example modulePathPrefix: '/third_party/workbox/v3.0.0/'.
+	 */
+	modulePathPrefix: string;
+
+	/**
+	 * If defined, this callback will be responsible for determining the path of each workbox module.
+	 */
+	modulePathCb: ModulePathCallback;
+}
+
+declare class WorkboxNamespace {
+	static readonly backgroundSync: typeof BackgroundSyncNamespace;
+	static readonly broadcastUpdate: typeof BroadcastUpdateNamespace;
+	static readonly cacheableResponse: typeof CacheableResponseNamespace;
+	static readonly core: typeof CoreNamespace;
+	static readonly expiration: typeof ExpirationNamespace;
+	static readonly googleAnalytics: typeof GoogleAnalyticsNamespace;
+	static readonly precaching: typeof PrecachingNamespace;
+	static readonly rangeRequests: typeof RangeRequestsNamespace;
+	static readonly routing: typeof RoutingNamespace;
+	static readonly strategies: typeof StrategiesNamespace;
+	static readonly streams: typeof StreamsNamespace;
+
+	/**
+	 * Claim any currently available clients once the service worker becomes active. This is normally used in conjunction with skipWaiting().
+	 */
+	static clientsClaim (): void;
+
+	/**
+	 * Load a Workbox module by passing in the appropriate module name.
+	 * This is not generally needed unless you know there are modules that are dynamically used and you want to safe guard use of the module while the user may be offline.
+	 * @param {string} moduleName
+	 */
+	static loadModule (moduleName: string): void;
+
+	/**
+	 * Updates the configuration options. You can specify whether to treat as a debug build and whether to use a CDN or a specific path when importing other workbox-modules
+	 * @param {Partial<IConfigOptions>} config
+	 */
+	static setConfig (config?: Partial<IConfigOptions>): void;
+
+	/**
+	 * Force a service worker to become active, instead of waiting. This is normally used in conjunction with clientsClaim().
+	 */
+	static skipWaiting (): void;
+}
+
+export default WorkboxNamespace;
diff --git a/types/workbox-sw/tsconfig.json b/types/workbox-sw/tsconfig.json
new file mode 100644
index 0000000000..d6c2821525
--- /dev/null
+++ b/types/workbox-sw/tsconfig.json
@@ -0,0 +1,26 @@
+{
+    "files": [
+        "index.d.ts",
+        "workbox-sw-tests.ts"
+    ],
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es2017",
+        "lib": [
+            "es2015",
+            "dom",
+            "webworker"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "strictFunctionTypes": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    }
+}
diff --git a/types/workbox-sw/tslint.json b/types/workbox-sw/tslint.json
new file mode 100644
index 0000000000..453ff1da24
--- /dev/null
+++ b/types/workbox-sw/tslint.json
@@ -0,0 +1,12 @@
+{
+	"extends": "dtslint/dt.json",
+	"rules": {
+		// TODO
+		"no-redundant-jsdoc-2": false,
+		"no-unnecessary-class": false,
+		"no-empty-interface": false,
+		"array-type": false,
+		"interface-name": false,
+		"space-before-function-paren": false
+	}
+}
diff --git a/types/workbox-sw/workbox-sw-tests.ts b/types/workbox-sw/workbox-sw-tests.ts
new file mode 100644
index 0000000000..37855310d5
--- /dev/null
+++ b/types/workbox-sw/workbox-sw-tests.ts
@@ -0,0 +1,11 @@
+import WorkboxSW from "workbox-sw";
+
+// $ExpectError
+WorkboxSW.core.setLogLevel(5); // $ExpectType void
+
+WorkboxSW.routing.registerRoute("/", WorkboxSW.strategies.networkFirst()); // $ExpectType Route
+
+// $ExpectError
+WorkboxSW.precaching.precacheAndRoute(/foo/);
+
+WorkboxSW.precaching.precacheAndRoute(["some-resource.js"], {directoryIndex: "/"}); // $ExpectType void
diff --git a/types/workerpool/index.d.ts b/types/workerpool/index.d.ts
new file mode 100644
index 0000000000..a170b26277
--- /dev/null
+++ b/types/workerpool/index.d.ts
@@ -0,0 +1,122 @@
+// Type definitions for workerpool 2.3
+// Project: https://github.com/josdejong/workerpool
+// Definitions by: Alorel <https://github.com/Alorel>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.3
+
+/// <reference types="node" />
+
+import * as cp from 'child_process';
+
+export interface WorkerPoolStats {
+    totalWorkers: number;
+    busyWorkers: number;
+    idleWorkers: number;
+    pendingTasks: number;
+    activeTasks: number;
+}
+
+export interface WorkerPool {
+    /**
+     * Execute a function on a worker with given arguments.
+     * @param method When method is a string, a method with this name must exist at the worker
+     * and must be registered to make it accessible via the pool.
+     * The function will be executed on the worker with given parameters.
+     * When method is a function, the provided function fn will be stringified, send to the worker,
+     * and executed there with the provided parameters. The provided function must be static,
+     * it must not depend on variables in a surrounding scope.
+     */
+    exec(method: ((...args: any[]) => any) | string, params: any[] | null): Promise<any>;
+
+    /**
+     * Create a proxy for the worker pool.
+     * The proxy contains a proxy for all methods available on the worker.
+     * All methods return promises resolving the methods result.
+     */
+    proxy(): Promise<any>;
+
+    /** Retrieve statistics on workers, and active and pending tasks. */
+    stats(): WorkerPoolStats;
+
+    /**
+     * If parameter force is false (default), workers will finish the tasks they are working on before terminating themselves.
+     * When force is true, all workers are terminated immediately without finishing running tasks.
+     * If timeout is provided, worker will be forced to terminal when the timeout expires and the worker has not finished.
+     */
+    terminate(force?: boolean, timeout?: number): Promise<any[]>;
+
+    /**
+     * Clear all workers from the pool.
+     * If parameter force is false (default), workers will finish the tasks they are working on before terminating themselves.
+     * When force is true, all workers are terminated immediately without finishing running tasks.
+     * @deprecated
+     */
+    clear(force?: boolean): Promise<any[]>;
+}
+
+export class Promise<T, E = Error> {
+    readonly resolved: boolean;
+    readonly rejected: boolean;
+    readonly pending: boolean;
+
+    always<TT>(handler: () => Promise<TT>): Promise<TT>;
+    then<TT, EE = Error>(result: (r: T) => TT, err?: (r: E) => EE): Promise<TT, EE>;
+    catch<TT>(err: (error: E) => TT): Promise<TT>;
+    cancel(): this;
+    timeout(delay: number): this;
+
+    static all(promises: Array<Promise<any, any>>): Array<Promise<any, any>>;
+}
+
+export namespace Promise {
+    // tslint:disable-next-line:strict-export-declare-modifiers
+    export class CancellationError extends Error {
+        name: 'CancellationError';
+    }
+
+    // tslint:disable-next-line:strict-export-declare-modifiers
+    export class TimeoutError extends Error {
+        name: 'TimeoutError';
+    }
+}
+
+export interface WorkerPoolOptions {
+    /**
+     * The minimum number of workers that must be initialized and kept available.
+     * Setting this to 'max' will create maxWorkers default workers.
+     */
+    minWorkers?: number | 'max';
+    /**
+     * The default number of maxWorkers is the number of CPU's minus one.
+     * When the number of CPU's could not be determined (for example in older browsers), maxWorkers is set to 3.
+     */
+    maxWorkers?: number;
+
+    /** 2nd argument to pass to childProcess.fork() */
+    forkArgs?: string[];
+
+    forkOpts?: cp.ForkOptions;
+}
+
+/**
+ * When a script argument is provided, the provided script will be started as a dedicated worker.
+ * When no script argument is provided, a default worker is started which can be used to offload functions dynamically via Pool.exec.
+ * Note that on node.js, script must be an absolute file path like __dirname + '/myWorker.js'.
+ */
+export function pool(pathToScript?: string, options?: WorkerPoolOptions): WorkerPool;
+
+/**
+ * When a script argument is provided, the provided script will be started as a dedicated worker.
+ * When no script argument is provided, a default worker is started which can be used to offload functions dynamically via Pool.exec.
+ * Note that on node.js, script must be an absolute file path like __dirname + '/myWorker.js'.
+ */
+export function pool(options?: WorkerPoolOptions): WorkerPool;
+
+/**
+ * Argument methods is optional can can be an object with functions available in the worker.
+ * Registered functions will be available via the worker pool.
+ */
+export function worker(methods?: {[k: string]: (...args: any[]) => any}): any;
+export const platform: 'node' | 'browser';
+export const isMainThread: boolean;
+export const cpus: number;
diff --git a/types/workerpool/tsconfig.json b/types/workerpool/tsconfig.json
new file mode 100644
index 0000000000..47460a6951
--- /dev/null
+++ b/types/workerpool/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",
+        "workerpool-tests.ts"
+    ]
+}
diff --git a/types/workerpool/tslint.json b/types/workerpool/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/workerpool/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/workerpool/workerpool-tests.ts b/types/workerpool/workerpool-tests.ts
new file mode 100644
index 0000000000..e691128548
--- /dev/null
+++ b/types/workerpool/workerpool-tests.ts
@@ -0,0 +1,34 @@
+import * as wp from 'workerpool';
+
+wp.pool('foo');
+wp.pool({minWorkers: 1});
+wp.pool({minWorkers: 'max'});
+wp.pool({minWorkers: 'max', maxWorkers: 1});
+wp.pool({minWorkers: 1, maxWorkers: 1});
+wp.pool({maxWorkers: 1});
+wp.pool({forkArgs: ['foo', 'bar']});
+wp.pool({forkOpts: {cwd: '/tmp'}});
+const pool = wp.pool();
+pool.clear()
+    .then(() => pool.terminate())
+    .then(() => pool.clear())
+    .then(() => pool.clear(true))
+    .then(() => pool.clear(false))
+    .then(() => pool.terminate(true))
+    .then(() => pool.terminate(false))
+    .then(() => pool.terminate(false, 1000));
+
+let x: number = pool.stats().activeTasks;
+x = pool.stats().busyWorkers;
+x = pool.stats().idleWorkers;
+x = pool.stats().pendingTasks;
+x = pool.stats().totalWorkers;
+
+pool.terminate().then(() => {});
+pool.proxy().then(() => {});
+pool.exec('foo', null)
+    .then(() => pool.exec('foo', []))
+    .then(() => pool.exec(() => {}, null));
+
+new wp.Promise.CancellationError();
+new wp.Promise.TimeoutError();
diff --git a/types/ws/index.d.ts b/types/ws/index.d.ts
index 3667941753..b99f9e4d88 100644
--- a/types/ws/index.d.ts
+++ b/types/ws/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for ws 5.1
+// Type definitions for ws 6.0
 // Project: https://github.com/websockets/ws
 // Definitions by: Paul Loyd <https://github.com/loyd>
 //                 Matt Silverlock <https://github.com/elithrar>
@@ -120,7 +120,7 @@ declare namespace WebSocket {
      * whether or not to accept the handshake.
      */
     type VerifyClientCallbackAsync = (info: { origin: string; secure: boolean; req: http.IncomingMessage }
-        , callback: (res: boolean, code?: number, message?: string) => void) => void;
+        , callback: (res: boolean, code?: number, message?: string, headers?: http.OutgoingHttpHeaders) => void) => void;
 
     interface ClientOptions {
         protocol?: string;
@@ -141,6 +141,7 @@ declare namespace WebSocket {
         key?: CertMeta;
         pfx?: string | Buffer;
         ca?: CertMeta;
+        maxPayload?: number;
     }
 
     interface PerMessageDeflateOptions {
@@ -148,8 +149,17 @@ declare namespace WebSocket {
         clientNoContextTakeover?: boolean;
         serverMaxWindowBits?: number;
         clientMaxWindowBits?: number;
-        level?: number;
-        memLevel?: number;
+        zlibDeflateOptions?: {
+            flush?: number;
+            finishFlush?: number;
+            chunkSize?: number;
+            windowBits?: number;
+            level?: number;
+            memLevel?: number;
+            strategy?: number;
+            dictionary?: Buffer | Buffer[] | DataView;
+            info?: boolean;
+        };
         threshold?: number;
         concurrencyLimit?: number;
     }
diff --git a/types/ws/ws-tests.ts b/types/ws/ws-tests.ts
index 51d37bea9c..bc62d9de98 100644
--- a/types/ws/ws-tests.ts
+++ b/types/ws/ws-tests.ts
@@ -88,7 +88,27 @@ import * as https from 'https';
             clientNoContextTakeover: true,
             serverMaxWindowBits: 0,
             clientMaxWindowBits: 0,
-            memLevel: 0
+            zlibDeflateOptions: {
+                flush: 0,
+                finishFlush: 0,
+                chunkSize: 0,
+                windowBits: 0,
+                level: 0,
+                memLevel: 0,
+                strategy: 0,
+                dictionary: new Buffer('test'),
+                info: false
+            }
+        },
+        verifyClient: (info: any, cb: any) => {
+            cb(true, 123, 'message', { Upgrade: "websocket" });
         }
     });
 }
+
+{
+    const ws = new WebSocket('ws://www.host.com/path', {
+        maxPayload: 10 * 1024 * 1024
+    });
+    ws.on('open', () => ws.send('something assume to be really long'));
+}
diff --git a/types/wu/index.d.ts b/types/wu/index.d.ts
index 3d44b5140f..08a1b9f19a 100644
--- a/types/wu/index.d.ts
+++ b/types/wu/index.d.ts
@@ -30,7 +30,7 @@ declare namespace wu {
 	function enumerate<T>(iter: Iterable<T>): Iterable<[number, T]>;
 	function every<T>(fn: Filter<T>, iter: Iterable<T>): boolean;
 	function filter<T>(fn: Filter<T>, iter: Iterable<T>): WuIterable<T>;
-	function find<T>(fn: Filter<T>, iter: Iterable<T>): T;
+	function find<T>(fn: Filter<T>, iter: Iterable<T>): T | undefined;
 	function flatten(iter: Iterable<any>): WuIterable<any>;
 	function flatten(shallow: boolean, iter: Iterable<any>): WuIterable<any>;
 	function forEach<T>(fn: Consumer<T>, iter: Iterable<T>): void;
@@ -79,7 +79,7 @@ declare namespace wu {
 		enumerate(): Iterable<[number, T]>;
 		every(fn: Filter<T>): boolean;
 		filter(fn: Filter<T>): WuIterable<T>;
-		find(fn: Filter<T>): T;
+		find(fn: Filter<T>): T | undefined;
 		flatten(shallow?: boolean): WuIterable<any>;
 		forEach(fn: Consumer<T>): void;
 		has(t: T): boolean;
diff --git a/types/x-ray/index.d.ts b/types/x-ray/index.d.ts
index 271155ef94..345059a8eb 100644
--- a/types/x-ray/index.d.ts
+++ b/types/x-ray/index.d.ts
@@ -2,7 +2,7 @@
 // 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
+// TypeScript Version: 2.8
 
 /// <reference types="node" />
 
diff --git a/types/xmlbuilder/index.d.ts b/types/xmlbuilder/index.d.ts
index 2115d30754..acaeddca11 100644
--- a/types/xmlbuilder/index.d.ts
+++ b/types/xmlbuilder/index.d.ts
@@ -3,7 +3,6 @@
 // Definitions by: Wallymathieu <https://github.com/wallymathieu>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
-
 export = xmlbuilder;
 
 declare namespace xmlbuilder {
@@ -87,5 +86,6 @@ declare namespace xmlbuilder {
         u(): XMLElementOrXMLNode;
     }
 
-    function create(nameOrObjSpec: string | { [name:string]: Object }, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
+    function create(nameOrObjSpec: string | { [name: string]: Object }, xmldec?: Object, doctype?: any, options?: Object): XMLElementOrXMLNode;
+    function begin(): XMLElementOrXMLNode;
 }
diff --git a/types/xmlbuilder/xmlbuilder-tests.ts b/types/xmlbuilder/xmlbuilder-tests.ts
index 8be8f780f9..0364d6fed8 100644
--- a/types/xmlbuilder/xmlbuilder-tests.ts
+++ b/types/xmlbuilder/xmlbuilder-tests.ts
@@ -1,6 +1,7 @@
 
 import xmlbuilder = require('xmlbuilder');
 var xml = xmlbuilder.create;
+var doc = xmlbuilder.begin;
 
 // https://github.com/oozcitak/xmlbuilder-js/blob/master/test/comment.coffee
 xml('comment', {}, {}, { headless: true }).comment('<>\'"&\t\n\r').end();
@@ -42,9 +43,12 @@ xml('root')
     .ele('atttest', 'text')
     .end();
 
+// https://github.com/oozcitak/xmlbuilder-js/blob/master/test/basic/begin.coffee
+doc().ele('root', { att: 'val' }).ele('test').end();
+
 xml({
-  displayNotification: {
-      level: 'error',
-      message: 'an error occurred'
-  }
+    displayNotification: {
+        level: 'error',
+        message: 'an error occurred'
+    }
 });
\ No newline at end of file
diff --git a/types/xrm/index.d.ts b/types/xrm/index.d.ts
index fdb6504e96..1b688c1e59 100644
--- a/types/xrm/index.d.ts
+++ b/types/xrm/index.d.ts
@@ -970,7 +970,7 @@ declare namespace Xrm {
          * 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>;
+        lookupObjects(lookupOptions: LookupOptions): Async.PromiseLike<LookupValue[]>;
 
         /**
          * Refreshes the parent grid containing the specified record.
diff --git a/types/yandex-maps/yandex-maps-tests.ts b/types/yandex-maps/yandex-maps-tests.ts
index 5c52936813..2406ef6cd6 100644
--- a/types/yandex-maps/yandex-maps-tests.ts
+++ b/types/yandex-maps/yandex-maps-tests.ts
@@ -23,7 +23,7 @@ const balloonLayout = ymaps.templateLayoutFactory.createClass(
 	{
 		build(this: ymaps.ILayout): void {
 			(<ymaps.layout.templateBased.Base> (<any> this.constructor).superclass).build.call(this);
-			this.getParentElement().children.item(0).children.item(0).appendChild((<any> this.getData()).properties.get("balloonContent"));
+			this.getParentElement().children.item(0)!.children.item(0)!.appendChild((<any> this.getData()).properties.get("balloonContent"));
 		}
 	}
 );
diff --git a/types/yar/index.d.ts b/types/yar/index.d.ts
index 79d55c1138..8f09e2023d 100644
--- a/types/yar/index.d.ts
+++ b/types/yar/index.d.ts
@@ -105,12 +105,17 @@ declare namespace yar {
              * an optional function to create custom session IDs.
              * Must retun a string and have the signature function (request) where:
              * request - (optional) is the original request received from the client.
+             * Defaults to uuidv4
              */
             customSessionIDGenerator?(req: Request): string;
         };
     }
 
     interface Yar {
+        /**
+         * Session id, see `customSessionIDGenerator`.
+         */
+        readonly id: string;
         /**
          * clears the session and assigns a new session id.
          */
diff --git a/types/yar/yar-tests.ts b/types/yar/yar-tests.ts
index 997b18f82b..c7e75e0a4b 100644
--- a/types/yar/yar-tests.ts
+++ b/types/yar/yar-tests.ts
@@ -18,7 +18,10 @@ async function boot() {
         method: 'get',
         handler(request: Request) {
             const example = request.yar.get('example');
-            return example.key;
+            return {
+                id: request.yar.id,
+                key: example.key,
+            };
         },
     });
 }
diff --git a/types/yargs-interactive/index.d.ts b/types/yargs-interactive/index.d.ts
new file mode 100644
index 0000000000..0f0d3461de
--- /dev/null
+++ b/types/yargs-interactive/index.d.ts
@@ -0,0 +1,26 @@
+// Type definitions for yargs-interactive 2.0
+// Project: https://github.com/nanovazquez/yargs-interactive#readme
+// Definitions by: Steven Zeck <https://github.com/szeck87>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+declare function yargsInteractive(): yargsInteractive.Interactive;
+
+declare namespace yargsInteractive {
+    interface OptionData {
+        type: string;
+        describe: string;
+        default?: string | number | boolean;
+        prompt?: string;
+        options?: string[];
+    }
+    interface Option {
+        [key: string]: OptionData | { default: boolean };
+    }
+    interface Interactive {
+        usage(usage: string): Interactive;
+        interactive(options: Option): Interactive;
+        then(callback: (result: any) => any): Interactive;
+    }
+}
+
+export = yargsInteractive;
diff --git a/types/yargs-interactive/tsconfig.json b/types/yargs-interactive/tsconfig.json
new file mode 100644
index 0000000000..5b8ffeee31
--- /dev/null
+++ b/types/yargs-interactive/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",
+        "yargs-interactive-tests.ts"
+    ]
+}
diff --git a/types/yargs-interactive/tslint.json b/types/yargs-interactive/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yargs-interactive/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yargs-interactive/yargs-interactive-tests.ts b/types/yargs-interactive/yargs-interactive-tests.ts
new file mode 100644
index 0000000000..cff1ca16c2
--- /dev/null
+++ b/types/yargs-interactive/yargs-interactive-tests.ts
@@ -0,0 +1,19 @@
+/// <reference types="node" />
+
+import yargsInteractive = require("yargs-interactive");
+
+const options: yargsInteractive.Option = {
+  color: {
+    describe: "What is your favorite color?",
+    prompt: "always",
+    type: "input",
+    default: "Blue",
+  }
+};
+
+yargsInteractive()
+  .usage("$0 <command> [args]")
+  .interactive(options)
+  .then((result: any) => {
+    console.log(result);
+  });
diff --git a/types/yargs/index.d.ts b/types/yargs/index.d.ts
index 882e8e9999..07d8d9958f 100644
--- a/types/yargs/index.d.ts
+++ b/types/yargs/index.d.ts
@@ -1,4 +1,4 @@
-// Type definitions for yargs 11.0
+// Type definitions for yargs 11.1
 // Project: https://github.com/chevex/yargs
 // Definitions by: Martin Poelstra <https://github.com/poelstra>
 //                 Mizunashi Mana <https://github.com/mizunashi-mana>
@@ -116,6 +116,8 @@ declare namespace yargs {
 
         group(key: string | string[], groupName: string): Argv;
 
+        hide(key: string): Argv;
+
         help(): Argv;
         help(enableExplicit: boolean): Argv;
         help(option: string, enableExplicit: boolean): Argv;
@@ -183,8 +185,13 @@ declare namespace yargs {
          */
         reset(): Argv;
 
+        scriptName($0: string): Argv;
+
         showCompletionScript(): Argv;
 
+        showhidden(option?: string | boolean): Argv;
+        showhidden(option: string, description?: string): Argv;
+
         showHelp(consoleLevel?: string): Argv;
 
         showHelpOnFail(enable: boolean, message?: string): Argv;
diff --git a/types/yargs/yargs-tests.ts b/types/yargs/yargs-tests.ts
index 43779309bf..d2d06e5bc6 100644
--- a/types/yargs/yargs-tests.ts
+++ b/types/yargs/yargs-tests.ts
@@ -648,3 +648,21 @@ function Argv$check() {
         .check((argv, aliases) => void 0)
         .check((argv, aliases) => void 0, false);
 }
+
+function Argv$hide() {
+    const ya = yargs
+        .hide('a');
+}
+
+function Argv$showhidden() {
+    const ya = yargs
+        .showhidden()
+        .showhidden(true)
+        .showhidden('show-hidden')
+        .showhidden('show-hidden', 'Show hidden options');
+}
+
+function Argv$scriptName() {
+    const ya = yargs
+        .scriptName("my-script");
+}
diff --git a/types/yesql/index.d.ts b/types/yesql/index.d.ts
new file mode 100644
index 0000000000..0fd68065ea
--- /dev/null
+++ b/types/yesql/index.d.ts
@@ -0,0 +1,20 @@
+// Type definitions for yesql 3.2
+// Project: https://github.com/pihvi/yesql#readme
+// Definitions by: Lluís Ulzurrun de Asanza Sáez <https://github.com/Sumolari>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.2
+
+declare function readSqlFiles(
+    dir: string,
+    options?: {
+        pg?: boolean,
+        type?: 'pg' | 'mysql'
+    }
+): string;
+
+declare namespace readSqlFiles {
+    function pg(query: string): (data: object) => {text: string, values: any[]};
+    function mysql(query: string): (data: object) => {sql: string, values: any[]};
+}
+
+export = readSqlFiles;
diff --git a/types/yesql/tsconfig.json b/types/yesql/tsconfig.json
new file mode 100644
index 0000000000..cd44319d86
--- /dev/null
+++ b/types/yesql/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",
+        "yesql-tests.ts"
+    ]
+}
diff --git a/types/yesql/tslint.json b/types/yesql/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yesql/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yesql/yesql-tests.ts b/types/yesql/yesql-tests.ts
new file mode 100644
index 0000000000..7f1aa7b91a
--- /dev/null
+++ b/types/yesql/yesql-tests.ts
@@ -0,0 +1,17 @@
+import * as yesql from "yesql";
+
+yesql(''); // $ExpectType string
+yesql('', {pg: true}); // $ExpectType string
+yesql('', {type: 'mysql'}); // $ExpectType string
+
+yesql.pg(''); // $ExpectType (data: object) => { text: string; values: any[]; }
+yesql.pg('')({}); // $ExpectType { text: string; values: any[]; }
+
+yesql.pg('')('demo'); // $ExpectError
+yesql.pg('')(42); // $ExpectError
+
+yesql.mysql(''); // $ExpectType (data: object) => { sql: string; values: any[]; }
+yesql.mysql('')({}); // $ExpectType { sql: string; values: any[]; }
+
+yesql.mysql('')('demo'); // $ExpectError
+yesql.mysql('')(42); // $ExpectError
diff --git a/types/yoctodelay/index.d.ts b/types/yoctodelay/index.d.ts
new file mode 100644
index 0000000000..ba4d2c6c58
--- /dev/null
+++ b/types/yoctodelay/index.d.ts
@@ -0,0 +1,12 @@
+// Type definitions for yoctodelay 1.1
+// Project: https://github.com/sindresorhus/yoctodelay#readme
+// Definitions by: Sean Marvi Oliver Genabe <https://github.com/seangenabe>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+/**
+ * Delay the promise and then resolve.
+ * @param ms Milliseconds to delay the promise.
+ */
+declare function delay(ms: number): Promise<void>;
+
+export = delay;
diff --git a/types/yoctodelay/tsconfig.json b/types/yoctodelay/tsconfig.json
new file mode 100644
index 0000000000..6f4d1bf068
--- /dev/null
+++ b/types/yoctodelay/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",
+        "yoctodelay-tests.ts"
+    ]
+}
diff --git a/types/yoctodelay/tslint.json b/types/yoctodelay/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/yoctodelay/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/yoctodelay/yoctodelay-tests.ts b/types/yoctodelay/yoctodelay-tests.ts
new file mode 100644
index 0000000000..67a0158d50
--- /dev/null
+++ b/types/yoctodelay/yoctodelay-tests.ts
@@ -0,0 +1,4 @@
+import delay = require('yoctodelay'); // delay is(ms: number) => Promise<void>
+
+// $ExpectType Promise<void>
+delay(4);
diff --git a/types/yog2-kernel/index.d.ts b/types/yog2-kernel/index.d.ts
index ea12cc4da9..0a6d1abc1e 100644
--- a/types/yog2-kernel/index.d.ts
+++ b/types/yog2-kernel/index.d.ts
@@ -2,7 +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
+// TypeScript Version: 2.6
 
 import * as express from "express";
 import * as _ from "lodash";
diff --git a/types/yoga-layout/index.d.ts b/types/yoga-layout/index.d.ts
new file mode 100644
index 0000000000..4014834802
--- /dev/null
+++ b/types/yoga-layout/index.d.ts
@@ -0,0 +1,414 @@
+// Type definitions for yoga-layout 1.9
+// Project: https://github.com/facebook/yoga#readme
+// Definitions by: tnobody <https://github.com/tnobody>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.1
+
+export const ALIGN_AUTO: 0;
+export const ALIGN_COUNT: 8;
+export const ALIGN_FLEX_START: 1;
+export const ALIGN_CENTER: 2;
+export const ALIGN_FLEX_END: 3;
+export const ALIGN_STRETCH: 4;
+export const ALIGN_BASELINE: 5;
+export const ALIGN_SPACE_BETWEEN: 6;
+export const ALIGN_SPACE_AROUND: 7;
+export const DIMENSION_COUNT: 2;
+export const DIMENSION_WIDTH: 0;
+export const DIMENSION_HEIGHT: 1;
+export const DIRECTION_COUNT: 3;
+export const DIRECTION_INHERIT: 0;
+export const DIRECTION_LTR: 1;
+export const DIRECTION_RTL: 2;
+export const DISPLAY_COUNT: 2;
+export const DISPLAY_FLEX: 0;
+export const DISPLAY_NONE: 1;
+export const EDGE_COUNT: 9;
+export const EDGE_LEFT: 0;
+export const EDGE_TOP: 1;
+export const EDGE_RIGHT: 2;
+export const EDGE_BOTTOM: 3;
+export const EDGE_START: 4;
+export const EDGE_END: 5;
+export const EDGE_HORIZONTAL: 6;
+export const EDGE_VERTICAL: 7;
+export const EDGE_ALL: 8;
+export const EXPERIMENTAL_FEATURE_COUNT: 1;
+export const EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS: 0;
+export const FLEX_DIRECTION_COUNT: 4;
+export const FLEX_DIRECTION_COLUMN: 0;
+export const FLEX_DIRECTION_COLUMN_REVERSE: 1;
+export const FLEX_DIRECTION_ROW: 2;
+export const FLEX_DIRECTION_ROW_REVERSE: 3;
+export const JUSTIFY_COUNT: 6;
+export const JUSTIFY_FLEX_START: 0;
+export const JUSTIFY_CENTER: 1;
+export const JUSTIFY_FLEX_END: 2;
+export const JUSTIFY_SPACE_BETWEEN: 3;
+export const JUSTIFY_SPACE_AROUND: 4;
+export const JUSTIFY_SPACE_EVENLY: 5;
+export const LOG_LEVEL_COUNT: 6;
+export const LOG_LEVEL_ERROR: 0;
+export const LOG_LEVEL_WARN: 1;
+export const LOG_LEVEL_INFO: 2;
+export const LOG_LEVEL_DEBUG: 3;
+export const LOG_LEVEL_VERBOSE: 4;
+export const LOG_LEVEL_FATAL: 5;
+export const MEASURE_MODE_COUNT: 3;
+export const MEASURE_MODE_UNDEFINED: 0;
+export const MEASURE_MODE_EXACTLY: 1;
+export const MEASURE_MODE_AT_MOST: 2;
+export const NODE_TYPE_COUNT: 2;
+export const NODE_TYPE_DEFAULT: 0;
+export const NODE_TYPE_TEXT: 1;
+export const OVERFLOW_COUNT: 3;
+export const OVERFLOW_VISIBLE: 0;
+export const OVERFLOW_HIDDEN: 1;
+export const OVERFLOW_SCROLL: 2;
+export const POSITION_TYPE_COUNT: 2;
+export const POSITION_TYPE_RELATIVE: 0;
+export const POSITION_TYPE_ABSOLUTE: 1;
+export const PRINT_OPTIONS_COUNT: 3;
+export const PRINT_OPTIONS_LAYOUT: 1;
+export const PRINT_OPTIONS_STYLE: 2;
+export const PRINT_OPTIONS_CHILDREN: 4;
+export const UNIT_COUNT: 4;
+export const UNIT_UNDEFINED: 0;
+export const UNIT_POINT: 1;
+export const UNIT_PERCENT: 2;
+export const UNIT_AUTO: 3;
+export const WRAP_COUNT: 3;
+export const WRAP_NO_WRAP: 0;
+export const WRAP_WRAP: 1;
+export const WRAP_WRAP_REVERSE: 2;
+
+interface ConstantsStatic {
+   readonly ALIGN_AUTO: typeof ALIGN_AUTO;
+   readonly ALIGN_COUNT: typeof ALIGN_COUNT;
+   readonly ALIGN_FLEX_START: typeof ALIGN_FLEX_START;
+   readonly ALIGN_CENTER: typeof ALIGN_CENTER;
+   readonly ALIGN_FLEX_END: typeof ALIGN_FLEX_END;
+   readonly ALIGN_STRETCH: typeof ALIGN_STRETCH;
+   readonly ALIGN_BASELINE: typeof ALIGN_BASELINE;
+   readonly ALIGN_SPACE_BETWEEN: typeof ALIGN_SPACE_BETWEEN;
+   readonly ALIGN_SPACE_AROUND: typeof ALIGN_SPACE_AROUND;
+   readonly DIMENSION_COUNT: typeof DIMENSION_COUNT;
+   readonly DIMENSION_WIDTH: typeof DIMENSION_WIDTH;
+   readonly DIMENSION_HEIGHT: typeof DIMENSION_HEIGHT;
+   readonly DIRECTION_COUNT: typeof DIRECTION_COUNT;
+   readonly DIRECTION_INHERIT: typeof DIRECTION_INHERIT;
+   readonly DIRECTION_LTR: typeof DIRECTION_LTR;
+   readonly DIRECTION_RTL: typeof DIRECTION_RTL;
+   readonly DISPLAY_COUNT: typeof DISPLAY_COUNT;
+   readonly DISPLAY_FLEX: typeof DISPLAY_FLEX;
+   readonly DISPLAY_NONE: typeof DISPLAY_NONE;
+   readonly EDGE_COUNT: typeof EDGE_COUNT;
+   readonly EDGE_LEFT: typeof EDGE_LEFT;
+   readonly EDGE_TOP: typeof EDGE_TOP;
+   readonly EDGE_RIGHT: typeof EDGE_RIGHT;
+   readonly EDGE_BOTTOM: typeof EDGE_BOTTOM;
+   readonly EDGE_START: typeof EDGE_START;
+   readonly EDGE_END: typeof EDGE_END;
+   readonly EDGE_HORIZONTAL: typeof EDGE_HORIZONTAL;
+   readonly EDGE_VERTICAL: typeof EDGE_VERTICAL;
+   readonly EDGE_ALL: typeof EDGE_ALL;
+   readonly EXPERIMENTAL_FEATURE_COUNT: typeof EXPERIMENTAL_FEATURE_COUNT;
+   readonly EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS: typeof EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS;
+   readonly FLEX_DIRECTION_COUNT: typeof FLEX_DIRECTION_COUNT;
+   readonly FLEX_DIRECTION_COLUMN: typeof FLEX_DIRECTION_COLUMN;
+   readonly FLEX_DIRECTION_COLUMN_REVERSE: typeof FLEX_DIRECTION_COLUMN_REVERSE;
+   readonly FLEX_DIRECTION_ROW: typeof FLEX_DIRECTION_ROW;
+   readonly FLEX_DIRECTION_ROW_REVERSE: typeof FLEX_DIRECTION_ROW_REVERSE;
+   readonly JUSTIFY_COUNT: typeof JUSTIFY_COUNT;
+   readonly JUSTIFY_FLEX_START: typeof JUSTIFY_FLEX_START;
+   readonly JUSTIFY_CENTER: typeof JUSTIFY_CENTER;
+   readonly JUSTIFY_FLEX_END: typeof JUSTIFY_FLEX_END;
+   readonly JUSTIFY_SPACE_BETWEEN: typeof JUSTIFY_SPACE_BETWEEN;
+   readonly JUSTIFY_SPACE_AROUND: typeof JUSTIFY_SPACE_AROUND;
+   readonly JUSTIFY_SPACE_EVENLY: typeof JUSTIFY_SPACE_EVENLY;
+   readonly LOG_LEVEL_COUNT: typeof LOG_LEVEL_COUNT;
+   readonly LOG_LEVEL_ERROR: typeof LOG_LEVEL_ERROR;
+   readonly LOG_LEVEL_WARN: typeof LOG_LEVEL_WARN;
+   readonly LOG_LEVEL_INFO: typeof LOG_LEVEL_INFO;
+   readonly LOG_LEVEL_DEBUG: typeof LOG_LEVEL_DEBUG;
+   readonly LOG_LEVEL_VERBOSE: typeof LOG_LEVEL_VERBOSE;
+   readonly LOG_LEVEL_FATAL: typeof LOG_LEVEL_FATAL;
+   readonly MEASURE_MODE_COUNT: typeof MEASURE_MODE_COUNT;
+   readonly MEASURE_MODE_UNDEFINED: typeof MEASURE_MODE_UNDEFINED;
+   readonly MEASURE_MODE_EXACTLY: typeof MEASURE_MODE_EXACTLY;
+   readonly MEASURE_MODE_AT_MOST: typeof MEASURE_MODE_AT_MOST;
+   readonly NODE_TYPE_COUNT: typeof NODE_TYPE_COUNT;
+   readonly NODE_TYPE_DEFAULT: typeof NODE_TYPE_DEFAULT;
+   readonly NODE_TYPE_TEXT: typeof NODE_TYPE_TEXT;
+   readonly OVERFLOW_COUNT: typeof OVERFLOW_COUNT;
+   readonly OVERFLOW_VISIBLE: typeof OVERFLOW_VISIBLE;
+   readonly OVERFLOW_HIDDEN: typeof OVERFLOW_HIDDEN;
+   readonly OVERFLOW_SCROLL: typeof OVERFLOW_SCROLL;
+   readonly POSITION_TYPE_COUNT: typeof POSITION_TYPE_COUNT;
+   readonly POSITION_TYPE_RELATIVE: typeof POSITION_TYPE_RELATIVE;
+   readonly POSITION_TYPE_ABSOLUTE: typeof POSITION_TYPE_ABSOLUTE;
+   readonly PRINT_OPTIONS_COUNT: typeof PRINT_OPTIONS_COUNT;
+   readonly PRINT_OPTIONS_LAYOUT: typeof PRINT_OPTIONS_LAYOUT;
+   readonly PRINT_OPTIONS_STYLE: typeof PRINT_OPTIONS_STYLE;
+   readonly PRINT_OPTIONS_CHILDREN: typeof PRINT_OPTIONS_CHILDREN;
+   readonly UNIT_COUNT: typeof UNIT_COUNT;
+   readonly UNIT_UNDEFINED: typeof UNIT_UNDEFINED;
+   readonly UNIT_POINT: typeof UNIT_POINT;
+   readonly UNIT_PERCENT: typeof UNIT_PERCENT;
+   readonly UNIT_AUTO: typeof UNIT_AUTO;
+   readonly WRAP_COUNT: typeof WRAP_COUNT;
+   readonly WRAP_NO_WRAP: typeof WRAP_NO_WRAP;
+   readonly WRAP_WRAP: typeof WRAP_WRAP;
+   readonly WRAP_WRAP_REVERSE: typeof WRAP_WRAP_REVERSE;
+}
+
+declare const Constans: ConstantsStatic;
+
+export type YogaJustifyContent =
+    | typeof JUSTIFY_CENTER
+    | typeof JUSTIFY_FLEX_END
+    | typeof JUSTIFY_FLEX_START
+    | typeof JUSTIFY_SPACE_AROUND
+    | typeof JUSTIFY_SPACE_BETWEEN
+    | typeof JUSTIFY_SPACE_EVENLY;
+
+export type YogaAlign =
+    | typeof ALIGN_AUTO
+    | typeof ALIGN_BASELINE
+    | typeof ALIGN_CENTER
+    | typeof ALIGN_FLEX_END
+    | typeof ALIGN_FLEX_START
+    | typeof ALIGN_SPACE_AROUND
+    | typeof ALIGN_SPACE_BETWEEN
+    | typeof ALIGN_STRETCH;
+
+export type YogaFlexDirection =
+    | typeof FLEX_DIRECTION_COLUMN
+    | typeof FLEX_DIRECTION_COLUMN_REVERSE
+    | typeof FLEX_DIRECTION_COUNT
+    | typeof FLEX_DIRECTION_ROW
+    | typeof FLEX_DIRECTION_ROW_REVERSE;
+
+export type YogaDirection =
+    | typeof DIRECTION_INHERIT
+    | typeof DIRECTION_LTR
+    | typeof DIRECTION_RTL;
+
+export type YogaFlexWrap =
+    | typeof WRAP_NO_WRAP
+    | typeof WRAP_WRAP
+    | typeof WRAP_WRAP_REVERSE;
+
+export type YogaEdge =
+    | typeof EDGE_LEFT
+    | typeof EDGE_TOP
+    | typeof EDGE_RIGHT
+    | typeof EDGE_BOTTOM
+    | typeof EDGE_START
+    | typeof EDGE_END
+    | typeof EDGE_HORIZONTAL
+    | typeof EDGE_VERTICAL
+    | typeof EDGE_ALL;
+
+export type YogaDisplay =
+    | typeof DISPLAY_FLEX
+    | typeof DISPLAY_NONE;
+
+export type YogaUnit =
+    | typeof UNIT_AUTO
+    | typeof UNIT_PERCENT
+    | typeof UNIT_POINT
+    | typeof UNIT_UNDEFINED;
+
+export type YogaOverflow =
+    | typeof OVERFLOW_HIDDEN
+    | typeof OVERFLOW_SCROLL
+    | typeof OVERFLOW_VISIBLE;
+
+export type YogaPositionType =
+    | typeof POSITION_TYPE_ABSOLUTE
+    | typeof POSITION_TYPE_RELATIVE;
+
+export type YogaExperimentalFeature = typeof EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS;
+
+export interface YogaNode {
+    calculateLayout(
+        width?: number,
+        height?: number,
+        direction?: YogaDirection,
+    ): void;
+    copyStyle(node: YogaNode): void;
+    free(): void;
+    freeRecursive(): void;
+    getAlignContent(): YogaAlign;
+    getAlignItems(): YogaAlign;
+    getAlignSelf(): YogaAlign;
+    getAspectRatio(): number;
+    getBorder(edge: YogaEdge): number;
+    getChild(index: number): YogaNode;
+    getChildCount(): number;
+    getComputedBorder(edge: YogaEdge): number;
+    getComputedBottom(): number;
+    getComputedHeight(): number;
+    getComputedLayout(): Layout;
+    getComputedLeft(): number;
+    getComputedMargin(edge: YogaEdge): number;
+    getComputedPadding(edge: YogaEdge): number;
+    getComputedRight(): number;
+    getComputedTop(): number;
+    getComputedWidth(): number;
+    getDisplay(): YogaDisplay;
+    getFlexBasis(): number;
+    getFlexDirection(): YogaFlexDirection;
+    getFlexGrow(): number;
+    getFlexShrink(): number;
+    getFlexWrap(): YogaFlexWrap;
+    getHeight(): Value;
+    getJustifyContent(): YogaJustifyContent;
+    getMargin(edge: YogaEdge): Value;
+    getMaxHeight(): Value;
+    getMaxWidth(): Value;
+    getMinHeight(): Value;
+    getMinWidth(): Value;
+    getOverflow(): YogaOverflow;
+    getPadding(edge: YogaEdge): Value;
+    getParent(): YogaNode | null;
+    getPosition(edge: YogaEdge): Value;
+    getPositionType(): YogaPositionType;
+    getWidth(): Value;
+    insertChild(child: YogaNode, index: number): void;
+    isDirty(): boolean;
+    markDirty(): void;
+    removeChild(child: YogaNode): void;
+    reset(): void;
+    setAlignContent(alignContent: YogaAlign): void;
+    setAlignItems(alignItems: YogaAlign): void;
+    setAlignSelf(alignSelf: YogaAlign): void;
+    setAspectRatio(aspectRatio: number): void;
+    setBorder(edge: YogaEdge, borderWidth: number): void;
+    setDisplay(display: YogaDisplay): void;
+    setFlex(flex: number): void;
+    setFlexBasis(flexBasis: number | string): void;
+    setFlexBasisPercent(flexBasis: number): void;
+    setFlexDirection(flexDirection: YogaFlexDirection): void;
+    setFlexGrow(flexGrow: number): void;
+    setFlexShrink(flexShrink: number): void;
+    setFlexWrap(flexWrap: YogaFlexWrap): void;
+    setHeight(height: number | string): void;
+    setHeightAuto(): void;
+    setHeightPercent(height: number): void;
+    setJustifyContent(justifyContent: YogaJustifyContent): void;
+    setMargin(edge: YogaEdge, margin: number): void;
+    setMarginAuto(edge: YogaEdge): void;
+    setMarginPercent(edge: YogaEdge, margin: number): void;
+    setMaxHeight(maxHeight: number | string): void;
+    setMaxHeightPercent(maxHeight: number): void;
+    setMaxWidth(maxWidth: number | string): void;
+    setMaxWidthPercent(maxWidth: number): void;
+    setMeasureFunc(measureFunc: (() => any) | null): void;
+    setMinHeight(minHeight: number | string): void;
+    setMinHeightPercent(minHeight: number): void;
+    setMinWidth(minWidth: number | string): void;
+    setMinWidthPercent(minWidth: number): void;
+    setOverflow(overflow: YogaOverflow): void;
+    setPadding(edge: YogaEdge, padding: number | string): void;
+    setPaddingPercent(edge: YogaEdge, padding: number): void;
+    setPosition(edge: YogaEdge, position: number | string): void;
+    setPositionPercent(edge: YogaEdge, position: number): void;
+    setPositionType(positionType: YogaPositionType): void;
+    setWidth(width: number | string): void;
+    setWidthAuto(): void;
+    setWidthPercent(width: number): void;
+    unsetMeasureFun(): void;
+}
+
+export class Layout {
+    readonly left: number;
+    readonly right: number;
+    readonly top: number;
+    readonly bottom: number;
+    readonly width: number;
+    readonly height: number;
+    constructor(
+        left: number,
+        right: number,
+        top: number,
+        bottom: number,
+        width: number,
+        height: number,
+    );
+
+    fromJs(expose: (
+        left: number,
+        right: number,
+        top: number,
+        bottom: number,
+        width: number,
+        height: number,
+    ) => any): void;
+
+    toString(): string;
+}
+
+export class Size {
+    static fromJS(dim: { width: number, height: number }): Size;
+
+    readonly width: number;
+    readonly height: number;
+
+    constructor(width: number, height: number);
+
+    fromJS(expose: (width: number, height: number) => any): void;
+
+    toString(): string;
+}
+
+export class Value {
+    readonly unit: YogaUnit | number;
+    readonly value: number;
+
+    constructor(unit: YogaUnit | number, value: number);
+
+    fromJS(expose: (unit: YogaUnit | number, value: number) => any): void;
+
+    toString(): string;
+    valueOf(): number;
+}
+
+export interface YogaConfig {
+    isExperimentalFeatureEnabled(feature: YogaExperimentalFeature): boolean;
+    setExperimentalFeatureEnabled(
+        feature: YogaExperimentalFeature,
+        enabled: boolean,
+    ): void;
+    setPointScaleFactor(factor: number): void;
+}
+
+interface NodeStatic {
+    create(): YogaNode;
+    createDefault(): YogaNode;
+    createWithConfig(config: YogaConfig): YogaNode;
+    destroy(node: YogaNode): any;
+}
+
+export const Node: NodeStatic;
+
+interface ConfigStatic {
+    create(): YogaConfig;
+    destroy(config: YogaConfig): any;
+}
+
+export const Config: ConfigStatic;
+
+interface YogaStatic extends ConstantsStatic {
+    Node: typeof Node;
+    Config: typeof Config;
+    Layout: typeof Layout;
+    Size: typeof Size;
+    Value: typeof Value;
+    getInstanceCount(): number;
+}
+
+declare const Yoga: YogaStatic;
+
+export default Yoga;
diff --git a/types/yoga-layout/tsconfig.json b/types/yoga-layout/tsconfig.json
new file mode 100644
index 0000000000..d7224a2b00
--- /dev/null
+++ b/types/yoga-layout/tsconfig.json
@@ -0,0 +1,23 @@
+{
+    "compilerOptions": {
+        "strictFunctionTypes": true,
+        "module": "commonjs",
+        "lib": [
+            "es6"
+        ],
+        "noImplicitAny": true,
+        "noImplicitThis": true,
+        "strictNullChecks": true,
+        "baseUrl": "../",
+        "typeRoots": [
+            "../"
+        ],
+        "types": [],
+        "noEmit": true,
+        "forceConsistentCasingInFileNames": true
+    },
+    "files": [
+        "index.d.ts",
+        "yoga-layout-tests.ts"
+    ]
+}
diff --git a/types/yoga-layout/tslint.json b/types/yoga-layout/tslint.json
new file mode 100644
index 0000000000..369f49adf2
--- /dev/null
+++ b/types/yoga-layout/tslint.json
@@ -0,0 +1,6 @@
+{ 
+    "extends": "dtslint/dt.json",
+    "rules": {
+        "file-name-casing": false
+    }
+}
diff --git a/types/yoga-layout/yoga-layout-tests.ts b/types/yoga-layout/yoga-layout-tests.ts
new file mode 100644
index 0000000000..c2effbef23
--- /dev/null
+++ b/types/yoga-layout/yoga-layout-tests.ts
@@ -0,0 +1,24 @@
+import yoga, { Node, Config, Size, Value, DISPLAY_FLEX } from 'yoga-layout';
+
+const cfg = Config.create();
+
+cfg.isExperimentalFeatureEnabled(yoga.EXPERIMENTAL_FEATURE_WEB_FLEX_BASIS);
+
+const root = Node.createWithConfig(cfg);
+root.setWidth(500);
+root.setHeight(300);
+root.setJustifyContent(yoga.JUSTIFY_CENTER);
+
+const node1 = yoga.Node.create();
+node1.setWidth(100);
+node1.setHeight(100);
+node1.setDisplay(DISPLAY_FLEX);
+
+const node2 = Node.create();
+node2.setWidth(100);
+node2.setHeight(100);
+
+root.insertChild(node1, 0);
+root.insertChild(node2, 1);
+
+root.calculateLayout(500, 300, yoga.DIRECTION_LTR);
diff --git a/types/yup/index.d.ts b/types/yup/index.d.ts
index 243cb985c1..2dcf110a9e 100644
--- a/types/yup/index.d.ts
+++ b/types/yup/index.d.ts
@@ -12,6 +12,7 @@ export function addMethod<T extends Schema<any>>(schemaCtor: AnySchemaConstructo
 export function ref(path: string, options?: { contextPrefix: string }): Ref;
 export function lazy<T>(fn: (value: T) => Schema<T>): Lazy;
 export function ValidationError(errors: string | string[], value: any, path: string, type?: any): ValidationError;
+export function setLocale(customLocale: LocaleObject): void;
 
 export const mixed: MixedSchemaConstructor;
 export const string: StringSchemaConstructor;
@@ -54,7 +55,7 @@ export interface Schema<T> {
     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 | Promise<boolean>, callbackStyleAsync?: boolean): this;
+    test(name: string, message: string, test: (this: TestContext, value?: any) => boolean | ValidationError | Promise<boolean | ValidationError>, callbackStyleAsync?: boolean): this;
     test(options: TestOptions): this;
     transform(fn: TransformFunction<this>): this;
 }
@@ -161,6 +162,14 @@ export type WhenOptions<T> = WhenOptionsBuilder<T>
     | { is: boolean | ((value: any) => boolean), then: any, otherwise: any }
     | object;
 
+export interface TestContext {
+    path: string;
+    options: ValidateOptions;
+    parent: any;
+    schema: Schema<any>;
+    createError: (params: { path: string, message: string }) => ValidationError;
+}
+
 export interface ValidateOptions {
     /**
      * Only validate the input, and skip and coercion or transformation. Default - false
@@ -193,7 +202,7 @@ export interface TestOptions {
     /**
      * Test function, determines schema validity
      */
-    test: (value: any) => boolean | Promise<boolean>;
+    test: (this: TestContext, value: any) => boolean | ValidationError | Promise<boolean | ValidationError>;
 
     /**
      * The validation error message
diff --git a/types/yup/lib/customLocale.d.ts b/types/yup/lib/customLocale.d.ts
deleted file mode 100644
index b0abe418f3..0000000000
--- a/types/yup/lib/customLocale.d.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import {
-  LocaleObject,
-} from "../index";
-
-export function setLocale(customLocale: LocaleObject): void;
diff --git a/types/yup/tsconfig.json b/types/yup/tsconfig.json
index 2f701d2d03..7a38726edd 100644
--- a/types/yup/tsconfig.json
+++ b/types/yup/tsconfig.json
@@ -18,7 +18,6 @@
     },
     "files": [
         "index.d.ts",
-        "lib/customLocale.d.ts",
         "yup-tests.ts"
     ]
-}
\ No newline at end of file
+}
diff --git a/types/yup/yup-tests.ts b/types/yup/yup-tests.ts
index 871df0e8e0..c6f367a043 100644
--- a/types/yup/yup-tests.ts
+++ b/types/yup/yup-tests.ts
@@ -1,8 +1,7 @@
 import * as yup from 'yup';
-import { setLocale } from 'yup/lib/customLocale';
 
 // tslint:disable-next-line:no-duplicate-imports
-import { reach, date, Schema, ObjectSchema, ValidationError, MixedSchema, SchemaDescription, TestOptions, ValidateOptions, NumberSchema } from 'yup';
+import { reach, date, Schema, ObjectSchema, ValidationError, MixedSchema, SchemaDescription, TestOptions, ValidateOptions, NumberSchema, TestContext } from 'yup';
 
 // reach function
 let schema = yup.object().shape({
@@ -124,6 +123,43 @@ mixed.test({
     test: value => value == null || value.length <= 5
 });
 mixed.test('with-promise', 'It contains invalid value', value => new Promise(resolve => true));
+const testContext = function(this: TestContext) {
+    // $ExpectType string
+    this.path;
+    // $ExpectType ValidateOptions
+    this.options;
+    // $ExpectType any
+    this.parent;
+    // $ExpectType Schema<any>
+    this.schema;
+    // $ExpectType ValidationError
+    this.createError({ path: '1', message: '1' });
+    return true;
+};
+mixed.test('with-context', 'it uses function context', testContext);
+mixed.test({
+    test: testContext
+});
+
+// Async ValidationError
+const asyncValidationErrorTest = function(this: TestContext): Promise<ValidationError> {
+    return new Promise(resolve => resolve(this.createError({ path: "testPath", message: "testMessage" })));
+};
+
+mixed.test('async-validation-error', 'Returns async ValidationError', asyncValidationErrorTest);
+mixed.test({
+    test: asyncValidationErrorTest,
+});
+
+// Sync ValidationError
+const syncValidationErrorTest = function(this: TestContext): ValidationError {
+    return this.createError({ path: "testPath", message: "testMessage" });
+};
+
+mixed.test('sync-validation-error', 'Returns sync ValidationError', syncValidationErrorTest);
+mixed.test({
+    test: syncValidationErrorTest,
+});
 
 yup.string().transform(function(this, value: any, originalvalue: any) {
     return this.isType(value) && value !== null ? value.toUpperCase() : value;
@@ -272,7 +308,7 @@ const validateOptions: ValidateOptions = {
     }
 };
 
-setLocale({
+yup.setLocale({
     number: { max: "Max message", min: "Min message" },
     string: { email: "String message"}
 });
diff --git a/types/zeit__next-typescript/index.d.ts b/types/zeit__next-typescript/index.d.ts
index d10fc83f14..2c4c21014e 100644
--- a/types/zeit__next-typescript/index.d.ts
+++ b/types/zeit__next-typescript/index.d.ts
@@ -2,7 +2,7 @@
 // Project: https://github.com/zeit/next-plugins/tree/master/packages/next-typescript
 // Definitions by: icopp <https://github.com/icopp>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
-// TypeScript Version: 2.6
+// TypeScript Version: 2.8
 
 import { ServerConfig } from 'next';
 
diff --git a/types/zen-observable/index.d.ts b/types/zen-observable/index.d.ts
index bcf02e8f8a..94ca94ccd2 100644
--- a/types/zen-observable/index.d.ts
+++ b/types/zen-observable/index.d.ts
@@ -1,7 +1,8 @@
-// Type definitions for zen-observable 0.5
+// Type definitions for zen-observable 0.8
 // Project: https://github.com/zenparsing/zen-observable
 // Definitions by: Kombu <https://github.com/aicest>
 //                 JounQin <https://github.com/JounQin>
+//                 Thomas <https://github.com/itomtom>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 declare global {
@@ -52,6 +53,7 @@ declare class Observable<T> {
     reduce(callback: (previousValue: T, currentValue: T) => T, initialValue?: T): Observable<T>;
     reduce<R>(callback: (previousValue: R, currentValue: T) => R, initialValue?: R): Observable<R>;
     flatMap<R>(callback: (value: T) => ZenObservable.ObservableLike<R>): Observable<R>;
+    concat<R>(...observable: Array<Observable<R>>): Observable<R>;
 
     static from<R>(observable: Observable<R> | ZenObservable.ObservableLike<R> | ArrayLike<R>): Observable<R>;
     static of<R>(...items: R[]): Observable<R>;
diff --git a/types/zen-observable/zen-observable-tests.ts b/types/zen-observable/zen-observable-tests.ts
index b06e7cb512..b1aea6d46a 100644
--- a/types/zen-observable/zen-observable-tests.ts
+++ b/types/zen-observable/zen-observable-tests.ts
@@ -94,6 +94,14 @@ Observable.of(1, 2, 3)
     .flatMap(val => Observable.of(val.toString()))
     .subscribe(val => assert(typeof val === 'string'));
 
+/**
+ * observable.concat
+ */
+
+Observable.of(1, 2, 3)
+.concat(Observable.of(4, 5, 6), Observable.of(7, 8, 9))
+.subscribe(val => assert(typeof val === 'number'));
+
 /**
  * ZenObservable
  */
diff --git a/types/zip-webpack-plugin/index.d.ts b/types/zip-webpack-plugin/index.d.ts
new file mode 100644
index 0000000000..332e2936e2
--- /dev/null
+++ b/types/zip-webpack-plugin/index.d.ts
@@ -0,0 +1,99 @@
+// Type definitions for zip-webpack-plugin 3.0
+// Project: https://github.com/erikdesjardins/zip-webpack-plugin
+// Definitions by: Blaise Kal <https://github.com/blaise-io>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 2.8
+
+import * as webpack from 'webpack';
+
+export = ZipPlugin;
+
+/**
+ * Webpack plugin to zip emitted files. Compresses all assets into a zip file.
+ * See https://www.npmjs.com/package/zip-webpack-plugin#usage
+ */
+declare class ZipPlugin extends webpack.Plugin {
+    /**
+     * @param options Options for ZipPlugin.
+     */
+    constructor(options?: ZipPlugin.Options);
+}
+
+declare namespace ZipPlugin {
+    interface Options {
+        /**
+         * Output path. Can be relative (to the webpack output path) or absolute.
+         * Defaults to the Webpack output path.
+         */
+        path?: string;
+        /**
+         * Output file name.
+         * Defaults to the Webpack output filename or basename of the path.
+         */
+        filename?: string;
+        /**
+         * The file extension to use instead of "zip".
+         * Defaults to "zip".
+         */
+        extension?: string;
+        /**
+         * The path prefix for files included in the zip file.
+         * Default to no prefix.
+         */
+        pathPrefix?: string;
+        /**
+         * Function to map asset paths to new paths.
+         */
+        pathMapper?: (assetPath: string) => string;
+        /**
+         * Include file paths or patterns.
+         * Defaults to including all files in the webpack output path.
+         */
+        include?: string | RegExp | ReadonlyArray<string|RegExp>;
+        /**
+         * Exclude file paths or patterns. Takes precedence over include. Defaults to no excluding.
+         */
+        exclude?: string | RegExp | ReadonlyArray<string|RegExp>;
+        /**
+         * File options passed to yazl `addFile`.
+         * See https://github.com/thejoshwolfe/yazl#addfilerealpath-metadatapath-options
+         */
+        fileOptions?: fileOptions;
+        /**
+         * File options passed to yazl `end`.
+         * See https://github.com/thejoshwolfe/yazl#endoptions-finalsizecallback
+         */
+        zipOptions?: zipOptions;
+    }
+
+    interface fileOptions {
+        /**
+         * Overwrite the last modified time.
+         * Defaults to the current date and time.
+         */
+        mtime?: Date;
+        /**
+         * UNIX permission bits and file type.
+         */
+        mode?: number;
+        /**
+         * Whether to compress the out[ut zip file.
+         * When true, the file data will be deflated (compression method 8).
+         * When false, the file data will be stored (compression method 0).
+         */
+        compress?: boolean;
+        /**
+         * Force ZIP64 format. ZIP64 format is enabled by default where necessary.
+         * See https://github.com/thejoshwolfe/yazl#regarding-zip64-support
+         */
+        forceZip64Format?: boolean;
+    }
+
+    interface zipOptions {
+        /**
+         * Force ZIP64 format. ZIP64 format is enabled by default where necessary.
+         * See https://github.com/thejoshwolfe/yazl#regarding-zip64-support
+         */
+        forceZip64Format?: boolean;
+    }
+}
diff --git a/types/zip-webpack-plugin/tsconfig.json b/types/zip-webpack-plugin/tsconfig.json
new file mode 100644
index 0000000000..8c18bf81a0
--- /dev/null
+++ b/types/zip-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",
+        "zip-webpack-plugin-tests.ts"
+    ]
+}
diff --git a/types/zip-webpack-plugin/tslint.json b/types/zip-webpack-plugin/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/zip-webpack-plugin/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/zip-webpack-plugin/zip-webpack-plugin-tests.ts b/types/zip-webpack-plugin/zip-webpack-plugin-tests.ts
new file mode 100644
index 0000000000..f6396e5e7b
--- /dev/null
+++ b/types/zip-webpack-plugin/zip-webpack-plugin-tests.ts
@@ -0,0 +1,28 @@
+import * as ZipPlugin from "zip-webpack-plugin";
+
+new ZipPlugin();
+
+const options: ZipPlugin.Options = {
+    include: "include.string",
+    exclude: "exclude.string",
+};
+new ZipPlugin(options);
+
+new ZipPlugin({
+    path: "path",
+    filename: "filename",
+    extension: "ext",
+    pathPrefix: "prefix",
+    pathMapper: (assetPath) => `pathMapper/${assetPath}`,
+    include: ["include.string", /include\.regexp/],
+    exclude: ["exclude.string", /exclude\.regexp/],
+    fileOptions: {
+        mtime: new Date(),
+        mode: parseInt("0100664", 8),
+        compress: false,
+        forceZip64Format: true,
+    },
+    zipOptions: {
+        forceZip64Format: true,
+    }
+});
diff --git a/types/zipcodes/index.d.ts b/types/zipcodes/index.d.ts
index b1903ad48b..276db5cbac 100644
--- a/types/zipcodes/index.d.ts
+++ b/types/zipcodes/index.d.ts
@@ -1,6 +1,6 @@
-// Type definitions for zipcodes 6.0
+// Type definitions for zipcodes 6.1
 // Project: https://github.com/davglass/zipcodes#readme
-// Definitions by: Brayden Lopez <https://github.com/headdetect>
+// Definitions by: Brayden Lopez <https://github.com/headdetect>, Dobes Vandermeer <https://github.com/dobesv>
 // Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
 
 export as namespace ZipCodes;
@@ -14,18 +14,18 @@ export interface ZipCode {
     country: string;
 }
 
-export function lookup(zip: any): ZipCode;
+export function lookup(zip: string|number): ZipCode | undefined;
 
 export function lookupByName(city: string, state: string): ZipCode[];
 
 export function lookupByState(state: string): ZipCode[];
 
-export function distance(zipA: ZipCode, zipB: ZipCode): number;
+export function distance(zipA: string|number, zipB: string|number): number | null;
 
-export function radius(zip: ZipCode, miles: number, full: boolean): string | ZipCode[];
+export function radius(zip: string|number, 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;
+export function lookupByCoords(lat: number, lon: number): string | null;
diff --git a/types/zipcodes/zipcodes-tests.ts b/types/zipcodes/zipcodes-tests.ts
index 43bb711474..acaa6a0d46 100644
--- a/types/zipcodes/zipcodes-tests.ts
+++ b/types/zipcodes/zipcodes-tests.ts
@@ -18,19 +18,19 @@ const zipB: ZipCodes.ZipCode = {
   country: 'US'
 };
 
-ZipCodes.lookup(zipA); // $ExpectType ZipCode
+ZipCodes.lookup(zipA.zip); // $ExpectType ZipCode | undefined
 
 ZipCodes.lookupByName('Cupertino', 'CA'); // $ExpectType ZipCode[]
 
 ZipCodes.lookupByState('CA'); // $ExpectType ZipCode[]
 
-ZipCodes.distance(zipA, zipB); // $ExpectType number
+ZipCodes.distance(zipA.zip, zipB.zip); // $ExpectType number | null
 
-ZipCodes.radius(zipA, 1, true); // $ExpectType string | ZipCode[]
-ZipCodes.radius(zipA, 1, false); // $ExpectType string | ZipCode[]
+ZipCodes.radius(zipA.zip, 1, true); // $ExpectType ZipCode[] | string[]
+ZipCodes.radius(zipA.zip, 1, false); // $ExpectType ZipCode[] | string[]
 
 ZipCodes.toMiles(3); // $ExpectType number
 
 ZipCodes.toKilometers(3); // $ExpectType number
 
-ZipCodes.lookupByCoords(37.323, -122.0527); // $ExpectType ZipCode
+ZipCodes.lookupByCoords(37.323, -122.0527); // $ExpectType string | null
diff --git a/types/zipkin-javascript-opentracing/index.d.ts b/types/zipkin-javascript-opentracing/index.d.ts
new file mode 100644
index 0000000000..7185f033b0
--- /dev/null
+++ b/types/zipkin-javascript-opentracing/index.d.ts
@@ -0,0 +1,50 @@
+// Type definitions for zipkin-javascript-opentracing 1.6
+// Project: https://github.com/DanielMSchmidt/zipkin-javascript-opentracing
+// Definitions by: Laurent Gilly <https://github.com/laurentgilly>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+
+export = zipkin_javascript_opentracing;
+
+declare class zipkin_javascript_opentracing {
+    constructor(...args: any[]);
+
+    extract(format: any, carrier: any): any;
+
+    inject(span: any, format: any, carrier: any): void;
+
+    startSpan(name: any, ...args: any[]): any;
+
+    static FORMAT_BINARY: string;
+
+    static FORMAT_HTTP_HEADERS: string;
+
+    static FORMAT_TEXT_MAP: string;
+
+    static makeOptional(val: any): any;
+}
+
+declare namespace zipkin_javascript_opentracing {
+    namespace makeOptionalNamespace {
+        const prototype: {};
+    }
+
+    namespace prototypeNamespace {
+        function extract(format: any, carrier: any): any;
+
+        function inject(span: any, format: any, carrier: any): void;
+
+        function startSpan(name: any, ...args: any[]): any;
+
+        namespace extract {
+            const prototype: {};
+        }
+
+        namespace inject {
+            const prototype: {};
+        }
+
+        namespace startSpan {
+            const prototype: {};
+        }
+    }
+}
diff --git a/types/zipkin-javascript-opentracing/tsconfig.json b/types/zipkin-javascript-opentracing/tsconfig.json
new file mode 100644
index 0000000000..1b9b9b2c05
--- /dev/null
+++ b/types/zipkin-javascript-opentracing/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", "zipkin-javascript-opentracing-tests.ts"]
+}
diff --git a/types/zipkin-javascript-opentracing/tslint.json b/types/zipkin-javascript-opentracing/tslint.json
new file mode 100644
index 0000000000..3db14f85ea
--- /dev/null
+++ b/types/zipkin-javascript-opentracing/tslint.json
@@ -0,0 +1 @@
+{ "extends": "dtslint/dt.json" }
diff --git a/types/zipkin-javascript-opentracing/zipkin-javascript-opentracing-tests.ts b/types/zipkin-javascript-opentracing/zipkin-javascript-opentracing-tests.ts
new file mode 100644
index 0000000000..8e69b175dd
--- /dev/null
+++ b/types/zipkin-javascript-opentracing/zipkin-javascript-opentracing-tests.ts
@@ -0,0 +1,9 @@
+import ZipkinOpentracing = require("zipkin-javascript-opentracing");
+const zipkinBaseUrl = "http://zipkin.danielmschmidt.de";
+
+// Setup the tracer
+const tracer = new ZipkinOpentracing({
+    serviceName: "zipkin-opentracing-service",
+    endpoint: zipkinBaseUrl,
+    kind: "client"
+});